From a2b2070b679ff7e92d856c7d6775f5f67ce4792d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 11:54:27 +0200 Subject: bootstrap: %bootstrap-inputs: Wrap input lists into thunks. * gnu/packages/bootstrap.scm (%bootstrap-inputs): Change to procedure. Update users; prepares for Mes bootstrap. * gnu/packages/commencement.scm (%boot0-inputs, %boot1-inputs, %boot2-inputs, %boot3-inputs, %boot4-inputs, %boot5-inputs, %boot-6-inputs): Change to procedure. Update users. * tests/builders.scm (%bootstrap-inputs, %bootstrap-search-paths): Make a procedure, filter on package?. Update users. --- gnu/packages/bootstrap.scm | 2 +- gnu/packages/commencement.scm | 115 +++++++++++++++++++++--------------------- guix/scripts/pack.scm | 6 +-- tests/builders.scm | 23 +++++---- tests/graph.scm | 4 +- tests/union.scm | 5 +- 6 files changed, 81 insertions(+), 74 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 936d6c1a2a..fb6e8db88a 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -586,7 +586,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) -(define %bootstrap-inputs +(define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. `(("libc" ,%bootstrap-glibc) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0aa65fe638..a4e71b000b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,13 +101,13 @@ (install-file "make" bin) #t)))))))) (native-inputs '()) ; no need for 'pkg-config' - (inputs %bootstrap-inputs)))) + (inputs (%bootstrap-inputs))))) (define diffutils-boot0 (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs diffutils `(("make" ,gnu-make-boot0) - ,@%bootstrap-inputs) + ,@(%bootstrap-inputs)) #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") @@ -120,7 +121,7 @@ (name "findutils-boot0")) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ; for tests - ,@%bootstrap-inputs) + ,@(%bootstrap-inputs)) (current-source-location) #:guile %bootstrap-guile))) @@ -130,17 +131,17 @@ (inherit file) (name "file-boot0")) `(("make" ,gnu-make-boot0) - ,@%bootstrap-inputs) + ,@(%bootstrap-inputs)) (current-source-location) #:guile %bootstrap-guile))) -(define %boot0-inputs +(define (%boot0-inputs) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) - ,@%bootstrap-inputs)) + ,@(%bootstrap-inputs))) (define* (boot-triplet #:optional (system (%current-system))) ;; Return the triplet used to create the cross toolchain needed in the @@ -149,7 +150,7 @@ ;; Following Linux From Scratch, build a cross-toolchain in stage 0. That ;; toolchain actually targets the same OS and arch, but it has the advantage -;; of being independent of the libc and tools in %BOOTSTRAP-INPUTS, since +;; of being independent of the libc and tools in (%BOOTSTRAP-INPUTS), since ;; GCC-BOOT0 (below) is built without any reference to the target libc. (define binutils-boot0 @@ -184,7 +185,7 @@ ((#:configure-flags cf) `(cons ,(string-append "--target=" (boot-triplet)) ,cf))))) - (inputs %boot0-inputs)))) + (inputs (%boot0-inputs))))) ;; Use a "fixed" package source for this early libstdc++ variant so we can ;; update GCC 4.9 without triggering a full rebuild. @@ -216,7 +217,7 @@ #:validate-runpath? #f ,@(package-arguments lib))) - (inputs %boot0-inputs) + (inputs (%boot0-inputs)) (native-inputs '())))) (define gcc-boot0 @@ -307,8 +308,8 @@ ;; Call it differently so that the builder can check whether ;; the "libc" input is #f. - ("libc-native" ,@(assoc-ref %boot0-inputs "libc")) - ,@(alist-delete "libc" %boot0-inputs))) + ("libc-native" ,@(assoc-ref (%boot0-inputs) "libc")) + ,@(alist-delete "libc" (%boot0-inputs)))) ;; No need for the native-inputs to build the documentation at this stage. (native-inputs `())))) @@ -338,7 +339,7 @@ `(delete "-Dusethreads" ,configure-flags)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs perl - %boot0-inputs + (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -347,7 +348,7 @@ ;; It is also needed to rebuild Bash's parser, which is modified by ;; its CVE patches. Remove it when it's no longer needed. (let* ((m4 (package-with-bootstrap-guile - (package-with-explicit-inputs m4 %boot0-inputs + (package-with-explicit-inputs m4 (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile))) (bison (package (inherit bison) @@ -363,7 +364,7 @@ "V=1")))))) (package (inherit (package-with-bootstrap-guile - (package-with-explicit-inputs bison %boot0-inputs + (package-with-explicit-inputs bison (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile))) (native-inputs `(("perl" ,perl-boot0)))))) @@ -376,7 +377,7 @@ (inputs `(("indent" ,indent))) (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs flex %boot0-inputs + (package-with-explicit-inputs flex (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -394,12 +395,12 @@ ,@(package-arguments linux-libre-headers))) (native-inputs `(("perl" ,perl-boot0) - ,@%boot0-inputs)))))) + ,@(%boot0-inputs))))))) (define gnumach-headers-boot0 (package-with-bootstrap-guile (package-with-explicit-inputs gnumach-headers - %boot0-inputs + (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile))) @@ -413,7 +414,7 @@ `(,(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %build-inputs "flex") "/lib/"))))))) (package-with-bootstrap-guile - (package-with-explicit-inputs mig %boot0-inputs + (package-with-explicit-inputs mig (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -422,7 +423,7 @@ (native-inputs `(("mig" ,mig-boot0))) (inputs '())))) (package-with-bootstrap-guile - (package-with-explicit-inputs hurd-headers %boot0-inputs + (package-with-explicit-inputs hurd-headers (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -431,7 +432,7 @@ (native-inputs `(("mig" ,mig-boot0))) (inputs '())))) (package-with-bootstrap-guile - (package-with-explicit-inputs hurd-minimal %boot0-inputs + (package-with-explicit-inputs hurd-minimal (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -447,7 +448,7 @@ the bootstrap environment." `(("gnumach-headers" ,gnumach-headers-boot0) ("hurd-headers" ,hurd-headers-boot0) ("hurd-minimal" ,hurd-minimal-boot0) - ,@%boot0-inputs)))))) + ,@(%boot0-inputs))))))) (define* (kernel-headers-boot0 #:optional (system (%current-system))) (match system @@ -458,7 +459,7 @@ the bootstrap environment." ;; Texinfo used to build libc's manual. ;; We build without ncurses because it fails to build at this stage, and ;; because we don't need the stand-alone Info reader. - ;; Also, use %BOOT0-INPUTS to avoid building Perl once more. + ;; Also, use (%BOOT0-INPUTS) to avoid building Perl once more. (let ((texinfo (package (inherit texinfo) (native-inputs '()) (inputs `(("perl" ,perl-boot0))) @@ -468,7 +469,7 @@ the bootstrap environment." ;; UTF-8 locale at this stage, so skip them. (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs texinfo %boot0-inputs + (package-with-explicit-inputs texinfo (%boot0-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -479,14 +480,14 @@ the bootstrap environment." #:target boot-triplet #:binutils binutils-boot0 #:guile %bootstrap-guile - #:bash (car (assoc-ref %boot0-inputs "bash")))) + #:bash (car (assoc-ref (%boot0-inputs) "bash")))) -(define %boot1-inputs +(define (%boot1-inputs) ;; 2nd stage inputs. `(("gcc" ,gcc-boot0) ("ld-wrapper-cross" ,ld-wrapper-boot0) ("binutils-cross" ,binutils-boot0) - ,@(alist-delete "binutils" %boot0-inputs))) + ,@(alist-delete "binutils" (%boot0-inputs)))) (define glibc-final-with-bootstrap-bash ;; The final libc, "cross-built". If everything went well, the resulting @@ -542,7 +543,7 @@ the bootstrap environment." (inputs `(;; The boot inputs. That includes the bootstrap libc. We don't want ;; it in $CPATH, hence the 'pre-configure' phase above. - ,@%boot1-inputs + ,@(%boot1-inputs) ;; A native MiG is needed to build Glibc on Hurd. ,@(if (hurd-triplet? (%current-system)) @@ -550,11 +551,11 @@ the bootstrap environment." '()) ;; A native GCC is needed to build `cross-rpcgen'. - ("native-gcc" ,@(assoc-ref %boot0-inputs "gcc")) + ("native-gcc" ,@(assoc-ref (%boot0-inputs) "gcc")) ;; Here, we use the bootstrap Bash, which is not satisfactory ;; because we don't want to depend on bootstrap tools. - ("static-bash" ,@(assoc-ref %boot0-inputs "bash"))))))) + ("static-bash" ,@(assoc-ref (%boot0-inputs) "bash"))))))) (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC @@ -613,7 +614,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. (let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final-with-bootstrap-bash - (car (assoc-ref %boot1-inputs "bash")))) + (car (assoc-ref (%boot1-inputs) "bash")))) (bash (package (inherit static-bash) (arguments @@ -632,7 +633,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inputs `(("gcc" ,gcc) ("libc" ,glibc-final-with-bootstrap-bash) ("libc:static" ,glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete %boot1-inputs + ,@(fold alist-delete (%boot1-inputs) '("gcc" "libc"))))) (package-with-bootstrap-guile (package-with-explicit-inputs bash inputs @@ -670,7 +671,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (delete 'patch-tests)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs gettext-minimal - %boot1-inputs + (%boot1-inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -707,14 +708,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the ;; non-cross names. (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final - (car (assoc-ref %boot1-inputs "bash")))) + (car (assoc-ref (%boot1-inputs) "bash")))) -(define %boot2-inputs +(define (%boot2-inputs) ;; 3rd stage inputs. `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") ("gcc" ,gcc-boot0-wrapped) - ,@(fold alist-delete %boot1-inputs '("libc" "gcc")))) + ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc")))) (define binutils-final (package-with-bootstrap-guile @@ -724,7 +725,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:implicit-inputs? #f #:allowed-references ("out" ,glibc-final) ,@(package-arguments binutils))) - (inputs %boot2-inputs)))) + (inputs (%boot2-inputs))))) (define libstdc++ ;; Intermediate libstdc++ that will allow us to build the final GCC @@ -750,7 +751,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (assoc-ref %outputs "out") "/include")))) (outputs '("out")) - (inputs %boot2-inputs) + (inputs (%boot2-inputs)) (synopsis "GNU C++ standard library (intermediate)")))) (define zlib-final @@ -763,14 +764,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:implicit-inputs? #f #:allowed-references ("out" ,glibc-final) ,@(package-arguments zlib))) - (inputs %boot2-inputs)))) + (inputs (%boot2-inputs))))) (define ld-wrapper-boot3 ;; A linker wrapper that uses the bootstrap Guile. (make-ld-wrapper "ld-wrapper-boot3" #:binutils binutils-final #:guile %bootstrap-guile - #:bash (car (assoc-ref %boot2-inputs "bash")))) + #:bash (car (assoc-ref (%boot2-inputs) "bash")))) (define gcc-final ;; The final GCC. @@ -835,13 +836,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("binutils" ,binutils-final) ("libstdc++" ,libstdc++) ("zlib" ,zlib-final) - ,@%boot2-inputs)))) + ,@(%boot2-inputs))))) -(define %boot3-inputs +(define (%boot3-inputs) ;; 4th stage inputs. `(("gcc" ,gcc-final) ("ld-wrapper" ,ld-wrapper-boot3) - ,@(alist-delete "gcc" %boot2-inputs))) + ,@(alist-delete "gcc" (%boot2-inputs)))) (define bash-final ;; Link with `-static-libgcc' to make sure we don't retain a reference @@ -851,25 +852,25 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inherit bash-minimal) (arguments `(#:disallowed-references - ,(assoc-ref %boot3-inputs "coreutils&co") + ,(assoc-ref (%boot3-inputs) "coreutils&co") ,@(package-arguments bash-minimal)))))) (package-with-bootstrap-guile (package-with-explicit-inputs (static-libgcc-package bash) - %boot3-inputs + (%boot3-inputs) (current-source-location) #:guile %bootstrap-guile)))) -(define %boot4-inputs +(define (%boot4-inputs) ;; Now use the final Bash. `(("bash" ,bash-final) - ,@(alist-delete "bash" %boot3-inputs))) + ,@(alist-delete "bash" (%boot3-inputs)))) (define-public guile-final ;; This package must be public because other modules refer to it. However, ;; mark it as hidden so that 'fold-packages' ignores it. (package-with-bootstrap-guile (package-with-explicit-inputs (hidden-package guile-2.2/fixed) - %boot4-inputs + (%boot4-inputs) (current-source-location) #:guile %bootstrap-guile))) @@ -883,7 +884,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inherit glibc-utf8-locales) (inputs `(("glibc" ,glibc-final) ("gzip" - ,(package-with-explicit-inputs gzip %boot4-inputs + ,(package-with-explicit-inputs gzip (%boot4-inputs) (current-source-location) #:guile %bootstrap-guile)))))) @@ -894,19 +895,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:guile guile-final #:bash bash-final)) -(define %boot5-inputs +(define (%boot5-inputs) ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built ;; with an older libc, which cannot load the new locale format. See ;; . `(("locales" ,glibc-utf8-locales-final) - ,@%boot4-inputs)) + ,@(%boot4-inputs))) (define gnu-make-final ;; The final GNU Make, which uses the final Guile. (package-with-bootstrap-guile (package-with-explicit-inputs gnu-make `(("guile" ,guile-final) - ,@%boot5-inputs) + ,@(%boot5-inputs)) (current-source-location)))) (define coreutils-final @@ -914,7 +915,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Findutils, keep a reference to the Coreutils they were built with. (package-with-bootstrap-guile (package-with-explicit-inputs coreutils - %boot5-inputs + (%boot5-inputs) (current-source-location) ;; Use the final Guile, linked against the @@ -927,23 +928,23 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; The final grep. Gzip holds a reference to it (via zgrep), so it must be ;; built before gzip. (let ((grep (package-with-bootstrap-guile - (package-with-explicit-inputs grep %boot5-inputs + (package-with-explicit-inputs grep (%boot5-inputs) (current-source-location) #:guile guile-final)))) (package/inherit grep (inputs (alist-delete "pcre" (package-inputs grep))) (native-inputs `(("perl" ,perl-boot0)))))) -(define %boot6-inputs +(define (%boot6-inputs) ;; Now use the final Coreutils. `(("coreutils" ,coreutils-final) ("grep" ,grep-final) - ,@%boot5-inputs)) + ,@(%boot5-inputs))) (define sed-final ;; The final sed. (let ((sed (package-with-bootstrap-guile - (package-with-explicit-inputs sed %boot6-inputs + (package-with-explicit-inputs sed (%boot6-inputs) (current-source-location) #:guile guile-final)))) (package/inherit sed (native-inputs `(("perl" ,perl-boot0)))))) @@ -954,7 +955,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; used for origins that have patches, thereby avoiding circular ;; dependencies. (let ((finalize (compose package-with-bootstrap-guile - (cut package-with-explicit-inputs <> %boot6-inputs + (cut package-with-explicit-inputs <> (%boot6-inputs) (current-source-location))))) `(,@(map (match-lambda ((name package) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 1916f3b9d7..28462d9b8d 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -388,9 +388,9 @@ the image." "Return the C compiler that uses the bootstrap toolchain. This is used only by '--bootstrap', for testing purposes." (define bootstrap-toolchain - (list (first (assoc-ref %bootstrap-inputs "gcc")) - (first (assoc-ref %bootstrap-inputs "binutils")) - (first (assoc-ref %bootstrap-inputs "libc")))) + (list (first (assoc-ref (%bootstrap-inputs) "gcc")) + (first (assoc-ref (%bootstrap-inputs) "binutils")) + (first (assoc-ref (%bootstrap-inputs) "libc")))) (c-compiler bootstrap-toolchain #:guile %bootstrap-guile)) diff --git a/tests/builders.scm b/tests/builders.scm index 8b8ef013e7..b2d8a7c6b2 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -28,7 +28,8 @@ #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module ((guix packages) - #:select (package-derivation package-native-search-paths)) + #:select (package? + package-derivation package-native-search-paths)) #:use-module (gnu packages bootstrap) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -39,7 +40,7 @@ (define %store (open-connection-for-tests)) -(define %bootstrap-inputs +(define (%bootstrap-inputs) ;; Use the bootstrap inputs so it doesn't take ages to run these tests. ;; This still involves building Make, Diffutils, and Findutils. ;; XXX: We're relying on the higher-level `package-derivations' here. @@ -47,14 +48,18 @@ (map (match-lambda ((name package) (list name (package-derivation %store package)))) - (@@ (gnu packages commencement) %boot0-inputs)))) + (filter + (compose package? cadr) + ((@@ (gnu packages commencement) %boot0-inputs)))))) -(define %bootstrap-search-paths +(define (%bootstrap-search-paths) ;; Search path specifications that go with %BOOTSTRAP-INPUTS. (append-map (match-lambda - ((name package _ ...) - (package-native-search-paths package))) - (@@ (gnu packages commencement) %boot0-inputs))) + ((name package _ ...) + (package-native-search-paths package))) + (filter + (compose package? cadr) + ((@@ (gnu packages commencement) %boot0-inputs))))) (define url-fetch* (store-lower url-fetch)) @@ -104,9 +109,9 @@ #:guile %bootstrap-guile)) (build (gnu-build %store "hello-2.8" `(("source" ,tarball) - ,@%bootstrap-inputs) + ,@(%bootstrap-inputs)) #:guile %bootstrap-guile - #:search-paths %bootstrap-search-paths)) + #:search-paths (%bootstrap-search-paths))) (out (derivation->output-path build))) (and (build-derivations %store (list (pk 'hello-drv build))) (valid-path? %store out) diff --git a/tests/graph.scm b/tests/graph.scm index 4799d3bd0c..2a0f675717 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -153,9 +153,9 @@ edges." (match nodes (((labels names) ...) names)))) - (match %bootstrap-inputs + (match (%bootstrap-inputs) (((labels packages) ...) - (map package-full-name packages)))))))) + (map package-full-name (filter package? packages))))))))) (test-assert "bag DAG, including origins" (let-values (((backend nodes+edges) (make-recording-backend))) diff --git a/tests/union.scm b/tests/union.scm index 5a6a4033fc..5599625447 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -94,8 +94,9 @@ `(,name ,(package-derivation %store package)))) ;; Purposefully leave duplicate entries. - (append %bootstrap-inputs - (take %bootstrap-inputs 3)))) + (filter (compose package? cadr) + (append (%bootstrap-inputs) + (take (%bootstrap-inputs) 3))))) (builder `(begin (use-modules (guix build union)) (union-build (assoc-ref %outputs "out") -- cgit v1.2.3 From c362904485d3c8c3f155538ab2f7cd082b334801 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 13:33:41 +0200 Subject: bootstrap: %bootstrap-inputs+toolchain: Replace %bootstrap-inputs. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): : New procedure replacing %bootstrap-inputs to prepare for Mes bootstrap. Update users. * tests/union.scm (%bootstrap-inputs): New variable: set to %bootstrap-inputs+toolchain. --- gnu/packages/commencement.scm | 19 +++++++++++-------- tests/union.scm | 4 ++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a4e71b000b..12d5b528fd 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -79,6 +79,9 @@ ;;; ;;; Code: +(define (%bootstrap-inputs+toolchain) + (%bootstrap-inputs)) + (define gnu-make-boot0 (package-with-bootstrap-guile (package (inherit gnu-make) @@ -101,13 +104,13 @@ (install-file "make" bin) #t)))))))) (native-inputs '()) ; no need for 'pkg-config' - (inputs (%bootstrap-inputs))))) + (inputs (%bootstrap-inputs+toolchain))))) (define diffutils-boot0 (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs diffutils `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs)) + ,@(%bootstrap-inputs+toolchain)) #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") @@ -121,7 +124,7 @@ (name "findutils-boot0")) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ; for tests - ,@(%bootstrap-inputs)) + ,@(%bootstrap-inputs+toolchain)) (current-source-location) #:guile %bootstrap-guile))) @@ -131,17 +134,16 @@ (inherit file) (name "file-boot0")) `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs)) + ,@(%bootstrap-inputs+toolchain)) (current-source-location) #:guile %bootstrap-guile))) - (define (%boot0-inputs) `(("make" ,gnu-make-boot0) ("diffutils" ,diffutils-boot0) ("findutils" ,findutils-boot0) ("file" ,file-boot0) - ,@(%bootstrap-inputs))) + ,@(%bootstrap-inputs+toolchain))) (define* (boot-triplet #:optional (system (%current-system))) ;; Return the triplet used to create the cross toolchain needed in the @@ -150,8 +152,9 @@ ;; Following Linux From Scratch, build a cross-toolchain in stage 0. That ;; toolchain actually targets the same OS and arch, but it has the advantage -;; of being independent of the libc and tools in (%BOOTSTRAP-INPUTS), since -;; GCC-BOOT0 (below) is built without any reference to the target libc. +;; of being independent of the libc and tools in +;; (%BOOTSTRAP-INPUTS+TOOLCHAIN), since GCC-BOOT0 (below) is built without any +;; reference to the target libc. (define binutils-boot0 (package-with-bootstrap-guile diff --git a/tests/union.scm b/tests/union.scm index 5599625447..091895ff8e 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,9 @@ #:use-module (rnrs io ports) #:use-module (ice-9 match)) +(define %bootstrap-inputs + (@@ (gnu packages commencement) %bootstrap-inputs+toolchain)) + ;; Exercise the (guix build union) module. (define %store -- cgit v1.2.3 From 32f4a073e197e10223fc3c45d459be359d606968 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 13:44:43 +0200 Subject: gnu: m4-boot0: New variable. * gnu/packages/commencement.scm (m4-boot0): New variable. --- gnu/packages/commencement.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 12d5b528fd..a62655800d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -346,6 +346,17 @@ (current-source-location) #:guile %bootstrap-guile)))) +(define m4-boot0 + (package-with-bootstrap-guile + (package + (inherit m4) + (name "m4-boot0") + (inputs (%boot0-inputs)) + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + ,@(package-arguments m4)))))) + (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. ;; It is also needed to rebuild Bash's parser, which is modified by -- cgit v1.2.3 From f50b013f8ce7606f3769ef02c09b4f7e0620686b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 13:36:48 +0200 Subject: bootstrap: Use thunk for inputs in package-with-explicit-inputs. * gnu/packages/commencement.scm (diffutils-boot0, findutils-boot0, perl-boot0, bison-boot0, flex-boot0, texinfo-boot0, static-bash-for-glibc, gettext-boot0, bash-final, guile-final, glibc-utf8-locales-final, gnu-make-final, coreutils-final, grep-final, sed-final, %final-inputs): Use thunk for inputs in package-with-explicit-inputs. This makes --system=i686-linux behave identical to a native x86 build and prepares for Mes bootstrap. (ld-wrapper-boot0, ld-wrapper-boot3): Change to procedure. Explicitly add #:guile-for-build. Update users. --- gnu/packages/commencement.scm | 82 +++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a62655800d..ea30694475 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -109,8 +109,9 @@ (define diffutils-boot0 (package-with-bootstrap-guile (let ((p (package-with-explicit-inputs diffutils - `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs+toolchain)) + (lambda _ + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") @@ -122,9 +123,10 @@ (package-with-explicit-inputs (package (inherit findutils) (name "findutils-boot0")) - `(("make" ,gnu-make-boot0) - ("diffutils" ,diffutils-boot0) ; for tests - ,@(%bootstrap-inputs+toolchain)) + (lambda _ + `(("make" ,gnu-make-boot0) + ("diffutils" ,diffutils-boot0) ; for tests + ,@(%bootstrap-inputs+toolchain))) (current-source-location) #:guile %bootstrap-guile))) @@ -132,9 +134,13 @@ (package-with-bootstrap-guile (package-with-explicit-inputs (package (inherit file) - (name "file-boot0")) - `(("make" ,gnu-make-boot0) - ,@(%bootstrap-inputs+toolchain)) + (name "file-boot0") + (arguments + '(#:strip-binaries? #f + #:validate-runpath? #f))) + (lambda _ + `(("make" ,gnu-make-boot0) + ,@(%bootstrap-inputs+toolchain))) (current-source-location) #:guile %bootstrap-guile))) @@ -342,7 +348,7 @@ `(delete "-Dusethreads" ,configure-flags)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs perl - (%boot0-inputs) + %boot0-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -361,11 +367,7 @@ ;; This Bison is needed to build MiG so we need it early in the process. ;; It is also needed to rebuild Bash's parser, which is modified by ;; its CVE patches. Remove it when it's no longer needed. - (let* ((m4 (package-with-bootstrap-guile - (package-with-explicit-inputs m4 (%boot0-inputs) - (current-source-location) - #:guile %bootstrap-guile))) - (bison (package (inherit bison) + (let* ((bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... (arguments @@ -374,11 +376,12 @@ ;; Zero timestamps in liby.a; this must be done ;; explicitly here because the bootstrap Binutils don't ;; do that (default is "cru".) - #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D" + #:make-flags '("ARFLAGS=crD" + "RANLIB=ranlib -D" "V=1")))))) (package (inherit (package-with-bootstrap-guile - (package-with-explicit-inputs bison (%boot0-inputs) + (package-with-explicit-inputs bison %boot0-inputs (current-source-location) #:guile %bootstrap-guile))) (native-inputs `(("perl" ,perl-boot0)))))) @@ -391,7 +394,7 @@ (inputs `(("indent" ,indent))) (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs flex (%boot0-inputs) + (package-with-explicit-inputs flex %boot0-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -483,23 +486,24 @@ the bootstrap environment." ;; UTF-8 locale at this stage, so skip them. (arguments '(#:tests? #f))))) (package-with-bootstrap-guile - (package-with-explicit-inputs texinfo (%boot0-inputs) + (package-with-explicit-inputs texinfo %boot0-inputs (current-source-location) #:guile %bootstrap-guile)))) -(define ld-wrapper-boot0 +(define (ld-wrapper-boot0) ;; We need this so binaries on Hurd will have libmachuser and libhurduser ;; in their RUNPATH, otherwise validate-runpath will fail. (make-ld-wrapper "ld-wrapper-boot0" #:target boot-triplet #:binutils binutils-boot0 #:guile %bootstrap-guile - #:bash (car (assoc-ref (%boot0-inputs) "bash")))) + #:bash (car (assoc-ref (%boot0-inputs) "bash")) + #:guile-for-build %bootstrap-guile)) (define (%boot1-inputs) ;; 2nd stage inputs. `(("gcc" ,gcc-boot0) - ("ld-wrapper-cross" ,ld-wrapper-boot0) + ("ld-wrapper-cross" ,(ld-wrapper-boot0)) ("binutils-cross" ,binutils-boot0) ,@(alist-delete "binutils" (%boot0-inputs)))) @@ -650,7 +654,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(fold alist-delete (%boot1-inputs) '("gcc" "libc"))))) (package-with-bootstrap-guile - (package-with-explicit-inputs bash inputs + (package-with-explicit-inputs bash (lambda _ inputs) (current-source-location) #:guile %bootstrap-guile)))) @@ -685,7 +689,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (delete 'patch-tests)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs gettext-minimal - (%boot1-inputs) + %boot1-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -718,7 +722,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments glibc-final-with-bootstrap-bash)))))) -(define gcc-boot0-wrapped +(define (gcc-boot0-wrapped) ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the ;; non-cross names. (cross-gcc-wrapper gcc-boot0 binutils-boot0 glibc-final @@ -728,7 +732,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; 3rd stage inputs. `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") - ("gcc" ,gcc-boot0-wrapped) + ("gcc" ,(gcc-boot0-wrapped)) ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc")))) (define binutils-final @@ -780,12 +784,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments zlib))) (inputs (%boot2-inputs))))) -(define ld-wrapper-boot3 +(define (ld-wrapper-boot3) ;; A linker wrapper that uses the bootstrap Guile. (make-ld-wrapper "ld-wrapper-boot3" #:binutils binutils-final #:guile %bootstrap-guile - #:bash (car (assoc-ref (%boot2-inputs) "bash")))) + #:bash (car (assoc-ref (%boot2-inputs) "bash")) + #:guile-for-build %bootstrap-guile)) (define gcc-final ;; The final GCC. @@ -846,7 +851,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) - ("ld-wrapper" ,ld-wrapper-boot3) + ("ld-wrapper" ,(ld-wrapper-boot3)) ("binutils" ,binutils-final) ("libstdc++" ,libstdc++) ("zlib" ,zlib-final) @@ -855,7 +860,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot3-inputs) ;; 4th stage inputs. `(("gcc" ,gcc-final) - ("ld-wrapper" ,ld-wrapper-boot3) + ("ld-wrapper" ,(ld-wrapper-boot3)) ,@(alist-delete "gcc" (%boot2-inputs)))) (define bash-final @@ -870,7 +875,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments bash-minimal)))))) (package-with-bootstrap-guile (package-with-explicit-inputs (static-libgcc-package bash) - (%boot3-inputs) + %boot3-inputs (current-source-location) #:guile %bootstrap-guile)))) @@ -884,7 +889,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; mark it as hidden so that 'fold-packages' ignores it. (package-with-bootstrap-guile (package-with-explicit-inputs (hidden-package guile-2.2/fixed) - (%boot4-inputs) + %boot4-inputs (current-source-location) #:guile %bootstrap-guile))) @@ -898,7 +903,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (inherit glibc-utf8-locales) (inputs `(("glibc" ,glibc-final) ("gzip" - ,(package-with-explicit-inputs gzip (%boot4-inputs) + ,(package-with-explicit-inputs gzip %boot4-inputs (current-source-location) #:guile %bootstrap-guile)))))) @@ -920,8 +925,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; The final GNU Make, which uses the final Guile. (package-with-bootstrap-guile (package-with-explicit-inputs gnu-make - `(("guile" ,guile-final) - ,@(%boot5-inputs)) + (lambda _ + `(("guile" ,guile-final) + ,@(%boot5-inputs))) (current-source-location)))) (define coreutils-final @@ -929,7 +935,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Findutils, keep a reference to the Coreutils they were built with. (package-with-bootstrap-guile (package-with-explicit-inputs coreutils - (%boot5-inputs) + %boot5-inputs (current-source-location) ;; Use the final Guile, linked against the @@ -942,7 +948,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; The final grep. Gzip holds a reference to it (via zgrep), so it must be ;; built before gzip. (let ((grep (package-with-bootstrap-guile - (package-with-explicit-inputs grep (%boot5-inputs) + (package-with-explicit-inputs grep %boot5-inputs (current-source-location) #:guile guile-final)))) (package/inherit grep @@ -958,7 +964,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define sed-final ;; The final sed. (let ((sed (package-with-bootstrap-guile - (package-with-explicit-inputs sed (%boot6-inputs) + (package-with-explicit-inputs sed %boot6-inputs (current-source-location) #:guile guile-final)))) (package/inherit sed (native-inputs `(("perl" ,perl-boot0)))))) @@ -969,7 +975,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; used for origins that have patches, thereby avoiding circular ;; dependencies. (let ((finalize (compose package-with-bootstrap-guile - (cut package-with-explicit-inputs <> (%boot6-inputs) + (cut package-with-explicit-inputs <> %boot6-inputs (current-source-location))))) `(,@(map (match-lambda ((name package) -- cgit v1.2.3 From 517af02ea1de95ecbde3fa265f3e40b4e44c0eca Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Sep 2018 22:25:27 +0200 Subject: bootstrap: static-bash-for-glibc: Consider %current-system at run time. * gnu/packages/commencement.scm (static-bash-for-glibc): Rewrite so that (%boot1-inputs) is evaluated run time, rather than at load time. --- gnu/packages/commencement.scm | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ea30694475..84d834f5c1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -630,33 +630,35 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. - (let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 - glibc-final-with-bootstrap-bash - (car (assoc-ref (%boot1-inputs) "bash")))) - (bash (package - (inherit static-bash) - (arguments - (substitute-keyword-arguments - (package-arguments static-bash) - ((#:guile _ #f) - '%bootstrap-guile) - ((#:configure-flags flags '()) - ;; Add a '-L' flag so that the pseudo-cross-ld of - ;; BINUTILS-BOOT0 can find libc.a. - `(append ,flags - (list (string-append "LDFLAGS=-static -L" - (assoc-ref %build-inputs - "libc:static") - "/lib")))))))) - (inputs `(("gcc" ,gcc) - ("libc" ,glibc-final-with-bootstrap-bash) - ("libc:static" ,glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete (%boot1-inputs) - '("gcc" "libc"))))) + (let ((bash (package + (inherit static-bash) + (arguments + (substitute-keyword-arguments + (package-arguments static-bash) + ((#:guile _ #f) + '%bootstrap-guile) + ((#:configure-flags flags '()) + ;; Add a '-L' flag so that the pseudo-cross-ld of + ;; BINUTILS-BOOT0 can find libc.a. + `(append ,flags + (list (string-append "LDFLAGS=-static -L" + (assoc-ref %build-inputs + "libc:static") + "/lib"))))))))) (package-with-bootstrap-guile - (package-with-explicit-inputs bash (lambda _ inputs) - (current-source-location) - #:guile %bootstrap-guile)))) + (package-with-explicit-inputs + bash + (lambda _ + (let ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 + glibc-final-with-bootstrap-bash + (car (assoc-ref (%boot1-inputs) "bash"))))) + `(("gcc" ,gcc) + ("libc" ,glibc-final-with-bootstrap-bash) + ("libc:static" ,glibc-final-with-bootstrap-bash "static") + ,@(fold alist-delete (%boot1-inputs) + '("gcc" "libc"))))) + (current-source-location) + #:guile %bootstrap-guile)))) (define gettext-boot0 ;; A minimal gettext used during bootstrap. -- cgit v1.2.3 From dbabfc470d568125d523bbd1942e421a14911f6d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 12:32:07 +0200 Subject: guix: package-from-tarball: Allow PROGRAM-TO-TEST to be #f. * gnu/packages/bootstrap.scm (package-from-tarball): Allow PROGRAM-TO-TEST to be #f. --- gnu/packages/bootstrap.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index fb6e8db88a..c8d4e7e85f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,10 +98,10 @@ (define* (package-from-tarball name source program-to-test description #:key snippet) "Return a package that correspond to the extraction of SOURCE. -PROGRAM-TO-TEST is a program to run after extraction of SOURCE, to check -whether everything is alright. If SNIPPET is provided, it is evaluated after -extracting SOURCE. SNIPPET should raise an exception to signal an error; its -return value is ignored." +PROGRAM-TO-TEST is #f or a string: the program to run after extraction of +SOURCE to check whether everything is alright. If SNIPPET is provided, it is +evaluated after extracting SOURCE. SNIPPET should return true if successful, +or false to signal an error." (package (name name) (version "0") @@ -123,8 +124,9 @@ return value is ignored." (invoke tar "xvf" (string-append builddir "/binaries.tar")) ,@(if snippet (list snippet) '()) - (invoke (string-append "bin/" ,program-to-test) - "--version")))))) + (or (not ,program-to-test) + (invoke (string-append "bin/" ,program-to-test) + "--version"))))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) -- cgit v1.2.3 From efe3c5717dbb613dae9c99c2618ba326de50677c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 11:43:23 +0200 Subject: guix: copy-linux-headers: Extract procedure, add headers. * guix/build/make-bootstrap.scm (copy-linux-headers): New procedure; extract from make-stripped-libc and add headers for Mes bootstrap. (make-stripped-libc): Use it. --- guix/build/make-bootstrap.scm | 72 +++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 43b136248f..0c7b4ac6fd 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,7 +24,8 @@ #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (guix build utils) - #:export (make-stripped-libc)) + #:export (copy-linux-headers + make-stripped-libc)) ;; Commentary: ;; @@ -31,6 +33,53 @@ ;; ;; Code: +(define (copy-linux-headers output kernel-headers) + "Copy to OUTPUT the subset of KERNEL-HEADERS that is needed when producing a +bootstrap libc." + + (let* ((incdir (string-append output "/include"))) + (mkdir-p incdir) + + ;; Copy some of the Linux-Libre headers that glibc headers + ;; refer to. + (mkdir (string-append incdir "/linux")) + (for-each (lambda (file) + (install-file (pk 'src (string-append kernel-headers "/include/linux/" file)) + (pk 'dest (string-append incdir "/linux")))) + '( + "a.out.h" ; for 2.2.5 + "atalk.h" ; for 2.2.5 + "errno.h" + "falloc.h" + "if_addr.h" ; for 2.16.0 + "if_ether.h" ; for 2.2.5 + "if_link.h" ; for 2.16.0 + "ioctl.h" + "kernel.h" + "limits.h" + "neighbour.h" ; for 2.16.0 + "netlink.h" ; for 2.16.0 + "param.h" + "prctl.h" ; for 2.16.0 + "posix_types.h" + "rtnetlink.h" ; for 2.16.0 + "socket.h" + "stddef.h" + "swab.h" ; for 2.2.5 + "sysctl.h" + "sysinfo.h" ; for 2.2.5 + "types.h" + "version.h" ; for 2.2.5 + )) + + (copy-recursively (string-append kernel-headers "/include/asm") + (string-append incdir "/asm")) + (copy-recursively (string-append kernel-headers "/include/asm-generic") + (string-append incdir "/asm-generic")) + (copy-recursively (string-append kernel-headers "/include/linux/byteorder") + (string-append incdir "/linux/byteorder")) + #t)) + (define (make-stripped-libc output libc kernel-headers) "Copy to OUTPUT the subset of LIBC and KERNEL-HEADERS that is needed when producing a bootstrap libc." @@ -43,25 +92,10 @@ when producing a bootstrap libc." (string-append incdir "/mach")) #t)) - (define (copy-linux-headers output kernel-headers) + (define (copy-libc+linux-headers output kernel-headers) (let* ((incdir (string-append output "/include"))) (copy-recursively (string-append libc "/include") incdir) - - ;; Copy some of the Linux-Libre headers that glibc headers - ;; refer to. - (mkdir (string-append incdir "/linux")) - (for-each (lambda (file) - (install-file (string-append kernel-headers "/include/linux/" file) - (string-append incdir "/linux"))) - '("limits.h" "errno.h" "socket.h" "kernel.h" - "sysctl.h" "param.h" "ioctl.h" "types.h" - "posix_types.h" "stddef.h" "falloc.h")) - - (copy-recursively (string-append kernel-headers "/include/asm") - (string-append incdir "/asm")) - (copy-recursively (string-append kernel-headers "/include/asm-generic") - (string-append incdir "/asm-generic")) - #t)) + (copy-linux-headers output kernel-headers))) (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\ util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\ @@ -80,6 +114,6 @@ _nonshared\\.a)$") (if (directory-exists? (string-append kernel-headers "/include/mach")) (copy-mach-headers output kernel-headers) - (copy-linux-headers output kernel-headers))) + (copy-libc+linux-headers output kernel-headers))) -- cgit v1.2.3 From 990ee3016486c1f1915a35ccea475eec1acde202 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 11:49:04 +0200 Subject: gnu: Add linux-libre-headers-bootstrap-tarball. * gnu/packages/make-bootstrap.scm (%linux-libre-headers-stripped): New variable. (%linux-libre-headers-bootstrap-tarball): New variable. --- gnu/packages/make-bootstrap.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 65d632f64e..6523f36d8d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%bootstrap-binaries-tarball + %linux-libre-headers-bootstrap-tarball %binutils-bootstrap-tarball %glibc-bootstrap-tarball %gcc-bootstrap-tarball @@ -300,6 +302,26 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (license gpl3+) (home-page #f))) +(define %linux-libre-headers-stripped + ;; The subset of Linux-Libre-Headers that we need. + (package (inherit linux-libre-headers) + (name (string-append (package-name linux-libre-headers) "-stripped")) + (build-system trivial-build-system) + (outputs '("out")) + (arguments + `(#:modules ((guix build utils) + (guix build make-bootstrap)) + #:builder + (begin + (use-modules (guix build utils) + (guix build make-bootstrap)) + + (let* ((in (assoc-ref %build-inputs "linux-libre-headers")) + (out (assoc-ref %outputs "out"))) + (copy-linux-headers out in) + #t)))) + (inputs `(("linux-libre-headers" ,linux-libre-headers))))) + (define %binutils-static ;; Statically-linked Binutils. (package (inherit binutils) @@ -658,6 +680,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked bootstrap binaries. (tarball-package %static-binaries)) +(define %linux-libre-headers-bootstrap-tarball + ;; A tarball with the statically-linked Linux-Libre-Headers programs. + (tarball-package %linux-libre-headers-stripped)) + (define %binutils-bootstrap-tarball ;; A tarball with the statically-linked Binutils programs. (tarball-package %binutils-static-stripped)) -- cgit v1.2.3 From aec77e869571347863043fdf09c3aeecd28f3682 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 12:34:21 +0200 Subject: bootstrap: Add Mes bootstrap seeds. * gnu/packages/bootstrap.scm (%mescc-tools-seed, %mes-seed, %tinycc-seed, %srfi-43): New variable. --- gnu/packages/bootstrap.scm | 66 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c8d4e7e85f..19995e629f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -44,10 +44,15 @@ %bootstrap-guile %bootstrap-coreutils&co + %bootstrap-linux-libre-headers %bootstrap-binutils %bootstrap-gcc %bootstrap-glibc - %bootstrap-inputs)) + %bootstrap-inputs + %mescc-tools-seed + %mes-seed + %srfi-43 + %tinycc-seed)) ;;; Commentary: ;;; @@ -393,6 +398,23 @@ $out/bin/guile --version~%" (("^exec grep") (string-append (getcwd) "/bin/grep")))) (chmod "bin" #o555)))) +(define-public %bootstrap-linux-libre-headers + (package-from-tarball + "linux-libre-headers-bootstrap" + (lambda (system) + (origin + (method url-fetch) + (uri (match system + ((or "i686-linux" + "x86_64-linux") + "http://lilypond.org/janneke/mes/linux-libre-headers-stripped-4.14.26-i686-linux.tar.xz") + (_ (error "linux-libre-headers-bootstrap: system not supported")))) + (sha256 + (base32 + "0nwspwydn089xbd28nnas762iwl6l9ymbcz170qvfi50ywgim1ma")))) + #f ; no program to test + "Bootstrap linux-libre-headers")) + (define %bootstrap-binutils (package-from-tarball "binutils-bootstrap" (lambda (system) @@ -588,6 +610,48 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ + (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" + "/-/archive/" commit + "/mescc-tools-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v"))))) + +(define %mes-seed + (let ((commit "bed429ae315c2c57e9dd428a4dcf3f0d332ef064")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mes-seed" + "/-/archive/" commit + "/mes-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0k7iv9djcky18r8lm0zq96xj5nz8v5kg1clf7a2y8r47n6wzww8s"))))) + +(define %tinycc-seed + (let ((commit "f6e7682891ab72ba66e9f5b9401eaed4e4733cfd")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc-seed" + "/-/archive/" commit + "/tinycc-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0hzjd0iyghj4zphwn3ppyclq7k9qqg3xam9fj9hsrr2m0ibvr387"))))) + +(define %srfi-43 + (origin + (method url-fetch) + (uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0") + (file-name "srfi-43.scm") + (sha256 + (base32 + "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) + (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. -- cgit v1.2.3 From 0b652851b187dd0451c221f6dc173afbd7a555f4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 14:52:00 +0200 Subject: bootstrap: Add Mes bootstrap. * gnu/packages/patches/mes-nyacc-0.86.0.patch: Support bootstrap build. * gnu/packages/commencement.scm (%fake-bootstrap mes-boot0, mescc-tools-boot, nyacc-boot, mes-boot, tcc-boot0, tcc-boot, make-mesboot0, diffutils-mesboot, binutils-mesboot0, gcc-core-mesboot, mesboot-headers, glibc-mesboot0, gcc-mesboot0, binutils-mesboot, make-mesboot, gmp-boot, mpfr-boot, mpc-boot, gcc-mesboot1, gcc-mesboot1-wrapper, glibc-headers-mesboot, glibc-mesboot, gcc-mesboot, gcc-mesboot-wrapper, m4-mesboot): New variable. * gnu/packages/patches/binutils-boot-2.20.1a.patch: New file. New file. * gnu/packages/patches/gcc-boot-2.95.3.patch: New file. * gnu/packages/patches/gcc-boot-4.7.4.patch: New file. * gnu/packages/patches/glibc-boot-2.16.0.patch: New file. * gnu/packages/patches/glibc-boot-2.2.5.patch: New file. * gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch: New file. * gnu/packages/patches/tcc-boot-0.9.27.patch: New file. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 6 + gnu/packages/commencement.scm | 1491 ++++++++++++++++++++ gnu/packages/patches/binutils-boot-2.20.1a.patch | 157 +++ gnu/packages/patches/gcc-boot-2.95.3.patch | 137 ++ gnu/packages/patches/gcc-boot-4.7.4.patch | 68 + gnu/packages/patches/glibc-boot-2.16.0.patch | 352 +++++ gnu/packages/patches/glibc-boot-2.2.5.patch | 251 ++++ .../patches/glibc-bootstrap-system-2.16.0.patch | 30 + gnu/packages/patches/mes-nyacc-0.86.0.patch | 28 + gnu/packages/patches/tcc-boot-0.9.27.patch | 26 + 10 files changed, 2546 insertions(+) create mode 100644 gnu/packages/patches/binutils-boot-2.20.1a.patch create mode 100644 gnu/packages/patches/gcc-boot-2.95.3.patch create mode 100644 gnu/packages/patches/gcc-boot-4.7.4.patch create mode 100644 gnu/packages/patches/glibc-boot-2.16.0.patch create mode 100644 gnu/packages/patches/glibc-boot-2.2.5.patch create mode 100644 gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch create mode 100644 gnu/packages/patches/tcc-boot-0.9.27.patch diff --git a/gnu/local.mk b/gnu/local.mk index c10894cb5d..71d8e832fd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -593,6 +593,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ + %D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ @@ -697,6 +698,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-arm-bug-71399.patch \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-asan-missing-include.patch \ + %D%/packages/patches/gcc-boot-2.95.3.patch \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ @@ -745,6 +747,9 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \ %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ %D%/packages/patches/glibc-allow-kernel-2.6.32.patch \ + %D%/packages/patches/glibc-boot-2.16.0.patch \ + %D%/packages/patches/glibc-boot-2.2.5.patch \ + %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \ %D%/packages/patches/glibc-bootstrap-system.patch \ %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ @@ -1155,6 +1160,7 @@ dist_patch_DATA = \ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ + %D%/packages/patches/tcc-boot-0.9.27.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 84d834f5c1..ea4d2de725 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages bootstrap) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) #:use-module (gnu packages code) @@ -40,6 +41,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages multiprecision) #:use-module (gnu packages compression) + #:use-module (gnu packages mes) #:use-module (gnu packages perl) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) @@ -79,7 +81,1496 @@ ;;; ;;; Code: +(define %fake-bootstrap? #t) ; cheat using Guile (instead of Mes) in MesCC + ; for speed-up? + +(define mes-boot0 + (let ((version "0.17.1") + (revision "2") + (commit #f)) + (package + (inherit mes) + (name "mes-boot0") + (version (if commit (string-append version "-" revision "." (string-take commit 7)) + version)) + (source (if commit + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mes" + "/-/archive/" commit + "/mes-" commit ".tar.gz")) + (sha256 + (base32 + "1dfnchrz3fb8x220bz28i6p3ql2xfahk9mzin3vk8lyw45s12r5g"))) + (package-source mes))) + (native-inputs '()) + (propagated-inputs '())))) + +(define mescc-tools-boot + (let ((version "0.4") + (revision "1") + (commit "f02b8f4fda8d0c5c11a1d63a02b2bfdfab55abc5")) + (package-with-bootstrap-guile + (package + (inherit mescc-tools) + (name "mescc-tools-boot") + (version (string-append version "-" revision "." (string-take commit 7))) + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mescc-tools" + "/-/archive/" commit + "/mescc-tools-" commit ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-source" ,(package-source mes-boot0)) + + ("coreutils" ,%bootstrap-coreutils&co) + ("mes-seed" ,%mes-seed))) + (build-system gnu-build-system) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) + (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) + (mes-seed (assoc-ref %build-inputs "mes-seed")) + (mes-source (assoc-ref %build-inputs "mes-source")) + (out (assoc-ref %outputs "out"))) + (with-directory-excursion ".." + (and + (mkdir-p "mescc-tools-seed") + (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" + "-xvf" mescc-tools-seed) + (mkdir-p "mes-source") + (invoke "tar" "--strip=1" "-C" "mes-source" + "-xvf" mes-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" + "-xvf" mes-seed)))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (out (assoc-ref %outputs "out"))) + (setenv "PATH" (string-append coreutils "/bin" + ":" "../mescc-tools-seed")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (setenv "PREFIX" out) + (setenv "MES_PREFIX" "../mes-source") + (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") + (setenv "MES_SEED" "../mes-seed") + #t))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + (invoke "sh" "check.sh"))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh")))))))))) + +(define nyacc-boot + (let ((version "0.86.0") + (revision "0") + (commit #f)) + (package + (inherit nyacc) + (name "nyacc-boot") + (version + (if commit + (string-append version "-" revision "." (string-take commit 7)) + version)) + (source + (if commit + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/nyacc" + "/-/archive/" commit + "/nyacc-" commit ".tar.gz")) + (sha256 + (base32 + "0dlcqmchhl57nh7f0v6qb1kkbi7zbs3b185hcqv57fhb60b7rgcq"))) + (package-source nyacc)))))) + +(define mes-boot + (package-with-bootstrap-guile + (package + (inherit mes) + (source (package-source mes-boot0)) + (name "mes-boot") + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mescc-tools" ,mescc-tools-boot) + ("nyacc-source" ,(package-source nyacc-boot)) + + ("coreutils" , %bootstrap-coreutils&co) + ("mes-seed" ,%mes-seed) + ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile + `(("guile" ,%bootstrap-guile) + ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick + '()))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (srfi-43 (assoc-ref %build-inputs "srfi-43")) + (nyacc-source (assoc-ref %build-inputs "nyacc-source")) + (mes-seed (assoc-ref %build-inputs "mes-seed"))) + (with-directory-excursion ".." + (and + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed) + (or (not srfi-43) + (and (mkdir-p "srfi") + (copy-file srfi-43 "srfi/srfi-43.scm") + #t))))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + (symlink (string-append "../nyacc-source/module") "nyacc") + (setenv "GUILE_LOAD_PATH" "nyacc") + (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile + (invoke "bash" "-x" "configure.sh" + (string-append "--prefix=" out)) + (setenv "MES" "src/mes") + (setenv "MESCC" "scripts/mescc") + (when ,%fake-bootstrap? ; Cheat using Guile+Nyacc+MesCC; ~30 times faster + (let ((dir (with-directory-excursion ".." (getcwd))) + (guile (assoc-ref %build-inputs "guile")) + (srfi-43 (assoc-ref %build-inputs "srfi-43"))) + (setenv "MES" "guile") + (setenv "GUILE_AUTO_COMPILE" "1") + (setenv "GUILE_LOAD_COMPILED_PATH" + (string-append guile "/lib/guile/2.0/ccache")) + (setenv "GUILE_LOAD_PATH" + (string-append (string-append dir "/nyacc-source/module") + ":" dir + ":" guile "/share/guile/2.0/")) + ;; these fail with guile-2.0 + (when srfi-43 + (delete-file "tests/srfi-9.test") + (delete-file "tests/srfi-43.test")) + ;; give auto-compile a home -- massive speed-up + (mkdir-p "/tmp/home") + (setenv "HOME" "/tmp/home"))) + #t))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + (when ,%fake-bootstrap? + ;; breaks with guile-2.0 + (delete-file "scaffold/boot/50-primitive-load.scm") + (delete-file "scaffold/boot/51-module.scm")) + (and + (setenv "MES_ARENA" "100000000") + (setenv "DIFF" "sh scripts/diff.scm") + (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") + (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") + (invoke "sh" "-x" "check.sh")))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh")))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("share/mes/include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("share/mes/lib")))))))) + +(define tcc-boot0 + ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11 + ;; patches. In a very early and rough form they were presented to the + ;; TinyCC developers, who at the time showed no interest in supporting the + ;; bootstrappable effort; we will try again later. These patches have been + ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more + ;; mature, this package should use the 0.9.27 sources (or later). + (let ((version "0.9.26") + (revision "3") + (commit "812e9343e4520ec90934fd7f47134416ad0dce07")) + (package-with-bootstrap-guile + (package + (inherit tcc) + (name "tcc-boot0") + (version (string-append version "-" revision "." (string-take commit 7))) + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc" + "/-/archive/" commit + "/tinycc-" commit ".tar.gz")) + (sha256 + (base32 + "0c68hmi6ryb3bmbmdrr5knhz61li3mlhkmxvji6khgkb199znlqc")))) + (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mes" ,mes-boot) + ("mes-seed" ,%mes-seed) + ("mescc-tools" ,mescc-tools-boot) + ("nyacc-source" ,(package-source nyacc-boot)) + + ("coreutils" , %bootstrap-coreutils&co) + ("tinycc-seed" ,%tinycc-seed) + ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile + `(("guile" ,%bootstrap-guile) + ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick + '()))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) + (srfi-43 (assoc-ref %build-inputs "srfi-43")) + (nyacc-source (assoc-ref %build-inputs "nyacc-source")) + (mes-seed (assoc-ref %build-inputs "mes-seed")) + (tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))) + (setenv "PATH" (string-append + coreutils "/bin")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (with-directory-excursion ".." + (and + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" + "-xvf" nyacc-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" + "-xvf" mes-seed) + (mkdir-p "tinycc-seed") + (invoke "tar" "--strip=1" "-C" "tinycc-seed" + "-xvf" tinycc-seed) + (or (not srfi-43) + (and (mkdir-p "srfi") + (copy-file srfi-43 "srfi/srfi-43.scm") + #t))))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (dir (with-directory-excursion ".." (getcwd))) + (coreutils (assoc-ref %build-inputs "coreutils")) + (guile (assoc-ref %build-inputs "guile")) + (mes (assoc-ref %build-inputs "mes")) + (mescc-tools (assoc-ref %build-inputs "mescc-tools")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter (if libc + (string-append libc ,(glibc-dynamic-linker)) + (string-append mes "/lib/mes-loader")))) + (setenv "PATH" (string-append + coreutils "/bin" + ":" mes "/bin" + (if guile (string-append ":" guile "/bin") + "") + ":" mescc-tools "/bin")) + + (setenv "PREFIX" out) + (setenv "MESCC" (string-append mes "/bin/mescc")) + (symlink (string-append mes "/share/mes") "mes") + (setenv "MES_PREFIX" "mes") + (setenv "OBJDUMP" "true") + (setenv "ONE_SOURCE" "1") + (setenv "PREPROCESS" "1") + (setenv "MES_DEBUG" "1") + (setenv "MES_ARENA" "70000000") + (setenv "MES_MAX_ARENA" "70000000") + + (if ,%fake-bootstrap? + (begin ; Cheat using Guile+Nyacc+MesCC; ~30 times faster + (setenv "MES" "guile") + (setenv "GUILE_AUTO_COMPILE" "1") + (setenv "GUILE_LOAD_COMPILED_PATH" + (string-append guile "/lib/guile/2.0/ccache")) + (setenv "GUILE_LOAD_PATH" + (string-append dir + ":" guile "/share/guile/2.0/" + ":" dir "/nyacc-source/module" + ":" mes "/share/mes/guile")) + + ;; give auto-compile a home -- massive speed-up + (mkdir-p "/tmp/home") + (setenv "HOME" "/tmp/home")) + + (begin ; True bootstrap build with Mes+Nyacc+MesCC + (setenv "MES" "mes") + (setenv "GUILE_LOAD_PATH" "nyacc") + (symlink (string-append "../nyacc-source/module") "nyacc"))) + (invoke "sh" "configure" + "--prefix=$PREFIX" + (string-append "--elfinterp=" interpreter) + "--crtprefix=." + "--tccdir=.")))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + (setenv "DIFF" "diff.scm") + ;; fail fast tests + ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") + ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") + (setenv "TCC" "./tcc") + (invoke "sh" "check.sh"))) + (replace 'install + (lambda _ + (invoke "sh" "install.sh")))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib"))))))))) + +(define tcc-boot + (package-with-bootstrap-guile + (package + (inherit tcc-boot0) + (name "tcc-boot") + (version "0.9.27") + (source (origin + (inherit (package-source tcc)) + (patches (search-patches "tcc-boot-0.9.27.patch")))) + (build-system gnu-build-system) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mes" ,mes-boot) + ("tcc" ,tcc-boot0) + + ("coreutils" , %bootstrap-coreutils&co))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 + ; binaries, tcc-boot also comes with + ; MesCC/M1/hex2-built binaries + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (coreutils (assoc-ref %build-inputs "coreutils")) + (mes (assoc-ref %build-inputs "mes")) + (tcc (assoc-ref %build-inputs "tcc")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter (if libc + (string-append libc ,(glibc-dynamic-linker)) + (string-append mes "/lib/mes-loader")))) + ;; unpack + (setenv "PATH" (string-append + coreutils "/bin" + ":" tcc "/bin")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (invoke "sh" "configure" + (string-append "--cc=tcc") + (string-append "--cpu=i386") + (string-append "--prefix=" out) + (string-append "--elfinterp=" interpreter) + (string-append "--crtprefix=" tcc "/lib") + (string-append "--sysincludepaths=" tcc "/include") + (string-append "--libpaths=" tcc "/lib"))))) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (mes (assoc-ref %build-inputs "mes")) + (tcc (assoc-ref %build-inputs "tcc")) + (libc (assoc-ref %build-inputs "libc")) + (interpreter (if libc + (string-append libc ,(glibc-dynamic-linker)) + (string-append mes "/lib/mes-loader")))) + (invoke "tcc" + "-vvv" + "-D" "BOOTSTRAP=1" + "-D" "ONE_SOURCE=1" + "-D" "TCC_TARGET_I386=1" + "-D" "CONFIG_TCC_STATIC=1" + "-D" "CONFIG_USE_LIBGCC=1" + "-D" (string-append "CONFIG_TCCDIR=\"" out "/lib/tcc\"") + "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_ELFINTERP=\"" interpreter "\"") + "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc "/lib:{B}/lib:.\"") + "-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\"" tcc "/include" ":/include:{B}/include\"") + "-D" (string-append "TCC_LIBGCC=\"" tcc "/lib/libc.a\"") + "-o" "tcc" + "tcc.c")))) + (replace 'check + (lambda _ + ;; FIXME: add sensible check target (without depending on make) + ;; ./check.sh ? + (= 1 (status:exit-val (system* "./tcc" "--help"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out")) + (tcc (assoc-ref %build-inputs "tcc"))) + (and + (mkdir-p (string-append out "/bin")) + (copy-file "tcc" (string-append out "/bin/tcc")) + (mkdir-p (string-append out "/lib/tcc")) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + (copy-recursively (string-append tcc "/lib") + (string-append out "/lib")) + (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) + (delete-file (string-append out "/lib/tcc/libtcc1.a")) + (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) + #t)))))))))) + +(define make-mesboot0 + (package-with-bootstrap-guile + (package + (inherit gnu-make) + (name "make-mesboot0") + (version "3.80") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" + version ".tar.gz")) + (sha256 + (base32 + "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co))) + (arguments + `(#:implicit-inputs? #f + #:tests? #f ; check depends on perl + #:guile ,%bootstrap-guile + #:configure-flags `("CC=tcc -DO_RDONLY=0" + "LD=tcc" + "--disable-nls") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'configure-fixup + (lambda _ + (substitute* "build.sh" + (("^REMOTE=.*") "REMOTE=stub\n") + (("^extras=.*") "extras=getloadavg.c\n")) + (substitute* "make.h" + (("^extern long int lseek.*" all) (string-append "// " all))) + #t)) + (delete 'patch-generated-file-shebangs) ; no perl + (replace 'build + (lambda _ + (invoke "sh" "./build.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "make" bin)))))))))) + +(define diffutils-mesboot + (package-with-bootstrap-guile + (package + (inherit diffutils) + (name "diffutils-mesboot") + (version "2.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/diffutils/diffutils-" + version ".tar.gz")) + (sha256 + (base32 + "1mirn5i825bn5w7rh6mgn0r8aj9xqanav95dwcl1b8sn82f4iwnm")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("mes" ,mes-boot) + ("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("make" ,make-mesboot0))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:parallel-build? #f + #:tests? #f ; check is naive, also checks non-built PROGRAMS + #:strip-binaries? #f ; no strip yet + #:phases + (modify-phases %standard-phases + ;; diffutils-2.7 needs more traditional configure + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "CC" "tcc") + (setenv "LD" "tcc") + (invoke "./configure" (string-append "--prefix=" out))))) + (add-before 'configure 'remove-diff3-sdiff + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.in" + (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")))))))))) + + +(define binutils-mesboot0 + (package-with-bootstrap-guile + (package + (inherit binutils) + (name "binutils-mesboot0") + (version "2.20.1a") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/binutils/binutils-" + version ".tar.bz2")) + (patches (search-patches "binutils-boot-2.20.1a.patch")) + (sha256 + (base32 + "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("make" ,make-mesboot0))) + (supported-systems '("i686-linux" "x86_64-linux")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f ; runtest: command not found + #:parallel-build? #f + #:strip-binaries? #f ; no strip yet + #:configure-flags + (let ((cppflags (string-append " -D __GLIBC_MINOR__=6" + " -D MES_BOOTSTRAP=1")) + (bash (assoc-ref %build-inputs "bash"))) + `(,(string-append "CONFIG_SHELL=" bash "/bin/sh") + ,(string-append "CPPFLAGS=" cppflags) + "AR=tcc -ar" + "CXX=false" + "RANLIB=true" + ,(string-append "CC=tcc" cppflags) + "--disable-nls" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/"))))))) + +(define gcc-core-mesboot + ;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C + ;; Library v0.16 offers. Gcc-3.x (and 4.x) place higher demands on a C + ;; library, such as dir.h/struct DIR/readdir, locales, signals... Also, + ;; with gcc-2.95.3, binutils-boot-2.20.1a and glibc-2.2.5 we found a GNU + ;; toolchain triplet "that works". + (package-with-bootstrap-guile + (package + (inherit gcc) + (name "gcc-core-mesboot") + (version "2.95.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-" + version + ".tar.gz")) + (patches (search-patches "gcc-boot-2.95.3.patch")) + (sha256 + (base32 + "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("binutils" ,binutils-mesboot0) + ("tcc" ,tcc-boot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("make" ,make-mesboot0))) + (outputs '("out")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f + #:parallel-build? #f + #:strip-binaries? #f + #:configure-flags + (let ((out (assoc-ref %outputs "out"))) + `("--enable-static" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + ,(string-append "--prefix=" out))) + #:make-flags (list + "CC=tcc -static -D __GLIBC_MINOR__=6" + "OLDCC=tcc -static -D __GLIBC_MINOR__=6" + "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6" + "AR=ar" + "RANLIB=ranlib" + (string-append "LIBGCC2_INCLUDES=-I " + (assoc-ref %build-inputs "tcc") + "/include") + "LANGUAGES=c" + (string-append "BOOT_LDFLAGS=" + " -B" (assoc-ref %build-inputs "tcc") + "/lib/")) + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + ;; gcc-2.95.3 needs more traditional configure + (add-before 'configure 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (tcc (assoc-ref %build-inputs "tcc")) + (cppflags " -D __GLIBC_MINOR__=6")) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "CPPFLAGS" cppflags) + (setenv "CC" (string-append "tcc" cppflags)) + (setenv "CC_FOR_BUILD" (string-append "tcc" cppflags)) + (setenv "CPP" (string-append "tcc -E" cppflags)) + (with-output-to-file "config.cache" + (lambda _ + (display " +ac_cv_c_float_format='IEEE (little-endian)' +")))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply invoke "./configure" configure-flags))) + (add-after 'configure 'remove-info + (lambda _ + ;; no info at this stage + (delete-file-recursively "texinfo") + (invoke "touch" "gcc/cpp.info" "gcc/gcc.info"))) + (add-after 'install 'install2 + (lambda* (#:key outputs #:allow-other-keys) + (let* ((tcc (assoc-ref %build-inputs "tcc")) + (tcc-lib (string-append tcc "/lib/x86-mes-gcc")) + (out (assoc-ref outputs "out")) + (gcc-dir (string-append + out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) + (and + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) + (copy-file (string-append tcc "/lib/libtcc1.a") + (string-append out "/lib/libtcc1.a")) + (invoke "ar" "r" (string-append gcc-dir "/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ar" "r" (string-append out "/lib/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ls" "-ltrF" gcc-dir) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + #t))))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include" "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib")))))))) + +(define mesboot-headers + (package-with-bootstrap-guile + (package + (inherit mes-boot) + (name "mesboot-headers") + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("coreutils" ,%bootstrap-coreutils&co) + ("headers" ,%bootstrap-linux-libre-headers))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f + #:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include (string-append out "/include")) + (headers (assoc-ref %build-inputs "headers" ))) + (mkdir-p include) + (copy-recursively "include" out) + (copy-recursively headers out) + #t)))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include")))))))) + +(define glibc-mesboot0 + ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build + ;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer + ;; gcc. + (package-with-bootstrap-guile + (package + (inherit glibc) + (name "glibc-mesboot0") + (version "2.2.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" + version + ".tar.gz")) + (patches (search-patches "glibc-boot-2.2.5.patch")) + (sha256 + (base32 + "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) + (supported-systems '("i686-linux" "x86_64-linux")) + (inputs '()) + (propagated-inputs '()) + (native-inputs `(("binutils" ,binutils-mesboot0) + ("gcc" ,gcc-core-mesboot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("headers" ,mesboot-headers) + ("make" ,make-mesboot0))) + (outputs '("out")) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:tests? #f + #:strip-binaries? #f + #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds + #:make-flags (list (string-append + "SHELL=" + (assoc-ref %build-inputs "bash") + "/bin/sh")) + #:configure-flags + (let ((out (assoc-ref %outputs "out")) + (headers (assoc-ref %build-inputs "headers"))) + (list + "--disable-shared" + "--enable-static" + "--disable-sanity-checks" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + (string-append "--with-headers=" headers "/include") + "--enable-static-nss" + "--without-__thread" + "--without-cvs" + "--without-gd" + "--without-tls" + (string-append "--prefix=" out))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (headers (assoc-ref %build-inputs "headers")) + (cppflags (string-append + ;;" -D __STDC__=1" + " -D MES_BOOTSTRAP=1" + " -D BOOTSTRAP_GLIBC=1")) + (cflags (string-append " -L " (getcwd)))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "SHELL" (getenv "CONFIG_SHELL")) + (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) + (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) + #t))) + ;; glibc-2.2.5 needs a more classic invocation of configure + ;; configure: warning: CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash: invalid host type + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format (current-error-port) + "running ./configure ~a\n" (string-join configure-flags)) + (apply invoke "./configure" configure-flags)))))) + (native-search-paths + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib")))))))) + +(define gcc-mesboot0 + (package-with-bootstrap-guile + (package + (inherit gcc-core-mesboot) + (name "gcc-mesboot0") + (native-inputs `(("binutils" ,binutils-mesboot0) + ("gcc" ,gcc-core-mesboot) + ("libc" ,glibc-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot0))) + (arguments + (substitute-keyword-arguments (package-arguments gcc-core-mesboot) + ((#:phases phases) + `(modify-phases ,phases + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" + ":" kernel-headers "/include" + ":" glibc "/include")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + ;; FIXME: add glibc dirs to paths manually + (setenv "LIBRARY_PATH" (string-join + (list (string-append glibc "/lib") + (getenv "LIBRARY_PATH")) + ":")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + (with-output-to-file "config.cache" + (lambda _ + (display " +ac_cv_c_float_format='IEEE (little-endian)' +"))) + #t))) + (replace 'install2 + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gcc-dir (string-append + out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) + (and + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")))))))) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out"))) + `("--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + ,(string-append "--prefix=" out)))) + ((#:make-flags make-flags) + `(let ((gcc (assoc-ref %build-inputs "gcc"))) + `("RANLIB=true" + ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include") + "LANGUAGES=c")))))))) + +(define binutils-mesboot + (package-with-bootstrap-guile + (package + (inherit binutils-mesboot0) + (name "binutils-mesboot") + (native-inputs `(("binutils" ,binutils-mesboot0) + ("libc" ,glibc-mesboot0) + ("gcc" ,gcc-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot0))) + (arguments + (substitute-keyword-arguments (package-arguments binutils-mesboot0) + ((#:configure-flags configure-flags) + '(list "--disable-nls" + "--disable-shared" + "--disable-werror" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/"))))))) + +(define make-mesboot + (package-with-bootstrap-guile + (package + (inherit make-mesboot0) + (name "make-mesboot") + (version "3.82") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/make/make-" + version ".tar.gz")) + (sha256 + (base32 + "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x")))) + (native-inputs `(("binutils" ,binutils-mesboot0) + ("libc" ,glibc-mesboot0) + ("gcc" ,gcc-mesboot0) + ("make" ,make-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("kernel-headers" ,%bootstrap-linux-libre-headers))) + (arguments + (substitute-keyword-arguments (package-arguments make-mesboot0) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out"))) + `(,(string-append "--prefix=" out)))) + ((#:phases phases) + `(modify-phases ,phases + (delete 'configure-fixup) + (add-before 'configure 'setenv + (lambda _ + (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") + #t))))))))) + +(define gmp-boot + (package + (inherit gmp) + (version "4.3.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gmp/gmp-" version + ".tar.gz")) + (sha256 (base32 + "15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv")))))) + +(define mpfr-boot + (package + (inherit mpfr) + (version "2.4.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mpfr/mpfr-" version + ".tar.gz")) + (sha256 (base32 + "0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94")))))) + +(define mpc-boot + (package + (inherit mpc) + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://gnu/mpc/mpc-" version ".tar.gz")) + (sha256 + (base32 + "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1")))))) + +(define gcc-mesboot1 + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot0) + (name "gcc-mesboot1") + (version "4.7.4") + (source (origin (inherit (package-source gcc-4.7)) + (patches (search-patches "gcc-boot-4.7.4.patch")))) + (inputs `(("gmp-source" ,(package-source gmp-boot)) + ("mpfr-source" ,(package-source mpfr-boot)) + ("mpc-source" ,(package-source mpc-boot)))) + (native-inputs `(("binutils" ,binutils-mesboot) + ("gcc" ,gcc-mesboot0) + ("libc" ,glibc-mesboot0) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + (arguments + (substitute-keyword-arguments (package-arguments gcc-core-mesboot) + ((#:make-flags make-flags) + `(let* ((libc (assoc-ref %build-inputs "libc")) + (ldflags (string-append + "-B" libc "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc + ,(glibc-dynamic-linker)))) + (list (string-append "LDFLAGS=" ldflags) + (string-append "LDFLAGS_FOR_TARGET=" ldflags)))) + ((#:phases phases) + `(modify-phases ,phases + ;; c&p from commencement.scm:gcc-boot0 + (add-after 'unpack 'unpack-gmp&co + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref %build-inputs "gmp-source")) + (mpfr (assoc-ref %build-inputs "mpfr-source")) + (mpc (assoc-ref %build-inputs "mpc-source"))) + + ;; To reduce the set of pre-built bootstrap inputs, build + ;; GMP & co. from GCC. + (for-each (lambda (source) + (or (invoke "tar" "xvf" source) + (error "failed to unpack tarball" + source))) + (list gmp mpfr mpc)) + + ;; Create symlinks like `gmp' -> `gmp-x.y.z'. + ,@(map (lambda (lib) + ;; Drop trailing letters, as gmp-6.0.0a unpacks + ;; into gmp-6.0.0. + `(symlink ,(string-trim-right + (package-full-name lib "-") + char-set:letter) + ,(package-name lib))) + (list gmp-boot mpfr-boot mpc-boot)) + #t))) + (delete 'remove-info) + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (binutils (assoc-ref %build-inputs "binutils")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "LIBRARY_PATH" (string-append glibc "/lib" + ":" gcc "/lib")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + #t))) + (delete 'install2))) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out")) + (glibc (assoc-ref %build-inputs "libc"))) + (list (string-append "--prefix=" out) + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + + (string-append "--with-native-system-header-dir=" glibc "/include") + (string-append "--with-build-sysroot=" glibc "/include") + + "--disable-bootstrap" + "--disable-decimal-float" + "--disable-libatomic" + "--disable-libcilkrts" + "--disable-libgomp" + "--disable-libitm" + "--disable-libmudflap" + "--disable-libquadmath" + "--disable-libsanitizer" + "--disable-libssp" + "--disable-libvtv" + "--disable-lto" + "--disable-lto-plugin" + "--disable-multilib" + "--disable-plugin" + "--disable-threads" + "--enable-languages=c,c++" + + "--enable-static" + ;; libstdc++.so: error: depends on 'libgcc_s.so.1', which cannot be found in RUNPATH () + "--disable-shared" + "--enable-threads=single" + + ;; No pre-compiled libstdc++ headers, to save space. + "--disable-libstdcxx-pch" + + ;; for libcpp ... + "--disable-build-with-cxx")))))))) + +(define gcc-mesboot1-wrapper + ;; We need this so gcc-mesboot1 can be used to create shared binaries that + ;; have the correct interpreter, otherwise configuring gcc-mesboot using + ;; --enable-shared will fail. + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot1) + (name "gcc-mesboot1-wrapper") + (source #f) + (inputs '()) + (native-inputs `(("bash" ,%bootstrap-coreutils&co) + ("libc" ,glibc-mesboot) + ("gcc" ,gcc-mesboot1))) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:phases + (modify-phases %standard-phases + (delete 'unpack) + (delete 'configure) + (delete 'install) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (libc (assoc-ref %build-inputs "libc")) + (gcc (assoc-ref %build-inputs "gcc")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (for-each + (lambda (program) + (let ((wrapper (string-append bin "/" program))) + (with-output-to-file wrapper + (lambda _ + (display (string-append "#! " bash "/bin/bash +exec " gcc "/bin/" program +" -Wl,--dynamic-linker" +" -Wl," libc ,(glibc-dynamic-linker) +" -Wl,--rpath" +" -Wl," libc "/lib" +" \"$@\" +")) + (chmod wrapper #o555))))) + '( + "gcc" + "g++" + "i686-unknown-linux-gnu-gcc" + "i686-unknown-linux-gnu-g++" + )) + #t))) + (replace 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (program (string-append bin "/gcc"))) + (invoke program "--help")))))))))) + +(define glibc-headers-mesboot + (package-with-bootstrap-guile + (package + (inherit glibc-mesboot0) + (name "glibc-headers-mesboot") + (version "2.16.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" + version + ".tar.gz")) + (patches (search-patches "glibc-boot-2.16.0.patch" + "glibc-bootstrap-system-2.16.0.patch")) + (sha256 + (base32 + "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7")))) + (native-inputs `(("binutils" ,binutils-mesboot) + ("libc" ,glibc-mesboot0) + ("gcc" ,gcc-mesboot1) + ("headers" ,mesboot-headers) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + + (arguments + (substitute-keyword-arguments (package-arguments glibc-mesboot0) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out")) + (headers (assoc-ref %build-inputs "headers"))) + (list + (string-append "--prefix=" out) + "--disable-obsolete-rpc" + "--host=i686-unknown-linux-gnu" + (string-append "--with-headers=" headers "/include") + "--enable-static-nss" + "--with-pthread" + "--without-cvs" + "--without-gd" + "--enable-add-ons=nptl"))) + ((#:make-flags make-flags) + `(let ((bash (assoc-ref %build-inputs "bash"))) + (list (string-append "SHELL=" bash "/bin/sh") + "install-bootstrap-headers=yes" "install-headers"))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (headers (assoc-ref %build-inputs "headers")) + (bash (assoc-ref %build-inputs "bash")) + (coreutils (assoc-ref %build-inputs "coreutils")) + (libc (assoc-ref %build-inputs "libc")) + (gcc (assoc-ref %build-inputs "gcc")) + (cppflags (string-append + " -I " (getcwd) "/nptl/sysdeps/pthread/bits" + " -D BOOTSTRAP_GLIBC=1")) + (cflags (string-append " -L " (getcwd) + " -L " libc "/lib"))) + (setenv "libc_cv_friendly_stddef" "yes") + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "SHELL" (getenv "CONFIG_SHELL")) + (format (current-error-port) "CONFIG_SHELL=~s\n" (getenv "CONFIG_SHELL")) + + (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags)) + (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) + + ;; avoid -fstack-protector + (setenv "libc_cv_ssp" "false") + (substitute* "configure" + (("/bin/pwd") (string-append coreutils "/bin/pwd"))) + (setenv "C_INCLUDE_PATH" (string-append libc "/include" + headers "/include")) + (setenv "LIBRARY_PATH" (string-append libc "/lib"))))) + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) + (out (assoc-ref outputs "out"))) + (and (apply invoke "make" make-flags) + (copy-recursively kernel-headers out) + #t)))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (format (current-error-port) "running ../configure ~a\n" (string-join configure-flags)) + (mkdir-p "build") + (chdir "build") + (apply invoke "../configure" configure-flags))) + (add-after 'configure 'remove-sunrpc + (lambda _ + (invoke "make" (string-append (getcwd) "/sysd-sorted" ) + (string-append "SHELL=" (getenv "CONFIG_SHELL"))) + (substitute* "sysd-sorted" + ((" sunrpc") " ") + ((" nis") " ")) + ;; 'rpcgen' needs native libc headers to be built. + (substitute* "../Makefile" + (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))) + (substitute* "../Makeconfig" + (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))) + (substitute* "../elf/Makefile" + (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL"))))))))))))) + +(define glibc-mesboot + (package-with-bootstrap-guile + (package + (inherit glibc-headers-mesboot) + (name "glibc-mesboot") + (native-inputs `(("binutils" ,binutils-mesboot) + ("libc" ,glibc-mesboot0) + ("headers" ,glibc-headers-mesboot) + ("gcc" ,gcc-mesboot1) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + + (arguments + `(#:validate-runpath? #f ; fails when using --enable-shared + ,@(substitute-keyword-arguments (package-arguments glibc-headers-mesboot) + ((#:make-flags make-flags) + `(let ((bash (assoc-ref %build-inputs "bash"))) + (list (string-append "SHELL=" bash "/bin/sh")))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) + (out (assoc-ref outputs "out")) + (install-flags (cons "install" make-flags))) + (and (apply invoke "make" install-flags) + (copy-recursively kernel-headers out) + #t))))))))) + (native-search-paths ;; FIXME: move to glibc-mesboot0 + ;; Use the language-specific variables rather than 'CPATH' because they + ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. + ;; The intent is to allow headers that are in the search path to be + ;; treated as "system headers" (headers exempt from warnings) just like + ;; the typical /usr/include headers on an FHS system. + (list (search-path-specification + (variable "C_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib")))))))) + +(define gcc-mesboot + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot1) + (name "gcc-mesboot") + (version "4.9.4") + (source (package-source gcc-4.9)) + (native-inputs `(("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot1-wrapper) + ("gcc" ,gcc-mesboot1) + ("libc" ,glibc-mesboot) + + ("bash" ,%bootstrap-coreutils&co) + ("coreutils" ,%bootstrap-coreutils&co) + ("diffutils" ,diffutils-mesboot) + ("kernel-headers" ,%bootstrap-linux-libre-headers) + ("make" ,make-mesboot))) + (arguments + `(#:validate-runpath? #f + ,@(substitute-keyword-arguments (package-arguments gcc-mesboot1) + ((#:configure-flags configure-flags) + `(let ((out (assoc-ref %outputs "out")) + (glibc (assoc-ref %build-inputs "libc"))) + (list (string-append "--prefix=" out) + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + + "--with-host-libstdcxx=-lsupc++" + + (string-append "--with-native-system-header-dir=" glibc "/include") + (string-append "--with-build-sysroot=" glibc "/include") + + "--disable-bootstrap" + "--disable-decimal-float" + "--disable-libatomic" + "--disable-libcilkrts" + "--disable-libgomp" + "--disable-libitm" + "--disable-libmudflap" + "--disable-libquadmath" + "--disable-libsanitizer" + "--disable-libssp" + "--disable-libvtv" + "--disable-lto" + "--disable-lto-plugin" + "--disable-multilib" + "--disable-plugin" + "--disable-threads" + "--enable-languages=c,c++" + + "--enable-static" + "--enable-shared" + "--enable-threads=single" + + ;; No pre-compiled libstdc++ headers, to save space. + "--disable-libstdcxx-pch" + + ;; for libcpp ... + "--disable-build-with-cxx"))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (binutils (assoc-ref %build-inputs "binutils")) + (bash (assoc-ref %build-inputs "bash")) + (gcc (assoc-ref %build-inputs "gcc")) + (glibc (assoc-ref %build-inputs "libc")) + (kernel-headers (assoc-ref %build-inputs "kernel-headers"))) + (setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) + (setenv "C_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "CPLUS_INCLUDE_PATH" (string-append + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include" + ":" kernel-headers "/include" + ":" glibc "/include" + ":" (getcwd) "/mpfr/src")) + (setenv "LIBRARY_PATH" (string-append glibc "/lib" + ":" gcc "/lib")) + (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) + (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH")) + (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) + #t))))))))))) + +(define gcc-mesboot-wrapper + ;; We need this so gcc-mesboot can be used to create shared binaries that + ;; have the correct interpreter and runpath to libc. + (package-with-bootstrap-guile + (package + (inherit gcc-mesboot1-wrapper) + (name "gcc-mesboot-wrapper") + (source #f) + (inputs '()) + (native-inputs `(("bash" ,%bootstrap-coreutils&co) + ("libc" ,glibc-mesboot) + ("gcc" ,gcc-mesboot)))))) + +(define m4-mesboot + (package-with-bootstrap-guile + (package + (inherit m4) + (name "m4-mesboot") + (version "1.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/m4/m4-" + version ".tar.gz")) + (sha256 + (base32 + "1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw")))) + (supported-systems '("i686-linux")) + (native-inputs `(("mes" ,mes-boot) + ("tcc" ,tcc-boot))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (string-append + (assoc-ref %build-inputs "bash") + "/bin/sh")) + (setenv "CC" "tcc -static") + (setenv "CPP" "tcc -E") + (invoke "./configure" (string-append "--prefix=" out))))))))))) + (define (%bootstrap-inputs+toolchain) + ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed + ;; the actual reduced set with bootstrapped toolchain. (%bootstrap-inputs)) (define gnu-make-boot0 diff --git a/gnu/packages/patches/binutils-boot-2.20.1a.patch b/gnu/packages/patches/binutils-boot-2.20.1a.patch new file mode 100644 index 0000000000..7e5762ceb4 --- /dev/null +++ b/gnu/packages/patches/binutils-boot-2.20.1a.patch @@ -0,0 +1,157 @@ +This patch enables building binutils using TCC and Mes C Library + + * disable building DOC + * remove signed int trickery that does not work with TCC + * fixe the malloc prototype to use size_t + * add missing includes + * remove C99'isms to avoid of mixing code and variable declaration + * [MES_BOOTSTRAP]: remove strncmp to avoid duplicat symbol + +Upstream status: Not presented upstream. + +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/bfd/elf32-i386.c binutils-2.20.1a/bfd/elf32-i386.c +--- ../binutils-2.20.1a/bfd/elf32-i386.c 2009-09-10 13:47:12.000000000 +0200 ++++ binutils-2.20.1a/bfd/elf32-i386.c 2018-06-23 19:33:20.068134411 +0200 +@@ -4254,6 +4254,7 @@ elf_i386_finish_dynamic_symbol (bfd *out + if (!h->pointer_equality_needed) + abort (); + ++ { + /* For non-shared object, we can't use .got.plt, which + contains the real function addres if we need pointer + equality. We load the GOT entry with the PLT entry. */ +@@ -4262,6 +4263,7 @@ elf_i386_finish_dynamic_symbol (bfd *out + (plt->output_section->vma + + plt->output_offset + h->plt.offset), + htab->elf.sgot->contents + h->got.offset); ++ } + return TRUE; + } + } +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/bfd/elfcode.h binutils-2.20.1a/bfd/elfcode.h +--- ../binutils-2.20.1a/bfd/elfcode.h 2009-09-10 13:47:12.000000000 +0200 ++++ binutils-2.20.1a/bfd/elfcode.h 2018-06-19 19:07:16.647627075 +0200 +@@ -73,6 +73,7 @@ + #include "bfdlink.h" + #include "libbfd.h" + #include "elf-bfd.h" ++#include + + /* Renaming structures, typedefs, macros and functions to be size-specific. */ + #define Elf_External_Ehdr NAME(Elf,External_Ehdr) +@@ -706,8 +707,8 @@ elf_object_p (bfd *abfd) + if (i_ehdrp->e_shnum != 1) + { + /* Check that we don't have a totally silly number of sections. */ +- if (i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (x_shdr) +- || i_ehdrp->e_shnum > (unsigned int) -1 / sizeof (i_shdr)) ++ if (i_ehdrp->e_shnum > INT_MAX / sizeof (x_shdr) ++ || i_ehdrp->e_shnum > INT_MAX / sizeof (i_shdr)) + goto got_wrong_format_error; + + where += (i_ehdrp->e_shnum - 1) * sizeof (x_shdr); +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/bfd/Makefile.in binutils-2.20.1a/bfd/Makefile.in +--- ../binutils-2.20.1a/bfd/Makefile.in 2010-03-03 14:59:15.000000000 +0100 ++++ binutils-2.20.1a/bfd/Makefile.in 2018-06-16 14:00:46.297724081 +0200 +@@ -320,7 +320,7 @@ ACLOCAL_AMFLAGS = -I . -I .. -I ../confi + # RELEASE=y + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) +-SUBDIRS = doc po ++SUBDIRS = # these fail to build: doc po + bfddocdir = doc + libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ + @SHARED_LDFLAGS@ $(am__empty) +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/binutils/arparse.c binutils-2.20.1a/binutils/arparse.c +--- ../binutils-2.20.1a/binutils/arparse.c 2009-10-16 13:52:16.000000000 +0200 ++++ binutils-2.20.1a/binutils/arparse.c 2018-06-19 01:30:00.576219981 +0200 +@@ -330,7 +330,7 @@ YYID (i) + # define YYMALLOC malloc + # if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++void *malloc (size_t); /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/binutils/dwarf.c binutils-2.20.1a/binutils/dwarf.c +--- ../binutils-2.20.1a/binutils/dwarf.c 2009-09-14 13:43:26.000000000 +0200 ++++ binutils-2.20.1a/binutils/dwarf.c 2018-06-16 14:01:45.162684662 +0200 +@@ -27,6 +27,10 @@ + #include "dwarf2.h" + #include "dwarf.h" + ++#if MES_BOOTSTRAP ++#include "getopt.h" ++#endif ++ + static int have_frame_base; + static int need_base_address; + +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/binutils/sysinfo.c binutils-2.20.1a/binutils/sysinfo.c +--- ../binutils-2.20.1a/binutils/sysinfo.c 2009-10-16 13:52:17.000000000 +0200 ++++ binutils-2.20.1a/binutils/sysinfo.c 2018-06-19 01:29:23.823612807 +0200 +@@ -286,7 +286,7 @@ YYID (i) + # define YYMALLOC malloc + # if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++void *malloc (size_t); /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/gas/config/tc-i386.c binutils-2.20.1a/gas/config/tc-i386.c +--- ../binutils-2.20.1a/gas/config/tc-i386.c 2009-09-14 13:43:27.000000000 +0200 ++++ binutils-2.20.1a/gas/config/tc-i386.c 2018-06-23 19:39:37.546254752 +0200 +@@ -4869,6 +4869,7 @@ build_modrm_byte (void) + if (vex_3_sources) + { + unsigned int nds, reg; ++ expressionS *exp; + + if (i.tm.opcode_modifier.veximmext + && i.tm.opcode_modifier.immext) +@@ -4892,7 +4893,7 @@ build_modrm_byte (void) + + /* Generate an 8bit immediate operand to encode the register + operand. */ +- expressionS *exp = &im_expressions[i.imm_operands++]; ++ exp = &im_expressions[i.imm_operands++]; + i.op[i.operands].imms = exp; + i.types[i.operands] = imm8; + i.operands++; +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/ld/ldgram.c binutils-2.20.1a/ld/ldgram.c +--- ../binutils-2.20.1a/ld/ldgram.c 2009-10-16 13:52:15.000000000 +0200 ++++ binutils-2.20.1a/ld/ldgram.c 2018-06-19 01:30:57.809165437 +0200 +@@ -561,7 +561,7 @@ YYID (i) + # define YYMALLOC malloc + # if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++void *malloc (size_t); /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE +diff -purN -x config.status -x config.h -x BOOT ../binutils-2.20.1a/libiberty/strncmp.c binutils-2.20.1a/libiberty/strncmp.c +--- ../binutils-2.20.1a/libiberty/strncmp.c 2005-03-28 04:09:01.000000000 +0200 ++++ binutils-2.20.1a/libiberty/strncmp.c 2018-06-23 19:19:50.038992482 +0200 +@@ -15,6 +15,13 @@ Compares the first @var{n} bytes of two + #include + #include + ++#if !MES_BOOTSTRAP ++ ++/* ++ libtool: link: /gnu/store/rgwjixk5zl7s2d3xsb2ws2z2q3m0xjm4-tcc-boot-0.9.26-0.97196ce/bin/tcc -D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1 -g -o size size.o bucomm.o version.o filemode.o ../bfd/.libs/libbfd.a ../libiberty/libiberty.a ./../intl/libintl.a ++ /gnu/store/rgwjixk5zl7s2d3xsb2ws2z2q3m0xjm4-tcc-boot-0.9.26-0.97196ce/lib/libc.a: error: 'strncmp' defined twice ++*/ ++ + int + strncmp(const char *s1, const char *s2, register size_t n) + { +@@ -31,3 +38,5 @@ strncmp(const char *s1, const char *s2, + } + return 0; + } ++ ++#endif // !MES_BOOTSTRAP diff --git a/gnu/packages/patches/gcc-boot-2.95.3.patch b/gnu/packages/patches/gcc-boot-2.95.3.patch new file mode 100644 index 0000000000..fd167ae052 --- /dev/null +++ b/gnu/packages/patches/gcc-boot-2.95.3.patch @@ -0,0 +1,137 @@ +This patch enables building gcc-2.95.3 using TCC and Mes C Library. + + * Disable building DOC + * Avoid running `fixproto'. + * Force running `fixinc'. + * Replace Makefile trickery of creating an libgcc1.a archive, then + extracting the .o files later to create a new libgcc2.a archive. + Instead, keep temporary .o files. + +Upstream status: Not presented upstream. + +diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/Makefile.in gcc-2.95.3/gcc/Makefile.in +--- ../gcc-2.95.3/gcc/Makefile.in 2001-01-25 15:02:58.000000000 +0100 ++++ gcc-2.95.3/gcc/Makefile.in 2018-06-23 11:46:03.525159181 +0200 +@@ -221,7 +221,7 @@ RANLIB_TEST_FOR_TARGET = \ + SYSTEM_HEADER_DIR = /usr/include + + # Control whether to run fixproto. +-STMP_FIXPROTO = stmp-fixproto ++# STMP_FIXPROTO = stmp-fixproto + + # Test to see whether exists in the system header files. + LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] +@@ -958,6 +958,7 @@ libgcc1.cross: + # fragments. + libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1FUNCS_EXTRA) config.status + -rm -f tmplibgcc1.a ++ mkdir -p libgcc1-o + # Actually build it in tmplibgcc1.a, then rename at end, + # so that libgcc1.a itself remains nonexistent if compilation is aborted. + # -e causes any failing command to make this rule fail. +@@ -974,6 +975,7 @@ libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1F + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + mv libgcc1$(objext) $${name}$(objext); \ + $(OLDAR) $(OLDAR_FLAGS) tmplibgcc1.a $${name}$(objext); \ ++ mv $${name}$(objext) libgcc1-o; \ + rm -f $${name}$(objext); \ + done + # Some shells crash when a loop has no items. +@@ -994,6 +996,7 @@ libgcc1.a: libgcc1.c $(CONFIG_H) $(LIB1F + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + $(OLDAR) $(OLDAR_FLAGS) tmplibgcc1.a $${name}$(objext); \ + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ ++ mv $${name}$(objext) libgcc1-o; \ + rm -f $${name}.s $${name}$(objext); \ + else true; \ + fi; \ +@@ -1024,6 +1027,7 @@ libgcc1-asm.a: libgcc2.ready config.stat + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + mv libgcc1$(objext) $${name}$(objext); \ + $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) tmplibgcc1.a $${name}$(objext); \ ++ mv $${name}$(objext) libgcc1-o; \ + rm -f $${name}$(objext); \ + done + -rm -f libgcc1.S +@@ -1062,6 +1066,7 @@ libgcc2.a: libgcc2.c libgcc2.ready $(CON + # Actually build it in tmplibgcc2.a, then rename at end, + # so that libgcc2.a itself remains nonexistent if compilation is aborted. + -rm -f tmplibgcc2.a ++ mkdir -p libgcc2-o + # -e causes any failing command to make this rule fail. + # -e doesn't work in certain shells, so we test $$? as well. + # lynx has a broken ar, it always complains when the initial library is +@@ -1139,6 +1144,7 @@ libgcc2.a: libgcc2.c libgcc2.ready $(CON + $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) -c $${file}; \ + if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) tmplibgcc2.a $${oname}$(objext); \ ++ mv $${oname}$(objext) libgcc2-o;\ + rm -f $${name}.s $${oname}$(objext); \ + fi; \ + done +@@ -1156,7 +1162,7 @@ libgcc.a: $(LIBGCC1) $(LIBGCC2) + -rm -rf tmplibgcc.a libgcc.a tmpcopy + mkdir tmpcopy + -if [ x$(LIBGCC1) != x ]; \ +- then (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC1)); \ ++ then cp -v libgcc1-o/*.o tmpcopy; \ + else true; \ + fi + # Some versions of ar (specifically the one in RISC/os 5.x), create an +@@ -1164,7 +1170,7 @@ libgcc.a: $(LIBGCC1) $(LIBGCC2) + # the second ar command tries to overwrite this file. To avoid the error + # message from ar, we make sure all files are writable. + -(cd tmpcopy; chmod +w * > /dev/null 2>&1) +- (cd tmpcopy; $(AR_FOR_TARGET) x ../$(LIBGCC2)) ++ cp -v libgcc2-o/*.o tmpcopy + (cd tmpcopy; $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) ../tmplibgcc.a *$(objext)) + rm -rf tmpcopy + -if $(RANLIB_TEST_FOR_TARGET) ; then \ +@@ -2093,14 +2099,18 @@ gcov$(exeext): $(GCOV_OBJS) $(LIBDEPS) + # s-* so that mostlyclean does not force the include directory to + # be rebuilt. + ++# STMP_FIXINC = @STMP_FIXINC@ ++STMP_FIXINC = stmp-fixinc ++ + # Build the include directory including float.h (which no longer depends upon + # enquire). +-stmp-int-hdrs: stmp-fixinc $(USER_H) xlimits.h ++stmp-int-hdrs: $(STMP_FIXINC) $(USER_H) xlimits.h + # Copy in the headers provided with gcc. + # The sed command gets just the last file name component; + # this is necessary because VPATH could add a dirname. + # Using basename would be simpler, but some systems don't have it. + # The touch command is here to workaround an AIX/Linux NFS bug. ++ -if [ -d include ] ; then true; else mkdir include; chmod a+rx include; fi + for file in .. $(USER_H); do \ + if [ X$$file != X.. ]; then \ + realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ +@@ -2265,16 +2275,17 @@ stmp-fixproto: fixhdr.ready fixproto stm + # + # Remake the info files. + +-doc: info +-info: cpp.info gcc.info lang.info +- +-cpp.info: $(srcdir)/cpp.texi +- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o cpp.info $(srcdir)/cpp.texi +- +-gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \ +- $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \ +- $(srcdir)/tm.texi $(srcdir)/gcov.texi +- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o gcc.info $(srcdir)/gcc.texi ++doc: ++# doc: info ++# info: cpp.info gcc.info lang.info ++ ++# cpp.info: $(srcdir)/cpp.texi ++# $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o cpp.info $(srcdir)/cpp.texi ++ ++# gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \ ++# $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \ ++# $(srcdir)/tm.texi $(srcdir)/gcov.texi ++# $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o gcc.info $(srcdir)/gcc.texi + + dvi: gcc.dvi cpp.dvi lang.dvi + diff --git a/gnu/packages/patches/gcc-boot-4.7.4.patch b/gnu/packages/patches/gcc-boot-4.7.4.patch new file mode 100644 index 0000000000..3e51e31fdf --- /dev/null +++ b/gnu/packages/patches/gcc-boot-4.7.4.patch @@ -0,0 +1,68 @@ +This patch enables building gcc-4.7.4 using gcc-2.95.3 and glibc-2.2.5 + + * Tweak Makefile to allow overriding NATIVE_SYSTEM_HEADER_DIR using #:makeflags + * Add missing limits.h include. + * Add SSIZE_MAX define. The SSIZE_MAX define has been added to Mes + upstream and can be removed with the next Mes release. + * Remove -fbuilding-libgcc flag, it assumes features being present from a + newer gcc or glibc. + * [MES_BOOTSTRAP_GCC]: Disable threads harder. + +Upstream status: not presented upstream. + +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index f3cc49fdb18..bc5718fc9a6 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -458,7 +458,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h + LTO_SYMTAB_H = $(srcdir)/../include/lto-symtab.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +-NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ ++# NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@ + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c +index 94b7a0b89a7..ab2baab55ca 100644 +--- a/gcc/config/host-linux.c ++++ b/gcc/config/host-linux.c +@@ -23,6 +23,12 @@ + #include "hosthooks.h" + #include "hosthooks-def.h" + ++// ../.././gcc/config/host-linux.c:213: `SSIZE_MAX' undeclared (first ++// use in this function) ++#include ++#ifndef SSIZE_MAX ++# define SSIZE_MAX LONG_MAX ++#endif + + /* Linux has a feature called exec-shield-randomize that perturbs the + address of non-fixed mapped segments by a (relatively) small amount. +diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in +index c301ff03cae..f86318c3bd5 100644 +--- a/libgcc/Makefile.in ++++ b/libgcc/Makefile.in +@@ -225,7 +225,7 @@ endif + LIBGCC2_DEBUG_CFLAGS = -g + LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \ + $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \ +- -fbuilding-libgcc -fno-stack-protector \ ++ -fno-stack-protector \ + $(INHIBIT_LIBC_CFLAGS) + + # Additional options to use when compiling libgcc2.a. +diff --git a/libgcc/generic-morestack-thread.c b/libgcc/generic-morestack-thread.c +index bbe6dd12b5a..1d1d48223d7 100644 +--- a/libgcc/generic-morestack-thread.c ++++ b/libgcc/generic-morestack-thread.c +@@ -35,7 +35,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + will want to define inhibit_libc while building a compiler which + can build glibc. */ + +-#ifndef inhibit_libc ++#if 0 //!defined (inhibit_libc) && !MES_BOOTSTRAP_GCC + + #include + #include diff --git a/gnu/packages/patches/glibc-boot-2.16.0.patch b/gnu/packages/patches/glibc-boot-2.16.0.patch new file mode 100644 index 0000000000..5cb29bc271 --- /dev/null +++ b/gnu/packages/patches/glibc-boot-2.16.0.patch @@ -0,0 +1,352 @@ +This patch enables building glibc-2.2.5 using TCC and GNU Make 4.x and Mes C Library. + + * Makefile: Do not link with (non-existent) libgc_eh. + * Makefile: Add SHELL variable, ready for substitution, export it. + * Makefile: Do not build or assume librpc_compat_pic. + * Makefile: Do not build libmesusage. + * gen-as-const: Always add preamble. + * [BOOTSTRAP_GLIBC]: Really disable rpc. + +Upstream status: Not presented upstream. + +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/elf/Makefile glibc-2.16.0/elf/Makefile +--- /home/janneke/src/glibc-2.16.0/elf/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/elf/Makefile 2018-09-02 12:54:44.616962543 +0200 +@@ -17,6 +17,8 @@ + + # Makefile for elf subdirectory of GNU C Library. + ++SHELL := /bin/sh ++ + subdir := elf + + headers = elf.h bits/elfclass.h link.h bits/link.h +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/include/libc-symbols.h glibc-2.16.0/include/libc-symbols.h +--- /home/janneke/src/glibc-2.16.0/include/libc-symbols.h 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/include/libc-symbols.h 2018-09-02 22:41:00.798467803 +0200 +@@ -558,9 +558,9 @@ for linking") + # define libc_hidden_weak(name) hidden_weak (name) + # ifdef LINK_OBSOLETE_RPC + /* libc_hidden_nolink_sunrpc should only get used in sunrpc code. */ +-# define libc_hidden_nolink_sunrpc(name, version) hidden_def (name) ++# define libc_hidden_nolink_sunrpc(name, version) + # else +-# define libc_hidden_nolink_sunrpc(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink_sunrpc(name, version) + # endif + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makeconfig glibc-2.16.0/Makeconfig +--- /home/janneke/src/glibc-2.16.0/Makeconfig 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Makeconfig 2018-09-03 00:00:25.290357414 +0200 +@@ -23,6 +23,9 @@ ifneq (,) + This makefile requires GNU Make. + endif + ++SHELL := /bin/sh ++export SHELL ++ + all: # Make this the default goal + + ifneq "$(origin +included-Makeconfig)" "file" +@@ -521,9 +524,9 @@ ifneq ($(have-cc-with-libunwind),yes) + else + libunwind = -lunwind + endif +-libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed ++libgcc_eh := #-Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed + gnulib := -lgcc $(libgcc_eh) +-static-gnulib := -lgcc -lgcc_eh $(libunwind) ++static-gnulib := -lgcc $(libunwind) + libc.so-gnulib := -lgcc + endif + +preinit = $(addprefix $(csu-objpfx),crti.o) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makefile glibc-2.16.0/Makefile +--- /home/janneke/src/glibc-2.16.0/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Makefile 2018-09-02 23:01:10.485803965 +0200 +@@ -22,6 +22,9 @@ ifneq (,) + This makefile requires GNU Make. + endif + ++SHELL := /bin/sh ++export SHELL ++ + include Makeconfig + + +@@ -135,13 +138,10 @@ $(common-objpfx)linkobj/libc.so: $(elfob + $(shlib-lds) + $(build-shlib) + +-$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \ +- $(common-objpfx)sunrpc/librpc_compat_pic.a ++$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a + $(..)./scripts/mkinstalldirs $(common-objpfx)linkobj + (cd $(common-objpfx)linkobj; \ + $(AR) x ../libc_pic.a; \ +- rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \ +- $(AR) x ../sunrpc/librpc_compat_pic.a; \ + $(AR) cr libc_pic.a *.os; \ + rm *.os) + endif +@@ -151,7 +151,7 @@ endif + # the current libc build for testing. + $(common-objpfx)testrun.sh: $(common-objpfx)config.make \ + $(..)Makeconfig $(..)Makefile +- (echo '#!/bin/sh'; \ ++ (echo '#! $(SHELL)'; \ + echo 'builddir=`dirname "$$0"`'; \ + echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \ + echo 'exec $(subst $(common-objdir),"$${builddir}",\ +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Makefile.in glibc-2.16.0/Makefile.in +--- /home/janneke/src/glibc-2.16.0/Makefile.in 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Makefile.in 2018-09-02 13:03:01.892962551 +0200 +@@ -9,3 +9,6 @@ all .DEFAULT: + install: + LANGUAGE=C LC_ALL=C; export LANGUAGE LC_ALL; \ + $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ ++ ++export SHELL ++export BASH +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/malloc/Makefile glibc-2.16.0/malloc/Makefile +--- /home/janneke/src/glibc-2.16.0/malloc/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/malloc/Makefile 2018-09-02 17:11:33.461547394 +0200 +@@ -35,7 +35,7 @@ install-lib := libmcheck.a + non-lib.a := libmcheck.a + + # Additional library. +-extra-libs = libmemusage ++extra-libs = #libmemusage + extra-libs-others = $(extra-libs) + + libmemusage-routines = memusage +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/cache.c glibc-2.16.0/nscd/cache.c +--- /home/janneke/src/glibc-2.16.0/nscd/cache.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nscd/cache.c 2018-09-02 23:38:31.757616750 +0200 +@@ -74,7 +74,11 @@ struct datahead * + cache_search (request_type type, const void *key, size_t len, + struct database_dyn *table, uid_t owner) + { ++#if !BOOTSTRAP_GLIBC + unsigned long int hash = __nis_hash (key, len) % table->head->module; ++#else ++ unsigned long int hash = 0; ++#endif + + unsigned long int nsearched = 0; + struct datahead *result = NULL; +@@ -153,7 +153,11 @@ cache_add (int type, const void *key, si + first ? _(" (first)") : ""); + } + ++#if !BOOTSTRAP_GLIBC + unsigned long int hash = __nis_hash (key, len) % table->head->module; ++#else ++ unsigned long int hash = 0; ++#endif + struct hashentry *newp; + + newp = mempool_alloc (table, sizeof (struct hashentry), 0); +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/Makefile glibc-2.16.0/nscd/Makefile +--- /home/janneke/src/glibc-2.16.0/nscd/Makefile 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nscd/Makefile 2018-09-02 23:49:29.948031787 +0200 +@@ -126,9 +126,7 @@ include $(patsubst %,$(..)cppflags-itera + $(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o) + + ifeq ($(build-shared),yes) +-$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \ +- $(common-objpfx)nis/libnsl.so ++$(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) + else +-$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \ +- $(common-objpfx)nis/libnsl.a ++$(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) + endif +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nscd/nscd_helper.c glibc-2.16.0/nscd/nscd_helper.c +--- /home/janneke/src/glibc-2.16.0/nscd/nscd_helper.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nscd/nscd_helper.c 2018-09-02 23:38:04.941189464 +0200 +@@ -474,7 +474,7 @@ struct datahead * + __nscd_cache_search (request_type type, const char *key, size_t keylen, + const struct mapped_database *mapped, size_t datalen) + { +- unsigned long int hash = __nis_hash (key, keylen) % mapped->head->module; ++ unsigned long int hash = 0; + size_t datasize = mapped->datasize; + + ref_t trail = mapped->head->array[hash]; +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/nss/getent.c glibc-2.16.0/nss/getent.c +--- /home/janneke/src/glibc-2.16.0/nss/function.def 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nss/function.def 2018-09-18 13:54:49.582060539 +0200 +@@ -63,10 +63,12 @@ + DEFINE_GET (files, pwnam) + DEFINE_GET (files, pwuid) + ++#if !BOOTSTRAP_GLIBC + /* rpc */ + DEFINE_ENT (files, rpc) + DEFINE_GETBY (files, rpc, name) + DEFINE_GETBY (files, rpc, number) ++#endif + + /* services */ + DEFINE_ENT (files, serv) +diff -u ~/src/glibc-2.16.0/nss/getent.c glibc-2.16.0/nss/getent.c +--- /home/janneke/src/glibc-2.16.0/nss/getent.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/nss/getent.c 2018-09-18 13:57:41.856849140 +0200 +@@ -700,6 +700,7 @@ + return result; + } + ++#if !BOOTSTRAP_GLIBC + /* Now is all for rpc */ + static inline void + print_rpc (struct rpcent *rpc) +@@ -745,6 +746,7 @@ + + return result; + } ++#endif //rpc + + /* for services */ + static void +@@ -880,7 +882,9 @@ + D(networks) + D(passwd) + D(protocols) ++#if !BOOTSTRAP_GLIBC + D(rpc) ++#endif + D(services) + D(shadow) + #undef D +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/resolv/netdb.h glibc-2.16.0/resolv/netdb.h +--- /home/janneke/src/glibc-2.16.0/resolv/netdb.h 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/resolv/netdb.h 2018-09-08 08:49:30.537811219 +0200 +@@ -26,11 +26,13 @@ + + #include + #include ++#if 0 //!BOOTSTRAP_GLIBC + #ifdef __USE_MISC + /* This is necessary to make this include file properly replace the + Sun version. */ + # include + #endif ++#endif + + #ifdef __USE_GNU + # define __need_sigevent_t +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/Rules glibc-2.16.0/Rules +--- /home/janneke/src/glibc-2.16.0/Rules 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/Rules 2018-09-02 10:52:06.927362861 +0200 +@@ -24,6 +24,9 @@ ifneq (,) + This makefile requires GNU Make. + endif + ++export SHELL ++export BASH ++ + all: # Don't let the default goal come from Makeconfig. + + include $(firstword $(..) ../)Makeconfig +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/scripts/gen-as-const.awk glibc-2.16.0/scripts/gen-as-const.awk +--- /home/janneke/src/glibc-2.16.0/scripts/gen-as-const.awk 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/scripts/gen-as-const.awk 2018-09-01 18:08:37.266516330 +0200 +@@ -14,6 +14,12 @@ BEGIN { started = 0 } + + NF >= 1 && !started { + if (test) { ++ print "\n#include "; ++ print "\n#include "; ++# print "\ntypedef unsigned long size_t;"; ++ print "\n#ifndef offsetof"; ++ print "\n#define offsetof(type, field) ((size_t)&((type *)0)->field)"; ++ print "\n#endif"; + print "\n#include "; + print "\n#include "; + print "\n#include "; +@@ -33,8 +39,15 @@ NF >= 1 && !started { + " source, #name, U (asconst_##name), #expr, (c_t) (expr));" \ + " } else ++good;\n"; + } +- else ++ else { ++ print "\n#include "; ++ print "\n#include "; ++# print "\ntypedef unsigned long size_t;"; ++ print "\n#ifndef offsetof"; ++ print "\n#define offsetof(type, field) ((size_t)&((type *)0)->field)"; ++ print "\n#endif"; + print "void dummy(void) {"; ++ } + started = 1; + } + +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/auth_none.c glibc-2.16.0/sunrpc/auth_none.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/auth_none.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/auth_none.c 2018-09-02 22:09:21.629007932 +0200 +@@ -95,7 +95,9 @@ authnone_create (void) + __libc_once (authnone_private_guard, authnone_create_once); + return &authnone_private.no_client; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (authnone_create, GLIBC_2_0) ++#endif + + static bool_t + authnone_marshal (AUTH *client, XDR *xdrs) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/authuxprot.c glibc-2.16.0/sunrpc/authuxprot.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/authuxprot.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/authuxprot.c 2018-09-02 22:15:51.927158451 +0200 +@@ -63,4 +63,6 @@ xdr_authunix_parms (XDR * xdrs, struct a + } + return FALSE; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (xdr_authunix_parms, GLIBC_2_0) ++#endif +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/bindrsvprt.c glibc-2.16.0/sunrpc/bindrsvprt.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/bindrsvprt.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/bindrsvprt.c 2018-09-02 22:24:32.687187675 +0200 +@@ -96,4 +96,7 @@ bindresvport (int sd, struct sockaddr_in + + return res; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_def (bindresvport) ++#endif ++ +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/clnt_raw.c glibc-2.16.0/sunrpc/clnt_raw.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/clnt_raw.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/clnt_raw.c 2018-09-02 22:33:21.151343826 +0200 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #define MCALL_MSG_SIZE 24 + +@@ -129,7 +130,9 @@ clntraw_create (u_long prog, u_long vers + client->cl_auth = authnone_create (); + return client; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0) ++#endif + + static enum clnt_stat + clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout) +diff '--exclude=*.orig' -purN /home/janneke/src/glibc-2.16.0/sunrpc/clnt_simp.c glibc-2.16.0/sunrpc/clnt_simp.c +--- /home/janneke/src/glibc-2.16.0/sunrpc/clnt_simp.c 2012-06-30 21:12:34.000000000 +0200 ++++ glibc-2.16.0/sunrpc/clnt_simp.c 2018-09-02 22:34:14.884175251 +0200 +@@ -139,7 +139,9 @@ callrpc (const char *host, u_long prognu + crp->valid = 0; + return (int) clnt_stat; + } ++#if !BOOTSTRAP_GLIBC + libc_hidden_nolink_sunrpc (callrpc, GLIBC_2_0) ++#endif + + #ifdef _RPC_THREAD_SAFE_ + void diff --git a/gnu/packages/patches/glibc-boot-2.2.5.patch b/gnu/packages/patches/glibc-boot-2.2.5.patch new file mode 100644 index 0000000000..26bc92a6bb --- /dev/null +++ b/gnu/packages/patches/glibc-boot-2.2.5.patch @@ -0,0 +1,251 @@ +This patch enables building glibc-2.2.5 using TCC and GNU Make 4.x and Mes C Library. + + * Makefile: Do not assemble from stdin, use file indirection. + * Makefile: Add new target: install-lib-all. + * Makefile: Avoid building stub DOC. + * [_LIBC_REENTRANT]: Add missing guarding. + * [MES_BOOTSTRAP]: Disable some GCC extensions. + * [MES_BOOTSTRAP]: Add missing GCC div/mod defines. + +Upstream status: Not presented upstream. + +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/config.h.in glibc-2.2.5/config.h.in +--- ../glibc-2.2.5/config.h.in 2001-11-16 02:02:56.000000000 +0100 ++++ glibc-2.2.5/config.h.in 2018-06-17 21:30:02.313029074 +0200 +@@ -1,3 +1,10 @@ ++#if MES_BOOTSTRAP && BOOTSTRAP_GLIBC ++#undef __umoddi3 ++#define __umoddi3(a,b) ((a)%(b)) ++#undef __udivdi3 ++#define __udivdi3(a,b) ((a)/(b)) ++#endif ++ + #if !defined ASSEMBLER && !defined _ISOMAC && !defined __OPTIMIZE__ + # error "glibc cannot be compiled without optimization" + #endif +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/configure glibc-2.2.5/configure +--- ../glibc-2.2.5/configure 2002-01-08 23:16:44.000000000 +0100 ++++ glibc-2.2.5/configure 2018-06-07 20:47:26.608895319 +0200 +@@ -1530,7 +1530,7 @@ echo "configure:1530: checking version o + ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 3.79* | 3.[89]*) ++ 3.79* | 3.[89]* | 4.*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/Makeconfig glibc-2.2.5/Makeconfig +--- ../glibc-2.2.5/Makeconfig 2001-09-12 20:49:45.000000000 +0200 ++++ glibc-2.2.5/Makeconfig 2018-06-20 16:33:35.472167202 +0200 +@@ -400,7 +400,7 @@ ifndef +link + $(start-installed-name))\ + $(+preinit) $(link-extra-libs) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs) $(link-libc) $(+postctor) $(+postinit) ++ $(link-extra-libs) $(link-libc) $(+postctor) $(+postinit) -lc -lgcc2 + endif + # Command for statically linking programs with the C library. + ifndef +link-static +@@ -412,7 +412,7 @@ ifndef +link-static + $(start-installed-name))\ + $(+preinit) $(link-extra-libs-static) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) ++ $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) -lc -lgcc2 + endif + # Command for statically linking bounded-pointer programs with the C library. + ifndef +link-bounded +@@ -424,7 +424,7 @@ ifndef +link-bounded + $(start-installed-name))\ + $(+preinit) $(link-extra-libs-bounded) \ + $(common-objpfx)libc% $(+postinit),$^) \ +- $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctor) $(+postinit) ++ $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctor) $(+postinit) -lc -lgcc2 + endif + ifndef config-LDFLAGS + ifeq (yesyes,$(build-shared)$(elf)) +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/Makerules glibc-2.2.5/Makerules +--- ../glibc-2.2.5/Makerules 2001-11-16 02:02:19.000000000 +0100 ++++ glibc-2.2.5/Makerules 2018-06-10 15:03:42.390329860 +0200 +@@ -748,6 +748,18 @@ endef + installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\ + $(inst_libdir)/$(patsubst %,$(libtype$o),\ + $(libprefix)$(libc-name))) ++ ++ifeq (yes,$(build-shared)) ++install-lib-all: $(inst_libdir)/libc.a \ ++ $(inst_slibdir)/libc.so$(libc.so-version) \ ++ $(inst_slibdir)/libc-$(version).so \ ++ $(inst_libdir)/libc.so \ ++ install-lib ++else ++install-lib-all: $(inst_libdir)/libc.a \ ++ install-lib ++endif ++ + install: $(installed-libcs) + $(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) + $(make-target-directory) +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/misc/syslog.c glibc-2.2.5/misc/syslog.c +--- ../glibc-2.2.5/misc/syslog.c 2001-08-31 01:13:49.000000000 +0200 ++++ glibc-2.2.5/misc/syslog.c 2018-06-09 09:01:20.008918690 +0200 +@@ -216,9 +216,11 @@ vsyslog(pri, fmt, ap) + + /* Prepare for multiple users. We have to take care: open and + write are cancellation points. */ ++#if _LIBC_REENTRANT + __libc_cleanup_region_start (1, (void (*) (void *)) cancel_handler, + &oldaction_ptr); + __libc_lock_lock (syslog_lock); ++#endif + + /* Prepare for a broken connection. */ + memset (&action, 0, sizeof (action)); +@@ -268,9 +270,11 @@ vsyslog(pri, fmt, ap) + if (sigpipe == 0) + __sigaction (SIGPIPE, &oldaction, (struct sigaction *) NULL); + ++#if _LIBC_REENTRANT + /* End of critical section. */ + __libc_cleanup_region_end (0); + __libc_lock_unlock (syslog_lock); ++#endif + + free (buf); + } +@@ -326,16 +330,20 @@ openlog_internal(const char *ident, int + void + openlog (const char *ident, int logstat, int logfac) + { ++#if _LIBC_REENTRANT + /* Protect against multiple users. */ + __libc_cleanup_region_start (1, + (void (*) __P ((void *))) __libc_mutex_unlock, + &syslog_lock); + __libc_lock_lock (syslog_lock); ++#endif + + openlog_internal (ident, logstat, logfac); + ++#if _LIBC_REENTRANT + /* Free the lock. */ + __libc_cleanup_region_end (1); ++#endif + } + + static void +@@ -358,18 +366,22 @@ closelog_internal() + void + closelog () + { ++#if _LIBC_REENTRANT + /* Protect against multiple users. */ + __libc_cleanup_region_start (1, + (void (*) __P ((void *))) __libc_mutex_unlock, + &syslog_lock); + __libc_lock_lock (syslog_lock); ++#endif + + closelog_internal (); + LogTag = NULL; + LogType = SOCK_DGRAM; /* this is the default */ + ++#if _LIBC_REENTRANT + /* Free the lock. */ + __libc_cleanup_region_end (1); ++#endif + } + + #ifdef _LIBC_REENTRANT +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/Rules glibc-2.2.5/Rules +--- ../glibc-2.2.5/Rules 2001-08-30 00:44:35.000000000 +0200 ++++ glibc-2.2.5/Rules 2018-06-09 08:15:54.880683675 +0200 +@@ -218,7 +218,7 @@ endif + fopen_max=`sed -n 's/^#define OPEN_MAX //1p' $(@:st=hT)`; \ + filename_max=`sed -n 's/^#define PATH_MAX //1p' $(@:st=hT)`; \ + iov_max=`sed -n 's/^#define UIO_MAXIOV //p' $(@:st=hT)`; \ +- fopen_max=$${fopen_max:-16}; \ ++ fopen_max=$${fu_fopen_max:-16}; \ + filename_max=$${filename_max:-1024}; \ + if [ -z $$iov_max ]; then \ + define_iov_max="# undef IOV_MAX"; \ +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/stdio-common/perror.c glibc-2.2.5/stdio-common/perror.c +--- ../glibc-2.2.5/stdio-common/perror.c 2001-09-01 07:33:01.000000000 +0200 ++++ glibc-2.2.5/stdio-common/perror.c 2018-06-09 10:42:25.909899529 +0200 +@@ -48,6 +48,9 @@ perror_internal (FILE *fp, const char *s + } + + ++#if MES_BOOTSTRAP ++#define fileno_unlocked(x) 1 ++#endif + /* Print a line on stderr consisting of the text in S, a colon, a space, + a message describing the meaning of the contents of `errno' and a newline. + If S is NULL or "", the colon and space are omitted. */ +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c +--- ../glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c 2001-07-06 06:55:53.000000000 +0200 ++++ glibc-2.2.5/sysdeps/i386/fpu/ftestexcept.c 2018-06-09 09:45:13.363031424 +0200 +@@ -25,8 +25,10 @@ fetestexcept (int excepts) + { + int temp; + ++#if !MES_BOOTSTRAP + /* Get current exceptions. */ + __asm__ ("fnstsw %0" : "=a" (temp)); ++#endif + + return temp & excepts & FE_ALL_EXCEPT; + } +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/sysdeps/unix/make-syscalls.sh glibc-2.2.5/sysdeps/unix/make-syscalls.sh +--- ../glibc-2.2.5/sysdeps/unix/make-syscalls.sh 2001-09-13 00:19:30.000000000 +0200 ++++ glibc-2.2.5/sysdeps/unix/make-syscalls.sh 2018-06-20 15:16:01.813004453 +0200 +@@ -173,7 +173,7 @@ shared-only-routines += $file + done + + # And finally, pipe this all into the compiler. +- echo ' ) | $(COMPILE.S) -x assembler-with-cpp -o $@ -' ++ echo ' ) > stdin.c; $(COMPILE.S) -x assembler-with-cpp -o $@ stdin.c' + + case $weak in + *@*) +@@ -284,7 +284,7 @@ shared-only-routines += $file + echo "\ + echo ''; \\ + echo '#include '; \\ +- ) | \$(COMPILE.c) -x c -o \$@ -" ++ ) > stdin.c; \$(COMPILE.c) -x c -o \$@ stdin.c" + ### Use this for debugging intermediate output: + ### ) >\$(@:.ob=.c) + ### \$(subst -c,-E,\$(COMPILE.c)) -o \$(@:.ob=.ib) \$(@:.ob=.c) +diff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h +--- ../glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h 2001-07-06 06:56:21.000000000 +0200 ++++ glibc-2.2.5/sysdeps/unix/sysv/linux/sys/timex.h 2018-06-09 20:09:07.713806647 +0200 +@@ -54,10 +54,12 @@ struct timex + long int errcnt; /* calibration errors (ro) */ + long int stbcnt; /* stability limit exceeded (ro) */ + ++#if !MES_BOOTSTRAP + /* ??? */ + int :32; int :32; int :32; int :32; + int :32; int :32; int :32; int :32; + int :32; int :32; int :32; int :32; ++#endif + }; + + /* Mode codes (timex.mode) */ +--- ../glibc-2.2.5/manual/Makefile 2001-08-28 10:05:40.000000000 +0200 ++++ glibc-2.2.5/manual/Makefile 2018-06-09 10:13:03.093633660 +0200 +@@ -247,7 +247,11 @@ + .PHONY: stubs + stubs: $(objpfx)stubs + endif +-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: ++po/manual.pot $(objpfx)stubs: ++ $(make-target-directory) ++ touch $@ ++ ++$(objpfx)stamp%: + $(make-target-directory) + touch $@ + diff --git a/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch b/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch new file mode 100644 index 0000000000..936d592f1a --- /dev/null +++ b/gnu/packages/patches/glibc-bootstrap-system-2.16.0.patch @@ -0,0 +1,30 @@ +We want to allow builds in chroots that lack /bin/sh. Thus, system(3) +and popen(3) need to be tweaked to use the right shell. For the bootstrap +glibc, we just use whatever `sh' can be found in $PATH. The final glibc +instead uses the hard-coded absolute file name of `bash'. + +--- a/sysdeps/posix/system.c ++++ b/sysdeps/posix/system.c +@@ -134,7 +134,7 @@ do_system (const char *line) + INIT_LOCK (); + + /* Exec the shell. */ +- (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ); ++ (void) __execvpe (SHELL_NAME, (char *const *) new_argv, __environ); + _exit (127); + } + else if (pid < (pid_t) 0) + +--- a/libio/iopopen.c ++++ b/libio/iopopen.c +@@ -145,7 +145,7 @@ _IO_new_proc_open (fp, command, mode) + _IO_close (fd); + } + +- _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0); ++ execlp ("sh", "sh", "-c", command, (char *) 0); + _IO__exit (127); + } + _IO_close (child_end); + + diff --git a/gnu/packages/patches/mes-nyacc-0.86.0.patch b/gnu/packages/patches/mes-nyacc-0.86.0.patch index 58dfc5a46b..30ee4645c2 100644 --- a/gnu/packages/patches/mes-nyacc-0.86.0.patch +++ b/gnu/packages/patches/mes-nyacc-0.86.0.patch @@ -1,3 +1,6 @@ +Two small patches off the current Mes `wip' branch, that enable using +Nyacc-0.86.0; and a fix for running ./check.sh. + From 9e610736bf779f3295c1192e748cd19cbbe3be28 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 5 Sep 2018 20:28:06 +0200 @@ -195,3 +198,28 @@ index 9e341cba..c2efb32c 100644 -- 2.18.0 +From 20deefe6ea0d62a3338a8e2a9552d2a20b0f607e Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sun, 9 Sep 2018 07:11:50 +0200 +Subject: [PATCH] build: Oops, fix ./check.sh for bootstrap build. + +* build-aux/config.sh (top_builddir): Set default to `.'. +--- + build-aux/config.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build-aux/config.sh b/build-aux/config.sh +index a4b9fdef..4fa84441 100644 +--- a/build-aux/config.sh ++++ b/build-aux/config.sh +@@ -17,6 +17,7 @@ + # along with GNU Mes. If not, see . + + srcdir=${srcdir-.} ++top_builddir=${top_builddir-.} + if [ "$V" = 2 ]; then + echo $0 + echo srcdest=${srcdest} +-- +2.18.0 + diff --git a/gnu/packages/patches/tcc-boot-0.9.27.patch b/gnu/packages/patches/tcc-boot-0.9.27.patch new file mode 100644 index 0000000000..6f9d365788 --- /dev/null +++ b/gnu/packages/patches/tcc-boot-0.9.27.patch @@ -0,0 +1,26 @@ +From 1431ba3a99582e4c3d2693ac37e57f361858affd Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Mon, 11 Jun 2018 18:39:44 +0200 +Subject: [PATCH] bootstrappable: Force static link. + +--- + libtcc.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libtcc.c b/libtcc.c +index 3448f44..02ab850 100644 +--- a/libtcc.c ++++ b/libtcc.c +@@ -735,6 +735,9 @@ LIBTCCAPI TCCState *tcc_new(void) + tcc_state = s; + ++nb_states; + ++#if BOOTSTRAP ++ s->static_link = 1; ++#endif + s->alacarte_link = 1; + s->nocommon = 1; + s->warn_implicit_function_declaration = 1; +-- +2.16.2 + -- cgit v1.2.3 From 56f45b7c785dd576d023c45c5603ab907da912fe Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Sep 2018 23:18:40 +0200 Subject: bootstrap: bison-boot0: Do not use `ranlib -D'. * gnu/packages/commencement.scm (bison-boot0): Do not use `ranlib -D' for i686-linux bootstrap. --- gnu/packages/commencement.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ea4d2de725..f107beff6f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1862,13 +1862,16 @@ exec " gcc "/bin/" program (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... (arguments - '(#:tests? #f ;... and thus disable tests + `(#:tests? #f ;... and thus disable tests ;; Zero timestamps in liby.a; this must be done ;; explicitly here because the bootstrap Binutils don't ;; do that (default is "cru".) - #:make-flags '("ARFLAGS=crD" - "RANLIB=ranlib -D" + #:make-flags `("ARFLAGS=crD" + ,,(match (%current-system) + ;; ranlib: '-D': No such file + ("i686-linux" "RANLIB=ranlib") + (_ "RANLIB=ranlib -D")) "V=1")))))) (package (inherit (package-with-bootstrap-guile -- cgit v1.2.3 From cffe966dd5d3b412d31a4b1c7bf9f81a2697dd7b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Sep 2018 23:04:57 +0200 Subject: bootstrap: perl-boot0: Disable validate-runpath?. * gnu/packages/commencement.scm (perl-boot0): Add disable validate-runpath? to args, and actually pass args. --- gnu/packages/commencement.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f107beff6f..349dc32adf 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1820,23 +1820,25 @@ exec " gcc "/bin/" program (name "perl-boot0") (arguments ;; At the very least, this must not depend on GCC & co. - (let ((args `(#:disallowed-references + (let ((args `(#:validate-runpath? #f + #:disallowed-references ,(list %bootstrap-binutils)))) - (substitute-keyword-arguments (package-arguments perl) - ((#:phases phases) - `(modify-phases ,phases - ;; Pthread support is missing in the bootstrap compiler - ;; (broken spec file), so disable it. - (add-before 'configure 'disable-pthreads - (lambda _ - (substitute* "Configure" - (("^libswanted=(.*)pthread" _ before) - (string-append "libswanted=" before))) - #t)))) - ;; Do not configure with '-Dusethreads' since pthread - ;; support is missing. - ((#:configure-flags configure-flags) - `(delete "-Dusethreads" ,configure-flags)))))))) + `(,@args + ,@(substitute-keyword-arguments (package-arguments perl) + ((#:phases phases) + `(modify-phases ,phases + ;; Pthread support is missing in the bootstrap compiler + ;; (broken spec file), so disable it. + (add-before 'configure 'disable-pthreads + (lambda _ + (substitute* "Configure" + (("^libswanted=(.*)pthread" _ before) + (string-append "libswanted=" before))) + #t)))) + ;; Do not configure with '-Dusethreads' since pthread + ;; support is missing. + ((#:configure-flags configure-flags) + `(delete "-Dusethreads" ,configure-flags))))))))) (package-with-bootstrap-guile (package-with-explicit-inputs perl %boot0-inputs -- cgit v1.2.3 From d536c39e5490ab2a8d41e594f33483ee2946e610 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 14:53:48 +0200 Subject: bootstrap: Replace GNU toolchain seeds with Mes for i686-linux. * gnu/packages/bootstrap.scm (%bootstrap-inputs)[i686-linux]: Replace %bootstrap-gcc, %bootstrap-binutils, %bootstrap-glibc with %mescc-tools-seed, %mes-seed, %srfi-43 and %tinycc-seed. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[i686-linux]: Replace gcc-tarball, binutils-tarball, glibc-tarball with %mescc-tools-seed, %mes-seed, %srfi-43 and %tinycc-seed. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain)[i686-linux]: Add glibc-mesboot, binutils-mesboot, gcc-wrapper, gcc-mesboot. (file-boot0)[i686-linux]: Disable strip-binaries?, validate-runpath?. (libstdc++-boot0)[i686-linux]: Add libtool install workarourd: copy libstdc++.so.0.0.20 from gcc-mesboot. (gcc-boot0)[i686-linux]: Add libtool install workaround: touch libcc1.so.0.0.0, libcc1plugin.so.0.0.0. (perl-boot0): Disable validate-runpath?. (bison-boot0)[i686-linux]: Do not use ranlib -D. --- gnu/packages/bootstrap.scm | 13 ++++++++++--- gnu/packages/commencement.scm | 36 ++++++++++++++++++++++++++++++++++-- gnu/packages/make-bootstrap.scm | 11 ++++++++--- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 19995e629f..83dd2f860f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -655,9 +655,16 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. - `(("libc" ,%bootstrap-glibc) - ("gcc" ,%bootstrap-gcc) - ("binutils" ,%bootstrap-binutils) + `(,@(match (%current-system) + ("i686-linux" `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) + ("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-seed" ,%mes-seed) + ("srfi-43" ,%srfi-43 ) + ("tinycc-seed" ,%tinycc-seed))) + + (_ `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils)))) ("coreutils&co" ,%bootstrap-coreutils&co) ;; In gnu-build-system.scm, we rely on the availability of Bash. diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 349dc32adf..446129c4be 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1571,7 +1571,13 @@ exec " gcc "/bin/" program (define (%bootstrap-inputs+toolchain) ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; the actual reduced set with bootstrapped toolchain. - (%bootstrap-inputs)) + (append (match (%current-system) + ("i686-linux" `(("libc" ,glibc-mesboot) + ("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gcc" ,gcc-mesboot))) + (_ '())) + (%bootstrap-inputs))) (define gnu-make-boot0 (package-with-bootstrap-guile @@ -1716,7 +1722,23 @@ exec " gcc "/bin/" program ;; XXX: libstdc++.so NEEDs ld.so for some reason. #:validate-runpath? #f - ,@(package-arguments lib))) + ,@(match (%current-system) + ("i686-linux" + (substitute-keyword-arguments (package-arguments lib) + ((#:phases phases) + `(modify-phases ,phases + ;; FIXME: why doesn't this package build libstdc++.so.6.0.20, + ;; when gcc-mesboot builds it fine? + ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libstdc++.so.6.0.20 /gnu/store/np5pmdlwfin3vmqk88chh0fgs0ncki79-libstdc++-boot0-4.8.5/lib/libstdc++.so.6.0.20 + ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libstdc++.so.6.0.20': No such file or directory + (add-after 'build 'copy-libstdc++- + (lambda* (#:key outputs #:allow-other-keys) + (let ((gcc (assoc-ref %build-inputs "gcc")) + (out (assoc-ref outputs "out"))) + (copy-file (string-append gcc "/lib/libstdc++.so.6.0.20") + (string-append "src/.libs/libstdc++.so.6.0.20")) + #t))))))) + (_ (package-arguments lib))))) (inputs (%boot0-inputs)) (native-inputs '())))) @@ -1786,6 +1808,16 @@ exec " gcc "/bin/" program ,(package-name lib))) (list gmp-6.0 mpfr mpc)) #t))) + ,(match (%current-system) + ("i686-linux" + '(add-after 'build 'libtool-workaround + (lambda _ + ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libcc1.so.0.0.0 /gnu/store/8qf47i99nxz9jvrmq5va0g3q1yvs3x74-gcc-cross-boot0-5.5.0-lib/lib/./libcc1.so.0.0.0 + ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory + (system* "touch" + "libcc1/.libs/libcc1.so.0.0.0" + "libcc1/.libs/libcc1plugin.so.0.0.0")))) + (_ 'identity)) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "lib"))) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 6523f36d8d..3553737f1e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -728,9 +728,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." %build-inputs) #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) - ("gcc-tarball" ,%gcc-bootstrap-tarball) - ("binutils-tarball" ,%binutils-bootstrap-tarball) - ("glibc-tarball" ,(%glibc-bootstrap-tarball)) + ,@(match (%current-system) + ("i686-linux" `(("mescc-tools-seed" ,(@ (gnu packages bootstrap) %mescc-tools-seed)) + ("mes-seed" ,(@ (gnu packages bootstrap) %mes-seed)) + ("srfi-43" ,(@ (gnu packages bootstrap) %srfi-43)) + ("tinycc-seed" ,(@ (gnu packages bootstrap) %tinycc-seed)))) + (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball) + ("binutils-tarball" ,%binutils-bootstrap-tarball) + ("glibc-tarball" ,(%glibc-bootstrap-tarball))))) ("coreutils&co-tarball" ,%bootstrap-binaries-tarball))) (synopsis "Tarballs containing all the bootstrap binaries") (description synopsis) -- cgit v1.2.3 From a243722c5b8d50b4f0e3f9717ca71aa43dfc56a3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 17 Sep 2018 18:48:19 +0200 Subject: doc: Describe the Reduced Binary Seed bootstrap. * doc/guix.texi (Reduced Binary Seed Bootstrap): New node. * doc/images/gcc-mesboot-bag-graph.dot: New file. * doc/local.mk (DOT_FILES): Add it. --- doc/guix.texi | 70 ++++++++++++++++++++ doc/images/gcc-mesboot-bag-graph.dot | 124 +++++++++++++++++++++++++++++++++++ doc/local.mk | 1 + 3 files changed, 195 insertions(+) create mode 100644 doc/images/gcc-mesboot-bag-graph.dot diff --git a/doc/guix.texi b/doc/guix.texi index b925485be5..55c1ac3102 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -210,6 +210,7 @@ GNU Distribution * Package Modules:: Packages from the programmer's viewpoint. * Packaging Guidelines:: Growing the distribution. * Bootstrapping:: GNU/Linux built from scratch. +* Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. * Porting:: Targeting another platform or kernel. System Installation @@ -8694,6 +8695,7 @@ For information on porting to other architectures or kernels, * Package Modules:: Packages from the programmer's viewpoint. * Packaging Guidelines:: Growing the distribution. * Bootstrapping:: GNU/Linux built from scratch. +* Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. * Porting:: Targeting another platform or kernel. @end menu @@ -23552,6 +23554,9 @@ Binutils, libc, and the other packages mentioned above---the These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later). +For @code{i686-linux} the Guix bootstrap process is more elaborate, +@pxref{Reduced Binary Seed Bootstrap}. + @unnumberedsubsec Preparing to Use the Bootstrap Binaries @c As of Emacs 24.3, Info-mode displays the image, but since it's a @@ -23705,6 +23710,71 @@ bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler. Your help is welcome! +@node Reduced Binary Seed Bootstrap +@section The Reduced Binary Seed Bootstrap + +Guix---like other GNU/Linux distributions---is traditionally bootstrapped from +a set of bootstrap binaries: Bourne shell, command-line tools provided by GNU +Coreutils, Awk, Findutils, `sed', and `grep' and Guile, GCC, Binutils, and the +GNU C Library (@pxref{Bootstrapping}). Usually, these bootstrap binaries are +``taken for granted.'' + +Taking these binaries for granted means that we consider them to be a correct +and trustworthy `seed' for building the complete system. Therein lies a +problem: the current combined size of these bootstrap binaries is about 250MB +(@pxref{Bootstrappable Builds,,, mes, Mes Reference Manual}). Auditing or +even inspecting these is next to impossible. + +For @code{i686-linux}, Guix now features a ``Reduced Binary Seed'' bootstrap +@footnote{We would like to say: ``Full Source Bootstrap'' and while we are +working towards that goal it would be hyperbole to use that term for what we +do now.}. + +The Reduced Binary Seed bootstrap removes the most critical tools---from a +trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C +Library are replaced by: @code{mescc-tools-seed} (a tiny assembler and linker) +@code{mes-seed} (a small Scheme Interpreter and a C compiler writen in Scheme) +and @code{tinycc-seed} (the Mes C Library, built for TinyCC). Using these new +binary seeds and a new set of +@c +packages@footnote{@c +mescc-tools-boot, +nyacc-boot, +mes-boot, +tcc-boot0, +tcc-boot, +make-mesboot0, +diffutils-mesboot, +binutils-mesboot0, +gcc-core-mesboot, +mesboot-headers, +glibc-mesboot0, +gcc-mesboot0, +binutils-mesboot, +make-mesboot, +gcc-mesboot1, +gcc-mesboot1-wrapper, +glibc-headers-mesboot, +glibc-mesboot, +gcc-mesboot, +and +gcc-mesboot-wrapper. +} +@c +the ``missing'' Binutils, GCC, and the GNU C Library are built from source. +From here on the more traditional bootstrap process resumes. This approach +has reduced the bootstrap binaries in size to about 130MB. Work is ongoing to +reduce this further. If you are interested, join us on @code{#bootstrappable} +on the Freenode IRC network. + +@c ./pre-inst-env guix graph --type=bag -e '(begin (use-modules (guix packages)) (%current-system "i686-linux") (@@ (gnu packages commencement) gcc-mesboot))' > doc/images/gcc-mesboot-bag-graph.dot +@c dot -T png doc/images/gcc-mesboot-bag-graph.dot > doc/images/gcc-mesboot-bag-graph.png + +Below is the generated dependency graph for @code{gcc-mesboot}, the bootstrap +compiler used to build the rest of GuixSD. + +@image{images/gcc-mesboot-bag-graph,6in,,Dependency graph of the gcc-mesboot} + @node Porting @section Porting to a New Platform diff --git a/doc/images/gcc-mesboot-bag-graph.dot b/doc/images/gcc-mesboot-bag-graph.dot new file mode 100644 index 0000000000..b8c1dc6ad1 --- /dev/null +++ b/doc/images/gcc-mesboot-bag-graph.dot @@ -0,0 +1,124 @@ +digraph "Guix bag" { + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" [label = "gcc-mesboot@4.9.4", shape = box, fontname = Helvetica]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = cyan3]; + "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = cyan3]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [label = "binutils-mesboot@2.20.1a", shape = box, fontname = Helvetica]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [color = darkseagreen]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = darkseagreen]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; + "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = darkseagreen]; + "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [label = "binutils-mesboot0@2.20.1a", shape = box, fontname = Helvetica]; + "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = blue]; + "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = blue]; + "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = blue]; + "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; + "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" -> "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [color = blue]; + "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" -> "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" [color = blue]; + "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [label = "mes-boot@0.17.1", shape = box, fontname = Helvetica]; + "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" -> "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" [color = darkgoldenrod]; + "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkgoldenrod]; + "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" -> "/gnu/store/1dz9ddx84s4lgpcayy71kd01w493ab8f-guile-bootstrap-2.0.drv" [color = darkgoldenrod]; + "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" [label = "mescc-tools-boot@0.4-1.f02b8f4", shape = box, fontname = Helvetica]; + "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [label = "bootstrap-binaries@0", shape = box, fontname = Helvetica]; + "/gnu/store/1dz9ddx84s4lgpcayy71kd01w493ab8f-guile-bootstrap-2.0.drv" [label = "guile-bootstrap@2.0", shape = box, fontname = Helvetica]; + "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" [label = "tcc-boot0@0.9.26-2.b7aa906", shape = box, fontname = Helvetica]; + "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [color = peachpuff4]; + "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" [color = peachpuff4]; + "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/1dz9ddx84s4lgpcayy71kd01w493ab8f-guile-bootstrap-2.0.drv" [color = peachpuff4]; + "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; + "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [color = red]; + "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = red]; + "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = red]; + "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; + "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = darkviolet]; + "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [label = "glibc-mesboot0@2.2.5", shape = box, fontname = Helvetica]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = darkviolet]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" [color = darkviolet]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = darkviolet]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" [color = darkviolet]; + "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = darkviolet]; + "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" [label = "gcc-core-mesboot@2.95.3", shape = box, fontname = Helvetica]; + "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = blue]; + "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = blue]; + "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = blue]; + "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = blue]; + "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" [label = "mesboot-headers@0.17.1", shape = box, fontname = Helvetica]; + "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = cyan3]; + "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [label = "linux-libre-headers-bootstrap@0", shape = box, fontname = Helvetica]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [label = "gcc-mesboot0@2.95.3", shape = box, fontname = Helvetica]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = red]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" [color = red]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = red]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = red]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = red]; + "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = red]; + "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" [label = "gcc-mesboot1-wrapper@4.7.4", shape = box, fontname = Helvetica]; + "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" [color = cyan3]; + "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = cyan3]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" [label = "glibc-mesboot@2.16.0", shape = box, fontname = Helvetica]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; + "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = darkseagreen]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" [label = "glibc-headers-mesboot@2.16.0", shape = box, fontname = Helvetica]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = red]; + "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = red]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [label = "gcc-mesboot1@4.7.4", shape = box, fontname = Helvetica]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = peachpuff4]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [color = peachpuff4]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = peachpuff4]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = peachpuff4]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = peachpuff4]; + "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = peachpuff4]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [label = "make-mesboot@3.82", shape = box, fontname = Helvetica]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = darkviolet]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = darkviolet]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [color = darkviolet]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = darkviolet]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = darkviolet]; + +} diff --git a/doc/local.mk b/doc/local.mk index 0b7904329a..f6129708c3 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -33,6 +33,7 @@ DOT_FILES = \ %D%/images/bootstrap-packages.dot \ %D%/images/coreutils-graph.dot \ %D%/images/coreutils-bag-graph.dot \ + %D%/images/gcc-mesboot-bag-graph.dot \ %D%/images/service-graph.dot \ %D%/images/shepherd-graph.dot -- cgit v1.2.3 From eb4434598cbf8d04a3e5b1995be50fe3b44f0507 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 19 Sep 2018 17:23:09 +0200 Subject: bootstrap: Reduced Binary Seed bootstrap for x86_64 too. * gnu/packages/bootstrap.scm (%bootstrap-inputs): Replace %bootstrap-libc, %bootstrap-gcc, and %bootstrap-binutils with Mes seeds for x86_64 too. * gnu/packages/commencement.scm (tcc-boot0, tcc-boot, gcc-mesboot1, gcc-mesboot1-wrapper, m4-mesboot, %bootstrap-inputs+toolchain, libstdc++-boot0, gcc-boot0, bison-boot0): For x86_64-linux, use i686-linux glibc-dynamic-linker and Mes bootstrap settings. (gcc-boot0-intermediate-wrapped): New variable, extract from static-bash-for-glibc. (static-bash-for-glibc): Use it. (gcc-final): Copy gmp&co phase from gcc-boot0, inherit other arguments from gcc; avoid i686-linux impersonation from gcc-boot0. * doc/guix.texi (Bootstrapping, Reduced Binary Seed Bootstrap): Note x86_64-linux also as Reduced Binary Seed bootstrap. --- doc/guix.texi | 12 ++--- gnu/packages/bootstrap.scm | 19 +++---- gnu/packages/commencement.scm | 112 ++++++++++++++++++++++++++++-------------- 3 files changed, 91 insertions(+), 52 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 55c1ac3102..a213a0324c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23554,8 +23554,8 @@ Binutils, libc, and the other packages mentioned above---the These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later). -For @code{i686-linux} the Guix bootstrap process is more elaborate, -@pxref{Reduced Binary Seed Bootstrap}. +For @code{i686-linux} and @code{x86_64-linux} the Guix bootstrap process is +more elaborate, @pxref{Reduced Binary Seed Bootstrap}. @unnumberedsubsec Preparing to Use the Bootstrap Binaries @@ -23725,10 +23725,10 @@ problem: the current combined size of these bootstrap binaries is about 250MB (@pxref{Bootstrappable Builds,,, mes, Mes Reference Manual}). Auditing or even inspecting these is next to impossible. -For @code{i686-linux}, Guix now features a ``Reduced Binary Seed'' bootstrap -@footnote{We would like to say: ``Full Source Bootstrap'' and while we are -working towards that goal it would be hyperbole to use that term for what we -do now.}. +For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced +Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source +Bootstrap'' and while we are working towards that goal it would be hyperbole +to use that term for what we do now.}. The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 83dd2f860f..c52b4302e1 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -656,15 +656,16 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. `(,@(match (%current-system) - ("i686-linux" `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) - ("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-seed" ,%mes-seed) - ("srfi-43" ,%srfi-43 ) - ("tinycc-seed" ,%tinycc-seed))) - - (_ `(("libc" ,%bootstrap-glibc) - ("gcc" ,%bootstrap-gcc) - ("binutils" ,%bootstrap-binutils)))) + ((or "i686-linux" "x86_64-linux") + `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) + ("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-seed" ,%mes-seed) + ("srfi-43" ,%srfi-43 ) + ("tinycc-seed" ,%tinycc-seed))) + (_ + `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils)))) ("coreutils&co" ,%bootstrap-coreutils&co) ;; In gnu-build-system.scm, we rely on the availability of Bash. diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 446129c4be..4c7a381349 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -383,7 +383,8 @@ (mescc-tools (assoc-ref %build-inputs "mescc-tools")) (libc (assoc-ref %build-inputs "libc")) (interpreter (if libc - (string-append libc ,(glibc-dynamic-linker)) + ;; also for x86_64-linux, we are still on i686-linux + (string-append libc ,(glibc-dynamic-linker "i686-linux")) (string-append mes "/lib/mes-loader")))) (setenv "PATH" (string-append coreutils "/bin" @@ -488,7 +489,8 @@ (tcc (assoc-ref %build-inputs "tcc")) (libc (assoc-ref %build-inputs "libc")) (interpreter (if libc - (string-append libc ,(glibc-dynamic-linker)) + ;; also for x86_64-linux, we are still on i686-linux + (string-append libc ,(glibc-dynamic-linker "i686-linux")) (string-append mes "/lib/mes-loader")))) ;; unpack (setenv "PATH" (string-append @@ -510,7 +512,8 @@ (tcc (assoc-ref %build-inputs "tcc")) (libc (assoc-ref %build-inputs "libc")) (interpreter (if libc - (string-append libc ,(glibc-dynamic-linker)) + ;; also for x86_64-linux, we are still on i686-linux + (string-append libc ,(glibc-dynamic-linker "i686-linux")) (string-append mes "/lib/mes-loader")))) (invoke "tcc" "-vvv" @@ -1140,7 +1143,7 @@ ac_cv_c_float_format='IEEE (little-endian)' "-B" libc "/lib " "-Wl,-dynamic-linker " "-Wl," libc - ,(glibc-dynamic-linker)))) + ,(glibc-dynamic-linker "i686-linux")))) (list (string-append "LDFLAGS=" ldflags) (string-append "LDFLAGS_FOR_TARGET=" ldflags)))) ((#:phases phases) @@ -1267,7 +1270,8 @@ ac_cv_c_float_format='IEEE (little-endian)' (display (string-append "#! " bash "/bin/bash exec " gcc "/bin/" program " -Wl,--dynamic-linker" -" -Wl," libc ,(glibc-dynamic-linker) +;; also for x86_64-linux, we are still on i686-linux +" -Wl," libc ,(glibc-dynamic-linker "i686-linux") " -Wl,--rpath" " -Wl," libc "/lib" " \"$@\" @@ -1552,7 +1556,7 @@ exec " gcc "/bin/" program (sha256 (base32 "1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw")))) - (supported-systems '("i686-linux")) + (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs `(("mes" ,mes-boot) ("tcc" ,tcc-boot))) (arguments @@ -1572,11 +1576,13 @@ exec " gcc "/bin/" program ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; the actual reduced set with bootstrapped toolchain. (append (match (%current-system) - ("i686-linux" `(("libc" ,glibc-mesboot) - ("binutils" ,binutils-mesboot) - ("gcc-wrapper" ,gcc-mesboot-wrapper) - ("gcc" ,gcc-mesboot))) - (_ '())) + ((or "i686-linux" "x86_64-linux") + `(("libc" ,glibc-mesboot) + ("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gcc" ,gcc-mesboot))) + (_ + '())) (%bootstrap-inputs))) (define gnu-make-boot0 @@ -1723,7 +1729,7 @@ exec " gcc "/bin/" program #:validate-runpath? #f ,@(match (%current-system) - ("i686-linux" + ((or "i686-linux" "x86_64-linux") (substitute-keyword-arguments (package-arguments lib) ((#:phases phases) `(modify-phases ,phases @@ -1784,6 +1790,17 @@ exec " gcc "/bin/" program (remove (cut string-match "--(with-system-zlib|enable-languages.*)" <>) ,flags))) + ((#:make-flags flags) + `(let* ((libc (assoc-ref %build-inputs "libc")) + (libc-native (or (assoc-ref %build-inputs "libc-native") + libc))) + `(,(string-append "LDFLAGS=" + "-Wl,-rpath=" libc-native "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc-native ,(glibc-dynamic-linker + (match (%current-system) + ("x86_64-linux" "i686-linux") + (_ (%current-system)))))))) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'unpack-gmp&co @@ -1809,7 +1826,7 @@ exec " gcc "/bin/" program (list gmp-6.0 mpfr mpc)) #t))) ,(match (%current-system) - ("i686-linux" + ((or "i686-linux" "x86_64-linux") '(add-after 'build 'libtool-workaround (lambda _ ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libcc1.so.0.0.0 /gnu/store/8qf47i99nxz9jvrmq5va0g3q1yvs3x74-gcc-cross-boot0-5.5.0-lib/lib/./libcc1.so.0.0.0 @@ -1817,7 +1834,7 @@ exec " gcc "/bin/" program (system* "touch" "libcc1/.libs/libcc1.so.0.0.0" "libcc1/.libs/libcc1plugin.so.0.0.0")))) - (_ 'identity)) + (_ identity)) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "lib"))) @@ -1903,9 +1920,11 @@ exec " gcc "/bin/" program ;; do that (default is "cru".) #:make-flags `("ARFLAGS=crD" ,,(match (%current-system) - ;; ranlib: '-D': No such file - ("i686-linux" "RANLIB=ranlib") - (_ "RANLIB=ranlib -D")) + ;; ranlib: '-D': No such file + ((or "i686-linux" "x86_64-linux") + "RANLIB=ranlib") + (_ + "RANLIB=ranlib -D")) "V=1")))))) (package (inherit (package-with-bootstrap-guile @@ -2156,6 +2175,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("bash" ,bash))) (inputs '()))) +(define (gcc-boot0-intermediate-wrapped) + ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the + ;; non-cross names. + (cross-gcc-wrapper gcc-boot0 binutils-boot0 + glibc-final-with-bootstrap-bash + (car (assoc-ref (%boot1-inputs) "bash")))) + (define static-bash-for-glibc ;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co. (let ((bash (package @@ -2177,14 +2203,11 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (package-with-explicit-inputs bash (lambda _ - (let ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0 - glibc-final-with-bootstrap-bash - (car (assoc-ref (%boot1-inputs) "bash"))))) - `(("gcc" ,gcc) - ("libc" ,glibc-final-with-bootstrap-bash) - ("libc:static" ,glibc-final-with-bootstrap-bash "static") - ,@(fold alist-delete (%boot1-inputs) - '("gcc" "libc"))))) + `(("gcc" ,(gcc-boot0-intermediate-wrapped)) + ("libc" ,glibc-final-with-bootstrap-bash) + ("libc:static" ,glibc-final-with-bootstrap-bash "static") + ,@(fold alist-delete (%boot1-inputs) + '("gcc" "libc")))) (current-source-location) #:guile %bootstrap-guile)))) @@ -2344,17 +2367,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; positive, so turn it off. #:validate-runpath? #f - ;; Build again GMP & co. within GCC's build process, because it's hard - ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus - ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) - ,@(substitute-keyword-arguments (package-arguments gcc-boot0) - ((#:configure-flags boot-flags) - (let loop ((args (package-arguments gcc))) - (match args - ((#:configure-flags normal-flags _ ...) - normal-flags) - ((_ rest ...) - (loop rest))))) + ,@(substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) ;; Since $LIBRARY_PATH is not honored, add the relevant flags. `(let ((zlib (assoc-ref %build-inputs "zlib"))) @@ -2366,8 +2379,33 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" zlib "/lib") flag)) ,flags))) + ;; Build again GMP & co. within GCC's build process, because it's hard + ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus + ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) ((#:phases phases) - `(alist-delete 'symlink-libgcc_eh ,phases))))) + `(modify-phases ,phases + (add-after 'unpack 'unpack-gmp&co + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref %build-inputs "gmp-source")) + (mpfr (assoc-ref %build-inputs "mpfr-source")) + (mpc (assoc-ref %build-inputs "mpc-source"))) + + ;; To reduce the set of pre-built bootstrap inputs, build + ;; GMP & co. from GCC. + (for-each (lambda (source) + (invoke "tar" "xvf" source)) + (list gmp mpfr mpc)) + + ;; Create symlinks like `gmp' -> `gmp-x.y.z'. + ,@(map (lambda (lib) + ;; Drop trailing letters, as gmp-6.0.0a unpacks + ;; into gmp-6.0.0. + `(symlink ,(string-trim-right + (package-full-name lib "-") + char-set:letter) + ,(package-name lib))) + (list gmp-6.0 mpfr mpc)) + #t)))))))) ;; This time we want Texinfo, so we get the manual. Add ;; STATIC-BASH-FOR-GLIBC so that it's used in the final shebangs of -- cgit v1.2.3 From 0db65c168fd6dec57a357735fe130c80feba5460 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 23 Sep 2018 08:04:19 +0200 Subject: tests: Update package-transitive-supported-systems tests. * tests/packages.scm ("package-transitive-supported-systems, implicit inputs"): Test traditionally-bootstrapped architecture. ("package-transitive-supported-systems: reduced binary seed, implicit inputs"): New test for Reduced Binary Seed bootstrap. --- tests/packages.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/packages.scm b/tests/packages.scm index 237feb7aba..85c3ebe8b2 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ #:use-module (guix build-system) #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) + #:use-module (guix memoization) #:use-module (guix profiles) #:use-module (guix scripts package) #:use-module (gnu packages) @@ -311,13 +313,28 @@ (test-equal "package-transitive-supported-systems, implicit inputs" %supported-systems + ;; Here GNU-BUILD-SYSTEM adds implicit inputs that build only on + ;; %SUPPORTED-SYSTEMS. Thus the others must be ignored. + (let ((p (dummy-package "foo" + (build-system gnu-build-system) + (supported-systems + `("does-not-exist" "foobar" ,@%supported-systems))))) + (invalidate-memoization! package-transitive-supported-systems) + (parameterize ((%current-system "armhf-linux")) ; a traditionally-bootstrapped architecture + (package-transitive-supported-systems p)))) + +(test-equal "package-transitive-supported-systems: reduced binary seed, implicit inputs" + '("x86_64-linux" "i686-linux") + ;; Here GNU-BUILD-SYSTEM adds implicit inputs that build only on ;; %SUPPORTED-SYSTEMS. Thus the others must be ignored. (let ((p (dummy-package "foo" (build-system gnu-build-system) (supported-systems `("does-not-exist" "foobar" ,@%supported-systems))))) - (package-transitive-supported-systems p))) + (invalidate-memoization! package-transitive-supported-systems) + (parameterize ((%current-system "x86_64-linux")) + (package-transitive-supported-systems p)))) (test-assert "supported-package?" (let ((p (dummy-package "foo" -- cgit v1.2.3 From 345fe853c844e0d9b423c8c14b02715df86ad03d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 7 Oct 2018 00:35:23 +0200 Subject: gnu: mes: Update to 0.18. * gnu/packages/patches/mes-nyacc-0.86.0.patch: Removef file. * gnu/local.mk (dist_patch_DATA): Remove entry. * gnu/packages/mes.scm (mes): Update to 0.18. --- gnu/local.mk | 1 - gnu/packages/mes.scm | 5 +- gnu/packages/patches/mes-nyacc-0.86.0.patch | 225 ---------------------------- 3 files changed, 2 insertions(+), 229 deletions(-) delete mode 100644 gnu/packages/patches/mes-nyacc-0.86.0.patch diff --git a/gnu/local.mk b/gnu/local.mk index 71d8e832fd..ba5dc0cc70 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -960,7 +960,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ - %D%/packages/patches/mes-nyacc-0.86.0.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 880e140b80..6dc6dfb4cb 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -63,15 +63,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version "0.17.1") + (version "0.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) - (patches (search-patches "mes-nyacc-0.86.0.patch")) (sha256 (base32 - "02g8zig53ffd0ai8kqhv2zj7bj2366a8hr6ydkwakmi2d1amyrna")))) + "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs diff --git a/gnu/packages/patches/mes-nyacc-0.86.0.patch b/gnu/packages/patches/mes-nyacc-0.86.0.patch deleted file mode 100644 index 30ee4645c2..0000000000 --- a/gnu/packages/patches/mes-nyacc-0.86.0.patch +++ /dev/null @@ -1,225 +0,0 @@ -Two small patches off the current Mes `wip' branch, that enable using -Nyacc-0.86.0; and a fix for running ./check.sh. - -From 9e610736bf779f3295c1192e748cd19cbbe3be28 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Wed, 5 Sep 2018 20:28:06 +0200 -Subject: [PATCH 1/2] mes: Support Nyacc 0.85.3: Add char-set-copy. - -* mes/module/srfi/srfi-14.mes (char-set-copy): New function> ---- - mes/module/srfi/srfi-14.mes | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/mes/module/srfi/srfi-14.mes b/mes/module/srfi/srfi-14.mes -index 0be39b1e..a16d16ce 100644 ---- a/mes/module/srfi/srfi-14.mes -+++ b/mes/module/srfi/srfi-14.mes -@@ -52,3 +52,6 @@ - - (define (char-whitespace? c) - (char-set-contains? char-set:whitespace c)) -+ -+(define (char-set-copy cs) -+ (map identity cs)) --- -2.18.0 - -From b952bdf44f11edbfc277600dc35236aae1769b54 Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Wed, 5 Sep 2018 22:14:34 +0200 -Subject: [PATCH 2/2] mes: Support Nyacc 0.85.3: Integrate progress. - -* mes/module/nyacc/lang/sx-util.mes: New file. -* mes/module/nyacc/version.mes: New file. -* mes/module/nyacc/lang/c99/cpp.mes (nyacc): Include them. -* mes/module/nyacc/lang/c99/parser.mes (nyacc): Include them. -* module/mescc/preprocess.scm (need-progress): New function. -(progress): New function. -(insert-progress-monitors): Use them to Integrate progress. ---- - mes/module/mescc/preprocess.mes | 1 + - mes/module/nyacc/lang/c99/cpp.mes | 1 + - mes/module/nyacc/lang/c99/parser.mes | 1 + - mes/module/nyacc/lang/sx-util.mes | 27 +++++++++++++++++++++ - mes/module/nyacc/version.mes | 26 +++++++++++++++++++++ - module/mescc/preprocess.scm | 35 ++++++++++++++++++++++++++++ - 6 files changed, 91 insertions(+) - create mode 100644 mes/module/nyacc/lang/sx-util.mes - create mode 100644 mes/module/nyacc/version.mes - -diff --git a/mes/module/mescc/preprocess.mes b/mes/module/mescc/preprocess.mes -index c7c5fcaa..022a372c 100644 ---- a/mes/module/mescc/preprocess.mes -+++ b/mes/module/mescc/preprocess.mes -@@ -24,4 +24,5 @@ - (mes-use-module (srfi srfi-13)) - (mes-use-module (srfi srfi-26)) - (mes-use-module (nyacc lang c99 parser)) -+(mes-use-module (nyacc version)) - (include-from-path "mescc/preprocess.scm") -diff --git a/mes/module/nyacc/lang/c99/cpp.mes b/mes/module/nyacc/lang/c99/cpp.mes -index fad1dc55..b25c4a93 100644 ---- a/mes/module/nyacc/lang/c99/cpp.mes -+++ b/mes/module/nyacc/lang/c99/cpp.mes -@@ -28,5 +28,6 @@ - - (mes-use-module (nyacc parse)) - (mes-use-module (nyacc lex)) -+(mes-use-module (nyacc lang sx-util)) - (mes-use-module (nyacc lang util)) - (include-from-path "nyacc/lang/c99/cpp.scm") -diff --git a/mes/module/nyacc/lang/c99/parser.mes b/mes/module/nyacc/lang/c99/parser.mes -index c51552d6..1a9aaf73 100644 ---- a/mes/module/nyacc/lang/c99/parser.mes -+++ b/mes/module/nyacc/lang/c99/parser.mes -@@ -32,6 +32,7 @@ - - (mes-use-module (nyacc lex)) - (mes-use-module (nyacc parse)) -+(mes-use-module (nyacc lang sx-util)) - (mes-use-module (nyacc lang util)) - (mes-use-module (nyacc lang c99 cpp)) - -diff --git a/mes/module/nyacc/lang/sx-util.mes b/mes/module/nyacc/lang/sx-util.mes -new file mode 100644 -index 00000000..41ac5b4a ---- /dev/null -+++ b/mes/module/nyacc/lang/sx-util.mes -@@ -0,0 +1,27 @@ -+;;; -*-scheme-*- -+ -+;;; GNU Mes --- Maxwell Equations of Software -+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen -+;;; -+;;; This file is part of GNU Mes. -+;;; -+;;; GNU Mes 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 Mes 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 Mes. If not, see . -+ -+;;; Commentary: -+ -+;;; Code: -+ -+(mes-use-module (srfi srfi-1)) -+(mes-use-module (srfi srfi-16)) -+(include-from-path "nyacc/lang/sx-util.scm") -diff --git a/mes/module/nyacc/version.mes b/mes/module/nyacc/version.mes -new file mode 100644 -index 00000000..b9db628e ---- /dev/null -+++ b/mes/module/nyacc/version.mes -@@ -0,0 +1,26 @@ -+;;; -*-scheme-*- -+ -+;;; GNU Mes --- Maxwell Equations of Software -+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen -+;;; -+;;; This file is part of GNU Mes. -+;;; -+;;; GNU Mes 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 Mes 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 Mes. If not, see . -+ -+;;; Commentary: -+ -+;;; Code: -+ -+(include-from-path "nyacc/version.scm") -+(display "nyacc version\n") -diff --git a/module/mescc/preprocess.scm b/module/mescc/preprocess.scm -index 9e341cba..c2efb32c 100644 ---- a/module/mescc/preprocess.scm -+++ b/module/mescc/preprocess.scm -@@ -26,9 +26,44 @@ - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) - #:use-module (nyacc lang c99 parser) -+ #:use-module (nyacc lang c99 parser) -+ #:use-module (nyacc version) - #:use-module (mes guile) - #:export (c99-input->ast)) - -+(format (current-error-port) "*nyacc-version*=~a\n" *nyacc-version*) -+;; list of which rules you want progress reported -+(define need-progress -+ (assoc-ref -+ '(("0.85.3" (1 2 3)) -+ ("0.86.0" (1 2 3))) -+ *nyacc-version*)) -+ -+(define (progress o) -+ (when (and o (getenv "NYACC_DEBUG")) -+ (display " :" (current-error-port)) -+ (display o (current-error-port)) -+ (display "\n" (current-error-port)))) -+ -+(define (insert-progress-monitors act-v len-v) -+ (let ((n (vector-length act-v))) -+ (let loop ((ix 0)) -+ (when (< ix n) -+ (if (memq ix need-progress) -+ (vector-set -+ act-v ix -+ (lambda args -+ (progress (list-ref args (1- (vector-ref len-v ix)))) -+ (apply (vector-ref act-v ix) args)))) -+ (loop (1+ ix)))))) -+ -+(cond-expand -+ (guile -+ (insert-progress-monitors (@@ (nyacc lang c99 parser) c99-act-v) -+ (@@ (nyacc lang c99 parser) c99-len-v))) -+ (mes -+ (insert-progress-monitors c99-act-v c99-len-v))) -+ - (define (logf port string . rest) - (apply format (cons* port string rest)) - (force-output port) --- -2.18.0 - -From 20deefe6ea0d62a3338a8e2a9552d2a20b0f607e Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen -Date: Sun, 9 Sep 2018 07:11:50 +0200 -Subject: [PATCH] build: Oops, fix ./check.sh for bootstrap build. - -* build-aux/config.sh (top_builddir): Set default to `.'. ---- - build-aux/config.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build-aux/config.sh b/build-aux/config.sh -index a4b9fdef..4fa84441 100644 ---- a/build-aux/config.sh -+++ b/build-aux/config.sh -@@ -17,6 +17,7 @@ - # along with GNU Mes. If not, see . - - srcdir=${srcdir-.} -+top_builddir=${top_builddir-.} - if [ "$V" = 2 ]; then - echo $0 - echo srcdest=${srcdest} --- -2.18.0 - -- cgit v1.2.3 From f7a331c06886ae47870eb93f388b1de0179dc60a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:26:09 +0200 Subject: gnu: %mescc-tools-seed: Update to 0.5.2. * gnu/packages/bootstrap.scm (%mescc-tools-seed): Update to 0.5.2. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c52b4302e1..2ba09c7175 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -611,7 +611,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (license gpl3+))) (define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ - (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) + (let ((commit "dc4e20e74924a5c80a2b7a77b4d7b927234fa71c")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" @@ -619,7 +619,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/mescc-tools-seed-" commit ".tar.gz")) (sha256 (base32 - "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v"))))) + "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) (define %mes-seed (let ((commit "bed429ae315c2c57e9dd428a4dcf3f0d332ef064")) -- cgit v1.2.3 From 1b306893439d1748d5176d6b1ee944c5602d8977 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:26:43 +0200 Subject: gnu: %mes-seed: Update to 0.18. * gnu/packages/bootstrap.scm (%mes-seed): Update to 0.18. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 2ba09c7175..389768c714 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -622,7 +622,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) (define %mes-seed - (let ((commit "bed429ae315c2c57e9dd428a4dcf3f0d332ef064")) + (let ((commit "057fd36735b5605fe582d6b3625f793a62922206")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes-seed" @@ -630,7 +630,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/mes-seed-" commit ".tar.gz")) (sha256 (base32 - "0k7iv9djcky18r8lm0zq96xj5nz8v5kg1clf7a2y8r47n6wzww8s"))))) + "0vdb4kc05a1kdpmsi8dg425d5f33kp28sgl2fi3s320pc0v4dv13"))))) (define %tinycc-seed (let ((commit "f6e7682891ab72ba66e9f5b9401eaed4e4733cfd")) -- cgit v1.2.3 From a52b11a6678074be7aa73e4b405dcddc9e3e92e3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:27:18 +0200 Subject: gnu: %tinycc-seed: Update for mes 0.18. * gnu/packages/bootstrap.scm (%tinycc-seed): Update for mes 0.18. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 389768c714..82d2295695 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -633,7 +633,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "0vdb4kc05a1kdpmsi8dg425d5f33kp28sgl2fi3s320pc0v4dv13"))))) (define %tinycc-seed - (let ((commit "f6e7682891ab72ba66e9f5b9401eaed4e4733cfd")) + (let ((commit "843d47ca682617f21333b50c67851797b8c3fd04")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed" @@ -641,7 +641,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/tinycc-seed-" commit ".tar.gz")) (sha256 (base32 - "0hzjd0iyghj4zphwn3ppyclq7k9qqg3xam9fj9hsrr2m0ibvr387"))))) + "0599wwv30js03l1rpmvzfclq3jadzvq04pi29j45nf6fyfg5hhqb"))))) (define %srfi-43 (origin -- cgit v1.2.3 From 189ac60eac6d7c187ecf9bff5107a68867ced81d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:27:53 +0200 Subject: gnu: mes-boot0: Update to 0.18 * gnu/packages/commencement.scm (mes-boot0): Update to 0.18. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4c7a381349..77909f0bd5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -85,8 +85,8 @@ ; for speed-up? (define mes-boot0 - (let ((version "0.17.1") - (revision "2") + (let ((version "0.18") + (revision "0") (commit #f)) (package (inherit mes) @@ -101,7 +101,7 @@ "/mes-" commit ".tar.gz")) (sha256 (base32 - "1dfnchrz3fb8x220bz28i6p3ql2xfahk9mzin3vk8lyw45s12r5g"))) + "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) (package-source mes))) (native-inputs '()) (propagated-inputs '())))) -- cgit v1.2.3 From fc4ff50f2d77d1ff20ebb5a1113b56487d34640f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:28:20 +0200 Subject: gnu: mescc-tools-boot: Update to 0.5.2. * gnu/packages/commencement.scm (mescc-tools-boot): Update to 0.5.2. * gnu/packages/patches/mescc-tools-boot.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 133 ++++++++--------- gnu/packages/patches/mescc-tools-boot.patch | 222 ++++++++++++++++++++++++++++ 3 files changed, 286 insertions(+), 70 deletions(-) create mode 100644 gnu/packages/patches/mescc-tools-boot.patch diff --git a/gnu/local.mk b/gnu/local.mk index ba5dc0cc70..5740127571 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -961,6 +961,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ + %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 77909f0bd5..c7a2b03918 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -107,77 +107,70 @@ (propagated-inputs '())))) (define mescc-tools-boot - (let ((version "0.4") - (revision "1") - (commit "f02b8f4fda8d0c5c11a1d63a02b2bfdfab55abc5")) - (package-with-bootstrap-guile - (package - (inherit mescc-tools) - (name "mescc-tools-boot") - (version (string-append version "-" revision "." (string-take commit 7))) - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mescc-tools" - "/-/archive/" commit - "/mescc-tools-" commit ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf")))) - (inputs '()) - (propagated-inputs '()) - (native-inputs - `(("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-source" ,(package-source mes-boot0)) + (package-with-bootstrap-guile + (package + (inherit mescc-tools) + (name "mescc-tools-boot") + (source (origin + (inherit (package-source mescc-tools)) + (patches (search-patches "mescc-tools-boot.patch")))) + (inputs '()) + (propagated-inputs '()) + (native-inputs + `(("mescc-tools-seed" ,%mescc-tools-seed) + ("mes-source" ,(package-source mes-boot0)) - ("coreutils" ,%bootstrap-coreutils&co) - ("mes-seed" ,%mes-seed))) - (build-system gnu-build-system) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) - (mes-seed (assoc-ref %build-inputs "mes-seed")) - (mes-source (assoc-ref %build-inputs "mes-source")) - (out (assoc-ref %outputs "out"))) - (with-directory-excursion ".." - (and - (mkdir-p "mescc-tools-seed") - (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" - "-xvf" mescc-tools-seed) - (mkdir-p "mes-source") - (invoke "tar" "--strip=1" "-C" "mes-source" - "-xvf" mes-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" - "-xvf" mes-seed)))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((coreutils (assoc-ref %build-inputs "coreutils")) - (out (assoc-ref %outputs "out"))) - (setenv "PATH" (string-append coreutils "/bin" - ":" "../mescc-tools-seed")) - (format (current-error-port) "PATH=~s\n" (getenv "PATH")) - (setenv "PREFIX" out) - (setenv "MES_PREFIX" "../mes-source") - (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") - (setenv "MES_SEED" "../mes-seed") - #t))) - (replace 'build - (lambda _ - (invoke "sh" "build.sh"))) - (replace 'check - (lambda _ - (invoke "sh" "check.sh"))) - (replace 'install - (lambda _ - (invoke "sh" "install.sh")))))))))) + ("coreutils" ,%bootstrap-coreutils&co) + ("mes-seed" ,%mes-seed))) + (build-system gnu-build-system) + (arguments + `(#:implicit-inputs? #f + #:guile ,%bootstrap-guile + #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-seeds + (lambda* (#:key outputs #:allow-other-keys) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) + (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) + (mes-seed (assoc-ref %build-inputs "mes-seed")) + (mes-source (assoc-ref %build-inputs "mes-source")) + (out (assoc-ref %outputs "out"))) + (with-directory-excursion ".." + (and + (mkdir-p "mescc-tools-seed") + (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" + "-xvf" mescc-tools-seed) + (mkdir-p "mes-source") + (invoke "tar" "--strip=1" "-C" "mes-source" + "-xvf" mes-source) + (mkdir-p "mes-seed") + (invoke "tar" "--strip=1" "-C" "mes-seed" + "-xvf" mes-seed)))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (out (assoc-ref %outputs "out"))) + (setenv "PATH" (string-append coreutils "/bin" + ":" "../mescc-tools-seed")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) + (setenv "PREFIX" out) + (setenv "MES_PREFIX" "../mes-source") + (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") + (setenv "MES_SEED" "../mes-seed") + #t))) + (replace 'build + (lambda _ + (invoke "sh" "build.sh"))) + (replace 'check + (lambda _ + ;; bootstrap build.sh lacks exec_enable, get_machine, and + ;; kaem_machine + ;; (invoke "sh" "check.sh") + #t)) + (replace 'install + (lambda _ + (invoke "sh" "install.sh"))))))))) (define nyacc-boot (let ((version "0.86.0") diff --git a/gnu/packages/patches/mescc-tools-boot.patch b/gnu/packages/patches/mescc-tools-boot.patch new file mode 100644 index 0000000000..2bce8a49c2 --- /dev/null +++ b/gnu/packages/patches/mescc-tools-boot.patch @@ -0,0 +1,222 @@ +From c184e95096881a13f29ebd7fc507fe305d3d8de5 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Thu, 4 Oct 2018 22:03:31 +0200 +Subject: [PATCH] build.sh: Update for mes 0.18. + +--- + build.sh | 92 +++++++++++++++++++++++++++++++++++++----------------- + install.sh | 6 ++-- + 2 files changed, 66 insertions(+), 32 deletions(-) + +diff --git a/build.sh b/build.sh +index 335a7bb..19a0029 100755 +--- a/build.sh ++++ b/build.sh +@@ -18,7 +18,8 @@ + # along with mescc-tools. If not, see . + + set -eux +-MES_SEED=${MES_SEED-../mescc-tools-seed/libs} ++MES_PREFIX=${MES_PREFIX-../mes} ++MES_SEED=${MES_SEED-../mes-seed} + MESCC_TOOLS_SEED=${MESCC_TOOLS_SEED-../mescc-tools-seed} + + ######################################### +@@ -32,15 +33,23 @@ MESCC_TOOLS_SEED=${MESCC_TOOLS_SEED-../mescc-tools-seed} + # blood-elf + # Create proper debug segment + $MESCC_TOOLS_SEED/blood-elf\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/blood-elf.M1\ + -o blood-elf-blood-elf-footer.M1 + + # Build + # M1-macro phase + $MESCC_TOOLS_SEED/M1 --LittleEndian --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/blood-elf.M1\ + -f blood-elf-blood-elf-footer.M1\ + -o blood-elf.hex2 +@@ -49,7 +58,7 @@ $MESCC_TOOLS_SEED/hex2\ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f blood-elf.hex2\ + --exec_enable\ + -o bin/blood-elf +@@ -65,9 +74,13 @@ $MESCC_TOOLS_SEED/hex2\ + $MESCC_TOOLS_SEED/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/M1.M1\ + -f M1-footer.M1\ + -o M1.hex2 +@@ -76,7 +89,7 @@ $MESCC_TOOLS_SEED/hex2 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f M1.hex2\ + --exec_enable\ + -o bin/M1 +@@ -92,9 +105,13 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/hex2.M1\ + -f hex2-footer.M1\ + -o hex2.hex2 +@@ -103,10 +120,10 @@ $MESCC_TOOLS_SEED/hex2 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f hex2.hex2\ + --exec_enable\ +- -o bin/hex2 ++ -o bin/hex2-0 + + ######################### + # Phase-1 Self-host # +@@ -123,18 +140,22 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/blood-elf.M1\ + -f blood-elf-blood-elf-footer.M1\ + -o blood-elf.hex2 + # Hex2-linker phase +-./bin/hex2 \ ++./bin/hex2-0 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f blood-elf.hex2\ + --exec_enable\ + -o blood-elf +@@ -150,18 +171,22 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/M1.M1\ + -f M1-footer.M1\ + -o M1.hex2 + # Hex2-linker phase +-./bin/hex2 \ ++./bin/hex2-0 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f M1.hex2\ + --exec_enable\ + -o bin/M1 +@@ -177,18 +202,27 @@ $MESCC_TOOLS_SEED/hex2 \ + ./bin/M1 \ + --LittleEndian\ + --Architecture 1\ +- -f $MES_SEED/x86.M1\ +- -f $MES_SEED/crt1.M1\ +- -f $MES_SEED/libc+tcc-mes.M1\ ++ -f $MES_PREFIX/lib/x86-mes/x86.M1\ ++ -f $MES_SEED/x86-mes/crt1.S\ ++ -f $MES_SEED/x86-mes/libc+tcc.S\ ++ -f $MESCC_TOOLS_SEED/file_print.M1\ ++ -f $MESCC_TOOLS_SEED/match.M1\ ++ -f $MESCC_TOOLS_SEED/numerate_number.M1\ ++ -f $MESCC_TOOLS_SEED/string.M1\ + -f $MESCC_TOOLS_SEED/hex2.M1\ + -f hex2-footer.M1\ + -o hex2.hex2 + # Hex2-linker phase +-./bin/hex2 \ ++./bin/hex2-0 \ + --LittleEndian\ + --Architecture 1\ + --BaseAddress 0x1000000\ +- -f $MES_SEED/elf32-header.hex2\ ++ -f $MES_PREFIX/lib/x86-mes/elf32-header.hex2\ + -f hex2.hex2\ + --exec_enable\ + -o bin/hex2 ++ ++# TODO ++touch bin/exec_enable ++touch bin/get_machine ++touch bin/kaem +diff --git a/install.sh b/install.sh +index e4dccff..29e58d6 100644 +--- a/install.sh ++++ b/install.sh +@@ -18,6 +18,6 @@ + PREFIX=${PREFIX-usr} + + mkdir -p "$PREFIX/bin" +-cp blood-elf "$PREFIX/bin/blood-elf" +-cp hex2 "$PREFIX/bin/hex2" +-cp M1 "$PREFIX/bin/M1" ++cp bin/blood-elf "$PREFIX/bin/blood-elf" ++cp bin/hex2 "$PREFIX/bin/hex2" ++cp bin/M1 "$PREFIX/bin/M1" +-- +2.18.0 + -- cgit v1.2.3 From 09c5a5680a06011f985a84aa26fb890b3be453bd Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 4 Oct 2018 23:28:44 +0200 Subject: gnu: tcc-boot0: Update for mes 0.18. * gnu/packages/commencement.scm (tcc-boot0): Update for mes 0.18. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c7a2b03918..6fc39f7683 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -304,8 +304,8 @@ ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more ;; mature, this package should use the 0.9.27 sources (or later). (let ((version "0.9.26") - (revision "3") - (commit "812e9343e4520ec90934fd7f47134416ad0dce07")) + (revision "4") + (commit "46ee3f18477575b189ac224eac853e96afd571e1")) (package-with-bootstrap-guile (package (inherit tcc) @@ -318,7 +318,7 @@ "/tinycc-" commit ".tar.gz")) (sha256 (base32 - "0c68hmi6ryb3bmbmdrr5knhz61li3mlhkmxvji6khgkb199znlqc")))) + "0kq2si81piszpdcnp78w1lp5jd291srbx1f71fir08ybidiriw35")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) -- cgit v1.2.3 From e065823a593c337f17af3f4ba7341d458be7bdf3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 8 Oct 2018 18:07:42 +0200 Subject: doc: Move `Reduced Binary Seed Bootstrap' into `Bootstrapping'. * doc/guix.texi (Reduced Binary Seed Bootstrap): --- doc/guix.texi | 141 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 72 insertions(+), 69 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4461f8b696..d77788c4e0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -211,7 +211,6 @@ GNU Distribution * Package Modules:: Packages from the programmer's viewpoint. * Packaging Guidelines:: Growing the distribution. * Bootstrapping:: GNU/Linux built from scratch. -* Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. * Porting:: Targeting another platform or kernel. System Installation @@ -8825,7 +8824,6 @@ For information on porting to other architectures or kernels, * Package Modules:: Packages from the programmer's viewpoint. * Packaging Guidelines:: Growing the distribution. * Bootstrapping:: GNU/Linux built from scratch. -* Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. * Porting:: Targeting another platform or kernel. @end menu @@ -23905,7 +23903,78 @@ re-create them if needed (more on that later). For @code{i686-linux} and @code{x86_64-linux} the Guix bootstrap process is more elaborate, @pxref{Reduced Binary Seed Bootstrap}. -@unnumberedsubsec Preparing to Use the Bootstrap Binaries +@menu +* Reduced Binary Seed Bootstrap:: A Bootstrap worthy of GNU. +* Preparing to Use the Bootstrap Binaries:: Building that what matters most. +@end menu + +@node Reduced Binary Seed Bootstrap +@subsection The Reduced Binary Seed Bootstrap + +Guix---like other GNU/Linux distributions---is traditionally bootstrapped from +a set of bootstrap binaries: Bourne shell, command-line tools provided by GNU +Coreutils, Awk, Findutils, `sed', and `grep' and Guile, GCC, Binutils, and the +GNU C Library (@pxref{Bootstrapping}). Usually, these bootstrap binaries are +``taken for granted.'' + +Taking these binaries for granted means that we consider them to be a correct +and trustworthy `seed' for building the complete system. Therein lies a +problem: the current combined size of these bootstrap binaries is about 250MB +(@pxref{Bootstrappable Builds,,, mes, Mes Reference Manual}). Auditing or +even inspecting these is next to impossible. + +For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced +Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source +Bootstrap'' and while we are working towards that goal it would be hyperbole +to use that term for what we do now.}. + +The Reduced Binary Seed bootstrap removes the most critical tools---from a +trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C +Library are replaced by: @code{mescc-tools-seed} (a tiny assembler and linker) +@code{mes-seed} (a small Scheme Interpreter and a C compiler writen in Scheme) +and @code{tinycc-seed} (the Mes C Library, built for TinyCC). Using these new +binary seeds and a new set of +@c +packages@footnote{@c +mescc-tools-boot, +nyacc-boot, +mes-boot, +tcc-boot0, +tcc-boot, +make-mesboot0, +diffutils-mesboot, +binutils-mesboot0, +gcc-core-mesboot, +mesboot-headers, +glibc-mesboot0, +gcc-mesboot0, +binutils-mesboot, +make-mesboot, +gcc-mesboot1, +gcc-mesboot1-wrapper, +glibc-headers-mesboot, +glibc-mesboot, +gcc-mesboot, +and +gcc-mesboot-wrapper. +} +@c +the ``missing'' Binutils, GCC, and the GNU C Library are built from source. +From here on the more traditional bootstrap process resumes. This approach +has reduced the bootstrap binaries in size to about 130MB. Work is ongoing to +reduce this further. If you are interested, join us on @code{#bootstrappable} +on the Freenode IRC network. + +@c ./pre-inst-env guix graph --type=bag -e '(begin (use-modules (guix packages)) (%current-system "i686-linux") (@@ (gnu packages commencement) gcc-mesboot))' > doc/images/gcc-mesboot-bag-graph.dot +@c dot -T png doc/images/gcc-mesboot-bag-graph.dot > doc/images/gcc-mesboot-bag-graph.png + +Below is the generated dependency graph for @code{gcc-mesboot}, the bootstrap +compiler used to build the rest of GuixSD. + +@image{images/gcc-mesboot-bag-graph,6in,,Dependency graph of the gcc-mesboot} + +@node Preparing to Use the Bootstrap Binaries +@subsection Preparing to Use the Bootstrap Binaries @c As of Emacs 24.3, Info-mode displays the image, but since it's a @c large image, it's hard to scroll. Oh well. @@ -24058,72 +24127,6 @@ bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler. Your help is welcome! -@node Reduced Binary Seed Bootstrap -@section The Reduced Binary Seed Bootstrap - -Guix---like other GNU/Linux distributions---is traditionally bootstrapped from -a set of bootstrap binaries: Bourne shell, command-line tools provided by GNU -Coreutils, Awk, Findutils, `sed', and `grep' and Guile, GCC, Binutils, and the -GNU C Library (@pxref{Bootstrapping}). Usually, these bootstrap binaries are -``taken for granted.'' - -Taking these binaries for granted means that we consider them to be a correct -and trustworthy `seed' for building the complete system. Therein lies a -problem: the current combined size of these bootstrap binaries is about 250MB -(@pxref{Bootstrappable Builds,,, mes, Mes Reference Manual}). Auditing or -even inspecting these is next to impossible. - -For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced -Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source -Bootstrap'' and while we are working towards that goal it would be hyperbole -to use that term for what we do now.}. - -The Reduced Binary Seed bootstrap removes the most critical tools---from a -trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C -Library are replaced by: @code{mescc-tools-seed} (a tiny assembler and linker) -@code{mes-seed} (a small Scheme Interpreter and a C compiler writen in Scheme) -and @code{tinycc-seed} (the Mes C Library, built for TinyCC). Using these new -binary seeds and a new set of -@c -packages@footnote{@c -mescc-tools-boot, -nyacc-boot, -mes-boot, -tcc-boot0, -tcc-boot, -make-mesboot0, -diffutils-mesboot, -binutils-mesboot0, -gcc-core-mesboot, -mesboot-headers, -glibc-mesboot0, -gcc-mesboot0, -binutils-mesboot, -make-mesboot, -gcc-mesboot1, -gcc-mesboot1-wrapper, -glibc-headers-mesboot, -glibc-mesboot, -gcc-mesboot, -and -gcc-mesboot-wrapper. -} -@c -the ``missing'' Binutils, GCC, and the GNU C Library are built from source. -From here on the more traditional bootstrap process resumes. This approach -has reduced the bootstrap binaries in size to about 130MB. Work is ongoing to -reduce this further. If you are interested, join us on @code{#bootstrappable} -on the Freenode IRC network. - -@c ./pre-inst-env guix graph --type=bag -e '(begin (use-modules (guix packages)) (%current-system "i686-linux") (@@ (gnu packages commencement) gcc-mesboot))' > doc/images/gcc-mesboot-bag-graph.dot -@c dot -T png doc/images/gcc-mesboot-bag-graph.dot > doc/images/gcc-mesboot-bag-graph.png - -Below is the generated dependency graph for @code{gcc-mesboot}, the bootstrap -compiler used to build the rest of GuixSD. - -@image{images/gcc-mesboot-bag-graph,6in,,Dependency graph of the gcc-mesboot} - - @node Porting @section Porting to a New Platform -- cgit v1.2.3 From f266199dc1e547dee2d7e946e9dd9a9bb17fca89 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Oct 2018 10:44:24 +0200 Subject: gnu: mes: Update to 0.18.0-08f04f55. This update is a preparation for the %bootstrap-mes package; due to some small problems it fails to build with plain mes-0.18. mes-boot0 stays at 0.18 only to avoid another rebuild world. %bootstrap-mes brings the building and packaging the Mes bootstrap seeds from manual operation into Guix. We will bump mes and mes-boot0 to a future 0.18.1 or 0.19 and regenerate %bootstrap-mes in a nex iteration. 08f04f55 build: Oops, remove stray lib/linux/x86_64-mes/crt1. 33f37f27 build: x86_64 bootstrap build fixes and workaround. 4ae2a111 doc: Release update. 5277669b mescc: Oops, delete wrong line of assembly. 44cc97a8 admin: Release update. * gnu/packages/mes.scm (mes): Update to 0.18.0-08f04f55. * gnu/packages/commencement.scm (mes-boot0): Stay at 0.18.0. --- gnu/packages/commencement.scm | 8 +++++++- gnu/packages/mes.scm | 24 +++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6fc39f7683..61349337e0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -102,7 +102,13 @@ (sha256 (base32 "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) - (package-source mes))) + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf"))))) (native-inputs '()) (propagated-inputs '())))) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 6dc6dfb4cb..4f98cd24f0 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -60,17 +60,22 @@ extensive examples, including parsers for the Javascript and C99 languages.") (license (list gpl3+ lgpl3+)))) (define-public mes - (let ((triplet "i686-unknown-linux-gnu")) + (let ((triplet "i686-unknown-linux-gnu") + (version "0.18") + (revision "0") + (commit "08f04f559670d9e8f57eb03bb9b13f4d0b81cedf")) (package (name "mes") - (version "0.18") + (version (string-append version "-" revision "." (string-take commit 7))) (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/mes/" - "mes-" version ".tar.gz")) + (uri (string-append + "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" + name "-" commit + ".tar.gz")) (sha256 (base32 - "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf")))) + "1b7wz9k38pfrz707pd4p8s54q903jr167q73ya7qkna89sxj3wna")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs @@ -93,10 +98,11 @@ extensive examples, including parsers for the Javascript and C99 languages.") `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries (synopsis "Scheme interpreter and C compiler for full source bootstrapping") (description - "GNU Mes [Maxwell Equations of Software] 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.") + "GNU Mes--Maxwell Equations of Software--brings the Reduced +Binary Seed bootstrap to GuixSD and aims to help create full source +bootstrapping for GNU/Linux distributions. It consists of a mutual +self-hosting Scheme interpreter in C and a Nyacc-based C compiler in +Scheme and is compatible with Guile.") (home-page "https://gnu.org/software/mes") (license gpl3+)))) -- cgit v1.2.3 From 35dcf85157435be848bc03bc014bdf5eb18546e6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 20 Oct 2018 08:59:19 +0200 Subject: bootstrap: Add %mes-stripped, %mes-bootstrap-tarball. * gnu/packages/make-bootstrap.scm (%mes-stripped): New variable. (%mes-bootstrap-tarball): New variable. * gnu/packages/mes.scm: Oops, remove stray (gnu packages commencement) module include. --- gnu/packages/make-bootstrap.scm | 35 +++++++++++++++++++++++++++++++++++ gnu/packages/mes.scm | 1 - 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 3553737f1e..7bfba3c14b 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) + #:use-module (gnu packages mes) #:use-module (gnu packages multiprecision) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -47,6 +48,7 @@ %glibc-bootstrap-tarball %gcc-bootstrap-tarball %guile-bootstrap-tarball + %mes-bootstrap-tarball %bootstrap-tarballs %guile-static-stripped)) @@ -533,6 +535,35 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("gcc" ,%gcc-static))))) +(define %mes-stripped + ;; The subset of Mes files needed for bootstrap. + (package + (inherit mes) + (name "mes-stripped") + (build-system trivial-build-system) + (source #f) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (srfi srfi-1) + (srfi srfi-26) + (guix build utils)) + + (setvbuf (current-output-port) _IOLBF) + (let* ((out (assoc-ref %outputs "out")) + (libdir (string-append out "/lib")) + (mes (assoc-ref %build-inputs "mes"))) + + (copy-recursively (string-append mes "/lib") libdir) + (copy-recursively (string-append mes "/share/mes/lib") libdir) + (for-each remove-store-references + (remove (lambda (file) (or (string-suffix? ".h" file) + (string-suffix? ".c" file))) + (find-files out ".*"))) + #t)))) + (inputs `(("mes" ,mes))))) + (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search ;; .scm and .go files relative to its installation directory, rather @@ -700,6 +731,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked, relocatable Guile. (tarball-package %guile-static-stripped)) +(define %mes-bootstrap-tarball + ;; A tarball with Mes ASCII Seed and binary Mes C Library. + (tarball-package %mes-stripped)) + (define %bootstrap-tarballs ;; A single derivation containing all the bootstrap tarballs, for ;; convenience. diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 4f98cd24f0..c4cb118e35 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -21,7 +21,6 @@ (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 graphviz) -- cgit v1.2.3 From 668ffe1e4e67e22268c9565993c6d9d7a86ae72a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 21 Oct 2018 23:39:43 +0200 Subject: bootstrap: Move use-modules to top of builder. * gnu/packages/bootstrap.scm (package-from-tarball): Move use-modules to top of builder. (%bootstrap-glibc): Likewise. (%bootstrap-gcc): Likewise. --- gnu/packages/bootstrap.scm | 182 +++++++++++++++++++++++---------------------- 1 file changed, 94 insertions(+), 88 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 82d2295695..2614d73c2c 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -115,23 +115,25 @@ or false to signal an error." `(#:guile ,%bootstrap-guile #:modules ((guix build utils)) #:builder - (let ((out (assoc-ref %outputs "out")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (tarball (assoc-ref %build-inputs "tarball"))) + (begin (use-modules (guix build utils)) - (mkdir out) - (copy-file tarball "binaries.tar.xz") - (invoke xz "-d" "binaries.tar.xz") - (let ((builddir (getcwd))) - (with-directory-excursion out - (invoke tar "xvf" - (string-append builddir "/binaries.tar")) - ,@(if snippet (list snippet) '()) - (or (not ,program-to-test) - (invoke (string-append "bin/" ,program-to-test) - "--version"))))))) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar")) + ,@(if snippet (list snippet) '()) + (or (not ,program-to-test) + (invoke (string-append "bin/" ,program-to-test) + "--version")))))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) @@ -460,28 +462,30 @@ $out/bin/guile --version~%" `(#:guile ,%bootstrap-guile #:modules ((guix build utils)) #:builder - (let ((out (assoc-ref %outputs "out")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (tarball (assoc-ref %build-inputs "tarball"))) + (begin (use-modules (guix build utils)) - (mkdir out) - (copy-file tarball "binaries.tar.xz") - (invoke xz "-d" "binaries.tar.xz") - (let ((builddir (getcwd))) - (with-directory-excursion out - (invoke tar "xvf" - (string-append builddir - "/binaries.tar")) - (chmod "lib" #o755) - - ;; Patch libc.so so it refers to the right path. - (substitute* "lib/libc.so" - (("/[^ ]+/lib/(libc|ld)" _ prefix) - (string-append out "/lib/" prefix))) - - #t))))) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir + "/binaries.tar")) + (chmod "lib" #o755) + + ;; Patch libc.so so it refers to the right path. + (substitute* "lib/libc.so" + (("/[^ ]+/lib/(libc|ld)" _ prefix) + (string-append out "/lib/" prefix))) + + #t)))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) @@ -531,39 +535,41 @@ $out/bin/guile --version~%" `(#:guile ,%bootstrap-guile #:modules ((guix build utils)) #:builder - (let ((out (assoc-ref %outputs "out")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (bash (assoc-ref %build-inputs "bash")) - (libc (assoc-ref %build-inputs "libc")) - (tarball (assoc-ref %build-inputs "tarball"))) + (begin (use-modules (guix build utils) (ice-9 popen)) - (mkdir out) - (copy-file tarball "binaries.tar.xz") - (invoke xz "-d" "binaries.tar.xz") - (let ((builddir (getcwd)) - (bindir (string-append out "/bin"))) - (with-directory-excursion out - (invoke tar "xvf" - (string-append builddir "/binaries.tar"))) - - (with-directory-excursion bindir - (chmod "." #o755) - (rename-file "gcc" ".gcc-wrapped") - (call-with-output-file "gcc" - (lambda (p) - (format p "#!~a + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (bash (assoc-ref %build-inputs "bash")) + (libc (assoc-ref %build-inputs "libc")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd)) + (bindir (string-append out "/bin"))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar"))) + + (with-directory-excursion bindir + (chmod "." #o755) + (rename-file "gcc" ".gcc-wrapped") + (call-with-output-file "gcc" + (lambda (p) + (format p "#!~a exec ~a/bin/.gcc-wrapped -B~a/lib \ -Wl,-rpath -Wl,~a/lib \ -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" - bash - out libc libc libc - ,(glibc-dynamic-linker)))) + bash + out libc libc libc + ,(glibc-dynamic-linker)))) - (chmod "gcc" #o555) - #t))))) + (chmod "gcc" #o555) + #t)))))) (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) @@ -571,33 +577,33 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("libc" ,%bootstrap-glibc) ("tarball" ,(bootstrap-origin (origin - (method url-fetch) - (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("armhf-linux" - "/20150101/gcc-4.8.4.tar.xz") - ("aarch64-linux" - "/20170217/gcc-5.4.0.tar.xz") - (_ - "/20131110/gcc-4.8.2.tar.xz"))) - %bootstrap-base-urls)) - (sha256 - (match (%current-system) - ("x86_64-linux" - (base32 - "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")) - ("i686-linux" - (base32 - "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")) - ("armhf-linux" - (base32 - "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v")) - ("aarch64-linux" - (base32 - "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")) - ("mips64el-linux" - (base32 - "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) + (method url-fetch) + (uri (map (cut string-append <> "/" (%current-system) + (match (%current-system) + ("armhf-linux" + "/20150101/gcc-4.8.4.tar.xz") + ("aarch64-linux" + "/20170217/gcc-5.4.0.tar.xz") + (_ + "/20131110/gcc-4.8.2.tar.xz"))) + %bootstrap-base-urls)) + (sha256 + (match (%current-system) + ("x86_64-linux" + (base32 + "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")) + ("i686-linux" + (base32 + "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")) + ("armhf-linux" + (base32 + "0ghz825yzp43fxw53kd6afm8nkz16f7dxi9xi40bfwc8x3nbbr8v")) + ("aarch64-linux" + (base32 + "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")) + ("mips64el-linux" + (base32 + "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) (native-search-paths (list (search-path-specification (variable "CPATH") -- cgit v1.2.3 From 5f02c9b7d67cf6c1fedc64c9bd51367cd636a398 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 20 Oct 2018 09:02:39 +0200 Subject: bootstrap: Add %bootstrap-mes. Built with 668ffe1e4e67e22268c9565993c6d9d7a86ae72a bootstrap: Move use-modules to top of builder. Todo: host these on ftp.gnu.org/pub/guix/... * gnu/packages/bootstrap.scm (%bootstrap-mes): New variable. --- gnu/packages/bootstrap.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 2614d73c2c..3d4f1f5036 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -49,6 +49,7 @@ %bootstrap-gcc %bootstrap-glibc %bootstrap-inputs + %bootstrap-mes %mescc-tools-seed %mes-seed %srfi-43 @@ -616,6 +617,58 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %bootstrap-mes + ;; The initial Mes. Uses binaries from a tarball typically built by + ;; %MES-BOOTSTRAP-TARBALL. + (package + (name "bootstrap-mes") + (version "0") + (source #f) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 popen)) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd)) + (bindir (string-append out "/bin"))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar")))))))) + (inputs + `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) + ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + ("tarball" ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "http://lilypond.org/janneke/mes/" + (match (%current-system) + ("x86_64-linux" "mes-stripped-0.18-0.08f04f5-x86_64-linux.tar.xz") + ("i686-linux" "mes-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) + (sha256 + (match (%current-system) + ("x86_64-linux" + (base32 + "1yhxqf1sm67gwjbkkc26m4lcscvpjfmi71bzy8rhysal4lcj1vc8")) + ("i686-linux" + (base32 + "1p116ya9n52852bryh34n7db4mhvi98qifmmwygl7nbyc4dz92jy"))))))))) + (synopsis "Bootstrap binaries of Mes") + (description synopsis) + (home-page #f) + (license gpl3+))) + (define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ (let ((commit "dc4e20e74924a5c80a2b7a77b4d7b927234fa71c")) (origin -- cgit v1.2.3 From 7cbf6f1ca268a7a179d715aaba2a451a8886ab44 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Oct 2018 08:20:20 +0200 Subject: gnu: mescc-tools: Update to 0.5.2-0.bb062b0d. * gnu/packages/mes.scm (mescc-tools): Update to 0.5.2-0.bb062b0d. mescc * gnu/packages/commencement.scm (mescc-tools-boot): Stay at 0.5.2 --- gnu/packages/commencement.scm | 13 +++++++++-- gnu/packages/mes.scm | 50 ++++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 61349337e0..258655fbad 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -117,9 +117,18 @@ (package (inherit mescc-tools) (name "mescc-tools-boot") + (version "0.5.2") (source (origin - (inherit (package-source mescc-tools)) - (patches (search-patches "mescc-tools-boot.patch")))) + (method url-fetch) + (uri (string-append + "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" + name "-Release_" version + ".tar.gz")) + (patches (search-patches "mescc-tools-boot.patch")) + (file-name (string-append "mescc-tools" "-" version ".tar.gz")) + (sha256 + (base32 + "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2")))) (inputs '()) (propagated-inputs '()) (native-inputs diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index c4cb118e35..7f7caa7a6d 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -106,31 +106,33 @@ Scheme and is compatible with Guile.") (license gpl3+)))) (define-public mescc-tools - (package - (name "mescc-tools") - (version "0.5.2") - (source (origin - (method url-fetch) - (uri (string-append - "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" - name "-Release_" version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2")))) - (build-system gnu-build-system) - (supported-systems '("i686-linux" "x86_64-linux")) - (arguments - `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:test-target "test" - #:phases (modify-phases %standard-phases - (delete 'configure)))) - (synopsis "Tools for the full source bootstrapping process") - (description - "Mescc-tools is a collection of tools for use in a full source + (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7") + (revision "0") + (version "0.5.2")) + (package + (name "mescc-tools") + (version (string-append version "-" revision "." (string-take commit 7))) + (source (origin + (method url-fetch) + (uri (string-append + "https://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" + name "-" commit + ".tar.gz")) + (sha256 + (base32 + "1h6j57wyf91i42b26f8msbv6451cw3nm4nmpl1fckp9c7vi8mwkh")))) + (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) + (arguments + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:test-target "test" + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Tools for the full source bootstrapping process") + (description + "Mescc-tools is a collection of tools for use in a full source bootstrapping process. It consists of the M1 macro assembler, the hex2 linker, the blood-elf symbol table generator, the kaem shell, exec_enable and get_machine.") (home-page "https://savannah.nongnu.org/projects/mescc-tools") - (license gpl3+))) + (license gpl3+)))) -- cgit v1.2.3 From 1a99a9c45c9c8708b7b28979759e342e56424e4c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 9 Oct 2018 19:30:11 +0200 Subject: bootstrap: Build with %bootstrap-mes. * gnu/packages/bootstrap.scm (%tinycc-seed): Remove. (%bootstrap-inputs): Use %bootstrap-mes instead of %mes-seed and %tinycc-seed. * gnu/packages/commencement.scm (mescc-tools-boot, mes-boot, tcc-boot0): Build with %bootstrap-mes instead of %mes-seed and %tinycc-seed. --- gnu/packages/bootstrap.scm | 31 +++-------------------- gnu/packages/commencement.scm | 57 ++++++++++++++++--------------------------- 2 files changed, 24 insertions(+), 64 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3d4f1f5036..7e6200c576 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -51,9 +51,7 @@ %bootstrap-inputs %bootstrap-mes %mescc-tools-seed - %mes-seed - %srfi-43 - %tinycc-seed)) + %srfi-43)) ;;; Commentary: ;;; @@ -680,28 +678,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (base32 "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) -(define %mes-seed - (let ((commit "057fd36735b5605fe582d6b3625f793a62922206")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes-seed" - "/-/archive/" commit - "/mes-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0vdb4kc05a1kdpmsi8dg425d5f33kp28sgl2fi3s320pc0v4dv13"))))) - -(define %tinycc-seed - (let ((commit "843d47ca682617f21333b50c67851797b8c3fd04")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/tinycc-seed" - "/-/archive/" commit - "/tinycc-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0599wwv30js03l1rpmvzfclq3jadzvq04pi29j45nf6fyfg5hhqb"))))) - (define %srfi-43 (origin (method url-fetch) @@ -718,9 +694,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) ("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-seed" ,%mes-seed) - ("srfi-43" ,%srfi-43 ) - ("tinycc-seed" ,%tinycc-seed))) + ("mes" ,%bootstrap-mes) + ("srfi-43" ,%srfi-43 ))) (_ `(("libc" ,%bootstrap-glibc) ("gcc" ,%bootstrap-gcc) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 258655fbad..4def178a83 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -102,13 +102,7 @@ (sha256 (base32 "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mes/" - "mes-" version ".tar.gz")) - (sha256 - (base32 - "1dsaaqyanzsq9m5wrcd2bjhb3qd6928c9q97rg5r730pyqjwxyxf"))))) + (package-source mes))) (native-inputs '()) (propagated-inputs '())))) @@ -135,8 +129,8 @@ `(("mescc-tools-seed" ,%mescc-tools-seed) ("mes-source" ,(package-source mes-boot0)) - ("coreutils" ,%bootstrap-coreutils&co) - ("mes-seed" ,%mes-seed))) + ("bootstrap-mes" ,%bootstrap-mes) + ("coreutils" ,%bootstrap-coreutils&co))) (build-system gnu-build-system) (arguments `(#:implicit-inputs? #f @@ -148,7 +142,6 @@ (lambda* (#:key outputs #:allow-other-keys) (let* ((coreutils (assoc-ref %build-inputs "coreutils")) (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) - (mes-seed (assoc-ref %build-inputs "mes-seed")) (mes-source (assoc-ref %build-inputs "mes-source")) (out (assoc-ref %outputs "out"))) (with-directory-excursion ".." @@ -159,12 +152,11 @@ (mkdir-p "mes-source") (invoke "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" - "-xvf" mes-seed)))))) + #t))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((coreutils (assoc-ref %build-inputs "coreutils")) + (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes")) (out (assoc-ref %outputs "out"))) (setenv "PATH" (string-append coreutils "/bin" ":" "../mescc-tools-seed")) @@ -172,7 +164,7 @@ (setenv "PREFIX" out) (setenv "MES_PREFIX" "../mes-source") (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") - (setenv "MES_SEED" "../mes-seed") + (setenv "MES_SEED" (string-append bootstrap-mes "/lib")) #t))) (replace 'build (lambda _ @@ -223,7 +215,7 @@ ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) - ("mes-seed" ,%mes-seed) + ("bootstrap-mes" ,%bootstrap-mes) ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile `(("guile" ,%bootstrap-guile) ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick @@ -239,13 +231,12 @@ (let ((coreutils (assoc-ref %build-inputs "coreutils")) (srfi-43 (assoc-ref %build-inputs "srfi-43")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) - (mes-seed (assoc-ref %build-inputs "mes-seed"))) + (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (with-directory-excursion ".." (and (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed) + (symlink (string-append bootstrap-mes "/lib") "mes-seed") (or (not srfi-43) (and (mkdir-p "srfi") (copy-file srfi-43 "srfi/srfi-43.scm") @@ -256,7 +247,7 @@ (symlink (string-append "../nyacc-source/module") "nyacc") (setenv "GUILE_LOAD_PATH" "nyacc") (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile - (invoke "bash" "-x" "configure.sh" + (invoke "bash" "configure.sh" (string-append "--prefix=" out)) (setenv "MES" "src/mes") (setenv "MESCC" "scripts/mescc") @@ -286,15 +277,16 @@ (replace 'check (lambda _ (when ,%fake-bootstrap? - ;; breaks with guile-2.0 + ;; break with guile-2.0 (delete-file "scaffold/boot/50-primitive-load.scm") (delete-file "scaffold/boot/51-module.scm")) (and (setenv "MES_ARENA" "100000000") (setenv "DIFF" "sh scripts/diff.scm") - (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") - (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") - (invoke "sh" "-x" "check.sh")))) + ;; fail fast tests + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") + (invoke "sh" "check.sh")))) (replace 'install (lambda _ (invoke "sh" "install.sh")))))) @@ -319,8 +311,8 @@ ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more ;; mature, this package should use the 0.9.27 sources (or later). (let ((version "0.9.26") - (revision "4") - (commit "46ee3f18477575b189ac224eac853e96afd571e1")) + (revision "5") + (commit "c7b3f59d1a71e71b470f859b20f0cfe840f3954d")) (package-with-bootstrap-guile (package (inherit tcc) @@ -333,19 +325,18 @@ "/tinycc-" commit ".tar.gz")) (sha256 (base32 - "0kq2si81piszpdcnp78w1lp5jd291srbx1f71fir08ybidiriw35")))) + "1agz5w5q6dm51n63hsxii33hxdghmdiacbb5zzxzac3aarfxjb2m")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) - ("mes-seed" ,%mes-seed) ("mescc-tools" ,mescc-tools-boot) ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) - ("tinycc-seed" ,%tinycc-seed) + ("bootstrap-mes" ,%bootstrap-mes) ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile `(("guile" ,%bootstrap-guile) ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick @@ -361,8 +352,7 @@ (let* ((coreutils (assoc-ref %build-inputs "coreutils")) (srfi-43 (assoc-ref %build-inputs "srfi-43")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) - (mes-seed (assoc-ref %build-inputs "mes-seed")) - (tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))) + (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (setenv "PATH" (string-append coreutils "/bin")) (format (current-error-port) "PATH=~s\n" (getenv "PATH")) @@ -371,12 +361,7 @@ (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (mkdir-p "mes-seed") - (invoke "tar" "--strip=1" "-C" "mes-seed" - "-xvf" mes-seed) - (mkdir-p "tinycc-seed") - (invoke "tar" "--strip=1" "-C" "tinycc-seed" - "-xvf" tinycc-seed) + (symlink (string-append bootstrap-mes "/lib") "mes-seed") (or (not srfi-43) (and (mkdir-p "srfi") (copy-file srfi-43 "srfi/srfi-43.scm") -- cgit v1.2.3 From d0bb7ed61ed9e356c53de1a8e9bd6c2ec030ffb6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Oct 2018 22:02:18 +0200 Subject: doc: Update Preparing to Use the Bootstrap Binaries. * doc/guix.texi (Preparing to Use the Bootstrap Binaries): Mention bootstrap-mes alongside bootstrap-gcc. (Reducing the Set of Bootstrap Binaries): Mention the Reduced Binary Seed bootstrap, MesCC-Tools and Mes. --- doc/guix.texi | 56 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d77788c4e0..41abfa4999 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23920,8 +23920,8 @@ GNU C Library (@pxref{Bootstrapping}). Usually, these bootstrap binaries are Taking these binaries for granted means that we consider them to be a correct and trustworthy `seed' for building the complete system. Therein lies a problem: the current combined size of these bootstrap binaries is about 250MB -(@pxref{Bootstrappable Builds,,, mes, Mes Reference Manual}). Auditing or -even inspecting these is next to impossible. +(@pxref{Bootstrappable Builds,,, mes, GNU Mes}). Auditing or even inspecting +these is next to impossible. For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source @@ -23931,8 +23931,8 @@ to use that term for what we do now.}. The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C Library are replaced by: @code{mescc-tools-seed} (a tiny assembler and linker) -@code{mes-seed} (a small Scheme Interpreter and a C compiler writen in Scheme) -and @code{tinycc-seed} (the Mes C Library, built for TinyCC). Using these new +@code{bootstrap-mes} (a small Scheme Interpreter and a C compiler writen in +Scheme and the Mes C Library, built for TinyCC and for GCC). Using these new binary seeds and a new set of @c packages@footnote{@c @@ -23988,7 +23988,15 @@ packages bootstrap)} module. A similar figure can be generated with @example guix graph -t derivation \ -e '(@@@@ (gnu packages bootstrap) %bootstrap-gcc)' \ - | dot -Tps > t.ps + | dot -Tps > gcc.ps +@end example + +or, for the Reduced Binary Seed bootstrap + +@example +guix graph -t derivation \ + -e '(@@@@ (gnu packages bootstrap) %bootstrap-mes)' \ + | dot -Tps > mes.ps @end example At this level of detail, things are @@ -24020,10 +24028,10 @@ write them in an output directory with the right layout. This corresponds to the @code{#:modules} argument of @code{build-expression->derivation} (@pxref{Derivations}). -Finally, the various tarballs are unpacked by the -derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, -etc., at which point we have a working C tool chain. - +Finally, the various tarballs are unpacked by the derivations +@code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, or +@code{bootstrap-mes-0.drv} and @code{mescc-tools-boot-0.drv}, at which point +we have a working C tool chain. @unnumberedsubsec Building the Build Tools @@ -24089,7 +24097,9 @@ automated way to produce them, should an update occur, and this is what the @code{(gnu packages make-bootstrap)} module provides. The following command builds the tarballs containing the bootstrap -binaries (Guile, Binutils, GCC, libc, and a tarball containing a mixture +binaries (Binutils, GCC, glibc, for the traditional bootstrap and +linux-libre-headers, mescc-tools-seed, bootstrap-mes for the Reduced +Binary Seed bootstrap, and Guile, and a tarball containing a mixture of Coreutils and other basic command-line tools): @example @@ -24108,12 +24118,12 @@ know. @unnumberedsubsec Reducing the Set of Bootstrap Binaries -Our bootstrap binaries currently include GCC, Guile, etc. That's a lot -of binary code! Why is that a problem? It's a problem because these -big chunks of binary code are practically non-auditable, which makes it -hard to establish what source code produced them. Every unauditable -binary also leaves us vulnerable to compiler backdoors as described by -Ken Thompson in the 1984 paper @emph{Reflections on Trusting Trust}. +Our traditional bootstrap includes GCC, GNU Libc, Guile, etc. That's a lot of +binary code! Why is that a problem? It's a problem because these big chunks +of binary code are practically non-auditable, which makes it hard to establish +what source code produced them. Every unauditable binary also leaves us +vulnerable to compiler backdoors as described by Ken Thompson in the 1984 +paper @emph{Reflections on Trusting Trust}. This is mitigated by the fact that our bootstrap binaries were generated from an earlier Guix revision. Nevertheless it lacks the level of @@ -24125,7 +24135,19 @@ The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that. One of these is about replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from -a simple and auditable assembler. Your help is welcome! +a simple and auditable assembler. + +Our first major achievement is the replacement of of GCC, the GNU C Library +and Binutils by MesCC-Tools (a simple hex linker and macro assembler) and Mes +(@pxref{Top, GNU Mes Reference Manual,, mes, GNU Mes}, a Scheme interpreter +and C compiler in Scheme). Neither MesCC-Tools nor Mes can be fully +bootstrapped yet and thus we inject them as binary seeds. We call this the +Reduced Binary Seed bootstrap, as it has halved the size of our bootstrap +binaries! Also, it has eliminated the C compiler binary; i686-linux and +x86_64-linux Guix packages are now bootstrapped without any binary C compiler. + +Work is ongoing to make MesCC-Tools and Mes fully bootstrappable and we are +also looking at any other bootstrap binaries. Your help is welcome! @node Porting @section Porting to a New Platform -- cgit v1.2.3 From a036e3c9ba8c303f06e221f14285d265c7b0b4fc Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 23 Oct 2018 23:17:24 +0200 Subject: doc: Fix typo. * doc/guix.texi (Reduced Binary Seed Bootstrap): Fix typo. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 41abfa4999..5ab42d121c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23931,7 +23931,7 @@ to use that term for what we do now.}. The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C Library are replaced by: @code{mescc-tools-seed} (a tiny assembler and linker) -@code{bootstrap-mes} (a small Scheme Interpreter and a C compiler writen in +@code{bootstrap-mes} (a small Scheme Interpreter and a C compiler written in Scheme and the Mes C Library, built for TinyCC and for GCC). Using these new binary seeds and a new set of @c -- cgit v1.2.3 From 1b9fb043d9c2fbd047ab17209ca4a3de5293edee Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 28 Oct 2018 11:16:46 +0900 Subject: gnu: glibc: Export supported locales. Debian and Archlinux (at least) force the installation of the localedata/SUPPORTED file of the glibc. This file lists all the supported locales of the glibc. * gnu/packages/patches/glibc-supported-locales.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (glibc/linux): Add the previous patch, (glibc-2.28): ditto. --- gnu/local.mk | 1 + gnu/packages/base.scm | 6 +++-- gnu/packages/patches/glibc-supported-locales.patch | 31 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-supported-locales.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4ba49e86a4..798b1e9209 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -763,6 +763,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-2.27-git-fixes.patch \ %D%/packages/patches/glibc-2.28-git-fixes.patch \ + %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3a1186673e..a6ece07ad9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -604,7 +604,8 @@ store.") "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -901,7 +902,8 @@ GLIBC/HURD for a Hurd host" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch")))))) + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch")))))) (define-public glibc-2.26 (package diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch new file mode 100644 index 0000000000..f1c8a88871 --- /dev/null +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -0,0 +1,31 @@ +This patch is taken from debian's glibc package (generate-supported.mk). + +diff --git a/localedata/Makefile.old b/localedata/Makefile +index 34877c0..a61d9b9 100644 +--- a/localedata/Makefile.old ++++ b/localedata/Makefile +@@ -91,7 +91,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -195,6 +196,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. -- cgit v1.2.3 From 421ec86532041eb17cdfd250f481430179ea8d20 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 7 Nov 2018 18:57:08 +0900 Subject: gnu: glibc: Update supported locale patch description. gnu/packages/patches/glibc-supported-locales.patch: Update description. --- gnu/packages/patches/glibc-supported-locales.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch index f1c8a88871..2888052bb8 100644 --- a/gnu/packages/patches/glibc-supported-locales.patch +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -1,4 +1,6 @@ This patch is taken from debian's glibc package (generate-supported.mk). +It install the localedata/SUPPORTED file of the glibc. This file lists +all the supported locales of the glibc. diff --git a/localedata/Makefile.old b/localedata/Makefile index 34877c0..a61d9b9 100644 -- cgit v1.2.3 From 5b01b6034aeab32a5011c5757f18bd9772d3497d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 1 Nov 2018 21:18:41 -0500 Subject: python: Honor '--cores=...' in tests. * gnu/packages/python.scm (python-2.7)[arguments]: Add #:make-flags. --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2b6a0647fd..46ce0dde40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -190,6 +190,9 @@ "--enable-unicode=ucs4" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) + ;; With no -j argument tests use all available cpus, so provide one. + #:make-flags + (list (format #f "EXTRATESTOPTS=-j~d" (parallel-job-count))) #:modules ((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) -- cgit v1.2.3 From fae3c0d953a7b0b552b4ce654ed9b5a51186f491 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 19:29:55 +0100 Subject: bootstrap: Add mescc-tools-static, mescc-tools-static-tarball. * gnu/packages/make-bootstrap.scm (%mescc-tools-static, %mescc-tools-bootstrap-tarball): New variable. --- gnu/packages/make-bootstrap.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 7bfba3c14b..36a5f6904c 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -48,6 +48,7 @@ %glibc-bootstrap-tarball %gcc-bootstrap-tarball %guile-bootstrap-tarball + %mescc-tools-bootstrap-tarball %mes-bootstrap-tarball %bootstrap-tarballs @@ -535,6 +536,16 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("gcc" ,%gcc-static))))) +(define %mescc-tools-static + ;; A statically linked MesCC Tools for bootstrap. + (package + (inherit mescc-tools) + (name "mescc-tools-static") + (arguments + (substitute-keyword-arguments (package-arguments mescc-tools) + ((#:make-flags flags) + `(cons "CC=gcc -static" ,flags)))))) + (define %mes-stripped ;; The subset of Mes files needed for bootstrap. (package @@ -731,6 +742,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked, relocatable Guile. (tarball-package %guile-static-stripped)) +(define %mescc-tools-bootstrap-tarball + ;; A tarball with MesCC binary seed. + (tarball-package %mescc-tools-static)) + (define %mes-bootstrap-tarball ;; A tarball with Mes ASCII Seed and binary Mes C Library. (tarball-package %mes-stripped)) -- cgit v1.2.3 From 02d83c247931045cf899433223e1b1a51f605a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?= Date: Fri, 2 Nov 2018 17:56:32 +0100 Subject: gnu: libgcrypt: Update to 1.8.4. Update libgcrypt and remove reproducibility patch, it is now built-in. See https://dev.gnupg.org/T4102 * gnu/packages/gnupg.scm (libgcrypt): Update to 1.8.4. [source]: Remove patch. * gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch: Delete file. * gnu/local.mk(dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 7 ++--- .../libgcrypt-make-yat2m-reproducible.patch | 32 ---------------------- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch diff --git a/gnu/local.mk b/gnu/local.mk index 798b1e9209..773d55ff18 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -886,7 +886,6 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ - %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 3d6727bbde..0b8d3e578e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,16 +98,14 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package (name "libgcrypt") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")) - (patches - (search-patches "libgcrypt-make-yat2m-reproducible.patch")))) + "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) diff --git a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch deleted file mode 100644 index 3056f0baad..0000000000 --- a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch +++ /dev/null @@ -1,32 +0,0 @@ -Make yat2m in libgcrypt respect SOURCE_DATE_EPOCH, making -the build reproducible. - -This was already fixed upstream in GnuPG: -https://dev.gnupg.org/rG139de02b93773615bdd95e04a7f0c1ad73b4f6fb - -and in libgpg-error: -https://dev.gnupg.org/rE5494a5728418938d2e42158bb646b07124184e64 - - ---- a/doc/yat2m.c 2017-11-23 19:16:58.000000000 +0100 -+++ b/doc/yat2m.c 2017-08-28 12:22:54.000000000 +0200 -@@ -1475,6 +1484,7 @@ - main (int argc, char **argv) - { - int last_argc = -1; -+ const char *s; - - opt_source = "GNU"; - opt_release = ""; -@@ -1608,6 +1618,11 @@ - if (argc > 1) - die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n"); - -+ /* Take care of supplied timestamp for reproducible builds. See -+ * https://reproducible-builds.org/specs/source-date-epoch/ */ -+ if (!opt_date && (s = getenv ("SOURCE_DATE_EPOCH")) && *s) -+ opt_date = s; -+ - /* Start processing. */ - if (argc && strcmp (*argv, "-")) - { -- cgit v1.2.3 From a647da364ac494b409114a52e48dc0dab03cbf4f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 18 Nov 2018 13:41:18 +0100 Subject: bootstrap: Add %mes-minimal. %mes-minimal introduces a Mes for bootstrap that does not depend on graphviz, perl, and texinfo and thus does not build any documentation. This removes ~100 dependencies from bootstrap-tarballs. * gnu/packages/make-bootstrap.scm (%mes-minimal): New variable. (%mes-minmal-stripped): Rename from %mes-stripped. (%mes-bootstrap-tarball): Update. --- gnu/packages/make-bootstrap.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 36a5f6904c..1897a6d12b 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -546,11 +546,36 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ((#:make-flags flags) `(cons "CC=gcc -static" ,flags)))))) -(define %mes-stripped +(define %mes-minimal + ;; A minimal Mes without documentation dependencies, for bootstrap. + (let ((triplet "i686-unknown-linux-gnu")) + (package + (inherit mes) + (name "mes-minimal") + (native-inputs + `(("guile" ,guile-2.2) + ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) + (%current-system)))) + ;; 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" ,(cross-gcc triplet))) + '()))) + (arguments + `(#:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'optional-dot + (lambda _ + (substitute* "configure" + (("#:version-option \"-V\"" all) + (string-append all "#:optional? #t"))))))))))) + +(define-public %mes-minimal-stripped ;; The subset of Mes files needed for bootstrap. (package - (inherit mes) - (name "mes-stripped") + (inherit %mes-minimal) + (name "mes-minimal-stripped") (build-system trivial-build-system) (source #f) (arguments @@ -573,7 +598,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (string-suffix? ".c" file))) (find-files out ".*"))) #t)))) - (inputs `(("mes" ,mes))))) + (inputs `(("mes" ,%mes-minimal))))) (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search @@ -748,7 +773,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %mes-bootstrap-tarball ;; A tarball with Mes ASCII Seed and binary Mes C Library. - (tarball-package %mes-stripped)) + (tarball-package %mes-minimal-stripped)) (define %bootstrap-tarballs ;; A single derivation containing all the bootstrap tarballs, for -- cgit v1.2.3 From b00a95be28b7c663cf8f82ef03b385d32ca51ae9 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 21:30:00 +0100 Subject: bootstrap: Add %bootstrap-mescc-tools. Built with a647da364ac494b409114a52e48dc0dab03cbf4f bootstrap: Add %mes-minimal. * gnu/packages/bootstrap.scm (%bootstrap-mescc-tools): New variable. --- gnu/packages/bootstrap.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 7e6200c576..3cc43934fb 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -49,6 +49,7 @@ %bootstrap-gcc %bootstrap-glibc %bootstrap-inputs + %bootstrap-mescc-tools %bootstrap-mes %mescc-tools-seed %srfi-43)) @@ -615,6 +616,54 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %bootstrap-mescc-tools + ;; The initial MesCC tools. Uses binaries from a tarball typically built by + ;; %MESCC-TOOLS-BOOTSTRAP-TARBALL. + (package + (name "bootstrap-mescc-tools") + (version "0.5.2") + (source #f) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils) + (ice-9 popen)) + (let ((out (assoc-ref %outputs "out")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (tarball (assoc-ref %build-inputs "tarball"))) + + (mkdir out) + (copy-file tarball "binaries.tar.xz") + (invoke xz "-d" "binaries.tar.xz") + (let ((builddir (getcwd)) + (bindir (string-append out "/bin"))) + (with-directory-excursion out + (invoke tar "xvf" + (string-append builddir "/binaries.tar")))))))) + (inputs + `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) + ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + ("tarball" ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "http://lilypond.org/janneke/mes/" + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz")))) + (sha256 + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + (base32 "0dkwl8mjmmizx7gba9spiq9sp8c5fqv7370qakggy5nxpply59jh"))))))))) + (synopsis "Bootstrap binaries of MesCC Tools") + (description synopsis) + (home-page #f) + (license gpl3+))) + (define %bootstrap-mes ;; The initial Mes. Uses binaries from a tarball typically built by ;; %MES-BOOTSTRAP-TARBALL. -- cgit v1.2.3 From 562c37c7beaea9e6912d5ae1c7f7dc8d2a2a3a64 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 18 Nov 2018 16:12:56 +0100 Subject: bootstrap: Update %bootstrap-mes. Built with b00a95be28b7c663cf8f82ef03b385d32ca51ae9 bootstrap: Add %bootstrap-mescc-tools. * gnu/packages/bootstrap.scm (%bootstrap-mes): Update. --- gnu/packages/bootstrap.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3cc43934fb..620f888eb0 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -701,16 +701,13 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (uri (string-append "http://lilypond.org/janneke/mes/" (match (%current-system) - ("x86_64-linux" "mes-stripped-0.18-0.08f04f5-x86_64-linux.tar.xz") - ("i686-linux" "mes-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) + ((or "i686-linux" "x86_64-linux") + "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) (sha256 (match (%current-system) - ("x86_64-linux" - (base32 - "1yhxqf1sm67gwjbkkc26m4lcscvpjfmi71bzy8rhysal4lcj1vc8")) - ("i686-linux" + ((or "i686-linux" "x86_64-linux") (base32 - "1p116ya9n52852bryh34n7db4mhvi98qifmmwygl7nbyc4dz92jy"))))))))) + "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From 4fd4efc812b18c11a2ed22a13befc630f5b95434 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 21:30:28 +0100 Subject: bootstrap: Replace %mescc-tools-seed with %bootstrap-mescc-tools. * gnu/packages/bootstrap.scm (%mescc-tools-seed): Remove. (%bootstrap-inputs): Replace %mescc-tools-seed with %bootstrap-mescc-tools. * gnu/packages/commencement.scm (mes-boot): Likewise. (tcc-boot0): Likewise. (mescc-tools-boot): Remove. --- gnu/packages/bootstrap.scm | 14 +------- gnu/packages/commencement.scm | 78 ++----------------------------------------- 2 files changed, 3 insertions(+), 89 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 620f888eb0..93e9d8ddbd 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -51,7 +51,6 @@ %bootstrap-inputs %bootstrap-mescc-tools %bootstrap-mes - %mescc-tools-seed %srfi-43)) ;;; Commentary: @@ -713,17 +712,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) -(define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ - (let ((commit "dc4e20e74924a5c80a2b7a77b4d7b927234fa71c")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" - "/-/archive/" commit - "/mescc-tools-seed-" commit ".tar.gz")) - (sha256 - (base32 - "1lj7df73vxanmffmiwkhcn83r7yd9n8568nkki06bqq5zg526nyz"))))) - (define %srfi-43 (origin (method url-fetch) @@ -739,7 +727,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ `(,@(match (%current-system) ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) - ("mescc-tools-seed" ,%mescc-tools-seed) + ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) ("mes" ,%bootstrap-mes) ("srfi-43" ,%srfi-43 ))) (_ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4def178a83..ed8a429c23 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -106,79 +106,6 @@ (native-inputs '()) (propagated-inputs '())))) -(define mescc-tools-boot - (package-with-bootstrap-guile - (package - (inherit mescc-tools) - (name "mescc-tools-boot") - (version "0.5.2") - (source (origin - (method url-fetch) - (uri (string-append - "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" - name "-Release_" version - ".tar.gz")) - (patches (search-patches "mescc-tools-boot.patch")) - (file-name (string-append "mescc-tools" "-" version ".tar.gz")) - (sha256 - (base32 - "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2")))) - (inputs '()) - (propagated-inputs '()) - (native-inputs - `(("mescc-tools-seed" ,%mescc-tools-seed) - ("mes-source" ,(package-source mes-boot0)) - - ("bootstrap-mes" ,%bootstrap-mes) - ("coreutils" ,%bootstrap-coreutils&co))) - (build-system gnu-build-system) - (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) - (mes-source (assoc-ref %build-inputs "mes-source")) - (out (assoc-ref %outputs "out"))) - (with-directory-excursion ".." - (and - (mkdir-p "mescc-tools-seed") - (invoke "tar" "--strip=1" "-C" "mescc-tools-seed" - "-xvf" mescc-tools-seed) - (mkdir-p "mes-source") - (invoke "tar" "--strip=1" "-C" "mes-source" - "-xvf" mes-source) - #t))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((coreutils (assoc-ref %build-inputs "coreutils")) - (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes")) - (out (assoc-ref %outputs "out"))) - (setenv "PATH" (string-append coreutils "/bin" - ":" "../mescc-tools-seed")) - (format (current-error-port) "PATH=~s\n" (getenv "PATH")) - (setenv "PREFIX" out) - (setenv "MES_PREFIX" "../mes-source") - (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed") - (setenv "MES_SEED" (string-append bootstrap-mes "/lib")) - #t))) - (replace 'build - (lambda _ - (invoke "sh" "build.sh"))) - (replace 'check - (lambda _ - ;; bootstrap build.sh lacks exec_enable, get_machine, and - ;; kaem_machine - ;; (invoke "sh" "check.sh") - #t)) - (replace 'install - (lambda _ - (invoke "sh" "install.sh"))))))))) - (define nyacc-boot (let ((version "0.86.0") (revision "0") @@ -211,7 +138,7 @@ (inputs '()) (propagated-inputs '()) (native-inputs - `(("mescc-tools" ,mescc-tools-boot) + `(("mescc-tools" ,%bootstrap-mescc-tools) ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) @@ -332,7 +259,7 @@ (propagated-inputs '()) (native-inputs `(("mes" ,mes-boot) - ("mescc-tools" ,mescc-tools-boot) + ("mescc-tools" ,%bootstrap-mescc-tools) ("nyacc-source" ,(package-source nyacc-boot)) ("coreutils" , %bootstrap-coreutils&co) @@ -393,7 +320,6 @@ (setenv "OBJDUMP" "true") (setenv "ONE_SOURCE" "1") (setenv "PREPROCESS" "1") - (setenv "MES_DEBUG" "1") (setenv "MES_ARENA" "70000000") (setenv "MES_MAX_ARENA" "70000000") -- cgit v1.2.3 From d9ed0a46301e259c3082fcc67678e72ceae19a2d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 16 Nov 2018 21:58:37 +0100 Subject: bootstrap: Update %bootstrap-tarballs. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs): Update to use %mescc-tools-bootstrap-tarball, %mes-bootstrap-tarball, %linux-libre-headers-bootstrap-tarball. --- gnu/packages/make-bootstrap.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 1897a6d12b..fa3914cde7 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -804,10 +804,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) ,@(match (%current-system) - ("i686-linux" `(("mescc-tools-seed" ,(@ (gnu packages bootstrap) %mescc-tools-seed)) - ("mes-seed" ,(@ (gnu packages bootstrap) %mes-seed)) - ("srfi-43" ,(@ (gnu packages bootstrap) %srfi-43)) - ("tinycc-seed" ,(@ (gnu packages bootstrap) %tinycc-seed)))) + ((or "i686-linux" "x86_64-linux") + `(("bootstrap-mescc-tools" ,%mescc-tools-bootstrap-tarball) + ("bootstrap-mes" ,%mes-bootstrap-tarball) + ("bootstrap-linux-libre-headers" + ,%linux-libre-headers-bootstrap-tarball))) (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball) ("binutils-tarball" ,%binutils-bootstrap-tarball) ("glibc-tarball" ,(%glibc-bootstrap-tarball))))) -- cgit v1.2.3 From da91723cc5bba433f59ac40ee669d97e4cbc0e45 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 20 Nov 2018 08:12:09 +0100 Subject: bootstrap: Force i686-linux for bootstrap-tarballs. * gnu/packages/make-bootstrap.scm (%mescc-tools-static): Force i686-linux for bootstrap-tarballs. (%mes-minimal): Likewise. Remove i686-linux cross-compiler dependency. * gnu/packages/commencement.scm (mes-boot): Support strict i686-linux build on x86_64. --- gnu/packages/commencement.scm | 2 ++ gnu/packages/make-bootstrap.scm | 19 +++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ed8a429c23..3d3f8e6650 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -174,6 +174,8 @@ (symlink (string-append "../nyacc-source/module") "nyacc") (setenv "GUILE_LOAD_PATH" "nyacc") (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile + (substitute* "configure.sh" + (("^arch=.*") "arch=i686\n")) (invoke "bash" "configure.sh" (string-append "--prefix=" out)) (setenv "MES" "src/mes") diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index fa3914cde7..761420af67 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -542,9 +542,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (inherit mescc-tools) (name "mescc-tools-static") (arguments - (substitute-keyword-arguments (package-arguments mescc-tools) - ((#:make-flags flags) - `(cons "CC=gcc -static" ,flags)))))) + `(#:system "i686-linux" + ,@(substitute-keyword-arguments (package-arguments mescc-tools) + ((#:make-flags flags) + `(cons "CC=gcc -static" ,flags))))))) (define %mes-minimal ;; A minimal Mes without documentation dependencies, for bootstrap. @@ -553,16 +554,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (inherit mes) (name "mes-minimal") (native-inputs - `(("guile" ,guile-2.2) - ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) - (%current-system)))) - ;; 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" ,(cross-gcc triplet))) - '()))) + `(("guile" ,guile-2.2))) (arguments - `(#:strip-binaries? #f + `(#:system "i686-linux" + #:strip-binaries? #f #:phases (modify-phases %standard-phases (add-before 'configure 'optional-dot -- cgit v1.2.3 From 3d3daf7fa1794c64914ed53e51838a41d9b7adc4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 20 Nov 2018 21:02:53 +0100 Subject: doc: Update for bootstrap-mescc-tools change. * doc/guix.texi (Reduced Binary Seed Bootstrap): Update for bootstrap-mescc-tools change. * doc/images/gcc-mesboot-bag-graph.dot: Regenerate. --- doc/guix.texi | 23 ++-- doc/images/gcc-mesboot-bag-graph.dot | 244 ++++++++++++++++++----------------- 2 files changed, 134 insertions(+), 133 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5ab42d121c..a957930d37 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23930,13 +23930,12 @@ to use that term for what we do now.}. The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C -Library are replaced by: @code{mescc-tools-seed} (a tiny assembler and linker) -@code{bootstrap-mes} (a small Scheme Interpreter and a C compiler written in -Scheme and the Mes C Library, built for TinyCC and for GCC). Using these new -binary seeds and a new set of +Library are replaced by: @code{bootstrap-mescc-tools} (a tiny assembler and +linker) and @code{bootstrap-mes} (a small Scheme Interpreter and a C compiler +written in Scheme and the Mes C Library, built for TinyCC and for GCC). Using +these new binary seeds and a new set of @c packages@footnote{@c -mescc-tools-boot, nyacc-boot, mes-boot, tcc-boot0, @@ -24030,8 +24029,8 @@ corresponds to the @code{#:modules} argument of Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, or -@code{bootstrap-mes-0.drv} and @code{mescc-tools-boot-0.drv}, at which point -we have a working C tool chain. +@code{bootstrap-mes-0.drv} and @code{bootstrap-mescc-tools-0.drv}, at which +point we have a working C tool chain. @unnumberedsubsec Building the Build Tools @@ -24096,11 +24095,11 @@ those rarely need to be updated. Nevertheless, it is useful to have an automated way to produce them, should an update occur, and this is what the @code{(gnu packages make-bootstrap)} module provides. -The following command builds the tarballs containing the bootstrap -binaries (Binutils, GCC, glibc, for the traditional bootstrap and -linux-libre-headers, mescc-tools-seed, bootstrap-mes for the Reduced -Binary Seed bootstrap, and Guile, and a tarball containing a mixture -of Coreutils and other basic command-line tools): +The following command builds the tarballs containing the bootstrap binaries +(Binutils, GCC, glibc, for the traditional bootstrap and linux-libre-headers, +bootstrap-mescc-tools, bootstrap-mes for the Reduced Binary Seed bootstrap, +and Guile, and a tarball containing a mixture of Coreutils and other basic +command-line tools): @example guix build bootstrap-tarballs diff --git a/doc/images/gcc-mesboot-bag-graph.dot b/doc/images/gcc-mesboot-bag-graph.dot index b8c1dc6ad1..a49f5070ed 100644 --- a/doc/images/gcc-mesboot-bag-graph.dot +++ b/doc/images/gcc-mesboot-bag-graph.dot @@ -1,124 +1,126 @@ digraph "Guix bag" { - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" [label = "gcc-mesboot@4.9.4", shape = box, fontname = Helvetica]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = cyan3]; - "/gnu/store/kp05qzqscbbq070h42saa7v2814fym56-gcc-mesboot-4.9.4.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = cyan3]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [label = "binutils-mesboot@2.20.1a", shape = box, fontname = Helvetica]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [color = darkseagreen]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = darkseagreen]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; - "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = darkseagreen]; - "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [label = "binutils-mesboot0@2.20.1a", shape = box, fontname = Helvetica]; - "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = blue]; - "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = blue]; - "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = blue]; - "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; - "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" -> "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [color = blue]; - "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" -> "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" [color = blue]; - "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [label = "mes-boot@0.17.1", shape = box, fontname = Helvetica]; - "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" -> "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" [color = darkgoldenrod]; - "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkgoldenrod]; - "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" -> "/gnu/store/1dz9ddx84s4lgpcayy71kd01w493ab8f-guile-bootstrap-2.0.drv" [color = darkgoldenrod]; - "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" [label = "mescc-tools-boot@0.4-1.f02b8f4", shape = box, fontname = Helvetica]; - "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [label = "bootstrap-binaries@0", shape = box, fontname = Helvetica]; - "/gnu/store/1dz9ddx84s4lgpcayy71kd01w493ab8f-guile-bootstrap-2.0.drv" [label = "guile-bootstrap@2.0", shape = box, fontname = Helvetica]; - "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" [label = "tcc-boot0@0.9.26-2.b7aa906", shape = box, fontname = Helvetica]; - "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [color = peachpuff4]; - "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/351v0qka337idkx47agnbxb7f741ywhv-mescc-tools-boot-0.4-1.f02b8f4.drv" [color = peachpuff4]; - "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/wgcwpbgcx6rc6qkzap8r1jmm1lqd94xn-tcc-boot0-0.9.26-2.b7aa906.drv" -> "/gnu/store/1dz9ddx84s4lgpcayy71kd01w493ab8f-guile-bootstrap-2.0.drv" [color = peachpuff4]; - "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; - "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/6jim8kmyfzqh4k6klsln723na6f8mny8-mes-boot-0.17.1.drv" [color = red]; - "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = red]; - "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = red]; - "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; - "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = darkviolet]; - "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [label = "glibc-mesboot0@2.2.5", shape = box, fontname = Helvetica]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = darkviolet]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" [color = darkviolet]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = darkviolet]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" [color = darkviolet]; - "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = darkviolet]; - "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" [label = "gcc-core-mesboot@2.95.3", shape = box, fontname = Helvetica]; - "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = blue]; - "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/mxph96gajplchgml487c17x9mqp22zci-tcc-boot-0.9.27.drv" [color = blue]; - "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = blue]; - "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = blue]; - "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" [label = "mesboot-headers@0.17.1", shape = box, fontname = Helvetica]; - "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = cyan3]; - "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [label = "linux-libre-headers-bootstrap@0", shape = box, fontname = Helvetica]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [label = "gcc-mesboot0@2.95.3", shape = box, fontname = Helvetica]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = red]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/98vyp5jvzwimxqz55kqb6qh6slzixrys-gcc-core-mesboot-2.95.3.drv" [color = red]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = red]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = red]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = red]; - "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = red]; - "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" [label = "gcc-mesboot1-wrapper@4.7.4", shape = box, fontname = Helvetica]; - "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" [color = cyan3]; - "/gnu/store/m714lzfw5f1nlbj8p9igigpawrjklzc5-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = cyan3]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" [label = "glibc-mesboot@2.16.0", shape = box, fontname = Helvetica]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; - "/gnu/store/idk50v7k1n62f6zwr4v174c8svnaskmc-glibc-mesboot-2.16.0.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = darkseagreen]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" [label = "glibc-headers-mesboot@2.16.0", shape = box, fontname = Helvetica]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/mfs8zc6658csv4i51qpb443di9mwbhs6-mesboot-headers-0.17.1.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = red]; - "/gnu/store/172h59jyafvvn9m7ia5kp04xyy962cpd-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = red]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" [label = "gcc-mesboot1@4.7.4", shape = box, fontname = Helvetica]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/pn2330dk3mi0bzih60d4nd9k1q1bbhp3-binutils-mesboot-2.20.1a.drv" [color = peachpuff4]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [color = peachpuff4]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = peachpuff4]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/ysbncdfxdgb8n9f1d1xaadkzlpyrri5r-diffutils-mesboot-2.7.drv" [color = peachpuff4]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = peachpuff4]; - "/gnu/store/y3axw4m9rh9a4z34mjxy7cn9gqsml3l9-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [color = peachpuff4]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" [label = "make-mesboot@3.82", shape = box, fontname = Helvetica]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/d9ik7gv1iqmcrpg8iw49195wzr2yhxam-binutils-mesboot0-2.20.1a.drv" [color = darkviolet]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/9y9g13gxcq2ilrk27ic2ga4sm6glxyvf-glibc-mesboot0-2.2.5.drv" [color = darkviolet]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/qnn5zfx4jxx45rdlw7r7qivqml3a35kj-gcc-mesboot0-2.95.3.drv" [color = darkviolet]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/n4if7b9krvdj6mzm6ziphhvpggxz7y4h-make-mesboot0-3.80.drv" [color = darkviolet]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/9wgjh1j6bcd552wyf36jb3dqwdi4vxzj-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/nh28zik1l0b0y5sl9b3j3xff0gv8pf3z-make-mesboot-3.82.drv" -> "/gnu/store/7izlib8w4yjmjwqiv24bddcc5p12ircv-linux-libre-headers-bootstrap-0.drv" [color = darkviolet]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" [label = "gcc-mesboot@4.9.4", shape = box, fontname = Helvetica]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = blue]; + "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = blue]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [label = "binutils-mesboot@2.20.1a", shape = box, fontname = Helvetica]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [color = darkseagreen]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = darkseagreen]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; + "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = darkseagreen]; + "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [label = "binutils-mesboot0@2.20.1a", shape = box, fontname = Helvetica]; + "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = red]; + "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = red]; + "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = red]; + "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; + "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" -> "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [color = darkseagreen]; + "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" -> "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" [color = darkseagreen]; + "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [label = "mes-boot@0.18-0.08f04f5", shape = box, fontname = Helvetica]; + "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/pn5wxcxg4bgmyzidc519kyfd609m9kw3-bootstrap-mescc-tools-0.5.2.drv" [color = dimgrey]; + "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/9qw55y8fgq9q0h3wz47lih78cwd0zz0q-bootstrap-mes-0.drv" [color = dimgrey]; + "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/gz3agxnnlgkafw2c8jnvk2hqmlh85pkc-guile-bootstrap-2.0.drv" [color = dimgrey]; + "/gnu/store/pn5wxcxg4bgmyzidc519kyfd609m9kw3-bootstrap-mescc-tools-0.5.2.drv" [label = "bootstrap-mescc-tools@0.5.2", shape = box, fontname = Helvetica]; + "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [label = "bootstrap-binaries@0", shape = box, fontname = Helvetica]; + "/gnu/store/9qw55y8fgq9q0h3wz47lih78cwd0zz0q-bootstrap-mes-0.drv" [label = "bootstrap-mes@0", shape = box, fontname = Helvetica]; + "/gnu/store/gz3agxnnlgkafw2c8jnvk2hqmlh85pkc-guile-bootstrap-2.0.drv" [label = "guile-bootstrap@2.0", shape = box, fontname = Helvetica]; + "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" [label = "tcc-boot0@0.9.26-5.c7b3f59", shape = box, fontname = Helvetica]; + "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [color = peachpuff4]; + "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/pn5wxcxg4bgmyzidc519kyfd609m9kw3-bootstrap-mescc-tools-0.5.2.drv" [color = peachpuff4]; + "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/9qw55y8fgq9q0h3wz47lih78cwd0zz0q-bootstrap-mes-0.drv" [color = peachpuff4]; + "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/gz3agxnnlgkafw2c8jnvk2hqmlh85pkc-guile-bootstrap-2.0.drv" [color = peachpuff4]; + "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; + "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [color = darkgoldenrod]; + "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = darkgoldenrod]; + "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; + "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; + "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = darkgoldenrod]; + "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; + "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = darkviolet]; + "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [label = "glibc-mesboot0@2.2.5", shape = box, fontname = Helvetica]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = magenta]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" [color = magenta]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = magenta]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" [color = magenta]; + "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = magenta]; + "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" [label = "gcc-core-mesboot@2.95.3", shape = box, fontname = Helvetica]; + "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = cyan3]; + "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = cyan3]; + "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = cyan3]; + "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = cyan3]; + "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" [label = "mesboot-headers@0.18-0.08f04f5", shape = box, fontname = Helvetica]; + "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = dimgrey]; + "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [label = "linux-libre-headers-bootstrap@0", shape = box, fontname = Helvetica]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [label = "gcc-mesboot0@2.95.3", shape = box, fontname = Helvetica]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = darkgoldenrod]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" [color = darkgoldenrod]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = darkgoldenrod]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = darkgoldenrod]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = darkgoldenrod]; + "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = darkgoldenrod]; + "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" [label = "gcc-mesboot1-wrapper@4.7.4", shape = box, fontname = Helvetica]; + "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" [color = cyan3]; + "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = cyan3]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" [label = "glibc-mesboot@2.16.0", shape = box, fontname = Helvetica]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; + "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = darkseagreen]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" [label = "glibc-headers-mesboot@2.16.0", shape = box, fontname = Helvetica]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = blue]; + "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = blue]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [label = "gcc-mesboot1@4.7.4", shape = box, fontname = Helvetica]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = magenta]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [color = magenta]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = magenta]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = magenta]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = magenta]; + "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = magenta]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [label = "make-mesboot@3.82", shape = box, fontname = Helvetica]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = magenta]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = magenta]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [color = magenta]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = magenta]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = magenta]; } -- cgit v1.2.3 From f4bf64138c9628114173e999f080c4fad3fec975 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Oct 2018 17:08:02 +0200 Subject: gnu: Remove gcc-for-libstdc++. * gnu/packages/commencement.scm (gcc-for-libstdc++): Remove variable. (libstdc++-boot0): Inherit GCC-4.9 instead. --- gnu/packages/commencement.scm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3d3f8e6650..015211f493 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1620,25 +1620,12 @@ exec " gcc "/bin/" program ,cf))))) (inputs (%boot0-inputs))))) -;; Use a "fixed" package source for this early libstdc++ variant so we can -;; update GCC 4.9 without triggering a full rebuild. -(define gcc-for-libstdc++ - (package - (inherit gcc-4.9) - (source (origin - (inherit (package-source gcc-4.9)) - (patches (search-patches "gcc-4.9-libsanitizer-fix.patch" - "gcc-arm-bug-71399.patch" - "gcc-asan-missing-include.patch" - "gcc-libvtv-runpath.patch" - "gcc-fix-texi2pod.patch")))))) - (define libstdc++-boot0 ;; GCC's libcc1 is always built as a shared library (the top-level ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on ;; C++14 features missing in some of our bootstrap compilers. - (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-for-libstdc++)))) + (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-4.9)))) (package (inherit lib) (name "libstdc++-boot0") -- cgit v1.2.3 From a6facf94828b7215566c724822f00feee36f60a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Oct 2018 17:13:06 +0200 Subject: gnu: libstdc++-boot0: Improve gcc-wrapper workaround. * gnu/packages/commencement.scm (libstdc++-boot0): Adjust the configure script instead of copying libstdc++.so from %BOOT0-INPUTS. --- gnu/packages/commencement.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 015211f493..467a1585ff 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1641,17 +1641,13 @@ exec " gcc "/bin/" program (substitute-keyword-arguments (package-arguments lib) ((#:phases phases) `(modify-phases ,phases - ;; FIXME: why doesn't this package build libstdc++.so.6.0.20, - ;; when gcc-mesboot builds it fine? - ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libstdc++.so.6.0.20 /gnu/store/np5pmdlwfin3vmqk88chh0fgs0ncki79-libstdc++-boot0-4.8.5/lib/libstdc++.so.6.0.20 - ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libstdc++.so.6.0.20': No such file or directory - (add-after 'build 'copy-libstdc++- - (lambda* (#:key outputs #:allow-other-keys) - (let ((gcc (assoc-ref %build-inputs "gcc")) - (out (assoc-ref outputs "out"))) - (copy-file (string-append gcc "/lib/libstdc++.so.6.0.20") - (string-append "src/.libs/libstdc++.so.6.0.20")) - #t))))))) + (add-after 'unpack 'workaround-wrapper-bug + ;; XXX: The crude gcc-cross-wrapper causes "g++ -v" to + ;; fail, which in turn confuses the configure script. + (lambda _ + (substitute* "libstdc++-v3/configure" + (("g\\+\\+ -v") "true")) + #t)))))) (_ (package-arguments lib))))) (inputs (%boot0-inputs)) (native-inputs '())))) -- cgit v1.2.3 From 77e02d948c9e16ae894ea0eba2c1e706d03d09e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Oct 2018 17:16:08 +0200 Subject: gnu: gcc-boot0: Improve gcc-wrapper workarounds. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: Adjust the libcc1 build scripts instead of copying libcc1.so from %BOOT0-INPUTS. --- gnu/packages/commencement.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 467a1585ff..f9770425a8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1731,13 +1731,18 @@ exec " gcc "/bin/" program #t))) ,(match (%current-system) ((or "i686-linux" "x86_64-linux") - '(add-after 'build 'libtool-workaround - (lambda _ - ;; libtool: install: /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c .libs/libcc1.so.0.0.0 /gnu/store/8qf47i99nxz9jvrmq5va0g3q1yvs3x74-gcc-cross-boot0-5.5.0-lib/lib/./libcc1.so.0.0.0 - ;; /gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory - (system* "touch" - "libcc1/.libs/libcc1.so.0.0.0" - "libcc1/.libs/libcc1plugin.so.0.0.0")))) + '(add-before 'configure 'fix-libcc1 + (lambda* (#:key inputs #:allow-other-keys) + ;; libcc1.so NEEDs libgcc_s.so, so provide one here + ;; to placate the 'validate-runpath' phase. + (substitute* "libcc1/Makefile.in" + (("la_LDFLAGS =") + (string-append "la_LDFLAGS = -Wl,-rpath=" + (assoc-ref inputs "gcc") "/lib"))) + ;; XXX: "g++ -v" is broken (see also libstdc++ above). + (substitute* "libcc1/configure" + (("g\\+\\+ -v") "true")) + #t))) (_ identity)) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 4ae7dc7b9af64794081b1913740b97acd89c91bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 5 Oct 2018 16:06:35 +0200 Subject: gnu: Remove duplicate linux-libre-headers package from bootstrap inputs. GLIBC-FINAL already propagates linux-libre-headers, so drop the bootstrap input. * gnu/packages/commencement.scm (%boot2-inputs): Remove %BOOTSTRAP-LINUX-LIBRE-HEADERS. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f9770425a8..70b9b8176f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2195,7 +2195,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" `(("libc" ,glibc-final) ("libc:static" ,glibc-final "static") ("gcc" ,(gcc-boot0-wrapped)) - ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc")))) + ,@(fold alist-delete (%boot1-inputs) '("libc" "gcc" "linux-libre-headers")))) (define binutils-final (package-with-bootstrap-guile -- cgit v1.2.3 From 89e7f90d0b40bc4f15f902cc3b82c3effa87dd02 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 11 Jul 2018 13:03:33 +0530 Subject: build-system: python: Do not double wrap executables. * guix/build/python-build-system.scm (wrap): Only wrap executables that have not already been wrapped. * guix/build/utils.scm (wrapper?): New function. --- guix/build/python-build-system.scm | 9 ++++----- guix/build/utils.scm | 9 +++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 5bb0ba49d5..73b554c766 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,11 +187,9 @@ when running checks after installing the package." (define* (wrap #:key inputs outputs #:allow-other-keys) (define (list-of-files dir) - (map (cut string-append dir "/" <>) - (or (scandir dir (lambda (f) - (let ((s (stat (string-append dir "/" f)))) - (eq? 'regular (stat:type s))))) - '()))) + (find-files dir (lambda (file stat) + (and (eq? 'regular (stat:type stat)) + (not (wrapper? file)))))) (define bindirs (append-map (match-lambda diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 5fe3286843..cb5621a5a9 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015, 2018 Mark H Weaver +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -87,6 +88,7 @@ patch-/usr/bin/file fold-port-matches remove-store-references + wrapper? wrap-program invoke @@ -1003,6 +1005,13 @@ known as `nuke-refs' in Nixpkgs." (put-u8 out (char->integer char)) result)))))) +(define (wrapper? prog) + "Return #t if PROG is a wrapper as produced by 'wrap-program'." + (and (file-exists? prog) + (let ((base (basename prog))) + (and (string-prefix? "." base) + (string-suffix? "-real" base))))) + (define* (wrap-program prog #:rest vars) "Make a wrapper for PROG. VARS should look like this: -- cgit v1.2.3 From e66c6eb2bc71736df5aaad23eaf2778be46fd88f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 5 Dec 2018 20:03:54 +0000 Subject: gnu: python: Update to 3.7.1. Remove the replacement, as version 3.7.1 includes the fix for this issue. * gnu/packages/python.scm (python-3.7): Update to 3.7.1. (python-3/fixed): Remove this. --- gnu/packages/python.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 46ce0dde40..176bbb9416 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -341,8 +341,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.0") - (replacement python-3/fixed) + (version "3.7.1") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -355,7 +354,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3")) + "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps")) (snippet '(begin (for-each delete-file @@ -414,14 +413,6 @@ data types.") ;; Current 3.x version. (define-public python-3 python-3.7) -(define python-3/fixed - (package - (inherit python-3) - (source (origin - (inherit (package-source python-3)) - (patches (append (origin-patches (package-source python-3)) - (search-patches "python-CVE-2018-14647.patch"))))))) - ;; Current major version. (define-public python python-3) -- cgit v1.2.3 From 99ff4b102c82d27a7d0bd3054f97226d28dfc8eb Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 12 Nov 2018 16:21:03 +0100 Subject: bootstrap: mes-boot: Use mes-boot0 version. * gnu/packages/commencement.scm (mes-boot): Use mes-boot0 version. --- gnu/packages/commencement.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 70b9b8176f..c46aeed04a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -133,6 +133,7 @@ (package-with-bootstrap-guile (package (inherit mes) + (version (package-version mes-boot0)) (source (package-source mes-boot0)) (name "mes-boot") (inputs '()) -- cgit v1.2.3 From da3c6a7f19ef1243af725f63c16c8fd92fde33b4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 24 Nov 2018 08:49:48 +0100 Subject: bootstrap: Switch to official bootstrap urls. Built with 4ae7dc7b9af64794081b1913740b97acd89c91bc gnu: Remove duplicate linux-libre-headers package from bootstrap inputs. * gnu/packages/bootstrap.scm (%bootstrap-linux-libre-headers): Switch to official bootstrap urls. (%bootstrap-mescc-tools): Likewise. (%bootstrap-mes): Likewise. --- gnu/packages/bootstrap.scm | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 93e9d8ddbd..eac729f785 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -405,14 +405,13 @@ $out/bin/guile --version~%" (lambda (system) (origin (method url-fetch) - (uri (match system - ((or "i686-linux" - "x86_64-linux") - "http://lilypond.org/janneke/mes/linux-libre-headers-stripped-4.14.26-i686-linux.tar.xz") - (_ (error "linux-libre-headers-bootstrap: system not supported")))) + (uri (map (cute string-append <> + "/i686-linux/20181020/" + "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz") + %bootstrap-base-urls)) (sha256 (base32 - "0nwspwydn089xbd28nnas762iwl6l9ymbcz170qvfi50ywgim1ma")))) + "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s")))) #f ; no program to test "Bootstrap linux-libre-headers")) @@ -646,18 +645,18 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/mes/" - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz")))) - (sha256 - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - (base32 "0dkwl8mjmmizx7gba9spiq9sp8c5fqv7370qakggy5nxpply59jh"))))))))) + ("tarball" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz") + %bootstrap-base-urls)) + (sha256 + (base32 + "11lniw0vg61kmyhvnwkmcnkci9ym6hbmiksiqggd0hkipbq7hvlz"))))))) (synopsis "Bootstrap binaries of MesCC Tools") (description synopsis) (home-page #f) @@ -694,19 +693,20 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/mes/" - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz")))) - (sha256 - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - (base32 - "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) + ("tarball" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz") + %bootstrap-base-urls)) + (sha256 + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + (base32 + "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From f9e51e9737a6ccb8efb5074a2b4e66f7c0fcb2ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 22:50:30 +0100 Subject: gnu: libgc: Update to 7.6.8. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.8. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index c7491f845f..a5130f5e85 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -30,14 +30,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.6") + (version "7.6.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79")))) + "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 2b4a4e8e47f5cd5cdb5e8cadc7a4fc4b9d15e719 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 22:50:56 +0100 Subject: gnu: libatomic-ops: Update to 7.6.8. * gnu/packages/bdw-gc.scm (libatomic-ops): Update to 7.6.8. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index a5130f5e85..d816b66615 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -91,7 +91,7 @@ C or C++ programs, though that is not its primary goal.") (define-public libatomic-ops (package (name "libatomic-ops") - (version "7.6.6") + (version "7.6.8") (source (origin (method url-fetch) (uri (string-append @@ -99,7 +99,7 @@ C or C++ programs, though that is not its primary goal.") version "/libatomic_ops-" version ".tar.gz")) (sha256 (base32 - "0x7071z707msvyrv9dmgahd1sghbkw8fpbagvcag6xs8yp2spzlr")))) + "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx")))) (build-system gnu-build-system) (outputs '("out" "debug")) (synopsis "Accessing hardware atomic memory update operations") -- cgit v1.2.3 From 9abbfd3ca6025a9142c53de6247a82864b3bf643 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 22:55:09 +0100 Subject: gnu: perl: Update to 5.28.1. * gnu/packages/perl.scm (perl): Update to 5.28.1. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8c854e88df..4dcc4bea66 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -62,14 +62,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.28.0") + (version "5.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky")) + "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From c4ac237f0898a56bcbb21e739ed4fdd51f9ac66f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 23:03:27 +0100 Subject: gnu: bison: Update to 3.2.2. * gnu/packages/bison.scm (bison): Update to 3.2.2. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 71de47762d..c1323d83ec 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -30,7 +30,7 @@ (define-public bison (package (name "bison") - (version "3.0.5") + (version "3.2.2") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "0f7kjygrckkx8vas2nm673592jif0a9mw5g8207f6hj6h4pfyp07")))) + "1yps7xyhllbg9rbb9mii1z736w85yh26vqvhr1y5qx6hwhj0z5bg")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From d52680eec04c83c9350ebedebea19f9aa67ac1e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Dec 2018 23:27:09 +0100 Subject: gnu: libxml2: Don't reference libxml2.a in the default output. * gnu/packages/xml.scm (libxml2)[arguments]: Add substitution for libxml2.la. --- gnu/packages/xml.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index fd4c3fea2c..b85064ed7f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -145,6 +145,12 @@ hierarchical form with variable field lengths.") (rename-file ar (string-append dst "/" (basename ar)))) (find-files src "\\.a$")) + + ;; Remove reference to the static library from the .la + ;; file such that Libtool does the right thing when both + ;; the shared and static variants are available. + (substitute* (string-append src "/libxml2.la") + (("^old_library='libxml2.a'") "old_library=''")) #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") -- cgit v1.2.3 From 5b2da2a659bea9a442a36c89be241a1d6c820d45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 12 Dec 2018 20:08:28 +0100 Subject: gnu: xz: Move liblzma.a to separate output. * gnu/packages/compression.scm (xz)[arguments, outputs]: New fields. * gnu/packages/make-bootstrap.scm (%static-inputs)[xz]: Don't inherit outputs. --- gnu/packages/compression.scm | 17 +++++++++++++++++ gnu/packages/make-bootstrap.scm | 1 + 2 files changed, 18 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e8a50c676c..69f72906b6 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -425,6 +425,23 @@ compressed with pbzip2 can be decompressed with bzip2).") (base32 "0ibi2zsfaz6l756spjwc5rayf4ckgc9hwmy8qinppcyk4svz64mm")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-static-lib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (rename-file (string-append out "/lib/liblzma.a") + (string-append static "/lib/liblzma.a")) + ;; Remove reference to the static library from the .la file + ;; so Libtool does the right thing when both the shared and + ;; static library is available. + (substitute* (string-append out "/lib/liblzma.la") + (("^old_library='liblzma.a'") "old_library=''")) + #t)))))) + (outputs '("out" "static")) (synopsis "General-purpose data compression") (description "XZ Utils is free general-purpose data compression software with high diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 761420af67..d0f8d62f2f 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -159,6 +159,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "LDFLAGS = -static")) #t)))))))) (xz (package (inherit xz) + (outputs '("out")) (arguments `(#:strip-flags '("--strip-all") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From fafa78969eb9a3b5ebaaededc91cab8fc1c208d4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 13 Dec 2018 13:57:25 +0100 Subject: gnu: llvm-rtti: Remove it. This reverts commit f8cba3ff4fc6aed0c539700aa47b6e8f4c25c34d. It sounds from the comment that this should be removed now, as it's been a while since this change was made. * gnu/packages/llvm.scm (llvm-without-rtti): Remove it. * gnu/packages/gl.scm (mesa)[inputs]: Switch to using llvm rather than llvm-without-rtti. --- gnu/packages/gl.scm | 3 +-- gnu/packages/llvm.scm | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d7c112928f..5313a74e5c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -255,8 +255,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxvmc" ,libxvmc) ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - ;; FIXME: Change to 'llvm' in the next rebuild cycle. - `(("llvm" ,llvm-without-rtti))) + `(("llvm" ,llvm))) (_ `())) ("makedepend" ,makedepend) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8a9d1d312b..4be86f3d21 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -95,26 +95,6 @@ languages is in development. The compiler infrastructure includes mirror sets of programming tools as well as libraries with equivalent functionality.") (license license:ncsa))) -;; FIXME: This package is here to prevent many rebuilds on x86_64 and i686 -;; from commit fc9dbf41311d99d0fd8befc789ea7c0e35911890. Update users of -;; this in the next rebuild cycle. -(define-public llvm-without-rtti - (package - (inherit llvm) - (arguments - `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DLLVM_ENABLE_FFI:BOOL=TRUE" - "-DLLVM_INSTALL_UTILS=ON") - #:build-type "Release" - #:phases (modify-phases %standard-phases - (add-before 'build 'shared-lib-workaround - (lambda _ - (setenv "LD_LIBRARY_PATH" - (string-append (getcwd) "/lib")) - #t))))))) - (define* (clang-runtime-from-llvm llvm hash #:optional (patches '())) (package -- cgit v1.2.3 From efa1ea20e6010e71257076cfa4fd7ca0fe2b825c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 12 Dec 2018 15:55:54 +0100 Subject: bootstrap: mes-minimal-stripped: Do not strip bin. * gnu/packages/make-bootstrap.scm (%mes-minimal-stripped): Do not strip bin. --- gnu/packages/make-bootstrap.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d0f8d62f2f..7ce05fe611 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -584,9 +584,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (setvbuf (current-output-port) _IOLBF) (let* ((out (assoc-ref %outputs "out")) + (bindir (string-append out "/bin")) (libdir (string-append out "/lib")) (mes (assoc-ref %build-inputs "mes"))) + (copy-recursively (string-append mes "/bin") bindir) (copy-recursively (string-append mes "/lib") libdir) (copy-recursively (string-append mes "/share/mes/lib") libdir) (for-each remove-store-references -- cgit v1.2.3 From 464baaf7359a5c0192ade7e435f7384a335679e6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Dec 2018 18:24:21 +0100 Subject: gnu: mes: Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd. core: Support \xNN in reader. Fixes tcc-boot running on Mes. * gnu/packages/mes.scm (mes): Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd. --- gnu/packages/mes.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 7f7caa7a6d..844c130383 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -61,8 +61,8 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public mes (let ((triplet "i686-unknown-linux-gnu") (version "0.18") - (revision "0") - (commit "08f04f559670d9e8f57eb03bb9b13f4d0b81cedf")) + (revision "1") + (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) (package (name "mes") (version (string-append version "-" revision "." (string-take commit 7))) @@ -74,7 +74,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") ".tar.gz")) (sha256 (base32 - "1b7wz9k38pfrz707pd4p8s54q903jr167q73ya7qkna89sxj3wna")))) + "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs -- cgit v1.2.3 From f8067e0329d2fca96abbae8988913d6bfa8bcfd3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Dec 2018 02:27:05 +0100 Subject: bootstrap: bootstrap-mes: Update. Built with 464baaf7359a5c0192ade7e435f7384a335679e6 gnu: mes: Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd. * gnu/packages/bootstrap.scm (%bootstrap-mes): Update. --- gnu/packages/bootstrap.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index eac729f785..59fd2784f2 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -697,16 +697,14 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ,(bootstrap-origin (origin (method url-fetch) - (uri (map - (cute string-append <> - "/i686-linux/20181020/" - "mes-minimal-stripped-0.18-0.08f04f5-i686-linux.tar.xz") - %bootstrap-base-urls)) + (uri (string-append + "http://lilypond.org/janneke/guix/20181214/" + "mes-minimal-stripped-0.18-1.a155a0a-i686-linux.tar.xz")) (sha256 (match (%current-system) ((or "i686-linux" "x86_64-linux") (base32 - "0qwpby91hp6afmg5ibdrrk3fw85zxdazfk7rhrdsihsfzqwmfhfx"))))))))) + "06nzpryzh1blldlfdg256176cs3g1qyn3qs9yabzlbx7ps5pq3h3"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From cdd3bcf03883d129581a79e6d6611b2afd3b277b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Dec 2018 02:29:28 +0100 Subject: bootstrap: Do not fake, use Mes instead of Guile. * gnu/packages/commencement.scm (%fake-bootstrap?): Do not fake, use Mes instead of Guile. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c46aeed04a..06bf2144dd 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,7 +81,7 @@ ;;; ;;; Code: -(define %fake-bootstrap? #t) ; cheat using Guile (instead of Mes) in MesCC +(define %fake-bootstrap? #f) ; cheat using Guile (instead of Mes) in MesCC ; for speed-up? (define mes-boot0 -- cgit v1.2.3 From b3bf38a5600d0fdcb0aeed29ee121edef632165d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 13 Dec 2018 02:30:10 +0100 Subject: doc: Update mesboot graph without bootstrap-guile. * doc/images/gcc-mesboot-bag-graph.dot: Update. --- doc/images/gcc-mesboot-bag-graph.dot | 243 +++++++++++++++++------------------ 1 file changed, 120 insertions(+), 123 deletions(-) diff --git a/doc/images/gcc-mesboot-bag-graph.dot b/doc/images/gcc-mesboot-bag-graph.dot index a49f5070ed..74d1896fb1 100644 --- a/doc/images/gcc-mesboot-bag-graph.dot +++ b/doc/images/gcc-mesboot-bag-graph.dot @@ -1,126 +1,123 @@ digraph "Guix bag" { - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" [label = "gcc-mesboot@4.9.4", shape = box, fontname = Helvetica]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = blue]; - "/gnu/store/szgq0x7gm43xafbvg2ps1vp63zlzbj59-gcc-mesboot-4.9.4.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = blue]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [label = "binutils-mesboot@2.20.1a", shape = box, fontname = Helvetica]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [color = darkseagreen]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = darkseagreen]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; - "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = darkseagreen]; - "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [label = "binutils-mesboot0@2.20.1a", shape = box, fontname = Helvetica]; - "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = red]; - "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = red]; - "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = red]; - "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = red]; - "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; - "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" -> "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [color = darkseagreen]; - "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" -> "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" [color = darkseagreen]; - "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [label = "mes-boot@0.18-0.08f04f5", shape = box, fontname = Helvetica]; - "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/pn5wxcxg4bgmyzidc519kyfd609m9kw3-bootstrap-mescc-tools-0.5.2.drv" [color = dimgrey]; - "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/9qw55y8fgq9q0h3wz47lih78cwd0zz0q-bootstrap-mes-0.drv" [color = dimgrey]; - "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" -> "/gnu/store/gz3agxnnlgkafw2c8jnvk2hqmlh85pkc-guile-bootstrap-2.0.drv" [color = dimgrey]; - "/gnu/store/pn5wxcxg4bgmyzidc519kyfd609m9kw3-bootstrap-mescc-tools-0.5.2.drv" [label = "bootstrap-mescc-tools@0.5.2", shape = box, fontname = Helvetica]; - "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [label = "bootstrap-binaries@0", shape = box, fontname = Helvetica]; - "/gnu/store/9qw55y8fgq9q0h3wz47lih78cwd0zz0q-bootstrap-mes-0.drv" [label = "bootstrap-mes@0", shape = box, fontname = Helvetica]; - "/gnu/store/gz3agxnnlgkafw2c8jnvk2hqmlh85pkc-guile-bootstrap-2.0.drv" [label = "guile-bootstrap@2.0", shape = box, fontname = Helvetica]; - "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" [label = "tcc-boot0@0.9.26-5.c7b3f59", shape = box, fontname = Helvetica]; - "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [color = peachpuff4]; - "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/pn5wxcxg4bgmyzidc519kyfd609m9kw3-bootstrap-mescc-tools-0.5.2.drv" [color = peachpuff4]; - "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = peachpuff4]; - "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/9qw55y8fgq9q0h3wz47lih78cwd0zz0q-bootstrap-mes-0.drv" [color = peachpuff4]; - "/gnu/store/vv6vl6l8y60vjbby6mwk41zkfc4x7mcr-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/gz3agxnnlgkafw2c8jnvk2hqmlh85pkc-guile-bootstrap-2.0.drv" [color = peachpuff4]; - "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; - "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/fr8h0pkfnvk4yhx5i9k8alfc86yhmhri-mes-boot-0.18-0.08f04f5.drv" [color = darkgoldenrod]; - "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = darkgoldenrod]; - "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; - "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; - "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = darkgoldenrod]; - "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; - "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = darkviolet]; - "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkviolet]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [label = "glibc-mesboot0@2.2.5", shape = box, fontname = Helvetica]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = magenta]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" [color = magenta]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = magenta]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" [color = magenta]; - "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = magenta]; - "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" [label = "gcc-core-mesboot@2.95.3", shape = box, fontname = Helvetica]; - "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = cyan3]; - "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/b2hc3h7h61yaaifk8w4iapvx3s0w8yk6-tcc-boot-0.9.27.drv" [color = cyan3]; - "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = cyan3]; - "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = cyan3]; - "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" [label = "mesboot-headers@0.18-0.08f04f5", shape = box, fontname = Helvetica]; - "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = dimgrey]; - "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = dimgrey]; - "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [label = "linux-libre-headers-bootstrap@0", shape = box, fontname = Helvetica]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [label = "gcc-mesboot0@2.95.3", shape = box, fontname = Helvetica]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = darkgoldenrod]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/mkb8vw25b18nw49afj21w4c9v1f7ik1f-gcc-core-mesboot-2.95.3.drv" [color = darkgoldenrod]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = darkgoldenrod]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkgoldenrod]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = darkgoldenrod]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = darkgoldenrod]; - "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = darkgoldenrod]; - "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" [label = "gcc-mesboot1-wrapper@4.7.4", shape = box, fontname = Helvetica]; - "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = cyan3]; - "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" [color = cyan3]; - "/gnu/store/gjzjhr6h3lq58kb2dv989pl4y1bbk2wg-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = cyan3]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" [label = "glibc-mesboot@2.16.0", shape = box, fontname = Helvetica]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; - "/gnu/store/mk9p60ajavjha1ybrgh3wm47k5fqmi2c-glibc-mesboot-2.16.0.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = darkseagreen]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" [label = "glibc-headers-mesboot@2.16.0", shape = box, fontname = Helvetica]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/s03mkbbgz3zvqw0mgadrj4rj52kaliy3-mesboot-headers-0.18-0.08f04f5.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = blue]; - "/gnu/store/9hxjjd75ck45v1lq07mlari4j65yzpal-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = blue]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" [label = "gcc-mesboot1@4.7.4", shape = box, fontname = Helvetica]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9anasaq20q8rlq036lswazs8k8h3b3bz-binutils-mesboot-2.20.1a.drv" [color = magenta]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [color = magenta]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = magenta]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/9k08vfps0s8hjdrgag1vvaainr3vbs2i-diffutils-mesboot-2.7.drv" [color = magenta]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = magenta]; - "/gnu/store/dbdm0njsi3dvwa63d97dl5bhc3l5lqnq-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [color = magenta]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" [label = "make-mesboot@3.82", shape = box, fontname = Helvetica]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/gvh9xfc5cl5d4s256pvm7w7rhw413piv-binutils-mesboot0-2.20.1a.drv" [color = magenta]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/sr7l7m4q6g5anghww1klqx3q38wywp8v-glibc-mesboot0-2.2.5.drv" [color = magenta]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/kfw0qp3885yd2blygsfsml7rr8vn1k77-gcc-mesboot0-2.95.3.drv" [color = magenta]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/iskgf1pd99455dfxnkqbb6ibj06jihhl-make-mesboot0-3.80.drv" [color = magenta]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/9l87r75n3rgsxc9230r4bxhd8dljfx6x-bootstrap-binaries-0.drv" [color = magenta]; - "/gnu/store/bdl4qbzwsx7mwhi4zsbim2jnrqlzyl07-make-mesboot-3.82.drv" -> "/gnu/store/3hmp33npkfndjpikabxxcv2qb5pv9qwj-linux-libre-headers-bootstrap-0.drv" [color = magenta]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" [label = "gcc-mesboot@4.9.4", shape = box, fontname = Helvetica]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = darkviolet]; + "/gnu/store/5gkanb1d995yrpdd2h4iqkjmc5g1j0q4-gcc-mesboot-4.9.4.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = darkviolet]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [label = "binutils-mesboot@2.20.1a", shape = box, fontname = Helvetica]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = dimgrey]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = dimgrey]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [color = dimgrey]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = dimgrey]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = dimgrey]; + "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = dimgrey]; + "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [label = "binutils-mesboot0@2.20.1a", shape = box, fontname = Helvetica]; + "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = peachpuff4]; + "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = peachpuff4]; + "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = peachpuff4]; + "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [label = "tcc-boot@0.9.27", shape = box, fontname = Helvetica]; + "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" -> "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [color = cyan3]; + "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" -> "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" [color = cyan3]; + "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [label = "mes-boot@0.18", shape = box, fontname = Helvetica]; + "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" -> "/gnu/store/gd83makzwnb2aq1x0hylfsi8gaxln5js-bootstrap-mescc-tools-0.5.2.drv" [color = darkviolet]; + "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkviolet]; + "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" -> "/gnu/store/viccpx5izm9z0ci5nvib0xkdrsfqixlr-bootstrap-mes-0.drv" [color = darkviolet]; + "/gnu/store/gd83makzwnb2aq1x0hylfsi8gaxln5js-bootstrap-mescc-tools-0.5.2.drv" [label = "bootstrap-mescc-tools@0.5.2", shape = box, fontname = Helvetica]; + "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [label = "bootstrap-binaries@0", shape = box, fontname = Helvetica]; + "/gnu/store/viccpx5izm9z0ci5nvib0xkdrsfqixlr-bootstrap-mes-0.drv" [label = "bootstrap-mes@0", shape = box, fontname = Helvetica]; + "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" [label = "tcc-boot0@0.9.26-5.c7b3f59", shape = box, fontname = Helvetica]; + "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [color = dimgrey]; + "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/gd83makzwnb2aq1x0hylfsi8gaxln5js-bootstrap-mescc-tools-0.5.2.drv" [color = dimgrey]; + "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/p437zhq42yavzknp3miacrgnaw206h7i-tcc-boot0-0.9.26-5.c7b3f59.drv" -> "/gnu/store/viccpx5izm9z0ci5nvib0xkdrsfqixlr-bootstrap-mes-0.drv" [color = dimgrey]; + "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [label = "diffutils-mesboot@2.7", shape = box, fontname = Helvetica]; + "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/as3hax4r1zzxz4ihlzj9yq3rs83gm93c-mes-boot-0.18.drv" [color = peachpuff4]; + "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = peachpuff4]; + "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = peachpuff4]; + "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = peachpuff4]; + "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [label = "make-mesboot0@3.80", shape = box, fontname = Helvetica]; + "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = darkgoldenrod]; + "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkgoldenrod]; + "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkgoldenrod]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [label = "glibc-mesboot0@2.2.5", shape = box, fontname = Helvetica]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" [color = darkseagreen]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkseagreen]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" [color = darkseagreen]; + "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = darkseagreen]; + "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" [label = "gcc-core-mesboot@2.95.3", shape = box, fontname = Helvetica]; + "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = dimgrey]; + "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/xjvyz26a4m191p5aqyifi7fw57vjps15-tcc-boot-0.9.27.drv" [color = dimgrey]; + "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = dimgrey]; + "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = dimgrey]; + "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = dimgrey]; + "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" [label = "mesboot-headers@0.18", shape = box, fontname = Helvetica]; + "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = cyan3]; + "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = cyan3]; + "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [label = "linux-libre-headers-bootstrap@0", shape = box, fontname = Helvetica]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [label = "gcc-mesboot0@2.95.3", shape = box, fontname = Helvetica]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = darkseagreen]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/ia8z1bsk6hw80inpxxn751n4haas5zbv-gcc-core-mesboot-2.95.3.drv" [color = darkseagreen]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkseagreen]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; + "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = darkseagreen]; + "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" [label = "gcc-mesboot1-wrapper@4.7.4", shape = box, fontname = Helvetica]; + "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" [color = red]; + "/gnu/store/86dqsl7b3qrzxl0zd049i5rl7l19gnk0-gcc-mesboot1-wrapper-4.7.4.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = red]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" [label = "glibc-mesboot@2.16.0", shape = box, fontname = Helvetica]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = blue]; + "/gnu/store/f89fk16sm2l8amhjqli2zg6hil71c7m3-glibc-mesboot-2.16.0.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = blue]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" [label = "glibc-headers-mesboot@2.16.0", shape = box, fontname = Helvetica]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/kd7b9sba79s1l7hjdhav51gvci5ws4jy-mesboot-headers-0.18.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = red]; + "/gnu/store/l92gwa7d9jylv25q7fra0hd4cqsxyxz8-glibc-headers-mesboot-2.16.0.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = red]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" [label = "gcc-mesboot1@4.7.4", shape = box, fontname = Helvetica]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/91nyq32kpndqj8qywqx17zy1ahv4xzgf-binutils-mesboot-2.20.1a.drv" [color = darkseagreen]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [color = darkseagreen]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = darkseagreen]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = darkseagreen]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/yn5ryq346dhxhjsg3glcnb0wmdz4cn8c-diffutils-mesboot-2.7.drv" [color = darkseagreen]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = darkseagreen]; + "/gnu/store/8jk8qkbvi8bgf1h2m0f8c2gmriql52p4-gcc-mesboot1-4.7.4.drv" -> "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [color = darkseagreen]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" [label = "make-mesboot@3.82", shape = box, fontname = Helvetica]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/0w4i240rlsq7bd9ig4nixpbijkf4qy12-binutils-mesboot0-2.20.1a.drv" [color = magenta]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/0admz8igq3lvcyga32gp87q2g7918zwy-glibc-mesboot0-2.2.5.drv" [color = magenta]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/r9rsmhz659147krcvksx53b0mjdavr05-gcc-mesboot0-2.95.3.drv" [color = magenta]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/mrbi3ffh1v62b7sc3g40qvz0i0dbbvbi-make-mesboot0-3.80.drv" [color = magenta]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/00rjhpbkzk86s4pksjg934l310iaxxjr-bootstrap-binaries-0.drv" [color = magenta]; + "/gnu/store/79zblx3zhbmycl30kvwylpxyhjv52qi4-make-mesboot-3.82.drv" -> "/gnu/store/q8d60ln0dxjvqd2ymi1g6xyk3046m23n-linux-libre-headers-bootstrap-0.drv" [color = magenta]; } -- cgit v1.2.3 From 9c14fd07708e0824c493f273a236747631799261 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Dec 2018 14:08:14 +0100 Subject: bootstrap: Remove development hacks. * gnu/packages/commencement.scm (%fake-bootstrap?): Remove. Update users to always keep true bootstrap; i.e., do not use %bootstrap-guile. (mes-boot0): Remove. Update users. (nyacc-boot): Likewise. --- gnu/packages/commencement.scm | 113 +++--------------------------------------- 1 file changed, 7 insertions(+), 106 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 06bf2144dd..108db5a75d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,73 +81,19 @@ ;;; ;;; Code: -(define %fake-bootstrap? #f) ; cheat using Guile (instead of Mes) in MesCC - ; for speed-up? - -(define mes-boot0 - (let ((version "0.18") - (revision "0") - (commit #f)) - (package - (inherit mes) - (name "mes-boot0") - (version (if commit (string-append version "-" revision "." (string-take commit 7)) - version)) - (source (if commit - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes" - "/-/archive/" commit - "/mes-" commit ".tar.gz")) - (sha256 - (base32 - "1whbzahv16bwhavr2azqli0dcbk29p9rsqfbjl69la135z8vgdhx"))) - (package-source mes))) - (native-inputs '()) - (propagated-inputs '())))) - -(define nyacc-boot - (let ((version "0.86.0") - (revision "0") - (commit #f)) - (package - (inherit nyacc) - (name "nyacc-boot") - (version - (if commit - (string-append version "-" revision "." (string-take commit 7)) - version)) - (source - (if commit - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/nyacc" - "/-/archive/" commit - "/nyacc-" commit ".tar.gz")) - (sha256 - (base32 - "0dlcqmchhl57nh7f0v6qb1kkbi7zbs3b185hcqv57fhb60b7rgcq"))) - (package-source nyacc)))))) - (define mes-boot (package-with-bootstrap-guile (package (inherit mes) - (version (package-version mes-boot0)) - (source (package-source mes-boot0)) (name "mes-boot") (inputs '()) (propagated-inputs '()) (native-inputs `(("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc-boot)) + ("nyacc-source" ,(package-source nyacc)) ("coreutils" , %bootstrap-coreutils&co) - ("bootstrap-mes" ,%bootstrap-mes) - ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile - `(("guile" ,%bootstrap-guile) - ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick - '()))) + ("bootstrap-mes" ,%bootstrap-mes))) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -181,35 +127,12 @@ (string-append "--prefix=" out)) (setenv "MES" "src/mes") (setenv "MESCC" "scripts/mescc") - (when ,%fake-bootstrap? ; Cheat using Guile+Nyacc+MesCC; ~30 times faster - (let ((dir (with-directory-excursion ".." (getcwd))) - (guile (assoc-ref %build-inputs "guile")) - (srfi-43 (assoc-ref %build-inputs "srfi-43"))) - (setenv "MES" "guile") - (setenv "GUILE_AUTO_COMPILE" "1") - (setenv "GUILE_LOAD_COMPILED_PATH" - (string-append guile "/lib/guile/2.0/ccache")) - (setenv "GUILE_LOAD_PATH" - (string-append (string-append dir "/nyacc-source/module") - ":" dir - ":" guile "/share/guile/2.0/")) - ;; these fail with guile-2.0 - (when srfi-43 - (delete-file "tests/srfi-9.test") - (delete-file "tests/srfi-43.test")) - ;; give auto-compile a home -- massive speed-up - (mkdir-p "/tmp/home") - (setenv "HOME" "/tmp/home"))) #t))) (replace 'build (lambda _ (invoke "sh" "build.sh"))) (replace 'check (lambda _ - (when ,%fake-bootstrap? - ;; break with guile-2.0 - (delete-file "scaffold/boot/50-primitive-load.scm") - (delete-file "scaffold/boot/51-module.scm")) (and (setenv "MES_ARENA" "100000000") (setenv "DIFF" "sh scripts/diff.scm") @@ -263,14 +186,10 @@ (native-inputs `(("mes" ,mes-boot) ("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc-boot)) + ("nyacc-source" ,(package-source nyacc)) ("coreutils" , %bootstrap-coreutils&co) - ("bootstrap-mes" ,%bootstrap-mes) - ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile - `(("guile" ,%bootstrap-guile) - ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43; cherry-pick - '()))) + ("bootstrap-mes" ,%bootstrap-mes))) (arguments `(#:implicit-inputs? #f #:guile ,%bootstrap-guile @@ -325,27 +244,9 @@ (setenv "PREPROCESS" "1") (setenv "MES_ARENA" "70000000") (setenv "MES_MAX_ARENA" "70000000") - - (if ,%fake-bootstrap? - (begin ; Cheat using Guile+Nyacc+MesCC; ~30 times faster - (setenv "MES" "guile") - (setenv "GUILE_AUTO_COMPILE" "1") - (setenv "GUILE_LOAD_COMPILED_PATH" - (string-append guile "/lib/guile/2.0/ccache")) - (setenv "GUILE_LOAD_PATH" - (string-append dir - ":" guile "/share/guile/2.0/" - ":" dir "/nyacc-source/module" - ":" mes "/share/mes/guile")) - - ;; give auto-compile a home -- massive speed-up - (mkdir-p "/tmp/home") - (setenv "HOME" "/tmp/home")) - - (begin ; True bootstrap build with Mes+Nyacc+MesCC - (setenv "MES" "mes") - (setenv "GUILE_LOAD_PATH" "nyacc") - (symlink (string-append "../nyacc-source/module") "nyacc"))) + (setenv "MES" "mes") + (setenv "GUILE_LOAD_PATH" "nyacc") + (symlink (string-append "../nyacc-source/module") "nyacc") (invoke "sh" "configure" "--prefix=$PREFIX" (string-append "--elfinterp=" interpreter) -- cgit v1.2.3 From c994177155db71fad9312441043fd8790af9092d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Dec 2018 18:52:35 +0100 Subject: gnu: mes: Update to 0.19. * gnu/packages/mes.scm (mes): Update to 0.19. --- gnu/packages/mes.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 844c130383..9aff59ab1d 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -59,22 +59,17 @@ extensive examples, including parsers for the Javascript and C99 languages.") (license (list gpl3+ lgpl3+)))) (define-public mes - (let ((triplet "i686-unknown-linux-gnu") - (version "0.18") - (revision "1") - (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) + (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version (string-append version "-" revision "." (string-take commit 7))) + (version "0.19") (source (origin (method url-fetch) - (uri (string-append - "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" - name "-" commit - ".tar.gz")) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) (sha256 (base32 - "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn")))) + "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs @@ -97,11 +92,11 @@ extensive examples, including parsers for the Javascript and C99 languages.") `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries (synopsis "Scheme interpreter and C compiler for full source bootstrapping") (description - "GNU Mes--Maxwell Equations of Software--brings the Reduced -Binary Seed bootstrap to GuixSD and aims to help create full source -bootstrapping for GNU/Linux distributions. It consists of a mutual -self-hosting Scheme interpreter in C and a Nyacc-based C compiler in -Scheme and is compatible with Guile.") + "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed +bootstrap to Guix and aims to help create full source bootstrapping for +GNU/Linux distributions. It consists of a mutual self-hosting Scheme +interpreter in C and a Nyacc-based C compiler in Scheme and is compatible with +Guile.") (home-page "https://gnu.org/software/mes") (license gpl3+)))) -- cgit v1.2.3 From 20dd94b82fc60918d9fdabb609e30ed4414aba95 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 15 Dec 2018 09:01:53 +0100 Subject: bootstrap: Merge mes-minimal into mes-minimal-stripped. * gnu/packages/make-bootstrap.scm (%mes-minimal): Remove. (%mes-minimal-stripped): Configure using --mes. Strip installation. --- gnu/packages/make-bootstrap.scm | 50 +++++++++++------------------------------ 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 7ce05fe611..ff0523babc 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -548,55 +548,31 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ((#:make-flags flags) `(cons "CC=gcc -static" ,flags))))))) -(define %mes-minimal +(define-public %mes-minimal-stripped ;; A minimal Mes without documentation dependencies, for bootstrap. (let ((triplet "i686-unknown-linux-gnu")) (package (inherit mes) - (name "mes-minimal") + (name "mes-minimal-stripped") (native-inputs `(("guile" ,guile-2.2))) (arguments `(#:system "i686-linux" #:strip-binaries? #f + #:configure-flags '("--mes") #:phases (modify-phases %standard-phases - (add-before 'configure 'optional-dot + (add-after 'install 'strip-install (lambda _ - (substitute* "configure" - (("#:version-option \"-V\"" all) - (string-append all "#:optional? #t"))))))))))) - -(define-public %mes-minimal-stripped - ;; The subset of Mes files needed for bootstrap. - (package - (inherit %mes-minimal) - (name "mes-minimal-stripped") - (build-system trivial-build-system) - (source #f) - (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (srfi srfi-1) - (srfi srfi-26) - (guix build utils)) - - (setvbuf (current-output-port) _IOLBF) - (let* ((out (assoc-ref %outputs "out")) - (bindir (string-append out "/bin")) - (libdir (string-append out "/lib")) - (mes (assoc-ref %build-inputs "mes"))) - - (copy-recursively (string-append mes "/bin") bindir) - (copy-recursively (string-append mes "/lib") libdir) - (copy-recursively (string-append mes "/share/mes/lib") libdir) - (for-each remove-store-references - (remove (lambda (file) (or (string-suffix? ".h" file) - (string-suffix? ".c" file))) - (find-files out ".*"))) - #t)))) - (inputs `(("mes" ,%mes-minimal))))) + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (delete-file-recursively (string-append out "/lib/guile")) + (delete-file-recursively (string-append share "/guile")) + (delete-file-recursively (string-append share "/mes/scaffold")) + (for-each + delete-file + (find-files (string-append share "/mes/lib") + "\\.(h|c)"))))))))))) (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search -- cgit v1.2.3 From ef809e3ac036eccc5f9c9edd8fb661d14ae15f2f Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 14 Dec 2018 19:21:59 +0100 Subject: bootstrap: Add mes-boot0; decouple mes-boot from Mes. * gnu/packages/commencement.scm (mes-boot0): New variable. (mes-boot): Use it. --- gnu/packages/commencement.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 108db5a75d..babad13e5f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,11 +81,36 @@ ;;; ;;; Code: +(define mes-boot0 + (let ((version "0.18") + (revision "1") + (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) + (package + (inherit mes) + (name "mes-boot0") + (version (if commit (string-append version "-" revision "." (string-take commit 7)) + version)) + (source (if commit + (origin + (method url-fetch) + (uri (string-append + "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" + "mes" "-" commit + ".tar.gz")) + (sha256 + (base32 + "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn"))) + (package-source mes))) + (native-inputs '()) + (propagated-inputs '())))) + (define mes-boot (package-with-bootstrap-guile (package (inherit mes) (name "mes-boot") + (version (package-version mes-boot0)) + (source (package-source mes-boot0)) (inputs '()) (propagated-inputs '()) (native-inputs -- cgit v1.2.3 From c89bbcccb2cb5449bc609c1229f1638ac72aeea3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 15 Dec 2018 09:25:39 +0100 Subject: bootstrap: bootstrap-mes: Update. Built with ef809e3ac036eccc5f9c9edd8fb661d14ae15f2f bootstrap: Add mes-boot0; decouple mes-boot from Mes. * gnu/packages/bootstrap.scm (%bootstrap-mes): Update. --- gnu/packages/bootstrap.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 59fd2784f2..760344ba5a 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -697,14 +697,16 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ,(bootstrap-origin (origin (method url-fetch) - (uri (string-append - "http://lilypond.org/janneke/guix/20181214/" - "mes-minimal-stripped-0.18-1.a155a0a-i686-linux.tar.xz")) + (uri (map + (cute string-append <> + "/i686-linux/20181020/" + "mes-minimal-stripped-0.19-i686-linux.tar.xz") + %bootstrap-base-urls)) (sha256 (match (%current-system) ((or "i686-linux" "x86_64-linux") (base32 - "06nzpryzh1blldlfdg256176cs3g1qyn3qs9yabzlbx7ps5pq3h3"))))))))) + "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))))) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From df2242a462559d57b1362793f50667a81b2475d3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 16 Dec 2018 21:16:29 +0100 Subject: bootstrap: mes-boot: Update for mes 0.19. * gnu/packages/commencement.scm (mes-boot): Update for mes 0.19. (mes-boot0): Remove. --- gnu/packages/commencement.scm | 58 +++++++++++-------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index babad13e5f..dfb9fee4c2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -81,36 +81,11 @@ ;;; ;;; Code: -(define mes-boot0 - (let ((version "0.18") - (revision "1") - (commit "a155a0a9a2d941b15c1b98e5cce787de40a8dacd")) - (package - (inherit mes) - (name "mes-boot0") - (version (if commit (string-append version "-" revision "." (string-take commit 7)) - version)) - (source (if commit - (origin - (method url-fetch) - (uri (string-append - "https://git.savannah.gnu.org/cgit/mes.git/snapshot/" - "mes" "-" commit - ".tar.gz")) - (sha256 - (base32 - "14siwfwg0zlf1pa4ah8s08gsxqcazhydbwa9qvybb0knxs27aicn"))) - (package-source mes))) - (native-inputs '()) - (propagated-inputs '())))) - (define mes-boot (package-with-bootstrap-guile (package (inherit mes) (name "mes-boot") - (version (package-version mes-boot0)) - (source (package-source mes-boot0)) (inputs '()) (propagated-inputs '()) (native-inputs @@ -126,40 +101,35 @@ #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let ((coreutils (assoc-ref %build-inputs "coreutils")) - (srfi-43 (assoc-ref %build-inputs "srfi-43")) - (nyacc-source (assoc-ref %build-inputs "nyacc-source")) + (lambda _ + (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source")) (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (with-directory-excursion ".." (and (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/lib") "mes-seed") - (or (not srfi-43) - (and (mkdir-p "srfi") - (copy-file srfi-43 "srfi/srfi-43.scm") - #t))))))) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") + #t))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) - (symlink (string-append "../nyacc-source/module") "nyacc") + (setenv "GUILE" "mes") + (setenv "GUILE_EFFECTIVE_VERSION" "2.2") (setenv "GUILE_LOAD_PATH" "nyacc") - (setenv "GUILE_TOOLS" "true") ; no tools in bootstrap-guile - (substitute* "configure.sh" - (("^arch=.*") "arch=i686\n")) + (symlink (string-append "../nyacc-source/module") "nyacc") (invoke "bash" "configure.sh" - (string-append "--prefix=" out)) - (setenv "MES" "src/mes") - (setenv "MESCC" "scripts/mescc") - #t))) + (string-append "--prefix=" out))))) (replace 'build (lambda _ - (invoke "sh" "build.sh"))) + (let ((mes (assoc-ref %build-inputs "bootstrap-mes"))) + (setenv "MES_PREFIX" (string-append mes "/share/mes")) + (setenv "MES_ARENA" "100000000") + (setenv "MES_MAX_ARENA" "100000000") + (setenv "MES_STACK" "10000000") + (invoke "sh" "bootstrap.sh")))) (replace 'check (lambda _ (and - (setenv "MES_ARENA" "100000000") (setenv "DIFF" "sh scripts/diff.scm") ;; fail fast tests ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") -- cgit v1.2.3 From b02dc758a5316a8ba164d65f3d0c19fc2e21b408 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 16 Dec 2018 21:17:14 +0100 Subject: bootstrap: tcc-boot0: Update for mes 0.19. * gnu/packages/commencement.scm (tcc-boot0): Update for mes 0.19. --- gnu/packages/commencement.scm | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dfb9fee4c2..bbcc5ac589 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -159,8 +159,8 @@ ;; ported to 0.9.27, alas the resulting tcc is buggy. Once MesCC is more ;; mature, this package should use the 0.9.27 sources (or later). (let ((version "0.9.26") - (revision "5") - (commit "c7b3f59d1a71e71b470f859b20f0cfe840f3954d")) + (revision "6") + (commit "c004e9a34fb026bb44d211ab98bb768e79900eef")) (package-with-bootstrap-guile (package (inherit tcc) @@ -173,7 +173,7 @@ "/tinycc-" commit ".tar.gz")) (sha256 (base32 - "1agz5w5q6dm51n63hsxii33hxdghmdiacbb5zzxzac3aarfxjb2m")))) + "1hmzn1pq0x22ppd80hyrn5qzqq94mxd0ychzj6vrr2vnj2frjv5b")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) @@ -194,7 +194,6 @@ (add-after 'unpack 'unpack-seeds (lambda* (#:key outputs #:allow-other-keys) (let* ((coreutils (assoc-ref %build-inputs "coreutils")) - (srfi-43 (assoc-ref %build-inputs "srfi-43")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (setenv "PATH" (string-append @@ -205,17 +204,13 @@ (mkdir-p "nyacc-source") (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/lib") "mes-seed") - (or (not srfi-43) - (and (mkdir-p "srfi") - (copy-file srfi-43 "srfi/srfi-43.scm") - #t))))))) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") + #t))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) (dir (with-directory-excursion ".." (getcwd))) (coreutils (assoc-ref %build-inputs "coreutils")) - (guile (assoc-ref %build-inputs "guile")) (mes (assoc-ref %build-inputs "mes")) (mescc-tools (assoc-ref %build-inputs "mescc-tools")) (libc (assoc-ref %build-inputs "libc")) @@ -226,22 +221,18 @@ (setenv "PATH" (string-append coreutils "/bin" ":" mes "/bin" - (if guile (string-append ":" guile "/bin") - "") ":" mescc-tools "/bin")) + (format (current-error-port) "PATH=~s\n" (getenv "PATH")) (setenv "PREFIX" out) - (setenv "MESCC" (string-append mes "/bin/mescc")) (symlink (string-append mes "/share/mes") "mes") + (symlink (string-append "../nyacc-source/module") "nyacc") (setenv "MES_PREFIX" "mes") - (setenv "OBJDUMP" "true") - (setenv "ONE_SOURCE" "1") - (setenv "PREPROCESS" "1") - (setenv "MES_ARENA" "70000000") - (setenv "MES_MAX_ARENA" "70000000") + (setenv "MES_ARENA" "100000000") + (setenv "MES_MAX_ARENA" "100000000") + (setenv "MES_STACK" "10000000") (setenv "MES" "mes") (setenv "GUILE_LOAD_PATH" "nyacc") - (symlink (string-append "../nyacc-source/module") "nyacc") (invoke "sh" "configure" "--prefix=$PREFIX" (string-append "--elfinterp=" interpreter) @@ -249,10 +240,13 @@ "--tccdir=.")))) (replace 'build (lambda _ - (invoke "sh" "build.sh"))) + (substitute* "bootstrap.sh" + (("^ cmp") "# cmp")) + (invoke "sh" "bootstrap.sh"))) (replace 'check (lambda _ (setenv "DIFF" "diff.scm") + (setenv "OBJDUMP" "true") ;; fail fast tests ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") -- cgit v1.2.3 From 03a45a40227d97ccafeb49c4eb0fc7539f4d2127 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 17 Dec 2018 07:41:23 +0100 Subject: bootstrap: srfi-43: Remove. * gnu/packages/bootstrap.scm (%bootstrap-inputs): Remove srfi-43. (srfi-43): Remove. --- gnu/packages/bootstrap.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 760344ba5a..72e3d0847f 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -50,8 +50,7 @@ %bootstrap-glibc %bootstrap-inputs %bootstrap-mescc-tools - %bootstrap-mes - %srfi-43)) + %bootstrap-mes)) ;;; Commentary: ;;; @@ -712,15 +711,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) -(define %srfi-43 - (origin - (method url-fetch) - (uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0") - (file-name "srfi-43.scm") - (sha256 - (base32 - "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) - (define (%bootstrap-inputs) ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. @@ -728,8 +718,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ((or "i686-linux" "x86_64-linux") `(("linux-libre-headers" ,%bootstrap-linux-libre-headers) ("bootstrap-mescc-tools" ,%bootstrap-mescc-tools) - ("mes" ,%bootstrap-mes) - ("srfi-43" ,%srfi-43 ))) + ("mes" ,%bootstrap-mes))) (_ `(("libc" ,%bootstrap-glibc) ("gcc" ,%bootstrap-gcc) -- cgit v1.2.3 From ea8be005d409658dea4f4356e9279784ce0a5a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 20 Dec 2018 19:57:28 +0100 Subject: gnu: Use i686-linux bootstrap binaries on x86_64-linux. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This saves 4.4 MB on the installed Guix. * gnu/packages/bootstrap/x86_64-linux: Remove directory. * gnu/local.mk (bootstrap_x86_64_linuxdir) (dist_bootstrap_x86_64_linux_DATA): Remove. * gnu/packages.scm (search-bootstrap-binary): When SYSTEM is "x86_64-linux", use "i686-linux" instead. --- gnu/local.mk | 7 ------- gnu/packages.scm | 18 +++++++++++------- gnu/packages/bootstrap/x86_64-linux/bash | Bin 1425560 -> 0 bytes gnu/packages/bootstrap/x86_64-linux/mkdir | Bin 792448 -> 0 bytes gnu/packages/bootstrap/x86_64-linux/tar | Bin 1369912 -> 0 bytes gnu/packages/bootstrap/x86_64-linux/xz | Bin 927264 -> 0 bytes 6 files changed, 11 insertions(+), 14 deletions(-) delete mode 100755 gnu/packages/bootstrap/x86_64-linux/bash delete mode 100755 gnu/packages/bootstrap/x86_64-linux/mkdir delete mode 100755 gnu/packages/bootstrap/x86_64-linux/tar delete mode 100755 gnu/packages/bootstrap/x86_64-linux/xz diff --git a/gnu/local.mk b/gnu/local.mk index 9cf690e0f1..7c970dc47c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1287,18 +1287,11 @@ MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap -bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux bootstrap_aarch64_linuxdir = $(bootstrapdir)/aarch64-linux bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux -dist_bootstrap_x86_64_linux_DATA = \ - %D%/packages/bootstrap/x86_64-linux/bash \ - %D%/packages/bootstrap/x86_64-linux/mkdir \ - %D%/packages/bootstrap/x86_64-linux/tar \ - %D%/packages/bootstrap/x86_64-linux/xz - dist_bootstrap_i686_linux_DATA = \ %D%/packages/bootstrap/i686-linux/bash \ %D%/packages/bootstrap/i686-linux/mkdir \ diff --git a/gnu/packages.scm b/gnu/packages.scm index 532297239d..333b18f9f0 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -102,14 +102,18 @@ FILE-NAME found in %PATCH-PATH." (define (search-bootstrap-binary file-name system) "Search the bootstrap binary FILE-NAME for SYSTEM. Raise an error if not found." - (or (search-path (%bootstrap-binaries-path) - (string-append system "/" file-name)) - (raise (condition - (&message - (message - (format #f (G_ "could not find bootstrap binary '~a' \ + ;; On x86_64 always use the i686 binaries. + (let ((system (match system + ("x86_64-linux" "i686-linux") + (_ system)))) + (or (search-path (%bootstrap-binaries-path) + (string-append system "/" file-name)) + (raise (condition + (&message + (message + (format #f (G_ "could not find bootstrap binary '~a' \ for system '~a'") - file-name system))))))) + file-name system)))))))) (define %distro-root-directory ;; Absolute file name of the module hierarchy. Since (gnu packages …) might diff --git a/gnu/packages/bootstrap/x86_64-linux/bash b/gnu/packages/bootstrap/x86_64-linux/bash deleted file mode 100755 index b9c410b7cf..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/x86_64-linux/mkdir b/gnu/packages/bootstrap/x86_64-linux/mkdir deleted file mode 100755 index f8250ae693..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/x86_64-linux/tar b/gnu/packages/bootstrap/x86_64-linux/tar deleted file mode 100755 index 90e492f89d..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/x86_64-linux/xz b/gnu/packages/bootstrap/x86_64-linux/xz deleted file mode 100755 index 6bfe3c6d96..0000000000 Binary files a/gnu/packages/bootstrap/x86_64-linux/xz and /dev/null differ -- cgit v1.2.3 From ef5821093adfddf80ec472652b6b00439412fa47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 20 Dec 2018 20:02:03 +0100 Subject: =?UTF-8?q?gnu:=20glibc:=20Inline=20Hurd=20"pid/=E2=80=A6"=20magic?= =?UTF-8?q?=20lookup=20patch.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/base.scm (glibc)[source](patches): Add "glibc-hurd-magic-pid.patch". [arguments]: Remove 'apply-hurd-patch' phase. [native-inputs]: Remove "hurd-magic-pid-patch". * gnu/packages/cross-base.scm (cross-libc)[arguments]: Remove 'apply-hurd-patch' phase. [native-inputs]: Remove "hurd-magic-pid-patch". --- gnu/packages/base.scm | 17 ++--------------- gnu/packages/cross-base.scm | 21 +-------------------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 64f60a928e..127ac7a75f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -607,6 +607,7 @@ store.") "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" + "glibc-hurd-magic-pid.patch" "glibc-supported-locales.patch")))) (build-system gnu-build-system) @@ -682,18 +683,6 @@ store.") #:tests? #f ; XXX #:phases (modify-phases %standard-phases - ,@(if (hurd-target?) - `((add-after 'unpack 'apply-hurd-patch - (lambda* (#:key inputs native-inputs - #:allow-other-keys) - ;; TODO: Move this to 'patches' field. - (let ((patch (or (assoc-ref native-inputs - "hurd-magic-pid-patch") - (assoc-ref inputs - "hurd-magic-pid-patch")))) - (invoke "patch" "-p1" "--force" "--input" - patch))))) - '()) (add-before 'configure 'pre-configure (lambda* (#:key inputs native-inputs outputs @@ -819,9 +808,7 @@ store.") ,@(if (hurd-target?) `(("mig" ,mig) - ("perl" ,perl) - ("hurd-magic-pid-patch" - ,(search-patch "glibc-hurd-magic-pid.patch"))) + ("perl" ,perl)) '()))) (native-search-paths diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index bb3d6d916a..2fcb7fb36b 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -454,23 +454,6 @@ XBINUTILS and the cross tool chain." flags))) ((#:phases phases) `(modify-phases ,phases - ;; XXX: The hack below allows us to make sure the - ;; 'apply-hurd-patch' phase gets added in the first - ;; cross-libc, but does *not* get added twice subsequently - ;; when cross-building another libc. - ,@(if (and (hurd-triplet? target) - (not (hurd-target?))) - `((add-after 'unpack 'apply-hurd-patch - (lambda* (#:key inputs native-inputs - #:allow-other-keys) - ;; TODO: Move this to 'patches' field. - (let ((patch (or (assoc-ref native-inputs - "hurd-magic-pid-patch") - (assoc-ref inputs - "hurd-magic-pid-patch")))) - (invoke "patch" "-p1" "--force" "--input" - patch))))) - '()) (add-before 'configure 'set-cross-kernel-headers-path (lambda* (#:key inputs #:allow-other-keys) (let* ((kernel (assoc-ref inputs "kernel-headers")) @@ -494,9 +477,7 @@ XBINUTILS and the cross tool chain." ,@(if (hurd-triplet? target) `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) - "cross-mig")) - ("hurd-magic-pid-patch" - ,(search-patch "glibc-hurd-magic-pid.patch"))) + "cross-mig"))) '()) ,@(package-inputs libc) ;FIXME: static-bash ,@(package-native-inputs libc))))))) -- cgit v1.2.3 From b659e97adc462b221692696b641602a5873902b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 24 Dec 2018 01:39:17 +0100 Subject: gnu: grep: Update to 3.3. * gnu/packages/base.scm (grep): Update to 3.3. [arguments]: Remove 'disable-failing-tests' phase. --- gnu/packages/base.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 127ac7a75f..663d3d8692 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -87,14 +87,14 @@ command-line arguments, multiple languages, and so on.") (define-public grep (package (name "grep") - (version "3.1") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grep/grep-" version ".tar.xz")) (sha256 (base32 - "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv")) + "055mqp6vrd0brkygmygb2673qwz409a7kyp1mzbfy6cn94f58q5r")) (patches (search-patches "grep-timing-sensitive-test.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ;some of the tests require it @@ -102,15 +102,6 @@ command-line arguments, multiple languages, and so on.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-failing-tests - (lambda _ - ;; These tests are expected to fail due to a glibc bug which has - ;; been fixed in 2.28, so they are unexpectedly passing. They - ;; should be fixed for grep versions > 3.1. - (substitute* "tests/Makefile.in" - (("^[[:blank:]]+backref-alt[[:blank:]]+\\\\") "\\") - (("^[[:blank:]]+triple-backref[[:blank:]]+\\\\") "\\")) - #t)) (add-after 'install 'fix-egrep-and-fgrep ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its ;; absolute file name instead of searching for it in $PATH. -- cgit v1.2.3 From dad2e7dc79112733dd5e1086ba77aa1daddb0c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 24 Dec 2018 01:39:52 +0100 Subject: gnu: sed: Update to 4.7. * gnu/packages/base.scm (sed): Update to 4.7. [arguments]: Remove. --- gnu/packages/base.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 663d3d8692..2c5e7c6455 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -128,28 +128,16 @@ including, for example, recursive directory searching.") (define-public sed (package (name "sed") - (version "4.5") + (version "4.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/sed/sed-" version ".tar.xz")) (sha256 (base32 - "0h3b2jfj57wmz680vkbyavlsrkak556qhvs7m7fdlawwhg477bbs")))) + "0smxcx66vx29djzb542nxcynl7qnzxqa5032ibazi7x2s267d198")))) (build-system gnu-build-system) (synopsis "Stream editor") - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'dont-rebuild-sed.1 - (lambda _ - ;; Make sure we do not attempt to rebuild 'doc/sed.1', which does - ;; not work when cross-compiling because we cannot run 'sed'. - ;; This is fixed upstream as commit a0a25e3. - (substitute* "Makefile.in" - (("^doc/sed\\.1:.*") - "doc/sed.1:\n")) - #t))))) (native-inputs `(("perl" ,perl))) ;for tests (description -- cgit v1.2.3 From 0b07f22728488f2f85624b716e5398bbb3a4165d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 25 Dec 2018 02:16:25 +0100 Subject: gnu: bootstrap: Add missing 'supported-systems', remove extra 'match'. Previously evaluation would fail for armhf, aarch64, and mips64el. * gnu/packages/bootstrap.scm (%bootstrap-mescc-tools)[supported-systems]: New field. (%bootstrap-mes)[supported-systems]: New field. [inputs]: Remove 'match' form on %current-system, which would fail on non-Intel platforms. --- gnu/packages/bootstrap.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 72e3d0847f..d9570a32f5 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -659,6 +659,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (synopsis "Bootstrap binaries of MesCC Tools") (description synopsis) (home-page #f) + (supported-systems '("i686-linux" "x86_64-linux")) (license gpl3+))) (define %bootstrap-mes @@ -702,10 +703,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "mes-minimal-stripped-0.19-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 - (match (%current-system) - ((or "i686-linux" "x86_64-linux") - (base32 - "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))))) + (base32 + "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))) + (supported-systems '("i686-linux" "x86_64-linux")) (synopsis "Bootstrap binaries of Mes") (description synopsis) (home-page #f) -- cgit v1.2.3 From 5fe2c549b48771bd461b32545325e321456a24ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 11:43:13 +0200 Subject: gnu: gcc-boot0: Fix build on non-Intel systems. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: Fix 'match case for alternate systems so a 'phase is added. --- gnu/packages/commencement.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bbcc5ac589..dc05e047d1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver -;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; @@ -1634,7 +1634,8 @@ exec " gcc "/bin/" program (substitute* "libcc1/configure" (("g\\+\\+ -v") "true")) #t))) - (_ identity)) + (_ '(add-before 'configure 'return-true + (lambda _ #t)))) (add-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "lib"))) -- cgit v1.2.3 From 17f43346225d2d73ed366047e9d05059dbe59539 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 15:44:49 +0200 Subject: gnu: tar: Update to 1.31. * gnu/packages/base.scm (tar): Update to 1.31. --- gnu/packages/base.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 2c5e7c6455..d4d3317b98 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra @@ -152,14 +152,14 @@ implementation offers several extensions over the standard utility.") (define-public tar (package (name "tar") - (version "1.30") + (version "1.31") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" version ".tar.xz")) (sha256 (base32 - "1lyjyk8z8hdddsxw0ikchrsfg3i0x3fsh7l63a8jgaz1n7dr5gzi")) + "1h9dxhjhz1jnyhmh6jfhqw1g1sxqbg3cd32vpwg7x2xxxqffzwrp")) (patches (search-patches "tar-skip-unreliable-tests.patch" "tar-remove-wholesparse-check.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From e992d56669aac6e4e5a2c46d27902a882f3d1bc6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 15:45:48 +0200 Subject: gnu: diffutils: Update to 3.7. * gnu/packages/base.scm (diffutils): Update to 3.7. [source]: Remove patch. [native-inputs]: Add perl. * gnu/packages/commencement.scm (diffutils-boot0)[native-inputs]: Don't add perl. * gnu/packages/patches/diffutils-getopt.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/base.scm | 6 ++-- gnu/packages/commencement.scm | 1 + gnu/packages/patches/diffutils-getopt.patch | 44 ----------------------------- 4 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/diffutils-getopt.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7c970dc47c..d87d0b598d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -657,7 +657,6 @@ dist_patch_DATA = \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ - %D%/packages/patches/diffutils-getopt.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d4d3317b98..aa85662a0c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -245,16 +245,16 @@ differences.") (define-public diffutils (package (name "diffutils") - (version "3.6") + (version "3.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/diffutils/diffutils-" version ".tar.xz")) (sha256 (base32 - "1mivg0fy3a6fcn535ln8nkgfj6vxh5hsxxs5h6692wxmsjyyh8fn")) - (patches (search-patches "diffutils-getopt.patch")))) + "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk")))) (build-system gnu-build-system) + (native-inputs `(("perl" ,perl))) (synopsis "Comparing and merging files") (description "GNU Diffutils is a package containing tools for finding the diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dc05e047d1..79246a0c5d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1430,6 +1430,7 @@ exec " gcc "/bin/" program #:guile %bootstrap-guile))) (package (inherit p) (name "diffutils-boot0") + (native-inputs `()) (arguments `(#:tests? #f ; the test suite needs diffutils ,@(package-arguments p))))))) diff --git a/gnu/packages/patches/diffutils-getopt.patch b/gnu/packages/patches/diffutils-getopt.patch deleted file mode 100644 index 05c2504adf..0000000000 --- a/gnu/packages/patches/diffutils-getopt.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit e3461d1c21a99bcef1b8826f710434e0ffb5adea -Author: Paul Eggert -Date: Sun Jun 11 15:53:09 2017 -0700 - - getopt-posix: port to glibc 2.25.90 - - Problem reported by Daniel P. Berrange in: - http://lists.gnu.org/archive/html/bug-gnulib/2017-06/msg00003.html - * lib/getopt-pfx-core.h (_GETOPT_CORE_H): - * lib/getopt-pfx-ext.h (_GETOPT_EXT_H): - #undef if __GETOPT_PREFIX is defined. - -diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h -index 155c11612..6ad0da683 100644 ---- a/lib/getopt-pfx-core.h -+++ b/lib/getopt-pfx-core.h -@@ -47,6 +47,11 @@ - # define opterr __GETOPT_ID (opterr) - # define optind __GETOPT_ID (optind) - # define optopt __GETOPT_ID (optopt) -+ -+/* The system's getopt.h may have already included getopt-core.h to -+ declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that -+ getopt-core.h declares them with prefixes. */ -+# undef _GETOPT_CORE_H - #endif - - #include -diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h -index d960bb34e..c5ac52202 100644 ---- a/lib/getopt-pfx-ext.h -+++ b/lib/getopt-pfx-ext.h -@@ -45,6 +45,11 @@ - # define getopt_long_only __GETOPT_ID (getopt_long_only) - # define option __GETOPT_ID (option) - # define _getopt_internal __GETOPT_ID (getopt_internal) -+ -+/* The system's getopt.h may have already included getopt-ext.h to -+ declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that -+ getopt-ext.h declares them with prefixes. */ -+# undef _GETOPT_EXT_H - #endif - - /* Standalone applications get correct prototypes for getopt_long and -- cgit v1.2.3 From 3526c72c5ef0568c698f116c2aa4b614d47d77e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:44:51 +0200 Subject: gnu: bison: Update to 3.2.4. * gnu/packages/bison.scm (bison): Update to 3.2.4. --- gnu/packages/bison.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index c1323d83ec..70d5e08d4a 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.2.2") + (version "3.2.4") (source (origin (method url-fetch) @@ -38,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "1yps7xyhllbg9rbb9mii1z736w85yh26vqvhr1y5qx6hwhj0z5bg")))) + "0d2ny1kmvvlmj4h9gdyqsx4bf01lgdfcjh1pa2385xjdkx0l8gaj")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From 07c95566a4dfdc92e587ea90c41e788db2a5ae7c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:45:18 +0200 Subject: gnu: gzip: Update to 1.10. * gnu/packages/compression.scm (gzip): Update to 1.10. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 69f72906b6..ef68b2bf44 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice @@ -202,14 +202,14 @@ adding and extracting files to/from a tar archive.") (define-public gzip (package (name "gzip") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gzip/gzip-" version ".tar.xz")) (sha256 (base32 - "16h8g4acy7fgfxcjacr3wijjsnixwsfd2jhz3zwdi2qrzi262l5f")))) + "1h6p374d3j8d4cdfydzls021xa2yby8myc0h8d6m8bc7k6ncq9c4")))) (build-system gnu-build-system) (synopsis "General file (de)compression (using lzw)") (arguments -- cgit v1.2.3 From f478ff860545bcea474da96b4d7f7e8ac1602218 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:45:41 +0200 Subject: gnu: ed: Update to 1.15. * gnu/packages/ed.scm (ed): Update to 1.15. --- gnu/packages/ed.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index d30d7bcfa8..c2198763ef 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2013, 2014 Ludovic Courtès -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +28,14 @@ (define-public ed (package (name "ed") - (version "1.14.2") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ed/ed-" version ".tar.lz")) (sha256 (base32 - "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm")))) + "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d")))) (build-system gnu-build-system) (native-inputs `(("lzip" ,lzip))) (arguments -- cgit v1.2.3 From 0559a4c2ca5b2573d5086c8b64794a634fc3e799 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 6 Jan 2019 19:46:01 +0200 Subject: gnu: groff: Update to 1.22.4. * gnu/packages/groff.scm (groff): Update to 1.22.4. [source]: Remove patch. (groff-minimal)[arguments]: Update configure flags to skip documentation. * gnu/packages/patches/groff-source-date-epoch.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/groff.scm | 8 +- gnu/packages/patches/groff-source-date-epoch.patch | 299 --------------------- 3 files changed, 4 insertions(+), 304 deletions(-) delete mode 100644 gnu/packages/patches/groff-source-date-epoch.patch diff --git a/gnu/local.mk b/gnu/local.mk index d87d0b598d..f487f357e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -790,7 +790,6 @@ dist_patch_DATA = \ %D%/packages/patches/gpsbabel-minizip.patch \ %D%/packages/patches/gpsbabel-qstring.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \ - %D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-binutils-compat.patch \ %D%/packages/patches/grub-check-error-efibootmgr.patch \ diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 77728a5d78..9bf8662b9f 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,14 +37,13 @@ (define-public groff (package (name "groff") - (version "1.22.3") + (version "1.22.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/groff/groff-" version ".tar.gz")) (sha256 (base32 - "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s")) - (patches (search-patches "groff-source-date-epoch.patch")))) + "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;12MiB of PS, PDF, HTML, and examples @@ -91,7 +91,7 @@ is usually the formatter of \"man\" documentation pages.") (arguments `(#:disallowed-references (,perl) - #:configure-flags '("--docdir=/tmp/trash/doc") + #:configure-flags '("--with-doc=no") ,@(substitute-keyword-arguments (package-arguments groff) ((#:phases phases) diff --git a/gnu/packages/patches/groff-source-date-epoch.patch b/gnu/packages/patches/groff-source-date-epoch.patch deleted file mode 100644 index 53c590b049..0000000000 --- a/gnu/packages/patches/groff-source-date-epoch.patch +++ /dev/null @@ -1,299 +0,0 @@ -Adds support for the environment variable SOURCE_DATE_EPOCH. - -See: https://sources.debian.net/patches/groff/1.22.3-9/source-date-epoch.patch/ - -From abc23bc9245e18468817f2838361c3a08f7521e2 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Thu, 5 Nov 2015 11:47:34 +0000 -Subject: Implement `SOURCE_DATE_EPOCH' for reproducible builds. - -Author: Colin Watson -Forwarded: yes -Last-Update: 2015-11-05 - -Patch-Name: source-date-epoch.patch ---- - doc/groff.texinfo | 6 +++++ - src/devices/grohtml/grohtml.man | 7 ++++++ - src/devices/grohtml/post-html.cpp | 5 ++-- - src/devices/gropdf/gropdf.man | 7 ++++++ - src/devices/gropdf/gropdf.pl | 3 ++- - src/devices/grops/grops.man | 7 ++++++ - src/devices/grops/ps.cpp | 3 ++- - src/include/curtime.h | 23 ++++++++++++++++++ - src/libs/libgroff/Makefile.sub | 2 ++ - src/libs/libgroff/curtime.cpp | 51 +++++++++++++++++++++++++++++++++++++++ - src/roff/troff/input.cpp | 3 ++- - 11 files changed, 112 insertions(+), 5 deletions(-) - create mode 100644 src/include/curtime.h - create mode 100644 src/libs/libgroff/curtime.cpp - -diff --git a/doc/groff.texinfo b/doc/groff.texinfo -index 066b5274..1d3c7a9f 100644 ---- a/doc/groff.texinfo -+++ b/doc/groff.texinfo -@@ -1453,6 +1453,12 @@ default directory (on Unix and GNU/Linux systems, this is usually - @item GROFF_TYPESETTER - @tindex GROFF_TYPESETTER@r{, environment variable} - The default output device. -+ -+@item SOURCE_DATE_EPOCH -+@tindex SOURCE_DATE_EPOCH@r{, environment variable} -+A timestamp (expressed as seconds since the Unix epoch) to use in place of -+the current time when initializing time-based built-in registers such as -+@code{\n[seconds]}. - @end table - - Note that MS-DOS and MS-Windows ports of @code{groff} use semi-colons, -diff --git a/src/devices/grohtml/grohtml.man b/src/devices/grohtml/grohtml.man -index 51eae224..4be4abbc 100644 ---- a/src/devices/grohtml/grohtml.man -+++ b/src/devices/grohtml/grohtml.man -@@ -419,6 +419,13 @@ and - for more details. - . - . -+.TP -+.SM -+.B SOURCE_DATE_EPOCH -+A timestamp (expressed as seconds since the Unix epoch) to use as the -+creation timestamp in place of the current time. -+. -+. - .\" -------------------------------------------------------------------- - .SH BUGS - .\" -------------------------------------------------------------------- -diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp -index fefbf014..b5fc5167 100644 ---- a/src/devices/grohtml/post-html.cpp -+++ b/src/devices/grohtml/post-html.cpp -@@ -28,6 +28,7 @@ along with this program. If not, see . */ - #include "html.h" - #include "html-text.h" - #include "html-table.h" -+#include "curtime.h" - - #include - -@@ -5013,7 +5014,7 @@ void html_printer::do_file_components (void) - .put_string(Version_string) - .end_comment(); - -- t = time(0); -+ t = current_time(); - html.begin_comment("CreationDate: ") - .put_string(ctime(&t), strlen(ctime(&t))-1) - .end_comment(); -@@ -5126,7 +5127,7 @@ html_printer::~html_printer() - .put_string(Version_string) - .end_comment(); - -- t = time(0); -+ t = current_time(); - html.begin_comment("CreationDate: ") - .put_string(ctime(&t), strlen(ctime(&t))-1) - .end_comment(); -diff --git a/src/devices/gropdf/gropdf.man b/src/devices/gropdf/gropdf.man -index 3bbace6a..cc0c82f1 100644 ---- a/src/devices/gropdf/gropdf.man -+++ b/src/devices/gropdf/gropdf.man -@@ -1029,6 +1029,13 @@ and - for more details. - . - . -+.TP -+.SM -+.B SOURCE_DATE_EPOCH -+A timestamp (expressed as seconds since the Unix epoch) to use as the -+creation timestamp in place of the current time. -+. -+. - .\" -------------------------------------------------------------------- - .SH FILES - .\" -------------------------------------------------------------------- -diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl -index 035d1238..c25c4c67 100644 ---- a/src/devices/gropdf/gropdf.pl -+++ b/src/devices/gropdf/gropdf.pl -@@ -239,13 +239,14 @@ elsif (exists($ppsz{$papersz})) - @defaultmb=@mediabox=(0,0,$ppsz{$papersz}->[0],$ppsz{$papersz}->[1]); - } - --my (@dt)=localtime(time); -+my (@dt)=localtime($ENV{SOURCE_DATE_EPOCH} || time); - my $dt=PDFDate(\@dt); - - my %info=('Creator' => "(groff version $cfg{GROFF_VERSION})", - 'Producer' => "(gropdf version $cfg{GROFF_VERSION})", - 'ModDate' => "($dt)", - 'CreationDate' => "($dt)"); -+ - while (<>) - { - chomp; -diff --git a/src/devices/grops/grops.man b/src/devices/grops/grops.man -index 99fb7486..272c2d18 100644 ---- a/src/devices/grops/grops.man -+++ b/src/devices/grops/grops.man -@@ -1419,6 +1419,13 @@ and - for more details. - . - . -+.TP -+.SM -+.B SOURCE_DATE_EPOCH -+A timestamp (expressed as seconds since the Unix epoch) to use as the -+creation timestamp in place of the current time. -+. -+. - .\" -------------------------------------------------------------------- - .SH FILES - .\" -------------------------------------------------------------------- -diff --git a/src/devices/grops/ps.cpp b/src/devices/grops/ps.cpp -index 745a503b..03e65372 100644 ---- a/src/devices/grops/ps.cpp -+++ b/src/devices/grops/ps.cpp -@@ -28,6 +28,7 @@ along with this program. If not, see . */ - #include "cset.h" - #include "nonposix.h" - #include "paper.h" -+#include "curtime.h" - - #include "ps.h" - #include -@@ -1390,7 +1391,7 @@ ps_printer::~ps_printer() - #else - time_t - #endif -- t = time(0); -+ t = current_time(); - fputs(ctime(&t), out.get_file()); - } - for (font_pointer_list *f = font_list; f; f = f->next) { -diff --git a/src/include/curtime.h b/src/include/curtime.h -new file mode 100644 -index 00000000..a4105196 ---- /dev/null -+++ b/src/include/curtime.h -@@ -0,0 +1,23 @@ -+/* Copyright (C) 2015 Free Software Foundation, Inc. -+ -+This file is part of groff. -+ -+groff 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 2 of the License, or -+(at your option) any later version. -+ -+groff 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. -+ -+The GNU General Public License version 2 (GPL2) is available in the -+internet at . */ -+ -+#ifdef LONG_FOR_TIME_T -+long -+#else -+time_t -+#endif -+current_time(); -diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub -index 840d9934..4cb4937a 100644 ---- a/src/libs/libgroff/Makefile.sub -+++ b/src/libs/libgroff/Makefile.sub -@@ -32,6 +32,7 @@ OBJS=\ - cmap.$(OBJEXT) \ - color.$(OBJEXT) \ - cset.$(OBJEXT) \ -+ curtime.$(OBJEXT) \ - device.$(OBJEXT) \ - errarg.$(OBJEXT) \ - error.$(OBJEXT) \ -@@ -82,6 +83,7 @@ CCSRCS=\ - $(srcdir)/cmap.cpp \ - $(srcdir)/color.cpp \ - $(srcdir)/cset.cpp \ -+ $(srcdir)/curtime.cpp \ - $(srcdir)/device.cpp \ - $(srcdir)/errarg.cpp \ - $(srcdir)/error.cpp \ -diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp -new file mode 100644 -index 00000000..00821b7f ---- /dev/null -+++ b/src/libs/libgroff/curtime.cpp -@@ -0,0 +1,51 @@ -+/* Copyright (C) 2015 Free Software Foundation, Inc. -+ -+This file is part of groff. -+ -+groff 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 2 of the License, or -+(at your option) any later version. -+ -+groff 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. -+ -+The GNU General Public License version 2 (GPL2) is available in the -+internet at . */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "errarg.h" -+#include "error.h" -+ -+#ifdef LONG_FOR_TIME_T -+long -+#else -+time_t -+#endif -+current_time() -+{ -+ char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ -+ if (source_date_epoch) { -+ errno = 0; -+ char *endptr; -+ long epoch = strtol(source_date_epoch, &endptr, 10); -+ -+ if ((errno == ERANGE && (epoch == LONG_MAX || epoch == LONG_MIN)) || -+ (errno != 0 && epoch == 0)) -+ fatal("$SOURCE_DATE_EPOCH: strtol: %1", strerror(errno)); -+ if (endptr == source_date_epoch) -+ fatal("$SOURCE_DATE_EPOCH: no digits found: %1", endptr); -+ if (*endptr != '\0') -+ fatal("$SOURCE_DATE_EPOCH: trailing garbage: %1", endptr); -+ return epoch; -+ } else -+ return time(0); -+} -diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp -index 9594f074..f7d2c18a 100644 ---- a/src/roff/troff/input.cpp -+++ b/src/roff/troff/input.cpp -@@ -36,6 +36,7 @@ along with this program. If not, see . */ - #include "input.h" - #include "defs.h" - #include "unicode.h" -+#include "curtime.h" - - // Needed for getpid() and isatty() - #include "posix.h" -@@ -8138,7 +8139,7 @@ static void init_registers() - #else /* not LONG_FOR_TIME_T */ - time_t - #endif /* not LONG_FOR_TIME_T */ -- t = time(0); -+ t = current_time(); - // Use struct here to work around misfeature in old versions of g++. - struct tm *tt = localtime(&t); - set_number_reg("seconds", int(tt->tm_sec)); -- cgit v1.2.3 From 2cb4f940f2a18d68b14b0bb7a8ddaf766d8024ab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 8 Jan 2019 18:13:43 +0200 Subject: gnu: readline: Update to 8.0. * gnu/packages/readline.scm (readline): Update to 8.0. [source]: Remove patch series %patch-series-7.0. (readline-7): New variable. --- gnu/packages/readline.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 59fa8af8af..57d550d67f 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -55,18 +55,15 @@ (define-public readline (package (name "readline") - (version (string-append "7.0." - (number->string (length %patch-series-7.0)))) + (version "8.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/readline/readline-" (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm")) - (patches (append - %patch-series-7.0 - (search-patches "readline-link-ncurses.patch"))) + "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3")) + (patches (search-patches "readline-link-ncurses.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) @@ -101,6 +98,23 @@ comfortable for anyone.") (license gpl3+) (home-page "https://savannah.gnu.org/projects/readline/"))) +(define-public readline-7 + (package (inherit readline) + (name "readline") + (version (string-append "7.0." + (number->string (length %patch-series-7.0)))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/readline/readline-" + (version-major+minor version) ".tar.gz")) + (sha256 + (base32 + "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm")) + (patches (append + %patch-series-7.0 + (search-patches "readline-link-ncurses.patch"))) + (patch-flags '("-p0")))))) + (define-public readline-6.2 (package (inherit readline) (version "6.2") -- cgit v1.2.3 From 847ffe88526ccf1209ff0292fbdae9c557cf5d3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 8 Jan 2019 18:18:55 +0200 Subject: gnu: bash: Update to 5.0. * gnu/packages/bash.scm (bash): Update to 5.0. [source]: Remove patches. (patch-url seqno): Prepare for bash-5.0 patches. (%patch-series-4.4): Rename %patch-series-5.0, remove patches. --- gnu/packages/bash.scm | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index fb4e3f4be3..9fd4b30e62 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Leo Famulari -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -44,7 +44,7 @@ (define (patch-url seqno) "Return the URL of Bash patch number SEQNO." - (format #f "mirror://gnu/bash/bash-4.4-patches/bash44-~3,'0d" seqno)) + (format #f "mirror://gnu/bash/bash-5.0-patches/bash50-~3,'0d" seqno)) (define (bash-patch seqno sha256) "Return the origin of Bash patch SEQNO, with expected hash SHA256" @@ -57,33 +57,11 @@ (list (bash-patch seqno (base32 hash)) ...)) -(define %patch-series-4.4 - ;; This is the current patches series for 4.4, generated using +(define %patch-series-5.0 + ;; This is the current patches series for 5.0, generated using ;; 'download-patches' below. (patch-series - (1 "03vzy7qwjdd5qvl3ydg99naazas2qmyd0yhnrflgjbbm64axja1y") - (2 "0lrwq6vyqism3yqv9s7kzaf3dsl4q5w9r5svcqz279qp7qca083h") - (3 "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi") - (4 "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d") - (5 "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2") - (6 "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka") - (7 "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y") ;CVE-2017-5932 - (8 "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546") - (9 "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb") - (10 "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4") - (11 "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx") - (12 "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps") - (13 "1djkx0w9v62q78gz3jsvamj1jq53i6hbfrfhhsw86ihwpjnfy98v") - (14 "0z5ikcq9zyxw79d0z36r5p0mspnb5piavbv03jmlan1wnknmrxx7") - (15 "09n307fi1j257abhm295k6ksmnzw47ka2zhnr0i5lbdnpvn04xnk") - (16 "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh") - (17 "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp") - (18 "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v") - (19 "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7") - (20 "0b2jk5n1af1vh590qfc52hv65mafb4vl1xv26s8j5a3byb5y4h0q") - (21 "1hblcd2xmqqlp0idnavw66570n7m0yv5rbbr873c2gkn982mk3xx") - (22 "0yfbjzr79vzjs2hyi5m8iy2b38fq7vikdfa4zqdvjsp36q4iycs5") - (23 "1dlism6qdx60nvzj0v7ndr7lfahl4a8zmzckp13hqgdx7xpj7v2g"))) + )) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of @@ -119,7 +97,7 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." " -Wl,-rpath -Wl," (assoc-ref %build-inputs "ncurses") "/lib"))) - (version "4.4")) + (version "5.0")) (package (name "bash") (source (origin @@ -128,11 +106,8 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." "mirror://gnu/bash/bash-" version ".tar.gz")) (sha256 (base32 - "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq")) - (patch-flags '("-p0")) - (patches %patch-series-4.4))) - (version (string-append version "." - (number->string (length %patch-series-4.4)))) + "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")))) + (version version) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From a9883939977f5fb0bd62d1dccb1ab0a772a4b720 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 13 Jan 2019 22:43:20 +0000 Subject: gnu: python-2.7: Fix build. The -j flag is passed in through #:make-flags and EXTRATESTOPTS. This is combined with the TESTOPTS, and in Python 2, that includes the -l flag by default. The -l flag, is for finding memory leaks in tests, and is incompatible with the -j flag, and the build previously failed at the start of the 'check phase. Therefore, remove the -l flag from the Python 2 testsuite, as it doesn't sound like a useful thing to do when building the package for Guix. * gnu/packages/python.scm (python-2.7): Add 'remove-findleaks-from-testopts phase. --- gnu/packages/python.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9b43f465cc..2971dfe779 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -200,6 +200,14 @@ (guix build utils) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-findleaks-from-testopts + (lambda _ + (substitute* "Makefile.pre.in" + ;; -l which is short for --findleaks isn't compatible with the + ;; -j flag added through the #:make-flags, therefore remove + ;; it. This only affects python-2.7. + (("TESTOPTS= -l ") "TESTOPTS= ")) + #t)) (add-before 'configure 'patch-lib-shells (lambda _ -- cgit v1.2.3 From 2df4f7020d2c49110900f786af7700d170c3035c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 13 Jan 2019 01:03:24 -0600 Subject: gnu: groff: Fix doc installation. * gnu/packages/groff.scm (groff)[arguments]: Add 'fix-docdir phase. --- gnu/packages/groff.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 9bf8662b9f..a8a31337c8 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,7 +66,11 @@ (add-after 'unpack 'setenv (lambda _ (setenv "GS_GENERATE_UUIDS" "0") - #t))))) + #t)) + (add-after 'unpack 'fix-docdir + (lambda _ ;see https://savannah.gnu.org/bugs/index.php?55461 + (substitute* "Makefile.in" + (("^docdir =.*") "docdir = @docdir@\n"))))))) (synopsis "Typesetting from plain text mixed with formatting commands") (description "Groff is a typesetting package that reads plain text and produces -- cgit v1.2.3 From 974537fc4cd8045bcdce68c5ce79df35b0e17ec3 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 13 Jan 2019 21:08:48 -0600 Subject: gnu: python-pycodestyle: Fix build with Python 3.7. * gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python.scm (python-pycodestyle)[source]: Use it. --- gnu/local.mk | 1 + .../python-pycodestyle-stdlib-tokenize-fix.patch | 35 ++++++++++++++++++++++ gnu/packages/python.scm | 3 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index f487f357e9..23ba0d48f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1108,6 +1108,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ + %D%/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch b/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch new file mode 100644 index 0000000000..16388c8dba --- /dev/null +++ b/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch @@ -0,0 +1,35 @@ +From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle +Date: Tue, 25 Sep 2018 14:58:57 +1200 +Subject: [PATCH] Keep compability with stdlib tokenize.py changes + +https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 +is not yet part of any release of Python but has been backported to all +versions in Git (includeing 2.7!). It causes the tokenize.py module to +emit a synthetic NEWLINE token for files that do not in fact end with a +newline, which confuses pycodestyle's checks for blank lines at the end +of a file. Fortunately the synthetic NEWLINE tokens are easy to detect +(the token text is ""). + +Fixes #786 +--- + pycodestyle.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pycodestyle.py b/pycodestyle.py +index 0d725d27..fbc3dca3 100755 +--- a/pycodestyle.py ++++ b/pycodestyle.py +@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): + """ + if line_number == total_lines: + stripped_last_line = physical_line.rstrip() +- if not stripped_last_line: ++ if physical_line and not stripped_last_line: + return 0, "W391 blank line at end of file" + if stripped_last_line == physical_line: +- return len(physical_line), "W292 no newline at end of file" ++ return len(lines[-1]), "W292 no newline at end of file" + + + @register_check diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2971dfe779..c0ed19e16c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3974,7 +3974,8 @@ as the original project seems to have been abandoned circa 2007.") (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")))) + "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")) + (patches (search-patches "python-pycodestyle-stdlib-tokenize-fix.patch")))) (build-system python-build-system) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") -- cgit v1.2.3 From cff1927f30c00e6df5a3be5bd7cb769cd1345873 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 10 Jan 2019 07:35:38 -0500 Subject: gnu: dbus: Build documentation (manpages and html). * gnu/packages/glib.scm (dbus)[native-inputs]: Add docbook-xml-4.4, docbook-xsl, doxygen, xmlto, libxml2, libxslt and yelp-tools. [outputs]: Add a "doc" output to hold the large HTML documentation. --- gnu/packages/glib.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cd9b48caff..946ed2ba19 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,8 @@ #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages docbook) + #:use-module (gnu packages documentation) #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -118,14 +121,21 @@ "sysconfdir=/tmp/dummy" "install")))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ;; Dependencies to generate the doc. + ("docbook-xml" ,docbook-xml-4.4) + ("docbook-xsl" ,docbook-xsl) + ("doxygen" ,doxygen) + ("xmlto" ,xmlto) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("libxslt" ,libxslt) + ("yelp-tools" ,yelp-tools))) (inputs `(("expat" ,expat) - ;; Add a dependency on libx11 so that 'dbus-launch' has support for ;; '--autolaunch'. ("libx11" ,libx11))) - + (outputs '("out" "doc")) ;22 MiB of HTML doc (home-page "https://www.freedesktop.org/wiki/Software/dbus/") (synopsis "Message bus for inter-process communication (IPC)") (description -- cgit v1.2.3 From cbd833750a57ae0596e80d06c74b02bccddf6197 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 15 Jan 2019 08:39:39 -0600 Subject: gnu: mariadb: Disable "main.mysqldump" test. * gnu/packages/databases.scm (mariadb)[arguments]: Add "main.mysqldump" to disabled-tests in 'adjust-tests' phase. --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 07c6006c3b..b995de2a53 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -707,6 +707,9 @@ Language.") "main.stat_tables_innodb" "roles.acl_statistics" + ;; FIXME: Fixed in mysql, but we have no patch. See + ;; https://bugs.mysql.com/bug.php?id=93778 + "main.mysqldump" ;; FIXME: This test fails on i686: ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) -- cgit v1.2.3 From 44ab38ef01f11fe29860c944e2169f9a4ef72d13 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 14 Jan 2019 22:31:56 +0100 Subject: bootstrap: Oops, list gcc-boot-4.7.4.patch. * gnu/local.mk (dist_patch_DATA): Oops, add gcc-boot-4.7.4.patch. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/local.mk b/gnu/local.mk index 23ba0d48f7..38076259e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -710,6 +710,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-asan-missing-include.patch \ %D%/packages/patches/gcc-boot-2.95.3.patch \ + %D%/packages/patches/gcc-boot-4.7.4.patch \ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ -- cgit v1.2.3 From 4929ee9b196b7e3f0e4e217865ca4d6dfd22c853 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 17 Jan 2019 22:10:02 -0600 Subject: gnu: rcs: disable buggy test t810. * gnu/packages/version-control.scm (rcs)[arguments]: New field. Add 'disable-t810' phase. --- gnu/packages/version-control.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 2eaf0c69f4..399453200b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2014, 2016 Eric Bavier +;;; Copyright © 2014, 2016, 2019 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015, 2018 Kyle Meyer ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus @@ -1384,6 +1384,15 @@ projects, from individuals to large-scale enterprise operations.") (patches (search-patches "rcs-5.9.4-noreturn.patch")))) (build-system gnu-build-system) (native-inputs `(("ed" ,ed))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-t810 + ;; See https://savannah.gnu.org/bugs/index.php?52288 + ;; Back-porting the fix is non-trivial, so disable for now. + (lambda _ + (substitute* "tests/Makefile" + ((" t810 \\\\\n") "")) + #t))))) (home-page "https://www.gnu.org/software/rcs/") (synopsis "Per-file local revision control system") (description -- cgit v1.2.3 From d453b0e11d3f001a8160a7d126fdbf40e45d5042 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 3 Jan 2019 20:47:39 +0000 Subject: gnu: python-2.7: Include /lib/python.../test/support. Don't remove the support directory from the /lib/python.../test/ directory, as this is used from the test_support module. /gnu/store/...-python2-2.7.15/lib/python2.7/test/test_support.py:2: in import test.support E ImportError: No module named support * gnu/packages/python.scm (python-2.7)[arguments]: Change the 'remove-tests phase to not remove the support directory. --- gnu/packages/python.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c0ed19e16c..d13d7dbd8d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -271,12 +271,9 @@ (scandir testdir (match-lambda ((or "." "..") #f) + ("support" #f) (file (not - ;; FIXME: Add the 'support' directory - ;; in the next rebuild cycle, since it - ;; moved in 2.7.14. See also - ;; python2-futures below. (string-prefix? "test_support." file)))))) (call-with-output-file "__init__.py" (const #t)) -- cgit v1.2.3 From 85e457946917004cf1ae4f01ea2d51e028884333 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 3 Jan 2019 21:06:44 +0000 Subject: gnu: python-futures: Enable tests. Re-enable the tests, as the python-2 package now has the support directory. Also, switch to running the tests via the test_futures.py script to avoid errors like: AttributeError: 'AsCompletedTests' object has no attribute 'executor' * gnu/packages/python.scm (python2-futures)[arguments]: Run the test_futures.py script to run the tests. --- gnu/packages/python.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d13d7dbd8d..e8706ff688 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7899,11 +7899,14 @@ otherwise matches 3.2’s API.") (base32 "0rdjmmsab550kxsssdq49jcniz77zlkpw4pvi9hvib3lsskjmh4y")))) (build-system python-build-system) - (arguments `(#:python ,python-2 - ;; FIXME: Python 2.7.14 moved the test.support library, - ;; but our package has not yet been adjusted. Enable - ;; tests when the python2 package has been fixed. - #:tests? #f)) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "test_futures.py") + #t))))) (home-page "https://github.com/agronholm/pythonfutures") (synopsis "Backport of the concurrent.futures package from Python 3.2") -- cgit v1.2.3 From 32922190977f701694880254a71feb2752222f94 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 22 Jan 2019 22:00:50 -0600 Subject: gnu: python2: Fix test flags. Reverts a9883939977f5fb0bd62d1dccb1ab0a772a4b720 in favor of a cleaner approach. * gnu/packages/python.scm (python-2.7)[arguments]: 'EXTRATESTOPTS' -> 'TESTOPTS'. This overrides the default '-l' argument for memory leak checks which is not compatible with the -j for parallelism. --- gnu/packages/python.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e8706ff688..4dfc95d301 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2014, 2017 Eric Bavier +;;; Copyright © 2014, 2017, 2019 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault @@ -194,20 +194,12 @@ (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. #:make-flags - (list (format #f "EXTRATESTOPTS=-j~d" (parallel-job-count))) + (list (format #f "TESTOPTS=-j~d" (parallel-job-count))) #:modules ((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-findleaks-from-testopts - (lambda _ - (substitute* "Makefile.pre.in" - ;; -l which is short for --findleaks isn't compatible with the - ;; -j flag added through the #:make-flags, therefore remove - ;; it. This only affects python-2.7. - (("TESTOPTS= -l ") "TESTOPTS= ")) - #t)) (add-before 'configure 'patch-lib-shells (lambda _ -- cgit v1.2.3 From 4bdd41bb839e52876fdc03011bed0aa450c92263 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 22 Jan 2019 23:33:21 -0600 Subject: gnu: handbrake: Upgrade to 1.2.0. * gnu/packages/patches/handbrake-opt-in-nvenc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (handbrake)[source]: Upgrade to 1.2.0. Use patch. [native-inputs]: Add cmake. [inputs]: Add speex. [arguments]: Disable runtime update checks via #:configure-flags. --- gnu/local.mk | 1 + gnu/packages/patches/handbrake-opt-in-nvenc.patch | 14 ++++++++++++++ gnu/packages/video.scm | 14 +++++++++----- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/handbrake-opt-in-nvenc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 38076259e3..f55907731b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -812,6 +812,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ + %D%/packages/patches/handbrake-opt-in-nvenc.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ diff --git a/gnu/packages/patches/handbrake-opt-in-nvenc.patch b/gnu/packages/patches/handbrake-opt-in-nvenc.patch new file mode 100644 index 0000000000..2b34aaa427 --- /dev/null +++ b/gnu/packages/patches/handbrake-opt-in-nvenc.patch @@ -0,0 +1,14 @@ +Require opt-in for NVEnc support. Otherwise the default is true with no way +to disable it. + +--- HandBrake-1.2.0/make/configure.py.orig 1969-12-31 18:00:00.000000000 -0600 ++++ HandBrake-1.2.0/make/configure.py 2019-01-22 23:22:46.186959060 -0600 +@@ -1320,7 +1320,7 @@ + grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' ) + + h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value +- grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h ) ++ grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=False, action='store_true', help=h ) + + + cli.add_option_group( grp ) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c327c9bc5c..4ac1b68077 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2016, 2018 Eric Bavier +;;; Copyright © 2016, 2018, 2019 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice @@ -2430,14 +2430,14 @@ supported players in addition to this package.") (define-public handbrake (package (name "handbrake") - (version "1.1.2") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "https://download.handbrake.fr/releases/" version "/HandBrake-" version "-source.tar.bz2")) (sha256 (base32 - "0bny0hwlr55g2c69rsamv0xvwmfh1s4a582b9vq20xv5ly84m6ms")) + "03clkknaq3mz84p85cvr21gsy9b8vv2g4vvyfz44hz8la253jfqi")) (modules '((guix build utils))) (snippet ;; Remove "contrib" and source not necessary for @@ -2451,11 +2451,13 @@ supported players in addition to this package.") ;; which would lead to fetching and building of these ;; libraries. Use our own instead. (("MODULES \\+= contrib") "# MODULES += contrib")) - #t)))) + #t)) + (patches (search-patches "handbrake-opt-in-nvenc.patch")))) (build-system glib-or-gtk-build-system) (native-inputs `(("automake" ,automake) ;gui subpackage must be bootstrapped ("autoconf" ,autoconf) + ("cmake" ,cmake) ;TODO: could probably strip check from make/configure.py ("curl" ,curl) ;not actually used, but tested for ("intltool" ,intltool) ("libtool" ,libtool) @@ -2488,12 +2490,14 @@ supported players in addition to this package.") ("libvpx" ,libvpx) ("libxml2" ,libxml2) ("libx264" ,libx264) + ("speex" ,speex) ("x265" ,x265) ("zlib" ,zlib))) (arguments `(#:tests? #f ;tests require Ruby and claim to be unsupported #:configure-flags - (list (string-append "CPPFLAGS=-I" + (list "--disable-gtk-update-checks" + (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "libxml2") "/include/libxml2") "LDFLAGS=-lx265") -- cgit v1.2.3 From 782f1ea9f693639b8feb3152fa6a280356ab1167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 Jan 2019 09:49:33 +0100 Subject: utils: Switch to the new 'setvbuf' API. * guix/build/utils.scm (setvbuf) [(and guile-2 (not guile-2.2))]: New procedure. (remove-store-references): Use the 2.2 'setvbuf' API style. * guix/build/gnu-build-system.scm (gnu-build): Likewise. --- guix/build/gnu-build-system.scm | 6 +++--- guix/build/utils.scm | 26 +++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index e5f3197b0a..7d92b8d72e 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -784,8 +784,8 @@ in order. Return #t if all the PHASES succeeded, #f otherwise." (+ (time-second diff) (/ (time-nanosecond diff) 1e9)))) - (setvbuf (current-output-port) _IOLBF) - (setvbuf (current-error-port) _IOLBF) + (setvbuf (current-output-port) 'line) + (setvbuf (current-error-port) 'line) ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index cb5621a5a9..a21dbb0128 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015, 2018 Mark H Weaver @@ -101,7 +101,27 @@ locale-category->string)) + +;;; +;;; Guile 2.0 compatibility later. +;;; +;; The bootstrap Guile is Guile 2.0, so provide a compatibility layer. +(cond-expand + ((and guile-2 (not guile-2.2)) + (define (setvbuf port mode . rest) + (apply (@ (guile) setvbuf) port + (match mode + ('line _IOLBF) + ('block _IOFBF) + ('none _IONBF) + (_ mode)) ;an _IO* integer + rest)) + + (module-replace! (current-module) '(setvbuf))) + (else #f)) + + ;;; ;;; Directories. ;;; @@ -989,8 +1009,8 @@ known as `nuke-refs' in Nixpkgs." ;; We cannot use `regexp-exec' here because it cannot deal with ;; strings containing NUL characters. (format #t "removing store references from `~a'...~%" file) - (setvbuf in _IOFBF 65536) - (setvbuf out _IOFBF 65536) + (setvbuf in 'block 65536) + (setvbuf out 'block 65536) (fold-port-matches (lambda (match result) (put-bytevector out (string->utf8 store)) (put-u8 out (char->integer #\/)) -- cgit v1.2.3 From f380f9d55e6757c242acf6c71c4a3ccfcdb066b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 29 Jan 2019 11:00:42 +0100 Subject: build-system/gnu: Report invocation errors in a human-friendly way. * guix/build/utils.scm (report-invoke-error): New procedure. * guix/build/gnu-build-system.scm (gnu-build): Guard against 'invoke-error?'. --- guix/build/gnu-build-system.scm | 43 ++++++++++++++++++++++------------------- guix/build/utils.scm | 17 ++++++++++++++++ 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 7d92b8d72e..3f68ad52ed 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -790,28 +790,31 @@ in order. Return #t if all the PHASES succeeded, #f otherwise." ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) - ;; The trick is to #:allow-other-keys everywhere, so that each procedure in - ;; PHASES can pick the keyword arguments it's interested in. - (every (match-lambda - ((name . proc) - (let ((start (current-time time-monotonic))) - (format #t "starting phase `~a'~%" name) - (let ((result (apply proc args)) - (end (current-time time-monotonic))) - (format #t "phase `~a' ~:[failed~;succeeded~] after ~,1f seconds~%" - name result - (elapsed-time end start)) - - ;; Issue a warning unless the result is #t. - (unless (eqv? result #t) - (format (current-error-port) "\ + (guard (c ((invoke-error? c) + (report-invoke-error c) + (exit 1))) + ;; The trick is to #:allow-other-keys everywhere, so that each procedure in + ;; PHASES can pick the keyword arguments it's interested in. + (every (match-lambda + ((name . proc) + (let ((start (current-time time-monotonic))) + (format #t "starting phase `~a'~%" name) + (let ((result (apply proc args)) + (end (current-time time-monotonic))) + (format #t "phase `~a' ~:[failed~;succeeded~] after ~,1f seconds~%" + name result + (elapsed-time end start)) + + ;; Issue a warning unless the result is #t. + (unless (eqv? result #t) + (format (current-error-port) "\ ## WARNING: phase `~a' returned `~s'. Return values other than #t ## are deprecated. Please migrate this package so that its phase ## procedures report errors by raising an exception, and otherwise ## always return #t.~%" - name result)) + name result)) - ;; Dump the environment variables as a shell script, for handy debugging. - (system "export > $NIX_BUILD_TOP/environment-variables") - result)))) - phases)) + ;; Dump the environment variables as a shell script, for handy debugging. + (system "export > $NIX_BUILD_TOP/environment-variables") + result)))) + phases))) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index a21dbb0128..55d34b67e7 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -98,6 +98,7 @@ invoke-error-exit-status invoke-error-term-signal invoke-error-stop-signal + report-invoke-error locale-category->string)) @@ -622,6 +623,11 @@ Where every <*-phase-name> is an expression evaluating to a symbol, and ((_ phases (add-after old-phase-name new-phase-name new-phase)) (alist-cons-after old-phase-name new-phase-name new-phase phases)))) + +;;; +;;; Program invocation. +;;; + (define-condition-type &invoke-error &error invoke-error? (program invoke-error-program) @@ -643,6 +649,17 @@ if the exit code is non-zero; otherwise return #t." (stop-signal (status:stop-sig code)))))) #t)) +(define* (report-invoke-error c #:optional (port (current-error-port))) + "Report to PORT about C, an '&invoke-error' condition, in a human-friendly +way." + (format port "command~{ ~s~} failed with ~:[signal~;status~] ~a~%" + (cons (invoke-error-program c) + (invoke-error-arguments c)) + (invoke-error-exit-status c) + (or (invoke-error-exit-status c) + (invoke-error-term-signal c) + (invoke-error-stop-signal c)))) + ;;; ;;; Text substitution (aka. sed). -- cgit v1.2.3 From 8ad8568bb5974a42a479a0c2158e105b209aa253 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Feb 2019 15:36:35 +0100 Subject: doc: Raise subsections. * doc/guix.texi (Reduced Binary Seed Bootstrap, Preparing to Use the Bootstrap Binaries): Raise subsections. --- doc/guix.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e94204f69f..5a26d69eb7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24256,7 +24256,7 @@ more elaborate, @pxref{Reduced Binary Seed Bootstrap}. @end menu @node Reduced Binary Seed Bootstrap -@subsection The Reduced Binary Seed Bootstrap +@section The Reduced Binary Seed Bootstrap Guix---like other GNU/Linux distributions---is traditionally bootstrapped from a set of bootstrap binaries: Bourne shell, command-line tools provided by GNU @@ -24319,8 +24319,8 @@ compiler used to build the rest of GuixSD. @image{images/gcc-mesboot-bag-graph,6in,,Dependency graph of the gcc-mesboot} -@unnumberedsec Preparing to Use the Bootstrap Binaries - +@node Preparing to Use the Bootstrap Binaries +@section Preparing to Use the Bootstrap Binaries @c As of Emacs 24.3, Info-mode displays the image, but since it's a @c large image, it's hard to scroll. Oh well. -- cgit v1.2.3 From cc43d807c08af02d31770a011881990d46428737 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:28:38 +0100 Subject: gnu: file: Incorporate grafted changes. * gnu/packages/file.scm (file)[replacement]: Remove. [source](patches): New field. (file/fixed): Remove variable. --- gnu/packages/file.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 4518c8d3dc..24ed37a9d2 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -31,11 +31,11 @@ (package (name "file") (version "5.33") - (replacement file/fixed) (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" version ".tar.gz")) + (patches (search-patches "file-CVE-2018-10360.patch")) (sha256 (base32 "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw")))) @@ -53,10 +53,3 @@ extensions to tell you the type of a file, but looks at the actual contents of the file. This package provides the libmagic library.") (license bsd-2) (home-page "https://www.darwinsys.com/file/"))) - -(define file/fixed - (package - (inherit file) - (source - (origin (inherit (package-source file)) - (patches (search-patches "file-CVE-2018-10360.patch")))))) -- cgit v1.2.3 From 0293b353bdde6b9593138a48fc78a500423fda0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:26:47 +0100 Subject: gnu: sqlite: Remove graft for 3.26.0. * gnu/packages/sqlite.scm (sqlite): Update to 3.26.0. [replacement]: Remove. (sqlite-3.26.0): Remove variable. --- gnu/packages/sqlite.scm | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 5e5bbd8fb6..d40fc119e0 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,8 +46,7 @@ (define-public sqlite (package (name "sqlite") - (replacement sqlite-3.26.0) - (version "3.24.0") + (version "3.26.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -63,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr")))) + "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments @@ -83,26 +82,6 @@ widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) -(define-public sqlite-3.26.0 - (package (inherit sqlite) - (version "3.26.0") - (source (origin - (method url-fetch) - (uri (let ((numeric-version - (match (string-split version #\.) - ((first-digit other-digits ...) - (string-append first-digit - (string-pad-right - (string-concatenate - (map (cut string-pad <> 2 #\0) - other-digits)) - 6 #\0)))))) - (string-append "https://sqlite.org/2018/sqlite-autoconf-" - numeric-version ".tar.gz"))) - (sha256 - (base32 - "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))))) - ;; This is used by Tracker. (define-public sqlite-with-fts5 (package/inherit sqlite -- cgit v1.2.3 From 027250f1a65f5500a68687a32e444f424bda7fda Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:22:21 +0100 Subject: gnu: python2: Incorporate grafted changes. * gnu/packages/python.scm (python-2.7)[source](patches): Add python2-CVE-2018-14647.patch and python2-CVE-2018-1000802.patch. [replacement]: Remove field. (python-2/fixed): Remove variable. --- gnu/packages/python.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 69b8b3fd4d..87b80f9c40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -95,7 +95,6 @@ (package (name "python2") (version "2.7.15") - (replacement python-2/fixed) (source (origin (method url-fetch) @@ -108,7 +107,9 @@ "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" "python-2.7-source-date-epoch.patch" - "python-2.7-adjust-tests.patch")) + "python-2.7-adjust-tests.patch" + "python2-CVE-2018-14647.patch" + "python2-CVE-2018-1000802.patch")) (modules '((guix build utils))) ;; suboptimal to delete failing tests here, but if we delete them in the ;; arguments then we need to make sure to strip out that phase when it @@ -266,16 +267,6 @@ data types.") ;; Current 2.x version. (define-public python-2 python-2.7) -(define python-2/fixed - (package - (inherit python-2) - (source (origin - (inherit (package-source python-2)) - (patches (append - (origin-patches (package-source python-2)) - (search-patches "python2-CVE-2018-14647.patch" - "python2-CVE-2018-1000802.patch"))))))) - (define-public python2-called-python ;; Both 2.x and 3.x used to be called "python". In commit ;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the -- cgit v1.2.3 From a5be549e393962764a9df590dc5ba6a314bfe866 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:31:23 +0100 Subject: gnu: libarchive: Remove graft for 3.3.3. * gnu/packages/patches/libarchive-CVE-2017-14166.patch, gnu/packages/patches/libarchive-CVE-2017-14502.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/backup.scm (libarchive): Update to 3.3.3. [source](patches): Adjust for 3.3.3. [replacement]: Remove field. (libarchive-3.3.3): Remove variable. --- gnu/local.mk | 2 - gnu/packages/backup.scm | 26 +++---------- .../patches/libarchive-CVE-2017-14166.patch | 45 ---------------------- .../patches/libarchive-CVE-2017-14502.patch | 40 ------------------- 4 files changed, 5 insertions(+), 108 deletions(-) delete mode 100644 gnu/packages/patches/libarchive-CVE-2017-14166.patch delete mode 100644 gnu/packages/patches/libarchive-CVE-2017-14502.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9544297f17..45f108e768 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -943,8 +943,6 @@ dist_patch_DATA = \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ - %D%/packages/patches/libarchive-CVE-2017-14166.patch \ - %D%/packages/patches/libarchive-CVE-2017-14502.patch \ %D%/packages/patches/libarchive-CVE-2018-1000877.patch \ %D%/packages/patches/libarchive-CVE-2018-1000878.patch \ %D%/packages/patches/libarchive-CVE-2018-1000880.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index c312f23c1a..45b1be2413 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -197,18 +197,18 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (replacement libarchive-3.3.3) - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (string-append "https://libarchive.org/downloads/libarchive-" version ".tar.gz")) - (patches (search-patches "libarchive-CVE-2017-14166.patch" - "libarchive-CVE-2017-14502.patch")) + (patches (search-patches "libarchive-CVE-2018-1000877.patch" + "libarchive-CVE-2018-1000878.patch" + "libarchive-CVE-2018-1000880.patch")) (sha256 (base32 - "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd")))) + "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) @@ -274,22 +274,6 @@ 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-public libarchive-3.3.3 - (package - (inherit libarchive) - (version "3.3.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://libarchive.org/downloads/libarchive-" - version ".tar.gz")) - (patches (search-patches "libarchive-CVE-2018-1000877.patch" - "libarchive-CVE-2018-1000878.patch" - "libarchive-CVE-2018-1000880.patch")) - (sha256 - (base32 - "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms")))))) - (define-public rdup (package (name "rdup") diff --git a/gnu/packages/patches/libarchive-CVE-2017-14166.patch b/gnu/packages/patches/libarchive-CVE-2017-14166.patch deleted file mode 100644 index a122848440..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2017-14166.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix CVE-2017-14166: - -https://github.com/libarchive/libarchive/issues/935 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14166 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/fa7438a0ff4033e4741c807394a9af6207940d71 - -From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Tue, 5 Sep 2017 18:12:19 +0200 -Subject: [PATCH] Do something sensible for empty strings to make fuzzers - happy. - ---- - libarchive/archive_read_support_format_xar.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c -index 7a22beb9d..93eeacc5e 100644 ---- a/libarchive/archive_read_support_format_xar.c -+++ b/libarchive/archive_read_support_format_xar.c -@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) - uint64_t l; - int digit; - -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - digit = *p - '0'; - while (digit >= 0 && digit < 10 && char_cnt-- > 0) { -@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) - { - int64_t l; - int digit; -- -+ -+ if (char_cnt == 0) -+ return (0); -+ - l = 0; - while (char_cnt-- > 0) { - if (*p >= '0' && *p <= '7') diff --git a/gnu/packages/patches/libarchive-CVE-2017-14502.patch b/gnu/packages/patches/libarchive-CVE-2017-14502.patch deleted file mode 100644 index 8e0508afb5..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2017-14502.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix CVE-2017-14502: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14502 -https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=573 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/5562545b5562f6d12a4ef991fae158bf4ccf92b6 - -From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger -Date: Sat, 9 Sep 2017 17:47:32 +0200 -Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR - archives. - -Reported-By: OSS-Fuzz issue 573 ---- - libarchive/archive_read_support_format_rar.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index cbb14c32..751de697 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, - return (ARCHIVE_FATAL); - } - filename[filename_size++] = '\0'; -- filename[filename_size++] = '\0'; -+ /* -+ * Do not increment filename_size here as the computations below -+ * add the space for the terminating NUL explicitly. -+ */ -+ filename[filename_size] = '\0'; - - /* Decoded unicode form is UTF-16BE, so we have to update a string - * conversion object for it. */ --- -2.15.1 - -- cgit v1.2.3 From 4ee5482a0801015f81914f1ef08b5583dc174190 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Feb 2019 20:43:47 +0100 Subject: gnu: bison: Update to 3.3.2. * gnu/packages/bison.scm (bison): Update to 3.3.2. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 70d5e08d4a..ae37a8f80c 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.2.4") + (version "3.3.2") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "0d2ny1kmvvlmj4h9gdyqsx4bf01lgdfcjh1pa2385xjdkx0l8gaj")))) + "016qp59wxakz3ckxwyrmzxk406q0h286ydz8ww1m0pnrc5dy97h3")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From e34ae707881f3bfb09036f9461b1527336057c7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Feb 2019 20:44:24 +0100 Subject: gnu: mpfr: Update to 4.0.2. * gnu/packages/multiprecision.scm (mpfr): Update to 4.0.2. --- gnu/packages/multiprecision.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index c17321a9b3..9f434dabe3 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -93,13 +93,13 @@ algebra.") (define-public mpfr (package (name "mpfr") - (version "4.0.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mpfr/mpfr-" version ".tar.xz")) (sha256 (base32 - "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7")))) + "12m3amcavhpqygc499s3fzqlb8f2j2rr7fkqsm10xbjfc04fffqx")))) (build-system gnu-build-system) (outputs '("out" "debug")) (propagated-inputs `(("gmp" ,gmp))) ; refers to -- cgit v1.2.3 From dfc941a9437160303ee141604d0d69bfcada99ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Feb 2019 20:45:16 +0100 Subject: gnu: binutils: Update to 2.32. * gnu/packages/base.scm (binutils): Update to 2.32. --- gnu/packages/base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3db0cc056b..96739b4de9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -439,14 +439,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.31.1") + (version "2.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z")) + "0b8767nyal1bc4cyzg5h9iis8kpkln1i3wkamig75cifj1fb2f6y")) (patches (search-patches "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 28a873f2084db159ebf1d9a03d86884ed971a810 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:15:29 +0100 Subject: gnu: libpng: Update to 1.6.36. * gnu/packages/image.scm (libpng): Update to 1.6.36. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index adec68a084..5975fc10ae 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -86,7 +86,7 @@ (define-public libpng (package (name "libpng") - (version "1.6.34") + (version "1.6.36") (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" @@ -99,7 +99,7 @@ "/libpng16/libpng-" version ".tar.xz"))) (sha256 (base32 - "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig")))) + "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc")))) (build-system gnu-build-system) ;; libpng.la says "-lz", so propagate it. -- cgit v1.2.3 From 596c54c9672011a7d54c3aee25b1ab2a3e7c1e59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:16:01 +0100 Subject: gnu: mit-krb5: Update to 1.17. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.17. --- gnu/packages/kerberos.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index f52bb62c23..7cf61c8d0f 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -49,7 +49,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.16.1") + (version "1.17") (source (origin (method url-fetch) (uri (list @@ -61,7 +61,7 @@ "/krb5-" version ".tar.gz"))) (sha256 (base32 - "05qis9l93hhxaknbp0a2v5cr24fsy52fqx20aqqcgl1s9qwzwkr1")))) + "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From d9464ca53ab66a92d1d223738227a23e8ad1b86b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:16:26 +0100 Subject: gnu: pcre2: Update to 10.32. * gnu/packages/pcre.scm (pcre2): Update to 10.32. --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 564a23d012..f46f7e3775 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -89,7 +89,7 @@ POSIX regular expression API.") (define-public pcre2 (package (name "pcre2") - (version "10.31") + (version "10.32") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" @@ -97,7 +97,7 @@ POSIX regular expression API.") (sha256 (base32 - "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0")))) + "0bkwp2czcckvvbdls7b331cad11rxsm020aqhrbz84z8bp68k7pj")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) -- cgit v1.2.3 From 28ae145ba6e9556513b774bdc1636e500995cda7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:16:58 +0100 Subject: gnu: python: Update to 3.7.2. * gnu/packages/python.scm (python-3.7): Update to 3.7.2. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 87b80f9c40..5c74e8fde7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -279,7 +279,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.1") + (version "3.7.2") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -292,7 +292,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps")) + "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) (snippet '(begin (for-each delete-file -- cgit v1.2.3 From 85559eb88b9a5c9d0c44eaadd83c9ec565c4d4e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:17:19 +0100 Subject: gnu: openssl: Update to 1.0.2q. * gnu/packages/tls.scm (openssl): Update to 1.0.2q. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index b398d6f8c5..f00886d8c2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -264,7 +264,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2p") + (version "1.0.2q") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -276,7 +276,7 @@ required structures.") "/" name "-" version ".tar.gz"))) (sha256 (base32 - "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah")) + "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 723c356d806223c0e1ecf921f6cf15af83387fb1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:18:28 +0100 Subject: gnu: libxml2: Update to 2.9.9. * gnu/packages/xml.scm (libxml2): Update to 2.9.9. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index f15c24243a..b6d6bf8034 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -123,14 +123,14 @@ hierarchical form with variable field lengths.") (define-public libxml2 (package (name "libxml2") - (version "2.9.8") + (version "2.9.9") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" version ".tar.gz")) (sha256 (base32 - "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b")))) + "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl")))) (build-system gnu-build-system) (outputs '("out" "static")) (arguments -- cgit v1.2.3 From df2bf40eec54f8aa143015d2ae452fcc847e7dcd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 7 Feb 2019 21:18:52 +0100 Subject: gnu: libxslt: Update to 1.1.33. * gnu/packages/xml.scm (libxslt): Update to 1.1.33. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b6d6bf8034..322fc4ec3e 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -205,14 +205,14 @@ project (but it is usable outside of the Gnome platform).") (define-public libxslt (package (name "libxslt") - (version "1.1.32") + (version "1.1.33") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" version ".tar.gz")) (sha256 (base32 - "0q2l6m56iv3ysxgm2walhg4c9wp7q183jb328687i9zlp85csvjj")) + "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf")) (patches (search-patches "libxslt-generated-ids.patch")))) (build-system gnu-build-system) (home-page "http://xmlsoft.org/XSLT/index.html") -- cgit v1.2.3 From 0fb9a8df429a7b9f40610ff15baaff0d8e31e8cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2018 21:43:07 +0100 Subject: guix: Add wrap-script. * guix/build/utils.scm (wrap-script): New procedure. (&wrap-error): New condition. (wrap-error?, wrap-error-program, wrap-error-type): New procedures. * tests/build-utils.scm ("wrap-script, simple case", "wrap-script, with encoding declaration", "wrap-script, raises condition"): New tests. --- guix/build/utils.scm | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/build-utils.scm | 102 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 55d34b67e7..b7cd748d81 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,11 @@ remove-store-references wrapper? wrap-program + wrap-script + + wrap-error? + wrap-error-program + wrap-error-type invoke invoke-error? @@ -1042,6 +1048,11 @@ known as `nuke-refs' in Nixpkgs." (put-u8 out (char->integer char)) result)))))) +(define-condition-type &wrap-error &error + wrap-error? + (program wrap-error-program) + (type wrap-error-type)) + (define (wrapper? prog) "Return #t if PROG is a wrapper as produced by 'wrap-program'." (and (file-exists? prog) @@ -1146,6 +1157,120 @@ with definitions for VARS." (chmod prog-tmp #o755) (rename-file prog-tmp prog)))) +(define wrap-script + (let ((interpreter-regex + (make-regexp + (string-append "^#! ?(/[^ ]+/bin/(" + (string-join '("python[^ ]*" + "Rscript" + "perl" + "ruby" + "bash" + "sh") "|") + "))( ?.*)"))) + (coding-line-regex + (make-regexp + ".*#.*coding[=:][[:space:]]*([-a-zA-Z_0-9.]+)"))) + (lambda* (prog #:key (guile (which "guile")) #:rest vars) + "Wrap the script PROG such that VARS are set first. The format of VARS +is the same as in the WRAP-PROGRAM procedure. This procedure differs from +WRAP-PROGRAM in that it does not create a separate shell script. Instead, +PROG is modified directly by prepending a Guile script, which is interpreted +as a comment in the script's language. + +Special encoding comments as supported by Python are recreated on the second +line. + +Note that this procedure can only be used once per file as Guile scripts are +not supported." + (define update-env + (match-lambda + ((var sep '= rest) + `(setenv ,var ,(string-join rest sep))) + ((var sep 'prefix rest) + `(let ((current (getenv ,var))) + (setenv ,var (if current + (string-append ,(string-join rest sep) + ,sep current) + ,(string-join rest sep))))) + ((var sep 'suffix rest) + `(let ((current (getenv ,var))) + (setenv ,var (if current + (string-append current ,sep + ,(string-join rest sep)) + ,(string-join rest sep))))) + ((var '= rest) + `(setenv ,var ,(string-join rest ":"))) + ((var 'prefix rest) + `(let ((current (getenv ,var))) + (setenv ,var (if current + (string-append ,(string-join rest ":") + ":" current) + ,(string-join rest ":"))))) + ((var 'suffix rest) + `(let ((current (getenv ,var))) + (setenv ,var (if current + (string-append current ":" + ,(string-join rest ":")) + ,(string-join rest ":"))))))) + (let-values (((interpreter args coding-line) + (call-with-ascii-input-file prog + (lambda (p) + (let ((first-match + (false-if-exception + (regexp-exec interpreter-regex (read-line p))))) + (values (and first-match (match:substring first-match 1)) + (and first-match (match:substring first-match 3)) + (false-if-exception + (and=> (regexp-exec coding-line-regex (read-line p)) + (lambda (m) (match:substring m 0)))))))))) + (if interpreter + (let* ((header (format #f "\ +#!~a --no-auto-compile +#!#; ~a +#\\-~s +#\\-~s +" + guile + (or coding-line "Guix wrapper") + (cons 'begin (map update-env + (match vars + ((#:guile _ . vars) vars) + (_ vars)))) + `(let ((cl (command-line))) + (apply execl ,interpreter + (car cl) + (cons (car cl) + (append + ',(string-split args #\space) + cl)))))) + (template (string-append prog ".XXXXXX")) + (out (mkstemp! template)) + (st (stat prog)) + (mode (stat:mode st))) + (with-throw-handler #t + (lambda () + (call-with-ascii-input-file prog + (lambda (p) + (format out header) + (dump-port p out) + (close out) + (chmod template mode) + (rename-file template prog) + (set-file-time prog st)))) + (lambda (key . args) + (format (current-error-port) + "wrap-script: ~a: error: ~a ~s~%" + prog key args) + (false-if-exception (delete-file template)) + (raise (condition + (&wrap-error (program prog) + (type key)))) + #f))) + (raise (condition + (&wrap-error (program prog) + (type 'no-interpreter-found))))))))) + ;;; ;;; Locales. diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 7d49446f66..1c9084514d 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2015, 2016 Ludovic Courtès +;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,4 +123,105 @@ (and (zero? (close-pipe pipe)) str)))))) +(let ((script-contents "\ +#!/anything/cabbage-bash-1.2.3/bin/sh + +echo hello world")) + + (test-equal "wrap-script, simple case" + (string-append + (format #f "\ +#!GUILE --no-auto-compile +#!#; Guix wrapper +#\\-~s +#\\-~s +" + '(begin (let ((current (getenv "GUIX_FOO"))) + (setenv "GUIX_FOO" + (if current + (string-append "/some/path:/some/other/path" + ":" current) + "/some/path:/some/other/path")))) + '(let ((cl (command-line))) + (apply execl "/anything/cabbage-bash-1.2.3/bin/sh" + (car cl) + (cons (car cl) + (append '("") cl))))) + script-contents) + (call-with-temporary-directory + (lambda (directory) + (let ((script-file-name (string-append directory "/foo"))) + (call-with-output-file script-file-name + (lambda (port) + (format port script-contents))) + (chmod script-file-name #o777) + + (mock ((guix build utils) which (const "GUILE")) + (wrap-script script-file-name + `("GUIX_FOO" prefix ("/some/path" + "/some/other/path")))) + (let ((str (call-with-input-file script-file-name get-string-all))) + (with-directory-excursion directory + (delete-file "foo")) + str)))))) + +(let ((script-contents "\ +#!/anything/cabbage-bash-1.2.3/bin/python3 -and -args +# vim:fileencoding=utf-8 +print('hello world')")) + + (test-equal "wrap-script, with encoding declaration" + (string-append + (format #f "\ +#!MYGUILE --no-auto-compile +#!#; # vim:fileencoding=utf-8 +#\\-~s +#\\-~s +" + '(begin (let ((current (getenv "GUIX_FOO"))) + (setenv "GUIX_FOO" + (if current + (string-append "/some/path:/some/other/path" + ":" current) + "/some/path:/some/other/path")))) + `(let ((cl (command-line))) + (apply execl "/anything/cabbage-bash-1.2.3/bin/python3" + (car cl) + (cons (car cl) + (append '("" "-and" "-args") cl))))) + script-contents) + (call-with-temporary-directory + (lambda (directory) + (let ((script-file-name (string-append directory "/foo"))) + (call-with-output-file script-file-name + (lambda (port) + (format port script-contents))) + (chmod script-file-name #o777) + + (wrap-script script-file-name + #:guile "MYGUILE" + `("GUIX_FOO" prefix ("/some/path" + "/some/other/path"))) + (let ((str (call-with-input-file script-file-name get-string-all))) + (with-directory-excursion directory + (delete-file "foo")) + str)))))) + +(test-assert "wrap-script, raises condition" + (call-with-temporary-directory + (lambda (directory) + (let ((script-file-name (string-append directory "/foo"))) + (call-with-output-file script-file-name + (lambda (port) + (format port "This is not a script"))) + (chmod script-file-name #o777) + (catch 'srfi-34 + (lambda () + (wrap-script script-file-name + #:guile "MYGUILE" + `("GUIX_FOO" prefix ("/some/path" + "/some/other/path")))) + (lambda (type obj) + (wrap-error? obj))))))) + (test-end) -- cgit v1.2.3 From d41f63942b5df85223f5fae110253bc30869653b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 8 Feb 2019 10:24:11 +0100 Subject: gnu: python-2.7: Rebuild bytecode. Fixes . * gnu/packages/python.scm (python-2.7)[arguments]: Add phase "rebuild-bytecode". (python-3.7)[arguments]: Replace "rebuild-bytecode" phase; remove outdated comment. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c74e8fde7..ce2e344880 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -215,6 +215,28 @@ file)))))) (call-with-output-file "__init__.py" (const #t)) #t))))))) + (add-after 'remove-tests 'rebuild-bytecode + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Disable hash randomization to ensure the generated .pycs + ;; are reproducible. + (setenv "PYTHONHASHSEED" "0") + (for-each + (lambda (opt) + (format #t "Compiling with optimization level: ~a\n" + (if (null? opt) "none" (car opt))) + (for-each (lambda (file) + (apply invoke + `(,(string-append out "/bin/python") + ,@opt + "-m" "compileall" + "-f" ; force rebuild + ;; Don't build lib2to3, because it contains Python 3 code. + "-x" "lib2to3/.*" + ,file))) + (find-files out "\\.py$"))) + (list '() '("-O") '("-OO"))) + #t))) (add-after 'install 'move-tk-inter (lambda* (#:key outputs #:allow-other-keys) ;; When Tkinter support is built move it to a separate output so @@ -316,10 +338,7 @@ data types.") (lambda _ (unsetenv "SOURCE_DATE_EPOCH") #t)) (add-after 'check 'reset-SOURCE_DATE_EPOCH (lambda _ (setenv "SOURCE_DATE_EPOCH" "1") #t)) - ;; FIXME: Without this phase we have close to 400 files that - ;; differ across different builds of this package. With this phase - ;; there are 44 files left that differ. - (add-after 'remove-tests 'rebuild-bytecode + (replace 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; Disable hash randomization to ensure the generated .pycs -- cgit v1.2.3 From f73f2e17d9f9e43c6d8842bce497006851537934 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 17:54:21 +0100 Subject: gnu: sqlite: Update to 3.27.1. * gnu/packages/sqlite.scm (sqlite): Update to 3.27.1. --- gnu/packages/sqlite.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index 794c030385..e6beef63b8 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.26.0") + (version "3.27.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -58,11 +58,11 @@ (map (cut string-pad <> 2 #\0) other-digits)) 6 #\0)))))) - (string-append "https://sqlite.org/2018/sqlite-autoconf-" + (string-append "https://sqlite.org/2019/sqlite-autoconf-" numeric-version ".tar.gz"))) (sha256 (base32 - "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))) + "1y7l225jm18fz6z3vyffrkl9k6qi964w1c5ri4giixizyy7jpaal")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 46d5a7e33d672d302c88292a9c297a9823f67a2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 19:37:33 +0100 Subject: gnu: sqlite: Enable FTS3 support. This is no longer enabled by default since 3.25.0. * gnu/packages/sqlite.scm (sqlite)[arguments]: Add "-DSQLITE_ENABLE_FTS3" to #:configure-flags. --- gnu/packages/sqlite.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index e6beef63b8..caa98c0861 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -67,10 +67,12 @@ (inputs `(("readline" ,readline))) (arguments `(#:configure-flags - ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_UNLOCK_NOTIFY and - ;; -DSQLITE_ENABLE_DBSTAT_VTAB to CFLAGS. GNU Icecat will refuse - ;; to use the system SQLite unless these options are enabled. + ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_FTS3, + ;; -DSQLITE_ENABLE_UNLOCK_NOTIFY and -DSQLITE_ENABLE_DBSTAT_VTAB + ;; to CFLAGS. GNU Icecat will refuse to use the system SQLite + ;; unless these options are enabled. (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " + "-DSQLITE_ENABLE_FTS3 " "-DSQLITE_ENABLE_UNLOCK_NOTIFY " "-DSQLITE_ENABLE_DBSTAT_VTAB")))) (home-page "https://www.sqlite.org/") -- cgit v1.2.3 From b5a72640d72fa8b4bc52cc24845eb23983f5f377 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:28:51 +0100 Subject: gnu: Tcl/Tk: Update to 8.6.9. * gnu/packages/tcl.scm (tcl): Update to 8.6.9. (tk): Update to 8.6.9.1. [source](uri): Use VERSION-PREFIX to take only the first three components. --- gnu/packages/tcl.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index b8c85eb844..368a80ab57 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -40,14 +40,14 @@ (define-public tcl (package (name "tcl") - (version "8.6.8") + (version "8.6.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" version "/tcl" version "-src.tar.gz")) (sha256 (base32 - "0sprsg7wnraa4cbwgbcliylm6p0rspfymxn8ww02pr4ca70v0g64")))) + "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -135,14 +135,15 @@ X11 GUIs.") (define-public tk (package (name "tk") - (version "8.6.8") + (version "8.6.9.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/tcl/Tcl/" - version "/tk" version "-src.tar.gz")) + (version-prefix version 3) "/tk" + version "-src.tar.gz")) (sha256 (base32 - "0cvvznjwfn0i9vj9cw3wg8svx25ha34gg57m4xd1k5fyinhbrrs9")) + "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg")) (patches (search-patches "tk-find-library.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 8dd1fce66e93bebceeacfa2dc398a76b10bc8e39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:12:08 +0100 Subject: gnu: python-py: Update to 1.7.0. * gnu/packages/python-xyz.scm (python-py): Update to 1.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 34126c1fe1..afffdb7d33 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1521,14 +1521,14 @@ server.") (define-public python-py (package (name "python-py") - (version "1.5.4") + (version "1.7.0") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "1xxvwfn82457djf55f5n2c94699rfqnk43br8fif2r2q8gvrmm9z")))) + "152nyjvd8phqbm9pwlnfx0xi4c6343hakjzg42sp4qw3k1qn74mz")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From 850926439fb3d853c7f50d8be9580b1599ad47c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:12:39 +0100 Subject: gnu: python-setuptools-scm: Update to 3.2.0. * gnu/packages/python-xyz.scm (python-setuptools-scm): Update to 3.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afffdb7d33..38241c67f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4263,13 +4263,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "3.1.0") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "0h4bglwfz8b9prqljv8z3w9rgydfyxzaj05bm1y6zs5m6shz548i")))) + "0n3knn3p1sqlx31k2lahn7z9bacvlv8nhlfidj77vz50bxqlgasj")))) (build-system python-build-system) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") -- cgit v1.2.3 From 5b972c3256eff3588ad516b6ae64f2b948cac7c5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:13:22 +0100 Subject: gnu: python-hypothesis: Update to 4.5.3. * gnu/packages/check.scm (python-hypothesis): Update to 4.5.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7550586c1f..afb3b96aba 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1447,13 +1447,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.70.3") + (version "4.5.3") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "1rshs1japfmwgar98yrkq4hg4z2q76hlnq7w2n3lfbjnscn1jd9b")))) + "0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c")))) (build-system python-build-system) (native-inputs `(;; FIXME: Change to python-flake8 in the next rebuild cycle. -- cgit v1.2.3 From ac63cf0a6995fb9de6121e648b401167895b2c9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 17:45:51 +0100 Subject: gnu: Remove python-flake8@3.5. * gnu/packages/python-xyz.scm (python-flake8-3.5): Rename to ... (python-flake8): ... this. Update to 3.6.0. Remove previous variant. [arguments]: Remove phases 'delete-broken-test' and 'fix-problem-with-pycodestyle'. [properties]: Adjust for renamed variable. (python2-flake8-3.5): Rename to ... (python2-flake8): ... this. Remove previous variable. * gnu/packages/check.scm (python-hypothesis)[native-inputs]: Adjust accordingly. --- gnu/packages/check.scm | 3 +-- gnu/packages/python-xyz.scm | 65 ++++++++------------------------------------- 2 files changed, 12 insertions(+), 56 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index afb3b96aba..02ee9b136b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1456,8 +1456,7 @@ instantly.") "0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c")))) (build-system python-build-system) (native-inputs - `(;; FIXME: Change to python-flake8 in the next rebuild cycle. - ("python-flake8" ,python-flake8-3.5) + `(("python-flake8" ,python-flake8) ("python-pytest" ,python-pytest-bootstrap))) (propagated-inputs `(("python-attrs" ,python-attrs-bootstrap) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38241c67f8..b92bed542f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5556,35 +5556,20 @@ complexity of Python source code.") (define-public python2-pyflakes-0.8.1 (package-with-python2 python-pyflakes-0.8.1)) -;; This package is used by hypothesis which has thousands of dependent packages. -;; FIXME: Consolidate this with "python-flake8" below in the next rebuild cycle. -(define-public python-flake8-3.5 +(define-public python-flake8 (package (name "python-flake8") - (version "3.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "flake8" version)) - (sha256 - (base32 - "184b33grvvjmiwlv9kyd7yng9qv5ld24154j70z332xxg9gjclvj")))) + (version "3.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "flake8" version)) + (sha256 + (base32 + "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Two errors don't seem to have assigned codes. - (add-after 'unpack 'delete-broken-test - (lambda _ (delete-file "tests/unit/test_pyflakes_codes.py") #t)) - (add-after 'unpack 'fix-problem-with-pycodestyle - (lambda _ - ;; See https://gitlab.com/pycqa/flake8/merge_requests/230 - ;; This should no longer be needed with the next release. - (substitute* "setup.py" - (("PEP8_PLUGIN\\('break_around_binary_operator'\\),") - "PEP8_PLUGIN('break_after_binary_operator'),\ -PEP8_PLUGIN('break_before_binary_operator'),")) - #t)) (delete 'check) (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) @@ -5604,45 +5589,17 @@ PEP8_PLUGIN('break_before_binary_operator'),")) "The modular source code checker: pep8, pyflakes and co") (description "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") - (properties `((python2-variant . ,(delay python2-flake8-3.5)))) + (properties `((python2-variant . ,(delay python2-flake8)))) (license license:expat))) -(define-public python2-flake8-3.5 - (let ((base (package-with-python2 (strip-python2-variant python-flake8-3.5)))) +(define-public python2-flake8 + (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) -;; Version 3.5.0 has compatibility issues with Pyflakes 2.0, so we need -;; this newer version. Keep it as a separate variable for now to avoid -;; rebuilding "python-hypothesis"; this should be removed in the next -;; rebuild cycle. -(define-public python-flake8 - (package - (inherit python-flake8-3.5) - (version "3.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "flake8" version)) - (sha256 - (base32 - "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) - (arguments - (substitute-keyword-arguments (package-arguments python-flake8-3.5) - ((#:phases phases) - `(modify-phases ,phases - (delete 'delete-broken-test) - (delete 'fix-problem-with-pycodestyle))))) - (properties `((python2-variant . ,(delay python2-flake8)))))) - -(define-public python2-flake8 - (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) - (package (inherit base) - (propagated-inputs - (package-propagated-inputs python2-flake8-3.5))))) - ;; python-hacking requires flake8 <2.6.0. (define-public python-flake8-2.5 (package -- cgit v1.2.3 From d16ef28b8037664ad08af5fb825811e9f46bb64c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:43:42 +0100 Subject: gnu: python-pycodestyle: Update to 2.5.0. * gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-pycodestyle): Update to 2.5.0. [source](patches): Remove. --- gnu/local.mk | 1 - .../python-pycodestyle-stdlib-tokenize-fix.patch | 35 ---------------------- gnu/packages/python-xyz.scm | 5 ++-- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 41f81d0d0b..9df65b9d21 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1171,7 +1171,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch b/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch deleted file mode 100644 index 16388c8dba..0000000000 --- a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 -From: Michael Hudson-Doyle -Date: Tue, 25 Sep 2018 14:58:57 +1200 -Subject: [PATCH] Keep compability with stdlib tokenize.py changes - -https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 -is not yet part of any release of Python but has been backported to all -versions in Git (includeing 2.7!). It causes the tokenize.py module to -emit a synthetic NEWLINE token for files that do not in fact end with a -newline, which confuses pycodestyle's checks for blank lines at the end -of a file. Fortunately the synthetic NEWLINE tokens are easy to detect -(the token text is ""). - -Fixes #786 ---- - pycodestyle.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pycodestyle.py b/pycodestyle.py -index 0d725d27..fbc3dca3 100755 ---- a/pycodestyle.py -+++ b/pycodestyle.py -@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): - """ - if line_number == total_lines: - stripped_last_line = physical_line.rstrip() -- if not stripped_last_line: -+ if physical_line and not stripped_last_line: - return 0, "W391 blank line at end of file" - if stripped_last_line == physical_line: -- return len(physical_line), "W292 no newline at end of file" -+ return len(lines[-1]), "W292 no newline at end of file" - - - @register_check diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b92bed542f..9d80531296 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3593,15 +3593,14 @@ as the original project seems to have been abandoned circa 2007.") (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")) - (patches (search-patches "python-pycodestyle-stdlib-tokenize-fix.patch")))) + "0v4prb05n21bm8650v0a01k1nyqjdmkrsm3zycfxh2j5k9n962p4")))) (build-system python-build-system) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") -- cgit v1.2.3 From 1bfb53c025fc68bb81ec06a9614f4da163c784f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:46:07 +0100 Subject: gnu: python-coverage: Update to 4.5.2. * gnu/packages/check.scm (python-coverage): Update to 4.5.2. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 02ee9b136b..c7c3ec0640 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1177,14 +1177,14 @@ have failed since the last commit or what tests are currently failing."))) (define-public python-coverage (package (name "python-coverage") - (version "4.4.1") + (version "4.5.2") (source (origin (method url-fetch) (uri (pypi-uri "coverage" version)) (sha256 (base32 - "097l4s3ssxm1vncsn0nw3a1pbzah28773q36c1ab9wz01r04973s")))) + "1d5zlyl3h39d3xlvkpsn4g5gpvdci9arplil2cnz2cs8wsgms8xb")))) (build-system python-build-system) (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. -- cgit v1.2.3 From 14f10479d0c9705dda371b2b17708b63cdf28ada Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:46:43 +0100 Subject: gnu: python-atomicwrites: Update to 1.3.0. * gnu/packages/python-xyz.scm (python-atomicwrites): Update to 1.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d80531296..c24caa836c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7169,13 +7169,13 @@ tables.") (define-public python-atomicwrites (package (name "python-atomicwrites") - (version "1.1.5") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "atomicwrites" version)) (sha256 (base32 - "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214")))) + "19ngcscdf3jsqmpcxn6zl5b6anmsajb6izp1smcd1n02midl9abm")))) (build-system python-build-system) (synopsis "Atomic file writes in Python") (description "Library for atomic file writes using platform dependent tools -- cgit v1.2.3 From 81ed0980a50ee1846c3a1c812e72fbb94c61c8f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:47:19 +0100 Subject: gnu: python-pluggy: Update to 0.8.1. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.8.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c24caa836c..1fd3e8bb27 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7607,14 +7607,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "1qbn70mksmr03hac6jgp6fiqc4l7859z8dchx2x950vhlij87swm")))) + "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 54da6f9f9b7badb6c957e598e71652af9e86c0e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:48:07 +0100 Subject: gnu: python2-pathlib2: Update to 2.3.3. * gnu/packages/python-xyz.scm (python2-pathlib2): Update to 2.3.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1fd3e8bb27..f2ef078cf3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8300,13 +8300,13 @@ anymore.") (define-public python2-pathlib2 (package (name "python2-pathlib2") - (version "2.3.2") + (version "2.3.3") (source (origin (method url-fetch) (uri (pypi-uri "pathlib2" version)) (sha256 (base32 - "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf")))) + "0hpp92vqqgcd8h92msm9slv161b1q160igjwnkf2ag6cx0c96695")))) (build-system python-build-system) ;; We only need the the Python 2 variant, since for Python 3 our minimum ;; version is 3.4 which already includes this package as part of the -- cgit v1.2.3 From 84127f8c300b6485d1fc476ccb2a0bf06cea683e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:48:46 +0100 Subject: gnu: python-configparser: Update to 3.7.1. * gnu/packages/python-xyz.scm (python-configparser): Update to 3.7.1. [source](uri): Use PYPI-URI. --- gnu/packages/python-xyz.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f2ef078cf3..89a1ec0172 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11348,17 +11348,14 @@ of @code{functools.lru_cache} from python 3.3.") (define-public python-configparser (package (name "python-configparser") - (version "3.5.0") + (version "3.7.1") (source (origin (method url-fetch) - (uri (string-append - "https://bitbucket.org/ambv/configparser/get/" - version ".tar.bz2")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "configparser" version)) (sha256 (base32 - "0waq40as14abwzbb321hfz4vr1fi363nscy32ga14qvfygrg96wa")))) + "0cnz213il9lhgda6x70fw7mfqr8da43s3wm343lwzhqx94mgmmav")))) (build-system python-build-system) (home-page "https://github.com/jaraco/configparser/") (synopsis "Backport of configparser from python 3.5") -- cgit v1.2.3 From 16e03a521e3d4a0b0415cacb87d66d88a5463f67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:50:33 +0100 Subject: gnu: python-more-itertools: Update to 5.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 5.0.0. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 89a1ec0172..3c9da320cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13560,29 +13560,15 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "4.3.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4")))) + "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) (build-system python-build-system) - (arguments - `(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) - '("armhf" "i686")) - '(#:phases - (modify-phases %standard-phases - ;; This is required for 32-bit hardware. - ;; TODO: Try to remove this when upgrading. - (add-after 'unpack 'patch-test - (lambda _ - (substitute* "more_itertools/tests/test_more.py" - (("10 \\*\\* 10") "9 ** 9")) - #t)))) - '()))) (propagated-inputs `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") -- cgit v1.2.3 From b3ca2b45d1be73f5d0a843c6e3721e7209f1c89d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 19:10:48 +0100 Subject: gnu: python-setuptools: Update to 40.8.0. * gnu/packages/python-xyz.scm (python-setuptools): Update to 40.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3c9da320cc..28618bc6bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -613,14 +613,14 @@ encoded).") (define-public python-setuptools (package (name "python-setuptools") - (version "40.0.0") + (version "40.8.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools" version ".zip")) (sha256 (base32 - "0pq116lr14gnc62v76nk0npkm6krb2mpp7p9ab369zgv4n7dnah1")) + "0k9hifpgahnw2a26w3cr346iy733k6d3nwh3f7g9m13y6f8fqkkf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From b2b96d536782d00d5f2c0e3ae15ab9fc87091bb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 23:53:54 +0100 Subject: gnu: python-freezegun: Update to 0.3.11. * gnu/packages/check.scm (python-freezegun): Update to 0.3.11. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c7c3ec0640..3932f4c305 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1974,14 +1974,14 @@ create data based on random numbers and yet remain repeatable.") (define-public python-freezegun (package (name "python-freezegun") - (version "0.3.10") + (version "0.3.11") (source (origin (method url-fetch) (uri (pypi-uri "freezegun" version)) (sha256 (base32 - "08m6b42yxb9hk5lv747v9n2qsxyadmkb0k6yg0gxdanwap0slg3h")))) + "1nh0fzqjwg88n57k3qa8mxnmiwrr7lqyd5xvc96qn5g8zcxv8fg8")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) -- cgit v1.2.3 From 59bd5a4a09f0f43f5cd7f86a4ee61d2351f93d99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:37:58 +0100 Subject: gnu: python-fonttools: Update to 3.37.3. * gnu/packages/python-xyz.scm (python-fonttools): Update to 3.37.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 28618bc6bc..0147abff98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5826,13 +5826,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.28.0") + (version "3.37.3") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) + "0k90g0q1h4var3kq6xn6zs3j1ghff97hwyn1gdqfdywsldas9668")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From 94295903939471314e5c89f4eff73bee28b9def6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:38:23 +0100 Subject: gnu: python-packaging: Update to 19.0. * gnu/packages/python-xyz.scm (python-packaging): Update to 19.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0147abff98..b4ebf46d1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11711,14 +11711,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "18.0") + (version "19.0") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "01wq9c53ix5rz6qg2c98gy8n4ff768rmanifm8m5jpjiaizj51h8")))) + "1brjhygq9dz6x1kdljivkjfldi3qf5rbkqgck1bpgv9qpv8ab60c")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From de92ab21c162e69bd15b7215ade61bc47603c8bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:56:37 +0100 Subject: gnu: python-dateutil: Update to 2.8.0. * gnu/packages/time.scm (python-dateutil): Update to 2.8.0. [arguments]: New field. [native-inputs]: Add PYTHON-PYTEST. --- gnu/packages/time.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 948d2b995c..e67960db0d 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -145,17 +145,31 @@ Pendulum instances.") (define-public python-dateutil (package (name "python-dateutil") - (version "2.7.3") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "python-dateutil" version)) (sha256 (base32 - "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72")))) + "17nsfhy4xdz1khrfxa61vd7pmvd5z0wa3zb6v4gb4kfnykv0b668")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Delete tests that depend on "freezegun" to avoid a + ;; circular dependency. + (delete-file "dateutil/test/test_utils.py") + (delete-file "dateutil/test/test_rrule.py") + + ;; XXX: Fails to get timezone from /etc/localtime. + (delete-file "dateutil/test/test_tz.py") + + (invoke "pytest" "-vv")))))) (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm))) + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-six" ,python-six))) (home-page "https://dateutil.readthedocs.io/en/stable/") -- cgit v1.2.3 From 01e8263febb9634564b4b73af49b81a36567a11b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 19:56:30 +0200 Subject: gnu: Use GCC 7 as the default compiler. * gnu/packages/cross-base.scm (%gcc-cross-include-paths): Remove CROSS_C_INCLUDE_PATH & co in favor of CROSS_CPATH. * gnu/build/cross-toolchain.scm (%gcc-cross-include-paths): Likewise. (cross-gcc-build-phases): Set CROSS_C_INCLUDE_PATH and CROSS_CPLUS_INCLUDE_PATH when building the cross GCC. * gnu/packages/commencement.scm (libstdc++): Add "--disable-libstdcxx-dual-abi" to #:configure-flags. (gcc-boot0)[arguments]: Add "--disable-libmpx" to #:configure-flags. (gcc-final): Add phase to set C_INCLUDE_PATH and CPLUS_INCLUDE_PATH before building GCC. (gcc-toolchain-5): Use MAKE-GCC-TOOLCHAIN. (gcc-toolchain-7): Change to GCC-TOOLCHAIN. * gnu/packages/gcc.scm (gcc): Change from GCC-5 to GCC-7. (gfortran): Change to GFORTRAN-7. (gcc-objc): Change to GCC-OBJC-7. (gcc-objc++): Change to GCC-OBJC++-7. * gnu/packages/rust.scm (rust-1.19.0)[native-search-paths]: Change from C_INCLUDE_PATH & co to CPATH. --- gnu/build/cross-toolchain.scm | 18 +++++++++++++----- gnu/packages/commencement.scm | 22 +++++++++++++++++----- gnu/packages/cross-base.scm | 7 ++----- gnu/packages/gcc.scm | 8 ++++---- gnu/packages/rust.scm | 5 +---- 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index d430b8afc4..0b5450d1b4 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,11 +37,8 @@ (define %gcc-include-paths ;; Environment variables for header search paths. - ;; Note: See for why not 'CPATH'. - '("C_INCLUDE_PATH" - "CPLUS_INCLUDE_PATH" - "OBJC_INCLUDE_PATH" - "OBJCPLUS_INCLUDE_PATH")) + ;; Note: See for why not 'C_INCLUDE_PATH' & co. + '("CPATH")) (define %gcc-cross-include-paths ;; Search path for target headers when cross-compiling. @@ -171,6 +169,16 @@ a target triplet." (if (string-contains target "mingw") set-cross-path/mingw set-cross-path)) + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + (when libc + ;; For GCC6 and later, make sure Glibc is treated as a "system + ;; header" such that #include_next does the right thing. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) + #t))) (add-after 'install 'make-cross-binutils-visible (cut make-cross-binutils-visible #:target target <...>)) (replace 'install install-strip))) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 79246a0c5d..92a67acede 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -1578,6 +1579,7 @@ exec " gcc "/bin/" program "--disable-libsanitizer" "--disable-libitm" "--disable-libgomp" + "--disable-libmpx" "--disable-libcilkrts" "--disable-libvtv" "--disable-libssp" @@ -2118,6 +2120,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; except for the configure-flags. ,@(package-arguments lib) #:configure-flags `("--disable-shared" + "--disable-libstdcxx-dual-abi" "--disable-libstdcxx-threads" "--disable-libstdcxx-pch" ,(string-append "--with-gxx-include-dir=" @@ -2207,6 +2210,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" char-set:letter) ,(package-name lib))) (list gmp-6.0 mpfr mpc)) + #t))) + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + ;; Make sure Glibc is treated as a "system header" so + ;; #include_next does the right thing. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t)))))))) ;; This time we want Texinfo, so we get the manual. Add @@ -2455,23 +2467,23 @@ and binaries, plus debugging symbols in the 'debug' output), and Binutils.") ("libc-debug" ,glibc-final "debug") ("libc-static" ,glibc-final "static"))))) +(define-public gcc-toolchain + (make-gcc-toolchain gcc-final)) + (define-public gcc-toolchain-4.8 (make-gcc-toolchain gcc-4.8)) (define-public gcc-toolchain-4.9 (make-gcc-toolchain gcc-4.9)) -(define-public gcc-toolchain - (make-gcc-toolchain gcc-final)) - (define-public gcc-toolchain-5 - gcc-toolchain) + (make-gcc-toolchain gcc-5)) (define-public gcc-toolchain-6 (make-gcc-toolchain gcc-6)) (define-public gcc-toolchain-7 - (make-gcc-toolchain gcc-7)) + gcc-toolchain) (define-public gcc-toolchain-8 (make-gcc-toolchain gcc-8)) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 2fcb7fb36b..8fe9d5b6d6 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -51,11 +51,8 @@ (define %gcc-include-paths ;; Environment variables for header search paths. - ;; Note: See for why not 'CPATH'. - '("C_INCLUDE_PATH" - "CPLUS_INCLUDE_PATH" - "OBJC_INCLUDE_PATH" - "OBJCPLUS_INCLUDE_PATH")) + ;; Note: See for why not 'C_INCLUDE_PATH' & co. + '("CPATH")) (define %gcc-cross-include-paths ;; Search path for target headers when cross-compiling. diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1f1e80dde8..3b6c540221 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -522,7 +522,7 @@ It also includes runtime support libraries for these languages."))) ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions and the gfortran definition ;; accordingly. -(define-public gcc gcc-5) +(define-public gcc gcc-7) (define-public (make-libstdc++ gcc) "Return a libstdc++ package based on GCC. The primary use case is when @@ -660,7 +660,7 @@ as the 'native-search-paths' field." ;; (custom-gcc gcc "fortran" …) because that would lead to a package object ;; that is not 'eq?' with GFORTRAN-5, and thus 'fold-packages' would ;; report two gfortran@5 that are in fact identical. - gfortran-5) + gfortran-7) (define-public gccgo-4.9 (custom-gcc gcc-4.9 "gccgo" '("go") @@ -724,7 +724,7 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) -(define-public gcc-objc gcc-objc-5) +(define-public gcc-objc gcc-objc-7) (define-public gcc-objc++-4.8 (custom-gcc gcc-4.8 "gcc-objc++" '("obj-c++") @@ -780,7 +780,7 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) -(define-public gcc-objc++ gcc-objc++-5) +(define-public gcc-objc++ gcc-objc++-7) (define (make-libstdc++-doc gcc) "Return a package with the libstdc++ documentation for GCC." diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 501736d898..6e3ea79845 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -406,10 +406,7 @@ test = { path = \"../libtest\" } ;; modules (see ). (native-search-paths (list (search-path-specification - (variable "C_INCLUDE_PATH") - (files '("include"))) - (search-path-specification - (variable "CPLUS_INCLUDE_PATH") + (variable "CPATH") (files '("include"))) (search-path-specification (variable "LIBRARY_PATH") -- cgit v1.2.3 From 3670ea70e2e932969a3ffc0acf75a714c7b42540 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 19 Jan 2019 19:02:47 +0200 Subject: gnu: glibc-final-with-bootstrap-bash: Don't enable obsolete rpc. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash) [arguments]: Remove 'enable-obsolete-rpc' configure flag. This brings this glibc package in line with the other glibc packages which are also built without the pre-2.14 glibc RPC functions. These functions cause build failures on armhf-linux and aarch64-linux. --- gnu/packages/commencement.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 92a67acede..a76867f426 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1874,11 +1874,7 @@ the bootstrap environment." ((#:configure-flags flags) `(append (list ,(string-append "--host=" (boot-triplet)) ,(string-append "--build=" - (nix-system->gnu-triplet)) - - ;; Build Sun/ONC RPC support. In particular, - ;; install rpc/*.h. - "--enable-obsolete-rpc") + (nix-system->gnu-triplet))) ,flags)) ((#:phases phases) `(modify-phases ,phases -- cgit v1.2.3 From a1635de0ce12979d74ba3796d460c01e58b198f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 5 Oct 2018 20:46:57 +0200 Subject: gnu: python: Fix FTBFS with GCC >= 6. * gnu/packages/patches/python-3-search-paths.patch: s/C_INCLUDE_PATH/CPATH. * gnu/packages/patches/python-2.7-search-paths.patch: Ditto. --- gnu/packages/patches/python-2.7-search-paths.patch | 4 ++-- gnu/packages/patches/python-3-search-paths.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch index ba7235df27..a012bc8fe0 100644 --- a/gnu/packages/patches/python-2.7-search-paths.patch +++ b/gnu/packages/patches/python-2.7-search-paths.patch @@ -1,4 +1,4 @@ -Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when +Make sure the build system honors CPATH and LIBRARY_PATH when looking for headers and libraries. --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 @@ -9,7 +9,7 @@ looking for headers and libraries. + # Always honor these variables. + lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index 73e3f4ccf5..c824705633 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -1,4 +1,4 @@ -Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when +Make sure the build system honors CPATH and LIBRARY_PATH when looking for headers and libraries. --- setup.py 2015-10-07 23:32:58.891329173 +0200 @@ -10,7 +10,7 @@ looking for headers and libraries. - lib_dirs = self.compiler.library_dirs + system_lib_dirs - inc_dirs = self.compiler.include_dirs + system_include_dirs + lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ++ inc_dirs = os.getenv('CPATH', '').split(os.pathsep) else: # Add the sysroot paths. 'sysroot' is a compiler option used to # set the logical path of the standard system headers and -- cgit v1.2.3 From 546bee40023687e52aff457b3b487cd47d751548 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 14:48:07 +0200 Subject: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries. * gnu/packages/cmake.scm (cmake)[arguments]: Try both CPATH and C_INCLUDE_PATH instead of just the latter. --- gnu/packages/cmake.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 7186cf98df..5bd91b7bf5 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -116,7 +116,8 @@ ;; Help cmake's bootstrap process to find system libraries (begin (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) + (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH") + (getenv "C_INCLUDE_PATH"))) #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 7f81f8bcccb1aa624e1a5f64992dbeb38de5515f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Oct 2018 14:50:02 +0200 Subject: gnu: cppunit: Update to 1.14.0. * gnu/packages/check.scm (cppunit): Update to 1.14.0. (cppunit-1.14): Remove variable. * gnu/packages/libreoffice.scm (libreoffice)[inputs]: Change CPPUNIT-1.14 to CPPUNIT. --- gnu/packages/check.scm | 21 ++------------------- gnu/packages/libreoffice.scm | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3932f4c305..2e9103ab90 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -132,14 +132,14 @@ with a flexible variety of user interfaces.") (define-public cppunit (package (name "cppunit") - (version "1.13.2") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "-" version ".tar.gz")) (sha256 (base32 - "17s2kzmkw3kfjhpp72rfppyd7syr7bdq5s69syj2nvrlwd3d4irz")))) + "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix")))) ;; Explicitly link with libdl. This is expected to be done by packages ;; relying on cppunit for their tests. However, not all of them do. ;; If we added the linker flag to such packages, we would pollute all @@ -154,23 +154,6 @@ unit testing. Test output is in XML for automatic testing and GUI based for supervised tests.") (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball -;; Some packages require this newer version of cppunit. However, it needs -;; C++11 support, which is not enabled by default in our current GCC, and -;; updating in-place would require adding CXXFLAGS to many dependent packages. -;; Thus, keep as a separate variable for now. -;; TODO: Remove this when our default GCC is updated to 6 or higher. -(define-public cppunit-1.14 - (package - (inherit cppunit) - (version "1.14.0") - (source (origin - (method url-fetch) - (uri (string-append "https://dev-www.libreoffice.org/src/" - "cppunit-" version ".tar.gz")) - (sha256 - (base32 - "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix")))))) - ;; When dependent packages upgraded to use newer version of catch, this one should ;; be removed. (define-public catch-framework diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b047c34a0b..712b25bc24 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1011,7 +1011,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) - ("cppunit" ,cppunit-1.14) + ("cppunit" ,cppunit) ("flex" ,flex) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) -- cgit v1.2.3 From a555c3f4386a4cbb2abae52768dbca408a8ad9da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 13:46:32 +0200 Subject: gnu: swig: Fix FTBFS with GCC >= 6. * gnu/packages/swig.scm (swig)[arguments]: Add phase to remove -isystem flag to GCC. --- gnu/packages/swig.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 61f6a8ccfe..b1b17fc68d 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,7 +51,14 @@ ;; Required since Perl 5.26.0's removal of the current ;; working directory from @INC. ;; TODO Try removing this for later versions of SWIG. - (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t))))) + (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t)) + (add-before 'configure 'workaround-gcc-bug + (lambda _ + ;; XXX: Don't add the -isystem flag, or GCCs #include_next + ;; won't be able to find . + (substitute* "configure" + (("-isystem ") "-I")) + #t))))) (native-inputs `(("boost" ,boost) ("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(;; Provide these to run the corresponding tests. -- cgit v1.2.3 From 8771fc1715b400ead16f97683c67ad336b485750 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 14:38:25 +0200 Subject: gnu: aspell: Fix FTBFS with GCC7. * gnu/packages/patches/aspell-gcc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/aspell.scm (aspell)[source](patches): Use it. --- gnu/local.mk | 1 + gnu/packages/aspell.scm | 3 ++- gnu/packages/patches/aspell-gcc-compat.patch | 31 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/aspell-gcc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9df65b9d21..d16b9e8c01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -643,6 +643,7 @@ dist_patch_DATA = \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aria2-CVE-2019-3500.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ + %D%/packages/patches/aspell-gcc-compat.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index ca9fc8eda5..01133155e1 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -45,7 +45,8 @@ (sha256 (base32 "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm")) - (patches (search-patches "aspell-default-dict-dir.patch")))) + (patches (search-patches "aspell-default-dict-dir.patch" + "aspell-gcc-compat.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/aspell-gcc-compat.patch b/gnu/packages/patches/aspell-gcc-compat.patch new file mode 100644 index 0000000000..94c44f8fb6 --- /dev/null +++ b/gnu/packages/patches/aspell-gcc-compat.patch @@ -0,0 +1,31 @@ +Fix GCC7 warnings. + +Taken from upstream: +https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384 + +diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp +index a979539..19ab63c 100644 +--- a/modules/filter/tex.cpp ++++ b/modules/filter/tex.cpp +@@ -174,7 +174,7 @@ namespace { + + if (c == '{') { + +- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') ++ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') + push_command(Parm); + + top.in_what = Parm; +diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp +index db54f3d..89ee09d 100644 +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { + } + } + if (i == width-1) { +- if (word == '\0') ++ if (*word == '\0') + put(out,' '); + else if (word[len] == '\0') + put(out, word, len); -- cgit v1.2.3 From 43d4c2298143631ada19539314c99775c18747e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 15:32:40 +0200 Subject: gnu: libevdev: Fix FTBFS with GCC7. * gnu/packages/xorg.scm (libevdev)[arguments]: Add phase to please "gcc -pedantic". --- gnu/packages/xorg.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bf7a4050a3..15ebd380d4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2402,6 +2402,18 @@ XC-APPGROUP, XTEST.") (base32 "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'pedantry + (lambda _ + ;; XXX: libevdev includes kernel headers, which causes this + ;; compile test to fail with: + ;; ...-headers-4.14.67/include/asm-generic/posix_types.h:88:14: + ;;error: ISO C90 does not support ‘long long’ [-Werror=long-long] + (substitute* "test/Makefile.in" + (("-pedantic -Werror -std=c89") + "-pedantic -Werror -std=c99")) + #t))))) (native-inputs `(("python" ,python))) (home-page "https://www.freedesktop.org/wiki/Software/libevdev/") (synopsis "Wrapper library for evdev devices") -- cgit v1.2.3 From b6c2805c0b6d9d237c52f9e0cc779fb7af548b93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 18:31:26 +0200 Subject: gnu: hyperrogue: Fix FTBFS with GCC7. * gnu/packages/games.scm (hyperrogue)[arguments]: Remove redundant #:make-flags. Preserve original CPATH when adding SDL path. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5d7c89a880..f46da6cff4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3635,7 +3635,8 @@ throwing people around in pseudo-randomly generated buildings.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-union") + (string-append (getenv "CPATH") ":" + (assoc-ref inputs "sdl-union") "/include/SDL")))) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 0bba8a5cf8a089227549bcb0489628e5b08183c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Oct 2018 18:54:59 +0200 Subject: gnu: inkscape: Fix FTBFS with GCC >= 6. * gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase 'dont-use-system-includes. --- gnu/packages/inkscape.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 7b17ebae40..a2c6778b57 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -86,6 +86,13 @@ (lambda _ (substitute* "share/icons/application/CMakeLists.txt" (("gtk-update-icon-cache") "true")) + #t)) + (add-before 'configure 'dont-use-system-includes + (lambda _ + ;; Don't add redundant -isystem includes which confuses GCC7. + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("include_directories\\(SYSTEM") + "include_directories(")) #t))))) (home-page "https://inkscape.org/") (synopsis "Vector graphics editor") -- cgit v1.2.3 From a46dcdfa3d9002eface76ef9f83e5d34c1ecbfb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:10:08 +0100 Subject: gnu: GnuTLS: Update to 3.6.6. * gnu/packages/tls.scm (gnutls): Update to 3.6.6. [source](snippet): Remove. --- gnu/packages/tls.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c025bfc56f..a90cf0b0c2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -164,7 +164,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.5") + (version "3.6.6") (source (origin (method url-fetch) (uri @@ -176,16 +176,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "0ddvg97dyrh8dkffv1mdc0knxx5my3qdbzv97s4a6jggmk9wwgh7")) - (modules '((guix build utils))) - (snippet - '(begin - ;; XXX: The generated configure script in GnuTLS 3.6.5 - ;; apparently does not know about Guile 2.2. - (substitute* "configure" - (("guile_versions_to_search=\"2\\.0 1\\.8\"") - "guile_versions_to_search=\"2.2 2.0 1.8\"")) - #t)))) + "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. -- cgit v1.2.3 From cb2c6364947017c06e8437477071f8d1098833a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:10:48 +0100 Subject: gnu: OpenLDAP: Update to 2.4.47. * gnu/packages/openldap.scm (openldap): Update to 2.4.47. --- gnu/packages/openldap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 368a953cb5..0d07571c2c 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -56,7 +56,7 @@ (define-public openldap (package (name "openldap") - (version "2.4.46") + (version "2.4.47") (source (origin (method url-fetch) @@ -73,7 +73,7 @@ "openldap-release/openldap-" version ".tgz"))) (sha256 (base32 - "0bab1km8f2nan1x0zgwliknbxg0zlf2pafxrr867kblrdfwdr44s")))) + "02sj0p1pq12hqq29b22m3f5zs2rykgvc0q3wlynxjcsjhrvmhk7m")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 0c5ddd40b12102e14559f4703da2557913401b17 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:11:35 +0100 Subject: gnu: libuv: Update to 1.26.0. * gnu/packages/libevent.scm (libuv): Update to 1.26.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index b3a5471527..0b8deaf15d 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "01pg0zsfr8mxlpipkbpw0dpsl26x5s966f5br7dx9ac29abk419q")))) + "1rqlh0ag02fni8ildz3anc26z9vz69vwf5qmzsid2gvzzfkigy6a")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From 2bdf9cb38c82a460632c9866f80278da1b35b12d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:12:01 +0100 Subject: gnu: RHash: Update to 1.3.8. * gnu/packages/crypto.scm (rhash): Update to 1.3.8. [arguments]: Adjust install target. --- gnu/packages/crypto.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ffef4ff8e4..3cb80eb0f2 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -683,7 +683,7 @@ BLAKE.") (define-public rhash (package (name "rhash") - (version "1.3.6") + (version "1.3.8") (source (origin (method url-fetch) @@ -692,7 +692,7 @@ BLAKE.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "14ngzfgmd1lfp7m78sn49x8ymf2s37nrr67c6p5vas85nrrgjkcn")))) + "0k60ywyhwqwqxa2q2l85vwgf884hcgy31nxir3dqgz7ymib6llxy")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -711,7 +711,7 @@ BLAKE.") (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "-C" "librhash" - "install-headers" "install-so-link" + "install-lib-headers" "install-so-link" make-flags)))))) (home-page "https://sourceforge.net/projects/rhash/") (synopsis "Utility for computing hash sums") -- cgit v1.2.3 From c3188c9accaa0299ea181617b5ab6a5682837e58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:12:53 +0100 Subject: gnu: nghttp2: Remove GCC7 workaround. * gnu/packages/web.scm (nghttp2)[native-inputs]: Remove GCC-7. [arguments]: Remove phase 'work-around-bug-30756'. --- gnu/packages/web.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 158d542d7f..129e8861a8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6255,7 +6255,6 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") "lib")) ; only libnghttp2 (native-inputs `(("pkg-config" ,pkg-config) - ("gcc" ,gcc-7) ; 1.35.0 requires GCC6 or later ;; Required by tests. ("cunit" ,cunit) @@ -6287,9 +6286,6 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (("@prefix@") (assoc-ref outputs "lib"))) #t)) - (add-before 'configure 'work-around-bug-30756 - (lambda _ - (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) #t)) (add-before 'check 'set-timezone-directory (lambda* (#:key inputs #:allow-other-keys) (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") -- cgit v1.2.3 From e04780b836a42050097fd2593eae8f2d636f8af7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:13:35 +0100 Subject: gnu: nghttp2: Update to 1.36.0. * gnu/packages/web.scm (nghttp2): Update to 1.36.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 129e8861a8..b386c1d469 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6240,7 +6240,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.35.1") + (version "1.36.0") (source (origin (method url-fetch) @@ -6249,7 +6249,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "0fi6qg2w82636wixwkqy7bclpgxslmvg82r431hs8h6aqc4mnzwv")))) + "1z47hadp5gpspfn41dj4mb0m5fzbkw1jw8sahjkabvc8gcaqdfz9")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From 8152024c2c743aada72b26692862859f74866640 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:14:02 +0100 Subject: gnu: graphite2: Update to 1.3.13. * gnu/packages/fontutils.scm (graphite2): Update to 1.3.13. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 274efe5fd8..2b60979699 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -433,7 +433,7 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.12") + (version "1.3.13") (source (origin (method url-fetch) @@ -441,7 +441,7 @@ applications should be.") "download/" version "/" name "-" version ".tgz")) (sha256 (base32 - "1l1940d8fz67jm6a0x8cjb5p2dv48cvz3wcskwa83hamd70k15fd")))) + "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests -- cgit v1.2.3 From 342c695e10a4528338a63301c99c3c175e8a4931 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:14:51 +0100 Subject: gnu: harfbuzz: Update to 2.3.1. * gnu/packages/gtk.scm (harfbuzz): Update to 2.3.1. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 93b9ba09fe..4817fec8c1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -182,7 +182,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.2.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -190,7 +190,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "047q63jr513azf3g1y7f5xn60b4jdjs9zsmrx04sfw5rasyzrk5p")))) + "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From f9126dd404b61d7aeea8cf5ddcfb3b2829ac0f73 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:18:18 +0100 Subject: gnu: libidn2: Update to 2.1.1a. * gnu/packages/libidn.scm (libidn2): Update to 2.1.1a. --- gnu/packages/libidn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 719a0f0b4b..1487a7644d 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -59,14 +59,14 @@ Java libraries.") (define-public libidn2 (package (name "libidn2") - (version "2.0.5") + (version "2.1.1a") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/" name "-" version ".tar.lz")) (sha256 (base32 - "0s4nkazy1xbs6bbq4farby1xhmhzk5bdclbil5gqdwyzxsgabxqg")))) + "1pdvar50hsgma40gmd7rgrwxhfbqfdpx5slxhl3jjpy1rcjgy9bd")))) (native-inputs `(("lzip" ,lzip))) (inputs -- cgit v1.2.3 From 7d9ca5c4b55a22da249ff2afec07e0d0f7a623f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 19:45:27 +0100 Subject: gnu: curl: Remove graft for 7.64.0. * gnu/packages/curl.scm (curl): Update to 7.64.0. (curl-7.64.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 12a82d1bb7..2e14e05c2c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (replacement curl-7.64.0) - (version "7.63.0") + (version "7.64.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1i38v49233jirzlfqd8fy6jyf80assa953hk7w6qmysbg562604n")))) + "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -142,19 +141,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.64.0 - (package - (inherit curl) - (version "7.64.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))))) - (define-public kurly (package (name "kurly") -- cgit v1.2.3 From fe82194394137bbd617d474d3a3b58783afb0470 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 21:27:12 +0100 Subject: gnu: gdbm: Update to 1.18.1. * gnu/packages/dbm.scm (gdbm): Update to 1.18.1. --- gnu/packages/dbm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index bf548a25f3..2f1c88f112 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -139,14 +139,14 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") (define-public gdbm (package (name "gdbm") - (version "1.18") + (version "1.18.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq")))) + "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") -- cgit v1.2.3 From 35b259eed055e288eadb2365b5ab4e8b15f363a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 16:42:15 +0100 Subject: gnu: pixman: Update to 0.38.0. * gnu/packages/xdisorg.scm (pixman): Update to 0.38.0. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5359c4c9d9..c43f834985 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -298,7 +298,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.36.0") + (version "0.38.0") (source (origin (method url-fetch) (uri (string-append @@ -306,7 +306,7 @@ following the mouse.") version ".tar.gz")) (sha256 (base32 - "1blzrx50ssdv0pn56hcv2v0zw0vrjwj1sx22pkgjls1p9n6rr88w")) + "1a0ci5ni7wngh59m0m00wzvhrc39aqj54yj88msw5msn07pjnnd7")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 9df397508dc1bc3544534aebc7c658c9754b08b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 18:15:10 +0100 Subject: gnu: poppler: Update to 0.74.0. * gnu/packages/patches/scribus-poppler-0.73.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/scribus.scm (scribus)[source](patches): Add it. * gnu/packages/pdf.scm (poppler): Update to 0.74.0. [arguments]: Adjust renamed configure flag. * gnu/packages/tex.scm (texlive-bin)[arguments]: Add phase 'use-code-for-even-newer-poppler'. --- gnu/local.mk | 1 + gnu/packages/patches/scribus-poppler-0.73.patch | 36 +++++++++++++++++++++++++ gnu/packages/pdf.scm | 6 ++--- gnu/packages/scribus.scm | 4 ++- gnu/packages/tex.scm | 9 +++++++ 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/scribus-poppler-0.73.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3a7bbedf6c..3f66beac14 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1220,6 +1220,7 @@ dist_patch_DATA = \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ %D%/packages/patches/scribus-poppler.patch \ + %D%/packages/patches/scribus-poppler-0.73.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ diff --git a/gnu/packages/patches/scribus-poppler-0.73.patch b/gnu/packages/patches/scribus-poppler-0.73.patch new file mode 100644 index 0000000000..5cf4cf721d --- /dev/null +++ b/gnu/packages/patches/scribus-poppler-0.73.patch @@ -0,0 +1,36 @@ +Fix build with Poppler 0.73. + +This is an amalgamation of these upstream commits: +https://github.com/scribusproject/scribus/commit/d34e59bfe495250ba023ba0f99e672ee32300a27 +https://github.com/scribusproject/scribus/commit/c43a89030026f8ffab5070b6935daee8bd74838a + +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index c46448b80a..4dac7c3983 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. + #include "selection.h" + #include "vgradient.h" + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) + #include ++#endif + #include + #include + #include +diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h +index f6b3950377..80ac796501 100644 +--- a/scribus/plugins/import/pdf/importpdfconfig.h ++++ b/scribus/plugins/import/pdf/importpdfconfig.h +@@ -37,4 +37,11 @@ for which a new license (GPL+exception) is in place. + #define getCString c_str + #endif + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0) ++#define Guchar unsigned char ++#define Gushort unsigned short ++#define Guint unsigned int ++#define Gulong unsigned long ++#endif ++ + #endif diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 504e69c769..1aa47b5c28 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -83,14 +83,14 @@ (define-public poppler (package (name "poppler") - (version "0.72.0") + (version "0.74.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0lfs1b1jfamxl13zbl5n448dqvl9n8frbv8180y7b7kfyaw7wx61")))) + "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no @@ -122,7 +122,7 @@ #:configure-flags (let* ((out (assoc-ref %outputs "out")) (lib (string-append out "/lib"))) - (list "-DENABLE_XPDF_HEADERS=ON" ; to install header files + (list "-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" ;to install header files "-DENABLE_ZLIB=ON" (string-append "-DCMAKE_INSTALL_LIBDIR=" lib) (string-append "-DCMAKE_INSTALL_RPATH=" lib))))) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 20795da275..5b770fd696 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -97,7 +97,9 @@ (file-name "scribus-poppler-0.70.patch") (sha256 (base32 - "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))))) + "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))) + + (search-patches "scribus-poppler-0.73.patch"))) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5f294dc84c..631fb8319f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -200,6 +200,15 @@ (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) + (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler + (lambda _ + ;; Adjust for deprecated types in Poppler 0.73. + (substitute* (append + (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$") + '("texk/web2c/pdftexdir/pdftosrc.cc")) + (("Guint") "unsigned int") + (("Guchar") "unsigned char")) + #t)) (add-after 'unpack 'disable-failing-test (lambda _ ;; FIXME: This test fails on 32-bit architectures since Glibc 2.28: -- cgit v1.2.3 From 0b7c0b699db4351522459ec69d8a159ed9fae6c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 21:27:56 +0100 Subject: gnu: libx11: Update to 1.6.7. * gnu/packages/xorg.scm (libx11): Update to 1.6.7. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 15ebd380d4..f4dbdffb63 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5261,7 +5261,7 @@ draggable titlebars and borders.") (define-public libx11 (package (name "libx11") - (version "1.6.6") + (version "1.6.7") (source (origin (method url-fetch) @@ -5271,7 +5271,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5")))) + "0j0k5bjz4kd7rx6z09n5ggxbzbi84wf78xx25ikx6jmsxwq9w3li")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML -- cgit v1.2.3 From 709fdfc21ec565b93630b935bd18b0803feace72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 21:28:15 +0100 Subject: gnu: libsm: Update to 1.2.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f4dbdffb63..bdfbabb356 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1212,7 +1212,7 @@ hit when running single-threaded.") (define-public libsm (package (name "libsm") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) @@ -1222,7 +1222,7 @@ hit when running single-threaded.") ".tar.bz2")) (sha256 (base32 - "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b")))) + "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id")))) (build-system gnu-build-system) (propagated-inputs `(("libice" ,libice))) ; SMlib.h includes ICElib.h -- cgit v1.2.3 From 4e546e546d85d590db32ab9dd7bc6ab5c14f28ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Feb 2019 23:51:48 +0100 Subject: gnu: libxau: Update to 1.0.9. * gnu/packages/xorg.scm (libxau): Update to 1.0.9. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bdfbabb356..b8e6c4add5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4845,7 +4845,7 @@ common definitions and porting layer.") (define-public libxau (package (name "libxau") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) @@ -4855,7 +4855,7 @@ common definitions and porting layer.") ".tar.bz2")) (sha256 (base32 - "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x")))) + "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 66679ab97846568a8a222afddc5181586636b74e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 14:17:08 +0100 Subject: gnu: libreoffice.scm: Fix build failures with GCC7. * gnu/packages/libreoffice.scm (libwpd, libcmis, libpagemaker)[arguments]: Add "--disable-werror" to #:configure-flags. --- gnu/packages/libreoffice.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 712b25bc24..4e90d436ac 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -181,6 +181,8 @@ spreadsheets and presentations.") (sha256 (base32 "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-werror"))) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) @@ -315,6 +317,8 @@ working with graphics in the WPG (WordPerfect Graphics) format.") ;; FIXME: Man pages generation requires docbook-to-man; reenable ;; it once this is available. "--without-man" + ;; XXX: A configure test fails with GCC7 when including Boost headers. + "--disable-werror" ;; During configure, the boost headers are found, but linking ;; fails without the following flag. (string-append "--with-boost=" @@ -565,6 +569,8 @@ Java.") (sha256 (base32 "17ai8ajffr0ixxmmcv3k5vgjlcsix38ldb4fw2arild70pbsrbb6")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-werror"))) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f85ca6eda044c43bd5b9b54e756c02fd90c372f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 14:21:22 +0100 Subject: gnu: Remove WebKitGTK@2.20. * gnu/packages/gnome.scm (eolie, epiphany)[native-inputs]: Remove GCC-7. [inputs]: Change WEBKITGTK-2.22 to WEBKITGTK. [arguments]: Adjust accordingly. * gnu/packages/web-browsers.scm (next-gtk-webkit): Likewise. * gnu/packages/webkit.scm (webkitgtk): Update to 2.22.6. (webkitgtk-2.22): Remove variable. --- gnu/packages/gnome.scm | 9 +++------ gnu/packages/web-browsers.scm | 10 +++------- gnu/packages/webkit.scm | 34 ++-------------------------------- 3 files changed, 8 insertions(+), 45 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3a09ae373c..3a34356beb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4130,7 +4130,6 @@ work and the interface is well tested.") ;; These libraries must be on LD_LIBRARY_PATH. (libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret" "atk" "gtk+" "gsettings-desktop-schemas" - "gcc:lib" ; needed b/c webkitgtk is built with gcc-7 "gobject-introspection")) (path (string-join (map (lambda (lib) @@ -4143,8 +4142,7 @@ work and the interface is well tested.") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) #t))))) (native-inputs - `(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7 - ("intltool" ,intltool) + `(("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("python" ,python) @@ -4165,7 +4163,7 @@ work and the interface is well tested.") ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description @@ -4203,7 +4201,6 @@ a secret password store, an adblocker, and a modern UI.") `(("dconf" ,dconf))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database - ("gcc" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 ("glib:bin" ,glib "bin") ; for glib-mkenums ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) @@ -4224,7 +4221,7 @@ a secret password store, an adblocker, and a modern UI.") ("libxslt" ,libxslt) ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index c9038ed8c7..b84abd0929 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -383,10 +383,7 @@ driven and does not detract you from your daily work.") (arguments `(#:tests? #f ; no tests #:make-flags (list "gtk-webkit" - (string-append - "CC=" - (assoc-ref %build-inputs "gcc-7") - "/bin/gcc") + "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases @@ -397,10 +394,9 @@ driven and does not detract you from your daily work.") (inputs `(("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk-2.22))) + ("webkitgtk" ,webkitgtk))) (native-inputs - `(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://next.atlas.engineer") (synopsis "Infinitely extensible web-browser (user interface only)") (description "Next is a keyboard-oriented, extensible web-browser diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 91c6c7d02a..af34052ee4 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -59,14 +59,14 @@ (define-public webkitgtk (package (name "webkitgtk") - (version "2.20.5") + (version "2.22.6") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m")))) + "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments @@ -160,33 +160,3 @@ HTML/CSS applications to full-fledged web browsers.") license:lgpl2.1+ license:bsd-2 license:bsd-3)))) - -;; This version of webkitgtk needs to be kept separate, because it requires a -;; newer version of GCC than our default compiler, and this causes problems -;; when linked with C++ libraries built using our default compiler. For now, -;; we use this newer webkitgtk only for selected packages, e.g. epiphany. -(define-public webkitgtk-2.22 - (package/inherit webkitgtk - (name "webkitgtk") - (version "2.22.6") - (source (origin - (method url-fetch) - (uri (string-append "https://www.webkitgtk.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z")))) - (native-inputs - `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer - ,@(package-native-inputs webkitgtk))) - (arguments - (substitute-keyword-arguments (package-arguments webkitgtk) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)))))))) -- cgit v1.2.3 From 63d4ef52ebad4157817d56ccbe974da8fff81929 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Feb 2019 19:49:27 +0100 Subject: gnu: Remove GCC < 7 workarounds. * gnu/packages/emulators.scm (dolphin-emu)[native-inputs]: Remove GCC-7. [arguments]: Adjust accordingly. * gnu/packages/games.scm (openrct2): Likewise. * gnu/packages/linux.scm (make-linux-libre): Likewise. * gnu/packages/mpd.scm (mpd): Likewise. * gnu/packages/storage.scm (ceph): Likewise. --- gnu/packages/emulators.scm | 6 ------ gnu/packages/games.scm | 13 ++++--------- gnu/packages/linux.scm | 9 --------- gnu/packages/mpd.scm | 17 ++--------------- gnu/packages/storage.scm | 8 +------- 5 files changed, 7 insertions(+), 46 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 184a3bc859..16dc7945ba 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -151,11 +151,6 @@ '(#:tests? #f #:phases (modify-phases %standard-phases - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (add-before 'configure 'generate-fonts&hardcore-libvulkan-path (lambda* (#:key inputs outputs #:allow-other-keys) (let ((fontfile @@ -189,7 +184,6 @@ "-DX11_FOUND=1"))) (native-inputs `(("pkg-config" ,pkg-config) - ("gcc" ,gcc-7) ; Building with gcc@5 doesn't work anymore. ("gettext" ,gnu-gettext))) (inputs `(("alsa-lib" ,alsa-lib) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f46da6cff4..8858de7713 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2615,16 +2615,12 @@ Transport Tycoon Deluxe.") "/share/openrct2/title-sequences") "data/title") (copy-recursively (string-append objects "/share/openrct2/objects") "data/object")))) - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) - (add-after 'fixgcc7 'get-rid-of-errors + (add-before 'configure 'get-rid-of-errors (lambda _ ;; Don't treat warnings as errors. (substitute* "CMakeLists.txt" - (("-Werror") ""))))))) + (("-Werror") "")) + #t))))) (inputs `(("curl" ,curl) ("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -2640,8 +2636,7 @@ Transport Tycoon Deluxe.") ("speexdsp" ,speexdsp) ("zlib" ,zlib))) (native-inputs - `(("gcc" ,gcc-7) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/OpenRCT2/OpenRCT2") (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") (description "OpenRCT2 is a free software re-implementation of diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7c242015e..e71c62900f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -308,10 +308,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ("flex" ,flex) ("bison" ,bison) - ;; Build with GCC-7 for full retpoline support. - ;; FIXME: Remove this when our default compiler has retpoline support. - ("gcc" ,gcc-7) - ;; These are needed to compile the GCC plugins. ("gmp" ,gmp) ("mpfr" ,mpfr) @@ -338,11 +334,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (substitute* (find-files "." "^Makefile(\\.include)?$") (("/bin/pwd") "pwd")) #t)) - (add-before 'configure 'work-around-gcc-7-include-path-issue - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) ;; Avoid introducing timestamps diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 7885e21aa4..56ffe177f2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -103,17 +103,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'... - #:phases - (modify-phases %standard-phases - (add-before 'configure 'expand-C++-include-path - ;; Make /include/c++/ext/string_conversions.h find . - (lambda* (#:key inputs #:allow-other-keys) - (let* ((path "CPLUS_INCLUDE_PATH") - (gcc (assoc-ref inputs "gcc")) - (c++ (string-append gcc "/include/c++"))) - (setenv path (string-append c++ ":" (getenv path))) - #t)))))) + `(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'... (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) ("avahi" ,avahi) @@ -135,10 +125,7 @@ interfacing MPD in the C, C++ & Objective C languages.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib))) - ;; MPD > 0.21 requires > GCC 6 - (native-inputs `(("gcc" ,gcc-8) - ("gcc-lib" ,gcc-8 "lib") - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx))) ;; Missing optional inputs: ;; libyajl diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 063825f429..4cff9665d5 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -237,11 +237,6 @@ (("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n") (("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n")) #t))) - (add-before 'configure 'gcc-workaround - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (add-before 'check 'set-check-environment (lambda _ ;; Run tests in parallel. @@ -289,8 +284,7 @@ (outputs '("out" "lib")) (native-inputs - `(("gcc" ,gcc-7) ;7 or later is required - ("gperf" ,gperf) + `(("gperf" ,gperf) ("pkg-config" ,pkg-config) ("python-cython" ,python-cython) ("python-sphinx" ,python-sphinx) -- cgit v1.2.3 From 47f66348f7c80056d6ae9637c42fce4effa688db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 18:24:03 +0100 Subject: gnu: python-more-itertools: Update to 6.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 6.0.0. [propagated-inputs]: Remove PYTHON-SIX-BOOTSTRAP. [properties]: New field. (python2-more-itertools): Stay on version 5.0.0. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d119fd12a..5768228dfe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -13788,27 +13788,40 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "5.0.0") + (version "6.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) + "1lfrx2ndnilla3a5lhpjc1wjgkplkxrhp5nyn6ys2l93jkil802r")))) (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") (description "Python's built-in @code{itertools} module implements a number of iterator building blocks inspired by constructs from APL, Haskell, and SML. @code{more-itertools} includes additional building blocks for working with iterables.") + (properties `((python2-variant . ,(delay python2-more-itertools)))) (license license:expat))) +;; The 5.x series are the last versions supporting Python 2.7. (define-public python2-more-itertools - (package-with-python2 python-more-itertools)) + (package + (inherit python-more-itertools) + (name "python2-more-itertools") + (version "5.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "more-itertools" version)) + (sha256 + (base32 + "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) + (arguments + `(#:python ,python2-minimal)) + (propagated-inputs + `(("python2-six" ,python2-six-bootstrap))))) (define-public python-latexcodec (package -- cgit v1.2.3 From b3e508dadbeb1a08592f8691a1de63bdeb43b39a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Feb 2019 16:59:45 +0100 Subject: gnu: texinfo: Update to 6.6. * gnu/packages/patches/texinfo-perl-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/texinfo.scm (texinfo): Update to 6.6. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/patches/texinfo-perl-compat.patch | 51 -------------------------- gnu/packages/texinfo.scm | 5 +-- 3 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 gnu/packages/patches/texinfo-perl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index e239c76c7c..0500a06b53 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1270,7 +1270,6 @@ dist_patch_DATA = \ %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ - %D%/packages/patches/texinfo-perl-compat.patch \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \ %D%/packages/patches/texlive-bin-pdftex-poppler-compat.patch \ diff --git a/gnu/packages/patches/texinfo-perl-compat.patch b/gnu/packages/patches/texinfo-perl-compat.patch deleted file mode 100644 index a7348fde0d..0000000000 --- a/gnu/packages/patches/texinfo-perl-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -Fix compatibility with newer Perls. - -The first patch is taken from upstream: -https://svn.savannah.gnu.org/viewvc/texinfo?view=revision&revision=8008 - -The second gets rid of a deprecation warning that breaks some tests. -Taken from Fedora: . - ---- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2017/04/30 14:57:26 7765 -+++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018/07/13 15:39:29 8008 -@@ -248,6 +248,11 @@ - - dTHX; - -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ switch_to_global_locale(); -+#endif -+ - if (setlocale (LC_CTYPE, "en_US.UTF-8") - || setlocale (LC_CTYPE, "en_US.utf8")) - goto success; -@@ -320,6 +325,10 @@ - { - success: ; - free (utf8_locale); -+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) -+ /* needed due to thread-safe locale handling in newer perls */ -+ sync_locale(); -+#endif - /* - fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); - fprintf (stderr, "character encoding is: %s\n", - -diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm ---- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200 -+++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200 -@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index fa98bd56b8..befdd78551 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -32,15 +32,14 @@ (define-public texinfo (package (name "texinfo") - (version "6.5") + (version "6.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) - (patches (search-patches "texinfo-perl-compat.patch")) (sha256 (base32 - "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp")))) + "0rixv4c301djr0d0cnsxs8c1wjndi6bf9vi5axz6mwjkv80cmfcv")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("perl" ,perl))) -- cgit v1.2.3 From 128c82bb3961ff74ff5b5fcac7c75b87fdee9336 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 20 Feb 2019 16:35:29 +0100 Subject: gnu: libgpg-error: Update to 1.35. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.35. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index e0a763dfaf..42b66f8953 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -77,7 +77,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.32") + (version "1.35") (source (origin (method url-fetch) @@ -85,7 +85,7 @@ version ".tar.bz2")) (sha256 (base32 - "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3")))) + "0rz00xyrk7qzg7mmcjhvrnm34hddkvyg9zsqq548vj58m1ifxmfb")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") -- cgit v1.2.3 From 3f544cf207b1d7aafdb500b26900fcba4cfe8fa4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Feb 2019 18:49:15 +0100 Subject: gnu: OpenSSL: Remove obsolete phase. * gnu/packages/tls.scm (openssl)[arguments]: Remove 'make-libraries-writable' phase. --- gnu/packages/tls.scm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f4ae7fbda3..8813083302 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -318,16 +318,6 @@ required structures.") "/share/openssl-" ,version) (string-append "--prefix=" out))))) - (add-after - 'install 'make-libraries-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; Make libraries writable so that 'strip' does its job. - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (file) - (chmod file #o644)) - (find-files (string-append out "/lib") - "\\.so")) - #t))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. -- cgit v1.2.3 From 218eb6e611c0a238802bf9cb5742d37cea0bb012 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:13:37 +0100 Subject: gnu: tar: Update to 1.32. * gnu/packages/base.scm (tar): Update to 1.32. [arguments]: Remove #:make-flags and #:configure-flags. --- gnu/packages/base.scm | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 289631acee..c252067571 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -156,14 +156,14 @@ implementation offers several extensions over the standard utility.") (define-public tar (package (name "tar") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" version ".tar.xz")) (sha256 (base32 - "1h9dxhjhz1jnyhmh6jfhqw1g1sxqbg3cd32vpwg7x2xxxqffzwrp")) + "1n7xy657ii0sa42zx6944v2m4v9qrh6sqgmw17l3nch3y43sxlyh")) (patches (search-patches "tar-skip-unreliable-tests.patch" "tar-remove-wholesparse-check.patch")))) (build-system gnu-build-system) @@ -177,27 +177,7 @@ implementation offers several extensions over the standard utility.") (substitute* "src/system.c" (("/bin/sh") (string-append bash "/bin/sh"))) - #t)))) - - ;; Work around a cross-compilation bug whereby libgnu.a would provide - ;; '__mktime_internal', which conflicts with the one in libc.a. - ,@(if (%current-target-system) - `(#:configure-flags '("gl_cv_func_working_mktime=yes")) - '()) - - ;; Test #92 "link mismatch" expects "a/z: Not linked to a/y" but gets - ;; "a/y: Not linked to a/z" and fails, presumably due to differences in - ;; the order in which 'diff' traverses directories. That leads to a - ;; test failure even though conceptually the test passes. Skip it. - ;; Test 117 and 118 are prone to race conditions too, particularly - ;; when cross-compiling, so we skip those as well. All issues have - ;; been fixed upstream in these commits: - ;; - ;; - #:make-flags (list (string-append - "TESTSUITEFLAGS= -k '!link mismatch," - "!directory removed before reading," - "!explicitly named directory removed before reading'")))) + #t)))))) ;; When cross-compiling, the 'set-shell-file-name' phase needs to be able ;; to refer to the target Bash. -- cgit v1.2.3 From 9b070277f9cb1512787fc6eb10ecf87102508d86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:31:29 +0100 Subject: gnu: libjpeg-turbo: Remove graft for 2.0.2. * gnu/packages/image.scm (libjpeg-turbo): Update to 2.0.2. [replacement]: Remove. (libjpeg-turbo-2.0.2): Remove variable. --- gnu/packages/image.scm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f4bf1116e4..79826a579c 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1298,15 +1298,14 @@ PNG, and performs PNG integrity checks and corrections.") (define-public libjpeg-turbo (package (name "libjpeg-turbo") - (version "2.0.1") - (replacement libjpeg-turbo-2.0.2) + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libjpeg-turbo/" version "/libjpeg-turbo-" version ".tar.gz")) (sha256 (base32 - "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75")))) + "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c")))) (build-system cmake-build-system) (native-inputs `(("nasm" ,nasm))) @@ -1329,18 +1328,6 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions -(define-public libjpeg-turbo-2.0.2 - (package - (inherit libjpeg-turbo) - (version "2.0.2") - (source (origin - (inherit (package-source libjpeg-turbo)) - (uri (string-append "mirror://sourceforge/libjpeg-turbo/" - version "/libjpeg-turbo-" version ".tar.gz")) - (sha256 - (base32 - "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c")))))) - (define-public niftilib (package (name "niftilib") -- cgit v1.2.3 From db91596a78cf463056b7304b4fc9e2b19ba042fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:32:16 +0100 Subject: gnu: gd: Incorporate grafted changes. * gnu/packages/gd.scm (gd)[replacement]: Remove. [source](patches): Add gd-CVE-2019-6977.patch and gd-CVE-2019-6978.patch. (gd/fixed): Remove variable. --- gnu/packages/gd.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index c08c1f6758..2012a38e26 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -39,7 +39,6 @@ (define-public gd (package (name "gd") - (replacement gd/fixed) ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. @@ -55,6 +54,8 @@ (patches (search-patches "gd-CVE-2018-5711.patch" "gd-CVE-2018-1000222.patch" + "gd-CVE-2019-6977.patch" + "gd-CVE-2019-6978.patch" "gd-fix-tests-on-i686.patch" "gd-freetype-test-failure.patch")))) (build-system gnu-build-system) @@ -95,16 +96,6 @@ most common applications of GD involve website development.") "See COPYING file in the distribution.")) (properties '((cpe-name . "libgd"))))) -(define-public gd/fixed - (hidden-package - (package - (inherit gd) - (source (origin - (inherit (package-source gd)) - (patches (append (origin-patches (package-source gd)) - (search-patches "gd-CVE-2019-6977.patch" - "gd-CVE-2019-6978.patch")))))))) - (define-public perl-gd (package (name "perl-gd") -- cgit v1.2.3 From 4e3a7d84613e4caeca903a205f21707cff5819f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 19:54:46 +0100 Subject: gnu: Python: Consolidate test patches. While at it, adjust patches for -p1 patch flag. * gnu/packages/patches/python-fix-tests.patch: Delete file. Move contents ... * gnu/packages/patches/python-3-fix-tests.patch: ... here. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python.scm (python-3.7)[source](patches): Remove obsolete. [source](patch-flags): Remove. * gnu/packages/patches/python-3-deterministic-build-info.patch, gnu/packages/patches/python-3-search-paths.patch: Adjust for `patch -p1`. --- gnu/local.mk | 1 - .../python-3-deterministic-build-info.patch | 4 +- gnu/packages/patches/python-3-fix-tests.patch | 354 +++++++++++++++------ gnu/packages/patches/python-3-search-paths.patch | 4 +- gnu/packages/patches/python-fix-tests.patch | 147 --------- gnu/packages/python.scm | 2 - 6 files changed, 256 insertions(+), 256 deletions(-) delete mode 100644 gnu/packages/patches/python-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0500a06b53..a1555fa224 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1173,7 +1173,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-cffi-x87-stack-clean.patch \ - %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ diff --git a/gnu/packages/patches/python-3-deterministic-build-info.patch b/gnu/packages/patches/python-3-deterministic-build-info.patch index 22c372a0cf..25a079fe90 100644 --- a/gnu/packages/patches/python-3-deterministic-build-info.patch +++ b/gnu/packages/patches/python-3-deterministic-build-info.patch @@ -2,8 +2,8 @@ Always provide the same date and time in 'Py_GetBuildInfo'. This is the information shown at the REPL and in 'sys.version'. We cannot pass it in CPPFLAGS due to whitespace in the DATE string. ---- Modules/getbuildinfo.c -+++ Modules/getbuildinfo.c +--- a/Modules/getbuildinfo.c ++++ b/Modules/getbuildinfo.c @@ -4,6 +4,10 @@ #include #endif diff --git a/gnu/packages/patches/python-3-fix-tests.patch b/gnu/packages/patches/python-3-fix-tests.patch index ab713c54dd..e4ba728a7e 100644 --- a/gnu/packages/patches/python-3-fix-tests.patch +++ b/gnu/packages/patches/python-3-fix-tests.patch @@ -1,9 +1,134 @@ -Additional test fixes which affect Python 3.5 (and presumably later) but not -prior revisions of Python. +See the discussion about the issues fixed here at: +http://bugs.python.org/issue20868 . ---- Lib/test/test_pathlib.py 2014-03-01 03:02:36.088311000 +0100 -+++ Lib/test/test_pathlib.py 2014-03-01 04:56:37.768311000 +0100 -@@ -2132,8 +2132,7 @@ +diff --git a/Lib/ctypes/test/test_callbacks.py b/Lib/ctypes/test/test_callbacks.py +--- a/Lib/ctypes/test/test_callbacks.py ++++ b/Lib/ctypes/test/test_callbacks.py +@@ -3,6 +3,7 @@ import unittest + from ctypes import * + from ctypes.test import need_symbol + import _ctypes_test ++import platform + + class Callbacks(unittest.TestCase): + functype = CFUNCTYPE +@@ -176,6 +177,8 @@ class SampleCallbacksTestCase(unittest.TestCase): + + self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_issue_8959_a(self): + from ctypes.util import find_library + libc_path = find_library("c") +diff --git a/Lib/ctypes/test/test_libc.py b/Lib/ctypes/test/test_libc.py +--- a/Lib/ctypes/test/test_libc.py ++++ b/Lib/ctypes/test/test_libc.py +@@ -2,6 +2,7 @@ import unittest + + from ctypes import * + import _ctypes_test ++import platform + + lib = CDLL(_ctypes_test.__file__) + +@@ -17,6 +18,8 @@ class LibTest(unittest.TestCase): + import math + self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_qsort(self): + comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) + lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc +diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py +--- a/Lib/distutils/tests/test_archive_util.py ++++ b/Lib/distutils/tests/test_archive_util.py +@@ -333,6 +333,7 @@ class ArchiveUtilTestCase(support.TempdirManager, + self.assertEqual(os.path.basename(res), 'archive.tar.xz') + self.assertEqual(self._tarinfo(res), self._created_files) + ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -362,6 +363,7 @@ class ArchiveUtilTestCase(support.TempdirManager, + + @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_tarfile_root_owner(self): + tmpdir = self._create_files() + base_name = os.path.join(self.mkdtemp(), 'archive') +diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py +--- a/Lib/distutils/tests/test_sdist.py ++++ b/Lib/distutils/tests/test_sdist.py +@@ -443,6 +443,7 @@ class SDistTestCase(BasePyPIRCCommandTestCase): + "The tar command is not found") + @unittest.skipIf(find_executable('gzip') is None, + "The gzip command is not found") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_distribution_owner_group(self): + # now building a sdist + dist, cmd = self.get_cmd() +diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py +--- a/Lib/test/_test_multiprocessing.py ++++ b/Lib/test/_test_multiprocessing.py +@@ -1473,6 +1473,7 @@ class _TestCondition(BaseTestCase): + if pid is not None: + os.kill(pid, signal.SIGINT) + ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_wait_result(self): + if isinstance(self, ProcessesMixin) and sys.platform != 'win32': + pid = os.getpid() +diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py +--- a/Lib/test/test_asyncio/test_base_events.py ++++ b/Lib/test/test_asyncio/test_base_events.py +@@ -1301,6 +1301,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): + self._test_create_connection_ip_addr(m_socket, False) + + @patch_socket ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value +diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py +--- a/Lib/test/test_generators.py ++++ b/Lib/test/test_generators.py +@@ -34,6 +34,7 @@ class SignalAndYieldFromTest(unittest.TestCase): + else: + return "FAILED" + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') + def test_raise_and_yield_from(self): + gen = self.generator1() + gen.send(None) +diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py +--- a/Lib/test/test_normalization.py ++++ b/Lib/test/test_normalization.py +@@ -2,6 +2,7 @@ from test.support import open_urlresource + import unittest + + from http.client import HTTPException ++from urllib.error import URLError + import sys + from unicodedata import normalize, unidata_version + +@@ -43,6 +44,8 @@ class NormalizationTest(unittest.TestCase): + except PermissionError: + self.skipTest(f"Permission error when downloading {TESTDATAURL} " + f"into the test data directory") ++ except URLError: ++ self.skipTest("DNS lookups are not enabled.") + except (OSError, HTTPException): + self.fail(f"Could not retrieve {TESTDATAURL}") + +diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py +--- a/Lib/test/test_pathlib.py ++++ b/Lib/test/test_pathlib.py +@@ -2130,8 +2130,7 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): self.assertEqual(given, expect) self.assertEqual(set(p.rglob("FILEd*")), set()) @@ -13,47 +138,10 @@ prior revisions of Python. def test_expanduser(self): P = self.cls support.import_module('pwd') ---- Lib/test/test_tarfile.py 2016-02-24 19:22:52.597208055 +0000 -+++ Lib/test/test_tarfile.py 2016-02-24 20:50:48.941950135 +0000 -@@ -2305,11 +2305,14 @@ - try: - import pwd, grp - except ImportError: - return False -- if pwd.getpwuid(0)[0] != 'root': -- return False -- if grp.getgrgid(0)[0] != 'root': -+ try: -+ if pwd.getpwuid(0)[0] != 'root': -+ return False -+ if grp.getgrgid(0)[0] != 'root': -+ return False -+ except KeyError: - return False - return True - - ---- Lib/test/test_asyncio/test_base_events.py -+++ Lib/test/test_asyncio/test_base_events.py -@@ -1216,6 +1216,8 @@ - self._test_create_connection_ip_addr(m_socket, False) - - @patch_socket -+ @unittest.skipUnless(support.is_resource_enabled('network'), -+ 'network is not enabled') - def test_create_connection_service_name(self, m_socket): - m_socket.getaddrinfo = socket.getaddrinfo - sock = m_socket.socket.return_value - ---- Lib/test/test_pdb.py.org 2017-03-12 03:09:01.991856701 +0100 -+++ Lib/test/test_pdb.py 2017-03-12 03:26:17.742572869 +0100 - -For some reason, KeyboardInterrupts do not work in the build -environment (lack of controlling TTY?). Just change the expected -outcome. Unfortunately, this will make it fail for users running -`python -m test test_pdb test_pdb` interactively. - -@@ -928,11 +928,11 @@ +diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py +--- a/Lib/test/test_pdb.py ++++ b/Lib/test/test_pdb.py +@@ -1133,11 +1133,11 @@ def test_pdb_issue_20766(): > (6)test_function() -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) (Pdb) continue @@ -65,22 +153,100 @@ outcome. Unfortunately, this will make it fail for users running - pdb 2: + pdb 2: Handlers.SIG_IGN """ - - class PdbTestCase(unittest.TestCase): ---- Lib/test/test_socket.py -+++ Lib/test/test_socket.py -@@ -802,6 +802,8 @@ + + +diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py +--- a/Lib/test/test_regrtest.py ++++ b/Lib/test/test_regrtest.py +@@ -764,6 +764,7 @@ class ArgsTestCase(BaseTestCase): + output = self.run_tests('--fromfile', filename) + self.check_executed_tests(output, tests) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_interrupted(self): + code = TEST_INTERRUPTED + test = self.create_test('sigint', code=code) +@@ -781,6 +782,7 @@ class ArgsTestCase(BaseTestCase): + % (self.TESTNAME_REGEX, len(tests))) + self.check_line(output, regex) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_slow_interrupted(self): + # Issue #25373: test --slowest with an interrupted test + code = TEST_INTERRUPTED +diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py +--- a/Lib/test/test_resource.py ++++ b/Lib/test/test_resource.py +@@ -145,6 +145,7 @@ class ResourceTest(unittest.TestCase): + + @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') + @support.requires_linux_version(2, 6, 36) ++ @unittest.skipIf(True, "Bug: the PermissionError is not raised") + def test_prlimit(self): + self.assertRaises(TypeError, resource.prlimit) + self.assertRaises(ProcessLookupError, resource.prlimit, +diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py +--- a/Lib/test/test_shutil.py ++++ b/Lib/test/test_shutil.py +@@ -1135,6 +1135,7 @@ class TestShutil(unittest.TestCase): + self.assertRaises(ValueError, make_archive, base_name, 'xxx') + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -1163,6 +1164,7 @@ class TestShutil(unittest.TestCase): + + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") + def test_tarfile_root_owner(self): + root_dir, base_dir = self._create_files() +diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py +--- a/Lib/test/test_socket.py ++++ b/Lib/test/test_socket.py +@@ -875,6 +875,8 @@ class GeneralModuleTests(unittest.TestCase): if not fqhn in all_host_names: self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') def test_host_resolution(self): - for addr in [support.HOST, '10.0.0.1', '255.255.255.255']: + for addr in [support.HOSTv4, '10.0.0.1', '255.255.255.255']: self.assertEqual(socket.gethostbyname(addr), addr) ---- Lib/test/test_spwd.py -+++ Lib/test/test_spwd.py -@@ -5,8 +5,7 @@ +@@ -1004,6 +1006,8 @@ class GeneralModuleTests(unittest.TestCase): + self.assertWarns(DeprecationWarning, socket.ntohs, k) + self.assertWarns(DeprecationWarning, socket.htons, k) + ++ @unittest.skipUnless(os.path.exists("/etc/services"), ++ "getservbyname uses /etc/services, which is not in the chroot") + def testGetServBy(self): + eq = self.assertEqual + # Find one service that exists, then check all the related interfaces. +@@ -1358,6 +1362,8 @@ class GeneralModuleTests(unittest.TestCase): + raise + self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + def testGetaddrinfo(self): + try: + socket.getaddrinfo('localhost', 80) +@@ -1440,6 +1446,8 @@ class GeneralModuleTests(unittest.TestCase): + # only IP addresses are allowed + self.assertRaises(OSError, socket.getnameinfo, ('mail.python.org',0), 0) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') + def test_idna(self): +diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py +--- a/Lib/test/test_spwd.py ++++ b/Lib/test/test_spwd.py +@@ -5,8 +5,7 @@ from test import support spwd = support.import_module('spwd') @@ -90,7 +256,7 @@ outcome. Unfortunately, this will make it fail for users running class TestSpwdRoot(unittest.TestCase): def test_getspall(self): -@@ -56,8 +55,7 @@ +@@ -56,8 +55,7 @@ class TestSpwdRoot(unittest.TestCase): self.assertRaises(TypeError, spwd.getspnam, bytes_name) @@ -100,50 +266,34 @@ outcome. Unfortunately, this will make it fail for users running class TestSpwdNonRoot(unittest.TestCase): def test_getspnam_exception(self): ---- Lib/test/test_regrtest.py -+++ Lib/test/test_regrtest.py -@@ -700,6 +700,7 @@ - output = self.run_tests('--fromfile', filename) - self.check_executed_tests(output, tests) - -+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') - def test_interrupted(self): - code = TEST_INTERRUPTED - test = self.create_test('sigint', code=code) -@@ -717,6 +718,7 @@ - % (self.TESTNAME_REGEX, len(tests))) - self.check_line(output, regex) - -+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') - def test_slow_interrupted(self): - # Issue #25373: test --slowest with an interrupted test - code = TEST_INTERRUPTED ---- Lib/test/test_generators.py -+++ Lib/test/test_generators.py -@@ -29,6 +29,7 @@ - else: - return "FAILED" - -+ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') - def test_raise_and_yield_from(self): - gen = self.generator1() - gen.send(None) ---- Lib/test/test_normalization.py -+++ Lib/test/test_normalization.py -@@ -2,6 +2,7 @@ - import unittest - - from http.client import HTTPException -+from urllib.error import URLError - import sys - from unicodedata import normalize, unidata_version - -@@ -43,6 +44,8 @@ - except PermissionError: - self.skipTest(f"Permission error when downloading {TESTDATAURL} " - f"into the test data directory") -+ except URLError: -+ self.skipTest("DNS lookups are not enabled.") - except (OSError, HTTPException): - self.fail(f"Could not retrieve {TESTDATAURL}") +diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py +--- a/Lib/test/test_tarfile.py ++++ b/Lib/test/test_tarfile.py +@@ -2504,9 +2504,12 @@ def root_is_uid_gid_0(): + import pwd, grp + except ImportError: + return False +- if pwd.getpwuid(0)[0] != 'root': +- return False +- if grp.getgrgid(0)[0] != 'root': ++ try: ++ if pwd.getpwuid(0)[0] != 'root': ++ return False ++ if grp.getgrgid(0)[0] != 'root': ++ return False ++ except KeyError: + return False + return True +diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py +--- a/Tools/scripts/run_tests.py ++++ b/Tools/scripts/run_tests.py +@@ -39,7 +39,7 @@ def main(regrtest_args): + if not any(is_multiprocess_flag(arg) for arg in regrtest_args): + args.extend(['-j', '0']) # Use all CPU cores + if not any(is_resource_use_flag(arg) for arg in regrtest_args): +- args.extend(['-u', 'all,-largefile,-audio,-gui']) ++ args.extend(['-u', 'all,-largefile,-audio,-gui,-network']) + args.extend(regrtest_args) + print(' '.join(args)) + if sys.platform == 'win32': diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index c824705633..5fea9c66b6 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -1,8 +1,8 @@ Make sure the build system honors CPATH and LIBRARY_PATH when looking for headers and libraries. ---- setup.py 2015-10-07 23:32:58.891329173 +0200 -+++ setup.py 2015-10-07 23:46:29.653349924 +0200 +--- a/setup.py 2015-10-07 23:32:58.891329173 +0200 ++++ b/setup.py 2015-10-07 23:46:29.653349924 +0200 @@ -575,8 +575,8 @@ # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. diff --git a/gnu/packages/patches/python-fix-tests.patch b/gnu/packages/patches/python-fix-tests.patch deleted file mode 100644 index d8f69866fd..0000000000 --- a/gnu/packages/patches/python-fix-tests.patch +++ /dev/null @@ -1,147 +0,0 @@ -See the discussion about the issues fixed here at: -http://bugs.python.org/issue20868 . - ---- Lib/test/test_shutil.py 2014-03-01 03:02:36.088311000 +0100 -+++ Lib/test/test_shutil.py 2014-03-01 04:56:37.768311000 +0100 -@@ -1127,6 +1127,7 @@ - self.assertRaises(ValueError, make_archive, base_name, 'xxx') - - @support.requires_zlib -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_make_archive_owner_group(self): - # testing make_archive with owner and group, with various combinations - # this works even if there's not gid/uid support -@@ -1155,6 +1156,7 @@ - - - @support.requires_zlib -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") - def test_tarfile_root_owner(self): - root_dir, base_dir = self._create_files() ---- Lib/test/test_socket.py.orig 2014-03-02 22:14:12.264311000 +0100 -+++ Lib/test/test_socket.py 2014-03-21 03:50:45.660311000 +0100 -@@ -819,6 +819,8 @@ - self.assertRaises(OverflowError, socket.htonl, k) - self.assertRaises(OverflowError, socket.htons, k) - -+ @unittest.skipUnless(os.path.exists("/etc/services"), -+ "getservbyname uses /etc/services, which is not in the chroot") - def testGetServBy(self): - eq = self.assertEqual - # Find one service that exists, then check all the related interfaces. -@@ -1104,6 +1106,8 @@ - self.assertRaises(ValueError, s.ioctl, -1, None) - s.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 100, 100)) - -+ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), -+ "getaddrinfo() will fail") - def testGetaddrinfo(self): - try: - socket.getaddrinfo('localhost', 80) -@@ -1174,6 +1178,8 @@ - # only IP addresses are allowed - self.assertRaises(socket.error, socket.getnameinfo, ('mail.python.org',0), 0) - -+ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), -+ "getaddrinfo() will fail") - @unittest.skipUnless(support.is_resource_enabled('network'), - 'network is not enabled') - def test_idna(self): ---- Lib/test/_test_multiprocessing.py 2014-04-06 23:12:27.575235000 +0200 -+++ Lib/test/_test_multiprocessing.py 2014-04-06 23:13:04.827235000 +0200 -@@ -1016,6 +1016,7 @@ - if pid is not None: - os.kill(pid, signal.SIGINT) - -+ @unittest.skipIf(True, "This fails for unknown reasons on Guix") - def test_wait_result(self): - if isinstance(self, ProcessesMixin) and sys.platform != 'win32': - pid = os.getpid() ---- Lib/ctypes/test/test_libc.py 2014-04-07 23:17:41.351235000 +0200 -+++ Lib/ctypes/test/test_libc.py 2014-04-07 23:32:18.799235000 +0200 -@@ -2,6 +2,7 @@ - - from ctypes import * - import _ctypes_test -+import platform - - lib = CDLL(_ctypes_test.__file__) - -@@ -17,6 +18,8 @@ - import math - self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) - -+ @unittest.skipIf(platform.machine() in ['mips64'], -+ "This test fails on this platform") - def test_qsort(self): - comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) - lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc ---- Lib/ctypes/test/test_callbacks.py 2014-04-07 23:15:42.835235000 +0200 -+++ Lib/ctypes/test/test_callbacks.py 2014-04-07 23:32:42.035235000 +0200 -@@ -1,6 +1,7 @@ - import unittest - from ctypes import * - import _ctypes_test -+import platform - - class Callbacks(unittest.TestCase): - functype = CFUNCTYPE -@@ -174,6 +175,8 @@ - - self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) - -+ @unittest.skipIf(platform.machine() in ['mips64'], -+ "This test fails on this platform") - def test_issue_8959_a(self): - from ctypes.util import find_library - libc_path = find_library("c") ---- Tools/scripts/run_tests.py.orig 2015-04-06 03:52:17.484000000 +0200 -+++ Tools/scripts/run_tests.py 2015-04-06 03:52:25.880000000 +0200 -@@ -47,7 +47,7 @@ - if threading and not any(is_multiprocess_flag(arg) for arg in regrtest_args): - args.extend(['-j', '0']) # Use all CPU cores - if not any(is_resource_use_flag(arg) for arg in regrtest_args): -- args.extend(['-u', 'all,-largefile,-audio,-gui']) -+ args.extend(['-u', 'all,-largefile,-audio,-gui,-network']) - args.extend(regrtest_args) - print(' '.join(args)) - os.execv(sys.executable, args) ---- Lib/distutils/tests/test_archive_util.py.orig 2015-04-06 04:08:49.288000000 +0200 -+++ Lib/distutils/tests/test_archive_util.py 2015-04-06 04:09:34.396000000 +0200 -@@ -282,6 +282,7 @@ - finally: - del ARCHIVE_FORMATS['xxx'] - -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_make_archive_owner_group(self): - # testing make_archive with owner and group, with various combinations - # this works even if there's not gid/uid support -@@ -310,6 +311,7 @@ - - @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib") - @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_tarfile_root_owner(self): - tmpdir, tmpdir2, base_name = self._create_files() - old_dir = os.getcwd() ---- Lib/distutils/tests/test_sdist.py.orig 2015-04-06 04:10:05.264000000 +0200 -+++ Lib/distutils/tests/test_sdist.py 2015-04-06 04:10:21.448000000 +0200 -@@ -435,6 +435,7 @@ - "The tar command is not found") - @unittest.skipIf(find_executable('gzip') is None, - "The gzip command is not found") -+ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") - def test_make_distribution_owner_group(self): - # now building a sdist - dist, cmd = self.get_cmd() ---- Lib/test/test_resource.py.orig 2015-04-06 21:30:24.708000000 +0200 -+++ Lib/test/test_resource.py 2015-04-06 23:07:27.220000000 +0200 -@@ -146,6 +146,7 @@ - - @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') - @support.requires_linux_version(2, 6, 36) -+ @unittest.skipIf(True, "Bug: the PermissionError is not raised") - def test_prlimit(self): - self.assertRaises(TypeError, resource.prlimit) - if os.geteuid() != 0: diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 057c47706b..9ed16d447e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -307,11 +307,9 @@ data types.") (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (patches (search-patches - "python-fix-tests.patch" "python-3-fix-tests.patch" "python-3-deterministic-build-info.patch" "python-3-search-paths.patch")) - (patch-flags '("-p0")) (sha256 (base32 "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) -- cgit v1.2.3 From 5466e82a1e61349e5a3f9726a03874e4f9817226 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Feb 2019 23:37:31 +0100 Subject: gnu: groff: Adjust relocatability snippet for 1.22.4. This commit does three things. It reverts 73b2ce87 ("gnu: groff-minimal: Disable relocatability."), re-applies f57693e1 ("gnu: groff: Disable relocatability."), and finally adjusts the substitution for changes since 0559a4c2 ("gnu: groff: Update to 1.22.4."). * gnu/packages/groff.scm (groff-minimal)[arguments]: Move relocatibility snippet ... (groff)[arguments]: ... here. Don't delete relocation.cpp and adjust file name. --- gnu/packages/groff.scm | 53 ++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index dd679f1582..cf4a884e04 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -63,6 +63,29 @@ `(#:parallel-build? #f ; parallel build fails #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-relocatability + (lambda _ + ;; Groff contains a Rube Goldberg-esque relocator for the file + ;; "charset.alias". It tries to find the current executable + ;; using realpath, a do-it-yourself search in $PATH and so on. + ;; Furthermore, the routine that does the search is buggy + ;; in that it doesn't handle error cases when they arise. + ;; This causes preconv to segfault when trying to look up + ;; the file "charset.alias" in the NULL location. + ;; The "charset.alias" parser is a copy of gnulib's, and a + ;; non-broken version of gnulib's "charset.alias" parser is + ;; part of glibc's libcharset. + ;; However, groff unconditionally uses their own + ;; "charset.alias" parser, but then DOES NOT INSTALL the + ;; file "charset.alias" when glibc is too new. + ;; In Guix, our file "charset.alias" only contains an obscure + ;; alias for ASCII and nothing else. So just disable relocation + ;; and make the entire "charset.alias" lookup fail. + ;; See for + ;; details. + (substitute* "Makefile.in" + (("-DENABLE_RELOCATABLE=1") "")) + #t)) (add-after 'unpack 'setenv (lambda _ (setenv "GS_GENERATE_UUIDS" "0") @@ -101,36 +124,6 @@ is usually the formatter of \"man\" documentation pages.") ,@(substitute-keyword-arguments (package-arguments groff) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'disable-relocatability - (lambda _ - ;; Groff contains a Rube Goldberg-esque relocator for the - ;; file "charset.alias". - ;; It tries to find the current executable using realpath, - ;; a do-it-yourself search in $PATH and so on. - ;; Furthermore, the routine that does the search is buggy - ;; in that it doesn't handle error cases when they arise. - ;; This causes preconv to segfault when trying to look up - ;; the file "charset.alias" in the NULL location. - ;; The "charset.alias" parser is a copy of gnulib's, and a - ;; non-broken version of gnulib's "charset.alias" parser - ;; is part of glibc's libcharset. - ;; However, groff unconditionally uses their own - ;; "charset.alias" parser, but then DOES NOT INSTALL the - ;; file "charset.alias" when glibc is too new. - ;; In Guix, our file "charset.alias" only contains an - ;; obscure alias for ASCII and nothing else. - ;; So just disable relocation and make the entire - ;; "charset.alias" lookup fail. - ;; See - ;; for details. - (substitute* "src/libs/libgroff/Makefile.sub" - (("-DENABLE_RELOCATABLE=1") "")) - ;; That file contains a crash bug--so make sure that - ;; its contents are not there. - (call-with-output-file "src/libs/libgroff/relocate.cpp" - (lambda (port) - #t)) - #t)) (add-after 'install 'remove-non-essential-programs (lambda* (#:key outputs #:allow-other-keys) ;; Keep only the programs that man-db needs at run time, -- cgit v1.2.3 From b4037d82c0d30455ca9288e18a543dbb310476ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Feb 2019 23:39:02 +0100 Subject: gnu: groff: Return #t from all phases. * gnu/packages/groff.scm (groff)[arguments]: Return #t from phases. --- gnu/packages/groff.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index cf4a884e04..98f17914bf 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -93,7 +93,8 @@ (add-after 'unpack 'fix-docdir (lambda _ ;see https://savannah.gnu.org/bugs/index.php?55461 (substitute* "Makefile.in" - (("^docdir =.*") "docdir = @docdir@\n"))))))) + (("^docdir =.*") "docdir = @docdir@\n")) + #t))))) (synopsis "Typesetting from plain text mixed with formatting commands") (description "Groff is a typesetting package that reads plain text and produces -- cgit v1.2.3 From b45a97ea84befd28b6191aa9ca320b8758ee8090 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Feb 2019 20:28:57 +0100 Subject: gnu: GCC: Move cross-toolchain build fix to (gnu packages cross-base). This makes sure it is inherited by packages using (cross-gcc ...). This commit is a followup to 01e8263febb9634564b4b73af49b81a36567a11b. * gnu/build/cross-toolchain.scm (cross-gcc-build-phases): Move 'treat-glibc-as-system-header' phase ... * gnu/packages/cross-base.scm (cross-gcc-arguments): ... here. --- gnu/build/cross-toolchain.scm | 10 ---------- gnu/packages/cross-base.scm | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 0b5450d1b4..53d6d39187 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -169,16 +169,6 @@ a target triplet." (if (string-contains target "mingw") set-cross-path/mingw set-cross-path)) - (add-before 'configure 'treat-glibc-as-system-header - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc"))) - (when libc - ;; For GCC6 and later, make sure Glibc is treated as a "system - ;; header" such that #include_next does the right thing. - (for-each (lambda (var) - (setenv var (string-append libc "/include"))) - '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) - #t))) (add-after 'install 'make-cross-binutils-visible (cut make-cross-binutils-visible #:target target <...>)) (replace 'install install-strip))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 8fe9d5b6d6..6a092727c1 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,7 +166,19 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ,flags)) flags)) ((#:phases phases) - `(cross-gcc-build-phases ,target ,phases)))))) + `(cross-gcc-build-phases + ,target + (modify-phases ,phases + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "libc"))) + (when libc + ;; For GCC6 and later, make sure Glibc is treated as a "system + ;; header" such that #include_next does the right thing. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH"))) + #t)))))))))) (define (cross-gcc-patches target) "Return GCC patches needed for TARGET." -- cgit v1.2.3 From e050aa1990ca846ccbf27327bc9009ffcfa0d578 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Feb 2019 20:39:13 +0100 Subject: gnu: make-bootstrap: Adjust for GCC7. This is a follow-up to commit 01e8263febb9634564b4b73af49b81a36567a11b. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc): Add the GCC7 'treat-glibc-as-system-header' build phase. --- gnu/packages/make-bootstrap.scm | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 86e331b34d..ec477da7c8 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -114,11 +115,26 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ("gcc" ,(package (inherit gcc) - (outputs '("out")) ; all in one so libgcc_s is easily found + (outputs '("out")) ;all in one so libgcc_s is easily found (inputs - `(("libc" ,(glibc-for-bootstrap)) + `(;; Distinguish the name so we can refer to it below. + ("bootstrap-libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") - ,@(package-inputs gcc))))) + ,@(package-inputs gcc))) + (arguments + (substitute-keyword-arguments (package-arguments gcc) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'treat-glibc-as-system-header + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (assoc-ref inputs "bootstrap-libc"))) + ;; GCCs build processes requires that the libc + ;; we're building against is on the system header + ;; search path. + (for-each (lambda (var) + (setenv var (string-append libc "/include"))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) + #t))))))))) ,@(fold alist-delete (%final-inputs) '("libc" "gcc"))))) (package-with-explicit-inputs p inputs -- cgit v1.2.3 From f90d6c3f69d51f10a47e78c6d57d8e59a7da337e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 Feb 2019 20:20:28 +0100 Subject: gnu: efivar: Fix build failure with GCC7. * gnu/packages/linux.scm (efivar)[arguments]: Add phase 'kernel-headers-are-system-headers'. --- gnu/packages/linux.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 23dd3f1ebd..8dd8e947ed 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4104,7 +4104,14 @@ under OpenGL graphics workloads.") (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-before 'build 'kernel-headers-are-system-headers + (lambda* (#:key inputs #:allow-other-keys) + (let ((kernel-headers (assoc-ref inputs "kernel-headers"))) + ;; Make sure the kernel headers are treated as system headers + ;; to suppress a conflict between "util.h" and . + (setenv "C_INCLUDE_PATH" (string-append kernel-headers "/include")) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From ceb831d33841d47f4b92c07829df9134853c83d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 14:44:37 +0100 Subject: gnu: libcap: Update to 2.26. * gnu/packages/linux.scm (libcap): Update to 2.26. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8dd8e947ed..24234b431f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1381,7 +1381,7 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.25") + (version "2.26") (source (origin (method url-fetch) (uri (string-append @@ -1389,7 +1389,7 @@ configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39")))) + "12s5b8fp61jcn4qld8a7fakcz1han4a6l3b8cyl3n6r7hk2bfc5n")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e02671939bcc4a38e13f68f58d4cb531150dde81 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 16:02:16 +0100 Subject: gnu: acl: Update to 2.2.53. * gnu/packages/patches/acl-hurd-path-max.patch, gnu/packages/patches/acl-fix-perl-regex.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/acl.scm (acl): Update to 2.2.53. [source](uri): Adjust for renamed tarball. [arguments]: Remove #:test-target. Adjust disabled tests. Don't override install phase. --- gnu/local.mk | 2 - gnu/packages/acl.scm | 24 ++++---- gnu/packages/patches/acl-fix-perl-regex.patch | 22 -------- gnu/packages/patches/acl-hurd-path-max.patch | 80 --------------------------- 4 files changed, 10 insertions(+), 118 deletions(-) delete mode 100644 gnu/packages/patches/acl-fix-perl-regex.patch delete mode 100644 gnu/packages/patches/acl-hurd-path-max.patch diff --git a/gnu/local.mk b/gnu/local.mk index 98074678ec..bcdb716c41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -627,8 +627,6 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ - %D%/packages/patches/acl-fix-perl-regex.patch \ - %D%/packages/patches/acl-hurd-path-max.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 8d5f0117f5..0131adcac4 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,21 +35,18 @@ (define-public acl (package (name "acl") - (version "2.2.52") + (version "2.2.53") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/acl/acl-" - version ".src.tar.gz")) + version ".tar.gz")) (sha256 (base32 - "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p")) - (patches (search-patches "acl-fix-perl-regex.patch" - "acl-hurd-path-max.patch")))) + "1ir6my3w74s6nfbgbqgzj6w570sn0qjf3524zx8xh67lqrjrigh6")))) (build-system gnu-build-system) (arguments - `(#:test-target "tests" - #:modules ((ice-9 ftw) + `(#:modules ((ice-9 ftw) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -75,13 +73,11 @@ (("\\| sed.*'") "")) ;; These tests require the existence of a user named "bin", but ;; this user does not exist within Guix's build environment. - (for-each (lambda (file) - (delete-file (string-append "test/" file))) - '("setfacl-X.test" "cp.test" "misc.test")) - #t)) - (replace 'install - (lambda _ - (invoke "make" "install" "install-lib" "install-dev")))))) + (substitute* "Makefile.in" + ((".*test/misc\\.test.*") "") + ((".*test/cp\\.test.*") "") + ((".*test/setfacl-X\\.test.*") "")) + #t))))) (inputs `(("attr" ,attr))) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/patches/acl-fix-perl-regex.patch b/gnu/packages/patches/acl-fix-perl-regex.patch deleted file mode 100644 index f682abc058..0000000000 --- a/gnu/packages/patches/acl-fix-perl-regex.patch +++ /dev/null @@ -1,22 +0,0 @@ -This can be removed with the next acl release - ---- - test/run | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/run b/test/run -index 2cf52e8..4627cd2 100755 ---- a/test/run -+++ b/test/run -@@ -70,7 +70,7 @@ for (;;) { - if (defined $line) { - # Substitute %VAR and %{VAR} with environment variables. - $line =~ s[%(\w+)][$ENV{$1}]eg; -- $line =~ s[%{(\w+)}][$ENV{$1}]eg; -+ $line =~ s[%\{(\w+)\}][$ENV{$1}]eg; - } - if (defined $line) { - if ($line =~ s/^\s*< ?//) { --- -2.15.0 - diff --git a/gnu/packages/patches/acl-hurd-path-max.patch b/gnu/packages/patches/acl-hurd-path-max.patch deleted file mode 100644 index 89cb3a38d7..0000000000 --- a/gnu/packages/patches/acl-hurd-path-max.patch +++ /dev/null @@ -1,80 +0,0 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636512 - -From: Svante Signell -Subject: acl: Fix FTBFS on hurd-i386 -Date: Wed, 03 Aug 2011 19:36:27 +0200 - -Currently acl does not compile on hurd-i386. The problem is a PATH_MAX -definition which is not supported on GNU/Hurd. - -Index: acl-2.2.52/setfacl/parse.c -=================================================================== ---- acl-2.2.52/setfacl/parse.c -+++ acl-2.2.52/setfacl/parse.c -@@ -419,7 +419,13 @@ read_acl_comments( - bytes for "# file: ". Not a good solution but for now it is the - best I can do without too much impact on the code. [tw] - */ -+ -+#ifdef __GNU__ -+ char *linebuf; -+ size_t dummy = 0; -+#else - char linebuf[(4*PATH_MAX)+9]; -+#endif - char *cp; - char *p; - int comments_read = 0; -@@ -449,9 +455,13 @@ read_acl_comments( - if (line) - (*line)++; - -+#ifdef __GNU__ -+ if (getline(&linebuf, &dummy, file) == -1) -+ break; -+#else - if (fgets(linebuf, sizeof(linebuf), file) == NULL) - break; -- -+#endif - comments_read = 1; - - p = strrchr(linebuf, '\0'); -@@ -473,7 +483,12 @@ read_acl_comments( - goto fail; - *path_p = (char*)malloc(strlen(cp)+1); - if (!*path_p) -+ { -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return -1; -+ } - strcpy(*path_p, cp); - } - } else if (strncmp(cp, "owner:", 6) == 0) { -@@ -522,13 +537,24 @@ read_acl_comments( - } - } - if (ferror(file)) -+ { -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return -1; -+ } -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return comments_read; - fail: - if (path_p && *path_p) { - free(*path_p); - *path_p = NULL; - } -+#ifdef __GNU__ -+ free (linebuf); -+#endif - return -EINVAL; - } - -- cgit v1.2.3 From 1130929acfff30b3f179e6bb949b1b7d78b85b69 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 16:05:04 +0100 Subject: gnu: attr: Update to 2.4.48. * gnu/packages/attr.scm (attr): Update to 2.4.48. [source](uri): Adjust for renamed tarball. [arguments]: Remove obsolete phases. [license]: Remove GPL2+ (see upstream commit 0fb61a4d20). --- gnu/packages/attr.scm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/gnu/packages/attr.scm b/gnu/packages/attr.scm index ff0a07aa67..3237376d40 100644 --- a/gnu/packages/attr.scm +++ b/gnu/packages/attr.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2012, 2013, 2016 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,28 +30,18 @@ (define-public attr (package (name "attr") - (version "2.4.47") + (version "2.4.48") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/attr/attr-" - version ".src.tar.gz")) + version ".tar.gz")) (sha256 (base32 - "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5")))) + "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'configure 'patch-makefile-SHELL - (lambda _ - (patch-makefile-SHELL "include/buildmacros") - #t)) - (replace 'install - (lambda _ - (invoke "make" - "install" - "install-lib" - "install-dev"))) (replace 'check (lambda* (#:key target #:allow-other-keys) ;; Use the right shell. @@ -80,4 +71,4 @@ (synopsis "Library and tools for manipulating extended attributes") (description "Portable library and tools for manipulating extended attributes.") - (license (list gpl2+ lgpl2.1+)))) + (license lgpl2.1+))) -- cgit v1.2.3 From 0e5f3282601f84b7dfba65cbc617c31629040223 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:41:21 +0100 Subject: gnu: OpenSSL@1.0: Update to 1.0.2r. * gnu/packages/tls.scm (openssl): Update to 1.0.2r. [replacement]: Remove. (openssl/fixed): Remove variable. --- gnu/packages/tls.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9cb2f7e7b0..7cc70fe0d6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -262,8 +262,7 @@ required structures.") (define-public openssl (package (name "openssl") - (replacement openssl/fixed) - (version "1.0.2q") + (version "1.0.2r") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -275,7 +274,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p")) + "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) @@ -381,15 +380,6 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define-public openssl/fixed - (hidden-package - (package - (inherit openssl) - (source (origin - (inherit (package-source openssl)) - (patches (append (origin-patches (package-source openssl)) - (search-patches "openssl-CVE-2019-1559.patch")))))))) - (define-public openssl-next (package (inherit openssl) -- cgit v1.2.3 From b9a30e0d37525e714a232318c26c7e4ef8250dc1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:41:43 +0100 Subject: gnu: efibootmgr: Fix build failure with GCC7. * gnu/packages/linux.scm (efibootmgr)[arguments]: Set C_INCLUDE_PATH. --- gnu/packages/linux.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed092e1c73..6049b09139 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4142,7 +4142,12 @@ interface to the variable facility of UEFI boot firmware.") ;; installed (known as OS_VENDOR in the code). ;; GRUB overrides this, as such it's only used if ;; nothing else is specified on the command line. - "EFIDIR=gnu") + "EFIDIR=gnu" + ;; Treat kernel headers as system headers to prevent + ;; warnings about conflicting types. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include")) #:phases (modify-phases %standard-phases (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 4aeb42b9f88a9191cfa5f7fed75143e0a03488c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 2 Mar 2019 22:19:37 +0200 Subject: gnu: bash: Update to patch level 2. * gnu/packages/bash.scm (%patch-series-5.0): Add patches 1 and 2. [source]: Apply patches. [version]: Update with patch numbers. --- gnu/packages/bash.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 9fd4b30e62..4a884e6175 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -61,7 +61,8 @@ ;; This is the current patches series for 5.0, generated using ;; 'download-patches' below. (patch-series - )) + (1 "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") + (2 "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of @@ -106,8 +107,10 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." "mirror://gnu/bash/bash-" version ".tar.gz")) (sha256 (base32 - "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")))) - (version version) + "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l")) + (patch-flags '("-p0")) + (patches %patch-series-5.0))) + (version (string-append version "." (number->string (length %patch-series-5.0)))) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From ed709ee954817486a5021b182b539dafa80549fb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 13:02:05 +0100 Subject: gnu: Python@2: Update to 2.7.16. * gnu/packages/patches/python2-CVE-2018-1000802.patch, gnu/packages/patches/python2-CVE-2018-14647.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python.scm (python-2.7): Update to 2.7.16. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - .../patches/python2-CVE-2018-1000802.patch | 47 ----------------- gnu/packages/patches/python2-CVE-2018-14647.patch | 61 ---------------------- gnu/packages/python.scm | 8 ++- 4 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 gnu/packages/patches/python2-CVE-2018-1000802.patch delete mode 100644 gnu/packages/patches/python2-CVE-2018-14647.patch diff --git a/gnu/local.mk b/gnu/local.mk index 52df157a95..64d4324607 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1161,8 +1161,6 @@ dist_patch_DATA = \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ %D%/packages/patches/pyqt-public-sip.patch \ - %D%/packages/patches/python2-CVE-2018-14647.patch \ - %D%/packages/patches/python2-CVE-2018-1000802.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/python2-CVE-2018-1000802.patch b/gnu/packages/patches/python2-CVE-2018-1000802.patch deleted file mode 100644 index 0d5bc77c84..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-1000802.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix CVE-2018-1000802: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000802 - -Taken from upstream commit (sans NEWS): -https://github.com/python/cpython/commit/d8b103b8b3ef9644805341216963a64098642435 - -diff --git a/Lib/shutil.py b/Lib/shutil.py -index 3462f7c5e9..0ab1a06f52 100644 ---- a/Lib/shutil.py -+++ b/Lib/shutil.py -@@ -413,17 +413,21 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, - - return archive_name - --def _call_external_zip(base_dir, zip_filename, verbose=False, dry_run=False): -+def _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger): - # XXX see if we want to keep an external call here - if verbose: - zipoptions = "-r" - else: - zipoptions = "-rq" -- from distutils.errors import DistutilsExecError -- from distutils.spawn import spawn -+ cmd = ["zip", zipoptions, zip_filename, base_dir] -+ if logger is not None: -+ logger.info(' '.join(cmd)) -+ if dry_run: -+ return -+ import subprocess - try: -- spawn(["zip", zipoptions, zip_filename, base_dir], dry_run=dry_run) -- except DistutilsExecError: -+ subprocess.check_call(cmd) -+ except subprocess.CalledProcessError: - # XXX really should distinguish between "couldn't find - # external 'zip' command" and "zip failed". - raise ExecError, \ -@@ -458,7 +462,7 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): - zipfile = None - - if zipfile is None: -- _call_external_zip(base_dir, zip_filename, verbose, dry_run) -+ _call_external_zip(base_dir, zip_filename, verbose, dry_run, logger) - else: - if logger is not None: - logger.info("creating '%s' and adding '%s' to it", diff --git a/gnu/packages/patches/python2-CVE-2018-14647.patch b/gnu/packages/patches/python2-CVE-2018-14647.patch deleted file mode 100644 index 6226b06aca..0000000000 --- a/gnu/packages/patches/python2-CVE-2018-14647.patch +++ /dev/null @@ -1,61 +0,0 @@ -Fix CVE-2018-14647: -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647 -https://bugs.python.org/issue34623 - -Taken from upstream: -https://github.com/python/cpython/commit/18b20bad75b4ff0486940fba4ec680e96e70f3a2 - -diff --git a/Include/pyexpat.h b/Include/pyexpat.h -index 5340ef5fa3..3fc5fa54da 100644 ---- a/Include/pyexpat.h -+++ b/Include/pyexpat.h -@@ -3,7 +3,7 @@ - - /* note: you must import expat.h before importing this module! */ - --#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" -+#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" - #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" - - struct PyExpat_CAPI -@@ -43,6 +43,8 @@ struct PyExpat_CAPI - XML_Parser parser, XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - void (*SetUserData)(XML_Parser parser, void *userData); -+ /* might be none for expat < 2.1.0 */ -+ int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); - /* always add new stuff to the end! */ - }; - -diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c -index f7f992dd3a..b38e0ab329 100644 ---- a/Modules/_elementtree.c -+++ b/Modules/_elementtree.c -@@ -2574,6 +2574,11 @@ xmlparser(PyObject* self_, PyObject* args, PyObject* kw) - PyErr_NoMemory(); - return NULL; - } -+ /* expat < 2.1.0 has no XML_SetHashSalt() */ -+ if (EXPAT(SetHashSalt) != NULL) { -+ EXPAT(SetHashSalt)(self->parser, -+ (unsigned long)_Py_HashSecret.prefix); -+ } - - ALLOC(sizeof(XMLParserObject), "create expatparser"); - -diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c -index 2b4d31293c..1f8c0d70a5 100644 ---- a/Modules/pyexpat.c -+++ b/Modules/pyexpat.c -@@ -2042,6 +2042,11 @@ MODULE_INITFUNC(void) - capi.SetProcessingInstructionHandler = XML_SetProcessingInstructionHandler; - capi.SetUnknownEncodingHandler = XML_SetUnknownEncodingHandler; - capi.SetUserData = XML_SetUserData; -+#if XML_COMBINED_VERSION >= 20100 -+ capi.SetHashSalt = XML_SetHashSalt; -+#else -+ capi.SetHashSalt = NULL; -+#endif - - /* export using capsule */ - capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL); diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9ed16d447e..0a483fb1db 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -94,7 +94,7 @@ (define-public python-2.7 (package (name "python2") - (version "2.7.15") + (version "2.7.16") (source (origin (method url-fetch) @@ -102,14 +102,12 @@ version "/Python-" version ".tar.xz")) (sha256 (base32 - "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92")) + "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj")) (patches (search-patches "python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" "python-2.7-source-date-epoch.patch" - "python-2.7-adjust-tests.patch" - "python2-CVE-2018-14647.patch" - "python2-CVE-2018-1000802.patch")) + "python-2.7-adjust-tests.patch")) (modules '((guix build utils))) ;; suboptimal to delete failing tests here, but if we delete them in the ;; arguments then we need to make sure to strip out that phase when it -- cgit v1.2.3 From 08eba545f1551157d4b24877a8f6f167d7957d3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:06:27 +0100 Subject: gnu: python-py: Update to 1.8.0. * gnu/packages/python-xyz.scm (python-py): Update to 1.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd754e10fd..afb74859bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1526,14 +1526,14 @@ server.") (define-public python-py (package (name "python-py") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "152nyjvd8phqbm9pwlnfx0xi4c6343hakjzg42sp4qw3k1qn74mz")))) + "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From d0cba11bc568a75070cae19fe3aed14ae8a524b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:08:59 +0100 Subject: gnu: python-pyflakes: Update to 2.1.1. * gnu/packages/python-xyz.scm (python-pyflakes): Update to 2.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afb74859bb..46f71ccbfa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5652,14 +5652,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "2.0.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "0jba28czyvimdc72llms3f17swp3i8jdcabf5w0j00adfbn64xls")))) + "18pq95a1xj2dgdd0m85gyfsn40jajj4xc3lp8wfv7igqhrc86xnr")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") -- cgit v1.2.3 From b86b79960174eea6b16e4b8baa0e3d0d12310332 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:09:59 +0100 Subject: gnu: python-pluggy: Update to 0.9.0. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46f71ccbfa..0fa5d45a0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7800,14 +7800,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d")))) + "13yg2q0wgcb4l8lgdvcnzqa8db5lrw3nwn50lxjy1z5jkp7gkv0r")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From c49c71cd2c6c74595f093b9d3bbad5d07865c5f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:10:58 +0100 Subject: gnu: python-pytest-runner: Update to 4.4. * gnu/packages/check.scm (python-pytest-runner): Update to 4.4. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3d0cf8a297..65faaee6ea 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -774,14 +774,14 @@ supports coverage of subprocesses.") (define-public python-pytest-runner (package (name "python-pytest-runner") - (version "4.2") + (version "4.4") (source (origin (method url-fetch) (uri (pypi-uri "pytest-runner" version)) (sha256 (base32 - "1gkpyphawxz38ni1gdq1fmwyqcg02m7ypzqvv46z06crwdxi2gyj")))) + "1x0d9n40lsiphblbs61rdc0d5r31f6vh0vcahqdv0mffakbnrb80")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest-bootstrap) -- cgit v1.2.3 From d9ea7a734db21d5b608bd8ee30359b1ef44c1d25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:12:35 +0100 Subject: gnu: python-hypothesis: Update to 4.7.19. * gnu/packages/check.scm (python-hypothesis): Update to 4.7.19. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 65faaee6ea..03e6c5fcd0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1474,13 +1474,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "4.5.3") + (version "4.7.19") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c")))) + "18740bkpvj4ygmvzxnhakxdmj2igvgyayczyajll9gz5x47d9mjy")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From 1a246c01c6d573b6226fd273f648d231e6ec38f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:13:18 +0100 Subject: gnu: python-pytest: Update to 4.3.0. * gnu/packages/patches/python-pytest-pluggy-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/check.scm (python-pytest): Update to 4.3.0. [source](patches): New field. [arguments]: Skip five new tests. Disable tests by passing them as arguments. --- gnu/local.mk | 1 + gnu/packages/check.scm | 32 ++++++----- .../patches/python-pytest-pluggy-compat.patch | 64 ++++++++++++++++++++++ 3 files changed, 83 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/python-pytest-pluggy-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 64d4324607..de352884a1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1182,6 +1182,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ + %D%/packages/patches/python-pytest-pluggy-compat.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 03e6c5fcd0..20132492a7 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -660,31 +660,35 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.8.0") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) + (patches (search-patches "python-pytest-pluggy-compat.patch")) (sha256 (base32 - "17grcfvd6ggvvqmprwv5y8g319nayam70hr43ssjwj40ws27z858")))) + "077gzimi9xiiyzpc3xjpb5yfgz038xkldg91mmbdvzr7z15isyh6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'check 'disable-invalid-tests + (replace 'check (lambda _ - ;; Some tests involves the /usr directory, and fails. - (substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix\\(self\\):") - "@pytest.mark.xfail\n def test_remove_dir_prefix(self):")) - (substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix" line) - (string-append "@pytest.mark.skip" - "(reason=\"Assumes that /usr exists.\")\n " - line))) - #t)) - (replace 'check (lambda _ (invoke "pytest" "-vv")))))) + (invoke "pytest" "-vv" "-k" + (string-append + ;; These tests involve the /usr directory, and fails. + "not test_remove_dir_prefix" + " and not test_argcomplete" + ;; This test tries to override PYTHONPATH, and + ;; subsequently fails to locate the test libraries. + " and not test_collection" + ;; These tests fail when run in verbose mode: + ;; . + " and not test_dont_rewrite_if_hasattr_fails" + " and not test_len" + " and not test_custom_repr" + " and not test_name"))))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-attrs" ,python-attrs-bootstrap) diff --git a/gnu/packages/patches/python-pytest-pluggy-compat.patch b/gnu/packages/patches/python-pytest-pluggy-compat.patch new file mode 100644 index 0000000000..ac33b862e6 --- /dev/null +++ b/gnu/packages/patches/python-pytest-pluggy-compat.patch @@ -0,0 +1,64 @@ +Fix test failures when built against Pluggy 0.9. + +Taken from this upstream commit: +https://github.com/pytest-dev/pytest/commit/a68f4fd2b9e99c82476d0e04ebcf561aeddbcb2e + +diff --git a/testing/test_assertion.py b/testing/test_assertion.py +index b659233eb..e4fe56c6f 100644 +--- a/testing/test_assertion.py ++++ b/testing/test_assertion.py +@@ -209,7 +209,7 @@ def load(self, require=True, *args, **kwargs): + import spamplugin + return spamplugin + +- def iter_entry_points(name): ++ def iter_entry_points(group, name=None): + yield DummyEntryPoint() + + pkg_resources.iter_entry_points = iter_entry_points +diff --git a/testing/test_config.py b/testing/test_config.py +index f9f22a63e..1e29b83f1 100644 +--- a/testing/test_config.py ++++ b/testing/test_config.py +@@ -514,8 +514,8 @@ def test_preparse_ordering_with_setuptools(testdir, monkeypatch): + pkg_resources = pytest.importorskip("pkg_resources") + monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) + +- def my_iter(name): +- assert name == "pytest11" ++ def my_iter(group, name=None): ++ assert group == "pytest11" + + class Dist(object): + project_name = "spam" +@@ -552,8 +552,8 @@ def test_setuptools_importerror_issue1479(testdir, monkeypatch): + pkg_resources = pytest.importorskip("pkg_resources") + monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) + +- def my_iter(name): +- assert name == "pytest11" ++ def my_iter(group, name=None): ++ assert group == "pytest11" + + class Dist(object): + project_name = "spam" +@@ -583,8 +583,8 @@ def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block + + plugin_module_placeholder = object() + +- def my_iter(name): +- assert name == "pytest11" ++ def my_iter(group, name=None): ++ assert group == "pytest11" + + class Dist(object): + project_name = "spam" +@@ -621,7 +621,7 @@ def load(self): + def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, should_load): + pkg_resources = pytest.importorskip("pkg_resources") + +- def my_iter(name): ++ def my_iter(group, name=None): + raise AssertionError("Should not be called") + + class PseudoPlugin(object): -- cgit v1.2.3 From 6c58a06e796962720c02ba50651d26acfbcbd269 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:16:51 +0100 Subject: gnu: python-six: Update to 1.12.0. * gnu/packages/python-xyz.scm (python-six): Update to 1.12.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0fa5d45a0d..7d4498f285 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -872,14 +872,14 @@ from the Python interpreter, or as a small part of a larger application.") (define-public python-six (package (name "python-six") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (pypi-uri "six" version)) (sha256 (base32 - "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h")))) + "0wxs1q74v07ssjywbbm7x6h5v9qx209ld2yfsif4060sxi0h2sni")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From beaff4a8a991fc04b5298d86be70490a718b80dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:17:11 +0100 Subject: gnu: python-flake8: Update to 3.7.7. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.7.7. [propagated-inputs]: Add PYTHON-ENTRYPOINTS. (python2-flake8)[propagated-inputs]: Add PYTHON2-TYPING. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7d4498f285..af3c5a4667 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5751,13 +5751,13 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.6.0") + (version "3.7.7") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) + "0qg6zggqigrd4k3gv88shd1a27d0cwgfql8vfiq2c7rl7w3rd6c5")))) (build-system python-build-system) (arguments `(#:phases @@ -5770,6 +5770,7 @@ complexity of Python source code.") #t))))) (propagated-inputs `(("python-pycodestyle" ,python-pycodestyle) + ("python-entrypoints" ,python-entrypoints) ("python-pyflakes" ,python-pyflakes) ("python-mccabe" ,python-mccabe))) (native-inputs @@ -5790,6 +5791,7 @@ complexity of Python source code.") (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) + ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) ;; python-hacking requires flake8 <2.6.0. -- cgit v1.2.3 From 7b43d3a7c1204cd89d3009abef8b908c9999b762 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:37:51 +0100 Subject: gnu: python-zope-event: Update to 4.4. * gnu/packages/python-web.scm (python-zope-event): Update to 4.4. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4b84594b2a..198795db24 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -872,14 +872,14 @@ object to help create WSGI responses.") (define-public python-zope-event (package (name "python-zope-event") - (version "4.1.0") + (version "4.4") (source (origin (method url-fetch) (uri (pypi-uri "zope.event" version)) (sha256 (base32 - "11p75zpfz3ffhz21nzx9wb23xs993ck5s6hkjcvhswwizni5jynw")))) + "1ksbc726av9xacml6jhcfyn828hlhb9xlddpx6fcvnlvmpmpvhk9")))) (build-system python-build-system) (home-page "https://pypi.python.org/pypi/zope.event") (synopsis "Event publishing system for Python") -- cgit v1.2.3 From b87fc008aaa8bbc99c62fcbccf77e0356acba6b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:38:12 +0100 Subject: gnu: python-zope-interface: Update to 4.6.0. * gnu/packages/python-web.scm (python-zope-interface): Update to 4.6.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 198795db24..cf04c06541 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -895,14 +895,14 @@ dispatching systems can be built.") (define-public python-zope-interface (package (name "python-zope-interface") - (version "4.1.3") + (version "4.6.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.interface" version)) (sha256 (base32 - "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if")))) + "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v")))) (build-system python-build-system) (native-inputs `(("python-zope-event" ,python-zope-event))) -- cgit v1.2.3 From ce1706b1bd7c4d085ea050fff038a811e3b2df10 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:38:58 +0100 Subject: gnu: python-pympler: Update to 0.6. * gnu/packages/python-xyz.scm (python-pympler): Update to 0.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index af3c5a4667..5043f87c6f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1980,13 +1980,13 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "03qwsbilqgvnbl3a1jmpgixbr2kq6m3fvdlzyr3wdp01bwlc85kx")))) + "19qkpaw5icwhb4c0f6ijqfmhwhj34k2k6s4m4fsvhrxc9p5cwqn2")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From a6184bee6fd01c6cfac5b51d1020a8ba6d9c61de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:41:54 +0100 Subject: gnu: python-attrs-bootstrap: Update to 18.2.0. * gnu/packages/python-xyz.scm (python-attrs-bootstrap)[version, source]: Remove. --- gnu/packages/python-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5043f87c6f..e86698fd5b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11237,15 +11237,6 @@ protocols.") (package (inherit python-attrs) (name "python-attrs-bootstrap") - ;; Keep this on a fixed version so python-attrs can be updated without - ;; triggering a mass-rebuild. FIXME: Update this in the next rebuild cycle. - (version "17.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "attrs" version)) - (sha256 - (base32 - "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w")))) (native-inputs `()) (arguments `(#:tests? #f)))) -- cgit v1.2.3 From c41d5144cf9affce02b7252493e3ac4b93a2f745 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:43:06 +0100 Subject: gnu: python-attrs: Update to 19.1.0. * gnu/packages/python-xyz.scm (python-attrs): Update to 19.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e86698fd5b..e3917f5a1c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11189,13 +11189,13 @@ and bit flag values.") (define-public python-attrs (package (name "python-attrs") - (version "18.2.0") + (version "19.1.0") (source (origin (method url-fetch) (uri (pypi-uri "attrs" version)) (sha256 (base32 - "0s9ydh058wmmf5v391pym877x4ahxg45dw6a0w4c7s5wgpigdjqh")))) + "16g33zr5f449lqc5wgvzpknxryfzrfsxcr6kpgxwn7l5fkv71f7h")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 4c97f959021ce772a3162d17ec8b7aa13905fd85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:47:17 +0100 Subject: gnu: python-pytz: Update to 2018.9. * gnu/packages/time.scm (python-pytz): Update to 2018.9. --- gnu/packages/time.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index e67960db0d..04dbd8f002 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -92,14 +92,14 @@ to a file.") (define-public python-pytz (package (name "python-pytz") - (version "2018.5") + (version "2018.9") (source (origin (method url-fetch) - (uri (pypi-uri "pytz" version ".tar.gz")) + (uri (pypi-uri "pytz" version)) (sha256 (base32 - "0xzj5gkpdn2da8m6j47chlp6zrzcypv9m0fjv4236q3jw4fyzfgz")))) + "0k1pqnq3c4gvcspjxf3fschdjn71fk89i4wz801rxqh7f145xw6m")))) (build-system python-build-system) (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") -- cgit v1.2.3 From 1a4bb420a7485a389e46cd793f4a4d6ca4209462 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 20:19:51 +0100 Subject: gnu: python-fonttools: Update to 3.38.0. * gnu/packages/python-xyz.scm (python-fonttools): Update to 3.38.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3917f5a1c..0a5b24e79d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6021,13 +6021,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.37.3") + (version "3.38.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0k90g0q1h4var3kq6xn6zs3j1ghff97hwyn1gdqfdywsldas9668")))) + "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From dd7ce8643a28f5d633c5f3124de6be897cd5065f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 21:36:41 +0100 Subject: gnu: pcre: Update to 8.43. * gnu/packages/pcre.scm (pcre): Update to 8.43. --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index f46f7e3775..0f9d590476 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -35,7 +35,7 @@ (define-public pcre (package (name "pcre") - (version "8.42") + (version "8.43") (source (origin (method url-fetch) (uri (list @@ -46,7 +46,7 @@ version "/pcre-" version ".tar.bz2"))) (sha256 (base32 - "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c")))) + "0sxg1wlknq05ryq63h21cchjmcjkin9lmnqsmhs3h08301965rwi")))) (build-system gnu-build-system) (outputs '("out" ;library & headers "bin" ;depends on Readline (adds 20MiB to the closure) -- cgit v1.2.3 From b9cb310468520928d39aabff4ea1cf76ad8dd92e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 12:59:32 +0100 Subject: gnu: libatomic-ops: Update to 7.6.10. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.10. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index d816b66615..041e142ded 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -91,7 +91,7 @@ C or C++ programs, though that is not its primary goal.") (define-public libatomic-ops (package (name "libatomic-ops") - (version "7.6.8") + (version "7.6.10") (source (origin (method url-fetch) (uri (string-append @@ -99,7 +99,7 @@ C or C++ programs, though that is not its primary goal.") version "/libatomic_ops-" version ".tar.gz")) (sha256 (base32 - "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx")))) + "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq")))) (build-system gnu-build-system) (outputs '("out" "debug")) (synopsis "Accessing hardware atomic memory update operations") -- cgit v1.2.3 From b0f5ec4ffb9fd509c84c0fcf125b2e038e543ebc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 13:00:08 +0100 Subject: gnu: libgc: Update to 7.6.12. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.12. [arguments]: Add phase to avoid libatomic-ops propagation. --- gnu/packages/bdw-gc.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 041e142ded..7196ffcd32 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016, 2018 Leo Famulari ;;; Copyright © 2017 Rene Saavedra +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,14 +31,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.8") + (version "7.6.12") (source (origin (method url-fetch) (uri (string-append "https://github.com/ivmai/bdwgc/releases" "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4")))) + "10jhhi79d5brwlsyhwgpnrmc8nhlf7aan2lk9xhgihk5jc6srbvc")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -53,7 +54,19 @@ ,@(if (hurd-triplet? (or (%current-system) (%current-target-system))) '("--disable-gcj-support") - '())))) + '())) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-pc-file + (lambda* (#:key inputs #:allow-other-keys) + (let ((libatomic-ops (assoc-ref inputs "libatomic-ops"))) + ;; GC 7.6.10 and later includes -latomic_ops in the + ;; pkg-config file. To avoid propagation, insert an + ;; absolute reference so dependent programs can find it. + (substitute* "bdw-gc.pc.in" + (("@ATOMIC_OPS_LIBS@" match) + (string-append "-L" libatomic-ops "/lib " + match))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("libatomic-ops" ,libatomic-ops))) (outputs '("out" "debug")) -- cgit v1.2.3 From e74f153a10ca387a50c3acaf685981048c1bdb70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 1 Mar 2019 17:52:57 +0100 Subject: gnu: Use OpenSSL 1.1 as the default OpenSSL package. * gnu/packages/tls.scm (openssl-next): Delete variable. Move related code ... (openssl) ... here. (openssl-1.0): New public variable. Retain old arguments. * gnu/packages/crypto.scm (asignify)[inputs]: Change OPENSSL-NEXT to OPENSSL. * gnu/packages/databases.scm (mariadb)[inputs]: Change from OPENSSL to OPENSSL-1.0. * gnu/packages/node.scm (node)[inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[inputs]: Likewise. --- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/node.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/tls.scm | 211 ++++++++++++++++++++++----------------------- 5 files changed, 106 insertions(+), 113 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index cc09f4abe1..cfd1df123d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -817,7 +817,7 @@ security.") ("automake" ,automake) ("libtool" ,libtool))) (inputs - `(("openssl" ,openssl-next))) + `(("openssl" ,openssl))) (home-page "https://github.com/vstakhov/asignify") (synopsis "Cryptographic authentication and encryption tool and library") (description "Asignify offers public cryptographic signatures and diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f63257034f..e151a5d9e2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -671,7 +671,7 @@ Language.") ("zlib" ,zlib))) (propagated-inputs ;; mariadb.pc says -lssl -lcrypto, so propagate it. - `(("openssl" ,openssl))) + `(("openssl" ,openssl-1.0))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. (properties '((timeout . 64800))) ;18 hours diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a0221601dd..2772f56d9f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -186,7 +186,7 @@ ("icu4c" ,icu4c) ("libuv" ,libuv-1.19) ("nghttp2" ,nghttp2 "lib") - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("zlib" ,zlib))) (synopsis "Evented I/O for V8 JavaScript") (description "Node.js is a platform built on Chrome's JavaScript runtime diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 2c9668c2f2..abd873aefa 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -400,7 +400,7 @@ test = { path = \"../libtest\" } (inputs `(("jemalloc" ,jemalloc-4.5.0) ("llvm" ,llvm-3.9.1) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("libssh2" ,libssh2) ; For "cargo" ("libcurl" ,curl))) ; For "cargo" diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f736447523..1ab9ec5a54 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2018 Nils Gillmann ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur @@ -262,7 +262,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2r") + (version "1.1.1b") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -274,13 +274,12 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) - (patches (search-patches "openssl-runpath.patch" - "openssl-c-rehash-in.patch")))) + "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw")) + (patches (search-patches "openssl-1.1-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" - "doc" ;1.5MiB of man3 pages - "static")) ;6MiB of .a files + "doc" ;6.8 MiB of man3 pages and full HTML documentation + "static")) ;6.4 MiB of .a files (native-inputs `(("perl" ,perl))) (arguments `(#:disallowed-references (,perl) @@ -293,31 +292,27 @@ required structures.") #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases - (add-before - 'configure 'patch-Makefile.org - (lambda* (#:key outputs #:allow-other-keys) - ;; The default MANDIR is some unusual place. Fix that. - (let ((out (assoc-ref outputs "out"))) - (patch-makefile-SHELL "Makefile.org") - (substitute* "Makefile.org" - (("^MANDIR[[:blank:]]*=.*$") - (string-append "MANDIR = " out "/share/man\n"))) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + ;; It's not a shebang so patch-source-shebangs misses it. + (substitute* "config" + (("/usr/bin/env") + (string-append (assoc-ref %build-inputs "coreutils") + "/bin/env"))) + (invoke "./config" + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out) + (string-append "-Wl,-rpath," lib))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -330,31 +325,20 @@ required structures.") (delete-file file)) (find-files lib "\\.a$")) #t))) - (add-after 'install 'move-man3-pages + (add-after 'install 'move-extra-documentation (lambda* (#:key outputs #:allow-other-keys) - ;; Move section 3 man pages to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (doc (assoc-ref outputs "doc")) - (target (string-append doc "/share/man/man3"))) - (mkdir-p target) - (for-each (lambda (file) - (rename-file file - (string-append target "/" - (basename file)))) - (find-files man3)) - (delete-file-recursively man3) - #t))) - (add-before - 'patch-source-shebangs 'patch-tests - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) - (substitute* (find-files "test" ".*") - (("/bin/sh") - (string-append bash "/bin/sh")) - (("/bin/rm") - "rm")) - #t))) + ;; Move man3 pages and full HTML documentation to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (html (string-append out "/share/doc/openssl")) + (doc (assoc-ref outputs "doc")) + (man-target (string-append doc "/share/man/man3")) + (html-target (string-append doc "/share/doc/openssl"))) + (copy-recursively man3 man-target) + (delete-file-recursively man3) + (copy-recursively html html-target) + (delete-file-recursively html) + #t))) (add-after 'install 'remove-miscellany (lambda* (#:key outputs #:allow-other-keys) @@ -380,72 +364,81 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define-public openssl-next +(define-public openssl-1.0 (package (inherit openssl) (name "openssl") - (version "1.1.1b") + (version "1.0.2r") (source (origin - (method url-fetch) - (uri (list (string-append "https://www.openssl.org/source/openssl-" - version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/" - "openssl-" version ".tar.gz") - (string-append "ftp://ftp.openssl.org/source/old/" - (string-trim-right version char-set:letter) - "/openssl-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1-c-rehash-in.patch")) + (method url-fetch) + (uri (list (string-append "https://www.openssl.org/source/openssl-" + version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/" + "openssl-" version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/old/" + (string-trim-right version char-set:letter) + "/openssl-" version ".tar.gz"))) (sha256 (base32 - "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw")))) + "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) + (patches (search-patches "openssl-runpath.patch" + "openssl-c-rehash-in.patch")))) (outputs '("out" - "doc" ; 6.8 MiB of man3 pages and full HTML documentation - "static")) ; 6.4 MiB of .a files + "doc" ;1.5MiB of man3 pages + "static")) ;6MiB of .a files (arguments (substitute-keyword-arguments (package-arguments openssl) ((#:phases phases) `(modify-phases ,phases - (delete 'patch-tests) ; These two phases are not needed by - (delete 'patch-Makefile.org) ; OpenSSL 1.1. - - ;; Override configure phase since -rpath is now a configure option. - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - ;; It's not a shebang so patch-source-shebangs misses it. - (substitute* "config" - (("/usr/bin/env") - (string-append (assoc-ref %build-inputs "coreutils") - "/bin/env"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib))))) - - (delete 'move-man3-pages) - (add-after 'install 'move-extra-documentation + (add-before 'patch-source-shebangs 'patch-tests + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) + (substitute* (find-files "test" ".*") + (("/bin/sh") + (string-append bash "/bin/sh")) + (("/bin/rm") + "rm")) + #t))) + (add-before 'configure 'patch-Makefile.org (lambda* (#:key outputs #:allow-other-keys) - ;; Move man3 pages and full HTML documentation to "doc". - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3")) - (html (string-append out "/share/doc/openssl")) - (doc (assoc-ref outputs "doc")) - (man-target (string-append doc "/share/man/man3")) - (html-target (string-append doc "/share/doc/openssl"))) - (copy-recursively man3 man-target) - (delete-file-recursively man3) - (copy-recursively html html-target) - (delete-file-recursively html) + ;; The default MANDIR is some unusual place. Fix that. + (let ((out (assoc-ref outputs "out"))) + (patch-makefile-SHELL "Makefile.org") + (substitute* "Makefile.org" + (("^MANDIR[[:blank:]]*=.*$") + (string-append "MANDIR = " out "/share/man\n"))) #t))) + (replace 'configure + ;; Override this phase because OpenSSL 1.0 does not understand -rpath. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./config" + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out))))) + (delete 'move-extra-documentation) + (add-after 'install 'move-man3-pages + (lambda* (#:key outputs #:allow-other-keys) + ;; Move section 3 man pages to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (doc (assoc-ref outputs "doc")) + (target (string-append doc "/share/man/man3"))) + (mkdir-p target) + (for-each (lambda (file) + (rename-file file + (string-append target "/" + (basename file)))) + (find-files man3)) + (delete-file-recursively man3) + #t))) ;; XXX: Duplicate this phase to make sure 'version' evaluates ;; in the current scope and not the inherited one. (replace 'remove-miscellany -- cgit v1.2.3 From e8393ebe46d9ad09aceb152618db490378ba5ded Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 14:39:17 +0100 Subject: gnu: c-ares: Update to 1.15.0. * gnu/packages/adns.scm (c-ares): Update to 1.15.0. (c-ares-next): Remove variable. --- gnu/packages/adns.scm | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 28a65667eb..f6df825e7c 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -59,32 +59,6 @@ scripts.") (license gpl3+))) (define-public c-ares - (package - (name "c-ares") - (version "1.14.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://c-ares.haxx.se/download/" name "-" version - ".tar.gz")) - (sha256 - (base32 - "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://c-ares.haxx.se/") - (synopsis "C library for asynchronous DNS requests") - (description - "C-ares is a C library that performs DNS requests and name resolution -asynchronously. It is intended for applications which need to perform DNS -queries without blocking, or need to perform multiple DNS queries in parallel. -The primary examples of such applications are servers which communicate with -multiple clients and programs with graphical user interfaces.") - (license (x11-style "https://c-ares.haxx.se/license.html")))) - -;; XXX: temporary package for tensorflow / grpc -(define-public c-ares-next (package (name "c-ares") (version "1.15.0") @@ -96,11 +70,7 @@ multiple clients and programs with graphical user interfaces.") (sha256 (base32 "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; some tests seem to require Internet connection - #:configure-flags - (list "-DCARES_BUILD_TESTS=ON"))) + (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://c-ares.haxx.se/") -- cgit v1.2.3 From 9ded89fd7c064ce360d5dd13343d0f06cd48a1a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 14:40:09 +0100 Subject: gnu: nasm: Update to 2.14.02. * gnu/packages/assembly.scm (nasm): Update to 2.14.02. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 00ed00e1c1..6cb23ce2a8 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -38,14 +38,14 @@ (define-public nasm (package (name "nasm") - (version "2.13.03") + (version "2.14.02") (source (origin (method url-fetch) (uri (string-append "http://www.nasm.us/pub/nasm/releasebuilds/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0wr58pb2wnyihcl6635hlx98fnscx5yirxm8m84x8nxwvjqcybl1")))) + "1xg8dfr49py15vbwk1rzcjc3zpqydmr49ahlijm56wlgj8zdwjp2")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;for doc and test target ("texinfo" ,texinfo))) -- cgit v1.2.3 From 97e537c3c759d884ae06611de79969ff51827801 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 16:19:46 +0100 Subject: gnu: lz4: Update to 1.8.3. * gnu/packages/compression.scm (lz4): Update to 1.8.3. [arguments]: Add phase 'disable-broken-test'. --- gnu/packages/compression.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fff765f69d..2b82e2274c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -722,7 +722,7 @@ decompression of some loosely related file formats used by Microsoft.") (define-public lz4 (package (name "lz4") - (version "1.8.1.2") + (version "1.8.3") (source (origin (method git-fetch) @@ -730,16 +730,23 @@ decompression of some loosely related file formats used by Microsoft.") (commit (string-append "v" version)))) (sha256 (base32 - "1jggv4lvfav53advnj0pwqgxzn868lrj8dc9zp73iwvqlj82mhmx")) + "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g")) (file-name (git-file-name name version)))) (build-system gnu-build-system) - (native-inputs `(("valgrind" ,valgrind))) ; for tests + (native-inputs `(("valgrind" ,valgrind))) ;for tests (arguments `(#:test-target "test" #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; no configure script + (delete 'configure) ;no configure script + (add-before 'check 'disable-broken-test + (lambda _ + ;; XXX: test_install.sh fails when prefix is a subdirectory. + (substitute* "tests/Makefile" + (("^test: (.*) test-install" _ targets) + (string-append "test: " targets))) + #t))))) (home-page "https://www.lz4.org") (synopsis "Compression algorithm focused on speed") (description "LZ4 is a lossless compression algorithm, providing -- cgit v1.2.3 From 3d3694079d24756c6963d3e81d5341d6e536a450 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 20:25:00 +0100 Subject: gnu: python-chardet: Disable tests. * gnu/packages/python-xyz.scm (python-chardet)[arguments]: New field. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46339c1abb..f5bc442a35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7160,6 +7160,8 @@ simulation, statistical modeling, machine learning and much more.") ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (build-system python-build-system) + ;; XXX: Incompatible with Pytest 4: . + (arguments `(#:tests? #f)) (home-page "https://github.com/chardet/chardet") (synopsis "Universal encoding detector for Python 2 and 3") (description -- cgit v1.2.3 From 8acd1e90c5032d8bbcb0cdebc7f659ebdf442802 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 20:32:56 +0100 Subject: gnu: python-babel: Disable tests that are incompatible with Pytest 4. * gnu/packages/python-xyz.scm (python-babel)[arguments]: Expand pytest invokation. --- gnu/packages/python-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f5bc442a35..bf2fc56294 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -302,7 +302,14 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "pytest" "-vv")))))) + (lambda _ + (invoke "pytest" "-vv" "-k" + (string-append + ;; XXX: These tests fail when using Pytest 4.x and + ;; Babel 2.6.0. Try removing this for later versions. + "not test_no_inherit_metazone_marker_never_in_output" + " and not test_smoke_dates" + " and not test_smoke_numbers"))))))) (home-page "http://babel.pocoo.org/") (synopsis "Tools for internationalizing Python applications") -- cgit v1.2.3 From e1e89e2628b754da7823274d46bdef2a49539ca7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Mar 2019 16:32:24 +0100 Subject: gnu: nghttp2: Update to 1.37.0. * gnu/packages/web.scm (nghttp2): Update to 1.37.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0266e99e26..8dd6d6cc2b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6279,7 +6279,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.36.0") + (version "1.37.0") (source (origin (method url-fetch) @@ -6288,7 +6288,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "1z47hadp5gpspfn41dj4mb0m5fzbkw1jw8sahjkabvc8gcaqdfz9")))) + "1ds7ilgdsq1dykp285cxrl17xsgkxp0a2413wcgvkx0p9cb0n2da")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From 5a457656284cfb25e9305362e18adf4aff13f91a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Mar 2019 18:08:33 +0100 Subject: gnu: python-mako: Fix FTBFS with Pytest 4. * gnu/packages/python-xyz.scm (python-mako)[arguments]: New field. --- gnu/packages/python-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf2fc56294..9749ce96bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8000,6 +8000,14 @@ python-xdo for newer bindings.)") (base32 "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-setup.cfg + (lambda _ + ;; Adjust setup.cfg for compatibility with Pytest 4. + (substitute* "setup.cfg" + (("\\[pytest\\]") "[tool:pytest]")) + #t))))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (native-inputs -- cgit v1.2.3 From 278409e7e9ad63b80afa0a40c220dedd78c0aa54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 9 Mar 2019 15:08:11 +0100 Subject: build-system/gnu: Always look for license files in the source tree. Fixes . * guix/build/gnu-build-system.scm (install-license-files): Add #:out-of-source?. [find-source-directory]: New procedure. Use it to Determine the source directory and look for license files there. --- guix/build/gnu-build-system.scm | 48 ++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 3f68ad52ed..f62e96112d 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -735,8 +735,29 @@ which cannot be found~%" (define* (install-license-files #:key outputs (license-file-regexp %license-file-regexp) + out-of-source? #:allow-other-keys) "Install license files matching LICENSE-FILE-REGEXP to 'share/doc'." + (define (find-source-directory package) + ;; For an out-of-source build, guess the source directory location + ;; relative to the current directory. Return #f on failure. + (match (scandir ".." + (lambda (file) + (and (not (member file '("." ".." "build"))) + (file-is-directory? + (string-append "../" file))))) + (() ;hmm, no source + #f) + ((source) ;only one other file + (string-append "../" source)) + ((directories ...) ;pick the most likely one + ;; This happens for example with libstdc++, which lives within the GCC + ;; source tree. + (any (lambda (directory) + (and (string-prefix? package directory) + (string-append "../" directory))) + directories)))) + (let* ((regexp (make-regexp license-file-regexp)) (out (or (assoc-ref outputs "out") (match outputs @@ -744,14 +765,25 @@ which cannot be found~%" output)))) (package (strip-store-file-name out)) (directory (string-append out "/share/doc/" package)) - (files (scandir "." (lambda (file) - (regexp-exec regexp file))))) - (format #t "installing ~a license files~%" (length files)) - (for-each (lambda (file) - (if (file-is-directory? file) - (copy-recursively file directory) - (install-file file directory))) - files) + (source (if out-of-source? + (find-source-directory + (package-name->name+version package)) + ".")) + (files (and source + (scandir source + (lambda (file) + (regexp-exec regexp file)))))) + (if files + (begin + (format #t "installing ~a license files from '~a'~%" + (length files) source) + (for-each (lambda (file) + (if (file-is-directory? file) + (copy-recursively file directory) + (install-file file directory))) + (map (cut string-append source "/" <>) files))) + (format (current-error-port) + "failed to find license files~%")) #t)) (define %standard-phases -- cgit v1.2.3 From 6db044db45495aae471e1e8f537e267a0cb25cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 10 Mar 2019 22:16:14 +0100 Subject: build-system/gnu: Copy license files to all the outputs. Fixes . Reported by Leo Famulari . * guix/build/gnu-build-system.scm (install-license-files)[copy-to-directories]: New procedure. Call it to copy license files to all the outputs. --- guix/build/gnu-build-system.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index f62e96112d..afa1886ecd 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -758,13 +758,23 @@ which cannot be found~%" (string-append "../" directory))) directories)))) + (define (copy-to-directories directories sub-directory) + (lambda (file) + (for-each (if (file-is-directory? file) + (cut copy-recursively file <>) + (cut install-file file <>)) + (map (cut string-append <> "/" sub-directory) + directories)))) + (let* ((regexp (make-regexp license-file-regexp)) (out (or (assoc-ref outputs "out") (match outputs (((_ . output) _ ...) output)))) (package (strip-store-file-name out)) - (directory (string-append out "/share/doc/" package)) + (outputs (match outputs + (((_ . outputs) ...) + outputs))) (source (if out-of-source? (find-source-directory (package-name->name+version package)) @@ -777,10 +787,9 @@ which cannot be found~%" (begin (format #t "installing ~a license files from '~a'~%" (length files) source) - (for-each (lambda (file) - (if (file-is-directory? file) - (copy-recursively file directory) - (install-file file directory))) + (for-each (copy-to-directories outputs + (string-append "share/doc/" + package)) (map (cut string-append source "/" <>) files))) (format (current-error-port) "failed to find license files~%")) -- cgit v1.2.3 From ea89b62a18c988ead226cec542a5f4fdd3d58ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 10 Mar 2019 22:21:14 +0100 Subject: packages: 'patch-and-repack' specifies a 'type' property for the derivation. * guix/packages.scm (patch-and-repack): Pass #:properties to 'gexp->derivation'. --- guix/packages.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index 8515bb7c6f..e5e568efab 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -645,7 +645,9 @@ specifies modules in scope when evaluating SNIPPET." #:graft? #f #:system system #:deprecation-warnings #t ;to avoid a rebuild - #:guile-for-build guile-for-build)))) + #:guile-for-build guile-for-build + #:properties `((type . origin) + (patches . ,(length patches))))))) (define (transitive-inputs inputs) "Return the closure of INPUTS when considering the 'propagated-inputs' -- cgit v1.2.3 From cf8264364761857ca3550398369a0f20d7b0d512 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 20:44:26 +0100 Subject: gnu: coreutils: Update to 8.31. * gnu/packages/base.scm (coreutils): Update to 8.31. [arguments]: Remove obsolete workaround. --- gnu/packages/base.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c252067571..37be1ffeb7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -300,14 +300,14 @@ used to apply commands with arbitrarily long arguments.") (define-public coreutils (package (name "coreutils") - (version "8.30") + (version "8.31") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8")))) + "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! @@ -349,13 +349,7 @@ used to apply commands with arbitrarily long arguments.") ;; environments with long prefixes (/tmp/guix-build-...). (substitute* "Makefile" (("^.*tests/misc/env-S.pl.*$") "")) - #t))) - - ;; Work around a cross-compilation bug whereby libcoreutils.a would - ;; provide '__mktime_internal', which conflicts with the one in libc.a. - ,@(if (%current-target-system) - `(#:configure-flags '("gl_cv_func_working_mktime=yes")) - '()))) + #t))))) (synopsis "Core GNU utilities (file, text, shell)") (description "GNU Coreutils includes all of the basic command-line tools that are -- cgit v1.2.3 From d80dcf2bdd666277cd83bc4613924a63ec3bcfc3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 20:46:19 +0100 Subject: gnu: python-coverage: Update to 4.5.3. * gnu/packages/check.scm (python-coverage): Update to 4.5.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 20132492a7..f75dd61751 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1208,14 +1208,14 @@ have failed since the last commit or what tests are currently failing."))) (define-public python-coverage (package (name "python-coverage") - (version "4.5.2") + (version "4.5.3") (source (origin (method url-fetch) (uri (pypi-uri "coverage" version)) (sha256 (base32 - "1d5zlyl3h39d3xlvkpsn4g5gpvdci9arplil2cnz2cs8wsgms8xb")))) + "02f6m073qdispn96rc616hg0rnmw1pgqzw3bgxwiwza4zf9hirlx")))) (build-system python-build-system) (arguments ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. -- cgit v1.2.3 From b0c1c9b31426ba7f07b278ef8dc506614f594199 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 20:48:31 +0100 Subject: gnu: libxdamage: Update to 1.1.5. * gnu/packages/xorg.scm (libxdamage): Update to 1.1.5. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 01ce5ee7ab..658670f328 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4538,7 +4538,7 @@ cannot be adequately worked around on the client side of the wire.") (define-public libxdamage (package (name "libxdamage") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) @@ -4548,7 +4548,7 @@ cannot be adequately worked around on the client side of the wire.") ".tar.bz2")) (sha256 (base32 - "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw")))) + "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in the Requires or Requires.private field of xdamage.pc -- cgit v1.2.3 From 520ae432d446010ed6a5233c8abfda88a945926c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 11 Mar 2019 21:15:15 +0100 Subject: gnu: util-linux: Update to 2.33.1. * gnu/packages/linux.scm (util-linux): Update to 2.33.1. * gnu/packages/patches/util-linux-tests.patch: Skip one new test. --- gnu/packages/linux.scm | 4 ++-- gnu/packages/patches/util-linux-tests.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9020a599e2..674f6181da 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -600,7 +600,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.32.1") + (version "2.33.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -608,7 +608,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6")) + "08ggvgrb59m5jbq29950xxirsgv4xj3nwsc7vf82nyg1nvrxjjy1")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/util-linux-tests.patch b/gnu/packages/patches/util-linux-tests.patch index bb5be66515..ec1671f224 100644 --- a/gnu/packages/patches/util-linux-tests.patch +++ b/gnu/packages/patches/util-linux-tests.patch @@ -2,6 +2,8 @@ This test checks whether 'root' is successfully translated to UID/GID 0, using 'getpwnam' in libmount. This doesn't work in the chroot because /etc/passwd doesn't contain an entry for 'root' so skip it. +The second test requires that '/sys/dev/block' is present, which is not +the case inside the build container. --- util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:41.181151194 +0100 +++ util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:42.829161716 +0100 @@ -16,3 +18,14 @@ using 'getpwnam' in libmount. This doesn't work in the chroot because ts_init_subtest "deduplicate" ts_run $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT ts_finalize_subtest +--- a/tests/ts/lsblk/lsblk 2019-03-11 21:08:23.734387391 +0100 ++++ b/tests/ts/lsblk/lsblk 2019-03-11 21:12:43.635473111 +0100 +@@ -22,6 +22,8 @@ + + ts_init "$*" + ++ts_skip "/sys/dev/block is not available" ++ + ts_check_test_command "$TS_CMD_LSBLK" + ts_check_prog xz + ts_check_prog tar -- cgit v1.2.3 From 6b95bf0b37c9e95fbe6e93cf78743392e7cb1b91 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 15 Mar 2019 12:46:18 +0100 Subject: gnu: libimobiledevice: Build against OpenSSL 1.0. * gnu/packages/libusb.scm (libimobiledevice)[propagated-inputs]: Change from OPENSSL to OPENSSL-1.0. --- gnu/packages/libusb.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index f0725d77e8..a8d6d7c963 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -367,7 +367,7 @@ connections from and to iOS devices by connecting to a socket provided by a ,(version-major+minor (package-version python)) "m")))) (propagated-inputs - `(("openssl" ,openssl) + `(("openssl" ,openssl-1.0) ("libplist" ,libplist) ("libusbmuxd" ,libusbmuxd))) (inputs -- cgit v1.2.3 From e2bf462b05b14b8ba7765720d2a2e9ababf570cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:03:56 +0100 Subject: gnu: libxdmcp: Update to 1.1.3. * gnu/packages/xorg.scm (libxdmcp): Update to 1.1.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6471f2d630..3a7e69a82d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1300,7 +1300,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (define-public libxdmcp (package (name "libxdmcp") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) @@ -1310,7 +1310,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") ".tar.bz2")) (sha256 (base32 - "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1")))) + "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0")))) (build-system gnu-build-system) (inputs `(("libbsd" ,libbsd) -- cgit v1.2.3 From df37df52c9ccbb04e2173af7146cd0bc6e32152d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:04:07 +0100 Subject: gnu: libxft: Update to 2.3.3. * gnu/packages/xorg.scm (libxft): Update to 2.3.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3a7e69a82d..4867250cff 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1326,7 +1326,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") (define-public libxft (package (name "libxft") - (version "2.3.2") + (version "2.3.3") (source (origin (method url-fetch) @@ -1336,7 +1336,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.") ".tar.bz2")) (sha256 (base32 - "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm")))) + "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12")))) (build-system gnu-build-system) (propagated-inputs ;; xft.pc refers to all these. -- cgit v1.2.3 From cb7fd8d055a42a40754bb2b108542a3c9c5e97bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:04:28 +0100 Subject: gnu: libxmu: Update to 1.1.3. * gnu/packages/xorg.scm (libxmu): Update to 1.1.3. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4867250cff..63da44fdcd 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1385,7 +1385,7 @@ configuration files.") (define-public libxmu (package (name "libxmu") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) @@ -1395,7 +1395,7 @@ configuration files.") ".tar.bz2")) (sha256 (base32 - "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm")))) + "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w")))) (build-system gnu-build-system) (inputs `(("libxt" ,libxt) -- cgit v1.2.3 From 165d7c01274a08fcfefcdf1d1656014fc4627601 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:04:45 +0100 Subject: gnu: xtrans: Update to 1.4.0. * gnu/packages/xorg.scm (xtrans): Update to 1.4.0. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 63da44fdcd..920949ddac 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4333,7 +4333,7 @@ a display running X server.") (define-public xtrans (package (name "xtrans") - (version "1.3.5") + (version "1.4.0") (source (origin (method url-fetch) @@ -4343,7 +4343,7 @@ a display running X server.") ".tar.bz2")) (sha256 (base32 - "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd")))) + "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") -- cgit v1.2.3 From 40916d637a854818ac1c5c0264432d9f8b7f9d23 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:05:07 +0100 Subject: gnu: libxext: Update to 1.3.4. * gnu/packages/xorg.scm (libxext): Update to 1.3.4. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 920949ddac..2cab66eb3b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4560,7 +4560,7 @@ cannot be adequately worked around on the client side of the wire.") (define-public libxext (package (name "libxext") - (version "1.3.3") + (version "1.3.4") (source (origin (method url-fetch) @@ -4570,7 +4570,7 @@ cannot be adequately worked around on the client side of the wire.") ".tar.bz2")) (sha256 (base32 - "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m")))) + "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) -- cgit v1.2.3 From 7dad1cce6c7f1bc8c7eec93edc85b5dd26a21a18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 14:05:26 +0100 Subject: gnu: libxrandr: Update to 1.5.2. * gnu/packages/xorg.scm (libxrandr): Update to 1.5.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2cab66eb3b..ab12529c08 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4960,7 +4960,7 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxrandr (package (name "libxrandr") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) @@ -4970,7 +4970,7 @@ new API's in libXft, or the legacy API's in libX11.") ".tar.bz2")) (sha256 (base32 - "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z")))) + "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla")))) (build-system gnu-build-system) (propagated-inputs ;; In accordance with xrandr.pc. -- cgit v1.2.3 From ca99dc174d20496cbb4c6ffb04531e56b29d8d77 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 15:03:10 +0100 Subject: gnu: libuv: Update to 1.27.0. * gnu/packages/libevent.scm (libuv): Update to 1.27.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index cdd05c5441..273160c92a 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.26.0") + (version "1.27.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1rqlh0ag02fni8ildz3anc26z9vz69vwf5qmzsid2gvzzfkigy6a")))) + "1jndi12800p1r34rc41kaxhwrb3cb3pcsnkyp3v0c1k7ld3p124d")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From e16cf2666ffae3d5c008f092630d1b65eb8b1598 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 15:04:20 +0100 Subject: gnu: cmake: Update to 3.14.0. * gnu/packages/cmake.scm (cmake): Update to 3.14.0. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 5bd91b7bf5..7772fbedb1 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.13.1") + (version "3.14.0") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "04123d7fgnn1fs5p0nwyq397ss89r0y4wkg9a09qiwkjsvk1rzmy")) + "00jmwwkr3ybsr4hz4hgiv75zaak5yirp110zf131kby2ndkvlxma")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2f33a7321e5e37d37f57c229c8079cb4ffd10834 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 20 Mar 2019 21:38:19 -0400 Subject: cmake: Generate documentation. To prevent complicating the dependencies of a core tool, a new variant, CMAKE-MINIMAL is introduced and the CMake build system is configured to use it by default. The regular CMAKE package gains a manpage, info manual as well as HTML documentation. Fixes issue #33497 (https://bugs.gnu.org/33497). * gnu/packages/cmake.scm (gnu): Use modules (gnu packages python-xyz), (gnu packages texinfo) and (srfi srfi-1). (cmake-minimal): Rename the original cmake variable to this. [phases]{configure}: Extract the configure script arguments to... [configure-flags]: here. [properties]: Set the HIDDEN? property to #t. (cmake): New variable, which inherits from CMAKE-MINIMAL. [phases]{move-html-doc}: Add phase. [native-inputs]: Add PYTHON-SPHINX and TEXINFO. [outputs]: Add the "doc" output. [properties]: Clear the inherited HIDDEN? property. * guix/build-system/cmake.scm (default-cmake): Use CMAKE-MINIMAL instead of CMAKE. --- gnu/packages/cmake.scm | 94 +++++++++++++++++++++++++++++++++------------ guix/build-system/cmake.scm | 2 +- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 7772fbedb1..b999c0c170 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -8,6 +8,8 @@ ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Maxim Cournoyer + ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,11 +41,16 @@ #:use-module (gnu packages file) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) - #:use-module (gnu packages xml)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1)) -(define-public cmake +;;; This minimal variant of CMake does not include the documentation. It is +;;; used by the cmake-build-system. +(define-public cmake-minimal (package - (name "cmake") + (name "cmake-minimal") (version "3.14.0") (source (origin (method url-fetch) @@ -72,6 +79,23 @@ (build-system gnu-build-system) (arguments `(#:test-target "test" + #:configure-flags + (let ((out (assoc-ref %outputs "out")) + (parallel-job-count (number->string (parallel-job-count)))) + (list "--verbose" + (string-append "--parallel=" parallel-job-count) + (string-append "--prefix=" out) + "--system-libs" + "--no-system-jsoncpp" ; FIXME: Circular dependency. + ;; By default, the man pages and other docs land + ;; in PREFIX/man and PREFIX/doc, but we want them + ;; in share/{man,doc}. Note that unlike + ;; autoconf-generated configure scripts, cmake's + ;; configure prepends "PREFIX/" to what we pass + ;; to --mandir and --docdir. + "--mandir=share/man" + ,(string-append "--docdir=share/doc/cmake-" + (version-major+minor version)))) #:make-flags (let ((skipped-tests (list "BundleUtilities" ; This test fails on Guix. @@ -119,25 +143,10 @@ (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH") (getenv "C_INCLUDE_PATH"))) #t))) + ;; CMake uses its own configure script. (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke - "./configure" "--verbose" - (string-append "--parallel=" (number->string (parallel-job-count))) - (string-append "--prefix=" out) - "--system-libs" - "--no-system-jsoncpp" ; FIXME: Circular dependency. - ;; By default, the man pages and other docs land - ;; in PREFIX/man and PREFIX/doc, but we want them - ;; in share/{man,doc}. Note that unlike - ;; autoconf-generated configure scripts, cmake's - ;; configure prepends "PREFIX/" to what we pass - ;; to --mandir and --docdir. - "--mandir=share/man" - ,(string-append - "--docdir=share/doc/cmake-" - (version-major+minor version))))))))) + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (apply invoke "./configure" configure-flags)))))) (inputs `(("bzip2" ,bzip2) ("curl" ,curl) @@ -159,12 +168,47 @@ CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice.") - (license (list license:bsd-3 ; cmake - license:bsd-4 ; cmcompress - license:bsd-2 ; cmlibarchive - license:expat ; cmjsoncpp is dual MIT/public domain + (properties '((hidden? . #t))) + (license (list license:bsd-3 ; cmake + license:bsd-4 ; cmcompress + license:bsd-2 ; cmlibarchive + license:expat ; cmjsoncpp is dual MIT/public domain license:public-domain)))) ; cmlibarchive/archive_getdate.c +(define-public cmake + (package + (inherit cmake-minimal) + (name "cmake") + (arguments + (substitute-keyword-arguments (package-arguments cmake-minimal) + ((#:configure-flags configure-flags ''()) + `(append ,configure-flags + ;; Extra configure flags used to generate the documentation. + '("--sphinx-info" + "--sphinx-man" + "--sphinx-html"))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'move-html-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/doc/cmake-" + ,(version-major+minor + (package-version cmake-minimal)) + "/html"))) + (copy-recursively (string-append out html) + (string-append doc html)) + (delete-file-recursively (string-append out html)) + #t))))))) + ;; Extra inputs required to build the documentation. + (native-inputs + `(,@(package-native-inputs cmake-minimal) + ("python-sphinx" ,python-sphinx) + ("texinfo" ,texinfo))) + (outputs '("out" "doc")) + (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) + (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ee116c5a4c..ca88fadddf 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -48,7 +48,7 @@ ;; Do not use `@' to avoid introducing circular dependencies. (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake))) + (module-ref module 'cmake-minimal))) (define* (lower name #:key source inputs native-inputs outputs system target -- cgit v1.2.3 From 01a92a70c403ff0883733ec8ff0419f07d6b3ef4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 17 Mar 2019 17:04:20 +0100 Subject: gnu: fontforge: Build against Python 3. * gnu/packages/fontutils.scm (fontforge)[inputs]: Change from PYTHON-2 to PYTHON. --- gnu/packages/fontutils.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 21f8c7d227..0259e374d9 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -586,10 +586,7 @@ definitions.") ("libxml2" ,libxml2) ("pango" ,pango) ("potrace" ,potrace) - ;; FIXME: We use Python 2 here because there is a bug in Python - ;; 3.7 that is triggered when Py_Main is called after Py_Init, as - ;; is done by fontforge. This will be fixed in Python 3.7.1. - ("python" ,python-2) + ("python" ,python) ("zlib" ,zlib))) (arguments '(#:phases -- cgit v1.2.3 From d3b22d488babae461d03831a1bb5f776e53a13cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 18 Mar 2019 18:07:32 +0100 Subject: gnu: stb: Update snapshot. * gnu/packages/stb.scm (stb): Update to commit 2c2908f50515dcd. (stb-image): Update to 2.22. (stb-image-write): Update to 1.13. --- gnu/packages/stb.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index df31bd0f86..5444347644 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -26,8 +26,8 @@ (define stb ;; stb is a collection of libraries developed within the same repository. ;; When updating this, remember to change versions below as appropriate. - (let ((commit "e6afb9cbae4064da8c3e69af3ff5c4629579c1d2") - (revision "0")) + (let ((commit "2c2908f50515dcd939f24be261c3ccbcd277bb49") + (revision "1")) (package (name "stb") (home-page "https://github.com/nothings/stb") @@ -39,7 +39,7 @@ (commit commit))) (sha256 (base32 - "079nsn9bnb8c0vfq26g5l53q6gzx19a5x9q2nb55mpcljxsgxnmf")) + "1z753rscqc4clp0rd57bw68i60kz694y1z52bwv6slzmkgds1cki")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -92,12 +92,12 @@ the C programming language.") ;; converted to macros as outlined in . (define-public stb-image (make-stb-header-package - "stb-image" "2.19" + "stb-image" "2.22" "stb-image is a small and self-contained library for image loading or decoding from file or memory. A variety of formats are supported.")) (define-public stb-image-write (make-stb-header-package - "stb-image-write" "1.09" + "stb-image-write" "1.13" "stb-image-write is a small library for writing image files to the C@tie{}@code{stdio} interface.")) -- cgit v1.2.3 From d1659c0fb27c4f71c8ddc6a85d3cd9f3a10cca97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 15:31:09 +0100 Subject: gnu: Python: Remove bundled libraries. Fixes . * gnu/packages/python.scm (python-2.7)[source](snippet): Remove bundled libffi, expat and zlib. Add substitution to make pyexpat use system expat. [arguments]: Add "--with-system-expat" to #:configure-flags. [inputs]: Add EXPAT. * gnu/packages/python.scm (python-3.7)[source](snippet): Delete bundled expat and add the same pyexpat substitution. * gnu/packages/python.scm (python2-minimal, python-minimal)[inputs]: Add EXPAT. --- gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 064b8dbf4c..aa2f8addcf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -85,6 +85,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -109,11 +110,19 @@ "python-2.7-source-date-epoch.patch" "python-2.7-adjust-tests.patch")) (modules '((guix build utils))) - ;; suboptimal to delete failing tests here, but if we delete them in the - ;; arguments then we need to make sure to strip out that phase when it - ;; gets inherited by python and python-minimal. (snippet '(begin + ;; Ensure the bundled copies of these libraries are not used. + (for-each delete-file-recursively + '("Modules/_ctypes/libffi" "Modules/expat" "Modules/zlib")) + + (substitute* "Modules/Setup.dist" + ;; Link Expat instead of embedding the bundled one. + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + + ;; Suboptimal to delete failing tests here, but if we delete them in + ;; the arguments then we need to make sure to strip out that phase + ;; when it gets inherited by python and python-minimal. (for-each delete-file '("Lib/test/test_compileall.py" "Lib/test/test_ctypes.py" ; fails on mips64el @@ -130,6 +139,7 @@ `(#:test-target "test" #:configure-flags (list "--enable-shared" ;allow embedding + "--with-system-expat" ;for XML support "--with-system-ffi" ;build ctypes "--with-ensurepip=install" ;install pip and setuptools "--enable-unicode=ucs4" @@ -258,6 +268,7 @@ #t)))))) (inputs `(("bzip2" ,bzip2) + ("expat" ,expat) ("gdbm" ,gdbm) ("libffi" ,libffi) ; for ctypes ("sqlite" ,sqlite) ; for sqlite extension @@ -311,8 +322,15 @@ data types.") (sha256 (base32 "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) + (modules '((guix build utils))) (snippet '(begin + ;; Delete the bundled copy of libexpat. + (delete-file-recursively "Modules/expat") + (substitute* "Modules/Setup.dist" + ;; Link Expat instead of embedding the bundled one. + (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) + (for-each delete-file '(;; This test may hang and eventually run out of ;; memory on some systems: @@ -379,8 +397,10 @@ data types.") ;; Keep zlib, which is used by 'pip' (via the 'zipimport' module), which ;; is invoked upon 'make install'. 'pip' also expects 'ctypes' and thus - ;; libffi. - (inputs `(("libffi" ,libffi) + ;; libffi. Expat is needed for XML support which is expected by a lot + ;; of libraries out there. + (inputs `(("expat" ,expat) + ("libffi" ,libffi) ("zlib" ,zlib))))) (define-public python-minimal @@ -390,8 +410,10 @@ data types.") ;; Build fails due to missing ctypes without libffi. ;; OpenSSL is a mandatory dependency of Python 3.x, for urllib; - ;; zlib is required by 'zipimport', used by pip. - (inputs `(("libffi" ,libffi) + ;; zlib is required by 'zipimport', used by pip. Expat is needed + ;; for XML support, which is generally expected to be available. + (inputs `(("expat" ,expat) + ("libffi" ,libffi) ("openssl" ,openssl) ("zlib" ,zlib))))) -- cgit v1.2.3 From 2eb92ce85fc9e3e06650065e499385e8fba107c1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:25:39 +0100 Subject: gnu: poppler: Update to 0.75.0. * gnu/packages/pdf.scm (poppler): Update to 0.75.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 93bb53d801..8a78da854b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -83,14 +83,14 @@ (define-public poppler (package (name "poppler") - (version "0.74.0") + (version "0.75.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j")))) + "16hr0y3pv66s01bcd4k8xjgd1r038ca9srd06g4wm5r7zaqfvfiv")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From e54f0cf68067cbce0ad27baf52d48f968af100ec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:27:30 +0100 Subject: gnu: libgpg-error: Update to 1.36. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.36. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index d1d55c3a11..5f4badf4ef 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -77,7 +77,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.35") + (version "1.36") (source (origin (method url-fetch) @@ -85,7 +85,7 @@ version ".tar.bz2")) (sha256 (base32 - "0rz00xyrk7qzg7mmcjhvrnm34hddkvyg9zsqq548vj58m1ifxmfb")))) + "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") -- cgit v1.2.3 From f882f62c6bdef79f0348f1cdfe7a727f44a9cc63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:29:11 +0100 Subject: gnu: python-pytest: Update to 4.3.1. * gnu/packages/check.scm (python-pytest): Update to 4.3.1. [source](patches): Remove. * gnu/packages/patches/python-pytest-pluggy-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/check.scm | 5 +- .../patches/python-pytest-pluggy-compat.patch | 64 ---------------------- 3 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 gnu/packages/patches/python-pytest-pluggy-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index e936343918..41f42e588f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1188,7 +1188,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ - %D%/packages/patches/python-pytest-pluggy-compat.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 69fe278728..186f4ba09a 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -684,15 +684,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "4.3.0") + (version "4.3.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) - (patches (search-patches "python-pytest-pluggy-compat.patch")) (sha256 (base32 - "077gzimi9xiiyzpc3xjpb5yfgz038xkldg91mmbdvzr7z15isyh6")))) + "08q58ad8vaxyb57ll8m611yb4xwzzhp09kxafmyqrrps6cnalbjr")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/python-pytest-pluggy-compat.patch b/gnu/packages/patches/python-pytest-pluggy-compat.patch deleted file mode 100644 index ac33b862e6..0000000000 --- a/gnu/packages/patches/python-pytest-pluggy-compat.patch +++ /dev/null @@ -1,64 +0,0 @@ -Fix test failures when built against Pluggy 0.9. - -Taken from this upstream commit: -https://github.com/pytest-dev/pytest/commit/a68f4fd2b9e99c82476d0e04ebcf561aeddbcb2e - -diff --git a/testing/test_assertion.py b/testing/test_assertion.py -index b659233eb..e4fe56c6f 100644 ---- a/testing/test_assertion.py -+++ b/testing/test_assertion.py -@@ -209,7 +209,7 @@ def load(self, require=True, *args, **kwargs): - import spamplugin - return spamplugin - -- def iter_entry_points(name): -+ def iter_entry_points(group, name=None): - yield DummyEntryPoint() - - pkg_resources.iter_entry_points = iter_entry_points -diff --git a/testing/test_config.py b/testing/test_config.py -index f9f22a63e..1e29b83f1 100644 ---- a/testing/test_config.py -+++ b/testing/test_config.py -@@ -514,8 +514,8 @@ def test_preparse_ordering_with_setuptools(testdir, monkeypatch): - pkg_resources = pytest.importorskip("pkg_resources") - monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) - -- def my_iter(name): -- assert name == "pytest11" -+ def my_iter(group, name=None): -+ assert group == "pytest11" - - class Dist(object): - project_name = "spam" -@@ -552,8 +552,8 @@ def test_setuptools_importerror_issue1479(testdir, monkeypatch): - pkg_resources = pytest.importorskip("pkg_resources") - monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False) - -- def my_iter(name): -- assert name == "pytest11" -+ def my_iter(group, name=None): -+ assert group == "pytest11" - - class Dist(object): - project_name = "spam" -@@ -583,8 +583,8 @@ def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block - - plugin_module_placeholder = object() - -- def my_iter(name): -- assert name == "pytest11" -+ def my_iter(group, name=None): -+ assert group == "pytest11" - - class Dist(object): - project_name = "spam" -@@ -621,7 +621,7 @@ def load(self): - def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, should_load): - pkg_resources = pytest.importorskip("pkg_resources") - -- def my_iter(name): -+ def my_iter(group, name=None): - raise AssertionError("Should not be called") - - class PseudoPlugin(object): -- cgit v1.2.3 From db65a4fd914be10f9170cb8ad049e15eefefd5a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:32:53 +0100 Subject: gnu: python-mako: Update to 1.0.8. * gnu/packages/python-xyz.scm (python-mako): Update to 1.0.8. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db31794225..71727ad1da 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8117,23 +8117,15 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) + "0hr89gcda0y0baz25cm4yq7fbl7cvid4zsns8cgv0jfzq102j284")))) (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-setup.cfg - (lambda _ - ;; Adjust setup.cfg for compatibility with Pytest 4. - (substitute* "setup.cfg" - (("\\[pytest\\]") "[tool:pytest]")) - #t))))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (native-inputs -- cgit v1.2.3 From 6bbb37a545912c6bb2513ee08587ee4fe39cc330 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Apr 2019 00:09:20 -0400 Subject: build-system/python: Move the check phase after the install phase. A reproducibility problem was discovered while packaging python-pygithub where the bytecode produced by running the tests would interfere with the result of the install phase byte compilation. Moving the check phase after the install phase solves the problem. * guix/build/python-build-system.scm (%standard-phases): Add comment, move the check phase after the install phase. --- guix/build/python-build-system.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 73b554c766..7c00306b3e 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -250,16 +250,21 @@ installed with setuptools." #t) (define %standard-phases - ;; 'configure' phase is not needed. + ;; The build phase only builds C extensions and copies the Python sources, + ;; while the install phase byte-compiles and copies them to the prefix + ;; directory. The tests are run after the install phase because otherwise + ;; the cached .pyc generated during the tests execution seem to interfere + ;; with the byte compilation of the install phase. (modify-phases gnu:%standard-phases (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism enable-bytecode-determinism) (delete 'bootstrap) - (delete 'configure) - (replace 'install install) - (replace 'check check) + (delete 'configure) ;not needed (replace 'build build) + (delete 'check) ;moved after the install phase + (replace 'install install) + (add-after 'install 'check check) (add-after 'install 'wrap wrap) (add-before 'strip 'rename-pth-file rename-pth-file))) -- cgit v1.2.3 From e337061b3a7af892d3a14f5191efb2487ec0fad9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Apr 2019 23:39:39 -0400 Subject: gnu: python: Disable failing tests for Python 2. Fixes issue #35311 (see: https://bugs.gnu.org/35311). * gnu/packages/python.scm (python-2.7)[make-flags]: Exclude the tests test_urllib2_localnet and test_httplib. * gnu/packages/python.scm (python-3.7)[make-flags]: Do not consider tests exclusions inherited from the python2 package, which leaves Python 3 unchanged. --- gnu/packages/python.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aa2f8addcf..a26a88e6d9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -54,7 +54,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2019 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; @@ -147,7 +147,14 @@ (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. #:make-flags - (list (format #f "TESTOPTS=-j~d" (parallel-job-count))) + (list (string-append + (format #f "TESTOPTS=-j~d" (parallel-job-count)) + ;; Exclude the following tests as they fail + ;; non-deterministically with "error: [Errno 104] Connection + ;; reset by peer." Python 3 seems unaffected. A potential fix, + ;; yet to be backported to Python 2, is available at: + ;; https://github.com/python/cpython/commit/529525fb5a8fd9b96ab4021311a598c77588b918. + " --exclude test_urllib2_localnet test_httplib")) #:modules ((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) @@ -344,6 +351,9 @@ data types.") #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) + ((#:make-flags _) + ;; Strip tests exclusions that have to do with Python 2 only. + `(list (format #f "TESTOPTS=-j~d" (parallel-job-count)))) ((#:phases phases) `(modify-phases ,phases ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it -- cgit v1.2.3 From 2ca3fdc2db1aef96fbf702a2f26f5e18ce832038 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 4 Mar 2019 12:45:59 +0100 Subject: gnu: shishi: Make shishi keys and database administrator-modifiable. Fixes . * gnu/packages/kerberos.scm (shishi)[arguments]<#:configure-flags>: Add --with-key-dir, --with-db-dir. <#:phases>[disable-automatic-key-generation]: New phase. --- gnu/packages/kerberos.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 7cf61c8d0f..1253a58546 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -116,9 +116,19 @@ cryptography.") (build-system gnu-build-system) (arguments '(;; This is required since we patch some of the build scripts. - ;; Remove for the next Shishi release after 1.0.2 or when - ;; removing 'shishi-fix-libgcrypt-detection.patch'. - #:configure-flags '("ac_cv_libgcrypt=yes" "--disable-static"))) + ;; Remove first two items for the next Shishi release after 1.0.2 or + ;; when removing 'shishi-fix-libgcrypt-detection.patch'. + #:configure-flags + '("ac_cv_libgcrypt=yes" "--disable-static" + "--with-key-dir=/etc/shishi" "--with-db-dir=/var/shishi") + #:phases + (modify-phases %standard-phases + (add-after 'configure 'disable-automatic-key-generation + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("^install-data-hook:") + "install-data-hook:\nx:\n")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("gnutls" ,gnutls) @@ -132,7 +142,10 @@ cryptography.") (description "GNU Shishi is a free implementation of the Kerberos 5 network security system. It is used to allow non-secure network nodes to communicate in a -secure manner through client-server mutual authentication via tickets.") +secure manner through client-server mutual authentication via tickets. + +After installation, the system administrator should generate keys using +@code{shisa -a /etc/shishi/shishi.keys}.") (license license:gpl3+))) (define-public heimdal -- cgit v1.2.3 From c078f1b08b844c7126db2a4a0f83db2217e3bb0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 17:46:59 +0200 Subject: gnu: texlive-bin: Adapt to Poppler 0.75. This is a follow-up to commit 2eb92ce85fc9e3e06650065e499385e8fba107c1. * gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch: Update for Poppler 0.75. * gnu/packages/tex.scm (texlive-bin)[source](patches): Update pdftex-poppler-0.75.patch. [arguments]: Adjust accordingly. --- .../texlive-bin-luatex-poppler-compat.patch | 313 +++++++++------------ gnu/packages/tex.scm | 16 +- 2 files changed, 137 insertions(+), 192 deletions(-) diff --git a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch index d8b9bf172a..df6121c6e1 100644 --- a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch +++ b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch @@ -1,23 +1,14 @@ -Fix LuaTeX compatibility with Poppler 0.72. +Fix LuaTeX compatibility with Poppler 0.75. Upstream LuaTeX have moved from Poppler to "pplib" and thus upstream -fixes are unavailable. This is based on Arch Linux patches, with minor -changes for Poppler 0.72: -https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/texlive-bin&id=f1b424435c8fa31d9296c7a6dc17f939a8332780 +fixes are unavailable. This is based on Archs patch, with minor +tweaks to comply with texlive-bin-CVE-2018-17407.patch. +https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/texlive-bin&id=418dd6f008c3d41a461353fdb60f2d73d87c58ed diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w --- a/texk/web2c/luatexdir/image/pdftoepdf.w +++ b/texk/web2c/luatexdir/image/pdftoepdf.w -@@ -35,7 +35,7 @@ - - extern void md5(Guchar *msg, int msgLen, Guchar *digest); - --static GBool isInit = gFalse; -+static bool isInit = false; - - /* Maintain AVL tree of all PDF files for embedding */ - -@@ -363,10 +363,10 @@ void copyReal(PDF pdf, double d) +@@ -363,7 +363,7 @@ void copyReal(PDF pdf, double d) static void copyString(PDF pdf, GooString * string) { @@ -25,11 +16,7 @@ diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image + const char *p; unsigned char c; size_t i, l; -- p = string->getCString(); -+ p = string->c_str(); - l = (size_t) string->getLength(); - if (pdf->cave) - pdf_out(pdf, ' '); + p = string->getCString(); @@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string) pdf->cave = true; } @@ -39,15 +26,25 @@ diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image { pdf_out(pdf, '/'); for (; *s != 0; s++) { -@@ -468,14 +468,14 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj) - break; - /* - case objNum: -- GBool isNum() { return type == objInt || type == objReal; } -+ bool isNum() { return type == objInt || type == objReal; } - break; - */ - case objString: +@@ -412,7 +412,7 @@ static void copyArray(PDF pdf, PdfDocument * pdf_doc, Array * array) + Object obj1; + pdf_begin_array(pdf); + for (i = 0, l = array->getLength(); i < l; ++i) { +- obj1 = array->getNF(i); ++ obj1 = array->getNF(i).copy(); + copyObject(pdf, pdf_doc, &obj1); + } + pdf_end_array(pdf); +@@ -425,7 +425,7 @@ static void copyDict(PDF pdf, PdfDocument * pdf_doc, Dict * dict) + pdf_begin_dict(pdf); + for (i = 0, l = dict->getLength(); i < l; ++i) { + copyName(pdf, dict->getKey(i)); +- obj1 = dict->getValNF(i); ++ obj1 = dict->getValNF(i).copy(); + copyObject(pdf, pdf_doc, &obj1); + } + pdf_end_dict(pdf); +@@ -475,7 +475,7 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj) copyString(pdf, (GooString *)obj->getString()); break; case objName: @@ -85,31 +82,37 @@ diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image break; } } -@@ -587,11 +587,11 @@ void read_pdf_info(image_dict * idict) - PDFRectangle *pagebox; - int pdf_major_version_found, pdf_minor_version_found; - float xsize, ysize, xorig, yorig; -- if (isInit == gFalse) { -+ if (isInit == false) { - if (!(globalParams)) - globalParams = new GlobalParams(); -- globalParams->setErrQuiet(gFalse); -- isInit = gTrue; -+ globalParams->setErrQuiet(false); -+ isInit = true; - } - if (img_type(idict) == IMG_TYPE_PDF) - pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL); -@@ -966,7 +966,7 @@ void epdf_free() - if (PdfDocumentTree != NULL) - avl_destroy(PdfDocumentTree, destroyPdfDocument); - PdfDocumentTree = NULL; -- if (isInit == gTrue) -+ if (isInit == true) - delete globalParams; -- isInit = gFalse; -+ isInit = false; - } +@@ -788,12 +788,12 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info) + Now all relevant parts of the Page dictionary are copied. Metadata validity + check is needed(as a stream it must be indirect). + */ +- obj1 = pageDict->lookupNF("Metadata"); ++ obj1 = pageDict->lookupNF("Metadata").copy(); + if (!obj1.isNull() && !obj1.isRef()) + formatted_warning("pdf inclusion","/Metadata must be indirect object"); + /* copy selected items in Page dictionary */ + for (i = 0; pagedictkeys[i] != NULL; i++) { +- obj1 = pageDict->lookupNF(pagedictkeys[i]); ++ obj1 = pageDict->lookupNF(pagedictkeys[i]).copy(); + if (!obj1.isNull()) { + pdf_add_name(pdf, pagedictkeys[i]); + /* preserves indirection */ +@@ -806,13 +806,13 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info) + PDF file, climbing up the tree until the Resources are found. + (This fixes a problem with Scribus 1.3.3.14.) + */ +- obj1 = pageDict->lookupNF("Resources"); ++ obj1 = pageDict->lookupNF("Resources").copy(); + if (obj1.isNull()) { + op1 = &pagesobj1; + op2 = &pagesobj2; + *op1 = pageDict->lookup("Parent"); + while (op1->isDict()) { +- obj1 = op1->dictLookupNF("Resources"); ++ obj1 = op1->dictLookupNF("Resources").copy(); + if (!obj1.isNull()) { + pdf_add_name(pdf, "Resources"); + copyObject(pdf, pdf_doc, &obj1); diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc --- a/texk/web2c/luatexdir/lua/lepdflib.cc +++ b/texk/web2c/luatexdir/lua/lepdflib.cc @@ -122,15 +125,15 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uout->atype = ALLOC_LEPDF; uout->pc = uobj->pc; uout->pd = uobj->pd; -@@ -439,7 +439,7 @@ static int l_new_Object(lua_State * L) - break; - case 1: - if (lua_isboolean (L,1)) { -- uout->d = new Object(lua_toboolean(L, 1)? gTrue : gFalse); -+ uout->d = new Object(lua_toboolean(L, 1)? true : false); - uout->atype = ALLOC_LEPDF; - uout->pc = 0; - uout->pd = NULL; +@@ -496,7 +496,7 @@ static int l_new_Object(lua_State * L) + double numA = lua_tonumber(L,1); + double genA = lua_tonumber(L,2); + if ( ((numA)==(int)(numA)) && ((genA)==(int)(genA)) ){ +- uout->d = new Object((int)(numA), (int)(genA)); ++ uout->d = new Object({(int)(numA), (int)(genA)}); + uout->atype = ALLOC_LEPDF; + uout->pc = 0; + uout->pd = NULL; @@ -596,7 +596,7 @@ static int m_##in##_##function(lua_State * L) \ uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ if (uin->pd != NULL && uin->pd->pc != uin->pc) \ @@ -140,33 +143,15 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep if (o != NULL) { \ uout = new_##out##_userdata(L); \ uout->d = o; \ -@@ -676,7 +676,7 @@ static int m_##in##_##function(lua_State * L) \ - pdfdoc_changed_error(L); \ - gs = (GooString *)((in *) uin->d)->function(); \ - if (gs != NULL) \ -- lua_pushlstring(L, gs->getCString(), gs->getLength()); \ -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); \ - else \ - lua_pushnil(L); \ - return 1; \ -@@ -911,7 +911,7 @@ static int m_Array_getString(lua_State * L) +@@ -889,7 +889,7 @@ static int m_Array_getNF(lua_State * L) if (i > 0 && i <= len) { - gs = new GooString(); - if (((Array *) uin->d)->getString(i - 1, gs)) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - delete gs; -@@ -1063,7 +1063,7 @@ static int m_Catalog_getJS(lua_State * L) - if (i > 0 && i <= len) { - gs = ((Catalog *) uin->d)->getJS(i - 1); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - delete gs; + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1); ++ *((Object *) uout->d) = ((Array *) uin->d)->getNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; @@ -1125,12 +1125,12 @@ m_poppler_get_INT(Dict, getLength); static int m_Dict_add(lua_State * L) @@ -182,36 +167,42 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); return 0; -@@ -1378,7 +1378,7 @@ static int m_GooString__tostring(lua_State * L) - uin = (udstruct *) luaL_checkudata(L, 1, M_GooString); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- lua_pushlstring(L, ((GooString *) uin->d)->getCString(), -+ lua_pushlstring(L, ((GooString *) uin->d)->c_str(), - ((GooString *) uin->d)->getLength()); - return 1; - } -@@ -1527,9 +1527,9 @@ static int m_Object_initBool(lua_State * L) +@@ -1190,7 +1190,7 @@ static int m_Dict_lookupNF(lua_State * L) + s = luaL_checkstring(L, 2); + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s); ++ *((Object *) uout->d) = ((Dict *) uin->d)->lookupNF(s).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1263,7 +1263,7 @@ static int m_Dict_getValNF(lua_State * L) + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1); ++ *((Object *) uout->d) = ((Dict *) uin->d)->getValNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -1653,7 +1653,7 @@ static int m_Object_initRef(lua_State * L) pdfdoc_changed_error(L); - luaL_checktype(L, 2, LUA_TBOOLEAN); - if (lua_toboolean(L, 2) != 0) -- *((Object *) uin->d) = Object(gTrue); -+ *((Object *) uin->d) = Object(true); - else -- *((Object *) uin->d) = Object(gFalse); -+ *((Object *) uin->d) = Object(false); + num = luaL_checkint(L, 2); + gen = luaL_checkint(L, 3); +- *((Object *) uin->d) = Object(num, gen); ++ *((Object *) uin->d) = Object({num, gen}); return 0; } -@@ -1814,7 +1814,7 @@ static int m_Object_getString(lua_State * L) - pdfdoc_changed_error(L); - if (((Object *) uin->d)->isString()) { - gs = (GooString *)((Object *) uin->d)->getString(); -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - } else - lua_pushnil(L); - return 1; +@@ -2011,7 +2011,7 @@ static int m_Object_arrayGetNF(lua_State * L) + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1); ++ *((Object *) uout->d) = ((Object *) uin->d)->arrayGetNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; @@ -2051,7 +2051,7 @@ static int m_Object_dictAdd(lua_State * L) pdfdoc_changed_error(L); if (!((Object *) uin->d)->isDict()) @@ -221,30 +212,42 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep return 0; } -@@ -2470,9 +2470,9 @@ static int m_PDFDoc_getFileName(lua_State * L) +@@ -2104,7 +2104,7 @@ static int m_Object_dictLookupNF(lua_State * L) + if (((Object *) uin->d)->isDict()) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictLookupNF(s).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2169,7 +2169,7 @@ static int m_Object_dictGetValNF(lua_State * L) + if (i > 0 && i <= len) { + uout = new_Object_userdata(L); + uout->d = new Object(); +- *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1); ++ *((Object *) uout->d) = ((Object *) uin->d)->dictGetValNF(i - 1).copy(); + uout->atype = ALLOC_LEPDF; + uout->pc = uin->pc; + uout->pd = uin->pd; +@@ -2470,7 +2470,7 @@ static int m_PDFDoc_getFileName(lua_State * L) uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); - gs = ((PdfDocument *) uin->d)->doc->getFileName(); + gs = (GooString *) ((PdfDocument *) uin->d)->doc->getFileName(); if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); + lua_pushlstring(L, gs->getCString(), gs->getLength()); else - lua_pushnil(L); - return 1; -@@ -2559,9 +2559,9 @@ static int m_PDFDoc_readMetadata(lua_State * L) +@@ -2559,7 +2559,7 @@ static int m_PDFDoc_readMetadata(lua_State * L) if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { - gs = ((PdfDocument *) uin->d)->doc->readMetadata(); + gs = (GooString *) ((PdfDocument *) uin->d)->doc->readMetadata(); if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); + lua_pushlstring(L, gs->getCString(), gs->getLength()); else - lua_pushnil(L); - } else @@ -2577,7 +2577,7 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L) if (uin->pd != NULL && uin->pd->pc != uin->pc) pdfdoc_changed_error(L); @@ -254,65 +257,3 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uout = new_StructTreeRoot_userdata(L); uout->d = obj; uout->pc = uin->pc; -@@ -3038,12 +3038,12 @@ m_poppler_get_BOOL(Attribute, isHidden); - - static int m_Attribute_setHidden(lua_State * L) - { -- GBool i; -+ bool i; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- i = (GBool) lua_toboolean(L, 2); -+ i = (bool) lua_toboolean(L, 2); - ((Attribute *) uin->d)->setHidden(i); - return 0; - } -@@ -3180,7 +3180,7 @@ static int m_StructElement_getParentRef(lua_State * L) - // Ref is false if the C++ functione return false - static int m_StructElement_getPageRef(lua_State * L) - { -- GBool b; -+ bool b; - Ref *r; - udstruct *uin, *uout; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); -@@ -3226,16 +3226,16 @@ static int m_StructElement_setRevision(lua_State * L) - - static int m_StructElement_getText(lua_State * L) - { -- GBool i; -+ bool i; - GooString *gs; - udstruct *uin; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); - if (uin->pd != NULL && uin->pd->pc != uin->pc) - pdfdoc_changed_error(L); -- i = (GBool) lua_toboolean(L, 2); -+ i = (bool) lua_toboolean(L, 2); - gs = ((StructElement *) uin->d)->getText(i); - if (gs != NULL) -- lua_pushlstring(L, gs->getCString(), gs->getLength()); -+ lua_pushlstring(L, gs->c_str(), gs->getLength()); - else - lua_pushnil(L); - return 1; -@@ -3321,7 +3321,7 @@ static int m_StructElement_findAttribute(lua_State * L) - { - Attribute::Type t; - Attribute::Owner o; -- GBool g; -+ bool g; - udstruct *uin, *uout; - const Attribute *a; - uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); -@@ -3329,7 +3329,7 @@ static int m_StructElement_findAttribute(lua_State * L) - pdfdoc_changed_error(L); - t = (Attribute::Type) luaL_checkint(L,1); - o = (Attribute::Owner) luaL_checkint(L,2); -- g = (GBool) lua_toboolean(L, 3); -+ g = (bool) lua_toboolean(L, 3); - a = ((StructElement *) uin->d)->findAttribute(t,g,o); - - if (a!=NULL){ diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a6fedd78f0..2287a2ff08 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -111,12 +111,12 @@ "&id=" revision)) (file-name (string-append "texlive-bin-" name)) (sha256 (base32 hash))))) - (arch-revision "e1975bce0b9d270d7c9773c5beb7e87d61ee8f57")) + (arch-revision "418dd6f008c3d41a461353fdb60f2d73d87c58ed")) (append (search-patches "texlive-bin-CVE-2018-17407.patch" "texlive-bin-luatex-poppler-compat.patch") (list - (arch-patch "pdftex-poppler0.72.patch" arch-revision - "0p46b6xxxg2s3hx67r0wpz16g3qygx65hpc581xs3jz5pvsiq3y7") + (arch-patch "pdftex-poppler0.75.patch" arch-revision + "1cqpcp7h1qyxyp3wjbpcmx2wgvj9ywpz60hvy280mp9w633yzyg3") (arch-patch "xetex-poppler-fixes.patch" arch-revision "1jj1p5zkjljb7id9pjv29cw0cf8mwrgrh4ackgzz9c200vaqpsvx"))))))) (build-system gnu-build-system) @@ -197,17 +197,21 @@ #t)) (add-after 'unpack 'use-code-for-new-poppler (lambda _ - (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc" "texk/web2c/pdftexdir/pdftoepdf.cc") - (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.75.0.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler (lambda _ - ;; Adjust for deprecated types in Poppler 0.73. + ;; Adjust for deprecated types in Poppler 0.73 and later. (substitute* (append (find-files "texk/web2c/luatexdir/" "\\.(cc|w)$") '("texk/web2c/pdftexdir/pdftosrc.cc")) + (("GBool") "bool") + (("gFalse") "false") + (("gTrue") "true") + (("getCString") "c_str") (("Guint") "unsigned int") (("Guchar") "unsigned char")) #t)) -- cgit v1.2.3 From 50943b4878623f17c688766b8ff72d9f3ce7ffb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Apr 2019 01:14:20 +0200 Subject: gnu: lcms: Incorporate grafted changes. * gnu/packages/ghostscript.scm (lcms)[replacement]: Remove. [source](patches): New field. (lcms/fixed): Remove variable. --- gnu/packages/ghostscript.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 53a9b60fdb..f724fe3ff1 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -47,12 +47,13 @@ (define-public lcms (package (name "lcms") - (replacement lcms/fixed) (version "2.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lcms/lcms/" version "/lcms2-" version ".tar.gz")) + + (patches (search-patches "lcms-CVE-2018-16435.patch")) (sha256 (base32 "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8")))) (build-system gnu-build-system) @@ -68,14 +69,6 @@ Consortium standard (ICC), approved as ISO 15076-1.") (home-page "http://www.littlecms.com/") (properties '((cpe-name . "little_cms_color_engine"))))) -(define lcms/fixed - (package - (inherit lcms) - (source - (origin - (inherit (package-source lcms)) - (patches (search-patches "lcms-CVE-2018-16435.patch")))))) - (define-public libpaper (package (name "libpaper") -- cgit v1.2.3 From de1b5e4959bb3c499cde5bae14f8ec6a0c85630c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:44:50 +0200 Subject: gnu: openjpeg: Incorporate grafted changes. * gnu/packages/image.scm (openjpeg): Update to 2.3.1. [replacement]: Remove. [source]: Change to GIT-FETCH. --- gnu/packages/image.scm | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 08b4be5148..6c0ae474e8 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -580,18 +580,16 @@ work.") (define-public openjpeg (package (name "openjpeg") - (version "2.3.0") - (replacement openjpeg-2.3.1) - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/uclouvain/openjpeg/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "06npqzkg20avnygdwaqpap91r7qpdqgrn39adj2bl8v0pg0qgirx")))) + (version "2.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uclouvain/openjpeg") + (commit (string-append "v" version)))) + (file-name (git-file-name "openjpeg" version)) + (sha256 + (base32 + "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments ;; Trying to run `$ make check' results in a no rule fault. @@ -615,20 +613,6 @@ error-resilience, a Java-viewer for j2k-images, ...") (home-page "https://github.com/uclouvain/openjpeg") (license license:bsd-2))) -(define-public openjpeg-2.3.1 - (package - (inherit openjpeg) - (version "2.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/uclouvain/openjpeg") - (commit (string-append "v" version)))) - (file-name (git-file-name "openjpeg" version)) - (sha256 - (base32 - "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))))) - (define-public openjpeg-1 (package (inherit openjpeg) (name "openjpeg") -- cgit v1.2.3 From 8de1979d7c2ad52100bd37ae0180e598e68d1c7c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 23:31:58 +0200 Subject: gnu: openjpeg: Don't build 'libopenjp2.a'. * gnu/packages/image.scm (openjpeg)[arguments]: Add #:configure-flags. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 6c0ae474e8..9adbf78390 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -592,8 +592,8 @@ work.") "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb")))) (build-system cmake-build-system) (arguments - ;; Trying to run `$ make check' results in a no rule fault. - '(#:tests? #f)) + '(#:tests? #f ;TODO: requires a 1.1 GiB data repository + #:configure-flags '("-DBUILD_STATIC_LIBS=OFF"))) (inputs `(("lcms" ,lcms) ("libpng" ,libpng) -- cgit v1.2.3 From 8b5b3acab3c98bf58e14fc55399a8b3a098094ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 May 2019 22:39:23 +0200 Subject: gnu: libpng: Remove graft for 1.6.37. * gnu/packages/image.scm (libpng): Update to 1.6.37. [replacement]: Remove field. (libpng-1.6.37): Remove variable. --- gnu/packages/image.scm | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9adbf78390..10c2f82153 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -86,8 +86,7 @@ (define-public libpng (package (name "libpng") - (version "1.6.36") - (replacement libpng-1.6.37) + (version "1.6.37") (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" @@ -100,7 +99,7 @@ "/libpng16/libpng-" version ".tar.xz"))) (sha256 (base32 - "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc")))) + "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))) (build-system gnu-build-system) ;; libpng.la says "-lz", so propagate it. @@ -113,25 +112,6 @@ library. It supports almost all PNG features and is extensible.") (license license:zlib) (home-page "http://www.libpng.org/pub/png/libpng.html"))) -;; This graft exists to fix CVE-2018-14048, CVE-2018-14550, and CVE-2019-7317. -(define-public libpng-1.6.37 - (package - (inherit libpng) - (version "1.6.37") - (source (origin - (method url-fetch) - (uri (list (string-append "mirror://sourceforge/libpng/libpng16/" - version "/libpng-" version ".tar.xz") - (string-append - "ftp://ftp.simplesystems.org/pub/libpng/png/src" - "/libpng16/libpng-" version ".tar.xz") - (string-append - "ftp://ftp.simplesystems.org/pub/libpng/png/src/history" - "/libpng16/libpng-" version ".tar.xz"))) - (sha256 - (base32 - "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))))) - ;; libpng-apng should be updated when the APNG patch is released: ;; (define-public libpng-apng -- cgit v1.2.3 From 1ec290e27a52f92373d06b76afb0b677ea5d4aa0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:08:36 +0200 Subject: gnu: curl: Update to 7.64.1. * gnu/packages/curl.scm (curl): Update to 7.64.1. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index c8c1b0ca0d..32b120541d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,14 +51,14 @@ (define-public curl (package (name "curl") - (version "7.64.0") + (version "7.64.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "00b0mw4fc1pbmbh55maab24x3ijdvkbpl1s4njfa4jnl6kx16brg")))) + "1cwg2skp953cqxbwn9ychy0lv4p3l38bsy3zz9xy6747gwm36llj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit v1.2.3 From 2da9b81837fd1e6f08a10952784d3358be982855 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:09:06 +0200 Subject: gnu: harfbuzz: Update to 2.4.0. * gnu/packages/gtk.scm (harfbuzz): Update to 2.4.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0850c2bd5b..0549ca31c8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -177,7 +177,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "0s74ramsbfa183rxkidqgfd2vbhrwicnrqzqsq440dwibffnj1gj")))) + "1mpah6kwqid1kxsj4rwqsniivqbrx231j65v51yncx6s0dch0dch")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 922fbf8a66306c59d5fc0078bd9cf91eafce381e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:10:26 +0200 Subject: gnu: jemalloc: Update to 5.2.0. * gnu/packages/jemalloc.scm (jemalloc): Update to 5.2.0. --- gnu/packages/jemalloc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index cb870208e4..aa8493fd1d 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -32,7 +32,7 @@ (define-public jemalloc (package (name "jemalloc") - (version "5.1.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (string-append @@ -40,7 +40,7 @@ version "/jemalloc-" version ".tar.bz2")) (sha256 (base32 - "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk")))) + "1d73a5c5qdrwck0fa5pxz0myizaf3s9alsvhiqwrjahdlr29zgkl")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1f62621607fa5fa3914303e793ddb56d7455ac94 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:10:49 +0200 Subject: gnu: python-more-itertools: Update to 7.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 7.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6d84932a6..bf1c0e3eb9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14280,14 +14280,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "6.0.0") + (version "7.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1lfrx2ndnilla3a5lhpjc1wjgkplkxrhp5nyn6ys2l93jkil802r")))) + "0npsg9rbzvjrf176bf1p7239lkq0laqv11j81aixpn5al65p9r63")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From f6e25b3358b8db6c115df9915c989c6afa0c007f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:11:16 +0200 Subject: gnu: python: Update to 3.7.3. * gnu/packages/python.scm (python-3.7): Update to 3.7.3. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a26a88e6d9..4fd7948327 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -317,7 +317,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.2") + (version "3.7.3") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -328,7 +328,7 @@ data types.") "python-3-search-paths.patch")) (sha256 (base32 - "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq")) + "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 46d258cbe2ad8f038ed805cac640d13604f54ea6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:31:07 +0200 Subject: gnu: pixman: Update to 0.38.4. * gnu/packages/xdisorg.scm (pixman): Update to 0.38.4. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 03b27f35a5..c30e711946 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -353,7 +353,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.38.0") + (version "0.38.4") (source (origin (method url-fetch) (uri (string-append @@ -361,7 +361,7 @@ following the mouse.") version ".tar.gz")) (sha256 (base32 - "1a0ci5ni7wngh59m0m00wzvhrc39aqj54yj88msw5msn07pjnnd7")) + "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 3d8f6577bf0ff68d5b73ca713d247319bdd30f03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:33:10 +0200 Subject: gnu: util-linux: Update to 2.33.2. * gnu/packages/linux.scm (util-linux): Update to 2.33.2. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b39f45338f..68d022cffe 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -645,7 +645,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.33.1") + (version "2.33.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -653,7 +653,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "08ggvgrb59m5jbq29950xxirsgv4xj3nwsc7vf82nyg1nvrxjjy1")) + "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 0a404bdb5ec415357b14b7780d4eae4b42a4014b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:34:28 +0200 Subject: gnu: libuv: Update to 1.28.0. * gnu/packages/libevent.scm (libuv): Update to 1.28.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 0ec707bcb7..e8d2892f74 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.27.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1jndi12800p1r34rc41kaxhwrb3cb3pcsnkyp3v0c1k7ld3p124d")))) + "1b86gsigfviacq47wdk82avzh5ipz6c06in65qclf805ssi8gbrh")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From f1e9999b5f69e4534a0f74acf3080b0e34bdcc98 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Apr 2019 15:37:55 +0200 Subject: gnu: boost: Update to 1.70.0. * gnu/packages/boost.scm (boost): Update to 1.70.0. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b83bd73a39..73b4cff4c8 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -44,7 +44,7 @@ (define-public boost (package (name "boost") - (version "1.69.0") + (version "1.70.0") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -56,7 +56,7 @@ version-with-underscores ".tar.bz2")))) (sha256 (base32 - "01j4n142dz20lcgqji8d8hspp04p1nv7m8i6dz8w5lchfdhx8clg")) + "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) -- cgit v1.2.3 From 56e95d54d209c2428f970d65d9b27ae4168449ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:07:14 +0200 Subject: gnu: python-pytest: Update to 4.4.1. * gnu/packages/check.scm (python-pytest): Update to 4.4.1. [arguments]: Enable previously failing tests. --- gnu/packages/check.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 6103f8e3f7..ef6b29f17d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -686,14 +686,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "4.3.1") + (version "4.4.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "08q58ad8vaxyb57ll8m611yb4xwzzhp09kxafmyqrrps6cnalbjr")))) + "1xcmic8wzaj00rn1lg4ib4prh2f4lzpiaadk35qlv8hcny1j505p")))) (build-system python-build-system) (arguments `(#:phases @@ -707,13 +707,7 @@ standard library.") " and not test_argcomplete" ;; This test tries to override PYTHONPATH, and ;; subsequently fails to locate the test libraries. - " and not test_collection" - ;; These tests fail when run in verbose mode: - ;; . - " and not test_dont_rewrite_if_hasattr_fails" - " and not test_len" - " and not test_custom_repr" - " and not test_name"))))))) + " and not test_collection"))))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-attrs" ,python-attrs-bootstrap) -- cgit v1.2.3 From 123bba720d569e533d45173c472475d655541dae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 May 2019 23:29:03 +0200 Subject: gnu: python-hypothesis: Update to 4.18.3. * gnu/packages/check.scm (python-hypothesis): Update to 4.18.3. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ef6b29f17d..9172c2c5e0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1497,13 +1497,13 @@ instantly.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "4.7.19") + (version "4.18.3") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "18740bkpvj4ygmvzxnhakxdmj2igvgyayczyajll9gz5x47d9mjy")))) + "0a35nwqyjnm4cphi43xracqpkws0ip61mndvqb1iqq7gkva83lb1")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From a5e9413ce874d8e26f78361a91965f6ff9735bf4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 3 May 2019 23:46:29 -0400 Subject: gnu: python: Disable failing test. Fixes issue #35556 (see: https://bugs.gnu.org/35556). * gnu/packages/python.scm (python-3.7)[make-flags]: Exclude the test "test_asyncio", which currently fails. --- gnu/packages/python.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4fd7948327..244e0d1a1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -352,8 +352,11 @@ data types.") (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:make-flags _) - ;; Strip tests exclusions that have to do with Python 2 only. - `(list (format #f "TESTOPTS=-j~d" (parallel-job-count)))) + `(list (string-append + (format #f "TESTOPTS=-j~d" (parallel-job-count)) + ;; Exclude the following test, which fails as of 3.7.3 (see: + ;; https://bugs.python.org/issue35998). + " --exclude test_asyncio"))) ((#:phases phases) `(modify-phases ,phases ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it -- cgit v1.2.3 From 176003dafe8bda6cc07c81f4a8c97af8e529427c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:57:49 +0200 Subject: gnu: meson: Update to 0.50.1. * gnu/packages/build-tools.scm (meson): Update to 0.50.1. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 71b1756d3b..34f0037e6a 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -160,7 +160,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.50.0") + (version "0.50.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "07q2wz23wjfk8z66mli1cc9as0ycjp5f39fd4awny82qv8nw86ra")))) + "1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From de7dae6e1014c749ce209f67e8db156dd2fc7b9e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:58:11 +0200 Subject: gnu: CMake: Update to 3.14.3. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.3. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index b999c0c170..179b3fec50 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.0") + (version "3.14.3") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "00jmwwkr3ybsr4hz4hgiv75zaak5yirp110zf131kby2ndkvlxma")) + "0cmnyk9agdgwnc4svzafhddqgcrhvwp5cgmn54mih1qkx1j0np91")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 3b08c873d857b5585204535da8906e53c8aed568 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:58:30 +0200 Subject: gnu: fontforge: Update to 20190413. * gnu/packages/fontutils.scm (fontforge): Update to 20190413. --- gnu/packages/fontutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 0259e374d9..820dd6f666 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -555,14 +555,14 @@ definitions.") (define-public fontforge (package (name "fontforge") - (version "20190317") + (version "20190413") (source (origin (method url-fetch) (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) - (sha256 (base32 - "1ddqbpc32cgbccdnv0lfw0qhj59hcqzb7616ph5lkvm91pnas4dp")))) + (sha256 + (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 27ed6960beda88e823790f3ab4cd9af9772c00ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:58:57 +0200 Subject: gnu: icu4c: Update to 64.2. * gnu/packages/icu4c.scm (icu4c): Update to 64.2. [native-inputs]: Add PYTHON. --- gnu/packages/icu4c.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 6e93d6aed9..054c41d361 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -23,6 +23,7 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) @@ -32,7 +33,7 @@ (define-public icu4c (package (name "icu4c") - (version "63.1") + (version "64.2") (source (origin (method url-fetch) (uri (string-append @@ -42,8 +43,10 @@ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) (sha256 - (base32 "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05")))) + (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) + (native-inputs + `(("python" ,python))) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From e77412362f8217eaa9afa34f44a4b85aba23e91f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:59:25 +0200 Subject: gnu: OpenBLAS: Update to 0.3.6. * gnu/packages/maths.scm (openblas): Update to 0.3.6. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d59028599f..49c8de8979 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2973,7 +2973,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.5") + (version "0.3.6") (source (origin (method url-fetch) @@ -2982,7 +2982,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "062kg4ny1ywz7k5grpb4pbf0hba0w6manbajwkmv4f477a31sxpl")))) + "1r2g9zzwq5dm8vjd19pxwggfvfzy56cvkmpmp5d014qr3svgmsap")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 63432c96473e689b9d01c366a507bec1f9e05f22 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:59:56 +0200 Subject: gnu: SQLite: Update to 3.28.0. * gnu/packages/sqlite.scm (sqlite): Update to 3.28.0. --- gnu/packages/sqlite.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index caa98c0861..6d6df17f90 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -46,7 +46,7 @@ (define-public sqlite (package (name "sqlite") - (version "3.27.1") + (version "3.28.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -62,7 +62,7 @@ numeric-version ".tar.gz"))) (sha256 (base32 - "1y7l225jm18fz6z3vyffrkl9k6qi964w1c5ri4giixizyy7jpaal")))) + "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 45a3ad2ea6b902c7f154168fdfd834937af76183 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 14:00:21 +0200 Subject: gnu: nghttp2: Update to 1.38.0. * gnu/packages/web.scm (nghttp2): Update to 1.38.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7c3744cc5b..6d591b88cb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6354,7 +6354,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.37.0") + (version "1.38.0") (source (origin (method url-fetch) @@ -6363,7 +6363,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "1ds7ilgdsq1dykp285cxrl17xsgkxp0a2413wcgvkx0p9cb0n2da")))) + "1y47xsg7nbfwqx77rc5phi5rh6j8l1x3k9ig6yscchc2hmhwfxgg")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From ae528aaf19f3828d3d7d204b15570800e1bbf100 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 14:01:04 +0200 Subject: gnu: perl: Update to 5.28.2. * gnu/packages/perl.scm (perl): Update to 5.28.2. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 58d6da2d01..8f953cf3ad 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -65,14 +65,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.28.1") + (version "5.28.2") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry")) + "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From 3784b580efcf82f38299eee516dfc5be75e5a4fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 14:01:36 +0200 Subject: gnu: QPDF: Update to 8.4.1. * gnu/packages/pdf.scm (qpdf): Update to 8.4.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 850e1db3e5..659e9b6bfe 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -663,14 +663,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files (define-public qpdf (package (name "qpdf") - (version "8.4.0") + (version "8.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version "/qpdf-" version ".tar.gz")) (sha256 (base32 - "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r")) + "1fsfy38dnm9cy1j40jw5x8vn84l6f2kgb68rdjl0wxignfw05z87")) (modules '((guix build utils))) (snippet ;; Replace shebang with the bi-lingual shell/Perl trick to remove -- cgit v1.2.3 From 420b013724a99d3b00507669f57c5de135dd758f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 May 2019 16:23:57 +0200 Subject: gnu: libpng: Don't build 'libpng16.a'. * gnu/packages/image.scm (libpng)[arguments]: Add #:configure-flags. --- gnu/packages/image.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 10c2f82153..e76661c7d4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -101,6 +101,8 @@ (base32 "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) ;; libpng.la says "-lz", so propagate it. (propagated-inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From a8bb8fccd82a10a46f127b2235675b4f6cbaaf98 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 May 2019 18:01:12 +0200 Subject: gnu: harfbuzz: Update source hash. The previous tarball was modified in-place; see . * gnu/packages/gtk.scm (harfbuzz)[source](sha256): Update. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0549ca31c8..a0308cb036 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "1mpah6kwqid1kxsj4rwqsniivqbrx231j65v51yncx6s0dch0dch")))) + "0vrkvdlmihdg62a4c6h5kx27khc33xmb95l50zgnwnavvpwyyw5l")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 4e933afda42c41a5425fe460a0ee7ba5435e612b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 27 Apr 2019 23:46:40 -0400 Subject: gnu: python-cffi: Fix tests. Fixes issue #35371 (see: https://bugs.gnu.org/35371). * gnu/packages/libffi.scm (python-cffi)[phases] {patch-paths-of-dynamically-loaded-libraries}: Add phase. [home-page]: Update URL. --- gnu/packages/libffi.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index f47f7623b4..3a16b752cd 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,6 +127,30 @@ conversions for values passed between the two languages.") (("'cc testownlib") "'gcc testownlib")) (invoke "py.test" "-v" "c/" "testing/") #t)) + (add-before 'check 'patch-paths-of-dynamically-loaded-libraries + (lambda* (#:key inputs #:allow-other-keys) + ;; Shared libraries should be referred by their absolute path as + ;; using find_library or the like with their name fail when the + ;; resolved .so object is a linker script rather than an ELF + ;; binary (this is a limitation of the ctype library of Python). + (let* ((glibc (assoc-ref inputs "libc")) + (libm (string-append glibc "/lib/libm.so.6")) + (libc (string-append glibc "/lib/libc.so.6"))) + (substitute* '("testing/cffi0/test_function.py" + "testing/cffi0/test_parsing.py" + "testing/cffi0/test_unicode_literals.py" + "testing/cffi0/test_zdistutils.py" + "testing/cffi1/test_recompiler.py") + (("lib_m = ['\"]{1}m['\"]{1}") + (format #f "lib_m = '~a'" libm))) + (substitute* '("testing/cffi0/test_verify.py" + "testing/cffi1/test_verify1.py") + (("lib_m = \\[['\"]{1}m['\"]{1}\\]") + (format #f "lib_m = ['~a']" libm))) + (substitute* "c/test_c.py" + (("find_and_load_library\\(['\"]{1}c['\"]{1}") + (format #f "find_and_load_library('~a'" libc))) + #t))) (add-before 'check 'disable-failing-test ;; This is assumed to be a libffi issue: ;; https://bitbucket.org/cffi/cffi/issues/312/tests-failed-with-armv8 @@ -133,10 +158,9 @@ conversions for values passed between the two languages.") (substitute* "testing/cffi0/test_ownlib.py" (("ret.left") "ownlib.left")) #t))))) - (home-page "https://cffi.readthedocs.org") + (home-page "https://cffi.readthedocs.io/") (synopsis "Foreign function interface for Python") - (description - "Foreign Function Interface for Python calling C code.") + (description "Foreign Function Interface for Python calling C code.") (license expat))) (define-public python2-cffi -- cgit v1.2.3 From 996186b64de91927d2868e43804d97dd95c3794c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 5 May 2019 15:20:18 +0200 Subject: gnu: lz4: Update to 1.9.1. * gnu/packages/compression.scm (lz4): Update to 1.9.1. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4324ac4d96..890ff7691a 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -722,7 +722,7 @@ decompression of some loosely related file formats used by Microsoft.") (define-public lz4 (package (name "lz4") - (version "1.8.3") + (version "1.9.1") (source (origin (method git-fetch) @@ -730,7 +730,7 @@ decompression of some loosely related file formats used by Microsoft.") (commit (string-append "v" version)))) (sha256 (base32 - "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g")) + "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs `(("valgrind" ,valgrind))) ;for tests -- cgit v1.2.3 From fd6983d10ff987ca3fffca601b5edf66a293e380 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 17:14:29 +0100 Subject: gnu: gsasl: Use the MIT Kerberos implementation instead of GSS. * gnu/packages/gsasl.scm (gsasl)[inputs]: Change from GSS to MIT-KRB5. [arguments]: New field. --- gnu/packages/gsasl.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 127b476ef3..9296f3d80f 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -95,9 +95,11 @@ the underlying security implementation.") (("test-lock\\$\\(EXEEXT\\) ") "")) #t)))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-gssapi-impl=mit"))) (inputs `(("libidn" ,libidn) ("libntlm" ,libntlm) - ("gss" ,gss) + ("mit-krb5" ,mit-krb5) ("zlib" ,zlib))) (propagated-inputs ;; Propagate GnuTLS because libgnutls.la reads `-lnettle', and Nettle is a -- cgit v1.2.3 From 828d3765a71ce1b74d1ab122c84d5c16eabf98b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Feb 2019 17:16:25 +0100 Subject: gnu: curl: Build against MIT Kerberos instead of GSS. * gnu/packages/curl.scm (curl)[inputs]: Change from GSS to MIT-KRB5. [arguments]: Adjust accordingly. --- gnu/packages/curl.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 32b120541d..a83760adc1 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -37,8 +37,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages golang) #:use-module (gnu packages groff) - #:use-module (gnu packages gsasl) #:use-module (gnu packages guile) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libidn) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) @@ -63,7 +63,6 @@ (outputs '("out" "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) - ("gss" ,gss) ("libidn" ,libidn) ;; TODO XXX ;; Curl doesn't actually use or refer to libssh2 because the build @@ -71,6 +70,7 @@ ;; a mass rebuild is appropriate (e.g. core-updates). ("libssh2" ,libssh2-1.8.0) ("openldap" ,openldap) + ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") ("zlib" ,zlib))) (native-inputs @@ -89,8 +89,10 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi" - "--disable-static") + `(#:configure-flags (list "--with-gnutls" + (string-append "--with-gssapi=" + (assoc-ref %build-inputs "mit-krb5")) + "--disable-static") ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 52cb7748cbdb61b87e5c2bbc99e12284f21a304d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 14 May 2019 20:08:36 +0200 Subject: gnu: curl: Remove unused input. * gnu/packages/curl.scm (curl)[inputs]: Remove LIBSSH2-1.8.0. * gnu/packages/ssh.scm (libssh2-1.8.0): Remove variable. --- gnu/packages/curl.scm | 5 ----- gnu/packages/ssh.scm | 18 ------------------ 2 files changed, 23 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a83760adc1..9a13815e3d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -64,11 +64,6 @@ "doc")) ;1.2 MiB of man3 pages (inputs `(("gnutls" ,gnutls) ("libidn" ,libidn) - ;; TODO XXX - ;; Curl doesn't actually use or refer to libssh2 because the build - ;; is not configured with '--with-libssh2'. Remove this input when - ;; a mass rebuild is appropriate (e.g. core-updates). - ("libssh2" ,libssh2-1.8.0) ("openldap" ,openldap) ("mit-krb5" ,mit-krb5) ("nghttp2" ,nghttp2 "lib") diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index e887cd7e70..a763c6aba2 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -143,24 +143,6 @@ a server that supports the SSH-2 protocol.") (license license:bsd-3) (home-page "https://www.libssh2.org/"))) -;; XXX A hidden special obsolete libssh2 for temporary use in the curl package. -;; -(define-public libssh2-1.8.0 - (hidden-package - (package - (inherit libssh2) - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.libssh2.org/download/libssh2-" - version ".tar.gz")) - (sha256 - (base32 - "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr")) - (patches - (search-patches "libssh2-fix-build-failure-with-gcrypt.patch"))))))) - (define-public openssh (package (name "openssh") -- cgit v1.2.3 From 43d9ed7792808638eabb43aa6133f1d6186c520b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 15 May 2019 01:05:30 +0200 Subject: gnu: lzip: Update to 1.21. * gnu/packages/compression.scm (lzip): Update to 1.21. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 890ff7691a..8db1136be0 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -536,14 +536,14 @@ some compression ratio).") (define-public lzip (package (name "lzip") - (version "1.20") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lzip-" version ".tar.gz")) (sha256 (base32 - "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9")))) + "12qdcw5k1cx77brv9yxi1h4dzwibhfmdpigrj43nfk8nscwm12z4")))) (build-system gnu-build-system) (home-page "https://www.nongnu.org/lzip/lzip.html") (synopsis "Lossless data compressor based on the LZMA algorithm") -- cgit v1.2.3 From 74659ebef1f6da73eac2ac1bf357c85e8add1118 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 May 2019 00:30:09 +0200 Subject: gnu: curl: Remove graft for 7.65.0. * gnu/packages/curl.scm (curl): Update to 7.65.0. (curl-7.65.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 338d26d2e3..5be31ff73e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,15 +51,14 @@ (define-public curl (package (name "curl") - (replacement curl-7.65.0) - (version "7.64.1") + (version "7.65.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1cwg2skp953cqxbwn9ychy0lv4p3l38bsy3zz9xy6747gwm36llj")))) + "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -144,19 +143,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.65.0 - (package - (inherit curl) - (version "7.65.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))))) - (define-public kurly (package (name "kurly") -- cgit v1.2.3 From 1b4c3faff4a412e8478184bc7b41fa23c78c4320 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 May 2019 18:16:45 +0200 Subject: gnu: curl: Remove unused module import. This is a follow-up to commit 52cb7748cbdb61b87e5c2bbc99e12284f21a304d. * gnu/packages/curl.scm: Don't import (gnu packages ssh). --- gnu/packages/curl.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 5be31ff73e..6d1ab81d07 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages web)) -- cgit v1.2.3 From a3e53041b87932e2a44b109d7f28cc331bc5021b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 May 2019 18:14:01 +0200 Subject: gnu: perl: Update to 5.30.0. * gnu/packages/patches/perl-no-sys-dirs.patch: Adjust Errno.h hunk. * gnu/packages/perl.scm (perl): Update to 5.30.0. --- gnu/packages/patches/perl-no-sys-dirs.patch | 23 ++++++++++++++++------- gnu/packages/perl.scm | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gnu/packages/patches/perl-no-sys-dirs.patch b/gnu/packages/patches/perl-no-sys-dirs.patch index 31d53e0353..2269d715c7 100644 --- a/gnu/packages/patches/perl-no-sys-dirs.patch +++ b/gnu/packages/patches/perl-no-sys-dirs.patch @@ -112,20 +112,29 @@ Only in perl-5.20.0/: Configure.orig diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL --- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 +++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 -@@ -126,11 +126,7 @@ +@@ -114,7 +114,7 @@ sub get_files { + # When cross-compiling we may store a path for gcc's "sysroot" option: + my $sysroot = $Config{sysroot} || ''; + my $linux_errno_h; +- if ($^O eq 'linux') { ++ if (0) { + # Some Linuxes have weird errno.hs which generate + # no #file or #line directives + ($linux_errno_h) = grep { -e $_ } map { "$_/errno.h" } +@@ -134,13 +134,6 @@ sub get_files { if ($dep =~ /(\S+errno\.h)/) { $file{$1} = 1; } - } elsif ($^O eq 'linux' && - $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i +- $Config{gccversion} !~ /intel/i && - # might be using, say, Intel's icc +- $linux_errno_h - ) { -+ } elsif (0) { - # When cross-compiling we may store a path for gcc's "sysroot" option: - my $sysroot = $Config{sysroot} || ''; - # Some Linuxes have weird errno.hs which generate -Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +- $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place + $file{'/boot/develop/headers/posix/errno.h'} = 1; diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh --- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 +++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9ec802472a..8ae7558e7d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -65,14 +65,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.28.2") + (version "5.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da")) + "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5")) (patches (search-patches "perl-no-sys-dirs.patch" "perl-autosplit-default-time.patch" -- cgit v1.2.3 From e7809d96aa3853e09a90c42d4b5a5dbd84765964 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:38:52 +0200 Subject: gnu: bison: Update to 3.4.1. * gnu/packages/bison.scm (bison): Update to 3.4.1. --- gnu/packages/bison.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index ae37a8f80c..5f50ebf6b8 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -31,7 +31,7 @@ (define-public bison (package (name "bison") - (version "3.3.2") + (version "3.4.1") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "016qp59wxakz3ckxwyrmzxk406q0h286ydz8ww1m0pnrc5dy97h3")))) + "03c2pmq3bs0drdislnz6gm1rwz3n4pb2rz9navyxydppxg2rl597")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. -- cgit v1.2.3 From 45771d63c5b8e3c65b0bc5dfaca57c44e87128e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:40:41 +0200 Subject: gnu: cmake: Update to 3.14.4. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.4. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e49654a6d5..e77c97e11f 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.3") + (version "3.14.4") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0cmnyk9agdgwnc4svzafhddqgcrhvwp5cgmn54mih1qkx1j0np91")) + "1n9nzxq1dzbpa0pisdv7g57a8qr9b7n35vbfy489s1v602dxrd00")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 98be913d5b467bbc56b9fddeca6e9e7b6d402b21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:41:33 +0200 Subject: gnu: dbus: Update to 1.12.14. * gnu/packages/glib.scm (dbus): Update to 1.12.14. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2f70e8d875..b2d4bf5554 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -82,7 +82,7 @@ (define dbus (package (name "dbus") - (version "1.12.12") + (version "1.12.14") (source (origin (method url-fetch) (uri (string-append @@ -90,7 +90,7 @@ version ".tar.gz")) (sha256 (base32 - "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm")) + "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 91cf806425f3ebd7a5256c904ed882095e5ea12b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:41:58 +0200 Subject: gnu: libuv: Update to 1.29.1. * gnu/packages/libevent.scm (libuv): Update to 1.29.1. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index e8d2892f74..263fe7630f 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -124,14 +124,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.28.0") + (version "1.29.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1b86gsigfviacq47wdk82avzh5ipz6c06in65qclf805ssi8gbrh")))) + "032pr9366qsxl78bd4id2c5pfrjv1j997zm5a7a8dbycllyh91hl")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From 5dc3de3ac7cc1b748500072de730f84d3e63961e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 19:42:22 +0200 Subject: gnu: libidn2: Update to 2.2.0. * gnu/packages/libidn.scm (libidn2): Update to 2.2.0. --- gnu/packages/libidn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 1487a7644d..ea9ce70dfb 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -59,14 +59,14 @@ Java libraries.") (define-public libidn2 (package (name "libidn2") - (version "2.1.1a") + (version "2.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/" name "-" version ".tar.lz")) (sha256 (base32 - "1pdvar50hsgma40gmd7rgrwxhfbqfdpx5slxhl3jjpy1rcjgy9bd")))) + "1a5cv79q6b719jv4fpwjl3r0mmx9qcpla98v9dk64cgxn8f8di10")))) (native-inputs `(("lzip" ,lzip))) (inputs -- cgit v1.2.3 From bb9dec546f839c38b7955f78d46b5405af505f76 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 20:50:38 +0200 Subject: gnu: gawk: Update to 5.0.0. * gnu/packages/patches/libgpg-error-gawk-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnupg.scm (libgpg-error)[source](modules, patches): New fields. * gnu/packages/gawk.scm (gawk): Update to 5.0.0. --- gnu/local.mk | 1 + gnu/packages/gawk.scm | 4 +- gnu/packages/gnupg.scm | 11 +- .../patches/libgpg-error-gawk-compat.patch | 155 +++++++++++++++++++++ 4 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libgpg-error-gawk-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index d531050254..06f3f3a802 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -994,6 +994,7 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ + %D%/packages/patches/libgpg-error-gawk-compat.patch \ %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 487020ad3b..9b7b93651f 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -30,13 +30,13 @@ (define-public gawk (package (name "gawk") - (version "4.2.1") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gawk/gawk-" version ".tar.xz")) (sha256 - (base32 "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi")))) + (base32 "01j409gharghgf7h0pjzywkimhz2ldrxf85nvf3sv1dl1vnr3w2h")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 47fcf5569d..230df101d5 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -85,7 +85,16 @@ version ".tar.bz2")) (sha256 (base32 - "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds")))) + "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds")) + (patches (search-patches "libgpg-error-gawk-compat.patch")) + ;; XXX: Remove this snippet with the gawk patch above. It avoids having + ;; to call autoreconf for the Makefile.am change to take effect. + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "src/Makefile.in" + (("namespace=errnos") "pkg_namespace=errnos")) + #t)))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") diff --git a/gnu/packages/patches/libgpg-error-gawk-compat.patch b/gnu/packages/patches/libgpg-error-gawk-compat.patch new file mode 100644 index 0000000000..85477b0be6 --- /dev/null +++ b/gnu/packages/patches/libgpg-error-gawk-compat.patch @@ -0,0 +1,155 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0. + +* src/Makefile.am: Use pkg_namespace (instead of namespace). +* src/mkerrnos.awk: Likewise. +* lang/cl/mkerrcodes.awk: Don't escape # in regexp. +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. + +-- + +In Gawk 5.0, regexp routines are replaced by Gnulib implementation, +which only allows escaping specific characters. + +GnuPG-bug-id: 4459 +Reported-by: Marius Schamschula +Signed-off-by: NIIBE Yutaka +--- + lang/cl/mkerrcodes.awk | 2 +- + src/Makefile.am | 2 +- + src/mkerrcodes.awk | 2 +- + src/mkerrcodes1.awk | 2 +- + src/mkerrcodes2.awk | 2 +- + src/mkerrnos.awk | 2 +- + src/mkstrtable.awk | 10 +++++----- + 7 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk +index ae29043..9a1fc18 100644 +--- a/lang/cl/mkerrcodes.awk ++++ b/lang/cl/mkerrcodes.awk +@@ -122,7 +122,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/Makefile.am b/src/Makefile.am +index ce1b882..f2590cb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile + + errnos-sym.h: Makefile mkstrtable.awk errnos.in + $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \ +- -v prefix=GPG_ERR_ -v namespace=errnos_ \ ++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \ + $(srcdir)/errnos.in >$@ + + +diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk +index 46d436c..e9c857c 100644 +--- a/src/mkerrcodes.awk ++++ b/src/mkerrcodes.awk +@@ -85,7 +85,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk +index a771a73..4578e29 100644 +--- a/src/mkerrcodes1.awk ++++ b/src/mkerrcodes1.awk +@@ -81,7 +81,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk +index ea58503..188f7a4 100644 +--- a/src/mkerrcodes2.awk ++++ b/src/mkerrcodes2.awk +@@ -91,7 +91,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk +index f79df66..15b1aad 100644 +--- a/src/mkerrnos.awk ++++ b/src/mkerrnos.awk +@@ -83,7 +83,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk +index c9de9c1..285e45f 100644 +--- a/src/mkstrtable.awk ++++ b/src/mkstrtable.awk +@@ -77,7 +77,7 @@ + # + # The variable prefix can be used to prepend a string to each message. + # +-# The variable namespace can be used to prepend a string to each ++# The variable pkg_namespace can be used to prepend a string to each + # variable and macro name. + + BEGIN { +@@ -102,7 +102,7 @@ header { + print "/* The purpose of this complex string table is to produce"; + print " optimal code with a minimum of relocations. */"; + print ""; +- print "static const char " namespace "msgstr[] = "; ++ print "static const char " pkg_namespace "msgstr[] = "; + header = 0; + } + else +@@ -110,7 +110,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +@@ -150,7 +150,7 @@ END { + else + print " gettext_noop (\"" last_msgstr "\");"; + print ""; +- print "static const int " namespace "msgidx[] ="; ++ print "static const int " pkg_namespace "msgidx[] ="; + print " {"; + for (i = 0; i < coded_msgs; i++) + print " " pos[i] ","; +@@ -158,7 +158,7 @@ END { + print " };"; + print ""; + print "static GPG_ERR_INLINE int"; +- print namespace "msgidxof (int code)"; ++ print pkg_namespace "msgidxof (int code)"; + print "{"; + print " return (0 ? 0"; + -- cgit v1.2.3 From 848e600d71bc7420ff08cc1f1fd40498b7817ab4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 May 2019 00:53:04 +0200 Subject: gnu: Remove help2man@1.47.6. * gnu/packages/man.scm (help2man): Update to 1.47.10. (help2man/latest): Remove variable. --- gnu/packages/man.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 04c800e95f..a24c7eff22 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -198,7 +198,7 @@ Linux kernel and C library interfaces employed by user-space programs.") (define-public help2man (package (name "help2man") - (version "1.47.6") + (version "1.47.10") (source (origin (method url-fetch) @@ -206,7 +206,7 @@ Linux kernel and C library interfaces employed by user-space programs.") version ".tar.xz")) (sha256 (base32 - "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr")))) + "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk")))) (build-system gnu-build-system) (arguments `(;; There's no `check' target. #:tests? #f)) @@ -224,18 +224,6 @@ Linux kernel and C library interfaces employed by user-space programs.") automatically.") (license gpl3+))) -(define-public help2man/latest - (package - (inherit help2man) - (version "1.47.10") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/help2man/help2man-" - version ".tar.xz")) - (sha256 - (base32 - "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk")))))) - (define-public scdoc (package (name "scdoc") -- cgit v1.2.3 From 13f3893b600e77c04b9962b8eea409f50e8efdbf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 26 May 2019 21:18:48 +0300 Subject: gnu: bash: Update to patch level 7. * gnu/packages/bash.scm (%patch-series-5.0): Add patches 3 through 7. --- gnu/packages/bash.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 4a884e6175..31c9a8b0cf 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -62,7 +62,12 @@ ;; 'download-patches' below. (patch-series (1 "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") - (2 "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47"))) + (2 "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47") + (3 "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf") + (4 "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l") + (5 "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") + (6 "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") + (7 "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of -- cgit v1.2.3 From f87a7cc60e058d2e07560d0d602747b567d9dce4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 May 2019 14:07:56 +0200 Subject: gnu: libev: Update to 4.25. * gnu/packages/libevent.scm (libev): Update to 4.25. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 263fe7630f..962a228e4b 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -100,7 +100,7 @@ loop.") (define-public libev (package (name "libev") - (version "4.24") + (version "4.25") (source (origin (method url-fetch) (uri (string-append "http://dist.schmorp.de/libev/Attic/libev-" @@ -108,7 +108,7 @@ loop.") ".tar.gz")) (sha256 (base32 - "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp")))) + "1295q0lkkbrlpd5dl5i48bh1rm8mjzh9y795jlvjz3bp4wf7wxbq")))) (build-system gnu-build-system) (home-page "http://software.schmorp.de/pkg/libev.html") (synopsis "Event loop loosely modelled after libevent") -- cgit v1.2.3 From 376a258f254eb58546b10ef74d1f5b98aa55deb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 13 Jun 2019 13:32:23 +0200 Subject: Reinstate "nls: Update 'de' translation of the manual." This reverts commit d69bbd8c70a98ae6f3257fb4b4098ee92eeaebfe. --- po/doc/guix-manual.de.po | 17215 +++++++++++++++++++++++---------------------- 1 file changed, 8630 insertions(+), 8585 deletions(-) diff --git a/po/doc/guix-manual.de.po b/po/doc/guix-manual.de.po index 059b248e90..96fbe58afe 100644 --- a/po/doc/guix-manual.de.po +++ b/po/doc/guix-manual.de.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: guix-manual 1.0.1-after-pre1\n" +"Project-Id-Version: guix-manual 1.0.1-pre1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2019-05-16 22:44+0200\n" -"PO-Revision-Date: 2019-05-17 00:29+0200\n" +"POT-Creation-Date: 2019-05-10 20:53+0200\n" +"PO-Revision-Date: 2019-06-07 00:54+0200\n" "Last-Translator: Florian Pelz \n" "Language-Team: German \n" "Language: de\n" @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#. #-#-#-#-# contributing.pot (guix 1.0.0.697-481ec) #-#-#-#-# +#. #-#-#-#-# contributing.pot (guix 1.0.1-pre1) #-#-#-#-# #. type: chapter -#. #-#-#-#-# guix.pot (guix 1.0.0.697-481ec) #-#-#-#-# +#. #-#-#-#-# guix.pot (guix 1.0.1-pre1) #-#-#-#-# #. type: menuentry -#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:141 +#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:139 #, no-wrap msgid "Contributing" msgstr "Mitwirken" @@ -67,7 +67,8 @@ msgid "The latest and greatest." msgstr "Das Neueste und Beste." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:103 doc/contributing.texi:104 +#: doc/contributing.texi:29 doc/contributing.texi:103 +#: doc/contributing.texi:104 #, no-wrap msgid "Running Guix Before It Is Installed" msgstr "Guix vor der Installation ausführen" @@ -78,7 +79,8 @@ msgid "Hacker tricks." msgstr "Hacker-Tricks." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:167 doc/contributing.texi:168 +#: doc/contributing.texi:29 doc/contributing.texi:167 +#: doc/contributing.texi:168 #, no-wrap msgid "The Perfect Setup" msgstr "Perfekt eingerichtet" @@ -89,7 +91,8 @@ msgid "The right tools." msgstr "Die richtigen Werkzeuge." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:231 doc/contributing.texi:232 +#: doc/contributing.texi:29 doc/contributing.texi:231 +#: doc/contributing.texi:232 #, no-wrap msgid "Packaging Guidelines" msgstr "Paketrichtlinien" @@ -100,7 +103,8 @@ msgid "Growing the distribution." msgstr "Die Distribution wachsen lassen." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:680 doc/contributing.texi:681 +#: doc/contributing.texi:29 doc/contributing.texi:680 +#: doc/contributing.texi:681 #, no-wrap msgid "Coding Style" msgstr "Code-Stil" @@ -111,7 +115,8 @@ msgid "Hygiene of the contributor." msgstr "Wie Mitwirkende hygienisch arbeiten." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:778 doc/contributing.texi:779 +#: doc/contributing.texi:29 doc/contributing.texi:778 +#: doc/contributing.texi:779 #, no-wrap msgid "Submitting Patches" msgstr "Einreichen von Patches" @@ -950,7 +955,7 @@ msgid "For Java packages containing a single class or a small class hierarchy, w msgstr "Bei Java-Paketen, die eine einzelne Klasse oder eine kleine Klassenhierarchie enthalten, benutzen wir den Klassennamen in Kleinbuchstaben und ersetzen dabei alle Vorkommen von @code{.} durch Striche und setzen das Präfix @code{java-} davor. Die Klasse @code{apache.commons.cli} wird also zum Paket @code{java-apache-commons-cli}." #. type: cindex -#: doc/contributing.texi:645 doc/guix.texi:1667 +#: doc/contributing.texi:645 doc/guix.texi:1665 #, no-wrap msgid "fonts" msgstr "Schriftarten" @@ -1143,7 +1148,7 @@ msgstr "Die Entwicklung wird mit Hilfe des verteilten Versionskontrollsystems Gi #. type: Plain text #: doc/contributing.texi:792 msgid "This mailing list is backed by a Debbugs instance accessible at @uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of submissions. Each message sent to that mailing list gets a new tracking number assigned; people can then follow up on the submission by sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking number (@pxref{Sending a Patch Series})." -msgstr "Diese Mailing-Liste setzt auf einer Debbugs-Instanz auf, die zugänglich ist unter @uref{https://bugs.gnu.org/guix-patches}, wodurch wir den Überblick über Eingereichtes behalten können. Jede an diese Mailing-Liste gesendete Nachricht bekommt eine neue Folgenummer zugewiesen, so dass man eine Folge-Email zur Einreichung an @code{@var{NNN}@@debbugs.gnu.org} senden kann, wobei @var{NNN} für die Folgenummer steht (siehe @ref{Sending a Patch Series})." +msgstr "Diese Mailing-Liste setzt auf einer Debbugs-Instanz auf, die zugänglich ist unter @uref{https://bugs.gnu.org/guix-patches}, wodurch wir den Überblick über Eingereichtes behalten können. Jede an diese Mailing-Liste gesendete Nachricht bekommt eine neue Folgenummer zugewiesen, so dass man eine Folge-E-Mail zur Einreichung an @code{@var{NNN}@@debbugs.gnu.org} senden kann, wobei @var{NNN} für die Folgenummer steht (siehe @ref{Sending a Patch Series})." #. type: Plain text #: doc/contributing.texi:796 @@ -1414,7 +1419,7 @@ msgstr "" "@frenchspacing on" #. type: title -#: doc/guix.texi:7 doc/guix.texi:93 +#: doc/guix.texi:7 doc/guix.texi:92 #, no-wrap msgid "GNU Guix Reference Manual" msgstr "Referenzhandbuch zu GNU Guix" @@ -1426,1836 +1431,1840 @@ msgid "version.texi" msgstr "version-de.texi" #. type: copying -#: doc/guix.texi:67 -msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@*" +#: doc/guix.texi:66 +#, fuzzy +#| msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@*" +msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@*" msgstr "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@*" #. type: copying -#: doc/guix.texi:74 +#: doc/guix.texi:73 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''." msgstr "Es ist Ihnen gestattet, dieses Dokument zu vervielfältigen, weiterzugeben und/oder zu verändern, unter den Bedingungen der GNU Free Documentation License, entweder gemäß Version 1.3 der Lizenz oder (nach Ihrer Option) einer späteren Version, die von der Free Software Foundation veröffentlicht wurde, ohne unveränderliche Abschnitte, ohne vorderen Umschlagtext und ohne hinteren Umschlagtext. Eine Kopie der Lizenz finden Sie im Abschnitt mit dem Titel „GNU Free Documentation License“." #. type: dircategory -#: doc/guix.texi:76 +#: doc/guix.texi:75 #, no-wrap msgid "System administration" msgstr "Systemadministration" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Guix: (guix)" msgstr "Guix: (guix.de)" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Manage installed software and system configuration." msgstr "Installierte Software und Systemkonfigurationen verwalten." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix package: (guix)Invoking guix package" msgstr "guix package: (guix.de)guix package aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Installing, removing, and upgrading packages." msgstr "Pakete installieren, entfernen und aktualisieren." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix gc: (guix)Invoking guix gc" msgstr "guix gc: (guix.de)guix gc aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Reclaiming unused disk space." msgstr "Unbenutzten Plattenspeicher wieder freigeben." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix pull: (guix)Invoking guix pull" msgstr "guix pull: (guix.de)guix pull aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Update the list of available packages." msgstr "Die Liste verfügbarer Pakete aktualisieren." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix system: (guix)Invoking guix system" msgstr "guix system: (guix.de)guix system aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Manage the operating system configuration." msgstr "Die Betriebssystemkonfiguration verwalten." #. type: dircategory -#: doc/guix.texi:85 +#: doc/guix.texi:84 #, no-wrap msgid "Software development" msgstr "Softwareentwicklung" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "guix environment: (guix)Invoking guix environment" msgstr "guix environment: (guix.de)guix environment aufrufen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "Building development environments with Guix." msgstr "Umgebungen für Entwickler erstellen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "guix build: (guix)Invoking guix build" msgstr "guix build: (guix.de)guix build aufrufen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "Building packages." msgstr "Erstellen von Paketen." #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "guix pack: (guix)Invoking guix pack" msgstr "guix pack: (guix.de)guix pack aufrufen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "Creating binary bundles." msgstr "Bündel aus Binärdateien erstellen." #. type: subtitle -#: doc/guix.texi:94 +#: doc/guix.texi:93 #, no-wrap msgid "Using the GNU Guix Functional Package Manager" msgstr "Den funktionalen Paketmanager GNU Guix benutzen" #. type: author -#: doc/guix.texi:95 +#: doc/guix.texi:94 #, no-wrap msgid "The GNU Guix Developers" msgstr "Die GNU-Guix-Entwickler" #. type: titlepage -#: doc/guix.texi:101 +#: doc/guix.texi:100 msgid "Edition @value{EDITION} @* @value{UPDATED} @*" msgstr "Edition @value{EDITION} @* @value{UPDATED} @*" #. type: node -#: doc/guix.texi:108 +#: doc/guix.texi:107 #, no-wrap msgid "Top" msgstr "Top" #. type: top -#: doc/guix.texi:109 +#: doc/guix.texi:108 #, no-wrap msgid "GNU Guix" msgstr "GNU Guix" #. type: Plain text -#: doc/guix.texi:113 +#: doc/guix.texi:112 msgid "This document describes GNU Guix version @value{VERSION}, a functional package management tool written for the GNU system." msgstr "Dieses Dokument beschreibt GNU Guix, Version @value{VERSION}, ein Werkzeug zur funktionalen Verwaltung von Softwarepaketen, das für das GNU-System geschrieben wurde." #. type: Plain text -#: doc/guix.texi:125 -msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." +#: doc/guix.texi:123 +#, fuzzy +#| msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." +msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), and Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." msgstr "Dieses Handbuch ist auch auf Englisch (siehe @ref{Top,,, guix, GNU Guix Reference Manual}), in Vereinfachtem Chinesisch (siehe @ref{Top,,, guix.zh_CN, GNU Guix参考手册}), auf Französisch (siehe @ref{Top,,, guix.fr, Manuel de référence de GNU Guix}), auf Spanisch (siehe @ref{Top,,, guix.es, Manual de referencia de GNU Guix}) und auf Russisch verfügbar (siehe @ref{Top,,, guix.ru, Руководство GNU Guix}). Wenn Sie es in Ihre eigene Sprache übersetzen möchten, dann sind Sie beim @uref{https://translationproject.org/domain/guix-manual.html, Translation Project} herzlich willkommen." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:151 doc/guix.texi:314 doc/guix.texi:315 +#: doc/guix.texi:139 doc/guix.texi:149 doc/guix.texi:312 doc/guix.texi:313 #, no-wrap msgid "Introduction" msgstr "Einführung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "What is Guix about?" msgstr "Was ist Guix überhaupt?" #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:156 doc/guix.texi:473 doc/guix.texi:474 +#: doc/guix.texi:139 doc/guix.texi:154 doc/guix.texi:471 doc/guix.texi:472 #, no-wrap msgid "Installation" msgstr "Installation" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Installing Guix." msgstr "Guix installieren." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:171 doc/guix.texi:1770 doc/guix.texi:1771 +#: doc/guix.texi:139 doc/guix.texi:169 doc/guix.texi:1768 doc/guix.texi:1769 #, no-wrap msgid "System Installation" msgstr "Systeminstallation" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Installing the whole operating system." msgstr "Das ganze Betriebssystem installieren." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:188 doc/guix.texi:2481 doc/guix.texi:2482 +#: doc/guix.texi:139 doc/guix.texi:186 doc/guix.texi:2479 doc/guix.texi:2480 #, no-wrap msgid "Package Management" msgstr "Paketverwaltung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Package installation, upgrade, etc." msgstr "Pakete installieren, aktualisieren usw." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:210 doc/guix.texi:4333 doc/guix.texi:4334 +#: doc/guix.texi:139 doc/guix.texi:208 doc/guix.texi:4331 doc/guix.texi:4332 #, no-wrap msgid "Development" msgstr "Entwicklung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Guix-aided software development." msgstr "Von Guix unterstützte Softwareentwicklung." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:215 doc/guix.texi:4957 doc/guix.texi:4958 +#: doc/guix.texi:139 doc/guix.texi:213 doc/guix.texi:4955 doc/guix.texi:4956 #, no-wrap msgid "Programming Interface" msgstr "Programmierschnittstelle" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Using Guix in Scheme." msgstr "Guix in Scheme verwenden." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:231 doc/guix.texi:7585 doc/guix.texi:7586 +#: doc/guix.texi:139 doc/guix.texi:229 doc/guix.texi:7583 doc/guix.texi:7584 #, no-wrap msgid "Utilities" msgstr "Zubehör" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Package management commands." msgstr "Befehle zur Paketverwaltung." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:256 doc/guix.texi:10196 doc/guix.texi:10197 +#: doc/guix.texi:139 doc/guix.texi:254 doc/guix.texi:10194 doc/guix.texi:10195 #, no-wrap msgid "System Configuration" msgstr "Systemkonfiguration" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Configuring the operating system." msgstr "Das Betriebssystem konfigurieren." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25410 doc/guix.texi:25411 +#: doc/guix.texi:139 doc/guix.texi:25392 doc/guix.texi:25393 #, no-wrap msgid "Documentation" msgstr "Dokumentation" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Browsing software user manuals." msgstr "Wie man Nutzerhandbücher von Software liest." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25474 doc/guix.texi:25475 +#: doc/guix.texi:139 doc/guix.texi:25456 doc/guix.texi:25457 #, no-wrap msgid "Installing Debugging Files" msgstr "Dateien zur Fehlersuche installieren" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Feeding the debugger." msgstr "Womit man seinen Debugger füttert." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25540 doc/guix.texi:25541 +#: doc/guix.texi:139 doc/guix.texi:25522 doc/guix.texi:25523 #, no-wrap msgid "Security Updates" msgstr "Sicherheitsaktualisierungen" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Deploying security fixes quickly." msgstr "Sicherheits-Patches schnell einspielen." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25660 doc/guix.texi:25661 +#: doc/guix.texi:139 doc/guix.texi:25642 doc/guix.texi:25643 #, no-wrap msgid "Bootstrapping" msgstr "Bootstrapping" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "GNU/Linux built from scratch." msgstr "GNU/Linux von Grund auf selbst erstellen." #. type: node -#: doc/guix.texi:141 doc/guix.texi:25844 +#: doc/guix.texi:139 doc/guix.texi:25826 #, no-wrap msgid "Porting" msgstr "Portierung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Targeting another platform or kernel." msgstr "Guix auf andere Plattformen und Kernels bringen." #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Your help needed!" msgstr "Ihre Hilfe ist nötig!" #. type: chapter -#: doc/guix.texi:146 doc/guix.texi:25892 doc/guix.texi:25893 +#: doc/guix.texi:144 doc/guix.texi:25874 doc/guix.texi:25875 #, no-wrap msgid "Acknowledgments" msgstr "Danksagungen" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "Thanks!" msgstr "Danke!" #. type: appendix -#: doc/guix.texi:146 doc/guix.texi:25914 doc/guix.texi:25915 +#: doc/guix.texi:144 doc/guix.texi:25896 doc/guix.texi:25897 #, no-wrap msgid "GNU Free Documentation License" msgstr "GNU-Lizenz für freie Dokumentation" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "The license of this manual." msgstr "Die Lizenz dieses Handbuchs." #. type: unnumbered -#: doc/guix.texi:146 doc/guix.texi:25920 doc/guix.texi:25921 +#: doc/guix.texi:144 doc/guix.texi:25902 doc/guix.texi:25903 #, no-wrap msgid "Concept Index" msgstr "Konzeptverzeichnis" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "Concepts." msgstr "Konzepte." #. type: unnumbered -#: doc/guix.texi:146 doc/guix.texi:25924 doc/guix.texi:25925 +#: doc/guix.texi:144 doc/guix.texi:25906 doc/guix.texi:25907 #, no-wrap msgid "Programming Index" msgstr "Programmierverzeichnis" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "Data types, functions, and variables." msgstr "Datentypen, Funktionen und Variable." #. type: menuentry -#: doc/guix.texi:149 +#: doc/guix.texi:147 msgid "--- The Detailed Node Listing ---" msgstr "--- Detaillierte Liste der Knoten ---" #. type: section -#: doc/guix.texi:154 doc/guix.texi:341 doc/guix.texi:343 doc/guix.texi:344 +#: doc/guix.texi:152 doc/guix.texi:339 doc/guix.texi:341 doc/guix.texi:342 #, no-wrap msgid "Managing Software the Guix Way" msgstr "Auf Guix-Art Software verwalten" #. type: menuentry -#: doc/guix.texi:154 doc/guix.texi:341 +#: doc/guix.texi:152 doc/guix.texi:339 msgid "What's special." msgstr "Was Guix besonders macht." #. type: section -#: doc/guix.texi:154 doc/guix.texi:341 doc/guix.texi:398 doc/guix.texi:399 +#: doc/guix.texi:152 doc/guix.texi:339 doc/guix.texi:396 doc/guix.texi:397 #, no-wrap msgid "GNU Distribution" msgstr "GNU-Distribution" #. type: menuentry -#: doc/guix.texi:154 doc/guix.texi:341 +#: doc/guix.texi:152 doc/guix.texi:339 msgid "The packages and tools." msgstr "Die Pakete und Werkzeuge." #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:514 doc/guix.texi:515 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:512 doc/guix.texi:513 #, no-wrap msgid "Binary Installation" msgstr "Aus Binärdatei installieren" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Getting Guix running in no time!" msgstr "Guix installieren, ohne Zeit zu verlieren!" #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:716 doc/guix.texi:717 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:714 doc/guix.texi:715 #, no-wrap msgid "Requirements" msgstr "Voraussetzungen" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Software needed to build and run Guix." msgstr "Zum Erstellen und Benutzen von Guix nötige Software." #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:800 doc/guix.texi:801 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:798 doc/guix.texi:799 #, no-wrap msgid "Running the Test Suite" msgstr "Den Testkatalog laufen lassen" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Testing Guix." msgstr "Guix testen." #. type: section -#: doc/guix.texi:163 doc/guix.texi:165 doc/guix.texi:512 doc/guix.texi:865 -#: doc/guix.texi:866 +#: doc/guix.texi:161 doc/guix.texi:163 doc/guix.texi:510 doc/guix.texi:863 +#: doc/guix.texi:864 #, no-wrap msgid "Setting Up the Daemon" msgstr "Den Daemon einrichten" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Preparing the build daemon's environment." msgstr "Wie man die Umgebung des Erstellungs-Daemons einrichtet." #. type: node -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:1296 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:1294 #, no-wrap msgid "Invoking guix-daemon" msgstr "Aufruf des guix-daemon" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Running the build daemon." msgstr "Den Erstellungs-Daemon laufen lassen." #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:1564 doc/guix.texi:1565 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:1562 doc/guix.texi:1563 #, no-wrap msgid "Application Setup" msgstr "Anwendungen einrichten" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Application-specific setup." msgstr "Anwendungsspezifische Einstellungen." #. type: subsection -#: doc/guix.texi:169 doc/guix.texi:885 doc/guix.texi:887 doc/guix.texi:888 +#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:885 doc/guix.texi:886 #, no-wrap msgid "Build Environment Setup" msgstr "Einrichten der Erstellungsumgebung" #. type: menuentry -#: doc/guix.texi:169 doc/guix.texi:885 +#: doc/guix.texi:167 doc/guix.texi:883 msgid "Preparing the isolated build environment." msgstr "Die isolierte Umgebung zum Erstellen vorbereiten." #. type: node -#: doc/guix.texi:169 doc/guix.texi:885 doc/guix.texi:1004 +#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:1002 #, no-wrap msgid "Daemon Offload Setup" msgstr "Auslagern des Daemons einrichten" #. type: menuentry -#: doc/guix.texi:169 doc/guix.texi:885 +#: doc/guix.texi:167 doc/guix.texi:883 msgid "Offloading builds to remote machines." msgstr "Erstellungen auf entfernte Maschinen auslagern." #. type: subsection -#: doc/guix.texi:169 doc/guix.texi:885 doc/guix.texi:1210 doc/guix.texi:1211 +#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:1208 doc/guix.texi:1209 #, no-wrap msgid "SELinux Support" msgstr "SELinux-Unterstützung" #. type: menuentry -#: doc/guix.texi:169 doc/guix.texi:885 +#: doc/guix.texi:167 doc/guix.texi:883 msgid "Using an SELinux policy for the daemon." msgstr "Wie man eine SELinux-Richtlinie für den Daemon einrichtet." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1246 doc/guix.texi:1804 doc/guix.texi:1806 -#: doc/guix.texi:1807 +#: doc/guix.texi:179 doc/guix.texi:1244 doc/guix.texi:1802 doc/guix.texi:1804 +#: doc/guix.texi:1805 #, no-wrap msgid "Limitations" msgstr "Einschränkungen" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "What you can expect." msgstr "Was Sie erwarten dürfen." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1835 doc/guix.texi:1836 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1833 doc/guix.texi:1834 #, no-wrap msgid "Hardware Considerations" msgstr "Hardware-Überlegungen" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Supported hardware." msgstr "Unterstützte Hardware." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1870 doc/guix.texi:1871 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1868 doc/guix.texi:1869 #, no-wrap msgid "USB Stick and DVD Installation" msgstr "Installation von USB-Stick oder DVD" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Preparing the installation medium." msgstr "Das Installationsmedium vorbereiten." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1969 doc/guix.texi:1970 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1967 doc/guix.texi:1968 #, no-wrap msgid "Preparing for Installation" msgstr "Vor der Installation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Networking, partitioning, etc." msgstr "Netzwerkanbindung, Partitionierung etc." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1992 doc/guix.texi:1993 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1990 doc/guix.texi:1991 #, no-wrap msgid "Guided Graphical Installation" msgstr "Geführte grafische Installation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Easy graphical installation." msgstr "Leichte grafische Installation." #. type: section -#: doc/guix.texi:181 doc/guix.texi:183 doc/guix.texi:1804 doc/guix.texi:2023 -#: doc/guix.texi:2024 +#: doc/guix.texi:179 doc/guix.texi:181 doc/guix.texi:1802 doc/guix.texi:2021 +#: doc/guix.texi:2022 #, no-wrap msgid "Manual Installation" msgstr "Manuelle Installation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Manual installation for wizards." msgstr "Manuelle Installation für Zauberer." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:2366 doc/guix.texi:2367 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2364 doc/guix.texi:2365 #, no-wrap msgid "After System Installation" msgstr "Nach der Systeminstallation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "When installation succeeded." msgstr "Wenn die Installation erfolgreich war." #. type: node -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:2394 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2392 #, no-wrap msgid "Installing Guix in a VM" msgstr "Guix in einer VM installieren" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Guix System playground." msgstr "Ein „Guix System“-Spielplatz." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:2448 doc/guix.texi:2449 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2446 doc/guix.texi:2447 #, no-wrap msgid "Building the Installation Image" msgstr "Ein Abbild zur Installation erstellen" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "How this comes to be." msgstr "Wie ein solches entsteht." #. type: node -#: doc/guix.texi:186 doc/guix.texi:2041 doc/guix.texi:2043 +#: doc/guix.texi:184 doc/guix.texi:2039 doc/guix.texi:2041 #, no-wrap msgid "Keyboard Layout and Networking and Partitioning" -msgstr "Tastaturbelegung und Netzwerkanbindung und Partitionierung" +msgstr "Tastaturbelegung@comma{} Netzwerkanbindung und Partitionierung" #. type: menuentry -#: doc/guix.texi:186 doc/guix.texi:2041 +#: doc/guix.texi:184 doc/guix.texi:2039 msgid "Initial setup." msgstr "Erstes Einrichten." #. type: subsection -#: doc/guix.texi:186 doc/guix.texi:2041 doc/guix.texi:2278 doc/guix.texi:2279 +#: doc/guix.texi:184 doc/guix.texi:2039 doc/guix.texi:2276 doc/guix.texi:2277 #, no-wrap msgid "Proceeding with the Installation" msgstr "Fortfahren mit der Installation" #. type: menuentry -#: doc/guix.texi:186 doc/guix.texi:2041 +#: doc/guix.texi:184 doc/guix.texi:2039 msgid "Installing." msgstr "Installieren." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:2515 doc/guix.texi:2516 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:2513 doc/guix.texi:2514 #, no-wrap msgid "Features" msgstr "Funktionalitäten" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "How Guix will make your life brighter." msgstr "Wie Guix Ihr Leben schöner machen wird." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:2601 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:2599 #, no-wrap msgid "Invoking guix package" msgstr "Aufruf von guix package" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Package installation, removal, etc." msgstr "Pakete installieren, entfernen usw." #. type: section -#: doc/guix.texi:199 doc/guix.texi:201 doc/guix.texi:2513 doc/guix.texi:3102 -#: doc/guix.texi:3103 +#: doc/guix.texi:197 doc/guix.texi:199 doc/guix.texi:2511 doc/guix.texi:3100 +#: doc/guix.texi:3101 #, no-wrap msgid "Substitutes" msgstr "Substitute" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Downloading pre-built binaries." msgstr "Vorerstelle Binärdateien herunterladen." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3330 doc/guix.texi:3331 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3328 doc/guix.texi:3329 #, no-wrap msgid "Packages with Multiple Outputs" msgstr "Pakete mit mehreren Ausgaben." #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Single source package, multiple outputs." msgstr "Ein Quellpaket, mehrere Ausgaben." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3384 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3382 #, no-wrap msgid "Invoking guix gc" msgstr "Aufruf von guix gc" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Running the garbage collector." msgstr "Den Müllsammler laufen lassen." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3590 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3588 #, no-wrap msgid "Invoking guix pull" msgstr "Aufruf von guix pull" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Fetching the latest Guix and distribution." msgstr "Das neueste Guix samt Distribution laden." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3745 doc/guix.texi:3746 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3743 doc/guix.texi:3744 #, no-wrap msgid "Channels" msgstr "Kanäle" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Customizing the package collection." msgstr "Die Paketsammlung anpassen." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3958 doc/guix.texi:3959 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3956 doc/guix.texi:3957 #, no-wrap msgid "Inferiors" msgstr "Untergeordnete" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Interacting with another revision of Guix." msgstr "Mit einer anderen Version von Guix interagieren." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:4086 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:4084 #, no-wrap msgid "Invoking guix describe" msgstr "Aufruf von guix describe" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Display information about your Guix revision." msgstr "Informationen über Ihre Guix-Version anzeigen." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:4167 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:4165 #, no-wrap msgid "Invoking guix archive" msgstr "Aufruf von guix archive" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Exporting and importing store files." msgstr "Import und Export von Store-Dateien." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3127 doc/guix.texi:3128 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3125 doc/guix.texi:3126 #, no-wrap msgid "Official Substitute Server" msgstr "Offizieller Substitut-Server" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "One particular source of substitutes." msgstr "Eine besondere Quelle von Substituten." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3157 doc/guix.texi:3158 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3155 doc/guix.texi:3156 #, no-wrap msgid "Substitute Server Authorization" msgstr "Substitut-Server autorisieren" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How to enable or disable substitutes." msgstr "Wie man Substitute an- und abschaltet." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3225 doc/guix.texi:3226 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3223 doc/guix.texi:3224 #, no-wrap msgid "Substitute Authentication" msgstr "Substitutauthentifizierung" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How Guix verifies substitutes." msgstr "Wie Guix Substitute verifiziert." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3260 doc/guix.texi:3261 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3258 doc/guix.texi:3259 #, no-wrap msgid "Proxy Settings" msgstr "Proxy-Einstellungen" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How to get substitutes via proxy." msgstr "Wie Sie Substitute über einen Proxy beziehen." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3272 doc/guix.texi:3273 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3270 doc/guix.texi:3271 #, no-wrap msgid "Substitution Failure" msgstr "Fehler bei der Substitution" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "What happens when substitution fails." msgstr "Was passiert, wenn die Substitution fehlschlägt." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3300 doc/guix.texi:3301 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3298 doc/guix.texi:3299 #, no-wrap msgid "On Trusting Binaries" msgstr "Vom Vertrauen gegenüber Binärdateien" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How can you trust that binary blob?" msgstr "Wie können Sie diesem binären Blob trauen?" #. type: node -#: doc/guix.texi:213 doc/guix.texi:4350 doc/guix.texi:4352 +#: doc/guix.texi:211 doc/guix.texi:4348 doc/guix.texi:4350 #, no-wrap msgid "Invoking guix environment" msgstr "Aufruf von guix environment" #. type: menuentry -#: doc/guix.texi:213 doc/guix.texi:4350 +#: doc/guix.texi:211 doc/guix.texi:4348 msgid "Setting up development environments." msgstr "Entwicklungsumgebungen einrichten." #. type: node -#: doc/guix.texi:213 doc/guix.texi:4350 doc/guix.texi:4691 +#: doc/guix.texi:211 doc/guix.texi:4348 doc/guix.texi:4689 #, no-wrap msgid "Invoking guix pack" msgstr "Aufruf von guix pack" #. type: menuentry -#: doc/guix.texi:213 doc/guix.texi:4350 +#: doc/guix.texi:211 doc/guix.texi:4348 msgid "Creating software bundles." msgstr "Software-Bündel erstellen." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:4996 doc/guix.texi:4997 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:4994 doc/guix.texi:4995 #, no-wrap msgid "Package Modules" msgstr "Paketmodule" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Packages from the programmer's viewpoint." msgstr "Pakete aus Sicht des Programmierers." #. type: section -#: doc/guix.texi:224 doc/guix.texi:226 doc/guix.texi:4994 doc/guix.texi:5058 -#: doc/guix.texi:5059 +#: doc/guix.texi:222 doc/guix.texi:224 doc/guix.texi:4992 doc/guix.texi:5056 +#: doc/guix.texi:5057 #, no-wrap msgid "Defining Packages" msgstr "Pakete definieren" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Defining new packages." msgstr "Wie Sie neue Pakete definieren." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:5561 doc/guix.texi:5562 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:5559 doc/guix.texi:5560 #, no-wrap msgid "Build Systems" msgstr "Erstellungssysteme" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Specifying how packages are built." msgstr "Angeben, wie Pakete erstellt werden." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6299 doc/guix.texi:6300 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6297 doc/guix.texi:6298 #, no-wrap msgid "The Store" msgstr "Der Store" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Manipulating the package store." msgstr "Den Paket-Store verändern." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6449 doc/guix.texi:6450 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6447 doc/guix.texi:6448 #, no-wrap msgid "Derivations" msgstr "Ableitungen" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Low-level interface to package derivations." msgstr "Systemnahe Schnittstelle für Paketableitungen." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6643 doc/guix.texi:6644 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6641 doc/guix.texi:6642 #, no-wrap msgid "The Store Monad" msgstr "Die Store-Monade" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Purely functional interface to the store." msgstr "Rein funktionale Schnittstelle zum Store." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6958 doc/guix.texi:6959 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6956 doc/guix.texi:6957 #, no-wrap msgid "G-Expressions" msgstr "G-Ausdrücke" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Manipulating build expressions." msgstr "Erstellungsausdrücke verarbeiten." #. type: node -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:7532 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:7530 #, no-wrap msgid "Invoking guix repl" msgstr "Aufruf von guix repl" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Fiddling with Guix interactively." msgstr "Interaktiv an Guix herumbasteln." #. type: node -#: doc/guix.texi:229 doc/guix.texi:5326 doc/guix.texi:5329 +#: doc/guix.texi:227 doc/guix.texi:5324 doc/guix.texi:5327 #, no-wrap msgid "package Reference" msgstr "„package“-Referenz" #. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:5326 +#: doc/guix.texi:227 doc/guix.texi:5324 msgid "The package data type." msgstr "Der Datentyp für Pakete." #. type: node -#: doc/guix.texi:229 doc/guix.texi:5326 doc/guix.texi:5473 +#: doc/guix.texi:227 doc/guix.texi:5324 doc/guix.texi:5471 #, no-wrap msgid "origin Reference" msgstr "„origin“-Referenz" #. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:5326 +#: doc/guix.texi:227 doc/guix.texi:5324 msgid "The origin data type." msgstr "Datentyp für Paketursprünge." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:7611 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:7609 #, no-wrap msgid "Invoking guix build" msgstr "Aufruf von guix build" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Building packages from the command line." msgstr "Pakete aus der Befehlszeile heraus erstellen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8262 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8260 #, no-wrap msgid "Invoking guix edit" msgstr "Aufruf von guix edit" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Editing package definitions." msgstr "Paketdefinitionen bearbeiten." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8288 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8286 #, no-wrap msgid "Invoking guix download" msgstr "Aufruf von guix download" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Downloading a file and printing its hash." msgstr "Herunterladen einer Datei und Ausgabe ihres Hashes." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8341 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8339 #, no-wrap msgid "Invoking guix hash" msgstr "Aufruf von guix hash" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Computing the cryptographic hash of a file." msgstr "Den kryptografischen Hash einer Datei berechnen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8403 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8401 #, no-wrap msgid "Invoking guix import" msgstr "Aufruf von guix import" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Importing package definitions." msgstr "Paketdefinitionen importieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8801 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8799 #, no-wrap msgid "Invoking guix refresh" msgstr "Aufruf von guix refresh" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Updating package definitions." msgstr "Paketdefinitionen aktualisieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9112 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9110 #, no-wrap msgid "Invoking guix lint" msgstr "Aufruf von guix lint" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Finding errors in package definitions." msgstr "Fehler in Paketdefinitionen finden." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9228 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9226 #, no-wrap msgid "Invoking guix size" msgstr "Aufruf von guix size" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Profiling disk usage." msgstr "Plattenplatzverbrauch profilieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9352 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9350 #, no-wrap msgid "Invoking guix graph" msgstr "Aufruf von guix graph" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Visualizing the graph of packages." msgstr "Den Paketgraphen visualisieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9555 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9553 #, no-wrap msgid "Invoking guix publish" msgstr "Aufruf von guix publish" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Sharing substitutes." msgstr "Substitute teilen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9772 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9770 #, no-wrap msgid "Invoking guix challenge" msgstr "Aufruf von guix challenge" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Challenging substitute servers." msgstr "Die Substitut-Server anfechten." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9911 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9909 #, no-wrap msgid "Invoking guix copy" msgstr "Aufruf von guix copy" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Copying to and from a remote store." msgstr "Mit einem entfernten Store Dateien austauschen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9974 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9972 #, no-wrap msgid "Invoking guix container" msgstr "Aufruf von guix container" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Process isolation." msgstr "Prozesse isolieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:10028 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:10026 #, no-wrap msgid "Invoking guix weather" msgstr "Aufruf von guix weather" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Assessing substitute availability." msgstr "Die Verfügbarkeit von Substituten einschätzen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:10139 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:10137 #, no-wrap msgid "Invoking guix processes" msgstr "Aufruf von guix processes" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Listing client processes." msgstr "Auflisten der Client-Prozesse" #. type: section -#: doc/guix.texi:249 doc/guix.texi:7612 +#: doc/guix.texi:247 doc/guix.texi:7610 #, no-wrap msgid "Invoking @command{guix build}" msgstr "Aufruf von @command{guix build}" #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:7665 doc/guix.texi:7666 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7663 doc/guix.texi:7664 #, no-wrap msgid "Common Build Options" msgstr "Gemeinsame Erstellungsoptionen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Build options for most commands." msgstr "Erstellungsoptionen für die meisten Befehle." #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:7821 doc/guix.texi:7822 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7819 doc/guix.texi:7820 #, no-wrap msgid "Package Transformation Options" msgstr "Paketumwandlungsoptionen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Creating variants of packages." msgstr "Varianten von Paketen erzeugen." #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:7970 doc/guix.texi:7971 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7968 doc/guix.texi:7969 #, no-wrap msgid "Additional Build Options" msgstr "Zusätzliche Erstellungsoptionen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Options specific to 'guix build'." msgstr "Optionen spezifisch für „guix build“." #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:8182 doc/guix.texi:8183 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:8180 doc/guix.texi:8181 #, no-wrap msgid "Debugging Build Failures" msgstr "Fehlschläge beim Erstellen untersuchen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Real life packaging experience." msgstr "Praxiserfahrung bei der Paketerstellung." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10240 -#: doc/guix.texi:10241 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10238 +#: doc/guix.texi:10239 #, no-wrap msgid "Using the Configuration System" msgstr "Das Konfigurationssystem nutzen" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Customizing your GNU system." msgstr "Ihr GNU-System anpassen." #. type: node -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10476 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10474 #, no-wrap msgid "operating-system Reference" msgstr "„operating-system“-Referenz" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Detail of operating-system declarations." msgstr "Details der Betriebssystem-Deklarationen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10680 -#: doc/guix.texi:10681 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10678 +#: doc/guix.texi:10679 #, no-wrap msgid "File Systems" msgstr "Dateisysteme" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Configuring file system mounts." msgstr "Die Dateisystemeinbindungen konfigurieren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10850 -#: doc/guix.texi:10851 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10848 +#: doc/guix.texi:10849 #, no-wrap msgid "Mapped Devices" msgstr "Zugeordnete Geräte" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Block device extra processing." msgstr "Näheres zu blockorientierten Speichermedien." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10971 -#: doc/guix.texi:10972 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10969 +#: doc/guix.texi:10970 #, no-wrap msgid "User Accounts" msgstr "Benutzerkonten" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Specifying user accounts." msgstr "Benutzerkonten festlegen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:2050 doc/guix.texi:10238 doc/guix.texi:11124 -#: doc/guix.texi:11125 +#: doc/guix.texi:271 doc/guix.texi:2048 doc/guix.texi:10236 +#: doc/guix.texi:11122 doc/guix.texi:11123 #, no-wrap msgid "Keyboard Layout" msgstr "Tastaturbelegung" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "How the system interprets key strokes." msgstr "Wie das System Tastendrücke interpretiert." #. type: section -#: doc/guix.texi:273 doc/guix.texi:1572 doc/guix.texi:10238 doc/guix.texi:11256 -#: doc/guix.texi:11257 +#: doc/guix.texi:271 doc/guix.texi:1570 doc/guix.texi:10236 +#: doc/guix.texi:11254 doc/guix.texi:11255 #, no-wrap msgid "Locales" msgstr "Locales" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Language and cultural convention settings." msgstr "Sprache und kulturelle Konventionen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:275 doc/guix.texi:10238 doc/guix.texi:11396 -#: doc/guix.texi:11397 +#: doc/guix.texi:271 doc/guix.texi:273 doc/guix.texi:10236 doc/guix.texi:11394 +#: doc/guix.texi:11395 #, no-wrap msgid "Services" msgstr "Dienste" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Specifying system services." msgstr "Systemdienste festlegen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:23610 -#: doc/guix.texi:23611 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:23607 +#: doc/guix.texi:23608 #, no-wrap msgid "Setuid Programs" msgstr "Setuid-Programme" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Programs running with root privileges." msgstr "Mit Administratorrechten startende Programme." #. type: section -#: doc/guix.texi:273 doc/guix.texi:1717 doc/guix.texi:10238 doc/guix.texi:23656 -#: doc/guix.texi:23657 +#: doc/guix.texi:271 doc/guix.texi:1715 doc/guix.texi:10236 +#: doc/guix.texi:23653 doc/guix.texi:23654 #, no-wrap msgid "X.509 Certificates" msgstr "X.509-Zertifikate" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Authenticating HTTPS servers." msgstr "HTTPS-Server authentifizieren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:1615 doc/guix.texi:10238 doc/guix.texi:23719 -#: doc/guix.texi:23720 +#: doc/guix.texi:271 doc/guix.texi:1613 doc/guix.texi:10236 +#: doc/guix.texi:23716 doc/guix.texi:23717 #, no-wrap msgid "Name Service Switch" msgstr "Name Service Switch" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Configuring libc's name service switch." msgstr "Den Name Service Switch von libc konfigurieren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:23857 -#: doc/guix.texi:23858 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:23854 +#: doc/guix.texi:23855 #, no-wrap msgid "Initial RAM Disk" msgstr "Initiale RAM-Disk" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Linux-Libre bootstrapping." msgstr "Linux-libre hochfahren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:24031 -#: doc/guix.texi:24032 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24028 +#: doc/guix.texi:24029 #, no-wrap msgid "Bootloader Configuration" msgstr "Bootloader-Konfiguration" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Configuring the boot loader." msgstr "Den Bootloader konfigurieren." #. type: node -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:24228 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24225 #, no-wrap msgid "Invoking guix system" msgstr "Aufruf von guix system" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Instantiating a system configuration." msgstr "Instanziierung einer Systemkonfiguration." #. type: node -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:24694 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24680 #, no-wrap msgid "Running Guix in a VM" msgstr "Guix in einer VM starten" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "How to run Guix System in a virtual machine." msgstr "Wie man „Guix System“ in einer virtuellen Maschine startet." #. type: section -#: doc/guix.texi:273 doc/guix.texi:304 doc/guix.texi:10238 doc/guix.texi:24824 -#: doc/guix.texi:24825 +#: doc/guix.texi:271 doc/guix.texi:302 doc/guix.texi:10236 doc/guix.texi:24810 +#: doc/guix.texi:24811 #, no-wrap msgid "Defining Services" msgstr "Dienste definieren" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Adding new service definitions." msgstr "Neue Dienstdefinitionen hinzufügen." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:11475 -#: doc/guix.texi:11476 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:11473 +#: doc/guix.texi:11474 #, no-wrap msgid "Base Services" msgstr "Basisdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Essential system services." msgstr "Essenzielle Systemdienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:12268 -#: doc/guix.texi:12269 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12266 +#: doc/guix.texi:12267 #, no-wrap msgid "Scheduled Job Execution" msgstr "Geplante Auftragsausführung" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The mcron service." msgstr "Der mcron-Dienst." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:12369 -#: doc/guix.texi:12370 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12367 +#: doc/guix.texi:12368 #, no-wrap msgid "Log Rotation" msgstr "Log-Rotation" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The rottlog service." msgstr "Der rottlog-Dienst." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:12471 -#: doc/guix.texi:12472 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12469 +#: doc/guix.texi:12470 #, no-wrap msgid "Networking Services" msgstr "Netzwerkdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Network setup, SSH daemon, etc." msgstr "Netzwerkeinrichtung, SSH-Daemon etc." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:13417 -#: doc/guix.texi:13418 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:13415 +#: doc/guix.texi:13416 #, no-wrap msgid "X Window" msgstr "X Window" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Graphical display." msgstr "Grafische Anzeige." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:13764 -#: doc/guix.texi:13765 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:13762 +#: doc/guix.texi:13763 #, no-wrap msgid "Printing Services" msgstr "Druckdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Local and remote printer support." msgstr "Unterstützung für lokale und entfernte Drucker." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:14605 -#: doc/guix.texi:14606 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:14603 +#: doc/guix.texi:14604 #, no-wrap msgid "Desktop Services" msgstr "Desktop-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "D-Bus and desktop services." msgstr "D-Bus- und Desktop-Dienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:15007 -#: doc/guix.texi:15008 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15004 +#: doc/guix.texi:15005 #, no-wrap msgid "Sound Services" msgstr "Tondienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "ALSA and Pulseaudio services." msgstr "Dienste für ALSA und Pulseaudio." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:15088 -#: doc/guix.texi:15089 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15085 +#: doc/guix.texi:15086 #, no-wrap msgid "Database Services" msgstr "Datenbankdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "SQL databases, key-value stores, etc." msgstr "SQL-Datenbanken, Schlüssel-Wert-Speicher etc." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:15248 -#: doc/guix.texi:15249 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15245 +#: doc/guix.texi:15246 #, no-wrap msgid "Mail Services" msgstr "Mail-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "IMAP, POP3, SMTP, and all that." msgstr "IMAP, POP3, SMTP und so weiter." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:16749 -#: doc/guix.texi:16750 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:16746 +#: doc/guix.texi:16747 #, no-wrap msgid "Messaging Services" msgstr "Kurznachrichtendienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Messaging services." msgstr "Dienste für Kurznachrichten." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:17251 -#: doc/guix.texi:17252 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17248 +#: doc/guix.texi:17249 #, no-wrap msgid "Telephony Services" msgstr "Telefondienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Telephony services." msgstr "Telefoniedienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:17456 -#: doc/guix.texi:17457 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17453 +#: doc/guix.texi:17454 #, no-wrap msgid "Monitoring Services" msgstr "Systemüberwachungsdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Monitoring services." msgstr "Dienste zur Systemüberwachung." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:17961 -#: doc/guix.texi:17962 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17958 +#: doc/guix.texi:17959 #, no-wrap msgid "Kerberos Services" msgstr "Kerberos-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Kerberos services." msgstr "Kerberos-Dienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:18565 -#: doc/guix.texi:18566 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:18562 +#: doc/guix.texi:18563 #, no-wrap msgid "Web Services" msgstr "Web-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Web servers." msgstr "Web-Server." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:19366 -#: doc/guix.texi:19367 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:19363 +#: doc/guix.texi:19364 #, no-wrap msgid "Certificate Services" msgstr "Zertifikatsdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "TLS certificates via Let's Encrypt." msgstr "TLS-Zertifikate via Let’s Encrypt." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:19532 -#: doc/guix.texi:19533 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:19529 +#: doc/guix.texi:19530 #, no-wrap msgid "DNS Services" msgstr "DNS-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "DNS daemons." msgstr "DNS-Daemons." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20153 -#: doc/guix.texi:20154 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20150 +#: doc/guix.texi:20151 #, no-wrap msgid "VPN Services" msgstr "VPN-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "VPN daemons." msgstr "VPN-Daemons." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20511 -#: doc/guix.texi:20512 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20508 +#: doc/guix.texi:20509 #, no-wrap msgid "Network File System" msgstr "Network File System" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "NFS related services." msgstr "Dienste mit Bezug zum Netzwerkdateisystem." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20626 -#: doc/guix.texi:20627 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20623 +#: doc/guix.texi:20624 #, no-wrap msgid "Continuous Integration" msgstr "Kontinuierliche Integration" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The Cuirass service." msgstr "Der Cuirass-Dienst." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20743 -#: doc/guix.texi:20744 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20740 +#: doc/guix.texi:20741 #, no-wrap msgid "Power Management Services" msgstr "Dienste zur Stromverbrauchsverwaltung" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Extending battery life." msgstr "Den Akku schonen." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:21277 -#: doc/guix.texi:21278 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:21274 +#: doc/guix.texi:21275 #, no-wrap msgid "Audio Services" msgstr "Audio-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The MPD." msgstr "Der MPD." #. type: node -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:21336 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:21333 #, no-wrap msgid "Virtualization Services" msgstr "Virtualisierungsdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Virtualization services." msgstr "Dienste für virtuelle Maschinen." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:22129 -#: doc/guix.texi:22130 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:22126 +#: doc/guix.texi:22127 #, no-wrap msgid "Version Control Services" msgstr "Versionskontrolldienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Providing remote access to Git repositories." msgstr "Entfernten Zugang zu Git-Repositorys bieten." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:23317 -#: doc/guix.texi:23318 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:23314 +#: doc/guix.texi:23315 #, no-wrap msgid "Game Services" msgstr "Spieldienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Game servers." msgstr "Spielserver." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:23348 -#: doc/guix.texi:23349 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:23345 +#: doc/guix.texi:23346 #, no-wrap msgid "Miscellaneous Services" msgstr "Verschiedene Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Other services." msgstr "Andere Dienste." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:24838 -#: doc/guix.texi:24839 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:24824 +#: doc/guix.texi:24825 #, no-wrap msgid "Service Composition" msgstr "Dienstkompositionen" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "The model for composing services." msgstr "Wie Dienste zusammengestellt werden." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:24894 -#: doc/guix.texi:24895 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:24880 +#: doc/guix.texi:24881 #, no-wrap msgid "Service Types and Services" msgstr "Diensttypen und Dienste" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "Types and services." msgstr "Typen und Dienste." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:25031 -#: doc/guix.texi:25032 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:25017 +#: doc/guix.texi:25018 #, no-wrap msgid "Service Reference" msgstr "Service-Referenz" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "API reference." msgstr "Referenz zur Programmierschnittstelle." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:25256 -#: doc/guix.texi:25257 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:25242 +#: doc/guix.texi:25243 #, no-wrap msgid "Shepherd Services" msgstr "Shepherd-Dienste" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "A particular type of service." msgstr "Eine spezielle Art von Dienst." #. type: cindex -#: doc/guix.texi:317 +#: doc/guix.texi:315 #, no-wrap msgid "purpose" msgstr "Zweck" #. type: Plain text -#: doc/guix.texi:325 +#: doc/guix.texi:323 msgid "GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using the international phonetic alphabet (IPA).} is a package management tool for and distribution of the GNU system. Guix makes it easy for unprivileged users to install, upgrade, or remove software packages, to roll back to a previous package set, to build packages from source, and generally assists with the creation and maintenance of software environments." msgstr "GNU Guix@footnote{„Guix“ wird wie „geeks“ ausgesprochen, also als „ɡiːks“ in der Notation des Internationalen Phonetischen Alphabets (IPA).} ist ein Werkzeug zur Verwaltung von Softwarepaketen für das GNU-System und eine Distribution desselbigen GNU-Systems. Guix macht es @emph{nicht} mit besonderen Berechtigungen ausgestatteten, „unprivilegierten“ Nutzern leicht, Softwarepakete zu installieren, zu aktualisieren oder zu entfernen, zu einem vorherigen Satz von Paketen zurückzuwechseln, Pakete aus ihrem Quellcode heraus zu erstellen und hilft allgemein bei der Erzeugung und Wartung von Software-Umgebungen." #. type: cindex -#: doc/guix.texi:326 doc/guix.texi:401 +#: doc/guix.texi:324 doc/guix.texi:399 #, no-wrap msgid "Guix System" msgstr "Guix System" #. type: cindex -#: doc/guix.texi:327 +#: doc/guix.texi:325 #, no-wrap msgid "GuixSD, now Guix System" msgstr "GuixSD, was jetzt Guix System heißt" #. type: cindex -#: doc/guix.texi:328 +#: doc/guix.texi:326 #, no-wrap msgid "Guix System Distribution, now Guix System" msgstr "Guix System Distribution, welche jetzt Guix System heißt" #. type: Plain text -#: doc/guix.texi:337 +#: doc/guix.texi:335 msgid "You can install GNU@tie{}Guix on top of an existing GNU/Linux system where it complements the available tools without interference (@pxref{Installation}), or you can use it as a standalone operating system distribution, @dfn{Guix@tie{}System}@footnote{We used to refer to Guix System as ``Guix System Distribution'' or ``GuixSD''. We now consider it makes more sense to group everything under the ``Guix'' banner since, after all, Guix System is readily available through the @command{guix system} command, even if you're using a different distro underneath!}. @xref{GNU Distribution}." msgstr "Sie können GNU@tie{}Guix auf ein bestehendes GNU/Linux-System aufsetzen, wo es die bereits verfügbaren Werkzeuge ergänzt, ohne zu stören (siehe @ref{Installation}), oder Sie können es als eine eigenständige Betriebssystem-Distribution namens @dfn{Guix@tie{}System} verwenden@footnote{Der Name @dfn{Guix@tie{}System} wird auf englische Weise ausgesprochen. Früher hatten wir „Guix System“ als „Guix System Distribution“ bezeichnet und mit „GuixSD“ abgekürzt. Wir denken mittlerweile aber, dass es sinnvoller ist, alles unter der Fahne von Guix zu gruppieren, weil schließlich „Guix System“ auch über den Befehl @command{guix system} verfügbar ist, selbst wenn Sie Guix auf einer fremden Distribution benutzen!}. Siehe @ref{GNU Distribution}." #. type: cindex -#: doc/guix.texi:346 +#: doc/guix.texi:344 #, no-wrap msgid "user interfaces" msgstr "Benutzeroberflächen" #. type: Plain text -#: doc/guix.texi:352 +#: doc/guix.texi:350 msgid "Guix provides a command-line package management interface (@pxref{Package Management}), tools to help with software development (@pxref{Development}), command-line utilities for more advanced usage, (@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})." msgstr "Guix bietet eine befehlszeilenbasierte Paketverwaltungsschnittstelle (siehe @ref{Invoking guix package}), Werkzeuge als Hilfestellung bei der Software-Entwicklung (siehe @ref{Development}), Befehlszeilenwerkzeuge für fortgeschrittenere Nutzung (siehe @ref{Utilities}) sowie Schnittstellen zur Programmierung in Scheme (siehe @ref{Programming Interface})." #. type: cindex -#: doc/guix.texi:352 +#: doc/guix.texi:350 #, no-wrap msgid "build daemon" msgstr "Erstellungs-Daemon" #. type: Plain text -#: doc/guix.texi:356 +#: doc/guix.texi:354 msgid "Its @dfn{build daemon} is responsible for building packages on behalf of users (@pxref{Setting Up the Daemon}) and for downloading pre-built binaries from authorized sources (@pxref{Substitutes})." msgstr "Der @dfn{Erstellungs-Daemon} ist für das Erstellen von Paketen im Auftrag von Nutzern verantwortlich (siehe @ref{Setting Up the Daemon}) und für das Herunterladen vorerstellter Binärdateien aus autorisierten Quellen (siehe @ref{Substitutes})." #. type: cindex -#: doc/guix.texi:357 +#: doc/guix.texi:355 #, no-wrap msgid "extensibility of the distribution" msgstr "Erweiterbarkeit der Distribution" #. type: cindex -#: doc/guix.texi:358 doc/guix.texi:5018 +#: doc/guix.texi:356 doc/guix.texi:5016 #, no-wrap msgid "customization, of packages" msgstr "Anpassung, von Paketen" #. type: Plain text -#: doc/guix.texi:367 +#: doc/guix.texi:365 msgid "Guix includes package definitions for many GNU and non-GNU packages, all of which @uref{https://www.gnu.org/philosophy/free-sw.html, respect the user's computing freedom}. It is @emph{extensible}: users can write their own package definitions (@pxref{Defining Packages}) and make them available as independent package modules (@pxref{Package Modules}). It is also @emph{customizable}: users can @emph{derive} specialized package definitions from existing ones, including from the command line (@pxref{Package Transformation Options})." msgstr "Guix enthält Paketdefinitionen für viele Pakete, von GNU und nicht von GNU, die alle @uref{https://www.gnu.org/philosophy/free-sw.html, die Freiheit des Computernutzers respektieren}. Es ist @emph{erweiterbar}: Nutzer können ihre eigenen Paketdefinitionen schreiben (siehe @ref{Defining Packages}) und sie als unabhängige Paketmodule verfügbar machen (siehe @ref{Package Modules}). Es ist auch @emph{anpassbar}: Nutzer können spezialisierte Paketdefinitionen aus bestehenden @emph{ableiten}, auch von der Befehlszeile (siehe @ref{Package Transformation Options})." #. type: cindex -#: doc/guix.texi:368 +#: doc/guix.texi:366 #, no-wrap msgid "functional package management" msgstr "funktionale Paketverwaltung" #. type: cindex -#: doc/guix.texi:369 +#: doc/guix.texi:367 #, no-wrap msgid "isolation" msgstr "Isolierung" #. type: Plain text -#: doc/guix.texi:384 +#: doc/guix.texi:382 msgid "Under the hood, Guix implements the @dfn{functional package management} discipline pioneered by Nix (@pxref{Acknowledgments}). In Guix, the package build and installation process is seen as a @emph{function}, in the mathematical sense. That function takes inputs, such as build scripts, a compiler, and libraries, and returns an installed package. As a pure function, its result depends solely on its inputs---for instance, it cannot refer to software or scripts that were not explicitly passed as inputs. A build function always produces the same result when passed a given set of inputs. It cannot alter the environment of the running system in any way; for instance, it cannot create, modify, or delete files outside of its build and installation directories. This is achieved by running build processes in isolated environments (or @dfn{containers}), where only their explicit inputs are visible." msgstr "Intern implementiert Guix die Disziplin der @dfn{funktionalen Paketverwaltung}, zu der Nix schon die Pionierarbeit geleistet hat (siehe @ref{Acknowledgments}). In Guix wird der Prozess, ein Paket zu erstellen und zu installieren, als eine @emph{Funktion} im mathematischen Sinn aufgefasst. Diese Funktion hat Eingaben, wie zum Beispiel Erstellungs-Skripts, einen Compiler und Bibliotheken, und liefert ein installiertes Paket. Als eine reine Funktion hängt sein Ergebnis allein von seinen Eingaben ab — zum Beispiel kann er nicht auf Software oder Skripts Bezug nehmen, die nicht ausdrücklich als Eingaben übergeben wurden. Eine Erstellungsfunktion führt immer zum selben Ergebnis, wenn ihr die gleiche Menge an Eingaben übergeben wurde. Sie kann die Umgebung des laufenden Systems auf keine Weise beeinflussen, zum Beispiel kann sie keine Dateien außerhalb ihrer Erstellungs- und Installationsverzeichnisse verändern. Um dies zu erreichen, laufen Erstellungsprozesse in isolieren Umgebungen (sogenannte @dfn{Container}), wo nur ausdrückliche Eingaben sichtbar sind." #. type: cindex -#: doc/guix.texi:385 doc/guix.texi:6302 +#: doc/guix.texi:383 doc/guix.texi:6300 #, no-wrap msgid "store" msgstr "Store" #. type: Plain text -#: doc/guix.texi:392 +#: doc/guix.texi:390 msgid "The result of package build functions is @dfn{cached} in the file system, in a special directory called @dfn{the store} (@pxref{The Store}). Each package is installed in a directory of its own in the store---by default under @file{/gnu/store}. The directory name contains a hash of all the inputs used to build that package; thus, changing an input yields a different directory name." msgstr "Das Ergebnis von Paketerstellungsfunktionen wird im Dateisystem @dfn{zwischengespeichert} in einem besonderen Verzeichnis, was als @dfn{der Store} bezeichnet wird (siehe @ref{The Store}). Jedes Paket wird in sein eigenes Verzeichnis im Store installiert — standardmäßig ist er unter @file{/gnu/store} zu finden. Der Verzeichnisname enthält einen Hash aller Eingaben, anhand derer das Paket erzeugt wurde, somit hat das Ändern einer Eingabe einen völlig anderen Verzeichnisnamen zur Folge." #. type: Plain text -#: doc/guix.texi:396 +#: doc/guix.texi:394 msgid "This approach is the foundation for the salient features of Guix: support for transactional package upgrade and rollback, per-user installation, and garbage collection of packages (@pxref{Features})." msgstr "Dieses Vorgehen ist die Grundlage für die Guix auszeichnenden Funktionalitäten: Unterstützung transaktionsbasierter Paketaktualisierungen und -rücksetzungen, Installation von Paketen als einfacher Nutzer sowie Garbage Collection für Pakete (siehe @ref{Features})." #. type: Plain text -#: doc/guix.texi:411 +#: doc/guix.texi:409 msgid "Guix comes with a distribution of the GNU system consisting entirely of free software@footnote{The term ``free'' here refers to the @url{https://www.gnu.org/philosophy/free-sw.html,freedom provided to users of that software}.}. The distribution can be installed on its own (@pxref{System Installation}), but it is also possible to install Guix as a package manager on top of an installed GNU/Linux system (@pxref{Installation}). When we need to distinguish between the two, we refer to the standalone distribution as Guix@tie{}System." msgstr "Mit Guix kommt eine Distribution des GNU-Systems, die nur aus freier Software@footnote{Die Bezeichnung „frei“ steht hier für die @url{https://www.gnu.org/philosophy/free-sw.html,Freiheiten, die Nutzern der Software geboten werden}.} besteht. Die Distribution kann für sich allein installiert werden (siehe @ref{System Installation}), aber Guix kann auch auf einem bestehenden GNU/Linux-System installiert werden. Wenn wir die Anwendungsfälle unterscheiden möchten, bezeichnen wir die alleinstehende Distribution als „Guix@tie{}System“ (mit englischer Aussprache)." #. type: Plain text -#: doc/guix.texi:417 +#: doc/guix.texi:415 msgid "The distribution provides core GNU packages such as GNU libc, GCC, and Binutils, as well as many GNU and non-GNU applications. The complete list of available packages can be browsed @url{https://www.gnu.org/software/guix/packages,on-line} or by running @command{guix package} (@pxref{Invoking guix package}):" msgstr "Die Distribution stellt den Kern der GNU-Pakete, also insbesondere GNU libc, GCC und Binutils, sowie zahlreiche zum GNU-Projekt gehörende und nicht dazu gehörende Anwendungen zur Verfügung. Die vollständige Liste verfügbarer Pakete können Sie @url{https://www.gnu.org/software/guix/packages,online} einsehen, oder indem Sie @command{guix package} ausführen (siehe @ref{Invoking guix package}):" #. type: example -#: doc/guix.texi:420 +#: doc/guix.texi:418 #, no-wrap msgid "guix package --list-available\n" msgstr "guix package --list-available\n" #. type: Plain text -#: doc/guix.texi:426 +#: doc/guix.texi:424 msgid "Our goal is to provide a practical 100% free software distribution of Linux-based and other variants of GNU, with a focus on the promotion and tight integration of GNU components, and an emphasis on programs and tools that help users exert that freedom." msgstr "Unser Ziel ist, eine zu 100% freie Software-Distribution von Linux-basierten und von anderen GNU-Varianten anzubieten, mit dem Fokus darauf, das GNU-Projekt und die enge Zusammenarbeit seiner Bestandteile zu befördern, sowie die Programme und Werkzeuge hervorzuheben, die die Nutzer dabei unterstützen, von dieser Freiheit Gebrauch zu machen." #. type: Plain text -#: doc/guix.texi:428 +#: doc/guix.texi:426 msgid "Packages are currently available on the following platforms:" msgstr "Pakete sind zur Zeit auf folgenden Plattformen verfügbar:" #. type: item -#: doc/guix.texi:431 doc/guix.texi:1879 +#: doc/guix.texi:429 doc/guix.texi:1877 #, no-wrap msgid "x86_64-linux" msgstr "x86_64-linux" #. type: table -#: doc/guix.texi:433 +#: doc/guix.texi:431 msgid "Intel/AMD @code{x86_64} architecture, Linux-Libre kernel;" msgstr "Intel/AMD-@code{x86_64}-Architektur, Linux-Libre als Kernel," #. type: item -#: doc/guix.texi:434 doc/guix.texi:1882 +#: doc/guix.texi:432 doc/guix.texi:1880 #, no-wrap msgid "i686-linux" msgstr "i686-linux" #. type: table -#: doc/guix.texi:436 +#: doc/guix.texi:434 msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel;" msgstr "Intel-32-Bit-Architektur (IA-32), Linux-Libre als Kernel," #. type: item -#: doc/guix.texi:437 +#: doc/guix.texi:435 #, no-wrap msgid "armhf-linux" msgstr "armhf-linux" #. type: table -#: doc/guix.texi:441 +#: doc/guix.texi:439 msgid "ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI hard-float application binary interface (ABI), and Linux-Libre kernel." msgstr "ARMv7-A-Architektur mit „hard float“, Thumb-2 und NEON, für die EABI „hard-float application binary interface“, mit Linux-Libre als Kernel," #. type: item -#: doc/guix.texi:442 +#: doc/guix.texi:440 #, no-wrap msgid "aarch64-linux" msgstr "aarch64-linux" #. type: table #: doc/guix.texi:444 -msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel." -msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, mit Linux-Libre als Kernel," +msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. This is currently in an experimental stage, with limited support. @xref{Contributing}, for how to help!" +msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, Linux-Libre als Kernel. Derzeit ist dies noch in der Erprobungsphase mit begrenzter Unterstützung. Unter @ref{Contributing} steht, wie Sie dabei helfen können!" #. type: item #: doc/guix.texi:445 @@ -3264,126 +3273,128 @@ msgid "mips64el-linux" msgstr "mips64el-linux" #. type: table -#: doc/guix.texi:450 -msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully supported; in particular, the project's build farms no longer provide substitutes for this architecture." -msgstr "64-Bit-MIPS-Prozessoren, little-endian, speziell die Loongson-Reihe, n32-ABI, mit Linux-Libre als Kernel. Diese Konfiguration wird nicht länger in vollem Umfang unterstützt; insbesondere werden von der Build-Farm des Guix-Projekts keine Substitute mehr für diese Architektur angeboten." +#: doc/guix.texi:448 +#, fuzzy +#| msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel." +msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel." +msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, mit Linux-Libre als Kernel," #. type: Plain text -#: doc/guix.texi:460 +#: doc/guix.texi:458 msgid "With Guix@tie{}System, you @emph{declare} all aspects of the operating system configuration and Guix takes care of instantiating the configuration in a transactional, reproducible, and stateless fashion (@pxref{System Configuration}). Guix System uses the Linux-libre kernel, the Shepherd initialization system (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}), the well-known GNU utilities and tool chain, as well as the graphical environment or system services of your choice." msgstr "Mit Guix@tie{}System @emph{deklarieren} Sie alle Aspekte der Betriebssystemkonfiguration und Guix kümmert sich darum, die Konfiguration auf transaktionsbasierte, reproduzierbare und zustandslose Weise zu instanziieren (siehe @ref{System Configuration}). Guix System benutzt den Kernel Linux-libre, das Shepherd-Initialisierungssystem (siehe @ref{Introduction,,, shepherd, The GNU Shepherd Manual}), die wohlbekannten GNU-Werkzeuge mit der zugehörigen Werkzeugkette sowie die grafische Umgebung und Systemdienste Ihrer Wahl." #. type: Plain text -#: doc/guix.texi:463 +#: doc/guix.texi:461 msgid "Guix System is available on all the above platforms except @code{mips64el-linux}." msgstr "Guix System ist auf allen oben genannten Plattformen außer @code{mips64el-linux} verfügbar." #. type: Plain text -#: doc/guix.texi:467 +#: doc/guix.texi:465 msgid "For information on porting to other architectures or kernels, @pxref{Porting}." msgstr "Informationen, wie auf andere Architekturen oder Kernels portiert werden kann, finden Sie im Abschnitt @ref{Porting}." #. type: Plain text -#: doc/guix.texi:470 +#: doc/guix.texi:468 msgid "Building this distribution is a cooperative effort, and you are invited to join! @xref{Contributing}, for information about how you can help." msgstr "Diese Distribution aufzubauen basiert auf Kooperation, und Sie sind herzlich eingeladen, dabei mitzumachen! Im Abschnitt @ref{Contributing} stehen weitere Informationen, wie Sie uns helfen können." #. type: cindex -#: doc/guix.texi:476 +#: doc/guix.texi:474 #, no-wrap msgid "installing Guix" msgstr "Guix installieren" #. type: quotation -#: doc/guix.texi:478 doc/guix.texi:526 doc/guix.texi:1550 doc/guix.texi:1781 -#: doc/guix.texi:1986 doc/guix.texi:2188 doc/guix.texi:2383 doc/guix.texi:3182 -#: doc/guix.texi:3962 doc/guix.texi:4178 doc/guix.texi:4467 doc/guix.texi:4699 -#: doc/guix.texi:4846 doc/guix.texi:6321 doc/guix.texi:6389 doc/guix.texi:8075 -#: doc/guix.texi:8087 doc/guix.texi:9978 doc/guix.texi:10515 -#: doc/guix.texi:11064 doc/guix.texi:13546 doc/guix.texi:19355 -#: doc/guix.texi:24110 doc/guix.texi:24305 doc/guix.texi:24424 -#: doc/guix.texi:24545 doc/guix.texi:25563 +#: doc/guix.texi:476 doc/guix.texi:524 doc/guix.texi:1548 doc/guix.texi:1779 +#: doc/guix.texi:1984 doc/guix.texi:2186 doc/guix.texi:2381 doc/guix.texi:3180 +#: doc/guix.texi:3960 doc/guix.texi:4176 doc/guix.texi:4465 doc/guix.texi:4697 +#: doc/guix.texi:4844 doc/guix.texi:6319 doc/guix.texi:6387 doc/guix.texi:8073 +#: doc/guix.texi:8085 doc/guix.texi:9976 doc/guix.texi:10513 +#: doc/guix.texi:11062 doc/guix.texi:13544 doc/guix.texi:19352 +#: doc/guix.texi:24107 doc/guix.texi:24302 doc/guix.texi:24421 +#: doc/guix.texi:24536 doc/guix.texi:25545 #, no-wrap msgid "Note" msgstr "Anmerkung" #. type: quotation -#: doc/guix.texi:488 +#: doc/guix.texi:486 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script} to install Guix on top of a running GNU/Linux system, thereafter called a @dfn{foreign distro}.@footnote{This section is concerned with the installation of the package manager, which can be done on top of a running GNU/Linux system. If, instead, you want to install the complete GNU operating system, @pxref{System Installation}.} The script automates the download, installation, and initial configuration of Guix. It should be run as the root user." msgstr "Wir empfehlen, dieses @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, Shell-basierte Installationsskript} zu benutzen, um Guix auf ein bestehendes GNU/Linux-System zu installieren — im Folgenden als @dfn{Fremddistribution} bezeichnet.@footnote{Dieser Abschnitt bezieht sich auf die Installation des Paketverwaltungswerkzeugs, das auf ein bestehendes GNU/Linux-System aufsetzend installiert werden kann. Wenn Sie stattdessen das vollständige GNU-Betriebssystem installieren möchten, lesen Sie @ref{System Installation}.} Das Skript automatisiert das Herunterladen, das Installieren und die anfängliche Konfiguration von Guix. Es sollte als der Administratornutzer „root“ ausgeführt werden." #. type: cindex -#: doc/guix.texi:490 doc/guix.texi:1567 +#: doc/guix.texi:488 doc/guix.texi:1565 #, no-wrap msgid "foreign distro" msgstr "Fremddistribution" #. type: cindex -#: doc/guix.texi:491 +#: doc/guix.texi:489 #, no-wrap msgid "directories related to foreign distro" msgstr "Verzeichnisse auf einer Fremddistribution" #. type: Plain text -#: doc/guix.texi:496 +#: doc/guix.texi:494 msgid "When installed on a foreign distro, GNU@tie{}Guix complements the available tools without interference. Its data lives exclusively in two directories, usually @file{/gnu/store} and @file{/var/guix}; other files on your system, such as @file{/etc}, are left untouched." msgstr "Wenn es auf einer Fremddistribution installiert wird, ergänzt GNU@tie{}Guix die verfügbaren Werkzeuge, ohne dass sie sich gegenseitig stören. Guix’ Daten befinden sich ausschließlich in zwei Verzeichnissen, üblicherweise @file{/gnu/store} und @file{/var/guix}; andere Dateien auf Ihrem System wie @file{/etc} bleiben unberührt." #. type: Plain text -#: doc/guix.texi:499 +#: doc/guix.texi:497 msgid "Once installed, Guix can be updated by running @command{guix pull} (@pxref{Invoking guix pull})." msgstr "Sobald es installiert ist, kann Guix durch Ausführen von @command{guix pull} aktualisiert werden (siehe @ref{Invoking guix pull})." #. type: Plain text -#: doc/guix.texi:504 +#: doc/guix.texi:502 msgid "If you prefer to perform the installation steps manually or want to tweak them, you may find the following subsections useful. They describe the software requirements of Guix, as well as how to install it manually and get ready to use it." msgstr "Sollten Sie es vorziehen, die Installationsschritte manuell durchzuführen, oder falls Sie Anpassungen daran vornehmen möchten, könnten sich die folgenden Unterabschnitte als nützlich erweisen. Diese beschreiben die Software-Voraussetzungen von Guix und wie man es manuell installiert, so dass man es benutzen kann." #. type: cindex -#: doc/guix.texi:517 +#: doc/guix.texi:515 #, no-wrap msgid "installing Guix from binaries" msgstr "Guix aus Binärdateien installieren" #. type: cindex -#: doc/guix.texi:518 +#: doc/guix.texi:516 #, no-wrap msgid "installer script" msgstr "Installations-Skript" #. type: Plain text -#: doc/guix.texi:524 +#: doc/guix.texi:522 msgid "This section describes how to install Guix on an arbitrary system from a self-contained tarball providing binaries for Guix and for all its dependencies. This is often quicker than installing from source, which is described in the next sections. The only requirement is to have GNU@tie{}tar and Xz." msgstr "Dieser Abschnitt beschreibt, wie sich Guix auf einem beliebigen System aus einem alle Komponenten umfassenden Tarball installieren lässt, der Binärdateien für Guix und all seine Abhängigkeiten liefert. Dies geht in der Regel schneller, als Guix aus seinen Quelldateien zu installieren, was in den nächsten Abschnitten beschrieben wird. Vorausgesetzt wird hier lediglich, dass GNU@tie{}tar und Xz verfügbar sind." #. type: quotation -#: doc/guix.texi:532 +#: doc/guix.texi:530 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}. The script automates the download, installation, and initial configuration steps described below. It should be run as the root user." msgstr "Wir empfehlen, dass Sie dieses @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, Installations-Skript für die Shell} verwenden, welches Guix automatisch herunterlädt, installiert und eine erste Konfiguration von Guix mit sich bringt. Es sollte als der Administratornutzer (als „root“) ausgeführt werden." #. type: Plain text -#: doc/guix.texi:535 +#: doc/guix.texi:533 msgid "Installing goes along these lines:" msgstr "Die Installation läuft so ab:" #. type: cindex -#: doc/guix.texi:538 +#: doc/guix.texi:536 #, no-wrap msgid "downloading Guix binary" msgstr "Guix-Binärdatei herunterladen" #. type: enumerate -#: doc/guix.texi:543 +#: doc/guix.texi:541 msgid "Download the binary tarball from @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine already running the kernel Linux, and so on." msgstr "Laden Sie den binären Tarball von @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{System}.tar.xz} herunter, wobei @var{System} für @code{x86_64-linux} steht, falls Sie es auf einer Maschine mit @code{x86_64}-Architektur einrichten, auf der bereits der Linux-Kernel läuft, oder entsprechend für andere Maschinen." #. type: enumerate -#: doc/guix.texi:547 +#: doc/guix.texi:545 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines:" msgstr "Achten Sie darauf, auch die zugehörige @file{.sig}-Datei herunterzuladen und verifizieren Sie damit die Authentizität des Tarballs, ungefähr so:" #. type: example -#: doc/guix.texi:551 +#: doc/guix.texi:549 #, no-wrap msgid "" "$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n" @@ -3393,12 +3404,12 @@ msgstr "" "$ gpg --verify guix-binary-@value{VERSION}.@var{System}.tar.xz.sig\n" #. type: Plain text -#: doc/guix.texi:555 doc/guix.texi:1897 +#: doc/guix.texi:553 doc/guix.texi:1895 msgid "If that command fails because you do not have the required public key, then run this command to import it:" msgstr "Falls dieser Befehl fehlschlägt, weil Sie nicht über den nötigen öffentlichen Schlüssel verfügen, können Sie ihn mit diesem Befehl importieren:" #. type: example -#: doc/guix.texi:559 doc/guix.texi:1901 +#: doc/guix.texi:557 doc/guix.texi:1899 #, no-wrap msgid "" "$ gpg --keyserver @value{KEY-SERVER} \\\n" @@ -3408,17 +3419,17 @@ msgstr "" " --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n" #. type: Plain text -#: doc/guix.texi:564 doc/guix.texi:1906 +#: doc/guix.texi:562 doc/guix.texi:1904 msgid "and rerun the @code{gpg --verify} command." msgstr "und den Befehl @code{gpg --verify} erneut ausführen." #. type: enumerate -#: doc/guix.texi:568 +#: doc/guix.texi:566 msgid "Now, you need to become the @code{root} user. Depending on your distribution, you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run:" msgstr "Nun müssen Sie zum Administratornutzer @code{root} wechseln. Abhängig von Ihrer Distribution müssen Sie dazu etwa @code{su -} oder @code{sudo -i} ausführen. Danach führen Sie als @code{root}-Nutzer aus:" #. type: example -#: doc/guix.texi:574 +#: doc/guix.texi:572 #, no-wrap msgid "" "# cd /tmp\n" @@ -3432,27 +3443,27 @@ msgstr "" "# mv var/guix /var/ && mv gnu /\n" #. type: enumerate -#: doc/guix.texi:579 +#: doc/guix.texi:577 msgid "This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}. The latter contains a ready-to-use profile for @code{root} (see next step.)" msgstr "Dadurch wird @file{/gnu/store} (siehe @ref{The Store}) und @file{/var/guix} erzeugt. Letzteres enthält ein fertiges Guix-Profil für den Administratornutzer @code{root} (wie im nächsten Schritt beschrieben)." #. type: enumerate -#: doc/guix.texi:582 +#: doc/guix.texi:580 msgid "Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files." msgstr "Entpacken Sie den Tarball @emph{nicht} auf einem schon funktionierenden Guix-System, denn es würde seine eigenen essenziellen Dateien überschreiben." #. type: enumerate -#: doc/guix.texi:592 +#: doc/guix.texi:590 msgid "The @code{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent versions are fine.) They stem from the fact that all the files in the archive have their modification time set to zero (which means January 1st, 1970.) This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible." msgstr "Die Befehlszeilenoption @code{--warning=no-timestamp} stellt sicher, dass GNU@tie{}tar nicht vor „unplausibel alten Zeitstempeln“ warnt (solche Warnungen traten bei GNU@tie{}tar 1.26 und älter auf, neue Versionen machen keine Probleme). Sie treten auf, weil alle Dateien im Archiv als Änderungszeitpunkt null eingetragen bekommen haben (das bezeichnet den 1. Januar 1970). Das ist Absicht, damit der Inhalt des Archivs nicht davon abhängt, wann es erstellt wurde, und es somit reproduzierbar wird." #. type: enumerate -#: doc/guix.texi:596 +#: doc/guix.texi:594 msgid "Make the profile available under @file{~root/.config/guix/current}, which is where @command{guix pull} will install updates (@pxref{Invoking guix pull}):" msgstr "Machen Sie das Profil als @file{~root/.config/guix/current} verfügbar, wo @command{guix pull} es aktualisieren kann (siehe @ref{Invoking guix pull}):" #. type: example -#: doc/guix.texi:601 +#: doc/guix.texi:599 #, no-wrap msgid "" "# mkdir -p ~root/.config/guix\n" @@ -3464,12 +3475,12 @@ msgstr "" " ~root/.config/guix/current\n" #. type: enumerate -#: doc/guix.texi:605 +#: doc/guix.texi:603 msgid "Source @file{etc/profile} to augment @code{PATH} and other relevant environment variables:" msgstr "„Sourcen“ Sie @file{etc/profile}, um @code{PATH} und andere relevante Umgebungsvariable zu ergänzen:" #. type: example -#: doc/guix.texi:609 +#: doc/guix.texi:607 #, no-wrap msgid "" "# GUIX_PROFILE=\"`echo ~root`/.config/guix/current\" ; \\\n" @@ -3479,22 +3490,22 @@ msgstr "" " source $GUIX_PROFILE/etc/profile\n" #. type: enumerate -#: doc/guix.texi:614 +#: doc/guix.texi:612 msgid "Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup})." msgstr "Erzeugen Sie Nutzergruppe und Nutzerkonten für die Erstellungs-Benutzer wie folgt (siehe @ref{Build Environment Setup})." #. type: enumerate -#: doc/guix.texi:617 +#: doc/guix.texi:615 msgid "Run the daemon, and set it to automatically start on boot." msgstr "Führen Sie den Daemon aus, und lassen Sie ihn automatisch bei jedem Hochfahren starten." #. type: enumerate -#: doc/guix.texi:620 +#: doc/guix.texi:618 msgid "If your host distro uses the systemd init system, this can be achieved with these commands:" msgstr "Wenn Ihre Wirts-Distribution systemd als „init“-System verwendet, können Sie das mit folgenden Befehlen veranlassen:" #. type: example -#: doc/guix.texi:632 +#: doc/guix.texi:630 #, no-wrap msgid "" "# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \\\n" @@ -3506,12 +3517,12 @@ msgstr "" "# systemctl start guix-daemon && systemctl enable guix-daemon\n" #. type: itemize -#: doc/guix.texi:635 doc/guix.texi:9762 +#: doc/guix.texi:633 doc/guix.texi:9760 msgid "If your host distro uses the Upstart init system:" msgstr "Wenn Ihre Wirts-Distribution als „init“-System Upstart verwendet:" #. type: example -#: doc/guix.texi:641 +#: doc/guix.texi:639 #, no-wrap msgid "" "# initctl reload-configuration\n" @@ -3525,12 +3536,12 @@ msgstr "" "# start guix-daemon\n" #. type: enumerate -#: doc/guix.texi:644 +#: doc/guix.texi:642 msgid "Otherwise, you can still start the daemon manually with:" msgstr "Andernfalls können Sie den Daemon immer noch manuell starten, mit:" #. type: example -#: doc/guix.texi:648 +#: doc/guix.texi:646 #, no-wrap msgid "" "# ~root/.config/guix/current/bin/guix-daemon \\\n" @@ -3540,12 +3551,12 @@ msgstr "" " --build-users-group=guixbuild\n" #. type: enumerate -#: doc/guix.texi:653 +#: doc/guix.texi:651 msgid "Make the @command{guix} command available to other users on the machine, for instance with:" msgstr "Stellen Sie den @command{guix}-Befehl auch anderen Nutzern Ihrer Maschine zur Verfügung, zum Beispiel so:" #. type: example -#: doc/guix.texi:658 +#: doc/guix.texi:656 #, no-wrap msgid "" "# mkdir -p /usr/local/bin\n" @@ -3557,12 +3568,12 @@ msgstr "" "# ln -s /var/guix/profiles/per-user/root/current-guix/bin/guix\n" #. type: enumerate -#: doc/guix.texi:662 +#: doc/guix.texi:660 msgid "It is also a good idea to make the Info version of this manual available there:" msgstr "Es ist auch eine gute Idee, die Info-Version dieses Handbuchs ebenso verfügbar zu machen:" #. type: example -#: doc/guix.texi:668 +#: doc/guix.texi:666 #, no-wrap msgid "" "# mkdir -p /usr/local/share/info\n" @@ -3576,23 +3587,23 @@ msgstr "" " do ln -s $i ; done\n" #. type: enumerate -#: doc/guix.texi:674 +#: doc/guix.texi:672 msgid "That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info search path.)" msgstr "Auf diese Art wird, unter der Annahme, dass bei Ihnen @file{/usr/local/share/info} im Suchpfad eingetragen ist, das Ausführen von @command{info guix.de} dieses Handbuch öffnen (siehe @ref{Other Info Directories,,, texinfo, GNU Texinfo} hat weitere Details, wie Sie den Info-Suchpfad ändern können)." #. type: cindex -#: doc/guix.texi:676 doc/guix.texi:3161 doc/guix.texi:11982 +#: doc/guix.texi:674 doc/guix.texi:3159 doc/guix.texi:11980 #, no-wrap msgid "substitutes, authorization thereof" msgstr "Substitute, deren Autorisierung" #. type: enumerate -#: doc/guix.texi:679 +#: doc/guix.texi:677 msgid "To use substitutes from @code{@value{SUBSTITUTE-SERVER}} or one of its mirrors (@pxref{Substitutes}), authorize them:" msgstr "Um Substitute von @code{@value{SUBSTITUTE-SERVER}} oder einem Spiegelserver davon zu benutzen (siehe @ref{Substitutes}), müssen sie erst autorisiert werden:" #. type: example -#: doc/guix.texi:683 +#: doc/guix.texi:681 #, no-wrap msgid "" "# guix archive --authorize < \\\n" @@ -3602,44 +3613,44 @@ msgstr "" " ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER}.pub\n" #. type: enumerate -#: doc/guix.texi:688 +#: doc/guix.texi:686 msgid "Each user may need to perform a few additional steps to make their Guix environment ready for use, @pxref{Application Setup}." msgstr "Alle Nutzer müssen womöglich ein paar zusätzliche Schritte ausführen, damit ihre Guix-Umgebung genutzt werden kann, siehe @ref{Application Setup}." #. type: Plain text -#: doc/guix.texi:691 +#: doc/guix.texi:689 msgid "Voilà, the installation is complete!" msgstr "Voilà, die Installation ist fertig!" #. type: Plain text -#: doc/guix.texi:694 +#: doc/guix.texi:692 msgid "You can confirm that Guix is working by installing a sample package into the root profile:" msgstr "Sie können nachprüfen, dass Guix funktioniert, indem Sie ein Beispielpaket in das root-Profil installieren:" #. type: example -#: doc/guix.texi:697 +#: doc/guix.texi:695 #, no-wrap msgid "# guix install hello\n" msgstr "# guix install hello\n" #. type: Plain text -#: doc/guix.texi:701 +#: doc/guix.texi:699 msgid "The binary installation tarball can be (re)produced and verified simply by running the following command in the Guix source tree:" msgstr "Der Tarball zur Installation aus einer Binärdatei kann einfach durch Ausführung des folgenden Befehls im Guix-Quellbaum (re-)produziert und verifiziert werden:" #. type: example -#: doc/guix.texi:704 +#: doc/guix.texi:702 #, no-wrap msgid "make guix-binary.@var{system}.tar.xz\n" msgstr "make guix-binary.@var{System}.tar.xz\n" #. type: Plain text -#: doc/guix.texi:708 +#: doc/guix.texi:706 msgid "...@: which, in turn, runs:" msgstr "…@: was wiederum dies ausführt:" #. type: example -#: doc/guix.texi:712 +#: doc/guix.texi:710 #, no-wrap msgid "" "guix pack -s @var{system} --localstatedir \\\n" @@ -3649,277 +3660,277 @@ msgstr "" " --profile-name=current-guix guix\n" #. type: Plain text -#: doc/guix.texi:715 +#: doc/guix.texi:713 msgid "@xref{Invoking guix pack}, for more info on this handy tool." msgstr "Siehe @ref{Invoking guix pack} für weitere Informationen zu diesem praktischen Werkzeug." #. type: Plain text -#: doc/guix.texi:723 +#: doc/guix.texi:721 msgid "This section lists requirements when building Guix from source. The build procedure for Guix is the same as for other GNU software, and is not covered here. Please see the files @file{README} and @file{INSTALL} in the Guix source tree for additional details." msgstr "Dieser Abschnitt listet Voraussetzungen auf, um Guix aus seinem Quellcode zu erstellen. Der Erstellungsprozess für Guix ist derselbe wie für andere GNU-Software und wird hier nicht beschrieben. Bitte lesen Sie die Dateien @file{README} und @file{INSTALL} im Guix-Quellbaum, um weitere Details zu erfahren." #. type: cindex -#: doc/guix.texi:724 +#: doc/guix.texi:722 #, no-wrap msgid "official website" msgstr "Offizielle Webpräsenz" #. type: Plain text -#: doc/guix.texi:727 +#: doc/guix.texi:725 msgid "GNU Guix is available for download from its website at @url{https://www.gnu.org/software/guix/}." msgstr "GNU Guix kann von seiner Webpräsenz unter @url{http://www.gnu.org/software/guix/} heruntergeladen werden." #. type: Plain text -#: doc/guix.texi:729 +#: doc/guix.texi:727 msgid "GNU Guix depends on the following packages:" msgstr "GNU Guix hat folgende Pakete als Abhängigkeiten:" #. type: item -#: doc/guix.texi:731 +#: doc/guix.texi:729 #, no-wrap msgid "@url{https://gnu.org/software/guile/, GNU Guile}, version 2.2.x;" msgstr "@url{https://gnu.org/software/guile/, GNU Guile}, Version 2.2.x," #. type: item -#: doc/guix.texi:732 +#: doc/guix.texi:730 #, no-wrap msgid "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version" msgstr "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, Version" #. type: itemize -#: doc/guix.texi:734 +#: doc/guix.texi:732 msgid "0.1.0 or later;" msgstr "0.1.0 oder neuer," #. type: itemize -#: doc/guix.texi:738 +#: doc/guix.texi:736 msgid "@uref{https://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile});" msgstr "@uref{https://gnutls.org/, GnuTLS}, im Speziellen dessen Anbindungen für Guile (siehe @ref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile})," #. type: itemize -#: doc/guix.texi:741 +#: doc/guix.texi:739 msgid "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0 or later;" msgstr "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, Version 0.1.0 oder neuer," #. type: itemize -#: doc/guix.texi:745 +#: doc/guix.texi:743 msgid "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later;" msgstr "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, vom August 2017 oder neuer," #. type: item -#: doc/guix.texi:745 +#: doc/guix.texi:743 #, no-wrap msgid "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON};" msgstr "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}," #. type: item -#: doc/guix.texi:746 +#: doc/guix.texi:744 #, no-wrap msgid "@url{https://zlib.net, zlib};" msgstr "@url{https://zlib.net, zlib}," #. type: item -#: doc/guix.texi:747 +#: doc/guix.texi:745 #, no-wrap msgid "@url{https://www.gnu.org/software/make/, GNU Make}." msgstr "@url{https://www.gnu.org/software/make/, GNU Make}." #. type: Plain text -#: doc/guix.texi:751 +#: doc/guix.texi:749 msgid "The following dependencies are optional:" msgstr "Folgende Abhängigkeiten sind optional:" #. type: itemize -#: doc/guix.texi:759 +#: doc/guix.texi:757 msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later." msgstr "Unterstützung für das Auslagern von Erstellungen (siehe @ref{Daemon Offload Setup}) und @command{guix copy} (siehe @ref{Invoking guix copy}) hängt von @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, Version 0.10.2 oder neuer, ab." #. type: itemize -#: doc/guix.texi:763 +#: doc/guix.texi:761 msgid "When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} can use it to compress build logs." msgstr "Wenn @url{http://www.bzip.org, libbz2} verfügbar ist, kann @command{guix-daemon} damit Erstellungsprotokolle komprimieren." #. type: Plain text -#: doc/guix.texi:767 +#: doc/guix.texi:765 msgid "Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed:" msgstr "Sofern nicht @code{--disable-daemon} beim Aufruf von @command{configure} übergeben wurde, benötigen Sie auch folgende Pakete:" #. type: item -#: doc/guix.texi:769 +#: doc/guix.texi:767 #, no-wrap msgid "@url{https://gnupg.org/, GNU libgcrypt};" msgstr "@url{https://gnupg.org/, GNU libgcrypt}," #. type: item -#: doc/guix.texi:770 +#: doc/guix.texi:768 #, no-wrap msgid "@url{https://sqlite.org, SQLite 3};" msgstr "@url{https://sqlite.org, SQLite 3}," #. type: item -#: doc/guix.texi:771 +#: doc/guix.texi:769 #, no-wrap msgid "@url{https://gcc.gnu.org, GCC's g++}, with support for the" msgstr "@url{https://gcc.gnu.org, GCC's g++} mit Unterstützung für den" #. type: itemize -#: doc/guix.texi:773 +#: doc/guix.texi:771 msgid "C++11 standard." msgstr "C++11-Standard." #. type: cindex -#: doc/guix.texi:775 +#: doc/guix.texi:773 #, no-wrap msgid "state directory" msgstr "Zustandsverzeichnis" #. type: Plain text -#: doc/guix.texi:783 +#: doc/guix.texi:781 msgid "When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing installation using the @code{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}). The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})." msgstr "Sollten Sie Guix auf einem System konfigurieren, auf dem Guix bereits installiert ist, dann stellen Sie sicher, dasselbe Zustandsverzeichnis wie für die bestehende Installation zu verwenden. Benutzen Sie dazu die Befehlszeilenoption @code{--localstatedir} des @command{configure}-Skripts (siehe @ref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}). Das @command{configure}-Skript schützt vor ungewollter Fehlkonfiguration der @var{localstatedir}, damit sie nicht versehentlich Ihren Store verfälschen (siehe @ref{The Store})." #. type: cindex -#: doc/guix.texi:784 +#: doc/guix.texi:782 #, no-wrap msgid "Nix, compatibility" msgstr "Nix, Kompatibilität" #. type: Plain text -#: doc/guix.texi:789 +#: doc/guix.texi:787 msgid "When a working installation of @url{https://nixos.org/nix/, the Nix package manager} is available, you can instead configure Guix with @code{--disable-daemon}. In that case, Nix replaces the three dependencies above." msgstr "Wenn eine funktionierende Installation von @url{https://nixos.org/nix/, dem Nix-Paketverwaltungswerkzeug} verfügbar ist, können Sie Guix stattdessen mit @code{--disable-daemon} konfigurieren. In diesem Fall ersetzt Nix die drei oben genannten Abhängigkeiten." #. type: Plain text -#: doc/guix.texi:799 +#: doc/guix.texi:797 msgid "Guix is compatible with Nix, so it is possible to share the same store between both. To do so, you must pass @command{configure} not only the same @code{--with-store-dir} value, but also the same @code{--localstatedir} value. The latter is essential because it specifies where the database that stores metadata about the store is located, among other things. The default values for Nix are @code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}. Note that @code{--disable-daemon} is not required if your goal is to share the store with Nix." msgstr "Guix ist mit Nix kompatibel, daher ist es möglich, denselben Store für beide zu verwenden. Dazu müssen Sie an @command{configure} nicht nur denselben Wert für @code{--with-store-dir} übergeben, sondern auch denselben Wert für @code{--localstatedir}. Letzterer ist deswegen essenziell, weil er unter anderem angibt, wo die Datenbank liegt, in der sich die Metainformationen über den Store befinden. Für Nix sind die Werte standardmäßig @code{--with-store-dir=/nix/store} und @code{--localstatedir=/nix/var}. Beachten Sie, dass @code{--disable-daemon} nicht erforderlich ist, wenn Sie die Absicht haben, den Store mit Nix zu teilen." #. type: cindex -#: doc/guix.texi:803 +#: doc/guix.texi:801 #, no-wrap msgid "test suite" msgstr "Testkatalog" #. type: Plain text -#: doc/guix.texi:809 +#: doc/guix.texi:807 msgid "After a successful @command{configure} and @code{make} run, it is a good idea to run the test suite. It can help catch issues with the setup or environment, or bugs in Guix itself---and really, reporting test failures is a good way to help improve the software. To run the test suite, type:" msgstr "Nachdem @command{configure} und @code{make} erfolgreich durchgelaufen sind, ist es ratsam, den Testkatalog auszuführen. Er kann dabei helfen, Probleme mit der Einrichtung oder Systemumgebung zu finden, oder auch Probleme in Guix selbst — und Testfehler zu melden ist eine wirklich gute Art und Weise, bei der Verbesserung von Guix mitzuhelfen. Um den Testkatalog auszuführen, geben Sie Folgendes ein:" #. type: example -#: doc/guix.texi:812 +#: doc/guix.texi:810 #, no-wrap msgid "make check\n" msgstr "make check\n" #. type: Plain text -#: doc/guix.texi:819 +#: doc/guix.texi:817 msgid "Test cases can run in parallel: you can use the @code{-j} option of GNU@tie{}make to speed things up. The first run may take a few minutes on a recent machine; subsequent runs will be faster because the store that is created for test purposes will already have various things in cache." msgstr "Testfälle können parallel ausgeführt werden. Sie können die Befehlszeiltenoption @code{-j} von GNU@tie{}make benutzen, damit es schneller geht. Der erste Durchlauf kann auf neuen Maschinen ein paar Minuten dauern, nachfolgende Ausführungen werden schneller sein, weil der für die Tests erstellte Store schon einige Dinge zwischengespeichert haben wird." #. type: Plain text -#: doc/guix.texi:822 +#: doc/guix.texi:820 msgid "It is also possible to run a subset of the tests by defining the @code{TESTS} makefile variable as in this example:" msgstr "Es ist auch möglich, eine Teilmenge der Tests laufen zu lassen, indem Sie die @code{TESTS}-Variable des Makefiles ähnlich wie in diesem Beispiel definieren:" #. type: example -#: doc/guix.texi:825 +#: doc/guix.texi:823 #, no-wrap msgid "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n" msgstr "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n" #. type: Plain text -#: doc/guix.texi:830 +#: doc/guix.texi:828 msgid "By default, tests results are displayed at a file level. In order to see the details of every individual test cases, it is possible to define the @code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example:" msgstr "Standardmäßig werden Testergebnisse pro Datei angezeigt. Um die Details jedes einzelnen Testfalls zu sehen, können Sie wie in diesem Beispiel die @code{SCM_LOG_DRIVER_FLAGS}-Variable des Makefiles definieren:" #. type: example -#: doc/guix.texi:833 +#: doc/guix.texi:831 #, no-wrap msgid "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n" msgstr "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n" #. type: Plain text -#: doc/guix.texi:839 +#: doc/guix.texi:837 msgid "Upon failure, please email @email{bug-guix@@gnu.org} and attach the @file{test-suite.log} file. Please specify the Guix version being used as well as version numbers of the dependencies (@pxref{Requirements}) in your message." msgstr "Kommt es zum Fehlschlag, senden Sie bitte eine E-Mail an @email{bug-guix@@gnu.org} und fügen Sie die Datei @file{test-suite.log} als Anhang bei. Bitte geben Sie dabei in Ihrer Nachricht die benutzte Version von Guix an sowie die Versionsnummern der Abhängigkeiten (siehe @ref{Requirements})." #. type: Plain text -#: doc/guix.texi:843 +#: doc/guix.texi:841 msgid "Guix also comes with a whole-system test suite that tests complete Guix System instances. It can only run on systems where Guix is already installed, using:" msgstr "Guix wird auch mit einem Testkatalog für das ganze System ausgeliefert, der vollständige Instanzen des „Guix System“-Betriebssystems testet. Er kann nur auf Systemen benutzt werden, auf denen Guix bereits installiert ist, mit folgendem Befehl:" #. type: example -#: doc/guix.texi:846 +#: doc/guix.texi:844 #, no-wrap msgid "make check-system\n" msgstr "make check-system\n" #. type: Plain text -#: doc/guix.texi:850 +#: doc/guix.texi:848 msgid "or, again, by defining @code{TESTS} to select a subset of tests to run:" msgstr "Oder, auch hier, indem Sie @code{TESTS} definieren, um eine Teilmenge der auszuführenden Tests anzugeben:" #. type: example -#: doc/guix.texi:853 +#: doc/guix.texi:851 #, no-wrap msgid "make check-system TESTS=\"basic mcron\"\n" msgstr "make check-system TESTS=\"basic mcron\"\n" #. type: Plain text -#: doc/guix.texi:861 +#: doc/guix.texi:859 msgid "These system tests are defined in the @code{(gnu tests @dots{})} modules. They work by running the operating systems under test with lightweight instrumentation in a virtual machine (VM). They can be computationally intensive or rather cheap, depending on whether substitutes are available for their dependencies (@pxref{Substitutes}). Some of them require a lot of storage space to hold VM images." msgstr "Diese Systemtests sind in den @code{(gnu tests …)}-Modulen definiert. Sie funktionieren, indem Sie das getestete Betriebssystem mitsamt schlichter Instrumentierung in einer virtuellen Maschine (VM) ausführen. Die Tests können aufwendige Berechnungen durchführen oder sie günstig umgehen, je nachdem, ob für ihre Abhängigkeiten Substitute zur Verfügung stehen (siehe @ref{Substitutes}). Manche von ihnen nehmen viel Speicherplatz in Anspruch, um die VM-Abbilder zu speichern." #. type: Plain text -#: doc/guix.texi:864 +#: doc/guix.texi:862 msgid "Again in case of test failures, please send @email{bug-guix@@gnu.org} all the details." msgstr "Auch hier gilt: Falls Testfehler auftreten, senden Sie bitte alle Details an @email{bug-guix@@gnu.org}." #. type: cindex -#: doc/guix.texi:868 +#: doc/guix.texi:866 #, no-wrap msgid "daemon" msgstr "Daemon" #. type: Plain text -#: doc/guix.texi:876 +#: doc/guix.texi:874 msgid "Operations such as building a package or running the garbage collector are all performed by a specialized process, the @dfn{build daemon}, on behalf of clients. Only the daemon may access the store and its associated database. Thus, any operation that manipulates the store goes through the daemon. For instance, command-line tools such as @command{guix package} and @command{guix build} communicate with the daemon (@i{via} remote procedure calls) to instruct it what to do." msgstr "Operationen wie das Erstellen eines Pakets oder Laufenlassen des Müllsammlers werden alle durch einen spezialisierten Prozess durchgeführt, den @dfn{Erstellungs-Daemon}, im Auftrag seiner Kunden (den Clients). Nur der Daemon darf auf den Store und seine zugehörige Datenbank zugreifen. Daher wird jede den Store verändernde Operation durch den Daemon durchgeführt. Zum Beispiel kommunizieren Befehlszeilenwerkzeuge wie @command{guix package} und @command{guix build} mit dem Daemon (mittels entfernter Prozeduraufrufe), um ihm Anweisungen zu geben, was er tun soll." #. type: Plain text -#: doc/guix.texi:880 +#: doc/guix.texi:878 msgid "The following sections explain how to prepare the build daemon's environment. See also @ref{Substitutes}, for information on how to allow the daemon to download pre-built binaries." msgstr "Folgende Abschnitte beschreiben, wie Sie die Umgebung des Erstellungs-Daemons ausstatten sollten. Siehe auch @ref{Substitutes} für Informationen darüber, wie Sie es dem Daemon ermöglichen, vorerstellte Binärdateien herunterzuladen." #. type: cindex -#: doc/guix.texi:890 doc/guix.texi:1313 +#: doc/guix.texi:888 doc/guix.texi:1311 #, no-wrap msgid "build environment" msgstr "Erstellungsumgebung" #. type: Plain text -#: doc/guix.texi:898 +#: doc/guix.texi:896 msgid "In a standard multi-user setup, Guix and its daemon---the @command{guix-daemon} program---are installed by the system administrator; @file{/gnu/store} is owned by @code{root} and @command{guix-daemon} runs as @code{root}. Unprivileged users may use Guix tools to build packages or otherwise access the store, and the daemon will do it on their behalf, ensuring that the store is kept in a consistent state, and allowing built packages to be shared among users." msgstr "In einem normalen Mehrbenutzersystem werden Guix und sein Daemon — das Programm @command{guix-daemon} — vom Systemadministrator installiert; @file{/gnu/store} gehört @code{root} und @command{guix-daemon} läuft als @code{root}. Nicht mit erweiterten Rechten ausgestattete Nutzer können Guix-Werkzeuge benutzen, um Pakete zu erstellen oder anderweitig auf den Store zuzugreifen, und der Daemon wird dies für sie erledigen und dabei sicherstellen, dass der Store in einem konsistenten Zustand verbleibt und sich die Nutzer erstellte Pakete teilen." #. type: cindex -#: doc/guix.texi:899 +#: doc/guix.texi:897 #, no-wrap msgid "build users" msgstr "Erstellungsbenutzer" #. type: Plain text -#: doc/guix.texi:910 +#: doc/guix.texi:908 msgid "When @command{guix-daemon} runs as @code{root}, you may not want package build processes themselves to run as @code{root} too, for obvious security reasons. To avoid that, a special pool of @dfn{build users} should be created for use by build processes started by the daemon. These build users need not have a shell and a home directory: they will just be used when the daemon drops @code{root} privileges in build processes. Having several such users allows the daemon to launch distinct build processes under separate UIDs, which guarantees that they do not interfere with each other---an essential feature since builds are regarded as pure functions (@pxref{Introduction})." msgstr "Wenn @command{guix-daemon} als Administratornutzer @code{root} läuft, wollen Sie aber vielleicht dennoch nicht, dass Paketerstellungsprozesse auch als @code{root} ablaufen, aus offensichtlichen Sicherheitsgründen. Um dies zu vermeiden, sollte ein besonderer Pool aus @dfn{Erstellungsbenutzern} geschaffen werden, damit vom Daemon gestartete Erstellungsprozesse ihn benutzen. Diese Erstellungsbenutzer müssen weder eine Shell noch ein Persönliches Verzeichnis zugewiesen bekommen, sie werden lediglich benutzt, wenn der Daemon @code{root}-Rechte in Erstellungsprozessen ablegt. Mehrere solche Benutzer zu haben, ermöglicht es dem Daemon, verschiedene Erstellungsprozessen unter verschiedenen Benutzeridentifikatoren (UIDs) zu starten, was garantiert, dass sie einander nicht stören — eine essenzielle Funktionalität, da Erstellungen als reine Funktionen angesehen werden (siehe @ref{Introduction})." #. type: Plain text -#: doc/guix.texi:913 +#: doc/guix.texi:911 msgid "On a GNU/Linux system, a build user pool may be created like this (using Bash syntax and the @code{shadow} commands):" msgstr "Auf einem GNU/Linux-System kann ein Pool von Erstellungsbenutzern wie folgt erzeugt werden (mit Bash-Syntax und den Befehlen von @code{shadow}):" #. type: example -#: doc/guix.texi:925 +#: doc/guix.texi:923 #, no-wrap msgid "" "# groupadd --system guixbuild\n" @@ -3941,113 +3952,113 @@ msgstr "" " done\n" #. type: Plain text -#: doc/guix.texi:935 +#: doc/guix.texi:933 msgid "The number of build users determines how many build jobs may run in parallel, as specified by the @option{--max-jobs} option (@pxref{Invoking guix-daemon, @option{--max-jobs}}). To use @command{guix system vm} and related commands, you may need to add the build users to the @code{kvm} group so they can access @file{/dev/kvm}, using @code{-G guixbuild,kvm} instead of @code{-G guixbuild} (@pxref{Invoking guix system})." msgstr "Die Anzahl der Erstellungsbenutzer entscheidet, wieviele Erstellungsaufträge parallel ausgeführt werden können, wie es mit der Befehlszeilenoption @option{--max-jobs} vorgegeben werden kann (siehe @ref{Invoking guix-daemon, @option{--max-jobs}}). Um @command{guix system vm} und ähnliche Befehle nutzen zu können, müssen Sie die Erstellungsbenutzer unter Umständen zur @code{kvm}-Benutzergruppe hinzufügen, damit sie Zugriff auf @file{/dev/kvm} haben, mit @code{-G guixbuild,kvm} statt @code{-G guixbuild} (siehe @ref{Invoking guix system})." #. type: Plain text -#: doc/guix.texi:944 +#: doc/guix.texi:942 msgid "The @code{guix-daemon} program may then be run as @code{root} with the following command@footnote{If your machine uses the systemd init system, dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service} file in @file{/etc/systemd/system} will ensure that @command{guix-daemon} is automatically started. Similarly, if your machine uses the Upstart init system, drop the @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} file in @file{/etc/init}.}:" msgstr "Das Programm @code{guix-daemon} kann mit dem folgenden Befehl als @code{root} gestartet werden@footnote{Wenn Ihre Maschine systemd als „init“-System verwendet, genügt es, die Datei @file{@var{prefix}/lib/systemd/system/guix-daemon.service} in @file{/etc/systemd/system} zu platzieren, damit @command{guix-daemon} automatisch gestartet wird. Ebenso können Sie, wenn Ihre Maschine Upstart als „init“-System benutzt, die Datei @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} in @file{/etc/init} platzieren.}:" #. type: example -#: doc/guix.texi:947 doc/guix.texi:1306 +#: doc/guix.texi:945 doc/guix.texi:1304 #, no-wrap msgid "# guix-daemon --build-users-group=guixbuild\n" msgstr "# guix-daemon --build-users-group=guixbuild\n" #. type: cindex -#: doc/guix.texi:949 doc/guix.texi:1311 +#: doc/guix.texi:947 doc/guix.texi:1309 #, no-wrap msgid "chroot" msgstr "chroot" #. type: Plain text -#: doc/guix.texi:954 +#: doc/guix.texi:952 msgid "This way, the daemon starts build processes in a chroot, under one of the @code{guixbuilder} users. On GNU/Linux, by default, the chroot environment contains nothing but:" msgstr "Auf diese Weise startet der Daemon Erstellungsprozesse in einem chroot als einer der @code{guixbuilder}-Benutzer. Auf GNU/Linux enthält die chroot-Umgebung standardmäßig nichts außer:" #. type: itemize -#: doc/guix.texi:962 +#: doc/guix.texi:960 msgid "a minimal @code{/dev} directory, created mostly independently from the host @code{/dev}@footnote{``Mostly'', because while the set of files that appear in the chroot's @code{/dev} is fixed, most of these files can only be created if the host has them.};" msgstr "einem minimalen @code{/dev}-Verzeichnis, was größtenteils vom @code{/dev} des Wirtssystems unabhängig erstellt wurde@footnote{„Größtenteils“, denn obwohl die Menge an Dateien, die im @code{/dev} des chroots vorkommen, fest ist, können die meisten dieser Dateien nur dann erstellt werden, wenn das Wirtssystem sie auch hat.}," #. type: itemize -#: doc/guix.texi:966 +#: doc/guix.texi:964 msgid "the @code{/proc} directory; it only shows the processes of the container since a separate PID name space is used;" msgstr "dem @code{/proc}-Verzeichnis, es zeigt nur die Prozesse des Containers, weil ein separater Namensraum für Prozess-IDs (PIDs) benutzt wird," #. type: itemize -#: doc/guix.texi:970 +#: doc/guix.texi:968 msgid "@file{/etc/passwd} with an entry for the current user and an entry for user @file{nobody};" msgstr "@file{/etc/passwd} mit einem Eintrag für den aktuellen Benutzer und einem Eintrag für den Benutzer @file{nobody}," #. type: itemize -#: doc/guix.texi:973 +#: doc/guix.texi:971 msgid "@file{/etc/group} with an entry for the user's group;" msgstr "@file{/etc/group} mit einem Eintrag für die Gruppe des Benutzers," #. type: itemize -#: doc/guix.texi:977 +#: doc/guix.texi:975 msgid "@file{/etc/hosts} with an entry that maps @code{localhost} to @code{127.0.0.1};" msgstr "@file{/etc/hosts} mit einem Eintrag, der @code{localhost} auf @code{127.0.0.1} abbildet," #. type: itemize -#: doc/guix.texi:980 +#: doc/guix.texi:978 msgid "a writable @file{/tmp} directory." msgstr "einem @file{/tmp}-Verzeichnis mit Schreibrechten." #. type: Plain text -#: doc/guix.texi:989 +#: doc/guix.texi:987 msgid "You can influence the directory where the daemon stores build trees @i{via} the @code{TMPDIR} environment variable. However, the build tree within the chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where @var{name} is the derivation name---e.g., @code{coreutils-8.24}. This way, the value of @code{TMPDIR} does not leak inside build environments, which avoids discrepancies in cases where build processes capture the name of their build tree." msgstr "Sie können beeinflussen, in welchem Verzeichnis der Daemon Verzeichnisbäume zur Erstellung unterbringt, indem sie den Wert der Umgebungsvariablen @code{TMPDIR} ändern. Allerdings heißt innerhalb des chroots der Erstellungsbaum immer @file{/tmp/guix-build-@var{Name}.drv-0}, wobei @var{Name} der Ableitungsname ist — z.B.@: @code{coreutils-8.24}. Dadurch hat der Wert von @code{TMPDIR} keinen Einfluss auf die Erstellungsumgebung, wodurch Unterschiede vermieden werden, falls Erstellungsprozesse den Namen ihres Erstellungsbaumes einfangen." #. type: vindex -#: doc/guix.texi:990 doc/guix.texi:3263 +#: doc/guix.texi:988 doc/guix.texi:3261 #, no-wrap msgid "http_proxy" msgstr "http_proxy" #. type: Plain text -#: doc/guix.texi:994 +#: doc/guix.texi:992 msgid "The daemon also honors the @code{http_proxy} environment variable for HTTP downloads it performs, be it for fixed-output derivations (@pxref{Derivations}) or for substitutes (@pxref{Substitutes})." msgstr "Der Daemon befolgt außerdem den Wert der Umgebungsvariablen @code{http_proxy} für von ihm durchgeführte HTTP-Downloads, sei es für Ableitungen mit fester Ausgabe (siehe @ref{Derivations}) oder für Substitute (siehe @ref{Substitutes})." #. type: Plain text -#: doc/guix.texi:1002 +#: doc/guix.texi:1000 msgid "If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @code{--disable-chroot}. However, build processes will not be isolated from one another, and not from the rest of the system. Thus, build processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it much harder to view them as @emph{pure} functions." msgstr "Wenn Sie Guix als ein Benutzer ohne erweiterte Rechte installieren, ist es dennoch möglich, @command{guix-daemon} auszuführen, sofern Sie @code{--disable-chroot} übergeben. Allerdings können Erstellungsprozesse dann nicht voneinander und vom Rest des Systems isoliert werden. Daher können sich Erstellungsprozesse gegenseitig stören und auf Programme, Bibliotheken und andere Dateien zugreifen, die dem restlichen System zur Verfügung stehen — was es deutlich schwerer macht, sie als @emph{reine} Funktionen aufzufassen." #. type: subsection -#: doc/guix.texi:1005 +#: doc/guix.texi:1003 #, no-wrap msgid "Using the Offload Facility" msgstr "Nutzung der Auslagerungsfunktionalität" #. type: cindex -#: doc/guix.texi:1007 +#: doc/guix.texi:1005 #, no-wrap msgid "offloading" msgstr "auslagern" #. type: cindex -#: doc/guix.texi:1008 doc/guix.texi:1369 +#: doc/guix.texi:1006 doc/guix.texi:1367 #, no-wrap msgid "build hook" msgstr "Build-Hook" #. type: Plain text -#: doc/guix.texi:1022 +#: doc/guix.texi:1020 msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}. When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}. Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine." msgstr "Wenn erwünscht, kann der Erstellungs-Daemon Ableitungserstellungen auf andere Maschinen @dfn{auslagern}, auf denen Guix läuft, mit Hilfe des @code{offload}-@dfn{Build-Hooks}@footnote{Diese Funktionalität ist nur verfügbar, wenn @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} vorhanden ist.}. Wenn diese Funktionalität aktiviert ist, wird eine nutzerspezifizierte Liste von Erstellungsmaschinen aus @file{/etc/guix/machines.scm} gelesen. Wann immer eine Erstellung angefragt wird, zum Beispiel durch @code{guix build}, versucht der Daemon, sie an eine der Erstellungsmaschinen auszulagern, die die Einschränkungen der Ableitung erfüllen, insbesondere ihren Systemtyp — z.B.@: @file{x86_64-linux}. Fehlende Voraussetzungen für die Erstellung werden über SSH auf die Zielmaschine kopiert, welche dann mit der Erstellung weitermacht. Hat sie Erfolg damit, so werden die Ausgabe oder Ausgaben der Erstellung zurück auf die ursprüngliche Maschine kopiert." #. type: Plain text -#: doc/guix.texi:1024 +#: doc/guix.texi:1022 msgid "The @file{/etc/guix/machines.scm} file typically looks like this:" msgstr "Die Datei @file{/etc/guix/machines.scm} sieht normalerweise so aus:" #. type: example -#: doc/guix.texi:1032 +#: doc/guix.texi:1030 #, no-wrap msgid "" "(list (build-machine\n" @@ -4067,7 +4078,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:1041 +#: doc/guix.texi:1039 #, no-wrap msgid "" " (build-machine\n" @@ -4089,93 +4100,93 @@ msgstr "" " \"/.ssh/identität-für-guix\"))))\n" #. type: Plain text -#: doc/guix.texi:1047 +#: doc/guix.texi:1045 msgid "In the example above we specify a list of two build machines, one for the @code{x86_64} architecture and one for the @code{mips64el} architecture." msgstr "Im obigen Beispiel geben wir eine Liste mit zwei Erstellungsmaschinen vor, eine für die @code{x86_64}-Architektur und eine für die @code{mips64el}-Architektur." #. type: Plain text -#: doc/guix.texi:1056 +#: doc/guix.texi:1054 msgid "In fact, this file is---not surprisingly!---a Scheme file that is evaluated when the @code{offload} hook is started. Its return value must be a list of @code{build-machine} objects. While this example shows a fixed list of build machines, one could imagine, say, using DNS-SD to return a list of potential build machines discovered in the local network (@pxref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}). The @code{build-machine} data type is detailed below." msgstr "Tatsächlich ist diese Datei — wenig überraschend! — eine Scheme-Datei, die ausgewertet wird, wenn der @code{offload}-Hook gestartet wird. Der Wert, den sie zurückliefert, muss eine Liste von @code{build-machine}-Objekten sein. Obwohl dieses Beispiel eine feste Liste von Erstellungsmaschinen zeigt, könnte man auch auf die Idee kommen, etwa mit DNS-SD eine Liste möglicher im lokalen Netzwerk entdeckter Erstellungsmaschinen zu liefern (siehe @ref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}). Der Datentyp @code{build-machine} wird im Folgenden weiter ausgeführt." #. type: deftp -#: doc/guix.texi:1057 +#: doc/guix.texi:1055 #, no-wrap msgid "{Data Type} build-machine" msgstr "{Datentyp} build-machine" #. type: deftp -#: doc/guix.texi:1060 +#: doc/guix.texi:1058 msgid "This data type represents build machines to which the daemon may offload builds. The important fields are:" msgstr "Dieser Datentyp repräsentiert Erstellungsmaschinen, an die der Daemon Erstellungen auslagern darf. Die wichtigen Felder sind:" #. type: item -#: doc/guix.texi:1063 doc/guix.texi:5339 doc/guix.texi:11006 -#: doc/guix.texi:11088 doc/guix.texi:11315 doc/guix.texi:12899 -#: doc/guix.texi:17437 doc/guix.texi:18022 doc/guix.texi:18633 -#: doc/guix.texi:18941 doc/guix.texi:18982 doc/guix.texi:23526 -#: doc/guix.texi:23543 doc/guix.texi:23836 doc/guix.texi:25144 -#: doc/guix.texi:25354 +#: doc/guix.texi:1061 doc/guix.texi:5337 doc/guix.texi:11004 +#: doc/guix.texi:11086 doc/guix.texi:11313 doc/guix.texi:12897 +#: doc/guix.texi:17434 doc/guix.texi:18019 doc/guix.texi:18630 +#: doc/guix.texi:18938 doc/guix.texi:18979 doc/guix.texi:23523 +#: doc/guix.texi:23540 doc/guix.texi:23833 doc/guix.texi:25130 +#: doc/guix.texi:25336 #, no-wrap msgid "name" msgstr "name" #. type: table -#: doc/guix.texi:1065 +#: doc/guix.texi:1063 msgid "The host name of the remote machine." msgstr "Der Hostname (d.h.@: der Rechnername) der entfernten Maschine." #. type: item -#: doc/guix.texi:1066 +#: doc/guix.texi:1064 #, no-wrap msgid "system" msgstr "system" #. type: table -#: doc/guix.texi:1068 +#: doc/guix.texi:1066 msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}." msgstr "Der Systemtyp der entfernten Maschine — z.B.@: @code{\"x86_64-linux\"}." #. type: code{#1} -#: doc/guix.texi:1069 doc/guix.texi:12909 +#: doc/guix.texi:1067 doc/guix.texi:12907 #, no-wrap msgid "user" msgstr "user" #. type: table -#: doc/guix.texi:1073 +#: doc/guix.texi:1071 msgid "The user account to use when connecting to the remote machine over SSH. Note that the SSH key pair must @emph{not} be passphrase-protected, to allow non-interactive logins." msgstr "Das Benutzerkonto, mit dem eine Verbindung zur entfernten Maschine über SSH aufgebaut werden soll. Beachten Sie, dass das SSH-Schlüsselpaar @emph{nicht} durch eine Passphrase geschützt sein darf, damit nicht-interaktive Anmeldungen möglich sind." #. type: item -#: doc/guix.texi:1074 +#: doc/guix.texi:1072 #, no-wrap msgid "host-key" msgstr "host-key" #. type: table -#: doc/guix.texi:1078 +#: doc/guix.texi:1076 msgid "This must be the machine's SSH @dfn{public host key} in OpenSSH format. This is used to authenticate the machine when we connect to it. It is a long string that looks like this:" msgstr "Dies muss der @dfn{öffentliche SSH-Host-Schlüssel} der Maschine im OpenSSH-Format sein. Er wird benutzt, um die Identität der Maschine zu prüfen, wenn wir uns mit ihr verbinden. Er ist eine lange Zeichenkette, die ungefähr so aussieht:" #. type: example -#: doc/guix.texi:1081 +#: doc/guix.texi:1079 #, no-wrap msgid "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n" msgstr "ssh-ed25519 AAAAC3NzaC…mde+UhL hint@@example.org\n" #. type: table -#: doc/guix.texi:1086 +#: doc/guix.texi:1084 msgid "If the machine is running the OpenSSH daemon, @command{sshd}, the host key can be found in a file such as @file{/etc/ssh/ssh_host_ed25519_key.pub}." msgstr "Wenn auf der Maschine der OpenSSH-Daemon, @command{sshd}, läuft, ist der Host-Schlüssel in einer Datei wie @file{/etc/ssh/ssh_host_ed25519_key.pub} zu finden." #. type: table -#: doc/guix.texi:1091 +#: doc/guix.texi:1089 msgid "If the machine is running the SSH daemon of GNU@tie{}lsh, @command{lshd}, the host key is in @file{/etc/lsh/host-key.pub} or a similar file. It can be converted to the OpenSSH format using @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}):" msgstr "Wenn auf der Maschine der SSH-Daemon von GNU@tie{}lsh, nämlich @command{lshd}, läuft, befindet sich der Host-Schlüssel in @file{/etc/lsh/host-key.pub} oder einer ähnlichen Datei. Er kann ins OpenSSH-Format umgewandelt werden durch @command{lsh-export-key} (siehe @ref{Converting keys,,, lsh, LSH Manual}):" #. type: example -#: doc/guix.texi:1095 +#: doc/guix.texi:1093 #, no-wrap msgid "" "$ lsh-export-key --openssh < /etc/lsh/host-key.pub \n" @@ -4185,840 +4196,840 @@ msgstr "" "ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV…\n" #. type: deftp -#: doc/guix.texi:1100 +#: doc/guix.texi:1098 msgid "A number of optional fields may be specified:" msgstr "Eine Reihe optionaler Felder kann festgelegt werden:" #. type: item -#: doc/guix.texi:1103 +#: doc/guix.texi:1101 #, no-wrap msgid "@code{port} (default: @code{22})" msgstr "@code{port} (Vorgabe: @code{22})" #. type: table -#: doc/guix.texi:1105 +#: doc/guix.texi:1103 msgid "Port number of SSH server on the machine." msgstr "Portnummer des SSH-Servers auf der Maschine." #. type: item -#: doc/guix.texi:1106 +#: doc/guix.texi:1104 #, no-wrap msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})" msgstr "@code{private-key} (Vorgabe: @file{~root/.ssh/id_rsa})" #. type: table -#: doc/guix.texi:1109 +#: doc/guix.texi:1107 msgid "The SSH private key file to use when connecting to the machine, in OpenSSH format. This key must not be protected with a passphrase." msgstr "Die Datei mit dem privaten SSH-Schlüssel, der beim Verbinden zur Maschine genutzt werden soll, im OpenSSH-Format. Dieser Schlüssel darf nicht mit einer Passphrase geschützt sein." #. type: table -#: doc/guix.texi:1112 +#: doc/guix.texi:1110 msgid "Note that the default value is the private key @emph{of the root account}. Make sure it exists if you use the default." msgstr "Beachten Sie, dass als Vorgabewert der private Schlüssel @emph{des root-Benutzers} genommen wird. Vergewissern Sie sich, dass er existiert, wenn Sie die Standardeinstellung verwenden." #. type: item -#: doc/guix.texi:1113 +#: doc/guix.texi:1111 #, no-wrap msgid "@code{compression} (default: @code{\"zlib@@openssh.com,zlib\"})" msgstr "@code{compression} (Vorgabe: @code{\"zlib@@openssh.com,zlib\"})" #. type: item -#: doc/guix.texi:1114 doc/guix.texi:12202 +#: doc/guix.texi:1112 doc/guix.texi:12200 #, no-wrap msgid "@code{compression-level} (default: @code{3})" msgstr "@code{compression-level} (Vorgabe: @code{3})" #. type: table -#: doc/guix.texi:1116 +#: doc/guix.texi:1114 msgid "The SSH-level compression methods and compression level requested." msgstr "Die Kompressionsmethoden auf SSH-Ebene und das angefragte Kompressionsniveau." #. type: table -#: doc/guix.texi:1119 +#: doc/guix.texi:1117 msgid "Note that offloading relies on SSH compression to reduce bandwidth usage when transferring files to and from build machines." msgstr "Beachten Sie, dass Auslagerungen SSH-Kompression benötigen, um beim Übertragen von Dateien an Erstellungsmaschinen und zurück weniger Bandbreite zu benutzen." #. type: item -#: doc/guix.texi:1120 +#: doc/guix.texi:1118 #, no-wrap msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})" msgstr "@code{daemon-socket} (Vorgabe: @code{\"/var/guix/daemon-socket/socket\"})" #. type: table -#: doc/guix.texi:1123 +#: doc/guix.texi:1121 msgid "File name of the Unix-domain socket @command{guix-daemon} is listening to on that machine." msgstr "Dateiname des Unix-Sockets, auf dem @command{guix-daemon} auf der Maschine lauscht." #. type: item -#: doc/guix.texi:1124 +#: doc/guix.texi:1122 #, no-wrap msgid "@code{parallel-builds} (default: @code{1})" msgstr "@code{parallel-builds} (Vorgabe: @code{1})" #. type: table -#: doc/guix.texi:1126 +#: doc/guix.texi:1124 msgid "The number of builds that may run in parallel on the machine." msgstr "Die Anzahl der Erstellungen, die auf der Maschine parallel ausgeführt werden können." #. type: item -#: doc/guix.texi:1127 +#: doc/guix.texi:1125 #, no-wrap msgid "@code{speed} (default: @code{1.0})" msgstr "@code{speed} (Vorgabe: @code{1.0})" #. type: table -#: doc/guix.texi:1130 +#: doc/guix.texi:1128 msgid "A ``relative speed factor''. The offload scheduler will tend to prefer machines with a higher speed factor." msgstr "Ein „relativer Geschwindigkeitsfaktor“. Der Auslagerungsplaner gibt tendenziell Maschinen mit höherem Geschwindigkeitsfaktor den Vorrang." #. type: item -#: doc/guix.texi:1131 +#: doc/guix.texi:1129 #, no-wrap msgid "@code{features} (default: @code{'()})" msgstr "@code{features} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:1136 +#: doc/guix.texi:1134 msgid "A list of strings denoting specific features supported by the machine. An example is @code{\"kvm\"} for machines that have the KVM Linux modules and corresponding hardware support. Derivations can request features by name, and they will be scheduled on matching build machines." msgstr "Eine Liste von Zeichenketten, die besondere von der Maschine unterstützte Funktionalitäten bezeichnen. Ein Beispiel ist @code{\"kvm\"} für Maschinen, die über die KVM-Linux-Module zusammen mit entsprechender Hardware-Unterstützung verfügen. Ableitungen können Funktionalitäten dem Namen nach anfragen und werden dann auf passenden Erstellungsmaschinen eingeplant." #. type: Plain text -#: doc/guix.texi:1142 +#: doc/guix.texi:1140 msgid "The @command{guix} command must be in the search path on the build machines. You can check whether this is the case by running:" msgstr "Der Befehl @code{guix} muss sich im Suchpfad der Erstellungsmaschinen befinden. Um dies nachzuprüfen, können Sie Folgendes ausführen:" #. type: example -#: doc/guix.texi:1145 +#: doc/guix.texi:1143 #, no-wrap msgid "ssh build-machine guix repl --version\n" msgstr "ssh build-machine guix repl --version\n" #. type: Plain text -#: doc/guix.texi:1152 +#: doc/guix.texi:1150 msgid "There is one last thing to do once @file{machines.scm} is in place. As explained above, when offloading, files are transferred back and forth between the machine stores. For this to work, you first need to generate a key pair on each machine to allow the daemon to export signed archives of files from the store (@pxref{Invoking guix archive}):" msgstr "Es gibt noch eine weitere Sache zu tun, sobald @file{machines.scm} eingerichtet ist. Wie zuvor erklärt, werden beim Auslagern Dateien zwischen den Stores der Maschinen hin- und hergeschickt. Damit das funktioniert, müssen Sie als Erstes ein Schlüsselpaar auf jeder Maschine erzeugen, damit der Daemon signierte Archive mit den Dateien aus dem Store versenden kann (siehe @ref{Invoking guix archive}):" #. type: example -#: doc/guix.texi:1155 +#: doc/guix.texi:1153 #, no-wrap msgid "# guix archive --generate-key\n" msgstr "# guix archive --generate-key\n" #. type: Plain text -#: doc/guix.texi:1160 +#: doc/guix.texi:1158 msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:" msgstr "Jede Erstellungsmaschine muss den Schlüssel der Hauptmaschine autorisieren, damit diese Store-Objekte von der Hauptmaschine empfangen kann:" #. type: example -#: doc/guix.texi:1163 +#: doc/guix.texi:1161 #, no-wrap msgid "# guix archive --authorize < master-public-key.txt\n" msgstr "# guix archive --authorize < öffentlicher-schlüssel-hauptmaschine.txt\n" #. type: Plain text -#: doc/guix.texi:1167 +#: doc/guix.texi:1165 msgid "Likewise, the master machine must authorize the key of each build machine." msgstr "Andersherum muss auch die Hauptmaschine den jeweiligen Schlüssel jeder Erstellungsmaschine autorisieren." #. type: Plain text -#: doc/guix.texi:1173 +#: doc/guix.texi:1171 msgid "All the fuss with keys is here to express pairwise mutual trust relations between the master and the build machines. Concretely, when the master receives files from a build machine (and @i{vice versa}), its build daemon can make sure they are genuine, have not been tampered with, and that they are signed by an authorized key." msgstr "Der ganze Umstand mit den Schlüsseln soll ausdrücken, dass sich Haupt- und Erstellungsmaschinen paarweise gegenseitig vertrauen. Konkret kann der Erstellungs-Daemon auf der Hauptmaschine die Echtheit von den Erstellungsmaschinen empfangener Dateien gewährleisten (und umgekehrt), und auch dass sie nicht sabotiert wurden und mit einem autorisierten Schlüssel signiert wurden." #. type: cindex -#: doc/guix.texi:1174 +#: doc/guix.texi:1172 #, no-wrap msgid "offload test" msgstr "Auslagerung testen" #. type: Plain text -#: doc/guix.texi:1177 +#: doc/guix.texi:1175 msgid "To test whether your setup is operational, run this command on the master node:" msgstr "Um zu testen, ob Ihr System funktioniert, führen Sie diesen Befehl auf der Hauptmaschine aus:" #. type: example -#: doc/guix.texi:1180 +#: doc/guix.texi:1178 #, no-wrap msgid "# guix offload test\n" msgstr "# guix offload test\n" #. type: Plain text -#: doc/guix.texi:1186 +#: doc/guix.texi:1184 msgid "This will attempt to connect to each of the build machines specified in @file{/etc/guix/machines.scm}, make sure Guile and the Guix modules are available on each machine, attempt to export to the machine and import from it, and report any error in the process." msgstr "Dadurch wird versucht, zu jeder Erstellungsmaschine eine Verbindung herzustellen, die in @file{/etc/guix/machines.scm} angegeben wurde, sichergestellt, dass auf jeder Guile und die Guix-Module nutzbar sind, und jeweils versucht, etwas auf die Erstellungsmaschine zu exportieren und von dort zu imporieren. Dabei auftretende Fehler werden gemeldet." #. type: Plain text -#: doc/guix.texi:1189 +#: doc/guix.texi:1187 msgid "If you want to test a different machine file, just specify it on the command line:" msgstr "Wenn Sie stattdessen eine andere Maschinendatei verwenden möchten, geben Sie diese einfach auf der Befehlszeile an:" #. type: example -#: doc/guix.texi:1192 +#: doc/guix.texi:1190 #, no-wrap msgid "# guix offload test machines-qualif.scm\n" msgstr "# guix offload test maschinen-qualif.scm\n" #. type: Plain text -#: doc/guix.texi:1196 +#: doc/guix.texi:1194 msgid "Last, you can test the subset of the machines whose name matches a regular expression like this:" msgstr "Letztendlich können Sie hiermit nur die Teilmenge der Maschinen testen, deren Name zu einem regulären Ausdruck passt:" #. type: example -#: doc/guix.texi:1199 +#: doc/guix.texi:1197 #, no-wrap msgid "# guix offload test machines.scm '\\.gnu\\.org$'\n" msgstr "# guix offload test maschinen.scm '\\.gnu\\.org$'\n" #. type: cindex -#: doc/guix.texi:1201 +#: doc/guix.texi:1199 #, no-wrap msgid "offload status" msgstr "Auslagerungs-Lagebericht" #. type: Plain text -#: doc/guix.texi:1204 +#: doc/guix.texi:1202 msgid "To display the current load of all build hosts, run this command on the main node:" msgstr "Um die momentane Auslastung aller Erstellungs-Hosts anzuzeigen, führen Sie diesen Befehl auf dem Hauptknoten aus:" #. type: example -#: doc/guix.texi:1207 +#: doc/guix.texi:1205 #, no-wrap msgid "# guix offload status\n" msgstr "# guix offload status\n" #. type: cindex -#: doc/guix.texi:1213 +#: doc/guix.texi:1211 #, no-wrap msgid "SELinux, daemon policy" msgstr "SELinux, Policy für den Daemon" #. type: cindex -#: doc/guix.texi:1214 +#: doc/guix.texi:1212 #, no-wrap msgid "mandatory access control, SELinux" msgstr "Mandatory Access Control, SELinux" #. type: cindex -#: doc/guix.texi:1215 +#: doc/guix.texi:1213 #, no-wrap msgid "security, guix-daemon" msgstr "Sicherheit, des guix-daemon" #. type: Plain text -#: doc/guix.texi:1221 +#: doc/guix.texi:1219 msgid "Guix includes an SELinux policy file at @file{etc/guix-daemon.cil} that can be installed on a system where SELinux is enabled, in order to label Guix files and to specify the expected behavior of the daemon. Since Guix System does not provide an SELinux base policy, the daemon policy cannot be used on Guix System." msgstr "Guix enthält eine SELinux-Richtliniendatei („Policy“) unter @file{etc/guix-daemon.cil}, die auf einem System installiert werden kann, auf dem SELinux aktiviert ist, damit Guix-Dateien gekennzeichnet sind und um das erwartete Verhalten des Daemons anzugeben. Da Guix System keine Grundrichtlinie („Base Policy“) für SELinux bietet, kann diese Richtlinie für den Daemon auf Guix System nicht benutzt werden." #. type: subsubsection -#: doc/guix.texi:1222 +#: doc/guix.texi:1220 #, no-wrap msgid "Installing the SELinux policy" msgstr "Installieren der SELinux-Policy" #. type: cindex -#: doc/guix.texi:1223 +#: doc/guix.texi:1221 #, no-wrap msgid "SELinux, policy installation" msgstr "SELinux, Policy installieren" #. type: Plain text -#: doc/guix.texi:1225 +#: doc/guix.texi:1223 msgid "To install the policy run this command as root:" msgstr "Um die Richtlinie (Policy) zu installieren, führen Sie folgenden Befehl mit Administratorrechten aus:" #. type: example -#: doc/guix.texi:1228 +#: doc/guix.texi:1226 #, no-wrap msgid "semodule -i etc/guix-daemon.cil\n" msgstr "semodule -i etc/guix-daemon.cil\n" #. type: Plain text -#: doc/guix.texi:1232 +#: doc/guix.texi:1230 msgid "Then relabel the file system with @code{restorecon} or by a different mechanism provided by your system." msgstr "Kennzeichnen Sie dann das Dateisystem neu mit @code{restorecon} oder einem anderen, von Ihrem System angebotenen Mechanismus." #. type: Plain text -#: doc/guix.texi:1237 +#: doc/guix.texi:1235 msgid "Once the policy is installed, the file system has been relabeled, and the daemon has been restarted, it should be running in the @code{guix_daemon_t} context. You can confirm this with the following command:" msgstr "Sobald die Richtlinie installiert ist, das Dateisystem neu gekennzeichnet wurde und der Daemon neugestartet wurde, sollte er im Kontext @code{guix_daemon_t} laufen. Sie können dies mit dem folgenden Befehl nachprüfen:" #. type: example -#: doc/guix.texi:1240 +#: doc/guix.texi:1238 #, no-wrap msgid "ps -Zax | grep guix-daemon\n" msgstr "ps -Zax | grep guix-daemon\n" #. type: Plain text -#: doc/guix.texi:1245 +#: doc/guix.texi:1243 msgid "Monitor the SELinux log files as you run a command like @code{guix build hello} to convince yourself that SELinux permits all necessary operations." msgstr "Beobachten Sie die Protokolldateien von SELinux, wenn Sie einen Befehl wie @code{guix build hello} ausführen, um sich zu überzeugen, dass SELinux alle notwendigen Operationen gestattet." #. type: cindex -#: doc/guix.texi:1247 +#: doc/guix.texi:1245 #, no-wrap msgid "SELinux, limitations" msgstr "SELinux, Einschränkungen" #. type: Plain text -#: doc/guix.texi:1252 +#: doc/guix.texi:1250 msgid "This policy is not perfect. Here is a list of limitations or quirks that should be considered when deploying the provided SELinux policy for the Guix daemon." msgstr "Diese Richtlinie ist nicht perfekt. Im Folgenden finden Sie eine Liste von Einschränkungen oder merkwürdigen Verhaltensweisen, die bedacht werden sollten, wenn man die mitgelieferte SELinux-Richtlinie für den Guix-Daemon einspielt." #. type: enumerate -#: doc/guix.texi:1259 +#: doc/guix.texi:1257 msgid "@code{guix_daemon_socket_t} isn’t actually used. None of the socket operations involve contexts that have anything to do with @code{guix_daemon_socket_t}. It doesn’t hurt to have this unused label, but it would be preferrable to define socket rules for only this label." msgstr "@code{guix_daemon_socket_t} wird nicht wirklich benutzt. Keine der Socket-Operationen benutzt Kontexte, die irgendetwas mit @code{guix_daemon_socket_t} zu tun haben. Es schadet nicht, diese ungenutzte Kennzeichnung zu haben, aber es wäre besser, für die Kennzeichnung auch Socket-Regeln festzulegen." #. type: enumerate -#: doc/guix.texi:1270 +#: doc/guix.texi:1268 msgid "@code{guix gc} cannot access arbitrary links to profiles. By design, the file label of the destination of a symlink is independent of the file label of the link itself. Although all profiles under $localstatedir are labelled, the links to these profiles inherit the label of the directory they are in. For links in the user’s home directory this will be @code{user_home_t}. But for links from the root user’s home directory, or @file{/tmp}, or the HTTP server’s working directory, etc, this won’t work. @code{guix gc} would be prevented from reading and following these links." msgstr "@code{guix gc} kann nicht auf beliebige Verknüpfungen zu Profilen zugreifen. Die Kennzeichnung des Ziels einer symbolischen Verknüpfung ist notwendigerweise unabhängig von der Dateikennzeichnung der Verknüpfung. Obwohl alle Profile unter $localstatedir gekennzeichnet sind, erben die Verknüpfungen auf diese Profile die Kennzeichnung desjenigen Verzeichnisses, in dem sie sich befinden. Für Verknüpfungen im Persönlichen Verzeichnis des Benutzers ist das @code{user_home_t}, aber Verknüpfungen aus dem Persönlichen Verzeichnis des Administratornutzers, oder @file{/tmp}, oder das Arbeitsverzeichnis des HTTP-Servers, etc., funktioniert das nicht. @code{guix gc} würde es nicht gestattet, diese Verknüpfungen auszulesen oder zu verfolgen." #. type: enumerate -#: doc/guix.texi:1275 +#: doc/guix.texi:1273 msgid "The daemon’s feature to listen for TCP connections might no longer work. This might require extra rules, because SELinux treats network sockets differently from files." msgstr "Die vom Daemon gebotene Funktionalität, auf TCP-Verbindungen zu lauschen, könnte nicht mehr funktionieren. Dies könnte zusätzliche Regeln brauchen, weil SELinux Netzwerk-Sockets anders behandelt als Dateien." #. type: enumerate -#: doc/guix.texi:1286 +#: doc/guix.texi:1284 msgid "Currently all files with a name matching the regular expression @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the label @code{guix_daemon_exec_t}; this means that @emph{any} file with that name in any profile would be permitted to run in the @code{guix_daemon_t} domain. This is not ideal. An attacker could build a package that provides this executable and convince a user to install and run it, which lifts it into the @code{guix_daemon_t} domain. At that point SELinux could not prevent it from accessing files that are allowed for processes in that domain." msgstr "Derzeit wird allen Dateien mit einem Namen, der zum regulären Ausdruck @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} passt, die Kennzeichnung @code{guix_daemon_exec_t} zugewiesen, wodurch @emph{jede beliebige} Datei mit diesem Namen in irgendeinem Profil gestattet wäre, in der Domäne @code{guix_daemon_t} ausgeführt zu werden. Das ist nicht ideal. Ein Angreifer könnte ein Paket erstellen, dass solch eine ausführbare Datei enthält, und den Nutzer überzeugen, es zu installieren und auszuführen. Dadurch käme es in die Domäne @code{guix_daemon_t}. Ab diesem Punkt könnte SELinux nicht mehr verhindern, dass es auf Dateien zugreift, auf die Prozesse in dieser Domäne zugreifen dürfen." #. type: enumerate -#: doc/guix.texi:1294 +#: doc/guix.texi:1292 msgid "We could generate a much more restrictive policy at installation time, so that only the @emph{exact} file name of the currently installed @code{guix-daemon} executable would be labelled with @code{guix_daemon_exec_t}, instead of using a broad regular expression. The downside is that root would have to install or upgrade the policy at installation time whenever the Guix package that provides the effectively running @code{guix-daemon} executable is upgraded." msgstr "Wir könnten zum Zeitpunkt der Installation eine wesentlich restriktivere Richtlinie generieren, für die nur @emph{genau derselbe} Dateiname des gerade installierten @code{guix-daemon}-Programms als @code{guix_daemon_exec_t} gekennzeichnet würde, statt einen vieles umfassenden regulären Ausdruck zu benutzen. Aber dann müsste der Administratornutzer zum Zeitpunkt der Installation jedes Mal die Richtlinie installieren oder aktualisieren müssen, sobald das Guix-Paket aktualisiert wird, dass das tatsächlich in Benutzung befindliche @code{guix-daemon}-Programm enthält." #. type: section -#: doc/guix.texi:1297 +#: doc/guix.texi:1295 #, no-wrap msgid "Invoking @command{guix-daemon}" msgstr "Aufruf von @command{guix-daemon}" #. type: Plain text -#: doc/guix.texi:1303 +#: doc/guix.texi:1301 msgid "The @command{guix-daemon} program implements all the functionality to access the store. This includes launching build processes, running the garbage collector, querying the availability of a build result, etc. It is normally run as @code{root} like this:" msgstr "Das Programm @command{guix-daemon} implementiert alle Funktionalitäten, um auf den Store zuzugreifen. Dazu gehört das Starten von Erstellungsprozessen, das Ausführen des Müllsammlers, das Abfragen, ob ein Erstellungsergebnis verfügbar ist, etc. Normalerweise wird er so als Administratornutzer (@code{root}) gestartet:" #. type: Plain text -#: doc/guix.texi:1310 +#: doc/guix.texi:1308 msgid "For details on how to set it up, @pxref{Setting Up the Daemon}." msgstr "Details, wie Sie ihn einrichten, finden Sie im Abschnitt @ref{Setting Up the Daemon}." #. type: cindex -#: doc/guix.texi:1312 +#: doc/guix.texi:1310 #, no-wrap msgid "container, build environment" msgstr "Container, Erstellungsumgebung" #. type: cindex -#: doc/guix.texi:1314 doc/guix.texi:2563 doc/guix.texi:3244 doc/guix.texi:9775 +#: doc/guix.texi:1312 doc/guix.texi:2561 doc/guix.texi:3242 doc/guix.texi:9773 #, no-wrap msgid "reproducible builds" msgstr "Reproduzierbare Erstellungen" #. type: Plain text -#: doc/guix.texi:1326 +#: doc/guix.texi:1324 msgid "By default, @command{guix-daemon} launches build processes under different UIDs, taken from the build group specified with @code{--build-users-group}. In addition, each build process is run in a chroot environment that only contains the subset of the store that the build process depends on, as specified by its derivation (@pxref{Programming Interface, derivation}), plus a set of specific system directories. By default, the latter contains @file{/dev} and @file{/dev/pts}. Furthermore, on GNU/Linux, the build environment is a @dfn{container}: in addition to having its own file system tree, it has a separate mount name space, its own PID name space, network name space, etc. This helps achieve reproducible builds (@pxref{Features})." msgstr "Standardmäßig führt @command{guix-daemon} Erstellungsprozesse mit unterschiedlichen UIDs aus, die aus der Erstellungsgruppe stammen, deren Name mit @code{--build-users-group} übergeben wurde. Außerdem läuft jeder Erstellungsprozess in einer chroot-Umgebung, die nur die Teilmenge des Stores enthält, von der der Erstellungsprozess abhängt, entsprechend seiner Ableitung (siehe @ref{Programming Interface, derivation}), und ein paar bestimmte Systemverzeichnisse, darunter standardmäßig auch @file{/dev} und @file{/dev/pts}. Zudem ist die Erstellungsumgebung auf GNU/Linux ein @dfn{Container}: Nicht nur hat er seinen eigenen Dateisystembaum, er hat auch einen separaten Namensraum zum Einhängen von Dateisystemen, seinen eigenen Namensraum für PIDs, für Netzwerke, etc. Dies hilft dabei, reproduzierbare Erstellungen zu garantieren (siehe @ref{Features})." #. type: Plain text -#: doc/guix.texi:1332 +#: doc/guix.texi:1330 msgid "When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory specified by its @code{TMPDIR} environment variable. This directory is shared with the container for the duration of the build, though within the container, the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}." msgstr "Wenn der Daemon im Auftrag des Nutzers eine Erstellung durchführt, erzeugt er ein Erstellungsverzeichnis, entweder in @file{/tmp} oder im Verzeichnis, das durch die Umgebungsvariable @code{TMPDIR} angegeben wurde. Dieses Verzeichnis wird mit dem Container geteilt, solange die Erstellung noch läuft, allerdings trägt es im Container stattdessen immer den Namen „/tmp/guix-build-NAME.drv-0“." #. type: Plain text -#: doc/guix.texi:1336 +#: doc/guix.texi:1334 msgid "The build directory is automatically deleted upon completion, unless the build failed and the client specified @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}})." msgstr "Nach Abschluss der Erstellung wird das Erstellungsverzeichnis automatisch entfernt, außer wenn die Erstellung fehlgeschlagen ist und der Client @option{--keep-failed} angegeben hat (siehe @ref{Invoking guix build, @option{--keep-failed}})." #. type: Plain text -#: doc/guix.texi:1342 +#: doc/guix.texi:1340 msgid "The daemon listens for connections and spawns one sub-process for each session started by a client (one of the @command{guix} sub-commands.) The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients. @xref{Invoking guix processes}, for more information." msgstr "Der Daemon lauscht auf Verbindungen und erstellt jeweils einen Unterprozess für jede von einem Client begonnene Sitzung (d.h.@: von einem der @command{guix}-Unterbefehle). Der Befehl @command{guix processes} zeigt Ihnen eine Übersicht solcher Systemaktivitäten; damit werden Ihnen alle aktiven Sitzungen und Clients gezeigt. Weitere Informationen finden Sie unter @ref{Invoking guix processes}." #. type: Plain text -#: doc/guix.texi:1344 +#: doc/guix.texi:1342 msgid "The following command-line options are supported:" msgstr "Die folgenden Befehlszeilenoptionen werden unterstützt:" #. type: item -#: doc/guix.texi:1346 +#: doc/guix.texi:1344 #, no-wrap msgid "--build-users-group=@var{group}" msgstr "--build-users-group=@var{Gruppe}" #. type: table -#: doc/guix.texi:1349 +#: doc/guix.texi:1347 msgid "Take users from @var{group} to run build processes (@pxref{Setting Up the Daemon, build users})." msgstr "Verwende die Benutzerkonten aus der @var{Gruppe}, um Erstellungsprozesse auszuführen (siehe @ref{Setting Up the Daemon, build users})." #. type: item -#: doc/guix.texi:1350 doc/guix.texi:7725 +#: doc/guix.texi:1348 doc/guix.texi:7723 #, no-wrap msgid "--no-substitutes" msgstr "--no-substitutes" #. type: cindex -#: doc/guix.texi:1351 doc/guix.texi:2575 doc/guix.texi:3105 +#: doc/guix.texi:1349 doc/guix.texi:2573 doc/guix.texi:3103 #, no-wrap msgid "substitutes" msgstr "Substitute" #. type: table -#: doc/guix.texi:1355 doc/guix.texi:7729 +#: doc/guix.texi:1353 doc/guix.texi:7727 msgid "Do not use substitutes for build products. That is, always build things locally instead of allowing downloads of pre-built binaries (@pxref{Substitutes})." msgstr "Benutze keine Substitute für Erstellungsergebnisse. Das heißt, dass alle Objekte lokal erstellt werden müssen, und kein Herunterladen von vorab erstellten Binärdateien erlaubt ist (siehe @ref{Substitutes})." #. type: table -#: doc/guix.texi:1359 +#: doc/guix.texi:1357 msgid "When the daemon runs with @code{--no-substitutes}, clients can still explicitly enable substitution @i{via} the @code{set-build-options} remote procedure call (@pxref{The Store})." msgstr "Wenn der Daemon mit @code{--no-substitutes} ausgeführt wird, können Clients trotzdem Substitute explizit aktivieren über den entfernten Prozeduraufruf @code{set-build-options} (siehe @ref{The Store})." #. type: item -#: doc/guix.texi:1360 doc/guix.texi:7712 doc/guix.texi:9319 doc/guix.texi:9900 -#: doc/guix.texi:10090 +#: doc/guix.texi:1358 doc/guix.texi:7710 doc/guix.texi:9317 doc/guix.texi:9898 +#: doc/guix.texi:10088 #, no-wrap msgid "--substitute-urls=@var{urls}" msgstr "--substitute-urls=@var{URLs}" #. type: anchor{#1} -#: doc/guix.texi:1365 +#: doc/guix.texi:1363 msgid "daemon-substitute-urls" msgstr "daemon-substitute-urls" #. type: table -#: doc/guix.texi:1365 +#: doc/guix.texi:1363 msgid "Consider @var{urls} the default whitespace-separated list of substitute source URLs. When this option is omitted, @indicateurl{https://@value{SUBSTITUTE-SERVER}} is used." msgstr "@var{URLs} als standardmäßige, leerzeichengetrennte Liste der Quell-URLs für Substitute benutzen. Wenn diese Befehlszeilenoption @emph{nicht} angegeben wird, wird @indicateurl{https://@value{SUBSTITUTE-SERVER}} verwendet." #. type: table -#: doc/guix.texi:1368 +#: doc/guix.texi:1366 msgid "This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature (@pxref{Substitutes})." msgstr "Das hat zur Folge, dass Substitute von den @var{URLs} heruntergeladen werden können, solange sie mit einer Signatur versehen sind, der vertraut wird (siehe @ref{Substitutes})." #. type: item -#: doc/guix.texi:1370 doc/guix.texi:7750 +#: doc/guix.texi:1368 doc/guix.texi:7748 #, no-wrap msgid "--no-build-hook" msgstr "--no-build-hook" #. type: table -#: doc/guix.texi:1372 +#: doc/guix.texi:1370 msgid "Do not use the @dfn{build hook}." msgstr "Den @dfn{Build-Hook} nicht benutzen." #. type: table -#: doc/guix.texi:1376 +#: doc/guix.texi:1374 msgid "The build hook is a helper program that the daemon can start and to which it submits build requests. This mechanism is used to offload builds to other machines (@pxref{Daemon Offload Setup})." msgstr "„Build-Hook“ ist der Name eines Hilfsprogramms, das der Daemon starten kann und an das er Erstellungsanfragen übermittelt. Durch diesen Mechanismus können Erstellungen an andere Maschinen ausgelagert werden (siehe @ref{Daemon Offload Setup})." #. type: item -#: doc/guix.texi:1377 +#: doc/guix.texi:1375 #, no-wrap msgid "--cache-failures" msgstr "--cache-failures" #. type: table -#: doc/guix.texi:1379 +#: doc/guix.texi:1377 msgid "Cache build failures. By default, only successful builds are cached." msgstr "Fehler bei der Erstellung zwischenspeichern. Normalerweise werden nur erfolgreiche Erstellungen gespeichert." #. type: table -#: doc/guix.texi:1384 +#: doc/guix.texi:1382 msgid "When this option is used, @command{guix gc --list-failures} can be used to query the set of store items marked as failed; @command{guix gc --clear-failures} removes store items from the set of cached failures. @xref{Invoking guix gc}." msgstr "Wenn diese Befehlszeilenoption benutzt wird, kann @command{guix gc --list-failures} benutzt werden, um die Menge an Store-Objekten abzufragen, die als Fehlschläge markiert sind; @command{guix gc --clear-failures} entfernt Store-Objekte aus der Menge zwischengespeicherter Fehlschläge. Siehe @ref{Invoking guix gc}." #. type: item -#: doc/guix.texi:1385 doc/guix.texi:7779 +#: doc/guix.texi:1383 doc/guix.texi:7777 #, no-wrap msgid "--cores=@var{n}" msgstr "--cores=@var{n}" #. type: itemx -#: doc/guix.texi:1386 doc/guix.texi:7780 +#: doc/guix.texi:1384 doc/guix.texi:7778 #, no-wrap msgid "-c @var{n}" msgstr "-c @var{n}" #. type: table -#: doc/guix.texi:1389 +#: doc/guix.texi:1387 msgid "Use @var{n} CPU cores to build each derivation; @code{0} means as many as available." msgstr "@var{n} CPU-Kerne zum Erstellen jeder Ableitung benutzen; @code{0} heißt, so viele wie verfügbar sind." #. type: table -#: doc/guix.texi:1393 +#: doc/guix.texi:1391 msgid "The default value is @code{0}, but it may be overridden by clients, such as the @code{--cores} option of @command{guix build} (@pxref{Invoking guix build})." msgstr "Der Vorgabewert ist @code{0}, jeder Client kann jedoch eine abweichende Anzahl vorgeben, zum Beispiel mit der Befehlszeilenoption @code{--cores} von @command{guix build} (siehe @ref{Invoking guix build})." #. type: table -#: doc/guix.texi:1397 +#: doc/guix.texi:1395 msgid "The effect is to define the @code{NIX_BUILD_CORES} environment variable in the build process, which can then use it to exploit internal parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}." msgstr "Dadurch wird die Umgebungsvariable @code{NIX_BUILD_CORES} im Erstellungsprozess definiert, welcher sie benutzen kann, um intern parallele Ausführungen zuzulassen — zum Beispiel durch Nutzung von @code{make -j$NIX_BUILD_CORES}." #. type: item -#: doc/guix.texi:1398 doc/guix.texi:7784 +#: doc/guix.texi:1396 doc/guix.texi:7782 #, no-wrap msgid "--max-jobs=@var{n}" msgstr "--max-jobs=@var{n}" #. type: itemx -#: doc/guix.texi:1399 doc/guix.texi:7785 +#: doc/guix.texi:1397 doc/guix.texi:7783 #, no-wrap msgid "-M @var{n}" msgstr "-M @var{n}" #. type: table -#: doc/guix.texi:1404 +#: doc/guix.texi:1402 msgid "Allow at most @var{n} build jobs in parallel. The default value is @code{1}. Setting it to @code{0} means that no builds will be performed locally; instead, the daemon will offload builds (@pxref{Daemon Offload Setup}), or simply fail." msgstr "Höchstenss @var{n} Erstellungsaufträge parallel bearbeiten. Der Vorgabewert liegt bei @code{1}. Wird er auf @code{0} gesetzt, werden keine Erstellungen lokal durchgeführt, stattdessen lagert der Daemon sie nur aus (siehe @ref{Daemon Offload Setup}) oder sie schlagen einfach fehl." #. type: item -#: doc/guix.texi:1405 doc/guix.texi:7755 +#: doc/guix.texi:1403 doc/guix.texi:7753 #, no-wrap msgid "--max-silent-time=@var{seconds}" msgstr "--max-silent-time=@var{Sekunden}" #. type: table -#: doc/guix.texi:1408 doc/guix.texi:7758 +#: doc/guix.texi:1406 doc/guix.texi:7756 msgid "When the build or substitution process remains silent for more than @var{seconds}, terminate it and report a build failure." msgstr "Wenn der Erstellungs- oder Substitutionsprozess länger als @var{Sekunden}-lang keine Ausgabe erzeugt, wird er abgebrochen und ein Fehler beim Erstellen gemeldet." #. type: table -#: doc/guix.texi:1410 doc/guix.texi:1419 +#: doc/guix.texi:1408 doc/guix.texi:1417 msgid "The default value is @code{0}, which disables the timeout." msgstr "Der Vorgabewert ist @code{0}, was bedeutet, dass es keine Zeitbeschränkung gibt." #. type: table -#: doc/guix.texi:1413 +#: doc/guix.texi:1411 msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--max-silent-time}})." msgstr "Clients können einen anderen Wert als den hier angegebenen verwenden lassen (siehe @ref{Common Build Options, @code{--max-silent-time}})." #. type: item -#: doc/guix.texi:1414 doc/guix.texi:7762 +#: doc/guix.texi:1412 doc/guix.texi:7760 #, no-wrap msgid "--timeout=@var{seconds}" msgstr "--timeout=@var{Sekunden}" #. type: table -#: doc/guix.texi:1417 doc/guix.texi:7765 +#: doc/guix.texi:1415 doc/guix.texi:7763 msgid "Likewise, when the build or substitution process lasts for more than @var{seconds}, terminate it and report a build failure." msgstr "Entsprechend wird hier der Erstellungs- oder Substitutionsprozess abgebrochen und als Fehlschlag gemeldet, wenn er mehr als @var{Sekunden}-lang dauert." #. type: table -#: doc/guix.texi:1422 +#: doc/guix.texi:1420 msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--timeout}})." msgstr "Clients können einen anderen Wert verwenden lassen (siehe @ref{Common Build Options, @code{--timeout}})." #. type: item -#: doc/guix.texi:1423 +#: doc/guix.texi:1421 #, no-wrap msgid "--rounds=@var{N}" msgstr "--rounds=@var{N}" #. type: table -#: doc/guix.texi:1428 +#: doc/guix.texi:1426 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical. Note that this setting can be overridden by clients such as @command{guix build} (@pxref{Invoking guix build})." msgstr "Jede Ableitung @var{n}-mal hintereinander erstellen und einen Fehler melden, wenn nacheinander ausgewertete Erstellungsergebnisse nicht Bit für Bit identisch sind. Beachten Sie, dass Clients wie @command{guix build} einen anderen Wert verwenden lassen können (siehe @ref{Invoking guix build})." #. type: table -#: doc/guix.texi:1432 doc/guix.texi:8124 +#: doc/guix.texi:1430 doc/guix.texi:8122 msgid "When used in conjunction with @option{--keep-failed}, the differing output is kept in the store, under @file{/gnu/store/@dots{}-check}. This makes it easy to look for differences between the two results." msgstr "Wenn dies zusammen mit @option{--keep-failed} benutzt wird, bleiben die sich unterscheidenden Ausgaben im Store unter dem Namen @file{/gnu/store/…-check}. Dadurch können Unterschiede zwischen den beiden Ergebnissen leicht erkannt werden." #. type: item -#: doc/guix.texi:1433 +#: doc/guix.texi:1431 #, no-wrap msgid "--debug" msgstr "--debug" #. type: table -#: doc/guix.texi:1435 +#: doc/guix.texi:1433 msgid "Produce debugging output." msgstr "Informationen zur Fehlersuche ausgeben." #. type: table -#: doc/guix.texi:1439 +#: doc/guix.texi:1437 msgid "This is useful to debug daemon start-up issues, but then it may be overridden by clients, for example the @code{--verbosity} option of @command{guix build} (@pxref{Invoking guix build})." msgstr "Dies ist nützlich, um Probleme beim Starten des Daemons nachzuvollziehen; Clients könn aber auch ein abweichenden Wert verwenden lassen, zum Beispiel mit der Befehlszeilenoption @code{--verbosity} von @command{guix build} (siehe @ref{Invoking guix build})." #. type: item -#: doc/guix.texi:1440 +#: doc/guix.texi:1438 #, no-wrap msgid "--chroot-directory=@var{dir}" msgstr "--chroot-directory=@var{Verzeichnis}" #. type: table -#: doc/guix.texi:1442 +#: doc/guix.texi:1440 msgid "Add @var{dir} to the build chroot." msgstr "Füge das @var{Verzeichnis} zum chroot von Erstellungen hinzu." #. type: table -#: doc/guix.texi:1448 +#: doc/guix.texi:1446 msgid "Doing this may change the result of build processes---for instance if they use optional dependencies found in @var{dir} when it is available, and not otherwise. For that reason, it is not recommended to do so. Instead, make sure that each derivation declares all the inputs that it needs." msgstr "Dadurch kann sich das Ergebnis von Erstellungsprozessen ändern — zum Beispiel, wenn diese optionale Abhängigkeiten aus dem @var{Verzeichnis} verwenden, wenn sie verfügbar sind, und nicht, wenn es fehlt. Deshalb ist es nicht empfohlen, dass Sie diese Befehlszeilenoption verwenden, besser sollten Sie dafür sorgen, dass jede Ableitung alle von ihr benötigten Eingabgen deklariert." #. type: item -#: doc/guix.texi:1449 +#: doc/guix.texi:1447 #, no-wrap msgid "--disable-chroot" msgstr "--disable-chroot" #. type: table -#: doc/guix.texi:1451 +#: doc/guix.texi:1449 msgid "Disable chroot builds." msgstr "Erstellungen ohne chroot durchführen." #. type: table -#: doc/guix.texi:1456 +#: doc/guix.texi:1454 msgid "Using this option is not recommended since, again, it would allow build processes to gain access to undeclared dependencies. It is necessary, though, when @command{guix-daemon} is running under an unprivileged user account." msgstr "Diese Befehlszeilenoption zu benutzen, wird nicht empfohlen, denn auch dadurch bekämen Erstellungsprozesse Zugriff auf nicht deklarierte Abhängigkeiten. Sie ist allerdings unvermeidlich, wenn @command{guix-daemon} auf einem Benutzerkonto ohne ausreichende Berechtigungen ausgeführt wird." #. type: item -#: doc/guix.texi:1457 +#: doc/guix.texi:1455 #, no-wrap msgid "--log-compression=@var{type}" msgstr "--log-compression=@var{Typ}" #. type: table -#: doc/guix.texi:1460 +#: doc/guix.texi:1458 msgid "Compress build logs according to @var{type}, one of @code{gzip}, @code{bzip2}, or @code{none}." msgstr "Erstellungsprotokolle werden entsprechend dem @var{Typ} komprimiert, der entweder @code{gzip}, @code{bzip2} oder @code{none} (für keine Kompression) sein muss." #. type: table -#: doc/guix.texi:1464 +#: doc/guix.texi:1462 msgid "Unless @code{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}. To save space, the daemon automatically compresses them with bzip2 by default." msgstr "Sofern nicht @code{--lose-logs} angegeben wurde, werden alle Erstellungsprotokolle in der @var{localstatedir} gespeichert. Um Platz zu sparen, komprimiert sie der Daemon standardmäßig automatisch mit bzip2." #. type: item -#: doc/guix.texi:1465 +#: doc/guix.texi:1463 #, no-wrap msgid "--disable-deduplication" msgstr "--disable-deduplication" #. type: cindex -#: doc/guix.texi:1466 doc/guix.texi:3578 +#: doc/guix.texi:1464 doc/guix.texi:3576 #, no-wrap msgid "deduplication" msgstr "Deduplizieren" #. type: table -#: doc/guix.texi:1468 +#: doc/guix.texi:1466 msgid "Disable automatic file ``deduplication'' in the store." msgstr "Automatische Dateien-„Deduplizierung“ im Store ausschalten." #. type: table -#: doc/guix.texi:1475 +#: doc/guix.texi:1473 msgid "By default, files added to the store are automatically ``deduplicated'': if a newly added file is identical to another one found in the store, the daemon makes the new file a hard link to the other file. This can noticeably reduce disk usage, at the expense of slightly increased input/output load at the end of a build process. This option disables this optimization." msgstr "Standardmäßig werden zum Store hinzugefügte Objekte automatisch „dedupliziert“: Wenn eine neue Datei mit einer anderen im Store übereinstimmt, wird die neue Datei stattdessen als harte Verknüpfung auf die andere Datei angelegt. Dies reduziert den Speicherverbrauch auf der Platte merklich, jedoch steigt andererseits die Auslastung bei der Ein-/Ausgabe im Erstellungsprozess geringfügig. Durch diese Option wird keine solche Optimierung durchgeführt." #. type: item -#: doc/guix.texi:1476 +#: doc/guix.texi:1474 #, no-wrap msgid "--gc-keep-outputs[=yes|no]" msgstr "--gc-keep-outputs[=yes|no]" #. type: table -#: doc/guix.texi:1479 +#: doc/guix.texi:1477 msgid "Tell whether the garbage collector (GC) must keep outputs of live derivations." msgstr "Gibt an, ob der Müllsammler (Garbage Collector, GC) die Ausgaben lebendiger Ableitungen behalten muss („yes“) oder nicht („no“)." #. type: cindex -#: doc/guix.texi:1480 doc/guix.texi:3395 +#: doc/guix.texi:1478 doc/guix.texi:3393 #, no-wrap msgid "GC roots" msgstr "GC-Wurzeln" #. type: cindex -#: doc/guix.texi:1481 doc/guix.texi:3396 +#: doc/guix.texi:1479 doc/guix.texi:3394 #, no-wrap msgid "garbage collector roots" msgstr "Müllsammlerwurzeln" #. type: table -#: doc/guix.texi:1486 +#: doc/guix.texi:1484 msgid "When set to ``yes'', the GC will keep the outputs of any live derivation available in the store---the @code{.drv} files. The default is ``no'', meaning that derivation outputs are kept only if they are reachable from a GC root. @xref{Invoking guix gc}, for more on GC roots." msgstr "Für „yes“ behält der Müllsammler die Ausgaben aller lebendigen Ableitungen im Store — die @code{.drv}-Dateien. Der Vorgabewert ist aber „no“, so dass Ableitungsausgaben nur vorgehalten werden, wenn sie von einer Müllsammlerwurzel aus erreichbar sind. Siehe den Abschnitt @ref{Invoking guix gc} für weitere Informationen zu Müllsammlerwurzeln." #. type: item -#: doc/guix.texi:1487 +#: doc/guix.texi:1485 #, no-wrap msgid "--gc-keep-derivations[=yes|no]" msgstr "--gc-keep-derivations[=yes|no]" #. type: table -#: doc/guix.texi:1490 +#: doc/guix.texi:1488 msgid "Tell whether the garbage collector (GC) must keep derivations corresponding to live outputs." msgstr "Gibt an, ob der Müllsammler (GC) Ableitungen behalten muss („yes“), wenn sie lebendige Ausgaben haben, oder nicht („no“)." #. type: table -#: doc/guix.texi:1495 +#: doc/guix.texi:1493 msgid "When set to ``yes'', as is the case by default, the GC keeps derivations---i.e., @code{.drv} files---as long as at least one of their outputs is live. This allows users to keep track of the origins of items in their store. Setting it to ``no'' saves a bit of disk space." msgstr "Für „yes“, den Vorgabewert, behält der Müllsammler Ableitungen — z.B.@: @code{.drv}-Dateien —, solange zumindest eine ihrer Ausgaben lebendig ist. Dadurch können Nutzer den Ursprung der Dateien in ihrem Store nachvollziehen. Setzt man den Wert auf „no“, wird ein bisschen weniger Speicher auf der Platte verbraucht." #. type: table -#: doc/guix.texi:1503 +#: doc/guix.texi:1501 msgid "In this way, setting @code{--gc-keep-derivations} to ``yes'' causes liveness to flow from outputs to derivations, and setting @code{--gc-keep-outputs} to ``yes'' causes liveness to flow from derivations to outputs. When both are set to ``yes'', the effect is to keep all the build prerequisites (the sources, compiler, libraries, and other build-time tools) of live objects in the store, regardless of whether these prerequisites are reachable from a GC root. This is convenient for developers since it saves rebuilds or downloads." msgstr "Auf diese Weise überträgt sich, wenn @code{--gc-keep-derivations} auf „yes“ steht, die Lebendigkeit von Ausgaben auf Ableitungen, und wenn @code{--gc-keep-outputs} auf „yes“ steht, die Lebendigkeit von Ableitungen auf Ausgaben. Stehen beide auf „yes“, bleiben so alle Erstellungsvoraussetzungen wie Quelldateien, Compiler, Bibliotheken und andere Erstellungswerkzeuge lebendiger Objekte im Store erhalten, ob sie von einer Müllsammlerwurzel aus erreichbar sind oder nicht. Entwickler können sich so erneute Erstellungen oder erneutes Herunterladen sparen." #. type: item -#: doc/guix.texi:1504 +#: doc/guix.texi:1502 #, no-wrap msgid "--impersonate-linux-2.6" msgstr "--impersonate-linux-2.6" #. type: table -#: doc/guix.texi:1507 +#: doc/guix.texi:1505 msgid "On Linux-based systems, impersonate Linux 2.6. This means that the kernel's @code{uname} system call will report 2.6 as the release number." msgstr "Auf Linux-basierten Systemen wird hiermit vorgetäuscht, dass es sich um Linux 2.6 handeln würde, indem der Kernel für einen @code{uname}-Systemaufruf als Version der Veröffentlichung mit 2.6 antwortet." #. type: table -#: doc/guix.texi:1510 +#: doc/guix.texi:1508 msgid "This might be helpful to build programs that (usually wrongfully) depend on the kernel version number." msgstr "Dies kann hilfreich sein, um Programme zu erstellen, die (normalerweise zu Unrecht) von der Kernel-Versionsnummer abhängen." #. type: item -#: doc/guix.texi:1511 +#: doc/guix.texi:1509 #, no-wrap msgid "--lose-logs" msgstr "--lose-logs" #. type: table -#: doc/guix.texi:1514 +#: doc/guix.texi:1512 msgid "Do not keep build logs. By default they are kept under @code{@var{localstatedir}/guix/log}." msgstr "Keine Protokolle der Erstellungen vorhalten. Normalerweise würden solche in @code{@var{localstatedir}/guix/log} gespeichert." #. type: item -#: doc/guix.texi:1515 doc/guix.texi:3724 doc/guix.texi:4592 doc/guix.texi:4885 -#: doc/guix.texi:8068 doc/guix.texi:9346 doc/guix.texi:9545 doc/guix.texi:10095 -#: doc/guix.texi:23938 doc/guix.texi:24564 +#: doc/guix.texi:1513 doc/guix.texi:3722 doc/guix.texi:4590 doc/guix.texi:4883 +#: doc/guix.texi:8066 doc/guix.texi:9344 doc/guix.texi:9543 +#: doc/guix.texi:10093 doc/guix.texi:23935 doc/guix.texi:24555 #, no-wrap msgid "--system=@var{system}" msgstr "--system=@var{System}" #. type: table -#: doc/guix.texi:1519 +#: doc/guix.texi:1517 msgid "Assume @var{system} as the current system type. By default it is the architecture/kernel pair found at configure time, such as @code{x86_64-linux}." msgstr "Verwende @var{System} als aktuellen Systemtyp. Standardmäßig ist dies das Paar aus Befehlssatz und Kernel, welches beim Aufruf von @code{configure} erkannt wurde, wie zum Beispiel @code{x86_64-linux}." #. type: item -#: doc/guix.texi:1520 doc/guix.texi:7570 +#: doc/guix.texi:1518 doc/guix.texi:7568 #, no-wrap msgid "--listen=@var{endpoint}" msgstr "--listen=@var{Endpunkt}" #. type: table -#: doc/guix.texi:1525 +#: doc/guix.texi:1523 msgid "Listen for connections on @var{endpoint}. @var{endpoint} is interpreted as the file name of a Unix-domain socket if it starts with @code{/} (slash sign). Otherwise, @var{endpoint} is interpreted as a host name or host name and port to listen to. Here are a few examples:" msgstr "Lausche am @var{Endpunkt} auf Verbindungen. Dabei wird der @var{Endpunkt} als Dateiname eines Unix-Sockets verstanden, wenn er mit einem @code{/} (Schrägstrich) beginnt. Andernfalls wird der @var{Endpunkt} als Hostname (d.h.@: Rechnername) oder als Hostname-Port-Paar verstanden, auf dem gelauscht wird. Hier sind ein paar Beispiele:" #. type: item -#: doc/guix.texi:1527 +#: doc/guix.texi:1525 #, no-wrap msgid "--listen=/gnu/var/daemon" msgstr "--listen=/gnu/var/daemon" #. type: table -#: doc/guix.texi:1530 +#: doc/guix.texi:1528 msgid "Listen for connections on the @file{/gnu/var/daemon} Unix-domain socket, creating it if needed." msgstr "Lausche auf Verbindungen am Unix-Socket @file{/gnu/var/daemon}, falls nötig wird er dazu erstellt." #. type: item -#: doc/guix.texi:1531 +#: doc/guix.texi:1529 #, no-wrap msgid "--listen=localhost" msgstr "--listen=localhost" #. type: cindex -#: doc/guix.texi:1532 doc/guix.texi:6351 +#: doc/guix.texi:1530 doc/guix.texi:6349 #, no-wrap msgid "daemon, remote access" msgstr "Daemon, Fernzugriff" #. type: cindex -#: doc/guix.texi:1533 doc/guix.texi:6352 +#: doc/guix.texi:1531 doc/guix.texi:6350 #, no-wrap msgid "remote access to the daemon" msgstr "Fernzugriff auf den Daemon" #. type: cindex -#: doc/guix.texi:1534 doc/guix.texi:6353 +#: doc/guix.texi:1532 doc/guix.texi:6351 #, no-wrap msgid "daemon, cluster setup" msgstr "Daemon, Einrichten auf Clustern" #. type: cindex -#: doc/guix.texi:1535 doc/guix.texi:6354 +#: doc/guix.texi:1533 doc/guix.texi:6352 #, no-wrap msgid "clusters, daemon setup" msgstr "Cluster, Einrichtung des Daemons" #. type: table -#: doc/guix.texi:1538 +#: doc/guix.texi:1536 msgid "Listen for TCP connections on the network interface corresponding to @code{localhost}, on port 44146." msgstr "Lausche auf TCP-Verbindungen an der Netzwerkschnittstelle, die @code{localhost} entspricht, auf Port 44146." #. type: item -#: doc/guix.texi:1539 +#: doc/guix.texi:1537 #, no-wrap msgid "--listen=128.0.0.42:1234" msgstr "--listen=128.0.0.42:1234" #. type: table -#: doc/guix.texi:1542 +#: doc/guix.texi:1540 msgid "Listen for TCP connections on the network interface corresponding to @code{128.0.0.42}, on port 1234." msgstr "Lausche auf TCP-Verbindungen an der Netzwerkschnittstelle, die @code{128.0.0.42} entspricht, auf Port 1234." #. type: table -#: doc/guix.texi:1549 +#: doc/guix.texi:1547 msgid "This option can be repeated multiple times, in which case @command{guix-daemon} accepts connections on all the specified endpoints. Users can tell client commands what endpoint to connect to by setting the @code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})." msgstr "Diese Befehlszeilenoption kann mehrmals wiederholt werden. In diesem Fall akzeptiert @command{guix-daemon} Verbindungen auf allen angegebenen Endpunkten. Benutzer können bei Client-Befehlen angeben, mit welchem Endpunkt sie sich verbinden möchten, indem sie die Umgebungsvariable @code{GUIX_DAEMON_SOCKET} festlegen (siehe @ref{The Store, @code{GUIX_DAEMON_SOCKET}})." #. type: quotation -#: doc/guix.texi:1556 +#: doc/guix.texi:1554 msgid "The daemon protocol is @emph{unauthenticated and unencrypted}. Using @code{--listen=@var{host}} is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon. In other cases where remote access to the daemon is needed, we recommend using Unix-domain sockets along with SSH." msgstr "Das Daemon-Protokoll ist @emph{weder authentifiziert noch verschlüsselt}. Die Benutzung von @code{--listen=@var{Host}} eignet sich für lokale Netzwerke, wie z.B.@: in Rechen-Clustern, wo sich nur solche Knoten mit dem Daemon verbinden, denen man vertraut. In Situationen, wo ein Fernzugriff auf den Daemon durchgeführt wird, empfehlen wir, über Unix-Sockets in Verbindung mit SSH zuzugreifen." #. type: table -#: doc/guix.texi:1561 +#: doc/guix.texi:1559 msgid "When @code{--listen} is omitted, @command{guix-daemon} listens for connections on the Unix-domain socket located at @file{@var{localstatedir}/guix/daemon-socket/socket}." msgstr "Wird @code{--listen} nicht angegeben, lauscht @command{guix-daemon} auf Verbindungen auf dem Unix-Socket, der sich unter @file{@var{localstatedir}/guix/daemon-socket/socket} befindet." #. type: Plain text -#: doc/guix.texi:1571 +#: doc/guix.texi:1569 msgid "When using Guix on top of GNU/Linux distribution other than Guix System---a so-called @dfn{foreign distro}---a few additional steps are needed to get everything in place. Here are some of them." msgstr "Läuft Guix aufgesetzt auf einer GNU/Linux-Distribution außer Guix System — einer sogenannten @dfn{Fremddistribution} —, so sind ein paar zusätzliche Schritte bei der Einrichtung nötig. Hier finden Sie manche davon." #. type: anchor{#1} -#: doc/guix.texi:1575 +#: doc/guix.texi:1573 msgid "locales-and-locpath" msgstr "locales-and-locpath" #. type: cindex -#: doc/guix.texi:1575 +#: doc/guix.texi:1573 #, no-wrap msgid "locales, when not on Guix System" msgstr "Locales, nicht auf Guix System" #. type: vindex -#: doc/guix.texi:1576 doc/guix.texi:11299 +#: doc/guix.texi:1574 doc/guix.texi:11297 #, no-wrap msgid "LOCPATH" msgstr "LOCPATH" #. type: vindex -#: doc/guix.texi:1577 +#: doc/guix.texi:1575 #, no-wrap msgid "GUIX_LOCPATH" msgstr "GUIX_LOCPATH" #. type: Plain text -#: doc/guix.texi:1582 +#: doc/guix.texi:1580 msgid "Packages installed @i{via} Guix will not use the locale data of the host system. Instead, you must first install one of the locale packages available with Guix and then define the @code{GUIX_LOCPATH} environment variable:" msgstr "Über Guix installierte Pakete benutzen nicht die Daten zu Regions- und Spracheinstellungen (Locales) des Wirtssystems. Stattdessen müssen Sie erst eines der Locale-Pakete installieren, die für Guix verfügbar sind, und dann den Wert Ihrer Umgebungsvariablen @code{GUIX_LOCPATH} passend festlegen:" #. type: example -#: doc/guix.texi:1586 +#: doc/guix.texi:1584 #, no-wrap msgid "" "$ guix install glibc-locales\n" @@ -5028,363 +5039,363 @@ msgstr "" "$ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale\n" #. type: Plain text -#: doc/guix.texi:1592 +#: doc/guix.texi:1590 msgid "Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around 110@tie{}MiB. Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales." msgstr "Beachten Sie, dass das Paket @code{glibc-locales} Daten für alle von GNU@tie{}libc unterstützten Locales enthält und deswegen um die 110@tie{}MiB wiegt. Alternativ gibt es auch @code{glibc-utf8-locales}, was kleiner, aber auf ein paar UTF-8-Locales beschränkt ist." #. type: Plain text -#: doc/guix.texi:1596 +#: doc/guix.texi:1594 msgid "The @code{GUIX_LOCPATH} variable plays a role similar to @code{LOCPATH} (@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}). There are two important differences though:" msgstr "Die Variable @code{GUIX_LOCPATH} spielt eine ähnliche Rolle wie @code{LOCPATH} (siehe @ref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}). Es gibt jedoch zwei wichtige Unterschiede:" #. type: enumerate -#: doc/guix.texi:1603 +#: doc/guix.texi:1601 msgid "@code{GUIX_LOCPATH} is honored only by the libc in Guix, and not by the libc provided by foreign distros. Thus, using @code{GUIX_LOCPATH} allows you to make sure the programs of the foreign distro will not end up loading incompatible locale data." msgstr "@code{GUIX_LOCPATH} wird nur von der libc in Guix beachtet und nicht der von Fremddistributionen bereitgestellten libc. Mit @code{GUIX_LOCPATH} können Sie daher sicherstellen, dass die Programme der Fremddistribution keine inkompatiblen Locale-Daten von Guix laden." #. type: enumerate -#: doc/guix.texi:1610 +#: doc/guix.texi:1608 msgid "libc suffixes each entry of @code{GUIX_LOCPATH} with @code{/X.Y}, where @code{X.Y} is the libc version---e.g., @code{2.22}. This means that, should your Guix profile contain a mixture of programs linked against different libc version, each libc version will only try to load locale data in the right format." msgstr "libc hängt an jeden @code{GUIX_LOCPATH}-Eintrag @code{/X.Y} an, wobei @code{X.Y} die Version von libc ist — z.B.@: @code{2.22}. Sollte Ihr Guix-Profil eine Mischung aus Programmen enthalten, die an verschiedene libc-Versionen gebunden sind, wird jede nur die Locale-Daten im richtigen Format zu laden versuchen." #. type: Plain text -#: doc/guix.texi:1614 +#: doc/guix.texi:1612 msgid "This is important because the locale data format used by different libc versions may be incompatible." msgstr "Das ist wichtig, weil das Locale-Datenformat verschiedener libc-Versionen inkompatibel sein könnte." #. type: cindex -#: doc/guix.texi:1617 +#: doc/guix.texi:1615 #, no-wrap msgid "name service switch, glibc" msgstr "Name Service Switch, glibc" #. type: cindex -#: doc/guix.texi:1618 +#: doc/guix.texi:1616 #, no-wrap msgid "NSS (name service switch), glibc" msgstr "NSS (Name Service Switch), glibc" #. type: cindex -#: doc/guix.texi:1619 +#: doc/guix.texi:1617 #, no-wrap msgid "nscd (name service caching daemon)" msgstr "nscd (Name Service Caching Daemon)" #. type: cindex -#: doc/guix.texi:1620 +#: doc/guix.texi:1618 #, no-wrap msgid "name service caching daemon (nscd)" msgstr "Name Service Caching Daemon (nscd)" #. type: Plain text -#: doc/guix.texi:1627 +#: doc/guix.texi:1625 msgid "When using Guix on a foreign distro, we @emph{strongly recommend} that the system run the GNU C library's @dfn{name service cache daemon}, @command{nscd}, which should be listening on the @file{/var/run/nscd/socket} socket. Failing to do that, applications installed with Guix may fail to look up host names or user accounts, or may even crash. The next paragraphs explain why." msgstr "Wenn Sie Guix auf einer Fremddistribution verwenden, @emph{empfehlen wir stärkstens}, dass Sie den @dfn{Name Service Cache Daemon} der GNU-C-Bibliothek, @command{nscd}, laufen lassen, welcher auf dem Socket @file{/var/run/nscd/socket} lauschen sollte. Wenn Sie das nicht tun, könnten mit Guix installierte Anwendungen Probleme beim Auflösen von Hostnamen (d.h.@: Rechnernamen) oder Benutzerkonten haben, oder sogar abstürzen. Die nächsten Absätze erklären warum." #. type: file{#1} -#: doc/guix.texi:1628 +#: doc/guix.texi:1626 #, no-wrap msgid "nsswitch.conf" msgstr "nsswitch.conf" #. type: Plain text -#: doc/guix.texi:1633 +#: doc/guix.texi:1631 msgid "The GNU C library implements a @dfn{name service switch} (NSS), which is an extensible mechanism for ``name lookups'' in general: host name resolution, user accounts, and more (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." msgstr "Die GNU-C-Bibliothek implementiert einen @dfn{Name Service Switch} (NSS), welcher einen erweiterbaren Mechanismus zur allgemeinen „Namensauflösung“ darstellt: Hostnamensauflösung, Benutzerkonten und weiteres (siehe @ref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." #. type: cindex -#: doc/guix.texi:1634 +#: doc/guix.texi:1632 #, no-wrap msgid "Network information service (NIS)" msgstr "Network Information Service (NIS)" #. type: cindex -#: doc/guix.texi:1635 +#: doc/guix.texi:1633 #, no-wrap msgid "NIS (Network information service)" msgstr "NIS (Network Information Service)" #. type: Plain text -#: doc/guix.texi:1644 +#: doc/guix.texi:1642 msgid "Being extensible, the NSS supports @dfn{plugins}, which provide new name lookup implementations: for example, the @code{nss-mdns} plugin allow resolution of @code{.local} host names, the @code{nis} plugin allows user account lookup using the Network information service (NIS), and so on. These extra ``lookup services'' are configured system-wide in @file{/etc/nsswitch.conf}, and all the programs running on the system honor those settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})." msgstr "Für die Erweiterbarkeit unterstützt der NSS @dfn{Plugins}, welche neue Implementierungen zur Namensauflösung bieten: Zum Beispiel ermöglicht das Plugin @code{nss-mdns} die Namensauflösung für @code{.local}-Hostnamen, das Plugin @code{nis} gestattet die Auflösung von Benutzerkonten über den Network Information Service (NIS) und so weiter. Diese zusätzlichen „Auflösungsdienste“ werden systemweit konfiguriert in @file{/etc/nsswitch.conf} und alle auf dem System laufenden Programme halten sich an diese Einstellungen (siehe @ref{NSS Configuration File,,, libc, The GNU C Reference Manual})." #. type: Plain text -#: doc/guix.texi:1654 +#: doc/guix.texi:1652 msgid "When they perform a name lookup---for instance by calling the @code{getaddrinfo} function in C---applications first try to connect to the nscd; on success, nscd performs name lookups on their behalf. If the nscd is not running, then they perform the name lookup by themselves, by loading the name lookup services into their own address space and running it. These name lookup services---the @file{libnss_*.so} files---are @code{dlopen}'d, but they may come from the host system's C library, rather than from the C library the application is linked against (the C library coming from Guix)." msgstr "Wenn sie eine Namensauflösung durchführen — zum Beispiel, indem sie die @code{getaddrinfo}-Funktion in C aufrufen — versuchen die Anwendungen als Erstes, sich mit dem nscd zu verbinden; ist dies erfolgreich, führt nscd für sie die weiteren Namensauflösungen durch. Falls nscd nicht läuft, führen sie selbst die Namensauflösungen durch, indem sie die Namensauflösungsdienste in ihren eigenen Adressraum laden und ausführen. Diese Namensauflösungsdienste — die @file{libnss_*.so}-Dateien — werden mit @code{dlopen} geladen, aber sie kommen von der C-Bibliothek des Wirtssystems und nicht von der C-Bibliothek, mit der die Anwendung gebunden wurde (also der C-Bibliothek von Guix)." #. type: Plain text -#: doc/guix.texi:1659 +#: doc/guix.texi:1657 msgid "And this is where the problem is: if your application is linked against Guix's C library (say, glibc 2.24) and tries to load NSS plugins from another C library (say, @code{libnss_mdns.so} for glibc 2.22), it will likely crash or have its name lookups fail unexpectedly." msgstr "Und hier kommt es zum Problem: Wenn die Anwendung mit der C-Bibliothek von Guix (etwa glibc 2.24) gebunden wurde und die NSS-Plugins von einer anderen C-Bibliothek (etwa @code{libnss_mdns.so} für glibc 2.22) zu laden versucht, wird sie vermutlich abstürzen oder die Namensauflösungen werden unerwartet fehlschlagen." #. type: Plain text -#: doc/guix.texi:1664 +#: doc/guix.texi:1662 msgid "Running @command{nscd} on the system, among other advantages, eliminates this binary incompatibility problem because those @code{libnss_*.so} files are loaded in the @command{nscd} process, not in applications themselves." msgstr "Durch das Ausführen von @command{nscd} auf dem System wird, neben anderen Vorteilen, dieses Problem der binären Inkompatibilität vermieden, weil diese @code{libnss_*.so}-Dateien vom @command{nscd}-Prozess geladen werden, nicht in den Anwendungen selbst." #. type: subsection -#: doc/guix.texi:1665 +#: doc/guix.texi:1663 #, no-wrap msgid "X11 Fonts" msgstr "X11-Schriftarten" #. type: Plain text -#: doc/guix.texi:1675 +#: doc/guix.texi:1673 msgid "The majority of graphical applications use Fontconfig to locate and load fonts and perform X11-client-side rendering. The @code{fontconfig} package in Guix looks for fonts in @file{$HOME/.guix-profile} by default. Thus, to allow graphical applications installed with Guix to display fonts, you have to install fonts with Guix as well. Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and @code{font-gnu-freefont-ttf}." msgstr "Die Mehrheit der grafischen Anwendungen benutzen Fontconfig zum Finden und Laden von Schriftarten und für die Darstellung im X11-Client. Im Paket @code{fontconfig} in Guix werden Schriftarten standardmäßig in @file{$HOME/.guix-profile} gesucht. Um es grafischen Anwendungen, die mit Guix installiert wurden, zu ermöglichen, Schriftarten anzuzeigen, müssen Sie die Schriftarten auch mit Guix installieren. Essenzielle Pakete für Schriftarten sind unter anderem @code{gs-fonts}, @code{font-dejavu} und @code{font-gnu-freefont-ttf}." #. type: Plain text -#: doc/guix.texi:1682 +#: doc/guix.texi:1680 msgid "To display text written in Chinese languages, Japanese, or Korean in graphical applications, consider installing @code{font-adobe-source-han-sans} or @code{font-wqy-zenhei}. The former has multiple outputs, one per language family (@pxref{Packages with Multiple Outputs}). For instance, the following command installs fonts for Chinese languages:" msgstr "Um auf Chinesisch, Japanisch oder Koreanisch verfassten Text in grafischen Anwendungen anzeigen zu können, möchten Sie vielleicht @code{font-adobe-source-han-sans} oder @code{font-wqy-zenhei} installieren. Ersteres hat mehrere Ausgaben, für jede Sprachfamilie eine (siehe @ref{Packages with Multiple Outputs}). Zum Beispiel installiert folgender Befehl Schriftarten für chinesische Sprachen:" #. type: example -#: doc/guix.texi:1685 +#: doc/guix.texi:1683 #, no-wrap msgid "guix install font-adobe-source-han-sans:cn\n" msgstr "guix install font-adobe-source-han-sans:cn\n" #. type: code{#1} -#: doc/guix.texi:1687 +#: doc/guix.texi:1685 #, no-wrap msgid "xterm" msgstr "xterm" #. type: Plain text -#: doc/guix.texi:1691 +#: doc/guix.texi:1689 msgid "Older programs such as @command{xterm} do not use Fontconfig and instead rely on server-side font rendering. Such programs require to specify a full name of a font using XLFD (X Logical Font Description), like this:" msgstr "Ältere Programme wie @command{xterm} benutzen kein Fontconfig, sondern X-Server-seitige Schriftartendarstellung. Solche Programme setzen voraus, dass der volle Name einer Schriftart mit XLFD (X Logical Font Description) angegeben wird, z.B.@: so:" #. type: example -#: doc/guix.texi:1694 +#: doc/guix.texi:1692 #, no-wrap msgid "-*-dejavu sans-medium-r-normal-*-*-100-*-*-*-*-*-1\n" msgstr "-*-dejavu sans-medium-r-normal-*-*-100-*-*-*-*-*-1\n" #. type: Plain text -#: doc/guix.texi:1698 +#: doc/guix.texi:1696 msgid "To be able to use such full names for the TrueType fonts installed in your Guix profile, you need to extend the font path of the X server:" msgstr "Um solche vollen Namen für die in Ihrem Guix-Profil installierten TrueType-Schriftarten zu verwenden, müssen Sie den Pfad für Schriftarten (Font Path) des X-Servers anpassen:" #. type: example -#: doc/guix.texi:1703 +#: doc/guix.texi:1701 #, no-wrap msgid "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n" msgstr "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n" #. type: code{#1} -#: doc/guix.texi:1705 +#: doc/guix.texi:1703 #, no-wrap msgid "xlsfonts" msgstr "xlsfonts" #. type: Plain text -#: doc/guix.texi:1708 +#: doc/guix.texi:1706 msgid "After that, you can run @code{xlsfonts} (from @code{xlsfonts} package) to make sure your TrueType fonts are listed there." msgstr "Danach können Sie den Befehl @code{xlsfonts} ausführen (aus dem Paket @code{xlsfonts}), um sicherzustellen, dass dort Ihre TrueType-Schriftarten aufgeführt sind." #. type: code{#1} -#: doc/guix.texi:1709 +#: doc/guix.texi:1707 #, no-wrap msgid "fc-cache" msgstr "fc-cache" #. type: cindex -#: doc/guix.texi:1710 +#: doc/guix.texi:1708 #, no-wrap msgid "font cache" msgstr "Font-Cache" #. type: Plain text -#: doc/guix.texi:1716 +#: doc/guix.texi:1714 msgid "After installing fonts you may have to refresh the font cache to use them in applications. The same applies when applications installed via Guix do not seem to find fonts. To force rebuilding of the font cache run @code{fc-cache -f}. The @code{fc-cache} command is provided by the @code{fontconfig} package." msgstr "Nach der Installation der Schriftarten müssen Sie unter Umständen den Schriftarten-Zwischenspeicher (Font-Cache) erneuern, um diese in Anwendungen benutzen zu können. Gleiches gilt, wenn mit Guix installierte Anwendungen anscheinend keine Schriftarten finden können. Um das Erneuern des Font-Caches zu erzwingen, führen Sie @code{fc-cache -f} aus. Der Befehl @code{fc-cache} wird vom Paket @code{fontconfig} angeboten." #. type: code{#1} -#: doc/guix.texi:1719 doc/guix.texi:23677 +#: doc/guix.texi:1717 doc/guix.texi:23674 #, no-wrap msgid "nss-certs" msgstr "nss-certs" #. type: Plain text -#: doc/guix.texi:1722 +#: doc/guix.texi:1720 msgid "The @code{nss-certs} package provides X.509 certificates, which allow programs to authenticate Web servers accessed over HTTPS." msgstr "Das Paket @code{nss-certs} bietet X.509-Zertifikate, womit Programme die Identität von Web-Servern authentifizieren können, auf die über HTTPS zugegriffen wird." #. type: Plain text -#: doc/guix.texi:1727 +#: doc/guix.texi:1725 msgid "When using Guix on a foreign distro, you can install this package and define the relevant environment variables so that packages know where to look for certificates. @xref{X.509 Certificates}, for detailed information." msgstr "Wenn Sie Guix auf einer Fremddistribution verwenden, können Sie dieses Paket installieren und die relevanten Umgebungsvariablen festlegen, damit Pakete wissen, wo sie Zertifikate finden. Unter @ref{X.509 Certificates} stehen genaue Informationen." #. type: subsection -#: doc/guix.texi:1728 +#: doc/guix.texi:1726 #, no-wrap msgid "Emacs Packages" msgstr "Emacs-Pakete" #. type: code{#1} -#: doc/guix.texi:1730 +#: doc/guix.texi:1728 #, no-wrap msgid "emacs" msgstr "emacs" #. type: Plain text -#: doc/guix.texi:1741 +#: doc/guix.texi:1739 msgid "When you install Emacs packages with Guix, the elisp files may be placed either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in sub-directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}. The latter directory exists because potentially there may exist thousands of Emacs packages and storing all their files in a single directory may not be reliable (because of name conflicts). So we think using a separate directory for each package is a good idea. It is very similar to how the Emacs package system organizes the file structure (@pxref{Package Files,,, emacs, The GNU Emacs Manual})." msgstr "Wenn Sie mit Guix Pakete für Emacs installieren, werden deren elisp-Dateien entweder in @file{$HOME/.guix-profile/share/emacs/site-lisp/} oder in Unterverzeichnissen von @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/} gespeichert. Letzteres Verzeichnis gibt es, weil es Tausende von Emacs-Paketen gibt und sie alle im selben Verzeichnis zu speichern vielleicht nicht verlässlich funktioniert (wegen Namenskonflikten). Daher halten wir es für richtig, für jedes Paket ein anderes Verzeichnis zu benutzen. Das Emacs-Paketsystem organisiert die Dateistruktur ähnlich (siehe @ref{Package Files,,, emacs, The GNU Emacs Manual})." #. type: Plain text -#: doc/guix.texi:1747 +#: doc/guix.texi:1745 msgid "By default, Emacs (installed with Guix) ``knows'' where these packages are placed, so you do not need to perform any configuration. If, for some reason, you want to avoid auto-loading Emacs packages installed with Guix, you can do so by running Emacs with @code{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})." msgstr "Standardmäßig „weiß“ Emacs (wenn er mit Guix installiert wurde), wo diese Pakete liegen, Sie müssen also nichts selbst konfigurieren. Wenn Sie aber aus irgendeinem Grund mit Guix installierte Pakete nicht automatisch laden lassen möchten, können Sie Emacs mit der Befehlszeilenoption @code{--no-site-file} starten (siehe @ref{Init File,,, emacs, The GNU Emacs Manual})." #. type: subsection -#: doc/guix.texi:1748 +#: doc/guix.texi:1746 #, no-wrap msgid "The GCC toolchain" msgstr "GCC-Toolchain" #. type: cindex -#: doc/guix.texi:1750 +#: doc/guix.texi:1748 #, no-wrap msgid "GCC" msgstr "GCC" #. type: cindex -#: doc/guix.texi:1751 +#: doc/guix.texi:1749 #, no-wrap msgid "ld-wrapper" msgstr "ld-wrapper" #. type: Plain text -#: doc/guix.texi:1760 +#: doc/guix.texi:1758 msgid "Guix offers individual compiler packages such as @code{gcc} but if you are in need of a complete toolchain for compiling and linking source code what you really want is the @code{gcc-toolchain} package. This package provides a complete GCC toolchain for C/C++ development, including GCC itself, the GNU C Library (headers and binaries, plus debugging symbols in the @code{debug} output), Binutils, and a linker wrapper." msgstr "Guix bietet individuelle Compiler-Pakete wie etwa @code{gcc}, aber wenn Sie einen vollständigen Satz an Werkzeugen zum Kompilieren und Binden von Quellcode brauchen, werden Sie eigentlich das Paket @code{gcc-toolchain} haben wollen. Das Paket bietet eine vollständige GCC-Toolchain für die Entwicklung mit C/C++, einschließlich GCC selbst, der GNU-C-Bibliothek (Header-Dateien und Binärdateien samt Symbolen zur Fehlersuche/Debugging in der @code{debug}-Ausgabe), Binutils und einen Wrapper für den Binder/Linker." #. type: Plain text -#: doc/guix.texi:1766 +#: doc/guix.texi:1764 msgid "The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches passed to the linker, add corresponding @code{-rpath} arguments, and invoke the actual linker with this new set of arguments. You can instruct the wrapper to refuse to link against libraries not in the store by setting the @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}." msgstr "Der Zweck des Wrappers ist, die an den Binder übergebenen Befehlszeilenoptionen mit @code{-L} und @code{-l} zu überprüfen und jeweils passende Argumente mit @code{-rpath} anzufügen, womit dann der echte Binder aufgerufen wird. Standardmäßig weigert sich der Binder-Wrapper, mit Bibliotheken außerhalb des Stores zu binden, um „Reinheit“ zu gewährleisten. Das kann aber stören, wenn man die Toolchain benutzt, um mit lokalen Bibliotheken zu binden. Um Referenzen auf Bibliotheken außerhalb des Stores zu erlauben, müssen Sie die Umgebungsvariable @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} setzen." #. type: cindex -#: doc/guix.texi:1773 +#: doc/guix.texi:1771 #, no-wrap msgid "installing Guix System" msgstr "Installieren von Guix System" #. type: cindex -#: doc/guix.texi:1774 +#: doc/guix.texi:1772 #, no-wrap msgid "Guix System, installation" msgstr "Guix System, Installation" #. type: Plain text -#: doc/guix.texi:1779 +#: doc/guix.texi:1777 msgid "This section explains how to install Guix System on a machine. Guix, as a package manager, can also be installed on top of a running GNU/Linux system, @pxref{Installation}." msgstr "Dieser Abschnitt beschreibt, wie Sie „Guix System“ auf einer Maschine installieren. Guix kann auch als Paketverwaltungswerkzeug ein bestehendes GNU/Linux-System ergänzen, mehr dazu finden Sie im Abschnitt @ref{Installation}." #. type: quotation -#: doc/guix.texi:1788 +#: doc/guix.texi:1786 msgid "You are reading this documentation with an Info reader. For details on how to use it, hit the @key{RET} key (``return'' or ``enter'') on the link that follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}. Hit @kbd{l} afterwards to come back here." msgstr "Sie lesen diese Dokumentation mit einem Info-Betrachter. Details, wie Sie ihn bedienen, erfahren Sie, indem Sie die Eingabetaste (auch „Return“ oder „Enter“ genannt) auf folgender Verknüpfung drücken: @ref{Top, Info reader,, info-stnd, Stand-alone GNU Info}. Drücken Sie danach @kbd{l}, um hierher zurückzukommen." #. type: quotation -#: doc/guix.texi:1791 +#: doc/guix.texi:1789 msgid "Alternately, run @command{info info} in another tty to keep the manual available." msgstr "Führen Sie alternativ @command{info info} auf einer anderen Konsole (tty) aus, um dieses Handbuch offen zu lassen." #. type: Plain text -#: doc/guix.texi:1812 +#: doc/guix.texi:1810 msgid "We consider Guix System to be ready for a wide range of ``desktop'' and server use cases. The reliability guarantees it provides---transactional upgrades and rollbacks, reproducibility---make it a solid foundation." msgstr "Wir denken, dass Guix System für viele Anwendungszwecke von Heim- und Bürorechnern bis hin zu Servern geeignet ist. Die Verlässlichkeitsgarantien, die es einem bietet — transaktionelle Aktualisierungen und Rücksetzungen, Reproduzierbarkeit — machen es zu einer soliden Grundlage." #. type: Plain text -#: doc/guix.texi:1815 +#: doc/guix.texi:1813 msgid "Nevertheless, before you proceed with the installation, be aware of the following noteworthy limitations applicable to version @value{VERSION}:" msgstr "Bevor Sie mit der Installation fortfahren, sollten Sie dennoch die folgenden merklichen Einschränkungen der Version @value{VERSION} beachten:" #. type: itemize -#: doc/guix.texi:1819 +#: doc/guix.texi:1817 msgid "Support for the Logical Volume Manager (LVM) is missing." msgstr "Der Logical Volume Manager (LVM) wird nicht unterstützt." #. type: itemize -#: doc/guix.texi:1823 +#: doc/guix.texi:1821 msgid "More and more system services are provided (@pxref{Services}), but some may be missing." msgstr "Immer mehr Systemdienste sind verfügbar (siehe @ref{Services}), aber manche könnten noch fehlen." #. type: itemize -#: doc/guix.texi:1828 +#: doc/guix.texi:1826 msgid "GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}), as well as a number of X11 window managers. However, KDE is currently missing." msgstr "GNOME, Xfce, LXDE und Enlightenment stehen zur Verfügung (siehe @ref{Desktop Services}), ebenso eine Reihe von X11-Fensterverwaltungsprogrammen, allerdings fehlt KDE zur Zeit noch." #. type: Plain text -#: doc/guix.texi:1833 +#: doc/guix.texi:1831 msgid "More than a disclaimer, this is an invitation to report issues (and success stories!), and to join us in improving it. @xref{Contributing}, for more info." msgstr "Dies soll allerdings nicht nur ein Hinweis sein, sondern auch als Einladung aufgefasst werden, uns Fehler (und Erfolgsgeschichten!) zu melden und bei uns mitzumachen, um Guix zu verbessern. Siehe den Abschnitt @ref{Contributing}." #. type: cindex -#: doc/guix.texi:1838 +#: doc/guix.texi:1836 #, no-wrap msgid "hardware support on Guix System" msgstr "Hardwareunterstützung von Guix System" #. type: Plain text -#: doc/guix.texi:1847 +#: doc/guix.texi:1845 msgid "GNU@tie{}Guix focuses on respecting the user's computing freedom. It builds around the kernel Linux-libre, which means that only hardware for which free software drivers and firmware exist is supported. Nowadays, a wide range of off-the-shelf hardware is supported on GNU/Linux-libre---from keyboards to graphics cards to scanners and Ethernet controllers. Unfortunately, there are still areas where hardware vendors deny users control over their own computing, and such hardware is not supported on Guix System." msgstr "GNU@tie{}Guix legt den Fokus darauf, die Freiheit des Nutzers auf seinem Rechner zu respektieren. Es baut auf Linux-libre als Kernel auf, wodurch nur Hardware unterstützt wird, für die Treiber und Firmware existieren, die freie Software sind. Heutzutage wird ein großer Teil der handelsüblichen Hardware von GNU/Linux-libre unterstützt — von Tastaturen bis hin zu Grafikkarten, Scannern und Ethernet-Adaptern. Leider gibt es noch Bereiche, wo die Hardwareanbieter ihren Nutzern die Kontrolle über ihren eigenen Rechner verweigern. Solche Hardware wird von Guix System nicht unterstützt." #. type: cindex -#: doc/guix.texi:1848 +#: doc/guix.texi:1846 #, no-wrap msgid "WiFi, hardware support" msgstr "WLAN, Hardware-Unterstützung" #. type: Plain text -#: doc/guix.texi:1857 +#: doc/guix.texi:1855 msgid "One of the main areas where free drivers or firmware are lacking is WiFi devices. WiFi devices known to work include those using Atheros chips (AR9271 and AR7010), which corresponds to the @code{ath9k} Linux-libre driver, and those using Broadcom/AirForce chips (BCM43xx with Wireless-Core Revision 5), which corresponds to the @code{b43-open} Linux-libre driver. Free firmware exists for both and is available out-of-the-box on Guix System, as part of @code{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})." msgstr "Einer der wichtigsten Bereiche, wo es an freien Treibern und freier Firmware mangelt, sind WLAN-Geräte. WLAN-Geräte, von denen wir wissen, dass sie funktionieren, sind unter anderem solche, die die Atheros-Chips AR9271 und AR7010 verbauen, welche der Linux-libre-Treiber @code{ath9k} unterstützt, und die, die Broadcom/AirForce-Chips BCM43xx (mit Wireless-Core Revision 5) verbauen, welche der Linux-libre-Treiber @code{b43-open} unterstützt. Freie Firmware gibt es für beide und sie wird von Haus aus mit Guix System als ein Teil von @code{%base-firmware} mitgeliefert (siehe @ref{operating-system Reference, @code{firmware}})." #. type: cindex -#: doc/guix.texi:1858 +#: doc/guix.texi:1856 #, no-wrap msgid "RYF, Respects Your Freedom" msgstr "RYF, Respects Your Freedom" #. type: Plain text -#: doc/guix.texi:1864 +#: doc/guix.texi:1862 msgid "The @uref{https://www.fsf.org/, Free Software Foundation} runs @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a certification program for hardware products that respect your freedom and your privacy and ensure that you have control over your device. We encourage you to check the list of RYF-certified devices." msgstr "Die @uref{https://www.fsf.org/, Free Software Foundation} betreibt @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), ein Zertifizierungsprogramm für Hardware-Produkte, die Ihre Freiheit respektieren, Datenschutz gewährleisten und sicherstellen, dass Sie die Kontrolle über Ihr Gerät haben. Wir ermutigen Sie dazu, die Liste RYF-zertifizierter Geräte zu beachten." #. type: Plain text -#: doc/guix.texi:1868 +#: doc/guix.texi:1866 msgid "Another useful resource is the @uref{https://www.h-node.org/, H-Node} web site. It contains a catalog of hardware devices with information about their support in GNU/Linux." msgstr "Eine weitere nützliche Ressource ist die Website @uref{https://www.h-node.org/, H-Node}. Dort steht ein Katalog von Hardware-Geräten mit Informationen darüber, wie gut sie von GNU/Linux unterstützt werden." #. type: Plain text -#: doc/guix.texi:1877 +#: doc/guix.texi:1875 msgid "An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is one of:" msgstr "Sie können ein ISO-9660-Installationsabbild von @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{System}.iso.xz} herunterladen, dass Sie auf einen USB-Stick aufspielen oder auf eine DVD brennen können, wobei Sie für @var{System} eines der folgenden schreiben müssen:" #. type: table -#: doc/guix.texi:1881 +#: doc/guix.texi:1879 msgid "for a GNU/Linux system on Intel/AMD-compatible 64-bit CPUs;" msgstr "für ein GNU/Linux-System auf Intel/AMD-kompatiblen 64-Bit-Prozessoren," #. type: table -#: doc/guix.texi:1884 +#: doc/guix.texi:1882 msgid "for a 32-bit GNU/Linux system on Intel-compatible CPUs." msgstr "für ein 32-Bit-GNU/Linux-System auf Intel-kompatiblen Prozessoren." #. type: Plain text -#: doc/guix.texi:1889 +#: doc/guix.texi:1887 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines:" msgstr "Laden Sie auch die entsprechende @file{.sig}-Datei herunter und verifizieren Sie damit die Authentizität Ihres Abbilds, indem Sie diese Befehle eingeben:" #. type: example -#: doc/guix.texi:1893 +#: doc/guix.texi:1891 #, no-wrap msgid "" "$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n" @@ -5394,39 +5405,39 @@ msgstr "" "$ gpg --verify guix-system-install-@value{VERSION}.@var{System}.iso.xz.sig\n" #. type: Plain text -#: doc/guix.texi:1909 +#: doc/guix.texi:1907 msgid "This image contains the tools necessary for an installation. It is meant to be copied @emph{as is} to a large-enough USB stick or DVD." msgstr "Dieses Abbild enthält die Werkzeuge, die Sie zur Installation brauchen. Es ist dafür gedacht, @emph{so wie es ist} auf einen hinreichend großen USB-Stick oder eine DVD kopiert zu werden." #. type: unnumberedsubsec -#: doc/guix.texi:1910 +#: doc/guix.texi:1908 #, no-wrap msgid "Copying to a USB Stick" msgstr "Kopieren auf einen USB-Stick" #. type: Plain text -#: doc/guix.texi:1913 +#: doc/guix.texi:1911 msgid "To copy the image to a USB stick, follow these steps:" msgstr "Um das Abbild auf einen USB-Stick zu kopieren, führen Sie folgende Schritte durch:" #. type: enumerate -#: doc/guix.texi:1917 doc/guix.texi:1942 +#: doc/guix.texi:1915 doc/guix.texi:1940 msgid "Decompress the image using the @command{xz} command:" msgstr "Entpacken Sie das Abbild mit dem @command{xz}-Befehl:" #. type: example -#: doc/guix.texi:1920 doc/guix.texi:1945 +#: doc/guix.texi:1918 doc/guix.texi:1943 #, no-wrap msgid "xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz\n" msgstr "xz -d guix-system-install-@value{VERSION}.@var{System}.iso.xz\n" #. type: enumerate -#: doc/guix.texi:1926 +#: doc/guix.texi:1924 msgid "Insert a USB stick of 1@tie{}GiB or more into your machine, and determine its device name. Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with:" msgstr "Stecken Sie einen USB-Stick in Ihren Rechner ein, der mindestens 1@tie{}GiB groß ist, und bestimmen Sie seinen Gerätenamen. Ist der Gerätename des USB-Sticks @file{/dev/sdX}, dann kopieren Sie das Abbild mit dem Befehl:" #. type: example -#: doc/guix.texi:1930 +#: doc/guix.texi:1928 #, no-wrap msgid "" "dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX\n" @@ -5436,237 +5447,237 @@ msgstr "" "sync\n" #. type: enumerate -#: doc/guix.texi:1933 +#: doc/guix.texi:1931 msgid "Access to @file{/dev/sdX} usually requires root privileges." msgstr "Sie benötigen in der Regel Administratorrechte, um auf @file{/dev/sdX} zuzugreifen." #. type: unnumberedsubsec -#: doc/guix.texi:1935 +#: doc/guix.texi:1933 #, no-wrap msgid "Burning on a DVD" msgstr "Auf eine DVD brennen" #. type: Plain text -#: doc/guix.texi:1938 +#: doc/guix.texi:1936 msgid "To copy the image to a DVD, follow these steps:" msgstr "Um das Abbild auf eine DVD zu kopieren, führen Sie diese Schritte durch:" #. type: enumerate -#: doc/guix.texi:1951 +#: doc/guix.texi:1949 msgid "Insert a blank DVD into your machine, and determine its device name. Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with:" msgstr "Legen Sie eine unbespielte DVD in Ihren Rechner ein und bestimmen Sie ihren Gerätenamen. Angenommen der Name des DVD-Laufwerks ist @file{/dev/srX}, kopieren Sie das Abbild mit:" #. type: example -#: doc/guix.texi:1954 +#: doc/guix.texi:1952 #, no-wrap msgid "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso\n" msgstr "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{System}.iso\n" #. type: enumerate -#: doc/guix.texi:1957 +#: doc/guix.texi:1955 msgid "Access to @file{/dev/srX} usually requires root privileges." msgstr "Der Zugriff auf @file{/dev/srX} setzt in der Regel Administratorrechte voraus." #. type: unnumberedsubsec -#: doc/guix.texi:1959 +#: doc/guix.texi:1957 #, no-wrap msgid "Booting" msgstr "Das System starten" #. type: Plain text -#: doc/guix.texi:1964 +#: doc/guix.texi:1962 msgid "Once this is done, you should be able to reboot the system and boot from the USB stick or DVD. The latter usually requires you to get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick." msgstr "Sobald das erledigt ist, sollten Sie Ihr System neu starten und es vom USB-Stick oder der DVD hochfahren („booten“) können. Dazu müssen Sie wahrscheinlich beim Starten des Rechners in das BIOS- oder UEFI-Boot-Menü gehen, von wo aus Sie auswählen können, dass vom USB-Stick gebootet werden soll." #. type: Plain text -#: doc/guix.texi:1967 +#: doc/guix.texi:1965 msgid "@xref{Installing Guix in a VM}, if, instead, you would like to install Guix System in a virtual machine (VM)." msgstr "Lesen Sie den Abschnitt @ref{Installing Guix in a VM}, wenn Sie Guix System stattdessen in einer virtuellen Maschine (VM) installieren möchten." #. type: Plain text -#: doc/guix.texi:1977 +#: doc/guix.texi:1975 msgid "Once you have booted, you can use the guided graphical installer, which makes it easy to get started (@pxref{Guided Graphical Installation}). Alternately, if you are already familiar with GNU/Linux and if you want more control than what the graphical installer provides, you can choose the ``manual'' installation process (@pxref{Manual Installation})." msgstr "Wenn Sie Ihren Rechner gebootet haben, können Sie sich vom grafischen Installationsprogramm durch den Installationsvorgang führen lassen, was den Einstieg leicht macht (siehe @ref{Guided Graphical Installation}). Alternativ können Sie sich auch für einen „manuellen“ Installationsvorgang entscheiden, wenn Sie bereits mit GNU/Linux vertraut sind und mehr Kontrolle haben möchten, als sie das grafische Installationsprogramm bietet (siehe @ref{Manual Installation})." #. type: Plain text -#: doc/guix.texi:1985 +#: doc/guix.texi:1983 msgid "The graphical installer is available on TTY1. You can obtain root shells on TTYs 3 to 6 by hitting @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, etc. TTY2 shows this documentation and you can reach it with @kbd{ctrl-alt-f2}. Documentation is browsable using the Info reader commands (@pxref{Top,,, info-stnd, Stand-alone GNU Info}). The installation system runs the GPM mouse daemon, which allows you to select text with the left mouse button and to paste it with the middle button." msgstr "Das grafische Installationsprogramm steht Ihnen auf TTY1 zur Verfügung. Auf den TTYs 3 bis 6 können Sie vor sich eine Eingabeaufforderung für den Administratornutzer „root“ sehen, nachdem Sie @kbd{strg-alt-f3}, @kbd{strg-alt-f4} usw.@: gedrückt haben. TTY2 zeigt Ihnen dieses Handbuch, das Sie über die Tastenkombination @kbd{strg-alt-f2} erreichen. In dieser Dokumentation können Sie mit den Steuerungsbefehlen Ihres Info-Betrachters blättern (siehe @ref{Top,,, info-stnd, Stand-alone GNU Info}). Auf dem Installationssystem läuft der GPM-Maus-Daemon, wodurch Sie Text mit der linken Maustaste markieren und ihn mit der mittleren Maustaste einfügen können." #. type: quotation -#: doc/guix.texi:1990 +#: doc/guix.texi:1988 msgid "Installation requires access to the Internet so that any missing dependencies of your system configuration can be downloaded. See the ``Networking'' section below." msgstr "Für die Installation benötigen Sie Zugang zum Internet, damit fehlende Abhängigkeiten Ihrer Systemkonfiguration heruntergeladen werden können. Im Abschnitt „Netzwerkkonfiguration“ weiter unten finden Sie mehr Informationen dazu." #. type: Plain text -#: doc/guix.texi:1997 +#: doc/guix.texi:1995 msgid "The graphical installer is a text-based user interface. It will guide you, with dialog boxes, through the steps needed to install GNU@tie{}Guix System." msgstr "Das grafische Installationsprogramm ist mit einer textbasierten Benutzeroberfläche ausgestattet. Es kann Sie mit Dialogfeldern durch die Schritte führen, mit denen Sie GNU@tie{}Guix System installieren." #. type: Plain text -#: doc/guix.texi:2002 +#: doc/guix.texi:2000 msgid "The first dialog boxes allow you to set up the system as you use it during the installation: you can choose the language, keyboard layout, and set up networking, which will be used during the installation. The image below shows the networking dialog." msgstr "Die ersten Dialogfelder ermöglichen es Ihnen, das System aufzusetzen, wie Sie es bei der Installation benutzen: Sie können die Sprache und Tastaturbelegung festlegen und die Netzwerkanbindung einrichten, die während der Installation benutzt wird. Das folgende Bild zeigt den Dialog zur Einrichtung der Netzwerkanbindung." #. type: Plain text -#: doc/guix.texi:2004 +#: doc/guix.texi:2002 msgid "@image{images/installer-network,5in,, networking setup with the graphical installer}" msgstr "@image{images/installer-network,5in,, Netzwerkanbindung einrichten mit dem grafischen Installationsprogramm}" #. type: Plain text -#: doc/guix.texi:2009 +#: doc/guix.texi:2007 msgid "Later steps allow you to partition your hard disk, as shown in the image below, to choose whether or not to use encrypted file systems, to enter the host name and root password, and to create an additional account, among other things." msgstr "Mit den danach kommenden Schritten können Sie Ihre Festplatte partitionieren, wie im folgenden Bild gezeigt, und auswählen, ob Ihre Dateisysteme verschlüsselt werden sollen oder nicht. Sie können Ihren Rechnernamen und das Administratorpasswort (das „root“-Passwort) festlegen und ein Benutzerkonto einrichten, und noch mehr." #. type: Plain text -#: doc/guix.texi:2011 +#: doc/guix.texi:2009 msgid "@image{images/installer-partitions,5in,, partitioning with the graphical installer}" msgstr "@image{images/installer-partitions,5in,, Partitionieren mit dem grafischen Installationsprogramm}" #. type: Plain text -#: doc/guix.texi:2014 +#: doc/guix.texi:2012 msgid "Note that, at any time, the installer allows you to exit the current installation step and resume at a previous step, as show in the image below." msgstr "Beachten Sie, dass Sie mit dem Installationsprogramm jederzeit den aktuellen Installationsschritt verlassen und zu einem vorherigen Schritt zurückkehren können, wie Sie im folgenden Bild sehen können." #. type: Plain text -#: doc/guix.texi:2016 +#: doc/guix.texi:2014 msgid "@image{images/installer-resume,5in,, resuming the installation process}" msgstr "@image{images/installer-resume,5in,, Mit einem Installationsschritt fortfahren}" #. type: Plain text -#: doc/guix.texi:2021 +#: doc/guix.texi:2019 msgid "Once you're done, the installer produces an operating system configuration and displays it (@pxref{Using the Configuration System}). At that point you can hit ``OK'' and installation will proceed. On success, you can reboot into the new system and enjoy. @xref{After System Installation}, for what's next!" msgstr "Sobald Sie fertig sind, erzeugt das Installationsprogramm eine Betriebssystemkonfiguration und zeigt sie an (siehe @ref{Using the Configuration System}). Zu diesem Zeitpunkt können Sie auf „OK“ drücken und die Installation wird losgehen. Ist sie erfolgreich, können Sie neu starten und Ihr neues System genießen. Siehe @ref{After System Installation} für Informationen, wie es weitergeht!" #. type: Plain text -#: doc/guix.texi:2031 +#: doc/guix.texi:2029 msgid "This section describes how you would ``manually'' install GNU@tie{}Guix System on your machine. This option requires familiarity with GNU/Linux, with the shell, and with common administration tools. If you think this is not for you, consider using the guided graphical installer (@pxref{Guided Graphical Installation})." msgstr "Dieser Abschnitt beschreibt, wie Sie GNU@tie{}Guix System auf manuelle Weise auf Ihrer Maschine installieren. Diese Alternative setzt voraus, dass Sie bereits mit GNU/Linux, der Shell und üblichen Administrationswerkzeugen vertraut sind. Wenn Sie glauben, dass das nichts für Sie ist, dann möchten Sie vielleicht das geführte grafische Installationsprogramm benutzen (siehe @ref{Guided Graphical Installation})." #. type: Plain text -#: doc/guix.texi:2037 +#: doc/guix.texi:2035 msgid "The installation system provides root shells on TTYs 3 to 6; press @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, and so on to reach them. It includes many common tools needed to install the system. But it is also a full-blown Guix System, which means that you can install additional packages, should you need it, using @command{guix package} (@pxref{Invoking guix package})." msgstr "Das Installationssystem macht Eingabeaufforderungen auf den TTYs 3 bis 6 zugänglich, auf denen Sie als Administratornutzer Befehle eingeben können; Sie erreichen diese, indem Sie die Tastenkombinationen @kbd{strg-alt-f3}, @kbd{strg-alt-f4} und so weiter benutzen. Es enthält viele übliche Werkzeuge, mit denen Sie diese Aufgabe bewältigen können. Da es sich auch um ein vollständiges „Guix System“-System handelt, können Sie aber auch andere Pakete mit dem Befehl @command{guix package} nachinstallieren, wenn Sie sie brauchen (siehe @ref{Invoking guix package})." #. type: subsection -#: doc/guix.texi:2044 +#: doc/guix.texi:2042 #, no-wrap msgid "Keyboard Layout, Networking, and Partitioning" msgstr "Tastaturbelegung, Netzwerkanbindung und Partitionierung" #. type: Plain text -#: doc/guix.texi:2049 +#: doc/guix.texi:2047 msgid "Before you can install the system, you may want to adjust the keyboard layout, set up networking, and partition your target hard disk. This section will guide you through this." msgstr "Bevor Sie das System installieren können, wollen Sie vielleicht die Tastaturbelegung ändern, eine Netzwerkverbindung herstellen und die Zielfestplatte partitionieren. Dieser Abschnitt wird Sie durch diese Schritte führen." #. type: cindex -#: doc/guix.texi:2052 doc/guix.texi:11127 +#: doc/guix.texi:2050 doc/guix.texi:11125 #, no-wrap msgid "keyboard layout" msgstr "Tastaturbelegung" #. type: Plain text -#: doc/guix.texi:2056 +#: doc/guix.texi:2054 msgid "The installation image uses the US qwerty keyboard layout. If you want to change it, you can use the @command{loadkeys} command. For example, the following command selects the Dvorak keyboard layout:" msgstr "Das Installationsabbild verwendet die US-amerikanische QWERTY-Tastaturbelegung. Wenn Sie dies ändern möchten, können Sie den @command{loadkeys}-Befehl benutzen. Mit folgendem Befehl würden Sie zum Beispiel die Dvorak-Tastaturbelegung auswählen:" #. type: example -#: doc/guix.texi:2059 +#: doc/guix.texi:2057 #, no-wrap msgid "loadkeys dvorak\n" msgstr "loadkeys dvorak\n" #. type: Plain text -#: doc/guix.texi:2064 +#: doc/guix.texi:2062 msgid "See the files under @file{/run/current-system/profile/share/keymaps} for a list of available keyboard layouts. Run @command{man loadkeys} for more information." msgstr "Schauen Sie sich an, welche Dateien im Verzeichnis @file{/run/current-system/profile/share/keymaps} stehen, um eine Liste verfügbarer Tastaturbelegungen zu sehen. Wenn Sie mehr Informationen brauchen, führen Sie @command{man loadkeys} aus." #. type: subsubsection -#: doc/guix.texi:2065 +#: doc/guix.texi:2063 #, no-wrap msgid "Networking" msgstr "Netzwerkkonfiguration" #. type: Plain text -#: doc/guix.texi:2068 +#: doc/guix.texi:2066 msgid "Run the following command to see what your network interfaces are called:" msgstr "Führen Sie folgenden Befehl aus, um zu sehen, wie Ihre Netzwerkschnittstellen benannt sind:" #. type: example -#: doc/guix.texi:2071 +#: doc/guix.texi:2069 #, no-wrap msgid "ifconfig -a\n" msgstr "ifconfig -a\n" #. type: Plain text -#: doc/guix.texi:2075 +#: doc/guix.texi:2073 msgid "@dots{} or, using the GNU/Linux-specific @command{ip} command:" msgstr "…@: oder mit dem GNU/Linux-eigenen @command{ip}-Befehl:" #. type: example -#: doc/guix.texi:2078 +#: doc/guix.texi:2076 #, no-wrap msgid "ip a\n" msgstr "ip a\n" #. type: Plain text -#: doc/guix.texi:2085 +#: doc/guix.texi:2083 msgid "Wired interfaces have a name starting with @samp{e}; for example, the interface corresponding to the first on-board Ethernet controller is called @samp{eno1}. Wireless interfaces have a name starting with @samp{w}, like @samp{w1p2s0}." msgstr "Der Name kabelgebundener Schnittstellen (engl. Interfaces) beginnt mit dem Buchstaben @samp{e}, zum Beispiel heißt die dem ersten fest eingebauten Ethernet-Adapter entsprechende Schnittstelle @samp{eno1}. Drahtlose Schnittstellen werden mit einem Namen bezeichnet, der mit dem Buchstaben @samp{w} beginnt, etwa @samp{w1p2s0}." #. type: item -#: doc/guix.texi:2087 +#: doc/guix.texi:2085 #, no-wrap msgid "Wired connection" msgstr "Kabelverbindung" #. type: table -#: doc/guix.texi:2090 +#: doc/guix.texi:2088 msgid "To configure a wired network run the following command, substituting @var{interface} with the name of the wired interface you want to use." msgstr "Um ein kabelgebundenes Netzwerk einzurichten, führen Sie den folgenden Befehl aus, wobei Sie statt @var{Schnittstelle} den Namen der kabelgebundenen Schnittstelle eintippen, die Sie benutzen möchten." #. type: example -#: doc/guix.texi:2093 +#: doc/guix.texi:2091 #, no-wrap msgid "ifconfig @var{interface} up\n" msgstr "ifconfig @var{Schnittstelle} up\n" #. type: item -#: doc/guix.texi:2095 +#: doc/guix.texi:2093 #, no-wrap msgid "Wireless connection" msgstr "Drahtlose Verbindung" #. type: cindex -#: doc/guix.texi:2096 doc/guix.texi:12558 +#: doc/guix.texi:2094 doc/guix.texi:12556 #, no-wrap msgid "wireless" msgstr "WLAN" #. type: cindex -#: doc/guix.texi:2097 doc/guix.texi:12559 +#: doc/guix.texi:2095 doc/guix.texi:12557 #, no-wrap msgid "WiFi" msgstr "WiFi" #. type: table -#: doc/guix.texi:2102 +#: doc/guix.texi:2100 msgid "To configure wireless networking, you can create a configuration file for the @command{wpa_supplicant} configuration tool (its location is not important) using one of the available text editors such as @command{nano}:" msgstr "Um Drahtlosnetzwerke einzurichten, können Sie eine Konfigurationsdatei für das Konfigurationswerkzeug des @command{wpa_supplicant} schreiben (wo Sie sie speichern, ist nicht wichtig), indem Sie eines der verfügbaren Textbearbeitungsprogramme wie etwa @command{nano} benutzen:" #. type: example -#: doc/guix.texi:2105 +#: doc/guix.texi:2103 #, no-wrap msgid "nano wpa_supplicant.conf\n" msgstr "nano wpa_supplicant.conf\n" #. type: table -#: doc/guix.texi:2110 +#: doc/guix.texi:2108 msgid "As an example, the following stanza can go to this file and will work for many wireless networks, provided you give the actual SSID and passphrase for the network you are connecting to:" msgstr "Zum Beispiel können Sie die folgende Formulierung in der Datei speichern, die für viele Drahtlosnetzwerke funktioniert, sofern Sie die richtige SSID und Passphrase für das Netzwerk eingeben, mit dem Sie sich verbinden möchten:" #. type: example -#: doc/guix.texi:2117 +#: doc/guix.texi:2115 #, no-wrap msgid "" "network=@{\n" @@ -5682,184 +5693,184 @@ msgstr "" "@}\n" #. type: table -#: doc/guix.texi:2122 +#: doc/guix.texi:2120 msgid "Start the wireless service and run it in the background with the following command (substitute @var{interface} with the name of the network interface you want to use):" msgstr "Starten Sie den Dienst für Drahtlosnetzwerke und lassen Sie ihn im Hintergrund laufen, indem Sie folgenden Befehl eintippen (ersetzen Sie dabei @var{Schnittstelle} durch den Namen der Netzwerkschnittstelle, die Sie benutzen möchten):" #. type: example -#: doc/guix.texi:2125 +#: doc/guix.texi:2123 #, no-wrap msgid "wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B\n" msgstr "wpa_supplicant -c wpa_supplicant.conf -i @var{Schnittstelle} -B\n" #. type: table -#: doc/guix.texi:2128 +#: doc/guix.texi:2126 msgid "Run @command{man wpa_supplicant} for more information." msgstr "Führen Sie @command{man wpa_supplicant} aus, um mehr Informationen zu erhalten." #. type: cindex -#: doc/guix.texi:2130 +#: doc/guix.texi:2128 #, no-wrap msgid "DHCP" msgstr "DHCP" #. type: Plain text -#: doc/guix.texi:2133 +#: doc/guix.texi:2131 msgid "At this point, you need to acquire an IP address. On a network where IP addresses are automatically assigned @i{via} DHCP, you can run:" msgstr "Zu diesem Zeitpunkt müssen Sie sich eine IP-Adresse beschaffen. Auf einem Netzwerk, wo IP-Adressen automatisch @i{via} DHCP zugewiesen werden, können Sie das hier ausführen:" #. type: example -#: doc/guix.texi:2136 +#: doc/guix.texi:2134 #, no-wrap msgid "dhclient -v @var{interface}\n" msgstr "dhclient -v @var{Schnittstelle}\n" #. type: Plain text -#: doc/guix.texi:2139 +#: doc/guix.texi:2137 msgid "Try to ping a server to see if networking is up and running:" msgstr "Versuchen Sie, einen Server zu pingen, um zu prüfen, ob sie mit dem Internet verbunden sind und alles richtig funktioniert:" #. type: example -#: doc/guix.texi:2142 +#: doc/guix.texi:2140 #, no-wrap msgid "ping -c 3 gnu.org\n" msgstr "ping -c 3 gnu.org\n" #. type: Plain text -#: doc/guix.texi:2146 +#: doc/guix.texi:2144 msgid "Setting up network access is almost always a requirement because the image does not contain all the software and tools that may be needed." msgstr "Einen Internetzugang herzustellen, ist in jedem Fall nötig, weil das Abbild nicht alle Software und Werkzeuge enthält, die nötig sein könnten." #. type: cindex -#: doc/guix.texi:2147 +#: doc/guix.texi:2145 #, no-wrap msgid "installing over SSH" msgstr "Über SSH installieren" #. type: Plain text -#: doc/guix.texi:2150 +#: doc/guix.texi:2148 msgid "If you want to, you can continue the installation remotely by starting an SSH server:" msgstr "Wenn Sie möchten, können Sie die weitere Installation auch per Fernwartung durchführen, indem Sie einen SSH-Server starten:" #. type: example -#: doc/guix.texi:2153 +#: doc/guix.texi:2151 #, no-wrap msgid "herd start ssh-daemon\n" msgstr "herd start ssh-daemon\n" #. type: Plain text -#: doc/guix.texi:2157 +#: doc/guix.texi:2155 msgid "Make sure to either set a password with @command{passwd}, or configure OpenSSH public key authentication before logging in." msgstr "Vergewissern Sie sich vorher, dass Sie entweder ein Passwort mit @command{passwd} festgelegt haben, oder dass Sie für OpenSSH eine Authentifizierung über öffentliche Schlüssel eingerichtet haben, bevor Sie sich anmelden." #. type: subsubsection -#: doc/guix.texi:2158 +#: doc/guix.texi:2156 #, no-wrap msgid "Disk Partitioning" msgstr "Plattenpartitionierung" #. type: Plain text -#: doc/guix.texi:2162 +#: doc/guix.texi:2160 msgid "Unless this has already been done, the next step is to partition, and then format the target partition(s)." msgstr "Sofern nicht bereits geschehen, ist der nächste Schritt, zu partitionieren und dann die Zielpartition zu formatieren." #. type: Plain text -#: doc/guix.texi:2167 +#: doc/guix.texi:2165 msgid "The installation image includes several partitioning tools, including Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk}, and @command{cfdisk}. Run it and set up your disk with the partition layout you want:" msgstr "Auf dem Installationsabbild sind mehrere Partitionierungswerkzeuge zu finden, einschließlich (siehe @ref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk} und @command{cfdisk}. Starten Sie eines davon und partitionieren Sie Ihre Festplatte oder sonstigen Massenspeicher:" #. type: example -#: doc/guix.texi:2170 +#: doc/guix.texi:2168 #, no-wrap msgid "cfdisk\n" msgstr "cfdisk\n" #. type: Plain text -#: doc/guix.texi:2176 +#: doc/guix.texi:2174 msgid "If your disk uses the GUID Partition Table (GPT) format and you plan to install BIOS-based GRUB (which is the default), make sure a BIOS Boot Partition is available (@pxref{BIOS installation,,, grub, GNU GRUB manual})." msgstr "Wenn Ihre Platte mit einer „GUID Partition Table“ (GPT) formatiert ist, und Sie vorhaben, die BIOS-basierte Variante des GRUB-Bootloaders zu installieren (was der Vorgabe entspricht), stellen Sie sicher, dass eine Partition als BIOS-Boot-Partition ausgewiesen ist (siehe @ref{BIOS installation,,, grub, GNU GRUB manual})." #. type: cindex -#: doc/guix.texi:2177 +#: doc/guix.texi:2175 #, no-wrap msgid "EFI, installation" msgstr "EFI, Installation" #. type: cindex -#: doc/guix.texi:2178 +#: doc/guix.texi:2176 #, no-wrap msgid "UEFI, installation" msgstr "UEFI, Installation" #. type: cindex -#: doc/guix.texi:2179 +#: doc/guix.texi:2177 #, no-wrap msgid "ESP, EFI system partition" msgstr "ESP, EFI-Systempartition" #. type: Plain text -#: doc/guix.texi:2183 +#: doc/guix.texi:2181 msgid "If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System Partition} (ESP) is required. This partition can be mounted at @file{/boot/efi} for instance and must have the @code{esp} flag set. E.g., for @command{parted}:" msgstr "Falls Sie stattdessen einen EFI-basierten GRUB installieren möchten, muss auf der Platte eine FAT32-formatierte @dfn{EFI-Systempartition} (ESP) vorhanden sein. Diese Partition kann unter dem Pfad @file{/boot/efi} eingebunden („gemountet“) werden und die @code{esp}-Flag der Partition muss gesetzt sein. Dazu würden Sie beispielsweise in @command{parted} eintippen:" #. type: example -#: doc/guix.texi:2186 +#: doc/guix.texi:2184 #, no-wrap msgid "parted /dev/sda set 1 esp on\n" msgstr "parted /dev/sda set 1 esp on\n" #. type: vindex -#: doc/guix.texi:2189 doc/guix.texi:24067 +#: doc/guix.texi:2187 doc/guix.texi:24064 #, no-wrap msgid "grub-bootloader" msgstr "grub-bootloader" #. type: vindex -#: doc/guix.texi:2190 doc/guix.texi:24061 +#: doc/guix.texi:2188 doc/guix.texi:24058 #, no-wrap msgid "grub-efi-bootloader" msgstr "grub-efi-bootloader" #. type: quotation -#: doc/guix.texi:2197 +#: doc/guix.texi:2195 msgid "Unsure whether to use EFI- or BIOS-based GRUB? If the directory @file{/sys/firmware/efi} exists in the installation image, then you should probably perform an EFI installation, using @code{grub-efi-bootloader}. Otherwise you should use the BIOS-based GRUB, known as @code{grub-bootloader}. @xref{Bootloader Configuration}, for more info on bootloaders." msgstr "Falls Sie nicht wissen, ob Sie einen EFI- oder BIOS-basierten GRUB installieren möchten: Wenn bei Ihnen das Verzeichnis @file{/sys/firmware/efi} im Dateisystem existiert, möchten Sie vermutlich eine EFI-Installation durchführen, wozu Sie in Ihrer Konfiguration @code{grub-efi-bootloader} benutzen. Ansonsten sollten Sie den BIOS-basierten GRUB benutzen, der mit @code{grub-bootloader} bezeichnet wird. Siehe @ref{Bootloader Configuration}, wenn Sie mehr Informationen über Bootloader brauchen." #. type: Plain text -#: doc/guix.texi:2205 +#: doc/guix.texi:2203 msgid "Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently Guix System only supports ext4 and btrfs file systems. In particular, code that reads file system UUIDs and labels only works for these file system types.}. For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:" msgstr "Sobald Sie die Platte fertig partitioniert haben, auf die Sie installieren möchten, müssen Sie ein Dateisystem auf Ihrer oder Ihren für Guix System vorgesehenen Partition(en) erzeugen@footnote{Derzeit unterstützt Guix System nur die Dateisystemtypen ext4 und btrfs. Insbesondere funktioniert Guix-Code, der Dateisystem-UUIDs und -Labels ausliest, nur auf diesen Dateisystemtypen.}. Wenn Sie eine ESP brauchen und dafür die Partition @file{/dev/sda1} vorgesehen haben, müssen Sie diesen Befehl ausführen:" #. type: example -#: doc/guix.texi:2208 +#: doc/guix.texi:2206 #, no-wrap msgid "mkfs.fat -F32 /dev/sda1\n" msgstr "mkfs.fat -F32 /dev/sda1\n" #. type: Plain text -#: doc/guix.texi:2216 +#: doc/guix.texi:2214 msgid "Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations (@pxref{File Systems}). This is typically done using the @code{-L} option of @command{mkfs.ext4} and related commands. So, assuming the target root partition lives at @file{/dev/sda2}, a file system with the label @code{my-root} can be created with:" msgstr "Geben Sie Ihren Dateisystemen auch besser eine Bezeichnung („Label“), damit Sie sie zuverlässig wiedererkennen und später in den @code{file-system}-Deklarationen darauf Bezug nehmen können (siehe @ref{File Systems}). Dazu benutzen Sie typischerweise die Befehlszeilenoption @code{-L} des Befehls @command{mkfs.ext4} oder entsprechende Optionen für andere Befehle. Wenn wir also annehmen, dass @file{/dev/sda2} die Partition ist, auf der Ihr Wurzeldateisystem (englisch „root“) wohnen soll, können Sie dort mit diesem Befehl ein Dateisystem mit der Bezeichnung @code{my-root} erstellen:" #. type: example -#: doc/guix.texi:2219 +#: doc/guix.texi:2217 #, no-wrap msgid "mkfs.ext4 -L my-root /dev/sda2\n" msgstr "mkfs.ext4 -L my-root /dev/sda2\n" #. type: cindex -#: doc/guix.texi:2221 doc/guix.texi:10384 +#: doc/guix.texi:2219 doc/guix.texi:10382 #, no-wrap msgid "encrypted disk" msgstr "verschlüsselte Partition" #. type: Plain text -#: doc/guix.texi:2228 +#: doc/guix.texi:2226 msgid "If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information.) Assuming you want to store the root partition on @file{/dev/sda2}, the command sequence would be along these lines:" msgstr "Falls Sie aber vorhaben, die Partition mit dem Wurzeldateisystem zu verschlüsseln, können Sie dazu die Cryptsetup-/LUKS-Werkzeuge verwenden (siehe @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}}, um mehr darüber zu erfahren). Angenommen Sie wollen die Partition für das Wurzeldateisystem verschlüsselt auf @file{/dev/sda2} installieren, dann brauchen Sie eine Befehlsfolge ähnlich wie diese:" #. type: example -#: doc/guix.texi:2233 +#: doc/guix.texi:2231 #, no-wrap msgid "" "cryptsetup luksFormat /dev/sda2\n" @@ -5871,28 +5882,28 @@ msgstr "" "mkfs.ext4 -L my-root /dev/mapper/my-partition\n" #. type: Plain text -#: doc/guix.texi:2238 +#: doc/guix.texi:2236 msgid "Once that is done, mount the target file system under @file{/mnt} with a command like (again, assuming @code{my-root} is the label of the root file system):" msgstr "Sobald das erledigt ist, binden Sie dieses Dateisystem als Installationsziel mit dem Einhängepunkt @file{/mnt} ein, wozu Sie einen Befehl wie hier eintippen (auch hier unter der Annahme, dass @code{my-root} die Bezeichnung des künftigen Wurzeldateisystems ist):" #. type: example -#: doc/guix.texi:2241 +#: doc/guix.texi:2239 #, no-wrap msgid "mount LABEL=my-root /mnt\n" msgstr "mount LABEL=my-root /mnt\n" #. type: Plain text -#: doc/guix.texi:2247 +#: doc/guix.texi:2245 msgid "Also mount any other file systems you would like to use on the target system relative to this path. If you have opted for @file{/boot/efi} as an EFI mount point for example, mount it at @file{/mnt/boot/efi} now so it is found by @code{guix system init} afterwards." msgstr "Binden Sie auch alle anderen Dateisysteme ein, die Sie auf dem Zielsystem benutzen möchten, mit Einhängepunkten relativ zu diesem Pfad. Wenn Sie sich zum Beispiel für einen Einhängepunkt @file{/boot/efi} für die EFI-Systempartition entschieden haben, binden Sie sie jetzt als @file{/mnt/boot/efi} ein, damit @code{guix system init} sie später findet." #. type: Plain text -#: doc/guix.texi:2252 +#: doc/guix.texi:2250 msgid "Finally, if you plan to use one or more swap partitions (@pxref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), make sure to initialize them with @command{mkswap}. Assuming you have one swap partition on @file{/dev/sda3}, you would run:" msgstr "Wenn Sie zudem auch vorhaben, eine oder mehrere Swap-Partitionen zu benutzen (siehe @ref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), initialisieren Sie diese nun mit @command{mkswap}. Angenommen Sie haben eine Swap-Partition auf @file{/dev/sda3}, dann würde der Befehl so lauten:" #. type: example -#: doc/guix.texi:2256 +#: doc/guix.texi:2254 #, no-wrap msgid "" "mkswap /dev/sda3\n" @@ -5902,12 +5913,12 @@ msgstr "" "swapon /dev/sda3\n" #. type: Plain text -#: doc/guix.texi:2264 +#: doc/guix.texi:2262 msgid "Alternatively, you may use a swap file. For example, assuming that in the new system you want to use the file @file{/swapfile} as a swap file, you would run@footnote{This example will work for many types of file systems (e.g., ext4). However, for copy-on-write file systems (e.g., btrfs), the required steps may be different. For details, see the manual pages for @command{mkswap} and @command{swapon}.}:" msgstr "Alternativ können Sie eine Swap-Datei benutzen. Angenommen, Sie wollten die Datei @file{/swapdatei} im neuen System als eine Swapdatei benutzen, dann müssten Sie Folgendes ausführen@footnote{Dieses Beispiel wird auf vielen Arten von Dateisystemen funktionieren (z.B.@: auf ext4). Auf Dateisystemen mit Copy-on-Write (wie z.B.@: btrfs) können sich die nötigen Schritte unterscheiden. Details finden Sie in der Dokumentation auf den Handbuchseiten von @command{mkswap} und @command{swapon}.}:" #. type: example -#: doc/guix.texi:2272 +#: doc/guix.texi:2270 #, no-wrap msgid "" "# This is 10 GiB of swap space. Adjust \"count\" to change the size.\n" @@ -5925,38 +5936,38 @@ msgstr "" "swapon /mnt/swapfile\n" #. type: Plain text -#: doc/guix.texi:2277 +#: doc/guix.texi:2275 msgid "Note that if you have encrypted the root partition and created a swap file in its file system as described above, then the encryption also protects the swap file, just like any other file in that file system." msgstr "Bedenken Sie, dass, wenn Sie die Partition für das Wurzeldateisystem („root“) verschlüsselt und eine Swap-Datei in diesem Dateisystem wie oben beschrieben erstellt haben, die Verschlüsselung auch die Swap-Datei schützt, genau wie jede andere Datei in dem Dateisystem." #. type: Plain text -#: doc/guix.texi:2283 +#: doc/guix.texi:2281 msgid "With the target partitions ready and the target root mounted on @file{/mnt}, we're ready to go. First, run:" msgstr "Wenn die Partitionen des Installationsziels bereit sind und dessen Wurzeldateisystem unter @file{/mnt} eingebunden wurde, kann es losgehen mit der Installation. Führen Sie zuerst aus:" #. type: example -#: doc/guix.texi:2286 +#: doc/guix.texi:2284 #, no-wrap msgid "herd start cow-store /mnt\n" msgstr "herd start cow-store /mnt\n" #. type: Plain text -#: doc/guix.texi:2293 +#: doc/guix.texi:2291 msgid "This makes @file{/gnu/store} copy-on-write, such that packages added to it during the installation phase are written to the target disk on @file{/mnt} rather than kept in memory. This is necessary because the first phase of the @command{guix system init} command (see below) entails downloads or builds to @file{/gnu/store} which, initially, is an in-memory file system." msgstr "Dadurch wird @file{/gnu/store} copy-on-write, d.h.@: dorthin von Guix erstellte Pakete werden in ihrer Installationsphase auf dem unter @file{/mnt} befindlichen Zieldateisystem gespeichert, statt den Arbeitsspeicher auszulasten. Das ist nötig, weil die erste Phase des Befehls @command{guix system init} (siehe unten) viele Dateien nach @file{/gnu/store} herunterlädt oder sie erstellt, Änderungen am @file{/gnu/store} aber bis dahin wie das übrige Installationssystem nur im Arbeitsspeicher gelagert werden konnten." #. type: Plain text -#: doc/guix.texi:2304 +#: doc/guix.texi:2302 msgid "Next, you have to edit a file and provide the declaration of the operating system to be installed. To that end, the installation system comes with three text editors. We recommend GNU nano (@pxref{Top,,, nano, GNU nano Manual}), which supports syntax highlighting and parentheses matching; other editors include GNU Zile (an Emacs clone), and nvi (a clone of the original BSD @command{vi} editor). We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}. Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system." msgstr "Als Nächstes müssen Sie eine Datei bearbeiten und dort eine Deklaration des Betriebssystems, das Sie installieren möchten, hineinschreiben. Zu diesem Zweck sind im Installationssystem drei Texteditoren enthalten. Wir empfehlen, dass Sie GNU nano benutzen (siehe @ref{Top,,, nano, GNU nano Manual}), welcher Syntax und zueinander gehörende Klammern hervorheben kann. Andere mitgelieferte Texteditoren, die Sie benutzen können, sind GNU Zile (ein Emacs-Klon) und nvi (ein Klon des ursprünglichen @command{vi}-Editors von BSD). Wir empfehlen sehr, dass Sie diese Datei im Zieldateisystem der Installation speichern, etwa als @file{/mnt/etc/config.scm}, weil Sie Ihre Konfigurationsdatei im frisch installierten System noch brauchen werden." #. type: Plain text -#: doc/guix.texi:2311 +#: doc/guix.texi:2309 msgid "@xref{Using the Configuration System}, for an overview of the configuration file. The example configurations discussed in that section are available under @file{/etc/configuration} in the installation image. Thus, to get started with a system configuration providing a graphical display server (a ``desktop'' system), you can run something along these lines:" msgstr "Der Abschnitt @ref{Using the Configuration System} gibt einen Überblick über die Konfigurationsdatei. Die in dem Abschnitt diskutierten Beispielkonfigurationen sind im Installationsabbild im Verzeichnis @file{/etc/configuration} zu finden. Um also mit einer Systemkonfiguration anzufangen, die einen grafischen Anzeigeserver (einen „Display-Server“ zum Darstellen einer „Desktop“-Arbeitsumgebung) bietet, könnten Sie so etwas ausführen:" #. type: example -#: doc/guix.texi:2316 +#: doc/guix.texi:2314 #, no-wrap msgid "" "# mkdir /mnt/etc\n" @@ -5968,53 +5979,53 @@ msgstr "" "# nano /mnt/etc/config.scm\n" #. type: Plain text -#: doc/guix.texi:2320 +#: doc/guix.texi:2318 msgid "You should pay attention to what your configuration file contains, and in particular:" msgstr "Achten Sie darauf, was in Ihrer Konfigurationsdatei steht, und besonders auf Folgendes:" #. type: itemize -#: doc/guix.texi:2331 +#: doc/guix.texi:2329 msgid "Make sure the @code{bootloader-configuration} form refers to the target you want to install GRUB on. It should mention @code{grub-bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems. For legacy systems, the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path to a mounted EFI partition, like @code{/boot/efi}; do make sure the path is currently mounted and a @code{file-system} entry is specified in your configuration." msgstr "Ihre @code{bootloader-configuration}-Form muss sich auf dasjenige Ziel beziehen, auf das Sie GRUB installieren möchten. Sie sollte genau dann @code{grub-bootloader} nennen, wenn Sie GRUB im alten BIOS-Modus installieren, und für neuere UEFI-Systeme sollten Sie @code{grub-efi-bootloader} nennen. Bei Altsystemen bezeichnet das @code{target}-Feld ein Gerät wie @code{/dev/sda}, bei UEFI-Systemen bezeichnet es den Pfad zu einer eingebundenen EFI-Partition wie @code{/boot/efi}; stellen Sie sicher, dass die ESP tatsächlich dort eingebunden ist und ein @code{file-system}-Eintrag dafür in Ihrer Konfiguration festgelegt wurde." #. type: itemize -#: doc/guix.texi:2337 +#: doc/guix.texi:2335 msgid "Be sure that your file system labels match the value of their respective @code{device} fields in your @code{file-system} configuration, assuming your @code{file-system} configuration uses the @code{file-system-label} procedure in its @code{device} field." msgstr "Dateisystembezeichnungen müssen mit den jeweiligen @code{device}-Feldern in Ihrer @code{file-system}-Konfiguration übereinstimmen, sofern Sie in Ihrer @code{file-system}-Konfiguration die Prozedur @code{file-system-label} für ihre @code{device}-Felder benutzen." #. type: itemize -#: doc/guix.texi:2341 +#: doc/guix.texi:2339 msgid "If there are encrypted or RAID partitions, make sure to add a @code{mapped-devices} field to describe them (@pxref{Mapped Devices})." msgstr "Gibt es verschlüsselte Partitionen oder RAID-Partitionen, dann müssen sie im @code{mapped-devices}-Feld genannt werden (siehe @ref{Mapped Devices})." #. type: Plain text -#: doc/guix.texi:2346 +#: doc/guix.texi:2344 msgid "Once you are done preparing the configuration file, the new system must be initialized (remember that the target root file system is mounted under @file{/mnt}):" msgstr "Wenn Sie damit fertig sind, Ihre Konfigurationsdatei vorzubereiten, können Sie das neue System initialisieren (denken Sie daran, dass zukünftige Wurzeldateisystem muss unter @file{/mnt} wie bereits beschrieben eingebunden sein):" #. type: example -#: doc/guix.texi:2349 +#: doc/guix.texi:2347 #, no-wrap msgid "guix system init /mnt/etc/config.scm /mnt\n" msgstr "guix system init /mnt/etc/config.scm /mnt\n" #. type: Plain text -#: doc/guix.texi:2356 +#: doc/guix.texi:2354 msgid "This copies all the necessary files and installs GRUB on @file{/dev/sdX}, unless you pass the @option{--no-bootloader} option. For more information, @pxref{Invoking guix system}. This command may trigger downloads or builds of missing packages, which can take some time." msgstr "Dies kopiert alle notwendigen Dateien und installiert GRUB auf @file{/dev/sdX}, sofern Sie nicht noch die Befehlszeilenoption @option{--no-bootloader} benutzen. Weitere Informationen finden Sie im Abschnitt @ref{Invoking guix system}. Der Befehl kann das Herunterladen oder Erstellen fehlender Softwarepakete auslösen, was einige Zeit in Anspruch nehmen kann." #. type: Plain text -#: doc/guix.texi:2364 +#: doc/guix.texi:2362 msgid "Once that command has completed---and hopefully succeeded!---you can run @command{reboot} and boot into the new system. The @code{root} password in the new system is initially empty; other users' passwords need to be initialized by running the @command{passwd} command as @code{root}, unless your configuration specifies otherwise (@pxref{user-account-password, user account passwords}). @xref{After System Installation}, for what's next!" msgstr "Sobald der Befehl erfolgreich — hoffentlich! — durchgelaufen ist, können Sie mit dem Befehl @command{reboot} das neue System booten lassen. Der Administratornutzer @code{root} hat im neuen System zunächst ein leeres Passwort, und Passwörter der anderen Nutzer müssen Sie später setzen, indem Sie den Befehl @command{passwd} als @code{root} ausführen, außer Ihre Konfiguration enthält schon Passwörter (siehe @ref{user-account-password, user account passwords}). Siehe @ref{After System Installation} für Informationen, wie es weiter geht!" #. type: Plain text -#: doc/guix.texi:2371 +#: doc/guix.texi:2369 msgid "Success, you've now booted into Guix System! From then on, you can update the system whenever you want by running, say:" msgstr "Sie haben es geschafft: Sie haben Guix System erfolgreich gebootet! Von jetzt an können Sie Guix System aktualisieren, wann Sie möchten, indem Sie zum Beispiel das hier ausführen:" #. type: example -#: doc/guix.texi:2375 +#: doc/guix.texi:2373 #, no-wrap msgid "" "guix pull\n" @@ -6024,88 +6035,88 @@ msgstr "" "sudo guix system reconfigure /etc/config.scm\n" #. type: Plain text -#: doc/guix.texi:2381 +#: doc/guix.texi:2379 msgid "This builds a new system generation with the latest packages and services (@pxref{Invoking guix system}). We recommend doing that regularly so that your system includes the latest security updates (@pxref{Security Updates})." msgstr "Dadurch wird eine neue Systemgeneration aus den neuesten Paketen und Diensten erstellt (siehe @ref{Invoking guix system}). Wir empfehlen, diese Schritte regelmäßig zu wiederholen, damit Ihr System die aktuellen Sicherheitsaktualisierungen benutzt (siehe @ref{Security Updates})." #. type: cindex -#: doc/guix.texi:2384 +#: doc/guix.texi:2382 #, no-wrap msgid "sudo vs. @command{guix pull}" msgstr "sudo, Wirkung auf @command{guix pull}" #. type: quotation -#: doc/guix.texi:2388 +#: doc/guix.texi:2386 msgid "Note that @command{sudo guix} runs your user's @command{guix} command and @emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged. To explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}." msgstr "Beachten Sie, dass bei Nutzung von @command{sudo guix} der @command{guix}-Befehl des aktiven Benutzers ausgeführt wird und @emph{nicht} der des Administratornutzers „root“, weil @command{sudo} die Umgebungsvariable @code{PATH} unverändert lässt. Um ausdrücklich das @command{guix}-Programm des Administrators aufzurufen, müssen Sie @command{sudo -i guix …} eintippen." #. type: Plain text -#: doc/guix.texi:2392 +#: doc/guix.texi:2390 msgid "Join us on @code{#guix} on the Freenode IRC network or on @email{guix-devel@@gnu.org} to share your experience!" msgstr "Besuchen Sie uns auf @code{#guix} auf dem Freenode-IRC-Netzwerk oder auf der Mailing-Liste @file{guix-devel@@gnu.org}, um uns Rückmeldung zu geben!" #. type: section -#: doc/guix.texi:2395 +#: doc/guix.texi:2393 #, no-wrap msgid "Installing Guix in a Virtual Machine" msgstr "Guix in einer virtuellen Maschine installieren" #. type: cindex -#: doc/guix.texi:2397 +#: doc/guix.texi:2395 #, no-wrap msgid "virtual machine, Guix System installation" msgstr "virtuelle Maschine, Guix System installieren" #. type: cindex -#: doc/guix.texi:2398 +#: doc/guix.texi:2396 #, no-wrap msgid "virtual private server (VPS)" msgstr "Virtual Private Server (VPS)" #. type: cindex -#: doc/guix.texi:2399 +#: doc/guix.texi:2397 #, no-wrap msgid "VPS (virtual private server)" msgstr "VPS (Virtual Private Server)" #. type: Plain text -#: doc/guix.texi:2403 +#: doc/guix.texi:2401 msgid "If you'd like to install Guix System in a virtual machine (VM) or on a virtual private server (VPS) rather than on your beloved machine, this section is for you." msgstr "Wenn Sie Guix System auf einer virtuellen Maschine (VM) oder einem „Virtual Private Server“ (VPS) statt auf Ihrer echten Maschine installieren möchten, ist dieser Abschnitt hier richtig für Sie." #. type: Plain text -#: doc/guix.texi:2406 +#: doc/guix.texi:2404 msgid "To boot a @uref{https://qemu.org/,QEMU} VM for installing Guix System in a disk image, follow these steps:" msgstr "Um eine virtuelle Maschine für @uref{https://qemu.org/,QEMU} aufzusetzen, mit der Sie Guix System in ein „Disk-Image“ installieren können (also in eine Datei mit einem Abbild eines Plattenspeichers), gehen Sie so vor:" #. type: enumerate -#: doc/guix.texi:2411 +#: doc/guix.texi:2409 msgid "First, retrieve and decompress the Guix system installation image as described previously (@pxref{USB Stick and DVD Installation})." msgstr "Zunächst laden Sie das Installationsabbild des Guix-Systems wie zuvor beschrieben herunter und entpacken es (siehe @ref{USB Stick and DVD Installation})." #. type: enumerate -#: doc/guix.texi:2415 +#: doc/guix.texi:2413 msgid "Create a disk image that will hold the installed system. To make a qcow2-formatted disk image, use the @command{qemu-img} command:" msgstr "Legen Sie nun ein Disk-Image an, das das System nach der Installation enthalten soll. Um ein qcow2-formatiertes Disk-Image zu erstellen, benutzen Sie den Befehl @command{qemu-img}:" #. type: example -#: doc/guix.texi:2418 +#: doc/guix.texi:2416 #, no-wrap msgid "qemu-img create -f qcow2 guixsd.img 50G\n" msgstr "qemu-img create -f qcow2 guixsd.img 50G\n" #. type: enumerate -#: doc/guix.texi:2422 +#: doc/guix.texi:2420 msgid "The resulting file will be much smaller than 50 GB (typically less than 1 MB), but it will grow as the virtualized storage device is filled up." msgstr "Die Datei, die Sie herausbekommen, wird wesentlich kleiner als 50 GB sein (typischerweise kleiner als 1 MB), vergrößert sich aber, wenn der virtualisierte Speicher gefüllt wird." #. type: enumerate -#: doc/guix.texi:2425 +#: doc/guix.texi:2423 msgid "Boot the USB installation image in an VM:" msgstr "Starten Sie das USB-Installationsabbild auf einer virtuellen Maschine:" #. type: example -#: doc/guix.texi:2431 +#: doc/guix.texi:2429 #, no-wrap msgid "" "qemu-system-x86_64 -m 1024 -smp 1 \\\n" @@ -6119,38 +6130,38 @@ msgstr "" " -drive file=guixsd.img\n" #. type: enumerate -#: doc/guix.texi:2434 +#: doc/guix.texi:2432 msgid "The ordering of the drives matters." msgstr "Halten Sie obige Reihenfolge der @option{-drive}-Befehlszeilenoptionen für die Laufwerke ein." #. type: enumerate -#: doc/guix.texi:2438 +#: doc/guix.texi:2436 msgid "In the VM console, quickly press the @kbd{F12} key to enter the boot menu. Then press the @kbd{2} key and the @kbd{RET} key to validate your selection." msgstr "Drücken Sie auf der Konsole der virtuellen Maschine schnell die @kbd{F12}-Taste, um ins Boot-Menü zu gelangen. Drücken Sie dort erst die Taste @kbd{2} und dann die Eingabetaste @kbd{RET}, um Ihre Auswahl zu bestätigen." #. type: enumerate -#: doc/guix.texi:2442 +#: doc/guix.texi:2440 msgid "You're now root in the VM, proceed with the installation process. @xref{Preparing for Installation}, and follow the instructions." msgstr "Sie sind nun in der virtuellen Maschine als Administratornutzer @code{root} angemeldet und können mit der Installation wie gewohnt fortfahren. Folgen Sie der Anleitung im Abschnitt @ref{Preparing for Installation}." #. type: Plain text -#: doc/guix.texi:2447 +#: doc/guix.texi:2445 msgid "Once installation is complete, you can boot the system that's on your @file{guixsd.img} image. @xref{Running Guix in a VM}, for how to do that." msgstr "Wurde die Installation abgeschlossen, können Sie das System starten, das sich nun als Abbild in der Datei @file{guixsd.img} befindet. Der Abschnitt @ref{Running Guix in a VM} erklärt, wie Sie das tun können." #. type: cindex -#: doc/guix.texi:2451 +#: doc/guix.texi:2449 #, no-wrap msgid "installation image" msgstr "Installationsabbild" #. type: Plain text -#: doc/guix.texi:2454 +#: doc/guix.texi:2452 msgid "The installation image described above was built using the @command{guix system} command, specifically:" msgstr "Das oben beschriebene Installationsabbild wurde mit dem Befehl @command{guix system} erstellt, genauer gesagt mit:" #. type: example -#: doc/guix.texi:2458 +#: doc/guix.texi:2456 #, no-wrap msgid "" "guix system disk-image --file-system-type=iso9660 \\\n" @@ -6160,260 +6171,260 @@ msgstr "" " gnu/system/install.scm\n" #. type: Plain text -#: doc/guix.texi:2463 +#: doc/guix.texi:2461 msgid "Have a look at @file{gnu/system/install.scm} in the source tree, and see also @ref{Invoking guix system} for more information about the installation image." msgstr "Die Datei @file{gnu/system/install.scm} finden Sie im Quellbaum von Guix. Schauen Sie sich die Datei und auch den Abschnitt @ref{Invoking guix system} an, um mehr Informationen über das Installationsabbild zu erhalten." #. type: section -#: doc/guix.texi:2464 +#: doc/guix.texi:2462 #, no-wrap msgid "Building the Installation Image for ARM Boards" msgstr "Abbild zur Installation für ARM-Rechner erstellen" #. type: Plain text -#: doc/guix.texi:2468 +#: doc/guix.texi:2466 msgid "Many ARM boards require a specific variant of the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot} bootloader." msgstr "Viele ARM-Chips funktionieren nur mit ihrer eigenen speziellen Variante des @uref{https://www.denx.de/wiki/U-Boot/, U-Boot-Bootloaders}." #. type: Plain text -#: doc/guix.texi:2472 +#: doc/guix.texi:2470 msgid "If you build a disk image and the bootloader is not available otherwise (on another boot drive etc), it's advisable to build an image that includes the bootloader, specifically:" msgstr "Wenn Sie ein Disk-Image erstellen und der Bootloader nicht anderweitig schon installiert ist (auf einem anderen Laufwerk), ist es ratsam, ein Disk-Image zu erstellen, was den Bootloader enthält, mit dem Befehl:" #. type: example -#: doc/guix.texi:2475 +#: doc/guix.texi:2473 #, no-wrap msgid "guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n" msgstr "guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n" #. type: Plain text -#: doc/guix.texi:2479 +#: doc/guix.texi:2477 msgid "@code{A20-OLinuXino-Lime2} is the name of the board. If you specify an invalid board, a list of possible boards will be printed." msgstr "@code{A20-OLinuXino-Lime2} ist der Name des Chips. Wenn Sie einen ungültigen Namen eingeben, wird eine Liste möglicher Chip-Namen ausgegeben." #. type: cindex -#: doc/guix.texi:2484 +#: doc/guix.texi:2482 #, no-wrap msgid "packages" msgstr "Pakete" #. type: Plain text -#: doc/guix.texi:2489 +#: doc/guix.texi:2487 msgid "The purpose of GNU Guix is to allow users to easily install, upgrade, and remove software packages, without having to know about their build procedures or dependencies. Guix also goes beyond this obvious set of features." msgstr "Der Zweck von GNU Guix ist, Benutzern die leichte Installation, Aktualisierung und Entfernung von Software-Paketen zu ermöglichen, ohne dass sie ihre Erstellungsprozeduren oder Abhängigkeiten kennen müssen. Guix kann natürlich noch mehr als diese offensichtlichen Funktionalitäten." #. type: Plain text -#: doc/guix.texi:2497 +#: doc/guix.texi:2495 msgid "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 the Emacs-Guix 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):" msgstr "Dieses Kapitel beschreibt die Hauptfunktionalitäten von Guix, sowie die von Guix angebotenen Paketverwaltungswerkzeuge. Zusätzlich von den im Folgenden beschriebenen Befehlszeilen-Benutzerschnittstellen (siehe @ref{Invoking guix package, @code{guix package}}) können Sie auch mit der Emacs-Guix-Schnittstelle (siehe @ref{Top,,, emacs-guix, The Emacs-Guix Reference Manual}) arbeiten, nachdem Sie das Paket @code{emacs-guix} installiert haben (führen Sie zum Einstieg in Emacs-Guix den Emacs-Befehl @kbd{M-x guix-help} aus):" #. type: example -#: doc/guix.texi:2500 +#: doc/guix.texi:2498 #, no-wrap msgid "guix install emacs-guix\n" msgstr "guix install emacs-guix\n" #. type: Plain text -#: doc/guix.texi:2521 +#: doc/guix.texi:2519 msgid "When using Guix, each package ends up in the @dfn{package store}, in its own directory---something that resembles @file{/gnu/store/xxx-package-1.2}, where @code{xxx} is a base32 string." msgstr "Wenn Sie Guix benutzen, landet jedes Paket schließlich im @dfn{Paket-Store} in seinem eigenen Verzeichnis — der Name ist ähnlich wie @file{/gnu/store/xxx-package-1.2}, wobei @code{xxx} eine Zeichenkette in Base32-Darstellung ist." #. type: Plain text -#: doc/guix.texi:2526 +#: doc/guix.texi:2524 msgid "Instead of referring to these directories, users have their own @dfn{profile}, which points to the packages that they actually want to use. These profiles are stored within each user's home directory, at @code{$HOME/.guix-profile}." msgstr "Statt diese Verzeichnisse direkt anzugeben, haben Nutzer ihr eigenes @dfn{Profil}, welches auf diejenigen Pakete zeigt, die sie tatsächlich benutzen wollen. Diese Profile sind im Persönlichen Verzeichnis des jeweiligen Nutzers gespeichert als @code{$HOME/.guix-profile}." #. type: Plain text -#: doc/guix.texi:2534 +#: doc/guix.texi:2532 msgid "For example, @code{alice} installs GCC 4.7.2. As a result, @file{/home/alice/.guix-profile/bin/gcc} points to @file{/gnu/store/@dots{}-gcc-4.7.2/bin/gcc}. Now, on the same machine, @code{bob} had already installed GCC 4.8.0. The profile of @code{bob} simply continues to point to @file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC coexist on the same system without any interference." msgstr "Zum Beispiel installiert @code{alice} GCC 4.7.2. Dadurch zeigt dann @file{/home/alice/.guix-profile/bin/gcc} auf @file{/gnu/store/…-gcc-4.7.2/bin/gcc}. Auf demselben Rechner hat @code{bob} bereits GCC 4.8.0 installiert. Das Profil von @code{bob} zeigt dann einfach weiterhin auf @file{/gnu/store/…-gcc-4.8.0/bin/gcc} — d.h.@: beide Versionen von GCC koexistieren auf demselben System, ohne sich zu stören." #. type: Plain text -#: doc/guix.texi:2538 +#: doc/guix.texi:2536 msgid "The @command{guix package} command is the central tool to manage packages (@pxref{Invoking guix package}). It operates on the per-user profiles, and can be used @emph{with normal user privileges}." msgstr "Der Befehl @command{guix package} ist das zentrale Werkzeug, um Pakete zu verwalten (siehe @ref{Invoking guix package}). Es arbeitet auf dem eigenen Profil jedes Nutzers und kann @emph{mit normalen Benutzerrechten} ausgeführt werden." #. type: cindex -#: doc/guix.texi:2539 doc/guix.texi:2618 +#: doc/guix.texi:2537 doc/guix.texi:2616 #, no-wrap msgid "transactions" msgstr "Transaktionen" #. type: Plain text -#: doc/guix.texi:2546 +#: doc/guix.texi:2544 msgid "The command provides the obvious install, remove, and upgrade operations. Each invocation is actually a @emph{transaction}: either the specified operation succeeds, or nothing happens. Thus, if the @command{guix package} process is terminated during the transaction, or if a power outage occurs during the transaction, then the user's profile remains in its previous state, and remains usable." msgstr "Der Befehl stellt die offensichtlichen Installations-, Entfernungs- und Aktualisierungsoperationen zur Verfügung. Jeder Aufruf ist tatsächlich eine eigene @emph{Transaktion}: Entweder die angegebene Operation wird erfolgreich durchgeführt, oder gar nichts passiert. Wenn also der Prozess von @command{guix package} während der Transaktion beendet wird, oder es zum Stromausfall während der Transaktion kommt, dann bleibt der alte, nutzbare Zustands des Nutzerprofils erhalten." #. type: Plain text -#: doc/guix.texi:2554 +#: doc/guix.texi:2552 msgid "In addition, any package transaction may be @emph{rolled back}. So, if, for example, an upgrade installs a new version of a package that turns out to have a serious bug, users may roll back to the previous instance of their profile, which was known to work well. Similarly, the global system configuration on Guix is subject to transactional upgrades and roll-back (@pxref{Using the Configuration System})." msgstr "Zudem kann jede Pakettransaktion @emph{zurückgesetzt} werden (Rollback). Wird also zum Beispiel durch eine Aktualisierung eine neue Version eines Pakets installiert, die einen schwerwiegenden Fehler zur Folge hat, können Nutzer ihr Profil einfach auf die vorherige Profilinstanz zurücksetzen, von der sie wissen, dass sie gut lief. Ebenso unterliegt bei Guix auch die globale Systemkonfiguration transaktionellen Aktualisierungen und Rücksetzungen (siehe @ref{Using the Configuration System})." #. type: Plain text -#: doc/guix.texi:2561 +#: doc/guix.texi:2559 msgid "All packages in the package store may be @emph{garbage-collected}. Guix can determine which packages are still referenced by user profiles, and remove those that are provably no longer referenced (@pxref{Invoking guix gc}). Users may also explicitly remove old generations of their profile so that the packages they refer to can be collected." msgstr "Alle Pakete im Paket-Store können vom @emph{Müllsammler} (Garbage Collector) gelöscht werden. Guix ist in der Lage, festzustellen, welche Pakete noch durch Benutzerprofile referenziert werden, und entfernt nur diese, die nachweislich nicht mehr referenziert werden (siehe @ref{Invoking guix gc}). Benutzer können auch ausdrücklich alte Generationen ihres Profils löschen, damit die zugehörigen Pakete vom Müllsammler gelöscht werden können." #. type: cindex -#: doc/guix.texi:2562 doc/guix.texi:4089 +#: doc/guix.texi:2560 doc/guix.texi:4087 #, no-wrap msgid "reproducibility" msgstr "Reproduzierbarkeit" #. type: Plain text -#: doc/guix.texi:2574 +#: doc/guix.texi:2572 msgid "Guix takes a @dfn{purely functional} approach to package management, as described in the introduction (@pxref{Introduction}). Each @file{/gnu/store} package directory name contains a hash of all the inputs that were used to build that package---compiler, libraries, build scripts, etc. This direct correspondence allows users to make sure a given package installation matches the current state of their distribution. It also helps maximize @dfn{build reproducibility}: thanks to the isolated build environments that are used, a given build is likely to yield bit-identical files when performed on different machines (@pxref{Invoking guix-daemon, container})." msgstr "Guix verfolgt einen @dfn{rein funktionalen} Ansatz bei der Paketverwaltung, wie er in der Einleitung beschrieben wurde (siehe @ref{Introduction}). Jedes Paketverzeichnis im @file{/gnu/store} hat einen Hash all seiner bei der Erstellung benutzten Eingaben im Namen — Compiler, Bibliotheken, Erstellungs-Skripts etc. Diese direkte Entsprechung ermöglicht es Benutzern, eine Paketinstallation zu benutzen, die sicher dem aktuellen Stand ihrer Distribution entspricht. Sie maximiert auch die @dfn{Reproduzierbarkeit der Erstellungen} zu maximieren: Dank der isolierten Erstellungsumgebungen, die benutzt werden, resultiert eine Erstellung wahrscheinlich in bitweise identischen Dateien, auch wenn sie auf unterschiedlichen Maschinen durchgeführt wird (siehe @ref{Invoking guix-daemon, container})." #. type: Plain text -#: doc/guix.texi:2585 +#: doc/guix.texi:2583 msgid "This foundation allows Guix to support @dfn{transparent binary/source deployment}. When a pre-built binary for a @file{/gnu/store} item is available from an external source---a @dfn{substitute}, Guix just downloads it and unpacks it; otherwise, it builds the package from source, locally (@pxref{Substitutes}). Because build results are usually bit-for-bit reproducible, users do not have to trust servers that provide substitutes: they can force a local build and @emph{challenge} providers (@pxref{Invoking guix challenge})." msgstr "Auf dieser Grundlage kann Guix @dfn{transparent Binär- oder Quelldateien ausliefern}. Wenn eine vorerstellte Binärdatei für ein @file{/gnu/store}-Objekt von einer externen Quelle verfügbar ist — ein @dfn{Substitut} —, lädt Guix sie einfach herunter und entpackt sie, andernfalls erstellt Guix das Paket lokal aus seinem Quellcode (siehe @ref{Substitutes}). Weil Erstellungsergebnisse normalerweise Bit für Bit reproduzierbar sind, müssen die Nutzer den Servern, die Substitute anbieten, nicht blind vertrauen; sie können eine lokale Erstellung erzwingen und Substitute @emph{anfechten} (siehe @ref{Invoking guix challenge})." #. type: Plain text -#: doc/guix.texi:2591 +#: doc/guix.texi:2589 msgid "Control over the build environment is a feature that is also useful for developers. The @command{guix environment} command allows developers of a package to quickly set up the right development environment for their package, without having to manually install the dependencies of the package into their profile (@pxref{Invoking guix environment})." msgstr "Kontrolle über die Erstellungsumgebung ist eine auch für Entwickler nützliche Funktionalität. Der Befehl @command{guix environment} ermöglicht es Entwicklern eines Pakets, schnell die richtige Entwicklungsumgebung für ihr Paket einzurichten, ohne manuell die Abhängigkeiten des Pakets in ihr Profil installieren zu müssen (siehe @ref{Invoking guix environment})." #. type: cindex -#: doc/guix.texi:2592 +#: doc/guix.texi:2590 #, no-wrap msgid "replication, of software environments" msgstr "Nachbildung, von Software-Umgebungen" #. type: cindex -#: doc/guix.texi:2593 +#: doc/guix.texi:2591 #, no-wrap msgid "provenance tracking, of software artifacts" msgstr "Provenienzverfolgung, von Software-Artefakten" #. type: Plain text -#: doc/guix.texi:2600 +#: doc/guix.texi:2598 msgid "All of Guix and its package definitions is version-controlled, and @command{guix pull} allows you to ``travel in time'' on the history of Guix itself (@pxref{Invoking guix pull}). This makes it possible to replicate a Guix instance on a different machine or at a later point in time, which in turn allows you to @emph{replicate complete software environments}, while retaining precise @dfn{provenance tracking} of the software." msgstr "Ganz Guix und all seine Paketdefinitionen stehen unter Versionskontrolle und @command{guix pull} macht es möglich, auf dem Verlauf der Entwicklung von Guix selbst „in der Zeit zu reisen“ (siehe @ref{Invoking guix pull}). Dadurch kann eine Instanz von Guix auf einer anderen Maschine oder zu einem späteren Zeitpunkt genau nachgebildet werden, wodurch auch @emph{vollständige Software-Umgebungen gänzlich nachgebildet} werden können, mit genauer @dfn{Provenienzverfolgung}, wo diese Software herkommt." #. type: section -#: doc/guix.texi:2602 +#: doc/guix.texi:2600 #, no-wrap msgid "Invoking @command{guix package}" msgstr "Invoking @command{guix package}" #. type: cindex -#: doc/guix.texi:2604 +#: doc/guix.texi:2602 #, no-wrap msgid "installing packages" msgstr "Installieren von Paketen" #. type: cindex -#: doc/guix.texi:2605 +#: doc/guix.texi:2603 #, no-wrap msgid "removing packages" msgstr "Entfernen von Paketen" #. type: cindex -#: doc/guix.texi:2606 +#: doc/guix.texi:2604 #, no-wrap msgid "package installation" msgstr "Paketinstallation" #. type: cindex -#: doc/guix.texi:2607 +#: doc/guix.texi:2605 #, no-wrap msgid "package removal" msgstr "Paketentfernung" #. type: Plain text -#: doc/guix.texi:2613 +#: doc/guix.texi:2611 msgid "The @command{guix package} command is the tool that allows users to install, upgrade, and remove packages, as well as rolling back to previous configurations. It operates only on the user's own profile, and works with normal user privileges (@pxref{Features}). Its syntax is:" msgstr "Der Befehl @command{guix package} ist ein Werkzeug, womit Nutzer Pakete installieren, aktualisieren, entfernen und auf vorherige Konfigurationen zurücksetzen können. Dabei wird nur das eigene Profil des Nutzers verwendet, und es funktioniert mit normalen Benutzerrechten, ohne Administratorrechte (siehe @ref{Funktionalitäten}). Die Syntax ist:" #. type: example -#: doc/guix.texi:2616 +#: doc/guix.texi:2614 #, no-wrap msgid "guix package @var{options}\n" msgstr "guix package @var{Optionen}\n" #. type: Plain text -#: doc/guix.texi:2623 +#: doc/guix.texi:2621 msgid "Primarily, @var{options} specifies the operations to be performed during the transaction. Upon completion, a new profile is created, but previous @dfn{generations} of the profile remain available, should the user want to roll back." msgstr "In erster Linie geben die @var{Optionen} an, welche Operationen in der Transaktion durchgeführt werden sollen. Nach Abschluss wird ein neues Profil erzeugt, aber vorherige @dfn{Generationen} des Profils bleiben verfügbar, falls der Benutzer auf sie zurückwechseln will." #. type: Plain text -#: doc/guix.texi:2626 +#: doc/guix.texi:2624 msgid "For example, to remove @code{lua} and install @code{guile} and @code{guile-cairo} in a single transaction:" msgstr "Um zum Beispiel @code{lua} zu entfernen und @code{guile} und @code{guile-cairo} in einer einzigen Transaktion zu installieren:" #. type: example -#: doc/guix.texi:2629 +#: doc/guix.texi:2627 #, no-wrap msgid "guix package -r lua -i guile guile-cairo\n" msgstr "guix package -r lua -i guile guile-cairo\n" #. type: cindex -#: doc/guix.texi:2631 +#: doc/guix.texi:2629 #, no-wrap msgid "aliases, for @command{guix package}" msgstr "Alias-Namen für @command{guix package}" #. type: Plain text -#: doc/guix.texi:2633 +#: doc/guix.texi:2631 msgid "For your convenience, we also provide the following aliases:" msgstr "Um es Ihnen einfacher zu machen, bieten wir auch die folgenden Alias-Namen an:" #. type: itemize -#: doc/guix.texi:2637 +#: doc/guix.texi:2635 msgid "@command{guix search} is an alias for @command{guix package -s}," msgstr "@command{guix search} ist eine andere Schreibweise für @command{guix package -s}," #. type: itemize -#: doc/guix.texi:2639 +#: doc/guix.texi:2637 msgid "@command{guix install} is an alias for @command{guix package -i}," msgstr "@command{guix install} ist eine andere Schreibweise für @command{guix package -i}," #. type: itemize -#: doc/guix.texi:2641 +#: doc/guix.texi:2639 msgid "@command{guix remove} is an alias for @command{guix package -r}," msgstr "@command{guix remove} ist eine andere Schreibweise für @command{guix package -r}" #. type: itemize -#: doc/guix.texi:2643 +#: doc/guix.texi:2641 msgid "and @command{guix upgrade} is an alias for @command{guix package -u}." msgstr "und @command{guix upgrade} ist eine andere Schreibweise für @command{guix package -u}." #. type: Plain text -#: doc/guix.texi:2648 +#: doc/guix.texi:2646 msgid "These aliases are less expressive than @command{guix package} and provide fewer options, so in some cases you'll probably want to use @command{guix package} directly." msgstr "Diese Alias-Namen sind weniger ausdrucksstark als @command{guix package} und stellen weniger Befehlszeilenoptionen bereit, deswegen werden Sie vermutlich manchmal @command{guix package} direkt benutzen wollen." #. type: Plain text -#: doc/guix.texi:2653 +#: doc/guix.texi:2651 msgid "@command{guix package} also supports a @dfn{declarative approach} whereby the user specifies the exact set of packages to be available and passes it @i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--manifest}})." msgstr "@command{guix package} unterstützt auch ein @dfn{deklaratives Vorgehen}, wobei der Nutzer die genaue Menge an Paketen, die verfügbar sein sollen, festlegt und über die Befehlszeilenoption @option{--manifest} übergibt (siehe @ref{profile-manifest, @option{--manifest}})." #. type: cindex -#: doc/guix.texi:2654 +#: doc/guix.texi:2652 #, no-wrap msgid "profile" msgstr "Profil" #. type: Plain text -#: doc/guix.texi:2660 +#: doc/guix.texi:2658 msgid "For each user, a symlink to the user's default profile is automatically created in @file{$HOME/.guix-profile}. This symlink always points to the current generation of the user's default profile. Thus, users can add @file{$HOME/.guix-profile/bin} to their @code{PATH} environment variable, and so on." msgstr "Für jeden Benutzer wird automatisch eine symbolische Verknüpfung zu seinem Standardprofil angelegt als @file{$HOME/.guix-profile}. Diese symbolische Verknüpfung zeigt immer auf die aktuelle Generation des Standardprofils des Benutzers. Somit können Nutzer @file{$HOME/.guix-profile/bin} z.B.@: zu ihrer Umgebungsvariablen @code{PATH} hinzufügen." #. type: cindex -#: doc/guix.texi:2660 doc/guix.texi:2857 +#: doc/guix.texi:2658 doc/guix.texi:2855 #, no-wrap msgid "search paths" msgstr "Suchpfade" #. type: Plain text -#: doc/guix.texi:2665 +#: doc/guix.texi:2663 msgid "If you are not using Guix System, consider adding the following lines to your @file{~/.bash_profile} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}) so that newly-spawned shells get all the right environment variable definitions:" msgstr "Wenn Sie @emph{nicht} Guix System benutzen, sollten Sie in Betracht ziehen, folgende Zeilen zu Ihrem @file{~/.bash_profile} hinzuzufügen (siehe @ref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}), damit in neu erzeugten Shells alle Umgebungsvariablen richtig definiert werden:" #. type: example -#: doc/guix.texi:2669 +#: doc/guix.texi:2667 #, no-wrap msgid "" "GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\\n" @@ -6423,249 +6434,249 @@ msgstr "" "source \"$HOME/.guix-profile/etc/profile\"\n" #. type: Plain text -#: doc/guix.texi:2680 +#: doc/guix.texi:2678 msgid "In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to (@pxref{Invoking guix gc}). That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @code{--localstatedir}, and @var{user} is the user name. The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created by @command{guix package}." msgstr "Ist Ihr System für mehrere Nutzer eingerichtet, werden Nutzerprofile an einem Ort gespeichert, der als @dfn{Müllsammlerwurzel} registriert ist, auf die @file{$HOME/.guix-profile} zeigt (siehe @ref{Invoking guix gc}). Dieses Verzeichnis ist normalerweise @code{@var{localstatedir}/guix/profiles/per-user/@var{Benutzer}}, wobei @var{localstatedir} der an @code{configure} als @code{--localstatedir} übergebene Wert ist und @var{Benutzer} für den jeweiligen Benutzernamen steht. Das @file{per-user}-Verzeichnis wird erstellt, wenn @command{guix-daemon} gestartet wird, und das Unterverzeichnis @var{Benutzer} wird durch @command{guix package} erstellt." #. type: Plain text -#: doc/guix.texi:2682 +#: doc/guix.texi:2680 msgid "The @var{options} can be among the following:" msgstr "Als @var{Optionen} kann vorkommen:" #. type: item -#: doc/guix.texi:2685 +#: doc/guix.texi:2683 #, no-wrap msgid "--install=@var{package} @dots{}" msgstr "--install=@var{Paket} …" #. type: itemx -#: doc/guix.texi:2686 +#: doc/guix.texi:2684 #, no-wrap msgid "-i @var{package} @dots{}" msgstr "-i @var{Paket} …" #. type: table -#: doc/guix.texi:2688 +#: doc/guix.texi:2686 msgid "Install the specified @var{package}s." msgstr "Die angegebenen @var{Paket}e installieren." #. type: table -#: doc/guix.texi:2693 +#: doc/guix.texi:2691 msgid "Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter case, the newest version prefixed by @code{1.8} is selected.)" msgstr "Jedes @var{Paket} kann entweder einfach durch seinen Paketnamen aufgeführt werden, wie @code{guile}, oder als Paketname gefolgt von einem At-Zeichen @@ und einer Versionsnummer, wie @code{guile@@1.8.8} oder auch nur @code{guile@@1.8} (in letzterem Fall wird die neueste Version mit Präfix @code{1.8} ausgewählt.)" #. type: table -#: doc/guix.texi:2701 +#: doc/guix.texi:2699 msgid "If no version number is specified, the newest available version will be selected. In addition, @var{package} may contain a colon, followed by the name of one of the outputs of the package, as in @code{gcc:doc} or @code{binutils@@2.22:lib} (@pxref{Packages with Multiple Outputs}). Packages with a corresponding name (and optionally version) are searched for among the GNU distribution modules (@pxref{Package Modules})." msgstr "Wird keine Versionsnummer angegeben, wird die neueste verfügbare Version ausgewählt. Zudem kann im @var{Paket} ein Doppelpunkt auftauchen, gefolgt vom Namen einer der Ausgaben des Pakets, wie @code{gcc:doc} oder @code{binutils@@2.22:lib} (siehe @ref{Packages with Multiple Outputs}). Pakete mit zugehörigem Namen (und optional der Version) werden unter den Modulen der GNU-Distribution gesucht (siehe @ref{Package Modules})." #. type: cindex -#: doc/guix.texi:2702 +#: doc/guix.texi:2700 #, no-wrap msgid "propagated inputs" msgstr "propagierte Eingaben" #. type: table -#: doc/guix.texi:2708 +#: doc/guix.texi:2706 msgid "Sometimes packages have @dfn{propagated inputs}: these are dependencies that automatically get installed along with the required package (@pxref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects}, for information about propagated inputs in package definitions)." msgstr "Manchmal haben Pakete @dfn{propagierte Eingaben}: Als solche werden Abhängigkeiten bezeichnet, die automatisch zusammen mit dem angeforderten Paket installiert werden (im Abschnitt @ref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects} sind weitere Informationen über propagierte Eingaben in Paketdefinitionen zu finden)." #. type: anchor{#1} -#: doc/guix.texi:2715 +#: doc/guix.texi:2713 msgid "package-cmd-propagated-inputs" msgstr "package-cmd-propagated-inputs" #. type: table -#: doc/guix.texi:2715 +#: doc/guix.texi:2713 msgid "An example is the GNU MPC library: its C header files refer to those of the GNU MPFR library, which in turn refer to those of the GMP library. Thus, when installing MPC, the MPFR and GMP libraries also get installed in the profile; removing MPC also removes MPFR and GMP---unless they had also been explicitly installed by the user." msgstr "Ein Beispiel ist die GNU-MPC-Bibliothek: Ihre C-Headerdateien verweisen auf die der GNU-MPFR-Bibliothek, welche wiederum auf die der GMP-Bibliothek verweisen. Wenn also MPC installiert wird, werden auch die MPFR- und GMP-Bibliotheken in das Profil installiert; entfernt man MPC, werden auch MPFR und GMP entfernt — außer sie wurden noch auf andere Art ausdrücklich vom Nutzer installiert." #. type: table -#: doc/guix.texi:2720 +#: doc/guix.texi:2718 msgid "Besides, packages sometimes rely on the definition of environment variables for their search paths (see explanation of @code{--search-paths} below). Any missing or possibly incorrect environment variable definitions are reported here." msgstr "Abgesehen davon setzen Pakete manchmal die Definition von Umgebungsvariablen für ihre Suchpfade voraus (siehe die Erklärung von @code{--search-paths} weiter unten). Alle fehlenden oder womöglich falschen Definitionen von Umgebungsvariablen werden hierbei gemeldet." #. type: item -#: doc/guix.texi:2721 +#: doc/guix.texi:2719 #, no-wrap msgid "--install-from-expression=@var{exp}" msgstr "--install-from-expression=@var{Ausdruck}" #. type: itemx -#: doc/guix.texi:2722 +#: doc/guix.texi:2720 #, no-wrap msgid "-e @var{exp}" msgstr "-e @var{Ausdruck}" #. type: table -#: doc/guix.texi:2724 +#: doc/guix.texi:2722 msgid "Install the package @var{exp} evaluates to." msgstr "Das Paket installieren, zu dem der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:2729 +#: doc/guix.texi:2727 msgid "@var{exp} must be a Scheme expression that evaluates to a @code{} object. This option is notably useful to disambiguate between same-named variants of a package, with expressions such as @code{(@@ (gnu packages base) guile-final)}." msgstr "Beim @var{Ausdruck} muss es sich um einen Scheme-Ausdruck handeln, der zu einem @code{}-Objekt ausgewertet wird. Diese Option ist besonders nützlich, um zwischen gleichnamigen Varianten eines Pakets zu unterscheiden, durch Ausdrücke wie @code{(@@ (gnu packages base) guile-final)}." #. type: table -#: doc/guix.texi:2733 +#: doc/guix.texi:2731 msgid "Note that this option installs the first output of the specified package, which may be insufficient when needing a specific output of a multiple-output package." msgstr "Beachten Sie, dass mit dieser Option die erste Ausgabe des angegebenen Pakets installiert wird, was unzureichend sein kann, wenn eine bestimmte Ausgabe eines Pakets mit mehreren Ausgaben gewünscht ist." #. type: item -#: doc/guix.texi:2734 +#: doc/guix.texi:2732 #, no-wrap msgid "--install-from-file=@var{file}" msgstr "--install-from-file=@var{Datei}" #. type: itemx -#: doc/guix.texi:2735 doc/guix.texi:7985 +#: doc/guix.texi:2733 doc/guix.texi:7983 #, no-wrap msgid "-f @var{file}" msgstr "-f @var{Datei}" #. type: table -#: doc/guix.texi:2737 +#: doc/guix.texi:2735 msgid "Install the package that the code within @var{file} evaluates to." msgstr "Das Paket installieren, zu dem der Code in der @var{Datei} ausgewertet wird." #. type: table -#: doc/guix.texi:2740 doc/guix.texi:4526 +#: doc/guix.texi:2738 doc/guix.texi:4524 msgid "As an example, @var{file} might contain a definition like this (@pxref{Defining Packages}):" msgstr "Zum Beispiel könnte die @var{Datei} eine Definition wie diese enthalten (siehe @ref{Defining Packages}):" #. type: example -#: doc/guix.texi:2743 doc/guix.texi:7994 +#: doc/guix.texi:2741 doc/guix.texi:7992 #, no-wrap msgid "@verbatiminclude package-hello.scm\n" msgstr "@verbatiminclude package-hello.scm\n" #. type: table -#: doc/guix.texi:2749 +#: doc/guix.texi:2747 msgid "Developers may find it useful to include such a @file{guix.scm} file in the root of their project source tree that can be used to test development snapshots and create reproducible development environments (@pxref{Invoking guix environment})." msgstr "Entwickler könnten es für nützlich erachten, eine solche @file{guix.scm}-Datei im Quellbaum ihres Projekts abzulegen, mit der Zwischenstände der Entwicklung getestet und reproduzierbare Erstellungsumgebungen aufgebaut werden können (siehe @ref{Invoking guix environment})." #. type: item -#: doc/guix.texi:2750 +#: doc/guix.texi:2748 #, no-wrap msgid "--remove=@var{package} @dots{}" msgstr "--remove=@var{Paket} …" #. type: itemx -#: doc/guix.texi:2751 +#: doc/guix.texi:2749 #, no-wrap msgid "-r @var{package} @dots{}" msgstr "-r @var{Paket} …" #. type: table -#: doc/guix.texi:2753 +#: doc/guix.texi:2751 msgid "Remove the specified @var{package}s." msgstr "Die angegebenen @var{Paket}e entfernen." #. type: table -#: doc/guix.texi:2758 +#: doc/guix.texi:2756 msgid "As for @code{--install}, each @var{package} may specify a version number and/or output name in addition to the package name. For instance, @code{-r glibc:debug} would remove the @code{debug} output of @code{glibc}." msgstr "Wie auch bei @code{--install} kann jedes @var{Paket} neben dem Paketnamen auch eine Versionsnummer und/oder eine Ausgabe benennen. Zum Beispiel würde @code{-r glibc:debug} die @code{debug}-Ausgabe von @code{glibc} aus dem Profil entfernen." #. type: item -#: doc/guix.texi:2759 +#: doc/guix.texi:2757 #, no-wrap msgid "--upgrade[=@var{regexp} @dots{}]" msgstr "--upgrade[=@var{Regexp} …]" #. type: itemx -#: doc/guix.texi:2760 +#: doc/guix.texi:2758 #, no-wrap msgid "-u [@var{regexp} @dots{}]" msgstr "-u [@var{Regexp} …]" #. type: cindex -#: doc/guix.texi:2761 +#: doc/guix.texi:2759 #, no-wrap msgid "upgrading packages" msgstr "Pakete aktualisieren" #. type: table -#: doc/guix.texi:2765 +#: doc/guix.texi:2763 msgid "Upgrade all the installed packages. If one or more @var{regexp}s are specified, upgrade only installed packages whose name matches a @var{regexp}. Also see the @code{--do-not-upgrade} option below." msgstr "Alle installierten Pakete aktualisieren. Wenn einer oder mehr reguläre Ausdrücke (Regexps) angegeben wurden, werden nur diejenigen installierten Pakete aktualisiert, deren Name zu einer der @var{Regexp}s passt. Siehe auch weiter unten die Befehlszeilenoption @code{--do-not-upgrade}." #. type: table -#: doc/guix.texi:2770 +#: doc/guix.texi:2768 msgid "Note that this upgrades package to the latest version of packages found in the distribution currently installed. To update your distribution, you should regularly run @command{guix pull} (@pxref{Invoking guix pull})." msgstr "Beachten Sie, dass das Paket so auf die neueste Version unter den Paketen gebracht wird, die in der aktuell installierten Distribution vorliegen. Um jedoch Ihre Distribution zu aktualisieren, sollten Sie regelmäßig @command{guix pull} ausführen (siehe @ref{Invoking guix pull})." #. type: item -#: doc/guix.texi:2771 +#: doc/guix.texi:2769 #, no-wrap msgid "--do-not-upgrade[=@var{regexp} @dots{}]" msgstr "--do-not-upgrade[=@var{Regexp} …]" #. type: table -#: doc/guix.texi:2776 +#: doc/guix.texi:2774 msgid "When used together with the @code{--upgrade} option, do @emph{not} upgrade any packages whose name matches a @var{regexp}. For example, to upgrade all packages in the current profile except those containing the substring ``emacs'':" msgstr "In Verbindung mit der Befehlszeilenoption @code{--upgrade}, führe @emph{keine} Aktualisierung von Paketen durch, deren Name zum regulären Ausdruck @var{Regexp} passt. Um zum Beispiel alle Pakete im aktuellen Profil zu aktualisieren mit Ausnahme derer, die „emacs“ im Namen haben:" #. type: example -#: doc/guix.texi:2779 +#: doc/guix.texi:2777 #, no-wrap msgid "$ guix package --upgrade . --do-not-upgrade emacs\n" msgstr "$ guix package --upgrade . --do-not-upgrade emacs\n" #. type: anchor{#1} -#: doc/guix.texi:2781 +#: doc/guix.texi:2779 #, no-wrap msgid "profile-manifest" msgstr "profile-manifest" #. type: item -#: doc/guix.texi:2781 doc/guix.texi:4531 doc/guix.texi:4872 doc/guix.texi:8918 -#: doc/guix.texi:10101 +#: doc/guix.texi:2779 doc/guix.texi:4529 doc/guix.texi:4870 doc/guix.texi:8916 +#: doc/guix.texi:10099 #, no-wrap msgid "--manifest=@var{file}" msgstr "--manifest=@var{Datei}" #. type: itemx -#: doc/guix.texi:2782 doc/guix.texi:4532 doc/guix.texi:4873 doc/guix.texi:8919 +#: doc/guix.texi:2780 doc/guix.texi:4530 doc/guix.texi:4871 doc/guix.texi:8917 #, no-wrap msgid "-m @var{file}" msgstr "-m @var{Datei}" #. type: cindex -#: doc/guix.texi:2783 +#: doc/guix.texi:2781 #, no-wrap msgid "profile declaration" msgstr "Profildeklaration" #. type: cindex -#: doc/guix.texi:2784 +#: doc/guix.texi:2782 #, no-wrap msgid "profile manifest" msgstr "Profilmanifest" #. type: table -#: doc/guix.texi:2787 +#: doc/guix.texi:2785 msgid "Create a new generation of the profile from the manifest object returned by the Scheme code in @var{file}." msgstr "Erstellt eine neue Generation des Profils aus dem vom Scheme-Code in @var{Datei} gelieferten Manifest-Objekt." #. type: table -#: doc/guix.texi:2793 +#: doc/guix.texi:2791 msgid "This allows you to @emph{declare} the profile's contents rather than constructing it through a sequence of @code{--install} and similar commands. The advantage is that @var{file} can be put under version control, copied to different machines to reproduce the same profile, and so on." msgstr "Dadurch könnrn Sie den Inhalt des Profils @emph{deklarieren}, statt ihn durch eine Folge von Befehlen wie @code{--install} u.Ä. zu generieren. Der Vorteil ist, dass die @var{Datei} unter Versionskontrolle gestellt werden kann, auf andere Maschinen zum Reproduzieren desselben Profils kopiert werden kann und Ähnliches." #. type: table -#: doc/guix.texi:2797 +#: doc/guix.texi:2795 msgid "@var{file} must return a @dfn{manifest} object, which is roughly a list of packages:" msgstr "Der Code in der @var{Datei} muss ein @dfn{Manifest}-Objekt liefern, was ungefähr einer Liste von Paketen entspricht:" #. type: findex -#: doc/guix.texi:2798 +#: doc/guix.texi:2796 #, no-wrap msgid "packages->manifest" msgstr "packages->manifest" #. type: example -#: doc/guix.texi:2801 +#: doc/guix.texi:2799 #, no-wrap msgid "" "(use-package-modules guile emacs)\n" @@ -6675,7 +6686,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2807 +#: doc/guix.texi:2805 #, no-wrap msgid "" "(packages->manifest\n" @@ -6691,18 +6702,18 @@ msgstr "" " (list guile-2.0 \"debug\")))\n" #. type: findex -#: doc/guix.texi:2809 +#: doc/guix.texi:2807 #, no-wrap msgid "specifications->manifest" msgstr "specifications->manifest" #. type: table -#: doc/guix.texi:2816 +#: doc/guix.texi:2814 msgid "In this example we have to know which modules define the @code{emacs} and @code{guile-2.0} variables to provide the right @code{use-package-modules} line, which can be cumbersome. We can instead provide regular package specifications and let @code{specifications->manifest} look up the corresponding package objects, like this:" msgstr "In diesem Beispiel müssen wir wissen, welche Module die Variablen @code{emacs} und @code{guile-2.0} definieren, um die richtige Angabe mit @code{use-package-modules} machen zu können, was umständlich sein kann. Wir können auch normale Paketnamen angeben und sie durch @code{specifications->manifest} zu den entsprechenden Paketobjekten auflösen, zum Beispiel so:" #. type: example -#: doc/guix.texi:2820 +#: doc/guix.texi:2818 #, no-wrap msgid "" "(specifications->manifest\n" @@ -6712,121 +6723,121 @@ msgstr "" " '(\"emacs\" \"guile@@2.2\" \"guile@@2.2:debug\"))\n" #. type: item -#: doc/guix.texi:2822 +#: doc/guix.texi:2820 #, no-wrap msgid "--roll-back" msgstr "--roll-back" #. type: cindex -#: doc/guix.texi:2823 doc/guix.texi:24357 +#: doc/guix.texi:2821 doc/guix.texi:24354 #, no-wrap msgid "rolling back" msgstr "rücksetzen" #. type: cindex -#: doc/guix.texi:2824 +#: doc/guix.texi:2822 #, no-wrap msgid "undoing transactions" msgstr "Zurücksetzen von Transaktionen" #. type: cindex -#: doc/guix.texi:2825 +#: doc/guix.texi:2823 #, no-wrap msgid "transactions, undoing" msgstr "Transaktionen, zurücksetzen" #. type: table -#: doc/guix.texi:2828 +#: doc/guix.texi:2826 msgid "Roll back to the previous @dfn{generation} of the profile---i.e., undo the last transaction." msgstr "Wechselt zur vorherigen @dfn{Generation} des Profils zurück — d.h.@: macht die letzte Transaktion rückgängig." #. type: table -#: doc/guix.texi:2831 +#: doc/guix.texi:2829 msgid "When combined with options such as @code{--install}, roll back occurs before any other actions." msgstr "In Verbindung mit Befehlszeilenoptionen wie @code{--install} wird zuerst zurückgesetzt, bevor andere Aktionen durchgeführt werden." #. type: table -#: doc/guix.texi:2835 +#: doc/guix.texi:2833 msgid "When rolling back from the first generation that actually contains installed packages, the profile is made to point to the @dfn{zeroth generation}, which contains no files apart from its own metadata." msgstr "Ein Rücksetzen der ersten Generation, die installierte Pakete enthält, wechselt das Profil zur @dfn{nullten Generation}, die keinerlei Dateien enthält, abgesehen von Metadaten über sich selbst." #. type: table -#: doc/guix.texi:2839 +#: doc/guix.texi:2837 msgid "After having rolled back, installing, removing, or upgrading packages overwrites previous future generations. Thus, the history of the generations in a profile is always linear." msgstr "Nach dem Zurücksetzen überschreibt das Installieren, Entfernen oder Aktualisieren von Paketen vormals zukünftige Generationen, d.h.@: der Verlauf der Generationen eines Profils ist immer linear." #. type: item -#: doc/guix.texi:2840 +#: doc/guix.texi:2838 #, no-wrap msgid "--switch-generation=@var{pattern}" msgstr "--switch-generation=@var{Muster}" #. type: itemx -#: doc/guix.texi:2841 +#: doc/guix.texi:2839 #, no-wrap msgid "-S @var{pattern}" msgstr "-S @var{Muster}" #. type: cindex -#: doc/guix.texi:2842 doc/guix.texi:3038 doc/guix.texi:24315 +#: doc/guix.texi:2840 doc/guix.texi:3036 doc/guix.texi:24312 #, no-wrap msgid "generations" msgstr "Generationen" #. type: table -#: doc/guix.texi:2844 +#: doc/guix.texi:2842 msgid "Switch to a particular generation defined by @var{pattern}." msgstr "Wechselt zu der bestimmten Generation, die durch das @var{Muster} bezeichnet wird." #. type: table -#: doc/guix.texi:2850 +#: doc/guix.texi:2848 msgid "@var{pattern} may be either a generation number or a number prefixed with ``+'' or ``-''. The latter means: move forward/backward by a specified number of generations. For example, if you want to return to the latest generation after @code{--roll-back}, use @code{--switch-generation=+1}." msgstr "Als @var{Muster} kann entweder die Nummer einer Generation oder eine Nummer mit vorangestelltem „+“ oder „-“ dienen. Letzteres springt die angegebene Anzahl an Generationen vor oder zurück. Zum Beispiel kehrt @code{--switch-generation=+1} nach einem Zurücksetzen wieder zur neueren Generation zurück." #. type: table -#: doc/guix.texi:2855 +#: doc/guix.texi:2853 msgid "The difference between @code{--roll-back} and @code{--switch-generation=-1} is that @code{--switch-generation} will not make a zeroth generation, so if a specified generation does not exist, the current generation will not be changed." msgstr "Der Unterschied zwischen @code{--roll-back} und @code{--switch-generation=-1} ist, dass @code{--switch-generation} keine nullte Generation erzeugen wird; existiert die angegebene Generation nicht, bleibt schlicht die aktuelle Generation erhalten." #. type: item -#: doc/guix.texi:2856 +#: doc/guix.texi:2854 #, no-wrap msgid "--search-paths[=@var{kind}]" msgstr "--search-paths[=@var{Art}]" #. type: table -#: doc/guix.texi:2862 +#: doc/guix.texi:2860 msgid "Report environment variable definitions, in Bash syntax, that may be needed in order to use the set of installed packages. These environment variables are used to specify @dfn{search paths} for files used by some of the installed packages." msgstr "Führe die Definitionen von Umgebungsvariablen auf, in Bash-Syntax, die nötig sein könnten, um alle installierten Pakete nutzen zu können. Diese Umgebungsvariablen werden benutzt, um die @dfn{Suchpfade} für Dateien festzulegen, die von einigen installierten Paketen benutzt werden." #. type: table -#: doc/guix.texi:2870 +#: doc/guix.texi:2868 msgid "For example, GCC needs the @code{CPATH} and @code{LIBRARY_PATH} environment variables to be defined so it can look for headers and libraries in the user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). If GCC and, say, the C library are installed in the profile, then @code{--search-paths} will suggest setting these variables to @code{@var{profile}/include} and @code{@var{profile}/lib}, respectively." msgstr "Zum Beispiel braucht GCC die Umgebungsvariablen @code{CPATH} und @code{LIBRARY_PATH}, um zu wissen, wo sich im Benutzerprofil Header und Bibliotheken befinden (siehe @ref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). Wenn GCC und, sagen wir, die C-Bibliothek im Profil installiert sind, schlägt @code{--search-paths} also vor, diese Variablen jeweils auf @code{@var{profile}/include} und @code{@var{profile}/lib} verweisen zu lassen." #. type: table -#: doc/guix.texi:2873 +#: doc/guix.texi:2871 msgid "The typical use case is to define these environment variables in the shell:" msgstr "Die typische Nutzung ist, in der Shell diese Variablen zu definieren:" #. type: example -#: doc/guix.texi:2876 +#: doc/guix.texi:2874 #, no-wrap msgid "$ eval `guix package --search-paths`\n" msgstr "$ eval `guix package --search-paths`\n" #. type: table -#: doc/guix.texi:2882 +#: doc/guix.texi:2880 msgid "@var{kind} may be one of @code{exact}, @code{prefix}, or @code{suffix}, meaning that the returned environment variable definitions will either be exact settings, or prefixes or suffixes of the current value of these variables. When omitted, @var{kind} defaults to @code{exact}." msgstr "Als @var{Art} kann entweder @code{exact}, @code{prefix} oder @code{suffix} gewählt werden, wodurch die gelieferten Definitionen der Umgebungsvariablen entweder exakt die Einstellungen für Guix meldet, oder sie als Präfix oder Suffix an den aktuellen Wert dieser Variablen anhängt. Gibt man keine @var{Art} an, wird der Vorgabewert @code{exact} verwendet." #. type: table -#: doc/guix.texi:2885 +#: doc/guix.texi:2883 msgid "This option can also be used to compute the @emph{combined} search paths of several profiles. Consider this example:" msgstr "Diese Befehlszeilenoption kann auch benutzt werden, um die @emph{kombinierten} Suchpfade mehrerer Profile zu berechnen. Betrachten Sie dieses Beispiel:" #. type: example -#: doc/guix.texi:2890 +#: doc/guix.texi:2888 #, no-wrap msgid "" "$ guix package -p foo -i guile\n" @@ -6838,107 +6849,107 @@ msgstr "" "$ guix package -p foo -p bar --search-paths\n" #. type: table -#: doc/guix.texi:2895 +#: doc/guix.texi:2893 msgid "The last command above reports about the @code{GUILE_LOAD_PATH} variable, even though, taken individually, neither @file{foo} nor @file{bar} would lead to that recommendation." msgstr "Der letzte Befehl oben meldet auch die Definition der Umgebungsvariablen @code{GUILE_LOAD_PATH}, obwohl für sich genommen weder @file{foo} noch @file{bar} zu dieser Empfehlung führen würden." #. type: item -#: doc/guix.texi:2897 doc/guix.texi:3715 doc/guix.texi:4162 +#: doc/guix.texi:2895 doc/guix.texi:3713 doc/guix.texi:4160 #, no-wrap msgid "--profile=@var{profile}" msgstr "--profile=@var{Profil}" #. type: itemx -#: doc/guix.texi:2898 doc/guix.texi:3716 doc/guix.texi:4163 +#: doc/guix.texi:2896 doc/guix.texi:3714 doc/guix.texi:4161 #, no-wrap msgid "-p @var{profile}" msgstr "-p @var{Profil}" #. type: table -#: doc/guix.texi:2900 +#: doc/guix.texi:2898 msgid "Use @var{profile} instead of the user's default profile." msgstr "Auf @var{Profil} anstelle des Standardprofils des Benutzers arbeiten." #. type: cindex -#: doc/guix.texi:2901 +#: doc/guix.texi:2899 #, no-wrap msgid "collisions, in a profile" msgstr "Kollisionen, in einem Profil" #. type: cindex -#: doc/guix.texi:2902 +#: doc/guix.texi:2900 #, no-wrap msgid "colliding packages in profiles" msgstr "Paketkollisionen in Profilen" #. type: cindex -#: doc/guix.texi:2903 +#: doc/guix.texi:2901 #, no-wrap msgid "profile collisions" msgstr "Profilkollisionen" #. type: item -#: doc/guix.texi:2904 +#: doc/guix.texi:2902 #, no-wrap msgid "--allow-collisions" msgstr "--allow-collisions" #. type: table -#: doc/guix.texi:2906 +#: doc/guix.texi:2904 msgid "Allow colliding packages in the new profile. Use at your own risk!" msgstr "Kollidierende Pakete im neuen Profil zulassen. Benutzung auf eigene Gefahr!" #. type: table -#: doc/guix.texi:2910 +#: doc/guix.texi:2908 msgid "By default, @command{guix package} reports as an error @dfn{collisions} in the profile. Collisions happen when two or more different versions or variants of a given package end up in the profile." msgstr "Standardmäßig wird @command{guix package} @dfn{Kollisionen} als Fehler auffassen und melden. Zu Kollisionen kommt es, wenn zwei oder mehr verschiedene Versionen oder Varianten desselben Pakets im Profil landen." #. type: item -#: doc/guix.texi:2911 doc/guix.texi:3732 doc/guix.texi:4946 +#: doc/guix.texi:2909 doc/guix.texi:3730 doc/guix.texi:4944 #, no-wrap msgid "--bootstrap" msgstr "--bootstrap" #. type: table -#: doc/guix.texi:2914 +#: doc/guix.texi:2912 msgid "Use the bootstrap Guile to build the profile. This option is only useful to distribution developers." msgstr "Erstellt das Profil mit dem Bootstrap-Guile. Diese Option ist nur für Entwickler der Distribution nützlich." #. type: Plain text -#: doc/guix.texi:2920 +#: doc/guix.texi:2918 msgid "In addition to these actions, @command{guix package} supports the following options to query the current state of a profile, or the availability of packages:" msgstr "Zusätzlich zu diesen Aktionen unterstützt @command{guix package} folgende Befehlszeilenoptionen, um den momentanen Zustand eines Profils oder die Verfügbarkeit von Paketen nachzulesen:" #. type: item -#: doc/guix.texi:2923 +#: doc/guix.texi:2921 #, no-wrap msgid "--search=@var{regexp}" msgstr "--search=@var{Regexp}" #. type: itemx -#: doc/guix.texi:2924 +#: doc/guix.texi:2922 #, no-wrap msgid "-s @var{regexp}" msgstr "-s @var{Regexp}" #. type: cindex -#: doc/guix.texi:2925 +#: doc/guix.texi:2923 #, no-wrap msgid "searching for packages" msgstr "Suche nach Paketen" #. type: table -#: doc/guix.texi:2931 +#: doc/guix.texi:2929 msgid "List the available packages whose name, synopsis, or description matches @var{regexp} (in a case-insensitive fashion), sorted by relevance. Print all the metadata of matching packages in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." msgstr "Führt alle verfügbaren Pakete auf, deren Name, Zusammenfassung oder Beschreibung zum regulären Ausdruck @var{Regexp} passt, ohne Groß- und Kleinschreibung zu unterscheiden und sortiert nach ihrer Relevanz. Alle Metadaten passender Pakete werden im @code{recutils}-Format geliefert (siehe @ref{Top, GNU recutils databases,, recutils, GNU recutils manual})." #. type: table -#: doc/guix.texi:2934 +#: doc/guix.texi:2932 msgid "This allows specific fields to be extracted using the @command{recsel} command, for instance:" msgstr "So können bestimmte Felder mit dem Befehl @command{recsel} extrahiert werden, zum Beispiel:" #. type: example -#: doc/guix.texi:2940 +#: doc/guix.texi:2938 #, no-wrap msgid "" "$ guix package -s malloc | recsel -p name,version,relevance\n" @@ -6954,7 +6965,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2944 +#: doc/guix.texi:2942 #, no-wrap msgid "" "name: glibc\n" @@ -6968,7 +6979,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2948 +#: doc/guix.texi:2946 #, no-wrap msgid "" "name: libgc\n" @@ -6980,12 +6991,12 @@ msgstr "" "relevance: 1\n" #. type: table -#: doc/guix.texi:2952 +#: doc/guix.texi:2950 msgid "Similarly, to show the name of all the packages available under the terms of the GNU@tie{}LGPL version 3:" msgstr "Ebenso kann der Name aller zu den Bedingungen der GNU@tie{}LGPL, Version 3, verfügbaren Pakete ermittelt werden:" #. type: example -#: doc/guix.texi:2956 +#: doc/guix.texi:2954 #, no-wrap msgid "" "$ guix package -s \"\" | recsel -p name -e 'license ~ \"LGPL 3\"'\n" @@ -6997,7 +7008,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2959 +#: doc/guix.texi:2957 #, no-wrap msgid "" "name: gmp\n" @@ -7007,12 +7018,12 @@ msgstr "" "…\n" #. type: table -#: doc/guix.texi:2965 +#: doc/guix.texi:2963 msgid "It is also possible to refine search results using several @code{-s} flags to @command{guix package}, or several arguments to @command{guix search}. For example, the following command returns a list of board games (this time using the @command{guix search} alias):" msgstr "Es ist auch möglich, Suchergebnisse näher einzuschränken, indem Sie @code{-s} mehrmals an @command{guix package} übergeben, oder mehrere Argumente an @command{guix search} übergeben. Zum Beispiel liefert folgender Befehl eines Liste von Brettspielen:" #. type: example -#: doc/guix.texi:2970 +#: doc/guix.texi:2968 #, no-wrap msgid "" "$ guix search '\\' game | recsel -p name\n" @@ -7024,17 +7035,17 @@ msgstr "" "…\n" #. type: table -#: doc/guix.texi:2976 +#: doc/guix.texi:2974 msgid "If we were to omit @code{-s game}, we would also get software packages that deal with printed circuit boards; removing the angle brackets around @code{board} would further add packages that have to do with keyboards." msgstr "Würden wir @code{-s game} weglassen, bekämen wir auch Software-Pakete aufgelistet, die mit „printed circuit boards“ (elektronischen Leiterplatten) zu tun haben; ohne die spitzen Klammern um @code{board} bekämen wir auch Pakete, die mit „keyboards“ (Tastaturen, oder musikalischen Keyboard) zu tun haben." #. type: table -#: doc/guix.texi:2980 +#: doc/guix.texi:2978 msgid "And now for a more elaborate example. The following command searches for cryptographic libraries, filters out Haskell, Perl, Python, and Ruby libraries, and prints the name and synopsis of the matching packages:" msgstr "Es ist Zeit für ein komplexeres Beispiel. Folgender Befehl sucht kryptografische Bibliotheken, filtert Haskell-, Perl-, Python- und Ruby-Bibliotheken heraus und gibt Namen und Zusammenfassung passender Pakete aus:" #. type: example -#: doc/guix.texi:2984 +#: doc/guix.texi:2982 #, no-wrap msgid "" "$ guix search crypto library | \\\n" @@ -7044,23 +7055,23 @@ msgstr "" " recsel -e '! (name ~ \"^(ghc|perl|python|ruby)\")' -p name,synopsis\n" #. type: table -#: doc/guix.texi:2989 +#: doc/guix.texi:2987 msgid "@xref{Selection Expressions,,, recutils, GNU recutils manual}, for more information on @dfn{selection expressions} for @code{recsel -e}." msgstr "Siehe @ref{Selection Expressions,,, recutils, GNU recutils manual}, es enthält weitere Informationen über @dfn{Auswahlausdrücke} mit @code{recsel -e}." #. type: item -#: doc/guix.texi:2990 +#: doc/guix.texi:2988 #, no-wrap msgid "--show=@var{package}" msgstr "--show=@var{Paket}" #. type: table -#: doc/guix.texi:2994 +#: doc/guix.texi:2992 msgid "Show details about @var{package}, taken from the list of available packages, in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." msgstr "Zeigt Details über das @var{Paket} aus der Liste verfügbarer Pakete, im @code{recutils}-Format (siehe @ref{Top, GNU recutils databases,, recutils, GNU recutils manual})." #. type: example -#: doc/guix.texi:2999 +#: doc/guix.texi:2997 #, no-wrap msgid "" "$ guix package --show=python | recsel -p name,version\n" @@ -7074,7 +7085,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:3002 +#: doc/guix.texi:3000 #, no-wrap msgid "" "name: python\n" @@ -7084,12 +7095,12 @@ msgstr "" "version: 3.3.5\n" #. type: table -#: doc/guix.texi:3006 +#: doc/guix.texi:3004 msgid "You may also specify the full name of a package to only get details about a specific version of it:" msgstr "Sie können auch den vollständigen Namen eines Pakets angeben, um Details nur über diese Version angezeigt zu bekommen:" #. type: example -#: doc/guix.texi:3010 +#: doc/guix.texi:3008 #, no-wrap msgid "" "$ guix package --show=python@@3.4 | recsel -p name,version\n" @@ -7101,245 +7112,245 @@ msgstr "" "version: 3.4.3\n" #. type: item -#: doc/guix.texi:3014 +#: doc/guix.texi:3012 #, no-wrap msgid "--list-installed[=@var{regexp}]" msgstr "--list-installed[=@var{Regexp}]" #. type: itemx -#: doc/guix.texi:3015 +#: doc/guix.texi:3013 #, no-wrap msgid "-I [@var{regexp}]" msgstr "-I [@var{Regexp}]" #. type: table -#: doc/guix.texi:3019 +#: doc/guix.texi:3017 msgid "List the currently installed packages in the specified profile, with the most recently installed packages shown last. When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}." msgstr "Listet die derzeit installierten Pakete im angegebenen Profil auf, die zuletzt installierten Pakete zuletzt. Wenn ein regulärer Ausdruck @var{Regexp} angegeben wird, werden nur installierte Pakete aufgeführt, deren Name zu @var{Regexp} passt." #. type: table -#: doc/guix.texi:3025 +#: doc/guix.texi:3023 msgid "For each installed package, print the following items, separated by tabs: the package name, its version string, the part of the package that is installed (for instance, @code{out} for the default output, @code{include} for its headers, etc.), and the path of this package in the store." msgstr "Zu jedem installierten Paket werden folgende Informationen angezeigt, durch Tabulatorzeichen getrennt: der Paketname, die Version als Zeichenkette, welche Teile des Pakets installiert sind (zum Beispiel @code{out}, wenn die Standard-Paketausgabe installiert ist, @code{include}, wenn seine Header installiert sind, usw.)@: und an welchem Pfad das Paket im Store zu finden ist." #. type: item -#: doc/guix.texi:3026 +#: doc/guix.texi:3024 #, no-wrap msgid "--list-available[=@var{regexp}]" msgstr "--list-available[=@var{Regexp}]" #. type: itemx -#: doc/guix.texi:3027 +#: doc/guix.texi:3025 #, no-wrap msgid "-A [@var{regexp}]" msgstr "-A [@var{Regexp}]" #. type: table -#: doc/guix.texi:3031 +#: doc/guix.texi:3029 msgid "List packages currently available in the distribution for this system (@pxref{GNU Distribution}). When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}." msgstr "Listet Pakete auf, die in der aktuell installierten Distribution dieses Systems verfügbar sind (siehe @ref{GNU Distribution}). Wenn ein regulärer Ausdruck @var{Regexp} angegeben wird, werden nur Pakete aufgeführt, deren Name zum regulären Ausdruck @var{Regexp} passt." #. type: table -#: doc/guix.texi:3035 +#: doc/guix.texi:3033 msgid "For each package, print the following items separated by tabs: its name, its version string, the parts of the package (@pxref{Packages with Multiple Outputs}), and the source location of its definition." msgstr "Zu jedem Paket werden folgende Informationen getrennt durch Tabulatorzeichen ausgegeben: der Name, die Version als Zeichenkette, die Teile des Programms (siehe @ref{Packages with Multiple Outputs}) und die Stelle im Quellcode, an der das Paket definiert ist." #. type: item -#: doc/guix.texi:3036 doc/guix.texi:3705 +#: doc/guix.texi:3034 doc/guix.texi:3703 #, no-wrap msgid "--list-generations[=@var{pattern}]" msgstr "--list-generations[=@var{Muster}]" #. type: itemx -#: doc/guix.texi:3037 doc/guix.texi:3706 +#: doc/guix.texi:3035 doc/guix.texi:3704 #, no-wrap msgid "-l [@var{pattern}]" msgstr "-l [@var{Muster}]" #. type: table -#: doc/guix.texi:3043 +#: doc/guix.texi:3041 msgid "Return a list of generations along with their creation dates; for each generation, show the installed packages, with the most recently installed packages shown last. Note that the zeroth generation is never shown." msgstr "Liefert eine Liste der Generationen zusammen mit dem Datum, an dem sie erzeugt wurden; zu jeder Generation werden zudem die installierten Pakete angezeigt, zuletzt installierte Pakete zuletzt. Beachten Sie, dass die nullte Generation niemals angezeigt wird." #. type: table -#: doc/guix.texi:3048 +#: doc/guix.texi:3046 msgid "For each installed package, print the following items, separated by tabs: the name of a package, its version string, the part of the package that is installed (@pxref{Packages with Multiple Outputs}), and the location of this package in the store." msgstr "Zu jedem installierten Paket werden folgende Informationen durch Tabulatorzeichen getrennt angezeigt: der Name des Pakets, die Version als Zeichenkette, welcher Teil des Pakets installiert ist (siehe @ref{Packages with Multiple Outputs}) und an welcher Stelle sich das Paket im Store befindet." #. type: table -#: doc/guix.texi:3051 +#: doc/guix.texi:3049 msgid "When @var{pattern} is used, the command returns only matching generations. Valid patterns include:" msgstr "Wenn ein @var{Muster} angegeben wird, liefert der Befehl nur dazu passende Generationen. Gültige Muster sind zum Beispiel:" #. type: item -#: doc/guix.texi:3053 +#: doc/guix.texi:3051 #, no-wrap msgid "@emph{Integers and comma-separated integers}. Both patterns denote" msgstr "@emph{Ganze Zahlen und kommagetrennte ganze Zahlen}. Beide Muster bezeichnen" #. type: itemize -#: doc/guix.texi:3056 +#: doc/guix.texi:3054 msgid "generation numbers. For instance, @code{--list-generations=1} returns the first one." msgstr "Generationsnummern. Zum Beispiel liefert @code{--list-generations=1} die erste Generation." #. type: itemize -#: doc/guix.texi:3059 +#: doc/guix.texi:3057 msgid "And @code{--list-generations=1,8,2} outputs three generations in the specified order. Neither spaces nor trailing commas are allowed." msgstr "Durch @code{--list-generations=1,8,2} werden drei Generationen in der angegebenen Reihenfolge angezeigt. Weder Leerzeichen noch ein Komma am Schluss der Liste ist erlaubt." #. type: item -#: doc/guix.texi:3060 +#: doc/guix.texi:3058 #, no-wrap msgid "@emph{Ranges}. @code{--list-generations=2..9} prints the" msgstr "@emph{Bereiche}. @code{--list-generations=2..9} gibt die" #. type: itemize -#: doc/guix.texi:3063 +#: doc/guix.texi:3061 msgid "specified generations and everything in between. Note that the start of a range must be smaller than its end." msgstr "angegebenen Generationen und alles dazwischen aus. Beachten Sie, dass der Bereichsanfang eine kleinere Zahl als das Bereichsende sein muss." #. type: itemize -#: doc/guix.texi:3067 +#: doc/guix.texi:3065 msgid "It is also possible to omit the endpoint. For example, @code{--list-generations=2..}, returns all generations starting from the second one." msgstr "Sie können auch kein Bereichsende angeben, zum Beispiel liefert @code{--list-generations=2..} alle Generationen ab der zweiten." #. type: item -#: doc/guix.texi:3068 +#: doc/guix.texi:3066 #, no-wrap msgid "@emph{Durations}. You can also get the last @emph{N}@tie{}days, weeks," msgstr "@emph{Zeitdauern}. Sie können auch die letzten @emph{N}@tie{}Tage, Wochen" #. type: itemize -#: doc/guix.texi:3072 +#: doc/guix.texi:3070 msgid "or months by passing an integer along with the first letter of the duration. For example, @code{--list-generations=20d} lists generations that are up to 20 days old." msgstr "oder Monate angeben, indem Sie eine ganze Zahl gefolgt von jeweils „d“, „w“ oder „m“ angeben (dem ersten Buchstaben der Maßeinheit der Dauer im Englischen). Zum Beispiel listet @code{--list-generations=20d} die Generationen auf, die höchstens 20 Tage alt sind." #. type: item -#: doc/guix.texi:3074 +#: doc/guix.texi:3072 #, no-wrap msgid "--delete-generations[=@var{pattern}]" msgstr "--delete-generations[=@var{Muster}]" #. type: itemx -#: doc/guix.texi:3075 +#: doc/guix.texi:3073 #, no-wrap msgid "-d [@var{pattern}]" msgstr "-d [@var{Muster}]" #. type: table -#: doc/guix.texi:3078 +#: doc/guix.texi:3076 msgid "When @var{pattern} is omitted, delete all generations except the current one." msgstr "Wird kein @var{Muster} angegeben, werden alle Generationen außer der aktuellen entfernt." #. type: table -#: doc/guix.texi:3084 +#: doc/guix.texi:3082 msgid "This command accepts the same patterns as @option{--list-generations}. When @var{pattern} is specified, delete the matching generations. When @var{pattern} specifies a duration, generations @emph{older} than the specified duration match. For instance, @code{--delete-generations=1m} deletes generations that are more than one month old." msgstr "Dieser Befehl akzeptiert dieselben Muster wie @option{--list-generations}. Wenn ein @var{Muster} angegeben wird, werden die passenden Generationen gelöscht. Wenn das @var{Muster} für eine Zeitdauer steht, werden diejenigen Generationen gelöscht, die @emph{älter} als die angegebene Dauer sind. Zum Beispiel löscht @code{--delete-generations=1m} die Generationen, die mehr als einen Monat alt sind." #. type: table -#: doc/guix.texi:3087 +#: doc/guix.texi:3085 msgid "If the current generation matches, it is @emph{not} deleted. Also, the zeroth generation is never deleted." msgstr "Falls die aktuelle Generation zum Muster passt, wird sie @emph{nicht} gelöscht. Auch die nullte Generation wird niemals gelöscht." #. type: table -#: doc/guix.texi:3090 +#: doc/guix.texi:3088 msgid "Note that deleting generations prevents rolling back to them. Consequently, this command must be used with care." msgstr "Beachten Sie, dass Sie auf gelöschte Generationen nicht zurückwechseln können. Dieser Befehl sollte also nur mit Vorsicht benutzt werden." #. type: Plain text -#: doc/guix.texi:3101 +#: doc/guix.texi:3099 msgid "Finally, since @command{guix package} may actually start build processes, it supports all the common build options (@pxref{Common Build Options}). It also supports package transformation options, such as @option{--with-source} (@pxref{Package Transformation Options}). However, note that package transformations are lost when upgrading; to preserve transformations across upgrades, you should define your own package variant in a Guile module and add it to @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})." msgstr "Zu guter Letzt können Sie, da @command{guix package} Erstellungsprozesse zu starten vermag, auch alle gemeinsamen Erstellungsoptionen (siehe @ref{Common Build Options}) verwenden. Auch Paketumwandlungsoptionen wie @option{--with-source} sind möglich (siehe @ref{Package Transformation Options}). Beachten Sie jedoch, dass die verwendeten Paketumwandlungsoptionen verloren gehen, nachdem Sie die Pakete aktualisiert haben. Damit Paketumwandlungen über Aktualisierungen hinweg erhalten bleiben, sollten Sie Ihre eigene Paketvariante in einem Guile-Modul definieren und zur Umgebungsvariablen @code{GUIX_PACKAGE_PATH} hinzufügen (siehe @ref{Defining Packages})." #. type: cindex -#: doc/guix.texi:3106 +#: doc/guix.texi:3104 #, no-wrap msgid "pre-built binaries" msgstr "vorerstellte Binärdateien" #. type: Plain text -#: doc/guix.texi:3112 +#: doc/guix.texi:3110 msgid "Guix supports transparent source/binary deployment, which means that it can either build things locally, or download pre-built items from a server, or both. We call these pre-built items @dfn{substitutes}---they are substitutes for local build results. In many cases, downloading a substitute is much faster than building things locally." msgstr "Guix kann transparent Binär- oder Quelldateien ausliefern. Das heißt, Dinge können sowohl lokal erstellt, als auch als vorerstellte Objekte von einem Server heruntergeladen werden, oder beides gemischt. Wir bezeichnen diese vorerstellten Objekte als @dfn{Substitute} — sie substituieren lokale Erstellungsergebnisse. In vielen Fällen geht das Herunterladen eines Substituts wesentlich schneller, als Dinge lokal zu erstellen." #. type: Plain text -#: doc/guix.texi:3117 +#: doc/guix.texi:3115 msgid "Substitutes can be anything resulting from a derivation build (@pxref{Derivations}). Of course, in the common case, they are pre-built package binaries, but source tarballs, for instance, which also result from derivation builds, can be available as substitutes." msgstr "Substitute können alles sein, was das Ergebnis einer Ableitungserstellung ist (siehe @ref{Derivations}). Natürlich sind sie üblicherweise vorerstellte Paket-Binärdateien, aber wenn zum Beispiel ein Quell-Tarball das Ergebnis einer Ableitungserstellung ist, kann auch er als Substitut verfügbar sein." #. type: cindex -#: doc/guix.texi:3130 +#: doc/guix.texi:3128 #, no-wrap msgid "hydra" msgstr "Hydra" #. type: cindex -#: doc/guix.texi:3131 +#: doc/guix.texi:3129 #, no-wrap msgid "build farm" msgstr "Build-Farm" #. type: Plain text -#: doc/guix.texi:3141 +#: doc/guix.texi:3139 msgid "The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official build farm that builds packages from Guix continuously for some architectures, and makes them available as substitutes. This is the default source of substitutes; it can be overridden by passing the @option{--substitute-urls} option either to @command{guix-daemon} (@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}}) or to client tools such as @command{guix package} (@pxref{client-substitute-urls,, client @option{--substitute-urls} option})." msgstr "Der Server @code{@value{SUBSTITUTE-SERVER}} ist die Fassade für eine offizielle „Build-Farm“, ein Erstellungswerk, das kontinuierlich Guix-Pakete für einige Prozessorarchitekturen erstellt und sie als Substitute zur Verfügung stellt. Dies ist die standardmäßige Quelle von Substituten; durch Übergeben der Befehlszeilenoption @option{--substitute-urls} an entweder den @command{guix-daemon} (siehe @ref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}}) oder Client-Werkzeuge wie @command{guix package} (siehe @ref{client-substitute-urls,, die Befehlszeilenoption @option{--substitute-urls} beim Client}) kann eine abweichende Einstellung benutzt werden." #. type: Plain text -#: doc/guix.texi:3147 +#: doc/guix.texi:3145 msgid "Substitute URLs can be either HTTP or HTTPS. HTTPS is recommended because communications are encrypted; conversely, using HTTP makes all communications visible to an eavesdropper, who could use the information gathered to determine, for instance, whether your system has unpatched security vulnerabilities." msgstr "Substitut-URLs können entweder HTTP oder HTTPS sein. HTTPS wird empfohlen, weil die Kommunikation verschlüsselt ist; umgekehrt kann bei HTTP die Kommunikation belauscht werden, wodurch der Angreifer zum Beispiel erfahren könnte, ob Ihr System über noch nicht behobene Sicherheitsschwachstellen verfügt." #. type: Plain text -#: doc/guix.texi:3156 +#: doc/guix.texi:3154 msgid "Substitutes from the official build farm are enabled by default when using Guix System (@pxref{GNU Distribution}). However, they are disabled by default when using Guix on a foreign distribution, unless you have explicitly enabled them via one of the recommended installation steps (@pxref{Installation}). The following paragraphs describe how to enable or disable substitutes for the official build farm; the same procedure can also be used to enable substitutes for any other substitute server." msgstr "Substitute von der offiziellen Build-Farm sind standardmäßig erlaubt, wenn Sie Guix System verwenden (siehe @ref{GNU Distribution}). Auf Fremddistributionen sind sie allerdings standardmäßig ausgeschaltet, solange Sie sie nicht ausdrücklich in einem der empfohlenen Installationsschritte erlaubt haben (siehe @ref{Installation}). Die folgenden Absätze beschreiben, wie Sie Substitute für die offizielle Build-Farm an- oder ausschalten; dieselbe Prozedur kann auch benutzt werden, um Substitute für einen beliebigen anderen Substitutsserver zu erlauben." #. type: cindex -#: doc/guix.texi:3160 +#: doc/guix.texi:3158 #, no-wrap msgid "security" msgstr "Sicherheit" #. type: cindex -#: doc/guix.texi:3162 +#: doc/guix.texi:3160 #, no-wrap msgid "access control list (ACL), for substitutes" msgstr "Access Control List (ACL), für Substitute" #. type: cindex -#: doc/guix.texi:3163 +#: doc/guix.texi:3161 #, no-wrap msgid "ACL (access control list), for substitutes" msgstr "ACL (Access Control List), für Substitute" #. type: Plain text -#: doc/guix.texi:3170 +#: doc/guix.texi:3168 msgid "To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER}} or a mirror thereof, you must add its public key to the access control list (ACL) of archive imports, using the @command{guix archive} command (@pxref{Invoking guix archive}). Doing so implies that you trust @code{@value{SUBSTITUTE-SERVER}} to not be compromised and to serve genuine substitutes." msgstr "Um es Guix zu gestatten, Substitute von @code{@value{SUBSTITUTE-SERVER}} oder einem Spiegelserver davon herunterzuladen, müssen Sie den zugehörigen öffentlichen Schlüssel zur Access Control List (ACL, Zugriffssteuerungsliste) für Archivimporte hinzufügen, mit Hilfe des Befehls @command{guix archive} (siehe @ref{Invoking guix archive}). Dies impliziert, dass Sie darauf vertrauen, dass @code{@value{SUBSTITUTE-SERVER}} nicht kompromittiert wurde und echte Substitute liefert." #. type: Plain text -#: doc/guix.texi:3177 +#: doc/guix.texi:3175 msgid "The public key for @code{@value{SUBSTITUTE-SERVER}} is installed along with Guix, in @code{@var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub}, where @var{prefix} is the installation prefix of Guix. If you installed Guix from source, make sure you checked the GPG signature of @file{guix-@value{VERSION}.tar.gz}, which contains this public key file. Then, you can run something like this:" msgstr "Der öffentliche Schlüssel für @code{@value{SUBSTITUTE-SERVER}} wird zusammen mit Guix installiert, in das Verzeichnis @code{@var{prefix}/share/guix/hydra.gnu.org.pub}, wobei @var{prefix} das bei der Installation angegebene Präfix von Guix ist. Wenn Sie Guix aus seinem Quellcode heraus installieren, sollten Sie sichergehen, dass Sie die GPG-Signatur (auch „Beglaubigung“ genannt) von @file{guix-@value{VERSION}.tar.gz} prüfen, worin sich dieser öffentliche Schlüssel befindet. Dann können Sie so etwas wie hier ausführen:" #. type: example -#: doc/guix.texi:3180 +#: doc/guix.texi:3178 #, no-wrap msgid "# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub\n" msgstr "# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub\n" #. type: quotation -#: doc/guix.texi:3186 +#: doc/guix.texi:3184 msgid "Similarly, the @file{hydra.gnu.org.pub} file contains the public key of an independent build farm also run by the project, reachable at @indicateurl{https://mirror.hydra.gnu.org}." msgstr "Genauso enthält die Datei @file{hydra.gnu.org.pub} den öffentlichen Schlüssel für eine unabhängige Build-Farm, die auch vom Guix-Projekt betrieben wird. Sie ist unter @indicateurl{https://mirror.hydra.gnu.org} erreichbar ist." #. type: Plain text -#: doc/guix.texi:3190 +#: doc/guix.texi:3188 msgid "Once this is in place, the output of a command like @code{guix build} should change from something like:" msgstr "Sobald es eingerichtet wurde, sollte sich die Ausgabe eines Befehls wie @code{guix build} von so etwas:" #. type: example -#: doc/guix.texi:3199 +#: doc/guix.texi:3197 #, no-wrap msgid "" "$ guix build emacs --dry-run\n" @@ -7359,12 +7370,12 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:3203 +#: doc/guix.texi:3201 msgid "to something like:" msgstr "in so etwas verwandeln:" #. type: example -#: doc/guix.texi:3212 +#: doc/guix.texi:3210 #, no-wrap msgid "" "$ guix build emacs --dry-run\n" @@ -7384,590 +7395,590 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:3217 +#: doc/guix.texi:3215 msgid "This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when possible, for future builds." msgstr "Das zeigt an, dass Substitute von @code{@value{SUBSTITUTE-SERVER}} nutzbar sind und für zukünftige Erstellungen heruntergeladen werden, wann immer es möglich ist." #. type: cindex -#: doc/guix.texi:3218 +#: doc/guix.texi:3216 #, no-wrap msgid "substitutes, how to disable" msgstr "Substitute, wie man sie ausschaltet" #. type: Plain text -#: doc/guix.texi:3224 +#: doc/guix.texi:3222 msgid "The substitute mechanism can be disabled globally by running @code{guix-daemon} with @code{--no-substitutes} (@pxref{Invoking guix-daemon}). It can also be disabled temporarily by passing the @code{--no-substitutes} option to @command{guix package}, @command{guix build}, and other command-line tools." msgstr "Der Substitutsmechanismus kann global ausgeschaltet werden, indem Sie dem @code{guix-daemon} beim Starten die Befehlszeilenoption @code{--no-substitutes} übergeben (siehe @ref{Invoking guix-daemon}). Er kann auch temporär ausgeschaltet werden, indem Sie @code{--no-substitutes} an @command{guix package}, @command{guix build} und andere Befehlszeilenwerkzeuge übergeben." #. type: cindex -#: doc/guix.texi:3228 +#: doc/guix.texi:3226 #, no-wrap msgid "digital signatures" msgstr "digitale Signaturen" #. type: Plain text -#: doc/guix.texi:3232 +#: doc/guix.texi:3230 msgid "Guix detects and raises an error when attempting to use a substitute that has been tampered with. Likewise, it ignores substitutes that are not signed, or that are not signed by one of the keys listed in the ACL." msgstr "Guix erkennt, wenn ein verfälschtes Substitut benutzt würde, und meldet einen Fehler. Ebenso werden Substitute ignoriert, die nich signiert sind, oder nicht mit einem in der ACL aufgelisteten Schlüssel signiert sind." #. type: Plain text -#: doc/guix.texi:3238 +#: doc/guix.texi:3236 msgid "There is one exception though: if an unauthorized server provides substitutes that are @emph{bit-for-bit identical} to those provided by an authorized server, then the unauthorized server becomes eligible for downloads. For example, assume we have chosen two substitute servers with this option:" msgstr "Es gibt nur eine Ausnahme: Wenn ein unautorisierter Server Substitute anbietet, die @emph{Bit für Bit identisch} mit denen von einem autorisierten Server sind, können sie auch vom unautorisierten Server heruntergeladen werden. Zum Beispiel, angenommen wir haben zwei Substitutserver mit dieser Befehlszeilenoption ausgewählt:" #. type: example -#: doc/guix.texi:3241 +#: doc/guix.texi:3239 #, no-wrap msgid "--substitute-urls=\"https://a.example.org https://b.example.org\"\n" msgstr "--substitute-urls=\"https://a.example.org https://b.example.org\"\n" #. type: Plain text -#: doc/guix.texi:3252 +#: doc/guix.texi:3250 msgid "If the ACL contains only the key for @code{b.example.org}, and if @code{a.example.org} happens to serve the @emph{exact same} substitutes, then Guix will download substitutes from @code{a.example.org} because it comes first in the list and can be considered a mirror of @code{b.example.org}. In practice, independent build machines usually produce the same binaries, thanks to bit-reproducible builds (see below)." msgstr "Wenn in der ACL nur der Schlüssel für @code{b.example.org} aufgeführt wurde, aber @code{a.example.org} @emph{exakt dieselben} Substitute anbietet, wird Guix auch Substitute von @code{a.example.org} herunterladen, weil es in der Liste zuerst kommt und als Spiegelserver für @code{b.example.org} aufgefasst werden kann. In der Praxis haben unabhängige Maschinen bei der Erstellung normalerweise dieselben Binärdateien als Ergebnis, dank bit-reproduzierbarer Erstellungen (siehe unten)." #. type: Plain text -#: doc/guix.texi:3259 +#: doc/guix.texi:3257 msgid "When using HTTPS, the server's X.509 certificate is @emph{not} validated (in other words, the server is not authenticated), contrary to what HTTPS clients such as Web browsers usually do. This is because Guix authenticates substitute information itself, as explained above, which is what we care about (whereas X.509 certificates are about authenticating bindings between domain names and public keys.)" msgstr "Wenn Sie HTTPS benutzen, wird das X.509-Zertifikat des Servers @emph{nicht} validiert (mit anderen Worten, die Identität des Servers wird nicht authentifiziert), entgegen dem, was HTTPS-Clients wie Web-Browser normalerweise tun. Da Guix Substitutinformationen selbst überprüft, wie oben erklärt, wäre es unnötig (wohingegen mit X.509-Zertifikaten geprüft wird, ob ein Domain-Name zu öffentlichen Schlüsseln passt)." #. type: Plain text -#: doc/guix.texi:3271 +#: doc/guix.texi:3269 msgid "Substitutes are downloaded over HTTP or HTTPS. The @code{http_proxy} environment variable can be set in the environment of @command{guix-daemon} and is honored for downloads of substitutes. Note that the value of @code{http_proxy} in the environment where @command{guix build}, @command{guix package}, and other client commands are run has @emph{absolutely no effect}." msgstr "Substitute werden über HTTP oder HTTPS heruntergeladen. Die Umgebungsvariable @code{http_proxy} kann in der Umgebung von @command{guix-daemon} definiert werden und wirkt sich dann auf das Herunterladen von Substituten aus. Beachten Sie, dass der Wert von @code{http_proxy} in der Umgebung, in der @command{guix build}, @command{guix package} und andere Client-Befehle ausgeführt werden, @emph{keine Rolle spielt}." #. type: Plain text -#: doc/guix.texi:3280 +#: doc/guix.texi:3278 msgid "Even when a substitute for a derivation is available, sometimes the substitution attempt will fail. This can happen for a variety of reasons: the substitute server might be offline, the substitute may recently have been deleted, the connection might have been interrupted, etc." msgstr "Selbst wenn ein Substitut für eine Ableitung verfügbar ist, schlägt die versuchte Substitution manchmal fehl. Das kann aus vielen Gründen geschehen: die Substitutsserver könnten offline sein, das Substitut könnte kürzlich gelöscht worden sein, die Netzwerkverbindunge könnte unterbrochen worden sein, usw." #. type: Plain text -#: doc/guix.texi:3294 +#: doc/guix.texi:3292 msgid "When substitutes are enabled and a substitute for a derivation is available, but the substitution attempt fails, Guix will attempt to build the derivation locally depending on whether or not @code{--fallback} was given (@pxref{fallback-option,, common build option @code{--fallback}}). Specifically, if @code{--fallback} was omitted, then no local build will be performed, and the derivation is considered to have failed. However, if @code{--fallback} was given, then Guix will attempt to build the derivation locally, and the success or failure of the derivation depends on the success or failure of the local build. Note that when substitutes are disabled or no substitute is available for the derivation in question, a local build will @emph{always} be performed, regardless of whether or not @code{--fallback} was given." msgstr "Wenn Substitute aktiviert sind und ein Substitut für eine Ableitung zwar verfügbar ist, aber die versuchte Substitution fehlschlägt, kann Guix versuchen, die Ableitung lokal zu erstellen, je nachdem, ob @code{--fallback} übergeben wurde (siehe @ref{fallback-option,, common build option @code{--fallback}}). Genauer gesagt, wird keine lokale Erstellung durchgeführt, solange kein @code{--fallback} angegeben wurde, und die Ableitung wird als Fehlschlag angesehen. Wenn @code{--fallback} übergeben wurde, wird Guix versuchen, die Ableitung lokal zu erstellen, und ob die Ableitung erfolgreich ist oder nicht, hängt davon ab, ob die lokale Erstellung erfolgreich ist oder nicht. Beachten Sie, dass, falls Substitute ausgeschaltet oder erst gar kein Substitut verfügbar ist, @emph{immer} eine lokale Erstellung durchgeführt wird, egal ob @code{--fallback} übergeben wurde oder nicht." #. type: Plain text -#: doc/guix.texi:3299 +#: doc/guix.texi:3297 msgid "To get an idea of how many substitutes are available right now, you can try running the @command{guix weather} command (@pxref{Invoking guix weather}). This command provides statistics on the substitutes provided by a server." msgstr "Um eine Vorstellung zu bekommen, wieviele Substitute gerade verfügbar sind, können Sie den Befehl @command{guix weather} benutzen (siehe @ref{Invoking guix weather}). Dieser Befehl zeigt Statistiken darüber an, wie es um die von einem Server verfügbaren Substitute steht." #. type: cindex -#: doc/guix.texi:3303 +#: doc/guix.texi:3301 #, no-wrap msgid "trust, of pre-built binaries" msgstr "Vertrauen, gegenüber vorerstellten Binärdateien" #. type: Plain text -#: doc/guix.texi:3313 +#: doc/guix.texi:3311 msgid "Today, each individual's control over their own computing is at the mercy of institutions, corporations, and groups with enough power and determination to subvert the computing infrastructure and exploit its weaknesses. While using @code{@value{SUBSTITUTE-SERVER}} substitutes can be convenient, we encourage users to also build on their own, or even run their own build farm, such that @code{@value{SUBSTITUTE-SERVER}} is less of an interesting target. One way to help is by publishing the software you build using @command{guix publish} so that others have one more choice of server to download substitutes from (@pxref{Invoking guix publish})." msgstr "Derzeit hängt die Kontrolle jedes Individuums über seine Rechner von Institutionen, Unternehmen und solchen Gruppierungen ab, die über genug Macht und Entschlusskraft verfügen, die Rechnerinfrastruktur zu sabotieren und ihre Schwachstellen auszunutzen. Auch wenn es bequem ist, Substitute von @code{@value{SUBSTITUTE-SERVER}} zu benutzen, ermuntern wir Nutzer, auch selbst Erstellungen durchzuführen oder gar ihre eigene Build-Farm zu betreiben, damit @code{@value{SUBSTITUTE-SERVER}} ein weniger interessantes Ziel wird. Eine Art, uns zu helfen, ist, die von Ihnen erstellte Software mit dem Befehl @command{guix publish} zu veröffentlichen, damit andere eine größere Auswahl haben, von welchem Server sie Substitute beziehen möchten (siehe @ref{Invoking guix publish})." #. type: Plain text -#: doc/guix.texi:3325 +#: doc/guix.texi:3323 msgid "Guix has the foundations to maximize build reproducibility (@pxref{Features}). In most cases, independent builds of a given package or derivation should yield bit-identical results. Thus, through a diverse set of independent package builds, we can strengthen the integrity of our systems. The @command{guix challenge} command aims to help users assess substitute servers, and to assist developers in finding out about non-deterministic package builds (@pxref{Invoking guix challenge}). Similarly, the @option{--check} option of @command{guix build} allows users to check whether previously-installed substitutes are genuine by rebuilding them locally (@pxref{build-check, @command{guix build --check}})." msgstr "Guix hat die richtigen Grundlagen, um die Reproduzierbarkeit von Erstellungen zu maximieren (siehe @ref{Features}). In den meisten Fällen sollten unabhängige Erstellungen eines bestimmten Pakets zu bitweise identischen Ergebnissen führen. Wir können also mit Hilfe einer vielschichtigen Menge an unabhängigen Paketerstellungen die Integrität unseres Systems besser gewährleisten. Der Befehl @command{guix challenge} hat das Ziel, Nutzern zu ermöglichen, Substitutserver zu beurteilen, und Entwickler dabei zu unterstützen, nichtdeterministische Paketerstellungen zu finden (siehe @ref{Invoking guix challenge}). Ebenso ermöglicht es die Befehlszeilenoption @option{--check} von @command{guix build}, dass Nutzer bereits installierte Substitute auf Echtheit zu prüfen, indem sie lokal nachgebaut werden (siehe @ref{build-check, @command{guix build --check}})." #. type: Plain text -#: doc/guix.texi:3329 +#: doc/guix.texi:3327 msgid "In the future, we want Guix to have support to publish and retrieve binaries to/from other users, in a peer-to-peer fashion. If you would like to discuss this project, join us on @email{guix-devel@@gnu.org}." msgstr "In Zukunft wollen wir, dass Guix Binärdateien an und von Nutzern peer-to-peer veröffentlichen kann. Wenn Sie mit uns dieses Projekt diskutieren möchten, kommen Sie auf unsere Mailing-Liste @email{guix-devel@@gnu.org}." #. type: cindex -#: doc/guix.texi:3333 +#: doc/guix.texi:3331 #, no-wrap msgid "multiple-output packages" msgstr "mehrere Ausgaben, bei Paketen" #. type: cindex -#: doc/guix.texi:3334 +#: doc/guix.texi:3332 #, no-wrap msgid "package outputs" msgstr "Paketausgaben" #. type: cindex -#: doc/guix.texi:3335 +#: doc/guix.texi:3333 #, no-wrap msgid "outputs" msgstr "Ausgaben" #. type: Plain text -#: doc/guix.texi:3345 +#: doc/guix.texi:3343 msgid "Often, packages defined in Guix have a single @dfn{output}---i.e., the source package leads to exactly one directory in the store. When running @command{guix install glibc}, one installs the default output of the GNU libc package; the default output is called @code{out}, but its name can be omitted as shown in this command. In this particular case, the default output of @code{glibc} contains all the C header files, shared libraries, static libraries, Info documentation, and other supporting files." msgstr "Oft haben in Guix definierte Pakete eine einzige @dfn{Ausgabe} — d.h.@: aus dem Quellpaket entsteht genau ein Verzeichnis im Store. Wenn Sie @command{guix install glibc} ausführen, wird die Standard-Paketausgabe des GNU-libc-Pakets installiert; die Standardausgabe wird @code{out} genannt, aber ihr Name kann weggelassen werden, wie Sie am obigen Befehl sehen. In diesem speziellen Fall enthält die Standard-Paketausgabe von @code{glibc} alle C-Headerdateien, gemeinsamen Bibliotheken („Shared Libraries“), statischen Bibliotheken („Static Libraries“), Dokumentation für Info sowie andere zusätzliche Dateien." #. type: Plain text -#: doc/guix.texi:3353 +#: doc/guix.texi:3351 msgid "Sometimes it is more appropriate to separate the various types of files produced from a single source package into separate outputs. For instance, the GLib C library (used by GTK+ and related packages) installs more than 20 MiB of reference documentation as HTML pages. To save space for users who do not need it, the documentation goes to a separate output, called @code{doc}. To install the main GLib output, which contains everything but the documentation, one would run:" msgstr "Manchmal ist es besser, die verschiedenen Arten von Dateien, die aus einem einzelnen Quellpaket hervorgehen, in getrennte Ausgaben zu unterteilen. Zum Beispiel installiert die GLib-C-Bibliothek (die von GTK und damit zusammenhängenden Paketen benutzt wird) mehr als 20 MiB an HTML-Seiten mit Referenzdokumentation. Um den Nutzern, die das nicht brauchen, Platz zu sparen, wird die Dokumentation in einer separaten Ausgabe abgelegt, genannt @code{doc}. Um also die Hauptausgabe von GLib zu installieren, zu der alles außer der Dokumentation gehört, ist der Befehl:" #. type: example -#: doc/guix.texi:3356 +#: doc/guix.texi:3354 #, no-wrap msgid "guix install glib\n" msgstr "guix install glib\n" #. type: item -#: doc/guix.texi:3358 doc/guix.texi:25332 doc/guix.texi:25357 +#: doc/guix.texi:3356 doc/guix.texi:25314 doc/guix.texi:25339 #, no-wrap msgid "documentation" msgstr "Dokumentation" #. type: Plain text -#: doc/guix.texi:3360 +#: doc/guix.texi:3358 msgid "The command to install its documentation is:" msgstr "Der Befehl, um die Dokumentation zu installieren, ist:" #. type: example -#: doc/guix.texi:3363 +#: doc/guix.texi:3361 #, no-wrap msgid "guix install glib:doc\n" msgstr "guix install glib:doc\n" #. type: Plain text -#: doc/guix.texi:3374 +#: doc/guix.texi:3372 msgid "Some packages install programs with different ``dependency footprints''. For instance, the WordNet package installs both command-line tools and graphical user interfaces (GUIs). The former depend solely on the C library, whereas the latter depend on Tcl/Tk and the underlying X libraries. In this case, we leave the command-line tools in the default output, whereas the GUIs are in a separate output. This allows users who do not need the GUIs to save space. The @command{guix size} command can help find out about such situations (@pxref{Invoking guix size}). @command{guix graph} can also be helpful (@pxref{Invoking guix graph})." msgstr "Manche Pakete installieren Programme mit unterschiedlich großem „Abhängigkeiten-Fußabdruck“. Zum Beispiel installiert das Paket WordNet sowohl Befehlszeilenwerkzeuge als auch grafische Benutzerschnittstellen (GUIs). Erstere hängen nur von der C-Bibliothek ab, während Letztere auch von Tcl/Tk und den zu Grunde liegenden X-Bibliotheken abhängen. Jedenfalls belassen wir deshalb die Befehlszeilenwerkzeuge in der Standard-Paketausgabe, während sich die GUIs in einer separaten Ausgabe befinden. So können Benutzer, die die GUIs nicht brauchen, Platz sparen. Der Befehl @command{guix size} kann dabei helfen, solche Situationen zu erkennen (siehe @ref{Invoking guix size}). @command{guix graph} kann auch helfen (siehe @ref{Invoking guix graph})." #. type: Plain text -#: doc/guix.texi:3382 +#: doc/guix.texi:3380 msgid "There are several such multiple-output packages in the GNU distribution. Other conventional output names include @code{lib} for libraries and possibly header files, @code{bin} for stand-alone programs, and @code{debug} for debugging information (@pxref{Installing Debugging Files}). The outputs of a packages are listed in the third column of the output of @command{guix package --list-available} (@pxref{Invoking guix package})." msgstr "In der GNU-Distribution gibt es viele solche Pakete mit mehreren Ausgaben. Andere Konventionen für Ausgabenamen sind zum Beispiel @code{lib} für Bibliotheken und eventuell auch ihre Header-Dateien,, @code{bin} für eigenständige Programme und @code{debug} für Informationen zur Fehlerbehandlung (siehe @ref{Installing Debugging Files}). Die Ausgaben eines Pakets stehen in der dritten Spalte der Anzeige von @command{guix package --list-available} (siehe @ref{Invoking guix package})." #. type: section -#: doc/guix.texi:3385 +#: doc/guix.texi:3383 #, no-wrap msgid "Invoking @command{guix gc}" msgstr "@command{guix gc} aufrufen" #. type: cindex -#: doc/guix.texi:3387 +#: doc/guix.texi:3385 #, no-wrap msgid "garbage collector" msgstr "Müllsammler" #. type: cindex -#: doc/guix.texi:3388 +#: doc/guix.texi:3386 #, no-wrap msgid "disk space" msgstr "Plattenspeicher" #. type: Plain text -#: doc/guix.texi:3394 +#: doc/guix.texi:3392 msgid "Packages that are installed, but not used, may be @dfn{garbage-collected}. The @command{guix gc} command allows users to explicitly run the garbage collector to reclaim space from the @file{/gnu/store} directory. It is the @emph{only} way to remove files from @file{/gnu/store}---removing files or directories manually may break it beyond repair!" msgstr "Pakete, die zwar installiert sind, aber nicht benutzt werden, können vom @dfn{Müllsammler} entfernt werden. Mit dem Befehl @command{guix gc} können Benutzer den Müllsammler ausdrücklich aufrufen, um Speicher im Verzeichnis @file{/gnu/store} freizugeben. Dies ist der @emph{einzige} Weg, Dateien aus @file{/gnu/store} zu entfernen — das manuelle Entfernen von Dateien kann den Store irreparabel beschädigen!" #. type: Plain text -#: doc/guix.texi:3405 +#: doc/guix.texi:3403 msgid "The garbage collector has a set of known @dfn{roots}: any file under @file{/gnu/store} reachable from a root is considered @dfn{live} and cannot be deleted; any other file is considered @dfn{dead} and may be deleted. The set of garbage collector roots (``GC roots'' for short) includes default user profiles; by default, the symlinks under @file{/var/guix/gcroots} represent these GC roots. New GC roots can be added with @command{guix build --root}, for example (@pxref{Invoking guix build}). The @command{guix gc --list-roots} command lists them." msgstr "Der Müllsammler kennt eine Reihe von @dfn{Wurzeln}: Jede Datei in @file{/gnu/store}, die von einer Wurzel aus erreichbar ist, gilt als @dfn{lebendig} und kann nicht entfernt werden; jede andere Datei gilt als @dfn{tot} und ist ein Kandidat, gelöscht zu werden. Die Menge der Müllsammlerwurzeln (kurz auch „GC-Wurzeln“, von englisch „Garbage Collector“) umfasst Standard-Benutzerprofile; standardmäßig werden diese Müllsammlerwurzeln durch symbolische Verknüpfungen in @file{/var/guix/gcroots} dargestellt. Neue Müllsammlerwurzeln können zum Beispiel mit @command{guix build --root} festgelegt werden (siehe @ref{Invoking guix build}). Der Befehl @command{guix gc --list-roots} listet sie auf." #. type: Plain text -#: doc/guix.texi:3411 +#: doc/guix.texi:3409 msgid "Prior to running @code{guix gc --collect-garbage} to make space, it is often useful to remove old generations from user profiles; that way, old package builds referenced by those generations can be reclaimed. This is achieved by running @code{guix package --delete-generations} (@pxref{Invoking guix package})." msgstr "Bevor Sie mit @code{guix gc --collect-garbage} Speicher freimachen, wollen Sie vielleicht alte Generationen von Benutzerprofilen löschen, damit alte Paketerstellungen von diesen Generationen entfernt werden können. Führen Sie dazu @code{guix package --delete-generations} aus (siehe @ref{Invoking guix package})." #. type: Plain text -#: doc/guix.texi:3415 +#: doc/guix.texi:3413 msgid "Our recommendation is to run a garbage collection periodically, or when you are short on disk space. For instance, to guarantee that at least 5@tie{}GB are available on your disk, simply run:" msgstr "Unsere Empfehlung ist, dass Sie den Müllsammler regelmäßig laufen lassen und wenn Sie wenig freien Speicherplatz zur Verfügung haben. Um zum Beispiel sicherzustellen, dass Sie mindestens 5@tie{}GB auf Ihrer Platte zur Verfügung haben, benutzen Sie einfach:" #. type: example -#: doc/guix.texi:3418 +#: doc/guix.texi:3416 #, no-wrap msgid "guix gc -F 5G\n" msgstr "guix gc -F 5G\n" #. type: Plain text -#: doc/guix.texi:3427 +#: doc/guix.texi:3425 msgid "It is perfectly safe to run as a non-interactive periodic job (@pxref{Scheduled Job Execution}, for how to set up such a job). Running @command{guix gc} with no arguments will collect as much garbage as it can, but that is often inconvenient: you may find yourself having to rebuild or re-download software that is ``dead'' from the GC viewpoint but that is necessary to build other pieces of software---e.g., the compiler tool chain." msgstr "Es ist völlig sicher, dafür eine nicht interaktive, regelmäßige Auftragsausführung vorzugeben (siehe @ref{Scheduled Job Execution} für eine Erklärung, wie man das tun kann). @command{guix gc} ohne Befehlszeilenargumente auszuführen, lässt so viel Müll wie möglich sammeln, aber das ist oft nicht, was man will, denn so muss man unter Umständen Software erneut erstellen oder erneut herunterladen, weil der Müllsammler sie als „tot“ ansieht, sie aber zur Erstellung anderer Software wieder gebraucht wird — das trifft zum Beispiel auf die Compiler-Toolchain zu." #. type: Plain text -#: doc/guix.texi:3433 +#: doc/guix.texi:3431 msgid "The @command{guix gc} command has three modes of operation: it can be used to garbage-collect any dead files (the default), to delete specific files (the @code{--delete} option), to print garbage-collector information, or for more advanced queries. The garbage collection options are as follows:" msgstr "Der Befehl @command{guix gc} hat drei Arbeitsmodi: Er kann benutzt werden, um als Müllsammler tote Dateien zu entfernen (das Standardverhalten), um ganz bestimmte, angegebene Datein zu löschen (mit der Befehlszeilenoption @code{--delete}), um Müllsammlerinformationen auszugeben oder fortgeschrittenere Anfragen zu verarbeiten. Die Müllsammler-Befehlszeilenoptionen sind wie folgt:" #. type: item -#: doc/guix.texi:3435 +#: doc/guix.texi:3433 #, no-wrap msgid "--collect-garbage[=@var{min}]" msgstr "--collect-garbage[=@var{Minimum}]" #. type: itemx -#: doc/guix.texi:3436 +#: doc/guix.texi:3434 #, no-wrap msgid "-C [@var{min}]" msgstr "-C [@var{Minimum}]" #. type: table -#: doc/guix.texi:3440 +#: doc/guix.texi:3438 msgid "Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-directories. This is the default operation when no option is specified." msgstr "Lässt Müll sammeln — z.B.@: nicht erreichbare Dateien in @file{/gnu/store} und seinen Unterverzeichnissen. Wird keine andere Befehlszeilenoption angegeben, wird standardmäßig diese durchgeführt." #. type: table -#: doc/guix.texi:3445 +#: doc/guix.texi:3443 msgid "When @var{min} is given, stop once @var{min} bytes have been collected. @var{min} may be a number of bytes, or it may include a unit as a suffix, such as @code{MiB} for mebibytes and @code{GB} for gigabytes (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." msgstr "Wenn ein @var{Minimum} angegeben wurde, hört der Müllsammler auf, sobald @var{Minimum} Bytes gesammelt wurden. Das @var{Minimum} kann die Anzahl der Bytes bezeichnen oder mit einer Einheit als Suffix versehen sein, wie etwa @code{MiB} für Mebibytes und @code{GB} für Gigabytes (siehe @ref{Block size, size specifications,, coreutils, GNU Coreutils})." #. type: table -#: doc/guix.texi:3447 +#: doc/guix.texi:3445 msgid "When @var{min} is omitted, collect all the garbage." msgstr "Wird kein @var{Minimum} angegeben, sammelt der Müllsammler allen Müll." #. type: item -#: doc/guix.texi:3448 +#: doc/guix.texi:3446 #, no-wrap msgid "--free-space=@var{free}" msgstr "--free-space=@var{Menge}" #. type: itemx -#: doc/guix.texi:3449 +#: doc/guix.texi:3447 #, no-wrap msgid "-F @var{free}" msgstr "-F @var{Menge}" #. type: table -#: doc/guix.texi:3453 +#: doc/guix.texi:3451 msgid "Collect garbage until @var{free} space is available under @file{/gnu/store}, if possible; @var{free} denotes storage space, such as @code{500MiB}, as described above." msgstr "Sammelt Müll, bis die angegebene @var{Menge} an freiem Speicher in @file{/gnu/store} zur Verfügung steht, falls möglich; die @var{Menge} ist eine Speichergröße wie @code{500MiB}, wie oben beschrieben." #. type: table -#: doc/guix.texi:3456 +#: doc/guix.texi:3454 msgid "When @var{free} or more is already available in @file{/gnu/store}, do nothing and exit immediately." msgstr "Wenn die angegebene @var{Menge} oder mehr bereits in @file{/gnu/store} frei verfügbar ist, passiert nichts." #. type: item -#: doc/guix.texi:3457 +#: doc/guix.texi:3455 #, no-wrap msgid "--delete-generations[=@var{duration}]" msgstr "--delete-generations[=@var{Dauer}]" #. type: itemx -#: doc/guix.texi:3458 +#: doc/guix.texi:3456 #, no-wrap msgid "-d [@var{duration}]" msgstr "-d [@var{Dauer}]" #. type: table -#: doc/guix.texi:3462 +#: doc/guix.texi:3460 msgid "Before starting the garbage collection process, delete all the generations older than @var{duration}, for all the user profiles; when run as root, this applies to all the profiles @emph{of all the users}." msgstr "Bevor der Müllsammelvorgang beginnt, werden hiermit alle Generationen von allen Benutzerprofilen gelöscht, die älter sind als die angegebene @var{Dauer}; wird es als Administratornutzer „root“ ausgeführt, geschieht dies mit den Profilen @emph{von allen Benutzern}." #. type: table -#: doc/guix.texi:3466 +#: doc/guix.texi:3464 msgid "For example, this command deletes all the generations of all your profiles that are older than 2 months (except generations that are current), and then proceeds to free space until at least 10 GiB are available:" msgstr "Zum Beispiel löscht der folgende Befehl alle Generationen Ihrer Profile, die älter als zwei Monate sind (ausgenommen die momentanen Generationen), und schmeißt dann den Müllsammler an, um Platz freizuräumen, bis mindestens 10 GiB verfügbar sind:" #. type: example -#: doc/guix.texi:3469 +#: doc/guix.texi:3467 #, no-wrap msgid "guix gc -d 2m -F 10G\n" msgstr "guix gc -d 2m -F 10G\n" #. type: item -#: doc/guix.texi:3471 +#: doc/guix.texi:3469 #, no-wrap msgid "--delete" msgstr "--delete" #. type: itemx -#: doc/guix.texi:3472 +#: doc/guix.texi:3470 #, no-wrap msgid "-D" msgstr "-D" #. type: table -#: doc/guix.texi:3476 +#: doc/guix.texi:3474 msgid "Attempt to delete all the store files and directories specified as arguments. This fails if some of the files are not in the store, or if they are still live." msgstr "Versucht, alle als Argumente angegebenen Dateien oder Verzeichnisse im Store zu löschen. Dies schlägt fehl, wenn manche der Dateien oder Verzeichnisse nicht im Store oder noch immer lebendig sind." #. type: item -#: doc/guix.texi:3477 +#: doc/guix.texi:3475 #, no-wrap msgid "--list-failures" msgstr "--list-failures" #. type: table -#: doc/guix.texi:3479 +#: doc/guix.texi:3477 msgid "List store items corresponding to cached build failures." msgstr "Store-Objekte auflisten, die zwischengespeicherten Erstellungsfehlern entsprechen." #. type: table -#: doc/guix.texi:3483 +#: doc/guix.texi:3481 msgid "This prints nothing unless the daemon was started with @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})." msgstr "Hierbei wird nichts ausgegeben, sofern der Daemon nicht mit @option{--cache-failures} gestartet wurde (siehe @ref{Invoking guix-daemon, @option{--cache-failures}})." #. type: item -#: doc/guix.texi:3484 +#: doc/guix.texi:3482 #, no-wrap msgid "--list-roots" msgstr "--list-roots" #. type: table -#: doc/guix.texi:3487 +#: doc/guix.texi:3485 msgid "List the GC roots owned by the user; when run as root, list @emph{all} the GC roots." msgstr "Die Müllsammlerwurzeln auflisten, die dem Nutzer gehören. Wird der Befehl als Administratornutzer ausgeführt, werden @emph{alle} Müllsammlerwurzeln aufgelistet." #. type: item -#: doc/guix.texi:3488 +#: doc/guix.texi:3486 #, no-wrap msgid "--clear-failures" msgstr "--clear-failures" #. type: table -#: doc/guix.texi:3490 +#: doc/guix.texi:3488 msgid "Remove the specified store items from the failed-build cache." msgstr "Die angegebenen Store-Objekte aus dem Zwischenspeicher für fehlgeschlagene Erstellungen entfernen." #. type: table -#: doc/guix.texi:3493 +#: doc/guix.texi:3491 msgid "Again, this option only makes sense when the daemon is started with @option{--cache-failures}. Otherwise, it does nothing." msgstr "Auch diese Option macht nur Sinn, wenn der Daemon mit @option{--cache-failures} gestartet wurde. Andernfalls passiert nichts." #. type: item -#: doc/guix.texi:3494 +#: doc/guix.texi:3492 #, no-wrap msgid "--list-dead" msgstr "--list-dead" #. type: table -#: doc/guix.texi:3497 +#: doc/guix.texi:3495 msgid "Show the list of dead files and directories still present in the store---i.e., files and directories no longer reachable from any root." msgstr "Zeigt die Liste toter Dateien und Verzeichnisse an, die sich noch im Store befinden — das heißt, Dateien, die von keiner Wurzel mehr erreichbar sind." #. type: item -#: doc/guix.texi:3498 +#: doc/guix.texi:3496 #, no-wrap msgid "--list-live" msgstr "--list-live" #. type: table -#: doc/guix.texi:3500 +#: doc/guix.texi:3498 msgid "Show the list of live store files and directories." msgstr "Zeige die Liste lebendiger Store-Dateien und -Verzeichnisse." #. type: Plain text -#: doc/guix.texi:3504 +#: doc/guix.texi:3502 msgid "In addition, the references among existing store files can be queried:" msgstr "Außerdem können Referenzen unter bestehenden Store-Dateien gefunden werden:" #. type: item -#: doc/guix.texi:3507 +#: doc/guix.texi:3505 #, no-wrap msgid "--references" msgstr "--references" #. type: itemx -#: doc/guix.texi:3508 +#: doc/guix.texi:3506 #, no-wrap msgid "--referrers" msgstr "--referrers" #. type: cindex -#: doc/guix.texi:3509 doc/guix.texi:9357 +#: doc/guix.texi:3507 doc/guix.texi:9355 #, no-wrap msgid "package dependencies" msgstr "Paketabhängigkeiten" #. type: table -#: doc/guix.texi:3512 +#: doc/guix.texi:3510 msgid "List the references (respectively, the referrers) of store files given as arguments." msgstr "Listet die referenzierten bzw. sie referenzierenden Objekte der angegebenen Store-Dateien auf." #. type: item -#: doc/guix.texi:3513 +#: doc/guix.texi:3511 #, no-wrap msgid "--requisites" msgstr "--requisites" #. type: itemx -#: doc/guix.texi:3514 doc/guix.texi:4812 +#: doc/guix.texi:3512 doc/guix.texi:4810 #, no-wrap msgid "-R" msgstr "-R" #. type: item -#: doc/guix.texi:3515 doc/guix.texi:9233 doc/guix.texi:9261 doc/guix.texi:9329 +#: doc/guix.texi:3513 doc/guix.texi:9231 doc/guix.texi:9259 doc/guix.texi:9327 #, no-wrap msgid "closure" msgstr "Abschluss" #. type: table -#: doc/guix.texi:3520 +#: doc/guix.texi:3518 msgid "List the requisites of the store files passed as arguments. Requisites include the store files themselves, their references, and the references of these, recursively. In other words, the returned list is the @dfn{transitive closure} of the store files." msgstr "Listet alle Voraussetzungen der als Argumente übergebenen Store-Dateien auf. Voraussetzungen sind die Store-Dateien selbst, ihre Referenzen sowie die Referenzen davon, rekursiv. Mit anderen Worten, die zurückgelieferte Liste ist der @dfn{transitive Abschluss} dieser Store-Dateien." #. type: table -#: doc/guix.texi:3524 +#: doc/guix.texi:3522 msgid "@xref{Invoking guix size}, for a tool to profile the size of the closure of an element. @xref{Invoking guix graph}, for a tool to visualize the graph of references." msgstr "Der Abschnitt @ref{Invoking guix size} erklärt ein Werkzeug, um den Speicherbedarf des Abschlusses eines Elements zu ermitteln. Siehe @ref{Invoking guix graph} für ein Werkzeug, um den Referenzgraphen zu veranschaulichen." #. type: item -#: doc/guix.texi:3525 +#: doc/guix.texi:3523 #, no-wrap msgid "--derivers" msgstr "--derivers" #. type: item -#: doc/guix.texi:3526 doc/guix.texi:4973 doc/guix.texi:9458 +#: doc/guix.texi:3524 doc/guix.texi:4971 doc/guix.texi:9456 #, no-wrap msgid "derivation" msgstr "Ableitung" #. type: table -#: doc/guix.texi:3529 +#: doc/guix.texi:3527 msgid "Return the derivation(s) leading to the given store items (@pxref{Derivations})." msgstr "Liefert die Ableitung(en), die zu den angegebenen Store-Objekten führen (siehe @ref{Derivations})." #. type: table -#: doc/guix.texi:3531 +#: doc/guix.texi:3529 msgid "For example, this command:" msgstr "Zum Beispiel liefert dieser Befehl:" #. type: example -#: doc/guix.texi:3534 +#: doc/guix.texi:3532 #, no-wrap msgid "guix gc --derivers `guix package -I ^emacs$ | cut -f4`\n" msgstr "guix gc --derivers `guix package -I ^emacs$ | cut -f4`\n" #. type: table -#: doc/guix.texi:3539 +#: doc/guix.texi:3537 msgid "returns the @file{.drv} file(s) leading to the @code{emacs} package installed in your profile." msgstr "die @file{.drv}-Datei(en), die zum in Ihrem Profil installierten @code{emacs}-Paket führen." #. type: table -#: doc/guix.texi:3543 +#: doc/guix.texi:3541 msgid "Note that there may be zero matching @file{.drv} files, for instance because these files have been garbage-collected. There can also be more than one matching @file{.drv} due to fixed-output derivations." msgstr "Beachten Sie, dass es auch sein kann, dass keine passenden @file{.drv}-Dateien existieren, zum Beispiel wenn diese Dateien bereits dem Müllsammler zum Opfer gefallen sind. Es kann auch passieren, dass es mehr als eine passende @file{.drv} gibt, bei Ableitungen mit fester Ausgabe." #. type: Plain text -#: doc/guix.texi:3547 +#: doc/guix.texi:3545 msgid "Lastly, the following options allow you to check the integrity of the store and to control disk usage." msgstr "Zuletzt können Sie mit folgenden Befehlszeilenoptionen die Integrität des Stores prüfen und den Plattenspeicherverbrauch im Zaum halten." #. type: item -#: doc/guix.texi:3550 +#: doc/guix.texi:3548 #, no-wrap msgid "--verify[=@var{options}]" msgstr "--verify[=@var{Optionen}]" #. type: cindex -#: doc/guix.texi:3551 +#: doc/guix.texi:3549 #, no-wrap msgid "integrity, of the store" msgstr "Integrität, des Stores" #. type: cindex -#: doc/guix.texi:3552 +#: doc/guix.texi:3550 #, no-wrap msgid "integrity checking" msgstr "Integritätsprüfung" #. type: table -#: doc/guix.texi:3554 +#: doc/guix.texi:3552 msgid "Verify the integrity of the store." msgstr "Die Integrität des Stores verifizieren" #. type: table -#: doc/guix.texi:3557 +#: doc/guix.texi:3555 msgid "By default, make sure that all the store items marked as valid in the database of the daemon actually exist in @file{/gnu/store}." msgstr "Standardmäßig wird sichergestellt, dass alle Store-Objekte, die in der Datenbank des Daemons als gültig markiert wurden, auch tatsächlich in @file{/gnu/store} existieren." #. type: table -#: doc/guix.texi:3560 +#: doc/guix.texi:3558 msgid "When provided, @var{options} must be a comma-separated list containing one or more of @code{contents} and @code{repair}." msgstr "Wenn angegeben, müssen die @var{Optionen} eine kommagetrennte Liste aus mindestens einem der Worte @code{contents} und @code{repair} sein." #. type: table -#: doc/guix.texi:3566 +#: doc/guix.texi:3564 msgid "When passing @option{--verify=contents}, the daemon computes the content hash of each store item and compares it against its hash in the database. Hash mismatches are reported as data corruptions. Because it traverses @emph{all the files in the store}, this command can take a long time, especially on systems with a slow disk drive." msgstr "Wenn Sie @option{--verify=contents} übergeben, berechnet der Daemon den Hash des Inhalts jedes Store-Objekts und vergleicht ihn mit dem Hash in der Datenbank. Sind die Hashes ungleich, wird eine Datenbeschädigung gemeldet. Weil dabei @emph{alle Dateien im Store} durchlaufen werden, kann der Befehl viel Zeit brauchen, besonders auf Systemen mit langsamer Platte." #. type: cindex -#: doc/guix.texi:3567 +#: doc/guix.texi:3565 #, no-wrap msgid "repairing the store" msgstr "Store, reparieren" #. type: cindex -#: doc/guix.texi:3568 doc/guix.texi:8127 +#: doc/guix.texi:3566 doc/guix.texi:8125 #, no-wrap msgid "corruption, recovering from" msgstr "Datenbeschädigung, Behebung" #. type: table -#: doc/guix.texi:3576 +#: doc/guix.texi:3574 msgid "Using @option{--verify=repair} or @option{--verify=contents,repair} causes the daemon to try to repair corrupt store items by fetching substitutes for them (@pxref{Substitutes}). Because repairing is not atomic, and thus potentially dangerous, it is available only to the system administrator. A lightweight alternative, when you know exactly which items in the store are corrupt, is @command{guix build --repair} (@pxref{Invoking guix build})." msgstr "Mit @option{--verify=repair} oder @option{--verify=contents,repair} versucht der Daemon, beschädigte Store-Objekte zu reparieren, indem er Substitute für selbige herunterlädt (siehe @ref{Substitutes}). Weil die Reparatur nicht atomar und daher womöglich riskant ist, kann nur der Systemadministrator den Befehl benutzen. Eine weniger aufwendige Alternative, wenn Sie wissen, welches Objekt beschädigt ist, ist, @command{guix build --repair} zu benutzen (siehe @ref{Invoking guix build})." #. type: item -#: doc/guix.texi:3577 +#: doc/guix.texi:3575 #, no-wrap msgid "--optimize" msgstr "--optimize" #. type: table -#: doc/guix.texi:3581 +#: doc/guix.texi:3579 msgid "Optimize the store by hard-linking identical files---this is @dfn{deduplication}." msgstr "Den Store durch Nutzung harter Verknüpfungen für identische Dateien optimieren — mit anderen Worten wird der Store @dfn{dedupliziert}." #. type: table -#: doc/guix.texi:3587 +#: doc/guix.texi:3585 msgid "The daemon performs deduplication after each successful build or archive import, unless it was started with @code{--disable-deduplication} (@pxref{Invoking guix-daemon, @code{--disable-deduplication}}). Thus, this option is primarily useful when the daemon was running with @code{--disable-deduplication}." msgstr "Der Daemon führt Deduplizierung automatisch nach jeder erfolgreichen Erstellung und jedem Importieren eines Archivs durch, sofern er nicht mit @code{--disable-deduplication} (siehe @ref{Invoking guix-daemon, @code{--disable-deduplication}}) gestartet wurde. Diese Befehlszeilenoption brauchen Sie also in erster Linie dann, wenn der Daemon zuvor mit @code{--disable-deduplication} gestartet worden ist." #. type: section -#: doc/guix.texi:3591 +#: doc/guix.texi:3589 #, no-wrap msgid "Invoking @command{guix pull}" msgstr "@command{guix pull} aufrufen" #. type: cindex -#: doc/guix.texi:3593 +#: doc/guix.texi:3591 #, no-wrap msgid "upgrading Guix" msgstr "Aktualisieren von Guix" #. type: cindex -#: doc/guix.texi:3594 +#: doc/guix.texi:3592 #, no-wrap msgid "updating Guix" msgstr "Updaten von Guix" #. type: command{#1} -#: doc/guix.texi:3595 +#: doc/guix.texi:3593 #, no-wrap msgid "guix pull" msgstr "guix pull" #. type: cindex -#: doc/guix.texi:3596 +#: doc/guix.texi:3594 #, no-wrap msgid "pull" msgstr "pull" #. type: Plain text -#: doc/guix.texi:3604 +#: doc/guix.texi:3602 msgid "Packages are installed or upgraded to the latest version available in the distribution currently available on your local machine. To update that distribution, along with the Guix tools, you must run @command{guix pull}: the command downloads the latest Guix source code and package descriptions, and deploys it. Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official GNU@tie{}Guix repository, though this can be customized." msgstr "Nach der Installation oder Aktualisierung wird stets die neueste Version von Paketen verwendet, die in der aktuell installierten Distribution verfügbar ist. Um die Distribution und die Guix-Werkzeuge zu aktualisieren, führen Sie @command{guix pull} aus. Der Befehl lädt den neuesten Guix-Quellcode einschließlich Paketbeschreibungen herunter und installiert ihn. Quellcode wird aus einem @uref{https://git-scm.com, Git-Repository} geladen, standardmäßig dem offiziellen Repository von GNU@tie{}Guix, was Sie aber auch ändern können." #. type: Plain text -#: doc/guix.texi:3610 +#: doc/guix.texi:3608 msgid "On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix. Not only that, but all the Guix commands and Scheme modules will also be taken from that latest version. New @command{guix} sub-commands added by the update also become available." msgstr "Danach wird @command{guix package} Pakete und ihre Versionen entsprechend der gerade heruntergeladenen Kopie von Guix benutzen. Nicht nur das, auch alle Guix-Befehle und Scheme-Module werden aus der neuesten Version von Guix kommen. Neue @command{guix}-Unterbefehle, die durch die Aktualisierung hinzugekommen sind, werden also auch verfügbar." #. type: Plain text -#: doc/guix.texi:3616 +#: doc/guix.texi:3614 msgid "Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who run @command{guix pull}. For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, and vice versa." msgstr "Jeder Nutzer kann seine Kopie von Guix mittels @command{guix pull} aktualisieren, wodurch sich nur für den Nutzer etwas verändert, der @command{guix pull} ausgeführt hat. Wenn also zum Beispiel der Administratornutzer @code{root} den Befehl @command{guix pull} ausführt, hat das keine Auswirkungen auf die für den Benutzer @code{alice} sichtbare Guix-Version, und umgekehrt." #. type: Plain text -#: doc/guix.texi:3622 +#: doc/guix.texi:3620 msgid "The result of running @command{guix pull} is a @dfn{profile} available under @file{~/.config/guix/current} containing the latest Guix. Thus, make sure to add it to the beginning of your search path so that you use the latest version, and similarly for the Info manual (@pxref{Documentation}):" msgstr "Das Ergebnis von @command{guix pull} ist ein als @file{~/.config/guix/current} verfügbares @dfn{Profil} mit dem neuesten Guix. Stellen Sie sicher, dass es am Anfang Ihres Suchpfades steht, damit Sie auch wirklich das neueste Guix und sein Info-Handbuch sehen (siehe @ref{Documentation}):" #. type: example -#: doc/guix.texi:3626 +#: doc/guix.texi:3624 #, no-wrap msgid "" "export PATH=\"$HOME/.config/guix/current/bin:$PATH\"\n" @@ -7977,12 +7988,12 @@ msgstr "" "export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"\n" #. type: Plain text -#: doc/guix.texi:3630 +#: doc/guix.texi:3628 msgid "The @code{--list-generations} or @code{-l} option lists past generations produced by @command{guix pull}, along with details about their provenance:" msgstr "Die Befehlszeilenoption @code{--list-generations} oder kurz @code{-l} listet ältere von @command{guix pull} erzeugte Generationen auf, zusammen mit Informationen zu deren Provenienz." #. type: example -#: doc/guix.texi:3638 +#: doc/guix.texi:3636 #, no-wrap msgid "" "$ guix pull -l\n" @@ -8002,7 +8013,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:3648 +#: doc/guix.texi:3646 #, no-wrap msgid "" "Generation 2\tJun 11 2018 11:02:49\n" @@ -8028,7 +8039,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:3656 +#: doc/guix.texi:3654 #, no-wrap msgid "" "Generation 3\tJun 13 2018 23:31:07\t(current)\n" @@ -8048,17 +8059,17 @@ msgstr "" " 69 packages upgraded: borg@@1.1.6, cheese@@3.28.0, …\n" #. type: Plain text -#: doc/guix.texi:3660 +#: doc/guix.texi:3658 msgid "@xref{Invoking guix describe, @command{guix describe}}, for other ways to describe the current status of Guix." msgstr "Im Abschnitt @ref{Invoking guix describe, @command{guix describe}} werden andere Möglichkeiten erklärt, sich den momentanen Zustand von Guix beschreiben zu lassen." #. type: Plain text -#: doc/guix.texi:3665 +#: doc/guix.texi:3663 msgid "This @code{~/.config/guix/current} profile works like any other profile created by @command{guix package} (@pxref{Invoking guix package}). That is, you can list generations, roll back to the previous generation---i.e., the previous Guix---and so on:" msgstr "Das Profil @code{~/.config/guix/current} verhält sich genau wie jedes andere Profil, das von @command{guix package} erzeugt wurde (siehe @ref{Invoking guix package}). Das bedeutet, Sie können seine Generationen auflisten und es auf die vorherige Generation — also das vorherige Guix — zurücksetzen und so weiter:" #. type: example -#: doc/guix.texi:3671 +#: doc/guix.texi:3669 #, no-wrap msgid "" "$ guix package -p ~/.config/guix/current --roll-back\n" @@ -8072,196 +8083,196 @@ msgstr "" "deleting /var/guix/profiles/per-user/charlie/current-guix-1-link\n" #. type: Plain text -#: doc/guix.texi:3675 +#: doc/guix.texi:3673 msgid "The @command{guix pull} command is usually invoked with no arguments, but it supports the following options:" msgstr "Der Befehl @command{guix pull} wird in der Regel ohne Befehlszeilenargumente aufgerufen, aber er versteht auch folgende Befehlszeilenoptionen:" #. type: item -#: doc/guix.texi:3677 +#: doc/guix.texi:3675 #, no-wrap msgid "--url=@var{url}" msgstr "--url=@var{URL}" #. type: itemx -#: doc/guix.texi:3678 +#: doc/guix.texi:3676 #, no-wrap msgid "--commit=@var{commit}" msgstr "--commit=@var{Commit}" #. type: itemx -#: doc/guix.texi:3679 +#: doc/guix.texi:3677 #, no-wrap msgid "--branch=@var{branch}" msgstr "--branch=@var{Branch}" #. type: table -#: doc/guix.texi:3683 +#: doc/guix.texi:3681 msgid "Download code for the @code{guix} channel from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}." msgstr "Code wird für den @code{guix}-Kanal von der angegebenen @var{URL} für den angegebenen @var{Commit} (eine gültige Commit-ID, dargestellt als hexadezimale Zeichenkette) oder @var{Branch} heruntergeladen." #. type: cindex -#: doc/guix.texi:3684 doc/guix.texi:3749 +#: doc/guix.texi:3682 doc/guix.texi:3747 #, no-wrap msgid "@file{channels.scm}, configuration file" msgstr "@file{channels.scm}, Konfigurationsdatei" #. type: cindex -#: doc/guix.texi:3685 doc/guix.texi:3750 +#: doc/guix.texi:3683 doc/guix.texi:3748 #, no-wrap msgid "configuration file for channels" msgstr "Konfigurationsdatei für Kanäle" #. type: table -#: doc/guix.texi:3689 +#: doc/guix.texi:3687 msgid "These options are provided for convenience, but you can also specify your configuration in the @file{~/.config/guix/channels.scm} file or using the @option{--channels} option (see below)." msgstr "Diese Befehlszeilenoptionen sind manchmal bequemer, aber Sie können Ihre Konfiguration auch in der Datei @file{~/.config/guix/channels.scm} oder über die Option @option{--channels} angeben (siehe unten)." #. type: item -#: doc/guix.texi:3690 +#: doc/guix.texi:3688 #, no-wrap msgid "--channels=@var{file}" msgstr "--channels=@var{Datei}" #. type: itemx -#: doc/guix.texi:3691 +#: doc/guix.texi:3689 #, no-wrap msgid "-C @var{file}" msgstr "-C @var{Datei}" #. type: table -#: doc/guix.texi:3696 +#: doc/guix.texi:3694 msgid "Read the list of channels from @var{file} instead of @file{~/.config/guix/channels.scm}. @var{file} must contain Scheme code that evaluates to a list of channel objects. @xref{Channels}, for more information." msgstr "Die Liste der Kanäle aus der angegebenen @var{Datei} statt aus @file{~/.config/guix/channels.scm} auslesen. Die @var{Datei} muss Scheme-Code enthalten, der zu einer Liste von Kanalobjekten ausgewertet wird. Siehe @ref{Channels} für nähere Informationen." #. type: item -#: doc/guix.texi:3697 +#: doc/guix.texi:3695 #, no-wrap msgid "--news" msgstr "--news" #. type: itemx -#: doc/guix.texi:3698 doc/guix.texi:4610 doc/guix.texi:24598 +#: doc/guix.texi:3696 doc/guix.texi:4608 #, no-wrap msgid "-N" msgstr "-N" #. type: table -#: doc/guix.texi:3700 +#: doc/guix.texi:3698 msgid "Display the list of packages added or upgraded since the previous generation." msgstr "Anzeigen, welche Pakete seit der letzten Generation hinzugefügt oder aktualisiert wurden." #. type: table -#: doc/guix.texi:3704 +#: doc/guix.texi:3702 msgid "This is the same information as displayed upon @command{guix pull} completion, but without ellipses; it is also similar to the output of @command{guix pull -l} for the last generation (see below)." msgstr "Die Information ist dieselbe, die auch nach Abschluss von @command{guix pull} angezeigt wird, aber ohne Auslassungen; sie ähnelt auch der Ausgabe von @command{guix pull -l} für die neueste Generation (siehe unten)." #. type: table -#: doc/guix.texi:3711 +#: doc/guix.texi:3709 msgid "List all the generations of @file{~/.config/guix/current} or, if @var{pattern} is provided, the subset of generations that match @var{pattern}. The syntax of @var{pattern} is the same as with @code{guix package --list-generations} (@pxref{Invoking guix package})." msgstr "Alle Generationen von @file{~/.config/guix/current} bzw., wenn ein @var{Muster} angegeben wird, die dazu passenden Generationen auflisten. Die Syntax für das @var{Muster} ist dieselbe wie bei @code{guix package --list-generations} (siehe @ref{Invoking guix package})." #. type: table -#: doc/guix.texi:3714 +#: doc/guix.texi:3712 msgid "@xref{Invoking guix describe}, for a way to display information about the current generation only." msgstr "Im Abschnitt @ref{Invoking guix describe, @command{guix describe}} wird eine Möglichkeit erklärt, sich Informationen nur über die aktuelle Generation anzeigen zu lassen." #. type: table -#: doc/guix.texi:3718 +#: doc/guix.texi:3716 msgid "Use @var{profile} instead of @file{~/.config/guix/current}." msgstr "Auf @var{Profil} anstelle von @file{~/.config/guix/current} arbeiten." #. type: item -#: doc/guix.texi:3719 doc/guix.texi:7703 +#: doc/guix.texi:3717 doc/guix.texi:7701 #, no-wrap msgid "--dry-run" msgstr "--dry-run" #. type: itemx -#: doc/guix.texi:3720 doc/guix.texi:7704 +#: doc/guix.texi:3718 doc/guix.texi:7702 #, no-wrap msgid "-n" msgstr "-n" #. type: table -#: doc/guix.texi:3723 +#: doc/guix.texi:3721 msgid "Show which channel commit(s) would be used and what would be built or substituted but do not actually do it." msgstr "Anzeigen, welche(r) Commit(s) für die Kanäle benutzt würde(n) und was jeweils erstellt oder substituiert würde, ohne es tatsächlich durchzuführen." #. type: itemx -#: doc/guix.texi:3725 doc/guix.texi:4593 doc/guix.texi:4886 doc/guix.texi:8069 -#: doc/guix.texi:9347 doc/guix.texi:9546 doc/guix.texi:10096 -#: doc/guix.texi:24565 +#: doc/guix.texi:3723 doc/guix.texi:4591 doc/guix.texi:4884 doc/guix.texi:8067 +#: doc/guix.texi:9345 doc/guix.texi:9544 doc/guix.texi:10094 +#: doc/guix.texi:24556 #, no-wrap msgid "-s @var{system}" msgstr "-s @var{System}" #. type: table -#: doc/guix.texi:3728 doc/guix.texi:4889 +#: doc/guix.texi:3726 doc/guix.texi:4887 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host." msgstr "Versuchen, für die angegebene Art von @var{System} geeignete Binärdateien zu erstellen — z.B.@: @code{i686-linux} — statt für die Art von System, das die Erstellung durchführt." #. type: item -#: doc/guix.texi:3729 doc/guix.texi:9904 +#: doc/guix.texi:3727 doc/guix.texi:9902 #, no-wrap msgid "--verbose" msgstr "--verbose" #. type: table -#: doc/guix.texi:3731 +#: doc/guix.texi:3729 msgid "Produce verbose output, writing build logs to the standard error output." msgstr "Ausführliche Informationen ausgeben und Erstellungsprotokolle auf der Standardfehlerausgabe ausgeben." #. type: table -#: doc/guix.texi:3735 +#: doc/guix.texi:3733 msgid "Use the bootstrap Guile to build the latest Guix. This option is only useful to Guix developers." msgstr "Das neueste Guix mit dem Bootstrap-Guile erstellen. Diese Befehlszeilenoption ist nur für Guix-Entwickler von Nutzen." #. type: Plain text -#: doc/guix.texi:3741 +#: doc/guix.texi:3739 msgid "The @dfn{channel} mechanism allows you to instruct @command{guix pull} which repository and branch to pull from, as well as @emph{additional} repositories containing package modules that should be deployed. @xref{Channels}, for more information." msgstr "Mit Hilfe von @dfn{Kanälen} können Sie @command{guix pull} anweisen, von welchem Repository und welchem Branch Guix aktualisiert werden soll, sowie von welchen @emph{weiteren} Repositorys Paketmodule bezogen werden sollen. Im Abschnitt @ref{Channels} finden Sie nähere Informationen." #. type: Plain text -#: doc/guix.texi:3744 +#: doc/guix.texi:3742 msgid "In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options})." msgstr "Außerdem unterstützt @command{guix pull} alle gemeinsamen Erstellungsoptionen (siehe @ref{Common Build Options})." #. type: item -#: doc/guix.texi:3748 doc/guix.texi:4151 +#: doc/guix.texi:3746 doc/guix.texi:4149 #, no-wrap msgid "channels" msgstr "Kanäle" #. type: cindex -#: doc/guix.texi:3751 +#: doc/guix.texi:3749 #, no-wrap msgid "@command{guix pull}, configuration file" msgstr "@command{guix pull}, Konfigurationsdatei" #. type: cindex -#: doc/guix.texi:3752 +#: doc/guix.texi:3750 #, no-wrap msgid "configuration of @command{guix pull}" msgstr "Konfiguration von @command{guix pull}" #. type: Plain text -#: doc/guix.texi:3761 +#: doc/guix.texi:3759 msgid "Guix and its package collection are updated by running @command{guix pull} (@pxref{Invoking guix pull}). By default @command{guix pull} downloads and deploys Guix itself from the official GNU@tie{}Guix repository. This can be customized by defining @dfn{channels} in the @file{~/.config/guix/channels.scm} file. A channel specifies a URL and branch of a Git repository to be deployed, and @command{guix pull} can be instructed to pull from one or more channels. In other words, channels can be used to @emph{customize} and to @emph{extend} Guix, as we will see below." msgstr "Guix und die Sammlung darin verfügbarer Pakete können Sie durch Ausführen von @command{guix pull} aktualisieren (siehe @ref{Invoking guix pull}). Standardmäßig lädt @command{guix pull} Guix selbst vom offiziellen Repository von GNU@tie{}Guix herunter und installiert es. Diesen Vorgang können Sie anpassen, indem Sie @dfn{Kanäle} in der Datei @file{~/.config/guix/channels.scm} angeben. Ein Kanal enthält eine Angabe einer URL und eines Branches eines zu installierenden Git-Repositorys und Sie können @command{guix pull} veranlassen, die Aktualisierungen von einem oder mehreren Kanälen zu beziehen. Mit anderen Worten können Kanäle benutzt werden, um Guix @emph{anzupassen} und zu @emph{erweitern}, wie wir im Folgenden sehen werden." #. type: subsection -#: doc/guix.texi:3762 +#: doc/guix.texi:3760 #, no-wrap msgid "Using a Custom Guix Channel" msgstr "Einen eigenen Guix-Kanal benutzen" #. type: Plain text -#: doc/guix.texi:3769 +#: doc/guix.texi:3767 msgid "The channel called @code{guix} specifies where Guix itself---its command-line tools as well as its package collection---should be downloaded. For instance, suppose you want to update from your own copy of the Guix repository at @code{example.org}, and specifically the @code{super-hacks} branch, you can write in @code{~/.config/guix/channels.scm} this specification:" msgstr "Der Kanal namens @code{guix} gibt an, wovon Guix selbst — seine Befehlszeilenwerkzeuge und seine Paketsammlung — heruntergeladen werden sollten. Wenn Sie zum Beispiel mit Ihrer eigenen Kopie des Guix-Repositorys arbeiten möchten und diese auf @code{example.org} zu finden ist, und zwar im Branch namens @code{super-hacks}, dann schreiben Sie folgende Spezifikation in @code{~/.config/guix/channels.scm}:" #. type: lisp -#: doc/guix.texi:3776 +#: doc/guix.texi:3774 #, no-wrap msgid "" ";; Tell 'guix pull' to use my own repo.\n" @@ -8277,83 +8288,83 @@ msgstr "" " (branch \"super-hacks\")))\n" #. type: Plain text -#: doc/guix.texi:3781 +#: doc/guix.texi:3779 msgid "From there on, @command{guix pull} will fetch code from the @code{super-hacks} branch of the repository at @code{example.org}." msgstr "Ab dann wird @command{guix pull} seinen Code vom Branch @code{super-hacks} des Repositorys auf @code{example.org} beziehen." #. type: subsection -#: doc/guix.texi:3782 +#: doc/guix.texi:3780 #, no-wrap msgid "Specifying Additional Channels" msgstr "Weitere Kanäle angeben" #. type: cindex -#: doc/guix.texi:3784 +#: doc/guix.texi:3782 #, no-wrap msgid "extending the package collection (channels)" msgstr "Paketsammlung erweitern (Kanäle)" #. type: cindex -#: doc/guix.texi:3785 +#: doc/guix.texi:3783 #, no-wrap msgid "personal packages (channels)" msgstr "Eigene Pakete (Kanäle)" #. type: cindex -#: doc/guix.texi:3786 +#: doc/guix.texi:3784 #, no-wrap msgid "channels, for personal packages" msgstr "Kanäle, für eigene Pakete" #. type: Plain text -#: doc/guix.texi:3794 +#: doc/guix.texi:3792 msgid "You can also specify @emph{additional channels} to pull from. Let's say you have a bunch of custom package variants or personal packages that you think would make little sense to contribute to the Guix project, but would like to have these packages transparently available to you at the command line. You would first write modules containing those package definitions (@pxref{Package Modules}), maintain them in a Git repository, and then you and anyone else can use it as an additional channel to get packages from. Neat, no?" msgstr "Sie können auch @emph{weitere Kanäle} als Bezugsquelle angeben. Sagen wir, Sie haben ein paar eigene Paketvarianten oder persönliche Pakete, von denen Sie meinen, dass sie @emph{nicht} geeignet sind, ins Guix-Projekt selbst aufgenommen zu werden, die Ihnen aber dennoch wie andere Pakete auf der Befehlszeile zur Verfügung stehen sollen. Dann würden Sie zunächst Module mit diesen Paketdefinitionen schreiben (siehe @ref{Package Modules}) und diese dann in einem Git-Repository verwalten, welches Sie selbst oder jeder andere dann als zusätzlichen Kanal eintragen können, von dem Pakete geladen werden. Klingt gut, oder?" #. type: quotation -#: doc/guix.texi:3798 +#: doc/guix.texi:3796 #, no-wrap msgid "Warning" msgstr "Warnung" #. type: quotation -#: doc/guix.texi:3802 +#: doc/guix.texi:3800 msgid "Before you, dear user, shout---``woow this is @emph{soooo coool}!''---and publish your personal channel to the world, we would like to share a few words of caution:" msgstr "Bevor Sie, verehrter Nutzer, ausrufen: „Wow, das ist @emph{soooo coool}!“, und Ihren eigenen Kanal der Welt zur Verfügung stellen, möchten wir Ihnen auch ein paar Worte der Warnung mit auf den Weg geben:" #. type: itemize -#: doc/guix.texi:3810 +#: doc/guix.texi:3808 msgid "Before publishing a channel, please consider contributing your package definitions to Guix proper (@pxref{Contributing}). Guix as a project is open to free software of all sorts, and packages in Guix proper are readily available to all Guix users and benefit from the project's quality assurance process." msgstr "Bevor Sie einen Kanal veröffentlichen, überlegen Sie sich bitte erst, ob Sie die Pakete nicht besser zum eigentlichen Guix-Projekt beisteuern (siehe @ref{Contributing}). Das Guix-Projekt ist gegenüber allen Arten freier Software offen und zum eigentlichen Guix gehörende Pakete stehen allen Guix-Nutzern zur Verfügung, außerdem profitieren sie von Guix’ Qualitätssicherungsprozess." #. type: itemize -#: doc/guix.texi:3819 +#: doc/guix.texi:3817 msgid "When you maintain package definitions outside Guix, we, Guix developers, consider that @emph{the compatibility burden is on you}. Remember that package modules and package definitions are just Scheme code that uses various programming interfaces (APIs). We want to remain free to change these APIs to keep improving Guix, possibly in ways that break your channel. We never change APIs gratuitously, but we will @emph{not} commit to freezing APIs either." msgstr "Wenn Sie Paketdefinitionen außerhalb von Guix betreuen, sehen wir Guix-Entwickler es als @emph{Ihre Aufgabe an, deren Kompatibilität sicherzstellen}. Bedenken Sie, dass Paketmodule und Paketdefinitionen nur Scheme-Code sind, der verschiedene Programmierschnittstellen (APIs) benutzt. Wir nehmen uns das Recht heraus, diese APIs jederzeit zu ändern, damit wir Guix besser machen können, womöglich auf eine Art, wodurch Ihr Kanal nicht mehr funktioniert. Wir ändern APIs nie einfach so, werden aber auch @emph{nicht} versprechen, APIs nicht zu verändern." #. type: itemize -#: doc/guix.texi:3823 +#: doc/guix.texi:3821 msgid "Corollary: if you're using an external channel and that channel breaks, please @emph{report the issue to the channel authors}, not to the Guix project." msgstr "Das bedeutet auch, dass Sie, wenn Sie einen externen Kanal verwenden und dieser kaputt geht, Sie dies bitte @emph{den Autoren des Kanals} und nicht dem Guix-Projekt melden." #. type: quotation -#: doc/guix.texi:3830 +#: doc/guix.texi:3828 msgid "You've been warned! Having said this, we believe external channels are a practical way to exert your freedom to augment Guix' package collection and to share your improvements, which are basic tenets of @uref{https://www.gnu.org/philosophy/free-sw.html, free software}. Please email us at @email{guix-devel@@gnu.org} if you'd like to discuss this." msgstr "Wir haben Sie gewarnt! Allerdings denken wir auch, dass externe Kanäle eine praktische Möglichkeit sind, die Paketsammlung von Guix zu ergänzen und Ihre Verbesserungen mit anderen zu teilen, wie es dem Grundgedanken @uref{https://www.gnu.org/philosophy/free-sw.html, freier Software} entspricht. Bitte schicken Sie eine E-Mail an @email{guix-devel@@gnu.org}, wenn Sie dies diskutieren möchten." #. type: Plain text -#: doc/guix.texi:3835 +#: doc/guix.texi:3833 msgid "To use a channel, write @code{~/.config/guix/channels.scm} to instruct @command{guix pull} to pull from it @emph{in addition} to the default Guix channel(s):" msgstr "Um einen Kanal zu benutzen, tragen Sie ihn in @code{~/.config/guix/channels.scm} ein, damit @command{guix pull} diesen Kanal @emph{zusätzlich} zu den standardmäßigen Guix-Kanälen als Paketquelle verwendet:" #. type: vindex -#: doc/guix.texi:3836 +#: doc/guix.texi:3834 #, no-wrap msgid "%default-channels" msgstr "%default-channels" #. type: lisp -#: doc/guix.texi:3843 +#: doc/guix.texi:3841 #, no-wrap msgid "" ";; Add my personal packages to those Guix provides.\n" @@ -8369,12 +8380,12 @@ msgstr "" " %default-channels)\n" #. type: Plain text -#: doc/guix.texi:3853 +#: doc/guix.texi:3851 msgid "Note that the snippet above is (as always!)@: Scheme code; we use @code{cons} to add a channel the list of channels that the variable @code{%default-channels} is bound to (@pxref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}). With this file in place, @command{guix pull} builds not only Guix but also the package modules from your own repository. The result in @file{~/.config/guix/current} is the union of Guix with your own package modules:" msgstr "Beachten Sie, dass der obige Schnipsel (wie immer!)@: Scheme-Code ist; mit @code{cons} fügen wir einen Kanal zur Liste der Kanäle hinzu, an die die Variable @code{%default-channels} gebunden ist (siehe @ref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}). Mit diesem Dateiinhalt wird @command{guix pull} nun nicht mehr nur Guix, sondern auch die Paketmodule aus Ihrem Repository erstellen. Das Ergebnis in @file{~/.config/guix/current} ist so die Vereinigung von Guix und Ihren eigenen Paketmodulen." #. type: example -#: doc/guix.texi:3868 +#: doc/guix.texi:3866 #, no-wrap msgid "" "$ guix pull --list-generations\n" @@ -8406,45 +8417,45 @@ msgstr "" " 4 packages upgraded: emacs-racket-mode@@0.0.2-2.1b78827, …\n" #. type: Plain text -#: doc/guix.texi:3876 +#: doc/guix.texi:3874 msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{my-personal-packages} channel. Among the new and upgraded packages that are listed, some like @code{my-gimp} and @code{my-emacs-with-cool-features} might come from @code{my-personal-packages}, while others come from the Guix default channel." msgstr "Obige Ausgabe von @command{guix pull} zeigt an, dass Generation@tie{}19 sowohl Guix als auch Pakete aus dem Kanal @code{meine-persönlichen-pakete} enthält. Unter den aufgeführten neuen und aktualisierten Paketen kommen vielleicht manche wie @code{mein-gimp} und @code{mein-emacs-mit-coolen-features} aus @code{meine-persönlichen-pakete}, während andere aus dem Standard-Guix-Kanal kommen." #. type: Plain text -#: doc/guix.texi:3887 +#: doc/guix.texi:3885 msgid "To create a channel, create a Git repository containing your own package modules and make it available. The repository can contain anything, but a useful channel will contain Guile modules that export packages. Once you start using a channel, Guix will behave as if the root directory of that channel's Git repository has been added to the Guile load path (@pxref{Load Paths,,, guile, GNU Guile Reference Manual}). For example, if your channel contains a file at @file{my-packages/my-tools.scm} that defines a Guile module, then the module will be available under the name @code{(my-packages my-tools)}, and you will be able to use it like any other module (@pxref{Modules,,, guile, GNU Guile Reference Manual})." msgstr "Um einen Kanal zu erzeugen, müssen Sie ein Git-Repository mit Ihren eigenen Paketmodulen erzeugen und den Zugriff darauf ermöglichen. Das Repository kann beliebigen Inhalt haben, aber wenn es ein nützlicher Kanal sein soll, muss es Guile-Module enthalten, die Pakete exportieren. Sobald Sie anfangen, einen Kanal zu benutzen, verhält sich Guix, als wäre das Wurzelverzeichnis des Git-Repositorys des Kanals in Guiles Ladepfad enthalten (siehe @ref{Load Paths,,, guile, GNU Guile Reference Manual}). Wenn Ihr Kanal also zum Beispiel eine Datei als @file{my-packages/my-tools.scm} enthält, die ein Guile-Modul definiert, dann wird das Modul unter dem Namen @code{(my-packages my-tools)} verfügbar sein und Sie werden es wie jedes andere Modul benutzen können (siehe @ref{Modules,,, guile, GNU Guile Reference Manual})." #. type: cindex -#: doc/guix.texi:3888 +#: doc/guix.texi:3886 #, no-wrap msgid "dependencies, channels" msgstr "Abhängigkeiten, bei Kanälen" #. type: cindex -#: doc/guix.texi:3889 +#: doc/guix.texi:3887 #, no-wrap msgid "meta-data, channels" msgstr "Metadaten, bei Kanälen" #. type: subsection -#: doc/guix.texi:3890 +#: doc/guix.texi:3888 #, no-wrap msgid "Declaring Channel Dependencies" msgstr "Kanalabhängigkeiten deklarieren" #. type: Plain text -#: doc/guix.texi:3896 +#: doc/guix.texi:3894 msgid "Channel authors may decide to augment a package collection provided by other channels. They can declare their channel to be dependent on other channels in a meta-data file @file{.guix-channel}, which is to be placed in the root of the channel repository." msgstr "Kanalautoren können auch beschließen, die Paketsammlung von anderen Kanälen zu erweitern. Dazu können sie in einer Metadatendatei @file{.guix-channel} deklarieren, dass ihr Kanal von anderen Kanälen abhängt. Diese Datei muss im Wurzelverzeichnis des Kanal-Repositorys platziert werden." #. type: Plain text -#: doc/guix.texi:3898 +#: doc/guix.texi:3896 msgid "The meta-data file should contain a simple S-expression like this:" msgstr "Die Metadatendatei sollte einen einfachen S-Ausdruck wie diesen enthalten:" #. type: lisp -#: doc/guix.texi:3910 +#: doc/guix.texi:3908 #, no-wrap msgid "" "(channel\n" @@ -8470,46 +8481,46 @@ msgstr "" " (branch \"testing\"))))\n" #. type: Plain text -#: doc/guix.texi:3916 +#: doc/guix.texi:3914 msgid "In the above example this channel is declared to depend on two other channels, which will both be fetched automatically. The modules provided by the channel will be compiled in an environment where the modules of all these declared channels are available." msgstr "Im Beispiel oben wird deklariert, dass dieser Kanal von zwei anderen Kanälen abhängt, die beide automatisch geladen werden. Die vom Kanal angebotenen Module werden in einer Umgebung kompiliert, in der die Module all dieser deklarierten Kanäle verfügbar sind." #. type: Plain text -#: doc/guix.texi:3920 +#: doc/guix.texi:3918 msgid "For the sake of reliability and maintainability, you should avoid dependencies on channels that you don't control, and you should aim to keep the number of dependencies to a minimum." msgstr "Um Verlässlichkeit und Wartbarkeit zu gewährleisten, sollen Sie darauf verzichten, eine Abhängigkeit von Kanälen herzustellen, die Sie nicht kontrollieren, außerdem sollten Sie sich auf eine möglichst kleine Anzahl von Abhängigkeiten beschränken." #. type: subsection -#: doc/guix.texi:3921 +#: doc/guix.texi:3919 #, no-wrap msgid "Replicating Guix" msgstr "Guix nachbilden" #. type: cindex -#: doc/guix.texi:3923 +#: doc/guix.texi:3921 #, no-wrap msgid "pinning, channels" msgstr "Festsetzen, bei Kanälen" #. type: cindex -#: doc/guix.texi:3924 doc/guix.texi:4090 +#: doc/guix.texi:3922 doc/guix.texi:4088 #, no-wrap msgid "replicating Guix" msgstr "Nachbilden von Guix" #. type: cindex -#: doc/guix.texi:3925 +#: doc/guix.texi:3923 #, no-wrap msgid "reproducibility, of Guix" msgstr "Reproduzierbarkeit von Guix" #. type: Plain text -#: doc/guix.texi:3930 +#: doc/guix.texi:3928 msgid "The @command{guix pull --list-generations} output above shows precisely which commits were used to build this instance of Guix. We can thus replicate it, say, on another machine, by providing a channel specification in @file{~/.config/guix/channels.scm} that is ``pinned'' to these commits:" msgstr "Die Ausgabe von @command{guix pull --list-generations} oben zeigt genau, aus welchen Commits diese Guix-Instanz erstellt wurde. Wir können Guix so zum Beispiel auf einer anderen Maschine nachbilden, indem wir eine Kanalspezifikation in @file{~/.config/guix/channels.scm} angeben, die auf diese Commits „festgesetzt“ ist." #. type: lisp -#: doc/guix.texi:3941 +#: doc/guix.texi:3939 #, no-wrap msgid "" ";; Deploy specific commits of my channels of interest.\n" @@ -8533,60 +8544,60 @@ msgstr "" " (branch \"dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb\")))\n" #. type: Plain text -#: doc/guix.texi:3945 +#: doc/guix.texi:3943 msgid "The @command{guix describe --format=channels} command can even generate this list of channels directly (@pxref{Invoking guix describe})." msgstr "Der Befehl @command{guix describe --format=channels} kann diese Kanalliste sogar direkt erzeugen (siehe @ref{Invoking guix describe})." #. type: Plain text -#: doc/guix.texi:3952 +#: doc/guix.texi:3950 msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}. The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine. It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines." msgstr "Somit läuft auf beiden Maschinen @emph{genau dasselbe Guix} und es hat Zugang zu @emph{genau denselben Paketen}. Die Ausgabe von @command{guix build gimp} auf der einen Maschine wird Bit für Bit genau dieselbe wie die desselben Befehls auf der anderen Maschine sein. Das bedeutet auch, dass beide Maschinen Zugang zum gesamten Quellcode von Guix und daher auch transitiv Zugang zum Quellcode jedes davon definierten Pakets haben." #. type: Plain text -#: doc/guix.texi:3957 +#: doc/guix.texi:3955 msgid "This gives you super powers, allowing you to track the provenance of binary artifacts with very fine grain, and to reproduce software environments at will---some sort of ``meta reproducibility'' capabilities, if you will. @xref{Inferiors}, for another way to take advantage of these super powers." msgstr "Das verleiht Ihnen Superkräfte, mit denen Sie die Provenienz binärer Artefakte sehr feinkörnig nachverfolgen können und Software-Umgebungen nach Belieben nachbilden können. Sie können es als eine Art Fähigkeit zur „Meta-Reproduzierbarkeit“ auffassen, wenn Sie möchten. Der Abschnitt @ref{Inferiors} beschreibt eine weitere Möglichkeit, diese Superkräfte zu nutzen." #. type: quotation -#: doc/guix.texi:3965 +#: doc/guix.texi:3963 msgid "The functionality described here is a ``technology preview'' as of version @value{VERSION}. As such, the interface is subject to change." msgstr "Die hier beschriebenen Funktionalitäten sind in der Version @value{VERSION} bloß eine „Technologie-Vorschau“, daher kann sich die Schnittstelle in Zukunft noch ändern." #. type: cindex -#: doc/guix.texi:3967 doc/guix.texi:7549 +#: doc/guix.texi:3965 doc/guix.texi:7547 #, no-wrap msgid "inferiors" msgstr "Untergeordnete" #. type: cindex -#: doc/guix.texi:3968 +#: doc/guix.texi:3966 #, no-wrap msgid "composition of Guix revisions" msgstr "Mischen von Guix-Versionen" #. type: Plain text -#: doc/guix.texi:3973 +#: doc/guix.texi:3971 msgid "Sometimes you might need to mix packages from the revision of Guix you're currently running with packages available in a different revision of Guix. Guix @dfn{inferiors} allow you to achieve that by composing different Guix revisions in arbitrary ways." msgstr "Manchmal könnten Sie Pakete aus der gerade laufenden Fassung von Guix mit denen mischen wollen, die in einer anderen Guix-Version verfügbar sind. Guix-@dfn{Untergeordnete} ermöglichen dies, indem Sie verschiedene Guix-Versionen beliebig mischen können." #. type: cindex -#: doc/guix.texi:3974 doc/guix.texi:4039 +#: doc/guix.texi:3972 doc/guix.texi:4037 #, no-wrap msgid "inferior packages" msgstr "untergeordnete Pakete" #. type: Plain text -#: doc/guix.texi:3980 +#: doc/guix.texi:3978 msgid "Technically, an ``inferior'' is essentially a separate Guix process connected to your main Guix process through a REPL (@pxref{Invoking guix repl}). The @code{(guix inferior)} module allows you to create inferiors and to communicate with them. It also provides a high-level interface to browse and manipulate the packages that an inferior provides---@dfn{inferior packages}." msgstr "Aus technischer Sicht ist ein „Untergeordneter“ im Kern ein separater Guix-Prozess, der über eine REPL (siehe @ref{Invoking guix repl}) mit Ihrem Haupt-Guix-Prozess verbunden ist. Das Modul @code{(guix inferior)} ermöglicht es Ihnen, Untergeordnete zu erstellen und mit ihnen zu kommunizieren. Dadurch steht Ihnen auch eine hochsprachliche Schnittstelle zur Verfügung, um die von einem Untergeordneten angebotenen Pakete zu durchsuchen und zu verändern — @dfn{untergeordnete Pakete}." #. type: Plain text -#: doc/guix.texi:3990 +#: doc/guix.texi:3988 msgid "When combined with channels (@pxref{Channels}), inferiors provide a simple way to interact with a separate revision of Guix. For example, let's assume you want to install in your profile the current @code{guile} package, along with the @code{guile-json} as it existed in an older revision of Guix---perhaps because the newer @code{guile-json} has an incompatible API and you want to run your code against the old API@. To do that, you could write a manifest for use by @code{guix package --manifest} (@pxref{Invoking guix package}); in that manifest, you would create an inferior for that old Guix revision you care about, and you would look up the @code{guile-json} package in the inferior:" msgstr "In Kombination mit Kanälen (siehe @ref{Channels}) bieten Untergeordnete eine einfache Möglichkeit, mit einer anderen Version von Guix zu interagieren. Nehmen wir zum Beispiel an, Sie wollen das aktuelle @code{guile}-Paket in Ihr Profil installieren, zusammen mit dem @code{guile-json}, wie es in einer früheren Guix-Version existiert hat — vielleicht weil das neuere @code{guile-json} eine inkompatible API hat und Sie daher Ihren Code mit der alten API benutzen möchten. Dazu könnten Sie ein Manifest für @code{guix package --manifest} schreiben (siehe @ref{Invoking guix package}); in diesem Manifest würden Sie einen Untergeordneten für diese alte Guix-Version erzeugen, für die Sie sich interessieren, und aus diesem Untergeordneten das @code{guile-json}-Paket holen:" #. type: lisp -#: doc/guix.texi:3994 +#: doc/guix.texi:3992 #, no-wrap msgid "" "(use-modules (guix inferior) (guix channels)\n" @@ -8598,7 +8609,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:4003 +#: doc/guix.texi:4001 #, no-wrap msgid "" "(define channels\n" @@ -8622,7 +8633,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:4007 +#: doc/guix.texi:4005 #, no-wrap msgid "" "(define inferior\n" @@ -8636,7 +8647,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:4013 +#: doc/guix.texi:4011 #, no-wrap msgid "" ";; Now create a manifest with the current \"guile\" package\n" @@ -8652,186 +8663,186 @@ msgstr "" " (specification->package \"guile\")))\n" #. type: Plain text -#: doc/guix.texi:4018 +#: doc/guix.texi:4016 msgid "On its first run, @command{guix package --manifest} might have to build the channel you specified before it can create the inferior; subsequent runs will be much faster because the Guix revision will be cached." msgstr "Bei seiner ersten Ausführung könnte für @command{guix package --manifest} erst der angegebene Kanal erstellt werden müssen, bevor der Untergeordnete erstellt werden kann; nachfolgende Durchläufe sind wesentlich schneller, weil diese Guix-Version bereits zwischengespeichert ist." #. type: Plain text -#: doc/guix.texi:4021 +#: doc/guix.texi:4019 msgid "The @code{(guix inferior)} module provides the following procedures to open an inferior:" msgstr "Folgende Prozeduren werden im Modul @code{(guix inferior)} angeboten, um einen Untergeordneten zu öffnen:" #. type: deffn -#: doc/guix.texi:4022 +#: doc/guix.texi:4020 #, no-wrap msgid "{Scheme Procedure} inferior-for-channels @var{channels} @" msgstr "{Scheme-Prozedur} inferior-for-channels @var{Kanäle} @" #. type: deffn -#: doc/guix.texi:4027 +#: doc/guix.texi:4025 msgid "[#:cache-directory] [#:ttl] Return an inferior for @var{channels}, a list of channels. Use the cache at @var{cache-directory}, where entries can be reclaimed after @var{ttl} seconds. This procedure opens a new connection to the build daemon." msgstr "[#:cache-directory] [#:ttl] Liefert einen Untergeordneten für die @var{Kanäle}, einer Liste von Kanälen. Dazu wird der Zwischenspeicher im Verzeichnis @var{cache-directory} benutzt, dessen Einträge nach @var{ttl} Sekunden gesammelt werden dürfen. Mit dieser Prozedur wird eine neue Verbindung zum Erstellungs-Daemon geöffnet." #. type: deffn -#: doc/guix.texi:4030 +#: doc/guix.texi:4028 msgid "As a side effect, this procedure may build or substitute binaries for @var{channels}, which can take time." msgstr "Als Nebenwirkung erstellt oder substituiert diese Prozedur unter Umständen Binärdateien für die @var{Kanäle}, was einige Zeit in Anspruch nehmen kann." #. type: deffn -#: doc/guix.texi:4032 +#: doc/guix.texi:4030 #, no-wrap msgid "{Scheme Procedure} open-inferior @var{directory} @" msgstr "{Scheme-Prozedur} open-inferior @var{Verzeichnis} @" #. type: deffn -#: doc/guix.texi:4037 +#: doc/guix.texi:4035 msgid "[#:command \"bin/guix\"] Open the inferior Guix in @var{directory}, running @code{@var{directory}/@var{command} repl} or equivalent. Return @code{#f} if the inferior could not be launched." msgstr "[#:command \"bin/guix\"] Öffnet das untergeordnete Guix mit dem Befehl @var{command} im angegebenen @var{Verzeichnis} durch Ausführung von @code{@var{Verzeichnis}/@var{command} repl} oder entsprechend. Liefert @code{#f}, wenn der Untergeordnete nicht gestartet werden konnte." #. type: Plain text -#: doc/guix.texi:4042 +#: doc/guix.texi:4040 msgid "The procedures listed below allow you to obtain and manipulate inferior packages." msgstr "Die im Folgenden aufgeführten Prozeduren ermöglichen es Ihnen, untergeordnete Pakete abzurufen und zu verändern." #. type: deffn -#: doc/guix.texi:4043 +#: doc/guix.texi:4041 #, no-wrap msgid "{Scheme Procedure} inferior-packages @var{inferior}" msgstr "{Scheme-Prozedur} inferior-packages @var{Untergeordneter}" #. type: deffn -#: doc/guix.texi:4045 +#: doc/guix.texi:4043 msgid "Return the list of packages known to @var{inferior}." msgstr "Liefert die Liste der Pakete in @var{Untergeordneter}." #. type: deffn -#: doc/guix.texi:4047 +#: doc/guix.texi:4045 #, no-wrap msgid "{Scheme Procedure} lookup-inferior-packages @var{inferior} @var{name} @" msgstr "{Scheme-Prozedur} lookup-inferior-packages @var{Untergeordneter} @var{Name} @" #. type: deffn -#: doc/guix.texi:4052 +#: doc/guix.texi:4050 msgid "[@var{version}] Return the sorted list of inferior packages matching @var{name} in @var{inferior}, with highest version numbers first. If @var{version} is true, return only packages with a version number prefixed by @var{version}." msgstr "[@var{Version}] Liefert die sortierte Liste der untergeordneten Pakete in @var{Untergeordneter}, die zum Muster @var{Name} in @var{Untergeordneter} passen, dabei kommen höhere Versionsnummern zuerst. Wenn @var{Version} auf wahr gesetzt ist, werden nur Pakete geliefert, deren Versionsnummer mit dem Präfix @var{Version} beginnt." #. type: deffn -#: doc/guix.texi:4054 +#: doc/guix.texi:4052 #, no-wrap msgid "{Scheme Procedure} inferior-package? @var{obj}" msgstr "{Scheme-Prozedur} inferior-package? @var{Objekt}" #. type: deffn -#: doc/guix.texi:4056 +#: doc/guix.texi:4054 msgid "Return true if @var{obj} is an inferior package." msgstr "Liefert wahr, wenn das @var{obj} ein Untergeordneter ist." #. type: deffn -#: doc/guix.texi:4058 +#: doc/guix.texi:4056 #, no-wrap msgid "{Scheme Procedure} inferior-package-name @var{package}" msgstr "{Scheme-Prozedur} inferior-package-name @var{Paket}" #. type: deffnx -#: doc/guix.texi:4059 +#: doc/guix.texi:4057 #, no-wrap msgid "{Scheme Procedure} inferior-package-version @var{package}" msgstr "{Scheme-Prozedur} inferior-package-version @var{Paket}" #. type: deffnx -#: doc/guix.texi:4060 +#: doc/guix.texi:4058 #, no-wrap msgid "{Scheme Procedure} inferior-package-synopsis @var{package}" msgstr "{Scheme-Prozedur} inferior-package-synopsis @var{Paket}" #. type: deffnx -#: doc/guix.texi:4061 +#: doc/guix.texi:4059 #, no-wrap msgid "{Scheme Procedure} inferior-package-description @var{package}" msgstr "{Scheme-Prozedur} inferior-package-description @var{Paket}" #. type: deffnx -#: doc/guix.texi:4062 +#: doc/guix.texi:4060 #, no-wrap msgid "{Scheme Procedure} inferior-package-home-page @var{package}" msgstr "{Scheme-Prozedur} inferior-package-home-page @var{Paket}" #. type: deffnx -#: doc/guix.texi:4063 +#: doc/guix.texi:4061 #, no-wrap msgid "{Scheme Procedure} inferior-package-location @var{package}" msgstr "{Scheme-Prozedur} inferior-package-location @var{Paket}" #. type: deffnx -#: doc/guix.texi:4064 +#: doc/guix.texi:4062 #, no-wrap msgid "{Scheme Procedure} inferior-package-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4065 +#: doc/guix.texi:4063 #, no-wrap msgid "{Scheme Procedure} inferior-package-native-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-native-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4066 +#: doc/guix.texi:4064 #, no-wrap msgid "{Scheme Procedure} inferior-package-propagated-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-propagated-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4067 +#: doc/guix.texi:4065 #, no-wrap msgid "{Scheme Procedure} inferior-package-transitive-propagated-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-transitive-propagated-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4068 +#: doc/guix.texi:4066 #, no-wrap msgid "{Scheme Procedure} inferior-package-native-search-paths @var{package}" msgstr "{Scheme-Prozedur} inferior-package-native-search-paths @var{Paket}" #. type: deffnx -#: doc/guix.texi:4069 +#: doc/guix.texi:4067 #, no-wrap msgid "{Scheme Procedure} inferior-package-transitive-native-search-paths @var{package}" msgstr "{Scheme-Prozedur} inferior-package-transitive-native-search-paths @var{Paket}" #. type: deffnx -#: doc/guix.texi:4070 +#: doc/guix.texi:4068 #, no-wrap msgid "{Scheme Procedure} inferior-package-search-paths @var{package}" msgstr "{Scheme-Prozedur} inferior-package-search-paths @var{Paket}" #. type: deffn -#: doc/guix.texi:4075 +#: doc/guix.texi:4073 msgid "These procedures are the counterpart of package record accessors (@pxref{package Reference}). Most of them work by querying the inferior @var{package} comes from, so the inferior must still be live when you call these procedures." msgstr "Diese Prozeduren sind das Gegenstück zu den Zugriffsmethoden des Verbunds „package“ für Pakete (siehe @ref{package Reference}). Die meisten davon funktionieren durch eine Abfrage auf dem Untergeordneten, von dem das @var{Paket} kommt, weshalb der Untergeordnete noch lebendig sein muss, wenn Sie diese Prozeduren aufrufen." #. type: Plain text -#: doc/guix.texi:4085 +#: doc/guix.texi:4083 msgid "Inferior packages can be used transparently like any other package or file-like object in G-expressions (@pxref{G-Expressions}). They are also transparently handled by the @code{packages->manifest} procedure, which is commonly use in manifests (@pxref{Invoking guix package, the @option{--manifest} option of @command{guix package}}). Thus you can insert an inferior package pretty much anywhere you would insert a regular package: in manifests, in the @code{packages} field of your @code{operating-system} declaration, and so on." msgstr "Untergeordnete Pakete können transparent wie jedes andere Paket oder dateiartige Objekt in G-Ausdrücken verwendet werden (siehe @ref{G-Expressions}). Sie werden auch transparent wie reguläre Pakete von der Prozedur @code{packages->manifest} behandelt, welche oft in Manifesten benutzt wird (siehe @ref{Invoking guix package, siehe die Befehlszeilenoption @option{--manifest} von @command{guix package}}). Somit können Sie ein untergeordnetes Paket ziemlich überall dort verwenden, wo Sie ein reguläres Paket einfügen würden: in Manifesten, im Feld @code{packages} Ihrer @code{operating-system}-Deklaration und so weiter." #. type: section -#: doc/guix.texi:4087 +#: doc/guix.texi:4085 #, no-wrap msgid "Invoking @command{guix describe}" msgstr "@command{guix describe} aufrufen" #. type: Plain text -#: doc/guix.texi:4098 +#: doc/guix.texi:4096 msgid "Often you may want to answer questions like: ``Which revision of Guix am I using?'' or ``Which channels am I using?'' This is useful information in many situations: if you want to @emph{replicate} an environment on a different machine or user account, if you want to report a bug or to determine what change in the channels you are using caused it, or if you want to record your system state for reproducibility purposes. The @command{guix describe} command answers these questions." msgstr "Sie könnten sich des Öfteren Fragen stellen wie: „Welche Version von Guix benutze ich gerade?“ oder „Welche Kanäle benutze ich?“ Diese Informationen sind in vielen Situationen nützlich: wenn Sie eine Umgebung auf einer anderen Maschine oder mit einem anderen Benutzerkonto @emph{nachbilden} möchten, wenn Sie einen Fehler melden möchten, wenn Sie festzustellen versuchen, welche Änderung an den von Ihnen verwendeten Kanälen diesen Fehler verursacht hat, oder wenn Sie Ihren Systemzustand zum Zweck der Reproduzierbarkeit festhalten möchten. Der Befehl @command{guix describe} gibt Ihnen Antwort auf diese Fragen." #. type: Plain text -#: doc/guix.texi:4102 +#: doc/guix.texi:4100 msgid "When run from a @command{guix pull}ed @command{guix}, @command{guix describe} displays the channel(s) that it was built from, including their repository URL and commit IDs (@pxref{Channels}):" msgstr "Wenn Sie ihn aus einem mit @command{guix pull} bezogenen @command{guix} heraus ausführen, zeigt Ihnen @command{guix describe} die Kanäle an, aus denen es erstellt wurde, jeweils mitsamt ihrer Repository-URL und Commit-ID (siehe @ref{Channels}):" #. type: example -#: doc/guix.texi:4110 +#: doc/guix.texi:4108 #, no-wrap msgid "" "$ guix describe\n" @@ -8849,17 +8860,17 @@ msgstr "" " commit: e0fa68c7718fffd33d81af415279d6ddb518f727\n" #. type: Plain text -#: doc/guix.texi:4119 +#: doc/guix.texi:4117 msgid "If you're familiar with the Git version control system, this is similar in spirit to @command{git describe}; the output is also similar to that of @command{guix pull --list-generations}, but limited to the current generation (@pxref{Invoking guix pull, the @option{--list-generations} option}). Because the Git commit ID shown above unambiguously refers to a snapshot of Guix, this information is all it takes to describe the revision of Guix you're using, and also to replicate it." msgstr "Wenn Sie mit dem Versionskontrollsystem Git vertraut sind, erkennen Sie vielleicht die Ähnlichkeit zu @command{git describe}; die Ausgabe ähnelt auch der von @command{guix pull --list-generations} eingeschränkt auf die aktuelle Generation (siehe @ref{Invoking guix pull, die Befehlszeilenoption @option{--list-generations}}). Weil die oben gezeigte Git-Commit-ID eindeutig eine bestimmte Version von Guix bezeichnet, genügt diese Information, um die von Ihnen benutzte Version von Guix zu beschreiben, und auch, um sie nachzubilden." #. type: Plain text -#: doc/guix.texi:4122 +#: doc/guix.texi:4120 msgid "To make it easier to replicate Guix, @command{guix describe} can also be asked to return a list of channels instead of the human-readable description above:" msgstr "Damit es leichter ist, Guix nachzubilden, kann Ihnen @command{guix describe} auch eine Liste der Kanäle statt einer menschenlesbaren Beschreibung wie oben liefern:" #. type: example -#: doc/guix.texi:4130 +#: doc/guix.texi:4128 #, no-wrap msgid "" "$ guix describe -f channels\n" @@ -8877,160 +8888,160 @@ msgstr "" " \"e0fa68c7718fffd33d81af415279d6ddb518f727\")))\n" #. type: Plain text -#: doc/guix.texi:4139 +#: doc/guix.texi:4137 msgid "You can save this to a file and feed it to @command{guix pull -C} on some other machine or at a later point in time, which will instantiate @emph{this exact Guix revision} (@pxref{Invoking guix pull, the @option{-C} option}). From there on, since you're able to deploy the same revision of Guix, you can just as well @emph{replicate a complete software environment}. We humbly think that this is @emph{awesome}, and we hope you'll like it too!" msgstr "Sie können die Ausgabe in einer Datei speichern, die Sie an @command{guix pull -C} auf einer anderen Maschine oder zu einem späteren Zeitpunkt übergeben, wodurch dann eine Instanz @emph{von genau derselben Guix-Version} installiert wird (siehe @ref{Invoking guix pull, die Befehlszeilenoption @option{-C}}). Daraufhin können Sie, weil Sie jederzeit dieselbe Version von Guix installieren können, auch gleich @emph{eine vollständige Softwareumgebung genau nachbilden}. Wir halten das trotz aller Bescheidenheit für @emph{klasse} und hoffen, dass Ihnen das auch gefällt!" #. type: Plain text -#: doc/guix.texi:4142 +#: doc/guix.texi:4140 msgid "The details of the options supported by @command{guix describe} are as follows:" msgstr "Die genauen Befehlszeilenoptionen, die @command{guix describe} unterstützt, lauten wie folgt:" #. type: item -#: doc/guix.texi:4144 doc/guix.texi:4788 +#: doc/guix.texi:4142 doc/guix.texi:4786 #, no-wrap msgid "--format=@var{format}" msgstr "--format=@var{Format}" #. type: itemx -#: doc/guix.texi:4145 doc/guix.texi:4789 +#: doc/guix.texi:4143 doc/guix.texi:4787 #, no-wrap msgid "-f @var{format}" msgstr "-f @var{Format}" #. type: table -#: doc/guix.texi:4147 +#: doc/guix.texi:4145 msgid "Produce output in the specified @var{format}, one of:" msgstr "Die Ausgabe im angegebenen @var{Format} generieren, was eines der Folgenden sein muss:" #. type: item -#: doc/guix.texi:4149 +#: doc/guix.texi:4147 #, no-wrap msgid "human" msgstr "human" #. type: table -#: doc/guix.texi:4151 +#: doc/guix.texi:4149 msgid "produce human-readable output;" msgstr "für menschenlesbare Ausgabe," #. type: table -#: doc/guix.texi:4155 +#: doc/guix.texi:4153 msgid "produce a list of channel specifications that can be passed to @command{guix pull -C} or installed as @file{~/.config/guix/channels.scm} (@pxref{Invoking guix pull});" msgstr "eine Liste von Kanalspezifikationen erzeugen, die an @command{guix pull -C} übergeben werden oder als @file{~/.config/guix/channels.scm} eingesetzt werden können (siehe @ref{Invoking guix pull})," #. type: item -#: doc/guix.texi:4155 doc/guix.texi:8586 +#: doc/guix.texi:4153 doc/guix.texi:8584 #, no-wrap msgid "json" msgstr "json" #. type: cindex -#: doc/guix.texi:4156 +#: doc/guix.texi:4154 #, no-wrap msgid "JSON" msgstr "JSON" #. type: table -#: doc/guix.texi:4158 +#: doc/guix.texi:4156 msgid "produce a list of channel specifications in JSON format;" msgstr "generiert eine Liste von Kanalspezifikationen im JSON-Format," #. type: item -#: doc/guix.texi:4158 +#: doc/guix.texi:4156 #, no-wrap msgid "recutils" msgstr "recutils" #. type: table -#: doc/guix.texi:4160 +#: doc/guix.texi:4158 msgid "produce a list of channel specifications in Recutils format." msgstr "generiert eine Liste von Kanalspezifikationen im Recutils-Format." #. type: table -#: doc/guix.texi:4165 +#: doc/guix.texi:4163 msgid "Display information about @var{profile}." msgstr "Informationen über das @var{Profil} anzeigen." #. type: section -#: doc/guix.texi:4168 +#: doc/guix.texi:4166 #, no-wrap msgid "Invoking @command{guix archive}" msgstr "@command{guix archive} aufrufen" #. type: command{#1} -#: doc/guix.texi:4170 +#: doc/guix.texi:4168 #, no-wrap msgid "guix archive" msgstr "guix archive" #. type: cindex -#: doc/guix.texi:4171 +#: doc/guix.texi:4169 #, no-wrap msgid "archive" msgstr "Archivdateien" #. type: Plain text -#: doc/guix.texi:4177 +#: doc/guix.texi:4175 msgid "The @command{guix archive} command allows users to @dfn{export} files from the store into a single archive, and to later @dfn{import} them on a machine that runs Guix. In particular, it allows store files to be transferred from one machine to the store on another machine." msgstr "Der Befehl @command{guix archive} ermöglicht es Nutzern, Dateien im Store in eine einzelne Archivdatei zu @dfn{exportieren} und diese später auf einer Maschine, auf der Guix läuft, zu @dfn{importieren}. Insbesondere können so Store-Objekte von einer Maschine in den Store einer anderen Maschine übertragen werden." #. type: quotation -#: doc/guix.texi:4181 +#: doc/guix.texi:4179 msgid "If you're looking for a way to produce archives in a format suitable for tools other than Guix, @pxref{Invoking guix pack}." msgstr "Wenn Sie nach einer Möglichkeit suchen, Archivdateien für andere Werkzeuge als Guix zu erstellen, finden Sie Informationen dazu im Abschnitt @ref{Invoking guix pack}." #. type: cindex -#: doc/guix.texi:4183 +#: doc/guix.texi:4181 #, no-wrap msgid "exporting store items" msgstr "Store-Objekte exportieren" #. type: Plain text -#: doc/guix.texi:4185 +#: doc/guix.texi:4183 msgid "To export store files as an archive to standard output, run:" msgstr "Führen Sie Folgendes aus, um Store-Dateien als ein Archiv auf die Standardausgabe zu exportieren:" #. type: example -#: doc/guix.texi:4188 +#: doc/guix.texi:4186 #, no-wrap msgid "guix archive --export @var{options} @var{specifications}...\n" msgstr "guix archive --export @var{Optionen} @var{Spezifikationen}…\n" #. type: Plain text -#: doc/guix.texi:4195 +#: doc/guix.texi:4193 msgid "@var{specifications} may be either store file names or package specifications, as for @command{guix package} (@pxref{Invoking guix package}). For instance, the following command creates an archive containing the @code{gui} output of the @code{git} package and the main output of @code{emacs}:" msgstr "@var{Spezifikationen} sind dabei entweder die Namen von Store-Dateien oder Paketspezifikationen wie bei @command{guix package} (siehe @ref{Invoking guix package}). Zum Beispiel erzeugt der folgende Befehl ein Archiv der @code{gui}-Ausgabe des Pakets @code{git} sowie die Hauptausgabe von @code{emacs}:" #. type: example -#: doc/guix.texi:4198 +#: doc/guix.texi:4196 #, no-wrap msgid "guix archive --export git:gui /gnu/store/...-emacs-24.3 > great.nar\n" msgstr "guix archive --export git:gui /gnu/store/…-emacs-24.3 > groß.nar\n" #. type: Plain text -#: doc/guix.texi:4203 +#: doc/guix.texi:4201 msgid "If the specified packages are not built yet, @command{guix archive} automatically builds them. The build process may be controlled with the common build options (@pxref{Common Build Options})." msgstr "Wenn die angegebenen Pakete noch nicht erstellt worden sind, werden sie durch @command{guix archive} automatisch erstellt. Der Erstellungsprozess kann durch die gemeinsamen Erstellungsoptionen gesteuert werden (siehe @ref{Common Build Options})." #. type: Plain text -#: doc/guix.texi:4206 +#: doc/guix.texi:4204 msgid "To transfer the @code{emacs} package to a machine connected over SSH, one would run:" msgstr "Um das @code{emacs}-Paket auf eine über SSH verbundene Maschine zu übertragen, würde man dies ausführen:" #. type: example -#: doc/guix.texi:4209 +#: doc/guix.texi:4207 #, no-wrap msgid "guix archive --export -r emacs | ssh the-machine guix archive --import\n" msgstr "guix archive --export -r emacs | ssh die-maschine guix archive --import\n" #. type: Plain text -#: doc/guix.texi:4214 +#: doc/guix.texi:4212 msgid "Similarly, a complete user profile may be transferred from one machine to another like this:" msgstr "Auf gleiche Art kann auch ein vollständiges Benutzerprofil von einer Maschine auf eine andere übertragen werden:" #. type: example -#: doc/guix.texi:4218 +#: doc/guix.texi:4216 #, no-wrap msgid "" "guix archive --export -r $(readlink -f ~/.guix-profile) | \\\n" @@ -9040,162 +9051,162 @@ msgstr "" " ssh die-maschine guix-archive --import\n" #. type: Plain text -#: doc/guix.texi:4228 +#: doc/guix.texi:4226 msgid "However, note that, in both examples, all of @code{emacs} and the profile as well as all of their dependencies are transferred (due to @code{-r}), regardless of what is already available in the store on the target machine. The @code{--missing} option can help figure out which items are missing from the target store. The @command{guix copy} command simplifies and optimizes this whole process, so this is probably what you should use in this case (@pxref{Invoking guix copy})." msgstr "Jedoch sollten Sie in beiden Beispielen beachten, dass alles, was zu @code{emacs}, dem Profil oder deren Abhängigkeiten (wegen @code{-r}) gehört, übertragen wird, egal ob es schon im Store der Zielmaschine vorhanden ist oder nicht. Mit der Befehlszeilenoption @code{--missing} lässt sich herausfinden, welche Objekte im Ziel-Store noch fehlen. Der Befehl @command{guix copy} vereinfacht und optimiert diesen gesamten Prozess, ist also, was Sie in diesem Fall wahrscheinlich eher benutzen wollten (siehe @ref{Invoking guix copy})." #. type: cindex -#: doc/guix.texi:4229 +#: doc/guix.texi:4227 #, no-wrap msgid "nar, archive format" msgstr "Nar, Archivformat" #. type: cindex -#: doc/guix.texi:4230 +#: doc/guix.texi:4228 #, no-wrap msgid "normalized archive (nar)" msgstr "Normalisiertes Archiv (Nar)" #. type: Plain text -#: doc/guix.texi:4240 +#: doc/guix.texi:4238 msgid "Archives are stored in the ``normalized archive'' or ``nar'' format, which is comparable in spirit to `tar', but with differences that make it more appropriate for our purposes. First, rather than recording all Unix metadata for each file, the nar format only mentions the file type (regular, directory, or symbolic link); Unix permissions and owner/group are dismissed. Second, the order in which directory entries are stored always follows the order of file names according to the C locale collation order. This makes archive production fully deterministic." msgstr "Archive werden als „Normalisiertes Archiv“, kurz „Nar“, formatiert. Diese Technik folgt einem ähnlichen Gedanken wie beim „tar“-Format, unterscheidet sich aber auf eine für unsere Zwecke angemessene Art. Erstens werden im Nar-Format nicht sämtliche Unix-Metadaten aller Dateien aufgenommen, sondern nur der Dateityp (ob es sich um eine reguläre Datei, ein Verzeichnis oder eine symbolische Verknüpfung handelt). Unix-Dateiberechtigungen sowie Besitzer und Gruppe werden nicht gespeichert. Zweitens entspricht die Reihenfolge, in der der Inhalt von Verzeichnissen abgelegt wird, immer der Reihenfolge, in der die Dateinamen gemäß der C-Locale sortiert würden. Dadurch wird die Erstellung von Archivdateien völlig deterministisch." #. type: Plain text -#: doc/guix.texi:4246 +#: doc/guix.texi:4244 msgid "When exporting, the daemon digitally signs the contents of the archive, and that digital signature is appended. When importing, the daemon verifies the signature and rejects the import in case of an invalid signature or if the signing key is not authorized." msgstr "Beim Exportieren versieht der Daemon den Inhalt des Archivs mit einer digitalen Signatur, auch Beglaubigung genannt. Diese digitale Signatur wird an das Archiv angehängt. Beim Importieren verifiziert der Daemon die Signatur und lehnt den Import ab, falls die Signatur ungültig oder der signierende Schlüssel nicht autorisiert ist." #. type: Plain text -#: doc/guix.texi:4248 +#: doc/guix.texi:4246 msgid "The main options are:" msgstr "Die wichtigsten Befehlszeilenoptionen sind:" #. type: item -#: doc/guix.texi:4250 +#: doc/guix.texi:4248 #, no-wrap msgid "--export" msgstr "--export" #. type: table -#: doc/guix.texi:4253 +#: doc/guix.texi:4251 msgid "Export the specified store files or packages (see below.) Write the resulting archive to the standard output." msgstr "Exportiert die angegebenen Store-Dateien oder Pakete (siehe unten) und schreibt das resultierende Archiv auf die Standardausgabe." #. type: table -#: doc/guix.texi:4256 +#: doc/guix.texi:4254 msgid "Dependencies are @emph{not} included in the output, unless @code{--recursive} is passed." msgstr "Abhängigkeiten @emph{fehlen} in der Ausgabe, außer wenn @code{--recursive} angegeben wurde." #. type: itemx -#: doc/guix.texi:4257 doc/guix.texi:8374 doc/guix.texi:8471 doc/guix.texi:8496 -#: doc/guix.texi:8691 doc/guix.texi:8732 doc/guix.texi:8779 +#: doc/guix.texi:4255 doc/guix.texi:8372 doc/guix.texi:8469 doc/guix.texi:8494 +#: doc/guix.texi:8689 doc/guix.texi:8730 doc/guix.texi:8777 #, no-wrap msgid "-r" msgstr "-r" #. type: item -#: doc/guix.texi:4258 doc/guix.texi:8373 doc/guix.texi:8470 doc/guix.texi:8495 -#: doc/guix.texi:8690 doc/guix.texi:8731 doc/guix.texi:8778 doc/guix.texi:8835 +#: doc/guix.texi:4256 doc/guix.texi:8371 doc/guix.texi:8468 doc/guix.texi:8493 +#: doc/guix.texi:8688 doc/guix.texi:8729 doc/guix.texi:8776 doc/guix.texi:8833 #, no-wrap msgid "--recursive" msgstr "--recursive" #. type: table -#: doc/guix.texi:4263 +#: doc/guix.texi:4261 msgid "When combined with @code{--export}, this instructs @command{guix archive} to include dependencies of the given items in the archive. Thus, the resulting archive is self-contained: it contains the closure of the exported store items." msgstr "Zusammen mit @code{--export} wird @command{guix archive} hiermit angewiesen, Abhängigkeiten der angegebenen Objekte auch ins Archiv aufzunehmen. Das resultierende Archiv ist somit eigenständig; es enthält den Abschluss der exportierten Store-Objekte." #. type: item -#: doc/guix.texi:4264 +#: doc/guix.texi:4262 #, no-wrap msgid "--import" msgstr "--import" #. type: table -#: doc/guix.texi:4269 +#: doc/guix.texi:4267 msgid "Read an archive from the standard input, and import the files listed therein into the store. Abort if the archive has an invalid digital signature, or if it is signed by a public key not among the authorized keys (see @code{--authorize} below.)" msgstr "Ein Archiv von der Standardeingabe lesen und darin enthaltende Dateien in den Store importieren. Der Import bricht ab, wenn das Archiv keine gültige digitale Signatur hat oder wenn es von einem öffentlichen Schlüssel signiert wurde, der keiner der autorisierten Schlüssel ist (siehe @code{--authorize} weiter unten)." #. type: item -#: doc/guix.texi:4270 +#: doc/guix.texi:4268 #, no-wrap msgid "--missing" msgstr "--missing" #. type: table -#: doc/guix.texi:4274 +#: doc/guix.texi:4272 msgid "Read a list of store file names from the standard input, one per line, and write on the standard output the subset of these files missing from the store." msgstr "Eine Liste der Store-Dateinamen von der Standardeingabe lesen, je ein Name pro Zeile, und auf die Standardausgabe die Teilmenge dieser Dateien schreiben, die noch nicht im Store vorliegt." #. type: item -#: doc/guix.texi:4275 +#: doc/guix.texi:4273 #, no-wrap msgid "--generate-key[=@var{parameters}]" msgstr "--generate-key[=@var{Parameter}]" #. type: cindex -#: doc/guix.texi:4276 +#: doc/guix.texi:4274 #, no-wrap msgid "signing, archives" msgstr "Signieren, von Archiven" #. type: table -#: doc/guix.texi:4281 +#: doc/guix.texi:4279 msgid "Generate a new key pair for the daemon. This is a prerequisite before archives can be exported with @code{--export}. Note that this operation usually takes time, because it needs to gather enough entropy to generate the key pair." msgstr "Ein neues Schlüsselpaar für den Daemon erzeugen. Dies ist erforderlich, damit Archive mit @code{--export} exportiert werden können. Beachten Sie, dass diese Option normalerweise einige Zeit in Anspruch nimmt, da erst Entropie für die Erzeugung des Schlüsselpaares gesammelt werden muss." #. type: table -#: doc/guix.texi:4291 +#: doc/guix.texi:4289 msgid "The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} (private key, which must be kept secret.) When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key. Alternatively, @var{parameters} can specify @code{genkey} parameters suitable for Libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})." msgstr "Das erzeugte Schlüsselpaar wird typischerweise unter @file{/etc/guix} gespeichert, in den Dateien @file{signing-key.pub} (für den öffentlichen Schlüssel) und @file{signing-key.sec} (für den privaten Schlüssel, der geheim gehalten werden muss). Wurden keine @var{Parameters} angegeben, wird ein ECDSA-Schlüssel unter Verwendung der Kurve Ed25519 erzeugt, oder, falls die Libgcrypt-Version älter als 1.6.0 ist, ein 4096-Bit-RSA-Schlüssel. Sonst geben die @var{Parameter} für Libgcrypt geeignete Parameter für @code{genkey} an (siehe @ref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})." #. type: item -#: doc/guix.texi:4292 +#: doc/guix.texi:4290 #, no-wrap msgid "--authorize" msgstr "--authorize" #. type: cindex -#: doc/guix.texi:4293 +#: doc/guix.texi:4291 #, no-wrap msgid "authorizing, archives" msgstr "Autorisieren, von Archiven" #. type: table -#: doc/guix.texi:4297 +#: doc/guix.texi:4295 msgid "Authorize imports signed by the public key passed on standard input. The public key must be in ``s-expression advanced format''---i.e., the same format as the @file{signing-key.pub} file." msgstr "Mit dem auf der Standardeingabe übergebenen öffentlichen Schlüssel signierte Importe autorisieren. Der öffentliche Schlüssel muss als „advanced“-formatierter S-Ausdruck gespeichert sein, d.h.@: im selben Format wie die Datei @file{signing-key.pub}." #. type: table -#: doc/guix.texi:4304 +#: doc/guix.texi:4302 msgid "The list of authorized keys is kept in the human-editable file @file{/etc/guix/acl}. The file contains @url{https://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format s-expressions''} and is structured as an access-control list in the @url{https://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)}." msgstr "Die Liste autorisierter Schlüssel wird in der Datei @file{/etc/guix/acl} gespeichert, die auch von Hand bearbeitet werden kann. Die Datei enthält @url{https://people.csail.mit.edu/rivest/Sexp.txt, „advanced“-formatierte S-Ausdrücke} und ist als eine Access Control List für die @url{https://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)} aufgebaut." #. type: item -#: doc/guix.texi:4305 +#: doc/guix.texi:4303 #, no-wrap msgid "--extract=@var{directory}" msgstr "--extract=@var{Verzeichnis}" #. type: itemx -#: doc/guix.texi:4306 +#: doc/guix.texi:4304 #, no-wrap msgid "-x @var{directory}" msgstr "-x @var{Verzeichnis}" #. type: table -#: doc/guix.texi:4310 +#: doc/guix.texi:4308 msgid "Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and extract it to @var{directory}. This is a low-level operation needed in only very narrow use cases; see below." msgstr "Ein Archiv mit einem einzelnen Objekt lesen, wie es von Substitutservern geliefert wird (siehe @ref{Substitutes}) und ins @var{Verzeichnis} entpacken. Dies ist eine systemnahe Operation, die man nur selten direkt benutzt; siehe unten." #. type: table -#: doc/guix.texi:4313 +#: doc/guix.texi:4311 msgid "For example, the following command extracts the substitute for Emacs served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:" msgstr "Zum Beispiel entpackt folgender Befehl das Substitut für Emacs, wie es von @code{@value{SUBSTITUTE-SERVER}} geliefert wird, nach @file{/tmp/emacs}:" #. type: example -#: doc/guix.texi:4318 +#: doc/guix.texi:4316 #, no-wrap msgid "" "$ wget -O - \\\n" @@ -9207,108 +9218,108 @@ msgstr "" " | bunzip2 | guix archive -x /tmp/emacs\n" #. type: table -#: doc/guix.texi:4325 +#: doc/guix.texi:4323 msgid "Single-item archives are different from multiple-item archives produced by @command{guix archive --export}; they contain a single store item, and they do @emph{not} embed a signature. Thus this operation does @emph{no} signature verification and its output should be considered unsafe." msgstr "Archive mit nur einem einzelnen Objekt unterscheiden sich von Archiven für mehrere Dateien, wie sie @command{guix archive --export} erzeugt; sie enthalten nur ein einzelnes Store-Objekt und @emph{keine} eingebettete Signatur. Beim Entpacken findet also @emph{keine} Signaturprüfung statt und ihrer Ausgabe sollte so erst einmal nicht vertraut werden." #. type: table -#: doc/guix.texi:4328 +#: doc/guix.texi:4326 msgid "The primary purpose of this operation is to facilitate inspection of archive contents coming from possibly untrusted substitute servers." msgstr "Der eigentliche Zweck dieser Operation ist, die Inspektion von Archivinhalten von Substitutservern möglich zu machen, auch wenn diesen unter Umständen nicht vertraut wird." #. type: cindex -#: doc/guix.texi:4336 +#: doc/guix.texi:4334 #, no-wrap msgid "software development" msgstr "Softwareentwicklung" #. type: Plain text -#: doc/guix.texi:4340 +#: doc/guix.texi:4338 msgid "If you are a software developer, Guix provides tools that you should find helpful---independently of the language you're developing in. This is what this chapter is about." msgstr "Wenn Sie ein Software-Entwickler sind, gibt Ihnen Guix Werkzeuge an die Hand, die Sie für hilfreich erachten dürften — ganz unabhängig davon, in welcher Sprache Sie entwickeln. Darum soll es in diesem Kapitel gehen." #. type: Plain text -#: doc/guix.texi:4346 +#: doc/guix.texi:4344 msgid "The @command{guix environment} command provides a convenient way to set up @dfn{development environments} containing all the dependencies and tools necessary to work on the software package of your choice. The @command{guix pack} command allows you to create @dfn{application bundles} that can be easily distributed to users who do not run Guix." msgstr "Der Befehl @command{guix environment} stellt eine bequeme Möglichkeit dar, wie Sie eine @dfn{Entwicklungsumgebung} aufsetzen können, in der all die Abhängigkeiten und Werkzeuge enthalten sind, die Sie brauchen, wenn Sie an Ihrem Lieblingssoftwarepaket arbeiten. Der Befehl @command{guix pack} macht es Ihnen möglich, @dfn{Anwendungsbündel} zu erstellen, die leicht an Nutzer verteilt werden können, die kein Guix benutzen." #. type: section -#: doc/guix.texi:4353 +#: doc/guix.texi:4351 #, no-wrap msgid "Invoking @command{guix environment}" msgstr "@command{guix environment} aufrufen" #. type: cindex -#: doc/guix.texi:4355 +#: doc/guix.texi:4353 #, no-wrap msgid "reproducible build environments" msgstr "reproduzierbare Erstellungsumgebungen" #. type: cindex -#: doc/guix.texi:4356 +#: doc/guix.texi:4354 #, no-wrap msgid "development environments" msgstr "Entwicklungsumgebungen" #. type: command{#1} -#: doc/guix.texi:4357 +#: doc/guix.texi:4355 #, no-wrap msgid "guix environment" msgstr "guix environment" #. type: cindex -#: doc/guix.texi:4358 +#: doc/guix.texi:4356 #, no-wrap msgid "environment, package build environment" msgstr "Umgebung, Paketerstellungsumgebung" #. type: Plain text -#: doc/guix.texi:4364 +#: doc/guix.texi:4362 msgid "The purpose of @command{guix environment} is to assist hackers in creating reproducible development environments without polluting their package profile. The @command{guix environment} tool takes one or more packages, builds all of their inputs, and creates a shell environment to use them." msgstr "Der Zweck von @command{guix environment} ist es, Hacker beim Aufbau einer reproduzierbaren Entwicklungsumgebung zu unterstützen, ohne dass diese ihr Paketprofil verunreinigen müssen. Das Werkzeug @command{guix environment} nimmt eines oder mehrere Pakete entgegen und erstellt erst all ihre Eingaben, um dann eine Shell-Umgebung herzustellen, in der diese benutzt werden können." #. type: Plain text -#: doc/guix.texi:4366 doc/guix.texi:7623 doc/guix.texi:8351 doc/guix.texi:8418 -#: doc/guix.texi:9207 doc/guix.texi:9580 doc/guix.texi:9885 doc/guix.texi:9951 -#: doc/guix.texi:9990 +#: doc/guix.texi:4364 doc/guix.texi:7621 doc/guix.texi:8349 doc/guix.texi:8416 +#: doc/guix.texi:9205 doc/guix.texi:9578 doc/guix.texi:9883 doc/guix.texi:9949 +#: doc/guix.texi:9988 msgid "The general syntax is:" msgstr "Die allgemeine Syntax lautet:" #. type: example -#: doc/guix.texi:4369 +#: doc/guix.texi:4367 #, no-wrap msgid "guix environment @var{options} @var{package}@dots{}\n" msgstr "guix environment @var{Optionen} @var{Paket}…\n" #. type: Plain text -#: doc/guix.texi:4373 +#: doc/guix.texi:4371 msgid "The following example spawns a new shell set up for the development of GNU@tie{}Guile:" msgstr "Folgendes Beispiel zeigt, wie eine neue Shell gestartet wird, auf der alles für die Entwicklung von GNU@tie{}Guile eingerichtet ist:" #. type: example -#: doc/guix.texi:4376 +#: doc/guix.texi:4374 #, no-wrap msgid "guix environment guile\n" msgstr "guix environment guile\n" #. type: Plain text -#: doc/guix.texi:4393 +#: doc/guix.texi:4391 msgid "If the needed dependencies are not built yet, @command{guix environment} automatically builds them. The environment of the new shell is an augmented version of the environment that @command{guix environment} was run in. It contains the necessary search paths for building the given package added to the existing environment variables. To create a ``pure'' environment, in which the original environment variables have been unset, use the @code{--pure} option@footnote{Users sometimes wrongfully augment environment variables such as @code{PATH} in their @file{~/.bashrc} file. As a consequence, when @code{guix environment} launches it, Bash may read @file{~/.bashrc}, thereby introducing ``impurities'' in these environment variables. It is an error to define such environment variables in @file{.bashrc}; instead, they should be defined in @file{.bash_profile}, which is sourced only by log-in shells. @xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for details on Bash start-up files.}." msgstr "Wenn benötigte Abhängigkeiten noch nicht erstellt worden sind, wird @command{guix environment} sie automatisch erstellen lassen. Die Umgebung der neuen Shell ist eine ergänzte Version der Umgebung, in der @command{guix environment} ausgeführt wurde. Sie enthält neben den existierenden Umgebungsvariablen auch die nötigen Suchpfade, um das angegebene Paket erstellen zu können. Um eine „reine“ Umgebung zu erstellen, in der die ursprünglichen Umgebungsvariablen nicht mehr vorkommen, kann die Befehlszeilenoption @code{--pure} benutzt werden@footnote{Manchmal ergänzen Nutzer fälschlicherweise Umgebungsvariable wie @code{PATH} in ihrer @file{~/.bashrc}-Datei. Das hat zur Folge, dass wenn @code{guix environment} Bash startet, selbige @file{~/.bashrc} von Bash gelesen wird und die neuen Umgebungen somit „verunreinigt“. Es ist ein Fehler, solche Umgebungsvariable in @file{.bashrc} zu definieren, stattdessen sollten sie in @file{.bash_profile} geschrieben werden, was nur von Login-Shells mit „source“ geladen wird. Siehe @ref{Bash Startup Files,,, bash, The GNU Bash Reference Manual} für Details über beim Starten von Bash gelesene Dateien}." #. type: vindex -#: doc/guix.texi:4394 +#: doc/guix.texi:4392 #, no-wrap msgid "GUIX_ENVIRONMENT" msgstr "GUIX_ENVIRONMENT" #. type: Plain text -#: doc/guix.texi:4400 +#: doc/guix.texi:4398 msgid "@command{guix environment} defines the @code{GUIX_ENVIRONMENT} variable in the shell it spawns; its value is the file name of the profile of this environment. This allows users to, say, define a specific prompt for development environments in their @file{.bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):" msgstr "@command{guix environment} definiert die Variable @code{GUIX_ENVIRONMENT} in der neu erzeugten Shell. Ihr Wert ist der Dateiname des Profils dieser neuen Umgebung. Das könnten Nutzer verwenden, um zum Beispiel eine besondere Prompt als Eingabeaufforderung für Entwicklungsumgebungen in ihrer @file{.bashrc} festzulegen (siehe @ref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):" #. type: example -#: doc/guix.texi:4406 +#: doc/guix.texi:4404 #, no-wrap msgid "" "if [ -n \"$GUIX_ENVIRONMENT\" ]\n" @@ -9322,282 +9333,282 @@ msgstr "" "fi\n" #. type: Plain text -#: doc/guix.texi:4410 +#: doc/guix.texi:4408 msgid "...@: or to browse the profile:" msgstr "…@: oder um ihr Profil durchzusehen:" #. type: example -#: doc/guix.texi:4413 +#: doc/guix.texi:4411 #, no-wrap msgid "$ ls \"$GUIX_ENVIRONMENT/bin\"\n" msgstr "$ ls \"$GUIX_ENVIRONMENT/bin\"\n" #. type: Plain text -#: doc/guix.texi:4419 +#: doc/guix.texi:4417 msgid "Additionally, more than one package may be specified, in which case the union of the inputs for the given packages are used. For example, the command below spawns a shell where all of the dependencies of both Guile and Emacs are available:" msgstr "Des Weiteren kann mehr als ein Paket angegeben werden. In diesem Fall wird die Vereinigung der Eingaben der jeweiligen Pakete zugänglich gemacht. Zum Beispiel erzeugt der folgende Befehl eine Shell, in der alle Abhängigkeiten von sowohl Guile als auch Emacs verfügbar sind:" #. type: example -#: doc/guix.texi:4422 +#: doc/guix.texi:4420 #, no-wrap msgid "guix environment guile emacs\n" msgstr "guix environment guile emacs\n" #. type: Plain text -#: doc/guix.texi:4427 +#: doc/guix.texi:4425 msgid "Sometimes an interactive shell session is not desired. An arbitrary command may be invoked by placing the @code{--} token to separate the command from the rest of the arguments:" msgstr "Manchmal will man keine interaktive Shell-Sitzung. Ein beliebiger Befehl kann aufgerufen werden, indem man nach Angabe der Pakete noch @code{--} vor den gewünschten Befehl schreibt, um ihn von den übrigen Argumenten abzutrennen:" #. type: example -#: doc/guix.texi:4430 +#: doc/guix.texi:4428 #, no-wrap msgid "guix environment guile -- make -j4\n" msgstr "guix environment guile -- make -j4\n" #. type: Plain text -#: doc/guix.texi:4436 +#: doc/guix.texi:4434 msgid "In other situations, it is more convenient to specify the list of packages needed in the environment. For example, the following command runs @command{python} from an environment containing Python@tie{}2.7 and NumPy:" msgstr "In anderen Situationen ist es bequemer, aufzulisten, welche Pakete in der Umgebung benötigt werden. Zum Beispiel führt der folgende Befehl @command{python} aus einer Umgebung heraus aus, in der Python@tie{}2.7 und NumPy enthalten sind:" #. type: example -#: doc/guix.texi:4439 +#: doc/guix.texi:4437 #, no-wrap msgid "guix environment --ad-hoc python2-numpy python-2.7 -- python\n" msgstr "guix environment --ad-hoc python2-numpy python-2.7 -- python\n" #. type: Plain text -#: doc/guix.texi:4450 +#: doc/guix.texi:4448 msgid "Furthermore, one might want the dependencies of a package and also some additional packages that are not build-time or runtime dependencies, but are useful when developing nonetheless. Because of this, the @code{--ad-hoc} flag is positional. Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment. Packages appearing after are interpreted as packages that will be added to the environment directly. For example, the following command creates a Guix development environment that additionally includes Git and strace:" msgstr "Man kann auch sowohl die Abhängigkeiten eines Pakets haben wollen, als auch ein paar zusätzliche Pakete, die nicht Erstellungs- oder Laufzeitabhängigkeiten davon sind, aber trotzdem bei der Entwicklung nützlich sind. Deshalb hängt die Wirkung von der Position der Befehlszeilenoption @code{--ad-hoc} ab. Pakete, die links von @code{--ad-hoc} stehen, werden als Pakete interpretiert, deren Abhängigkeiten zur Umgebung hinzugefügt werden. Pakete, die rechts stehen, werden selbst zur Umgebung hinzugefügt. Zum Beispiel erzeugt der folgende Befehl eine Guix-Entwicklungsumgebung, die zusätzlich Git und strace umfasst:" #. type: example -#: doc/guix.texi:4453 +#: doc/guix.texi:4451 #, no-wrap msgid "guix environment guix --ad-hoc git strace\n" msgstr "guix environment guix --ad-hoc git strace\n" #. type: Plain text -#: doc/guix.texi:4462 +#: doc/guix.texi:4460 msgid "Sometimes it is desirable to isolate the environment as much as possible, for maximal purity and reproducibility. In particular, when using Guix on a host distro that is not Guix System, it is desirable to prevent access to @file{/usr/bin} and other system-wide resources from the development environment. For example, the following command spawns a Guile REPL in a ``container'' where only the store and the current working directory are mounted:" msgstr "Manchmal ist es wünschenswert, die Umgebung so viel wie möglich zu isolieren, um maximale Reinheit und Reproduzierbarkeit zu bekommen. Insbesondere ist es wünschenswert, den Zugriff auf @file{/usr/bin} und andere Systemressourcen aus der Entwicklungsumgebung heraus zu verhindern, wenn man Guix auf einer fremden Wirtsdistribution benutzt, die nicht Guix System ist. Zum Beispiel startet der folgende Befehl eine Guile-REPL in einer isolierten Umgebung, einem sogenannten „Container“, in der nur der Store und das aktuelle Arbeitsverzeichnis eingebunden sind:" #. type: example -#: doc/guix.texi:4465 +#: doc/guix.texi:4463 #, no-wrap msgid "guix environment --ad-hoc --container guile -- guile\n" msgstr "guix environment --ad-hoc --container guile -- guile\n" #. type: quotation -#: doc/guix.texi:4469 +#: doc/guix.texi:4467 msgid "The @code{--container} option requires Linux-libre 3.19 or newer." msgstr "Die Befehlszeilenoption @code{--container} funktioniert nur mit Linux-libre 3.19 oder neuer." #. type: Plain text -#: doc/guix.texi:4472 +#: doc/guix.texi:4470 msgid "The available options are summarized below." msgstr "Im Folgenden werden die verfügbaren Befehlszeilenoptionen zusammengefasst." #. type: item -#: doc/guix.texi:4474 doc/guix.texi:8138 doc/guix.texi:24602 +#: doc/guix.texi:4472 doc/guix.texi:8136 doc/guix.texi:24588 #, no-wrap msgid "--root=@var{file}" msgstr "--root=@var{Datei}" #. type: itemx -#: doc/guix.texi:4475 doc/guix.texi:8139 doc/guix.texi:24603 +#: doc/guix.texi:4473 doc/guix.texi:8137 doc/guix.texi:24589 #, no-wrap msgid "-r @var{file}" msgstr "-r @var{Datei}" #. type: cindex -#: doc/guix.texi:4476 +#: doc/guix.texi:4474 #, no-wrap msgid "persistent environment" msgstr "persistente Umgebung" #. type: cindex -#: doc/guix.texi:4477 +#: doc/guix.texi:4475 #, no-wrap msgid "garbage collector root, for environments" msgstr "Müllsammlerwurzel, für Umgebungen" #. type: table -#: doc/guix.texi:4480 +#: doc/guix.texi:4478 msgid "Make @var{file} a symlink to the profile for this environment, and register it as a garbage collector root." msgstr "Die @var{Datei} zu einer symbolischen Verknüpfung auf das Profil dieser Umgebung machen und als eine Müllsammlerwurzel registrieren." #. type: table -#: doc/guix.texi:4483 +#: doc/guix.texi:4481 msgid "This is useful if you want to protect your environment from garbage collection, to make it ``persistent''." msgstr "Das ist nützlich, um seine Umgebung vor dem Müllsammler zu schützen und sie „persistent“ zu machen." #. type: table -#: doc/guix.texi:4489 +#: doc/guix.texi:4487 msgid "When this option is omitted, the environment is protected from garbage collection only for the duration of the @command{guix environment} session. This means that next time you recreate the same environment, you could have to rebuild or re-download packages. @xref{Invoking guix gc}, for more on GC roots." msgstr "Wird diese Option weggelassen, ist die Umgebung nur, solange die Sitzung von @command{guix environment} besteht, vor dem Müllsammler sicher. Das bedeutet, wenn Sie das nächste Mal dieselbe Umgebung neu erzeugen, müssen Sie vielleicht Pakete neu erstellen oder neu herunterladen. @ref{Invoking guix gc} hat mehr Informationen über Müllsammlerwurzeln." #. type: item -#: doc/guix.texi:4490 doc/guix.texi:4864 doc/guix.texi:7996 doc/guix.texi:8877 -#: doc/guix.texi:9535 doc/guix.texi:24556 +#: doc/guix.texi:4488 doc/guix.texi:4862 doc/guix.texi:7994 doc/guix.texi:8875 +#: doc/guix.texi:9533 doc/guix.texi:24547 #, no-wrap msgid "--expression=@var{expr}" msgstr "--expression=@var{Ausdruck}" #. type: itemx -#: doc/guix.texi:4491 doc/guix.texi:4865 doc/guix.texi:7997 doc/guix.texi:8878 -#: doc/guix.texi:9536 doc/guix.texi:24557 +#: doc/guix.texi:4489 doc/guix.texi:4863 doc/guix.texi:7995 doc/guix.texi:8876 +#: doc/guix.texi:9534 doc/guix.texi:24548 #, no-wrap msgid "-e @var{expr}" msgstr "-e @var{Ausdruck}" #. type: table -#: doc/guix.texi:4494 +#: doc/guix.texi:4492 msgid "Create an environment for the package or list of packages that @var{expr} evaluates to." msgstr "Eine Umgebung für das Paket oder die Liste von Paketen erzeugen, zu der der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:4496 +#: doc/guix.texi:4494 msgid "For example, running:" msgstr "Zum Beispiel startet dies:" #. type: example -#: doc/guix.texi:4499 +#: doc/guix.texi:4497 #, no-wrap msgid "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n" msgstr "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n" #. type: table -#: doc/guix.texi:4503 +#: doc/guix.texi:4501 msgid "starts a shell with the environment for this specific variant of the PETSc package." msgstr "eine Shell mit der Umgebung für eben diese bestimmte Variante des Pakets PETSc." #. type: table -#: doc/guix.texi:4505 +#: doc/guix.texi:4503 msgid "Running:" msgstr "Wenn man dies ausführt:" #. type: example -#: doc/guix.texi:4508 +#: doc/guix.texi:4506 #, no-wrap msgid "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n" msgstr "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n" #. type: table -#: doc/guix.texi:4511 +#: doc/guix.texi:4509 msgid "starts a shell with all the base system packages available." msgstr "bekommt man eine Shell, in der alle Basis-Pakete verfügbar sind." #. type: table -#: doc/guix.texi:4514 +#: doc/guix.texi:4512 msgid "The above commands only use the default output of the given packages. To select other outputs, two element tuples can be specified:" msgstr "Die obigen Befehle benutzen nur die Standard-Ausgabe des jeweiligen Pakets. Um andere Ausgaben auszuwählen, können zweielementige Tupel spezifiziert werden:" #. type: example -#: doc/guix.texi:4517 +#: doc/guix.texi:4515 #, no-wrap msgid "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n" msgstr "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n" #. type: item -#: doc/guix.texi:4519 +#: doc/guix.texi:4517 #, no-wrap msgid "--load=@var{file}" msgstr "--load=@var{Datei}" #. type: itemx -#: doc/guix.texi:4520 +#: doc/guix.texi:4518 #, no-wrap msgid "-l @var{file}" msgstr "-l @var{Datei}" #. type: table -#: doc/guix.texi:4523 +#: doc/guix.texi:4521 msgid "Create an environment for the package or list of packages that the code within @var{file} evaluates to." msgstr "Eine Umgebung erstellen für das Paket oder die Liste von Paketen, zu der der Code in der @var{Datei} ausgewertet wird." #. type: example -#: doc/guix.texi:4529 +#: doc/guix.texi:4527 #, no-wrap msgid "@verbatiminclude environment-gdb.scm\n" msgstr "@verbatiminclude environment-gdb.scm\n" #. type: table -#: doc/guix.texi:4535 +#: doc/guix.texi:4533 msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}." msgstr "Eine Umgebung für die Pakete erzeugen, die im Manifest-Objekt enthalten sind, das vom Scheme-Code in der @var{Datei} geliefert wird." #. type: table -#: doc/guix.texi:4539 +#: doc/guix.texi:4537 msgid "This is similar to the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files." msgstr "Dies verhält sich ähnlich wie die gleichnamige Option des Befehls @command{guix package} (siehe @ref{profile-manifest, @option{--manifest}}) und benutzt auch dieselben Manifestdateien." #. type: item -#: doc/guix.texi:4540 +#: doc/guix.texi:4538 #, no-wrap msgid "--ad-hoc" msgstr "--ad-hoc" #. type: table -#: doc/guix.texi:4545 +#: doc/guix.texi:4543 msgid "Include all specified packages in the resulting environment, as if an @i{ad hoc} package were defined with them as inputs. This option is useful for quickly creating an environment without having to write a package expression to contain the desired inputs." msgstr "Alle angegebenen Pakete in der resultierenden Umgebung einschließen, als wären sie Eingaben eines @i{ad hoc} definierten Pakets. Diese Befehlszeilenoption ist nützlich, um schnell Umgebungen aufzusetzen, ohne dafür einen Paketausdruck schreiben zu müssen, der die gewünschten Eingaben enthält." #. type: table -#: doc/guix.texi:4547 +#: doc/guix.texi:4545 msgid "For instance, the command:" msgstr "Zum Beispiel wird mit diesem Befehl:" #. type: example -#: doc/guix.texi:4550 +#: doc/guix.texi:4548 #, no-wrap msgid "guix environment --ad-hoc guile guile-sdl -- guile\n" msgstr "guix environment --ad-hoc guile guile-sdl -- guile\n" #. type: table -#: doc/guix.texi:4554 +#: doc/guix.texi:4552 msgid "runs @command{guile} in an environment where Guile and Guile-SDL are available." msgstr "@command{guile} in einer Umgebung ausgeführt, in der sowohl Guile als auch Guile-SDL zur Verfügung stehen." #. type: table -#: doc/guix.texi:4559 +#: doc/guix.texi:4557 msgid "Note that this example implicitly asks for the default output of @code{guile} and @code{guile-sdl}, but it is possible to ask for a specific output---e.g., @code{glib:bin} asks for the @code{bin} output of @code{glib} (@pxref{Packages with Multiple Outputs})." msgstr "Beachten Sie, dass in diesem Beispiel implizit die vorgegebene Ausgabe von @code{guile} und @code{guile-sdl} verwendet wird, es aber auch möglich ist, eine bestimmte Ausgabe auszuwählen — z.B.@: wird mit @code{glib:bin} die Ausgabe @code{bin} von @code{glib} gewählt (siehe @ref{Packages with Multiple Outputs})." #. type: table -#: doc/guix.texi:4565 +#: doc/guix.texi:4563 msgid "This option may be composed with the default behavior of @command{guix environment}. Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment, the default behavior. Packages appearing after are interpreted as packages that will be added to the environment directly." msgstr "Diese Befehlszeilenoption kann mit dem standardmäßigen Verhalten von @command{guix environment} verbunden werden. Pakete, die vor @code{--ad-hoc} aufgeführt werden, werden als Pakete interpretiert, deren Abhängigkeiten zur Umgebung hinzugefügt werden, was dem standardmäßigen Verhalten entspricht. Pakete, die danach aufgeführt werden, werden selbst zur Umgebung hinzugefügt." #. type: item -#: doc/guix.texi:4566 +#: doc/guix.texi:4564 #, no-wrap msgid "--pure" msgstr "--pure" #. type: table -#: doc/guix.texi:4570 +#: doc/guix.texi:4568 msgid "Unset existing environment variables when building the new environment, except those specified with @option{--preserve} (see below.) This has the effect of creating an environment in which search paths only contain package inputs." msgstr "Bestehende Umgebungsvariable deaktivieren, wenn die neue Umgebung erzeugt wird, mit Ausnahme der mit @option{--preserve} angegebenen Variablen (siehe unten). Dies bewirkt, dass eine Umgebung erzeugt wird, in der die Suchpfade nur Paketeingaben nennen und sonst nichts." #. type: item -#: doc/guix.texi:4571 +#: doc/guix.texi:4569 #, no-wrap msgid "--preserve=@var{regexp}" msgstr "--preserve=@var{Regexp}" #. type: itemx -#: doc/guix.texi:4572 +#: doc/guix.texi:4570 #, no-wrap msgid "-E @var{regexp}" msgstr "-E @var{Regexp}" #. type: table -#: doc/guix.texi:4577 +#: doc/guix.texi:4575 msgid "When used alongside @option{--pure}, preserve the environment variables matching @var{regexp}---in other words, put them on a ``white list'' of environment variables that must be preserved. This option can be repeated several times." msgstr "Wenn das hier zusammen mit @option{--pure} angegeben wird, bleiben die zum regulären Ausdruck @var{Regexp} passenden Umgebungsvariablen erhalten — mit anderen Worten werden sie auf eine „weiße Liste“ von Umgebungsvariablen gesetzt, die erhalten bleiben müssen. Diese Befehlszeilenoption kann mehrmals wiederholt werden." #. type: example -#: doc/guix.texi:4581 +#: doc/guix.texi:4579 #, no-wrap msgid "" "guix environment --pure --preserve=^SLURM --ad-hoc openmpi @dots{} \\\n" @@ -9607,111 +9618,111 @@ msgstr "" " -- mpirun …\n" #. type: table -#: doc/guix.texi:4587 +#: doc/guix.texi:4585 msgid "This example runs @command{mpirun} in a context where the only environment variables defined are @code{PATH}, environment variables whose name starts with @code{SLURM}, as well as the usual ``precious'' variables (@code{HOME}, @code{USER}, etc.)" msgstr "In diesem Beispiel wird @command{mpirun} in einem Kontext ausgeführt, in dem die einzig definierten Umgebungsvariablen @code{PATH} und solche sind, deren Name mit @code{SLURM} beginnt, sowie die üblichen besonders „kostbaren“ Variablen (@code{HOME}, @code{USER}, etc.)." #. type: item -#: doc/guix.texi:4588 +#: doc/guix.texi:4586 #, no-wrap msgid "--search-paths" msgstr "--search-paths" #. type: table -#: doc/guix.texi:4591 +#: doc/guix.texi:4589 msgid "Display the environment variable definitions that make up the environment." msgstr "Die Umgebungsvariablendefinitionen anzeigen, aus denen die Umgebung besteht." #. type: table -#: doc/guix.texi:4595 +#: doc/guix.texi:4593 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}." msgstr "Versuchen, für das angegebene @var{System} zu erstellen — z.B.@: @code{i686-linux}." #. type: item -#: doc/guix.texi:4596 +#: doc/guix.texi:4594 #, no-wrap msgid "--container" msgstr "--container" #. type: itemx -#: doc/guix.texi:4597 +#: doc/guix.texi:4595 #, no-wrap msgid "-C" msgstr "-C" #. type: item -#: doc/guix.texi:4598 doc/guix.texi:9976 doc/guix.texi:24524 +#: doc/guix.texi:4596 doc/guix.texi:9974 doc/guix.texi:24515 #, no-wrap msgid "container" msgstr "container" #. type: table -#: doc/guix.texi:4604 +#: doc/guix.texi:4602 msgid "Run @var{command} within an isolated container. The current working directory outside the container is mapped inside the container. Additionally, unless overridden with @code{--user}, a dummy home directory is created that matches the current user's home directory, and @file{/etc/passwd} is configured accordingly." msgstr "Den @var{Befehl} in einer isolierten Umgebung (einem sogenannten „Container“) ausführen. Das aktuelle Arbeitsverzeichnis außerhalb des Containers wird in den Container zugeordnet. Zusätzlich wird, wenn es mit der Befehlszeilenoption @code{--user} nicht anders spezifiziert wurde, ein stellvertretendes persönliches Verzeichnis erzeugt, dessen Inhalt der des wirklichen persönlichen Verzeichnisses ist, sowie eine passend konfigurierte Datei @file{/etc/passwd}." #. type: table -#: doc/guix.texi:4608 +#: doc/guix.texi:4606 msgid "The spawned process runs as the current user outside the container. Inside the container, it has the same UID and GID as the current user, unless @option{--user} is passed (see below.)" msgstr "Der erzeugte Prozess läuft außerhalb des Containers als der momentane Nutzer. Innerhalb des Containers hat er dieselbe UID und GID wie der momentane Nutzer, außer die Befehlszeilenoption @option{--user} wird übergeben (siehe unten)." #. type: item -#: doc/guix.texi:4609 doc/guix.texi:24597 +#: doc/guix.texi:4607 #, no-wrap msgid "--network" msgstr "--network" #. type: table -#: doc/guix.texi:4614 +#: doc/guix.texi:4612 msgid "For containers, share the network namespace with the host system. Containers created without this flag only have access to the loopback device." msgstr "Bei isolierten Umgebungen („Containern“) wird hiermit der Netzwerk-Namensraum mit dem des Wirtssystems geteilt. Container, die ohne diese Befehlszeilenoption erzeugt wurden, haben nur Zugriff auf das Loopback-Gerät." #. type: item -#: doc/guix.texi:4615 +#: doc/guix.texi:4613 #, no-wrap msgid "--link-profile" msgstr "--link-profile" #. type: itemx -#: doc/guix.texi:4616 +#: doc/guix.texi:4614 #, no-wrap msgid "-P" msgstr "-P" #. type: table -#: doc/guix.texi:4623 +#: doc/guix.texi:4621 msgid "For containers, link the environment profile to @file{~/.guix-profile} within the container. This is equivalent to running the command @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} within the container. Linking will fail and abort the environment if the directory already exists, which will certainly be the case if @command{guix environment} was invoked in the user's home directory." msgstr "Bei isolierten Umgebungen („Containern“) wird das Umgebungsprofil im Container als @file{~/.guix-profile} verknüpft. Das ist äquivalent dazu, den Befehl @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} im Container auszuführen. Wenn das Verzeichnis bereits existiert, schlägt das Verknüpfen fehl und die Umgebung wird nicht hergestellt. Dieser Fehler wird immer eintreten, wenn @command{guix environment} im persönlichen Verzeichnis des Benutzers aufgerufen wurde." #. type: table -#: doc/guix.texi:4630 +#: doc/guix.texi:4628 msgid "Certain packages are configured to look in @code{~/.guix-profile} for configuration files and data;@footnote{For example, the @code{fontconfig} package inspects @file{~/.guix-profile/share/fonts} for additional fonts.} @code{--link-profile} allows these programs to behave as expected within the environment." msgstr "Bestimmte Pakete sind so eingerichtet, dass sie in @code{~/.guix-profile} nach Konfigurationsdateien und Daten suchen,@footnote{Zum Beispiel inspiziert das Paket @code{fontconfig} das Verzeichnis @file{~/.guix-profile/share/fonts}, um zusätzliche Schriftarten zu finden.} weshalb @code{--link-profile} benutzt werden kann, damit sich diese Programme auch in der isolierten Umgebung wie erwartet verhalten." #. type: item -#: doc/guix.texi:4631 doc/guix.texi:9648 +#: doc/guix.texi:4629 doc/guix.texi:9646 #, no-wrap msgid "--user=@var{user}" msgstr "--user=@var{Benutzer}" #. type: itemx -#: doc/guix.texi:4632 doc/guix.texi:9649 +#: doc/guix.texi:4630 doc/guix.texi:9647 #, no-wrap msgid "-u @var{user}" msgstr "-u @var{Benutzer}" #. type: table -#: doc/guix.texi:4639 +#: doc/guix.texi:4637 msgid "For containers, use the username @var{user} in place of the current user. The generated @file{/etc/passwd} entry within the container will contain the name @var{user}, the home directory will be @file{/home/@var{user}}, and no user GECOS data will be copied. Furthermore, the UID and GID inside the container are 1000. @var{user} need not exist on the system." msgstr "Bei isolierten Umgebungen („Containern“) wird der Benutzername @var{Benutzer} anstelle des aktuellen Benutzers benutzt. Der erzeugte Eintrag in @file{/etc/passwd} im Container wird also den Namen @var{Benutzer} enthalten und das persönliche Verzeichnis wird den Namen @file{/home/BENUTZER} tragen; keine GECOS-Daten über den Nutzer werden in die Umgebung übernommen. Des Weiteren sind UID und GID innerhalb der isolierten Umgebung auf 1000 gesetzt. @var{Benutzer} muss auf dem System nicht existieren." #. type: table -#: doc/guix.texi:4644 +#: doc/guix.texi:4642 msgid "Additionally, any shared or exposed path (see @code{--share} and @code{--expose} respectively) whose target is within the current user's home directory will be remapped relative to @file{/home/USER}; this includes the automatic mapping of the current working directory." msgstr "Zusätzlich werden alle geteilten oder exponierten Pfade (siehe jeweils @code{--share} und @code{--expose}), deren Ziel innerhalb des persönlichen Verzeichnisses des aktuellen Benutzers liegt, relativ zu @file{/home/BENUTZER} erscheinen, einschließlich der automatischen Zuordnung des aktuellen Arbeitsverzeichnisses." #. type: example -#: doc/guix.texi:4651 +#: doc/guix.texi:4649 #, no-wrap msgid "" "# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target\n" @@ -9727,111 +9738,111 @@ msgstr "" " --expose=/tmp/target=$HOME/target\n" #. type: table -#: doc/guix.texi:4656 +#: doc/guix.texi:4654 msgid "While this will limit the leaking of user identity through home paths and each of the user fields, this is only one useful component of a broader privacy/anonymity solution---not one in and of itself." msgstr "Obwohl dies das Datenleck von Nutzerdaten durch Pfade im persönlichen Verzeichnis und die Benutzereinträge begrenzt, kann dies nur als Teil einer größeren Lösung für Datenschutz und Anonymität sinnvoll eingesetzt werden. Es sollte nicht für sich allein dazu eingesetzt werden." #. type: item -#: doc/guix.texi:4657 +#: doc/guix.texi:4655 #, no-wrap msgid "--expose=@var{source}[=@var{target}]" msgstr "--expose=@var{Quelle}[=@var{Ziel}]" #. type: table -#: doc/guix.texi:4662 +#: doc/guix.texi:4660 msgid "For containers, expose the file system @var{source} from the host system as the read-only file system @var{target} within the container. If @var{target} is not specified, @var{source} is used as the target mount point in the container." msgstr "Bei isolierten Umgebungen („Containern“) wird das Dateisystem unter @var{Quelle} vom Wirtssystem als Nur-Lese-Dateisystem @var{Ziel} im Container zugänglich gemacht. Wenn kein @var{Ziel} angegeben wurde, wird die @var{Quelle} auch als Ziel-Einhängepunkt in der isolierten Umgebung benutzt." #. type: table -#: doc/guix.texi:4666 +#: doc/guix.texi:4664 msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible read-only via the @file{/exchange} directory:" msgstr "Im folgenden Beispiel wird eine Guile-REPL in einer isolierten Umgebung gestartet, in der das persönliche Verzeichnis des Benutzers als Verzeichnis @file{/austausch} nur für Lesezugriffe zugänglich gemacht wurde:" #. type: example -#: doc/guix.texi:4669 +#: doc/guix.texi:4667 #, no-wrap msgid "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n" msgstr "guix environment --container --expose=$HOME=/austausch --ad-hoc guile -- guile\n" #. type: item -#: doc/guix.texi:4671 +#: doc/guix.texi:4669 #, no-wrap msgid "--share=@var{source}[=@var{target}]" msgstr "--share=@var{Quelle}[=@var{Ziel}]" #. type: table -#: doc/guix.texi:4676 +#: doc/guix.texi:4674 msgid "For containers, share the file system @var{source} from the host system as the writable file system @var{target} within the container. If @var{target} is not specified, @var{source} is used as the target mount point in the container." msgstr "Bei isolierten Umgebungen („Containern“) wird das Dateisystem unter @var{Quelle} vom Wirtssystem als beschreibbares Dateisystem @var{Ziel} im Container zugänglich gemacht. Wenn kein @var{Ziel} angegeben wurde, wird die @var{Quelle} auch als Ziel-Einhängepunkt in der isolierten Umgebung benutzt." #. type: table -#: doc/guix.texi:4680 +#: doc/guix.texi:4678 msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible for both reading and writing via the @file{/exchange} directory:" msgstr "Im folgenden Beispiel wird eine Guile-REPL in einer isolierten Umgebung gestartet, in der das persönliche Verzeichnis des Benutzers als Verzeichnis @file{/austausch} sowohl für Lese- als auch für Schreibzugriffe zugänglich gemacht wurde:" #. type: example -#: doc/guix.texi:4683 +#: doc/guix.texi:4681 #, no-wrap msgid "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n" msgstr "guix environment --container --share=$HOME=/austausch --ad-hoc guile -- guile\n" #. type: Plain text -#: doc/guix.texi:4690 +#: doc/guix.texi:4688 msgid "@command{guix environment} also supports all of the common build options that @command{guix build} supports (@pxref{Common Build Options}) as well as package transformation options (@pxref{Package Transformation Options})." msgstr "@command{guix environment} unterstützt auch alle gemeinsamen Erstellungsoptionen, die von @command{guix build} unterstützt werden (siehe @ref{Common Build Options}), und die Paketumwandlungsoptionen (siehe @ref{Package Transformation Options})." #. type: section -#: doc/guix.texi:4692 +#: doc/guix.texi:4690 #, no-wrap msgid "Invoking @command{guix pack}" msgstr "@command{guix pack} aufrufen" #. type: Plain text -#: doc/guix.texi:4698 +#: doc/guix.texi:4696 msgid "Occasionally you want to pass software to people who are not (yet!) lucky enough to be using Guix. You'd tell them to run @command{guix package -i @var{something}}, but that's not possible in this case. This is where @command{guix pack} comes in." msgstr "Manchmal möchten Sie Software an Leute weitergeben, die (noch!) nicht das Glück haben, Guix zu benutzen. Mit Guix würden sie nur @command{guix package -i @var{irgendetwas}} einzutippen brauchen, aber wenn sie kein Guix haben, muss es anders gehen. Hier kommt @command{guix pack} ins Spiel." #. type: quotation -#: doc/guix.texi:4703 +#: doc/guix.texi:4701 msgid "If you are looking for ways to exchange binaries among machines that already run Guix, @pxref{Invoking guix copy}, @ref{Invoking guix publish}, and @ref{Invoking guix archive}." msgstr "Wenn Sie aber nach einer Möglichkeit suchen, Binärdateien unter Maschinen auszutauschen, auf denen Guix bereits läuft, sollten Sie einen Blick auf die Abschnitte @ref{Invoking guix copy}, @ref{Invoking guix publish} und @ref{Invoking guix archive} werfen." #. type: cindex -#: doc/guix.texi:4705 +#: doc/guix.texi:4703 #, no-wrap msgid "pack" msgstr "Pack" #. type: cindex -#: doc/guix.texi:4706 +#: doc/guix.texi:4704 #, no-wrap msgid "bundle" msgstr "Bündel" #. type: cindex -#: doc/guix.texi:4707 +#: doc/guix.texi:4705 #, no-wrap msgid "application bundle" msgstr "Anwendungsbündel" #. type: cindex -#: doc/guix.texi:4708 +#: doc/guix.texi:4706 #, no-wrap msgid "software bundle" msgstr "Software-Bündel" #. type: Plain text -#: doc/guix.texi:4717 +#: doc/guix.texi:4715 msgid "The @command{guix pack} command creates a shrink-wrapped @dfn{pack} or @dfn{software bundle}: it creates a tarball or some other archive containing the binaries of the software you're interested in, and all its dependencies. The resulting archive can be used on any machine that does not have Guix, and people can run the exact same binaries as those you have with Guix. The pack itself is created in a bit-reproducible fashion, so anyone can verify that it really contains the build results that you pretend to be shipping." msgstr "Der Befehl @command{guix pack} erzeugt ein gut verpacktes @dfn{Software-Bündel}: Konkret wird dadurch ein Tarball oder eine andere Art von Archiv mit den Binärdateien der Software erzeugt, die Sie sich gewünscht haben, zusammen mit all ihren Abhängigkeiten. Der resultierende Archiv kann auch auf jeder Maschine genutzt werden, die kein Guix hat, und jeder kann damit genau dieselben Binärdateien benutzen, die Ihnen unter Guix zur Verfügung stehen. Das Bündel wird dabei auf eine Bit für Bit reproduzierbare Art erzeugt, damit auch jeder nachprüfen kann, dass darin wirklich diejenigen Binärdateien enthalten sind, von denen Sie es behaupten." #. type: Plain text -#: doc/guix.texi:4720 +#: doc/guix.texi:4718 msgid "For example, to create a bundle containing Guile, Emacs, Geiser, and all their dependencies, you can run:" msgstr "Um zum Beispiel ein Bündel mit Guile, Emacs, Geiser und all ihren Abhängigkeiten zu erzeugen, führen Sie diesen Befehl aus:" #. type: example -#: doc/guix.texi:4725 +#: doc/guix.texi:4723 #, no-wrap msgid "" "$ guix pack guile emacs geiser\n" @@ -9843,175 +9854,175 @@ msgstr "" "/gnu/store/…-pack.tar.gz\n" #. type: Plain text -#: doc/guix.texi:4733 +#: doc/guix.texi:4731 msgid "The result here is a tarball containing a @file{/gnu/store} directory with all the relevant packages. The resulting tarball contains a @dfn{profile} with the three packages of interest; the profile is the same as would be created by @command{guix package -i}. It is this mechanism that is used to create Guix's own standalone binary tarball (@pxref{Binary Installation})." msgstr "Als Ergebnis erhalten Sie einen Tarball mit einem Verzeichnis @file{/gnu/store}, worin sich alles relevanten Pakete befinden. Der resultierende Tarball enthält auch ein @dfn{Profil} mit den drei angegebenen Paketen; es ist dieselbe Art von Profil, die auch @command{guix package -i} erzeugen würde. Mit diesem Mechanismus wird auch der binäre Tarball zur Installation von Guix erzeugt (siehe @ref{Binary Installation})." #. type: Plain text -#: doc/guix.texi:4738 +#: doc/guix.texi:4736 msgid "Users of this pack would have to run @file{/gnu/store/@dots{}-profile/bin/guile} to run Guile, which you may find inconvenient. To work around it, you can create, say, a @file{/opt/gnu/bin} symlink to the profile:" msgstr "Benutzer des Bündels müssten dann aber zum Beispiel @file{/gnu/store/…-profile/bin/guile} eintippen, um Guile auszuführen, was Ihnen zu unbequem sein könnte. Ein Ausweg wäre, dass Sie etwa eine symbolische Verknüpfung @file{/opt/gnu/bin} auf das Profil anlegen:" #. type: example -#: doc/guix.texi:4741 +#: doc/guix.texi:4739 #, no-wrap msgid "guix pack -S /opt/gnu/bin=bin guile emacs geiser\n" msgstr "guix pack -S /opt/gnu/bin=bin guile emacs geiser\n" #. type: Plain text -#: doc/guix.texi:4745 +#: doc/guix.texi:4743 msgid "That way, users can happily type @file{/opt/gnu/bin/guile} and enjoy." msgstr "Benutzer müssten dann nur noch @file{/opt/gnu/bin/guile} eintippen, um Guile zu genießen." #. type: cindex -#: doc/guix.texi:4746 +#: doc/guix.texi:4744 #, no-wrap msgid "relocatable binaries, with @command{guix pack}" msgstr "pfad-agnostische Binärdateien, mit @command{guix pack}" #. type: Plain text -#: doc/guix.texi:4754 +#: doc/guix.texi:4752 msgid "What if the recipient of your pack does not have root privileges on their machine, and thus cannot unpack it in the root file system? In that case, you will want to use the @code{--relocatable} option (see below). This option produces @dfn{relocatable binaries}, meaning they they can be placed anywhere in the file system hierarchy: in the example above, users can unpack your tarball in their home directory and directly run @file{./opt/gnu/bin/guile}." msgstr "Doch was ist, wenn die Empfängerin Ihres Bündels keine Administratorrechte auf ihrer Maschine hat, das Bündel also nicht ins Wurzelverzeichnis ihres Dateisystems entpacken kann? Dann möchten Sie vielleicht die Befehlszeilenoption @code{--relocatable} benutzen (siehe weiter unten). Mit dieser Option werden @dfn{pfad-agnostische Binärdateien} erzeugt, die auch in einem beliebigen anderen Verzeichnis in der Dateisystemhierarchie abgelegt und von dort ausgeführt werden können. In obigem Beispiel würden Benutzer Ihren Tarball in ihr Persönliches Verzeichnis (das „Home“-Verzeichnis) entpacken und von dort den Befehl @file{./opt/gnu/bin/guile} ausführen." #. type: cindex -#: doc/guix.texi:4755 +#: doc/guix.texi:4753 #, no-wrap msgid "Docker, build an image with guix pack" msgstr "Docker, ein Abbild erstellen mit guix pack" #. type: Plain text -#: doc/guix.texi:4758 +#: doc/guix.texi:4756 msgid "Alternatively, you can produce a pack in the Docker image format using the following command:" msgstr "Eine weitere Möglichkeit ist, das Bündel im Format eines Docker-Abbilds (englisch Docker-Image) zu erzeugen. Das geht mit dem folgenden Befehl:" #. type: example -#: doc/guix.texi:4761 +#: doc/guix.texi:4759 #, no-wrap msgid "guix pack -f docker guile emacs geiser\n" msgstr "guix pack -f docker guile emacs geiser\n" #. type: Plain text -#: doc/guix.texi:4768 +#: doc/guix.texi:4766 msgid "The result is a tarball that can be passed to the @command{docker load} command. See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information." msgstr "Das Ergebnis ist ein Tarball, der dem Befehl @command{docker load} übergeben werden kann. In der @uref{https://docs.docker.com/engine/reference/commandline/load/, Dokumentation von Docker} finden Sie nähere Informationen." #. type: cindex -#: doc/guix.texi:4769 +#: doc/guix.texi:4767 #, no-wrap msgid "Singularity, build an image with guix pack" msgstr "Singularity, ein Abbild erstellen mit guix pack" #. type: cindex -#: doc/guix.texi:4770 +#: doc/guix.texi:4768 #, no-wrap msgid "SquashFS, build an image with guix pack" msgstr "SquashFS, ein Abbild erstellen mit guix pack" #. type: Plain text -#: doc/guix.texi:4773 +#: doc/guix.texi:4771 msgid "Yet another option is to produce a SquashFS image with the following command:" msgstr "Und noch eine weitere Möglichkeit ist, dass Sie ein SquashFS-Abbild mit folgendem Befehl erzeugen:" #. type: example -#: doc/guix.texi:4776 +#: doc/guix.texi:4774 #, no-wrap msgid "guix pack -f squashfs guile emacs geiser\n" msgstr "guix pack -f squashfs guile emacs geiser\n" #. type: Plain text -#: doc/guix.texi:4784 +#: doc/guix.texi:4782 msgid "The result is a SquashFS file system image that can either be mounted or directly be used as a file system container image with the @uref{https://singularity.lbl.gov, Singularity container execution environment}, using commands like @command{singularity shell} or @command{singularity exec}." msgstr "Das Ergebnis ist ein SquashFS-Dateisystemabbild, dass entweder als Dateisystem eingebunden oder mit Hilfe der @uref{https://singularity.lbl.gov, Singularity-Container-Ausführungsumgebung} als Dateisystemcontainer benutzt werden kann, mit Befehlen wie @command{singularity shell} oder @command{singularity exec}." #. type: Plain text -#: doc/guix.texi:4786 +#: doc/guix.texi:4784 msgid "Several command-line options allow you to customize your pack:" msgstr "Es gibt mehrere Befehlszeilenoptionen, mit denen Sie Ihr Bündel anpassen können:" #. type: table -#: doc/guix.texi:4791 +#: doc/guix.texi:4789 msgid "Produce a pack in the given @var{format}." msgstr "Generiert ein Bündel im angegebenen @var{Format}." #. type: table -#: doc/guix.texi:4793 +#: doc/guix.texi:4791 msgid "The available formats are:" msgstr "Die verfügbaren Formate sind:" #. type: item -#: doc/guix.texi:4795 +#: doc/guix.texi:4793 #, no-wrap msgid "tarball" msgstr "tarball" #. type: table -#: doc/guix.texi:4798 +#: doc/guix.texi:4796 msgid "This is the default format. It produces a tarball containing all the specified binaries and symlinks." msgstr "Das standardmäßig benutzte Format. Damit wird ein Tarball generiert, der alle angegebenen Binärdateien und symbolischen Verknüpfungen enthält." #. type: item -#: doc/guix.texi:4799 +#: doc/guix.texi:4797 #, no-wrap msgid "docker" msgstr "docker" #. type: table -#: doc/guix.texi:4803 +#: doc/guix.texi:4801 msgid "This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image Specification}." msgstr "Generiert einen Tarball gemäß der @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Spezifikation für Docker-Abbilder}." #. type: item -#: doc/guix.texi:4804 +#: doc/guix.texi:4802 #, no-wrap msgid "squashfs" msgstr "squashfs" #. type: table -#: doc/guix.texi:4808 +#: doc/guix.texi:4806 msgid "This produces a SquashFS image containing all the specified binaries and symlinks, as well as empty mount points for virtual file systems like procfs." msgstr "Generiert ein SquashFS-Abbild, das alle angegebenen Binärdateien und symbolischen Verknüpfungen enthält, sowie leere Einhängepunkte für virtuelle Dateisysteme wie procfs." #. type: cindex -#: doc/guix.texi:4810 +#: doc/guix.texi:4808 #, no-wrap msgid "relocatable binaries" msgstr "pfad-agnostische Binärdateien" #. type: item -#: doc/guix.texi:4811 +#: doc/guix.texi:4809 #, no-wrap msgid "--relocatable" msgstr "--relocatable" #. type: table -#: doc/guix.texi:4815 +#: doc/guix.texi:4813 msgid "Produce @dfn{relocatable binaries}---i.e., binaries that can be placed anywhere in the file system hierarchy and run from there." msgstr "Erzeugt @dfn{pfad-agnostische Binärdateien} — also „portable“ Binärdateien, die an einer beliebigen Stelle in der Dateisystemhierarchie platziert und von dort ausgeführt werden können." #. type: table -#: doc/guix.texi:4823 +#: doc/guix.texi:4821 msgid "When this option is passed once, the resulting binaries require support for @dfn{user namespaces} in the kernel Linux; when passed @emph{twice}@footnote{Here's a trick to memorize it: @code{-RR}, which adds PRoot support, can be thought of as the abbreviation of ``Really Relocatable''. Neat, isn't it?}, relocatable binaries fall to back to PRoot if user namespaces are unavailable, and essentially work anywhere---see below for the implications." msgstr "Wenn diese Befehlszeilenoption einmal übergeben wird, funktionieren die erzeugten Binärdateien nur dann, wenn @dfn{Benutzernamensräume} des Linux-Kernels unterstützt werden. Wenn sie @emph{zweimal}@footnote{Es gibt einen Trick, wie Sie sich das merken können: @code{-RR}, womit PRoot-Unterstützung hinzugefügt wird, kann man sich als Abkürzung für „Rundum Relocatable“ oder englisch „Really Relocatable“ vorstellen. Ist das nicht prima?} übergeben wird, laufen die Binärdateien notfalls mit PRoot, wenn keine Benutzernamensräume zur Verfügung stehen, funktionieren also ziemlich überall — siehe unten für die Auswirkungen." #. type: table -#: doc/guix.texi:4825 +#: doc/guix.texi:4823 msgid "For example, if you create a pack containing Bash with:" msgstr "Zum Beispiel können Sie ein Bash enthalltendes Bündel erzeugen mit:" #. type: example -#: doc/guix.texi:4828 +#: doc/guix.texi:4826 #, no-wrap msgid "guix pack -RR -S /mybin=bin bash\n" msgstr "guix pack -RR -S /mybin=bin bash\n" #. type: table -#: doc/guix.texi:4833 +#: doc/guix.texi:4831 msgid "...@: you can copy that pack to a machine that lacks Guix, and from your home directory as a normal user, run:" msgstr "…@: Sie können dieses dann auf eine Maschine ohne Guix kopieren und als normaler Nutzer aus Ihrem Persönlichen Verzeichnis (auch „Home“-Verzeichnis genannt) dann ausführen mit:" #. type: example -#: doc/guix.texi:4837 +#: doc/guix.texi:4835 #, no-wrap msgid "" "tar xf pack.tar.gz\n" @@ -10021,243 +10032,243 @@ msgstr "" "./meine-bin/sh\n" #. type: table -#: doc/guix.texi:4845 +#: doc/guix.texi:4843 msgid "In that shell, if you type @code{ls /gnu/store}, you'll notice that @file{/gnu/store} shows up and contains all the dependencies of @code{bash}, even though the machine actually lacks @file{/gnu/store} altogether! That is probably the simplest way to deploy Guix-built software on a non-Guix machine." msgstr "Wenn Sie in der so gestarteten Shell dann @code{ls /gnu/store} eintippen, sehen Sie, dass Ihnen angezeigt wird, in @file{/gnu/store} befänden sich alle Abhängigkeiten von @code{bash}, obwohl auf der Maschine überhaupt kein Verzeichnis @file{/gnu/store} existiert! Dies ist vermutlich die einfachste Art, mit Guix erstellte Software für eine Maschine ohne Guix auszuliefern." #. type: quotation -#: doc/guix.texi:4851 +#: doc/guix.texi:4849 msgid "By default, relocatable binaries rely on the @dfn{user namespace} feature of the kernel Linux, which allows unprivileged users to mount or change root. Old versions of Linux did not support it, and some GNU/Linux distributions turn it off." msgstr "Wenn die Voreinstellung verwendet wird, funktionieren pfad-agnostische Binärdateien nur mit @dfn{Benutzernamensräumen} (englisch @dfn{User namespaces}), einer Funktionalität des Linux-Kernels, mit der Benutzer ohne besondere Berechtigungen Dateisysteme einbinden (englisch „mount“) oder die Wurzel des Dateisystems wechseln können („change root“, kurz „chroot“). Alte Versionen von Linux haben diese Funktionalität noch nicht unterstützt und manche Distributionen von GNU/Linux schalten sie ab." #. type: quotation -#: doc/guix.texi:4856 +#: doc/guix.texi:4854 msgid "To produce relocatable binaries that work even in the absence of user namespaces, pass @option{--relocatable} or @option{-R} @emph{twice}. In that case, binaries will try user namespace support and fall back to PRoot if user namespaces are not supported." msgstr "Um pfad-agnostische Binärdateien zu erzeugen, die auch ohne Benutzernamensräume funktionieren, können Sie die Befehlszeilenoption @option{--relocatable} oder @option{-R} @emph{zweimal} angeben. In diesem Fall werden die Binärdateien zuerst überprüfen, ob Benutzernamensräume unterstützt werden, und sonst notfalls PRoot benutzen, um das Programm auszuführen, wenn Benutzernamensräume nicht unterstützt werden." #. type: quotation -#: doc/guix.texi:4862 +#: doc/guix.texi:4860 msgid "The @uref{https://proot-me.github.io/, PRoot} program provides the necessary support for file system virtualization. It achieves that by using the @code{ptrace} system call on the running program. This approach has the advantage to work without requiring special kernel support, but it incurs run-time overhead every time a system call is made." msgstr "Das Programm @uref{https://proot-me.github.io/, PRoot} bietet auch Unterstützung für Dateisystemvirtualisierung, indem der Systemaufruf @code{ptrace} auf das laufende Programm angewendet wird. Dieser Ansatz funktioniert auch ohne besondere Kernel-Unterstützung, aber das Programm braucht mehr Zeit, um selbst Systemaufrufe durchzuführen." #. type: table -#: doc/guix.texi:4867 doc/guix.texi:8880 doc/guix.texi:9538 +#: doc/guix.texi:4865 doc/guix.texi:8878 doc/guix.texi:9536 msgid "Consider the package @var{expr} evaluates to." msgstr "Als Paket benutzen, wozu der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:4871 +#: doc/guix.texi:4869 msgid "This has the same purpose as the same-named option in @command{guix build} (@pxref{Additional Build Options, @code{--expression} in @command{guix build}})." msgstr "Der Zweck hiervon ist derselbe wie bei der gleichnamigen Befehlszeilenoption in @command{guix build} (siehe @ref{Additional Build Options, @code{--expression} in @command{guix build}})." #. type: table -#: doc/guix.texi:4876 +#: doc/guix.texi:4874 msgid "Use the packages contained in the manifest object returned by the Scheme code in @var{file}." msgstr "Die Pakete benutzen, die im Manifest-Objekt aufgeführt sind, das vom Scheme-Code in der angegebenen @var{Datei} geliefert wird." #. type: table -#: doc/guix.texi:4884 +#: doc/guix.texi:4882 msgid "This has a similar purpose as the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files. It allows you to define a collection of packages once and use it both for creating profiles and for creating archives for use on machines that do not have Guix installed. Note that you can specify @emph{either} a manifest file @emph{or} a list of packages, but not both." msgstr "Dies hat einen ähnlichen Zweck wie die gleichnamige Befehlszeilenoption in @command{guix package} (siehe @ref{profile-manifest, @option{--manifest}}) und benutzt dieselben Regeln für Manifest-Dateien. Damit können Sie eine Reihe von Paketen einmal definieren und dann sowohl zum Erzeugen von Profilesn als auch zum Erzeugen von Archiven benutzen, letztere für Maschinen, auf denen Guix nicht installiert ist. Beachten Sie, dass Sie @emph{entweder} eine Manifest-Datei @emph{oder} eine Liste von Paketen angeben können, aber nicht beides." #. type: item -#: doc/guix.texi:4890 doc/guix.texi:8102 +#: doc/guix.texi:4888 doc/guix.texi:8100 #, no-wrap msgid "--target=@var{triplet}" msgstr "--target=@var{Tripel}" #. type: cindex -#: doc/guix.texi:4891 doc/guix.texi:5237 doc/guix.texi:8103 +#: doc/guix.texi:4889 doc/guix.texi:5235 doc/guix.texi:8101 #, no-wrap msgid "cross-compilation" msgstr "Cross-Kompilieren" #. type: table -#: doc/guix.texi:4895 +#: doc/guix.texi:4893 msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})." msgstr "Lässt für das angegebene @var{Tripel} cross-erstellen, dieses muss ein gültiges GNU-Tripel wie z.B.@: @code{\"mips64el-linux-gnu\"} sein (siehe @ref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})." #. type: item -#: doc/guix.texi:4896 +#: doc/guix.texi:4894 #, no-wrap msgid "--compression=@var{tool}" msgstr "--compression=@var{Werkzeug}" #. type: itemx -#: doc/guix.texi:4897 +#: doc/guix.texi:4895 #, no-wrap msgid "-C @var{tool}" msgstr "-C @var{Werkzeug}" #. type: table -#: doc/guix.texi:4900 +#: doc/guix.texi:4898 msgid "Compress the resulting tarball using @var{tool}---one of @code{gzip}, @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression." msgstr "Komprimiert den resultierenden Tarball mit dem angegebenen @var{Werkzeug} — dieses kann @code{gzip}, @code{bzip2}, @code{xz}, @code{lzip} oder @code{none} für keine Kompression sein." #. type: item -#: doc/guix.texi:4901 +#: doc/guix.texi:4899 #, no-wrap msgid "--symlink=@var{spec}" msgstr "--symlink=@var{Spezifikation}" #. type: itemx -#: doc/guix.texi:4902 +#: doc/guix.texi:4900 #, no-wrap msgid "-S @var{spec}" msgstr "-S @var{Spezifikation}" #. type: table -#: doc/guix.texi:4905 +#: doc/guix.texi:4903 msgid "Add the symlinks specified by @var{spec} to the pack. This option can appear several times." msgstr "Fügt die in der @var{Spezifikation} festgelegten symbolischen Verknüpfungen zum Bündel hinzu. Diese Befehlszeilenoption darf mehrmals vorkommen." #. type: table -#: doc/guix.texi:4909 +#: doc/guix.texi:4907 msgid "@var{spec} has the form @code{@var{source}=@var{target}}, where @var{source} is the symlink that will be created and @var{target} is the symlink target." msgstr "Die @var{Spezifikation} muss von der Form @code{@var{Quellort}=@var{Zielort}} sein, wobei der @var{Quellort} der Ort der symbolischen Verknüpfung, die erstellt wird, und @var{Zielort} das Ziel der symbolischen Verknüpfung ist." #. type: table -#: doc/guix.texi:4912 +#: doc/guix.texi:4910 msgid "For instance, @code{-S /opt/gnu/bin=bin} creates a @file{/opt/gnu/bin} symlink pointing to the @file{bin} sub-directory of the profile." msgstr "Zum Beispiel wird mit @code{-S /opt/gnu/bin=bin} eine symbolische Verknüpfung @file{/opt/gnu/bin} auf das Unterverzeichnis @file{bin} im Profil erzeugt." #. type: item -#: doc/guix.texi:4913 +#: doc/guix.texi:4911 #, no-wrap msgid "--save-provenance" msgstr "--save-provenance" #. type: table -#: doc/guix.texi:4917 +#: doc/guix.texi:4915 msgid "Save provenance information for the packages passed on the command line. Provenance information includes the URL and commit of the channels in use (@pxref{Channels})." msgstr "Provenienzinformationen für die auf der Befehlszeile übergebenen Pakete speichern. Zu den Provenienzinformationen gehören die URL und der Commit jedes benutzten Kanals (siehe @ref{Channels})." #. type: table -#: doc/guix.texi:4923 +#: doc/guix.texi:4921 msgid "Provenance information is saved in the @file{/gnu/store/@dots{}-profile/manifest} file in the pack, along with the usual package metadata---the name and version of each package, their propagated inputs, and so on. It is useful information to the recipient of the pack, who then knows how the pack was (supposedly) obtained." msgstr "Provenienzinformationen werden in der Datei @file{/gnu/store/…-profile/manifest} im Bündel zusammen mit den üblichen Paketmetadaten abgespeichert — also Name und Version jedes Pakets, welche Eingaben dabei propagiert werden und so weiter. Die Informationen nützen den Empfängern des Bündels, weil sie dann wissen, woraus das Bündel (angeblich) besteht." #. type: table -#: doc/guix.texi:4929 +#: doc/guix.texi:4927 msgid "This option is not enabled by default because, like timestamps, provenance information contributes nothing to the build process. In other words, there is an infinity of channel URLs and commit IDs that can lead to the same pack. Recording such ``silent'' metadata in the output thus potentially breaks the source-to-binary bitwise reproducibility property." msgstr "Der Vorgabe nach wird diese Befehlszeilenoption @emph{nicht} verwendet, weil Provenienzinformationen genau wie Zeitstempel nichts zum Erstellungsprozess beitragen. Mit anderen Worten gibt es unendlich viele Kanal-URLs und Commit-IDs, aus denen dasselbe Bündel stammen könnte. Wenn solche „stillen“ Metadaten Teil des Ausgabe sind, dann wird also die bitweise Reproduzierbarkeit von Quellcode zu Binärdateien eingeschränkt." #. type: item -#: doc/guix.texi:4930 +#: doc/guix.texi:4928 #, no-wrap msgid "--localstatedir" msgstr "--localstatedir" #. type: itemx -#: doc/guix.texi:4931 +#: doc/guix.texi:4929 #, no-wrap msgid "--profile-name=@var{name}" msgstr "--profile-name=@var{Name}" #. type: table -#: doc/guix.texi:4936 +#: doc/guix.texi:4934 msgid "Include the ``local state directory'', @file{/var/guix}, in the resulting pack, and notably the @file{/var/guix/profiles/per-user/root/@var{name}} profile---by default @var{name} is @code{guix-profile}, which corresponds to @file{~root/.guix-profile}." msgstr "Das „lokale Zustandsverzeichnis“ @file{/var/guix} ins resultierende Bündel aufnehmen, speziell auch das Profil @file{/var/guix/profiles/per-user/root/@var{Name}} — der vorgegebene @var{Name} ist @code{guix-profile}, was @file{~root/.guix-profile} entspricht." #. type: table -#: doc/guix.texi:4942 +#: doc/guix.texi:4940 msgid "@file{/var/guix} contains the store database (@pxref{The Store}) as well as garbage-collector roots (@pxref{Invoking guix gc}). Providing it in the pack means that the store is ``complete'' and manageable by Guix; not providing it pack means that the store is ``dead'': items cannot be added to it or removed from it after extraction of the pack." msgstr "@file{/var/guix} enthält die Store-Datenbank (siehe @ref{The Store}) sowie die Müllsammlerwurzeln (siehe @ref{Invoking guix gc}). Es ins Bündel aufzunehmen, bedeutet, dass der enthaltene Store „vollständig“ ist und von Guix verwaltet werden kann, andernfalls wäre der Store im Bündel „tot“ und nach dem Auspacken des Bündels könnte Guix keine Objekte mehr dort hinzufügen oder entfernen." #. type: table -#: doc/guix.texi:4945 +#: doc/guix.texi:4943 msgid "One use case for this is the Guix self-contained binary tarball (@pxref{Binary Installation})." msgstr "Ein Anwendungsfall hierfür ist der eigenständige, alle Komponenten umfassende binäre Tarball von Guix (siehe @ref{Binary Installation})." #. type: table -#: doc/guix.texi:4949 +#: doc/guix.texi:4947 msgid "Use the bootstrap binaries to build the pack. This option is only useful to Guix developers." msgstr "Mit den Bootstrap-Binärdateien das Bündel erstellen. Diese Option ist nur für Guix-Entwickler nützlich." #. type: Plain text -#: doc/guix.texi:4954 +#: doc/guix.texi:4952 msgid "In addition, @command{guix pack} supports all the common build options (@pxref{Common Build Options}) and all the package transformation options (@pxref{Package Transformation Options})." msgstr "Außerdem unterstützt @command{guix pack} alle gemeinsamen Erstellungsoptionen (siehe @ref{Common Build Options}) und alle Paketumwandlungsoptionen (siehe @ref{Package Transformation Options})." #. type: Plain text -#: doc/guix.texi:4966 +#: doc/guix.texi:4964 msgid "GNU Guix provides several Scheme programming interfaces (APIs) to define, build, and query packages. The first interface allows users to write high-level package definitions. These definitions refer to familiar packaging concepts, such as the name and version of a package, its build system, and its dependencies. These definitions can then be turned into concrete build actions." msgstr "GNU Guix bietet mehrere Programmierschnittstellen (APIs) in der Programmiersprache Scheme an, mit denen Software-Pakete definiert, erstellt und gesucht werden können. Die erste Schnittstelle erlaubt es Nutzern, ihre eigenen Paketdefinitionen in einer Hochsprache zu schreiben. Diese Definitionen nehmen Bezug auf geläufige Konzepte der Paketverwaltung, wie den Namen und die Version eines Pakets, sein Erstellungssystem (Build System) und seine Abhängigkeiten (Dependencies). Diese Definitionen können dann in konkrete Erstellungsaktionen umgewandelt werden." #. type: Plain text -#: doc/guix.texi:4972 +#: doc/guix.texi:4970 msgid "Build actions are performed by the Guix daemon, on behalf of users. In a standard setup, the daemon has write access to the store---the @file{/gnu/store} directory---whereas users do not. The recommended setup also has the daemon perform builds in chroots, under a specific build users, to minimize interference with the rest of the system." msgstr "Erstellungsaktionen werden vom Guix-Daemon für dessen Nutzer durchgeführt. Bei einer normalen Konfiguration hat der Daemon Schreibzugriff auf den Store, also das Verzeichnis @file{/gnu/store}, Nutzer hingegen nicht. Die empfohlene Konfiguration lässt den Daemon die Erstellungen in chroot-Umgebungen durchführen, mit eigenen Benutzerkonten für „Erstellungsbenutzer“, um gegenseitige Beeinflussung der Erstellung und des übrigen Systems zu minimieren." #. type: Plain text -#: doc/guix.texi:4981 +#: doc/guix.texi:4979 msgid "Lower-level APIs are available to interact with the daemon and the store. To instruct the daemon to perform a build action, users actually provide it with a @dfn{derivation}. A derivation is a low-level representation of the build actions to be taken, and the environment in which they should occur---derivations are to package definitions what assembly is to C programs. The term ``derivation'' comes from the fact that build results @emph{derive} from them." msgstr "Systemnahe APIs stehen zur Verfügung, um mit dem Daemon und dem Store zu interagieren. Um den Daemon anzuweisen, eine Erstellungsaktion durchzuführen, versorgen ihn Nutzer jeweils mit einer @dfn{Ableitung}. Eine Ableitung ist, wie durchzuführende Erstellungsaktionen, sowie die Umgebungen, in denen sie durchzuführen sind, in Guix eigentlich intern dargestellt werden. Ableitungen verhalten sich zu Paketdefinitionen vergleichbar mit Assembler-Code zu C-Programmen. Der Begriff „Ableitung“ kommt daher, dass Erstellungsergebnisse daraus @emph{abgeleitet} werden." #. type: Plain text -#: doc/guix.texi:4984 +#: doc/guix.texi:4982 msgid "This chapter describes all these APIs in turn, starting from high-level package definitions." msgstr "Dieses Kapitel beschreibt der Reihe nach all diese Programmierschnittstellen (APIs), angefangen mit hochsprachlichen Paketdefinitionen." #. type: Plain text -#: doc/guix.texi:5010 +#: doc/guix.texi:5008 msgid "From a programming viewpoint, the package definitions of the GNU distribution are provided by Guile modules in the @code{(gnu packages @dots{})} name space@footnote{Note that packages under the @code{(gnu packages @dots{})} module name space are not necessarily ``GNU packages''. This module naming scheme follows the usual Guile module naming convention: @code{gnu} means that these modules are distributed as part of the GNU system, and @code{packages} identifies modules that define packages.} (@pxref{Modules, Guile modules,, guile, GNU Guile Reference Manual}). For instance, the @code{(gnu packages emacs)} module exports a variable named @code{emacs}, which is bound to a @code{} object (@pxref{Defining Packages})." msgstr "Aus Programmierersicht werden die Paketdefinitionen der GNU-Distribution als Guile-Module in Namensräumen wie @code{(gnu packages …)} sichtbar gemacht@footnote{Beachten Sie, dass Pakete unter dem Modulnamensraum @code{(gnu packages …)} nicht notwendigerweise auch „GNU-Pakete“ sind. Dieses Schema für die Benennung von Modulen folgt lediglich den üblichen Guile-Konventionen: @code{gnu} bedeutet, dass die Module als Teil des GNU-Systems ausgeliefert werden, und @code{packages} gruppiert Module mit Paketdefinitionen.} (siehe @ref{Modules, Guile modules,, guile, GNU Guile Reference Manual}). Zum Beispiel exportiert das Modul @code{(gnu packages emacs)} eine Variable namens @code{emacs}, die an ein @code{}-Objekt gebunden ist (siehe @ref{Defining Packages})." #. type: Plain text -#: doc/guix.texi:5017 +#: doc/guix.texi:5015 msgid "The @code{(gnu packages @dots{})} module name space is automatically scanned for packages by the command-line tools. For instance, when running @code{guix install emacs}, all the @code{(gnu packages @dots{})} modules are scanned until one that exports a package object whose name is @code{emacs} is found. This package search facility is implemented in the @code{(gnu packages)} module." msgstr "Der Modulnamensraum @code{(gnu packages …)} wird von Befehlszeilenwerkzeugen automatisch nach Paketen durchsucht. Wenn Sie zum Beispiel @code{guix install emacs} ausführen, werden alle @code{(gnu packages …)}-Module durchlaufen, bis eines gefunden wird, das ein Paketobjekt mit dem Namen @code{emacs} exportiert. Diese Paketsuchfunktion ist im Modul @code{(gnu packages)} implementiert." #. type: cindex -#: doc/guix.texi:5019 +#: doc/guix.texi:5017 #, no-wrap msgid "package module search path" msgstr "Paketmodulsuchpfad" #. type: Plain text -#: doc/guix.texi:5028 +#: doc/guix.texi:5026 msgid "Users can store package definitions in modules with different names---e.g., @code{(my-packages emacs)}@footnote{Note that the file name and module name must match. For instance, the @code{(my-packages emacs)} module must be stored in a @file{my-packages/emacs.scm} file relative to the load path specified with @option{--load-path} or @code{GUIX_PACKAGE_PATH}. @xref{Modules and the File System,,, guile, GNU Guile Reference Manual}, for details.}. There are two ways to make these package definitions visible to the user interfaces:" msgstr "Benutzer können Paketdefinitionen auch in Modulen mit anderen Namen unterbringen — z.B.@: @code{(my-packages emacs)}@footnote{Beachten Sie, dass Dateiname und Modulname übereinstimmen müssen. Zum Beispiel muss das Modul @code{(my-packages emacs)} in einer Datei @file{my-packages/emacs.scm} relativ zum mit @option{--load-path} oder @code{GUIX_PACKAGE_PATH} angegebenen Ladepfad stehen. Siehe @ref{Modules and the File System,,, guile, GNU Guile Reference Manual} für Details.}. Es gibt zwei Arten, solche Paketdefinitionen für die Benutzungsschnittstelle sichtbar zu machen:" #. type: enumerate -#: doc/guix.texi:5035 +#: doc/guix.texi:5033 msgid "By adding the directory containing your package modules to the search path with the @code{-L} flag of @command{guix package} and other commands (@pxref{Common Build Options}), or by setting the @code{GUIX_PACKAGE_PATH} environment variable described below." msgstr "Eine Möglichkeit ist, das Verzeichnis, in dem Ihre Paketmodule stehen, mit der Befehlszeilenoption @code{-L} von @command{guix package} und anderen Befehlen (siehe @ref{Common Build Options}) oder durch Setzen der unten beschriebenen Umgebungsvariablen @code{GUIX_PACKAGE_PATH} zum Suchpfad hinzuzufügen." #. type: enumerate -#: doc/guix.texi:5041 +#: doc/guix.texi:5039 msgid "By defining a @dfn{channel} and configuring @command{guix pull} so that it pulls from it. A channel is essentially a Git repository containing package modules. @xref{Channels}, for more information on how to define and use channels." msgstr "Die andere Möglichkeit ist, einen @dfn{Kanal} zu definieren und @command{guix pull} so zu konfigurieren, dass es davon seine Module bezieht. Ein Kanal ist im Kern nur ein Git-Repository, in welchem Paketmodule liegen. Siehe @ref{Channels} für mehr Informationen, wie Kanäle definiert und benutzt werden." #. type: Plain text -#: doc/guix.texi:5044 +#: doc/guix.texi:5042 msgid "@code{GUIX_PACKAGE_PATH} works similarly to other search path variables:" msgstr "@code{GUIX_PACKAGE_PATH} funktioniert ähnlich wie andere Variable mit Suchpfaden:" #. type: defvr -#: doc/guix.texi:5045 +#: doc/guix.texi:5043 #, no-wrap msgid "{Environment Variable} GUIX_PACKAGE_PATH" msgstr "{Umgebungsvariable} GUIX_PACKAGE_PATH" #. type: defvr -#: doc/guix.texi:5049 +#: doc/guix.texi:5047 msgid "This is a colon-separated list of directories to search for additional package modules. Directories listed in this variable take precedence over the own modules of the distribution." msgstr "Dies ist eine doppelpunktgetrennte Liste von Verzeichnissen, die nach zusätzlichen Paketmodulen durchsucht werden. In dieser Variablen aufgelistete Verzeichnisse haben Vorrang vor den Modulen, die zur Distribution gehören." #. type: Plain text -#: doc/guix.texi:5057 +#: doc/guix.texi:5055 msgid "The distribution is fully @dfn{bootstrapped} and @dfn{self-contained}: each package is built based solely on other packages in the distribution. The root of this dependency graph is a small set of @dfn{bootstrap binaries}, provided by the @code{(gnu packages bootstrap)} module. For more information on bootstrapping, @pxref{Bootstrapping}." msgstr "Die Distribution wird komplett von Grund auf initialisiert — man sagt zur Initialisierung auch @dfn{Bootstrapping} — und sie ist @dfn{eigenständig} („self-contained“): Jedes Paket wird nur auf Basis von anderen Paketen in der Distribution erstellt. Die Wurzel dieses Abhängigkeitsgraphen ist ein kleiner Satz von Initialisierungsbinärdateien, den @dfn{Bootstrap-Binärdateien}, die im Modul @code{(gnu packages bootstrap)} verfügbar gemacht werden. Für mehr Informationen über Bootstrapping, siehe @ref{Bootstrapping}." #. type: Plain text -#: doc/guix.texi:5065 +#: doc/guix.texi:5063 msgid "The high-level interface to package definitions is implemented in the @code{(guix packages)} and @code{(guix build-system)} modules. As an example, the package definition, or @dfn{recipe}, for the GNU Hello package looks like this:" msgstr "Mit den Modulen @code{(guix packages)} und @code{(guix build-system)} können Paketdefinitionen auf einer hohen Abstraktionsebene geschrieben werden. Zum Beispiel sieht die Paketdefinition bzw. das @dfn{Rezept} für das Paket von GNU Hello so aus:" #. type: example -#: doc/guix.texi:5073 +#: doc/guix.texi:5071 #, no-wrap msgid "" "(define-module (gnu packages hello)\n" @@ -10277,7 +10288,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:5092 +#: doc/guix.texi:5090 #, no-wrap msgid "" "(define-public hello\n" @@ -10319,277 +10330,277 @@ msgstr "" " (license gpl3+)))\n" #. type: Plain text -#: doc/guix.texi:5102 +#: doc/guix.texi:5100 msgid "Without being a Scheme expert, the reader may have guessed the meaning of the various fields here. This expression binds the variable @code{hello} to a @code{} object, which is essentially a record (@pxref{SRFI-9, Scheme records,, guile, GNU Guile Reference Manual}). This package object can be inspected using procedures found in the @code{(guix packages)} module; for instance, @code{(package-name hello)} returns---surprise!---@code{\"hello\"}." msgstr "Auch ohne ein Experte in Scheme zu sein, könnten Leser erraten haben, was die verschiedenen Felder dabei bedeuten. Dieser Ausdruck bindet die Variable @code{hello} an ein @code{}-Objekt, was an sich nur ein Verbund (Record) ist (siehe @ref{SRFI-9, Scheme records,, guile, GNU Guile Reference Manual}). Die Felder dieses Paket-Objekts lassen sich mit den Prozeduren aus dem Modul @code{(guix packages)} auslesen, zum Beispiel liefert @code{(package-name hello)} — Überraschung! — @code{\"hello\"}." #. type: Plain text -#: doc/guix.texi:5106 +#: doc/guix.texi:5104 msgid "With luck, you may be able to import part or all of the definition of the package you are interested in from another repository, using the @code{guix import} command (@pxref{Invoking guix import})." msgstr "Mit etwas Glück können Sie die Definition vielleicht teilweise oder sogar ganz aus einer anderen Paketsammlung importieren, indem Sie den Befehl @code{guix import} verwenden (siehe @ref{Invoking guix import})." #. type: Plain text -#: doc/guix.texi:5112 +#: doc/guix.texi:5110 msgid "In the example above, @var{hello} is defined in a module of its own, @code{(gnu packages hello)}. Technically, this is not strictly necessary, but it is convenient to do so: all the packages defined in modules under @code{(gnu packages @dots{})} are automatically known to the command-line tools (@pxref{Package Modules})." msgstr "In obigem Beispiel wurde @var{hello} in einem eigenen Modul ganz für sich alleine definiert, und zwar @code{(gnu packages hello)}. Technisch gesehen muss es nicht unbedingt in einem solchen Modul definiert werden, aber es ist bequem, denn alle Module unter @code{(gnu packages …)} werden automatisch von den Befehlszeilenwerkzeugen gefunden (siehe @ref{Package Modules})." #. type: Plain text -#: doc/guix.texi:5114 +#: doc/guix.texi:5112 msgid "There are a few points worth noting in the above package definition:" msgstr "Ein paar Dinge sind noch erwähnenswert in der obigen Paketdefinition:" #. type: itemize -#: doc/guix.texi:5121 +#: doc/guix.texi:5119 msgid "The @code{source} field of the package is an @code{} object (@pxref{origin Reference}, for the complete reference). Here, the @code{url-fetch} method from @code{(guix download)} is used, meaning that the source is a file to be downloaded over FTP or HTTP." msgstr "Das @code{source}-Feld für die Quelle des Pakets ist ein @code{}-Objekt, was den Paketursprung angibt (siehe @ref{origin Reference} für eine vollständige Referenz). Hier wird dafür die Methode @code{url-fetch} aus dem Modul @code{(guix download)} benutzt, d.h.@: die Quelle ist eine Datei, die über FTP oder HTTP heruntergeladen werden soll." #. type: itemize -#: doc/guix.texi:5124 +#: doc/guix.texi:5122 msgid "The @code{mirror://gnu} prefix instructs @code{url-fetch} to use one of the GNU mirrors defined in @code{(guix download)}." msgstr "Das Präfix @code{mirror://gnu} lässt @code{url-fetch} einen der GNU-Spiegelserver benutzen, die in @code{(guix download)} definiert sind." #. type: itemize -#: doc/guix.texi:5131 +#: doc/guix.texi:5129 msgid "The @code{sha256} field specifies the expected SHA256 hash of the file being downloaded. It is mandatory, and allows Guix to check the integrity of the file. The @code{(base32 @dots{})} form introduces the base32 representation of the hash. You can obtain this information with @code{guix download} (@pxref{Invoking guix download}) and @code{guix hash} (@pxref{Invoking guix hash})." msgstr "Das Feld @code{sha256} legt den erwarteten SHA256-Hashwert der herunterzuladenden Datei fest. Ihn anzugeben ist Pflicht und er ermöglicht es Guix, die Integrität der Datei zu überprüfen. Die Form @code{(base32 …)} geht der base32-Darstellung des Hash-Wertes voraus. Sie finden die base32-Darstellung mit Hilfe der Befehle @code{guix download} (siehe @ref{Invoking guix download}) und @code{guix hash} (siehe @ref{Invoking guix hash})." #. type: cindex -#: doc/guix.texi:5132 +#: doc/guix.texi:5130 #, no-wrap msgid "patches" msgstr "Patches" #. type: itemize -#: doc/guix.texi:5136 +#: doc/guix.texi:5134 msgid "When needed, the @code{origin} form can also have a @code{patches} field listing patches to be applied, and a @code{snippet} field giving a Scheme expression to modify the source code." msgstr "Wenn nötig kann in der @code{origin}-Form auch ein @code{patches}-Feld stehen, wo anzuwendende Patches aufgeführt werden, sowie ein @code{snippet}-Feld mit einem Scheme-Ausdruck mit den Anweisungen, wie der Quellcode zu modifizieren ist." #. type: cindex -#: doc/guix.texi:5138 +#: doc/guix.texi:5136 #, no-wrap msgid "GNU Build System" msgstr "GNU-Erstellungssystem" #. type: itemize -#: doc/guix.texi:5144 +#: doc/guix.texi:5142 msgid "The @code{build-system} field specifies the procedure to build the package (@pxref{Build Systems}). Here, @var{gnu-build-system} represents the familiar GNU Build System, where packages may be configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence." msgstr "Das Feld @code{build-system} legt fest, mit welcher Prozedur das Paket erstellt werden soll (siehe @ref{Build Systems}). In diesem Beispiel steht @var{gnu-build-system} für das wohlbekannte GNU-Erstellungssystem, wo Pakete mit der üblichen Befehlsfolge @code{./configure && make && make check && make install} konfiguriert, erstellt und installiert werden." #. type: itemize -#: doc/guix.texi:5150 +#: doc/guix.texi:5148 msgid "The @code{arguments} field specifies options for the build system (@pxref{Build Systems}). Here it is interpreted by @var{gnu-build-system} as a request run @file{configure} with the @code{--enable-silent-rules} flag." msgstr "Das Feld @code{arguments} gibt an, welche Optionen dem Erstellungssystem mitgegeben werden sollen (siehe @ref{Build Systems}). In diesem Fall interpretiert @var{gnu-build-system} diese als Auftrag, @file{configure} mit der Befehlszeilenoption @code{--enable-silent-rules} auszuführen." #. type: findex -#: doc/guix.texi:5151 doc/guix.texi:5154 +#: doc/guix.texi:5149 doc/guix.texi:5152 #, no-wrap msgid "quote" msgstr "quote" #. type: cindex -#: doc/guix.texi:5152 +#: doc/guix.texi:5150 #, no-wrap msgid "quoting" msgstr "Maskierung" #. type: findex -#: doc/guix.texi:5153 +#: doc/guix.texi:5151 #, no-wrap msgid "'" msgstr "'" #. type: itemize -#: doc/guix.texi:5162 +#: doc/guix.texi:5160 msgid "What about these quote (@code{'}) characters? They are Scheme syntax to introduce a literal list; @code{'} is synonymous with @code{quote}. @xref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual}, for details. Here the value of the @code{arguments} field is a list of arguments passed to the build system down the road, as with @code{apply} (@pxref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})." msgstr "Was hat es mit diesen einfachen Anführungszeichen (@code{'}) auf sich? Sie gehören zur Syntax von Scheme und führen eine wörtlich zu interpretierende Datenlisten ein; dies nennt sich Maskierung oder Quotierung. @code{'} ist synonym mit @code{quote}. @ref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual} enthält weitere Details. Hierbei ist also der Wert des @code{arguments}-Feldes eine Liste von Argumenten, die an das Erstellungssystem weitergereicht werden, wie bei @code{apply} (siehe @ref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})." #. type: itemize -#: doc/guix.texi:5168 +#: doc/guix.texi:5166 msgid "The hash-colon (@code{#:}) sequence defines a Scheme @dfn{keyword} (@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and @code{#:configure-flags} is a keyword used to pass a keyword argument to the build system (@pxref{Coding With Keywords,,, guile, GNU Guile Reference Manual})." msgstr "Ein Doppelkreuz gefolgt von einem Doppelpunkt (@code{#:}) definiert ein Scheme-@dfn{Schlüsselwort} (siehe @ref{Keywords,,, guile, GNU Guile Reference Manual}) und @code{#:configure-flags} ist ein Schlüsselwort, um eine Befehlszeilenoption an das Erstellungssystem mitzugeben (siehe @ref{Coding With Keywords,,, guile, GNU Guile Reference Manual})." #. type: itemize -#: doc/guix.texi:5174 +#: doc/guix.texi:5172 msgid "The @code{inputs} field specifies inputs to the build process---i.e., build-time or run-time dependencies of the package. Here, we define an input called @code{\"gawk\"} whose value is that of the @var{gawk} variable; @var{gawk} is itself bound to a @code{} object." msgstr "Das Feld @code{inputs} legt Eingaben an den Erstellungsprozess fest — d.h.@: Abhängigkeiten des Pakets zur Erstellungs- oder Laufzeit. Hier definieren wir eine Eingabe namens @code{\"gawk\"}, deren Wert wir auf den Wert der @var{gawk}-Variablen festlegen; @var{gawk} ist auch selbst wiederum an ein @code{}-Objekt als Variablenwert gebunden." #. type: cindex -#: doc/guix.texi:5175 +#: doc/guix.texi:5173 #, no-wrap msgid "backquote (quasiquote)" msgstr "Backquote (Quasimaskierung)" #. type: findex -#: doc/guix.texi:5176 +#: doc/guix.texi:5174 #, no-wrap msgid "`" msgstr "`" #. type: findex -#: doc/guix.texi:5177 +#: doc/guix.texi:5175 #, no-wrap msgid "quasiquote" msgstr "quasiquote" #. type: cindex -#: doc/guix.texi:5178 +#: doc/guix.texi:5176 #, no-wrap msgid "comma (unquote)" msgstr "Komma (Demaskierung)" #. type: findex -#: doc/guix.texi:5179 +#: doc/guix.texi:5177 #, no-wrap msgid "," msgstr "," #. type: findex -#: doc/guix.texi:5180 +#: doc/guix.texi:5178 #, no-wrap msgid "unquote" msgstr "unquote" #. type: findex -#: doc/guix.texi:5181 +#: doc/guix.texi:5179 #, no-wrap msgid ",@@" msgstr ",@@" #. type: findex -#: doc/guix.texi:5182 +#: doc/guix.texi:5180 #, no-wrap msgid "unquote-splicing" msgstr "unquote-splicing" #. type: itemize -#: doc/guix.texi:5188 +#: doc/guix.texi:5186 msgid "Again, @code{`} (a backquote, synonymous with @code{quasiquote}) allows us to introduce a literal list in the @code{inputs} field, while @code{,} (a comma, synonymous with @code{unquote}) allows us to insert a value in that list (@pxref{Expression Syntax, unquote,, guile, GNU Guile Reference Manual})." msgstr "Auch mit @code{`} (einem Backquote, stattdessen kann man auch das längere Synonym @code{quasiquote} schreiben) können wir eine wörtlich als Daten interpretierte Liste im @code{inputs}-Feld einführen, aber bei dieser „Quasimaskierung“ kann @code{,} (ein Komma, oder dessen Synonym @code{unquote}) benutzt werden, um den ausgewerteten Wert eines Ausdrucks in diese Liste einzufügen (siehe @ref{Expression Syntax, unquote,, guile, GNU Guile Reference Manual})." #. type: itemize -#: doc/guix.texi:5192 +#: doc/guix.texi:5190 msgid "Note that GCC, Coreutils, Bash, and other essential tools do not need to be specified as inputs here. Instead, @var{gnu-build-system} takes care of ensuring that they are present (@pxref{Build Systems})." msgstr "Beachten Sie, dass GCC, Coreutils, Bash und andere essenzielle Werkzeuge hier nicht als Eingaben aufgeführt werden müssen. Stattdessen sorgt schon @var{gnu-build-system} dafür, dass diese vorhanden sein müssen (siehe @ref{Build Systems})." #. type: itemize -#: doc/guix.texi:5196 +#: doc/guix.texi:5194 msgid "However, any other dependencies need to be specified in the @code{inputs} field. Any dependency not specified here will simply be unavailable to the build process, possibly leading to a build failure." msgstr "Sämtliche anderen Abhängigkeiten müssen aber im @code{inputs}-Feld aufgezählt werden. Jede hier nicht angegebene Abhängigkeit wird während des Erstellungsprozesses schlicht nicht verfügbar sein, woraus ein Erstellungsfehler resultieren kann." #. type: Plain text -#: doc/guix.texi:5199 +#: doc/guix.texi:5197 msgid "@xref{package Reference}, for a full description of possible fields." msgstr "Siehe @ref{package Reference} für eine umfassende Beschreibung aller erlaubten Felder." #. type: Plain text -#: doc/guix.texi:5210 +#: doc/guix.texi:5208 msgid "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}), 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 more information on how to test package definitions, and @ref{Invoking guix lint}, for information on how to check a definition for style conformance." msgstr "Sobald eine Paketdefinition eingesetzt wurde, können Sie das Paket mit Hilfe des Befehlszeilenwerkzeugs @code{guix build} dann auch tatsächlich erstellen (siehe @ref{Invoking guix build}) und dabei jegliche Erstellungsfehler, auf die Sie stoßen, beseitigen (siehe @ref{Debugging Build Failures}). Sie können den Befehl @command{guix edit} benutzen, um leicht zur Paketdefinition zurückzuspringen (siehe @ref{Invoking guix edit}). Unter @ref{Packaging Guidelines} finden Sie mehr Informationen darüber, wie Sie Paketdefinitionen testen, und unter @ref{Invoking guix lint} finden Sie Informationen, wie Sie prüfen, ob eine Definition alle Stilkonventionen einhält." #. type: vindex -#: doc/guix.texi:5210 +#: doc/guix.texi:5208 #, no-wrap msgid "GUIX_PACKAGE_PATH" msgstr "GUIX_PACKAGE_PATH" #. type: Plain text -#: doc/guix.texi:5214 +#: doc/guix.texi:5212 msgid "Lastly, @pxref{Channels}, for information on how to extend the distribution by adding your own package definitions in a ``channel''." msgstr "Zuletzt finden Sie unter @ref{Channels} Informationen, wie Sie die Distribution um Ihre eigenen Pakete in einem „Kanal“ erweitern." #. type: Plain text -#: doc/guix.texi:5218 +#: doc/guix.texi:5216 msgid "Finally, updating the package definition to a new upstream version can be partly automated by the @command{guix refresh} command (@pxref{Invoking guix refresh})." msgstr "Zu all dem sei auch erwähnt, dass Sie das Aktualisieren einer Paketdefinition auf eine vom Anbieter neu veröffentlichte Version mit dem Befehl @command{guix refresh} teilweise automatisieren können (siehe @ref{Invoking guix refresh})." #. type: Plain text -#: doc/guix.texi:5224 +#: doc/guix.texi:5222 msgid "Behind the scenes, a derivation corresponding to the @code{} object is first computed by the @code{package-derivation} procedure. That derivation is stored in a @code{.drv} file under @file{/gnu/store}. The build actions it prescribes may then be realized by using the @code{build-derivations} procedure (@pxref{The Store})." msgstr "Hinter den Kulissen wird die einem @code{}-Objekt entsprechende Ableitung zuerst durch @code{package-derivation} berechnet. Diese Ableitung wird in der @code{.drv}-Datei unter @file{/gnu/store} gespeichert. Die von ihr vorgeschriebenen Erstellungsaktionen können dann durch die Prozedur @code{build-derivations} umgesetzt werden (siehe @ref{The Store})." #. type: deffn -#: doc/guix.texi:5225 +#: doc/guix.texi:5223 #, no-wrap msgid "{Scheme Procedure} package-derivation @var{store} @var{package} [@var{system}]" msgstr "{Scheme-Prozedur} package-derivation @var{Store} @var{Paket} [@var{System}]" #. type: deffn -#: doc/guix.texi:5228 +#: doc/guix.texi:5226 msgid "Return the @code{} object of @var{package} for @var{system} (@pxref{Derivations})." msgstr "Das @code{}-Objekt zum @var{Paket} für das angegebene @var{System} liefern (siehe @ref{Derivations})." #. type: deffn -#: doc/guix.texi:5234 +#: doc/guix.texi:5232 msgid "@var{package} must be a valid @code{} object, and @var{system} must be a string denoting the target system type---e.g., @code{\"x86_64-linux\"} for an x86_64 Linux-based GNU system. @var{store} must be a connection to the daemon, which operates on the store (@pxref{The Store})." msgstr "Als @var{Paket} muss ein gültiges @code{}-Objekt angegeben werden und das @var{System} muss eine Zeichenkette sein, die das Zielsystem angibt — z.B.@: @code{\"x86_64-linux\"} für ein auf x86_64 laufendes, Linux-basiertes GNU-System. @var{Store} muss eine Verbindung zum Daemon sein, der die Operationen auf dem Store durchführt (siehe @ref{The Store})." #. type: Plain text -#: doc/guix.texi:5240 +#: doc/guix.texi:5238 msgid "Similarly, it is possible to compute a derivation that cross-builds a package for some other system:" msgstr "Auf ähnliche Weise kann eine Ableitung berechnet werden, die ein Paket für ein anderes System cross-erstellt." #. type: deffn -#: doc/guix.texi:5241 +#: doc/guix.texi:5239 #, no-wrap msgid "{Scheme Procedure} package-cross-derivation @var{store} @" msgstr "{Scheme-Prozedur} package-cross-derivation @var{Store} @" #. type: deffn -#: doc/guix.texi:5245 +#: doc/guix.texi:5243 msgid "@var{package} @var{target} [@var{system}] Return the @code{} object of @var{package} cross-built from @var{system} to @var{target}." msgstr "@var{Paket} @var{Ziel} [@var{System}] Liefert das @code{}-Objekt, um das @var{Paket} zu cross-erstellen vom @var{System} aus für das @var{Ziel}-System." #. type: deffn -#: doc/guix.texi:5249 +#: doc/guix.texi:5247 msgid "@var{target} must be a valid GNU triplet denoting the target hardware and operating system, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets,,, autoconf, Autoconf})." msgstr "Als @var{Ziel} muss ein gültiges GNU-Tripel angegeben werden, was die Ziel-Hardware und das zugehörige Betriebssystem beschreibt, wie z.B.@: @code{\"mips64el-linux-gnu\"} (siehe @ref{Specifying Target Triplets,,, autoconf, Autoconf})." #. type: cindex -#: doc/guix.texi:5251 +#: doc/guix.texi:5249 #, no-wrap msgid "package transformations" msgstr "Paketumwandlungen" #. type: cindex -#: doc/guix.texi:5252 +#: doc/guix.texi:5250 #, no-wrap msgid "input rewriting" msgstr "Eingaben umschreiben" #. type: cindex -#: doc/guix.texi:5253 +#: doc/guix.texi:5251 #, no-wrap msgid "dependency tree rewriting" msgstr "Abhängigkeitsbaum umschreiben" #. type: Plain text -#: doc/guix.texi:5257 +#: doc/guix.texi:5255 msgid "Packages can be manipulated in arbitrary ways. An example of a useful transformation is @dfn{input rewriting}, whereby the dependency tree of a package is rewritten by replacing specific inputs by others:" msgstr "Pakete können auf beliebige Art verändert werden. Ein Beispiel für eine nützliche Veränderung ist das @dfn{Umschreiben von Eingaben}, womit der Abhängigkeitsbaum eines Pakets umgeschrieben wird, indem bestimmte Eingaben durch andere ersetzt werden:" #. type: deffn -#: doc/guix.texi:5258 +#: doc/guix.texi:5256 #, no-wrap msgid "{Scheme Procedure} package-input-rewriting @var{replacements} @" msgstr "{Scheme-Prozedur} package-input-rewriting @var{Ersetzungen} @" #. type: deffn -#: doc/guix.texi:5265 +#: doc/guix.texi:5263 msgid "[@var{rewrite-name}] Return a procedure that, when passed a package, replaces its direct and indirect dependencies (but not its implicit inputs) according to @var{replacements}. @var{replacements} is a list of package pairs; the first element of each pair is the package to replace, and the second one is the replacement." msgstr "[@var{umgeschriebener-Name}] Eine Prozedur liefern, die für ein ihr übergebenes Paket dessen direkte und indirekte Abhängigkeit (aber nicht dessen implizite Eingaben) gemäß den @var{Ersetzungen} umschreibt. @var{Ersetzungen} ist eine Liste von Paketpaaren; das erste Element eines Paares ist das zu ersetzende Paket und das zweite ist, wodurch es ersetzt werden soll." #. type: deffn -#: doc/guix.texi:5268 +#: doc/guix.texi:5266 msgid "Optionally, @var{rewrite-name} is a one-argument procedure that takes the name of a package and returns its new name after rewrite." msgstr "Optional kann als @var{umgeschriebener-Name} eine ein Argument nehmende Prozedur angegeben werden, die einen Paketnamen nimmt und den Namen nach dem Umschreiben zurückliefert." #. type: Plain text -#: doc/guix.texi:5272 +#: doc/guix.texi:5270 msgid "Consider this example:" msgstr "Betrachten Sie dieses Beispiel:" #. type: example -#: doc/guix.texi:5278 +#: doc/guix.texi:5276 #, no-wrap msgid "" "(define libressl-instead-of-openssl\n" @@ -10605,7 +10616,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:5281 +#: doc/guix.texi:5279 #, no-wrap msgid "" "(define git-with-libressl\n" @@ -10615,33 +10626,33 @@ msgstr "" " (libressl-statt-openssl git))\n" #. type: Plain text -#: doc/guix.texi:5289 +#: doc/guix.texi:5287 msgid "Here we first define a rewriting procedure that replaces @var{openssl} with @var{libressl}. Then we use it to define a @dfn{variant} of the @var{git} package that uses @var{libressl} instead of @var{openssl}. This is exactly what the @option{--with-input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}})." msgstr "Hier definieren wir zuerst eine Umschreibeprozedur, die @var{openssl} durch @var{libressl} ersetzt. Dann definieren wir damit eine @dfn{Variante} des @var{git}-Pakets, die @var{libressl} statt @var{openssl} benutzt. Das ist genau, was auch die Befehlszeilenoption @option{--with-input} tut (siehe @ref{Package Transformation Options, @option{--with-input}})." #. type: Plain text -#: doc/guix.texi:5292 +#: doc/guix.texi:5290 msgid "The following variant of @code{package-input-rewriting} can match packages to be replaced by name rather than by identity." msgstr "Die folgende Variante von @code{package-input-rewriting} kann für die Ersetzung passende Pakete anhand ihres Namens finden, statt zu prüfen, ob der Wert identisch ist." #. type: deffn -#: doc/guix.texi:5293 +#: doc/guix.texi:5291 #, no-wrap msgid "{Scheme Procedure} package-input-rewriting/spec @var{replacements}" msgstr "{Scheme-Prozedur} package-input-rewriting/spec @var{Ersetzungen}" #. type: deffn -#: doc/guix.texi:5299 +#: doc/guix.texi:5297 msgid "Return a procedure that, given a package, applies the given @var{replacements} to all the package graph (excluding implicit inputs). @var{replacements} is a list of spec/procedures pair; each spec is a package specification such as @code{\"gcc\"} or @code{\"guile@@2\"}, and each procedure takes a matching package and returns a replacement for that package." msgstr "Liefert eine Prozedur, die für ein gegebenes Paket die angegebenen @var{Ersetzungen} auf dessen gesamten Paketgraphen anwendet (außer auf implizite Eingaben). @var{Ersetzungen} muss dabei eine Liste von Paaren aus je einer Spezifikation und Prozedur sein. Dabei ist jede Spezifikation eine Paketspezifikation wie @code{\"gcc\"} oder @code{\"guile@@2\"} und jede Prozedur nimmt ein passendes Paket und liefert dafür einen Ersatz für das Paket." #. type: Plain text -#: doc/guix.texi:5302 +#: doc/guix.texi:5300 msgid "The example above could be rewritten this way:" msgstr "Das obige Beispiel könnte auch so geschrieben werden:" #. type: example -#: doc/guix.texi:5307 +#: doc/guix.texi:5305 #, no-wrap msgid "" "(define libressl-instead-of-openssl\n" @@ -10653,129 +10664,129 @@ msgstr "" " (package-input-rewriting/spec `((\"openssl\" . ,(const libressl)))))\n" #. type: Plain text -#: doc/guix.texi:5312 +#: doc/guix.texi:5310 msgid "The key difference here is that, this time, packages are matched by spec and not by identity. In other words, any package in the graph that is called @code{openssl} will be replaced." msgstr "Der Hauptunterschied ist hier, dass diesmal Pakete zur Spezifikation passen müssen und nicht deren Wert identisch sein muss, damit sie ersetzt werden. Mit anderen Worten wird jedes Paket im Graphen ersetzt, das @code{openssl} heißt." #. type: Plain text -#: doc/guix.texi:5316 +#: doc/guix.texi:5314 msgid "A more generic procedure to rewrite a package dependency graph is @code{package-mapping}: it supports arbitrary changes to nodes in the graph." msgstr "Eine allgemeiner anwendbare Prozedur, um den Abhängigkeitsgraphen eines Pakets umzuschreiben, ist @code{package-mapping}. Sie unterstützt beliebige Änderungen an den Knoten des Graphen." #. type: deffn -#: doc/guix.texi:5317 +#: doc/guix.texi:5315 #, no-wrap msgid "{Scheme Procedure} package-mapping @var{proc} [@var{cut?}]" msgstr "{Scheme-Prozedur} package-mapping @var{Prozedur} [@var{Schnitt?}]" #. type: deffn -#: doc/guix.texi:5321 +#: doc/guix.texi:5319 msgid "Return a procedure that, given a package, applies @var{proc} to all the packages depended on and returns the resulting package. The procedure stops recursion when @var{cut?} returns true for a given package." msgstr "Liefert eine Prozedur, die, wenn ihr ein Paket übergeben wird, die an @code{package-mapping} übergebene @var{Prozedur} auf alle vom Paket abhängigen Pakete anwendet. Die Prozedur liefert das resultierende Paket. Wenn @var{Schnitt?} für ein Paket davon einen wahren Wert liefert, findet kein rekursiver Abstieg in dessen Abhängigkeiten statt." #. type: subsection -#: doc/guix.texi:5330 +#: doc/guix.texi:5328 #, no-wrap msgid "@code{package} Reference" msgstr "@code{package}-Referenz" #. type: Plain text -#: doc/guix.texi:5334 +#: doc/guix.texi:5332 msgid "This section summarizes all the options available in @code{package} declarations (@pxref{Defining Packages})." msgstr "Dieser Abschnitt fasst alle in @code{package}-Deklarationen zur Verfügung stehenden Optionen zusammen (siehe @ref{Defining Packages})." #. type: deftp -#: doc/guix.texi:5335 +#: doc/guix.texi:5333 #, no-wrap msgid "{Data Type} package" msgstr "{Datentyp} package" #. type: deftp -#: doc/guix.texi:5337 +#: doc/guix.texi:5335 msgid "This is the data type representing a package recipe." msgstr "Dieser Datentyp steht für ein Paketrezept." #. type: table -#: doc/guix.texi:5341 +#: doc/guix.texi:5339 msgid "The name of the package, as a string." msgstr "Der Name des Pakets als Zeichenkette." #. type: code{#1} -#: doc/guix.texi:5342 +#: doc/guix.texi:5340 #, no-wrap msgid "version" msgstr "version" #. type: table -#: doc/guix.texi:5344 +#: doc/guix.texi:5342 msgid "The version of the package, as a string." msgstr "Die Version des Pakets als Zeichenkette." #. type: code{#1} -#: doc/guix.texi:5345 doc/guix.texi:9132 doc/guix.texi:10881 -#: doc/guix.texi:11319 +#: doc/guix.texi:5343 doc/guix.texi:9130 doc/guix.texi:10879 +#: doc/guix.texi:11317 #, no-wrap msgid "source" msgstr "source" #. type: table -#: doc/guix.texi:5352 +#: doc/guix.texi:5350 msgid "An object telling how the source code for the package should be acquired. Most of the time, this is an @code{origin} object, which denotes a file fetched from the Internet (@pxref{origin Reference}). It can also be any other ``file-like'' object such as a @code{local-file}, which denotes a file from the local file system (@pxref{G-Expressions, @code{local-file}})." msgstr "Ein Objekt, das beschreibt, wie der Quellcode des Pakets bezogen werden soll. Meistens ist es ein @code{origin}-Objekt, welches für eine aus dem Internet heruntergeladene Datei steht (siehe @ref{origin Reference}). Es kann aber auch ein beliebiges anderes „dateiähnliches“ Objekt sein, wie z.B.@: ein @code{local-file}, was eine Datei im lokalen Dateisystem bezeichnet (siehe @ref{G-Expressions, @code{local-file}})." #. type: code{#1} -#: doc/guix.texi:5353 +#: doc/guix.texi:5351 #, no-wrap msgid "build-system" msgstr "build-system" #. type: table -#: doc/guix.texi:5356 +#: doc/guix.texi:5354 msgid "The build system that should be used to build the package (@pxref{Build Systems})." msgstr "Das Erstellungssystem, mit dem das Paket erstellt werden soll (siehe @ref{Build Systems})." #. type: item -#: doc/guix.texi:5357 doc/guix.texi:12917 +#: doc/guix.texi:5355 doc/guix.texi:12915 #, no-wrap msgid "@code{arguments} (default: @code{'()})" msgstr "@code{arguments} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5360 +#: doc/guix.texi:5358 msgid "The arguments that should be passed to the build system. This is a list, typically containing sequential keyword-value pairs." msgstr "Die Argumente, die an das Erstellungssystem übergeben werden sollen. Dies ist eine Liste, typischerweise eine Reihe von Schlüssel-Wert-Paaren." #. type: item -#: doc/guix.texi:5361 +#: doc/guix.texi:5359 #, no-wrap msgid "@code{inputs} (default: @code{'()})" msgstr "@code{inputs} (Vorgabe: @code{'()})" #. type: itemx -#: doc/guix.texi:5362 +#: doc/guix.texi:5360 #, no-wrap msgid "@code{native-inputs} (default: @code{'()})" msgstr "@code{native-inputs} (Vorgabe: @code{'()})" #. type: itemx -#: doc/guix.texi:5363 +#: doc/guix.texi:5361 #, no-wrap msgid "@code{propagated-inputs} (default: @code{'()})" msgstr "@code{propagated-inputs} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:5364 +#: doc/guix.texi:5362 #, no-wrap msgid "inputs, of packages" msgstr "Eingaben, von Paketen" #. type: table -#: doc/guix.texi:5372 +#: doc/guix.texi:5370 msgid "These fields list dependencies of the package. Each one is a list of tuples, where each tuple has a label for the input (a string) as its first element, a package, origin, or derivation as its second element, and optionally the name of the output thereof that should be used, which defaults to @code{\"out\"} (@pxref{Packages with Multiple Outputs}, for more on package outputs). For example, the list below specifies three inputs:" msgstr "In diesen Feldern werden die Abhängigkeiten des Pakets aufgeführt. Jedes dieser Felder enthält eine Liste von Tupeln, wobei jedes Tupel eine Bezeichnung für die Eingabe (als Zeichenkette) als erstes Element, dann ein „package“-, „origin“- oder „derivation“-Objekt (Paket, Ursprung oder Ableitung) als zweites Element und optional die Benennung der davon zu benutzenden Ausgabe umfasst; letztere hat als Vorgabewert @code{\"out\"} (siehe @ref{Packages with Multiple Outputs} für mehr Informationen zu Paketausgaben). Im folgenden Beispiel etwa werden drei Eingaben festgelegt:" #. type: example -#: doc/guix.texi:5377 +#: doc/guix.texi:5375 #, no-wrap msgid "" "`((\"libffi\" ,libffi)\n" @@ -10787,181 +10798,181 @@ msgstr "" " (\"glib:bin\" ,glib \"bin\")) ;Ausgabe \"bin\" von Glib\n" #. type: cindex -#: doc/guix.texi:5379 +#: doc/guix.texi:5377 #, no-wrap msgid "cross compilation, package dependencies" msgstr "Cross-Kompilieren, Paketabhängigkeiten" #. type: table -#: doc/guix.texi:5385 +#: doc/guix.texi:5383 msgid "The distinction between @code{native-inputs} and @code{inputs} is necessary when considering cross-compilation. When cross-compiling, dependencies listed in @code{inputs} are built for the @emph{target} architecture; conversely, dependencies listed in @code{native-inputs} are built for the architecture of the @emph{build} machine." msgstr "Die Unterscheidung zwischen @code{native-inputs} und @code{inputs} ist wichtig, damit Cross-Kompilieren möglich ist. Beim Cross-Kompilieren werden als @code{inputs} aufgeführte Abhängigkeiten für die Ziel-Prozessorarchitektur (@emph{target}) erstellt, andersherum werden als @code{native-inputs} aufgeführte Abhängigkeiten für die Prozessorarchitektur der erstellenden Maschine (@emph{build}) erstellt." #. type: table -#: doc/guix.texi:5390 +#: doc/guix.texi:5388 msgid "@code{native-inputs} is typically used to list tools needed at build time, but not at run time, such as Autoconf, Automake, pkg-config, Gettext, or Bison. @command{guix lint} can report likely mistakes in this area (@pxref{Invoking guix lint})." msgstr "@code{native-inputs} listet typischerweise die Werkzeuge auf, die während der Erstellung gebraucht werden, aber nicht zur Laufzeit des Programms gebraucht werden. Beispiele sind Autoconf, Automake, pkg-config, Gettext oder Bison. @command{guix lint} kann melden, ob wahrscheinlich Fehler in der Auflistung sind (siehe @ref{Invoking guix lint})." #. type: anchor{#1} -#: doc/guix.texi:5397 +#: doc/guix.texi:5395 msgid "package-propagated-inputs" msgstr "package-propagated-inputs" #. type: table -#: doc/guix.texi:5397 +#: doc/guix.texi:5395 msgid "Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed alongside the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix package} deals with propagated inputs.)" msgstr "Schließlich ist @code{propagated-inputs} ähnlich wie @code{inputs}, aber die angegebenen Pakete werden automatisch mit ins Profil installiert, wenn das Paket installiert wird, zu dem sie gehören (siehe @ref{package-cmd-propagated-inputs, @command{guix package}} für Informationen darüber, wie @command{guix package} mit propagierten Eingaben umgeht)." #. type: table -#: doc/guix.texi:5401 +#: doc/guix.texi:5399 msgid "For example this is necessary when a C/C++ library needs headers of another library to compile, or when a pkg-config file refers to another one @i{via} its @code{Requires} field." msgstr "Dies ist zum Beispiel nötig, wenn eine C-/C++-Bibliothek Header-Dateien einer anderen Bibliothek braucht, um mit ihr kompilieren zu können, oder wenn sich eine pkg-config-Datei auf eine andere über ihren @code{Requires}-Eintrag bezieht." #. type: table -#: doc/guix.texi:5408 +#: doc/guix.texi:5406 msgid "Another example where @code{propagated-inputs} is useful is for languages that lack a facility to record the run-time search path akin to the @code{RUNPATH} of ELF files; this includes Guile, Python, Perl, and more. To ensure that libraries written in those languages can find library code they depend on at run time, run-time dependencies must be listed in @code{propagated-inputs} rather than @code{inputs}." msgstr "Noch ein Beispiel, wo @code{propagated-inputs} nützlich ist, sind Sprachen, die den Laufzeit-Suchpfad @emph{nicht} zusammen mit dem Programm abspeichern (@emph{nicht} wie etwa im @code{RUNPATH} bei ELF-Dateien), also Sprachen wie Guile, Python, Perl und weitere. Damit auch in solchen Sprachen geschriebene Bibliotheken zur Laufzeit den von ihnen benötigten Code finden können, müssen deren Laufzeit-Abhängigkeiten in @code{propagated-inputs} statt in @code{inputs} aufgeführt werden." #. type: item -#: doc/guix.texi:5409 +#: doc/guix.texi:5407 #, no-wrap msgid "@code{outputs} (default: @code{'(\"out\")})" msgstr "@code{outputs} (Vorgabe: @code{'(\"out\")})" #. type: table -#: doc/guix.texi:5412 +#: doc/guix.texi:5410 msgid "The list of output names of the package. @xref{Packages with Multiple Outputs}, for typical uses of additional outputs." msgstr "Die Liste der Benennungen der Ausgaben des Pakets. Der Abschnitt @ref{Packages with Multiple Outputs} beschreibt übliche Nutzungen zusätzlicher Ausgaben." #. type: item -#: doc/guix.texi:5413 +#: doc/guix.texi:5411 #, no-wrap msgid "@code{native-search-paths} (default: @code{'()})" msgstr "@code{native-search-paths} (Vorgabe: @code{'()})" #. type: itemx -#: doc/guix.texi:5414 +#: doc/guix.texi:5412 #, no-wrap msgid "@code{search-paths} (default: @code{'()})" msgstr "@code{search-paths} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5417 +#: doc/guix.texi:5415 msgid "A list of @code{search-path-specification} objects describing search-path environment variables honored by the package." msgstr "Eine Liste von @code{search-path-specification}-Objekten, die Umgebungsvariable für von diesem Paket beachtete Suchpfade („search paths“) beschreiben." #. type: item -#: doc/guix.texi:5418 +#: doc/guix.texi:5416 #, no-wrap msgid "@code{replacement} (default: @code{#f})" msgstr "@code{replacement} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5422 +#: doc/guix.texi:5420 msgid "This must be either @code{#f} or a package object that will be used as a @dfn{replacement} for this package. @xref{Security Updates, grafts}, for details." msgstr "Dies muss entweder @code{#f} oder ein package-Objekt sein, das als Ersatz (@dfn{replacement}) dieses Pakets benutzt werden soll. Im Abschnitt @ref{Security Updates, grafts} wird dies erklärt." #. type: item -#: doc/guix.texi:5423 doc/guix.texi:9124 +#: doc/guix.texi:5421 doc/guix.texi:9122 #, no-wrap msgid "synopsis" msgstr "synopsis" #. type: table -#: doc/guix.texi:5425 +#: doc/guix.texi:5423 msgid "A one-line description of the package." msgstr "Eine einzeilige Beschreibung des Pakets." #. type: item -#: doc/guix.texi:5426 doc/guix.texi:9125 doc/guix.texi:25017 +#: doc/guix.texi:5424 doc/guix.texi:9123 doc/guix.texi:25003 #, no-wrap msgid "description" msgstr "description" #. type: table -#: doc/guix.texi:5428 +#: doc/guix.texi:5426 msgid "A more elaborate description of the package." msgstr "Eine ausführlichere Beschreibung des Pakets." #. type: code{#1} -#: doc/guix.texi:5429 +#: doc/guix.texi:5427 #, no-wrap msgid "license" msgstr "license" #. type: cindex -#: doc/guix.texi:5430 +#: doc/guix.texi:5428 #, no-wrap msgid "license, of packages" msgstr "Lizenz, von Paketen" #. type: table -#: doc/guix.texi:5433 +#: doc/guix.texi:5431 msgid "The license of the package; a value from @code{(guix licenses)}, or a list of such values." msgstr "Die Lizenz des Pakets; benutzt werden kann ein Wert aus dem Modul @code{(guix licenses)} oder eine Liste solcher Werte." #. type: itemx -#: doc/guix.texi:5434 doc/guix.texi:9133 +#: doc/guix.texi:5432 doc/guix.texi:9131 #, no-wrap msgid "home-page" msgstr "home-page" #. type: table -#: doc/guix.texi:5436 +#: doc/guix.texi:5434 msgid "The URL to the home-page of the package, as a string." msgstr "Die URL, die die Homepage des Pakets angibt, als Zeichenkette." #. type: item -#: doc/guix.texi:5437 +#: doc/guix.texi:5435 #, no-wrap msgid "@code{supported-systems} (default: @var{%supported-systems})" msgstr "@code{supported-systems} (Vorgabe: @var{%supported-systems})" #. type: table -#: doc/guix.texi:5440 +#: doc/guix.texi:5438 msgid "The list of systems supported by the package, as strings of the form @code{architecture-kernel}, for example @code{\"x86_64-linux\"}." msgstr "Die Liste der vom Paket unterstützten Systeme als Zeichenketten der Form @code{Architektur-Kernel}, zum Beispiel @code{\"x86_64-linux\"}." #. type: item -#: doc/guix.texi:5441 +#: doc/guix.texi:5439 #, no-wrap msgid "@code{maintainers} (default: @code{'()})" msgstr "@code{maintainers} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5443 +#: doc/guix.texi:5441 msgid "The list of maintainers of the package, as @code{maintainer} objects." msgstr "Die Liste der Betreuer (Maintainer) des Pakets als @code{maintainer}-Objekte." #. type: item -#: doc/guix.texi:5444 +#: doc/guix.texi:5442 #, no-wrap msgid "@code{location} (default: source location of the @code{package} form)" msgstr "@code{location} (Vorgabe: die Stelle im Quellcode, wo die @code{package}-Form steht)" #. type: table -#: doc/guix.texi:5448 +#: doc/guix.texi:5446 msgid "The source location of the package. It is useful to override this when inheriting from another package, in which case this field is not automatically corrected." msgstr "Wo im Quellcode das Paket definiert wurde. Es ist sinnvoll, dieses Feld manuell zuzuweisen, wenn das Paket von einem anderen Paket erbt, weil dann dieses Feld nicht automatisch berichtigt wird." #. type: deffn -#: doc/guix.texi:5451 +#: doc/guix.texi:5449 #, no-wrap msgid "{Scheme Syntax} this-package" msgstr "{Scheme-Syntax} this-package" #. type: deffn -#: doc/guix.texi:5454 +#: doc/guix.texi:5452 msgid "When used in the @emph{lexical scope} of a package field definition, this identifier resolves to the package being defined." msgstr "Wenn dies im @emph{lexikalischen Geltungsbereich} der Definition eines Feldes im Paket steht, bezieht sich dieser Bezeichner auf das Paket, das gerade definiert wird." #. type: deffn -#: doc/guix.texi:5457 +#: doc/guix.texi:5455 msgid "The example below shows how to add a package as a native input of itself when cross-compiling:" msgstr "Das folgende Beispiel zeigt, wie man ein Paket als native Eingabe von sich selbst beim Cross-Kompilieren deklariert:" #. type: example -#: doc/guix.texi:5462 +#: doc/guix.texi:5460 #, no-wrap msgid "" "(package\n" @@ -10975,7 +10986,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:5468 +#: doc/guix.texi:5466 #, no-wrap msgid "" " ;; When cross-compiled, Guile, for example, depends on\n" @@ -10992,89 +11003,89 @@ msgstr "" " '())))\n" #. type: deffn -#: doc/guix.texi:5471 +#: doc/guix.texi:5469 msgid "It is an error to refer to @code{this-package} outside a package definition." msgstr "Es ist ein Fehler, außerhalb einer Paketdefinition auf @code{this-package} zu verweisen." #. type: subsection -#: doc/guix.texi:5474 +#: doc/guix.texi:5472 #, no-wrap msgid "@code{origin} Reference" msgstr "@code{origin}-Referenz" #. type: Plain text -#: doc/guix.texi:5478 +#: doc/guix.texi:5476 msgid "This section summarizes all the options available in @code{origin} declarations (@pxref{Defining Packages})." msgstr "Dieser Abschnitt fasst alle Optionen zusammen, die in @code{origin}-Deklarationen zur Verfügung stehen (siehe @ref{Defining Packages})." #. type: deftp -#: doc/guix.texi:5479 +#: doc/guix.texi:5477 #, no-wrap msgid "{Data Type} origin" msgstr "{Datentyp} origin" #. type: deftp -#: doc/guix.texi:5481 +#: doc/guix.texi:5479 msgid "This is the data type representing a source code origin." msgstr "Mit diesem Datentyp wird ein Ursprung, von dem Quellcode geladen werden kann, beschrieben." #. type: code{#1} -#: doc/guix.texi:5483 doc/guix.texi:18960 +#: doc/guix.texi:5481 doc/guix.texi:18957 #, no-wrap msgid "uri" msgstr "uri" #. type: table -#: doc/guix.texi:5488 +#: doc/guix.texi:5486 msgid "An object containing the URI of the source. The object type depends on the @code{method} (see below). For example, when using the @var{url-fetch} method of @code{(guix download)}, the valid @code{uri} values are: a URL represented as a string, or a list thereof." msgstr "Ein Objekt, was die URI des Quellcodes enthält. Der Objekttyp hängt von der @code{Methode} ab (siehe unten). Zum Beispiel sind, wenn die @var{url-fetch}-Methode aus @code{(guix download)} benutzt wird, die gültigen Werte für @code{uri}: eine URL dargestellt als Zeichenkette oder eine Liste solcher URLs." #. type: code{#1} -#: doc/guix.texi:5489 +#: doc/guix.texi:5487 #, no-wrap msgid "method" msgstr "method" #. type: table -#: doc/guix.texi:5491 +#: doc/guix.texi:5489 msgid "A procedure that handles the URI." msgstr "Eine Prozedur, die die URI verwertet." #. type: table -#: doc/guix.texi:5493 +#: doc/guix.texi:5491 msgid "Examples include:" msgstr "Beispiele sind unter anderem:" #. type: item -#: doc/guix.texi:5495 +#: doc/guix.texi:5493 #, no-wrap msgid "@var{url-fetch} from @code{(guix download)}" msgstr "@var{url-fetch} aus @code{(guix download)}" #. type: table -#: doc/guix.texi:5498 +#: doc/guix.texi:5496 msgid "download a file from the HTTP, HTTPS, or FTP URL specified in the @code{uri} field;" msgstr "Herunterladen einer Datei von einer HTTP-, HTTPS- oder FTP-URL, die im @code{uri}-Feld angegeben wurde." #. type: vindex -#: doc/guix.texi:5499 doc/guix.texi:8391 +#: doc/guix.texi:5497 doc/guix.texi:8389 #, no-wrap msgid "git-fetch" msgstr "git-fetch" #. type: item -#: doc/guix.texi:5500 +#: doc/guix.texi:5498 #, no-wrap msgid "@var{git-fetch} from @code{(guix git-download)}" msgstr "@var{git-fetch} aus @code{(guix git-download)}" #. type: table -#: doc/guix.texi:5504 +#: doc/guix.texi:5502 msgid "clone the Git version control repository, and check out the revision specified in the @code{uri} field as a @code{git-reference} object; a @code{git-reference} looks like this:" msgstr "Das im @code{uri}-Feld spezifizierte Repository des Git-Versionskontrollsystems klonen und davon den im @code{uri}-Feld als ein @code{git-reference}-Objekt angegebenen Commit benutzen; eine @code{git-reference} sieht so aus:" #. type: example -#: doc/guix.texi:5509 +#: doc/guix.texi:5507 #, no-wrap msgid "" "(git-reference\n" @@ -11086,1415 +11097,1415 @@ msgstr "" " (commit \"v4.1.5.1\"))\n" #. type: code{#1} -#: doc/guix.texi:5512 +#: doc/guix.texi:5510 #, no-wrap msgid "sha256" msgstr "sha256" #. type: table -#: doc/guix.texi:5516 +#: doc/guix.texi:5514 msgid "A bytevector containing the SHA-256 hash of the source. Typically the @code{base32} form is used here to generate the bytevector from a base-32 string." msgstr "Ein Bytevektor, der den SHA-256-Hash der Quelldateien enthält. Typischerweise wird hier mit der @code{base32}-Form der Bytevektor aus einer Base-32-Zeichenkette generiert." #. type: table -#: doc/guix.texi:5520 +#: doc/guix.texi:5518 msgid "You can obtain this information using @code{guix download} (@pxref{Invoking guix download}) or @code{guix hash} (@pxref{Invoking guix hash})." msgstr "Diese Informationen liefert Ihnen der Befehl @code{guix download} (siehe @ref{Invoking guix download}) oder @code{guix hash} (siehe @ref{Invoking guix hash})." #. type: item -#: doc/guix.texi:5521 +#: doc/guix.texi:5519 #, no-wrap msgid "@code{file-name} (default: @code{#f})" msgstr "@code{file-name} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5527 +#: doc/guix.texi:5525 msgid "The file name under which the source code should be saved. When this is @code{#f}, a sensible default value will be used in most cases. In case the source is fetched from a URL, the file name from the URL will be used. For version control checkouts, it is recommended to provide the file name explicitly because the default is not very descriptive." msgstr "Der Dateiname, unter dem der Quellcode abgespeichert werden sollte. Wenn er auf @code{#f} steht, wird ein vernünftiger Name automatisch gewählt. Falls der Quellcode von einer URL geladen wird, wird der Dateiname aus der URL genommen. Wenn der Quellcode von einem Versionskontrollsystem bezogen wird, empfiehlt es sich, den Dateinamen ausdrücklich anzugeben, weil dann keine sprechende Benennung automatisch gefunden werden kann." #. type: item -#: doc/guix.texi:5528 +#: doc/guix.texi:5526 #, no-wrap msgid "@code{patches} (default: @code{'()})" msgstr "@code{patches} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5531 +#: doc/guix.texi:5529 msgid "A list of file names, origins, or file-like objects (@pxref{G-Expressions, file-like objects}) pointing to patches to be applied to the source." msgstr "Eine Liste von Dateinamen, Ursprüngen oder dateiähnlichen Objekten (siehe @ref{G-Expressions, file-like objects}) mit Patches, welche auf den Quellcode anzuwenden sind." #. type: table -#: doc/guix.texi:5535 +#: doc/guix.texi:5533 msgid "This list of patches must be unconditional. In particular, it cannot depend on the value of @code{%current-system} or @code{%current-target-system}." msgstr "Die Liste von Patches kann nicht von Parametern der Erstellung abhängen. Insbesondere kann sie nicht vom Wert von @code{%current-system} oder @code{%current-target-system} abḧängen." #. type: item -#: doc/guix.texi:5536 +#: doc/guix.texi:5534 #, no-wrap msgid "@code{snippet} (default: @code{#f})" msgstr "@code{snippet} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5540 +#: doc/guix.texi:5538 msgid "A G-expression (@pxref{G-Expressions}) or S-expression that will be run in the source directory. This is a convenient way to modify the source, sometimes more convenient than a patch." msgstr "Ein im Quellcode-Verzeichnis auszuführender G-Ausdruck (siehe @ref{G-Expressions}) oder S-Ausdruck. Hiermit kann der Quellcode bequem modifiziert werden, manchmal ist dies bequemer als mit einem Patch." #. type: item -#: doc/guix.texi:5541 +#: doc/guix.texi:5539 #, no-wrap msgid "@code{patch-flags} (default: @code{'(\"-p1\")})" msgstr "@code{patch-flags} (Vorgabe: @code{'(\"-p1\")})" #. type: table -#: doc/guix.texi:5544 +#: doc/guix.texi:5542 msgid "A list of command-line flags that should be passed to the @code{patch} command." msgstr "Eine Liste der Befehlszeilenoptionen, die dem @code{patch}-Befehl übergeben werden sollen." #. type: item -#: doc/guix.texi:5545 +#: doc/guix.texi:5543 #, no-wrap msgid "@code{patch-inputs} (default: @code{#f})" msgstr "@code{patch-inputs} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5549 +#: doc/guix.texi:5547 msgid "Input packages or derivations to the patching process. When this is @code{#f}, the usual set of inputs necessary for patching are provided, such as GNU@tie{}Patch." msgstr "Eingabepakete oder -ableitungen für den Patch-Prozess. Bei @code{#f} werden die üblichen Patcheingaben wie GNU@tie{}Patch bereitgestellt." #. type: item -#: doc/guix.texi:5550 +#: doc/guix.texi:5548 #, no-wrap msgid "@code{modules} (default: @code{'()})" msgstr "@code{modules} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5553 +#: doc/guix.texi:5551 msgid "A list of Guile modules that should be loaded during the patching process and while running the code in the @code{snippet} field." msgstr "Eine Liste von Guile-Modulen, die während des Patch-Prozesses und während der Ausführung des @code{snippet}-Felds geladen werden sollten." #. type: item -#: doc/guix.texi:5554 +#: doc/guix.texi:5552 #, no-wrap msgid "@code{patch-guile} (default: @code{#f})" msgstr "@code{patch-guile} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5557 +#: doc/guix.texi:5555 msgid "The Guile package that should be used in the patching process. When this is @code{#f}, a sensible default is used." msgstr "Welches Guile-Paket für den Patch-Prozess benutzt werden sollte. Bei @code{#f} wird ein vernünftiger Vorgabewert angenommen." #. type: cindex -#: doc/guix.texi:5564 +#: doc/guix.texi:5562 #, no-wrap msgid "build system" msgstr "Erstellungssystem" #. type: Plain text -#: doc/guix.texi:5569 +#: doc/guix.texi:5567 msgid "Each package definition specifies a @dfn{build system} and arguments for that build system (@pxref{Defining Packages}). This @code{build-system} field represents the build procedure of the package, as well as implicit dependencies of that build procedure." msgstr "Jede Paketdefinition legt ein @dfn{Erstellungssystem} („build system“) sowie dessen Argumente fest (siehe @ref{Defining Packages}). Das @code{build-system}-Feld steht für die Erstellungsprozedur des Pakets sowie für weitere implizite Eingaben für die Erstellungsprozedur." #. type: Plain text -#: doc/guix.texi:5573 +#: doc/guix.texi:5571 msgid "Build systems are @code{} objects. The interface to create and manipulate them is provided by the @code{(guix build-system)} module, and actual build systems are exported by specific modules." msgstr "Erstellungssysteme sind @code{}-Objekte. Die Schnittstelle, um solche zu erzeugen und zu verändern, ist im Modul @code{(guix build-system)} zu finden, und die eigentlichen Erstellungssysteme werden jeweils von ihren eigenen Modulen exportiert." #. type: cindex -#: doc/guix.texi:5574 +#: doc/guix.texi:5572 #, no-wrap msgid "bag (low-level package representation)" msgstr "Bag (systemnahe Paketrepräsentation)" #. type: Plain text -#: doc/guix.texi:5581 +#: doc/guix.texi:5579 msgid "Under the hood, build systems first compile package objects to @dfn{bags}. A @dfn{bag} is like a package, but with less ornamentation---in other words, a bag is a lower-level representation of a package, which includes all the inputs of that package, including some that were implicitly added by the build system. This intermediate representation is then compiled to a derivation (@pxref{Derivations})." msgstr "Intern funktionieren Erstellungssysteme, indem erst Paketobjekte zu @dfn{Bags} kompiliert werden. Eine Bag (deutsch: Beutel, Sack) ist wie ein Paket, aber mit weniger Zierrat — anders gesagt ist eine Bag eine systemnähere Darstellung eines Pakets, die sämtliche Eingaben des Pakets einschließlich vom Erstellungssystem hinzugefügter Eingaben enthält. Diese Zwischendarstellung wird dann zur eigentlichen Ableitung kompiliert (siehe @ref{Derivations})." #. type: Plain text -#: doc/guix.texi:5589 +#: doc/guix.texi:5587 msgid "Build systems accept an optional list of @dfn{arguments}. In package definitions, these are passed @i{via} the @code{arguments} field (@pxref{Defining Packages}). They are typically keyword arguments (@pxref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile Reference Manual}). The value of these arguments is usually evaluated in the @dfn{build stratum}---i.e., by a Guile process launched by the daemon (@pxref{Derivations})." msgstr "Erstellungssysteme akzeptieren optional eine Liste von @dfn{Argumenten}. In Paketdefinitionen werden diese über das @code{arguments}-Feld übergeben (siehe @ref{Defining Packages}). Sie sind in der Regel Schlüsselwort-Argumente (siehe @ref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile Reference Manual}). Der Wert dieser Argumente wird normalerweise vom Erstellungssystem in der @dfn{Erstellungsschicht} ausgewertet, d.h.@: von einem durch den Daemon gestarteten Guile-Prozess (siehe @ref{Derivations})." #. type: Plain text -#: doc/guix.texi:5593 +#: doc/guix.texi:5591 msgid "The main build system is @var{gnu-build-system}, which implements the standard build procedure for GNU and many other packages. It is provided by the @code{(guix build-system gnu)} module." msgstr "Das häufigste Erstellungssystem ist @var{gnu-build-system}, was die übliche Erstellungsprozedur für GNU-Pakete und viele andere Pakete darstellt. Es wird vom Modul @code{(guix build-system gnu)} bereitgestellt." #. type: defvr -#: doc/guix.texi:5594 +#: doc/guix.texi:5592 #, no-wrap msgid "{Scheme Variable} gnu-build-system" msgstr "{Scheme-Variable} gnu-build-system" #. type: defvr -#: doc/guix.texi:5598 +#: doc/guix.texi:5596 msgid "@var{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})." msgstr "@var{gnu-build-system} steht für das GNU-Erstellungssystem und Varianten desselben (siehe @ref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})." #. type: cindex -#: doc/guix.texi:5599 doc/guix.texi:6261 +#: doc/guix.texi:5597 doc/guix.texi:6259 #, no-wrap msgid "build phases" msgstr "Erstellungsphasen" #. type: defvr -#: doc/guix.texi:5606 +#: doc/guix.texi:5604 msgid "In a nutshell, packages using it are configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence. In practice, a few additional steps are often needed. All these steps are split up in separate @dfn{phases}, notably@footnote{Please see the @code{(guix build gnu-build-system)} modules for more details about the build phases.}:" msgstr "Kurz gefasst werden Pakete, die es benutzen, konfiguriert, erstellt und installiert mit der üblichen Befehlsfolge @code{./configure && make && make check && make install}. In der Praxis braucht man oft noch ein paar weitere Schritte. Alle Schritte sind in voneinander getrennte @dfn{Phasen} unterteilt. Erwähnt werden sollten@footnote{Bitte schauen Sie in den Modulen unter @code{(guix build gnu-build-system)}, wenn Sie mehr Details zu Erstellungsphasen brauchen.}:" #. type: item -#: doc/guix.texi:5608 +#: doc/guix.texi:5606 #, no-wrap msgid "unpack" msgstr "unpack" #. type: table -#: doc/guix.texi:5612 +#: doc/guix.texi:5610 msgid "Unpack the source tarball, and change the current directory to the extracted source tree. If the source is actually a directory, copy it to the build tree, and enter that directory." msgstr "Den Quell-Tarball entpacken und das Arbeitsverzeichnis wechseln in den entpackten Quellbaum. Wenn die Quelle bereits ein Verzeichnis ist, wird es in den Quellbaum kopiert und dorthin gewechselt." #. type: item -#: doc/guix.texi:5613 +#: doc/guix.texi:5611 #, no-wrap msgid "patch-source-shebangs" msgstr "patch-source-shebangs" #. type: table -#: doc/guix.texi:5617 +#: doc/guix.texi:5615 msgid "Patch shebangs encountered in source files so they refer to the right store file names. For instance, this changes @code{#!/bin/sh} to @code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}." msgstr "„Shebangs“ in Quelldateien beheben, damit Sie sich auf die richtigen Store-Dateipfade beziehen. Zum Beispiel könnte @code{#!/bin/sh} zu @code{#!/gnu/store/…-bash-4.3/bin/sh} geändert werden." #. type: item -#: doc/guix.texi:5618 doc/guix.texi:6219 doc/guix.texi:6267 +#: doc/guix.texi:5616 doc/guix.texi:6217 doc/guix.texi:6265 #, no-wrap msgid "configure" msgstr "configure" #. type: table -#: doc/guix.texi:5622 +#: doc/guix.texi:5620 msgid "Run the @file{configure} script with a number of default options, such as @code{--prefix=/gnu/store/@dots{}}, as well as the options specified by the @code{#:configure-flags} argument." msgstr "Das Skript @file{configure} mit einigen vorgegebenen Befehlszeilenoptionen ausführen, wie z.B.@: mit @code{--prefix=/gnu/store/…}, sowie mit den im @code{#:configure-flags}-Argument angegebenen Optionen." #. type: item -#: doc/guix.texi:5623 doc/guix.texi:5812 doc/guix.texi:6224 doc/guix.texi:6271 -#: doc/guix.texi:24393 +#: doc/guix.texi:5621 doc/guix.texi:5810 doc/guix.texi:6222 doc/guix.texi:6269 +#: doc/guix.texi:24390 #, no-wrap msgid "build" msgstr "build" #. type: table -#: doc/guix.texi:5627 +#: doc/guix.texi:5625 msgid "Run @code{make} with the list of flags specified with @code{#:make-flags}. If the @code{#:parallel-build?} argument is true (the default), build with @code{make -j}." msgstr "@code{make} ausführen mit den Optionen aus der Liste in @code{#:make-flags}. Wenn das Argument @code{#:parallel-build?} auf wahr gesetzt ist (was der Vorgabewert ist), wird @code{make -j} zum Erstellen ausgeführt." #. type: item -#: doc/guix.texi:5628 doc/guix.texi:5822 doc/guix.texi:6228 +#: doc/guix.texi:5626 doc/guix.texi:5820 doc/guix.texi:6226 #, no-wrap msgid "check" msgstr "check" #. type: table -#: doc/guix.texi:5633 +#: doc/guix.texi:5631 msgid "Run @code{make check}, or some other target specified with @code{#:test-target}, unless @code{#:tests? #f} is passed. If the @code{#:parallel-tests?} argument is true (the default), run @code{make check -j}." msgstr "@code{make check} (oder statt @code{check} ein anderes bei @code{#:test-target} angegebenes Ziel) ausführen, außer falls @code{#:tests? #f} gesetzt ist. Wenn das Argument @code{#:parallel-tests?} auf wahr gesetzt ist (der Vorgabewert), führe @code{make check -j} aus." #. type: item -#: doc/guix.texi:5634 doc/guix.texi:5830 doc/guix.texi:6232 doc/guix.texi:6275 +#: doc/guix.texi:5632 doc/guix.texi:5828 doc/guix.texi:6230 doc/guix.texi:6273 #, no-wrap msgid "install" msgstr "install" #. type: table -#: doc/guix.texi:5636 +#: doc/guix.texi:5634 msgid "Run @code{make install} with the flags listed in @code{#:make-flags}." msgstr "@code{make install} mit den in @code{#:make-flags} aufgelisteten Optionen ausführen." #. type: item -#: doc/guix.texi:5637 +#: doc/guix.texi:5635 #, no-wrap msgid "patch-shebangs" msgstr "patch-shebangs" #. type: table -#: doc/guix.texi:5639 +#: doc/guix.texi:5637 msgid "Patch shebangs on the installed executable files." msgstr "Shebangs in den installierten ausführbaren Dateien beheben." #. type: item -#: doc/guix.texi:5640 +#: doc/guix.texi:5638 #, no-wrap msgid "strip" msgstr "strip" #. type: table -#: doc/guix.texi:5644 +#: doc/guix.texi:5642 msgid "Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} is false), copying them to the @code{debug} output when available (@pxref{Installing Debugging Files})." msgstr "Symbole zur Fehlerbehebung aus ELF-Dateien entfernen (außer @code{#:strip-binaries?} ist auf falsch gesetzt) und in die @code{debug}-Ausgabe kopieren, falls diese verfügbar ist (siehe @ref{Installing Debugging Files})." #. type: vindex -#: doc/guix.texi:5646 +#: doc/guix.texi:5644 #, no-wrap msgid "%standard-phases" msgstr "%standard-phases" #. type: defvr -#: doc/guix.texi:5651 +#: doc/guix.texi:5649 msgid "The build-side module @code{(guix build gnu-build-system)} defines @var{%standard-phases} as the default list of build phases. @var{%standard-phases} is a list of symbol/procedure pairs, where the procedure implements the actual phase." msgstr "Das erstellungsseitige Modul @code{(guix build gnu-build-system)} definiert @var{%standard-phases} als die vorgegebene Liste der Erstellungsphasen. @var{%standard-phases} ist eine Liste von Paaren aus je einem Symbol und einer Prozedur. Letztere implementiert die eigentliche Phase." #. type: defvr -#: doc/guix.texi:5654 +#: doc/guix.texi:5652 msgid "The list of phases used for a particular package can be changed with the @code{#:phases} parameter. For instance, passing:" msgstr "Die Liste der Phasen, die für ein bestimmtes Paket verwendet werden sollen, kann vom Parameter @code{#:phases} überschrieben werden. Zum Beispiel werden bei Übergabe von:" #. type: example -#: doc/guix.texi:5657 +#: doc/guix.texi:5655 #, no-wrap msgid "#:phases (modify-phases %standard-phases (delete 'configure))\n" msgstr "#:phases (modify-phases %standard-phases (delete 'configure))\n" #. type: defvr -#: doc/guix.texi:5661 +#: doc/guix.texi:5659 msgid "means that all the phases described above will be used, except the @code{configure} phase." msgstr "alle oben beschriebenen Phasen benutzt außer der @code{configure}-Phase." #. type: defvr -#: doc/guix.texi:5668 +#: doc/guix.texi:5666 msgid "In addition, this build system ensures that the ``standard'' environment for GNU packages is available. This includes tools such as GCC, libc, Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-system gnu)} module for a complete list). We call these the @dfn{implicit inputs} of a package, because package definitions do not have to mention them." msgstr "Zusätzlich stellt dieses Erstellungssystem sicher, dass die „Standard“-Umgebung für GNU-Pakete zur Verfügung steht. Diese umfasst Werkzeuge wie GCC, libc, Coreutils, Bash, Make, Diffutils, grep und sed (siehe das Modul @code{(guix build-system gnu)} für eine vollständige Liste). Wir bezeichnen sie als @dfn{implizite Eingaben} eines Pakets, weil Paketdefinitionen sie nicht aufführen müssen." #. type: Plain text -#: doc/guix.texi:5675 +#: doc/guix.texi:5673 msgid "Other @code{} objects are defined to support other conventions and tools used by free software packages. They inherit most of @var{gnu-build-system}, and differ mainly in the set of inputs implicitly added to the build process, and in the list of phases executed. Some of these build systems are listed below." msgstr "Andere @code{}-Objekte werden definiert, um andere Konventionen und Werkzeuge von Paketen für freie Software zu unterstützen. Die anderen Erstellungssysteme erben den Großteil vom @var{gnu-build-system} und unterscheiden sich hauptsächlich darin, welche Eingaben dem Erstellungsprozess implizit hinzugefügt werden und welche Liste von Phasen durchlaufen wird. Manche dieser Erstellungssysteme sind im Folgenden aufgeführt." #. type: defvr -#: doc/guix.texi:5676 +#: doc/guix.texi:5674 #, no-wrap msgid "{Scheme Variable} ant-build-system" msgstr "{Scheme-Variable} ant-build-system" #. type: defvr -#: doc/guix.texi:5680 +#: doc/guix.texi:5678 msgid "This variable is exported by @code{(guix build-system ant)}. It implements the build procedure for Java packages that can be built with @url{https://ant.apache.org/, Ant build tool}." msgstr "Diese Variable wird vom Modul @code{(guix build-system ant)} exportiert. Sie implementiert die Erstellungsprozedur für Java-Pakete, die mit dem @url{https://ant.apache.org/, Ant build tool} erstellt werden können." #. type: defvr -#: doc/guix.texi:5685 +#: doc/guix.texi:5683 msgid "It adds both @code{ant} and the @dfn{Java Development Kit} (JDK) as provided by the @code{icedtea} package to the set of inputs. Different packages can be specified with the @code{#:ant} and @code{#:jdk} parameters, respectively." msgstr "Sowohl @code{ant} als auch der @dfn{Java Development Kit} (JDK), wie er vom Paket @code{icedtea} bereitgestellt wird, werden zu den Eingaben hinzugefügt. Wenn andere Pakete dafür benutzt werden sollen, können sie jeweils mit den Parametern @code{#:ant} und @code{#:jdk} festgelegt werden." #. type: defvr -#: doc/guix.texi:5691 +#: doc/guix.texi:5689 msgid "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. In this case the parameter @code{#:source-dir} can be used to specify the source sub-directory, defaulting to ``src''." msgstr "Falls das ursprüngliche Paket über keine nutzbare Ant-Erstellungsdatei („Ant-Buildfile“) verfügt, kann aus der Angabe im Parameter @code{#:jar-name} eine minimale Ant-Erstellungsdatei @file{build.xml} erzeugt werden, in der die für die Erstellung durchzuführenden Aufgaben (Tasks) für die Erstellung des angegebenen Jar-Archivs stehen. In diesem Fall kann der Parameter @code{#:source-dir} benutzt werden, um das Unterverzeichnis mit dem Quellcode anzugeben; sein Vorgabewert ist „src“." #. type: defvr -#: doc/guix.texi:5699 +#: doc/guix.texi:5697 msgid "The @code{#:main-class} parameter can be used with the minimal ant buildfile to specify the main class of the resulting jar. This makes the jar file executable. The @code{#:test-include} parameter can be used to specify the list of junit tests to run. It defaults to @code{(list \"**/*Test.java\")}. The @code{#:test-exclude} can be used to disable some tests. It defaults to @code{(list \"**/Abstract*.java\")}, because abstract classes cannot be run as tests." msgstr "Der Parameter @code{#:main-class} kann mit einer minimalen Ant-Erstellungsdatei benutzt werden, um die Hauptklasse des resultierenden Jar-Archivs anzugeben. Dies ist nötig, wenn die Jar-Datei ausführbar sein soll. Mit dem Parameter @code{#:test-include} kann eine Liste angegeben werden, welche Junit-Tests auszuführen sind. Der Vorgabewert ist @code{(list \"**/*Test.java\")}. Mit @code{#:test-exclude} kann ein Teil der Testdateien ignoriert werden. Der Vorgabewert ist @code{(list \"**/Abstract*.java\")}, weil abstrakte Klassen keine ausführbaren Tests enthalten können." #. type: defvr -#: doc/guix.texi:5703 +#: doc/guix.texi:5701 msgid "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 ``jar'' task will be run." msgstr "Der Parameter @code{#:build-target} kann benutzt werden, um die Ant-Aufgabe (Task) anzugeben, die während der @code{build}-Phase ausgeführt werden soll. Vorgabe ist, dass die Aufgabe (Task) „jar“ ausgeführt wird." #. type: defvr -#: doc/guix.texi:5706 +#: doc/guix.texi:5704 #, no-wrap msgid "{Scheme Variable} android-ndk-build-system" msgstr "{Scheme-Variable} android-ndk-build-system" #. type: cindex -#: doc/guix.texi:5707 +#: doc/guix.texi:5705 #, no-wrap msgid "Android distribution" msgstr "Android-Distribution" #. type: cindex -#: doc/guix.texi:5708 +#: doc/guix.texi:5706 #, no-wrap msgid "Android NDK build system" msgstr "Android-NDK-Erstellungssystem" #. type: defvr -#: doc/guix.texi:5712 +#: doc/guix.texi:5710 msgid "This variable is exported by @code{(guix build-system android-ndk)}. It implements a build procedure for Android NDK (native development kit) packages using a Guix-specific build process." msgstr "Diese Variable wird von @code{(guix build-system android-ndk)} exportiert. Sie implementiert eine Erstellungsprozedur für das Android NDK (Native Development Kit) benutzende Pakete mit einem Guix-spezifischen Erstellungsprozess." #. type: defvr -#: doc/guix.texi:5716 +#: doc/guix.texi:5714 msgid "The build system assumes that packages install their public interface (header) files to the subdirectory \"include\" of the \"out\" output and their libraries to the subdirectory \"lib\" of the \"out\" output." msgstr "Für das Erstellungssystem wird angenommen, dass Pakete die zu ihrer öffentlichen Schnittstelle gehörenden Header-Dateien im Unterverzeichnis \"include\" der Ausgabe \"out\" und ihre Bibliotheken im Unterverzeichnis \"lib\" der Ausgabe \"out\" platzieren." #. type: defvr -#: doc/guix.texi:5719 +#: doc/guix.texi:5717 msgid "It's also assumed that the union of all the dependencies of a package has no conflicting files." msgstr "Ebenso wird angenommen, dass es keine im Konflikt stehenden Dateien unter der Vereinigung aller Abhängigkeiten gibt." #. type: defvr -#: doc/guix.texi:5722 +#: doc/guix.texi:5720 msgid "For the time being, cross-compilation is not supported - so right now the libraries and header files are assumed to be host tools." msgstr "Derzeit wird Cross-Kompilieren hierfür nicht unterstützt, also wird dabei vorausgesetzt, dass Bibliotheken und Header-Dateien dieselben wie im Wirtssystem sind." #. type: defvr -#: doc/guix.texi:5725 +#: doc/guix.texi:5723 #, no-wrap msgid "{Scheme Variable} asdf-build-system/source" msgstr "{Scheme-Variable} asdf-build-system/source" #. type: defvrx -#: doc/guix.texi:5726 +#: doc/guix.texi:5724 #, no-wrap msgid "{Scheme Variable} asdf-build-system/sbcl" msgstr "{Scheme-Variable} asdf-build-system/sbcl" #. type: defvrx -#: doc/guix.texi:5727 +#: doc/guix.texi:5725 #, no-wrap msgid "{Scheme Variable} asdf-build-system/ecl" msgstr "{Scheme-Variable} asdf-build-system/ecl" #. type: defvr -#: doc/guix.texi:5733 +#: doc/guix.texi:5731 msgid "These variables, exported by @code{(guix build-system asdf)}, implement build procedures for Common Lisp packages using @url{https://common-lisp.net/project/asdf/, ``ASDF''}. ASDF is a system definition facility for Common Lisp programs and libraries." msgstr "Diese Variablen, die vom Modul @code{(guix build-system asdf)} exportiert werden, implementieren Erstellungsprozeduren für Common-Lisp-Pakete, welche @url{https://common-lisp.net/project/asdf/, „ASDF“} benutzen. ASDF dient der Systemdefinition für Common-Lisp-Programme und -Bibliotheken." #. type: defvr -#: doc/guix.texi:5740 +#: doc/guix.texi:5738 msgid "The @code{asdf-build-system/source} system installs the packages in source form, and can be loaded using any common lisp implementation, via ASDF. The others, such as @code{asdf-build-system/sbcl}, install binary systems in the format which a particular implementation understands. These build systems can also be used to produce executable programs, or lisp images which contain a set of packages pre-loaded." msgstr "Das Erstellungssystem @code{asdf-build-system/source} installiert die Pakete in Quellcode-Form und kann @i{via} ASDF mit jeder Common-Lisp-Implementierung geladen werden. Die anderen Erstellungssysteme wie @code{asdf-build-system/sbcl} installieren binäre Systeme in dem Format, das von einer bestimmten Implementierung verstanden wird. Diese Erstellungssysteme können auch benutzt werden, um ausführbare Programme zu erzeugen oder um Lisp-Abbilder mit einem vorab geladenen Satz von Paketen zu erzeugen." #. type: defvr -#: doc/guix.texi:5744 +#: doc/guix.texi:5742 msgid "The build system uses naming conventions. For binary packages, the package name should be prefixed with the lisp implementation, such as @code{sbcl-} for @code{asdf-build-system/sbcl}." msgstr "Das Erstellungssystem benutzt gewisse Namenskonventionen. Bei Binärpaketen sollte dem Paketnamen die Lispimplementierung als Präfix vorangehen, z.B.@: @code{sbcl-} für @code{asdf-build-system/sbcl}." #. type: defvr -#: doc/guix.texi:5748 +#: doc/guix.texi:5746 msgid "Additionally, the corresponding source package should be labeled using the same convention as python packages (see @ref{Python Modules}), using the @code{cl-} prefix." msgstr "Zudem sollte das entsprechende Quellcode-Paket mit der Konvention wie bei Python-Paketen (siehe @ref{Python Modules}) ein @code{cl-} als Präfix bekommen." #. type: defvr -#: doc/guix.texi:5753 +#: doc/guix.texi:5751 msgid "For binary packages, each system should be defined as a Guix package. If one package @code{origin} contains several systems, package variants can be created in order to build all the systems. Source packages, which use @code{asdf-build-system/source}, may contain several systems." msgstr "Für Binärpakete sollte für jedes System ein Guix-Paket definiert werden. Wenn für einen Ursprung im @code{origin} mehrere Systeme enthalten sind, können Paketvarianten geschrieben werden, mit denen alle Systeme erstellt werden. Quellpakete, die @code{asdf-build-system/source} benutzen, können mehrere Systeme enthalten." #. type: defvr -#: doc/guix.texi:5760 +#: doc/guix.texi:5758 msgid "In order to create executable programs and images, the build-side procedures @code{build-program} and @code{build-image} can be used. They should be called in a build phase after the @code{create-symlinks} phase, so that the system which was just built can be used within the resulting image. @code{build-program} requires a list of Common Lisp expressions to be passed as the @code{#:entry-program} argument." msgstr "Um ausführbare Programme und Abbilder zu erzeugen, können die erstellungsseitigen Prozeduren @code{build-program} und @code{build-image} benutzt werden. Sie sollten in einer Erstellungsphase nach der @code{create-symlinks}-Phase aufgerufen werden, damit das gerade erstellte System Teil des resultierenden Abbilds sein kann. An @code{build-program} muss eine Liste von Common-Lisp-Ausdrücken über das Argument @code{#:entry-program} übergeben werden." #. type: defvr -#: doc/guix.texi:5769 +#: doc/guix.texi:5767 msgid "If the system is not defined within its own @code{.asd} file of the same name, then the @code{#:asd-file} parameter should be used to specify which file the system is defined in. Furthermore, if the package defines a system for its tests in a separate file, it will be loaded before the tests are run if it is specified by the @code{#:test-asd-file} parameter. If it is not set, the files @code{-tests.asd}, @code{-test.asd}, @code{tests.asd}, and @code{test.asd} will be tried if they exist." msgstr "Wenn das System nicht in seiner eigenen gleichnamigen @code{.asd}-Datei definiert ist, sollte der Parameter @code{#:asd-file} benutzt werden, um anzugeben, in welcher Datei das System definiert ist. Außerdem wird bei Paketen, für deren Tests ein System in einer separaten Datei definiert wurde, dieses System geladen, bevor die Tests ablaufen, wenn es im Parameter @code{#:test-asd-file} steht. Ist dafür kein Wert gesetzt, werden die Dateien @code{-tests.asd}, @code{-test.asd}, @code{tests.asd} und @code{test.asd} durchsucht, wenn sie existieren." #. type: defvr -#: doc/guix.texi:5773 +#: doc/guix.texi:5771 msgid "If for some reason the package must be named in a different way than the naming conventions suggest, the @code{#:asd-system-name} parameter can be used to specify the name of the system." msgstr "Wenn aus irgendeinem Grund der Paketname nicht den Namenskonventionen folgen kann, kann der Parameter @code{#:asd-system-name} benutzt werden, um den Namen des Systems anzugeben." #. type: defvr -#: doc/guix.texi:5776 +#: doc/guix.texi:5774 #, no-wrap msgid "{Scheme Variable} cargo-build-system" msgstr "{Scheme-Variable} cargo-build-system" #. type: cindex -#: doc/guix.texi:5777 +#: doc/guix.texi:5775 #, no-wrap msgid "Rust programming language" msgstr "Rust-Programmiersprache" #. type: cindex -#: doc/guix.texi:5778 +#: doc/guix.texi:5776 #, no-wrap msgid "Cargo (Rust build system)" msgstr "Cargo (Rust-Erstellungssystem)" #. type: defvr -#: doc/guix.texi:5782 +#: doc/guix.texi:5780 msgid "This variable is exported by @code{(guix build-system cargo)}. It supports builds of packages using Cargo, the build tool of the @uref{https://www.rust-lang.org, Rust programming language}." msgstr "Diese Variable wird vom Modul @code{(guix build-system cargo)} exportiert. Damit können Pakete mit Cargo erstellt werden, dem Erstellungswerkzeug der @uref{https://www.rust-lang.org, Rust-Programmiersprache}." #. type: defvr -#: doc/guix.texi:5787 +#: doc/guix.texi:5785 msgid "In its @code{configure} phase, this build system replaces dependencies specified in the @file{Cargo.toml} file with inputs to the Guix package. The @code{install} phase installs the binaries, and it also installs the source code and @file{Cargo.toml} file." msgstr "In seiner @code{configure}-Phase ersetzt dieses Erstellungssystem in der Datei @file{Cargo.toml} angegebene Abhängigkeiten durch Eingaben im Guix-Paket. Die Phase @code{install} installiert die Binärdateien und auch den Quellcode und die @file{Cargo.toml}-Datei." #. type: cindex -#: doc/guix.texi:5789 +#: doc/guix.texi:5787 #, no-wrap msgid "Clojure (programming language)" msgstr "Clojure (Programmiersprache)" #. type: cindex -#: doc/guix.texi:5790 +#: doc/guix.texi:5788 #, no-wrap msgid "simple Clojure build system" msgstr "einfaches Clojure-Erstellungssystem" #. type: defvr -#: doc/guix.texi:5791 +#: doc/guix.texi:5789 #, no-wrap msgid "{Scheme Variable} clojure-build-system" msgstr "{Scheme-Variable} clojure-build-system" #. type: defvr -#: doc/guix.texi:5796 +#: doc/guix.texi:5794 msgid "This variable is exported by @code{(guix build-system clojure)}. It implements a simple build procedure for @uref{https://clojure.org/, Clojure} packages using plain old @code{compile} in Clojure. Cross-compilation is not supported yet." msgstr "Diese Variable wird durch das Modul @code{(guix build-system clojure)} exportiert. Sie implementiert eine einfache Erstellungsprozedur für in @uref{https://clojure.org/, Clojure} geschriebene Pakete mit dem guten alten @code{compile} in Clojure. Cross-Kompilieren wird noch nicht unterstützt." #. type: defvr -#: doc/guix.texi:5800 +#: doc/guix.texi:5798 msgid "It adds @code{clojure}, @code{icedtea} and @code{zip} to the set of inputs. Different packages can be specified with the @code{#:clojure}, @code{#:jdk} and @code{#:zip} parameters, respectively." msgstr "Das Erstellungssystem fügt @code{clojure}, @code{icedtea} und @code{zip} zu den Eingaben hinzu. Sollen stattdessen andere Pakete benutzt werden, können diese jeweils mit den Parametern @code{#:clojure}, @code{#:jdk} und @code{#:zip} spezifiziert werden." #. type: defvr -#: doc/guix.texi:5806 +#: doc/guix.texi:5804 msgid "A list of source directories, test directories and jar names can be specified with the @code{#:source-dirs}, @code{#:test-dirs} and @code{#:jar-names} parameters, respectively. Compile directory and main class can be specified with the @code{#:compile-dir} and @code{#:main-class} parameters, respectively. Other parameters are documented below." msgstr "Eine Liste der Quellcode-Verzeichnisse, Test-Verzeichnisse und Namen der Jar-Dateien können jeweils über die Parameter @code{#:source-dirs}, @code{#:test-dirs} und @code{#:jar-names} angegeben werden. Das Verzeichnis, in das kompiliert wird, sowie die Hauptklasse können jeweils mit den Parametern @code{#:compile-dir} und @code{#:main-class} angegeben werden. Andere Parameter sind im Folgenden dokumentiert." #. type: defvr -#: doc/guix.texi:5809 +#: doc/guix.texi:5807 msgid "This build system is an extension of @var{ant-build-system}, but with the following phases changed:" msgstr "Dieses Erstellungssystem ist eine Erweiterung des @var{ant-build-system}, bei der aber die folgenden Phasen geändert wurden:" #. type: table -#: doc/guix.texi:5821 +#: doc/guix.texi:5819 msgid "This phase calls @code{compile} in Clojure to compile source files and runs @command{jar} to create jars from both source files and compiled files according to the include list and exclude list specified in @code{#:aot-include} and @code{#:aot-exclude}, respectively. The exclude list has priority over the include list. These lists consist of symbols representing Clojure libraries or the special keyword @code{#:all} representing all Clojure libraries found under the source directories. The parameter @code{#:omit-source?} decides if source should be included into the jars." msgstr "Diese Phase ruft @code{compile} in Clojure auf, um Quelldateien zu kompilieren, und führt @command{jar} aus, um Jar-Dateien aus sowohl Quelldateien als auch kompilierten Dateien zu erzeugen, entsprechend der jeweils in @code{#:aot-include} und @code{#:aot-exclude} festgelegten Listen aus in der Menge der Quelldateien eingeschlossenen und ausgeschlossenen Bibliotheken. Die Ausschlussliste hat Vorrang vor der Einschlussliste. Diese Listen setzen sich aus Symbolen zusammen, die für Clojure-Bibliotheken stehen oder dem Schlüsselwort @code{#:all} entsprechen, was für alle im Quellverzeichis gefundenen Clojure-Bibliotheken steht. Der Parameter @code{#:omit-source?} entscheidet, ob Quelldateien in die Jar-Archive aufgenommen werden sollten." #. type: table -#: doc/guix.texi:5829 +#: doc/guix.texi:5827 msgid "This phase runs tests according to the include list and exclude list specified in @code{#:test-include} and @code{#:test-exclude}, respectively. Their meanings are analogous to that of @code{#:aot-include} and @code{#:aot-exclude}, except that the special keyword @code{#:all} now stands for all Clojure libraries found under the test directories. The parameter @code{#:tests?} decides if tests should be run." msgstr "In dieser Phase werden Tests auf die durch Einschluss- und Ausschlussliste @code{#:test-include} bzw. @code{#:test-exclude} angegebenen Dateien ausgeführt. Deren Bedeutung ist analog zu @code{#:aot-include} und @code{#:aot-exclude}, außer dass das besondere Schlüsselwort @code{#:all} jetzt für alle Clojure-Bibliotheken in den Test-Verzeichnissen steht. Der Parameter @code{#:tests?} entscheidet, ob Tests ausgeführt werden sollen." #. type: table -#: doc/guix.texi:5832 +#: doc/guix.texi:5830 msgid "This phase installs all jars built previously." msgstr "In dieser Phase werden alle zuvor erstellten Jar-Dateien installiert." #. type: defvr -#: doc/guix.texi:5835 +#: doc/guix.texi:5833 msgid "Apart from the above, this build system also contains an additional phase:" msgstr "Zusätzlich zu den bereits angegebenen enthält dieses Erstellungssystem noch eine weitere Phase." #. type: item -#: doc/guix.texi:5838 +#: doc/guix.texi:5836 #, no-wrap msgid "install-doc" msgstr "install-doc" #. type: table -#: doc/guix.texi:5843 +#: doc/guix.texi:5841 msgid "This phase installs all top-level files with base name matching @var{%doc-regex}. A different regex can be specified with the @code{#:doc-regex} parameter. All files (recursively) inside the documentation directories specified in @code{#:doc-dirs} are installed as well." msgstr "Diese Phase installiert alle Dateien auf oberster Ebene, deren Basisnamen ohne Verzeichnisangabe zu @var{%doc-regex} passen. Ein anderer regulärer Ausdruck kann mit dem Parameter @code{#:doc-regex} verwendet werden. All die so gefundenen oder (rekursiv) in den mit @code{#:doc-dirs} angegebenen Dokumentationsverzeichnissen liegenden Dateien werden installiert." #. type: defvr -#: doc/guix.texi:5846 +#: doc/guix.texi:5844 #, no-wrap msgid "{Scheme Variable} cmake-build-system" msgstr "{Scheme-Variable} cmake-build-system" #. type: defvr -#: doc/guix.texi:5850 +#: doc/guix.texi:5848 msgid "This variable is exported by @code{(guix build-system cmake)}. It implements the build procedure for packages using the @url{https://www.cmake.org, CMake build tool}." msgstr "Diese Variable wird von @code{(guix build-system cmake)} exportiert. Sie implementiert die Erstellungsprozedur für Pakete, die das @url{https://www.cmake.org, CMake-Erstellungswerkzeug} benutzen." #. type: defvr -#: doc/guix.texi:5854 +#: doc/guix.texi:5852 msgid "It automatically adds the @code{cmake} package to the set of inputs. Which package is used can be specified with the @code{#:cmake} parameter." msgstr "Das Erstellungssystem fügt automatisch das Paket @code{cmake} zu den Eingaben hinzu. Welches Paket benutzt wird, kann mit dem Parameter @code{#:cmake} geändert werden." #. type: defvr -#: doc/guix.texi:5861 +#: doc/guix.texi:5859 msgid "The @code{#:configure-flags} parameter is taken as a list of flags passed to the @command{cmake} command. The @code{#:build-type} parameter specifies in abstract terms the flags passed to the compiler; it defaults to @code{\"RelWithDebInfo\"} (short for ``release mode with debugging information''), which roughly means that code is compiled with @code{-O2 -g}, as is the case for Autoconf-based packages by default." msgstr "Der Parameter @code{#:configure-flags} wird als Liste von Befehlszeilenoptionen aufgefasst, die an den Befehl @command{cmake} übergeben werden. Der Parameter @code{#:build-type} abstrahiert, welche Befehlszeilenoptionen dem Compiler übergeben werden; der Vorgabewert ist @code{\"RelWithDebInfo\"} (kurz für „release mode with debugging information“), d.h.@: kompiliert wird für eine Produktionsumgebung und Informationen zur Fehlerbehebung liegen bei, was ungefähr @code{-O2 -g} entspricht, wie bei der Vorgabe für Autoconf-basierte Pakete." #. type: defvr -#: doc/guix.texi:5863 +#: doc/guix.texi:5861 #, no-wrap msgid "{Scheme Variable} dune-build-system" msgstr "{Scheme-Variable} dune-build-system" #. type: defvr -#: doc/guix.texi:5870 +#: doc/guix.texi:5868 msgid "This variable is exported by @code{(guix build-system dune)}. It supports builds of packages using @uref{https://dune.build/, Dune}, a build tool for the OCaml programming language. It is implemented as an extension of the @code{ocaml-build-system} which is described below. As such, the @code{#:ocaml} and @code{#:findlib} parameters can be passed to this build system." msgstr "Diese Variable wird vom Modul @code{(guix build-system dune)} exportiert. Sie unterstützt es, Pakete mit @uref{https://dune.build/, Dune} zu erstellen, einem Erstellungswerkzeug für die Programmiersprache OCaml, und ist als Erweiterung des unten beschriebenen OCaml-Erstellungssystems @code{ocaml-build-system} implementiert. Als solche können auch die Parameter @code{#:ocaml} und @code{#:findlib} an dieses Erstellungssystem übergeben werden." #. type: defvr -#: doc/guix.texi:5874 +#: doc/guix.texi:5872 msgid "It automatically adds the @code{dune} package to the set of inputs. Which package is used can be specified with the @code{#:dune} parameter." msgstr "Das Erstellungssystem fügt automatisch das Paket @code{dune} zu den Eingaben hinzu. Welches Paket benutzt wird, kann mit dem Parameter @code{#:dune} geändert werden." #. type: defvr -#: doc/guix.texi:5878 +#: doc/guix.texi:5876 msgid "There is no @code{configure} phase because dune packages typically don't need to be configured. The @code{#:build-flags} parameter is taken as a list of flags passed to the @code{dune} command during the build." msgstr "Es gibt keine @code{configure}-Phase, weil dune-Pakete typischerweise nicht konfiguriert werden müssen. Vom Parameter @code{#:build-flags} wird erwartet, dass es sich um eine Liste von Befehlszeilenoptionen handelt, die zur Erstellung an den @code{dune}-Befehl übergeben werden." #. type: defvr -#: doc/guix.texi:5882 +#: doc/guix.texi:5880 msgid "The @code{#:jbuild?} parameter can be passed to use the @code{jbuild} command instead of the more recent @code{dune} command while building a package. Its default value is @code{#f}." msgstr "Der Parameter @code{#:jbuild?} kann übergeben werden, um den Befehl @code{jbuild} anstelle des neueren @code{dune}-Befehls aufzurufen, um das Paket zu erstellen. Der Vorgabewert ist @code{#f}." #. type: defvr -#: doc/guix.texi:5887 +#: doc/guix.texi:5885 msgid "The @code{#:package} parameter can be passed to specify a package name, which is useful when a package contains multiple packages and you want to build only one of them. This is equivalent to passing the @code{-p} argument to @code{dune}." msgstr "Mit dem Parameter @code{#:package} kann ein Paketname angegeben werden, wenn im Paket mehrere Pakete enthalten sind und nur eines davon erstellt werden soll. Es ist äquivalent dazu, die Befehlszeilenoption @code{-p} an @code{dune} zu übergeben." #. type: defvr -#: doc/guix.texi:5889 +#: doc/guix.texi:5887 #, no-wrap msgid "{Scheme Variable} go-build-system" msgstr "{Scheme-Variable} go-build-system" #. type: defvr -#: doc/guix.texi:5894 +#: doc/guix.texi:5892 msgid "This variable is exported by @code{(guix build-system go)}. It implements a build procedure for Go packages using the standard @url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go build mechanisms}." msgstr "Diese Variable wird vom Modul @code{(guix build-system go)} exportiert. Mit ihr ist eine Erstellungsprozedur für Go-Pakete implementiert, die dem normalen @url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go-Erstellungsmechanismus} entspricht." #. type: defvr -#: doc/guix.texi:5905 +#: doc/guix.texi:5903 msgid "The user is expected to provide a value for the key @code{#:import-path} and, in some cases, @code{#:unpack-path}. The @url{https://golang.org/doc/code.html#ImportPaths, import path} corresponds to the file system path expected by the package's build scripts and any referring packages, and provides a unique way to refer to a Go package. It is typically based on a combination of the package source code's remote URI and file system hierarchy structure. In some cases, you will need to unpack the package's source code to a different directory structure than the one indicated by the import path, and @code{#:unpack-path} should be used in such cases." msgstr "Beim Aufruf wird ein Wert für den Schlüssel @code{#:import-path} und manchmal auch für @code{#:unpack-path} erwartet. Der @url{https://golang.org/doc/code.html#ImportPaths, „import path“} entspricht dem Dateisystempfad, den die Erstellungsskripts des Pakets und darauf Bezug nehmende Pakete erwarten; durch ihn wird ein Go-Paket eindeutig bezeichnet. Typischerweise setzt er sich aus einer Kombination der entfernten URI des Paketquellcodes und der Dateisystemhierarchie zusammen. Manchmal ist es nötig, den Paketquellcode in ein anderes als das vom „import path“ bezeichnete Verzeichnis zu entpacken; diese andere Verzeichnisstruktur sollte dann als @code{#:unpack-path} angegeben werden." #. type: defvr -#: doc/guix.texi:5910 +#: doc/guix.texi:5908 msgid "Packages that provide Go libraries should install their source code into the built output. The key @code{#:install-source?}, which defaults to @code{#t}, controls whether or not the source code is installed. It can be set to @code{#f} for packages that only provide executable files." msgstr "Pakete, die Go-Bibliotheken zur Verfügung stellen, sollten ihren Quellcode auch in die Erstellungsausgabe installieren. Der Schlüssel @code{#:install-source?}, sein Vorgabewert ist @code{#t}, steuert, ob Quellcode installiert wird. Bei Paketen, die nur ausführbare Dateien liefern, kann der Wert auf @code{#f} gesetzt werden." #. type: defvr -#: doc/guix.texi:5912 +#: doc/guix.texi:5910 #, no-wrap msgid "{Scheme Variable} glib-or-gtk-build-system" msgstr "{Scheme-Variable} glib-or-gtk-build-system" #. type: defvr -#: doc/guix.texi:5915 +#: doc/guix.texi:5913 msgid "This variable is exported by @code{(guix build-system glib-or-gtk)}. It is intended for use with packages making use of GLib or GTK+." msgstr "Diese Variable wird vom Modul @code{(guix build-system glib-or-gtk)} exportiert. Sie ist für Pakete gedacht, die GLib oder GTK benutzen." #. type: defvr -#: doc/guix.texi:5918 +#: doc/guix.texi:5916 msgid "This build system adds the following two phases to the ones defined by @var{gnu-build-system}:" msgstr "Dieses Erstellungssystem fügt die folgenden zwei Phasen zu denen von @var{gnu-build-system} hinzu:" #. type: item -#: doc/guix.texi:5920 doc/guix.texi:6248 +#: doc/guix.texi:5918 doc/guix.texi:6246 #, no-wrap msgid "glib-or-gtk-wrap" msgstr "glib-or-gtk-wrap" #. type: table -#: doc/guix.texi:5927 +#: doc/guix.texi:5925 msgid "The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are able to find GLib ``schemas'' and @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK+ modules}. This is achieved by wrapping the programs in launch scripts that appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH} environment variables." msgstr "Die Phase @code{glib-or-gtk-wrap} stellt sicher, dass Programme in @file{bin/} in der Lage sind, GLib-„Schemata“ und @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK-Module} zu finden. Dazu wird für das Programm ein Wrapper-Skript erzeugt, dass das eigentliche Programm mit den richtigen Werten für die Umgebungsvariablen @code{XDG_DATA_DIRS} und @code{GTK_PATH} aufruft." #. type: table -#: doc/guix.texi:5934 +#: doc/guix.texi:5932 msgid "It is possible to exclude specific package outputs from that wrapping process by listing their names in the @code{#:glib-or-gtk-wrap-excluded-outputs} parameter. This is useful when an output is known not to contain any GLib or GTK+ binaries, and where wrapping would gratuitously add a dependency of that output on GLib and GTK+." msgstr "Es ist möglich, bestimmte Paketausgaben von diesem Wrapping-Prozess auszunehmen, indem Sie eine Liste ihrer Namen im Parameter @code{#:glib-or-gtk-wrap-excluded-outputs} angeben. Das ist nützlich, wenn man von einer Ausgabe weiß, dass sie keine Binärdateien enthält, die GLib oder GTK benutzen, und diese Ausgabe durch das Wrappen ohne Not eine weitere Abhängigkeit von GLib und GTK bekäme." #. type: item -#: doc/guix.texi:5935 doc/guix.texi:6252 +#: doc/guix.texi:5933 doc/guix.texi:6250 #, no-wrap msgid "glib-or-gtk-compile-schemas" msgstr "glib-or-gtk-compile-schemas" #. type: table -#: doc/guix.texi:5943 +#: doc/guix.texi:5941 msgid "The phase @code{glib-or-gtk-compile-schemas} makes sure that all @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, GSettings schemas} of GLib are compiled. Compilation is performed by the @command{glib-compile-schemas} program. It is provided by the package @code{glib:bin} which is automatically imported by the build system. The @code{glib} package providing @command{glib-compile-schemas} can be specified with the @code{#:glib} parameter." msgstr "Mit der Phase @code{glib-or-gtk-compile-schemas} wird sichergestellt, dass alle @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, GSettings-Schemata} für GLib kompiliert werden. Dazu wird das Programm @command{glib-compile-schemas} ausgeführt. Es kommt aus dem Paket @code{glib:bin}, was automatisch vom Erstellungssystem importiert wird. Welches @code{glib}-Paket dieses @command{glib-compile-schemas} bereitstellt, kann mit dem Parameter @code{#:glib} spezifiziert werden." #. type: defvr -#: doc/guix.texi:5946 +#: doc/guix.texi:5944 msgid "Both phases are executed after the @code{install} phase." msgstr "Beide Phasen finden nach der @code{install}-Phase statt." #. type: defvr -#: doc/guix.texi:5948 +#: doc/guix.texi:5946 #, no-wrap msgid "{Scheme Variable} guile-build-system" msgstr "{Scheme-Variable} guile-build-system" #. type: defvr -#: doc/guix.texi:5955 +#: doc/guix.texi:5953 msgid "This build system is for Guile packages that consist exclusively of Scheme code and that are so lean that they don't even have a makefile, let alone a @file{configure} script. It compiles Scheme code using @command{guild compile} (@pxref{Compilation,,, guile, GNU Guile Reference Manual}) and installs the @file{.scm} and @file{.go} files in the right place. It also installs documentation." msgstr "Dieses Erstellungssystem ist für Guile-Pakete gedacht, die nur aus Scheme-Code bestehen und so schlicht sind, dass sie nicht einmal ein Makefile und erst recht keinen @file{configure}-Skript enthalten. Hierzu wird Scheme-Code mit @command{guild compile} kompiliert (siehe @ref{Compilation,,, guile, GNU Guile Reference Manual}) und die @file{.scm}- und @file{.go}-Dateien an den richtigen Pfad installiert. Auch Dokumentation wird installiert." #. type: defvr -#: doc/guix.texi:5958 +#: doc/guix.texi:5956 msgid "This build system supports cross-compilation by using the @code{--target} option of @command{guild compile}." msgstr "Das Erstellungssystem unterstützt Cross-Kompilieren durch die Befehlszeilenoption @code{--target} für @command{guild compile}." #. type: defvr -#: doc/guix.texi:5961 +#: doc/guix.texi:5959 msgid "Packages built with @code{guile-build-system} must provide a Guile package in their @code{native-inputs} field." msgstr "Mit @code{guile-build-system} erstellte Pakete müssen ein Guile-Paket in ihrem @code{native-inputs}-Feld aufführen." #. type: defvr -#: doc/guix.texi:5963 +#: doc/guix.texi:5961 #, no-wrap msgid "{Scheme Variable} minify-build-system" msgstr "{Scheme-Variable} minify-build-system" #. type: defvr -#: doc/guix.texi:5966 +#: doc/guix.texi:5964 msgid "This variable is exported by @code{(guix build-system minify)}. It implements a minification procedure for simple JavaScript packages." msgstr "Diese Variable wird vom Modul @code{(guix build-system minify)} exportiert. Sie implementiert eine Prozedur zur Minifikation einfacher JavaScript-Pakete." #. type: defvr -#: doc/guix.texi:5972 +#: doc/guix.texi:5970 msgid "It adds @code{uglify-js} to the set of inputs and uses it to compress all JavaScript files in the @file{src} directory. A different minifier package can be specified with the @code{#:uglify-js} parameter, but it is expected that the package writes the minified code to the standard output." msgstr "Es fügt @code{uglify-js} zur Menge der Eingaben hinzu und komprimiert damit alle JavaScript-Dateien im @file{src}-Verzeichnis. Ein anderes Programm zur Minifikation kann verwendet werden, indem es mit dem Parameter @code{#:uglify-js} angegeben wird; es wird erwartet, dass das angegebene Paket den minifizierten Code auf der Standardausgabe ausgibt." #. type: defvr -#: doc/guix.texi:5976 +#: doc/guix.texi:5974 msgid "When the input JavaScript files are not all located in the @file{src} directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier." msgstr "Wenn die Eingabe-JavaScript-Dateien nicht alle im @file{src}-Verzeichnis liegen, kann mit dem Parameter @code{#:javascript-files} eine Liste der Dateinamen übergeben werden, auf die das Minifikationsprogramm aufgerufen wird." #. type: defvr -#: doc/guix.texi:5978 +#: doc/guix.texi:5976 #, no-wrap msgid "{Scheme Variable} ocaml-build-system" msgstr "{Scheme-Variable} ocaml-build-system" #. type: defvr -#: doc/guix.texi:5984 +#: doc/guix.texi:5982 msgid "This variable is exported by @code{(guix build-system ocaml)}. It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists of choosing the correct set of commands to run for each package. OCaml packages can expect many different commands to be run. This build system will try some of them." msgstr "Diese Variable wird vom Modul @code{(guix build-system ocaml)} exportiert. Mit ihr ist ein Erstellungssystem für @uref{https://ocaml.org, OCaml-Pakete} implementiert, was bedeutet, dass es die richtigen auszuführenden Befehle für das jeweilige Paket auswählt. OCaml-Pakete können sehr unterschiedliche Befehle erwarten. Dieses Erstellungssystem probiert manche davon durch." #. type: defvr -#: doc/guix.texi:5994 +#: doc/guix.texi:5992 msgid "When the package has a @file{setup.ml} file present at the top-level, it will run @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} and @code{ocaml setup.ml -install}. The build system will assume that this file was generated by @uref{http://oasis.forge.ocamlcore.org/, OASIS} and will take care of setting the prefix and enabling tests if they are not disabled. You can pass configure and build flags with the @code{#:configure-flags} and @code{#:build-flags}. The @code{#:test-flags} key can be passed to change the set of flags used to enable tests. The @code{#:use-make?} key can be used to bypass this system in the build and install phases." msgstr "Wenn im Paket eine Datei @file{setup.ml} auf oberster Ebene vorhanden ist, wird @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} und @code{ocaml setup.ml -install} ausgeführt. Das Erstellungssystem wird annehmen, dass die Datei durch @uref{http://oasis.forge.ocamlcore.org/, OASIS} erzeugt wurde, und wird das Präfix setzen und Tests aktivieren, wenn diese nicht abgeschaltet wurden. Sie können Befehlszeilenoptionen zum Konfigurieren und Erstellen mit den Parametern @code{#:configure-flags} und @code{#:build-flags} übergeben. Der Schlüssel @code{#:test-flags} kann übergeben werden, um die Befehlszeilenoptionen zu ändern, mit denen die Tests aktiviert werden. Mit dem Parameter @code{#:use-make?} kann dieses Erstellungssystem für die build- und install-Phasen abgeschaltet werden." #. type: defvr -#: doc/guix.texi:5999 +#: doc/guix.texi:5997 msgid "When the package has a @file{configure} file, it is assumed that it is a hand-made configure script that requires a different argument format than in the @code{gnu-build-system}. You can add more flags with the @code{#:configure-flags} key." msgstr "Verfügt das Paket über eine @file{configure}-Datei, wird angenommen, dass diese von Hand geschrieben wurde mit einem anderen Format für Argumente als bei einem Skript des @code{gnu-build-system}. Sie können weitere Befehlszeilenoptionen mit dem Schlüssel @code{#:configure-flags} hinzufügen." #. type: defvr -#: doc/guix.texi:6003 +#: doc/guix.texi:6001 msgid "When the package has a @file{Makefile} file (or @code{#:use-make?} is @code{#t}), it will be used and more flags can be passed to the build and install phases with the @code{#:make-flags} key." msgstr "Falls dem Paket ein @file{Makefile} beiliegt (oder @code{#:use-make?} auf @code{#t} gesetzt wurde), wird dieses benutzt und weitere Befehlszeilenoptionen können mit dem Schlüssel @code{#:make-flags} zu den build- und install-Phasen hinzugefügt werden." #. type: defvr -#: doc/guix.texi:6011 +#: doc/guix.texi:6009 msgid "Finally, some packages do not have these files and use a somewhat standard location for its build system. In that case, the build system will run @code{ocaml pkg/pkg.ml} or @code{ocaml pkg/build.ml} and take care of providing the path to the required findlib module. Additional flags can be passed via the @code{#:build-flags} key. Install is taken care of by @command{opam-installer}. In this case, the @code{opam} package must be added to the @code{native-inputs} field of the package definition." msgstr "Letztlich gibt es in manchen Pakete keine solchen Dateien, sie halten sich aber an bestimmte Konventionen, wo ihr eigenes Erstellungssystem zu finden ist. In diesem Fall führt Guix’ OCaml-Erstellungssystem @code{ocaml pkg/pkg.ml} oder @code{ocaml pkg/build.ml} aus und kümmert sich darum, dass der Pfad zu dem benötigten findlib-Modul passt. Weitere Befehlszeilenoptionen können über den Schlüssel @code{#:build-flags} übergeben werden. Um die Installation kümmert sich @command{opam-installer}. In diesem Fall muss das @code{opam}-Paket im @code{native-inputs}-Feld der Paketdefinition stehen." #. type: defvr -#: doc/guix.texi:6019 +#: doc/guix.texi:6017 msgid "Note that most OCaml packages assume they will be installed in the same directory as OCaml, which is not what we want in guix. In particular, they will install @file{.so} files in their module's directory, which is usually fine because it is in the OCaml compiler directory. In guix though, these libraries cannot be found and we use @code{CAML_LD_LIBRARY_PATH}. This variable points to @file{lib/ocaml/site-lib/stubslibs} and this is where @file{.so} libraries should be installed." msgstr "Beachten Sie, dass die meisten OCaml-Pakete davon ausgehen, dass sie in dasselbe Verzeichnis wie OCaml selbst installiert werden, was wir in Guix aber nicht so haben wollen. Solche Pakete installieren ihre @file{.so}-Dateien in das Verzeichnis ihres Moduls, was für die meisten anderen Einrichtungen funktioniert, weil es im OCaml-Compilerverzeichnis liegt. Jedoch können so in Guix die Bibliotheken nicht gefunden werden, deswegen benutzen wir @code{CAML_LD_LIBRARY_PATH}. Diese Umgebungsvariable zeigt auf @file{lib/ocaml/site-lib/stubslibs} und dorthin sollten @file{.so}-Bibliotheken installiert werden." #. type: defvr -#: doc/guix.texi:6021 +#: doc/guix.texi:6019 #, no-wrap msgid "{Scheme Variable} python-build-system" msgstr "{Scheme-Variable} python-build-system" #. type: defvr -#: doc/guix.texi:6026 +#: doc/guix.texi:6024 msgid "This variable is exported by @code{(guix build-system python)}. It implements the more or less standard build procedure used by Python packages, which consists in running @code{python setup.py build} and then @code{python setup.py install --prefix=/gnu/store/@dots{}}." msgstr "Diese Variable wird vom Modul @code{(guix build-system python)} exportiert. Sie implementiert mehr oder weniger die konventionelle Erstellungsprozedur, wie sie für Python-Pakete üblich ist, d.h.@: erst wird @code{python setup.py build} ausgeführt und dann @code{python setup.py install --prefix=/gnu/store/…}." #. type: defvr -#: doc/guix.texi:6030 +#: doc/guix.texi:6028 msgid "For packages that install stand-alone Python programs under @code{bin/}, it takes care of wrapping these programs so that their @code{PYTHONPATH} environment variable points to all the Python libraries they depend on." msgstr "Für Pakete, die eigenständige Python-Programme nach @code{bin/} installieren, sorgt dieses Erstellungssystem dafür, dass die Programme in ein Wrapper-Skript verpackt werden, welches die eigentlichen Programme mit einer Umgebungsvariablen @code{PYTHONPATH} aufruft, die alle Python-Bibliotheken auflistet, von denen die Programme abhängen." #. type: defvr -#: doc/guix.texi:6036 +#: doc/guix.texi:6034 msgid "Which Python package is used to perform the build can be specified with the @code{#:python} parameter. This is a useful way to force a package to be built for a specific version of the Python interpreter, which might be necessary if the package is only compatible with a single interpreter version." msgstr "Welches Python-Paket benutzt wird, um die Erstellung durchzuführen, kann mit dem Parameter @code{#:python} bestimmt werden. Das ist nützlich, wenn wir erzwingen wollen, dass ein Paket mit einer bestimmten Version des Python-Interpretierers arbeitet, was nötig sein kann, wenn das Programm nur mit einer einzigen Interpretiererversion kompatibel ist." #. type: defvr -#: doc/guix.texi:6041 +#: doc/guix.texi:6039 msgid "By default guix calls @code{setup.py} under control of @code{setuptools}, much like @command{pip} does. Some packages are not compatible with setuptools (and pip), thus you can disable this by setting the @code{#:use-setuptools} parameter to @code{#f}." msgstr "Standardmäßig ruft Guix @code{setup.py} auf, was zu @code{setuptools} gehört, ähnlich wie es auch @command{pip} tut. Manche Pakete sind mit setuptools (und pip) inkompatibel, deswegen können Sie diese Einstellung abschalten, indem Sie den Parameter @code{#:use-setuptools} auf @code{#f} setzen." #. type: defvr -#: doc/guix.texi:6043 +#: doc/guix.texi:6041 #, no-wrap msgid "{Scheme Variable} perl-build-system" msgstr "{Scheme-Variable} perl-build-system" #. type: defvr -#: doc/guix.texi:6055 +#: doc/guix.texi:6053 msgid "This variable is exported by @code{(guix build-system perl)}. It implements the standard build procedure for Perl packages, which either consists in running @code{perl Build.PL --prefix=/gnu/store/@dots{}}, followed by @code{Build} and @code{Build install}; or in running @code{perl Makefile.PL PREFIX=/gnu/store/@dots{}}, followed by @code{make} and @code{make install}, depending on which of @code{Build.PL} or @code{Makefile.PL} is present in the package distribution. Preference is given to the former if both @code{Build.PL} and @code{Makefile.PL} exist in the package distribution. This preference can be reversed by specifying @code{#t} for the @code{#:make-maker?} parameter." msgstr "Diese Variable wird vom Modul @code{(guix build-system perl)} exportiert. Mit ihr wird die Standard-Erstellungsprozedur für Perl-Pakete implementiert, welche entweder darin besteht, @code{perl Build.PL --prefix=/gnu/store/…} gefolgt von @code{Build} und @code{Build install} auszuführen, oder @code{perl Makefile.PL PREFIX=/gnu/store/…} gefolgt von @code{make} und @code{make install} auszuführen, je nachdem, ob eine Datei @code{Build.PL} oder eine Datei @code{Makefile.PL} in der Paketdistribution vorliegt. Den Vorrang hat erstere, wenn sowohl @code{Build.PL} als auch @code{Makefile.PL} in der Paketdistribution existieren. Der Vorrang kann umgekehrt werden, indem @code{#t} für den Parameter @code{#:make-maker?} angegeben wird." #. type: defvr -#: doc/guix.texi:6059 +#: doc/guix.texi:6057 msgid "The initial @code{perl Makefile.PL} or @code{perl Build.PL} invocation passes flags specified by the @code{#:make-maker-flags} or @code{#:module-build-flags} parameter, respectively." msgstr "Der erste Aufruf von @code{perl Makefile.PL} oder @code{perl Build.PL} übergibt die im Parameter @code{#:make-maker-flags} bzw. @code{#:module-build-flags} angegebenen Befehlszeilenoptionen, je nachdem, was verwendet wird." #. type: defvr -#: doc/guix.texi:6061 +#: doc/guix.texi:6059 msgid "Which Perl package is used can be specified with @code{#:perl}." msgstr "Welches Perl-Paket dafür benutzt wird, kann mit @code{#:perl} angegeben werden." #. type: defvr -#: doc/guix.texi:6063 +#: doc/guix.texi:6061 #, no-wrap msgid "{Scheme Variable} r-build-system" msgstr "{Scheme-Variable} r-build-system" #. type: defvr -#: doc/guix.texi:6071 +#: doc/guix.texi:6069 msgid "This variable is exported by @code{(guix build-system r)}. It implements the build procedure used by @uref{https://r-project.org, R} packages, which essentially is little more than running @code{R CMD INSTALL --library=/gnu/store/@dots{}} in an environment where @code{R_LIBS_SITE} contains the paths to all R package inputs. Tests are run after installation using the R function @code{tools::testInstalledPackage}." msgstr "Diese Variable wird vom Modul @code{(guix build-system r)} exportiert. Sie entspricht einer Implementierung der durch @uref{https://r-project.org, R-Pakete} genutzten Erstellungsprozedur, die wenig mehr tut, als @code{R CMD INSTALL --library=/gnu/store/…} in einer Umgebung auszuführen, in der die Umgebungsvariable @code{R_LIBS_SITE} die Pfade aller R-Pakete unter den Paketeingaben enthält. Tests werden nach der Installation mit der R-Funktion @code{tools::testInstalledPackage} ausgeführt." #. type: defvr -#: doc/guix.texi:6073 +#: doc/guix.texi:6071 #, no-wrap msgid "{Scheme Variable} rakudo-build-system" msgstr "{Scheme-Variable} rakudo-build-system" #. type: defvr -#: doc/guix.texi:6081 +#: doc/guix.texi:6079 msgid "This variable is exported by @code{(guix build-system rakudo)}. It implements the build procedure used by @uref{https://rakudo.org/, Rakudo} for @uref{https://perl6.org/, Perl6} packages. It installs the package to @code{/gnu/store/@dots{}/NAME-VERSION/share/perl6} and installs the binaries, library files and the resources, as well as wrap the files under the @code{bin/} directory. Tests can be skipped by passing @code{#f} to the @code{tests?} parameter." msgstr "Diese Variable wird vom Modul @code{(guix build-system rakudo)} exportiert. Sie implementiert die Erstellungsprozedur, die von @uref{https://rakudo.org/, Rakudo} für @uref{https://perl6.org/, Perl6-Pakete} benutzt wird. Pakete werden ins Verzeichnis @code{/gnu/store/…/NAME-VERSION/share/perl6} abgelegt und Binärdateien, Bibliotheksdateien und Ressourcen werden installiert, zudem werden die Dateien im Verzeichnis @code{bin/} in Wrapper-Skripte verpackt. Tests können übersprungen werden, indem man @code{#f} im Parameter @code{tests?} übergibt." #. type: defvr -#: doc/guix.texi:6089 +#: doc/guix.texi:6087 msgid "Which rakudo package is used can be specified with @code{rakudo}. Which perl6-tap-harness package used for the tests can be specified with @code{#:prove6} or removed by passing @code{#f} to the @code{with-prove6?} parameter. Which perl6-zef package used for tests and installing can be specified with @code{#:zef} or removed by passing @code{#f} to the @code{with-zef?} parameter." msgstr "Welches rakudo-Paket benutzt werden soll, kann mit dem Parameter @code{rakudo} angegeben werden. Das perl6-tap-harness-Paket, das für die Tests benutzt wird, kann mit @code{#:prove6} ausgewählt werden; es kann auch entfernt werden, indem man @code{#f} für den Parameter @code{with-prove6?} übergibt. Welches perl6-zef-Paket für Tests und Installation verwendet wird, kann mit dem Parameter @code{#:zef} angegeben werden; es kann auch entfernt werden, indem man @code{#f} für den Parameter @code{with-zef?} übergibt." #. type: defvr -#: doc/guix.texi:6091 +#: doc/guix.texi:6089 #, no-wrap msgid "{Scheme Variable} texlive-build-system" msgstr "{Scheme-Variable} texlive-build-system" #. type: defvr -#: doc/guix.texi:6096 +#: doc/guix.texi:6094 msgid "This variable is exported by @code{(guix build-system texlive)}. It is used to build TeX packages in batch mode with a specified engine. The build system sets the @code{TEXINPUTS} variable to find all TeX source files in the inputs." msgstr "Diese Variable wird vom Modul @code{(guix build-system texlive)} exportiert. Mit ihr werden TeX-Pakete in Stapelverarbeitung („batch mode“) mit der angegebenen Engine erstellt. Das Erstellungssystem setzt die Variable @code{TEXINPUTS} so, dass alle TeX-Quelldateien unter den Eingaben gefunden werden können." #. type: defvr -#: doc/guix.texi:6105 +#: doc/guix.texi:6103 msgid "By default it runs @code{luatex} on all files ending on @code{ins}. A different engine and format can be specified with the @code{#:tex-format} argument. Different build targets can be specified with the @code{#:build-targets} argument, which expects a list of file names. The build system adds only @code{texlive-bin} and @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the inputs. Both can be overridden with the arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, respectively." msgstr "Standardmäßig wird @code{luatex} auf allen Dateien mit der Dateiendung @code{ins} ausgeführt. Eine andere Engine oder ein anderes Format kann mit dem Argument @code{#:tex-format} angegeben werden. Verschiedene Erstellungsziele können mit dem Argument @code{#:build-targets} festgelegt werden, das eine Liste von Dateinamen erwartet. Das Erstellungssystem fügt nur @code{texlive-bin} und @code{texlive-latex-base} zu den Eingaben hinzu (beide kommen aus dem Modul @code{(gnu packages tex}). Für beide kann das zu benutzende Paket jeweils mit den Argumenten @code{#:texlive-bin} oder @code{#:texlive-latex-base} geändert werden." #. type: defvr -#: doc/guix.texi:6108 +#: doc/guix.texi:6106 msgid "The @code{#:tex-directory} parameter tells the build system where to install the built files under the texmf tree." msgstr "Der Parameter @code{#:tex-directory} sagt dem Erstellungssystem, wohin die installierten Dateien im texmf-Verzeichnisbaum installiert werden sollen." #. type: defvr -#: doc/guix.texi:6110 +#: doc/guix.texi:6108 #, no-wrap msgid "{Scheme Variable} ruby-build-system" msgstr "{Scheme-Variable} ruby-build-system" #. type: defvr -#: doc/guix.texi:6114 +#: doc/guix.texi:6112 msgid "This variable is exported by @code{(guix build-system ruby)}. It implements the RubyGems build procedure used by Ruby packages, which involves running @code{gem build} followed by @code{gem install}." msgstr "Diese Variable wird vom Modul @code{(guix build-system ruby)} exportiert. Sie steht für eine Implementierung der RubyGems-Erstellungsprozedur, die für Ruby-Pakete benutzt wird, wobei @code{gem build} gefolgt von @code{gem install} ausgeführt wird." #. type: defvr -#: doc/guix.texi:6122 +#: doc/guix.texi:6120 msgid "The @code{source} field of a package that uses this build system typically references a gem archive, since this is the format that Ruby developers use when releasing their software. The build system unpacks the gem archive, potentially patches the source, runs the test suite, repackages the gem, and installs it. Additionally, directories and tarballs may be referenced to allow building unreleased gems from Git or a traditional source release tarball." msgstr "Das @code{source}-Feld eines Pakets, das dieses Erstellungssystem benutzt, verweist typischerweise auf ein Gem-Archiv, weil Ruby-Entwickler dieses Format benutzen, wenn sie ihre Software veröffentlichen. Das Erstellungssystem entpackt das Gem-Archiv, spielt eventuell Patches für den Quellcode ein, führt die Tests aus, verpackt alles wieder in ein Gem-Archiv und installiert dieses. Neben Gem-Archiven darf das Feld auch auf Verzeichnisse und Tarballs verweisen, damit es auch möglich ist, unveröffentlichte Gems aus einem Git-Repository oder traditionelle Quellcode-Veröffentlichungen zu benutzen." #. type: defvr -#: doc/guix.texi:6126 +#: doc/guix.texi:6124 msgid "Which Ruby package is used can be specified with the @code{#:ruby} parameter. A list of additional flags to be passed to the @command{gem} command can be specified with the @code{#:gem-flags} parameter." msgstr "Welches Ruby-Paket benutzt werden soll, kann mit dem Parameter @code{#:ruby} festgelegt werden. Eine Liste zusätzlicher Befehlszeilenoptionen für den Aufruf des @command{gem}-Befehls kann mit dem Parameter @code{#:gem-flags} angegeben werden." #. type: defvr -#: doc/guix.texi:6128 +#: doc/guix.texi:6126 #, no-wrap msgid "{Scheme Variable} waf-build-system" msgstr "{Scheme-Variable} waf-build-system" #. type: defvr -#: doc/guix.texi:6134 +#: doc/guix.texi:6132 msgid "This variable is exported by @code{(guix build-system waf)}. It implements a build procedure around the @code{waf} script. The common phases---@code{configure}, @code{build}, and @code{install}---are implemented by passing their names as arguments to the @code{waf} script." msgstr "Diese Variable wird durch das Modul @code{(guix build-system waf)} exportiert. Damit ist eine Erstellungsprozedur rund um das @code{waf}-Skript implementiert. Die üblichen Phasen — @code{configure}, @code{build} und @code{install} — sind implementiert, indem deren Namen als Argumente an das @code{waf}-Skript übergeben werden." #. type: defvr -#: doc/guix.texi:6138 +#: doc/guix.texi:6136 msgid "The @code{waf} script is executed by the Python interpreter. Which Python package is used to run the script can be specified with the @code{#:python} parameter." msgstr "Das @code{waf}-Skript wird vom Python-Interpetierer ausgeführt. Mit welchem Python-Paket das Skript ausgeführt werden soll, kann mit dem Parameter @code{#:python} angegeben werden." #. type: defvr -#: doc/guix.texi:6140 +#: doc/guix.texi:6138 #, no-wrap msgid "{Scheme Variable} scons-build-system" msgstr "{Scheme-Variable} scons-build-system" #. type: defvr -#: doc/guix.texi:6146 +#: doc/guix.texi:6144 msgid "This variable is exported by @code{(guix build-system scons)}. It implements the build procedure used by the SCons software construction tool. This build system runs @code{scons} to build the package, @code{scons test} to run tests, and then @code{scons install} to install the package." msgstr "Diese Variable wird vom Modul @code{(guix build-system scons)} exportiert. Sie steht für eine Implementierung der Erstellungsprozedur, die das SCons-Softwarekonstruktionswerkzeug („software construction tool“) benutzt. Das Erstellungssystem führt @code{scons} aus, um das Paket zu erstellen, führt mit @code{scons test} Tests aus und benutzt @code{scons install}, um das Paket zu installieren." #. type: defvr -#: doc/guix.texi:6151 +#: doc/guix.texi:6149 msgid "Additional flags to be passed to @code{scons} can be specified with the @code{#:scons-flags} parameter. The version of Python used to run SCons can be specified by selecting the appropriate SCons package with the @code{#:scons} parameter." msgstr "Zusätzliche Optionen, die an @code{scons} übergeben werden sollen, können mit dem Parameter @code{#:scons-flags} angegeben werden. Die Python-Version, die benutzt werden soll, um SCons auszuführen, kann festgelegt werden, indem das passende SCons-Paket mit dem Parameter @code{#:scons} ausgewählt wird." #. type: defvr -#: doc/guix.texi:6153 +#: doc/guix.texi:6151 #, no-wrap msgid "{Scheme Variable} haskell-build-system" msgstr "{Scheme-Variable} haskell-build-system" #. type: defvr -#: doc/guix.texi:6167 +#: doc/guix.texi:6165 msgid "This variable is exported by @code{(guix build-system haskell)}. It implements the Cabal build procedure used by Haskell packages, which involves running @code{runhaskell Setup.hs configure --prefix=/gnu/store/@dots{}} and @code{runhaskell Setup.hs build}. Instead of installing the package by running @code{runhaskell Setup.hs install}, to avoid trying to register libraries in the read-only compiler store directory, the build system uses @code{runhaskell Setup.hs copy}, followed by @code{runhaskell Setup.hs register}. In addition, the build system generates the package documentation by running @code{runhaskell Setup.hs haddock}, unless @code{#:haddock? #f} is passed. Optional Haddock parameters can be passed with the help of the @code{#:haddock-flags} parameter. If the file @code{Setup.hs} is not found, the build system looks for @code{Setup.lhs} instead." msgstr "Diese Variable wird vom Modul @code{(guix build-system haskell)} exportiert. Sie bietet Zugang zur Cabal-Erstellungsprozedur, die von Haskell-Paketen benutzt wird, was bedeutet, @code{runhaskell Setup.hs configure --prefix=/gnu/store/…} und @code{runhaskell Setup.hs build} auszuführen. Statt das Paket mit dem Befehl @code{runhaskell Setup.hs install} zu installieren, benutzt das Erstellungssystem @code{runhaskell Setup.hs copy} gefolgt von @code{runhaskell Setup.hs register}, um keine Bibliotheken im Store-Verzeichnis des Compilers zu speichern, auf dem keine Schreibberechtigung besteht. Zusätzlich generiert das Erstellungssystem Dokumentation durch Ausführen von @code{runhaskell Setup.hs haddock}, außer @code{#:haddock? #f} wurde übergeben. Optional können an Haddock Parameter mit Hilfe des Parameters @code{#:haddock-flags} übergeben werden. Wird die Datei @code{Setup.hs} nicht gefunden, sucht das Erstellungssystem stattdessen nach @code{Setup.lhs}." #. type: defvr -#: doc/guix.texi:6170 +#: doc/guix.texi:6168 msgid "Which Haskell compiler is used can be specified with the @code{#:haskell} parameter which defaults to @code{ghc}." msgstr "Welcher Haskell-Compiler benutzt werden soll, kann über den @code{#:haskell}-Parameter angegeben werden. Als Vorgabewert verwendet er @code{ghc}." #. type: defvr -#: doc/guix.texi:6172 +#: doc/guix.texi:6170 #, no-wrap msgid "{Scheme Variable} dub-build-system" msgstr "{Scheme-Variable} dub-build-system" #. type: defvr -#: doc/guix.texi:6177 +#: doc/guix.texi:6175 msgid "This variable is exported by @code{(guix build-system dub)}. It implements the Dub build procedure used by D packages, which involves running @code{dub build} and @code{dub run}. Installation is done by copying the files manually." msgstr "Diese Variable wird vom Modul @code{(guix build-system dub)} exportiert. Sie verweist auf eine Implementierung des Dub-Erstellungssystems, das von D-Paketen benutzt wird. Dabei werden @code{dub build} und @code{dub run} ausgeführt. Die Installation wird durch manuelles Kopieren der Dateien durchgeführt." #. type: defvr -#: doc/guix.texi:6180 +#: doc/guix.texi:6178 msgid "Which D compiler is used can be specified with the @code{#:ldc} parameter which defaults to @code{ldc}." msgstr "Welcher D-Compiler benutzt wird, kann mit dem Parameter @code{#:ldc} festgelegt werden, was als Vorgabewert @code{ldc} benutzt." #. type: defvr -#: doc/guix.texi:6182 +#: doc/guix.texi:6180 #, no-wrap msgid "{Scheme Variable} emacs-build-system" msgstr "{Scheme-Variable} emacs-build-system" #. type: defvr -#: doc/guix.texi:6186 +#: doc/guix.texi:6184 msgid "This variable is exported by @code{(guix build-system emacs)}. It implements an installation procedure similar to the packaging system of Emacs itself (@pxref{Packages,,, emacs, The GNU Emacs Manual})." msgstr "Diese Variable wird vom Modul @code{(guix build-system emacs)} exportiert. Darin wird eine Installationsprozedur ähnlich der des Paketsystems von Emacs selbst implementiert (siehe @ref{Packages,,, emacs, The GNU Emacs Manual})." #. type: defvr -#: doc/guix.texi:6193 +#: doc/guix.texi:6191 msgid "It first creates the @code{@var{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files. Differently from the Emacs packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is deleted. Each package is installed in its own directory under @file{share/emacs/site-lisp/guix.d}." msgstr "Zunächst wird eine Datei @code{@var{Paket}-autoloads.el} erzeugt, dann werden alle Emacs-Lisp-Dateien zu Bytecode kompiliert. Anders als beim Emacs-Paketsystem werden die Info-Dokumentationsdateien in das Standardverzeichnis für Dokumentation verschoben und die Datei @file{dir} gelöscht. Jedes Paket wird in sein eigenes Verzeichnis unter @file{share/emacs/site-lisp/guix.d} installiert." #. type: defvr -#: doc/guix.texi:6195 +#: doc/guix.texi:6193 #, no-wrap msgid "{Scheme Variable} font-build-system" msgstr "{Scheme-Variable} font-build-system" #. type: defvr -#: doc/guix.texi:6201 +#: doc/guix.texi:6199 msgid "This variable is exported by @code{(guix build-system font)}. It implements an installation procedure for font packages where upstream provides pre-compiled TrueType, OpenType, etc.@: font files that merely need to be copied into place. It copies font files to standard locations in the output directory." msgstr "Diese Variable wird vom Modul @code{(guix build-system font)} exportiert. Mit ihr steht eine Installationsprozedur für Schriftarten-Pakete zur Verfügung für vom Anbieter vorkompilierte TrueType-, OpenType- und andere Schriftartendateien, die nur an die richtige Stelle kopiert werden müssen. Dieses Erstellungssystem kopiert die Schriftartendateien an den Konventionen folgende Orte im Ausgabeverzeichnis." #. type: defvr -#: doc/guix.texi:6203 +#: doc/guix.texi:6201 #, no-wrap msgid "{Scheme Variable} meson-build-system" msgstr "{Scheme-Variable} meson-build-system" #. type: defvr -#: doc/guix.texi:6207 +#: doc/guix.texi:6205 msgid "This variable is exported by @code{(guix build-system meson)}. It implements the build procedure for packages that use @url{https://mesonbuild.com, Meson} as their build system." msgstr "Diese Variable wird vom Modul @code{(guix build-system meson)} exportiert. Sie enthält die Erstellungsprozedur für Pakete, die @url{https://mesonbuild.com, Meson} als ihr Erstellungssystem benutzen." #. type: defvr -#: doc/guix.texi:6213 +#: doc/guix.texi:6211 msgid "It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set of inputs, and they can be changed with the parameters @code{#:meson} and @code{#:ninja} if needed. The default Meson is @code{meson-for-build}, which is special because it doesn't clear the @code{RUNPATH} of binaries and libraries when they are installed." msgstr "Mit ihr werden sowohl Meson als auch @uref{https://ninja-build.org/, Ninja} zur Menge der Eingaben hinzugefügt; die Pakete dafür können mit den Parametern @code{#:meson} und @code{#:ninja} geändert werden, wenn nötig. Das vorgegebene Meson-Paket ist @code{meson-for-build}, ein besonderes Paket, dessen Besonderheit darin besteht, den @code{RUNPATH} von Binärdateien und Bibliotheken @emph{nicht} zu entfernen, wenn sie installiert werden." #. type: defvr -#: doc/guix.texi:6216 +#: doc/guix.texi:6214 msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed to some specific for Meson:" msgstr "Dieses Erstellungssystem ist eine Erweiterung für das @var{gnu-build-system}, aber mit Änderungen an den folgenden Phasen, die Meson-spezifisch sind:" #. type: table -#: doc/guix.texi:6223 +#: doc/guix.texi:6221 msgid "The phase runs @code{meson} with the flags specified in @code{#:configure-flags}. The flag @code{--build-type} is always set to @code{plain} unless something else is specified in @code{#:build-type}." msgstr "Diese Phase führt den @code{meson}-Befehl mit den in @code{#:configure-flags} angegebenen Befehlszeilenoptionen aus. Die Befehlszeilenoption @code{--build-type} wird immer auf @code{plain} gesetzt, solange nichts anderes mit dem Parameter @code{#:build-type} angegeben wurde." #. type: table -#: doc/guix.texi:6227 +#: doc/guix.texi:6225 msgid "The phase runs @code{ninja} to build the package in parallel by default, but this can be changed with @code{#:parallel-build?}." msgstr "Diese Phase ruft @code{ninja} auf, um das Paket standardmäßig parallel zu erstellen. Die Vorgabeeinstellung, dass parallel erstellt wird, kann verändert werden durch Setzen von @code{#:parallel-build?}." #. type: table -#: doc/guix.texi:6231 +#: doc/guix.texi:6229 msgid "The phase runs @code{ninja} with the target specified in @code{#:test-target}, which is @code{\"test\"} by default." msgstr "Diese Phase führt @code{ninja} mit dem als @code{#:test-target} spezifizierten Ziel für Tests auf, der Vorgabewert ist das Ziel namens @code{\"test\"}." #. type: table -#: doc/guix.texi:6234 +#: doc/guix.texi:6232 msgid "The phase runs @code{ninja install} and can not be changed." msgstr "Diese Phase führt @code{ninja install} aus und kann nicht verändert werden." #. type: defvr -#: doc/guix.texi:6237 +#: doc/guix.texi:6235 msgid "Apart from that, the build system also adds the following phases:" msgstr "Dazu fügt das Erstellungssystem noch folgende neue Phasen:" #. type: item -#: doc/guix.texi:6240 +#: doc/guix.texi:6238 #, no-wrap msgid "fix-runpath" msgstr "fix-runpath" #. type: table -#: doc/guix.texi:6247 +#: doc/guix.texi:6245 msgid "This phase ensures that all binaries can find the libraries they need. It searches for required libraries in subdirectories of the package being built, and adds those to @code{RUNPATH} where needed. It also removes references to libraries left over from the build phase by @code{meson-for-build}, such as test dependencies, that aren't actually required for the program to run." msgstr "In dieser Phase wird sichergestellt, dass alle Binärdateien die von ihnen benötigten Bibliotheken finden können. Die benötigten Bibliotheken werden in den Unterverzeichnissen des Pakets, das erstellt wird, gesucht, und zum @code{RUNPATH} hinzugefügt, wann immer es nötig ist. Auch werden diejenigen Referenzen zu Bibliotheken aus der Erstellungsphase wieder entfernt, die bei @code{meson-for-build} hinzugefügt wurden, aber eigentlich zur Laufzeit nicht gebraucht werden, wie Abhängigkeiten nur für Tests." #. type: table -#: doc/guix.texi:6251 doc/guix.texi:6255 +#: doc/guix.texi:6249 doc/guix.texi:6253 msgid "This phase is the phase provided by @code{glib-or-gtk-build-system}, and it is not enabled by default. It can be enabled with @code{#:glib-or-gtk?}." msgstr "Diese Phase ist dieselbe, die auch im @code{glib-or-gtk-build-system} zur Verfügung gestellt wird, und mit Vorgabeeinstellungen wird sie nicht durchlaufen. Wenn sie gebraucht wird, kann sie mit dem Parameter @code{#:glib-or-gtk?} aktiviert werden." #. type: defvr -#: doc/guix.texi:6258 +#: doc/guix.texi:6256 #, no-wrap msgid "{Scheme Variable} linux-module-build-system" msgstr "{Scheme-Variable} linux-module-build-system" #. type: defvr -#: doc/guix.texi:6260 +#: doc/guix.texi:6258 msgid "@var{linux-module-build-system} allows building Linux kernel modules." msgstr "Mit @var{linux-module-build-system} können Linux-Kernelmodule erstellt werden." #. type: defvr -#: doc/guix.texi:6264 +#: doc/guix.texi:6262 msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed:" msgstr "Dieses Erstellungssystem ist eine Erweiterung des @var{gnu-build-system}, bei der aber die folgenden Phasen geändert wurden:" #. type: table -#: doc/guix.texi:6270 +#: doc/guix.texi:6268 msgid "This phase configures the environment so that the Linux kernel's Makefile can be used to build the external kernel module." msgstr "Diese Phase konfiguriert die Umgebung so, dass das externe Kernel-Modul durch das Makefile des Linux-Kernels erstellt werden kann." #. type: table -#: doc/guix.texi:6274 +#: doc/guix.texi:6272 msgid "This phase uses the Linux kernel's Makefile in order to build the external kernel module." msgstr "Diese Phase benutzt das Makefile des Linux-Kernels, um das externe Kernel-Modul zu erstellen." #. type: table -#: doc/guix.texi:6278 +#: doc/guix.texi:6276 msgid "This phase uses the Linux kernel's Makefile in order to install the external kernel module." msgstr "Diese Phase benutzt das Makefile des Linux-Kernels zur Installation des externen Kernel-Moduls." #. type: defvr -#: doc/guix.texi:6283 +#: doc/guix.texi:6281 msgid "It is possible and useful to specify the Linux kernel to use for building the module (in the \"arguments\" form of a package using the linux-module-build-system, use the key #:linux to specify it)." msgstr "Es ist möglich und hilfreich, den für die Erstellung des Moduls zu benutzenden Linux-Kernel anzugeben (in der „arguments“-Form eines Pakets, dass das linux-module-build-system als Erstellungssystem benutzt, wird dazu der Schlüssel #:linux benutzt)." #. type: Plain text -#: doc/guix.texi:6289 +#: doc/guix.texi:6287 msgid "Lastly, for packages that do not need anything as sophisticated, a ``trivial'' build system is provided. It is trivial in the sense that it provides basically no support: it does not pull any implicit inputs, and does not have a notion of build phases." msgstr "Letztlich gibt es für die Pakete, die bei weitem nichts so komplexes brauchen, ein „triviales“ Erstellungssystem. Es ist in dem Sinn trivial, dass es praktisch keine Hilfestellungen gibt: Es fügt keine impliziten Eingaben hinzu und hat kein Konzept von Erstellungsphasen." #. type: defvr -#: doc/guix.texi:6290 +#: doc/guix.texi:6288 #, no-wrap msgid "{Scheme Variable} trivial-build-system" msgstr "{Scheme-Variable} trivial-build-system" #. type: defvr -#: doc/guix.texi:6292 +#: doc/guix.texi:6290 msgid "This variable is exported by @code{(guix build-system trivial)}." msgstr "Diese Variable wird vom Modul @code{(guix build-system trivial)} exportiert." #. type: defvr -#: doc/guix.texi:6297 +#: doc/guix.texi:6295 msgid "This build system requires a @code{#:builder} argument. This argument must be a Scheme expression that builds the package output(s)---as with @code{build-expression->derivation} (@pxref{Derivations, @code{build-expression->derivation}})." msgstr "Diesem Erstellungssystem muss im Argument @code{#:builder} ein Scheme-Ausdruck übergeben werden, der die Paketausgabe(n) erstellt — wie bei @code{build-expression->derivation} (siehe @ref{Derivations, @code{build-expression->derivation}})." #. type: cindex -#: doc/guix.texi:6303 +#: doc/guix.texi:6301 #, no-wrap msgid "store items" msgstr "Store-Objekte" #. type: cindex -#: doc/guix.texi:6304 +#: doc/guix.texi:6302 #, no-wrap msgid "store paths" msgstr "Store-Pfade" #. type: Plain text -#: doc/guix.texi:6315 +#: doc/guix.texi:6313 msgid "Conceptually, the @dfn{store} is the place where derivations that have been built successfully are stored---by default, @file{/gnu/store}. Sub-directories in the store are referred to as @dfn{store items} or sometimes @dfn{store paths}. The store has an associated database that contains information such as the store paths referred to by each store path, and the list of @emph{valid} store items---results of successful builds. This database resides in @file{@var{localstatedir}/guix/db}, where @var{localstatedir} is the state directory specified @i{via} @option{--localstatedir} at configure time, usually @file{/var}." msgstr "Konzeptionell ist der @dfn{Store} der Ort, wo Ableitungen nach erfolgreicher Erstellung gespeichert werden — standardmäßig finden Sie ihn in @file{/gnu/store}. Unterverzeichnisse im Store werden @dfn{Store-Objekte} oder manchmal auch @dfn{Store-Pfade} genannt. Mit dem Store ist eine Datenbank assoziiert, die Informationen enthält wie zum Beispiel, welche Store-Pfade jeder Store-Pfad jeweils referenziert, und eine Liste, welche Store-Objekte @emph{gültig} sind, also Ergebnisse erfolgreicher Erstellungen sind. Die Datenbank befindet sich in @file{@var{localstatedir}/guix/db}, wobei @var{localstatedir} das mit @option{--localstatedir} bei der Ausführung von „configure“ angegebene Zustandsverzeichnis ist, normalerweise @file{/var}." #. type: Plain text -#: doc/guix.texi:6320 +#: doc/guix.texi:6318 msgid "The store is @emph{always} accessed by the daemon on behalf of its clients (@pxref{Invoking guix-daemon}). To manipulate the store, clients connect to the daemon over a Unix-domain socket, send requests to it, and read the result---these are remote procedure calls, or RPCs." msgstr "Auf den Store wird @emph{nur} durch den Daemon im Auftrag seiner Clients zugegriffen (siehe @ref{Invoking guix-daemon}). Um den Store zu verändern, verbinden sich Clients über einen Unix-Socket mit dem Daemon, senden ihm entsprechende Anfragen und lesen dann dessen Antwort — so etwas nennt sich entfernter Prozeduraufruf (englisch „Remote Procedure Call“ oder kurz RPC)." #. type: quotation -#: doc/guix.texi:6325 +#: doc/guix.texi:6323 msgid "Users must @emph{never} modify files under @file{/gnu/store} directly. This would lead to inconsistencies and break the immutability assumptions of Guix's functional model (@pxref{Introduction})." msgstr "Benutzer dürfen @emph{niemals} Dateien in @file{/gnu/store} direkt verändern, sonst wären diese nicht mehr konsistent und die Grundannahmen im funktionalen Modell von Guix, dass die Objekte unveränderlich sind, wären dahin (siehe @ref{Introduction})." #. type: quotation -#: doc/guix.texi:6329 +#: doc/guix.texi:6327 msgid "@xref{Invoking guix gc, @command{guix gc --verify}}, for information on how to check the integrity of the store and attempt recovery from accidental modifications." msgstr "Siehe @ref{Invoking guix gc, @command{guix gc --verify}} für Informationen, wie die Integrität des Stores überprüft und nach versehentlichen Veränderungen unter Umständen wiederhergestellt werden kann." #. type: Plain text -#: doc/guix.texi:6336 +#: doc/guix.texi:6334 msgid "The @code{(guix store)} module provides procedures to connect to the daemon, and to perform RPCs. These are described below. By default, @code{open-connection}, and thus all the @command{guix} commands, connect to the local daemon or to the URI specified by the @code{GUIX_DAEMON_SOCKET} environment variable." msgstr "Das Modul @code{(guix store)} bietet Prozeduren an, um sich mit dem Daemon zu verbinden und entfernte Prozeduraufrufe durchzuführen. Diese werden im Folgenden beschrieben. Das vorgegebene Verhalten von @code{open-connection}, und daher allen @command{guix}-Befehlen, ist, sich mit dem lokalen Daemon oder dem an der in der Umgebungsvariablen @code{GUIX_DAEMON_SOCKET} angegeben URL zu verbinden." #. type: defvr -#: doc/guix.texi:6337 +#: doc/guix.texi:6335 #, no-wrap msgid "{Environment Variable} GUIX_DAEMON_SOCKET" msgstr "{Umgebungsvariable} GUIX_DAEMON_SOCKET" #. type: defvr -#: doc/guix.texi:6342 +#: doc/guix.texi:6340 msgid "When set, the value of this variable should be a file name or a URI designating the daemon endpoint. When it is a file name, it denotes a Unix-domain socket to connect to. In addition to file names, the supported URI schemes are:" msgstr "Ist diese Variable gesetzt, dann sollte ihr Wert ein Dateipfad oder eine URI sein, worüber man sich mit dem Daemon verbinden kann. Ist der Wert der Pfad zu einer Datei, bezeichnet dieser einen Unix-Socket, mit dem eine Verbindung hergestellt werden soll. Ist er eine URI, so werden folgende URI-Schemata unterstützt:" #. type: code{#1} -#: doc/guix.texi:6344 doc/guix.texi:18636 +#: doc/guix.texi:6342 doc/guix.texi:18633 #, no-wrap msgid "file" msgstr "file" #. type: itemx -#: doc/guix.texi:6345 +#: doc/guix.texi:6343 #, no-wrap msgid "unix" msgstr "unix" #. type: table -#: doc/guix.texi:6349 +#: doc/guix.texi:6347 msgid "These are for Unix-domain sockets. @code{file:///var/guix/daemon-socket/socket} is equivalent to @file{/var/guix/daemon-socket/socket}." msgstr "Für Unix-Sockets. @code{file:///var/guix/daemon-socket/socket} kann gleichbedeutend auch als @file{/var/guix/daemon-socket/socket} angegeben werden." #. type: item -#: doc/guix.texi:6350 +#: doc/guix.texi:6348 #, no-wrap msgid "guix" msgstr "guix" #. type: table -#: doc/guix.texi:6358 +#: doc/guix.texi:6356 msgid "These URIs denote connections over TCP/IP, without encryption nor authentication of the remote host. The URI must specify the host name and optionally a port number (by default port 44146 is used):" msgstr "Solche URIs benennen Verbindungen über TCP/IP ohne Verschlüsselung oder Authentifizierung des entfernten Rechners. Die URI muss den Hostnamen, also den Rechnernamen des entfernten Rechners, und optional eine Port-Nummer angeben (sonst wird als Vorgabe der Port 44146 benutzt):" #. type: example -#: doc/guix.texi:6361 +#: doc/guix.texi:6359 #, no-wrap msgid "guix://master.guix.example.org:1234\n" msgstr "guix://master.guix.example.org:1234\n" #. type: table -#: doc/guix.texi:6366 +#: doc/guix.texi:6364 msgid "This setup is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon at @code{master.guix.example.org}." msgstr "Diese Konfiguration ist für lokale Netzwerke wie etwa in Rechen-Clustern geeignet, wo sich nur vertrauenswürdige Knoten mit dem Erstellungs-Daemon z.B.@: unter @code{master.guix.example.org} verbinden können." #. type: table -#: doc/guix.texi:6370 +#: doc/guix.texi:6368 msgid "The @code{--listen} option of @command{guix-daemon} can be used to instruct it to listen for TCP connections (@pxref{Invoking guix-daemon, @code{--listen}})." msgstr "Die Befehlszeilenoption @code{--listen} von @command{guix-daemon} kann benutzt werden, damit er auf TCP-Verbindungen lauscht (siehe @ref{Invoking guix-daemon, @code{--listen}})." #. type: item -#: doc/guix.texi:6371 +#: doc/guix.texi:6369 #, no-wrap msgid "ssh" msgstr "ssh" #. type: cindex -#: doc/guix.texi:6372 +#: doc/guix.texi:6370 #, no-wrap msgid "SSH access to build daemons" msgstr "SSH-Zugriff auf Erstellungs-Daemons" #. type: table -#: doc/guix.texi:6376 +#: doc/guix.texi:6374 msgid "These URIs allow you to connect to a remote daemon over SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}. A typical URL might look like this:" msgstr "Mit solchen URIs kann eine Verbindung zu einem entfernten Daemon über SSH hergestellt werden@footnote{Diese Funktionalitäts setzt Guile-SSH voraus (siehe @ref{Requirements}).}. Eine typische URL sieht so aus:" #. type: example -#: doc/guix.texi:6379 +#: doc/guix.texi:6377 #, no-wrap msgid "ssh://charlie@@guix.example.org:22\n" msgstr "ssh://charlie@@guix.example.org:22\n" #. type: table -#: doc/guix.texi:6383 +#: doc/guix.texi:6381 msgid "As for @command{guix copy}, the usual OpenSSH client configuration files are honored (@pxref{Invoking guix copy})." msgstr "Was @command{guix copy} betrifft, richtet es sich nach den üblichen OpenSSH-Client-Konfigurationsdateien (siehe @ref{Invoking guix copy})." #. type: defvr -#: doc/guix.texi:6386 +#: doc/guix.texi:6384 msgid "Additional URI schemes may be supported in the future." msgstr "In Zukunft könnten weitere URI-Schemata unterstützt werden." #. type: quotation -#: doc/guix.texi:6393 +#: doc/guix.texi:6391 msgid "The ability to connect to remote build daemons is considered experimental as of @value{VERSION}. Please get in touch with us to share any problems or suggestions you may have (@pxref{Contributing})." msgstr "Die Fähigkeit, sich mit entfernten Erstellungs-Daemons zu verbinden, sehen wir als experimentell an, Stand @value{VERSION}. Bitte diskutieren Sie mit uns jegliche Probleme oder Vorschläge, die Sie haben könnten (siehe @ref{Contributing})." #. type: deffn -#: doc/guix.texi:6396 +#: doc/guix.texi:6394 #, no-wrap msgid "{Scheme Procedure} open-connection [@var{uri}] [#:reserve-space? #t]" msgstr "{Scheme-Prozedur} open-connection [@var{Uri}] [#:reserve-space? #t]" #. type: deffn -#: doc/guix.texi:6401 +#: doc/guix.texi:6399 msgid "Connect to the daemon over the Unix-domain socket at @var{uri} (a string). When @var{reserve-space?} is true, instruct it to reserve a little bit of extra space on the file system so that the garbage collector can still operate should the disk become full. Return a server object." msgstr "Sich mit dem Daemon über den Unix-Socket an @var{Uri} verbinden (einer Zeichenkette). Wenn @var{reserve-space?} wahr ist, lässt ihn das etwas zusätzlichen Speicher im Dateisystem reservieren, damit der Müllsammler auch dann noch funktioniert, wenn die Platte zu voll wird. Liefert ein Server-Objekt." #. type: deffn -#: doc/guix.texi:6404 +#: doc/guix.texi:6402 msgid "@var{file} defaults to @var{%default-socket-path}, which is the normal location given the options that were passed to @command{configure}." msgstr "@var{Uri} nimmt standardmäßig den Wert von @var{%default-socket-path} an, was dem bei der Installation mit dem Aufruf von @command{configure} ausgewählten Vorgabeort entspricht, gemäß den Befehlszeilenoptionen, mit denen @command{configure} aufgerufen wurde." #. type: deffn -#: doc/guix.texi:6406 +#: doc/guix.texi:6404 #, no-wrap msgid "{Scheme Procedure} close-connection @var{server}" msgstr "{Scheme-Prozedur} close-connection @var{Server}" #. type: deffn -#: doc/guix.texi:6408 +#: doc/guix.texi:6406 msgid "Close the connection to @var{server}." msgstr "Die Verbindung zum @var{Server} trennen." #. type: defvr -#: doc/guix.texi:6410 +#: doc/guix.texi:6408 #, no-wrap msgid "{Scheme Variable} current-build-output-port" msgstr "{Scheme-Variable} current-build-output-port" #. type: defvr -#: doc/guix.texi:6413 +#: doc/guix.texi:6411 msgid "This variable is bound to a SRFI-39 parameter, which refers to the port where build and error logs sent by the daemon should be written." msgstr "Diese Variable ist an einen SRFI-39-Parameter gebunden, der auf den Scheme-Port verweist, an den vom Daemon empfangene Erstellungsprotokolle und Fehlerprotokolle geschrieben werden sollen." #. type: Plain text -#: doc/guix.texi:6417 +#: doc/guix.texi:6415 msgid "Procedures that make RPCs all take a server object as their first argument." msgstr "Prozeduren, die entfernte Prozeduraufrufe durchführen, nehmen immer ein Server-Objekt als ihr erstes Argument." #. type: deffn -#: doc/guix.texi:6418 +#: doc/guix.texi:6416 #, no-wrap msgid "{Scheme Procedure} valid-path? @var{server} @var{path}" msgstr "{Scheme-Prozedur} valid-path? @var{Server} @var{Pfad}" #. type: cindex -#: doc/guix.texi:6419 +#: doc/guix.texi:6417 #, no-wrap msgid "invalid store items" msgstr "ungültige Store-Objekte" #. type: deffn -#: doc/guix.texi:6424 +#: doc/guix.texi:6422 msgid "Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still be invalid, for instance because it is the result of an aborted or failed build.)" msgstr "Liefert @code{#t}, wenn der @var{Pfad} ein gültiges Store-Objekt benennt, und sonst @code{#f} (ein ungültiges Objekt kann auf der Platte gespeichert sein, tatsächlich aber ungültig sein, zum Beispiel weil es das Ergebnis einer abgebrochenen oder fehlgeschlagenen Erstellung ist)." #. type: deffn -#: doc/guix.texi:6427 +#: doc/guix.texi:6425 msgid "A @code{&store-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store})." msgstr "Ein @code{&store-protocol-error}-Fehlerzustand wird ausgelöst, wenn der @var{Pfad} nicht mit dem Store-Verzeichnis als Präfix beginnt (@file{/gnu/store})." #. type: deffn -#: doc/guix.texi:6429 +#: doc/guix.texi:6427 #, no-wrap msgid "{Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]" msgstr "{Scheme-Prozedur} add-text-to-store @var{Server} @var{Name} @var{Text} [@var{Referenzen}]" #. type: deffn -#: doc/guix.texi:6433 +#: doc/guix.texi:6431 msgid "Add @var{text} under file @var{name} in the store, and return its store path. @var{references} is the list of store paths referred to by the resulting store path." msgstr "Den @var{Text} im Store in einer Datei namens @var{Name} ablegen und ihren Store-Pfad zurückliefern. @var{Referenzen} ist die Liste der Store-Pfade, die der Store-Pfad dann referenzieren soll." #. type: deffn -#: doc/guix.texi:6435 +#: doc/guix.texi:6433 #, no-wrap msgid "{Scheme Procedure} build-derivations @var{server} @var{derivations}" msgstr "{Scheme-Prozedur} build-derivations @var{Server} @var{Ableitungen}" #. type: deffn -#: doc/guix.texi:6439 +#: doc/guix.texi:6437 msgid "Build @var{derivations} (a list of @code{} objects or derivation paths), and return when the worker is done building them. Return @code{#t} on success." msgstr "Die @var{Ableitungen} erstellen (eine Liste von @code{}-Objekten oder von Pfaden zu Ableitungen) und terminieren, sobald der Worker-Prozess mit dem Erstellen fertig ist. Liefert @code{#t} bei erfolgreicher Erstellung." #. type: Plain text -#: doc/guix.texi:6445 +#: doc/guix.texi:6443 msgid "Note that the @code{(guix monads)} module provides a monad as well as monadic versions of the above procedures, with the goal of making it more convenient to work with code that accesses the store (@pxref{The Store Monad})." msgstr "Es sei erwähnt, dass im Modul @code{(guix monads)} eine Monade sowie monadische Versionen obiger Prozeduren angeboten werden, damit an Code, der auf den Store zugreift, bequemer gearbeitet werden kann (siehe @ref{The Store Monad})." #. type: i{#1} -#: doc/guix.texi:6448 +#: doc/guix.texi:6446 msgid "This section is currently incomplete." msgstr "Dieser Abschnitt ist im Moment noch unvollständig." #. type: cindex -#: doc/guix.texi:6452 +#: doc/guix.texi:6450 #, no-wrap msgid "derivations" msgstr "Ableitungen" #. type: Plain text -#: doc/guix.texi:6456 +#: doc/guix.texi:6454 msgid "Low-level build actions and the environment in which they are performed are represented by @dfn{derivations}. A derivation contains the following pieces of information:" msgstr "Systemnahe Erstellungsaktionen sowie die Umgebung, in der selbige durchzuführen sind, werden durch @dfn{Ableitungen} dargestellt. Eine Ableitung enthält folgende Informationen:" #. type: itemize -#: doc/guix.texi:6461 +#: doc/guix.texi:6459 msgid "The outputs of the derivation---derivations produce at least one file or directory in the store, but may produce more." msgstr "Die Ausgaben, die die Ableitung hat. Ableitungen erzeugen mindestens eine Datei bzw. ein Verzeichnis im Store, können aber auch mehrere erzeugen." #. type: cindex -#: doc/guix.texi:6463 +#: doc/guix.texi:6461 #, no-wrap msgid "build-time dependencies" msgstr "Erstellungszeitabhängigkeiten" #. type: cindex -#: doc/guix.texi:6464 +#: doc/guix.texi:6462 #, no-wrap msgid "dependencies, build-time" msgstr "Abhängigkeiten zur Erstellungszeit" #. type: itemize -#: doc/guix.texi:6468 +#: doc/guix.texi:6466 msgid "The inputs of the derivations---i.e., its build-time dependencies---which may be other derivations or plain files in the store (patches, build scripts, etc.)" msgstr "Die Eingaben der Ableitung, also Abhängigkeiten zur Zeit ihrer Erstellung, die entweder andere Ableitungen oder einfache Dateien im Store sind (wie Patches, Erstellungsskripts usw.)." #. type: itemize -#: doc/guix.texi:6471 +#: doc/guix.texi:6469 msgid "The system type targeted by the derivation---e.g., @code{x86_64-linux}." msgstr "Das System, wofür mit der Ableitung erstellt wird, also ihr Ziel — z.B.@: @code{x86_64-linux}." #. type: itemize -#: doc/guix.texi:6475 +#: doc/guix.texi:6473 msgid "The file name of a build script in the store, along with the arguments to be passed." msgstr "Der Dateiname eines Erstellungsskripts im Store, zusammen mit den Argumenten, mit denen es aufgerufen werden soll." #. type: itemize -#: doc/guix.texi:6478 +#: doc/guix.texi:6476 msgid "A list of environment variables to be defined." msgstr "Eine Liste zu definierender Umgebungsvariabler." #. type: cindex -#: doc/guix.texi:6481 +#: doc/guix.texi:6479 #, no-wrap msgid "derivation path" msgstr "Ableitungspfad" #. type: Plain text -#: doc/guix.texi:6489 +#: doc/guix.texi:6487 msgid "Derivations allow clients of the daemon to communicate build actions to the store. They exist in two forms: as an in-memory representation, both on the client- and daemon-side, and as files in the store whose name end in @code{.drv}---these files are referred to as @dfn{derivation paths}. Derivations paths can be passed to the @code{build-derivations} procedure to perform the build actions they prescribe (@pxref{The Store})." msgstr "Ableitungen ermöglichen es den Clients des Daemons, diesem Erstellungsaktionen für den Store mitzuteilen. Es gibt davon zwei Arten, sowohl Darstellungen im Arbeitsspeicher jeweils für Client und Daemon, als auch Dateien im Store, deren Namen auf @code{.drv} enden — diese Dateien werden als @dfn{Ableitungspfade} bezeichnet. Ableitungspfade können an die Prozedur @code{build-derivations} übergeben werden, damit die darin niedergeschriebenen Erstellungsaktionen durchgeführt werden (siehe @ref{The Store})." #. type: cindex -#: doc/guix.texi:6490 +#: doc/guix.texi:6488 #, no-wrap msgid "fixed-output derivations" msgstr "Ableitungen mit fester Ausgabe" #. type: Plain text -#: doc/guix.texi:6497 +#: doc/guix.texi:6495 msgid "Operations such as file downloads and version-control checkouts for which the expected content hash is known in advance are modeled as @dfn{fixed-output derivations}. Unlike regular derivations, the outputs of a fixed-output derivation are independent of its inputs---e.g., a source code download produces the same result regardless of the download method and tools being used." msgstr "Operationen wie das Herunterladen von Dateien und Checkouts von unter Versionskontrolle stehenden Quelldateien, bei denen der Hash des Inhalts im Voraus bekannt ist, werden als @dfn{Ableitungen mit fester Ausgabe} modelliert. Anders als reguläre Ableitungen sind die Ausgaben von Ableitungen mit fester Ausgabe unabhängig von ihren Eingaben — z.B.@: liefert das Herunterladen desselben Quellcodes dasselbe Ergebnis unabhängig davon, mit welcher Methode und welchen Werkzeugen er heruntergeladen wurde." #. type: item -#: doc/guix.texi:6498 doc/guix.texi:9485 +#: doc/guix.texi:6496 doc/guix.texi:9483 #, no-wrap msgid "references" msgstr "references" #. type: cindex -#: doc/guix.texi:6499 +#: doc/guix.texi:6497 #, no-wrap msgid "run-time dependencies" msgstr "Laufzeitabhängigkeiten" #. type: cindex -#: doc/guix.texi:6500 +#: doc/guix.texi:6498 #, no-wrap msgid "dependencies, run-time" msgstr "Abhängigkeiten, zur Laufzeit" #. type: Plain text -#: doc/guix.texi:6507 +#: doc/guix.texi:6505 msgid "The outputs of derivations---i.e., the build results---have a set of @dfn{references}, as reported by the @code{references} RPC or the @command{guix gc --references} command (@pxref{Invoking guix gc}). References are the set of run-time dependencies of the build results. References are a subset of the inputs of the derivation; this subset is automatically computed by the build daemon by scanning all the files in the outputs." msgstr "Den Ausgaben von Ableitungen — d.h.@: Erstellungergebnissen — ist eine Liste von @dfn{Referenzen} zugeordnet, die auch der entfernte Prozeduraufruf @code{references} oder der Befehl @command{guix gc --references} liefert (siehe @ref{Invoking guix gc}). Referenzen sind die Menge der Laufzeitabhängigkeiten von Erstellungsergebnissen. Referenzen sind eine Teilmenge der Eingaben von Ableitungen; die Teilmenge wird automatisch ermittelt, indem der Erstellungsdaemon alle Dateien unter den Ausgaben nach Referenzen durchsucht." #. type: Plain text -#: doc/guix.texi:6512 +#: doc/guix.texi:6510 msgid "The @code{(guix derivations)} module provides a representation of derivations as Scheme objects, along with procedures to create and otherwise manipulate derivations. The lowest-level primitive to create a derivation is the @code{derivation} procedure:" msgstr "Das Modul @code{(guix derivations)} stellt eine Repräsentation von Ableitungen als Scheme-Objekte zur Verfügung, zusammen mit Prozeduren, um Ableitungen zu erzeugen und zu manipulieren. Die am wenigsten abstrahierte Methode, eine Ableitung zu erzeugen, ist mit der Prozedur @code{derivation}:" #. type: deffn -#: doc/guix.texi:6513 +#: doc/guix.texi:6511 #, no-wrap msgid "{Scheme Procedure} derivation @var{store} @var{name} @var{builder} @" msgstr "{Scheme-Prozedur} derivation @var{Store} @var{Name} @var{Ersteller} @" #. type: deffn -#: doc/guix.texi:6522 +#: doc/guix.texi:6520 msgid "@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:substitutable? #t] [#:properties '()] Build a derivation with the given arguments, and return the resulting @code{} object." msgstr "@var{Argumente} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:substitutable? #t] [#:properties '()] Eine Ableitungen mit den @var{Argumente}n erstellen und das resultierende @code{}-Objekt liefern." #. type: deffn -#: doc/guix.texi:6529 +#: doc/guix.texi:6527 msgid "When @var{hash} and @var{hash-algo} are given, a @dfn{fixed-output derivation} is created---i.e., one whose result is known in advance, such as a file download. If, in addition, @var{recursive?} is true, then that fixed output may be an executable file or a directory and @var{hash} must be the hash of an archive containing this output." msgstr "Wurden @var{hash} und @var{hash-algo} angegeben, wird eine @dfn{Ableitung mit fester Ausgabe} erzeugt — d.h.@: eine, deren Ausgabe schon im Voraus bekannt ist, wie z.B.@: beim Herunterladen einer Datei. Wenn des Weiteren auch @var{recursive?} wahr ist, darf die Ableitung mit fester Ausgabe eine ausführbare Datei oder ein Verzeichnis sein und @var{hash} muss die Prüfsumme eines Archivs mit dieser Ausgabe sein." #. type: deffn -#: doc/guix.texi:6534 +#: doc/guix.texi:6532 msgid "When @var{references-graphs} is true, it must be a list of file name/store path pairs. In that case, the reference graph of each store path is exported in the build environment in the corresponding file, in a simple text format." msgstr "Ist @var{references-graphs} wahr, dann muss es eine Liste von Paaren aus je einem Dateinamen und einem Store-Pfad sein. In diesem Fall wird der Referenzengraph jedes Store-Pfads in einer Datei mit dem angegebenen Namen in der Erstellungsumgebung zugänglich gemacht, in einem einfachen Text-Format." #. type: deffn -#: doc/guix.texi:6539 +#: doc/guix.texi:6537 msgid "When @var{allowed-references} is true, it must be a list of store items or outputs that the derivation's output may refer to. Likewise, @var{disallowed-references}, if true, must be a list of things the outputs may @emph{not} refer to." msgstr "Ist @var{allowed-references} ein wahr, muss es eine Liste von Store-Objekten oder Ausgaben sein, die die Ausgabe der Ableitung referenzieren darf. Ebenso muss @var{disallowed-references}, wenn es auf wahr gesetzt ist, eine Liste von Dingen bezeichnen, die die Ausgaben @emph{nicht} referenzieren dürfen." #. type: deffn -#: doc/guix.texi:6546 +#: doc/guix.texi:6544 msgid "When @var{leaked-env-vars} is true, it must be a list of strings denoting environment variables that are allowed to ``leak'' from the daemon's environment to the build environment. This is only applicable to fixed-output derivations---i.e., when @var{hash} is true. The main use is to allow variables such as @code{http_proxy} to be passed to derivations that download files." msgstr "Ist @var{leaked-env-vars} wahr, muss es eine Liste von Zeichenketten sein, die Umgebungsvariable benennen, die aus der Umgebung des Daemons in die Erstellungsumgebung überlaufen — ein „Leck“, englisch „leak“. Dies kann nur in Ableitungen mit fester Ausgabe benutzt werden, also wenn @var{hash} wahr ist. So ein Leck kann zum Beispiel benutzt werden, um Variable wie @code{http_proxy} an Ableitungen zu übergeben, die darüber Dateien herunterladen." #. type: deffn -#: doc/guix.texi:6551 +#: doc/guix.texi:6549 msgid "When @var{local-build?} is true, declare that the derivation is not a good candidate for offloading and should rather be built locally (@pxref{Daemon Offload Setup}). This is the case for small derivations where the costs of data transfers would outweigh the benefits." msgstr "Ist @var{local-build?} wahr, wird die Ableitung als schlechter Kandidat für das Auslagern deklariert, der besser lokal erstellt werden sollte (siehe @ref{Daemon Offload Setup}). Dies betrifft kleine Ableitungen, wo das Übertragen der Daten aufwendiger als ihre Erstellung ist." #. type: deffn -#: doc/guix.texi:6556 +#: doc/guix.texi:6554 msgid "When @var{substitutable?} is false, declare that substitutes of the derivation's output should not be used (@pxref{Substitutes}). This is useful, for instance, when building packages that capture details of the host CPU instruction set." msgstr "Ist @var{substitutable?} falsch, wird deklariert, dass für die Ausgabe der Ableitung keine Substitute benutzt werden sollen (siehe @ref{Substitutes}). Das ist nützlich, wenn Pakete erstellt werden, die Details über den Prozessorbefehlssatz des Wirtssystems auslesen." #. type: deffn -#: doc/guix.texi:6559 +#: doc/guix.texi:6557 msgid "@var{properties} must be an association list describing ``properties'' of the derivation. It is kept as-is, uninterpreted, in the derivation." msgstr "@var{properties} muss eine assoziative Liste enthalten, die „Eigenschaften“ der Ableitungen beschreibt. Sie wird genau so, wie sie ist, in der Ableitung gespeichert." #. type: Plain text -#: doc/guix.texi:6565 +#: doc/guix.texi:6563 msgid "Here's an example with a shell script as its builder, assuming @var{store} is an open connection to the daemon, and @var{bash} points to a Bash executable in the store:" msgstr "Hier ist ein Beispiel mit einem Shell-Skript, das als Ersteller benutzt wird. Es wird angenommen, dass @var{Store} eine offene Verbindung zum Daemon ist und @var{bash} auf eine ausführbare Bash im Store verweist:" #. type: lisp -#: doc/guix.texi:6570 +#: doc/guix.texi:6568 #, no-wrap msgid "" "(use-modules (guix utils)\n" @@ -12508,7 +12519,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:6579 +#: doc/guix.texi:6577 #, no-wrap msgid "" "(let ((builder ; add the Bash script to the store\n" @@ -12530,48 +12541,48 @@ msgstr "" "@result{} # /gnu/store/…-foo>\n" #. type: Plain text -#: doc/guix.texi:6586 +#: doc/guix.texi:6584 msgid "As can be guessed, this primitive is cumbersome to use directly. A better approach is to write build scripts in Scheme, of course! The best course of action for that is to write the build code as a ``G-expression'', and to pass it to @code{gexp->derivation}. For more information, @pxref{G-Expressions}." msgstr "Wie man sehen kann, ist es umständlich, diese grundlegende Methode direkt zu benutzen. Natürlich ist es besser, Erstellungsskripts in Scheme zu schreiben! Am besten schreibt man den Erstellungscode als „G-Ausdruck“ und übergibt ihn an @code{gexp->derivation}. Mehr Informationen finden Sie im Abschnitt @ref{G-Expressions}." #. type: Plain text -#: doc/guix.texi:6591 +#: doc/guix.texi:6589 msgid "Once upon a time, @code{gexp->derivation} did not exist and constructing derivations with build code written in Scheme was achieved with @code{build-expression->derivation}, documented below. This procedure is now deprecated in favor of the much nicer @code{gexp->derivation}." msgstr "Doch es gab einmal eine Zeit, zu der @code{gexp->derivation} noch nicht existiert hatte und wo das Zusammenstellen von Ableitungen mit Scheme-Erstellungscode noch mit @code{build-expression->derivation} bewerkstelligt wurde, was im Folgenden beschrieben wird. Diese Prozedur gilt als veraltet und man sollte nunmehr die viel schönere Prozedur @code{gexp->derivation} benutzen." #. type: deffn -#: doc/guix.texi:6592 +#: doc/guix.texi:6590 #, no-wrap msgid "{Scheme Procedure} build-expression->derivation @var{store} @" msgstr "{Scheme-Prozedur} build-expression->derivation @var{Store} @" #. type: deffn -#: doc/guix.texi:6608 +#: doc/guix.texi:6606 msgid "@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f] Return a derivation that executes Scheme expression @var{exp} as a builder for derivation @var{name}. @var{inputs} must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} is omitted, @code{\"out\"} is assumed. @var{modules} is a list of names of Guile modules from the current search path to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}." msgstr "@var{Name} @var{Ausdruck} @ [#:system (%current-system)] [#:inputs '()] @ [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f] Liefert eine Ableitung, die den Scheme-Ausdruck @var{Ausdruck} als Ersteller einer Ableitung namens @var{Name} ausführt. @var{inputs} muss die Liste der Eingaben enthalten, jeweils als Tupel @code{(Name Ableitungspfad Unterableitung)}; wird keine @var{Unterableitung} angegeben, wird @code{\"out\"} angenommen. @var{Module} ist eine Liste der Namen von Guile-Modulen im momentanen Suchpfad, die in den Store kopiert, kompiliert und zur Verfügung gestellt werden, wenn der @var{Ausdruck} ausgeführt wird — z.B.@: @code{((guix build utils) (guix build gnu-build-system))}." #. type: deffn -#: doc/guix.texi:6616 +#: doc/guix.texi:6614 msgid "@var{exp} is evaluated in an environment where @code{%outputs} is bound to a list of output/path pairs, and where @code{%build-inputs} is bound to a list of string/output-path pairs made from @var{inputs}. Optionally, @var{env-vars} is a list of string pairs specifying the name and value of environment variables visible to the builder. The builder terminates by passing the result of @var{exp} to @code{exit}; thus, when @var{exp} returns @code{#f}, the build is considered to have failed." msgstr "Der @var{Ausdruck} wird in einer Umgebung ausgewertet, in der @code{%outputs} an eine Liste von Ausgabe-/Pfad-Paaren gebunden wurde und in der @code{%build-inputs} an eine Liste von Zeichenkette-/Ausgabepfad-Paaren gebunden wurde, die aus den @var{inputs}-Eingaben konstruiert worden ist. Optional kann in @var{env-vars} eine Liste von Paaren aus Zeichenketten stehen, die Name und Wert von für den Ersteller sichtbaren Umgebungsvariablen angeben. Der Ersteller terminiert, indem er @code{exit} mit dem Ergebnis des @var{Ausdruck}s aufruft; wenn also der @var{Ausdruck} den Wert @code{#f} liefert, wird angenommen, dass die Erstellung fehlgeschlagen ist." #. type: deffn -#: doc/guix.texi:6620 +#: doc/guix.texi:6618 msgid "@var{exp} is built using @var{guile-for-build} (a derivation). When @var{guile-for-build} is omitted or is @code{#f}, the value of the @code{%guile-for-build} fluid is used instead." msgstr "@var{Ausdruck} wird mit einer Ableitung @var{guile-for-build} erstellt. Wird kein @var{guile-for-build} angegeben oder steht es auf @code{#f}, wird stattdessen der Wert der Fluiden @code{%guile-for-build} benutzt." #. type: deffn -#: doc/guix.texi:6625 +#: doc/guix.texi:6623 msgid "See the @code{derivation} procedure for the meaning of @var{references-graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-build?}, and @var{substitutable?}." msgstr "Siehe die Erklärungen zur Prozedur @code{derivation} für die Bedeutung von @var{references-graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-build?} und @var{substitutable?}." #. type: Plain text -#: doc/guix.texi:6630 +#: doc/guix.texi:6628 msgid "Here's an example of a single-output derivation that creates a directory containing one file:" msgstr "Hier ist ein Beispiel einer Ableitung mit nur einer Ausgabe, die ein Verzeichnis erzeugt, in dem eine einzelne Datei enthalten ist:" #. type: lisp -#: doc/guix.texi:6638 +#: doc/guix.texi:6636 #, no-wrap msgid "" "(let ((builder '(let ((out (assoc-ref %outputs \"out\")))\n" @@ -12592,51 +12603,51 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:6640 +#: doc/guix.texi:6638 #, no-wrap msgid "@result{} # @dots{}>\n" msgstr "@result{} # …>\n" #. type: cindex -#: doc/guix.texi:6646 +#: doc/guix.texi:6644 #, no-wrap msgid "monad" msgstr "Monade" #. type: Plain text -#: doc/guix.texi:6652 +#: doc/guix.texi:6650 msgid "The procedures that operate on the store described in the previous sections all take an open connection to the build daemon as their first argument. Although the underlying model is functional, they either have side effects or depend on the current state of the store." msgstr "Die auf dem Store arbeitenden Prozeduren, die in den vorigen Abschnitten beschrieben wurden, nehmen alle eine offene Verbindung zum Erstellungs-Daemon als ihr erstes Argument entgegen. Obwohl das ihnen zu Grunde liegende Modell funktional ist, weisen sie doch alle Nebenwirkungen auf oder hängen vom momentanen Zustand des Stores ab." #. type: Plain text -#: doc/guix.texi:6658 +#: doc/guix.texi:6656 msgid "The former is inconvenient: the connection to the build daemon has to be carried around in all those functions, making it impossible to compose functions that do not take that parameter with functions that do. The latter can be problematic: since store operations have side effects and/or depend on external state, they have to be properly sequenced." msgstr "Ersteres ist umständlich, weil die Verbindung zum Erstellungs-Daemon zwischen all diesen Funktionen durchgereicht werden muss, so dass eine Komposition mit Funktionen ohne diesen Parameter unmöglich wird. Letzteres kann problematisch sein, weil Operationen auf dem Store Nebenwirkungen und/oder Abhängigkeiten von externem Zustand haben und ihre Ausführungsreihenfolge deswegen eine Rolle spielt." #. type: cindex -#: doc/guix.texi:6659 +#: doc/guix.texi:6657 #, no-wrap msgid "monadic values" msgstr "monadische Werte" #. type: cindex -#: doc/guix.texi:6660 +#: doc/guix.texi:6658 #, no-wrap msgid "monadic functions" msgstr "monadische Funktionen" #. type: Plain text -#: doc/guix.texi:6670 +#: doc/guix.texi:6668 msgid "This is where the @code{(guix monads)} module comes in. This module provides a framework for working with @dfn{monads}, and a particularly useful monad for our uses, the @dfn{store monad}. Monads are a construct that allows two things: associating ``context'' with values (in our case, the context is the store), and building sequences of computations (here computations include accesses to the store). Values in a monad---values that carry this additional context---are called @dfn{monadic values}; procedures that return such values are called @dfn{monadic procedures}." msgstr "Hier kommt das Modul @code{(guix monads)} ins Spiel. Im Rahmen dieses Moduls können @dfn{Monaden} benutzt werden und dazu gehört insbesondere eine für unsere Zwecke sehr nützliche Monade, die @dfn{Store-Monade}. Monaden sind ein Konstrukt, mit dem zwei Dinge möglich sind: eine Assoziation von Werten mit einem „Kontext“ (in unserem Fall ist das die Verbindung zum Store) und das Festlegen einer Reihenfolge für Berechnungen (hiermit sind auch Zugriffe auf den Store gemeint). Werte in einer Monade — solche, die mit weiterem Kontext assoziiert sind — werden @dfn{monadische Werte} genannt; Prozeduren, die solche Werte liefern, heißen @dfn{monadische Prozeduren}." #. type: Plain text -#: doc/guix.texi:6672 +#: doc/guix.texi:6670 msgid "Consider this ``normal'' procedure:" msgstr "Betrachten Sie folgende „normale“ Prozedur:" #. type: example -#: doc/guix.texi:6681 +#: doc/guix.texi:6679 #, no-wrap msgid "" "(define (sh-symlink store)\n" @@ -12657,12 +12668,12 @@ msgstr "" " `(symlink ,sh %output))))\n" #. type: Plain text -#: doc/guix.texi:6685 +#: doc/guix.texi:6683 msgid "Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten as a monadic function:" msgstr "Unter Verwendung von @code{(guix monads)} und @code{(guix gexp)} lässt sie sich als monadische Funktion aufschreiben:" #. type: example -#: doc/guix.texi:6693 +#: doc/guix.texi:6691 #, no-wrap msgid "" "(define (sh-symlink)\n" @@ -12680,17 +12691,17 @@ msgstr "" " #$output))))\n" #. type: Plain text -#: doc/guix.texi:6700 +#: doc/guix.texi:6698 msgid "There are several things to note in the second version: the @code{store} parameter is now implicit and is ``threaded'' in the calls to the @code{package->derivation} and @code{gexp->derivation} monadic procedures, and the monadic value returned by @code{package->derivation} is @dfn{bound} using @code{mlet} instead of plain @code{let}." msgstr "An der zweiten Version lassen sich mehrere Dinge beobachten: Der Parameter @code{Store} ist jetzt implizit geworden und wurde in die Aufrufe der monadischen Prozeduren @code{package->derivation} und @code{gexp->derivation} „eingefädelt“ und der von @code{package->derivation} gelieferte monadische Wert wurde mit @code{mlet} statt einem einfachen @code{let} @dfn{gebunden}." #. type: Plain text -#: doc/guix.texi:6704 +#: doc/guix.texi:6702 msgid "As it turns out, the call to @code{package->derivation} can even be omitted since it will take place implicitly, as we will see later (@pxref{G-Expressions}):" msgstr "Wie sich herausstellt, muss man den Aufruf von @code{package->derivation} nicht einmal aufschreiben, weil er implizit geschieht, wie wir später sehen werden (siehe @ref{G-Expressions}):" #. type: example -#: doc/guix.texi:6710 +#: doc/guix.texi:6708 #, no-wrap msgid "" "(define (sh-symlink)\n" @@ -12704,12 +12715,12 @@ msgstr "" " #$output)))\n" #. type: Plain text -#: doc/guix.texi:6719 +#: doc/guix.texi:6717 msgid "Calling the monadic @code{sh-symlink} has no effect. As someone once said, ``you exit a monad like you exit a building on fire: by running''. So, to exit the monad and get the desired effect, one must use @code{run-with-store}:" msgstr "Die monadische @code{sh-symlink} einfach aufzurufen, bewirkt nichts. Wie jemand einst sagte: „Mit einer Monade geht man um, wie mit Gefangenen, gegen die man keine Beweise hat: Man muss sie laufen lassen.“ Um also aus der Monade auszubrechen und die gewünschte Wirkung zu erzielen, muss man @code{run-with-store} benutzen:" #. type: example -#: doc/guix.texi:6723 +#: doc/guix.texi:6721 #, no-wrap msgid "" "(run-with-store (open-connection) (sh-symlink))\n" @@ -12719,12 +12730,12 @@ msgstr "" "@result{} /gnu/store/…-sh-symlink\n" #. type: Plain text -#: doc/guix.texi:6729 +#: doc/guix.texi:6727 msgid "Note that the @code{(guix monad-repl)} module extends the Guile REPL with new ``meta-commands'' to make it easier to deal with monadic procedures: @code{run-in-store}, and @code{enter-store-monad}. The former is used to ``run'' a single monadic value through the store:" msgstr "Erwähnenswert ist, dass das Modul @code{(guix monad-repl)} die REPL von Guile um neue „Meta-Befehle“ erweitert, mit denen es leichter ist, mit monadischen Prozeduren umzugehen: @code{run-in-store} und @code{enter-store-monad}. Mit Ersterer wird ein einzelner monadischer Wert durch den Store „laufen gelassen“:" #. type: example -#: doc/guix.texi:6733 +#: doc/guix.texi:6731 #, no-wrap msgid "" "scheme@@(guile-user)> ,run-in-store (package->derivation hello)\n" @@ -12734,12 +12745,12 @@ msgstr "" "$1 = # …>\n" #. type: Plain text -#: doc/guix.texi:6737 +#: doc/guix.texi:6735 msgid "The latter enters a recursive REPL, where all the return values are automatically run through the store:" msgstr "Mit Letzterer wird rekursiv eine weitere REPL betreten, in der alle Rückgabewerte automatisch durch den Store laufen gelassen werden:" #. type: example -#: doc/guix.texi:6746 +#: doc/guix.texi:6744 #, no-wrap msgid "" "scheme@@(guile-user)> ,enter-store-monad\n" @@ -12759,50 +12770,50 @@ msgstr "" "scheme@@(guile-user)>\n" #. type: Plain text -#: doc/guix.texi:6751 +#: doc/guix.texi:6749 msgid "Note that non-monadic values cannot be returned in the @code{store-monad} REPL." msgstr "Beachten Sie, dass in einer @code{store-monad}-REPL keine nicht-monadischen Werte zurückgeliefert werden können." #. type: Plain text -#: doc/guix.texi:6754 +#: doc/guix.texi:6752 msgid "The main syntactic forms to deal with monads in general are provided by the @code{(guix monads)} module and are described below." msgstr "Die wichtigsten syntaktischen Formen, um mit Monaden im Allgemeinen umzugehen, werden im Modul @code{(guix monads)} bereitgestellt und sind im Folgenden beschrieben." #. type: deffn -#: doc/guix.texi:6755 +#: doc/guix.texi:6753 #, no-wrap msgid "{Scheme Syntax} with-monad @var{monad} @var{body} ..." msgstr "{Scheme-Syntax} with-monad @var{Monade} @var{Rumpf} ..." #. type: deffn -#: doc/guix.texi:6758 +#: doc/guix.texi:6756 msgid "Evaluate any @code{>>=} or @code{return} forms in @var{body} as being in @var{monad}." msgstr "Alle @code{>>=}- oder @code{return}-Formen im @var{Rumpf} in der @var{Monade} auswerten." #. type: deffn -#: doc/guix.texi:6760 +#: doc/guix.texi:6758 #, no-wrap msgid "{Scheme Syntax} return @var{val}" msgstr "{Scheme-Syntax} return @var{Wert}" #. type: deffn -#: doc/guix.texi:6762 +#: doc/guix.texi:6760 msgid "Return a monadic value that encapsulates @var{val}." msgstr "Einen monadischen Wert liefern, der den übergebenen @var{Wert} kapselt." #. type: deffn -#: doc/guix.texi:6764 +#: doc/guix.texi:6762 #, no-wrap msgid "{Scheme Syntax} >>= @var{mval} @var{mproc} ..." msgstr "{Scheme-Syntax} >>= @var{mWert} @var{mProz} ..." #. type: deffn -#: doc/guix.texi:6771 +#: doc/guix.texi:6769 msgid "@dfn{Bind} monadic value @var{mval}, passing its ``contents'' to monadic procedures @var{mproc}@dots{}@footnote{This operation is commonly referred to as ``bind'', but that name denotes an unrelated procedure in Guile. Thus we use this somewhat cryptic symbol inherited from the Haskell language.}. There can be one @var{mproc} or several of them, as in this example:" msgstr "Den monadischen Wert @var{mWert} @dfn{binden}, wobei sein „Inhalt“ an die monadischen Prozeduren @var{mProz}…@: übergeben wird@footnote{Diese Operation wird gemeinhin „bind“ genannt, aber mit diesem Begriff wird in Guile eine völlig andere Prozedur bezeichnet, die nichts damit zu tun hat. Also benutzen wir dieses etwas kryptische Symbol als Erbe der Haskell-Programmiersprache.}. Es kann eine einzelne @var{mProz} oder mehrere davon geben, wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:6779 +#: doc/guix.texi:6777 #, no-wrap msgid "" "(run-with-state\n" @@ -12822,7 +12833,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:6782 +#: doc/guix.texi:6780 #, no-wrap msgid "" "@result{} 4\n" @@ -12832,99 +12843,99 @@ msgstr "" "@result{} irgendein-Zustand\n" #. type: deffn -#: doc/guix.texi:6785 +#: doc/guix.texi:6783 #, no-wrap msgid "{Scheme Syntax} mlet @var{monad} ((@var{var} @var{mval}) ...) @" msgstr "{Scheme-Syntax} mlet @var{Monade} ((@var{Variable} @var{mWert}) ...) @" #. type: deffn -#: doc/guix.texi:6787 +#: doc/guix.texi:6785 msgid "@var{body} ..." msgstr "@var{Rumpf} ..." #. type: deffnx -#: doc/guix.texi:6787 +#: doc/guix.texi:6785 #, no-wrap msgid "{Scheme Syntax} mlet* @var{monad} ((@var{var} @var{mval}) ...) @" msgstr "{Scheme-Syntax} mlet* @var{Monade} ((@var{Variable} @var{mWert}) ...) @" #. type: deffn -#: doc/guix.texi:6799 +#: doc/guix.texi:6797 msgid "@var{body} ... Bind the variables @var{var} to the monadic values @var{mval} in @var{body}, which is a sequence of expressions. As with the bind operator, this can be thought of as ``unpacking'' the raw, non-monadic value ``contained'' in @var{mval} and making @var{var} refer to that raw, non-monadic value within the scope of the @var{body}. The form (@var{var} -> @var{val}) binds @var{var} to the ``normal'' value @var{val}, as per @code{let}. The binding operations occur in sequence from left to right. The last expression of @var{body} must be a monadic expression, and its result will become the result of the @code{mlet} or @code{mlet*} when run in the @var{monad}." msgstr "@var{Rumpf} ... Die @var{Variable}n an die monadischen Werte @var{mWert} im @var{Rumpf} binden, der eine Folge von Ausdrücken ist. Wie beim bind-Operator kann man es sich vorstellen als „Auspacken“ des rohen, nicht-monadischen Werts, der im @var{mWert} steckt, wobei anschließend dieser rohe, nicht-monadische Wert im Sichtbarkeitsbereich des @var{Rumpf}s von der @var{Variable}n bezeichnet wird. Die Form (@var{Variable} -> @var{Wert}) bindet die @var{Variable} an den „normalen“ @var{Wert}, wie es @code{let} tun würde. Die Bindungsoperation geschieht in der Reihenfolge von links nach rechts. Der letzte Ausdruck des @var{Rumpfs} muss ein monadischer Ausdruck sein und dessen Ergebnis wird das Ergebnis von @code{mlet} oder @code{mlet*} werden, wenn es durch die @var{Monad} laufen gelassen wurde." #. type: deffn -#: doc/guix.texi:6802 +#: doc/guix.texi:6800 msgid "@code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})." msgstr "@code{mlet*} verhält sich gegenüber @code{mlet} wie @code{let*} gegenüber @code{let} (siehe @ref{Local Bindings,,, guile, GNU Guile Reference Manual})." #. type: deffn -#: doc/guix.texi:6804 +#: doc/guix.texi:6802 #, no-wrap msgid "{Scheme System} mbegin @var{monad} @var{mexp} ..." msgstr "{Scheme-System} mbegin @var{Monade} @var{mAusdruck} ..." #. type: deffn -#: doc/guix.texi:6808 +#: doc/guix.texi:6806 msgid "Bind @var{mexp} and the following monadic expressions in sequence, returning the result of the last expression. Every expression in the sequence must be a monadic expression." msgstr "Der Reihe nach den @var{mAusdruck} und die nachfolgenden monadischen Ausdrücke binden und als Ergebnis das des letzten Ausdrucks liefern. Jeder Ausdruck in der Abfolge muss ein monadischer Ausdruck sein." #. type: deffn -#: doc/guix.texi:6812 +#: doc/guix.texi:6810 msgid "This is akin to @code{mlet}, except that the return values of the monadic expressions are ignored. In that sense, it is analogous to @code{begin}, but applied to monadic expressions." msgstr "Dies verhält sich ähnlich wie @code{mlet}, außer dass die Rückgabewerte der monadischen Prozeduren ignoriert werden. In diesem Sinn verhält es sich analog zu @code{begin}, nur auf monadischen Ausdrücken." #. type: deffn -#: doc/guix.texi:6814 +#: doc/guix.texi:6812 #, no-wrap msgid "{Scheme System} mwhen @var{condition} @var{mexp0} @var{mexp*} ..." msgstr "{Scheme-System} mwhen @var{Bedingung} @var{mAusdr0} @var{mAusdr*} ..." #. type: deffn -#: doc/guix.texi:6819 +#: doc/guix.texi:6817 msgid "When @var{condition} is true, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}. When @var{condition} is false, return @code{*unspecified*} in the current monad. Every expression in the sequence must be a monadic expression." msgstr "Wenn die @var{Bedingung} wahr ist, wird die Folge monadischer Ausdrücke @var{mAusdr0}..@var{mAusdr*} wie bei @code{mbegin} ausgewertet. Wenn die @var{Bedingung} falsch ist, wird @code{*unspecified*} in der momentanen Monade zurückgeliefert. Jeder Ausdruck in der Folge muss ein monadischer Ausdruck sein." #. type: deffn -#: doc/guix.texi:6821 +#: doc/guix.texi:6819 #, no-wrap msgid "{Scheme System} munless @var{condition} @var{mexp0} @var{mexp*} ..." msgstr "{Scheme-System} munless @var{Bedingung} @var{mAusdr0} @var{mAusdr*} ..." #. type: deffn -#: doc/guix.texi:6826 +#: doc/guix.texi:6824 msgid "When @var{condition} is false, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}. When @var{condition} is true, return @code{*unspecified*} in the current monad. Every expression in the sequence must be a monadic expression." msgstr "Wenn die @var{Bedingung} falsch ist, wird die Folge monadischer Ausdrücke @var{mAusdr0}..@var{mAusdr*} wie bei @code{mbegin} ausgewertet. Wenn die @var{Bedingung} wahr ist, wird @code{*unspecified*} in der momentanen Monade zurückgeliefert. Jeder Ausdruck in der Folge muss ein monadischer Ausdruck sein." #. type: cindex -#: doc/guix.texi:6828 +#: doc/guix.texi:6826 #, no-wrap msgid "state monad" msgstr "Zustandsmonade" #. type: Plain text -#: doc/guix.texi:6832 +#: doc/guix.texi:6830 msgid "The @code{(guix monads)} module provides the @dfn{state monad}, which allows an additional value---the state---to be @emph{threaded} through monadic procedure calls." msgstr "Das Modul @code{(guix monads)} macht die @dfn{Zustandsmonade} (englisch „state monad“) verfügbar, mit der ein zusätzlicher Wert — der Zustand — durch die monadischen Prozeduraufrufe @emph{gefädelt} werden kann." #. type: defvr -#: doc/guix.texi:6833 +#: doc/guix.texi:6831 #, no-wrap msgid "{Scheme Variable} %state-monad" msgstr "{Scheme-Variable} %state-monad" #. type: defvr -#: doc/guix.texi:6836 +#: doc/guix.texi:6834 msgid "The state monad. Procedures in the state monad can access and change the state that is threaded." msgstr "Die Zustandsmonade. Prozeduren in der Zustandsmonade können auf den gefädelten Zustand zugreifen und ihn verändern." #. type: defvr -#: doc/guix.texi:6840 +#: doc/guix.texi:6838 msgid "Consider the example below. The @code{square} procedure returns a value in the state monad. It returns the square of its argument, but also increments the current state value:" msgstr "Betrachten Sie das folgende Beispiel. Die Prozedur @code{Quadrat} liefert einen Wert in der Zustandsmonade zurück. Sie liefert das Quadrat ihres Arguments, aber sie inkrementiert auch den momentanen Zustandswert:" #. type: example -#: doc/guix.texi:6847 +#: doc/guix.texi:6845 #, no-wrap msgid "" "(define (square x)\n" @@ -12942,7 +12953,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:6851 +#: doc/guix.texi:6849 #, no-wrap msgid "" "(run-with-state (sequence %state-monad (map square (iota 3))) 0)\n" @@ -12954,147 +12965,147 @@ msgstr "" "@result{} 3\n" #. type: defvr -#: doc/guix.texi:6855 +#: doc/guix.texi:6853 msgid "When ``run'' through @var{%state-monad}, we obtain that additional state value, which is the number of @code{square} calls." msgstr "Wird das „durch“ die Zustandsmonade @var{%state-monad} laufen gelassen, erhalten wir jenen zusätzlichen Zustandswert, der der Anzahl der Aufrufe von @code{Quadrat} entspricht." #. type: deffn -#: doc/guix.texi:6857 +#: doc/guix.texi:6855 #, no-wrap msgid "{Monadic Procedure} current-state" msgstr "{Monadische Prozedur} current-state" #. type: deffn -#: doc/guix.texi:6859 +#: doc/guix.texi:6857 msgid "Return the current state as a monadic value." msgstr "Liefert den momentanen Zustand als einen monadischen Wert." #. type: deffn -#: doc/guix.texi:6861 +#: doc/guix.texi:6859 #, no-wrap msgid "{Monadic Procedure} set-current-state @var{value}" msgstr "{Monadische Prozedur} set-current-state @var{Wert}" #. type: deffn -#: doc/guix.texi:6864 +#: doc/guix.texi:6862 msgid "Set the current state to @var{value} and return the previous state as a monadic value." msgstr "Setzt den momentanen Zustand auf @var{Wert} und liefert den vorherigen Zustand als einen monadischen Wert." #. type: deffn -#: doc/guix.texi:6866 +#: doc/guix.texi:6864 #, no-wrap msgid "{Monadic Procedure} state-push @var{value}" msgstr "{Monadische Prozedur} state-push @var{Wert}" #. type: deffn -#: doc/guix.texi:6869 +#: doc/guix.texi:6867 msgid "Push @var{value} to the current state, which is assumed to be a list, and return the previous state as a monadic value." msgstr "Hängt den @var{Wert} vorne an den momentanen Zustand an, der eine Liste sein muss. Liefert den vorherigen Zustand als monadischen Wert." #. type: deffn -#: doc/guix.texi:6871 +#: doc/guix.texi:6869 #, no-wrap msgid "{Monadic Procedure} state-pop" msgstr "{Monadische Prozedur} state-pop" #. type: deffn -#: doc/guix.texi:6874 +#: doc/guix.texi:6872 msgid "Pop a value from the current state and return it as a monadic value. The state is assumed to be a list." msgstr "Entfernt einen Wert vorne vom momentanen Zustand und liefert ihn als monadischen Wert zurück. Dabei wird angenommen, dass es sich beim Zustand um eine Liste handelt." #. type: deffn -#: doc/guix.texi:6876 +#: doc/guix.texi:6874 #, no-wrap msgid "{Scheme Procedure} run-with-state @var{mval} [@var{state}]" msgstr "{Scheme-Prozedur} run-with-state @var{mWert} [@var{Zustand}]" #. type: deffn -#: doc/guix.texi:6879 +#: doc/guix.texi:6877 msgid "Run monadic value @var{mval} starting with @var{state} as the initial state. Return two values: the resulting value, and the resulting state." msgstr "Den monadischen Wert @var{mWert} mit @var{Zustand} als initialem Zustand laufen lassen. Dies liefert zwei Werte: den Ergebniswert und den Ergebniszustand." #. type: Plain text -#: doc/guix.texi:6883 +#: doc/guix.texi:6881 msgid "The main interface to the store monad, provided by the @code{(guix store)} module, is as follows." msgstr "Die zentrale Schnittstelle zur Store-Monade, wie sie vom Modul @code{(guix store)} angeboten wird, ist die Folgende:" #. type: defvr -#: doc/guix.texi:6884 +#: doc/guix.texi:6882 #, no-wrap msgid "{Scheme Variable} %store-monad" msgstr "{Scheme-Variable} %store-monad" #. type: defvr -#: doc/guix.texi:6886 +#: doc/guix.texi:6884 msgid "The store monad---an alias for @var{%state-monad}." msgstr "Die Store-Monade — ein anderer Name für @var{%state-monad}." #. type: defvr -#: doc/guix.texi:6890 +#: doc/guix.texi:6888 msgid "Values in the store monad encapsulate accesses to the store. When its effect is needed, a value of the store monad must be ``evaluated'' by passing it to the @code{run-with-store} procedure (see below.)" msgstr "Werte in der Store-Monade kapseln Zugriffe auf den Store. Sobald seine Wirkung gebraucht wird, muss ein Wert der Store-Monade „ausgewertet“ werden, indem er an die Prozedur @code{run-with-store} übergeben wird (siehe unten)." #. type: deffn -#: doc/guix.texi:6892 +#: doc/guix.texi:6890 #, no-wrap msgid "{Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]" msgstr "{Scheme-Prozedur} run-with-store @var{Store} @var{mWert} [#:guile-for-build] [#:system (%current-system)]" #. type: deffn -#: doc/guix.texi:6895 +#: doc/guix.texi:6893 msgid "Run @var{mval}, a monadic value in the store monad, in @var{store}, an open store connection." msgstr "Den @var{mWert}, einen monadischen Wert in der Store-Monade, in der offenen Verbindung @var{Store} laufen lassen." #. type: deffn -#: doc/guix.texi:6897 +#: doc/guix.texi:6895 #, no-wrap msgid "{Monadic Procedure} text-file @var{name} @var{text} [@var{references}]" msgstr "{Monadische Prozedur} text-file @var{Name} @var{Text} [@var{Referenzen}]" #. type: deffn -#: doc/guix.texi:6901 +#: doc/guix.texi:6899 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{text}, a string. @var{references} is a list of store items that the resulting text file refers to; it defaults to the empty list." msgstr "Als monadischen Wert den absoluten Dateinamen im Store für eine Datei liefern, deren Inhalt der der Zeichenkette @var{Text} ist. @var{Referenzen} ist dabei eine Liste von Store-Objekten, die die Ergebnis-Textdatei referenzieren wird; der Vorgabewert ist die leere Liste." #. type: deffn -#: doc/guix.texi:6903 +#: doc/guix.texi:6901 #, no-wrap msgid "{Monadic Procedure} binary-file @var{name} @var{data} [@var{references}]" msgstr "{Monadische Prozedur} binary-file @var{Name} @var{Daten} [@var{Referenzen}]" #. type: deffn -#: doc/guix.texi:6907 +#: doc/guix.texi:6905 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{data}, a bytevector. @var{references} is a list of store items that the resulting binary file refers to; it defaults to the empty list." msgstr "Den absoluten Dateinamen im Store als monadischen Wert für eine Datei liefern, deren Inhalt der des Byte-Vektors @var{Daten} ist. @var{Referenzen} ist dabei eine Liste von Store-Objekten, die die Ergebnis-Binärdatei referenzieren wird; der Vorgabewert ist die leere Liste." #. type: deffn -#: doc/guix.texi:6909 +#: doc/guix.texi:6907 #, no-wrap msgid "{Monadic Procedure} interned-file @var{file} [@var{name}] @" msgstr "{Monadische Prozedur} interned-file @var{Datei} [@var{Name}] @" #. type: deffn -#: doc/guix.texi:6914 +#: doc/guix.texi:6912 msgid "[#:recursive? #t] [#:select? (const #t)] Return the name of @var{file} once interned in the store. Use @var{name} as its store name, or the basename of @var{file} if @var{name} is omitted." msgstr "[#:recursive? #t] [#:select? (const #t)] Liefert den Namen der @var{Datei}, nachdem sie in den Store interniert wurde. Dabei wird der @var{Name} als ihr Store-Name verwendet, oder, wenn kein @var{Name} angegeben wurde, der Basisname der @var{Datei}." #. type: deffn -#: doc/guix.texi:6918 doc/guix.texi:7331 +#: doc/guix.texi:6916 doc/guix.texi:7329 msgid "When @var{recursive?} is true, the contents of @var{file} are added recursively; if @var{file} designates a flat file and @var{recursive?} is true, its contents are added, and its permission bits are kept." msgstr "Ist @var{recursive?} wahr, werden in der @var{Datei} enthaltene Dateien rekursiv hinzugefügt; ist die @var{Datei} eine flache Datei und @var{recursive?} ist wahr, wird ihr Inhalt in den Store eingelagert und ihre Berechtigungs-Bits übernommen." #. type: deffn -#: doc/guix.texi:6923 doc/guix.texi:7336 +#: doc/guix.texi:6921 doc/guix.texi:7334 msgid "When @var{recursive?} is true, call @code{(@var{select?} @var{file} @var{stat})} for each directory entry, where @var{file} is the entry's absolute file name and @var{stat} is the result of @code{lstat}; exclude entries for which @var{select?} does not return true." msgstr "Steht @var{recursive?} auf wahr, wird @code{(@var{select?} @var{Datei} @var{Stat})} für jeden Verzeichniseintrag aufgerufen, wobei @var{Datei} der absolute Dateiname und @var{Stat} das Ergebnis von @code{lstat} ist, außer auf den Einträgen, wo @var{select?} keinen wahren Wert liefert." #. type: deffn -#: doc/guix.texi:6925 +#: doc/guix.texi:6923 msgid "The example below adds a file to the store, under two different names:" msgstr "Folgendes Beispiel fügt eine Datei unter zwei verschiedenen Namen in den Store ein:" #. type: example -#: doc/guix.texi:6931 +#: doc/guix.texi:6929 #, no-wrap msgid "" "(run-with-store (open-connection)\n" @@ -13110,115 +13121,115 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:6933 +#: doc/guix.texi:6931 #, no-wrap msgid "@result{} (\"/gnu/store/rwm@dots{}-README\" \"/gnu/store/44i@dots{}-LEGU-MIN\")\n" msgstr "@result{} (\"/gnu/store/rwm…-README\" \"/gnu/store/44i…-LEGU-MIN\")\n" #. type: Plain text -#: doc/guix.texi:6939 +#: doc/guix.texi:6937 msgid "The @code{(guix packages)} module exports the following package-related monadic procedures:" msgstr "Das Modul @code{(guix packages)} exportiert die folgenden paketbezogenen monadischen Prozeduren:" #. type: deffn -#: doc/guix.texi:6940 +#: doc/guix.texi:6938 #, no-wrap msgid "{Monadic Procedure} package-file @var{package} [@var{file}] @" msgstr "{Monadische Prozedur} package-file @var{Paket} [@var{Datei}] @" #. type: deffn -#: doc/guix.texi:6948 +#: doc/guix.texi:6946 msgid "[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Return as a monadic value in the absolute file name of @var{file} within the @var{output} directory of @var{package}. When @var{file} is omitted, return the name of the @var{output} directory of @var{package}. When @var{target} is true, use it as a cross-compilation target triplet." msgstr "[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Liefert als monadischen Wert den absoluten Dateinamen der @var{Datei} innerhalb des Ausgabeverzeichnisses @var{output} des @var{Paket}s. Wird keine @var{Datei} angegeben, wird der Name des Ausgabeverzeichnisses @var{output} für das @var{Paket} zurückgeliefert. Ist @var{target} wahr, wird sein Wert als das Zielsystem bezeichnendes Tripel zum Cross-Kompilieren benutzt." #. type: deffn -#: doc/guix.texi:6950 +#: doc/guix.texi:6948 #, no-wrap msgid "{Monadic Procedure} package->derivation @var{package} [@var{system}]" msgstr "{Monadische Prozedur} package->derivation @var{Paket} [@var{System}]" #. type: deffnx -#: doc/guix.texi:6951 +#: doc/guix.texi:6949 #, no-wrap msgid "{Monadic Procedure} package->cross-derivation @var{package} @" msgstr "{Monadische Prozedur} package->cross-derivation @var{Paket} @" #. type: deffn -#: doc/guix.texi:6955 +#: doc/guix.texi:6953 msgid "@var{target} [@var{system}] Monadic version of @code{package-derivation} and @code{package-cross-derivation} (@pxref{Defining Packages})." msgstr "@var{Ziel} [@var{System}] Monadische Version von @code{package-derivation} und @code{package-cross-derivation} (siehe @ref{Defining Packages})." #. type: cindex -#: doc/guix.texi:6961 +#: doc/guix.texi:6959 #, no-wrap msgid "G-expression" msgstr "G-Ausdruck" #. type: cindex -#: doc/guix.texi:6962 +#: doc/guix.texi:6960 #, no-wrap msgid "build code quoting" msgstr "Erstellungscode maskieren" #. type: Plain text -#: doc/guix.texi:6968 +#: doc/guix.texi:6966 msgid "So we have ``derivations'', which represent a sequence of build actions to be performed to produce an item in the store (@pxref{Derivations}). These build actions are performed when asking the daemon to actually build the derivations; they are run by the daemon in a container (@pxref{Invoking guix-daemon})." msgstr "Es gibt also „Ableitungen“, die eine Abfolge von Erstellungsaktionen repräsentieren, die durchgeführt werden müssen, um ein Objekt im Store zu erzeugen (siehe @ref{Derivations}). Diese Erstellungsaktionen werden durchgeführt, nachdem der Daemon gebeten wurde, die Ableitungen tatsächlich zu erstellen; dann führt der Daemon sie in einer isolierten Umgebung (einem sogenannten Container) aus (siehe @ref{Invoking guix-daemon})." #. type: cindex -#: doc/guix.texi:6969 +#: doc/guix.texi:6967 #, no-wrap msgid "strata of code" msgstr "Schichten von Code" #. type: Plain text -#: doc/guix.texi:6981 +#: doc/guix.texi:6979 msgid "It should come as no surprise that we like to write these build actions in Scheme. When we do that, we end up with two @dfn{strata} of Scheme code@footnote{The term @dfn{stratum} in this context was coined by Manuel Serrano et al.@: in the context of their work on Hop. Oleg Kiselyov, who has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on this topic}, refers to this kind of code generation as @dfn{staging}.}: the ``host code''---code that defines packages, talks to the daemon, etc.---and the ``build code''---code that actually performs build actions, such as making directories, invoking @command{make}, etc." msgstr "Wenig überraschend ist, dass wir diese Erstellungsaktionen gerne in Scheme schreiben würden. Wenn wir das tun, bekommen wir zwei verschiedene @dfn{Schichten} von Scheme-Code@footnote{Der Begriff @dfn{Schicht}, englisch Stratum, wurde in diesem Kontext von Manuel Serrano et al.@: in ihrer Arbeit an Hop geprägt. Oleg Kiselyov, der aufschlussreiche @url{http://okmij.org/ftp/meta-programming/#meta-scheme, Essays und Code zu diesem Thema} geschrieben hat, nennt diese Art der Code-Generierung @dfn{Staging}, deutsch etwa Inszenierung bzw.@: Aufführung.}: den „wirtsseitigen Code“ („host code“) — also Code, der Pakete definiert, mit dem Daemon kommuniziert etc.@: — und den „erstellungsseitigen Code“ („build code“) — also Code, der die Erstellungsaktionen auch wirklich umsetzt, indem Dateien erstellt werden, @command{make} aufgerufen wird etc." #. type: Plain text -#: doc/guix.texi:6988 +#: doc/guix.texi:6986 msgid "To describe a derivation and its build actions, one typically needs to embed build code inside host code. It boils down to manipulating build code as data, and the homoiconicity of Scheme---code has a direct representation as data---comes in handy for that. But we need more than the normal @code{quasiquote} mechanism in Scheme to construct build expressions." msgstr "Um eine Ableitung und ihre Erstellungsaktionen zu beschreiben, muss man normalerweise erstellungsseitigen Code im wirtsseitigen Code einbetten. Das bedeutet, man behandelt den erstellungsseitigen Code als Daten, was wegen der Homoikonizität von Scheme — dass Code genauso als Daten repräsentiert werden kann — sehr praktisch ist. Doch brauchen wir hier mehr als nur den normalen Quasimaskierungsmechanismus mit @code{quasiquote} in Scheme, wenn wir Erstellungsausdrücke konstruieren möchten." #. type: Plain text -#: doc/guix.texi:6997 +#: doc/guix.texi:6995 msgid "The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of S-expressions adapted to build expressions. G-expressions, or @dfn{gexps}, consist essentially of three syntactic forms: @code{gexp}, @code{ungexp}, and @code{ungexp-splicing} (or simply: @code{#~}, @code{#$}, and @code{#$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and @code{unquote-splicing}, respectively (@pxref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}). However, there are major differences:" msgstr "Das Modul @code{(guix gexp)} implementiert @dfn{G-Ausdrücke}, eine Form von S-Ausdrücken, die zu Erstellungsausdrücken angepasst wurden. G-Ausdrücke (englisch „G-expressions“, kurz @dfn{Gexps}) setzen sich grundlegend aus drei syntaktischen Formen zusammen: @code{gexp}, @code{ungexp} und @code{ungexp-splicing} (alternativ einfach: @code{#~}, @code{#$} und @code{#$@@}), die jeweils mit @code{quasiquote}, @code{unquote} und @code{unquote-splicing} vergleichbar sind (siehe @ref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}). Es gibt aber auch erhebliche Unterschiede:" #. type: itemize -#: doc/guix.texi:7002 +#: doc/guix.texi:7000 msgid "Gexps are meant to be written to a file and run or manipulated by other processes." msgstr "G-Ausdrücke sind dafür gedacht, in eine Datei geschrieben zu werden, wo sie von anderen Prozessen ausgeführt oder manipuliert werden können." #. type: itemize -#: doc/guix.texi:7007 +#: doc/guix.texi:7005 msgid "When a high-level object such as a package or derivation is unquoted inside a gexp, the result is as if its output file name had been introduced." msgstr "Wenn ein abstraktes Objekt wie ein Paket oder eine Ableitung innerhalb eines G-Ausdrücks demaskiert wird, ist das Ergebnis davon dasselbe, wie wenn dessen Ausgabedateiname genannt worden wäre." #. type: itemize -#: doc/guix.texi:7012 +#: doc/guix.texi:7010 msgid "Gexps carry information about the packages or derivations they refer to, and these dependencies are automatically added as inputs to the build processes that use them." msgstr "G-Ausdrücke tragen Informationen über die Pakete oder Ableitungen mit sich, auf die sie sich beziehen, und diese Abhängigkeiten werden automatisch zu den sie benutzenden Erstellungsprozessen als Eingaben hinzugefügt." #. type: cindex -#: doc/guix.texi:7014 doc/guix.texi:7518 +#: doc/guix.texi:7012 doc/guix.texi:7516 #, no-wrap msgid "lowering, of high-level objects in gexps" msgstr "Herunterbrechen, von abstrakten Objekten in G-Ausdrücken" #. type: Plain text -#: doc/guix.texi:7024 +#: doc/guix.texi:7022 msgid "This mechanism is not limited to package and derivation objects: @dfn{compilers} able to ``lower'' other high-level objects to derivations or files in the store can be defined, such that these objects can also be inserted into gexps. For example, a useful type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and to refer to them in derivations and such (see @code{local-file} and @code{plain-file} below.)" msgstr "Dieser Mechanismus ist nicht auf Pakete und Ableitung beschränkt: Es können @dfn{Compiler} definiert werden, die weitere abstrakte, hochsprachliche Objekte auf Ableitungen oder Dateien im Store „herunterbrechen“, womit diese Objekte dann auch in G-Ausdrücken eingefügt werden können. Zum Beispiel sind „dateiartige Objekte“ ein nützlicher Typ solcher abstrakter Objekte. Mit ihnen können Dateien leicht in den Store eingefügt und von Ableitungen und anderem referenziert werden (siehe unten @code{local-file} und @code{plain-file})." #. type: Plain text -#: doc/guix.texi:7026 +#: doc/guix.texi:7024 msgid "To illustrate the idea, here is an example of a gexp:" msgstr "Zur Veranschaulichung dieser Idee soll uns dieses Beispiel eines G-Ausdrucks dienen:" #. type: example -#: doc/guix.texi:7034 +#: doc/guix.texi:7032 #, no-wrap msgid "" "(define build-exp\n" @@ -13236,34 +13247,34 @@ msgstr "" " \"list-files\")))\n" #. type: Plain text -#: doc/guix.texi:7039 +#: doc/guix.texi:7037 msgid "This gexp can be passed to @code{gexp->derivation}; we obtain a derivation that builds a directory containing exactly one symlink to @file{/gnu/store/@dots{}-coreutils-8.22/bin/ls}:" msgstr "Indem wir diesen G-Ausdruck an @code{gexp->derivation} übergeben, bekommen wir eine Ableitung, die ein Verzeichnis mit genau einer symbolischen Verknüpfung auf @file{/gnu/store/…-coreutils-8.22/bin/ls} erstellt:" #. type: example -#: doc/guix.texi:7042 +#: doc/guix.texi:7040 #, no-wrap msgid "(gexp->derivation \"the-thing\" build-exp)\n" msgstr "(gexp->derivation \"das-ding\" build-exp)\n" #. type: Plain text -#: doc/guix.texi:7050 +#: doc/guix.texi:7048 msgid "As one would expect, the @code{\"/gnu/store/@dots{}-coreutils-8.22\"} string is substituted to the reference to the @var{coreutils} package in the actual build code, and @var{coreutils} is automatically made an input to the derivation. Likewise, @code{#$output} (equivalent to @code{(ungexp output)}) is replaced by a string containing the directory name of the output of the derivation." msgstr "Wie man es erwarten würde, wird die Zeichenkette @code{\"/gnu/store/…-coreutils-8.22\"} anstelle der Referenzen auf das Paket @var{coreutils} im eigentlichen Erstellungscode eingefügt und @var{coreutils} automatisch zu einer Eingabe der Ableitung gemacht. Genauso wird auch @code{#$output} (was äquivalent zur Schreibweise @code{(ungexp output)} ist) ersetzt durch eine Zeichenkette mit dem Namen der Ausgabe der Ableitung." #. type: cindex -#: doc/guix.texi:7051 +#: doc/guix.texi:7049 #, no-wrap msgid "cross compilation" msgstr "Cross-Kompilieren" #. type: Plain text -#: doc/guix.texi:7057 +#: doc/guix.texi:7055 msgid "In a cross-compilation context, it is useful to distinguish between references to the @emph{native} build of a package---that can run on the host---versus references to cross builds of a package. To that end, the @code{#+} plays the same role as @code{#$}, but is a reference to a native package build:" msgstr "Im Kontext der Cross-Kompilierung bietet es sich an, zwischen Referenzen auf die @emph{native} Erstellung eines Pakets — also der, die auf dem Wirtssystem ausgeführt werden kann — und Referenzen auf Cross-Erstellungen eines Pakets zu unterscheiden. Hierfür spielt @code{#+} dieselbe Rolle wie @code{#$}, steht aber für eine Referenz auf eine native Paketerstellung." #. type: example -#: doc/guix.texi:7067 +#: doc/guix.texi:7065 #, no-wrap msgid "" "(gexp->derivation \"vi\"\n" @@ -13285,29 +13296,29 @@ msgstr "" " #:target \"mips64el-linux-gnu\")\n" #. type: Plain text -#: doc/guix.texi:7073 +#: doc/guix.texi:7071 msgid "In the example above, the native build of @var{coreutils} is used, so that @command{ln} can actually run on the host; but then the cross-compiled build of @var{emacs} is referenced." msgstr "Im obigen Beispiel wird die native Erstellung der @var{coreutils} benutzt, damit @command{ln} tatsächlich auf dem Wirtssystem ausgeführt werden kann, aber danach die cross-kompilierte Erstellung von @var{emacs} referenziert." #. type: cindex -#: doc/guix.texi:7074 +#: doc/guix.texi:7072 #, no-wrap msgid "imported modules, for gexps" msgstr "importierte Module, in G-Ausdrücken" #. type: findex -#: doc/guix.texi:7075 +#: doc/guix.texi:7073 #, no-wrap msgid "with-imported-modules" msgstr "with-imported-modules" #. type: Plain text -#: doc/guix.texi:7080 +#: doc/guix.texi:7078 msgid "Another gexp feature is @dfn{imported modules}: sometimes you want to be able to use certain Guile modules from the ``host environment'' in the gexp, so those modules should be imported in the ``build environment''. The @code{with-imported-modules} form allows you to express that:" msgstr "Eine weitere Funktionalität von G-Ausdrücken stellen @dfn{importierte Module} dar. Manchmal will man bestimmte Guile-Module von der „wirtsseitigen Umgebung“ im G-Ausdruck benutzen können, deswegen sollten diese Module in die „erstellungsseitige Umgebung“ importiert werden. Die @code{with-imported-modules}-Form macht das möglich:" #. type: example -#: doc/guix.texi:7091 +#: doc/guix.texi:7089 #, no-wrap msgid "" "(let ((build (with-imported-modules '((guix build utils))\n" @@ -13331,29 +13342,29 @@ msgstr "" " #t)))\n" #. type: Plain text -#: doc/guix.texi:7097 +#: doc/guix.texi:7095 msgid "In this example, the @code{(guix build utils)} module is automatically pulled into the isolated build environment of our gexp, such that @code{(use-modules (guix build utils))} works as expected." msgstr "In diesem Beispiel wird das Modul @code{(guix build utils)} automatisch in die isolierte Erstellungsumgebung unseres G-Ausdrucks geholt, so dass @code{(use-modules (guix build utils))} wie erwartet funktioniert." #. type: cindex -#: doc/guix.texi:7098 +#: doc/guix.texi:7096 #, no-wrap msgid "module closure" msgstr "Modulabschluss" #. type: findex -#: doc/guix.texi:7099 +#: doc/guix.texi:7097 #, no-wrap msgid "source-module-closure" msgstr "source-module-closure" #. type: Plain text -#: doc/guix.texi:7106 +#: doc/guix.texi:7104 msgid "Usually you want the @emph{closure} of the module to be imported---i.e., the module itself and all the modules it depends on---rather than just the module; failing to do that, attempts to use the module will fail because of missing dependent modules. The @code{source-module-closure} procedure computes the closure of a module by looking at its source file headers, which comes in handy in this case:" msgstr "Normalerweise möchten Sie, dass der @emph{Abschluss} eines Moduls importiert wird — also das Modul und alle Module, von denen es abhängt — statt nur das Modul selbst. Ansonsten scheitern Versuche, das Modul zu benutzen, weil seine Modulabhängigkeiten fehlen. Die Prozedur @code{source-module-closure} berechnet den Abschluss eines Moduls, indem es den Kopf seiner Quelldatei analysiert, deswegen schafft die Prozedur hier Abhilfe:" #. type: example -#: doc/guix.texi:7109 +#: doc/guix.texi:7107 #, no-wrap msgid "" "(use-modules (guix modules)) ;for 'source-module-closure'\n" @@ -13363,7 +13374,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:7118 +#: doc/guix.texi:7116 #, no-wrap msgid "" "(with-imported-modules (source-module-closure\n" @@ -13385,24 +13396,24 @@ msgstr "" " …)))\n" #. type: cindex -#: doc/guix.texi:7120 +#: doc/guix.texi:7118 #, no-wrap msgid "extensions, for gexps" msgstr "Erweiterungen, für G-Ausdrücke" #. type: findex -#: doc/guix.texi:7121 +#: doc/guix.texi:7119 #, no-wrap msgid "with-extensions" msgstr "with-extensions" #. type: Plain text -#: doc/guix.texi:7126 +#: doc/guix.texi:7124 msgid "In the same vein, sometimes you want to import not just pure-Scheme modules, but also ``extensions'' such as Guile bindings to C libraries or other ``full-blown'' packages. Say you need the @code{guile-json} package available on the build side, here's how you would do it:" msgstr "Auf die gleiche Art können Sie auch vorgehen, wenn Sie nicht bloß reine Scheme-Module importieren möchten, sondern auch „Erweiterungen“ wie Guile-Anbindungen von C-Bibliotheken oder andere „vollumfängliche“ Pakete. Sagen wir, Sie bräuchten das Paket @code{guile-json} auf der Erstellungsseite, dann könnten Sie es hiermit bekommen:" #. type: example -#: doc/guix.texi:7129 +#: doc/guix.texi:7127 #, no-wrap msgid "" "(use-modules (gnu packages guile)) ;for 'guile-json'\n" @@ -13412,7 +13423,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:7135 +#: doc/guix.texi:7133 #, no-wrap msgid "" "(with-extensions (list guile-json)\n" @@ -13428,184 +13439,184 @@ msgstr "" " …)))\n" #. type: Plain text -#: doc/guix.texi:7138 +#: doc/guix.texi:7136 msgid "The syntactic form to construct gexps is summarized below." msgstr "Die syntaktische Form, in der G-Ausdrücke konstruiert werden, ist im Folgenden zusammengefasst." #. type: deffn -#: doc/guix.texi:7139 +#: doc/guix.texi:7137 #, no-wrap msgid "{Scheme Syntax} #~@var{exp}" msgstr "{Scheme-Syntax} #~@var{Ausdruck}" #. type: deffnx -#: doc/guix.texi:7140 +#: doc/guix.texi:7138 #, no-wrap msgid "{Scheme Syntax} (gexp @var{exp})" msgstr "{Scheme-Syntax} (gexp @var{Ausdruck})" #. type: deffn -#: doc/guix.texi:7143 +#: doc/guix.texi:7141 msgid "Return a G-expression containing @var{exp}. @var{exp} may contain one or more of the following forms:" msgstr "Liefert einen G-Ausdruck, der den @var{Ausdruck} enthält. Der @var{Ausdruck} kann eine oder mehrere der folgenden Formen enthalten:" #. type: item -#: doc/guix.texi:7145 +#: doc/guix.texi:7143 #, no-wrap msgid "#$@var{obj}" msgstr "#$@var{Objekt}" #. type: itemx -#: doc/guix.texi:7146 +#: doc/guix.texi:7144 #, no-wrap msgid "(ungexp @var{obj})" msgstr "(ungexp @var{Objekt})" #. type: table -#: doc/guix.texi:7151 +#: doc/guix.texi:7149 msgid "Introduce a reference to @var{obj}. @var{obj} may have one of the supported types, for example a package or a derivation, in which case the @code{ungexp} form is replaced by its output file name---e.g., @code{\"/gnu/store/@dots{}-coreutils-8.22}." msgstr "Eine Referenz auf das @var{Objekt} einführen. Das @var{Objekt} kann einen der unterstützten Typen haben, zum Beispiel ein Paket oder eine Ableitung, so dass die @code{ungexp}-Form durch deren Ausgabedateiname ersetzt wird — z.B.@: @code{\"/gnu/store/…-coreutils-8.22}." #. type: table -#: doc/guix.texi:7154 +#: doc/guix.texi:7152 msgid "If @var{obj} is a list, it is traversed and references to supported objects are substituted similarly." msgstr "Wenn das @var{Objekt} eine Liste ist, wird diese durchlaufen und alle unterstützten Objekte darin auf diese Weise ersetzt." #. type: table -#: doc/guix.texi:7157 +#: doc/guix.texi:7155 msgid "If @var{obj} is another gexp, its contents are inserted and its dependencies are added to those of the containing gexp." msgstr "Wenn das @var{Objekt} ein anderer G-Ausdruck ist, wird sein Inhalt eingefügt und seine Abhängigkeiten zu denen des äußeren G-Ausdrucks hinzugefügt." #. type: table -#: doc/guix.texi:7159 +#: doc/guix.texi:7157 msgid "If @var{obj} is another kind of object, it is inserted as is." msgstr "Wenn das @var{Objekt} eine andere Art von Objekt ist, wird es so wie es ist eingefügt." #. type: item -#: doc/guix.texi:7160 +#: doc/guix.texi:7158 #, no-wrap msgid "#$@var{obj}:@var{output}" msgstr "#$@var{Objekt}:@var{Ausgabe}" #. type: itemx -#: doc/guix.texi:7161 +#: doc/guix.texi:7159 #, no-wrap msgid "(ungexp @var{obj} @var{output})" msgstr "(ungexp @var{Objekt} @var{Ausgabe})" #. type: table -#: doc/guix.texi:7165 +#: doc/guix.texi:7163 msgid "This is like the form above, but referring explicitly to the @var{output} of @var{obj}---this is useful when @var{obj} produces multiple outputs (@pxref{Packages with Multiple Outputs})." msgstr "Dies verhält sich wie die Form oben, bezieht sich aber ausdrücklich auf die angegebene @var{Ausgabe} des @var{Objekt}s — dies ist nützlich, wenn das @var{Objekt} mehrere Ausgaben generiert (siehe @ref{Packages with Multiple Outputs})." #. type: item -#: doc/guix.texi:7166 +#: doc/guix.texi:7164 #, no-wrap msgid "#+@var{obj}" msgstr "#+@var{Objekt}" #. type: itemx -#: doc/guix.texi:7167 +#: doc/guix.texi:7165 #, no-wrap msgid "#+@var{obj}:output" msgstr "#+@var{Objekt}:@var{Ausgabe}" #. type: itemx -#: doc/guix.texi:7168 +#: doc/guix.texi:7166 #, no-wrap msgid "(ungexp-native @var{obj})" msgstr "(ungexp-native @var{Objekt})" #. type: itemx -#: doc/guix.texi:7169 +#: doc/guix.texi:7167 #, no-wrap msgid "(ungexp-native @var{obj} @var{output})" msgstr "(ungexp-native @var{Objekt} @var{Ausgabe})" #. type: table -#: doc/guix.texi:7172 +#: doc/guix.texi:7170 msgid "Same as @code{ungexp}, but produces a reference to the @emph{native} build of @var{obj} when used in a cross compilation context." msgstr "Das Gleiche wie @code{ungexp}, jedoch wird im Kontext einer Cross-Kompilierung eine Referenz auf die @emph{native} Erstellung des @var{Objekt}s eingefügt." #. type: item -#: doc/guix.texi:7173 +#: doc/guix.texi:7171 #, no-wrap msgid "#$output[:@var{output}]" msgstr "#$output[:@var{Ausgabe}]" #. type: itemx -#: doc/guix.texi:7174 +#: doc/guix.texi:7172 #, no-wrap msgid "(ungexp output [@var{output}])" msgstr "(ungexp output [@var{Ausgabe}])" #. type: table -#: doc/guix.texi:7177 +#: doc/guix.texi:7175 msgid "Insert a reference to derivation output @var{output}, or to the main output when @var{output} is omitted." msgstr "Fügt eine Referenz auf die angegebene @var{Ausgabe} dieser Ableitung ein, oder auf die Hauptausgabe, wenn keine @var{Ausgabe} angegeben wurde." #. type: table -#: doc/guix.texi:7179 +#: doc/guix.texi:7177 msgid "This only makes sense for gexps passed to @code{gexp->derivation}." msgstr "Dies ist nur bei G-Ausdrücken sinnvoll, die an @code{gexp->derivation} übergeben werden." #. type: item -#: doc/guix.texi:7180 +#: doc/guix.texi:7178 #, no-wrap msgid "#$@@@var{lst}" msgstr "#$@@@var{Liste}" #. type: itemx -#: doc/guix.texi:7181 +#: doc/guix.texi:7179 #, no-wrap msgid "(ungexp-splicing @var{lst})" msgstr "(ungexp-splicing @var{Liste})" #. type: table -#: doc/guix.texi:7184 +#: doc/guix.texi:7182 msgid "Like the above, but splices the contents of @var{lst} inside the containing list." msgstr "Das Gleiche wie oben, jedoch wird nur der Inhalt der @var{Liste} in die äußere Liste eingespleißt." #. type: item -#: doc/guix.texi:7185 +#: doc/guix.texi:7183 #, no-wrap msgid "#+@@@var{lst}" msgstr "#+@@@var{Liste}" #. type: itemx -#: doc/guix.texi:7186 +#: doc/guix.texi:7184 #, no-wrap msgid "(ungexp-native-splicing @var{lst})" msgstr "(ungexp-native-splicing @var{Liste})" #. type: table -#: doc/guix.texi:7189 +#: doc/guix.texi:7187 msgid "Like the above, but refers to native builds of the objects listed in @var{lst}." msgstr "Das Gleiche, aber referenziert werden native Erstellungen der Objekte in der @var{Liste}." #. type: deffn -#: doc/guix.texi:7194 +#: doc/guix.texi:7192 msgid "G-expressions created by @code{gexp} or @code{#~} are run-time objects of the @code{gexp?} type (see below.)" msgstr "G-Ausdrücke, die mit @code{gexp} oder @code{#~} erzeugt wurden, sind zur Laufzeit Objekte vom Typ @code{gexp?} (siehe unten)." #. type: deffn -#: doc/guix.texi:7196 +#: doc/guix.texi:7194 #, no-wrap msgid "{Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{}" msgstr "{Scheme-Syntax} with-imported-modules @var{Module} @var{Rumpf}…" #. type: deffn -#: doc/guix.texi:7199 +#: doc/guix.texi:7197 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{modules} in their execution environment." msgstr "Markiert die in @var{Rumpf}…@: definierten G-Ausdrücke, dass sie in ihrer Ausführungsumgebung die angegebenen @var{Module} brauchen." #. type: deffn -#: doc/guix.texi:7203 +#: doc/guix.texi:7201 msgid "Each item in @var{modules} can be the name of a module, such as @code{(guix build utils)}, or it can be a module name, followed by an arrow, followed by a file-like object:" msgstr "Jedes Objekt unter den @var{Module}n kann der Name eines Moduls wie @code{(guix build utils)} sein, oder es kann nacheinander ein Modulname, ein Pfeil und ein dateiartiges Objekt sein:" #. type: example -#: doc/guix.texi:7209 +#: doc/guix.texi:7207 #, no-wrap msgid "" "`((guix build utils)\n" @@ -13619,80 +13630,80 @@ msgstr "" " #~(define-module …))))\n" #. type: deffn -#: doc/guix.texi:7214 +#: doc/guix.texi:7212 msgid "In the example above, the first two modules are taken from the search path, and the last one is created from the given file-like object." msgstr "Im Beispiel oben werden die ersten beiden Module vom Suchpfad genommen und das letzte aus dem angegebenen dateiartigen Objekt erzeugt." #. type: deffn -#: doc/guix.texi:7218 +#: doc/guix.texi:7216 msgid "This form has @emph{lexical} scope: it has an effect on the gexps directly defined in @var{body}@dots{}, but not on those defined, say, in procedures called from @var{body}@dots{}." msgstr "Diese Form hat einen @emph{lexikalischen} Sichtbarkeitsbereich: Sie wirkt sich auf die direkt in @var{Rumpf}…@: definierten G-Ausdrücke aus, aber nicht auf jene, die, sagen wir, in aus @var{Rumpf}…@: heraus aufgerufenen Prozeduren definiert wurden." #. type: deffn -#: doc/guix.texi:7220 +#: doc/guix.texi:7218 #, no-wrap msgid "{Scheme Syntax} with-extensions @var{extensions} @var{body}@dots{}" msgstr "{Scheme-Syntax} with-extensions @var{Erweiterungen} @var{Rumpf}…" #. type: deffn -#: doc/guix.texi:7225 +#: doc/guix.texi:7223 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{extensions} in their build and execution environment. @var{extensions} is typically a list of package objects such as those defined in the @code{(gnu packages guile)} module." msgstr "Markiert die in @var{Rumpf}…@: definierten G-Ausdrücke, dass sie @var{Erweiterungen} in ihrer Erstellungs- und Ausführungsumgebung benötigen. @var{Erweiterungen} sind typischerweise eine Liste von Paketobjekten wie zum Beispiel die im Modul @code{(gnu packages guile)} definierten." #. type: deffn -#: doc/guix.texi:7230 +#: doc/guix.texi:7228 msgid "Concretely, the packages listed in @var{extensions} are added to the load path while compiling imported modules in @var{body}@dots{}; they are also added to the load path of the gexp returned by @var{body}@dots{}." msgstr "Konkret werden die unter den @var{Erweiterungen} aufgeführten Pakete zum Ladepfad hinzugefügt, während die in @var{Rumpf}…@: aufgeführten importierten Module kompiliert werden und sie werden auch zum Ladepfad des von @var{Rumpf}…@: gelieferten G-Ausdrucks hinzugefügt." #. type: deffn -#: doc/guix.texi:7232 +#: doc/guix.texi:7230 #, no-wrap msgid "{Scheme Procedure} gexp? @var{obj}" msgstr "{Scheme-Prozedur} gexp? @var{Objekt}" #. type: deffn -#: doc/guix.texi:7234 +#: doc/guix.texi:7232 msgid "Return @code{#t} if @var{obj} is a G-expression." msgstr "Liefert @code{#t}, wenn das @var{Objekt} ein G-Ausdruck ist." #. type: Plain text -#: doc/guix.texi:7240 +#: doc/guix.texi:7238 msgid "G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store. The monadic procedures below allow you to do that (@pxref{The Store Monad}, for more information about monads.)" msgstr "G-Ausdrücke sind dazu gedacht, auf die Platte geschrieben zu werden, entweder als Code, der eine Ableitung erstellt, oder als einfache Dateien im Store. Die monadischen Prozeduren unten ermöglichen Ihnen das (siehe @ref{The Store Monad}, wenn Sie mehr Informationen über Monaden suchen)." #. type: deffn -#: doc/guix.texi:7241 +#: doc/guix.texi:7239 #, no-wrap msgid "{Monadic Procedure} gexp->derivation @var{name} @var{exp} @" msgstr "{Monadische Prozedur} gexp->derivation @var{Name} @var{Ausdruck} @" #. type: deffn -#: doc/guix.texi:7259 +#: doc/guix.texi:7257 msgid "[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:module-path @var{%load-path}] @ [#:effective-version \"2.2\"] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] [#:substitutable? #t] @ [#:properties '()] [#:guile-for-build #f] Return a derivation @var{name} that runs @var{exp} (a gexp) with @var{guile-for-build} (a derivation) on @var{system}; @var{exp} is stored in a file called @var{script-name}. When @var{target} is true, it is used as the cross-compilation target triplet for packages referred to by @var{exp}." msgstr "[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:module-path @var{%load-path}] @ [#:effective-version \"2.2\"] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{Name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] [#:substitutable? #t] @ [#:properties '()] [#:guile-for-build #f] Liefert eine Ableitung unter dem @var{Name}n, die jeden @var{Ausdruck} (ein G-Ausdruck) mit @var{guile-for-build} (eine Ableitung) für das @var{System} erstellt; der @var{Ausdruck} wird dabei in einer Datei namens @var{script-name} gespeichert. Wenn „@var{target}“ wahr ist, wird es beim Cross-Kompilieren als Zieltripel für mit @var{Ausdruck} bezeichnete Pakete benutzt." #. type: deffn -#: doc/guix.texi:7267 +#: doc/guix.texi:7265 msgid "@var{modules} is deprecated in favor of @code{with-imported-modules}. Its meaning is to make @var{modules} available in the evaluation context of @var{exp}; @var{modules} is a list of names of Guile modules searched in @var{module-path} to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}." msgstr "@var{modules} gilt als veraltet; stattdessen sollte @code{with-imported-modules} benutzt werden. Die Bedeutung ist, dass die @var{Module} im Ausführungskontext des @var{Ausdruck}s verfügbar gemacht werden; @var{modules} ist dabei eine Liste von Namen von Guile-Modulen, die im Modulpfad @var{module-path} gesucht werden, um sie in den Store zu kopieren, zu kompilieren und im Ladepfad während der Ausführung des @var{Ausdruck}s verfügbar zu machen — z.B.@: @code{((guix build utils) (guix build gnu-build-system))}." #. type: deffn -#: doc/guix.texi:7270 +#: doc/guix.texi:7268 msgid "@var{effective-version} determines the string to use when adding extensions of @var{exp} (see @code{with-extensions}) to the search path---e.g., @code{\"2.2\"}." msgstr "@var{effective-version} bestimmt, unter welcher Zeichenkette die Erweiterungen des @var{Ausdruck}s zum Suchpfad hinzugefügt werden (siehe @code{with-extensions}) — z.B.@: @code{\"2.2\"}." #. type: deffn -#: doc/guix.texi:7273 +#: doc/guix.texi:7271 msgid "@var{graft?} determines whether packages referred to by @var{exp} should be grafted when applicable." msgstr "@var{graft?} bestimmt, ob vom @var{Ausdruck} benannte Pakete veredelt werden sollen, falls Veredelungen zur Verfügung stehen." #. type: deffn -#: doc/guix.texi:7276 +#: doc/guix.texi:7274 msgid "When @var{references-graphs} is true, it must be a list of tuples of one of the following forms:" msgstr "Ist @var{references-graphs} wahr, muss es eine Liste von Tupeln in einer der folgenden Formen sein:" #. type: example -#: doc/guix.texi:7283 +#: doc/guix.texi:7281 #, no-wrap msgid "" "(@var{file-name} @var{package})\n" @@ -13708,38 +13719,38 @@ msgstr "" "(@var{Dateiname} @var{Store-Objekt})\n" #. type: deffn -#: doc/guix.texi:7289 +#: doc/guix.texi:7287 msgid "The right-hand-side of each element of @var{references-graphs} is automatically made an input of the build process of @var{exp}. In the build environment, each @var{file-name} contains the reference graph of the corresponding item, in a simple text format." msgstr "Bei jedem Element von @var{references-graphs} wird das rechts Stehende automatisch zu einer Eingabe des Erstellungsprozesses vom @var{Ausdruck} gemacht. In der Erstellungsumgebung enthält das, was mit @var{Dateiname} bezeichnet wird, den Referenzgraphen des entsprechenden Objekts in einem einfachen Textformat." #. type: deffn -#: doc/guix.texi:7295 +#: doc/guix.texi:7293 msgid "@var{allowed-references} must be either @code{#f} or a list of output names and packages. In the latter case, the list denotes store items that the result is allowed to refer to. Any reference to another store item will lead to a build error. Similarly for @var{disallowed-references}, which can list items that must not be referenced by the outputs." msgstr "@var{allowed-references} muss entweder @code{#f} oder eine Liste von Ausgabenamen und Paketen sein. Eine solche Liste benennt Store-Objekte, die das Ergebnis referenzieren darf. Jede Referenz auf ein nicht dort aufgeführtes Store-Objekt löst einen Erstellungsfehler aus. Genauso funktioniert @var{disallowed-references}, was eine Liste von Objekten sein kann, die von den Ausgaben nicht referenziert werden dürfen." #. type: deffn -#: doc/guix.texi:7298 +#: doc/guix.texi:7296 msgid "@var{deprecation-warnings} determines whether to show deprecation warnings while compiling modules. It can be @code{#f}, @code{#t}, or @code{'detailed}." msgstr "@var{deprecation-warnings} bestimmt, ob beim Kompilieren von Modulen Warnungen angezeigt werden sollen, wenn auf als veraltet markierten Code zugegriffen wird („deprecation warnings“). @var{deprecation-warnings} kann @code{#f}, @code{#t} oder @code{'detailed} (detailliert) sein." #. type: deffn -#: doc/guix.texi:7300 +#: doc/guix.texi:7298 msgid "The other arguments are as for @code{derivation} (@pxref{Derivations})." msgstr "Die anderen Argumente verhalten sich wie bei @code{derivation} (siehe @ref{Derivations})." #. type: cindex -#: doc/guix.texi:7302 +#: doc/guix.texi:7300 #, no-wrap msgid "file-like objects" msgstr "dateiartige Objekte" #. type: Plain text -#: doc/guix.texi:7307 +#: doc/guix.texi:7305 msgid "The @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file}, and @code{scheme-file} procedures below return @dfn{file-like objects}. That is, when unquoted in a G-expression, these objects lead to a file in the store. Consider this G-expression:" msgstr "Die im Folgenden erklärten Prozeduren @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file} und @code{scheme-file} liefern @dfn{dateiartige Objekte}. Das bedeutet, dass diese Objekte, wenn sie in einem G-Ausdruck demaskiert werden, zu einer Datei im Store führen. Betrachten Sie zum Beispiel diesen G-Ausdruck:" #. type: example -#: doc/guix.texi:7311 +#: doc/guix.texi:7309 #, no-wrap msgid "" "#~(system* #$(file-append glibc \"/sbin/nscd\") \"-f\"\n" @@ -13749,76 +13760,76 @@ msgstr "" " #$(local-file \"/tmp/my-nscd.conf\"))\n" #. type: Plain text -#: doc/guix.texi:7320 +#: doc/guix.texi:7318 msgid "The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it to the store. Once expanded, for instance @i{via} @code{gexp->derivation}, the G-expression refers to that copy under @file{/gnu/store}; thus, modifying or removing the file in @file{/tmp} does not have any effect on what the G-expression does. @code{plain-file} can be used similarly; it differs in that the file content is directly passed as a string." msgstr "Der Effekt hiervon ist, dass @file{/tmp/my-nscd.conf} „interniert“ wird, indem es in den Store kopiert wird. Sobald er umgeschrieben wurde, zum Beispiel über @code{gexp->derivation}, referenziert der G-Ausdruck diese Kopie im @file{/gnu/store}. Die Datei in @file{/tmp} zu bearbeiten oder zu löschen, hat dann keinen Effekt mehr darauf, was der G-Ausdruck tut. @code{plain-file} kann in ähnlicher Weise benutzt werden, es unterscheidet sich aber darin, dass dort der Prozedur der Inhalt der Datei als eine Zeichenkette übergeben wird." #. type: deffn -#: doc/guix.texi:7321 +#: doc/guix.texi:7319 #, no-wrap msgid "{Scheme Procedure} local-file @var{file} [@var{name}] @" msgstr "{Scheme-Prozedur} local-file @var{Datei} [@var{Name}] @" #. type: deffn -#: doc/guix.texi:7327 +#: doc/guix.texi:7325 msgid "[#:recursive? #f] [#:select? (const #t)] Return an object representing local file @var{file} to add to the store; this object can be used in a gexp. If @var{file} is a relative file name, it is looked up relative to the source file where this form appears. @var{file} will be added to the store under @var{name}--by default the base name of @var{file}." msgstr "[#:recursive? #f] [#:select? (const #t)] Liefert ein Objekt, dass die lokale Datei @var{Datei} repräsentiert und sie zum Store hinzufügen lässt; dieses Objekt kann in einem G-Ausdruck benutzt werden. Wurde für die @var{Datei} ein relativer Dateiname angegeben, wird sie relativ zur Quelldatei gesucht, in der diese Form steht. Die @var{Datei} wird unter dem angegebenen @var{Name}n im Store abgelegt — als Vorgabe wird dabei der Basisname der @var{Datei} genommen." #. type: deffn -#: doc/guix.texi:7339 +#: doc/guix.texi:7337 msgid "This is the declarative counterpart of the @code{interned-file} monadic procedure (@pxref{The Store Monad, @code{interned-file}})." msgstr "Dies ist das deklarative Gegenstück zur monadischen Prozedur @code{interned-file} (siehe @ref{The Store Monad, @code{interned-file}})." #. type: deffn -#: doc/guix.texi:7341 +#: doc/guix.texi:7339 #, no-wrap msgid "{Scheme Procedure} plain-file @var{name} @var{content}" msgstr "{Scheme-Prozedur} plain-file @var{Name} @var{Inhalt}" #. type: deffn -#: doc/guix.texi:7344 +#: doc/guix.texi:7342 msgid "Return an object representing a text file called @var{name} with the given @var{content} (a string or a bytevector) to be added to the store." msgstr "Liefert ein Objekt, das eine Textdatei mit dem angegebenen @var{Name}n repräsentiert, die den angegebenen @var{Inhalt} hat (eine Zeichenkette oder ein Bytevektor), welche zum Store hinzugefügt werden soll." #. type: deffn -#: doc/guix.texi:7346 +#: doc/guix.texi:7344 msgid "This is the declarative counterpart of @code{text-file}." msgstr "Dies ist das deklarative Gegenstück zu @code{text-file}." #. type: deffn -#: doc/guix.texi:7348 +#: doc/guix.texi:7346 #, no-wrap msgid "{Scheme Procedure} computed-file @var{name} @var{gexp} @" msgstr "{Scheme-Prozedur} computed-file @var{Name} @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:7353 +#: doc/guix.texi:7351 msgid "[#:options '(#:local-build? #t)] Return an object representing the store item @var{name}, a file or directory computed by @var{gexp}. @var{options} is a list of additional arguments to pass to @code{gexp->derivation}." msgstr "[#:options '(#:local-build? #t)] Liefert ein Objekt, das das Store-Objekt mit dem @var{Name}n repräsentiert, eine Datei oder ein Verzeichnis, das vom @var{G-Ausdruck} berechnet wurde. @var{options} ist eine Liste zusätzlicher Argumente, die an @code{gexp->derivation} übergeben werden." #. type: deffn -#: doc/guix.texi:7355 +#: doc/guix.texi:7353 msgid "This is the declarative counterpart of @code{gexp->derivation}." msgstr "Dies ist das deklarative Gegenstück zu @code{gexp->derivation}." #. type: deffn -#: doc/guix.texi:7357 +#: doc/guix.texi:7355 #, no-wrap msgid "{Monadic Procedure} gexp->script @var{name} @var{exp} @" msgstr "{Monadische Prozedur} gexp->script @var{Name} @var{Ausdruck} @" #. type: deffn -#: doc/guix.texi:7362 +#: doc/guix.texi:7360 msgid "[#:guile (default-guile)] [#:module-path %load-path] Return an executable script @var{name} that runs @var{exp} using @var{guile}, with @var{exp}'s imported modules in its search path. Look up @var{exp}'s modules in @var{module-path}." msgstr "[#:guile (default-guile)] [#:module-path %load-path] Liefert ein ausführbares Skript namens @var{Name}, das den @var{Ausdruck} mit dem angegebenen @var{guile} ausführt, wobei vom @var{Ausdruck} importierte Module in seinem Suchpfad stehen. Die Module des @var{Ausdruck}s werden dazu im Modulpfad @var{module-path} gesucht." #. type: deffn -#: doc/guix.texi:7365 +#: doc/guix.texi:7363 msgid "The example below builds a script that simply invokes the @command{ls} command:" msgstr "Folgendes Beispiel erstellt ein Skript, das einfach nur den Befehl @command{ls} ausführt:" #. type: example -#: doc/guix.texi:7368 +#: doc/guix.texi:7366 #, no-wrap msgid "" "(use-modules (guix gexp) (gnu packages base))\n" @@ -13828,7 +13839,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:7372 +#: doc/guix.texi:7370 #, no-wrap msgid "" "(gexp->script \"list-files\"\n" @@ -13840,12 +13851,12 @@ msgstr "" " \"ls\"))\n" #. type: deffn -#: doc/guix.texi:7377 +#: doc/guix.texi:7375 msgid "When ``running'' it through the store (@pxref{The Store Monad, @code{run-with-store}}), we obtain a derivation that produces an executable file @file{/gnu/store/@dots{}-list-files} along these lines:" msgstr "Lässt man es durch den Store „laufen“ (siehe @ref{The Store Monad, @code{run-with-store}}), erhalten wir eine Ableitung, die eine ausführbare Datei @file{/gnu/store/…-list-files} generiert, ungefähr so:" #. type: example -#: doc/guix.texi:7382 +#: doc/guix.texi:7380 #, no-wrap msgid "" "#!/gnu/store/@dots{}-guile-2.0.11/bin/guile -ds\n" @@ -13857,76 +13868,76 @@ msgstr "" "(execl \"/gnu/store/…-coreutils-8.22\"/bin/ls\" \"ls\")\n" #. type: deffn -#: doc/guix.texi:7385 +#: doc/guix.texi:7383 #, no-wrap msgid "{Scheme Procedure} program-file @var{name} @var{exp} @" msgstr "{Scheme-Prozedur} program-file @var{Name} @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:7390 +#: doc/guix.texi:7388 msgid "[#:guile #f] [#:module-path %load-path] Return an object representing the executable store item @var{name} that runs @var{gexp}. @var{guile} is the Guile package used to execute that script. Imported modules of @var{gexp} are looked up in @var{module-path}." msgstr "[#:guile #f] [#:module-path %load-path] Liefert ein Objekt, das eine ausführbare Store-Datei @var{Name} repräsentiert, die den @var{G-Ausdruck} ausführt. @var{guile} ist das zu verwendende Guile-Paket, mit dem das Skript ausgeführt werden kann. Importierte Module des @var{G-Ausdruck}s werden im Modulpfad @var{module-path} gesucht." #. type: deffn -#: doc/guix.texi:7392 +#: doc/guix.texi:7390 msgid "This is the declarative counterpart of @code{gexp->script}." msgstr "Dies ist das deklarative Gegenstück zu @code{gexp->script}." #. type: deffn -#: doc/guix.texi:7394 +#: doc/guix.texi:7392 #, no-wrap msgid "{Monadic Procedure} gexp->file @var{name} @var{exp} @" msgstr "{Monadische Prozedur} gexp->file @var{Name} @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:7401 +#: doc/guix.texi:7399 msgid "[#:set-load-path? #t] [#:module-path %load-path] @ [#:splice? #f] @ [#:guile (default-guile)] Return a derivation that builds a file @var{name} containing @var{exp}. When @var{splice?} is true, @var{exp} is considered to be a list of expressions that will be spliced in the resulting file." msgstr "[#:set-load-path? #t] [#:module-path %load-path] @ [#:splice? #f] @ [#:guile (default-guile)] Liefert eine Ableitung, die eine Datei @var{Name} erstellen wird, deren Inhalt der @var{G-Ausdruck} ist. Ist @var{splice?} wahr, dann wird @var{G-Ausdruck} stattdessen als eine Liste von mehreren G-Ausdrücken behandelt, die alle in die resultierende Datei gespleißt werden." #. type: deffn -#: doc/guix.texi:7406 +#: doc/guix.texi:7404 msgid "When @var{set-load-path?} is true, emit code in the resulting file to set @code{%load-path} and @code{%load-compiled-path} to honor @var{exp}'s imported modules. Look up @var{exp}'s modules in @var{module-path}." msgstr "Ist @var{set-load-path?} wahr, wird in die resultierende Datei Code hinzugefügt, der den Ladepfad @code{%load-path} und den Ladepfad für kompilierte Dateien @code{%load-compiled-path} festlegt, die für die importierten Module des @var{G-Ausdruck}s nötig sind. Die Module des @var{G-Ausdruck}s werden im Modulpfad @var{module-path} gesucht." #. type: deffn -#: doc/guix.texi:7409 +#: doc/guix.texi:7407 msgid "The resulting file holds references to all the dependencies of @var{exp} or a subset thereof." msgstr "Die resultierende Datei referenziert alle Abhängigkeiten des @var{G-Ausdruck}s oder eine Teilmenge davon." #. type: deffn -#: doc/guix.texi:7411 +#: doc/guix.texi:7409 #, no-wrap msgid "{Scheme Procedure} scheme-file @var{name} @var{exp} [#:splice? #f]" msgstr "{Scheme-Prozedur} scheme-file @var{Name} @var{G-Ausdruck} [#:splice? #f]" #. type: deffn -#: doc/guix.texi:7414 +#: doc/guix.texi:7412 msgid "Return an object representing the Scheme file @var{name} that contains @var{exp}." msgstr "Liefert ein Objekt, das die Scheme-Datei @var{Name} mit dem @var{G-Ausdruck} als Inhalt repräsentiert." #. type: deffn -#: doc/guix.texi:7416 +#: doc/guix.texi:7414 msgid "This is the declarative counterpart of @code{gexp->file}." msgstr "Dies ist das deklarative Gegenstück zu @code{gexp->file}." #. type: deffn -#: doc/guix.texi:7418 +#: doc/guix.texi:7416 #, no-wrap msgid "{Monadic Procedure} text-file* @var{name} @var{text} @dots{}" msgstr "{Monadische Prozedur} text-file* @var{Name} @var{Text} …" #. type: deffn -#: doc/guix.texi:7424 +#: doc/guix.texi:7422 msgid "Return as a monadic value a derivation that builds a text file containing all of @var{text}. @var{text} may list, in addition to strings, objects of any type that can be used in a gexp: packages, derivations, local file objects, etc. The resulting store file holds references to all these." msgstr "Liefert eine Ableitung als monadischen Wert, welche eine Textdatei erstellt, in der der gesamte @var{Text} enthalten ist. @var{Text} kann eine Folge nicht nur von Zeichenketten, sondern auch Objekten beliebigen Typs sein, die in einem G-Ausdruck benutzt werden können, also Paketen, Ableitungen, Objekte lokaler Dateien und so weiter. Die resultierende Store-Datei referenziert alle davon." #. type: deffn -#: doc/guix.texi:7429 +#: doc/guix.texi:7427 msgid "This variant should be preferred over @code{text-file} anytime the file to create will reference items from the store. This is typically the case when building a configuration file that embeds store file names, like this:" msgstr "Diese Variante sollte gegenüber @code{text-file} bevorzugt verwendet werden, wann immer die zu erstellende Datei Objekte im Store referenzieren wird. Typischerweise ist das der Fall, wenn eine Konfigurationsdatei erstellt wird, die Namen von Store-Dateien enthält, so wie hier:" #. type: example -#: doc/guix.texi:7437 +#: doc/guix.texi:7435 #, no-wrap msgid "" "(define (profile.sh)\n" @@ -13944,23 +13955,23 @@ msgstr "" " grep \"/bin:\" sed \"/bin\\n\"))\n" #. type: deffn -#: doc/guix.texi:7442 +#: doc/guix.texi:7440 msgid "In this example, the resulting @file{/gnu/store/@dots{}-profile.sh} file will reference @var{coreutils}, @var{grep}, and @var{sed}, thereby preventing them from being garbage-collected during its lifetime." msgstr "In diesem Beispiel wird die resultierende Datei @file{/gnu/store/…-profile.sh} sowohl @var{coreutils}, @var{grep} als auch @var{sed} referenzieren, so dass der Müllsammler diese nicht löscht, während die resultierende Datei noch lebendig ist." #. type: deffn -#: doc/guix.texi:7444 +#: doc/guix.texi:7442 #, no-wrap msgid "{Scheme Procedure} mixed-text-file @var{name} @var{text} @dots{}" msgstr "{Scheme-Prozedur} mixed-text-file @var{Name} @var{Text} …" #. type: deffn -#: doc/guix.texi:7448 +#: doc/guix.texi:7446 msgid "Return an object representing store file @var{name} containing @var{text}. @var{text} is a sequence of strings and file-like objects, as in:" msgstr "Liefert ein Objekt, was die Store-Datei @var{Name} repräsentiert, die @var{Text} enthält. @var{Text} ist dabei eine Folge von Zeichenketten und dateiartigen Objekten wie zum Beispiel:" #. type: example -#: doc/guix.texi:7452 +#: doc/guix.texi:7450 #, no-wrap msgid "" "(mixed-text-file \"profile\"\n" @@ -13970,23 +13981,23 @@ msgstr "" " \"export PATH=\" coreutils \"/bin:\" grep \"/bin\")\n" #. type: deffn -#: doc/guix.texi:7455 +#: doc/guix.texi:7453 msgid "This is the declarative counterpart of @code{text-file*}." msgstr "Dies ist das deklarative Gegenstück zu @code{text-file*}." #. type: deffn -#: doc/guix.texi:7457 +#: doc/guix.texi:7455 #, no-wrap msgid "{Scheme Procedure} file-union @var{name} @var{files}" msgstr "{Scheme-Prozedur} file-union @var{Name} @var{Dateien}" #. type: deffn -#: doc/guix.texi:7462 +#: doc/guix.texi:7460 msgid "Return a @code{} that builds a directory containing all of @var{files}. Each item in @var{files} must be a two-element list where the first element is the file name to use in the new directory, and the second element is a gexp denoting the target file. Here's an example:" msgstr "Liefert ein @code{}, das ein Verzeichnis mit allen @var{Dateien} enthält. Jedes Objekt in @var{Dateien} muss eine zweielementige Liste sein, deren erstes Element der im neuen Verzeichnis zu benutzende Dateiname ist und deren zweites Element ein G-Ausdruck ist, der die Zieldatei benennt. Hier ist ein Beispiel:" #. type: example -#: doc/guix.texi:7469 +#: doc/guix.texi:7467 #, no-wrap msgid "" "(file-union \"etc\"\n" @@ -14002,50 +14013,50 @@ msgstr "" " \"alias ls='ls --color=auto'\"))))\n" #. type: deffn -#: doc/guix.texi:7472 +#: doc/guix.texi:7470 msgid "This yields an @code{etc} directory containing these two files." msgstr "Dies liefert ein Verzeichnis @code{etc}, das zwei Dateien enthält." #. type: deffn -#: doc/guix.texi:7474 +#: doc/guix.texi:7472 #, no-wrap msgid "{Scheme Procedure} directory-union @var{name} @var{things}" msgstr "{Scheme-Prozedur} directory-union @var{Name} @var{Dinge}" #. type: deffn -#: doc/guix.texi:7477 +#: doc/guix.texi:7475 msgid "Return a directory that is the union of @var{things}, where @var{things} is a list of file-like objects denoting directories. For example:" msgstr "Liefert ein Verzeichnis, was die Vereinigung (englisch „Union“) der @var{Dinge} darstellt, wobei @var{Dinge} eine Liste dateiartiger Objekte sein muss, die Verzeichnisse bezeichnen. Zum Beispiel:" #. type: example -#: doc/guix.texi:7480 +#: doc/guix.texi:7478 #, no-wrap msgid "(directory-union \"guile+emacs\" (list guile emacs))\n" msgstr "(directory-union \"guile+emacs\" (list guile emacs))\n" #. type: deffn -#: doc/guix.texi:7483 +#: doc/guix.texi:7481 msgid "yields a directory that is the union of the @code{guile} and @code{emacs} packages." msgstr "Das liefert ein Verzeichnis, welches die Vereinigung der Pakete @code{guile} und @code{emacs} ist." #. type: deffn -#: doc/guix.texi:7485 +#: doc/guix.texi:7483 #, no-wrap msgid "{Scheme Procedure} file-append @var{obj} @var{suffix} @dots{}" msgstr "{Scheme-Prozedur} file-append @var{Objekt} @var{Suffix} …" #. type: deffn -#: doc/guix.texi:7489 +#: doc/guix.texi:7487 msgid "Return a file-like object that expands to the concatenation of @var{obj} and @var{suffix}, where @var{obj} is a lowerable object and each @var{suffix} is a string." msgstr "Liefert ein dateiartiges Objekt, das zur Aneinanderreihung von @var{Objekt} und @var{Suffix} umgeschrieben wird, wobei das @var{Objekt} ein herunterbrechbares Objekt und jedes @var{Suffix} eine Zeichenkette sein muss." #. type: deffn -#: doc/guix.texi:7491 +#: doc/guix.texi:7489 msgid "As an example, consider this gexp:" msgstr "Betrachten Sie zum Beispiel diesen G-Ausdruck:" #. type: example -#: doc/guix.texi:7496 +#: doc/guix.texi:7494 #, no-wrap msgid "" "(gexp->script \"run-uname\"\n" @@ -14057,12 +14068,12 @@ msgstr "" " \"/bin/uname\")))\n" #. type: deffn -#: doc/guix.texi:7499 +#: doc/guix.texi:7497 msgid "The same effect could be achieved with:" msgstr "Denselben Effekt könnte man erreichen mit:" #. type: example -#: doc/guix.texi:7504 +#: doc/guix.texi:7502 #, no-wrap msgid "" "(gexp->script \"run-uname\"\n" @@ -14074,50 +14085,50 @@ msgstr "" " \"/bin/uname\")))\n" #. type: deffn -#: doc/guix.texi:7510 +#: doc/guix.texi:7508 msgid "There is one difference though: in the @code{file-append} case, the resulting script contains the absolute file name as a string, whereas in the second case, the resulting script contains a @code{(string-append @dots{})} expression to construct the file name @emph{at run time}." msgstr "Es gibt jedoch einen Unterschied, nämlich enthält das resultierende Skript bei @code{file-append} tatsächlich den absoluten Dateinamen als Zeichenkette, während im anderen Fall das resultierende Skript einen Ausdruck @code{(string-append …)} enthält, der den Dateinamen erst @emph{zur Laufzeit} zusammensetzt." #. type: Plain text -#: doc/guix.texi:7517 +#: doc/guix.texi:7515 msgid "Of course, in addition to gexps embedded in ``host'' code, there are also modules containing build tools. To make it clear that they are meant to be used in the build stratum, these modules are kept in the @code{(guix build @dots{})} name space." msgstr "Natürlich gibt es zusätzlich zu in „wirtsseitigem“ Code eingebetteten G-Ausdrücken auch Module mit „erstellungsseitig“ nutzbaren Werkzeugen. Um klarzustellen, dass sie dafür gedacht sind, in der Erstellungsschicht benutzt zu werden, bleiben diese Module im Namensraum @code{(guix build …)}." #. type: Plain text -#: doc/guix.texi:7523 +#: doc/guix.texi:7521 msgid "Internally, high-level objects are @dfn{lowered}, using their compiler, to either derivations or store items. For instance, lowering a package yields a derivation, and lowering a @code{plain-file} yields a store item. This is achieved using the @code{lower-object} monadic procedure." msgstr "Intern werden hochsprachliche, abstrakte Objekte mit ihrem Compiler entweder zu Ableitungen oder zu Store-Objekten @dfn{heruntergebrochen}. Wird zum Beispiel ein Paket heruntergebrochen, bekommt man eine Ableitung, während ein @code{plain-file} zu einem Store-Objekt heruntergebrochen wird. Das wird mit der monadischen Prozedur @code{lower-object} bewerkstelligt." #. type: deffn -#: doc/guix.texi:7524 +#: doc/guix.texi:7522 #, no-wrap msgid "{Monadic Procedure} lower-object @var{obj} [@var{system}] @" msgstr "{Monadische Prozedur} lower-object @var{Objekt} [@var{System}] @" #. type: deffn -#: doc/guix.texi:7530 +#: doc/guix.texi:7528 msgid "[#:target #f] Return as a value in @var{%store-monad} the derivation or store item corresponding to @var{obj} for @var{system}, cross-compiling for @var{target} if @var{target} is true. @var{obj} must be an object that has an associated gexp compiler, such as a @code{}." msgstr "[#:target #f] Liefert die Ableitung oder das Store-Objekt, das dem @var{Objekt} für @var{System} als Wert in der Store-Monade @var{%store-monad} entspricht, cross-kompiliert für das Zieltripel @var{target}, wenn @var{target} wahr ist. Das @var{Objekt} muss ein Objekt sein, für das es einen mit ihm assoziierten G-Ausdruck-Compiler gibt, wie zum Beispiel ein @code{}." #. type: section -#: doc/guix.texi:7533 +#: doc/guix.texi:7531 #, no-wrap msgid "Invoking @command{guix repl}" msgstr "@command{guix repl} aufrufen" #. type: cindex -#: doc/guix.texi:7535 +#: doc/guix.texi:7533 #, no-wrap msgid "REPL, read-eval-print loop" msgstr "REPL (Lese-Auswerten-Schreiben-Schleife)" #. type: Plain text -#: doc/guix.texi:7541 +#: doc/guix.texi:7539 msgid "The @command{guix repl} command spawns a Guile @dfn{read-eval-print loop} (REPL) for interactive programming (@pxref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}). Compared to just launching the @command{guile} command, @command{guix repl} guarantees that all the Guix modules and all its dependencies are available in the search path. You can use it this way:" msgstr "Der Befehl @command{guix repl} startet eine Guile-REPL (@dfn{Read-Eval-Print Loop}, kurz REPL, deutsch Lese-Auswerten-Schreiben-Schleife) zur interaktiven Programmierung (siehe @ref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}). Im Vergleich dazu, einfach den Befehl @command{guile} aufzurufen, garantiert @command{guix repl}, dass alle Guix-Module und deren Abhängigkeiten im Suchpfad verfügbar sind. Sie können die REPL so benutzen:" #. type: example -#: doc/guix.texi:7547 +#: doc/guix.texi:7545 #, no-wrap msgid "" "$ guix repl\n" @@ -14131,127 +14142,127 @@ msgstr "" "$1 = #\n" #. type: Plain text -#: doc/guix.texi:7554 +#: doc/guix.texi:7552 msgid "In addition, @command{guix repl} implements a simple machine-readable REPL protocol for use by @code{(guix inferior)}, a facility to interact with @dfn{inferiors}, separate processes running a potentially different revision of Guix." msgstr "@command{guix repl} implementiert zusätzlich ein einfaches maschinenlesbares Protokoll für die REPL, das von @code{(guix inferior)} benutzt wird, um mit @dfn{Untergeordneten} zu interagieren, also mit getrennten Prozessen einer womöglich anderen Version von Guix." #. type: Plain text -#: doc/guix.texi:7556 +#: doc/guix.texi:7554 msgid "The available options are as follows:" msgstr "Folgende @var{Optionen} gibt es:" #. type: item -#: doc/guix.texi:7558 doc/guix.texi:9518 +#: doc/guix.texi:7556 doc/guix.texi:9516 #, no-wrap msgid "--type=@var{type}" msgstr "--type=@var{Typ}" #. type: itemx -#: doc/guix.texi:7559 doc/guix.texi:9519 doc/guix.texi:24575 +#: doc/guix.texi:7557 doc/guix.texi:9517 doc/guix.texi:24566 #, no-wrap msgid "-t @var{type}" msgstr "-t @var{Typ}" #. type: table -#: doc/guix.texi:7561 +#: doc/guix.texi:7559 msgid "Start a REPL of the given @var{TYPE}, which can be one of the following:" msgstr "Startet eine REPL des angegebenen @var{Typ}s, der einer der Folgenden sein darf:" #. type: item -#: doc/guix.texi:7563 +#: doc/guix.texi:7561 #, no-wrap msgid "guile" msgstr "guile" #. type: table -#: doc/guix.texi:7565 +#: doc/guix.texi:7563 msgid "This is default, and it spawns a standard full-featured Guile REPL." msgstr "Die Voreinstellung, mit der eine normale, voll funktionsfähige Guile-REPL gestartet wird." #. type: item -#: doc/guix.texi:7565 +#: doc/guix.texi:7563 #, no-wrap msgid "machine" msgstr "machine" #. type: table -#: doc/guix.texi:7568 +#: doc/guix.texi:7566 msgid "Spawn a REPL that uses the machine-readable protocol. This is the protocol that the @code{(guix inferior)} module speaks." msgstr "Startet eine REPL, die ein maschinenlesbares Protokoll benutzt. Dieses Protokoll wird vom Modul @code{(guix inferior)} gesprochen." #. type: table -#: doc/guix.texi:7574 +#: doc/guix.texi:7572 msgid "By default, @command{guix repl} reads from standard input and writes to standard output. When this option is passed, it will instead listen for connections on @var{endpoint}. Here are examples of valid options:" msgstr "Der Vorgabe nach würde @command{guix repl} von der Standardeingabe lesen und auf die Standardausgabe schreiben. Wird diese Befehlszeilenoption angegeben, lauscht die REPL stattdessen auf dem @var{Endpunkt} auf Verbindungen. Hier sind Beispiele gültiger Befehlszeilenoptionen:" #. type: item -#: doc/guix.texi:7576 +#: doc/guix.texi:7574 #, no-wrap msgid "--listen=tcp:37146" msgstr "--listen=tcp:37146" #. type: table -#: doc/guix.texi:7578 +#: doc/guix.texi:7576 msgid "Accept connections on localhost on port 37146." msgstr "Verbindungen mit dem „localhost“ auf Port 37146 akzeptieren." #. type: item -#: doc/guix.texi:7579 +#: doc/guix.texi:7577 #, no-wrap msgid "--listen=unix:/tmp/socket" msgstr "--listen=unix:/tmp/socket" #. type: table -#: doc/guix.texi:7581 +#: doc/guix.texi:7579 msgid "Accept connections on the Unix-domain socket @file{/tmp/socket}." msgstr "Verbindungen zum Unix-Socket @file{/tmp/socket} akzeptieren." #. type: Plain text -#: doc/guix.texi:7592 +#: doc/guix.texi:7590 msgid "This section describes Guix command-line utilities. Some of them are primarily targeted at developers and users who write new package definitions, while others are more generally useful. They complement the Scheme programming interface of Guix in a convenient way." msgstr "Dieser Abschnitt beschreibt die Befehlszeilenwerkzeuge von Guix. Manche davon richten sich hauptsächlich an Entwickler und solche Nutzer, die neue Paketdefinitionen schreiben, andere sind auch für ein breiteres Publikum nützlich. Sie ergänzen die Scheme-Programmierschnittstelle um bequeme Befehle." #. type: cindex -#: doc/guix.texi:7614 +#: doc/guix.texi:7612 #, no-wrap msgid "package building" msgstr "Paketerstellung" #. type: command{#1} -#: doc/guix.texi:7615 +#: doc/guix.texi:7613 #, no-wrap msgid "guix build" msgstr "guix build" #. type: Plain text -#: doc/guix.texi:7621 +#: doc/guix.texi:7619 msgid "The @command{guix build} command builds packages or derivations and their dependencies, and prints the resulting store paths. Note that it does not modify the user's profile---this is the job of the @command{guix package} command (@pxref{Invoking guix package}). Thus, it is mainly useful for distribution developers." msgstr "Der Befehl @command{guix build} lässt Pakete oder Ableitungen samt ihrer Abhängigkeiten erstellen und gibt die resultierenden Pfade im Store aus. Beachten Sie, dass das Nutzerprofil dadurch nicht modifiziert wird — eine solche Installation bewirkt der Befehl @command{guix package} (siehe @ref{Invoking guix package}). @command{guix build} wird also hauptsächlich von Entwicklern der Distribution benutzt." #. type: example -#: doc/guix.texi:7626 +#: doc/guix.texi:7624 #, no-wrap msgid "guix build @var{options} @var{package-or-derivation}@dots{}\n" msgstr "guix build @var{Optionen} @var{Paket-oder-Ableitung}…\n" #. type: Plain text -#: doc/guix.texi:7631 +#: doc/guix.texi:7629 msgid "As an example, the following command builds the latest versions of Emacs and of Guile, displays their build logs, and finally displays the resulting directories:" msgstr "Zum Beispiel wird mit folgendem Befehl die neueste Version von Emacs und von Guile erstellt, das zugehörige Erstellungsprotokoll angezeigt und letztendlich werden die resultierenden Verzeichnisse ausgegeben:" #. type: example -#: doc/guix.texi:7634 +#: doc/guix.texi:7632 #, no-wrap msgid "guix build emacs guile\n" msgstr "guix build emacs guile\n" #. type: Plain text -#: doc/guix.texi:7637 +#: doc/guix.texi:7635 msgid "Similarly, the following command builds all the available packages:" msgstr "Folgender Befehl erstellt alle Pakete, die zur Verfügung stehen:" #. type: example -#: doc/guix.texi:7641 +#: doc/guix.texi:7639 #, no-wrap msgid "" "guix build --quiet --keep-going \\\n" @@ -14261,334 +14272,334 @@ msgstr "" " `guix package -A | cut -f1,2 --output-delimiter=@@`\n" #. type: Plain text -#: doc/guix.texi:7649 +#: doc/guix.texi:7647 msgid "@var{package-or-derivation} may be either the name of a package found in the software distribution such as @code{coreutils} or @code{coreutils@@8.20}, or a derivation such as @file{/gnu/store/@dots{}-coreutils-8.19.drv}. In the former case, a package with the corresponding name (and optionally version) is searched for among the GNU distribution modules (@pxref{Package Modules})." msgstr "Als @var{Paket-oder-Ableitung} muss entweder der Name eines in der Software-Distribution zu findenden Pakets, wie etwa @code{coreutils} oder @code{coreutils@@8.20}, oder eine Ableitung wie @file{/gnu/store/…-coreutils-8.19.drv} sein. Im ersten Fall wird nach einem Paket mit entsprechendem Namen (und optional der entsprechenden Version) in den Modulen der GNU-Distribution gesucht (siehe @ref{Package Modules})." #. type: Plain text -#: doc/guix.texi:7654 +#: doc/guix.texi:7652 msgid "Alternatively, the @code{--expression} option may be used to specify a Scheme expression that evaluates to a package; this is useful when disambiguating among several same-named packages or package variants is needed." msgstr "Alternativ kann die Befehlszeilenoption @code{--expression} benutzt werden, um einen Scheme-Ausdruck anzugeben, der zu einem Paket ausgewertet wird; dies ist nützlich, wenn zwischen mehreren gleichnamigen Paketen oder Paket-Varianten unterschieden werden muss." #. type: Plain text -#: doc/guix.texi:7657 +#: doc/guix.texi:7655 msgid "There may be zero or more @var{options}. The available options are described in the subsections below." msgstr "Null oder mehr @var{Optionen} können angegeben werden. Zur Verfügung stehen die in den folgenden Unterabschnitten beschriebenen Befehlszeilenoptionen." #. type: Plain text -#: doc/guix.texi:7672 +#: doc/guix.texi:7670 msgid "A number of options that control the build process are common to @command{guix build} and other commands that can spawn builds, such as @command{guix package} or @command{guix archive}. These are the following:" msgstr "Einige dieser Befehlszeilenoptionen zur Steuerung des Erstellungsprozess haben @command{guix build} und andere Befehle, mit denen Erstellungen ausgelöst werden können, wie @command{guix package} oder @command{guix archive}, gemeinsam. Das sind folgende:" #. type: item -#: doc/guix.texi:7675 +#: doc/guix.texi:7673 #, no-wrap msgid "--load-path=@var{directory}" msgstr "--load-path=@var{Verzeichnis}" #. type: itemx -#: doc/guix.texi:7676 +#: doc/guix.texi:7674 #, no-wrap msgid "-L @var{directory}" msgstr "-L @var{Verzeichnis}" #. type: table -#: doc/guix.texi:7679 +#: doc/guix.texi:7677 msgid "Add @var{directory} to the front of the package module search path (@pxref{Package Modules})." msgstr "Das @var{Verzeichnis} vorne an den Suchpfad für Paketmodule anfügen (siehe @ref{Package Modules})." #. type: table -#: doc/guix.texi:7682 +#: doc/guix.texi:7680 msgid "This allows users to define their own packages and make them visible to the command-line tools." msgstr "Damit können Nutzer dafür sorgen, dass ihre eigenen selbstdefinierten Pakete für die Befehlszeilenwerkzeuge sichtbar sind." #. type: item -#: doc/guix.texi:7683 +#: doc/guix.texi:7681 #, no-wrap msgid "--keep-failed" msgstr "--keep-failed" #. type: itemx -#: doc/guix.texi:7684 +#: doc/guix.texi:7682 #, no-wrap msgid "-K" msgstr "-K" #. type: table -#: doc/guix.texi:7690 +#: doc/guix.texi:7688 msgid "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." msgstr "Den Verzeichnisbaum, in dem fehlgeschlagene Erstellungen durchgeführt wurden, behalten. Wenn also eine Erstellung fehlschlägt, bleibt ihr Erstellungsbaum in @file{/tmp} erhalten. Der Name dieses Unterverzeichnisses wird am Ende dem Erstellungsprotokolls ausgegeben. Dies hilft bei der Suche nach Fehlern in Erstellungen. Der Abschnitt @ref{Debugging Build Failures} zeigt Ihnen Hinweise und Tricks, wie Erstellungsfehler untersucht werden können." #. type: table -#: doc/guix.texi:7694 +#: doc/guix.texi:7692 msgid "This option has no effect when connecting to a remote daemon with a @code{guix://} URI (@pxref{The Store, the @code{GUIX_DAEMON_SOCKET} variable})." msgstr "Diese Option hat keine Auswirkungen, wenn eine Verbindung zu einem entfernten Daemon über eine @code{guix://}-URI verwendet wurde (siehe @ref{The Store, the @code{GUIX_DAEMON_SOCKET} variable})." #. type: item -#: doc/guix.texi:7695 +#: doc/guix.texi:7693 #, no-wrap msgid "--keep-going" msgstr "--keep-going" #. type: itemx -#: doc/guix.texi:7696 +#: doc/guix.texi:7694 #, no-wrap msgid "-k" msgstr "-k" #. type: table -#: doc/guix.texi:7699 +#: doc/guix.texi:7697 msgid "Keep going when some of the derivations fail to build; return only once all the builds have either completed or failed." msgstr "Weitermachen, auch wenn ein Teil der Erstellungen fehlschlägt. Das bedeutet, dass der Befehl erst terminiert, wenn alle Erstellungen erfolgreich oder mit Fehler durchgeführt wurden." #. type: table -#: doc/guix.texi:7702 +#: doc/guix.texi:7700 msgid "The default behavior is to stop as soon as one of the specified derivations has failed." msgstr "Das normale Verhalten ist, abzubrechen, sobald eine der angegebenen Ableitungen fehlschlägt." #. type: table -#: doc/guix.texi:7706 +#: doc/guix.texi:7704 msgid "Do not build the derivations." msgstr "Die Ableitungen nicht erstellen." #. type: anchor{#1} -#: doc/guix.texi:7708 +#: doc/guix.texi:7706 msgid "fallback-option" msgstr "fallback-option" #. type: item -#: doc/guix.texi:7708 +#: doc/guix.texi:7706 #, no-wrap msgid "--fallback" msgstr "--fallback" #. type: table -#: doc/guix.texi:7711 +#: doc/guix.texi:7709 msgid "When substituting a pre-built binary fails, fall back to building packages locally (@pxref{Substitution Failure})." msgstr "Wenn das Substituieren vorerstellter Binärdateien fehlschlägt, diese als „Fallback“ lokal selbst erstellen (siehe @ref{Substitution Failure})." #. type: anchor{#1} -#: doc/guix.texi:7717 +#: doc/guix.texi:7715 msgid "client-substitute-urls" msgstr "client-substitute-urls" #. type: table -#: doc/guix.texi:7717 +#: doc/guix.texi:7715 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs, overriding the default list of URLs of @command{guix-daemon} (@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs})." msgstr "Die @var{urls} als durch Leerraumzeichen getrennte Liste von Quell-URLs für Substitute anstelle der vorgegebenen URL-Liste für den @command{guix-daemon} verwenden (siehe @ref{daemon-substitute-urls,, @command{guix-daemon} URLs})." #. type: table -#: doc/guix.texi:7721 +#: doc/guix.texi:7719 msgid "This means that substitutes may be downloaded from @var{urls}, provided they are signed by a key authorized by the system administrator (@pxref{Substitutes})." msgstr "Das heißt, die Substitute dürfen von den @var{urls} heruntergeladen werden, sofern sie mit einem durch den Systemadministrator autorisierten Schlüssel signiert worden sind (siehe @ref{Substitutes})." #. type: table -#: doc/guix.texi:7724 +#: doc/guix.texi:7722 msgid "When @var{urls} is the empty string, substitutes are effectively disabled." msgstr "Wenn als @var{urls} eine leere Zeichenkette angegeben wurde, verhält es sich, als wären Substitute abgeschaltet." #. type: item -#: doc/guix.texi:7730 +#: doc/guix.texi:7728 #, no-wrap msgid "--no-grafts" msgstr "--no-grafts" #. type: table -#: doc/guix.texi:7734 +#: doc/guix.texi:7732 msgid "Do not ``graft'' packages. In practice, this means that package updates available as grafts are not applied. @xref{Security Updates}, for more information on grafts." msgstr "Pakete nicht „veredeln“ (engl. „graft“). Praktisch heißt das, dass als Veredelungen verfügbare Paketaktualisierungen nicht angewandt werden. Der Abschnitt @ref{Security Updates} hat weitere Informationen zu Veredelungen." #. type: item -#: doc/guix.texi:7735 +#: doc/guix.texi:7733 #, no-wrap msgid "--rounds=@var{n}" msgstr "--rounds=@var{n}" #. type: table -#: doc/guix.texi:7738 +#: doc/guix.texi:7736 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical." msgstr "Jede Ableitung @var{n}-mal nacheinander erstellen und einen Fehler melden, wenn die aufeinanderfolgenden Erstellungsergebnisse nicht Bit für Bit identisch sind." #. type: table -#: doc/guix.texi:7743 +#: doc/guix.texi:7741 msgid "This is a useful way to detect non-deterministic builds processes. Non-deterministic build processes are a problem because they make it practically impossible for users to @emph{verify} whether third-party binaries are genuine. @xref{Invoking guix challenge}, for more." msgstr "Das ist eine nützliche Methode, um nicht-deterministische Erstellungsprozesse zu erkennen. Nicht-deterministische Erstellungsprozesse sind ein Problem, weil Nutzer dadurch praktisch nicht @emph{verifizieren} können, ob von Drittanbietern bereitgestellte Binärdateien echt sind. Der Abschnitt @ref{Invoking guix challenge} erklärt dies genauer." #. type: table -#: doc/guix.texi:7749 +#: doc/guix.texi:7747 msgid "Note that, currently, the differing build results are not kept around, so you will have to manually investigate in case of an error---e.g., by stashing one of the build results with @code{guix archive --export} (@pxref{Invoking guix archive}), then rebuilding, and finally comparing the two results." msgstr "Beachten Sie, dass die sich unterscheidenden Erstellungsergebnisse nicht erhalten bleiben, so dass Sie eventuelle Fehler manuell untersuchen müssen, z.B.@: indem Sie eines oder mehrere der Erstellungsergebnisse @code{guix archive --export} auslagern (siehe @ref{Invoking guix archive}), dann neu erstellen und letztlich die beiden Erstellungsergebnisse vergleichen." #. type: table -#: doc/guix.texi:7754 +#: doc/guix.texi:7752 msgid "Do not attempt to offload builds @i{via} the ``build hook'' of the daemon (@pxref{Daemon Offload Setup}). That is, always build things locally instead of offloading builds to remote machines." msgstr "Nicht versuchen, Erstellungen über den „Build-Hook“ des Daemons auszulagern (siehe @ref{Daemon Offload Setup}). Somit wird lokal erstellt, statt Erstellungen auf entfernte Maschinen auszulagern." #. type: table -#: doc/guix.texi:7761 +#: doc/guix.texi:7759 msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--max-silent-time}})." msgstr "Standardmäßig wird die Einstellung für den Daemon benutzt (siehe @ref{Invoking guix-daemon, @code{--max-silent-time}})." #. type: table -#: doc/guix.texi:7768 +#: doc/guix.texi:7766 msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--timeout}})." msgstr "Standardmäßig wird die Einstellung für den Daemon benutzt (siehe @ref{Invoking guix-daemon, @code{--timeout}})." #. type: cindex -#: doc/guix.texi:7771 +#: doc/guix.texi:7769 #, no-wrap msgid "verbosity, of the command-line tools" msgstr "Ausführlichkeit der Befehlszeilenwerkzeuge" #. type: cindex -#: doc/guix.texi:7772 +#: doc/guix.texi:7770 #, no-wrap msgid "build logs, verbosity" msgstr "Erstellungsprotokolle, Ausführlichkeit" #. type: item -#: doc/guix.texi:7773 +#: doc/guix.texi:7771 #, no-wrap msgid "-v @var{level}" msgstr "-v @var{Stufe}" #. type: itemx -#: doc/guix.texi:7774 +#: doc/guix.texi:7772 #, no-wrap msgid "--verbosity=@var{level}" msgstr "--verbosity=@var{Stufe}" #. type: table -#: doc/guix.texi:7778 +#: doc/guix.texi:7776 msgid "Use the given verbosity @var{level}, an integer. Choosing 0 means that no output is produced, 1 is for quiet output, and 2 shows all the build log output on standard error." msgstr "Die angegebene Ausführlichkeitsstufe verwenden. Als @var{Stufe} muss eine ganze Zahl angegeben werden. Wird 0 gewählt, wird keine Ausgabe zur Fehlersuche angezeigt, 1 bedeutet eine knappe Ausgabe und 2 lässt alle Erstellungsprotokollausgaben auf die Standardfehlerausgabe schreiben." #. type: table -#: doc/guix.texi:7783 +#: doc/guix.texi:7781 msgid "Allow the use of up to @var{n} CPU cores for the build. The special value @code{0} means to use as many CPU cores as available." msgstr "Die Nutzung von bis zu @var{n} Prozessorkernen für die Erstellungen gestatten. Der besondere Wert @code{0} bedeutet, dass so viele wie möglich benutzt werden." #. type: table -#: doc/guix.texi:7789 +#: doc/guix.texi:7787 msgid "Allow at most @var{n} build jobs in parallel. @xref{Invoking guix-daemon, @code{--max-jobs}}, for details about this option and the equivalent @command{guix-daemon} option." msgstr "Höchstens @var{n} gleichzeitige Erstellungsaufträge erlauben. Im Abschnitt @ref{Invoking guix-daemon, @code{--max-jobs}} finden Sie Details zu dieser Option und der äquivalenten Option des @command{guix-daemon}." #. type: item -#: doc/guix.texi:7790 +#: doc/guix.texi:7788 #, no-wrap msgid "--debug=@var{level}" msgstr "--debug=@var{Stufe}" #. type: table -#: doc/guix.texi:7794 +#: doc/guix.texi:7792 msgid "Produce debugging output coming from the build daemon. @var{level} must be an integer between 0 and 5; higher means more verbose output. Setting a level of 4 or more may be helpful when debugging setup issues with the build daemon." msgstr "Ein Protokoll zur Fehlersuche ausgeben, das vom Erstellungsdaemon kommt. Als @var{Stufe} muss eine ganze Zahl zwischen 0 und 5 angegeben werden; höhere Zahlen stehen für ausführlichere Ausgaben. Stufe 4 oder höher zu wählen, kann bei der Suche nach Fehlern, wie der Erstellungs-Daemon eingerichtet ist, helfen." #. type: Plain text -#: doc/guix.texi:7801 +#: doc/guix.texi:7799 msgid "Behind the scenes, @command{guix build} is essentially an interface to the @code{package-derivation} procedure of the @code{(guix packages)} module, and to the @code{build-derivations} procedure of the @code{(guix derivations)} module." msgstr "Intern ist @command{guix build} im Kern eine Schnittstelle zur Prozedur @code{package-derivation} aus dem Modul @code{(guix packages)} und zu der Prozedur @code{build-derivations} des Moduls @code{(guix derivations)}." #. type: Plain text -#: doc/guix.texi:7805 +#: doc/guix.texi:7803 msgid "In addition to options explicitly passed on the command line, @command{guix build} and other @command{guix} commands that support building honor the @code{GUIX_BUILD_OPTIONS} environment variable." msgstr "Neben auf der Befehlszeile übergebenen Optionen beachten @command{guix build} und andere @command{guix}-Befehle, die Erstellungen durchführen lassen, die Umgebungsvariable @code{GUIX_BUILD_OPTIONS}." #. type: defvr -#: doc/guix.texi:7806 +#: doc/guix.texi:7804 #, no-wrap msgid "{Environment Variable} GUIX_BUILD_OPTIONS" msgstr "{Umgebungsvariable} GUIX_BUILD_OPTIONS" #. type: defvr -#: doc/guix.texi:7811 +#: doc/guix.texi:7809 msgid "Users can define this variable to a list of command line options that will automatically be used by @command{guix build} and other @command{guix} commands that can perform builds, as in the example below:" msgstr "Nutzer können diese Variable auf eine Liste von Befehlszeilenoptionen definieren, die automatisch von @command{guix build} und anderen @command{guix}-Befehlen, die Erstellungen durchführen lassen, benutzt wird, wie in folgendem Beispiel:" #. type: example -#: doc/guix.texi:7814 +#: doc/guix.texi:7812 #, no-wrap msgid "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n" msgstr "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n" #. type: defvr -#: doc/guix.texi:7818 +#: doc/guix.texi:7816 msgid "These options are parsed independently, and the result is appended to the parsed command-line options." msgstr "Diese Befehlszeilenoptionen werden unabhängig von den auf der Befehlszeile übergebenen Befehlszeilenoptionen grammatikalisch analysiert und das Ergebnis an die bereits analysierten auf der Befehlszeile übergebenen Befehlszeilenoptionen angehängt." #. type: cindex -#: doc/guix.texi:7824 +#: doc/guix.texi:7822 #, no-wrap msgid "package variants" msgstr "Paketvarianten" #. type: Plain text -#: doc/guix.texi:7832 +#: doc/guix.texi:7830 msgid "Another set of command-line options supported by @command{guix build} and also @command{guix package} are @dfn{package transformation options}. These are options that make it possible to define @dfn{package variants}---for instance, packages built from different source code. This is a convenient way to create customized packages on the fly without having to type in the definitions of package variants (@pxref{Defining Packages})." msgstr "Eine weitere Gruppe von Befehlszeilenoptionen, die @command{guix build} und auch @command{guix package} unterstützen, sind @dfn{Paketumwandlungsoptionen}. Diese Optionen ermöglichen es, @dfn{Paketvarianten} zu definieren — zum Beispiel können Pakete aus einem anderen Quellcode als normalerweise erstellt werden. Damit ist es leicht, angepasste Pakete schnell zu erstellen, ohne die vollständigen Definitionen von Paketvarianten einzutippen (siehe @ref{Defining Packages})." #. type: item -#: doc/guix.texi:7835 +#: doc/guix.texi:7833 #, no-wrap msgid "--with-source=@var{source}" msgstr "--with-source=@var{Quelle}" #. type: itemx -#: doc/guix.texi:7836 +#: doc/guix.texi:7834 #, no-wrap msgid "--with-source=@var{package}=@var{source}" msgstr "--with-source=@var{Paket}=@var{Quelle}" #. type: itemx -#: doc/guix.texi:7837 +#: doc/guix.texi:7835 #, no-wrap msgid "--with-source=@var{package}@@@var{version}=@var{source}" msgstr "--with-source=@var{Paket}@@@var{Version}=@var{Quelle}" #. type: table -#: doc/guix.texi:7842 +#: doc/guix.texi:7840 msgid "Use @var{source} as the source of @var{package}, and @var{version} as its version number. @var{source} must be a file name or a URL, as for @command{guix download} (@pxref{Invoking guix download})." msgstr "Den Paketquellcode für das @var{Paket} von der angegebenen @var{Quelle} holen und die @var{Version} als seine Versionsnummer verwenden. Die @var{Quelle} muss ein Dateiname oder eine URL sein wie bei @command{guix download} (siehe @ref{Invoking guix download})." #. type: table -#: doc/guix.texi:7848 +#: doc/guix.texi:7846 msgid "When @var{package} is omitted, it is taken to be the package name specified on the command line that matches the base of @var{source}---e.g., if @var{source} is @code{/src/guile-2.0.10.tar.gz}, the corresponding package is @code{guile}." msgstr "Wird kein @var{Paket} angegeben, wird als Paketname derjenige auf der Befehlszeile angegebene Paketname angenommen, der zur Basis am Ende der @var{Quelle} passt — wenn z.B.@: als @var{Quelle} die Datei @code{/src/guile-2.0.10.tar.gz} angegeben wurde, entspricht das dem @code{guile}-Paket." #. type: table -#: doc/guix.texi:7851 +#: doc/guix.texi:7849 msgid "Likewise, when @var{version} is omitted, the version string is inferred from @var{source}; in the previous example, it is @code{2.0.10}." msgstr "Ebenso wird, wenn keine @var{Version} angegeben wurde, die Version als Zeichenkette aus der @var{Quelle} abgeleitet; im vorherigen Beispiel wäre sie @code{2.0.10}." #. type: table -#: doc/guix.texi:7856 +#: doc/guix.texi:7854 msgid "This option allows users to try out versions of packages other than the one provided by the distribution. The example below downloads @file{ed-1.7.tar.gz} from a GNU mirror and uses that as the source for the @code{ed} package:" msgstr "Mit dieser Option können Nutzer versuchen, eine andere Version ihres Pakets auszuprobieren, als die in der Distribution enthaltene Version. Folgendes Beispiel lädt @file{ed-1.7.tar.gz} von einem GNU-Spiegelserver herunter und benutzt es als Quelle für das @code{ed}-Paket:" #. type: example -#: doc/guix.texi:7859 +#: doc/guix.texi:7857 #, no-wrap msgid "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n" msgstr "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n" #. type: table -#: doc/guix.texi:7863 +#: doc/guix.texi:7861 msgid "As a developer, @code{--with-source} makes it easy to test release candidates:" msgstr "Für Entwickler wird es einem durch @code{--with-source} leicht gemacht, „Release Candidates“, also Vorabversionen, zu testen:" #. type: example -#: doc/guix.texi:7866 +#: doc/guix.texi:7864 #, no-wrap msgid "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n" msgstr "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n" #. type: table -#: doc/guix.texi:7869 +#: doc/guix.texi:7867 msgid "@dots{} or to build from a checkout in a pristine environment:" msgstr "…@: oder ein Checkout eines versionskontrollierten Repositorys in einer isolierten Umgebung zu erstellen:" #. type: example -#: doc/guix.texi:7873 +#: doc/guix.texi:7871 #, no-wrap msgid "" "$ git clone git://git.sv.gnu.org/guix.git\n" @@ -14598,94 +14609,94 @@ msgstr "" "$ guix build guix --with-source=guix@@1.0=./guix\n" #. type: item -#: doc/guix.texi:7875 +#: doc/guix.texi:7873 #, no-wrap msgid "--with-input=@var{package}=@var{replacement}" msgstr "--with-input=@var{Paket}=@var{Ersatz}" #. type: table -#: doc/guix.texi:7880 +#: doc/guix.texi:7878 msgid "Replace dependency on @var{package} by a dependency on @var{replacement}. @var{package} must be a package name, and @var{replacement} must be a package specification such as @code{guile} or @code{guile@@1.8}." msgstr "Abhängigkeiten vom @var{Paket} durch eine Abhängigkeit vom @var{Ersatz}-Paket ersetzen. Als @var{Paket} muss ein Paketname angegeben werden und als @var{Ersatz} eine Paketspezifikation wie @code{guile} oder @code{guile@@1.8}." #. type: table -#: doc/guix.texi:7884 +#: doc/guix.texi:7882 msgid "For instance, the following command builds Guix, but replaces its dependency on the current stable version of Guile with a dependency on the legacy version of Guile, @code{guile@@2.0}:" msgstr "Mit folgendem Befehl wird zum Beispiel Guix erstellt, aber statt der aktuellen stabilen Guile-Version hängt es von der alten Guile-Version @code{guile@@2.0} ab:" #. type: example -#: doc/guix.texi:7887 +#: doc/guix.texi:7885 #, no-wrap msgid "guix build --with-input=guile=guile@@2.0 guix\n" msgstr "guix build --with-input=guile=guile@@2.0 guix\n" #. type: table -#: doc/guix.texi:7892 +#: doc/guix.texi:7890 msgid "This is a recursive, deep replacement. So in this example, both @code{guix} and its dependency @code{guile-json} (which also depends on @code{guile}) get rebuilt against @code{guile@@2.0}." msgstr "Die Ersetzung ist rekursiv und umfassend. In diesem Beispiel würde nicht nur @code{guix}, sondern auch seine Abhängigkeit @code{guile-json} (was auch von @code{guile} abhängt) für @code{guile@@2.0} neu erstellt." #. type: table -#: doc/guix.texi:7895 +#: doc/guix.texi:7893 msgid "This is implemented using the @code{package-input-rewriting} Scheme procedure (@pxref{Defining Packages, @code{package-input-rewriting}})." msgstr "Implementiert wird das alles mit der Scheme-Prozedur @code{package-input-rewriting} (siehe @ref{Defining Packages, @code{package-input-rewriting}})." #. type: item -#: doc/guix.texi:7896 +#: doc/guix.texi:7894 #, no-wrap msgid "--with-graft=@var{package}=@var{replacement}" msgstr "--with-graft=@var{Paket}=@var{Ersatz}" #. type: table -#: doc/guix.texi:7902 +#: doc/guix.texi:7900 msgid "This is similar to @code{--with-input} but with an important difference: instead of rebuilding the whole dependency chain, @var{replacement} is built and then @dfn{grafted} onto the binaries that were initially referring to @var{package}. @xref{Security Updates}, for more information on grafts." msgstr "Dies verhält sich ähnlich wie mit @code{--with-input}, aber mit dem wichtigen Unterschied, dass nicht die gesamte Abhängigkeitskette neu erstellt wird, sondern das @var{Ersatz}-Paket erstellt und die ursprünglichen Binärdateien, die auf das @var{Paket} verwiesen haben, damit @dfn{veredelt} werden. Im Abschnitt @ref{Security Updates} finden Sie weitere Informationen über Veredelungen." #. type: table -#: doc/guix.texi:7906 +#: doc/guix.texi:7904 msgid "For example, the command below grafts version 3.5.4 of GnuTLS onto Wget and all its dependencies, replacing references to the version of GnuTLS they currently refer to:" msgstr "Zum Beispiel veredelt folgender Befehl Wget und alle Abhängigkeiten davon mit der Version 3.5.4 von GnuTLS, indem Verweise auf die ursprünglich verwendete GnuTLS-Version ersetzt werden:" #. type: example -#: doc/guix.texi:7909 +#: doc/guix.texi:7907 #, no-wrap msgid "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n" msgstr "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n" #. type: table -#: doc/guix.texi:7918 +#: doc/guix.texi:7916 msgid "This has the advantage of being much faster than rebuilding everything. But there is a caveat: it works if and only if @var{package} and @var{replacement} are strictly compatible---for example, if they provide a library, the application binary interface (ABI) of those libraries must be compatible. If @var{replacement} is somehow incompatible with @var{package}, then the resulting package may be unusable. Use with care!" msgstr "Das hat den Vorteil, dass es viel schneller geht, als alles neu zu erstellen. Die Sache hat aber einen Haken: Veredelung funktioniert nur, wenn das @var{Paket} und sein @var{Ersatz} miteinander streng kompatibel sind — zum Beispiel muss, wenn diese eine Programmbibliothek zur Verfügung stellen, deren Binärschnittstelle („Application Binary Interface“, kurz ABI) kompatibel sein. Wenn das @var{Ersatz}-Paket auf irgendeine Art inkompatibel mit dem @var{Paket} ist, könnte das Ergebnispaket unbrauchbar sein. Vorsicht ist also geboten!" #. type: item -#: doc/guix.texi:7919 +#: doc/guix.texi:7917 #, no-wrap msgid "--with-git-url=@var{package}=@var{url}" msgstr "--with-git-url=@var{Paket}=@var{URL}" #. type: cindex -#: doc/guix.texi:7920 +#: doc/guix.texi:7918 #, no-wrap msgid "Git, using the latest commit" msgstr "Git, den neuesten Commit benutzen" #. type: cindex -#: doc/guix.texi:7921 +#: doc/guix.texi:7919 #, no-wrap msgid "latest commit, building" msgstr "neuester Commit, davon erstellen" #. type: table -#: doc/guix.texi:7925 +#: doc/guix.texi:7923 msgid "Build @var{package} from the latest commit of the @code{master} branch of the Git repository at @var{url}. Git sub-modules of the repository are fetched, recursively." msgstr "Das @var{Paket} aus dem neuesten Commit im @code{master}-Branch des unter der @var{URL} befindlichen Git-Repositorys erstellen. Git-Submodule des Repositorys werden dabei rekursiv geladen." #. type: table -#: doc/guix.texi:7928 +#: doc/guix.texi:7926 msgid "For example, the following command builds the NumPy Python library against the latest commit of the master branch of Python itself:" msgstr "Zum Beispiel erstellt der folgende Befehl die NumPy-Python-Bibliothek unter Verwendung des neuesten Commits von Python auf dessen „master“-Branch." #. type: example -#: doc/guix.texi:7932 +#: doc/guix.texi:7930 #, no-wrap msgid "" "guix build python-numpy \\\n" @@ -14695,179 +14706,179 @@ msgstr "" " --with-git-url=python=https://github.com/python/cpython\n" #. type: table -#: doc/guix.texi:7936 +#: doc/guix.texi:7934 msgid "This option can also be combined with @code{--with-branch} or @code{--with-commit} (see below)." msgstr "Diese Befehlszeilenoption kann auch mit @code{--with-branch} oder @code{--with-commit} kombiniert werden (siehe unten)." #. type: cindex -#: doc/guix.texi:7937 doc/guix.texi:20629 +#: doc/guix.texi:7935 doc/guix.texi:20626 #, no-wrap msgid "continuous integration" msgstr "Kontinuierliche Integration" #. type: table -#: doc/guix.texi:7943 +#: doc/guix.texi:7941 msgid "Obviously, since it uses the latest commit of the given branch, the result of such a command varies over time. Nevertheless it is a convenient way to rebuild entire software stacks against the latest commit of one or more packages. This is particularly useful in the context of continuous integration (CI)." msgstr "Da es den neuesten Commit auf dem verwendeten Branch benutzt, ändert sich das Ergebnis natürlich mit der Zeit. Nichtsdestoweniger ist es eine bequeme Möglichkeit, ganze Softwarestapel auf dem neuesten Commit von einem oder mehr Paketen aufbauen zu lassen. Es ist besonders nützlich im Kontext Kontinuierlicher Integration (englisch „Continuous Integration“, kurz CI)." #. type: table -#: doc/guix.texi:7947 +#: doc/guix.texi:7945 msgid "Checkouts are kept in a cache under @file{~/.cache/guix/checkouts} to speed up consecutive accesses to the same repository. You may want to clean it up once in a while to save disk space." msgstr "Checkouts bleiben zwischengespeichert als @file{~/.cache/guix/checkouts}, damit danach schneller auf dasselbe Repository zugegriffen werden kann. Eventuell möchten Sie das Verzeichnis ab und zu bereinigen, um Plattenplatz zu sparen." #. type: item -#: doc/guix.texi:7948 +#: doc/guix.texi:7946 #, no-wrap msgid "--with-branch=@var{package}=@var{branch}" msgstr "--with-branch=@var{Paket}=@var{Branch}" #. type: table -#: doc/guix.texi:7954 +#: doc/guix.texi:7952 msgid "Build @var{package} from the latest commit of @var{branch}. If the @code{source} field of @var{package} is an origin with the @code{git-fetch} method (@pxref{origin Reference}) or a @code{git-checkout} object, the repository URL is taken from that @code{source}. Otherwise you have to use @code{--with-git-url} to specify the URL of the Git repository." msgstr "Das @var{Paket} aus dem neuesten Commit auf dem @var{Branch} erstellen. Wenn das @code{source}-Feld des @var{Paket}s ein origin-Objekt mit der Methode @code{git-fetch} (siehe @ref{origin Reference}) oder ein @code{git-checkout}-Objekt ist, wird die URL des Repositorys vom @code{source}-Feld genommen. Andernfalls müssen Sie die Befehlszeilenoption @code{--with-git-url} benutzen, um die URL des Git-Repositorys anzugeben." #. type: table -#: doc/guix.texi:7959 +#: doc/guix.texi:7957 msgid "For instance, the following command builds @code{guile-sqlite3} from the latest commit of its @code{master} branch, and then builds @code{guix} (which depends on it) and @code{cuirass} (which depends on @code{guix}) against this specific @code{guile-sqlite3} build:" msgstr "Zum Beispiel wird mit dem folgenden Befehl @code{guile-sqlite3} aus dem neuesten Commit seines @code{master}-Branches erstellt und anschließend @code{guix} (was von @code{guile-sqlite3} abhängt) und @code{cuirass} (was von @code{guix} abhängt) unter Nutzung genau dieser @code{guile-sqlite3}-Erstellung erstellt:" #. type: example -#: doc/guix.texi:7962 +#: doc/guix.texi:7960 #, no-wrap msgid "guix build --with-branch=guile-sqlite3=master cuirass\n" msgstr "guix build --with-branch=guile-sqlite3=master cuirass\n" #. type: item -#: doc/guix.texi:7964 +#: doc/guix.texi:7962 #, no-wrap msgid "--with-commit=@var{package}=@var{commit}" msgstr "--with-commit=@var{Paket}=@var{Commit}" #. type: table -#: doc/guix.texi:7968 +#: doc/guix.texi:7966 msgid "This is similar to @code{--with-branch}, except that it builds from @var{commit} rather than the tip of a branch. @var{commit} must be a valid Git commit SHA1 identifier." msgstr "Dies verhält sich ähnlich wie @code{--with-branch}, außer dass es den angegebenen @var{Commit} benutzt statt die Spitze eines angegebenen Branches. Als @var{Commit} muss ein gültiger SHA1-Bezeichner für einen Git-Commit angegeben werden." #. type: Plain text -#: doc/guix.texi:7975 +#: doc/guix.texi:7973 msgid "The command-line options presented below are specific to @command{guix build}." msgstr "Die unten aufgeführten Befehlszeilenoptionen funktionieren nur mit @command{guix build}." #. type: item -#: doc/guix.texi:7978 +#: doc/guix.texi:7976 #, no-wrap msgid "--quiet" msgstr "--quiet" #. type: itemx -#: doc/guix.texi:7979 +#: doc/guix.texi:7977 #, no-wrap msgid "-q" msgstr "-q" #. type: table -#: doc/guix.texi:7983 +#: doc/guix.texi:7981 msgid "Build quietly, without displaying the build log; this is equivalent to @code{--verbosity=0}. Upon completion, the build log is kept in @file{/var} (or similar) and can always be retrieved using the @option{--log-file} option." msgstr "Schweigend erstellen, ohne das Erstellungsprotokoll anzuzeigen — dies ist äquivalent zu @code{--verbosity=0}. Nach Abschluss der Erstellung ist das Protokoll in @file{/var} (oder einem entsprechenden Ort) einsehbar und kann jederzeit mit der Befehlszeilenoption @option{--log-file} gefunden werden." #. type: item -#: doc/guix.texi:7984 +#: doc/guix.texi:7982 #, no-wrap msgid "--file=@var{file}" msgstr "--file=@var{Datei}" #. type: table -#: doc/guix.texi:7988 +#: doc/guix.texi:7986 msgid "Build the package, derivation, or other file-like object that the code within @var{file} evaluates to (@pxref{G-Expressions, file-like objects})." msgstr "Das Paket, die Ableitung oder das dateiähnliche Objekt erstellen, zu dem der Code in der @var{Datei} ausgewertet wird (siehe @ref{G-Expressions, file-like objects})." #. type: table -#: doc/guix.texi:7991 +#: doc/guix.texi:7989 msgid "As an example, @var{file} might contain a package definition like this (@pxref{Defining Packages}):" msgstr "Zum Beispiel könnte in der @var{Datei} so eine Paketdefinition stehen (siehe @ref{Defining Packages}):" #. type: table -#: doc/guix.texi:7999 +#: doc/guix.texi:7997 msgid "Build the package or derivation @var{expr} evaluates to." msgstr "Das Paket oder die Ableitung erstellen, zu der der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:8003 +#: doc/guix.texi:8001 msgid "For example, @var{expr} may be @code{(@@ (gnu packages guile) guile-1.8)}, which unambiguously designates this specific variant of version 1.8 of Guile." msgstr "Zum Beispiel kann der @var{Ausdruck} @code{(@@ (gnu packages guile) guile-1.8)} sein, was diese bestimmte Variante der Version 1.8 von Guile eindeutig bezeichnet." #. type: table -#: doc/guix.texi:8007 +#: doc/guix.texi:8005 msgid "Alternatively, @var{expr} may be a G-expression, in which case it is used as a build program passed to @code{gexp->derivation} (@pxref{G-Expressions})." msgstr "Alternativ kann der @var{Ausdruck} ein G-Ausdruck sein. In diesem Fall wird er als Erstellungsprogramm an @code{gexp->derivation} übergeben (siehe @ref{G-Expressions})." #. type: table -#: doc/guix.texi:8011 +#: doc/guix.texi:8009 msgid "Lastly, @var{expr} may refer to a zero-argument monadic procedure (@pxref{The Store Monad}). The procedure must return a derivation as a monadic value, which is then passed through @code{run-with-store}." msgstr "Zudem kann der @var{Ausdruck} eine monadische Prozedur mit null Argumenten bezeichnen (siehe @ref{The Store Monad}). Die Prozedur muss eine Ableitung als monadischen Wert zurückliefern, die dann durch @code{run-with-store} laufen gelassen wird." #. type: item -#: doc/guix.texi:8012 +#: doc/guix.texi:8010 #, no-wrap msgid "--source" msgstr "--source" #. type: itemx -#: doc/guix.texi:8013 +#: doc/guix.texi:8011 #, no-wrap msgid "-S" msgstr "-S" #. type: table -#: doc/guix.texi:8016 +#: doc/guix.texi:8014 msgid "Build the source derivations of the packages, rather than the packages themselves." msgstr "Die Quellcode-Ableitung der Pakete statt die Pakete selbst erstellen." #. type: table -#: doc/guix.texi:8020 +#: doc/guix.texi:8018 msgid "For instance, @code{guix build -S gcc} returns something like @file{/gnu/store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source tarball." msgstr "Zum Beispiel liefert @code{guix build -S gcc} etwas in der Art von @file{/gnu/store/…-gcc-4.7.2.tar.bz2}, also den Tarball mit dem GCC-Quellcode." #. type: table -#: doc/guix.texi:8024 +#: doc/guix.texi:8022 msgid "The returned source tarball is the result of applying any patches and code snippets specified in the package @code{origin} (@pxref{Defining Packages})." msgstr "Der gelieferte Quell-Tarball ist das Ergebnis davon, alle Patches und Code-Schnipsel aufzuspielen, die im @code{origin}-Objekt des Pakets festgelegt wurden (siehe @ref{Defining Packages})." #. type: item -#: doc/guix.texi:8025 +#: doc/guix.texi:8023 #, no-wrap msgid "--sources" msgstr "--sources" #. type: table -#: doc/guix.texi:8032 +#: doc/guix.texi:8030 msgid "Fetch and return the source of @var{package-or-derivation} and all their dependencies, recursively. This is a handy way to obtain a local copy of all the source code needed to build @var{packages}, allowing you to eventually build them even without network access. It is an extension of the @code{--source} option and can accept one of the following optional argument values:" msgstr "Den Quellcode für @var{Paket-oder-Ableitung} und alle Abhängigkeiten davon rekursiv herunterladen und zurückliefern. Dies ist eine praktische Methode, eine lokale Kopie des gesamten Quellcodes zu beziehen, der nötig ist, um die Pakete zu erstellen, damit Sie diese später auch ohne Netzwerkzugang erstellen lassen können. Es handelt sich um eine Erweiterung der Befehlszeilenoption @code{--source}, die jeden der folgenden Argumentwerte akzeptiert:" #. type: item -#: doc/guix.texi:8034 doc/guix.texi:9396 +#: doc/guix.texi:8032 doc/guix.texi:9394 #, no-wrap msgid "package" msgstr "package" #. type: table -#: doc/guix.texi:8037 +#: doc/guix.texi:8035 msgid "This value causes the @code{--sources} option to behave in the same way as the @code{--source} option." msgstr "Mit diesem Wert verhält sich die Befehlszeilenoption @code{--sources} auf genau die gleiche Weise wie die Befehlszeilenoption @code{--source}." #. type: item -#: doc/guix.texi:8038 doc/guix.texi:13889 +#: doc/guix.texi:8036 doc/guix.texi:13887 #, no-wrap msgid "all" msgstr "all" #. type: table -#: doc/guix.texi:8041 +#: doc/guix.texi:8039 msgid "Build the source derivations of all packages, including any source that might be listed as @code{inputs}. This is the default value." msgstr "Erstellt die Quellcode-Ableitungen aller Pakete einschließlich allen Quellcodes, der als Teil der Eingaben im @code{inputs}-Feld aufgelistet ist. Dies ist der vorgegebene Wert, wenn sonst keiner angegeben wird." #. type: example -#: doc/guix.texi:8047 +#: doc/guix.texi:8045 #, no-wrap msgid "" "$ guix build --sources tzdata\n" @@ -14881,18 +14892,18 @@ msgstr "" " /gnu/store/…-tzcode2015b.tar.gz.drv\n" #. type: item -#: doc/guix.texi:8049 +#: doc/guix.texi:8047 #, no-wrap msgid "transitive" msgstr "transitive" #. type: table -#: doc/guix.texi:8053 +#: doc/guix.texi:8051 msgid "Build the source derivations of all packages, as well of all transitive inputs to the packages. This can be used e.g.@: to prefetch package source for later offline building." msgstr "Die Quellcode-Ableitungen aller Pakete sowie aller transitiven Eingaben der Pakete erstellen. Damit kann z.B.@: Paket-Quellcode vorab heruntergeladen und später offline erstellt werden." #. type: example -#: doc/guix.texi:8064 +#: doc/guix.texi:8062 #, no-wrap msgid "" "$ guix build --sources=transitive tzdata\n" @@ -14916,158 +14927,158 @@ msgstr "" "…\n" #. type: table -#: doc/guix.texi:8074 +#: doc/guix.texi:8072 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host. The @command{guix build} command allows you to repeat this option several times, in which case it builds for all the specified systems; other commands ignore extraneous @option{-s} options." msgstr "Versuchen, für das angegebene @var{System} — z.B.@: @code{i686-linux} — statt für denselben Systemtyp wie auf dem Wirtssystem zu erstellen. Beim Befehl @command{guix build} können Sie diese Befehlszeilenoption mehrmals wiederholen, wodurch für jedes angegebene System eine Erstellung durchgeführt wird; andere Befehle ignorieren überzählige @option{-s}-Befehlszeilenoptionen." #. type: quotation -#: doc/guix.texi:8079 +#: doc/guix.texi:8077 msgid "The @code{--system} flag is for @emph{native} compilation and must not be confused with cross-compilation. See @code{--target} below for information on cross-compilation." msgstr "Die Befehlszeilenoption @code{--system} dient der @emph{nativen} Kompilierung (nicht zu verwechseln mit Cross-Kompilierung). Siehe @code{--target} unten für Informationen zur Cross-Kompilierung." #. type: table -#: doc/guix.texi:8086 +#: doc/guix.texi:8084 msgid "An example use of this is on Linux-based systems, which can emulate different personalities. For instance, passing @code{--system=i686-linux} on an @code{x86_64-linux} system or @code{--system=armhf-linux} on an @code{aarch64-linux} system allows you to build packages in a complete 32-bit environment." msgstr "Ein Beispiel sind Linux-basierte Systeme, die verschiedene Persönlichkeiten emulieren können. Zum Beispiel können Sie @code{--system=i686-linux} auf einem @code{x86_64-linux}-System oder @code{--system=armhf-linux} auf einem @code{aarch64-linux}-System angeben, um Pakete in einer vollständigen 32-Bit-Umgebung zu erstellen." #. type: quotation -#: doc/guix.texi:8091 +#: doc/guix.texi:8089 msgid "Building for an @code{armhf-linux} system is unconditionally enabled on @code{aarch64-linux} machines, although certain aarch64 chipsets do not allow for this functionality, notably the ThunderX." msgstr "Das Erstellen für ein @code{armhf-linux}-System ist ungeprüft auf allen @code{aarch64-linux}-Maschinen aktiviert, obwohl bestimmte aarch64-Chipsätze diese Funktionalität nicht unterstützen, darunter auch ThunderX." #. type: table -#: doc/guix.texi:8097 +#: doc/guix.texi:8095 msgid "Similarly, when transparent emulation with QEMU and @code{binfmt_misc} is enabled (@pxref{Virtualization Services, @code{qemu-binfmt-service-type}}), you can build for any system for which a QEMU @code{binfmt_misc} handler is installed." msgstr "Ebenso können Sie, wenn transparente Emulation mit QEMU und @code{binfmt_misc} aktiviert sind (siehe @ref{Virtualization Services, @code{qemu-binfmt-service-type}}), für jedes System Erstellungen durchführen, für das ein QEMU-@code{binfmt_misc}-Handler installiert ist." #. type: table -#: doc/guix.texi:8101 +#: doc/guix.texi:8099 msgid "Builds for a system other than that of the machine you are using can also be offloaded to a remote machine of the right architecture. @xref{Daemon Offload Setup}, for more information on offloading." msgstr "Erstellungen für ein anderes System, das nicht dem System der Maschine, die Sie benutzen, entspricht, können auch auf eine entfernte Maschine mit der richtigen Architektur ausgelagert werden. Siehe @ref{Daemon Offload Setup} für mehr Informationen über das Auslagern." #. type: table -#: doc/guix.texi:8107 +#: doc/guix.texi:8105 msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf})." msgstr "Lässt für das angegebene @var{Tripel} cross-erstellen, dieses muss ein gültiges GNU-Tripel wie z.B.@: @code{\"mips64el-linux-gnu\"} sein (siehe @ref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf})." #. type: anchor{#1} -#: doc/guix.texi:8109 +#: doc/guix.texi:8107 msgid "build-check" msgstr "build-check" #. type: item -#: doc/guix.texi:8109 +#: doc/guix.texi:8107 #, no-wrap msgid "--check" msgstr "--check" #. type: cindex -#: doc/guix.texi:8110 +#: doc/guix.texi:8108 #, no-wrap msgid "determinism, checking" msgstr "Determinismus, Überprüfung" #. type: cindex -#: doc/guix.texi:8111 +#: doc/guix.texi:8109 #, no-wrap msgid "reproducibility, checking" msgstr "Reproduzierbarkeit, Überprüfung" #. type: table -#: doc/guix.texi:8115 +#: doc/guix.texi:8113 msgid "Rebuild @var{package-or-derivation}, which are already available in the store, and raise an error if the build results are not bit-for-bit identical." msgstr "@var{Paket-oder-Ableitung} erneut erstellen, wenn diese bereits im Store verfügbar ist, und einen Fehler melden, wenn die Erstellungsergebnisse nicht Bit für Bit identisch sind." #. type: table -#: doc/guix.texi:8120 +#: doc/guix.texi:8118 msgid "This mechanism allows you to check whether previously installed substitutes are genuine (@pxref{Substitutes}), or whether the build result of a package is deterministic. @xref{Invoking guix challenge}, for more background information and tools." msgstr "Mit diesem Mechanismus können Sie überprüfen, ob zuvor installierte Substitute unverfälscht sind (siehe @ref{Substitutes}) oder auch ob das Erstellungsergebnis eines Pakets deterministisch ist. Siehe @ref{Invoking guix challenge} für mehr Hintergrundinformationen und Werkzeuge." #. type: item -#: doc/guix.texi:8125 +#: doc/guix.texi:8123 #, no-wrap msgid "--repair" msgstr "--repair" #. type: cindex -#: doc/guix.texi:8126 +#: doc/guix.texi:8124 #, no-wrap msgid "repairing store items" msgstr "Reparieren von Store-Objekten" #. type: table -#: doc/guix.texi:8130 +#: doc/guix.texi:8128 msgid "Attempt to repair the specified store items, if they are corrupt, by re-downloading or rebuilding them." msgstr "Versuchen, die angegebenen Store-Objekte zu reparieren, wenn sie beschädigt sind, indem sie neu heruntergeladen oder neu erstellt werden." #. type: table -#: doc/guix.texi:8132 +#: doc/guix.texi:8130 msgid "This operation is not atomic and thus restricted to @code{root}." msgstr "Diese Operation ist nicht atomar und nur der Administratornutzer @code{root} kann sie verwenden." #. type: item -#: doc/guix.texi:8133 +#: doc/guix.texi:8131 #, no-wrap msgid "--derivations" msgstr "--derivations" #. type: itemx -#: doc/guix.texi:8134 doc/guix.texi:24570 +#: doc/guix.texi:8132 doc/guix.texi:24561 #, no-wrap msgid "-d" msgstr "-d" #. type: table -#: doc/guix.texi:8137 +#: doc/guix.texi:8135 msgid "Return the derivation paths, not the output paths, of the given packages." msgstr "Liefert die Ableitungspfade und @emph{nicht} die Ausgabepfade für die angegebenen Pakete." #. type: cindex -#: doc/guix.texi:8140 +#: doc/guix.texi:8138 #, no-wrap msgid "GC roots, adding" msgstr "GC-Wurzeln, Hinzufügen" #. type: cindex -#: doc/guix.texi:8141 +#: doc/guix.texi:8139 #, no-wrap msgid "garbage collector roots, adding" msgstr "Müllsammlerwurzeln, Hinzufügen" #. type: table -#: doc/guix.texi:8144 doc/guix.texi:24606 +#: doc/guix.texi:8142 doc/guix.texi:24592 msgid "Make @var{file} a symlink to the result, and register it as a garbage collector root." msgstr "Die @var{Datei} zu einer symbolischen Verknüpfung auf das Ergebnis machen und als Müllsammlerwurzel registrieren." #. type: table -#: doc/guix.texi:8150 +#: doc/guix.texi:8148 msgid "Consequently, the results of this @command{guix build} invocation are protected from garbage collection until @var{file} is removed. When that option is omitted, build results are eligible for garbage collection as soon as the build completes. @xref{Invoking guix gc}, for more on GC roots." msgstr "Dadurch wird das Ergebnis dieses Aufrufs von @command{guix build} vor dem Müllsammler geschützt, bis die @var{Datei} gelöscht wird. Wird diese Befehlszeilenoption @emph{nicht} angegeben, können Erstellungsergebnisse vom Müllsammler geholt werden, sobald die Erstellung abgeschlossen ist. Siehe @ref{Invoking guix gc} für mehr Informationen zu Müllsammlerwurzeln." #. type: item -#: doc/guix.texi:8151 +#: doc/guix.texi:8149 #, no-wrap msgid "--log-file" msgstr "--log-file" #. type: cindex -#: doc/guix.texi:8152 +#: doc/guix.texi:8150 #, no-wrap msgid "build logs, access" msgstr "Erstellungsprotokolle, Zugriff" #. type: table -#: doc/guix.texi:8156 +#: doc/guix.texi:8154 msgid "Return the build log file names or URLs for the given @var{package-or-derivation}, or raise an error if build logs are missing." msgstr "Liefert die Dateinamen oder URLs der Erstellungsprotokolle für das angegebene @var{Paket-oder-Ableitung} oder meldet einen Fehler, falls Protokolldateien fehlen." #. type: table -#: doc/guix.texi:8159 +#: doc/guix.texi:8157 msgid "This works regardless of how packages or derivations are specified. For instance, the following invocations are equivalent:" msgstr "Dies funktioniert, egal wie die Pakete oder Ableitungen angegeben werden. Zum Beispiel sind folgende Aufrufe alle äquivalent:" #. type: example -#: doc/guix.texi:8165 +#: doc/guix.texi:8163 #, no-wrap msgid "" "guix build --log-file `guix build -d guile`\n" @@ -15081,17 +15092,17 @@ msgstr "" "guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)'\n" #. type: table -#: doc/guix.texi:8170 +#: doc/guix.texi:8168 msgid "If a log is unavailable locally, and unless @code{--no-substitutes} is passed, the command looks for a corresponding log on one of the substitute servers (as specified with @code{--substitute-urls}.)" msgstr "Wenn ein Protokoll lokal nicht verfügbar ist und sofern @code{--no-substitutes} nicht übergeben wurde, sucht der Befehl nach einem entsprechenden Protokoll auf einem der Substitutserver (die mit @code{--substitute-urls} angegeben werden können)." #. type: table -#: doc/guix.texi:8173 +#: doc/guix.texi:8171 msgid "So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine:" msgstr "Stellen Sie sich zum Beispiel vor, sie wollten das Erstellungsprotokoll von GDB auf einem MIPS-System sehen, benutzen aber selbst eine @code{x86_64}-Maschine:" #. type: example -#: doc/guix.texi:8177 +#: doc/guix.texi:8175 #, no-wrap msgid "" "$ guix build --log-file gdb -s mips64el-linux\n" @@ -15101,33 +15112,33 @@ msgstr "" "https://@value{SUBSTITUTE-SERVER}/log/…-gdb-7.10\n" #. type: table -#: doc/guix.texi:8180 +#: doc/guix.texi:8178 msgid "You can freely access a huge library of build logs!" msgstr "So haben Sie umsonst Zugriff auf eine riesige Bibliothek von Erstellungsprotokollen!" #. type: cindex -#: doc/guix.texi:8185 +#: doc/guix.texi:8183 #, no-wrap msgid "build failures, debugging" msgstr "Erstellungsfehler, Fehlersuche" #. type: Plain text -#: doc/guix.texi:8191 +#: doc/guix.texi:8189 msgid "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." msgstr "Wenn Sie ein neues Paket definieren (siehe @ref{Defining Packages}), werden Sie sich vermutlich einige Zeit mit der Fehlersuche beschäftigen und die Erstellung so lange anpassen, bis sie funktioniert. Dazu müssen Sie die Erstellungsbefehle selbst in einer Umgebung benutzen, die der, die der Erstellungsdaemon aufbaut, so ähnlich wie möglich ist." #. type: Plain text -#: doc/guix.texi:8196 +#: doc/guix.texi:8194 msgid "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}})." msgstr "Das Erste, was Sie dafür tun müssen, ist die Befehlszeilenoption @option{--keep-failed} oder @option{-K} von @command{guix build} einzusetzen, wodurch Verzeichnisbäume fehlgeschlagener Erstellungen in @file{/tmp} oder dem von Ihnen als @code{TMPDIR} ausgewiesenen Verzeichnis erhalten und nicht gelöscht werden (siehe @ref{Invoking guix build, @code{--keep-failed}})." #. type: Plain text -#: doc/guix.texi:8202 +#: doc/guix.texi:8200 msgid "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:" msgstr "Im Anschluss können Sie mit @command{cd} in die Verzeichnisse dieses fehlgeschlagenen Erstellungsbaums wechseln und mit @command{source} dessen @file{environment-variables}-Datei laden, die alle Umgebungsvariablendefinitionen enthält, die zum Zeitpunkt des Fehlschlags der Erstellung galten. Sagen wir, Sie suchen Fehler in einem Paket @code{foo}, dann würde eine typische Sitzung so aussehen:" #. type: example -#: doc/guix.texi:8209 +#: doc/guix.texi:8207 #, no-wrap msgid "" "$ guix build foo -K\n" @@ -15143,22 +15154,22 @@ msgstr "" "$ cd foo-1.2\n" #. type: Plain text -#: doc/guix.texi:8213 +#: doc/guix.texi:8211 msgid "Now, you can invoke commands as if you were the daemon (almost) and troubleshoot your build process." msgstr "Nun können Sie Befehle (fast) so aufrufen, als wären Sie der Daemon, und Fehlerursachen in Ihrem Erstellungsprozess ermitteln." #. type: Plain text -#: doc/guix.texi:8219 +#: doc/guix.texi:8217 msgid "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})." msgstr "Manchmal passiert es, dass zum Beispiel die Tests eines Pakets erfolgreich sind, wenn Sie sie manuell aufrufen, aber scheitern, wenn der Daemon sie ausführt. Das kann passieren, weil der Daemon Erstellungen in isolierten Umgebungen („Containern“) durchführt, wo, anders als in der obigen Umgebung, kein Netzwerkzugang möglich ist, @file{/bin/sh} nicht exisiert usw.@: (siehe @ref{Build Environment Setup})." #. type: Plain text -#: doc/guix.texi:8222 +#: doc/guix.texi:8220 msgid "In such cases, you may need to run inspect the build process from within a container similar to the one the build daemon creates:" msgstr "In solchen Fällen müssen Sie den Erstellungsprozess womöglich aus einer zu der des Daemons ähnlichen isolierten Umgebung heraus ausprobieren:" #. type: example -#: doc/guix.texi:8230 +#: doc/guix.texi:8228 #, no-wrap msgid "" "$ guix build -K foo\n" @@ -15176,251 +15187,251 @@ msgstr "" "[env]# cd foo-1.2\n" #. type: Plain text -#: doc/guix.texi:8239 +#: doc/guix.texi:8237 msgid "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. The @option{--no-grafts} option makes sure we get the exact same environment, with ungrafted packages (@pxref{Security Updates}, for more info on grafts)." msgstr "Hierbei erzeugt @command{guix environment -C} eine isolierte Umgebung und öffnet darin eine Shell (siehe @ref{Invoking guix environment}). Der Teil mit @command{--ad-hoc strace gdb} fügt die Befehle @command{strace} und @command{gdb} zur isolierten Umgebung hinzu, die Sie gut gebrauchen könnten, während Sie Fehler suchen. Wegen der Befehlszeilenoption @option{--no-grafts} bekommen Sie haargenau dieselbe Umgebung ohne veredelte Pakete (siehe @ref{Security Updates} für mehr Informationen zu Veredelungen)." #. type: Plain text -#: doc/guix.texi:8242 +#: doc/guix.texi:8240 msgid "To get closer to a container like that used by the build daemon, we can remove @file{/bin/sh}:" msgstr "Um der isolierten Umgebung des Erstellungsdaemons noch näher zu kommen, können wir @file{/bin/sh} entfernen:" #. type: example -#: doc/guix.texi:8245 +#: doc/guix.texi:8243 #, no-wrap msgid "[env]# rm /bin/sh\n" msgstr "[env]# rm /bin/sh\n" #. type: Plain text -#: doc/guix.texi:8249 +#: doc/guix.texi:8247 msgid "(Don't worry, this is harmless: this is all happening in the throw-away container created by @command{guix environment}.)" msgstr "(Keine Sorge, das ist harmlos: All dies passiert nur in der zuvor von @command{guix environment} erzeugten Wegwerf-Umgebung.)" #. type: Plain text -#: doc/guix.texi:8252 +#: doc/guix.texi:8250 msgid "The @command{strace} command is probably not in the search path, but we can run:" msgstr "Der Befehl @command{strace} befindet sich wahrscheinlich nicht in Ihrem Suchpfad, aber wir können ihn so benutzen:" #. type: example -#: doc/guix.texi:8255 +#: doc/guix.texi:8253 #, no-wrap msgid "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n" msgstr "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n" #. type: Plain text -#: doc/guix.texi:8260 +#: doc/guix.texi:8258 msgid "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." msgstr "Auf diese Weise haben Sie nicht nur die Umgebungsvariablen, die der Daemon benutzt, nachgebildet, sondern lassen auch den Erstellungsprozess in einer isolierten Umgebung ähnlich der des Daemons laufen." #. type: section -#: doc/guix.texi:8263 +#: doc/guix.texi:8261 #, no-wrap msgid "Invoking @command{guix edit}" msgstr "@command{guix edit} aufrufen" #. type: command{#1} -#: doc/guix.texi:8265 +#: doc/guix.texi:8263 #, no-wrap msgid "guix edit" msgstr "guix edit" #. type: cindex -#: doc/guix.texi:8266 +#: doc/guix.texi:8264 #, no-wrap msgid "package definition, editing" msgstr "Paketdefinition, Bearbeiten" #. type: Plain text -#: doc/guix.texi:8271 +#: doc/guix.texi:8269 msgid "So many packages, so many source files! The @command{guix edit} command facilitates the life of users and packagers by pointing their editor at the source file containing the definition of the specified packages. For instance:" msgstr "So viele Pakete, so viele Quelldateien! Der Befehl @command{guix edit} erleichtert das Leben von sowohl Nutzern als auch Paketentwicklern, indem er Ihren Editor anweist, die Quelldatei mit der Definition des jeweiligen Pakets zu bearbeiten. Zum Beispiel startet dies:" #. type: example -#: doc/guix.texi:8274 +#: doc/guix.texi:8272 #, no-wrap msgid "guix edit gcc@@4.9 vim\n" msgstr "guix edit gcc@@4.9 vim\n" #. type: Plain text -#: doc/guix.texi:8280 +#: doc/guix.texi:8278 msgid "launches the program specified in the @code{VISUAL} or in the @code{EDITOR} environment variable to view the recipe of GCC@tie{}4.9.3 and that of Vim." msgstr "das mit der Umgebungsvariablen @code{VISUAL} ode @code{EDITOR} angegebene Programm und lässt es das Rezept von GCC@tie{}4.9.3 und von Vim anzeigen." #. type: Plain text -#: doc/guix.texi:8286 +#: doc/guix.texi:8284 msgid "If you are using a Guix Git checkout (@pxref{Building from Git}), or have created your own packages on @code{GUIX_PACKAGE_PATH} (@pxref{Package Modules}), you will be able to edit the package recipes. In other cases, you will be able to examine the read-only recipes for packages currently in the store." msgstr "Wenn Sie ein Git-Checkout von Guix benutzen (siehe @ref{Building from Git}) oder Ihre eigenen Pakete im @code{GUIX_PACKAGE_PATH} erstellt haben (siehe @ref{Package Modules}), werden Sie damit die Paketrezepte auch bearbeiten können. Andernfalls werden Sie zumindest in die Lage versetzt, die nur lesbaren Rezepte für sich im Moment im Store befindliche Pakete zu untersuchen." #. type: section -#: doc/guix.texi:8289 +#: doc/guix.texi:8287 #, no-wrap msgid "Invoking @command{guix download}" msgstr "@command{guix download} aufrufen" #. type: command{#1} -#: doc/guix.texi:8291 +#: doc/guix.texi:8289 #, no-wrap msgid "guix download" msgstr "guix download" #. type: cindex -#: doc/guix.texi:8292 +#: doc/guix.texi:8290 #, no-wrap msgid "downloading package sources" msgstr "Paketquellcode herunterladen" #. type: Plain text -#: doc/guix.texi:8299 +#: doc/guix.texi:8297 msgid "When writing a package definition, developers typically need to download a source tarball, compute its SHA256 hash, and write that hash in the package definition (@pxref{Defining Packages}). The @command{guix download} tool helps with this task: it downloads a file from the given URI, adds it to the store, and prints both its file name in the store and its SHA256 hash." msgstr "Wenn Entwickler einer Paketdefinition selbige schreiben, müssen diese normalerweise einen Quellcode-Tarball herunterladen, seinen SHA256-Hash als Prüfsumme berechnen und diese in der Paketdefinition eintragen (siehe @ref{Defining Packages}). Das Werkzeug @command{guix download} hilft bei dieser Aufgabe: Damit wird eine Datei von der angegebenen URI heruntergeladen, in den Store eingelagert und sowohl ihr Dateiname im Store als auch ihr SHA256-Hash als Prüfsumme angezeigt." #. type: Plain text -#: doc/guix.texi:8306 +#: doc/guix.texi:8304 msgid "The fact that the downloaded file is added to the store saves bandwidth: when the developer eventually tries to build the newly defined package with @command{guix build}, the source tarball will not have to be downloaded again because it is already in the store. It is also a convenient way to temporarily stash files, which may be deleted eventually (@pxref{Invoking guix gc})." msgstr "Dadurch, dass die heruntergeladene Datei in den Store eingefügt wird, wird Bandbreite gespart: Wenn der Entwickler schließlich versucht, das neu definierte Paket mit @command{guix build} zu erstellen, muss der Quell-Tarball nicht erneut heruntergeladen werden, weil er sich bereits im Store befindet. Es ist auch eine bequeme Methode, Dateien temporär aufzubewahren, die letztlich irgendwann gelöscht werden (siehe @ref{Invoking guix gc})." #. type: Plain text -#: doc/guix.texi:8314 +#: doc/guix.texi:8312 msgid "The @command{guix download} command supports the same URIs as used in package definitions. In particular, it supports @code{mirror://} URIs. @code{https} URIs (HTTP over TLS) are supported @emph{provided} the Guile bindings for GnuTLS are available in the user's environment; when they are not available, an error is raised. @xref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, for more information." msgstr "Der Befehl @command{guix download} unterstützt dieselben URIs, die in Paketdefinitionen verwendet werden. Insbesondere unterstützt er @code{mirror://}-URIs. @code{https}-URIs (HTTP über TLS) werden unterstützt, @emph{vorausgesetzt} die Guile-Anbindungen für GnuTLS sind in der Umgebung des Benutzers verfügbar; wenn nicht, wird ein Fehler gemeldet. Siehe @ref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, hat mehr Informationen." #. type: Plain text -#: doc/guix.texi:8319 +#: doc/guix.texi:8317 msgid "@command{guix download} verifies HTTPS server certificates by loading the certificates of X.509 authorities from the directory pointed to by the @code{SSL_CERT_DIR} environment variable (@pxref{X.509 Certificates}), unless @option{--no-check-certificate} is used." msgstr "Mit @command{guix download} werden HTTPS-Serverzertifikate verifiziert, indem die Zertifikate der X.509-Autoritäten in das durch die Umgebungsvariable @code{SSL_CERT_DIR} bezeichnete Verzeichnis heruntergeladen werden (siehe @ref{X.509 Certificates}), außer @option{--no-check-certificate} wird benutzt." #. type: Plain text -#: doc/guix.texi:8321 doc/guix.texi:9638 +#: doc/guix.texi:8319 doc/guix.texi:9636 msgid "The following options are available:" msgstr "Folgende Befehlszeilenoptionen stehen zur Verfügung:" #. type: item -#: doc/guix.texi:8323 doc/guix.texi:8362 +#: doc/guix.texi:8321 doc/guix.texi:8360 #, no-wrap msgid "--format=@var{fmt}" msgstr "--format=@var{Format}" #. type: itemx -#: doc/guix.texi:8324 doc/guix.texi:8363 +#: doc/guix.texi:8322 doc/guix.texi:8361 #, no-wrap msgid "-f @var{fmt}" msgstr "-f @var{Format}" #. type: table -#: doc/guix.texi:8327 +#: doc/guix.texi:8325 msgid "Write the hash in the format specified by @var{fmt}. For more information on the valid values for @var{fmt}, @pxref{Invoking guix hash}." msgstr "Die Hash-Prüfsumme im angegebenen @var{Format} ausgeben. Für weitere Informationen, was gültige Werte für das @var{Format} sind, siehe @ref{Invoking guix hash}." #. type: item -#: doc/guix.texi:8328 +#: doc/guix.texi:8326 #, no-wrap msgid "--no-check-certificate" msgstr "--no-check-certificate" #. type: table -#: doc/guix.texi:8330 +#: doc/guix.texi:8328 msgid "Do not validate the X.509 certificates of HTTPS servers." msgstr "X.509-Zertifikate von HTTPS-Servern @emph{nicht} validieren." #. type: table -#: doc/guix.texi:8334 +#: doc/guix.texi:8332 msgid "When using this option, you have @emph{absolutely no guarantee} that you are communicating with the authentic server responsible for the given URL, which makes you vulnerable to ``man-in-the-middle'' attacks." msgstr "Wenn Sie diese Befehlszeilenoption benutzen, haben Sie @emph{keinerlei Garantie}, dass Sie tatsächlich mit dem authentischen Server, der für die angegebene URL verantwortlich ist, kommunizieren. Das macht Sie anfällig gegen sogenannte „Man-in-the-Middle“-Angriffe." #. type: item -#: doc/guix.texi:8335 +#: doc/guix.texi:8333 #, no-wrap msgid "--output=@var{file}" msgstr "--output=@var{Datei}" #. type: itemx -#: doc/guix.texi:8336 +#: doc/guix.texi:8334 #, no-wrap msgid "-o @var{file}" msgstr "-o @var{Datei}" #. type: table -#: doc/guix.texi:8339 +#: doc/guix.texi:8337 msgid "Save the downloaded file to @var{file} instead of adding it to the store." msgstr "Die heruntergeladene Datei @emph{nicht} in den Store, sondern in die angegebene @var{Datei} abspeichern." #. type: section -#: doc/guix.texi:8342 +#: doc/guix.texi:8340 #, no-wrap msgid "Invoking @command{guix hash}" msgstr "@command{guix hash} aufrufen" #. type: command{#1} -#: doc/guix.texi:8344 +#: doc/guix.texi:8342 #, no-wrap msgid "guix hash" msgstr "guix hash" #. type: Plain text -#: doc/guix.texi:8349 +#: doc/guix.texi:8347 msgid "The @command{guix hash} command computes the SHA256 hash of a file. It is primarily a convenience tool for anyone contributing to the distribution: it computes the cryptographic hash of a file, which can be used in the definition of a package (@pxref{Defining Packages})." msgstr "Der Befehl @command{guix hash} berechnet den SHA256-Hash einer Datei. Er ist primär ein Werkzeug, dass es bequemer macht, etwas zur Distribution beizusteuern: Damit wird die kryptografische Hash-Prüfsumme berechnet, die bei der Definition eines Pakets benutzt werden kann (siehe @ref{Defining Packages})." #. type: example -#: doc/guix.texi:8354 +#: doc/guix.texi:8352 #, no-wrap msgid "guix hash @var{option} @var{file}\n" msgstr "guix hash @var{Option} @var{Datei}\n" #. type: Plain text -#: doc/guix.texi:8359 +#: doc/guix.texi:8357 msgid "When @var{file} is @code{-} (a hyphen), @command{guix hash} computes the hash of data read from standard input. @command{guix hash} has the following options:" msgstr "Wird als @var{Datei} ein Bindestrich @code{-} angegeben, berechnet @command{guix hash} den Hash der von der Standardeingabe gelesenen Daten. @command{guix hash} unterstützt die folgenden Optionen:" #. type: table -#: doc/guix.texi:8365 +#: doc/guix.texi:8363 msgid "Write the hash in the format specified by @var{fmt}." msgstr "Gibt die Prüfsumme im angegebenen @var{Format} aus." #. type: table -#: doc/guix.texi:8368 +#: doc/guix.texi:8366 msgid "Supported formats: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well)." msgstr "Unterstützte Formate: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} und @code{hexadecimal} können auch benutzt werden)." #. type: table -#: doc/guix.texi:8372 +#: doc/guix.texi:8370 msgid "If the @option{--format} option is not specified, @command{guix hash} will output the hash in @code{nix-base32}. This representation is used in the definitions of packages." msgstr "Wird keine Befehlszeilenoption @option{--format} angegeben, wird @command{guix hash} die Prüfsumme im @code{nix-base32}-Format ausgeben. Diese Darstellung wird bei der Definition von Paketen benutzt." #. type: table -#: doc/guix.texi:8376 +#: doc/guix.texi:8374 msgid "Compute the hash on @var{file} recursively." msgstr "Die Prüfsumme der @var{Datei} rekursiv berechnen." #. type: table -#: doc/guix.texi:8385 +#: doc/guix.texi:8383 msgid "In this case, the hash is computed on an archive containing @var{file}, including its children if it is a directory. Some of the metadata of @var{file} is part of the archive; for instance, when @var{file} is a regular file, the hash is different depending on whether @var{file} is executable or not. Metadata such as time stamps has no impact on the hash (@pxref{Invoking guix archive})." msgstr "In diesem Fall wird die Prüfsumme eines Archivs berechnet, das die @var{Datei} enthält, und auch ihre Kinder, wenn es sich um ein Verzeichnis handelt. Einige der Metadaten der @var{Datei} sind Teil dieses Archivs. Zum Beispiel unterscheidet sich die berechnete Prüfsumme, wenn die @var{Datei} eine reguläre Datei ist, je nachdem, ob die @var{Datei} ausführbar ist oder nicht. Metadaten wie der Zeitstempel haben keinen Einfluss auf die Prüfsumme (siehe @ref{Invoking guix archive})." #. type: item -#: doc/guix.texi:8386 +#: doc/guix.texi:8384 #, no-wrap msgid "--exclude-vcs" msgstr "--exclude-vcs" #. type: itemx -#: doc/guix.texi:8387 +#: doc/guix.texi:8385 #, no-wrap msgid "-x" msgstr "-x" #. type: table -#: doc/guix.texi:8390 +#: doc/guix.texi:8388 msgid "When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)" msgstr "Wenn dies zusammen mit der Befehlszeilenoption @option{--recursive} angegeben wird, werden Verzeichnisse zur Versionskontrolle (@file{.bzr}, @file{.git}, @file{.hg}, etc.)@: vom Archiv ausgenommen." #. type: table -#: doc/guix.texi:8395 +#: doc/guix.texi:8393 msgid "As an example, here is how you would compute the hash of a Git checkout, which is useful when using the @code{git-fetch} method (@pxref{origin Reference}):" msgstr "Zum Beispiel würden Sie auf diese Art die Prüfsumme eines Git-Checkouts berechnen, was nützlich ist, wenn Sie die Prüfsumme für die Methode @code{git-fetch} benutzen (siehe @ref{origin Reference}):" #. type: example -#: doc/guix.texi:8400 +#: doc/guix.texi:8398 #, no-wrap msgid "" "$ git clone http://example.org/foo.git\n" @@ -15432,299 +15443,299 @@ msgstr "" "$ guix hash -rx .\n" #. type: cindex -#: doc/guix.texi:8404 doc/guix.texi:8409 +#: doc/guix.texi:8402 doc/guix.texi:8407 #, no-wrap msgid "Invoking @command{guix import}" msgstr "@command{guix import} aufrufen" #. type: cindex -#: doc/guix.texi:8406 +#: doc/guix.texi:8404 #, no-wrap msgid "importing packages" msgstr "Pakete importieren" #. type: cindex -#: doc/guix.texi:8407 +#: doc/guix.texi:8405 #, no-wrap msgid "package import" msgstr "Paketimport" #. type: cindex -#: doc/guix.texi:8408 +#: doc/guix.texi:8406 #, no-wrap msgid "package conversion" msgstr "Pakete an Guix anpassen" #. type: Plain text -#: doc/guix.texi:8416 +#: doc/guix.texi:8414 msgid "The @command{guix import} command is useful for people who would like to add a package to the distribution with as little work as possible---a legitimate demand. The command knows of a few repositories from which it can ``import'' package metadata. The result is a package definition, or a template thereof, in the format we know (@pxref{Defining Packages})." msgstr "Der Befehl @command{guix import} ist für Leute hilfreich, die ein Paket gerne mit so wenig Arbeit wie möglich zur Distribution hinzufügen würden — ein legitimer Anspruch. Der Befehl kennt ein paar Sammlungen, aus denen mit ihm Paketmetadaten „importiert“ werden können. Das Ergebnis ist eine Paketdefinition oder eine Vorlage dafür in dem uns bekannten Format (siehe @ref{Defining Packages})." #. type: example -#: doc/guix.texi:8421 +#: doc/guix.texi:8419 #, no-wrap msgid "guix import @var{importer} @var{options}@dots{}\n" msgstr "guix import @var{Importer} @var{Optionen}…\n" #. type: Plain text -#: doc/guix.texi:8427 +#: doc/guix.texi:8425 msgid "@var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and other options specific to @var{importer}. Currently, the available ``importers'' are:" msgstr "Der @var{Importer} gibt die Quelle an, aus der Paketmetadaten importiert werden, und die @var{Optionen} geben eine Paketbezeichnung und andere vom @var{Importer} abhängige Daten an. Derzeit sind folgende „Importer“ verfügbar:" #. type: item -#: doc/guix.texi:8429 doc/guix.texi:8929 +#: doc/guix.texi:8427 doc/guix.texi:8927 #, no-wrap msgid "gnu" msgstr "gnu" #. type: table -#: doc/guix.texi:8433 +#: doc/guix.texi:8431 msgid "Import metadata for the given GNU package. This provides a template for the latest version of that GNU package, including the hash of its source tarball, and its canonical synopsis and description." msgstr "Metadaten für das angegebene GNU-Paket importieren. Damit wird eine Vorlage für die neueste Version dieses GNU-Pakets zur Verfügung gestellt, einschließlich der Prüfsumme seines Quellcode-Tarballs, seiner kanonischen Zusammenfassung und seiner Beschreibung." #. type: table -#: doc/guix.texi:8436 +#: doc/guix.texi:8434 msgid "Additional information such as the package dependencies and its license needs to be figured out manually." msgstr "Zusätzliche Informationen wie Paketabhängigkeiten und seine Lizenz müssen noch manuell ermittelt werden." #. type: table -#: doc/guix.texi:8439 +#: doc/guix.texi:8437 msgid "For example, the following command returns a package definition for GNU@tie{}Hello:" msgstr "Zum Beispiel liefert der folgende Befehl eine Paketdefinition für GNU@tie{}Hello:" #. type: example -#: doc/guix.texi:8442 +#: doc/guix.texi:8440 #, no-wrap msgid "guix import gnu hello\n" msgstr "guix import gnu hello\n" #. type: table -#: doc/guix.texi:8445 doc/guix.texi:8672 doc/guix.texi:8722 doc/guix.texi:8751 +#: doc/guix.texi:8443 doc/guix.texi:8670 doc/guix.texi:8720 doc/guix.texi:8749 msgid "Specific command-line options are:" msgstr "Speziell für diesen Importer stehen noch folgende Befehlszeilenoptionen zur Verfügung:" #. type: item -#: doc/guix.texi:8447 doc/guix.texi:9078 +#: doc/guix.texi:8445 doc/guix.texi:9076 #, no-wrap msgid "--key-download=@var{policy}" msgstr "--key-download=@var{Richtlinie}" #. type: table -#: doc/guix.texi:8451 +#: doc/guix.texi:8449 msgid "As for @code{guix refresh}, specify the policy to handle missing OpenPGP keys when verifying the package signature. @xref{Invoking guix refresh, @code{--key-download}}." msgstr "Die Richtlinie zum Umgang mit fehlenden OpenPGP-Schlüsseln beim Verifizieren der Paketsignatur (auch „Beglaubigung“ genannt) festlegen, wie bei @code{guix refresh}. Siehe @ref{Invoking guix refresh, @code{--key-download}}." #. type: item -#: doc/guix.texi:8453 doc/guix.texi:8454 doc/guix.texi:8947 +#: doc/guix.texi:8451 doc/guix.texi:8452 doc/guix.texi:8945 #, no-wrap msgid "pypi" msgstr "pypi" #. type: table -#: doc/guix.texi:8461 +#: doc/guix.texi:8459 msgid "Import metadata from the @uref{https://pypi.python.org/, Python Package Index}. Information is taken from the JSON-formatted description available at @code{pypi.python.org} and usually includes all the relevant information, including package dependencies. For maximum efficiency, it is recommended to install the @command{unzip} utility, so that the importer can unzip Python wheels and gather data from them." msgstr "Metadaten aus dem @uref{https://pypi.python.org/, Python Package Index} importieren. Informationen stammen aus der JSON-formatierten Beschreibung, die unter @code{pypi.python.org} verfügbar ist, und enthalten meistens alle relevanten Informationen einschließlich der Abhängigkeiten des Pakets. Für maximale Effizienz wird empfohlen, das Hilfsprogramm @command{unzip} zu installieren, damit der Importer „Python Wheels“ entpacken und daraus Daten beziehen kann." #. type: table -#: doc/guix.texi:8464 +#: doc/guix.texi:8462 msgid "The command below imports metadata for the @code{itsdangerous} Python package:" msgstr "Der folgende Befehl importiert Metadaten für das Python-Paket namens @code{itsdangerous}:" #. type: example -#: doc/guix.texi:8467 +#: doc/guix.texi:8465 #, no-wrap msgid "guix import pypi itsdangerous\n" msgstr "guix import pypi itsdangerous\n" #. type: table -#: doc/guix.texi:8475 doc/guix.texi:8500 doc/guix.texi:8695 doc/guix.texi:8736 -#: doc/guix.texi:8783 +#: doc/guix.texi:8473 doc/guix.texi:8498 doc/guix.texi:8693 doc/guix.texi:8734 +#: doc/guix.texi:8781 msgid "Traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix." msgstr "Den Abhängigkeitsgraphen des angegebenen Pakets beim Anbieter rekursiv durchlaufen und Paketausdrücke für alle solchen Pakete erzeugen, die es in Guix noch nicht gibt." #. type: item -#: doc/guix.texi:8477 doc/guix.texi:8478 doc/guix.texi:8949 +#: doc/guix.texi:8475 doc/guix.texi:8476 doc/guix.texi:8947 #, no-wrap msgid "gem" msgstr "gem" #. type: table -#: doc/guix.texi:8487 +#: doc/guix.texi:8485 msgid "Import metadata from @uref{https://rubygems.org/, RubyGems}. Information is taken from the JSON-formatted description available at @code{rubygems.org} and includes most relevant information, including runtime dependencies. There are some caveats, however. The metadata doesn't distinguish between synopses and descriptions, so the same string is used for both fields. Additionally, the details of non-Ruby dependencies required to build native extensions is unavailable and left as an exercise to the packager." msgstr "Metadaten von @uref{https://rubygems.org/, RubyGems} importieren. Informationen kommen aus der JSON-formatierten Beschreibung, die auf @code{rubygems.org} verfügbar ist, und enthält die relevantesten Informationen einschließlich der Laufzeitabhängigkeiten. Dies hat aber auch Schattenseiten — die Metadaten unterscheiden nicht zwischen Zusammenfassungen und Beschreibungen, daher wird dieselbe Zeichenkette für beides eingesetzt. Zudem fehlen Informationen zu nicht in Ruby geschriebenen Abhängigkeiten, die benötigt werden, um native Erweiterungen zu in Ruby geschriebenem Code zu erstellen. Diese herauszufinden bleibt dem Paketentwickler überlassen." #. type: table -#: doc/guix.texi:8489 +#: doc/guix.texi:8487 msgid "The command below imports metadata for the @code{rails} Ruby package:" msgstr "Der folgende Befehl importiert Metadaten aus dem Ruby-Paket @code{rails}." #. type: example -#: doc/guix.texi:8492 +#: doc/guix.texi:8490 #, no-wrap msgid "guix import gem rails\n" msgstr "guix import gem rails\n" #. type: item -#: doc/guix.texi:8502 doc/guix.texi:8945 +#: doc/guix.texi:8500 doc/guix.texi:8943 #, no-wrap msgid "cpan" msgstr "cpan" #. type: cindex -#: doc/guix.texi:8503 +#: doc/guix.texi:8501 #, no-wrap msgid "CPAN" msgstr "CPAN" #. type: table -#: doc/guix.texi:8511 +#: doc/guix.texi:8509 msgid "Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}. Information is taken from the JSON-formatted metadata provided through @uref{https://fastapi.metacpan.org/, MetaCPAN's API} and includes most relevant information, such as module dependencies. License information should be checked closely. If Perl is available in the store, then the @code{corelist} utility will be used to filter core modules out of the list of dependencies." msgstr "Importiert Metadaten von @uref{https://www.metacpan.org/, MetaCPAN}. Informationen werden aus den JSON-formatierten Metadaten genommen, die über die @uref{https://fastapi.metacpan.org/, Programmierschnittstelle („API“) von MetaCPAN} angeboten werden, und enthalten die relevantesten Informationen wie zum Beispiel Modulabhängigkeiten. Lizenzinformationen sollten genau nachgeprüft werden. Wenn Perl im Store verfügbar ist, wird das Werkzeug @code{corelist} benutzt, um Kernmodule in der Abhängigkeitsliste wegzulassen." #. type: table -#: doc/guix.texi:8514 +#: doc/guix.texi:8512 msgid "The command command below imports metadata for the @code{Acme::Boolean} Perl module:" msgstr "Folgender Befehl importiert Metadaten für das Perl-Modul @code{Acme::Boolean}:" #. type: example -#: doc/guix.texi:8517 +#: doc/guix.texi:8515 #, no-wrap msgid "guix import cpan Acme::Boolean\n" msgstr "guix import cpan Acme::Boolean\n" #. type: item -#: doc/guix.texi:8519 doc/guix.texi:8941 +#: doc/guix.texi:8517 doc/guix.texi:8939 #, no-wrap msgid "cran" msgstr "cran" #. type: cindex -#: doc/guix.texi:8520 +#: doc/guix.texi:8518 #, no-wrap msgid "CRAN" msgstr "CRAN" #. type: cindex -#: doc/guix.texi:8521 +#: doc/guix.texi:8519 #, no-wrap msgid "Bioconductor" msgstr "Bioconductor" #. type: table -#: doc/guix.texi:8525 +#: doc/guix.texi:8523 msgid "Import metadata from @uref{https://cran.r-project.org/, CRAN}, the central repository for the @uref{https://r-project.org, GNU@tie{}R statistical and graphical environment}." msgstr "Metadaten aus dem @uref{https://cran.r-project.org/, CRAN} importieren, der zentralen Sammlung für die @uref{https://r-project.org, statistische und grafische Umgebung GNU@tie{}R}." #. type: table -#: doc/guix.texi:8527 +#: doc/guix.texi:8525 msgid "Information is extracted from the @code{DESCRIPTION} file of the package." msgstr "Informationen werden aus der Datei namens @code{DESCRIPTION} des Pakets extrahiert." #. type: table -#: doc/guix.texi:8530 +#: doc/guix.texi:8528 msgid "The command command below imports metadata for the @code{Cairo} R package:" msgstr "Der folgende Befehl importiert Metadaten für das @code{Cairo}-R-Paket:" #. type: example -#: doc/guix.texi:8533 +#: doc/guix.texi:8531 #, no-wrap msgid "guix import cran Cairo\n" msgstr "guix import cran Cairo\n" #. type: table -#: doc/guix.texi:8538 +#: doc/guix.texi:8536 msgid "When @code{--recursive} is added, the importer will traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix." msgstr "Wird zudem @code{--recursive} angegeben, wird der Importer den Abhängigkeitsgraphen des angegebenen Pakets beim Anbieter rekursiv durchlaufen und Paketausdrücke für all die Pakete erzeugen, die noch nicht Teil von Guix sind." #. type: table -#: doc/guix.texi:8543 +#: doc/guix.texi:8541 msgid "When @code{--archive=bioconductor} is added, metadata is imported from @uref{https://www.bioconductor.org/, Bioconductor}, a repository of R packages for for the analysis and comprehension of high-throughput genomic data in bioinformatics." msgstr "Wird @code{--archive=bioconductor} angegeben, werden Metadaten vom @uref{https://www.bioconductor.org/, Bioconductor} importiert, einer Sammlung von R-Paketen zur Analyse und zum Verständnis von großen Mengen genetischer Daten in der Bioinformatik." #. type: table -#: doc/guix.texi:8546 +#: doc/guix.texi:8544 msgid "Information is extracted from the @code{DESCRIPTION} file of a package published on the web interface of the Bioconductor SVN repository." msgstr "Informationen werden aus der @code{DESCRIPTION}-Datei im Paket extrahiert, das auf der Weboberfläche des Bioconductor-SVN-Repositorys veröffentlicht wurde." #. type: table -#: doc/guix.texi:8549 +#: doc/guix.texi:8547 msgid "The command below imports metadata for the @code{GenomicRanges} R package:" msgstr "Der folgende Befehl importiert Metadaten für das R-Paket @code{GenomicRanges}:" #. type: example -#: doc/guix.texi:8552 +#: doc/guix.texi:8550 #, no-wrap msgid "guix import cran --archive=bioconductor GenomicRanges\n" msgstr "guix import cran --archive=bioconductor GenomicRanges\n" #. type: item -#: doc/guix.texi:8554 +#: doc/guix.texi:8552 #, no-wrap msgid "texlive" msgstr "texlive" #. type: cindex -#: doc/guix.texi:8555 +#: doc/guix.texi:8553 #, no-wrap msgid "TeX Live" msgstr "TeX Live" #. type: cindex -#: doc/guix.texi:8556 +#: doc/guix.texi:8554 #, no-wrap msgid "CTAN" msgstr "CTAN" #. type: table -#: doc/guix.texi:8560 +#: doc/guix.texi:8558 msgid "Import metadata from @uref{https://www.ctan.org/, CTAN}, the comprehensive TeX archive network for TeX packages that are part of the @uref{https://www.tug.org/texlive/, TeX Live distribution}." msgstr "Metadaten aus @uref{https://www.ctan.org/, CTAN}, dem umfassenden TeX-Archivnetzwerk, herunterladen, was für TeX-Pakete benutzt wird, die Teil der @uref{https://www.tug.org/texlive/, TeX-Live-Distribution} sind." #. type: table -#: doc/guix.texi:8565 +#: doc/guix.texi:8563 msgid "Information about the package is obtained through the XML API provided by CTAN, while the source code is downloaded from the SVN repository of the Tex Live project. This is done because the CTAN does not keep versioned archives." msgstr "Informationen über das Paket werden über die von CTAN angebotene XML-Programmierschnittstelle bezogen, wohingegen der Quellcode aus dem SVN-Repository des TeX-Live-Projekts heruntergeladen wird. Das wird so gemacht, weil CTAN keine versionierten Archive vorhält." #. type: table -#: doc/guix.texi:8568 +#: doc/guix.texi:8566 msgid "The command command below imports metadata for the @code{fontspec} TeX package:" msgstr "Der folgende Befehl importiert Metadaten für das TeX-Paket @code{fontspec}:" #. type: example -#: doc/guix.texi:8571 +#: doc/guix.texi:8569 #, no-wrap msgid "guix import texlive fontspec\n" msgstr "guix import texlive fontspec\n" #. type: table -#: doc/guix.texi:8577 +#: doc/guix.texi:8575 msgid "When @code{--archive=DIRECTORY} is added, the source code is downloaded not from the @file{latex} sub-directory of the @file{texmf-dist/source} tree in the TeX Live SVN repository, but from the specified sibling directory under the same root." msgstr "Wenn @code{--archive=VERZEICHNIS} angegeben wird, wird der Quellcode @emph{nicht} aus dem Unterverzeichnis @file{latex} des @file{texmf-dist/source}-Baums im SVN-Repository von TeX Live heruntergeladen, sondern aus dem angegebenen Schwesterverzeichnis im selben Wurzelverzeichnis." #. type: table -#: doc/guix.texi:8581 +#: doc/guix.texi:8579 msgid "The command below imports metadata for the @code{ifxetex} package from CTAN while fetching the sources from the directory @file{texmf/source/generic}:" msgstr "Der folgende Befehl importiert Metadaten für das Paket @code{ifxetex} aus CTAN und lädt die Quelldateien aus dem Verzeichnis @file{texmf/source/generic}:" #. type: example -#: doc/guix.texi:8584 +#: doc/guix.texi:8582 #, no-wrap msgid "guix import texlive --archive=generic ifxetex\n" msgstr "guix import texlive --archive=generic ifxetex\n" #. type: cindex -#: doc/guix.texi:8587 +#: doc/guix.texi:8585 #, no-wrap msgid "JSON, import" msgstr "JSON, Import" #. type: table -#: doc/guix.texi:8590 +#: doc/guix.texi:8588 msgid "Import package metadata from a local JSON file. Consider the following example package definition in JSON format:" msgstr "Paketmetadaten aus einer lokalen JSON-Datei importieren. Betrachten Sie folgende Beispiel-Paketdefinition im JSON-Format:" #. type: example -#: doc/guix.texi:8603 +#: doc/guix.texi:8601 #, no-wrap msgid "" "@{\n" @@ -15752,17 +15763,17 @@ msgstr "" "@}\n" #. type: table -#: doc/guix.texi:8609 +#: doc/guix.texi:8607 msgid "The field names are the same as for the @code{} record (@xref{Defining Packages}). References to other packages are provided as JSON lists of quoted package specification strings such as @code{guile} or @code{guile@@2.0}." msgstr "Die Felder sind genauso benannt wie bei einem @code{}-Verbundstyp (siehe @ref{Defining Packages}). Referenzen zu anderen Paketen stehen darin als JSON-Liste von mit Anführungszeichen quotierten Zeichenketten wie @code{guile} oder @code{guile@@2.0}." #. type: table -#: doc/guix.texi:8612 +#: doc/guix.texi:8610 msgid "The importer also supports a more explicit source definition using the common fields for @code{} records:" msgstr "Der Importer unterstützt auch eine ausdrücklichere Definition der Quelldateien mit den üblichen Feldern eines @code{}-Verbunds:" #. type: example -#: doc/guix.texi:8625 +#: doc/guix.texi:8623 #, no-wrap msgid "" "@{\n" @@ -15790,288 +15801,288 @@ msgstr "" "@}\n" #. type: table -#: doc/guix.texi:8629 +#: doc/guix.texi:8627 msgid "The command below reads metadata from the JSON file @code{hello.json} and outputs a package expression:" msgstr "Der folgende Befehl liest Metadaten aus der JSON-Datei @code{hello.json} und gibt einen Paketausdruck aus:" #. type: example -#: doc/guix.texi:8632 +#: doc/guix.texi:8630 #, no-wrap msgid "guix import json hello.json\n" msgstr "guix import json hello.json\n" #. type: item -#: doc/guix.texi:8634 +#: doc/guix.texi:8632 #, no-wrap msgid "nix" msgstr "nix" #. type: table -#: doc/guix.texi:8643 +#: doc/guix.texi:8641 msgid "Import metadata from a local copy of the source of the @uref{https://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This relies on the @command{nix-instantiate} command of @uref{https://nixos.org/nix/, Nix}.}. Package definitions in Nixpkgs are typically written in a mixture of Nix-language and Bash code. This command only imports the high-level package structure that is written in the Nix language. It normally includes all the basic fields of a package definition." msgstr "Metadaten aus einer lokalen Kopie des Quellcodes der @uref{https://nixos.org/nixpkgs/, Nixpkgs-Distribution} importieren@footnote{Dazu wird der Befehl @command{nix-instantiate} von @uref{https://nixos.org/nix/, Nix} verwendet.}. Paketdefinitionen in Nixpkgs werden typischerweise in einer Mischung aus der Sprache von Nix und aus Bash-Code geschrieben. Dieser Befehl wird nur die abstrakte Paketstruktur, die in der Nix-Sprache geschrieben ist, importieren. Dazu gehören normalerweise alle grundlegenden Felder einer Paketdefinition." #. type: table -#: doc/guix.texi:8646 +#: doc/guix.texi:8644 msgid "When importing a GNU package, the synopsis and descriptions are replaced by their canonical upstream variant." msgstr "Beim Importieren eines GNU-Pakets werden Zusammenfassung und Beschreibung stattdessen durch deren kanonische Variante bei GNU ersetzt." #. type: table -#: doc/guix.texi:8648 +#: doc/guix.texi:8646 msgid "Usually, you will first need to do:" msgstr "Normalerweise würden Sie zunächst dies ausführen:" #. type: example -#: doc/guix.texi:8651 +#: doc/guix.texi:8649 #, no-wrap msgid "export NIX_REMOTE=daemon\n" msgstr "export NIX_REMOTE=daemon\n" #. type: table -#: doc/guix.texi:8655 +#: doc/guix.texi:8653 msgid "so that @command{nix-instantiate} does not try to open the Nix database." msgstr "damit @command{nix-instantiate} nicht versucht, die Nix-Datenbank zu öffnen." #. type: table -#: doc/guix.texi:8659 +#: doc/guix.texi:8657 msgid "As an example, the command below imports the package definition of LibreOffice (more precisely, it imports the definition of the package bound to the @code{libreoffice} top-level attribute):" msgstr "Zum Beispiel importiert der Befehl unten die Paketdefinition von LibreOffice (genauer gesagt importiert er die Definition des an das Attribut @code{libreoffice} auf oberster Ebene gebundenen Pakets):" #. type: example -#: doc/guix.texi:8662 +#: doc/guix.texi:8660 #, no-wrap msgid "guix import nix ~/path/to/nixpkgs libreoffice\n" msgstr "guix import nix ~/path/to/nixpkgs libreoffice\n" #. type: item -#: doc/guix.texi:8664 doc/guix.texi:8665 doc/guix.texi:8953 +#: doc/guix.texi:8662 doc/guix.texi:8663 doc/guix.texi:8951 #, no-wrap msgid "hackage" msgstr "hackage" #. type: table -#: doc/guix.texi:8670 +#: doc/guix.texi:8668 msgid "Import metadata from the Haskell community's central package archive @uref{https://hackage.haskell.org/, Hackage}. Information is taken from Cabal files and includes all the relevant information, including package dependencies." msgstr "Metadaten aus @uref{https://hackage.haskell.org/, Hackage}, dem zentralen Paketarchiv der Haskell-Gemeinde, importieren. Informationen werden aus Cabal-Dateien ausgelesen. Darin sind alle relevanten Informationen einschließlich der Paketabhängigkeiten enthalten." #. type: item -#: doc/guix.texi:8674 +#: doc/guix.texi:8672 #, no-wrap msgid "--stdin" msgstr "--stdin" #. type: itemx -#: doc/guix.texi:8675 +#: doc/guix.texi:8673 #, no-wrap msgid "-s" msgstr "-s" #. type: table -#: doc/guix.texi:8677 +#: doc/guix.texi:8675 msgid "Read a Cabal file from standard input." msgstr "Eine Cabal-Datei von der Standardeingabe lesen." #. type: item -#: doc/guix.texi:8677 doc/guix.texi:8724 +#: doc/guix.texi:8675 doc/guix.texi:8722 #, no-wrap msgid "--no-test-dependencies" msgstr "--no-test-dependencies" #. type: itemx -#: doc/guix.texi:8678 doc/guix.texi:8725 +#: doc/guix.texi:8676 doc/guix.texi:8723 #, no-wrap msgid "-t" msgstr "-t" #. type: table -#: doc/guix.texi:8680 doc/guix.texi:8727 +#: doc/guix.texi:8678 doc/guix.texi:8725 msgid "Do not include dependencies required only by the test suites." msgstr "Keine Abhängigkeiten übernehmen, die nur von Testkatalogen benötigt werden." #. type: item -#: doc/guix.texi:8680 +#: doc/guix.texi:8678 #, no-wrap msgid "--cabal-environment=@var{alist}" msgstr "--cabal-environment=@var{Aliste}" #. type: itemx -#: doc/guix.texi:8681 +#: doc/guix.texi:8679 #, no-wrap msgid "-e @var{alist}" msgstr "-e @var{Aliste}" #. type: table -#: doc/guix.texi:8690 +#: doc/guix.texi:8688 msgid "@var{alist} is a Scheme alist defining the environment in which the Cabal conditionals are evaluated. The accepted keys are: @code{os}, @code{arch}, @code{impl} and a string representing the name of a flag. The value associated with a flag has to be either the symbol @code{true} or @code{false}. The value associated with other keys has to conform to the Cabal file format definition. The default value associated with the keys @code{os}, @code{arch} and @code{impl} is @samp{linux}, @samp{x86_64} and @samp{ghc}, respectively." msgstr "@var{Aliste} muss eine assoziative Liste der Scheme-Programmiersprache sein, die die Umgebung definiert, in der bedingte Ausdrücke von Cabal ausgewertet werden. Dabei werden folgende Schlüssel akzeptiert: @code{os}, @code{arch}, @code{impl} und eine Zeichenkette, die dem Namen einer Option (einer „Flag“) entspricht. Der mit einer „Flag“ assoziierte Wert muss entweder das Symbol @code{true} oder @code{false} sein. Der anderen Schlüsseln zugeordnete Wert muss mit der Definition des Cabal-Dateiformats konform sein. Der vorgegebene Wert zu den Schlüsseln @code{os}, @code{arch} and @code{impl} ist jeweils @samp{linux}, @samp{x86_64} bzw. @samp{ghc}." #. type: table -#: doc/guix.texi:8700 +#: doc/guix.texi:8698 msgid "The command below imports metadata for the latest version of the @code{HTTP} Haskell package without including test dependencies and specifying the value of the flag @samp{network-uri} as @code{false}:" msgstr "Der folgende Befehl importiert Metadaten für die neuste Version des Haskell-@code{HTTP}-Pakets, ohne Testabhängigkeiten zu übernehmen und bei Übergabe von @code{false} als Wert der Flag @samp{network-uri}:" #. type: example -#: doc/guix.texi:8703 +#: doc/guix.texi:8701 #, no-wrap msgid "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n" msgstr "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n" #. type: table -#: doc/guix.texi:8707 +#: doc/guix.texi:8705 msgid "A specific package version may optionally be specified by following the package name by an at-sign and a version number as in the following example:" msgstr "Eine ganz bestimmte Paketversion kann optional ausgewählt werden, indem man nach dem Paketnamen anschließend ein At-Zeichen und eine Versionsnummer angibt wie in folgendem Beispiel:" #. type: example -#: doc/guix.texi:8710 +#: doc/guix.texi:8708 #, no-wrap msgid "guix import hackage mtl@@2.1.3.1\n" msgstr "guix import hackage mtl@@2.1.3.1\n" #. type: item -#: doc/guix.texi:8712 doc/guix.texi:8713 doc/guix.texi:8955 +#: doc/guix.texi:8710 doc/guix.texi:8711 doc/guix.texi:8953 #, no-wrap msgid "stackage" msgstr "stackage" #. type: table -#: doc/guix.texi:8720 +#: doc/guix.texi:8718 msgid "The @code{stackage} importer is a wrapper around the @code{hackage} one. It takes a package name, looks up the package version included in a long-term support (LTS) @uref{https://www.stackage.org, Stackage} release and uses the @code{hackage} importer to retrieve its metadata. Note that it is up to you to select an LTS release compatible with the GHC compiler used by Guix." msgstr "Der @code{stackage}-Importer ist ein Wrapper um den @code{hackage}-Importer. Er nimmt einen Paketnamen und schaut dafür die Paketversion nach, die Teil einer @uref{https://www.stackage.org, Stackage-Veröffentlichung} mit Langzeitunterstützung (englisch „Long-Term Support“, kurz LTS) ist, deren Metadaten er dann mit dem @code{hackage}-Importer bezieht. Beachten Sie, dass es Ihre Aufgabe ist, eine LTS-Veröffentlichung auszuwählen, die mit dem von Guix benutzten GHC-Compiler kompatibel ist." #. type: item -#: doc/guix.texi:8727 +#: doc/guix.texi:8725 #, no-wrap msgid "--lts-version=@var{version}" msgstr "--lts-version=@var{Version}" #. type: itemx -#: doc/guix.texi:8728 +#: doc/guix.texi:8726 #, no-wrap msgid "-l @var{version}" msgstr "-l @var{Version}" #. type: table -#: doc/guix.texi:8731 +#: doc/guix.texi:8729 msgid "@var{version} is the desired LTS release version. If omitted the latest release is used." msgstr "@var{Version} ist die gewünschte Version der LTS-Veröffentlichung. Wird keine angegeben, wird die neueste benutzt." #. type: table -#: doc/guix.texi:8740 +#: doc/guix.texi:8738 msgid "The command below imports metadata for the @code{HTTP} Haskell package included in the LTS Stackage release version 7.18:" msgstr "Der folgende Befehl importiert Metadaten für dasjenige @code{HTTP}-Haskell-Paket, das in der LTS-Stackage-Veröffentlichung mit Version 7.18 vorkommt:" #. type: example -#: doc/guix.texi:8743 +#: doc/guix.texi:8741 #, no-wrap msgid "guix import stackage --lts-version=7.18 HTTP\n" msgstr "guix import stackage --lts-version=7.18 HTTP\n" #. type: item -#: doc/guix.texi:8745 doc/guix.texi:8746 doc/guix.texi:8939 +#: doc/guix.texi:8743 doc/guix.texi:8744 doc/guix.texi:8937 #, no-wrap msgid "elpa" msgstr "elpa" #. type: table -#: doc/guix.texi:8749 +#: doc/guix.texi:8747 msgid "Import metadata from an Emacs Lisp Package Archive (ELPA) package repository (@pxref{Packages,,, emacs, The GNU Emacs Manual})." msgstr "Metadaten aus der Paketsammlung „Emacs Lisp Package Archive“ (ELPA) importieren (siehe @ref{Packages,,, emacs, The GNU Emacs Manual})." #. type: item -#: doc/guix.texi:8753 +#: doc/guix.texi:8751 #, no-wrap msgid "--archive=@var{repo}" msgstr "--archive=@var{Repo}" #. type: itemx -#: doc/guix.texi:8754 +#: doc/guix.texi:8752 #, no-wrap msgid "-a @var{repo}" msgstr "-a @var{Repo}" #. type: table -#: doc/guix.texi:8758 +#: doc/guix.texi:8756 msgid "@var{repo} identifies the archive repository from which to retrieve the information. Currently the supported repositories and their identifiers are:" msgstr "Mit @var{Repo} wird die Archiv-Sammlung (ein „Repository“) bezeichnet, von dem die Informationen bezogen werden sollen. Derzeit sind die unterstützten Repositorys und ihre Bezeichnungen folgende:" #. type: itemize -#: doc/guix.texi:8762 +#: doc/guix.texi:8760 msgid "@uref{https://elpa.gnu.org/packages, GNU}, selected by the @code{gnu} identifier. This is the default." msgstr "@uref{https://elpa.gnu.org/packages, GNU}, bezeichnet mit @code{gnu}. Dies ist die Vorgabe." #. type: itemize -#: doc/guix.texi:8768 +#: doc/guix.texi:8766 msgid "Packages from @code{elpa.gnu.org} are signed with one of the keys contained in the GnuPG keyring at @file{share/emacs/25.1/etc/package-keyring.gpg} (or similar) in the @code{emacs} package (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual})." msgstr "Pakete aus @code{elpa.gnu.org} wurden mit einem der Schlüssel im GnuPG-Schlüsselbund in @file{share/emacs/25.1/etc/package-keyring.gpg} (oder einem ähnlichen Pfad) des @code{emacs}-Pakets signiert (siehe @ref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual})." #. type: itemize -#: doc/guix.texi:8772 +#: doc/guix.texi:8770 msgid "@uref{https://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier." msgstr "@uref{https://stable.melpa.org/packages, MELPA-Stable}, bezeichnet mit @code{melpa-stable}." #. type: itemize -#: doc/guix.texi:8776 +#: doc/guix.texi:8774 msgid "@uref{https://melpa.org/packages, MELPA}, selected by the @code{melpa} identifier." msgstr "@uref{https://melpa.org/packages, MELPA}, bezeichnet mit @code{melpa}." #. type: item -#: doc/guix.texi:8785 doc/guix.texi:8786 doc/guix.texi:8957 +#: doc/guix.texi:8783 doc/guix.texi:8784 doc/guix.texi:8955 #, no-wrap msgid "crate" msgstr "crate" #. type: table -#: doc/guix.texi:8789 +#: doc/guix.texi:8787 msgid "Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}." msgstr "Metadaten aus der Paketsammlung crates.io für Rust importieren @uref{https://crates.io, crates.io}." #. type: item -#: doc/guix.texi:8790 +#: doc/guix.texi:8788 #, no-wrap msgid "opam" msgstr "opam" #. type: cindex -#: doc/guix.texi:8791 +#: doc/guix.texi:8789 #, no-wrap msgid "OPAM" msgstr "OPAM" #. type: cindex -#: doc/guix.texi:8792 +#: doc/guix.texi:8790 #, no-wrap msgid "OCaml" msgstr "OCaml" #. type: table -#: doc/guix.texi:8795 +#: doc/guix.texi:8793 msgid "Import metadata from the @uref{https://opam.ocaml.org/, OPAM} package repository used by the OCaml community." msgstr "Metadaten aus der Paketsammlung @uref{https://opam.ocaml.org/, OPAM} der OCaml-Gemeinde importieren." #. type: Plain text -#: doc/guix.texi:8800 +#: doc/guix.texi:8798 msgid "The structure of the @command{guix import} code is modular. It would be useful to have more importers for other package formats, and your help is welcome here (@pxref{Contributing})." msgstr "@command{guix import} verfügt über eine modulare Code-Struktur. Mehr Importer für andere Paketformate zu haben, wäre nützlich, und Ihre Hilfe ist hierbei gerne gesehen (siehe @ref{Contributing})." #. type: section -#: doc/guix.texi:8802 +#: doc/guix.texi:8800 #, no-wrap msgid "Invoking @command{guix refresh}" msgstr "@command{guix refresh} aufrufen" #. type: command{#1} -#: doc/guix.texi:8804 +#: doc/guix.texi:8802 #, no-wrap msgid "guix refresh" msgstr "guix refresh" #. type: Plain text -#: doc/guix.texi:8809 +#: doc/guix.texi:8807 msgid "The primary audience of the @command{guix refresh} command is developers of the GNU software distribution. By default, it reports any packages provided by the distribution that are outdated compared to the latest upstream version, like this:" msgstr "Die Zielgruppe des Befehls @command{guix refresh} zum Auffrischen von Paketen sind in erster Linie Entwickler der GNU-Software-Distribution. Nach Vorgabe werden damit alle Pakete in der Distribution gemeldet, die nicht der neuesten Version des Anbieters entsprechen, indem Sie dies ausführen:" #. type: example -#: doc/guix.texi:8814 +#: doc/guix.texi:8812 #, no-wrap msgid "" "$ guix refresh\n" @@ -16083,12 +16094,12 @@ msgstr "" "gnu/packages/glib.scm:77:12: glib would be upgraded from 2.34.3 to 2.37.0\n" #. type: Plain text -#: doc/guix.texi:8818 +#: doc/guix.texi:8816 msgid "Alternately, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater:" msgstr "Alternativ können die zu betrachtenden Pakete dabei angegeben werden, was zur Ausgabe einer Warnung führt, wenn es für Pakete kein Aktualisierungsprogramm gibt:" #. type: example -#: doc/guix.texi:8823 +#: doc/guix.texi:8821 #, no-wrap msgid "" "$ guix refresh coreutils guile guile-ssh\n" @@ -16100,17 +16111,17 @@ msgstr "" "gnu/packages/guile.scm:136:12: guile would be upgraded from 2.0.12 to 2.0.13\n" #. type: Plain text -#: doc/guix.texi:8832 +#: doc/guix.texi:8830 msgid "@command{guix refresh} browses the upstream repository of each package and determines the highest version number of the releases therein. The command knows how to update specific types of packages: GNU packages, ELPA packages, etc.---see the documentation for @option{--type} below. There are many packages, though, for which it lacks a method to determine whether a new upstream release is available. However, the mechanism is extensible, so feel free to get in touch with us to add a new method!" msgstr "@command{guix refresh} durchsucht die Paketsammlung beim Anbieter jedes Pakets und bestimmt, was die höchste Versionsnummer ist, zu der es dort eine Veröffentlichung gibt. Zum Befehl gehören Aktualisierungsprogramme, mit denen bestimmte Typen von Paketen automatisch aktualisiert werden können: GNU-Pakete, ELPA-Pakete usw.@: — siehe die Dokumentation von @option{--type} unten. Es gibt jedoch auch viele Pakete, für die noch keine Methode enthalten ist, um das Vorhandensein einer neuen Veröffentlichung zu prüfen. Der Mechanismus ist aber erweiterbar, also können Sie gerne mit uns in Kontakt treten, wenn Sie eine neue Methode hinzufügen möchten!" #. type: table -#: doc/guix.texi:8837 +#: doc/guix.texi:8835 msgid "Consider the packages specified, and all the packages upon which they depend." msgstr "Hiermit werden die angegebenen Pakete betrachtet und außerdem alle Pakete, von denen sie abhängen." #. type: example -#: doc/guix.texi:8845 +#: doc/guix.texi:8843 #, no-wrap msgid "" "$ guix refresh --recursive coreutils\n" @@ -16128,12 +16139,12 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:8853 +#: doc/guix.texi:8851 msgid "Sometimes the upstream name differs from the package name used in Guix, and @command{guix refresh} needs a little help. Most updaters honor the @code{upstream-name} property in package definitions, which can be used to that effect:" msgstr "Manchmal unterscheidet sich der vom Anbieter benutzte Name von dem Paketnamen, der in Guix verwendet wird, so dass @command{guix refresh} etwas Unterstützung braucht. Die meisten Aktualisierungsprogramme folgen der Eigenschaft @code{upstream-name} in Paketdefinitionen, die diese Unterstützung bieten kann." #. type: example -#: doc/guix.texi:8860 +#: doc/guix.texi:8858 #, no-wrap msgid "" "(define-public network-manager\n" @@ -16149,237 +16160,237 @@ msgstr "" " (properties '((upstream-name . \"NetworkManager\")))))\n" #. type: Plain text -#: doc/guix.texi:8872 +#: doc/guix.texi:8870 msgid "When passed @code{--update}, it modifies distribution source files to update the version numbers and source tarball hashes of those package recipes (@pxref{Defining Packages}). This is achieved by downloading each package's latest source tarball and its associated OpenPGP signature, authenticating the downloaded tarball against its signature using @command{gpg}, and finally computing its hash. When the public key used to sign the tarball is missing from the user's keyring, an attempt is made to automatically retrieve it from a public key server; when this is successful, the key is added to the user's keyring; otherwise, @command{guix refresh} reports an error." msgstr "Wenn @code{--update} übergeben wird, werden die Quelldateien der Distribution verändert, so dass für diese Paketrezepte die aktuelle Version und die aktuelle Hash-Prüfsumme des Quellcode-Tarballs eingetragen wird (siehe @ref{Defining Packages}). Dazu werden der neueste Quellcode-Tarball jedes Pakets sowie die jeweils zugehörige OpenPGP-Signatur heruntergeladen; mit Letzterer wird der heruntergeladene Tarball gegen seine Signatur mit @command{gpg} authentifiziert und schließlich dessen Hash berechnet. Wenn der öffentliche Schlüssel, mit dem der Tarball signiert wurde, im Schlüsselbund des Benutzers fehlt, wird versucht, ihn automatisch von einem Schlüssel-Server zu holen; wenn das klappt, wird der Schlüssel zum Schlüsselbund des Benutzers hinzugefügt, ansonsten meldet @command{guix refresh} einen Fehler." #. type: Plain text -#: doc/guix.texi:8874 +#: doc/guix.texi:8872 msgid "The following options are supported:" msgstr "Die folgenden Befehlszeilenoptionen werden unterstützt:" #. type: table -#: doc/guix.texi:8882 doc/guix.texi:9540 +#: doc/guix.texi:8880 doc/guix.texi:9538 msgid "This is useful to precisely refer to a package, as in this example:" msgstr "Dies ist nützlich, um genau ein bestimmtes Paket zu referenzieren, wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:8885 +#: doc/guix.texi:8883 #, no-wrap msgid "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n" msgstr "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n" #. type: table -#: doc/guix.texi:8889 +#: doc/guix.texi:8887 msgid "This command lists the dependents of the ``final'' libc (essentially all the packages.)" msgstr "Dieser Befehls listet auf, was alles von der „endgültigen“ Erstellung von libc abhängt (praktisch alle Pakete)." #. type: item -#: doc/guix.texi:8890 +#: doc/guix.texi:8888 #, no-wrap msgid "--update" msgstr "--update" #. type: itemx -#: doc/guix.texi:8891 +#: doc/guix.texi:8889 #, no-wrap msgid "-u" msgstr "-u" #. type: table -#: doc/guix.texi:8895 +#: doc/guix.texi:8893 msgid "Update distribution source files (package recipes) in place. This is usually run from a checkout of the Guix source tree (@pxref{Running Guix Before It Is Installed}):" msgstr "Die Quelldateien der Distribution (die Paketrezepte) werden direkt „in place“ verändert. Normalerweise führen Sie dies aus einem Checkout des Guix-Quellbaums heraus aus (siehe @ref{Running Guix Before It Is Installed}):" #. type: example -#: doc/guix.texi:8898 +#: doc/guix.texi:8896 #, no-wrap msgid "$ ./pre-inst-env guix refresh -s non-core -u\n" msgstr "$ ./pre-inst-env guix refresh -s non-core -u\n" #. type: table -#: doc/guix.texi:8901 +#: doc/guix.texi:8899 msgid "@xref{Defining Packages}, for more information on package definitions." msgstr "Siehe @ref{Defining Packages} für mehr Informationen zu Paketdefinitionen." #. type: item -#: doc/guix.texi:8902 +#: doc/guix.texi:8900 #, no-wrap msgid "--select=[@var{subset}]" msgstr "--select=[@var{Teilmenge}]" #. type: itemx -#: doc/guix.texi:8903 +#: doc/guix.texi:8901 #, no-wrap msgid "-s @var{subset}" msgstr "-s @var{Teilmenge}" #. type: table -#: doc/guix.texi:8906 +#: doc/guix.texi:8904 msgid "Select all the packages in @var{subset}, one of @code{core} or @code{non-core}." msgstr "Wählt alle Pakete aus der @var{Teilmenge} aus, die entweder @code{core} oder @code{non-core} sein muss." #. type: table -#: doc/guix.texi:8913 +#: doc/guix.texi:8911 msgid "The @code{core} subset refers to all the packages at the core of the distribution---i.e., packages that are used to build ``everything else''. This includes GCC, libc, Binutils, Bash, etc. Usually, changing one of these packages in the distribution entails a rebuild of all the others. Thus, such updates are an inconvenience to users in terms of build time or bandwidth used to achieve the upgrade." msgstr "Die @code{core}-Teilmenge bezieht sich auf alle Pakete, die den Kern der Distribution ausmachen, d.h.@: Pakete, aus denen heraus „alles andere“ erstellt wird. Dazu gehören GCC, libc, Binutils, Bash und so weiter. In der Regel ist die Folge einer Änderung an einem dieser Pakete in der Distribution, dass alle anderen neu erstellt werden müssen. Daher sind solche Änderungen unangenehm für Nutzer, weil sie einiges an Erstellungszeit oder Bandbreite investieren müssen, um die Aktualisierung abzuschließen." #. type: table -#: doc/guix.texi:8917 +#: doc/guix.texi:8915 msgid "The @code{non-core} subset refers to the remaining packages. It is typically useful in cases where an update of the core packages would be inconvenient." msgstr "Die @code{non-core}-Teilmenge bezieht sich auf die übrigen Pakete. Sie wird typischerweise dann benutzt, wenn eine Aktualisierung der Kernpakete zu viele Umstände machen würde." #. type: table -#: doc/guix.texi:8922 +#: doc/guix.texi:8920 msgid "Select all the packages from the manifest in @var{file}. This is useful to check if any packages of the user manifest can be updated." msgstr "Wählt alle Pakete im in der @var{Datei} stehenden Manifest aus. Das ist nützlich, um zu überprüfen, welche Pakete aus dem Manifest des Nutzers aktualisiert werden können." #. type: item -#: doc/guix.texi:8923 +#: doc/guix.texi:8921 #, no-wrap msgid "--type=@var{updater}" msgstr "--type=@var{Aktualisierungsprogramm}" #. type: itemx -#: doc/guix.texi:8924 +#: doc/guix.texi:8922 #, no-wrap msgid "-t @var{updater}" msgstr "-t @var{Aktualisierungsprogramm}" #. type: table -#: doc/guix.texi:8927 +#: doc/guix.texi:8925 msgid "Select only packages handled by @var{updater} (may be a comma-separated list of updaters). Currently, @var{updater} may be one of:" msgstr "Nur solche Pakete auswählen, die vom angegebenen @var{Aktualisierungsprogramm} behandelt werden. Es darf auch eine kommagetrennte Liste mehrerer Aktualisierungsprogramme angegeben werden. Zur Zeit kann als @var{Aktualisierungsprogramm} eines der folgenden angegeben werden:" #. type: table -#: doc/guix.texi:8931 +#: doc/guix.texi:8929 msgid "the updater for GNU packages;" msgstr "Aktualisierungsprogramm für GNU-Pakete," #. type: item -#: doc/guix.texi:8931 +#: doc/guix.texi:8929 #, no-wrap msgid "gnome" msgstr "gnome" #. type: table -#: doc/guix.texi:8933 +#: doc/guix.texi:8931 msgid "the updater for GNOME packages;" msgstr "Aktualisierungsprogramm für GNOME-Pakete," #. type: item -#: doc/guix.texi:8933 +#: doc/guix.texi:8931 #, no-wrap msgid "kde" msgstr "kde" #. type: table -#: doc/guix.texi:8935 +#: doc/guix.texi:8933 msgid "the updater for KDE packages;" msgstr "Aktualisierungsprogramm für KDE-Pakete," #. type: item -#: doc/guix.texi:8935 +#: doc/guix.texi:8933 #, no-wrap msgid "xorg" msgstr "xorg" #. type: table -#: doc/guix.texi:8937 +#: doc/guix.texi:8935 msgid "the updater for X.org packages;" msgstr "Aktualisierungsprogramm für X.org-Pakete," #. type: item -#: doc/guix.texi:8937 +#: doc/guix.texi:8935 #, no-wrap msgid "kernel.org" msgstr "kernel.org" #. type: table -#: doc/guix.texi:8939 +#: doc/guix.texi:8937 msgid "the updater for packages hosted on kernel.org;" msgstr "Aktualisierungsprogramm auf kernel.org angebotener Pakete," #. type: table -#: doc/guix.texi:8941 +#: doc/guix.texi:8939 msgid "the updater for @uref{https://elpa.gnu.org/, ELPA} packages;" msgstr "Aktualisierungsprogramm für @uref{https://elpa.gnu.org/, ELPA-Pakete}," #. type: table -#: doc/guix.texi:8943 +#: doc/guix.texi:8941 msgid "the updater for @uref{https://cran.r-project.org/, CRAN} packages;" msgstr "Aktualisierungsprogramm für @uref{https://cran.r-project.org/, CRAN-Pakete}," #. type: item -#: doc/guix.texi:8943 +#: doc/guix.texi:8941 #, no-wrap msgid "bioconductor" msgstr "bioconductor" #. type: table -#: doc/guix.texi:8945 +#: doc/guix.texi:8943 msgid "the updater for @uref{https://www.bioconductor.org/, Bioconductor} R packages;" msgstr "Aktualisierungsprogramm für R-Pakete vom @uref{https://www.bioconductor.org/, Bioconductor}," #. type: table -#: doc/guix.texi:8947 +#: doc/guix.texi:8945 msgid "the updater for @uref{https://www.cpan.org/, CPAN} packages;" msgstr "Aktualisierungsprogramm für @uref{https://www.cpan.org/, CPAN-Pakete}," #. type: table -#: doc/guix.texi:8949 +#: doc/guix.texi:8947 msgid "the updater for @uref{https://pypi.python.org, PyPI} packages." msgstr "Aktualisierungsprogramm für @uref{https://pypi.python.org, PyPI-Pakete}," #. type: table -#: doc/guix.texi:8951 +#: doc/guix.texi:8949 msgid "the updater for @uref{https://rubygems.org, RubyGems} packages." msgstr "Aktualisierungsprogramm für @uref{https://rubygems.org, RubyGems-Pakete}." #. type: item -#: doc/guix.texi:8951 +#: doc/guix.texi:8949 #, no-wrap msgid "github" msgstr "github" #. type: table -#: doc/guix.texi:8953 +#: doc/guix.texi:8951 msgid "the updater for @uref{https://github.com, GitHub} packages." msgstr "Aktualisierungsprogramm für @uref{https://github.com, GitHub-Pakete}." #. type: table -#: doc/guix.texi:8955 +#: doc/guix.texi:8953 msgid "the updater for @uref{https://hackage.haskell.org, Hackage} packages." msgstr "Aktualisierungsprogramm für @uref{https://hackage.haskell.org, Hackage-Pakete}." #. type: table -#: doc/guix.texi:8957 +#: doc/guix.texi:8955 msgid "the updater for @uref{https://www.stackage.org, Stackage} packages." msgstr "Aktualisierungsprogramm für @uref{https://www.stackage.org, Stackage-Pakete}." #. type: table -#: doc/guix.texi:8959 +#: doc/guix.texi:8957 msgid "the updater for @uref{https://crates.io, Crates} packages." msgstr "Aktualisierungsprogramm für @uref{https://crates.io, Crates-Pakete}." #. type: item -#: doc/guix.texi:8959 +#: doc/guix.texi:8957 #, no-wrap msgid "launchpad" msgstr "launchpad" #. type: table -#: doc/guix.texi:8961 +#: doc/guix.texi:8959 msgid "the updater for @uref{https://launchpad.net, Launchpad} packages." msgstr "Aktualisierungsprogramm für @uref{https://launchpad.net, Launchpad}." #. type: table -#: doc/guix.texi:8965 +#: doc/guix.texi:8963 msgid "For instance, the following command only checks for updates of Emacs packages hosted at @code{elpa.gnu.org} and for updates of CRAN packages:" msgstr "Zum Beispiel prüft folgender Befehl nur auf mögliche Aktualisierungen von auf @code{elpa.gnu.org} angebotenen Emacs-Paketen und von CRAN-Paketen:" #. type: example -#: doc/guix.texi:8970 +#: doc/guix.texi:8968 #, no-wrap msgid "" "$ guix refresh --type=elpa,cran\n" @@ -16391,77 +16402,77 @@ msgstr "" "gnu/packages/emacs.scm:856:13: emacs-auctex would be upgraded from 11.88.6 to 11.88.9\n" #. type: Plain text -#: doc/guix.texi:8976 +#: doc/guix.texi:8974 msgid "In addition, @command{guix refresh} can be passed one or more package names, as in this example:" msgstr "An @command{guix refresh} können auch ein oder mehrere Paketnamen übergeben werden wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:8979 +#: doc/guix.texi:8977 #, no-wrap msgid "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n" msgstr "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n" #. type: Plain text -#: doc/guix.texi:8985 +#: doc/guix.texi:8983 msgid "The command above specifically updates the @code{emacs} and @code{idutils} packages. The @code{--select} option would have no effect in this case." msgstr "Der Befehl oben aktualisiert speziell das @code{emacs}- und das @code{idutils}-Paket. Eine Befehlszeilenoption @code{--select} hätte dann keine Wirkung." #. type: Plain text -#: doc/guix.texi:8990 +#: doc/guix.texi:8988 msgid "When considering whether to upgrade a package, it is sometimes convenient to know which packages would be affected by the upgrade and should be checked for compatibility. For this the following option may be used when passing @command{guix refresh} one or more package names:" msgstr "Wenn Sie sich fragen, ob ein Paket aktualisiert werden sollte oder nicht, kann es helfen, sich anzuschauen, welche Pakete von der Aktualisierung betroffen wären und auf Kompatibilität hin geprüft werden sollten. Dazu kann die folgende Befehlszeilenoption zusammen mit einem oder mehreren Paketnamen an @command{guix refresh} übergeben werden:" #. type: item -#: doc/guix.texi:8993 +#: doc/guix.texi:8991 #, no-wrap msgid "--list-updaters" msgstr "--list-updaters" #. type: itemx -#: doc/guix.texi:8994 +#: doc/guix.texi:8992 #, no-wrap msgid "-L" msgstr "-L" #. type: table -#: doc/guix.texi:8996 +#: doc/guix.texi:8994 msgid "List available updaters and exit (see @option{--type} above.)" msgstr "Eine Liste verfügbarer Aktualisierungsprogramme anzeigen und terminieren (siehe @option{--type} oben)." #. type: table -#: doc/guix.texi:8999 +#: doc/guix.texi:8997 msgid "For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these updaters." msgstr "Für jedes Aktualisierungsprogramm den Anteil der davon betroffenen Pakete anzeigen; zum Schluss wird der Gesamtanteil von irgendeinem Aktualisierungsprogramm betroffener Pakete angezeigt." #. type: item -#: doc/guix.texi:9000 +#: doc/guix.texi:8998 #, no-wrap msgid "--list-dependent" msgstr "--list-dependent" #. type: itemx -#: doc/guix.texi:9001 doc/guix.texi:9217 +#: doc/guix.texi:8999 doc/guix.texi:9215 #, no-wrap msgid "-l" msgstr "-l" #. type: table -#: doc/guix.texi:9004 +#: doc/guix.texi:9002 msgid "List top-level dependent packages that would need to be rebuilt as a result of upgrading one or more packages." msgstr "Auflisten, welche abhängigen Pakete auf oberster Ebene neu erstellt werden müssten, wenn eines oder mehrere Pakete aktualisiert würden." #. type: table -#: doc/guix.texi:9008 +#: doc/guix.texi:9006 msgid "@xref{Invoking guix graph, the @code{reverse-package} type of @command{guix graph}}, for information on how to visualize the list of dependents of a package." msgstr "Siehe @ref{Invoking guix graph, den @code{reverse-package}-Typ von @command{guix graph}} für Informationen dazu, wie Sie die Liste der Abhängigen eines Pakets visualisieren können." #. type: Plain text -#: doc/guix.texi:9014 +#: doc/guix.texi:9012 msgid "Be aware that the @code{--list-dependent} option only @emph{approximates} the rebuilds that would be required as a result of an upgrade. More rebuilds might be required under some circumstances." msgstr "Bedenken Sie, dass die Befehlszeilenoption @code{--list-dependent} das Ausmaß der nach einer Aktualisierungen benötigten Neuerstellungen nur @emph{annähert}. Es könnten auch unter Umständen mehr Neuerstellungen anfallen." #. type: example -#: doc/guix.texi:9019 +#: doc/guix.texi:9017 #, no-wrap msgid "" "$ guix refresh --list-dependent flex\n" @@ -16473,23 +16484,23 @@ msgstr "" "hop@@2.4.0 geiser@@0.4 notmuch@@0.18 mu@@0.9.9.5 cflow@@1.4 idutils@@4.6 …\n" #. type: Plain text -#: doc/guix.texi:9023 +#: doc/guix.texi:9021 msgid "The command above lists a set of packages that could be built to check for compatibility with an upgraded @code{flex} package." msgstr "Der oben stehende Befehl gibt einen Satz von Paketen aus, die Sie erstellen wollen könnten, um die Kompatibilität einer Aktualisierung des @code{flex}-Pakets beurteilen zu können." #. type: item -#: doc/guix.texi:9026 +#: doc/guix.texi:9024 #, no-wrap msgid "--list-transitive" msgstr "--list-transitive" #. type: table -#: doc/guix.texi:9028 +#: doc/guix.texi:9026 msgid "List all the packages which one or more packages depend upon." msgstr "Die Pakete auflisten, von denen eines oder mehrere Pakete abhängen." #. type: example -#: doc/guix.texi:9033 +#: doc/guix.texi:9031 #, no-wrap msgid "" "$ guix refresh --list-transitive flex\n" @@ -16501,60 +16512,60 @@ msgstr "" "bison@@3.0.5 indent@@2.2.10 tar@@1.30 gzip@@1.9 bzip2@@1.0.6 xz@@5.2.4 file@@5.33 …\n" #. type: Plain text -#: doc/guix.texi:9039 +#: doc/guix.texi:9037 msgid "The command above lists a set of packages which, when changed, would cause @code{flex} to be rebuilt." msgstr "Der oben stehende Befehl gibt einen Satz von Paketen aus, die, wenn sie geändert würden, eine Neuerstellung des @code{flex}-Pakets auslösen würden." #. type: Plain text -#: doc/guix.texi:9041 +#: doc/guix.texi:9039 msgid "The following options can be used to customize GnuPG operation:" msgstr "Mit den folgenden Befehlszeilenoptionen können Sie das Verhalten von GnuPG anpassen:" #. type: item -#: doc/guix.texi:9044 +#: doc/guix.texi:9042 #, no-wrap msgid "--gpg=@var{command}" msgstr "--gpg=@var{Befehl}" #. type: table -#: doc/guix.texi:9047 +#: doc/guix.texi:9045 msgid "Use @var{command} as the GnuPG 2.x command. @var{command} is searched for in @code{$PATH}." msgstr "Den @var{Befehl} als GnuPG-2.x-Befehl einsetzen. Der @var{Befehl} wird im @code{$PATH} gesucht." #. type: item -#: doc/guix.texi:9048 +#: doc/guix.texi:9046 #, no-wrap msgid "--keyring=@var{file}" msgstr "--keyring=@var{Datei}" #. type: table -#: doc/guix.texi:9054 +#: doc/guix.texi:9052 msgid "Use @var{file} as the keyring for upstream keys. @var{file} must be in the @dfn{keybox format}. Keybox files usually have a name ending in @file{.kbx} and the GNU@tie{}Privacy Guard (GPG) can manipulate these files (@pxref{kbxutil, @command{kbxutil},, gnupg, Using the GNU Privacy Guard}, for information on a tool to manipulate keybox files)." msgstr "Die @var{Datei} als Schlüsselbund mit Anbieterschlüsseln verwenden. Die @var{Datei} muss im @dfn{Keybox-Format} vorliegen. Keybox-Dateien haben normalerweise einen Namen, der auf @file{.kbx} endet. Sie können mit Hilfe von GNU@tie{}Privacy Guard (GPG) bearbeitet werden (siehe @ref{kbxutil, @command{kbxutil},, gnupg, Using the GNU Privacy Guard} für Informationen über ein Werkzeug zum Bearbeiten von Keybox-Dateien)." #. type: table -#: doc/guix.texi:9060 +#: doc/guix.texi:9058 msgid "When this option is omitted, @command{guix refresh} uses @file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream signing keys. OpenPGP signatures are checked against keys from this keyring; missing keys are downloaded to this keyring as well (see @option{--key-download} below.)" msgstr "Wenn diese Befehlszeilenoption nicht angegeben wird, benutzt @command{guix refresh} die Keybox-Datei @file{~/.config/guix/upstream/trustedkeys.kbx} als Schlüsselbund für Signierschlüssel von Anbietern. OpenPGP-Signaturen werden mit Schlüsseln aus diesem Schlüsselbund überprüft; fehlende Schlüssel werden auch in diesen Schlüsselbund heruntergeladen (siehe @option{--key-download} unten)." #. type: table -#: doc/guix.texi:9063 +#: doc/guix.texi:9061 msgid "You can export keys from your default GPG keyring into a keybox file using commands like this one:" msgstr "Sie können Schlüssel aus Ihrem normalerweise benutzten GPG-Schlüsselbund in eine Keybox-Datei exportieren, indem Sie Befehle wie diesen benutzen:" #. type: example -#: doc/guix.texi:9066 +#: doc/guix.texi:9064 #, no-wrap msgid "gpg --export rms@@gnu.org | kbxutil --import-openpgp >> mykeyring.kbx\n" msgstr "gpg --export rms@@gnu.org | kbxutil --import-openpgp >> mykeyring.kbx\n" #. type: table -#: doc/guix.texi:9069 +#: doc/guix.texi:9067 msgid "Likewise, you can fetch keys to a specific keybox file like this:" msgstr "Ebenso können Sie wie folgt Schlüssel in eine bestimmte Keybox-Datei herunterladen:" #. type: example -#: doc/guix.texi:9073 +#: doc/guix.texi:9071 #, no-wrap msgid "" "gpg --no-default-keyring --keyring mykeyring.kbx \\\n" @@ -16564,187 +16575,187 @@ msgstr "" " --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n" #. type: table -#: doc/guix.texi:9077 +#: doc/guix.texi:9075 msgid "@ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU Privacy Guard}, for more information on GPG's @option{--keyring} option." msgstr "Siehe @ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU Privacy Guard} für mehr Informationen zur Befehlszeilenoption @option{--keyring} von GPG." #. type: table -#: doc/guix.texi:9081 +#: doc/guix.texi:9079 msgid "Handle missing OpenPGP keys according to @var{policy}, which may be one of:" msgstr "Fehlende OpenPGP-Schlüssel gemäß dieser @var{Richtlinie} behandeln, für die eine der Folgenden angegeben werden kann:" #. type: item -#: doc/guix.texi:9083 doc/guix.texi:16051 +#: doc/guix.texi:9081 doc/guix.texi:16048 #, no-wrap msgid "always" msgstr "always" #. type: table -#: doc/guix.texi:9086 +#: doc/guix.texi:9084 msgid "Always download missing OpenPGP keys from the key server, and add them to the user's GnuPG keyring." msgstr "Immer fehlende OpenPGP-Schlüssel herunterladen und zum GnuPG-Schlüsselbund des Nutzers hinzufügen." #. type: item -#: doc/guix.texi:9087 doc/guix.texi:16053 +#: doc/guix.texi:9085 doc/guix.texi:16050 #, no-wrap msgid "never" msgstr "never" #. type: table -#: doc/guix.texi:9089 +#: doc/guix.texi:9087 msgid "Never try to download missing OpenPGP keys. Instead just bail out." msgstr "Niemals fehlende OpenPGP-Schlüssel herunterladen, sondern einfach abbrechen." #. type: item -#: doc/guix.texi:9090 +#: doc/guix.texi:9088 #, no-wrap msgid "interactive" msgstr "interactive" #. type: table -#: doc/guix.texi:9093 +#: doc/guix.texi:9091 msgid "When a package signed with an unknown OpenPGP key is encountered, ask the user whether to download it or not. This is the default behavior." msgstr "Ist ein Paket mit einem unbekannten OpenPGP-Schlüssel signiert, wird der Nutzer gefragt, ob der Schlüssel heruntergeladen werden soll oder nicht. Dies entspricht dem vorgegebenen Verhalten." #. type: item -#: doc/guix.texi:9095 +#: doc/guix.texi:9093 #, no-wrap msgid "--key-server=@var{host}" msgstr "--key-server=@var{Host}" #. type: table -#: doc/guix.texi:9097 +#: doc/guix.texi:9095 msgid "Use @var{host} as the OpenPGP key server when importing a public key." msgstr "Den mit @var{Host} bezeichneten Rechner als Schlüsselserver für OpenPGP benutzen, wenn ein öffentlicher Schlüssel importiert wird." #. type: Plain text -#: doc/guix.texi:9110 +#: doc/guix.texi:9108 msgid "The @code{github} updater uses the @uref{https://developer.github.com/v3/, GitHub API} to query for new releases. When used repeatedly e.g.@: when refreshing all packages, GitHub will eventually refuse to answer any further API requests. By default 60 API requests per hour are allowed, and a full refresh on all GitHub packages in Guix requires more than this. Authentication with GitHub through the use of an API token alleviates these limits. To use an API token, set the environment variable @code{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/settings/tokens} or otherwise." msgstr "Das @code{github}-Aktualisierungsprogramm benutzt die @uref{https://developer.github.com/v3/, GitHub-Programmierschnittstelle} (die „Github-API“), um Informationen über neue Veröffentlichungen einzuholen. Geschieht dies oft, z.B.@: beim Auffrischen aller Pakete, so wird GitHub irgendwann aufhören, weitere API-Anfragen zu beantworten. Normalerweise sind 60 API-Anfragen pro Stunde erlaubt, für eine vollständige Auffrischung aller GitHub-Pakete in Guix werden aber mehr benötigt. Wenn Sie sich bei GitHub mit Ihrem eigenen API-Token authentisieren, gelten weniger einschränkende Grenzwerte. Um einen API-Token zu benutzen, setzen Sie die Umgebungsvariable @code{GUIX_GITHUB_TOKEN} auf einen von @uref{https://github.com/settings/tokens} oder anderweitig bezogenen API-Token." #. type: section -#: doc/guix.texi:9113 +#: doc/guix.texi:9111 #, no-wrap msgid "Invoking @command{guix lint}" msgstr "@command{guix lint} aufrufen" #. type: command{#1} -#: doc/guix.texi:9115 +#: doc/guix.texi:9113 #, no-wrap msgid "guix lint" msgstr "guix lint" #. type: cindex -#: doc/guix.texi:9116 +#: doc/guix.texi:9114 #, no-wrap msgid "package, checking for errors" msgstr "Pakete, auf Fehler prüfen" #. type: Plain text -#: doc/guix.texi:9122 +#: doc/guix.texi:9120 msgid "The @command{guix lint} command is meant to help package developers avoid common errors and use a consistent style. It runs a number of checks on a given set of packages in order to find common mistakes in their definitions. Available @dfn{checkers} include (see @code{--list-checkers} for a complete list):" msgstr "Den Befehl @command{guix lint} gibt es, um Paketentwicklern beim Vermeiden häufiger Fehler und bei der Einhaltung eines konsistenten Code-Stils zu helfen. Er führt eine Reihe von Prüfungen auf einer angegebenen Menge von Paketen durch, um in deren Definition häufige Fehler aufzuspüren. Zu den verfügbaren @dfn{Prüfern} gehören (siehe @code{--list-checkers} für eine vollständige Liste):" #. type: table -#: doc/guix.texi:9128 +#: doc/guix.texi:9126 msgid "Validate certain typographical and stylistic rules about package descriptions and synopses." msgstr "Überprüfen, ob bestimmte typografische und stilistische Regeln in Paketbeschreibungen und -zusammenfassungen eingehalten wurden." #. type: item -#: doc/guix.texi:9129 +#: doc/guix.texi:9127 #, no-wrap msgid "inputs-should-be-native" msgstr "inputs-should-be-native" #. type: table -#: doc/guix.texi:9131 +#: doc/guix.texi:9129 msgid "Identify inputs that should most likely be native inputs." msgstr "Eingaben identifizieren, die wahrscheinlich native Eingaben sein sollten." #. type: itemx -#: doc/guix.texi:9134 +#: doc/guix.texi:9132 #, no-wrap msgid "mirror-url" msgstr "mirror-url" #. type: itemx -#: doc/guix.texi:9135 +#: doc/guix.texi:9133 #, no-wrap msgid "github-url" msgstr "github-url" #. type: itemx -#: doc/guix.texi:9136 +#: doc/guix.texi:9134 #, no-wrap msgid "source-file-name" msgstr "source-file-name" #. type: table -#: doc/guix.texi:9143 +#: doc/guix.texi:9141 msgid "Probe @code{home-page} and @code{source} URLs and report those that are invalid. Suggest a @code{mirror://} URL when applicable. If the @code{source} URL redirects to a GitHub URL, recommend usage of the GitHub URL. Check that the source file name is meaningful, e.g.@: is not just a version number or ``git-checkout'', without a declared @code{file-name} (@pxref{origin Reference})." msgstr "Die URLs für die Felder @code{home-page} und @code{source} anrufen und nicht erreichbare URLs melden. Wenn passend, wird eine @code{mirror://}-URL vorgeschlagen. Wenn die Quell-URL auf eine GitHub-URL weiterleitet, wird eine Empfehlung ausgegeben, direkt letztere zu verwenden. Es wird geprüft, dass der Quell-Dateiname aussagekräftig ist, dass er also z.B.@: nicht nur aus einer Versionsnummer besteht oder als „git-checkout“ angegeben wurde, ohne dass ein @code{Dateiname} deklariert wurde (siehe @ref{origin Reference})." #. type: item -#: doc/guix.texi:9144 +#: doc/guix.texi:9142 #, no-wrap msgid "source-unstable-tarball" msgstr "source-unstable-tarball" #. type: table -#: doc/guix.texi:9148 +#: doc/guix.texi:9146 msgid "Parse the @code{source} URL to determine if a tarball from GitHub is autogenerated or if it is a release tarball. Unfortunately GitHub's autogenerated tarballs are sometimes regenerated." msgstr "Analysiert die @code{source}-URL, um zu bestimmen, ob der Tarball von GitHub automatisch generiert wurde oder zu einer Veröffentlichung gehört. Leider werden GitHubs automatisch generierte Tarballs manchmal neu generiert." #. type: item -#: doc/guix.texi:9149 +#: doc/guix.texi:9147 #, no-wrap msgid "cve" msgstr "cve" #. type: cindex -#: doc/guix.texi:9150 doc/guix.texi:25544 +#: doc/guix.texi:9148 doc/guix.texi:25526 #, no-wrap msgid "security vulnerabilities" msgstr "Sicherheitslücken" #. type: cindex -#: doc/guix.texi:9151 +#: doc/guix.texi:9149 #, no-wrap msgid "CVE, Common Vulnerabilities and Exposures" msgstr "CVE, Common Vulnerabilities and Exposures" #. type: table -#: doc/guix.texi:9156 +#: doc/guix.texi:9154 msgid "Report known vulnerabilities found in the Common Vulnerabilities and Exposures (CVE) databases of the current and past year @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, published by the US NIST}." msgstr "Bekannte Sicherheitslücken melden, die in den Datenbanken der „Common Vulnerabilities and Exposures“ (CVE) aus diesem und dem letzten Jahr vorkommen, @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, wie sie von der US-amerikanischen NIST veröffentlicht werden}." #. type: table -#: doc/guix.texi:9158 +#: doc/guix.texi:9156 msgid "To view information about a particular vulnerability, visit pages such as:" msgstr "Um Informationen über eine bestimmte Sicherheitslücke angezeigt zu bekommen, besuchen Sie Webseiten wie:" #. type: indicateurl{#1} -#: doc/guix.texi:9162 +#: doc/guix.texi:9160 msgid "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD" msgstr "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD" #. type: indicateurl{#1} -#: doc/guix.texi:9164 +#: doc/guix.texi:9162 msgid "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD" msgstr "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD" #. type: table -#: doc/guix.texi:9169 +#: doc/guix.texi:9167 msgid "where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g., @code{CVE-2015-7554}." msgstr "wobei Sie statt @code{CVE-YYYY-ABCD} die CVE-Kennnummer angeben — z.B.@: @code{CVE-2015-7554}." #. type: table -#: doc/guix.texi:9174 +#: doc/guix.texi:9172 msgid "Package developers can specify in package recipes the @uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} name and version of the package when they differ from the name or version that Guix uses, as in this example:" msgstr "Paketentwickler können in ihren Paketrezepten den Namen und die Version des Pakets in der @uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} angeben, falls sich diese von dem in Guix benutzten Namen und der Version unterscheiden, zum Beispiel so:" #. type: example -#: doc/guix.texi:9182 +#: doc/guix.texi:9180 #, no-wrap msgid "" "(package\n" @@ -16762,12 +16773,12 @@ msgstr "" " (cpe-version . \"2.3\")))\n" #. type: table -#: doc/guix.texi:9189 +#: doc/guix.texi:9187 msgid "Some entries in the CVE database do not specify which version of a package they apply to, and would thus ``stick around'' forever. Package developers who found CVE alerts and verified they can be ignored can declare them as in this example:" msgstr "Manche Einträge in der CVE-Datenbank geben die Version des Pakets nicht an, auf das sie sich beziehen, und würden daher bis in alle Ewigkeit Warnungen auslösen. Paketentwickler, die CVE-Warnmeldungen gefunden und geprüft haben, dass diese ignoriert werden können, können sie wie in diesem Beispiel deklarieren:" #. type: example -#: doc/guix.texi:9199 +#: doc/guix.texi:9197 #, no-wrap msgid "" "(package\n" @@ -16790,91 +16801,91 @@ msgstr "" " \"CVE-2011-5244\")))))\n" #. type: item -#: doc/guix.texi:9201 +#: doc/guix.texi:9199 #, no-wrap msgid "formatting" msgstr "Formatierung" #. type: table -#: doc/guix.texi:9204 +#: doc/guix.texi:9202 msgid "Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc." msgstr "Offensichtliche Fehler bei der Formatierung von Quellcode melden, z.B.@: Leerraum-Zeichen am Zeilenende oder Nutzung von Tabulatorzeichen." #. type: example -#: doc/guix.texi:9210 +#: doc/guix.texi:9208 #, no-wrap msgid "guix lint @var{options} @var{package}@dots{}\n" msgstr "guix lint @var{Optionen} @var{Pakete}…\n" #. type: Plain text -#: doc/guix.texi:9214 +#: doc/guix.texi:9212 msgid "If no package is given on the command line, then all packages are checked. The @var{options} may be zero or more of the following:" msgstr "Wird kein Paket auf der Befehlszeile angegeben, dann werden alle Pakete geprüft, die es gibt. Als @var{Optionen} können null oder mehr der folgenden Befehlszeilenoptionen übergeben werden:" #. type: item -#: doc/guix.texi:9216 +#: doc/guix.texi:9214 #, no-wrap msgid "--list-checkers" msgstr "--list-checkers" #. type: table -#: doc/guix.texi:9220 +#: doc/guix.texi:9218 msgid "List and describe all the available checkers that will be run on packages and exit." msgstr "Alle verfügbaren Prüfer für die Pakete auflisten und beschreiben." #. type: item -#: doc/guix.texi:9221 +#: doc/guix.texi:9219 #, no-wrap msgid "--checkers" msgstr "--checkers" #. type: itemx -#: doc/guix.texi:9222 +#: doc/guix.texi:9220 #, no-wrap msgid "-c" msgstr "-c" #. type: table -#: doc/guix.texi:9225 +#: doc/guix.texi:9223 msgid "Only enable the checkers specified in a comma-separated list using the names returned by @code{--list-checkers}." msgstr "Nur die Prüfer aktivieren, die hiernach in einer kommagetrennten Liste aus von @code{--list-checkers} aufgeführten Prüfern vorkommen." #. type: section -#: doc/guix.texi:9229 +#: doc/guix.texi:9227 #, no-wrap msgid "Invoking @command{guix size}" msgstr "@command{guix size} aufrufen" #. type: cindex -#: doc/guix.texi:9231 +#: doc/guix.texi:9229 #, no-wrap msgid "size" msgstr "Größe" #. type: cindex -#: doc/guix.texi:9232 +#: doc/guix.texi:9230 #, no-wrap msgid "package size" msgstr "Paketgröße" #. type: command{#1} -#: doc/guix.texi:9234 +#: doc/guix.texi:9232 #, no-wrap msgid "guix size" msgstr "guix size" #. type: Plain text -#: doc/guix.texi:9241 +#: doc/guix.texi:9239 msgid "The @command{guix size} command helps package developers profile the disk usage of packages. It is easy to overlook the impact of an additional dependency added to a package, or the impact of using a single output for a package that could easily be split (@pxref{Packages with Multiple Outputs}). Such are the typical issues that @command{guix size} can highlight." msgstr "Der Befehl @command{guix size} hilft Paketentwicklern dabei, den Plattenplatzverbrauch von Paketen zu profilieren. Es ist leicht, die Auswirkungen zu unterschätzen, die das Hinzufügen zusätzlicher Abhängigkeiten zu einem Paket hat oder die das Verwenden einer einzelnen Ausgabe für ein leicht aufteilbares Paket ausmacht (siehe @ref{Packages with Multiple Outputs}). Das sind typische Probleme, auf die @command{guix size} aufmerksam machen kann." #. type: Plain text -#: doc/guix.texi:9246 +#: doc/guix.texi:9244 msgid "The command can be passed one or more package specifications such as @code{gcc@@4.8} or @code{guile:debug}, or a file name in the store. Consider this example:" msgstr "Dem Befehl können eine oder mehrere Paketspezifikationen wie @code{gcc@@4.8} oder @code{guile:debug} übergeben werden, oder ein Dateiname im Store. Betrachten Sie dieses Beispiel:" #. type: example -#: doc/guix.texi:9259 +#: doc/guix.texi:9257 #, no-wrap msgid "" "$ guix size coreutils\n" @@ -16902,43 +16913,43 @@ msgstr "" "Gesamt: 78.9 MiB\n" #. type: Plain text -#: doc/guix.texi:9265 +#: doc/guix.texi:9263 msgid "The store items listed here constitute the @dfn{transitive closure} of Coreutils---i.e., Coreutils and all its dependencies, recursively---as would be returned by:" msgstr "Die hier aufgelisteten Store-Objekte bilden den @dfn{transitiven Abschluss} der Coreutils — d.h.@: die Coreutils und all ihre Abhängigkeiten und deren Abhängigkeiten, rekursiv —, wie sie hiervon angezeigt würden: dag.pdf\n" msgstr "guix graph coreutils | dot -Tpdf > dag.pdf\n" #. type: Plain text -#: doc/guix.texi:9384 +#: doc/guix.texi:9382 msgid "The output looks like this:" msgstr "Die Ausgabe sieht so aus:" #. type: Plain text -#: doc/guix.texi:9386 +#: doc/guix.texi:9384 msgid "@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}" msgstr "@image{images/coreutils-graph,2in,,Abhängigkeitsgraph der GNU Coreutils}" #. type: Plain text -#: doc/guix.texi:9388 +#: doc/guix.texi:9386 msgid "Nice little graph, no?" msgstr "Ein netter, kleiner Graph, oder?" #. type: Plain text -#: doc/guix.texi:9394 +#: doc/guix.texi:9392 msgid "But there is more than one graph! The one above is concise: it is the graph of package objects, omitting implicit inputs such as GCC, libc, grep, etc. It is often useful to have such a concise graph, but sometimes one may want to see more details. @command{guix graph} supports several types of graphs, allowing you to choose the level of detail:" msgstr "Aber es gibt mehr als eine Art von Graph! Der Graph oben ist kurz und knapp: Es ist der Graph der Paketobjekte, ohne implizite Eingaben wie GCC, libc, grep und so weiter. Oft möchte man einen knappen Graphen sehen, aber manchmal will man auch mehr Details sehen. @command{guix graph} unterstützt mehrere Typen von Graphen; Sie können den Detailgrad auswählen." #. type: table -#: doc/guix.texi:9400 +#: doc/guix.texi:9398 msgid "This is the default type used in the example above. It shows the DAG of package objects, excluding implicit dependencies. It is concise, but filters out many details." msgstr "Der vorgegebene Typ aus dem Beispiel oben. Er zeigt den DAG der Paketobjekte ohne implizite Abhängigkeiten. Er ist knapp, filtert aber viele Details heraus." #. type: item -#: doc/guix.texi:9401 +#: doc/guix.texi:9399 #, no-wrap msgid "reverse-package" msgstr "reverse-package" #. type: table -#: doc/guix.texi:9403 +#: doc/guix.texi:9401 msgid "This shows the @emph{reverse} DAG of packages. For example:" msgstr "Dies zeigt den @emph{umgekehrten} DAG der Pakete. Zum Beispiel liefert" #. type: example -#: doc/guix.texi:9406 +#: doc/guix.texi:9404 #, no-wrap msgid "guix graph --type=reverse-package ocaml\n" msgstr "guix graph --type=reverse-package ocaml\n" #. type: table -#: doc/guix.texi:9411 +#: doc/guix.texi:9409 msgid "...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if you are also interested in cases where OCaml is an implicit dependency, see @code{reverse-bag} below.)" msgstr "…@: den Graphen der Pakete, die @emph{explizit} von OCaml abhängen (wenn Sie auch an Fällen interessiert sind, bei denen OCaml eine implizite Abhängigkeit ist, siehe @code{reverse-bag} weiter unten)." #. type: table -#: doc/guix.texi:9416 +#: doc/guix.texi:9414 msgid "Note that for core packages this can yield huge graphs. If all you want is to know the number of packages that depend on a given package, use @command{guix refresh --list-dependent} (@pxref{Invoking guix refresh, @option{--list-dependent}})." msgstr "Beachten Sie, dass für Kernpakete damit gigantische Graphen entstehen können. Wenn Sie nur die Anzahl der Pakete wissen wollen, die von einem gegebenen Paket abhängen, benutzen Sie @command{guix refresh --list-dependent} (siehe @ref{Invoking guix refresh, @option{--list-dependent}})." #. type: item -#: doc/guix.texi:9417 +#: doc/guix.texi:9415 #, no-wrap msgid "bag-emerged" msgstr "bag-emerged" #. type: table -#: doc/guix.texi:9419 +#: doc/guix.texi:9417 msgid "This is the package DAG, @emph{including} implicit inputs." msgstr "Dies ist der Paket-DAG @emph{einschließlich} impliziter Eingaben." #. type: table -#: doc/guix.texi:9421 +#: doc/guix.texi:9419 msgid "For instance, the following command:" msgstr "Zum Beispiel liefert der folgende Befehl" #. type: example -#: doc/guix.texi:9424 +#: doc/guix.texi:9422 #, no-wrap msgid "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n" msgstr "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n" #. type: table -#: doc/guix.texi:9427 +#: doc/guix.texi:9425 msgid "...@: yields this bigger graph:" msgstr "…@: diesen größeren Graphen:" #. type: table -#: doc/guix.texi:9429 +#: doc/guix.texi:9427 msgid "@image{images/coreutils-bag-graph,,5in,Detailed dependency graph of the GNU Coreutils}" msgstr "@image{images/coreutils-bag-graph,,5in,Detaillierter Abhängigkeitsgraph der GNU Coreutils}" #. type: table -#: doc/guix.texi:9432 +#: doc/guix.texi:9430 msgid "At the bottom of the graph, we see all the implicit inputs of @var{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})." msgstr "Am unteren Rand des Graphen sehen wir alle impliziten Eingaben des @var{gnu-build-system} (siehe @ref{Build Systems, @code{gnu-build-system}})." #. type: table -#: doc/guix.texi:9436 +#: doc/guix.texi:9434 msgid "Now, note that the dependencies of these implicit inputs---that is, the @dfn{bootstrap dependencies} (@pxref{Bootstrapping})---are not shown here, for conciseness." msgstr "Beachten Sie dabei aber, dass auch hier die Abhängigkeiten dieser impliziten Eingaben — d.h.@: die @dfn{Bootstrap-Abhängigkeiten} (siehe @ref{Bootstrapping}) — nicht gezeigt werden, damit der Graph knapper bleibt." #. type: item -#: doc/guix.texi:9437 +#: doc/guix.texi:9435 #, no-wrap msgid "bag" msgstr "bag" #. type: table -#: doc/guix.texi:9440 +#: doc/guix.texi:9438 msgid "Similar to @code{bag-emerged}, but this time including all the bootstrap dependencies." msgstr "Ähnlich wie @code{bag-emerged}, aber diesmal mit allen Bootstrap-Abhängigkeiten." #. type: item -#: doc/guix.texi:9441 +#: doc/guix.texi:9439 #, no-wrap msgid "bag-with-origins" msgstr "bag-with-origins" #. type: table -#: doc/guix.texi:9443 +#: doc/guix.texi:9441 msgid "Similar to @code{bag}, but also showing origins and their dependencies." msgstr "Ähnlich wie @code{bag}, aber auch mit den Ursprüngen und deren Abhängigkeiten." #. type: item -#: doc/guix.texi:9444 +#: doc/guix.texi:9442 #, no-wrap msgid "reverse-bag" msgstr "reverse-bag" #. type: table -#: doc/guix.texi:9447 +#: doc/guix.texi:9445 msgid "This shows the @emph{reverse} DAG of packages. Unlike @code{reverse-package}, it also takes implicit dependencies into account. For example:" msgstr "Dies zeigt den @emph{umgekehrten} DAG der Pakete. Anders als @code{reverse-package} werden auch implizite Abhängigkeiten berücksichtigt. Zum Beispiel liefert" #. type: example -#: doc/guix.texi:9450 +#: doc/guix.texi:9448 #, no-wrap msgid "guix graph -t reverse-bag dune\n" msgstr "guix graph -t reverse-bag dune\n" #. type: table -#: doc/guix.texi:9457 +#: doc/guix.texi:9455 msgid "...@: yields the graph of all packages that depend on Dune, directly or indirectly. Since Dune is an @emph{implicit} dependency of many packages @i{via} @code{dune-build-system}, this shows a large number of packages, whereas @code{reverse-package} would show very few if any." msgstr "…@: den Graphen aller Pakete, die von Dune direkt oder indirekt abhängen. Weil Dune eine @emph{implizite} Abhängigkeit von vielen Paketen über das @code{dune-build-system} ist, zeigt er eine große Zahl von Paketen, während bei @code{reverse-package} nur sehr wenige bis gar keine zu sehen sind." #. type: table -#: doc/guix.texi:9463 +#: doc/guix.texi:9461 msgid "This is the most detailed representation: It shows the DAG of derivations (@pxref{Derivations}) and plain store items. Compared to the above representation, many additional nodes are visible, including build scripts, patches, Guile modules, etc." msgstr "Diese Darstellung ist am detailliertesten: Sie zeigt den DAG der Ableitungen (siehe @ref{Derivations}) und der einfachen Store-Objekte. Verglichen mit obiger Darstellung sieht man viele zusätzliche Knoten einschließlich Erstellungs-Skripts, Patches, Guile-Module usw." #. type: table -#: doc/guix.texi:9466 +#: doc/guix.texi:9464 msgid "For this type of graph, it is also possible to pass a @file{.drv} file name instead of a package name, as in:" msgstr "Für diesen Typ Graph kann auch der Name einer @file{.drv}-Datei anstelle eines Paketnamens angegeben werden, etwa so:" #. type: example -#: doc/guix.texi:9469 +#: doc/guix.texi:9467 #, no-wrap msgid "guix graph -t derivation `guix system build -d my-config.scm`\n" msgstr "guix graph -t derivation `guix system build -d my-config.scm`\n" #. type: item -#: doc/guix.texi:9471 +#: doc/guix.texi:9469 #, no-wrap msgid "module" msgstr "module" #. type: table -#: doc/guix.texi:9475 +#: doc/guix.texi:9473 msgid "This is the graph of @dfn{package modules} (@pxref{Package Modules}). For example, the following command shows the graph for the package module that defines the @code{guile} package:" msgstr "Dies ist der Graph der @dfn{Paketmodule} (siehe @ref{Package Modules}). Zum Beispiel zeigt der folgende Befehl den Graph für das Paketmodul an, das das @code{guile}-Paket definiert:" #. type: example -#: doc/guix.texi:9478 +#: doc/guix.texi:9476 #, no-wrap msgid "guix graph -t module guile | dot -Tpdf > module-graph.pdf\n" msgstr "guix graph -t module guile | dot -Tpdf > modul-graph.pdf\n" #. type: Plain text -#: doc/guix.texi:9483 +#: doc/guix.texi:9481 msgid "All the types above correspond to @emph{build-time dependencies}. The following graph type represents the @emph{run-time dependencies}:" msgstr "Alle oben genannten Typen entsprechen @emph{Abhängigkeiten zur Erstellungszeit}. Der folgende Graphtyp repräsentiert die @emph{Abhängigkeiten zur Laufzeit}:" #. type: table -#: doc/guix.texi:9488 +#: doc/guix.texi:9486 msgid "This is the graph of @dfn{references} of a package output, as returned by @command{guix gc --references} (@pxref{Invoking guix gc})." msgstr "Dies ist der Graph der @dfn{Referenzen} einer Paketausgabe, wie @command{guix gc --references} sie liefert (siehe @ref{Invoking guix gc})." #. type: table -#: doc/guix.texi:9491 +#: doc/guix.texi:9489 msgid "If the given package output is not available in the store, @command{guix graph} attempts to obtain dependency information from substitutes." msgstr "Wenn die angegebene Paketausgabe im Store nicht verfügbar ist, versucht @command{guix graph}, die Abhängigkeitsinformationen aus Substituten zu holen." #. type: table -#: doc/guix.texi:9495 +#: doc/guix.texi:9493 msgid "Here you can also pass a store file name instead of a package name. For example, the command below produces the reference graph of your profile (which can be big!):" msgstr "Hierbei können Sie auch einen Store-Dateinamen statt eines Paketnamens angeben. Zum Beispiel generiert der Befehl unten den Referenzgraphen Ihres Profils (der sehr groß werden kann!):" #. type: example -#: doc/guix.texi:9498 +#: doc/guix.texi:9496 #, no-wrap msgid "guix graph -t references `readlink -f ~/.guix-profile`\n" msgstr "guix graph -t references `readlink -f ~/.guix-profile`\n" #. type: item -#: doc/guix.texi:9500 +#: doc/guix.texi:9498 #, no-wrap msgid "referrers" msgstr "referrers" #. type: table -#: doc/guix.texi:9503 +#: doc/guix.texi:9501 msgid "This is the graph of the @dfn{referrers} of a store item, as returned by @command{guix gc --referrers} (@pxref{Invoking guix gc})." msgstr "Dies ist der Graph der ein Store-Objekt @dfn{referenzierenden} Objekte, wie @command{guix gc --referrers} sie liefern würde (siehe @ref{Invoking guix gc})." #. type: table -#: doc/guix.texi:9509 +#: doc/guix.texi:9507 msgid "This relies exclusively on local information from your store. For instance, let us suppose that the current Inkscape is available in 10 profiles on your machine; @command{guix graph -t referrers inkscape} will show a graph rooted at Inkscape and with those 10 profiles linked to it." msgstr "Er basiert ausschließlich auf lokalen Informationen aus Ihrem Store. Nehmen wir zum Beispiel an, dass das aktuelle Inkscape in 10 Profilen verfügbar ist, dann wird @command{guix graph -t referrers inkscape} einen Graph zeigen, der bei Inkscape gewurzelt ist und Kanten zu diesen 10 Profilen hat." #. type: table -#: doc/guix.texi:9512 +#: doc/guix.texi:9510 msgid "It can help determine what is preventing a store item from being garbage collected." msgstr "Ein solcher Graph kann dabei helfen, herauszufinden, weshalb ein Store-Objekt nicht vom Müllsammler abgeholt werden kann." #. type: Plain text -#: doc/guix.texi:9516 +#: doc/guix.texi:9514 msgid "The available options are the following:" msgstr "Folgendes sind die verfügbaren Befehlszeilenoptionen:" #. type: table -#: doc/guix.texi:9522 +#: doc/guix.texi:9520 msgid "Produce a graph output of @var{type}, where @var{type} must be one of the values listed above." msgstr "Eine Graph-Ausgabe dieses @var{Typ}s generieren. Dieser @var{Typ} muss einer der oben genannten Werte sein." #. type: item -#: doc/guix.texi:9523 +#: doc/guix.texi:9521 #, no-wrap msgid "--list-types" msgstr "--list-types" #. type: table -#: doc/guix.texi:9525 +#: doc/guix.texi:9523 msgid "List the supported graph types." msgstr "Die unterstützten Graph-Typen auflisten." #. type: item -#: doc/guix.texi:9526 +#: doc/guix.texi:9524 #, no-wrap msgid "--backend=@var{backend}" msgstr "--backend=@var{Backend}" #. type: itemx -#: doc/guix.texi:9527 +#: doc/guix.texi:9525 #, no-wrap msgid "-b @var{backend}" msgstr "-b @var{Backend}" #. type: table -#: doc/guix.texi:9529 +#: doc/guix.texi:9527 msgid "Produce a graph using the selected @var{backend}." msgstr "Einen Graph mit Hilfe des ausgewählten @var{Backend}s generieren." #. type: item -#: doc/guix.texi:9530 +#: doc/guix.texi:9528 #, no-wrap msgid "--list-backends" msgstr "--list-backends" #. type: table -#: doc/guix.texi:9532 +#: doc/guix.texi:9530 msgid "List the supported graph backends." msgstr "Die unterstützten Graph-Backends auflisten." #. type: table -#: doc/guix.texi:9534 +#: doc/guix.texi:9532 msgid "Currently, the available backends are Graphviz and d3.js." msgstr "Derzeit sind die verfügbaren Backends Graphviz und d3.js." #. type: example -#: doc/guix.texi:9543 +#: doc/guix.texi:9541 #, no-wrap msgid "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n" msgstr "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n" #. type: table -#: doc/guix.texi:9548 +#: doc/guix.texi:9546 msgid "Display the graph for @var{system}---e.g., @code{i686-linux}." msgstr "Den Graphen für das @var{System} anzeigen — z.B.@: @code{i686-linux}." #. type: table -#: doc/guix.texi:9551 +#: doc/guix.texi:9549 msgid "The package dependency graph is largely architecture-independent, but there are some architecture-dependent bits that this option allows you to visualize." msgstr "Der Abhängigkeitsgraph ist größtenteils von der Systemarchitektur unabhängig, aber ein paar architekturabhängige Teile können Ihnen mit dieser Befehlszeilenoption visualisiert werden." #. type: section -#: doc/guix.texi:9556 +#: doc/guix.texi:9554 #, no-wrap msgid "Invoking @command{guix publish}" msgstr "@command{guix publish} aufrufen" #. type: command{#1} -#: doc/guix.texi:9558 +#: doc/guix.texi:9556 #, no-wrap msgid "guix publish" msgstr "guix publish" #. type: Plain text -#: doc/guix.texi:9562 +#: doc/guix.texi:9560 msgid "The purpose of @command{guix publish} is to enable users to easily share their store with others, who can then use it as a substitute server (@pxref{Substitutes})." msgstr "Der Zweck von @command{guix publish} ist, es Nutzern zu ermöglichen, ihren Store auf einfache Weise mit anderen zu teilen, die ihn dann als Substitutserver einsetzen können (siehe @ref{Substitutes})." #. type: Plain text -#: doc/guix.texi:9568 +#: doc/guix.texi:9566 msgid "When @command{guix publish} runs, it spawns an HTTP server which allows anyone with network access to obtain substitutes from it. This means that any machine running Guix can also act as if it were a build farm, since the HTTP interface is compatible with Hydra, the software behind the @code{@value{SUBSTITUTE-SERVER}} build farm." msgstr "Wenn @command{guix publish} ausgeführt wird, wird dadurch ein HTTP-Server gestartet, so dass jeder mit Netzwerkzugang davon Substitute beziehen kann. Das bedeutet, dass jede Maschine, auf der Guix läuft, auch als Build-Farm fungieren kann, weil die HTTP-Schnittstelle mit Hydra, der Software, mit der die offizielle Build-Farm @code{@value{SUBSTITUTE-SERVER}} betrieben wird, kompatibel ist." #. type: Plain text -#: doc/guix.texi:9574 +#: doc/guix.texi:9572 msgid "For security, each substitute is signed, allowing recipients to check their authenticity and integrity (@pxref{Substitutes}). Because @command{guix publish} uses the signing key of the system, which is only readable by the system administrator, it must be started as root; the @code{--user} option makes it drop root privileges early on." msgstr "Um Sicherheit zu gewährleisten, wird jedes Substitut signiert, so dass Empfänger dessen Authentizität und Integrität nachprüfen können (siehe @ref{Substitutes}). Weil @command{guix publish} den Signierschlüssel des Systems benutzt, der nur vom Systemadministrator gelesen werden kann, muss es als der Administratornutzer „root“ gestartet werden. Mit der Befehlszeilenoption @code{--user} werden Administratorrechte bald nach dem Start wieder abgelegt." #. type: Plain text -#: doc/guix.texi:9578 +#: doc/guix.texi:9576 msgid "The signing key pair must be generated before @command{guix publish} is launched, using @command{guix archive --generate-key} (@pxref{Invoking guix archive})." msgstr "Das Schlüsselpaar zum Signieren muss erzeugt werden, bevor @command{guix publish} gestartet wird. Dazu können Sie @command{guix archive --generate-key} ausführen (siehe @ref{Invoking guix archive})." #. type: example -#: doc/guix.texi:9583 +#: doc/guix.texi:9581 #, no-wrap msgid "guix publish @var{options}@dots{}\n" msgstr "guix publish @var{Optionen}…\n" #. type: Plain text -#: doc/guix.texi:9587 +#: doc/guix.texi:9585 msgid "Running @command{guix publish} without any additional arguments will spawn an HTTP server on port 8080:" msgstr "Wird @command{guix publish} ohne weitere Argumente ausgeführt, wird damit ein HTTP-Server gestartet, der auf Port 8080 lauscht:" #. type: example -#: doc/guix.texi:9590 +#: doc/guix.texi:9588 #, no-wrap msgid "guix publish\n" msgstr "guix publish\n" #. type: Plain text -#: doc/guix.texi:9594 +#: doc/guix.texi:9592 msgid "Once a publishing server has been authorized (@pxref{Invoking guix archive}), the daemon may download substitutes from it:" msgstr "Sobald ein Server zum Veröffentlichen autorisiert wurde (siehe @ref{Invoking guix archive}), kann der Daemon davon Substitute herunterladen:" #. type: example -#: doc/guix.texi:9597 +#: doc/guix.texi:9595 #, no-wrap msgid "guix-daemon --substitute-urls=http://example.org:8080\n" msgstr "guix-daemon --substitute-urls=http://example.org:8080\n" #. type: Plain text -#: doc/guix.texi:9606 +#: doc/guix.texi:9604 msgid "By default, @command{guix publish} compresses archives on the fly as it serves them. This ``on-the-fly'' mode is convenient in that it requires no setup and is immediately available. However, when serving lots of clients, we recommend using the @option{--cache} option, which enables caching of the archives before they are sent to clients---see below for details. The @command{guix weather} command provides a handy way to check what a server provides (@pxref{Invoking guix weather})." msgstr "Nach den Voreinstellungen komprimiert @command{guix publish} Archive erst dann, wenn sie angefragt werden. Dieser „dynamische“ Modus bietet sich an, weil so nichts weiter eingerichtet werden muss und er direkt verfügbar ist. Wenn Sie allerdings viele Clients bedienen wollen, empfehlen wir, dass Sie die Befehlszeilenoption @option{--cache} benutzen, die das Zwischenspeichern der komprimierten Archive aktiviert, bevor diese an die Clients geschickt werden — siehe unten für Details. Mit dem Befehl @command{guix weather} haben Sie eine praktische Methode zur Hand, zu überprüfen, was so ein Server anbietet (siehe @ref{Invoking guix weather})." #. type: Plain text -#: doc/guix.texi:9613 +#: doc/guix.texi:9611 msgid "As a bonus, @command{guix publish} also serves as a content-addressed mirror for source files referenced in @code{origin} records (@pxref{origin Reference}). For instance, assuming @command{guix publish} is running on @code{example.org}, the following URL returns the raw @file{hello-2.10.tar.gz} file with the given SHA256 hash (represented in @code{nix-base32} format, @pxref{Invoking guix hash}):" msgstr "Als Bonus dient @command{guix publish} auch als inhaltsadressierbarer Spiegelserver für Quelldateien, die in @code{origin}-Verbundsobjekten eingetragen sind (siehe @ref{origin Reference}). Wenn wir zum Beispiel annehmen, dass @command{guix publish} auf @code{example.org} läuft, liefert folgende URL die rohe @file{hello-2.10.tar.gz}-Datei mit dem angegebenen SHA256-Hash als ihre Prüfsumme (dargestellt im @code{nix-base32}-Format, siehe @ref{Invoking guix hash}):" #. type: example -#: doc/guix.texi:9616 +#: doc/guix.texi:9614 #, no-wrap msgid "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1@dots{}ndq1i\n" msgstr "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1…ndq1i\n" #. type: Plain text -#: doc/guix.texi:9620 +#: doc/guix.texi:9618 msgid "Obviously, these URLs only work for files that are in the store; in other cases, they return 404 (``Not Found'')." msgstr "Offensichtlich funktionieren diese URLs nur mit solchen Dateien, die auch im Store vorliegen; in anderen Fällen werden sie 404 („Nicht gefunden“) zurückliefern." #. type: cindex -#: doc/guix.texi:9621 +#: doc/guix.texi:9619 #, no-wrap msgid "build logs, publication" msgstr "Erstellungsprotokolle, Veröffentlichen" #. type: Plain text -#: doc/guix.texi:9623 +#: doc/guix.texi:9621 msgid "Build logs are available from @code{/log} URLs like:" msgstr "Erstellungsprotokolle sind unter @code{/log}-URLs abrufbar:" #. type: example -#: doc/guix.texi:9626 +#: doc/guix.texi:9624 #, no-wrap msgid "http://example.org/log/gwspk@dots{}-guile-2.2.3\n" msgstr "http://example.org/log/gwspk…-guile-2.2.3\n" #. type: Plain text -#: doc/guix.texi:9636 +#: doc/guix.texi:9634 msgid "When @command{guix-daemon} is configured to save compressed build logs, as is the case by default (@pxref{Invoking guix-daemon}), @code{/log} URLs return the compressed log as-is, with an appropriate @code{Content-Type} and/or @code{Content-Encoding} header. We recommend running @command{guix-daemon} with @code{--log-compression=gzip} since Web browsers can automatically decompress it, which is not the case with bzip2 compression." msgstr "Ist der @command{guix-daemon} so eingestellt, dass er Erstellungsprotokolle komprimiert abspeichert, wie es voreingestellt ist (siehe @ref{Invoking guix-daemon}), liefern @code{/log}-URLs das unveränderte komprimierte Protokoll, mit einer entsprechenden @code{Content-Type}- und/oder @code{Content-Encoding}-Kopfzeile. Wir empfehlen dabei, dass Sie den @command{guix-daemon} mit @code{--log-compression=gzip} ausführen, weil Web-Browser dieses Format automatisch dekomprimieren können, was bei bzip2-Kompression nicht der Fall ist." #. type: item -#: doc/guix.texi:9640 +#: doc/guix.texi:9638 #, no-wrap msgid "--port=@var{port}" msgstr "--port=@var{Port}" #. type: itemx -#: doc/guix.texi:9641 +#: doc/guix.texi:9639 #, no-wrap msgid "-p @var{port}" msgstr "-p @var{Port}" #. type: table -#: doc/guix.texi:9643 +#: doc/guix.texi:9641 msgid "Listen for HTTP requests on @var{port}." msgstr "Auf HTTP-Anfragen auf diesem @var{Port} lauschen." #. type: item -#: doc/guix.texi:9644 doc/guix.texi:20716 +#: doc/guix.texi:9642 doc/guix.texi:20713 #, no-wrap msgid "--listen=@var{host}" msgstr "--listen=@var{Host}" #. type: table -#: doc/guix.texi:9647 +#: doc/guix.texi:9645 msgid "Listen on the network interface for @var{host}. The default is to accept connections from any interface." msgstr "Auf der Netzwerkschnittstelle für den angegebenen @var{Host}, also der angegebenen Rechneradresse, lauschen. Vorgegeben ist, Verbindungen mit jeder Schnittstelle zu akzeptieren." #. type: table -#: doc/guix.texi:9652 +#: doc/guix.texi:9650 msgid "Change privileges to @var{user} as soon as possible---i.e., once the server socket is open and the signing key has been read." msgstr "So früh wie möglich alle über die Berechtigungen des @var{Benutzer}s hinausgehenden Berechtigungen ablegen — d.h.@: sobald der Server-Socket geöffnet und der Signierschlüssel gelesen wurde." #. type: item -#: doc/guix.texi:9653 +#: doc/guix.texi:9651 #, no-wrap msgid "--compression[=@var{level}]" msgstr "--compression[=@var{Stufe}]" #. type: itemx -#: doc/guix.texi:9654 +#: doc/guix.texi:9652 #, no-wrap msgid "-C [@var{level}]" msgstr "-C [@var{Stufe}]" #. type: table -#: doc/guix.texi:9659 +#: doc/guix.texi:9657 msgid "Compress data using the given @var{level}. When @var{level} is zero, disable compression. The range 1 to 9 corresponds to different gzip compression levels: 1 is the fastest, and 9 is the best (CPU-intensive). The default is 3." msgstr "Daten auf der angegebenen Kompressions-@var{Stufe} komprimieren. Wird als @var{Stufe} null angegeben, wird Kompression deaktiviert. Der Bereich von 1 bis 9 entspricht unterschiedlichen gzip-Kompressionsstufen: 1 ist am schnellsten, während 9 am besten komprimiert (aber den Prozessor mehr auslastet). Der Vorgabewert ist 3." #. type: table -#: doc/guix.texi:9668 +#: doc/guix.texi:9666 msgid "Unless @option{--cache} is used, compression occurs on the fly and the compressed streams are not cached. Thus, to reduce load on the machine that runs @command{guix publish}, it may be a good idea to choose a low compression level, to run @command{guix publish} behind a caching proxy, or to use @option{--cache}. Using @option{--cache} has the advantage that it allows @command{guix publish} to add @code{Content-Length} HTTP header to its responses." msgstr "Wenn @option{--cache} nicht übergeben wird, werden Daten dynamisch immer erst dann komprimiert, wenn sie abgeschickt werden; komprimierte Datenströme landen in keinem Zwischenspeicher. Um also die Auslastung der Maschine, auf der @command{guix publish} läuft, zu reduzieren, kann es eine gute Idee sein, eine niedrige Kompressionsstufe zu wählen, @command{guix publish} einen Proxy mit Zwischenspeicher (einen „Caching Proxy“) voranzuschalten, oder @option{--cache} zu benutzen. @option{--cache} zu benutzen, hat den Vorteil, dass @command{guix publish} damit eine @code{Content-Length}-HTTP-Kopfzeile seinen Antworten beifügen kann." #. type: item -#: doc/guix.texi:9669 +#: doc/guix.texi:9667 #, no-wrap msgid "--cache=@var{directory}" msgstr "--cache=@var{Verzeichnis}" #. type: itemx -#: doc/guix.texi:9670 +#: doc/guix.texi:9668 #, no-wrap msgid "-c @var{directory}" msgstr "-c @var{Verzeichnis}" #. type: table -#: doc/guix.texi:9673 +#: doc/guix.texi:9671 msgid "Cache archives and meta-data (@code{.narinfo} URLs) to @var{directory} and only serve archives that are in cache." msgstr "Archive und Metadaten (@code{.narinfo}-URLs) in das @var{Verzeichnis} zwischenspeichern und nur solche Archive versenden, die im Zwischenspeicher vorliegen." #. type: table -#: doc/guix.texi:9681 +#: doc/guix.texi:9679 msgid "When this option is omitted, archives and meta-data are created on-the-fly. This can reduce the available bandwidth, especially when compression is enabled, since this may become CPU-bound. Another drawback of the default mode is that the length of archives is not known in advance, so @command{guix publish} does not add a @code{Content-Length} HTTP header to its responses, which in turn prevents clients from knowing the amount of data being downloaded." msgstr "Wird diese Befehlszeilenoption weggelassen, dann werden Archive und Metadaten „dynamisch“ erst auf eine Anfrage hin erzeugt. Dadurch kann die verfügbare Bandbreite reduziert werden, besonders wenn Kompression aktiviert ist, weil die Operation dann durch die Prozessorleistung beschränkt sein kann. Noch ein Nachteil des voreingestellten Modus ist, dass die Länge der Archive nicht im Voraus bekannt ist, @command{guix publish} also keine @code{Content-Length}-HTTP-Kopfzeile an seine Antworten anfügt, wodurch Clients nicht wissen können, welche Datenmenge noch heruntergeladen werden muss." #. type: table -#: doc/guix.texi:9689 +#: doc/guix.texi:9687 msgid "Conversely, when @option{--cache} is used, the first request for a store item (@i{via} a @code{.narinfo} URL) returns 404 and triggers a background process to @dfn{bake} the archive---computing its @code{.narinfo} and compressing the archive, if needed. Once the archive is cached in @var{directory}, subsequent requests succeed and are served directly from the cache, which guarantees that clients get the best possible bandwidth." msgstr "Im Gegensatz dazu liefert, wenn @option{--cache} benutzt wird, die erste Anfrage nach einem Store-Objekt (über dessen @code{.narinfo}-URL) den Fehlercode 404, und im Hintergrund wird ein Prozess gestartet, der das Archiv in den Zwischenspeicher einlagert (auf Englisch sagen wir „@dfn{bake} the archive“), d.h.@: seine @code{.narinfo} wird berechnet und das Archiv, falls nötig, komprimiert. Sobald das Archiv im @var{Verzeichnis} zwischengespeichert wurde, werden nachfolgende Anfragen erfolgreich sein und direkt aus dem Zwischenspeicher bedient, der garantiert, dass Clients optimale Bandbreite genießen." #. type: table -#: doc/guix.texi:9693 +#: doc/guix.texi:9691 msgid "The ``baking'' process is performed by worker threads. By default, one thread per CPU core is created, but this can be customized. See @option{--workers} below." msgstr "Der Prozess zum Einlagern wird durch Worker-Threads umgesetzt. Der Vorgabe entsprechend wird dazu pro Prozessorkern ein Thread erzeugt, aber dieses Verhalten kann angepasst werden. Siehe @option{--workers} weiter unten." #. type: table -#: doc/guix.texi:9696 +#: doc/guix.texi:9694 msgid "When @option{--ttl} is used, cached entries are automatically deleted when they have expired." msgstr "Wird @option{--ttl} verwendet, werden zwischengespeicherte Einträge automatisch gelöscht, sobald die dabei angegebene Zeit abgelaufen ist." #. type: item -#: doc/guix.texi:9697 +#: doc/guix.texi:9695 #, no-wrap msgid "--workers=@var{N}" msgstr "--workers=@var{N}" #. type: table -#: doc/guix.texi:9700 +#: doc/guix.texi:9698 msgid "When @option{--cache} is used, request the allocation of @var{N} worker threads to ``bake'' archives." msgstr "Wird @option{--cache} benutzt, wird die Reservierung von @var{N} Worker-Threads angefragt, um Archive einzulagern." #. type: item -#: doc/guix.texi:9701 +#: doc/guix.texi:9699 #, no-wrap msgid "--ttl=@var{ttl}" msgstr "--ttl=@var{ttl}" #. type: table -#: doc/guix.texi:9705 +#: doc/guix.texi:9703 msgid "Produce @code{Cache-Control} HTTP headers that advertise a time-to-live (TTL) of @var{ttl}. @var{ttl} must denote a duration: @code{5d} means 5 days, @code{1m} means 1 month, and so on." msgstr "@code{Cache-Control}-HTTP-Kopfzeilen erzeugen, die eine Time-to-live (TTL) von @var{ttl} signalisieren. Für @var{ttl} muss eine Dauer (mit dem Anfangsbuchstaben der Maßeinheit der Dauer im Englischen) angegeben werden: @code{5d} bedeutet 5 Tage, @code{1m} bedeutet 1 Monat und so weiter." #. type: table -#: doc/guix.texi:9710 +#: doc/guix.texi:9708 msgid "This allows the user's Guix to keep substitute information in cache for @var{ttl}. However, note that @code{guix publish} does not itself guarantee that the store items it provides will indeed remain available for as long as @var{ttl}." msgstr "Das ermöglicht es Guix, Substitutinformationen @var{ttl} lang zwischenzuspeichern. Beachten Sie allerdings, dass @code{guix publish} selbst @emph{nicht} garantiert, dass die davon angebotenen Store-Objekte so lange verfügbar bleiben, wie es die @var{ttl} vorsieht." #. type: table -#: doc/guix.texi:9714 +#: doc/guix.texi:9712 msgid "Additionally, when @option{--cache} is used, cached entries that have not been accessed for @var{ttl} and that no longer have a corresponding item in the store, may be deleted." msgstr "Des Weiteren können bei Nutzung von @option{--cache} die zwischengespeicherten Einträge gelöscht werden, wenn auf sie @var{ttl} lang nicht zugegriffen wurde und kein ihnen entsprechendes Objekt mehr im Store existiert." #. type: item -#: doc/guix.texi:9715 +#: doc/guix.texi:9713 #, no-wrap msgid "--nar-path=@var{path}" msgstr "--nar-path=@var{Pfad}" #. type: table -#: doc/guix.texi:9718 +#: doc/guix.texi:9716 msgid "Use @var{path} as the prefix for the URLs of ``nar'' files (@pxref{Invoking guix archive, normalized archives})." msgstr "Den @var{Pfad} als Präfix für die URLs von „nar“-Dateien benutzen (siehe @ref{Invoking guix archive, normalized archives})." #. type: table -#: doc/guix.texi:9722 +#: doc/guix.texi:9720 msgid "By default, nars are served at a URL such as @code{/nar/gzip/@dots{}-coreutils-8.25}. This option allows you to change the @code{/nar} part to @var{path}." msgstr "Vorgegeben ist, dass Nars unter einer URL mit @code{/nar/gzip/…-coreutils-8.25} angeboten werden. Mit dieser Befehlszeilenoption können Sie den @code{/nar}-Teil durch den angegebenen @var{Pfad} ersetzen." #. type: item -#: doc/guix.texi:9723 +#: doc/guix.texi:9721 #, no-wrap msgid "--public-key=@var{file}" msgstr "--public-key=@var{Datei}" #. type: itemx -#: doc/guix.texi:9724 +#: doc/guix.texi:9722 #, no-wrap msgid "--private-key=@var{file}" msgstr "--private-key=@var{Datei}" #. type: table -#: doc/guix.texi:9727 +#: doc/guix.texi:9725 msgid "Use the specific @var{file}s as the public/private key pair used to sign the store items being published." msgstr "Die angegebenen @var{Datei}en als das Paar aus öffentlichem und privatem Schlüssel zum Signieren veröffentlichter Store-Objekte benutzen." #. type: table -#: doc/guix.texi:9734 +#: doc/guix.texi:9732 msgid "The files must correspond to the same key pair (the private key is used for signing and the public key is merely advertised in the signature metadata). They must contain keys in the canonical s-expression format as produced by @command{guix archive --generate-key} (@pxref{Invoking guix archive}). By default, @file{/etc/guix/signing-key.pub} and @file{/etc/guix/signing-key.sec} are used." msgstr "Die Dateien müssen demselben Schlüsselpaar entsprechen (der private Schlüssel wird zum Signieren benutzt, der öffentliche Schlüssel wird lediglich in den Metadaten der Signatur aufgeführt). Die Dateien müssen Schlüssel im kanonischen („canonical“) S-Ausdruck-Format enthalten, wie es von @command{guix archive --generate-key} erzeugt wird (siehe @ref{Invoking guix archive}). Vorgegeben ist, dass @file{/etc/guix/signing-key.pub} und @file{/etc/guix/signing-key.sec} benutzt werden." #. type: item -#: doc/guix.texi:9735 +#: doc/guix.texi:9733 #, no-wrap msgid "--repl[=@var{port}]" msgstr "--repl[=@var{Port}]" #. type: itemx -#: doc/guix.texi:9736 +#: doc/guix.texi:9734 #, no-wrap msgid "-r [@var{port}]" msgstr "-r [@var{Port}]" #. type: table -#: doc/guix.texi:9740 +#: doc/guix.texi:9738 msgid "Spawn a Guile REPL server (@pxref{REPL Servers,,, guile, GNU Guile Reference Manual}) on @var{port} (37146 by default). This is used primarily for debugging a running @command{guix publish} server." msgstr "Einen Guile-REPL-Server (siehe @ref{REPL Servers,,, guile, GNU Guile Reference Manual}) auf diesem @var{Port} starten (37146 ist voreingestellt). Dies kann zur Fehlersuche auf einem laufenden „@command{guix publish}“-Server benutzt werden." #. type: Plain text -#: doc/guix.texi:9746 +#: doc/guix.texi:9744 msgid "Enabling @command{guix publish} on Guix System is a one-liner: just instantiate a @code{guix-publish-service-type} service in the @code{services} field of the @code{operating-system} declaration (@pxref{guix-publish-service-type, @code{guix-publish-service-type}})." msgstr "@command{guix publish} auf einem „Guix System“-System zu aktivieren ist ein Einzeiler: Instanziieren Sie einfach einen @code{guix-publish-service-type}-Dienst im @code{services}-Feld Ihres @code{operating-system}-Objekts zur Betriebssystemdeklaration (siehe @ref{guix-publish-service-type, @code{guix-publish-service-type}})." #. type: Plain text -#: doc/guix.texi:9749 +#: doc/guix.texi:9747 msgid "If you are instead running Guix on a ``foreign distro'', follow these instructions:”" msgstr "Falls Sie Guix aber auf einer „Fremddistribution“ laufen lassen, folgen Sie folgenden Anweisungen:" #. type: itemize -#: doc/guix.texi:9753 +#: doc/guix.texi:9751 msgid "If your host distro uses the systemd init system:" msgstr "Wenn Ihre Wirtsdistribution systemd als „init“-System benutzt:" #. type: example -#: doc/guix.texi:9758 +#: doc/guix.texi:9756 #, no-wrap msgid "" "# ln -s ~root/.guix-profile/lib/systemd/system/guix-publish.service \\\n" @@ -17670,7 +17681,7 @@ msgstr "" "# systemctl start guix-publish && systemctl enable guix-publish\n" #. type: example -#: doc/guix.texi:9766 +#: doc/guix.texi:9764 #, no-wrap msgid "" "# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n" @@ -17680,56 +17691,56 @@ msgstr "" "# start guix-publish\n" #. type: itemize -#: doc/guix.texi:9770 +#: doc/guix.texi:9768 msgid "Otherwise, proceed similarly with your distro's init system." msgstr "Verfahren Sie andernfalls auf die gleiche Art für das „init“-System, das Ihre Distribution verwendet." #. type: section -#: doc/guix.texi:9773 +#: doc/guix.texi:9771 #, no-wrap msgid "Invoking @command{guix challenge}" msgstr "@command{guix challenge} aufrufen" #. type: cindex -#: doc/guix.texi:9776 +#: doc/guix.texi:9774 #, no-wrap msgid "verifiable builds" msgstr "verifizierbare Erstellungen" #. type: command{#1} -#: doc/guix.texi:9777 +#: doc/guix.texi:9775 #, no-wrap msgid "guix challenge" msgstr "guix challenge" #. type: cindex -#: doc/guix.texi:9778 +#: doc/guix.texi:9776 #, no-wrap msgid "challenge" msgstr "Anfechten" #. type: Plain text -#: doc/guix.texi:9783 +#: doc/guix.texi:9781 msgid "Do the binaries provided by this server really correspond to the source code it claims to build? Is a package build process deterministic? These are the questions the @command{guix challenge} command attempts to answer." msgstr "Entsprechen die von diesem Server gelieferten Binärdateien tatsächlich dem Quellcode, aus dem sie angeblich erzeugt wurden? Ist ein Paketerstellungsprozess deterministisch? Diese Fragen versucht @command{guix challenge} zu beantworten." #. type: Plain text -#: doc/guix.texi:9791 +#: doc/guix.texi:9789 msgid "The former is obviously an important question: Before using a substitute server (@pxref{Substitutes}), one had better @emph{verify} that it provides the right binaries, and thus @emph{challenge} it. The latter is what enables the former: If package builds are deterministic, then independent builds of the package should yield the exact same result, bit for bit; if a server provides a binary different from the one obtained locally, it may be either corrupt or malicious." msgstr "Die erste Frage ist offensichtlich wichtig: Bevor man einen Substitutserver benutzt (siehe @ref{Substitutes}), @emph{verifiziert} man besser, dass er die richtigen Binärdateien liefert, d.h.@: man @emph{fechtet sie an}. Die letzte Frage macht die erste möglich: Wenn Paketerstellungen deterministisch sind, müssten voneinander unabhängige Erstellungen genau dasselbe Ergebnis liefern, Bit für Bit; wenn ein Server mit einer anderen Binärdatei als der lokal erstellten Binärdatei antwortet, ist diese entweder beschädigt oder bösartig." #. type: Plain text -#: doc/guix.texi:9800 +#: doc/guix.texi:9798 msgid "We know that the hash that shows up in @file{/gnu/store} file names is the hash of all the inputs of the process that built the file or directory---compilers, libraries, build scripts, etc. (@pxref{Introduction}). Assuming deterministic build processes, one store file name should map to exactly one build output. @command{guix challenge} checks whether there is, indeed, a single mapping by comparing the build outputs of several independent builds of any given store item." msgstr "Wir wissen, dass die in @file{/gnu/store}-Dateinamen auftauchende Hash-Prüfsumme der Hash aller Eingaben des Prozesses ist, mit dem die Datei oder das Verzeichnis erstellt wurde — Compiler, Bibliotheken, Erstellungsskripts und so weiter (siehe @ref{Introduction}). Wenn wir von deterministischen Erstellungen ausgehen, sollte ein Store-Dateiname also auf genau eine Erstellungsausgabe abgebildet werden. Mit @command{guix challenge} prüft man, ob es tatsächlich eine eindeutige Abbildung gibt, indem die Erstellungsausgaben mehrerer unabhängiger Erstellungen jedes angegebenen Store-Objekts verglichen werden." #. type: Plain text -#: doc/guix.texi:9802 +#: doc/guix.texi:9800 msgid "The command output looks like this:" msgstr "Die Ausgabe des Befehls sieht so aus:" #. type: smallexample -#: doc/guix.texi:9819 +#: doc/guix.texi:9817 #, no-wrap msgid "" "$ guix challenge --substitute-urls=\"https://@value{SUBSTITUTE-SERVER} https://guix.example.org\"\n" @@ -17767,7 +17778,7 @@ msgstr "" "\n" #. type: smallexample -#: doc/guix.texi:9821 +#: doc/guix.texi:9819 #, no-wrap msgid "" "@dots{}\n" @@ -17777,7 +17788,7 @@ msgstr "" "\n" #. type: smallexample -#: doc/guix.texi:9826 +#: doc/guix.texi:9824 #, no-wrap msgid "" "6,406 store items were analyzed:\n" @@ -17791,28 +17802,28 @@ msgstr "" " — 1,132 (17.7%) blieben ergebnislos\n" #. type: Plain text -#: doc/guix.texi:9834 +#: doc/guix.texi:9832 msgid "In this example, @command{guix challenge} first scans the store to determine the set of locally-built derivations---as opposed to store items that were downloaded from a substitute server---and then queries all the substitute servers. It then reports those store items for which the servers obtained a result different from the local build." msgstr "In diesem Beispiel wird mit @command{guix challenge} zuerst die Menge lokal erstellter Ableitungen im Store ermittelt — im Gegensatz zu von einem Substitserver heruntergeladenen Store-Objekten — und dann werden alle Substitutserver angefragt. Diejenigen Store-Objekte, bei denen der Server ein anderes Ergebnis berechnet hat als die lokale Erstellung, werden gemeldet." #. type: cindex -#: doc/guix.texi:9835 +#: doc/guix.texi:9833 #, no-wrap msgid "non-determinism, in package builds" msgstr "Nichtdeterminismus, in Paketerstellungen" #. type: Plain text -#: doc/guix.texi:9846 +#: doc/guix.texi:9844 msgid "As an example, @code{guix.example.org} always gets a different answer. Conversely, @code{@value{SUBSTITUTE-SERVER}} agrees with local builds, except in the case of Git. This might indicate that the build process of Git is non-deterministic, meaning that its output varies as a function of various things that Guix does not fully control, in spite of building packages in isolated environments (@pxref{Features}). Most common sources of non-determinism include the addition of timestamps in build results, the inclusion of random numbers, and directory listings sorted by inode number. See @uref{https://reproducible-builds.org/docs/}, for more information." msgstr "Nehmen wir zum Beispiel an, @code{guix.example.org} gibt uns immer eine verschiedene Antwort, aber @code{@value{SUBSTITUTE-SERVER}} stimmt mit lokalen Erstellungen überein, @emph{außer} im Fall von Git. Das könnte ein Hinweis sein, dass der Erstellungsprozess von Git nichtdeterministisch ist; das bedeutet, seine Ausgabe variiert abhängig von verschiedenen Umständen, die Guix nicht vollends kontrollieren kann, obwohl es Pakete in isolierten Umgebungen erstellt (siehe @ref{Features}). Zu den häufigsten Quellen von Nichtdeterminismus gehören das Einsetzen von Zeitstempeln innerhalb der Erstellungsgebnisse, das Einsetzen von Zufallszahlen und von Auflistungen eines Verzeichnisinhalts sortiert nach der Inode-Nummer. Siehe @uref{https://reproducible-builds.org/docs/} für mehr Informationen." #. type: Plain text -#: doc/guix.texi:9849 +#: doc/guix.texi:9847 msgid "To find out what is wrong with this Git binary, we can do something along these lines (@pxref{Invoking guix archive}):" msgstr "Um herauszufinden, was mit dieser Git-Binärdatei nicht stimmt, können wir so etwas machen (siehe @ref{Invoking guix archive}):" #. type: example -#: doc/guix.texi:9854 +#: doc/guix.texi:9852 #, no-wrap msgid "" "$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \\\n" @@ -17824,100 +17835,100 @@ msgstr "" "$ diff -ur --no-dereference /gnu/store/…-git.2.5.0 /tmp/git\n" #. type: Plain text -#: doc/guix.texi:9863 +#: doc/guix.texi:9861 msgid "This command shows the difference between the files resulting from the local build, and the files resulting from the build on @code{@value{SUBSTITUTE-SERVER}} (@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}). The @command{diff} command works great for text files. When binary files differ, a better option is @uref{https://diffoscope.org/, Diffoscope}, a tool that helps visualize differences for all kinds of files." msgstr "Dieser Befehl zeigt die Unterschiede zwischen den Dateien, die sich aus der lokalen Erstellung ergeben, und den Dateien, die sich aus der Erstellung auf @code{@value{SUBSTITUTE-SERVER}} ergeben (siehe @ref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}). Der Befehl @command{diff} funktioniert großartig für Textdateien. Wenn sich Binärdateien unterscheiden, ist @uref{https://diffoscope.org/, Diffoscope} die bessere Wahl: Es ist ein hilfreiches Werkzeug, das Unterschiede in allen Arten von Dateien visualisiert." #. type: Plain text -#: doc/guix.texi:9871 +#: doc/guix.texi:9869 msgid "Once you have done that work, you can tell whether the differences are due to a non-deterministic build process or to a malicious server. We try hard to remove sources of non-determinism in packages to make it easier to verify substitutes, but of course, this is a process that involves not just Guix, but a large part of the free software community. In the meantime, @command{guix challenge} is one tool to help address the problem." msgstr "Sobald Sie mit dieser Arbeit fertig sind, können Sie erkennen, ob die Unterschiede aufgrund eines nichtdeterministischen Erstellungsprozesses oder wegen einem bösartigen Server zustande kommen. Wir geben uns Mühe, Quellen von Nichtdeterminismus in Paketen zu entfernen, damit Substitute leichter verifiziert werden können, aber natürlich ist an diesem Prozess nicht nur Guix, sondern ein großer Teil der Freie-Software-Gemeinschaft beteiligt. In der Zwischenzeit ist @command{guix challenge} eines der Werkzeuge, die das Problem anzugehen helfen." #. type: Plain text -#: doc/guix.texi:9875 +#: doc/guix.texi:9873 msgid "If you are writing packages for Guix, you are encouraged to check whether @code{@value{SUBSTITUTE-SERVER}} and other substitute servers obtain the same build result as you did with:" msgstr "Wenn Sie ein Paket für Guix schreiben, ermutigen wir Sie, zu überprüfen, ob @code{@value{SUBSTITUTE-SERVER}} und andere Substitutserver dasselbe Erstellungsergebnis bekommen, das Sie bekommen haben. Das geht so:" #. type: example -#: doc/guix.texi:9878 +#: doc/guix.texi:9876 #, no-wrap msgid "$ guix challenge @var{package}\n" msgstr "$ guix challenge @var{Paket}\n" #. type: Plain text -#: doc/guix.texi:9883 +#: doc/guix.texi:9881 msgid "where @var{package} is a package specification such as @code{guile@@2.0} or @code{glibc:debug}." msgstr "Dabei wird mit @var{Paket} eine Paketspezifikation wie @code{guile@@2.0} oder @code{glibc:debug} bezeichnet." #. type: example -#: doc/guix.texi:9888 +#: doc/guix.texi:9886 #, no-wrap msgid "guix challenge @var{options} [@var{packages}@dots{}]\n" msgstr "guix challenge @var{Optionen} [@var{Pakete}…]\n" #. type: Plain text -#: doc/guix.texi:9895 +#: doc/guix.texi:9893 msgid "When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes denote other kinds of errors.)" msgstr "Wird ein Unterschied zwischen der Hash-Prüfsumme des lokal erstellten Objekts und dem vom Server gelieferten Substitut festgestellt, oder zwischen den Substituten von unterschiedlichen Servern, dann wird der Befehl dies wie im obigen Beispiel anzeigen und mit dem Exit-Code 2 terminieren (andere Exit-Codes außer null stehen für andere Arten von Fehlern)." #. type: Plain text -#: doc/guix.texi:9897 +#: doc/guix.texi:9895 msgid "The one option that matters is:" msgstr "Die eine, wichtige Befehlszeilenoption ist:" #. type: table -#: doc/guix.texi:9903 +#: doc/guix.texi:9901 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs to compare to." msgstr "Die @var{URLs} als durch Leerraumzeichen getrennte Liste von Substitut-Quell-URLs benutzen. mit denen verglichen wird." #. type: itemx -#: doc/guix.texi:9905 +#: doc/guix.texi:9903 #, no-wrap msgid "-v" msgstr "-v" #. type: table -#: doc/guix.texi:9908 +#: doc/guix.texi:9906 msgid "Show details about matches (identical contents) in addition to information about mismatches." msgstr "Details auch zu Übereinstimmungen (deren Inhalt identisch ist) ausgeben, zusätzlich zu Informationen über Unterschiede." #. type: section -#: doc/guix.texi:9912 +#: doc/guix.texi:9910 #, no-wrap msgid "Invoking @command{guix copy}" msgstr "@command{guix copy} aufrufen" #. type: cindex -#: doc/guix.texi:9914 +#: doc/guix.texi:9912 #, no-wrap msgid "copy, of store items, over SSH" msgstr "Kopieren, von Store-Objekten, über SSH" #. type: cindex -#: doc/guix.texi:9915 +#: doc/guix.texi:9913 #, no-wrap msgid "SSH, copy of store items" msgstr "SSH, Kopieren von Store-Objekten" #. type: cindex -#: doc/guix.texi:9916 +#: doc/guix.texi:9914 #, no-wrap msgid "sharing store items across machines" msgstr "Store-Objekte zwischen Maschinen teilen" #. type: cindex -#: doc/guix.texi:9917 +#: doc/guix.texi:9915 #, no-wrap msgid "transferring store items across machines" msgstr "Übertragen von Store-Objekten zwischen Maschinen" #. type: Plain text -#: doc/guix.texi:9924 +#: doc/guix.texi:9922 msgid "The @command{guix copy} command copies items from the store of one machine to that of another machine over a secure shell (SSH) connection@footnote{This command is available only when Guile-SSH was found. @xref{Requirements}, for details.}. For example, the following command copies the @code{coreutils} package, the user's profile, and all their dependencies over to @var{host}, logged in as @var{user}:" msgstr "Der Befehl @command{guix copy} kopiert Objekte aus dem Store einer Maschine in den Store einer anderen Maschine mittels einer Secure-Shell-Verbindung (kurz SSH-Verbindung)@footnote{Dieser Befehl steht nur dann zur Verfügung, wenn Guile-SSH gefunden werden kann. Siehe @ref{Requirements} für Details.}. Zum Beispiel kopiert der folgende Befehl das Paket @code{coreutils}, das Profil des Benutzers und all deren Abhängigkeiten auf den anderen @var{Rechner}, dazu meldet sich Guix als @var{Benutzer} an:" #. type: example -#: doc/guix.texi:9928 +#: doc/guix.texi:9926 #, no-wrap msgid "" "guix copy --to=@var{user}@@@var{host} \\\n" @@ -17927,192 +17938,192 @@ msgstr "" " coreutils `readlink -f ~/.guix-profile`\n" #. type: Plain text -#: doc/guix.texi:9932 +#: doc/guix.texi:9930 msgid "If some of the items to be copied are already present on @var{host}, they are not actually sent." msgstr "Wenn manche der zu kopierenden Objekte schon auf dem anderen @var{Rechner} vorliegen, werden sie tatsächlich @emph{nicht} übertragen." #. type: Plain text -#: doc/guix.texi:9935 +#: doc/guix.texi:9933 msgid "The command below retrieves @code{libreoffice} and @code{gimp} from @var{host}, assuming they are available there:" msgstr "Der folgende Befehl bezieht @code{libreoffice} und @code{gimp} von dem @var{Rechner}, vorausgesetzt sie sind dort verfügbar:" #. type: example -#: doc/guix.texi:9938 +#: doc/guix.texi:9936 #, no-wrap msgid "guix copy --from=@var{host} libreoffice gimp\n" msgstr "guix copy --from=@var{host} libreoffice gimp\n" #. type: Plain text -#: doc/guix.texi:9943 +#: doc/guix.texi:9941 msgid "The SSH connection is established using the Guile-SSH client, which is compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} and @file{~/.ssh/config}, and uses the SSH agent for authentication." msgstr "Die SSH-Verbindung wird mit dem Guile-SSH-Client hergestellt, der mit OpenSSH kompatibel ist: Er berücksichtigt @file{~/.ssh/known_hosts} und @file{~/.ssh/config} und verwendet den SSH-Agenten zur Authentifizierung." #. type: Plain text -#: doc/guix.texi:9949 +#: doc/guix.texi:9947 msgid "The key used to sign items that are sent must be accepted by the remote machine. Likewise, the key used by the remote machine to sign items you are retrieving must be in @file{/etc/guix/acl} so it is accepted by your own daemon. @xref{Invoking guix archive}, for more information about store item authentication." msgstr "Der Schlüssel, mit dem gesendete Objekte signiert sind, muss von der entfernten Maschine akzeptiert werden. Ebenso muss der Schlüssel, mit dem die Objekte signiert sind, die Sie von der entfernten Maschine empfangen, in Ihrer Datei @file{/etc/guix/acl} eingetragen sein, damit Ihr Daemon sie akzeptiert. Siehe @ref{Invoking guix archive} für mehr Informationen über die Authentifizierung von Store-Objekten." #. type: example -#: doc/guix.texi:9954 +#: doc/guix.texi:9952 #, no-wrap msgid "guix copy [--to=@var{spec}|--from=@var{spec}] @var{items}@dots{}\n" msgstr "guix copy [--to=@var{Spezifikation}|--from=@var{Spezifikation}] @var{Objekte}…\n" #. type: Plain text -#: doc/guix.texi:9957 +#: doc/guix.texi:9955 msgid "You must always specify one of the following options:" msgstr "Sie müssen immer eine der folgenden Befehlszeilenoptionen angeben:" #. type: item -#: doc/guix.texi:9959 +#: doc/guix.texi:9957 #, no-wrap msgid "--to=@var{spec}" msgstr "--to=@var{Spezifikation}" #. type: itemx -#: doc/guix.texi:9960 +#: doc/guix.texi:9958 #, no-wrap msgid "--from=@var{spec}" msgstr "--from=@var{Spezifikation}" #. type: table -#: doc/guix.texi:9964 +#: doc/guix.texi:9962 msgid "Specify the host to send to or receive from. @var{spec} must be an SSH spec such as @code{example.org}, @code{charlie@@example.org}, or @code{charlie@@example.org:2222}." msgstr "Gibt den Rechner (den „Host“) an, an den oder von dem gesendet bzw. empfangen wird. Die @var{Spezifikation} muss eine SSH-Spezifikation sein wie @code{example.org}, @code{charlie@@example.org} oder @code{charlie@@example.org:2222}." #. type: Plain text -#: doc/guix.texi:9968 +#: doc/guix.texi:9966 msgid "The @var{items} can be either package names, such as @code{gimp}, or store items, such as @file{/gnu/store/@dots{}-idutils-4.6}." msgstr "Die @var{Objekte} können entweder Paketnamen wie @code{gimp} oder Store-Objekte wie @file{/gnu/store/…-idutils-4.6} sein." #. type: Plain text -#: doc/guix.texi:9972 +#: doc/guix.texi:9970 msgid "When specifying the name of a package to send, it is first built if needed, unless @option{--dry-run} was specified. Common build options are supported (@pxref{Common Build Options})." msgstr "Wenn ein zu sendendes Paket mit Namen angegeben wird, wird es erst erstellt, falls es nicht im Store vorliegt, außer @option{--dry-run} wurde angegeben wurde. Alle gemeinsamen Erstellungsoptionen werden unterstützt (siehe @ref{Common Build Options})." #. type: section -#: doc/guix.texi:9975 +#: doc/guix.texi:9973 #, no-wrap msgid "Invoking @command{guix container}" msgstr "@command{guix container} aufrufen" #. type: command{#1} -#: doc/guix.texi:9977 +#: doc/guix.texi:9975 #, no-wrap msgid "guix container" msgstr "guix container" #. type: quotation -#: doc/guix.texi:9981 +#: doc/guix.texi:9979 msgid "As of version @value{VERSION}, this tool is experimental. The interface is subject to radical change in the future." msgstr "Dieses Werkzeug ist noch experimentell, Stand Version @value{VERSION}. Die Schnittstelle wird sich in Zukunft grundlegend verändern." #. type: Plain text -#: doc/guix.texi:9988 +#: doc/guix.texi:9986 msgid "The purpose of @command{guix container} is to manipulate processes running within an isolated environment, commonly known as a ``container'', typically created by the @command{guix environment} (@pxref{Invoking guix environment}) and @command{guix system container} (@pxref{Invoking guix system}) commands." msgstr "Der Zweck von @command{guix container} ist, in einer isolierten Umgebung (gemeinhin als „Container“ bezeichnet) laufende Prozesse zu manipulieren, die typischerweise durch die Befehle @command{guix environment} (siehe @ref{Invoking guix environment}) und @command{guix system container} (siehe @ref{Invoking guix system}) erzeugt werden." #. type: example -#: doc/guix.texi:9993 +#: doc/guix.texi:9991 #, no-wrap msgid "guix container @var{action} @var{options}@dots{}\n" msgstr "guix container @var{Aktion} @var{Optionen}…\n" #. type: Plain text -#: doc/guix.texi:9997 +#: doc/guix.texi:9995 msgid "@var{action} specifies the operation to perform with a container, and @var{options} specifies the context-specific arguments for the action." msgstr "Mit @var{Aktion} wird die Operation angegeben, die in der isolierten Umgebung durchgeführt werden soll, und mit @var{Optionen} werden die kontextabhängigen Argumente an die Aktion angegeben." #. type: Plain text -#: doc/guix.texi:9999 +#: doc/guix.texi:9997 msgid "The following actions are available:" msgstr "Folgende Aktionen sind verfügbar:" #. type: item -#: doc/guix.texi:10001 +#: doc/guix.texi:9999 #, no-wrap msgid "exec" msgstr "exec" #. type: table -#: doc/guix.texi:10003 +#: doc/guix.texi:10001 msgid "Execute a command within the context of a running container." msgstr "Führt einen Befehl im Kontext der laufenden isolierten Umgebung aus." #. type: table -#: doc/guix.texi:10005 +#: doc/guix.texi:10003 msgid "The syntax is:" msgstr "Die Syntax ist:" #. type: example -#: doc/guix.texi:10008 +#: doc/guix.texi:10006 #, no-wrap msgid "guix container exec @var{pid} @var{program} @var{arguments}@dots{}\n" msgstr "guix container exec @var{PID} @var{Programm} @var{Argumente}…\n" #. type: table -#: doc/guix.texi:10014 +#: doc/guix.texi:10012 msgid "@var{pid} specifies the process ID of the running container. @var{program} specifies an executable file name within the root file system of the container. @var{arguments} are the additional options that will be passed to @var{program}." msgstr "@var{PID} gibt die Prozess-ID der laufenden isolierten Umgebung an. Als @var{Programm} muss eine ausführbare Datei im Wurzeldateisystem der isolierten Umgebung angegeben werden. Die @var{Argumente} sind die zusätzlichen Befehlszeilenoptionen, die an das @var{Programm} übergeben werden." #. type: table -#: doc/guix.texi:10018 +#: doc/guix.texi:10016 msgid "The following command launches an interactive login shell inside a Guix system container, started by @command{guix system container}, and whose process ID is 9001:" msgstr "Der folgende Befehl startet eine interaktive Anmelde-Shell innerhalb einer isolierten Guix-Systemumgebung, gestartet durch @command{guix system container}, dessen Prozess-ID 9001 ist:" #. type: example -#: doc/guix.texi:10021 +#: doc/guix.texi:10019 #, no-wrap msgid "guix container exec 9001 /run/current-system/profile/bin/bash --login\n" msgstr "guix container exec 9001 /run/current-system/profile/bin/bash --login\n" #. type: table -#: doc/guix.texi:10025 +#: doc/guix.texi:10023 msgid "Note that the @var{pid} cannot be the parent process of a container. It must be PID 1 of the container or one of its child processes." msgstr "Beachten Sie, dass die @var{PID} nicht der Elternprozess der isolierten Umgebung sein darf, sondern PID 1 in der isolierten Umgebung oder einer seiner Kindprozesse sein muss." #. type: section -#: doc/guix.texi:10029 +#: doc/guix.texi:10027 #, no-wrap msgid "Invoking @command{guix weather}" msgstr "@command{guix weather} aufrufen" #. type: Plain text -#: doc/guix.texi:10038 +#: doc/guix.texi:10036 msgid "Occasionally you're grumpy because substitutes are lacking and you end up building packages by yourself (@pxref{Substitutes}). The @command{guix weather} command reports on substitute availability on the specified servers so you can have an idea of whether you'll be grumpy today. It can sometimes be useful info as a user, but it is primarily useful to people running @command{guix publish} (@pxref{Invoking guix publish})." msgstr "Manchmal werden Sie schlecht gelaunt sein, weil es zu wenige Substitute gibt und die Pakete bei Ihnen selbst erstellt werden müssen (siehe @ref{Substitutes}). Der Befehl @command{guix weather} zeigt einen Bericht über die Verfügbarkeit von Substituten auf den angegebenen Servern an, damit Sie sich eine Vorstellung davon machen können, wie es heute um Ihre Laune bestellt sein wird. Manchmal bekommt man als Nutzer so hilfreiche Informationen, aber in erster Linie nützt der Befehl den Leuten, die @command{guix publish} benutzen (siehe @ref{Invoking guix publish})." #. type: cindex -#: doc/guix.texi:10039 +#: doc/guix.texi:10037 #, no-wrap msgid "statistics, for substitutes" msgstr "Statistik, für Substitute" #. type: cindex -#: doc/guix.texi:10040 +#: doc/guix.texi:10038 #, no-wrap msgid "availability of substitutes" msgstr "Verfügbarkeit von Substituten" #. type: cindex -#: doc/guix.texi:10041 +#: doc/guix.texi:10039 #, no-wrap msgid "substitute availability" msgstr "Substitutverfügbarkeit" #. type: cindex -#: doc/guix.texi:10042 +#: doc/guix.texi:10040 #, no-wrap msgid "weather, substitute availability" msgstr "Wetter, Substitutverfügbarkeit" #. type: Plain text -#: doc/guix.texi:10044 +#: doc/guix.texi:10042 msgid "Here's a sample run:" msgstr "Hier ist ein Beispiel für einen Aufruf davon:" #. type: example -#: doc/guix.texi:10056 +#: doc/guix.texi:10054 #, no-wrap msgid "" "$ guix weather --substitute-urls=https://guix.example.org\n" @@ -18140,7 +18151,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10066 +#: doc/guix.texi:10064 #, no-wrap msgid "" " 9.8% (342 out of 3,470) of the missing items are queued\n" @@ -18164,60 +18175,60 @@ msgstr "" " aarch64-linux: 6,41 Erstellungen pro Stunde\n" #. type: cindex -#: doc/guix.texi:10068 +#: doc/guix.texi:10066 #, no-wrap msgid "continuous integration, statistics" msgstr "Kontinuierliche Integration, Statistik" #. type: Plain text -#: doc/guix.texi:10079 +#: doc/guix.texi:10077 msgid "As you can see, it reports the fraction of all the packages for which substitutes are available on the server---regardless of whether substitutes are enabled, and regardless of whether this server's signing key is authorized. It also reports the size of the compressed archives (``nars'') provided by the server, the size the corresponding store items occupy in the store (assuming deduplication is turned off), and the server's throughput. The second part gives continuous integration (CI) statistics, if the server supports it. In addition, using the @option{--coverage} option, @command{guix weather} can list ``important'' package substitutes missing on the server (see below)." msgstr "Wie Sie sehen können, wird der Anteil unter allen Paketen angezeigt, für die auf dem Server Substitute verfügbar sind — unabhängig davon, ob Substitute aktiviert sind, und unabhängig davon, ob der signierende Schlüssel des Servers autorisiert ist. Es wird auch über die Größe der komprimierten Archive (die „Nars“) berichtet, die vom Server angeboten werden, sowie über die Größe, die die zugehörigen Store-Objekte im Store belegen würden (unter der Annahme, dass Deduplizierung abgeschaltet ist) und über den Durchsatz des Servers. Der zweite Teil sind Statistiken zur Kontinuierlichen Integration (englisch „Continuous Integration“, kurz CI), wenn der Server dies unterstützt. Des Weiteren kann @command{guix weather}, wenn es mit der Befehlszeilenoption @option{--coverage} aufgerufen wird, „wichtige“ Paketsubstitute, die auf dem Server fehlen, auflisten (siehe unten)." #. type: Plain text -#: doc/guix.texi:10085 +#: doc/guix.texi:10083 msgid "To achieve that, @command{guix weather} queries over HTTP(S) meta-data (@dfn{narinfos}) for all the relevant store items. Like @command{guix challenge}, it ignores signatures on those substitutes, which is innocuous since the command only gathers statistics and cannot install those substitutes." msgstr "Dazu werden mit @command{guix weather} Anfragen über HTTP(S) zu Metadaten (@dfn{Narinfos}) für alle relevanten Store-Objekte gestellt. Wie @command{guix challenge} werden die Signaturen auf den Substituten ignoriert, was harmlos ist, weil der Befehl nur Statistiken sammelt und keine Substitute installieren kann." #. type: Plain text -#: doc/guix.texi:10088 +#: doc/guix.texi:10086 msgid "Among other things, it is possible to query specific system types and specific package sets. The available options are listed below." msgstr "Neben anderen Dingen ist es möglich, bestimmte Systemtypen und bestimmte Paketmengen anzufragen. Die verfügbaren Befehlszeilenoptionen sind folgende:" #. type: table -#: doc/guix.texi:10094 +#: doc/guix.texi:10092 msgid "@var{urls} is the space-separated list of substitute server URLs to query. When this option is omitted, the default set of substitute servers is queried." msgstr "@var{URLs} ist eine leerzeichengetrennte Liste anzufragender Substitutserver-URLs. Wird diese Befehlszeilenoption weggelassen, wird die vorgegebene Menge an Substitutservern angefragt." #. type: table -#: doc/guix.texi:10100 +#: doc/guix.texi:10098 msgid "Query substitutes for @var{system}---e.g., @code{aarch64-linux}. This option can be repeated, in which case @command{guix weather} will query substitutes for several system types." msgstr "Substitute für das @var{System} anfragen — z.B.@: für @code{aarch64-linux}. Diese Befehlszeilenoption kann mehrmals angegeben werden, wodurch @command{guix weather} die Substitute für mehrere Systemtypen anfragt." #. type: table -#: doc/guix.texi:10106 +#: doc/guix.texi:10104 msgid "Instead of querying substitutes for all the packages, only ask for those specified in @var{file}. @var{file} must contain a @dfn{manifest}, as with the @code{-m} option of @command{guix package} (@pxref{Invoking guix package})." msgstr "Anstatt die Substitute für alle Pakete anzufragen, werden nur die in der @var{Datei} angegebenen Pakete erfragt. Die @var{Datei} muss ein @dfn{Manifest} enthalten, wie bei der Befehlszeilenoption @code{-m} von @command{guix package} (siehe @ref{Invoking guix package})." #. type: item -#: doc/guix.texi:10107 +#: doc/guix.texi:10105 #, no-wrap msgid "--coverage[=@var{count}]" msgstr "--coverage[=@var{Anzahl}]" #. type: itemx -#: doc/guix.texi:10108 +#: doc/guix.texi:10106 #, no-wrap msgid "-c [@var{count}]" msgstr "-c [@var{Anzahl}]" #. type: table -#: doc/guix.texi:10114 +#: doc/guix.texi:10112 msgid "Report on substitute coverage for packages: list packages with at least @var{count} dependents (zero by default) for which substitutes are unavailable. Dependent packages themselves are not listed: if @var{b} depends on @var{a} and @var{a} has no substitutes, only @var{a} is listed, even though @var{b} usually lacks substitutes as well. The result looks like this:" msgstr "Einen Bericht über die Substitutabdeckung für Pakete ausgeben, d.h.@: Pakete mit mindestens @var{Anzahl}-vielen Abhängigen (voreingestellt mindestens null) anzeigen, für die keine Substitute verfügbar sind. Die abhängigen Pakete werden selbst nicht aufgeführt: Wenn @var{b} von @var{a} abhängt und Substitute für @var{a} fehlen, wird nur @var{a} aufgeführt, obwohl dann in der Regel auch die Substitute für @var{b} fehlen. Das Ergebnis sieht so aus:" #. type: example -#: doc/guix.texi:10128 +#: doc/guix.texi:10126 #, no-wrap msgid "" "$ guix weather --substitute-urls=@value{SUBSTITUTE-URL} -c 10\n" @@ -18247,28 +18258,28 @@ msgstr "" " …\n" #. type: table -#: doc/guix.texi:10133 +#: doc/guix.texi:10131 msgid "What this example shows is that @code{kcoreaddons} and presumably the 58 packages that depend on it have no substitutes at @code{ci.guix.info}; likewise for @code{qgpgme} and the 46 packages that depend on it." msgstr "Was man hier in diesem Beispiel sehen kann, ist, dass es für @code{kcoreaddons} und vermutlich die 58 Pakete, die davon abhängen, auf @code{ci.guix.info} keine Substitute gibt; Gleiches gilt für @code{qgpgme} und die 46 Pakete, die davon abhängen." #. type: table -#: doc/guix.texi:10137 +#: doc/guix.texi:10135 msgid "If you are a Guix developer, or if you are taking care of this build farm, you'll probably want to have a closer look at these packages: they may simply fail to build." msgstr "Wenn Sie ein Guix-Entwickler sind oder sich um diese Build-Farm kümmern, wollen Sie sich diese Pakete vielleicht genauer anschauen. Es kann sein, dass sie schlicht nie erfolgreich erstellt werden können." #. type: section -#: doc/guix.texi:10140 +#: doc/guix.texi:10138 #, no-wrap msgid "Invoking @command{guix processes}" msgstr "@command{guix processes} aufrufen" #. type: Plain text -#: doc/guix.texi:10148 +#: doc/guix.texi:10146 msgid "The @command{guix processes} command can be useful to developers and system administrators, especially on multi-user machines and on build farms: it lists the current sessions (connections to the daemon), as well as information about the processes involved@footnote{Remote sessions, when @command{guix-daemon} is started with @option{--listen} specifying a TCP endpoint, are @emph{not} listed.}. Here's an example of the information it returns:" msgstr "Der Befehl @command{guix processes} kann sich für Entwickler und Systemadministratoren als nützlich erweisen, besonders auf Maschinen mit mehreren Nutzern und auf Build-Farms. Damit werden die aktuellen Sitzungen (also Verbindungen zum Daemon) sowie Informationen über die beteiligten Prozesse aufgelistet@footnote{Entfernte Sitzungen, wenn @command{guix-daemon} mit @option{--listen} unter Angabe eines TCP-Endpunkts gestartet wurde, werden @emph{nicht} aufgelistet.}. Hier ist ein Beispiel für die davon gelieferten Informationen:" #. type: example -#: doc/guix.texi:10154 +#: doc/guix.texi:10152 #, no-wrap msgid "" "$ sudo guix processes\n" @@ -18284,7 +18295,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10158 +#: doc/guix.texi:10156 #, no-wrap msgid "" "SessionPID: 19402\n" @@ -18298,7 +18309,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10168 +#: doc/guix.texi:10166 #, no-wrap msgid "" "SessionPID: 19444\n" @@ -18322,22 +18333,22 @@ msgstr "" "ChildProcess: 27793: guix offload x86_64-linux 7200 1 28800\n" #. type: Plain text -#: doc/guix.texi:10175 +#: doc/guix.texi:10173 msgid "In this example we see that @command{guix-daemon} has three clients: @command{guix environment}, @command{guix publish}, and the Cuirass continuous integration tool; their process identifier (PID) is given by the @code{ClientPID} field. The @code{SessionPID} field gives the PID of the @command{guix-daemon} sub-process of this particular session." msgstr "In diesem Beispiel sehen wir, dass @command{guix-daemon} drei Clients hat: @command{guix environment}, @command{guix publish} und das Werkzeug Cuirass zur Kontinuierlichen Integration. Deren Prozesskennung (PID) ist jeweils im @code{ClientPID}-Feld zu sehen. Das Feld @code{SessionPID} zeigt die PID des @command{guix-daemon}-Unterprozesses dieser bestimmten Sitzung." #. type: Plain text -#: doc/guix.texi:10182 +#: doc/guix.texi:10180 msgid "The @code{LockHeld} fields show which store items are currently locked by this session, which corresponds to store items being built or substituted (the @code{LockHeld} field is not displayed when @command{guix processes} is not running as root.) Last, by looking at the @code{ChildProcess} field, we understand that these three builds are being offloaded (@pxref{Daemon Offload Setup})." msgstr "Das Feld @code{LockHeld} zeigt an, welche Store-Objekte derzeit durch die Sitzung gesperrt sind, d.h.@: welche Store-Objekte zur Zeit erstellt oder substituiert werden (das @code{LockHeld}-Feld wird nicht angezeigt, wenn @command{guix processes} nicht als Administratornutzer root ausgeführt wird). Letztlich sehen wir am @code{ChildProcess}-Feld oben, dass diese drei Erstellungen hier ausgelagert (englisch „offloaded“) werden (siehe @ref{Daemon Offload Setup})." #. type: Plain text -#: doc/guix.texi:10187 +#: doc/guix.texi:10185 msgid "The output is in Recutils format so we can use the handy @command{recsel} command to select sessions of interest (@pxref{Selection Expressions,,, recutils, GNU recutils manual}). As an example, the command shows the command line and PID of the client that triggered the build of a Perl package:" msgstr "Die Ausgabe ist im Recutils-Format, damit wir den praktischen @command{recsel}-Befehl benutzen können, um uns interessierende Sitzungen auszuwählen (siehe @ref{Selection Expressions,,, recutils, GNU recutils manual}). Zum Beispiel zeigt dieser Befehl die Befehlszeile und PID des Clients an, der die Erstellung des Perl-Pakets ausgelöst hat:" #. type: example -#: doc/guix.texi:10193 +#: doc/guix.texi:10191 #, no-wrap msgid "" "$ sudo guix processes | \\\n" @@ -18351,90 +18362,90 @@ msgstr "" "ClientCommand: cuirass --cache-directory /var/cache/cuirass …\n" #. type: cindex -#: doc/guix.texi:10199 +#: doc/guix.texi:10197 #, no-wrap msgid "system configuration" msgstr "Systemkonfiguration" #. type: Plain text -#: doc/guix.texi:10205 +#: doc/guix.texi:10203 msgid "Guix System supports a consistent whole-system configuration mechanism. By that we mean that all aspects of the global system configuration---such as the available system services, timezone and locale settings, user accounts---are declared in a single place. Such a @dfn{system configuration} can be @dfn{instantiated}---i.e., effected." msgstr "Guix System unterstützt einen Mechanismus zur konsistenten Konfiguration des gesamten Systems. Damit meinen wir, dass alle Aspekte der globalen Systemkonfiguration an einem Ort stehen, d.h.@: die zur Verfügung gestellten Systemdienste, die Zeitzone und Einstellungen zur Locale (also die Anpassung an regionale Gepflogenheiten und Sprachen) sowie Benutzerkonten. Sie alle werden an derselben Stelle deklariert. So eine @dfn{Systemkonfiguration} kann @dfn{instanziiert}, also umgesetzt, werden." #. type: Plain text -#: doc/guix.texi:10215 +#: doc/guix.texi:10213 msgid "One of the advantages of putting all the system configuration under the control of Guix is that it supports transactional system upgrades, and makes it possible to roll back to a previous system instantiation, should something go wrong with the new one (@pxref{Features}). Another advantage is that it makes it easy to replicate the exact same configuration across different machines, or at different points in time, without having to resort to additional administration tools layered on top of the own tools of the system." msgstr "Einer der Vorteile, die ganze Systemkonfiguration unter die Kontrolle von Guix zu stellen, ist, dass so transaktionelle Systemaktualisierungen möglich werden und dass diese rückgängig gemacht werden können, wenn das aktualisierte System nicht richtig funktioniert (siehe @ref{Features}). Ein anderer Vorteil ist, dass dieselbe Systemkonfiguration leicht auf einer anderen Maschine oder zu einem späteren Zeitpunkt benutzt werden kann, ohne dazu eine weitere Schicht administrativer Werkzeuge über den systemeigenen Werkzeugen einsetzen zu müssen." #. type: Plain text -#: doc/guix.texi:10220 +#: doc/guix.texi:10218 msgid "This section describes this mechanism. First we focus on the system administrator's viewpoint---explaining how the system is configured and instantiated. Then we show how this mechanism can be extended, for instance to support new system services." msgstr "In diesem Abschnitt wird dieser Mechanismus beschrieben. Zunächst betrachten wir ihn aus der Perspektive eines Administrators. Dabei wird erklärt, wie das System konfiguriert und instanziiert werden kann. Dann folgt eine Demonstration, wie der Mechanismus erweitert werden kann, etwa um neue Systemdienste zu unterstützen." #. type: Plain text -#: doc/guix.texi:10248 +#: doc/guix.texi:10246 msgid "The operating system is configured by providing an @code{operating-system} declaration in a file that can then be passed to the @command{guix system} command (@pxref{Invoking guix system}). A simple setup, with the default system services, the default Linux-Libre kernel, initial RAM disk, and boot loader looks like this:" msgstr "Das Betriebssystem können Sie konfigurieren, indem Sie eine @code{operating-system}-Deklaration in einer Datei speichern, die Sie dann dem Befehl @command{guix system} übergeben (siehe @ref{Invoking guix system}). Eine einfache Konfiguration mit den vorgegebenen Systemdiensten und dem vorgegebenen Linux-Libre als Kernel und mit einer initialen RAM-Disk und einem Bootloader, sieht so aus:" #. type: findex -#: doc/guix.texi:10249 +#: doc/guix.texi:10247 #, no-wrap msgid "operating-system" msgstr "operating-system" #. type: include -#: doc/guix.texi:10251 +#: doc/guix.texi:10249 #, no-wrap msgid "os-config-bare-bones.texi" msgstr "os-config-bare-bones.texi" #. type: Plain text -#: doc/guix.texi:10258 +#: doc/guix.texi:10256 msgid "This example should be self-describing. Some of the fields defined above, such as @code{host-name} and @code{bootloader}, are mandatory. Others, such as @code{packages} and @code{services}, can be omitted, in which case they get a default value." msgstr "Dieses Beispiel sollte selbsterklärend sein. Manche der Felder oben, wie etwa @code{host-name} und @code{bootloader}, müssen angegeben werden. Andere sind optional, wie etwa @code{packages} und @code{services}, sind optional; werden sie nicht angegeben, nehmen sie einen Vorgabewert an." #. type: Plain text -#: doc/guix.texi:10263 +#: doc/guix.texi:10261 msgid "Below we discuss the effect of some of the most important fields (@pxref{operating-system Reference}, for details about all the available fields), and how to @dfn{instantiate} the operating system using @command{guix system}." msgstr "Im Folgenden werden die Effekte von einigen der wichtigsten Feldern erläutert (siehe @ref{operating-system Reference} für Details zu allen verfügbaren Feldern), dann wird beschrieben, wie man das Betriebssystem mit @command{guix system} @dfn{instanziieren} kann." #. type: unnumberedsubsec -#: doc/guix.texi:10264 +#: doc/guix.texi:10262 #, no-wrap msgid "Bootloader" msgstr "Bootloader" #. type: cindex -#: doc/guix.texi:10266 +#: doc/guix.texi:10264 #, no-wrap msgid "legacy boot, on Intel machines" msgstr "Legacy-Boot, auf Intel-Maschinen" #. type: cindex -#: doc/guix.texi:10267 +#: doc/guix.texi:10265 #, no-wrap msgid "BIOS boot, on Intel machines" msgstr "BIOS-Boot, auf Intel-Maschinen" #. type: cindex -#: doc/guix.texi:10268 +#: doc/guix.texi:10266 #, no-wrap msgid "UEFI boot" msgstr "UEFI-Boot" #. type: cindex -#: doc/guix.texi:10269 +#: doc/guix.texi:10267 #, no-wrap msgid "EFI boot" msgstr "EFI-Boot" #. type: Plain text -#: doc/guix.texi:10275 +#: doc/guix.texi:10273 msgid "The @code{bootloader} field describes the method that will be used to boot your system. Machines based on Intel processors can boot in ``legacy'' BIOS mode, as in the example above. However, more recent machines rely instead on the @dfn{Unified Extensible Firmware Interface} (UEFI) to boot. In that case, the @code{bootloader} field should contain something along these lines:" msgstr "Das @code{bootloader}-Feld beschreibt, mit welcher Methode Ihr System „gebootet“ werden soll. Maschinen, die auf Intel-Prozessoren basieren, können im alten „Legacy“-BIOS-Modus gebootet werden, wie es im obigen Beispiel der Fall wäre. Neuere Maschinen benutzen stattdessen das @dfn{Unified Extensible Firmware Interface} (UEFI) zum Booten. In diesem Fall sollte das @code{bootloader}-Feld in etwa so aussehen:" #. type: example -#: doc/guix.texi:10280 +#: doc/guix.texi:10278 #, no-wrap msgid "" "(bootloader-configuration\n" @@ -18446,29 +18457,29 @@ msgstr "" " (target \"/boot/efi\"))\n" #. type: Plain text -#: doc/guix.texi:10284 +#: doc/guix.texi:10282 msgid "@xref{Bootloader Configuration}, for more information on the available configuration options." msgstr "Siehe den Abschnitt @ref{Bootloader Configuration} für weitere Informationen zu den verfügbaren Konfigurationsoptionen." #. type: unnumberedsubsec -#: doc/guix.texi:10285 +#: doc/guix.texi:10283 #, no-wrap msgid "Globally-Visible Packages" msgstr "global sichtbare Pakete" #. type: vindex -#: doc/guix.texi:10287 +#: doc/guix.texi:10285 #, no-wrap msgid "%base-packages" msgstr "%base-packages" #. type: Plain text -#: doc/guix.texi:10300 +#: doc/guix.texi:10298 msgid "The @code{packages} field lists packages that will be globally visible on the system, for all user accounts---i.e., in every user's @code{PATH} environment variable---in addition to the per-user profiles (@pxref{Invoking guix package}). The @var{%base-packages} variable 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 GNU@tie{}Screen to those, taken from the @code{(gnu packages screen)} module (@pxref{Package Modules}). The @code{(list package output)} syntax can be used to add a specific output of a package:" msgstr "Im Feld @code{packages} werden Pakete aufgeführt, die auf dem System für alle Benutzerkonten global sichtbar sein sollen, d.h.@: in der @code{PATH}-Umgebungsvariablen jedes Nutzers, zusätzlich zu den nutzereigenen Profilen (siehe @ref{Invoking guix package}). Die Variable @var{%base-packages} bietet alle Werkzeuge, die man für grundlegende Nutzer- und Administratortätigkeiten erwarten würde, einschließlich der GNU Core Utilities, der GNU Networking Utilities, des leichtgewichtigen Texteditors GNU Zile, @command{find}, @command{grep} und so weiter. Obiges Beispiel fügt zu diesen noch das Programm GNU@tie{}Screen hinzu, welches aus dem Modul @code{(gnu packages screen)} genommen wird (siehe @ref{Package Modules}). Die Syntax @code{(list package output)} kann benutzt werden, um eine bestimmte Ausgabe eines Pakets auszuwählen:" #. type: lisp -#: doc/guix.texi:10304 +#: doc/guix.texi:10302 #, no-wrap msgid "" "(use-modules (gnu packages))\n" @@ -18480,7 +18491,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:10309 +#: doc/guix.texi:10307 #, no-wrap msgid "" "(operating-system\n" @@ -18494,18 +18505,18 @@ msgstr "" " %base-packages)))\n" #. type: findex -#: doc/guix.texi:10311 +#: doc/guix.texi:10309 #, no-wrap msgid "specification->package" msgstr "specification->package" #. type: Plain text -#: doc/guix.texi:10320 +#: doc/guix.texi:10318 msgid "Referring to packages by variable name, like @code{bind} above, has the advantage of being unambiguous; it also allows typos and such to be diagnosed right away as ``unbound variables''. The downside is that one needs to know which module defines which package, and to augment the @code{use-package-modules} line accordingly. To avoid that, one can use the @code{specification->package} procedure of the @code{(gnu packages)} module, which returns the best package for a given name or name and version:" msgstr "Sich auf Pakete anhand ihres Variablennamens zu beziehen, wie oben bei @code{bind}, hat den Vorteil, dass der Name eindeutig ist; Tippfehler werden direkt als „unbound variables“ gemeldet. Der Nachteil ist, dass man wissen muss, in welchem Modul ein Paket definiert wird, um die Zeile mit @code{use-package-modules} entsprechend zu ergänzen. Um dies zu vermeiden, kann man auch die Prozedur @code{specification->package} aus dem Modul @code{(gnu packages)} aufrufen, welche das einem angegebenen Namen oder Name-Versions-Paar zu Grunde liegende Paket liefert:" #. type: lisp -#: doc/guix.texi:10323 +#: doc/guix.texi:10321 #, no-wrap msgid "" "(use-modules (gnu packages))\n" @@ -18515,7 +18526,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:10329 +#: doc/guix.texi:10327 #, no-wrap msgid "" "(operating-system\n" @@ -18531,52 +18542,52 @@ msgstr "" " %base-packages)))\n" #. type: unnumberedsubsec -#: doc/guix.texi:10331 +#: doc/guix.texi:10329 #, no-wrap msgid "System Services" msgstr "Systemdienste" #. type: cindex -#: doc/guix.texi:10333 doc/guix.texi:23823 doc/guix.texi:24841 +#: doc/guix.texi:10331 doc/guix.texi:23820 doc/guix.texi:24827 #, no-wrap msgid "services" msgstr "services" #. type: vindex -#: doc/guix.texi:10334 +#: doc/guix.texi:10332 #, no-wrap msgid "%base-services" msgstr "%base-services" #. type: Plain text -#: doc/guix.texi:10344 +#: doc/guix.texi:10342 msgid "The @code{services} field lists @dfn{system services} to be made available when the system starts (@pxref{Services}). The @code{operating-system} declaration above specifies that, in addition to the basic services, we want the OpenSSH secure shell daemon listening on port 2222 (@pxref{Networking Services, @code{openssh-service-type}}). Under the hood, @code{openssh-service-type} arranges so that @command{sshd} is started with the right command-line options, possibly with supporting configuration files generated as needed (@pxref{Defining Services})." msgstr "Das Feld @code{services} listet @dfn{Systemdienste} auf, die zur Verfügung stehen sollen, wenn das System startet (siehe @ref{Services}). Die @code{operating-system}-Deklaration oben legt fest, dass wir neben den grundlegenden Basis-Diensten auch wollen, dass der OpenSSH-Secure-Shell-Daemon auf Port 2222 lauscht (siehe @ref{Networking Services, @code{openssh-service-type}}). Intern sorgt der @code{openssh-service-type} dafür, dass @code{sshd} mit den richtigen Befehlszeilenoptionen aufgerufen wird, je nach Systemkonfiguration werden auch für dessen Betrieb nötige Konfigurationsdateien erstellt (siehe @ref{Defining Services})." #. type: cindex -#: doc/guix.texi:10345 +#: doc/guix.texi:10343 #, no-wrap msgid "customization, of services" msgstr "Anpassung, von Diensten" #. type: findex -#: doc/guix.texi:10346 +#: doc/guix.texi:10344 #, no-wrap msgid "modify-services" msgstr "modify-services" #. type: Plain text -#: doc/guix.texi:10350 +#: doc/guix.texi:10348 msgid "Occasionally, instead of using the base services as is, you will want to customize them. To do this, use @code{modify-services} (@pxref{Service Reference, @code{modify-services}}) to modify the list." msgstr "Gelegentlich werden Sie die Basis-Dienste nicht einfach so, wie sie sind, benutzen, sondern anpassen wollen. Benutzen Sie @code{modify-services} (siehe @ref{Service Reference, @code{modify-services}}), um die Liste der Basis-Dienste zu modifizieren." #. type: Plain text -#: doc/guix.texi:10355 +#: doc/guix.texi:10353 msgid "For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @var{%base-services} list (@pxref{Base Services, @code{%base-services}}). To do that, you can write the following in your operating system declaration:" msgstr "Wenn Sie zum Beispiel @code{guix-daemon} und Mingetty (das Programm, womit Sie sich auf der Konsole anmelden) in der @var{%base-services}-Liste modifizieren möchten (siehe @ref{Base Services, @code{%base-services}}), schreiben Sie das Folgende in Ihre Betriebssystemdeklaration:" #. type: lisp -#: doc/guix.texi:10368 +#: doc/guix.texi:10366 #, no-wrap msgid "" "(define %my-services\n" @@ -18606,7 +18617,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:10372 +#: doc/guix.texi:10370 #, no-wrap msgid "" "(operating-system\n" @@ -18618,49 +18629,49 @@ msgstr "" " (services %my-services))\n" #. type: Plain text -#: doc/guix.texi:10383 +#: doc/guix.texi:10381 msgid "This changes the configuration---i.e., the service parameters---of the @code{guix-service-type} instance, and that of all the @code{mingetty-service-type} instances in the @var{%base-services} list. Observe how this is accomplished: first, we arrange for the original configuration to be bound to the identifier @code{config} in the @var{body}, and then we write the @var{body} so that it evaluates to the desired configuration. In particular, notice how we use @code{inherit} to create a new configuration which has the same values as the old configuration, but with a few modifications." msgstr "Dadurch ändert sich die Konfiguration — d.h.@: die Dienst-Parameter — der @code{guix-service-type}-Instanz und die aller @code{mingetty-service-type}-Instanzen in der @var{%base-services}-Liste. Das funktioniert so: Zunächst arrangieren wir, dass die ursprüngliche Konfiguration an den Bezeichner @code{config} im @var{Rumpf} gebunden wird, dann schreiben wir den @var{Rumpf}, damit er zur gewünschten Konfiguration ausgewertet wird. Beachten Sie insbesondere, wie wir mit @code{inherit} eine neue Konfiguration erzeugen, die dieselben Werte wie die alte Konfiguration hat, aber mit ein paar Modifikationen." #. type: Plain text -#: doc/guix.texi:10390 +#: doc/guix.texi:10388 msgid "The configuration for a typical ``desktop'' usage, with an encrypted root partition, the X11 display server, GNOME and Xfce (users can choose which of these desktop environments to use at the log-in screen by pressing @kbd{F1}), network management, power management, and more, would look like this:" msgstr "Die Konfiguration für typische Nutzung auf Heim- und Arbeitsrechnern, mit einer verschlüsselten Partition für das Wurzeldateisystem, einem X11-Anzeigeserver, GNOME und Xfce (Benutzer können im Anmeldebildschirm auswählen, welche dieser Arbeitsumgebungen sie möchten, indem sie die Taste @kbd{F1} drücken), Netzwerkverwaltung, Verwaltungswerkzeugen für den Energieverbrauch, und Weiteres, würde so aussehen:" #. type: include -#: doc/guix.texi:10392 +#: doc/guix.texi:10390 #, no-wrap msgid "os-config-desktop.texi" msgstr "os-config-desktop.texi" #. type: Plain text -#: doc/guix.texi:10397 +#: doc/guix.texi:10395 msgid "A graphical system with a choice of lightweight window managers instead of full-blown desktop environments would look like this:" msgstr "Ein grafisches System mit einer Auswahl an leichtgewichtigen Fenster-Managern statt voll ausgestatteten Arbeitsumgebungen würde so aussehen:" #. type: include -#: doc/guix.texi:10399 +#: doc/guix.texi:10397 #, no-wrap msgid "os-config-lightweight-desktop.texi" msgstr "os-config-lightweight-desktop.texi" #. type: Plain text -#: doc/guix.texi:10405 +#: doc/guix.texi:10403 msgid "This example refers to the @file{/boot/efi} file system by its UUID, @code{1234-ABCD}. Replace this UUID with the right UUID on your system, as returned by the @command{blkid} command." msgstr "Dieses Beispiel bezieht sich auf das Dateisystem hinter @file{/boot/efi} über dessen UUID, @code{1234-ABCD}. Schreiben Sie statt dieser UUID die richtige UUID für Ihr System, wie sie der Befehl @command{blkid} liefert." #. type: Plain text -#: doc/guix.texi:10409 +#: doc/guix.texi:10407 msgid "@xref{Desktop Services}, for the exact list of services provided by @var{%desktop-services}. @xref{X.509 Certificates}, for background information about the @code{nss-certs} package that is used here." msgstr "Im Abschnitt @ref{Desktop Services} finden Sie eine genaue Liste der unter @var{%desktop-services} angebotenen Dienste. Der Abschnitt @ref{X.509 Certificates} hat Hintergrundinformationen über das @code{nss-certs}-Paket, das hier benutzt wird." #. type: Plain text -#: doc/guix.texi:10416 +#: doc/guix.texi:10414 msgid "Again, @var{%desktop-services} is just a list of service objects. If you want to remove services from there, you can do so using the procedures for list filtering (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}). For instance, the following expression returns a list that contains all the services in @var{%desktop-services} minus the Avahi service:" msgstr "Beachten Sie, dass @var{%desktop-services} nur eine Liste von die Dienste repräsentierenden service-Objekten ist. Wenn Sie Dienste daraus entfernen möchten, können Sie dazu die Prozeduren zum Filtern von Listen benutzen (siehe @ref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}). Beispielsweise liefert der folgende Ausdruck eine Liste mit allen Diensten von @var{%desktop-services} außer dem Avahi-Dienst." #. type: example -#: doc/guix.texi:10421 +#: doc/guix.texi:10419 #, no-wrap msgid "" "(remove (lambda (service)\n" @@ -18672,320 +18683,320 @@ msgstr "" " %desktop-services)\n" #. type: unnumberedsubsec -#: doc/guix.texi:10423 +#: doc/guix.texi:10421 #, no-wrap msgid "Instantiating the System" msgstr "Das System instanziieren" #. type: Plain text -#: doc/guix.texi:10430 +#: doc/guix.texi:10428 msgid "Assuming the @code{operating-system} declaration is stored in the @file{my-system-config.scm} file, the @command{guix system reconfigure my-system-config.scm} command instantiates that configuration, and makes it the default GRUB boot entry (@pxref{Invoking guix system})." msgstr "Angenommen, Sie haben die @code{operating-system}-Deklaration in einer Datei @file{my-system-config.scm} gespeichert, dann instanziiert der Befehl @command{guix system reconfigure my-system-config.scm} diese Konfiguration und macht sie zum voreingestellten GRUB-Boot-Eintrag (siehe @ref{Invoking guix system})." #. type: Plain text -#: doc/guix.texi:10438 +#: doc/guix.texi:10436 msgid "The normal way to change the system configuration is by updating this file and re-running @command{guix system reconfigure}. One should never have to touch files in @file{/etc} or to run commands that modify the system state such as @command{useradd} or @command{grub-install}. In fact, you must avoid that since that would not only void your warranty but also prevent you from rolling back to previous versions of your system, should you ever need to." msgstr "Der normale Weg, die Systemkonfiguration nachträglich zu ändern, ist, die Datei zu aktualisieren und @command{guix system reconfigure} erneut auszuführen. Man sollte nie die Dateien in @file{/etc} bearbeiten oder den Systemzustand mit Befehlen wie @command{useradd} oder @command{grub-install} verändern. Tatsächlich müssen Sie das ausdrücklich vermeiden, sonst verfällt nicht nur Ihre Garantie, sondern Sie können Ihr System auch nicht mehr auf eine alte Version des Systems zurücksetzen, falls das jemals notwendig wird." #. type: cindex -#: doc/guix.texi:10439 +#: doc/guix.texi:10437 #, no-wrap msgid "roll-back, of the operating system" msgstr "Zurücksetzen, des Betriebssystems" #. type: Plain text -#: doc/guix.texi:10449 +#: doc/guix.texi:10447 msgid "Speaking of roll-back, each time you run @command{guix system reconfigure}, a new @dfn{generation} of the system is created---without modifying or deleting previous generations. Old system generations get an entry in the bootloader boot menu, allowing you to boot them in case something went wrong with the latest generation. Reassuring, no? The @command{guix system list-generations} command lists the system generations available on disk. It is also possible to roll back the system via the commands @command{guix system roll-back} and @command{guix system switch-generation}." msgstr "Zurücksetzen bezieht sich hierbei darauf, dass jedes Mal, wenn Sie @command{guix system reconfigure} ausführen, eine neue @dfn{Generation} des Systems erzeugt wird — ohne vorherige Generationen zu verändern. Alte Systemgenerationen bekommen einen Eintrag im Boot-Menü des Bootloaders, womit Sie alte Generationen beim Starten des Rechners auswählen können, wenn mit der neuesten Generation etwas nicht stimmt. Eine beruhigende Vorstellung, oder? Der Befehl @command{guix system list-generations} führt die auf der Platte verfügbaren Systemgenerationen auf. Es ist auch möglich, das System mit den Befehlen @command{guix system roll-back} und @command{guix system switch-generation} zurückzusetzen." #. type: Plain text -#: doc/guix.texi:10455 +#: doc/guix.texi:10453 msgid "Although the @command{guix system reconfigure} command will not modify previous generations, you must take care when the current generation is not the latest (e.g., after invoking @command{guix system roll-back}), since the operation might overwrite a later generation (@pxref{Invoking guix system})." msgstr "Obwohl der Befehl @command{guix system reconfigure} vorherige Generationen nicht verändern wird, müssen Sie Acht geben, dass wenn die momentan aktuelle Generation nicht die neueste ist (z.B.@: nach einem Aufruf von @command{guix system roll-back}), weil @command{guix system reconfigure} alle neueren Generationen überschreibt (siehe @ref{Invoking guix system})." #. type: unnumberedsubsec -#: doc/guix.texi:10456 +#: doc/guix.texi:10454 #, no-wrap msgid "The Programming Interface" msgstr "Die Programmierschnittstelle" #. type: Plain text -#: doc/guix.texi:10461 +#: doc/guix.texi:10459 msgid "At the Scheme level, the bulk of an @code{operating-system} declaration is instantiated with the following monadic procedure (@pxref{The Store Monad}):" msgstr "Auf der Ebene von Scheme wird der Großteil der @code{operating-system}-Deklaration mit der folgenden monadischen Prozedur instanziiert (siehe @ref{The Store Monad}):" #. type: deffn -#: doc/guix.texi:10462 +#: doc/guix.texi:10460 #, no-wrap msgid "{Monadic Procedure} operating-system-derivation os" msgstr "{Monadische Prozedur} operating-system-derivation os" #. type: deffn -#: doc/guix.texi:10465 +#: doc/guix.texi:10463 msgid "Return a derivation that builds @var{os}, an @code{operating-system} object (@pxref{Derivations})." msgstr "Liefert eine Ableitung, mit der ein @code{operating-system}-Objekt @var{os} erstellt wird (siehe @ref{Derivations})." #. type: deffn -#: doc/guix.texi:10469 +#: doc/guix.texi:10467 msgid "The output of the derivation is a single directory that refers to all the packages, configuration files, and other supporting files needed to instantiate @var{os}." msgstr "Die Ausgabe der Ableitung ist ein einzelnes Verzeichnis mit Verweisen auf alle Pakete, Konfigurationsdateien und andere unterstützenden Dateien, die nötig sind, um @var{os} zu instanziieren." #. type: Plain text -#: doc/guix.texi:10474 +#: doc/guix.texi:10472 msgid "This procedure is provided by the @code{(gnu system)} module. Along with @code{(gnu services)} (@pxref{Services}), this module contains the guts of Guix System. Make sure to visit it!" msgstr "Diese Prozedur wird vom Modul @code{(gnu system)} angeboten. Zusammen mit @code{(gnu services)} (siehe @ref{Services}) deckt dieses Modul den Kern von „Guix System“ ab. Schauen Sie es sich mal an!" #. type: section -#: doc/guix.texi:10477 +#: doc/guix.texi:10475 #, no-wrap msgid "@code{operating-system} Reference" msgstr "@code{operating-system}-Referenz" #. type: Plain text -#: doc/guix.texi:10482 +#: doc/guix.texi:10480 msgid "This section summarizes all the options available in @code{operating-system} declarations (@pxref{Using the Configuration System})." msgstr "Dieser Abschnitt fasst alle Optionen zusammen, die für @code{operating-system}-Deklarationen zur Verfügung stehen (siehe @ref{Using the Configuration System})." #. type: deftp -#: doc/guix.texi:10483 +#: doc/guix.texi:10481 #, no-wrap msgid "{Data Type} operating-system" msgstr "{Datentyp} operating-system" #. type: deftp -#: doc/guix.texi:10487 +#: doc/guix.texi:10485 msgid "This is the data type representing an operating system configuration. By that, we mean all the global system configuration, not per-user configuration (@pxref{Using the Configuration System})." msgstr "Der die Betriebssystemkonfiguration repräsentierende Datentyp. Damit meinen wir die globale Konfiguration des Systems und nicht die, die sich nur auf einzelne Nutzer bezieht (siehe @ref{Using the Configuration System})." #. type: item -#: doc/guix.texi:10489 +#: doc/guix.texi:10487 #, no-wrap msgid "@code{kernel} (default: @var{linux-libre})" msgstr "@code{kernel} (Vorgabe: @var{linux-libre})" #. type: table -#: doc/guix.texi:10493 +#: doc/guix.texi:10491 msgid "The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is supported. In the future, it will be possible to use the GNU@tie{}Hurd.}." msgstr "Das Paket für den zu nutzenden Betriebssystem-Kernel als „package“-Objekt@footnote{Derzeit wird nur der Kernel Linux-libre unterstützt. In der Zukunft wird man auch GNU@tie{}Hurd benutzen können.}." #. type: item -#: doc/guix.texi:10494 +#: doc/guix.texi:10492 #, no-wrap msgid "@code{kernel-arguments} (default: @code{'(\"quiet\")})" msgstr "@code{kernel-arguments} (Vorgabe: @code{'(\"quiet\")})" #. type: table -#: doc/guix.texi:10497 +#: doc/guix.texi:10495 msgid "List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{(\"console=ttyS0\")}." msgstr "Eine Liste aus Zeichenketten oder G-Ausdrücken, die für zusätzliche Argumente an den Kernel stehen, die ihm auf seiner Befehlszeile übergeben werden — wie z.B.@: @code{(\"console=ttyS0\")}." #. type: code{#1} -#: doc/guix.texi:10498 doc/guix.texi:24034 doc/guix.texi:24053 +#: doc/guix.texi:10496 doc/guix.texi:24031 doc/guix.texi:24050 #, no-wrap msgid "bootloader" msgstr "bootloader" #. type: table -#: doc/guix.texi:10500 +#: doc/guix.texi:10498 msgid "The system bootloader configuration object. @xref{Bootloader Configuration}." msgstr "Das Konfigurationsobjekt für den Bootloader, mit dem das System gestartet wird. Siehe @ref{Bootloader Configuration}." #. type: code{#1} -#: doc/guix.texi:10501 doc/guix.texi:24173 +#: doc/guix.texi:10499 doc/guix.texi:24170 #, no-wrap msgid "label" msgstr "label" #. type: table -#: doc/guix.texi:10504 +#: doc/guix.texi:10502 msgid "This is the label (a string) as it appears in the bootloader's menu entry. The default label includes the kernel name and version." msgstr "Diese Bezeichnung (eine Zeichenkette) wird für den Menüeintrag im Bootloader verwendet. Die Vorgabe ist eine Bezeichnung, die den Namen des Kernels und seine Version enthält." #. type: item -#: doc/guix.texi:10505 doc/guix.texi:13711 doc/guix.texi:24103 +#: doc/guix.texi:10503 doc/guix.texi:13709 doc/guix.texi:24100 #, no-wrap msgid "@code{keyboard-layout} (default: @code{#f})" msgstr "@code{keyboard-layout} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10509 +#: doc/guix.texi:10507 msgid "This field specifies the keyboard layout to use in the console. It can be either @code{#f}, in which case the default keyboard layout is used (usually US English), or a @code{} record." msgstr "Dieses Feld gibt an, welche Tastaturbelegung auf der Konsole benutzt werden soll. Es kann entweder auf @code{#f} gesetzt sein, damit die voreingestellte Tastaturbelegung benutzt wird (in der Regel ist diese „US English“), oder ein @code{}-Verbundsobjekt sein." #. type: table -#: doc/guix.texi:10514 +#: doc/guix.texi:10512 msgid "This keyboard layout is in effect as soon as the kernel has booted. For instance, it is the keyboard layout in effect when you type a passphrase if your root file system is on a @code{luks-device-mapping} mapped device (@pxref{Mapped Devices})." msgstr "Diese Tastaturbelegung wird benutzt, sobald der Kernel gebootet wurde. Diese Tastaturbelegung wird zum Beispiel auch verwendet, wenn Sie eine Passphrase eintippen, falls sich Ihr Wurzeldateisystem auf einem mit @code{luks-device-mapping} zugeordneten Gerät befindet (siehe @ref{Mapped Devices})." #. type: quotation -#: doc/guix.texi:10521 +#: doc/guix.texi:10519 msgid "This does @emph{not} specify the keyboard layout used by the bootloader, nor that used by the graphical display server. @xref{Bootloader Configuration}, for information on how to specify the bootloader's keyboard layout. @xref{X Window}, for information on how to specify the keyboard layout used by the X Window System." msgstr "Damit wird @emph{nicht} angegeben, welche Tastaturbelegung der Bootloader benutzt, und auch nicht, welche der grafische Anzeigeserver verwendet. Siehe @ref{Bootloader Configuration} für Informationen darüber, wie Sie die Tastaturbelegung des Bootloaders angeben können. Siehe @ref{X Window} für Informationen darüber, wie Sie die Tastaturbelegung angeben können, die das X-Fenstersystem verwendet." #. type: item -#: doc/guix.texi:10523 +#: doc/guix.texi:10521 #, no-wrap msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})" msgstr "@code{initrd-modules} (Vorgabe: @code{%base-initrd-modules})" #. type: code{#1} -#: doc/guix.texi:10524 doc/guix.texi:23860 doc/guix.texi:23963 -#: doc/guix.texi:24198 +#: doc/guix.texi:10522 doc/guix.texi:23857 doc/guix.texi:23960 +#: doc/guix.texi:24195 #, no-wrap msgid "initrd" msgstr "initrd" #. type: cindex -#: doc/guix.texi:10525 doc/guix.texi:23861 doc/guix.texi:23964 +#: doc/guix.texi:10523 doc/guix.texi:23858 doc/guix.texi:23961 #, no-wrap msgid "initial RAM disk" msgstr "initiale RAM-Disk" #. type: table -#: doc/guix.texi:10528 +#: doc/guix.texi:10526 msgid "The list of Linux kernel modules that need to be available in the initial RAM disk. @xref{Initial RAM Disk}." msgstr "Die Liste der Linux-Kernel-Module, die in der initialen RAM-Disk zur Verfügung stehen sollen. Siehe @ref{Initial RAM Disk}." #. type: item -#: doc/guix.texi:10529 +#: doc/guix.texi:10527 #, no-wrap msgid "@code{initrd} (default: @code{base-initrd})" msgstr "@code{initrd} (Vorgabe: @code{base-initrd})" #. type: table -#: doc/guix.texi:10533 +#: doc/guix.texi:10531 msgid "A procedure that returns an initial RAM disk for the Linux kernel. This field is provided to support low-level customization and should rarely be needed for casual use. @xref{Initial RAM Disk}." msgstr "Eine Prozedur, die eine initiale RAM-Disk für den Linux-Kernel liefert. Dieses Feld gibt es, damit auch sehr systemnahe Anpassungen vorgenommen werden können, aber für die normale Nutzung sollte man es kaum brauchen. Siehe @ref{Initial RAM Disk}." #. type: item -#: doc/guix.texi:10534 +#: doc/guix.texi:10532 #, no-wrap msgid "@code{firmware} (default: @var{%base-firmware})" msgstr "@code{firmware} (Vorgabe: @var{%base-firmware})" #. type: cindex -#: doc/guix.texi:10535 +#: doc/guix.texi:10533 #, no-wrap msgid "firmware" msgstr "Firmware" #. type: table -#: doc/guix.texi:10537 +#: doc/guix.texi:10535 msgid "List of firmware packages loadable by the operating system kernel." msgstr "Eine Liste der Firmware-Pakete, die vom Betriebssystem-Kernel geladen werden können." #. type: table -#: doc/guix.texi:10542 +#: doc/guix.texi:10540 msgid "The default includes firmware needed for Atheros- and Broadcom-based WiFi devices (Linux-libre modules @code{ath9k} and @code{b43-open}, respectively). @xref{Hardware Considerations}, for more info on supported hardware." msgstr "Vorgegeben ist, dass für Atheros- und Broadcom-basierte WLAN-Geräte nötige Firmware geladen werden kann (genauer jeweils die Linux-libre-Module @code{ath9k} und @code{b43-open}). Siehe den Abschnitt @ref{Hardware Considerations} für mehr Informationen zu unterstützter Hardware." #. type: code{#1} -#: doc/guix.texi:10543 +#: doc/guix.texi:10541 #, no-wrap msgid "host-name" msgstr "host-name" #. type: table -#: doc/guix.texi:10545 +#: doc/guix.texi:10543 msgid "The host name." msgstr "Der Hostname" #. type: code{#1} -#: doc/guix.texi:10546 +#: doc/guix.texi:10544 #, no-wrap msgid "hosts-file" msgstr "hosts-file" #. type: cindex -#: doc/guix.texi:10547 +#: doc/guix.texi:10545 #, no-wrap msgid "hosts file" msgstr "hosts-Datei" #. type: table -#: doc/guix.texi:10552 +#: doc/guix.texi:10550 msgid "A file-like object (@pxref{G-Expressions, file-like objects}) for use as @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). The default is a file with entries for @code{localhost} and @var{host-name}." msgstr "Ein dateiartiges Objekt (siehe @ref{G-Expressions, file-like objects}), das für @file{/etc/hosts} benutzt werden soll (siehe @ref{Host Names,,, libc, The GNU C Library Reference Manual}). Der Vorgabewert ist eine Datei mit Einträgen für @code{localhost} und @var{host-name}." #. type: item -#: doc/guix.texi:10553 +#: doc/guix.texi:10551 #, no-wrap msgid "@code{mapped-devices} (default: @code{'()})" msgstr "@code{mapped-devices} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:10555 +#: doc/guix.texi:10553 msgid "A list of mapped devices. @xref{Mapped Devices}." msgstr "Eine Liste zugeordneter Geräte („mapped devices“). Siehe @ref{Mapped Devices}." #. type: code{#1} -#: doc/guix.texi:10556 +#: doc/guix.texi:10554 #, no-wrap msgid "file-systems" msgstr "file-systems" #. type: table -#: doc/guix.texi:10558 +#: doc/guix.texi:10556 msgid "A list of file systems. @xref{File Systems}." msgstr "Eine Liste von Dateisystemen. Siehe @ref{File Systems}." #. type: item -#: doc/guix.texi:10559 +#: doc/guix.texi:10557 #, no-wrap msgid "@code{swap-devices} (default: @code{'()})" msgstr "@code{swap-devices} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:10560 +#: doc/guix.texi:10558 #, no-wrap msgid "swap devices" msgstr "Swap-Geräte" #. type: table -#: doc/guix.texi:10567 +#: doc/guix.texi:10565 msgid "A list of strings identifying devices or files to be used for ``swap space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}). For example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}. It is possible to specify a swap file in a file system on a mapped device, provided that the necessary device mapping and file system are also specified. @xref{Mapped Devices} and @ref{File Systems}." msgstr "Eine Liste von Zeichenketten, die Geräte identifizieren oder als „Swap-Speicher“ genutzte Dateien identifizieren (siehe @ref{Memory Concepts,,, libc, The GNU C Library Reference Manual}). Beispiele wären etwa @code{'(\"/dev/sda3\")} oder @code{'(\"/swapdatei\")}. Es ist möglich, eine Swap-Datei auf dem Dateisystem eines zugeordneten Geräts anzugeben, sofern auch die Gerätezuordnung und das Dateisystem mit angegeben werden. Siehe @ref{Mapped Devices} und @ref{File Systems}." #. type: item -#: doc/guix.texi:10568 +#: doc/guix.texi:10566 #, no-wrap msgid "@code{users} (default: @code{%base-user-accounts})" msgstr "@code{users} (Vorgabe: @code{%base-user-accounts})" #. type: itemx -#: doc/guix.texi:10569 +#: doc/guix.texi:10567 #, no-wrap msgid "@code{groups} (default: @var{%base-groups})" msgstr "@code{groups} (Vorgabe: @var{%base-groups})" #. type: table -#: doc/guix.texi:10571 +#: doc/guix.texi:10569 msgid "List of user accounts and groups. @xref{User Accounts}." msgstr "Liste der Benutzerkonten und Benutzergruppen. Siehe @ref{User Accounts}." #. type: table -#: doc/guix.texi:10574 +#: doc/guix.texi:10572 msgid "If the @code{users} list lacks a user account with UID@tie{}0, a ``root'' account with UID@tie{}0 is automatically added." msgstr "Wenn in der @code{users}-Liste kein Benutzerkonto mit der UID-Kennung@tie{}0 aufgeführt wird, wird automatisch für den Administrator ein „root“-Benutzerkonto mit UID-Kennung@tie{}0 hinzugefügt." #. type: item -#: doc/guix.texi:10575 +#: doc/guix.texi:10573 #, no-wrap msgid "@code{skeletons} (default: @code{(default-skeletons)})" msgstr "@code{skeletons} (Vorgabe: @code{(default-skeletons)})" #. type: table -#: doc/guix.texi:10579 +#: doc/guix.texi:10577 msgid "A list target file name/file-like object tuples (@pxref{G-Expressions, file-like objects}). These are the skeleton files that will be added to the home directory of newly-created user accounts." msgstr "Eine Liste von Tupeln aus je einem Ziel-Dateinamen und einem dateiähnlichen Objekt (siehe @ref{G-Expressions, file-like objects}). Diese Objekte werden als Skeleton-Dateien im Persönlichen Verzeichnis („Home“-Verzeichnis) jedes neuen Benutzerkontos angelegt." #. type: table -#: doc/guix.texi:10581 +#: doc/guix.texi:10579 msgid "For instance, a valid value may look like this:" msgstr "Ein gültiger Wert könnte zum Beispiel so aussehen:" #. type: example -#: doc/guix.texi:10587 +#: doc/guix.texi:10585 #, no-wrap msgid "" "`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n" @@ -18999,194 +19010,194 @@ msgstr "" " (activate-readline)\")))\n" #. type: item -#: doc/guix.texi:10589 +#: doc/guix.texi:10587 #, no-wrap msgid "@code{issue} (default: @var{%default-issue})" msgstr "@code{issue} (Vorgabe: @var{%default-issue})" #. type: table -#: doc/guix.texi:10592 +#: doc/guix.texi:10590 msgid "A string denoting the contents of the @file{/etc/issue} file, which is displayed when users log in on a text console." msgstr "Eine Zeichenkette, die als Inhalt der Datei @file{/etc/issue} verwendet werden soll, der jedes Mal angezeigt wird, wenn sich ein Nutzer auf einer Textkonsole anmeldet." #. type: item -#: doc/guix.texi:10593 +#: doc/guix.texi:10591 #, no-wrap msgid "@code{packages} (default: @var{%base-packages})" msgstr "@code{packages} (Vorgabe: @var{%base-packages})" #. type: table -#: doc/guix.texi:10596 +#: doc/guix.texi:10594 msgid "The set of packages installed in the global profile, which is accessible at @file{/run/current-system/profile}." msgstr "Die Menge der Pakete, die ins globale Profil installiert werden sollen, welches unter @file{/run/current-system/profile} zu finden ist." #. type: table -#: doc/guix.texi:10600 +#: doc/guix.texi:10598 msgid "The default set includes core utilities and it is good practice to install non-core utilities in user profiles (@pxref{Invoking guix package})." msgstr "Die vorgegebene Paketmenge umfasst zum Kern des Systems gehörende Werkzeuge („core utilities“). Es ist empfehlenswert, nicht zum Kern gehörende Werkzeuge („non-core“) stattdessen in Nutzerprofile zu installieren (siehe @ref{Invoking guix package})." #. type: code{#1} -#: doc/guix.texi:10601 +#: doc/guix.texi:10599 #, no-wrap msgid "timezone" msgstr "timezone" #. type: table -#: doc/guix.texi:10603 +#: doc/guix.texi:10601 msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}." msgstr "Eine Zeichenkette, die die Zeitzone bezeichnet, wie z.B.@: @code{\"Europe/Berlin\"}." #. type: table -#: doc/guix.texi:10607 +#: doc/guix.texi:10605 msgid "You can run the @command{tzselect} command to find out which timezone string corresponds to your region. Choosing an invalid timezone name causes @command{guix system} to fail." msgstr "Mit dem Befehl @command{tzselect} können Sie herausfinden, welche Zeichenkette der Zeitzone Ihrer Region entspricht. Wenn Sie eine ungültige Zeichenkette angeben, schlägt @command{guix system} fehl." #. type: item -#: doc/guix.texi:10608 +#: doc/guix.texi:10606 #, no-wrap msgid "@code{locale} (default: @code{\"en_US.utf8\"})" msgstr "@code{locale} (Vorgabe: @code{\"en_US.utf8\"})" #. type: table -#: doc/guix.texi:10611 +#: doc/guix.texi:10609 msgid "The name of the default locale (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}). @xref{Locales}, for more information." msgstr "Der Name der als Voreinstellung zu verwendenden Locale (siehe @ref{Locale Names,,, libc, The GNU C Library Reference Manual}). Siehe @ref{Locales} für weitere Informationen." #. type: item -#: doc/guix.texi:10612 +#: doc/guix.texi:10610 #, no-wrap msgid "@code{locale-definitions} (default: @var{%default-locale-definitions})" msgstr "@code{locale-definitions} (Vorgabe: @var{%default-locale-definitions})" #. type: table -#: doc/guix.texi:10615 +#: doc/guix.texi:10613 msgid "The list of locale definitions to be compiled and that may be used at run time. @xref{Locales}." msgstr "Die Liste der Locale-Definitionen, die kompiliert werden sollen und dann im laufenden System benutzt werden können. Siehe @ref{Locales}." #. type: item -#: doc/guix.texi:10616 +#: doc/guix.texi:10614 #, no-wrap msgid "@code{locale-libcs} (default: @code{(list @var{glibc})})" msgstr "@code{locale-libcs} (Vorgabe: @code{(list @var{glibc})})" #. type: table -#: doc/guix.texi:10620 +#: doc/guix.texi:10618 msgid "The list of GNU@tie{}libc packages whose locale data and tools are used to build the locale definitions. @xref{Locales}, for compatibility considerations that justify this option." msgstr "Die Liste der GNU-libc-Pakete, deren Locale-Daten und -Werkzeuge zum Erzeugen der Locale-Definitionen verwendet werden sollen. Siehe @ref{Locales} für eine Erläuterung der Kompatibilitätsauswirkungen, deretwegen man diese Option benutzen wollen könnte." #. type: item -#: doc/guix.texi:10621 +#: doc/guix.texi:10619 #, no-wrap msgid "@code{name-service-switch} (default: @var{%default-nss})" msgstr "@code{name-service-switch} (Vorgabe: @var{%default-nss})" #. type: table -#: doc/guix.texi:10625 +#: doc/guix.texi:10623 msgid "Configuration of the libc name service switch (NSS)---a @code{} object. @xref{Name Service Switch}, for details." msgstr "Die Konfiguration des Name Service Switch (NSS) der libc — ein @code{}-Objekt. Siehe @ref{Name Service Switch} für Details." #. type: item -#: doc/guix.texi:10626 +#: doc/guix.texi:10624 #, no-wrap msgid "@code{services} (default: @var{%base-services})" msgstr "@code{services} (Vorgabe: @var{%base-services})" #. type: table -#: doc/guix.texi:10628 +#: doc/guix.texi:10626 msgid "A list of service objects denoting system services. @xref{Services}." msgstr "Eine Liste von „service“-Objekten, die die Systemdienste repräsentieren. Siehe @ref{Services}." #. type: cindex -#: doc/guix.texi:10629 +#: doc/guix.texi:10627 #, no-wrap msgid "essential services" msgstr "essenzielle Dienste" #. type: item -#: doc/guix.texi:10630 +#: doc/guix.texi:10628 #, no-wrap msgid "@code{essential-services} (default: ...)" msgstr "@code{essential-services} (Vorgabe: …)" #. type: table -#: doc/guix.texi:10635 +#: doc/guix.texi:10633 msgid "The list of ``essential services''---i.e., things like instances of @code{system-service-type} and @code{host-name-service-type} (@pxref{Service Reference}), which are derived from the operating system definition itself. As a user you should @emph{never} need to touch this field." msgstr "Die Liste „essenzieller Dienste“ — d.h.@: Dinge wie Instanzen von @code{system-service-type} und @code{host-name-service-type} (siehe @ref{Service Reference}), die aus der Betriebssystemdefinition an sich abgeleitet werden. Als normaler Benutzer sollten Sie dieses Feld @emph{niemals} ändern müssen." #. type: item -#: doc/guix.texi:10636 +#: doc/guix.texi:10634 #, no-wrap msgid "@code{pam-services} (default: @code{(base-pam-services)})" msgstr "@code{pam-services} (Vorgabe: @code{(base-pam-services)})" #. type: cindex -#: doc/guix.texi:10637 +#: doc/guix.texi:10635 #, no-wrap msgid "PAM" msgstr "PAM" #. type: cindex -#: doc/guix.texi:10638 +#: doc/guix.texi:10636 #, no-wrap msgid "pluggable authentication modules" msgstr "Pluggable Authentication Modules" #. type: table -#: doc/guix.texi:10641 +#: doc/guix.texi:10639 msgid "Linux @dfn{pluggable authentication module} (PAM) services." msgstr "Dienste für @dfn{Pluggable Authentication Modules} (PAM) von Linux." #. type: item -#: doc/guix.texi:10642 +#: doc/guix.texi:10640 #, no-wrap msgid "@code{setuid-programs} (default: @var{%setuid-programs})" msgstr "@code{setuid-programs} (Vorgabe: @var{%setuid-programs})" #. type: table -#: doc/guix.texi:10645 +#: doc/guix.texi:10643 msgid "List of string-valued G-expressions denoting setuid programs. @xref{Setuid Programs}." msgstr "Eine Liste von Zeichenketten liefernden G-Ausdrücken, die setuid-Programme bezeichnen. Siehe @ref{Setuid Programs}." #. type: item -#: doc/guix.texi:10646 +#: doc/guix.texi:10644 #, no-wrap msgid "@code{sudoers-file} (default: @var{%sudoers-specification})" msgstr "@code{sudoers-file} (Vorgabe: @var{%sudoers-specification})" #. type: cindex -#: doc/guix.texi:10647 +#: doc/guix.texi:10645 #, no-wrap msgid "sudoers file" msgstr "sudoers-Datei" #. type: table -#: doc/guix.texi:10650 +#: doc/guix.texi:10648 msgid "The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-Expressions, @code{local-file} and @code{plain-file}})." msgstr "Der Inhalt der Datei @file{/etc/sudoers} als ein dateiähnliches Objekt (siehe @ref{G-Expressions, @code{local-file} und @code{plain-file}})." #. type: table -#: doc/guix.texi:10655 +#: doc/guix.texi:10653 msgid "This file specifies which users can use the @command{sudo} command, what they are allowed to do, and what privileges they may gain. The default is that only @code{root} and members of the @code{wheel} group may use @code{sudo}." msgstr "Diese Datei gibt an, welche Nutzer den Befehl @command{sudo} benutzen dürfen, was sie damit tun und welche Berechtigungen sie so erhalten können. Die Vorgabe ist, dass nur der Administratornutzer @code{root} und Mitglieder der Benutzergruppe @code{wheel} den @code{sudo}-Befehl verwenden dürfen." #. type: deffn -#: doc/guix.texi:10658 +#: doc/guix.texi:10656 #, no-wrap msgid "{Scheme Syntax} this-operating-system" msgstr "{Scheme-Syntax} this-operating-system" #. type: deffn -#: doc/guix.texi:10661 +#: doc/guix.texi:10659 msgid "When used in the @emph{lexical scope} of an operating system field definition, this identifier resolves to the operating system being defined." msgstr "Wenn dies im @emph{lexikalischen Geltungsbereich} der Definition eines Feldes im Betriebssystem steht, bezieht sich dieser Bezeichner auf das Betriebssystem, das gerade definiert wird." #. type: deffn -#: doc/guix.texi:10664 +#: doc/guix.texi:10662 msgid "The example below shows how to refer to the operating system being defined in the definition of the @code{label} field:" msgstr "Das folgende Beispiel zeigt, wie man auf das Betriebssystem, das gerade definiert wird, verweist, während man die Definition des @code{label}-Felds schreibt:" #. type: example -#: doc/guix.texi:10667 doc/guix.texi:13332 +#: doc/guix.texi:10665 doc/guix.texi:13330 #, no-wrap msgid "" "(use-modules (gnu) (guix))\n" @@ -19196,7 +19207,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10672 +#: doc/guix.texi:10670 #, no-wrap msgid "" "(operating-system\n" @@ -19210,17 +19221,17 @@ msgstr "" " (operating-system-kernel this-operating-system))))\n" #. type: deffn -#: doc/guix.texi:10676 +#: doc/guix.texi:10674 msgid "It is an error to refer to @code{this-operating-system} outside an operating system definition." msgstr "Es ist ein Fehler, außerhalb einer Betriebssystemdefinition auf @code{this-operating-system} zu verweisen." #. type: Plain text -#: doc/guix.texi:10687 +#: doc/guix.texi:10685 msgid "The list of file systems to be mounted is specified in the @code{file-systems} field of the operating system declaration (@pxref{Using the Configuration System}). Each file system is declared using the @code{file-system} form, like this:" msgstr "Die Liste der Dateisysteme, die eingebunden werden sollen, steht im @code{file-systems}-Feld der Betriebssystemdeklaration (siehe @ref{Using the Configuration System}). Jedes Dateisystem wird mit der @code{file-system}-Form deklariert, etwa so:" #. type: example -#: doc/guix.texi:10693 +#: doc/guix.texi:10691 #, no-wrap msgid "" "(file-system\n" @@ -19234,67 +19245,67 @@ msgstr "" " (type \"ext4\"))\n" #. type: Plain text -#: doc/guix.texi:10697 +#: doc/guix.texi:10695 msgid "As usual, some of the fields are mandatory---those shown in the example above---while others can be omitted. These are described below." msgstr "Wie immer müssen manche Felder angegeben werden — die, die im Beispiel oben stehen —, während andere optional sind. Die Felder werden nun beschrieben." #. type: deftp -#: doc/guix.texi:10698 +#: doc/guix.texi:10696 #, no-wrap msgid "{Data Type} file-system" msgstr "{Datentyp} file-system" #. type: deftp -#: doc/guix.texi:10701 +#: doc/guix.texi:10699 msgid "Objects of this type represent file systems to be mounted. They contain the following members:" msgstr "Objekte dieses Typs repräsentieren einzubindende Dateisysteme. Sie weisen folgende Komponenten auf:" #. type: item -#: doc/guix.texi:10703 doc/guix.texi:10894 +#: doc/guix.texi:10701 doc/guix.texi:10892 #, no-wrap msgid "type" msgstr "type" #. type: table -#: doc/guix.texi:10706 +#: doc/guix.texi:10704 msgid "This is a string specifying the type of the file system---e.g., @code{\"ext4\"}." msgstr "Eine Zeichenkette, die den Typ des Dateisystems spezifiziert, z.B.@: @code{\"ext4\"}." #. type: code{#1} -#: doc/guix.texi:10707 +#: doc/guix.texi:10705 #, no-wrap msgid "mount-point" msgstr "mount-point" #. type: table -#: doc/guix.texi:10709 +#: doc/guix.texi:10707 msgid "This designates the place where the file system is to be mounted." msgstr "Der Einhängepunkt, d.h.@: der Pfad, an dem das Dateisystem eingebunden werden soll." #. type: code{#1} -#: doc/guix.texi:10710 +#: doc/guix.texi:10708 #, no-wrap msgid "device" msgstr "device" #. type: table -#: doc/guix.texi:10720 +#: doc/guix.texi:10718 msgid "This names the ``source'' of the file system. It can be one of three things: a file system label, a file system UUID, or the name of a @file{/dev} node. Labels and UUIDs offer a way to refer to file systems without having to hard-code their actual device name@footnote{Note that, while it is tempting to use @file{/dev/disk/by-uuid} and similar device names to achieve the same result, this is not recommended: These special device nodes are created by the udev daemon and may be unavailable at the time the device is mounted.}." msgstr "Hiermit wird die „Quelle“ des Dateisystems bezeichnet. Sie kann eines von drei Dingen sein: die Bezeichnung („Labels“) eines Dateisystems, die UUID-Kennung des Dateisystems oder der Name eines @file{/dev}-Knotens. Mit Bezeichnungen und UUIDs kann man Dateisysteme benennen, ohne den Gerätenamen festzuschreiben@footnote{Beachten Sie: Obwohl es verführerisch ist, mit @file{/dev/disk/by-uuid} und ähnlichen Gerätenamen dasselbe Resultat bekommen zu wollen, raten wir davon ab: Diese speziellen Gerätenamen werden erst vom udev-Daemon erzeugt und sind, wenn die Geräte eingebunden werden, vielleicht noch nicht verfügbar.}." #. type: findex -#: doc/guix.texi:10721 +#: doc/guix.texi:10719 #, no-wrap msgid "file-system-label" msgstr "file-system-label" #. type: table -#: doc/guix.texi:10726 +#: doc/guix.texi:10724 msgid "File system labels are created using the @code{file-system-label} procedure, UUIDs are created using @code{uuid}, and @file{/dev} node are plain strings. Here's an example of a file system referred to by its label, as shown by the @command{e2label} command:" msgstr "Dateisystem-Bezeichnungen („Labels“) werden mit der Prozedur @code{file-system-label} erzeugt und UUID-Kennungen werden mit @code{uuid} erzeugt, während Knoten in @file{/dev} mit ihrem Pfad als einfache Zeichenketten aufgeführt werden. Hier ist ein Beispiel, wie wir ein Dateisystem anhand seiner Bezeichnung aufführen, wie sie vom Befehl @command{e2label} angezeigt wird:" #. type: example -#: doc/guix.texi:10732 +#: doc/guix.texi:10730 #, no-wrap msgid "" "(file-system\n" @@ -19308,18 +19319,18 @@ msgstr "" " (device (file-system-label \"my-home\")))\n" #. type: findex -#: doc/guix.texi:10734 +#: doc/guix.texi:10732 #, no-wrap msgid "uuid" msgstr "uuid" #. type: table -#: doc/guix.texi:10742 +#: doc/guix.texi:10740 msgid "UUIDs are converted from their string representation (as shown by the @command{tune2fs -l} command) using the @code{uuid} form@footnote{The @code{uuid} form expects 16-byte UUIDs as defined in @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}. This is the form of UUID used by the ext2 family of file systems and others, but it is different from ``UUIDs'' found in FAT file systems, for instance.}, like this:" msgstr "UUID-Kennungen werden mit der @code{uuid}-Form von ihrer Darstellung als Zeichenkette (wie sie vom Befehl @command{tune2fs -l} angezeigt wird) konvertiert@footnote{Die @code{uuid}-Form nimmt 16-Byte-UUIDs entgegen, wie sie in @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122} definiert sind. Diese Form der UUID wird unter anderem von der ext2-Familie von Dateisystemen verwendet, sie unterscheidet sich jedoch zum Beispiel von den „UUID“ genannten Kennungen, wie man sie bei FAT-Dateisystemen findet.} wie hier:" #. type: example -#: doc/guix.texi:10748 +#: doc/guix.texi:10746 #, no-wrap msgid "" "(file-system\n" @@ -19333,268 +19344,268 @@ msgstr "" " (device (uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\")))\n" #. type: table -#: doc/guix.texi:10756 +#: doc/guix.texi:10754 msgid "When the source of a file system is a mapped device (@pxref{Mapped Devices}), its @code{device} field @emph{must} refer to the mapped device name---e.g., @file{\"/dev/mapper/root-partition\"}. This is required so that the system knows that mounting the file system depends on having the corresponding device mapping established." msgstr "Wenn die Quelle eines Dateisystems ein zugeordnetes Gerät (siehe @ref{Mapped Devices}) ist, @emph{muss} sich das @code{device}-Feld auf den zugeordneten Gerätenamen beziehen — z.B.@: @file{\"/dev/mapper/root-partition\"}. Das ist nötig, damit das System weiß, dass das Einbinden des Dateisystems davon abhängt, die entsprechende Gerätezuordnung hergestellt zu haben." #. type: item -#: doc/guix.texi:10757 +#: doc/guix.texi:10755 #, no-wrap msgid "@code{flags} (default: @code{'()})" msgstr "@code{flags} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:10764 +#: doc/guix.texi:10762 msgid "This is a list of symbols denoting mount flags. Recognized flags include @code{read-only}, @code{bind-mount}, @code{no-dev} (disallow access to special files), @code{no-suid} (ignore setuid and setgid bits), @code{no-atime} (do not update file access times), and @code{no-exec} (disallow program execution). @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for more information on these flags." msgstr "Eine Liste von Symbolen, die Einbinde-Flags („mount flags“) bezeichnen. Erkannt werden unter anderem @code{read-only}, @code{bind-mount}, @code{no-dev} (Zugang zu besonderen Dateien verweigern), @code{no-suid} (setuid- und setgid-Bits ignorieren), @code{no-atime} (Dateizugriffs-Zeitstempel nicht aktualisieren) und @code{no-exec} (Programmausführungen verweigern). Siehe @ref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual} für mehr Informationen zu diesen Einbinde-Optionen." #. type: item -#: doc/guix.texi:10765 +#: doc/guix.texi:10763 #, no-wrap msgid "@code{options} (default: @code{#f})" msgstr "@code{options} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10770 +#: doc/guix.texi:10768 msgid "This is either @code{#f}, or a string denoting mount options passed to the file system driver. @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for details and run @command{man 8 mount} for options for various file systems." msgstr "Entweder @code{#f} oder eine Zeichenkette mit Einbinde-Optionen („mount options“), die an den Dateisystemtreiber übergeben werden. Siehe @ref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual} für Details; führen Sie @command{man 8 mount} aus, um die Einbinde-Optionen verschiedener Dateisysteme zu sehen." #. type: item -#: doc/guix.texi:10771 +#: doc/guix.texi:10769 #, no-wrap msgid "@code{mount?} (default: @code{#t})" msgstr "@code{mount?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:10776 +#: doc/guix.texi:10774 msgid "This value indicates whether to automatically mount the file system when the system is brought up. When set to @code{#f}, the file system gets an entry in @file{/etc/fstab} (read by the @command{mount} command) but is not automatically mounted." msgstr "Dieser Wert zeigt an, ob das Dateisystem automatisch eingebunden werden soll, wenn das System gestartet wird. Ist der Wert @code{#f}, dann erhält das Dateisystem nur einen Eintrag in der Datei @file{/etc/fstab} (welche vom @command{mount}-Befehl zum Einbinden gelesen wird), es wird aber nicht automatisch eingebunden." #. type: item -#: doc/guix.texi:10777 +#: doc/guix.texi:10775 #, no-wrap msgid "@code{needed-for-boot?} (default: @code{#f})" msgstr "@code{needed-for-boot?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10782 +#: doc/guix.texi:10780 msgid "This Boolean value indicates whether the file system is needed when booting. If that is true, then the file system is mounted when the initial RAM disk (initrd) is loaded. This is always the case, for instance, for the root file system." msgstr "Dieser boolesche Wert gibt an, ob das Dateisystem zum Hochfahren des Systems notwendig ist. In diesem Fall wird das Dateisystem eingebunden, wenn die initiale RAM-Disk (initrd) geladen wird. Für zum Beispiel das Wurzeldateisystem ist dies ohnehin immer der Fall." #. type: item -#: doc/guix.texi:10783 +#: doc/guix.texi:10781 #, no-wrap msgid "@code{check?} (default: @code{#t})" msgstr "@code{check?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:10786 +#: doc/guix.texi:10784 msgid "This Boolean indicates whether the file system needs to be checked for errors before being mounted." msgstr "Dieser boolesche Wert sagt aus, ob das Dateisystem vor dem Einbinden auf Fehler hin geprüft werden soll." #. type: item -#: doc/guix.texi:10787 +#: doc/guix.texi:10785 #, no-wrap msgid "@code{create-mount-point?} (default: @code{#f})" msgstr "@code{create-mount-point?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10789 +#: doc/guix.texi:10787 msgid "When true, the mount point is created if it does not exist yet." msgstr "Steht dies auf wahr, wird der Einhängepunkt vor dem Einbinden erstellt, wenn er noch nicht existiert." #. type: item -#: doc/guix.texi:10790 +#: doc/guix.texi:10788 #, no-wrap msgid "@code{dependencies} (default: @code{'()})" msgstr "@code{dependencies} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:10794 +#: doc/guix.texi:10792 msgid "This is a list of @code{} or @code{} objects representing file systems that must be mounted or mapped devices that must be opened before (and unmounted or closed after) this one." msgstr "Dies ist eine Liste von @code{}- oder @code{}-Objekten, die Dateisysteme repräsentieren, die vor diesem Dateisystem eingebunden oder zugeordnet werden müssen (und nach diesem ausgehängt oder geschlossen werden müssen)." #. type: table -#: doc/guix.texi:10798 +#: doc/guix.texi:10796 msgid "As an example, consider a hierarchy of mounts: @file{/sys/fs/cgroup} is a dependency of @file{/sys/fs/cgroup/cpu} and @file{/sys/fs/cgroup/memory}." msgstr "Betrachten Sie zum Beispiel eine Hierarchie von Einbindungen: @file{/sys/fs/cgroup} ist eine Abhängigkeit von @file{/sys/fs/cgroup/cpu} und @file{/sys/fs/cgroup/memory}." #. type: table -#: doc/guix.texi:10801 +#: doc/guix.texi:10799 msgid "Another example is a file system that depends on a mapped device, for example for an encrypted partition (@pxref{Mapped Devices})." msgstr "Ein weiteres Beispiel ist ein Dateisystem, was von einem zugeordneten Gerät abhängt, zum Beispiel zur Verschlüsselung einer Partition (siehe @ref{Mapped Devices})." #. type: Plain text -#: doc/guix.texi:10806 +#: doc/guix.texi:10804 msgid "The @code{(gnu system file-systems)} exports the following useful variables." msgstr "Das Modul @code{(gnu system file-systems)} exportiert die folgenden nützlichen Variablen." #. type: defvr -#: doc/guix.texi:10807 +#: doc/guix.texi:10805 #, no-wrap msgid "{Scheme Variable} %base-file-systems" msgstr "{Scheme-Variable} %base-file-systems" #. type: defvr -#: doc/guix.texi:10812 +#: doc/guix.texi:10810 msgid "These are essential file systems that are required on normal systems, such as @var{%pseudo-terminal-file-system} and @var{%immutable-store} (see below.) Operating system declarations should always contain at least these." msgstr "Hiermit werden essenzielle Dateisysteme bezeichnet, die für normale Systeme unverzichtbar sind, wie zum Beispiel @var{%pseudo-terminal-file-system} und @var{%immutable-store} (siehe unten). Betriebssystemdeklaration sollten auf jeden Fall mindestens diese enthalten." #. type: defvr -#: doc/guix.texi:10814 +#: doc/guix.texi:10812 #, no-wrap msgid "{Scheme Variable} %pseudo-terminal-file-system" msgstr "{Scheme-Variable} %pseudo-terminal-file-system" #. type: defvr -#: doc/guix.texi:10820 +#: doc/guix.texi:10818 msgid "This is the file system to be mounted as @file{/dev/pts}. It supports @dfn{pseudo-terminals} created @i{via} @code{openpty} and similar functions (@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}). Pseudo-terminals are used by terminal emulators such as @command{xterm}." msgstr "Das als @file{/dev/pts} einzubindende Dateisystem. Es unterstützt über @code{openpty} und ähnliche Funktionen erstellte @dfn{Pseudo-Terminals} (siehe @ref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}). Pseudo-Terminals werden von Terminal-Emulatoren wie @command{xterm} benutzt." #. type: defvr -#: doc/guix.texi:10822 +#: doc/guix.texi:10820 #, no-wrap msgid "{Scheme Variable} %shared-memory-file-system" msgstr "{Scheme-Variable} %shared-memory-file-system" #. type: defvr -#: doc/guix.texi:10826 +#: doc/guix.texi:10824 msgid "This file system is mounted as @file{/dev/shm} and is used to support memory sharing across processes (@pxref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})." msgstr "Dieses Dateisystem wird als @file{/dev/shm} eingebunden, um Speicher zwischen Prozessen teilen zu können (siehe @ref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})." #. type: defvr -#: doc/guix.texi:10828 +#: doc/guix.texi:10826 #, no-wrap msgid "{Scheme Variable} %immutable-store" msgstr "{Scheme-Variable} %immutable-store" #. type: defvr -#: doc/guix.texi:10833 +#: doc/guix.texi:10831 msgid "This file system performs a read-only ``bind mount'' of @file{/gnu/store}, making it read-only for all the users including @code{root}. This prevents against accidental modification by software running as @code{root} or by system administrators." msgstr "Dieses Dateisystem vollzieht einen „bind mount“ des @file{/gnu/store}, um ihn für alle Nutzer einschließlich des Administratornutzers @code{root} nur lesbar zu machen, d.h.@: Schreibrechte zu entziehen. Dadurch kann als @code{root} ausgeführte Software, oder der Systemadministrator, nicht aus Versehen den Store modifizieren." #. type: defvr -#: doc/guix.texi:10836 +#: doc/guix.texi:10834 msgid "The daemon itself is still able to write to the store: it remounts it read-write in its own ``name space.''" msgstr "Der Daemon kann weiterhin in den Store schreiben, indem er ihn selbst mit Schreibrechten in seinem eigenen „Namensraum“ einbindet." #. type: defvr -#: doc/guix.texi:10838 +#: doc/guix.texi:10836 #, no-wrap msgid "{Scheme Variable} %binary-format-file-system" msgstr "{Scheme-Variable} %binary-format-file-system" #. type: defvr -#: doc/guix.texi:10842 +#: doc/guix.texi:10840 msgid "The @code{binfmt_misc} file system, which allows handling of arbitrary executable file types to be delegated to user space. This requires the @code{binfmt.ko} kernel module to be loaded." msgstr "Das @code{binfmt_misc}-Dateisystem, durch das beliebige Dateitypen als ausführbare Dateien auf der Anwendungsebene (dem User Space) zugänglich gemacht werden können. Es setzt voraus, dass das Kernel-Modul @code{binfmt.ko} geladen wurde." #. type: defvr -#: doc/guix.texi:10844 +#: doc/guix.texi:10842 #, no-wrap msgid "{Scheme Variable} %fuse-control-file-system" msgstr "{Scheme-Variable} %fuse-control-file-system" #. type: defvr -#: doc/guix.texi:10848 +#: doc/guix.texi:10846 msgid "The @code{fusectl} file system, which allows unprivileged users to mount and unmount user-space FUSE file systems. This requires the @code{fuse.ko} kernel module to be loaded." msgstr "Das @code{fusectl}-Dateisystem, womit „unprivilegierte“ Nutzer ohne besondere Berechtigungen im User Space FUSE-Dateisysteme einbinden und aushängen können. Dazu muss das Kernel-Modul @code{fuse.ko} geladen sein." #. type: cindex -#: doc/guix.texi:10853 +#: doc/guix.texi:10851 #, no-wrap msgid "device mapping" msgstr "Gerätezuordnung" #. type: cindex -#: doc/guix.texi:10854 +#: doc/guix.texi:10852 #, no-wrap msgid "mapped devices" msgstr "zugeordnete Geräte" #. type: Plain text -#: doc/guix.texi:10872 +#: doc/guix.texi:10870 msgid "The Linux kernel has a notion of @dfn{device mapping}: a block device, such as a hard disk partition, can be @dfn{mapped} into another device, usually in @code{/dev/mapper/}, with additional processing over the data that flows through it@footnote{Note that the GNU@tie{}Hurd makes no difference between the concept of a ``mapped device'' and that of a file system: both boil down to @emph{translating} input/output operations made on a file to operations on its backing store. Thus, the Hurd implements mapped devices, like file systems, using the generic @dfn{translator} mechanism (@pxref{Translators,,, hurd, The GNU Hurd Reference Manual}).}. A typical example is encryption device mapping: all writes to the mapped device are encrypted, and all reads are deciphered, transparently. Guix extends this notion by considering any device or set of devices that are @dfn{transformed} in some way to create a new device; for instance, RAID devices are obtained by @dfn{assembling} several other devices, such as hard disks or partitions, into a new one that behaves as one partition. Other examples, not yet implemented, are LVM logical volumes." msgstr "Der Linux-Kernel unterstützt das Konzept der @dfn{Gerätezuordnung}: Ein blockorientiertes Gerät wie eine Festplattenpartition kann einem neuen Gerät @dfn{zugeordnet} werden, gewöhnlich unter @code{/dev/mapper/}, wobei das neue Gerät durchlaufende Daten zusätzlicher Verarbeitung unterzogen werden@footnote{Beachten Sie, dass mit GNU@tie{}Hurd kein Unterschied zwischen dem Konzept eines „zugeordneten Geräts“ und dem eines Dateisystems besteht: Dort werden bei beiden Ein- und Ausgabeoperationen auf eine Datei in Operationen auf dessen Hintergrundspeicher @emph{übersetzt}. Hurd implementiert zugeordnete Geräte genau wie Dateisysteme mit dem generischen @dfn{Übersetzer}-Mechanismus (siehe @ref{Translators,,, hurd, The GNU Hurd Reference Manual}).}. Ein typisches Beispiel ist eine Gerätezuordnung zur Verschlüsselung: Jeder Schreibzugriff auf das zugeordnete Gerät wird transparent verschlüsselt und jeder Lesezugriff ebenso entschlüsselt. Guix erweitert dieses Konzept, indem es darunter jedes Gerät und jede Menge von Geräten versteht, die auf irgendeine Weise @dfn{umgewandelt} wird, um ein neues Gerät zu bilden; zum Beispiel entstehen auch RAID-Geräte aus einem @dfn{Verbund} mehrerer anderer Geräte, wie etwa Festplatten oder Partition zu einem einzelnen Gerät, das sich wie eine Partition verhält. Ein weiteres Beispiel, das noch nicht in Guix implementiert wurde, sind „LVM logical volumes“." #. type: Plain text -#: doc/guix.texi:10875 +#: doc/guix.texi:10873 msgid "Mapped devices are declared using the @code{mapped-device} form, defined as follows; for examples, see below." msgstr "Zugeordnete Geräte werden mittels einer @code{mapped-device}-Form deklariert, die wie folgt definiert ist; Beispiele folgen weiter unten." #. type: deftp -#: doc/guix.texi:10876 +#: doc/guix.texi:10874 #, no-wrap msgid "{Data Type} mapped-device" msgstr "{Datentyp} mapped-device" #. type: deftp -#: doc/guix.texi:10879 +#: doc/guix.texi:10877 msgid "Objects of this type represent device mappings that will be made when the system boots up." msgstr "Objekte dieses Typs repräsentieren Gerätezuordnungen, die gemacht werden, wenn das System hochfährt." #. type: table -#: doc/guix.texi:10885 +#: doc/guix.texi:10883 msgid "This is either a string specifying the name of the block device to be mapped, such as @code{\"/dev/sda3\"}, or a list of such strings when several devices need to be assembled for creating a new one." msgstr "Es handelt sich entweder um eine Zeichenkette, die den Namen eines zuzuordnenden blockorientierten Geräts angibt, wie @code{\"/dev/sda3\"}, oder um eine Liste solcher Zeichenketten, sofern mehrere Geräts zu einem neuen Gerät verbunden werden." #. type: code{#1} -#: doc/guix.texi:10886 doc/guix.texi:24078 +#: doc/guix.texi:10884 doc/guix.texi:24075 #, no-wrap msgid "target" msgstr "target" #. type: table -#: doc/guix.texi:10893 +#: doc/guix.texi:10891 msgid "This string specifies the name of the resulting mapped device. For kernel mappers such as encrypted devices of type @code{luks-device-mapping}, specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/mapper/my-partition\"} device. For RAID devices of type @code{raid-device-mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given." msgstr "Diese Zeichenkette gibt den Namen des neuen zugeordneten Geräts an. Bei Kernel-Zuordnern, wie verschlüsselten Geräten vom Typ @code{luks-device-mapping}, wird durch Angabe von @code{\"my-partition\"} ein Gerät @code{\"/dev/mapper/my-partition\"} erzeugt. Bei RAID-Geräten vom Typ @code{raid-device-mapping} muss der Gerätename als voller Pfad wie zum Beispiel @code{\"/dev/md0\"} angegeben werden." #. type: table -#: doc/guix.texi:10897 +#: doc/guix.texi:10895 msgid "This must be a @code{mapped-device-kind} object, which specifies how @var{source} is mapped to @var{target}." msgstr "Dies muss ein @code{mapped-device-kind}-Objekt sein, das angibt, wie die Quelle @var{source} dem Ziel @var{target} zugeordnet wird." #. type: defvr -#: doc/guix.texi:10900 +#: doc/guix.texi:10898 #, no-wrap msgid "{Scheme Variable} luks-device-mapping" msgstr "{Scheme-Variable} luks-device-mapping" #. type: defvr -#: doc/guix.texi:10904 +#: doc/guix.texi:10902 msgid "This defines LUKS block device encryption using the @command{cryptsetup} command from the package with the same name. It relies on the @code{dm-crypt} Linux kernel module." msgstr "Hiermit wird ein blockorientiertes Gerät mit LUKS verschlüsselt, mit Hilfe des Befehls @command{cryptsetup} aus dem gleichnamigen Paket. Dazu wird das Linux-Kernel-Modul @code{dm-crypt} vorausgesetzt." #. type: defvr -#: doc/guix.texi:10906 +#: doc/guix.texi:10904 #, no-wrap msgid "{Scheme Variable} raid-device-mapping" msgstr "{Scheme-Variable} raid-device-mapping" #. type: defvr -#: doc/guix.texi:10911 +#: doc/guix.texi:10909 msgid "This defines a RAID device, which is assembled using the @code{mdadm} command from the package with the same name. It requires a Linux kernel module for the appropriate RAID level to be loaded, such as @code{raid456} for RAID-4, RAID-5 or RAID-6, or @code{raid10} for RAID-10." msgstr "Dies definiert ein RAID-Gerät, das mit dem Befehl @code{mdadm} aus dem gleichnamigen Paket als Verbund zusammengestellt wird. Es setzt voraus, dass das Linux-Kernel-Modul für das entsprechende RAID-Level geladen ist, z.B.@: @code{raid456} für RAID-4, RAID-5 oder RAID-6, oder @code{raid10} für RAID-10." #. type: cindex -#: doc/guix.texi:10913 +#: doc/guix.texi:10911 #, no-wrap msgid "disk encryption" msgstr "Laufwerksverschlüsselung" #. type: cindex -#: doc/guix.texi:10914 +#: doc/guix.texi:10912 #, no-wrap msgid "LUKS" msgstr "LUKS" #. type: Plain text -#: doc/guix.texi:10922 +#: doc/guix.texi:10920 msgid "The following example specifies a mapping from @file{/dev/sda3} to @file{/dev/mapper/home} using LUKS---the @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, a standard mechanism for disk encryption. The @file{/dev/mapper/home} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems})." msgstr "Das folgende Beispiel gibt eine Zuordnung von @file{/dev/sda3} auf @file{/dev/mapper/home} mit LUKS an — dem @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, einem Standardmechanismus zur Plattenverschlüsselung. Das Gerät @file{/dev/mapper/home} kann dann als @code{device} einer @code{file-system}-Deklaration benutzt werden (siehe @ref{File Systems})." #. type: example -#: doc/guix.texi:10928 +#: doc/guix.texi:10926 #, no-wrap msgid "" "(mapped-device\n" @@ -19608,23 +19619,23 @@ msgstr "" " (type luks-device-mapping))\n" #. type: Plain text -#: doc/guix.texi:10933 +#: doc/guix.texi:10931 msgid "Alternatively, to become independent of device numbering, one may obtain the LUKS UUID (@dfn{unique identifier}) of the source device by a command like:" msgstr "Um nicht davon abhängig zu sein, wie Ihre Geräte nummeriert werden, können Sie auch die LUKS-UUID (@dfn{unique identifier}, d.h.@: den eindeutigen Bezeichner) des Quellgeräts auf der Befehlszeile ermitteln:" #. type: example -#: doc/guix.texi:10936 +#: doc/guix.texi:10934 #, no-wrap msgid "cryptsetup luksUUID /dev/sda3\n" msgstr "cryptsetup luksUUID /dev/sda3\n" #. type: Plain text -#: doc/guix.texi:10939 +#: doc/guix.texi:10937 msgid "and use it as follows:" msgstr "und wie folgt benutzen:" #. type: example -#: doc/guix.texi:10945 +#: doc/guix.texi:10943 #, no-wrap msgid "" "(mapped-device\n" @@ -19638,23 +19649,23 @@ msgstr "" " (type luks-device-mapping))\n" #. type: cindex -#: doc/guix.texi:10947 +#: doc/guix.texi:10945 #, no-wrap msgid "swap encryption" msgstr "Swap-Verschlüsselung" #. type: Plain text -#: doc/guix.texi:10953 +#: doc/guix.texi:10951 msgid "It is also desirable to encrypt swap space, since swap space may contain sensitive data. One way to accomplish that is to use a swap file in a file system on a device mapped via LUKS encryption. In this way, the swap file is encrypted because the entire device is encrypted. @xref{Preparing for Installation,,Disk Partitioning}, for an example." msgstr "Es ist auch wünschenswert, Swap-Speicher zu verschlüsseln, da in den Swap-Speicher sensible Daten ausgelagert werden können. Eine Möglichkeit ist, eine Swap-Datei auf einem mit LUKS-Verschlüsselung zugeordneten Dateisystem zu verwenden. Dann wird die Swap-Datei verschlüsselt, weil das ganze Gerät verschlüsselt wird. Ein Beispiel finden Sie im Abschnitt @ref{Preparing for Installation,,Disk Partitioning}." #. type: Plain text -#: doc/guix.texi:10956 +#: doc/guix.texi:10954 msgid "A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows:" msgstr "Ein RAID-Gerät als Verbund der Partitionen @file{/dev/sda1} und @file{/dev/sdb1} kann wie folgt deklariert werden:" #. type: example -#: doc/guix.texi:10962 +#: doc/guix.texi:10960 #, no-wrap msgid "" "(mapped-device\n" @@ -19668,35 +19679,35 @@ msgstr "" " (type raid-device-mapping))\n" #. type: Plain text -#: doc/guix.texi:10969 +#: doc/guix.texi:10967 msgid "The @file{/dev/md0} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems}). Note that the RAID level need not be given; it is chosen during the initial creation and formatting of the RAID device and is determined automatically later." msgstr "Das Gerät @file{/dev/md0} kann als @code{device} in einer @code{file-system}-Deklaration dienen (siehe @ref{File Systems}). Beachten Sie, dass das RAID-Level dabei nicht angegeben werden muss; es wird während der initialen Erstellung und Formatierung des RAID-Geräts festgelegt und später automatisch bestimmt." #. type: cindex -#: doc/guix.texi:10974 +#: doc/guix.texi:10972 #, no-wrap msgid "users" msgstr "Benutzer" #. type: cindex -#: doc/guix.texi:10975 +#: doc/guix.texi:10973 #, no-wrap msgid "accounts" msgstr "Konten" #. type: cindex -#: doc/guix.texi:10976 +#: doc/guix.texi:10974 #, no-wrap msgid "user accounts" msgstr "Benutzerkonten" #. type: Plain text -#: doc/guix.texi:10980 +#: doc/guix.texi:10978 msgid "User accounts and groups are entirely managed through the @code{operating-system} declaration. They are specified with the @code{user-account} and @code{user-group} forms:" msgstr "Benutzerkonten und Gruppen werden allein durch die @code{operating-system}-Deklaration des Betriebssystems verwaltet. Sie werden mit den @code{user-account}- und @code{user-group}-Formen angegeben:" #. type: example -#: doc/guix.texi:10991 +#: doc/guix.texi:10989 #, no-wrap msgid "" "(user-account\n" @@ -19720,149 +19731,149 @@ msgstr "" " (home-directory \"/home/alice\"))\n" #. type: Plain text -#: doc/guix.texi:11000 +#: doc/guix.texi:10998 msgid "When booting or upon completion of @command{guix system reconfigure}, the system ensures that only the user accounts and groups specified in the @code{operating-system} declaration exist, and with the specified properties. Thus, account or group creations or modifications made by directly invoking commands such as @command{useradd} are lost upon reconfiguration or reboot. This ensures that the system remains exactly as declared." msgstr "Beim Hochfahren oder nach Abschluss von @command{guix system reconfigure} stellt das System sicher, dass nur die in der @code{operating-system}-Deklaration angegebenen Benutzerkonten und Gruppen existieren, mit genau den angegebenen Eigenschaften. Daher gehen durch direkten Aufruf von Befehlen wie @command{useradd} erwirkte Erstellungen oder Modifikationen von Konten oder Gruppen verloren, sobald rekonfiguriert oder neugestartet wird. So wird sichergestellt, dass das System genau so funktioniert, wie es deklariert wurde." #. type: deftp -#: doc/guix.texi:11001 +#: doc/guix.texi:10999 #, no-wrap msgid "{Data Type} user-account" msgstr "{Datentyp} user-account" #. type: deftp -#: doc/guix.texi:11004 +#: doc/guix.texi:11002 msgid "Objects of this type represent user accounts. The following members may be specified:" msgstr "Objekte dieses Typs repräsentieren Benutzerkonten. Darin können folgende Komponenten aufgeführt werden:" #. type: table -#: doc/guix.texi:11008 +#: doc/guix.texi:11006 msgid "The name of the user account." msgstr "Der Name des Benutzerkontos." #. type: itemx -#: doc/guix.texi:11009 doc/guix.texi:23814 +#: doc/guix.texi:11007 doc/guix.texi:23811 #, no-wrap msgid "group" msgstr "group" #. type: cindex -#: doc/guix.texi:11010 doc/guix.texi:11077 +#: doc/guix.texi:11008 doc/guix.texi:11075 #, no-wrap msgid "groups" msgstr "Gruppen" #. type: table -#: doc/guix.texi:11013 +#: doc/guix.texi:11011 msgid "This is the name (a string) or identifier (a number) of the user group this account belongs to." msgstr "Dies ist der Name (als Zeichenkette) oder die Bezeichnung (als Zahl) der Benutzergruppe, zu der dieses Konto gehört." #. type: item -#: doc/guix.texi:11014 +#: doc/guix.texi:11012 #, no-wrap msgid "@code{supplementary-groups} (default: @code{'()})" msgstr "@code{supplementary-groups} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:11017 +#: doc/guix.texi:11015 msgid "Optionally, this can be defined as a list of group names that this account belongs to." msgstr "Dies kann optional als Liste von Gruppennamen angegeben werden, zu denen dieses Konto auch gehört." #. type: item -#: doc/guix.texi:11018 +#: doc/guix.texi:11016 #, no-wrap msgid "@code{uid} (default: @code{#f})" msgstr "@code{uid} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11022 +#: doc/guix.texi:11020 msgid "This is the user ID for this account (a number), or @code{#f}. In the latter case, a number is automatically chosen by the system when the account is created." msgstr "Dies ist entweder der Benutzeridentifikator dieses Kontos (seine „User ID“) als Zahl oder @code{#f}. Bei Letzterem wird vom System automatisch eine Zahl gewählt, wenn das Benutzerkonto erstellt wird." #. type: item -#: doc/guix.texi:11023 +#: doc/guix.texi:11021 #, no-wrap msgid "@code{comment} (default: @code{\"\"})" msgstr "@code{comment} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:11025 +#: doc/guix.texi:11023 msgid "A comment about the account, such as the account owner's full name." msgstr "Ein Kommentar zu dem Konto, wie etwa der vollständige Name des Kontoinhabers." #. type: code{#1} -#: doc/guix.texi:11026 +#: doc/guix.texi:11024 #, no-wrap msgid "home-directory" msgstr "home-directory" #. type: table -#: doc/guix.texi:11028 +#: doc/guix.texi:11026 msgid "This is the name of the home directory for the account." msgstr "Der Name des Persönlichen Verzeichnisses („Home“-Verzeichnis) für dieses Konto." #. type: item -#: doc/guix.texi:11029 +#: doc/guix.texi:11027 #, no-wrap msgid "@code{create-home-directory?} (default: @code{#t})" msgstr "@code{create-home-directory?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11032 +#: doc/guix.texi:11030 msgid "Indicates whether the home directory of this account should be created if it does not exist yet." msgstr "Zeigt an, ob das Persönliche Verzeichnis für das Konto automatisch erstellt werden soll, falls es noch nicht existiert." #. type: item -#: doc/guix.texi:11033 +#: doc/guix.texi:11031 #, no-wrap msgid "@code{shell} (default: Bash)" msgstr "@code{shell} (Vorgabe: Bash)" #. type: table -#: doc/guix.texi:11036 +#: doc/guix.texi:11034 msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions})." msgstr "Ein G-Ausdruck, der den Dateinamen des Programms angibt, das dem Benutzer als Shell dienen soll (siehe @ref{G-Expressions})." #. type: item -#: doc/guix.texi:11037 doc/guix.texi:11095 +#: doc/guix.texi:11035 doc/guix.texi:11093 #, no-wrap msgid "@code{system?} (default: @code{#f})" msgstr "@code{system?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11041 +#: doc/guix.texi:11039 msgid "This Boolean value indicates whether the account is a ``system'' account. System accounts are sometimes treated specially; for instance, graphical login managers do not list them." msgstr "Dieser boolesche Wert zeigt an, ob das Konto ein „System“-Benutzerkonto ist. Systemkonten werden manchmal anders behandelt, zum Beispiel werden sie auf grafischen Anmeldebildschirmen nicht aufgeführt." #. type: anchor{#1} -#: doc/guix.texi:11043 +#: doc/guix.texi:11041 msgid "user-account-password" msgstr "user-account-password" #. type: cindex -#: doc/guix.texi:11043 +#: doc/guix.texi:11041 #, no-wrap msgid "password, for user accounts" msgstr "Passwort, für Benutzerkonten" #. type: item -#: doc/guix.texi:11044 doc/guix.texi:11099 +#: doc/guix.texi:11042 doc/guix.texi:11097 #, no-wrap msgid "@code{password} (default: @code{#f})" msgstr "@code{password} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11050 +#: doc/guix.texi:11048 msgid "You would normally leave this field to @code{#f}, initialize user passwords as @code{root} with the @command{passwd} command, and then let users change it with @command{passwd}. Passwords set with @command{passwd} are of course preserved across reboot and reconfiguration." msgstr "Normalerweise lassen Sie dieses Feld auf @code{#f} und initialisieren Benutzerpasswörter als @code{root} mit dem @command{passwd}-Befehl. Die Benutzer lässt man ihr eigenes Passwort dann mit @command{passwd} ändern. Mit @command{passwd} festgelegte Passwörter bleiben natürlich beim Neustarten und beim Rekonfigurieren erhalten." #. type: table -#: doc/guix.texi:11054 +#: doc/guix.texi:11052 msgid "If you @emph{do} want to set an initial password for an account, then this field must contain the encrypted password, as a string. You can use the @code{crypt} procedure for this purpose:" msgstr "Wenn Sie aber @emph{doch} ein anfängliches Passwort für ein Konto voreinstellen möchten, muss dieses Feld hier das verschlüsselte Passwort als Zeichenkette enthalten. Sie können dazu die Prozedur @code{crypt} benutzen." #. type: example -#: doc/guix.texi:11059 +#: doc/guix.texi:11057 #, no-wrap msgid "" "(user-account\n" @@ -19876,7 +19887,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11062 +#: doc/guix.texi:11060 #, no-wrap msgid "" " ;; Specify a SHA-512-hashed initial password.\n" @@ -19886,150 +19897,150 @@ msgstr "" " (password (crypt \"InitialPassword!\" \"$6$abc\")))\n" #. type: quotation -#: doc/guix.texi:11068 +#: doc/guix.texi:11066 msgid "The hash of this initial password will be available in a file in @file{/gnu/store}, readable by all the users, so this method must be used with care." msgstr "Der Hash dieses initialen Passworts wird in einer Datei im @file{/gnu/store} abgelegt, auf die alle Benutzer Lesezugriff haben, daher ist Vorsicht geboten, wenn Sie diese Methode verwenden." #. type: table -#: doc/guix.texi:11073 +#: doc/guix.texi:11071 msgid "@xref{Passphrase Storage,,, libc, The GNU C Library Reference Manual}, for more information on password encryption, and @ref{Encryption,,, guile, GNU Guile Reference Manual}, for information on Guile's @code{crypt} procedure." msgstr "Siehe @ref{Passphrase Storage,,, libc, The GNU C Library Reference Manual} für weitere Informationen über Passwortverschlüsselung und @ref{Encryption,,, guile, GNU Guile Reference Manual} für Informationen über die Prozedur @code{crypt} in Guile." #. type: Plain text -#: doc/guix.texi:11079 +#: doc/guix.texi:11077 msgid "User group declarations are even simpler:" msgstr "Benutzergruppen-Deklarationen sind noch einfacher aufgebaut:" #. type: example -#: doc/guix.texi:11082 +#: doc/guix.texi:11080 #, no-wrap msgid "(user-group (name \"students\"))\n" msgstr "(user-group (name \"students\"))\n" #. type: deftp -#: doc/guix.texi:11084 +#: doc/guix.texi:11082 #, no-wrap msgid "{Data Type} user-group" msgstr "{Datentyp} user-group" #. type: deftp -#: doc/guix.texi:11086 +#: doc/guix.texi:11084 msgid "This type is for, well, user groups. There are just a few fields:" msgstr "Dieser Typ gibt, nun ja, eine Benutzergruppe an. Es gibt darin nur ein paar Felder:" #. type: table -#: doc/guix.texi:11090 +#: doc/guix.texi:11088 msgid "The name of the group." msgstr "Der Name der Gruppe." #. type: item -#: doc/guix.texi:11091 +#: doc/guix.texi:11089 #, no-wrap msgid "@code{id} (default: @code{#f})" msgstr "@code{id} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11094 +#: doc/guix.texi:11092 msgid "The group identifier (a number). If @code{#f}, a new number is automatically allocated when the group is created." msgstr "Der Gruppenbezeichner (eine Zahl). Wird er als @code{#f} angegeben, wird automatisch eine neue Zahl reserviert, wenn die Gruppe erstellt wird." #. type: table -#: doc/guix.texi:11098 +#: doc/guix.texi:11096 msgid "This Boolean value indicates whether the group is a ``system'' group. System groups have low numerical IDs." msgstr "Dieser boolesche Wert gibt an, ob es sich um eine „System“-Gruppe handelt. Systemgruppen sind solche mit einer kleinen Zahl als Bezeichner." #. type: table -#: doc/guix.texi:11102 +#: doc/guix.texi:11100 msgid "What, user groups can have a password? Well, apparently yes. Unless @code{#f}, this field specifies the password of the group." msgstr "Wie, Benutzergruppen können ein Passwort haben? Nun ja, anscheinend schon. Wenn es nicht auf @code{#f} steht, gibt dieses Feld das Passwort der Gruppe an." #. type: Plain text -#: doc/guix.texi:11108 +#: doc/guix.texi:11106 msgid "For convenience, a variable lists all the basic user groups one may expect:" msgstr "Um Ihnen das Leben zu erleichtern, gibt es eine Variable, worin alle grundlegenden Benutzergruppen aufgeführt sind, die man erwarten könnte:" #. type: defvr -#: doc/guix.texi:11109 +#: doc/guix.texi:11107 #, no-wrap msgid "{Scheme Variable} %base-groups" msgstr "{Scheme-Variable} %base-groups" #. type: defvr -#: doc/guix.texi:11114 +#: doc/guix.texi:11112 msgid "This is the list of basic user groups that users and/or packages expect to be present on the system. This includes groups such as ``root'', ``wheel'', and ``users'', as well as groups used to control access to specific devices such as ``audio'', ``disk'', and ``cdrom''." msgstr "Die Liste von Basis-Benutzergruppen, von denen Benutzer und/oder Pakete erwarten könnten, dass sie auf dem System existieren. Dazu gehören Gruppen wie „root“, „wheel“ und „users“, sowie Gruppen, um den Zugriff auf bestimmte Geräte einzuschränken, wie „audio“, „disk“ und „cdrom“." #. type: defvr -#: doc/guix.texi:11116 +#: doc/guix.texi:11114 #, no-wrap msgid "{Scheme Variable} %base-user-accounts" msgstr "{Scheme-Variable} %base-user-accounts" #. type: defvr -#: doc/guix.texi:11119 +#: doc/guix.texi:11117 msgid "This is the list of basic system accounts that programs may expect to find on a GNU/Linux system, such as the ``nobody'' account." msgstr "Diese Liste enthält Basis-Systembenutzerkonten, von denen Programme erwarten können, dass sie auf einem GNU/Linux-System existieren, wie das Konto „nobody“." #. type: defvr -#: doc/guix.texi:11122 +#: doc/guix.texi:11120 msgid "Note that the ``root'' account is not included here. It is a special-case and is automatically added whether or not it is specified." msgstr "Beachten Sie, dass das Konto „root“ für den Administratornutzer nicht dazugehört. Es ist ein Sonderfall und wird automatisch erzeugt, egal ob es spezifiziert wurde oder nicht." #. type: cindex -#: doc/guix.texi:11128 +#: doc/guix.texi:11126 #, no-wrap msgid "keymap" msgstr "Keymap" #. type: Plain text -#: doc/guix.texi:11136 +#: doc/guix.texi:11134 msgid "To specify what each key of your keyboard does, you need to tell the operating system what @dfn{keyboard layout} you want to use. The default, when nothing is specified, is the US English QWERTY layout for 105-key PC keyboards. However, German speakers will usually prefer the German QWERTZ layout, French speakers will want the AZERTY layout, and so on; hackers might prefer Dvorak or bépo, and they might even want to further customize the effect of some of the keys. This section explains how to get that done." msgstr "Um anzugeben, was jede Taste auf Ihrer Tastatur tut, müssen Sie angeben, welche @dfn{Tastaturbelegung} das Betriebssystem benutzen soll. Wenn nichts angegeben wird, ist die „US English“-QWERTY-Tastaturbelegung für PC-Tastaturen mit 105 Tasten voreingestellt. Allerdings bevorzugen Deutsch sprechende Nutzer meistens die deutsche QWERTZ-Tastaturbelegung, Französisch sprechende haben lieber die AZERTY-Belegung und so weiter; Hacker wollen vielleicht Dvorak oder Bépo als Tastaturbelegung benutzen oder sogar eigene Anpassungen bei manchen Tasten vornehmen. Dieser Abschnitt erklärt, wie das geht." #. type: cindex -#: doc/guix.texi:11137 +#: doc/guix.texi:11135 #, no-wrap msgid "keyboard layout, definition" msgstr "Tastaturbelegung, Definition" #. type: Plain text -#: doc/guix.texi:11139 +#: doc/guix.texi:11137 msgid "There are three components that will want to know about your keyboard layout:" msgstr "Die Informationen über Ihre Tastaturbelegung werden an drei Stellen gebraucht:" #. type: itemize -#: doc/guix.texi:11146 +#: doc/guix.texi:11144 msgid "The @emph{bootloader} may want to know what keyboard layout you want to use (@pxref{Bootloader Configuration, @code{keyboard-layout}}). This is useful if you want, for instance, to make sure that you can type the passphrase of your encrypted root partition using the right layout." msgstr "Der @emph{Bootloader} muss auslesen können, welche Tastaturbelegung Sie benutzen möchten (siehe @ref{Bootloader Configuration, @code{keyboard-layout}}). Das ist praktisch, wenn Sie zum Beispiel die Passphrase Ihrer verschlüsselten Wurzelpartition mit der richtigen Tastaturbelegung eintippen wollen." #. type: itemize -#: doc/guix.texi:11151 +#: doc/guix.texi:11149 msgid "The @emph{operating system kernel}, Linux, will need that so that the console is properly configured (@pxref{operating-system Reference, @code{keyboard-layout}})." msgstr "Der @emph{Kernel des Betriebssystems}, Linux, braucht die Information, damit die Konsole richtig eingestellt ist (siehe @ref{operating-system Reference, @code{keyboard-layout}})." #. type: itemize -#: doc/guix.texi:11155 +#: doc/guix.texi:11153 msgid "The @emph{graphical display server}, usually Xorg, also has its own idea of the keyboard layout (@pxref{X Window, @code{keyboard-layout}})." msgstr "Der @emph{grafische Anzeigeserver}, meistens ist das Xorg, hat auch seine eigene Konfiguration der Tastaturbelegung (siehe @ref{X Window, @code{keyboard-layout}})." #. type: Plain text -#: doc/guix.texi:11159 +#: doc/guix.texi:11157 msgid "Guix allows you to configure all three separately but, fortunately, it allows you to share the same keyboard layout for all three components." msgstr "Mit Guix können Sie alle drei Komponenten separat konfigurieren, aber zum Glück können Sie damit auch dieselbe Konfiguration der Tastaturbelegung für alle drei benutzen." #. type: cindex -#: doc/guix.texi:11160 +#: doc/guix.texi:11158 #, no-wrap msgid "XKB, keyboard layouts" msgstr "XKB, Tastaturbelegungen" #. type: Plain text -#: doc/guix.texi:11168 +#: doc/guix.texi:11166 msgid "Keyboard layouts are represented by records created by the @code{keyboard-layout} procedure of @code{(gnu system keyboard)}. Following the X Keyboard extension (XKB), each layout has four attributes: a name (often a language code such as ``fi'' for Finnish or ``jp'' for Japanese), an optional variant name, an optional keyboard model name, and a possibly empty list of additional options. In most cases the layout name is all you care about. Here are a few example:" msgstr "Tastaturbelegungen werden durch Verbundsobjekte repräsentiert, die mit der Prozedur @code{keyboard-layout} aus dem Modul @code{(gnu system keyboard)} angelegt werden. Entsprechend der „X-Keyboard“-Erweiterung (XKB) verfügt jede Tastaturbelegung über vier Attribute: einen Namen (oft ist das ein Sprachkürzel wie „fi“ für Finnisch oder „jp“ für Japanisch), ein optionaler Variantenname, ein optionaler Tastaturmodellname und eine möglicherweise leere Liste zusätzlicher Optionen. In den meisten Fällen interessiert Sie nur der Name der Tastaturbelegung. Hier sind ein paar Beispiele:" #. type: example -#: doc/guix.texi:11173 +#: doc/guix.texi:11171 #, no-wrap msgid "" ";; The German QWERTZ layout. Here we assume a standard\n" @@ -20043,7 +20054,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11176 +#: doc/guix.texi:11174 #, no-wrap msgid "" ";; The bépo variant of the French layout.\n" @@ -20055,7 +20066,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11179 +#: doc/guix.texi:11177 #, no-wrap msgid "" ";; The Catalan layout.\n" @@ -20067,7 +20078,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11186 +#: doc/guix.texi:11184 #, no-wrap msgid "" ";; The Latin American Spanish layout. In addition, the\n" @@ -20088,7 +20099,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11189 +#: doc/guix.texi:11187 #, no-wrap msgid "" ";; The Russian layout for a ThinkPad keyboard.\n" @@ -20100,7 +20111,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11194 +#: doc/guix.texi:11192 #, no-wrap msgid "" ";; The \"US international\" layout, which is the US layout plus\n" @@ -20114,29 +20125,29 @@ msgstr "" "(keyboard-layout \"us\" \"intl\" #:model \"macbook78\")\n" #. type: Plain text -#: doc/guix.texi:11198 +#: doc/guix.texi:11196 msgid "See the @file{share/X11/xkb} directory of the @code{xkeyboard-config} package for a complete list of supported layouts, variants, and models." msgstr "Im Verzeichnis @file{share/X11/xkb} des @code{xkeyboard-config}-Pakets finden Sie eine vollständige Liste der unterstützten Tastaturbelegungen, Varianten und Modelle." #. type: cindex -#: doc/guix.texi:11199 +#: doc/guix.texi:11197 #, no-wrap msgid "keyboard layout, configuration" msgstr "Tastaturbelegung, Konfiguration" #. type: Plain text -#: doc/guix.texi:11203 +#: doc/guix.texi:11201 msgid "Let's say you want your system to use the Turkish keyboard layout throughout your system---bootloader, console, and Xorg. Here's what your system configuration would look like:" msgstr "Sagen wir, Sie würden gerne die türkische Tastaturbelegung für Ihr gesamtes System — Bootloader, Konsole und Xorg — verwenden. Dann würde Ihre Systemkonfiguration so aussehen:" #. type: findex -#: doc/guix.texi:11204 +#: doc/guix.texi:11202 #, no-wrap msgid "set-xorg-configuration" msgstr "set-xorg-configuration" #. type: lisp -#: doc/guix.texi:11208 +#: doc/guix.texi:11206 #, no-wrap msgid "" ";; Using the Turkish layout for the bootloader, the console,\n" @@ -20148,7 +20159,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:11220 +#: doc/guix.texi:11218 #, no-wrap msgid "" "(operating-system\n" @@ -20176,76 +20187,76 @@ msgstr "" " %desktop-services)))\n" #. type: Plain text -#: doc/guix.texi:11227 +#: doc/guix.texi:11225 msgid "In the example above, for GRUB and for Xorg, we just refer to the @code{keyboard-layout} field defined above, but we could just as well refer to a different layout. The @code{set-xorg-configuration} procedure communicates the desired Xorg configuration to the graphical log-in manager, by default GDM." msgstr "Im obigen Beispiel beziehen wir uns für GRUB und Xorg einfach auf das @code{keyboard-layout}-Feld, was wir darüber definiert haben, wir könnten aber auch eine andere Tastaturbelegung angeben. Die Prozedur @code{set-xorg-configuration} kommuniziert an die grafische Anmeldeverwaltung (d.h.@: nach Vorgabe an GDM), welche Xorg-Konfiguration verwendet werden soll." #. type: Plain text -#: doc/guix.texi:11230 +#: doc/guix.texi:11228 msgid "We've discussed how to specify the @emph{default} keyboard layout of your system when it starts, but you can also adjust it at run time:" msgstr "Wir haben uns bisher damit auseinandergesetzt, wie die @emph{Voreinstellung} für die Tastaturbelegung ausgewählt werden kann, die das System annimmt, wenn es startet, aber zur Laufzeit kann sie geändert werden:" #. type: itemize -#: doc/guix.texi:11235 +#: doc/guix.texi:11233 msgid "If you're using GNOME, its settings panel has a ``Region & Language'' entry where you can select one or more keyboard layouts." msgstr "Wenn Sie GNOME benutzen, können Sie in den Einstellungen dazu einen Eintrag „Region und Sprache“ finden, in dem Sie eine oder mehrere Tastaturbelegungen auswählen können." #. type: itemize -#: doc/guix.texi:11240 +#: doc/guix.texi:11238 msgid "Under Xorg, the @command{setxkbmap} command (from the same-named package) allows you to change the current layout. For example, this is how you would change the layout to US Dvorak:" msgstr "Unter Xorg können Sie den Befehl @command{setxkbmap} (aus dem gleichnamigen Paket) zum Anpassen der momentan aktiven Tastaturbelegung benutzen. Zum Beispiel würden Sie so die Belegung auf US Dvorak wechseln:" #. type: example -#: doc/guix.texi:11243 +#: doc/guix.texi:11241 #, no-wrap msgid "setxkbmap us dvorak\n" msgstr "setxkbmap us dvorak\n" #. type: itemize -#: doc/guix.texi:11250 +#: doc/guix.texi:11248 msgid "The @code{loadkeys} command changes the keyboard layout in effect in the Linux console. However, note that @code{loadkeys} does @emph{not} use the XKB keyboard layout categorization described above. The command below loads the French bépo layout:" msgstr "Mit dem Befehl @code{loadkeys} ändern Sie die für die Linux-Konsole geltende Tastaturbelegung. Allerdings ist zu beachten, dass @code{loadkeys} @emph{nicht} die Kategorisierung der Tastaturbelegungen von XKB benutzt. Der Befehl, um die französische Bépo-Belegung zu laden, wäre folgender:" #. type: example -#: doc/guix.texi:11253 +#: doc/guix.texi:11251 #, no-wrap msgid "loadkeys fr-bepo\n" msgstr "loadkeys fr-bepo\n" #. type: cindex -#: doc/guix.texi:11259 +#: doc/guix.texi:11257 #, no-wrap msgid "locale" msgstr "Locale" #. type: Plain text -#: doc/guix.texi:11266 +#: doc/guix.texi:11264 msgid "A @dfn{locale} defines cultural conventions for a particular language and region of the world (@pxref{Locales,,, libc, The GNU C Library Reference Manual}). Each locale has a name that typically has the form @code{@var{language}_@var{territory}.@var{codeset}}---e.g., @code{fr_LU.utf8} designates the locale for the French language, with cultural conventions from Luxembourg, and using the UTF-8 encoding." msgstr "Eine @dfn{Locale} legt die kulturellen Konventionen einer bestimmten Sprache und Region auf der Welt fest (siehe @ref{Locales,,, libc, The GNU C Library Reference Manual}). Jede Locale hat einen Namen, der typischerweise von der Form @code{@var{Sprache}_@var{Gebiet}.@var{Kodierung}} — z.B.@: benennt @code{fr_LU.utf8} die Locale für französische Sprache mit den kulturellen Konventionen aus Luxemburg unter Verwendung der UTF-8-Kodierung." #. type: cindex -#: doc/guix.texi:11267 +#: doc/guix.texi:11265 #, no-wrap msgid "locale definition" msgstr "Locale-Definition" #. type: Plain text -#: doc/guix.texi:11271 +#: doc/guix.texi:11269 msgid "Usually, you will want to specify the default locale for the machine using the @code{locale} field of the @code{operating-system} declaration (@pxref{operating-system Reference, @code{locale}})." msgstr "Normalerweise werden Sie eine standardmäßig zu verwendende Locale für die Maschine vorgeben wollen, indem Sie das @code{locale}-Feld der @code{operating-system}-Deklaration verwenden (siehe @ref{operating-system Reference, @code{locale}})." #. type: Plain text -#: doc/guix.texi:11280 +#: doc/guix.texi:11278 msgid "The selected locale is automatically added to the @dfn{locale definitions} known to the system if needed, with its codeset inferred from its name---e.g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} codeset. Additional locale definitions can be specified in the @code{locale-definitions} slot of @code{operating-system}---this is useful, for instance, if the codeset could not be inferred from the locale name. The default set of locale definitions includes some widely used locales, but not all the available locales, in order to save space." msgstr "Die ausgewählte Locale wird automatisch zu den dem System bekannten @dfn{Locale-Definitionen} hinzugefügt, falls nötig, und ihre Kodierung wird aus dem Namen hergeleitet — z.B.@: wird angenommen, dass @code{bo_CN.utf8} als Kodierung @code{UTF-8} verwendet. Zusätzliche Locale-Definitionen können im Feld @code{locale-definitions} vom @code{operating-system} festgelegt werden — das ist zum Beispiel dann nützlich, wenn die Kodierung nicht aus dem Locale-Namen hergeleitet werden konnte. Die vorgegebene Menge an Locale-Definitionen enthält manche weit verbreiteten Locales, aber um Platz zu sparen, nicht alle verfügbaren Locales." #. type: Plain text -#: doc/guix.texi:11283 +#: doc/guix.texi:11281 msgid "For instance, to add the North Frisian locale for Germany, the value of that field may be:" msgstr "Um zum Beispiel die nordfriesische Locale für Deutschland hinzuzufügen, könnte der Wert des Feldes wie folgt aussehen:" #. type: example -#: doc/guix.texi:11288 +#: doc/guix.texi:11286 #, no-wrap msgid "" "(cons (locale-definition\n" @@ -20257,12 +20268,12 @@ msgstr "" " %default-locale-definitions)\n" #. type: Plain text -#: doc/guix.texi:11292 +#: doc/guix.texi:11290 msgid "Likewise, to save space, one might want @code{locale-definitions} to list only the locales that are actually used, as in:" msgstr "Um Platz zu sparen, könnte man auch wollen, dass @code{locale-definitions} nur die tatsächlich benutzen Locales aufführt, wie etwa:" #. type: example -#: doc/guix.texi:11297 +#: doc/guix.texi:11295 #, no-wrap msgid "" "(list (locale-definition\n" @@ -20274,114 +20285,114 @@ msgstr "" " (charset \"EUC-JP\")))\n" #. type: Plain text -#: doc/guix.texi:11306 +#: doc/guix.texi:11304 msgid "The compiled locale definitions are available at @file{/run/current-system/locale/X.Y}, where @code{X.Y} is the libc version, which is the default location where the GNU@tie{}libc provided by Guix looks for locale data. This can be overridden using the @code{LOCPATH} environment variable (@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})." msgstr "Die kompilierten Locale-Definitionen sind unter @file{/run/current-system/locale/X.Y} verfügbar, wobei @code{X.Y} die Version von libc bezeichnet. Dies entspricht dem Pfad, an dem eine von Guix ausgelieferte GNU@tie{}libc standardmäßig nach Locale-Daten sucht. Er kann überschrieben werden durch die Umgebungsvariable @code{LOCPATH} (siehe @ref{locales-and-locpath, @code{LOCPATH} und Locale-Pakete})." #. type: Plain text -#: doc/guix.texi:11309 +#: doc/guix.texi:11307 msgid "The @code{locale-definition} form is provided by the @code{(gnu system locale)} module. Details are given below." msgstr "Die @code{locale-definition}-Form wird vom Modul @code{(gnu system locale)} zur Verfügung gestellt. Details folgen unten." #. type: deftp -#: doc/guix.texi:11310 +#: doc/guix.texi:11308 #, no-wrap msgid "{Data Type} locale-definition" msgstr "{Datentyp} locale-definition" #. type: deftp -#: doc/guix.texi:11312 +#: doc/guix.texi:11310 msgid "This is the data type of a locale definition." msgstr "Dies ist der Datentyp einer Locale-Definition." #. type: table -#: doc/guix.texi:11318 +#: doc/guix.texi:11316 msgid "The name of the locale. @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, for more information on locale names." msgstr "Der Name der Locale. Siehe @ref{Locale Names,,, libc, The GNU C Library Reference Manual} für mehr Informationen zu Locale-Namen." #. type: table -#: doc/guix.texi:11322 +#: doc/guix.texi:11320 msgid "The name of the source for that locale. This is typically the @code{@var{language}_@var{territory}} part of the locale name." msgstr "Der Name der Quelle der Locale. Typischerweise ist das der Teil @code{@var{Sprache}_@var{Gebiet}} des Locale-Namens." #. type: item -#: doc/guix.texi:11323 +#: doc/guix.texi:11321 #, no-wrap msgid "@code{charset} (default: @code{\"UTF-8\"})" msgstr "@code{charset} (Vorgabe: @code{\"UTF-8\"})" #. type: table -#: doc/guix.texi:11327 +#: doc/guix.texi:11325 msgid "The ``character set'' or ``code set'' for that locale, @uref{https://www.iana.org/assignments/character-sets, as defined by IANA}." msgstr "Der „Zeichensatz“ oder das „Code set“, d.h.@: die Kodierung dieser Locale, @uref{https://www.iana.org/assignments/character-sets, wie die IANA sie definiert}." #. type: defvr -#: doc/guix.texi:11331 +#: doc/guix.texi:11329 #, no-wrap msgid "{Scheme Variable} %default-locale-definitions" msgstr "{Scheme-Variable} %default-locale-definitions" #. type: defvr -#: doc/guix.texi:11335 +#: doc/guix.texi:11333 msgid "A list of commonly used UTF-8 locales, used as the default value of the @code{locale-definitions} field of @code{operating-system} declarations." msgstr "Eine Liste häufig benutzter UTF-8-Locales, die als Vorgabewert des @code{locale-definitions}-Feldes in @code{operating-system}-Deklarationen benutzt wird." #. type: cindex -#: doc/guix.texi:11336 +#: doc/guix.texi:11334 #, no-wrap msgid "locale name" msgstr "Locale-Name" #. type: cindex -#: doc/guix.texi:11337 +#: doc/guix.texi:11335 #, no-wrap msgid "normalized codeset in locale names" msgstr "Normalisiertes Codeset in Locale-Namen" #. type: defvr -#: doc/guix.texi:11343 +#: doc/guix.texi:11341 msgid "These locale definitions use the @dfn{normalized codeset} for the part that follows the dot in the name (@pxref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}). So for instance it has @code{uk_UA.utf8} but @emph{not}, say, @code{uk_UA.UTF-8}." msgstr "Diese Locale-Definitionen benutzen das @dfn{normalisierte Codeset} für den Teil des Namens, der nach dem Punkt steht (siehe @ref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}). Zum Beispiel ist @code{uk_UA.utf8} enthalten, dagegen ist etwa @code{uk_UA.UTF-8} darin @emph{nicht} enthalten." #. type: subsection -#: doc/guix.texi:11345 +#: doc/guix.texi:11343 #, no-wrap msgid "Locale Data Compatibility Considerations" msgstr "Kompatibilität der Locale-Daten" #. type: cindex -#: doc/guix.texi:11347 +#: doc/guix.texi:11345 #, no-wrap msgid "incompatibility, of locale data" msgstr "Inkompatibilität, von Locale-Daten" #. type: Plain text -#: doc/guix.texi:11354 +#: doc/guix.texi:11352 msgid "@code{operating-system} declarations provide a @code{locale-libcs} field to specify the GNU@tie{}libc packages that are used to compile locale declarations (@pxref{operating-system Reference}). ``Why would I care?'', you may ask. Well, it turns out that the binary format of locale data is occasionally incompatible from one libc version to another." msgstr "@code{operating-system}-Deklarationen verfügen über ein @code{locale-libcs}-Feld, um die GNU@tie{}libc-Pakete anzugeben, die zum Kompilieren von Locale-Deklarationen verwendet werden sollen (siehe @ref{operating-system Reference}). „Was interessiert mich das?“, könnten Sie fragen. Naja, leider ist das binäre Format der Locale-Daten von einer libc-Version auf die nächste manchmal nicht miteinander kompatibel." #. type: Plain text -#: doc/guix.texi:11366 +#: doc/guix.texi:11364 msgid "For instance, a program linked against libc version 2.21 is unable to read locale data produced with libc 2.22; worse, that program @emph{aborts} instead of simply ignoring the incompatible locale data@footnote{Versions 2.23 and later of GNU@tie{}libc will simply skip the incompatible locale data, which is already an improvement.}. Similarly, a program linked against libc 2.22 can read most, but not all, of the locale data from libc 2.21 (specifically, @code{LC_COLLATE} data is incompatible); thus calls to @code{setlocale} may fail, but programs will not abort." msgstr "Zum Beispiel kann ein mit der libc-Version 2.21 gebundenes Programm keine mit libc 2.22 erzeugten Locale-Daten lesen; schlimmer noch, das Programm @emph{terminiert} statt einfach die inkompatiblen Locale-Daten zu ignorieren@footnote{Versionen 2.23 von GNU@tie{}libc und neuere werden inkompatible Locale-Daten nur mehr überspringen, was schon einmal eine Verbesserung ist.}. Ähnlich kann ein gegen libc 2.22 gebundenes Programm die meisten, aber nicht alle, Locale-Daten von libc 2.21 lesen (Daten zu @code{LC_COLLATE} sind aber zum Beispiel inkompatibel); somit schlagen Aufrufe von @code{setlocale} vielleicht fehl, aber das Programm läuft weiter." #. type: Plain text -#: doc/guix.texi:11371 +#: doc/guix.texi:11369 msgid "The ``problem'' with Guix is that users have a lot of freedom: They can choose whether and when to upgrade software in their profiles, and might be using a libc version different from the one the system administrator used to build the system-wide locale data." msgstr "Das „Problem“ mit Guix ist, dass Nutzer viel Freiheit genießen: Sie können wählen, ob und wann sie die Software in ihren Profilen aktualisieren und benutzen vielleicht eine andere libc-Version als sie der Systemadministrator benutzt hat, um die systemweiten Locale-Daten zu erstellen." #. type: Plain text -#: doc/guix.texi:11375 +#: doc/guix.texi:11373 msgid "Fortunately, unprivileged users can also install their own locale data and define @var{GUIX_LOCPATH} accordingly (@pxref{locales-and-locpath, @code{GUIX_LOCPATH} and locale packages})." msgstr "Glücklicherweise können „unprivilegierte“ Nutzer ohne zusätzliche Berechtigungen dann zumindest ihre eigenen Locale-Daten installieren und @var{GUIX_LOCPATH} entsprechend definieren (siehe @ref{locales-and-locpath, @code{GUIX_LOCPATH} und Locale-Pakete})." #. type: Plain text -#: doc/guix.texi:11382 +#: doc/guix.texi:11380 msgid "Still, it is best if the system-wide locale data at @file{/run/current-system/locale} is built for all the libc versions actually in use on the system, so that all the programs can access it---this is especially crucial on a multi-user system. To do that, the administrator can specify several libc packages in the @code{locale-libcs} field of @code{operating-system}:" msgstr "Trotzdem ist es am besten, wenn die systemweiten Locale-Daten unter @file{/run/current-system/locale} für alle libc-Versionen erstellt werden, die auf dem System noch benutzt werden, damit alle Programme auf sie zugreifen können — was auf einem Mehrbenutzersystem ganz besonders wichtig ist. Dazu kann der Administrator des Systems mehrere libc-Pakete im @code{locale-libcs}-Feld vom @code{operating-system} angeben:" #. type: example -#: doc/guix.texi:11385 +#: doc/guix.texi:11383 #, no-wrap msgid "" "(use-package-modules base)\n" @@ -20391,7 +20402,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11389 +#: doc/guix.texi:11387 #, no-wrap msgid "" "(operating-system\n" @@ -20403,39 +20414,39 @@ msgstr "" " (locale-libcs (list glibc-2.21 (canonical-package glibc))))\n" #. type: Plain text -#: doc/guix.texi:11394 +#: doc/guix.texi:11392 msgid "This example would lead to a system containing locale definitions for both libc 2.21 and the current version of libc in @file{/run/current-system/locale}." msgstr "Mit diesem Beispiel ergäbe sich ein System, was Locale-Definitionen sowohl für libc 2.21 als auch die aktuelle Version von libc in @file{/run/current-system/locale} hat." #. type: cindex -#: doc/guix.texi:11399 +#: doc/guix.texi:11397 #, no-wrap msgid "system services" msgstr "Systemdienste" #. type: Plain text -#: doc/guix.texi:11405 +#: doc/guix.texi:11403 msgid "An important part of preparing an @code{operating-system} declaration is listing @dfn{system services} and their configuration (@pxref{Using the Configuration System}). System services are typically daemons launched when the system boots, or other actions needed at that time---e.g., configuring network access." msgstr "Ein wichtiger Bestandteil des Schreibens einer @code{operating-system}-Deklaration ist das Auflisten der @dfn{Systemdienste} und ihrer Konfiguration (siehe @ref{Using the Configuration System}). Systemdienste sind typischerweise im Hintergrund laufende Daemon-Programme, die beim Hochfahren des Systems gestartet werden, oder andere Aktionen, die zu dieser Zeit durchgeführt werden müssen — wie das Konfigurieren des Netzwerkzugangs." #. type: Plain text -#: doc/guix.texi:11412 +#: doc/guix.texi:11410 msgid "Guix has a broad definition of ``service'' (@pxref{Service Composition}), but many services are managed by the GNU@tie{}Shepherd (@pxref{Shepherd Services}). On a running system, the @command{herd} command allows you to list the available services, show their status, start and stop them, or do other specific operations (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}). For example:" msgstr "Guix hat eine weit gefasste Definition, was ein „Dienst“ ist (siehe @ref{Service Composition}), aber viele Dienste sind solche, die von GNU@tie{}Shepherd verwaltet werden (siehe @ref{Shepherd Services}). Auf einem laufenden System kann der @command{herd}-Befehl benutzt werden, um verfügbare Dienste aufzulisten, ihren Status anzuzeigen, sie zu starten und zu stoppen oder andere angebotene Operationen durchzuführen (siehe @ref{Jump Start,,, shepherd, The GNU Shepherd Manual}). Zum Beispiel:" #. type: example -#: doc/guix.texi:11415 +#: doc/guix.texi:11413 #, no-wrap msgid "# herd status\n" msgstr "# herd status\n" #. type: Plain text -#: doc/guix.texi:11420 +#: doc/guix.texi:11418 msgid "The above command, run as @code{root}, lists the currently defined services. The @command{herd doc} command shows a synopsis of the given service and its associated actions:" msgstr "Dieser Befehl, durchgeführt als @code{root}, listet die momentan definierten Dienste auf. Der Befehl @command{herd doc} fasst kurz zusammen, was ein gegebener Dienst ist und welche Aktionen mit ihm assoziiert sind:" #. type: example -#: doc/guix.texi:11424 +#: doc/guix.texi:11422 #, no-wrap msgid "" "# herd doc nscd\n" @@ -20447,7 +20458,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11427 +#: doc/guix.texi:11425 #, no-wrap msgid "" "# herd doc nscd action invalidate\n" @@ -20457,12 +20468,12 @@ msgstr "" "invalidate: Invalidate the given cache--e.g., 'hosts' for host name lookups.\n" #. type: Plain text -#: doc/guix.texi:11432 +#: doc/guix.texi:11430 msgid "The @command{start}, @command{stop}, and @command{restart} sub-commands have the effect you would expect. For instance, the commands below stop the nscd service and restart the Xorg display server:" msgstr "Die Unterbefehle @command{start}, @command{stop} und @command{restart} haben die Wirkung, die man erwarten würde. Zum Beispiel kann mit folgenden Befehlen der nscd-Dienst angehalten und der Xorg-Anzeigeserver neu gestartet werden:" #. type: example -#: doc/guix.texi:11439 +#: doc/guix.texi:11437 #, no-wrap msgid "" "# herd stop nscd\n" @@ -20478,44 +20489,44 @@ msgstr "" "Service xorg-server has been started.\n" #. type: Plain text -#: doc/guix.texi:11444 +#: doc/guix.texi:11442 msgid "The following sections document the available services, starting with the core services, that may be used in an @code{operating-system} declaration." msgstr "Die folgenden Abschnitte dokumentieren die verfügbaren Dienste, die in einer @code{operating-system}-Deklaration benutzt werden können, angefangen mit den Diensten im Kern des Systems („core services“)" #. type: subsection -#: doc/guix.texi:11473 doc/guix.texi:18087 doc/guix.texi:18088 +#: doc/guix.texi:11471 doc/guix.texi:18084 doc/guix.texi:18085 #, no-wrap msgid "LDAP Services" msgstr "LDAP-Dienste" #. type: menuentry -#: doc/guix.texi:11473 +#: doc/guix.texi:11471 msgid "LDAP services." msgstr "LDAP-Dienste." #. type: Plain text -#: doc/guix.texi:11481 +#: doc/guix.texi:11479 msgid "The @code{(gnu services base)} module provides definitions for the basic services that one expects from the system. The services exported by this module are listed below." msgstr "Das Modul @code{(gnu services base)} stellt Definitionen für Basis-Dienste zur Verfügung, von denen man erwartet, dass das System sie anbietet. Im Folgenden sind die von diesem Modul exportierten Dienste aufgeführt." #. type: defvr -#: doc/guix.texi:11482 +#: doc/guix.texi:11480 #, no-wrap msgid "{Scheme Variable} %base-services" msgstr "{Scheme-Variable} %base-services" #. type: defvr -#: doc/guix.texi:11488 +#: doc/guix.texi:11486 msgid "This variable contains a list of basic services (@pxref{Service Types and Services}, for more information on service objects) one would expect from the system: a login service (mingetty) on each tty, syslogd, the libc name service cache daemon (nscd), the udev device manager, and more." msgstr "Diese Variable enthält eine Liste von Basis-Diensten, die man auf einem System vorzufinden erwartet (siehe @ref{Service Types and Services} für weitere Informationen zu Dienstobjekten): ein Anmeldungsdienst (mingetty) auf jeder Konsole (jedem „tty“), syslogd, den Name Service Cache Daemon (nscd) von libc, die udev-Geräteverwaltung und weitere." #. type: defvr -#: doc/guix.texi:11493 +#: doc/guix.texi:11491 msgid "This is the default value of the @code{services} field of @code{operating-system} declarations. Usually, when customizing a system, you will want to append services to @var{%base-services}, like this:" msgstr "Dies ist der Vorgabewert für das @code{services}-Feld für die Dienste von @code{operating-system}-Deklarationen. Normalerweise werden Sie, wenn Sie ein Betriebssystem anpassen, Dienste an die @var{%base-services}-Liste anhängen, wie hier gezeigt:" #. type: example -#: doc/guix.texi:11498 +#: doc/guix.texi:11496 #, no-wrap msgid "" "(append (list (service avahi-service-type)\n" @@ -20527,58 +20538,58 @@ msgstr "" " %base-services)\n" #. type: defvr -#: doc/guix.texi:11501 +#: doc/guix.texi:11499 #, no-wrap msgid "{Scheme Variable} special-files-service-type" msgstr "{Scheme-Variable} special-files-service-type" #. type: defvr -#: doc/guix.texi:11504 +#: doc/guix.texi:11502 msgid "This is the service that sets up ``special files'' such as @file{/bin/sh}; an instance of it is part of @code{%base-services}." msgstr "Dieser Dienst richtet „besondere Dateien“ wie @file{/bin/sh} ein; eine Instanz des Dienstes ist Teil der @code{%base-services}." #. type: defvr -#: doc/guix.texi:11508 +#: doc/guix.texi:11506 msgid "The value associated with @code{special-files-service-type} services must be a list of tuples where the first element is the ``special file'' and the second element is its target. By default it is:" msgstr "Der mit @code{special-files-service-type}-Diensten assoziierte Wert muss eine Liste von Tupeln sein, deren erstes Element eine „besondere Datei“ und deren zweites Element deren Zielpfad ist. Der Vorgabewert ist:" #. type: file{#1} -#: doc/guix.texi:11509 +#: doc/guix.texi:11507 #, no-wrap msgid "/bin/sh" msgstr "/bin/sh" #. type: cindex -#: doc/guix.texi:11510 +#: doc/guix.texi:11508 #, no-wrap msgid "@file{sh}, in @file{/bin}" msgstr "@file{sh}, in @file{/bin}" #. type: example -#: doc/guix.texi:11513 +#: doc/guix.texi:11511 #, no-wrap msgid "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" msgstr "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" #. type: file{#1} -#: doc/guix.texi:11515 +#: doc/guix.texi:11513 #, no-wrap msgid "/usr/bin/env" msgstr "/usr/bin/env" #. type: cindex -#: doc/guix.texi:11516 +#: doc/guix.texi:11514 #, no-wrap msgid "@file{env}, in @file{/usr/bin}" msgstr "@file{env}, in @file{/usr/bin}" #. type: defvr -#: doc/guix.texi:11519 +#: doc/guix.texi:11517 msgid "If you want to add, say, @code{/usr/bin/env} to your system, you can change it to:" msgstr "Wenn Sie zum Beispiel auch @code{/usr/bin/env} zu Ihrem System hinzufügen möchten, können Sie den Wert ändern auf:" #. type: example -#: doc/guix.texi:11523 +#: doc/guix.texi:11521 #, no-wrap msgid "" "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n" @@ -20588,28 +20599,28 @@ msgstr "" " (\"/usr/bin/env\" ,(file-append @var{coreutils} \"/bin/env\")))\n" #. type: defvr -#: doc/guix.texi:11530 +#: doc/guix.texi:11528 msgid "Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files (@pxref{Service Reference, @code{modify-services}}). But the simple way to add a special file is @i{via} the @code{extra-special-file} procedure (see below.)" msgstr "Da dieser Dienst Teil der @code{%base-services} ist, können Sie @code{modify-services} benutzen, um die Liste besonderer Dateien abzuändern (siehe @ref{Service Reference, @code{modify-services}}). Die leichte Alternative, um eine besondere Datei hinzuzufügen, ist über die Prozedur @code{extra-special-file} (siehe unten)." #. type: deffn -#: doc/guix.texi:11532 +#: doc/guix.texi:11530 #, no-wrap msgid "{Scheme Procedure} extra-special-file @var{file} @var{target}" msgstr "{Scheme-Prozedur} extra-special-file @var{Datei} @var{Ziel}" #. type: deffn -#: doc/guix.texi:11534 +#: doc/guix.texi:11532 msgid "Use @var{target} as the ``special file'' @var{file}." msgstr "Das @var{Ziel} als „besondere Datei“ @var{Datei} verwenden." #. type: deffn -#: doc/guix.texi:11538 +#: doc/guix.texi:11536 msgid "For example, adding the following lines to the @code{services} field of your operating system declaration leads to a @file{/usr/bin/env} symlink:" msgstr "Beispielsweise können Sie die folgenden Zeilen in das @code{services}-Feld Ihrer Betriebssystemdeklaration einfügen für eine symbolische Verknüpfung @file{/usr/bin/env}:" #. type: example -#: doc/guix.texi:11542 +#: doc/guix.texi:11540 #, no-wrap msgid "" "(extra-special-file \"/usr/bin/env\"\n" @@ -20619,1150 +20630,1150 @@ msgstr "" " (file-append coreutils \"/bin/env\"))\n" #. type: deffn -#: doc/guix.texi:11545 +#: doc/guix.texi:11543 #, no-wrap msgid "{Scheme Procedure} host-name-service @var{name}" msgstr "{Scheme-Prozedur} host-name-service @var{Name}" #. type: deffn -#: doc/guix.texi:11547 +#: doc/guix.texi:11545 msgid "Return a service that sets the host name to @var{name}." msgstr "Liefert einen Dienst, der den Rechnernamen (den „Host“-Namen des Rechners) als @var{Name} festlegt." #. type: deffn -#: doc/guix.texi:11549 +#: doc/guix.texi:11547 #, no-wrap msgid "{Scheme Procedure} login-service @var{config}" msgstr "{Scheme-Prozedur} login-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11553 +#: doc/guix.texi:11551 msgid "Return a service to run login according to @var{config}, a @code{} object, which specifies the message of the day, among other things." msgstr "Liefert einen Dienst, der die Benutzeranmeldung möglich macht. Dazu verwendet er die angegebene @var{Konfiguration}, ein @code{}-Objekt, das unter anderem die beim Anmelden angezeigte Mitteilung des Tages („Message of the Day“) festlegt." #. type: deftp -#: doc/guix.texi:11555 +#: doc/guix.texi:11553 #, no-wrap msgid "{Data Type} login-configuration" msgstr "{Datentyp} login-configuration" #. type: deftp -#: doc/guix.texi:11557 +#: doc/guix.texi:11555 msgid "This is the data type representing the configuration of login." msgstr "Dies ist der Datentyp, der die Anmeldekonfiguration repräsentiert." #. type: code{#1} -#: doc/guix.texi:11560 +#: doc/guix.texi:11558 #, no-wrap msgid "motd" msgstr "motd" #. type: cindex -#: doc/guix.texi:11561 +#: doc/guix.texi:11559 #, no-wrap msgid "message of the day" msgstr "Message of the Day" #. type: table -#: doc/guix.texi:11563 +#: doc/guix.texi:11561 msgid "A file-like object containing the ``message of the day''." msgstr "Ein dateiartiges Objekt, das die „Message of the Day“ enthält." #. type: item -#: doc/guix.texi:11564 doc/guix.texi:13524 +#: doc/guix.texi:11562 doc/guix.texi:13522 #, no-wrap msgid "@code{allow-empty-passwords?} (default: @code{#t})" msgstr "@code{allow-empty-passwords?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11567 +#: doc/guix.texi:11565 msgid "Allow empty passwords by default so that first-time users can log in when the 'root' account has just been created." msgstr "Leere Passwörter standardmäßig zulassen, damit sich neue Anwender anmelden können, direkt nachdem das Benutzerkonto „root“ für den Administrator angelegt wurde." #. type: deffn -#: doc/guix.texi:11571 +#: doc/guix.texi:11569 #, no-wrap msgid "{Scheme Procedure} mingetty-service @var{config}" msgstr "{Scheme-Prozedur} mingetty-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11575 +#: doc/guix.texi:11573 msgid "Return a service to run mingetty according to @var{config}, a @code{} object, which specifies the tty to run, among other things." msgstr "Liefert einen Dienst, der mingetty nach den Vorgaben der @var{Konfiguration} ausführt, einem @code{}-Objekt, das unter anderem die Konsole (das „tty“) festlegt, auf der mingetty laufen soll." #. type: deftp -#: doc/guix.texi:11577 +#: doc/guix.texi:11575 #, no-wrap msgid "{Data Type} mingetty-configuration" msgstr "{Datentyp} mingetty-configuration" #. type: deftp -#: doc/guix.texi:11580 +#: doc/guix.texi:11578 msgid "This is the data type representing the configuration of Mingetty, which provides the default implementation of virtual console log-in." msgstr "Dieser Datentyp repräsentiert die Konfiguration von Mingetty, der vorgegebenen Implementierung zur Anmeldung auf einer virtuellen Konsole." #. type: code{#1} -#: doc/guix.texi:11583 doc/guix.texi:11619 +#: doc/guix.texi:11581 doc/guix.texi:11617 #, no-wrap msgid "tty" msgstr "tty" #. type: table -#: doc/guix.texi:11585 +#: doc/guix.texi:11583 msgid "The name of the console this Mingetty runs on---e.g., @code{\"tty1\"}." msgstr "Der Name der Konsole, auf der diese Mingetty-Instanz läuft — z.B.@: @code{\"tty1\"}." #. type: item -#: doc/guix.texi:11586 doc/guix.texi:11648 doc/guix.texi:11807 +#: doc/guix.texi:11584 doc/guix.texi:11646 doc/guix.texi:11805 #, no-wrap msgid "@code{auto-login} (default: @code{#f})" msgstr "@code{auto-login} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11590 +#: doc/guix.texi:11588 msgid "When true, this field must be a string denoting the user name under which the system automatically logs in. When it is @code{#f}, a user name and password must be entered to log in." msgstr "Steht dieses Feld auf wahr, muss es eine Zeichenkette sein, die den Benutzernamen angibt, als der man vom System automatisch angemeldet wird. Ist es @code{#f}, so muss zur Anmeldung ein Benutzername und ein Passwort eingegeben werden." #. type: item -#: doc/guix.texi:11591 +#: doc/guix.texi:11589 #, no-wrap msgid "@code{login-program} (default: @code{#f})" msgstr "@code{login-program} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11595 +#: doc/guix.texi:11593 msgid "This must be either @code{#f}, in which case the default log-in program is used (@command{login} from the Shadow tool suite), or a gexp denoting the name of the log-in program." msgstr "Dies muss entweder @code{#f} sein, dann wird das voreingestellte Anmeldeprogramm benutzt (@command{login} aus dem Shadow-Werkzeugsatz) oder der Name des Anmeldeprogramms als G-Ausdruck." #. type: item -#: doc/guix.texi:11596 +#: doc/guix.texi:11594 #, no-wrap msgid "@code{login-pause?} (default: @code{#f})" msgstr "@code{login-pause?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11599 +#: doc/guix.texi:11597 msgid "When set to @code{#t} in conjunction with @var{auto-login}, the user will have to press a key before the log-in shell is launched." msgstr "Ist es auf @code{#t} gesetzt, sorgt es in Verbindung mit @var{auto-login} dafür, dass der Benutzer eine Taste drücken muss, ehe eine Anmelde-Shell gestartet wird." #. type: item -#: doc/guix.texi:11600 +#: doc/guix.texi:11598 #, no-wrap msgid "@code{mingetty} (default: @var{mingetty})" msgstr "@code{mingetty} (Vorgabe: @var{mingetty})" #. type: table -#: doc/guix.texi:11602 +#: doc/guix.texi:11600 msgid "The Mingetty package to use." msgstr "Welches Mingetty-Paket benutzt werden soll." #. type: deffn -#: doc/guix.texi:11606 +#: doc/guix.texi:11604 #, no-wrap msgid "{Scheme Procedure} agetty-service @var{config}" msgstr "{Scheme-Prozedur} agetty-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11610 +#: doc/guix.texi:11608 msgid "Return a service to run agetty according to @var{config}, an @code{} object, which specifies the tty to run, among other things." msgstr "Liefert einen Dienst, um agetty entsprechend der @var{Konfiguration} auszuführen, welche ein @code{}-Objekt sein muss, das unter anderem festlegt, auf welchem tty es laufen soll." #. type: deftp -#: doc/guix.texi:11612 +#: doc/guix.texi:11610 #, no-wrap msgid "{Data Type} agetty-configuration" msgstr "{Datentyp} agetty-configuration" #. type: deftp -#: doc/guix.texi:11616 +#: doc/guix.texi:11614 msgid "This is the data type representing the configuration of agetty, which implements virtual and serial console log-in. See the @code{agetty(8)} man page for more information." msgstr "Dies ist der Datentyp, der die Konfiguration von agetty repräsentiert, was Anmeldungen auf einer virtuellen oder seriellen Konsole implementiert. Siehe die Handbuchseite @code{agetty(8)} für mehr Informationen." #. type: table -#: doc/guix.texi:11623 +#: doc/guix.texi:11621 msgid "The name of the console this agetty runs on, as a string---e.g., @code{\"ttyS0\"}. This argument is optional, it will default to a reasonable default serial port used by the kernel Linux." msgstr "Der Name der Konsole, auf der diese Instanz von agetty läuft, als Zeichenkette — z.B.@: @code{\"ttyS0\"}. Dieses Argument ist optional, sein Vorgabewert ist eine vernünftige Wahl unter den seriellen Schnittstellen, auf deren Benutzung der Linux-Kernel eingestellt ist." #. type: table -#: doc/guix.texi:11627 +#: doc/guix.texi:11625 msgid "For this, if there is a value for an option @code{agetty.tty} in the kernel command line, agetty will extract the device name of the serial port from it and use that." msgstr "Hierzu wird, wenn in der Kernel-Befehlszeile ein Wert für eine Option namens @code{agetty.tty} festgelegt wurde, der Gerätename daraus für agetty extrahiert und benutzt." #. type: table -#: doc/guix.texi:11631 +#: doc/guix.texi:11629 msgid "If not and if there is a value for an option @code{console} with a tty in the Linux command line, agetty will extract the device name of the serial port from it and use that." msgstr "Andernfalls wird agetty, falls auf der Kernel-Befehlszeile eine Option @code{console} mit einem tty vorkommt, den daraus extrahierten Gerätenamen der seriellen Schnittstelle benutzen." #. type: table -#: doc/guix.texi:11635 +#: doc/guix.texi:11633 msgid "In both cases, agetty will leave the other serial device settings (baud rate etc.)@: alone---in the hope that Linux pinned them to the correct values." msgstr "In beiden Fällen wird agetty nichts an den anderen Einstellungen für serielle Geräte verändern (Baud-Rate etc.), in der Hoffnung, dass Linux sie auf die korrekten Werte festgelegt hat." #. type: item -#: doc/guix.texi:11636 +#: doc/guix.texi:11634 #, no-wrap msgid "@code{baud-rate} (default: @code{#f})" msgstr "@code{baud-rate} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11639 +#: doc/guix.texi:11637 msgid "A string containing a comma-separated list of one or more baud rates, in descending order." msgstr "Eine Zeichenkette, die aus einer kommagetrennten Liste von einer oder mehreren Baud-Raten besteht, absteigend sortiert." #. type: item -#: doc/guix.texi:11640 +#: doc/guix.texi:11638 #, no-wrap msgid "@code{term} (default: @code{#f})" msgstr "@code{term} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11643 +#: doc/guix.texi:11641 msgid "A string containing the value used for the @code{TERM} environment variable." msgstr "Eine Zeichenkette, die den Wert enthält, der für die Umgebungsvariable @code{TERM} benutzt werden soll." #. type: item -#: doc/guix.texi:11644 +#: doc/guix.texi:11642 #, no-wrap msgid "@code{eight-bits?} (default: @code{#f})" msgstr "@code{eight-bits?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11647 +#: doc/guix.texi:11645 msgid "When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection is disabled." msgstr "Steht dies auf @code{#t}, wird angenommen, dass das tty 8-Bit-korrekt ist, so dass die Paritätserkennung abgeschaltet wird." #. type: table -#: doc/guix.texi:11651 doc/guix.texi:11810 +#: doc/guix.texi:11649 doc/guix.texi:11808 msgid "When passed a login name, as a string, the specified user will be logged in automatically without prompting for their login name or password." msgstr "Wird hier ein Anmeldename als eine Zeichenkette übergeben, wird der angegebene Nutzer automatisch angemeldet, ohne nach einem Anmeldenamen oder Passwort zu fragen." #. type: item -#: doc/guix.texi:11652 +#: doc/guix.texi:11650 #, no-wrap msgid "@code{no-reset?} (default: @code{#f})" msgstr "@code{no-reset?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11654 +#: doc/guix.texi:11652 msgid "When @code{#t}, don't reset terminal cflags (control modes)." msgstr "Steht dies auf @code{#t}, werden die Cflags des Terminals (d.h.@: dessen Steuermodi) nicht zurückgesetzt." #. type: item -#: doc/guix.texi:11655 +#: doc/guix.texi:11653 #, no-wrap msgid "@code{host} (default: @code{#f})" msgstr "@code{host} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11658 +#: doc/guix.texi:11656 msgid "This accepts a string containing the \"login_host\", which will be written into the @file{/var/run/utmpx} file." msgstr "Dies akzeptiert eine Zeichenkette mit dem einzutragenden Anmeldungs-Rechnernamen \"login_host\", der in die Datei @file{/var/run/utmpx} geschrieben wird." #. type: item -#: doc/guix.texi:11659 +#: doc/guix.texi:11657 #, no-wrap msgid "@code{remote?} (default: @code{#f})" msgstr "@code{remote?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11663 +#: doc/guix.texi:11661 msgid "When set to @code{#t} in conjunction with @var{host}, this will add an @code{-r} fakehost option to the command line of the login program specified in @var{login-program}." msgstr "Ist dies auf @code{#t} gesetzt, wird in Verbindung mit @var{host} eine Befehlszeilenoption @code{-r} für einen falschen Rechnernamen („Fakehost“) in der Befehlszeile des mit @var{login-program} angegebenen Anmeldeprogramms übergeben." #. type: item -#: doc/guix.texi:11664 +#: doc/guix.texi:11662 #, no-wrap msgid "@code{flow-control?} (default: @code{#f})" msgstr "@code{flow-control?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11666 +#: doc/guix.texi:11664 msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control." msgstr "Ist dies auf @code{#t} gesetzt, wird Hardware-Flusssteuerung (RTS/CTS) aktiviert." #. type: item -#: doc/guix.texi:11667 +#: doc/guix.texi:11665 #, no-wrap msgid "@code{no-issue?} (default: @code{#f})" msgstr "@code{no-issue?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11670 +#: doc/guix.texi:11668 msgid "When set to @code{#t}, the contents of the @file{/etc/issue} file will not be displayed before presenting the login prompt." msgstr "Ist dies auf @code{#t} gesetzt, wird der Inhalt der Datei @file{/etc/issue} @emph{nicht} angezeigt, bevor die Anmeldeaufforderung zu sehen ist." #. type: item -#: doc/guix.texi:11671 +#: doc/guix.texi:11669 #, no-wrap msgid "@code{init-string} (default: @code{#f})" msgstr "@code{init-string} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11674 +#: doc/guix.texi:11672 msgid "This accepts a string that will be sent to the tty or modem before sending anything else. It can be used to initialize a modem." msgstr "Dies akzeptiert eine Zeichenkette, die zum tty oder zum Modem zuerst vor allem anderen gesendet wird. Es kann benutzt werden, um ein Modem zu initialisieren." #. type: item -#: doc/guix.texi:11675 +#: doc/guix.texi:11673 #, no-wrap msgid "@code{no-clear?} (default: @code{#f})" msgstr "@code{no-clear?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11678 +#: doc/guix.texi:11676 msgid "When set to @code{#t}, agetty will not clear the screen before showing the login prompt." msgstr "Ist dies auf @code{#t} gesetzt, wird agetty den Bildschirm @emph{nicht} löschen, bevor es die Anmeldeaufforderung anzeigt." #. type: item -#: doc/guix.texi:11679 +#: doc/guix.texi:11677 #, no-wrap msgid "@code{login-program} (default: (file-append shadow \"/bin/login\"))" msgstr "@code{login-program} (Vorgabe: (file-append shadow \"/bin/login\"))" #. type: table -#: doc/guix.texi:11683 +#: doc/guix.texi:11681 msgid "This must be either a gexp denoting the name of a log-in program, or unset, in which case the default value is the @command{login} from the Shadow tool suite." msgstr "Hier muss entweder ein G-Ausdruck mit dem Namen eines Anmeldeprogramms übergeben werden, oder dieses Feld wird nicht gesetzt, so dass als Vorgabewert das Programm @command{login} aus dem Shadow-Werkzeugsatz verwendet wird." #. type: item -#: doc/guix.texi:11684 +#: doc/guix.texi:11682 #, no-wrap msgid "@code{local-line} (default: @code{#f})" msgstr "@code{local-line} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11688 +#: doc/guix.texi:11686 msgid "Control the CLOCAL line flag. This accepts one of three symbols as arguments, @code{'auto}, @code{'always}, or @code{'never}. If @code{#f}, the default value chosen by agetty is @code{'auto}." msgstr "Steuert den Leitungsschalter CLOCAL. Hierfür wird eines von drei Symbolen als Argument akzeptiert, @code{'auto}, @code{'always} oder @code{'never}. Für @code{#f} wählt agetty als Vorgabewert @code{'auto}." #. type: item -#: doc/guix.texi:11689 +#: doc/guix.texi:11687 #, no-wrap msgid "@code{extract-baud?} (default: @code{#f})" msgstr "@code{extract-baud?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11692 +#: doc/guix.texi:11690 msgid "When set to @code{#t}, instruct agetty to try to extract the baud rate from the status messages produced by certain types of modems." msgstr "Ist dies auf @code{#t} gesetzt, so wird agetty angewiesen, die Baud-Rate aus den Statusmeldungen mancher Arten von Modem abzulesen." #. type: item -#: doc/guix.texi:11693 +#: doc/guix.texi:11691 #, no-wrap msgid "@code{skip-login?} (default: @code{#f})" msgstr "@code{skip-login?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11697 +#: doc/guix.texi:11695 msgid "When set to @code{#t}, do not prompt the user for a login name. This can be used with @var{login-program} field to use non-standard login systems." msgstr "Ist dies auf @code{#t} gesetzt, wird der Benutzer nicht aufgefordert, einen Anmeldenamen einzugeben. Dies kann zusammen mit dem @var{login-program}-Feld benutzt werden, um nicht standardkonforme Anmeldesysteme zu benutzen." #. type: item -#: doc/guix.texi:11698 +#: doc/guix.texi:11696 #, no-wrap msgid "@code{no-newline?} (default: @code{#f})" msgstr "@code{no-newline?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11701 +#: doc/guix.texi:11699 msgid "When set to @code{#t}, do not print a newline before printing the @file{/etc/issue} file." msgstr "Ist dies auf @code{#t} gesetzt, wird @emph{kein} Zeilenumbruch ausgegeben, bevor die Datei @file{/etc/issue} ausgegeben wird." #. type: item -#: doc/guix.texi:11703 +#: doc/guix.texi:11701 #, no-wrap msgid "@code{login-options} (default: @code{#f})" msgstr "@code{login-options} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11708 +#: doc/guix.texi:11706 msgid "This option accepts a string containing options that are passed to the login program. When used with the @var{login-program}, be aware that a malicious user could try to enter a login name containing embedded options that could be parsed by the login program." msgstr "Dieses Feld akzeptiert eine Zeichenkette mit den Befehlszeilenoptionen für das Anmeldeprogramm. Beachten Sie, dass bei einem selbst gewählten @var{login-program} ein böswilliger Nutzer versuchen könnte, als Anmeldenamen etwas mit eingebetteten Befehlszeilenoptionen anzugeben, die vom Anmeldeprogramm interpretiert werden könnten." #. type: item -#: doc/guix.texi:11709 +#: doc/guix.texi:11707 #, no-wrap msgid "@code{login-pause} (default: @code{#f})" msgstr "@code{login-pause} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11713 +#: doc/guix.texi:11711 msgid "When set to @code{#t}, wait for any key before showing the login prompt. This can be used in conjunction with @var{auto-login} to save memory by lazily spawning shells." msgstr "Ist dies auf @code{#t} gesetzt, wird auf das Drücken einer beliebigen Taste gewartet, bevor die Anmeldeaufforderung angezeigt wird. Hiermit kann in Verbindung mit @var{auto-login} weniger Speicher verbraucht werden, indem man Shells erst erzeugt, wenn sie benötigt werden." #. type: item -#: doc/guix.texi:11714 +#: doc/guix.texi:11712 #, no-wrap msgid "@code{chroot} (default: @code{#f})" msgstr "@code{chroot} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11717 +#: doc/guix.texi:11715 msgid "Change root to the specified directory. This option accepts a directory path as a string." msgstr "Wechselt die Wurzel des Dateisystems auf das angegebene Verzeichnis. Dieses Feld akzeptiert einen Verzeichnispfad als Zeichenkette." #. type: item -#: doc/guix.texi:11718 +#: doc/guix.texi:11716 #, no-wrap msgid "@code{hangup?} (default: @code{#f})" msgstr "@code{hangup?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11721 +#: doc/guix.texi:11719 msgid "Use the Linux system call @code{vhangup} to do a virtual hangup of the specified terminal." msgstr "Mit dem Linux-Systemaufruf @code{vhangup} auf dem angegebenen Terminal virtuell auflegen." #. type: item -#: doc/guix.texi:11722 +#: doc/guix.texi:11720 #, no-wrap msgid "@code{keep-baud?} (default: @code{#f})" msgstr "@code{keep-baud?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11726 +#: doc/guix.texi:11724 msgid "When set to @code{#t}, try to keep the existing baud rate. The baud rates from @var{baud-rate} are used when agetty receives a @key{BREAK} character." msgstr "Ist dies auf @code{#t} gesetzt, wird versucht, die bestehende Baud-Rate beizubehalten. Die Baud-Raten aus dem Feld @var{baud-rate} werden benutzt, wenn agetty ein @key{BREAK}-Zeichen empfängt." #. type: item -#: doc/guix.texi:11727 +#: doc/guix.texi:11725 #, no-wrap msgid "@code{timeout} (default: @code{#f})" msgstr "@code{timeout} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11730 +#: doc/guix.texi:11728 msgid "When set to an integer value, terminate if no user name could be read within @var{timeout} seconds." msgstr "Ist dies auf einen ganzzahligen Wert gesetzt, wird terminiert, falls kein Benutzername innerhalb von @var{timeout} Sekunden eingelesen werden konnte." #. type: item -#: doc/guix.texi:11731 +#: doc/guix.texi:11729 #, no-wrap msgid "@code{detect-case?} (default: @code{#f})" msgstr "@code{detect-case?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11737 +#: doc/guix.texi:11735 msgid "When set to @code{#t}, turn on support for detecting an uppercase-only terminal. This setting will detect a login name containing only uppercase letters as indicating an uppercase-only terminal and turn on some upper-to-lower case conversions. Note that this will not support Unicode characters." msgstr "Ist dies auf @code{#t} gesetzt, wird Unterstützung für die Erkennung von Terminals aktiviert, die nur Großschreibung beherrschen. Mit dieser Einstellung wird, wenn ein Anmeldename nur aus Großbuchstaben besteht, dieser als Anzeichen dafür aufgefasst, dass das Terminal nur Großbuchstaben beherrscht, und einige Umwandlungen von Groß- in Kleinbuchstaben aktiviert. Beachten Sie, dass dabei @emph{keine} Unicode-Zeichen unterstützt werden." #. type: item -#: doc/guix.texi:11738 +#: doc/guix.texi:11736 #, no-wrap msgid "@code{wait-cr?} (default: @code{#f})" msgstr "@code{wait-cr?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11743 +#: doc/guix.texi:11741 msgid "When set to @code{#t}, wait for the user or modem to send a carriage-return or linefeed character before displaying @file{/etc/issue} or login prompt. This is typically used with the @var{init-string} option." msgstr "Wenn dies auf @code{#t} gesetzt ist, wird gewartet, bis der Benutzer oder das Modem einen Wagenrücklauf („Carriage Return“) oder einen Zeilenvorschub („Linefeed“) absendet, ehe @file{/etc/issue} oder eine Anmeldeaufforderung angezeigt wird. Dies wird typischerweise zusammen mit dem Feld @var{init-string} benutzt." #. type: item -#: doc/guix.texi:11744 +#: doc/guix.texi:11742 #, no-wrap msgid "@code{no-hints?} (default: @code{#f})" msgstr "@code{no-hints?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11747 +#: doc/guix.texi:11745 msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks." msgstr "Ist es auf @code{#t} gesetzt, werden @emph{keine} Hinweise zu den Feststelltasten Num-Taste, Umschaltsperre („Caps Lock“) und Rollen-Taste („Scroll Lock“) angezeigt." #. type: item -#: doc/guix.texi:11748 +#: doc/guix.texi:11746 #, no-wrap msgid "@code{no-hostname?} (default: @code{#f})" msgstr "@code{no-hostname?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11751 +#: doc/guix.texi:11749 msgid "By default, the hostname is printed. When this option is set to @code{#t}, no hostname will be shown at all." msgstr "Das vorgegebene Verhalten ist, den Rechnernamen auszugeben. Ist dieses Feld auf @code{#t} gesetzt, wird überhaupt kein Rechnername angezeigt." #. type: item -#: doc/guix.texi:11752 +#: doc/guix.texi:11750 #, no-wrap msgid "@code{long-hostname?} (default: @code{#f})" msgstr "@code{long-hostname?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11756 +#: doc/guix.texi:11754 msgid "By default, the hostname is only printed until the first dot. When this option is set to @code{#t}, the fully qualified hostname by @code{gethostname} or @code{getaddrinfo} is shown." msgstr "Das vorgegebene Verhalten ist, den Rechnernamen nur bis zu seinem ersten Punkt anzuzeigen. Ist dieses Feld auf @code{#t} gesetzt, wird der vollständige Rechnername (der „Fully Qualified Hostname“), wie ihn @code{gethostname} oder @code{getaddrinfo} liefern, angezeigt." #. type: item -#: doc/guix.texi:11757 +#: doc/guix.texi:11755 #, no-wrap msgid "@code{erase-characters} (default: @code{#f})" msgstr "@code{erase-characters} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11760 +#: doc/guix.texi:11758 msgid "This option accepts a string of additional characters that should be interpreted as backspace when the user types their login name." msgstr "Dieses Feld akzeptiert eine Zeichenkette aus Zeichen, die auch als Rücktaste (zum Löschen) interpretiert werden sollen, wenn der Benutzer seinen Anmeldenamen eintippt." #. type: item -#: doc/guix.texi:11761 +#: doc/guix.texi:11759 #, no-wrap msgid "@code{kill-characters} (default: @code{#f})" msgstr "@code{kill-characters} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11765 +#: doc/guix.texi:11763 msgid "This option accepts a string that should be interpreted to mean \"ignore all previous characters\" (also called a \"kill\" character) when the user types their login name." msgstr "Dieses Feld akzeptiert eine Zeichenkette aus Zeichen, deren Eingabe als „ignoriere alle vorherigen Zeichen“ interpretiert werden soll (auch „Kill“-Zeichen genannt), wenn der Benutzer seinen Anmeldenamen eintippt." #. type: item -#: doc/guix.texi:11766 +#: doc/guix.texi:11764 #, no-wrap msgid "@code{chdir} (default: @code{#f})" msgstr "@code{chdir} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11769 +#: doc/guix.texi:11767 msgid "This option accepts, as a string, a directory path that will be changed to before login." msgstr "Dieses Feld akzeptiert eine Zeichenkette, die einen Verzeichnispfad angibt, zu dem vor der Anmeldung gewechselt wird." #. type: item -#: doc/guix.texi:11770 +#: doc/guix.texi:11768 #, no-wrap msgid "@code{delay} (default: @code{#f})" msgstr "@code{delay} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11773 +#: doc/guix.texi:11771 msgid "This options accepts, as an integer, the number of seconds to sleep before opening the tty and displaying the login prompt." msgstr "Dieses Feld akzeptiert eine ganze Zahl mit der Anzahl Sekunden, die gewartet werden soll, bis ein tty geöffnet und die Anmeldeaufforderung angezeigt wird." #. type: item -#: doc/guix.texi:11774 +#: doc/guix.texi:11772 #, no-wrap msgid "@code{nice} (default: @code{#f})" msgstr "@code{nice} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11777 +#: doc/guix.texi:11775 msgid "This option accepts, as an integer, the nice value with which to run the @command{login} program." msgstr "Dieses Feld akzeptiert eine ganze Zahl mit dem „nice“-Wert, mit dem das Anmeldeprogramm ausgeführt werden soll." #. type: item -#: doc/guix.texi:11778 doc/guix.texi:12009 doc/guix.texi:12696 -#: doc/guix.texi:19067 +#: doc/guix.texi:11776 doc/guix.texi:12007 doc/guix.texi:12694 +#: doc/guix.texi:19064 #, no-wrap msgid "@code{extra-options} (default: @code{'()})" msgstr "@code{extra-options} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:11781 +#: doc/guix.texi:11779 msgid "This option provides an \"escape hatch\" for the user to provide arbitrary command-line arguments to @command{agetty} as a list of strings." msgstr "Dieses Feld ist ein „Notausstieg“, mit dem Nutzer beliebige Befehlszeilenoptionen direkt an @command{agetty} übergeben können. Diese müssen hier als eine Liste von Zeichenketten angegeben werden." #. type: deffn -#: doc/guix.texi:11785 +#: doc/guix.texi:11783 #, no-wrap msgid "{Scheme Procedure} kmscon-service-type @var{config}" msgstr "{Scheme-Prozedur} kmscon-service-type @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11789 +#: doc/guix.texi:11787 msgid "Return a service to run @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} according to @var{config}, a @code{} object, which specifies the tty to run, among other things." msgstr "Liefert einen Dienst, um @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} entsprechend der @var{Konfiguration} auszuführen. Diese ist ein @code{}-Objekt, das unter anderem angibt, auf welchem tty es ausgeführt werden soll." #. type: deftp -#: doc/guix.texi:11791 +#: doc/guix.texi:11789 #, no-wrap msgid "{Data Type} kmscon-configuration" msgstr "{Datentyp} kmscon-configuration" #. type: deftp -#: doc/guix.texi:11794 +#: doc/guix.texi:11792 msgid "This is the data type representing the configuration of Kmscon, which implements virtual console log-in." msgstr "Dieser Datentyp repräsentiert die Konfiguration von Kmscon, die das Anmelden auf virtuellen Konsolen ermöglicht." #. type: code{#1} -#: doc/guix.texi:11797 +#: doc/guix.texi:11795 #, no-wrap msgid "virtual-terminal" msgstr "virtual-terminal" #. type: table -#: doc/guix.texi:11799 +#: doc/guix.texi:11797 msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}." msgstr "Der Name der Konsole, auf der diese Kmscon läuft — z.B.@: @code{\"tty1\"}." #. type: item -#: doc/guix.texi:11800 +#: doc/guix.texi:11798 #, no-wrap msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})" msgstr "@code{login-program} (Vorgabe: @code{#~(string-append #$shadow \"/bin/login\")})" #. type: table -#: doc/guix.texi:11803 +#: doc/guix.texi:11801 msgid "A gexp denoting the name of the log-in program. The default log-in program is @command{login} from the Shadow tool suite." msgstr "Ein G-Ausdruck, der den Namen des Anmeldeprogramms angibt. Als Vorgabe wird das Anmeldeprogramm @command{login} aus dem Shadow-Werkzeugsatz verwendet." #. type: item -#: doc/guix.texi:11804 +#: doc/guix.texi:11802 #, no-wrap msgid "@code{login-arguments} (default: @code{'(\"-p\")})" msgstr "@code{login-arguments} (Vorgabe: @code{'(\"-p\")})" #. type: table -#: doc/guix.texi:11806 +#: doc/guix.texi:11804 msgid "A list of arguments to pass to @command{login}." msgstr "Eine Liste der Argumente, die an @command{login} übergeben werden sollen." #. type: item -#: doc/guix.texi:11811 +#: doc/guix.texi:11809 #, no-wrap msgid "@code{hardware-acceleration?} (default: #f)" msgstr "@code{hardware-acceleration?} (Vorgabe: #f)" #. type: table -#: doc/guix.texi:11813 +#: doc/guix.texi:11811 msgid "Whether to use hardware acceleration." msgstr "Ob Hardware-Beschleunigung verwendet werden soll." #. type: item -#: doc/guix.texi:11814 +#: doc/guix.texi:11812 #, no-wrap msgid "@code{kmscon} (default: @var{kmscon})" msgstr "@code{kmscon} (Vorgabe: @var{kmscon})" #. type: table -#: doc/guix.texi:11816 +#: doc/guix.texi:11814 msgid "The Kmscon package to use." msgstr "Das Kmscon-Paket, das benutzt werden soll." #. type: cindex -#: doc/guix.texi:11820 +#: doc/guix.texi:11818 #, no-wrap msgid "name service cache daemon" msgstr "Name Service Cache Daemon" #. type: cindex -#: doc/guix.texi:11821 +#: doc/guix.texi:11819 #, no-wrap msgid "nscd" msgstr "nscd" #. type: deffn -#: doc/guix.texi:11822 +#: doc/guix.texi:11820 #, no-wrap msgid "{Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @" msgstr "{Scheme-Prozedur} nscd-service [@var{Konfiguration}] [#:glibc glibc] @" #. type: deffn -#: doc/guix.texi:11827 +#: doc/guix.texi:11825 msgid "[#:name-services '()] Return a service that runs the libc name service cache daemon (nscd) with the given @var{config}---an @code{} object. @xref{Name Service Switch}, for an example." msgstr "[#:name-services '()] Liefert einen Dienst, der den Name Service Cache Daemon (nscd) von libc mit der angegebenen @var{Konfiguration} ausführt — diese muss ein @code{}-Objekt sein. Siehe @ref{Name Service Switch} für ein Beispiel." #. type: deffn -#: doc/guix.texi:11829 +#: doc/guix.texi:11827 msgid "For convenience, the Shepherd service for nscd provides the following actions:" msgstr "Der Einfachheit halber bietet der Shepherd-Dienst für nscd die folgenden Aktionen an:" #. type: item -#: doc/guix.texi:11831 +#: doc/guix.texi:11829 #, no-wrap msgid "invalidate" msgstr "invalidate" #. type: cindex -#: doc/guix.texi:11832 +#: doc/guix.texi:11830 #, no-wrap msgid "cache invalidation, nscd" msgstr "Zwischenspeicher ungültig machen, nscd" #. type: cindex -#: doc/guix.texi:11833 +#: doc/guix.texi:11831 #, no-wrap msgid "nscd, cache invalidation" msgstr "nscd, Ungültigmachen des Zwischenspeichers" #. type: table -#: doc/guix.texi:11835 +#: doc/guix.texi:11833 msgid "This invalidate the given cache. For instance, running:" msgstr "Dies macht den angegebenen Zwischenspeicher ungültig. Wenn Sie zum Beispiel:" #. type: example -#: doc/guix.texi:11838 +#: doc/guix.texi:11836 #, no-wrap msgid "herd invalidate nscd hosts\n" msgstr "herd invalidate nscd hosts\n" #. type: table -#: doc/guix.texi:11842 +#: doc/guix.texi:11840 msgid "invalidates the host name lookup cache of nscd." msgstr "ausführen, wird der Zwischenspeicher für die Auflösung von Rechnernamen (von „Host“-Namen) des nscd ungültig." #. type: item -#: doc/guix.texi:11843 +#: doc/guix.texi:11841 #, no-wrap msgid "statistics" msgstr "statistics" #. type: table -#: doc/guix.texi:11846 +#: doc/guix.texi:11844 msgid "Running @command{herd statistics nscd} displays information about nscd usage and caches." msgstr "Wenn Sie @command{herd statistics nscd} ausführen, werden Ihnen Informationen angezeigt, welche Ihnen Informationen über den nscd-Zustand und die Zwischenspeicher angezeigt." #. type: defvr -#: doc/guix.texi:11850 +#: doc/guix.texi:11848 #, no-wrap msgid "{Scheme Variable} %nscd-default-configuration" msgstr "{Scheme-Variable} %nscd-default-configuration" #. type: defvr -#: doc/guix.texi:11854 +#: doc/guix.texi:11852 msgid "This is the default @code{} value (see below) used by @code{nscd-service}. It uses the caches defined by @var{%nscd-default-caches}; see below." msgstr "Dies ist der vorgegebene Wert für die @code{} (siehe unten), die @code{nscd-service} benutzt. Die Konfiguration benutzt die Zwischenspeicher, die in @var{%nscd-default-caches} definiert sind; siehe unten." #. type: deftp -#: doc/guix.texi:11856 +#: doc/guix.texi:11854 #, no-wrap msgid "{Data Type} nscd-configuration" msgstr "{Datentyp} nscd-configuration" #. type: deftp -#: doc/guix.texi:11859 +#: doc/guix.texi:11857 msgid "This is the data type representing the name service cache daemon (nscd) configuration." msgstr "Dieser Datentyp repräsentiert die Konfiguration des Name Service Caching Daemon (kurz „nscd“)." #. type: item -#: doc/guix.texi:11862 +#: doc/guix.texi:11860 #, no-wrap msgid "@code{name-services} (default: @code{'()})" msgstr "@code{name-services} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:11865 +#: doc/guix.texi:11863 msgid "List of packages denoting @dfn{name services} that must be visible to the nscd---e.g., @code{(list @var{nss-mdns})}." msgstr "Liste von Paketen, die @dfn{Namensdienste} bezeichnen, die für den nscd sichtbar sein müssen, z.B.@: @code{(list @var{nss-mdns})}." #. type: item -#: doc/guix.texi:11866 +#: doc/guix.texi:11864 #, no-wrap msgid "@code{glibc} (default: @var{glibc})" msgstr "@code{glibc} (Vorgabe: @var{glibc})" #. type: table -#: doc/guix.texi:11869 +#: doc/guix.texi:11867 msgid "Package object denoting the GNU C Library providing the @command{nscd} command." msgstr "Ein Paket-Objekt, das die GNU-C-Bibliothek angibt, woraus der @command{nscd}-Befehl genommen werden soll." #. type: item -#: doc/guix.texi:11870 +#: doc/guix.texi:11868 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})" msgstr "@code{log-file} (Vorgabe: @code{\"/var/log/nscd.log\"})" #. type: table -#: doc/guix.texi:11873 +#: doc/guix.texi:11871 msgid "Name of the nscd log file. This is where debugging output goes when @code{debug-level} is strictly positive." msgstr "Name der nscd-Protokolldatei. Hierhin werden Ausgaben zur Fehlersuche geschrieben, falls @code{debug-level} echt positiv ist." #. type: item -#: doc/guix.texi:11874 +#: doc/guix.texi:11872 #, no-wrap msgid "@code{debug-level} (default: @code{0})" msgstr "@code{debug-level} (Vorgabe: @code{0})" #. type: table -#: doc/guix.texi:11877 +#: doc/guix.texi:11875 msgid "Integer denoting the debugging levels. Higher numbers mean that more debugging output is logged." msgstr "Eine ganze Zahl, die den Detailgrad der Ausgabe zur Fehlersuche angibt. Größere Zahlen bewirken eine ausführlichere Ausgabe." #. type: item -#: doc/guix.texi:11878 +#: doc/guix.texi:11876 #, no-wrap msgid "@code{caches} (default: @var{%nscd-default-caches})" msgstr "@code{caches} (Vorgabe: @var{%nscd-default-caches})" #. type: table -#: doc/guix.texi:11881 +#: doc/guix.texi:11879 msgid "List of @code{} objects denoting things to be cached; see below." msgstr "Liste der @code{}-Objekte, die repräsentieren, was alles zwischengespeichert werden soll; siehe unten." #. type: deftp -#: doc/guix.texi:11885 +#: doc/guix.texi:11883 #, no-wrap msgid "{Data Type} nscd-cache" msgstr "{Datentyp} nscd-cache" #. type: deftp -#: doc/guix.texi:11887 +#: doc/guix.texi:11885 msgid "Data type representing a cache database of nscd and its parameters." msgstr "Ein Datentyp, der eine Zwischenspeicher-Datenbank von nscd mitsamt ihren Parametern definiert." #. type: cindex -#: doc/guix.texi:11890 doc/guix.texi:15091 +#: doc/guix.texi:11888 doc/guix.texi:15088 #, no-wrap msgid "database" msgstr "Datenbank" #. type: table -#: doc/guix.texi:11895 +#: doc/guix.texi:11893 msgid "This is a symbol representing the name of the database to be cached. Valid values are @code{passwd}, @code{group}, @code{hosts}, and @code{services}, which designate the corresponding NSS database (@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual})." msgstr "Dies ist ein Symbol, was den Namen der Datenbank repräsentiert, die zwischengespeichert werden soll. Gültige Werte sind @code{passwd}, @code{group}, @code{hosts} und @code{services}, womit jeweils die entsprechende NSS-Datenbank bezeichnet wird (siehe @ref{NSS Basics,,, libc, The GNU C Library Reference Manual})." #. type: code{#1} -#: doc/guix.texi:11896 +#: doc/guix.texi:11894 #, no-wrap msgid "positive-time-to-live" msgstr "positive-time-to-live" #. type: itemx -#: doc/guix.texi:11897 +#: doc/guix.texi:11895 #, no-wrap msgid "@code{negative-time-to-live} (default: @code{20})" msgstr "@code{negative-time-to-live} (Vorgabe: @code{20})" #. type: table -#: doc/guix.texi:11900 +#: doc/guix.texi:11898 msgid "A number representing the number of seconds during which a positive or negative lookup result remains in cache." msgstr "Eine Zahl, die für die Anzahl an Sekunden steht, die ein erfolgreiches (positives) oder erfolgloses (negatives) Nachschlageresultat im Zwischenspeicher verbleibt." #. type: item -#: doc/guix.texi:11901 +#: doc/guix.texi:11899 #, no-wrap msgid "@code{check-files?} (default: @code{#t})" msgstr "@code{check-files?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11904 +#: doc/guix.texi:11902 msgid "Whether to check for updates of the files corresponding to @var{database}." msgstr "Ob auf Änderungen an den der @var{database} entsprechenden Dateien reagiert werden soll." #. type: table -#: doc/guix.texi:11908 +#: doc/guix.texi:11906 msgid "For instance, when @var{database} is @code{hosts}, setting this flag instructs nscd to check for updates in @file{/etc/hosts} and to take them into account." msgstr "Wenn @var{database} zum Beispiel @code{hosts} ist, wird, wenn dieses Feld gesetzt ist, nscd Änderungen an @file{/etc/hosts} beobachten und berücksichtigen." #. type: item -#: doc/guix.texi:11909 +#: doc/guix.texi:11907 #, no-wrap msgid "@code{persistent?} (default: @code{#t})" msgstr "@code{persistent?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11911 +#: doc/guix.texi:11909 msgid "Whether the cache should be stored persistently on disk." msgstr "Ob der Zwischenspeicher dauerhaft auf der Platte gespeichert werden soll." #. type: item -#: doc/guix.texi:11912 +#: doc/guix.texi:11910 #, no-wrap msgid "@code{shared?} (default: @code{#t})" msgstr "@code{shared?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11914 +#: doc/guix.texi:11912 msgid "Whether the cache should be shared among users." msgstr "Ob der Zwischenspeicher zwischen den Nutzern geteilt werden soll." #. type: item -#: doc/guix.texi:11915 +#: doc/guix.texi:11913 #, no-wrap msgid "@code{max-database-size} (default: 32@tie{}MiB)" msgstr "@code{max-database-size} (Vorgabe: 32@tie{}MiB)" #. type: table -#: doc/guix.texi:11917 +#: doc/guix.texi:11915 msgid "Maximum size in bytes of the database cache." msgstr "Die Maximalgröße des Datenbank-Zwischenspeichers in Bytes." #. type: defvr -#: doc/guix.texi:11924 +#: doc/guix.texi:11922 #, no-wrap msgid "{Scheme Variable} %nscd-default-caches" msgstr "{Scheme-Variable} %nscd-default-caches" #. type: defvr -#: doc/guix.texi:11927 +#: doc/guix.texi:11925 msgid "List of @code{} objects used by default by @code{nscd-configuration} (see above)." msgstr "Liste von @code{}-Objekten, die von der vorgegebenen @code{nscd-configuration} benutzt werden (siehe oben)." #. type: defvr -#: doc/guix.texi:11933 +#: doc/guix.texi:11931 msgid "It enables persistent and aggressive caching of service and host name lookups. The latter provides better host name lookup performance, resilience in the face of unreliable name servers, and also better privacy---often the result of host name lookups is in local cache, so external name servers do not even need to be queried." msgstr "Damit wird dauerhaftes und aggressives Zwischenspeichern beim Nachschlagen von Dienst- und Rechnernamen („Host“-Namen) aktiviert. Letzteres verbessert die Leistungsfähigkeit beim Nachschlagen von Rechnernamen, sorgt für mehr Widerstandsfähigkeit gegenüber unverlässlichen Namens-Servern und bietet außerdem einen besseren Datenschutz — oftmals befindet sich das Ergebnis einer Anfrage nach einem Rechnernamen bereits im lokalen Zwischenspeicher und externe Namens-Server müssen nicht miteinbezogen werden." #. type: anchor{#1} -#: doc/guix.texi:11936 +#: doc/guix.texi:11934 msgid "syslog-configuration-type" msgstr "syslog-configuration-type" #. type: cindex -#: doc/guix.texi:11936 doc/guix.texi:11952 +#: doc/guix.texi:11934 doc/guix.texi:11950 #, no-wrap msgid "syslog" msgstr "syslog" #. type: cindex -#: doc/guix.texi:11937 doc/guix.texi:12374 +#: doc/guix.texi:11935 doc/guix.texi:12372 #, no-wrap msgid "logging" msgstr "Protokollierung" #. type: deftp -#: doc/guix.texi:11938 +#: doc/guix.texi:11936 #, no-wrap msgid "{Data Type} syslog-configuration" msgstr "{Datentyp} syslog-configuration" #. type: deftp -#: doc/guix.texi:11940 +#: doc/guix.texi:11938 msgid "This data type represents the configuration of the syslog daemon." msgstr "Dieser Datentyp repräsentiert die Konfiguration des syslog-Daemons." #. type: item -#: doc/guix.texi:11942 +#: doc/guix.texi:11940 #, no-wrap msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" msgstr "@code{syslogd} (Vorgabe: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" #. type: table -#: doc/guix.texi:11944 +#: doc/guix.texi:11942 msgid "The syslog daemon to use." msgstr "Welcher Syslog-Daemon benutzt werden soll." #. type: item -#: doc/guix.texi:11945 +#: doc/guix.texi:11943 #, no-wrap msgid "@code{config-file} (default: @code{%default-syslog.conf})" msgstr "@code{config-file} (Vorgabe: @code{%default-syslog.conf})" #. type: table -#: doc/guix.texi:11947 +#: doc/guix.texi:11945 msgid "The syslog configuration file to use." msgstr "Die zu benutzende syslog-Konfigurationsdatei." #. type: anchor{#1} -#: doc/guix.texi:11952 +#: doc/guix.texi:11950 msgid "syslog-service" msgstr "syslog-service" #. type: deffn -#: doc/guix.texi:11953 +#: doc/guix.texi:11951 #, no-wrap msgid "{Scheme Procedure} syslog-service @var{config}" msgstr "{Scheme-Prozedur} syslog-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11955 +#: doc/guix.texi:11953 msgid "Return a service that runs a syslog daemon according to @var{config}." msgstr "Liefert einen Dienst, der einen syslog-Daemon entsprechend der @var{Konfiguration} ausführt." #. type: deffn -#: doc/guix.texi:11958 +#: doc/guix.texi:11956 msgid "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information on the configuration file syntax." msgstr "Siehe @ref{syslogd invocation,,, inetutils, GNU Inetutils} für weitere Informationen über die Syntax der Konfiguration." #. type: defvr -#: doc/guix.texi:11960 +#: doc/guix.texi:11958 #, no-wrap msgid "{Scheme Variable} guix-service-type" msgstr "{Scheme-Variable} guix-service-type" #. type: defvr -#: doc/guix.texi:11964 +#: doc/guix.texi:11962 msgid "This is the type of the service that runs the build daemon, @command{guix-daemon} (@pxref{Invoking guix-daemon}). Its value must be a @code{guix-configuration} record as described below." msgstr "Dies ist der Typ für den Dienst, der den Erstellungs-Daemon @command{guix-daemon} ausführt (siehe @ref{Invoking guix-daemon}). Als Wert muss ein @code{guix-configuration}-Verbundsobjekt verwendet werden, wie unten beschrieben." #. type: anchor{#1} -#: doc/guix.texi:11967 +#: doc/guix.texi:11965 msgid "guix-configuration-type" msgstr "guix-configuration-type" #. type: deftp -#: doc/guix.texi:11967 +#: doc/guix.texi:11965 #, no-wrap msgid "{Data Type} guix-configuration" msgstr "{Datentyp} guix-configuration" #. type: deftp -#: doc/guix.texi:11970 +#: doc/guix.texi:11968 msgid "This data type represents the configuration of the Guix build daemon. @xref{Invoking guix-daemon}, for more information." msgstr "Dieser Datentyp repräsentiert die Konfiguration des Erstellungs-Daemons von Guix. Siehe @ref{Invoking guix-daemon} für weitere Informationen." #. type: item -#: doc/guix.texi:11972 +#: doc/guix.texi:11970 #, no-wrap msgid "@code{guix} (default: @var{guix})" msgstr "@code{guix} (Vorgabe: @var{guix})" #. type: table -#: doc/guix.texi:11974 doc/guix.texi:12194 +#: doc/guix.texi:11972 doc/guix.texi:12192 msgid "The Guix package to use." msgstr "Das zu verwendende Guix-Paket." #. type: item -#: doc/guix.texi:11975 +#: doc/guix.texi:11973 #, no-wrap msgid "@code{build-group} (default: @code{\"guixbuild\"})" msgstr "@code{build-group} (Vorgabe: @code{\"guixbuild\"})" #. type: table -#: doc/guix.texi:11977 +#: doc/guix.texi:11975 msgid "Name of the group for build user accounts." msgstr "Der Name der Gruppe, zu der die Erstellungs-Benutzerkonten gehören." #. type: item -#: doc/guix.texi:11978 +#: doc/guix.texi:11976 #, no-wrap msgid "@code{build-accounts} (default: @code{10})" msgstr "@code{build-accounts} (Vorgabe: @code{10})" #. type: table -#: doc/guix.texi:11980 +#: doc/guix.texi:11978 msgid "Number of build user accounts to create." msgstr "Die Anzahl zu erzeugender Erstellungs-Benutzerkonten." #. type: item -#: doc/guix.texi:11981 +#: doc/guix.texi:11979 #, no-wrap msgid "@code{authorize-key?} (default: @code{#t})" msgstr "@code{authorize-key?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11986 +#: doc/guix.texi:11984 msgid "Whether to authorize the substitute keys listed in @code{authorized-keys}---by default that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})." msgstr "Ob die unter @code{authorized-keys} aufgelisteten Substitutschlüssel autorisiert werden sollen — vorgegeben ist, den von @code{@value{SUBSTITUTE-SERVER}} zu autorisieren (siehe @ref{Substitutes})." #. type: vindex -#: doc/guix.texi:11987 +#: doc/guix.texi:11985 #, no-wrap msgid "%default-authorized-guix-keys" msgstr "%default-authorized-guix-keys" #. type: item -#: doc/guix.texi:11988 +#: doc/guix.texi:11986 #, no-wrap msgid "@code{authorized-keys} (default: @var{%default-authorized-guix-keys})" msgstr "@code{authorized-keys} (Vorgabe: @var{%default-authorized-guix-keys})" #. type: table -#: doc/guix.texi:11992 +#: doc/guix.texi:11990 msgid "The list of authorized key files for archive imports, as a list of string-valued gexps (@pxref{Invoking guix archive}). By default, it contains that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})." msgstr "Die Liste der Dateien mit autorisierten Schlüsseln, d.h.@: eine Liste von Zeichenketten als G-Ausdrücke (siehe @ref{Invoking guix archive}). Der vorgegebene Inhalt ist der Schlüssel von @code{@value{SUBSTITUTE-SERVER}} (siehe @ref{Substitutes})." #. type: item -#: doc/guix.texi:11993 +#: doc/guix.texi:11991 #, no-wrap msgid "@code{use-substitutes?} (default: @code{#t})" msgstr "@code{use-substitutes?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11995 +#: doc/guix.texi:11993 msgid "Whether to use substitutes." msgstr "Ob Substitute benutzt werden sollen." #. type: item -#: doc/guix.texi:11996 +#: doc/guix.texi:11994 #, no-wrap msgid "@code{substitute-urls} (default: @var{%default-substitute-urls})" msgstr "@code{substitute-urls} (Vorgabe: @var{%default-substitute-urls})" #. type: table -#: doc/guix.texi:11998 +#: doc/guix.texi:11996 msgid "The list of URLs where to look for substitutes by default." msgstr "Die Liste der URLs, auf denen nach Substituten gesucht wird, wenn nicht anders angegeben." #. type: item -#: doc/guix.texi:11999 +#: doc/guix.texi:11997 #, no-wrap msgid "@code{max-silent-time} (default: @code{0})" msgstr "@code{max-silent-time} (Vorgabe: @code{0})" #. type: itemx -#: doc/guix.texi:12000 +#: doc/guix.texi:11998 #, no-wrap msgid "@code{timeout} (default: @code{0})" msgstr "@code{timeout} (Vorgabe: @code{0})" #. type: table -#: doc/guix.texi:12004 +#: doc/guix.texi:12002 msgid "The number of seconds of silence and the number of seconds of activity, respectively, after which a build process times out. A value of zero disables the timeout." msgstr "Die Anzahl an Sekunden, die jeweils nichts in die Ausgabe geschrieben werden darf bzw. die es insgesamt dauern darf, bis ein Erstellungsprozess abgebrochen wird. Beim Wert null wird nie abgebrochen." #. type: item -#: doc/guix.texi:12005 +#: doc/guix.texi:12003 #, no-wrap msgid "@code{log-compression} (default: @code{'bzip2})" msgstr "@code{log-compression} (Vorgabe: @code{'bzip2})" #. type: table -#: doc/guix.texi:12008 +#: doc/guix.texi:12006 msgid "The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}." msgstr "Die für Erstellungsprotokolle zu benutzende Kompressionsmethode — entweder @code{gzip}, @code{bzip2} oder @code{none}." #. type: table -#: doc/guix.texi:12011 +#: doc/guix.texi:12009 msgid "List of extra command-line options for @command{guix-daemon}." msgstr "Eine Liste zusätzlicher Befehlszeilenoptionen zu @command{guix-daemon}." #. type: item -#: doc/guix.texi:12012 +#: doc/guix.texi:12010 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})" msgstr "@code{log-file} (Vorgabe: @code{\"/var/log/guix-daemon.log\"})" #. type: table -#: doc/guix.texi:12015 +#: doc/guix.texi:12013 msgid "File where @command{guix-daemon}'s standard output and standard error are written." msgstr "Die Datei, in die die Standardausgabe und die Standardfehlerausgabe von @command{guix-daemon} geschrieben werden." #. type: item -#: doc/guix.texi:12016 +#: doc/guix.texi:12014 #, no-wrap msgid "@code{http-proxy} (default: @code{#f})" msgstr "@code{http-proxy} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12019 +#: doc/guix.texi:12017 msgid "The HTTP proxy used for downloading fixed-output derivations and substitutes." msgstr "Der für das Herunterladen von Ableitungen mit fester Ausgabe und von Substituten zu verwendende HTTP-Proxy." #. type: item -#: doc/guix.texi:12020 +#: doc/guix.texi:12018 #, no-wrap msgid "@code{tmpdir} (default: @code{#f})" msgstr "@code{tmpdir} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12022 +#: doc/guix.texi:12020 msgid "A directory path where the @command{guix-daemon} will perform builds." msgstr "Ein Verzeichnispfad, der angibt, wo @command{guix-daemon} seine Erstellungen durchführt." #. type: deffn -#: doc/guix.texi:12026 +#: doc/guix.texi:12024 #, no-wrap msgid "{Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]" msgstr "{Scheme-Prozedur} udev-service [#:udev @var{eudev} #:rules @code{'()}]" #. type: deffn -#: doc/guix.texi:12031 +#: doc/guix.texi:12029 msgid "Run @var{udev}, which populates the @file{/dev} directory dynamically. udev rules can be provided as a list of files through the @var{rules} variable. The procedures @code{udev-rule} and @code{file->udev-rule} from @code{(gnu services base)} simplify the creation of such rule files." msgstr "Führt @var{udev} aus, was zur Laufzeit Gerätedateien ins Verzeichnis @file{/dev} einfügt. udev-Regeln können über die @var{rules}-Variable als eine Liste von Dateien übergeben werden. Die Prozeduren @code{udev-rule} und @code{file->udev-rule} aus @code{(gnu services base)} vereinfachen die Erstellung einer solchen Regeldatei." #. type: deffn -#: doc/guix.texi:12033 +#: doc/guix.texi:12031 #, no-wrap msgid "{Scheme Procedure} udev-rule [@var{file-name} @var{contents}]" msgstr "{Scheme-Prozedur} udev-rule [@var{Dateiname} @var{Inhalt}]" #. type: deffn -#: doc/guix.texi:12036 +#: doc/guix.texi:12034 msgid "Return a udev-rule file named @var{file-name} containing the rules defined by the @var{contents} literal." msgstr "Liefert eine udev-Regeldatei mit dem angegebenen @var{Dateiname}n, in der die vom Literal @var{Inhalt} definierten Regeln stehen." #. type: deffn -#: doc/guix.texi:12040 +#: doc/guix.texi:12038 msgid "In the following example, a rule for a USB device is defined to be stored in the file @file{90-usb-thing.rules}. The rule runs a script upon detecting a USB device with a given product identifier." msgstr "Im folgenden Beispiel wird eine Regel für ein USB-Gerät definiert und in der Datei @file{90-usb-ding.rules} gespeichert. Mit der Regel wird ein Skript ausgeführt, sobald ein USB-Gerät mit der angegebenen Produktkennung erkannt wird." #. type: example -#: doc/guix.texi:12048 +#: doc/guix.texi:12046 #, no-wrap msgid "" "(define %example-udev-rule\n" @@ -21780,17 +21791,17 @@ msgstr "" " \"RUN+=\\\"/pfad/zum/skript\\\"\")))\n" #. type: deffn -#: doc/guix.texi:12052 +#: doc/guix.texi:12050 msgid "The @command{herd rules udev} command, as root, returns the name of the directory containing all the active udev rules." msgstr "Der Befehl @command{herd rules udev} liefert, wenn er als Administratornutzer „root“ ausgeführt wird, Namen und Verzeichnis von allen aktiven udev-Regeln." #. type: Plain text -#: doc/guix.texi:12055 +#: doc/guix.texi:12053 msgid "Here we show how the default @var{udev-service} can be extended with it." msgstr "Hier zeigen wir, wie man den vorgegebenen @var{udev-service} um sie erweitern kann." #. type: example -#: doc/guix.texi:12065 +#: doc/guix.texi:12063 #, no-wrap msgid "" "(operating-system\n" @@ -21812,23 +21823,23 @@ msgstr "" " (list %beispiel-udev-rule))))))))\n" #. type: deffn -#: doc/guix.texi:12067 +#: doc/guix.texi:12065 #, no-wrap msgid "{Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]" msgstr "{Scheme-Prozedur} file->udev-rule [@var{Dateiname} @var{Datei}]" #. type: deffn -#: doc/guix.texi:12070 +#: doc/guix.texi:12068 msgid "Return a udev file named @var{file-name} containing the rules defined within @var{file}, a file-like object." msgstr "Liefert eine udev-Datei mit dem angegebenen @var{Dateiname}n, in der alle in der @var{Datei}, einem dateiartigen Objekt, definierten Regeln stehen." #. type: deffn -#: doc/guix.texi:12072 +#: doc/guix.texi:12070 msgid "The following example showcases how we can use an existing rule file." msgstr "Folgendes Beispiel stellt dar, wie wir eine bestehende Regeldatei verwenden können." #. type: example -#: doc/guix.texi:12077 +#: doc/guix.texi:12075 #, no-wrap msgid "" "(use-modules (guix download) ;for url-fetch\n" @@ -21842,7 +21853,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12088 +#: doc/guix.texi:12086 #, no-wrap msgid "" "(define %android-udev-rules\n" @@ -21868,17 +21879,17 @@ msgstr "" " (base32 \"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n" #. type: Plain text -#: doc/guix.texi:12097 +#: doc/guix.texi:12095 msgid "Additionally, Guix package definitions can be included in @var{rules} in order to extend the udev rules with the definitions found under their @file{lib/udev/rules.d} sub-directory. In lieu of the previous @var{file->udev-rule} example, we could have used the @var{android-udev-rules} package which exists in Guix in the @code{(gnu packages android)} module." msgstr "Zusätzlich können Guix-Paketdefinitionen unter den @var{rules} aufgeführt werden, um die udev-Regeln um diejenigen Definitionen zu ergänzen, die im Unterverzeichnis @file{lib/udev/rules.d} des jeweiligen Pakets aufgeführt sind. Statt des bisherigen Beispiels zu @var{file->udev-rule} hätten wir also auch das Paket @var{android-udev-rules} benutzen können, das in Guix im Modul @code{(gnu packages android)} vorhanden ist." #. type: Plain text -#: doc/guix.texi:12106 +#: doc/guix.texi:12104 msgid "The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices without root privileges. It also details how to create the @code{adbusers} group, which is required for the proper functioning of the rules defined within the @var{android-udev-rules} package. To create such a group, we must define it both as part of the @var{supplementary-groups} of our @var{user-account} declaration, as well as in the @var{groups} field of the @var{operating-system} record." msgstr "Das folgende Beispiel zeit, wie dieses Paket @var{android-udev-rules} benutzt werden kann, damit das „Android-Tool“ @command{adb} Geräte erkennen kann, ohne dafür Administratorrechte vorauszusetzen. Man sieht hier auch, wie die Benutzergruppe @code{adbusers} erstellt werden kann, die existieren muss, damit die im Paket @var{android-udev-rules} definierten Regeln richtig funktionieren. Um so eine Benutzergruppe zu erzeugen, müssen wir sie sowohl unter den @var{supplementary-groups} unserer @var{user-account}-Deklaration aufführen, als auch sie im @var{groups}-Feld des @var{operating-system}-Verbundsobjekts aufführen." #. type: example -#: doc/guix.texi:12111 +#: doc/guix.texi:12109 #, no-wrap msgid "" "(use-modules (gnu packages android) ;for android-udev-rules\n" @@ -21892,7 +21903,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12120 +#: doc/guix.texi:12118 #, no-wrap msgid "" "(operating-system\n" @@ -21916,7 +21927,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12123 +#: doc/guix.texi:12121 #, no-wrap msgid "" " (groups (cons (user-group (system? #t) (name \"adbusers\"))\n" @@ -21928,7 +21939,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12125 +#: doc/guix.texi:12123 #, no-wrap msgid "" " ;; @dots{}\n" @@ -21938,7 +21949,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12133 +#: doc/guix.texi:12131 #, no-wrap msgid "" " (services\n" @@ -21958,266 +21969,266 @@ msgstr "" " (udev-configuration-rules config))))))))\n" #. type: defvr -#: doc/guix.texi:12135 +#: doc/guix.texi:12133 #, no-wrap msgid "{Scheme Variable} urandom-seed-service-type" msgstr "{Scheme-Variable} urandom-seed-service-type" #. type: defvr -#: doc/guix.texi:12140 +#: doc/guix.texi:12138 msgid "Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom} when rebooting. It also tries to seed @file{/dev/urandom} from @file{/dev/hwrng} while booting, if @file{/dev/hwrng} exists and is readable." msgstr "Etwas Entropie in der Datei @var{%random-seed-file} aufsparen, die als Startwert (als sogenannter „Seed“) für @file{/dev/urandom} dienen kann, nachdem das System neu gestartet wurde. Es wird auch versucht, @file{/dev/urandom} beim Hochfahren mit Werten aus @file{/dev/hwrng} zu starten, falls @file{/dev/hwrng} existiert und lesbar ist." #. type: defvr -#: doc/guix.texi:12142 +#: doc/guix.texi:12140 #, no-wrap msgid "{Scheme Variable} %random-seed-file" msgstr "{Scheme-Variable} %random-seed-file" #. type: defvr -#: doc/guix.texi:12146 +#: doc/guix.texi:12144 msgid "This is the name of the file where some random bytes are saved by @var{urandom-seed-service} to seed @file{/dev/urandom} when rebooting. It defaults to @file{/var/lib/random-seed}." msgstr "Der Name der Datei, in der einige zufällige Bytes vom @var{urandom-seed-service} abgespeichert werden, um sie nach einem Neustart von dort als Startwert für @file{/dev/urandom} auslesen zu können. Als Vorgabe wird @file{/var/lib/random-seed} verwendet." #. type: cindex -#: doc/guix.texi:12148 +#: doc/guix.texi:12146 #, no-wrap msgid "mouse" msgstr "Maus" #. type: cindex -#: doc/guix.texi:12149 +#: doc/guix.texi:12147 #, no-wrap msgid "gpm" msgstr "gpm" #. type: defvr -#: doc/guix.texi:12150 +#: doc/guix.texi:12148 #, no-wrap msgid "{Scheme Variable} gpm-service-type" msgstr "{Scheme-Variable} gpm-service-type" #. type: defvr -#: doc/guix.texi:12155 +#: doc/guix.texi:12153 msgid "This is the type of the service that runs GPM, the @dfn{general-purpose mouse daemon}, which provides mouse support to the Linux console. GPM allows users to use the mouse in the console, notably to select, copy, and paste text." msgstr "Dieser Typ wird für den Dienst verwendet, der GPM ausführt, den @dfn{General-Purpose Mouse Daemon}, welcher zur Linux-Konsole Mausunterstützung hinzufügt. GPM ermöglicht es seinen Benutzern, auch in der Konsole die Maus zu benutzen und damit etwa Text auszuwählen, zu kopieren und einzufügen." #. type: defvr -#: doc/guix.texi:12158 +#: doc/guix.texi:12156 msgid "The value for services of this type must be a @code{gpm-configuration} (see below). This service is not part of @var{%base-services}." msgstr "Der Wert für Dienste dieses Typs muss eine @code{gpm-configuration} sein (siehe unten). Dieser Dienst gehört @emph{nicht} zu den @var{%base-services}." #. type: deftp -#: doc/guix.texi:12160 +#: doc/guix.texi:12158 #, no-wrap msgid "{Data Type} gpm-configuration" msgstr "{Datentyp} gpm-configuration" #. type: deftp -#: doc/guix.texi:12162 +#: doc/guix.texi:12160 msgid "Data type representing the configuration of GPM." msgstr "Repräsentiert die Konfiguration von GPM." #. type: item -#: doc/guix.texi:12164 +#: doc/guix.texi:12162 #, no-wrap msgid "@code{options} (default: @code{%default-gpm-options})" msgstr "@code{options} (Vorgabe: @code{%default-gpm-options})" #. type: table -#: doc/guix.texi:12169 +#: doc/guix.texi:12167 msgid "Command-line options passed to @command{gpm}. The default set of options instruct @command{gpm} to listen to mouse events on @file{/dev/input/mice}. @xref{Command Line,,, gpm, gpm manual}, for more information." msgstr "Befehlszeilenoptionen, die an @command{gpm} übergeben werden. Die vorgegebenen Optionen weisen @command{gpm} an, auf Maus-Ereignisse auf der Datei @file{/dev/input/mice} zu lauschen. Siehe @ref{Command Line,,, gpm, gpm manual} für weitere Informationen." #. type: item -#: doc/guix.texi:12170 +#: doc/guix.texi:12168 #, no-wrap msgid "@code{gpm} (default: @code{gpm})" msgstr "@code{gpm} (Vorgabe: @code{gpm})" #. type: table -#: doc/guix.texi:12172 +#: doc/guix.texi:12170 msgid "The GPM package to use." msgstr "Das GPM-Paket, was benutzt werden soll." #. type: anchor{#1} -#: doc/guix.texi:12177 +#: doc/guix.texi:12175 msgid "guix-publish-service-type" msgstr "guix-publish-service-type" #. type: deffn -#: doc/guix.texi:12177 +#: doc/guix.texi:12175 #, no-wrap msgid "{Scheme Variable} guix-publish-service-type" msgstr "{Scheme-Variable} guix-publish-service-type" #. type: deffn -#: doc/guix.texi:12181 +#: doc/guix.texi:12179 msgid "This is the service type for @command{guix publish} (@pxref{Invoking guix publish}). Its value must be a @code{guix-configuration} object, as described below." msgstr "Dies ist der Diensttyp für @command{guix publish} (siehe @ref{Invoking guix publish}). Sein Wert muss ein @code{guix-publish-configuration}-Objekt sein, wie im Folgenden beschrieben." #. type: deffn -#: doc/guix.texi:12185 +#: doc/guix.texi:12183 msgid "This assumes that @file{/etc/guix} already contains a signing key pair as created by @command{guix archive --generate-key} (@pxref{Invoking guix archive}). If that is not the case, the service will fail to start." msgstr "Hierbei wird angenommen, dass @file{/etc/guix} bereits ein mit @command{guix archive --generate-key} erzeugtes Schlüsselpaar zum Signieren enthält (siehe @ref{Invoking guix archive}). Falls nicht, wird der Dienst beim Starten fehlschlagen." #. type: deftp -#: doc/guix.texi:12187 +#: doc/guix.texi:12185 #, no-wrap msgid "{Data Type} guix-publish-configuration" msgstr "{Datentyp} guix-publish-configuration" #. type: deftp -#: doc/guix.texi:12190 +#: doc/guix.texi:12188 msgid "Data type representing the configuration of the @code{guix publish} service." msgstr "Der Datentyp, der die Konfiguration des „@code{guix publish}“-Dienstes repräsentiert." #. type: item -#: doc/guix.texi:12192 +#: doc/guix.texi:12190 #, no-wrap msgid "@code{guix} (default: @code{guix})" msgstr "@code{guix} (Vorgabe: @code{guix})" #. type: item -#: doc/guix.texi:12195 +#: doc/guix.texi:12193 #, no-wrap msgid "@code{port} (default: @code{80})" msgstr "@code{port} (Vorgabe: @code{80})" #. type: table -#: doc/guix.texi:12197 +#: doc/guix.texi:12195 msgid "The TCP port to listen for connections." msgstr "Der TCP-Port, auf dem auf Verbindungen gelauscht werden soll." #. type: item -#: doc/guix.texi:12198 +#: doc/guix.texi:12196 #, no-wrap msgid "@code{host} (default: @code{\"localhost\"})" msgstr "@code{host} (Vorgabe: @code{\"localhost\"})" #. type: table -#: doc/guix.texi:12201 +#: doc/guix.texi:12199 msgid "The host (and thus, network interface) to listen to. Use @code{\"0.0.0.0\"} to listen on all the network interfaces." msgstr "Unter welcher Rechneradresse (welchem „Host“, also welcher Netzwerkschnittstelle) auf Verbindungen gelauscht wird. Benutzen Sie @code{\"0.0.0.0\"}, wenn auf allen verfügbaren Netzwerkschnittstellen gelauscht werden soll." #. type: table -#: doc/guix.texi:12206 +#: doc/guix.texi:12204 msgid "The gzip compression level at which substitutes are compressed. Use @code{0} to disable compression altogether, and @code{9} to get the best compression ratio at the expense of increased CPU usage." msgstr "Die gzip-Kompressionsstufe, mit der Substitute komprimiert werden sollen. Benutzen Sie @code{0}, um Kompression völlig abzuschalten, und @code{9} für das höchste Kompressionsverhältnis, zu Lasten von zusätzlicher Prozessorauslastung." #. type: item -#: doc/guix.texi:12207 +#: doc/guix.texi:12205 #, no-wrap msgid "@code{nar-path} (default: @code{\"nar\"})" msgstr "@code{nar-path} (Vorgabe: @code{\"nar\"})" #. type: table -#: doc/guix.texi:12210 +#: doc/guix.texi:12208 msgid "The URL path at which ``nars'' can be fetched. @xref{Invoking guix publish, @code{--nar-path}}, for details." msgstr "Der URL-Pfad, unter dem „Nars“ zum Herunterladen angeboten werden. Siehe @ref{Invoking guix publish, @code{--nar-path}} für Details." #. type: item -#: doc/guix.texi:12211 +#: doc/guix.texi:12209 #, no-wrap msgid "@code{cache} (default: @code{#f})" msgstr "@code{cache} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12217 +#: doc/guix.texi:12215 msgid "When it is @code{#f}, disable caching and instead generate archives on demand. Otherwise, this should be the name of a directory---e.g., @code{\"/var/cache/guix/publish\"}---where @command{guix publish} caches archives and meta-data ready to be sent. @xref{Invoking guix publish, @option{--cache}}, for more information on the tradeoffs involved." msgstr "Wenn dies @code{#f} ist, werden Archive nicht zwischengespeichert, sondern erst bei einer Anfrage erzeugt. Andernfalls sollte dies der Name eines Verzeichnisses sein — z.B.@: @code{\"/var/cache/guix/publish\"} —, in das @command{guix publish} fertige Archive und Metadaten zwischenspeichern soll. Siehe @ref{Invoking guix publish, @option{--cache}} für weitere Informationen über die jeweiligen Vor- und Nachteile." #. type: item -#: doc/guix.texi:12218 +#: doc/guix.texi:12216 #, no-wrap msgid "@code{workers} (default: @code{#f})" msgstr "@code{workers} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12222 +#: doc/guix.texi:12220 msgid "When it is an integer, this is the number of worker threads used for caching; when @code{#f}, the number of processors is used. @xref{Invoking guix publish, @option{--workers}}, for more information." msgstr "Ist dies eine ganze Zahl, gibt es die Anzahl der Worker-Threads an, die zum Zwischenspeichern benutzt werden; ist es @code{#f}, werden so viele benutzt, wie es Prozessoren gibt. Siehe @ref{Invoking guix publish, @option{--workers}} für mehr Informationen." #. type: item -#: doc/guix.texi:12223 +#: doc/guix.texi:12221 #, no-wrap msgid "@code{ttl} (default: @code{#f})" msgstr "@code{ttl} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12227 +#: doc/guix.texi:12225 msgid "When it is an integer, this denotes the @dfn{time-to-live} in seconds of the published archives. @xref{Invoking guix publish, @option{--ttl}}, for more information." msgstr "Wenn dies eine ganze Zahl ist, bezeichnet sie die @dfn{Time-to-live} als die Anzahl der Sekunden, die heruntergeladene veröffentlichte Archive zwischengespeichert werden dürfen. Siehe @ref{Invoking guix publish, @option{--ttl}} für mehr Informationen." #. type: anchor{#1} -#: doc/guix.texi:12231 +#: doc/guix.texi:12229 msgid "rngd-service" msgstr "rngd-service" #. type: deffn -#: doc/guix.texi:12231 +#: doc/guix.texi:12229 #, no-wrap msgid "{Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @" msgstr "{Scheme-Prozedur} rngd-service [#:rng-tools @var{rng-tools}] @" #. type: deffn -#: doc/guix.texi:12236 +#: doc/guix.texi:12234 msgid "[#:device \"/dev/hwrng\"] Return a service that runs the @command{rngd} program from @var{rng-tools} to add @var{device} to the kernel's entropy pool. The service will fail if @var{device} does not exist." msgstr "[#:device \"/dev/hwrng\"] Liefert einen Dienst, der das @command{rngd}-Programm aus den @var{rng-tools} benutzt, um das mit @var{device} bezeichnete Gerät zum Entropie-Pool des Kernels hinzuzufügen. Dieser Dienst wird fehlschlagen, falls das mit @var{device} bezeichnete Gerät nicht existiert." #. type: anchor{#1} -#: doc/guix.texi:12239 +#: doc/guix.texi:12237 msgid "pam-limits-service" msgstr "pam-limits-service" #. type: cindex -#: doc/guix.texi:12239 +#: doc/guix.texi:12237 #, no-wrap msgid "session limits" msgstr "Sitzungs-Limits" #. type: cindex -#: doc/guix.texi:12240 +#: doc/guix.texi:12238 #, no-wrap msgid "ulimit" msgstr "ulimit" #. type: cindex -#: doc/guix.texi:12241 +#: doc/guix.texi:12239 #, no-wrap msgid "priority" msgstr "Priorität" #. type: cindex -#: doc/guix.texi:12242 +#: doc/guix.texi:12240 #, no-wrap msgid "realtime" msgstr "Echtzeit" #. type: cindex -#: doc/guix.texi:12243 +#: doc/guix.texi:12241 #, no-wrap msgid "jackd" msgstr "jackd" #. type: deffn -#: doc/guix.texi:12244 +#: doc/guix.texi:12242 #, no-wrap msgid "{Scheme Procedure} pam-limits-service [#:limits @code{'()}]" msgstr "{Scheme-Prozedur} pam-limits-service [#:limits @code{'()}]" #. type: deffn -#: doc/guix.texi:12251 +#: doc/guix.texi:12249 msgid "Return a service that installs a configuration file for the @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits} module}. The procedure optionally takes a list of @code{pam-limits-entry} values, which can be used to specify @code{ulimit} limits and nice priority limits to user sessions." msgstr "Liefert einen Dienst, der eine Konfigurationsdatei für das @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits}-Modul} installiert. Diese Prozedur nimmt optional eine Liste von @code{pam-limits-entry}-Werten entgegen, die benutzt werden können, um @code{ulimit}-Limits und nice-Prioritäten für Benutzersitzungen festzulegen." #. type: deffn -#: doc/guix.texi:12254 +#: doc/guix.texi:12252 msgid "The following limits definition sets two hard and soft limits for all login sessions of users in the @code{realtime} group:" msgstr "Die folgenden Limit-Definitionen setzen zwei harte und weiche Limits für alle Anmeldesitzungen für Benutzer in der @code{realtime}-Gruppe." #. type: example -#: doc/guix.texi:12260 +#: doc/guix.texi:12258 #, no-wrap msgid "" "(pam-limits-service\n" @@ -22231,40 +22242,40 @@ msgstr "" " (pam-limits-entry \"@@realtime\" 'both 'memlock 'unlimited)))\n" #. type: deffn -#: doc/guix.texi:12266 +#: doc/guix.texi:12264 msgid "The first entry increases the maximum realtime priority for non-privileged processes; the second entry lifts any restriction of the maximum address space that can be locked in memory. These settings are commonly used for real-time audio systems." msgstr "Der erste Eintrag erhöht die maximale Echtzeit-Priorität für unprivilegierte Prozesse ohne zusätzliche Berechtigungen; der zweite Eintrag hebt jegliche Einschränkungen des maximalen Adressbereichs auf, der im Speicher reserviert werden darf. Diese Einstellungen werden in dieser Form oft für Echtzeit-Audio-Systeme verwendet." #. type: cindex -#: doc/guix.texi:12271 +#: doc/guix.texi:12269 #, no-wrap msgid "cron" msgstr "cron" #. type: cindex -#: doc/guix.texi:12272 +#: doc/guix.texi:12270 #, no-wrap msgid "mcron" msgstr "mcron" #. type: cindex -#: doc/guix.texi:12273 +#: doc/guix.texi:12271 #, no-wrap msgid "scheduling jobs" msgstr "Planen von Aufträgen" #. type: Plain text -#: doc/guix.texi:12280 +#: doc/guix.texi:12278 msgid "The @code{(gnu services mcron)} module provides an interface to GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, GNU@tie{}mcron}). GNU@tie{}mcron is similar to the traditional Unix @command{cron} daemon; the main difference is that it is implemented in Guile Scheme, which provides a lot of flexibility when specifying the scheduling of jobs and their actions." msgstr "Das Modul @code{(gnu services mcron)} enthält eine Schnittstelle zu GNU@tie{}mcron, einem Daemon, der gemäß einem vorher festgelegten Zeitplan Aufträge (sogenannte „Jobs“) ausführt (siehe @ref{Top,,, mcron, GNU@tie{}mcron}). GNU@tie{}mcron ist ähnlich zum traditionellen @command{cron}-Daemon aus Unix; der größte Unterschied ist, dass mcron in Guile Scheme implementiert ist, wodurch einem viel Flexibilität bei der Spezifikation von Aufträgen und ihren Aktionen offen steht." #. type: Plain text -#: doc/guix.texi:12288 +#: doc/guix.texi:12286 msgid "The example below defines an operating system that runs the @command{updatedb} (@pxref{Invoking updatedb,,, find, Finding Files}) and the @command{guix gc} commands (@pxref{Invoking guix gc}) daily, as well as the @command{mkid} command on behalf of an unprivileged user (@pxref{mkid invocation,,, idutils, ID Database Utilities}). It uses gexps to introduce job definitions that are passed to mcron (@pxref{G-Expressions})." msgstr "Das folgende Beispiel definiert ein Betriebssystem, das täglich die Befehle @command{updatedb} (siehe @ref{Invoking updatedb,,, find, Finding Files}) und @command{guix gc} (siehe @ref{Invoking guix gc}) ausführt sowie den Befehl @command{mkid} im Namen eines „unprivilegierten“ Nutzers ohne besondere Berechtigungen laufen lässt (siehe @ref{mkid invocation,,, idutils, ID Database Utilities}). Zum Anlegen von Auftragsdefinitionen benutzt es G-Ausdrücke, die dann an mcron übergeben werden (siehe @ref{G-Expressions})." #. type: lisp -#: doc/guix.texi:12292 +#: doc/guix.texi:12290 #, no-wrap msgid "" "(use-modules (guix) (gnu) (gnu services mcron))\n" @@ -22276,7 +22287,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12301 +#: doc/guix.texi:12299 #, no-wrap msgid "" "(define updatedb-job\n" @@ -22300,7 +22311,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12307 +#: doc/guix.texi:12305 #, no-wrap msgid "" "(define garbage-collector-job\n" @@ -22318,7 +22329,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12314 +#: doc/guix.texi:12312 #, no-wrap msgid "" "(define idutils-job\n" @@ -22339,7 +22350,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12323 +#: doc/guix.texi:12321 #, no-wrap msgid "" "(operating-system\n" @@ -22361,105 +22372,105 @@ msgstr "" " %base-services)))\n" #. type: Plain text -#: doc/guix.texi:12328 +#: doc/guix.texi:12326 msgid "@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, for more information on mcron job specifications. Below is the reference of the mcron service." msgstr "Siehe @ref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron} für weitere Informationen zu mcron-Auftragsspezifikationen. Nun folgt die Referenz des mcron-Dienstes." #. type: Plain text -#: doc/guix.texi:12331 +#: doc/guix.texi:12329 msgid "On a running system, you can use the @code{schedule} action of the service to visualize the mcron jobs that will be executed next:" msgstr "Wenn das System läuft, können Sie mit der Aktion @code{schedule} des Dienstes visualisieren lassen, welche mcron-Aufträge als Nächstes ausgeführt werden:" #. type: example -#: doc/guix.texi:12334 +#: doc/guix.texi:12332 #, no-wrap msgid "# herd schedule mcron\n" msgstr "# herd schedule mcron\n" #. type: Plain text -#: doc/guix.texi:12339 +#: doc/guix.texi:12337 msgid "The example above lists the next five tasks that will be executed, but you can also specify the number of tasks to display:" msgstr "Das vorangehende Beispiel listet die nächsten fünf Aufgaben auf, die ausgeführt werden, aber Sie können auch angeben, wieviele Aufgaben angezeigt werden sollen:" #. type: example -#: doc/guix.texi:12342 +#: doc/guix.texi:12340 #, no-wrap msgid "# herd schedule mcron 10\n" msgstr "# herd schedule mcron 10\n" #. type: defvr -#: doc/guix.texi:12344 +#: doc/guix.texi:12342 #, no-wrap msgid "{Scheme Variable} mcron-service-type" msgstr "{Scheme-Variable} mcron-service-type" #. type: defvr -#: doc/guix.texi:12347 +#: doc/guix.texi:12345 msgid "This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object." msgstr "Dies ist der Diensttyp des @code{mcron}-Dienstes. Als Wert verwendet er ein @code{mcron-configuration}-Objekt." #. type: defvr -#: doc/guix.texi:12352 +#: doc/guix.texi:12350 msgid "This service type can be the target of a service extension that provides it additional job specifications (@pxref{Service Composition}). In other words, it is possible to define services that provide additional mcron jobs to run." msgstr "Dieser Diensttyp kann als Ziel einer Diensterweiterung verwendet werden, die ihn mit zusätzlichen Auftragsspezifikationen versorgt (siehe @ref{Service Composition}). Mit anderen Worten ist es möglich, Dienste zu definieren, die weitere mcron-Aufträge ausführen lassen." #. type: deftp -#: doc/guix.texi:12354 +#: doc/guix.texi:12352 #, no-wrap msgid "{Data Type} mcron-configuration" msgstr "{Datentyp} mcron-configuration" #. type: deftp -#: doc/guix.texi:12356 +#: doc/guix.texi:12354 msgid "Data type representing the configuration of mcron." msgstr "Datentyp, der die Konfiguration von mcron repräsentiert." #. type: item -#: doc/guix.texi:12358 +#: doc/guix.texi:12356 #, no-wrap msgid "@code{mcron} (default: @var{mcron})" msgstr "@code{mcron} (Vorgabe: @var{mcron})" #. type: table -#: doc/guix.texi:12360 +#: doc/guix.texi:12358 msgid "The mcron package to use." msgstr "Welches mcron-Paket benutzt werden soll." #. type: code{#1} -#: doc/guix.texi:12361 doc/guix.texi:12420 +#: doc/guix.texi:12359 doc/guix.texi:12418 #, no-wrap msgid "jobs" msgstr "jobs" #. type: table -#: doc/guix.texi:12365 +#: doc/guix.texi:12363 msgid "This is a list of gexps (@pxref{G-Expressions}), where each gexp corresponds to an mcron job specification (@pxref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})." msgstr "Dies muss eine Liste von G-Ausdrücken sein (siehe @ref{G-Expressions}), die jeweils einer mcron-Auftragsspezifikation (der Spezifikation eines „Jobs“) entsprechen (siehe @ref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})." #. type: cindex -#: doc/guix.texi:12372 +#: doc/guix.texi:12370 #, no-wrap msgid "rottlog" msgstr "rottlog" #. type: cindex -#: doc/guix.texi:12373 +#: doc/guix.texi:12371 #, no-wrap msgid "log rotation" msgstr "Log-Rotation" #. type: Plain text -#: doc/guix.texi:12380 +#: doc/guix.texi:12378 msgid "Log files such as those found in @file{/var/log} tend to grow endlessly, so it's a good idea to @dfn{rotate} them once in a while---i.e., archive their contents in separate files, possibly compressed. The @code{(gnu services admin)} module provides an interface to GNU@tie{}Rot[t]log, a log rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})." msgstr "Protokolldateien wie die in @file{/var/log} neigen dazu, bis ins Unendliche zu wachsen, deshalb ist es eine gute Idee, sie von Zeit zu Zeit zu @dfn{rotieren} — d.h.@: ihren Inhalt in separaten Dateien zu archivieren, welche optional auch komprimiert werden. Das Modul @code{(gnu services admin)} stellt eine Schnittstelle zu GNU@tie{}Rot[t]log bereit, einem Werkzeug, um Protokolldateien („Log“-Dateien) zu rotieren (siehe @ref{Top,,, rottlog, GNU Rot[t]log Manual})." #. type: Plain text -#: doc/guix.texi:12383 +#: doc/guix.texi:12381 msgid "The example below defines an operating system that provides log rotation with the default settings, for commonly encountered log files." msgstr "Im folgenden Beispiel wird ein Betriebssystem definiert, das Log-Rotation mit den Vorgabeeinstellungen für übliche Log-Dateien durchführt." #. type: lisp -#: doc/guix.texi:12388 +#: doc/guix.texi:12386 #, no-wrap msgid "" "(use-modules (guix) (gnu))\n" @@ -22473,7 +22484,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12393 +#: doc/guix.texi:12391 #, no-wrap msgid "" "(operating-system\n" @@ -22487,93 +22498,93 @@ msgstr "" " %base-services)))\n" #. type: defvr -#: doc/guix.texi:12395 +#: doc/guix.texi:12393 #, no-wrap msgid "{Scheme Variable} rottlog-service-type" msgstr "{Scheme-Variable} rottlog-service-type" #. type: defvr -#: doc/guix.texi:12398 +#: doc/guix.texi:12396 msgid "This is the type of the Rottlog service, whose value is a @code{rottlog-configuration} object." msgstr "Dies ist der Typ des Rottlog-Dienstes, dessen Wert ein @code{rottlog-configuration}-Objekt ist." #. type: defvr -#: doc/guix.texi:12401 +#: doc/guix.texi:12399 msgid "Other services can extend this one with new @code{log-rotation} objects (see below), thereby augmenting the set of files to be rotated." msgstr "Andere Dienste können diesen Dienst um neue @code{log-rotation}-Objekte erweitern (siehe unten), wodurch die Auswahl an zu rotierenden Dateien ausgeweitet wird." #. type: defvr -#: doc/guix.texi:12404 +#: doc/guix.texi:12402 msgid "This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to run the rottlog service." msgstr "Dieser Diensttyp kann mcron-Aufträge definieren (siehe @ref{Scheduled Job Execution}), die den rottlog-Dienst ausführen." #. type: deftp -#: doc/guix.texi:12406 +#: doc/guix.texi:12404 #, no-wrap msgid "{Data Type} rottlog-configuration" msgstr "{Datentyp} rottlog-configuration" #. type: deftp -#: doc/guix.texi:12408 +#: doc/guix.texi:12406 msgid "Data type representing the configuration of rottlog." msgstr "Datentyp, der die Konfiguration von rottlog repräsentiert." #. type: item -#: doc/guix.texi:12410 +#: doc/guix.texi:12408 #, no-wrap msgid "@code{rottlog} (default: @code{rottlog})" msgstr "@code{rottlog} (Vorgabe: @code{rottlog})" #. type: table -#: doc/guix.texi:12412 +#: doc/guix.texi:12410 msgid "The Rottlog package to use." msgstr "Das Rottlog-Paket, das verwendet werden soll." #. type: item -#: doc/guix.texi:12413 +#: doc/guix.texi:12411 #, no-wrap msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})" msgstr "@code{rc-file} (Vorgabe: @code{(file-append rottlog \"/etc/rc\")})" #. type: table -#: doc/guix.texi:12416 +#: doc/guix.texi:12414 msgid "The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." msgstr "Die zu benutzende Rottlog-Konfigurationsdatei (siehe @ref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." #. type: item -#: doc/guix.texi:12417 +#: doc/guix.texi:12415 #, no-wrap msgid "@code{rotations} (default: @code{%default-rotations})" msgstr "@code{rotations} (Vorgabe: @code{%default-rotations})" #. type: table -#: doc/guix.texi:12419 +#: doc/guix.texi:12417 msgid "A list of @code{log-rotation} objects as defined below." msgstr "Eine Liste von @code{log-rotation}-Objekten, wie wir sie weiter unten definieren." #. type: table -#: doc/guix.texi:12423 +#: doc/guix.texi:12421 msgid "This is a list of gexps where each gexp corresponds to an mcron job specification (@pxref{Scheduled Job Execution})." msgstr "Dies ist eine Liste von G-Ausdrücken. Jeder G-Ausdruck darin entspricht einer mcron-Auftragsspezifikation (siehe @ref{Scheduled Job Execution})." #. type: deftp -#: doc/guix.texi:12426 +#: doc/guix.texi:12424 #, no-wrap msgid "{Data Type} log-rotation" msgstr "{Datentyp} log-rotation" #. type: deftp -#: doc/guix.texi:12428 +#: doc/guix.texi:12426 msgid "Data type representing the rotation of a group of log files." msgstr "Datentyp, der die Rotation einer Gruppe von Protokolldateien repräsentiert." #. type: deftp -#: doc/guix.texi:12432 +#: doc/guix.texi:12430 msgid "Taking an example from the Rottlog manual (@pxref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be defined like this:" msgstr "Um ein Beispiel aus dem Rottlog-Handbuch (siehe @ref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}) aufzugreifen: Eine Log-Rotation kann auf folgende Art definiert werden:" #. type: example -#: doc/guix.texi:12441 +#: doc/guix.texi:12439 #, no-wrap msgid "" "(log-rotation\n" @@ -22593,111 +22604,111 @@ msgstr "" " \"nocompress\")))\n" #. type: deftp -#: doc/guix.texi:12444 +#: doc/guix.texi:12442 msgid "The list of fields is as follows:" msgstr "Die Liste der Felder ist folgendermaßen aufgebaut:" #. type: item -#: doc/guix.texi:12446 +#: doc/guix.texi:12444 #, no-wrap msgid "@code{frequency} (default: @code{'weekly})" msgstr "@code{frequency} (Vorgabe: @code{'weekly})" #. type: table -#: doc/guix.texi:12448 +#: doc/guix.texi:12446 msgid "The log rotation frequency, a symbol." msgstr "Die Häufigkeit der Log-Rotation, dargestellt als englischsprachiges Symbol." #. type: code{#1} -#: doc/guix.texi:12449 +#: doc/guix.texi:12447 #, no-wrap msgid "files" msgstr "files" #. type: table -#: doc/guix.texi:12451 +#: doc/guix.texi:12449 msgid "The list of files or file glob patterns to rotate." msgstr "Die Liste der Dateien oder Glob-Muster für Dateien, die rotiert werden sollen." #. type: item -#: doc/guix.texi:12452 +#: doc/guix.texi:12450 #, no-wrap msgid "@code{options} (default: @code{'()})" msgstr "@code{options} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12455 +#: doc/guix.texi:12453 msgid "The list of rottlog options for this rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})." msgstr "Die Liste der Rottlog-Optionen für diese Rotation (siehe @ref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})." #. type: item -#: doc/guix.texi:12456 +#: doc/guix.texi:12454 #, no-wrap msgid "@code{post-rotate} (default: @code{#f})" msgstr "@code{post-rotate} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12458 +#: doc/guix.texi:12456 msgid "Either @code{#f} or a gexp to execute once the rotation has completed." msgstr "Entweder @code{#f} oder ein G-Ausdruck, der nach Abschluss der Rotation einmal ausgeführt wird." #. type: defvr -#: doc/guix.texi:12461 +#: doc/guix.texi:12459 #, no-wrap msgid "{Scheme Variable} %default-rotations" msgstr "{Scheme-Variable} %default-rotations" #. type: defvr -#: doc/guix.texi:12464 +#: doc/guix.texi:12462 msgid "Specifies weekly rotation of @var{%rotated-files} and a couple of other files." msgstr "Gibt wöchentliche Rotationen der @var{%rotated-files} und von ein paar anderen Dateien an." #. type: defvr -#: doc/guix.texi:12466 +#: doc/guix.texi:12464 #, no-wrap msgid "{Scheme Variable} %rotated-files" msgstr "{Scheme-Variable} %rotated-files" #. type: defvr -#: doc/guix.texi:12469 +#: doc/guix.texi:12467 msgid "The list of syslog-controlled files to be rotated. By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\")}." msgstr "Die Liste der von Syslog verwalteten Dateien, die rotiert werden sollen. Vorgegeben ist @code{'(\"/var/log/messages\" \"/var/log/secure\")}." #. type: Plain text -#: doc/guix.texi:12476 +#: doc/guix.texi:12474 msgid "The @code{(gnu services networking)} module provides services to configure the network interface." msgstr "Das Modul @code{(gnu services networking)} bietet Dienste zum Konfigurieren des Netzwerks an." #. type: cindex -#: doc/guix.texi:12477 +#: doc/guix.texi:12475 #, no-wrap msgid "DHCP, networking service" msgstr "DHCP, Netzwerkdienst" #. type: defvr -#: doc/guix.texi:12478 +#: doc/guix.texi:12476 #, no-wrap msgid "{Scheme Variable} dhcp-client-service-type" msgstr "{Scheme-Variable} dhcp-client-service-type" #. type: defvr -#: doc/guix.texi:12482 +#: doc/guix.texi:12480 msgid "This is the type of services that run @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces. Its value is the DHCP client package to use, @code{isc-dhcp} by default." msgstr "Dies ist der Diensttyp für den Dienst, der @var{dhcp} ausführt, einen Client für das „Dynamic Host Configuration Protocol“ (DHCP), der auf allen Netzwerkschnittstellen außer „loopback“ läuft. Sein Wert ist das zu verwendende DHCP-Client-Paket; vorgegeben ist @code{isc-dhcp}." #. type: deffn -#: doc/guix.texi:12484 +#: doc/guix.texi:12482 #, no-wrap msgid "{Scheme Procedure} dhcpd-service-type" msgstr "{Scheme-Prozedur} dhcpd-service-type" #. type: deffn -#: doc/guix.texi:12488 +#: doc/guix.texi:12486 msgid "This type defines a service that runs a DHCP daemon. To create a service of this type, you must supply a @code{}. For example:" msgstr "Dieser Diensttyp definiert einen Dienst, der einen DHCP-Daemon ausführt. Um einen Dienst zu diesem Typ anzugeben, müssen Sie eine @code{} bereitstellen. Zum Beispiel so:" #. type: example -#: doc/guix.texi:12494 +#: doc/guix.texi:12492 #, no-wrap msgid "" "(service dhcpd-service-type\n" @@ -22711,111 +22722,111 @@ msgstr "" " (interfaces '(\"enp0s25\"))))\n" #. type: deftp -#: doc/guix.texi:12497 +#: doc/guix.texi:12495 #, no-wrap msgid "{Data Type} dhcpd-configuration" msgstr "{Datentyp} dhcpd-configuration" #. type: item -#: doc/guix.texi:12499 +#: doc/guix.texi:12497 #, no-wrap msgid "@code{package} (default: @code{isc-dhcp})" msgstr "@code{package} (Vorgabe: @code{isc-dhcp})" #. type: table -#: doc/guix.texi:12504 +#: doc/guix.texi:12502 msgid "The package that provides the DHCP daemon. This package is expected to provide the daemon at @file{sbin/dhcpd} relative to its output directory. The default package is the @uref{https://www.isc.org/products/DHCP, ISC's DHCP server}." msgstr "Das Paket, das den DHCP-Daemon zur Verfügung stellt. Von diesem Paket wird erwartet, dass es den Daemon unter dem Pfad @file{sbin/dhcpd} relativ zum Verzeichnis der Paketausgabe bereitstellt. Das vorgegebene Paket ist @uref{https://www.isc.org/products/DHCP, der DHCP-Server vom ISC}." #. type: item -#: doc/guix.texi:12504 doc/guix.texi:12693 doc/guix.texi:16681 +#: doc/guix.texi:12502 doc/guix.texi:12691 doc/guix.texi:16678 #, no-wrap msgid "@code{config-file} (default: @code{#f})" msgstr "@code{config-file} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12509 +#: doc/guix.texi:12507 msgid "The configuration file to use. This is required. It will be passed to @code{dhcpd} via its @code{-cf} option. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}). See @code{man dhcpd.conf} for details on the configuration file syntax." msgstr "Die Konfigurationsdatei, die benutzt werden soll. Sie @emph{muss} angegeben werden und wird an @code{dhcpd} mittels seiner Befehlszeilenoption @code{-cf} übergeben. Ein beliebiges „dateiartiges“ Objekt kann dafür angegeben werden (siehe @ref{G-Expressions, file-like objects}). Siehe @code{man dhcpd.conf} für Details, welcher Syntax die Konfigurationsdatei genügen muss." #. type: item -#: doc/guix.texi:12509 +#: doc/guix.texi:12507 #, no-wrap msgid "@code{version} (default: @code{\"4\"})" msgstr "@code{version} (Vorgabe: @code{\"4\"})" #. type: table -#: doc/guix.texi:12514 +#: doc/guix.texi:12512 msgid "The DHCP version to use. The ISC DHCP server supports the values ``4'', ``6'', and ``4o6''. These correspond to the @code{dhcpd} program options @code{-4}, @code{-6}, and @code{-4o6}. See @code{man dhcpd} for details." msgstr "Die DHCP-Version, die benutzt werden soll. Der ISC-DHCP-Server unterstützt die Werte „4“, „6“ und „4o6“. Das Feld entspricht den Befehlszeilenoptionen @code{-4}, @code{-6} und @code{-4o6} von @code{dhcpd}. Siehe @code{man dhcpd} für Details." #. type: item -#: doc/guix.texi:12514 +#: doc/guix.texi:12512 #, no-wrap msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})" msgstr "@code{run-directory} (Vorgabe: @code{\"/run/dhcpd\"})" #. type: table -#: doc/guix.texi:12517 +#: doc/guix.texi:12515 msgid "The run directory to use. At service activation time, this directory will be created if it does not exist." msgstr "Das zu benutzende Laufzeit-Verzeichnis („run“-Verzeichnis). Wenn der Dienst aktiviert wird, wird dieses Verzeichnis erzeugt, wenn es noch nicht existiert." #. type: item -#: doc/guix.texi:12517 +#: doc/guix.texi:12515 #, no-wrap msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/run/dhcpd/dhcpd.pid\"})" #. type: table -#: doc/guix.texi:12520 +#: doc/guix.texi:12518 msgid "The PID file to use. This corresponds to the @code{-pf} option of @code{dhcpd}. See @code{man dhcpd} for details." msgstr "Die zu benutzende PID-Datei. Dieses Feld entspricht der Befehlszeilenoption @code{-pf} von @code{dhcpd}. Siehe @code{man dhcpd} für Details." #. type: item -#: doc/guix.texi:12520 +#: doc/guix.texi:12518 #, no-wrap msgid "@code{interfaces} (default: @code{'()})" msgstr "@code{interfaces} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12526 +#: doc/guix.texi:12524 msgid "The names of the network interfaces on which dhcpd should listen for broadcasts. If this list is not empty, then its elements (which must be strings) will be appended to the @code{dhcpd} invocation when starting the daemon. It may not be necessary to explicitly specify any interfaces here; see @code{man dhcpd} for details." msgstr "Die Namen der Netzwerkschnittstelle, auf der dhcpd auf Broadcast-Nachrichten lauscht. Wenn diese Liste nicht leer ist, werden ihre Elemente (diese müssen Zeichenketten sein) an den @code{dhcpd}-Aufruf beim Starten des Daemons angehängt. Es ist unter Umständen @emph{nicht} nötig, hier Schnittstellen ausdrücklich anzugeben; siehe @code{man dhcpd} für Details." #. type: defvr -#: doc/guix.texi:12529 +#: doc/guix.texi:12527 #, no-wrap msgid "{Scheme Variable} static-networking-service-type" msgstr "{Scheme-Variable} static-networking-service-type" #. type: defvr -#: doc/guix.texi:12532 +#: doc/guix.texi:12530 msgid "This is the type for statically-configured network interfaces." msgstr "Dies ist der Typ für statisch konfigurierte Netzwerkschnittstellen." #. type: deffn -#: doc/guix.texi:12534 +#: doc/guix.texi:12532 #, no-wrap msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @" msgstr "{Scheme-Prozedur} static-networking-service @var{Schnittstelle} @var{IP} @" #. type: deffn -#: doc/guix.texi:12542 +#: doc/guix.texi:12540 msgid "[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] @ [#:requirement @code{'(udev)}] Return a service that starts @var{interface} with address @var{ip}. If @var{netmask} is true, use it as the network mask. If @var{gateway} is true, it must be a string specifying the default network gateway. @var{requirement} can be used to declare a dependency on another service before configuring the interface." msgstr "[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] @ [#:requirement @code{'(udev)}] Liefert einen Dienst, der die @var{Schnittstelle} auf dieser @var{IP}-Adresse startet. Wenn @var{netmask} wahr ist, wird es als Netzwerkmaske benutzt. Wenn @var{gateway} wahr ist, muss es eine Zeichenkette sein, die den voreingestellten Netzwerk-Zugang („Netzwerk-Gateway“) angibt. Als @var{requirement} („Anforderung“) können Abhängigkeiten von anderen Diensten deklariert werden, die vor dem Konfigurieren der Schnittstelle gestartet sein müssen." #. type: deffn -#: doc/guix.texi:12547 +#: doc/guix.texi:12545 msgid "This procedure can be called several times, one for each network interface of interest. Behind the scenes what it does is extend @code{static-networking-service-type} with additional network interfaces to handle." msgstr "Diese Prozedur kann mehrmals aufgerufen werden, einmal pro Netzwerkschnittstelle, die Sie möchten. Intern funktioniert sie, indem sie @code{static-networking-service-type} mit zusätzlichen Netzwerkschnittstellen erweitert, um die sich der Dienst kümmern soll." #. type: deffn -#: doc/guix.texi:12549 +#: doc/guix.texi:12547 msgid "For example:" msgstr "Zum Beispiel:" #. type: example -#: doc/guix.texi:12554 +#: doc/guix.texi:12552 #, no-wrap msgid "" "(static-networking-service \"eno1\" \"192.168.1.82\"\n" @@ -22827,195 +22838,195 @@ msgstr "" " #:name-servers '(\"192.168.1.2\"))\n" #. type: cindex -#: doc/guix.texi:12557 +#: doc/guix.texi:12555 #, no-wrap msgid "wicd" msgstr "wicd" #. type: cindex -#: doc/guix.texi:12560 +#: doc/guix.texi:12558 #, no-wrap msgid "network management" msgstr "Netzwerkverwaltung" #. type: deffn -#: doc/guix.texi:12561 +#: doc/guix.texi:12559 #, no-wrap msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]" msgstr "{Scheme-Prozedur} wicd-service [#:wicd @var{wicd}]" #. type: deffn -#: doc/guix.texi:12564 +#: doc/guix.texi:12562 msgid "Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network management daemon that aims to simplify wired and wireless networking." msgstr "Liefert einen Dienst, der @url{https://launchpad.net/wicd,Wicd} ausführt, einen Netzwerkverwaltungsdaemon, um ein einfacheres Einrichten kabelgebundener und drahtloser Netzwerkanbindungen zu ermöglichen." #. type: deffn -#: doc/guix.texi:12569 +#: doc/guix.texi:12567 msgid "This service adds the @var{wicd} package to the global profile, providing several commands to interact with the daemon and configure networking: @command{wicd-client}, a graphical user interface, and the @command{wicd-cli} and @command{wicd-curses} user interfaces." msgstr "Dieser Dienst fügt das @var{wicd}-Paket zum globalen Profil hinzu und stellt dadurch mehrere Befehle zur Verfügung, um mit dem Daemon zu interagieren und Netzwerke einzurichten: @command{wicd-client}, eine grafische Benutzeroberfläche, und die Benutzungsschnittstellen @command{wicd-cli} und @command{wicd-curses}." #. type: cindex -#: doc/guix.texi:12571 +#: doc/guix.texi:12569 #, no-wrap msgid "ModemManager" msgstr "ModemManager" #. type: defvr -#: doc/guix.texi:12573 +#: doc/guix.texi:12571 #, no-wrap msgid "{Scheme Variable} modem-manager-service-type" msgstr "{Scheme-Variable} modem-manager-service-type" #. type: defvr -#: doc/guix.texi:12578 +#: doc/guix.texi:12576 msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager} service. The value for this service type is a @code{modem-manager-configuration} record." msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager-Dienst}. Der Wert dieses Diensttyps ist ein @code{modem-manager-configuration}-Verbundsobjekt." #. type: defvr -#: doc/guix.texi:12581 doc/guix.texi:12603 +#: doc/guix.texi:12579 doc/guix.texi:12601 msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})." msgstr "Dieser Dienst gehört zu den @code{%desktop-services} (siehe @ref{Desktop Services})." #. type: deftp -#: doc/guix.texi:12583 +#: doc/guix.texi:12581 #, no-wrap msgid "{Data Type} modem-manager-configuration" msgstr "{Datentyp} modem-manager-configuration" #. type: deftp -#: doc/guix.texi:12585 +#: doc/guix.texi:12583 msgid "Data type representing the configuration of ModemManager." msgstr "Repräsentiert die Konfiguration vom ModemManager." #. type: item -#: doc/guix.texi:12587 +#: doc/guix.texi:12585 #, no-wrap msgid "@code{modem-manager} (default: @code{modem-manager})" msgstr "@code{modem-manager} (Vorgabe: @code{modem-manager})" #. type: table -#: doc/guix.texi:12589 +#: doc/guix.texi:12587 msgid "The ModemManager package to use." msgstr "Das ModemManager-Paket, was benutzt werden soll." #. type: cindex -#: doc/guix.texi:12593 +#: doc/guix.texi:12591 #, no-wrap msgid "NetworkManager" msgstr "NetworkManager" #. type: defvr -#: doc/guix.texi:12595 +#: doc/guix.texi:12593 #, no-wrap msgid "{Scheme Variable} network-manager-service-type" msgstr "{Scheme-Variable} network-manager-service-type" #. type: defvr -#: doc/guix.texi:12600 +#: doc/guix.texi:12598 msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager} service. The value for this service type is a @code{network-manager-configuration} record." msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager-Dienst}. Der Wert dieses Diensttyps ist ein @code{network-manager-configuration}-Verbundsobjekt." #. type: deftp -#: doc/guix.texi:12605 +#: doc/guix.texi:12603 #, no-wrap msgid "{Data Type} network-manager-configuration" msgstr "{Datentyp} network-manager-configuration" #. type: deftp -#: doc/guix.texi:12607 +#: doc/guix.texi:12605 msgid "Data type representing the configuration of NetworkManager." msgstr "Datentyp, der die Konfiguration von NetworkManager repräsentiert." #. type: item -#: doc/guix.texi:12609 +#: doc/guix.texi:12607 #, no-wrap msgid "@code{network-manager} (default: @code{network-manager})" msgstr "@code{network-manager} (Vorgabe: @code{network-manager})" #. type: table -#: doc/guix.texi:12611 +#: doc/guix.texi:12609 msgid "The NetworkManager package to use." msgstr "Das zu verwendende NetworkManager-Paket." #. type: item -#: doc/guix.texi:12612 +#: doc/guix.texi:12610 #, no-wrap msgid "@code{dns} (default: @code{\"default\"})" msgstr "@code{dns} (Vorgabe: @code{\"default\"})" #. type: table -#: doc/guix.texi:12615 +#: doc/guix.texi:12613 msgid "Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file." msgstr "Der Verarbeitungsmodus für DNS-Anfragen. Er hat Einfluss darauf, wie NetworkManager mit der Konfigurationsdatei @code{resolv.conf} verfährt." #. type: item -#: doc/guix.texi:12617 +#: doc/guix.texi:12615 #, no-wrap msgid "default" msgstr "default" #. type: table -#: doc/guix.texi:12620 +#: doc/guix.texi:12618 msgid "NetworkManager will update @code{resolv.conf} to reflect the nameservers provided by currently active connections." msgstr "NetworkManager aktualisiert @code{resolv.conf}, damit sie die Nameserver enthält, die von zur Zeit aktiven Verbindungen benutzt werden." #. type: item -#: doc/guix.texi:12621 +#: doc/guix.texi:12619 #, no-wrap msgid "dnsmasq" msgstr "dnsmasq" #. type: table -#: doc/guix.texi:12625 +#: doc/guix.texi:12623 msgid "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a \"split DNS\" configuration if you are connected to a VPN, and then update @code{resolv.conf} to point to the local nameserver." msgstr "NetworkManager führt @code{dnsmasq} als lokal zwischenspeichernden Nameserver aus und aktualisiert @code{resolv.conf} so, dass es auf den lokalen Nameserver verweist. Falls Sie mit einem VPN verbunden sind, wird dafür eine getrennte DNS-Auflösung verwendet („Split DNS“)." #. type: item -#: doc/guix.texi:12626 doc/guix.texi:13886 +#: doc/guix.texi:12624 doc/guix.texi:13884 #, no-wrap msgid "none" msgstr "none" #. type: table -#: doc/guix.texi:12628 +#: doc/guix.texi:12626 msgid "NetworkManager will not modify @code{resolv.conf}." msgstr "NetworkManager verändert @code{resolv.conf} nicht." #. type: item -#: doc/guix.texi:12630 +#: doc/guix.texi:12628 #, no-wrap msgid "@code{vpn-plugins} (default: @code{'()})" msgstr "@code{vpn-plugins} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12634 +#: doc/guix.texi:12632 msgid "This is the list of available plugins for virtual private networks (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN." msgstr "Dies ist die Liste der verfügbaren Plugins für virtuelle private Netzwerke (VPN). Zum Beispiel kann das Paket @code{network-manager-openvpn} angegeben werden, womit NetworkManager virtuelle private Netzwerke mit OpenVPN verwalten kann." #. type: cindex -#: doc/guix.texi:12638 +#: doc/guix.texi:12636 #, no-wrap msgid "Connman" msgstr "Connman" #. type: deffn -#: doc/guix.texi:12639 +#: doc/guix.texi:12637 #, no-wrap msgid "{Scheme Variable} connman-service-type" msgstr "{Scheme-Variable} connman-service-type" #. type: deffn -#: doc/guix.texi:12642 +#: doc/guix.texi:12640 msgid "This is the service type to run @url{https://01.org/connman,Connman}, a network connection manager." msgstr "Mit diesem Diensttyp wird @url{https://01.org/connman,Connman} ausgeführt, ein Programm zum Verwalten von Netzwerkverbindungen." #. type: deffn -#: doc/guix.texi:12645 +#: doc/guix.texi:12643 msgid "Its value must be an @code{connman-configuration} record as in this example:" msgstr "Sein Wert muss ein @code{connman-configuration}-Verbundsobjekt wie im folgenden Beispiel sein:" #. type: example -#: doc/guix.texi:12650 +#: doc/guix.texi:12648 #, no-wrap msgid "" "(service connman-service-type\n" @@ -23027,149 +23038,149 @@ msgstr "" " (disable-vpn? #t)))\n" #. type: deffn -#: doc/guix.texi:12653 +#: doc/guix.texi:12651 msgid "See below for details about @code{connman-configuration}." msgstr "Weiter unten werden Details der @code{connman-configuration} erklärt." #. type: deftp -#: doc/guix.texi:12655 +#: doc/guix.texi:12653 #, no-wrap msgid "{Data Type} connman-configuration" msgstr "{Datentyp} connman-configuration" #. type: deftp -#: doc/guix.texi:12657 +#: doc/guix.texi:12655 msgid "Data Type representing the configuration of connman." msgstr "Datentyp, der die Konfiguration von Connman repräsentiert." #. type: item -#: doc/guix.texi:12659 +#: doc/guix.texi:12657 #, no-wrap msgid "@code{connman} (default: @var{connman})" msgstr "@code{connman} (Vorgabe: @var{connman})" #. type: table -#: doc/guix.texi:12661 +#: doc/guix.texi:12659 msgid "The connman package to use." msgstr "Das zu verwendende Connman-Paket." #. type: item -#: doc/guix.texi:12662 +#: doc/guix.texi:12660 #, no-wrap msgid "@code{disable-vpn?} (default: @code{#f})" msgstr "@code{disable-vpn?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12664 +#: doc/guix.texi:12662 msgid "When true, disable connman's vpn plugin." msgstr "Falls dies auf wahr gesetzt ist, wird Connmans VPN-Plugin deaktiviert." #. type: cindex -#: doc/guix.texi:12667 +#: doc/guix.texi:12665 #, no-wrap msgid "WPA Supplicant" msgstr "WPA-Supplikant" #. type: defvr -#: doc/guix.texi:12668 +#: doc/guix.texi:12666 #, no-wrap msgid "{Scheme Variable} wpa-supplicant-service-type" msgstr "{Scheme-Variable} wpa-supplicant-service-type" #. type: defvr -#: doc/guix.texi:12672 +#: doc/guix.texi:12670 msgid "This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA supplicant}, an authentication daemon required to authenticate against encrypted WiFi or ethernet networks." msgstr "Dies ist der Diensttyp, um @url{https://w1.fi/wpa_supplicant/,WPA Supplicant} auszuführen. Dabei handelt es sich um einen Authentisierungsdaemon, der notwendig ist, um sich gegenüber verschlüsselten WLAN- oder Ethernet-Netzwerken zu authentisieren." #. type: deftp -#: doc/guix.texi:12674 +#: doc/guix.texi:12672 #, no-wrap msgid "{Data Type} wpa-supplicant-configuration" msgstr "{Datentyp} wpa-supplicant-configuration" #. type: deftp -#: doc/guix.texi:12676 +#: doc/guix.texi:12674 msgid "Data type representing the configuration of WPA Supplicant." msgstr "Repräsentiert die Konfiguration des WPA-Supplikanten." #. type: deftp -#: doc/guix.texi:12678 +#: doc/guix.texi:12676 msgid "It takes the following parameters:" msgstr "Sie hat folgende Parameter:" #. type: item -#: doc/guix.texi:12680 +#: doc/guix.texi:12678 #, no-wrap msgid "@code{wpa-supplicant} (default: @code{wpa-supplicant})" msgstr "@code{wpa-supplicant} (Vorgabe: @code{wpa-supplicant})" #. type: table -#: doc/guix.texi:12682 +#: doc/guix.texi:12680 msgid "The WPA Supplicant package to use." msgstr "Das WPA-Supplicant-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:12683 +#: doc/guix.texi:12681 #, no-wrap msgid "@code{dbus?} (default: @code{#t})" msgstr "@code{dbus?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:12685 +#: doc/guix.texi:12683 msgid "Whether to listen for requests on D-Bus." msgstr "Ob auf Anfragen auf D-Bus gelauscht werden soll." #. type: item -#: doc/guix.texi:12686 +#: doc/guix.texi:12684 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/wpa_supplicant.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/wpa_supplicant.pid\"})" #. type: table -#: doc/guix.texi:12688 +#: doc/guix.texi:12686 msgid "Where to store the PID file." msgstr "Wo die PID-Datei abgelegt wird." #. type: item -#: doc/guix.texi:12689 +#: doc/guix.texi:12687 #, no-wrap msgid "@code{interface} (default: @code{#f})" msgstr "@code{interface} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12692 +#: doc/guix.texi:12690 msgid "If this is set, it must specify the name of a network interface that WPA supplicant will control." msgstr "Wenn dieses Feld gesetzt ist, muss es den Namen einer Netzwerkschnittstelle angeben, die von WPA Supplicant verwaltet werden soll." #. type: table -#: doc/guix.texi:12695 +#: doc/guix.texi:12693 msgid "Optional configuration file to use." msgstr "Optionale Konfigurationsdatei." #. type: table -#: doc/guix.texi:12698 +#: doc/guix.texi:12696 msgid "List of additional command-line arguments to pass to the daemon." msgstr "Liste zusätzlicher Befehlszeilenoptionen, die an den Daemon übergeben werden." #. type: cindex -#: doc/guix.texi:12701 +#: doc/guix.texi:12699 #, no-wrap msgid "iptables" msgstr "iptables" #. type: defvr -#: doc/guix.texi:12702 +#: doc/guix.texi:12700 #, no-wrap msgid "{Scheme Variable} iptables-service-type" msgstr "{Scheme-Variable} iptables-service-type" #. type: defvr -#: doc/guix.texi:12708 +#: doc/guix.texi:12706 msgid "This is the service type to set up an iptables configuration. iptables is a packet filtering framework supported by the Linux kernel. This service supports configuring iptables for both IPv4 and IPv6. A simple example configuration rejecting all incoming connections except those to the ssh port 22 is shown below." msgstr "Mit diesem Diensttyp wird eine iptables-Konfiguration eingerichtet. iptables ist ein Netzwerkpaketfilter, der vom Linux-Kernel unterstützt wird. Der Dienst unterstützt die Konfiguration von iptables für sowohl IPv4 als auch IPv6. Eine einfache Beispielkonfiguration, die alle eingehenden Verbindungen verweigert, die nicht an den SSH-Port 22 gehen, können Sie hier sehen:" #. type: lisp -#: doc/guix.texi:12728 +#: doc/guix.texi:12726 #, no-wrap msgid "" "(service iptables-service-type\n" @@ -23211,151 +23222,151 @@ msgstr "" "\"))))\n" #. type: deftp -#: doc/guix.texi:12731 +#: doc/guix.texi:12729 #, no-wrap msgid "{Data Type} iptables-configuration" msgstr "{Datentyp} iptables-configuration" #. type: deftp -#: doc/guix.texi:12733 +#: doc/guix.texi:12731 msgid "The data type representing the configuration of iptables." msgstr "Repräsentiert die iptables-Konfiguration." #. type: item -#: doc/guix.texi:12735 +#: doc/guix.texi:12733 #, no-wrap msgid "@code{iptables} (default: @code{iptables})" msgstr "@code{iptables} (Vorgabe: @code{iptables})" #. type: table -#: doc/guix.texi:12738 +#: doc/guix.texi:12736 msgid "The iptables package that provides @code{iptables-restore} and @code{ip6tables-restore}." msgstr "Das zu benutzende iptables-Paket, das @code{iptables-restore} und @code{ip6tables-restore} zur Verfügung stellt." #. type: item -#: doc/guix.texi:12738 +#: doc/guix.texi:12736 #, no-wrap msgid "@code{ipv4-rules} (default: @code{%iptables-accept-all-rules})" msgstr "@code{ipv4-rules} (Vorgabe: @code{%iptables-accept-all-rules})" #. type: table -#: doc/guix.texi:12742 +#: doc/guix.texi:12740 msgid "The iptables rules to use. It will be passed to @code{iptables-restore}. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})." msgstr "Die zu benutzenden iptables-Regeln. Diese werden an @code{iptables-restore} übergeben. Als Regeln kann jedes „dateiartige“ Objekt angegeben werden (siehe @ref{G-Expressions, file-like objects})." #. type: item -#: doc/guix.texi:12742 +#: doc/guix.texi:12740 #, no-wrap msgid "@code{ipv6-rules} (default: @code{%iptables-accept-all-rules})" msgstr "@code{ipv6-rules} (Vorgabe: @code{%iptables-accept-all-rules})" #. type: table -#: doc/guix.texi:12746 +#: doc/guix.texi:12744 msgid "The ip6tables rules to use. It will be passed to @code{ip6tables-restore}. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})." msgstr "Die zu benutzenden ip6tables-Regeln. Diese werden an @code{ip6tables-restore} übergeben. Als Regeln kann jedes „dateiartige“ Objekt angegeben werden (siehe @ref{G-Expressions, file-like objects})." #. type: cindex -#: doc/guix.texi:12749 +#: doc/guix.texi:12747 #, no-wrap msgid "NTP (Network Time Protocol), service" msgstr "NTP (Network Time Protocol), Dienst" #. type: cindex -#: doc/guix.texi:12750 +#: doc/guix.texi:12748 #, no-wrap msgid "real time clock" msgstr "Echtzeituhr" #. type: defvr -#: doc/guix.texi:12751 +#: doc/guix.texi:12749 #, no-wrap msgid "{Scheme Variable} ntp-service-type" msgstr "{Scheme-Variable} ntp-service-type" #. type: defvr -#: doc/guix.texi:12755 +#: doc/guix.texi:12753 msgid "This is the type of the service running the @uref{http://www.ntp.org, Network Time Protocol (NTP)} daemon, @command{ntpd}. The daemon will keep the system clock synchronized with that of the specified NTP servers." msgstr "Dies ist der Typ des Dienstes, der den @command{ntpd}-Daemon für das @uref{http://www.ntp.org, Network Time Protocol}, kurz NTP, ausführt. Mit diesem Daemon wird die Systemuhr mit der Uhr auf den angegebenen NTP-Servern synchronisiert." #. type: defvr -#: doc/guix.texi:12758 +#: doc/guix.texi:12756 msgid "The value of this service is an @code{ntpd-configuration} object, as described below." msgstr "Der Wert dieses Dienstes ist ein @code{ntpd-configuration}-Objekt, wie im Folgenden beschrieben." #. type: deftp -#: doc/guix.texi:12760 +#: doc/guix.texi:12758 #, no-wrap msgid "{Data Type} ntp-configuration" msgstr "{Datentyp} ntp-configuration" #. type: deftp -#: doc/guix.texi:12762 +#: doc/guix.texi:12760 msgid "This is the data type for the NTP service configuration." msgstr "Der Datentyp für die Dienstkonfiguration des NTP-Dienstes." #. type: item -#: doc/guix.texi:12764 +#: doc/guix.texi:12762 #, no-wrap msgid "@code{servers} (default: @code{%ntp-servers})" msgstr "@code{servers} (Vorgabe: @code{%ntp-servers})" #. type: table -#: doc/guix.texi:12767 +#: doc/guix.texi:12765 msgid "This is the list of servers (host names) with which @command{ntpd} will be synchronized." msgstr "Dies ist die Liste der Server (also von deren Rechnernamen/„Host“-Namen), mit denen @command{ntpd} synchronisiert wird." #. type: item -#: doc/guix.texi:12768 doc/guix.texi:12829 +#: doc/guix.texi:12766 doc/guix.texi:12827 #, no-wrap msgid "@code{allow-large-adjustment?} (default: @code{#f})" msgstr "@code{allow-large-adjustment?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12771 +#: doc/guix.texi:12769 msgid "This determines whether @command{ntpd} is allowed to make an initial adjustment of more than 1,000 seconds." msgstr "Hiermit wird festgelegt, ob @command{ntpd} die Uhr beim ersten Umstellen um mehr als 1.000 Sekunden ändern darf." #. type: item -#: doc/guix.texi:12772 +#: doc/guix.texi:12770 #, no-wrap msgid "@code{ntp} (default: @code{ntp})" msgstr "@code{ntp} (Vorgabe: @code{ntp})" #. type: table -#: doc/guix.texi:12774 +#: doc/guix.texi:12772 msgid "The NTP package to use." msgstr "Das NTP-Paket, was benutzt werden soll." #. type: defvr -#: doc/guix.texi:12777 +#: doc/guix.texi:12775 #, no-wrap msgid "{Scheme Variable} %ntp-servers" msgstr "{Scheme-Variable} %ntp-servers" #. type: defvr -#: doc/guix.texi:12780 +#: doc/guix.texi:12778 msgid "List of host names used as the default NTP servers. These are servers of the @uref{https://www.ntppool.org/en/, NTP Pool Project}." msgstr "Liste der Rechnernamen („Host“-Namen), die als vorgegebene NTP-Server benutzt werden. Dabei handelt es sich um die Server des @uref{https://www.ntppool.org/en/, NTP Pool Project}." #. type: cindex -#: doc/guix.texi:12782 +#: doc/guix.texi:12780 #, no-wrap msgid "OpenNTPD" msgstr "OpenNTPD" #. type: deffn -#: doc/guix.texi:12783 +#: doc/guix.texi:12781 #, no-wrap msgid "{Scheme Procedure} openntpd-service-type" msgstr "{Scheme-Prozedur} openntpd-service-type" #. type: deffn -#: doc/guix.texi:12787 +#: doc/guix.texi:12785 msgid "Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}. The daemon will keep the system clock synchronized with that of the given servers." msgstr "Hiermit wird @command{ntpd}, der Network-Time-Protocol-Daemon (NTP-Daemon), ausgeführt, in seiner @uref{http://www.openntpd.org, OpenNTPD-Implementierung}. Der Daemon sorgt dafür, dass die Systemuhr mit den Uhren der eingestellten Server synchron bleibt." #. type: example -#: doc/guix.texi:12797 +#: doc/guix.texi:12795 #, no-wrap msgid "" "(service\n" @@ -23379,128 +23390,128 @@ msgstr "" "\n" #. type: deftp -#: doc/guix.texi:12801 +#: doc/guix.texi:12799 #, no-wrap msgid "{Data Type} openntpd-configuration" msgstr "{Datentyp} openntpd-configuration" #. type: item -#: doc/guix.texi:12803 +#: doc/guix.texi:12801 #, no-wrap msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})" msgstr "@code{openntpd} (Vorgabe: @code{(file-append openntpd \"/sbin/ntpd\")})" #. type: table -#: doc/guix.texi:12805 +#: doc/guix.texi:12803 msgid "The openntpd executable to use." msgstr "Das openntpd-Programm, das benutzt werden soll." #. type: item -#: doc/guix.texi:12805 +#: doc/guix.texi:12803 #, no-wrap msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})" msgstr "@code{listen-on} (Vorgabe: @code{'(\"127.0.0.1\" \"::1\")})" #. type: table -#: doc/guix.texi:12807 +#: doc/guix.texi:12805 msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on." msgstr "Eine Liste von lokalen IP-Adressen oder Rechnernamen („Host“-Namen), auf denen der ntpd-Daemon lauschen soll." #. type: item -#: doc/guix.texi:12807 +#: doc/guix.texi:12805 #, no-wrap msgid "@code{query-from} (default: @code{'()})" msgstr "@code{query-from} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12809 +#: doc/guix.texi:12807 msgid "A list of local IP address the ntpd daemon should use for outgoing queries." msgstr "Eine Liste von lokalen IP-Adressen, die der ntpd-Daemon für ausgehende Anfragen benutzen soll." #. type: item -#: doc/guix.texi:12809 +#: doc/guix.texi:12807 #, no-wrap msgid "@code{sensor} (default: @code{'()})" msgstr "@code{sensor} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12814 +#: doc/guix.texi:12812 msgid "Specify a list of timedelta sensor devices ntpd should use. @code{ntpd} will listen to each sensor that actually exists and ignore non-existent ones. See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more information." msgstr "Hiermit geben Sie eine Liste von Zeitdifferenz-Sensorgeräten an, die ntpd benutzen soll. @code{ntpd} wird auf jeden Sensor lauschen, der auch tatsächlich existiert, und solche, die nicht existieren, ignorieren. Siehe die @uref{https://man.openbsd.org/ntpd.conf, Dokumentation beim Anbieter} für weitere Informationen." #. type: item -#: doc/guix.texi:12814 +#: doc/guix.texi:12812 #, no-wrap msgid "@code{server} (default: @var{%ntp-servers})" msgstr "@code{server} (Vorgabe: @var{%ntp-servers})" #. type: table -#: doc/guix.texi:12816 +#: doc/guix.texi:12814 msgid "Specify a list of IP addresses or hostnames of NTP servers to synchronize to." msgstr "Hiermit geben Sie eine Liste von IP-Adressen oder Rechnernamen von NTP-Servern an, mit denen synchronisiert werden soll." #. type: item -#: doc/guix.texi:12816 doc/guix.texi:20032 +#: doc/guix.texi:12814 doc/guix.texi:20029 #, no-wrap msgid "@code{servers} (default: @code{'()})" msgstr "@code{servers} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12818 +#: doc/guix.texi:12816 msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to." msgstr "Hiermit geben Sie eine Liste von IP-Adressen oder Rechnernamen von NTP-Pools an, mit denen synchronisiert werden soll." #. type: item -#: doc/guix.texi:12818 +#: doc/guix.texi:12816 #, no-wrap msgid "@code{constraint-from} (default: @code{'()})" msgstr "@code{constraint-from} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12825 +#: doc/guix.texi:12823 msgid "@code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers via TLS. This time information is not used for precision but acts as an authenticated constraint, thereby reducing the impact of unauthenticated NTP man-in-the-middle attacks. Specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint." msgstr "@code{ntpd} kann so eingestellt werden, dass es das Datum aus der „Date“-Kopfzeile bei mit TLS übermittelten Anfragen an HTTPS-Server, denen vertraut wird, ausliest. Diese Zeitinformation wird nicht für Genauigkeit benutzt, sondern um mit authentifizierten Informationen die Auswirkungen eines Man-in-the-Middle-Angriffs auf unauthentifizierte NTP-Kommunikation einzuschränken. Geben Sie hierzu eine Liste von URLs, IP-Adressen oder Rechnernamen („Host“-Namen) von HTTPS-Servern an, um eine solche Beschränkung („Constraint“) einzurichten." #. type: item -#: doc/guix.texi:12825 +#: doc/guix.texi:12823 #, no-wrap msgid "@code{constraints-from} (default: @code{'()})" msgstr "@code{constraints-from} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12829 +#: doc/guix.texi:12827 msgid "As with constraint from, specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint. Should the hostname resolve to multiple IP addresses, @code{ntpd} will calculate a median constraint from all of them." msgstr "Wie bei @code{constraint-from} geben Sie auch hier eine Liste von URLs, IP-Adressen oder Rechnernamen von HTTPS-Servern an, um eine Beschränkung einzurichten. Falls der Rechnername zu mehreren IP-Adressen aufgelöst wird, berechnet @code{ntpd} den Median von allen als Beschränkung." #. type: table -#: doc/guix.texi:12832 +#: doc/guix.texi:12830 msgid "Determines if @code{ntpd} is allowed to make an initial adjustment of more than 180 seconds." msgstr "Legt fest, ob @code{ntpd} die Uhr beim ersten Umstellen um mehr als 180 Sekunden verstellen darf." #. type: cindex -#: doc/guix.texi:12835 +#: doc/guix.texi:12833 #, no-wrap msgid "inetd" msgstr "inetd" #. type: deffn -#: doc/guix.texi:12836 +#: doc/guix.texi:12834 #, no-wrap msgid "{Scheme variable} inetd-service-type" msgstr "{Scheme-Variable} inetd-service-type" #. type: deffn -#: doc/guix.texi:12841 +#: doc/guix.texi:12839 msgid "This service runs the @command{inetd} (@pxref{inetd invocation,,, inetutils, GNU Inetutils}) daemon. @command{inetd} listens for connections on internet sockets, and lazily starts the specified server program when a connection is made on one of these sockets." msgstr "Dieser Dienst führt den @command{inetd}-Daemon aus (siehe @ref{inetd invocation,,, inetutils, GNU Inetutils}). @command{inetd} lauscht auf Verbindungen mit Internet-Sockets und startet bei Bedarf das entsprechende Server-Programm, sobald eine Verbindung mit einem dieser Sockets hergestellt wird." #. type: deffn -#: doc/guix.texi:12847 +#: doc/guix.texi:12845 msgid "The value of this service is an @code{inetd-configuration} object. The following example configures the @command{inetd} daemon to provide the built-in @command{echo} service, as well as an smtp service which forwards smtp traffic over ssh to a server @code{smtp-server} behind a gateway @code{hostname}:" msgstr "Der Wert dieses Dienstes ist ein @code{inetd-configuration}-Objekt. Im folgenden Beispiel wird der @command{inetd}-Daemon konfiguriert, um den eingebauten @command{echo}-Dienst sowie einen SMTP-Dienst anzubieten, wobei letzterer SMTP-Kommunikation über SSH an einen Server @code{smtp-server} über einen vom @code{rechnername}n bezeichneten Zugang („Gateway“) weiterleitet:" #. type: example -#: doc/guix.texi:12870 +#: doc/guix.texi:12868 #, no-wrap msgid "" "(service\n" @@ -23548,220 +23559,220 @@ msgstr "" " \"-W\" \"smtp-server:25\" \"benutzer@@rechnername\")))))\n" #. type: deffn -#: doc/guix.texi:12873 +#: doc/guix.texi:12871 msgid "See below for more details about @code{inetd-configuration}." msgstr "Siehe unten für mehr Details über @code{inetd-configuration}." #. type: deftp -#: doc/guix.texi:12875 +#: doc/guix.texi:12873 #, no-wrap msgid "{Data Type} inetd-configuration" msgstr "{Datentyp} inetd-configuration" #. type: deftp -#: doc/guix.texi:12877 +#: doc/guix.texi:12875 msgid "Data type representing the configuration of @command{inetd}." msgstr "Datentyp, der die Konfiguration von @command{inetd} repräsentiert." #. type: item -#: doc/guix.texi:12879 +#: doc/guix.texi:12877 #, no-wrap msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})" msgstr "@code{program} (Vorgabe: @code{(file-append inetutils \"/libexec/inetd\")})" #. type: table -#: doc/guix.texi:12881 +#: doc/guix.texi:12879 msgid "The @command{inetd} executable to use." msgstr "Das @command{inetd}-Programm, das benutzt werden soll." #. type: item -#: doc/guix.texi:12882 doc/guix.texi:19686 +#: doc/guix.texi:12880 doc/guix.texi:19683 #, no-wrap msgid "@code{entries} (default: @code{'()})" msgstr "@code{entries} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12885 +#: doc/guix.texi:12883 msgid "A list of @command{inetd} service entries. Each entry should be created by the @code{inetd-entry} constructor." msgstr "Eine Liste von @command{inetd}-Diensteinträgen. Jeder Eintrag sollte von einem @code{inetd-entry}-Konstruktor erzeugt werden." #. type: deftp -#: doc/guix.texi:12888 +#: doc/guix.texi:12886 #, no-wrap msgid "{Data Type} inetd-entry" msgstr "{Datentyp} inetd-entry" #. type: deftp -#: doc/guix.texi:12892 +#: doc/guix.texi:12890 msgid "Data type representing an entry in the @command{inetd} configuration. Each entry corresponds to a socket where @command{inetd} will listen for requests." msgstr "Datentyp, der einen Eintrag in der @command{inetd}-Konfiguration repräsentiert. Jeder Eintrag entspricht einem Socket, auf dem @command{inetd} auf Anfragen lauscht." #. type: item -#: doc/guix.texi:12894 +#: doc/guix.texi:12892 #, no-wrap msgid "@code{node} (default: @code{#f})" msgstr "@code{node} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12899 +#: doc/guix.texi:12897 msgid "Optional string, a comma-separated list of local addresses @command{inetd} should use when listening for this service. @xref{Configuration file,,, inetutils, GNU Inetutils} for a complete description of all options." msgstr "Optional sollte hier als Zeichenkette eine kommagetrennte Liste lokaler Adressen angegeben werden, die @command{inetd} benutzen soll, wenn er stellvertretend für den angegebenen Dienst lauscht. Siehe @ref{Configuration file,,, inetutils, GNU Inetutils} für eine vollständige Beschreibung aller Optionen." #. type: table -#: doc/guix.texi:12901 +#: doc/guix.texi:12899 msgid "A string, the name must correspond to an entry in @code{/etc/services}." msgstr "Eine Zeichenkette. Dieser Name muss einem Eintrag in @code{/etc/services} entsprechen." #. type: code{#1} -#: doc/guix.texi:12901 +#: doc/guix.texi:12899 #, no-wrap msgid "socket-type" msgstr "socket-type" #. type: table -#: doc/guix.texi:12904 +#: doc/guix.texi:12902 msgid "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or @code{'seqpacket}." msgstr "Entweder @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} oder @code{'seqpacket}." #. type: code{#1} -#: doc/guix.texi:12904 +#: doc/guix.texi:12902 #, no-wrap msgid "protocol" msgstr "protocol" #. type: table -#: doc/guix.texi:12906 +#: doc/guix.texi:12904 msgid "A string, must correspond to an entry in @code{/etc/protocols}." msgstr "Eine Zeichenkette, die einem Eintrag in @code{/etc/protocols} entsprechen muss." #. type: item -#: doc/guix.texi:12906 +#: doc/guix.texi:12904 #, no-wrap msgid "@code{wait?} (default: @code{#t})" msgstr "@code{wait?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:12909 +#: doc/guix.texi:12907 msgid "Whether @command{inetd} should wait for the server to exit before listening to new service requests." msgstr "Ob @command{inetd} warten soll, bis der Server beendet ist, bevor es wieder auf neue Anfragen an den Dienst lauscht." #. type: table -#: doc/guix.texi:12914 +#: doc/guix.texi:12912 msgid "A string containing the user (and, optionally, group) name of the user as whom the server should run. The group name can be specified in a suffix, separated by a colon or period, i.e.@: @code{\"user\"}, @code{\"user:group\"} or @code{\"user.group\"}." msgstr "Eine Zeichenkette mit dem Benutzernamen (und optional dem Gruppennamen) des Benutzers, als der dieser Server ausgeführt werden soll. Der Gruppenname kann als Suffix angegeben werden, getrennt durch einen Doppelpunkt oder Punkt, d.h.@: @code{\"benutzer\"}, @code{\"benutzer:gruppe\"} oder @code{\"benutzer.gruppe\"}." #. type: item -#: doc/guix.texi:12914 +#: doc/guix.texi:12912 #, no-wrap msgid "@code{program} (default: @code{\"internal\"})" msgstr "@code{program} (Vorgabe: @code{\"internal\"})" #. type: table -#: doc/guix.texi:12917 +#: doc/guix.texi:12915 msgid "The server program which will serve the requests, or @code{\"internal\"} if @command{inetd} should use a built-in service." msgstr "Das Serverprogramm, das die Anfragen bedienen soll, oder @code{\"internal\"}, wenn @command{inetd} einen eingebauten Dienst verwenden soll." #. type: table -#: doc/guix.texi:12922 +#: doc/guix.texi:12920 msgid "A list strings or file-like objects, which are the server program's arguments, starting with the zeroth argument, i.e.@: the name of the program itself. For @command{inetd}'s internal services, this entry must be @code{'()} or @code{'(\"internal\")}." msgstr "Eine Liste von Zeichenketten oder dateiartigen Objekten, die dem Serverprogramm als Argumente übergeben werden, angefangen mit dem nullten Argument, d.h.@: dem Namen selbigen Serverprogramms. Bei in @command{inetd} eingebauten Diensten muss dieser Eintrag auf @code{'()} oder @code{'(\"internal\")} gesetzt sein." #. type: deftp -#: doc/guix.texi:12926 +#: doc/guix.texi:12924 msgid "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed discussion of each configuration field." msgstr "Siehe @ref{Configuration file,,, inetutils, GNU Inetutils} für eine mehr ins Detail gehende Erörterung jedes Konfigurationsfeldes." #. type: cindex -#: doc/guix.texi:12928 +#: doc/guix.texi:12926 #, no-wrap msgid "Tor" msgstr "Tor" #. type: defvr -#: doc/guix.texi:12929 +#: doc/guix.texi:12927 #, no-wrap msgid "{Scheme Variable} tor-service-type" msgstr "{Scheme-Variable} tor-service-type" #. type: defvr -#: doc/guix.texi:12934 +#: doc/guix.texi:12932 msgid "This is the type for a service that runs the @uref{https://torproject.org, Tor} anonymous networking daemon. The service is configured using a @code{} record. By default, the Tor daemon runs as the @code{tor} unprivileged user, which is a member of the @code{tor} group." msgstr "Dies ist der Diensttyp für den Dienst, der den @uref{https://torproject.org, Tor-Daemon} für anonyme Netzwerkrouten ausführt. Der Dienst benutzt für seine Konfiguration ein @code{}-Verbundsobjekt. Vorgegeben ist, dass der Tor-Daemon als „unprivilegierter“ Nutzer @code{tor} ausgeführt wird, einem Mitglied der @code{tor}-Benutzergruppe ohne besondere Berechtigungen." #. type: deftp -#: doc/guix.texi:12937 +#: doc/guix.texi:12935 #, no-wrap msgid "{Data Type} tor-configuration" msgstr "{Datentyp} tor-configuration" #. type: item -#: doc/guix.texi:12939 +#: doc/guix.texi:12937 #, no-wrap msgid "@code{tor} (default: @code{tor})" msgstr "@code{tor} (Vorgabe: @code{tor})" #. type: table -#: doc/guix.texi:12944 +#: doc/guix.texi:12942 msgid "The package that provides the Tor daemon. This package is expected to provide the daemon at @file{bin/tor} relative to its output directory. The default package is the @uref{https://www.torproject.org, Tor Project's} implementation." msgstr "Das Paket, das den Tor-Daemon zur Verfügung stellt. Von diesem Paket wird erwartet, dass es den Daemon unter dem Pfad @file{bin/tor} relativ zum Ausgabeverzeichnis verfügbar macht. Das vorgegebene Paket ist die Implementierung des @uref{https://www.torproject.org, Tor-Projekts}." #. type: item -#: doc/guix.texi:12945 +#: doc/guix.texi:12943 #, no-wrap msgid "@code{config-file} (default: @code{(plain-file \"empty\" \"\")})" msgstr "@code{config-file} (Vorgabe: @code{(plain-file \"empty\" \"\")})" #. type: table -#: doc/guix.texi:12951 +#: doc/guix.texi:12949 msgid "The configuration file to use. It will be appended to a default configuration file, and the final configuration file will be passed to @code{tor} via its @code{-f} option. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}). See @code{man tor} for details on the configuration file syntax." msgstr "Die Konfigurationsdatei, die benutzt werden soll. Sie wird an eine vorgegebene Konfigurationsdatei angehängt und die sich daraus ergebende Konfigurationsdatei wird dann an @code{tor} über dessen Befehlszeilenoption @code{-f} übergeben. Hier kann jedes „dateiartige“ Objekt (siehe @ref{G-Expressions, file-like objects}) angegeben werden. Siehe @code{man tor} für Details zur Syntax der Konfigurationsdatei." #. type: item -#: doc/guix.texi:12952 +#: doc/guix.texi:12950 #, no-wrap msgid "@code{hidden-services} (default: @code{'()})" msgstr "@code{hidden-services} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12958 +#: doc/guix.texi:12956 msgid "The list of @code{} records to use. For any hidden service you include in this list, appropriate configuration to enable the hidden service will be automatically added to the default configuration file. You may conveniently create @code{} records using the @code{tor-hidden-service} procedure described below." msgstr "Die Liste der zu benutzenden „versteckten Dienste“ als @code{}-Verbundsobjekte. Für jeden versteckten Dienst, den Sie in dieser Liste eintragen, werden automatisch entsprechende Einstellungen zur vorgefertigten Konfigurationsdatei hinzugefügt. Sie können @code{}-Verbundsobjekte bequem mit der unten beschriebenen Prozedur @code{tor-hidden-service} erzeugen lassen." #. type: item -#: doc/guix.texi:12959 +#: doc/guix.texi:12957 #, no-wrap msgid "@code{socks-socket-type} (default: @code{'tcp})" msgstr "@code{socks-socket-type} (Vorgabe: @code{'tcp})" #. type: table -#: doc/guix.texi:12966 +#: doc/guix.texi:12964 msgid "The default socket type that Tor should use for its SOCKS socket. This must be either @code{'tcp} or @code{'unix}. If it is @code{'tcp}, then by default Tor will listen on TCP port 9050 on the loopback interface (i.e., localhost). If it is @code{'unix}, then Tor will listen on the UNIX domain socket @file{/var/run/tor/socks-sock}, which will be made writable by members of the @code{tor} group." msgstr "Welche Art von Socket Tor für seinen SOCKS-Socket in der Voreinstellung benutzen soll. Dafür muss entweder @code{'tcp} oder @code{'unix} angegeben werden. Für @code{'tcp} wird Tor nach Voreinstellung auf dem TCP-Port 9050 auf der loopback-Schnittstelle (d.h.@: localhost) lauschen. Für @code{'unix} wird Tor auf dem UNIX-Socket @file{/var/run/tor/socks-sock} lauschen, auf den Mitglieder der @code{tor}-Benutzergruppe Schreibberechtigung erhalten." #. type: table -#: doc/guix.texi:12971 +#: doc/guix.texi:12969 msgid "If you want to customize the SOCKS socket in more detail, leave @code{socks-socket-type} at its default value of @code{'tcp} and use @code{config-file} to override the default by providing your own @code{SocksPort} option." msgstr "Wenn Sie detailliertere Anpassungen am SOCKS-Socket vornehmen wollen, belassen Sie @code{socks-socket-type} bei seinem vorgegebenen Wert @code{'tcp} und benutzen Sie @code{config-file}, um diese Voreinstellung mit Ihrer eigenen @code{SocksPort}-Option zu überspielen." #. type: cindex -#: doc/guix.texi:12974 +#: doc/guix.texi:12972 #, no-wrap msgid "hidden service" msgstr "versteckter Dienst" #. type: deffn -#: doc/guix.texi:12975 +#: doc/guix.texi:12973 #, no-wrap msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}" msgstr "{Scheme-Prozedur} tor-hidden-service @var{Name} @var{Zuordnung}" #. type: deffn -#: doc/guix.texi:12978 +#: doc/guix.texi:12976 msgid "Define a new Tor @dfn{hidden service} called @var{name} and implementing @var{mapping}. @var{mapping} is a list of port/host tuples, such as:" msgstr "Hiermit wird ein neuer @dfn{versteckter Dienst} von Tor mit diesem @var{Name}n definiert, der die @var{Zuordnung} herstellt. Die @var{Zuordnung} ist eine Liste von Port-/Rechner-Tupeln wie hier:" #. type: example -#: doc/guix.texi:12982 +#: doc/guix.texi:12980 #, no-wrap msgid "" " '((22 \"127.0.0.1:22\")\n" @@ -23771,288 +23782,288 @@ msgstr "" " (80 \"127.0.0.1:8080\"))\n" #. type: deffn -#: doc/guix.texi:12986 +#: doc/guix.texi:12984 msgid "In this example, port 22 of the hidden service is mapped to local port 22, and port 80 is mapped to local port 8080." msgstr "In diesem Beispiel wird Port 22 des versteckten Dienstes an den ihm zugeordneten lokalen Port 22 weitergeleitet und Port 80 wird an den lokalen Port 8080 weitergeleitet." #. type: deffn -#: doc/guix.texi:12990 +#: doc/guix.texi:12988 msgid "This creates a @file{/var/lib/tor/hidden-services/@var{name}} directory, where the @file{hostname} file contains the @code{.onion} host name for the hidden service." msgstr "Dadurch wird ein Verzeichnis @file{/var/lib/tor/hidden-services/@var{Name}} erstellt, worin sich in der Datei @file{hostname} der @code{.onion}-Rechnername („Host“-Name) des versteckten Dienstes befindet." #. type: deffn -#: doc/guix.texi:12993 +#: doc/guix.texi:12991 msgid "See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information." msgstr "Siehe @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, die Dokumentation des Tor-Projekts} für weitere Informationen." #. type: Plain text -#: doc/guix.texi:12996 +#: doc/guix.texi:12994 msgid "The @code{(gnu services rsync)} module provides the following services:" msgstr "Das Modul @code{(gnu services rsync)} bietet die folgenden Dienste an:" #. type: Plain text -#: doc/guix.texi:13000 +#: doc/guix.texi:12998 msgid "You might want an rsync daemon if you have files that you want available so anyone (or just yourself) can download existing files or upload new files." msgstr "Sie könnten einen rsync-Daemon einsetzen wollen, um Dateien verfügbar zu machen, damit jeder (oder nur Sie) bestehende Dateien herunterladen oder neue Dateien hochladen kann." #. type: deffn -#: doc/guix.texi:13001 +#: doc/guix.texi:12999 #, no-wrap msgid "{Scheme Variable} rsync-service-type" msgstr "{Scheme-Variable} rsync-service-type" #. type: deffn -#: doc/guix.texi:13005 +#: doc/guix.texi:13003 msgid "This is the service type for the @uref{https://rsync.samba.org, rsync} daemon, The value for this service type is a @command{rsync-configuration} record as in this example:" msgstr "Dies ist der Diensttyp für den @uref{https://rsync.samba.org, rsync-Daemon}, er benutzt ein @command{rsync-configuration}-Verbundsobjekt wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:13008 +#: doc/guix.texi:13006 #, no-wrap msgid "(service rsync-service-type)\n" msgstr "(service rsync-service-type)\n" #. type: deffn -#: doc/guix.texi:13011 +#: doc/guix.texi:13009 msgid "See below for details about @code{rsync-configuration}." msgstr "Siehe unten für Details zur @code{rsync-configuration}." #. type: deftp -#: doc/guix.texi:13013 +#: doc/guix.texi:13011 #, no-wrap msgid "{Data Type} rsync-configuration" msgstr "{Datentyp} rsync-configuration" #. type: deftp -#: doc/guix.texi:13015 +#: doc/guix.texi:13013 msgid "Data type representing the configuration for @code{rsync-service}." msgstr "Datentyp, der die Konfiguration für den @code{rsync-service} repräsentiert." #. type: item -#: doc/guix.texi:13017 +#: doc/guix.texi:13015 #, no-wrap msgid "@code{package} (default: @var{rsync})" msgstr "@code{package} (Vorgabe: @var{rsync})" #. type: table -#: doc/guix.texi:13019 +#: doc/guix.texi:13017 msgid "@code{rsync} package to use." msgstr "Zu benutzendes @code{rsync}-Paket." #. type: item -#: doc/guix.texi:13020 +#: doc/guix.texi:13018 #, no-wrap msgid "@code{port-number} (default: @code{873})" msgstr "@code{port-number} (Vorgabe: @code{873})" #. type: table -#: doc/guix.texi:13024 +#: doc/guix.texi:13022 msgid "TCP port on which @command{rsync} listens for incoming connections. If port is less than @code{1024} @command{rsync} needs to be started as the @code{root} user and group." msgstr "Der TCP-Port, auf dem @command{rsync} auf eingehende Verbindungen lauscht. Wenn die Portnummer kleiner als @code{1024} ist, muss @command{rsync} als Administratornutzer @code{root} und auch mit dieser Benutzergruppe gestartet werden." #. type: item -#: doc/guix.texi:13025 +#: doc/guix.texi:13023 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/rsyncd/rsyncd.pid\"})" #. type: table -#: doc/guix.texi:13027 +#: doc/guix.texi:13025 msgid "Name of the file where @command{rsync} writes its PID." msgstr "Der Name der Datei, in die @command{rsync} seine PID schreibt." #. type: item -#: doc/guix.texi:13028 +#: doc/guix.texi:13026 #, no-wrap msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})" msgstr "@code{lock-file} (Vorgabe: @code{\"/var/run/rsyncd/rsyncd.lock\"})" #. type: table -#: doc/guix.texi:13030 +#: doc/guix.texi:13028 msgid "Name of the file where @command{rsync} writes its lock file." msgstr "Der Name der Datei, die @command{rsync} als seine Sperrdatei verwendet." #. type: item -#: doc/guix.texi:13031 +#: doc/guix.texi:13029 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})" msgstr "@code{log-file} (Vorgabe: @code{\"/var/log/rsyncd.log\"})" #. type: table -#: doc/guix.texi:13033 +#: doc/guix.texi:13031 msgid "Name of the file where @command{rsync} writes its log file." msgstr "Der Name der Datei, in die @command{rsync} seine Protokolle schreibt." #. type: item -#: doc/guix.texi:13034 +#: doc/guix.texi:13032 #, no-wrap msgid "@code{use-chroot?} (default: @var{#t})" msgstr "@code{use-chroot?} (Vorgabe: @var{#t})" #. type: table -#: doc/guix.texi:13036 +#: doc/guix.texi:13034 msgid "Whether to use chroot for @command{rsync} shared directory." msgstr "Ob chroot auf das über @command{rsync} geteilte Verzeichnis angewandt werden soll." #. type: item -#: doc/guix.texi:13037 +#: doc/guix.texi:13035 #, no-wrap msgid "@code{share-path} (default: @file{/srv/rsync})" msgstr "@code{share-path} (Vorgabe: @file{/srv/rsync})" #. type: table -#: doc/guix.texi:13039 +#: doc/guix.texi:13037 msgid "Location of the @command{rsync} shared directory." msgstr "Der Ort des Verzeichnisses, das @command{rsync} teilt, d.h.@: seine „Shared Directory“." #. type: item -#: doc/guix.texi:13040 +#: doc/guix.texi:13038 #, no-wrap msgid "@code{share-comment} (default: @code{\"Rsync share\"})" msgstr "@code{share-comment} (Vorgabe: @code{\"Rsync share\"})" #. type: table -#: doc/guix.texi:13042 +#: doc/guix.texi:13040 msgid "Comment of the @command{rsync} shared directory." msgstr "Kommentar zum von @command{rsync} geteilten Verzeichnis." #. type: item -#: doc/guix.texi:13043 +#: doc/guix.texi:13041 #, no-wrap msgid "@code{read-only?} (default: @var{#f})" msgstr "@code{read-only?} (Vorgabe: @var{#f})" #. type: table -#: doc/guix.texi:13045 +#: doc/guix.texi:13043 msgid "Read-write permissions to shared directory." msgstr "Bestimmt die Lese- und Schreibberechtigungen für das gemeinsame Verzeichnis." #. type: item -#: doc/guix.texi:13046 +#: doc/guix.texi:13044 #, no-wrap msgid "@code{timeout} (default: @code{300})" msgstr "@code{timeout} (Vorgabe: @code{300})" #. type: table -#: doc/guix.texi:13048 +#: doc/guix.texi:13046 msgid "I/O timeout in seconds." msgstr "Ein-/Ausgabe-Zeitbeschränkung in Sekunden." #. type: item -#: doc/guix.texi:13049 +#: doc/guix.texi:13047 #, no-wrap msgid "@code{user} (default: @var{\"root\"})" msgstr "@code{user} (Vorgabe: @var{\"root\"})" #. type: table -#: doc/guix.texi:13051 +#: doc/guix.texi:13049 msgid "Owner of the @code{rsync} process." msgstr "Das Benutzerkonto, dem der @code{rsync}-Prozess gehören soll." #. type: item -#: doc/guix.texi:13052 +#: doc/guix.texi:13050 #, no-wrap msgid "@code{group} (default: @var{\"root\"})" msgstr "@code{group} (Vorgabe: @var{\"root\"})" #. type: table -#: doc/guix.texi:13054 +#: doc/guix.texi:13052 msgid "Group of the @code{rsync} process." msgstr "Die Benutzergruppe des @code{rsync}-Prozesses." #. type: item -#: doc/guix.texi:13055 +#: doc/guix.texi:13053 #, no-wrap msgid "@code{uid} (default: @var{\"rsyncd\"})" msgstr "@code{uid} (Vorgabe: @var{\"rsyncd\"})" #. type: table -#: doc/guix.texi:13058 +#: doc/guix.texi:13056 msgid "User name or user ID that file transfers to and from that module should take place as when the daemon was run as @code{root}." msgstr "Der Benutzername oder der Benutzeridentifikator (d.h.@: die „User-ID“), mit dem Dateiübertragungen zum und vom Modul stattfinden sollen, wenn der Daemon als Administratornutzer @code{root} läuft." #. type: item -#: doc/guix.texi:13059 +#: doc/guix.texi:13057 #, no-wrap msgid "@code{gid} (default: @var{\"rsyncd\"})" msgstr "@code{gid} (Vorgabe: @var{\"rsyncd\"})" #. type: table -#: doc/guix.texi:13061 +#: doc/guix.texi:13059 msgid "Group name or group ID that will be used when accessing the module." msgstr "Benutzergruppenname oder Gruppenidentifikator („Group-ID“), mit dem auf das Modul zugegriffen wird." #. type: Plain text -#: doc/guix.texi:13066 +#: doc/guix.texi:13064 msgid "Furthermore, @code{(gnu services ssh)} provides the following services." msgstr "Des Weiteren bietet das Modul @code{(gnu services ssh)} die folgenden Dienste an." #. type: cindex -#: doc/guix.texi:13066 doc/guix.texi:13105 doc/guix.texi:24782 +#: doc/guix.texi:13064 doc/guix.texi:13103 doc/guix.texi:24768 #, no-wrap msgid "SSH" msgstr "SSH" #. type: cindex -#: doc/guix.texi:13067 doc/guix.texi:13106 doc/guix.texi:24783 +#: doc/guix.texi:13065 doc/guix.texi:13104 doc/guix.texi:24769 #, no-wrap msgid "SSH server" msgstr "SSH-Server" #. type: deffn -#: doc/guix.texi:13069 +#: doc/guix.texi:13067 #, no-wrap msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" msgstr "{Scheme-Prozedur} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" #. type: deffn -#: doc/guix.texi:13078 +#: doc/guix.texi:13076 msgid "[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-key-authentication? #t] [#:initialize? #t] Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}. @var{host-key} must designate a file containing the host key, and readable only by root." msgstr "[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-key-authentication? #t] [#:initialize? #t] Das @command{lshd}-Programm auf dem @var{lsh}-Paket so ausführen, dass es auf dem Port mit Portnummer @var{port-number} lauscht. @var{host-key} muss eine Datei angeben, die den Wirtsschlüssel enthält, die nur für den Administratornutzer lesbar sein darf." #. type: deffn -#: doc/guix.texi:13084 +#: doc/guix.texi:13082 msgid "When @var{daemonic?} is true, @command{lshd} will detach from the controlling terminal and log its output to syslogd, unless one sets @var{syslog-output?} to false. Obviously, it also makes lsh-service depend on existence of syslogd service. When @var{pid-file?} is true, @command{lshd} writes its PID to the file called @var{pid-file}." msgstr "Wenn @var{daemonic?} wahr ist, entkoppelt sich @command{lshd} vom Terminal, auf dem er läuft, und schickt seine Protokolle an syslogd, außer @var{syslog-output?} ist auf falsch gesetzt. Selbstverständlich hängt der lsh-service dann auch von der Existenz eines syslogd-Dienstes ab. Wenn @var{pid-file?} wahr ist, schreibt @command{lshd} seine PID in die Datei namens @var{pid-file}." #. type: deffn -#: doc/guix.texi:13088 +#: doc/guix.texi:13086 msgid "When @var{initialize?} is true, automatically create the seed and host key upon service activation if they do not exist yet. This may take long and require interaction." msgstr "Wenn @var{initialize?} wahr ist, wird der Startwert zur Verschlüsselung ebenso wie der Wirtsschlüssel bei der Dienstaktivierung erstellt, falls sie noch nicht existieren. Das kann lange dauern und Anwenderinteraktion kann dabei erforderlich sein." #. type: deffn -#: doc/guix.texi:13093 +#: doc/guix.texi:13091 msgid "When @var{initialize?} is false, it is up to the user to initialize the randomness generator (@pxref{lsh-make-seed,,, lsh, LSH Manual}), and to create a key pair with the private key stored in file @var{host-key} (@pxref{lshd basics,,, lsh, LSH Manual})." msgstr "Wenn @var{initialize?} falsch ist, bleibt es dem Nutzer überlassen, den Zufallsgenerator zu initialisieren (siehe @ref{lsh-make-seed,,, lsh, LSH Manual}) und ein Schlüsselpaar zu erzeugen, dessen privater Schlüssel in der mit @var{host-key} angegebenen Datei steht (siehe @ref{lshd basics,,, lsh, LSH Manual})." #. type: deffn -#: doc/guix.texi:13097 +#: doc/guix.texi:13095 msgid "When @var{interfaces} is empty, lshd listens for connections on all the network interfaces; otherwise, @var{interfaces} must be a list of host names or addresses." msgstr "Wenn @var{interfaces} leer ist, lauscht lshd an allen Netzwerkschnittstellen auf Verbindungen, andernfalls muss @var{interfaces} eine Liste von Rechnernamen („Host“-Namen) oder Adressen bezeichnen." #. type: deffn -#: doc/guix.texi:13101 +#: doc/guix.texi:13099 msgid "@var{allow-empty-passwords?} specifies whether to accept log-ins with empty passwords, and @var{root-login?} specifies whether to accept log-ins as root." msgstr "@var{allow-empty-passwords?} gibt an, ob Anmeldungen mit leeren Passwörtern akzeptiert werden sollen, und @var{root-login?} gibt an, ob Anmeldungen als Administratornutzer „root“ akzeptiert werden sollen." #. type: deffn -#: doc/guix.texi:13103 +#: doc/guix.texi:13101 msgid "The other options should be self-descriptive." msgstr "Die anderen Felder sollten selbsterklärend sein." #. type: deffn -#: doc/guix.texi:13107 +#: doc/guix.texi:13105 #, no-wrap msgid "{Scheme Variable} openssh-service-type" msgstr "{Scheme-Variable} openssh-service-type" #. type: deffn -#: doc/guix.texi:13111 +#: doc/guix.texi:13109 msgid "This is the type for the @uref{http://www.openssh.org, OpenSSH} secure shell daemon, @command{sshd}. Its value must be an @code{openssh-configuration} record as in this example:" msgstr "Dies ist der Diensttyp für den @uref{http://www.openssh.org, OpenSSH-Secure-Shell-Daemon}, @command{sshd}. Sein Wert muss ein @code{openssh-configuration}-Verbundsobjekt wie in diesem Beispiel sein:" #. type: example -#: doc/guix.texi:13120 +#: doc/guix.texi:13118 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -24072,17 +24083,17 @@ msgstr "" " (\"bob\" ,(local-file \"bob.pub\"))))))\n" #. type: deffn -#: doc/guix.texi:13123 +#: doc/guix.texi:13121 msgid "See below for details about @code{openssh-configuration}." msgstr "Siehe unten für Details zur @code{openssh-configuration}." #. type: deffn -#: doc/guix.texi:13126 +#: doc/guix.texi:13124 msgid "This service can be extended with extra authorized keys, as in this example:" msgstr "Dieser Dienst kann mit weiteren autorisierten Schlüsseln erweitert werden, wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:13131 +#: doc/guix.texi:13129 #, no-wrap msgid "" "(service-extension openssh-service-type\n" @@ -24094,192 +24105,192 @@ msgstr "" " ,(local-file \"charlie.pub\")))))\n" #. type: deftp -#: doc/guix.texi:13134 +#: doc/guix.texi:13132 #, no-wrap msgid "{Data Type} openssh-configuration" msgstr "{Datentyp} openssh-configuration" #. type: deftp -#: doc/guix.texi:13136 +#: doc/guix.texi:13134 msgid "This is the configuration record for OpenSSH's @command{sshd}." msgstr "Dies ist der Verbundstyp für die Konfiguration von OpenSSHs @command{sshd}." #. type: item -#: doc/guix.texi:13138 +#: doc/guix.texi:13136 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/sshd.pid\"})" #. type: table -#: doc/guix.texi:13140 +#: doc/guix.texi:13138 msgid "Name of the file where @command{sshd} writes its PID." msgstr "Der Name der Datei, in die @command{sshd} seine PID schreibt." #. type: item -#: doc/guix.texi:13141 +#: doc/guix.texi:13139 #, no-wrap msgid "@code{port-number} (default: @code{22})" msgstr "@code{port-number} (Vorgabe: @code{22})" #. type: table -#: doc/guix.texi:13143 +#: doc/guix.texi:13141 msgid "TCP port on which @command{sshd} listens for incoming connections." msgstr "Der TCP-Port, auf dem @command{sshd} auf eingehende Verbindungen lauscht." #. type: item -#: doc/guix.texi:13144 +#: doc/guix.texi:13142 #, no-wrap msgid "@code{permit-root-login} (default: @code{#f})" msgstr "@code{permit-root-login} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13149 +#: doc/guix.texi:13147 msgid "This field determines whether and when to allow logins as root. If @code{#f}, root logins are disallowed; if @code{#t}, they are allowed. If it's the symbol @code{'without-password}, then root logins are permitted but not with password-based authentication." msgstr "Dieses Feld bestimmt, ob und wann Anmeldungen als Administratornutzer „root“ erlaubt sind. Wenn es @code{#f} ist, sind Anmeldungen als Administrator gesperrt, bei @code{#t} sind sie erlaubt. Wird hier das Symbol @code{'without-password} angegeben, dann sind Anmeldungen als Administrator erlaubt, aber nur, wenn keine passwortbasierte Authentifizierung verwendet wird." #. type: item -#: doc/guix.texi:13150 doc/guix.texi:13311 +#: doc/guix.texi:13148 doc/guix.texi:13309 #, no-wrap msgid "@code{allow-empty-passwords?} (default: @code{#f})" msgstr "@code{allow-empty-passwords?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13153 +#: doc/guix.texi:13151 msgid "When true, users with empty passwords may log in. When false, they may not." msgstr "Wenn dies auf wahr gesetzt ist, können sich Nutzer, deren Passwort leer ist, anmelden. Ist es falsch, können sie es nicht." #. type: item -#: doc/guix.texi:13154 doc/guix.texi:13314 +#: doc/guix.texi:13152 doc/guix.texi:13312 #, no-wrap msgid "@code{password-authentication?} (default: @code{#t})" msgstr "@code{password-authentication?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13157 +#: doc/guix.texi:13155 msgid "When true, users may log in with their password. When false, they have other authentication methods." msgstr "Wenn dies wahr ist, können sich Benutzer mit ihrem Passwort anmelden. Wenn es falsch ist, müssen sie andere Authentizierungsmethoden benutzen." #. type: item -#: doc/guix.texi:13158 +#: doc/guix.texi:13156 #, no-wrap msgid "@code{public-key-authentication?} (default: @code{#t})" msgstr "@code{public-key-authentication?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13161 +#: doc/guix.texi:13159 msgid "When true, users may log in using public key authentication. When false, users have to use other authentication method." msgstr "Wenn dies wahr ist, können Benutzer zur Anmeldung mit ihrem öffentlichen Schlüssel authentifiziert werden. Wenn es falsch ist, müssen sie andere Authentizierungsmethoden benutzen." #. type: table -#: doc/guix.texi:13164 +#: doc/guix.texi:13162 msgid "Authorized public keys are stored in @file{~/.ssh/authorized_keys}. This is used only by protocol version 2." msgstr "Autorisierte öffentliche Schlüssel werden in @file{~/.ssh/authorized_keys} gespeichert. Dies wird nur für Protokollversion 2 benutzt." #. type: item -#: doc/guix.texi:13165 +#: doc/guix.texi:13163 #, no-wrap msgid "@code{x11-forwarding?} (default: @code{#f})" msgstr "@code{x11-forwarding?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13169 +#: doc/guix.texi:13167 msgid "When true, forwarding of X11 graphical client connections is enabled---in other words, @command{ssh} options @option{-X} and @option{-Y} will work." msgstr "Wenn dies auf wahr gesetzt ist, ist das Weiterleiten von Verbindungen an grafische X11-Clients erlaubt — mit anderen Worten funktionieren dann die @command{ssh}-Befehlszeilenoptionen @option{-X} und @option{-Y}." #. type: item -#: doc/guix.texi:13170 +#: doc/guix.texi:13168 #, no-wrap msgid "@code{allow-agent-forwarding?} (default: @code{#t})" msgstr "@code{allow-agent-forwarding?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13172 +#: doc/guix.texi:13170 msgid "Whether to allow agent forwarding." msgstr "Ob Weiterleitung an den SSH-Agenten zugelassen werden soll." #. type: item -#: doc/guix.texi:13173 +#: doc/guix.texi:13171 #, no-wrap msgid "@code{allow-tcp-forwarding?} (default: @code{#t})" msgstr "@code{allow-tcp-forwarding?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13175 +#: doc/guix.texi:13173 msgid "Whether to allow TCP forwarding." msgstr "Ob Weiterleitung von TCP-Kommunikation zugelassen werden soll." #. type: item -#: doc/guix.texi:13176 +#: doc/guix.texi:13174 #, no-wrap msgid "@code{gateway-ports?} (default: @code{#f})" msgstr "@code{gateway-ports?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13178 +#: doc/guix.texi:13176 msgid "Whether to allow gateway ports." msgstr "Ob Ports als Zugang für eingehende Verbindungen („Gateway-Ports“) weitergeleitet werden dürfen." #. type: item -#: doc/guix.texi:13179 +#: doc/guix.texi:13177 #, no-wrap msgid "@code{challenge-response-authentication?} (default: @code{#f})" msgstr "@code{challenge-response-authentication?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13182 +#: doc/guix.texi:13180 msgid "Specifies whether challenge response authentication is allowed (e.g.@: via PAM)." msgstr "Gibt an, ob „Challenge-Response“-Authentifizierung zugelassen wird (z.B.@: über PAM)." #. type: item -#: doc/guix.texi:13183 +#: doc/guix.texi:13181 #, no-wrap msgid "@code{use-pam?} (default: @code{#t})" msgstr "@code{use-pam?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13189 +#: doc/guix.texi:13187 msgid "Enables the Pluggable Authentication Module interface. If set to @code{#t}, this will enable PAM authentication using @code{challenge-response-authentication?} and @code{password-authentication?}, in addition to PAM account and session module processing for all authentication types." msgstr "Aktiviert die Pluggable-Authentication-Module-Schnittstelle. Wenn es auf @code{#t} gesetzt ist, wird dadurch PAM-Authentizierung über @code{challenge-response-authentication?} und @code{password-authentication?} aktiviert, zusätzlich zur Verarbeitung von PAM-Konten und Sitzungsmodulen für alle Authentizierungsarten." #. type: table -#: doc/guix.texi:13194 +#: doc/guix.texi:13192 msgid "Because PAM challenge response authentication usually serves an equivalent role to password authentication, you should disable either @code{challenge-response-authentication?} or @code{password-authentication?}." msgstr "Weil PAM-Challenge-Response-Authentizierung oft für dieselben Zwecke wie Passwortauthentizierung eingesetzt wird, sollten Sie entweder @code{challenge-response-authentication?} oder @code{password-authentication?} deaktivieren." #. type: item -#: doc/guix.texi:13195 +#: doc/guix.texi:13193 #, no-wrap msgid "@code{print-last-log?} (default: @code{#t})" msgstr "@code{print-last-log?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13198 +#: doc/guix.texi:13196 msgid "Specifies whether @command{sshd} should print the date and time of the last user login when a user logs in interactively." msgstr "Hiermit wird angegeben, ob @command{sshd} Datum und Uhrzeit der letzten Anmeldung anzeigen soll, wenn sich ein Benutzer interaktiv anmeldet." #. type: item -#: doc/guix.texi:13199 +#: doc/guix.texi:13197 #, no-wrap msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})" msgstr "@code{subsystems} (Vorgabe: @code{'((\"sftp\" \"internal-sftp\"))})" #. type: table -#: doc/guix.texi:13201 +#: doc/guix.texi:13199 msgid "Configures external subsystems (e.g.@: file transfer daemon)." msgstr "Hiermit werden externe Subsysteme konfiguriert (z.B.@: ein Dateiübertragungsdaemon)." #. type: table -#: doc/guix.texi:13205 +#: doc/guix.texi:13203 msgid "This is a list of two-element lists, each of which containing the subsystem name and a command (with optional arguments) to execute upon subsystem request." msgstr "Diese werden als Liste von zweielementigen Listen angegeben, von denen jede den Namen des Subsystems und einen Befehl (mit optionalen Befehlszeilenargumenten) benennt, der bei einer Anfrage an das Subsystem ausgeführt werden soll." #. type: table -#: doc/guix.texi:13208 +#: doc/guix.texi:13206 msgid "The command @command{internal-sftp} implements an in-process SFTP server. Alternately, one can specify the @command{sftp-server} command:" msgstr "Der Befehl @command{internal-sftp} implementiert einen SFTP-Server im selben Prozess. Alternativ kann man den @command{sftp-server}-Befehl angeben:" #. type: example -#: doc/guix.texi:13213 +#: doc/guix.texi:13211 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -24293,28 +24304,28 @@ msgstr "" " `((\"sftp\" ,(file-append openssh \"/libexec/sftp-server\"))))))\n" #. type: item -#: doc/guix.texi:13215 +#: doc/guix.texi:13213 #, no-wrap msgid "@code{accepted-environment} (default: @code{'()})" msgstr "@code{accepted-environment} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13217 +#: doc/guix.texi:13215 msgid "List of strings describing which environment variables may be exported." msgstr "Eine Liste von Zeichenketten, die die Umgebungsvariablen benennen, die exportiert werden dürfen." #. type: table -#: doc/guix.texi:13220 +#: doc/guix.texi:13218 msgid "Each string gets on its own line. See the @code{AcceptEnv} option in @code{man sshd_config}." msgstr "Jede Zeichenkette wird zu einer eigenen Zeile in der Konfigurationsdatei. Siehe die Option @code{AcceptEnv} in @code{man sshd_config}." #. type: table -#: doc/guix.texi:13225 +#: doc/guix.texi:13223 msgid "This example allows ssh-clients to export the @code{COLORTERM} variable. It is set by terminal emulators, which support colors. You can use it in your shell's ressource file to enable colors for the prompt and commands if this variable is set." msgstr "Mit diesem Beispiel können SSH-Clients die Umgebungsvariable @code{COLORTERM} exportieren. Sie wird von Terminal-Emulatoren gesetzt, die Farben unterstützen. Sie können Sie in der Ressourcendatei Ihrer Shell benutzen, um Farben in der Eingabeaufforderung und in Befehlen zu aktivieren, wenn diese Variable gesetzt ist." #. type: example -#: doc/guix.texi:13230 +#: doc/guix.texi:13228 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -24326,30 +24337,30 @@ msgstr "" " (accepted-environment '(\"COLORTERM\"))))\n" #. type: item -#: doc/guix.texi:13232 +#: doc/guix.texi:13230 #, no-wrap msgid "@code{authorized-keys} (default: @code{'()})" msgstr "@code{authorized-keys} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:13233 +#: doc/guix.texi:13231 #, no-wrap msgid "authorized keys, SSH" msgstr "Autorisierte Schlüssel, SSH" #. type: cindex -#: doc/guix.texi:13234 +#: doc/guix.texi:13232 #, no-wrap msgid "SSH authorized keys" msgstr "SSH, autorisierte Schlüssel" #. type: table -#: doc/guix.texi:13238 +#: doc/guix.texi:13236 msgid "This is the list of authorized keys. Each element of the list is a user name followed by one or more file-like objects that represent SSH public keys. For example:" msgstr "Dies ist die Liste der autorisierten Schlüssel. Jedes Element der Liste ist ein Benutzername gefolgt von einem oder mehr dateiartigen Objekten, die öffentliche SSH-Schlüssel repräsentieren. Zum Beispiel werden mit" #. type: example -#: doc/guix.texi:13245 +#: doc/guix.texi:13243 #, no-wrap msgid "" "(openssh-configuration\n" @@ -24365,44 +24376,44 @@ msgstr "" " (\"root\" ,(local-file \"rekado.pub\") ,(local-file \"chris.pub\")))))\n" #. type: table -#: doc/guix.texi:13250 +#: doc/guix.texi:13248 msgid "registers the specified public keys for user accounts @code{rekado}, @code{chris}, and @code{root}." msgstr "die angegebenen öffentlichen Schlüssel für die Benutzerkonten @code{rekado}, @code{chris} und @code{root} registriert." #. type: table -#: doc/guix.texi:13253 +#: doc/guix.texi:13251 msgid "Additional authorized keys can be specified @i{via} @code{service-extension}." msgstr "Weitere autorisierte Schlüssel können als @code{service-extension} hinzugefügt werden." #. type: table -#: doc/guix.texi:13256 +#: doc/guix.texi:13254 msgid "Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}." msgstr "Beachten Sie, dass das hier neben @file{~/.ssh/authorized_keys} @emph{ohne} sich zu stören benutzt werden kann." #. type: item -#: doc/guix.texi:13257 +#: doc/guix.texi:13255 #, no-wrap msgid "@code{log-level} (default: @code{'info})" msgstr "@code{log-level} (Vorgabe: @code{'info})" #. type: table -#: doc/guix.texi:13261 +#: doc/guix.texi:13259 msgid "This is a symbol specifying the logging level: @code{quiet}, @code{fatal}, @code{error}, @code{info}, @code{verbose}, @code{debug}, etc. See the man page for @file{sshd_config} for the full list of level names." msgstr "Dieses Symbol gibt die Stufe der Protokollierung an: @code{quiet} (schweigsam), @code{fatal}, @code{error}, @code{info}, @code{verbose} (ausführlich), @code{debug} etc. Siehe die Handbuchseite für @file{sshd_config} für die vollständige Liste der Stufenbezeichnungen." #. type: item -#: doc/guix.texi:13262 doc/guix.texi:18877 +#: doc/guix.texi:13260 doc/guix.texi:18874 #, no-wrap msgid "@code{extra-content} (default: @code{\"\"})" msgstr "@code{extra-content} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:13267 +#: doc/guix.texi:13265 msgid "This field can be used to append arbitrary text to the configuration file. It is especially useful for elaborate configurations that cannot be expressed otherwise. This configuration, for example, would generally disable root logins, but permit them from one specific IP address:" msgstr "Dieses Feld kann benutzt werden, um beliebigen Text an die Konfigurationsdatei anzuhängen. Es ist besonders bei ausgeklügelten Konfigurationen nützlich, die anders nicht ausgedrückt werden können. Zum Beispiel würden mit dieser Konfiguration Anmeldungen als Administratornutzer „root“ grundsätzlich untersagt, lediglich für eine bestimmte IP-Adresse wären sie zugelassen:" #. type: example -#: doc/guix.texi:13273 +#: doc/guix.texi:13271 #, no-wrap msgid "" "(openssh-configuration\n" @@ -24416,23 +24427,23 @@ msgstr "" " PermitRootLogin yes\"))\n" #. type: deffn -#: doc/guix.texi:13278 +#: doc/guix.texi:13276 #, no-wrap msgid "{Scheme Procedure} dropbear-service [@var{config}]" msgstr "{Scheme-Prozedur} dropbear-service [@var{Konfiguration}]" #. type: deffn -#: doc/guix.texi:13282 +#: doc/guix.texi:13280 msgid "Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH daemon} with the given @var{config}, a @code{} object." msgstr "Den @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear-SSH-Daemon} mit der angegebenen @var{Konfiguration} ausführen, einem @code{}-Objekt." #. type: deffn -#: doc/guix.texi:13285 +#: doc/guix.texi:13283 msgid "For example, to specify a Dropbear service listening on port 1234, add this call to the operating system's @code{services} field:" msgstr "Wenn Sie zum Beispiel einen Dropbear-Dienst angeben möchten, der auf Port 1234 lauscht, dann fügen Sie diesen Aufruf ins @code{services}-Feld des Betriebssystems ein:" #. type: example -#: doc/guix.texi:13289 +#: doc/guix.texi:13287 #, no-wrap msgid "" "(dropbear-service (dropbear-configuration\n" @@ -24442,99 +24453,99 @@ msgstr "" " (port-number 1234)))\n" #. type: deftp -#: doc/guix.texi:13292 +#: doc/guix.texi:13290 #, no-wrap msgid "{Data Type} dropbear-configuration" msgstr "{Datentyp} dropbear-configuration" #. type: deftp -#: doc/guix.texi:13294 +#: doc/guix.texi:13292 msgid "This data type represents the configuration of a Dropbear SSH daemon." msgstr "Dieser Datentyp repräsentiert die Konfiguration eines Dropbear-SSH-Daemons." #. type: item -#: doc/guix.texi:13296 +#: doc/guix.texi:13294 #, no-wrap msgid "@code{dropbear} (default: @var{dropbear})" msgstr "@code{dropbear} (Vorgabe: @var{dropbear})" #. type: table -#: doc/guix.texi:13298 +#: doc/guix.texi:13296 msgid "The Dropbear package to use." msgstr "Das zu benutzende Dropbear-Paket." #. type: item -#: doc/guix.texi:13299 +#: doc/guix.texi:13297 #, no-wrap msgid "@code{port-number} (default: 22)" msgstr "@code{port-number} (Vorgabe: 22)" #. type: table -#: doc/guix.texi:13301 +#: doc/guix.texi:13299 msgid "The TCP port where the daemon waits for incoming connections." msgstr "Die Portnummer des TCP-Ports, auf dem der Daemon auf eingehende Verbindungen wartet." #. type: item -#: doc/guix.texi:13302 +#: doc/guix.texi:13300 #, no-wrap msgid "@code{syslog-output?} (default: @code{#t})" msgstr "@code{syslog-output?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13304 +#: doc/guix.texi:13302 msgid "Whether to enable syslog output." msgstr "Ob eine Ausgabe für Syslog aktiviert sein soll." #. type: item -#: doc/guix.texi:13305 +#: doc/guix.texi:13303 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/dropbear.pid\"})" #. type: table -#: doc/guix.texi:13307 +#: doc/guix.texi:13305 msgid "File name of the daemon's PID file." msgstr "Der Dateiname der PID-Datei des Daemons." #. type: item -#: doc/guix.texi:13308 +#: doc/guix.texi:13306 #, no-wrap msgid "@code{root-login?} (default: @code{#f})" msgstr "@code{root-login?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13310 +#: doc/guix.texi:13308 msgid "Whether to allow @code{root} logins." msgstr "Ob Anmeldungen als Administratornutzer @code{root} möglich sein sollen." #. type: table -#: doc/guix.texi:13313 +#: doc/guix.texi:13311 msgid "Whether to allow empty passwords." msgstr "Ob leere Passwörter zugelassen sein sollen." #. type: table -#: doc/guix.texi:13316 +#: doc/guix.texi:13314 msgid "Whether to enable password-based authentication." msgstr "Ob passwortbasierte Authentizierung zugelassen sein soll." #. type: defvr -#: doc/guix.texi:13319 +#: doc/guix.texi:13317 #, no-wrap msgid "{Scheme Variable} %facebook-host-aliases" msgstr "{Scheme-Variable} %facebook-host-aliases" #. type: defvr -#: doc/guix.texi:13325 +#: doc/guix.texi:13323 msgid "This variable contains a string for use in @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). Each line contains a entry that maps a known server name of the Facebook on-line service---e.g., @code{www.facebook.com}---to the local host---@code{127.0.0.1} or its IPv6 equivalent, @code{::1}." msgstr "Diese Variable enthält eine Zeichenkette, die Sie für @file{/etc/hosts} benutzen können (siehe @ref{Host Names,,, libc, The GNU C Library Reference Manual}). Jede Zeile enthält einen Eintrag, der einen bekannten Servernamen des Facebook-Online-Dienstes — z.B.@: @code{www.facebook.com} — an den lokalen Rechner umleitet — also an @code{127.0.0.1} oder dessen IPv6-Gegenstück @code{::1}." #. type: defvr -#: doc/guix.texi:13329 +#: doc/guix.texi:13327 msgid "This variable is typically used in the @code{hosts-file} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @file{/etc/hosts}}):" msgstr "Normalerweise wird diese Variable im Feld @code{hosts-file} einer @code{operating-system}-Betriebssystemdeklaration benutzt (siehe @ref{operating-system Reference, @file{/etc/hosts}}):" #. type: example -#: doc/guix.texi:13342 +#: doc/guix.texi:13340 #, no-wrap msgid "" "(operating-system\n" @@ -24560,348 +24571,348 @@ msgstr "" " %facebook-host-aliases))))\n" #. type: defvr -#: doc/guix.texi:13346 +#: doc/guix.texi:13344 msgid "This mechanism can prevent programs running locally, such as Web browsers, from accessing Facebook." msgstr "Dieser Mechanismus kann verhindern, dass lokal laufende Programme, wie z.B.@: Web-Browser, auf Facebook zugreifen." #. type: Plain text -#: doc/guix.texi:13349 +#: doc/guix.texi:13347 msgid "The @code{(gnu services avahi)} provides the following definition." msgstr "Das Modul @code{(gnu services avahi)} stellt die folgende Definition zur Verfügung." #. type: defvr -#: doc/guix.texi:13350 +#: doc/guix.texi:13348 #, no-wrap msgid "{Scheme Variable} avahi-service-type" msgstr "{Scheme-Variable} avahi-service-type" #. type: defvr -#: doc/guix.texi:13355 +#: doc/guix.texi:13353 msgid "This is the service that runs @command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for service discovery and ``zero-configuration'' host name lookups (see @uref{https://avahi.org/}). Its value must be a @code{zero-configuration} record---see below." msgstr "Dieser Dienst führt den @command{avahi-daemon} aus, einen systemweiten mDNS-/DNS-SD-Anbieter, mit dem im lokalen Netzwerk befindliche Geräte erkannt werden können („Service Discovery“) und Rechnernamen selbstständig aufgelöst werden können („Zero-Configuration“) (siehe @uref{https://avahi.org/}). Sein Wert muss ein @code{zero-configuration}-Verbundsobjekt sein — siehe unten." #. type: defvr -#: doc/guix.texi:13360 +#: doc/guix.texi:13358 msgid "This service extends the name service cache daemon (nscd) so that it can resolve @code{.local} host names using @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}. @xref{Name Service Switch}, for information on host name resolution." msgstr "Dieser Dienst erweitert den Name Service Cache Daemon (nscd), damit er @code{.local}-Rechnernamen mit @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns} auflösen kann. Siehe @ref{Name Service Switch} für Informationen zur Auflösung von Rechnernamen." #. type: defvr -#: doc/guix.texi:13363 +#: doc/guix.texi:13361 msgid "Additionally, add the @var{avahi} package to the system profile so that commands such as @command{avahi-browse} are directly usable." msgstr "Des Weiteren wird das @var{avahi}-Paket zum Systemprofil hinzugefügt, damit Befehle wie @command{avahi-browse} einfach benutzt werden können." #. type: deftp -#: doc/guix.texi:13365 +#: doc/guix.texi:13363 #, no-wrap msgid "{Data Type} avahi-configuration" msgstr "{Datentyp} avahi-configuration" #. type: deftp -#: doc/guix.texi:13367 +#: doc/guix.texi:13365 msgid "Data type representation the configuration for Avahi." msgstr "Dieser Datentyp repräsentiert die Konfiguration von Avahi." #. type: item -#: doc/guix.texi:13370 +#: doc/guix.texi:13368 #, no-wrap msgid "@code{host-name} (default: @code{#f})" msgstr "@code{host-name} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13373 +#: doc/guix.texi:13371 msgid "If different from @code{#f}, use that as the host name to publish for this machine; otherwise, use the machine's actual host name." msgstr "Wenn dies auf etwas anderes als @code{#f} gesetzt ist, wird es anderen als Rechnername für diese Maschine mitgeteilt, andernfalls wird der tatsächliche Rechnername anderen mitgeteilt." #. type: item -#: doc/guix.texi:13374 +#: doc/guix.texi:13372 #, no-wrap msgid "@code{publish?} (default: @code{#t})" msgstr "@code{publish?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13377 +#: doc/guix.texi:13375 msgid "When true, allow host names and services to be published (broadcast) over the network." msgstr "Wenn es auf wahr gesetzt ist, dürfen Rechnernamen und Avahi-Dienste über das Netzwerk mitgeteilt werden (als Broadcast)." #. type: item -#: doc/guix.texi:13378 +#: doc/guix.texi:13376 #, no-wrap msgid "@code{publish-workstation?} (default: @code{#t})" msgstr "@code{publish-workstation?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13382 +#: doc/guix.texi:13380 msgid "When true, @command{avahi-daemon} publishes the machine's host name and IP address via mDNS on the local network. To view the host names published on your local network, you can run:" msgstr "Wenn es auf wahr gesetzt ist, teilt @command{avahi-daemon} den Rechnernamen dieser Maschine und die IP-Adresse über mDNS auf dem lokalen Netzwerk öffentlich mit. Um die auf Ihrem lokalen Netzwerk mitgeteilten Rechnernamen zu sehen, können Sie das hier ausführen:" #. type: example -#: doc/guix.texi:13385 +#: doc/guix.texi:13383 #, no-wrap msgid "avahi-browse _workstation._tcp\n" msgstr "avahi-browse _workstation._tcp\n" #. type: item -#: doc/guix.texi:13387 +#: doc/guix.texi:13385 #, no-wrap msgid "@code{wide-area?} (default: @code{#f})" msgstr "@code{wide-area?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13389 +#: doc/guix.texi:13387 msgid "When true, DNS-SD over unicast DNS is enabled." msgstr "Wenn dies auf wahr gesetzt ist, ist DNS-SD über „Unicast DNS“ aktiviert." #. type: item -#: doc/guix.texi:13390 +#: doc/guix.texi:13388 #, no-wrap msgid "@code{ipv4?} (default: @code{#t})" msgstr "@code{ipv4?} (Vorgabe: @code{#t})" #. type: itemx -#: doc/guix.texi:13391 +#: doc/guix.texi:13389 #, no-wrap msgid "@code{ipv6?} (default: @code{#t})" msgstr "@code{ipv6?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13393 +#: doc/guix.texi:13391 msgid "These fields determine whether to use IPv4/IPv6 sockets." msgstr "Mit diesen Feldern wird festgelegt, ob IPv4-/IPv6-Sockets verwendet werden." #. type: item -#: doc/guix.texi:13394 +#: doc/guix.texi:13392 #, no-wrap msgid "@code{domains-to-browse} (default: @code{'()})" msgstr "@code{domains-to-browse} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13396 +#: doc/guix.texi:13394 msgid "This is a list of domains to browse." msgstr "Dies ist eine Liste von Domänen, die durchsucht werden." #. type: deffn -#: doc/guix.texi:13399 +#: doc/guix.texi:13397 #, no-wrap msgid "{Scheme Variable} openvswitch-service-type" msgstr "{Scheme-Variable} openvswitch-service-type" #. type: deffn -#: doc/guix.texi:13403 +#: doc/guix.texi:13401 msgid "This is the type of the @uref{https://www.openvswitch.org, Open vSwitch} service, whose value should be an @code{openvswitch-configuration} object." msgstr "Dies ist der Diensttyp des @uref{https://www.openvswitch.org, Open-vSwitch-Dienstes}, der als Wert ein @code{openvswitch-configuration}-Objekt hat." #. type: deftp -#: doc/guix.texi:13405 +#: doc/guix.texi:13403 #, no-wrap msgid "{Data Type} openvswitch-configuration" msgstr "{Datentyp} openvswitch-configuration" #. type: deftp -#: doc/guix.texi:13409 +#: doc/guix.texi:13407 msgid "Data type representing the configuration of Open vSwitch, a multilayer virtual switch which is designed to enable massive network automation through programmatic extension." msgstr "Der Datentyp, der die Konfiguration von Open vSwitch repräsentiert, einem auf mehreren Schichten arbeitenden („multilayer“) virtuellen Switch, der für massenhafte Netzwerkautomatisierung durch programmatische Erweiterungen eingesetzt werden kann." #. type: item -#: doc/guix.texi:13411 +#: doc/guix.texi:13409 #, no-wrap msgid "@code{package} (default: @var{openvswitch})" msgstr "@code{package} (Vorgabe: @var{openvswitch})" #. type: table -#: doc/guix.texi:13413 +#: doc/guix.texi:13411 msgid "Package object of the Open vSwitch." msgstr "Das Paketobjekt vom Open vSwitch." #. type: cindex -#: doc/guix.texi:13420 +#: doc/guix.texi:13418 #, no-wrap msgid "X11" msgstr "X11" #. type: cindex -#: doc/guix.texi:13421 +#: doc/guix.texi:13419 #, no-wrap msgid "X Window System" msgstr "X Window System" #. type: cindex -#: doc/guix.texi:13422 doc/guix.texi:13671 +#: doc/guix.texi:13420 doc/guix.texi:13669 #, no-wrap msgid "login manager" msgstr "Anmeldeverwaltung" #. type: Plain text -#: doc/guix.texi:13427 +#: doc/guix.texi:13425 msgid "Support for the X Window graphical display system---specifically Xorg---is provided by the @code{(gnu services xorg)} module. Note that there is no @code{xorg-service} procedure. Instead, the X server is started by the @dfn{login manager}, by default the GNOME Display Manager (GDM)." msgstr "Unterstützung für das grafische Anzeigesystem X Window — insbesondere Xorg — wird vom Modul @code{(gnu services xorg)} zur Verfügung gestellt. Beachten Sie, dass es @emph{keine} @code{xorg-service}-Prozedur gibt, sondern der X-Server durch eine Software zur @dfn{Anmeldeverwaltung} gestartet wird (ein „Login Manager“). Vorgegeben ist, dass zur Anzeigenverwaltung der GNOME Display Manager (GDM) benutzt wird." #. type: cindex -#: doc/guix.texi:13428 +#: doc/guix.texi:13426 #, no-wrap msgid "GDM" msgstr "GDM" #. type: cindex -#: doc/guix.texi:13429 +#: doc/guix.texi:13427 #, no-wrap msgid "GNOME, login manager" msgstr "GNOME, Anmeldeverwaltung" #. type: Plain text -#: doc/guix.texi:13433 +#: doc/guix.texi:13431 msgid "GDM of course allows users to log in into window managers and desktop environments other than GNOME; for those using GNOME, GDM is required for features such as automatic screen locking." msgstr "GDM ermöglicht es seinen Nutzern natürlich auch, sich bei anderen Fensterverwaltungssystemen und Arbeitsumgebungen als GNOME anzumelden. Wer GNOME benutzt, kann Funktionalitäten wie eine automatische Bildschirmsperre nur verwenden, wenn die Anmeldung über GDM läuft." #. type: cindex -#: doc/guix.texi:13434 +#: doc/guix.texi:13432 #, no-wrap msgid "window manager" msgstr "Fensterverwaltung" #. type: Plain text -#: doc/guix.texi:13439 +#: doc/guix.texi:13437 msgid "To use X11, you must install at least one @dfn{window manager}---for example the @code{windowmaker} or @code{openbox} packages---preferably by adding it to the @code{packages} field of your operating system definition (@pxref{operating-system Reference, system-wide packages})." msgstr "Um X11 zu benutzen, müssen Sie ein Programme zur @dfn{Fensterverwaltung} („Window-Manager“) oder mehrere davon installieren — zum Beispiel die Pakete @code{windowmaker} oder @code{openbox} —, vorzugsweise indem Sie sie in das @code{packages}-Feld Ihrer Betriebssystemdefinition eintragen (siehe @ref{operating-system Reference, system-wide packages})." #. type: defvr -#: doc/guix.texi:13440 +#: doc/guix.texi:13438 #, no-wrap msgid "{Scheme Variable} gdm-service-type" msgstr "{Scheme-Variable} gdm-service-type" #. type: defvr -#: doc/guix.texi:13445 +#: doc/guix.texi:13443 msgid "This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager} (GDM), a program that manages graphical display servers and handles graphical user logins. Its value must be a @code{gdm-configuration} (see below.)" msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager}, GDM, ein Programm zur Verwaltung grafischer Anzeigeserver, das grafische Benutzeranmeldungen durchführt. Sein Wert muss eine @code{gdm-configuration} sein (siehe unten)." #. type: cindex -#: doc/guix.texi:13446 +#: doc/guix.texi:13444 #, no-wrap msgid "session types (X11)" msgstr "Sitzungstypen (X11)" #. type: cindex -#: doc/guix.texi:13447 +#: doc/guix.texi:13445 #, no-wrap msgid "X11 session types" msgstr "X11-Sitzungstypen" #. type: defvr -#: doc/guix.texi:13453 +#: doc/guix.texi:13451 msgid "GDM looks for @dfn{session types} described by the @file{.desktop} files in @file{/run/current-system/profile/share/xsessions} and allows users to choose a session from the log-in screen. Packages such as @code{gnome}, @code{xfce}, and @code{i3} provide @file{.desktop} files; adding them to the system-wide set of packages automatically makes them available at the log-in screen." msgstr "GDM liest die in den @file{.desktop}-Dateien in @file{/run/current-system/profile/share/xsessions} befindlichen @dfn{Sitzungstypen} ein und stellt diese seinen Nutzern zur Auswahl auf dem Anmeldebildschirm. Pakete wie @code{gnome}, @code{xfce} und @code{i3} stellen @file{.desktop}-Dateien bereit; wenn diese Pakete zu den systemweit verfügbaren Paketen hinzugefügt werden, werden diese automatisch auf dem Anmeldebildschirm angezeigt." #. type: defvr -#: doc/guix.texi:13457 +#: doc/guix.texi:13455 msgid "In addition, @file{~/.xsession} files are honored. When available, @file{~/.xsession} must be an executable that starts a window manager and/or other X clients." msgstr "Des Weiteren werden @file{~/.xsession}-Dateien berücksichtigt. Wenn es vorhanden ist, muss @file{~/.xsession} eine ausführbare Datei sein, die ein Programm zur Fensterverwaltung und/oder andere X-Clients startet." #. type: deftp -#: doc/guix.texi:13459 +#: doc/guix.texi:13457 #, no-wrap msgid "{Data Type} gdm-configuration" msgstr "{Datentyp} gdm-configuration" #. type: item -#: doc/guix.texi:13461 doc/guix.texi:13527 +#: doc/guix.texi:13459 doc/guix.texi:13525 #, no-wrap msgid "@code{auto-login?} (default: @code{#f})" msgstr "@code{auto-login?} (Vorgabe: @code{#f})" #. type: itemx -#: doc/guix.texi:13462 +#: doc/guix.texi:13460 #, no-wrap msgid "@code{default-user} (default: @code{#f})" msgstr "@code{default-user} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13464 +#: doc/guix.texi:13462 msgid "When @code{auto-login?} is false, GDM presents a log-in screen." msgstr "Wenn @code{auto-login?} falsch ist, zeigt GDM einen Anmeldebildschirm an." #. type: table -#: doc/guix.texi:13467 +#: doc/guix.texi:13465 msgid "When @code{auto-login?} is true, GDM logs in directly as @code{default-user}." msgstr "Wenn @code{auto-login?} wahr ist, meldet GDM automatisch den in @code{default-user} angegebenen voreingestellten Benutzer an." #. type: item -#: doc/guix.texi:13468 +#: doc/guix.texi:13466 #, no-wrap msgid "@code{gnome-shell-assets} (default: ...)" msgstr "@code{gnome-shell-assets} (Vorgabe: …)" #. type: table -#: doc/guix.texi:13470 +#: doc/guix.texi:13468 msgid "List of GNOME Shell assets needed by GDM: icon theme, fonts, etc." msgstr "Liste der GNOME-Shell-„Assets“, die GDM benötigt, d.h.@: Symbolthema, Schriftarten etc." #. type: item -#: doc/guix.texi:13471 +#: doc/guix.texi:13469 #, no-wrap msgid "@code{xorg-configuration} (default: @code{(xorg-configuration)})" msgstr "@code{xorg-configuration} (Vorgabe: @code{(xorg-configuration)})" #. type: table -#: doc/guix.texi:13473 doc/guix.texi:13554 doc/guix.texi:13637 +#: doc/guix.texi:13471 doc/guix.texi:13552 doc/guix.texi:13635 msgid "Configuration of the Xorg graphical server." msgstr "Xorg-Server für grafische Oberflächen konfigurieren." #. type: item -#: doc/guix.texi:13474 +#: doc/guix.texi:13472 #, no-wrap msgid "@code{xsession} (default: @code{(xinitrc)})" msgstr "@code{xsession} (Vorgabe: @code{(xinitrc)})" #. type: table -#: doc/guix.texi:13476 doc/guix.texi:13652 +#: doc/guix.texi:13474 doc/guix.texi:13650 msgid "Script to run before starting a X session." msgstr "Das Skript, das vor dem Starten einer X-Sitzung ausgeführt werden soll." #. type: item -#: doc/guix.texi:13477 +#: doc/guix.texi:13475 #, no-wrap msgid "@code{dbus-daemon} (default: @code{dbus-daemon-wrapper})" msgstr "@code{dbus-daemon} (Vorgabe: @code{dbus-daemon-wrapper})" #. type: table -#: doc/guix.texi:13479 +#: doc/guix.texi:13477 msgid "File name of the @code{dbus-daemon} executable." msgstr "Der Dateiname der ausführbaren Datei des @code{dbus-daemon}-Programms." #. type: item -#: doc/guix.texi:13480 +#: doc/guix.texi:13478 #, no-wrap msgid "@code{gdm} (default: @code{gdm})" msgstr "@code{gdm} (Vorgabe: @code{gdm})" #. type: table -#: doc/guix.texi:13482 +#: doc/guix.texi:13480 msgid "The GDM package to use." msgstr "Das GDM-Paket, was benutzt werden soll." #. type: defvr -#: doc/guix.texi:13485 +#: doc/guix.texi:13483 #, no-wrap msgid "{Scheme Variable} slim-service-type" msgstr "{Scheme-Variable} slim-service-type" #. type: defvr -#: doc/guix.texi:13487 +#: doc/guix.texi:13485 msgid "This is the type for the SLiM graphical login manager for X11." msgstr "Dies ist der Diensttyp für die schlanke grafische Anmeldungsverwaltung SLiM für X11." #. type: defvr -#: doc/guix.texi:13491 +#: doc/guix.texi:13489 msgid "Like GDM, SLiM looks for session types described by @file{.desktop} files and allows users to choose a session from the log-in screen using @kbd{F1}. It also honors @file{~/.xsession} files." msgstr "Wie GDM liest SLiM die in @file{.desktop}-Dateien beschriebenen Sitzungstypen aus und ermöglicht es Nutzern, eine Sitzung darunter im Anmeldebildschirm durch Drücken von @kbd{F1} auszuwählen. Auch @file{~/.xsession}-Dateien können benutzt werden." #. type: defvr -#: doc/guix.texi:13498 +#: doc/guix.texi:13496 msgid "Unlike GDM, SLiM does not spawn the user session on a different VT after logging in, which means that you can only start one graphical session. If you want to be able to run multiple graphical sessions at the same time you have to add multiple SLiM services to your system services. The following example shows how to replace the default GDM service with two SLiM services on tty7 and tty8." msgstr "Anders als GDM wird durch SLiM die Benutzersitzung nicht auf einem anderen virtuellen Terminal gestartet, nachdem man sich anmeldet. Die Folge davon ist, dass man nur eine einzige grafische Sitzung starten kann. Wenn Sie mehrere, gleichzeitig laufende grafische Sitzungen starten können möchten, müssen Sie mehrere SLiM-Dienste zu ihren Systemdiensten hinzufügen. Das folgende Beispiel zeigt, wie Sie den vorgegebenen GDM-Dienst durch zwei SLiM-Dienste auf tty7 und tty8 ersetzen." #. type: lisp -#: doc/guix.texi:13504 +#: doc/guix.texi:13502 #, no-wrap msgid "" "(use-modules (gnu services)\n" @@ -24917,7 +24928,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:13516 +#: doc/guix.texi:13514 #, no-wrap msgid "" "(operating-system\n" @@ -24945,475 +24956,475 @@ msgstr "" " %desktop-services))))\n" #. type: deftp -#: doc/guix.texi:13520 +#: doc/guix.texi:13518 #, no-wrap msgid "{Data Type} slim-configuration" msgstr "{Datentyp} slim-configuration" #. type: deftp -#: doc/guix.texi:13522 +#: doc/guix.texi:13520 msgid "Data type representing the configuration of @code{slim-service-type}." msgstr "Datentyp, der die Konfiguration des @code{slim-service-type} repräsentiert." #. type: table -#: doc/guix.texi:13526 +#: doc/guix.texi:13524 msgid "Whether to allow logins with empty passwords." msgstr "Ob Anmeldungen mit leeren Passwörtern möglich sein sollen." #. type: itemx -#: doc/guix.texi:13528 +#: doc/guix.texi:13526 #, no-wrap msgid "@code{default-user} (default: @code{\"\"})" msgstr "@code{default-user} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:13530 +#: doc/guix.texi:13528 msgid "When @code{auto-login?} is false, SLiM presents a log-in screen." msgstr "Wenn @code{auto-login?} falsch ist, zeigt SLiM einen Anmeldebildschirm an." #. type: table -#: doc/guix.texi:13533 +#: doc/guix.texi:13531 msgid "When @code{auto-login?} is true, SLiM logs in directly as @code{default-user}." msgstr "Wenn @code{auto-login?} wahr ist, meldet SLiM automatisch den in @code{default-user} angegebenen voreingestellten Benutzer an." #. type: item -#: doc/guix.texi:13534 +#: doc/guix.texi:13532 #, no-wrap msgid "@code{theme} (default: @code{%default-slim-theme})" msgstr "@code{theme} (Vorgabe: @code{%default-slim-theme})" #. type: itemx -#: doc/guix.texi:13535 +#: doc/guix.texi:13533 #, no-wrap msgid "@code{theme-name} (default: @code{%default-slim-theme-name})" msgstr "@code{theme-name} (Vorgabe: @code{%default-slim-theme-name})" #. type: table -#: doc/guix.texi:13537 +#: doc/guix.texi:13535 msgid "The graphical theme to use and its name." msgstr "Das grafische Thema, was benutzt werden soll, mit seinem Namen." #. type: item -#: doc/guix.texi:13538 +#: doc/guix.texi:13536 #, no-wrap msgid "@code{auto-login-session} (default: @code{#f})" msgstr "@code{auto-login-session} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13541 +#: doc/guix.texi:13539 msgid "If true, this must be the name of the executable to start as the default session---e.g., @code{(file-append windowmaker \"/bin/windowmaker\")}." msgstr "Wenn es wahr ist, muss es den Namen der ausführbaren Datei angeben, die als voreingestellte Sitzung gestartet werden soll — z.B.@: @code{(file-append windowmaker \"/bin/windowmaker\")}." #. type: table -#: doc/guix.texi:13545 +#: doc/guix.texi:13543 msgid "If false, a session described by one of the available @file{.desktop} files in @code{/run/current-system/profile} and @code{~/.guix-profile} will be used." msgstr "Wenn es falsch ist, wird eine von einer der @file{.desktop}-Dateien in @code{/run/current-system/profile} und @code{~/.guix-profile} beschriebenen Sitzungen benutzt." #. type: quotation -#: doc/guix.texi:13550 +#: doc/guix.texi:13548 msgid "You must install at least one window manager in the system profile or in your user profile. Failing to do that, if @code{auto-login-session} is false, you will be unable to log in." msgstr "Sie müssen mindestens ein Fensterverwaltungsprogramm in das Systemprofil oder Ihr Benutzerprofil installieren, ansonsten können Sie sich, sofern @code{auto-login-session} falsch ist, nicht anmelden." #. type: item -#: doc/guix.texi:13552 doc/guix.texi:13635 +#: doc/guix.texi:13550 doc/guix.texi:13633 #, no-wrap msgid "@code{xorg-configuration} (default @code{(xorg-configuration)})" msgstr "@code{xorg-configuration} (Vorgabe: @code{(xorg-configuration)})" #. type: item -#: doc/guix.texi:13555 +#: doc/guix.texi:13553 #, no-wrap msgid "@code{display} (default @code{\":0\"})" msgstr "@code{display} (Vorgabe: @code{\":0\"})" #. type: table -#: doc/guix.texi:13557 +#: doc/guix.texi:13555 msgid "The display on which to start the Xorg graphical server." msgstr "Die Anzeige, auf welcher der Xorg-Server für grafische Oberflächen gestartet werden soll." #. type: item -#: doc/guix.texi:13558 +#: doc/guix.texi:13556 #, no-wrap msgid "@code{vt} (default @code{\"vt7\"})" msgstr "@code{vt} (Vorgabe: @code{\"vt7\"})" #. type: table -#: doc/guix.texi:13560 +#: doc/guix.texi:13558 msgid "The VT on which to start the Xorg graphical server." msgstr "Das virtuelle Terminal, auf dem der Xorg-Server für grafische Oberflächen gestartet werden soll." #. type: item -#: doc/guix.texi:13561 +#: doc/guix.texi:13559 #, no-wrap msgid "@code{xauth} (default: @code{xauth})" msgstr "@code{xauth} (Vorgabe: @code{xauth})" #. type: table -#: doc/guix.texi:13563 +#: doc/guix.texi:13561 msgid "The XAuth package to use." msgstr "Das XAuth-Paket, das benutzt werden soll." #. type: item -#: doc/guix.texi:13564 +#: doc/guix.texi:13562 #, no-wrap msgid "@code{shepherd} (default: @code{shepherd})" msgstr "@code{shepherd} (Vorgabe: @code{shepherd})" #. type: table -#: doc/guix.texi:13567 +#: doc/guix.texi:13565 msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}." msgstr "Das Shepherd-Paket, das benutzt wird, wenn @command{halt} und @command{reboot} aufgerufen werden." #. type: item -#: doc/guix.texi:13568 +#: doc/guix.texi:13566 #, no-wrap msgid "@code{sessreg} (default: @code{sessreg})" msgstr "@code{sessreg} (Vorgabe: @code{sessreg})" #. type: table -#: doc/guix.texi:13570 +#: doc/guix.texi:13568 msgid "The sessreg package used in order to register the session." msgstr "Das sessreg-Paket, das zum Registrieren der Sitzung benutzt werden soll." #. type: item -#: doc/guix.texi:13571 +#: doc/guix.texi:13569 #, no-wrap msgid "@code{slim} (default: @code{slim})" msgstr "@code{slim} (Vorgabe: @code{slim})" #. type: table -#: doc/guix.texi:13573 +#: doc/guix.texi:13571 msgid "The SLiM package to use." msgstr "Das zu benutzende SLiM-Paket." #. type: defvr -#: doc/guix.texi:13576 doc/guix.texi:24218 +#: doc/guix.texi:13574 doc/guix.texi:24215 #, no-wrap msgid "{Scheme Variable} %default-theme" msgstr "{Scheme-Variable} %default-theme" #. type: defvrx -#: doc/guix.texi:13577 +#: doc/guix.texi:13575 #, no-wrap msgid "{Scheme Variable} %default-theme-name" msgstr "{Scheme-Variable} %default-theme-name" #. type: defvr -#: doc/guix.texi:13579 +#: doc/guix.texi:13577 msgid "The default SLiM theme and its name." msgstr "Das vorgegebene Thema für das Aussehen von SLiM mit seinem Namen." #. type: deftp -#: doc/guix.texi:13582 +#: doc/guix.texi:13580 #, no-wrap msgid "{Data Type} sddm-configuration" msgstr "{Datentyp} sddm-configuration" #. type: deftp -#: doc/guix.texi:13584 +#: doc/guix.texi:13582 msgid "This is the data type representing the sddm service configuration." msgstr "Dieser Datentyp repräsentiert die Konfiguration des SDDM-Dienstes." #. type: item -#: doc/guix.texi:13586 +#: doc/guix.texi:13584 #, no-wrap msgid "@code{display-server} (default: \"x11\")" msgstr "@code{display-server} (Vorgabe: \"x11\")" #. type: table -#: doc/guix.texi:13589 +#: doc/guix.texi:13587 msgid "Select display server to use for the greeter. Valid values are \"x11\" or \"wayland\"." msgstr "Einen Anzeigeserver auswählen, der für den Anmeldebildschirm verwendet werden soll. Zulässige Werte sind \"x11\" oder \"wayland\"." #. type: item -#: doc/guix.texi:13590 +#: doc/guix.texi:13588 #, no-wrap msgid "@code{numlock} (default: \"on\")" msgstr "@code{numlock} (Vorgabe: \"on\")" #. type: table -#: doc/guix.texi:13592 +#: doc/guix.texi:13590 msgid "Valid values are \"on\", \"off\" or \"none\"." msgstr "Gültige Werte sind \"on\", \"off\" oder \"none\"." #. type: item -#: doc/guix.texi:13593 +#: doc/guix.texi:13591 #, no-wrap msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})" msgstr "@code{halt-command} (Vorgabe: @code{#~(string-apppend #$shepherd \"/sbin/halt\")})" #. type: table -#: doc/guix.texi:13595 +#: doc/guix.texi:13593 msgid "Command to run when halting." msgstr "Der Befehl, der zum Anhalten des Systems ausgeführt wird." #. type: item -#: doc/guix.texi:13596 +#: doc/guix.texi:13594 #, no-wrap msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})" msgstr "@code{reboot-command} (Vorgabe: @code{#~(string-append #$shepherd \"/sbin/reboot\")})" #. type: table -#: doc/guix.texi:13598 +#: doc/guix.texi:13596 msgid "Command to run when rebooting." msgstr "Der Befehl, der zum Neustarten des Systems ausgeführt wird." #. type: item -#: doc/guix.texi:13599 +#: doc/guix.texi:13597 #, no-wrap msgid "@code{theme} (default \"maldives\")" msgstr "@code{theme} (Vorgabe: \"maldives\")" #. type: table -#: doc/guix.texi:13601 +#: doc/guix.texi:13599 msgid "Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"." msgstr "Welches Thema für das Aussehen benutzt werden soll. Mit SDDM mitgelieferte Themen sind \"elarun\" und \"maldives\"." #. type: item -#: doc/guix.texi:13602 +#: doc/guix.texi:13600 #, no-wrap msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")" msgstr "@code{themes-directory} (Vorgabe: \"/run/current-system/profile/share/sddm/themes\")" #. type: table -#: doc/guix.texi:13604 +#: doc/guix.texi:13602 msgid "Directory to look for themes." msgstr "Verzeichnis, wo Themen gefunden werden können." #. type: item -#: doc/guix.texi:13605 +#: doc/guix.texi:13603 #, no-wrap msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")" msgstr "@code{faces-directory} (Vorgabe: \"/run/current-system/profile/share/sddm/faces\")" #. type: table -#: doc/guix.texi:13607 +#: doc/guix.texi:13605 msgid "Directory to look for faces." msgstr "Verzeichnis, wo Avatarbilder gefunden werden können.<" #. type: item -#: doc/guix.texi:13608 +#: doc/guix.texi:13606 #, no-wrap msgid "@code{default-path} (default \"/run/current-system/profile/bin\")" msgstr "@code{default-path} (Vorgabe: \"/run/current-system/profile/bin\")" #. type: table -#: doc/guix.texi:13610 +#: doc/guix.texi:13608 msgid "Default PATH to use." msgstr "Welcher PATH voreingestellt sein soll." #. type: item -#: doc/guix.texi:13611 +#: doc/guix.texi:13609 #, no-wrap msgid "@code{minimum-uid} (default 1000)" msgstr "@code{minimum-uid} (Vorgabe: 1000)" #. type: table -#: doc/guix.texi:13613 +#: doc/guix.texi:13611 msgid "Minimum UID to display in SDDM." msgstr "Der kleinste Benutzeridentifikator (UID), mit dem Benutzer in SDDM angezeigt werden." #. type: item -#: doc/guix.texi:13614 +#: doc/guix.texi:13612 #, no-wrap msgid "@code{maximum-uid} (default 2000)" msgstr "@code{maximum-uid} (Vorgabe: 2000)" #. type: table -#: doc/guix.texi:13616 +#: doc/guix.texi:13614 msgid "Maximum UID to display in SDDM" msgstr "Der größte Benutzeridentifikator (UID), mit dem Benutzer in SDDM angezeigt werden.<" #. type: item -#: doc/guix.texi:13617 +#: doc/guix.texi:13615 #, no-wrap msgid "@code{remember-last-user?} (default #t)" msgstr "@code{remember-last-user?} (Vorgabe: #t)" #. type: table -#: doc/guix.texi:13619 +#: doc/guix.texi:13617 msgid "Remember last user." msgstr "Den zuletzt ausgewählten Benutzer voreinstellen." #. type: item -#: doc/guix.texi:13620 +#: doc/guix.texi:13618 #, no-wrap msgid "@code{remember-last-session?} (default #t)" msgstr "@code{remember-last-session?} (Vorgabe: #t)" #. type: table -#: doc/guix.texi:13622 +#: doc/guix.texi:13620 msgid "Remember last session." msgstr "Die zuletzt ausgewählte Sitzung voreinstellen." #. type: item -#: doc/guix.texi:13623 +#: doc/guix.texi:13621 #, no-wrap msgid "@code{hide-users} (default \"\")" msgstr "@code{hide-users} (Vorgabe: \"\")" #. type: table -#: doc/guix.texi:13625 +#: doc/guix.texi:13623 msgid "Usernames to hide from SDDM greeter." msgstr "Benutzernamen, die in SDDM @emph{nicht} sichtbar sein sollen." #. type: item -#: doc/guix.texi:13626 +#: doc/guix.texi:13624 #, no-wrap msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})" msgstr "@code{hide-shells} (Vorgabe: @code{#~(string-append #$shadow \"/sbin/nologin\")})" #. type: table -#: doc/guix.texi:13628 +#: doc/guix.texi:13626 msgid "Users with shells listed will be hidden from the SDDM greeter." msgstr "Benutzerkonten, für die als Shell eine davon eingestellt ist, wird SDDM @emph{nicht} anzeigen." #. type: item -#: doc/guix.texi:13629 +#: doc/guix.texi:13627 #, no-wrap msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})" msgstr "@code{session-command} (Vorgabe: @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})" #. type: table -#: doc/guix.texi:13631 +#: doc/guix.texi:13629 msgid "Script to run before starting a wayland session." msgstr "Das Skript, das vor dem Starten einer Wayland-Sitzung ausgeführt werden soll." #. type: item -#: doc/guix.texi:13632 +#: doc/guix.texi:13630 #, no-wrap msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")" msgstr "@code{sessions-directory} (Vorgabe: \"/run/current-system/profile/share/wayland-sessions\")" #. type: table -#: doc/guix.texi:13634 +#: doc/guix.texi:13632 msgid "Directory to look for desktop files starting wayland sessions." msgstr "Verzeichnis, das nach .desktop-Dateien zum Starten von Wayland-Sitzungen durchsucht wird." #. type: item -#: doc/guix.texi:13638 +#: doc/guix.texi:13636 #, no-wrap msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})" msgstr "@code{xauth-path} (Vorgabe: @code{#~(string-append #$xauth \"/bin/xauth\")})" #. type: table -#: doc/guix.texi:13640 +#: doc/guix.texi:13638 msgid "Path to xauth." msgstr "Pfad von xauth." #. type: item -#: doc/guix.texi:13641 +#: doc/guix.texi:13639 #, no-wrap msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})" msgstr "@code{xephyr-path} (Vorgabe: @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})" #. type: table -#: doc/guix.texi:13643 +#: doc/guix.texi:13641 msgid "Path to Xephyr." msgstr "Pfad von Xephyr." #. type: item -#: doc/guix.texi:13644 +#: doc/guix.texi:13642 #, no-wrap msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})" msgstr "@code{xdisplay-start} (Vorgabe: @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})" #. type: table -#: doc/guix.texi:13646 +#: doc/guix.texi:13644 msgid "Script to run after starting xorg-server." msgstr "Skript, das nach dem Starten vom Xorg-Server ausgeführt wird." #. type: item -#: doc/guix.texi:13647 +#: doc/guix.texi:13645 #, no-wrap msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})" msgstr "@code{xdisplay-stop} (Vorgabe: @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})" #. type: table -#: doc/guix.texi:13649 +#: doc/guix.texi:13647 msgid "Script to run before stopping xorg-server." msgstr "Skript, das vor dem Stoppen vom Xorg-Server ausgeführt wird." #. type: item -#: doc/guix.texi:13650 +#: doc/guix.texi:13648 #, no-wrap msgid "@code{xsession-command} (default: @code{xinitrc})" msgstr "@code{xsession-command} (Vorgabe: @code{xinitrc})" #. type: item -#: doc/guix.texi:13653 +#: doc/guix.texi:13651 #, no-wrap msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")" msgstr "@code{xsessions-directory} (Vorgabe: \"/run/current-system/profile/share/xsessions\")" #. type: table -#: doc/guix.texi:13655 +#: doc/guix.texi:13653 msgid "Directory to look for desktop files starting X sessions." msgstr "Verzeichnis, das nach .desktop-Dateien zum Starten von X-Sitzungen durchsucht wird.<" #. type: item -#: doc/guix.texi:13656 +#: doc/guix.texi:13654 #, no-wrap msgid "@code{minimum-vt} (default: 7)" msgstr "@code{minimum-vt} (default: 7)" #. type: table -#: doc/guix.texi:13658 +#: doc/guix.texi:13656 msgid "Minimum VT to use." msgstr "Das kleinste virtuelle Terminal, das benutzt werden darf." #. type: item -#: doc/guix.texi:13659 +#: doc/guix.texi:13657 #, no-wrap msgid "@code{auto-login-user} (default \"\")" msgstr "@code{auto-login-user} (Vorgabe: \"\")" #. type: table -#: doc/guix.texi:13661 +#: doc/guix.texi:13659 msgid "User to use for auto-login." msgstr "Benutzer, der bei automatischer Anmeldung angemeldet wird." #. type: item -#: doc/guix.texi:13662 +#: doc/guix.texi:13660 #, no-wrap msgid "@code{auto-login-session} (default \"\")" msgstr "@code{auto-login-session} (Vorgabe: \"\")" #. type: table -#: doc/guix.texi:13664 +#: doc/guix.texi:13662 msgid "Desktop file to use for auto-login." msgstr "Desktop-Datei für die automatische Anmeldung." #. type: item -#: doc/guix.texi:13665 +#: doc/guix.texi:13663 #, no-wrap msgid "@code{relogin?} (default #f)" msgstr "@code{relogin?} (Vorgabe: #f)" #. type: table -#: doc/guix.texi:13667 +#: doc/guix.texi:13665 msgid "Relogin after logout." msgstr "Ob nach dem Abmelden neu angemeldet werden soll." #. type: cindex -#: doc/guix.texi:13672 +#: doc/guix.texi:13670 #, no-wrap msgid "X11 login" msgstr "X11-Anmeldung" #. type: deffn -#: doc/guix.texi:13673 +#: doc/guix.texi:13671 #, no-wrap msgid "{Scheme Procedure} sddm-service config" msgstr "{Scheme-Prozedur} sddm-service config" #. type: deffn -#: doc/guix.texi:13676 +#: doc/guix.texi:13674 msgid "Return a service that spawns the SDDM graphical login manager for config of type @code{}." msgstr "Liefert einen Dienst, der SDDM zur grafischen Anmeldeverwaltung startet, mit einer Konfiguration vom Typ @code{}." #. type: example -#: doc/guix.texi:13681 +#: doc/guix.texi:13679 #, no-wrap msgid "" " (sddm-service (sddm-configuration\n" @@ -25425,215 +25436,215 @@ msgstr "" " (auto-login-session \"xfce.desktop\")))\n" #. type: cindex -#: doc/guix.texi:13684 +#: doc/guix.texi:13682 #, no-wrap msgid "Xorg, configuration" msgstr "Xorg, Konfiguration" #. type: deftp -#: doc/guix.texi:13685 +#: doc/guix.texi:13683 #, no-wrap msgid "{Data Type} xorg-configuration" msgstr "{Datentyp} xorg-configuration" #. type: deftp -#: doc/guix.texi:13690 +#: doc/guix.texi:13688 msgid "This data type represents the configuration of the Xorg graphical display server. Note that there is not Xorg service; instead, the X server is started by a ``display manager'' such as GDM, SDDM, and SLiM. Thus, the configuration of these display managers aggregates an @code{xorg-configuration} record." msgstr "Dieser Datentyp repräsentiert die Konfiguration des grafischen Anzeigeservers Xorg. Beachten Sie, dass es keinen Xorg-Dienst gibt, sondern der X-Server von einer „Anzeigenverwaltung“ wie GDM, SDDM oder SLiM gestartet wird. Deswegen wird aus der Konfiguration dieser Anzeigenverwaltungen ein @code{xorg-configuration}-Verbundsobjekt konstruiert." #. type: item -#: doc/guix.texi:13692 +#: doc/guix.texi:13690 #, no-wrap msgid "@code{modules} (default: @code{%default-xorg-modules})" msgstr "@code{modules} (Vorgabe: @code{%default-xorg-modules})" #. type: table -#: doc/guix.texi:13695 +#: doc/guix.texi:13693 msgid "This is a list of @dfn{module packages} loaded by the Xorg server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so on." msgstr "Dies ist eine Liste von @dfn{Modulpaketen}, die vom Xorg-Server geladen werden — z.B.@: @code{xf86-video-vesa}, @code{xf86-input-keyboard} und so weiter." #. type: item -#: doc/guix.texi:13696 +#: doc/guix.texi:13694 #, no-wrap msgid "@code{fonts} (default: @code{%default-xorg-fonts})" msgstr "@code{fonts} (Vorgabe: @code{%default-xorg-fonts})" #. type: table -#: doc/guix.texi:13698 +#: doc/guix.texi:13696 msgid "This is a list of font directories to add to the server's @dfn{font path}." msgstr "Dies ist eine Liste von Verzeichnissen mit Schriftarten, die zum Schriftartensuchpfad („Font Path“) des Servers hinzugefügt werden." #. type: item -#: doc/guix.texi:13699 +#: doc/guix.texi:13697 #, no-wrap msgid "@code{drivers} (default: @code{'()})" msgstr "@code{drivers} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13703 +#: doc/guix.texi:13701 msgid "This must be either the empty list, in which case Xorg chooses a graphics driver automatically, or a list of driver names that will be tried in this order---e.g., @code{(\"modesetting\" \"vesa\")}." msgstr "Dies muss entweder die leere Liste sein — in diesem Fall wird durch Xorg automatisch ein Grafiktreiber ausgewählt — oder eine Liste von Treibernamen, die in dieser Reihenfolge durchprobiert werden — z.B.@: @code{(\"modesetting\" \"vesa\")}." #. type: item -#: doc/guix.texi:13704 +#: doc/guix.texi:13702 #, no-wrap msgid "@code{resolutions} (default: @code{'()})" msgstr "@code{resolutions} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13708 +#: doc/guix.texi:13706 msgid "When @code{resolutions} is the empty list, Xorg chooses an appropriate screen resolution. Otherwise, it must be a list of resolutions---e.g., @code{((1024 768) (640 480))}." msgstr "Wenn @code{resolutions} die leere Liste ist, wird automatisch durch Xorg eine passende Bildschirmauflösung gewählt. Andernfalls muss hier eine Liste von Bildschirmauflösungen angegeben werden — z.B.@: @code{((1024 768) (640 480))}." #. type: cindex -#: doc/guix.texi:13709 +#: doc/guix.texi:13707 #, no-wrap msgid "keyboard layout, for Xorg" msgstr "Tastaturbelegung, für Xorg" #. type: cindex -#: doc/guix.texi:13710 +#: doc/guix.texi:13708 #, no-wrap msgid "keymap, for Xorg" msgstr "Keymap, für Xorg" #. type: table -#: doc/guix.texi:13714 +#: doc/guix.texi:13712 msgid "If this is @code{#f}, Xorg uses the default keyboard layout---usually US English (``qwerty'') for a 105-key PC keyboard." msgstr "Wenn es auf @code{#f} gesetzt ist, benutzt Xorg die voreingestellte Tastaturbelegung, also normalerweise US English („QWERTY“) für eine PC-Tastatur mit 105 Tasten." #. type: table -#: doc/guix.texi:13718 +#: doc/guix.texi:13716 msgid "Otherwise this must be a @code{keyboard-layout} object specifying the keyboard layout in use when Xorg is running. @xref{Keyboard Layout}, for more information on how to specify the keyboard layout." msgstr "Andernfalls muss hier ein @code{keyboard-layout}-Objekt stehen, das angibt, welche Tastaturbelegung aktiv sein soll, während Xorg läuft. Siehe @ref{Keyboard Layout} für mehr Informationen, wie die Tastaturbelegung angegeben werden kann." #. type: item -#: doc/guix.texi:13719 +#: doc/guix.texi:13717 #, no-wrap msgid "@code{extra-config} (default: @code{'()})" msgstr "@code{extra-config} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13722 +#: doc/guix.texi:13720 msgid "This is a list of strings or objects appended to the configuration file. It is used to pass extra text to be added verbatim to the configuration file." msgstr "Dies ist eine Liste von Zeichenketten oder Objekten, die an die Konfigurationsdatei angehängt werden. Mit ihnen wird zusätzlicher Text wortwörtlich zur Konfigurationsdatei hinzugefügt." #. type: item -#: doc/guix.texi:13723 +#: doc/guix.texi:13721 #, no-wrap msgid "@code{server} (default: @code{xorg-server})" msgstr "@code{server} (Vorgabe: @code{xorg-server})" #. type: table -#: doc/guix.texi:13725 +#: doc/guix.texi:13723 msgid "This is the package providing the Xorg server." msgstr "Dieses Paket stellt den Xorg-Server zur Verfügung." #. type: item -#: doc/guix.texi:13726 +#: doc/guix.texi:13724 #, no-wrap msgid "@code{server-arguments} (default: @code{%default-xorg-server-arguments})" msgstr "@code{server-arguments} (Vorgabe: @code{%default-xorg-server-arguments})" #. type: table -#: doc/guix.texi:13729 +#: doc/guix.texi:13727 msgid "This is the list of command-line arguments to pass to the X server. The default is @code{-nolisten tcp}." msgstr "Dies ist die Liste der Befehlszeilenargumente, die an den X-Server übergeben werden. Die Vorgabe ist @code{-nolisten tcp}." #. type: deffn -#: doc/guix.texi:13732 +#: doc/guix.texi:13730 #, no-wrap msgid "{Scheme Procedure} set-xorg-configuration @var{config} @" msgstr "{Scheme-Prozedur} set-xorg-configuration @var{Konfiguration} @" #. type: deffn -#: doc/guix.texi:13736 +#: doc/guix.texi:13734 msgid "[@var{login-manager-service-type}] Tell the log-in manager (of type @var{login-manager-service-type}) to use @var{config}, an @code{} record." msgstr "[@var{login-manager-service-type}] Benennt, welche @var{Konfiguration} die Anmeldeverwaltung (vom Typ @var{login-manager-service-type}) benutzen soll, als ein @code{}-Verbundsobjekt." #. type: deffn -#: doc/guix.texi:13740 +#: doc/guix.texi:13738 msgid "Since the Xorg configuration is embedded in the log-in manager's configuration---e.g., @code{gdm-configuration}---this procedure provides a shorthand to set the Xorg configuration." msgstr "Da die Xorg-Konfiguration in die Konfiguration der Anmeldeverwaltung eingebettet ist — z.B.@: in einer @code{gdm-configuration} —, bietet diese Prozedur eine Kurzschreibweise zum Ändern der Xorg-Konfiguration." #. type: deffn -#: doc/guix.texi:13742 +#: doc/guix.texi:13740 #, no-wrap msgid "{Scheme Procedure} xorg-start-command [@var{config}]" msgstr "{Scheme-Prozedur} xorg-start-command [@var{Konfiguration}]" #. type: deffn -#: doc/guix.texi:13746 +#: doc/guix.texi:13744 msgid "Return a @code{startx} script in which the modules, fonts, etc. specified in @var{config}, are available. The result should be used in place of @code{startx}." msgstr "Hier wird ein @code{startx}-Skript geliefert, in welchem die Module, Schriftarten usw.@: verfügbar sind, die in der @var{Konfiguration} angegeben wurden. Das Ergebnis soll anstelle von @code{startx} benutzt werden." #. type: deffn -#: doc/guix.texi:13748 +#: doc/guix.texi:13746 msgid "Usually the X server is started by a login manager." msgstr "Normalerweise wird der X-Server von der Anmeldeverwaltung gestartet." #. type: deffn -#: doc/guix.texi:13751 +#: doc/guix.texi:13749 #, no-wrap msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]" msgstr "{Scheme Procedure} screen-locker-service @var{Paket} [@var{Programm}]" #. type: deffn -#: doc/guix.texi:13755 +#: doc/guix.texi:13753 msgid "Add @var{package}, a package for a screen locker or screen saver whose command is @var{program}, to the set of setuid programs and add a PAM entry for it. For example:" msgstr "Das @var{Paket} zur Menge der setuid-Programme hinzufügen, worin sich ein Programm zum Sperren des Bildschirms oder ein Bildschirmschoner befinden muss, der mit dem Befehl @var{Programm} gestartet wird, und einen PAM-Eintrag dafür hinzufügen. Zum Beispiel macht" #. type: lisp -#: doc/guix.texi:13758 +#: doc/guix.texi:13756 #, no-wrap msgid "(screen-locker-service xlockmore \"xlock\")\n" msgstr "(screen-locker-service xlockmore \"xlock\")\n" #. type: deffn -#: doc/guix.texi:13761 +#: doc/guix.texi:13759 msgid "makes the good ol' XlockMore usable." msgstr "das gute alte XlockMore benutzbar." #. type: cindex -#: doc/guix.texi:13767 +#: doc/guix.texi:13765 #, no-wrap msgid "printer support with CUPS" msgstr "Druckerunterstützung mit CUPS" #. type: Plain text -#: doc/guix.texi:13771 +#: doc/guix.texi:13769 msgid "The @code{(gnu services cups)} module provides a Guix service definition for the CUPS printing service. To add printer support to a Guix system, add a @code{cups-service} to the operating system definition:" msgstr "Das Modul @code{(gnu services cups)} stellt eine Guix-Dienstdefinition für den CUPS-Druckdienst zur Verfügung. Wenn Sie Druckerunterstützung zu einem Guix-System hinzufügen möchten, dann fügen Sie einen @code{cups-service}-Dienst in die Betriebssystemdefinition ein." #. type: deffn -#: doc/guix.texi:13772 +#: doc/guix.texi:13770 #, no-wrap msgid "{Scheme Variable} cups-service-type" msgstr "{Scheme-Variable} cups-service-type" #. type: deffn -#: doc/guix.texi:13776 +#: doc/guix.texi:13774 msgid "The service type for the CUPS print server. Its value should be a valid CUPS configuration (see below). To use the default settings, simply write:" msgstr "Der Diensttyp für den CUPS-Druckserver. Als Wert muss eine gültige CUPS-Konfiguration angegeben werden (siehe unten). Um die Voreinstellungen zu verwenden, schreiben Sie einfach nur:" #. type: example -#: doc/guix.texi:13778 +#: doc/guix.texi:13776 #, no-wrap msgid "(service cups-service-type)\n" msgstr "(service cups-service-type)\n" #. type: Plain text -#: doc/guix.texi:13788 +#: doc/guix.texi:13786 msgid "The CUPS configuration controls the basic things about your CUPS installation: what interfaces it listens on, what to do if a print job fails, how much logging to do, and so on. To actually add a printer, you have to visit the @url{http://localhost:631} URL, or use a tool such as GNOME's printer configuration services. By default, configuring a CUPS service will generate a self-signed certificate if needed, for secure connections to the print server." msgstr "Mit der CUPS-Konfiguration stellen Sie die grundlegenden Merkmale Ihrer CUPS-Installation ein: Auf welcher Schnittstelle sie lauscht, wie mit einem fehlgeschlagenen Druckauftrag umzugehen ist, wieviel in Protokolle geschrieben werden soll und so weiter. Um einen Drucker hinzuzufügen, müssen Sie jedoch die URL @url{http://localhost:631} besuchen oder ein Werkzeug wie die Druckereinstellungsdienste von GNOME benutzen. Die Vorgabe ist, dass beim Konfigurieren eines CUPS-Dienstes ein selbstsigniertes Zertifikat erzeugt wird, um sichere Verbindungen mit dem Druckserver zu ermöglichen." #. type: Plain text -#: doc/guix.texi:13793 +#: doc/guix.texi:13791 msgid "Suppose you want to enable the Web interface of CUPS and also add support for Epson printers @i{via} the @code{escpr} package and for HP printers @i{via} the @code{hplip-minimal} package. You can do that directly, like this (you need to use the @code{(gnu packages cups)} module):" msgstr "Nehmen wir an, Sie wollen die Weboberfläche von CUPS aktivieren und Unterstützung für Epson-Drucker über das @code{escpr}-Paket und für HP-Drucker über das @code{hplip-minimal}-Paket aktivieren. Sie können das auf diese Weise gleich machen (dazu müssen Sie vorher angeben, dass das Modul @code{(gnu packages cups)} benutzt werden soll):" #. type: example -#: doc/guix.texi:13800 +#: doc/guix.texi:13798 #, no-wrap msgid "" "(service cups-service-type\n" @@ -25649,1535 +25660,1535 @@ msgstr "" " (list cups-filters escpr hplip-minimal))))\n" #. type: Plain text -#: doc/guix.texi:13805 +#: doc/guix.texi:13803 msgid "Note: If you wish to use the Qt5 based GUI which comes with the hplip package then it is suggested that you install the @code{hplip} package, either in your OS configuration file or as your user." msgstr "Anmerkung: Wenn Sie die Qt5-basierte grafische Benutzeroberfläche benutzen möchten, die dem hplip-Paket beiliegt, sollten Sie das @code{hplip}-Paket installieren, entweder in die Konfigurationsdatei Ihres Betriebssystems oder für Ihr Benutzerkonto." #. type: Plain text -#: doc/guix.texi:13812 +#: doc/guix.texi:13810 msgid "The available configuration parameters follow. Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings. There is also a way to specify the configuration as a string, if you have an old @code{cupsd.conf} file that you want to port over from some other system; see the end for more details." msgstr "Im Folgenden sehen Sie die verfügbaren Konfigurationsparameter. Vor jeder Parameterdefinition wird ihr Typ angegeben, zum Beispiel steht @samp{Zeichenketten-Liste foo} für einen Parameter @code{foo}, der als Liste von Zeichenketten angegeben werden muss. Sie können die Konfiguration aber auch in einer einzigen Zeichenkette angeben, wenn Sie eine alte @code{cupsd.conf}-Datei von einem anderen System weiterbenutzen möchten; siehe das Abschnittsende für mehr Details." #. type: Plain text -#: doc/guix.texi:13823 +#: doc/guix.texi:13821 msgid "Available @code{cups-configuration} fields are:" msgstr "Die verfügbaren @code{cups-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:13824 +#: doc/guix.texi:13822 #, no-wrap msgid "{@code{cups-configuration} parameter} package cups" msgstr "{@code{cups-configuration}-Parameter} „package“ cups" #. type: deftypevr -#: doc/guix.texi:13826 doc/guix.texi:14583 +#: doc/guix.texi:13824 doc/guix.texi:14581 msgid "The CUPS package." msgstr "Das CUPS-Paket." #. type: deftypevr -#: doc/guix.texi:13828 +#: doc/guix.texi:13826 #, no-wrap msgid "{@code{cups-configuration} parameter} package-list extensions" msgstr "{@code{cups-configuration}-Parameter} „package“-Liste extensions" #. type: deftypevr -#: doc/guix.texi:13830 +#: doc/guix.texi:13828 msgid "Drivers and other extensions to the CUPS package." msgstr "Treiber und andere Erweiterungen für das CUPS-Paket." #. type: deftypevr -#: doc/guix.texi:13832 +#: doc/guix.texi:13830 #, no-wrap msgid "{@code{cups-configuration} parameter} files-configuration files-configuration" msgstr "{@code{cups-configuration}-Parameter} „files-configuration“ files-configuration" #. type: deftypevr -#: doc/guix.texi:13835 +#: doc/guix.texi:13833 msgid "Configuration of where to write logs, what directories to use for print spools, and related privileged configuration parameters." msgstr "Konfiguration, wo Protokolle abgelegt werden sollen, welche Verzeichnisse für Druckspoolerwarteschlangen benutzt werden sollen und ähnliche Berechtigungen erfordernde Konfigurationsparameter." #. type: deftypevr -#: doc/guix.texi:13837 +#: doc/guix.texi:13835 msgid "Available @code{files-configuration} fields are:" msgstr "Verfügbare Felder einer @code{files-configuration} sind:" #. type: deftypevr -#: doc/guix.texi:13838 +#: doc/guix.texi:13836 #, no-wrap msgid "{@code{files-configuration} parameter} log-location access-log" msgstr "{@code{files-configuration}-Parameter} Protokollpfad access-log" #. type: deftypevr -#: doc/guix.texi:13846 +#: doc/guix.texi:13844 msgid "Defines the access log filename. Specifying a blank filename disables access log generation. The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background. The value @code{syslog} causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-access_log}." msgstr "Hiermit wird der Dateiname des Zugriffsprotokolls („Access Log“) festgelegt. Wenn ein leerer Name angegeben wird, wird kein Protokoll erzeugt. Der Wert @code{stderr} lässt Protokolleinträge in die Standardfehlerdatei schreiben, wenn das Druckplanungsprogramm im Vordergrund läuft, oder an den Systemprotokolldaemon (also Syslog), wenn es im Hintergrund läuft. Der Wert @code{syslog} bewirkt, dass Protokolleinträge an den Systemprotokolldaemon geschickt werden. Der Servername darf in Dateinamen als die Zeichenkette @code{%s} angegeben werden, so kann etwa @code{/var/log/cups/%s-access_log} angegeben werden." #. type: deftypevr -#: doc/guix.texi:13848 +#: doc/guix.texi:13846 msgid "Defaults to @samp{\"/var/log/cups/access_log\"}." msgstr "Die Vorgabe ist @samp{\"/var/log/cups/access_log\"}." #. type: deftypevr -#: doc/guix.texi:13850 +#: doc/guix.texi:13848 #, no-wrap msgid "{@code{files-configuration} parameter} file-name cache-dir" msgstr "{@code{files-configuration}-Parameter} Dateiname cache-dir" #. type: deftypevr -#: doc/guix.texi:13852 +#: doc/guix.texi:13850 msgid "Where CUPS should cache data." msgstr "Wo CUPS zwischengespeicherte Daten ablegen soll." #. type: deftypevr -#: doc/guix.texi:13854 +#: doc/guix.texi:13852 msgid "Defaults to @samp{\"/var/cache/cups\"}." msgstr "Die Vorgabe ist @samp{\"/var/cache/cups\"}." #. type: deftypevr -#: doc/guix.texi:13856 +#: doc/guix.texi:13854 #, no-wrap msgid "{@code{files-configuration} parameter} string config-file-perm" msgstr "{@code{files-configuration}-Parameter} Zeichenkette config-file-perm" #. type: deftypevr -#: doc/guix.texi:13859 +#: doc/guix.texi:13857 msgid "Specifies the permissions for all configuration files that the scheduler writes." msgstr "Gibt die Berechtigungen für alle Konfigurationsdateien an, die das Planungsprogramm schreibt." #. type: deftypevr -#: doc/guix.texi:13865 +#: doc/guix.texi:13863 msgid "Note that the permissions for the printers.conf file are currently masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. There is no way to disable this security feature." msgstr "Beachten Sie, dass auf die Berechtigungen der Datei printers.conf eine Maske gelegt wird, wodurch Zugriffe nur durch das planende Benutzerkonto erlaubt werden (in der Regel der Administratornutzer „root“). Der Grund dafür ist, dass Druckergeräte-URIs manchmal sensible Authentizierungsdaten enthalten, die nicht allgemein auf dem System bekannt sein sollten. Es gibt keine Möglichkeit, diese Sicherheitsmaßnahme abzuschalten." #. type: deftypevr -#: doc/guix.texi:13867 +#: doc/guix.texi:13865 msgid "Defaults to @samp{\"0640\"}." msgstr "Die Vorgabe ist @samp{\"0640\"}." #. type: deftypevr -#: doc/guix.texi:13869 +#: doc/guix.texi:13867 #, no-wrap msgid "{@code{files-configuration} parameter} log-location error-log" msgstr "{@code{files-configuration}-Parameter} Protokollpfad error-log" #. type: deftypevr -#: doc/guix.texi:13877 +#: doc/guix.texi:13875 msgid "Defines the error log filename. Specifying a blank filename disables error log generation. The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background. The value @code{syslog} causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-error_log}." msgstr "Hiermit wird der Dateiname des Fehlerprotokolls („Error Log“) festgelegt. Wenn ein leerer Name angegeben wird, wird kein Fehlerprotokoll erzeugt. Der Wert @code{stderr} lässt Protokolleinträge in die Standardfehlerdatei schreiben, wenn das Planungsprogramm im Vordergrund läuft, oder an den Systemprotokolldaemon (also Syslog), wenn es im Hintergrund läuft. Der Wert @code{syslog} bewirkt, dass Protokolleinträge an den Systemprotokolldaemon geschickt werden. Der Servername darf in Dateinamen als die Zeichenkette @code{%s} angegeben werden, so kann etwa @code{/var/log/cups/%s-error_log} angegeben werden." #. type: deftypevr -#: doc/guix.texi:13879 +#: doc/guix.texi:13877 msgid "Defaults to @samp{\"/var/log/cups/error_log\"}." msgstr "Die Vorgabe ist @samp{\"/var/log/cups/error_log\"}." #. type: deftypevr -#: doc/guix.texi:13881 +#: doc/guix.texi:13879 #, no-wrap msgid "{@code{files-configuration} parameter} string fatal-errors" msgstr "{@code{files-configuration}-Parameter} Zeichenkette fatal-errors" #. type: deftypevr -#: doc/guix.texi:13884 +#: doc/guix.texi:13882 msgid "Specifies which errors are fatal, causing the scheduler to exit. The kind strings are:" msgstr "Gibt an, bei welchen Fehlern das Druckplanungsprogramm terminieren soll. Die Zeichenketten für die Arten sind:" #. type: table -#: doc/guix.texi:13888 +#: doc/guix.texi:13886 msgid "No errors are fatal." msgstr "Keine Fehler führen zur Beendigung." #. type: table -#: doc/guix.texi:13891 +#: doc/guix.texi:13889 msgid "All of the errors below are fatal." msgstr "Jeder der im Folgenden aufgeführten Fehler terminiert den Druckplaner." #. type: item -#: doc/guix.texi:13892 +#: doc/guix.texi:13890 #, no-wrap msgid "browse" msgstr "browse" #. type: table -#: doc/guix.texi:13895 +#: doc/guix.texi:13893 msgid "Browsing initialization errors are fatal, for example failed connections to the DNS-SD daemon." msgstr "Fehler bei der Suche während der Initialisierung terminieren den Druckplaner, zum Beispiel wenn keine Verbindung zum DNS-SD-Daemon aufgebaut werden kann." #. type: item -#: doc/guix.texi:13896 +#: doc/guix.texi:13894 #, no-wrap msgid "config" msgstr "config" #. type: table -#: doc/guix.texi:13898 +#: doc/guix.texi:13896 msgid "Configuration file syntax errors are fatal." msgstr "Syntaxfehler in der Konfigurationsdatei terminieren den Druckplaner." #. type: item -#: doc/guix.texi:13899 +#: doc/guix.texi:13897 #, no-wrap msgid "listen" msgstr "listen" #. type: table -#: doc/guix.texi:13902 +#: doc/guix.texi:13900 msgid "Listen or Port errors are fatal, except for IPv6 failures on the loopback or @code{any} addresses." msgstr "Fehler beim Lauschen oder Portfehler (entsprechend der Direktiven „Listen“ oder „Port“) terminieren den Druckplaner; ausgenommen sind Fehler bei IPv6 auf Loopback- oder @code{any}-Adressen." #. type: item -#: doc/guix.texi:13903 +#: doc/guix.texi:13901 #, no-wrap msgid "log" msgstr "log" #. type: table -#: doc/guix.texi:13905 +#: doc/guix.texi:13903 msgid "Log file creation or write errors are fatal." msgstr "Fehler beim Erzeugen von Protokolldateien terminieren den Druckplaner." #. type: item -#: doc/guix.texi:13906 +#: doc/guix.texi:13904 #, no-wrap msgid "permissions" msgstr "permissions" #. type: table -#: doc/guix.texi:13909 +#: doc/guix.texi:13907 msgid "Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions." msgstr "Falsche Zugriffsberechtigungen auf zum Starten benötigten Dateien terminieren den Druckplaner, zum Beispiel wenn auf gemeinsame TLS-Zertifikats- und Schlüsseldateien von allen lesend zugegriffen werden kann." #. type: deftypevr -#: doc/guix.texi:13912 +#: doc/guix.texi:13910 msgid "Defaults to @samp{\"all -browse\"}." msgstr "Die Vorgabe ist @samp{\"all -browse\"}." #. type: deftypevr -#: doc/guix.texi:13914 +#: doc/guix.texi:13912 #, no-wrap msgid "{@code{files-configuration} parameter} boolean file-device?" msgstr "{@code{files-configuration}-Parameter} Boolescher-Ausdruck file-device?" #. type: deftypevr -#: doc/guix.texi:13917 +#: doc/guix.texi:13915 msgid "Specifies whether the file pseudo-device can be used for new printer queues. The URI @uref{file:///dev/null} is always allowed." msgstr "Gibt an, welches Pseudogerät für neue Druckerwarteschlangen benutzt werden kann. Die URI @uref{file:///dev/null} wird immer zugelassen." #. type: deftypevr -#: doc/guix.texi:13919 doc/guix.texi:13989 doc/guix.texi:14025 -#: doc/guix.texi:14037 doc/guix.texi:14043 doc/guix.texi:14059 -#: doc/guix.texi:14147 doc/guix.texi:14241 doc/guix.texi:14557 -#: doc/guix.texi:14570 doc/guix.texi:20265 doc/guix.texi:20279 -#: doc/guix.texi:20401 doc/guix.texi:20422 doc/guix.texi:20443 -#: doc/guix.texi:20450 doc/guix.texi:20495 doc/guix.texi:20502 -#: doc/guix.texi:20929 doc/guix.texi:20943 doc/guix.texi:21115 -#: doc/guix.texi:21160 doc/guix.texi:21247 doc/guix.texi:21388 -#: doc/guix.texi:21421 doc/guix.texi:21561 doc/guix.texi:21572 -#: doc/guix.texi:21822 doc/guix.texi:22464 doc/guix.texi:22473 -#: doc/guix.texi:22481 doc/guix.texi:22489 doc/guix.texi:22505 -#: doc/guix.texi:22521 doc/guix.texi:22529 doc/guix.texi:22537 -#: doc/guix.texi:22546 doc/guix.texi:22555 doc/guix.texi:22571 -#: doc/guix.texi:22635 doc/guix.texi:22741 doc/guix.texi:22749 -#: doc/guix.texi:22757 doc/guix.texi:22782 doc/guix.texi:22836 -#: doc/guix.texi:22884 doc/guix.texi:23085 doc/guix.texi:23092 +#: doc/guix.texi:13917 doc/guix.texi:13987 doc/guix.texi:14023 +#: doc/guix.texi:14035 doc/guix.texi:14041 doc/guix.texi:14057 +#: doc/guix.texi:14145 doc/guix.texi:14239 doc/guix.texi:14555 +#: doc/guix.texi:14568 doc/guix.texi:20262 doc/guix.texi:20276 +#: doc/guix.texi:20398 doc/guix.texi:20419 doc/guix.texi:20440 +#: doc/guix.texi:20447 doc/guix.texi:20492 doc/guix.texi:20499 +#: doc/guix.texi:20926 doc/guix.texi:20940 doc/guix.texi:21112 +#: doc/guix.texi:21157 doc/guix.texi:21244 doc/guix.texi:21385 +#: doc/guix.texi:21418 doc/guix.texi:21558 doc/guix.texi:21569 +#: doc/guix.texi:21819 doc/guix.texi:22461 doc/guix.texi:22470 +#: doc/guix.texi:22478 doc/guix.texi:22486 doc/guix.texi:22502 +#: doc/guix.texi:22518 doc/guix.texi:22526 doc/guix.texi:22534 +#: doc/guix.texi:22543 doc/guix.texi:22552 doc/guix.texi:22568 +#: doc/guix.texi:22632 doc/guix.texi:22738 doc/guix.texi:22746 +#: doc/guix.texi:22754 doc/guix.texi:22779 doc/guix.texi:22833 +#: doc/guix.texi:22881 doc/guix.texi:23082 doc/guix.texi:23089 msgid "Defaults to @samp{#f}." msgstr "Vorgegeben ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:13921 +#: doc/guix.texi:13919 #, no-wrap msgid "{@code{files-configuration} parameter} string group" msgstr "{@code{files-configuration}-Parameter} Zeichenkette group" #. type: deftypevr -#: doc/guix.texi:13924 +#: doc/guix.texi:13922 msgid "Specifies the group name or ID that will be used when executing external programs." msgstr "Gibt Namen oder Identifikator der Benutzergruppe an, die zum Ausführen von externen Programmen verwendet wird." #. type: deftypevr -#: doc/guix.texi:13926 doc/guix.texi:14006 +#: doc/guix.texi:13924 doc/guix.texi:14004 msgid "Defaults to @samp{\"lp\"}." msgstr "Die Vorgabe ist @samp{\"lp\"}." #. type: deftypevr -#: doc/guix.texi:13928 +#: doc/guix.texi:13926 #, no-wrap msgid "{@code{files-configuration} parameter} string log-file-perm" msgstr "{@code{files-configuration}-Parameter} Zeichenkette log-file-perm" #. type: deftypevr -#: doc/guix.texi:13930 +#: doc/guix.texi:13928 msgid "Specifies the permissions for all log files that the scheduler writes." msgstr "Gibt die Berechtigungen für alle Protokolldateien an, die das Planungsprogramm schreibt." #. type: deftypevr -#: doc/guix.texi:13932 +#: doc/guix.texi:13930 msgid "Defaults to @samp{\"0644\"}." msgstr "Die Vorgabe ist @samp{\"0644\"}." #. type: deftypevr -#: doc/guix.texi:13934 +#: doc/guix.texi:13932 #, no-wrap msgid "{@code{files-configuration} parameter} log-location page-log" msgstr "{@code{files-configuration}-Parameter} log-location page-log" #. type: deftypevr -#: doc/guix.texi:13942 +#: doc/guix.texi:13940 msgid "Defines the page log filename. Specifying a blank filename disables page log generation. The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background. The value @code{syslog} causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-page_log}." msgstr "Hiermit wird der Dateiname des Seitenprotokolls („Page Log“) festgelegt. Wenn ein leerer Name angegeben wird, wird kein Seitenprotokoll erzeugt. Der Wert @code{stderr} lässt Protokolleinträge in die Standardfehlerdatei schreiben, wenn das Planungsprogramm im Vordergrund läuft, oder an den Systemprotokolldaemon (also Syslog), wenn es im Hintergrund läuft. Der Wert @code{syslog} bewirkt, dass Protokolleinträge an den Systemprotokolldaemon geschickt werden. Der Servername darf in Dateinamen als die Zeichenkette @code{%s} angegeben werden, so kann etwa @code{/var/log/cups/%s-page_log} angegeben werden." #. type: deftypevr -#: doc/guix.texi:13944 +#: doc/guix.texi:13942 msgid "Defaults to @samp{\"/var/log/cups/page_log\"}." msgstr "Die Vorgabe ist @samp{\"/var/log/cups/page_log\"}." #. type: deftypevr -#: doc/guix.texi:13946 +#: doc/guix.texi:13944 #, no-wrap msgid "{@code{files-configuration} parameter} string remote-root" msgstr "{@code{files-configuration}-Parameter} Zeichenkette remote-root" #. type: deftypevr -#: doc/guix.texi:13949 +#: doc/guix.texi:13947 msgid "Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user. The default is @code{remroot}." msgstr "Gibt den Benutzernamen an, der für unauthentifizierte Zugriffe durch Clients verwendet wird, die sich als der Administratornutzer „root“ anmelden. Vorgegeben ist @code{remroot}." #. type: deftypevr -#: doc/guix.texi:13951 +#: doc/guix.texi:13949 msgid "Defaults to @samp{\"remroot\"}." msgstr "Die Vorgabe ist @samp{\"remroot\"}." #. type: deftypevr -#: doc/guix.texi:13953 +#: doc/guix.texi:13951 #, no-wrap msgid "{@code{files-configuration} parameter} file-name request-root" msgstr "{@code{files-configuration}-Parameter} Dateiname request-root" #. type: deftypevr -#: doc/guix.texi:13956 +#: doc/guix.texi:13954 msgid "Specifies the directory that contains print jobs and other HTTP request data." msgstr "Gibt das Verzeichnis an, in dem Druckaufträge und andere Daten zu HTTP-Anfragen abgelegt werden." #. type: deftypevr -#: doc/guix.texi:13958 +#: doc/guix.texi:13956 msgid "Defaults to @samp{\"/var/spool/cups\"}." msgstr "Die Vorgabe ist @samp{\"/var/spool/cups\"}." #. type: deftypevr -#: doc/guix.texi:13960 +#: doc/guix.texi:13958 #, no-wrap msgid "{@code{files-configuration} parameter} sandboxing sandboxing" msgstr "{@code{files-configuration}-Parameter} Isolierung sandboxing" #. type: deftypevr -#: doc/guix.texi:13965 +#: doc/guix.texi:13963 msgid "Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler; either @code{relaxed} or @code{strict}. This directive is currently only used/supported on macOS." msgstr "Gibt die Stufe der Sicherheitsisolierung („Sandboxing“) an, die auf Druckfilter, Hintergrundsysteme (Backends) und andere Kindprozesse des Planungsprogramms angewandt wird; entweder @code{relaxed} („locker“) oder @code{strict} („strikt“). Diese Direktive wird zur Zeit nur auf macOS benutzt/unterstützt." #. type: deftypevr -#: doc/guix.texi:13967 +#: doc/guix.texi:13965 msgid "Defaults to @samp{strict}." msgstr "Die Vorgabe ist @samp{strict}." #. type: deftypevr -#: doc/guix.texi:13969 +#: doc/guix.texi:13967 #, no-wrap msgid "{@code{files-configuration} parameter} file-name server-keychain" msgstr "{@code{files-configuration}-Parameter} Dateiname server-keychain" #. type: deftypevr -#: doc/guix.texi:13974 +#: doc/guix.texi:13972 msgid "Specifies the location of TLS certificates and private keys. CUPS will look for public and private keys in this directory: a @code{.crt} files for PEM-encoded certificates and corresponding @code{.key} files for PEM-encoded private keys." msgstr "Gibt an, wo TLS-Zertifikate und private Schlüssel gespeichert sind. CUPS wird in diesem Verzeichnis öffentliche und private Schlüssel suchen: @code{.crt}-Dateien für PEM-kodierte Zertifikate und zugehörige @code{.key}-Dateien für PEM-kodierte private Schlüssel." #. type: deftypevr -#: doc/guix.texi:13976 +#: doc/guix.texi:13974 msgid "Defaults to @samp{\"/etc/cups/ssl\"}." msgstr "Die Vorgabe ist @samp{\"/etc/cups/ssl\"}." #. type: deftypevr -#: doc/guix.texi:13978 +#: doc/guix.texi:13976 #, no-wrap msgid "{@code{files-configuration} parameter} file-name server-root" msgstr "{@code{files-configuration}-Parameter} Dateiname server-root" #. type: deftypevr -#: doc/guix.texi:13980 +#: doc/guix.texi:13978 msgid "Specifies the directory containing the server configuration files." msgstr "Gibt das Verzeichnis an, das die Serverkonfigurationsdateien enthält." #. type: deftypevr -#: doc/guix.texi:13982 +#: doc/guix.texi:13980 msgid "Defaults to @samp{\"/etc/cups\"}." msgstr "Die Vorgabe ist @samp{\"/etc/cups\"}." #. type: deftypevr -#: doc/guix.texi:13984 +#: doc/guix.texi:13982 #, no-wrap msgid "{@code{files-configuration} parameter} boolean sync-on-close?" msgstr "{@code{files-configuration}-Parameter} Boolescher-Ausdruck sync-on-close?" #. type: deftypevr -#: doc/guix.texi:13987 +#: doc/guix.texi:13985 msgid "Specifies whether the scheduler calls fsync(2) after writing configuration or state files." msgstr "Gibt an, ob das Planungsprogramm fsync(2) aufrufen soll, nachdem es in Konfigurations- oder Zustandsdateien geschrieben hat." #. type: deftypevr -#: doc/guix.texi:13991 +#: doc/guix.texi:13989 #, no-wrap msgid "{@code{files-configuration} parameter} space-separated-string-list system-group" msgstr "{@code{files-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste system-group" #. type: deftypevr -#: doc/guix.texi:13993 +#: doc/guix.texi:13991 msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication." msgstr "Gibt die Benutzergruppe(n) an, die als die @code{@@SYSTEM}-Gruppen für die Authentizierung benutzt werden können." #. type: deftypevr -#: doc/guix.texi:13995 +#: doc/guix.texi:13993 #, no-wrap msgid "{@code{files-configuration} parameter} file-name temp-dir" msgstr "{@code{files-configuration}-Parameter} Dateiname temp-dir" #. type: deftypevr -#: doc/guix.texi:13997 +#: doc/guix.texi:13995 msgid "Specifies the directory where temporary files are stored." msgstr "Gibt das Verzeichnis an, in das temporäre Dateien gespeichert werden." #. type: deftypevr -#: doc/guix.texi:13999 +#: doc/guix.texi:13997 msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}." msgstr "Die Vorgabe ist @samp{\"/var/spool/cups/tmp\"}." #. type: deftypevr -#: doc/guix.texi:14001 +#: doc/guix.texi:13999 #, no-wrap msgid "{@code{files-configuration} parameter} string user" msgstr "{@code{files-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:14004 +#: doc/guix.texi:14002 msgid "Specifies the user name or ID that is used when running external programs." msgstr "Gibt den Benutzernamen oder -identifikator an, mit dessen Benutzerkonto externe Programme ausgeführt werden." #. type: deftypevr -#: doc/guix.texi:14009 +#: doc/guix.texi:14007 #, no-wrap msgid "{@code{cups-configuration} parameter} access-log-level access-log-level" msgstr "{@code{cups-configuration}-Parameter} Zugriffsprotokollstufe access-log-level" #. type: deftypevr -#: doc/guix.texi:14016 +#: doc/guix.texi:14014 msgid "Specifies the logging level for the AccessLog file. The @code{config} level logs when printers and classes are added, deleted, or modified and when configuration files are accessed or updated. The @code{actions} level logs when print jobs are submitted, held, released, modified, or canceled, and any of the conditions for @code{config}. The @code{all} level logs all requests." msgstr "Gibt an, mit welcher Detailstufe das Protokoll in der AccessLog-Datei geführt wird. Bei der Stufe @code{config} wird protokolliert, wenn Drucker und Klassen hinzugefügt, entfernt oder verändert werden, und wenn auf Konfigurationsdateien zugegriffen oder sie aktualisiert werden. Bei der Stufe @code{actions} wird protokolliert, wenn Druckaufträge eingereicht, gehalten, freigegeben, geändert oder abgebrochen werden sowie alles, was bei @code{config} Protokollierung auslöst. Bei der Stufe @code{all} wird jede Anfrage protokolliert." #. type: deftypevr -#: doc/guix.texi:14018 +#: doc/guix.texi:14016 msgid "Defaults to @samp{actions}." msgstr "Die Vorgabe ist @samp{actions}." #. type: deftypevr -#: doc/guix.texi:14020 +#: doc/guix.texi:14018 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck auto-purge-jobs?" #. type: deftypevr -#: doc/guix.texi:14023 +#: doc/guix.texi:14021 msgid "Specifies whether to purge job history data automatically when it is no longer required for quotas." msgstr "Gibt an, ob Daten über den Auftragsverlauf automatisch gelöscht werden sollen, wenn Sie nicht mehr zur Berechnung von Druckkontingenten benötigt werden." #. type: deftypevr -#: doc/guix.texi:14027 +#: doc/guix.texi:14025 #, no-wrap msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols" msgstr "{@code{cups-configuration}-Parameter} Protokolle-zur-lokalen-Suche browse-local-protocols" #. type: deftypevr -#: doc/guix.texi:14029 +#: doc/guix.texi:14027 msgid "Specifies which protocols to use for local printer sharing." msgstr "Gibt an, welche Protokolle zum lokalen Teilen („Freigeben“) von Druckern benutzt werden sollen." #. type: deftypevr -#: doc/guix.texi:14031 +#: doc/guix.texi:14029 msgid "Defaults to @samp{dnssd}." msgstr "Die Vorgabe ist @samp{dnssd}." #. type: deftypevr -#: doc/guix.texi:14033 +#: doc/guix.texi:14031 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean browse-web-if?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck browse-web-if?" #. type: deftypevr -#: doc/guix.texi:14035 +#: doc/guix.texi:14033 msgid "Specifies whether the CUPS web interface is advertised." msgstr "Gibt an, ob die Weboberfläche von CUPS anderen mitgeteilt wird." #. type: deftypevr -#: doc/guix.texi:14039 +#: doc/guix.texi:14037 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean browsing?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck browsing?" #. type: deftypevr -#: doc/guix.texi:14041 +#: doc/guix.texi:14039 msgid "Specifies whether shared printers are advertised." msgstr "Gibt an, ob geteilte Drucker bei Druckersuchen mitgeteilt werden." #. type: deftypevr -#: doc/guix.texi:14045 +#: doc/guix.texi:14043 #, no-wrap msgid "{@code{cups-configuration} parameter} string classification" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette classification" #. type: deftypevr -#: doc/guix.texi:14050 +#: doc/guix.texi:14048 msgid "Specifies the security classification of the server. Any valid banner name can be used, including \"classified\", \"confidential\", \"secret\", \"topsecret\", and \"unclassified\", or the banner can be omitted to disable secure printing functions." msgstr "Gibt die Geheimhaltungsstufe des Servers an. Jeder gültige Deckblattname („Banner“-Name) kann benutzt werden, einschließlich „classified“, „confidential“, „secret“, „topsecret“ und „unclassified“. Wird kein Deckblatt angegeben, werden Funktionen für sicheres Drucken abgeschaltet." #. type: deftypevr -#: doc/guix.texi:14052 doc/guix.texi:14389 doc/guix.texi:15993 -#: doc/guix.texi:16005 doc/guix.texi:17707 doc/guix.texi:17733 -#: doc/guix.texi:17769 doc/guix.texi:17834 doc/guix.texi:17873 -#: doc/guix.texi:17932 doc/guix.texi:17941 doc/guix.texi:21527 -#: doc/guix.texi:21535 doc/guix.texi:21543 doc/guix.texi:21551 -#: doc/guix.texi:21829 doc/guix.texi:22307 doc/guix.texi:22315 -#: doc/guix.texi:22323 doc/guix.texi:22431 doc/guix.texi:22456 -#: doc/guix.texi:22587 doc/guix.texi:22595 doc/guix.texi:22603 -#: doc/guix.texi:22611 doc/guix.texi:22619 doc/guix.texi:22627 -#: doc/guix.texi:22650 doc/guix.texi:22658 doc/guix.texi:22710 -#: doc/guix.texi:22726 doc/guix.texi:22734 doc/guix.texi:22773 -#: doc/guix.texi:22796 doc/guix.texi:22818 doc/guix.texi:22825 -#: doc/guix.texi:22860 doc/guix.texi:22868 doc/guix.texi:22892 -#: doc/guix.texi:22924 doc/guix.texi:22953 doc/guix.texi:22960 -#: doc/guix.texi:22967 doc/guix.texi:22975 doc/guix.texi:22989 -#: doc/guix.texi:22998 doc/guix.texi:23008 doc/guix.texi:23015 -#: doc/guix.texi:23022 doc/guix.texi:23029 doc/guix.texi:23100 -#: doc/guix.texi:23107 doc/guix.texi:23114 doc/guix.texi:23123 -#: doc/guix.texi:23139 doc/guix.texi:23146 doc/guix.texi:23153 -#: doc/guix.texi:23160 doc/guix.texi:23168 doc/guix.texi:23176 +#: doc/guix.texi:14050 doc/guix.texi:14387 doc/guix.texi:15990 +#: doc/guix.texi:16002 doc/guix.texi:17704 doc/guix.texi:17730 +#: doc/guix.texi:17766 doc/guix.texi:17831 doc/guix.texi:17870 +#: doc/guix.texi:17929 doc/guix.texi:17938 doc/guix.texi:21524 +#: doc/guix.texi:21532 doc/guix.texi:21540 doc/guix.texi:21548 +#: doc/guix.texi:21826 doc/guix.texi:22304 doc/guix.texi:22312 +#: doc/guix.texi:22320 doc/guix.texi:22428 doc/guix.texi:22453 +#: doc/guix.texi:22584 doc/guix.texi:22592 doc/guix.texi:22600 +#: doc/guix.texi:22608 doc/guix.texi:22616 doc/guix.texi:22624 +#: doc/guix.texi:22647 doc/guix.texi:22655 doc/guix.texi:22707 +#: doc/guix.texi:22723 doc/guix.texi:22731 doc/guix.texi:22770 +#: doc/guix.texi:22793 doc/guix.texi:22815 doc/guix.texi:22822 +#: doc/guix.texi:22857 doc/guix.texi:22865 doc/guix.texi:22889 +#: doc/guix.texi:22921 doc/guix.texi:22950 doc/guix.texi:22957 +#: doc/guix.texi:22964 doc/guix.texi:22972 doc/guix.texi:22986 +#: doc/guix.texi:22995 doc/guix.texi:23005 doc/guix.texi:23012 +#: doc/guix.texi:23019 doc/guix.texi:23026 doc/guix.texi:23097 +#: doc/guix.texi:23104 doc/guix.texi:23111 doc/guix.texi:23120 +#: doc/guix.texi:23136 doc/guix.texi:23143 doc/guix.texi:23150 +#: doc/guix.texi:23157 doc/guix.texi:23165 doc/guix.texi:23173 msgid "Defaults to @samp{\"\"}." msgstr "Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:14054 +#: doc/guix.texi:14052 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean classify-override?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck classify-override?" #. type: deftypevr -#: doc/guix.texi:14057 +#: doc/guix.texi:14055 msgid "Specifies whether users may override the classification (cover page) of individual print jobs using the @code{job-sheets} option." msgstr "Gibt an, ob Nutzer bei einzelnen Druckaufträgen eine andere als die voreingestellte Geheimhaltungsstufe (für das Deckblatt) vorgeben können, indem sie die Option @code{job-sheets} einstellen." #. type: deftypevr -#: doc/guix.texi:14061 +#: doc/guix.texi:14059 #, no-wrap msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type" msgstr "{@code{cups-configuration}-Parameter} Voreingestelle-Authentifizierungsart default-auth-type" #. type: deftypevr -#: doc/guix.texi:14063 +#: doc/guix.texi:14061 msgid "Specifies the default type of authentication to use." msgstr "Gibt an, wie man nach Voreinstellung authentifiziert wird." #. type: deftypevr -#: doc/guix.texi:14065 +#: doc/guix.texi:14063 msgid "Defaults to @samp{Basic}." msgstr "Die Vorgabe ist @samp{Basic}." #. type: deftypevr -#: doc/guix.texi:14067 +#: doc/guix.texi:14065 #, no-wrap msgid "{@code{cups-configuration} parameter} default-encryption default-encryption" msgstr "{@code{cups-configuration}-Parameter} Voreingestellte-Verschlüsselung default-encryption" #. type: deftypevr -#: doc/guix.texi:14069 +#: doc/guix.texi:14067 msgid "Specifies whether encryption will be used for authenticated requests." msgstr "Gibt an, ob für authentifizierte Anfragen Verschlüsselung benutzt wird." #. type: deftypevr -#: doc/guix.texi:14071 +#: doc/guix.texi:14069 msgid "Defaults to @samp{Required}." msgstr "Die Vorgabe ist @samp{Required}." #. type: deftypevr -#: doc/guix.texi:14073 +#: doc/guix.texi:14071 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-language" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette default-language" #. type: deftypevr -#: doc/guix.texi:14075 +#: doc/guix.texi:14073 msgid "Specifies the default language to use for text and web content." msgstr "Gibt an, welche Sprache für Text und Weboberfläche voreingestellt benutzt werden soll." #. type: deftypevr -#: doc/guix.texi:14077 +#: doc/guix.texi:14075 msgid "Defaults to @samp{\"en\"}." msgstr "Die Vorgabe ist @samp{\"en\"}." #. type: deftypevr -#: doc/guix.texi:14079 +#: doc/guix.texi:14077 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-paper-size" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette default-paper-size" #. type: deftypevr -#: doc/guix.texi:14084 +#: doc/guix.texi:14082 msgid "Specifies the default paper size for new print queues. @samp{\"Auto\"} uses a locale-specific default, while @samp{\"None\"} specifies there is no default paper size. Specific size names are typically @samp{\"Letter\"} or @samp{\"A4\"}." msgstr "Gibt das voreingestellte Papierformat für neue Druckwarteschlangen an. Bei @samp{\"Auto\"} wird eine der Locale entsprechende Voreinstellung gewählt, während bei @samp{\"None\"} kein Papierformat voreingestellt ist. Verfügbare Formatbezeichnungen sind typischerweise @samp{\"Letter\"} oder @samp{\"A4\"}." #. type: deftypevr -#: doc/guix.texi:14086 +#: doc/guix.texi:14084 msgid "Defaults to @samp{\"Auto\"}." msgstr "Die Vorgabe ist @samp{\"Auto\"}." #. type: deftypevr -#: doc/guix.texi:14088 +#: doc/guix.texi:14086 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-policy" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette default-policy" #. type: deftypevr -#: doc/guix.texi:14090 +#: doc/guix.texi:14088 msgid "Specifies the default access policy to use." msgstr "Gibt die voreingestellte Zugriffsrichtlinie an, die benutzt werden soll." #. type: deftypevr -#: doc/guix.texi:14092 +#: doc/guix.texi:14090 msgid "Defaults to @samp{\"default\"}." msgstr "Die Vorgabe ist @samp{\"default\"}." #. type: deftypevr -#: doc/guix.texi:14094 +#: doc/guix.texi:14092 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean default-shared?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck default-shared?" #. type: deftypevr -#: doc/guix.texi:14096 +#: doc/guix.texi:14094 msgid "Specifies whether local printers are shared by default." msgstr "Gibt an, ob lokale Drucker nach Voreinstellung geteilt werden sollen." #. type: deftypevr -#: doc/guix.texi:14098 doc/guix.texi:14178 doc/guix.texi:14474 -#: doc/guix.texi:20087 doc/guix.texi:20115 doc/guix.texi:20235 -#: doc/guix.texi:20242 doc/guix.texi:20250 doc/guix.texi:20272 -#: doc/guix.texi:20286 doc/guix.texi:20371 doc/guix.texi:20378 -#: doc/guix.texi:20386 doc/guix.texi:20796 doc/guix.texi:20936 -#: doc/guix.texi:21122 doc/guix.texi:21129 doc/guix.texi:21151 -#: doc/guix.texi:21190 doc/guix.texi:21210 doc/guix.texi:21224 -#: doc/guix.texi:21376 doc/guix.texi:22409 doc/guix.texi:22497 -#: doc/guix.texi:22513 doc/guix.texi:22563 +#: doc/guix.texi:14096 doc/guix.texi:14176 doc/guix.texi:14472 +#: doc/guix.texi:20084 doc/guix.texi:20112 doc/guix.texi:20232 +#: doc/guix.texi:20239 doc/guix.texi:20247 doc/guix.texi:20269 +#: doc/guix.texi:20283 doc/guix.texi:20368 doc/guix.texi:20375 +#: doc/guix.texi:20383 doc/guix.texi:20793 doc/guix.texi:20933 +#: doc/guix.texi:21119 doc/guix.texi:21126 doc/guix.texi:21148 +#: doc/guix.texi:21187 doc/guix.texi:21207 doc/guix.texi:21221 +#: doc/guix.texi:21373 doc/guix.texi:22406 doc/guix.texi:22494 +#: doc/guix.texi:22510 doc/guix.texi:22560 msgid "Defaults to @samp{#t}." msgstr "Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:14100 +#: doc/guix.texi:14098 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl dirty-clean-interval" #. type: deftypevr -#: doc/guix.texi:14104 +#: doc/guix.texi:14102 msgid "Specifies the delay for updating of configuration and state files, in seconds. A value of 0 causes the update to happen as soon as possible, typically within a few milliseconds." msgstr "Gibt an, mit welcher Verzögerung Konfigurations- und Zustandsdateien aktualisiert werden sollen. Der Wert 0 lässt die Aktualisierung so bald wie möglich stattfinden, in der Regel nach ein paar Millisekunden." #. type: deftypevr -#: doc/guix.texi:14106 doc/guix.texi:14154 doc/guix.texi:14163 -#: doc/guix.texi:14184 doc/guix.texi:14481 +#: doc/guix.texi:14104 doc/guix.texi:14152 doc/guix.texi:14161 +#: doc/guix.texi:14182 doc/guix.texi:14479 msgid "Defaults to @samp{30}." msgstr "Die Vorgabe ist @samp{30}." #. type: deftypevr -#: doc/guix.texi:14108 +#: doc/guix.texi:14106 #, no-wrap msgid "{@code{cups-configuration} parameter} error-policy error-policy" msgstr "{@code{cups-configuration}-Parameter} Fehlerrichtlinie error-policy" #. type: deftypevr -#: doc/guix.texi:14114 +#: doc/guix.texi:14112 msgid "Specifies what to do when an error occurs. Possible values are @code{abort-job}, which will discard the failed print job; @code{retry-job}, which will retry the job at a later time; @code{retry-this-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer." msgstr "Gibt an, wie beim Auftreten eines Fehlers verfahren werden soll. Mögliche Werte sind @code{abort-job}, wodurch der fehlgeschlagene Druckauftrag verworfen wird, @code{retry-job}, wodurch der Druckauftrag später erneut versucht wird, @code{retry-this-job}, wodurch der fehlgeschlagene Druckauftrag sofort erneut versucht wird, und @code{stop-printer}, wodurch der Drucker angehalten wird." #. type: deftypevr -#: doc/guix.texi:14116 +#: doc/guix.texi:14114 msgid "Defaults to @samp{stop-printer}." msgstr "Die Vorgabe ist @samp{stop-printer}." #. type: deftypevr -#: doc/guix.texi:14118 +#: doc/guix.texi:14116 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl filter-limit" #. type: deftypevr -#: doc/guix.texi:14126 +#: doc/guix.texi:14124 msgid "Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems. A limit of 0 disables filter limiting. An average print to a non-PostScript printer needs a filter limit of about 200. A PostScript printer needs about half that (100). Setting the limit below these thresholds will effectively limit the scheduler to printing a single job at any time." msgstr "Gibt die Maximalkosten von Filtern an, die nebenläufig ausgeführt werden, wodurch Probleme durch Platten-, Arbeitsspeicher- und Prozessorressourcennutzung minimiert werden können. Eine Beschränkung von 0 deaktiviert die Filterbeschränkung. Ein durchschnittlicher Druck mit einem Nicht-PostScript-Drucker erfordert eine Filterbeschränkung von mindestens ungefähr 200. Ein PostScript-Drucker erfordert eine halb so hohe Filterbeschränkung (100). Wird die Beschränkung unterhalb dieser Schwellwerte angesetzt, kann das Planungsprogramm effektiv nur noch einen einzelnen Druckauftrag gleichzeitig abarbeiten." #. type: deftypevr -#: doc/guix.texi:14128 doc/guix.texi:14136 doc/guix.texi:14191 -#: doc/guix.texi:14307 doc/guix.texi:14321 doc/guix.texi:14328 -#: doc/guix.texi:15435 doc/guix.texi:15451 doc/guix.texi:16097 -#: doc/guix.texi:16109 doc/guix.texi:20812 doc/guix.texi:21137 -#: doc/guix.texi:22402 doc/guix.texi:22702 doc/guix.texi:22876 +#: doc/guix.texi:14126 doc/guix.texi:14134 doc/guix.texi:14189 +#: doc/guix.texi:14305 doc/guix.texi:14319 doc/guix.texi:14326 +#: doc/guix.texi:15432 doc/guix.texi:15448 doc/guix.texi:16094 +#: doc/guix.texi:16106 doc/guix.texi:20809 doc/guix.texi:21134 +#: doc/guix.texi:22399 doc/guix.texi:22699 doc/guix.texi:22873 msgid "Defaults to @samp{0}." msgstr "Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:14130 +#: doc/guix.texi:14128 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl filter-nice" #. type: deftypevr -#: doc/guix.texi:14134 +#: doc/guix.texi:14132 msgid "Specifies the scheduling priority of filters that are run to print a job. The nice value ranges from 0, the highest priority, to 19, the lowest priority." msgstr "Gibt die Planungspriorität von Filtern an, die zum Drucken eines Druckauftrags ausgeführt werden. Der nice-Wert kann zwischen 0, der höchsten Priorität, und 19, der niedrigsten Priorität, liegen." #. type: deftypevr -#: doc/guix.texi:14138 +#: doc/guix.texi:14136 #, no-wrap msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups" msgstr "{@code{cups-configuration}-Parameter} Rechnernamensauflösungen host-name-lookups" #. type: deftypevr -#: doc/guix.texi:14145 +#: doc/guix.texi:14143 msgid "Specifies whether to do reverse lookups on connecting clients. The @code{double} setting causes @code{cupsd} to verify that the hostname resolved from the address matches one of the addresses returned for that hostname. Double lookups also prevent clients with unregistered addresses from connecting to your server. Only set this option to @code{#t} or @code{double} if absolutely required." msgstr "Gibt an, ob umgekehrte Namensauflösungen („Reverse Lookups“) bei sich verbindenden Clients durchgeführt werden sollen. Die Einstellung @code{double} lässt @code{cupsd} verifizieren, dass der anhand der Adresse aufgelöste Rechnername zu einer der für den Rechnernamen zurückgelieferten Adressen passt. „Double“-Namensauflösungen verhindern auch, dass sich Clients mit unregistrierten Adressen mit Ihrem Server verbinden können. Setzen Sie diese Option nur dann auf @code{#t} oder @code{double}, wenn es unbedingt notwendig ist." #. type: deftypevr -#: doc/guix.texi:14149 +#: doc/guix.texi:14147 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl job-kill-delay" #. type: deftypevr -#: doc/guix.texi:14152 +#: doc/guix.texi:14150 msgid "Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job." msgstr "Gibt die Anzahl an Sekunden an, wie lange vor dem Abwürgen der mit einem abgebrochenen oder gehaltenen Druckauftrag assoziierten Filter- und Hintergrundprozesse (dem „Backend“) gewartet wird." #. type: deftypevr -#: doc/guix.texi:14156 +#: doc/guix.texi:14154 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl job-retry-interval" #. type: deftypevr -#: doc/guix.texi:14161 +#: doc/guix.texi:14159 msgid "Specifies the interval between retries of jobs in seconds. This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}." msgstr "Gibt das Zeitintervall zwischen erneuten Versuchen von Druckaufträgen in Sekunden an. Dies wird in der Regel für Fax-Warteschlangen benutzt, kann aber auch für normale Druckwarteschlangen benutzt werden, deren Fehlerrichtlinie @code{retry-job} oder @code{retry-current-job} ist." #. type: deftypevr -#: doc/guix.texi:14165 +#: doc/guix.texi:14163 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl job-retry-limit" #. type: deftypevr -#: doc/guix.texi:14170 +#: doc/guix.texi:14168 msgid "Specifies the number of retries that are done for jobs. This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}." msgstr "Gibt die Anzahl an, wie oft ein Druckauftrag erneut versucht wird. Dies wird in der Regel für Fax-Warteschlangen benutzt, kann aber auch für normale Druckwarteschlangen benutzt werden, deren Fehlerrichtlinie @code{retry-job} oder @code{retry-current-job} ist." #. type: deftypevr -#: doc/guix.texi:14172 doc/guix.texi:21628 doc/guix.texi:21648 -#: doc/guix.texi:21664 doc/guix.texi:21678 doc/guix.texi:21685 -#: doc/guix.texi:21692 doc/guix.texi:21699 doc/guix.texi:21858 -#: doc/guix.texi:21874 doc/guix.texi:21881 doc/guix.texi:21888 -#: doc/guix.texi:21899 doc/guix.texi:22354 doc/guix.texi:22362 -#: doc/guix.texi:22370 doc/guix.texi:22394 +#: doc/guix.texi:14170 doc/guix.texi:21625 doc/guix.texi:21645 +#: doc/guix.texi:21661 doc/guix.texi:21675 doc/guix.texi:21682 +#: doc/guix.texi:21689 doc/guix.texi:21696 doc/guix.texi:21855 +#: doc/guix.texi:21871 doc/guix.texi:21878 doc/guix.texi:21885 +#: doc/guix.texi:21896 doc/guix.texi:22351 doc/guix.texi:22359 +#: doc/guix.texi:22367 doc/guix.texi:22391 msgid "Defaults to @samp{5}." msgstr "Die Vorgabe ist @samp{5}." #. type: deftypevr -#: doc/guix.texi:14174 +#: doc/guix.texi:14172 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean keep-alive?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck keep-alive?" #. type: deftypevr -#: doc/guix.texi:14176 +#: doc/guix.texi:14174 msgid "Specifies whether to support HTTP keep-alive connections." msgstr "Gibt an, ob HTTP-„keep-alive“ für Verbindungen unterstützt wird." #. type: deftypevr -#: doc/guix.texi:14180 +#: doc/guix.texi:14178 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl keep-alive-timeout" #. type: deftypevr -#: doc/guix.texi:14182 +#: doc/guix.texi:14180 msgid "Specifies how long an idle client connection remains open, in seconds." msgstr "Gibt an, wie lange eine Clientverbindung ohne Aktivität offen bleibt, in Sekunden." #. type: deftypevr -#: doc/guix.texi:14186 +#: doc/guix.texi:14184 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl limit-request-body" #. type: deftypevr -#: doc/guix.texi:14189 +#: doc/guix.texi:14187 msgid "Specifies the maximum size of print files, IPP requests, and HTML form data. A limit of 0 disables the limit check." msgstr "Gibt die Maximalgröße von zu druckenden Dateien, IPP-Anfragen und HTML-Formulardaten an. Eine Beschränkung von 0 deaktiviert die Beschränkung." #. type: deftypevr -#: doc/guix.texi:14193 +#: doc/guix.texi:14191 #, no-wrap msgid "{@code{cups-configuration} parameter} multiline-string-list listen" msgstr "{@code{cups-configuration}-Parameter} Mehrzeilige-Zeichenketten-Liste listen" #. type: deftypevr -#: doc/guix.texi:14200 +#: doc/guix.texi:14198 msgid "Listens on the specified interfaces for connections. Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses. Values can also be file names of local UNIX domain sockets. The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks." msgstr "Lauscht auf den angegebenen Schnittstellen auf Verbindungen. Gültige Werte haben die Form @var{Adresse}:@var{Port}, wobei die @var{Adresse} entweder eine von eckigen Klammern umschlossene IPv6-Adresse, eine IPv4-Adresse oder @code{*} ist; letztere steht für alle Adressen. Werte können auch Dateinamen lokaler UNIX-Sockets sein. Die Listen-Direktive ähnelt der Port-Direktive, macht es aber möglich, den Zugriff für bestimmte Schnittstellen oder Netzwerke einzuschränken." #. type: deftypevr -#: doc/guix.texi:14202 +#: doc/guix.texi:14200 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl listen-back-log" #. type: deftypevr -#: doc/guix.texi:14209 +#: doc/guix.texi:14207 msgid "Specifies the number of pending connections that will be allowed. This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections. When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones." msgstr "Gibt die Anzahl ausstehender Verbindungen an, die möglich sein soll. Normalerweise betrifft dies nur sehr ausgelastete Server, die die MaxClients-Beschränkung erreicht haben. Es kann aber auch eine Rolle spielen, wenn versucht wird, gleichzeitig sehr viele Verbindungen herzustellen. Wenn die Beschränkung erreicht wird, sperrt das Betriebssystem den Aufbau weiterer Verbindungen, bis das Druckplanungsprogramm die ausstehenden akzeptieren konnte." #. type: deftypevr -#: doc/guix.texi:14211 +#: doc/guix.texi:14209 msgid "Defaults to @samp{128}." msgstr "Die Vorgabe ist @samp{128}." #. type: deftypevr -#: doc/guix.texi:14213 +#: doc/guix.texi:14211 #, no-wrap msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls" msgstr "{@code{cups-configuration}-Parameter} „location-access-controls“-Liste location-access-controls" #. type: deftypevr -#: doc/guix.texi:14215 +#: doc/guix.texi:14213 msgid "Specifies a set of additional access controls." msgstr "Gibt eine Liste zusätzlicher Zugriffssteuerungen („Access Controls“) an." #. type: deftypevr -#: doc/guix.texi:14217 +#: doc/guix.texi:14215 msgid "Available @code{location-access-controls} fields are:" msgstr "Verfügbare @code{location-access-controls}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14218 +#: doc/guix.texi:14216 #, no-wrap msgid "{@code{location-access-controls} parameter} file-name path" msgstr "{@code{location-access-controls}-Parameter} Dateiname path" #. type: deftypevr -#: doc/guix.texi:14220 +#: doc/guix.texi:14218 msgid "Specifies the URI path to which the access control applies." msgstr "Gibt den URI-Pfad an, für den die Zugriffssteuerung gilt." #. type: deftypevr -#: doc/guix.texi:14222 +#: doc/guix.texi:14220 #, no-wrap msgid "{@code{location-access-controls} parameter} access-control-list access-controls" msgstr "{@code{location-access-controls}-Parameter} Zugriffssteuerungs-Liste access-controls" #. type: deftypevr -#: doc/guix.texi:14225 +#: doc/guix.texi:14223 msgid "Access controls for all access to this path, in the same format as the @code{access-controls} of @code{operation-access-control}." msgstr "Zugriffssteuerungen für jeden Zugriff auf diesen Pfad, im selben Format wie die @code{access-controls} bei @code{operation-access-control}." #. type: deftypevr -#: doc/guix.texi:14227 doc/guix.texi:14233 doc/guix.texi:14247 -#: doc/guix.texi:14254 doc/guix.texi:14396 doc/guix.texi:14455 -#: doc/guix.texi:14539 doc/guix.texi:14550 doc/guix.texi:16583 -#: doc/guix.texi:17777 doc/guix.texi:17881 doc/guix.texi:18306 -#: doc/guix.texi:18314 doc/guix.texi:18559 doc/guix.texi:20146 -#: doc/guix.texi:20293 doc/guix.texi:20481 doc/guix.texi:21519 -#: doc/guix.texi:21579 doc/guix.texi:21587 doc/guix.texi:22417 -#: doc/guix.texi:22424 doc/guix.texi:22766 doc/guix.texi:22844 -#: doc/guix.texi:22938 doc/guix.texi:22946 doc/guix.texi:22982 -#: doc/guix.texi:23132 doc/guix.texi:23183 doc/guix.texi:23192 +#: doc/guix.texi:14225 doc/guix.texi:14231 doc/guix.texi:14245 +#: doc/guix.texi:14252 doc/guix.texi:14394 doc/guix.texi:14453 +#: doc/guix.texi:14537 doc/guix.texi:14548 doc/guix.texi:16580 +#: doc/guix.texi:17774 doc/guix.texi:17878 doc/guix.texi:18303 +#: doc/guix.texi:18311 doc/guix.texi:18556 doc/guix.texi:20143 +#: doc/guix.texi:20290 doc/guix.texi:20478 doc/guix.texi:21516 +#: doc/guix.texi:21576 doc/guix.texi:21584 doc/guix.texi:22414 +#: doc/guix.texi:22421 doc/guix.texi:22763 doc/guix.texi:22841 +#: doc/guix.texi:22935 doc/guix.texi:22943 doc/guix.texi:22979 +#: doc/guix.texi:23129 doc/guix.texi:23180 doc/guix.texi:23189 msgid "Defaults to @samp{()}." msgstr "Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:14229 +#: doc/guix.texi:14227 #, no-wrap msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls" msgstr "{@code{location-access-controls}-Parameter} „method-access-controls“-Liste method-access-controls" #. type: deftypevr -#: doc/guix.texi:14231 +#: doc/guix.texi:14229 msgid "Access controls for method-specific access to this path." msgstr "Zugriffssteuerungen für methodenspezifische Zugriffe auf diesen Pfad." #. type: deftypevr -#: doc/guix.texi:14235 +#: doc/guix.texi:14233 msgid "Available @code{method-access-controls} fields are:" msgstr "Verfügbare @code{method-access-controls}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14236 +#: doc/guix.texi:14234 #, no-wrap msgid "{@code{method-access-controls} parameter} boolean reverse?" msgstr "{@code{method-access-controls}-Parameter} Boolescher-Ausdruck reverse?" #. type: deftypevr -#: doc/guix.texi:14239 +#: doc/guix.texi:14237 msgid "If @code{#t}, apply access controls to all methods except the listed methods. Otherwise apply to only the listed methods." msgstr "Falls dies @code{#t} ist, gelten die Zugriffssteuerungen für alle Methoden außer den aufgelisteten Methoden. Andernfalls gelten sie nur für die aufgelisteten Methoden." #. type: deftypevr -#: doc/guix.texi:14243 +#: doc/guix.texi:14241 #, no-wrap msgid "{@code{method-access-controls} parameter} method-list methods" msgstr "{@code{method-access-controls}-Parameter} Methoden-Liste methods" #. type: deftypevr -#: doc/guix.texi:14245 +#: doc/guix.texi:14243 msgid "Methods to which this access control applies." msgstr "Methoden, für die diese Zugriffssteuerung gilt." #. type: deftypevr -#: doc/guix.texi:14249 +#: doc/guix.texi:14247 #, no-wrap msgid "{@code{method-access-controls} parameter} access-control-list access-controls" msgstr "{@code{method-access-controls}-Parameter} Zugriffssteuerungs-Liste access-controls" #. type: deftypevr -#: doc/guix.texi:14252 +#: doc/guix.texi:14250 msgid "Access control directives, as a list of strings. Each string should be one directive, such as \"Order allow,deny\"." msgstr "Zugriffssteuerungsdirektiven als eine Liste von Zeichenketten. Jede Zeichenkette steht für eine Direktive wie z.B.@: \"Order allow,deny\"." #. type: deftypevr -#: doc/guix.texi:14258 +#: doc/guix.texi:14256 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl log-debug-history" #. type: deftypevr -#: doc/guix.texi:14262 +#: doc/guix.texi:14260 msgid "Specifies the number of debugging messages that are retained for logging if an error occurs in a print job. Debug messages are logged regardless of the LogLevel setting." msgstr "Gibt die Anzahl der Nachrichten zur Fehlersuche an, die für Protokolle vorgehalten werden, wenn ein Fehler in einem Druckauftrag auftritt. Nachrichten zur Fehlersuche werden unabhängig von der LogLevel-Einstellung protokolliert." #. type: deftypevr -#: doc/guix.texi:14264 doc/guix.texi:14285 doc/guix.texi:14292 -#: doc/guix.texi:16343 doc/guix.texi:20466 +#: doc/guix.texi:14262 doc/guix.texi:14283 doc/guix.texi:14290 +#: doc/guix.texi:16340 doc/guix.texi:20463 msgid "Defaults to @samp{100}." msgstr "Die Vorgabe ist @samp{100}." #. type: deftypevr -#: doc/guix.texi:14266 +#: doc/guix.texi:14264 #, no-wrap msgid "{@code{cups-configuration} parameter} log-level log-level" msgstr "{@code{cups-configuration}-Parameter} Protokollstufe log-level" #. type: deftypevr -#: doc/guix.texi:14269 +#: doc/guix.texi:14267 msgid "Specifies the level of logging for the ErrorLog file. The value @code{none} stops all logging while @code{debug2} logs everything." msgstr "Gibt die Stufe der Protokollierung in die ErrorLog-Datei an. Der Wert @code{none} stoppt alle Protokollierung, während @code{debug2} alles protokollieren lässt." #. type: deftypevr -#: doc/guix.texi:14271 +#: doc/guix.texi:14269 msgid "Defaults to @samp{info}." msgstr "Die Vorgabe ist @samp{info}." #. type: deftypevr -#: doc/guix.texi:14273 +#: doc/guix.texi:14271 #, no-wrap msgid "{@code{cups-configuration} parameter} log-time-format log-time-format" msgstr "{@code{cups-configuration}-Parameter} Protokollzeitformat log-time-format" #. type: deftypevr -#: doc/guix.texi:14276 +#: doc/guix.texi:14274 msgid "Specifies the format of the date and time in the log files. The value @code{standard} logs whole seconds while @code{usecs} logs microseconds." msgstr "Gibt das Format von Datum und Uhrzeit in Protokolldateien an. Der Wert @code{standard} lässt ganze Sekunden ins Protokoll schreiben, während bei @code{usecs} Mikrosekunden protokolliert werden." #. type: deftypevr -#: doc/guix.texi:14278 +#: doc/guix.texi:14276 msgid "Defaults to @samp{standard}." msgstr "Die Vorgabe ist @samp{standard}." #. type: deftypevr -#: doc/guix.texi:14280 +#: doc/guix.texi:14278 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-clients" #. type: deftypevr -#: doc/guix.texi:14283 +#: doc/guix.texi:14281 msgid "Specifies the maximum number of simultaneous clients that are allowed by the scheduler." msgstr "Gibt die Maximalzahl gleichzeitig bedienter Clients an, die vom Planer zugelassen werden." #. type: deftypevr -#: doc/guix.texi:14287 +#: doc/guix.texi:14285 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-clients-per-host" #. type: deftypevr -#: doc/guix.texi:14290 +#: doc/guix.texi:14288 msgid "Specifies the maximum number of simultaneous clients that are allowed from a single address." msgstr "Gibt die Maximalzahl gleichzeitiger Clients von derselben Adresse an, die zugelassen werden." #. type: deftypevr -#: doc/guix.texi:14294 +#: doc/guix.texi:14292 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-copies" #. type: deftypevr -#: doc/guix.texi:14297 +#: doc/guix.texi:14295 msgid "Specifies the maximum number of copies that a user can print of each job." msgstr "Gibt die Maximalzahl der Kopien an, die ein Nutzer vom selben Druckauftrag ausdrucken lassen kann." #. type: deftypevr -#: doc/guix.texi:14299 +#: doc/guix.texi:14297 msgid "Defaults to @samp{9999}." msgstr "Die Vorgabe ist @samp{9999}." #. type: deftypevr -#: doc/guix.texi:14301 +#: doc/guix.texi:14299 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-hold-time" #. type: deftypevr -#: doc/guix.texi:14305 +#: doc/guix.texi:14303 msgid "Specifies the maximum time a job may remain in the @code{indefinite} hold state before it is canceled. A value of 0 disables cancellation of held jobs." msgstr "Gibt die maximale Zeitdauer an, die ein Druckauftrag im Haltezustand @code{indefinite} bleiben darf, bevor er abgebrochen wird. Ein Wert von 0 deaktiviert ein Abbrechen gehaltener Druckaufträge." #. type: deftypevr -#: doc/guix.texi:14309 +#: doc/guix.texi:14307 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-jobs" #. type: deftypevr -#: doc/guix.texi:14312 +#: doc/guix.texi:14310 msgid "Specifies the maximum number of simultaneous jobs that are allowed. Set to 0 to allow an unlimited number of jobs." msgstr "Gibt die Maximalzahl gleichzeitiger Druckaufträge an, die noch zugelassen wird. Wenn Sie es auf 0 setzen, wird die Anzahl Druckaufträge @emph{nicht} beschränkt." #. type: deftypevr -#: doc/guix.texi:14314 +#: doc/guix.texi:14312 msgid "Defaults to @samp{500}." msgstr "Die Vorgabe ist @samp{500}." #. type: deftypevr -#: doc/guix.texi:14316 +#: doc/guix.texi:14314 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-jobs-per-printer" #. type: deftypevr -#: doc/guix.texi:14319 +#: doc/guix.texi:14317 msgid "Specifies the maximum number of simultaneous jobs that are allowed per printer. A value of 0 allows up to MaxJobs jobs per printer." msgstr "Gibt die Maximalzahl gleichzeitiger Druckaufträge an, die pro Drucker zugelassen werden. Ein Wert von 0 lässt bis zu MaxJobs-viele Druckaufträge pro Drucker zu." #. type: deftypevr -#: doc/guix.texi:14323 +#: doc/guix.texi:14321 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-jobs-per-user" #. type: deftypevr -#: doc/guix.texi:14326 +#: doc/guix.texi:14324 msgid "Specifies the maximum number of simultaneous jobs that are allowed per user. A value of 0 allows up to MaxJobs jobs per user." msgstr "Gibt die Maximalzahl gleichzeitiger Druckaufträge an, die pro Benutzer zugelassen werden. Ein Wert von 0 lässt bis zu MaxJobs-viele Druckaufträge pro Benutzer zu." #. type: deftypevr -#: doc/guix.texi:14330 +#: doc/guix.texi:14328 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-job-time" #. type: deftypevr -#: doc/guix.texi:14333 +#: doc/guix.texi:14331 msgid "Specifies the maximum time a job may take to print before it is canceled, in seconds. Set to 0 to disable cancellation of \"stuck\" jobs." msgstr "Gibt die maximale Anzahl an, wie oft das Drucken eines Druckauftrags versucht werden kann, bis er abgebrochen wird, in Sekunden. Wenn Sie es auf 0 setzen, wird das Abbrechen „feststeckender“ Druckaufträge deaktiviert." #. type: deftypevr -#: doc/guix.texi:14335 +#: doc/guix.texi:14333 msgid "Defaults to @samp{10800}." msgstr "Die Vorgabe ist @samp{10800}." #. type: deftypevr -#: doc/guix.texi:14337 +#: doc/guix.texi:14335 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-log-size" #. type: deftypevr -#: doc/guix.texi:14340 +#: doc/guix.texi:14338 msgid "Specifies the maximum size of the log files before they are rotated, in bytes. The value 0 disables log rotation." msgstr "Gibt die Maximalgröße der Protokolldateien an, bevor sie rotiert werden, in Bytes. Beim Wert 0 wird Protokollrotation deaktiviert." #. type: deftypevr -#: doc/guix.texi:14342 +#: doc/guix.texi:14340 msgid "Defaults to @samp{1048576}." msgstr "Die Vorgabe ist @samp{1048576}." #. type: deftypevr -#: doc/guix.texi:14344 +#: doc/guix.texi:14342 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl multiple-operation-timeout" #. type: deftypevr -#: doc/guix.texi:14347 +#: doc/guix.texi:14345 msgid "Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds." msgstr "Gibt die maximale Zeitdauer an, wie lange es zwischen Dateien in einem Druckauftrag mit mehreren Dateien dauern darf, in Sekunden." #. type: deftypevr -#: doc/guix.texi:14349 doc/guix.texi:14563 doc/guix.texi:20080 +#: doc/guix.texi:14347 doc/guix.texi:14561 doc/guix.texi:20077 msgid "Defaults to @samp{300}." msgstr "Die Vorgabe ist @samp{300}." #. type: deftypevr -#: doc/guix.texi:14351 +#: doc/guix.texi:14349 #, no-wrap msgid "{@code{cups-configuration} parameter} string page-log-format" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette page-log-format" #. type: deftypevr -#: doc/guix.texi:14356 +#: doc/guix.texi:14354 msgid "Specifies the format of PageLog lines. Sequences beginning with percent (@samp{%}) characters are replaced with the corresponding information, while all other characters are copied literally. The following percent sequences are recognized:" msgstr "Gibt das Format der Zeilen im PageLog-Seitenprotokoll an. Folgen, die mit Prozentzeichen (@samp{%}) beginnen, werden durch die jeweils zugehörigen Informationen ersetzt, während alle anderen Zeichen wortwörtlich übernommen werden. Die folgenden Prozentfolgen werden erkannt:" #. type: item -#: doc/guix.texi:14358 +#: doc/guix.texi:14356 #, no-wrap msgid "%%" msgstr "%%" #. type: table -#: doc/guix.texi:14360 +#: doc/guix.texi:14358 msgid "insert a single percent character" msgstr "ein einzelnes Prozentzeichen einfügen" #. type: item -#: doc/guix.texi:14361 +#: doc/guix.texi:14359 #, no-wrap msgid "%@{name@}" msgstr "%@{name@}" #. type: table -#: doc/guix.texi:14363 +#: doc/guix.texi:14361 msgid "insert the value of the specified IPP attribute" msgstr "den Wert des angegebenen IPP-Attributs einfügen" #. type: item -#: doc/guix.texi:14364 +#: doc/guix.texi:14362 #, no-wrap msgid "%C" msgstr "%C" #. type: table -#: doc/guix.texi:14366 +#: doc/guix.texi:14364 msgid "insert the number of copies for the current page" msgstr "die Anzahl der Kopien der aktuellen Seite einfügen" #. type: item -#: doc/guix.texi:14367 +#: doc/guix.texi:14365 #, no-wrap msgid "%P" msgstr "%P" #. type: table -#: doc/guix.texi:14369 +#: doc/guix.texi:14367 msgid "insert the current page number" msgstr "die aktuelle Seitenzahl einfügen" #. type: item -#: doc/guix.texi:14370 +#: doc/guix.texi:14368 #, no-wrap msgid "%T" msgstr "%T" #. type: table -#: doc/guix.texi:14372 +#: doc/guix.texi:14370 msgid "insert the current date and time in common log format" msgstr "das aktuelle Datum und Uhrzeit im allgemeinen Protokollformat einfügen" #. type: item -#: doc/guix.texi:14373 +#: doc/guix.texi:14371 #, no-wrap msgid "%j" msgstr "%j" #. type: table -#: doc/guix.texi:14375 +#: doc/guix.texi:14373 msgid "insert the job ID" msgstr "den Druckauftragsidentifikator („Job-ID“) einfügen" #. type: item -#: doc/guix.texi:14376 doc/guix.texi:15953 +#: doc/guix.texi:14374 doc/guix.texi:15950 #, no-wrap msgid "%p" msgstr "%p" #. type: table -#: doc/guix.texi:14378 +#: doc/guix.texi:14376 msgid "insert the printer name" msgstr "den Druckernamen einfügen" #. type: item -#: doc/guix.texi:14379 doc/guix.texi:15976 +#: doc/guix.texi:14377 doc/guix.texi:15973 #, no-wrap msgid "%u" msgstr "%u" #. type: table -#: doc/guix.texi:14381 +#: doc/guix.texi:14379 msgid "insert the username" msgstr "den Benutzernamen einfügen" #. type: deftypevr -#: doc/guix.texi:14387 +#: doc/guix.texi:14385 msgid "A value of the empty string disables page logging. The string @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} %@{media@} %@{sides@}} creates a page log with the standard items." msgstr "Wird die leere Zeichenkette als Wert angegeben, wird Seitenprotokollierung abgeschaltet. Die Zeichenkette @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} %@{media@} %@{sides@}} erzeugt ein Seitenprotokoll mit den üblichen Elementen." #. type: deftypevr -#: doc/guix.texi:14391 +#: doc/guix.texi:14389 #, no-wrap msgid "{@code{cups-configuration} parameter} environment-variables environment-variables" msgstr "{@code{cups-configuration}-Parameter} Umgebungsvariable environment-variables" #. type: deftypevr -#: doc/guix.texi:14394 +#: doc/guix.texi:14392 msgid "Passes the specified environment variable(s) to child processes; a list of strings." msgstr "Übergibt die angegebene(n) Umgebungsvariable(n) an Kindprozesse, als Liste von Zeichenketten." #. type: deftypevr -#: doc/guix.texi:14398 +#: doc/guix.texi:14396 #, no-wrap msgid "{@code{cups-configuration} parameter} policy-configuration-list policies" msgstr "{@code{cups-configuration}-Parameter} „policy-configuration“-Liste policies" #. type: deftypevr -#: doc/guix.texi:14400 +#: doc/guix.texi:14398 msgid "Specifies named access control policies." msgstr "Gibt die benannten Zugriffssteuerungsrichtlinien an." #. type: deftypevr -#: doc/guix.texi:14402 +#: doc/guix.texi:14400 msgid "Available @code{policy-configuration} fields are:" msgstr "Verfügbare @code{policy-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14403 +#: doc/guix.texi:14401 #, no-wrap msgid "{@code{policy-configuration} parameter} string name" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:14405 +#: doc/guix.texi:14403 msgid "Name of the policy." msgstr "Der Name der Richtlinie." #. type: deftypevr -#: doc/guix.texi:14407 +#: doc/guix.texi:14405 #, no-wrap msgid "{@code{policy-configuration} parameter} string job-private-access" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette job-private-access" #. type: deftypevr -#: doc/guix.texi:14417 +#: doc/guix.texi:14415 msgid "Specifies an access list for a job's private values. @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. @code{@@OWNER} maps to the job's owner. @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file. Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group. The access list may also be simply @code{all} or @code{default}." msgstr "Gibt eine Zugriffsliste der privaten Werte eines Druckauftrags an. @code{@@ACL} wird auf die Werte von requesting-user-name-allowed oder requesting-user-name-denied des Druckers abgebildet. @code{@@OWNER} wird auf den Besitzer des Druckauftrags abgebildet. @code{@@SYSTEM} wird auf die Gruppen abgebildet, die im @code{system-group}-Feld der @code{files-config}-Konfiguration aufgelistet sind, aus der die Datei @code{cups-files.conf(5)} erzeugt wird. Zu den anderen möglichen Elementen der Zugriffsliste gehören Namen bestimmer Benutzerkonten und @code{@@@var{Benutzergruppe}}, was für Mitglieder einer bestimmten Benutzergruppe steht. Die Zugriffsliste kann auch einfach als @code{all} oder @code{default} festgelegt werden." #. type: deftypevr -#: doc/guix.texi:14419 doc/guix.texi:14441 +#: doc/guix.texi:14417 doc/guix.texi:14439 msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}." msgstr "Die Vorgabe ist @samp{\"@@OWNER @@SYSTEM\"}." #. type: deftypevr -#: doc/guix.texi:14421 +#: doc/guix.texi:14419 #, no-wrap msgid "{@code{policy-configuration} parameter} string job-private-values" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette job-private-values" #. type: deftypevr -#: doc/guix.texi:14424 doc/guix.texi:14446 +#: doc/guix.texi:14422 doc/guix.texi:14444 msgid "Specifies the list of job values to make private, or @code{all}, @code{default}, or @code{none}." msgstr "Gibt die Liste der Druckauftragswerte an, die geschützt werden sollten, oder @code{all}, @code{default} oder @code{none}." #. type: deftypevr -#: doc/guix.texi:14427 +#: doc/guix.texi:14425 msgid "Defaults to @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}." msgstr "Die Vorgabe ist @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}." #. type: deftypevr -#: doc/guix.texi:14429 +#: doc/guix.texi:14427 #, no-wrap msgid "{@code{policy-configuration} parameter} string subscription-private-access" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette subscription-private-access" #. type: deftypevr -#: doc/guix.texi:14439 +#: doc/guix.texi:14437 msgid "Specifies an access list for a subscription's private values. @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. @code{@@OWNER} maps to the job's owner. @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file. Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group. The access list may also be simply @code{all} or @code{default}." msgstr "Gibt eine Zugriffsliste für die privaten Werte eines Abonnements an. @code{@@ACL} wird auf die Werte von requesting-user-name-allowed oder requesting-user-name-denied des Druckers abgebildet. @code{@@OWNER} wird auf den Besitzer des Druckauftrags abgebildet. @code{@@SYSTEM} wird auf die Gruppen abgebildet, die im @code{system-group}-Feld der @code{files-config}-Konfiguration aufgelistet sind, aus der die Datei @code{cups-files.conf(5)} erzeugt wird. Zu den anderen möglichen Elementen der Zugriffsliste gehören Namen bestimmer Benutzerkonten und @code{@@@var{Benutzergruppe}}, was für Mitglieder einer bestimmten Benutzergruppe steht. Die Zugriffsliste kann auch einfach als @code{all} oder @code{default} festgelegt werden." #. type: deftypevr -#: doc/guix.texi:14443 +#: doc/guix.texi:14441 #, no-wrap msgid "{@code{policy-configuration} parameter} string subscription-private-values" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette subscription-private-values" #. type: deftypevr -#: doc/guix.texi:14449 +#: doc/guix.texi:14447 msgid "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}." msgstr "Die Vorgabe ist @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}." #. type: deftypevr -#: doc/guix.texi:14451 +#: doc/guix.texi:14449 #, no-wrap msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls" msgstr "{@code{policy-configuration}-Parameter} „operation-access-controls“-Liste access-controls" #. type: deftypevr -#: doc/guix.texi:14453 +#: doc/guix.texi:14451 msgid "Access control by IPP operation." msgstr "Zugriffssteuerung durch IPP-Betrieb." #. type: deftypevr -#: doc/guix.texi:14458 +#: doc/guix.texi:14456 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck-oder-Nichtnegative-ganze-Zahl preserve-job-files" #. type: deftypevr -#: doc/guix.texi:14463 +#: doc/guix.texi:14461 msgid "Specifies whether job files (documents) are preserved after a job is printed. If a numeric value is specified, job files are preserved for the indicated number of seconds after printing. Otherwise a boolean value applies indefinitely." msgstr "Gibt an, ob die Dateien eines Druckauftrags (Dokumente) erhalten bleiben, nachdem ein Druckauftrag ausgedruckt wurde. Wenn eine Zahl angegeben wird, bleiben die Dateien des Druckauftrags für die angegebene Zahl von Sekunden nach dem Drucken erhalten. Ein boolescher Wert bestimmt ansonsten, ob sie auf unbestimmte Zeit erhalten bleiben." #. type: deftypevr -#: doc/guix.texi:14465 +#: doc/guix.texi:14463 msgid "Defaults to @samp{86400}." msgstr "Die Vorgabe ist @samp{86400}." #. type: deftypevr -#: doc/guix.texi:14467 +#: doc/guix.texi:14465 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history" -msgstr "{@code{cups-configuration} parameter} Boolescher-Ausdruck-oder-Nichtnegative-ganze-Zahl preserve-job-history" +msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck-oder-Nichtnegative-ganze-Zahl preserve-job-history" #. type: deftypevr -#: doc/guix.texi:14472 +#: doc/guix.texi:14470 msgid "Specifies whether the job history is preserved after a job is printed. If a numeric value is specified, the job history is preserved for the indicated number of seconds after printing. If @code{#t}, the job history is preserved until the MaxJobs limit is reached." msgstr "Gibt an, ob der Druckauftragsverlauf nach dem Drucken eines Druckauftrags erhalten bleibt. Wenn eine Zahl angegeben wird, bleibt der Druckauftragsverlauf für die angegebene Zahl von Sekunden nach dem Drucken erhalten. Bei @code{#t} bleibt der Druckauftragsverlauf so lange erhalten, bis die MaxJobs-Beschränkung erreicht wurde." #. type: deftypevr -#: doc/guix.texi:14476 +#: doc/guix.texi:14474 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl reload-timeout" #. type: deftypevr -#: doc/guix.texi:14479 +#: doc/guix.texi:14477 msgid "Specifies the amount of time to wait for job completion before restarting the scheduler." msgstr "Gibt an, wie lange vor dem Neustart des Planungsprogramms auf den Abschluss eines Druckauftrages gewartet wird." #. type: deftypevr -#: doc/guix.texi:14483 +#: doc/guix.texi:14481 #, no-wrap msgid "{@code{cups-configuration} parameter} string rip-cache" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette rip-cache" #. type: deftypevr -#: doc/guix.texi:14486 +#: doc/guix.texi:14484 msgid "Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer." msgstr "Gibt die maximale Menge an genutztem Arbeitsspeicher für das Konvertieren von Dokumenten in eine Rastergrafik (eine „Bitmap“) für einen Drucker an." #. type: deftypevr -#: doc/guix.texi:14488 +#: doc/guix.texi:14486 msgid "Defaults to @samp{\"128m\"}." msgstr "Die Vorgabe ist @samp{\"128m\"}." #. type: deftypevr -#: doc/guix.texi:14490 +#: doc/guix.texi:14488 #, no-wrap msgid "{@code{cups-configuration} parameter} string server-admin" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette server-admin" #. type: deftypevr -#: doc/guix.texi:14492 +#: doc/guix.texi:14490 msgid "Specifies the email address of the server administrator." msgstr "Gibt die E-Mail-Adresse des Serveradministrators an." #. type: deftypevr -#: doc/guix.texi:14494 +#: doc/guix.texi:14492 msgid "Defaults to @samp{\"root@@localhost.localdomain\"}." msgstr "Die Vorgabe ist @samp{\"root@@localhost.localdomain\"}." #. type: deftypevr -#: doc/guix.texi:14496 +#: doc/guix.texi:14494 #, no-wrap msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias" msgstr "{@code{cups-configuration}-Parameter} Rechnernamens-Liste-oder-* server-alias" #. type: deftypevr -#: doc/guix.texi:14504 +#: doc/guix.texi:14502 msgid "The ServerAlias directive is used for HTTP Host header validation when clients connect to the scheduler from external interfaces. Using the special name @code{*} can expose your system to known browser-based DNS rebinding attacks, even when accessing sites through a firewall. If the auto-discovery of alternate names does not work, we recommend listing each alternate name with a ServerAlias directive instead of using @code{*}." msgstr "Die ServerAlias-Direktive wird zur Prüfung der HTTP-Host-Kopfzeile benutzt, wenn sich Clients mit dem Planungsprogramm über externe Schnittstellen verbinden. Wenn der besondere Name @code{*} benutzt wird, könnte Ihr System möglicherweise bekannten browserbasierten DNS-Rebinding-Angriffen ausgesetzt werden, selbst wenn auf die Angebote nur über eine Firewall zugegriffen wird. Wenn alternative Namen nicht automatisch erkannt werden, empfehlen wir, jeden alternativen Namen in der ServerAlias-Direktive aufzulisten, statt @code{*} zu benutzen." #. type: deftypevr -#: doc/guix.texi:14506 +#: doc/guix.texi:14504 msgid "Defaults to @samp{*}." msgstr "Die Vorgabe ist @samp{*}." #. type: deftypevr -#: doc/guix.texi:14508 +#: doc/guix.texi:14506 #, no-wrap msgid "{@code{cups-configuration} parameter} string server-name" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette server-name" #. type: deftypevr -#: doc/guix.texi:14510 +#: doc/guix.texi:14508 msgid "Specifies the fully-qualified host name of the server." msgstr "Gibt den vollständigen Rechnernamen („Fully-Qualified Host Name“) des Servers an." #. type: deftypevr -#: doc/guix.texi:14512 doc/guix.texi:17904 doc/guix.texi:17948 +#: doc/guix.texi:14510 doc/guix.texi:17901 doc/guix.texi:17945 msgid "Defaults to @samp{\"localhost\"}." msgstr "Die Vorgabe ist @samp{\"localhost\"}." #. type: deftypevr -#: doc/guix.texi:14514 +#: doc/guix.texi:14512 #, no-wrap msgid "{@code{cups-configuration} parameter} server-tokens server-tokens" msgstr "{@code{cups-configuration}-Parameter} Server-Tokens server-tokens" #. type: deftypevr -#: doc/guix.texi:14522 +#: doc/guix.texi:14520 msgid "Specifies what information is included in the Server header of HTTP responses. @code{None} disables the Server header. @code{ProductOnly} reports @code{CUPS}. @code{Major} reports @code{CUPS 2}. @code{Minor} reports @code{CUPS 2.0}. @code{Minimal} reports @code{CUPS 2.0.0}. @code{OS} reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the @code{uname} command. @code{Full} reports @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}." msgstr "Gibt an, welche Informationen in der Server-Kopfzeile von HTTP-Antworten vorkommen. @code{None} deaktiviert die Server-Kopfzeile. @code{ProductOnly} liefert @code{CUPS}. @code{Major} liefert @code{CUPS 2}. @code{Minor} liefert @code{CUPS 2.0}. @code{Minimal} liefert @code{CUPS 2.0.0}. @code{OS} liefert @code{CUPS 2.0.0 (@var{uname})}, wobei @var{uname} die Ausgabe des Befehls @code{uname} ist. @code{Full} liefert @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}." #. type: deftypevr -#: doc/guix.texi:14524 +#: doc/guix.texi:14522 msgid "Defaults to @samp{Minimal}." msgstr "Die Vorgabe ist @samp{Minimal}." #. type: deftypevr -#: doc/guix.texi:14526 +#: doc/guix.texi:14524 #, no-wrap msgid "{@code{cups-configuration} parameter} string set-env" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette set-env" #. type: deftypevr -#: doc/guix.texi:14528 +#: doc/guix.texi:14526 msgid "Set the specified environment variable to be passed to child processes." msgstr "Legt die angegebene Umgebungsvariable auf einen Wert (englisch „Value“) fest, die an Kindprozesse übergeben wird." #. type: deftypevr -#: doc/guix.texi:14530 +#: doc/guix.texi:14528 msgid "Defaults to @samp{\"variable value\"}." msgstr "Die Vorgabe ist @samp{\"variable value\"}." #. type: deftypevr -#: doc/guix.texi:14532 +#: doc/guix.texi:14530 #, no-wrap msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen" msgstr "{@code{cups-configuration}-Parameter} Mehrzeilige-Zeichenketten-Liste ssl-listen" #. type: deftypevr -#: doc/guix.texi:14537 +#: doc/guix.texi:14535 msgid "Listens on the specified interfaces for encrypted connections. Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses." msgstr "Lauscht auf den angegebenen Schnittstellen auf verschlüsselte Verbindungen. Gültige Werte haben die Form @var{Adresse}:@var{Port}, wobei die @var{Adresse} entweder eine von eckigen Klammern umschlossene IPv6-Adresse, eine IPv4-Adresse oder @code{*} ist; letztere steht für alle Adressen." #. type: deftypevr -#: doc/guix.texi:14541 +#: doc/guix.texi:14539 #, no-wrap msgid "{@code{cups-configuration} parameter} ssl-options ssl-options" msgstr "{@code{cups-configuration}-Parameter} SSL-Optionen ssl-options" #. type: deftypevr -#: doc/guix.texi:14548 +#: doc/guix.texi:14546 msgid "Sets encryption options. By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. The @code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0." msgstr "Legt Verschlüsselungsoptionen fest. Nach Vorgabe unterstützt CUPS nur Verschlüsselung mit TLS v1.0 oder höher mit bekannten, sicheren „Cipher Suites“. Die Option @code{AllowRC4} aktiviert die 128-Bit-RC4-Cipher-Suites, die manche alten Clients brauchen, weil sie neuere nicht implementieren. Die Option @code{AllowSSL3} aktiviert SSL v3.0, das manche alte Clients brauchen, die TLS v1.0 nicht implementieren." #. type: deftypevr -#: doc/guix.texi:14552 +#: doc/guix.texi:14550 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean strict-conformance?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck strict-conformance?" #. type: deftypevr -#: doc/guix.texi:14555 +#: doc/guix.texi:14553 msgid "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications." msgstr "Gibt an, ob das Druckplanungsprogramm von Clients fordert, dass sie sich strikt an die IPP-Spezifikationen halten." #. type: deftypevr -#: doc/guix.texi:14559 +#: doc/guix.texi:14557 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl timeout" #. type: deftypevr -#: doc/guix.texi:14561 +#: doc/guix.texi:14559 msgid "Specifies the HTTP request timeout, in seconds." msgstr "Gibt die Zeitbeschränkung für HTTP-Anfragen an, in Sekunden." #. type: deftypevr -#: doc/guix.texi:14566 +#: doc/guix.texi:14564 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean web-interface?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck web-interface?" #. type: deftypevr -#: doc/guix.texi:14568 +#: doc/guix.texi:14566 msgid "Specifies whether the web interface is enabled." msgstr "Gibt an, ob die Weboberfläche zur Verfügung gestellt wird." #. type: Plain text -#: doc/guix.texi:14578 +#: doc/guix.texi:14576 msgid "At this point you're probably thinking ``oh dear, Guix manual, I like you but you can stop already with the configuration options''. Indeed. However, one more point: it could be that you have an existing @code{cupsd.conf} that you want to use. In that case, you can pass an @code{opaque-cups-configuration} as the configuration of a @code{cups-service-type}." msgstr "Mittlerweile denken Sie wahrscheinlich: „Ich bitte dich, Guix-Handbuch, ich mag dich, aber kannst du jetzt bitte mit den Konfigurationsoptionen aufhören?“ Damit hätten Sie recht. Allerdings sollte ein weitere Punkt noch erwähnt werden: Vielleicht haben Sie eine bestehende @code{cupsd.conf}, die Sie verwenden möchten. In diesem Fall können Sie eine @code{opaque-cups-configuration} als die Konfiguration eines @code{cups-service-type} übergeben." #. type: Plain text -#: doc/guix.texi:14580 +#: doc/guix.texi:14578 msgid "Available @code{opaque-cups-configuration} fields are:" msgstr "Verfügbare @code{opaque-cups-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14581 +#: doc/guix.texi:14579 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} package cups" msgstr "{@code{opaque-cups-configuration}-Parameter} „package“ cups" #. type: deftypevr -#: doc/guix.texi:14585 +#: doc/guix.texi:14583 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf" msgstr "{@code{opaque-cups-configuration}-Parameter} Zeichenkette cupsd.conf" #. type: deftypevr -#: doc/guix.texi:14587 +#: doc/guix.texi:14585 msgid "The contents of the @code{cupsd.conf}, as a string." msgstr "Der Inhalt der Datei @code{cupsd.conf} als eine Zeichenkette." #. type: deftypevr -#: doc/guix.texi:14589 +#: doc/guix.texi:14587 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf" msgstr "{@code{opaque-cups-configuration}-Parameter} Zeichenkette cups-files.conf" #. type: deftypevr -#: doc/guix.texi:14591 +#: doc/guix.texi:14589 msgid "The contents of the @code{cups-files.conf} file, as a string." msgstr "Der Inhalt der Datei @code{cups-files.conf} als eine Zeichenkette." #. type: Plain text -#: doc/guix.texi:14596 +#: doc/guix.texi:14594 msgid "For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in strings of the same name, you could instantiate a CUPS service like this:" msgstr "Wenn Ihre @code{cupsd.conf} und @code{cups-files.conf} zum Beispiel in Zeichenketten mit dem entsprechenden Namen definiert sind, könnten Sie auf diese Weise einen CUPS-Dienst instanziieren:" #. type: example -#: doc/guix.texi:14602 +#: doc/guix.texi:14600 #, no-wrap msgid "" "(service cups-service-type\n" @@ -27191,195 +27202,197 @@ msgstr "" " (cups-files.conf cups-files.conf)))\n" #. type: Plain text -#: doc/guix.texi:14613 +#: doc/guix.texi:14611 msgid "The @code{(gnu services desktop)} module provides services that are usually useful in the context of a ``desktop'' setup---that is, on a machine running a graphical display server, possibly with graphical user interfaces, etc. It also defines services that provide specific desktop environments like GNOME, Xfce or MATE." msgstr "Das Modul @code{(gnu services desktop)} stellt Dienste zur Verfügung, die meistens bei „Desktop“-Einrichtungen für grafische Nutzung praktisch sind — also auf einer Maschine mit einem grafischem Anzeigeserver, vielleicht mit einer grafischen Benutzeroberfläche, usw. Im Modul werden auch Dienste definiert, die bestimmte Arbeitsumgebungen wie GNOME, Xfce oder MATE bereitstellen." #. type: Plain text -#: doc/guix.texi:14617 +#: doc/guix.texi:14615 msgid "To simplify things, the module defines a variable containing the set of services that users typically expect on a machine with a graphical environment and networking:" msgstr "Um es einfacher zu machen, definiert das Modul auch eine Variable mit denjenigen Diensten, die man auf einer Maschine mit einer grafischen Umgebung und Netzwerkunterstützung erwarten würde:" #. type: defvr -#: doc/guix.texi:14618 +#: doc/guix.texi:14616 #, no-wrap msgid "{Scheme Variable} %desktop-services" msgstr "{Scheme-Variable} %desktop-services" #. type: defvr -#: doc/guix.texi:14621 +#: doc/guix.texi:14619 msgid "This is a list of services that builds upon @var{%base-services} and adds or adjusts services for a typical ``desktop'' setup." msgstr "Dies ist eine Liste von Diensten, die @var{%base-services} ergänzt und weitere Dienste hinzufügt oder bestehende anpasst, um für eine normale „Desktop“-Nutzung geeignet zu sein." #. type: defvr -#: doc/guix.texi:14632 -msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}) with modem support (@pxref{Networking Services, @code{modem-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." +#: doc/guix.texi:14629 +#, fuzzy +#| msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}) with modem support (@pxref{Networking Services, @code{modem-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." +msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." msgstr "Insbesondere wird eine grafische Anmeldeverwaltung hinzugefügt (siehe @ref{X Window, @code{gdm-service-type}}), ebenso Programme zur Bildschirmsperre, ein Werkzeug zur Netzwerkverwaltung (siehe @ref{Networking Services, @code{network-manager-service-type}}) mit Unterstützung für Modems (siehe @ref{Networking Services, @code{modem-manager-service-type}}), Energieverbrauchs- und Farbverwaltungsdienste, Anmeldungs- und Sitzungsverwaltung über @code{elogind}, der Berechtigungsdienst Polkit, der Ortungsdienst GeoClue, der AccountsService-Daemon, mit dem autorisierte Benutzer Systempasswörter ändern können, ein NTP-Client (siehe @ref{Networking Services}) und der Avahi-Daemon. Außerdem wird der Name Service Switch konfiguriert, damit er @code{nss-mdns} benutzt (siehe @ref{Name Service Switch, mDNS})." #. type: Plain text -#: doc/guix.texi:14637 +#: doc/guix.texi:14634 msgid "The @var{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}})." msgstr "Die @var{%desktop-services}-Variable kann als das @code{services}-Feld einer @code{operating-system}-Deklaration genutzt werden (siehe @ref{operating-system Reference, @code{services}})." #. type: Plain text -#: doc/guix.texi:14660 +#: doc/guix.texi:14657 msgid "Additionally, the @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type} and @code{enlightenment-desktop-service-type} procedures can add GNOME, Xfce, MATE and/or Enlightenment to a system. To ``add GNOME'' means that system-level services like the backlight adjustment helpers and the power management utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, adding a service made by @code{gnome-desktop-service-type} adds the GNOME metapackage to the system profile. Likewise, adding the Xfce service not only adds the @code{xfce} metapackage to the system profile, but it also gives the Thunar file manager the ability to open a ``root-mode'' file management window, if the user authenticates using the administrator's password via the standard polkit graphical interface. To ``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, adding a service of type @code{mate-desktop-service-type} adds the MATE metapackage to the system profile. ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other functionality to work as expetected." msgstr "Daneben können die Prozeduren @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type} und @code{enlightenment-desktop-service-type} jeweils GNOME, Xfce, MATE und/oder Enlightenment zu einem System hinzufügen. „GNOME hinzufügen“ bedeutet, dass Dienste auf Systemebene wie z.B.@: Hilfsprogramme zur Anpassung der Hintergrundbeleuchtung und des Energieverbrauchs zum System hinzugefügt werden und @code{polkit} und @code{dbus} entsprechend erweitert werden, wodurch GNOME mit erhöhten Berechtigungen auf eine begrenzte Zahl von speziellen Systemschnittstellen zugreifen kann. Zusätzlich bedeutet das Hinzufügen eines durch @code{gnome-desktop-service-type} erzeugten Dienstes, dass das GNOME-Metapaket ins Systemprofil eingefügt wird. Genauso wird beim Einfügen des Xfce-Dienstes nicht nur das @code{xfce}-Metapaket zum Systemprofil hinzugefügt, sondern dem Thunar-Dateiverwaltungsprogramm wird auch die Berechtigung gegeben, ein Fenster mit Administratorrechten zu öffnen, wenn der Benutzer sich mit dem Administratorpasswort über die standardmäßige grafische Oberfläche von Polkit authentiziert. „MATE hinzufügen“ bedeutet, dass @code{polkit} und @code{dbus} entsprechend erweitert werden, wodurch MATE mit erhöhten Berechtigungen auf eine begrenzte Zahl von speziellen Systemschnittstellen zugreifen kann. Zusätzlich bedeutet das Hinzufügen eines durch @code{mate-desktop-service-type} erzeugten Dienstes, dass das MATE-Metapaket ins Systemprofil eingefügt wird. „Enlightenment hinzufügen“ bedeutet, dass @code{dbus} entsprechend erweitert wird und mehrere Binärdateien von Enlightenment als setuid eingerichtet werden, wodurch das Programm zum Sperren des Bildschirms und andere Funktionen von Enlightenment wie erwartet funktionieren." #. type: Plain text -#: doc/guix.texi:14669 +#: doc/guix.texi:14666 msgid "The desktop environments in Guix use the Xorg display server by default. If you'd like to use the newer display server protocol called Wayland, you need to use the @code{sddm-service} instead of GDM as the graphical login manager. You should then select the ``GNOME (Wayland)'' session in SDDM. Alternatively you can also try starting GNOME on Wayland manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session``. Currently only GNOME has support for Wayland." msgstr "Die Arbeitsumgebungen in Guix benutzen standardmäßig den Xorg-Anzeigeserver. Falls Sie das neuere Anzeigeserverprotokoll namens Wayland benutzen möchten, müssen Sie den Dienst @code{sddm-service} anstelle von GDM für die grafische Anmeldeverwaltung einrichten. Dann sollten Sie in SDDM die Sitzung „GNOME (Wayland)“ auswählen. Alternativ können Sie auch versuchen, GNOME mit Wayland manuell aus einer Konsole (TTY) mit dem Befehl „XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session“ zu starten. Derzeit wird Wayland nur von GNOME unterstützt." #. type: defvr -#: doc/guix.texi:14670 +#: doc/guix.texi:14667 #, no-wrap msgid "{Scheme Variable} gnome-desktop-service-type" msgstr "{Scheme-Variable} gnome-desktop-service-type" #. type: defvr -#: doc/guix.texi:14674 +#: doc/guix.texi:14671 msgid "This is the type of the service that adds the @uref{https://www.gnome.org, GNOME} desktop environment. Its value is a @code{gnome-desktop-configuration} object (see below.)" msgstr "Dies ist der Typ des Dienstes, der die @uref{https://www.gnome.org, GNOME-Arbeitsumgebung} bereitstellt. Sein Wert ist ein @code{gnome-desktop-configuration}-Objekt (siehe unten)." #. type: defvr -#: doc/guix.texi:14677 +#: doc/guix.texi:14674 msgid "This service adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}." msgstr "Dieser Dienst fügt das @code{gnome}-Paket zum Systemprofil hinzu und erweitert Polkit um die von @code{gnome-settings-daemon} benötigten Aktionen." #. type: deftp -#: doc/guix.texi:14679 +#: doc/guix.texi:14676 #, no-wrap msgid "{Data Type} gnome-desktop-configuration" msgstr "{Datentyp} gnome-desktop-configuration" #. type: deftp -#: doc/guix.texi:14681 +#: doc/guix.texi:14678 msgid "Configuration record for the GNOME desktop environment." msgstr "Verbundsobjekt für die Konfiguration der GNOME-Arbeitsumgebung." #. type: item -#: doc/guix.texi:14683 +#: doc/guix.texi:14680 #, no-wrap msgid "@code{gnome} (default: @code{gnome})" msgstr "@code{gnome} (Vorgabe: @code{gnome})" #. type: table -#: doc/guix.texi:14685 +#: doc/guix.texi:14682 msgid "The GNOME package to use." msgstr "Welches GNOME-Paket benutzt werden soll." #. type: defvr -#: doc/guix.texi:14688 +#: doc/guix.texi:14685 #, no-wrap msgid "{Scheme Variable} xfce-desktop-service-type" msgstr "{Scheme-Variable} xfce-desktop-service-type" #. type: defvr -#: doc/guix.texi:14692 +#: doc/guix.texi:14689 msgid "This is the type of a service to run the @uref{Xfce, https://xfce.org/} desktop environment. Its value is an @code{xfce-desktop-configuration} object (see below.)" msgstr "Der Typ des Dienstes, um die @uref{https://xfce.org/, Xfce-Arbeitsumgebung} auszuführen. Sein Wert ist ein @code{xfce-desktop-configuration}-Objekt (siehe unten)." #. type: defvr -#: doc/guix.texi:14697 +#: doc/guix.texi:14694 msgid "This service adds the @code{xfce} package to the system profile, and extends polkit with the ability for @code{thunar} to manipulate the file system as root from within a user session, after the user has authenticated with the administrator's password." msgstr "Dieser Dienst fügt das Paket @code{xfce} zum Systemprofil hinzu und erweitert Polkit, damit @code{thunar} befähigt wird, das Dateisystem aus einer Benutzersitzung heraus mit Administratorrechten zu bearbeiten, nachdem sich der Benutzer mit dem Administratorpasswort authentiziert hat." #. type: deftp -#: doc/guix.texi:14699 +#: doc/guix.texi:14696 #, no-wrap msgid "{Data Type} xfce-desktop-configuration" msgstr "{Datentyp} xfce-desktop-configuration" #. type: deftp -#: doc/guix.texi:14701 +#: doc/guix.texi:14698 msgid "Configuration record for the Xfce desktop environment." msgstr "Verbundstyp für Einstellungen zur Xfce-Arbeitsumgebung." #. type: item -#: doc/guix.texi:14703 +#: doc/guix.texi:14700 #, no-wrap msgid "@code{xfce} (default: @code{xfce})" msgstr "@code{xfce} (Vorgabe: @code{xfce})" #. type: table -#: doc/guix.texi:14705 +#: doc/guix.texi:14702 msgid "The Xfce package to use." msgstr "Das Xfce-Paket, was benutzt werden soll." #. type: deffn -#: doc/guix.texi:14708 +#: doc/guix.texi:14705 #, no-wrap msgid "{Scheme Variable} mate-desktop-service-type" msgstr "{Scheme-Variable} mate-desktop-service-type" #. type: deffn -#: doc/guix.texi:14712 +#: doc/guix.texi:14709 msgid "This is the type of the service that runs the @uref{https://mate-desktop.org/, MATE desktop environment}. Its value is a @code{mate-desktop-configuration} object (see below.)" msgstr "Dies ist der Typ des Dienstes, um die @uref{https://mate-desktop.org/, MATE-Arbeitsumgebung} auszuführen. Sein Wert ist ein @code{mate-desktop-configuration}-Objekt (siehe unten)." #. type: deffn -#: doc/guix.texi:14716 +#: doc/guix.texi:14713 msgid "This service adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}." msgstr "Dieser Dienst fügt das Paket @code{mate} ins Systemprofil ein und erweitert Polkit um die Aktionen aus dem @code{mate-settings-daemon}." #. type: deftp -#: doc/guix.texi:14718 +#: doc/guix.texi:14715 #, no-wrap msgid "{Data Type} mate-desktop-configuration" msgstr "{Datentyp} mate-desktop-configuration" #. type: deftp -#: doc/guix.texi:14720 +#: doc/guix.texi:14717 msgid "Configuration record for the MATE desktop environment." msgstr "Verbundstyp für die Einstellungen der MATE-Arbeitsumgebung." #. type: item -#: doc/guix.texi:14722 +#: doc/guix.texi:14719 #, no-wrap msgid "@code{mate} (default: @code{mate})" msgstr "@code{mate} (Vorgabe: @code{mate})" #. type: table -#: doc/guix.texi:14724 +#: doc/guix.texi:14721 msgid "The MATE package to use." msgstr "Das MATE-Paket, was benutzt werden soll." #. type: deffn -#: doc/guix.texi:14727 +#: doc/guix.texi:14724 #, no-wrap msgid "{Scheme Variable} enlightenment-desktop-service-type" msgstr "{Scheme-Variable} enlightenment-desktop-service-type" #. type: deffn -#: doc/guix.texi:14730 +#: doc/guix.texi:14727 msgid "Return a service that adds the @code{enlightenment} package to the system profile, and extends dbus with actions from @code{efl}." msgstr "Liefert einen Dienst, der das @code{enlightenment}-Paket zum Systemprofil hinzufügt und D-Bus mit den Aktionen aus @code{efl} erweitert." #. type: deftp -#: doc/guix.texi:14732 +#: doc/guix.texi:14729 #, no-wrap msgid "{Data Type} enlightenment-desktop-service-configuration" msgstr "{Datentyp} enlightenment-desktop-service-configuration" #. type: item -#: doc/guix.texi:14734 +#: doc/guix.texi:14731 #, no-wrap msgid "@code{enlightenment} (default: @code{enlightenment})" msgstr "@code{enlightenment} (Vorgabe: @code{enlightenment})" #. type: table -#: doc/guix.texi:14736 +#: doc/guix.texi:14733 msgid "The enlightenment package to use." msgstr "Das Enlightenment-Paket, was benutzt werden soll." #. type: Plain text -#: doc/guix.texi:14744 +#: doc/guix.texi:14741 msgid "Because the GNOME, Xfce and MATE desktop services pull in so many packages, the default @code{%desktop-services} variable doesn't include any of them by default. To add GNOME, Xfce or MATE, just @code{cons} them onto @code{%desktop-services} in the @code{services} field of your @code{operating-system}:" msgstr "Weil die Desktopdienste GNOME, Xfce und MATE so viele Pakete ins System mitnehmen, gehören diese nicht zu den Vorgaben in der @code{%desktop-services}-Variablen. Um GNOME, Xfce oder MATE hinzuzufügen, benutzen Sie einfach @code{cons} zum Anhängen an die @code{%desktop-services} im @code{services}-Feld Ihrer @code{operating-system}-Deklaration:" #. type: example -#: doc/guix.texi:14755 +#: doc/guix.texi:14752 #, no-wrap msgid "" "(use-modules (gnu))\n" @@ -27403,666 +27416,666 @@ msgstr "" " …)\n" #. type: Plain text -#: doc/guix.texi:14759 +#: doc/guix.texi:14756 msgid "These desktop environments will then be available as options in the graphical login window." msgstr "Diese Arbeitsumgebungen stehen dann im grafischen Anmeldefenster zur Auswahl." #. type: Plain text -#: doc/guix.texi:14763 +#: doc/guix.texi:14760 msgid "The actual service definitions included in @code{%desktop-services} and provided by @code{(gnu services dbus)} and @code{(gnu services desktop)} are described below." msgstr "Die eigentlichen Dienstdefinitionen, die in @code{%desktop-services} stehen und durch @code{(gnu services dbus)} und @code{(gnu services desktop)} zur Verfügung gestellt werden, werden im Folgenden beschrieben." #. type: deffn -#: doc/guix.texi:14764 +#: doc/guix.texi:14761 #, no-wrap msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]" msgstr "{Scheme-Prozedur} dbus-service [#:dbus @var{dbus}] [#:services '()]" #. type: deffn -#: doc/guix.texi:14767 +#: doc/guix.texi:14764 msgid "Return a service that runs the ``system bus'', using @var{dbus}, with support for @var{services}." msgstr "Liefert einen Dienst, der den „Systembus“ mit @var{dbus} ausführt, mit Unterstützung für die als @var{services} übergebenen Dienste." #. type: deffn -#: doc/guix.texi:14771 +#: doc/guix.texi:14768 msgid "@uref{https://dbus.freedesktop.org/, D-Bus} is an inter-process communication facility. Its system bus is used to allow system services to communicate and to be notified of system-wide events." msgstr "@uref{https://dbus.freedesktop.org/, D-Bus} ist eine Einrichtung zur Interprozesskommunikation. Deren Systembus wird benutzt, damit Systemdienste miteinander kommunizieren können und damit sie bei systemweiten Ereignissen benachrichtigt werden können." #. type: deffn -#: doc/guix.texi:14776 +#: doc/guix.texi:14773 msgid "@var{services} must be a list of packages that provide an @file{etc/dbus-1/system.d} directory containing additional D-Bus configuration and policy files. For example, to allow avahi-daemon to use the system bus, @var{services} must be equal to @code{(list avahi)}." msgstr "Als @var{services} muss eine Liste von Paketen übergeben werden, die ein Verzeichnis @file{etc/dbus-1/system.d} mit zusätzlichen D-Bus-Konfigurations- und Richtliniendateien enthalten. Damit zum Beispiel der Avahi-Daemon den Systembus benutzen kann, muss @var{services} gleich @code{(list avahi)} sein." #. type: deffn -#: doc/guix.texi:14778 +#: doc/guix.texi:14775 #, no-wrap msgid "{Scheme Procedure} elogind-service [#:config @var{config}]" msgstr "{Scheme-Prozedur} elogind-service [#:config @var{Konfiguration}]" #. type: deffn -#: doc/guix.texi:14784 +#: doc/guix.texi:14781 msgid "Return a service that runs the @code{elogind} login and seat management daemon. @uref{https://github.com/elogind/elogind, Elogind} exposes a D-Bus interface that can be used to know which users are logged in, know what kind of sessions they have open, suspend the system, inhibit system suspend, reboot the system, and other tasks." msgstr "Liefert einen Dienst, der den Anmelde- und Sitzungsdaemon @code{elogind} ausführt. @uref{https://github.com/elogind/elogind, Elogind} stellt eine D-Bus-Schnittstelle bereit, über die ausgelesen werden kann, welche Benutzer angemeldet sind und welche Sitzungen sie geöffnet haben, und außerdem das System in Bereitschaft versetzt werden kann, der Bereitschaftsmodus unterdrückt werden kann, das System neu gestartet werden kann und anderes." #. type: deffn -#: doc/guix.texi:14788 +#: doc/guix.texi:14785 msgid "Elogind handles most system-level power events for a computer, for example suspending the system when a lid is closed, or shutting it down when the power button is pressed." msgstr "Die meisten Energieereignisse auf Systemebene in einem Rechner werden von elogind behandelt, wie etwa ein Versetzen des Systems in Bereitschaft, wenn der Rechner zugeklappt wird, oder ein Herunterfahren beim Drücken des Stromschalters." #. type: deffn -#: doc/guix.texi:14793 +#: doc/guix.texi:14790 msgid "The @var{config} keyword argument specifies the configuration for elogind, and should be the result of an @code{(elogind-configuration (@var{parameter} @var{value})...)} invocation. Available parameters and their default values are:" msgstr "Das @var{config}-Schlüsselwort gibt die Konfiguration für elogind an und sollte das Ergebnis eines Aufrufs von @code{(elogind-configuration (@var{Parameter} @var{Wert})...)} sein. Verfügbare Parameter und ihre Vorgabewerte sind:" #. type: item -#: doc/guix.texi:14795 +#: doc/guix.texi:14792 #, no-wrap msgid "kill-user-processes?" msgstr "kill-user-processes?" #. type: code{#1} -#: doc/guix.texi:14797 doc/guix.texi:14815 doc/guix.texi:14817 -#: doc/guix.texi:14819 doc/guix.texi:14831 +#: doc/guix.texi:14794 doc/guix.texi:14812 doc/guix.texi:14814 +#: doc/guix.texi:14816 doc/guix.texi:14828 msgid "#f" msgstr "#f" #. type: item -#: doc/guix.texi:14797 +#: doc/guix.texi:14794 #, no-wrap msgid "kill-only-users" msgstr "kill-only-users" #. type: code{#1} -#: doc/guix.texi:14799 doc/guix.texi:14837 +#: doc/guix.texi:14796 doc/guix.texi:14834 msgid "()" msgstr "()" #. type: item -#: doc/guix.texi:14799 +#: doc/guix.texi:14796 #, no-wrap msgid "kill-exclude-users" msgstr "kill-exclude-users" #. type: code{#1} -#: doc/guix.texi:14801 +#: doc/guix.texi:14798 msgid "(\"root\")" msgstr "(\"root\")" #. type: item -#: doc/guix.texi:14801 +#: doc/guix.texi:14798 #, no-wrap msgid "inhibit-delay-max-seconds" msgstr "inhibit-delay-max-seconds" #. type: code{#1} -#: doc/guix.texi:14803 +#: doc/guix.texi:14800 msgid "5" msgstr "5" #. type: item -#: doc/guix.texi:14803 +#: doc/guix.texi:14800 #, no-wrap msgid "handle-power-key" msgstr "handle-power-key" #. type: code{#1} -#: doc/guix.texi:14805 +#: doc/guix.texi:14802 msgid "poweroff" msgstr "poweroff" #. type: item -#: doc/guix.texi:14805 +#: doc/guix.texi:14802 #, no-wrap msgid "handle-suspend-key" msgstr "handle-suspend-key" #. type: code{#1} -#: doc/guix.texi:14807 doc/guix.texi:14811 +#: doc/guix.texi:14804 doc/guix.texi:14808 msgid "suspend" msgstr "suspend" #. type: item -#: doc/guix.texi:14807 +#: doc/guix.texi:14804 #, no-wrap msgid "handle-hibernate-key" msgstr "handle-hibernate-key" #. type: code{#1} -#: doc/guix.texi:14809 +#: doc/guix.texi:14806 msgid "hibernate" msgstr "hibernate" #. type: item -#: doc/guix.texi:14809 +#: doc/guix.texi:14806 #, no-wrap msgid "handle-lid-switch" msgstr "handle-lid-switch" #. type: item -#: doc/guix.texi:14811 +#: doc/guix.texi:14808 #, no-wrap msgid "handle-lid-switch-docked" msgstr "handle-lid-switch-docked" #. type: code{#1} -#: doc/guix.texi:14813 doc/guix.texi:14825 +#: doc/guix.texi:14810 doc/guix.texi:14822 msgid "ignore" msgstr "ignore" #. type: item -#: doc/guix.texi:14813 +#: doc/guix.texi:14810 #, no-wrap msgid "power-key-ignore-inhibited?" msgstr "power-key-ignore-inhibited?" #. type: item -#: doc/guix.texi:14815 +#: doc/guix.texi:14812 #, no-wrap msgid "suspend-key-ignore-inhibited?" msgstr "suspend-key-ignore-inhibited?" #. type: item -#: doc/guix.texi:14817 +#: doc/guix.texi:14814 #, no-wrap msgid "hibernate-key-ignore-inhibited?" msgstr "hibernate-key-ignore-inhibited?" #. type: item -#: doc/guix.texi:14819 +#: doc/guix.texi:14816 #, no-wrap msgid "lid-switch-ignore-inhibited?" msgstr "lid-switch-ignore-inhibited?" #. type: code{#1} -#: doc/guix.texi:14821 doc/guix.texi:14833 +#: doc/guix.texi:14818 doc/guix.texi:14830 msgid "#t" msgstr "#t" #. type: item -#: doc/guix.texi:14821 +#: doc/guix.texi:14818 #, no-wrap msgid "holdoff-timeout-seconds" msgstr "holdoff-timeout-seconds" #. type: code{#1} -#: doc/guix.texi:14823 +#: doc/guix.texi:14820 msgid "30" msgstr "30" #. type: item -#: doc/guix.texi:14823 +#: doc/guix.texi:14820 #, no-wrap msgid "idle-action" msgstr "idle-action" #. type: item -#: doc/guix.texi:14825 +#: doc/guix.texi:14822 #, no-wrap msgid "idle-action-seconds" msgstr "idle-action-seconds" #. type: code{#1} -#: doc/guix.texi:14827 +#: doc/guix.texi:14824 msgid "(* 30 60)" msgstr "(* 30 60)" #. type: item -#: doc/guix.texi:14827 +#: doc/guix.texi:14824 #, no-wrap msgid "runtime-directory-size-percent" msgstr "runtime-directory-size-percent" #. type: code{#1} -#: doc/guix.texi:14829 +#: doc/guix.texi:14826 msgid "10" msgstr "10" #. type: item -#: doc/guix.texi:14829 +#: doc/guix.texi:14826 #, no-wrap msgid "runtime-directory-size" msgstr "runtime-directory-size" #. type: item -#: doc/guix.texi:14831 +#: doc/guix.texi:14828 #, no-wrap msgid "remove-ipc?" msgstr "remove-ipc?" #. type: item -#: doc/guix.texi:14833 +#: doc/guix.texi:14830 #, no-wrap msgid "suspend-state" msgstr "suspend-state" #. type: code{#1} -#: doc/guix.texi:14835 +#: doc/guix.texi:14832 msgid "(\"mem\" \"standby\" \"freeze\")" msgstr "(\"mem\" \"standby\" \"freeze\")" #. type: item -#: doc/guix.texi:14835 +#: doc/guix.texi:14832 #, no-wrap msgid "suspend-mode" msgstr "suspend-mode" #. type: item -#: doc/guix.texi:14837 +#: doc/guix.texi:14834 #, no-wrap msgid "hibernate-state" msgstr "hibernate-state" #. type: code{#1} -#: doc/guix.texi:14839 doc/guix.texi:14843 +#: doc/guix.texi:14836 doc/guix.texi:14840 msgid "(\"disk\")" msgstr "(\"disk\")" #. type: item -#: doc/guix.texi:14839 +#: doc/guix.texi:14836 #, no-wrap msgid "hibernate-mode" msgstr "hibernate-mode" #. type: code{#1} -#: doc/guix.texi:14841 +#: doc/guix.texi:14838 msgid "(\"platform\" \"shutdown\")" msgstr "(\"platform\" \"shutdown\")" #. type: item -#: doc/guix.texi:14841 +#: doc/guix.texi:14838 #, no-wrap msgid "hybrid-sleep-state" msgstr "hybrid-sleep-state" #. type: item -#: doc/guix.texi:14843 +#: doc/guix.texi:14840 #, no-wrap msgid "hybrid-sleep-mode" msgstr "hybrid-sleep-mode" #. type: code{#1} -#: doc/guix.texi:14845 +#: doc/guix.texi:14842 msgid "(\"suspend\" \"platform\" \"shutdown\")" msgstr "(\"suspend\" \"platform\" \"shutdown\")" #. type: deffn -#: doc/guix.texi:14848 +#: doc/guix.texi:14845 #, no-wrap msgid "{Scheme Procedure} accountsservice-service @" msgstr "{Scheme-Prozedur} accountsservice-service @" #. type: deffn -#: doc/guix.texi:14856 +#: doc/guix.texi:14853 msgid "[#:accountsservice @var{accountsservice}] Return a service that runs AccountsService, a system service that can list available accounts, change their passwords, and so on. AccountsService integrates with PolicyKit to enable unprivileged users to acquire the capability to modify their system configuration. @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the accountsservice web site} for more information." -msgstr "" +msgstr "[#:accountsservice @var{accountsservice}] Liefert einen Dienst, der AccountsService ausführt. Dabei handelt es sich um einen Systemdienst, mit dem verfügbare Benutzerkonten aufgelistet und deren Passwörter geändert werden können, und Ähnliches. AccountsService arbeitet mit PolicyKit zusammen, um es Benutzern ohne besondere Berechtigungen zu ermöglichen, ihre Systemkonfiguration zu ändern. Siehe @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, die Webpräsenz von AccountsService} für weitere Informationen." #. type: deffn -#: doc/guix.texi:14859 +#: doc/guix.texi:14856 msgid "The @var{accountsservice} keyword argument is the @code{accountsservice} package to expose as a service." -msgstr "" +msgstr "Das Schlüsselwortargument @var{accountsservice} gibt das @code{accountsservice}-Paket an, das als Dienst verfügbar gemacht wird." #. type: deffn -#: doc/guix.texi:14861 +#: doc/guix.texi:14858 #, no-wrap msgid "{Scheme Procedure} polkit-service @" -msgstr "" +msgstr "{Scheme-Prozedur} polkit-service @" #. type: deffn -#: doc/guix.texi:14870 +#: doc/guix.texi:14867 msgid "[#:polkit @var{polkit}] Return a service that runs the @uref{https://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, which allows system administrators to grant access to privileged operations in a structured way. By querying the Polkit service, a privileged system component can know when it should grant additional capabilities to ordinary users. For example, an ordinary user can be granted the capability to suspend the system if the user is logged in locally." -msgstr "" +msgstr "[#:polkit @var{polkit}] Liefert einen Dienst, der @uref{https://www.freedesktop.org/wiki/Software/polkit/, Polkit als Dienst zur Verwaltung von Berechtigungen} ausführt, wodurch Systemadministratoren auf strukturierte Weise den Zugang zu „privilegierten“ Operationen gewähren können, die erweiterte Berechtigungen erfordern. Indem der Polkit-Dienst angefragt wird, kann eine mit Berechtigungen ausgestattete Systemkomponente die Information erhalten, ob normalen Benutzern Berechtigungen gewährt werden dürfen. Zum Beispiel kann einer normalen Nutzerin die Berechtigung gegeben werden, das System in den Bereitschaftsmodus zu versetzen, unter der Voraussetzung, dass sie lokal vor Ort angemeldet ist." #. type: defvr -#: doc/guix.texi:14872 +#: doc/guix.texi:14869 #, no-wrap msgid "{Scheme Variable} upower-service-type" msgstr "{Scheme-Variable} upower-service-type" #. type: defvr -#: doc/guix.texi:14876 +#: doc/guix.texi:14873 msgid "Service that runs @uref{https://upower.freedesktop.org/, @command{upowerd}}, a system-wide monitor for power consumption and battery levels, with the given configuration settings." msgstr "Typ des Dienstes, der @uref{https://upower.freedesktop.org/, @command{upowerd}} ausführt, ein Programm zur systemweiten Überwachung des Energieverbrauchs und der Akkuladung. Er hat die angegebenen Konfigurationseinstellungen." #. type: defvr -#: doc/guix.texi:14879 +#: doc/guix.texi:14876 msgid "It implements the @code{org.freedesktop.UPower} D-Bus interface, and is notably used by GNOME." -msgstr "" +msgstr "Er implementiert die D-Bus-Schnittstelle @code{org.freedesktop.UPower}. Insbesondere wird UPower auch von GNOME benutzt." #. type: deftp -#: doc/guix.texi:14881 +#: doc/guix.texi:14878 #, no-wrap msgid "{Data Type} upower-configuration" msgstr "{Datentyp} upower-configuration" #. type: deftp -#: doc/guix.texi:14883 +#: doc/guix.texi:14880 msgid "Data type representation the configuration for UPower." msgstr "Repräsentiert die Konfiguration von UPower." #. type: item -#: doc/guix.texi:14886 +#: doc/guix.texi:14883 #, no-wrap msgid "@code{upower} (default: @var{upower})" msgstr "@code{upower} (Vorgabe: @var{upower})" #. type: table -#: doc/guix.texi:14888 +#: doc/guix.texi:14885 msgid "Package to use for @code{upower}." -msgstr "" +msgstr "Das Paket, das für @code{upower} benutzt werden soll." #. type: item -#: doc/guix.texi:14889 +#: doc/guix.texi:14886 #, no-wrap msgid "@code{watts-up-pro?} (default: @code{#f})" msgstr "@code{watts-up-pro?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:14891 +#: doc/guix.texi:14888 msgid "Enable the Watts Up Pro device." -msgstr "" +msgstr "Aktiviert das Watts-Up-Pro-Gerät." #. type: item -#: doc/guix.texi:14892 +#: doc/guix.texi:14889 #, no-wrap msgid "@code{poll-batteries?} (default: @code{#t})" msgstr "@code{poll-batteries?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:14894 +#: doc/guix.texi:14891 msgid "Enable polling the kernel for battery level changes." -msgstr "" +msgstr "Aktiviert das regelmäßige Abfragen des Kernels bezüglich Änderungen am Stand der Akku-Ladung." #. type: item -#: doc/guix.texi:14895 +#: doc/guix.texi:14892 #, no-wrap msgid "@code{ignore-lid?} (default: @code{#f})" msgstr "@code{ignore-lid?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:14897 +#: doc/guix.texi:14894 msgid "Ignore the lid state, this can be useful if it's incorrect on a device." -msgstr "" +msgstr "Ignorieren, ob der Rechner zugeklappt ist. Das kann gewünscht sein, wenn Auf- und Zuklappen nicht richtig erkannt werden." #. type: item -#: doc/guix.texi:14898 +#: doc/guix.texi:14895 #, no-wrap msgid "@code{use-percentage-for-policy?} (default: @code{#f})" msgstr "@code{use-percentage-for-policy?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:14901 +#: doc/guix.texi:14898 msgid "Whether battery percentage based policy should be used. The default is to use the time left, change to @code{#t} to use the percentage." -msgstr "" +msgstr "Ob sich die Richtlinie am Akku-Ladestand in Prozent orientieren soll. Die Vorgabe ist, sich an der verbleibenden Zeit zu orientieren. Wenn Sie sie auf @code{#t} ändern, dient der Prozentstand als Orientierung." #. type: item -#: doc/guix.texi:14902 +#: doc/guix.texi:14899 #, no-wrap msgid "@code{percentage-low} (default: @code{10})" msgstr "@code{percentage-low} (Vorgabe: @code{10})" #. type: table -#: doc/guix.texi:14905 +#: doc/guix.texi:14902 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered low." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#t} gesetzt ist, wird hiermit der Prozentstand festgelegt, ab dem der Akku-Ladestand als niedrig gilt." #. type: item -#: doc/guix.texi:14906 +#: doc/guix.texi:14903 #, no-wrap msgid "@code{percentage-critical} (default: @code{3})" msgstr "@code{percentage-critical} (Vorgabe: @code{3})" #. type: table -#: doc/guix.texi:14909 +#: doc/guix.texi:14906 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered critical." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#t} gesetzt ist, wird hiermit der Prozentstand festgelegt, ab dem der Akku-Ladestand als kritisch gilt." #. type: item -#: doc/guix.texi:14910 +#: doc/guix.texi:14907 #, no-wrap msgid "@code{percentage-action} (default: @code{2})" msgstr "@code{percentage-action} (Vorgabe: @code{2})" #. type: table -#: doc/guix.texi:14913 +#: doc/guix.texi:14910 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which action will be taken." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#t} gesetzt ist, wird hiermit der Prozentstand festgelegt, ab dem Maßnahmen eingeleitet werden." #. type: item -#: doc/guix.texi:14914 +#: doc/guix.texi:14911 #, no-wrap msgid "@code{time-low} (default: @code{1200})" msgstr "@code{time-low} (Vorgabe: @code{1200})" #. type: table -#: doc/guix.texi:14917 +#: doc/guix.texi:14914 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered low." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#f} gesetzt ist, wird hiermit die verbleibende Zeit in Sekunden festgelegt, ab der der Akku-Ladestand als niedrig gilt." #. type: item -#: doc/guix.texi:14918 +#: doc/guix.texi:14915 #, no-wrap msgid "@code{time-critical} (default: @code{300})" msgstr "@code{time-critical} (Vorgabe: @code{300})" #. type: table -#: doc/guix.texi:14921 +#: doc/guix.texi:14918 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered critical." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#f} gesetzt ist, wird hiermit die verbleibende Zeit in Sekunden festgelegt, ab der der Akku-Ladestand als kritisch gilt." #. type: item -#: doc/guix.texi:14922 +#: doc/guix.texi:14919 #, no-wrap msgid "@code{time-action} (default: @code{120})" msgstr "@code{time-action} (Vorgabe: @code{120})" #. type: table -#: doc/guix.texi:14925 +#: doc/guix.texi:14922 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which action will be taken." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#f} gesetzt ist, wird hiermit die verbleibende Zeit in Sekunden festgelegt, ab der Maßnahmen eingeleitet werden." #. type: item -#: doc/guix.texi:14926 +#: doc/guix.texi:14923 #, no-wrap msgid "@code{critical-power-action} (default: @code{'hybrid-sleep})" msgstr "@code{critical-power-action} (Vorgabe: @code{'hybrid-sleep})" #. type: table -#: doc/guix.texi:14929 +#: doc/guix.texi:14926 msgid "The action taken when @code{percentage-action} or @code{time-action} is reached (depending on the configuration of @code{use-percentage-for-policy?})." -msgstr "" +msgstr "Welche Maßnahme eingeleitet wird, wenn die @code{percentage-action} oder @code{time-action} erreicht wurde (je nachdem, wie @code{use-percentage-for-policy?} eingestellt wurde)." #. type: table -#: doc/guix.texi:14931 +#: doc/guix.texi:14928 msgid "Possible values are:" -msgstr "" +msgstr "Mögliche Werte sind:" #. type: code{#1} -#: doc/guix.texi:14935 +#: doc/guix.texi:14932 msgid "'power-off" -msgstr "" +msgstr "'power-off" #. type: code{#1} -#: doc/guix.texi:14938 +#: doc/guix.texi:14935 msgid "'hibernate" -msgstr "" +msgstr "'hibernate" #. type: itemize -#: doc/guix.texi:14941 +#: doc/guix.texi:14938 msgid "@code{'hybrid-sleep}." -msgstr "" +msgstr "@code{'hybrid-sleep}." #. type: deffn -#: doc/guix.texi:14946 +#: doc/guix.texi:14943 #, no-wrap msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]" -msgstr "" +msgstr "{Scheme-Prozedur} udisks-service [#:udisks @var{udisks}]" #. type: deffn -#: doc/guix.texi:14951 +#: doc/guix.texi:14948 msgid "Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks. Programs that talk to UDisks include the @command{udisksctl} command, part of UDisks, and GNOME Disks." -msgstr "" +msgstr "Liefert einen Dienst für @uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, einen Daemon zur @dfn{Datenträgerverwaltung}, der Benutzeroberflächen mit Benachrichtigungen und Möglichkeiten zum Einbinden und Aushängen von Datenträgern versorgt. Zu den Programmen, die mit UDisks kommunizieren, gehört der Befehl @command{udisksctl}, der Teil von UDisks ist, sowie GNOME Disks." #. type: deffn -#: doc/guix.texi:14953 +#: doc/guix.texi:14950 #, no-wrap msgid "{Scheme Procedure} colord-service [#:colord @var{colord}]" -msgstr "" +msgstr "{Scheme-Prozedur} colord-service [#:colord @var{colord}]" #. type: deffn -#: doc/guix.texi:14959 +#: doc/guix.texi:14956 msgid "Return a service that runs @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners. It is notably used by the GNOME Color Manager graphical tool. See @uref{https://www.freedesktop.org/software/colord/, the colord web site} for more information." -msgstr "" +msgstr "Liefert einen Dienst, der @command{colord} ausführt. Dabei handelt es sich um einen Systemdienst mit einer D-Bus-Schnittstelle, um die Farbprofile von Ein- und Ausgabegeräten wie Bildschirmen oder Scannern zu verwalten. Insbesondere wird colord vom grafischen GNOME-Farbverwaltungswerkzeug benutzt. Siehe @uref{https://www.freedesktop.org/software/colord/, die Webpräsenz von colord} für weitere Informationen." #. type: deffn -#: doc/guix.texi:14961 +#: doc/guix.texi:14958 #, no-wrap msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]" -msgstr "" +msgstr "{Scheme-Prozedur} geoclue-application Name [#:allowed? #t] [#:system? #f] [#:users '()]" #. type: deffn -#: doc/guix.texi:14970 +#: doc/guix.texi:14967 msgid "Return a configuration allowing an application to access GeoClue location data. @var{name} is the Desktop ID of the application, without the @code{.desktop} part. If @var{allowed?} is true, the application will have access to location information by default. The boolean @var{system?} value indicates whether an application is a system component or not. Finally @var{users} is a list of UIDs of all users for which this application is allowed location info access. An empty users list means that all users are allowed." -msgstr "" +msgstr "Liefert eine Konfiguration, mit der eine Anwendung auf Ortungsdaten von GeoClue zugreifen kann. Als @var{Name} wird die Desktop-ID der Anwendung angegeben, ohne die Pfadkomponente mit @code{.desktop}-Endung. Wenn @var{allowed?} wahr ist, hat die Anwendung standardmäßig Zugriff auf Ortungsinformationen. Der boolesche Wert @var{system?} zeigt an, ob die Anwendung eine Systemkomponente ist oder nicht. Zum Schluss wird für @var{users} eine Liste von Benutzeridentifikatoren (UIDs) aller Benutzerkonten angegeben, für die diese Anwendung Zugriff auf Ortungsinformationen gewährt bekommt. Eine leere Benutzerliste bedeutet, dass dies für alle Benutzer gewährt wird." #. type: defvr -#: doc/guix.texi:14972 +#: doc/guix.texi:14969 #, no-wrap msgid "{Scheme Variable} %standard-geoclue-applications" -msgstr "" +msgstr "{Scheme-Variable} %standard-geoclue-applications" #. type: defvr -#: doc/guix.texi:14979 +#: doc/guix.texi:14976 msgid "The standard list of well-known GeoClue application configurations, granting authority to the GNOME date-and-time utility to ask for the current location in order to set the time zone, and allowing the IceCat and Epiphany web browsers to request location information. IceCat and Epiphany both query the user before allowing a web page to know the user's location." -msgstr "" +msgstr "Die Standardliste wohlbekannter GeoClue-Anwendungskonfigurationen, mit der das GNOME-Werkzeug für Datum und Uhrzeit die Berechtigung bekommt, den aktuellen Ort abzufragen, um die Zeitzone festzulegen, und die Webbrowser IceCat und Epiphany Ortsinformationen abfragen dürfen. IceCat und Epiphany fragen beide zuerst beim Benutzer nach, bevor sie einer Webseite gestatten, den Ort des Benutzer abzufragen." #. type: deffn -#: doc/guix.texi:14981 +#: doc/guix.texi:14978 #, no-wrap msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @" -msgstr "" +msgstr "{Scheme-Prozedur} geoclue-service [#:colord @var{colord}] @" #. type: deffn -#: doc/guix.texi:14994 +#: doc/guix.texi:14991 msgid "[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-applications] Return a service that runs the GeoClue location service. This service provides a D-Bus interface to allow applications to request access to a user's physical location, and optionally to add information to online location databases. See @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, the GeoClue web site} for more information." -msgstr "" +msgstr "[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-applications] Liefert einen Dienst, der den Ortungsdienst GeoClue ausführt. Dieser Dienst bietet eine D-Bus-Schnittstelle an, mit der Anwendungen Zugriff auf den physischen Ort eines Benutzers anfragen können, und optional Informationen in Online-Ortsdatenbanken eintragen können. Siehe @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, die Webpräsenz von GeoClue} für weitere Informationen." #. type: deffn -#: doc/guix.texi:14996 +#: doc/guix.texi:14993 #, no-wrap msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @" -msgstr "" +msgstr "{Scheme-Prozedur} bluetooth-service [#:bluez @var{bluez}] @" #. type: deffn -#: doc/guix.texi:15003 +#: doc/guix.texi:15000 msgid "[@w{#:auto-enable? #f}] Return a service that runs the @command{bluetoothd} daemon, which manages all the Bluetooth devices and provides a number of D-Bus interfaces. When AUTO-ENABLE? is true, the bluetooth controller is powered automatically at boot, which can be useful when using a bluetooth keyboard or mouse." -msgstr "" +msgstr "[@w{#:auto-enable? #f}] Liefert einen Dienst, der den @command{bluetoothd}-Daemon ausführt, welcher alle Bluetooth-Geräte verwaltet, und eine Reihe von D-Bus-Schnittstellen zur Verfügung stellt. Wenn AUTO-ENABLE? wahr ist, wird die Bluetooth-Steuerung automatisch beim Hochfahren gestartet, was sich als nützlich erweisen kann, wenn man eine Bluetooth-Tastatur oder -Maus benutzt." #. type: deffn -#: doc/guix.texi:15005 +#: doc/guix.texi:15002 msgid "Users need to be in the @code{lp} group to access the D-Bus service." -msgstr "" +msgstr "Benutzer müssen zur @code{lp}-Benutzergruppe gehören, damit sie Zugriff auf den D-Bus-Dienst bekommen." #. type: cindex -#: doc/guix.texi:15010 +#: doc/guix.texi:15007 #, no-wrap msgid "sound support" -msgstr "" +msgstr "Sound-Unterstützung" #. type: cindex -#: doc/guix.texi:15011 +#: doc/guix.texi:15008 #, no-wrap msgid "ALSA" -msgstr "" +msgstr "ALSA" #. type: cindex -#: doc/guix.texi:15012 +#: doc/guix.texi:15009 #, no-wrap msgid "PulseAudio, sound support" -msgstr "" +msgstr "PulseAudio, Sound-Unterstützung" #. type: Plain text -#: doc/guix.texi:15017 +#: doc/guix.texi:15014 msgid "The @code{(gnu services sound)} module provides a service to configure the Advanced Linux Sound Architecture (ALSA) system, which makes PulseAudio the preferred ALSA output driver." -msgstr "" +msgstr "Das Modul @code{(gnu services sound)} stellt einen Dienst zur Verfügung, um das Advanced-Linux-Sound-Architecture-System (ALSA) zu konfigurieren, so dass PulseAudio als bevorzugter ALSA-Ausgabetreiber benutzt wird." #. type: deffn -#: doc/guix.texi:15018 +#: doc/guix.texi:15015 #, no-wrap msgid "{Scheme Variable} alsa-service-type" -msgstr "" +msgstr "{Scheme-Variable} alsa-service-type" #. type: deffn -#: doc/guix.texi:15023 +#: doc/guix.texi:15020 msgid "This is the type for the @uref{https://alsa-project.org/, Advanced Linux Sound Architecture} (ALSA) system, which generates the @file{/etc/asound.conf} configuration file. The value for this type is a @command{alsa-configuration} record as in this example:" -msgstr "" +msgstr "Dies ist der Typ des Dienstes für das als @uref{https://alsa-project.org/, Advanced Linux Sound Architecture (ALSA)} bekannte System, das die Konfigurationsdatei @file{/etc/asound.conf} erzeugt. Der Wert für diesen Diensttyp ist ein @command{alsa-configuration}-Verbundsobjekt wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:15026 +#: doc/guix.texi:15023 #, no-wrap msgid "(service alsa-service-type)\n" -msgstr "" +msgstr "(service alsa-service-type)\n" #. type: deffn -#: doc/guix.texi:15029 +#: doc/guix.texi:15026 msgid "See below for details about @code{alsa-configuration}." -msgstr "" +msgstr "Siehe die folgenden Details zur @code{alsa-configuration}." #. type: deftp -#: doc/guix.texi:15031 +#: doc/guix.texi:15028 #, no-wrap msgid "{Data Type} alsa-configuration" msgstr "{Datentyp} alsa-configuration" #. type: deftp -#: doc/guix.texi:15033 +#: doc/guix.texi:15030 msgid "Data type representing the configuration for @code{alsa-service}." msgstr "Repräsentiert die Konfiguration für den Dienst @code{alsa-service}." #. type: item -#: doc/guix.texi:15035 +#: doc/guix.texi:15032 #, no-wrap msgid "@code{alsa-plugins} (default: @var{alsa-plugins})" msgstr "@code{alsa-plugins} (Vorgabe: @var{alsa-plugins})" #. type: table -#: doc/guix.texi:15037 +#: doc/guix.texi:15034 msgid "@code{alsa-plugins} package to use." msgstr "@code{alsa-plugins}-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:15038 +#: doc/guix.texi:15035 #, no-wrap msgid "@code{pulseaudio?} (default: @var{#t})" msgstr "@code{pulseaudio?} (Vorgabe: @var{#t})" #. type: table -#: doc/guix.texi:15041 +#: doc/guix.texi:15038 msgid "Whether ALSA applications should transparently be made to use the @uref{http://www.pulseaudio.org/, PulseAudio} sound server." -msgstr "" +msgstr "Ob ALSA-Anwendungen transparent den @uref{http://www.pulseaudio.org/, PulseAudio-Audioserver} benutzen sollen." #. type: table -#: doc/guix.texi:15045 +#: doc/guix.texi:15042 msgid "Using PulseAudio allows you to run several sound-producing applications at the same time and to individual control them @i{via} @command{pavucontrol}, among other things." -msgstr "" +msgstr "Wenn PulseAudio benutzt wird, können Sie gleichzeitig mehrere Anwendungen mit Tonausgabe ausführen und sie unter anderem mit @command{pavucontrol} einzeln einstellen." #. type: item -#: doc/guix.texi:15046 +#: doc/guix.texi:15043 #, no-wrap msgid "@code{extra-options} (default: @var{\"\"})" msgstr "@code{extra-options} (Vorgabe: @var{\"\"})" #. type: table -#: doc/guix.texi:15048 +#: doc/guix.texi:15045 msgid "String to append to the @file{/etc/asound.conf} file." -msgstr "" +msgstr "Die Zeichenkette, die an die Datei @file{/etc/asound.conf} angehängt werden soll." #. type: Plain text -#: doc/guix.texi:15054 +#: doc/guix.texi:15051 msgid "Individual users who want to override the system configuration of ALSA can do it with the @file{~/.asoundrc} file:" -msgstr "" +msgstr "Wenn einzelne Benutzer von ALSAs Systemkonfiguration abweichende Einstellungen vornehmen möchten, können Sie das mit der Konfigurationsdatei @file{~/.asoundrc} tun:" #. type: example -#: doc/guix.texi:15060 +#: doc/guix.texi:15057 #, no-wrap msgid "" "# In guix, we have to specify the absolute path for plugins.\n" @@ -28071,9 +28084,14 @@ msgid "" "@}\n" "\n" msgstr "" +"# In Guix müssen wir den absoluten Pfad von Plugins angeben.\n" +"pcm_type.jack @{\n" +" lib \"/home/alice/.guix-profile/lib/alsa-lib/libasound_module_pcm_jack.so\"\n" +"@}\n" +"\n" #. type: example -#: doc/guix.texi:15069 +#: doc/guix.texi:15066 #, no-wrap msgid "" "# Routing ALSA to jack:\n" @@ -28086,9 +28104,18 @@ msgid "" " @}\n" "\n" msgstr "" +"# ALSA an jack weiterleiten:\n" +"# .\n" +"pcm.rawjack @{\n" +" type jack\n" +" playback_ports @{\n" +" 0 system:playback_1\n" +" 1 system:playback_2\n" +" @}\n" +"\n" #. type: example -#: doc/guix.texi:15075 +#: doc/guix.texi:15072 #, no-wrap msgid "" " capture_ports @{\n" @@ -28098,9 +28125,15 @@ msgid "" "@}\n" "\n" msgstr "" +" capture_ports @{\n" +" 0 system:capture_1\n" +" 1 system:capture_2\n" +" @}\n" +"@}\n" +"\n" #. type: example -#: doc/guix.texi:15082 +#: doc/guix.texi:15079 #, no-wrap msgid "" "pcm.!default @{\n" @@ -28110,58 +28143,64 @@ msgid "" " @}\n" "@}\n" msgstr "" +"pcm.!default @{\n" +" type plug\n" +" slave @{\n" +" pcm \"rawjack\"\n" +" @}\n" +"@}\n" #. type: Plain text -#: doc/guix.texi:15086 +#: doc/guix.texi:15083 msgid "See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the details." -msgstr "" +msgstr "Siehe @uref{https://www.alsa-project.org/main/index.php/Asoundrc} für die Details." #. type: cindex -#: doc/guix.texi:15092 +#: doc/guix.texi:15089 #, no-wrap msgid "SQL" -msgstr "" +msgstr "SQL" #. type: Plain text -#: doc/guix.texi:15094 +#: doc/guix.texi:15091 msgid "The @code{(gnu services databases)} module provides the following services." -msgstr "" +msgstr "Das Modul @code{(gnu services databases)} stellt die folgenden Dienste zur Verfügung." #. type: deffn -#: doc/guix.texi:15095 +#: doc/guix.texi:15092 #, no-wrap msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @" -msgstr "" +msgstr "{Scheme-Prozedur} postgresql-service [#:postgresql postgresql] @" #. type: deffn -#: doc/guix.texi:15100 +#: doc/guix.texi:15097 msgid "[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port 5432] [#:locale ``en_US.utf8''] [#:extension-packages '()] Return a service that runs @var{postgresql}, the PostgreSQL database server." -msgstr "" +msgstr "[#:config-file] [#:data-directory \"/var/lib/postgresql/data\"] @ [#:port 5432] [#:locale \"en_US.utf8\"] [#:extension-packages '()] Liefert einen Dienst, der @var{postgresql}, den PostgreSQL-Datenbankserver, ausführt." #. type: deffn -#: doc/guix.texi:15104 +#: doc/guix.texi:15101 msgid "The PostgreSQL daemon loads its runtime configuration from @var{config-file}, creates a database cluster with @var{locale} as the default locale, stored in @var{data-directory}. It then listens on @var{port}." -msgstr "" +msgstr "Der PostgreSQL-Daemon lädt seine Laufzeitkonfiguration aus der bei @var{config-file} angegebenen Konfigurationsdatei, erzeugt einen Datenbankverbund mit der angegebenen @var{locale} als voreingestellte Locale, gespeichert im bei @var{data-directory} angegebenen Verzeichnis. Er lauscht dann auf dem @var{port}." #. type: cindex -#: doc/guix.texi:15105 +#: doc/guix.texi:15102 #, no-wrap msgid "postgresql extension-packages" -msgstr "" +msgstr "PostgreSQL-Erweiterungspakete" #. type: deffn -#: doc/guix.texi:15110 +#: doc/guix.texi:15107 msgid "Additional extensions are loaded from packages listed in @var{extension-packages}. Extensions are available at runtime. For instance, to create a geographic database using the @code{postgis} extension, a user can configure the postgresql-service as in this example:" -msgstr "" +msgstr "Zusätzliche Erweiterungen werden aus den unter @var{extension-packages} aufgeführten Paketen geladen. Erweiterungen sind zur Laufzeit verfügbar. Zum Beispiel kann ein Nutzer den postgresql-service-Dienst wie in diesem Beispiel konfigurieren, um eine geografische Datenbank mithilfe der @code{postgis}-Erweiterung zu erzeugen:" #. type: cindex -#: doc/guix.texi:15111 +#: doc/guix.texi:15108 #, no-wrap msgid "postgis" -msgstr "" +msgstr "postgis" #. type: example -#: doc/guix.texi:15114 +#: doc/guix.texi:15111 #, no-wrap msgid "" "(use-package-modules databases geo)\n" @@ -28171,7 +28210,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:15124 +#: doc/guix.texi:15121 #, no-wrap msgid "" "(operating-system\n" @@ -28195,12 +28234,12 @@ msgstr "" " %base-services)))\n" #. type: deffn -#: doc/guix.texi:15128 +#: doc/guix.texi:15125 msgid "Then the extension becomes visible and you can initialise an empty geographic database in this way:" msgstr "Dann wird die Erweiterung sichtbar und Sie können eine leere geografische Datenbak auf diese Weise initialisieren:" #. type: example -#: doc/guix.texi:15135 +#: doc/guix.texi:15132 #, no-wrap msgid "" "psql -U postgres\n" @@ -28216,2910 +28255,2925 @@ msgstr "" "> create extension postgis_topology;\n" #. type: deffn -#: doc/guix.texi:15140 +#: doc/guix.texi:15137 msgid "There is no need to add this field for contrib extensions such as hstore or dblink as they are already loadable by postgresql. This field is only required to add extensions provided by other packages." -msgstr "" +msgstr "Es ist nicht notwendig, dieses Feld für contrib-Erweiterungen wie hstore oder dblink hinzuzufügen, weil sie bereits durch postgresql geladen werden können. Dieses Feld wird nur benötigt, um Erweiterungen hinzuzufügen, die von anderen Paketen zur Verfügung gestellt werden." #. type: deffn -#: doc/guix.texi:15142 +#: doc/guix.texi:15139 #, no-wrap msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]" -msgstr "" +msgstr "{Scheme-Prozedur} mysql-service [#:config (mysql-configuration)]" #. type: deffn -#: doc/guix.texi:15145 +#: doc/guix.texi:15142 msgid "Return a service that runs @command{mysqld}, the MySQL or MariaDB database server." -msgstr "" +msgstr "Liefert einen Dienst, der @command{mysqld}, den Datenbankserver von MySQL oder MariaDB, ausführt." #. type: deffn -#: doc/guix.texi:15148 +#: doc/guix.texi:15145 msgid "The optional @var{config} argument specifies the configuration for @command{mysqld}, which should be a @code{} object." -msgstr "" +msgstr "Als optionales @var{config}-Argument wird die Konfiguration für @command{mysqld} angegeben, die ein @code{}-Objekt sein sollte." #. type: deftp -#: doc/guix.texi:15150 +#: doc/guix.texi:15147 #, no-wrap msgid "{Data Type} mysql-configuration" -msgstr "" +msgstr "{Datentyp} mysql-configuration" #. type: deftp -#: doc/guix.texi:15152 +#: doc/guix.texi:15149 msgid "Data type representing the configuration of @var{mysql-service}." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration des @var{mysql-service} repräsentiert." #. type: item -#: doc/guix.texi:15154 +#: doc/guix.texi:15151 #, no-wrap msgid "@code{mysql} (default: @var{mariadb})" -msgstr "" +msgstr "@code{mysql} (Vorgabe: @var{mariadb})" #. type: table -#: doc/guix.texi:15157 +#: doc/guix.texi:15154 msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}." -msgstr "" +msgstr "Das Paketobjekt des MySQL-Datenbankservers; es kann entweder @var{mariadb} oder @var{mysql} sein." #. type: table -#: doc/guix.texi:15160 +#: doc/guix.texi:15157 msgid "For MySQL, a temporary root password will be displayed at activation time. For MariaDB, the root password is empty." -msgstr "" +msgstr "Für MySQL wird bei der Aktivierung des Dienstes ein temporäres Administratorpasswort („root“-Passwort) angezeigt. Für MariaDB ist das „root“-Passwort leer." #. type: item -#: doc/guix.texi:15161 +#: doc/guix.texi:15158 #, no-wrap msgid "@code{port} (default: @code{3306})" -msgstr "" +msgstr "@code{port} (Vorgabe: @code{3306})" #. type: table -#: doc/guix.texi:15163 +#: doc/guix.texi:15160 msgid "TCP port on which the database server listens for incoming connections." -msgstr "" +msgstr "Der TCP-Port, auf dem der Datenbankserver auf eingehende Verbindungen lauscht." #. type: defvr -#: doc/guix.texi:15166 +#: doc/guix.texi:15163 #, no-wrap msgid "{Scheme Variable} memcached-service-type" -msgstr "" +msgstr "{Scheme-Variable} memcached-service-type" #. type: defvr -#: doc/guix.texi:15170 +#: doc/guix.texi:15167 msgid "This is the service type for the @uref{https://memcached.org/, Memcached} service, which provides a distributed in memory cache. The value for the service type is a @code{memcached-configuration} object." -msgstr "" +msgstr "Dies ist der Diensttyp für den @uref{https://memcached.org/, Memcached-Dienst}, der einen verteilten Zwischenspeicher im Arbeitsspeicher (einen „In-Memory-Cache“) zur Verfügung stellt. Der Wert dieses Dienstes ist ein @code{memcached-configuration}-Objekt." #. type: example -#: doc/guix.texi:15174 +#: doc/guix.texi:15171 #, no-wrap msgid "(service memcached-service-type)\n" -msgstr "" +msgstr "(service memcached-service-type)\n" #. type: deftp -#: doc/guix.texi:15176 +#: doc/guix.texi:15173 #, no-wrap msgid "{Data Type} memcached-configuration" -msgstr "" +msgstr "{Datentyp} memcached-configuration" #. type: deftp -#: doc/guix.texi:15178 +#: doc/guix.texi:15175 msgid "Data type representing the configuration of memcached." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration von memcached repräsentiert." #. type: item -#: doc/guix.texi:15180 +#: doc/guix.texi:15177 #, no-wrap msgid "@code{memcached} (default: @code{memcached})" -msgstr "" +msgstr "@code{memcached} (Vorgabe: @code{memcached})" #. type: table -#: doc/guix.texi:15182 +#: doc/guix.texi:15179 msgid "The Memcached package to use." -msgstr "" +msgstr "Das Memcached-Paket, das benutzt werden soll." #. type: item -#: doc/guix.texi:15183 +#: doc/guix.texi:15180 #, no-wrap msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})" -msgstr "" +msgstr "@code{interfaces} (Vorgabe: @code{'(\"0.0.0.0\")})" #. type: table -#: doc/guix.texi:15185 +#: doc/guix.texi:15182 msgid "Network interfaces on which to listen." -msgstr "" +msgstr "Auf welchen Netzwerkschnittstellen gelauscht werden soll." #. type: item -#: doc/guix.texi:15186 +#: doc/guix.texi:15183 #, no-wrap msgid "@code{tcp-port} (default: @code{11211})" -msgstr "" +msgstr "@code{tcp-port} (Vorgabe: @code{11211})" #. type: table -#: doc/guix.texi:15188 +#: doc/guix.texi:15185 msgid "Port on which to accept connections on," -msgstr "" +msgstr "Der Port, auf dem Verbindungen akzeptiert werden." #. type: item -#: doc/guix.texi:15189 +#: doc/guix.texi:15186 #, no-wrap msgid "@code{udp-port} (default: @code{11211})" -msgstr "" +msgstr "@code{udp-port} (Vorgabe: @code{11211})" #. type: table -#: doc/guix.texi:15192 +#: doc/guix.texi:15189 msgid "Port on which to accept UDP connections on, a value of 0 will disable listening on a UDP socket." -msgstr "" +msgstr "Der Port, auf dem UDP-Verbindungen akzeptiert werden. Ist der Wert 0, wird @emph{nicht} auf einem UDP-Socket gelauscht." #. type: item -#: doc/guix.texi:15193 +#: doc/guix.texi:15190 #, no-wrap msgid "@code{additional-options} (default: @code{'()})" -msgstr "" +msgstr "@code{additional-options} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:15195 +#: doc/guix.texi:15192 msgid "Additional command line options to pass to @code{memcached}." -msgstr "" +msgstr "Zusätzliche Befehlszeilenoptionen, die an @code{memcached} übergeben werden." #. type: defvr -#: doc/guix.texi:15198 +#: doc/guix.texi:15195 #, no-wrap msgid "{Scheme Variable} mongodb-service-type" -msgstr "" +msgstr "{Scheme-Variable} mongodb-service-type" #. type: defvr -#: doc/guix.texi:15201 +#: doc/guix.texi:15198 msgid "This is the service type for @uref{https://www.mongodb.com/, MongoDB}. The value for the service type is a @code{mongodb-configuration} object." -msgstr "" +msgstr "Dies ist der Diensttyp für @uref{https://www.mongodb.com/, MongoDB}. Der Wert dieses Diensttyps ist ein @code{mongodb-configuration}-Objekt." #. type: example -#: doc/guix.texi:15205 +#: doc/guix.texi:15202 #, no-wrap msgid "(service mongodb-service-type)\n" -msgstr "" +msgstr "(service mongodb-service-type)\n" #. type: deftp -#: doc/guix.texi:15207 +#: doc/guix.texi:15204 #, no-wrap msgid "{Data Type} mongodb-configuration" -msgstr "" +msgstr "{Datentyp} mongodb-configuration" #. type: deftp -#: doc/guix.texi:15209 +#: doc/guix.texi:15206 msgid "Data type representing the configuration of mongodb." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration von mongodb repräsentiert." #. type: item -#: doc/guix.texi:15211 +#: doc/guix.texi:15208 #, no-wrap msgid "@code{mongodb} (default: @code{mongodb})" -msgstr "" +msgstr "@code{mongodb} (Vorgabe: @code{mongodb})" #. type: table -#: doc/guix.texi:15213 +#: doc/guix.texi:15210 msgid "The MongoDB package to use." -msgstr "" +msgstr "Das zu benutzende MongoDB-Paket." #. type: item -#: doc/guix.texi:15214 +#: doc/guix.texi:15211 #, no-wrap msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})" -msgstr "" +msgstr "@code{config-file} (Vorgabe: @code{%default-mongodb-configuration-file})" #. type: table -#: doc/guix.texi:15216 +#: doc/guix.texi:15213 msgid "The configuration file for MongoDB." -msgstr "" +msgstr "Die Konfigurationsdatei für MongoDB." #. type: item -#: doc/guix.texi:15217 +#: doc/guix.texi:15214 #, no-wrap msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})" -msgstr "" +msgstr "@code{data-directory} (Vorgabe: @code{\"/var/lib/mongodb\"})" #. type: table -#: doc/guix.texi:15221 +#: doc/guix.texi:15218 msgid "This value is used to create the directory, so that it exists and is owned by the mongodb user. It should match the data-directory which MongoDB is configured to use through the configuration file." -msgstr "" +msgstr "Dieser Wert wird benutzt, um das Verzeichnis so zu erstellen, dass es existiert und zum Benutzer mongodb gehört. Es sollte mit dem Verzeichnis übereinstimmen, das in der Konfigurationsdatei von MongoDB als „data-directory“ angegeben wird." #. type: defvr -#: doc/guix.texi:15224 +#: doc/guix.texi:15221 #, no-wrap msgid "{Scheme Variable} redis-service-type" -msgstr "" +msgstr "{Scheme-Variable} redis-service-type" #. type: defvr -#: doc/guix.texi:15227 +#: doc/guix.texi:15224 msgid "This is the service type for the @uref{https://redis.io/, Redis} key/value store, whose value is a @code{redis-configuration} object." -msgstr "" +msgstr "Dies ist der Diensttyp für den Schlüssel-/Wert-Speicher @uref{https://redis.io/, Redis}, dessen Wert ein @code{redis-configuration}-Objekt ist." #. type: deftp -#: doc/guix.texi:15229 +#: doc/guix.texi:15226 #, no-wrap msgid "{Data Type} redis-configuration" -msgstr "" +msgstr "{Datentyp} redis-configuration" #. type: deftp -#: doc/guix.texi:15231 +#: doc/guix.texi:15228 msgid "Data type representing the configuration of redis." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration von redis repräsentiert." #. type: item -#: doc/guix.texi:15233 +#: doc/guix.texi:15230 #, no-wrap msgid "@code{redis} (default: @code{redis})" -msgstr "" +msgstr "@code{redis} (Vorgabe: @code{redis})" #. type: table -#: doc/guix.texi:15235 +#: doc/guix.texi:15232 msgid "The Redis package to use." -msgstr "" +msgstr "Das zu benutzende Redis-Paket." #. type: item -#: doc/guix.texi:15236 +#: doc/guix.texi:15233 #, no-wrap msgid "@code{bind} (default: @code{\"127.0.0.1\"})" -msgstr "" +msgstr "@code{bind} (Vorgabe: @code{\"127.0.0.1\"})" #. type: table -#: doc/guix.texi:15238 +#: doc/guix.texi:15235 msgid "Network interface on which to listen." -msgstr "" +msgstr "Die Netzwerkschnittstelle, auf der gelauscht wird." #. type: item -#: doc/guix.texi:15239 +#: doc/guix.texi:15236 #, no-wrap msgid "@code{port} (default: @code{6379})" -msgstr "" +msgstr "@code{port} (Vorgabe: @code{6379})" #. type: table -#: doc/guix.texi:15242 +#: doc/guix.texi:15239 msgid "Port on which to accept connections on, a value of 0 will disable listening on a TCP socket." -msgstr "" +msgstr "Der Port, auf dem Verbindungen akzeptiert werden. Ist der Wert 0, wird das Lauschen auf einem TCP-Socket deaktiviert." #. type: item -#: doc/guix.texi:15243 +#: doc/guix.texi:15240 #, no-wrap msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})" -msgstr "" +msgstr "@code{working-directory} (Vorgabe: @code{\"/var/lib/redis\"})" #. type: table -#: doc/guix.texi:15245 +#: doc/guix.texi:15242 msgid "Directory in which to store the database and related files." -msgstr "" +msgstr "Das Verzeichnis, in dem die Datenbank und damit zu tun habende Dateien gespeichert werden." #. type: cindex -#: doc/guix.texi:15251 +#: doc/guix.texi:15248 #, no-wrap msgid "mail" -msgstr "" +msgstr "Mail" #. type: code{#1} -#: doc/guix.texi:15252 doc/guix.texi:19452 +#: doc/guix.texi:15249 doc/guix.texi:19449 #, no-wrap msgid "email" -msgstr "" +msgstr "E-Mail" #. type: Plain text -#: doc/guix.texi:15257 +#: doc/guix.texi:15254 msgid "The @code{(gnu services mail)} module provides Guix service definitions for email services: IMAP, POP3, and LMTP servers, as well as mail transport agents (MTAs). Lots of acronyms! These services are detailed in the subsections below." -msgstr "" +msgstr "Das Modul @code{(gnu services mail)} stellt Guix-Dienstdefinitionen für E-Mail-Dienste zur Verfügung: IMAP-, POP3- und LMTP-Server sowie Mail Transport Agents (MTAs). Jede Menge Akronyme! Auf diese Dienste wird in den folgenden Unterabschnitten im Detail eingegangen." #. type: subsubheading -#: doc/guix.texi:15258 +#: doc/guix.texi:15255 #, no-wrap msgid "Dovecot Service" -msgstr "" +msgstr "Dovecot-Dienst" #. type: deffn -#: doc/guix.texi:15260 +#: doc/guix.texi:15257 #, no-wrap msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]" -msgstr "" +msgstr "{Scheme-Prozedur} dovecot-service [#:config (dovecot-configuration)]" #. type: deffn -#: doc/guix.texi:15262 +#: doc/guix.texi:15259 msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server." -msgstr "" +msgstr "Liefert einen Dienst, der den IMAP-/POP3-/LMTP-Mailserver Dovecot ausführt." #. type: Plain text -#: doc/guix.texi:15272 +#: doc/guix.texi:15269 msgid "By default, Dovecot does not need much configuration; the default configuration object created by @code{(dovecot-configuration)} will suffice if your mail is delivered to @code{~/Maildir}. A self-signed certificate will be generated for TLS-protected connections, though Dovecot will also listen on cleartext ports by default. There are a number of options, though, which mail administrators might need to change, and as is the case with other services, Guix allows the system administrator to specify these parameters via a uniform Scheme interface." -msgstr "" +msgstr "Normalerweise muss für Dovecot nicht viel eingestellt werden; das vorgegebene Konfigurationsobjekt, das mit @code{(dovecot-configuration)} erzeugt wird, wird genügen, wenn Ihre Mails in @code{~/Maildir} gespeichert werden. Ein selbstsigniertes Zertifikat wird für durch TLS geschützte Verbindungen generiert, aber Dovecot lauscht nach Vorgabe auch auf unverschlüsselten Ports. Es gibt jedoch eine Reihe von Optionen, die Mail-Administratoren unter Umständen ändern müssen, was Guix — wie auch bei anderen Diensten — mit einer einheitlichen Scheme-Schnittstelle möglich macht." #. type: Plain text -#: doc/guix.texi:15275 +#: doc/guix.texi:15272 msgid "For example, to specify that mail is located at @code{maildir~/.mail}, one would instantiate the Dovecot service like this:" -msgstr "" +msgstr "Um zum Beispiel anzugeben, dass sich Mails in @code{maildir~/.mail} befinden, würde man den Dovecot-Dienst wie folgt instanziieren:" #. type: example -#: doc/guix.texi:15280 +#: doc/guix.texi:15277 #, no-wrap msgid "" "(dovecot-service #:config\n" " (dovecot-configuration\n" " (mail-location \"maildir:~/.mail\")))\n" msgstr "" +"(dovecot-service #:config\n" +" (dovecot-configuration\n" +" (mail-location \"maildir:~/.mail\")))\n" #. type: Plain text -#: doc/guix.texi:15288 +#: doc/guix.texi:15285 msgid "The available configuration parameters follow. Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings. There is also a way to specify the configuration as a string, if you have an old @code{dovecot.conf} file that you want to port over from some other system; see the end for more details." -msgstr "" +msgstr "Im Folgenden sehen Sie die verfügbaren Konfigurationsparameter. Jeder Parameterdefinition ist ihr Typ vorangestellt; zum Beispiel bedeutet @samp{Zeichenketten-Liste foo}, dass der Parameter @code{foo} als eine Liste von Zeichenketten angegeben werden sollte. Es ist auch möglich, die Konfiguration als Zeichenkette anzugeben, wenn Sie eine alte @code{dovecot.conf}-Datei haben, die Sie von einem anderen System übernehmen möchten; am Ende finden Sie mehr Details dazu." #. type: Plain text -#: doc/guix.texi:15298 +#: doc/guix.texi:15295 msgid "Available @code{dovecot-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{dovecot-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15299 +#: doc/guix.texi:15296 #, no-wrap msgid "{@code{dovecot-configuration} parameter} package dovecot" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „package“ dovecot" #. type: deftypevr -#: doc/guix.texi:15301 doc/guix.texi:16607 +#: doc/guix.texi:15298 doc/guix.texi:16604 msgid "The dovecot package." -msgstr "" +msgstr "Das Dovecot-Paket." #. type: deftypevr -#: doc/guix.texi:15303 +#: doc/guix.texi:15300 #, no-wrap msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Kommagetrennte-Zeichenketten-Liste listen" #. type: deftypevr -#: doc/guix.texi:15309 +#: doc/guix.texi:15306 msgid "A list of IPs or hosts where to listen for connections. @samp{*} listens on all IPv4 interfaces, @samp{::} listens on all IPv6 interfaces. If you want to specify non-default ports or anything more complex, customize the address and port fields of the @samp{inet-listener} of the specific services you are interested in." -msgstr "" +msgstr "Eine Liste der IPs oder der Rechnernamen („Hosts“), auf denen auf Verbindungen gelauscht wird. @samp{*} bedeutet, auf allen IPv4-Schnittstellen zu lauschen; @samp{::} lässt auf allen IPv6-Schnittstellen lauschen. Wenn Sie nicht der Vorgabe entsprechende Ports oder komplexere Einstellungen festlegen möchten, sollten Sie die Adress- und Portfelder des @samp{inet-listener} beim jeweiligen Dienst anpassen, für den Sie sich interessieren." #. type: deftypevr -#: doc/guix.texi:15311 +#: doc/guix.texi:15308 #, no-wrap msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „protocol-configuration“-Liste protocols" #. type: deftypevr -#: doc/guix.texi:15314 +#: doc/guix.texi:15311 msgid "List of protocols we want to serve. Available protocols include @samp{imap}, @samp{pop3}, and @samp{lmtp}." -msgstr "" +msgstr "Die Liste der Protokolle, die angeboten werden sollen. Zu den verfügbaren Protokollen gehören @samp{imap}, @samp{pop3} und @samp{lmtp}." #. type: deftypevr -#: doc/guix.texi:15316 +#: doc/guix.texi:15313 msgid "Available @code{protocol-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{protocol-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15317 +#: doc/guix.texi:15314 #, no-wrap msgid "{@code{protocol-configuration} parameter} string name" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:15319 +#: doc/guix.texi:15316 msgid "The name of the protocol." -msgstr "" +msgstr "Der Name des Protokolls." #. type: deftypevr -#: doc/guix.texi:15321 +#: doc/guix.texi:15318 #, no-wrap msgid "{@code{protocol-configuration} parameter} string auth-socket-path" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Zeichenkette auth-socket-path" #. type: deftypevr -#: doc/guix.texi:15325 +#: doc/guix.texi:15322 msgid "UNIX socket path to the master authentication server to find users. This is used by imap (for shared users) and lda. It defaults to @samp{\"/var/run/dovecot/auth-userdb\"}." -msgstr "" +msgstr "Der Pfad des UNIX-Sockets zum Hauptauthentifizierungsserver, um Benutzer zu finden. Er wird von imap (für geteilte Benutzer) und lda benutzt. Die Vorgabe ist @samp{\"/var/run/dovecot/auth-userdb\"}." #. type: deftypevr -#: doc/guix.texi:15327 +#: doc/guix.texi:15324 #, no-wrap msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mail-plugins" #. type: deftypevr -#: doc/guix.texi:15329 +#: doc/guix.texi:15326 msgid "Space separated list of plugins to load." -msgstr "" +msgstr "Leerzeichengetrennte Liste der zu ladenden Plugins." #. type: deftypevr -#: doc/guix.texi:15331 +#: doc/guix.texi:15328 #, no-wrap msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-max-userip-connections" #. type: deftypevr -#: doc/guix.texi:15335 +#: doc/guix.texi:15332 msgid "Maximum number of IMAP connections allowed for a user from each IP address. NOTE: The username is compared case-sensitively. Defaults to @samp{10}." -msgstr "" +msgstr "Die Maximalzahl der IMAP-Verbindungen, die jeder Nutzer von derselben IP-Adresse aus benutzen kann. @emph{Anmerkung}: Beim Vergleichen des Benutzernamens wird Groß- und Kleinschreibung unterschieden. Die Vorgabe ist @samp{10}." #. type: deftypevr -#: doc/guix.texi:15339 +#: doc/guix.texi:15336 #, no-wrap msgid "{@code{dovecot-configuration} parameter} service-configuration-list services" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „service-configuration“-Liste services" #. type: deftypevr -#: doc/guix.texi:15343 +#: doc/guix.texi:15340 msgid "List of services to enable. Available services include @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and @samp{lmtp}." -msgstr "" +msgstr "Die Liste der zu aktivierenden Dienste. Zu den verfügbaren Diensten gehören @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth} und @samp{lmtp}." #. type: deftypevr -#: doc/guix.texi:15345 +#: doc/guix.texi:15342 msgid "Available @code{service-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{service-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15346 +#: doc/guix.texi:15343 #, no-wrap msgid "{@code{service-configuration} parameter} string kind" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Zeichenkette kind" #. type: deftypevr -#: doc/guix.texi:15351 +#: doc/guix.texi:15348 msgid "The service kind. Valid values include @code{director}, @code{imap-login}, @code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, @code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning}, or anything else." -msgstr "" +msgstr "Die Dienstart (englisch „kind“). Zu den gültigen Werten gehören @code{director}, @code{imap-login}, @code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, @code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning} oder alles andere." #. type: deftypevr -#: doc/guix.texi:15353 +#: doc/guix.texi:15350 #, no-wrap msgid "{@code{service-configuration} parameter} listener-configuration-list listeners" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} „listener-configuration“-Liste listeners" #. type: deftypevr -#: doc/guix.texi:15358 +#: doc/guix.texi:15355 msgid "Listeners for the service. A listener is either a @code{unix-listener-configuration}, a @code{fifo-listener-configuration}, or an @code{inet-listener-configuration}. Defaults to @samp{()}." -msgstr "" +msgstr "„Listener“ für den Dienst, also Lauscher auf neue Verbindungen. Als Listener kann entweder eine @code{unix-listener-configuration}, eine @code{fifo-listener-configuration} oder eine @code{inet-listener-configuration} angegeben werden. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15360 +#: doc/guix.texi:15357 msgid "Available @code{unix-listener-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{unix-listener-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15361 +#: doc/guix.texi:15358 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string path" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette path" #. type: deftypevr -#: doc/guix.texi:15364 doc/guix.texi:15387 +#: doc/guix.texi:15361 doc/guix.texi:15384 msgid "Path to the file, relative to @code{base-dir} field. This is also used as the section name." -msgstr "" +msgstr "Der Pfad zur Datei, relativ zum Feld @code{base-dir}. Er wird auch als der Abschnittsname verwendet." #. type: deftypevr -#: doc/guix.texi:15366 +#: doc/guix.texi:15363 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string mode" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette mode" #. type: deftypevr -#: doc/guix.texi:15369 doc/guix.texi:15392 +#: doc/guix.texi:15366 doc/guix.texi:15389 msgid "The access mode for the socket. Defaults to @samp{\"0600\"}." -msgstr "" +msgstr "Der Zugriffsmodus des Sockets. Die Vorgabe ist @samp{\"0600\"}." #. type: deftypevr -#: doc/guix.texi:15371 +#: doc/guix.texi:15368 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string user" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:15374 doc/guix.texi:15397 +#: doc/guix.texi:15371 doc/guix.texi:15394 msgid "The user to own the socket. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der Benutzer, dem der Socket gehört. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15376 +#: doc/guix.texi:15373 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string group" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette group" #. type: deftypevr -#: doc/guix.texi:15379 doc/guix.texi:15402 +#: doc/guix.texi:15376 doc/guix.texi:15399 msgid "The group to own the socket. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Gruppe, der der Socket gehört. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15383 +#: doc/guix.texi:15380 msgid "Available @code{fifo-listener-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{fifo-listener-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15384 +#: doc/guix.texi:15381 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string path" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette path" #. type: deftypevr -#: doc/guix.texi:15389 +#: doc/guix.texi:15386 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string mode" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette mode" #. type: deftypevr -#: doc/guix.texi:15394 +#: doc/guix.texi:15391 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string user" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:15399 +#: doc/guix.texi:15396 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string group" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette group" #. type: deftypevr -#: doc/guix.texi:15406 +#: doc/guix.texi:15403 msgid "Available @code{inet-listener-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{inet-listener-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15407 +#: doc/guix.texi:15404 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} string protocol" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Zeichenkette protocol" #. type: deftypevr -#: doc/guix.texi:15409 +#: doc/guix.texi:15406 msgid "The protocol to listen for." -msgstr "" +msgstr "Das Protokoll, auf das gelauscht wird." #. type: deftypevr -#: doc/guix.texi:15411 +#: doc/guix.texi:15408 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} string address" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Zeichenkette address" #. type: deftypevr -#: doc/guix.texi:15414 +#: doc/guix.texi:15411 msgid "The address on which to listen, or empty for all addresses. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Adresse, auf der gelauscht wird. Bleibt das Feld leer, wird auf allen Adressen gelauscht. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15416 +#: doc/guix.texi:15413 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Nichtnegative-ganze-Zahl port" #. type: deftypevr -#: doc/guix.texi:15418 +#: doc/guix.texi:15415 msgid "The port on which to listen." -msgstr "" +msgstr "Der Port, auf dem gelauscht werden soll." #. type: deftypevr -#: doc/guix.texi:15420 +#: doc/guix.texi:15417 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} boolean ssl?" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Boolescher-Ausdruck ssl?" #. type: deftypevr -#: doc/guix.texi:15424 +#: doc/guix.texi:15421 msgid "Whether to use SSL for this service; @samp{yes}, @samp{no}, or @samp{required}. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob für diesen Dienst SSL benutzt werden kann: @samp{yes} für ja, @samp{no} für nein oder @samp{required} für „verpflichtend“. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15428 +#: doc/guix.texi:15425 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer client-limit" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl client-limit" #. type: deftypevr -#: doc/guix.texi:15433 +#: doc/guix.texi:15430 msgid "Maximum number of simultaneous client connections per process. Once this number of connections is received, the next incoming connection will prompt Dovecot to spawn another process. If set to 0, @code{default-client-limit} is used instead." -msgstr "" +msgstr "Die maximale Anzahl gleichzeitiger Verbindungen mit Clients pro Prozess. Sobald diese Anzahl von Verbindungen eingegangen ist, bewirkt das Eingehen der nächsten Verbindung, dass Dovecot einen weiteren Prozess startet. Ist sie auf 0 gesetzt, benutzt Dovecot stattdessen @code{default-client-limit}." #. type: deftypevr -#: doc/guix.texi:15438 +#: doc/guix.texi:15435 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer service-count" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl service-count" #. type: deftypevr -#: doc/guix.texi:15443 +#: doc/guix.texi:15440 msgid "Number of connections to handle before starting a new process. Typically the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0 is faster. . Defaults to @samp{1}." -msgstr "" +msgstr "Die Anzahl Verbindungen, die behandelt werden, bevor ein neuer Prozess gestartet wird. Typischerweise sind die einzig sinnvollen Werte 0 (unbeschränkt) oder 1. 1 ist sicherer, aber 0 ist schneller. Siehe . Die Vorgabe ist @samp{1}." #. type: deftypevr -#: doc/guix.texi:15446 +#: doc/guix.texi:15443 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer process-limit" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl process-limit" #. type: deftypevr -#: doc/guix.texi:15449 +#: doc/guix.texi:15446 msgid "Maximum number of processes that can exist for this service. If set to 0, @code{default-process-limit} is used instead." -msgstr "" +msgstr "Die maximale Anzahl von Prozessen, die für diesen Dienst existieren können. Wenn sie auf 0 gesetzt ist, benutzt Dovecot stattdessen @code{default-process-limit}." #. type: deftypevr -#: doc/guix.texi:15454 +#: doc/guix.texi:15451 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl process-min-avail" #. type: deftypevr -#: doc/guix.texi:15457 +#: doc/guix.texi:15454 msgid "Number of processes to always keep waiting for more connections. Defaults to @samp{0}." -msgstr "" +msgstr "Die Anzahl der Prozesse, mit denen immer auf neue Verbindungen gewartet wird. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:15459 +#: doc/guix.texi:15456 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl vsz-limit" #. type: deftypevr -#: doc/guix.texi:15463 +#: doc/guix.texi:15460 msgid "If you set @samp{service-count 0}, you probably need to grow this. Defaults to @samp{256000000}." -msgstr "" +msgstr "Wenn Sie @samp{service-count 0} festlegen, müssen Sie hierfür wahrscheinlich eine größere Zahl wählen. Die Vorgabe ist @samp{256000000}." #. type: deftypevr -#: doc/guix.texi:15467 +#: doc/guix.texi:15464 #, no-wrap msgid "{@code{dovecot-configuration} parameter} dict-configuration dict" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} dict-configuration dict" #. type: deftypevr -#: doc/guix.texi:15470 +#: doc/guix.texi:15467 msgid "Dict configuration, as created by the @code{dict-configuration} constructor." -msgstr "" +msgstr "Die Wörterbuchkonfiguration, wie sie der @code{dict-configuration}-Konstruktor erzeugt." #. type: deftypevr -#: doc/guix.texi:15472 +#: doc/guix.texi:15469 msgid "Available @code{dict-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{dict-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15473 +#: doc/guix.texi:15470 #, no-wrap msgid "{@code{dict-configuration} parameter} free-form-fields entries" -msgstr "" +msgstr "{@code{dict-configuration}-Parameter} Formlose-Felder entries" #. type: deftypevr -#: doc/guix.texi:15476 +#: doc/guix.texi:15473 msgid "A list of key-value pairs that this dict should hold. Defaults to @samp{()}." -msgstr "" +msgstr "Eine Liste von Schlüssel-Wert-Paaren, die in diesem Wörterbuch enthalten sein sollen. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15480 +#: doc/guix.texi:15477 #, no-wrap msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „passdb-configuration“-Liste passdbs" #. type: deftypevr -#: doc/guix.texi:15483 +#: doc/guix.texi:15480 msgid "A list of passdb configurations, each one created by the @code{passdb-configuration} constructor." -msgstr "" +msgstr "Eine Liste von Passwortdatenbankkonfigurationen, die jeweils mit dem @code{passdb-configuration}-Konstruktor erzeugt werden." #. type: deftypevr -#: doc/guix.texi:15485 +#: doc/guix.texi:15482 msgid "Available @code{passdb-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{passdb-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15486 +#: doc/guix.texi:15483 #, no-wrap msgid "{@code{passdb-configuration} parameter} string driver" -msgstr "" +msgstr "{@code{passdb-configuration}-Parameter} Zeichenkette driver" #. type: deftypevr -#: doc/guix.texi:15491 +#: doc/guix.texi:15488 msgid "The driver that the passdb should use. Valid values include @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth}, and @samp{static}. Defaults to @samp{\"pam\"}." -msgstr "" +msgstr "Der Treiber, den die Passwortdatenbank benutzen soll. Zu den gültigen Werten gehören @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth} und @samp{static}. Die Vorgabe ist @samp{\"pam\"}." #. type: deftypevr -#: doc/guix.texi:15493 +#: doc/guix.texi:15490 #, no-wrap msgid "{@code{passdb-configuration} parameter} space-separated-string-list args" -msgstr "" +msgstr "{@code{passdb-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste args" #. type: deftypevr -#: doc/guix.texi:15496 +#: doc/guix.texi:15493 msgid "Space separated list of arguments to the passdb driver. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Leerzeichengetrennte Liste der Argumente an den Passwortdatenbanktreiber. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15500 +#: doc/guix.texi:15497 #, no-wrap msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „userdb-configuration“-Liste userdbs" #. type: deftypevr -#: doc/guix.texi:15503 +#: doc/guix.texi:15500 msgid "List of userdb configurations, each one created by the @code{userdb-configuration} constructor." -msgstr "" +msgstr "Liste der Benutzerdatenbankkonfigurationen, die jeweils mit dem @code{userdb-configuration}-Konstruktor erzeugt werden." #. type: deftypevr -#: doc/guix.texi:15505 +#: doc/guix.texi:15502 msgid "Available @code{userdb-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{userdb-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15506 +#: doc/guix.texi:15503 #, no-wrap msgid "{@code{userdb-configuration} parameter} string driver" -msgstr "" +msgstr "{@code{userdb-configuration}-Parameter} Zeichenkette driver" #. type: deftypevr -#: doc/guix.texi:15510 +#: doc/guix.texi:15507 msgid "The driver that the userdb should use. Valid values include @samp{passwd} and @samp{static}. Defaults to @samp{\"passwd\"}." -msgstr "" +msgstr "Der Treiber, den die Benutzerdatenbank benutzen soll. Zu den gültigen Werten gehören @samp{passwd} und @samp{static}. Die Vorgabe ist @samp{\"passwd\"}." #. type: deftypevr -#: doc/guix.texi:15512 +#: doc/guix.texi:15509 #, no-wrap msgid "{@code{userdb-configuration} parameter} space-separated-string-list args" -msgstr "" +msgstr "{@code{userdb-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste args" #. type: deftypevr -#: doc/guix.texi:15515 +#: doc/guix.texi:15512 msgid "Space separated list of arguments to the userdb driver. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Leerzeichengetrennte Liste der Argumente an den Benutzerdatenbanktreiber. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15517 +#: doc/guix.texi:15514 #, no-wrap msgid "{@code{userdb-configuration} parameter} free-form-args override-fields" -msgstr "" +msgstr "{@code{userdb-configuration}-Parameter} Formlose-Argumente override-fields" #. type: deftypevr -#: doc/guix.texi:15520 +#: doc/guix.texi:15517 msgid "Override fields from passwd. Defaults to @samp{()}." -msgstr "" +msgstr "Einträge, die Vorrang vor den Feldern aus passwd haben. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15524 +#: doc/guix.texi:15521 #, no-wrap msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „plugin-configuration“ plugin-configuration" #. type: deftypevr -#: doc/guix.texi:15527 +#: doc/guix.texi:15524 msgid "Plug-in configuration, created by the @code{plugin-configuration} constructor." -msgstr "" +msgstr "Die Plugin-Konfiguration, die vom @code{plugin-configuration}-Konstruktor erzeugt wird." #. type: deftypevr -#: doc/guix.texi:15529 +#: doc/guix.texi:15526 #, no-wrap msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „namespace-configuration“-Liste namespaces" #. type: deftypevr -#: doc/guix.texi:15532 +#: doc/guix.texi:15529 msgid "List of namespaces. Each item in the list is created by the @code{namespace-configuration} constructor." -msgstr "" +msgstr "Liste der Namensräume. Jedes Objekt in der Liste wird durch den @code{namespace-configuration}-Konstruktor erzeugt." #. type: deftypevr -#: doc/guix.texi:15534 +#: doc/guix.texi:15531 msgid "Available @code{namespace-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{namespace-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15535 +#: doc/guix.texi:15532 #, no-wrap msgid "{@code{namespace-configuration} parameter} string name" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:15537 +#: doc/guix.texi:15534 msgid "Name for this namespace." -msgstr "" +msgstr "Der Name dieses Namensraums." #. type: deftypevr -#: doc/guix.texi:15539 +#: doc/guix.texi:15536 #, no-wrap msgid "{@code{namespace-configuration} parameter} string type" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette type" #. type: deftypevr -#: doc/guix.texi:15542 +#: doc/guix.texi:15539 msgid "Namespace type: @samp{private}, @samp{shared} or @samp{public}. Defaults to @samp{\"private\"}." -msgstr "" +msgstr "Namensraum-Typ: @samp{private}, @samp{shared} oder @samp{public}. Die Vorgabe ist @samp{\"private\"}." #. type: deftypevr -#: doc/guix.texi:15544 +#: doc/guix.texi:15541 #, no-wrap msgid "{@code{namespace-configuration} parameter} string separator" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette separator" #. type: deftypevr -#: doc/guix.texi:15550 +#: doc/guix.texi:15547 msgid "Hierarchy separator to use. You should use the same separator for all namespaces or some clients get confused. @samp{/} is usually a good one. The default however depends on the underlying mail storage format. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Welche Trennzeichen in der Hierarchie von Namensräumen benutzt werden sollen. Sie sollten denselben Trenner für alle Namensräume benutzen, sonst führt es zu Verwirrung bei manchen Clients. Meistens ist @samp{/} eine gute Wahl, die Voreinstellung ist allerdings abhängig vom darunterliegenden Mail-Speicher-Format. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15552 +#: doc/guix.texi:15549 #, no-wrap msgid "{@code{namespace-configuration} parameter} string prefix" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette prefix" #. type: deftypevr -#: doc/guix.texi:15556 +#: doc/guix.texi:15553 msgid "Prefix required to access this namespace. This needs to be different for all namespaces. For example @samp{Public/}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Das Präfix, das für Zugang auf diesen Namensraum angegeben werden muss. Es muss für jeden Namensraum ein anderes gewählt werden. Ein Beispiel ist @samp{Public/}. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15558 +#: doc/guix.texi:15555 #, no-wrap msgid "{@code{namespace-configuration} parameter} string location" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette location" #. type: deftypevr -#: doc/guix.texi:15562 +#: doc/guix.texi:15559 msgid "Physical location of the mailbox. This is in the same format as mail_location, which is also the default for it. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der physische Ort, an dem sich dieses Postfach („Mailbox“) befindet. Das Format ist dasselbe wie beim Mail-Ort („mail location“), der auch als Voreinstellung hierfür benutzt wird. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15564 +#: doc/guix.texi:15561 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean inbox?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck inbox?" #. type: deftypevr -#: doc/guix.texi:15568 +#: doc/guix.texi:15565 msgid "There can be only one INBOX, and this setting defines which namespace has it. Defaults to @samp{#f}." -msgstr "" +msgstr "Es kann nur eine INBOX geben; hiermit wird festgelegt, zu welchem Namensraum sie gehört. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15570 +#: doc/guix.texi:15567 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean hidden?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck hidden?" #. type: deftypevr -#: doc/guix.texi:15578 +#: doc/guix.texi:15575 msgid "If namespace is hidden, it's not advertised to clients via NAMESPACE extension. You'll most likely also want to set @samp{list? #f}. This is mostly useful when converting from another server with different namespaces which you want to deprecate but still keep working. For example you can create hidden namespaces with prefixes @samp{~/mail/}, @samp{~%u/mail/} and @samp{mail/}. Defaults to @samp{#f}." -msgstr "" +msgstr "Wenn der Namensraum versteckt ist, wird er Clients gegenüber @emph{nicht} über die NAMESPACE-Erweiterung mitgeteilt. Wahrscheinlich möchten Sie auch @samp{list? #f} festlegen. Das ist in erster Linie dann nützlich, wenn Sie von einem anderen Server mit anderen Namensräumen umziehen, die Sie ersetzen möchten, die aber trotzdem noch weiterhin funktionieren sollen. Zum Beispiel können Sie versteckte Namensräume mit Präfixen @samp{~/mail/}, @samp{~%u/mail/} und @samp{mail/} anlegen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15580 +#: doc/guix.texi:15577 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean list?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck list?" #. type: deftypevr -#: doc/guix.texi:15586 +#: doc/guix.texi:15583 msgid "Show the mailboxes under this namespace with the LIST command. This makes the namespace visible for clients that do not support the NAMESPACE extension. The special @code{children} value lists child mailboxes, but hides the namespace prefix. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob die Postfächer („Mailboxes“) unter diesem Namensraum mit dem LIST-Befehl angezeigt werden können. Dadurch wird der Namensraum für Clients sichtbar, die die NAMESPACE-Erweiterung nicht unterstützen. Mit dem besonderen Wert @code{children} werden auch Kind-Postfächer aufgelistet, aber das Namensraumpräfix verborgen. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15588 +#: doc/guix.texi:15585 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean subscriptions?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck subscriptions?" #. type: deftypevr -#: doc/guix.texi:15593 +#: doc/guix.texi:15590 msgid "Namespace handles its own subscriptions. If set to @code{#f}, the parent namespace handles them. The empty prefix should always have this as @code{#t}). Defaults to @samp{#t}." -msgstr "" +msgstr "Die Abonnements werden im Namensraum selbst behandelt. Wenn es auf @code{#f} gesetzt ist, werden sie im Elternnamensraum behandelt. Das leere Präfix sollte hier immer @code{#t} haben. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15595 +#: doc/guix.texi:15592 #, no-wrap msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} „mailbox-configuration“-Liste mailboxes" #. type: deftypevr -#: doc/guix.texi:15598 +#: doc/guix.texi:15595 msgid "List of predefined mailboxes in this namespace. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der in diesem Namensraum vordefinierten Postfächer. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15600 +#: doc/guix.texi:15597 msgid "Available @code{mailbox-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{mailbox-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15601 +#: doc/guix.texi:15598 #, no-wrap msgid "{@code{mailbox-configuration} parameter} string name" -msgstr "" +msgstr "{@code{mailbox-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:15603 +#: doc/guix.texi:15600 msgid "Name for this mailbox." -msgstr "" +msgstr "Der Name dieses Postfachs (dieser „Mailbox“)." #. type: deftypevr -#: doc/guix.texi:15605 +#: doc/guix.texi:15602 #, no-wrap msgid "{@code{mailbox-configuration} parameter} string auto" -msgstr "" +msgstr "{@code{mailbox-configuration}-Parameter} Zeichenkette auto" #. type: deftypevr -#: doc/guix.texi:15609 +#: doc/guix.texi:15606 msgid "@samp{create} will automatically create this mailbox. @samp{subscribe} will both create and subscribe to the mailbox. Defaults to @samp{\"no\"}." -msgstr "" +msgstr "Bei @samp{create} wird dieses Postfach automatisch erzeugt. Bei @samp{subscribe} wird dieses Postfach sowohl automatisch erzeugt als auch automatisch abonniert. Die Vorgabe ist @samp{\"no\"}." #. type: deftypevr -#: doc/guix.texi:15611 +#: doc/guix.texi:15608 #, no-wrap msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use" -msgstr "" +msgstr "{@code{mailbox-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste special-use" #. type: deftypevr -#: doc/guix.texi:15616 +#: doc/guix.texi:15613 msgid "List of IMAP @code{SPECIAL-USE} attributes as specified by RFC 6154. Valid values are @code{\\All}, @code{\\Archive}, @code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent}, and @code{\\Trash}. Defaults to @samp{()}." -msgstr "" +msgstr "Liste der @code{SPECIAL-USE}-Attribute von IMAP, wie sie im RFC 6154 festgelegt wurden. Gültige Werte sind @code{\\All}, @code{\\Archive}, @code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent} und @code{\\Trash}. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15622 +#: doc/guix.texi:15619 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name base-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname base-dir" #. type: deftypevr -#: doc/guix.texi:15625 +#: doc/guix.texi:15622 msgid "Base directory where to store runtime data. Defaults to @samp{\"/var/run/dovecot/\"}." -msgstr "" +msgstr "Das Basisverzeichnis, in dem Laufzeitdaten gespeichert werden. Die Vorgabe ist @samp{\"/var/run/dovecot/\"}." #. type: deftypevr -#: doc/guix.texi:15627 +#: doc/guix.texi:15624 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string login-greeting" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette login-greeting" #. type: deftypevr -#: doc/guix.texi:15630 +#: doc/guix.texi:15627 msgid "Greeting message for clients. Defaults to @samp{\"Dovecot ready.\"}." -msgstr "" +msgstr "Begrüßungsnachricht für Clients. Die Vorgabe ist @samp{\"Dovecot ready.\"}." #. type: deftypevr -#: doc/guix.texi:15632 +#: doc/guix.texi:15629 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste login-trusted-networks" #. type: deftypevr -#: doc/guix.texi:15639 +#: doc/guix.texi:15636 msgid "List of trusted network ranges. Connections from these IPs are allowed to override their IP addresses and ports (for logging and for authentication checks). @samp{disable-plaintext-auth} is also ignored for these networks. Typically you would specify your IMAP proxy servers here. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Netzwerkbereiche, denen vertraut wird. Für Verbindungen von diesen IP-Adressen können abweichende IP-Adressen und Ports angegeben werden (zur Protokollierung und zur Authentifizierung). @samp{disable-plaintext-auth} wird für diese Netzwerke außerdem ignoriert. Normalerweise würden Sie hier Ihre IMAP-Proxy-Server eintragen. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15641 +#: doc/guix.texi:15638 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste login-access-sockets" #. type: deftypevr -#: doc/guix.texi:15644 +#: doc/guix.texi:15641 msgid "List of login access check sockets (e.g.@: tcpwrap). Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Sockets zur Zugriffsprüfung beim Anmelden (z.B.@: tcpwrap). Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15646 +#: doc/guix.texi:15643 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck verbose-proctitle?" #. type: deftypevr -#: doc/guix.texi:15652 +#: doc/guix.texi:15649 msgid "Show more verbose process titles (in ps). Currently shows user name and IP address. Useful for seeing who is actually using the IMAP processes (e.g.@: shared mailboxes or if the same uid is used for multiple accounts). Defaults to @samp{#f}." -msgstr "" +msgstr "Ausführlichere Prozessnamen anzeigen (mit „ps“). Nach Voreinstellung werden Benutzername und IP-Adresse angezeigt. Die Einstellung ist nützlich, wenn man sehen können will, wer tatsächlich IMAP-Prozesse benutzt (z.B.@: gemeinsam genutzte Postfächer oder wenn derselbe Benutzeridentifikator/„UID“ für mehrere Konten benutzt wird). Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15654 +#: doc/guix.texi:15651 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck shutdown-clients?" #. type: deftypevr -#: doc/guix.texi:15660 +#: doc/guix.texi:15657 msgid "Should all processes be killed when Dovecot master process shuts down. Setting this to @code{#f} means that Dovecot can be upgraded without forcing existing client connections to close (although that could also be a problem if the upgrade is e.g.@: due to a security fix). Defaults to @samp{#t}." -msgstr "" +msgstr "Ob alle Prozesse abgewürgt werden sollen, wenn der Haupt-Dovecot-Prozess terminiert. Ist dies auf @code{#f} gesetzt, kann Dovecot aktualisiert werden, ohne dass bestehende Client-Verbindungen zwangsweise geschlossen werden (jedoch kann das problematisch sein, wenn die Aktualisierung z.B.@: eine Sicherheitslücke schließen soll). Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15662 +#: doc/guix.texi:15659 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl doveadm-worker-count" #. type: deftypevr -#: doc/guix.texi:15666 +#: doc/guix.texi:15663 msgid "If non-zero, run mail commands via this many connections to doveadm server, instead of running them directly in the same process. Defaults to @samp{0}." -msgstr "" +msgstr "Ist dies @emph{nicht} null, werden Mail-Befehle über die angegebene Anzahl von Verbindungen an den doveadm-Server geschickt, statt sie direkt im selben Prozess auszuführen. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:15668 +#: doc/guix.texi:15665 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette doveadm-socket-path" #. type: deftypevr -#: doc/guix.texi:15671 +#: doc/guix.texi:15668 msgid "UNIX socket or host:port used for connecting to doveadm server. Defaults to @samp{\"doveadm-server\"}." -msgstr "" +msgstr "Der UNIX-Socket oder das „Host:Port“-Paar, mit dem Verbindungen zum doveadm-Server hergestellt werden. Die Vorgabe ist @samp{\"doveadm-server\"}." #. type: deftypevr -#: doc/guix.texi:15673 +#: doc/guix.texi:15670 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste import-environment" #. type: deftypevr -#: doc/guix.texi:15677 +#: doc/guix.texi:15674 msgid "List of environment variables that are preserved on Dovecot startup and passed down to all of its child processes. You can also give key=value pairs to always set specific settings." -msgstr "" +msgstr "Die Liste der Umgebungsvariablen, die beim Starten von Dovecot erhalten bleiben und allen Kindprozessen davon mitgegeben werden. Sie können auch „Schlüssel=Wert“-Paare angeben, um wie immer bestimmte Zuweisungen festzulegen." #. type: deftypevr -#: doc/guix.texi:15679 +#: doc/guix.texi:15676 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck disable-plaintext-auth?" #. type: deftypevr -#: doc/guix.texi:15686 +#: doc/guix.texi:15683 msgid "Disable LOGIN command and all other plaintext authentications unless SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP matches the local IP (i.e.@: you're connecting from the same computer), the connection is considered secure and plaintext authentication is allowed. See also ssl=required setting. Defaults to @samp{#t}." -msgstr "" +msgstr "Deaktiviert den LOGIN-Befehl und alle anderen Klartext-Authentizierungsverfahren, solange kein SSL/TLS benutzt wird (die LOGINDISABLED-Capability). Beachten Sie, dass, wenn die entfernte IP-Adresse mit der lokalen IP-Adresse identisch ist (Sie sich also vom selben Rechner aus verbinden), die Verbindung als sicher aufgefasst und Klartext-Authentizierung möglich ist. Siehe auch die „ssl=required“-Einstellung. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15688 +#: doc/guix.texi:15685 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl auth-cache-size" #. type: deftypevr -#: doc/guix.texi:15693 +#: doc/guix.texi:15690 msgid "Authentication cache size (e.g.@: @samp{#e10e6}). 0 means it's disabled. Note that bsdauth, PAM and vpopmail require @samp{cache-key} to be set for caching to be used. Defaults to @samp{0}." -msgstr "" +msgstr "Die Größe des Zwischenspeichers für Authentifizierungen (z.B.@: @samp{#e10e6}). Bei 0 ist er deaktiviert. Beachten Sie, dass für bsdauth, PAM und vpopmail die Einstellung @samp{cache-key} festgelegt sein muss, damit ein Zwischenspeicher benutzt wird. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:15695 +#: doc/guix.texi:15692 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-cache-ttl" #. type: deftypevr -#: doc/guix.texi:15703 +#: doc/guix.texi:15700 msgid "Time to live for cached data. After TTL expires the cached record is no longer used, *except* if the main database lookup returns internal failure. We also try to handle password changes automatically: If user's previous authentication was successful, but this one wasn't, the cache isn't used. For now this works only with plaintext authentication. Defaults to @samp{\"1 hour\"}." -msgstr "" +msgstr "Wie lange Daten im Zwischenspeicher gültig bleiben („Time to live“). Nachdem die TTL ausläuft, wird der zwischengespeicherte Eintrag nicht mehr benutzt, @emph{außer} wenn eine Auflösung über die Hauptdatenbank zu einem internen Fehler führt. Dovecot versucht zudem, Passwortänderungen automatisch zu behandeln: Wenn die letzte Authentizierung erfolgreich war, diese jetzt aber nicht, wird der Zwischenspeicher @emph{nicht} benutzt. Derzeit funktioniert dies nur bei Klartext-Authentizierung. Die Vorgabe ist @samp{\"1 hour\"} für 1 Stunde." #. type: deftypevr -#: doc/guix.texi:15705 +#: doc/guix.texi:15702 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-cache-negative-ttl" #. type: deftypevr -#: doc/guix.texi:15709 +#: doc/guix.texi:15706 msgid "TTL for negative hits (user not found, password mismatch). 0 disables caching them completely. Defaults to @samp{\"1 hour\"}." -msgstr "" +msgstr "TTL beim Zwischenspeichern negativer Ergebnisse („negative Hits“, z.B.@: wenn der Benutzer nicht gefunden wurde oder das Passwort nicht stimmt). 0 deaktiviert das Zwischenspeichern davon vollständig. Die Vorgabe ist @samp{\"1 hour\"} für 1 Stunde." #. type: deftypevr -#: doc/guix.texi:15711 +#: doc/guix.texi:15708 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste auth-realms" #. type: deftypevr -#: doc/guix.texi:15717 +#: doc/guix.texi:15714 msgid "List of realms for SASL authentication mechanisms that need them. You can leave it empty if you don't want to support multiple realms. Many clients simply use the first one listed here, so keep the default realm first. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Administrationsbereiche („Realms“) für SASL-Authentizierungsmechanismen, die solche benötigen. Sie können dieses Feld leer lassen, wenn Sie @emph{keine} Unterstützung für mehrere Administrationsbereiche wollen. Viele Clients benutzen den ersten hier aufgelisteten Administrationsbereich, also sollte der als Voreinstellung gewünschte Bereich vorne stehen. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15719 +#: doc/guix.texi:15716 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-default-realm" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-default-realm" #. type: deftypevr -#: doc/guix.texi:15724 +#: doc/guix.texi:15721 msgid "Default realm/domain to use if none was specified. This is used for both SASL realms and appending @@domain to username in plaintext logins. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der voreingestellte Administrationsbereich bzw.@: die Domain, falls keiner angegeben wurde. Dies wird sowohl für SASL-Administrationsbereiche als auch zum Anhängen von @@domain an den Benutzernamen bei Klartextanmeldungen benutzt. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15726 +#: doc/guix.texi:15723 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-chars" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-username-chars" #. type: deftypevr -#: doc/guix.texi:15733 +#: doc/guix.texi:15730 msgid "List of allowed characters in username. If the user-given username contains a character not listed in here, the login automatically fails. This is just an extra check to make sure user can't exploit any potential quote escaping vulnerabilities with SQL/LDAP databases. If you want to allow all characters, set this value to empty. Defaults to @samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}." -msgstr "" +msgstr "Die Liste der in Benutzernamen zulässigen Zeichen. Wenn der vom Benutzer angegebene Benutzername ein hier nicht aufgelistetes Zeichen enthält, wird die Authentizierung automatisch abgelehnt. Dies dient bloß als eine weitere Überprüfung, um zu gewährleisten, dass mögliche Schwachstellen bei der Maskierung von Anführungszeichen in SQL-/LDAP-Datenbanken nicht ausgenutzt werden können. Wenn Sie alle Zeichen zulassen möchten, setzen Sie dieses Feld auf eine leere Zeichenkette. Die Vorgabe ist @samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}." #. type: deftypevr -#: doc/guix.texi:15735 +#: doc/guix.texi:15732 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-translation" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-username-translation" #. type: deftypevr -#: doc/guix.texi:15741 +#: doc/guix.texi:15738 msgid "Username character translations before it's looked up from databases. The value contains series of from -> to characters. For example @samp{#@@/@@} means that @samp{#} and @samp{/} characters are translated to @samp{@@}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Wie Zeichen in Benutzernamen ersetzt werden sollen, bevor der Name mit Datenbanken aufgelöst wird. Der Wert besteht aus einer Reihe von Angaben, welches Zeichen durch welches zu ersetzen ist. Zum Beispiel werden für @samp{#@@/@@} die Zeichen @samp{#} und @samp{/} beide durch @samp{@@} ersetzt. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15743 +#: doc/guix.texi:15740 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-username-format" #. type: deftypevr -#: doc/guix.texi:15750 +#: doc/guix.texi:15747 msgid "Username formatting before it's looked up from databases. You can use the standard variables here, e.g.@: %Lu would lowercase the username, %n would drop away the domain if it was given, or @samp{%n-AT-%d} would change the @samp{@@} into @samp{-AT-}. This translation is done after @samp{auth-username-translation} changes. Defaults to @samp{\"%Lu\"}." -msgstr "" +msgstr "Formatierungsanweisungen, die auf jeden Benutzernamen angewandt werden, bevor er mit einer Datenbank aufgelöst wird. Sie können hierzu die Standardvariablen verwenden, z.B.@: würde %Lu den Benutzernamen in Kleinbuchstaben umschreiben („lowercase“), %n würde den Domainnamen weglassen, wenn einer angegeben wurde, und @samp{%n-AT-%d} würde alle @samp{@@} durch @samp{-AT-} ersetzen. Diese Übersetzung wird durchgeführt, nachdem die Änderungen aus @samp{auth-username-translation} angewandt wurden. Die Vorgabe ist @samp{\"%Lu\"}." #. type: deftypevr -#: doc/guix.texi:15752 +#: doc/guix.texi:15749 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-master-user-separator" #. type: deftypevr -#: doc/guix.texi:15760 +#: doc/guix.texi:15757 msgid "If you want to allow master users to log in by specifying the master username within the normal username string (i.e.@: not using SASL mechanism's support for it), you can specify the separator character here. The format is then . UW-IMAP uses @samp{*} as the separator, so that could be a good choice. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Wenn Sie es für „Master“-Benutzer erlauben möchten, sich durch Angeben des Master-Benutzernamens als Teil einer normalen Benutzernamens-Zeichenkette als jemand anders anzumelden (also ohne Verwendung der Unterstützung davon durch den SASL-Mechanismus), können Sie hier die Trennzeichen dazwischen angeben. Das Format ist dann . UW-IMAP benutzt @samp{*} als Trennzeichen, also könnte das eine gute Wahl sein. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15762 +#: doc/guix.texi:15759 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-anonymous-username" #. type: deftypevr -#: doc/guix.texi:15766 +#: doc/guix.texi:15763 msgid "Username to use for users logging in with ANONYMOUS SASL mechanism. Defaults to @samp{\"anonymous\"}." -msgstr "" +msgstr "Der Benutzername, der verwendet wird, wenn sich Benutzer mit dem SASL-Mechanismus „ANONYMOUS“ anmelden. Die Vorgabe ist @samp{\"anonymous\"}." #. type: deftypevr -#: doc/guix.texi:15768 +#: doc/guix.texi:15765 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl auth-worker-max-count" #. type: deftypevr -#: doc/guix.texi:15773 +#: doc/guix.texi:15770 msgid "Maximum number of dovecot-auth worker processes. They're used to execute blocking passdb and userdb queries (e.g.@: MySQL and PAM). They're automatically created and destroyed as needed. Defaults to @samp{30}." -msgstr "" +msgstr "Die maximale Anzahl von dovecot-auth-Arbeiterprozessen. Diese werden benutzt, um blockierende Anfragen an die Passwortdatenbank („passdb“) und an die Benutzerdatenbank („userdb“) zu stellen (z.B.@: MySQL und PAM). Sie werden automatisch erzeugt und gelöscht, je nachdem, wann sie gebraucht werden. Die Vorgabe ist @samp{30}." #. type: deftypevr -#: doc/guix.texi:15775 +#: doc/guix.texi:15772 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-gssapi-hostname" #. type: deftypevr -#: doc/guix.texi:15780 +#: doc/guix.texi:15777 msgid "Host name to use in GSSAPI principal names. The default is to use the name returned by gethostname(). Use @samp{$ALL} (with quotes) to allow all keytab entries. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der Rechnername, der in GSSAPI-Prinzipalnamen benutzt wird. Nach Voreinstellung wird der durch gethostname() zurückgelieferte Name verwendet. Benutzen Sie @samp{$ALL} (mit Anführungszeichen), damit alle Einträge in der Schlüsseltabelle („Keytab“) akzeptiert werden. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15782 +#: doc/guix.texi:15779 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-krb5-keytab" #. type: deftypevr -#: doc/guix.texi:15788 +#: doc/guix.texi:15785 msgid "Kerberos keytab to use for the GSSAPI mechanism. Will use the system default (usually @file{/etc/krb5.keytab}) if not specified. You may need to change the auth service to run as root to be able to read this file. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Kerberos-Schlüsseltabelle („Keytab“), die für den GSSAPI-Mechanismus benutzt werden soll. Wenn sie nicht angegeben wird, wird die Voreinstellung des Systems benutzt (in der Regel @file{/etc/krb5.keytab}). Eventuell müssen Sie den Auth-Dienst als Administratornutzer „root“ ausführen lassen, um Lesezugriffe auf diese Datei zu ermöglichen. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15790 +#: doc/guix.texi:15787 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-use-winbind?" #. type: deftypevr -#: doc/guix.texi:15795 +#: doc/guix.texi:15792 msgid "Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and @samp{ntlm-auth} helper. . Defaults to @samp{#f}." -msgstr "" +msgstr "NTLM-Authentifizierung und GSS-SPNEGO-Authentifizierung mit dem winbind-Daemon und dem @samp{ntlm-auth}-Hilfsprogramm von Samba durchführen. Siehe . Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15797 +#: doc/guix.texi:15794 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname auth-winbind-helper-path" #. type: deftypevr -#: doc/guix.texi:15800 +#: doc/guix.texi:15797 msgid "Path for Samba's @samp{ntlm-auth} helper binary. Defaults to @samp{\"/usr/bin/ntlm_auth\"}." -msgstr "" +msgstr "Der Pfad zur Binärdatei @samp{ntlm-auth} von Samba. Die Vorgabe ist @samp{\"/usr/bin/ntlm_auth\"}." #. type: deftypevr -#: doc/guix.texi:15802 +#: doc/guix.texi:15799 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-failure-delay" #. type: deftypevr -#: doc/guix.texi:15805 +#: doc/guix.texi:15802 msgid "Time to delay before replying to failed authentications. Defaults to @samp{\"2 secs\"}." -msgstr "" +msgstr "Die Zeit, wie lange vor der Antwort auf eine fehlgeschlagene Authentizierung gewartet wird. Die Vorgabe ist @samp{\"2 secs\"} für 2 Sekunden." #. type: deftypevr -#: doc/guix.texi:15807 +#: doc/guix.texi:15804 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-ssl-require-client-cert?" #. type: deftypevr -#: doc/guix.texi:15811 +#: doc/guix.texi:15808 msgid "Require a valid SSL client certificate or the authentication fails. Defaults to @samp{#f}." -msgstr "" +msgstr "Es wird ein gültiges SSL-Client-Zertifikat verlangt, andernfalls schlägt die Authentizierung fehl. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15813 +#: doc/guix.texi:15810 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-ssl-username-from-cert?" #. type: deftypevr -#: doc/guix.texi:15818 +#: doc/guix.texi:15815 msgid "Take the username from client's SSL certificate, using @code{X509_NAME_get_text_by_NID()} which returns the subject's DN's CommonName. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob der Benutzername aus dem SSL-Zertifikat des Clients ausgelesen werden soll, indem @code{X509_NAME_get_text_by_NID()} benutzt wird, um den Distinguished Name („DN“) als Gebräuchlicher Name („CommonName“) des Zertifikatinhabers („Subject“) auszulesen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15820 +#: doc/guix.texi:15817 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste auth-mechanisms" #. type: deftypevr -#: doc/guix.texi:15826 +#: doc/guix.texi:15823 msgid "List of wanted authentication mechanisms. Supported mechanisms are: @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey}, and @samp{gss-spnego}. NOTE: See also @samp{disable-plaintext-auth} setting." -msgstr "" +msgstr "Die Liste der erwünschten Authentizierungsmechanismen. Unterstützte Mechanismen sind: @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey} und @samp{gss-spnego}. @emph{Anmerkung}: Siehe auch die Einstellung zu @samp{disable-plaintext-auth}." #. type: deftypevr -#: doc/guix.texi:15828 +#: doc/guix.texi:15825 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste director-servers" #. type: deftypevr -#: doc/guix.texi:15833 +#: doc/guix.texi:15830 msgid "List of IPs or hostnames to all director servers, including ourself. Ports can be specified as ip:port. The default port is the same as what director service's @samp{inet-listener} is using. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der IP-Adressen oder Rechnernamen („Hostnames“) für alle Direktorserver, einschließlich dieses Servers selbst. Ports können wie in „IP:Port“ angegeben werden. Der voreingestellte Port ist derselbe wie der, der beim @samp{inet-listener} des Direktordienstes benutzt wird. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15835 +#: doc/guix.texi:15832 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste director-mail-servers" #. type: deftypevr -#: doc/guix.texi:15839 +#: doc/guix.texi:15836 msgid "List of IPs or hostnames to all backend mail servers. Ranges are allowed too, like 10.0.0.10-10.0.0.30. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der IP-Adressen oder Rechnernamen („Hostnames“), um alle Hintergrund-Mailserver zu erreichen. Auch Bereiche können angegeben werden, wie 10.0.0.10-10.0.0.30. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15841 +#: doc/guix.texi:15838 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string director-user-expire" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette director-user-expire" #. type: deftypevr -#: doc/guix.texi:15845 +#: doc/guix.texi:15842 msgid "How long to redirect users to a specific server after it no longer has any connections. Defaults to @samp{\"15 min\"}." -msgstr "" +msgstr "Wie lange Benutzer zum selben Server weitergeleitet werden, sobald dieser keine Verbindungen mehr hat. Die Vorgabe ist @samp{\"15 min\"}." #. type: deftypevr -#: doc/guix.texi:15847 +#: doc/guix.texi:15844 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string director-username-hash" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette director-username-hash" #. type: deftypevr -#: doc/guix.texi:15852 +#: doc/guix.texi:15849 msgid "How the username is translated before being hashed. Useful values include %Ln if user can log in with or without @@domain, %Ld if mailboxes are shared within domain. Defaults to @samp{\"%Lu\"}." -msgstr "" +msgstr "Wie der Benutzername umgeschrieben wird, bevor er gehasht wird. Zu den sinnvollen Werten gehören %Ln, wenn der Nutzer sich mit oder ohne @@domain anmelden kann, oder %Ld, wenn Postfächer innerhalb der Domain gemeinsam genutzt werden. Die Vorgabe ist @samp{\"%Lu\"}." #. type: deftypevr -#: doc/guix.texi:15854 +#: doc/guix.texi:15851 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string log-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette log-path" #. type: deftypevr -#: doc/guix.texi:15858 +#: doc/guix.texi:15855 msgid "Log file to use for error messages. @samp{syslog} logs to syslog, @samp{/dev/stderr} logs to stderr. Defaults to @samp{\"syslog\"}." -msgstr "" +msgstr "Die Protokolldatei, die für Fehlermeldungen benutzt werden soll. Bei @samp{syslog} wird das Protokoll an syslog geschrieben, bei @samp{/dev/stderr} an die Standardfehlerausgabe. Die Vorgabe ist @samp{\"syslog\"}." #. type: deftypevr -#: doc/guix.texi:15860 +#: doc/guix.texi:15857 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string info-log-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette info-log-path" #. type: deftypevr -#: doc/guix.texi:15864 +#: doc/guix.texi:15861 msgid "Log file to use for informational messages. Defaults to @samp{log-path}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Protokolldatei, die für Informationsmeldungen benutzt werden soll. Die Voreinstellung ist @samp{log-path}. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15866 +#: doc/guix.texi:15863 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string debug-log-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette debug-log-path" #. type: deftypevr -#: doc/guix.texi:15870 +#: doc/guix.texi:15867 msgid "Log file to use for debug messages. Defaults to @samp{info-log-path}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Protokolldatei, die für Meldungen zur Fehlersuche benutzt werden soll. Die Voreinstellung ist @samp{info-log-path}. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15872 +#: doc/guix.texi:15869 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string syslog-facility" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette syslog-facility" #. type: deftypevr -#: doc/guix.texi:15877 +#: doc/guix.texi:15874 msgid "Syslog facility to use if you're logging to syslog. Usually if you don't want to use @samp{mail}, you'll use local0..local7. Also other standard facilities are supported. Defaults to @samp{\"mail\"}." -msgstr "" +msgstr "Als welche Syslog-Einrichtung Protokolle an Syslog übermittelt werden sollen. Falls Sie @samp{mail} hierbei @emph{nicht} benutzen wollen, eignen sich normalerweise local0–local7. Andere Standardeinrichtungen werden auch unterstützt. Die Vorgabe ist @samp{\"mail\"}." #. type: deftypevr -#: doc/guix.texi:15879 +#: doc/guix.texi:15876 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-verbose?" #. type: deftypevr -#: doc/guix.texi:15883 +#: doc/guix.texi:15880 msgid "Log unsuccessful authentication attempts and the reasons why they failed. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob gescheiterte Anmeldeversuche und die Gründe, warum diese nicht erfolgreich waren, protokolliert werden sollen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15885 +#: doc/guix.texi:15882 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-verbose-passwords" msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-verbose-passwords" #. type: deftypevr -#: doc/guix.texi:15892 +#: doc/guix.texi:15889 msgid "In case of password mismatches, log the attempted password. Valid values are no, plain and sha1. sha1 can be useful for detecting brute force password attempts vs. user simply trying the same password over and over again. You can also truncate the value to n chars by appending \":n\" (e.g.@: sha1:6). Defaults to @samp{\"no\"}." -msgstr "" +msgstr "Ob bei falschen Passwörtern das versuchte falsche Passwort ins Protokoll geschrieben werden soll. Gültige Werte sind \"no\" („nein“), \"plain\" (als Klartext) und \"sha1\". Den SHA1-Hash zu speichern kann nützlich sein, um zu erkennen, wenn jemand versucht, sehr viele Passwörter durchzuprobieren (ein „Brute-Force“-Angriff) oder ob Benutzer einfach nur dasselbe Passwort immer wieder probieren. Sie können auch nur die ersten n Zeichen des Wertes protokollieren, indem Sie \":n\" anhängen (z.B.@: sha1:6). Die Vorgabe ist @samp{\"no\"}." #. type: deftypevr -#: doc/guix.texi:15894 +#: doc/guix.texi:15891 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-debug?" #. type: deftypevr -#: doc/guix.texi:15898 +#: doc/guix.texi:15895 msgid "Even more verbose logging for debugging purposes. Shows for example SQL queries. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob zur Fehlersuche noch ausführlichere Protokolle geschrieben werden sollen. Zum Beispiel werden SQL-Anfragen protokolliert. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15900 +#: doc/guix.texi:15897 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-debug-passwords?" #. type: deftypevr -#: doc/guix.texi:15905 +#: doc/guix.texi:15902 msgid "In case of password mismatches, log the passwords and used scheme so the problem can be debugged. Enabling this also enables @samp{auth-debug}. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob bei falschen Passwörtern das versuchte falsche Passwort und das benutzte Passwortschema ins Protokoll geschrieben werden soll, damit das Problem untersucht werden kann. Wenn dies aktiviert wird, wird auch @samp{auth-debug} aktiviert. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15907 +#: doc/guix.texi:15904 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-debug?" #. type: deftypevr -#: doc/guix.texi:15911 +#: doc/guix.texi:15908 msgid "Enable mail process debugging. This can help you figure out why Dovecot isn't finding your mails. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob die Fehlersuche beim Mail-Prozess ermöglicht werden soll. Dies kann Ihnen dabei helfen, herauszufinden, warum Dovecot Ihre E-Mails nicht findet. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15913 +#: doc/guix.texi:15910 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck verbose-ssl?" #. type: deftypevr -#: doc/guix.texi:15916 +#: doc/guix.texi:15913 msgid "Show protocol level SSL errors. Defaults to @samp{#f}." -msgstr "" +msgstr "SSL-Fehler auf Protokollebene anzeigen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15918 +#: doc/guix.texi:15915 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string log-timestamp" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette log-timestamp" #. type: deftypevr -#: doc/guix.texi:15922 +#: doc/guix.texi:15919 msgid "Prefix for each line written to log file. % codes are in strftime(3) format. Defaults to @samp{\"\\\"%b %d %H:%M:%S \\\"\"}." -msgstr "" +msgstr "Das Präfix für jede Zeile, die ins Protokoll geschrieben wird. %-Codes sind im Format von strftime(3). Die Vorgabe ist @samp{\"\\\"%b %d %H:%M:%S \\\"\"}." #. type: deftypevr -#: doc/guix.texi:15924 +#: doc/guix.texi:15921 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste login-log-format-elements" #. type: deftypevr -#: doc/guix.texi:15928 +#: doc/guix.texi:15925 msgid "List of elements we want to log. The elements which have a non-empty variable value are joined together to form a comma-separated string." -msgstr "" +msgstr "Eine Liste der Elemente, die protokolliert werden sollen. Die Elemente, deren Variablenwerte nicht leer sind, werden zu einer kommagetrennten Zeichenkette zusammengefügt." #. type: deftypevr -#: doc/guix.texi:15930 +#: doc/guix.texi:15927 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string login-log-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette login-log-format" #. type: deftypevr -#: doc/guix.texi:15934 +#: doc/guix.texi:15931 msgid "Login log format. %s contains @samp{login-log-format-elements} string, %$ contains the data we want to log. Defaults to @samp{\"%$: %s\"}." -msgstr "" +msgstr "Das Format des Anmeldeprogramms. %s umfasst die Zeichenkette @samp{login-log-format-elements}, %$ enthält die Daten, die man protokollieren lassen möchte. Die Vorgabe ist @samp{\"%$: %s\"}." #. type: deftypevr -#: doc/guix.texi:15936 +#: doc/guix.texi:15933 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-log-prefix" #. type: deftypevr -#: doc/guix.texi:15940 +#: doc/guix.texi:15937 msgid "Log prefix for mail processes. See doc/wiki/Variables.txt for list of possible variables you can use. Defaults to @samp{\"\\\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}." -msgstr "" +msgstr "Das Präfix, das Protokollen für Mailprozesse vorangestellt wird. Siehe doc/wiki/Variables.txt für eine Liste der benutzbaren Variablen. Die Vorgabe ist @samp{\"\\\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}." #. type: deftypevr -#: doc/guix.texi:15942 +#: doc/guix.texi:15939 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string deliver-log-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette deliver-log-format" #. type: deftypevr -#: doc/guix.texi:15944 +#: doc/guix.texi:15941 msgid "Format to use for logging mail deliveries. You can use variables:" -msgstr "" +msgstr "Welches Format zur Protokollierung von Mailzustellungen verwendet werden soll. Sie können die folgenden Variablen benutzen:" #. type: item -#: doc/guix.texi:15945 +#: doc/guix.texi:15942 #, no-wrap msgid "%$" -msgstr "" +msgstr "%$" #. type: table -#: doc/guix.texi:15947 +#: doc/guix.texi:15944 msgid "Delivery status message (e.g.@: @samp{saved to INBOX})" -msgstr "" +msgstr "Zustellungsstatusnachricht (z.B.@: @samp{saved to INBOX})" #. type: item -#: doc/guix.texi:15947 +#: doc/guix.texi:15944 #, no-wrap msgid "%m" -msgstr "" +msgstr "%m" #. type: table -#: doc/guix.texi:15949 +#: doc/guix.texi:15946 msgid "Message-ID" -msgstr "" +msgstr "Nachrichtenidentifikator („Message-ID“)" #. type: item -#: doc/guix.texi:15949 doc/guix.texi:16481 +#: doc/guix.texi:15946 doc/guix.texi:16478 #, no-wrap msgid "%s" -msgstr "" +msgstr "%s" #. type: table -#: doc/guix.texi:15951 +#: doc/guix.texi:15948 msgid "Subject" -msgstr "" +msgstr "Betreff („Subject“)" #. type: item -#: doc/guix.texi:15951 +#: doc/guix.texi:15948 #, no-wrap msgid "%f" -msgstr "" +msgstr "%f" #. type: table -#: doc/guix.texi:15953 +#: doc/guix.texi:15950 msgid "From address" -msgstr "" +msgstr "Absendeadresse („From“)" #. type: table -#: doc/guix.texi:15955 +#: doc/guix.texi:15952 msgid "Physical size" -msgstr "" +msgstr "Physische Größe" #. type: item -#: doc/guix.texi:15955 +#: doc/guix.texi:15952 #, no-wrap msgid "%w" -msgstr "" +msgstr "%w" #. type: table -#: doc/guix.texi:15957 +#: doc/guix.texi:15954 msgid "Virtual size." -msgstr "" +msgstr "Virtuelle Größe." #. type: deftypevr -#: doc/guix.texi:15959 +#: doc/guix.texi:15956 msgid "Defaults to @samp{\"msgid=%m: %$\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"msgid=%m: %$\"}." #. type: deftypevr -#: doc/guix.texi:15961 +#: doc/guix.texi:15958 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-location" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-location" #. type: deftypevr -#: doc/guix.texi:15966 +#: doc/guix.texi:15963 msgid "Location for users' mailboxes. The default is empty, which means that Dovecot tries to find the mailboxes automatically. This won't work if the user doesn't yet have any mail, so you should explicitly tell Dovecot the full location." -msgstr "" +msgstr "Wo die Postfächer (die „Mailboxes“) der Benutzer gespeichert sind. Die Vorgabe ist die leere Zeichenkette, was bedeutet, dass Dovecot die Postfächer automatisch zu finden versucht. Das funktioniert nur, wenn der Nutzer bereits E-Mails gespeichert hat, also sollten Sie Dovecot den vollständigen Pfad mitteilen." #. type: deftypevr -#: doc/guix.texi:15972 +#: doc/guix.texi:15969 msgid "If you're using mbox, giving a path to the INBOX file (e.g.@: /var/mail/%u) isn't enough. You'll also need to tell Dovecot where the other mailboxes are kept. This is called the \"root mail directory\", and it must be the first path given in the @samp{mail-location} setting." -msgstr "" +msgstr "Wenn Sie das mbox-Format benutzen, genügt es @emph{nicht}, den Pfad zur INBOX-Datei (z.B.@: /var/mail/%u) anzugeben. Sie müssen Dovecot @emph{auch} mitteilen, wo die anderen Postfächer gespeichert sind. Dieses Verzeichnis nennt sich Wurzelmailverzeichnis („Root Mail Directory“) und es muss als erster Pfad in der @samp{mail-location}-Einstellung angegeben werden." #. type: deftypevr -#: doc/guix.texi:15974 +#: doc/guix.texi:15971 msgid "There are a few special variables you can use, eg.:" -msgstr "" +msgstr "Es gibt ein paar besondere Variable, die Sie verwenden können, z.B.:" #. type: table -#: doc/guix.texi:15978 +#: doc/guix.texi:15975 msgid "username" -msgstr "" +msgstr "Benutzername" #. type: item -#: doc/guix.texi:15978 doc/guix.texi:16477 +#: doc/guix.texi:15975 doc/guix.texi:16474 #, no-wrap msgid "%n" -msgstr "" +msgstr "%n" #. type: table -#: doc/guix.texi:15980 +#: doc/guix.texi:15977 msgid "user part in user@@domain, same as %u if there's no domain" -msgstr "" +msgstr "Benutzerteil in Benutzer@@Domain; sonst dasselbe wie %u, wenn es keine Domain gibt" #. type: item -#: doc/guix.texi:15980 +#: doc/guix.texi:15977 #, no-wrap msgid "%d" -msgstr "" +msgstr "%d" #. type: table -#: doc/guix.texi:15982 +#: doc/guix.texi:15979 msgid "domain part in user@@domain, empty if there's no domain" -msgstr "" +msgstr "Domainteil in Benutzer@@Domain; sonst leer, wenn es keine Domain gibt" #. type: item -#: doc/guix.texi:15982 +#: doc/guix.texi:15979 #, no-wrap msgid "%h" -msgstr "" +msgstr "%h" #. type: table -#: doc/guix.texi:15984 +#: doc/guix.texi:15981 msgid "home director" -msgstr "" +msgstr "Persönliches Verzeichnis" #. type: deftypevr -#: doc/guix.texi:15987 +#: doc/guix.texi:15984 msgid "See doc/wiki/Variables.txt for full list. Some examples:" -msgstr "" +msgstr "Siehe doc/wiki/Variables.txt für die vollständige Liste. Einige Beispiele:" #. type: item -#: doc/guix.texi:15988 +#: doc/guix.texi:15985 #, no-wrap msgid "maildir:~/Maildir" -msgstr "" +msgstr "maildir:~/Maildir" #. type: item -#: doc/guix.texi:15989 +#: doc/guix.texi:15986 #, no-wrap msgid "mbox:~/mail:INBOX=/var/mail/%u" -msgstr "" +msgstr "mbox:~/mail:INBOX=/var/mail/%u" #. type: item -#: doc/guix.texi:15990 +#: doc/guix.texi:15987 #, no-wrap msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%" -msgstr "" +msgstr "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%" #. type: deftypevr -#: doc/guix.texi:15995 +#: doc/guix.texi:15992 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-uid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-uid" #. type: deftypevr -#: doc/guix.texi:16000 +#: doc/guix.texi:15997 msgid "System user and group used to access mails. If you use multiple, userdb can override these by returning uid or gid fields. You can use either numbers or names. . Defaults to @samp{\"\"}." -msgstr "" +msgstr "Systembenutzer und -gruppe, die benutzt werden sollen, um auf Mails zuzugreifen. Wenn Sie mehrere Benutzerkonten verwenden, kann auch die Benutzerdatenbank „userdb“ vorrangig verwendet werden, indem sie zu Benutzer- oder Gruppenidentifikatoren (UIDs und GIDs) auflöst. Sie können hier Zahlen oder Namen angeben. Siehe . Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16002 +#: doc/guix.texi:15999 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-gid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-gid" #. type: deftypevr -#: doc/guix.texi:16007 +#: doc/guix.texi:16004 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-privileged-group" #. type: deftypevr -#: doc/guix.texi:16013 +#: doc/guix.texi:16010 msgid "Group to enable temporarily for privileged operations. Currently this is used only with INBOX when either its initial creation or dotlocking fails. Typically this is set to \"mail\" to give access to /var/mail. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Benutzergruppe, die zwischenzeitlich benutzt wird, um Operationen mit besonderen Berechtigungen auszuführen. Derzeit wird dies nur mit dem INBOX-Postfach benutzt, wenn dessen anfängliche Erzeugung oder Sperrung per „Dotlocking“-Datei fehlschlägt. Typischerweise wird es auf \"mail\" gesetzt, damit Zugriffe auf /var/mail möglich sind. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16015 +#: doc/guix.texi:16012 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-access-groups" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-access-groups" #. type: deftypevr -#: doc/guix.texi:16023 +#: doc/guix.texi:16020 msgid "Grant access to these supplementary groups for mail processes. Typically these are used to set up access to shared mailboxes. Note that it may be dangerous to set these if users can create symlinks (e.g.@: if \"mail\" group is set here, ln -s /var/mail ~/mail/var could allow a user to delete others' mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). Defaults to @samp{\"\"}." -msgstr "" +msgstr "Mail-Prozessen Zugriff auf diese zusätzlichen Benutzergruppen gewähren. Typischerweise werden sie benutzt, um gemeinsam genutzte Postfächer („Mailboxes“) so einzurichten, dass alle aus der Gruppe zugreifen können. Beachten Sie, dass es gefährlich sein kann, dies zu erlauben, wenn Benutzer symbolische Verknüpfungen einrichten können (z.B.@: kann jeder, wenn hier die \"mail\"-Gruppe festgelegt wurde, „ln -s /var/mail ~/mail/var“ benutzen, um die Postfächer der anderen zu löschen, oder „ln -s /secret/shared/box ~/mail/mybox“, um sie zu lesen). Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16025 +#: doc/guix.texi:16022 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-full-filesystem-access?" #. type: deftypevr -#: doc/guix.texi:16031 +#: doc/guix.texi:16028 msgid "Allow full file system access to clients. There's no access checks other than what the operating system does for the active UID/GID. It works with both maildir and mboxes, allowing you to prefix mailboxes names with e.g.@: /path/ or ~user/. Defaults to @samp{#f}." -msgstr "" +msgstr "Clients vollen Dateisystemzugriff gestatten. Damit gibt es keine Zugriffsüberprüfungen mehr, abgesehen von denen, die das Betriebssystem für die aktiven Benutzer- und Gruppenidentifikatoren (UID und GID) durchführt. Es ist sowohl für maildir- als auch mbox-Formate verwendbar und Sie können dadurch für Namen von Postfächern („Mailboxes“) Präfixe wie z.B.@: /pfad/ oder ~benutzer/ wählen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16033 +#: doc/guix.texi:16030 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mmap-disable?" #. type: deftypevr -#: doc/guix.texi:16037 +#: doc/guix.texi:16034 msgid "Don't use mmap() at all. This is required if you store indexes to shared file systems (NFS or clustered file system). Defaults to @samp{#f}." -msgstr "" +msgstr "Überhaupt kein mmap() benutzen. Das ist erforderlich, wenn Sie Indizes auf geteilten Dateisystemen speichern (wie NFS oder Cluster-Dateisystemen). Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16039 +#: doc/guix.texi:16036 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck dotlock-use-excl?" #. type: deftypevr -#: doc/guix.texi:16044 +#: doc/guix.texi:16041 msgid "Rely on @samp{O_EXCL} to work when creating dotlock files. NFS supports @samp{O_EXCL} since version 3, so this should be safe to use nowadays by default. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob sich Dovecot darauf verlassen kann, dass @samp{O_EXCL} funktioniert, wenn es Sperrdateien als „Dotlock“ erstellt. NFS unterstützt @samp{O_EXCL} seit Version 3, also sollte es heutzutage kein Problem mehr sein, dies als Voreinstellung zu benutzen. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16046 +#: doc/guix.texi:16043 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-fsync" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-fsync" #. type: deftypevr -#: doc/guix.texi:16048 +#: doc/guix.texi:16045 msgid "When to use fsync() or fdatasync() calls:" -msgstr "" +msgstr "Wann fsync() oder fdatasync() aufgerufen werden soll:" #. type: item -#: doc/guix.texi:16049 +#: doc/guix.texi:16046 #, no-wrap msgid "optimized" -msgstr "" +msgstr "optimized" #. type: table -#: doc/guix.texi:16051 +#: doc/guix.texi:16048 msgid "Whenever necessary to avoid losing important data" -msgstr "" +msgstr "Wann immer es nötig ist, um keine wichtigen Daten zu verlieren" #. type: table -#: doc/guix.texi:16053 +#: doc/guix.texi:16050 msgid "Useful with e.g.@: NFS when write()s are delayed" -msgstr "" +msgstr "Praktisch bei z.B.@: NFS, wenn Schreibzugriffe mit write() verzögert sind" #. type: table -#: doc/guix.texi:16055 +#: doc/guix.texi:16052 msgid "Never use it (best performance, but crashes can lose data)." -msgstr "" +msgstr "Niemals benutzen (ist am schnellsten, aber Abstürze können zu Datenverlusten führen)" #. type: deftypevr -#: doc/guix.texi:16057 +#: doc/guix.texi:16054 msgid "Defaults to @samp{\"optimized\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"optimized\"}." #. type: deftypevr -#: doc/guix.texi:16059 +#: doc/guix.texi:16056 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-nfs-storage?" #. type: deftypevr -#: doc/guix.texi:16064 +#: doc/guix.texi:16061 msgid "Mail storage exists in NFS. Set this to yes to make Dovecot flush NFS caches whenever needed. If you're using only a single mail server this isn't needed. Defaults to @samp{#f}." -msgstr "" +msgstr "Mails werden in NFS gespeichert. Setzen Sie dies auf ja, damit Dovecot NFS-Zwischenspeicher zurückschreiben kann, wann immer es nötig ist. Wenn Sie nur einen einzigen Mail-Server benutzen, brauchen Sie es @emph{nicht}. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16066 +#: doc/guix.texi:16063 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-nfs-index?" #. type: deftypevr -#: doc/guix.texi:16070 +#: doc/guix.texi:16067 msgid "Mail index files also exist in NFS. Setting this to yes requires @samp{mmap-disable? #t} and @samp{fsync-disable? #f}. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob die Index-Dateien für Mails auch in NFS gespeichert sind. Wenn dies auf ja gesetzt ist, muss @samp{mmap-disable? #t} und @samp{fsync-disable? #f} gesetzt sein. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16072 +#: doc/guix.texi:16069 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string lock-method" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette lock-method" #. type: deftypevr -#: doc/guix.texi:16078 +#: doc/guix.texi:16075 msgid "Locking method for index files. Alternatives are fcntl, flock and dotlock. Dotlocking uses some tricks which may create more disk I/O than other locking methods. NFS users: flock doesn't work, remember to change @samp{mmap-disable}. Defaults to @samp{\"fcntl\"}." -msgstr "" +msgstr "Die Sperrmethode für Indexdateien. Die Alternativen sind fcntl, flock und dotlock. Bei Dotlocking werden ein paar Tricks benutzt, die mehr Plattenein- und -ausgaben als andere Sperrmethoden zur Folge haben. Für NFS-Benutzer gilt: flock funktioniert nicht, also denken Sie bitte daran, @samp{mmap-disable} zu ändern. Die Vorgabe ist @samp{\"fcntl\"}." #. type: deftypevr -#: doc/guix.texi:16080 +#: doc/guix.texi:16077 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname mail-temp-dir" #. type: deftypevr -#: doc/guix.texi:16084 +#: doc/guix.texi:16081 msgid "Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. Defaults to @samp{\"/tmp\"}." -msgstr "" +msgstr "Das Verzeichnis, in dem LDA/LMTP zwischenzeitlich eingehende E-Mails >128 kB speichert. Die Vorgabe ist @samp{\"/tmp\"}." #. type: deftypevr -#: doc/guix.texi:16086 +#: doc/guix.texi:16083 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl first-valid-uid" #. type: deftypevr -#: doc/guix.texi:16092 +#: doc/guix.texi:16089 msgid "Valid UID range for users. This is mostly to make sure that users can't log in as daemons or other system users. Note that denying root logins is hardcoded to dovecot binary and can't be done even if @samp{first-valid-uid} is set to 0. Defaults to @samp{500}." -msgstr "" +msgstr "Der Bereich, in dem die Benutzerkennungen („UIDs“) von sich bei Dovecot anmeldenden Benutzern liegen müssen. Das dient hauptsächlich dazu, sicherzustellen, dass sich Anwender nicht mit den Benutzerkonten von Daemons oder sonstigen Systembenutzerkonten anmelden können. Beachten Sie, dass eine Anmeldung als Administrator „root“ grundsätzlich vom Code des Dovecot-Programms verboten wird und selbst dann @emph{nicht} möglich ist, wenn Sie @samp{first-valid-uid} auf 0 setzen. Die Vorgabe ist @samp{500}." #. type: deftypevr -#: doc/guix.texi:16094 +#: doc/guix.texi:16091 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl last-valid-uid" #. type: deftypevr -#: doc/guix.texi:16099 +#: doc/guix.texi:16096 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl first-valid-gid" #. type: deftypevr -#: doc/guix.texi:16104 +#: doc/guix.texi:16101 msgid "Valid GID range for users. Users having non-valid GID as primary group ID aren't allowed to log in. If user belongs to supplementary groups with non-valid GIDs, those groups are not set. Defaults to @samp{1}." -msgstr "" +msgstr "Der Bereich, in dem die Gruppenkennungen („GIDs“) von sich bei Dovecot anmeldenden Benutzern liegen müssen. Benutzerkonten, deren primäre Gruppe keine gültige GID hat, können sich nicht anmelden. Wenn das Benutzerkonto zu zusätzlichen Gruppen mit ungültiger GID gehört, werden diese Gruppen-Berechtigungen von Dovecot wieder abgegeben. Die Vorgabe ist @samp{1}." #. type: deftypevr -#: doc/guix.texi:16106 +#: doc/guix.texi:16103 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl last-valid-gid" #. type: deftypevr -#: doc/guix.texi:16111 +#: doc/guix.texi:16108 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-max-keyword-length" #. type: deftypevr -#: doc/guix.texi:16115 +#: doc/guix.texi:16112 msgid "Maximum allowed length for mail keyword name. It's only forced when trying to create new keywords. Defaults to @samp{50}." -msgstr "" +msgstr "Die maximale zulässige Länge eines Mail-Schlüsselwort-Namens. Sie wirkt sich nur aus, wenn Sie neue Schlüsselwörter anzulegen versuchen. Die Vorgabe ist @samp{50}." #. type: deftypevr -#: doc/guix.texi:16117 +#: doc/guix.texi:16114 #, no-wrap msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Doppelpunktgetrennte-Dateinamen-Liste valid-chroot-dirs" #. type: deftypevr -#: doc/guix.texi:16127 +#: doc/guix.texi:16124 msgid "List of directories under which chrooting is allowed for mail processes (i.e.@: /var/mail will allow chrooting to /var/mail/foo/bar too). This setting doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot settings. If this setting is empty, \"/./\" in home dirs are ignored. WARNING: Never add directories here which local users can modify, that may lead to root exploit. Usually this should be done only if you don't allow shell access for users. . Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Verzeichnisse, in die Mail-Prozesse per „chroot“ das Wurzelverzeichnis wechseln können (d.h.@: für /var/mail wird auch ein chroot nach /var/mail/foo/bar möglich). Diese Einstellung hat keinen Einfluss auf @samp{login-chroot}, @samp{mail-chroot} oder Authentifizierungs-„chroot“-Einstellungen. Wenn diese Einstellung leer gelassen wird, werden chroots per „/./“ in Persönlichen Verzeichnissen ignoriert. @emph{Warnung}: Fügen Sie niemals Verzeichnisse hinzu, die lokale Benutzer verändern können, weil diese dann eventuell über eine Rechteausweitung Administratorrechte an sich reißen können. In der Regel sollte man ein solches Verzeichnis nur eintragen, wenn Nutzer keinen Shell-Zugriff erhalten können. Siehe . Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:16129 +#: doc/guix.texi:16126 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-chroot" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-chroot" #. type: deftypevr -#: doc/guix.texi:16138 +#: doc/guix.texi:16135 msgid "Default chroot directory for mail processes. This can be overridden for specific users in user database by giving /./ in user's home directory (e.g.@: /home/./user chroots into /home). Note that usually there is no real need to do chrooting, Dovecot doesn't allow users to access files outside their mail directory anyway. If your home directories are prefixed with the chroot directory, append \"/.\"@: to @samp{mail-chroot}. . Defaults to @samp{\"\"}." -msgstr "" +msgstr "Das voreingestellte „chroot“-Verzeichnis für Mail-Prozesse. Es kann für einzelne Nutzer in der Benutzerdatenbank außer Kraft gesetzt werden, indem „/./“ als Teil der Angabe zum Persönlichen Verzeichnis des Benutzers verwendet wird (z.B.@: lässt /home/./benutzer das Wurzelverzeichnis per „chroot“ nach /home wechseln). Beachten Sie, dass es in der Regel @emph{nicht} unbedingt notwendig ist, Chrooting zu betreiben, weil Dovecot es Benutzern ohnehin nicht erlaubt, auf Dateien außerhalb ihres Mail-Verzeichnisses zuzugreifen. Wenn Ihren Persönlichen Verzeichnissen das Chroot-Verzeichnis vorangestellt ist, sollten Sie \"/.\"@: an @samp{mail-chroot} anhängen. Siehe . Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16140 +#: doc/guix.texi:16137 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname auth-socket-path" #. type: deftypevr -#: doc/guix.texi:16144 +#: doc/guix.texi:16141 msgid "UNIX socket path to master authentication server to find users. This is used by imap (for shared users) and lda. Defaults to @samp{\"/var/run/dovecot/auth-userdb\"}." -msgstr "" +msgstr "Der UNIX-Socket-Pfad, unter dem der Hauptauthentifizierungsserver zu finden ist, mit dem Nutzer gefunden werden können. Er wird von IMAP (für gemeinsame Benutzerkonten) und von LDA benutzt. Die Vorgabe ist @samp{\"/var/run/dovecot/auth-userdb\"}." #. type: deftypevr -#: doc/guix.texi:16146 +#: doc/guix.texi:16143 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname mail-plugin-dir" #. type: deftypevr -#: doc/guix.texi:16149 +#: doc/guix.texi:16146 msgid "Directory where to look up mail plugins. Defaults to @samp{\"/usr/lib/dovecot\"}." -msgstr "" +msgstr "Das Verzeichnis, in dem Mailplugins zu finden sind. Die Vorgabe ist @samp{\"/usr/lib/dovecot\"}." #. type: deftypevr -#: doc/guix.texi:16151 +#: doc/guix.texi:16148 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mail-plugins" #. type: deftypevr -#: doc/guix.texi:16155 +#: doc/guix.texi:16152 msgid "List of plugins to load for all services. Plugins specific to IMAP, LDA, etc.@: are added to this list in their own .conf files. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Plugins, die für alle Dienste geladen werden sollen. Plugins, die nur für IMAP, LDA, etc.@: gedacht sind, werden in ihren eigenen .conf-Dateien zu dieser Liste hinzugefügt. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:16157 +#: doc/guix.texi:16154 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-cache-min-mail-count" #. type: deftypevr -#: doc/guix.texi:16162 +#: doc/guix.texi:16159 msgid "The minimum number of mails in a mailbox before updates are done to cache file. This allows optimizing Dovecot's behavior to do less disk writes at the cost of more disk reads. Defaults to @samp{0}." -msgstr "" +msgstr "Die kleinste Anzahl an Mails in einem Postfach, bevor Aktualisierungen an der Zwischenspeicherdatei vorgenommen werden. Damit kann das Verhalten von Dovecot optimiert werden, um weniger Schreibzugriffe auf die Platte durchzuführen, wofür allerdings mehr Lesezugriffe notwendig werden. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:16164 +#: doc/guix.texi:16161 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mailbox-idle-check-interval" #. type: deftypevr -#: doc/guix.texi:16171 +#: doc/guix.texi:16168 msgid "When IDLE command is running, mailbox is checked once in a while to see if there are any new mails or other changes. This setting defines the minimum time to wait between those checks. Dovecot can also use dnotify, inotify and kqueue to find out immediately when changes occur. Defaults to @samp{\"30 secs\"}." -msgstr "" +msgstr "Während der IDLE-Befehl läuft, wird ab und zu im Postfach (der „Mailbox“) nachgeschaut, ob es neue Mails oder andere Änderungen gibt. Mit dieser Einstellung wird festgelegt, wie lange zwischen diesen Überprüfungen höchstens gewartet wird. Dovecot kann auch dnotify, inotify und kqueue benutzen, um sofort über Änderungen informiert zu werden. Die Vorgabe ist @samp{\"30 secs\"}." #. type: deftypevr -#: doc/guix.texi:16173 +#: doc/guix.texi:16170 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-save-crlf?" #. type: deftypevr -#: doc/guix.texi:16180 +#: doc/guix.texi:16177 msgid "Save mails with CR+LF instead of plain LF. This makes sending those mails take less CPU, especially with sendfile() syscall with Linux and FreeBSD. But it also creates a bit more disk I/O which may just make it slower. Also note that if other software reads the mboxes/maildirs, they may handle the extra CRs wrong and cause problems. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob Mails mit CR+LF-Kodierung für Zeilenumbrüche statt einfacher LF gespeichert werden sollen. Dadurch wird das Versenden dieser Mails den Prozessor weniger beanspruchen, dies gilt besonders für den Systemaufruf sendfile() unter Linux und FreeBSD. Allerdings werden auch ein bisschen mehr Ein- und Ausgaben auf der Platte notwendig, wodurch es insgesamt langsamer werden könnte. Beachten Sie außerdem, dass andere Software, die die mboxes/maildirs ausliest, mit den CRs falsch umgehen und Probleme verursachen könnte. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16182 +#: doc/guix.texi:16179 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck maildir-stat-dirs?" #. type: deftypevr -#: doc/guix.texi:16190 +#: doc/guix.texi:16187 msgid "By default LIST command returns all entries in maildir beginning with a dot. Enabling this option makes Dovecot return only entries which are directories. This is done by stat()ing each entry, so it causes more disk I/O. (For systems setting struct @samp{dirent->d_type} this check is free and it's done always regardless of this setting). Defaults to @samp{#f}." -msgstr "" +msgstr "Nach Voreinstellung liefert der LIST-Befehl alle Einträge im Mailverzeichnis („Maildir“), die mit einem Punkt beginnen. Wenn diese Option aktiviert wird, liefert Dovecot nur solche Einträge, die für Verzeichnisse stehen. Dazu wird auf jedem Eintrag stat() aufgerufen, wodurch mehr Ein- und Ausgaben auf der Platte anfallen. (Bei Systemen, die einen Struktureintrag @samp{dirent->d_type} machen, ist diese Überprüfung unnötig, daher werden dort nur Verzeichnisse geliefert, egal was hier eingestellt ist.) Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16192 +#: doc/guix.texi:16189 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck maildir-copy-with-hardlinks?" #. type: deftypevr -#: doc/guix.texi:16197 +#: doc/guix.texi:16194 msgid "When copying a message, do it with hard links whenever possible. This makes the performance much better, and it's unlikely to have any side effects. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob zum Kopieren einer Nachricht statt einer Kopie so weit möglich harte Verknüpfungen („Hard Links“) verwendet werden sollen. Dadurch wird das System wesentlich weniger ausgelastet und Nebenwirkungen sind unwahrscheinlich. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16199 +#: doc/guix.texi:16196 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck maildir-very-dirty-syncs?" #. type: deftypevr -#: doc/guix.texi:16204 +#: doc/guix.texi:16201 msgid "Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only when its mtime changes unexpectedly or when we can't find the mail otherwise. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob Dovecot annehmen darf, dass es der einzige MUA ist, der auf Maildir zugreift. Dann wird das cur/-Verzeichnis nur bei unerwarteten Änderungen an seiner mtime durchsucht oder wenn die Mail sonst nicht gefunden werden kann. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16206 +#: doc/guix.texi:16203 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mbox-read-locks" #. type: deftypevr -#: doc/guix.texi:16209 +#: doc/guix.texi:16206 msgid "Which locking methods to use for locking mbox. There are four available:" -msgstr "" +msgstr "Welche Sperrmethoden zum Sperren des mbox-Postfachs (der „Mailbox“) benutzt werden. Es stehen vier Methoden zur Auswahl:" #. type: item -#: doc/guix.texi:16211 +#: doc/guix.texi:16208 #, no-wrap msgid "dotlock" -msgstr "" +msgstr "dotlock" #. type: table -#: doc/guix.texi:16215 +#: doc/guix.texi:16212 msgid "Create .lock file. This is the oldest and most NFS-safe solution. If you want to use /var/mail/ like directory, the users will need write access to that directory." -msgstr "" +msgstr "Hier wird eine Datei namens .lock erzeugt. Es handelt sich um die älteste und am ehesten mit NFS verwendbare Lösung. Wenn Sie ein Verzeichnis wie /var/mail/ benutzen, müssen die Benutzer Schreibzugriff darauf haben." #. type: item -#: doc/guix.texi:16215 +#: doc/guix.texi:16212 #, no-wrap msgid "dotlock-try" -msgstr "" +msgstr "dotlock-try" #. type: table -#: doc/guix.texi:16218 +#: doc/guix.texi:16215 msgid "Same as dotlock, but if it fails because of permissions or because there isn't enough disk space, just skip it." -msgstr "" +msgstr "Genau wie dotlock, aber wenn es mangels Berechtigungen fehlschlägt oder nicht genug Plattenplatz verfügbar ist, wird einfach nicht gesperrt." #. type: item -#: doc/guix.texi:16218 +#: doc/guix.texi:16215 #, no-wrap msgid "fcntl" -msgstr "" +msgstr "fcntl" #. type: table -#: doc/guix.texi:16220 +#: doc/guix.texi:16217 msgid "Use this if possible. Works with NFS too if lockd is used." -msgstr "" +msgstr "Benutzen Sie diese Einstellung wenn möglich. Sie funktioniert auch mit NFS, sofern lockd benutzt wird." #. type: item -#: doc/guix.texi:16220 +#: doc/guix.texi:16217 #, no-wrap msgid "flock" -msgstr "" +msgstr "flock" #. type: table -#: doc/guix.texi:16222 doc/guix.texi:16224 +#: doc/guix.texi:16219 doc/guix.texi:16221 msgid "May not exist in all systems. Doesn't work with NFS." -msgstr "" +msgstr "Existiert vielleicht nicht auf allen Systemen. Funktioniert nicht mit NFS." #. type: item -#: doc/guix.texi:16222 +#: doc/guix.texi:16219 #, no-wrap msgid "lockf" -msgstr "" +msgstr "lockf" #. type: deftypevr -#: doc/guix.texi:16230 +#: doc/guix.texi:16227 msgid "You can use multiple locking methods; if you do the order they're declared in is important to avoid deadlocks if other MTAs/MUAs are using multiple locking methods as well. Some operating systems don't allow using some of them simultaneously." -msgstr "" +msgstr "Sie können mehrere Sperrmethoden angeben; wenn ja, dann ist deren Reihenfolge entscheidend, um Verklemmungen („Deadlocks“) zu vermeiden, wenn andere MTAs/MUAs auch mehrere Sperrmethoden benutzen. Manche Betriebssysteme erlauben es nicht, manche davon gleichzeitig zu benutzen." #. type: deftypevr -#: doc/guix.texi:16232 +#: doc/guix.texi:16229 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mbox-write-locks" #. type: deftypevr -#: doc/guix.texi:16236 +#: doc/guix.texi:16233 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mbox-lock-timeout" #. type: deftypevr -#: doc/guix.texi:16239 +#: doc/guix.texi:16236 msgid "Maximum time to wait for lock (all of them) before aborting. Defaults to @samp{\"5 mins\"}." -msgstr "" +msgstr "Wie lange höchstens auf Sperren (irgendeiner Art) gewartet wird, bevor abgebrochen wird. Die Vorgabe ist @samp{\"5 mins\"}." #. type: deftypevr -#: doc/guix.texi:16241 +#: doc/guix.texi:16238 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mbox-dotlock-change-timeout" #. type: deftypevr -#: doc/guix.texi:16245 +#: doc/guix.texi:16242 msgid "If dotlock exists but the mailbox isn't modified in any way, override the lock file after this much time. Defaults to @samp{\"2 mins\"}." -msgstr "" +msgstr "Wenn eine Dotlock-Sperrdatei existiert, das Postfach (die „Mailbox“) aber auf keine Weise geändert wurde, wird die Sperrdatei nach der hier angegebenen Zeit außer Kraft gesetzt. Die Vorgabe ist @samp{\"2 mins\"}." #. type: deftypevr -#: doc/guix.texi:16247 +#: doc/guix.texi:16244 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mbox-dirty-syncs?" #. type: deftypevr -#: doc/guix.texi:16258 +#: doc/guix.texi:16255 msgid "When mbox changes unexpectedly we have to fully read it to find out what changed. If the mbox is large this can take a long time. Since the change is usually just a newly appended mail, it'd be faster to simply read the new mails. If this setting is enabled, Dovecot does this but still safely fallbacks to re-reading the whole mbox file whenever something in mbox isn't how it's expected to be. The only real downside to this setting is that if some other MUA changes message flags, Dovecot doesn't notice it immediately. Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK commands. Defaults to @samp{#t}." -msgstr "" +msgstr "Wenn sich das mbox-Postfach unerwartet ändert, müssen wir es gänzlich neu einlesen, um herauszufinden, was sich geändert hat. Wenn die mbox groß ist, kann das viel Zeit in Anspruch nehmen. Weil es sich bei der Änderung meistens nur um eine neu angefügte Mail handelt, wäre es schneller, nur die neuen Mails zu lesen. Wenn diese Einstellung hier aktiviert ist, arbeitet Dovecot nach dem eben beschriebenen Prinzip, liest aber doch die ganze mbox-Datei neu ein, sobald es etwas nicht wie erwartet vorfindet. Der einzige wirkliche Nachteil bei dieser Einstellung ist, dass es Dovecot nicht sofort erkennt, wenn ein anderer MUA die Statusindikatoren („Flags“) ändert. Beachten Sie, dass eine komplette Synchronisation bei den Befehlen SELECT, EXAMINE, EXPUNGE und CHECK durchgeführt wird. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16260 +#: doc/guix.texi:16257 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mbox-very-dirty-syncs?" #. type: deftypevr -#: doc/guix.texi:16265 +#: doc/guix.texi:16262 msgid "Like @samp{mbox-dirty-syncs}, but don't do full syncs even with SELECT, EXAMINE, EXPUNGE or CHECK commands. If this is set, @samp{mbox-dirty-syncs} is ignored. Defaults to @samp{#f}." -msgstr "" +msgstr "Wie @samp{mbox-dirty-syncs}, aber ohne dass komplette Synchronisationen selbst bei den Befehlen SELECT, EXAMINE, EXPUNGE oder CHECK durchgeführt werden. Wenn dies hier aktiviert ist, wird @samp{mbox-dirty-syncs} ignoriert. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16267 +#: doc/guix.texi:16264 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mbox-lazy-writes?" #. type: deftypevr -#: doc/guix.texi:16273 +#: doc/guix.texi:16270 msgid "Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK commands and when closing the mailbox). This is especially useful for POP3 where clients often delete all mails. The downside is that our changes aren't immediately visible to other MUAs. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob das Schreiben von mbox-Kopfzeilen hinausgezögert wird, bis eine komplette Schreibsynchronisation durchgeführt wird (bei den Befehlen EXPUNGE und CHECK, und beim Schließen des Postfachs, d.h.@: der „Mailbox“). Das wird besonders nützlich, wenn Clients POP3 verwenden, wo es oft vorkommt, dass die Clients alle Mails löschen. Der Nachteil ist, dass Dovecots Änderungen nicht sofort für andere MUAs sichtbar werden. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16275 +#: doc/guix.texi:16272 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mbox-min-index-size" #. type: deftypevr -#: doc/guix.texi:16280 +#: doc/guix.texi:16277 msgid "If mbox size is smaller than this (e.g.@: 100k), don't write index files. If an index file already exists it's still read, just not updated. Defaults to @samp{0}." -msgstr "" +msgstr "Wenn die Größe des mbox-Postfaches kleiner als die angegebene Größe (z.B.@: 100k) ist, werden keine Index-Dateien geschrieben. Wenn bereits eine Index-Datei existiert, wird sie weiterhin gelesen und nur nicht aktualisiert. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:16282 +#: doc/guix.texi:16279 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mdbox-rotate-size" #. type: deftypevr -#: doc/guix.texi:16285 +#: doc/guix.texi:16282 msgid "Maximum dbox file size until it's rotated. Defaults to @samp{10000000}." -msgstr "" +msgstr "Die maximale Größe der dbox-Datei, bis sie rotiert wird. Die Vorgabe ist @samp{10000000}." #. type: deftypevr -#: doc/guix.texi:16287 +#: doc/guix.texi:16284 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mdbox-rotate-interval" #. type: deftypevr -#: doc/guix.texi:16292 +#: doc/guix.texi:16289 msgid "Maximum dbox file age until it's rotated. Typically in days. Day begins from midnight, so 1d = today, 2d = yesterday, etc. 0 = check disabled. Defaults to @samp{\"1d\"}." -msgstr "" +msgstr "Das maximale Alter der dbox-Datei, bis sie rotiert wird. Typischerweise wird es in Tagen angegeben. Der Tag beginnt um Mitternacht, also steht 1d für heute, 2d für gestern, etc. 0 heißt, die Überprüfung ist abgeschaltet. Die Vorgabe ist @samp{\"1d\"}." #. type: deftypevr -#: doc/guix.texi:16294 +#: doc/guix.texi:16291 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mdbox-preallocate-space?" #. type: deftypevr -#: doc/guix.texi:16299 +#: doc/guix.texi:16296 msgid "When creating new mdbox files, immediately preallocate their size to @samp{mdbox-rotate-size}. This setting currently works only in Linux with some file systems (ext4, xfs). Defaults to @samp{#f}." -msgstr "" +msgstr "Ob beim Erstellen neuer mdbox-Postfachdateien gleich am Anfang eine Datei der Größe @samp{mdbox-rotate-size} vorab angelegt werden soll. Diese Einstellung funktioniert derzeit nur mit Linux auf manchen Dateisystemen (ext4, xfs). Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16301 +#: doc/guix.texi:16298 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-attachment-dir" #. type: deftypevr -#: doc/guix.texi:16305 +#: doc/guix.texi:16302 msgid "sdbox and mdbox support saving mail attachments to external files, which also allows single instance storage for them. Other backends don't support this for now." -msgstr "" +msgstr "Postfächer in den Formaten sdbox und mdbox unterstützen es, Mail-Anhänge in externen Dateien zu speichern, wodurch sie mit Einzelinstanz-Speicherung („Single-Instance Storage“) dedupliziert werden können. Andere Hintergrundsysteme („Backends“) bieten dafür noch keine Unterstützung." #. type: deftypevr -#: doc/guix.texi:16307 +#: doc/guix.texi:16304 msgid "WARNING: This feature hasn't been tested much yet. Use at your own risk." -msgstr "" +msgstr "@emph{Warnung}: Diese Funktionalität wurde noch nicht ausgiebig getestet. Benutzen Sie sie auf eigene Gefahr." #. type: deftypevr -#: doc/guix.texi:16310 +#: doc/guix.texi:16307 msgid "Directory root where to store mail attachments. Disabled, if empty. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Das Wurzelverzeichnis, in dem Mail-Anhänge gespeichert werden. Wenn es leer gelassen wird, ist es deaktiviert. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16312 +#: doc/guix.texi:16309 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-attachment-min-size" #. type: deftypevr -#: doc/guix.texi:16317 +#: doc/guix.texi:16314 msgid "Attachments smaller than this aren't saved externally. It's also possible to write a plugin to disable saving specific attachments externally. Defaults to @samp{128000}." -msgstr "" +msgstr "Anhänge, die kleiner sind als hier angegeben, werden @emph{nicht} extern gespeichert. Es ist auch möglich, ein Plugin zu schreiben, das externes Speichern bestimmter Anhänge deaktiviert. Die Vorgabe ist @samp{128000}." #. type: deftypevr -#: doc/guix.texi:16319 +#: doc/guix.texi:16316 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-attachment-fs" #. type: deftypevr -#: doc/guix.texi:16321 +#: doc/guix.texi:16318 msgid "File system backend to use for saving attachments:" -msgstr "" +msgstr "Ein Dateisystemhintergrundprogramm, mit dem Anhänge gespeichert werden:" #. type: item -#: doc/guix.texi:16322 +#: doc/guix.texi:16319 #, no-wrap msgid "posix" -msgstr "" +msgstr "posix" #. type: table -#: doc/guix.texi:16324 +#: doc/guix.texi:16321 msgid "No SiS done by Dovecot (but this might help FS's own deduplication)" -msgstr "" +msgstr "Dovecot führt keine Einzelinstanzspeicherung durch (aber das Dateisystem kann so leichter selbst deduplizieren)" #. type: item -#: doc/guix.texi:16324 +#: doc/guix.texi:16321 #, no-wrap msgid "sis posix" -msgstr "" +msgstr "sis posix" #. type: table -#: doc/guix.texi:16326 +#: doc/guix.texi:16323 msgid "SiS with immediate byte-by-byte comparison during saving" -msgstr "" +msgstr "Einzelinstanzspeicherung wird durch einen sofortigen Byte-für-Byte-Vergleich beim Speichern umgesetzt" #. type: item -#: doc/guix.texi:16326 +#: doc/guix.texi:16323 #, no-wrap msgid "sis-queue posix" -msgstr "" +msgstr "sis-queue posix" #. type: table -#: doc/guix.texi:16328 +#: doc/guix.texi:16325 msgid "SiS with delayed comparison and deduplication." -msgstr "" +msgstr "Einzelinstanzspeicherung mit verzögertem Vergleich und Deduplizierung." #. type: deftypevr -#: doc/guix.texi:16330 +#: doc/guix.texi:16327 msgid "Defaults to @samp{\"sis posix\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"sis posix\"}." #. type: deftypevr -#: doc/guix.texi:16332 +#: doc/guix.texi:16329 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-attachment-hash" #. type: deftypevr -#: doc/guix.texi:16338 +#: doc/guix.texi:16335 msgid "Hash format to use in attachment filenames. You can add any text and variables: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, @code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}. Variables can be truncated, e.g.@: @code{%@{sha256:80@}} returns only first 80 bits. Defaults to @samp{\"%@{sha1@}\"}." -msgstr "" +msgstr "Welches Hash-Format die Dateinamen von Anhängen bestimmt. Sie können beliebigen Text und Variable beifügen: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, @code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}. Es können auch nur Teile der Variablen benutzt werden, z.B.@: liefert @code{%@{sha256:80@}} nur die ersten 80 Bits. Die Vorgabe ist @samp{\"%@{sha1@}\"}." #. type: deftypevr -#: doc/guix.texi:16340 +#: doc/guix.texi:16337 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl default-process-limit" #. type: deftypevr -#: doc/guix.texi:16345 +#: doc/guix.texi:16342 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl default-client-limit" #. type: deftypevr -#: doc/guix.texi:16348 doc/guix.texi:21613 +#: doc/guix.texi:16345 doc/guix.texi:21610 msgid "Defaults to @samp{1000}." -msgstr "" +msgstr "Die Vorgabe ist @samp{1000}." #. type: deftypevr -#: doc/guix.texi:16350 +#: doc/guix.texi:16347 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl default-vsz-limit" #. type: deftypevr -#: doc/guix.texi:16355 +#: doc/guix.texi:16352 msgid "Default VSZ (virtual memory size) limit for service processes. This is mainly intended to catch and kill processes that leak memory before they eat up everything. Defaults to @samp{256000000}." -msgstr "" +msgstr "Die vorgegebene Beschränkung der VSZ („Virtual Memory Size“, virtuelle Speichergröße) für Dienstprozesse. Dies ist hauptsächlich dafür gedacht, Prozessen, die ein Speicherleck aufweisen, rechtzeitig Einhalt zu gebieten und sie abzuwürgen, bevor sie allen Speicher aufbrauchen. Die Vorgabe ist @samp{256000000}." #. type: deftypevr -#: doc/guix.texi:16357 +#: doc/guix.texi:16354 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string default-login-user" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette default-login-user" #. type: deftypevr -#: doc/guix.texi:16362 +#: doc/guix.texi:16359 msgid "Login user is internally used by login processes. This is the most untrusted user in Dovecot system. It shouldn't have access to anything at all. Defaults to @samp{\"dovenull\"}." -msgstr "" +msgstr "Der Anmeldebenutzer, der intern von Anmeldeprozessen benutzt wird. Der Anmeldebenutzer ist derjenige Benutzer im Dovecot-System, dem am wenigsten Vertrauen zugeschrieben wird. Er sollte auf überhaupt nichts Zugriff haben. Die Vorgabe ist @samp{\"dovenull\"}." #. type: deftypevr -#: doc/guix.texi:16364 +#: doc/guix.texi:16361 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string default-internal-user" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette default-internal-user" #. type: deftypevr -#: doc/guix.texi:16369 +#: doc/guix.texi:16366 msgid "Internal user is used by unprivileged processes. It should be separate from login user, so that login processes can't disturb other processes. Defaults to @samp{\"dovecot\"}." -msgstr "" +msgstr "Der interne Benutzer, der von Prozessen ohne besondere Berechtigungen benutzt wird. Er sollte sich vom Anmeldebenutzer unterscheiden, damit Anmeldeprozesse keine anderen Prozesse stören können. Die Vorgabe ist @samp{\"dovecot\"}." #. type: deftypevr -#: doc/guix.texi:16371 +#: doc/guix.texi:16368 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette ssl?" #. type: deftypevr -#: doc/guix.texi:16374 +#: doc/guix.texi:16371 msgid "SSL/TLS support: yes, no, required. . Defaults to @samp{\"required\"}." -msgstr "" +msgstr "SSL/TLS-Unterstützung: yes für ja, no für nein, oder required, wenn SSL/TLS verpflichtend benutzt werden muss. Siehe . Die Vorgabe ist @samp{\"required\"}." #. type: deftypevr -#: doc/guix.texi:16376 +#: doc/guix.texi:16373 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-cert" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette ssl-cert" #. type: deftypevr -#: doc/guix.texi:16379 +#: doc/guix.texi:16376 msgid "PEM encoded X.509 SSL/TLS certificate (public key). Defaults to @samp{\" was automatically rejected:%n%r\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"Your message to <%t> was automatically rejected:%n%r\"}." #. type: deftypevr -#: doc/guix.texi:16489 +#: doc/guix.texi:16486 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette recipient-delimiter" #. type: deftypevr -#: doc/guix.texi:16493 +#: doc/guix.texi:16490 msgid "Delimiter character between local-part and detail in email address. Defaults to @samp{\"+\"}." -msgstr "" +msgstr "Trennzeichen zwischen dem eigentlichen Lokalteil („local-part“) und Detailangaben in der E-Mail-Adresse. Die Vorgabe ist @samp{\"+\"}." #. type: deftypevr -#: doc/guix.texi:16495 +#: doc/guix.texi:16492 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette lda-original-recipient-header" #. type: deftypevr -#: doc/guix.texi:16501 +#: doc/guix.texi:16498 msgid "Header where the original recipient address (SMTP's RCPT TO: address) is taken from if not available elsewhere. With dovecot-lda -a parameter overrides this. A commonly used header for this is X-Original-To. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Aus welcher Kopfzeile die Adresse des Ursprünglichen Empfängers (SMTPs „RCPT TO:“-Adresse) genommen wird, wenn sie nicht anderweitig eingetragen ist. Wird die Befehlszeilenoption @option{-a} von dovecot-lda angegeben, hat sie Vorrang vor diesem Feld. Oft wird die Kopfzeile X-Original-To hierfür verwendet. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16503 +#: doc/guix.texi:16500 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck lda-mailbox-autocreate?" #. type: deftypevr -#: doc/guix.texi:16507 +#: doc/guix.texi:16504 msgid "Should saving a mail to a nonexistent mailbox automatically create it?. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob ein nicht existierendes Postfach (eine „Mailbox“) automatisch erzeugt werden soll, wenn eine Mail darin abgespeichert wird. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16509 +#: doc/guix.texi:16506 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck lda-mailbox-autosubscribe?" #. type: deftypevr -#: doc/guix.texi:16513 +#: doc/guix.texi:16510 msgid "Should automatically created mailboxes be also automatically subscribed?. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob automatisch erzeugte Postfächer („Mailboxes“) auch automatisch abonniert werden sollen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16515 +#: doc/guix.texi:16512 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl imap-max-line-length" #. type: deftypevr -#: doc/guix.texi:16521 +#: doc/guix.texi:16518 msgid "Maximum IMAP command line length. Some clients generate very long command lines with huge mailboxes, so you may need to raise this if you get \"Too long argument\" or \"IMAP command line too large\" errors often. Defaults to @samp{64000}." -msgstr "" +msgstr "Die maximale Länge einer IMAP-Befehlszeile. Manche Clients erzeugen sehr lange Befehlszeilen bei riesigen Postfächern, daher müssen Sie diesen Wert gegebenenfalls anheben, wenn Sie Fehlermeldungen wie „Too long argument“ oder „IMAP command line too large“ häufig sehen. Die Vorgabe ist @samp{64000}." #. type: deftypevr -#: doc/guix.texi:16523 +#: doc/guix.texi:16520 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-logout-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-logout-format" #. type: deftypevr -#: doc/guix.texi:16525 +#: doc/guix.texi:16522 msgid "IMAP logout format string:" -msgstr "" +msgstr "Formatzeichenkette für das Abmelden bei IMAP:" #. type: item -#: doc/guix.texi:16526 +#: doc/guix.texi:16523 #, no-wrap msgid "%i" -msgstr "" +msgstr "%i" #. type: table -#: doc/guix.texi:16528 +#: doc/guix.texi:16525 msgid "total number of bytes read from client" -msgstr "" +msgstr "Gesamtzahl vom Client empfangener Bytes" #. type: item -#: doc/guix.texi:16528 +#: doc/guix.texi:16525 #, no-wrap msgid "%o" -msgstr "" +msgstr "%o" #. type: table -#: doc/guix.texi:16530 +#: doc/guix.texi:16527 msgid "total number of bytes sent to client." -msgstr "" +msgstr "Gesamtzahl zum Client versandter Bytes" #. type: deftypevr -#: doc/guix.texi:16533 +#: doc/guix.texi:16530 msgid "See @file{doc/wiki/Variables.txt} for a list of all the variables you can use. Defaults to @samp{\"in=%i out=%o deleted=%@{deleted@} expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}\"}." -msgstr "" +msgstr "Siehe @file{doc/wiki/Variables.txt} für eine Liste aller Variablen, die Sie benutzen können. Die Vorgabe ist @samp{\"in=%i out=%o deleted=%@{deleted@} expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}\"}." #. type: deftypevr -#: doc/guix.texi:16535 +#: doc/guix.texi:16532 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-capability" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-capability" #. type: deftypevr -#: doc/guix.texi:16539 +#: doc/guix.texi:16536 msgid "Override the IMAP CAPABILITY response. If the value begins with '+', add the given capabilities on top of the defaults (e.g.@: +XFOO XBAR). Defaults to @samp{\"\"}." -msgstr "" +msgstr "Ersetzt die Antworten auf IMAP-CAPABILITY-Anfragen. Wenn der Wert mit „+“ beginnt, werden die angegebenen Capabilitys zu den voreingestellten hinzugefügt (z.B.@: +XFOO XBAR). Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16541 +#: doc/guix.texi:16538 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-idle-notify-interval" #. type: deftypevr -#: doc/guix.texi:16545 +#: doc/guix.texi:16542 msgid "How long to wait between \"OK Still here\" notifications when client is IDLEing. Defaults to @samp{\"2 mins\"}." -msgstr "" +msgstr "Wie lange zwischen „OK Still here“-Benachrichtigungen gewartet wird, wenn der Client auf IDLE steht. Die Vorgabe ist @samp{\"2 mins\"}." #. type: deftypevr -#: doc/guix.texi:16547 +#: doc/guix.texi:16544 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-id-send" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-id-send" #. type: deftypevr -#: doc/guix.texi:16553 +#: doc/guix.texi:16550 msgid "ID field names and values to send to clients. Using * as the value makes Dovecot use the default value. The following fields have default values currently: name, version, os, os-version, support-url, support-email. Defaults to @samp{\"\"}." -msgstr "" +msgstr "ID-Feldnamen und -werte, die an Clients versandt werden sollen. Wenn * als der Wert angegeben wird, benutzt Dovecot dafür den voreingestellten Wert. Die folgenden Felder verfügen derzeit über voreingestellte Werte: name, version, os, os-version, support-url, support-email. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16555 +#: doc/guix.texi:16552 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-id-log" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-id-log" #. type: deftypevr -#: doc/guix.texi:16558 +#: doc/guix.texi:16555 msgid "ID fields sent by client to log. * means everything. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Welche vom Client übermittelten ID-Felder protokolliert werden. * bedeutet alle. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16560 +#: doc/guix.texi:16557 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste imap-client-workarounds" #. type: deftypevr -#: doc/guix.texi:16562 +#: doc/guix.texi:16559 msgid "Workarounds for various client bugs:" -msgstr "" +msgstr "Maßnahmen, um verschiedene Fehler in Clients zu umgehen:" #. type: item -#: doc/guix.texi:16564 +#: doc/guix.texi:16561 #, no-wrap msgid "delay-newmail" -msgstr "" +msgstr "delay-newmail" #. type: table -#: doc/guix.texi:16571 +#: doc/guix.texi:16568 msgid "Send EXISTS/RECENT new mail notifications only when replying to NOOP and CHECK commands. Some clients ignore them otherwise, for example OSX Mail (' before setting it here, to get a feel for which cipher suites you will get. After setting this option, it is recommend that you inspect your Murmur log to ensure that Murmur is using the cipher suites that you expected it to." msgstr "" #. type: table -#: doc/guix.texi:17417 +#: doc/guix.texi:17414 msgid "Note: Changing this option may impact the backwards compatibility of your Murmur server, and can remove the ability for older Mumble clients to be able to connect to it." msgstr "" #. type: item -#: doc/guix.texi:17418 +#: doc/guix.texi:17415 #, no-wrap msgid "@code{public-registration} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:17420 +#: doc/guix.texi:17417 msgid "Must be a @code{} record or @code{#f}." msgstr "" #. type: table -#: doc/guix.texi:17425 +#: doc/guix.texi:17422 msgid "You can optionally register your server in the public server list that the @code{mumble} client shows on startup. You cannot register your server if you have set a @code{server-password}, or set @code{allow-ping} to @code{#f}." msgstr "" #. type: table -#: doc/guix.texi:17427 +#: doc/guix.texi:17424 msgid "It might take a few hours until it shows up in the public list." msgstr "" #. type: item -#: doc/guix.texi:17428 doc/guix.texi:18859 +#: doc/guix.texi:17425 doc/guix.texi:18856 #, no-wrap msgid "@code{file} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:17430 +#: doc/guix.texi:17427 msgid "Optional alternative override for this configuration." msgstr "" #. type: deftp -#: doc/guix.texi:17433 +#: doc/guix.texi:17430 #, no-wrap msgid "{Data Type} murmur-public-registration-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:17435 +#: doc/guix.texi:17432 msgid "Configuration for public registration of a murmur service." msgstr "" #. type: table -#: doc/guix.texi:17439 +#: doc/guix.texi:17436 msgid "This is a display name for your server. Not to be confused with the hostname." msgstr "" #. type: itemx -#: doc/guix.texi:17440 doc/guix.texi:23820 +#: doc/guix.texi:17437 doc/guix.texi:23817 #, no-wrap msgid "password" msgstr "" #. type: table -#: doc/guix.texi:17443 +#: doc/guix.texi:17440 msgid "A password to identify your registration. Subsequent updates will need the same password. Don't lose your password." msgstr "" #. type: code{#1} -#: doc/guix.texi:17444 +#: doc/guix.texi:17441 #, no-wrap msgid "url" msgstr "" #. type: table -#: doc/guix.texi:17447 +#: doc/guix.texi:17444 msgid "This should be a @code{http://} or @code{https://} link to your web site." msgstr "" #. type: item -#: doc/guix.texi:17448 +#: doc/guix.texi:17445 #, no-wrap msgid "@code{hostname} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:17451 +#: doc/guix.texi:17448 msgid "By default your server will be listed by its IP address. If it is set your server will be linked by this host name instead." msgstr "" #. type: subsubheading -#: doc/guix.texi:17459 +#: doc/guix.texi:17456 #, no-wrap msgid "Tailon Service" msgstr "" #. type: Plain text -#: doc/guix.texi:17463 +#: doc/guix.texi:17460 msgid "@uref{https://tailon.readthedocs.io/, Tailon} is a web application for viewing and searching log files." msgstr "" #. type: Plain text -#: doc/guix.texi:17466 +#: doc/guix.texi:17463 msgid "The following example will configure the service with default values. By default, Tailon can be accessed on port 8080 (@code{http://localhost:8080})." msgstr "" #. type: example -#: doc/guix.texi:17469 +#: doc/guix.texi:17466 #, no-wrap msgid "(service tailon-service-type)\n" msgstr "" #. type: Plain text -#: doc/guix.texi:17473 +#: doc/guix.texi:17470 msgid "The following example customises more of the Tailon configuration, adding @command{sed} to the list of allowed commands." msgstr "" #. type: example -#: doc/guix.texi:17480 +#: doc/guix.texi:17477 #, no-wrap msgid "" "(service tailon-service-type\n" @@ -32646,34 +32700,34 @@ msgid "" msgstr "" #. type: deftp -#: doc/guix.texi:17483 +#: doc/guix.texi:17480 #, no-wrap msgid "{Data Type} tailon-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:17486 +#: doc/guix.texi:17483 msgid "Data type representing the configuration of Tailon. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:17488 +#: doc/guix.texi:17485 #, no-wrap msgid "@code{config-file} (default: @code{(tailon-configuration-file)})" msgstr "" #. type: table -#: doc/guix.texi:17492 +#: doc/guix.texi:17489 msgid "The configuration file to use for Tailon. This can be set to a @dfn{tailon-configuration-file} record value, or any gexp (@pxref{G-Expressions})." msgstr "" #. type: table -#: doc/guix.texi:17495 +#: doc/guix.texi:17492 msgid "For example, to instead use a local file, the @code{local-file} function can be used:" msgstr "" #. type: example -#: doc/guix.texi:17500 +#: doc/guix.texi:17497 #, no-wrap msgid "" "(service tailon-service-type\n" @@ -32682,150 +32736,150 @@ msgid "" msgstr "" #. type: item -#: doc/guix.texi:17502 +#: doc/guix.texi:17499 #, no-wrap msgid "@code{package} (default: @code{tailon})" msgstr "" #. type: table -#: doc/guix.texi:17504 +#: doc/guix.texi:17501 msgid "The tailon package to use." msgstr "" #. type: deftp -#: doc/guix.texi:17508 +#: doc/guix.texi:17505 #, no-wrap msgid "{Data Type} tailon-configuration-file" msgstr "" #. type: deftp -#: doc/guix.texi:17511 +#: doc/guix.texi:17508 msgid "Data type representing the configuration options for Tailon. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:17513 +#: doc/guix.texi:17510 #, no-wrap msgid "@code{files} (default: @code{(list \"/var/log\")})" msgstr "" #. type: table -#: doc/guix.texi:17518 +#: doc/guix.texi:17515 msgid "List of files to display. The list can include strings for a single file or directory, or a list, where the first item is the name of a subsection, and the remaining items are the files or directories in that subsection." msgstr "" #. type: item -#: doc/guix.texi:17519 +#: doc/guix.texi:17516 #, no-wrap msgid "@code{bind} (default: @code{\"localhost:8080\"})" msgstr "" #. type: table -#: doc/guix.texi:17521 +#: doc/guix.texi:17518 msgid "Address and port to which Tailon should bind on." msgstr "" #. type: item -#: doc/guix.texi:17522 +#: doc/guix.texi:17519 #, no-wrap msgid "@code{relative-root} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:17524 +#: doc/guix.texi:17521 msgid "URL path to use for Tailon, set to @code{#f} to not use a path." msgstr "" #. type: item -#: doc/guix.texi:17525 +#: doc/guix.texi:17522 #, no-wrap msgid "@code{allow-transfers?} (default: @code{#t})" msgstr "" #. type: table -#: doc/guix.texi:17527 +#: doc/guix.texi:17524 msgid "Allow downloading the log files in the web interface." msgstr "" #. type: item -#: doc/guix.texi:17528 +#: doc/guix.texi:17525 #, no-wrap msgid "@code{follow-names?} (default: @code{#t})" msgstr "" #. type: table -#: doc/guix.texi:17530 +#: doc/guix.texi:17527 msgid "Allow tailing of not-yet existent files." msgstr "" #. type: item -#: doc/guix.texi:17531 +#: doc/guix.texi:17528 #, no-wrap msgid "@code{tail-lines} (default: @code{200})" msgstr "" #. type: table -#: doc/guix.texi:17533 +#: doc/guix.texi:17530 msgid "Number of lines to read initially from each file." msgstr "" #. type: item -#: doc/guix.texi:17534 +#: doc/guix.texi:17531 #, no-wrap msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})" msgstr "" #. type: table -#: doc/guix.texi:17536 +#: doc/guix.texi:17533 msgid "Commands to allow running. By default, @code{sed} is disabled." msgstr "" #. type: item -#: doc/guix.texi:17537 +#: doc/guix.texi:17534 #, no-wrap msgid "@code{debug?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:17539 +#: doc/guix.texi:17536 msgid "Set @code{debug?} to @code{#t} to show debug messages." msgstr "" #. type: item -#: doc/guix.texi:17540 +#: doc/guix.texi:17537 #, no-wrap msgid "@code{wrap-lines} (default: @code{#t})" msgstr "" #. type: table -#: doc/guix.texi:17544 +#: doc/guix.texi:17541 msgid "Initial line wrapping state in the web interface. Set to @code{#t} to initially wrap lines (the default), or to @code{#f} to initially not wrap lines." msgstr "" #. type: item -#: doc/guix.texi:17545 +#: doc/guix.texi:17542 #, no-wrap msgid "@code{http-auth} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:17549 +#: doc/guix.texi:17546 msgid "HTTP authentication type to use. Set to @code{#f} to disable authentication (the default). Supported values are @code{\"digest\"} or @code{\"basic\"}." msgstr "" #. type: item -#: doc/guix.texi:17550 +#: doc/guix.texi:17547 #, no-wrap msgid "@code{users} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:17555 +#: doc/guix.texi:17552 msgid "If HTTP authentication is enabled (see @code{http-auth}), access will be restricted to the credentials provided here. To configure users, use a list of pairs, where the first element of the pair is the username, and the 2nd element of the pair is the password." msgstr "" #. type: example -#: doc/guix.texi:17561 +#: doc/guix.texi:17558 #, no-wrap msgid "" "(tailon-configuration-file\n" @@ -32835,35 +32889,35 @@ msgid "" msgstr "" #. type: subsubheading -#: doc/guix.texi:17567 +#: doc/guix.texi:17564 #, no-wrap msgid "Darkstat Service" msgstr "" #. type: cindex -#: doc/guix.texi:17568 +#: doc/guix.texi:17565 #, no-wrap msgid "darkstat" msgstr "" #. type: Plain text -#: doc/guix.texi:17571 +#: doc/guix.texi:17568 msgid "Darkstat is a packet sniffer that captures network traffic, calculates statistics about usage, and serves reports over HTTP." msgstr "" #. type: defvar -#: doc/guix.texi:17572 +#: doc/guix.texi:17569 #, no-wrap msgid "{Scheme Variable} darkstat-service-type" msgstr "" #. type: defvar -#: doc/guix.texi:17577 +#: doc/guix.texi:17574 msgid "This is the service type for the @uref{https://unix4lyfe.org/darkstat/, darkstat} service, its value must be a @code{darkstat-configuration} record as in this example:" msgstr "" #. type: example -#: doc/guix.texi:17582 +#: doc/guix.texi:17579 #, no-wrap msgid "" "(service darkstat-service-type\n" @@ -32872,101 +32926,101 @@ msgid "" msgstr "" #. type: deftp -#: doc/guix.texi:17585 +#: doc/guix.texi:17582 #, no-wrap msgid "{Data Type} darkstat-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:17587 +#: doc/guix.texi:17584 msgid "Data type representing the configuration of @command{darkstat}." msgstr "" #. type: item -#: doc/guix.texi:17589 +#: doc/guix.texi:17586 #, no-wrap msgid "@code{package} (default: @code{darkstat})" msgstr "" #. type: table -#: doc/guix.texi:17591 +#: doc/guix.texi:17588 msgid "The darkstat package to use." msgstr "" #. type: code{#1} -#: doc/guix.texi:17592 +#: doc/guix.texi:17589 #, no-wrap msgid "interface" msgstr "" #. type: table -#: doc/guix.texi:17594 +#: doc/guix.texi:17591 msgid "Capture traffic on the specified network interface." msgstr "" #. type: item -#: doc/guix.texi:17595 +#: doc/guix.texi:17592 #, no-wrap msgid "@code{port} (default: @code{\"667\"})" msgstr "" #. type: table -#: doc/guix.texi:17597 +#: doc/guix.texi:17594 msgid "Bind the web interface to the specified port." msgstr "" #. type: item -#: doc/guix.texi:17598 +#: doc/guix.texi:17595 #, no-wrap msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})" msgstr "" #. type: table -#: doc/guix.texi:17600 doc/guix.texi:17638 +#: doc/guix.texi:17597 doc/guix.texi:17635 msgid "Bind the web interface to the specified address." msgstr "" #. type: item -#: doc/guix.texi:17601 +#: doc/guix.texi:17598 #, no-wrap msgid "@code{base} (default: @code{\"/\"})" msgstr "" #. type: table -#: doc/guix.texi:17604 +#: doc/guix.texi:17601 msgid "Specify the path of the base URL. This can be useful if @command{darkstat} is accessed via a reverse proxy." msgstr "" #. type: subsubheading -#: doc/guix.texi:17608 +#: doc/guix.texi:17605 #, no-wrap msgid "Prometheus Node Exporter Service" msgstr "" #. type: cindex -#: doc/guix.texi:17610 +#: doc/guix.texi:17607 #, no-wrap msgid "prometheus-node-exporter" msgstr "" #. type: Plain text -#: doc/guix.texi:17615 +#: doc/guix.texi:17612 msgid "The Prometheus ``node exporter'' makes hardware and operating system statistics provided by the Linux kernel available for the Prometheus monitoring system. This service should be deployed on all physical nodes and virtual machines, where monitoring these statistics is desirable." msgstr "" #. type: defvar -#: doc/guix.texi:17616 +#: doc/guix.texi:17613 #, no-wrap msgid "{Scheme variable} prometheus-node-exporter-service-type" msgstr "" #. type: defvar -#: doc/guix.texi:17621 +#: doc/guix.texi:17618 msgid "This is the service type for the @uref{https://github.com/prometheus/node_exporter/, prometheus-node-exporter} service, its value must be a @code{prometheus-node-exporter-configuration} record as in this example:" msgstr "" #. type: example -#: doc/guix.texi:17626 +#: doc/guix.texi:17623 #, no-wrap msgid "" "(service prometheus-node-exporter-service-type\n" @@ -32975,609 +33029,609 @@ msgid "" msgstr "" #. type: deftp -#: doc/guix.texi:17629 +#: doc/guix.texi:17626 #, no-wrap msgid "{Data Type} prometheus-node-exporter-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:17631 +#: doc/guix.texi:17628 msgid "Data type representing the configuration of @command{node_exporter}." msgstr "Repräsentiert die Konfiguration von @command{node_exporter}." #. type: item -#: doc/guix.texi:17633 +#: doc/guix.texi:17630 #, no-wrap msgid "@code{package} (default: @code{go-github-com-prometheus-node-exporter})" msgstr "@code{package} (Vorgabe: @code{go-github-com-prometheus-node-exporter})" #. type: table -#: doc/guix.texi:17635 +#: doc/guix.texi:17632 msgid "The prometheus-node-exporter package to use." msgstr "Das Paket für den prometheus-node-exporter, was benutzt werden soll." #. type: item -#: doc/guix.texi:17636 +#: doc/guix.texi:17633 #, no-wrap msgid "@code{web-listen-address} (default: @code{\":9100\"})" msgstr "@code{web-listen-address} (Vorgabe: @code{\":9100\"})" #. type: subsubheading -#: doc/guix.texi:17642 +#: doc/guix.texi:17639 #, no-wrap msgid "Zabbix server" msgstr "Zabbix-Server" #. type: cindex -#: doc/guix.texi:17643 +#: doc/guix.texi:17640 #, no-wrap msgid "zabbix zabbix-server" msgstr "" #. type: Plain text -#: doc/guix.texi:17646 +#: doc/guix.texi:17643 msgid "Zabbix provides monitoring metrics, among others network utilization, CPU load and disk space consumption:" msgstr "" #. type: item -#: doc/guix.texi:17648 +#: doc/guix.texi:17645 #, no-wrap msgid "High performance, high capacity (able to monitor hundreds of thousands of devices)." msgstr "" #. type: item -#: doc/guix.texi:17649 +#: doc/guix.texi:17646 #, no-wrap msgid "Auto-discovery of servers and network devices and interfaces." msgstr "" #. type: item -#: doc/guix.texi:17650 +#: doc/guix.texi:17647 #, no-wrap msgid "Low-level discovery, allows to automatically start monitoring new items, file systems or network interfaces among others." msgstr "" #. type: item -#: doc/guix.texi:17651 +#: doc/guix.texi:17648 #, no-wrap msgid "Distributed monitoring with centralized web administration." msgstr "" #. type: item -#: doc/guix.texi:17652 +#: doc/guix.texi:17649 #, no-wrap msgid "Native high performance agents." msgstr "" #. type: item -#: doc/guix.texi:17653 +#: doc/guix.texi:17650 #, no-wrap msgid "SLA, and ITIL KPI metrics on reporting." msgstr "" #. type: item -#: doc/guix.texi:17654 +#: doc/guix.texi:17651 #, no-wrap msgid "High-level (business) view of monitored resources through user-defined visual console screens and dashboards." msgstr "" #. type: item -#: doc/guix.texi:17655 +#: doc/guix.texi:17652 #, no-wrap msgid "Remote command execution through Zabbix proxies." msgstr "" #. type: Plain text -#: doc/guix.texi:17661 +#: doc/guix.texi:17658 msgid "Available @code{zabbix-server-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:17662 +#: doc/guix.texi:17659 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} package zabbix-server" msgstr "" #. type: deftypevr -#: doc/guix.texi:17664 +#: doc/guix.texi:17661 msgid "The zabbix-server package." msgstr "Das zabbix-server-Paket." #. type: deftypevr -#: doc/guix.texi:17667 +#: doc/guix.texi:17664 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string user" msgstr "" #. type: deftypevr -#: doc/guix.texi:17669 +#: doc/guix.texi:17666 msgid "User who will run the Zabbix server." msgstr "" #. type: deftypevr -#: doc/guix.texi:17671 doc/guix.texi:17678 doc/guix.texi:17692 -#: doc/guix.texi:17699 doc/guix.texi:17800 doc/guix.texi:17807 -#: doc/guix.texi:17918 doc/guix.texi:17925 +#: doc/guix.texi:17668 doc/guix.texi:17675 doc/guix.texi:17689 +#: doc/guix.texi:17696 doc/guix.texi:17797 doc/guix.texi:17804 +#: doc/guix.texi:17915 doc/guix.texi:17922 msgid "Defaults to @samp{\"zabbix\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17674 +#: doc/guix.texi:17671 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} group group" msgstr "" #. type: deftypevr -#: doc/guix.texi:17676 +#: doc/guix.texi:17673 msgid "Group who will run the Zabbix server." msgstr "" #. type: deftypevr -#: doc/guix.texi:17681 +#: doc/guix.texi:17678 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-host" msgstr "" #. type: deftypevr -#: doc/guix.texi:17683 doc/guix.texi:17902 +#: doc/guix.texi:17680 doc/guix.texi:17899 msgid "Database host name." msgstr "Rechnername der Datenbank." #. type: deftypevr -#: doc/guix.texi:17685 +#: doc/guix.texi:17682 msgid "Defaults to @samp{\"127.0.0.1\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17688 +#: doc/guix.texi:17685 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-name" msgstr "" #. type: deftypevr -#: doc/guix.texi:17690 doc/guix.texi:17916 +#: doc/guix.texi:17687 doc/guix.texi:17913 msgid "Database name." msgstr "Datenbankname." #. type: deftypevr -#: doc/guix.texi:17695 +#: doc/guix.texi:17692 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-user" msgstr "" #. type: deftypevr -#: doc/guix.texi:17697 doc/guix.texi:17923 +#: doc/guix.texi:17694 doc/guix.texi:17920 msgid "Database user." msgstr "Benutzerkonto der Datenbank." #. type: deftypevr -#: doc/guix.texi:17702 +#: doc/guix.texi:17699 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-password" msgstr "" #. type: deftypevr -#: doc/guix.texi:17705 +#: doc/guix.texi:17702 msgid "Database password. Please, use @code{include-files} with @code{DBPassword=SECRET} inside a specified file instead." msgstr "" #. type: deftypevr -#: doc/guix.texi:17710 +#: doc/guix.texi:17707 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} number db-port" msgstr "" #. type: deftypevr -#: doc/guix.texi:17712 doc/guix.texi:17909 +#: doc/guix.texi:17709 doc/guix.texi:17906 msgid "Database port." msgstr "Datenbank-Portnummer." #. type: deftypevr -#: doc/guix.texi:17714 doc/guix.texi:17911 +#: doc/guix.texi:17711 doc/guix.texi:17908 msgid "Defaults to @samp{5432}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17717 +#: doc/guix.texi:17714 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string log-type" msgstr "" #. type: deftypevr -#: doc/guix.texi:17719 doc/guix.texi:17820 +#: doc/guix.texi:17716 doc/guix.texi:17817 msgid "Specifies where log messages are written to:" msgstr "" #. type: itemize -#: doc/guix.texi:17723 doc/guix.texi:17824 +#: doc/guix.texi:17720 doc/guix.texi:17821 msgid "@code{system} - syslog." msgstr "" #. type: itemize -#: doc/guix.texi:17726 doc/guix.texi:17827 +#: doc/guix.texi:17723 doc/guix.texi:17824 msgid "@code{file} - file specified with @code{log-file} parameter." msgstr "" #. type: itemize -#: doc/guix.texi:17729 doc/guix.texi:17830 +#: doc/guix.texi:17726 doc/guix.texi:17827 msgid "@code{console} - standard output." msgstr "" #. type: deftypevr -#: doc/guix.texi:17736 +#: doc/guix.texi:17733 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string log-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:17738 doc/guix.texi:17839 +#: doc/guix.texi:17735 doc/guix.texi:17836 msgid "Log file name for @code{log-type} @code{file} parameter." msgstr "" #. type: deftypevr -#: doc/guix.texi:17740 +#: doc/guix.texi:17737 msgid "Defaults to @samp{\"/var/log/zabbix/server.log\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17743 +#: doc/guix.texi:17740 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string pid-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:17745 doc/guix.texi:17846 +#: doc/guix.texi:17742 doc/guix.texi:17843 msgid "Name of PID file." msgstr "Name der PID-Datei." #. type: deftypevr -#: doc/guix.texi:17747 +#: doc/guix.texi:17744 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_server.pid\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17750 +#: doc/guix.texi:17747 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string ssl-ca-location" msgstr "" #. type: deftypevr -#: doc/guix.texi:17753 +#: doc/guix.texi:17750 msgid "The location of certificate authority (CA) files for SSL server certificate verification." msgstr "" #. type: deftypevr -#: doc/guix.texi:17755 +#: doc/guix.texi:17752 msgid "Defaults to @samp{\"/etc/ssl/certs/ca-certificates.crt\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17758 +#: doc/guix.texi:17755 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string ssl-cert-location" msgstr "" #. type: deftypevr -#: doc/guix.texi:17760 +#: doc/guix.texi:17757 msgid "Location of SSL client certificates." msgstr "" #. type: deftypevr -#: doc/guix.texi:17762 +#: doc/guix.texi:17759 msgid "Defaults to @samp{\"/etc/ssl/certs\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17765 +#: doc/guix.texi:17762 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string extra-options" msgstr "" #. type: deftypevr -#: doc/guix.texi:17767 doc/guix.texi:17871 +#: doc/guix.texi:17764 doc/guix.texi:17868 msgid "Extra options will be appended to Zabbix server configuration file." msgstr "" #. type: deftypevr -#: doc/guix.texi:17772 +#: doc/guix.texi:17769 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} include-files include-files" msgstr "" #. type: deftypevr -#: doc/guix.texi:17775 doc/guix.texi:17879 +#: doc/guix.texi:17772 doc/guix.texi:17876 msgid "You may include individual files or all files in a directory in the configuration file." msgstr "" #. type: subsubheading -#: doc/guix.texi:17782 +#: doc/guix.texi:17779 #, no-wrap msgid "Zabbix agent" msgstr "" #. type: cindex -#: doc/guix.texi:17783 +#: doc/guix.texi:17780 #, no-wrap msgid "zabbix zabbix-agent" msgstr "" #. type: Plain text -#: doc/guix.texi:17786 +#: doc/guix.texi:17783 msgid "Zabbix agent gathers information for Zabbix server." msgstr "" #. type: Plain text -#: doc/guix.texi:17790 +#: doc/guix.texi:17787 msgid "Available @code{zabbix-agent-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:17791 +#: doc/guix.texi:17788 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} package zabbix-agent" msgstr "" #. type: deftypevr -#: doc/guix.texi:17793 +#: doc/guix.texi:17790 msgid "The zabbix-agent package." msgstr "Das zabbix-agent-Paket." #. type: deftypevr -#: doc/guix.texi:17796 +#: doc/guix.texi:17793 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string user" msgstr "" #. type: deftypevr -#: doc/guix.texi:17798 +#: doc/guix.texi:17795 msgid "User who will run the Zabbix agent." msgstr "" #. type: deftypevr -#: doc/guix.texi:17803 +#: doc/guix.texi:17800 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} group group" msgstr "" #. type: deftypevr -#: doc/guix.texi:17805 +#: doc/guix.texi:17802 msgid "Group who will run the Zabbix agent." msgstr "" #. type: deftypevr -#: doc/guix.texi:17810 +#: doc/guix.texi:17807 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string hostname" msgstr "" #. type: deftypevr -#: doc/guix.texi:17813 +#: doc/guix.texi:17810 msgid "Unique, case sensitive hostname which is required for active checks and must match hostname as configured on the server." msgstr "" #. type: deftypevr -#: doc/guix.texi:17815 +#: doc/guix.texi:17812 msgid "Defaults to @samp{\"Zabbix server\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17818 +#: doc/guix.texi:17815 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string log-type" msgstr "" #. type: deftypevr -#: doc/guix.texi:17837 +#: doc/guix.texi:17834 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string log-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:17841 +#: doc/guix.texi:17838 msgid "Defaults to @samp{\"/var/log/zabbix/agent.log\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17844 +#: doc/guix.texi:17841 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string pid-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:17848 +#: doc/guix.texi:17845 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_agent.pid\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17851 +#: doc/guix.texi:17848 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} list server" msgstr "" #. type: deftypevr -#: doc/guix.texi:17855 +#: doc/guix.texi:17852 msgid "List of IP addresses, optionally in CIDR notation, or hostnames of Zabbix servers and Zabbix proxies. Incoming connections will be accepted only from the hosts listed here." msgstr "" #. type: deftypevr -#: doc/guix.texi:17857 doc/guix.texi:17866 +#: doc/guix.texi:17854 doc/guix.texi:17863 msgid "Defaults to @samp{(\"127.0.0.1\")}." msgstr "" #. type: deftypevr -#: doc/guix.texi:17860 +#: doc/guix.texi:17857 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} list server-active" msgstr "" #. type: deftypevr -#: doc/guix.texi:17864 +#: doc/guix.texi:17861 msgid "List of IP:port (or hostname:port) pairs of Zabbix servers and Zabbix proxies for active checks. If port is not specified, default port is used. If this parameter is not specified, active checks are disabled." msgstr "" #. type: deftypevr -#: doc/guix.texi:17869 +#: doc/guix.texi:17866 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string extra-options" msgstr "" #. type: deftypevr -#: doc/guix.texi:17876 +#: doc/guix.texi:17873 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} include-files include-files" msgstr "" #. type: subsubheading -#: doc/guix.texi:17886 +#: doc/guix.texi:17883 #, no-wrap msgid "Zabbix front-end" msgstr "" #. type: cindex -#: doc/guix.texi:17887 +#: doc/guix.texi:17884 #, no-wrap msgid "zabbix zabbix-front-end" msgstr "" #. type: Plain text -#: doc/guix.texi:17890 +#: doc/guix.texi:17887 msgid "This service provides a WEB interface to Zabbix server." msgstr "" #. type: Plain text -#: doc/guix.texi:17894 +#: doc/guix.texi:17891 msgid "Available @code{zabbix-front-end-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:17895 +#: doc/guix.texi:17892 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} nginx-server-configuration-list nginx" msgstr "" #. type: deftypevr -#: doc/guix.texi:17897 doc/guix.texi:22299 +#: doc/guix.texi:17894 doc/guix.texi:22296 msgid "NGINX configuration." msgstr "" #. type: deftypevr -#: doc/guix.texi:17900 +#: doc/guix.texi:17897 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-host" msgstr "" #. type: deftypevr -#: doc/guix.texi:17907 +#: doc/guix.texi:17904 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} number db-port" msgstr "" #. type: deftypevr -#: doc/guix.texi:17914 +#: doc/guix.texi:17911 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-name" msgstr "" #. type: deftypevr -#: doc/guix.texi:17921 +#: doc/guix.texi:17918 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-user" msgstr "" #. type: deftypevr -#: doc/guix.texi:17928 +#: doc/guix.texi:17925 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-password" msgstr "" #. type: deftypevr -#: doc/guix.texi:17930 +#: doc/guix.texi:17927 msgid "Database password. Please, use @code{db-secret-file} instead." msgstr "" #. type: deftypevr -#: doc/guix.texi:17935 +#: doc/guix.texi:17932 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-secret-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:17939 +#: doc/guix.texi:17936 msgid "Secret file which will be appended to @file{zabbix.conf.php} file. This file contains credentials for use by Zabbix front-end. You are expected to create it manually." msgstr "" #. type: deftypevr -#: doc/guix.texi:17944 +#: doc/guix.texi:17941 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string zabbix-host" msgstr "" #. type: deftypevr -#: doc/guix.texi:17946 +#: doc/guix.texi:17943 msgid "Zabbix server hostname." msgstr "" #. type: deftypevr -#: doc/guix.texi:17951 +#: doc/guix.texi:17948 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} number zabbix-port" msgstr "" #. type: deftypevr -#: doc/guix.texi:17953 +#: doc/guix.texi:17950 msgid "Zabbix server port." msgstr "" #. type: deftypevr -#: doc/guix.texi:17955 +#: doc/guix.texi:17952 msgid "Defaults to @samp{10051}." msgstr "" #. type: cindex -#: doc/guix.texi:17963 +#: doc/guix.texi:17960 #, no-wrap msgid "Kerberos" msgstr "" #. type: Plain text -#: doc/guix.texi:17967 +#: doc/guix.texi:17964 msgid "The @code{(gnu services kerberos)} module provides services relating to the authentication protocol @dfn{Kerberos}." msgstr "" #. type: subsubheading -#: doc/guix.texi:17968 +#: doc/guix.texi:17965 #, no-wrap msgid "Krb5 Service" msgstr "" #. type: Plain text -#: doc/guix.texi:17975 +#: doc/guix.texi:17972 msgid "Programs using a Kerberos client library normally expect a configuration file in @file{/etc/krb5.conf}. This service generates such a file from a definition provided in the operating system declaration. It does not cause any daemon to be started." msgstr "" #. type: Plain text -#: doc/guix.texi:17979 +#: doc/guix.texi:17976 msgid "No ``keytab'' files are provided by this service---you must explicitly create them. This service is known to work with the MIT client library, @code{mit-krb5}. Other implementations have not been tested." msgstr "" #. type: defvr -#: doc/guix.texi:17980 +#: doc/guix.texi:17977 #, no-wrap msgid "{Scheme Variable} krb5-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:17982 +#: doc/guix.texi:17979 msgid "A service type for Kerberos 5 clients." msgstr "" #. type: Plain text -#: doc/guix.texi:17986 +#: doc/guix.texi:17983 msgid "Here is an example of its use:" msgstr "" #. type: lisp -#: doc/guix.texi:18000 +#: doc/guix.texi:17997 #, no-wrap msgid "" "(service krb5-service-type\n" @@ -33596,206 +33650,206 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:18004 +#: doc/guix.texi:18001 msgid "This example provides a Kerberos@tie{}5 client configuration which:" msgstr "" #. type: item -#: doc/guix.texi:18005 +#: doc/guix.texi:18002 #, no-wrap msgid "Recognizes two realms, @i{viz:} ``EXAMPLE.COM'' and ``ARGRX.EDU'', both" msgstr "" #. type: itemize -#: doc/guix.texi:18007 +#: doc/guix.texi:18004 msgid "of which have distinct administration servers and key distribution centers;" msgstr "" #. type: item -#: doc/guix.texi:18007 +#: doc/guix.texi:18004 #, no-wrap msgid "Will default to the realm ``EXAMPLE.COM'' if the realm is not explicitly" msgstr "" #. type: itemize -#: doc/guix.texi:18009 +#: doc/guix.texi:18006 msgid "specified by clients;" msgstr "" #. type: item -#: doc/guix.texi:18009 +#: doc/guix.texi:18006 #, no-wrap msgid "Accepts services which only support encryption types known to be weak." msgstr "" #. type: Plain text -#: doc/guix.texi:18017 +#: doc/guix.texi:18014 msgid "The @code{krb5-realm} and @code{krb5-configuration} types have many fields. Only the most commonly used ones are described here. For a full list, and more detailed explanation of each, see the MIT @uref{https://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} documentation." msgstr "" #. type: deftp -#: doc/guix.texi:18019 +#: doc/guix.texi:18016 #, no-wrap msgid "{Data Type} krb5-realm" msgstr "" #. type: cindex -#: doc/guix.texi:18020 +#: doc/guix.texi:18017 #, no-wrap msgid "realm, kerberos" msgstr "" #. type: table -#: doc/guix.texi:18026 +#: doc/guix.texi:18023 msgid "This field is a string identifying the name of the realm. A common convention is to use the fully qualified DNS name of your organization, converted to upper case." msgstr "" #. type: code{#1} -#: doc/guix.texi:18027 +#: doc/guix.texi:18024 #, no-wrap msgid "admin-server" msgstr "" #. type: table -#: doc/guix.texi:18030 +#: doc/guix.texi:18027 msgid "This field is a string identifying the host where the administration server is running." msgstr "" #. type: code{#1} -#: doc/guix.texi:18031 +#: doc/guix.texi:18028 #, no-wrap msgid "kdc" msgstr "" #. type: table -#: doc/guix.texi:18034 +#: doc/guix.texi:18031 msgid "This field is a string identifying the key distribution center for the realm." msgstr "" #. type: deftp -#: doc/guix.texi:18037 +#: doc/guix.texi:18034 #, no-wrap msgid "{Data Type} krb5-configuration" msgstr "" #. type: item -#: doc/guix.texi:18040 +#: doc/guix.texi:18037 #, no-wrap msgid "@code{allow-weak-crypto?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:18043 +#: doc/guix.texi:18040 msgid "If this flag is @code{#t} then services which only offer encryption algorithms known to be weak will be accepted." msgstr "" #. type: item -#: doc/guix.texi:18044 +#: doc/guix.texi:18041 #, no-wrap msgid "@code{default-realm} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:18051 +#: doc/guix.texi:18048 msgid "This field should be a string identifying the default Kerberos realm for the client. You should set this field to the name of your Kerberos realm. If this value is @code{#f} then a realm must be specified with every Kerberos principal when invoking programs such as @command{kinit}." msgstr "" #. type: code{#1} -#: doc/guix.texi:18052 +#: doc/guix.texi:18049 #, no-wrap msgid "realms" msgstr "" #. type: table -#: doc/guix.texi:18057 +#: doc/guix.texi:18054 msgid "This should be a non-empty list of @code{krb5-realm} objects, which clients may access. Normally, one of them will have a @code{name} field matching the @code{default-realm} field." msgstr "" #. type: subsubheading -#: doc/guix.texi:18061 +#: doc/guix.texi:18058 #, no-wrap msgid "PAM krb5 Service" msgstr "" #. type: cindex -#: doc/guix.texi:18062 +#: doc/guix.texi:18059 #, no-wrap msgid "pam-krb5" msgstr "" #. type: Plain text -#: doc/guix.texi:18068 +#: doc/guix.texi:18065 msgid "The @code{pam-krb5} service allows for login authentication and password management via Kerberos. You will need this service if you want PAM enabled applications to authenticate users using Kerberos." msgstr "" #. type: defvr -#: doc/guix.texi:18069 +#: doc/guix.texi:18066 #, no-wrap msgid "{Scheme Variable} pam-krb5-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:18071 +#: doc/guix.texi:18068 msgid "A service type for the Kerberos 5 PAM module." msgstr "" #. type: deftp -#: doc/guix.texi:18073 +#: doc/guix.texi:18070 #, no-wrap msgid "{Data Type} pam-krb5-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:18076 +#: doc/guix.texi:18073 msgid "Data type representing the configuration of the Kerberos 5 PAM module. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration eines PAM-Moduls für Kerberos 5 repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:18077 +#: doc/guix.texi:18074 #, no-wrap msgid "@code{pam-krb5} (default: @code{pam-krb5})" msgstr "" #. type: table -#: doc/guix.texi:18079 +#: doc/guix.texi:18076 msgid "The pam-krb5 package to use." msgstr "" #. type: item -#: doc/guix.texi:18080 +#: doc/guix.texi:18077 #, no-wrap msgid "@code{minimum-uid} (default: @code{1000})" msgstr "" #. type: table -#: doc/guix.texi:18083 +#: doc/guix.texi:18080 msgid "The smallest user ID for which Kerberos authentications should be attempted. Local accounts with lower values will silently fail to authenticate." msgstr "" #. type: cindex -#: doc/guix.texi:18089 +#: doc/guix.texi:18086 #, no-wrap msgid "LDAP" msgstr "" #. type: cindex -#: doc/guix.texi:18090 +#: doc/guix.texi:18087 #, no-wrap msgid "nslcd, LDAP service" msgstr "" #. type: Plain text -#: doc/guix.texi:18097 +#: doc/guix.texi:18094 msgid "The @code{(gnu services authentication)} module provides the @code{nslcd-service-type}, which can be used to authenticate against an LDAP server. In addition to configuring the service itself, you may want to add @code{ldap} as a name service to the Name Service Switch. @xref{Name Service Switch} for detailed information." msgstr "" #. type: Plain text -#: doc/guix.texi:18101 +#: doc/guix.texi:18098 msgid "Here is a simple operating system declaration with a default configuration of the @code{nslcd-service-type} and a Name Service Switch configuration that consults the @code{ldap} name service last:" msgstr "" #. type: example -#: doc/guix.texi:18124 +#: doc/guix.texi:18121 #, no-wrap msgid "" "(use-service-modules authentication)\n" @@ -33822,671 +33876,671 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:18129 +#: doc/guix.texi:18126 msgid "Available @code{nslcd-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:18130 +#: doc/guix.texi:18127 #, no-wrap msgid "{@code{nslcd-configuration} parameter} package nss-pam-ldapd" msgstr "" #. type: deftypevr -#: doc/guix.texi:18132 +#: doc/guix.texi:18129 msgid "The @code{nss-pam-ldapd} package to use." msgstr "Das @code{nss-pam-ldapd}-Paket, was benutzt werden soll." #. type: deftypevr -#: doc/guix.texi:18135 +#: doc/guix.texi:18132 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number threads" msgstr "" #. type: deftypevr -#: doc/guix.texi:18139 +#: doc/guix.texi:18136 msgid "The number of threads to start that can handle requests and perform LDAP queries. Each thread opens a separate connection to the LDAP server. The default is to start 5 threads." msgstr "" #. type: deftypevr -#: doc/guix.texi:18141 doc/guix.texi:18183 doc/guix.texi:18191 -#: doc/guix.texi:18199 doc/guix.texi:18207 doc/guix.texi:18216 -#: doc/guix.texi:18224 doc/guix.texi:18231 doc/guix.texi:18239 -#: doc/guix.texi:18247 doc/guix.texi:18257 doc/guix.texi:18264 -#: doc/guix.texi:18288 doc/guix.texi:18296 doc/guix.texi:18322 -#: doc/guix.texi:18331 doc/guix.texi:18340 doc/guix.texi:18349 -#: doc/guix.texi:18358 doc/guix.texi:18367 doc/guix.texi:18375 -#: doc/guix.texi:18383 doc/guix.texi:18390 doc/guix.texi:18398 -#: doc/guix.texi:18405 doc/guix.texi:18413 doc/guix.texi:18421 -#: doc/guix.texi:18430 doc/guix.texi:18439 doc/guix.texi:18447 -#: doc/guix.texi:18455 doc/guix.texi:18463 doc/guix.texi:18474 -#: doc/guix.texi:18484 doc/guix.texi:18495 doc/guix.texi:18504 -#: doc/guix.texi:18514 doc/guix.texi:18522 doc/guix.texi:18533 -#: doc/guix.texi:18542 doc/guix.texi:18552 doc/guix.texi:20842 -#: doc/guix.texi:20849 doc/guix.texi:20856 doc/guix.texi:20863 -#: doc/guix.texi:20870 doc/guix.texi:20877 doc/guix.texi:20885 -#: doc/guix.texi:20893 doc/guix.texi:20900 doc/guix.texi:20907 -#: doc/guix.texi:20914 doc/guix.texi:20921 doc/guix.texi:20951 -#: doc/guix.texi:20989 doc/guix.texi:20996 doc/guix.texi:21005 -#: doc/guix.texi:21027 doc/guix.texi:21035 doc/guix.texi:21042 -#: doc/guix.texi:21197 doc/guix.texi:21217 doc/guix.texi:21232 -#: doc/guix.texi:21239 doc/guix.texi:23037 doc/guix.texi:23045 -#: doc/guix.texi:23053 doc/guix.texi:23061 doc/guix.texi:23069 -#: doc/guix.texi:23077 +#: doc/guix.texi:18138 doc/guix.texi:18180 doc/guix.texi:18188 +#: doc/guix.texi:18196 doc/guix.texi:18204 doc/guix.texi:18213 +#: doc/guix.texi:18221 doc/guix.texi:18228 doc/guix.texi:18236 +#: doc/guix.texi:18244 doc/guix.texi:18254 doc/guix.texi:18261 +#: doc/guix.texi:18285 doc/guix.texi:18293 doc/guix.texi:18319 +#: doc/guix.texi:18328 doc/guix.texi:18337 doc/guix.texi:18346 +#: doc/guix.texi:18355 doc/guix.texi:18364 doc/guix.texi:18372 +#: doc/guix.texi:18380 doc/guix.texi:18387 doc/guix.texi:18395 +#: doc/guix.texi:18402 doc/guix.texi:18410 doc/guix.texi:18418 +#: doc/guix.texi:18427 doc/guix.texi:18436 doc/guix.texi:18444 +#: doc/guix.texi:18452 doc/guix.texi:18460 doc/guix.texi:18471 +#: doc/guix.texi:18481 doc/guix.texi:18492 doc/guix.texi:18501 +#: doc/guix.texi:18511 doc/guix.texi:18519 doc/guix.texi:18530 +#: doc/guix.texi:18539 doc/guix.texi:18549 doc/guix.texi:20839 +#: doc/guix.texi:20846 doc/guix.texi:20853 doc/guix.texi:20860 +#: doc/guix.texi:20867 doc/guix.texi:20874 doc/guix.texi:20882 +#: doc/guix.texi:20890 doc/guix.texi:20897 doc/guix.texi:20904 +#: doc/guix.texi:20911 doc/guix.texi:20918 doc/guix.texi:20948 +#: doc/guix.texi:20986 doc/guix.texi:20993 doc/guix.texi:21002 +#: doc/guix.texi:21024 doc/guix.texi:21032 doc/guix.texi:21039 +#: doc/guix.texi:21194 doc/guix.texi:21214 doc/guix.texi:21229 +#: doc/guix.texi:21236 doc/guix.texi:23034 doc/guix.texi:23042 +#: doc/guix.texi:23050 doc/guix.texi:23058 doc/guix.texi:23066 +#: doc/guix.texi:23074 msgid "Defaults to @samp{disabled}." msgstr "Der Vorgabewert ist @samp{disabled} (d.h.@: deaktiviert)." #. type: deftypevr -#: doc/guix.texi:18144 +#: doc/guix.texi:18141 #, no-wrap msgid "{@code{nslcd-configuration} parameter} string uid" msgstr "" #. type: deftypevr -#: doc/guix.texi:18146 +#: doc/guix.texi:18143 msgid "This specifies the user id with which the daemon should be run." msgstr "" #. type: deftypevr -#: doc/guix.texi:18148 doc/guix.texi:18155 +#: doc/guix.texi:18145 doc/guix.texi:18152 msgid "Defaults to @samp{\"nslcd\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:18151 +#: doc/guix.texi:18148 #, no-wrap msgid "{@code{nslcd-configuration} parameter} string gid" msgstr "" #. type: deftypevr -#: doc/guix.texi:18153 +#: doc/guix.texi:18150 msgid "This specifies the group id with which the daemon should be run." msgstr "" #. type: deftypevr -#: doc/guix.texi:18158 +#: doc/guix.texi:18155 #, no-wrap msgid "{@code{nslcd-configuration} parameter} log-option log" msgstr "" #. type: deftypevr -#: doc/guix.texi:18165 +#: doc/guix.texi:18162 msgid "This option controls the way logging is done via a list containing SCHEME and LEVEL. The SCHEME argument may either be the symbols \"none\" or \"syslog\", or an absolute file name. The LEVEL argument is optional and specifies the log level. The log level may be one of the following symbols: \"crit\", \"error\", \"warning\", \"notice\", \"info\" or \"debug\". All messages with the specified log level or higher are logged." msgstr "" #. type: deftypevr -#: doc/guix.texi:18167 +#: doc/guix.texi:18164 msgid "Defaults to @samp{(\"/var/log/nslcd\" info)}." msgstr "" #. type: deftypevr -#: doc/guix.texi:18170 +#: doc/guix.texi:18167 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list uri" msgstr "" #. type: deftypevr -#: doc/guix.texi:18173 +#: doc/guix.texi:18170 msgid "The list of LDAP server URIs. Normally, only the first server will be used with the following servers as fall-back." msgstr "" #. type: deftypevr -#: doc/guix.texi:18175 +#: doc/guix.texi:18172 msgid "Defaults to @samp{(\"ldap://localhost:389/\")}." msgstr "" #. type: deftypevr -#: doc/guix.texi:18178 +#: doc/guix.texi:18175 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string ldap-version" msgstr "" #. type: deftypevr -#: doc/guix.texi:18181 +#: doc/guix.texi:18178 msgid "The version of the LDAP protocol to use. The default is to use the maximum version supported by the LDAP library." msgstr "" #. type: deftypevr -#: doc/guix.texi:18186 +#: doc/guix.texi:18183 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string binddn" msgstr "" #. type: deftypevr -#: doc/guix.texi:18189 +#: doc/guix.texi:18186 msgid "Specifies the distinguished name with which to bind to the directory server for lookups. The default is to bind anonymously." msgstr "" #. type: deftypevr -#: doc/guix.texi:18194 +#: doc/guix.texi:18191 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string bindpw" msgstr "" #. type: deftypevr -#: doc/guix.texi:18197 +#: doc/guix.texi:18194 msgid "Specifies the credentials with which to bind. This option is only applicable when used with binddn." msgstr "" #. type: deftypevr -#: doc/guix.texi:18202 +#: doc/guix.texi:18199 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmoddn" msgstr "" #. type: deftypevr -#: doc/guix.texi:18205 +#: doc/guix.texi:18202 msgid "Specifies the distinguished name to use when the root user tries to modify a user's password using the PAM module." msgstr "" #. type: deftypevr -#: doc/guix.texi:18210 +#: doc/guix.texi:18207 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmodpw" msgstr "" #. type: deftypevr -#: doc/guix.texi:18214 +#: doc/guix.texi:18211 msgid "Specifies the credentials with which to bind if the root user tries to change a user's password. This option is only applicable when used with rootpwmoddn" msgstr "" #. type: deftypevr -#: doc/guix.texi:18219 +#: doc/guix.texi:18216 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-mech" msgstr "" #. type: deftypevr -#: doc/guix.texi:18222 +#: doc/guix.texi:18219 msgid "Specifies the SASL mechanism to be used when performing SASL authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18227 +#: doc/guix.texi:18224 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-realm" msgstr "" #. type: deftypevr -#: doc/guix.texi:18229 +#: doc/guix.texi:18226 msgid "Specifies the SASL realm to be used when performing SASL authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18234 +#: doc/guix.texi:18231 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authcid" msgstr "" #. type: deftypevr -#: doc/guix.texi:18237 +#: doc/guix.texi:18234 msgid "Specifies the authentication identity to be used when performing SASL authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18242 +#: doc/guix.texi:18239 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authzid" msgstr "" #. type: deftypevr -#: doc/guix.texi:18245 +#: doc/guix.texi:18242 msgid "Specifies the authorization identity to be used when performing SASL authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18250 +#: doc/guix.texi:18247 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean sasl-canonicalize?" msgstr "" #. type: deftypevr -#: doc/guix.texi:18255 +#: doc/guix.texi:18252 msgid "Determines whether the LDAP server host name should be canonicalised. If this is enabled the LDAP library will do a reverse host name lookup. By default, it is left up to the LDAP library whether this check is performed or not." msgstr "" #. type: deftypevr -#: doc/guix.texi:18260 +#: doc/guix.texi:18257 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string krb5-ccname" msgstr "" #. type: deftypevr -#: doc/guix.texi:18262 +#: doc/guix.texi:18259 msgid "Set the name for the GSS-API Kerberos credentials cache." msgstr "" #. type: deftypevr -#: doc/guix.texi:18267 +#: doc/guix.texi:18264 #, no-wrap msgid "{@code{nslcd-configuration} parameter} string base" msgstr "" #. type: deftypevr -#: doc/guix.texi:18269 +#: doc/guix.texi:18266 msgid "The directory search base." msgstr "Basis für die Verzeichnissuche." #. type: deftypevr -#: doc/guix.texi:18271 +#: doc/guix.texi:18268 msgid "Defaults to @samp{\"dc=example,dc=com\"}." msgstr "Vorgegeben ist @samp{\"dc=example,dc=com\"}." #. type: deftypevr -#: doc/guix.texi:18274 +#: doc/guix.texi:18271 #, no-wrap msgid "{@code{nslcd-configuration} parameter} scope-option scope" msgstr "" #. type: deftypevr -#: doc/guix.texi:18278 +#: doc/guix.texi:18275 msgid "Specifies the search scope (subtree, onelevel, base or children). The default scope is subtree; base scope is almost never useful for name service lookups; children scope is not supported on all servers." msgstr "" #. type: deftypevr -#: doc/guix.texi:18280 +#: doc/guix.texi:18277 msgid "Defaults to @samp{(subtree)}." msgstr "" #. type: deftypevr -#: doc/guix.texi:18283 +#: doc/guix.texi:18280 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-deref-option deref" msgstr "" #. type: deftypevr -#: doc/guix.texi:18286 +#: doc/guix.texi:18283 msgid "Specifies the policy for dereferencing aliases. The default policy is to never dereference aliases." msgstr "" #. type: deftypevr -#: doc/guix.texi:18291 +#: doc/guix.texi:18288 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean referrals" msgstr "" #. type: deftypevr -#: doc/guix.texi:18294 +#: doc/guix.texi:18291 msgid "Specifies whether automatic referral chasing should be enabled. The default behaviour is to chase referrals." msgstr "" #. type: deftypevr -#: doc/guix.texi:18299 +#: doc/guix.texi:18296 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list-of-map-entries maps" msgstr "" #. type: deftypevr -#: doc/guix.texi:18304 +#: doc/guix.texi:18301 msgid "This option allows for custom attributes to be looked up instead of the default RFC 2307 attributes. It is a list of maps, each consisting of the name of a map, the RFC 2307 attribute to match and the query expression for the attribute as it is available in the directory." msgstr "" #. type: deftypevr -#: doc/guix.texi:18309 +#: doc/guix.texi:18306 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list-of-filter-entries filters" msgstr "" #. type: deftypevr -#: doc/guix.texi:18312 +#: doc/guix.texi:18309 msgid "A list of filters consisting of the name of a map to which the filter applies and an LDAP search filter expression." msgstr "" #. type: deftypevr -#: doc/guix.texi:18317 +#: doc/guix.texi:18314 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number bind-timelimit" msgstr "" #. type: deftypevr -#: doc/guix.texi:18320 +#: doc/guix.texi:18317 msgid "Specifies the time limit in seconds to use when connecting to the directory server. The default value is 10 seconds." msgstr "" #. type: deftypevr -#: doc/guix.texi:18325 +#: doc/guix.texi:18322 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number timelimit" msgstr "" #. type: deftypevr -#: doc/guix.texi:18329 +#: doc/guix.texi:18326 msgid "Specifies the time limit (in seconds) to wait for a response from the LDAP server. A value of zero, which is the default, is to wait indefinitely for searches to be completed." msgstr "" #. type: deftypevr -#: doc/guix.texi:18334 +#: doc/guix.texi:18331 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number idle-timelimit" msgstr "" #. type: deftypevr -#: doc/guix.texi:18338 +#: doc/guix.texi:18335 msgid "Specifies the period if inactivity (in seconds) after which the con‐ nection to the LDAP server will be closed. The default is not to time out connections." msgstr "" #. type: deftypevr -#: doc/guix.texi:18343 +#: doc/guix.texi:18340 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-sleeptime" msgstr "" #. type: deftypevr -#: doc/guix.texi:18347 +#: doc/guix.texi:18344 msgid "Specifies the number of seconds to sleep when connecting to all LDAP servers fails. By default one second is waited between the first failure and the first retry." msgstr "" #. type: deftypevr -#: doc/guix.texi:18352 +#: doc/guix.texi:18349 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-retrytime" msgstr "" #. type: deftypevr -#: doc/guix.texi:18356 +#: doc/guix.texi:18353 msgid "Specifies the time after which the LDAP server is considered to be permanently unavailable. Once this time is reached retries will be done only once per this time period. The default value is 10 seconds." msgstr "" #. type: deftypevr -#: doc/guix.texi:18361 +#: doc/guix.texi:18358 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-ssl-option ssl" msgstr "" #. type: deftypevr -#: doc/guix.texi:18365 +#: doc/guix.texi:18362 msgid "Specifies whether to use SSL/TLS or not (the default is not to). If 'start-tls is specified then StartTLS is used rather than raw LDAP over SSL." msgstr "" #. type: deftypevr -#: doc/guix.texi:18370 +#: doc/guix.texi:18367 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-tls-reqcert-option tls-reqcert" msgstr "" #. type: deftypevr -#: doc/guix.texi:18373 +#: doc/guix.texi:18370 msgid "Specifies what checks to perform on a server-supplied certificate. The meaning of the values is described in the ldap.conf(5) manual page." msgstr "" #. type: deftypevr -#: doc/guix.texi:18378 +#: doc/guix.texi:18375 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertdir" msgstr "" #. type: deftypevr -#: doc/guix.texi:18381 +#: doc/guix.texi:18378 msgid "Specifies the directory containing X.509 certificates for peer authen‐ tication. This parameter is ignored when using GnuTLS." msgstr "" #. type: deftypevr -#: doc/guix.texi:18386 +#: doc/guix.texi:18383 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertfile" msgstr "" #. type: deftypevr -#: doc/guix.texi:18388 +#: doc/guix.texi:18385 msgid "Specifies the path to the X.509 certificate for peer authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18393 +#: doc/guix.texi:18390 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-randfile" msgstr "" #. type: deftypevr -#: doc/guix.texi:18396 +#: doc/guix.texi:18393 msgid "Specifies the path to an entropy source. This parameter is ignored when using GnuTLS." msgstr "" #. type: deftypevr -#: doc/guix.texi:18401 +#: doc/guix.texi:18398 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-ciphers" msgstr "" #. type: deftypevr -#: doc/guix.texi:18403 +#: doc/guix.texi:18400 msgid "Specifies the ciphers to use for TLS as a string." msgstr "" #. type: deftypevr -#: doc/guix.texi:18408 +#: doc/guix.texi:18405 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cert" msgstr "" #. type: deftypevr -#: doc/guix.texi:18411 +#: doc/guix.texi:18408 msgid "Specifies the path to the file containing the local certificate for client TLS authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18416 +#: doc/guix.texi:18413 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-key" msgstr "" #. type: deftypevr -#: doc/guix.texi:18419 +#: doc/guix.texi:18416 msgid "Specifies the path to the file containing the private key for client TLS authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18424 +#: doc/guix.texi:18421 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number pagesize" msgstr "" #. type: deftypevr -#: doc/guix.texi:18428 +#: doc/guix.texi:18425 msgid "Set this to a number greater than 0 to request paged results from the LDAP server in accordance with RFC2696. The default (0) is to not request paged results." msgstr "" #. type: deftypevr -#: doc/guix.texi:18433 +#: doc/guix.texi:18430 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-ignore-users-option nss-initgroups-ignoreusers" msgstr "" #. type: deftypevr -#: doc/guix.texi:18437 +#: doc/guix.texi:18434 msgid "This option prevents group membership lookups through LDAP for the specified users. Alternatively, the value 'all-local may be used. With that value nslcd builds a full list of non-LDAP users on startup." msgstr "" #. type: deftypevr -#: doc/guix.texi:18442 +#: doc/guix.texi:18439 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number nss-min-uid" msgstr "" #. type: deftypevr -#: doc/guix.texi:18445 +#: doc/guix.texi:18442 msgid "This option ensures that LDAP users with a numeric user id lower than the specified value are ignored." msgstr "" #. type: deftypevr -#: doc/guix.texi:18450 +#: doc/guix.texi:18447 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number nss-uid-offset" msgstr "" #. type: deftypevr -#: doc/guix.texi:18453 +#: doc/guix.texi:18450 msgid "This option specifies an offset that is added to all LDAP numeric user ids. This can be used to avoid user id collisions with local users." msgstr "" #. type: deftypevr -#: doc/guix.texi:18458 +#: doc/guix.texi:18455 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number nss-gid-offset" msgstr "" #. type: deftypevr -#: doc/guix.texi:18461 +#: doc/guix.texi:18458 msgid "This option specifies an offset that is added to all LDAP numeric group ids. This can be used to avoid user id collisions with local groups." msgstr "" #. type: deftypevr -#: doc/guix.texi:18466 +#: doc/guix.texi:18463 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-nested-groups" msgstr "" #. type: deftypevr -#: doc/guix.texi:18472 +#: doc/guix.texi:18469 msgid "If this option is set, the member attribute of a group may point to another group. Members of nested groups are also returned in the higher level group and parent groups are returned when finding groups for a specific user. The default is not to perform extra searches for nested groups." msgstr "" #. type: deftypevr -#: doc/guix.texi:18477 +#: doc/guix.texi:18474 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-getgrent-skipmembers" msgstr "" #. type: deftypevr -#: doc/guix.texi:18482 +#: doc/guix.texi:18479 msgid "If this option is set, the group member list is not retrieved when looking up groups. Lookups for finding which groups a user belongs to will remain functional so the user will likely still get the correct groups assigned on login." msgstr "" #. type: deftypevr -#: doc/guix.texi:18487 +#: doc/guix.texi:18484 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-disable-enumeration" msgstr "" #. type: deftypevr -#: doc/guix.texi:18493 +#: doc/guix.texi:18490 msgid "If this option is set, functions which cause all user/group entries to be loaded from the directory will not succeed in doing so. This can dramatically reduce LDAP server load in situations where there are a great number of users and/or groups. This option is not recommended for most configurations." msgstr "" #. type: deftypevr -#: doc/guix.texi:18498 +#: doc/guix.texi:18495 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string validnames" msgstr "" #. type: deftypevr -#: doc/guix.texi:18502 +#: doc/guix.texi:18499 msgid "This option can be used to specify how user and group names are verified within the system. This pattern is used to check all user and group names that are requested and returned from LDAP." msgstr "" #. type: deftypevr -#: doc/guix.texi:18507 +#: doc/guix.texi:18504 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean ignorecase" msgstr "" #. type: deftypevr -#: doc/guix.texi:18512 +#: doc/guix.texi:18509 msgid "This specifies whether or not to perform searches using case-insensitive matching. Enabling this could open up the system to authorization bypass vulnerabilities and introduce nscd cache poisoning vulnerabilities which allow denial of service." msgstr "" #. type: deftypevr -#: doc/guix.texi:18517 +#: doc/guix.texi:18514 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean pam-authc-ppolicy" msgstr "" #. type: deftypevr -#: doc/guix.texi:18520 +#: doc/guix.texi:18517 msgid "This option specifies whether password policy controls are requested and handled from the LDAP server when performing user authentication." msgstr "" #. type: deftypevr -#: doc/guix.texi:18525 +#: doc/guix.texi:18522 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authc-search" msgstr "" #. type: deftypevr -#: doc/guix.texi:18531 +#: doc/guix.texi:18528 msgid "By default nslcd performs an LDAP search with the user's credentials after BIND (authentication) to ensure that the BIND operation was successful. The default search is a simple check to see if the user's DN exists. A search filter can be specified that will be used instead. It should return at least one entry." msgstr "" #. type: deftypevr -#: doc/guix.texi:18536 +#: doc/guix.texi:18533 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authz-search" msgstr "" #. type: deftypevr -#: doc/guix.texi:18540 +#: doc/guix.texi:18537 msgid "This option allows flexible fine tuning of the authorisation check that should be performed. The search filter specified is executed and if any entries match, access is granted, otherwise access is denied." msgstr "" #. type: deftypevr -#: doc/guix.texi:18545 +#: doc/guix.texi:18542 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string pam-password-prohibit-message" msgstr "" #. type: deftypevr -#: doc/guix.texi:18550 +#: doc/guix.texi:18547 msgid "If this option is set password modification using pam_ldap will be denied and the specified message will be presented to the user instead. The message can be used to direct the user to an alternative means of changing their password." msgstr "" #. type: deftypevr -#: doc/guix.texi:18555 +#: doc/guix.texi:18552 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list pam-services" msgstr "" #. type: deftypevr -#: doc/guix.texi:18557 +#: doc/guix.texi:18554 msgid "List of pam service names for which LDAP authentication should suffice." msgstr "" #. type: cindex -#: doc/guix.texi:18568 +#: doc/guix.texi:18565 #, no-wrap msgid "web" msgstr "Web" #. type: cindex -#: doc/guix.texi:18569 +#: doc/guix.texi:18566 #, no-wrap msgid "www" msgstr "WWW" #. type: cindex -#: doc/guix.texi:18570 +#: doc/guix.texi:18567 #, no-wrap msgid "HTTP" msgstr "HTTP" #. type: Plain text -#: doc/guix.texi:18573 +#: doc/guix.texi:18570 msgid "The @code{(gnu services web)} module provides the Apache HTTP Server, the nginx web server, and also a fastcgi wrapper daemon." msgstr "Das Modul @code{(gnu services web)} stellt den Apache-HTTP-Server, den nginx-Webserver und auch einen fastcgi-Wrapperdienst bereit." #. type: subsubheading -#: doc/guix.texi:18574 +#: doc/guix.texi:18571 #, no-wrap msgid "Apache HTTP Server" msgstr "Apache-HTTP-Server" #. type: deffn -#: doc/guix.texi:18576 +#: doc/guix.texi:18573 #, no-wrap msgid "{Scheme Variable} httpd-service-type" msgstr "{Scheme-Variable} httpd-service-type" #. type: deffn -#: doc/guix.texi:18580 +#: doc/guix.texi:18577 msgid "Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}). The value for this service type is a @code{httpd-configuration} record." msgstr "Diensttyp für den @uref{https://httpd.apache.org/,Apache-HTTP-Server} @dfn{httpd}. Der Wert dieses Diensttyps ist ein @code{httpd-configuration}-Verbund." #. type: deffn -#: doc/guix.texi:18582 doc/guix.texi:18763 +#: doc/guix.texi:18579 doc/guix.texi:18760 msgid "A simple example configuration is given below." msgstr "Es folgt ein einfaches Beispiel der Konfiguration." #. type: example -#: doc/guix.texi:18590 +#: doc/guix.texi:18587 #, no-wrap msgid "" "(service httpd-service-type\n" @@ -34504,12 +34558,12 @@ msgstr "" " (document-root \"/srv/http/www.example.com\")))))\n" #. type: deffn -#: doc/guix.texi:18594 +#: doc/guix.texi:18591 msgid "Other services can also extend the @code{httpd-service-type} to add to the configuration." msgstr "Andere Dienste können den @code{httpd-service-type} auch erweitern, um etwas zur Konfiguration hinzuzufügen." #. type: example -#: doc/guix.texi:18603 doc/guix.texi:18743 +#: doc/guix.texi:18600 doc/guix.texi:18740 #, no-wrap msgid "" "(simple-service 'my-extra-server httpd-service-type\n" @@ -34529,115 +34583,115 @@ msgstr "" " DocumentRoot \\\"/srv/http/www.example.com\\\"\")))))\n" #. type: Plain text -#: doc/guix.texi:18609 +#: doc/guix.texi:18606 msgid "The details for the @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} and @code{httpd-virtualhost} record types are given below." msgstr "Nun folgt eine Beschreibung der Verbundstypen @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} und @code{httpd-virtualhost}." #. type: deffn -#: doc/guix.texi:18610 +#: doc/guix.texi:18607 #, no-wrap msgid "{Data Type} httpd-configuration" msgstr "{Datentyp} httpd-configuration" #. type: deffn -#: doc/guix.texi:18612 +#: doc/guix.texi:18609 msgid "This data type represents the configuration for the httpd service." msgstr "Dieser Datentyp repräsentiert die Konfiguration des httpd-Dienstes." #. type: item -#: doc/guix.texi:18614 +#: doc/guix.texi:18611 #, no-wrap msgid "@code{package} (default: @code{httpd})" msgstr "@code{package} (Vorgabe: @code{httpd})" #. type: table -#: doc/guix.texi:18616 +#: doc/guix.texi:18613 msgid "The httpd package to use." msgstr "Das zu benutzende httpd-Paket." #. type: item -#: doc/guix.texi:18617 doc/guix.texi:18706 +#: doc/guix.texi:18614 doc/guix.texi:18703 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/httpd\"})" #. type: table -#: doc/guix.texi:18619 +#: doc/guix.texi:18616 msgid "The pid file used by the shepherd-service." msgstr "Die vom Shepherd-Dienst benutzte PID-Datei." #. type: item -#: doc/guix.texi:18620 +#: doc/guix.texi:18617 #, no-wrap msgid "@code{config} (default: @code{(httpd-config-file)})" msgstr "@code{config} (Vorgabe: @code{(httpd-config-file)})" #. type: table -#: doc/guix.texi:18625 +#: doc/guix.texi:18622 msgid "The configuration file to use with the httpd service. The default value is a @code{httpd-config-file} record, but this can also be a different G-expression that generates a file, for example a @code{plain-file}. A file outside of the store can also be specified through a string." msgstr "Die vom httpd-Dienst zu benutzende Konfigurationsdatei. Vorgegeben ist ein @code{httpd-config-file}-Verbundsobjekt, aber als Wert kann auch ein anderer G-Ausdruck benutzt werden, der eine Datei erzeugt, zum Beispiel ein @code{plain-file}. Es kann auch eine Datei außerhalb des Stores mit einer Zeichenkette angegeben werden." #. type: deffn -#: doc/guix.texi:18629 +#: doc/guix.texi:18626 #, no-wrap msgid "{Data Type} httpd-module" msgstr "{Datentyp} httpd-module" #. type: deffn -#: doc/guix.texi:18631 +#: doc/guix.texi:18628 msgid "This data type represents a module for the httpd service." msgstr "Dieser Datentyp steht für ein Modul des httpd-Dienstes." #. type: table -#: doc/guix.texi:18635 +#: doc/guix.texi:18632 msgid "The name of the module." msgstr "Der Name des Moduls." #. type: table -#: doc/guix.texi:18641 +#: doc/guix.texi:18638 msgid "The file for the module. This can be relative to the httpd package being used, the absolute location of a file, or a G-expression for a file within the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}." msgstr "Die Datei, in der das Modul steht. Sie kann relativ zum benutzten httpd-Paket oder als absoluter Pfad einer Datei oder als ein G-Ausdruck für eine Datei im Store angegeben werden, zum Beispiel @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}." #. type: defvr -#: doc/guix.texi:18645 +#: doc/guix.texi:18642 #, no-wrap msgid "{Scheme Variable} %default-httpd-modules" msgstr "{Scheme-Variable} %default-httpd-modules" #. type: defvr -#: doc/guix.texi:18647 +#: doc/guix.texi:18644 msgid "A default list of @code{httpd-module} objects." msgstr "Eine vorgegebene Liste von @code{httpd-module}-Objekten." #. type: deffn -#: doc/guix.texi:18649 +#: doc/guix.texi:18646 #, no-wrap msgid "{Data Type} httpd-config-file" msgstr "{Datentyp} httpd-config-file" #. type: deffn -#: doc/guix.texi:18651 +#: doc/guix.texi:18648 msgid "This data type represents a configuration file for the httpd service." msgstr "Dieser Datentyp repräsentiert eine Konfigurationsdatei für den httpd-Dienst." #. type: item -#: doc/guix.texi:18653 +#: doc/guix.texi:18650 #, no-wrap msgid "@code{modules} (default: @code{%default-httpd-modules})" msgstr "@code{modules} (Vorgabe: @code{%default-httpd-modules})" #. type: table -#: doc/guix.texi:18656 +#: doc/guix.texi:18653 msgid "The modules to load. Additional modules can be added here, or loaded by additional configuration." msgstr "Welche Module geladen werden sollen. Zusätzliche Module können hier eingetragen werden oder durch eine zusätzliche Konfigurationsangabe geladen werden." #. type: table -#: doc/guix.texi:18659 +#: doc/guix.texi:18656 msgid "For example, in order to handle requests for PHP files, you can use Apache’s @code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:" msgstr "Um zum Beispiel Anfragen nach PHP-Dateien zu behandeln, können Sie das Modul @code{mod_proxy_fcgi} von Apache zusammen mit @code{php-fpm-service-type} benutzen:" #. type: example -#: doc/guix.texi:18681 +#: doc/guix.texi:18678 #, no-wrap msgid "" "(service httpd-service-type\n" @@ -34683,165 +34737,165 @@ msgstr "" " (socket-group \"httpd\")))\n" #. type: item -#: doc/guix.texi:18683 +#: doc/guix.texi:18680 #, no-wrap msgid "@code{server-root} (default: @code{httpd})" msgstr "@code{server-root} (Vorgabe: @code{httpd})" #. type: table -#: doc/guix.texi:18687 +#: doc/guix.texi:18684 msgid "The @code{ServerRoot} in the configuration file, defaults to the httpd package. Directives including @code{Include} and @code{LoadModule} are taken as relative to the server root." msgstr "Die @code{ServerRoot} in der Konfigurationsdatei, vorgegeben ist das httpd-Paket. Direktiven wie @code{Include} und @code{LoadModule} werden relativ zur ServerRoot interpretiert." #. type: item -#: doc/guix.texi:18688 +#: doc/guix.texi:18685 #, no-wrap msgid "@code{server-name} (default: @code{#f})" msgstr "@code{server-name} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18692 +#: doc/guix.texi:18689 msgid "The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to identify itself." msgstr "Der @code{ServerName} in der Konfigurationsdatei, mit dem das Anfrageschema (Request Scheme), der Rechnername (Hostname) und Port angegeben wird, mit denen sich der Server identifiziert." #. type: table -#: doc/guix.texi:18696 +#: doc/guix.texi:18693 msgid "This doesn't need to be set in the server config, and can be specifyed in virtual hosts. The default is @code{#f} to not specify a @code{ServerName}." msgstr "Es muss nicht als Teil der Server-Konfiguration festgelegt werden, sondern kann auch in virtuellen Rechnern (Virtual Hosts) festgelegt werden. Vorgegeben ist @code{#f}, wodurch kein @code{ServerName} festgelegt wird." #. type: item -#: doc/guix.texi:18697 +#: doc/guix.texi:18694 #, no-wrap msgid "@code{document-root} (default: @code{\"/srv/http\"})" msgstr "@code{document-root} (Vorgabe: @code{\"/srv/http\"})" #. type: table -#: doc/guix.texi:18699 +#: doc/guix.texi:18696 msgid "The @code{DocumentRoot} from which files will be served." msgstr "Das @code{DocumentRoot}-Verzeichnis, in dem sich die Dateien befinden, die man vom Server abrufen kann." #. type: item -#: doc/guix.texi:18700 +#: doc/guix.texi:18697 #, no-wrap msgid "@code{listen} (default: @code{'(\"80\")})" msgstr "@code{listen} (Vorgabe: @code{'(\"80\")})" #. type: table -#: doc/guix.texi:18705 +#: doc/guix.texi:18702 msgid "The list of values for the @code{Listen} directives in the config file. The value should be a list of strings, when each string can specify the port number to listen on, and optionally the IP address and protocol to use." msgstr "Die Liste der Werte für die @code{Listen}-Direktive in der Konfigurationsdatei. Als Wert sollte eine Liste von Zeichenketten angegeben werden, die jeweils die Portnummer, auf der gelauscht wird, und optional auch die zu benutzende IP-Adresse und das Protokoll angeben." #. type: table -#: doc/guix.texi:18710 +#: doc/guix.texi:18707 msgid "The @code{PidFile} to use. This should match the @code{pid-file} set in the @code{httpd-configuration} so that the Shepherd service is configured correctly." msgstr "Hiermit wird die PID-Datei als @code{PidFile}-Direktive angegeben. Der Wert sollte mit der @code{pid-file}-Datei in der @code{httpd-configuration} übereinstimmen, damit der Shepherd-Dienst richtig konfiguriert ist." #. type: item -#: doc/guix.texi:18711 +#: doc/guix.texi:18708 #, no-wrap msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})" msgstr "@code{error-log} (Vorgabe: @code{\"/var/log/httpd/error_log\"})" #. type: table -#: doc/guix.texi:18713 +#: doc/guix.texi:18710 msgid "The @code{ErrorLog} to which the server will log errors." msgstr "Der Ort, an den der Server mit der @code{ErrorLog}-Direktive Fehlerprotokolle schreibt." #. type: item -#: doc/guix.texi:18714 +#: doc/guix.texi:18711 #, no-wrap msgid "@code{user} (default: @code{\"httpd\"})" msgstr "@code{user} (Vorgabe: @code{\"httpd\"})" #. type: table -#: doc/guix.texi:18716 +#: doc/guix.texi:18713 msgid "The @code{User} which the server will answer requests as." msgstr "Der Benutzer, als der der Server durch die @code{User}-Direktive Anfragen beantwortet." #. type: item -#: doc/guix.texi:18717 +#: doc/guix.texi:18714 #, no-wrap msgid "@code{group} (default: @code{\"httpd\"})" msgstr "@code{group} (Vorgabe: @code{\"httpd\"})" #. type: table -#: doc/guix.texi:18719 +#: doc/guix.texi:18716 msgid "The @code{Group} which the server will answer requests as." msgstr "Die Gruppe, mit der der Server durch die @code{Group}-Direktive Anfragen beantwortet." #. type: item -#: doc/guix.texi:18720 +#: doc/guix.texi:18717 #, no-wrap msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})" msgstr "@code{extra-config} (Vorgabe: @code{(list \"TypesConfig etc/httpd/mime.types\")})" #. type: table -#: doc/guix.texi:18723 +#: doc/guix.texi:18720 msgid "A flat list of strings and G-expressions which will be added to the end of the configuration file." msgstr "Eine flache Liste von Zeichenketten und G-Ausdrücken, die am Ende der Konfigurationsdatei hinzugefügt werden." #. type: table -#: doc/guix.texi:18726 +#: doc/guix.texi:18723 msgid "Any values which the service is extended with will be appended to this list." msgstr "Alle Werte, mit denen dieser Dienst erweitert wird, werden an die Liste angehängt." #. type: deffn -#: doc/guix.texi:18730 +#: doc/guix.texi:18727 #, no-wrap msgid "{Data Type} httpd-virtualhost" msgstr "{Datentyp} httpd-virtualhost" #. type: deffn -#: doc/guix.texi:18732 +#: doc/guix.texi:18729 msgid "This data type represents a virtualhost configuration block for the httpd service." msgstr "Dieser Datentyp repräsentiert einen Konfigurationsblock für einen virtuellen Rechner (Virtual Host) des httpd-Dienstes." #. type: deffn -#: doc/guix.texi:18734 +#: doc/guix.texi:18731 msgid "These should be added to the extra-config for the httpd-service." msgstr "Sie sollten zur zusätzlichen Konfiguration extra-config des httpd-Dienstes hinzugefügt werden." #. type: code{#1} -#: doc/guix.texi:18746 +#: doc/guix.texi:18743 #, no-wrap msgid "addresses-and-ports" msgstr "addresses-and-ports" #. type: table -#: doc/guix.texi:18748 +#: doc/guix.texi:18745 msgid "The addresses and ports for the @code{VirtualHost} directive." msgstr "Adressen und Ports für die @code{VirtualHost}-Direktive." #. type: code{#1} -#: doc/guix.texi:18749 +#: doc/guix.texi:18746 #, no-wrap msgid "contents" msgstr "contents" #. type: table -#: doc/guix.texi:18752 +#: doc/guix.texi:18749 msgid "The contents of the @code{VirtualHost} directive, this should be a list of strings and G-expressions." msgstr "Der Inhalt der @code{VirtualHost}-Direktive. Er sollte als Liste von Zeichenketten und G-Ausdrücken angegeben werden." #. type: subsubheading -#: doc/guix.texi:18756 +#: doc/guix.texi:18753 #, no-wrap msgid "NGINX" msgstr "NGINX" #. type: deffn -#: doc/guix.texi:18758 +#: doc/guix.texi:18755 #, no-wrap msgid "{Scheme Variable} nginx-service-type" msgstr "{Scheme-Variable} nginx-service-type" #. type: deffn -#: doc/guix.texi:18761 +#: doc/guix.texi:18758 msgid "Service type for the @uref{https://nginx.org/,NGinx} web server. The value for this service type is a @code{} record." msgstr "Diensttyp für den @uref{https://nginx.org/,NGinx-Webserver}. Der Wert des Dienstes ist ein @code{}-Verbundsobjekt." #. type: example -#: doc/guix.texi:18771 doc/guix.texi:18825 +#: doc/guix.texi:18768 doc/guix.texi:18822 #, no-wrap msgid "" "(service nginx-service-type\n" @@ -34859,12 +34913,12 @@ msgstr "" " (root \"/srv/http/www.example.com\"))))))\n" #. type: deffn -#: doc/guix.texi:18776 +#: doc/guix.texi:18773 msgid "In addition to adding server blocks to the service configuration directly, this service can be extended by other services to add server blocks, as in this example:" msgstr "Außer durch direktes Hinzufügen von Server-Blöcken zur Dienstkonfiguration kann der Dienst auch durch andere Dienste erweitert werden, um Server-Blöcke hinzuzufügen, wie man im folgenden Beispiel sieht:" #. type: example -#: doc/guix.texi:18782 +#: doc/guix.texi:18779 #, no-wrap msgid "" "(simple-service 'my-extra-server nginx-service-type\n" @@ -34878,88 +34932,88 @@ msgstr "" " (try-files (list \"$uri\" \"$uri/index.html\")))))\n" #. type: Plain text -#: doc/guix.texi:18793 +#: doc/guix.texi:18790 msgid "At startup, @command{nginx} has not yet read its configuration file, so it uses a default file to log error messages. If it fails to load its configuration file, that is where error messages are logged. After the configuration file is loaded, the default error log file changes as per configuration. In our case, startup error messages can be found in @file{/var/run/nginx/logs/error.log}, and after configuration in @file{/var/log/nginx/error.log}. The second location can be changed with the @var{log-directory} configuration option." msgstr "Beim Starten hat @command{nginx} seine Konfigurationsdatei noch nicht gelesen und benutzt eine vorgegebene Datei, um Fehlermeldungen zu protokollieren. Wenn er seine Konfigurationsdatei nicht laden kann, landen Fehlermeldungen also dort. Nachdem die Konfigurationsdatei geladen ist, werden Fehlerprotokolle nach Voreinstellung in die Datei geschrieben, die in der Konfiguration angegeben ist. In unserem Fall können Sie Fehlermeldungen beim Starten in @file{/var/run/nginx/logs/error.log} finden und nachdem die Konfiguration eingelesen wurde, finden Sie sie in @file{/var/log/nginx/error.log}. Letzterer Ort kann mit der Konfigurationsoption @var{log-directory} geändert werden." #. type: deffn -#: doc/guix.texi:18794 +#: doc/guix.texi:18791 #, no-wrap msgid "{Data Type} nginx-configuration" msgstr "{Datentyp} nginx-configuration" #. type: deffn -#: doc/guix.texi:18798 +#: doc/guix.texi:18795 msgid "This data type represents the configuration for NGinx. Some configuration can be done through this and the other provided record types, or alternatively, a config file can be provided." msgstr "Dieser Datentyp repräsentiert die Konfiguration von NGinx. Ein Teil der Konfiguration kann hierüber und über die anderen zu Ihrer Verfügung stehenden Verbundstypen geschehen, alternativ können Sie eine Konfigurationsdatei mitgeben." #. type: item -#: doc/guix.texi:18800 +#: doc/guix.texi:18797 #, no-wrap msgid "@code{nginx} (default: @code{nginx})" msgstr "@code{nginx} (Vorgabe: @code{nginx})" #. type: table -#: doc/guix.texi:18802 +#: doc/guix.texi:18799 msgid "The nginx package to use." msgstr "Das zu benutzende nginx-Paket." #. type: item -#: doc/guix.texi:18803 +#: doc/guix.texi:18800 #, no-wrap msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})" msgstr "@code{log-directory} (Vorgabe: @code{\"/var/log/nginx\"})" #. type: table -#: doc/guix.texi:18805 +#: doc/guix.texi:18802 msgid "The directory to which NGinx will write log files." msgstr "In welches Verzeichnis NGinx Protokolldateien schreiben wird." #. type: item -#: doc/guix.texi:18806 +#: doc/guix.texi:18803 #, no-wrap msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})" msgstr "@code{run-directory} (Vorgabe: @code{\"/var/run/nginx\"})" #. type: table -#: doc/guix.texi:18809 +#: doc/guix.texi:18806 msgid "The directory in which NGinx will create a pid file, and write temporary files." msgstr "In welchem Verzeichnis NGinx eine PID-Datei anlegen und temporäre Dateien ablegen wird." #. type: item -#: doc/guix.texi:18810 +#: doc/guix.texi:18807 #, no-wrap msgid "@code{server-blocks} (default: @code{'()})" msgstr "@code{server-blocks} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18814 +#: doc/guix.texi:18811 msgid "A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{}." msgstr "Eine Liste von @dfn{Server-Blöcken}, die in der erzeugten Konfigurationsdatei stehen sollen. Die Elemente davon sollten den Typ @code{} haben." #. type: table -#: doc/guix.texi:18818 +#: doc/guix.texi:18815 msgid "The following example would setup NGinx to serve @code{www.example.com} from the @code{/srv/http/www.example.com} directory, without using HTTPS." msgstr "Im folgenden Beispiel wäre NGinx so eingerichtet, dass Anfragen an @code{www.example.com} mit Dateien aus dem Verzeichnis @code{/srv/http/www.example.com} beantwortet werden, ohne HTTPS zu benutzen." #. type: item -#: doc/guix.texi:18827 +#: doc/guix.texi:18824 #, no-wrap msgid "@code{upstream-blocks} (default: @code{'()})" msgstr "@code{upstream-blocks} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18831 +#: doc/guix.texi:18828 msgid "A list of @dfn{upstream blocks} to create in the generated configuration file, the elements should be of type @code{}." msgstr "Eine Liste von @dfn{Upstream-Blöcken}, die in der erzeugten Konfigurationsdatei stehen sollen. Ihre Elemente sollten den Typ @code{} haben." #. type: table -#: doc/guix.texi:18838 +#: doc/guix.texi:18835 msgid "Configuring upstreams through the @code{upstream-blocks} can be useful when combined with @code{locations} in the @code{} records. The following example creates a server configuration with one location configuration, that will proxy requests to a upstream configuration, which will handle requests with two servers." msgstr "Upstreams als @code{upstream-blocks} zu konfigurieren, kann hilfreich sein, wenn es mit @code{locations} in @code{} verbunden wird. Das folgende Beispiel erzeugt eine Server-Konfiguration mit einer Location-Konfiguration, bei der Anfragen als Proxy entsprechend einer Upstream-Konfiguration weitergeleitet werden, wodurch zwei Server diese beantworten können." #. type: example -#: doc/guix.texi:18857 +#: doc/guix.texi:18854 #, no-wrap msgid "" "(service\n" @@ -34999,344 +35053,344 @@ msgstr "" " \"server2.example.com\")))))))\n" #. type: table -#: doc/guix.texi:18865 +#: doc/guix.texi:18862 msgid "If a configuration @var{file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}. For proper operation, these arguments should match what is in @var{file} to ensure that the directories are created when the service is activated." msgstr "Wenn eine Konfigurationsdatei als @var{file} angegeben wird, dann wird diese benutzt und @emph{keine} Konfigurationsdatei anhand der angegebenen @code{log-directory}, @code{run-directory}, @code{server-blocks} und @code{upstream-blocks} erzeugt. Trotzdem sollten diese Argumente bei einer richtigen Konfiguration mit denen in der Datei @var{file} übereinstimmen, damit die Verzeichnisse bei Aktivierung des Dienstes erzeugt werden." #. type: table -#: doc/guix.texi:18869 +#: doc/guix.texi:18866 msgid "This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts of the nginx-configuration record." msgstr "Das kann nützlich sein, wenn Sie schon eine bestehende Konfigurationsdatei haben oder das, was Sie brauchen, nicht mit anderen Teilen eines nginx-configuration-Verbundsobjekts umgesetzt werden kann." #. type: item -#: doc/guix.texi:18870 +#: doc/guix.texi:18867 #, no-wrap msgid "@code{server-names-hash-bucket-size} (default: @code{#f})" msgstr "@code{server-names-hash-bucket-size} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18873 +#: doc/guix.texi:18870 msgid "Bucket size for the server names hash tables, defaults to @code{#f} to use the size of the processors cache line." msgstr "Größe der Behälter (englisch „Buckets“) für die Hashtabelle der Servernamen; vorgegeben ist @code{#f}, wodurch die Größe der Cache-Lines des Prozessors verwendet wird." #. type: item -#: doc/guix.texi:18874 +#: doc/guix.texi:18871 #, no-wrap msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})" msgstr "@code{server-names-hash-bucket-max-size} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18876 +#: doc/guix.texi:18873 msgid "Maximum bucket size for the server names hash tables." msgstr "Maximale Behältergröße für die Hashtabelle der Servernamen." #. type: table -#: doc/guix.texi:18880 +#: doc/guix.texi:18877 msgid "Extra content for the @code{http} block. Should be string or a string valued G-expression." msgstr "Zusätzlicher Inhalt des @code{http}-Blocks. Er sollte eine Zeichenkette oder ein zeichenkettenwertiger G-Ausdruck." #. type: deftp -#: doc/guix.texi:18884 +#: doc/guix.texi:18881 #, no-wrap msgid "{Data Type} nginx-server-configuration" msgstr "{Datentyp} nginx-server-configuration" #. type: deftp -#: doc/guix.texi:18887 +#: doc/guix.texi:18884 msgid "Data type representing the configuration of an nginx server block. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration eines nginx-Serverblocks repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:18889 +#: doc/guix.texi:18886 #, no-wrap msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})" msgstr "@code{listen} (Vorgabe: @code{'(\"80\" \"443 ssl\")})" #. type: table -#: doc/guix.texi:18894 +#: doc/guix.texi:18891 msgid "Each @code{listen} directive sets the address and port for IP, or the path for a UNIX-domain socket on which the server will accept requests. Both address and port, or only address or only port can be specified. An address may also be a hostname, for example:" msgstr "Jede @code{listen}-Direktive legt Adresse und Port für eine IP fest oder gibt einen Unix-Socket an, auf dem der Server Anfragen beantwortet. Es können entweder sowohl Adresse als auch Port oder nur die Adresse oder nur der Port angegeben werden. Als Adresse kann auch ein Rechnername („Hostname“) angegeben werden, zum Beispiel:" #. type: example -#: doc/guix.texi:18897 +#: doc/guix.texi:18894 #, no-wrap msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" msgstr "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" #. type: item -#: doc/guix.texi:18899 +#: doc/guix.texi:18896 #, no-wrap msgid "@code{server-name} (default: @code{(list 'default)})" msgstr "@code{server-name} (Vorgabe: @code{(list 'default)})" #. type: table -#: doc/guix.texi:18902 +#: doc/guix.texi:18899 msgid "A list of server names this server represents. @code{'default} represents the default server for connections matching no other server." msgstr "Eine Liste von Servernamen, die dieser Server repräsentiert. @code{'default} repräsentiert den voreingestellten Server, der für Verbindungen verwendet wird, die zu keinem anderen Server passen." #. type: item -#: doc/guix.texi:18903 +#: doc/guix.texi:18900 #, no-wrap msgid "@code{root} (default: @code{\"/srv/http\"})" msgstr "@code{root} (Vorgabe: @code{\"/srv/http\"})" #. type: table -#: doc/guix.texi:18905 +#: doc/guix.texi:18902 msgid "Root of the website nginx will serve." msgstr "Wurzelverzeichnis der Webpräsenz, die über nginx abgerufen werden kann." #. type: item -#: doc/guix.texi:18906 +#: doc/guix.texi:18903 #, no-wrap msgid "@code{locations} (default: @code{'()})" msgstr "@code{locations} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18910 +#: doc/guix.texi:18907 msgid "A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-configuration} records to use within this server block." msgstr "Eine Liste von @dfn{nginx-location-configuration}- oder @dfn{nginx-named-location-configuration}-Verbundsobjekten, die innerhalb des Serverblocks benutzt werden." #. type: item -#: doc/guix.texi:18911 +#: doc/guix.texi:18908 #, no-wrap msgid "@code{index} (default: @code{(list \"index.html\")})" msgstr "@code{index} (Vorgabe: @code{(list \"index.html\")})" #. type: table -#: doc/guix.texi:18914 +#: doc/guix.texi:18911 msgid "Index files to look for when clients ask for a directory. If it cannot be found, Nginx will send the list of files in the directory." msgstr "Index-Dateien, mit denen Anfragen nach einem Verzeichnis beantwortet werden. Wenn @emph{keine} davon gefunden wird, antwortet Nginx mit der Liste der Dateien im Verzeichnis." #. type: item -#: doc/guix.texi:18915 +#: doc/guix.texi:18912 #, no-wrap msgid "@code{try-files} (default: @code{'()})" msgstr "@code{try-files} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18918 +#: doc/guix.texi:18915 msgid "A list of files whose existence is checked in the specified order. @code{nginx} will use the first file it finds to process the request." msgstr "Eine Liste der Dateien, bei denen in der angegebenen Reihenfolge geprüft wird, ob sie existieren. @code{nginx} beantwortet die Anfrage mit der ersten Datei, die es findet." #. type: item -#: doc/guix.texi:18919 +#: doc/guix.texi:18916 #, no-wrap msgid "@code{ssl-certificate} (default: @code{#f})" msgstr "@code{ssl-certificate} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18922 +#: doc/guix.texi:18919 msgid "Where to find the certificate for secure connections. Set it to @code{#f} if you don't have a certificate or you don't want to use HTTPS." msgstr "Wo das Zertifikat für sichere Verbindungen gespeichert ist. Sie sollten es auf @code{#f} setzen, wenn Sie kein Zertifikat haben oder kein HTTPS benutzen möchten." #. type: item -#: doc/guix.texi:18923 +#: doc/guix.texi:18920 #, no-wrap msgid "@code{ssl-certificate-key} (default: @code{#f})" msgstr "@code{ssl-certificate-key} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18926 +#: doc/guix.texi:18923 msgid "Where to find the private key for secure connections. Set it to @code{#f} if you don't have a key or you don't want to use HTTPS." msgstr "Wo der private Schlüssel für sichere Verbindungen gespeichert ist. Sie sollten ihn auf @code{#f} setzen, wenn Sie keinen Schlüssel haben oder kein HTTPS benutzen möchten." #. type: item -#: doc/guix.texi:18927 +#: doc/guix.texi:18924 #, no-wrap msgid "@code{server-tokens?} (default: @code{#f})" msgstr "@code{server-tokens?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18929 +#: doc/guix.texi:18926 msgid "Whether the server should add its configuration to response." msgstr "Ob der Server Informationen über seine Konfiguration bei Antworten beilegen soll." #. type: item -#: doc/guix.texi:18930 +#: doc/guix.texi:18927 #, no-wrap msgid "@code{raw-content} (default: @code{'()})" msgstr "@code{raw-content} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18932 +#: doc/guix.texi:18929 msgid "A list of raw lines added to the server block." msgstr "Eine Liste von Zeilen, die unverändert in den Serverblock eingefügt werden." #. type: deftp -#: doc/guix.texi:18936 +#: doc/guix.texi:18933 #, no-wrap msgid "{Data Type} nginx-upstream-configuration" msgstr "{Datentyp} nginx-upstream-configuration" #. type: deftp -#: doc/guix.texi:18939 +#: doc/guix.texi:18936 msgid "Data type representing the configuration of an nginx @code{upstream} block. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration eines nginx-@code{upstream}-Blocks repräsentiert. Dieser Typ hat folgende Parameter:" #. type: table -#: doc/guix.texi:18943 +#: doc/guix.texi:18940 msgid "Name for this group of servers." msgstr "Der Name dieser Servergruppe." #. type: code{#1} -#: doc/guix.texi:18944 +#: doc/guix.texi:18941 #, no-wrap msgid "servers" msgstr "servers" #. type: table -#: doc/guix.texi:18951 +#: doc/guix.texi:18948 msgid "Specify the addresses of the servers in the group. The address can be specified as a IP address (e.g.@: @samp{127.0.0.1}), domain name (e.g.@: @samp{backend1.example.com}) or a path to a UNIX socket using the prefix @samp{unix:}. For addresses using an IP address or domain name, the default port is 80, and a different port can be specified explicitly." msgstr "Gibt die Adressen der Server in der Gruppe an. Die Adresse kann als IP-Adresse (z.B.@: @samp{127.0.0.1}), Domänenname (z.B.@: @samp{backend1.example.com}) oder als Pfad eines Unix-Sockets mit dem vorangestellten Präfix @samp{unix:} angegeben werden. Wenn Adressen eine IP-Adresse oder einen Domänennamen benutzen, ist der voreingestellte Port 80, aber ein abweichender Port kann auch explizit angegeben werden." #. type: deftp -#: doc/guix.texi:18955 +#: doc/guix.texi:18952 #, no-wrap msgid "{Data Type} nginx-location-configuration" msgstr "{Datentyp} nginx-location-configuration" #. type: deftp -#: doc/guix.texi:18958 +#: doc/guix.texi:18955 msgid "Data type representing the configuration of an nginx @code{location} block. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration eines nginx-@code{location}-Blocks angibt. Der Typ hat die folgenden Parameter:" #. type: table -#: doc/guix.texi:18962 +#: doc/guix.texi:18959 msgid "URI which this location block matches." msgstr "Die URI, die auf diesen Block passt." #. type: anchor{#1} -#: doc/guix.texi:18964 +#: doc/guix.texi:18961 msgid "nginx-location-configuration body" msgstr "nginx-location-configuration body" #. type: code{#1} -#: doc/guix.texi:18964 doc/guix.texi:18985 +#: doc/guix.texi:18961 doc/guix.texi:18982 #, no-wrap msgid "body" msgstr "body" #. type: table -#: doc/guix.texi:18971 +#: doc/guix.texi:18968 msgid "Body of the location block, specified as a list of strings. This can contain many configuration directives. For example, to pass requests to a upstream server group defined using an @code{nginx-upstream-configuration} block, the following directive would be specified in the body @samp{(list \"proxy_pass http://upstream-name;\")}." msgstr "Der Rumpf des location-Blocks, der als eine Liste von Zeichenketten angegeben werden muss. Er kann viele Konfigurationsdirektiven enthalten, zum Beispiel können Anfragen an eine Upstream-Servergruppe weitergeleitet werden, die mit einem @code{nginx-upstream-configuration}-Block angegeben wurde, indem diese Direktive im Rumpf angegeben wird: @samp{(list \"proxy_pass http://upstream-name;\")}." #. type: deftp -#: doc/guix.texi:18975 +#: doc/guix.texi:18972 #, no-wrap msgid "{Data Type} nginx-named-location-configuration" msgstr "{Datentyp} nginx-named-location-configuration" #. type: deftp -#: doc/guix.texi:18980 +#: doc/guix.texi:18977 msgid "Data type representing the configuration of an nginx named location block. Named location blocks are used for request redirection, and not used for regular request processing. This type has the following parameters:" msgstr "Der Datentyp repräsentiert die Konfiguration eines mit Namen versehenen nginx-location-Blocks („Named Location Block“). Ein mit Namen versehener location-Block wird zur Umleitung von Anfragen benutzt und nicht für die normale Anfrageverarbeitung. Dieser Typ hat die folgenden Parameter:" #. type: table -#: doc/guix.texi:18984 +#: doc/guix.texi:18981 msgid "Name to identify this location block." msgstr "Der Name, mit dem dieser location-Block identifiziert wird." #. type: table -#: doc/guix.texi:18990 +#: doc/guix.texi:18987 msgid "@xref{nginx-location-configuration body}, as the body for named location blocks can be used in a similar way to the @code{nginx-location-configuration body}. One restriction is that the body of a named location block cannot contain location blocks." msgstr "Siehe @ref{nginx-location-configuration body}, weil der Rumpf („Body“) eines mit Namen versehenen location-Blocks wie ein @code{nginx-location-configuration body} benutzt werden kann. Eine Einschränkung ist, dass der Rumpf eines mit Namen versehenen location-Blocks keine location-Blöcke enthalten kann." #. type: subsubheading -#: doc/guix.texi:18994 +#: doc/guix.texi:18991 #, no-wrap msgid "Varnish Cache" msgstr "Varnish Cache" #. type: cindex -#: doc/guix.texi:18995 +#: doc/guix.texi:18992 #, no-wrap msgid "Varnish" msgstr "Varnish" #. type: Plain text -#: doc/guix.texi:19000 +#: doc/guix.texi:18997 msgid "Varnish is a fast cache server that sits in between web applications and end users. It proxies requests from clients and caches the accessed URLs such that multiple requests for the same resource only creates one request to the back-end." msgstr "Varnish ist ein schneller zwischenspeichernder Server, der zwischen Web-Anwendungen und deren Endbenutzern sitzt. Er leitet Anfragen von Clients weiter und lagert die URLs, auf die zugegriffen wird, in einen Zwischenspeicher ein, damit bei mehreren Anfragen auf dieselbe Ressource nur eine Anfrage an die Hintergrundanwendung gestellt wird." #. type: defvr -#: doc/guix.texi:19001 +#: doc/guix.texi:18998 #, no-wrap msgid "{Scheme Variable} varnish-service-type" msgstr "{Scheme-Variable} varnish-service-type" #. type: defvr -#: doc/guix.texi:19003 +#: doc/guix.texi:19000 msgid "Service type for the Varnish daemon." msgstr "Diensttyp für den Varnish-Daemon." #. type: deftp -#: doc/guix.texi:19005 +#: doc/guix.texi:19002 #, no-wrap msgid "{Data Type} varnish-configuration" msgstr "{Datentyp} varnish-configuration" #. type: deftp -#: doc/guix.texi:19008 +#: doc/guix.texi:19005 msgid "Data type representing the @code{varnish} service configuration. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration des @code{varnish}-Dienstes repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:19010 +#: doc/guix.texi:19007 #, no-wrap msgid "@code{package} (default: @code{varnish})" msgstr "@code{package} (Vorgabe: @code{varnish})" #. type: table -#: doc/guix.texi:19012 +#: doc/guix.texi:19009 msgid "The Varnish package to use." msgstr "Das Varnish-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:19013 +#: doc/guix.texi:19010 #, no-wrap msgid "@code{name} (default: @code{\"default\"})" msgstr "@code{name} (Vorgabe: @code{\"default\"})" #. type: table -#: doc/guix.texi:19018 +#: doc/guix.texi:19015 msgid "A name for this Varnish instance. Varnish will create a directory in @file{/var/varnish/} with this name and keep temporary files there. If the name starts with a forward slash, it is interpreted as an absolute directory name." msgstr "Ein Name für diese Varnish-Instanz. Varnish wird ein Verzeichnis in @file{/var/varnish/} mit diesem Namen erzeugen und dort temporäre Dateien speichern. Wenn der Name mit einem Schrägstrich beginnt, wird er als absoluter Verzeichnispfad interpretiert." #. type: table -#: doc/guix.texi:19021 +#: doc/guix.texi:19018 msgid "Pass the @code{-n} argument to other Varnish programs to connect to the named instance, e.g.@: @command{varnishncsa -n default}." msgstr "Übergeben Sie die Befehlszeilenoption @code{-n} an andere Varnish-Programme, um sich mit der Instanz diesen Namens zu verbinden, z.B.@: @command{varnishncsa -n default}." #. type: item -#: doc/guix.texi:19022 +#: doc/guix.texi:19019 #, no-wrap msgid "@code{backend} (default: @code{\"localhost:8080\"})" msgstr "@code{backend} (Vorgabe: @code{\"localhost:8080\"})" #. type: table -#: doc/guix.texi:19024 +#: doc/guix.texi:19021 msgid "The backend to use. This option has no effect if @code{vcl} is set." msgstr "Welcher Hintergrunddienst benutzt werden soll. Diese Option wird ignoriert, wenn @code{vcl} gesetzt ist." #. type: item -#: doc/guix.texi:19025 +#: doc/guix.texi:19022 #, no-wrap msgid "@code{vcl} (default: #f)" msgstr "@code{vcl} (Vorgabe: #f)" #. type: table -#: doc/guix.texi:19030 +#: doc/guix.texi:19027 msgid "The @dfn{VCL} (Varnish Configuration Language) program to run. If this is @code{#f}, Varnish will proxy @code{backend} using the default configuration. Otherwise this must be a file-like object with valid VCL syntax." msgstr "Das @dfn{VCL}-Programm (in der Varnish Configuration Language), das ausgeführt werden soll. Ist dies auf @code{#f} gesetzt, fungiert Varnish als Proxy für den Hintergrunddienst @code{backend} mit der voreingestellten Konfiguration. Andernfalls muss dies ein dateiartiges Objekt mit gültiger VCL-Syntax sein." #. type: table -#: doc/guix.texi:19034 +#: doc/guix.texi:19031 msgid "For example, to mirror @url{http://www.gnu.org,www.gnu.org} with VCL you can do something along these lines:" msgstr "Um zum Beispiel mit VCL einen Spiegelserver für @url{http://www.gnu.org,www.gnu.org} einzurichten, können Sie so etwas benutzen:" #. type: example -#: doc/guix.texi:19041 +#: doc/guix.texi:19038 #, no-wrap msgid "" "(define %gnu-mirror\n" @@ -35354,7 +35408,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:19049 +#: doc/guix.texi:19046 #, no-wrap msgid "" "(operating-system\n" @@ -35374,554 +35428,554 @@ msgstr "" " %base-services)))\n" #. type: table -#: doc/guix.texi:19053 +#: doc/guix.texi:19050 msgid "The configuration of an already running Varnish instance can be inspected and changed using the @command{varnishadm} program." msgstr "Die Konfiguration einer bereits laufenden Varnish-Instanz kann mit dem Programm @command{varnishadm} eingesehen und verändert werden." #. type: table -#: doc/guix.texi:19057 +#: doc/guix.texi:19054 msgid "Consult the @url{https://varnish-cache.org/docs/,Varnish User Guide} and @url{https://book.varnish-software.com/4.0/,Varnish Book} for comprehensive documentation on Varnish and its configuration language." msgstr "Ziehen Sie die @url{https://varnish-cache.org/docs/,Varnish User Guide} und das @url{https://book.varnish-software.com/4.0/,Varnish Book} zu Rate, wenn Sie eine umfassende Dokumentation zu Varnish und seiner Konfigurationssprache suchen." #. type: item -#: doc/guix.texi:19058 +#: doc/guix.texi:19055 #, no-wrap msgid "@code{listen} (default: @code{'(\"localhost:80\")})" msgstr "@code{listen} (Vorgabe: @code{'(\"localhost:80\")})" #. type: table -#: doc/guix.texi:19060 +#: doc/guix.texi:19057 msgid "List of addresses Varnish will listen on." msgstr "Liste der Adressen, auf denen Varnish lauschen soll." #. type: item -#: doc/guix.texi:19061 +#: doc/guix.texi:19058 #, no-wrap msgid "@code{storage} (default: @code{'(\"malloc,128m\")})" msgstr "@code{storage} (Vorgabe: @code{'(\"malloc,128m\")})" #. type: table -#: doc/guix.texi:19063 +#: doc/guix.texi:19060 msgid "List of storage backends that will be available in VCL." msgstr "Liste der Speicher-Hintergrunddienste („Storage Backends“), die von der VCL aus benutzt werden können." #. type: item -#: doc/guix.texi:19064 +#: doc/guix.texi:19061 #, no-wrap msgid "@code{parameters} (default: @code{'()})" msgstr "@code{parameters} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19066 +#: doc/guix.texi:19063 msgid "List of run-time parameters in the form @code{'((\"parameter\" . \"value\"))}." msgstr "Liste der Laufzeitparameter von der Form @code{'((\"Parameter\" . \"Wert\"))}." #. type: table -#: doc/guix.texi:19069 +#: doc/guix.texi:19066 msgid "Additional arguments to pass to the @command{varnishd} process." msgstr "Zusätzliche Argumente, die an den @command{varnishd}-Prozess übergeben werden." #. type: subsubheading -#: doc/guix.texi:19073 +#: doc/guix.texi:19070 #, no-wrap msgid "FastCGI" msgstr "FastCGI" #. type: cindex -#: doc/guix.texi:19074 +#: doc/guix.texi:19071 #, no-wrap msgid "fastcgi" msgstr "fastcgi" #. type: cindex -#: doc/guix.texi:19075 +#: doc/guix.texi:19072 #, no-wrap msgid "fcgiwrap" msgstr "fcgiwrap" #. type: Plain text -#: doc/guix.texi:19082 +#: doc/guix.texi:19079 msgid "FastCGI is an interface between the front-end and the back-end of a web service. It is a somewhat legacy facility; new web services should generally just talk HTTP between the front-end and the back-end. However there are a number of back-end services such as PHP or the optimized HTTP Git repository access that use FastCGI, so we have support for it in Guix." msgstr "FastCGI ist eine Schnittstelle zwischen den Anwendungen im Vordergrund („Front-End“) und Hintergrund („Back-End“) eines Webdienstes. Die Rolle, die es ausübt, ist nicht mehr ganz aktuell, weil neue Webdienste im Allgemeinen einfach über HTTP zwischen Vorder- und Hintergrund kommunizieren sollten. Allerdings gibt es eine Menge von Hintergrunddiensten wie PHP oder den optimierten Git-Repository-Zugang über HTTP, welche FastCGI benutzen, also wird es auch in Guix unterstützt." #. type: Plain text -#: doc/guix.texi:19089 +#: doc/guix.texi:19086 msgid "To use FastCGI, you configure the front-end web server (e.g., nginx) to dispatch some subset of its requests to the fastcgi backend, which listens on a local TCP or UNIX socket. There is an intermediary @code{fcgiwrap} program that sits between the actual backend process and the web server. The front-end indicates which backend program to run, passing that information to the @code{fcgiwrap} process." msgstr "Um FastCGI zu benutzen, konfigurieren Sie den Webserver im Vordergrund (z.B.@: nginx) so, dass er eine Teilmenge der Anfragen an die fastcgi-Hintergrundanwendung weiterleitet, dass auf einem lokalen TCP- oder Unix-Socket lauscht. Ein dazwischenliegendes @code{fcgiwrap}-Programm sitzt zwischen dem eigentlichen Hintergrundprozess und dem Webserver. Vom Vordergrund wird angezeigt, welches Hintergrundprogramm ausgeführt werden soll. Diese Informationen werden an den @code{fcgiwrap}-Prozess übermittelt." #. type: defvr -#: doc/guix.texi:19090 +#: doc/guix.texi:19087 #, no-wrap msgid "{Scheme Variable} fcgiwrap-service-type" msgstr "{Scheme-Variable} fcgiwrap-service-type" #. type: defvr -#: doc/guix.texi:19092 +#: doc/guix.texi:19089 msgid "A service type for the @code{fcgiwrap} FastCGI proxy." msgstr "Ein Diensttyp für den @code{fcgiwrap}-FastCGI-Proxy." #. type: deftp -#: doc/guix.texi:19094 +#: doc/guix.texi:19091 #, no-wrap msgid "{Data Type} fcgiwrap-configuration" msgstr "{Datentyp} fcgiwrap-configuration" #. type: deftp -#: doc/guix.texi:19097 +#: doc/guix.texi:19094 msgid "Data type representing the configuration of the @code{fcgiwrap} service. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration des @code{fcgiwrap}-Dienstes repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:19098 +#: doc/guix.texi:19095 #, no-wrap msgid "@code{package} (default: @code{fcgiwrap})" msgstr "@code{package} (Vorgabe: @code{fcgiwrap})" #. type: table -#: doc/guix.texi:19100 +#: doc/guix.texi:19097 msgid "The fcgiwrap package to use." msgstr "Welches fcgiwrap-Paket benutzt werden soll." #. type: item -#: doc/guix.texi:19101 +#: doc/guix.texi:19098 #, no-wrap msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})" msgstr "@code{socket} (Vorgabe: @code{tcp:127.0.0.1:9000})" #. type: table -#: doc/guix.texi:19107 +#: doc/guix.texi:19104 msgid "The socket on which the @code{fcgiwrap} process should listen, as a string. Valid @var{socket} values include @code{unix:@var{/path/to/unix/socket}}, @code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:port}." msgstr "Der Socket, auf dem der @code{fcgiwrap}-Prozess lauschen soll, als eine Zeichenkette. Gültige Werte für @var{socket} wären unter anderem @code{unix:@var{/pfad/zum/unix/socket}}, @code{tcp:@var{vier.teile.gepunkt.et}:@var{Port}} und @code{tcp6:[@var{IPv6-Adresse}]:Port}." #. type: item -#: doc/guix.texi:19108 +#: doc/guix.texi:19105 #, no-wrap msgid "@code{user} (default: @code{fcgiwrap})" msgstr "@code{user} (Vorgabe: @code{fcgiwrap})" #. type: itemx -#: doc/guix.texi:19109 +#: doc/guix.texi:19106 #, no-wrap msgid "@code{group} (default: @code{fcgiwrap})" msgstr "@code{group} (Vorgabe: @code{fcgiwrap})" #. type: table -#: doc/guix.texi:19114 +#: doc/guix.texi:19111 msgid "The user and group names, as strings, under which to run the @code{fcgiwrap} process. The @code{fastcgi} service will ensure that if the user asks for the specific user or group names @code{fcgiwrap} that the corresponding user and/or group is present on the system." msgstr "Die Benutzerkonten- und Gruppennamen als Zeichenketten, unter denen der @code{fcgiwrap}-Prozess ausgeführt werden soll. Der @code{fastcgi}-Dienst wird sicherstellen, dass, wenn der Nutzer den Benutzer- oder Gruppennamen @code{fcgiwrap} verlangt, der entsprechende Benutzer und/oder Gruppe auch auf dem System existiert." #. type: table -#: doc/guix.texi:19121 +#: doc/guix.texi:19118 msgid "It is possible to configure a FastCGI-backed web service to pass HTTP authentication information from the front-end to the back-end, and to allow @code{fcgiwrap} to run the back-end process as a corresponding local user. To enable this capability on the back-end., run @code{fcgiwrap} as the @code{root} user and group. Note that this capability also has to be configured on the front-end as well." msgstr "Es ist möglich, einen FastCGI-gestützten Webdienst so zu konfigurieren, dass er HTTP-Authentizierungsinformationen vom Vordergrundserver an das Hintergrundsystem weiterreicht und es @code{fcgiwrap} möglich macht, den Hintergrundprozess als ein entsprechender lokaler Nutzer auszuführen. Um dem Hintergrundsystem diese Funktionalität anzubieten, lassen Sie @code{fcgiwrap} als der Administratornutzer @code{root} mit selbiger Gruppe ausführen. Beachten Sie, dass die Funktionalität auch auf dem Vordergrundsystem erst eingerichtet werden muss." #. type: cindex -#: doc/guix.texi:19124 +#: doc/guix.texi:19121 #, no-wrap msgid "php-fpm" msgstr "php-fpm" #. type: Plain text -#: doc/guix.texi:19127 +#: doc/guix.texi:19124 msgid "PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI implementation with some additional features useful for sites of any size." msgstr "PHP-FPM (FastCGI Process Manager) ist eine alternative PHP-FastCGI-Implementierung, die über einige zusätzliche Funktionalitäten verfügt, die für Webpräsenzen jeder Größe nützlich sind." #. type: Plain text -#: doc/guix.texi:19129 +#: doc/guix.texi:19126 msgid "These features include:" msgstr "Zu diesen Funktionalitäten gehören:" #. type: item -#: doc/guix.texi:19130 +#: doc/guix.texi:19127 #, no-wrap msgid "Adaptive process spawning" msgstr "Prozesserzeugung nach Bedarf" #. type: item -#: doc/guix.texi:19131 +#: doc/guix.texi:19128 #, no-wrap msgid "Basic statistics (similar to Apache's mod_status)" msgstr "Grundlegende Statistiken (ähnlich wie Apaches mod_status)" #. type: item -#: doc/guix.texi:19132 +#: doc/guix.texi:19129 #, no-wrap msgid "Advanced process management with graceful stop/start" msgstr "Fortschrittliche Prozessverwaltung mit sanftem Stoppen und Starten" #. type: item -#: doc/guix.texi:19133 +#: doc/guix.texi:19130 #, no-wrap msgid "Ability to start workers with different uid/gid/chroot/environment" msgstr "Die Möglichkeit, Arbeiter-Threads mit verschiedenen UIDs, GIDs, Chroot- oder Umgebungseinstellungen zu starten" #. type: itemize -#: doc/guix.texi:19135 +#: doc/guix.texi:19132 msgid "and different php.ini (replaces safe_mode)" -msgstr "Und verschiedene php.ini (als Ersatz für safe_mode)" +msgstr "und mit verschiedener php.ini (als Ersatz für safe_mode)" #. type: item -#: doc/guix.texi:19135 +#: doc/guix.texi:19132 #, no-wrap msgid "Stdout & stderr logging" msgstr "Protokollierung der Standard- und Standardfehlerausgabe" #. type: item -#: doc/guix.texi:19136 +#: doc/guix.texi:19133 #, no-wrap msgid "Emergency restart in case of accidental opcode cache destruction" msgstr "Neustart im Notfall einer ungewollten Zerstörung des Befehlscode-Zwischenspeichers" #. type: item -#: doc/guix.texi:19137 +#: doc/guix.texi:19134 #, no-wrap msgid "Accelerated upload support" msgstr "Unterstützung für beschleunigtes Hochladen" #. type: item -#: doc/guix.texi:19138 +#: doc/guix.texi:19135 #, no-wrap msgid "Support for a \"slowlog\"" msgstr "Unterstützung für „langsames Protokollieren“ („slowlog“)" #. type: item -#: doc/guix.texi:19139 +#: doc/guix.texi:19136 #, no-wrap msgid "Enhancements to FastCGI, such as fastcgi_finish_request() -" msgstr "Verbesserungen gegenüber FastCGI, wie z.B.@: fastcgi_finish_request() —" #. type: itemize -#: doc/guix.texi:19142 +#: doc/guix.texi:19139 msgid "a special function to finish request & flush all data while continuing to do something time-consuming (video converting, stats processing, etc.)" msgstr "eine besondere Funktion, um eine Anfrage fertig abzuarbeiten und alle Daten zu Ende zu verarbeiten, während etwas Zeitintensives abläuft (Videokonvertierung, Statistikverarbeitung usw.)" #. type: Plain text -#: doc/guix.texi:19144 +#: doc/guix.texi:19141 msgid "...@: and much more." msgstr "…@: und vieles mehr." #. type: defvr -#: doc/guix.texi:19145 +#: doc/guix.texi:19142 #, no-wrap msgid "{Scheme Variable} php-fpm-service-type" msgstr "{Scheme-Variable} php-fpm-service-type" #. type: defvr -#: doc/guix.texi:19147 +#: doc/guix.texi:19144 msgid "A Service type for @code{php-fpm}." msgstr "Ein Diensttyp für @code{php-fpm}." #. type: deftp -#: doc/guix.texi:19149 +#: doc/guix.texi:19146 #, no-wrap msgid "{Data Type} php-fpm-configuration" msgstr "{Datentyp} php-fpm-configuration" #. type: deftp -#: doc/guix.texi:19151 +#: doc/guix.texi:19148 msgid "Data Type for php-fpm service configuration." msgstr "Datentyp für die Konfiguration des php-fpm-Dienstes." #. type: item -#: doc/guix.texi:19152 +#: doc/guix.texi:19149 #, no-wrap msgid "@code{php} (default: @code{php})" msgstr "@code{php} (Vorgabe: @code{php})" #. type: table -#: doc/guix.texi:19154 +#: doc/guix.texi:19151 msgid "The php package to use." msgstr "Das zu benutzende PHP-Paket." #. type: item -#: doc/guix.texi:19154 +#: doc/guix.texi:19151 #, no-wrap msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" msgstr "@code{socket} (Vorgabe: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" #. type: table -#: doc/guix.texi:19156 +#: doc/guix.texi:19153 msgid "The address on which to accept FastCGI requests. Valid syntaxes are:" msgstr "Die Adresse, auf der FastCGI-Anfragen angenommen werden. Gültige Syntax hierfür ist:" #. type: code{#1} -#: doc/guix.texi:19157 +#: doc/guix.texi:19154 #, no-wrap msgid "\"ip.add.re.ss:port\"" msgstr "\"ip.ad.res.se:Port\"" #. type: table -#: doc/guix.texi:19159 +#: doc/guix.texi:19156 msgid "Listen on a TCP socket to a specific address on a specific port." msgstr "" #. type: code{#1} -#: doc/guix.texi:19159 +#: doc/guix.texi:19156 #, no-wrap msgid "\"port\"" msgstr "" #. type: table -#: doc/guix.texi:19161 +#: doc/guix.texi:19158 msgid "Listen on a TCP socket to all addresses on a specific port." msgstr "" #. type: code{#1} -#: doc/guix.texi:19161 +#: doc/guix.texi:19158 #, no-wrap msgid "\"/path/to/unix/socket\"" msgstr "" #. type: table -#: doc/guix.texi:19163 +#: doc/guix.texi:19160 msgid "Listen on a unix socket." msgstr "" #. type: item -#: doc/guix.texi:19165 +#: doc/guix.texi:19162 #, no-wrap msgid "@code{user} (default: @code{php-fpm})" msgstr "" #. type: table -#: doc/guix.texi:19167 +#: doc/guix.texi:19164 msgid "User who will own the php worker processes." msgstr "" #. type: item -#: doc/guix.texi:19167 +#: doc/guix.texi:19164 #, no-wrap msgid "@code{group} (default: @code{php-fpm})" msgstr "" #. type: table -#: doc/guix.texi:19169 +#: doc/guix.texi:19166 msgid "Group of the worker processes." msgstr "" #. type: item -#: doc/guix.texi:19169 +#: doc/guix.texi:19166 #, no-wrap msgid "@code{socket-user} (default: @code{php-fpm})" msgstr "" #. type: table -#: doc/guix.texi:19171 +#: doc/guix.texi:19168 msgid "User who can speak to the php-fpm socket." msgstr "" #. type: item -#: doc/guix.texi:19171 +#: doc/guix.texi:19168 #, no-wrap msgid "@code{socket-group} (default: @code{php-fpm})" msgstr "" #. type: table -#: doc/guix.texi:19173 +#: doc/guix.texi:19170 msgid "Group that can speak to the php-fpm socket." msgstr "" #. type: item -#: doc/guix.texi:19173 +#: doc/guix.texi:19170 #, no-wrap msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" msgstr "" #. type: table -#: doc/guix.texi:19176 +#: doc/guix.texi:19173 msgid "The process id of the php-fpm process is written to this file once the service has started." msgstr "" #. type: item -#: doc/guix.texi:19176 +#: doc/guix.texi:19173 #, no-wrap msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})" msgstr "" #. type: table -#: doc/guix.texi:19178 +#: doc/guix.texi:19175 msgid "Log for the php-fpm master process." msgstr "" #. type: item -#: doc/guix.texi:19178 +#: doc/guix.texi:19175 #, no-wrap msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})" msgstr "" #. type: table -#: doc/guix.texi:19181 +#: doc/guix.texi:19178 msgid "Detailed settings for the php-fpm process manager. Must be either:" msgstr "" #. type: code{#1} -#: doc/guix.texi:19182 +#: doc/guix.texi:19179 #, no-wrap msgid "" msgstr "" #. type: code{#1} -#: doc/guix.texi:19183 +#: doc/guix.texi:19180 #, no-wrap msgid "" msgstr "" #. type: code{#1} -#: doc/guix.texi:19184 +#: doc/guix.texi:19181 #, no-wrap msgid "" msgstr "" #. type: item -#: doc/guix.texi:19186 +#: doc/guix.texi:19183 #, no-wrap msgid "@code{display-errors} (default @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19191 +#: doc/guix.texi:19188 msgid "Determines whether php errors and warning should be sent to clients and displayed in their browsers. This is useful for local php development, but a security risk for public sites, as error messages can reveal passwords and personal data." msgstr "" #. type: item -#: doc/guix.texi:19191 +#: doc/guix.texi:19188 #, no-wrap msgid "@code{timezone} (default @code{#f})" msgstr "@code{timezone} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19193 +#: doc/guix.texi:19190 msgid "Specifies @code{php_admin_value[date.timezone]} parameter." msgstr "" #. type: item -#: doc/guix.texi:19193 +#: doc/guix.texi:19190 #, no-wrap msgid "@code{workers-logfile} (default @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})" msgstr "" #. type: table -#: doc/guix.texi:19196 +#: doc/guix.texi:19193 msgid "This file will log the @code{stderr} outputs of php worker processes. Can be set to @code{#f} to disable logging." msgstr "" #. type: item -#: doc/guix.texi:19196 +#: doc/guix.texi:19193 #, no-wrap msgid "@code{file} (default @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19199 +#: doc/guix.texi:19196 msgid "An optional override of the whole configuration. You can use the @code{mixed-text-file} function or an absolute filepath for it." msgstr "" #. type: deftp -#: doc/guix.texi:19202 +#: doc/guix.texi:19199 #, no-wrap msgid "{Data type} php-fpm-dynamic-process-manager-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19206 +#: doc/guix.texi:19203 msgid "Data Type for the @code{dynamic} php-fpm process manager. With the @code{dynamic} process manager, spare worker processes are kept around based on it's configured limits." msgstr "" #. type: item -#: doc/guix.texi:19207 doc/guix.texi:19223 doc/guix.texi:19233 +#: doc/guix.texi:19204 doc/guix.texi:19220 doc/guix.texi:19230 #, no-wrap msgid "@code{max-children} (default: @code{5})" msgstr "" #. type: table -#: doc/guix.texi:19209 doc/guix.texi:19225 doc/guix.texi:19235 +#: doc/guix.texi:19206 doc/guix.texi:19222 doc/guix.texi:19232 msgid "Maximum of worker processes." msgstr "" #. type: item -#: doc/guix.texi:19209 +#: doc/guix.texi:19206 #, no-wrap msgid "@code{start-servers} (default: @code{2})" msgstr "" #. type: table -#: doc/guix.texi:19211 +#: doc/guix.texi:19208 msgid "How many worker processes should be started on start-up." msgstr "" #. type: item -#: doc/guix.texi:19211 +#: doc/guix.texi:19208 #, no-wrap msgid "@code{min-spare-servers} (default: @code{1})" msgstr "" #. type: table -#: doc/guix.texi:19213 +#: doc/guix.texi:19210 msgid "How many spare worker processes should be kept around at minimum." msgstr "" #. type: item -#: doc/guix.texi:19213 +#: doc/guix.texi:19210 #, no-wrap msgid "@code{max-spare-servers} (default: @code{3})" msgstr "" #. type: table -#: doc/guix.texi:19215 +#: doc/guix.texi:19212 msgid "How many spare worker processes should be kept around at maximum." msgstr "" #. type: deftp -#: doc/guix.texi:19218 +#: doc/guix.texi:19215 #, no-wrap msgid "{Data type} php-fpm-static-process-manager-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19222 +#: doc/guix.texi:19219 msgid "Data Type for the @code{static} php-fpm process manager. With the @code{static} process manager, an unchanging number of worker processes are created." msgstr "" #. type: deftp -#: doc/guix.texi:19228 +#: doc/guix.texi:19225 #, no-wrap msgid "{Data type} php-fpm-on-demand-process-manager-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19232 +#: doc/guix.texi:19229 msgid "Data Type for the @code{on-demand} php-fpm process manager. With the @code{on-demand} process manager, worker processes are only created as requests arrive." msgstr "" #. type: item -#: doc/guix.texi:19235 +#: doc/guix.texi:19232 #, no-wrap msgid "@code{process-idle-timeout} (default: @code{10})" msgstr "" #. type: table -#: doc/guix.texi:19237 +#: doc/guix.texi:19234 msgid "The time in seconds after which a process with no requests is killed." msgstr "" #. type: deffn -#: doc/guix.texi:19241 +#: doc/guix.texi:19238 #, no-wrap msgid "{Scheme Procedure} nginx-php-fpm-location @" msgstr "{Scheme-Prozedur} nginx-php-fpm-location @" #. type: deffn -#: doc/guix.texi:19247 +#: doc/guix.texi:19244 msgid "[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")] A helper function to quickly add php to an @code{nginx-server-configuration}." msgstr "[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")] Eine Hilfsfunktion, mit der in kurzer Zeit PHP zu einer @code{nginx-server-configuration} hinzugefügt werden kann." #. type: Plain text -#: doc/guix.texi:19250 +#: doc/guix.texi:19247 msgid "A simple services setup for nginx with php can look like this:" msgstr "Eine einfache Art, die Dienste für nginx mit PHP einzurichten, kann so aussehen:" #. type: example -#: doc/guix.texi:19263 +#: doc/guix.texi:19260 #, no-wrap msgid "" "(services (cons* (service dhcp-client-service-type)\n" @@ -35951,34 +36005,34 @@ msgstr "" " %base-services))\n" #. type: cindex -#: doc/guix.texi:19265 +#: doc/guix.texi:19262 #, no-wrap msgid "cat-avatar-generator" msgstr "" #. type: Plain text -#: doc/guix.texi:19269 +#: doc/guix.texi:19266 msgid "The cat avatar generator is a simple service to demonstrate the use of php-fpm in @code{Nginx}. It is used to generate cat avatar from a seed, for instance the hash of a user's email address." msgstr "" #. type: deffn -#: doc/guix.texi:19270 +#: doc/guix.texi:19267 #, no-wrap msgid "{Scheme Procedure} cat-avatar-generator-service @" msgstr "{Scheme-Prozedur} cat-avatar-generator-service @" #. type: deffn -#: doc/guix.texi:19278 +#: doc/guix.texi:19275 msgid "[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-server-configuration that inherits @code{configuration}. It extends the nginx configuration to add a server block that serves @code{package}, a version of cat-avatar-generator. During execution, cat-avatar-generator will be able to use @code{cache-dir} as its cache directory." msgstr "" #. type: Plain text -#: doc/guix.texi:19281 +#: doc/guix.texi:19278 msgid "A simple setup for cat-avatar-generator can look like this:" msgstr "" #. type: example -#: doc/guix.texi:19288 +#: doc/guix.texi:19285 #, no-wrap msgid "" "(services (cons* (cat-avatar-generator-service\n" @@ -35990,155 +36044,155 @@ msgid "" msgstr "" #. type: subsubheading -#: doc/guix.texi:19290 +#: doc/guix.texi:19287 #, no-wrap msgid "Hpcguix-web" msgstr "" #. type: cindex -#: doc/guix.texi:19292 +#: doc/guix.texi:19289 #, no-wrap msgid "hpcguix-web" msgstr "" #. type: Plain text -#: doc/guix.texi:19297 +#: doc/guix.texi:19294 msgid "The @uref{hpcguix-web, https://github.com/UMCUGenetics/hpcguix-web/} program is a customizable web interface to browse Guix packages, initially designed for users of high-performance computing (HPC) clusters." msgstr "" #. type: defvr -#: doc/guix.texi:19298 +#: doc/guix.texi:19295 #, no-wrap msgid "{Scheme Variable} hpcguix-web-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:19300 +#: doc/guix.texi:19297 msgid "The service type for @code{hpcguix-web}." msgstr "" #. type: deftp -#: doc/guix.texi:19302 +#: doc/guix.texi:19299 #, no-wrap msgid "{Data Type} hpcguix-web-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19304 +#: doc/guix.texi:19301 msgid "Data type for the hpcguix-web service configuration." msgstr "" #. type: code{#1} -#: doc/guix.texi:19306 +#: doc/guix.texi:19303 #, no-wrap msgid "specs" msgstr "" #. type: table -#: doc/guix.texi:19309 +#: doc/guix.texi:19306 msgid "A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service configuration. The main items available in this spec are:" msgstr "" #. type: item -#: doc/guix.texi:19311 +#: doc/guix.texi:19308 #, no-wrap msgid "@code{title-prefix} (default: @code{\"hpcguix | \"})" msgstr "@code{title-prefix} (Vorgabe: @code{\"hpcguix | \"})" #. type: table -#: doc/guix.texi:19313 +#: doc/guix.texi:19310 msgid "The page title prefix." msgstr "Das Präfix der Webseitentitel." #. type: item -#: doc/guix.texi:19314 +#: doc/guix.texi:19311 #, no-wrap msgid "@code{guix-command} (default: @code{\"guix\"})" msgstr "@code{guix-command} (Vorgabe: @code{\"guix\"})" #. type: table -#: doc/guix.texi:19316 +#: doc/guix.texi:19313 msgid "The @command{guix} command." msgstr "Der @command{guix}-Befehl." #. type: item -#: doc/guix.texi:19317 +#: doc/guix.texi:19314 #, no-wrap msgid "@code{package-filter-proc} (default: @code{(const #t)})" msgstr "@code{package-filter-proc} (Vorgabe: @code{(const #t)})" #. type: table -#: doc/guix.texi:19319 +#: doc/guix.texi:19316 msgid "A procedure specifying how to filter packages that are displayed." msgstr "Eine Prozedur, die festlegt, wie anzuzeigende Pakete gefiltert werden." #. type: item -#: doc/guix.texi:19320 +#: doc/guix.texi:19317 #, no-wrap msgid "@code{package-page-extension-proc} (default: @code{(const '())})" msgstr "@code{package-page-extension-proc} (Vorgabe: @code{(const '())})" #. type: table -#: doc/guix.texi:19322 +#: doc/guix.texi:19319 msgid "Extension package for @code{hpcguix-web}." msgstr "Erweiterungspaket für @code{hpcguix-web}." #. type: item -#: doc/guix.texi:19323 +#: doc/guix.texi:19320 #, no-wrap msgid "@code{menu} (default: @code{'()})" msgstr "@code{menu} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19325 +#: doc/guix.texi:19322 msgid "Additional entry in page @code{menu}." msgstr "" #. type: item -#: doc/guix.texi:19326 +#: doc/guix.texi:19323 #, no-wrap msgid "@code{channels} (default: @code{%default-channels})" msgstr "@code{channels} (Vorgabe: @code{%default-channels})" #. type: table -#: doc/guix.texi:19328 +#: doc/guix.texi:19325 msgid "List of channels from which the package list is built (@pxref{Channels})." msgstr "Liste der Kanäle, aus denen die Paketliste erstellt wird (siehe @ref{Channels})." #. type: item -#: doc/guix.texi:19329 +#: doc/guix.texi:19326 #, no-wrap msgid "@code{package-list-expiration} (default: @code{(* 12 3600)})" msgstr "@code{package-list-expiration} (Vorgabe: @code{(* 12 3600)})" #. type: table -#: doc/guix.texi:19332 +#: doc/guix.texi:19329 msgid "The expiration time, in seconds, after which the package list is rebuilt from the latest instances of the given channels." msgstr "" #. type: table -#: doc/guix.texi:19337 +#: doc/guix.texi:19334 msgid "See the hpcguix-web repository for a @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, complete example}." msgstr "" #. type: item -#: doc/guix.texi:19338 +#: doc/guix.texi:19335 #, no-wrap msgid "@code{package} (default: @code{hpcguix-web})" msgstr "@code{package} (Vorgabe: @code{hpcguix-web})" #. type: table -#: doc/guix.texi:19340 +#: doc/guix.texi:19337 msgid "The hpcguix-web package to use." msgstr "Das hpcguix-web-Paket, was benutzt werden soll." #. type: Plain text -#: doc/guix.texi:19344 +#: doc/guix.texi:19341 msgid "A typical hpcguix-web service declaration looks like this:" msgstr "" #. type: example -#: doc/guix.texi:19353 +#: doc/guix.texi:19350 #, no-wrap msgid "" "(service hpcguix-web-service-type\n" @@ -36151,77 +36205,77 @@ msgid "" msgstr "" #. type: quotation -#: doc/guix.texi:19360 +#: doc/guix.texi:19357 msgid "The hpcguix-web service periodically updates the package list it publishes by pulling channels from Git. To that end, it needs to access X.509 certificates so that it can authenticate Git servers when communicating over HTTPS, and it assumes that @file{/etc/ssl/certs} contains those certificates." msgstr "" #. type: quotation -#: doc/guix.texi:19364 +#: doc/guix.texi:19361 msgid "Thus, make sure to add @code{nss-certs} or another certificate package to the @code{packages} field of your configuration. @ref{X.509 Certificates}, for more information on X.509 certificates." msgstr "" #. type: cindex -#: doc/guix.texi:19369 +#: doc/guix.texi:19366 #, no-wrap msgid "Web" msgstr "" #. type: cindex -#: doc/guix.texi:19370 +#: doc/guix.texi:19367 #, no-wrap msgid "HTTP, HTTPS" msgstr "" #. type: cindex -#: doc/guix.texi:19371 +#: doc/guix.texi:19368 #, no-wrap msgid "Let's Encrypt" msgstr "" #. type: cindex -#: doc/guix.texi:19372 +#: doc/guix.texi:19369 #, no-wrap msgid "TLS certificates" msgstr "" #. type: Plain text -#: doc/guix.texi:19379 +#: doc/guix.texi:19376 msgid "The @code{(gnu services certbot)} module provides a service to automatically obtain a valid TLS certificate from the Let's Encrypt certificate authority. These certificates can then be used to serve content securely over HTTPS or other TLS-based protocols, with the knowledge that the client will be able to verify the server's authenticity." msgstr "Das Modul @code{(gnu services certbot)} stellt einen Dienst zur Verfügung, um automatisch ein gültiges TLS-Zertifikat von der Zertifikatsautorität Let’s Encrypt zu beziehen. Mit diesen Zertifikaten können Informationen sicher über HTTPS oder andere TLS-basierte Protokolle übertragen werden, im Wissen, dass der Client die Authentizität des Servers überprüfen wird können." #. type: Plain text -#: doc/guix.texi:19391 +#: doc/guix.texi:19388 msgid "@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} tool to automate the certification process. This tool first securely generates a key on the server. It then makes a request to the Let's Encrypt certificate authority (CA) to sign the key. The CA checks that the request originates from the host in question by using a challenge-response protocol, requiring the server to provide its response over HTTP. If that protocol completes successfully, the CA signs the key, resulting in a certificate. That certificate is valid for a limited period of time, and therefore to continue to provide TLS services, the server needs to periodically ask the CA to renew its signature." msgstr "@url{https://letsencrypt.org/, Let’s Encrypt} macht das @code{certbot}-Werkzeug verfügbar, mit dem der Zertifizierungsvorgang automatisiert werden kann. Das Werkzeug erzeugt zunächst auf sichere Weise einen Schlüssel auf dem Server und stellt dann eine Anfrage an die Let’s-Encrypt-Zertifikatsautorität („Certificate Authority“, kurz CA), den Schlüssel zu signieren. Die Zertifikatsautorität prüft mit einem Challenge-Response-Protokoll, dass die Anfrage auch wirklich vom fraglichen Rechner (auch „Host“ genannt) kommt, wozu der Server über HTTP seine Antwort geben muss. Wenn dieses Protokoll erfolgreich befolgt wurde, signiert die Zertifikatsautorität den Schlüssel, woraus sich ein Zertifikat ergibt. Dieses Zertifikat ist eine begrenzte Zeit lang gültig, daher muss der Server für eine andauernde Bereitstellung von TLS-Leistungen immer wieder neu der Zertifikatsautorität eine Bitte um die Erneuerung der Signatur zukommen lassen." #. type: Plain text -#: doc/guix.texi:19398 +#: doc/guix.texi:19395 msgid "The certbot service automates this process: the initial key generation, the initial certification request to the Let's Encrypt service, the web server challenge/response integration, writing the certificate to disk, the automated periodic renewals, and the deployment tasks associated with the renewal (e.g.@: reloading services, copying keys with different permissions)." msgstr "" #. type: Plain text -#: doc/guix.texi:19404 +#: doc/guix.texi:19401 msgid "Certbot is run twice a day, at a random minute within the hour. It won't do anything until your certificates are due for renewal or revoked, but running it regularly would give your service a chance of staying online in case a Let's Encrypt-initiated revocation happened for some reason." msgstr "" #. type: Plain text -#: doc/guix.texi:19408 +#: doc/guix.texi:19405 msgid "By using this service, you agree to the ACME Subscriber Agreement, which can be found there: @url{https://acme-v01.api.letsencrypt.org/directory}." msgstr "Durch die Nutzung dieses Dienstes stimmen Sie dem „ACME Subscriber Agreement“ zu, das Sie hier finden:: @url{https://acme-v01.api.letsencrypt.org/directory}." #. type: defvr -#: doc/guix.texi:19409 +#: doc/guix.texi:19406 #, no-wrap msgid "{Scheme Variable} certbot-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:19412 +#: doc/guix.texi:19409 msgid "A service type for the @code{certbot} Let's Encrypt client. Its value must be a @code{certbot-configuration} record as in this example:" msgstr "" #. type: example -#: doc/guix.texi:19419 +#: doc/guix.texi:19416 #, no-wrap msgid "" "(define %nginx-deploy-hook\n" @@ -36233,7 +36287,7 @@ msgid "" msgstr "" #. type: example -#: doc/guix.texi:19430 +#: doc/guix.texi:19427 #, no-wrap msgid "" "(service certbot-service-type\n" @@ -36249,213 +36303,213 @@ msgid "" msgstr "" #. type: defvr -#: doc/guix.texi:19433 +#: doc/guix.texi:19430 msgid "See below for details about @code{certbot-configuration}." msgstr "" #. type: deftp -#: doc/guix.texi:19435 +#: doc/guix.texi:19432 #, no-wrap msgid "{Data Type} certbot-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19438 +#: doc/guix.texi:19435 msgid "Data type representing the configuration of the @code{certbot} service. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:19440 +#: doc/guix.texi:19437 #, no-wrap msgid "@code{package} (default: @code{certbot})" msgstr "" #. type: table -#: doc/guix.texi:19442 +#: doc/guix.texi:19439 msgid "The certbot package to use." msgstr "" #. type: item -#: doc/guix.texi:19443 +#: doc/guix.texi:19440 #, no-wrap msgid "@code{webroot} (default: @code{/var/www})" msgstr "" #. type: table -#: doc/guix.texi:19446 +#: doc/guix.texi:19443 msgid "The directory from which to serve the Let's Encrypt challenge/response files." msgstr "" #. type: item -#: doc/guix.texi:19447 +#: doc/guix.texi:19444 #, no-wrap msgid "@code{certificates} (default: @code{()})" msgstr "" #. type: table -#: doc/guix.texi:19451 +#: doc/guix.texi:19448 msgid "A list of @code{certificates-configuration}s for which to generate certificates and request signatures. Each certificate has a @code{name} and several @code{domains}." msgstr "" #. type: table -#: doc/guix.texi:19455 +#: doc/guix.texi:19452 msgid "Mandatory email used for registration, recovery contact, and important account notifications." msgstr "" #. type: item -#: doc/guix.texi:19456 +#: doc/guix.texi:19453 #, no-wrap msgid "@code{rsa-key-size} (default: @code{2048})" msgstr "" #. type: table -#: doc/guix.texi:19458 +#: doc/guix.texi:19455 msgid "Size of the RSA key." msgstr "" #. type: item -#: doc/guix.texi:19459 +#: doc/guix.texi:19456 #, no-wrap msgid "@code{default-location} (default: @i{see below})" msgstr "" #. type: table -#: doc/guix.texi:19468 +#: doc/guix.texi:19465 msgid "The default @code{nginx-location-configuration}. Because @code{certbot} needs to be able to serve challenges and responses, it needs to be able to run a web server. It does so by extending the @code{nginx} web service with an @code{nginx-server-configuration} listening on the @var{domains} on port 80, and which has a @code{nginx-location-configuration} for the @code{/.well-known/} URI path subspace used by Let's Encrypt. @xref{Web Services}, for more on these nginx configuration data types." msgstr "" #. type: table -#: doc/guix.texi:19472 +#: doc/guix.texi:19469 msgid "Requests to other URL paths will be matched by the @code{default-location}, which if present is added to all @code{nginx-server-configuration}s." msgstr "" #. type: table -#: doc/guix.texi:19476 +#: doc/guix.texi:19473 msgid "By default, the @code{default-location} will issue a redirect from @code{http://@var{domain}/...} to @code{https://@var{domain}/...}, leaving you to define what to serve on your site via @code{https}." msgstr "" #. type: table -#: doc/guix.texi:19478 +#: doc/guix.texi:19475 msgid "Pass @code{#f} to not issue a default location." msgstr "" #. type: deftp -#: doc/guix.texi:19481 +#: doc/guix.texi:19478 #, no-wrap msgid "{Data Type} certificate-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19484 +#: doc/guix.texi:19481 msgid "Data type representing the configuration of a certificate. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:19486 +#: doc/guix.texi:19483 #, no-wrap msgid "@code{name} (default: @i{see below})" msgstr "" #. type: table -#: doc/guix.texi:19490 +#: doc/guix.texi:19487 msgid "This name is used by Certbot for housekeeping and in file paths; it doesn't affect the content of the certificate itself. To see certificate names, run @code{certbot certificates}." msgstr "" #. type: table -#: doc/guix.texi:19492 +#: doc/guix.texi:19489 msgid "Its default is the first provided domain." msgstr "" #. type: item -#: doc/guix.texi:19493 +#: doc/guix.texi:19490 #, no-wrap msgid "@code{domains} (default: @code{()})" msgstr "" #. type: table -#: doc/guix.texi:19496 +#: doc/guix.texi:19493 msgid "The first domain provided will be the subject CN of the certificate, and all domains will be Subject Alternative Names on the certificate." msgstr "" #. type: item -#: doc/guix.texi:19497 +#: doc/guix.texi:19494 #, no-wrap msgid "@code{challenge} (default: @code{#f})" msgstr "@code{challenge} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19502 +#: doc/guix.texi:19499 msgid "The challenge type that has to be run by certbot. If @code{#f} is specified, default to the HTTP challenge. If a value is specified, defaults to the manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and the documentation at @url{https://certbot.eff.org/docs/using.html#hooks})." msgstr "" #. type: item -#: doc/guix.texi:19503 +#: doc/guix.texi:19500 #, no-wrap msgid "@code{authentication-hook} (default: @code{#f})" msgstr "@code{authentication-hook} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19509 +#: doc/guix.texi:19506 msgid "Command to be run in a shell once for each certificate challenge to be answered. For this command, the shell variable @code{$CERTBOT_DOMAIN} will contain the domain being authenticated, @code{$CERTBOT_VALIDATION} contains the validation string and @code{$CERTBOT_TOKEN} contains the file name of the resource requested when performing an HTTP-01 challenge." msgstr "" #. type: item -#: doc/guix.texi:19510 +#: doc/guix.texi:19507 #, no-wrap msgid "@code{cleanup-hook} (default: @code{#f})" msgstr "@code{cleanup-hook} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19516 +#: doc/guix.texi:19513 msgid "Command to be run in a shell once for each certificate challenge that have been answered by the @code{auth-hook}. For this command, the shell variables available in the @code{auth-hook} script are still available, and additionally @code{$CERTBOT_AUTH_OUTPUT} will contain the standard output of the @code{auth-hook} script." msgstr "" #. type: item -#: doc/guix.texi:19517 +#: doc/guix.texi:19514 #, no-wrap msgid "@code{deploy-hook} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19525 +#: doc/guix.texi:19522 msgid "Command to be run in a shell once for each successfully issued certificate. For this command, the shell variable @code{$RENEWED_LINEAGE} will point to the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/example.com\"}) containing the new certificates and keys; the shell variable @code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed certificate domains (for example, @samp{\"example.com www.example.com\"}." msgstr "" #. type: Plain text -#: doc/guix.texi:19532 +#: doc/guix.texi:19529 msgid "For each @code{certificate-configuration}, the certificate is saved to @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the key is saved to @code{/etc/letsencrypt/live/@var{name}/privkey.pem}." msgstr "" #. type: cindex -#: doc/guix.texi:19534 +#: doc/guix.texi:19531 #, no-wrap msgid "DNS (domain name system)" msgstr "" #. type: cindex -#: doc/guix.texi:19535 +#: doc/guix.texi:19532 #, no-wrap msgid "domain name system (DNS)" msgstr "" #. type: Plain text -#: doc/guix.texi:19543 +#: doc/guix.texi:19540 msgid "The @code{(gnu services dns)} module provides services related to the @dfn{domain name system} (DNS). It provides a server service for hosting an @emph{authoritative} DNS server for multiple zones, slave or master. This service uses @uref{https://www.knot-dns.cz/, Knot DNS}. And also a caching and forwarding DNS server for the LAN, which uses @uref{http://www.thekelleys.org.uk/dnsmasq/doc.html, dnsmasq}." msgstr "" #. type: subsubheading -#: doc/guix.texi:19544 +#: doc/guix.texi:19541 #, no-wrap msgid "Knot Service" msgstr "Knot-Dienst" #. type: Plain text -#: doc/guix.texi:19548 +#: doc/guix.texi:19545 msgid "An example configuration of an authoritative server for two zones, one master and one slave, is:" msgstr "" #. type: lisp -#: doc/guix.texi:19555 +#: doc/guix.texi:19552 #, no-wrap msgid "" "(define-zone-entries example.org.zone\n" @@ -36467,7 +36521,7 @@ msgid "" msgstr "" #. type: lisp -#: doc/guix.texi:19562 +#: doc/guix.texi:19559 #, no-wrap msgid "" "(define master-zone\n" @@ -36480,7 +36534,7 @@ msgid "" msgstr "" #. type: lisp -#: doc/guix.texi:19568 +#: doc/guix.texi:19565 #, no-wrap msgid "" "(define slave-zone\n" @@ -36492,7 +36546,7 @@ msgid "" msgstr "" #. type: lisp -#: doc/guix.texi:19573 +#: doc/guix.texi:19570 #, no-wrap msgid "" "(define plop-master\n" @@ -36503,7 +36557,7 @@ msgid "" msgstr "" #. type: lisp -#: doc/guix.texi:19582 +#: doc/guix.texi:19579 #, no-wrap msgid "" "(operating-system\n" @@ -36517,967 +36571,967 @@ msgid "" msgstr "" #. type: deffn -#: doc/guix.texi:19584 +#: doc/guix.texi:19581 #, no-wrap msgid "{Scheme Variable} knot-service-type" msgstr "" #. type: deffn -#: doc/guix.texi:19586 +#: doc/guix.texi:19583 msgid "This is the type for the Knot DNS server." msgstr "" #. type: deffn -#: doc/guix.texi:19594 +#: doc/guix.texi:19591 msgid "Knot DNS is an authoritative DNS server, meaning that it can serve multiple zones, that is to say domain names you would buy from a registrar. This server is not a resolver, meaning that it can only resolve names for which it is authoritative. This server can be configured to serve zones as a master server or a slave server as a per-zone basis. Slave zones will get their data from masters, and will serve it as an authoritative server. From the point of view of a resolver, there is no difference between master and slave." msgstr "" #. type: deffn -#: doc/guix.texi:19596 +#: doc/guix.texi:19593 msgid "The following data types are used to configure the Knot DNS server:" msgstr "" #. type: deftp -#: doc/guix.texi:19598 +#: doc/guix.texi:19595 #, no-wrap msgid "{Data Type} knot-key-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19601 +#: doc/guix.texi:19598 msgid "Data type representing a key. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:19603 doc/guix.texi:19623 doc/guix.texi:19738 -#: doc/guix.texi:19764 doc/guix.texi:19799 +#: doc/guix.texi:19600 doc/guix.texi:19620 doc/guix.texi:19735 +#: doc/guix.texi:19761 doc/guix.texi:19796 #, no-wrap msgid "@code{id} (default: @code{\"\"})" msgstr "" #. type: table -#: doc/guix.texi:19606 +#: doc/guix.texi:19603 msgid "An identifier for other configuration fields to refer to this key. IDs must be unique and must not be empty." msgstr "" #. type: item -#: doc/guix.texi:19607 +#: doc/guix.texi:19604 #, no-wrap msgid "@code{algorithm} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19611 +#: doc/guix.texi:19608 msgid "The algorithm to use. Choose between @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-sha384} and @code{'hmac-sha512}." msgstr "" #. type: item -#: doc/guix.texi:19612 +#: doc/guix.texi:19609 #, no-wrap msgid "@code{secret} (default: @code{\"\"})" msgstr "" #. type: table -#: doc/guix.texi:19614 +#: doc/guix.texi:19611 msgid "The secret key itself." msgstr "" #. type: deftp -#: doc/guix.texi:19618 +#: doc/guix.texi:19615 #, no-wrap msgid "{Data Type} knot-acl-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19621 +#: doc/guix.texi:19618 msgid "Data type representing an Access Control List (ACL) configuration. This type has the following parameters:" msgstr "" #. type: table -#: doc/guix.texi:19626 +#: doc/guix.texi:19623 msgid "An identifier for ether configuration fields to refer to this key. IDs must be unique and must not be empty." msgstr "" #. type: item -#: doc/guix.texi:19627 doc/guix.texi:19742 +#: doc/guix.texi:19624 doc/guix.texi:19739 #, no-wrap msgid "@code{address} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19631 +#: doc/guix.texi:19628 msgid "An ordered list of IP addresses, network subnets, or network ranges represented with strings. The query must match one of them. Empty value means that address match is not required." msgstr "" #. type: item -#: doc/guix.texi:19632 +#: doc/guix.texi:19629 #, no-wrap msgid "@code{key} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19636 +#: doc/guix.texi:19633 msgid "An ordered list of references to keys represented with strings. The string must match a key ID defined in a @code{knot-key-configuration}. No key means that a key is not require to match that ACL." msgstr "" #. type: item -#: doc/guix.texi:19637 +#: doc/guix.texi:19634 #, no-wrap msgid "@code{action} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19641 +#: doc/guix.texi:19638 msgid "An ordered list of actions that are permitted or forbidden by this ACL. Possible values are lists of zero or more elements from @code{'transfer}, @code{'notify} and @code{'update}." msgstr "" #. type: item -#: doc/guix.texi:19642 +#: doc/guix.texi:19639 #, no-wrap msgid "@code{deny?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19645 +#: doc/guix.texi:19642 msgid "When true, the ACL defines restrictions. Listed actions are forbidden. When false, listed actions are allowed." msgstr "" #. type: deftp -#: doc/guix.texi:19649 +#: doc/guix.texi:19646 #, no-wrap msgid "{Data Type} zone-entry" msgstr "" #. type: deftp -#: doc/guix.texi:19652 +#: doc/guix.texi:19649 msgid "Data type represnting a record entry in a zone file. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:19654 +#: doc/guix.texi:19651 #, no-wrap msgid "@code{name} (default: @code{\"@@\"})" msgstr "" #. type: table -#: doc/guix.texi:19660 +#: doc/guix.texi:19657 msgid "The name of the record. @code{\"@@\"} refers to the origin of the zone. Names are relative to the origin of the zone. For example, in the @code{example.org} zone, @code{\"ns.example.org\"} actually refers to @code{ns.example.org.example.org}. Names ending with a dot are absolute, which means that @code{\"ns.example.org.\"} refers to @code{ns.example.org}." msgstr "" #. type: item -#: doc/guix.texi:19661 +#: doc/guix.texi:19658 #, no-wrap msgid "@code{ttl} (default: @code{\"\"})" msgstr "" #. type: table -#: doc/guix.texi:19663 +#: doc/guix.texi:19660 msgid "The Time-To-Live (TTL) of this record. If not set, the default TTL is used." msgstr "" #. type: item -#: doc/guix.texi:19664 +#: doc/guix.texi:19661 #, no-wrap msgid "@code{class} (default: @code{\"IN\"})" msgstr "" #. type: table -#: doc/guix.texi:19667 +#: doc/guix.texi:19664 msgid "The class of the record. Knot currently supports only @code{\"IN\"} and partially @code{\"CH\"}." msgstr "" #. type: item -#: doc/guix.texi:19668 +#: doc/guix.texi:19665 #, no-wrap msgid "@code{type} (default: @code{\"A\"})" msgstr "" #. type: table -#: doc/guix.texi:19672 +#: doc/guix.texi:19669 msgid "The type of the record. Common types include A (IPv4 address), AAAA (IPv6 address), NS (Name Server) and MX (Mail eXchange). Many other types are defined." msgstr "" #. type: item -#: doc/guix.texi:19673 +#: doc/guix.texi:19670 #, no-wrap msgid "@code{data} (default: @code{\"\"})" msgstr "" #. type: table -#: doc/guix.texi:19677 +#: doc/guix.texi:19674 msgid "The data contained in the record. For instance an IP address associated with an A record, or a domain name associated with an NS record. Remember that domain names are relative to the origin unless they end with a dot." msgstr "" #. type: deftp -#: doc/guix.texi:19681 +#: doc/guix.texi:19678 #, no-wrap msgid "{Data Type} zone-file" msgstr "" #. type: deftp -#: doc/guix.texi:19684 +#: doc/guix.texi:19681 msgid "Data type representing the content of a zone file. This type has the following parameters:" msgstr "" #. type: table -#: doc/guix.texi:19693 +#: doc/guix.texi:19690 msgid "The list of entries. The SOA record is taken care of, so you don't need to put it in the list of entries. This list should probably contain an entry for your primary authoritative DNS server. Other than using a list of entries directly, you can use @code{define-zone-entries} to define a object containing the list of entries more easily, that you can later pass to the @code{entries} field of the @code{zone-file}." msgstr "" #. type: item -#: doc/guix.texi:19694 +#: doc/guix.texi:19691 #, no-wrap msgid "@code{origin} (default: @code{\"\"})" msgstr "" #. type: table -#: doc/guix.texi:19696 +#: doc/guix.texi:19693 msgid "The name of your zone. This parameter cannot be empty." msgstr "" #. type: item -#: doc/guix.texi:19697 +#: doc/guix.texi:19694 #, no-wrap msgid "@code{ns} (default: @code{\"ns\"})" msgstr "" #. type: table -#: doc/guix.texi:19702 +#: doc/guix.texi:19699 msgid "The domain of your primary authoritative DNS server. The name is relative to the origin, unless it ends with a dot. It is mandatory that this primary DNS server corresponds to an NS record in the zone and that it is associated to an IP address in the list of entries." msgstr "" #. type: item -#: doc/guix.texi:19703 +#: doc/guix.texi:19700 #, no-wrap msgid "@code{mail} (default: @code{\"hostmaster\"})" msgstr "" #. type: table -#: doc/guix.texi:19706 +#: doc/guix.texi:19703 msgid "An email address people can contact you at, as the owner of the zone. This is translated as @code{@@}." msgstr "" #. type: item -#: doc/guix.texi:19707 +#: doc/guix.texi:19704 #, no-wrap msgid "@code{serial} (default: @code{1})" msgstr "" #. type: table -#: doc/guix.texi:19711 +#: doc/guix.texi:19708 msgid "The serial number of the zone. As this is used to keep track of changes by both slaves and resolvers, it is mandatory that it @emph{never} decreases. Always increment it when you make a change in your zone." msgstr "" #. type: item -#: doc/guix.texi:19712 +#: doc/guix.texi:19709 #, no-wrap msgid "@code{refresh} (default: @code{(* 2 24 3600)})" msgstr "" #. type: table -#: doc/guix.texi:19716 +#: doc/guix.texi:19713 msgid "The frequency at which slaves will do a zone transfer. This value is a number of seconds. It can be computed by multiplications or with @code{(string->duration)}." msgstr "" #. type: item -#: doc/guix.texi:19717 +#: doc/guix.texi:19714 #, no-wrap msgid "@code{retry} (default: @code{(* 15 60)})" msgstr "" #. type: table -#: doc/guix.texi:19720 +#: doc/guix.texi:19717 msgid "The period after which a slave will retry to contact its master when it fails to do so a first time." msgstr "" #. type: item -#: doc/guix.texi:19721 +#: doc/guix.texi:19718 #, no-wrap msgid "@code{expiry} (default: @code{(* 14 24 3600)})" msgstr "" #. type: table -#: doc/guix.texi:19725 +#: doc/guix.texi:19722 msgid "Default TTL of records. Existing records are considered correct for at most this amount of time. After this period, resolvers will invalidate their cache and check again that it still exists." msgstr "" #. type: item -#: doc/guix.texi:19726 +#: doc/guix.texi:19723 #, no-wrap msgid "@code{nx} (default: @code{3600})" msgstr "" #. type: table -#: doc/guix.texi:19729 +#: doc/guix.texi:19726 msgid "Default TTL of inexistant records. This delay is usually short because you want your new domains to reach everyone quickly." msgstr "" #. type: deftp -#: doc/guix.texi:19733 +#: doc/guix.texi:19730 #, no-wrap msgid "{Data Type} knot-remote-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19736 +#: doc/guix.texi:19733 msgid "Data type representing a remote configuration. This type has the following parameters:" msgstr "" #. type: table -#: doc/guix.texi:19741 +#: doc/guix.texi:19738 msgid "An identifier for other configuration fields to refer to this remote. IDs must be unique and must not be empty." msgstr "" #. type: table -#: doc/guix.texi:19746 +#: doc/guix.texi:19743 msgid "An ordered list of destination IP addresses. Addresses are tried in sequence. An optional port can be given with the @@ separator. For instance: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}. Default port is 53." msgstr "" #. type: item -#: doc/guix.texi:19747 +#: doc/guix.texi:19744 #, no-wrap msgid "@code{via} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19751 +#: doc/guix.texi:19748 msgid "An ordered list of source IP addresses. An empty list will have Knot choose an appropriate source IP. An optional port can be given with the @@ separator. The default is to choose at random." msgstr "" #. type: item -#: doc/guix.texi:19752 +#: doc/guix.texi:19749 #, no-wrap msgid "@code{key} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19755 +#: doc/guix.texi:19752 msgid "A reference to a key, that is a string containing the identifier of a key defined in a @code{knot-key-configuration} field." msgstr "" #. type: deftp -#: doc/guix.texi:19759 +#: doc/guix.texi:19756 #, no-wrap msgid "{Data Type} knot-keystore-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19762 +#: doc/guix.texi:19759 msgid "Data type representing a keystore to hold dnssec keys. This type has the following parameters:" msgstr "" #. type: table -#: doc/guix.texi:19766 +#: doc/guix.texi:19763 msgid "The id of the keystore. It must not be empty." msgstr "" #. type: item -#: doc/guix.texi:19767 +#: doc/guix.texi:19764 #, no-wrap msgid "@code{backend} (default: @code{'pem})" msgstr "" #. type: table -#: doc/guix.texi:19769 +#: doc/guix.texi:19766 msgid "The backend to store the keys in. Can be @code{'pem} or @code{'pkcs11}." msgstr "" #. type: item -#: doc/guix.texi:19770 +#: doc/guix.texi:19767 #, no-wrap msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})" msgstr "" #. type: table -#: doc/guix.texi:19774 +#: doc/guix.texi:19771 msgid "The configuration string of the backend. An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}. For the pem backend, the string reprensents a path in the file system." msgstr "" #. type: deftp -#: doc/guix.texi:19778 +#: doc/guix.texi:19775 #, no-wrap msgid "{Data Type} knot-policy-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19782 +#: doc/guix.texi:19779 msgid "Data type representing a dnssec policy. Knot DNS is able to automatically sign your zones. It can either generate and manage your keys automatically or use keys that you generate." msgstr "" #. type: deftp -#: doc/guix.texi:19789 +#: doc/guix.texi:19786 msgid "Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that is used to sign the second, and a Zone Signing Key (ZSK) that is used to sign the zone. In order to be trusted, the KSK needs to be present in the parent zone (usually a top-level domain). If your registrar supports dnssec, you will have to send them your KSK's hash so they can add a DS record in their zone. This is not automated and need to be done each time you change your KSK." msgstr "" #. type: deftp -#: doc/guix.texi:19795 +#: doc/guix.texi:19792 msgid "The policy also defines the lifetime of keys. Usually, ZSK can be changed easily and use weaker cryptographic functions (they use lower parameters) in order to sign records quickly, so they are changed often. The KSK however requires manual interaction with the registrar, so they are changed less often and use stronger parameters because they sign only one record." msgstr "" #. type: deftp -#: doc/guix.texi:19797 +#: doc/guix.texi:19794 msgid "This type has the following parameters:" msgstr "" #. type: table -#: doc/guix.texi:19801 +#: doc/guix.texi:19798 msgid "The id of the policy. It must not be empty." msgstr "" #. type: item -#: doc/guix.texi:19802 +#: doc/guix.texi:19799 #, no-wrap msgid "@code{keystore} (default: @code{\"default\"})" msgstr "" #. type: table -#: doc/guix.texi:19807 +#: doc/guix.texi:19804 msgid "A reference to a keystore, that is a string containing the identifier of a keystore defined in a @code{knot-keystore-configuration} field. The @code{\"default\"} identifier means the default keystore (a kasp database that was setup by this service)." msgstr "" #. type: item -#: doc/guix.texi:19808 +#: doc/guix.texi:19805 #, no-wrap msgid "@code{manual?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19810 +#: doc/guix.texi:19807 msgid "Whether the key management is manual or automatic." msgstr "" #. type: item -#: doc/guix.texi:19811 +#: doc/guix.texi:19808 #, no-wrap msgid "@code{single-type-signing?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19813 +#: doc/guix.texi:19810 msgid "When @code{#t}, use the Single-Type Signing Scheme." msgstr "" #. type: item -#: doc/guix.texi:19814 +#: doc/guix.texi:19811 #, no-wrap msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})" msgstr "" #. type: table -#: doc/guix.texi:19816 +#: doc/guix.texi:19813 msgid "An algorithm of signing keys and issued signatures." msgstr "" #. type: item -#: doc/guix.texi:19817 +#: doc/guix.texi:19814 #, no-wrap msgid "@code{ksk-size} (default: @code{256})" msgstr "" #. type: table -#: doc/guix.texi:19820 +#: doc/guix.texi:19817 msgid "The length of the KSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms." msgstr "" #. type: item -#: doc/guix.texi:19821 +#: doc/guix.texi:19818 #, no-wrap msgid "@code{zsk-size} (default: @code{256})" msgstr "" #. type: table -#: doc/guix.texi:19824 +#: doc/guix.texi:19821 msgid "The length of the ZSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms." msgstr "" #. type: item -#: doc/guix.texi:19825 +#: doc/guix.texi:19822 #, no-wrap msgid "@code{dnskey-ttl} (default: @code{'default})" msgstr "" #. type: table -#: doc/guix.texi:19828 +#: doc/guix.texi:19825 msgid "The TTL value for DNSKEY records added into zone apex. The special @code{'default} value means same as the zone SOA TTL." msgstr "" #. type: item -#: doc/guix.texi:19829 +#: doc/guix.texi:19826 #, no-wrap msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})" msgstr "" #. type: table -#: doc/guix.texi:19831 +#: doc/guix.texi:19828 msgid "The period between ZSK publication and the next rollover initiation." msgstr "" #. type: item -#: doc/guix.texi:19832 +#: doc/guix.texi:19829 #, no-wrap msgid "@code{propagation-delay} (default: @code{(* 24 3600)})" msgstr "" #. type: table -#: doc/guix.texi:19835 +#: doc/guix.texi:19832 msgid "An extra delay added for each key rollover step. This value should be high enough to cover propagation of data from the master server to all slaves." msgstr "" #. type: item -#: doc/guix.texi:19836 +#: doc/guix.texi:19833 #, no-wrap msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})" msgstr "" #. type: table -#: doc/guix.texi:19838 +#: doc/guix.texi:19835 msgid "A validity period of newly issued signatures." msgstr "" #. type: item -#: doc/guix.texi:19839 +#: doc/guix.texi:19836 #, no-wrap msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})" msgstr "" #. type: table -#: doc/guix.texi:19841 +#: doc/guix.texi:19838 msgid "A period how long before a signature expiration the signature will be refreshed." msgstr "" #. type: item -#: doc/guix.texi:19842 +#: doc/guix.texi:19839 #, no-wrap msgid "@code{nsec3?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19844 +#: doc/guix.texi:19841 msgid "When @code{#t}, NSEC3 will be used instead of NSEC." msgstr "" #. type: item -#: doc/guix.texi:19845 +#: doc/guix.texi:19842 #, no-wrap msgid "@code{nsec3-iterations} (default: @code{5})" msgstr "" #. type: table -#: doc/guix.texi:19847 +#: doc/guix.texi:19844 msgid "The number of additional times the hashing is performed." msgstr "" #. type: item -#: doc/guix.texi:19848 +#: doc/guix.texi:19845 #, no-wrap msgid "@code{nsec3-salt-length} (default: @code{8})" msgstr "" #. type: table -#: doc/guix.texi:19851 +#: doc/guix.texi:19848 msgid "The length of a salt field in octets, which is appended to the original owner name before hashing." msgstr "" #. type: item -#: doc/guix.texi:19852 +#: doc/guix.texi:19849 #, no-wrap msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})" msgstr "" #. type: table -#: doc/guix.texi:19854 +#: doc/guix.texi:19851 msgid "The validity period of newly issued salt field." msgstr "" #. type: deftp -#: doc/guix.texi:19858 +#: doc/guix.texi:19855 #, no-wrap msgid "{Data Type} knot-zone-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19861 +#: doc/guix.texi:19858 msgid "Data type representing a zone served by Knot. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:19863 +#: doc/guix.texi:19860 #, no-wrap msgid "@code{domain} (default: @code{\"\"})" msgstr "" #. type: table -#: doc/guix.texi:19865 +#: doc/guix.texi:19862 msgid "The domain served by this configuration. It must not be empty." msgstr "" #. type: item -#: doc/guix.texi:19866 +#: doc/guix.texi:19863 #, no-wrap msgid "@code{file} (default: @code{\"\"})" msgstr "" #. type: table -#: doc/guix.texi:19869 +#: doc/guix.texi:19866 msgid "The file where this zone is saved. This parameter is ignored by master zones. Empty means default location that depends on the domain name." msgstr "" #. type: item -#: doc/guix.texi:19870 +#: doc/guix.texi:19867 #, no-wrap msgid "@code{zone} (default: @code{(zone-file)})" msgstr "" #. type: table -#: doc/guix.texi:19873 +#: doc/guix.texi:19870 msgid "The content of the zone file. This parameter is ignored by slave zones. It must contain a zone-file record." msgstr "" #. type: item -#: doc/guix.texi:19874 +#: doc/guix.texi:19871 #, no-wrap msgid "@code{master} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19877 +#: doc/guix.texi:19874 msgid "A list of master remotes. When empty, this zone is a master. When set, this zone is a slave. This is a list of remotes identifiers." msgstr "" #. type: item -#: doc/guix.texi:19878 +#: doc/guix.texi:19875 #, no-wrap msgid "@code{ddns-master} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19881 +#: doc/guix.texi:19878 msgid "The main master. When empty, it defaults to the first master in the list of masters." msgstr "" #. type: item -#: doc/guix.texi:19882 +#: doc/guix.texi:19879 #, no-wrap msgid "@code{notify} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19884 +#: doc/guix.texi:19881 msgid "A list of slave remote identifiers." msgstr "" #. type: item -#: doc/guix.texi:19885 +#: doc/guix.texi:19882 #, no-wrap msgid "@code{acl} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19887 +#: doc/guix.texi:19884 msgid "A list of acl identifiers." msgstr "" #. type: item -#: doc/guix.texi:19888 +#: doc/guix.texi:19885 #, no-wrap msgid "@code{semantic-checks?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19890 +#: doc/guix.texi:19887 msgid "When set, this adds more semantic checks to the zone." msgstr "" #. type: item -#: doc/guix.texi:19891 +#: doc/guix.texi:19888 #, no-wrap msgid "@code{disable-any?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:19893 +#: doc/guix.texi:19890 msgid "When set, this forbids queries of the ANY type." msgstr "" #. type: item -#: doc/guix.texi:19894 +#: doc/guix.texi:19891 #, no-wrap msgid "@code{zonefile-sync} (default: @code{0})" msgstr "" #. type: table -#: doc/guix.texi:19897 +#: doc/guix.texi:19894 msgid "The delay between a modification in memory and on disk. 0 means immediate synchronization." msgstr "" #. type: item -#: doc/guix.texi:19898 +#: doc/guix.texi:19895 #, no-wrap msgid "@code{zonefile-load} (default: @code{#f})" msgstr "@code{zonefile-load} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19901 +#: doc/guix.texi:19898 msgid "The way the zone file contents are applied during zone load. Possible values are:" msgstr "" #. type: item -#: doc/guix.texi:19903 +#: doc/guix.texi:19900 #, no-wrap msgid "@code{#f} for using the default value from Knot," msgstr "" #. type: item -#: doc/guix.texi:19904 +#: doc/guix.texi:19901 #, no-wrap msgid "@code{'none} for not using the zone file at all," msgstr "" #. type: item -#: doc/guix.texi:19905 +#: doc/guix.texi:19902 #, no-wrap msgid "@code{'difference} for computing the difference between already available" msgstr "" #. type: itemize -#: doc/guix.texi:19907 +#: doc/guix.texi:19904 msgid "contents and zone contents and applying it to the current zone contents," msgstr "" #. type: item -#: doc/guix.texi:19907 +#: doc/guix.texi:19904 #, no-wrap msgid "@code{'difference-no-serial} for the same as @code{'difference}, but" msgstr "" #. type: itemize -#: doc/guix.texi:19910 +#: doc/guix.texi:19907 msgid "ignoring the SOA serial in the zone file, while the server takes care of it automatically." msgstr "" #. type: item -#: doc/guix.texi:19910 +#: doc/guix.texi:19907 #, no-wrap msgid "@code{'whole} for loading zone contents from the zone file." msgstr "" #. type: item -#: doc/guix.texi:19913 +#: doc/guix.texi:19910 #, no-wrap msgid "@code{journal-content} (default: @code{#f})" msgstr "@code{journal-content} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19918 +#: doc/guix.texi:19915 msgid "The way the journal is used to store zone and its changes. Possible values are @code{'none} to not use it at all, @code{'changes} to store changes and @code{'all} to store contents. @code{#f} does not set this option, so the default value from Knot is used." msgstr "" #. type: item -#: doc/guix.texi:19919 +#: doc/guix.texi:19916 #, no-wrap msgid "@code{max-journal-usage} (default: @code{#f})" msgstr "@code{max-journal-usage} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19922 +#: doc/guix.texi:19919 msgid "The maximum size for the journal on disk. @code{#f} does not set this option, so the default value from Knot is used." msgstr "" #. type: item -#: doc/guix.texi:19923 +#: doc/guix.texi:19920 #, no-wrap msgid "@code{max-journal-depth} (default: @code{#f})" msgstr "@code{max-journal-depth} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19926 +#: doc/guix.texi:19923 msgid "The maximum size of the history. @code{#f} does not set this option, so the default value from Knot is used." msgstr "" #. type: item -#: doc/guix.texi:19927 +#: doc/guix.texi:19924 #, no-wrap msgid "@code{max-zone-size} (default: @code{#f})" msgstr "@code{max-zone-size} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19931 +#: doc/guix.texi:19928 msgid "The maximum size of the zone file. This limit is enforced for incoming transfer and updates. @code{#f} does not set this option, so the default value from Knot is used." msgstr "" #. type: item -#: doc/guix.texi:19932 +#: doc/guix.texi:19929 #, no-wrap msgid "@code{dnssec-policy} (default: @code{#f})" msgstr "@code{dnssec-policy} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19936 +#: doc/guix.texi:19933 msgid "A reference to a @code{knot-policy-configuration} record, or the special name @code{\"default\"}. If the value is @code{#f}, there is no dnssec signing on this zone." msgstr "" #. type: item -#: doc/guix.texi:19937 +#: doc/guix.texi:19934 #, no-wrap msgid "@code{serial-policy} (default: @code{'increment})" msgstr "" #. type: table -#: doc/guix.texi:19939 +#: doc/guix.texi:19936 msgid "A policy between @code{'increment} and @code{'unixtime}." msgstr "" #. type: deftp -#: doc/guix.texi:19943 +#: doc/guix.texi:19940 #, no-wrap msgid "{Data Type} knot-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:19946 +#: doc/guix.texi:19943 msgid "Data type representing the Knot configuration. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:19948 +#: doc/guix.texi:19945 #, no-wrap msgid "@code{knot} (default: @code{knot})" msgstr "" #. type: table -#: doc/guix.texi:19950 +#: doc/guix.texi:19947 msgid "The Knot package." msgstr "" #. type: item -#: doc/guix.texi:19951 +#: doc/guix.texi:19948 #, no-wrap msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})" msgstr "" #. type: table -#: doc/guix.texi:19953 +#: doc/guix.texi:19950 msgid "The run directory. This directory will be used for pid file and sockets." msgstr "" #. type: item -#: doc/guix.texi:19954 +#: doc/guix.texi:19951 #, no-wrap msgid "@code{includes} (default: @code{'()})" msgstr "@code{includes} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19957 +#: doc/guix.texi:19954 msgid "A list of strings or file-like objects denoting other files that must be included at the top of the configuration file." msgstr "Eine flache Liste von Zeichenketten oder dateiartigen Objekten, die oben in der Konfigurationsdatei eingebunden werden müssen." #. type: cindex -#: doc/guix.texi:19958 +#: doc/guix.texi:19955 #, no-wrap msgid "secrets, Knot service" msgstr "Geheimnisse, Knot-Dienst" #. type: table -#: doc/guix.texi:19964 +#: doc/guix.texi:19961 msgid "This can be used to manage secrets out-of-band. For example, secret keys may be stored in an out-of-band file not managed by Guix, and thus not visible in @file{/gnu/store}---e.g., you could store secret key configuration in @file{/etc/knot/secrets.conf} and add this file to the @code{includes} list." msgstr "" #. type: table -#: doc/guix.texi:19966 +#: doc/guix.texi:19963 msgid "It can also be used to add configuration not supported by this interface." msgstr "" #. type: item -#: doc/guix.texi:19967 +#: doc/guix.texi:19964 #, no-wrap msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})" msgstr "" #. type: table -#: doc/guix.texi:19969 doc/guix.texi:19972 +#: doc/guix.texi:19966 doc/guix.texi:19969 msgid "An ip address on which to listen." msgstr "" #. type: item -#: doc/guix.texi:19970 +#: doc/guix.texi:19967 #, no-wrap msgid "@code{listen-v6} (default: @code{\"::\"})" msgstr "" #. type: item -#: doc/guix.texi:19973 +#: doc/guix.texi:19970 #, no-wrap msgid "@code{listen-port} (default: @code{53})" msgstr "" #. type: table -#: doc/guix.texi:19975 +#: doc/guix.texi:19972 msgid "A port on which to listen." msgstr "" #. type: item -#: doc/guix.texi:19976 +#: doc/guix.texi:19973 #, no-wrap msgid "@code{keys} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19978 +#: doc/guix.texi:19975 msgid "The list of knot-key-configuration used by this configuration." msgstr "" #. type: item -#: doc/guix.texi:19979 +#: doc/guix.texi:19976 #, no-wrap msgid "@code{acls} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19981 +#: doc/guix.texi:19978 msgid "The list of knot-acl-configuration used by this configuration." msgstr "" #. type: item -#: doc/guix.texi:19982 +#: doc/guix.texi:19979 #, no-wrap msgid "@code{remotes} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19984 +#: doc/guix.texi:19981 msgid "The list of knot-remote-configuration used by this configuration." msgstr "" #. type: item -#: doc/guix.texi:19985 +#: doc/guix.texi:19982 #, no-wrap msgid "@code{zones} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:19987 +#: doc/guix.texi:19984 msgid "The list of knot-zone-configuration used by this configuration." msgstr "" #. type: subsubheading -#: doc/guix.texi:19991 +#: doc/guix.texi:19988 #, no-wrap msgid "Dnsmasq Service" msgstr "Dnsmasq-Dienst" #. type: deffn -#: doc/guix.texi:19993 +#: doc/guix.texi:19990 #, no-wrap msgid "{Scheme Variable} dnsmasq-service-type" msgstr "" #. type: deffn -#: doc/guix.texi:19996 +#: doc/guix.texi:19993 msgid "This is the type of the dnsmasq service, whose value should be an @code{dnsmasq-configuration} object as in this example:" msgstr "" #. type: example -#: doc/guix.texi:20002 +#: doc/guix.texi:19999 #, no-wrap msgid "" "(service dnsmasq-service-type\n" @@ -37487,1158 +37541,1158 @@ msgid "" msgstr "" #. type: deftp -#: doc/guix.texi:20005 +#: doc/guix.texi:20002 #, no-wrap msgid "{Data Type} dnsmasq-configuration" msgstr "{Datentyp} dnsmasq-configuration" #. type: deftp -#: doc/guix.texi:20007 +#: doc/guix.texi:20004 msgid "Data type representing the configuration of dnsmasq." msgstr "Repräsentiert die dnsmasq-Konfiguration." #. type: item -#: doc/guix.texi:20009 +#: doc/guix.texi:20006 #, no-wrap msgid "@code{package} (default: @var{dnsmasq})" msgstr "@code{package} (Vorgabe: @var{dnsmasq})" #. type: table -#: doc/guix.texi:20011 +#: doc/guix.texi:20008 msgid "Package object of the dnsmasq server." msgstr "" #. type: item -#: doc/guix.texi:20012 +#: doc/guix.texi:20009 #, no-wrap msgid "@code{no-hosts?} (default: @code{#f})" msgstr "@code{no-hosts?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20014 +#: doc/guix.texi:20011 msgid "When true, don't read the hostnames in /etc/hosts." msgstr "" #. type: item -#: doc/guix.texi:20015 +#: doc/guix.texi:20012 #, no-wrap msgid "@code{port} (default: @code{53})" msgstr "@code{port} (Vorgabe: @code{53})" #. type: table -#: doc/guix.texi:20018 +#: doc/guix.texi:20015 msgid "The port to listen on. Setting this to zero completely disables DNS responses, leaving only DHCP and/or TFTP functions." msgstr "" #. type: item -#: doc/guix.texi:20019 +#: doc/guix.texi:20016 #, no-wrap msgid "@code{local-service?} (default: @code{#t})" msgstr "@code{local-service?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:20022 +#: doc/guix.texi:20019 msgid "Accept DNS queries only from hosts whose address is on a local subnet, ie a subnet for which an interface exists on the server." msgstr "" #. type: item -#: doc/guix.texi:20023 +#: doc/guix.texi:20020 #, no-wrap msgid "@code{listen-addresses} (default: @code{'()})" msgstr "@code{listen-addresses} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:20025 +#: doc/guix.texi:20022 msgid "Listen on the given IP addresses." msgstr "" #. type: item -#: doc/guix.texi:20026 +#: doc/guix.texi:20023 #, no-wrap msgid "@code{resolv-file} (default: @code{\"/etc/resolv.conf\"})" msgstr "@code{resolv-file} (Vorgabe: @code{\"/etc/resolv.conf\"})" #. type: table -#: doc/guix.texi:20028 +#: doc/guix.texi:20025 msgid "The file to read the IP address of the upstream nameservers from." msgstr "" #. type: item -#: doc/guix.texi:20029 +#: doc/guix.texi:20026 #, no-wrap msgid "@code{no-resolv?} (default: @code{#f})" msgstr "@code{no-resolv?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20031 +#: doc/guix.texi:20028 msgid "When true, don't read @var{resolv-file}." msgstr "" #. type: table -#: doc/guix.texi:20034 +#: doc/guix.texi:20031 msgid "Specify IP address of upstream servers directly." msgstr "" #. type: item -#: doc/guix.texi:20035 +#: doc/guix.texi:20032 #, no-wrap msgid "@code{cache-size} (default: @code{150})" msgstr "@code{cache-size} (Vorgabe: @code{150})" #. type: table -#: doc/guix.texi:20038 +#: doc/guix.texi:20035 msgid "Set the size of dnsmasq's cache. Setting the cache size to zero disables caching." msgstr "" #. type: item -#: doc/guix.texi:20039 +#: doc/guix.texi:20036 #, no-wrap msgid "@code{negative-cache?} (default: @code{#t})" msgstr "@code{negative-cache?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:20041 +#: doc/guix.texi:20038 msgid "When false, disable negative caching." msgstr "" #. type: subsubheading -#: doc/guix.texi:20045 +#: doc/guix.texi:20042 #, no-wrap msgid "ddclient Service" msgstr "ddclient-Dienst" #. type: cindex -#: doc/guix.texi:20047 +#: doc/guix.texi:20044 #, no-wrap msgid "ddclient" msgstr "" #. type: Plain text -#: doc/guix.texi:20051 +#: doc/guix.texi:20048 msgid "The ddclient service described below runs the ddclient daemon, which takes care of automatically updating DNS entries for service providers such as @uref{https://dyn.com/dns/, Dyn}." msgstr "" #. type: Plain text -#: doc/guix.texi:20054 +#: doc/guix.texi:20051 msgid "The following example show instantiates the service with its default configuration:" msgstr "" #. type: example -#: doc/guix.texi:20057 +#: doc/guix.texi:20054 #, no-wrap msgid "(service ddclient-service-type)\n" msgstr "" #. type: Plain text -#: doc/guix.texi:20066 +#: doc/guix.texi:20063 msgid "Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see @code{secret-file} below.) You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be world-readable @i{via} @file{/gnu/store}.) See the examples in the @file{share/ddclient} directory of the @code{ddclient} package." msgstr "" #. type: Plain text -#: doc/guix.texi:20070 +#: doc/guix.texi:20067 msgid "Available @code{ddclient-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:20071 +#: doc/guix.texi:20068 #, no-wrap msgid "{@code{ddclient-configuration} parameter} package ddclient" msgstr "" #. type: deftypevr -#: doc/guix.texi:20073 +#: doc/guix.texi:20070 msgid "The ddclient package." msgstr "Das ddclient-Paket." #. type: deftypevr -#: doc/guix.texi:20076 +#: doc/guix.texi:20073 #, no-wrap msgid "{@code{ddclient-configuration} parameter} integer daemon" msgstr "" #. type: deftypevr -#: doc/guix.texi:20078 +#: doc/guix.texi:20075 msgid "The period after which ddclient will retry to check IP and domain name." msgstr "" #. type: deftypevr -#: doc/guix.texi:20083 +#: doc/guix.texi:20080 #, no-wrap msgid "{@code{ddclient-configuration} parameter} boolean syslog" msgstr "" #. type: deftypevr -#: doc/guix.texi:20085 +#: doc/guix.texi:20082 msgid "Use syslog for the output." msgstr "" #. type: deftypevr -#: doc/guix.texi:20090 +#: doc/guix.texi:20087 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string mail" msgstr "" #. type: deftypevr -#: doc/guix.texi:20092 +#: doc/guix.texi:20089 msgid "Mail to user." msgstr "" #. type: deftypevr -#: doc/guix.texi:20094 doc/guix.texi:20101 doc/guix.texi:21438 +#: doc/guix.texi:20091 doc/guix.texi:20098 doc/guix.texi:21435 msgid "Defaults to @samp{\"root\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20097 +#: doc/guix.texi:20094 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string mail-failure" msgstr "" #. type: deftypevr -#: doc/guix.texi:20099 +#: doc/guix.texi:20096 msgid "Mail failed update to user." msgstr "Den Nutzer per Mail bei fehlgeschlagenen Aktualisierungen benachrichtigen." #. type: deftypevr -#: doc/guix.texi:20104 +#: doc/guix.texi:20101 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string pid" msgstr "" #. type: deftypevr -#: doc/guix.texi:20106 +#: doc/guix.texi:20103 msgid "The ddclient PID file." msgstr "PID-Datei für den ddclient." #. type: deftypevr -#: doc/guix.texi:20108 +#: doc/guix.texi:20105 msgid "Defaults to @samp{\"/var/run/ddclient/ddclient.pid\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20111 +#: doc/guix.texi:20108 #, no-wrap msgid "{@code{ddclient-configuration} parameter} boolean ssl" msgstr "" #. type: deftypevr -#: doc/guix.texi:20113 +#: doc/guix.texi:20110 msgid "Enable SSL support." msgstr "" #. type: deftypevr -#: doc/guix.texi:20118 +#: doc/guix.texi:20115 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string user" msgstr "" #. type: deftypevr -#: doc/guix.texi:20121 +#: doc/guix.texi:20118 msgid "Specifies the user name or ID that is used when running ddclient program." msgstr "" #. type: deftypevr -#: doc/guix.texi:20123 doc/guix.texi:20130 +#: doc/guix.texi:20120 doc/guix.texi:20127 msgid "Defaults to @samp{\"ddclient\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20126 +#: doc/guix.texi:20123 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string group" msgstr "" #. type: deftypevr -#: doc/guix.texi:20128 +#: doc/guix.texi:20125 msgid "Group of the user who will run the ddclient program." msgstr "" #. type: deftypevr -#: doc/guix.texi:20133 +#: doc/guix.texi:20130 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string secret-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:20137 +#: doc/guix.texi:20134 msgid "Secret file which will be appended to @file{ddclient.conf} file. This file contains credentials for use by ddclient. You are expected to create it manually." msgstr "" #. type: deftypevr -#: doc/guix.texi:20139 +#: doc/guix.texi:20136 msgid "Defaults to @samp{\"/etc/ddclient/secrets.conf\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20142 +#: doc/guix.texi:20139 #, no-wrap msgid "{@code{ddclient-configuration} parameter} list extra-options" msgstr "" #. type: deftypevr -#: doc/guix.texi:20144 +#: doc/guix.texi:20141 msgid "Extra options will be appended to @file{ddclient.conf} file." msgstr "" #. type: cindex -#: doc/guix.texi:20155 +#: doc/guix.texi:20152 #, no-wrap msgid "VPN (virtual private network)" msgstr "" #. type: cindex -#: doc/guix.texi:20156 +#: doc/guix.texi:20153 #, no-wrap msgid "virtual private network (VPN)" msgstr "" #. type: Plain text -#: doc/guix.texi:20162 +#: doc/guix.texi:20159 msgid "The @code{(gnu services vpn)} module provides services related to @dfn{virtual private networks} (VPNs). It provides a @emph{client} service for your machine to connect to a VPN, and a @emph{server} service for your machine to host a VPN. Both services use @uref{https://openvpn.net/, OpenVPN}." msgstr "" #. type: deffn -#: doc/guix.texi:20163 +#: doc/guix.texi:20160 #, no-wrap msgid "{Scheme Procedure} openvpn-client-service @" msgstr "" #. type: deffn -#: doc/guix.texi:20165 +#: doc/guix.texi:20162 msgid "[#:config (openvpn-client-configuration)]" msgstr "" #. type: deffn -#: doc/guix.texi:20167 +#: doc/guix.texi:20164 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a client." msgstr "" #. type: deffn -#: doc/guix.texi:20169 +#: doc/guix.texi:20166 #, no-wrap msgid "{Scheme Procedure} openvpn-server-service @" msgstr "" #. type: deffn -#: doc/guix.texi:20171 +#: doc/guix.texi:20168 msgid "[#:config (openvpn-server-configuration)]" msgstr "" #. type: deffn -#: doc/guix.texi:20173 +#: doc/guix.texi:20170 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a server." msgstr "" #. type: deffn -#: doc/guix.texi:20175 +#: doc/guix.texi:20172 msgid "Both can be run simultaneously." msgstr "" #. type: Plain text -#: doc/guix.texi:20180 +#: doc/guix.texi:20177 msgid "Available @code{openvpn-client-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:20181 +#: doc/guix.texi:20178 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} package openvpn" msgstr "" #. type: deftypevr -#: doc/guix.texi:20183 doc/guix.texi:20319 +#: doc/guix.texi:20180 doc/guix.texi:20316 msgid "The OpenVPN package." msgstr "" #. type: deftypevr -#: doc/guix.texi:20186 +#: doc/guix.texi:20183 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string pid-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:20188 doc/guix.texi:20324 +#: doc/guix.texi:20185 doc/guix.texi:20321 msgid "The OpenVPN pid file." msgstr "" #. type: deftypevr -#: doc/guix.texi:20190 doc/guix.texi:20326 +#: doc/guix.texi:20187 doc/guix.texi:20323 msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20193 +#: doc/guix.texi:20190 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} proto proto" msgstr "" #. type: deftypevr -#: doc/guix.texi:20196 doc/guix.texi:20332 +#: doc/guix.texi:20193 doc/guix.texi:20329 msgid "The protocol (UDP or TCP) used to open a channel between clients and servers." msgstr "" #. type: deftypevr -#: doc/guix.texi:20198 doc/guix.texi:20334 +#: doc/guix.texi:20195 doc/guix.texi:20331 msgid "Defaults to @samp{udp}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20201 +#: doc/guix.texi:20198 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} dev dev" msgstr "" #. type: deftypevr -#: doc/guix.texi:20203 doc/guix.texi:20339 +#: doc/guix.texi:20200 doc/guix.texi:20336 msgid "The device type used to represent the VPN connection." msgstr "" #. type: deftypevr -#: doc/guix.texi:20205 doc/guix.texi:20341 +#: doc/guix.texi:20202 doc/guix.texi:20338 msgid "Defaults to @samp{tun}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20208 +#: doc/guix.texi:20205 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string ca" msgstr "" #. type: deftypevr -#: doc/guix.texi:20210 doc/guix.texi:20346 +#: doc/guix.texi:20207 doc/guix.texi:20343 msgid "The certificate authority to check connections against." msgstr "" #. type: deftypevr -#: doc/guix.texi:20212 doc/guix.texi:20348 +#: doc/guix.texi:20209 doc/guix.texi:20345 msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20215 +#: doc/guix.texi:20212 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string cert" msgstr "" #. type: deftypevr -#: doc/guix.texi:20218 doc/guix.texi:20354 +#: doc/guix.texi:20215 doc/guix.texi:20351 msgid "The certificate of the machine the daemon is running on. It should be signed by the authority given in @code{ca}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20220 doc/guix.texi:20356 +#: doc/guix.texi:20217 doc/guix.texi:20353 msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20223 +#: doc/guix.texi:20220 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string key" msgstr "" #. type: deftypevr -#: doc/guix.texi:20226 doc/guix.texi:20362 +#: doc/guix.texi:20223 doc/guix.texi:20359 msgid "The key of the machine the daemon is running on. It must be the key whose certificate is @code{cert}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20228 doc/guix.texi:20364 +#: doc/guix.texi:20225 doc/guix.texi:20361 msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20231 +#: doc/guix.texi:20228 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20233 doc/guix.texi:20369 +#: doc/guix.texi:20230 doc/guix.texi:20366 msgid "Whether to use the lzo compression algorithm." msgstr "" #. type: deftypevr -#: doc/guix.texi:20238 +#: doc/guix.texi:20235 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20240 doc/guix.texi:20376 +#: doc/guix.texi:20237 doc/guix.texi:20373 msgid "Don't re-read key files across SIGUSR1 or --ping-restart." msgstr "" #. type: deftypevr -#: doc/guix.texi:20245 +#: doc/guix.texi:20242 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20248 doc/guix.texi:20384 +#: doc/guix.texi:20245 doc/guix.texi:20381 msgid "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts." msgstr "" #. type: deftypevr -#: doc/guix.texi:20253 +#: doc/guix.texi:20250 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} number verbosity" msgstr "" #. type: deftypevr -#: doc/guix.texi:20255 doc/guix.texi:20391 +#: doc/guix.texi:20252 doc/guix.texi:20388 msgid "Verbosity level." msgstr "" #. type: deftypevr -#: doc/guix.texi:20257 doc/guix.texi:20393 doc/guix.texi:21706 -#: doc/guix.texi:21929 +#: doc/guix.texi:20254 doc/guix.texi:20390 doc/guix.texi:21703 +#: doc/guix.texi:21926 msgid "Defaults to @samp{3}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20260 +#: doc/guix.texi:20257 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth" msgstr "" #. type: deftypevr -#: doc/guix.texi:20263 doc/guix.texi:20399 +#: doc/guix.texi:20260 doc/guix.texi:20396 msgid "Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks." msgstr "" #. type: deftypevr -#: doc/guix.texi:20268 +#: doc/guix.texi:20265 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20270 +#: doc/guix.texi:20267 msgid "Whether to check the server certificate has server usage extension." msgstr "" #. type: deftypevr -#: doc/guix.texi:20275 +#: doc/guix.texi:20272 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} bind bind?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20277 +#: doc/guix.texi:20274 msgid "Bind to a specific local port number." msgstr "" #. type: deftypevr -#: doc/guix.texi:20282 +#: doc/guix.texi:20279 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20284 +#: doc/guix.texi:20281 msgid "Retry resolving server address." msgstr "" #. type: deftypevr -#: doc/guix.texi:20289 +#: doc/guix.texi:20286 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote" msgstr "" #. type: deftypevr -#: doc/guix.texi:20291 +#: doc/guix.texi:20288 msgid "A list of remote servers to connect to." msgstr "" #. type: deftypevr -#: doc/guix.texi:20295 +#: doc/guix.texi:20292 msgid "Available @code{openvpn-remote-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:20296 +#: doc/guix.texi:20293 #, no-wrap msgid "{@code{openvpn-remote-configuration} parameter} string name" msgstr "" #. type: deftypevr -#: doc/guix.texi:20298 +#: doc/guix.texi:20295 msgid "Server name." msgstr "" #. type: deftypevr -#: doc/guix.texi:20300 +#: doc/guix.texi:20297 msgid "Defaults to @samp{\"my-server\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20303 +#: doc/guix.texi:20300 #, no-wrap msgid "{@code{openvpn-remote-configuration} parameter} number port" msgstr "" #. type: deftypevr -#: doc/guix.texi:20305 +#: doc/guix.texi:20302 msgid "Port number the server listens to." msgstr "" #. type: deftypevr -#: doc/guix.texi:20307 doc/guix.texi:20408 +#: doc/guix.texi:20304 doc/guix.texi:20405 msgid "Defaults to @samp{1194}." msgstr "" #. type: Plain text -#: doc/guix.texi:20316 +#: doc/guix.texi:20313 msgid "Available @code{openvpn-server-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:20317 +#: doc/guix.texi:20314 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} package openvpn" msgstr "" #. type: deftypevr -#: doc/guix.texi:20322 +#: doc/guix.texi:20319 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string pid-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:20329 +#: doc/guix.texi:20326 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} proto proto" msgstr "" #. type: deftypevr -#: doc/guix.texi:20337 +#: doc/guix.texi:20334 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} dev dev" msgstr "" #. type: deftypevr -#: doc/guix.texi:20344 +#: doc/guix.texi:20341 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string ca" msgstr "" #. type: deftypevr -#: doc/guix.texi:20351 +#: doc/guix.texi:20348 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string cert" msgstr "" #. type: deftypevr -#: doc/guix.texi:20359 +#: doc/guix.texi:20356 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string key" msgstr "" #. type: deftypevr -#: doc/guix.texi:20367 +#: doc/guix.texi:20364 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20374 +#: doc/guix.texi:20371 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20381 +#: doc/guix.texi:20378 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20389 +#: doc/guix.texi:20386 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number verbosity" msgstr "" #. type: deftypevr -#: doc/guix.texi:20396 +#: doc/guix.texi:20393 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth" msgstr "" #. type: deftypevr -#: doc/guix.texi:20404 +#: doc/guix.texi:20401 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number port" msgstr "" #. type: deftypevr -#: doc/guix.texi:20406 +#: doc/guix.texi:20403 msgid "Specifies the port number on which the server listens." msgstr "" #. type: deftypevr -#: doc/guix.texi:20411 +#: doc/guix.texi:20408 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} ip-mask server" msgstr "" #. type: deftypevr -#: doc/guix.texi:20413 +#: doc/guix.texi:20410 msgid "An ip and mask specifying the subnet inside the virtual network." msgstr "" #. type: deftypevr -#: doc/guix.texi:20415 +#: doc/guix.texi:20412 msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20418 +#: doc/guix.texi:20415 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6" msgstr "" #. type: deftypevr -#: doc/guix.texi:20420 +#: doc/guix.texi:20417 msgid "A CIDR notation specifying the IPv6 subnet inside the virtual network." msgstr "" #. type: deftypevr -#: doc/guix.texi:20425 +#: doc/guix.texi:20422 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string dh" msgstr "" #. type: deftypevr -#: doc/guix.texi:20427 +#: doc/guix.texi:20424 msgid "The Diffie-Hellman parameters file." msgstr "" #. type: deftypevr -#: doc/guix.texi:20429 +#: doc/guix.texi:20426 msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20432 +#: doc/guix.texi:20429 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist" msgstr "" #. type: deftypevr -#: doc/guix.texi:20434 +#: doc/guix.texi:20431 msgid "The file that records client IPs." msgstr "" #. type: deftypevr -#: doc/guix.texi:20436 +#: doc/guix.texi:20433 msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20439 +#: doc/guix.texi:20436 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20441 +#: doc/guix.texi:20438 msgid "When true, the server will act as a gateway for its clients." msgstr "" #. type: deftypevr -#: doc/guix.texi:20446 +#: doc/guix.texi:20443 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20448 +#: doc/guix.texi:20445 msgid "When true, clients are allowed to talk to each other inside the VPN." msgstr "" #. type: deftypevr -#: doc/guix.texi:20453 +#: doc/guix.texi:20450 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive" msgstr "" #. type: deftypevr -#: doc/guix.texi:20459 +#: doc/guix.texi:20456 msgid "Causes ping-like messages to be sent back and forth over the link so that each side knows when the other side has gone down. @code{keepalive} requires a pair. The first element is the period of the ping sending, and the second element is the timeout before considering the other side down." msgstr "" #. type: deftypevr -#: doc/guix.texi:20462 +#: doc/guix.texi:20459 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number max-clients" msgstr "" #. type: deftypevr -#: doc/guix.texi:20464 +#: doc/guix.texi:20461 msgid "The maximum number of clients." msgstr "" #. type: deftypevr -#: doc/guix.texi:20469 +#: doc/guix.texi:20466 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string status" msgstr "" #. type: deftypevr -#: doc/guix.texi:20472 +#: doc/guix.texi:20469 msgid "The status file. This file shows a small report on current connection. It is truncated and rewritten every minute." msgstr "" #. type: deftypevr -#: doc/guix.texi:20474 +#: doc/guix.texi:20471 msgid "Defaults to @samp{\"/var/run/openvpn/status\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20477 +#: doc/guix.texi:20474 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir" msgstr "" #. type: deftypevr -#: doc/guix.texi:20479 +#: doc/guix.texi:20476 msgid "The list of configuration for some clients." msgstr "" #. type: deftypevr -#: doc/guix.texi:20483 +#: doc/guix.texi:20480 msgid "Available @code{openvpn-ccd-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:20484 +#: doc/guix.texi:20481 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} string name" msgstr "" #. type: deftypevr -#: doc/guix.texi:20486 +#: doc/guix.texi:20483 msgid "Client name." msgstr "" #. type: deftypevr -#: doc/guix.texi:20488 +#: doc/guix.texi:20485 msgid "Defaults to @samp{\"client\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20491 +#: doc/guix.texi:20488 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute" msgstr "" #. type: deftypevr -#: doc/guix.texi:20493 +#: doc/guix.texi:20490 msgid "Client own network" msgstr "" #. type: deftypevr -#: doc/guix.texi:20498 +#: doc/guix.texi:20495 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push" msgstr "" #. type: deftypevr -#: doc/guix.texi:20500 +#: doc/guix.texi:20497 msgid "Client VPN IP." msgstr "" #. type: cindex -#: doc/guix.texi:20513 +#: doc/guix.texi:20510 #, no-wrap msgid "NFS" msgstr "" #. type: Plain text -#: doc/guix.texi:20518 +#: doc/guix.texi:20515 msgid "The @code{(gnu services nfs)} module provides the following services, which are most commonly used in relation to mounting or exporting directory trees as @dfn{network file systems} (NFS)." msgstr "" #. type: subsubheading -#: doc/guix.texi:20519 +#: doc/guix.texi:20516 #, no-wrap msgid "RPC Bind Service" msgstr "" #. type: cindex -#: doc/guix.texi:20520 +#: doc/guix.texi:20517 #, no-wrap msgid "rpcbind" msgstr "" #. type: Plain text -#: doc/guix.texi:20526 +#: doc/guix.texi:20523 msgid "The RPC Bind service provides a facility to map program numbers into universal addresses. Many NFS related services use this facility. Hence it is automatically started when a dependent service starts." msgstr "" #. type: defvr -#: doc/guix.texi:20527 +#: doc/guix.texi:20524 #, no-wrap msgid "{Scheme Variable} rpcbind-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:20529 +#: doc/guix.texi:20526 msgid "A service type for the RPC portmapper daemon." msgstr "" #. type: deftp -#: doc/guix.texi:20532 +#: doc/guix.texi:20529 #, no-wrap msgid "{Data Type} rpcbind-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:20535 +#: doc/guix.texi:20532 msgid "Data type representing the configuration of the RPC Bind Service. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:20536 +#: doc/guix.texi:20533 #, no-wrap msgid "@code{rpcbind} (default: @code{rpcbind})" msgstr "" #. type: table -#: doc/guix.texi:20538 +#: doc/guix.texi:20535 msgid "The rpcbind package to use." msgstr "" #. type: item -#: doc/guix.texi:20539 +#: doc/guix.texi:20536 #, no-wrap msgid "@code{warm-start?} (default: @code{#t})" msgstr "" #. type: table -#: doc/guix.texi:20543 +#: doc/guix.texi:20540 msgid "If this parameter is @code{#t}, then the daemon will read a state file on startup thus reloading state information saved by a previous instance." msgstr "" #. type: subsubheading -#: doc/guix.texi:20547 +#: doc/guix.texi:20544 #, no-wrap msgid "Pipefs Pseudo File System" msgstr "" #. type: cindex -#: doc/guix.texi:20548 +#: doc/guix.texi:20545 #, no-wrap msgid "pipefs" msgstr "" #. type: cindex -#: doc/guix.texi:20549 +#: doc/guix.texi:20546 #, no-wrap msgid "rpc_pipefs" msgstr "" #. type: Plain text -#: doc/guix.texi:20553 +#: doc/guix.texi:20550 msgid "The pipefs file system is used to transfer NFS related data between the kernel and user space programs." msgstr "" #. type: defvr -#: doc/guix.texi:20554 +#: doc/guix.texi:20551 #, no-wrap msgid "{Scheme Variable} pipefs-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:20556 +#: doc/guix.texi:20553 msgid "A service type for the pipefs pseudo file system." msgstr "" #. type: deftp -#: doc/guix.texi:20558 +#: doc/guix.texi:20555 #, no-wrap msgid "{Data Type} pipefs-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:20561 +#: doc/guix.texi:20558 msgid "Data type representing the configuration of the pipefs pseudo file system service. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:20562 +#: doc/guix.texi:20559 #, no-wrap msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" msgstr "" #. type: table -#: doc/guix.texi:20564 +#: doc/guix.texi:20561 msgid "The directory to which the file system is to be attached." msgstr "" #. type: subsubheading -#: doc/guix.texi:20568 +#: doc/guix.texi:20565 #, no-wrap msgid "GSS Daemon Service" msgstr "" #. type: cindex -#: doc/guix.texi:20569 +#: doc/guix.texi:20566 #, no-wrap msgid "GSSD" msgstr "" #. type: cindex -#: doc/guix.texi:20570 +#: doc/guix.texi:20567 #, no-wrap msgid "GSS" msgstr "" #. type: cindex -#: doc/guix.texi:20571 +#: doc/guix.texi:20568 #, no-wrap msgid "global security system" msgstr "" #. type: Plain text -#: doc/guix.texi:20578 +#: doc/guix.texi:20575 msgid "The @dfn{global security system} (GSS) daemon provides strong security for RPC based protocols. Before exchanging RPC requests an RPC client must establish a security context. Typically this is done using the Kerberos command @command{kinit} or automatically at login time using PAM services (@pxref{Kerberos Services})." msgstr "" #. type: defvr -#: doc/guix.texi:20579 +#: doc/guix.texi:20576 #, no-wrap msgid "{Scheme Variable} gss-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:20581 +#: doc/guix.texi:20578 msgid "A service type for the Global Security System (GSS) daemon." msgstr "" #. type: deftp -#: doc/guix.texi:20583 +#: doc/guix.texi:20580 #, no-wrap msgid "{Data Type} gss-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:20586 +#: doc/guix.texi:20583 msgid "Data type representing the configuration of the GSS daemon service. This type has the following parameters:" msgstr "" #. type: item -#: doc/guix.texi:20587 doc/guix.texi:20612 +#: doc/guix.texi:20584 doc/guix.texi:20609 #, no-wrap msgid "@code{nfs-utils} (default: @code{nfs-utils})" msgstr "" #. type: table -#: doc/guix.texi:20589 +#: doc/guix.texi:20586 msgid "The package in which the @command{rpc.gssd} command is to be found." msgstr "" #. type: item -#: doc/guix.texi:20590 doc/guix.texi:20615 +#: doc/guix.texi:20587 doc/guix.texi:20612 #, no-wrap msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" msgstr "" #. type: table -#: doc/guix.texi:20592 doc/guix.texi:20617 +#: doc/guix.texi:20589 doc/guix.texi:20614 msgid "The directory where the pipefs file system is mounted." msgstr "" #. type: subsubheading -#: doc/guix.texi:20597 +#: doc/guix.texi:20594 #, no-wrap msgid "IDMAP Daemon Service" msgstr "" #. type: cindex -#: doc/guix.texi:20598 +#: doc/guix.texi:20595 #, no-wrap msgid "idmapd" msgstr "" #. type: cindex -#: doc/guix.texi:20599 +#: doc/guix.texi:20596 #, no-wrap msgid "name mapper" msgstr "" #. type: Plain text -#: doc/guix.texi:20603 +#: doc/guix.texi:20600 msgid "The idmap daemon service provides mapping between user IDs and user names. Typically it is required in order to access file systems mounted via NFSv4." msgstr "" #. type: defvr -#: doc/guix.texi:20604 +#: doc/guix.texi:20601 #, no-wrap msgid "{Scheme Variable} idmap-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:20606 +#: doc/guix.texi:20603 msgid "A service type for the Identity Mapper (IDMAP) daemon." msgstr "" #. type: deftp -#: doc/guix.texi:20608 +#: doc/guix.texi:20605 #, no-wrap msgid "{Data Type} idmap-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:20611 +#: doc/guix.texi:20608 msgid "Data type representing the configuration of the IDMAP daemon service. This type has the following parameters:" msgstr "" #. type: table -#: doc/guix.texi:20614 +#: doc/guix.texi:20611 msgid "The package in which the @command{rpc.idmapd} command is to be found." msgstr "" #. type: item -#: doc/guix.texi:20618 +#: doc/guix.texi:20615 #, no-wrap msgid "@code{domain} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:20622 +#: doc/guix.texi:20619 msgid "The local NFSv4 domain name. This must be a string or @code{#f}. If it is @code{#f} then the daemon will use the host's fully qualified domain name." msgstr "" #. type: Plain text -#: doc/guix.texi:20633 +#: doc/guix.texi:20630 msgid "@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} is a continuous integration tool for Guix. It can be used both for development and for providing substitutes to others (@pxref{Substitutes})." msgstr "" #. type: Plain text -#: doc/guix.texi:20635 +#: doc/guix.texi:20632 msgid "The @code{(gnu services cuirass)} module provides the following service." msgstr "" #. type: defvr -#: doc/guix.texi:20636 +#: doc/guix.texi:20633 #, no-wrap msgid "{Scheme Procedure} cuirass-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:20639 +#: doc/guix.texi:20636 msgid "The type of the Cuirass service. Its value must be a @code{cuirass-configuration} object, as described below." msgstr "" #. type: Plain text -#: doc/guix.texi:20646 +#: doc/guix.texi:20643 msgid "To add build jobs, you have to set the @code{specifications} field of the configuration. Here is an example of a service that polls the Guix repository and builds the packages from a manifest. Some of the packages are defined in the @code{\"custom-packages\"} input, which is the equivalent of @code{GUIX_PACKAGE_PATH}." msgstr "" #. type: example -#: doc/guix.texi:20674 +#: doc/guix.texi:20671 #, no-wrap msgid "" "(define %cuirass-specs\n" @@ -38671,7 +38725,7 @@ msgid "" msgstr "" #. type: example -#: doc/guix.texi:20678 +#: doc/guix.texi:20675 #, no-wrap msgid "" "(service cuirass-service-type\n" @@ -38680,1105 +38734,1105 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:20683 +#: doc/guix.texi:20680 msgid "While information related to build jobs is located directly in the specifications, global settings for the @command{cuirass} process are accessible in other @code{cuirass-configuration} fields." msgstr "" #. type: deftp -#: doc/guix.texi:20684 +#: doc/guix.texi:20681 #, no-wrap msgid "{Data Type} cuirass-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:20686 +#: doc/guix.texi:20683 msgid "Data type representing the configuration of Cuirass." msgstr "" #. type: item -#: doc/guix.texi:20688 +#: doc/guix.texi:20685 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})" msgstr "" #. type: table -#: doc/guix.texi:20690 +#: doc/guix.texi:20687 msgid "Location of the log file." msgstr "" #. type: item -#: doc/guix.texi:20691 +#: doc/guix.texi:20688 #, no-wrap msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})" msgstr "" #. type: table -#: doc/guix.texi:20693 +#: doc/guix.texi:20690 msgid "Location of the repository cache." msgstr "" #. type: item -#: doc/guix.texi:20694 +#: doc/guix.texi:20691 #, no-wrap msgid "@code{user} (default: @code{\"cuirass\"})" msgstr "" #. type: table -#: doc/guix.texi:20696 +#: doc/guix.texi:20693 msgid "Owner of the @code{cuirass} process." msgstr "" #. type: item -#: doc/guix.texi:20697 +#: doc/guix.texi:20694 #, no-wrap msgid "@code{group} (default: @code{\"cuirass\"})" msgstr "" #. type: table -#: doc/guix.texi:20699 +#: doc/guix.texi:20696 msgid "Owner's group of the @code{cuirass} process." msgstr "" #. type: item -#: doc/guix.texi:20700 +#: doc/guix.texi:20697 #, no-wrap msgid "@code{interval} (default: @code{60})" msgstr "" #. type: table -#: doc/guix.texi:20703 +#: doc/guix.texi:20700 msgid "Number of seconds between the poll of the repositories followed by the Cuirass jobs." msgstr "" #. type: item -#: doc/guix.texi:20704 +#: doc/guix.texi:20701 #, no-wrap msgid "@code{database} (default: @code{\"/var/lib/cuirass/cuirass.db\"})" msgstr "@code{database} (Vorgabe: @code{\"/var/lib/cuirass/cuirass.db\"})" #. type: table -#: doc/guix.texi:20707 +#: doc/guix.texi:20704 msgid "Location of sqlite database which contains the build results and previously added specifications." msgstr "" #. type: item -#: doc/guix.texi:20708 +#: doc/guix.texi:20705 #, no-wrap msgid "@code{ttl} (default: @code{(* 30 24 3600)})" msgstr "@code{ttl} (Vorgabe: @code{(* 30 24 3600)})" #. type: table -#: doc/guix.texi:20712 +#: doc/guix.texi:20709 msgid "Specifies the time-to-live (TTL) in seconds of garbage collector roots that are registered for build results. This means that build results are protected from garbage collection for at least @var{ttl} seconds." msgstr "" #. type: item -#: doc/guix.texi:20713 +#: doc/guix.texi:20710 #, no-wrap msgid "@code{port} (default: @code{8081})" msgstr "" #. type: table -#: doc/guix.texi:20715 +#: doc/guix.texi:20712 msgid "Port number used by the HTTP server." msgstr "" #. type: table -#: doc/guix.texi:20719 +#: doc/guix.texi:20716 msgid "Listen on the network interface for @var{host}. The default is to accept connections from localhost." msgstr "" #. type: item -#: doc/guix.texi:20720 +#: doc/guix.texi:20717 #, no-wrap msgid "@code{specifications} (default: @code{#~'()})" msgstr "" #. type: table -#: doc/guix.texi:20726 +#: doc/guix.texi:20723 msgid "A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, where a specification is an association list (@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-example}) as shown in the example above." msgstr "" #. type: item -#: doc/guix.texi:20727 +#: doc/guix.texi:20724 #, no-wrap msgid "@code{use-substitutes?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:20730 +#: doc/guix.texi:20727 msgid "This allows using substitutes to avoid building every dependencies of a job from source." msgstr "" #. type: item -#: doc/guix.texi:20731 doc/guix.texi:25300 +#: doc/guix.texi:20728 doc/guix.texi:25286 #, no-wrap msgid "@code{one-shot?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:20733 +#: doc/guix.texi:20730 msgid "Only evaluate specifications and build derivations once." msgstr "" #. type: item -#: doc/guix.texi:20734 +#: doc/guix.texi:20731 #, no-wrap msgid "@code{fallback?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:20737 +#: doc/guix.texi:20734 msgid "When substituting a pre-built binary fails, fall back to building packages locally." msgstr "" #. type: item -#: doc/guix.texi:20738 +#: doc/guix.texi:20735 #, no-wrap msgid "@code{cuirass} (default: @code{cuirass})" msgstr "" #. type: table -#: doc/guix.texi:20740 +#: doc/guix.texi:20737 msgid "The Cuirass package to use." msgstr "" #. type: cindex -#: doc/guix.texi:20746 +#: doc/guix.texi:20743 #, no-wrap msgid "tlp" msgstr "" #. type: cindex -#: doc/guix.texi:20747 +#: doc/guix.texi:20744 #, no-wrap msgid "power management with TLP" msgstr "" #. type: subsubheading -#: doc/guix.texi:20748 +#: doc/guix.texi:20745 #, no-wrap msgid "TLP daemon" msgstr "TLP-Daemon" #. type: Plain text -#: doc/guix.texi:20752 +#: doc/guix.texi:20749 msgid "The @code{(gnu services pm)} module provides a Guix service definition for the Linux power management tool TLP." msgstr "" #. type: Plain text -#: doc/guix.texi:20758 +#: doc/guix.texi:20755 msgid "TLP enables various powersaving modes in userspace and kernel. Contrary to @code{upower-service}, it is not a passive, monitoring tool, as it will apply custom settings each time a new power source is detected. More information can be found at @uref{https://linrunner.de/en/tlp/tlp.html, TLP home page}." msgstr "" #. type: deffn -#: doc/guix.texi:20759 +#: doc/guix.texi:20756 #, no-wrap msgid "{Scheme Variable} tlp-service-type" msgstr "" #. type: deffn -#: doc/guix.texi:20763 +#: doc/guix.texi:20760 msgid "The service type for the TLP tool. Its value should be a valid TLP configuration (see below). To use the default settings, simply write:" msgstr "" #. type: example -#: doc/guix.texi:20765 +#: doc/guix.texi:20762 #, no-wrap msgid "(service tlp-service-type)\n" msgstr "" #. type: Plain text -#: doc/guix.texi:20770 +#: doc/guix.texi:20767 msgid "By default TLP does not need much configuration but most TLP parameters can be tweaked using @code{tlp-configuration}." msgstr "" #. type: Plain text -#: doc/guix.texi:20776 +#: doc/guix.texi:20773 msgid "Each parameter definition is preceded by its type; for example, @samp{boolean foo} indicates that the @code{foo} parameter should be specified as a boolean. Types starting with @code{maybe-} denote parameters that won't show up in TLP config file when their value is @code{'disabled}." msgstr "" #. type: Plain text -#: doc/guix.texi:20786 +#: doc/guix.texi:20783 msgid "Available @code{tlp-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:20787 +#: doc/guix.texi:20784 #, no-wrap msgid "{@code{tlp-configuration} parameter} package tlp" msgstr "" #. type: deftypevr -#: doc/guix.texi:20789 +#: doc/guix.texi:20786 msgid "The TLP package." msgstr "" #. type: deftypevr -#: doc/guix.texi:20792 +#: doc/guix.texi:20789 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20794 +#: doc/guix.texi:20791 msgid "Set to true if you wish to enable TLP." msgstr "" #. type: deftypevr -#: doc/guix.texi:20799 +#: doc/guix.texi:20796 #, no-wrap msgid "{@code{tlp-configuration} parameter} string tlp-default-mode" msgstr "" #. type: deftypevr -#: doc/guix.texi:20802 +#: doc/guix.texi:20799 msgid "Default mode when no power supply can be detected. Alternatives are AC and BAT." msgstr "" #. type: deftypevr -#: doc/guix.texi:20804 +#: doc/guix.texi:20801 msgid "Defaults to @samp{\"AC\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20807 +#: doc/guix.texi:20804 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20810 +#: doc/guix.texi:20807 msgid "Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC." msgstr "" #. type: deftypevr -#: doc/guix.texi:20815 +#: doc/guix.texi:20812 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20817 +#: doc/guix.texi:20814 msgid "Same as @code{disk-idle-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20819 +#: doc/guix.texi:20816 msgid "Defaults to @samp{2}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20822 +#: doc/guix.texi:20819 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20824 +#: doc/guix.texi:20821 msgid "Dirty pages flushing periodicity, expressed in seconds." msgstr "" #. type: deftypevr -#: doc/guix.texi:20826 doc/guix.texi:21049 doc/guix.texi:22378 -#: doc/guix.texi:22386 +#: doc/guix.texi:20823 doc/guix.texi:21046 doc/guix.texi:22375 +#: doc/guix.texi:22383 msgid "Defaults to @samp{15}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20829 +#: doc/guix.texi:20826 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20831 +#: doc/guix.texi:20828 msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20833 +#: doc/guix.texi:20830 msgid "Defaults to @samp{60}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20836 +#: doc/guix.texi:20833 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20840 +#: doc/guix.texi:20837 msgid "CPU frequency scaling governor on AC mode. With intel_pstate driver, alternatives are powersave and performance. With acpi-cpufreq driver, alternatives are ondemand, powersave, performance and conservative." msgstr "" #. type: deftypevr -#: doc/guix.texi:20845 +#: doc/guix.texi:20842 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20847 +#: doc/guix.texi:20844 msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20852 +#: doc/guix.texi:20849 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20854 +#: doc/guix.texi:20851 msgid "Set the min available frequency for the scaling governor on AC." msgstr "" #. type: deftypevr -#: doc/guix.texi:20859 +#: doc/guix.texi:20856 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20861 +#: doc/guix.texi:20858 msgid "Set the max available frequency for the scaling governor on AC." msgstr "" #. type: deftypevr -#: doc/guix.texi:20866 +#: doc/guix.texi:20863 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20868 +#: doc/guix.texi:20865 msgid "Set the min available frequency for the scaling governor on BAT." msgstr "" #. type: deftypevr -#: doc/guix.texi:20873 +#: doc/guix.texi:20870 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20875 +#: doc/guix.texi:20872 msgid "Set the max available frequency for the scaling governor on BAT." msgstr "" #. type: deftypevr -#: doc/guix.texi:20880 +#: doc/guix.texi:20877 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20883 +#: doc/guix.texi:20880 msgid "Limit the min P-state to control the power dissipation of the CPU, in AC mode. Values are stated as a percentage of the available performance." msgstr "" #. type: deftypevr -#: doc/guix.texi:20888 +#: doc/guix.texi:20885 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20891 +#: doc/guix.texi:20888 msgid "Limit the max P-state to control the power dissipation of the CPU, in AC mode. Values are stated as a percentage of the available performance." msgstr "" #. type: deftypevr -#: doc/guix.texi:20896 +#: doc/guix.texi:20893 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20898 +#: doc/guix.texi:20895 msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20903 +#: doc/guix.texi:20900 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20905 +#: doc/guix.texi:20902 msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20910 +#: doc/guix.texi:20907 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20912 +#: doc/guix.texi:20909 msgid "Enable CPU turbo boost feature on AC mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20917 +#: doc/guix.texi:20914 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20919 +#: doc/guix.texi:20916 msgid "Same as @code{cpu-boost-on-ac?} on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20924 +#: doc/guix.texi:20921 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20927 +#: doc/guix.texi:20924 msgid "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions." msgstr "" #. type: deftypevr -#: doc/guix.texi:20932 +#: doc/guix.texi:20929 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20934 +#: doc/guix.texi:20931 msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20939 +#: doc/guix.texi:20936 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?" msgstr "" #. type: deftypevr -#: doc/guix.texi:20941 +#: doc/guix.texi:20938 msgid "Enable Linux kernel NMI watchdog." msgstr "" #. type: deftypevr -#: doc/guix.texi:20946 +#: doc/guix.texi:20943 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls" msgstr "" #. type: deftypevr -#: doc/guix.texi:20949 +#: doc/guix.texi:20946 msgid "For Linux kernels with PHC patch applied, change CPU voltages. An example value would be @samp{\"F:V F:V F:V F:V\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20954 +#: doc/guix.texi:20951 #, no-wrap msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20957 +#: doc/guix.texi:20954 msgid "Set CPU performance versus energy saving policy on AC. Alternatives are performance, normal, powersave." msgstr "" #. type: deftypevr -#: doc/guix.texi:20959 doc/guix.texi:21057 doc/guix.texi:21087 +#: doc/guix.texi:20956 doc/guix.texi:21054 doc/guix.texi:21084 msgid "Defaults to @samp{\"performance\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20962 +#: doc/guix.texi:20959 #, no-wrap msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20964 +#: doc/guix.texi:20961 msgid "Same as @code{energy-perf-policy-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20966 doc/guix.texi:21064 +#: doc/guix.texi:20963 doc/guix.texi:21061 msgid "Defaults to @samp{\"powersave\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:20969 +#: doc/guix.texi:20966 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices" msgstr "" #. type: deftypevr -#: doc/guix.texi:20971 +#: doc/guix.texi:20968 msgid "Hard disk devices." msgstr "" #. type: deftypevr -#: doc/guix.texi:20974 +#: doc/guix.texi:20971 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20976 +#: doc/guix.texi:20973 msgid "Hard disk advanced power management level." msgstr "" #. type: deftypevr -#: doc/guix.texi:20979 +#: doc/guix.texi:20976 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20981 +#: doc/guix.texi:20978 msgid "Same as @code{disk-apm-bat} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20984 +#: doc/guix.texi:20981 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:20987 +#: doc/guix.texi:20984 msgid "Hard disk spin down timeout. One value has to be specified for each declared hard disk." msgstr "" #. type: deftypevr -#: doc/guix.texi:20992 +#: doc/guix.texi:20989 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:20994 +#: doc/guix.texi:20991 msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:20999 +#: doc/guix.texi:20996 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched" msgstr "" #. type: deftypevr -#: doc/guix.texi:21003 +#: doc/guix.texi:21000 msgid "Select IO scheduler for disk devices. One value has to be specified for each declared hard disk. Example alternatives are cfq, deadline and noop." msgstr "" #. type: deftypevr -#: doc/guix.texi:21008 +#: doc/guix.texi:21005 #, no-wrap msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:21011 +#: doc/guix.texi:21008 msgid "SATA aggressive link power management (ALPM) level. Alternatives are min_power, medium_power, max_performance." msgstr "" #. type: deftypevr -#: doc/guix.texi:21013 +#: doc/guix.texi:21010 msgid "Defaults to @samp{\"max_performance\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21016 +#: doc/guix.texi:21013 #, no-wrap msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:21018 +#: doc/guix.texi:21015 msgid "Same as @code{sata-linkpwr-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21020 +#: doc/guix.texi:21017 msgid "Defaults to @samp{\"min_power\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21023 +#: doc/guix.texi:21020 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist" msgstr "" #. type: deftypevr -#: doc/guix.texi:21025 +#: doc/guix.texi:21022 msgid "Exclude specified SATA host devices for link power management." msgstr "" #. type: deftypevr -#: doc/guix.texi:21030 +#: doc/guix.texi:21027 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21033 +#: doc/guix.texi:21030 msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21038 +#: doc/guix.texi:21035 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21040 +#: doc/guix.texi:21037 msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21045 +#: doc/guix.texi:21042 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout" msgstr "" #. type: deftypevr -#: doc/guix.texi:21047 +#: doc/guix.texi:21044 msgid "Seconds of inactivity before disk is suspended." msgstr "" #. type: deftypevr -#: doc/guix.texi:21052 +#: doc/guix.texi:21049 #, no-wrap msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:21055 +#: doc/guix.texi:21052 msgid "PCI Express Active State Power Management level. Alternatives are default, performance, powersave." msgstr "" #. type: deftypevr -#: doc/guix.texi:21060 +#: doc/guix.texi:21057 #, no-wrap msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:21062 +#: doc/guix.texi:21059 msgid "Same as @code{pcie-aspm-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21067 +#: doc/guix.texi:21064 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:21070 +#: doc/guix.texi:21067 msgid "Radeon graphics clock speed level. Alternatives are low, mid, high, auto, default." msgstr "" #. type: deftypevr -#: doc/guix.texi:21072 +#: doc/guix.texi:21069 msgid "Defaults to @samp{\"high\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21075 +#: doc/guix.texi:21072 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:21077 +#: doc/guix.texi:21074 msgid "Same as @code{radeon-power-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21079 +#: doc/guix.texi:21076 msgid "Defaults to @samp{\"low\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21082 +#: doc/guix.texi:21079 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:21085 +#: doc/guix.texi:21082 msgid "Radeon dynamic power management method (DPM). Alternatives are battery, performance." msgstr "" #. type: deftypevr -#: doc/guix.texi:21090 +#: doc/guix.texi:21087 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:21092 +#: doc/guix.texi:21089 msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21094 +#: doc/guix.texi:21091 msgid "Defaults to @samp{\"battery\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21097 +#: doc/guix.texi:21094 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:21099 +#: doc/guix.texi:21096 msgid "Radeon DPM performance level. Alternatives are auto, low, high." msgstr "" #. type: deftypevr -#: doc/guix.texi:21101 doc/guix.texi:21108 doc/guix.texi:21182 +#: doc/guix.texi:21098 doc/guix.texi:21105 doc/guix.texi:21179 msgid "Defaults to @samp{\"auto\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21104 +#: doc/guix.texi:21101 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:21106 +#: doc/guix.texi:21103 msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21111 +#: doc/guix.texi:21108 #, no-wrap msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21113 +#: doc/guix.texi:21110 msgid "Wifi power saving mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21118 +#: doc/guix.texi:21115 #, no-wrap msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21120 +#: doc/guix.texi:21117 msgid "Same as @code{wifi-power-ac?} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21125 +#: doc/guix.texi:21122 #, no-wrap msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21127 +#: doc/guix.texi:21124 msgid "Disable wake on LAN." msgstr "" #. type: deftypevr -#: doc/guix.texi:21132 +#: doc/guix.texi:21129 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:21135 +#: doc/guix.texi:21132 msgid "Timeout duration in seconds before activating audio power saving on Intel HDA and AC97 devices. A value of 0 disables power saving." msgstr "" #. type: deftypevr -#: doc/guix.texi:21140 +#: doc/guix.texi:21137 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:21142 +#: doc/guix.texi:21139 msgid "Same as @code{sound-powersave-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21144 doc/guix.texi:21671 doc/guix.texi:21815 +#: doc/guix.texi:21141 doc/guix.texi:21668 doc/guix.texi:21812 msgid "Defaults to @samp{1}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21147 +#: doc/guix.texi:21144 #, no-wrap msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21149 +#: doc/guix.texi:21146 msgid "Disable controller in powersaving mode on Intel HDA devices." msgstr "" #. type: deftypevr -#: doc/guix.texi:21154 +#: doc/guix.texi:21151 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21158 +#: doc/guix.texi:21155 msgid "Enable optical drive in UltraBay/MediaBay on BAT mode. Drive can be powered on again by releasing (and reinserting) the eject lever or by pressing the disc eject button on newer models." msgstr "" #. type: deftypevr -#: doc/guix.texi:21163 +#: doc/guix.texi:21160 #, no-wrap msgid "{@code{tlp-configuration} parameter} string bay-device" msgstr "" #. type: deftypevr -#: doc/guix.texi:21165 +#: doc/guix.texi:21162 msgid "Name of the optical drive device to power off." msgstr "" #. type: deftypevr -#: doc/guix.texi:21167 +#: doc/guix.texi:21164 msgid "Defaults to @samp{\"sr0\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21170 +#: doc/guix.texi:21167 #, no-wrap msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac" msgstr "" #. type: deftypevr -#: doc/guix.texi:21173 +#: doc/guix.texi:21170 msgid "Runtime Power Management for PCI(e) bus devices. Alternatives are on and auto." msgstr "" #. type: deftypevr -#: doc/guix.texi:21175 +#: doc/guix.texi:21172 msgid "Defaults to @samp{\"on\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21178 +#: doc/guix.texi:21175 #, no-wrap msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat" msgstr "" #. type: deftypevr -#: doc/guix.texi:21180 +#: doc/guix.texi:21177 msgid "Same as @code{runtime-pm-ac} but on BAT mode." msgstr "" #. type: deftypevr -#: doc/guix.texi:21185 +#: doc/guix.texi:21182 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21188 +#: doc/guix.texi:21185 msgid "Runtime Power Management for all PCI(e) bus devices, except blacklisted ones." msgstr "" #. type: deftypevr -#: doc/guix.texi:21193 +#: doc/guix.texi:21190 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist" msgstr "" #. type: deftypevr -#: doc/guix.texi:21195 +#: doc/guix.texi:21192 msgid "Exclude specified PCI(e) device addresses from Runtime Power Management." msgstr "" #. type: deftypevr -#: doc/guix.texi:21200 +#: doc/guix.texi:21197 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist" msgstr "" #. type: deftypevr -#: doc/guix.texi:21203 +#: doc/guix.texi:21200 msgid "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management." msgstr "" #. type: deftypevr -#: doc/guix.texi:21206 +#: doc/guix.texi:21203 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21208 +#: doc/guix.texi:21205 msgid "Enable USB autosuspend feature." msgstr "" #. type: deftypevr -#: doc/guix.texi:21213 +#: doc/guix.texi:21210 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist" msgstr "" #. type: deftypevr -#: doc/guix.texi:21215 +#: doc/guix.texi:21212 msgid "Exclude specified devices from USB autosuspend." msgstr "" #. type: deftypevr -#: doc/guix.texi:21220 +#: doc/guix.texi:21217 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21222 +#: doc/guix.texi:21219 msgid "Exclude WWAN devices from USB autosuspend." msgstr "" #. type: deftypevr -#: doc/guix.texi:21227 +#: doc/guix.texi:21224 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist" msgstr "" #. type: deftypevr -#: doc/guix.texi:21230 +#: doc/guix.texi:21227 msgid "Include specified devices into USB autosuspend, even if they are already excluded by the driver or via @code{usb-blacklist-wwan?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21235 +#: doc/guix.texi:21232 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21237 +#: doc/guix.texi:21234 msgid "Enable USB autosuspend before shutdown." msgstr "" #. type: deftypevr -#: doc/guix.texi:21242 +#: doc/guix.texi:21239 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21245 +#: doc/guix.texi:21242 msgid "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup." msgstr "" #. type: cindex -#: doc/guix.texi:21250 +#: doc/guix.texi:21247 #, no-wrap msgid "thermald" msgstr "" #. type: cindex -#: doc/guix.texi:21251 +#: doc/guix.texi:21248 #, no-wrap msgid "CPU frequency scaling with thermald" msgstr "" #. type: subsubheading -#: doc/guix.texi:21252 +#: doc/guix.texi:21249 #, no-wrap msgid "Thermald daemon" msgstr "Thermald-Daemon" #. type: Plain text -#: doc/guix.texi:21256 +#: doc/guix.texi:21253 msgid "The @code{(gnu services pm)} module provides an interface to thermald, a CPU frequency scaling service which helps prevent overheating." msgstr "" #. type: defvr -#: doc/guix.texi:21257 +#: doc/guix.texi:21254 #, no-wrap msgid "{Scheme Variable} thermald-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:21262 +#: doc/guix.texi:21259 msgid "This is the service type for @uref{https://01.org/linux-thermal-daemon/, thermald}, the Linux Thermal Daemon, which is responsible for controlling the thermal state of processors and preventing overheating." msgstr "" #. type: deftp -#: doc/guix.texi:21264 +#: doc/guix.texi:21261 #, no-wrap msgid "{Data Type} thermald-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:21266 +#: doc/guix.texi:21263 msgid "Data type representing the configuration of @code{thermald-service-type}." msgstr "" #. type: item -#: doc/guix.texi:21268 +#: doc/guix.texi:21265 #, no-wrap msgid "@code{ignore-cpuid-check?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:21270 +#: doc/guix.texi:21267 msgid "Ignore cpuid check for supported CPU models." msgstr "" #. type: item -#: doc/guix.texi:21271 +#: doc/guix.texi:21268 #, no-wrap msgid "@code{thermald} (default: @var{thermald})" msgstr "" #. type: table -#: doc/guix.texi:21273 +#: doc/guix.texi:21270 msgid "Package object of thermald." msgstr "" #. type: Plain text -#: doc/guix.texi:21282 +#: doc/guix.texi:21279 msgid "The @code{(gnu services audio)} module provides a service to start MPD (the Music Player Daemon)." msgstr "" #. type: cindex -#: doc/guix.texi:21283 +#: doc/guix.texi:21280 #, no-wrap msgid "mpd" msgstr "" #. type: subsubheading -#: doc/guix.texi:21284 +#: doc/guix.texi:21281 #, no-wrap msgid "Music Player Daemon" msgstr "" #. type: Plain text -#: doc/guix.texi:21289 +#: doc/guix.texi:21286 msgid "The Music Player Daemon (MPD) is a service that can play music while being controlled from the local machine or over the network by a variety of clients." msgstr "" #. type: Plain text -#: doc/guix.texi:21292 +#: doc/guix.texi:21289 msgid "The following example shows how one might run @code{mpd} as user @code{\"bob\"} on port @code{6666}. It uses pulseaudio for output." msgstr "" #. type: example -#: doc/guix.texi:21298 +#: doc/guix.texi:21295 #, no-wrap msgid "" "(service mpd-service-type\n" @@ -39788,150 +39842,150 @@ msgid "" msgstr "" #. type: defvr -#: doc/guix.texi:21300 +#: doc/guix.texi:21297 #, no-wrap msgid "{Scheme Variable} mpd-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:21302 +#: doc/guix.texi:21299 msgid "The service type for @command{mpd}" msgstr "" #. type: deftp -#: doc/guix.texi:21304 +#: doc/guix.texi:21301 #, no-wrap msgid "{Data Type} mpd-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:21306 +#: doc/guix.texi:21303 msgid "Data type representing the configuration of @command{mpd}." msgstr "" #. type: item -#: doc/guix.texi:21308 +#: doc/guix.texi:21305 #, no-wrap msgid "@code{user} (default: @code{\"mpd\"})" msgstr "" #. type: table -#: doc/guix.texi:21310 +#: doc/guix.texi:21307 msgid "The user to run mpd as." msgstr "" #. type: item -#: doc/guix.texi:21311 +#: doc/guix.texi:21308 #, no-wrap msgid "@code{music-dir} (default: @code{\"~/Music\"})" msgstr "" #. type: table -#: doc/guix.texi:21313 +#: doc/guix.texi:21310 msgid "The directory to scan for music files." msgstr "" #. type: item -#: doc/guix.texi:21314 +#: doc/guix.texi:21311 #, no-wrap msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})" msgstr "" #. type: table -#: doc/guix.texi:21316 +#: doc/guix.texi:21313 msgid "The directory to store playlists." msgstr "" #. type: item -#: doc/guix.texi:21317 +#: doc/guix.texi:21314 #, no-wrap msgid "@code{db-file} (default: @code{\"~/.mpd/tag_cache\"})" msgstr "@code{db-file} (Vorgabe: @code{\"~/.mpd/tag_cache\"})" #. type: table -#: doc/guix.texi:21319 +#: doc/guix.texi:21316 msgid "The location of the music database." msgstr "Der Ort, an dem die Musikdatenbank gespeichert wird." #. type: item -#: doc/guix.texi:21320 +#: doc/guix.texi:21317 #, no-wrap msgid "@code{state-file} (default: @code{\"~/.mpd/state\"})" msgstr "@code{state-file} (Vorgabe: @code{\"~/.mpd/state\"})" #. type: table -#: doc/guix.texi:21322 +#: doc/guix.texi:21319 msgid "The location of the file that stores current MPD's state." msgstr "Der Ort, an dem die Datei mit dem aktuellen Zustand von MPD gespeichert wird." #. type: item -#: doc/guix.texi:21323 +#: doc/guix.texi:21320 #, no-wrap msgid "@code{sticker-file} (default: @code{\"~/.mpd/sticker.sql\"})" msgstr "@code{sticker-file} (Vorgabe: @code{\"~/.mpd/sticker.sql\"})" #. type: table -#: doc/guix.texi:21325 +#: doc/guix.texi:21322 msgid "The location of the sticker database." msgstr "Der Ort, an dem die Sticker-Datenbank gespeichert wird." #. type: item -#: doc/guix.texi:21326 +#: doc/guix.texi:21323 #, no-wrap msgid "@code{port} (default: @code{\"6600\"})" msgstr "" #. type: table -#: doc/guix.texi:21328 +#: doc/guix.texi:21325 msgid "The port to run mpd on." msgstr "" #. type: item -#: doc/guix.texi:21329 +#: doc/guix.texi:21326 #, no-wrap msgid "@code{address} (default: @code{\"any\"})" msgstr "" #. type: table -#: doc/guix.texi:21332 +#: doc/guix.texi:21329 msgid "The address that mpd will bind to. To use a Unix domain socket, an absolute path can be specified here." msgstr "" #. type: subsection -#: doc/guix.texi:21337 +#: doc/guix.texi:21334 #, no-wrap msgid "Virtualization services" msgstr "" #. type: Plain text -#: doc/guix.texi:21342 +#: doc/guix.texi:21339 msgid "The @code{(gnu services virtualization)} module provides services for the libvirt and virtlog daemons, as well as other virtualization-related services." msgstr "" #. type: subsubheading -#: doc/guix.texi:21343 +#: doc/guix.texi:21340 #, no-wrap msgid "Libvirt daemon" msgstr "" #. type: Plain text -#: doc/guix.texi:21347 +#: doc/guix.texi:21344 msgid "@code{libvirtd} is the server side daemon component of the libvirt virtualization management system. This daemon runs on host servers and performs required management tasks for virtualized guests." msgstr "" #. type: deffn -#: doc/guix.texi:21348 +#: doc/guix.texi:21345 #, no-wrap msgid "{Scheme Variable} libvirt-service-type" msgstr "" #. type: deffn -#: doc/guix.texi:21351 +#: doc/guix.texi:21348 msgid "This is the type of the @uref{https://libvirt.org, libvirt daemon}. Its value must be a @code{libvirt-configuration}." msgstr "" #. type: example -#: doc/guix.texi:21357 +#: doc/guix.texi:21354 #, no-wrap msgid "" "(service libvirt-service-type\n" @@ -39941,874 +39995,874 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:21362 +#: doc/guix.texi:21359 msgid "Available @code{libvirt-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:21363 +#: doc/guix.texi:21360 #, no-wrap msgid "{@code{libvirt-configuration} parameter} package libvirt" msgstr "" #. type: deftypevr -#: doc/guix.texi:21365 +#: doc/guix.texi:21362 msgid "Libvirt package." msgstr "" #. type: deftypevr -#: doc/guix.texi:21368 +#: doc/guix.texi:21365 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21371 +#: doc/guix.texi:21368 msgid "Flag listening for secure TLS connections on the public TCP/IP port. must set @code{listen} for this to have any effect." msgstr "" #. type: deftypevr -#: doc/guix.texi:21374 +#: doc/guix.texi:21371 msgid "It is necessary to setup a CA and issue server certificates before using this capability." msgstr "" #. type: deftypevr -#: doc/guix.texi:21379 +#: doc/guix.texi:21376 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21382 +#: doc/guix.texi:21379 msgid "Listen for unencrypted TCP connections on the public TCP/IP port. must set @code{listen} for this to have any effect." msgstr "" #. type: deftypevr -#: doc/guix.texi:21386 +#: doc/guix.texi:21383 msgid "Using the TCP socket requires SASL authentication by default. Only SASL mechanisms which support data encryption are allowed. This is DIGEST_MD5 and GSSAPI (Kerberos5)" msgstr "" #. type: deftypevr -#: doc/guix.texi:21391 +#: doc/guix.texi:21388 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tls-port" msgstr "" #. type: deftypevr -#: doc/guix.texi:21394 +#: doc/guix.texi:21391 msgid "Port for accepting secure TLS connections This can be a port number, or service name" msgstr "" #. type: deftypevr -#: doc/guix.texi:21396 +#: doc/guix.texi:21393 msgid "Defaults to @samp{\"16514\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21399 +#: doc/guix.texi:21396 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tcp-port" msgstr "" #. type: deftypevr -#: doc/guix.texi:21402 +#: doc/guix.texi:21399 msgid "Port for accepting insecure TCP connections This can be a port number, or service name" msgstr "" #. type: deftypevr -#: doc/guix.texi:21404 +#: doc/guix.texi:21401 msgid "Defaults to @samp{\"16509\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21407 +#: doc/guix.texi:21404 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string listen-addr" msgstr "" #. type: deftypevr -#: doc/guix.texi:21409 +#: doc/guix.texi:21406 msgid "IP address or hostname used for client connections." msgstr "" #. type: deftypevr -#: doc/guix.texi:21411 +#: doc/guix.texi:21408 msgid "Defaults to @samp{\"0.0.0.0\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21414 +#: doc/guix.texi:21411 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?" msgstr "" #. type: deftypevr -#: doc/guix.texi:21416 +#: doc/guix.texi:21413 msgid "Flag toggling mDNS advertisement of the libvirt service." msgstr "" #. type: deftypevr -#: doc/guix.texi:21419 +#: doc/guix.texi:21416 msgid "Alternatively can disable for all services on a host by stopping the Avahi daemon." msgstr "" #. type: deftypevr -#: doc/guix.texi:21424 +#: doc/guix.texi:21421 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string mdns-name" msgstr "" #. type: deftypevr -#: doc/guix.texi:21427 +#: doc/guix.texi:21424 msgid "Default mDNS advertisement name. This must be unique on the immediate broadcast network." msgstr "" #. type: deftypevr -#: doc/guix.texi:21429 +#: doc/guix.texi:21426 msgid "Defaults to @samp{\"Virtualization Host \"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21432 +#: doc/guix.texi:21429 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-group" msgstr "" #. type: deftypevr -#: doc/guix.texi:21436 +#: doc/guix.texi:21433 msgid "UNIX domain socket group ownership. This can be used to allow a 'trusted' set of users access to management capabilities without becoming root." msgstr "" #. type: deftypevr -#: doc/guix.texi:21441 +#: doc/guix.texi:21438 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms" msgstr "" #. type: deftypevr -#: doc/guix.texi:21444 +#: doc/guix.texi:21441 msgid "UNIX socket permissions for the R/O socket. This is used for monitoring VM status only." msgstr "" #. type: deftypevr -#: doc/guix.texi:21446 doc/guix.texi:21464 +#: doc/guix.texi:21443 doc/guix.texi:21461 msgid "Defaults to @samp{\"0777\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21449 +#: doc/guix.texi:21446 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms" msgstr "" #. type: deftypevr -#: doc/guix.texi:21453 +#: doc/guix.texi:21450 msgid "UNIX socket permissions for the R/W socket. Default allows only root. If PolicyKit is enabled on the socket, the default will change to allow everyone (eg, 0777)" msgstr "" #. type: deftypevr -#: doc/guix.texi:21455 +#: doc/guix.texi:21452 msgid "Defaults to @samp{\"0770\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21458 +#: doc/guix.texi:21455 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms" msgstr "" #. type: deftypevr -#: doc/guix.texi:21462 +#: doc/guix.texi:21459 msgid "UNIX socket permissions for the admin socket. Default allows only owner (root), do not change it unless you are sure to whom you are exposing the access to." msgstr "" #. type: deftypevr -#: doc/guix.texi:21467 +#: doc/guix.texi:21464 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir" msgstr "" #. type: deftypevr -#: doc/guix.texi:21469 +#: doc/guix.texi:21466 msgid "The directory in which sockets will be found/created." msgstr "" #. type: deftypevr -#: doc/guix.texi:21471 +#: doc/guix.texi:21468 msgid "Defaults to @samp{\"/var/run/libvirt\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21474 +#: doc/guix.texi:21471 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro" msgstr "" #. type: deftypevr -#: doc/guix.texi:21477 +#: doc/guix.texi:21474 msgid "Authentication scheme for UNIX read-only sockets. By default socket permissions allow anyone to connect" msgstr "" #. type: deftypevr -#: doc/guix.texi:21479 doc/guix.texi:21488 +#: doc/guix.texi:21476 doc/guix.texi:21485 msgid "Defaults to @samp{\"polkit\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21482 +#: doc/guix.texi:21479 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw" msgstr "" #. type: deftypevr -#: doc/guix.texi:21486 +#: doc/guix.texi:21483 msgid "Authentication scheme for UNIX read-write sockets. By default socket permissions only allow root. If PolicyKit support was compiled into libvirt, the default will be to use 'polkit' auth." msgstr "" #. type: deftypevr -#: doc/guix.texi:21491 +#: doc/guix.texi:21488 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-tcp" msgstr "" #. type: deftypevr -#: doc/guix.texi:21495 +#: doc/guix.texi:21492 msgid "Authentication scheme for TCP sockets. If you don't enable SASL, then all TCP traffic is cleartext. Don't do this outside of a dev/test scenario." msgstr "" #. type: deftypevr -#: doc/guix.texi:21497 +#: doc/guix.texi:21494 msgid "Defaults to @samp{\"sasl\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21500 +#: doc/guix.texi:21497 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-tls" msgstr "" #. type: deftypevr -#: doc/guix.texi:21504 +#: doc/guix.texi:21501 msgid "Authentication scheme for TLS sockets. TLS sockets already have encryption provided by the TLS layer, and limited authentication is done by certificates." msgstr "" #. type: deftypevr -#: doc/guix.texi:21507 +#: doc/guix.texi:21504 msgid "It is possible to make use of any SASL authentication mechanism as well, by using 'sasl' for this option" msgstr "" #. type: deftypevr -#: doc/guix.texi:21509 +#: doc/guix.texi:21506 msgid "Defaults to @samp{\"none\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21512 +#: doc/guix.texi:21509 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers" msgstr "" #. type: deftypevr -#: doc/guix.texi:21514 +#: doc/guix.texi:21511 msgid "API access control scheme." msgstr "" #. type: deftypevr -#: doc/guix.texi:21517 +#: doc/guix.texi:21514 msgid "By default an authenticated user is allowed access to all APIs. Access drivers can place restrictions on this." msgstr "" #. type: deftypevr -#: doc/guix.texi:21522 +#: doc/guix.texi:21519 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string key-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:21525 +#: doc/guix.texi:21522 msgid "Server key file path. If set to an empty string, then no private key is loaded." msgstr "" #. type: deftypevr -#: doc/guix.texi:21530 +#: doc/guix.texi:21527 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string cert-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:21533 +#: doc/guix.texi:21530 msgid "Server key file path. If set to an empty string, then no certificate is loaded." msgstr "" #. type: deftypevr -#: doc/guix.texi:21538 +#: doc/guix.texi:21535 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string ca-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:21541 +#: doc/guix.texi:21538 msgid "Server key file path. If set to an empty string, then no CA certificate is loaded." msgstr "" #. type: deftypevr -#: doc/guix.texi:21546 +#: doc/guix.texi:21543 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string crl-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:21549 +#: doc/guix.texi:21546 msgid "Certificate revocation list path. If set to an empty string, then no CRL is loaded." msgstr "" #. type: deftypevr -#: doc/guix.texi:21554 +#: doc/guix.texi:21551 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert" msgstr "" #. type: deftypevr -#: doc/guix.texi:21556 +#: doc/guix.texi:21553 msgid "Disable verification of our own server certificates." msgstr "" #. type: deftypevr -#: doc/guix.texi:21559 +#: doc/guix.texi:21556 msgid "When libvirtd starts it performs some sanity checks against its own certificates." msgstr "" #. type: deftypevr -#: doc/guix.texi:21564 +#: doc/guix.texi:21561 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert" msgstr "" #. type: deftypevr -#: doc/guix.texi:21566 +#: doc/guix.texi:21563 msgid "Disable verification of client certificates." msgstr "" #. type: deftypevr -#: doc/guix.texi:21570 +#: doc/guix.texi:21567 msgid "Client certificate verification is the primary authentication mechanism. Any client which does not present a certificate signed by the CA will be rejected." msgstr "" #. type: deftypevr -#: doc/guix.texi:21575 +#: doc/guix.texi:21572 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list" msgstr "" #. type: deftypevr -#: doc/guix.texi:21577 +#: doc/guix.texi:21574 msgid "Whitelist of allowed x509 Distinguished Name." msgstr "" #. type: deftypevr -#: doc/guix.texi:21582 +#: doc/guix.texi:21579 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames" msgstr "" #. type: deftypevr -#: doc/guix.texi:21585 +#: doc/guix.texi:21582 msgid "Whitelist of allowed SASL usernames. The format for username depends on the SASL authentication mechanism." msgstr "" #. type: deftypevr -#: doc/guix.texi:21590 +#: doc/guix.texi:21587 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tls-priority" msgstr "" #. type: deftypevr -#: doc/guix.texi:21594 +#: doc/guix.texi:21591 msgid "Override the compile time default TLS priority string. The default is usually \"NORMAL\" unless overridden at build time. Only set this is it is desired for libvirt to deviate from the global default settings." msgstr "" #. type: deftypevr -#: doc/guix.texi:21596 +#: doc/guix.texi:21593 msgid "Defaults to @samp{\"NORMAL\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21599 +#: doc/guix.texi:21596 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-clients" msgstr "" #. type: deftypevr -#: doc/guix.texi:21602 doc/guix.texi:22025 +#: doc/guix.texi:21599 doc/guix.texi:22022 msgid "Maximum number of concurrent client connections to allow over all sockets combined." msgstr "" #. type: deftypevr -#: doc/guix.texi:21604 +#: doc/guix.texi:21601 msgid "Defaults to @samp{5000}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21607 +#: doc/guix.texi:21604 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients" msgstr "" #. type: deftypevr -#: doc/guix.texi:21611 +#: doc/guix.texi:21608 msgid "Maximum length of queue of connections waiting to be accepted by the daemon. Note, that some protocols supporting retransmission may obey this so that a later reattempt at connection succeeds." msgstr "" #. type: deftypevr -#: doc/guix.texi:21616 +#: doc/guix.texi:21613 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients" msgstr "" #. type: deftypevr -#: doc/guix.texi:21619 +#: doc/guix.texi:21616 msgid "Maximum length of queue of accepted but not yet authenticated clients. Set this to zero to turn this feature off" msgstr "" #. type: deftypevr -#: doc/guix.texi:21621 doc/guix.texi:21639 doc/guix.texi:21655 +#: doc/guix.texi:21618 doc/guix.texi:21636 doc/guix.texi:21652 msgid "Defaults to @samp{20}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21624 +#: doc/guix.texi:21621 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer min-workers" msgstr "" #. type: deftypevr -#: doc/guix.texi:21626 +#: doc/guix.texi:21623 msgid "Number of workers to start up initially." msgstr "" #. type: deftypevr -#: doc/guix.texi:21631 +#: doc/guix.texi:21628 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-workers" msgstr "" #. type: deftypevr -#: doc/guix.texi:21633 +#: doc/guix.texi:21630 msgid "Maximum number of worker threads." msgstr "" #. type: deftypevr -#: doc/guix.texi:21637 +#: doc/guix.texi:21634 msgid "If the number of active clients exceeds @code{min-workers}, then more threads are spawned, up to max_workers limit. Typically you'd want max_workers to equal maximum number of clients allowed." msgstr "" #. type: deftypevr -#: doc/guix.texi:21642 +#: doc/guix.texi:21639 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer prio-workers" msgstr "" #. type: deftypevr -#: doc/guix.texi:21646 +#: doc/guix.texi:21643 msgid "Number of priority workers. If all workers from above pool are stuck, some calls marked as high priority (notably domainDestroy) can be executed in this pool." msgstr "" #. type: deftypevr -#: doc/guix.texi:21651 +#: doc/guix.texi:21648 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-requests" msgstr "" #. type: deftypevr -#: doc/guix.texi:21653 +#: doc/guix.texi:21650 msgid "Total global limit on concurrent RPC calls." msgstr "" #. type: deftypevr -#: doc/guix.texi:21658 +#: doc/guix.texi:21655 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-client-requests" msgstr "" #. type: deftypevr -#: doc/guix.texi:21662 +#: doc/guix.texi:21659 msgid "Limit on concurrent requests from a single client connection. To avoid one client monopolizing the server this should be a small fraction of the global max_requests and max_workers parameter." msgstr "" #. type: deftypevr -#: doc/guix.texi:21667 +#: doc/guix.texi:21664 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers" msgstr "" #. type: deftypevr -#: doc/guix.texi:21669 +#: doc/guix.texi:21666 msgid "Same as @code{min-workers} but for the admin interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:21674 +#: doc/guix.texi:21671 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers" msgstr "" #. type: deftypevr -#: doc/guix.texi:21676 +#: doc/guix.texi:21673 msgid "Same as @code{max-workers} but for the admin interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:21681 +#: doc/guix.texi:21678 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients" msgstr "" #. type: deftypevr -#: doc/guix.texi:21683 +#: doc/guix.texi:21680 msgid "Same as @code{max-clients} but for the admin interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:21688 +#: doc/guix.texi:21685 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients" msgstr "" #. type: deftypevr -#: doc/guix.texi:21690 +#: doc/guix.texi:21687 msgid "Same as @code{max-queued-clients} but for the admin interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:21695 +#: doc/guix.texi:21692 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests" msgstr "" #. type: deftypevr -#: doc/guix.texi:21697 +#: doc/guix.texi:21694 msgid "Same as @code{max-client-requests} but for the admin interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:21702 +#: doc/guix.texi:21699 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer log-level" msgstr "" #. type: deftypevr -#: doc/guix.texi:21704 doc/guix.texi:21927 +#: doc/guix.texi:21701 doc/guix.texi:21924 msgid "Logging level. 4 errors, 3 warnings, 2 information, 1 debug." msgstr "" #. type: deftypevr -#: doc/guix.texi:21709 +#: doc/guix.texi:21706 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string log-filters" msgstr "" #. type: deftypevr -#: doc/guix.texi:21711 doc/guix.texi:21934 +#: doc/guix.texi:21708 doc/guix.texi:21931 msgid "Logging filters." msgstr "" #. type: deftypevr -#: doc/guix.texi:21714 doc/guix.texi:21937 +#: doc/guix.texi:21711 doc/guix.texi:21934 msgid "A filter allows to select a different logging level for a given category of logs The format for a filter is one of:" msgstr "" #. type: itemize -#: doc/guix.texi:21718 doc/guix.texi:21941 +#: doc/guix.texi:21715 doc/guix.texi:21938 msgid "x:name" msgstr "" #. type: itemize -#: doc/guix.texi:21721 doc/guix.texi:21944 +#: doc/guix.texi:21718 doc/guix.texi:21941 msgid "x:+name" msgstr "" #. type: deftypevr -#: doc/guix.texi:21731 doc/guix.texi:21954 +#: doc/guix.texi:21728 doc/guix.texi:21951 msgid "where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., \"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a substring of the full category name, in order to match multiple similar categories), the optional \"+\" prefix tells libvirt to log stack trace for each message matching name, and @code{x} is the minimal level where matching messages should be logged:" msgstr "" #. type: itemize -#: doc/guix.texi:21735 doc/guix.texi:21780 doc/guix.texi:21958 -#: doc/guix.texi:22003 +#: doc/guix.texi:21732 doc/guix.texi:21777 doc/guix.texi:21955 +#: doc/guix.texi:22000 msgid "1: DEBUG" msgstr "" #. type: itemize -#: doc/guix.texi:21738 doc/guix.texi:21783 doc/guix.texi:21961 -#: doc/guix.texi:22006 +#: doc/guix.texi:21735 doc/guix.texi:21780 doc/guix.texi:21958 +#: doc/guix.texi:22003 msgid "2: INFO" msgstr "" #. type: itemize -#: doc/guix.texi:21741 doc/guix.texi:21786 doc/guix.texi:21964 -#: doc/guix.texi:22009 +#: doc/guix.texi:21738 doc/guix.texi:21783 doc/guix.texi:21961 +#: doc/guix.texi:22006 msgid "3: WARNING" msgstr "" #. type: itemize -#: doc/guix.texi:21744 doc/guix.texi:21789 doc/guix.texi:21967 -#: doc/guix.texi:22012 +#: doc/guix.texi:21741 doc/guix.texi:21786 doc/guix.texi:21964 +#: doc/guix.texi:22009 msgid "4: ERROR" msgstr "" #. type: deftypevr -#: doc/guix.texi:21749 doc/guix.texi:21972 +#: doc/guix.texi:21746 doc/guix.texi:21969 msgid "Multiple filters can be defined in a single filters statement, they just need to be separated by spaces." msgstr "" #. type: deftypevr -#: doc/guix.texi:21751 doc/guix.texi:21974 +#: doc/guix.texi:21748 doc/guix.texi:21971 msgid "Defaults to @samp{\"3:remote 4:event\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21754 +#: doc/guix.texi:21751 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string log-outputs" msgstr "" #. type: deftypevr -#: doc/guix.texi:21756 doc/guix.texi:21979 +#: doc/guix.texi:21753 doc/guix.texi:21976 msgid "Logging outputs." msgstr "" #. type: deftypevr -#: doc/guix.texi:21759 +#: doc/guix.texi:21756 msgid "An output is one of the places to save logging information. The format for an output can be:" msgstr "" #. type: item -#: doc/guix.texi:21761 doc/guix.texi:21984 +#: doc/guix.texi:21758 doc/guix.texi:21981 #, no-wrap msgid "x:stderr" msgstr "" #. type: table -#: doc/guix.texi:21763 doc/guix.texi:21986 +#: doc/guix.texi:21760 doc/guix.texi:21983 msgid "output goes to stderr" msgstr "" #. type: item -#: doc/guix.texi:21764 doc/guix.texi:21987 +#: doc/guix.texi:21761 doc/guix.texi:21984 #, no-wrap msgid "x:syslog:name" msgstr "" #. type: table -#: doc/guix.texi:21766 doc/guix.texi:21989 +#: doc/guix.texi:21763 doc/guix.texi:21986 msgid "use syslog for the output and use the given name as the ident" msgstr "" #. type: item -#: doc/guix.texi:21767 doc/guix.texi:21990 +#: doc/guix.texi:21764 doc/guix.texi:21987 #, no-wrap msgid "x:file:file_path" msgstr "" #. type: table -#: doc/guix.texi:21769 doc/guix.texi:21992 +#: doc/guix.texi:21766 doc/guix.texi:21989 msgid "output to a file, with the given filepath" msgstr "" #. type: item -#: doc/guix.texi:21770 doc/guix.texi:21993 +#: doc/guix.texi:21767 doc/guix.texi:21990 #, no-wrap msgid "x:journald" msgstr "" #. type: table -#: doc/guix.texi:21772 doc/guix.texi:21995 +#: doc/guix.texi:21769 doc/guix.texi:21992 msgid "output to journald logging system" msgstr "" #. type: deftypevr -#: doc/guix.texi:21776 doc/guix.texi:21999 +#: doc/guix.texi:21773 doc/guix.texi:21996 msgid "In all case the x prefix is the minimal level, acting as a filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:21794 doc/guix.texi:22017 +#: doc/guix.texi:21791 doc/guix.texi:22014 msgid "Multiple outputs can be defined, they just need to be separated by spaces." msgstr "" #. type: deftypevr -#: doc/guix.texi:21796 doc/guix.texi:22019 +#: doc/guix.texi:21793 doc/guix.texi:22016 msgid "Defaults to @samp{\"3:stderr\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21799 +#: doc/guix.texi:21796 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer audit-level" msgstr "" #. type: deftypevr -#: doc/guix.texi:21801 +#: doc/guix.texi:21798 msgid "Allows usage of the auditing subsystem to be altered" msgstr "" #. type: itemize -#: doc/guix.texi:21805 +#: doc/guix.texi:21802 msgid "0: disable all auditing" msgstr "" #. type: itemize -#: doc/guix.texi:21808 +#: doc/guix.texi:21805 msgid "1: enable auditing, only if enabled on host" msgstr "" #. type: itemize -#: doc/guix.texi:21811 +#: doc/guix.texi:21808 msgid "2: enable auditing, and exit if disabled on host." msgstr "" #. type: deftypevr -#: doc/guix.texi:21818 +#: doc/guix.texi:21815 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean audit-logging" msgstr "" #. type: deftypevr -#: doc/guix.texi:21820 +#: doc/guix.texi:21817 msgid "Send audit messages via libvirt logging infrastructure." msgstr "" #. type: deftypevr -#: doc/guix.texi:21825 +#: doc/guix.texi:21822 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid" msgstr "" #. type: deftypevr -#: doc/guix.texi:21827 +#: doc/guix.texi:21824 msgid "Host UUID. UUID must not have all digits be the same." msgstr "" #. type: deftypevr -#: doc/guix.texi:21832 +#: doc/guix.texi:21829 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string host-uuid-source" msgstr "" #. type: deftypevr -#: doc/guix.texi:21834 +#: doc/guix.texi:21831 msgid "Source to read host UUID." msgstr "" #. type: itemize -#: doc/guix.texi:21838 +#: doc/guix.texi:21835 msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}" msgstr "" #. type: itemize -#: doc/guix.texi:21841 +#: doc/guix.texi:21838 msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}" msgstr "" #. type: deftypevr -#: doc/guix.texi:21846 +#: doc/guix.texi:21843 msgid "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated." msgstr "" #. type: deftypevr -#: doc/guix.texi:21848 +#: doc/guix.texi:21845 msgid "Defaults to @samp{\"smbios\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:21851 +#: doc/guix.texi:21848 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval" msgstr "" #. type: deftypevr -#: doc/guix.texi:21856 +#: doc/guix.texi:21853 msgid "A keepalive message is sent to a client after @code{keepalive_interval} seconds of inactivity to check if the client is still responding. If set to -1, libvirtd will never send keepalive requests; however clients can still send them and the daemon will send responses." msgstr "" #. type: deftypevr -#: doc/guix.texi:21861 +#: doc/guix.texi:21858 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer keepalive-count" msgstr "" #. type: deftypevr -#: doc/guix.texi:21865 +#: doc/guix.texi:21862 msgid "Maximum number of keepalive messages that are allowed to be sent to the client without getting any response before the connection is considered broken." msgstr "" #. type: deftypevr -#: doc/guix.texi:21872 +#: doc/guix.texi:21869 msgid "In other words, the connection is automatically closed approximately after @code{keepalive_interval * (keepalive_count + 1)} seconds since the last message received from the client. When @code{keepalive-count} is set to 0, connections will be automatically closed after @code{keepalive-interval} seconds of inactivity without sending any keepalive messages." msgstr "" #. type: deftypevr -#: doc/guix.texi:21877 +#: doc/guix.texi:21874 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval" msgstr "" #. type: deftypevr -#: doc/guix.texi:21879 doc/guix.texi:21886 +#: doc/guix.texi:21876 doc/guix.texi:21883 msgid "Same as above but for admin interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:21884 +#: doc/guix.texi:21881 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count" msgstr "" #. type: deftypevr -#: doc/guix.texi:21891 +#: doc/guix.texi:21888 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout" msgstr "" #. type: deftypevr -#: doc/guix.texi:21893 +#: doc/guix.texi:21890 msgid "Timeout for Open vSwitch calls." msgstr "" #. type: deftypevr -#: doc/guix.texi:21897 +#: doc/guix.texi:21894 msgid "The @code{ovs-vsctl} utility is used for the configuration and its timeout option is set by default to 5 seconds to avoid potential infinite waits blocking libvirt." msgstr "" #. type: subsubheading -#: doc/guix.texi:21904 +#: doc/guix.texi:21901 #, no-wrap msgid "Virtlog daemon" msgstr "" #. type: Plain text -#: doc/guix.texi:21907 +#: doc/guix.texi:21904 msgid "The virtlogd service is a server side daemon component of libvirt that is used to manage logs from virtual machine consoles." msgstr "" #. type: Plain text -#: doc/guix.texi:21913 +#: doc/guix.texi:21910 msgid "This daemon is not used directly by libvirt client applications, rather it is called on their behalf by @code{libvirtd}. By maintaining the logs in a standalone daemon, the main @code{libvirtd} daemon can be restarted without risk of losing logs. The @code{virtlogd} daemon has the ability to re-exec() itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime." msgstr "" #. type: deffn -#: doc/guix.texi:21914 +#: doc/guix.texi:21911 #, no-wrap msgid "{Scheme Variable} virtlog-service-type" msgstr "" #. type: deffn -#: doc/guix.texi:21917 +#: doc/guix.texi:21914 msgid "This is the type of the virtlog daemon. Its value must be a @code{virtlog-configuration}." msgstr "" #. type: example -#: doc/guix.texi:21922 +#: doc/guix.texi:21919 #, no-wrap msgid "" "(service virtlog-service-type\n" @@ -40817,107 +40871,107 @@ msgid "" msgstr "" #. type: deftypevr -#: doc/guix.texi:21925 +#: doc/guix.texi:21922 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer log-level" msgstr "" #. type: deftypevr -#: doc/guix.texi:21932 +#: doc/guix.texi:21929 #, no-wrap msgid "{@code{virtlog-configuration} parameter} string log-filters" msgstr "" #. type: deftypevr -#: doc/guix.texi:21977 +#: doc/guix.texi:21974 #, no-wrap msgid "{@code{virtlog-configuration} parameter} string log-outputs" msgstr "" #. type: deftypevr -#: doc/guix.texi:21982 +#: doc/guix.texi:21979 msgid "An output is one of the places to save logging information The format for an output can be:" msgstr "" #. type: deftypevr -#: doc/guix.texi:22022 +#: doc/guix.texi:22019 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-clients" msgstr "" #. type: deftypevr -#: doc/guix.texi:22027 +#: doc/guix.texi:22024 msgid "Defaults to @samp{1024}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22030 +#: doc/guix.texi:22027 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-size" msgstr "" #. type: deftypevr -#: doc/guix.texi:22032 +#: doc/guix.texi:22029 msgid "Maximum file size before rolling over." msgstr "" #. type: deftypevr -#: doc/guix.texi:22034 +#: doc/guix.texi:22031 msgid "Defaults to @samp{2MB}" msgstr "" #. type: deftypevr -#: doc/guix.texi:22037 +#: doc/guix.texi:22034 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-backups" msgstr "" #. type: deftypevr -#: doc/guix.texi:22039 +#: doc/guix.texi:22036 msgid "Maximum number of backup files to keep." msgstr "" #. type: deftypevr -#: doc/guix.texi:22041 +#: doc/guix.texi:22038 msgid "Defaults to @samp{3}" msgstr "" #. type: subsubheading -#: doc/guix.texi:22044 +#: doc/guix.texi:22041 #, no-wrap msgid "Transparent Emulation with QEMU" msgstr "" #. type: cindex -#: doc/guix.texi:22046 +#: doc/guix.texi:22043 #, no-wrap msgid "emulation" msgstr "" #. type: code{#1} -#: doc/guix.texi:22047 +#: doc/guix.texi:22044 #, no-wrap msgid "binfmt_misc" msgstr "" #. type: Plain text -#: doc/guix.texi:22053 +#: doc/guix.texi:22050 msgid "@code{qemu-binfmt-service-type} provides support for transparent emulation of program binaries built for different architectures---e.g., it allows you to transparently execute an ARMv7 program on an x86_64 machine. It achieves this by combining the @uref{https://www.qemu.org, QEMU} emulator and the @code{binfmt_misc} feature of the kernel Linux." msgstr "" #. type: defvr -#: doc/guix.texi:22054 +#: doc/guix.texi:22051 #, no-wrap msgid "{Scheme Variable} qemu-binfmt-service-type" msgstr "{Scheme-Variable} qemu-binfmt-service-type" #. type: defvr -#: doc/guix.texi:22059 +#: doc/guix.texi:22056 msgid "This is the type of the QEMU/binfmt service for transparent emulation. Its value must be a @code{qemu-binfmt-configuration} object, which specifies the QEMU package to use as well as the architecture we want to emulated:" msgstr "Dies ist der Diensttyp des QEMU/binfmt-Dienstes für transparente Emulation. Sein Wert muss ein @code{qemu-binfmt-configuration}-Objekt sein, das das QEMU-Paket angibt, das benutzt werden soll, sowie die Architektur, die wir emulieren möchten." #. type: example -#: doc/guix.texi:22064 +#: doc/guix.texi:22061 #, no-wrap msgid "" "(service qemu-binfmt-service-type\n" @@ -40929,50 +40983,50 @@ msgstr "" " (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))))\n" #. type: defvr -#: doc/guix.texi:22070 +#: doc/guix.texi:22067 msgid "In this example, we enable transparent emulation for the ARM and aarch64 platforms. Running @code{herd stop qemu-binfmt} turns it off, and running @code{herd start qemu-binfmt} turns it back on (@pxref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})." msgstr "In diesem Beispiel aktivieren wir transparente Emulation für die Plattformen ARM und aarch64. Wenn wir @code{herd stop qemu-binfmt} ausführen, wird diese abgeschaltet, und mit @code{herd start qemu-binfmt} wird sie wieder aktiv (siehe @ref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})." #. type: deftp -#: doc/guix.texi:22072 +#: doc/guix.texi:22069 #, no-wrap msgid "{Data Type} qemu-binfmt-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:22074 +#: doc/guix.texi:22071 msgid "This is the configuration for the @code{qemu-binfmt} service." msgstr "" #. type: item -#: doc/guix.texi:22076 +#: doc/guix.texi:22073 #, no-wrap msgid "@code{platforms} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:22079 +#: doc/guix.texi:22076 msgid "The list of emulated QEMU platforms. Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see below)." msgstr "" #. type: item -#: doc/guix.texi:22080 +#: doc/guix.texi:22077 #, no-wrap msgid "@code{guix-support?} (default: @code{#f})" msgstr "" #. type: table -#: doc/guix.texi:22086 +#: doc/guix.texi:22083 msgid "When it is true, QEMU and all its dependencies are added to the build environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, @code{--chroot-directory} option}). This allows the @code{binfmt_misc} handlers to be used within the build environment, which in turn means that you can transparently build programs for another architecture." msgstr "" #. type: table -#: doc/guix.texi:22089 +#: doc/guix.texi:22086 msgid "For example, let's suppose you're on an x86_64 machine and you have this service:" msgstr "" #. type: example -#: doc/guix.texi:22095 +#: doc/guix.texi:22092 #, no-wrap msgid "" "(service qemu-binfmt-service-type\n" @@ -40982,262 +41036,262 @@ msgid "" msgstr "" #. type: table -#: doc/guix.texi:22098 +#: doc/guix.texi:22095 msgid "You can run:" msgstr "" #. type: example -#: doc/guix.texi:22101 +#: doc/guix.texi:22098 #, no-wrap msgid "guix build -s armhf-linux inkscape\n" msgstr "" #. type: table -#: doc/guix.texi:22108 +#: doc/guix.texi:22105 msgid "and it will build Inkscape for ARMv7 @emph{as if it were a native build}, transparently using QEMU to emulate the ARMv7 CPU. Pretty handy if you'd like to test a package build for an architecture you don't have access to!" msgstr "" #. type: item -#: doc/guix.texi:22109 +#: doc/guix.texi:22106 #, no-wrap msgid "@code{qemu} (default: @code{qemu})" msgstr "" #. type: table -#: doc/guix.texi:22111 +#: doc/guix.texi:22108 msgid "The QEMU package to use." msgstr "" #. type: deffn -#: doc/guix.texi:22114 +#: doc/guix.texi:22111 #, no-wrap msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}" msgstr "" #. type: deffn -#: doc/guix.texi:22119 +#: doc/guix.texi:22116 msgid "Return the list of QEMU platform objects corresponding to @var{platforms}@dots{}. @var{platforms} must be a list of strings corresponding to platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"}, and so on." msgstr "" #. type: deffn -#: doc/guix.texi:22121 +#: doc/guix.texi:22118 #, no-wrap msgid "{Scheme Procedure} qemu-platform? @var{obj}" msgstr "" #. type: deffn -#: doc/guix.texi:22123 +#: doc/guix.texi:22120 msgid "Return true if @var{obj} is a platform object." msgstr "" #. type: deffn -#: doc/guix.texi:22125 +#: doc/guix.texi:22122 #, no-wrap msgid "{Scheme Procedure} qemu-platform-name @var{platform}" msgstr "" #. type: deffn -#: doc/guix.texi:22127 +#: doc/guix.texi:22124 msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}." msgstr "" #. type: Plain text -#: doc/guix.texi:22139 +#: doc/guix.texi:22136 msgid "The @code{(gnu services version-control)} module provides a service to allow remote access to local Git repositories. There are three options: the @code{git-daemon-service}, which provides access to repositories via the @code{git://} unsecured TCP-based protocol, extending the @code{nginx} web server to proxy some requests to @code{git-http-backend}, or providing a web interface with @code{cgit-service-type}." msgstr "" #. type: deffn -#: doc/guix.texi:22140 +#: doc/guix.texi:22137 #, no-wrap msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]" msgstr "" #. type: deffn -#: doc/guix.texi:22144 +#: doc/guix.texi:22141 msgid "Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous access." msgstr "" #. type: deffn -#: doc/guix.texi:22150 +#: doc/guix.texi:22147 msgid "The optional @var{config} argument should be a @code{} object, by default it allows read-only access to exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the repository directory.} repositories under @file{/srv/git}." msgstr "" #. type: deftp -#: doc/guix.texi:22153 +#: doc/guix.texi:22150 #, no-wrap msgid "{Data Type} git-daemon-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:22155 +#: doc/guix.texi:22152 msgid "Data type representing the configuration for @code{git-daemon-service}." msgstr "" #. type: item -#: doc/guix.texi:22157 doc/guix.texi:22213 +#: doc/guix.texi:22154 doc/guix.texi:22210 #, no-wrap msgid "@code{package} (default: @var{git})" msgstr "" #. type: table -#: doc/guix.texi:22159 doc/guix.texi:22215 +#: doc/guix.texi:22156 doc/guix.texi:22212 msgid "Package object of the Git distributed version control system." msgstr "" #. type: item -#: doc/guix.texi:22160 doc/guix.texi:22219 +#: doc/guix.texi:22157 doc/guix.texi:22216 #, no-wrap msgid "@code{export-all?} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:22163 +#: doc/guix.texi:22160 msgid "Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file." msgstr "" #. type: item -#: doc/guix.texi:22164 +#: doc/guix.texi:22161 #, no-wrap msgid "@code{base-path} (default: @file{/srv/git})" msgstr "" #. type: table -#: doc/guix.texi:22169 +#: doc/guix.texi:22166 msgid "Whether to remap all the path requests as relative to the given path. If you run git daemon with @var{(base-path \"/srv/git\")} on example.com, then if you later try to pull @code{git://example.com/hello.git}, git daemon will interpret the path as @code{/srv/git/hello.git}." msgstr "" #. type: item -#: doc/guix.texi:22170 +#: doc/guix.texi:22167 #, no-wrap msgid "@code{user-path} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:22177 +#: doc/guix.texi:22174 msgid "Whether to allow @code{~user} notation to be used in requests. When specified with empty string, requests to @code{git://host/~alice/foo} is taken as a request to access @code{foo} repository in the home directory of user @code{alice}. If @var{(user-path \"path\")} is specified, the same request is taken as a request to access @code{path/foo} repository in the home directory of user @code{alice}." msgstr "" #. type: item -#: doc/guix.texi:22178 +#: doc/guix.texi:22175 #, no-wrap msgid "@code{listen} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:22181 +#: doc/guix.texi:22178 msgid "Whether to listen on specific IP addresses or hostnames, defaults to all." msgstr "" #. type: item -#: doc/guix.texi:22182 +#: doc/guix.texi:22179 #, no-wrap msgid "@code{port} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:22184 +#: doc/guix.texi:22181 msgid "Whether to listen on an alternative port, which defaults to 9418." msgstr "" #. type: item -#: doc/guix.texi:22185 +#: doc/guix.texi:22182 #, no-wrap msgid "@code{whitelist} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:22187 +#: doc/guix.texi:22184 msgid "If not empty, only allow access to this list of directories." msgstr "" #. type: item -#: doc/guix.texi:22188 +#: doc/guix.texi:22185 #, no-wrap msgid "@code{extra-options} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:22191 +#: doc/guix.texi:22188 msgid "Extra options will be passed to @code{git daemon}, please run @command{man git-daemon} for more information." msgstr "" #. type: Plain text -#: doc/guix.texi:22205 +#: doc/guix.texi:22202 msgid "The @code{git://} protocol lacks authentication. When you pull from a repository fetched via @code{git://}, you don't know that the data you receive was modified is really coming from the specified host, and you have your connection is subject to eavesdropping. It's better to use an authenticated and encrypted transport, such as @code{https}. Although Git allows you to serve repositories using unsophisticated file-based web servers, there is a faster protocol implemented by the @code{git-http-backend} program. This program is the back-end of a proper Git web service. It is designed to sit behind a FastCGI proxy. @xref{Web Services}, for more on running the necessary @code{fcgiwrap} daemon." msgstr "" #. type: Plain text -#: doc/guix.texi:22208 +#: doc/guix.texi:22205 msgid "Guix has a separate configuration data type for serving Git repositories over HTTP." msgstr "" #. type: deftp -#: doc/guix.texi:22209 +#: doc/guix.texi:22206 #, no-wrap msgid "{Data Type} git-http-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:22211 +#: doc/guix.texi:22208 msgid "Data type representing the configuration for @code{git-http-service}." msgstr "" #. type: item -#: doc/guix.texi:22216 +#: doc/guix.texi:22213 #, no-wrap msgid "@code{git-root} (default: @file{/srv/git})" msgstr "" #. type: table -#: doc/guix.texi:22218 +#: doc/guix.texi:22215 msgid "Directory containing the Git repositories to expose to the world." msgstr "" #. type: table -#: doc/guix.texi:22222 +#: doc/guix.texi:22219 msgid "Whether to expose access for all Git repositories in @var{git-root}, even if they do not have the @file{git-daemon-export-ok} file." msgstr "" #. type: item -#: doc/guix.texi:22223 +#: doc/guix.texi:22220 #, no-wrap msgid "@code{uri-path} (default: @file{/git/})" msgstr "" #. type: table -#: doc/guix.texi:22228 +#: doc/guix.texi:22225 msgid "Path prefix for Git access. With the default @code{/git/} prefix, this will map @code{http://@var{server}/git/@var{repo}.git} to @code{/srv/git/@var{repo}.git}. Requests whose URI paths do not begin with this prefix are not passed on to this Git instance." msgstr "" #. type: item -#: doc/guix.texi:22229 +#: doc/guix.texi:22226 #, no-wrap msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})" msgstr "" #. type: table -#: doc/guix.texi:22232 +#: doc/guix.texi:22229 msgid "The socket on which the @code{fcgiwrap} daemon is listening. @xref{Web Services}." msgstr "" #. type: Plain text -#: doc/guix.texi:22239 +#: doc/guix.texi:22236 msgid "There is no @code{git-http-service-type}, currently; instead you can create an @code{nginx-location-configuration} from a @code{git-http-configuration} and then add that location to a web server." msgstr "" #. type: deffn -#: doc/guix.texi:22240 +#: doc/guix.texi:22237 #, no-wrap msgid "{Scheme Procedure} git-http-nginx-location-configuration @" msgstr "" #. type: deffn -#: doc/guix.texi:22245 +#: doc/guix.texi:22242 msgid "[config=(git-http-configuration)] Compute an @code{nginx-location-configuration} that corresponds to the given Git http configuration. An example nginx service definition to serve the default @file{/srv/git} over HTTPS might be:" msgstr "" #. type: example -#: doc/guix.texi:22262 +#: doc/guix.texi:22259 #, no-wrap msgid "" "(service nginx-service-type\n" @@ -41258,1420 +41312,1420 @@ msgid "" msgstr "" #. type: deffn -#: doc/guix.texi:22269 +#: doc/guix.texi:22266 msgid "This example assumes that you are using Let's Encrypt to get your TLS certificate. @xref{Certificate Services}. The default @code{certbot} service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS. You will also need to add an @code{fcgiwrap} proxy to your system services. @xref{Web Services}." msgstr "" #. type: subsubheading -#: doc/guix.texi:22271 +#: doc/guix.texi:22268 #, no-wrap msgid "Cgit Service" msgstr "" #. type: cindex -#: doc/guix.texi:22273 +#: doc/guix.texi:22270 #, no-wrap msgid "Cgit service" msgstr "" #. type: cindex -#: doc/guix.texi:22274 +#: doc/guix.texi:22271 #, no-wrap msgid "Git, web interface" msgstr "" #. type: Plain text -#: doc/guix.texi:22277 +#: doc/guix.texi:22274 msgid "@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git repositories written in C." msgstr "" #. type: Plain text -#: doc/guix.texi:22280 +#: doc/guix.texi:22277 msgid "The following example will configure the service with default values. By default, Cgit can be accessed on port 80 (@code{http://localhost:80})." msgstr "" #. type: example -#: doc/guix.texi:22283 +#: doc/guix.texi:22280 #, no-wrap msgid "(service cgit-service-type)\n" msgstr "" #. type: Plain text -#: doc/guix.texi:22287 +#: doc/guix.texi:22284 msgid "The @code{file-object} type designates either a file-like object (@pxref{G-Expressions, file-like objects}) or a string." msgstr "" #. type: Plain text -#: doc/guix.texi:22291 +#: doc/guix.texi:22288 msgid "Available @code{cgit-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:22292 +#: doc/guix.texi:22289 #, no-wrap msgid "{@code{cgit-configuration} parameter} package package" msgstr "" #. type: deftypevr -#: doc/guix.texi:22294 +#: doc/guix.texi:22291 msgid "The CGIT package." msgstr "" #. type: deftypevr -#: doc/guix.texi:22297 +#: doc/guix.texi:22294 #, no-wrap msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx" msgstr "" #. type: deftypevr -#: doc/guix.texi:22302 +#: doc/guix.texi:22299 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object about-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22305 +#: doc/guix.texi:22302 msgid "Specifies a command which will be invoked to format the content of about pages (both top-level and for each repository)." msgstr "" #. type: deftypevr -#: doc/guix.texi:22310 +#: doc/guix.texi:22307 #, no-wrap msgid "{@code{cgit-configuration} parameter} string agefile" msgstr "" #. type: deftypevr -#: doc/guix.texi:22313 +#: doc/guix.texi:22310 msgid "Specifies a path, relative to each repository path, which can be used to specify the date and time of the youngest commit in the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22318 +#: doc/guix.texi:22315 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object auth-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22321 +#: doc/guix.texi:22318 msgid "Specifies a command that will be invoked for authenticating repository access." msgstr "" #. type: deftypevr -#: doc/guix.texi:22326 +#: doc/guix.texi:22323 #, no-wrap msgid "{@code{cgit-configuration} parameter} string branch-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22329 +#: doc/guix.texi:22326 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set @samp{name} enables ordering by branch name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22331 +#: doc/guix.texi:22328 msgid "Defaults to @samp{\"name\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22334 +#: doc/guix.texi:22331 #, no-wrap msgid "{@code{cgit-configuration} parameter} string cache-root" msgstr "" #. type: deftypevr -#: doc/guix.texi:22336 +#: doc/guix.texi:22333 msgid "Path used to store the cgit cache entries." msgstr "" #. type: deftypevr -#: doc/guix.texi:22338 +#: doc/guix.texi:22335 msgid "Defaults to @samp{\"/var/cache/cgit\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22341 +#: doc/guix.texi:22338 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22344 +#: doc/guix.texi:22341 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed with a fixed SHA1." msgstr "" #. type: deftypevr -#: doc/guix.texi:22346 doc/guix.texi:22789 +#: doc/guix.texi:22343 doc/guix.texi:22786 msgid "Defaults to @samp{-1}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22349 +#: doc/guix.texi:22346 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22352 +#: doc/guix.texi:22349 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed without a fixed SHA1." msgstr "" #. type: deftypevr -#: doc/guix.texi:22357 +#: doc/guix.texi:22354 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22360 +#: doc/guix.texi:22357 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository summary page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22365 +#: doc/guix.texi:22362 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22368 +#: doc/guix.texi:22365 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22373 +#: doc/guix.texi:22370 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22376 +#: doc/guix.texi:22373 msgid "Number which specifies the time-to-live, in minutes, for the result of scanning a path for Git repositories." msgstr "" #. type: deftypevr -#: doc/guix.texi:22381 +#: doc/guix.texi:22378 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22384 +#: doc/guix.texi:22381 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository about page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22389 +#: doc/guix.texi:22386 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22392 +#: doc/guix.texi:22389 msgid "Number which specifies the time-to-live, in minutes, for the cached version of snapshots." msgstr "" #. type: deftypevr -#: doc/guix.texi:22397 +#: doc/guix.texi:22394 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-size" msgstr "" #. type: deftypevr -#: doc/guix.texi:22400 +#: doc/guix.texi:22397 msgid "The maximum number of entries in the cgit cache. When set to @samp{0}, caching is disabled." msgstr "" #. type: deftypevr -#: doc/guix.texi:22405 +#: doc/guix.texi:22402 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22407 +#: doc/guix.texi:22404 msgid "Sort items in the repo list case sensitively." msgstr "" #. type: deftypevr -#: doc/guix.texi:22412 +#: doc/guix.texi:22409 #, no-wrap msgid "{@code{cgit-configuration} parameter} list clone-prefix" msgstr "" #. type: deftypevr -#: doc/guix.texi:22415 +#: doc/guix.texi:22412 msgid "List of common prefixes which, when combined with a repository URL, generates valid clone URLs for the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22420 +#: doc/guix.texi:22417 #, no-wrap msgid "{@code{cgit-configuration} parameter} list clone-url" msgstr "" #. type: deftypevr -#: doc/guix.texi:22422 +#: doc/guix.texi:22419 msgid "List of @code{clone-url} templates." msgstr "" #. type: deftypevr -#: doc/guix.texi:22427 +#: doc/guix.texi:22424 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object commit-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22429 +#: doc/guix.texi:22426 msgid "Command which will be invoked to format commit messages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22434 +#: doc/guix.texi:22431 #, no-wrap msgid "{@code{cgit-configuration} parameter} string commit-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22438 doc/guix.texi:22996 +#: doc/guix.texi:22435 doc/guix.texi:22993 msgid "Flag which, when set to @samp{date}, enables strict date ordering in the commit log, and when set to @samp{topo} enables strict topological ordering." msgstr "" #. type: deftypevr -#: doc/guix.texi:22440 +#: doc/guix.texi:22437 msgid "Defaults to @samp{\"git log\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22443 +#: doc/guix.texi:22440 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object css" msgstr "" #. type: deftypevr -#: doc/guix.texi:22445 +#: doc/guix.texi:22442 msgid "URL which specifies the css document to include in all cgit pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22447 +#: doc/guix.texi:22444 msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22450 +#: doc/guix.texi:22447 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object email-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22454 +#: doc/guix.texi:22451 msgid "Specifies a command which will be invoked to format names and email address of committers, authors, and taggers, as represented in various places throughout the cgit interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:22459 +#: doc/guix.texi:22456 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean embedded?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22462 +#: doc/guix.texi:22459 msgid "Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment suitable for embedding in other HTML pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22467 +#: doc/guix.texi:22464 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22471 +#: doc/guix.texi:22468 msgid "Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit history graph to the left of the commit messages in the repository log page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22476 +#: doc/guix.texi:22473 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22479 +#: doc/guix.texi:22476 msgid "Flag which, when set to @samp{#t}, allows all filter settings to be overridden in repository-specific cgitrc files." msgstr "" #. type: deftypevr -#: doc/guix.texi:22484 +#: doc/guix.texi:22481 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22487 +#: doc/guix.texi:22484 msgid "Flag which, when set to @samp{#t}, allows users to follow a file in the log view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22492 +#: doc/guix.texi:22489 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22495 +#: doc/guix.texi:22492 msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones." msgstr "" #. type: deftypevr -#: doc/guix.texi:22500 +#: doc/guix.texi:22497 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22503 +#: doc/guix.texi:22500 msgid "Flag which, when set to @samp{#t}, will make cgit generate extra links \"summary\", \"commit\", \"tree\" for each repo in the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:22508 +#: doc/guix.texi:22505 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22511 +#: doc/guix.texi:22508 msgid "Flag which, when set to @samp{#t}, will make cgit display the owner of each repo in the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:22516 +#: doc/guix.texi:22513 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22519 +#: doc/guix.texi:22516 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of modified files for each commit on the repository log page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22524 +#: doc/guix.texi:22521 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22527 +#: doc/guix.texi:22524 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of added and removed lines for each commit on the repository log page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22532 +#: doc/guix.texi:22529 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22535 doc/guix.texi:23059 +#: doc/guix.texi:22532 doc/guix.texi:23056 msgid "Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views." msgstr "" #. type: deftypevr -#: doc/guix.texi:22540 +#: doc/guix.texi:22537 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22544 +#: doc/guix.texi:22541 msgid "Flag which, when set to @code{1}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22549 +#: doc/guix.texi:22546 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22553 +#: doc/guix.texi:22550 msgid "Flag which, when set to @samp{#t}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22558 +#: doc/guix.texi:22555 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22561 +#: doc/guix.texi:22558 msgid "Flag which, when set to @samp{#t}, will make cgit generate linenumber links for plaintext blobs printed in the tree view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22566 +#: doc/guix.texi:22563 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22569 +#: doc/guix.texi:22566 msgid "Flag which, when set to @samp{#f}, will allow cgit to use Git config to set any repo specific settings." msgstr "" #. type: deftypevr -#: doc/guix.texi:22574 +#: doc/guix.texi:22571 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object favicon" msgstr "" #. type: deftypevr -#: doc/guix.texi:22576 +#: doc/guix.texi:22573 msgid "URL used as link to a shortcut icon for cgit." msgstr "" #. type: deftypevr -#: doc/guix.texi:22578 +#: doc/guix.texi:22575 msgid "Defaults to @samp{\"/favicon.ico\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22581 +#: doc/guix.texi:22578 #, no-wrap msgid "{@code{cgit-configuration} parameter} string footer" msgstr "" #. type: deftypevr -#: doc/guix.texi:22585 +#: doc/guix.texi:22582 msgid "The content of the file specified with this option will be included verbatim at the bottom of all pages (i.e.@: it replaces the standard \"generated by...\"@: message)." msgstr "" #. type: deftypevr -#: doc/guix.texi:22590 +#: doc/guix.texi:22587 #, no-wrap msgid "{@code{cgit-configuration} parameter} string head-include" msgstr "" #. type: deftypevr -#: doc/guix.texi:22593 +#: doc/guix.texi:22590 msgid "The content of the file specified with this option will be included verbatim in the HTML HEAD section on all pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22598 +#: doc/guix.texi:22595 #, no-wrap msgid "{@code{cgit-configuration} parameter} string header" msgstr "" #. type: deftypevr -#: doc/guix.texi:22601 +#: doc/guix.texi:22598 msgid "The content of the file specified with this option will be included verbatim at the top of all pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22606 +#: doc/guix.texi:22603 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object include" msgstr "" #. type: deftypevr -#: doc/guix.texi:22609 +#: doc/guix.texi:22606 msgid "Name of a configfile to include before the rest of the current config- file is parsed." msgstr "" #. type: deftypevr -#: doc/guix.texi:22614 +#: doc/guix.texi:22611 #, no-wrap msgid "{@code{cgit-configuration} parameter} string index-header" msgstr "" #. type: deftypevr -#: doc/guix.texi:22617 +#: doc/guix.texi:22614 msgid "The content of the file specified with this option will be included verbatim above the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:22622 +#: doc/guix.texi:22619 #, no-wrap msgid "{@code{cgit-configuration} parameter} string index-info" msgstr "" #. type: deftypevr -#: doc/guix.texi:22625 +#: doc/guix.texi:22622 msgid "The content of the file specified with this option will be included verbatim below the heading on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22630 +#: doc/guix.texi:22627 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean local-time?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22633 +#: doc/guix.texi:22630 msgid "Flag which, if set to @samp{#t}, makes cgit print commit and tag times in the servers timezone." msgstr "" #. type: deftypevr -#: doc/guix.texi:22638 +#: doc/guix.texi:22635 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object logo" msgstr "" #. type: deftypevr -#: doc/guix.texi:22641 +#: doc/guix.texi:22638 msgid "URL which specifies the source of an image which will be used as a logo on all cgit pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22643 +#: doc/guix.texi:22640 msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22646 +#: doc/guix.texi:22643 #, no-wrap msgid "{@code{cgit-configuration} parameter} string logo-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:22648 doc/guix.texi:23105 +#: doc/guix.texi:22645 doc/guix.texi:23102 msgid "URL loaded when clicking on the cgit logo image." msgstr "" #. type: deftypevr -#: doc/guix.texi:22653 +#: doc/guix.texi:22650 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object owner-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22656 +#: doc/guix.texi:22653 msgid "Command which will be invoked to format the Owner column of the main page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22661 +#: doc/guix.texi:22658 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-atom-items" msgstr "" #. type: deftypevr -#: doc/guix.texi:22663 +#: doc/guix.texi:22660 msgid "Number of items to display in atom feeds view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22665 doc/guix.texi:22900 doc/guix.texi:22908 -#: doc/guix.texi:22916 +#: doc/guix.texi:22662 doc/guix.texi:22897 doc/guix.texi:22905 +#: doc/guix.texi:22913 msgid "Defaults to @samp{10}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22668 +#: doc/guix.texi:22665 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-commit-count" msgstr "" #. type: deftypevr -#: doc/guix.texi:22670 +#: doc/guix.texi:22667 msgid "Number of entries to list per page in \"log\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22672 doc/guix.texi:22687 +#: doc/guix.texi:22669 doc/guix.texi:22684 msgid "Defaults to @samp{50}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22675 +#: doc/guix.texi:22672 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-message-length" msgstr "" #. type: deftypevr -#: doc/guix.texi:22677 +#: doc/guix.texi:22674 msgid "Number of commit message characters to display in \"log\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22679 doc/guix.texi:22695 +#: doc/guix.texi:22676 doc/guix.texi:22692 msgid "Defaults to @samp{80}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22682 +#: doc/guix.texi:22679 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-repo-count" msgstr "" #. type: deftypevr -#: doc/guix.texi:22685 +#: doc/guix.texi:22682 msgid "Specifies the number of entries to list per page on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22690 +#: doc/guix.texi:22687 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length" msgstr "" #. type: deftypevr -#: doc/guix.texi:22693 +#: doc/guix.texi:22690 msgid "Specifies the maximum number of repo description characters to display on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22698 +#: doc/guix.texi:22695 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-blob-size" msgstr "" #. type: deftypevr -#: doc/guix.texi:22700 +#: doc/guix.texi:22697 msgid "Specifies the maximum size of a blob to display HTML for in KBytes." msgstr "" #. type: deftypevr -#: doc/guix.texi:22705 +#: doc/guix.texi:22702 #, no-wrap msgid "{@code{cgit-configuration} parameter} string max-stats" msgstr "" #. type: deftypevr -#: doc/guix.texi:22708 +#: doc/guix.texi:22705 msgid "Maximum statistics period. Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22713 +#: doc/guix.texi:22710 #, no-wrap msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype" msgstr "" #. type: deftypevr -#: doc/guix.texi:22715 +#: doc/guix.texi:22712 msgid "Mimetype for the specified filename extension." msgstr "" #. type: deftypevr -#: doc/guix.texi:22719 +#: doc/guix.texi:22716 msgid "Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png \"image/png\") (svg \"image/svg+xml\"))}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22722 +#: doc/guix.texi:22719 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object mimetype-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:22724 +#: doc/guix.texi:22721 msgid "Specifies the file to use for automatic mimetype lookup." msgstr "" #. type: deftypevr -#: doc/guix.texi:22729 +#: doc/guix.texi:22726 #, no-wrap msgid "{@code{cgit-configuration} parameter} string module-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:22732 +#: doc/guix.texi:22729 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing." msgstr "" #. type: deftypevr -#: doc/guix.texi:22737 +#: doc/guix.texi:22734 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean nocache?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22739 +#: doc/guix.texi:22736 msgid "If set to the value @samp{#t} caching will be disabled." msgstr "" #. type: deftypevr -#: doc/guix.texi:22744 +#: doc/guix.texi:22741 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean noplainemail?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22747 +#: doc/guix.texi:22744 msgid "If set to @samp{#t} showing full author email addresses will be disabled." msgstr "" #. type: deftypevr -#: doc/guix.texi:22752 +#: doc/guix.texi:22749 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean noheader?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22755 +#: doc/guix.texi:22752 msgid "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22760 +#: doc/guix.texi:22757 #, no-wrap msgid "{@code{cgit-configuration} parameter} project-list project-list" msgstr "" #. type: deftypevr -#: doc/guix.texi:22764 +#: doc/guix.texi:22761 msgid "A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories. An empty list means that all subdirectories will be loaded." msgstr "" #. type: deftypevr -#: doc/guix.texi:22769 +#: doc/guix.texi:22766 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object readme" msgstr "" #. type: deftypevr -#: doc/guix.texi:22771 +#: doc/guix.texi:22768 msgid "Text which will be used as default value for @code{cgit-repo-readme}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22776 +#: doc/guix.texi:22773 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22780 +#: doc/guix.texi:22777 msgid "If set to @code{#t} and @code{repository-directory} is enabled, if any repositories are found with a suffix of @code{.git}, this suffix will be removed for the URL and name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22785 +#: doc/guix.texi:22782 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer renamelimit" msgstr "" #. type: deftypevr -#: doc/guix.texi:22787 +#: doc/guix.texi:22784 msgid "Maximum number of files to consider when detecting renames." msgstr "" #. type: deftypevr -#: doc/guix.texi:22792 +#: doc/guix.texi:22789 #, no-wrap msgid "{@code{cgit-configuration} parameter} string repository-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22794 +#: doc/guix.texi:22791 msgid "The way in which repositories in each section are sorted." msgstr "" #. type: deftypevr -#: doc/guix.texi:22799 +#: doc/guix.texi:22796 #, no-wrap msgid "{@code{cgit-configuration} parameter} robots-list robots" msgstr "" #. type: deftypevr -#: doc/guix.texi:22801 +#: doc/guix.texi:22798 msgid "Text used as content for the @code{robots} meta-tag." msgstr "" #. type: deftypevr -#: doc/guix.texi:22803 +#: doc/guix.texi:22800 msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22806 +#: doc/guix.texi:22803 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-desc" msgstr "" #. type: deftypevr -#: doc/guix.texi:22808 +#: doc/guix.texi:22805 msgid "Text printed below the heading on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22810 +#: doc/guix.texi:22807 msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22813 +#: doc/guix.texi:22810 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-readme" msgstr "" #. type: deftypevr -#: doc/guix.texi:22816 +#: doc/guix.texi:22813 msgid "The content of the file specified with this option will be included verbatim below thef \"about\" link on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22821 +#: doc/guix.texi:22818 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-title" msgstr "" #. type: deftypevr -#: doc/guix.texi:22823 +#: doc/guix.texi:22820 msgid "Text printed as heading on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22828 +#: doc/guix.texi:22825 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path" msgstr "" #. type: deftypevr -#: doc/guix.texi:22834 +#: doc/guix.texi:22831 msgid "If set to @samp{#t} and repository-directory is enabled, repository-directory will recurse into directories whose name starts with a period. Otherwise, repository-directory will stay away from such directories, considered as \"hidden\". Note that this does not apply to the \".git\" directory in non-bare repos." msgstr "" #. type: deftypevr -#: doc/guix.texi:22839 +#: doc/guix.texi:22836 #, no-wrap msgid "{@code{cgit-configuration} parameter} list snapshots" msgstr "" #. type: deftypevr -#: doc/guix.texi:22842 +#: doc/guix.texi:22839 msgid "Text which specifies the default set of snapshot formats that cgit generates links for." msgstr "" #. type: deftypevr -#: doc/guix.texi:22847 +#: doc/guix.texi:22844 #, no-wrap msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory" msgstr "" #. type: deftypevr -#: doc/guix.texi:22850 +#: doc/guix.texi:22847 msgid "Name of the directory to scan for repositories (represents @code{scan-path})." msgstr "" #. type: deftypevr -#: doc/guix.texi:22852 +#: doc/guix.texi:22849 msgid "Defaults to @samp{\"/srv/git\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22855 +#: doc/guix.texi:22852 #, no-wrap msgid "{@code{cgit-configuration} parameter} string section" msgstr "" #. type: deftypevr -#: doc/guix.texi:22858 doc/guix.texi:23174 +#: doc/guix.texi:22855 doc/guix.texi:23171 msgid "The name of the current repository section - all repositories defined after this option will inherit the current section name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22863 +#: doc/guix.texi:22860 #, no-wrap msgid "{@code{cgit-configuration} parameter} string section-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22866 +#: doc/guix.texi:22863 msgid "Flag which, when set to @samp{1}, will sort the sections on the repository listing by name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22871 +#: doc/guix.texi:22868 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer section-from-path" msgstr "" #. type: deftypevr -#: doc/guix.texi:22874 +#: doc/guix.texi:22871 msgid "A number which, if defined prior to repository-directory, specifies how many path elements from each repo path to use as a default section name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22879 +#: doc/guix.texi:22876 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22882 +#: doc/guix.texi:22879 msgid "If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default." msgstr "" #. type: deftypevr -#: doc/guix.texi:22887 +#: doc/guix.texi:22884 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object source-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22890 +#: doc/guix.texi:22887 msgid "Specifies a command which will be invoked to format plaintext blobs in the tree view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22895 +#: doc/guix.texi:22892 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-branches" msgstr "" #. type: deftypevr -#: doc/guix.texi:22898 +#: doc/guix.texi:22895 msgid "Specifies the number of branches to display in the repository \"summary\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22903 +#: doc/guix.texi:22900 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-log" msgstr "" #. type: deftypevr -#: doc/guix.texi:22906 +#: doc/guix.texi:22903 msgid "Specifies the number of log entries to display in the repository \"summary\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22911 +#: doc/guix.texi:22908 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-tags" msgstr "" #. type: deftypevr -#: doc/guix.texi:22914 +#: doc/guix.texi:22911 msgid "Specifies the number of tags to display in the repository \"summary\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22919 +#: doc/guix.texi:22916 #, no-wrap msgid "{@code{cgit-configuration} parameter} string strict-export" msgstr "" #. type: deftypevr -#: doc/guix.texi:22922 +#: doc/guix.texi:22919 msgid "Filename which, if specified, needs to be present within the repository for cgit to allow access to that repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22927 +#: doc/guix.texi:22924 #, no-wrap msgid "{@code{cgit-configuration} parameter} string virtual-root" msgstr "" #. type: deftypevr -#: doc/guix.texi:22929 +#: doc/guix.texi:22926 msgid "URL which, if specified, will be used as root for all cgit links." msgstr "" #. type: deftypevr -#: doc/guix.texi:22931 +#: doc/guix.texi:22928 msgid "Defaults to @samp{\"/\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22934 +#: doc/guix.texi:22931 #, no-wrap msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories" msgstr "" #. type: deftypevr -#: doc/guix.texi:22936 +#: doc/guix.texi:22933 msgid "A list of @dfn{cgit-repo} records to use with config." msgstr "" #. type: deftypevr -#: doc/guix.texi:22940 +#: doc/guix.texi:22937 msgid "Available @code{repository-cgit-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:22941 +#: doc/guix.texi:22938 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots" msgstr "" #. type: deftypevr -#: doc/guix.texi:22944 +#: doc/guix.texi:22941 msgid "A mask of snapshot formats for this repo that cgit generates links for, restricted by the global @code{snapshots} setting." msgstr "" #. type: deftypevr -#: doc/guix.texi:22949 +#: doc/guix.texi:22946 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22951 +#: doc/guix.texi:22948 msgid "Override the default @code{source-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22956 +#: doc/guix.texi:22953 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string url" msgstr "" #. type: deftypevr -#: doc/guix.texi:22958 +#: doc/guix.texi:22955 msgid "The relative URL used to access the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22963 +#: doc/guix.texi:22960 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22965 +#: doc/guix.texi:22962 msgid "Override the default @code{about-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22970 +#: doc/guix.texi:22967 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22973 +#: doc/guix.texi:22970 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set to @samp{name} enables ordering by branch name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22978 +#: doc/guix.texi:22975 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url" msgstr "" #. type: deftypevr -#: doc/guix.texi:22980 +#: doc/guix.texi:22977 msgid "A list of URLs which can be used to clone repo." msgstr "" #. type: deftypevr -#: doc/guix.texi:22985 +#: doc/guix.texi:22982 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22987 +#: doc/guix.texi:22984 msgid "Override the default @code{commit-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22992 +#: doc/guix.texi:22989 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:23001 +#: doc/guix.texi:22998 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch" msgstr "" #. type: deftypevr -#: doc/guix.texi:23006 +#: doc/guix.texi:23003 msgid "The name of the default branch for this repository. If no such branch exists in the repository, the first branch name (when sorted) is used as default instead. By default branch pointed to by HEAD, or \"master\" if there is no suitable HEAD." msgstr "" #. type: deftypevr -#: doc/guix.texi:23011 +#: doc/guix.texi:23008 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string desc" msgstr "" #. type: deftypevr -#: doc/guix.texi:23013 +#: doc/guix.texi:23010 msgid "The value to show as repository description." msgstr "" #. type: deftypevr -#: doc/guix.texi:23018 +#: doc/guix.texi:23015 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage" msgstr "" #. type: deftypevr -#: doc/guix.texi:23020 +#: doc/guix.texi:23017 msgid "The value to show as repository homepage." msgstr "" #. type: deftypevr -#: doc/guix.texi:23025 +#: doc/guix.texi:23022 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:23027 +#: doc/guix.texi:23024 msgid "Override the default @code{email-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23032 +#: doc/guix.texi:23029 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-commit-graph?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23035 +#: doc/guix.texi:23032 msgid "A flag which can be used to disable the global setting @code{enable-commit-graph?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23040 +#: doc/guix.texi:23037 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-filecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23043 +#: doc/guix.texi:23040 msgid "A flag which can be used to disable the global setting @code{enable-log-filecount?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23048 +#: doc/guix.texi:23045 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-linecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23051 +#: doc/guix.texi:23048 msgid "A flag which can be used to disable the global setting @code{enable-log-linecount?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23056 +#: doc/guix.texi:23053 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-remote-branches?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23064 +#: doc/guix.texi:23061 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-subject-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23067 +#: doc/guix.texi:23064 msgid "A flag which can be used to override the global setting @code{enable-subject-links?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23072 +#: doc/guix.texi:23069 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-html-serving?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23075 +#: doc/guix.texi:23072 msgid "A flag which can be used to override the global setting @code{enable-html-serving?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23080 +#: doc/guix.texi:23077 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23083 +#: doc/guix.texi:23080 msgid "Flag which, when set to @code{#t}, hides the repository from the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:23088 +#: doc/guix.texi:23085 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23090 +#: doc/guix.texi:23087 msgid "Flag which, when set to @samp{#t}, ignores the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:23095 +#: doc/guix.texi:23092 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo" msgstr "" #. type: deftypevr -#: doc/guix.texi:23098 +#: doc/guix.texi:23095 msgid "URL which specifies the source of an image which will be used as a logo on this repo’s pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:23103 +#: doc/guix.texi:23100 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:23110 +#: doc/guix.texi:23107 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:23112 +#: doc/guix.texi:23109 msgid "Override the default @code{owner-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23117 +#: doc/guix.texi:23114 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:23121 +#: doc/guix.texi:23118 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing. The arguments for the formatstring are the path and SHA1 of the submodule commit." msgstr "" #. type: deftypevr -#: doc/guix.texi:23126 +#: doc/guix.texi:23123 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path" msgstr "" #. type: deftypevr -#: doc/guix.texi:23130 +#: doc/guix.texi:23127 msgid "Text which will be used as the formatstring for a hyperlink when a submodule with the specified subdirectory path is printed in a directory listing." msgstr "" #. type: deftypevr -#: doc/guix.texi:23135 +#: doc/guix.texi:23132 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats" msgstr "" #. type: deftypevr -#: doc/guix.texi:23137 +#: doc/guix.texi:23134 msgid "Override the default maximum statistics period." msgstr "" #. type: deftypevr -#: doc/guix.texi:23142 +#: doc/guix.texi:23139 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string name" msgstr "" #. type: deftypevr -#: doc/guix.texi:23144 +#: doc/guix.texi:23141 msgid "The value to show as repository name." msgstr "" #. type: deftypevr -#: doc/guix.texi:23149 +#: doc/guix.texi:23146 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string owner" msgstr "" #. type: deftypevr -#: doc/guix.texi:23151 +#: doc/guix.texi:23148 msgid "A value used to identify the owner of the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:23156 +#: doc/guix.texi:23153 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string path" msgstr "" #. type: deftypevr -#: doc/guix.texi:23158 +#: doc/guix.texi:23155 msgid "An absolute path to the repository directory." msgstr "" #. type: deftypevr -#: doc/guix.texi:23163 +#: doc/guix.texi:23160 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string readme" msgstr "" #. type: deftypevr -#: doc/guix.texi:23166 +#: doc/guix.texi:23163 msgid "A path (relative to repo) which specifies a file to include verbatim as the \"About\" page for this repo." msgstr "" #. type: deftypevr -#: doc/guix.texi:23171 +#: doc/guix.texi:23168 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string section" msgstr "" #. type: deftypevr -#: doc/guix.texi:23179 +#: doc/guix.texi:23176 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options" msgstr "" #. type: deftypevr -#: doc/guix.texi:23181 doc/guix.texi:23190 +#: doc/guix.texi:23178 doc/guix.texi:23187 msgid "Extra options will be appended to cgitrc file." msgstr "" #. type: deftypevr -#: doc/guix.texi:23188 +#: doc/guix.texi:23185 #, no-wrap msgid "{@code{cgit-configuration} parameter} list extra-options" msgstr "" #. type: Plain text -#: doc/guix.texi:23202 +#: doc/guix.texi:23199 msgid "However, it could be that you just want to get a @code{cgitrc} up and running. In that case, you can pass an @code{opaque-cgit-configuration} as a record to @code{cgit-service-type}. As its name indicates, an opaque configuration does not have easy reflective capabilities." msgstr "" #. type: Plain text -#: doc/guix.texi:23204 +#: doc/guix.texi:23201 msgid "Available @code{opaque-cgit-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:23205 +#: doc/guix.texi:23202 #, no-wrap msgid "{@code{opaque-cgit-configuration} parameter} package cgit" msgstr "" #. type: deftypevr -#: doc/guix.texi:23207 +#: doc/guix.texi:23204 msgid "The cgit package." msgstr "" #. type: deftypevr -#: doc/guix.texi:23209 +#: doc/guix.texi:23206 #, no-wrap msgid "{@code{opaque-cgit-configuration} parameter} string string" msgstr "" #. type: deftypevr -#: doc/guix.texi:23211 +#: doc/guix.texi:23208 msgid "The contents of the @code{cgitrc}, as a string." msgstr "" #. type: Plain text -#: doc/guix.texi:23215 +#: doc/guix.texi:23212 msgid "For example, if your @code{cgitrc} is just the empty string, you could instantiate a cgit service like this:" msgstr "" #. type: example -#: doc/guix.texi:23220 +#: doc/guix.texi:23217 #, no-wrap msgid "" "(service cgit-service-type\n" @@ -42680,40 +42734,40 @@ msgid "" msgstr "" #. type: subsubheading -#: doc/guix.texi:23222 +#: doc/guix.texi:23219 #, no-wrap msgid "Gitolite Service" msgstr "Gitolite-Dienst" #. type: cindex -#: doc/guix.texi:23224 +#: doc/guix.texi:23221 #, no-wrap msgid "Gitolite service" msgstr "Gitolite-Dienst" #. type: cindex -#: doc/guix.texi:23225 +#: doc/guix.texi:23222 #, no-wrap msgid "Git, hosting" msgstr "" #. type: Plain text -#: doc/guix.texi:23228 +#: doc/guix.texi:23225 msgid "@uref{https://gitolite.com/gitolite/, Gitolite} is a tool for hosting Git repositories on a central server." msgstr "" #. type: Plain text -#: doc/guix.texi:23231 +#: doc/guix.texi:23228 msgid "Gitolite can handle multiple repositories and users, and supports flexible configuration of the permissions for the users on the repositories." msgstr "" #. type: Plain text -#: doc/guix.texi:23234 +#: doc/guix.texi:23231 msgid "The following example will configure Gitolite using the default @code{git} user, and the provided SSH public key." msgstr "" #. type: example -#: doc/guix.texi:23241 +#: doc/guix.texi:23238 #, no-wrap msgid "" "(service gitolite-service-type\n" @@ -42724,300 +42778,300 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:23246 +#: doc/guix.texi:23243 msgid "Gitolite is configured through a special admin repository which you can clone, for example, if you setup Gitolite on @code{example.com}, you would run the following command to clone the admin repository." msgstr "" #. type: example -#: doc/guix.texi:23249 +#: doc/guix.texi:23246 #, no-wrap msgid "git clone git@@example.com:gitolite-admin\n" msgstr "" #. type: Plain text -#: doc/guix.texi:23255 +#: doc/guix.texi:23252 msgid "When the Gitolite service is activated, the provided @code{admin-pubkey} will be inserted in to the @file{keydir} directory in the gitolite-admin repository. If this results in a change in the repository, it will be committed using the message ``gitolite setup by GNU Guix''." msgstr "" #. type: deftp -#: doc/guix.texi:23256 +#: doc/guix.texi:23253 #, no-wrap msgid "{Data Type} gitolite-configuration" msgstr "{Datentyp} gitolite-configuration" #. type: deftp -#: doc/guix.texi:23258 +#: doc/guix.texi:23255 msgid "Data type representing the configuration for @code{gitolite-service-type}." msgstr "Repräsentiert die Konfiguration vom @code{gitolite-service-type}." #. type: item -#: doc/guix.texi:23260 +#: doc/guix.texi:23257 #, no-wrap msgid "@code{package} (default: @var{gitolite})" msgstr "@code{package} (Vorgabe: @var{gitolite})" #. type: table -#: doc/guix.texi:23262 +#: doc/guix.texi:23259 msgid "Gitolite package to use." msgstr "Welches Gitolite-Paket benutzt werden soll." #. type: item -#: doc/guix.texi:23263 +#: doc/guix.texi:23260 #, no-wrap msgid "@code{user} (default: @var{git})" msgstr "@code{user} (Vorgabe: @var{git})" #. type: table -#: doc/guix.texi:23266 +#: doc/guix.texi:23263 msgid "User to use for Gitolite. This will be user that you use when accessing Gitolite over SSH." msgstr "" #. type: item -#: doc/guix.texi:23267 +#: doc/guix.texi:23264 #, no-wrap msgid "@code{group} (default: @var{git})" msgstr "@code{group} (Vorgabe: @var{git})" #. type: table -#: doc/guix.texi:23269 +#: doc/guix.texi:23266 msgid "Group to use for Gitolite." msgstr "" #. type: item -#: doc/guix.texi:23270 +#: doc/guix.texi:23267 #, no-wrap msgid "@code{home-directory} (default: @var{\"/var/lib/gitolite\"})" msgstr "@code{home-directory} (Vorgabe: @var{\"/var/lib/gitolite\"})" #. type: table -#: doc/guix.texi:23272 +#: doc/guix.texi:23269 msgid "Directory in which to store the Gitolite configuration and repositories." msgstr "" #. type: item -#: doc/guix.texi:23273 +#: doc/guix.texi:23270 #, no-wrap msgid "@code{rc-file} (default: @var{(gitolite-rc-file)})" msgstr "@code{rc-file} (Vorgabe: @var{(gitolite-rc-file)})" #. type: table -#: doc/guix.texi:23276 +#: doc/guix.texi:23273 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the configuration for Gitolite." msgstr "" #. type: item -#: doc/guix.texi:23277 +#: doc/guix.texi:23274 #, no-wrap msgid "@code{admin-pubkey} (default: @var{#f})" msgstr "@code{admin-pubkey} (Vorgabe: @var{#f})" #. type: table -#: doc/guix.texi:23281 +#: doc/guix.texi:23278 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite. This will be inserted in to the @file{keydir} directory within the gitolite-admin repository." msgstr "" #. type: table -#: doc/guix.texi:23283 +#: doc/guix.texi:23280 msgid "To specify the SSH key as a string, use the @code{plain-file} function." msgstr "" #. type: example -#: doc/guix.texi:23286 +#: doc/guix.texi:23283 #, no-wrap msgid "(plain-file \"yourname.pub\" \"ssh-rsa AAAA... guix@@example.com\")\n" msgstr "" #. type: deftp -#: doc/guix.texi:23291 +#: doc/guix.texi:23288 #, no-wrap msgid "{Data Type} gitolite-rc-file" msgstr "{Datentyp} gitolite-rc-file" #. type: deftp -#: doc/guix.texi:23293 +#: doc/guix.texi:23290 msgid "Data type representing the Gitolite RC file." msgstr "Repräsentiert die Gitolie-RC-Datei." #. type: item -#: doc/guix.texi:23295 +#: doc/guix.texi:23292 #, no-wrap msgid "@code{umask} (default: @code{#o0077})" msgstr "@code{umask} (Vorgabe: @code{#o0077})" #. type: table -#: doc/guix.texi:23298 +#: doc/guix.texi:23295 msgid "This controls the permissions Gitolite sets on the repositories and their contents." msgstr "" #. type: table -#: doc/guix.texi:23302 +#: doc/guix.texi:23299 msgid "A value like @code{#o0027} will give read access to the group used by Gitolite (by default: @code{git}). This is necessary when using Gitolite with software like cgit or gitweb." msgstr "" #. type: item -#: doc/guix.texi:23303 +#: doc/guix.texi:23300 #, no-wrap msgid "@code{git-config-keys} (default: @code{\"\"})" msgstr "@code{git-config-keys} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:23306 +#: doc/guix.texi:23303 msgid "Gitolite allows you to set git config values using the \"config\" keyword. This setting allows control over the config keys to accept." msgstr "" #. type: item -#: doc/guix.texi:23307 +#: doc/guix.texi:23304 #, no-wrap msgid "@code{roles} (default: @code{'((\"READERS\" . 1) (\"WRITERS\" . ))})" msgstr "@code{roles} (Vorgabe: @code{'((\"READERS\" . 1) (\"WRITERS\" . ))})" #. type: table -#: doc/guix.texi:23309 +#: doc/guix.texi:23306 msgid "Set the role names allowed to be used by users running the perms command." msgstr "" #. type: item -#: doc/guix.texi:23310 +#: doc/guix.texi:23307 #, no-wrap msgid "@code{enable} (default: @code{'(\"help\" \"desc\" \"info\" \"perms\" \"writable\" \"ssh-authkeys\" \"git-config\" \"daemon\" \"gitweb\")})" msgstr "" #. type: table -#: doc/guix.texi:23312 +#: doc/guix.texi:23309 msgid "This setting controls the commands and features to enable within Gitolite." msgstr "" #. type: subsubheading -#: doc/guix.texi:23320 +#: doc/guix.texi:23317 #, no-wrap msgid "The Battle for Wesnoth Service" msgstr "" #. type: cindex -#: doc/guix.texi:23321 +#: doc/guix.texi:23318 #, no-wrap msgid "wesnothd" msgstr "" #. type: Plain text -#: doc/guix.texi:23325 +#: doc/guix.texi:23322 msgid "@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn based tactical strategy game, with several single player campaigns, and multiplayer games (both networked and local)." msgstr "" #. type: defvar -#: doc/guix.texi:23326 +#: doc/guix.texi:23323 #, no-wrap msgid "{Scheme Variable} wesnothd-service-type" msgstr "" #. type: defvar -#: doc/guix.texi:23330 +#: doc/guix.texi:23327 msgid "Service type for the wesnothd service. Its value must be a @code{wesnothd-configuration} object. To run wesnothd in the default configuration, instantiate it as:" msgstr "" #. type: example -#: doc/guix.texi:23333 +#: doc/guix.texi:23330 #, no-wrap msgid "(service wesnothd-service-type)\n" msgstr "" #. type: deftp -#: doc/guix.texi:23336 +#: doc/guix.texi:23333 #, no-wrap msgid "{Data Type} wesnothd-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:23338 +#: doc/guix.texi:23335 msgid "Data type representing the configuration of @command{wesnothd}." msgstr "" #. type: item -#: doc/guix.texi:23340 +#: doc/guix.texi:23337 #, no-wrap msgid "@code{package} (default: @code{wesnoth-server})" msgstr "" #. type: table -#: doc/guix.texi:23342 +#: doc/guix.texi:23339 msgid "The wesnoth server package to use." msgstr "" #. type: item -#: doc/guix.texi:23343 +#: doc/guix.texi:23340 #, no-wrap msgid "@code{port} (default: @code{15000})" msgstr "" #. type: table -#: doc/guix.texi:23345 +#: doc/guix.texi:23342 msgid "The port to bind the server to." msgstr "" #. type: cindex -#: doc/guix.texi:23351 +#: doc/guix.texi:23348 #, no-wrap msgid "fingerprint" msgstr "" #. type: subsubheading -#: doc/guix.texi:23352 +#: doc/guix.texi:23349 #, no-wrap msgid "Fingerprint Service" msgstr "Fingerabdrucklese-Dienst" #. type: Plain text -#: doc/guix.texi:23356 +#: doc/guix.texi:23353 msgid "The @code{(gnu services authentication)} module provides a DBus service to read and identify fingerprints via a fingerprint sensor." msgstr "Das Modul @code{(gnu services authentication)} stellt einen DBus-Dienst zur Verfügung, mit dem Fingerabdrücke mit Hilfe eines Fingerabdrucksensors gelesen und identifiziert werden können." #. type: defvr -#: doc/guix.texi:23357 +#: doc/guix.texi:23354 #, no-wrap msgid "{Scheme Variable} fprintd-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:23360 +#: doc/guix.texi:23357 msgid "The service type for @command{fprintd}, which provides the fingerprint reading capability." msgstr "" #. type: example -#: doc/guix.texi:23363 +#: doc/guix.texi:23360 #, no-wrap msgid "(service fprintd-service-type)\n" msgstr "" #. type: cindex -#: doc/guix.texi:23366 +#: doc/guix.texi:23363 #, no-wrap msgid "sysctl" msgstr "" #. type: subsubheading -#: doc/guix.texi:23367 +#: doc/guix.texi:23364 #, no-wrap msgid "System Control Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23371 +#: doc/guix.texi:23368 msgid "The @code{(gnu services sysctl)} provides a service to configure kernel parameters at boot." msgstr "" #. type: defvr -#: doc/guix.texi:23372 +#: doc/guix.texi:23369 #, no-wrap msgid "{Scheme Variable} sysctl-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:23376 +#: doc/guix.texi:23373 msgid "The service type for @command{sysctl}, which modifies kernel parameters under @file{/proc/sys/}. To enable IPv4 forwarding, it can be instantiated as:" msgstr "" #. type: example -#: doc/guix.texi:23381 +#: doc/guix.texi:23378 #, no-wrap msgid "" "(service sysctl-service-type\n" @@ -43026,442 +43080,442 @@ msgid "" msgstr "" #. type: deftp -#: doc/guix.texi:23384 +#: doc/guix.texi:23381 #, no-wrap msgid "{Data Type} sysctl-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:23386 +#: doc/guix.texi:23383 msgid "The data type representing the configuration of @command{sysctl}." msgstr "" #. type: item -#: doc/guix.texi:23388 +#: doc/guix.texi:23385 #, no-wrap msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})" msgstr "" #. type: table -#: doc/guix.texi:23390 +#: doc/guix.texi:23387 msgid "The @command{sysctl} executable to use." msgstr "" #. type: item -#: doc/guix.texi:23391 +#: doc/guix.texi:23388 #, no-wrap msgid "@code{settings} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:23393 +#: doc/guix.texi:23390 msgid "An association list specifies kernel parameters and their values." msgstr "" #. type: cindex -#: doc/guix.texi:23396 +#: doc/guix.texi:23393 #, no-wrap msgid "pcscd" msgstr "" #. type: subsubheading -#: doc/guix.texi:23397 +#: doc/guix.texi:23394 #, no-wrap msgid "PC/SC Smart Card Daemon Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23404 +#: doc/guix.texi:23401 msgid "The @code{(gnu services security-token)} module provides the following service to run @command{pcscd}, the PC/SC Smart Card Daemon. @command{pcscd} is the daemon program for pcsc-lite and the MuscleCard framework. It is a resource manager that coordinates communications with smart card readers, smart cards and cryptographic tokens that are connected to the system." msgstr "" #. type: defvr -#: doc/guix.texi:23405 +#: doc/guix.texi:23402 #, no-wrap msgid "{Scheme Variable} pcscd-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:23409 +#: doc/guix.texi:23406 msgid "Service type for the @command{pcscd} service. Its value must be a @code{pcscd-configuration} object. To run pcscd in the default configuration, instantiate it as:" msgstr "" #. type: example -#: doc/guix.texi:23412 +#: doc/guix.texi:23409 #, no-wrap msgid "(service pcscd-service-type)\n" msgstr "" #. type: deftp -#: doc/guix.texi:23415 +#: doc/guix.texi:23412 #, no-wrap msgid "{Data Type} pcscd-configuration" msgstr "{Datentyp} pcscd-configuration" #. type: deftp -#: doc/guix.texi:23417 +#: doc/guix.texi:23414 msgid "The data type representing the configuration of @command{pcscd}." msgstr "Repräsentiert die Konfiguration von @command{pcscd}." #. type: item -#: doc/guix.texi:23419 +#: doc/guix.texi:23416 #, no-wrap msgid "@code{pcsc-lite} (default: @code{pcsc-lite})" msgstr "@code{pcsc-lite} (Vorgabe: @code{pcsc-lite})" #. type: table -#: doc/guix.texi:23421 +#: doc/guix.texi:23418 msgid "The pcsc-lite package that provides pcscd." msgstr "" #. type: item -#: doc/guix.texi:23421 +#: doc/guix.texi:23418 #, no-wrap msgid "@code{usb-drivers} (default: @code{(list ccid)})" msgstr "@code{usb-drivers} (Vorgabe: @code{(list ccid)})" #. type: table -#: doc/guix.texi:23424 +#: doc/guix.texi:23421 msgid "List of packages that provide USB drivers to pcscd. Drivers are expected to be under @file{pcsc/drivers} in the store directory of the package." msgstr "" #. type: cindex -#: doc/guix.texi:23427 +#: doc/guix.texi:23424 #, no-wrap msgid "lirc" msgstr "" #. type: subsubheading -#: doc/guix.texi:23428 +#: doc/guix.texi:23425 #, no-wrap msgid "Lirc Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23431 +#: doc/guix.texi:23428 msgid "The @code{(gnu services lirc)} module provides the following service." msgstr "" #. type: deffn -#: doc/guix.texi:23432 +#: doc/guix.texi:23429 #, no-wrap msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @" msgstr "" #. type: deffn -#: doc/guix.texi:23437 +#: doc/guix.texi:23434 msgid "[#:device #f] [#:driver #f] [#:config-file #f] @ [#:extra-options '()] Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that decodes infrared signals from remote controls." msgstr "" #. type: deffn -#: doc/guix.texi:23441 +#: doc/guix.texi:23438 msgid "Optionally, @var{device}, @var{driver} and @var{config-file} (configuration file name) may be specified. See @command{lircd} manual for details." msgstr "" #. type: deffn -#: doc/guix.texi:23444 +#: doc/guix.texi:23441 msgid "Finally, @var{extra-options} is a list of additional command-line options passed to @command{lircd}." msgstr "" #. type: cindex -#: doc/guix.texi:23446 +#: doc/guix.texi:23443 #, no-wrap msgid "spice" msgstr "" #. type: subsubheading -#: doc/guix.texi:23447 +#: doc/guix.texi:23444 #, no-wrap msgid "Spice Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23450 +#: doc/guix.texi:23447 msgid "The @code{(gnu services spice)} module provides the following service." msgstr "" #. type: deffn -#: doc/guix.texi:23451 +#: doc/guix.texi:23448 #, no-wrap msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]" msgstr "" #. type: deffn -#: doc/guix.texi:23455 +#: doc/guix.texi:23452 msgid "Returns a service that runs @url{https://www.spice-space.org,VDAGENT}, a daemon that enables sharing the clipboard with a vm and setting the guest display resolution when the graphical console window resizes." msgstr "" #. type: cindex -#: doc/guix.texi:23457 +#: doc/guix.texi:23454 #, no-wrap msgid "inputattach" msgstr "inputattach" #. type: subsubheading -#: doc/guix.texi:23458 +#: doc/guix.texi:23455 #, no-wrap msgid "inputattach Service" msgstr "inputattach-Dienst" #. type: cindex -#: doc/guix.texi:23460 +#: doc/guix.texi:23457 #, no-wrap msgid "tablet input, for Xorg" msgstr "Tablett-Eingaben, für Xorg" #. type: cindex -#: doc/guix.texi:23461 +#: doc/guix.texi:23458 #, no-wrap msgid "touchscreen input, for Xorg" msgstr "Tastbildschirm-Eingaben, für Xorg" #. type: Plain text -#: doc/guix.texi:23465 +#: doc/guix.texi:23462 msgid "The @uref{https://linuxwacom.github.io/, inputattach} service allows you to use input devices such as Wacom tablets, touchscreens, or joysticks with the Xorg display server." msgstr "Der @uref{https://linuxwacom.github.io/, inputattach-Dienst} macht es Ihnen möglich, Eingabegeräte wie Wacom-Tabletts, Tastbildschirme („Touchscreens“) oder Joysticks mit dem Xorg-Anzeigeserver zu benutzen." #. type: deffn -#: doc/guix.texi:23466 +#: doc/guix.texi:23463 #, no-wrap msgid "{Scheme Variable} inputattach-service-type" msgstr "{Scheme-Variable} inputattach-service-type" #. type: deffn -#: doc/guix.texi:23469 +#: doc/guix.texi:23466 msgid "Type of a service that runs @command{inputattach} on a device and dispatches events from it." msgstr "" #. type: deftp -#: doc/guix.texi:23471 +#: doc/guix.texi:23468 #, no-wrap msgid "{Data Type} inputattach-configuration" msgstr "{Datentyp} inputattach-configuration" #. type: item -#: doc/guix.texi:23473 +#: doc/guix.texi:23470 #, no-wrap msgid "@code{device-type} (default: @code{\"wacom\"})" msgstr "@code{device-type} (Vorgabe: @code{\"wacom\"})" #. type: table -#: doc/guix.texi:23476 +#: doc/guix.texi:23473 msgid "The type of device to connect to. Run @command{inputattach --help}, from the @code{inputattach} package, to see the list of supported device types." msgstr "" #. type: item -#: doc/guix.texi:23477 +#: doc/guix.texi:23474 #, no-wrap msgid "@code{device} (default: @code{\"/dev/ttyS0\"})" msgstr "@code{device} (Vorgabe: @code{\"/dev/ttyS0\"})" #. type: table -#: doc/guix.texi:23479 +#: doc/guix.texi:23476 msgid "The device file to connect to the device." msgstr "" #. type: item -#: doc/guix.texi:23480 +#: doc/guix.texi:23477 #, no-wrap msgid "@code{log-file} (default: @code{#f})" msgstr "@code{log-file} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:23482 +#: doc/guix.texi:23479 msgid "If true, this must be the name of a file to log messages to." msgstr "" #. type: subsection -#: doc/guix.texi:23485 +#: doc/guix.texi:23482 #, no-wrap msgid "Dictionary Services" msgstr "" #. type: cindex -#: doc/guix.texi:23486 +#: doc/guix.texi:23483 #, no-wrap msgid "dictionary" msgstr "" #. type: Plain text -#: doc/guix.texi:23488 +#: doc/guix.texi:23485 msgid "The @code{(gnu services dict)} module provides the following service:" msgstr "" #. type: deffn -#: doc/guix.texi:23489 +#: doc/guix.texi:23486 #, no-wrap msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]" msgstr "" #. type: deffn -#: doc/guix.texi:23492 +#: doc/guix.texi:23489 msgid "Return a service that runs the @command{dicod} daemon, an implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})." msgstr "" #. type: deffn -#: doc/guix.texi:23496 +#: doc/guix.texi:23493 msgid "The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{} object, by default it serves the GNU Collaborative International Dictonary of English." msgstr "" #. type: deffn -#: doc/guix.texi:23500 +#: doc/guix.texi:23497 msgid "You can add @command{open localhost} to your @file{~/.dico} file to make @code{localhost} the default server for @command{dico} client (@pxref{Initialization File,,, dico, GNU Dico Manual})." msgstr "" #. type: deftp -#: doc/guix.texi:23502 +#: doc/guix.texi:23499 #, no-wrap msgid "{Data Type} dicod-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:23504 +#: doc/guix.texi:23501 msgid "Data type representing the configuration of dicod." msgstr "" #. type: item -#: doc/guix.texi:23506 +#: doc/guix.texi:23503 #, no-wrap msgid "@code{dico} (default: @var{dico})" msgstr "" #. type: table -#: doc/guix.texi:23508 +#: doc/guix.texi:23505 msgid "Package object of the GNU Dico dictionary server." msgstr "" #. type: item -#: doc/guix.texi:23509 +#: doc/guix.texi:23506 #, no-wrap msgid "@code{interfaces} (default: @var{'(\"localhost\")})" msgstr "" #. type: table -#: doc/guix.texi:23513 +#: doc/guix.texi:23510 msgid "This is the list of IP addresses and ports and possibly socket file names to listen to (@pxref{Server Settings, @code{listen} directive,, dico, GNU Dico Manual})." msgstr "" #. type: item -#: doc/guix.texi:23514 +#: doc/guix.texi:23511 #, no-wrap msgid "@code{handlers} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:23516 +#: doc/guix.texi:23513 msgid "List of @code{} objects denoting handlers (module instances)." msgstr "" #. type: item -#: doc/guix.texi:23517 +#: doc/guix.texi:23514 #, no-wrap msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})" msgstr "" #. type: table -#: doc/guix.texi:23519 +#: doc/guix.texi:23516 msgid "List of @code{} objects denoting dictionaries to be served." msgstr "" #. type: deftp -#: doc/guix.texi:23522 +#: doc/guix.texi:23519 #, no-wrap msgid "{Data Type} dicod-handler" msgstr "" #. type: deftp -#: doc/guix.texi:23524 +#: doc/guix.texi:23521 msgid "Data type representing a dictionary handler (module instance)." msgstr "" #. type: table -#: doc/guix.texi:23528 +#: doc/guix.texi:23525 msgid "Name of the handler (module instance)." msgstr "" #. type: item -#: doc/guix.texi:23529 +#: doc/guix.texi:23526 #, no-wrap msgid "@code{module} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:23533 +#: doc/guix.texi:23530 msgid "Name of the dicod module of the handler (instance). If it is @code{#f}, the module has the same name as the handler. (@pxref{Modules,,, dico, GNU Dico Manual})." msgstr "" #. type: code{#1} -#: doc/guix.texi:23534 doc/guix.texi:23554 +#: doc/guix.texi:23531 doc/guix.texi:23551 #, no-wrap msgid "options" msgstr "" #. type: table -#: doc/guix.texi:23536 +#: doc/guix.texi:23533 msgid "List of strings or gexps representing the arguments for the module handler" msgstr "" #. type: deftp -#: doc/guix.texi:23539 +#: doc/guix.texi:23536 #, no-wrap msgid "{Data Type} dicod-database" msgstr "" #. type: deftp -#: doc/guix.texi:23541 +#: doc/guix.texi:23538 msgid "Data type representing a dictionary database." msgstr "" #. type: table -#: doc/guix.texi:23545 +#: doc/guix.texi:23542 msgid "Name of the database, will be used in DICT commands." msgstr "" #. type: code{#1} -#: doc/guix.texi:23546 +#: doc/guix.texi:23543 #, no-wrap msgid "handler" msgstr "" #. type: table -#: doc/guix.texi:23549 +#: doc/guix.texi:23546 msgid "Name of the dicod handler (module instance) used by this database (@pxref{Handlers,,, dico, GNU Dico Manual})." msgstr "" #. type: item -#: doc/guix.texi:23550 +#: doc/guix.texi:23547 #, no-wrap msgid "@code{complex?} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:23553 +#: doc/guix.texi:23550 msgid "Whether the database configuration complex. The complex configuration will need a corresponding @code{} object, otherwise not." msgstr "" #. type: table -#: doc/guix.texi:23557 +#: doc/guix.texi:23554 msgid "List of strings or gexps representing the arguments for the database (@pxref{Databases,,, dico, GNU Dico Manual})." msgstr "" #. type: defvr -#: doc/guix.texi:23560 +#: doc/guix.texi:23557 #, no-wrap msgid "{Scheme Variable} %dicod-database:gcide" msgstr "" #. type: defvr -#: doc/guix.texi:23563 +#: doc/guix.texi:23560 msgid "A @code{} object serving the GNU Collaborative International Dictionary of English using the @code{gcide} package." msgstr "" #. type: Plain text -#: doc/guix.texi:23566 +#: doc/guix.texi:23563 msgid "The following is an example @code{dicod-service} configuration." msgstr "" #. type: example -#: doc/guix.texi:23581 +#: doc/guix.texi:23578 #, no-wrap msgid "" "(dicod-service #:config\n" @@ -43480,169 +43534,169 @@ msgid "" msgstr "" #. type: cindex -#: doc/guix.texi:23583 +#: doc/guix.texi:23580 #, no-wrap msgid "Docker" msgstr "Docker" #. type: subsubheading -#: doc/guix.texi:23584 +#: doc/guix.texi:23581 #, no-wrap msgid "Docker Service" msgstr "Docker-Dienst" #. type: Plain text -#: doc/guix.texi:23587 +#: doc/guix.texi:23584 msgid "The @code{(gnu services docker)} module provides the following service." msgstr "Das Modul @code{(gnu services docker)} stellt den folgenden Dienst zur Verfügung." #. type: defvr -#: doc/guix.texi:23588 +#: doc/guix.texi:23585 #, no-wrap msgid "{Scheme Variable} docker-service-type" msgstr "{Scheme-Variable} docker-service-type" #. type: defvr -#: doc/guix.texi:23593 +#: doc/guix.texi:23590 msgid "This is the type of the service that runs @url{https://www.docker.com,Docker}, a daemon that can execute application bundles (sometimes referred to as ``containers'') in isolated environments." msgstr "" #. type: deftp -#: doc/guix.texi:23596 +#: doc/guix.texi:23593 #, no-wrap msgid "{Data Type} docker-configuration" msgstr "{Datentyp} docker-configuration" #. type: deftp -#: doc/guix.texi:23598 +#: doc/guix.texi:23595 msgid "This is the data type representing the configuration of Docker and Containerd." msgstr "Dies ist der Datentyp, der die Konfiguration von Docker und Containerd repräsentiert." #. type: item -#: doc/guix.texi:23601 +#: doc/guix.texi:23598 #, no-wrap msgid "@code{package} (default: @code{docker})" msgstr "@code{package} (Vorgabe: @code{docker})" #. type: table -#: doc/guix.texi:23603 +#: doc/guix.texi:23600 msgid "The Docker package to use." msgstr "Das Docker-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:23604 +#: doc/guix.texi:23601 #, no-wrap msgid "@code{containerd} (default: @var{containerd})" msgstr "@code{containerd} (Vorgabe: @var{containerd})" #. type: table -#: doc/guix.texi:23606 +#: doc/guix.texi:23603 msgid "The Containerd package to use." msgstr "Das Containerd-Paket, was benutzt werden soll." #. type: cindex -#: doc/guix.texi:23613 +#: doc/guix.texi:23610 #, no-wrap msgid "setuid programs" msgstr "setuid-Programme" #. type: Plain text -#: doc/guix.texi:23623 +#: doc/guix.texi:23620 msgid "Some programs need to run with ``root'' privileges, even when they are launched by unprivileged users. A notorious example is the @command{passwd} program, which users can run to change their password, and which needs to access the @file{/etc/passwd} and @file{/etc/shadow} files---something normally restricted to root, for obvious security reasons. To address that, these executables are @dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, for more info about the setuid mechanism.)" msgstr "Manche Programme müssen mit Administratorrechten (also den Berechtigungen des „root“-Benutzers) ausgeführt werden, selbst wenn Nutzer ohne besondere Berechtigungen sie starten. Ein bekanntes Beispiel ist das Programm @command{passwd}, womit Nutzer ihr Passwort ändern können, wozu das Programm auf die Dateien @file{/etc/passwd} und @file{/etc/shadow} zugreifen muss — was normalerweise nur der „root“-Nutzer darf, aus offensichtlichen Gründen der Informationssicherheit. Deswegen sind diese ausführbaren Programmdateien @dfn{setuid-root}, d.h.@: sie laufen immer mit den Administratorrechten des root-Nutzers, egal wer sie startet (siehe @ref{How Change Persona,,, libc, The GNU C Library Reference Manual} für mehr Informationen über den setuid-Mechanismus)." #. type: Plain text -#: doc/guix.texi:23630 +#: doc/guix.texi:23627 msgid "The store itself @emph{cannot} contain setuid programs: that would be a security issue since any user on the system can write derivations that populate the store (@pxref{The Store}). Thus, a different mechanism is used: instead of changing the setuid bit directly on files that are in the store, we let the system administrator @emph{declare} which programs should be setuid root." msgstr "Der Store selbst kann @emph{keine} setuid-Programme enthalten: Das wäre eine Sicherheitslücke, weil dann jeder Nutzer auf dem System Ableitungen schreiben könnte, die in den Store solche Dateien einfügen würden (siehe @ref{The Store}). Wir benutzen also einen anderen Mechanismus: Statt auf den ausführbaren Dateien im Store selbst deren setuid-Bit zu setzen, lassen wir den Systemadministrator @emph{deklarieren}, welche Programme mit setuid-root gestartet werden." #. type: Plain text -#: doc/guix.texi:23636 +#: doc/guix.texi:23633 msgid "The @code{setuid-programs} field of an @code{operating-system} declaration contains a list of G-expressions denoting the names of programs to be setuid-root (@pxref{Using the Configuration System}). For instance, the @command{passwd} program, which is part of the Shadow package, can be designated by this G-expression (@pxref{G-Expressions}):" msgstr "Das Feld @code{setuid-programs} einer @code{operating-system}-Deklaration enthält eine Liste von G-Ausdrücken, die die Namen der Programme angeben, die setuid-root sein sollen (siehe @ref{Using the Configuration System}). Zum Beispiel kann das Programm @command{passwd}, was Teil des Shadow-Pakets ist, durch diesen G-Ausdruck bezeichnet werden (siehe @ref{G-Expressions}):" #. type: example -#: doc/guix.texi:23639 +#: doc/guix.texi:23636 #, no-wrap msgid "#~(string-append #$shadow \"/bin/passwd\")\n" msgstr "#~(string-append #$shadow \"/bin/passwd\")\n" #. type: Plain text -#: doc/guix.texi:23643 +#: doc/guix.texi:23640 msgid "A default set of setuid programs is defined by the @code{%setuid-programs} variable of the @code{(gnu system)} module." msgstr "Eine vorgegebene Menge von setuid-Programmen wird durch die Variable @code{%setuid-programs} aus dem Modul @code{(gnu system)} definiert." #. type: defvr -#: doc/guix.texi:23644 +#: doc/guix.texi:23641 #, no-wrap msgid "{Scheme Variable} %setuid-programs" msgstr "{Scheme-Variable} %setuid-programs" #. type: defvr -#: doc/guix.texi:23646 +#: doc/guix.texi:23643 msgid "A list of G-expressions denoting common programs that are setuid-root." msgstr "Eine Liste von G-Ausdrücken, die übliche Programme angeben, die setuid-root sein müssen." #. type: defvr -#: doc/guix.texi:23649 +#: doc/guix.texi:23646 msgid "The list includes commands such as @command{passwd}, @command{ping}, @command{su}, and @command{sudo}." msgstr "Die Liste enthält Befehle wie @command{passwd}, @command{ping}, @command{su} und @command{sudo}." #. type: Plain text -#: doc/guix.texi:23655 +#: doc/guix.texi:23652 msgid "Under the hood, the actual setuid programs are created in the @file{/run/setuid-programs} directory at system activation time. The files in this directory refer to the ``real'' binaries, which are in the store." msgstr "Intern erzeugt Guix die eigentlichen setuid-Programme im Verzeichnis @file{/run/setuid-programs}, wenn das System aktiviert wird. Die Dateien in diesem Verzeichnis verweisen auf die „echten“ Binärdateien im Store." #. type: cindex -#: doc/guix.texi:23659 +#: doc/guix.texi:23656 #, no-wrap msgid "HTTPS, certificates" msgstr "HTTPS, Zertifikate" #. type: cindex -#: doc/guix.texi:23660 +#: doc/guix.texi:23657 #, no-wrap msgid "X.509 certificates" msgstr "X.509-Zertifikate" #. type: cindex -#: doc/guix.texi:23661 +#: doc/guix.texi:23658 #, no-wrap msgid "TLS" msgstr "TLS" #. type: Plain text -#: doc/guix.texi:23668 +#: doc/guix.texi:23665 msgid "Web servers available over HTTPS (that is, HTTP over the transport-layer security mechanism, TLS) send client programs an @dfn{X.509 certificate} that the client can then use to @emph{authenticate} the server. To do that, clients verify that the server's certificate is signed by a so-called @dfn{certificate authority} (CA). But to verify the CA's signature, clients must have first acquired the CA's certificate." msgstr "Über HTTPS verfügbare Webserver (also HTTP mit gesicherter Transportschicht, englisch „Transport-Layer Security“, kurz TLS) senden Client-Programmen ein @dfn{X.509-Zertifikat}, mit dem der Client den Server dann @emph{authentifizieren} kann. Dazu verifiziert der Client, dass das Zertifikat des Servers von einer sogenannten Zertifizierungsstelle signiert wurde (@dfn{Certificate Authority}, kurz CA). Damit er aber die Signatur der Zertifizierungsstelle verifizieren kann, muss jeder Client das Zertifikat der Zertifizierungsstelle besitzen." #. type: Plain text -#: doc/guix.texi:23672 +#: doc/guix.texi:23669 msgid "Web browsers such as GNU@tie{}IceCat include their own set of CA certificates, such that they are able to verify CA signatures out-of-the-box." msgstr "Web-Browser wie GNU@tie{}IceCat liefern ihre eigenen CA-Zertifikate mit, damit sie von Haus aus Zertifikate verifizieren können." #. type: Plain text -#: doc/guix.texi:23676 +#: doc/guix.texi:23673 msgid "However, most other programs that can talk HTTPS---@command{wget}, @command{git}, @command{w3m}, etc.---need to be told where CA certificates can be found." msgstr "Den meisten anderen Programmen, die HTTPS sprechen können — @command{wget}, @command{git}, @command{w3m} etc.@: — muss allerdings erst mitgeteilt werden, wo die CA-Zertifikate installiert sind." #. type: Plain text -#: doc/guix.texi:23683 +#: doc/guix.texi:23680 msgid "In Guix, this is done by adding a package that provides certificates to the @code{packages} field of the @code{operating-system} declaration (@pxref{operating-system Reference}). Guix includes one such package, @code{nss-certs}, which is a set of CA certificates provided as part of Mozilla's Network Security Services." msgstr "In Guix müssen Sie dazu ein Paket, das Zertifikate enthält, in das @code{packages}-Feld der @code{operating-system}-Deklaration des Betriebssystems hinzufügen (siehe @ref{operating-system Reference}). Guix liefert ein solches Paket mit, @code{nss-certs}, was als Teil von Mozillas „Network Security Services“ angeboten wird." #. type: Plain text -#: doc/guix.texi:23688 +#: doc/guix.texi:23685 msgid "Note that it is @emph{not} part of @var{%base-packages}, so you need to explicitly add it. The @file{/etc/ssl/certs} directory, which is where most applications and libraries look for certificates by default, points to the certificates installed globally." msgstr "Beachten Sie, dass es @emph{nicht} zu den @var{%base-packages} gehört, Sie es also ausdrücklich hinzufügen müssen. Das Verzeichnis @file{/etc/ssl/certs}, wo die meisten Anwendungen und Bibliotheken ihren Voreinstellungen entsprechend nach Zertifikaten suchen, verweist auf die global installierten Zertifikate." #. type: Plain text -#: doc/guix.texi:23698 +#: doc/guix.texi:23695 msgid "Unprivileged users, including users of Guix on a foreign distro, can also install their own certificate package in their profile. A number of environment variables need to be defined so that applications and libraries know where to find them. Namely, the OpenSSL library honors the @code{SSL_CERT_DIR} and @code{SSL_CERT_FILE} variables. Some applications add their own environment variables; for instance, the Git version control system honors the certificate bundle pointed to by the @code{GIT_SSL_CAINFO} environment variable. Thus, you would typically run something like:" msgstr "Unprivilegierte Benutzer, wie die, die Guix auf einer Fremddistribution benutzen, können sich auch lokal ihre eigenen Pakete mit Zertifikaten in ihr Profil installieren. Eine Reihe von Umgebungsvariablen muss dazu definiert werden, damit Anwendungen und Bibliotheken wissen, wo diese Zertifikate zu finden sind. Und zwar folgt die OpenSSL-Bibliothek den Umgebungsvariablen @code{SSL_CERT_DIR} und @code{SSL_CERT_FILE}, manche Anwendungen benutzen stattdessen aber ihre eigenen Umgebungsvariablen. Das Versionskontrollsystem Git liest den Ort zum Beispiel aus der Umgebungsvariablen @code{GIT_SSL_CAINFO} aus. Sie würden typischerweise also so etwas ausführen:" #. type: example -#: doc/guix.texi:23704 +#: doc/guix.texi:23701 #, no-wrap msgid "" "$ guix install nss-certs\n" @@ -43656,12 +43710,12 @@ msgstr "" "$ export GIT_SSL_CAINFO=\"$SSL_CERT_FILE\"\n" #. type: Plain text -#: doc/guix.texi:23709 +#: doc/guix.texi:23706 msgid "As another example, R requires the @code{CURL_CA_BUNDLE} environment variable to point to a certificate bundle, so you would have to run something like this:" msgstr "Ein weiteres Beispiel ist R, was voraussetzt, dass die Umgebungsvariable @code{CURL_CA_BUNDLE} auf ein Zertifikatsbündel verweist, weshalb Sie etwas wie hier ausführen müssten:" #. type: example -#: doc/guix.texi:23713 +#: doc/guix.texi:23710 #, no-wrap msgid "" "$ guix install nss-certs\n" @@ -43671,51 +43725,51 @@ msgstr "" "$ export CURL_CA_BUNDLE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n" #. type: Plain text -#: doc/guix.texi:23717 +#: doc/guix.texi:23714 msgid "For other applications you may want to look up the required environment variable in the relevant documentation." msgstr "Für andere Anwendungen möchten Sie die Namen der benötigten Umgebungsvariablen vielleicht in deren Dokumentation nachschlagen." #. type: cindex -#: doc/guix.texi:23722 +#: doc/guix.texi:23719 #, no-wrap msgid "name service switch" msgstr "Name Service Switch" #. type: cindex -#: doc/guix.texi:23723 +#: doc/guix.texi:23720 #, no-wrap msgid "NSS" msgstr "NSS" #. type: Plain text -#: doc/guix.texi:23732 +#: doc/guix.texi:23729 msgid "The @code{(gnu system nss)} module provides bindings to the configuration file of the libc @dfn{name service switch} or @dfn{NSS} (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). In a nutshell, the NSS is a mechanism that allows libc to be extended with new ``name'' lookup methods for system databases, which includes host names, service names, user accounts, and more (@pxref{Name Service Switch, System Databases and Name Service Switch,, libc, The GNU C Library Reference Manual})." msgstr "Das Modul @code{(gnu system nss)} enthält Anbindungen für die Konfiguration des @dfn{Name Service Switch} (NSS) der libc (siehe @ref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). Kurz gesagt ist der NSS ein Mechanismus, mit dem die libc um neue „Namens“-Auflösungsmethoden für Systemdatenbanken erweitert werden kann; dazu gehören Rechnernamen (auch bekannt als „Host“-Namen), Dienstnamen, Benutzerkonten und mehr (siehe @ref{Name Service Switch, System Databases and Name Service Switch,, libc, The GNU C Library Reference Manual})." #. type: Plain text -#: doc/guix.texi:23739 +#: doc/guix.texi:23736 msgid "The NSS configuration specifies, for each system database, which lookup method is to be used, and how the various methods are chained together---for instance, under which circumstances NSS should try the next method in the list. The NSS configuration is given in the @code{name-service-switch} field of @code{operating-system} declarations (@pxref{operating-system Reference, @code{name-service-switch}})." msgstr "Die NSS-Konfiguration legt für jede Systemdatenbank fest, mit welcher Methode der Name nachgeschlagen („aufgelöst“) werden kann und welche Methoden zusammenhängen — z.B.@: unter welchen Umständen der NSS es mit der nächsten Methode auf seiner Liste versuchen sollte. Die NSS-Konfiguration wird im Feld @code{name-service-switch} von @code{operating-system}-Deklarationen angegeben (siehe @ref{operating-system Reference, @code{name-service-switch}})." #. type: cindex -#: doc/guix.texi:23740 +#: doc/guix.texi:23737 #, no-wrap msgid "nss-mdns" msgstr "nss-mdns" #. type: cindex -#: doc/guix.texi:23741 +#: doc/guix.texi:23738 #, no-wrap msgid ".local, host name lookup" msgstr ".local, Rechnernamensauflösung" #. type: Plain text -#: doc/guix.texi:23746 +#: doc/guix.texi:23743 msgid "As an example, the declaration below configures the NSS to use the @uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-end}, which supports host name lookups over multicast DNS (mDNS) for host names ending in @code{.local}:" msgstr "Zum Beispiel konfigurieren die folgenden Deklarationen den NSS so, dass er das @uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns}-Backend} benutzt, wodurch er auf @code{.local} endende Rechnernamen über Multicast-DNS (mDNS) auflöst:" #. type: example -#: doc/guix.texi:23750 +#: doc/guix.texi:23747 #, no-wrap msgid "" "(name-service-switch\n" @@ -43727,7 +43781,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23755 +#: doc/guix.texi:23752 #, no-wrap msgid "" " ;; If the above did not succeed, try\n" @@ -43743,7 +43797,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23761 +#: doc/guix.texi:23758 #, no-wrap msgid "" " ;; 'mdns_minimal' is authoritative for\n" @@ -43763,7 +43817,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23765 +#: doc/guix.texi:23762 #, no-wrap msgid "" " ;; Then fall back to DNS.\n" @@ -43777,7 +43831,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23769 +#: doc/guix.texi:23766 #, no-wrap msgid "" " ;; Finally, try with the \"full\" 'mdns'.\n" @@ -43790,157 +43844,157 @@ msgstr "" " (name \"mdns\")))))\n" #. type: Plain text -#: doc/guix.texi:23774 +#: doc/guix.texi:23771 msgid "Do not worry: the @code{%mdns-host-lookup-nss} variable (see below) contains this configuration, so you will not have to type it if all you want is to have @code{.local} host lookup working." msgstr "Keine Sorge: Die Variable @code{%mdns-host-lookup-nss} (siehe unten) enthält diese Konfiguration bereits. Statt das alles selst einzutippen, können Sie sie benutzen, wenn alles, was Sie möchten, eine funktionierende Namensauflösung für @code{.local}-Rechner ist." #. type: Plain text -#: doc/guix.texi:23782 +#: doc/guix.texi:23779 msgid "Note that, in this case, in addition to setting the @code{name-service-switch} of the @code{operating-system} declaration, you also need to use @code{avahi-service-type} (@pxref{Networking Services, @code{avahi-service-type}}), or @var{%desktop-services}, which includes it (@pxref{Desktop Services}). Doing this makes @code{nss-mdns} accessible to the name service cache daemon (@pxref{Base Services, @code{nscd-service}})." msgstr "Beachten Sie dabei, dass es zusätzlich zum Festlegen des @code{name-service-switch} in der @code{operating-system}-Deklaration auch erforderlich ist, den @code{avahi-service-type} zu benutzen (siehe @ref{Networking Services, @code{avahi-service-type}}). Es genügt auch, wenn Sie die @var{%desktop-services} benutzen, weil er darin enthalten ist (siehe @ref{Desktop Services}). Dadurch wird @code{nss-mdns} für den Name Service Cache Daemon nutzbar (siehe @ref{Base Services, @code{nscd-service}})." #. type: Plain text -#: doc/guix.texi:23785 +#: doc/guix.texi:23782 msgid "For convenience, the following variables provide typical NSS configurations." msgstr "Um sich eine lange Konfiguration zu ersparen, können Sie auch einfach die folgenden Variablen für typische NSS-Konfigurationen benutzen." #. type: defvr -#: doc/guix.texi:23786 +#: doc/guix.texi:23783 #, no-wrap msgid "{Scheme Variable} %default-nss" msgstr "{Scheme-Variable} %default-nss" #. type: defvr -#: doc/guix.texi:23789 +#: doc/guix.texi:23786 msgid "This is the default name service switch configuration, a @code{name-service-switch} object." msgstr "Die vorgegebene Konfiguration des Name Service Switch als ein @code{name-service-switch}-Objekt." #. type: defvr -#: doc/guix.texi:23791 +#: doc/guix.texi:23788 #, no-wrap msgid "{Scheme Variable} %mdns-host-lookup-nss" msgstr "{Scheme-Variable} %mdns-host-lookup-nss" #. type: defvr -#: doc/guix.texi:23794 +#: doc/guix.texi:23791 msgid "This is the name service switch configuration with support for host name lookup over multicast DNS (mDNS) for host names ending in @code{.local}." msgstr "Die Name-Service-Switch-Konfiguration mit Unterstützung für Rechnernamensauflösung über „Multicast DNS“ (mDNS) für auf @code{.local} endende Rechnernamen." #. type: Plain text -#: doc/guix.texi:23804 +#: doc/guix.texi:23801 msgid "The reference for name service switch configuration is given below. It is a direct mapping of the configuration file format of the C library , so please refer to the C library manual for more information (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). Compared to the configuration file format of libc NSS, it has the advantage not only of adding this warm parenthetic feel that we like, but also static checks: you will know about syntax errors and typos as soon as you run @command{guix system}." msgstr "Im Folgenden finden Sie eine Referenz, wie eine Name-Service-Switch-Konfiguration aussehen muss. Sie hat eine direkte Entsprechung zum Konfigurationsdateiformat der C-Bibliothek, lesen Sie weitere Informationen also bitte im Handbuch der C-Bibliothek nach (siehe @ref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). Gegenüber dem Konfigurationsdateiformat des libc-NSS bekommen Sie mit unserer Syntax nicht nur ein warm umklammerndes Gefühl, sondern auch eine statische Analyse: Wenn Sie Syntax- und Schreibfehler machen, werden Sie darüber benachrichtigt, sobald Sie @command{guix system} aufrufen." #. type: deftp -#: doc/guix.texi:23805 +#: doc/guix.texi:23802 #, no-wrap msgid "{Data Type} name-service-switch" msgstr "{Datentyp} name-service-switch" #. type: deftp -#: doc/guix.texi:23810 +#: doc/guix.texi:23807 msgid "This is the data type representation the configuration of libc's name service switch (NSS). Each field below represents one of the supported system databases." msgstr "Der Datentyp, der die Konfiguration des Name Service Switch (NSS) der libc repräsentiert. Jedes im Folgenden aufgeführte Feld repräsentiert eine der unterstützten Systemdatenbanken." #. type: item -#: doc/guix.texi:23812 +#: doc/guix.texi:23809 #, no-wrap msgid "aliases" msgstr "aliases" #. type: itemx -#: doc/guix.texi:23813 +#: doc/guix.texi:23810 #, no-wrap msgid "ethers" msgstr "ethers" #. type: itemx -#: doc/guix.texi:23815 +#: doc/guix.texi:23812 #, no-wrap msgid "gshadow" msgstr "gshadow" #. type: itemx -#: doc/guix.texi:23816 +#: doc/guix.texi:23813 #, no-wrap msgid "hosts" msgstr "hosts" #. type: itemx -#: doc/guix.texi:23817 +#: doc/guix.texi:23814 #, no-wrap msgid "initgroups" msgstr "initgroups" #. type: itemx -#: doc/guix.texi:23818 +#: doc/guix.texi:23815 #, no-wrap msgid "netgroup" msgstr "netgroup" #. type: itemx -#: doc/guix.texi:23819 +#: doc/guix.texi:23816 #, no-wrap msgid "networks" msgstr "networks" #. type: itemx -#: doc/guix.texi:23821 +#: doc/guix.texi:23818 #, no-wrap msgid "public-key" msgstr "public-key" #. type: itemx -#: doc/guix.texi:23822 +#: doc/guix.texi:23819 #, no-wrap msgid "rpc" msgstr "rpc" #. type: itemx -#: doc/guix.texi:23824 +#: doc/guix.texi:23821 #, no-wrap msgid "shadow" msgstr "shadow" #. type: table -#: doc/guix.texi:23827 +#: doc/guix.texi:23824 msgid "The system databases handled by the NSS. Each of these fields must be a list of @code{} objects (see below)." msgstr "Das sind die Systemdatenbanken, um die sich NSS kümmern kann. Jedes dieser Felder muss eine Liste aus @code{}-Objekten sein (siehe unten)." #. type: deftp -#: doc/guix.texi:23830 +#: doc/guix.texi:23827 #, no-wrap msgid "{Data Type} name-service" msgstr "{Datentyp} name-service" #. type: deftp -#: doc/guix.texi:23834 +#: doc/guix.texi:23831 msgid "This is the data type representing an actual name service and the associated lookup action." msgstr "Der einen eigentlichen Namensdienst repräsentierende Datentyp zusammen mit der zugehörigen Auflösungsaktion." #. type: table -#: doc/guix.texi:23839 +#: doc/guix.texi:23836 msgid "A string denoting the name service (@pxref{Services in the NSS configuration,,, libc, The GNU C Library Reference Manual})." msgstr "Eine Zeichenkette, die den Namensdienst bezeichnet (siehe @ref{Services in the NSS configuration,,, libc, The GNU C Library Reference Manual})." #. type: table -#: doc/guix.texi:23844 +#: doc/guix.texi:23841 msgid "Note that name services listed here must be visible to nscd. This is achieved by passing the @code{#:name-services} argument to @code{nscd-service} the list of packages providing the needed name services (@pxref{Base Services, @code{nscd-service}})." msgstr "Beachten Sie, dass hier aufgeführte Namensdienste für den nscd sichtbar sein müssen. Dazu übergeben Sie im Argument @code{#:name-services} des @code{nscd-service} die Liste der Pakete, die die entsprechenden Namensdienste anbieten (siehe @ref{Base Services, @code{nscd-service}})." #. type: item -#: doc/guix.texi:23845 +#: doc/guix.texi:23842 #, no-wrap msgid "reaction" msgstr "reaction" #. type: table -#: doc/guix.texi:23849 +#: doc/guix.texi:23846 msgid "An action specified using the @code{lookup-specification} macro (@pxref{Actions in the NSS configuration,,, libc, The GNU C Library Reference Manual}). For example:" msgstr "Eine mit Hilfe des Makros @code{lookup-specification} angegebene Aktion (siehe @ref{Actions in the NSS configuration,,, libc, The GNU C Library Reference Manual}). Zum Beispiel:" #. type: example -#: doc/guix.texi:23853 +#: doc/guix.texi:23850 #, no-wrap msgid "" "(lookup-specification (unavailable => continue)\n" @@ -43950,17 +44004,17 @@ msgstr "" " (success => return))\n" #. type: Plain text -#: doc/guix.texi:23867 +#: doc/guix.texi:23864 msgid "For bootstrapping purposes, the Linux-Libre kernel is passed an @dfn{initial RAM disk}, or @dfn{initrd}. An initrd contains a temporary root file system as well as an initialization script. The latter is responsible for mounting the real root file system, and for loading any kernel modules that may be needed to achieve that." msgstr "Um ihn zu initialisieren (zu „bootstrappen“), wird für den Kernel Linux-Libre eine @dfn{initiale RAM-Disk} angegeben (kurz @dfn{initrd}). Eine initrd enthält ein temporäres Wurzeldateisystem sowie ein Skript zur Initialisierung. Letzteres ist dafür zuständig, das echte Wurzeldateisystem einzubinden und alle Kernel-Module zu laden, die dafür nötig sein könnten." #. type: Plain text -#: doc/guix.texi:23876 +#: doc/guix.texi:23873 msgid "The @code{initrd-modules} field of an @code{operating-system} declaration allows you to specify Linux-libre kernel modules that must be available in the initrd. In particular, this is where you would list modules needed to actually drive the hard disk where your root partition is---although the default value of @code{initrd-modules} should cover most use cases. For example, assuming you need the @code{megaraid_sas} module in addition to the default modules to be able to access your root file system, you would write:" msgstr "Mit dem Feld @code{initrd-modules} einer @code{operating-system}-Deklaration können Sie angeben, welche Kernel-Module für Linux-libre in der initrd verfügbar sein müssen. Insbesondere müssen hier die Module aufgeführt werden, um die Festplatte zu betreiben, auf der sich Ihre Wurzelpartition befindet — allerdings sollte der vorgegebene Wert der @code{initrd-modules} in dem meisten Fällen genügen. Wenn Sie aber zum Beispiel das Kernel-Modul @code{megaraid_sas} zusätzlich zu den vorgegebenen Modulen brauchen, um auf Ihr Wurzeldateisystem zugreifen zu können, würden Sie das so schreiben:" #. type: example -#: doc/guix.texi:23881 +#: doc/guix.texi:23878 #, no-wrap msgid "" "(operating-system\n" @@ -43972,28 +44026,28 @@ msgstr "" " (initrd-modules (cons \"megaraid_sas\" %base-initrd-modules)))\n" #. type: defvr -#: doc/guix.texi:23883 +#: doc/guix.texi:23880 #, no-wrap msgid "{Scheme Variable} %base-initrd-modules" msgstr "{Scheme-Variable} %base-initrd-modules" #. type: defvr -#: doc/guix.texi:23885 +#: doc/guix.texi:23882 msgid "This is the list of kernel modules included in the initrd by default." msgstr "Der Vorgabewert für die Liste der Kernel-Module, die in der initrd enthalten sein sollen." #. type: Plain text -#: doc/guix.texi:23893 +#: doc/guix.texi:23890 msgid "Furthermore, if you need lower-level customization, the @code{initrd} field of an @code{operating-system} declaration allows you to specify which initrd you would like to use. The @code{(gnu system linux-initrd)} module provides three ways to build an initrd: the high-level @code{base-initrd} procedure and the low-level @code{raw-initrd} and @code{expression->initrd} procedures." msgstr "Wenn Sie noch systemnähere Anpassungen durchführen wollen, können Sie im Feld @code{initrd} einer @code{operating-system}-Deklaration angeben, was für eine Art von initrd Sie benutzen möchten. Das Modul @code{(gnu system linux-initrd)} enthält drei Arten, eine initrd zu erstellen: die abstrakte Prozedur @code{base-initrd} und die systemnahen Prozeduren @code{raw-initrd} und @code{expression->initrd}." #. type: Plain text -#: doc/guix.texi:23898 +#: doc/guix.texi:23895 msgid "The @code{base-initrd} procedure is intended to cover most common uses. For example, if you want to add a bunch of kernel modules to be loaded at boot time, you can define the @code{initrd} field of the operating system declaration like this:" msgstr "Mit der Prozedur @code{base-initrd} sollten Sie die häufigsten Anwendungszwecke abdecken können. Wenn Sie zum Beispiel ein paar Kernel-Module zur Boot-Zeit laden lassen möchten, können Sie das @code{initrd}-Feld auf diese Art definieren:" #. type: example -#: doc/guix.texi:23906 +#: doc/guix.texi:23903 #, no-wrap msgid "" "(initrd (lambda (file-systems . rest)\n" @@ -44012,369 +44066,369 @@ msgstr "" " rest)))\n" #. type: Plain text -#: doc/guix.texi:23911 +#: doc/guix.texi:23908 msgid "The @code{base-initrd} procedure also handles common use cases that involves using the system as a QEMU guest, or as a ``live'' system with volatile root file system." msgstr "Die Prozedur @code{base-initrd} kann auch mit üblichen Anwendungszwecken umgehen, um das System als QEMU-Gastsystem zu betreiben oder als ein „Live“-System ohne ein dauerhaft gespeichertes Wurzeldateisystem." #. type: Plain text -#: doc/guix.texi:23918 +#: doc/guix.texi:23915 msgid "The @code{base-initrd} procedure is built from @code{raw-initrd} procedure. Unlike @code{base-initrd}, @code{raw-initrd} doesn't do anything high-level, such as trying to guess which kernel modules and packages should be included to the initrd. An example use of @code{raw-initrd} is when a user has a custom Linux kernel configuration and default kernel modules included by @code{base-initrd} are not available." msgstr "Die Prozedur @code{base-initrd} baut auf der Prozedur @code{raw-initrd} auf. Anders als @code{base-initrd} hat @code{raw-initrd} keinerlei Zusatzfunktionalitäten: Es wird kein Versuch unternommen, für die initrd notwendige Kernel-Module und Pakete automatisch hinzuzunehmen. @code{raw-initrd} kann zum Beispiel benutzt werden, wenn ein Nutzer eine eigene Konfiguration des Linux-Kernels verwendet und die Standard-Kernel-Module, die mit @code{base-initrd} hinzugenommen würden, nicht verfügbar sind." #. type: Plain text -#: doc/guix.texi:23923 +#: doc/guix.texi:23920 msgid "The initial RAM disk produced by @code{base-initrd} or @code{raw-initrd} honors several options passed on the Linux kernel command line (that is, arguments passed @i{via} the @code{linux} command of GRUB, or the @code{-append} option of QEMU), notably:" msgstr "Die initiale RAM-Disk, wie sie von @code{base-initrd} oder @code{raw-initrd} erzeugt wird, richtet sich nach verschiedenen Optionen, die auf der Kernel-Befehlszeile übergeben werden (also über GRUBs @code{linux}-Befehl oder die @code{-append}-Befehlszeilenoption von QEMU). Erwähnt werden sollten:" #. type: item -#: doc/guix.texi:23925 +#: doc/guix.texi:23922 #, no-wrap msgid "--load=@var{boot}" msgstr "--load=@var{boot}" #. type: table -#: doc/guix.texi:23928 +#: doc/guix.texi:23925 msgid "Tell the initial RAM disk to load @var{boot}, a file containing a Scheme program, once it has mounted the root file system." msgstr "Die initiale RAM-Disk eine Datei @var{boot}, in der ein Scheme-Programm steht, laden lassen, nachdem das Wurzeldateisystem eingebunden wurde." #. type: table -#: doc/guix.texi:23932 +#: doc/guix.texi:23929 msgid "Guix uses this option to yield control to a boot program that runs the service activation programs and then spawns the GNU@tie{}Shepherd, the initialization system." msgstr "Guix übergibt mit dieser Befehlszeilenoption die Kontrolle an ein Boot-Programm, das die Dienstaktivierungsprogramme ausführt und anschließend den GNU@tie{}Shepherd startet, das Initialisierungssystem („init“-System) von Guix System." #. type: item -#: doc/guix.texi:23933 +#: doc/guix.texi:23930 #, no-wrap msgid "--root=@var{root}" msgstr "--root=@var{Wurzel}" #. type: table -#: doc/guix.texi:23937 +#: doc/guix.texi:23934 msgid "Mount @var{root} as the root file system. @var{root} can be a device name like @code{/dev/sda1}, a file system label, or a file system UUID." msgstr "Das mit @var{Wurzel} bezeichnete Dateisystem als Wurzeldateisystem einbinden. @var{Wurzel} kann ein Geratename wie @code{/dev/sda1}, eine Dateisystembezeichnung (d.h.@: ein Dateisystem-„Label“) oder eine Dateisystem-UUID sein." #. type: table -#: doc/guix.texi:23941 +#: doc/guix.texi:23938 msgid "Have @file{/run/booted-system} and @file{/run/current-system} point to @var{system}." msgstr "@file{/run/booted-system} und @file{/run/current-system} auf das @var{System} zeigen lassen." #. type: item -#: doc/guix.texi:23942 +#: doc/guix.texi:23939 #, no-wrap msgid "modprobe.blacklist=@var{modules}@dots{}" msgstr "modprobe.blacklist=@var{Module}…" #. type: cindex -#: doc/guix.texi:23943 +#: doc/guix.texi:23940 #, no-wrap msgid "module, black-listing" msgstr "Kernel-Module, Sperrliste" #. type: cindex -#: doc/guix.texi:23944 +#: doc/guix.texi:23941 #, no-wrap msgid "black list, of kernel modules" msgstr "Sperrliste, von Kernel-Modulen" #. type: table -#: doc/guix.texi:23949 +#: doc/guix.texi:23946 msgid "Instruct the initial RAM disk as well as the @command{modprobe} command (from the kmod package) to refuse to load @var{modules}. @var{modules} must be a comma-separated list of module names---e.g., @code{usbkbd,9pnet}." msgstr "Die initiale RAM-Disk sowie den Befehl @command{modprobe} (aus dem kmod-Paket) anweisen, das Laden der angegebenen @var{Module} zu verweigern. Als @var{Module} muss eine kommagetrennte Liste von Kernel-Modul-Namen angegeben werden — z.B.@: @code{usbkbd,9pnet}." #. type: item -#: doc/guix.texi:23950 +#: doc/guix.texi:23947 #, no-wrap msgid "--repl" msgstr "--repl" #. type: table -#: doc/guix.texi:23956 +#: doc/guix.texi:23953 msgid "Start a read-eval-print loop (REPL) from the initial RAM disk before it tries to load kernel modules and to mount the root file system. Our marketing team calls it @dfn{boot-to-Guile}. The Schemer in you will love it. @xref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}, for more information on Guile's REPL." msgstr "Eine Lese-Auswerten-Schreiben-Schleife (englisch „Read-Eval-Print Loop“, kurz REPL) von der initialen RAM-Disk starten, bevor diese die Kernel-Module zu laden versucht und das Wurzeldateisystem einbindet. Unsere Marketingabteilung nennt das @dfn{boot-to-Guile}. Der Schemer in Ihnen wird das lieben. Siehe @ref{Using Guile Interactively,,, guile, GNU Guile Reference Manual} für mehr Informationen über die REPL von Guile." #. type: Plain text -#: doc/guix.texi:23962 +#: doc/guix.texi:23959 msgid "Now that you know all the features that initial RAM disks produced by @code{base-initrd} and @code{raw-initrd} provide, here is how to use it and customize it further." msgstr "Jetzt wo Sie wissen, was für Funktionalitäten eine durch @code{base-initrd} und @code{raw-initrd} erzeugte initiale RAM-Disk so haben kann, möchten Sie vielleicht auch wissen, wie man Sie benutzt und weiter anpasst:" #. type: deffn -#: doc/guix.texi:23965 +#: doc/guix.texi:23962 #, no-wrap msgid "{Scheme Procedure} raw-initrd @var{file-systems} @" msgstr "{Scheme-Prozedur} raw-initrd @var{Dateisysteme} @" #. type: deffn -#: doc/guix.texi:23978 +#: doc/guix.texi:23975 msgid "[#:linux-modules '()] [#:mapped-devices '()] @ [#:keyboard-layout #f] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a derivation that builds a raw initrd. @var{file-systems} is a list of file systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}. @var{linux-modules} is a list of kernel modules to be loaded at boot time. @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted (@pxref{Mapped Devices}). @var{helper-packages} is a list of packages to be copied in the initrd. It may include @code{e2fsck/static} or other packages needed by the initrd to check the root file system." msgstr "[#:linux-modules '()] [#:mapped-devices '()] @ [#:keyboard-layout #f] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Liefert eine Ableitung, die eine rohe („raw“) initrd erstellt. @var{Dateisysteme} bezeichnet eine Liste von durch die initrd einzubindenden Dateisystemen, unter Umständen zusätzlich zum auf der Kernel-Befehlszeile mit @code{--root} angegebenen Wurzeldateisystem. @var{linux-modules} ist eine Liste von Kernel-Modulen, die zur Boot-Zeit geladen werden sollen. @var{mapped-devices} ist eine Liste von Gerätezuordnungen, die hergestellt sein müssen, bevor die unter @var{file-systems} aufgeführten Dateisysteme eingebunden werden (siehe @ref{Mapped Devices}). @var{helper-packages} ist eine Liste von Paketen, die in die initrd kopiert werden. Darunter kann @code{e2fsck/static} oder andere Pakete aufgeführt werden, mit denen durch die initrd das Wurzeldateisystem auf Fehler hin geprüft werden kann." #. type: deffn -#: doc/guix.texi:23984 doc/guix.texi:24008 +#: doc/guix.texi:23981 doc/guix.texi:24005 msgid "When true, @var{keyboard-layout} is a @code{} record denoting the desired console keyboard layout. This is done before @var{mapped-devices} are set up and before @var{file-systems} are mounted such that, should the user need to enter a passphrase or use the REPL, this happens using the intended keyboard layout." msgstr "Ist es auf einen wahren Wert gesetzt, dann muss @var{keyboard-layout} eine Tastaturbelegung als @code{}-Verbundsobjekt angeben, die die gewünschte Tastaturbelegung für die Konsole bezeichnet. Sie wird verwendet, noch bevor die Gerätezuordnungen in @var{mapped-devices} hergestellt werden und bevor die Dateisysteme in @var{file-systems} eingebunden werden, damit der Anwender dabei die gewollte Tastaturbelegung beim Eingeben einer Passphrase und bei der Nutzung einer REPL verwenden kann." #. type: deffn -#: doc/guix.texi:23988 +#: doc/guix.texi:23985 msgid "When @var{qemu-networking?} is true, set up networking with the standard QEMU parameters. When @var{virtio?} is true, load additional modules so that the initrd can be used as a QEMU guest with para-virtualized I/O drivers." msgstr "Wenn @var{qemu-networking?} wahr ist, wird eine Netzwerkverbindung mit den Standard-QEMU-Parametern hergestellt. Wenn @var{virtio?} wahr ist, werden zusätzliche Kernel-Module geladen, damit die initrd als ein QEMU-Gast paravirtualisierte Ein-/Ausgabetreiber benutzen kann." #. type: deffn -#: doc/guix.texi:23991 +#: doc/guix.texi:23988 msgid "When @var{volatile-root?} is true, the root file system is writable but any changes to it are lost." msgstr "Wenn @var{volatile-root?} wahr ist, ist Schreiben auf das Wurzeldateisystem möglich, aber Änderungen daran bleiben nicht erhalten." #. type: deffn -#: doc/guix.texi:23993 +#: doc/guix.texi:23990 #, no-wrap msgid "{Scheme Procedure} base-initrd @var{file-systems} @" msgstr "{Scheme-Prozedur} base-initrd @var{Dateisysteme} @" #. type: deffn -#: doc/guix.texi:24002 +#: doc/guix.texi:23999 msgid "[#:mapped-devices '()] [#:keyboard-layout #f] @ [#:qemu-networking? #f] [#:volatile-root? #f] @ [#:linux-modules '()] Return as a file-like object a generic initrd, with kernel modules taken from @var{linux}. @var{file-systems} is a list of file-systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}. @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted." msgstr "[#:mapped-devices '()] [#:keyboard-layout #f] @ [#:qemu-networking? #f] [#:volatile-root? #f] @ [#:linux-modules '()] Liefert eine allgemein anwendbare, generische initrd als dateiartiges Objekt mit den Kernel-Modulen aus @var{linux}. Die @var{file-systems} sind eine Liste von durch die initrd einzubindenden Dateisystemen, unter Umständen zusätzlich zum Wurzeldateisystem, das auf der Kernel-Befehlszeile mit @code{--root} angegeben wurde. Die @var{mapped-devices} sind eine Liste von Gerätezuordnungen, die hergestellt sein müssen, bevor die @var{file-systems} eingebunden werden." #. type: deffn -#: doc/guix.texi:24010 +#: doc/guix.texi:24007 msgid "@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-initrd}." msgstr "@var{qemu-networking?} und @var{volatile-root?} verhalten sich wie bei @code{raw-initrd}." #. type: deffn -#: doc/guix.texi:24015 +#: doc/guix.texi:24012 msgid "The initrd is automatically populated with all the kernel modules necessary for @var{file-systems} and for the given options. Additional kernel modules can be listed in @var{linux-modules}. They will be added to the initrd, and loaded at boot time in the order in which they appear." msgstr "In die initrd werden automatisch alle Kernel-Module eingefügt, die für die unter @var{file-systems} angegebenen Dateisysteme und die angegebenen Optionen nötig sind. Zusätzliche Kernel-Module können unter den @var{linux-modules} aufgeführt werden. Diese werden zur initrd hinzugefügt und zur Boot-Zeit in der Reihenfolge geladen, in der sie angegeben wurden." #. type: Plain text -#: doc/guix.texi:24022 +#: doc/guix.texi:24019 msgid "Needless to say, the initrds we produce and use embed a statically-linked Guile, and the initialization program is a Guile program. That gives a lot of flexibility. The @code{expression->initrd} procedure builds such an initrd, given the program to run in that initrd." msgstr "Selbstverständlich betten die hier erzeugten und benutzten initrds ein statisch gebundenes Guile ein und das Initialisierungsprogramm ist ein Guile-Programm. Dadurch haben wir viel Flexibilität. Die Prozedur @code{expression->initrd} erstellt eine solche initrd für ein an sie übergebenes Programm." #. type: deffn -#: doc/guix.texi:24023 +#: doc/guix.texi:24020 #, no-wrap msgid "{Scheme Procedure} expression->initrd @var{exp} @" msgstr "{Scheme-Prozedur} expression->initrd @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:24029 +#: doc/guix.texi:24026 msgid "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return as a file-like object a Linux initrd (a gzipped cpio archive) containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting. All the derivations referenced by @var{exp} are automatically copied to the initrd." msgstr "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Liefert eine Linux-initrd (d.h.@: ein gzip-komprimiertes cpio-Archiv) als dateiartiges Objekt, in dem @var{guile} enthalten ist, womit der @var{G-Ausdruck} nach dem Booten ausgewertet wird. Alle vom @var{G-Ausdruck} referenzierten Ableitungen werden automatisch in die initrd kopiert." #. type: cindex -#: doc/guix.texi:24035 +#: doc/guix.texi:24032 #, no-wrap msgid "boot loader" msgstr "Bootloader" #. type: Plain text -#: doc/guix.texi:24042 +#: doc/guix.texi:24039 msgid "The operating system supports multiple bootloaders. The bootloader is configured using @code{bootloader-configuration} declaration. All the fields of this structure are bootloader agnostic except for one field, @code{bootloader} that indicates the bootloader to be configured and installed." msgstr "Das Betriebssystem unterstützt mehrere Bootloader. Der gewünschte Bootloader wird mit der @code{bootloader-configuration}-Deklaration konfiguriert. Alle Felder dieser Struktur sind für alle Bootloader gleich außer dem einen Feld @code{bootloader}, das angibt, welcher Bootloader konfiguriert und installiert werden soll." #. type: Plain text -#: doc/guix.texi:24047 +#: doc/guix.texi:24044 msgid "Some of the bootloaders do not honor every field of @code{bootloader-configuration}. For instance, the extlinux bootloader does not support themes and thus ignores the @code{theme} field." msgstr "Manche der Bootloader setzen nicht alle Felder einer @code{bootloader-configuration} um. Zum Beispiel ignoriert der extlinux-Bootloader das @code{theme}-Feld, weil er keine eigenen Themen unterstützt." #. type: deftp -#: doc/guix.texi:24048 +#: doc/guix.texi:24045 #, no-wrap msgid "{Data Type} bootloader-configuration" msgstr "{Datentyp} bootloader-configuration" #. type: deftp -#: doc/guix.texi:24050 +#: doc/guix.texi:24047 msgid "The type of a bootloader configuration declaration." msgstr "Der Typ der Deklaration einer Bootloader-Konfiguration." #. type: cindex -#: doc/guix.texi:24054 +#: doc/guix.texi:24051 #, no-wrap msgid "EFI, bootloader" msgstr "EFI, Bootloader" #. type: cindex -#: doc/guix.texi:24055 +#: doc/guix.texi:24052 #, no-wrap msgid "UEFI, bootloader" msgstr "UEFI, Bootloader" #. type: cindex -#: doc/guix.texi:24056 +#: doc/guix.texi:24053 #, no-wrap msgid "BIOS, bootloader" msgstr "BIOS, Bootloader" #. type: table -#: doc/guix.texi:24060 +#: doc/guix.texi:24057 msgid "The bootloader to use, as a @code{bootloader} object. For now @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} and @code{u-boot-bootloader} are supported." msgstr "Der zu benutzende Bootloader als ein @code{bootloader}-Objekt. Zur Zeit werden @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} und @code{u-boot-bootloader} unterstützt." #. type: table -#: doc/guix.texi:24066 +#: doc/guix.texi:24063 msgid "@code{grub-efi-bootloader} allows to boot on modern systems using the @dfn{Unified Extensible Firmware Interface} (UEFI). This is what you should use if the installation image contains a @file{/sys/firmware/efi} directory when you boot it on your system." msgstr "@code{grub-efi-bootloader} macht es möglich, auf modernen Systemen mit @dfn{Unified Extensible Firmware Interface} (UEFI) zu booten. Sie sollten das hier benutzen, wenn im Installationsabbild ein Verzeichnis @file{/sys/firmware/efi} vorhanden ist, wenn Sie davon auf Ihrem System booten." #. type: table -#: doc/guix.texi:24070 +#: doc/guix.texi:24067 msgid "@code{grub-bootloader} allows you to boot in particular Intel-based machines in ``legacy'' BIOS mode." msgstr "Mit @code{grub-bootloader} können Sie vor allem auf Intel-basierten Maschinen im alten „Legacy“-BIOS-Modus booten." #. type: cindex -#: doc/guix.texi:24071 +#: doc/guix.texi:24068 #, no-wrap msgid "ARM, bootloaders" msgstr "ARM, Bootloader" #. type: cindex -#: doc/guix.texi:24072 +#: doc/guix.texi:24069 #, no-wrap msgid "AArch64, bootloaders" msgstr "AArch64, Bootloader" #. type: table -#: doc/guix.texi:24077 +#: doc/guix.texi:24074 msgid "Available bootloaders are described in @code{(gnu bootloader @dots{})} modules. In particular, @code{(gnu bootloader u-boot)} contains definitions of bootloaders for a wide range of ARM and AArch64 systems, using the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot bootloader}." msgstr "Verfügbare Bootloader werden in den Modulen @code{(gnu bootloader …)} beschrieben. Insbesondere enthält @code{(gnu bootloader u-boot)} Definitionen für eine Vielzahl von ARM- und AArch64-Systemen, die den @uref{https://www.denx.de/wiki/U-Boot/, U-Boot-Bootloader} benutzen." #. type: table -#: doc/guix.texi:24081 +#: doc/guix.texi:24078 msgid "This is a string denoting the target onto which to install the bootloader." msgstr "Eine Zeichenkette, die angibt, auf welches Ziel der Bootloader installiert werden soll." #. type: table -#: doc/guix.texi:24088 +#: doc/guix.texi:24085 msgid "The interpretation depends on the bootloader in question. For @code{grub-bootloader}, for example, it should be a device name understood by the bootloader @command{installer} command, such as @code{/dev/sda} or @code{(hd0)} (@pxref{Invoking grub-install,,, grub, GNU GRUB Manual}). For @code{grub-efi-bootloader}, it should be the mount point of the EFI file system, usually @file{/boot/efi}." msgstr "Was das bedeutet, hängt vom jeweiligen Bootloader ab. Für @code{grub-bootloader} sollte hier zum Beispiel ein Gerätename angegeben werden, der vom @command{installer}-Befehl des Bootloaders verstanden wird, etwa @code{/dev/sda} oder @code{(hd0)} (siehe @ref{Invoking grub-install,,, grub, GNU GRUB Manual}). Für @code{grub-efi-bootloader} sollte der Einhängepunkt des EFI-Dateisystems angegeben werden, in der Regel @file{/boot/efi}." #. type: item -#: doc/guix.texi:24089 +#: doc/guix.texi:24086 #, no-wrap msgid "@code{menu-entries} (default: @code{()})" msgstr "@code{menu-entries} (Vorgabe: @code{()})" #. type: table -#: doc/guix.texi:24093 +#: doc/guix.texi:24090 msgid "A possibly empty list of @code{menu-entry} objects (see below), denoting entries to appear in the bootloader menu, in addition to the current system entry and the entry pointing to previous system generations." msgstr "Eine möglicherweise leere Liste von @code{menu-entry}-Objekten (siehe unten), die für Menüeinträge stehen, die im Bootloader-Menü auftauchen sollen, zusätzlich zum aktuellen Systemeintrag und dem auf vorherige Systemgenerationen verweisenden Eintrag." #. type: item -#: doc/guix.texi:24094 +#: doc/guix.texi:24091 #, no-wrap msgid "@code{default-entry} (default: @code{0})" msgstr "@code{default-entry} (Vorgabe: @code{0})" #. type: table -#: doc/guix.texi:24097 +#: doc/guix.texi:24094 msgid "The index of the default boot menu entry. Index 0 is for the entry of the current system." msgstr "Die Position des standardmäßig ausgewählten Bootmenü-Eintrags. An Position 0 steht der Eintrag der aktuellen Systemgeneration." #. type: item -#: doc/guix.texi:24098 +#: doc/guix.texi:24095 #, no-wrap msgid "@code{timeout} (default: @code{5})" msgstr "@code{timeout} (Vorgabe: @code{5})" #. type: table -#: doc/guix.texi:24101 +#: doc/guix.texi:24098 msgid "The number of seconds to wait for keyboard input before booting. Set to 0 to boot immediately, and to -1 to wait indefinitely." msgstr "Wieviele Sekunden lang im Menü auf eine Tastatureingabe gewartet wird, bevor gebootet wird. 0 steht für sofortiges Booten, für -1 wird ohne Zeitbeschränkung gewartet." #. type: cindex -#: doc/guix.texi:24102 +#: doc/guix.texi:24099 #, no-wrap msgid "keyboard layout, for the bootloader" msgstr "Tastaturbelegung, beim Bootloader" #. type: table -#: doc/guix.texi:24106 +#: doc/guix.texi:24103 msgid "If this is @code{#f}, the bootloader's menu (if any) uses the default keyboard layout, usually US@tie{}English (``qwerty'')." msgstr "Wenn dies auf @code{#f} gesetzt ist, verwendet das Menü des Bootloaders (falls vorhanden) die Vorgabe-Tastaturbelegung, normalerweise US@tie{}English („qwerty“)." #. type: table -#: doc/guix.texi:24109 +#: doc/guix.texi:24106 msgid "Otherwise, this must be a @code{keyboard-layout} object (@pxref{Keyboard Layout})." msgstr "Andernfalls muss es ein @code{keyboard-layout}-Objekt sein (siehe @ref{Keyboard Layout})." #. type: quotation -#: doc/guix.texi:24113 +#: doc/guix.texi:24110 msgid "This option is currently ignored by bootloaders other than @code{grub} and @code{grub-efi}." msgstr "Dieses Feld wird derzeit von Bootloadern außer @code{grub} und @code{grub-efi} ignoriert." #. type: item -#: doc/guix.texi:24115 +#: doc/guix.texi:24112 #, no-wrap msgid "@code{theme} (default: @var{#f})" msgstr "@code{theme} (Vorgabe: @var{#f})" #. type: table -#: doc/guix.texi:24119 +#: doc/guix.texi:24116 msgid "The bootloader theme object describing the theme to use. If no theme is provided, some bootloaders might use a default theme, that's true for GRUB." msgstr "Ein Objekt für das im Bootloader anzuzeigende Thema. Wird kein Thema angegeben, benutzen manche Bootloader vielleicht ein voreingestelltes Thema; GRUB zumindest macht es so." #. type: item -#: doc/guix.texi:24120 +#: doc/guix.texi:24117 #, no-wrap msgid "@code{terminal-outputs} (default: @code{'gfxterm})" msgstr "@code{terminal-outputs} (Vorgabe: @code{'gfxterm})" #. type: table -#: doc/guix.texi:24127 +#: doc/guix.texi:24124 msgid "The output terminals used for the bootloader boot menu, as a list of symbols. GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, @code{morse}, and @code{pkmodem}. This field corresponds to the GRUB variable @code{GRUB_TERMINAL_OUTPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})." msgstr "Die Ausgabeterminals, die für das Boot-Menü des Bootloaders benutzt werden, als eine Liste von Symbolen. GRUB akzeptiert hier diese Werte: @code{console}, @code{serial}, @code{serial_@{0–3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, @code{morse} und @code{pkmodem}. Dieses Feld entspricht der GRUB-Variablen @code{GRUB_TERMINAL_OUTPUT} (siehe @ref{Simple configuration,,, grub,GNU GRUB manual})." #. type: item -#: doc/guix.texi:24128 +#: doc/guix.texi:24125 #, no-wrap msgid "@code{terminal-inputs} (default: @code{'()})" msgstr "@code{terminal-inputs} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:24136 +#: doc/guix.texi:24133 msgid "The input terminals used for the bootloader boot menu, as a list of symbols. For GRUB, the default is the native platform terminal as determined at run-time. GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard}, and @code{usb_keyboard}. This field corresponds to the GRUB variable @code{GRUB_TERMINAL_INPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})." msgstr "Die Eingabeterminals, die für das Boot-Menü des Bootloaders benutzt werden, als eine Liste von Symbolen. GRUB verwendet hier das zur Laufzeit bestimmte Standardterminal. GRUB akzeptiert sonst diese Werte: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard} und @code{usb_keyboard}. Dieses Feld entspricht der GRUB-Variablen @code{GRUB_TERMINAL_INPUT} (siehe @ref{Simple configuration,,, grub,GNU GRUB manual})." #. type: item -#: doc/guix.texi:24137 +#: doc/guix.texi:24134 #, no-wrap msgid "@code{serial-unit} (default: @code{#f})" msgstr "@code{serial-unit} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:24141 +#: doc/guix.texi:24138 msgid "The serial unit used by the bootloader, as an integer from 0 to 3. For GRUB, it is chosen at run-time; currently GRUB chooses 0, which corresponds to COM1 (@pxref{Serial terminal,,, grub,GNU GRUB manual})." msgstr "Die serielle Einheit, die der Bootloader benutzt, als eine ganze Zahl zwischen 0 und 3, einschließlich. Für GRUB wird sie automatisch zur Laufzeit ausgewählt; derzeit wählt GRUB die 0 aus, die COM1 entspricht (siehe @ref{Serial terminal,,, grub,GNU GRUB manual})." #. type: item -#: doc/guix.texi:24142 +#: doc/guix.texi:24139 #, no-wrap msgid "@code{serial-speed} (default: @code{#f})" msgstr "@code{serial-speed} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:24146 +#: doc/guix.texi:24143 msgid "The speed of the serial interface, as an integer. For GRUB, the default value is chosen at run-time; currently GRUB chooses 9600@tie{}bps (@pxref{Serial terminal,,, grub,GNU GRUB manual})." msgstr "Die Geschwindigkeit der seriellen Schnittstelle als eine ganze Zahl. GRUB bestimmt den Wert standardmäßig zur Laufzeit; derzeit wählt GRUB 9600@tie{}bps (siehe @ref{Serial terminal,,, grub,GNU GRUB manual})." #. type: cindex -#: doc/guix.texi:24150 +#: doc/guix.texi:24147 #, no-wrap msgid "dual boot" msgstr "Dual-Boot" #. type: cindex -#: doc/guix.texi:24151 +#: doc/guix.texi:24148 #, no-wrap msgid "boot menu" msgstr "Bootmenü" #. type: Plain text -#: doc/guix.texi:24157 +#: doc/guix.texi:24154 msgid "Should you want to list additional boot menu entries @i{via} the @code{menu-entries} field above, you will need to create them with the @code{menu-entry} form. For example, imagine you want to be able to boot another distro (hard to imagine!), you can define a menu entry along these lines:" msgstr "Sollten Sie zusätzliche Bootmenü-Einträge über das oben beschriebene @code{menu-entries}-Feld hinzufügen möchten, müssen Sie diese mit der @code{menu-entry}-Form erzeugen. Stellen Sie sich zum Beispiel vor, Sie wollten noch eine andere Distribution booten können (schwer vorstellbar!), dann könnten Sie einen Menüeintrag wie den Folgenden definieren:" #. type: example -#: doc/guix.texi:24164 +#: doc/guix.texi:24161 #, no-wrap msgid "" "(menu-entry\n" @@ -44390,141 +44444,141 @@ msgstr "" " (initrd \"/boot/old/initrd\"))\n" #. type: Plain text -#: doc/guix.texi:24167 +#: doc/guix.texi:24164 msgid "Details below." msgstr "Details finden Sie unten." #. type: deftp -#: doc/guix.texi:24168 +#: doc/guix.texi:24165 #, no-wrap msgid "{Data Type} menu-entry" msgstr "{Datentyp} menu-entry" #. type: deftp -#: doc/guix.texi:24170 +#: doc/guix.texi:24167 msgid "The type of an entry in the bootloader menu." msgstr "Der Typ eines Eintrags im Bootloadermenü." #. type: table -#: doc/guix.texi:24175 +#: doc/guix.texi:24172 msgid "The label to show in the menu---e.g., @code{\"GNU\"}." msgstr "Die Beschriftung, die im Menü gezeigt werden soll — z.B.@: @code{\"GNU\"}." #. type: code{#1} -#: doc/guix.texi:24176 +#: doc/guix.texi:24173 #, no-wrap msgid "linux" msgstr "linux" #. type: table -#: doc/guix.texi:24178 +#: doc/guix.texi:24175 msgid "The Linux kernel image to boot, for example:" msgstr "Das Linux-Kernel-Abbild, was gebootet werden soll, zum Beispiel:" #. type: example -#: doc/guix.texi:24181 +#: doc/guix.texi:24178 #, no-wrap msgid "(file-append linux-libre \"/bzImage\")\n" msgstr "(file-append linux-libre \"/bzImage\")\n" #. type: table -#: doc/guix.texi:24186 +#: doc/guix.texi:24183 msgid "For GRUB, it is also possible to specify a device explicitly in the file path using GRUB's device naming convention (@pxref{Naming convention,,, grub, GNU GRUB manual}), for example:" msgstr "Für GRUB kann hier auch ein Gerät ausdrücklich zum Dateipfad angegeben werden, unter Verwendung von GRUBs Konventionen zur Gerätebenennung (siehe @ref{Naming convention,,, grub, GNU GRUB manual}), zum Beispiel:" #. type: example -#: doc/guix.texi:24189 +#: doc/guix.texi:24186 #, no-wrap msgid "\"(hd0,msdos1)/boot/vmlinuz\"\n" msgstr "\"(hd0,msdos1)/boot/vmlinuz\"\n" #. type: table -#: doc/guix.texi:24193 +#: doc/guix.texi:24190 msgid "If the device is specified explicitly as above, then the @code{device} field is ignored entirely." msgstr "Wenn das Gerät auf diese Weise ausdrücklich angegeben wird, wird das @code{device}-Feld gänzlich ignoriert." #. type: item -#: doc/guix.texi:24194 +#: doc/guix.texi:24191 #, no-wrap msgid "@code{linux-arguments} (default: @code{()})" msgstr "@code{linux-arguments} (Vorgabe: @code{()})" #. type: table -#: doc/guix.texi:24197 +#: doc/guix.texi:24194 msgid "The list of extra Linux kernel command-line arguments---e.g., @code{(\"console=ttyS0\")}." msgstr "Die Liste zusätzlicher Linux-Kernel-Befehlszeilenargumente — z.B.@: @code{(\"console=ttyS0\")}." #. type: table -#: doc/guix.texi:24201 +#: doc/guix.texi:24198 msgid "A G-Expression or string denoting the file name of the initial RAM disk to use (@pxref{G-Expressions})." msgstr "Ein G-Ausdruck oder eine Zeichenkette, die den Dateinamen der initialen RAM-Disk angibt, die benutzt werden soll (siehe @ref{G-Expressions})." #. type: item -#: doc/guix.texi:24201 +#: doc/guix.texi:24198 #, no-wrap msgid "@code{device} (default: @code{#f})" msgstr "@code{device} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:24204 +#: doc/guix.texi:24201 msgid "The device where the kernel and initrd are to be found---i.e., for GRUB, @dfn{root} for this menu entry (@pxref{root,,, grub, GNU GRUB manual})." msgstr "Das Gerät, auf dem Kernel und initrd zu finden sind — d.h.@: bei GRUB die Wurzel (@dfn{root}) dieses Menüeintrags (siehe @ref{root,,, grub, GNU GRUB manual})." #. type: table -#: doc/guix.texi:24210 +#: doc/guix.texi:24207 msgid "This may be a file system label (a string), a file system UUID (a bytevector, @pxref{File Systems}), or @code{#f}, in which case the bootloader will search the device containing the file specified by the @code{linux} field (@pxref{search,,, grub, GNU GRUB manual}). It must @emph{not} be an OS device name such as @file{/dev/sda1}." msgstr "Dies kann eine Dateisystembezeichnung (als Zeichenkette), eine Dateisystem-UUID (als Bytevektor, siehe @ref{File Systems}) oder @code{#f} sein, im letzten Fall wird der Bootloader auf dem Gerät suchen, das die vom @code{linux}-Feld benannte Datei enthält (siehe @ref{search,,, grub, GNU GRUB manual}). Ein vom Betriebssystem vergebener Gerätename wie @file{/dev/sda1} ist aber @emph{nicht} erlaubt." #. type: Plain text -#: doc/guix.texi:24217 +#: doc/guix.texi:24214 msgid "For now only GRUB has theme support. GRUB themes are created using the @code{grub-theme} form, which is not documented yet." msgstr "Zur Zeit lässt nur GRUB sein Aussehen durch Themen anpassen. GRUB-Themen werden mit der @code{grub-theme}-Form erzeugt, die hier noch nicht dokumentiert ist." #. type: defvr -#: doc/guix.texi:24222 +#: doc/guix.texi:24219 msgid "This is the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} record." msgstr "Das vorgegebene GRUB-Thema, das vom Betriebssystem benutzt wird, wenn kein @code{theme}-Feld im @code{bootloader-configuration}-Verbundsobjekt angegeben wurde." #. type: defvr -#: doc/guix.texi:24225 +#: doc/guix.texi:24222 msgid "It comes with a fancy background image displaying the GNU and Guix logos." msgstr "Es wird von einem feschen Hintergrundbild begleitet, das die Logos von GNU und Guix zeigt." #. type: section -#: doc/guix.texi:24229 +#: doc/guix.texi:24226 #, no-wrap msgid "Invoking @code{guix system}" msgstr "@code{guix system} aufrufen" #. type: Plain text -#: doc/guix.texi:24234 +#: doc/guix.texi:24231 msgid "Once you have written an operating system declaration as seen in the previous section, it can be @dfn{instantiated} using the @command{guix system} command. The synopsis is:" msgstr "Sobald Sie eine Betriebssystemdeklaration geschrieben haben, wie wir sie in den vorangehenden Abschnitten gesehen haben, kann diese @dfn{instanziiert} werden, indem Sie den Befehl @command{guix system} aufrufen. Zusammengefasst:" #. type: example -#: doc/guix.texi:24237 +#: doc/guix.texi:24234 #, no-wrap msgid "guix system @var{options}@dots{} @var{action} @var{file}\n" msgstr "guix system @var{Optionen}…@: @var{Aktion} @var{Datei}\n" #. type: Plain text -#: doc/guix.texi:24243 +#: doc/guix.texi:24240 msgid "@var{file} must be the name of a file containing an @code{operating-system} declaration. @var{action} specifies how the operating system is instantiated. Currently the following values are supported:" msgstr "@var{Datei} muss der Name einer Datei sein, in der eine Betriebssystemdeklaration als @code{operating-system}-Objekt steht. @var{Aktion} gibt an, wie das Betriebssystem instanziiert wird. Derzeit werden folgende Werte dafür unterstützt:" #. type: item -#: doc/guix.texi:24245 +#: doc/guix.texi:24242 #, no-wrap msgid "search" msgstr "search" #. type: table -#: doc/guix.texi:24248 +#: doc/guix.texi:24245 msgid "Display available service type definitions that match the given regular expressions, sorted by relevance:" msgstr "Verfügbare Diensttypendefinitionen anzeigen, die zum angegebenen regulären Ausdruck passen, sortiert nach Relevanz:" #. type: example -#: doc/guix.texi:24260 +#: doc/guix.texi:24257 #, no-wrap msgid "" "$ guix system search console font\n" @@ -44552,7 +44606,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24266 +#: doc/guix.texi:24263 #, no-wrap msgid "" "name: mingetty\n" @@ -44570,7 +44624,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24273 +#: doc/guix.texi:24270 #, no-wrap msgid "" "name: login\n" @@ -44590,254 +44644,254 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24275 +#: doc/guix.texi:24272 #, no-wrap msgid "@dots{}\n" msgstr "…\n" #. type: table -#: doc/guix.texi:24280 +#: doc/guix.texi:24277 msgid "As for @command{guix package --search}, the result is written in @code{recutils} format, which makes it easy to filter the output (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." msgstr "Wie auch bei @command{guix package --search} wird das Ergebnis im @code{recutils}-Format geliefert, so dass es leicht ist, die Ausgabe zu filtern (siehe @ref{Top, GNU recutils databases,, recutils, GNU recutils manual})." #. type: item -#: doc/guix.texi:24281 +#: doc/guix.texi:24278 #, no-wrap msgid "reconfigure" msgstr "reconfigure" #. type: table -#: doc/guix.texi:24286 +#: doc/guix.texi:24283 msgid "Build the operating system described in @var{file}, activate it, and switch to it@footnote{This action (and the related actions @code{switch-generation} and @code{roll-back}) are usable only on systems already running Guix System.}." msgstr "Das in der @var{Datei} beschriebene Betriebssystem erstellen, aktivieren und zu ihm wechseln@footnote{Diese Aktion (und die dazu ähnlichen Aktionen @code{switch-generation} und @code{roll-back}) sind nur auf Systemen nutzbar, auf denen „Guix System“ bereits läuft.}." #. type: table -#: doc/guix.texi:24293 +#: doc/guix.texi:24290 msgid "This effects all the configuration specified in @var{file}: user accounts, system services, global package list, setuid programs, etc. The command starts system services specified in @var{file} that are not currently running; if a service is currently running this command will arrange for it to be upgraded the next time it is stopped (e.g.@: by @code{herd stop X} or @code{herd restart X})." msgstr "Dieser Befehl setzt die in der @var{Datei} festgelegte Konfiguration vollständig um: Benutzerkonten, Systemdienste, die Liste globaler Pakete, setuid-Programme und so weiter. Der Befehl startet die in der @var{Datei} angegebenen Systemdienste, die aktuell nicht laufen; bei aktuell laufenden Diensten wird sichergestellt, dass sie aktualisiert werden, sobald sie das nächste Mal angehalten wurden (z.B.@: durch @code{herd stop X} oder @code{herd restart X})." #. type: table -#: doc/guix.texi:24299 +#: doc/guix.texi:24296 msgid "This command creates a new generation whose number is one greater than the current generation (as reported by @command{guix system list-generations}). If that generation already exists, it will be overwritten. This behavior mirrors that of @command{guix package} (@pxref{Invoking guix package})." msgstr "Dieser Befehl erzeugt eine neue Generation, deren Nummer (wie @command{guix system list-generations} sie anzeigt) um eins größer als die der aktuellen Generation ist. Wenn die so nummerierte Generation bereits existiert, wird sie überschrieben. Dieses Verhalten entspricht dem von @command{guix package} (siehe @ref{Invoking guix package})." #. type: table -#: doc/guix.texi:24304 +#: doc/guix.texi:24301 msgid "It also adds a bootloader menu entry for the new OS configuration, ---unless @option{--no-bootloader} is passed. For GRUB, it moves entries for older configurations to a submenu, allowing you to choose an older system generation at boot time should you need it." msgstr "Des Weiteren wird für den Bootloader ein Menüeintrag für die neue Betriebssystemkonfiguration hinzugefügt, außer die Befehlszeilenoption @option{--no-bootloader} wurde übergeben. Bei GRUB werden Einträge für ältere Konfigurationen in ein Untermenü verschoben, so dass Sie auch eine ältere Systemgeneration beim Booten noch hochfahren können, falls es notwendig wird." #. type: quotation -#: doc/guix.texi:24312 +#: doc/guix.texi:24309 msgid "It is highly recommended to run @command{guix pull} once before you run @command{guix system reconfigure} for the first time (@pxref{Invoking guix pull}). Failing to do that you would see an older version of Guix once @command{reconfigure} has completed." msgstr "Es ist sehr zu empfehlen, @command{guix pull} einmal auszuführen, bevor Sie @command{guix system reconfigure} zum ersten Mal aufrufen (siehe @ref{Invoking guix pull}). Wenn Sie das nicht tun, könnten Sie nach dem Abschluss von @command{reconfigure} eine ältere Version von Guix vorfinden, als Sie vorher hatten." #. type: item -#: doc/guix.texi:24314 +#: doc/guix.texi:24311 #, no-wrap msgid "switch-generation" msgstr "switch-generation" #. type: table -#: doc/guix.texi:24323 +#: doc/guix.texi:24320 msgid "Switch to an existing system generation. This action atomically switches the system profile to the specified system generation. It also rearranges the system's existing bootloader menu entries. It makes the menu entry for the specified system generation the default, and it moves the entries for the other generatiors to a submenu, if supported by the bootloader being used. The next time the system boots, it will use the specified system generation." msgstr "Zu einer bestehenden Systemgeneration wechseln. Diese Aktion wechselt das Systemprofil atomar auf die angegebene Systemgeneration. Hiermit werden auch die bestehenden Menüeinträge des Bootloaders umgeordnet. Der Menüeintrag für die angegebene Systemgeneration wird voreingestellt und die Einträge der anderen Generationen werden in ein Untermenü verschoben, sofern der verwendete Bootloader dies unterstützt. Das nächste Mal, wenn das System gestartet wird, wird die hier angegebene Systemgeneration hochgefahren." #. type: table -#: doc/guix.texi:24327 +#: doc/guix.texi:24324 msgid "The bootloader itself is not being reinstalled when using this command. Thus, the installed bootloader is used with an updated configuration file." msgstr "Der Bootloader selbst wird durch diesen Befehl @emph{nicht} neu installiert. Es wird also lediglich der bereits installierte Bootloader mit einer neuen Konfigurationsdatei benutzt werden." #. type: table -#: doc/guix.texi:24331 +#: doc/guix.texi:24328 msgid "The target generation can be specified explicitly by its generation number. For example, the following invocation would switch to system generation 7:" msgstr "Die Zielgeneration kann ausdrücklich über ihre Generationsnummer angegeben werden. Zum Beispiel würde folgender Aufruf einen Wechsel zur Systemgeneration 7 bewirken:" #. type: example -#: doc/guix.texi:24334 +#: doc/guix.texi:24331 #, no-wrap msgid "guix system switch-generation 7\n" msgstr "guix system switch-generation 7\n" #. type: table -#: doc/guix.texi:24342 +#: doc/guix.texi:24339 msgid "The target generation can also be specified relative to the current generation with the form @code{+N} or @code{-N}, where @code{+3} means ``3 generations ahead of the current generation,'' and @code{-1} means ``1 generation prior to the current generation.'' When specifying a negative value such as @code{-1}, you must precede it with @code{--} to prevent it from being parsed as an option. For example:" msgstr "Die Zielgeneration kann auch relativ zur aktuellen Generation angegeben werden, in der Form @code{+N} oder @code{-N}, wobei @code{+3} zum Beispiel „3 Generationen weiter als die aktuelle Generation“ bedeuten würde und @code{-1} „1 Generation vor der aktuellen Generation“ hieße. Wenn Sie einen negativen Wert wie @code{-1} angeben, müssen Sie @code{--} der Befehlszeilenoption voranstellen, damit die negative Zahl nicht selbst als Befehlszeilenoption aufgefasst wird. Zum Beispiel:" #. type: example -#: doc/guix.texi:24345 +#: doc/guix.texi:24342 #, no-wrap msgid "guix system switch-generation -- -1\n" msgstr "guix system switch-generation -- -1\n" #. type: table -#: doc/guix.texi:24353 +#: doc/guix.texi:24350 msgid "Currently, the effect of invoking this action is @emph{only} to switch the system profile to an existing generation and rearrange the bootloader menu entries. To actually start using the target system generation, you must reboot after running this action. In the future, it will be updated to do the same things as @command{reconfigure}, like activating and deactivating services." msgstr "Zur Zeit bewirkt ein Aufruf dieser Aktion @emph{nur} einen Wechsel des Systemprofils auf eine bereits existierende Generation und ein Umordnen der Bootloader-Menüeinträge. Um die Ziel-Systemgeneration aber tatsächlich zu benutzen, müssen Sie Ihr System neu hochfahren, nachdem Sie diese Aktion ausgeführt haben. In einer zukünftigen Version von Guix wird diese Aktion einmal dieselben Dinge tun, wie @command{reconfigure}, also etwa Dienste aktivieren und deaktivieren." #. type: table -#: doc/guix.texi:24355 +#: doc/guix.texi:24352 msgid "This action will fail if the specified generation does not exist." msgstr "Diese Aktion schlägt fehl, wenn die angegebene Generation nicht existiert." #. type: item -#: doc/guix.texi:24356 +#: doc/guix.texi:24353 #, no-wrap msgid "roll-back" msgstr "roll-back" #. type: table -#: doc/guix.texi:24362 +#: doc/guix.texi:24359 msgid "Switch to the preceding system generation. The next time the system boots, it will use the preceding system generation. This is the inverse of @command{reconfigure}, and it is exactly the same as invoking @command{switch-generation} with an argument of @code{-1}." msgstr "Zur vorhergehenden Systemgeneration wechseln. Wenn das System das nächste Mal hochgefahren wird, wird es die vorhergehende Systemgeneration benutzen. Dies ist die Umkehrung von @command{reconfigure} und tut genau dasselbe, wie @command{switch-generation} mit dem Argument @code{-1} aufzurufen." #. type: table -#: doc/guix.texi:24366 +#: doc/guix.texi:24363 msgid "Currently, as with @command{switch-generation}, you must reboot after running this action to actually start using the preceding system generation." msgstr "Wie auch bei @command{switch-generation} müssen Sie derzeit, nachdem Sie diese Aktion aufgerufen haben, Ihr System neu starten, um die vorhergehende Systemgeneration auch tatsächlich zu benutzen." #. type: item -#: doc/guix.texi:24367 +#: doc/guix.texi:24364 #, no-wrap msgid "delete-generations" msgstr "delete-generations" #. type: cindex -#: doc/guix.texi:24368 +#: doc/guix.texi:24365 #, no-wrap msgid "deleting system generations" msgstr "Löschen von Systemgenerationen" #. type: cindex -#: doc/guix.texi:24369 +#: doc/guix.texi:24366 #, no-wrap msgid "saving space" msgstr "Platz sparen" #. type: table -#: doc/guix.texi:24373 +#: doc/guix.texi:24370 msgid "Delete system generations, making them candidates for garbage collection (@pxref{Invoking guix gc}, for information on how to run the ``garbage collector'')." msgstr "Systemgenerationen löschen, wodurch diese zu Kandidaten für den Müllsammler werden (siehe @ref{Invoking guix gc} für Informationen, wie Sie den „Müllsammler“ laufen lassen)." #. type: table -#: doc/guix.texi:24377 +#: doc/guix.texi:24374 msgid "This works in the same way as @command{guix package --delete-generations} (@pxref{Invoking guix package, @code{--delete-generations}}). With no arguments, all system generations but the current one are deleted:" msgstr "Es funktioniert auf die gleiche Weise wie @command{guix package --delete-generations} (siehe @ref{Invoking guix package, @code{--delete-generations}}). Wenn keine Argumente angegeben werden, werden alle Systemgenerationen außer der aktuellen gelöscht:" #. type: example -#: doc/guix.texi:24380 +#: doc/guix.texi:24377 #, no-wrap msgid "guix system delete-generations\n" msgstr "guix system delete-generations\n" #. type: table -#: doc/guix.texi:24384 +#: doc/guix.texi:24381 msgid "You can also select the generations you want to delete. The example below deletes all the system generations that are more than two month old:" msgstr "Sie können auch eine Auswahl treffen, welche Generationen Sie löschen möchten. Das folgende Beispiel hat die Löschung aller Systemgenerationen zur Folge, die älter als zwei Monate sind:" #. type: example -#: doc/guix.texi:24387 +#: doc/guix.texi:24384 #, no-wrap msgid "guix system delete-generations 2m\n" msgstr "guix system delete-generations 2m\n" #. type: table -#: doc/guix.texi:24392 +#: doc/guix.texi:24389 msgid "Running this command automatically reinstalls the bootloader with an updated list of menu entries---e.g., the ``old generations'' sub-menu in GRUB no longer lists the generations that have been deleted." msgstr "Wenn Sie diesen Befehl ausführen, wird automatisch der Bootloader mit einer aktualisierten Liste von Menüeinträgen neu erstellt — z.B.@: werden im Untermenü für die „alten Generationen“ in GRUB die gelöschten Generationen nicht mehr aufgeführt." #. type: table -#: doc/guix.texi:24397 +#: doc/guix.texi:24394 msgid "Build the derivation of the operating system, which includes all the configuration files and programs needed to boot and run the system. This action does not actually install anything." msgstr "Die Ableitung des Betriebssystems erstellen, einschließlich aller Konfigurationsdateien und Programme, die zum Booten und Starten benötigt werden. Diese Aktion installiert jedoch nichts davon." #. type: item -#: doc/guix.texi:24398 +#: doc/guix.texi:24395 #, no-wrap msgid "init" msgstr "init" #. type: table -#: doc/guix.texi:24402 +#: doc/guix.texi:24399 msgid "Populate the given directory with all the files necessary to run the operating system specified in @var{file}. This is useful for first-time installations of Guix System. For instance:" msgstr "In das angegebene Verzeichnis alle Dateien einfügen, um das in der @var{Datei} angegebene Betriebssystem starten zu können. Dies ist nützlich bei erstmaligen Installationen von „Guix System“. Zum Beispiel:" #. type: example -#: doc/guix.texi:24405 +#: doc/guix.texi:24402 #, no-wrap msgid "guix system init my-os-config.scm /mnt\n" msgstr "guix system init my-os-config.scm /mnt\n" #. type: table -#: doc/guix.texi:24412 +#: doc/guix.texi:24409 msgid "copies to @file{/mnt} all the store items required by the configuration specified in @file{my-os-config.scm}. This includes configuration files, packages, and so on. It also creates other essential files needed for the system to operate correctly---e.g., the @file{/etc}, @file{/var}, and @file{/run} directories, and the @file{/bin/sh} file." msgstr "Hiermit werden alle Store-Objekte nach @file{/mnt} kopiert, die von der in @file{my-os-config.scm} angegebenen Konfiguration vorausgesetzt werden. Dazu gehören Konfigurationsdateien, Pakete und so weiter. Auch andere essenzielle Dateien, die auf dem System vorhanden sein müssen, damit es richtig funktioniert, werden erzeugt — z.B.@: die Verzeichnisse @file{/etc}, @file{/var} und @file{/run} und die Datei @file{/bin/sh}." #. type: table -#: doc/guix.texi:24416 +#: doc/guix.texi:24413 msgid "This command also installs bootloader on the target specified in @file{my-os-config}, unless the @option{--no-bootloader} option was passed." msgstr "Dieser Befehl installiert auch den Bootloader auf dem in @file{my-os-config} angegebenen Ziel, außer die Befehlszeilenoption @option{--no-bootloader} wurde übergeben." #. type: item -#: doc/guix.texi:24417 +#: doc/guix.texi:24414 #, no-wrap msgid "vm" msgstr "vm" #. type: cindex -#: doc/guix.texi:24418 doc/guix.texi:24697 +#: doc/guix.texi:24415 doc/guix.texi:24683 #, no-wrap msgid "virtual machine" msgstr "virtuelle Maschine" #. type: cindex -#: doc/guix.texi:24419 +#: doc/guix.texi:24416 #, no-wrap msgid "VM" msgstr "VM" #. type: anchor{#1} -#: doc/guix.texi:24423 +#: doc/guix.texi:24420 msgid "guix system vm" msgstr "guix system vm" #. type: table -#: doc/guix.texi:24423 +#: doc/guix.texi:24420 msgid "Build a virtual machine that contains the operating system declared in @var{file}, and return a script to run that virtual machine (VM)." msgstr "Eine virtuelle Maschine (VM) erstellen, die das in der @var{Datei} deklarierte Betriebssystem enthält, und ein Skript liefern, das diese virtuelle Maschine startet." #. type: quotation -#: doc/guix.texi:24431 +#: doc/guix.texi:24428 msgid "The @code{vm} action and others below can use KVM support in the Linux-libre kernel. Specifically, if the machine has hardware virtualization support, the corresponding KVM kernel module should be loaded, and the @file{/dev/kvm} device node must exist and be readable and writable by the user and by the build users of the daemon (@pxref{Build Environment Setup})." msgstr "Die Aktion @code{vm} sowie solche, die weiter unten genannt werden, können KVM-Unterstützung im Kernel Linux-libre ausnutzen. Insbesondere sollte, wenn die Maschine Hardware-Virtualisierung unterstützt, das entsprechende KVM-Kernelmodul geladen sein und das Gerät @file{/dev/kvm} muss dann existieren und dem Benutzer und den Erstellungsbenutzern des Daemons müssen Berechtigungen zum Lesen und Schreiben darauf gegeben werden (siehe @ref{Build Environment Setup})." #. type: table -#: doc/guix.texi:24436 +#: doc/guix.texi:24433 msgid "Arguments given to the script are passed to QEMU as in the example below, which enables networking and requests 1@tie{}GiB of RAM for the emulated machine:" msgstr "An das Skript übergebene Argumente werden an QEMU weitergereicht, wie Sie am folgenden Beispiel sehen können. Damit würde eine Netzwerkverbindung aktiviert und 1@tie{}GiB an RAM für die emulierte Maschine angefragt:" #. type: example -#: doc/guix.texi:24439 +#: doc/guix.texi:24436 #, no-wrap msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user\n" msgstr "$ /gnu/store/…-run-vm.sh -m 1024 -net user\n" #. type: table -#: doc/guix.texi:24442 +#: doc/guix.texi:24439 msgid "The VM shares its store with the host system." msgstr "Die virtuelle Maschine verwendet denselben Store wie das Wirtssystem." #. type: table -#: doc/guix.texi:24447 +#: doc/guix.texi:24444 msgid "Additional file systems can be shared between the host and the VM using the @code{--share} and @code{--expose} command-line options: the former specifies a directory to be shared with write access, while the latter provides read-only access to the shared directory." msgstr "Mit den Befehlszeilenoptionen @code{--share} und @code{--expose} können weitere Dateisysteme zwischen dem Wirtssystem und der VM geteilt werden: Der erste Befehl gibt ein mit Schreibzugriff zu teilendes Verzeichnis an, während der letzte Befehl nur Lesezugriff auf das gemeinsame Verzeichnis gestattet." #. type: table -#: doc/guix.texi:24451 +#: doc/guix.texi:24448 msgid "The example below creates a VM in which the user's home directory is accessible read-only, and where the @file{/exchange} directory is a read-write mapping of @file{$HOME/tmp} on the host:" msgstr "Im folgenden Beispiel wird eine virtuelle Maschine erzeugt, die auf das Persönliche Verzeichnis des Benutzers nur Lesezugriff hat, wo das Verzeichnis @file{/austausch} aber mit Lese- und Schreibzugriff dem Verzeichnis @file{$HOME/tmp} auf dem Wirtssystem zugeordnet wurde:" #. type: example -#: doc/guix.texi:24455 +#: doc/guix.texi:24452 #, no-wrap msgid "" "guix system vm my-config.scm \\\n" @@ -44847,121 +44901,114 @@ msgstr "" " --expose=$HOME --share=$HOME/tmp=/austausch\n" #. type: table -#: doc/guix.texi:24460 +#: doc/guix.texi:24457 msgid "On GNU/Linux, the default is to boot directly to the kernel; this has the advantage of requiring only a very tiny root disk image since the store of the host can then be mounted." msgstr "Für GNU/Linux ist das vorgegebene Verhalten, direkt in den Kernel zu booten, wodurch nur ein sehr winziges „Disk-Image“ (eine Datei mit einem Abbild des Plattenspeichers der virtuellen Maschine) für das Wurzeldateisystem nötig wird, weil der Store des Wirtssystems davon eingebunden werden kann." #. type: table -#: doc/guix.texi:24466 +#: doc/guix.texi:24463 msgid "The @code{--full-boot} option forces a complete boot sequence, starting with the bootloader. This requires more disk space since a root image containing at least the kernel, initrd, and bootloader data files must be created. The @code{--image-size} option can be used to specify the size of the image." msgstr "Mit der Befehlszeilenoption @code{--full-boot} wird erzwungen, einen vollständigen Bootvorgang durchzuführen, angefangen mit dem Bootloader. Dadurch wird mehr Plattenplatz verbraucht, weil dazu ein Disk-Image mindestens mit dem Kernel, initrd und Bootloader-Datendateien erzeugt werden muss. Mit der Befehlszeilenoption @code{--image-size} kann die Größe des Disk-Images angegeben werden." #. type: cindex -#: doc/guix.texi:24467 +#: doc/guix.texi:24464 #, no-wrap msgid "System images, creation in various formats" msgstr "System-Disk-Images, Erstellung in verschiedenen Formaten" #. type: cindex -#: doc/guix.texi:24468 +#: doc/guix.texi:24465 #, no-wrap msgid "Creating system images in various formats" msgstr "Erzeugen von System-Disk-Images in verschiedenen Formaten" #. type: item -#: doc/guix.texi:24469 +#: doc/guix.texi:24466 #, no-wrap msgid "vm-image" msgstr "vm-image" #. type: itemx -#: doc/guix.texi:24470 +#: doc/guix.texi:24467 #, no-wrap msgid "disk-image" msgstr "disk-image" #. type: itemx -#: doc/guix.texi:24471 +#: doc/guix.texi:24468 #, no-wrap msgid "docker-image" msgstr "docker-image" #. type: table -#: doc/guix.texi:24479 +#: doc/guix.texi:24476 msgid "Return a virtual machine, disk image, or Docker image of the operating system declared in @var{file} that stands alone. By default, @command{guix system} estimates the size of the image needed to store the system, but you can use the @option{--image-size} option to specify a value. Docker images are built to contain exactly what they need, so the @option{--image-size} option is ignored in the case of @code{docker-image}." msgstr "Ein eigenständiges Disk-Image für eine virtuelle Maschine, ein allgemeines Disk-Image oder ein Docker-Abbild für das in der @var{Datei} deklarierte Betriebssystem liefern. Das vorgegebene Verhalten von @command{guix system} ist, die Größe des Images zu schätzen, die zum Speichern des Systems benötigt wird, aber Sie können mit der Befehlszeilenoption @option{--image-size} selbst Ihre gewünschte Größe bestimmen. Docker-Abbilder werden aber so erstellt, dass sie gerade nur das enthalten, was für sie nötig ist, daher wird die Befehlszeilenoption @option{--image-size} im Fall von @code{docker-image} ignoriert." #. type: table -#: doc/guix.texi:24482 +#: doc/guix.texi:24479 msgid "You can specify the root file system type by using the @option{--file-system-type} option. It defaults to @code{ext4}." msgstr "Sie können den Dateisystemtyp für das Wurzeldateisystem mit der Befehlszeilenoption @option{--file-system-type} festlegen. Vorgegeben ist, @code{ext4} zu verwenden." #. type: table -#: doc/guix.texi:24486 +#: doc/guix.texi:24483 msgid "When using @code{vm-image}, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running Guix in a VM}, for more information on how to run the image in a virtual machine." msgstr "Wenn Sie ein @code{vm-image} anfordern, ist das gelieferte Disk-Image im qcow2-Format, was vom QEMU-Emulator effizient benutzt werden kann. Im Abschnitt @ref{Running Guix in a VM} finden Sie mehr Informationen, wie Sie das Disk-Image in einer virtuellen Maschine laufen lassen." #. type: table -#: doc/guix.texi:24491 +#: doc/guix.texi:24488 msgid "When using @code{disk-image}, a raw disk image is produced; it can be copied as is to a USB stick, for instance. Assuming @code{/dev/sdc} is the device corresponding to a USB stick, one can copy the image to it using the following command:" msgstr "Wenn Sie ein @code{disk-image} anfordern, wird ein rohes Disk-Image hergestellt; es kann zum Beispiel auf einen USB-Stick kopiert werden. Angenommen @code{/dev/sdc} ist das dem USB-Stick entsprechende Gerät, dann kann das Disk-Image mit dem folgenden Befehls darauf kopiert werden:" #. type: example -#: doc/guix.texi:24494 +#: doc/guix.texi:24491 #, no-wrap msgid "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n" msgstr "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n" #. type: table -#: doc/guix.texi:24501 +#: doc/guix.texi:24498 msgid "When using @code{docker-image}, a Docker image is produced. Guix builds the image from scratch, not from a pre-existing Docker base image. As a result, it contains @emph{exactly} what you define in the operating system configuration file. You can then load the image and launch a Docker container using commands like the following:" msgstr "Wenn Sie ein @code{docker-image} anfordern, wird ein Abbild für Docker hergestellt. Guix erstellt das Abbild von Grund auf und @emph{nicht} aus einem vorerstellten Docker-Basisabbild heraus, daher enthält es @emph{exakt} das, was Sie in der Konfigurationsdatei für das Betriebssystem angegeben haben. Sie können das Abbild dann wie folgt laden und einen Docker-Container damit erzeugen:" #. type: example -#: doc/guix.texi:24506 +#: doc/guix.texi:24504 #, no-wrap msgid "" -"image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" -"container_id=\"`docker create $image_id`\"\n" -"docker start $container_id\n" +"image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" +"docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" +" --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" +" $image_id /var/guix/profiles/system/boot\n" msgstr "" -"image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" -"container_id=\"`docker create $image_id`\"\n" -"docker start $container_id\n" - -#. type: table -#: doc/guix.texi:24513 -msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. You can get an interactive shell running in the container using @command{docker exec}:" -msgstr "Dieser Befehl startet einen neuen Docker-Container aus dem angegebenen Abbild. Damit wird das Guix-System auf die normale Weise hochgefahren, d.h.@: zunächst werden alle Dienste gestartet, die Sie in der Konfiguration des Betriebssystems angegeben haben. Sie können eine interaktive Shell in dieser isolierten Umgebung bekommen, indem Sie @command{docker exec} benutzen:" - -#. type: example -#: doc/guix.texi:24516 -#, no-wrap -msgid "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" -msgstr "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" +"image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" +"docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" +" --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" +" $image_id /var/guix/profiles/system/boot\n" #. type: table -#: doc/guix.texi:24523 -msgid "Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker create}." +#: doc/guix.texi:24514 +#, fuzzy +#| msgid "Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker create}." +msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker run}." msgstr "Je nachdem, was Sie im Docker-Container ausführen, kann es nötig sein, dass Sie ihn mit weitergehenden Berechtigungen ausstatten. Wenn Sie zum Beispiel Software mit Guix innerhalb des Docker-Containers erstellen wollen, müssen Sie an @code{docker create} die Befehlszeilenoption @option{--privileged} übergeben." #. type: table -#: doc/guix.texi:24531 +#: doc/guix.texi:24522 msgid "Return a script to run the operating system declared in @var{file} within a container. Containers are a set of lightweight isolation mechanisms provided by the kernel Linux-libre. Containers are substantially less resource-demanding than full virtual machines since the kernel, shared objects, and other resources can be shared with the host system; this also means they provide thinner isolation." msgstr "Liefert ein Skript, um das in der @var{Datei} deklarierte Betriebssystem in einem Container auszuführen. Mit Container wird hier eine Reihe ressourcenschonender Isolierungsmechanismen im Kernel Linux-libre bezeichnet. Container beanspruchen wesentlich weniger Ressourcen als vollumfängliche virtuelle Maschinen, weil der Kernel, Bibliotheken in gemeinsam nutzbaren Objektdateien („Shared Objects“) sowie andere Ressourcen mit dem Wirtssystem geteilt werden können. Damit ist also eine „dünnere“ Isolierung möglich." #. type: table -#: doc/guix.texi:24535 +#: doc/guix.texi:24526 msgid "Currently, the script must be run as root in order to support more than a single user and group. The container shares its store with the host system." msgstr "Zur Zeit muss das Skript als Administratornutzer „root“ ausgeführt werden, damit darin mehr als nur ein einzelner Benutzer und eine Benutzergruppe unterstützt wird. Der Container teilt seinen Store mit dem Wirtssystem." #. type: table -#: doc/guix.texi:24539 +#: doc/guix.texi:24530 msgid "As with the @code{vm} action (@pxref{guix system vm}), additional file systems to be shared between the host and container can be specified using the @option{--share} and @option{--expose} options:" msgstr "Wie bei der Aktion @code{vm} (siehe @ref{guix system vm}) können zusätzlich weitere Dateisysteme zwischen Wirt und Container geteilt werden, indem man die Befehlszeilenoptionen @option{--share} und @option{--expose} verwendet:" #. type: example -#: doc/guix.texi:24543 +#: doc/guix.texi:24534 #, no-wrap msgid "" "guix system container my-config.scm \\\n" @@ -44971,288 +45018,283 @@ msgstr "" " --expose=$HOME --share=$HOME/tmp=/austausch\n" #. type: quotation -#: doc/guix.texi:24547 +#: doc/guix.texi:24538 msgid "This option requires Linux-libre 3.19 or newer." msgstr "Diese Befehlszeilenoption funktioniert nur mit Linux-libre 3.19 oder neuer." #. type: Plain text -#: doc/guix.texi:24554 +#: doc/guix.texi:24545 msgid "@var{options} can contain any of the common build options (@pxref{Common Build Options}). In addition, @var{options} can contain one of the following:" msgstr "Unter den @var{Optionen} können beliebige gemeinsame Erstellungsoptionen aufgeführt werden (siehe @ref{Common Build Options}). Des Weiteren kann als @var{Optionen} Folgendes angegeben werden:" #. type: table -#: doc/guix.texi:24563 +#: doc/guix.texi:24554 msgid "Consider the operating-system @var{expr} evaluates to. This is an alternative to specifying a file which evaluates to an operating system. This is used to generate the Guix system installer @pxref{Building the Installation Image})." msgstr "Als Konfiguration des Betriebssystems das „operating-system“ betrachten, zu dem der @var{Ausdruck} ausgewertet wird. Dies ist eine Alternative dazu, die Konfiguration in einer Datei festzulegen. Hiermit wird auch das Installationsabbild des Guix-Systems erstellt, siehe @ref{Building the Installation Image})." #. type: table -#: doc/guix.texi:24568 +#: doc/guix.texi:24559 msgid "Attempt to build for @var{system} instead of the host system type. This works as per @command{guix build} (@pxref{Invoking guix build})." msgstr "Versuchen, für das angegebene @var{System} statt für denselben Systemtyp wie auf dem Wirtssystem zu erstellen. Dies funktioniert wie bei @command{guix build} (siehe @ref{Invoking guix build})." #. type: item -#: doc/guix.texi:24569 +#: doc/guix.texi:24560 #, no-wrap msgid "--derivation" msgstr "--derivation" #. type: table -#: doc/guix.texi:24573 +#: doc/guix.texi:24564 msgid "Return the derivation file name of the given operating system without building anything." msgstr "Liefert den Namen der Ableitungsdatei für das angegebene Betriebssystem, ohne dazu etwas zu erstellen." #. type: item -#: doc/guix.texi:24574 +#: doc/guix.texi:24565 #, no-wrap msgid "--file-system-type=@var{type}" msgstr "--file-system-type=@var{Typ}" #. type: table -#: doc/guix.texi:24578 +#: doc/guix.texi:24569 msgid "For the @code{disk-image} action, create a file system of the given @var{type} on the image." msgstr "Für die Aktion @code{disk-image} wird hiermit ein Dateisystem des angegebenen @var{Typ}s im Abbild bzw. Disk-Image erzeugt." #. type: table -#: doc/guix.texi:24580 +#: doc/guix.texi:24571 msgid "When this option is omitted, @command{guix system} uses @code{ext4}." msgstr "Wird diese Befehlszeilenoption nicht angegeben, so benutzt @command{guix system} als Dateisystemtyp @code{ext4}." #. type: cindex -#: doc/guix.texi:24581 +#: doc/guix.texi:24572 #, no-wrap msgid "ISO-9660 format" msgstr "ISO-9660-Format" #. type: cindex -#: doc/guix.texi:24582 +#: doc/guix.texi:24573 #, no-wrap msgid "CD image format" msgstr "CD-Abbild-Format" #. type: cindex -#: doc/guix.texi:24583 +#: doc/guix.texi:24574 #, no-wrap msgid "DVD image format" msgstr "DVD-Abbild-Format" #. type: table -#: doc/guix.texi:24586 +#: doc/guix.texi:24577 msgid "@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for burning on CDs and DVDs." msgstr "@code{--file-system-type=iso9660} erzeugt ein Abbild im Format ISO-9660, was für das Brennen auf CDs und DVDs geeignet ist." #. type: item -#: doc/guix.texi:24587 +#: doc/guix.texi:24578 #, no-wrap msgid "--image-size=@var{size}" msgstr "--image-size=@var{Größe}" #. type: table -#: doc/guix.texi:24592 +#: doc/guix.texi:24583 msgid "For the @code{vm-image} and @code{disk-image} actions, create an image of the given @var{size}. @var{size} may be a number of bytes, or it may include a unit as a suffix (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." msgstr "Für die Aktionen @code{vm-image} und @code{disk-image} wird hiermit festgelegt, dass ein Abbild der angegebenen @var{Größe} erstellt werden soll. Die @var{Größe} kann als Zahl die Anzahl Bytes angeben oder mit einer Einheit als Suffix versehen werden (siehe @ref{Block size, size specifications,, coreutils, GNU Coreutils})." #. type: table -#: doc/guix.texi:24596 +#: doc/guix.texi:24587 msgid "When this option is omitted, @command{guix system} computes an estimate of the image size as a function of the size of the system declared in @var{file}." msgstr "Wird keine solche Befehlszeilenoption angegeben, berechnet @command{guix system} eine Schätzung der Abbildgröße anhand der Größe des in der @var{Datei} deklarierten Systems." -#. type: table -#: doc/guix.texi:24601 -msgid "For the @code{container} action, allow containers to access the host network, that is, do not create a network namespace." -msgstr "Für die Aktion @code{container} dürfen isolierte Umgebungen (auch bekannt als „Container“) auf das Wirtsnetzwerk zugreifen, d.h.@: es wird kein Netzwerknamensraum für sie erzeugt." - #. type: item -#: doc/guix.texi:24607 +#: doc/guix.texi:24593 #, no-wrap msgid "--skip-checks" msgstr "--skip-checks" #. type: table -#: doc/guix.texi:24609 +#: doc/guix.texi:24595 msgid "Skip pre-installation safety checks." msgstr "Die Konfiguration @emph{nicht} vor der Installation zur Sicherheit auf Fehler prüfen." #. type: table -#: doc/guix.texi:24616 +#: doc/guix.texi:24602 msgid "By default, @command{guix system init} and @command{guix system reconfigure} perform safety checks: they make sure the file systems that appear in the @code{operating-system} declaration actually exist (@pxref{File Systems}), and that any Linux kernel modules that may be needed at boot time are listed in @code{initrd-modules} (@pxref{Initial RAM Disk}). Passing this option skips these tests altogether." msgstr "Das vorgegebene Verhalten von @command{guix system init} und @command{guix system reconfigure} sieht vor, die Konfiguration zur Sicherheit auf Fehler hin zu überprüfen, die ihr Autor übersehen haben könnte: Es wird sichergestellt, dass die in der @code{operating-system}-Deklaration erwähnten Dateisysteme tatsächlich existieren (siehe @ref{File Systems}) und dass alle Linux-Kernelmodule, die beim Booten benötigt werden könnten, auch im @code{initrd-modules}-Feld aufgeführt sind (siehe @ref{Initial RAM Disk}). Mit dieser Befehlszeilenoption werden diese Tests allesamt übersprungen." #. type: cindex -#: doc/guix.texi:24617 +#: doc/guix.texi:24603 #, no-wrap msgid "on-error" msgstr "on-error" #. type: cindex -#: doc/guix.texi:24618 +#: doc/guix.texi:24604 #, no-wrap msgid "on-error strategy" msgstr "on-error-Strategie" #. type: cindex -#: doc/guix.texi:24619 +#: doc/guix.texi:24605 #, no-wrap msgid "error strategy" msgstr "Fehlerstrategie" #. type: item -#: doc/guix.texi:24620 +#: doc/guix.texi:24606 #, no-wrap msgid "--on-error=@var{strategy}" msgstr "--on-error=@var{Strategie}" #. type: table -#: doc/guix.texi:24623 +#: doc/guix.texi:24609 msgid "Apply @var{strategy} when an error occurs when reading @var{file}. @var{strategy} may be one of the following:" msgstr "Beim Auftreten eines Fehlers beim Einlesen der @var{Datei} die angegebene @var{Strategie} verfolgen. Als @var{Strategie} dient eine der Folgenden:" #. type: item -#: doc/guix.texi:24625 +#: doc/guix.texi:24611 #, no-wrap msgid "nothing-special" msgstr "nothing-special" #. type: table -#: doc/guix.texi:24627 +#: doc/guix.texi:24613 msgid "Report the error concisely and exit. This is the default strategy." msgstr "Nichts besonderes; der Fehler wird kurz gemeldet und der Vorgang abgebrochen. Dies ist die vorgegebene Strategie." #. type: item -#: doc/guix.texi:24628 +#: doc/guix.texi:24614 #, no-wrap msgid "backtrace" msgstr "backtrace" #. type: table -#: doc/guix.texi:24630 +#: doc/guix.texi:24616 msgid "Likewise, but also display a backtrace." msgstr "Ebenso, aber zusätzlich wird eine Rückverfolgung des Fehlers (ein „Backtrace“) angezeigt." #. type: item -#: doc/guix.texi:24631 +#: doc/guix.texi:24617 #, no-wrap msgid "debug" msgstr "debug" #. type: table -#: doc/guix.texi:24637 +#: doc/guix.texi:24623 msgid "Report the error and enter Guile's debugger. From there, you can run commands such as @code{,bt} to get a backtrace, @code{,locals} to display local variable values, and more generally inspect the state of the program. @xref{Debug Commands,,, guile, GNU Guile Reference Manual}, for a list of available debugging commands." msgstr "Nach dem Melden des Fehlers wird der Debugger von Guile zur Fehlersuche gestartet. Von dort können Sie Befehle ausführen, zum Beispiel können Sie sich mit @code{,bt} eine Rückverfolgung („Backtrace“) anzeigen lassen und mit @code{,locals} die Werte lokaler Variabler anzeigen lassen. Im Allgemeinen können Sie mit Befehlen den Zustand des Programms inspizieren. Siehe @ref{Debug Commands,,, guile, GNU Guile Reference Manual} für eine Liste verfügbarer Befehle zur Fehlersuche." #. type: Plain text -#: doc/guix.texi:24644 +#: doc/guix.texi:24630 msgid "Once you have built, configured, re-configured, and re-re-configured your Guix installation, you may find it useful to list the operating system generations available on disk---and that you can choose from the bootloader boot menu:" msgstr "Sobald Sie Ihre Guix-Installation erstellt, konfiguriert, neu konfiguriert und nochmals neu konfiguriert haben, finden Sie es vielleicht hilfreich, sich die auf der Platte verfügbaren — und im Bootmenü des Bootloaders auswählbaren — Systemgenerationen auflisten zu lassen:" #. type: item -#: doc/guix.texi:24647 +#: doc/guix.texi:24633 #, no-wrap msgid "list-generations" msgstr "list-generations" #. type: table -#: doc/guix.texi:24652 +#: doc/guix.texi:24638 msgid "List a summary of each generation of the operating system available on disk, in a human-readable way. This is similar to the @option{--list-generations} option of @command{guix package} (@pxref{Invoking guix package})." msgstr "Eine für Menschen verständliche Zusammenfassung jeder auf der Platte verfügbaren Generation des Betriebssystems ausgeben. Dies ähnelt der Befehlszeilenoption @option{--list-generations} von @command{guix package} (siehe @ref{Invoking guix package})." #. type: table -#: doc/guix.texi:24657 +#: doc/guix.texi:24643 msgid "Optionally, one can specify a pattern, with the same syntax that is used in @command{guix package --list-generations}, to restrict the list of generations displayed. For instance, the following command displays generations that are up to 10 days old:" msgstr "Optional kann ein Muster angegeben werden, was dieselbe Syntax wie @command{guix package --list-generations} benutzt, um damit die Liste anzuzeigender Generationen einzuschränken. Zum Beispiel zeigt der folgende Befehl Generationen an, die bis zu 10 Tage alt sind:" #. type: example -#: doc/guix.texi:24660 +#: doc/guix.texi:24646 #, no-wrap msgid "$ guix system list-generations 10d\n" msgstr "$ guix system list-generations 10d\n" #. type: Plain text -#: doc/guix.texi:24667 +#: doc/guix.texi:24653 msgid "The @command{guix system} command has even more to offer! The following sub-commands allow you to visualize how your system services relate to each other:" msgstr "Der Befehl @command{guix system} hat sogar noch mehr zu bieten! Mit folgenden Unterbefehlen wird Ihnen visualisiert, wie Ihre Systemdienste voneinander abhängen:" #. type: anchor{#1} -#: doc/guix.texi:24669 +#: doc/guix.texi:24655 msgid "system-extension-graph" msgstr "system-extension-graph" #. type: item -#: doc/guix.texi:24671 +#: doc/guix.texi:24657 #, no-wrap msgid "extension-graph" msgstr "extension-graph" #. type: table -#: doc/guix.texi:24676 +#: doc/guix.texi:24662 msgid "Emit in Dot/Graphviz format to standard output the @dfn{service extension graph} of the operating system defined in @var{file} (@pxref{Service Composition}, for more information on service extensions.)" msgstr "Im Dot-/Graphviz-Format auf die Standardausgabe den @dfn{Diensterweiterungsgraphen} des in der @var{Datei} definierten Betriebssystems ausgeben (siehe @ref{Service Composition} für mehr Informationen zu Diensterweiterungen)." #. type: table -#: doc/guix.texi:24678 +#: doc/guix.texi:24664 msgid "The command:" msgstr "Der Befehl:" #. type: example -#: doc/guix.texi:24681 +#: doc/guix.texi:24667 #, no-wrap msgid "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n" msgstr "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n" #. type: table -#: doc/guix.texi:24684 +#: doc/guix.texi:24670 msgid "produces a PDF file showing the extension relations among services." msgstr "erzeugt eine PDF-Datei, in der die Erweiterungsrelation unter Diensten angezeigt wird." #. type: anchor{#1} -#: doc/guix.texi:24686 +#: doc/guix.texi:24672 msgid "system-shepherd-graph" msgstr "system-shepherd-graph" #. type: item -#: doc/guix.texi:24686 +#: doc/guix.texi:24672 #, no-wrap msgid "shepherd-graph" msgstr "shepherd-graph" #. type: table -#: doc/guix.texi:24691 +#: doc/guix.texi:24677 msgid "Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of shepherd services of the operating system defined in @var{file}. @xref{Shepherd Services}, for more information and for an example graph." msgstr "Im Dot-/Graphviz-Format auf die Standardausgabe den @dfn{Abhängigkeitsgraphen} der Shepherd-Dienste des in der @var{Datei} definierten Betriebssystems ausgeben. Siehe @ref{Shepherd Services} für mehr Informationen sowie einen Beispielgraphen." #. type: section -#: doc/guix.texi:24695 +#: doc/guix.texi:24681 #, no-wrap msgid "Running Guix in a Virtual Machine" msgstr "Guix in einer virtuellen Maschine betreiben" #. type: Plain text -#: doc/guix.texi:24704 +#: doc/guix.texi:24690 msgid "To run Guix in a virtual machine (VM), one can use the pre-built Guix VM image distributed at @url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.x86_64-linux.xz}. This image is a compressed image in QCOW format. You will first need to decompress with @command{xz -d}, and then you can pass it to an emulator such as QEMU (see below for details)." msgstr "Um Guix in einer virtuellen Maschine (VM) auszuführen, können Sie das vorerstellte Guix-VM-Abbild benutzen, das auf @url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.@var{System}.xz} angeboten wird. Das Abbild ist ein komprimiertes Abbild im QCOW-Format. Sie müssen es mit @command{xz -d} dekomprimieren, bevor Sie es an einen Emulator wie QEMU übergeben (siehe unten für Details)." #. type: Plain text -#: doc/guix.texi:24710 +#: doc/guix.texi:24696 msgid "This image boots the Xfce graphical environment and it contains some commonly-used tools. You can install more software in the image by running @command{guix package} in a terminal (@pxref{Invoking guix package}). You can also reconfigure the system based on its initial configuration file available as @file{/etc/config.scm} (@pxref{Using the Configuration System})." msgstr "Dieses Abbild startet eine grafische Xfce-Umgebung und enthält einige oft genutzte Werkzeuge. Sie können im Abbild mehr Software installieren, indem Sie @command{guix package} in einem Terminal ausführen (siehe @ref{Invoking guix package}). Sie können das System im Abbild auch rekonfigurieren, basierend auf seiner anfänglichen Konfigurationsdatei, die als @file{/etc/config.scm} verfügbar ist (siehe @ref{Using the Configuration System})." #. type: Plain text -#: doc/guix.texi:24715 +#: doc/guix.texi:24701 msgid "Instead of using this pre-built image, one can also build their own virtual machine image using @command{guix system vm-image} (@pxref{Invoking guix system}). The returned image is in qcow2 format, which the @uref{https://qemu.org/, QEMU emulator} can efficiently use." msgstr "Statt dieses vorerstellte Abbild zu benutzen, können Sie auch Ihr eigenes Abbild für virtuelle Maschinen erstellen, indem Sie @command{guix system vm-image} benutzen (siehe @ref{Invoking guix system}). Das Abbild wird im qcow2-Format zurückgeliefert, das der @uref{https://qemu.org/, QEMU-Emulator} effizient benutzen kann." #. type: cindex -#: doc/guix.texi:24716 +#: doc/guix.texi:24702 #, no-wrap msgid "QEMU" msgstr "QEMU" #. type: Plain text -#: doc/guix.texi:24723 +#: doc/guix.texi:24709 msgid "If you built your own image, you must copy it out of the store (@pxref{The Store}) and give yourself permission to write to the copy before you can use it. When invoking QEMU, you must choose a system emulator that is suitable for your hardware platform. Here is a minimal QEMU invocation that will boot the result of @command{guix system vm-image} on x86_64 hardware:" msgstr "Wenn Sie Ihr eigenes Abbild erstellen haben lassen, müssen Sie es aus dem Store herauskopieren (siehe @ref{The Store}) und sich darauf Schreibberechtigung geben, um die Kopie benutzen zu können. Wenn Sie QEMU aufrufen, müssen Sie einen Systememulator angeben, der für Ihre Hardware-Plattform passend ist. Hier ist ein minimaler QEMU-Aufruf, der das Ergebnis von @command{guix system vm-image} auf x86_64-Hardware bootet:" #. type: example -#: doc/guix.texi:24730 +#: doc/guix.texi:24716 #, no-wrap msgid "" "$ qemu-system-x86_64 \\\n" @@ -45268,143 +45310,143 @@ msgstr "" " -drive if=none,file=/tmp/qemu-image,id=myhd\n" #. type: Plain text -#: doc/guix.texi:24733 +#: doc/guix.texi:24719 msgid "Here is what each of these options means:" msgstr "Die Bedeutung jeder dieser Befehlszeilenoptionen ist folgende:" #. type: item -#: doc/guix.texi:24735 +#: doc/guix.texi:24721 #, no-wrap msgid "qemu-system-x86_64" msgstr "qemu-system-x86_64" #. type: table -#: doc/guix.texi:24738 +#: doc/guix.texi:24724 msgid "This specifies the hardware platform to emulate. This should match the host." msgstr "Hiermit wird die zu emulierende Hardware-Plattform angegeben. Sie sollte zum Wirtsrechner passen." #. type: item -#: doc/guix.texi:24739 +#: doc/guix.texi:24725 #, no-wrap msgid "-net user" msgstr "-net user" #. type: table -#: doc/guix.texi:24743 +#: doc/guix.texi:24729 msgid "Enable the unprivileged user-mode network stack. The guest OS can access the host but not vice versa. This is the simplest way to get the guest OS online." msgstr "Den als Nutzer ausgeführten Netzwerkstapel („User-Mode Network Stack“) ohne besondere Berechtigungen benutzen. Mit dieser Art von Netzwerkanbindung kann das Gast-Betriebssystem eine Verbindung zum Wirt aufbauen, aber nicht andersherum. Es ist die einfachste Art, das Gast-Betriebssystem mit dem Internet zu verbinden." #. type: item -#: doc/guix.texi:24744 +#: doc/guix.texi:24730 #, no-wrap msgid "-net nic,model=virtio" msgstr "-net nic,model=virtio" #. type: table -#: doc/guix.texi:24749 +#: doc/guix.texi:24735 msgid "You must create a network interface of a given model. If you do not create a NIC, the boot will fail. Assuming your hardware platform is x86_64, you can get a list of available NIC models by running @command{qemu-system-x86_64 -net nic,model=help}." msgstr "Sie müssen ein Modell einer zu emulierenden Netzwerkschnittstelle angeben. Wenn Sie keine Netzwerkkarte (englisch „Network Interface Card“, kurz NIC) erzeugen lassen, wird das Booten fehlschlagen. Falls Ihre Hardware-Plattform x86_64 ist, können Sie eine Liste verfügbarer NIC-Modelle einsehen, indem Sie @command{qemu-system-x86_64 -net nic,model=help} ausführen." #. type: item -#: doc/guix.texi:24750 +#: doc/guix.texi:24736 #, no-wrap msgid "-enable-kvm" msgstr "-enable-kvm" #. type: table -#: doc/guix.texi:24754 +#: doc/guix.texi:24740 msgid "If your system has hardware virtualization extensions, enabling the virtual machine support (KVM) of the Linux kernel will make things run faster." msgstr "Wenn Ihr System über Erweiterungen zur Hardware-Virtualisierung verfügt, beschleunigt es die Dinge, wenn Sie die Virtualisierungsunterstützung „KVM“ des Linux-Kernels benutzen lassen." #. type: item -#: doc/guix.texi:24756 +#: doc/guix.texi:24742 #, no-wrap msgid "-m 1024" msgstr "-m 1024" #. type: table -#: doc/guix.texi:24759 +#: doc/guix.texi:24745 msgid "RAM available to the guest OS, in mebibytes. Defaults to 128@tie{}MiB, which may be insufficient for some operations." msgstr "Die Menge an Arbeitsspeicher (RAM), die dem Gastbetriebssystem zur Verfügung stehen soll, in Mebibytes. Vorgegeben wären 128@tie{}MiB, was für einige Operationen zu wenig sein könnte." #. type: item -#: doc/guix.texi:24760 +#: doc/guix.texi:24746 #, no-wrap msgid "-device virtio-blk,drive=myhd" msgstr "-device virtio-blk,drive=myhd" #. type: table -#: doc/guix.texi:24765 +#: doc/guix.texi:24751 msgid "Create a @code{virtio-blk} drive called ``myhd''. @code{virtio-blk} is a ``paravirtualization'' mechanism for block devices that allows QEMU to achieve better performance than if it were emulating a complete disk drive. See the QEMU and KVM documentation for more info." msgstr "Ein @code{virtio-blk}-Laufwerk namens „myhd“ erzeugen. @code{virtio-blk} ist ein Mechanismus zur „Paravirtualisierung“ von Blockgeräten, wodurch QEMU diese effizienter benutzen kann, als wenn es ein Laufwerk vollständig emulieren würde. Siehe die Dokumentation von QEMU und KVM für mehr Informationen." #. type: item -#: doc/guix.texi:24766 +#: doc/guix.texi:24752 #, no-wrap msgid "-drive if=none,file=/tmp/qemu-image,id=myhd" msgstr "-drive if=none,file=/tmp/qemu-image,id=myhd" #. type: table -#: doc/guix.texi:24769 +#: doc/guix.texi:24755 msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store the the ``myhd'' drive." msgstr "Unser QCOW-Abbild in der Datei @file{/tmp/qemu-image} soll als Inhalt des „myhd“-Laufwerks herhalten." #. type: Plain text -#: doc/guix.texi:24779 +#: doc/guix.texi:24765 msgid "The default @command{run-vm.sh} script that is returned by an invocation of @command{guix system vm} does not add a @command{-net user} flag by default. To get network access from within the vm add the @code{(dhcp-client-service)} to your system definition and start the VM using @command{`guix system vm config.scm` -net user}. An important caveat of using @command{-net user} for networking is that @command{ping} will not work, because it uses the ICMP protocol. You'll have to use a different command to check for network connectivity, for example @command{guix download}." msgstr "Das voreingestellte @command{run-vm.sh}-Skript, das durch einen Aufruf von @command{guix system vm} erzeugt wird, fügt keine Befehlszeilenoption @command{-net user} an. Um innerhalb der virtuellen Maschine Netzwerkzugang zu haben, fügen Sie den @code{(dhcp-client-service)} zu Ihrer Systemdefinition hinzu und starten Sie die VM mit @command{`guix system vm config.scm` -net user}. Erwähnt werden sollte der Nachteil, dass bei Verwendung von @command{-net user} zur Netzanbindung der @command{ping}-Befehl @emph{nicht} funktionieren wird, weil dieser das ICMP-Protokoll braucht. Sie werden also einen anderen Befehl benutzen müssen, um auszuprobieren, ob Sie mit dem Netzwerk verbunden sind, zum Beispiel @command{guix download}." #. type: subsection -#: doc/guix.texi:24780 +#: doc/guix.texi:24766 #, no-wrap msgid "Connecting Through SSH" msgstr "Verbinden über SSH" #. type: Plain text -#: doc/guix.texi:24788 +#: doc/guix.texi:24774 msgid "To enable SSH inside a VM you need to add an SSH server like @code{openssh-service-type} to your VM (@pxref{Networking Services, @code{openssh-service-type}}). In addition you need to forward the SSH port, 22 by default, to the host. You can do this with" msgstr "Um SSH in der virtuellen Maschine zu aktivieren, müssen Sie einen SSH-Server wie @code{openssh-service-type} zu ihr hinzufügen (siehe @ref{Networking Services, @code{openssh-service-type}}). Des Weiteren müssen Sie den SSH-Port für das Wirtssystem freigeben (standardmäßig hat er die Portnummer 22). Das geht zum Beispiel so:" #. type: example -#: doc/guix.texi:24791 +#: doc/guix.texi:24777 #, no-wrap msgid "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n" msgstr "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n" #. type: Plain text -#: doc/guix.texi:24794 +#: doc/guix.texi:24780 msgid "To connect to the VM you can run" msgstr "Um sich mit der virtuellen Maschine zu verbinden, benutzen Sie diesen Befehl:" #. type: example -#: doc/guix.texi:24797 +#: doc/guix.texi:24783 #, no-wrap msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n" msgstr "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n" #. type: Plain text -#: doc/guix.texi:24804 +#: doc/guix.texi:24790 msgid "The @command{-p} tells @command{ssh} the port you want to connect to. @command{-o UserKnownHostsFile=/dev/null} prevents @command{ssh} from complaining every time you modify your @command{config.scm} file and the @command{-o StrictHostKeyChecking=no} prevents you from having to allow a connection to an unknown host every time you connect." msgstr "Mit @command{-p} wird @command{ssh} der Port mitgeteilt, über den eine Verbindung hergestellt werden soll. @command{-o UserKnownHostsFile=/dev/null} verhindert, dass @command{ssh} sich bei jeder Modifikation Ihrer @command{config.scm}-Datei beschwert, ein anderer bekannter Rechner sei erwartet worden, und @command{-o StrictHostKeyChecking=no} verhindert, dass Sie die Verbindung zu unbekannten Rechnern jedes Mal bestätigen müssen, wenn Sie sich verbinden." #. type: subsection -#: doc/guix.texi:24805 +#: doc/guix.texi:24791 #, no-wrap msgid "Using @command{virt-viewer} with Spice" msgstr "@command{virt-viewer} mit Spice benutzen" #. type: Plain text -#: doc/guix.texi:24811 +#: doc/guix.texi:24797 msgid "As an alternative to the default @command{qemu} graphical client you can use the @command{remote-viewer} from the @command{virt-viewer} package. To connect pass the @command{-spice port=5930,disable-ticketing} flag to @command{qemu}. See previous section for further information on how to do this." msgstr "Eine Alternative zur grafischen Schnittstelle des standardmäßigen @command{qemu} ist, sich mit Hilfe des @command{remote-viewer} aus dem Paket @command{virt-viewer} zu verbinden. Um eine Verbindung herzustellen, übergeben Sie die Befehlszeilenoption @command{-spice port=5930,disable-ticketing} an @command{qemu}. Siehe den vorherigen Abschnitt für weitere Informationen, wie Sie das übergeben." #. type: Plain text -#: doc/guix.texi:24814 +#: doc/guix.texi:24800 msgid "Spice also allows you to do some nice stuff like share your clipboard with your VM. To enable that you'll also have to pass the following flags to @command{qemu}:" msgstr "Spice macht es auch möglich, ein paar nette Hilfestellungen zu benutzen, zum Beispiel können Sie Ihren Zwischenspeicher zum Kopieren und Einfügen (Ihr „Clipboard“) mit Ihrer virtuellen Maschine teilen. Um das zu aktivieren, werden Sie die folgenden Befehlszeilennoptionen zusätzlich an @command{qemu} übergeben müssen:" #. type: example -#: doc/guix.texi:24820 +#: doc/guix.texi:24806 #, no-wrap msgid "" "-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n" @@ -45418,81 +45460,81 @@ msgstr "" "name=com.redhat.spice.0\n" #. type: Plain text -#: doc/guix.texi:24823 +#: doc/guix.texi:24809 msgid "You'll also need to add the @pxref{Miscellaneous Services, Spice service}." msgstr "Sie werden auch den @ref{Miscellaneous Services, Spice-Dienst} hinzufügen müssen." #. type: Plain text -#: doc/guix.texi:24830 +#: doc/guix.texi:24816 msgid "The previous sections show the available services and how one can combine them in an @code{operating-system} declaration. But how do we define them in the first place? And what is a service anyway?" msgstr "Der vorhergehende Abschnitt präsentiert die verfügbaren Dienste und wie man sie in einer @code{operating-system}-Deklaration kombiniert. Aber wie definieren wir solche Dienste eigentlich? Und was ist überhaupt ein Dienst?" #. type: cindex -#: doc/guix.texi:24842 +#: doc/guix.texi:24828 #, no-wrap msgid "daemons" msgstr "Daemons" #. type: Plain text -#: doc/guix.texi:24855 +#: doc/guix.texi:24841 msgid "Here we define a @dfn{service} as, broadly, something that extends the functionality of the operating system. Often a service is a process---a @dfn{daemon}---started when the system boots: a secure shell server, a Web server, the Guix build daemon, etc. Sometimes a service is a daemon whose execution can be triggered by another daemon---e.g., an FTP server started by @command{inetd} or a D-Bus service activated by @command{dbus-daemon}. Occasionally, a service does not map to a daemon. For instance, the ``account'' service collects user accounts and makes sure they exist when the system runs; the ``udev'' service collects device management rules and makes them available to the eudev daemon; the @file{/etc} service populates the @file{/etc} directory of the system." msgstr "Wir definieren hier einen @dfn{Dienst} (englisch „Service“) als, grob gesagt, etwas, das die Funktionalität des Betriebssystems erweitert. Oft ist ein Dienst ein Prozess — ein sogenannter @dfn{Daemon} —, der beim Hochfahren des Systems gestartet wird: ein Secure-Shell-Server, ein Web-Server, der Guix-Erstellungsdaemon usw. Manchmal ist ein Dienst ein Daemon, dessen Ausführung von einem anderen Daemon ausgelöst wird — zum Beispiel wird ein FTP-Server von @command{inetd} gestartet oder ein D-Bus-Dienst durch @command{dbus-daemon} aktiviert. Manchmal entspricht ein Dienst aber auch keinem Daemon. Zum Beispiel nimmt sich der Benutzerkonten-Dienst („account service“) die Benutzerkonten und sorgt dafür, dass sie existieren, wenn das System läuft. Der „udev“-Dienst sammelt die Regeln zur Geräteverwaltung an und macht diese für den eudev-Daemon verfügbar. Der @file{/etc}-Dienst fügt Dateien in das Verzeichnis @file{/etc} des Systems ein." #. type: cindex -#: doc/guix.texi:24856 +#: doc/guix.texi:24842 #, no-wrap msgid "service extensions" msgstr "Diensterweiterungen" #. type: Plain text -#: doc/guix.texi:24868 +#: doc/guix.texi:24854 msgid "Guix system services are connected by @dfn{extensions}. For instance, the secure shell service @emph{extends} the Shepherd---the initialization system, running as PID@tie{}1---by giving it the command lines to start and stop the secure shell daemon (@pxref{Networking Services, @code{openssh-service-type}}); the UPower service extends the D-Bus service by passing it its @file{.service} specification, and extends the udev service by passing it device management rules (@pxref{Desktop Services, @code{upower-service}}); the Guix daemon service extends the Shepherd by passing it the command lines to start and stop the daemon, and extends the account service by passing it a list of required build user accounts (@pxref{Base Services})." msgstr "Dienste des Guix-Systems werden durch @dfn{Erweiterungen} („Extensions“) miteinander verbunden. Zum Beispiel @emph{erweitert} der Secure-Shell-Dienst den Shepherd — Shepherd ist das Initialisierungssystem (auch „init“-System genannt), was als PID@tie{}1 läuft —, indem es ihm die Befehlszeilen zum Starten und Stoppen des Secure-Shell-Daemons übergibt (siehe @ref{Networking Services, @code{openssh-service-type}}). Der UPower-Dienst erweitert den D-Bus-Dienst, indem es ihm seine @file{.service}-Spezifikation übergibt, und erweitert den udev-Dienst, indem es ihm Geräteverwaltungsregeln übergibt (siehe @ref{Desktop Services, @code{upower-service}}). Der Guix-Daemon-Dienst erweitert den Shepherd, indem er ihm die Befehlszeilen zum Starten und Stoppen des Daemons übergibt, und er erweitert den Benutzerkontendienst („account service“), indem er ihm eine Liste der benötigten Erstellungsbenutzerkonten übergibt (siehe @ref{Base Services})." #. type: Plain text -#: doc/guix.texi:24872 +#: doc/guix.texi:24858 msgid "All in all, services and their ``extends'' relations form a directed acyclic graph (DAG). If we represent services as boxes and extensions as arrows, a typical system might provide something like this:" msgstr "Alles in allem bilden Dienste und ihre „Erweitert“-Relationen einen gerichteten azyklischen Graphen (englisch „Directed Acyclic Graph“, kurz DAG). Wenn wir Dienste als Kästen und Erweiterungen als Pfeile darstellen, könnte ein typisches System so etwas hier anbieten:" #. type: Plain text -#: doc/guix.texi:24874 +#: doc/guix.texi:24860 msgid "@image{images/service-graph,,5in,Typical service extension graph.}" msgstr "@image{images/service-graph,,5in,Typischer Diensterweiterungsgraph}" #. type: cindex -#: doc/guix.texi:24875 +#: doc/guix.texi:24861 #, no-wrap msgid "system service" msgstr "Systemdienst" #. type: Plain text -#: doc/guix.texi:24883 +#: doc/guix.texi:24869 msgid "At the bottom, we see the @dfn{system service}, which produces the directory containing everything to run and boot the system, as returned by the @command{guix system build} command. @xref{Service Reference}, to learn about the other service types shown here. @xref{system-extension-graph, the @command{guix system extension-graph} command}, for information on how to generate this representation for a particular operating system definition." msgstr "Ganz unten sehen wir den @dfn{Systemdienst}, der das Verzeichnis erzeugt, in dem alles zum Ausführen und Hochfahren enthalten ist, so wie es der Befehl @command{guix system build} liefert. Siehe @ref{Service Reference}, um mehr über die anderen hier gezeigten Diensttypen zu erfahren. Beim @ref{system-extension-graph, Befehl @command{guix system extension-graph}} finden Sie Informationen darüber, wie Sie diese Darstellung für eine Betriebssystemdefinition Ihrer Wahl generieren lassen." #. type: cindex -#: doc/guix.texi:24884 +#: doc/guix.texi:24870 #, no-wrap msgid "service types" msgstr "Diensttypen" #. type: Plain text -#: doc/guix.texi:24890 +#: doc/guix.texi:24876 msgid "Technically, developers can define @dfn{service types} to express these relations. There can be any number of services of a given type on the system---for instance, a system running two instances of the GNU secure shell server (lsh) has two instances of @code{lsh-service-type}, with different parameters." msgstr "Technisch funktioniert es so, dass Entwickler @dfn{Diensttypen} definieren können, um diese Beziehungen auszudrücken. Im System kann es beliebig viele Dienste zu jedem Typ geben — zum Beispiel können auf einem System zwei Instanzen des GNU-Secure-Shell-Servers (lsh) laufen, mit zwei Instanzen des Diensttyps @code{lsh-service-type} mit je unterschiedlichen Parametern." #. type: Plain text -#: doc/guix.texi:24893 +#: doc/guix.texi:24879 msgid "The following section describes the programming interface for service types and services." msgstr "Der folgende Abschnitt beschreibt die Programmierschnittstelle für Diensttypen und Dienste." #. type: Plain text -#: doc/guix.texi:24900 +#: doc/guix.texi:24886 msgid "A @dfn{service type} is a node in the DAG described above. Let us start with a simple example, the service type for the Guix build daemon (@pxref{Invoking guix-daemon}):" msgstr "Ein @dfn{Diensttyp} („service type“) ist ein Knoten im oben beschriebenen ungerichteten azyklischen Graphen (DAG). Fangen wir an mit einem einfachen Beispiel: dem Diensttyp für den Guix-Erstellungsdaemon (siehe @ref{Invoking guix-daemon}):" #. type: example -#: doc/guix.texi:24910 +#: doc/guix.texi:24896 #, no-wrap msgid "" "(define guix-service-type\n" @@ -45514,75 +45556,75 @@ msgstr "" " (default-value (guix-configuration))))\n" #. type: Plain text -#: doc/guix.texi:24914 +#: doc/guix.texi:24900 msgid "It defines three things:" msgstr "Damit sind drei Dinge definiert:" #. type: enumerate -#: doc/guix.texi:24918 +#: doc/guix.texi:24904 msgid "A name, whose sole purpose is to make inspection and debugging easier." msgstr "Ein Name, der nur dazu da ist, dass man leichter die Abläufe verstehen und Fehler suchen kann." #. type: enumerate -#: doc/guix.texi:24923 +#: doc/guix.texi:24909 msgid "A list of @dfn{service extensions}, where each extension designates the target service type and a procedure that, given the parameters of the service, returns a list of objects to extend the service of that type." msgstr "Eine Liste von @dfn{Diensterweiterungen} („service extensions“). Jede Erweiterung gibt den Ziel-Diensttyp an sowie eine Prozedur, die für gegebene Parameter für den Dienst eine Liste von Objekten zurückliefert, um den Dienst dieses Typs zu erweitern." #. type: enumerate -#: doc/guix.texi:24926 +#: doc/guix.texi:24912 msgid "Every service type has at least one service extension. The only exception is the @dfn{boot service type}, which is the ultimate service." msgstr "Jeder Diensttyp benutzt mindestens eine Diensterweiterung. Die einzige Ausnahme ist der @dfn{boot service type}, der die Grundlage aller Dienste ist." #. type: enumerate -#: doc/guix.texi:24929 +#: doc/guix.texi:24915 msgid "Optionally, a default value for instances of this type." msgstr "Optional kann ein Vorgabewert für Instanzen dieses Typs angegeben werden." #. type: Plain text -#: doc/guix.texi:24932 +#: doc/guix.texi:24918 msgid "In this example, @code{guix-service-type} extends three services:" msgstr "In diesem Beispiel werden durch @code{guix-service-type} drei Dienste erweitert:" #. type: item -#: doc/guix.texi:24934 +#: doc/guix.texi:24920 #, no-wrap msgid "shepherd-root-service-type" msgstr "shepherd-root-service-type" #. type: table -#: doc/guix.texi:24939 +#: doc/guix.texi:24925 msgid "The @code{guix-shepherd-service} procedure defines how the Shepherd service is extended. Namely, it returns a @code{} object that defines how @command{guix-daemon} is started and stopped (@pxref{Shepherd Services})." msgstr "Die Prozedur @code{guix-shepherd-service} definiert, wie der Shepherd-Dienst erweitert wird, und zwar liefert sie ein @code{}-Objekt, womit definiert wird, wie der @command{guix-daemon} gestartet und gestoppt werden kann (siehe @ref{Shepherd Services})." #. type: item -#: doc/guix.texi:24940 +#: doc/guix.texi:24926 #, no-wrap msgid "account-service-type" msgstr "account-service-type" #. type: table -#: doc/guix.texi:24945 +#: doc/guix.texi:24931 msgid "This extension for this service is computed by @code{guix-accounts}, which returns a list of @code{user-group} and @code{user-account} objects representing the build user accounts (@pxref{Invoking guix-daemon})." msgstr "Diese Erweiterung des Dienstes wird durch @code{guix-accounts} berechnet, eine Prozedur, die eine Liste von @code{user-group}- und @code{user-account}-Objekten liefert, die die Erstellungsbenutzerkonten repräsentieren (siehe @ref{Invoking guix-daemon})." #. type: item -#: doc/guix.texi:24946 +#: doc/guix.texi:24932 #, no-wrap msgid "activation-service-type" msgstr "activation-service-type" #. type: table -#: doc/guix.texi:24950 +#: doc/guix.texi:24936 msgid "Here @code{guix-activation} is a procedure that returns a gexp, which is a code snippet to run at ``activation time''---e.g., when the service is booted." msgstr "Hier ist @code{guix-activation} eine Prozedur, die einen G-Ausdruck liefert. Dieser ist ein Code-Schnipsel, das zur „Aktivierungszeit“ ausgeführt werden soll — z.B.@: wenn der Dienst hochgefahren wird." #. type: Plain text -#: doc/guix.texi:24953 +#: doc/guix.texi:24939 msgid "A service of this type is instantiated like this:" msgstr "Ein Dienst dieses Typs wird dann so instanziiert:" #. type: example -#: doc/guix.texi:24959 +#: doc/guix.texi:24945 #, no-wrap msgid "" "(service guix-service-type\n" @@ -45596,28 +45638,28 @@ msgstr "" " (use-substitutes? #f)))\n" #. type: Plain text -#: doc/guix.texi:24967 +#: doc/guix.texi:24953 msgid "The second argument to the @code{service} form is a value representing the parameters of this specific service instance. @xref{guix-configuration-type, @code{guix-configuration}}, for information about the @code{guix-configuration} data type. When the value is omitted, the default value specified by @code{guix-service-type} is used:" msgstr "Das zweite Argument an die @code{service}-Form ist ein Wert, der die Parameter dieser bestimmten Dienstinstanz repräsentiert. Siehe @ref{guix-configuration-type, @code{guix-configuration}} für Informationen über den @code{guix-configuration}-Datentyp. Wird kein Wert angegeben, wird die Vorgabe verwendet, die im @code{guix-service-type} angegeben wurde:" #. type: example -#: doc/guix.texi:24970 +#: doc/guix.texi:24956 #, no-wrap msgid "(service guix-service-type)\n" msgstr "(service guix-service-type)\n" #. type: Plain text -#: doc/guix.texi:24974 +#: doc/guix.texi:24960 msgid "@code{guix-service-type} is quite simple because it extends other services but is not extensible itself." msgstr "@code{guix-service-type} ist ziemlich einfach, weil es andere Dienste erweitert, aber selbst nicht erweitert werden kann." #. type: Plain text -#: doc/guix.texi:24978 +#: doc/guix.texi:24964 msgid "The service type for an @emph{extensible} service looks like this:" msgstr "Der Diensttyp eines @emph{erweiterbaren} Dienstes sieht ungefähr so aus:" #. type: example -#: doc/guix.texi:24985 +#: doc/guix.texi:24971 #, no-wrap msgid "" "(define udev-service-type\n" @@ -45635,7 +45677,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24993 +#: doc/guix.texi:24979 #, no-wrap msgid "" " (compose concatenate) ;concatenate the list of rules\n" @@ -45655,96 +45697,96 @@ msgstr "" " (rules (append initial-rules rules)))))))))\n" #. type: Plain text -#: doc/guix.texi:24999 +#: doc/guix.texi:24985 msgid "This is the service type for the @uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device management daemon}. Compared to the previous example, in addition to an extension of @code{shepherd-root-service-type}, we see two new fields:" msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gentoo.org/wiki/Project:Eudev, Geräteverwaltungsdaemon eudev}. Verglichen mit dem vorherigen Beispiel sehen wir neben einer Erweiterung des @code{shepherd-root-service-type} auch zwei neue Felder." #. type: item -#: doc/guix.texi:25001 +#: doc/guix.texi:24987 #, no-wrap msgid "compose" msgstr "compose" #. type: table -#: doc/guix.texi:25004 +#: doc/guix.texi:24990 msgid "This is the procedure to @dfn{compose} the list of extensions to services of this type." msgstr "Die Prozedur, um die Liste der jeweiligen Erweiterungen für den Dienst dieses Typs zu einem Objekt zusammenzustellen (zu „komponieren“, englisch @dfn{compose})." #. type: table -#: doc/guix.texi:25007 +#: doc/guix.texi:24993 msgid "Services can extend the udev service by passing it lists of rules; we compose those extensions simply by concatenating them." msgstr "Dienste können den udev-Dienst erweitern, indem sie eine Liste von Regeln („Rules“) an ihn übergeben; wir komponieren mehrere solche Erweiterungen, indem wir die Listen einfach zusammenfügen." #. type: item -#: doc/guix.texi:25008 +#: doc/guix.texi:24994 #, no-wrap msgid "extend" msgstr "extend" #. type: table -#: doc/guix.texi:25011 +#: doc/guix.texi:24997 msgid "This procedure defines how the value of the service is @dfn{extended} with the composition of the extensions." msgstr "Diese Prozedur definiert, wie der Wert des Dienstes um die Komposition mit Erweiterungen erweitert („extended“) werden kann." #. type: table -#: doc/guix.texi:25016 +#: doc/guix.texi:25002 msgid "Udev extensions are composed into a list of rules, but the udev service value is itself a @code{} record. So here, we extend that record by appending the list of rules it contains to the list of contributed rules." msgstr "Udev-Erweiterungen werden zu einer einzigen Liste von Regeln komponiert, aber der Wert des udev-Dienstes ist ein @code{}-Verbundsobjekt. Deshalb erweitern wir diesen Verbund, indem wir die Liste der von Erweiterungen beigetragenen Regeln an die im Verbund gespeicherte Liste der Regeln anhängen." #. type: table -#: doc/guix.texi:25022 +#: doc/guix.texi:25008 msgid "This is a string giving an overview of the service type. The string can contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}). The @command{guix system search} command searches these strings and displays them (@pxref{Invoking guix system})." msgstr "Diese Zeichenkette gibt einen Überblick über den Systemtyp. Die Zeichenkette darf mit Texinfo ausgezeichnet werden (siehe @ref{Overview,,, texinfo, GNU Texinfo}). Der Befehl @command{guix system search} durchsucht diese Zeichenketten und zeigt sie an (siehe @ref{Invoking guix system})." #. type: Plain text -#: doc/guix.texi:25027 +#: doc/guix.texi:25013 msgid "There can be only one instance of an extensible service type such as @code{udev-service-type}. If there were more, the @code{service-extension} specifications would be ambiguous." msgstr "Es kann nur eine Instanz eines erweiterbaren Diensttyps wie @code{udev-service-type} geben. Wenn es mehrere gäbe, wäre es mehrdeutig, welcher Dienst durch die @code{service-extension} erweitert werden soll." #. type: Plain text -#: doc/guix.texi:25030 +#: doc/guix.texi:25016 msgid "Still here? The next section provides a reference of the programming interface for services." msgstr "Sind Sie noch da? Der nächste Abschnitt gibt Ihnen eine Referenz der Programmierschnittstelle für Dienste." #. type: Plain text -#: doc/guix.texi:25038 +#: doc/guix.texi:25024 msgid "We have seen an overview of service types (@pxref{Service Types and Services}). This section provides a reference on how to manipulate services and service types. This interface is provided by the @code{(gnu services)} module." msgstr "Wir haben bereits einen Überblick über Diensttypen gesehen (siehe @ref{Service Types and Services}). Dieser Abschnitt hier stellt eine Referenz dar, wie Dienste und Diensttypen manipuliert werden können. Diese Schnittstelle wird vom Modul @code{(gnu services)} angeboten." #. type: deffn -#: doc/guix.texi:25039 +#: doc/guix.texi:25025 #, no-wrap msgid "{Scheme Procedure} service @var{type} [@var{value}]" msgstr "{Scheme-Prozedur} service @var{Typ} [@var{Wert}]" #. type: deffn -#: doc/guix.texi:25043 +#: doc/guix.texi:25029 msgid "Return a new service of @var{type}, a @code{} object (see below.) @var{value} can be any object; it represents the parameters of this particular service instance." msgstr "Liefert einen neuen Dienst des angegebenen @var{Typ}s. Der @var{Typ} muss als @code{}-Objekt angegeben werden (siehe unten). Als @var{Wert} kann ein beliebiges Objekt angegeben werden, das die Parameter dieser bestimmten Instanz dieses Dienstes repräsentiert." #. type: deffn -#: doc/guix.texi:25047 +#: doc/guix.texi:25033 msgid "When @var{value} is omitted, the default value specified by @var{type} is used; if @var{type} does not specify a default value, an error is raised." msgstr "Wenn kein @var{Wert} angegeben wird, wird der vom @var{Typ} festgelegte Vorgabewert verwendet; verfügt der @var{Typ} über keinen Vorgabewert, dann wird ein Fehler gemeldet." #. type: deffn -#: doc/guix.texi:25049 +#: doc/guix.texi:25035 msgid "For instance, this:" msgstr "Zum Beispiel bewirken Sie hiermit:" #. type: example -#: doc/guix.texi:25052 +#: doc/guix.texi:25038 #, no-wrap msgid "(service openssh-service-type)\n" msgstr "(service openssh-service-type)\n" #. type: deffn -#: doc/guix.texi:25056 +#: doc/guix.texi:25042 msgid "is equivalent to this:" msgstr "dasselbe wie mit:" #. type: example -#: doc/guix.texi:25060 +#: doc/guix.texi:25046 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -45754,50 +45796,50 @@ msgstr "" " (openssh-configuration))\n" #. type: deffn -#: doc/guix.texi:25064 +#: doc/guix.texi:25050 msgid "In both cases the result is an instance of @code{openssh-service-type} with the default configuration." msgstr "In beiden Fällen ist das Ergebnis eine Instanz von @code{openssh-service-type} mit der vorgegebenen Konfiguration." #. type: deffn -#: doc/guix.texi:25066 +#: doc/guix.texi:25052 #, no-wrap msgid "{Scheme Procedure} service? @var{obj}" msgstr "{Scheme-Prozedur} service? @var{Objekt}" #. type: deffn -#: doc/guix.texi:25068 +#: doc/guix.texi:25054 msgid "Return true if @var{obj} is a service." msgstr "Liefert wahr zurück, wenn das @var{Objekt} ein Dienst ist." #. type: deffn -#: doc/guix.texi:25070 +#: doc/guix.texi:25056 #, no-wrap msgid "{Scheme Procedure} service-kind @var{service}" msgstr "{Scheme-Prozedur} service-kind @var{Dienst}" #. type: deffn -#: doc/guix.texi:25072 +#: doc/guix.texi:25058 msgid "Return the type of @var{service}---i.e., a @code{} object." msgstr "Liefert den Typ des @var{Dienst}es — d.h.@: ein @code{}-Objekt." #. type: deffn -#: doc/guix.texi:25074 +#: doc/guix.texi:25060 #, no-wrap msgid "{Scheme Procedure} service-value @var{service}" msgstr "{Scheme-Prozedur} service-value @var{Dienst}" #. type: deffn -#: doc/guix.texi:25077 +#: doc/guix.texi:25063 msgid "Return the value associated with @var{service}. It represents its parameters." msgstr "Liefert den Wert, der mit dem @var{Dienst} assoziiert wurde. Er repräsentiert die Parameter des @var{Dienst}es." #. type: Plain text -#: doc/guix.texi:25080 +#: doc/guix.texi:25066 msgid "Here is an example of how a service is created and manipulated:" msgstr "Hier ist ein Beispiel, wie ein Dienst erzeugt und manipuliert werden kann:" #. type: example -#: doc/guix.texi:25089 +#: doc/guix.texi:25075 #, no-wrap msgid "" "(define s\n" @@ -45819,7 +45861,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:25092 +#: doc/guix.texi:25078 #, no-wrap msgid "" "(service? s)\n" @@ -45831,7 +45873,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:25095 +#: doc/guix.texi:25081 #, no-wrap msgid "" "(eq? (service-kind s) nginx-service-type)\n" @@ -45841,167 +45883,167 @@ msgstr "" "@result{} #t\n" #. type: Plain text -#: doc/guix.texi:25105 +#: doc/guix.texi:25091 msgid "The @code{modify-services} form provides a handy way to change the parameters of some of the services of a list such as @code{%base-services} (@pxref{Base Services, @code{%base-services}}). It evaluates to a list of services. Of course, you could always use standard list combinators such as @code{map} and @code{fold} to do that (@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual}); @code{modify-services} simply provides a more concise form for this common pattern." msgstr "Die Form @code{modify-services} ist eine nützliche Methode, die Parameter von einigen der Dienste aus einer Liste wie @code{%base-services} abzuändern (siehe @ref{Base Services, @code{%base-services}}). Sie wird zu einer Liste von Diensten ausgewertet. Natürlich können Sie dazu auch die üblichen Listenkombinatoren wie @code{map} und @code{fold} benutzen (siehe @ref{SRFI-1, List Library,, guile, GNU Guile Reference Manual}), @code{modify-services} soll dieses häufig benutzte Muster lediglich durch eine knappere Syntax unterstützen." #. type: deffn -#: doc/guix.texi:25106 +#: doc/guix.texi:25092 #, no-wrap msgid "{Scheme Syntax} modify-services @var{services} @" msgstr "{Scheme-Syntax} modify-services @var{Dienste} @" #. type: deffn -#: doc/guix.texi:25108 +#: doc/guix.texi:25094 msgid "(@var{type} @var{variable} => @var{body}) @dots{}" msgstr "(@var{Typ} @var{Variable} => @var{Rumpf}) …" #. type: deffn -#: doc/guix.texi:25111 +#: doc/guix.texi:25097 msgid "Modify the services listed in @var{services} according to the given clauses. Each clause has the form:" msgstr "Passt die von @var{Dienste} bezeichnete Dienst-Liste entsprechend den angegebenen Klauseln an. Jede Klausel hat die Form:" #. type: example -#: doc/guix.texi:25114 +#: doc/guix.texi:25100 #, no-wrap msgid "(@var{type} @var{variable} => @var{body})\n" msgstr "(@var{Typ} @var{Variable} => @var{Rumpf})\n" #. type: deffn -#: doc/guix.texi:25121 +#: doc/guix.texi:25107 msgid "where @var{type} is a service type---e.g., @code{guix-service-type}---and @var{variable} is an identifier that is bound within the @var{body} to the service parameters---e.g., a @code{guix-configuration} instance---of the original service of that @var{type}." msgstr "wobei @var{Typ} einen Diensttyp („service type“) bezeichnet — wie zum Beispiel @code{guix-service-type} — und @var{Variable} ein Bezeichner ist, der im @var{Rumpf} an die Dienst-Parameter — z.B.@: eine @code{guix-configuration}-Instanz — des ursprünglichen Dienstes mit diesem @var{Typ} gebunden wird." #. type: deffn -#: doc/guix.texi:25128 +#: doc/guix.texi:25114 msgid "The @var{body} should evaluate to the new service parameters, which will be used to configure the new service. This new service will replace the original in the resulting list. Because a service's service parameters are created using @code{define-record-type*}, you can write a succinct @var{body} that evaluates to the new service parameters by using the @code{inherit} feature that @code{define-record-type*} provides." msgstr "Der @var{Rumpf} muss zu den neuen Dienst-Parametern ausgewertet werden, welche benutzt werden, um den neuen Dienst zu konfigurieren. Dieser neue Dienst wird das Original in der resultierenden Liste ersetzen. Weil die Dienstparameter eines Dienstes mit @code{define-record-type*} erzeugt werden, können Sie einen kurzen @var{Rumpf} schreiben, der zu den neuen Dienstparametern ausgewertet wird, indem Sie die Funktionalität namens @code{inherit} benutzen, die von @code{define-record-type*} bereitgestellt wird." #. type: deffn -#: doc/guix.texi:25130 +#: doc/guix.texi:25116 msgid "@xref{Using the Configuration System}, for example usage." msgstr "Siehe @ref{Using the Configuration System} für ein Anwendungsbeispiel." #. type: Plain text -#: doc/guix.texi:25137 +#: doc/guix.texi:25123 msgid "Next comes the programming interface for service types. This is something you want to know when writing new service definitions, but not necessarily when simply looking for ways to customize your @code{operating-system} declaration." msgstr "Als Nächstes ist die Programmierschnittstelle für Diensttypen an der Reihe. Sie ist etwas, was Sie kennen werden wollen, wenn Sie neue Dienstdefinitionen schreiben, aber wenn Sie nur Ihre @code{operating-system}-Deklaration anpassen möchten, brauchen Sie diese Schnittstelle wahrscheinlich nicht." #. type: deftp -#: doc/guix.texi:25138 +#: doc/guix.texi:25124 #, no-wrap msgid "{Data Type} service-type" msgstr "{Datentyp} service-type" #. type: cindex -#: doc/guix.texi:25139 +#: doc/guix.texi:25125 #, no-wrap msgid "service type" msgstr "Diensttyp" #. type: deftp -#: doc/guix.texi:25142 +#: doc/guix.texi:25128 msgid "This is the representation of a @dfn{service type} (@pxref{Service Types and Services})." msgstr "Die Repräsentation eines @dfn{Diensttypen} (siehe @ref{Service Types and Services})." #. type: table -#: doc/guix.texi:25146 +#: doc/guix.texi:25132 msgid "This is a symbol, used only to simplify inspection and debugging." msgstr "Dieses Symbol wird nur verwendet, um die Abläufe im System anzuzeigen und die Fehlersuche zu erleichtern." #. type: code{#1} -#: doc/guix.texi:25147 +#: doc/guix.texi:25133 #, no-wrap msgid "extensions" msgstr "extensions" #. type: table -#: doc/guix.texi:25149 +#: doc/guix.texi:25135 msgid "A non-empty list of @code{} objects (see below)." msgstr "Eine nicht-leere Liste von @code{}-Objekten (siehe unten)." #. type: item -#: doc/guix.texi:25150 +#: doc/guix.texi:25136 #, no-wrap msgid "@code{compose} (default: @code{#f})" msgstr "@code{compose} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:25154 +#: doc/guix.texi:25140 msgid "If this is @code{#f}, then the service type denotes services that cannot be extended---i.e., services that do not receive ``values'' from other services." msgstr "Wenn es auf @code{#f} gesetzt ist, dann definiert der Diensttyp Dienste, die nicht erweitert werden können — d.h.@: diese Dienste erhalten ihren Wert nicht von anderen Diensten." #. type: table -#: doc/guix.texi:25158 +#: doc/guix.texi:25144 msgid "Otherwise, it must be a one-argument procedure. The procedure is called by @code{fold-services} and is passed a list of values collected from extensions. It may return any single value." msgstr "Andernfalls muss es eine Prozedur sein, die ein einziges Argument entgegennimmt. Die Prozedur wird durch @code{fold-services} aufgerufen und ihr wird die Liste von aus den Erweiterungen angesammelten Werten übergeben. Sie gibt daraufhin einen einzelnen Wert zurück." #. type: item -#: doc/guix.texi:25159 +#: doc/guix.texi:25145 #, no-wrap msgid "@code{extend} (default: @code{#f})" msgstr "@code{extend} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:25161 +#: doc/guix.texi:25147 msgid "If this is @code{#f}, services of this type cannot be extended." msgstr "Ist dies auf @code{#f} gesetzt, dann können Dienste dieses Typs nicht erweitert werden." #. type: table -#: doc/guix.texi:25167 +#: doc/guix.texi:25153 msgid "Otherwise, it must be a two-argument procedure: @code{fold-services} calls it, passing it the initial value of the service as the first argument and the result of applying @code{compose} to the extension values as the second argument. It must return a value that is a valid parameter value for the service instance." msgstr "Andernfalls muss es eine zwei Argumente nehmende Prozedur sein, die von @code{fold-services} mit dem anfänglichen Wert für den Dienst als erstes Argument und dem durch Anwendung von @code{compose} gelieferten Wert als zweites Argument aufgerufen wird. Als Ergebnis muss ein Wert geliefert werden, der einen zulässigen neuen Parameterwert für die Dienstinstanz darstellt." #. type: deftp -#: doc/guix.texi:25170 +#: doc/guix.texi:25156 msgid "@xref{Service Types and Services}, for examples." msgstr "Siehe den Abschnitt @ref{Service Types and Services} für Beispiele." #. type: deffn -#: doc/guix.texi:25172 +#: doc/guix.texi:25158 #, no-wrap msgid "{Scheme Procedure} service-extension @var{target-type} @" msgstr "{Scheme-Prozedur} service-extension @var{Zieltyp} @" #. type: deffn -#: doc/guix.texi:25178 +#: doc/guix.texi:25164 msgid "@var{compute} Return a new extension for services of type @var{target-type}. @var{compute} must be a one-argument procedure: @code{fold-services} calls it, passing it the value associated with the service that provides the extension; it must return a valid value for the target service." msgstr "@var{Berechner} Liefert eine neue Erweiterung für den Dienst mit dem @var{Zieltyp}. Als @var{Berechner} muss eine Prozedur angegeben werden, die ein einzelnes Argument nimmt: @code{fold-services} ruft sie auf und übergibt an sie den Wert des erweiternden Dienstes, sie muss dafür einen zulässigen Wert für den @var{Zieltyp} liefern." #. type: deffn -#: doc/guix.texi:25180 +#: doc/guix.texi:25166 #, no-wrap msgid "{Scheme Procedure} service-extension? @var{obj}" msgstr "{Scheme-Prozedur} service-extension? @var{Objekt}" #. type: deffn -#: doc/guix.texi:25182 +#: doc/guix.texi:25168 msgid "Return true if @var{obj} is a service extension." msgstr "Liefert wahr zurück, wenn das @var{Objekt} eine Diensterweiterung ist." #. type: Plain text -#: doc/guix.texi:25188 +#: doc/guix.texi:25174 msgid "Occasionally, you might want to simply extend an existing service. This involves creating a new service type and specifying the extension of interest, which can be verbose; the @code{simple-service} procedure provides a shorthand for this." msgstr "Manchmal wollen Sie vielleicht einfach nur einen bestehenden Dienst erweitern. Dazu müssten Sie einen neuen Diensttyp definieren und die Erweiterung definieren, für die Sie sich interessieren, was ganz schön wortreich werden kann. Mit der Prozedur @code{simple-service} können Sie es kürzer fassen." #. type: deffn -#: doc/guix.texi:25189 +#: doc/guix.texi:25175 #, no-wrap msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}" msgstr "{Scheme-Prozedur} simple-service @var{Name} @var{Zieltyp} @var{Wert}" #. type: deffn -#: doc/guix.texi:25193 +#: doc/guix.texi:25179 msgid "Return a service that extends @var{target} with @var{value}. This works by creating a singleton service type @var{name}, of which the returned service is an instance." msgstr "Liefert einen Dienst, der den Dienst mit dem @var{Zieltyp} um den @var{Wert} erweitert. Dazu wird ein Diensttyp mit dem @var{Name}n für den einmaligen Gebrauch erzeugt, den der zurückgelieferte Dienst instanziiert." #. type: deffn -#: doc/guix.texi:25196 +#: doc/guix.texi:25182 msgid "For example, this extends mcron (@pxref{Scheduled Job Execution}) with an additional job:" msgstr "Zum Beispiel kann mcron (siehe @ref{Scheduled Job Execution}) so um einen zusätzlichen Auftrag erweitert werden:" #. type: example -#: doc/guix.texi:25200 +#: doc/guix.texi:25186 #, no-wrap msgid "" "(simple-service 'my-mcron-job mcron-service-type\n" @@ -46011,318 +46053,308 @@ msgstr "" " #~(job '(next-hour (3)) \"guix gc -F 2G\"))\n" #. type: Plain text -#: doc/guix.texi:25210 +#: doc/guix.texi:25196 msgid "At the core of the service abstraction lies the @code{fold-services} procedure, which is responsible for ``compiling'' a list of services down to a single directory that contains everything needed to boot and run the system---the directory shown by the @command{guix system build} command (@pxref{Invoking guix system}). In essence, it propagates service extensions down the service graph, updating each node parameters on the way, until it reaches the root node." msgstr "Den Kern dieses abstrakten Modells für Dienste bildet die Prozedur @code{fold-services}, die für das „Kompilieren“ einer Liste von Diensten hin zu einem einzelnen Verzeichnis verantwortlich ist, in welchem alles enthalten ist, was Sie zum Booten und Hochfahren des Systems brauchen — d.h.@: das Verzeichnis, das der Befehl @command{guix system build} anzeigt (siehe @ref{Invoking guix system}). Einfach ausgedrückt propagiert @code{fold-services} Diensterweiterungen durch den Dienstgraphen nach unten und aktualisiert dabei in jedem Knoten des Graphen dessen Parameter, bis nur noch der Wurzelknoten übrig bleibt." #. type: deffn -#: doc/guix.texi:25211 +#: doc/guix.texi:25197 #, no-wrap msgid "{Scheme Procedure} fold-services @var{services} @" msgstr "{Scheme-Prozedur} fold-services @var{Dienste} @" #. type: deffn -#: doc/guix.texi:25215 +#: doc/guix.texi:25201 msgid "[#:target-type @var{system-service-type}] Fold @var{services} by propagating their extensions down to the root of type @var{target-type}; return the root service adjusted accordingly." msgstr "[#:target-type @var{system-service-type}] Faltet die @var{Dienste} wie die funktionale Prozedur @code{fold} zu einem einzigen zusammen, indem ihre Erweiterungen nach unten propagiert werden, bis eine Wurzel vom @var{target-type} als Diensttyp erreicht wird; dieser so angepasste Wurzeldienst wird zurückgeliefert." #. type: Plain text -#: doc/guix.texi:25219 +#: doc/guix.texi:25205 msgid "Lastly, the @code{(gnu services)} module also defines several essential service types, some of which are listed below." msgstr "Als Letztes definiert das Modul @code{(gnu services)} noch mehrere essenzielle Diensttypen, von denen manche im Folgenden aufgelistet sind:" #. type: defvr -#: doc/guix.texi:25220 +#: doc/guix.texi:25206 #, no-wrap msgid "{Scheme Variable} system-service-type" msgstr "{Scheme-Variable} system-service-type" #. type: defvr -#: doc/guix.texi:25223 +#: doc/guix.texi:25209 msgid "This is the root of the service graph. It produces the system directory as returned by the @command{guix system build} command." msgstr "Die Wurzel des Dienstgraphen. Davon wird das Systemverzeichnis erzeugt, wie es vom Befehl @command{guix system build} zurückgeliefert wird." #. type: defvr -#: doc/guix.texi:25225 +#: doc/guix.texi:25211 #, no-wrap msgid "{Scheme Variable} boot-service-type" msgstr "{Scheme-Variable} boot-service-type" #. type: defvr -#: doc/guix.texi:25228 +#: doc/guix.texi:25214 msgid "The type of the ``boot service'', which produces the @dfn{boot script}. The boot script is what the initial RAM disk runs when booting." msgstr "Der Typ des „Boot-Dienstes“, der das @dfn{Boot-Skript} erzeugt. Das Boot-Skript ist das, was beim Booten durch die initiale RAM-Disk ausgeführt wird." #. type: defvr -#: doc/guix.texi:25230 +#: doc/guix.texi:25216 #, no-wrap msgid "{Scheme Variable} etc-service-type" msgstr "{Scheme-Variable} etc-service-type" #. type: defvr -#: doc/guix.texi:25234 +#: doc/guix.texi:25220 msgid "The type of the @file{/etc} service. This service is used to create files under @file{/etc} and can be extended by passing it name/file tuples such as:" msgstr "Der Typ des @file{/etc}-Dienstes. Dieser Dienst wird benutzt, um im @file{/etc}-Verzeichnis Dateien zu platzieren. Er kann erweitert werden, indem man Name-/Datei-Tupel an ihn übergibt wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:25237 +#: doc/guix.texi:25223 #, no-wrap msgid "(list `(\"issue\" ,(plain-file \"issue\" \"Welcome!\\n\")))\n" msgstr "(list `(\"issue\" ,(plain-file \"issue\" \"Willkommen!\\n\")))\n" #. type: defvr -#: doc/guix.texi:25241 +#: doc/guix.texi:25227 msgid "In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file." msgstr "Dieses Beispiel würde bewirken, dass eine Datei @file{/etc/issue} auf die angegebene Datei verweist." #. type: defvr -#: doc/guix.texi:25243 +#: doc/guix.texi:25229 #, no-wrap msgid "{Scheme Variable} setuid-program-service-type" msgstr "{Scheme-Variable} setuid-program-service-type" #. type: defvr -#: doc/guix.texi:25247 +#: doc/guix.texi:25233 msgid "Type for the ``setuid-program service''. This service collects lists of executable file names, passed as gexps, and adds them to the set of setuid-root programs on the system (@pxref{Setuid Programs})." msgstr "Der Typ des Dienstes für setuid-Programme, der eine Liste von ausführbaren Dateien ansammelt, die jeweils als G-Ausdrücke übergeben werden und dann zur Menge der setuid-gesetzten Programme auf dem System hinzugefügt werden (siehe @ref{Setuid Programs})." #. type: defvr -#: doc/guix.texi:25249 +#: doc/guix.texi:25235 #, no-wrap msgid "{Scheme Variable} profile-service-type" msgstr "{Scheme-Variable} profile-service-type" #. type: defvr -#: doc/guix.texi:25253 +#: doc/guix.texi:25239 msgid "Type of the service that populates the @dfn{system profile}---i.e., the programs under @file{/run/current-system/profile}. Other services can extend it by passing it lists of packages to add to the system profile." msgstr "Der Typ des Dienstes zum Einfügen von Dateien ins @dfn{Systemprofil} — d.h.@: die Programme unter @file{/run/current-system/profile}. Andere Dienste können ihn erweitern, indem sie ihm Listen von ins Systemprofil zu installierenden Paketen übergeben." #. type: cindex -#: doc/guix.texi:25259 +#: doc/guix.texi:25245 #, no-wrap msgid "shepherd services" msgstr "Shepherd-Dienste" #. type: cindex -#: doc/guix.texi:25260 +#: doc/guix.texi:25246 #, no-wrap msgid "PID 1" msgstr "PID 1" #. type: cindex -#: doc/guix.texi:25261 +#: doc/guix.texi:25247 #, no-wrap msgid "init system" msgstr "init-System" #. type: Plain text -#: doc/guix.texi:25267 +#: doc/guix.texi:25253 msgid "The @code{(gnu services shepherd)} module provides a way to define services managed by the GNU@tie{}Shepherd, which is the initialization system---the first process that is started when the system boots, also known as PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual})." msgstr "Das Modul @code{(gnu services shepherd)} gibt eine Methode an, mit der Dienste definiert werden können, die von GNU@tie{}Shepherd verwaltet werden, was das Initialisierungssystem (das „init“-System) ist — es ist der erste Prozess, der gestartet wird, wenn das System gebootet wird, auch bekannt als PID@tie{}1 (siehe @ref{Introduction,,, shepherd, The GNU Shepherd Manual})." #. type: Plain text -#: doc/guix.texi:25273 +#: doc/guix.texi:25259 msgid "Services in the Shepherd can depend on each other. For instance, the SSH daemon may need to be started after the syslog daemon has been started, which in turn can only happen once all the file systems have been mounted. The simple operating system defined earlier (@pxref{Using the Configuration System}) results in a service graph like this:" msgstr "Dienste unter dem Shepherd können voneinander abhängen. Zum Beispiel kann es sein, dass der SSH-Daemon erst gestartet werden darf, nachdem der Syslog-Daemon gestartet wurde, welcher wiederum erst gestartet werden kann, sobald alle Dateisysteme eingebunden wurden. Das einfache Betriebssystem, dessen Definition wir zuvor gesehen haben (siehe @ref{Using the Configuration System}), ergibt folgenden Dienstgraphen:" #. type: Plain text -#: doc/guix.texi:25275 +#: doc/guix.texi:25261 msgid "@image{images/shepherd-graph,,5in,Typical shepherd service graph.}" msgstr "@image{images/shepherd-graph,,5in,Typischer Shepherd-Dienstgraph}" #. type: Plain text -#: doc/guix.texi:25279 +#: doc/guix.texi:25265 msgid "You can actually generate such a graph for any operating system definition using the @command{guix system shepherd-graph} command (@pxref{system-shepherd-graph, @command{guix system shepherd-graph}})." msgstr "Sie können so einen Graphen tatsächlich für jedes Betriebssystem erzeugen lassen, indem Sie den Befehl @command{guix system shepherd-graph} benutzen (siehe @ref{system-shepherd-graph, @command{guix system shepherd-graph}})." #. type: Plain text -#: doc/guix.texi:25283 +#: doc/guix.texi:25269 msgid "The @code{%shepherd-root-service} is a service object representing PID@tie{}1, of type @code{shepherd-root-service-type}; it can be extended by passing it lists of @code{} objects." msgstr "Der @code{%shepherd-root-service} ist ein Dienstobjekt, das diesen Prozess mit PID@tie{}1 repräsentiert. Der Dienst hat den Typ @code{shepherd-root-service-type}. Man kann ihn erweitern, indem man eine Liste von @code{}-Objekten an ihn übergibt." #. type: deftp -#: doc/guix.texi:25284 +#: doc/guix.texi:25270 #, no-wrap msgid "{Data Type} shepherd-service" msgstr "{Datentyp} shepherd-service" #. type: deftp -#: doc/guix.texi:25286 +#: doc/guix.texi:25272 msgid "The data type representing a service managed by the Shepherd." msgstr "Der Datentyp, der einen von Shepherd verwalteten Dienst repräsentiert." #. type: code{#1} -#: doc/guix.texi:25288 +#: doc/guix.texi:25274 #, no-wrap msgid "provision" msgstr "provision" #. type: table -#: doc/guix.texi:25290 +#: doc/guix.texi:25276 msgid "This is a list of symbols denoting what the service provides." msgstr "Diese Liste von Symbolen gibt an, was vom Dienst angeboten wird." #. type: table -#: doc/guix.texi:25295 +#: doc/guix.texi:25281 msgid "These are the names that may be passed to @command{herd start}, @command{herd status}, and similar commands (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual}). @xref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual}, for details." msgstr "Das bedeutet, es sind die Namen, die an @command{herd start}, @command{herd status} und ähnliche Befehle übergeben werden können (siehe @ref{Invoking herd,,, shepherd, The GNU Shepherd Manual}). Siehe @ref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual} für Details." #. type: item -#: doc/guix.texi:25296 -#, no-wrap -msgid "@code{requirement} (default: @code{'()})" +#: doc/guix.texi:25282 +#, fuzzy, no-wrap +#| msgid "@code{requirement} (default: @code{'()})" +msgid "@code{requirements} (default: @code{'()})" msgstr "@code{requirement} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:25298 +#: doc/guix.texi:25284 msgid "List of symbols denoting the Shepherd services this one depends on." msgstr "Eine Liste von Symbolen, die angegeben, von welchen anderen Shepherd-Diensten dieser hier abhängt." #. type: cindex -#: doc/guix.texi:25299 +#: doc/guix.texi:25285 #, no-wrap msgid "one-shot services, for the Shepherd" msgstr "einmalig ausgeführte Dienste, für Shepherd" #. type: table -#: doc/guix.texi:25304 +#: doc/guix.texi:25290 msgid "Whether this service is @dfn{one-shot}. One-shot services stop immediately after their @code{start} action has completed. @xref{Slots of services,,, shepherd, The GNU Shepherd Manual}, for more info." msgstr "Gibt an, ob dieser Dienst nur einmal ausgeführt wird („one-shot“). Einmalig ausgeführte Dienste werden gestoppt, sobald ihre @code{start}-Aktion abgeschlossen wurde. Siehe @ref{Slots of services,,, shepherd, The GNU Shepherd Manual} für weitere Informationen." #. type: item -#: doc/guix.texi:25305 +#: doc/guix.texi:25291 #, no-wrap msgid "@code{respawn?} (default: @code{#t})" msgstr "@code{respawn?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:25308 +#: doc/guix.texi:25294 msgid "Whether to restart the service when it stops, for instance when the underlying process dies." msgstr "Ob der Dienst neu gestartet werden soll, nachdem er gestoppt wurde, zum Beispiel wenn der ihm zu Grunde liegende Prozess terminiert wird." #. type: code{#1} -#: doc/guix.texi:25309 +#: doc/guix.texi:25295 #, no-wrap msgid "start" msgstr "start" #. type: itemx -#: doc/guix.texi:25310 +#: doc/guix.texi:25296 #, no-wrap msgid "@code{stop} (default: @code{#~(const #f)})" msgstr "@code{stop} (Vorgabe: @code{#~(const #f)})" #. type: table -#: doc/guix.texi:25316 +#: doc/guix.texi:25302 msgid "The @code{start} and @code{stop} fields refer to the Shepherd's facilities to start and stop processes (@pxref{Service De- and Constructors,,, shepherd, The GNU Shepherd Manual}). They are given as G-expressions that get expanded in the Shepherd configuration file (@pxref{G-Expressions})." msgstr "Die Felder @code{start} und @code{stop} beziehen sich auf Shepherds Funktionen zum Starten und Stoppen von Prozessen (siehe @ref{Service De- and Constructors,,, shepherd, The GNU Shepherd Manual}). Sie enthalten G-Ausdrücke, die in eine Shepherd-Konfigurationdatei umgeschrieben werden (siehe @ref{G-Expressions})." #. type: item -#: doc/guix.texi:25317 +#: doc/guix.texi:25303 #, no-wrap msgid "@code{actions} (default: @code{'()})" msgstr "@code{actions} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:25318 +#: doc/guix.texi:25304 #, no-wrap msgid "actions, of Shepherd services" msgstr "Aktionen, bei Shepherd-Diensten" #. type: table -#: doc/guix.texi:25323 +#: doc/guix.texi:25309 msgid "This is a list of @code{shepherd-action} objects (see below) defining @dfn{actions} supported by the service, in addition to the standard @code{start} and @code{stop} actions. Actions listed here become available as @command{herd} sub-commands:" msgstr "Dies ist eine Liste von @code{shepherd-action}-Objekten (siehe unten), die vom Dienst zusätzlich unterstützte @dfn{Aktionen} neben den Standardaktionen @code{start} und @code{stop} angeben. Hier aufgeführte Aktionen werden als @command{herd}-Unterbefehle verfügbar gemacht:" #. type: example -#: doc/guix.texi:25326 +#: doc/guix.texi:25312 #, no-wrap msgid "herd @var{action} @var{service} [@var{arguments}@dots{}]\n" msgstr "herd @var{Aktion} @var{Dienst} [@var{Argumente}…]\n" -#. type: item -#: doc/guix.texi:25328 -#, no-wrap -msgid "@code{auto-start?} (default: @code{#t})" -msgstr "@code{auto-start?} (Vorgabe: @code{#t})" - #. type: table -#: doc/guix.texi:25331 -msgid "Whether this service should be started automatically by the Shepherd. If it is @code{#f} the service has to be started manually with @code{herd start}." -msgstr "Ob dieser Dienst automatisch durch Shepherd gestartet werden sollte. Wenn es auf @code{#f} steht, muss der Dienst manuell über @code{herd start} gestartet werden." - -#. type: table -#: doc/guix.texi:25334 +#: doc/guix.texi:25316 msgid "A documentation string, as shown when running:" msgstr "Eine Zeichenkette zur Dokumentation, die angezeigt wird, wenn man dies ausführt:" #. type: example -#: doc/guix.texi:25337 +#: doc/guix.texi:25319 #, no-wrap msgid "herd doc @var{service-name}\n" msgstr "herd doc @var{Dienstname}\n" #. type: table -#: doc/guix.texi:25341 +#: doc/guix.texi:25323 msgid "where @var{service-name} is one of the symbols in @code{provision} (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})." msgstr "wobei der @var{Dienstname} eines der Symbole aus der @code{provision}-Liste sein muss (siehe @ref{Invoking herd,,, shepherd, The GNU Shepherd Manual})." #. type: item -#: doc/guix.texi:25342 +#: doc/guix.texi:25324 #, no-wrap msgid "@code{modules} (default: @code{%default-modules})" msgstr "@code{modules} (Vorgabe: @code{%default-modules})" #. type: table -#: doc/guix.texi:25345 +#: doc/guix.texi:25327 msgid "This is the list of modules that must be in scope when @code{start} and @code{stop} are evaluated." msgstr "Dies ist die Liste der Module, die in den Sichtbarkeitsbereich geladen sein müssen, wenn @code{start} und @code{stop} ausgewertet werden." #. type: deftp -#: doc/guix.texi:25349 +#: doc/guix.texi:25331 #, no-wrap msgid "{Data Type} shepherd-action" msgstr "{Datentyp} shepherd-action" #. type: deftp -#: doc/guix.texi:25352 +#: doc/guix.texi:25334 msgid "This is the data type that defines additional actions implemented by a Shepherd service (see above)." msgstr "Dieser Datentyp definiert zusätzliche Aktionen, die ein Shepherd-Dienst implementiert (siehe oben)." #. type: table -#: doc/guix.texi:25356 +#: doc/guix.texi:25338 msgid "Symbol naming the action." msgstr "Die Aktion bezeichnendes Symbol." #. type: table -#: doc/guix.texi:25359 +#: doc/guix.texi:25341 msgid "This is a documentation string for the action. It can be viewed by running:" msgstr "Diese Zeichenkette ist die Dokumentation für die Aktion. Sie können sie sehen, wenn Sie dies ausführen:" #. type: example -#: doc/guix.texi:25362 +#: doc/guix.texi:25344 #, no-wrap msgid "herd doc @var{service} action @var{action}\n" msgstr "herd doc @var{Dienst} action @var{Aktion}\n" #. type: item -#: doc/guix.texi:25364 +#: doc/guix.texi:25346 #, no-wrap msgid "procedure" msgstr "procedure" #. type: table -#: doc/guix.texi:25368 +#: doc/guix.texi:25350 msgid "This should be a gexp that evaluates to a procedure of at least one argument, which is the ``running value'' of the service (@pxref{Slots of services,,, shepherd, The GNU Shepherd Manual})." msgstr "Dies sollte ein G-Ausdruck sein, der zu einer mindestens ein Argument nehmenden Prozedur ausgewertet wird. Das Argument ist der „running“-Wert des Dienstes (siehe @ref{Slots of services,,, shepherd, The GNU Shepherd Manual})." #. type: deftp -#: doc/guix.texi:25372 +#: doc/guix.texi:25354 msgid "The following example defines an action called @code{say-hello} that kindly greets the user:" msgstr "Das folgende Beispiel definiert eine Aktion namens @code{sag-hallo}, die den Benutzer freundlich begrüßt:" #. type: example -#: doc/guix.texi:25381 +#: doc/guix.texi:25363 #, no-wrap msgid "" "(shepherd-action\n" @@ -46342,12 +46374,12 @@ msgstr "" " #t)))\n" #. type: deftp -#: doc/guix.texi:25384 +#: doc/guix.texi:25366 msgid "Assuming this action is added to the @code{example} service, then you can do:" msgstr "Wenn wir annehmen, dass wir die Aktion zum Dienst @code{beispiel} hinzufügen, können Sie Folgendes ausführen:" #. type: example -#: doc/guix.texi:25390 +#: doc/guix.texi:25372 #, no-wrap msgid "" "# herd say-hello example\n" @@ -46361,79 +46393,79 @@ msgstr "" "Hallo, Freund! Argumente: (\"a\" \"b\" \"c\")\n" #. type: deftp -#: doc/guix.texi:25395 +#: doc/guix.texi:25377 msgid "This, as you can see, is a fairly sophisticated way to say hello. @xref{Service Convenience,,, shepherd, The GNU Shepherd Manual}, for more info on actions." msgstr "Wie Sie sehen können, ist das eine sehr ausgeklügelte Art, Hallo zu sagen. Siehe @ref{Service Convenience,,, shepherd, The GNU Shepherd Manual} für mehr Informationen zu Aktionen." #. type: defvr -#: doc/guix.texi:25397 +#: doc/guix.texi:25379 #, no-wrap msgid "{Scheme Variable} shepherd-root-service-type" msgstr "{Scheme-Variable} shepherd-root-service-type" #. type: defvr -#: doc/guix.texi:25399 +#: doc/guix.texi:25381 msgid "The service type for the Shepherd ``root service''---i.e., PID@tie{}1." msgstr "Der Diensttyp für den Shepherd-„Wurzeldienst“ — also für PID@tie{}1." #. type: defvr -#: doc/guix.texi:25403 +#: doc/guix.texi:25385 msgid "This is the service type that extensions target when they want to create shepherd services (@pxref{Service Types and Services}, for an example). Each extension must pass a list of @code{}." msgstr "Dieser Diensttyp stellt das Ziel für Diensterweiterungen dar, die Shepherd-Dienste erzeugen sollen (siehe @ref{Service Types and Services} für ein Beispiel). Jede Erweiterung muss eine Liste von @code{}-Objekten übergeben." #. type: defvr -#: doc/guix.texi:25405 +#: doc/guix.texi:25387 #, no-wrap msgid "{Scheme Variable} %shepherd-root-service" msgstr "{Scheme-Variable} %shepherd-root-service" #. type: defvr -#: doc/guix.texi:25407 +#: doc/guix.texi:25389 msgid "This service represents PID@tie{}1." msgstr "Dieser Dienst repräsentiert PID@tie{}1." #. type: cindex -#: doc/guix.texi:25413 +#: doc/guix.texi:25395 #, no-wrap msgid "documentation, searching for" msgstr "Dokumentation, Suche danach" #. type: cindex -#: doc/guix.texi:25414 +#: doc/guix.texi:25396 #, no-wrap msgid "searching for documentation" msgstr "Suchen nach Dokumentation" #. type: cindex -#: doc/guix.texi:25415 +#: doc/guix.texi:25397 #, no-wrap msgid "Info, documentation format" msgstr "Info, Dokumentationsformat" #. type: cindex -#: doc/guix.texi:25416 +#: doc/guix.texi:25398 #, no-wrap msgid "man pages" msgstr "man-Pages (Handbuchseiten)" #. type: cindex -#: doc/guix.texi:25417 +#: doc/guix.texi:25399 #, no-wrap msgid "manual pages" msgstr "Handbuchseiten („Man-Pages“)" #. type: Plain text -#: doc/guix.texi:25424 +#: doc/guix.texi:25406 msgid "In most cases packages installed with Guix come with documentation. There are two main documentation formats: ``Info'', a browseable hypertext format used for GNU software, and ``manual pages'' (or ``man pages''), the linear documentation format traditionally found on Unix. Info manuals are accessed with the @command{info} command or with Emacs, and man pages are accessed using @command{man}." msgstr "In den meisten Fällen liegt den mit Guix installierten Paketen auch Dokumentation bei, die diese beschreibt. Die zwei üblichsten Formate für Dokumentation sind „Info“, ein durchsuchbares Hypertextformat, das für GNU-Software benutzt wird, und sogenannte „Handbuchseiten“ (englisch „Manual Pages“, kurz Man-Pages), das linear aufgebaute Dokumentationsformat, das auf Unix traditionell mitgeliefert wird. Info-Handbücher können mit dem Befehl @command{info} oder mit Emacs abgerufen werden, auf Handbuchseiten kann mit dem Befehl @command{man} zugegriffen werden." #. type: Plain text -#: doc/guix.texi:25428 +#: doc/guix.texi:25410 msgid "You can look for documentation of software installed on your system by keyword. For example, the following command searches for information about ``TLS'' in Info manuals:" msgstr "Sie können die Dokumentation von auf Ihrem System installierter Software nach einem Schlüsselwort durchsuchen. Zum Beispiel suchen Sie mit folgendem Befehl in den Info-Handbüchern nach „TLS“." #. type: example -#: doc/guix.texi:25436 +#: doc/guix.texi:25418 #, no-wrap msgid "" "$ info -k TLS\n" @@ -46451,12 +46483,12 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:25440 +#: doc/guix.texi:25422 msgid "The command below searches for the same keyword in man pages:" msgstr "Mit folgendem Befehl suchen Sie dasselbe Schlüsselwort in Handbuchseiten:" #. type: example -#: doc/guix.texi:25446 +#: doc/guix.texi:25428 #, no-wrap msgid "" "$ man -k TLS\n" @@ -46470,108 +46502,108 @@ msgstr "" "@dots {}\n" #. type: Plain text -#: doc/guix.texi:25452 +#: doc/guix.texi:25434 msgid "These searches are purely local to your computer so you have the guarantee that documentation you find corresponds to what you have actually installed, you can access it off-line, and your privacy is respected." msgstr "Diese Suchvorgänge finden ausschließlich lokal auf Ihrem Rechner statt, wodurch gewährleistet ist, dass die Fundstellen zur von Ihnen auch tatsächlich installierten Software passen, Sie für den Zugriff keine Internetverbindung brauchen und Datenschutz gewährleistet bleibt." #. type: Plain text -#: doc/guix.texi:25455 +#: doc/guix.texi:25437 msgid "Once you have these results, you can view the relevant documentation by running, say:" msgstr "Sobald Sie die Fundstellen kennen, können Sie zum Beispiel so die entsprechende Dokumentation anzeigen lassen:" #. type: example -#: doc/guix.texi:25458 +#: doc/guix.texi:25440 #, no-wrap msgid "$ info \"(gnutls)Core TLS API\"\n" msgstr "$ info \"(gnutls)Core TLS API\"\n" #. type: Plain text -#: doc/guix.texi:25462 +#: doc/guix.texi:25444 msgid "or:" msgstr "oder" #. type: example -#: doc/guix.texi:25465 +#: doc/guix.texi:25447 #, no-wrap msgid "$ man certtool\n" msgstr "$ man certtool\n" #. type: Plain text -#: doc/guix.texi:25473 +#: doc/guix.texi:25455 msgid "Info manuals contain sections and indices as well as hyperlinks like those found in Web pages. The @command{info} reader (@pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}) and its Emacs counterpart (@pxref{Misc Help,,, emacs, The GNU Emacs Manual}) provide intuitive key bindings to navigate manuals. @xref{Getting Started,,, info, Info: An Introduction}, for an introduction to Info navigation." msgstr "Info-Handbücher sind in Abschnitte unterteilt und verfügen über Register sowie Hyperlinks, wie jene, die Sie auch von Webseiten kennen. Der @command{info}-Betrachter (siehe @ref{Top, Info reader,, info-stnd, Stand-alone GNU Info}) und sein Gegenstück für Emacs (siehe @ref{Misc Help,,, emacs, The GNU Emacs Manual}) verfügen über leicht erlernbare Tastenkürzel, mit denen Sie in Handbüchern navigieren können. Siehe @ref{Getting Started,,, info, Info: An Introduction} für eine Einführung in die Info-Navigation." #. type: cindex -#: doc/guix.texi:25477 +#: doc/guix.texi:25459 #, no-wrap msgid "debugging files" msgstr "Dateien zur Fehlersuche" #. type: Plain text -#: doc/guix.texi:25483 +#: doc/guix.texi:25465 msgid "Program binaries, as produced by the GCC compilers for instance, are typically written in the ELF format, with a section containing @dfn{debugging information}. Debugging information is what allows the debugger, GDB, to map binary code to source code; it is required to debug a compiled program in good conditions." msgstr "Die Binärdateien von Programmen, wie sie zum Beispiel von den GCC-Compilern erzeugt werden, sind in der Regel im ELF-Format gespeichert und enthalten eine Sektion mit @dfn{Informationen zur Fehlersuche} (englisch „Debugging Information“). Informationen zur Fehlersuche machen es möglich, dass der Debugger, GDB, Binärcode dem Quellcode zuordnen kann, was nötig ist, damit es mit etwas Glück leicht ist, Fehler in einem kompilierten Programm zu suchen." #. type: Plain text -#: doc/guix.texi:25491 +#: doc/guix.texi:25473 msgid "The problem with debugging information is that is takes up a fair amount of disk space. For example, debugging information for the GNU C Library weighs in at more than 60 MiB. Thus, as a user, keeping all the debugging info of all the installed programs is usually not an option. Yet, space savings should not come at the cost of an impediment to debugging---especially in the GNU system, which should make it easier for users to exert their computing freedom (@pxref{GNU Distribution})." msgstr "Das Problem bei Informationen zur Fehlersuche ist, dass dadurch einiges an Plattenplatz verbraucht wird. Zum Beispiel steuern die Informationen zur Fehlersuche in der GNU-C-Bibliothek mehr als 60 MiB bei. Als ein Nutzer ist es deswegen in der Regel nicht möglich, sämtliche Fehlersuchinformationen für alle installierten Programme zu speichern. Andererseits sollten Platzeinsparnisse nicht auf Kosten der Fehlersuche gehen — besonders im GNU-System, wo es Nutzern leicht fallen sollte, ihre Freiheit, wie sie ihre Rechner benutzen, auszuüben (siehe @ref{GNU Distribution})." #. type: Plain text -#: doc/guix.texi:25498 +#: doc/guix.texi:25480 msgid "Thankfully, the GNU Binary Utilities (Binutils) and GDB provide a mechanism that allows users to get the best of both worlds: debugging information can be stripped from the binaries and stored in separate files. GDB is then able to load debugging information from those files, when they are available (@pxref{Separate Debug Files,,, gdb, Debugging with GDB})." msgstr "Glücklicherweise gibt es in den GNU Binary Utilities (Binutils) und GDB einen Mechanismus, mit dem Nutzer das Beste aus beiden Welten bekommen: Informationen zur Fehlersuche können von den davon beschriebenen Binärdateien losgelöst und in separaten Dateien gespeichert werden. GDB kann dann Fehlersuchinformationen laden, wenn diese Dateien verfügbar sind (siehe @ref{Separate Debug Files,,, gdb, Debugging with GDB})." #. type: Plain text -#: doc/guix.texi:25506 +#: doc/guix.texi:25488 msgid "The GNU distribution takes advantage of this by storing debugging information in the @code{lib/debug} sub-directory of a separate package output unimaginatively called @code{debug} (@pxref{Packages with Multiple Outputs}). Users can choose to install the @code{debug} output of a package when they need it. For instance, the following command installs the debugging information for the GNU C Library and for GNU Guile:" msgstr "Die GNU-Distribution nutzt diesen Mechanismus aus, indem sie Informationen zur Fehlersuche im Unterverzeichnis @code{lib/debug} einer separaten Paketausgabe speichert, die den fantasielosen Namen @code{debug} trägt. Mit dem folgenden Befehl können Sie zum Beispiel Informationen zur Fehlersuche für die GNU-C-Bibliothek und für GNU Guile installieren:" #. type: example -#: doc/guix.texi:25509 +#: doc/guix.texi:25491 #, no-wrap msgid "guix install glibc:debug guile:debug\n" msgstr "guix install glibc:debug guile:debug\n" #. type: Plain text -#: doc/guix.texi:25515 +#: doc/guix.texi:25497 msgid "GDB must then be told to look for debug files in the user's profile, by setting the @code{debug-file-directory} variable (consider setting it from the @file{~/.gdbinit} file, @pxref{Startup,,, gdb, Debugging with GDB}):" msgstr "GDB muss dann angewiesen werden, im Profil des Nutzers nach Informationen zur Fehlersuche zu schauen, indem Sie die Variable @code{debug-file-directory} entsprechend setzen (vielleicht möchsten Sie die Variable in der Datei @file{~/.gdbinit} festlegen, siehe @ref{Startup,,, gdb, Debugging with GDB}):" #. type: example -#: doc/guix.texi:25518 +#: doc/guix.texi:25500 #, no-wrap msgid "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n" msgstr "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n" #. type: Plain text -#: doc/guix.texi:25522 +#: doc/guix.texi:25504 msgid "From there on, GDB will pick up debugging information from the @code{.debug} files under @file{~/.guix-profile/lib/debug}." msgstr "Von da an wird GDB auch aus den @code{.debug}-Dateien unter @file{~/.guix-profile/lib/debug} auslesbare Informationen zur Fehlersuche verwenden." #. type: Plain text -#: doc/guix.texi:25529 +#: doc/guix.texi:25511 msgid "In addition, you will most likely want GDB to be able to show the source code being debugged. To do that, you will have to unpack the source code of the package of interest (obtained with @code{guix build --source}, @pxref{Invoking guix build}), and to point GDB to that source directory using the @code{directory} command (@pxref{Source Path, @code{directory},, gdb, Debugging with GDB})." msgstr "Des Weiteren werden Sie höchstwahrscheinlich wollen, dass GDB den Quellcode, der auf Fehler untersucht wird, anzeigen kann. Dazu müssen sie den Quellcodes des Pakets, für das Sie sich interessieren (laden Sie ihn mit @code{guix build --source} herunter; siehe @ref{Invoking guix build}), und dann weisen Sie GDB an, in dem Verzeichnis zu suchen, indem Sie den @code{directory}-Befehl benutzen (siehe @ref{Source Path, @code{directory},, gdb, Debugging with GDB})." #. type: Plain text -#: doc/guix.texi:25538 +#: doc/guix.texi:25520 msgid "The @code{debug} output mechanism in Guix is implemented by the @code{gnu-build-system} (@pxref{Build Systems}). Currently, it is opt-in---debugging information is available only for the packages with definitions explicitly declaring a @code{debug} output. This may be changed to opt-out in the future if our build farm servers can handle the load. To check whether a package has a @code{debug} output, use @command{guix package --list-available} (@pxref{Invoking guix package})." msgstr "Der Mechanismus mit der @code{debug}-Ausgabe wird in Guix als Teil des @code{gnu-build-system} implementiert (siehe @ref{Build Systems}). Zur Zeit ist sie optional — nur für Pakete, für die ausdrücklich eine @code{debug}-Ausgabe deklariert wurde, sind Informationen zur Fehlersuche verfügbar. Um zu überprüfen, ob Pakete eine @code{debug}-Ausgabe mit Informationen zur Fehlersuche haben, benutzen Sie @command{guix package --list-available} (siehe @ref{Invoking guix package})." #. type: cindex -#: doc/guix.texi:25543 +#: doc/guix.texi:25525 #, no-wrap msgid "security updates" msgstr "Sicherheitsaktualisierungen" #. type: Plain text -#: doc/guix.texi:25552 +#: doc/guix.texi:25534 msgid "Occasionally, important security vulnerabilities are discovered in software packages and must be patched. Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch containing only security updates.) The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution:" msgstr "Ab und zu werden wichtige Sicherheitsschwachstellen in Software-Paketen entdeckt, die mit Patches behoben werden müssen. Guix-Entwickler geben ihr Bestes, bezüglich bekannter Schwachstellen auf dem Laufenden zu bleiben und so bald wie möglich Patches dafür auf den @code{master}-Branch von Guix aufzuspielen (einen stabilen „stable“-Branch ohne riskante Änderungen haben wir noch nicht). Das Werkzeug @command{guix lint} hilft Entwicklern dabei, verwundbare Versionen von Softwarepaketen in der Distribution zu finden:" #. type: smallexample -#: doc/guix.texi:25559 +#: doc/guix.texi:25541 #, no-wrap msgid "" "$ guix lint -c cve\n" @@ -46587,44 +46619,44 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:25562 +#: doc/guix.texi:25544 msgid "@xref{Invoking guix lint}, for more information." msgstr "Siehe @ref{Invoking guix lint} für weitere Informationen." #. type: quotation -#: doc/guix.texi:25566 +#: doc/guix.texi:25548 msgid "As of version @value{VERSION}, the feature described below is considered ``beta''." msgstr "Die im Folgenden beschriebene Funktion wird noch als Beta-Version angesehen, Stand Version @value{VERSION}." #. type: Plain text -#: doc/guix.texi:25576 +#: doc/guix.texi:25558 msgid "Guix follows a functional package management discipline (@pxref{Introduction}), which implies that, when a package is changed, @emph{every package that depends on it} must be rebuilt. This can significantly slow down the deployment of fixes in core packages such as libc or Bash, since basically the whole distribution would need to be rebuilt. Using pre-built binaries helps (@pxref{Substitutes}), but deployment may still take more time than desired." msgstr "Guix verfolgt eine funktionale Disziplin bei der Paketverwaltung (siehe @ref{Introduction}), was impliziert, dass bei jeder Änderung an einem Paket @emph{jedes davon abhängige Paket} neu erstellt werden muss. Ohne einen Mechanismus würde das Ausliefern von Sicherheitsaktualisierungen in Kernpaketen wie libc oder Bash dadurch deutlich verlangsamt — schließlich müsste quasi die gesamte Distribution neu erstellt werden. Vorerstellte Binärdateien zu benutzen, wäre schon einmal eine Hilfe (siehe @ref{Substitutes}), aber die Auslieferung wäre immer noch laangsamer, als wir es uns wünschen." #. type: cindex -#: doc/guix.texi:25577 +#: doc/guix.texi:25559 #, no-wrap msgid "grafts" msgstr "Veredelungen" #. type: Plain text -#: doc/guix.texi:25585 +#: doc/guix.texi:25567 msgid "To address this, Guix implements @dfn{grafts}, a mechanism that allows for fast deployment of critical updates without the costs associated with a whole-distribution rebuild. The idea is to rebuild only the package that needs to be patched, and then to ``graft'' it onto packages explicitly installed by the user and that were previously referring to the original package. The cost of grafting is typically very low, and order of magnitudes lower than a full rebuild of the dependency chain." msgstr "Als Gegenmittel sind in Guix @dfn{Veredelungen} implementiert. Diese stellen einen Mechanismus dar, mit dem kritische Aktualisierungen schnell an Guix’ Benutzer ausgeliefert werden können, ohne die Nachteile, zu denen es käme, wenn wir die gesamte Distribution neu erstellen müssten. Die Idee dahinter ist, nur das Paket, das einen Patch braucht, neu zu erstellen, und damit dann Pakete, die der Nutzer ausdrücklich installiert hat und die vorher Referenzen auf das alte Paket enthielten, zu „veredeln“. So eine Veredelung kostet typischerweise nur sehr wenig, d.h.@: um Größenordnungen weniger, als die ganze Abhängigkeitskette neu zu erstellen." #. type: cindex -#: doc/guix.texi:25586 +#: doc/guix.texi:25568 #, no-wrap msgid "replacements of packages, for grafts" msgstr "Ersetzungen von Paketen, bei Veredelungen" #. type: Plain text -#: doc/guix.texi:25592 +#: doc/guix.texi:25574 msgid "For instance, suppose a security update needs to be applied to Bash. Guix developers will provide a package definition for the ``fixed'' Bash, say @code{bash-fixed}, in the usual way (@pxref{Defining Packages}). Then, the original package definition is augmented with a @code{replacement} field pointing to the package containing the bug fix:" msgstr "Nehmen wir also an, eine Sicherheitsaktualisierung müsste auf Bash angewandt werden. Guix-Entwickler schreiben dann eine Paketdefinition für die „reparierte“ Bash, sagen wir @code{bash-fixed}, auf die gleiche Art wie immer (siehe @ref{Defining Packages}). Dann wird die ursprüngliche Paketdefinition um ein @code{replacement}-Feld (zu Deutsch „Ersetzung“) erweitert, das auf das Paket verweist, in dem der Fehler behoben wurde:" #. type: example -#: doc/guix.texi:25599 +#: doc/guix.texi:25581 #, no-wrap msgid "" "(define bash\n" @@ -46640,120 +46672,120 @@ msgstr "" " (replacement bash-fixed)))\n" #. type: Plain text -#: doc/guix.texi:25609 +#: doc/guix.texi:25591 msgid "From there on, any package depending directly or indirectly on Bash---as reported by @command{guix gc --requisites} (@pxref{Invoking guix gc})---that is installed is automatically ``rewritten'' to refer to @code{bash-fixed} instead of @code{bash}. This grafting process takes time proportional to the size of the package, usually less than a minute for an ``average'' package on a recent machine. Grafting is recursive: when an indirect dependency requires grafting, then grafting ``propagates'' up to the package that the user is installing." msgstr "Ab diesem Zeitpunkt wird jedes Paket, das Sie installieren und das direkt oder indirekt von Bash abhängt — also die von @command{guix gc --requisites} ausgegebenen Pakete (siehe @ref{Invoking guix gc}) —, automatisch „umgeschrieben“, so dass es @code{bash-fixed} referenziert, wo es vorher @code{bash} referenziert hatte. Die Dauer dieses Veredelungsprozesses ist proportional zur Größe des Pakets und liegt auf einer neuen Maschine für ein „durchschnittliches“ Paket bei unter einer Minute. Veredeln ist rekursiv: Wenn eine indirekte Abhängigkeit veredelt werden muss, „propagiert“ der Veredelungsprozess durch die abhängigen Pakete und endet mit dem Paket, das der Nutzer installiert." #. type: Plain text -#: doc/guix.texi:25617 +#: doc/guix.texi:25599 msgid "Currently, the length of the name and version of the graft and that of the package it replaces (@code{bash-fixed} and @code{bash} in the example above) must be equal. This restriction mostly comes from the fact that grafting works by patching files, including binary files, directly. Other restrictions may apply: for instance, when adding a graft to a package providing a shared library, the original shared library and its replacement must have the same @code{SONAME} and be binary-compatible." msgstr "Zur Zeit muss der Name und die Version einer Veredelung gleichlang wie die beim ersetzten Paket sein (also bei @code{bash-fixed} und @code{bash} im Beispiel oben). Diese Einschränkung kommt daher, dass beim Veredeln der Inhalt von Dateien, einschließlich Binärdateien, durch einfache Ersetzungen „geflickt“ wird. Es gibt noch mehr Einschränkungen: Wenn zum Beispiel ein Paket veredelt wird, das eine gemeinsame Bibliothek („Shared Library“) verwendet, muss der @code{SONAME} von Original und Ersatz derselbe sein und die beiden müssen binär kompatibel sein." #. type: Plain text -#: doc/guix.texi:25621 +#: doc/guix.texi:25603 msgid "The @option{--no-grafts} command-line option allows you to forcefully avoid grafting (@pxref{Common Build Options, @option{--no-grafts}}). Thus, the command:" msgstr "Mit der Befehlszeilenoption @option{--no-grafts} können Sie den Veredelungsmechanismus zwingend abschalten (siehe @ref{Common Build Options, @option{--no-grafts}}). Der Befehl" #. type: example -#: doc/guix.texi:25624 +#: doc/guix.texi:25606 #, no-wrap msgid "guix build bash --no-grafts\n" msgstr "guix build bash --no-grafts\n" #. type: Plain text -#: doc/guix.texi:25628 +#: doc/guix.texi:25610 msgid "returns the store file name of the original Bash, whereas:" msgstr "liefert also den Namen der Store-Datei mit der ursprünglichen Bash, während" #. type: example -#: doc/guix.texi:25631 +#: doc/guix.texi:25613 #, no-wrap msgid "guix build bash\n" msgstr "guix build bash\n" #. type: Plain text -#: doc/guix.texi:25636 +#: doc/guix.texi:25618 msgid "returns the store file name of the ``fixed'', replacement Bash. This allows you to distinguish between the two variants of Bash." msgstr "den Namen der Store-Datei für die „reparierte“ Ersatz-Bash liefert. Dadurch können Sie zwischen den beiden Varianten von Bash unterscheiden." #. type: Plain text -#: doc/guix.texi:25639 +#: doc/guix.texi:25621 msgid "To verify which Bash your whole profile refers to, you can run (@pxref{Invoking guix gc}):" msgstr "Um zu prüfen, welche Bash Ihr gesamtes Profil referenziert, können Sie diesen Befehl hier laufen lassen (siehe @ref{Invoking guix gc}):" #. type: example -#: doc/guix.texi:25642 +#: doc/guix.texi:25624 #, no-wrap msgid "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n" msgstr "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n" #. type: Plain text -#: doc/guix.texi:25647 +#: doc/guix.texi:25629 msgid "@dots{} and compare the store file names that you get with those above. Likewise for a complete Guix system generation:" msgstr "Dann vergleichen Sie die Namen der Store-Objekte, die Sie ausgegeben bekommen, mit den beiden Bash-Paketnamen oben. Ebenso können Sie eine ganze Guix-Systemgeneration überprüfen:" #. type: example -#: doc/guix.texi:25650 +#: doc/guix.texi:25632 #, no-wrap msgid "guix gc -R `guix system build my-config.scm` | grep bash\n" msgstr "guix gc -R `guix system build my-config.scm` | grep bash\n" #. type: Plain text -#: doc/guix.texi:25654 +#: doc/guix.texi:25636 msgid "Lastly, to check which Bash running processes are using, you can use the @command{lsof} command:" msgstr "Zum Schluss können Sie mit dem Befehl @command{lsof} überprüfen, welches von den Bash-Paketen die laufenden Prozesse benutzen:" #. type: example -#: doc/guix.texi:25657 +#: doc/guix.texi:25639 #, no-wrap msgid "lsof | grep /gnu/store/.*bash\n" msgstr "lsof | grep /gnu/store/.*bash\n" #. type: cindex -#: doc/guix.texi:25665 +#: doc/guix.texi:25647 #, no-wrap msgid "bootstrapping" msgstr "Bootstrapping" #. type: Plain text -#: doc/guix.texi:25675 +#: doc/guix.texi:25657 msgid "Bootstrapping in our context refers to how the distribution gets built ``from nothing''. Remember that the build environment of a derivation contains nothing but its declared inputs (@pxref{Introduction}). So there's an obvious chicken-and-egg problem: how does the first package get built? How does the first compiler get compiled? Note that this is a question of interest only to the curious hacker, not to the regular user, so you can shamelessly skip this section if you consider yourself a ``regular user''." msgstr "Wenn wir von Bootstrapping sprechen, meinen wir damit, wie die Distribution „aus dem Nichts“ erstellt werden kann. Erinnern Sie sich, wie die Erstellungsumgebung für eine Ableitung nichts außer ihren deklarierten Eingaben enthält (siehe @ref{Introduction})? Daraus ergibt sich ein Henne-Ei-Problem: Wie kann so das allererste Paket entstehen? Womit wird der Compiler kompiliert? Beachten Sie, diese Frage ist nur für neugierige Hacker und keine normalen Nutzer interessant. Wenn Sie sich selbst als „normaler Nutzer“ sehen, dürfen Sie getrost diesen Abschnitt hier überspringen." #. type: cindex -#: doc/guix.texi:25676 doc/guix.texi:25798 +#: doc/guix.texi:25658 doc/guix.texi:25780 #, no-wrap msgid "bootstrap binaries" msgstr "Bootstrap-Binärdateien" #. type: Plain text -#: doc/guix.texi:25686 +#: doc/guix.texi:25668 msgid "The GNU system is primarily made of C code, with libc at its core. The GNU build system itself assumes the availability of a Bourne shell and command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep'. Furthermore, build programs---programs that run @code{./configure}, @code{make}, etc.---are written in Guile Scheme (@pxref{Derivations}). Consequently, to be able to build anything at all, from scratch, Guix relies on pre-built binaries of Guile, GCC, Binutils, libc, and the other packages mentioned above---the @dfn{bootstrap binaries}." msgstr "Das GNU-System besteht in erster Linie aus C-Code, dessen Kern die libc ist. Das GNU-Erstellungssystem selbst setzt voraus, dass eine Bourne-Shell und die Kommandozeilenwerkzeuge der GNU-Coreutils, Awk, Findutils, „sed“ und „grep“ verfügbar sind. Des Weiteren sind Programme für die Erstellung — also Programme, die @code{./configure}, @code{make}, etc.@: ausführen — in Guile Scheme geschrieben (siehe @ref{Derivations}). Folglich ist es erforderlich, dass, damit überhaupt irgendetwas erstellt werden kann, Guix vorerstellte Binärdateien von Guile, GCC, Binutils, libc und den anderen oben genannten Paketen verwendet. Diese bezeichnen wir als die @dfn{Bootstrap-Binärdateien}." #. type: Plain text -#: doc/guix.texi:25689 +#: doc/guix.texi:25671 msgid "These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later)." msgstr "Diese Bootstrap-Binärdateien werden als „gegeben“ angenommen, obwohl wir sie auch neu erzeugen können, falls nötig (mehr dazu später)." #. type: unnumberedsec -#: doc/guix.texi:25690 +#: doc/guix.texi:25672 #, no-wrap msgid "Preparing to Use the Bootstrap Binaries" -msgstr "Vorbereitung, um die Bootstrap-Binärdateien zu verwenden" +msgstr "Vorbereitung@comma{} um die Bootstrap-Binärdateien zu verwenden" #. type: Plain text -#: doc/guix.texi:25695 +#: doc/guix.texi:25677 msgid "@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap derivations}" msgstr "@image{images/bootstrap-graph,6in,,Abhängigkeitsgraph der frühen Bootstrap-Ableitungen}" #. type: Plain text -#: doc/guix.texi:25700 +#: doc/guix.texi:25682 msgid "The figure above shows the very beginning of the dependency graph of the distribution, corresponding to the package definitions of the @code{(gnu packages bootstrap)} module. A similar figure can be generated with @command{guix graph} (@pxref{Invoking guix graph}), along the lines of:" msgstr "Die Abbildung oben zeigt den Anfang des Abhängigkeitsgraphen der Distribution und entspricht den Paketdefinitionen im @code{(gnu package bootstrap)}-Modul. Eine ähnliche Grafik kann mit @command{guix graph} (siehe @ref{Invoking guix graph}) erzeugt werden:" #. type: example -#: doc/guix.texi:25705 +#: doc/guix.texi:25687 #, no-wrap msgid "" "guix graph -t derivation \\\n" @@ -46765,43 +46797,43 @@ msgstr "" " | dot -Tps > t.ps\n" #. type: Plain text -#: doc/guix.texi:25714 +#: doc/guix.texi:25696 msgid "At this level of detail, things are slightly complex. First, Guile itself consists of an ELF executable, along with many source and compiled Scheme files that are dynamically loaded when it runs. This gets stored in the @file{guile-2.0.7.tar.xz} tarball shown in this graph. This tarball is part of Guix's ``source'' distribution, and gets inserted into the store with @code{add-to-store} (@pxref{The Store})." -msgstr "Bei diesem Detaillierungsgrad sind die Dinge recht komplex. Guile selbst besteht aus einer ausführbaren ELF-Datei neben vielen Quelldateien und kompilierten Scheme Dateien, die dynamisch bei der Ausführung geladen werden. Das wird in dem im Graph gezeigten @file{guile-2.0.7.tar.xz}-Archiv gespeichert. Das Archiv ist Teil von Guix’ „Quelldistribution“ und wird in den Store mit @code{add-to-store} (siehe @ref{The Store}) eingefügt." +msgstr "Bei diesem Detaillierungsgrad sind die Dinge recht komplex. Guile selbst besteht aus einer ausführbaren ELF-Datei neben vielen Quelldateien und kompilierten Scheme-Dateien, die dynamisch bei der Ausführung geladen werden. Das wird in dem im Graph gezeigten @file{guile-2.0.7.tar.xz}-Archiv gespeichert. Das Archiv ist Teil von Guix’ „Quelldistribution“ und wird in den Store mit @code{add-to-store} (siehe @ref{The Store}) eingefügt." #. type: Plain text -#: doc/guix.texi:25723 +#: doc/guix.texi:25705 msgid "But how do we write a derivation that unpacks this tarball and adds it to the store? To solve this problem, the @code{guile-bootstrap-2.0.drv} derivation---the first one that gets built---uses @code{bash} as its builder, which runs @code{build-bootstrap-guile.sh}, which in turn calls @code{tar} to unpack the tarball. Thus, @file{bash}, @file{tar}, @file{xz}, and @file{mkdir} are statically-linked binaries, also part of the Guix source distribution, whose sole purpose is to allow the Guile tarball to be unpacked." msgstr "" #. type: Plain text -#: doc/guix.texi:25735 +#: doc/guix.texi:25717 msgid "Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile that can be used to run subsequent build programs. Its first task is to download tarballs containing the other pre-built binaries---this is what the @code{.tar.xz.drv} derivations do. Guix modules such as @code{ftp-client.scm} are used for this purpose. The @code{module-import.drv} derivations import those modules in a directory in the store, using the original layout. The @code{module-import-compiled.drv} derivations compile those modules, and write them in an output directory with the right layout. This corresponds to the @code{#:modules} argument of @code{build-expression->derivation} (@pxref{Derivations})." msgstr "" #. type: Plain text -#: doc/guix.texi:25739 +#: doc/guix.texi:25721 msgid "Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at which point we have a working C tool chain." msgstr "" #. type: unnumberedsec -#: doc/guix.texi:25741 +#: doc/guix.texi:25723 #, no-wrap msgid "Building the Build Tools" msgstr "" #. type: Plain text -#: doc/guix.texi:25750 +#: doc/guix.texi:25732 msgid "Bootstrapping is complete when we have a full tool chain that does not depend on the pre-built bootstrap tools discussed above. This no-dependency requirement is verified by checking whether the files of the final tool chain contain references to the @file{/gnu/store} directories of the bootstrap inputs. The process that leads to this ``final'' tool chain is described by the package definitions found in the @code{(gnu packages commencement)} module." msgstr "" #. type: Plain text -#: doc/guix.texi:25757 +#: doc/guix.texi:25739 msgid "The @command{guix graph} command allows us to ``zoom out'' compared to the graph above, by looking at the level of package objects instead of individual derivations---remember that a package may translate to several derivations, typically one derivation to download its source, one to build the Guile modules it needs, and one to actually build the package from source. The command:" msgstr "" #. type: example -#: doc/guix.texi:25762 +#: doc/guix.texi:25744 #, no-wrap msgid "" "guix graph -t bag \\\n" @@ -46810,171 +46842,184 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:25769 +#: doc/guix.texi:25751 msgid "produces the dependency graph leading to the ``final'' C library@footnote{You may notice the @code{glibc-intermediate} label, suggesting that it is not @emph{quite} final, but as a good approximation, we will consider it final.}, depicted below." msgstr "" #. type: Plain text -#: doc/guix.texi:25771 +#: doc/guix.texi:25753 msgid "@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}" msgstr "" #. type: Plain text -#: doc/guix.texi:25777 +#: doc/guix.texi:25759 msgid "The first tool that gets built with the bootstrap binaries is GNU@tie{}Make---noted @code{make-boot0} above---which is a prerequisite for all the following packages. From there Findutils and Diffutils get built." msgstr "" #. type: Plain text -#: doc/guix.texi:25782 +#: doc/guix.texi:25764 msgid "Then come the first-stage Binutils and GCC, built as pseudo cross tools---i.e., with @code{--target} equal to @code{--host}. They are used to build libc. Thanks to this cross-build trick, this libc is guaranteed not to hold any reference to the initial tool chain." msgstr "" #. type: Plain text -#: doc/guix.texi:25788 +#: doc/guix.texi:25770 msgid "From there the final Binutils and GCC (not shown above) are built. GCC uses @code{ld} from the final Binutils, and links programs against the just-built libc. This tool chain is used to build the other packages used by Guix and by the GNU Build System: Guile, Bash, Coreutils, etc." msgstr "" #. type: Plain text -#: doc/guix.texi:25794 +#: doc/guix.texi:25776 msgid "And voilà! At this point we have the complete set of build tools that the GNU Build System expects. These are in the @code{%final-inputs} variable of the @code{(gnu packages commencement)} module, and are implicitly used by any package that uses @code{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})." msgstr "" #. type: unnumberedsec -#: doc/guix.texi:25796 +#: doc/guix.texi:25778 #, no-wrap msgid "Building the Bootstrap Binaries" msgstr "" #. type: Plain text -#: doc/guix.texi:25803 +#: doc/guix.texi:25785 msgid "Because the final tool chain does not depend on the bootstrap binaries, those rarely need to be updated. Nevertheless, it is useful to have an automated way to produce them, should an update occur, and this is what the @code{(gnu packages make-bootstrap)} module provides." msgstr "" #. type: Plain text -#: doc/guix.texi:25807 +#: doc/guix.texi:25789 msgid "The following command builds the tarballs containing the bootstrap binaries (Guile, Binutils, GCC, libc, and a tarball containing a mixture of Coreutils and other basic command-line tools):" msgstr "" #. type: example -#: doc/guix.texi:25810 +#: doc/guix.texi:25792 #, no-wrap msgid "guix build bootstrap-tarballs\n" msgstr "" #. type: Plain text -#: doc/guix.texi:25815 +#: doc/guix.texi:25797 msgid "The generated tarballs are those that should be referred to in the @code{(gnu packages bootstrap)} module mentioned at the beginning of this section." msgstr "" #. type: Plain text -#: doc/guix.texi:25821 +#: doc/guix.texi:25803 msgid "Still here? Then perhaps by now you've started to wonder: when do we reach a fixed point? That is an interesting question! The answer is unknown, but if you would like to investigate further (and have significant computational and storage resources to do so), then let us know." msgstr "" #. type: unnumberedsec -#: doc/guix.texi:25822 +#: doc/guix.texi:25804 #, no-wrap msgid "Reducing the Set of Bootstrap Binaries" msgstr "" #. type: Plain text -#: doc/guix.texi:25830 +#: doc/guix.texi:25812 msgid "Our bootstrap binaries currently include GCC, Guile, etc. That's a lot of binary code! Why is that a problem? It's a problem because these big chunks of binary code are practically non-auditable, which makes it hard to establish what source code produced them. Every unauditable binary also leaves us vulnerable to compiler backdoors as described by Ken Thompson in the 1984 paper @emph{Reflections on Trusting Trust}." msgstr "" #. type: Plain text -#: doc/guix.texi:25836 +#: doc/guix.texi:25818 msgid "This is mitigated by the fact that our bootstrap binaries were generated from an earlier Guix revision. Nevertheless it lacks the level of transparency that we get in the rest of the package dependency graph, where Guix always gives us a source-to-binary mapping. Thus, our goal is to reduce the set of bootstrap binaries to the bare minimum." msgstr "" #. type: Plain text -#: doc/guix.texi:25842 +#: doc/guix.texi:25824 msgid "The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that. One of these is about replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler. Your help is welcome!" msgstr "" #. type: chapter -#: doc/guix.texi:25845 +#: doc/guix.texi:25827 #, no-wrap msgid "Porting to a New Platform" msgstr "Auf eine neue Plattform portieren" #. type: Plain text -#: doc/guix.texi:25854 +#: doc/guix.texi:25836 msgid "As discussed above, the GNU distribution is self-contained, and self-containment is achieved by relying on pre-built ``bootstrap binaries'' (@pxref{Bootstrapping}). These binaries are specific to an operating system kernel, CPU architecture, and application binary interface (ABI). Thus, to port the distribution to a platform that is not yet supported, one must build those bootstrap binaries, and update the @code{(gnu packages bootstrap)} module to use them on that platform." msgstr "Wie oben beschrieben ist die GNU-Distribution eigenständig und diese Eigenständigkeit wird erreicht, indem sie aus vorerstellten „Bootstrap-Binärdateien“ heraus erstellt werden kann (siehe @ref{Bootstrapping}). Diese Binärdateien unterscheiden sich je nach verwendetem Betriebssystem-Kernel, nach der Prozessorarchitektur und der Anwendungsbinärschnittstelle („Application Binary Interface“, kurz ABI). Um die Distribution also auf eine noch nicht unterstützte Plattform zu portieren, muss man diese Bootstrap-Binärdateien für diese Plattform erstellen und das Modul @code{(gnu packages bootstrap)} aktualisieren, damit es sie benutzt." #. type: Plain text -#: doc/guix.texi:25859 +#: doc/guix.texi:25841 msgid "Fortunately, Guix can @emph{cross compile} those bootstrap binaries. When everything goes well, and assuming the GNU tool chain supports the target platform, this can be as simple as running a command like this one:" msgstr "Zum Glück kann Guix diese Bootstrap-Binärdateien @emph{cross-kompilieren}. Wenn alles gut geht, und vorausgesetzt, die GNU-Werkzeuge (zusammen werden sie als GNU-„Toolchain“ bezeichnet) unterstützen diese Zielplattform auch, dann kann es völlig ausreichen, dass Sie einen Befehl wie hier ausführen:" #. type: example -#: doc/guix.texi:25862 +#: doc/guix.texi:25844 #, no-wrap msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n" msgstr "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n" #. type: Plain text -#: doc/guix.texi:25869 +#: doc/guix.texi:25851 msgid "For this to work, the @code{glibc-dynamic-linker} procedure in @code{(gnu packages bootstrap)} must be augmented to return the right file name for libc's dynamic linker on that platform; likewise, @code{system->linux-architecture} in @code{(gnu packages linux)} must be taught about the new platform." msgstr "Damit das funktioniert, muss erst die @code{glibc-dynamic-linker}-Prozedur in @code{(gnu packages bootstrap)} angepasst werden, damit sie den richtigen Dateinamen für den dynamischen Binder von libc auf dieser Plattform liefert; ebenso muss @code{system->linux-architecture} in @code{(gnu packages linux)} mit den Informationen über die neue Plattform versorgt werden." #. type: Plain text -#: doc/guix.texi:25878 +#: doc/guix.texi:25860 msgid "Once these are built, the @code{(gnu packages bootstrap)} module needs to be updated to refer to these binaries on the target platform. That is, the hashes and URLs of the bootstrap tarballs for the new platform must be added alongside those of the currently supported platforms. The bootstrap Guile tarball is treated specially: it is expected to be available locally, and @file{gnu/local.mk} has rules to download it for the supported architectures; a rule for the new platform must be added as well." msgstr "Sobald diese erstellt wurden, muss das Modul @code{(gnu packages bootstrap)} aktualisiert werden, damit es diese Binärdateien für die Zielplattform benutzt. Das heißt, die Hashes und URLs der Bootstrap-Tarballs für die neue Plattform müssen neben denen für die bisher unterstützten Plattformen aufgeführt werden. Der Bootstrap-Guile-Tarball wird besonders behandelt: Von ihm wird erwartet, dass er lokal verfügbar ist, und @file{gnu/local.mk} enthält Regeln, um ihn für die unterstützten Architekturen herunterzuladen; eine Regel muss auch für die neue Plattform hinzugefügt werden." #. type: Plain text -#: doc/guix.texi:25887 +#: doc/guix.texi:25869 msgid "In practice, there may be some complications. First, it may be that the extended GNU triplet that specifies an ABI (like the @code{eabi} suffix above) is not recognized by all the GNU tools. Typically, glibc recognizes some of these, whereas GCC uses an extra @code{--with-abi} configure flag (see @code{gcc.scm} for examples of how to handle this). Second, some of the required packages could fail to build for that platform. Lastly, the generated binaries could be broken for some reason." msgstr "In der Praxis kann es einige Schwierigkeiten geben. Erstens kann es sein, dass das erweiterte GNU-Tripel, das eine Anwendungsbinärschnittstelle (ABI) festlegt (wie es das @code{eabi}-Suffix oben tut) nicht von allen GNU-Werkzeugen erkannt wird. Typischerweise erkennt glibc manche davon, während für GCC eine zusätzliche Befehlszeilenoption @code{--with-abi} an configure übergeben werden muss (siehe @code{gcc.scm} für Beispiele, wie man das macht). Zweitens könnte es sein, dass manche der notwendige Pakete für diese Plattform nicht erfolgreich erstellt werden können. Zuletzt könnten die generierten Binärdateien aus dem einen oder anderen Grund fehlerhaft sein." #. type: include -#: doc/guix.texi:25889 +#: doc/guix.texi:25871 #, no-wrap msgid "contributing.texi" msgstr "contributing.de.texi" #. type: Plain text -#: doc/guix.texi:25902 +#: doc/guix.texi:25884 msgid "Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see the @file{nix/AUTHORS} file in Guix.) Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes. Without this work, Guix would not exist." msgstr "Guix baut auf dem @uref{https://nixos.org/nix/, Nix-Paketverwaltungsprogramm} auf, das von Eelco Dolstra entworfen und entwickelt wurde, mit Beiträgen von anderen Leuten (siehe die Datei @file{nix/AUTHORS} in Guix). Nix hat für die funktionale Paketverwaltung die Pionierarbeit geleistet und noch nie dagewesene Funktionalitäten vorangetrieben wie transaktionsbasierte Paketaktualisierungen und die Rücksetzbarkeit selbiger, eigene Paketprofile für jeden Nutzer und referenziell transparente Erstellungsprozesse. Ohne diese Arbeit gäbe es Guix nicht." #. type: Plain text -#: doc/guix.texi:25905 +#: doc/guix.texi:25887 msgid "The Nix-based software distributions, Nixpkgs and NixOS, have also been an inspiration for Guix." msgstr "Die Nix-basierten Software-Distributionen Nixpkgs und NixOS waren auch eine Inspiration für Guix." #. type: Plain text -#: doc/guix.texi:25911 +#: doc/guix.texi:25893 msgid "GNU@tie{}Guix itself is a collective work with contributions from a number of people. See the @file{AUTHORS} file in Guix for more information on these fine people. The @file{THANKS} file lists people who have helped by reporting bugs, taking care of the infrastructure, providing artwork and themes, making suggestions, and more---thank you!" msgstr "GNU@tie{}Guix ist selbst das Produkt kollektiver Arbeit mit Beiträgen durch eine Vielzahl von Leuten. Siehe die Datei @file{AUTHORS} in Guix für mehr Informationen, wer diese wunderbaren Menschen sind. In der Datei @file{THANKS} finden Sie eine Liste der Leute, die uns geholfen haben, indem Sie Fehler gemeldet, sich um unsere Infrastruktur gekümmert, künstlerische Arbeit und schön gestaltete Themen beigesteuert, Vorschläge gemacht und noch vieles mehr getan haben — vielen Dank!" #. type: cindex -#: doc/guix.texi:25916 +#: doc/guix.texi:25898 #, no-wrap msgid "license, GNU Free Documentation License" msgstr "Lizenz, GNU-Lizenz für freie Dokumentation" #. type: include -#: doc/guix.texi:25917 +#: doc/guix.texi:25899 #, no-wrap msgid "fdl-1.3.texi" msgstr "fdl-1.3.texi" -#~ msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. This is currently in an experimental stage, with limited support. @xref{Contributing}, for how to help!" -#~ msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, Linux-Libre als Kernel. Derzeit ist dies noch in der Erprobungsphase mit begrenzter Unterstützung. Unter @ref{Contributing} steht, wie Sie dabei helfen können!" +#~ msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully supported; in particular, the project's build farms no longer provide substitutes for this architecture." +#~ msgstr "64-Bit-MIPS-Prozessoren, little-endian, speziell die Loongson-Reihe, n32-ABI, mit Linux-Libre als Kernel. Diese Konfiguration wird nicht länger in vollem Umfang unterstützt; insbesondere werden von der Build-Farm des Guix-Projekts keine Substitute mehr für diese Architektur angeboten." #~ msgid "" -#~ "image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" -#~ "docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" -#~ " --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" -#~ " $image_id /var/guix/profiles/system/boot\n" +#~ "image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" +#~ "container_id=\"`docker create $image_id`\"\n" +#~ "docker start $container_id\n" #~ msgstr "" -#~ "image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" -#~ "docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" -#~ " --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" -#~ " $image_id /var/guix/profiles/system/boot\n" +#~ "image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" +#~ "container_id=\"`docker create $image_id`\"\n" +#~ "docker start $container_id\n" + +#~ msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. You can get an interactive shell running in the container using @command{docker exec}:" +#~ msgstr "Dieser Befehl startet einen neuen Docker-Container aus dem angegebenen Abbild. Damit wird das Guix-System auf die normale Weise hochgefahren, d.h.@: zunächst werden alle Dienste gestartet, die Sie in der Konfiguration des Betriebssystems angegeben haben. Sie können eine interaktive Shell in dieser isolierten Umgebung bekommen, indem Sie @command{docker exec} benutzen:" + +#~ msgid "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" +#~ msgstr "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" + +#~ msgid "For the @code{container} action, allow containers to access the host network, that is, do not create a network namespace." +#~ msgstr "Für die Aktion @code{container} dürfen isolierte Umgebungen (auch bekannt als „Container“) auf das Wirtsnetzwerk zugreifen, d.h.@: es wird kein Netzwerknamensraum für sie erzeugt." + +#~ msgid "@code{auto-start?} (default: @code{#t})" +#~ msgstr "@code{auto-start?} (Vorgabe: @code{#t})" + +#~ msgid "Whether this service should be started automatically by the Shepherd. If it is @code{#f} the service has to be started manually with @code{herd start}." +#~ msgstr "Ob dieser Dienst automatisch durch Shepherd gestartet werden sollte. Wenn es auf @code{#f} steht, muss der Dienst manuell über @code{herd start} gestartet werden." #~ msgid "The @code{guix} package must remain available in @code{root}'s profile, or it would become subject to garbage collection---in which case you would find yourself badly handicapped by the lack of the @command{guix} command. In other words, do not remove @code{guix} by running @code{guix package -r guix}." #~ msgstr "Das @code{guix}-Paket muss im Profil von @code{root} installiert bleiben, damit es nicht vom Müllsammler geholt wird, denn ohne den @command{guix}-Befehl wären Sie lahmgelegt. Anders gesagt, entfernen Sie @code{guix} @emph{nicht} mit @code{guix package -r guix}." -- cgit v1.2.3 From b644008ca2ea2cb588a1deec8cddaf8e4f07e004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 13 Jun 2019 18:09:21 +0200 Subject: gnu: mes-boot, tcc-boot0: Require nyacc 0.86. This is a followup to b8016467273d06ffe3780ac97d38acfd72ce15d9. * gnu/packages/commencement.scm (mes-boot, tcc-boot0): Use source from NYACC-0.86 instead of NYACC. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8f59087ff4..13b813f806 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver @@ -91,7 +91,7 @@ (propagated-inputs '()) (native-inputs `(("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc)) + ("nyacc-source" ,(package-source nyacc-0.86)) ("coreutils" , %bootstrap-coreutils&co) ("bootstrap-mes" ,%bootstrap-mes))) @@ -182,7 +182,7 @@ (native-inputs `(("mes" ,mes-boot) ("mescc-tools" ,%bootstrap-mescc-tools) - ("nyacc-source" ,(package-source nyacc)) + ("nyacc-source" ,(package-source nyacc-0.86)) ("coreutils" , %bootstrap-coreutils&co) ("bootstrap-mes" ,%bootstrap-mes))) -- cgit v1.2.3 From 44f07d1dc6806e97c4e9ee3e6be883cc59dc666e Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Tue, 28 May 2019 15:40:26 +0000 Subject: gnu: guile: Disable unreliable out-of-memory test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/guile-2.2-skip-oom-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/guile.scm (guile-2.2)[source](patches): Add "guile-2.2-skip-oom-test.patch". Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/guile.scm | 2 ++ gnu/packages/patches/guile-2.2-skip-oom-test.patch | 25 ++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 gnu/packages/patches/guile-2.2-skip-oom-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index a212dbc799..b92f82e7cb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -891,6 +891,7 @@ dist_patch_DATA = \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ + %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 67825ffc30..ae5fca513a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -228,6 +228,8 @@ without requiring the source code to be rewritten.") (base32 "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) (modules '((guix build utils))) + (patches (search-patches + "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything ;; from source, at the expense of significantly longer build diff --git a/gnu/packages/patches/guile-2.2-skip-oom-test.patch b/gnu/packages/patches/guile-2.2-skip-oom-test.patch new file mode 100644 index 0000000000..765577653f --- /dev/null +++ b/gnu/packages/patches/guile-2.2-skip-oom-test.patch @@ -0,0 +1,25 @@ +Skip 'test-out-of-memory', which is unreliable in Guile 2.2.4: + + https://bugs.gnu.org/34155 + +--- a/test-suite/standalone/Makefile.in 1969-12-31 19:00:00.000000000 -0500 ++++ b/test-suite/standalone/Makefile.in 2019-05-27 16:44:32.302355990 -0400 +@@ -103,7 +103,7 @@ + test-scm-c-bind-keyword-arguments$(EXEEXT) \ + test-srfi-4$(EXEEXT) $(am__append_6) $(am__EXEEXT_1) \ + test-smob-mark$(EXEEXT) test-smob-mark-race$(EXEEXT) \ +- test-stack-overflow test-out-of-memory ++ test-stack-overflow + check_PROGRAMS = test-num2integral$(EXEEXT) test-round$(EXEEXT) \ + test-foreign-object-c$(EXEEXT) test-list$(EXEEXT) \ + test-unwind$(EXEEXT) test-conversion$(EXEEXT) \ +@@ -1938,8 +1938,7 @@ + test-command-line-encoding test-command-line-encoding2 \ + test-language test-guild-compile $(am__append_3) \ + test-foreign-object-scm test-fast-slot-ref test-mb-regexp \ +- test-use-srfi $(am__append_5) test-stack-overflow \ +- test-out-of-memory ++ test-use-srfi $(am__append_5) test-stack-overflow + BUILT_SOURCES = $(am__append_2) + EXTRA_DIST = test-import-order-a.scm test-import-order-b.scm \ + test-import-order-c.scm test-import-order-d.scm \ -- cgit v1.2.3 From 267966f9111f4af905479fd01e7689912ccba026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Jun 2019 15:04:09 +0200 Subject: download: Add 'url-fetch/executable'. * guix/download.scm (built-in-download): Add #:executable? parameter. Pass #:recursive? to 'raw-derivation' and add "executable" to the #:env-vars alist when EXECUTABLE? is true. (url-fetch): Add #:executable? and pass it to 'built-in-download'. (url-fetch/executable): New procedure. --- guix/download.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/guix/download.scm b/guix/download.scm index cd5d61cd13..7782693f23 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -36,6 +36,7 @@ #:use-module (srfi srfi-26) #:export (%mirrors url-fetch + url-fetch/executable url-fetch/tarbomb url-fetch/zipbomb download-to-store)) @@ -420,8 +421,10 @@ (define* (built-in-download file-name url #:key system hash-algo hash mirrors content-addressed-mirrors + executable? (guile 'unused)) - "Download FILE-NAME from URL using the built-in 'download' builder. + "Download FILE-NAME from URL using the built-in 'download' builder. When +EXECUTABLE? is true, make the downloaded file executable. This is an \"out-of-band\" download in that the returned derivation does not explicitly depend on Guile, GnuTLS, etc. Instead, the daemon performs the @@ -433,6 +436,7 @@ download by itself using its own dependencies." #:system system #:hash-algo hash-algo #:hash hash + #:recursive? executable? #:inputs `((,mirrors) (,content-addressed-mirrors)) @@ -444,7 +448,10 @@ download by itself using its own dependencies." #:env-vars `(("url" . ,(object->string url)) ("mirrors" . ,mirrors) ("content-addressed-mirrors" - . ,content-addressed-mirrors)) + . ,content-addressed-mirrors) + ,@(if executable? + '(("executable" . "1")) + '())) ;; Do not offload this derivation because we cannot be ;; sure that the remote daemon supports the 'download' @@ -455,11 +462,13 @@ download by itself using its own dependencies." (define* (url-fetch url hash-algo hash #:optional name #:key (system (%current-system)) - (guile (default-guile))) + (guile (default-guile)) + executable?) "Return a fixed-output derivation that fetches URL (a string, or a list of strings denoting alternate URLs), which is expected to have hash HASH of type HASH-ALGO (a symbol). By default, the file name is the base name of URL; -optionally, NAME can specify a different file name. +optionally, NAME can specify a different file name. When EXECUTABLE? is true, +make the downloaded file executable. When one of the URL starts with mirror://, then its host part is interpreted as the name of a mirror scheme, taken from %MIRROR-FILE. @@ -490,10 +499,21 @@ in the store." #:system system #:hash-algo hash-algo #:hash hash + #:executable? executable? #:mirrors %mirror-file #:content-addressed-mirrors %content-addressed-mirror-file))))) +(define* (url-fetch/executable url hash-algo hash + #:optional name + #:key (system (%current-system)) + (guile (default-guile))) + "Like 'url-fetch', but make the downloaded file executable." + (url-fetch url hash-algo hash name + #:system system + #:guile guile + #:executable? #t)) + (define* (url-fetch/tarbomb url hash-algo hash #:optional name #:key (system (%current-system)) -- cgit v1.2.3 From 836a85da0e8609d40716581be00802ee43463038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Jun 2019 15:10:45 +0200 Subject: gnu: bootstrap: Download the bootstrap bash, mkdir, tar, and xz binaries. * gnu/packages/bootstrap.scm (%bootstrap-executables): New variable. (bootstrap-executable-url, bootstrap-executable): New procedure. (raw-build)[->store]: Use 'run-with-store' and 'origin->derivation'. Add calls to 'derivation->output-path', and remove the list of references passed to 'add-text-to-store' for BUILDER. Augment the list of #:inputs passed to 'derivation'. (package-from-tarball): Use 'bootstrap-executable' instead of 'search-bootstrap-binary'. (%bootstrap-glibc, %bootstrap-gcc, %bootstrap-mescc-tools) (%bootstrap-mes): Likewise. * guix/scripts/environment.scm (environment-bash): Use 'bootstrap-executable' instead of 'search-bootstrap-binary'. (guix-environment): Adjust CONTAINER? case accordingly. * po/guix/POTFILES.in: Add gnu/packages/bootstrap.scm. --- gnu/packages/bootstrap.scm | 123 +++++++++++++++++++++++++++++++++++-------- guix/scripts/environment.scm | 10 ++-- po/guix/POTFILES.in | 1 + 3 files changed, 107 insertions(+), 27 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 50786d9f21..255141ae87 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen @@ -33,8 +33,11 @@ #:select (derivation derivation->output-path)) #:use-module ((guix utils) #:select (gnu-triplet->nix-system)) #:use-module (guix memoization) + #:use-module (guix i18n) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:export (bootstrap-origin package-with-bootstrap-guile @@ -60,6 +63,82 @@ ;;; Code: + +;;; +;;; The bootstrap executables: 'bash', 'mkdir', 'tar', 'xz'. They allow us to +;;; extract the very first tarball. +;;; + +(define %bootstrap-executables + ;; List of bootstrap executables and their recursive hashes (as per 'guix + ;; hash -r'), taking their executable bit into account. + `(("aarch64-linux" + ("bash" + ,(base32 "13aqhqb8nydlwq1ah9974q0iadx1pb95v13wzzyf7vgv6nasrwzr")) + ("mkdir" + ,(base32 "1pxhdp7ldwavmm71xbh9wc197cb2nr66acjn26yjx3732cixh9ws")) + ("tar" + ,(base32 "1j51gv08sfg277yxj73xd564wjq3f8xwd6s9rbcg8v9gms47m4cx")) + ("xz" + ,(base32 "1d779rwsrasphg5g3r37qppcqy3p7ay1jb1y83w7x4i3qsc7zjy2"))) + ("armhf-linux" + ("bash" + ,(base32 "0s6f1s26g4dsrrkl39zblvwpxmbzi6n9mgqf6vxsqz42gik6bgyn")) + ("mkdir" + ,(base32 "1r5rcp35niyxfkrdf00y2ba8ifrq9bi76cr63lwjf2l655j1i5p7")) + ("tar" + ,(base32 "0dksx5im3fv8ximz7368bsax9f26nn47ds74298flm5lnvpv9xly")) + ("xz" + ,(base32 "1cqqavghjfr0iwxqf61lrssv27wfigysgq2rs4rm1gkmn04yn1k3"))) + ("i686-linux" + ("bash" + ,(base32 "0rjaxyzjdllfkf1abczvgaf3cdcc7mmahyvdbkjmjzhgz92pv23g")) + ("mkdir" + ,(base32 "133ybmfpkmsnysrzbngwvbysqnsmfi8is8zifs7i7n6n600h4s1w")) + ("tar" + ,(base32 "07830bx29ad5i0l1ykj0g0b1jayjdblf01sr3ww9wbnwdbzinqms")) + ("xz" + ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k"))) + ("mips64el-linux" + ("bash" + ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6")) + ("mkdir" + ,(base32 "0c9j6qgyw84zxbry3ypifzll13gy8ax71w40kdk1h11jbgla3f5k")) + ("tar" + ,(base32 "06gmqdjq3rl8lr47b9fyx4ifnm5x56ymc8lyryp1ax1j2s4y5jb4")) + ("xz" + ,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5"))))) + +(define (bootstrap-executable-url program system) + "Return the URL where PROGRAM can be found for SYSTEM." + (string-append + "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" + system "/" program + "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")) + +(define bootstrap-executable + (mlambda (program system) + "Return an origin for PROGRAM, a statically-linked bootstrap executable +built for SYSTEM." + (let ((system (if (string=? system "x86_64-linux") + "i686-linux" + system))) + (match (assoc-ref (assoc-ref %bootstrap-executables system) + program) + (#f + (raise (condition + (&message + (message + (format #f (G_ "could not find bootstrap binary '~a' \ +for system '~a'") + program system)))))) + ((sha256) + (origin + (method url-fetch/executable) + (uri (bootstrap-executable-url program system)) + (file-name program) + (sha256 sha256))))))) + ;;; ;;; Helper procedures. @@ -133,8 +212,8 @@ or false to signal an error." (invoke (string-append "bin/" ,program-to-test) "--version")))))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (source (%current-system)))))) (source #f) (synopsis description) @@ -258,11 +337,9 @@ or false to signal an error." #:key outputs system search-paths #:allow-other-keys) (define (->store file) - (add-to-store store file #t "sha256" - (or (search-bootstrap-binary file - system) - (error "bootstrap binary not found" - file system)))) + (run-with-store store + (origin->derivation (bootstrap-executable file system) + system))) (let* ((tar (->store "tar")) (xz (->store "xz")) @@ -312,14 +389,16 @@ $out/bin/guile -c ~s $out ~a # Sanity check. $out/bin/guile --version~%" - mkdir xz tar + (derivation->output-path mkdir) + (derivation->output-path xz) + (derivation->output-path tar) (format #f "~s" make-guile-wrapper) - bash) - (list mkdir xz tar bash)))) + (derivation->output-path bash))))) (derivation store name - bash `(,builder) + (derivation->output-path bash) `(,builder) #:system system - #:inputs `((,bash) (,builder) (,guile)) + #:inputs `((,bash) (,mkdir) (,tar) (,xz) + (,builder) (,guile)) #:env-vars `(("GUILE_TARBALL" . ,(derivation->output-path guile)))))) @@ -486,8 +565,8 @@ $out/bin/guile --version~%" #t)))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (origin (method url-fetch) @@ -570,9 +649,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (chmod "gcc" #o555) #t)))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) - ("bash" ,(search-bootstrap-binary "bash" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) + ("bash" ,(bootstrap-executable "bash" (%current-system))) ("libc" ,%bootstrap-glibc) ("tarball" ,(bootstrap-origin (origin @@ -644,8 +723,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (invoke tar "xvf" (string-append builddir "/binaries.tar")))))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (origin @@ -693,8 +772,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (invoke tar "xvf" (string-append builddir "/binaries.tar")))))))) (inputs - `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("tar" ,(bootstrap-executable "tar" (%current-system))) + ("xz" ,(bootstrap-executable "xz" (%current-system))) ("tarball" ,(bootstrap-origin (origin diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index c1341628a8..ac269083c8 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -29,7 +29,7 @@ #:use-module (guix search-paths) #:use-module (guix build utils) #:use-module (guix monads) - #:use-module ((guix gexp) #:select (lower-inputs)) + #:use-module ((guix gexp) #:select (lower-object)) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (gnu build linux-container) @@ -40,7 +40,8 @@ #:use-module (gnu packages bash) #:use-module (gnu packages commencement) #:use-module (gnu packages guile) - #:use-module ((gnu packages bootstrap) #:select (%bootstrap-guile)) + #:use-module ((gnu packages bootstrap) + #:select (bootstrap-executable %bootstrap-guile)) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) @@ -600,8 +601,7 @@ Otherwise, return the derivation for the Bash package." (package->derivation bash)) ;; Use the bootstrap Bash instead. ((and container? bootstrap?) - (interned-file - (search-bootstrap-binary "bash" system))) + (lower-object (bootstrap-executable "bash" system))) (else (return #f))))) @@ -730,7 +730,7 @@ message if any test fails." (container? (let ((bash-binary (if bootstrap? - bash + (derivation->output-path bash) (string-append (derivation->output-path bash) "/bin/sh")))) (launch-environment/container #:command command diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index ceee589b2e..5172345e5a 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -36,6 +36,7 @@ gnu/installer/steps.scm gnu/installer/timezone.scm gnu/installer/user.scm gnu/installer/utils.scm +gnu/packages/bootstrap.scm guix/scripts.scm guix/scripts/build.scm guix/discovery.scm -- cgit v1.2.3 From 11b4a8716c65e8fe21e5975e764b3e14dbd8dcc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Jun 2019 17:38:51 +0200 Subject: tests: Remove expensive and pointless test. This test had become too expensive since the introduction of the reduced bootstrap. * tests/builders.scm ("gnu-build"): Remove. (%bootstrap-inputs, %bootstrap-search-paths): Remove. --- tests/builders.scm | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/tests/builders.scm b/tests/builders.scm index b2d8a7c6b2..fdcf38ded3 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,27 +40,6 @@ (define %store (open-connection-for-tests)) -(define (%bootstrap-inputs) - ;; Use the bootstrap inputs so it doesn't take ages to run these tests. - ;; This still involves building Make, Diffutils, and Findutils. - ;; XXX: We're relying on the higher-level `package-derivations' here. - (and %store - (map (match-lambda - ((name package) - (list name (package-derivation %store package)))) - (filter - (compose package? cadr) - ((@@ (gnu packages commencement) %boot0-inputs)))))) - -(define (%bootstrap-search-paths) - ;; Search path specifications that go with %BOOTSTRAP-INPUTS. - (append-map (match-lambda - ((name package _ ...) - (package-native-search-paths package))) - (filter - (compose package? cadr) - ((@@ (gnu packages commencement) %boot0-inputs))))) - (define url-fetch* (store-lower url-fetch)) @@ -99,22 +78,4 @@ (test-assert "gnu-build-system" (build-system? gnu-build-system)) -(when (or (not (network-reachable?)) (shebang-too-long?)) - (test-skip 1)) -(test-assert "gnu-build" - (let* ((url "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz") - (hash (nix-base32-string->bytevector - "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6")) - (tarball (url-fetch* %store url 'sha256 hash - #:guile %bootstrap-guile)) - (build (gnu-build %store "hello-2.8" - `(("source" ,tarball) - ,@(%bootstrap-inputs)) - #:guile %bootstrap-guile - #:search-paths (%bootstrap-search-paths))) - (out (derivation->output-path build))) - (and (build-derivations %store (list (pk 'hello-drv build))) - (valid-path? %store out) - (file-exists? (string-append out "/bin/hello"))))) - (test-end "builders") -- cgit v1.2.3 From 03d76577b96ba81c9921eb3a297d42db8644280b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Jun 2019 21:26:22 +0200 Subject: tests: Make builds less expensive. The switch to the reduced bootstrap broke build time assumptions made by tests, notably the assumption that GNU-MAKE-BOOT0 was cheap to build. This commit adjusts this to make these tests cheaper. * gnu/packages/bootstrap.scm (%bootstrap-inputs-for-tests): New variable. * guix/tests.scm (gnu-make-for-tests): New variable. * tests/guix-environment.sh: Use GNU-MAKE-FOR-TESTS instead of GNU-MAKE-BOOT0. Remove test with FINDUTILS-BOOT0. * tests/guix-package-net.sh (boot_make): Use GNU-MAKE-FOR-TESTS. * tests/packages.scm ("GNU Make, bootstrap"): Likewise. * tests/profiles.scm ("profile-derivation relative symlinks, two entries"): Likewise. * tests/union.scm (%bootstrap-inputs): Remove. ("union-build"): Use %BOOTSTRAP-INPUTS-FOR-TESTS instead of %BOOTSTRAP-INPUTS. --- gnu/packages/bootstrap.scm | 14 +++++++++++++- guix/tests.scm | 33 ++++++++++++++++++++++++++++++++- tests/guix-environment.sh | 27 ++++++--------------------- tests/guix-package-net.sh | 2 +- tests/packages.scm | 6 +++--- tests/profiles.scm | 7 +++---- tests/union.scm | 9 +++------ 7 files changed, 61 insertions(+), 37 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 255141ae87..c78aaa33d0 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -53,7 +53,9 @@ %bootstrap-glibc %bootstrap-inputs %bootstrap-mescc-tools - %bootstrap-mes)) + %bootstrap-mes + + %bootstrap-inputs-for-tests)) ;;; Commentary: ;;; @@ -809,4 +811,14 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ;; In gnu-build-system.scm, we rely on the availability of Bash. ("bash" ,%bootstrap-coreutils&co))) +(define %bootstrap-inputs-for-tests + ;; These are bootstrap inputs that are cheap to produce (no compilation + ;; needed) and that are meant to be used for testing. (These are those we + ;; used before the Mes-based reduced bootstrap.) + `(("libc" ,%bootstrap-glibc) + ("gcc" ,%bootstrap-gcc) + ("binutils" ,%bootstrap-binutils) + ("coreutils&co" ,%bootstrap-coreutils&co) + ("bash" ,%bootstrap-coreutils&co))) + ;;; bootstrap.scm ends here diff --git a/guix/tests.scm b/guix/tests.scm index 66d60e964e..9df6353798 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -23,8 +23,10 @@ #:use-module (guix packages) #:use-module (guix base32) #:use-module (guix serialization) + #:use-module ((guix utils) #:select (substitute-keyword-arguments)) #:use-module (gcrypt hash) #:use-module (guix build-system gnu) + #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64) @@ -50,7 +52,9 @@ with-derivation-narinfo with-derivation-substitute dummy-package - dummy-origin)) + dummy-origin + + gnu-make-for-tests)) ;;; Commentary: ;;; @@ -364,6 +368,33 @@ default values, and with EXTRA-FIELDS set as specified." (sha256 (base32 (make-string 52 #\x)))))) (origin (inherit o) extra-fields ...))) +(define gnu-make-for-tests + ;; This is a variant of 'gnu-make-boot0' that can be built with minimal + ;; resources. + (package-with-bootstrap-guile + (package + (inherit gnu-make) + (name "make-test-boot0") + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + #:tests? #f ;cannot run "make check" + ,@(substitute-keyword-arguments (package-arguments gnu-make) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build + (lambda _ + (invoke "./build.sh") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "make" bin) + #t)))))))) + (native-inputs '()) ;no need for 'pkg-config' + (inputs %bootstrap-inputs-for-tests)))) + ;; Local Variables: ;; eval: (put 'call-with-derivation-narinfo 'scheme-indent-function 1) ;; eval: (put 'call-with-derivation-substitute 'scheme-indent-function 2) diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index a670db36be..fb1c1a022d 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -156,7 +156,7 @@ if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null then # Compute the build environment for the initial GNU Make. guix environment --bootstrap --no-substitutes --search-paths --pure \ - -e '(@@ (gnu packages commencement) gnu-make-boot0)' > "$tmpdir/a" + -e '(@ (guix tests) gnu-make-for-tests)' > "$tmpdir/a" # Make sure bootstrap binaries are in the profile. profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` @@ -177,30 +177,15 @@ then # Make sure that the shell spawned with '--exec' sees the same environment # as returned by '--search-paths'. guix environment --bootstrap --no-substitutes --pure \ - -e '(@@ (gnu packages commencement) gnu-make-boot0)' \ + -e '(@ (guix tests) gnu-make-for-tests)' \ -- /bin/sh -c 'echo $PATH $CPATH $LIBRARY_PATH' > "$tmpdir/b" ( . "$tmpdir/a" ; echo $PATH $CPATH $LIBRARY_PATH ) > "$tmpdir/c" cmp "$tmpdir/b" "$tmpdir/c" rm "$tmpdir"/* - # Compute the build environment for the initial GNU Findutils. - guix environment --bootstrap --no-substitutes --search-paths --pure \ - -e '(@@ (gnu packages commencement) findutils-boot0)' > "$tmpdir/a" - profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` - - # Make sure the bootstrap binaries are all listed where they belong. - grep -E "^export PATH=\"$profile/bin\"" "$tmpdir/a" - grep -E "^export CPATH=\"$profile/include\"" "$tmpdir/a" - grep -E "^export LIBRARY_PATH=\"$profile/lib\"" "$tmpdir/a" - for dep in bootstrap-binaries-0 gcc-bootstrap-0 glibc-bootstrap-0 \ - make-boot0 - do - guix gc --references "$profile" | grep "$dep" - done - # The following test assumes 'make-boot0' has a "debug" output. - make_boot0_debug="`guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' | grep -e -debug`" + make_boot0_debug="`guix build -e '(@ (guix tests) gnu-make-for-tests)' | grep -e -debug`" test "x$make_boot0_debug" != "x" # Make sure the "debug" output is not listed. @@ -210,7 +195,7 @@ then # Compute the build environment for the initial GNU Make, but add in the # bootstrap Guile as an ad-hoc addition. guix environment --bootstrap --no-substitutes --search-paths --pure \ - -e '(@@ (gnu packages commencement) gnu-make-boot0)' \ + -e '(@ (guix tests) gnu-make-for-tests)' \ --ad-hoc guile-bootstrap > "$tmpdir/a" profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` @@ -227,14 +212,14 @@ then # Make sure a package list with plain package objects and package+output # tuples can be used with -e. expr_list_test_code=" -(list (@@ (gnu packages commencement) gnu-make-boot0) +(list (@ (guix tests) gnu-make-for-tests) (list (@ (gnu packages bootstrap) %bootstrap-guile) \"out\"))" guix environment --bootstrap --ad-hoc --no-substitutes --search-paths \ --pure -e "$expr_list_test_code" > "$tmpdir/a" profile=`grep "^export PATH" "$tmpdir/a" | sed -r 's|^.*="(.*)/bin"|\1|'` - for dep in make-boot0 guile-bootstrap + for dep in make-test-boot0 guile-bootstrap do guix gc --references "$profile" | grep "$dep" done diff --git a/tests/guix-package-net.sh b/tests/guix-package-net.sh index 82c346dd4c..48a94865e1 100644 --- a/tests/guix-package-net.sh +++ b/tests/guix-package-net.sh @@ -57,7 +57,7 @@ test -L "$profile" && test -L "$profile-1-link" ! test -f "$profile-2-link" test -f "$profile/bin/guile" -boot_make="(@@ (gnu packages commencement) gnu-make-boot0)" +boot_make="(@ (guix tests) gnu-make-for-tests)" boot_make_drv="`guix build -e "$boot_make" | grep -v -e -debug`" guix package --bootstrap -p "$profile" -i "$boot_make_drv" test -L "$profile-2-link" diff --git a/tests/packages.scm b/tests/packages.scm index af1f76e36d..bd100bea5b 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -935,9 +935,9 @@ (when (or (not (network-reachable?)) (shebang-too-long?)) (test-skip 1)) (test-assert "GNU Make, bootstrap" - ;; GNU Make is the first program built during bootstrap; we choose it - ;; here so that the test doesn't last for too long. - (let ((gnu-make (@@ (gnu packages commencement) gnu-make-boot0))) + ;; GNU-MAKE-FOR-TESTS can be built cheaply; we choose it here so that the + ;; test doesn't last for too long. + (let ((gnu-make gnu-make-for-tests)) (and (package? gnu-make) (or (location? (package-location gnu-make)) (not (package-location gnu-make))) diff --git a/tests/profiles.scm b/tests/profiles.scm index eef93e24cf..a4e28672b5 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -239,11 +239,10 @@ (unless (network-reachable?) (test-skip 1)) (test-assertm "profile-derivation relative symlinks, two entries" (mlet* %store-monad - ((gnu-make-boot0 -> (@@ (gnu packages commencement) gnu-make-boot0)) - (manifest -> (packages->manifest - (list %bootstrap-guile gnu-make-boot0))) + ((manifest -> (packages->manifest + (list %bootstrap-guile gnu-make-for-tests))) (guile (package->derivation %bootstrap-guile)) - (make (package->derivation gnu-make-boot0)) + (make (package->derivation gnu-make-for-tests)) (drv (profile-derivation manifest #:relative-symlinks? #t #:hooks '() diff --git a/tests/union.scm b/tests/union.scm index 091895ff8e..a8387edf42 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -32,9 +32,6 @@ #:use-module (rnrs io ports) #:use-module (ice-9 match)) -(define %bootstrap-inputs - (@@ (gnu packages commencement) %bootstrap-inputs+toolchain)) - ;; Exercise the (guix build union) module. (define %store @@ -99,8 +96,8 @@ ;; Purposefully leave duplicate entries. (filter (compose package? cadr) - (append (%bootstrap-inputs) - (take (%bootstrap-inputs) 3))))) + (append %bootstrap-inputs-for-tests + (take %bootstrap-inputs-for-tests 3))))) (builder `(begin (use-modules (guix build union)) (union-build (assoc-ref %outputs "out") -- cgit v1.2.3 From 1ba0b1e6ec41afd94a3c5f907b1122204dcb5d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Jun 2019 21:35:08 +0200 Subject: packages: Remove 'search-bootstrap-binary'. * gnu/packages.scm (%bootstrap-binaries-path, search-bootstrap-binary): Remove. * gnu/packages/bootstrap.scm (bootstrap-executable): Export. * guix/tests.scm (bootstrap-binary-file, search-bootstrap-binary): Export. * tests/derivations.scm: Remove (gnu packages) import. * tests/grafts.scm: Likewise. * tests/guix-daemon.sh: Likewise. --- gnu/packages.scm | 25 +------------------------ gnu/packages/bootstrap.scm | 1 + guix/tests.scm | 35 +++++++++++++++++++++++++++++++++++ tests/derivations.scm | 1 - tests/grafts.scm | 3 +-- tests/guix-daemon.sh | 4 ++-- 6 files changed, 40 insertions(+), 29 deletions(-) diff --git a/gnu/packages.scm b/gnu/packages.scm index 4742f49405..2d7622d397 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -46,10 +46,8 @@ #:export (search-patch search-patches search-auxiliary-file - search-bootstrap-binary %patch-path %auxiliary-files-path - %bootstrap-binaries-path %package-module-path %default-package-module-path @@ -75,18 +73,13 @@ ;;; ;;; Code: -;; By default, we store patches, auxiliary files and bootstrap binaries +;; By default, we store patches and auxiliary files ;; alongside Guile modules. This is so that these extra files can be ;; found without requiring a special setup, such as a specific ;; installation directory and an extra environment variable. One ;; advantage of this setup is that everything just works in an ;; auto-compilation setting. -(define %bootstrap-binaries-path - (make-parameter - (map (cut string-append <> "/gnu/packages/bootstrap") - %load-path))) - (define %auxiliary-files-path (make-parameter (map (cut string-append <> "/gnu/packages/aux-files") @@ -108,22 +101,6 @@ FILE-NAME found in %PATCH-PATH." (list (search-patch file-name) ...)) -(define (search-bootstrap-binary file-name system) - "Search the bootstrap binary FILE-NAME for SYSTEM. Raise an error if not -found." - ;; On x86_64 always use the i686 binaries. - (let ((system (match system - ("x86_64-linux" "i686-linux") - (_ system)))) - (or (search-path (%bootstrap-binaries-path) - (string-append system "/" file-name)) - (raise (condition - (&message - (message - (format #f (G_ "could not find bootstrap binary '~a' \ -for system '~a'") - file-name system)))))))) - (define %distro-root-directory ;; Absolute file name of the module hierarchy. Since (gnu packages …) might ;; live in a directory different from (guix), try to get the best match. diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c78aaa33d0..428a89e927 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -43,6 +43,7 @@ package-with-bootstrap-guile glibc-dynamic-linker + bootstrap-executable bootstrap-guile-origin %bootstrap-guile diff --git a/guix/tests.scm b/guix/tests.scm index 9df6353798..ff31bcad44 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -23,14 +23,18 @@ #:use-module (guix packages) #:use-module (guix base32) #:use-module (guix serialization) + #:use-module (guix monads) #:use-module ((guix utils) #:select (substitute-keyword-arguments)) + #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module (gcrypt hash) #:use-module (guix build-system gnu) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64) #:use-module (rnrs bytevectors) + #:use-module (ice-9 match) #:use-module (ice-9 binary-ports) #:use-module (web uri) #:export (open-connection-for-tests @@ -44,6 +48,8 @@ shebang-too-long? with-environment-variable + search-bootstrap-binary + mock %test-substitute-urls test-assertm @@ -87,6 +93,35 @@ store))) +(define (bootstrap-binary-file program system) + "Return the absolute file name where bootstrap binary PROGRAM for SYSTEM is +stored." + (string-append (dirname (search-path %load-path + "gnu/packages/bootstrap.scm")) + "/bootstrap/" system "/" program)) + +(define (search-bootstrap-binary file-name system) + "Search the bootstrap binary FILE-NAME for SYSTEM. Raise an error if not +found." + ;; Note: Keep bootstrap binaries on the local file system so that the 'guix' + ;; package can provide them as inputs and copy them to the right place. + (let* ((system (match system + ("x86_64-linux" "i686-linux") + (_ system))) + (file (bootstrap-binary-file file-name system))) + (if (file-exists? file) + file + (with-store store + (run-with-store store + (mlet %store-monad ((drv (origin->derivation + (bootstrap-executable file-name system)))) + (mbegin %store-monad + (built-derivations (list drv)) + (begin + (mkdir-p (dirname file)) + (copy-file (derivation->output-path drv) file) + (return file))))))))) + (define (call-with-external-store proc) "Call PROC with an open connection to the external store or #f it there is no external store to talk to." diff --git a/tests/derivations.scm b/tests/derivations.scm index c421d094a4..25ba4c9fa0 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -29,7 +29,6 @@ #:use-module (guix tests http) #:use-module ((guix packages) #:select (package-derivation base32)) #:use-module ((guix build utils) #:select (executable-file?)) - #:use-module ((gnu packages) #:select (search-bootstrap-binary)) #:use-module (gnu packages bootstrap) #:use-module ((gnu packages guile) #:select (guile-1.8)) #:use-module (srfi srfi-1) diff --git a/tests/grafts.scm b/tests/grafts.scm index f85f3c6913..e5356decc5 100644 --- a/tests/grafts.scm +++ b/tests/grafts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,7 +24,6 @@ #:use-module (guix utils) #:use-module (guix grafts) #:use-module (guix tests) - #:use-module ((gnu packages) #:select (search-bootstrap-binary)) #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index ce82cfd1e6..ca46e34ce9 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -141,7 +141,7 @@ daemon_pid=$! GUIX_DAEMON_SOCKET="$socket" \ guile -c ' - (use-modules (guix) (gnu packages) (guix tests)) + (use-modules (guix) (guix tests)) (with-store store (let* ((build (add-text-to-store store "build.sh" @@ -165,7 +165,7 @@ kill "$daemon_pid" # honored. client_code=' - (use-modules (guix) (gnu packages) (guix tests) (srfi srfi-34)) + (use-modules (guix) (guix tests) (srfi srfi-34)) (with-store store (let* ((build (add-text-to-store store "build.sh" -- cgit v1.2.3 From 92d00ca4661e186022732a47956a2bc0ef16be96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Jun 2019 21:53:25 +0200 Subject: build: Remove 'gnu/packages/bootstrap' and its binaries. * gnu/local.mk (bootstrapdir, bootstrap_i686_linuxdir) (bootstrap_armhf_linuxdir, bootstrap_aarch64_linuxdir) (bootstrap_mips64el_linuxdir, dist_bootstrap_i686_linux_DATA) (dist_bootstrap_armhf_linux_DATA, dist_bootstrap_aarch64_linux_DATA) (dist_bootstrap_mips64el_linux_DATA): Remove. (set-bootstrap-executable-permissions): Remove target. * Makefile.am (install-data-hook): Remove dependency on 'set-bootstrap-executable-permissions'. * gnu/packages/bootstrap: Remove directory. * tests/search-paths.scm ("evaluate-search-paths, separator is #f"): Adjust to match .../aux-files/linux-libre. --- .gitignore | 1 + Makefile.am | 2 +- gnu/local.mk | 35 ---------------------------- gnu/packages/bootstrap/aarch64-linux/bash | Bin 1162056 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/mkdir | Bin 558216 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/tar | Bin 1085128 -> 0 bytes gnu/packages/bootstrap/aarch64-linux/xz | Bin 738576 -> 0 bytes gnu/packages/bootstrap/armhf-linux/bash | Bin 802224 -> 0 bytes gnu/packages/bootstrap/armhf-linux/mkdir | Bin 401544 -> 0 bytes gnu/packages/bootstrap/armhf-linux/tar | Bin 755356 -> 0 bytes gnu/packages/bootstrap/armhf-linux/xz | Bin 502884 -> 0 bytes gnu/packages/bootstrap/i686-linux/bash | Bin 1351732 -> 0 bytes gnu/packages/bootstrap/i686-linux/mkdir | Bin 714316 -> 0 bytes gnu/packages/bootstrap/i686-linux/tar | Bin 1285420 -> 0 bytes gnu/packages/bootstrap/i686-linux/xz | Bin 861836 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/bash | Bin 1409080 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/mkdir | Bin 698500 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/tar | Bin 1283708 -> 0 bytes gnu/packages/bootstrap/mips64el-linux/xz | Bin 851736 -> 0 bytes tests/search-paths.scm | 8 +++---- 20 files changed, 6 insertions(+), 40 deletions(-) delete mode 100755 gnu/packages/bootstrap/aarch64-linux/bash delete mode 100755 gnu/packages/bootstrap/aarch64-linux/mkdir delete mode 100755 gnu/packages/bootstrap/aarch64-linux/tar delete mode 100755 gnu/packages/bootstrap/aarch64-linux/xz delete mode 100755 gnu/packages/bootstrap/armhf-linux/bash delete mode 100755 gnu/packages/bootstrap/armhf-linux/mkdir delete mode 100755 gnu/packages/bootstrap/armhf-linux/tar delete mode 100755 gnu/packages/bootstrap/armhf-linux/xz delete mode 100755 gnu/packages/bootstrap/i686-linux/bash delete mode 100755 gnu/packages/bootstrap/i686-linux/mkdir delete mode 100755 gnu/packages/bootstrap/i686-linux/tar delete mode 100755 gnu/packages/bootstrap/i686-linux/xz delete mode 100755 gnu/packages/bootstrap/mips64el-linux/bash delete mode 100755 gnu/packages/bootstrap/mips64el-linux/mkdir delete mode 100755 gnu/packages/bootstrap/mips64el-linux/tar delete mode 100755 gnu/packages/bootstrap/mips64el-linux/xz diff --git a/.gitignore b/.gitignore index 93d2ec9801..aa374b54b9 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,4 @@ tmp /etc/indent-code.el /.version /doc/stamp-[0-9] +/gnu/packages/bootstrap diff --git a/Makefile.am b/Makefile.am index 80be73e4bf..ec1e0285ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -589,7 +589,7 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA # The above trick doesn't work for 'config.go' because both 'config.scm' and # 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it # special treatment. -install-data-hook: set-bootstrap-executable-permissions +install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" # Assuming Guix is already installed and the daemon is up and running, this diff --git a/gnu/local.mk b/gnu/local.mk index b92f82e7cb..0ba0d1f194 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1385,38 +1385,3 @@ dist_patch_DATA = \ MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in - -bootstrapdir = $(guilemoduledir)/%D%/packages/bootstrap -bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux -bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux -bootstrap_aarch64_linuxdir = $(bootstrapdir)/aarch64-linux -bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux - -dist_bootstrap_i686_linux_DATA = \ - %D%/packages/bootstrap/i686-linux/bash \ - %D%/packages/bootstrap/i686-linux/mkdir \ - %D%/packages/bootstrap/i686-linux/tar \ - %D%/packages/bootstrap/i686-linux/xz - -dist_bootstrap_armhf_linux_DATA = \ - %D%/packages/bootstrap/armhf-linux/bash \ - %D%/packages/bootstrap/armhf-linux/mkdir \ - %D%/packages/bootstrap/armhf-linux/tar \ - %D%/packages/bootstrap/armhf-linux/xz - -dist_bootstrap_aarch64_linux_DATA = \ - %D%/packages/bootstrap/aarch64-linux/bash \ - %D%/packages/bootstrap/aarch64-linux/mkdir \ - %D%/packages/bootstrap/aarch64-linux/tar \ - %D%/packages/bootstrap/aarch64-linux/xz - -dist_bootstrap_mips64el_linux_DATA = \ - %D%/packages/bootstrap/mips64el-linux/bash \ - %D%/packages/bootstrap/mips64el-linux/mkdir \ - %D%/packages/bootstrap/mips64el-linux/tar \ - %D%/packages/bootstrap/mips64el-linux/xz - -# Those files must remain executable, so they remain executable once -# imported into the store. -set-bootstrap-executable-permissions: - chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz} diff --git a/gnu/packages/bootstrap/aarch64-linux/bash b/gnu/packages/bootstrap/aarch64-linux/bash deleted file mode 100755 index 0bfb9d1824..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/mkdir b/gnu/packages/bootstrap/aarch64-linux/mkdir deleted file mode 100755 index 35cd1815fd..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/tar b/gnu/packages/bootstrap/aarch64-linux/tar deleted file mode 100755 index 7e68edb0be..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/aarch64-linux/xz b/gnu/packages/bootstrap/aarch64-linux/xz deleted file mode 100755 index 5aa18c9234..0000000000 Binary files a/gnu/packages/bootstrap/aarch64-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/bash b/gnu/packages/bootstrap/armhf-linux/bash deleted file mode 100755 index 212a22c8ce..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/mkdir b/gnu/packages/bootstrap/armhf-linux/mkdir deleted file mode 100755 index c3e5246e92..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/tar b/gnu/packages/bootstrap/armhf-linux/tar deleted file mode 100755 index 5a6aac8a58..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/armhf-linux/xz b/gnu/packages/bootstrap/armhf-linux/xz deleted file mode 100755 index a77aebc268..0000000000 Binary files a/gnu/packages/bootstrap/armhf-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/bash b/gnu/packages/bootstrap/i686-linux/bash deleted file mode 100755 index 4b99d7eb4a..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/mkdir b/gnu/packages/bootstrap/i686-linux/mkdir deleted file mode 100755 index 6623a38404..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/tar b/gnu/packages/bootstrap/i686-linux/tar deleted file mode 100755 index d33cd391f1..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/i686-linux/xz b/gnu/packages/bootstrap/i686-linux/xz deleted file mode 100755 index f94dbde77c..0000000000 Binary files a/gnu/packages/bootstrap/i686-linux/xz and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/bash b/gnu/packages/bootstrap/mips64el-linux/bash deleted file mode 100755 index 403671d2fa..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/bash and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/mkdir b/gnu/packages/bootstrap/mips64el-linux/mkdir deleted file mode 100755 index c8d3285b38..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/mkdir and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/tar b/gnu/packages/bootstrap/mips64el-linux/tar deleted file mode 100755 index 0cdf7cce2c..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/tar and /dev/null differ diff --git a/gnu/packages/bootstrap/mips64el-linux/xz b/gnu/packages/bootstrap/mips64el-linux/xz deleted file mode 100755 index b0622ba946..0000000000 Binary files a/gnu/packages/bootstrap/mips64el-linux/xz and /dev/null differ diff --git a/tests/search-paths.scm b/tests/search-paths.scm index 8dad424415..767a80b76c 100644 --- a/tests/search-paths.scm +++ b/tests/search-paths.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,17 +29,17 @@ (test-equal "evaluate-search-paths, separator is #f" (string-append %top-srcdir - "/gnu/packages/bootstrap/aarch64-linux") + "/gnu/packages/aux-files/linux-libre") ;; The following search path spec should evaluate to a single item: the ;; first directory that matches the "-linux$" pattern in ;; gnu/packages/bootstrap. (let ((spec (search-path-specification (variable "CHBOUIB") - (files '("gnu/packages/bootstrap")) + (files '("gnu/packages/aux-files")) (file-type 'directory) (separator #f) - (file-pattern "-linux$")))) + (file-pattern "^linux")))) (match (evaluate-search-paths (list spec) (list %top-srcdir)) (((spec* . value)) -- cgit v1.2.3 From cfd4e4d06e3cda0f3eed8d6b9277ce53e55404b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Jun 2019 23:02:28 +0200 Subject: build-system/gnu: Make 'first-subdirectory' deterministic. Fixes . Reported by Christopher Baines . * guix/build/gnu-build-system.scm (first-subdirectory): Rewrite using 'scandir' so that the result is deterministic. --- guix/build/gnu-build-system.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index afa1886ecd..4df0bb4904 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -25,6 +25,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 format) + #:use-module (ice-9 ftw) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (srfi srfi-34) @@ -58,19 +59,14 @@ See https://reproducible-builds.org/specs/source-date-epoch/." (setenv "SOURCE_DATE_EPOCH" "1") #t) -(define (first-subdirectory dir) - "Return the path of the first sub-directory of DIR." - (file-system-fold (lambda (path stat result) - (string=? path dir)) - (lambda (path stat result) result) ; leaf - (lambda (path stat result) result) ; down - (lambda (path stat result) result) ; up - (lambda (path stat result) ; skip - (or result path)) - (lambda (path stat errno result) ; error - (error "first-subdirectory" (strerror errno))) - #f - dir)) +(define (first-subdirectory directory) + "Return the file name of the first sub-directory of DIRECTORY." + (match (scandir directory + (lambda (file) + (and (not (member file '("." ".."))) + (file-is-directory? (string-append directory "/" + file))))) + ((first . _) first))) (define* (set-paths #:key target inputs native-inputs (search-paths '()) (native-search-paths '()) -- cgit v1.2.3 From 4bf8500384fe29d511007444cb6edb7aeeba6c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 15 Jun 2019 15:14:06 +0200 Subject: gnu: libcap: Update to 2.27. * gnu/packages/linux.scm (libcap): Update to 2.27. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 15473b06bd..eeb3a0a3e5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1537,7 +1537,7 @@ configuration (iptunnel, ipmaddr).") (define-public libcap (package (name "libcap") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) (uri (string-append @@ -1545,7 +1545,7 @@ configuration (iptunnel, ipmaddr).") "libcap2/libcap-" version ".tar.xz")) (sha256 (base32 - "12s5b8fp61jcn4qld8a7fakcz1han4a6l3b8cyl3n6r7hk2bfc5n")))) + "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 852d30a6b615c2306a398a8065e7e28d9ec6867d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 15 Jun 2019 21:47:57 +0200 Subject: =?UTF-8?q?self:=20Don't=20build=20(guix=20tests=20=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a regression introduced in 03d76577b96ba81c9921eb3a297d42db8644280b whereby 'guix-extra.drv' would pull in (guix tests), which in turn would pull in a large number of (gnu packages …), which would fail to build due to missing .patch files. * guix/self.scm (compiled-guix)[*extra-modules*]: Exclude (guix tests …) from the list of modules. --- guix/self.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/self.scm b/guix/self.scm index 69e2381a8c..f9e65cce31 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -732,6 +732,7 @@ Info manual." (filter-map (match-lambda (('guix 'scripts _ ..1) #f) (('guix 'man-db) #f) + (('guix 'tests _ ...) #f) (name name)) (scheme-modules* source "guix")) (list *core-modules*) -- cgit v1.2.3 From fefa75f39898bda746bf8119104ab42571ec10f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Jun 2019 18:07:20 +0200 Subject: gnu: freetype: Update to 2.10.0. * gnu/packages/fontutils.scm (freetype): Update to 2.10.0. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 820dd6f666..cddd067517 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -57,13 +57,13 @@ (define-public freetype (package (name "freetype") - (version "2.9.1") + (version "2.10.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv")))) + "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w")))) (build-system gnu-build-system) (arguments ;; The use of "freetype-config" is deprecated, but other packages still -- cgit v1.2.3 From 2489acc9bd1b23f989eca2612cabf95d48d3f17b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:54:20 +0200 Subject: gnu: CMake: Update to 3.14.5. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.5. --- gnu/packages/cmake.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index e77c97e11f..8a0bba2e8f 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.4") + (version "3.14.5") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1n9nzxq1dzbpa0pisdv7g57a8qr9b7n35vbfy489s1v602dxrd00")) + "01lcl6ynxfgqn09ncfz1gr24ha5pv1slk0azzaawaqrwpsgf8njh")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 755e81aba157b720b2c9d32100adb239cd96b5ec Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:54:48 +0200 Subject: gnu: curl: Update to 7.65.1. * gnu/packages/curl.scm (curl): Update to 7.65.1. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 6d1ab81d07..8605c12124 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.65.0") + (version "7.65.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1kb6p510m0n0y1c8fjxbcs6dyaqgm8i54pjvj29zc14lj9ix4rkp")))) + "0ym7b741hp4mgrvgp2z5ia7kb0pfqzdmfc65qzmml8vzhxs21hpn")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit v1.2.3 From 731d471a37bf23326ae3e042bb384f376f6fec99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:55:35 +0200 Subject: gnu: harfbuzz: Update to 2.5.1. * gnu/packages/gtk.scm (harfbuzz): Update to 2.5.1. [source]: Update source file name. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4fb7d3579b..a8bc2e42ce 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,15 +178,15 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.4.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" "harfbuzz/release/harfbuzz-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "0vrkvdlmihdg62a4c6h5kx27khc33xmb95l50zgnwnavvpwyyw5l")))) + "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 7892edc256e9f94acad57f698622b48dc741385f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:56:33 +0200 Subject: gnu: GnuTLS: Update to 3.6.8. * gnu/packages/tls.scm (gnutls): Update to 3.6.8. [arguments]: Add "--with-guile-{site,site-ccache,extension-dir}" to #:configure-flags. --- gnu/packages/tls.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index eb853da1bf..912069c26d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -161,7 +161,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.6") + (version "3.6.8") (source (origin (method url-fetch) (uri @@ -173,7 +173,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "19rcfgsfxb01cyz8jxmmgkjqc7y5s97amajzyknk1i1amywcm6mv")))) + "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. @@ -191,6 +191,15 @@ living in the same process.") ;; independently. This seems suboptimal. "--with-default-trust-store-dir=/etc/ssl/certs" + ;; Tell the build system that we want Guile bindings installed to + ;; the output instead of Guiles own module directory. + (string-append "--with-guile-site-dir=" + "$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)") + (string-append "--with-guile-site-ccache-dir=" + "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache") + (string-append "--with-guile-extension-dir=" + "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions") + ;; FIXME: Temporarily disable p11-kit support since it is not ;; working on mips64el. "--without-p11-kit") -- cgit v1.2.3 From e2083575d7857d18b1ab00ae380987cbed278eab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:57:37 +0200 Subject: gnu: nghttp2: Update to 1.39.1. * gnu/packages/web.scm (nghttp2): Update to 1.39.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6ddeb48d2c..695552c3e2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6313,7 +6313,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.38.0") + (version "1.39.1") (source (origin (method url-fetch) @@ -6322,7 +6322,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "1y47xsg7nbfwqx77rc5phi5rh6j8l1x3k9ig6yscchc2hmhwfxgg")))) + "0j0lk37k8k3f61r9nw647hg4b22z1753l36n3xrp9x01civ614b7")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From 549f4091c15568015fafa03ab04a37db5679edea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 15:58:57 +0200 Subject: gnu: libarchive: Update to 3.4.0. * gnu/packages/patches/libarchive-CVE-2018-1000877.patch, gnu/packages/patches/libarchive-CVE-2018-1000878.patch, gnu/packages/patches/libarchive-CVE-2018-1000880.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/backup.scm (libarchive): Update to 3.4.0. [source](uri): Add alternative download location. [source](patches): Remove. --- gnu/local.mk | 3 - gnu/packages/backup.scm | 14 ++-- .../patches/libarchive-CVE-2018-1000877.patch | 45 ----------- .../patches/libarchive-CVE-2018-1000878.patch | 86 ---------------------- .../patches/libarchive-CVE-2018-1000880.patch | 51 ------------- 5 files changed, 7 insertions(+), 192 deletions(-) delete mode 100644 gnu/packages/patches/libarchive-CVE-2018-1000877.patch delete mode 100644 gnu/packages/patches/libarchive-CVE-2018-1000878.patch delete mode 100644 gnu/packages/patches/libarchive-CVE-2018-1000880.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0ba0d1f194..7c68b40976 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -982,9 +982,6 @@ dist_patch_DATA = \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ - %D%/packages/patches/libarchive-CVE-2018-1000877.patch \ - %D%/packages/patches/libarchive-CVE-2018-1000878.patch \ - %D%/packages/patches/libarchive-CVE-2018-1000880.patch \ %D%/packages/patches/libbase-fix-includes.patch \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f62c5c3c00..beb3b09077 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -197,18 +197,18 @@ backups (called chunks) to allow easy burning to CD/DVD.") (define-public libarchive (package (name "libarchive") - (version "3.3.3") + (version "3.4.0") (source (origin (method url-fetch) - (uri (string-append "https://libarchive.org/downloads/libarchive-" - version ".tar.gz")) - (patches (search-patches "libarchive-CVE-2018-1000877.patch" - "libarchive-CVE-2018-1000878.patch" - "libarchive-CVE-2018-1000880.patch")) + (uri (list (string-append "https://libarchive.org/downloads/libarchive-" + version ".tar.gz") + (string-append "https://github.com/libarchive/libarchive" + "/releases/download/v" version "/libarchive-" + version ".tar.gz"))) (sha256 (base32 - "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms")))) + "0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) diff --git a/gnu/packages/patches/libarchive-CVE-2018-1000877.patch b/gnu/packages/patches/libarchive-CVE-2018-1000877.patch deleted file mode 100644 index 5b68884a0f..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2018-1000877.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix CVE-2018-1000877: - -https://bugs.launchpad.net/ubuntu/+source/libarchive/+bug/1794909 -https://github.com/libarchive/libarchive/pull/1105 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000877 -https://security-tracker.debian.org/tracker/CVE-2018-1000877 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/021efa522ad729ff0f5806c4ce53e4a6cc1daa31 - -From 021efa522ad729ff0f5806c4ce53e4a6cc1daa31 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 20 Nov 2018 17:56:29 +1100 -Subject: [PATCH] Avoid a double-free when a window size of 0 is specified - -new_size can be 0 with a malicious or corrupted RAR archive. - -realloc(area, 0) is equivalent to free(area), so the region would -be free()d here and the free()d again in the cleanup function. - -Found with a setup running AFL, afl-rb, and qsym. ---- - libarchive/archive_read_support_format_rar.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 23452222..6f419c27 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -2300,6 +2300,11 @@ parse_codes(struct archive_read *a) - new_size = DICTIONARY_MAX_SIZE; - else - new_size = rar_fls((unsigned int)rar->unp_size) << 1; -+ if (new_size == 0) { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Zero window size is invalid."); -+ return (ARCHIVE_FATAL); -+ } - new_window = realloc(rar->lzss.window, new_size); - if (new_window == NULL) { - archive_set_error(&a->archive, ENOMEM, --- -2.20.1 - diff --git a/gnu/packages/patches/libarchive-CVE-2018-1000878.patch b/gnu/packages/patches/libarchive-CVE-2018-1000878.patch deleted file mode 100644 index fef0881320..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2018-1000878.patch +++ /dev/null @@ -1,86 +0,0 @@ -Fix CVE-2018-1000878: - -https://bugs.launchpad.net/ubuntu/+source/libarchive/+bug/1794909 -https://github.com/libarchive/libarchive/pull/1105 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000878 -https://security-tracker.debian.org/tracker/CVE-2018-1000878 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/bfcfe6f04ed20db2504db8a254d1f40a1d84eb28 - -From bfcfe6f04ed20db2504db8a254d1f40a1d84eb28 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 4 Dec 2018 00:55:22 +1100 -Subject: [PATCH] rar: file split across multi-part archives must match - -Fuzzing uncovered some UAF and memory overrun bugs where a file in a -single file archive reported that it was split across multiple -volumes. This was caused by ppmd7 operations calling -rar_br_fillup. This would invoke rar_read_ahead, which would in some -situations invoke archive_read_format_rar_read_header. That would -check the new file name against the old file name, and if they didn't -match up it would free the ppmd7 buffer and allocate a new -one. However, because the ppmd7 decoder wasn't actually done with the -buffer, it would continue to used the freed buffer. Both reads and -writes to the freed region can be observed. - -This is quite tricky to solve: once the buffer has been freed it is -too late, as the ppmd7 decoder functions almost universally assume -success - there's no way for ppmd_read to signal error, nor are there -good ways for functions like Range_Normalise to propagate them. So we -can't detect after the fact that we're in an invalid state - e.g. by -checking rar->cursor, we have to prevent ourselves from ever ending up -there. So, when we are in the dangerous part or rar_read_ahead that -assumes a valid split, we set a flag force read_header to either go -down the path for split files or bail. This means that the ppmd7 -decoder keeps a valid buffer and just runs out of data. - -Found with a combination of AFL, afl-rb and qsym. ---- - libarchive/archive_read_support_format_rar.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c -index 6f419c27..a8cc5c94 100644 ---- a/libarchive/archive_read_support_format_rar.c -+++ b/libarchive/archive_read_support_format_rar.c -@@ -258,6 +258,7 @@ struct rar - struct data_block_offsets *dbo; - unsigned int cursor; - unsigned int nodes; -+ char filename_must_match; - - /* LZSS members */ - struct huffman_code maincode; -@@ -1560,6 +1561,12 @@ read_header(struct archive_read *a, struct archive_entry *entry, - } - return ret; - } -+ else if (rar->filename_must_match) -+ { -+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, -+ "Mismatch of file parts split across multi-volume archive"); -+ return (ARCHIVE_FATAL); -+ } - - rar->filename_save = (char*)realloc(rar->filename_save, - filename_size + 1); -@@ -2933,12 +2940,14 @@ rar_read_ahead(struct archive_read *a, size_t min, ssize_t *avail) - else if (*avail == 0 && rar->main_flags & MHD_VOLUME && - rar->file_flags & FHD_SPLIT_AFTER) - { -+ rar->filename_must_match = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - if (ret == (ARCHIVE_EOF)) - { - rar->has_endarc_header = 1; - ret = archive_read_format_rar_read_header(a, a->entry); - } -+ rar->filename_must_match = 0; - if (ret != (ARCHIVE_OK)) - return NULL; - return rar_read_ahead(a, min, avail); --- -2.20.1 - diff --git a/gnu/packages/patches/libarchive-CVE-2018-1000880.patch b/gnu/packages/patches/libarchive-CVE-2018-1000880.patch deleted file mode 100644 index 6834cabda0..0000000000 --- a/gnu/packages/patches/libarchive-CVE-2018-1000880.patch +++ /dev/null @@ -1,51 +0,0 @@ -Fix CVE-2018-1000880: - -https://bugs.launchpad.net/ubuntu/+source/libarchive/+bug/1794909 -https://github.com/libarchive/libarchive/pull/1105 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1000880 -https://security-tracker.debian.org/tracker/CVE-2018-1000880 - -Patch copied from upstream source repository: - -https://github.com/libarchive/libarchive/commit/9c84b7426660c09c18cc349f6d70b5f8168b5680 - -From 9c84b7426660c09c18cc349f6d70b5f8168b5680 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 4 Dec 2018 16:33:42 +1100 -Subject: [PATCH] warc: consume data once read - -The warc decoder only used read ahead, it wouldn't actually consume -data that had previously been printed. This means that if you specify -an invalid content length, it will just reprint the same data over -and over and over again until it hits the desired length. - -This means that a WARC resource with e.g. -Content-Length: 666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666665 -but only a few hundred bytes of data, causes a quasi-infinite loop. - -Consume data in subsequent calls to _warc_read. - -Found with an AFL + afl-rb + qsym setup. ---- - libarchive/archive_read_support_format_warc.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libarchive/archive_read_support_format_warc.c b/libarchive/archive_read_support_format_warc.c -index e8753853..e8fc8428 100644 ---- a/libarchive/archive_read_support_format_warc.c -+++ b/libarchive/archive_read_support_format_warc.c -@@ -386,6 +386,11 @@ _warc_read(struct archive_read *a, const void **buf, size_t *bsz, int64_t *off) - return (ARCHIVE_EOF); - } - -+ if (w->unconsumed) { -+ __archive_read_consume(a, w->unconsumed); -+ w->unconsumed = 0U; -+ } -+ - rab = __archive_read_ahead(a, 1U, &nrd); - if (nrd < 0) { - *bsz = 0U; --- -2.20.1 - -- cgit v1.2.3 From e9b27c70e3b4bca441d5c2d9f5b743da3cce182a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 14 Jun 2019 22:54:52 +0200 Subject: gnu: texlive-bin: Remove GCC5 workaround. * gnu/packages/tex.scm (texlive-bin)[arguments]: Remove "CXXFLAGS" from #:configure-flags. --- gnu/packages/tex.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 765eaf4be4..e28b36fd98 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -153,9 +153,6 @@ `(#:out-of-source? #t #:configure-flags `("--disable-native-texlive-build" - ;; XXX: This is needed because recent Poppler requires C++11 or later. - ;; Remove after switch to GCC >= 6. - "CXXFLAGS=-std=gnu++11" "--with-system-cairo" "--with-system-freetype2" "--with-system-gd" -- cgit v1.2.3 From 1a753d5673b7613727177cb1d3b4c7e343534545 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Jun 2019 12:31:49 +0200 Subject: gnu: poppler: Update to 0.77.0. * gnu/packages/patches/inkscape-poppler-0.76.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/inkscape.scm (inkscape)[source](patches): New field. * gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch: Add two new hunks. * gnu/packages/pdf.scm (poppler): Update to 0.77.0. * gnu/packages/tex.scm (texlive-bin)[source]: Update Arch patches. [arguments]: Adjust accordingly. * gnu/packages/scribus.scm (scribus)[source](patches): Add two new origins. --- gnu/local.mk | 1 + gnu/packages/inkscape.scm | 1 + gnu/packages/patches/inkscape-poppler-0.76.patch | 36 ++++++++++++++++++++++ .../texlive-bin-luatex-poppler-compat.patch | 34 ++++++++++++++++++++ gnu/packages/pdf.scm | 4 +-- gnu/packages/scribus.scm | 29 +++++++++++++++-- gnu/packages/tex.scm | 10 +++--- 7 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/inkscape-poppler-0.76.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7c68b40976..2a6908d4bb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -938,6 +938,7 @@ dist_patch_DATA = \ %D%/packages/patches/idris-test-no-node.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/inkscape-poppler-compat3.patch \ + %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index a2c6778b57..1ad23a92d4 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -52,6 +52,7 @@ (uri (string-append "https://media.inkscape.org/dl/" "resources/file/" "inkscape-" version ".tar.bz2")) + (patches (search-patches "inkscape-poppler-0.76.patch")) (sha256 (base32 "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p")))) diff --git a/gnu/packages/patches/inkscape-poppler-0.76.patch b/gnu/packages/patches/inkscape-poppler-0.76.patch new file mode 100644 index 0000000000..08e8303892 --- /dev/null +++ b/gnu/packages/patches/inkscape-poppler-0.76.patch @@ -0,0 +1,36 @@ +This patch adds support for Poppler 0.76 and later. + +Taken from upstream: + + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 8484984bdf..4f798e35bf 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new _POPPLER_NEW_PARSER(xref, obj); + go(topLevel); + delete parser; + parser = nullptr; +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index 61a15083a0..5e8bc4ae90 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -14,6 +14,13 @@ + + #include + ++#if POPPLER_CHECK_VERSION(0, 76, 0) ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse) ++#else ++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse) ++#endif ++ ++ + #if POPPLER_CHECK_VERSION(0, 72, 0) + #define getCString c_str + #endif diff --git a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch index df6121c6e1..024ff416af 100644 --- a/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch +++ b/gnu/packages/patches/texlive-bin-luatex-poppler-compat.patch @@ -257,3 +257,37 @@ diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lep uout = new_StructTreeRoot_userdata(L); uout->d = obj; uout->pc = uin->pc; +--- texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc.orig 2019-04-24 09:41:05.090522664 +0000 ++++ texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc 2019-04-24 09:43:37.119184926 +0000 +@@ -994,7 +994,8 @@ + pdfdoc_changed_error(L); + num = luaL_checkint(L, 2); + gen = luaL_checkint(L, 3); +- i = ((Catalog *) uin->d)->findPage(num, gen); ++ Ref numgen = {num, gen}; ++ i = ((Catalog *) uin->d)->findPage(numgen); + if (i > 0) + lua_pushinteger(L, i); + else +@@ -2596,8 +2597,9 @@ + pdfdoc_changed_error(L); + num = luaL_checkint(L, 2); + gen = luaL_checkint(L, 3); ++ Ref numgen = {num, gen}; + if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { +- i = ((PdfDocument *) uin->d)->doc->findPage(num, gen); ++ i = ((PdfDocument *) uin->d)->doc->findPage(numgen); + if (i > 0) + lua_pushinteger(L, i); + else +--- texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w.orig 2019-04-24 09:56:38.406498975 +0000 ++++ texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w 2019-04-24 09:56:57.020081327 +0000 +@@ -630,7 +630,7 @@ + if (link == NULL || !link->isOk()) + formatted_error("pdf inclusion","invalid destination '%s'",img_pagename(idict)); + Ref ref = link->getPageRef(); +- img_pagenum(idict) = catalog->findPage(ref.num, ref.gen); ++ img_pagenum(idict) = catalog->findPage(ref); + if (img_pagenum(idict) == 0) + formatted_error("pdf inclusion","destination is not a page '%s'",img_pagename(idict)); + delete link; diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index eab97a1a52..9cfac6fb9d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -84,14 +84,14 @@ (define-public poppler (package (name "poppler") - (version "0.75.0") + (version "0.77.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "16hr0y3pv66s01bcd4k8xjgd1r038ca9srd06g4wm5r7zaqfvfiv")))) + "0szk09hk8r98ck9cx97nqwrbzdn1q41ic8dq8j1aar6dpi6fnrvj")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 5b770fd696..322a096414 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017, 2018 Nicolas Goaziou ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,9 +98,33 @@ (file-name "scribus-poppler-0.70.patch") (sha256 (base32 - "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))) - + "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr"))) + ;; This and the preceding patch are taken from Arch Linux + ;; because they are adjusted for the Scribus release tarball + ;; rather than the upstream master branch. + (origin + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svntogit/" + "community.git/plain/trunk/scribus-" + "poppler-0.75.patch?h=packages/scribus&id=" + "4d35c4ad4869c1dcce9243c4786ff303bdd5c601")) + (file-name "scribus-poppler-0.75.patch") + (sha256 + (base32 + "1lhf2srp7iv44zzdbr3kqa0lfjmm77nalxnx80jqaixhr5yq2s8f"))) + (origin + (method url-fetch) + (uri (string-append + "https://github.com/scribusproject/scribus/commit/" + "9449265592a5195153d72c2a511d2010b0cf5b0b.patch")) + (file-name "scribus-poppler-0.76.patch") + (sha256 + (base32 + "0zghiqra9s6f6v06fdr97gdhiw41zr8r6vqh4ar4yw7rqn2771jd")))) (search-patches "scribus-poppler-0.73.patch"))) + ;; The --binary flag is required for 'scribus-poppler-0.75.patch', because + ;; we need to retain the CRLF line endings. + (patch-flags '("-p1" "--binary")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index e28b36fd98..10233a05b7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -111,12 +111,12 @@ "&id=" revision)) (file-name (string-append "texlive-bin-" name)) (sha256 (base32 hash))))) - (arch-revision "418dd6f008c3d41a461353fdb60f2d73d87c58ed")) + (arch-revision "c4b99aba97213ea554b6592a4916d3c7394a6d7b")) (append (search-patches "texlive-bin-CVE-2018-17407.patch" "texlive-bin-luatex-poppler-compat.patch") (list - (arch-patch "pdftex-poppler0.75.patch" arch-revision - "1cqpcp7h1qyxyp3wjbpcmx2wgvj9ywpz60hvy280mp9w633yzyg3") + (arch-patch "pdftex-poppler0.76.patch" arch-revision + "15ypbh21amfsdxy7ca825x28lkmmkklxk1w660gpgvzdi7s70h0b") (arch-patch "xetex-poppler-fixes.patch" arch-revision "1jj1p5zkjljb7id9pjv29cw0cf8mwrgrh4ackgzz9c200vaqpsvx"))))))) (build-system gnu-build-system) @@ -194,9 +194,9 @@ #t)) (add-after 'unpack 'use-code-for-new-poppler (lambda _ - (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc" "texk/web2c/pdftexdir/pdftoepdf.cc") - (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.75.0.cc" + (copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc" "texk/web2c/pdftexdir/pdftosrc.cc") #t)) (add-after 'use-code-for-new-poppler 'use-code-for-even-newer-poppler -- cgit v1.2.3 From e960c20a0613b8e9561385eef67c4427f1ec0296 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Jun 2019 12:41:58 +0200 Subject: gnu: adb: Build against OpenSSL 1.0. * gnu/packages/android.scm (adb)[inputs]: Change OPENSSL to OPENSSL-1.0. --- gnu/packages/android.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 7d5de08be9..8ab5377537 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -362,7 +362,7 @@ various Android core host applications.") `(("android-libbase" ,android-libbase) ("android-libcutils" ,android-libcutils) ("android-liblog" ,android-liblog) - ("openssl" ,openssl))) + ("openssl" ,openssl-1.0))) (home-page "https://developer.android.com/studio/command-line/adb.html") (synopsis "Android Debug Bridge") (description -- cgit v1.2.3 From b70ffe4e949062e37049f1ef3603a98703bd153e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:19:53 +0200 Subject: gnu: jbig2dec: Update to 0.16. * gnu/packages/image.scm (jbig2dec): Update to 0.16. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index eabb6aee41..390b74c333 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -534,15 +534,15 @@ arithmetic ops.") (define-public jbig2dec (package (name "jbig2dec") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "https://github.com/ArtifexSoftware" "/ghostpdl-downloads/releases/download" - "/gs924/" name "-" version ".tar.gz")) + "/gs927/" name "-" version ".tar.gz")) (sha256 (base32 - "0m1qwpbjbirgw2fqznbajdhdhh35d6xa2csr64lpjz735pvimykb")) + "00h61y7bh3z6mqfzxyb318gyh0f8jwarg4hvlrm83rqps8avzxm4")) (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From 3f151d90a3ceb9445305ba84588ea56b802e5ce5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:20:23 +0200 Subject: gnu: ghostscript: Update to 9.27. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.27. [arguments]: Add <#:parallel-tests?>. --- gnu/packages/ghostscript.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index f724fe3ff1..817104cde1 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -137,7 +137,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (version "9.26") + (version "9.27") (source (origin (method url-fetch) @@ -147,7 +147,7 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "1645f47all5w27bfhiq15vycdm954lmr6agqkrp68ksq6xglgvch")) + "06dnj0mxyaryfbwlsjwaqf847w91w2h8f108kxxcc41nrnx1y3zw")) (patches (search-patches "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -165,6 +165,13 @@ printing, and psresize, for adjusting page sizes.") (outputs '("out" "doc")) ;19 MiB of HTML/PS doc + examples (arguments `(#:disallowed-references ("doc") + ;; XXX: Starting with version 9.27, building the tests in parallel + ;; occasionally fails like this: + ;; In file included from ./base/memory_.h:23:0, + ;; from ./obj/gsmd5.h:1, + ;; from ./obj/gsmd5.c:56: + ;; ./base/std.h:25:10: fatal error: arch.h: No such file or directory + #:parallel-tests? #f #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") -- cgit v1.2.3 From 871dbd6c6e2414353045cf5f5d0045fff945f862 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Jun 2019 19:33:05 +0200 Subject: gnu: cross-base: Fix C++ cross-compilation problems with GCC 7. * gnu/packages/cross-base.scm (cross-gcc-arguments)[#:configure-flags]: Add "--with-sysroot=/". --- gnu/packages/cross-base.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 3d36dc6198..3fc9ba6540 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -121,7 +121,15 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ,@(if libc `( ;; Disable libcilkrts because it is not ;; ported to GNU/Hurd. - "--disable-libcilkrts") + "--disable-libcilkrts" + ;; When building a cross compiler, --with-sysroot is + ;; implicitly set to "$gcc_tooldir/sys-root". This does + ;; not work for us, because --with-native-system-header-dir + ;; is searched for relative to this location. Thus, we set + ;; it to "/" so GCC is able to find the target libc headers. + ;; This is safe because in practice GCC uses CROSS_CPATH + ;; & co to separate target and host libraries. + "--with-sysroot=/") `( ;; Disable features not needed at this stage. "--disable-shared" "--enable-static" "--enable-languages=c,c++" -- cgit v1.2.3 From b1593c1c4fd8f4fc6df4c43cab51334426e3aa76 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 09:39:00 +0200 Subject: gnu: bison: Disable parallel build. Fixes . * gnu/packages/bison.scm (bison)[arguments]: New field. --- gnu/packages/bison.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 5f50ebf6b8..2d7383ce98 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -41,6 +41,11 @@ (base32 "03c2pmq3bs0drdislnz6gm1rwz3n4pb2rz9navyxydppxg2rl597")))) (build-system gnu-build-system) + (arguments + '(;; Building in parallel on many-core systems may cause an error such as + ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or + ;; directory". See . + #:parallel-build? #f)) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. ("m4" ,m4))) -- cgit v1.2.3 From 2c35ae82192fd6f1732b15fa41aec87aa61a1879 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 11:23:44 +0200 Subject: gnu: bison: Disable parallel tests, too. * gnu/packages/bison.scm (bison)[arguments]: Add #:parallel-tests?. --- gnu/packages/bison.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 2d7383ce98..5ebc883d53 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -45,7 +45,11 @@ '(;; Building in parallel on many-core systems may cause an error such as ;; "mv: cannot stat 'examples/c/reccalc/scan.stamp.tmp': No such file or ;; directory". See . - #:parallel-build? #f)) + #:parallel-build? #f + ;; Similarly, when building tests in parallel, Make may produce this error: + ;; "./examples/c/reccalc/scan.l:13:10: fatal error: parse.h: No such file + ;; or directory". Full log in . + #:parallel-tests? #f)) (native-inputs `(("perl" ,perl) ;; m4 is not present in PATH when cross-building. ("m4" ,m4))) -- cgit v1.2.3 From 1380be3c73bb8734622df8972f80f9a5bfaf06dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 Jun 2019 12:10:24 +0200 Subject: gnu: commencement: '%bootstrap-inputs+toolchain' no longer contains Mes. * gnu/packages/commencement.scm (%bootstrap-inputs+toolchain): On i686-linux and x86_64-linux, remove "bootstrap-mescc-tools" and "mes" from %BOOTSTRAP-INPUTS. --- gnu/packages/commencement.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 13b813f806..9a5f6b0929 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1388,15 +1388,16 @@ exec " gcc "/bin/" program (define (%bootstrap-inputs+toolchain) ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; the actual reduced set with bootstrapped toolchain. - (append (match (%current-system) - ((or "i686-linux" "x86_64-linux") - `(("libc" ,glibc-mesboot) - ("binutils" ,binutils-mesboot) - ("gcc-wrapper" ,gcc-mesboot-wrapper) - ("gcc" ,gcc-mesboot))) - (_ - '())) - (%bootstrap-inputs))) + (match (%current-system) + ((or "i686-linux" "x86_64-linux") + `(("libc" ,glibc-mesboot) + ("binutils" ,binutils-mesboot) + ("gcc-wrapper" ,gcc-mesboot-wrapper) + ("gcc" ,gcc-mesboot) + ,@(fold alist-delete (%bootstrap-inputs) + '("bootstrap-mescc-tools" "mes")))) + (_ + (%bootstrap-inputs)))) (define gnu-make-boot0 (package-with-bootstrap-guile -- cgit v1.2.3 From 3c6b9fb5d2627c9f23b58ce530025a8dc8cc3c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 Jun 2019 15:54:17 +0200 Subject: gexp: Remove #:pre-load-modules? parameter. * guix/gexp.scm (gexp->derivation): Remove #:pre-load-modules?. (compiled-modules): Likewise. Inline the case correspoding to PRE-LOAD-MODULES? = #t. * guix/packages.scm (patch-and-repack): Remove #:pre-load-modules?. --- guix/gexp.scm | 68 ++++++++++++++++++++----------------------------------- guix/packages.scm | 3 --- 2 files changed, 24 insertions(+), 47 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 4f2adba90a..9bf68a91f4 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -633,12 +633,6 @@ names and file names suitable for the #:allowed-references argument to leaked-env-vars local-build? (substitutable? #t) (properties '()) - - ;; TODO: This parameter is transitional; it's here - ;; to avoid a full rebuild. Remove it on the next - ;; rebuild cycle. - (pre-load-modules? #t) - deprecation-warnings (script-name (string-append name "-builder"))) "Return a derivation NAME that runs EXP (a gexp) with GUILE-FOR-BUILD (a @@ -743,8 +737,6 @@ The other arguments are as for 'derivation'." #:module-path module-path #:extensions extensions #:guile guile-for-build - #:pre-load-modules? - pre-load-modules? #:deprecation-warnings deprecation-warnings) (return #f))) @@ -1220,11 +1212,7 @@ last one is created from the given object." (guile (%guile-for-build)) (module-path %load-path) (extensions '()) - (deprecation-warnings #f) - - ;; TODO: This flag is here to prevent a full - ;; rebuild. Remove it on the next rebuild cycle. - (pre-load-modules? #t)) + (deprecation-warnings #f)) "Return a derivation that builds a tree containing the `.go' files corresponding to MODULES. All the MODULES are built in a context where they can refer to each other." @@ -1257,11 +1245,8 @@ they can refer to each other." (let* ((base (basename entry ".scm")) (output (string-append output "/" base ".go"))) (format #t "[~2@a/~2@a] Compiling '~a'...~%" - (+ 1 processed - (ungexp-splicing (if pre-load-modules? - (gexp ((ungexp total))) - (gexp ())))) - (ungexp (* total (if pre-load-modules? 2 1))) + (+ 1 processed (ungexp total)) + (ungexp (* total 2)) entry) (compile-file entry #:output-file output @@ -1275,6 +1260,26 @@ they can refer to each other." processed entries))) + (define* (load-from-directory directory + #:optional (loaded 0)) + "Load all the source files found in DIRECTORY." + ;; XXX: This works around . + (let ((entries (map (cut string-append directory "/" <>) + (scandir directory regular?)))) + (fold (lambda (file loaded) + (if (file-is-directory? file) + (load-from-directory file loaded) + (begin + (format #t "[~2@a/~2@a] Loading '~a'...~%" + (+ 1 loaded) (ungexp (* 2 total)) + file) + (save-module-excursion + (lambda () + (primitive-load file))) + (+ 1 loaded)))) + loaded + entries))) + (setvbuf (current-output-port) (cond-expand (guile-2.2 'line) (else _IOLBF))) @@ -1310,32 +1315,7 @@ they can refer to each other." (mkdir (ungexp output)) (chdir (ungexp modules)) - (ungexp-splicing - (if pre-load-modules? - (gexp ((define* (load-from-directory directory - #:optional (loaded 0)) - "Load all the source files found in DIRECTORY." - ;; XXX: This works around . - (let ((entries (map (cut string-append directory "/" <>) - (scandir directory regular?)))) - (fold (lambda (file loaded) - (if (file-is-directory? file) - (load-from-directory file loaded) - (begin - (format #t "[~2@a/~2@a] Loading '~a'...~%" - (+ 1 loaded) - (ungexp (* 2 total)) - file) - (save-module-excursion - (lambda () - (primitive-load file))) - (+ 1 loaded)))) - loaded - entries))) - - (load-from-directory "."))) - (gexp ()))) - + (load-from-directory ".") (process-directory "." (ungexp output) 0)))) ;; TODO: Pass MODULES as an environment variable. diff --git a/guix/packages.scm b/guix/packages.scm index 9cd4cbc416..92859be441 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -642,9 +642,6 @@ specifies modules in scope when evaluating SNIPPET." (let ((name (tarxz-name original-file-name))) (gexp->derivation name build - ;; TODO: Remove this on the next rebuild cycle. - #:pre-load-modules? #f - #:graft? #f #:system system #:deprecation-warnings #t ;to avoid a rebuild -- cgit v1.2.3 From 25c639e2a3b96204950f1ac8a92cb518783f0d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 Jun 2019 15:55:36 +0200 Subject: packages: 'patch-and-repack' no longer uses #:deprecation-warnings. * guix/packages.scm (patch-and-repack): Remove #:deprecation-warnings argument passed to 'gexp->derivation'. --- guix/packages.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index 92859be441..9d2ab5be0f 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -644,7 +644,6 @@ specifies modules in scope when evaluating SNIPPET." (gexp->derivation name build #:graft? #f #:system system - #:deprecation-warnings #t ;to avoid a rebuild #:guile-for-build guile-for-build #:properties `((type . origin) (patches . ,(length patches))))))) -- cgit v1.2.3 From 45d46223f92b0933aaf9b1392a21d09eaa1e2881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 Jun 2019 16:06:27 +0200 Subject: utils: Add 'invoke/quiet'. * gnu/build/bootloader.scm (G_): Remove. (open-pipe-with-stderr, invoke/quiet): Move to... * guix/build/utils.scm: ... here. Use 'let-values' instead of 'define-values' because Guile 2.0 (the bootstrap Guile) doesn't know about 'define-values'. * po/guix/POTFILES.in: Remove gnu/build/bootloader.scm, and add guix/build/utils.scm. * tests/build-utils.scm: Remove import of (gnu build bootloader). --- gnu/build/bootloader.scm | 62 +----------------------------------------------- guix/build/utils.scm | 53 +++++++++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 3 +-- tests/build-utils.scm | 2 -- 4 files changed, 55 insertions(+), 65 deletions(-) diff --git a/gnu/build/bootloader.scm b/gnu/build/bootloader.scm index c5febcde1e..9570d6dd18 100644 --- a/gnu/build/bootloader.scm +++ b/gnu/build/bootloader.scm @@ -18,15 +18,8 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu build bootloader) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:use-module (ice-9 binary-ports) - #:use-module (ice-9 popen) - #:use-module (ice-9 match) - #:use-module (ice-9 rdelim) - #:use-module (ice-9 format) - #:export (write-file-on-device - invoke/quiet)) + #:export (write-file-on-device)) ;;; @@ -43,56 +36,3 @@ (seek output offset SEEK_SET) (put-bytevector output bv)) #:binary #t))))) - -(define-syntax-rule (G_ str) str) ;for xgettext - -(define (open-pipe-with-stderr program . args) - "Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect -both its standard output and standard error to the pipe. Return two value: -the pipe to read PROGRAM's data from, and the PID of the child process running -PROGRAM." - ;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why - ;; we need to roll our own. - (match (pipe) - ((input . output) - (match (primitive-fork) - (0 - (dynamic-wind - (const #t) - (lambda () - (close-port input) - (dup2 (fileno output) 1) - (dup2 (fileno output) 2) - (apply execlp program program args)) - (lambda () - (primitive-exit 127)))) - (pid - (close-port output) - (values input pid)))))) - -;; TODO: Move to (guix build utils) on the next rebuild cycle. -(define (invoke/quiet program . args) - "Invoke PROGRAM with ARGS and capture PROGRAM's standard output and standard -error. If PROGRAM succeeds, print nothing and return the unspecified value; -otherwise, raise a '&message' error condition that includes the status code -and the output of PROGRAM." - (define-values (pipe pid) - (apply open-pipe-with-stderr program args)) - - (let loop ((lines '())) - (match (read-line pipe) - ((? eof-object?) - (close-port pipe) - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (raise (condition - (&message - (message (format #f (G_ "'~a~{ ~a~}' exited with status ~a; \ -output follows:~%~%~{ ~a~%~}") - program args - (or (status:exit-val status) - status) - (reverse lines)))))))))) - (line - (loop (cons line lines)))))) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index b7cd748d81..b8be73ead4 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -106,6 +106,8 @@ invoke-error-stop-signal report-invoke-error + invoke/quiet + locale-category->string)) @@ -666,6 +668,57 @@ way." (invoke-error-term-signal c) (invoke-error-stop-signal c)))) +(define (open-pipe-with-stderr program . args) + "Run PROGRAM with ARGS in an input pipe, but, unlike 'open-pipe*', redirect +both its standard output and standard error to the pipe. Return two value: +the pipe to read PROGRAM's data from, and the PID of the child process running +PROGRAM." + ;; 'open-pipe*' doesn't attempt to capture stderr in any way, which is why + ;; we need to roll our own. + (match (pipe) + ((input . output) + (match (primitive-fork) + (0 + (dynamic-wind + (const #t) + (lambda () + (close-port input) + (dup2 (fileno output) 1) + (dup2 (fileno output) 2) + (apply execlp program program args)) + (lambda () + (primitive-exit 127)))) + (pid + (close-port output) + (values input pid)))))) + +(define (invoke/quiet program . args) + "Invoke PROGRAM with ARGS and capture PROGRAM's standard output and standard +error. If PROGRAM succeeds, print nothing and return the unspecified value; +otherwise, raise a '&message' error condition that includes the status code +and the output of PROGRAM." + (let-values (((pipe pid) + (apply open-pipe-with-stderr program args))) + (let loop ((lines '())) + (match (read-line pipe) + ((? eof-object?) + (close-port pipe) + (match (waitpid pid) + ((_ . status) + (unless (zero? status) + (let-syntax ((G_ (syntax-rules () ;for xgettext + ((_ str) str)))) + (raise (condition + (&message + (message (format #f (G_ "'~a~{ ~a~}' exited \ +with status ~a; output follows:~%~%~{ ~a~%~}") + program args + (or (status:exit-val status) + status) + (reverse lines))))))))))) + (line + (loop (cons line lines))))))) + ;;; ;;; Text substitution (aka. sed). diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 5172345e5a..9c4b6dedb5 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -37,6 +37,7 @@ gnu/installer/timezone.scm gnu/installer/user.scm gnu/installer/utils.scm gnu/packages/bootstrap.scm +guix/build/utils.scm guix/scripts.scm guix/scripts/build.scm guix/discovery.scm @@ -79,6 +80,4 @@ guix/channels.scm guix/profiles.scm guix/git.scm guix/deprecation.scm -gnu/build/bootloader.scm nix/nix-daemon/guix-daemon.cc - diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 5678bb6a22..61e6c44e63 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -21,8 +21,6 @@ (define-module (test-build-utils) #:use-module (guix tests) #:use-module (guix build utils) - #:use-module ((gnu build bootloader) - #:select (invoke/quiet)) #:use-module ((guix utils) #:select (%current-system call-with-temporary-directory)) #:use-module (gnu packages) -- cgit v1.2.3 From 20e4ee1e3b7044d9f64de02c6237b00e5a57da35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 Jun 2019 17:14:46 +0200 Subject: gnu: gcc-mesboot-wrapper: Fix 'version' field. Until now the 'version' field would match 'gcc-mesboot1-wrapper' ("4.7.4") instead of that of 'gcc-mesboot' ("4.9.4"). * gnu/packages/commencement.scm (gcc-mesboot-wrapper)[version]: New field. --- gnu/packages/commencement.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9a5f6b0929..08a34895f5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1350,6 +1350,7 @@ exec " gcc "/bin/" program (package (inherit gcc-mesboot1-wrapper) (name "gcc-mesboot-wrapper") + (version (package-version gcc-mesboot)) (source #f) (inputs '()) (native-inputs `(("bash" ,%bootstrap-coreutils&co) -- cgit v1.2.3 From a9a78d8bfbabcd306115684c99d3b2aa8fc75be8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:40:52 +0200 Subject: gnu: dbus: Update to 1.12.16. * gnu/packages/patches/dbus-CVE-2019-12749.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (dbus): Update to 1.12.16. [replacement]: Remove. (dbus/fixed): Remove variable. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 13 +-- gnu/packages/patches/dbus-CVE-2019-12749.patch | 116 ------------------------- 3 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 gnu/packages/patches/dbus-CVE-2019-12749.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3be9c9d60e..42b34ab90e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -740,7 +740,6 @@ dist_patch_DATA = \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ - %D%/packages/patches/dbus-CVE-2019-12749.patch \ %D%/packages/patches/dealii-mpi-deprecations.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d93a928c20..9fba2310d6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -82,8 +82,7 @@ (define dbus (package (name "dbus") - (version "1.12.14") - (replacement dbus/fixed) + (version "1.12.16") (source (origin (method url-fetch) (uri (string-append @@ -91,7 +90,7 @@ version ".tar.gz")) (sha256 (base32 - "13aca7gzgl7z1dfdipfs23773w8n6z01d4rj5kmssv4gms8c5ya4")) + "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments @@ -157,14 +156,6 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (license license:gpl2+))) ; or Academic Free License 2.1 -(define dbus/fixed - (package - (inherit dbus) - (source (origin - (inherit (package-source dbus)) - (patches (append (search-patches "dbus-CVE-2019-12749.patch") - (origin-patches (package-source dbus)))))))) - (define glib (package (name "glib") diff --git a/gnu/packages/patches/dbus-CVE-2019-12749.patch b/gnu/packages/patches/dbus-CVE-2019-12749.patch deleted file mode 100644 index 12106f4589..0000000000 --- a/gnu/packages/patches/dbus-CVE-2019-12749.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 47b1a4c41004bf494b87370987b222c934b19016 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Thu, 30 May 2019 12:53:03 +0100 -Subject: [PATCH] auth: Reject DBUS_COOKIE_SHA1 for users other than the server - owner - -The DBUS_COOKIE_SHA1 authentication mechanism aims to prove ownership -of a shared home directory by having the server write a secret "cookie" -into a .dbus-keyrings subdirectory of the desired identity's home -directory with 0700 permissions, and having the client prove that it can -read the cookie. This never actually worked for non-malicious clients in -the case where server uid != client uid (unless the server and client -both have privileges, such as Linux CAP_DAC_OVERRIDE or traditional -Unix uid 0) because an unprivileged server would fail to write out the -cookie, and an unprivileged client would be unable to read the resulting -file owned by the server. - -Additionally, since dbus 1.7.10 we have checked that ~/.dbus-keyrings -is owned by the uid of the server (a side-effect of a check added to -harden our use of XDG_RUNTIME_DIR), further ruling out successful use -by a non-malicious client with a uid differing from the server's. - -Joe Vennix of Apple Information Security discovered that the -implementation of DBUS_COOKIE_SHA1 was susceptible to a symbolic link -attack: a malicious client with write access to its own home directory -could manipulate a ~/.dbus-keyrings symlink to cause the DBusServer to -read and write in unintended locations. In the worst case this could -result in the DBusServer reusing a cookie that is known to the -malicious client, and treating that cookie as evidence that a subsequent -client connection came from an attacker-chosen uid, allowing -authentication bypass. - -This is mitigated by the fact that by default, the well-known system -dbus-daemon (since 2003) and the well-known session dbus-daemon (in -stable releases since dbus 1.10.0 in 2015) only accept the EXTERNAL -authentication mechanism, and as a result will reject DBUS_COOKIE_SHA1 -at an early stage, before manipulating cookies. As a result, this -vulnerability only applies to: - -* system or session dbus-daemons with non-standard configuration -* third-party dbus-daemon invocations such as at-spi2-core (although - in practice at-spi2-core also only accepts EXTERNAL by default) -* third-party uses of DBusServer such as the one in Upstart - -Avoiding symlink attacks in a portable way is difficult, because APIs -like openat() and Linux /proc/self/fd are not universally available. -However, because DBUS_COOKIE_SHA1 already doesn't work in practice for -a non-matching uid, we can solve this vulnerability in an easier way -without regressions, by rejecting it early (before looking at -~/.dbus-keyrings) whenever the requested identity doesn't match the -identity of the process hosting the DBusServer. - -Signed-off-by: Simon McVittie -Closes: https://gitlab.freedesktop.org/dbus/dbus/issues/269 -Closes: CVE-2019-12749 ---- - dbus/dbus-auth.c | 32 ++++++++++++++++++++++++++++++++ - 1 file changed, 32 insertions(+) - -diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c -index 37d8d4c9..7390a9d5 100644 ---- a/dbus/dbus-auth.c -+++ b/dbus/dbus-auth.c -@@ -529,6 +529,7 @@ sha1_handle_first_client_response (DBusAuth *auth, - DBusString tmp2; - dbus_bool_t retval = FALSE; - DBusError error = DBUS_ERROR_INIT; -+ DBusCredentials *myself = NULL; - - _dbus_string_set_length (&auth->challenge, 0); - -@@ -565,6 +566,34 @@ sha1_handle_first_client_response (DBusAuth *auth, - return FALSE; - } - -+ myself = _dbus_credentials_new_from_current_process (); -+ -+ if (myself == NULL) -+ goto out; -+ -+ if (!_dbus_credentials_same_user (myself, auth->desired_identity)) -+ { -+ /* -+ * DBUS_COOKIE_SHA1 is not suitable for authenticating that the -+ * client is anyone other than the user owning the process -+ * containing the DBusServer: we probably aren't allowed to write -+ * to other users' home directories. Even if we can (for example -+ * uid 0 on traditional Unix or CAP_DAC_OVERRIDE on Linux), we -+ * must not, because the other user controls their home directory, -+ * and could carry out symlink attacks to make us read from or -+ * write to unintended locations. It's difficult to avoid symlink -+ * attacks in a portable way, so we just don't try. This isn't a -+ * regression, because DBUS_COOKIE_SHA1 never worked for other -+ * users anyway. -+ */ -+ _dbus_verbose ("%s: client tried to authenticate as \"%s\", " -+ "but that doesn't match this process", -+ DBUS_AUTH_NAME (auth), -+ _dbus_string_get_const_data (data)); -+ retval = send_rejected (auth); -+ goto out; -+ } -+ - /* we cache the keyring for speed, so here we drop it if it's the - * wrong one. FIXME caching the keyring here is useless since we use - * a different DBusAuth for every connection. -@@ -679,6 +708,9 @@ sha1_handle_first_client_response (DBusAuth *auth, - _dbus_string_zero (&tmp2); - _dbus_string_free (&tmp2); - -+ if (myself != NULL) -+ _dbus_credentials_unref (myself); -+ - return retval; - } - -- cgit v1.2.3 From 814e12dc87a191718374d811c0a3024d38dffcbb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 10:50:15 +0200 Subject: packages: Retain version in file name when repacking source checkouts. Fixes . * guix/packages.scm (patch-and-repack): If FILE-NAME is a source checkout, reuse the name without the '-checkout' part. --- guix/packages.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 9d2ab5be0f..ac965acd2f 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -505,11 +506,17 @@ specifies modules in scope when evaluating SNIPPET." (and=> (file-extension file-name) (cut string-every char-set:hex-digit <>))) + (define (checkout? directory) + ;; Return true if DIRECTORY is a checkout (git, svn, etc). + (string-suffix? "-checkout" directory)) + (define (tarxz-name file-name) ;; Return a '.tar.xz' file name based on FILE-NAME. - (let ((base (if (numeric-extension? file-name) - original-file-name - (file-sans-extension file-name)))) + (let ((base (cond ((numeric-extension? file-name) + original-file-name) + ((checkout? file-name) + (string-drop-right file-name 9)) + (else (file-sans-extension file-name))))) (string-append base (if (equal? (file-extension base) "tar") ".xz" -- cgit v1.2.3 From c69959f0545e5383a8caab53944c86abc5dfeeed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:24:24 +0200 Subject: gnu: Replace uses of 'cmake' with 'cmake-minimal'. This follows up commit 2f33a7321e5e37d37f57c229c8079cb4ffd10834 which introduced a new CMAKE-MINIMAL variant for use in package inputs. * gnu/packages/databases.scm (python-pyarrow)[native-inputs]: Replace CMAKE with CMAKE-MINIMAL. * gnu/packages/emacs-xyz.scm (emacs-scel)[native-inputs]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Likewise. * gnu/packages/games.scm (0ad, the-butterfly-effect)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. * gnu/packages/ibus.scm (ibus-rime)[native-inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Likewise. * gnu/packages/simulation.scm (fenics)[native-inputs]: Likewise. * gnu/packages/squirrel.scm (squirrel)[native-inputs]: Likewise. * gnu/packages/video.scm (handbrake)[native-inputs]: Likewise. * gnu/packages/virtualization.scm (xen)[native-inputs]: Likewise. * gnu/packages/vulkan.scm (shaderc)[native-inputs]: Likewise. --- gnu/packages/databases.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/firmware.scm | 2 +- gnu/packages/games.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- gnu/packages/ibus.scm | 2 +- gnu/packages/rust.scm | 2 +- gnu/packages/simulation.scm | 2 +- gnu/packages/squirrel.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 2 +- gnu/packages/vulkan.scm | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c38f6d2db7..f4966276a0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3052,7 +3052,7 @@ algorithm implementations.") ("python-pandas" ,python-pandas) ("python-six" ,python-six))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-cython" ,python-cython) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9bf101ab31..176aa90eab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3470,7 +3470,7 @@ to a key in your preferred mode.") (inputs `(("supercollider" ,supercollider))) (native-inputs - `(("cmake" ,cmake))) + `(("cmake" ,cmake-minimal))) (home-page "https://github.com/supercollider/scel") (synopsis "SuperCollider Emacs interface") (description "@code{emacs-scel} is an Emacs interface to SuperCollider. diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 90cb8845cf..8f0b6cb15e 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -84,7 +84,7 @@ ;; Use our own tool chain for that. (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf")) ("cross-binutils" ,(cross-binutils "xtensa-elf")) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("perl" ,perl))) (home-page "http://wireless.kernel.org/en/users/Drivers/ath9k_htc") (synopsis "Firmware for the Atheros AR7010 and AR9271 USB 802.11n NICs") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b177c0b2f0..8e8c6c8058 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4779,7 +4779,7 @@ fight against their plot and save his fellow rabbits from slavery.") ("zlib" ,zlib))) (native-inputs `(("boost" ,boost) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("mesa" ,mesa) ("pkg-config" ,pkg-config) ("python-2" ,python-2))) @@ -5272,7 +5272,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) ("qttools" ,qttools))) (synopsis "Realistic physics puzzle game") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3c455b2838..ab2bd4e3e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -299,7 +299,7 @@ features to enable users to create their discs easily and quickly.") ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("intltool" ,intltool) - ("cmake" ,cmake))) + ("cmake" ,cmake-minimal))) (home-page "https://launchpad.net/deja-dup") (synopsis "Simple backup tool, for regular encrypted backups") (description diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f652cca1c2..eab35dbadd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -677,7 +677,7 @@ Method Engine.") ("librime" ,librime) ("rime-data" ,rime-data))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("pkg-config" ,pkg-config))) (home-page "https://rime.im/") (synopsis "Rime Input Method Engine for IBus") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 43725c64ce..f90bc52506 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -387,7 +387,7 @@ test = { path = \"../libtest\" } (build-system gnu-build-system) (native-inputs `(("bison" ,bison) ; For the tests - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("flex" ,flex) ; For the tests ("gdb" ,gdb) ; For the tests ("procps" ,procps) ; For the tests diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index a8d214794e..edc8d6e190 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -620,7 +620,7 @@ user interface to the FEniCS core components and external libraries.") ("python-matplotlib" ,python-matplotlib) ,@(alist-delete "python" (package-inputs fenics-dolfin)))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("ply" ,python-ply) ("pytest" ,python-pytest) ("python-decorator" ,python-decorator) diff --git a/gnu/packages/squirrel.scm b/gnu/packages/squirrel.scm index 2c3ed6e570..1b9489882f 100644 --- a/gnu/packages/squirrel.scm +++ b/gnu/packages/squirrel.scm @@ -71,7 +71,7 @@ (find-files "../squirrel3/include"))) #t))))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("python-sphinx" ,python-sphinx))) (home-page "https://squirrel-lang.org/") (synopsis "High level imperative, object-oriented programming language") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dc6d2fb9b4..9859c55f98 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2604,7 +2604,7 @@ supported players in addition to this package.") (native-inputs `(("automake" ,automake) ;gui subpackage must be bootstrapped ("autoconf" ,autoconf) - ("cmake" ,cmake) ;TODO: could probably strip check from make/configure.py + ("cmake" ,cmake-minimal) ;TODO: could probably strip check from make/configure.py ("curl" ,curl) ;not actually used, but tested for ("intltool" ,intltool) ("libtool" ,libtool) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 87839490b2..303171e61d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1291,7 +1291,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) (native-inputs `(("dev86" ,dev86) ("bison" ,bison) - ("cmake" ,cmake) + ("cmake" ,cmake-minimal) ("figlet" ,figlet) ("flex" ,flex) ("gettext" ,gettext-minimal) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 6b151f0a31..6ae9ba9b87 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -326,7 +326,7 @@ API.") `(("googletest" ,googletest) ("python" ,python))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("glslang-source" ,(package-source glslang)) ("pkg-config" ,pkg-config) ("spirv-headers-source" ,(package-source spirv-headers)) -- cgit v1.2.3 From 74c1c8daf543f72249f32216b41f3143c54acb4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:52:35 +0200 Subject: gnu: libx11: Update to 1.6.8. * gnu/packages/xorg.scm (libx11): Update to 1.6.8. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 919d2e62a6..794aefe7f8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5236,7 +5236,7 @@ draggable titlebars and borders.") (define-public libx11 (package (name "libx11") - (version "1.6.7") + (version "1.6.8") (source (origin (method url-fetch) @@ -5246,7 +5246,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "0j0k5bjz4kd7rx6z09n5ggxbzbi84wf78xx25ikx6jmsxwq9w3li")))) + "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML -- cgit v1.2.3 From ac3842ef3e6ecdaa7a147cfe6ab59f017544a8a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 18:12:54 +0200 Subject: gnu: util-linux: Update to 2.34. * gnu/packages/linux.scm (util-linux): Update to 2.34. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e2cde4b693..f0fa6bba92 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -723,7 +723,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.33.2") + (version "2.34") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -731,7 +731,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3")) + "1db2kydkwjmvgd1glkcba3adhidxw0f1x735dcjdpdjjf869sgvl")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 70530036b8313d5273fca286cd62c73bd2225110 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 18:20:22 +0200 Subject: gnu: meson: Update to 0.51.0. * gnu/packages/build-tools.scm (meson): Update to 0.51.0. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index c435e72824..68d5b77d49 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -162,7 +162,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.50.1") + (version "0.51.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -170,7 +170,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn")))) + "0gynkr02mlillh35ksizsf6zc4dfxb8gqym00df5klw6spvgsx9g")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From 2b5e412b30f5d3fb66ee4f697629e86d536ff5a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 21:18:54 +0200 Subject: gnu: commencement: Return #t from all phases. While at it, remove useless (and ...) indirections, because the procedures never return #f anyway: instead they would raise an exception upon failure. * gnu/packages/commencement.scm (mes-boot, tcc-boot0, tcc-boot, diffutils-mesboot, binutils-mesboot0, gcc-core-mesboot, gcc-mesboot0, glibc-headers-mesboot, glibc-mesboot, gnu-make-boot0): Return #t from phases and remove (and ...) blocks. --- gnu/packages/commencement.scm | 129 +++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 66 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 08a34895f5..10b0bd67f5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -106,11 +106,10 @@ (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source")) (bootstrap-mes (assoc-ref %build-inputs "bootstrap-mes"))) (with-directory-excursion ".." - (and - (mkdir-p "nyacc-source") - (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") - #t))))) + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed")) + #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) @@ -130,12 +129,11 @@ (invoke "sh" "bootstrap.sh")))) (replace 'check (lambda _ - (and - (setenv "DIFF" "sh scripts/diff.scm") - ;; fail fast tests - ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") - ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") - (invoke "sh" "check.sh")))) + (setenv "DIFF" "sh scripts/diff.scm") + ;; fail fast tests + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/t") + ;; (invoke "sh" "-x" "build-aux/test.sh" "scaffold/tests/63-struct-cell") + (invoke "sh" "check.sh"))) (replace 'install (lambda _ (invoke "sh" "install.sh")))))) @@ -201,12 +199,11 @@ coreutils "/bin")) (format (current-error-port) "PATH=~s\n" (getenv "PATH")) (with-directory-excursion ".." - (and - (mkdir-p "nyacc-source") - (invoke "tar" "--strip=1" "-C" "nyacc-source" - "-xvf" nyacc-source) - (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed") - #t))))) + (mkdir-p "nyacc-source") + (invoke "tar" "--strip=1" "-C" "nyacc-source" + "-xvf" nyacc-source) + (symlink (string-append bootstrap-mes "/share/mes/lib") "mes-seed")) + #t))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref %outputs "out")) @@ -353,20 +350,19 @@ (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out")) (tcc (assoc-ref %build-inputs "tcc"))) - (and - (mkdir-p (string-append out "/bin")) - (copy-file "tcc" (string-append out "/bin/tcc")) - (mkdir-p (string-append out "/lib/tcc")) - (copy-recursively (string-append tcc "/include") - (string-append out "/include")) - (copy-recursively (string-append tcc "/lib") - (string-append out "/lib")) - (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") - (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") - (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) - (delete-file (string-append out "/lib/tcc/libtcc1.a")) - (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) - #t)))))))))) + (mkdir-p (string-append out "/bin")) + (copy-file "tcc" (string-append out "/bin/tcc")) + (mkdir-p (string-append out "/lib/tcc")) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + (copy-recursively (string-append tcc "/lib") + (string-append out "/lib")) + (invoke "tcc" "-D" "TCC_TARGET_I386=1" "-c" "-o" "libtcc1.o" "lib/libtcc1.c") + (invoke "tcc" "-ar" "rc" "libtcc1.a" "libtcc1.o") + (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) + (delete-file (string-append out "/lib/tcc/libtcc1.a")) + (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) + #t))))))))) (define make-mesboot0 (package-with-bootstrap-guile @@ -413,7 +409,8 @@ (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (install-file "make" bin)))))))))) + (install-file "make" bin) + #t))))))))) (define diffutils-mesboot (package-with-bootstrap-guile @@ -457,8 +454,8 @@ (add-before 'configure 'remove-diff3-sdiff (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile.in" - (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")))))))))) - + (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")) + #t)))))))) (define binutils-mesboot0 (package-with-bootstrap-guile @@ -585,7 +582,8 @@ (lambda _ (display " ac_cv_c_float_format='IEEE (little-endian)' -")))))) +"))) + #t))) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) @@ -603,23 +601,22 @@ ac_cv_c_float_format='IEEE (little-endian)' (out (assoc-ref outputs "out")) (gcc-dir (string-append out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) - (and - (mkdir-p "tmp") - (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) - (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) - (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) - (copy-file (string-append tcc "/lib/libtcc1.a") - (string-append out "/lib/libtcc1.a")) - (invoke "ar" "r" (string-append gcc-dir "/libc.a") - (string-append tcc-lib "/libc+gnu.o") - (string-append tcc-lib "/libtcc1.o")) - (invoke "ar" "r" (string-append out "/lib/libc.a") - (string-append tcc-lib "/libc+gnu.o") - (string-append tcc-lib "/libtcc1.o")) - (invoke "ls" "-ltrF" gcc-dir) - (copy-recursively (string-append tcc "/include") - (string-append out "/include")) - #t))))))) + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) + (copy-file (string-append tcc "/lib/libtcc1.a") + (string-append out "/lib/libtcc1.a")) + (invoke "ar" "r" (string-append gcc-dir "/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ar" "r" (string-append out "/lib/libc.a") + (string-append tcc-lib "/libc+gnu.o") + (string-append tcc-lib "/libtcc1.o")) + (invoke "ls" "-ltrF" gcc-dir) + (copy-recursively (string-append tcc "/include") + (string-append out "/include")) + #t)))))) (native-search-paths ;; Use the language-specific variables rather than 'CPATH' because they ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. @@ -818,11 +815,11 @@ ac_cv_c_float_format='IEEE (little-endian)' (let* ((out (assoc-ref outputs "out")) (gcc-dir (string-append out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) - (and - (mkdir-p "tmp") - (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) - (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) - (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")))))))) + (mkdir-p "tmp") + (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) + (zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) + (copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a")) + #t))))) ((#:configure-flags configure-flags) `(let ((out (assoc-ref %outputs "out"))) `("--disable-shared" @@ -1179,14 +1176,15 @@ exec " gcc "/bin/" program (("/bin/pwd") (string-append coreutils "/bin/pwd"))) (setenv "C_INCLUDE_PATH" (string-append libc "/include" headers "/include")) - (setenv "LIBRARY_PATH" (string-append libc "/lib"))))) + (setenv "LIBRARY_PATH" (string-append libc "/lib")) + #t))) (replace 'install (lambda* (#:key outputs make-flags #:allow-other-keys) (let ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) (out (assoc-ref outputs "out"))) - (and (apply invoke "make" make-flags) - (copy-recursively kernel-headers out) - #t)))) + (apply invoke "make" make-flags) + (copy-recursively kernel-headers out) + #t))) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) (format (current-error-port) "running ../configure ~a\n" (string-join configure-flags)) @@ -1237,9 +1235,9 @@ exec " gcc "/bin/" program (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) (out (assoc-ref outputs "out")) (install-flags (cons "install" make-flags))) - (and (apply invoke "make" install-flags) - (copy-recursively kernel-headers out) - #t))))))))) + (apply invoke "make" install-flags) + (copy-recursively kernel-headers out) + #t)))))))) (native-search-paths ;; FIXME: move to glibc-mesboot0 ;; Use the language-specific variables rather than 'CPATH' because they ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'. @@ -1413,8 +1411,7 @@ exec " gcc "/bin/" program `(modify-phases ,phases (replace 'build (lambda _ - (invoke "./build.sh") - #t)) + (invoke "./build.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 1bd364364dbbff2b51a7822b13bdbeecfd9f2d34 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 18 Jun 2019 16:54:45 +0200 Subject: gnu: ncurses: Update to 6.1-20190909. * gnu/packages/ncurses.scm (ncurses): Update to 6.1-20190609. [arguments]: Reinstate 'apply-rollup-patch' phase. Move 'remove-unneeded-shebang' phase later to prevent conflict with patch. [native-inputs]: Add "rollup-patch" origin. --- gnu/packages/ncurses.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index a35ff9b400..78e9ba1377 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -40,7 +40,7 @@ (define-public ncurses (package (name "ncurses") - (version "6.1") + (version "6.1-20190609") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ncurses/ncurses-" @@ -84,8 +84,7 @@ (copy-file (assoc-ref (or native-inputs inputs) "rollup-patch") (string-append (getcwd) "/rollup-patch.sh.bz2")) (invoke "bzip2" "-d" "rollup-patch.sh.bz2") - (invoke "sh" "rollup-patch.sh") - #t)) + (invoke "sh" "rollup-patch.sh"))) (remove-shebang-phase '(lambda _ ;; To avoid retaining a reference to the bootstrap Bash via the @@ -189,17 +188,31 @@ ,@(if (target-mingw?) '("--enable-term-driver") '())))) #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases + (add-after 'unpack 'apply-rollup-patch + ,apply-rollup-patch-phase) (replace 'configure ,configure-phase) (add-after 'install 'post-install ,post-install-phase) (add-before 'configure 'patch-makefile-SHELL ,patch-makefile-phase) - (add-after 'unpack 'remove-unneeded-shebang + (add-before 'patch-source-shebangs 'remove-unneeded-shebang ,remove-shebang-phase))))) (native-inputs `(,@(if (%current-target-system) `(("self" ,this-package)) ;for `tic' '()) + + ("rollup-patch" + ,(origin + (method url-fetch) + (uri (string-append + "https://invisible-mirror.net/archives/ncurses/" + (car (string-split version #\-)) + "/ncurses-" version "-patch.sh.bz2")) + (sha256 + (base32 + "0hqlqdqmh7lfs6dwj763qksb4j9nk0pv6crzx5gnp6n4caz3i46g")))) + ("pkg-config" ,pkg-config))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 9f1da6ced3ea41cee93b5a1944a5526c6805359d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 14:39:58 +0200 Subject: gnu: isl: Fix fallback URL. * gnu/packages/gcc.scm (isl, isl-0.18, isl-0.11)[source](uri): Use '.bz2' tarball. --- gnu/packages/gcc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 345fa4c745..5d4acbce8a 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -868,7 +868,7 @@ as the 'native-search-paths' field." version ".tar.bz2") (string-append %gcc-infrastructure - name "-" version ".tar.gz"))) + name "-" version ".tar.bz2"))) (sha256 (base32 "1n4yz9rj24mv226hqbpw210ifvqkn8dgvpnkzf0s0lkq9zrjd5ym")))) @@ -898,7 +898,7 @@ dependence analysis and bounds on piecewise step-polynomials.") (uri (list (string-append "http://isl.gforge.inria.fr/isl-" version ".tar.bz2") (string-append %gcc-infrastructure - "isl-" version ".tar.gz"))) + "isl-" version ".tar.bz2"))) (sha256 (base32 "06ybml6llhi4i56q90jnimbcgk1lpcdwhy9nxdxra2hxz3bhz2vb")))))) @@ -915,7 +915,7 @@ dependence analysis and bounds on piecewise step-polynomials.") version ".tar.bz2") (string-append %gcc-infrastructure - name "-" version ".tar.gz"))) + name "-" version ".tar.bz2"))) (sha256 (base32 "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9")) -- cgit v1.2.3 From 8449cc133aac735cceb1caf1910506dfab099e40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 14:41:41 +0200 Subject: gnu: isl: Update to 0.21. * gnu/packages/gcc.scm (isl): Update to 0.21. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5d4acbce8a..41d66fc130 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -860,7 +860,7 @@ as the 'native-search-paths' field." (define-public isl (package (name "isl") - (version "0.19") + (version "0.21") (source (origin (method url-fetch) (uri (list (string-append @@ -871,7 +871,7 @@ as the 'native-search-paths' field." name "-" version ".tar.bz2"))) (sha256 (base32 - "1n4yz9rj24mv226hqbpw210ifvqkn8dgvpnkzf0s0lkq9zrjd5ym")))) + "0ng8l3q1px9lkzb44nxnzhh6fhdbclrwng9xs2v9m8yii8gs336i")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp))) (home-page "http://isl.gforge.inria.fr/") -- cgit v1.2.3 From 78b036ddcedb76b623bc54de880b133d2c33acf8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:13:51 +0200 Subject: gnu: libxi: Update to 1.7.10. * gnu/packages/xorg.scm (libxi): Update to 1.7.10. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 794aefe7f8..1f6fd35c60 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4919,7 +4919,7 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxi (package (name "libxi") - (version "1.7.9") + (version "1.7.10") (source (origin (method url-fetch) @@ -4929,7 +4929,7 @@ new API's in libXft, or the legacy API's in libX11.") ".tar.bz2")) (sha256 (base32 - "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2")))) + "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto) -- cgit v1.2.3 From d0828b07573c547345632acc3220a532fdc7d6ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:14:47 +0200 Subject: gnu: xorgproto: Update to 2019.1. * gnu/packages/xorg.scm (xorgproto): Update to 2019.1. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1f6fd35c60..ee345742a5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -211,14 +211,14 @@ which can be read by any architecture.") (define-public xorgproto (package (name "xorgproto") - (version "2018.4") + (version "2019.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/proto/" name "-" version ".tar.bz2")) (sha256 (base32 - "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y")))) + "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6")))) (build-system gnu-build-system) (propagated-inputs ;; To get util-macros in (almost?) all package inputs. -- cgit v1.2.3 From fc9e5973d6ffbf016dc09085467d146ad99e2f93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Jun 2019 23:16:50 +0200 Subject: gnu: expat: Update to 2.2.7. * gnu/packages/xml.scm (expat): Update to 2.2.7. [source](uri): Use XZ compressed archive. --- gnu/packages/xml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e71448e8a7..8dce027827 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -65,14 +65,14 @@ (define-public expat (package (name "expat") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/expat/expat/" - version "/expat-" version ".tar.bz2")) + version "/expat-" version ".tar.xz")) (sha256 (base32 - "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p")))) + "1y5yax6bq8p9xk49zqkd62pxk8bq266wrgbrqgaxp3wsrw5g9qrh")))) (build-system gnu-build-system) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") -- cgit v1.2.3 From e7041c8ef8b9137f40e0a5377b8224314168e226 Mon Sep 17 00:00:00 2001 From: "Jeremiah@pdp10.guru" Date: Tue, 11 Jun 2019 20:57:01 +0000 Subject: gnu: python: Allow building on low-memory systems. * gnu/packages/python.scm (python-3.7)[source]: Delete memory-intensive test. Signed-off-by: Marius Bakke --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8565e60f71..f3bea4a51d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -345,6 +345,9 @@ data types.") ;; "Lib/test/test_socket.py" + ;; Delete test that fails on low-memory systems. + "Lib/test/test_mmap.py" + ;; These tests fail on AArch64. "Lib/ctypes/test/test_win32.py" "Lib/test/test_fcntl.py" -- cgit v1.2.3 From 6c237a2d7bfa3c7be02c069e5c24a2b401a51864 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Dec 2018 16:11:52 +0100 Subject: gnu: glib: Update to 2.58.1. * gnu/packages/glib.scm (glib): Update to 2.58.1. [build-system]: Use meson-build-system. [outputs]: Remove "doc" as the documentation files are no longer included. [inputs]: Move libffi, util-linux, and zlib from here... [propagated-inputs]: ...to here; add libselinux. [arguments]: Remove key "disallowed-references" as it is not supported by the meson-build-system; delete "bootstrap" phase to prevent use of autotools; adjust "pre-build" phase; move "disable-failing-tests" phase after "unpack"; disable two more tests in "disable-failing-tests" phase; add phase "move-executables"; remove configure flags. --- gnu/packages/glib.scm | 72 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9fba2310d6..b5b4b5e039 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages selinux) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -159,7 +160,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.56.3") + (version "2.58.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -167,19 +168,20 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1cjcqz77m62zrx7224vl3f2cxwqf28r5xpqb2jy7av0vr2scb959")) + "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp")) (patches (search-patches "glib-tests-timer.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (outputs '("out" ; everything - "bin" ; glib-mkenums, gtester, etc.; depends on Python - "doc")) ; 20 MiB of GTK-Doc reference + "bin")) ; glib-mkenums, gtester, etc.; depends on Python (propagated-inputs - `(("pcre" ,pcre))) ; in the Requires.private field of glib-2.0.pc - (inputs - `(("coreutils" ,coreutils) + `(("pcre" ,pcre) ; in the Requires.private field of glib-2.0.pc + ("libffi" ,libffi) ; in the Requires.private field of gobject-2.0.pc + ;; These are in the Requires.private field of gio-2.0.pc ("util-linux" ,util-linux) ; for libmount - ("libffi" ,libffi) + ("libselinux" ,libselinux) ("zlib" ,zlib))) + (inputs + `(("coreutils" ,coreutils))) (native-inputs `(("gettext" ,gettext-minimal) ("dbus" ,dbus) ; for GDBus tests @@ -189,11 +191,14 @@ shared NFS home directories.") ("bash" ,bash) ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c (arguments - `(#:disallowed-references (,tzdata-for-tests) - #:phases + `(#:phases (modify-phases %standard-phases + (delete 'bootstrap) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) + ;; For building deterministic pyc files + (setenv "DETERMINISTIC_BUILD" "1") + ;; For tests/gdatetime.c. (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") @@ -202,14 +207,8 @@ shared NFS home directories.") ;; Some tests want write access there. (setenv "HOME" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) - - (substitute* '("glib/gspawn.c" - "glib/tests/utils.c" - "tests/spawn-test.c") - (("/bin/sh") - (string-append (assoc-ref inputs "bash") "/bin/sh"))) #t)) - (add-before 'check 'disable-failing-tests + (add-after 'unpack 'disable-failing-tests (lambda _ (let ((disable (lambda (test-file test-paths) @@ -228,6 +227,15 @@ shared NFS home directories.") ;; recognize it. "/thread/thread4")) + ;; This tries to find programs in FHS directories. + ("glib/tests/utils.c" + ("/utils/find-program")) + + ;; This fails because "glib/tests/echo-script" cannot be + ;; found. + ("glib/tests/spawn-singlethread.c" + ("/gthread/spawn-script")) + ("glib/tests/timer.c" (;; fails if compiler optimizations are enabled, which they ;; are by default. @@ -273,12 +281,30 @@ shared NFS home directories.") (;; Requires /etc/machine-id. "/gdbus/x11-autolaunch"))))) (for-each (lambda (x) (apply disable x)) failing-tests) + #t))) + ;; TODO: meson does not permit the bindir to be outside of prefix. + ;; See https://github.com/mesonbuild/meson/issues/2561 + ;; We can remove this once meson is patched. + (add-after 'install 'move-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (bin (assoc-ref outputs "bin"))) + (mkdir-p bin) + (rename-file (string-append out "/bin") + (string-append bin "/bin")) + ;; Do not refer to "bindir", which points to "${prefix}/bin". + ;; We don't patch "bindir" to point to "$bin/bin", because that + ;; would create a reference cycle between the "out" and "bin" + ;; outputs. + (substitute* (list (string-append out "/lib/pkgconfig/gio-2.0.pc") + (string-append out "/lib/pkgconfig/glib-2.0.pc")) + (("bindir=\\$\\{prefix\\}/bin") "") + (("=\\$\\{bindir\\}/") "=")) #t)))) - - ;; Note: `--docdir' and `--htmldir' are not honored, so work around it. - #:configure-flags (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) + ;; TODO: see above for explanation. + ;; #:configure-flags (list (string-append "--bindir=" + ;; (assoc-ref %outputs "bin") + ;; "/bin")) ;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a ;; file that gets compiled possibly before it has been fully generated. -- cgit v1.2.3 From 036c86be5ad6d960d3f8e3b06e15bc368c77957d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Dec 2018 16:21:35 +0100 Subject: gnu: gobject-introspection: Update to 1.58.1. * gnu/packages/glib.scm (gobject-introspection): Update to 1.58.1. [source]: Remove snippet. [arguments]: Add phase "do-not-use-/usr/bin/env". [inputs]: Replace python-2 with python-wrapper; add zlib. [native-inputs]: Add autoconf and automake to be able to keep using the gnu-build-system. * gnu/packages/patches/gobject-introspection-cc.patch: Update patch to apply to latest version. --- gnu/packages/glib.scm | 40 +++++++++++++--------- .../patches/gobject-introspection-cc.patch | 11 +++--- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b5b4b5e039..e438e56a59 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -28,6 +28,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -335,32 +336,44 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.56.1") + (version "1.58.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "0jx2kryjd7l0vl5gb3qp1qjfy3cjiizvcd1snsm7pzwrzz67aa2v")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "tools/g-ir-tool-template.in" - (("#!/usr/bin/env @PYTHON@") "#!@PYTHON@")) - #t)) + (base32 "12fzs3044047icdfs7cb2lsmnfi6w6fyhkci3m2rbvf5llgnhm29")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" "gobject-introspection-absolute-shlib-path.patch")))) (build-system gnu-build-system) + (arguments + `(;; The build system has at least one race condition involving Gio-2.0.gir + ;; which causes intermittent failures, as of 1.56.0. + #:parallel-build? #f + ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes + ;; some tests to fail. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-/usr/bin/env + (lambda _ + (substitute* "tools/g-ir-tool-template.in" + (("#!@PYTHON_CMD@") + (string-append "#!" (which "python3")))) + #t))))) (inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib) - ("python-2" ,python-2))) + ("python" ,python-wrapper) + ("zlib" ,zlib))) (native-inputs - `(("glib" ,glib "bin") + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (propagated-inputs `(;; In practice, GIR users will need libffi when using @@ -371,13 +384,6 @@ dynamic loading, and an object system.") (variable "GI_TYPELIB_PATH") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (arguments - `(;; The build system has at least one race condition involving Gio-2.0.gir - ;; which causes intermittent failures, as of 1.56.0. - #:parallel-build? #f - ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes - ;; some tests to fail. - #:tests? #f)) (home-page "https://wiki.gnome.org/GObjectIntrospection") (synopsis "Generate interface introspection data for GObject libraries") (description diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch index d9cacf4ca7..6a86b56b44 100644 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ b/gnu/packages/patches/gobject-introspection-cc.patch @@ -1,11 +1,14 @@ Use gcc as the default C compiler if CC is not set. - ---- gobject-introspection-1.44.0.orig/giscanner/__init__.py 2014-08-04 22:37:07.000000000 +0800 -+++ gobject-introspection-1.44.0/giscanner/__init__.py 2015-04-20 17:30:26.507697234 +0800 -@@ -22,3 +22,5 @@ +diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py +--- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 ++++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 +@@ -22,6 +22,8 @@ builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') if builddir is not None: __path__.append(os.path.join(builddir, 'giscanner')) +if not 'CC' in os.environ: + os.environ['CC'] = 'gcc' + try: + from ._version import __version__ + except ImportError: -- cgit v1.2.3 From 8a9ac0477dde61a5ce7cbf927b7a5f15f19a82e7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:02:07 +0100 Subject: gnu: glibmm: Update to 2.58.0. * gnu/packages/glib.scm (glibmm): Update to 2.58.0. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e438e56a59..35d2e685a4 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -551,7 +551,7 @@ has an ease of use unmatched by other C++ callback libraries.") (define glibmm (package (name "glibmm") - (version "2.56.0") + (version "2.58.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -559,7 +559,7 @@ has an ease of use unmatched by other C++ callback libraries.") "/glibmm-" version ".tar.xz")) (sha256 (base32 - "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f")))) + "0idnaii4h3mdym2a55gkavipyxigwvbgfmzmwql85s4rgciqjhfk")))) (build-system gnu-build-system) (arguments `(;; XXX: Some tests uses C++14 features. Remove this when the default -- cgit v1.2.3 From 3387ee41ac1469200db3cf7f914285905024e871 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:06:54 +0100 Subject: gnu: gnome-desktop: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-desktop): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab2bd4e3e9..32f70b1394 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -468,7 +468,7 @@ commonly used macros.") (define-public gnome-desktop (package (name "gnome-desktop") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -477,7 +477,7 @@ commonly used macros.") name "-" version ".tar.xz")) (sha256 (base32 - "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30")))) + "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0dd65d5a0ab462ef49653e8ccdecf9ed795f1f1c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:14 +0100 Subject: gnu: gnome-disk-utility: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-disk-utility): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 32f70b1394..44b81e67c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -556,7 +556,7 @@ and keep up to date translations of documentation.") (define-public gnome-disk-utility (package (name "gnome-disk-utility") - (version "3.28.3") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -564,7 +564,7 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m")))) + "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") -- cgit v1.2.3 From 2dfc16d14ae5c702f989ebb4fa7dc14d84e9946e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:32 +0100 Subject: gnu: evince: Update to 3.30.2. * gnu/packages/gnome.scm (evince): Update to 3.30.2. [inputs]: Add gspell. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 44b81e67c3..3374229a8c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -755,7 +755,7 @@ forgotten when the session ends.") (define-public evince (package (name "evince") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -763,7 +763,7 @@ forgotten when the session ends.") name "-" version ".tar.xz")) (sha256 (base32 - "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89")))) + "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus") @@ -788,6 +788,7 @@ forgotten when the session ends.") ;; ("libkpathsea" ,texlive-bin) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gspell" ,gspell) ("libgnome-keyring" ,libgnome-keyring) ("adwaita-icon-theme" ,adwaita-icon-theme) ("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 10ff872f77ff01cee56e07e0364d49047c629beb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:07:48 +0100 Subject: gnu: gsettings-desktop-schemas: Update to 3.28.1. * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 3.28.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3374229a8c..9cf1a0a7ff 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -829,7 +829,7 @@ on the GNOME Desktop with a single simple application.") (define-public gsettings-desktop-schemas (package (name "gsettings-desktop-schemas") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) @@ -838,7 +838,7 @@ on the GNOME Desktop with a single simple application.") name "-" version ".tar.xz")) (sha256 (base32 - "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c")))) + "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) -- cgit v1.2.3 From 412e53024aa43e49b7545b09312d75d132fce7cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:07 +0100 Subject: gnu: adwaita-icon-theme: Update to 3.30.1. * gnu/packages/gnome.scm (adwaita-icon-theme): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9cf1a0a7ff..8b94c30526 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -927,7 +927,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") (define-public adwaita-icon-theme (package (inherit gnome-icon-theme) (name "adwaita-icon-theme") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -935,7 +935,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.") name "-" version ".tar.xz")) (sha256 (base32 - "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks")))) + "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd")))) (native-inputs `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) -- cgit v1.2.3 From d19db454feb717e0f822a6d5c1faf88af3f427e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:24 +0100 Subject: gnu: libgnomeprint: Update to 2.18.8. * gnu/packages/gnome.scm (libgnomeprint): Update to 2.18.8. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b94c30526..9b58150a9d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1902,7 +1902,7 @@ widgets built in the loading process.") ;; . (package (name "libgnomeprint") - (version "2.8.2") + (version "2.18.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1910,7 +1910,7 @@ widgets built in the loading process.") name "-" version ".tar.bz2")) (sha256 (base32 - "129ka3nn8gx9dlfry17ib79azxk45wzfv5rgqzw6dwx2b5ns8phm")))) + "14cnimvlc7ky22g2snyf4362412k3jk1syjf8b9887q5a63fqd0h")))) (build-system gnu-build-system) (inputs `(("popt" ,popt) -- cgit v1.2.3 From 36053d7f1d601f77e7dcb614a4d0301f74743294 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:40 +0100 Subject: gnu: libgnomeprintui: Update to 2.18.6. * gnu/packages/gnome.scm (libgnomeprintui): Update to 2.18.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9b58150a9d..255867be59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1933,7 +1933,7 @@ since ca. 2006, when GTK+ itself incorporated printing support.") ;; Deprecated; see libgnomeprint. (package (name "libgnomeprintui") - (version "2.8.2") + (version "2.18.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1941,7 +1941,7 @@ since ca. 2006, when GTK+ itself incorporated printing support.") name "-" version ".tar.bz2")) (sha256 (base32 - "1ivipk7r61rg90p9kp889j28xlyyj6466ypvwa4jvnrcllnaajsw")))) + "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm")))) (build-system gnu-build-system) ;; Mentioned as Required in the .pc file (propagated-inputs `(("libgnomeprint" ,libgnomeprint))) -- cgit v1.2.3 From 6cc6e3e514823dae0daad8310356f219701be5b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:08:58 +0100 Subject: gnu: libwnck: Update to 3.30.0. * gnu/packages/gnome.scm (libwnck): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 255867be59..5063b4fe4f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2006,7 +2006,7 @@ controls using the Bonobo component framework.") (define-public libwnck (package (name "libwnck") - (version "3.24.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2014,7 +2014,7 @@ controls using the Bonobo component framework.") name "-" version ".tar.xz")) (sha256 (base32 - "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg")))) + "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 0db6bafb3d4a68c59c84da344be93a70d602540c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:09:43 +0100 Subject: gnu: seahorse: Update to 3.30. * gnu/packages/gnome.scm (seahorse): Update to 3.30. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5063b4fe4f..4a82dfe488 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2214,7 +2214,7 @@ engineering.") (define-public seahorse (package (name "seahorse") - (version "3.20.0") + (version "3.30") (source (origin (method url-fetch) @@ -2223,7 +2223,7 @@ engineering.") version ".tar.xz")) (sha256 (base32 - "1py6fj19kb8aaxvg6yrpd0876azc2zjvis98aqz37a2lxmhp9c72")))) + "1sbj1czlx1fakm72dwgbn0bwm12j838yaky4mkf6hf8j8afnxmzp")))) (build-system glib-or-gtk-build-system) (inputs `(("gtk+" ,gtk+) -- cgit v1.2.3 From 91185fe8f3d164ccf93ceb7cd41c4a760d8c75f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:10:00 +0100 Subject: gnu: vala: Update to 0.42.3. * gnu/packages/gnome.scm (vala): Update to 0.42.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a82dfe488..e9e3180b51 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2250,7 +2250,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.40.9") + (version "0.42.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2258,7 +2258,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "0yvaijkpahzz26sa37cyzbj75a9vbcbgvxbqzzb7hbcvfy009zy7")))) + "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 5f36c5eb12c321dda992691638169192133e1ae6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:10:16 +0100 Subject: gnu: vte: Update to 0.54.2. * gnu/packages/gnome.scm (vte): Update to 0.54.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e9e3180b51..7da3143be6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2297,7 +2297,7 @@ libraries written in C.") (define-public vte (package (name "vte") - (version "0.52.2") + (version "0.54.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2305,7 +2305,7 @@ libraries written in C.") name "-" version ".tar.xz")) (sha256 (base32 - "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg")))) + "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fd0557f84c03ccfdcab4ba2f6342c87b2bd53264 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:20 +0100 Subject: gnu: five-or-more: Update to 3.30.0. * gnu/packages/gnome.scm (five-or-more): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7da3143be6..7ecc468088 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2838,7 +2838,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public five-or-more (package (name "five-or-more") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -2847,7 +2847,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") name "-" version ".tar.xz")) (sha256 (base32 - "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c")))) + "00d729p251kh96624i7qg2370r5mxwafs016i6hy01vsr71jzb9x")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From f7a584f4e37af3916ff818ea3b04230fa607eeb1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:40 +0100 Subject: gnu: gnome-mines: Update to 3.30.1.1. * gnu/packages/gnome.scm (gnome-mines): Update to 3.30.1.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7ecc468088..a312fce0fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2869,7 +2869,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public gnome-mines (package (name "gnome-mines") - (version "3.28.0") + (version "3.30.1.1") (source (origin (method url-fetch) @@ -2878,7 +2878,7 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") name "-" version ".tar.xz")) (sha256 (base32 - "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf")))) + "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From b3f95507dff75790546ec22bd1b0f5b293a0dcc3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 05:11:57 +0100 Subject: gnu: gnome-sudoku: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-sudoku): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a312fce0fc..c71b24614a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2907,7 +2907,7 @@ floating in an ocean using only your brain and a little bit of luck.") (define-public gnome-sudoku (package (name "gnome-sudoku") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -2916,7 +2916,7 @@ floating in an ocean using only your brain and a little bit of luck.") name "-" version ".tar.xz")) (sha256 (base32 - "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav")))) + "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 1d7cb36e8ebe04f347cb8b9e0e6ff0658d8e80df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Dec 2018 19:06:58 +0100 Subject: gnu: gnome-terminal: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c71b24614a..9ae2d5fe97 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2942,7 +2942,7 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -2951,7 +2951,7 @@ more fun.") name "-" version ".tar.xz")) (sha256 (base32 - "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2")))) + "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 220bcf6fbac7eca3db16727d2f9e3bbc85c53cf5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 12:08:51 +0100 Subject: gnu: glib: Install m4 macros. * gnu/packages/glib.scm (glib)[native-inputs]: Add m4. --- gnu/packages/glib.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 35d2e685a4..9acbfd8386 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -185,6 +185,7 @@ shared NFS home directories.") `(("coreutils" ,coreutils))) (native-inputs `(("gettext" ,gettext-minimal) + ("m4" ,m4) ; for installing m4 macros ("dbus" ,dbus) ; for GDBus tests ("pkg-config" ,pkg-config) ("python" ,python-wrapper) -- cgit v1.2.3 From 0ecf6612c7d7a10df8ee697e92e9593e60242e78 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:14:46 +0100 Subject: gnu: gtkmm: Update to 3.24.0. * gnu/packages/gtk.scm (gtkmm): Update to 3.24.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a8bc2e42ce..64bf802c6f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1094,7 +1094,7 @@ toolkit.") (define-public gtkmm (package (name "gtkmm") - (version "3.22.2") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1102,7 +1102,7 @@ toolkit.") name "-" version ".tar.xz")) (sha256 (base32 - "1400535lhyya462pfx8bp11k3mg3jsbdghlpygskd5ai665dkbwi")))) + "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' -- cgit v1.2.3 From 3ec19e960c28e7f61d5b39f23d695646217b84f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:15:00 +0100 Subject: gnu: atkmm: Update to 2.28.0. * gnu/packages/gtk.scm (atkmm): Update to 2.28.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 64bf802c6f..f797cd942c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1071,7 +1071,7 @@ library.") (define-public atkmm (package (name "atkmm") - (version "2.24.2") + (version "2.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1079,7 +1079,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "1gaqwhviadsmy0fsr47686yglv1p4mpkamj0in127bz2b5bki5gz")))) + "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From 13b0a85dfa8dfc12adab0b7a558736814ddfc33b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:15:11 +0100 Subject: gnu: pangomm: Update to 2.42.0. * gnu/packages/gtk.scm (pangomm): Update to 2.42.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f797cd942c..1353dbb261 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1045,7 +1045,7 @@ library.") (define-public pangomm (package (name "pangomm") - (version "2.40.1") + (version "2.42.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1053,7 +1053,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "1bz3gciff23bpw9bqc4v2l3lkq9w7394v3a4jxkvx0ap5lmfwqlp")))) + "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From 85fb3df35d7ef134c146d70eda695d97ffe157d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:21:26 +0100 Subject: gnu: gnome-system-monitor: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-system-monitor): Update to 3.30.0. [build-system]: Use meson-build-system. [arguments]: Add configure flags to build without systemd. [native-inputs]: Add gtk+:bin. --- gnu/packages/gnome.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ae2d5fe97..960a3a999c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7348,7 +7348,7 @@ Bluefish supports many programming and markup languages.") (define-public gnome-system-monitor (package (name "gnome-system-monitor") - (version "3.28.2") + (version "3.30.0") (source (origin (method url-fetch) @@ -7357,10 +7357,14 @@ Bluefish supports many programming and markup languages.") name "-" version ".tar.xz")) (sha256 (base32 - "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb")))) - (build-system glib-or-gtk-build-system) + "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t + #:configure-flags '("-Dsystemd=false"))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums. + ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) ("libgtop" ,libgtop) -- cgit v1.2.3 From 2d475910fbcb33de9da4629264d12cb4854120ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:22:44 +0100 Subject: gnu: gnome-calculator: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.30.1. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add gtk+:bin and vala. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 960a3a999c..c1ab5d85ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7179,7 +7179,7 @@ handling the startup notification side.") (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.28.2") + (version "3.30.1") (source (origin (method url-fetch) @@ -7188,12 +7188,15 @@ handling the startup notification side.") name "-" version ".tar.xz")) (sha256 (base32 - "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s")))) - (build-system glib-or-gtk-build-system) + "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc")))) + (build-system meson-build-system) + (arguments '(#:glib-or-gtk? #t)) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) + ("vala" ,vala) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) -- cgit v1.2.3 From 8c6d7b61bf05ee3c4154d8fc4279a20f509d2740 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:24:44 +0100 Subject: gnu: network-manager-applet: Update to 1.8.18. * gnu/packages/gnome.scm (network-manager-applet): Update to 1.8.18. [inputs]: Add mobile-broadband-provider-info. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c1ab5d85ab..4a8c8049cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5487,7 +5487,7 @@ to virtual private networks (VPNs) via OpenVPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.8.14") + (version "1.8.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5495,7 +5495,7 @@ to virtual private networks (VPNs) via OpenVPN.") name "-" version ".tar.xz")) (sha256 (base32 - "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya")))) + "0y31g0lxr93370xi74hbpvcy9m81n5wdkdhq8xy2nqp0y4219p13")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags '("--disable-migration") #:phases -- cgit v1.2.3 From b74ef0bae75525227de092c4844b920625095f65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:25:57 +0100 Subject: gnu: gdm: Update to 3.30.2. * gnu/packages/gnome.scm (gdm): Update to 3.30.2. [arguments]: Add --with-udevdir configure flag. [source]: Remove patch. * gnu/packages/patches/gdm-CVE-2018-14424.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 8 +- gnu/packages/patches/gdm-CVE-2018-14424.patch | 172 -------------------------- 3 files changed, 5 insertions(+), 176 deletions(-) delete mode 100644 gnu/packages/patches/gdm-CVE-2018-14424.patch diff --git a/gnu/local.mk b/gnu/local.mk index 42b34ab90e..12a64b23f9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -836,7 +836,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2019-6978.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ - %D%/packages/patches/gdm-CVE-2018-14424.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a8c8049cf..787d9ab074 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5584,16 +5584,15 @@ libxml2.") (define-public gdm (package (name "gdm") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches (search-patches "gdm-CVE-2018-14424.patch")) (sha256 (base32 - "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0")))) + "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags @@ -5609,6 +5608,9 @@ libxml2.") ;; systemd-specific '/etc/locale.conf'. "--with-lang-file=/etc/environment" + ,(string-append "--with-udevdir=" + (assoc-ref %outputs "out") "/lib/udev") + "--localstatedir=/var" ,(string-append "--with-default-path=" (string-join '("/run/setuid-programs" diff --git a/gnu/packages/patches/gdm-CVE-2018-14424.patch b/gnu/packages/patches/gdm-CVE-2018-14424.patch deleted file mode 100644 index 88a71f4151..0000000000 --- a/gnu/packages/patches/gdm-CVE-2018-14424.patch +++ /dev/null @@ -1,172 +0,0 @@ -Fix CVE-2018-14424: - -https://gitlab.gnome.org/GNOME/gdm/issues/401 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14424 - -Patch copied from upstream source repository: - -https://gitlab.gnome.org/GNOME/gdm/commit/1ac1697b3b019f50729a6e992065959586e170da - -From 1ac1697b3b019f50729a6e992065959586e170da Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 19 Jul 2018 18:26:05 +0100 -Subject: [PATCH] display-store: Pass the display object rather than the id in - the removed signal - -By the time GdmDisplayStore emits the "display-removed" signal, the display -is no longer in the store and gdm_display_store_lookup will not work in -signal handlers. - -Change the "display-removed" parameter from the display id to the GdmDisplay -object, so that signal handers can perform any cleanup they need to do - -CVE-2018-14424 - -Closes: https://gitlab.gnome.org/GNOME/gdm/issues/401 ---- - daemon/gdm-display-store.c | 11 +++-------- - daemon/gdm-display-store.h | 2 +- - daemon/gdm-local-display-factory.c | 13 +++---------- - daemon/gdm-manager.c | 19 +++++++++---------- - daemon/gdm-manager.h | 3 ++- - 5 files changed, 18 insertions(+), 30 deletions(-) - -diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c -index af76f519..fd24334e 100644 ---- a/daemon/gdm-display-store.c -+++ b/daemon/gdm-display-store.c -@@ -76,15 +76,10 @@ stored_display_new (GdmDisplayStore *store, - static void - stored_display_free (StoredDisplay *stored_display) - { -- char *id; -- -- gdm_display_get_id (stored_display->display, &id, NULL); -- - g_signal_emit (G_OBJECT (stored_display->store), - signals[DISPLAY_REMOVED], - 0, -- id); -- g_free (id); -+ stored_display->display); - - g_debug ("GdmDisplayStore: Unreffing display: %p", - stored_display->display); -@@ -281,9 +276,9 @@ gdm_display_store_class_init (GdmDisplayStoreClass *klass) - G_STRUCT_OFFSET (GdmDisplayStoreClass, display_removed), - NULL, - NULL, -- g_cclosure_marshal_VOID__STRING, -+ g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, -- 1, G_TYPE_STRING); -+ 1, G_TYPE_OBJECT); - - g_type_class_add_private (klass, sizeof (GdmDisplayStorePrivate)); - } -diff --git a/daemon/gdm-display-store.h b/daemon/gdm-display-store.h -index 28359933..0aff8ee2 100644 ---- a/daemon/gdm-display-store.h -+++ b/daemon/gdm-display-store.h -@@ -49,7 +49,7 @@ typedef struct - void (* display_added) (GdmDisplayStore *display_store, - const char *id); - void (* display_removed) (GdmDisplayStore *display_store, -- const char *id); -+ GdmDisplay *display); - } GdmDisplayStoreClass; - - typedef enum -diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c -index 5f1ae89e..39f3e30a 100644 ---- a/daemon/gdm-local-display-factory.c -+++ b/daemon/gdm-local-display-factory.c -@@ -805,18 +805,11 @@ on_display_added (GdmDisplayStore *display_store, - - static void - on_display_removed (GdmDisplayStore *display_store, -- const char *id, -+ GdmDisplay *display, - GdmLocalDisplayFactory *factory) - { -- GdmDisplay *display; -- -- display = gdm_display_store_lookup (display_store, id); -- -- if (display != NULL) { -- g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory); -- g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory); -- -- } -+ g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), factory); -+ g_object_weak_unref (G_OBJECT (display), (GWeakNotify)on_display_disposed, factory); - } - - static gboolean -diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c -index f17bd1a5..f6684a8b 100644 ---- a/daemon/gdm-manager.c -+++ b/daemon/gdm-manager.c -@@ -1541,19 +1541,18 @@ on_display_status_changed (GdmDisplay *display, - - static void - on_display_removed (GdmDisplayStore *display_store, -- const char *id, -+ GdmDisplay *display, - GdmManager *manager) - { -- GdmDisplay *display; -+ char *id; - -- display = gdm_display_store_lookup (display_store, id); -- if (display != NULL) { -- g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); -+ gdm_display_get_id (display, &id, NULL); -+ g_dbus_object_manager_server_unexport (manager->priv->object_manager, id); -+ g_free (id); - -- g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); -+ g_signal_handlers_disconnect_by_func (display, G_CALLBACK (on_display_status_changed), manager); - -- g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, id); -- } -+ g_signal_emit (manager, signals[DISPLAY_REMOVED], 0, display); - } - - static void -@@ -2535,9 +2534,9 @@ gdm_manager_class_init (GdmManagerClass *klass) - G_STRUCT_OFFSET (GdmManagerClass, display_removed), - NULL, - NULL, -- g_cclosure_marshal_VOID__STRING, -+ g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, -- 1, G_TYPE_STRING); -+ 1, G_TYPE_OBJECT); - - g_object_class_install_property (object_class, - PROP_XDMCP_ENABLED, -diff --git a/daemon/gdm-manager.h b/daemon/gdm-manager.h -index 41c68a7a..c8fb3f22 100644 ---- a/daemon/gdm-manager.h -+++ b/daemon/gdm-manager.h -@@ -24,6 +24,7 @@ - - #include - -+#include "gdm-display.h" - #include "gdm-manager-glue.h" - - G_BEGIN_DECLS -@@ -50,7 +51,7 @@ typedef struct - void (* display_added) (GdmManager *manager, - const char *id); - void (* display_removed) (GdmManager *manager, -- const char *id); -+ GdmDisplay *display); - } GdmManagerClass; - - typedef enum --- -2.17.1 - -- cgit v1.2.3 From 5120f24f0eec81d44754f0bcc645d3aa06d31e3d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:30:02 +0100 Subject: gnu: gnome-keyring: Add missing input. * gnu/packages/gnome.scm (gnome-keyring)[native-inputs]: Add glib. [arguments]: Move "fix-docbook" phase after "unpack" phase. --- gnu/packages/gnome.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 787d9ab074..ff102d40ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -705,25 +705,24 @@ GNOME Desktop.") (substitute* "po/Makefile.in.in" (("/bin/sh") (which "sh"))) #t)) - (add-before - 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "docs/Makefile.am" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))) - (setenv "XML_CATALOG_FILES" - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")) - ;; Rerun the whole thing to avoid version mismatch ("This is - ;; Automake 1.15.1, but the definition used by this - ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't - ;; use 'autoreconf' because it insists on running 'libtoolize'. - (invoke "autoconf") - (invoke "aclocal") - (invoke "automake" "-ac")))))) + (add-after 'unpack 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "docs/Makefile.am" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + (setenv "XML_CATALOG_FILES" + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/catalog.xml")) + ;; Rerun the whole thing to avoid version mismatch ("This is + ;; Automake 1.15.1, but the definition used by this + ;; AM_INIT_AUTOMAKE comes from Automake 1.15."). Note: we don't + ;; use 'autoreconf' because it insists on running 'libtoolize'. + (invoke "autoconf") + (invoke "aclocal") + (invoke "automake" "-ac")))))) (inputs `(("libgcrypt" ,libgcrypt) ("linux-pam" ,linux-pam) @@ -733,6 +732,7 @@ GNOME Desktop.") (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") + ("glib" ,glib) ; for m4 macros ("python" ,python-2) ;for tests ("intltool" ,intltool) ("autoconf" ,autoconf) -- cgit v1.2.3 From 2fbe8cdb435a450133432bac8e232f8caa0939a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:32:15 +0100 Subject: gnu: gnome-settings-daemon: Update to 3.30.1.2. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.30.1.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ff102d40ee..886ad6dc6f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3240,7 +3240,7 @@ services for numerous locations.") (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.28.1") + (version "3.30.1.2") (source (origin (method url-fetch) @@ -3249,7 +3249,7 @@ services for numerous locations.") name "-" version ".tar.xz")) (sha256 (base32 - "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr")))) + "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 02710a9b558db8c5e56ab34a41ac6e30a1681a3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 19:50:29 +0100 Subject: gnu: network-manager: Update to 1.14.4. * gnu/packages/gnome.scm (network-manager): Update to 1.14.4. [source]: Simplify snippet. [arguments]: Pass more configure flags to use elogind; add phase "patch-ls-invocation"; adjust tests. [inputs]: Add coreutils. --- gnu/packages/gnome.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 886ad6dc6f..725a256e8b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5290,7 +5290,7 @@ users.") (define-public network-manager (package (name "network-manager") - (version "1.10.10") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -5298,20 +5298,13 @@ users.") "NetworkManager-" version ".tar.xz")) (sha256 (base32 - "1jn3g0f2x1irc88awqp8m3gnpdx1whqqqbdgkbgr4x55s702jki4")) + "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm")) + (modules '((guix build utils))) (snippet - '(begin - (use-modules (guix build utils)) - (substitute* "configure" - ;; Replace libsystemd-login with libelogind. - (("libsystemd-login") "libelogind")) - (substitute* "src/devices/wwan/nm-modem-manager.c" - (("systemd") "elogind")) - (substitute* "src/nm-session-monitor.c" - (("systemd") "elogind")) - (substitute* "./src/nm-logging.c" - (("systemd") "elogind")) - #t)))) + '(begin + (substitute* "src/devices/wwan/nm-modem-manager.c" + (("systemd") "elogind")) + #t)))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 8 MiB of gtk-doc HTML @@ -5321,7 +5314,10 @@ users.") (doc (assoc-ref %outputs "doc")) (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") "/sbin/dhclient"))) - (list "--with-systemd-logind=yes" ;In Guix System, this is provided by elogind. + (list "--with-libnm-glib" ; needed by network-manager-applet + "--with-systemd-journal=no" + "--with-session-tracking=elogind" + "--with-suspend-resume=elogind" "--with-consolekit=no" "--with-crypto=gnutls" "--disable-config-plugin-ibft" @@ -5336,6 +5332,13 @@ users.") (string-append "--with-dhclient=" dhclient))) #:phases (modify-phases %standard-phases + ;; This bare "ls" invocation breaks some tests. + (add-after 'unpack 'patch-ls-invocation + (lambda _ + (substitute* "build-aux/ltmain.sh" + (("`ls -") + (string-append "`" (which "ls") " -"))) + #t)) (add-before 'configure 'pre-configure (lambda _ ;; These tests try to test aspects of network-manager's @@ -5348,26 +5351,24 @@ users.") (("src/platform/tests/test-cleanup-linux") " ") (("src/platform/tests/test-link-linux") " ") (("src/platform/tests/test-route-linux") " ") + (("src/devices/tests/test-acd") "") (("src/devices/tests/test-arping") " ") (("src/devices/tests/test-lldp") " ") (("src/tests/test-route-manager-linux") " ")) #t)) (add-after 'unpack 'delete-failing-tests (lambda _ - ;; FIXME: These four tests fail for unknown reasons. + ;; FIXME: These three tests fail for unknown reasons. ;; ERROR:libnm-core/tests/test-general.c:5842: ;; _json_config_check_valid: assertion failed (res == expected): (1 == 0) ;; ERROR:libnm-core/tests/test-keyfile.c:647: ;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL) ;; ERROR:libnm-core/tests/test-setting.c:907: ;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner)) - ;; NetworkManager:ERROR:src/platform/tests/test-nmp-object.c:397: - ;; test_cache_link: assertion failed: (nmp_object_is_visible (obj_new)) (substitute* "Makefile.in" (("libnm-core/tests/test-general") " ") (("libnm-core/tests/test-keyfile") " ") - (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ") - (("src/platform/tests/test-nmp-object") " ")) + (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ")) #t)) (add-before 'check 'pre-check (lambda _ @@ -5398,7 +5399,8 @@ users.") ("python-dbus" ,python-dbus) ("python-pygobject" ,python-pygobject))) (inputs - `(("curl" ,curl) + `(("coreutils" ,coreutils) ; for ls + ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("dbus-glib" ,dbus-glib) ("dnsmasq" ,dnsmasq) -- cgit v1.2.3 From cd7f718ee0c51a6ad1f7d47d7d0d3ee0dcb74b90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 21:17:59 +0100 Subject: gnu: network-manager-applet: Use meson build system. * gnu/packages/gnome.scm (network-manager-applet)[build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add glib:bin and gtk-doc. [inputs]: Add gcr. --- gnu/packages/gnome.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 725a256e8b..c584edc245 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5498,28 +5498,14 @@ to virtual private networks (VPNs) via OpenVPN.") (sha256 (base32 "0y31g0lxr93370xi74hbpvcy9m81n5wdkdhq8xy2nqp0y4219p13")))) - (build-system glib-or-gtk-build-system) - (arguments '(#:configure-flags '("--disable-migration") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (let ((mbpi (assoc-ref inputs - "mobile-broadband-provider-info")) - (iso-codes (assoc-ref inputs "iso-codes"))) - (substitute* "src/libnma/nma-mobile-providers.c" - (("(g_build_filename \\()dirs\\[i\\].*,\ - (MOBILE_BROADBAND_PROVIDER_INFO.*)" all start end) - (string-append start "\"" mbpi "/share\", " end))) - (substitute* "src/libnma/nma-mobile-providers.c" - (("(g_build_filename \\()dirs\\[i\\].*,\ - (ISO_3166_COUNTRY_CODES.*)" all start end) - (string-append start "\"" iso-codes - "/share\", " end))) - #t)))))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t)) (native-inputs `(("intltool" ,intltool) + ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) (propagated-inputs ;; libnm-gtk.pc refers to all these. @@ -5527,7 +5513,8 @@ to virtual private networks (VPNs) via OpenVPN.") ("gtk+" ,gtk+) ("network-manager" ,network-manager))) (inputs - `(("iso-codes" ,iso-codes) + `(("gcr" ,gcr) + ("iso-codes" ,iso-codes) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) -- cgit v1.2.3 From 817b3fd1d57f51db04b608769beffa1b4d7cf72b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 21:21:06 +0100 Subject: gnu: libdazzle: Update to 3.30.2. * gnu/packages/gnome.scm (libdazzle): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c584edc245..bc59c58d4f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7903,7 +7903,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") (define-public libdazzle (package (name "libdazzle") - (version "3.28.5") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libdazzle/" @@ -7911,7 +7911,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") "libdazzle-" version ".tar.xz")) (sha256 (base32 - "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) + "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From d0b19e445cd542b8336e47801c6aacd9361ed5a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 22:32:10 +0100 Subject: gnu: libgdata: Update to 0.17.9. * gnu/packages/gnome.scm (libgdata): Update to 0.17.9. [inputs]: Move glib, json-glib, and libsoup from here... [propagated-inputs]: ...to here. * gnu/packages/patches/libgdata-fix-tests.patch: Remove file. * gnu/packages/patches/libgdata-glib-duplicate-tests.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Remove patches. --- gnu/local.mk | 2 - gnu/packages/gnome.scm | 17 +- gnu/packages/patches/libgdata-fix-tests.patch | 325 --------------------- .../patches/libgdata-glib-duplicate-tests.patch | 16 - 4 files changed, 8 insertions(+), 352 deletions(-) delete mode 100644 gnu/packages/patches/libgdata-fix-tests.patch delete mode 100644 gnu/packages/patches/libgdata-glib-duplicate-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 12a64b23f9..2051df8d85 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -997,8 +997,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgpg-error-gawk-compat.patch \ %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ - %D%/packages/patches/libgdata-fix-tests.patch \ - %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc59c58d4f..221c79e6a9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -357,10 +357,12 @@ relationship modeling, and network diagrams. The program supports various file formats like PNG, SVG, PDF and EPS.") (license license:gpl2+)))) +;; This is the unstable release, but it is required for the current stable +;; release of gvfs (1.38.1). (define-public libgdata (package (name "libgdata") - (version "0.16.1") + (version "0.17.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -368,10 +370,7 @@ formats like PNG, SVG, PDF and EPS.") name "-" version ".tar.xz")) (sha256 (base32 - "09q8h1129xjpw33rvzz7856drygxwlm0s64z9cm0vbmjxiqy0h47")) - (patches - (search-patches "libgdata-fix-tests.patch" - "libgdata-glib-duplicate-tests.patch")))) + "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45")))) (build-system gnu-build-system) (arguments '(#:phases @@ -391,14 +390,14 @@ formats like PNG, SVG, PDF and EPS.") ("uhttpmock" ,uhttpmock))) (inputs `(("cyrus-sasl" ,cyrus-sasl) - ("glib" ,glib) - ("glib-networking" ,glib-networking) - ("json-glib" ,json-glib) - ("libsoup" ,libsoup))) + ("glib-networking" ,glib-networking))) (propagated-inputs `(("gcr" ,gcr) + ("glib" ,glib) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("json-glib" ,json-glib) ("liboauth" ,liboauth) + ("libsoup" ,libsoup) ("libxml2" ,libxml2))) (home-page "https://wiki.gnome.org/Projects/libgdata") (synopsis "Library for accessing online service APIs") diff --git a/gnu/packages/patches/libgdata-fix-tests.patch b/gnu/packages/patches/libgdata-fix-tests.patch deleted file mode 100644 index dc86b3ab5a..0000000000 --- a/gnu/packages/patches/libgdata-fix-tests.patch +++ /dev/null @@ -1,325 +0,0 @@ -From c87a112246e0bcbd5c3a8aa484a50c617d710dbf Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Fri, 12 Dec 2014 17:31:01 +0000 -Subject: [PATCH] tests: Eliminate ISO 8601 formatting workaround for dates - -Follow up to commit 732017e4e5235e28c578cc3367fa0c4548b65495. - -https://bugzilla.gnome.org/show_bug.cgi?id=739956 ---- - gdata/tests/calendar.c | 20 ++++++++++---------- - gdata/tests/general.c | 34 +++++++++++++++++----------------- - gdata/tests/tasks.c | 34 +++++++++++++++++----------------- - gdata/tests/youtube.c | 16 ++++++++-------- - 4 files changed, 52 insertions(+), 52 deletions(-) - -diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c -index bb1d609..c54ddda 100644 ---- a/gdata/tests/calendar.c -+++ b/gdata/tests/calendar.c -@@ -620,7 +620,7 @@ test_event_xml (void) - "" - "" - "" -- "" -+ "" - "" -@@ -706,7 +706,7 @@ test_event_xml_dates (void) - "" - "" - "" -- "" -+ "" - "" - ""); - -@@ -934,25 +934,25 @@ test_query_uri (void) - - /* Check the built query URI with a normal feed URI */ - query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00" -- "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending" -- "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15" -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z" -+ "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending" -+ "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15" - "&showdeleted=true"); - g_free (query_uri); - - /* …with a feed URI with a trailing slash */ - query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/"); -- g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00" -- "&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00&singleevents=true&sortorder=descending" -- "&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00&ctz=America%2FLos_Angeles&max-attendees=15" -+ g_assert_cmpstr (query_uri, ==, "http://example.com/?q=q&futureevents=true&orderby=starttime&recurrence-expansion-start=2009-04-17T15:00:00Z" -+ "&recurrence-expansion-end=2010-04-17T15:00:00Z&singleevents=true&sortorder=descending" -+ "&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z&ctz=America%2FLos_Angeles&max-attendees=15" - "&showdeleted=true"); - g_free (query_uri); - - /* …with a feed URI with pre-existing arguments */ - query_uri = gdata_query_get_query_uri (GDATA_QUERY (query), "http://example.com/bar/?test=test&this=that"); - g_assert_cmpstr (query_uri, ==, "http://example.com/bar/?test=test&this=that&q=q&futureevents=true&orderby=starttime" -- "&recurrence-expansion-start=2009-04-17T15:00:00.000001+00:00&recurrence-expansion-end=2010-04-17T15:00:00.000001+00:00" -- "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00.000001+00:00&start-max=2010-04-17T15:00:00.000001+00:00" -+ "&recurrence-expansion-start=2009-04-17T15:00:00Z&recurrence-expansion-end=2010-04-17T15:00:00Z" -+ "&singleevents=true&sortorder=descending&start-min=2009-04-17T15:00:00Z&start-max=2010-04-17T15:00:00Z" - "&ctz=America%2FLos_Angeles&max-attendees=15&showdeleted=true"); - g_free (query_uri); - -diff --git a/gdata/tests/general.c b/gdata/tests/general.c -index 237a908..f828d2e 100644 ---- a/gdata/tests/general.c -+++ b/gdata/tests/general.c -@@ -528,8 +528,8 @@ test_entry_parse_xml (void) - "" - "" - "Testing unhandled XML" -- "2009-01-25T14:07:37.000001+00:00" -- "2009-01-23T14:06:37.000001+00:00" -+ "2009-01-25T14:07:37Z" -+ "2009-01-23T14:06:37Z" - "Here we test unhandled XML elements." - "Test!" - "" -@@ -569,8 +569,8 @@ test_entry_parse_xml_kind_category (void) - "" - "" - "Testing kind categories" -- "2009-01-25T14:07:37.000001+00:00" -- "2009-01-23T14:06:37.000001+00:00" -+ "2009-01-25T14:07:37Z" -+ "2009-01-23T14:06:37Z" - "Here we test kind categories." - "" - "Escaped content & stuff" - "http://foo.com/?foo&bar" -- "2010-12-10T17:21:24.000001+00:00" -- "2010-12-10T17:21:24.000001+00:00" -+ "2010-12-10T17:21:24Z" -+ "2010-12-10T17:21:24Z" - "Summary & stuff" - "Free & open source" - "Content & things." -@@ -1106,7 +1106,7 @@ test_feed_escaping (void) - "" - "Test feed & stuff." - "http://foo.com?foo&bar" -- "2010-12-10T17:49:15.000001+00:00" -+ "2010-12-10T17:49:15Z" - ""); - g_object_unref (feed); - } -@@ -1157,28 +1157,28 @@ test_query_dates (void) - /* updated-min */ - gdata_query_set_updated_min (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-min=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_updated_min (query, -1); - - /* updated-max */ - gdata_query_set_updated_max (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&updated-max=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_updated_max (query, -1); - - /* published-min */ - gdata_query_set_published_min (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-min=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_published_min (query, -1); - - /* published-max */ - gdata_query_set_published_max (query, 1373280114); /* 2013-07-08T10:41:54Z */ - query_uri = gdata_query_get_query_uri (query, "http://example.com"); -- g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54.000001+00:00"); -+ g_assert_cmpstr (query_uri, ==, "http://example.com?q=baz&published-max=2013-07-08T10:41:54Z"); - g_free (query_uri); - gdata_query_set_published_max (query, -1); - -@@ -3127,7 +3127,7 @@ test_gd_reminder (void) - gdata_test_assert_xml (reminder, - "" - ""); -+ "absoluteTime='2005-06-07T00:55:00Z' method='alert'/>"); - g_object_unref (reminder); - } - -@@ -3218,8 +3218,8 @@ test_gd_when (void) - /* Check the outputted XML is the same */ - gdata_test_assert_xml (when, - "" -- ""); -+ ""); - g_object_unref (when); - - /* Now parse a time with different information */ -@@ -3258,7 +3258,7 @@ test_gd_when (void) - "" - "" -- "" -+ "" - "" - ""); - g_object_unref (when); -@@ -3278,7 +3278,7 @@ test_gd_when_escaping (void) - gdata_test_assert_xml (when, - "" - ""); -+ "startTime='2005-06-07T01:00:00Z' valueString='Value string & stuff!'/>"); - g_object_unref (when); - } - -diff --git a/gdata/tests/tasks.c b/gdata/tests/tasks.c -index 7a5bc7e..7bf3174 100644 ---- a/gdata/tests/tasks.c -+++ b/gdata/tests/tasks.c -@@ -122,11 +122,11 @@ test_query_uri (void) - g_assert_cmpstr (query_uri, ==, - "http://example.com" - "?maxResults=10" -- "&updatedMin=1970-01-01T01:53:09.000001+00:00" -- "&completedMin=1970-01-01T01:34:38.000001+00:00" -- "&completedMax=1970-01-01T00:20:34.000001+00:00" -- "&dueMin=1970-01-01T00:39:05.000001+00:00" -- "&dueMax=1970-01-01T00:57:36.000001+00:00" -+ "&updatedMin=1970-01-01T01:53:09Z" -+ "&completedMin=1970-01-01T01:34:38Z" -+ "&completedMax=1970-01-01T00:20:34Z" -+ "&dueMin=1970-01-01T00:39:05Z" -+ "&dueMax=1970-01-01T00:57:36Z" - "&showCompleted=true" - "&showDeleted=true" - "&showHidden=true"); -@@ -148,11 +148,11 @@ test_query_uri (void) - g_assert_cmpstr (query_uri, ==, - "http://example.com" - "?maxResults=10" -- "&updatedMin=1970-01-01T01:53:09.000001+00:00" -- "&completedMin=1970-01-01T01:34:38.000001+00:00" -- "&completedMax=1970-01-01T00:20:34.000001+00:00" -- "&dueMin=1970-01-01T00:39:05.000001+00:00" -- "&dueMax=1970-01-01T00:57:36.000001+00:00" -+ "&updatedMin=1970-01-01T01:53:09Z" -+ "&completedMin=1970-01-01T01:34:38Z" -+ "&completedMax=1970-01-01T00:20:34Z" -+ "&dueMin=1970-01-01T00:39:05Z" -+ "&dueMax=1970-01-01T00:57:36Z" - "&showCompleted=false" - "&showDeleted=false" - "&showHidden=false"); -@@ -317,8 +317,8 @@ test_task_properties (void) - "\"title\": \"some-other-title\"," - "\"notes\": \"more-notes\"," - "\"status\": \"completed\"," -- "\"due\": \"2014-08-30T17:20:00.000001+00:00\"," -- "\"completed\": \"2014-08-30T17:20:00.000001+00:00\"," -+ "\"due\": \"2014-08-30T17:20:00Z\"," -+ "\"completed\": \"2014-08-30T17:20:00Z\"," - "\"deleted\": true," - "\"hidden\": false" - "}"); -@@ -332,8 +332,8 @@ test_task_properties (void) - "\"title\": \"some-other-title\"," - "\"notes\": \"more-notes\"," - "\"status\": \"completed\"," -- "\"due\": \"2014-08-30T17:20:00.000001+00:00\"," -- "\"completed\": \"2014-08-30T17:20:00.000001+00:00\"," -+ "\"due\": \"2014-08-30T17:20:00Z\"," -+ "\"completed\": \"2014-08-30T17:20:00Z\"," - "\"deleted\": false," - "\"hidden\": false" - "}"); -@@ -496,14 +496,14 @@ test_task_parser_normal (void) - "\"id\": \"some-id\"," - "\"etag\": \"some-etag\"," - "\"title\": \"some-title \\\"with quotes\\\"\"," -- "\"updated\": \"2014-08-30T19:40:00.000001+00:00\"," -+ "\"updated\": \"2014-08-30T19:40:00Z\"," - "\"selfLink\": \"http://some-uri/\"," - "\"parent\": \"some-parent-id\"," - "\"position\": \"some-position\"," - "\"notes\": \"Some notes!\"," - "\"status\": \"needsAction\"," -- "\"due\": \"2014-08-30T20:00:00.000001+00:00\"," -- "\"completed\": \"2014-08-30T20:10:05.000001+00:00\"," -+ "\"due\": \"2014-08-30T20:00:00Z\"," -+ "\"completed\": \"2014-08-30T20:10:05Z\"," - "\"deleted\": false," - "\"hidden\": true," - /* Unhandled for the moment: */ -diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c -index a1e070a..1195bc3 100644 ---- a/gdata/tests/youtube.c -+++ b/gdata/tests/youtube.c -@@ -967,8 +967,8 @@ test_parsing_yt_recorded (void) - "gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>" - "Judas Priest - Painkiller" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" -@@ -1055,8 +1055,8 @@ test_parsing_yt_access_control (void) - "gd:etag='W/\"CEMFSX47eCp7ImA9WxVUGEw.\"'>" - "Judas Priest - Painkiller" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" -@@ -1255,8 +1255,8 @@ test_parsing_georss_where (void) - "xmlns:gml='http://www.opengis.net/gml'>" - "Some video somewhere" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" -@@ -1295,8 +1295,8 @@ test_parsing_georss_where (void) - "xmlns:gml='http://www.opengis.net/gml'>" - "Some video somewhere" - "tag:youtube.com,2008:video:JAagedeKdcQ" -- "2009-03-23T12:46:58.000001+00:00" -- "2006-05-16T14:06:37.000001+00:00" -+ "2009-03-23T12:46:58Z" -+ "2006-05-16T14:06:37Z" - "" - "" - "" --- -1.9.3 diff --git a/gnu/packages/patches/libgdata-glib-duplicate-tests.patch b/gnu/packages/patches/libgdata-glib-duplicate-tests.patch deleted file mode 100644 index d5d8d064de..0000000000 --- a/gnu/packages/patches/libgdata-glib-duplicate-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur a/gdata/tests/oauth1-authorizer.c b/gdata/tests/oauth1-authorizer.c ---- a/gdata/tests/oauth1-authorizer.c 1969-12-31 19:00:00.000000000 -0500 -+++ b/gdata/tests/oauth1-authorizer.c 2017-05-27 19:35:30.551725678 -0400 -@@ -1045,10 +1045,10 @@ - /* Sync request-authentication-uri tests */ - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync", OAuth1AuthorizerData, NULL, set_up_oauth1_authorizer_data, - test_oauth1_authorizer_request_authentication_uri_sync, tear_down_oauth1_authorizer_data); -- g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL, -+ g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains1", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data_multiple_domains, test_oauth1_authorizer_request_authentication_uri_sync, - tear_down_oauth1_authorizer_data); -- g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains", OAuth1AuthorizerData, NULL, -+ g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/multiple-domains2", OAuth1AuthorizerData, NULL, - set_up_oauth1_authorizer_data_locale, test_oauth1_authorizer_request_authentication_uri_sync, - tear_down_oauth1_authorizer_data); - g_test_add ("/oauth1-authorizer/request-authentication-uri/sync/cancellation", OAuth1AuthorizerData, NULL, -- cgit v1.2.3 From e762d943e5eebcc57b3f86ed117cd5ba203e54f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Dec 2018 17:33:01 +0100 Subject: gnu: gvfs: Update to 1.38.1. * gnu/packages/gnome.scm (gvfs): Update to 1.38.1. [build-system]: Use meson-build-system. [arguments]: Remove custom phases; add configure flags to build without systemd; set glib-or-gtk? flag; enable tests; add sub-directory to RUNPATH. [native-inputs]: Remove autoconf, automake, and libtool. [inputs]: Add elogind, gnome-online-accounts, libgdata, libnfs, and openssh. --- gnu/packages/gnome.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 221c79e6a9..cdf361e5fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -81,6 +81,7 @@ #:use-module (gnu packages enchant) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) + #:use-module (gnu packages file-systems) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) @@ -4161,7 +4162,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.36.2") + (version "1.38.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4169,21 +4170,20 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") name "-" version ".tar.xz")) (sha256 (base32 - "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4")))) - (build-system gnu-build-system) + "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd")))) + (build-system meson-build-system) (arguments - '(#:tests? #f ; XXX: requiring `pidof' - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-broken-autogen-script - (lambda _ (delete-file "autogen.sh") #t))))) + '(#:glib-or-gtk? #t + #:configure-flags + (list "-Dsystemduserunitdir=no" + "-Dtmpfilesdir=no" + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/gvfs")))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. - ("autoconf" ,autoconf) - ("automake" ,automake) ("gettext" ,gettext-minimal) ("gtk-doc" ,gtk-doc) - ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs @@ -4191,23 +4191,28 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("dbus" ,dbus) + ("elogind" ,elogind) ("fuse" ,fuse) ("gcr" ,gcr) ("glib" ,glib) + ("gnome-online-accounts" ,gnome-online-accounts) ("libarchive" ,libarchive) ("libbluray" ,libbluray) ("libcap" ,libcap) ("libcdio-paranoia" ,libcdio-paranoia) ("libgcrypt" ,libgcrypt) + ("libgdata" ,libgdata) ("libgphoto2" ,libgphoto2) ("libgudev" ,libgudev) ("libimobiledevice" ,libimobiledevice) ("libmtp" ,libmtp) + ("libnfs" ,libnfs) ("libsecret" ,libsecret) ("libsmbclient" ,samba) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("nettle" ,nettle) ; XXX: required by libarchive.pc + ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) (home-page "https://wiki.gnome.org/gvfs/") -- cgit v1.2.3 From ec66ebd4cd97f05d3f968062557ed92b2f4e1c4b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 11:05:26 +0100 Subject: gnu: nautilus: Update to 3.30.4. * gnu/packages/gnome.scm (nautilus): Update to 3.30.4. [inputs]: Add libseccomp. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cdf361e5fc..84c3615974 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6238,7 +6238,7 @@ shared object databases, search tools and indexing.") (define-public nautilus (package (name "nautilus") - (version "3.28.1") + (version "3.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6246,7 +6246,7 @@ shared object databases, search tools and indexing.") name "-" version ".tar.xz")) (sha256 (base32 - "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w")))) + "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -6267,6 +6267,7 @@ shared object databases, search tools and indexing.") ("exempi" ,exempi) ("gnome-desktop" ,gnome-desktop) ("gnome-autoar" ,gnome-autoar) + ("libseccomp" ,libseccomp) ("libselinux" ,libselinux) ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar ("tracker" ,tracker) -- cgit v1.2.3 From bf6cb316864d975fad392b771c7ffe2056d5f0c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 12:22:34 +0100 Subject: gnu: gnome-tweak-tool: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-tweak-tool): Deprecate and rename... (gnome-tweaks): ...to this. Update to 3.30.1. [build-system]: Use meson-build-system. [arguments]: Adjust configure flags; pass glib-or-gtk? flag; remove custom phases that are now provided by the meson-build-system; add phases "wrap" and "wrap-gi-typelib". [native-inputs]: Remove meson-for-build and ninja. [home-page]: Update. [description]: Use "Tweaks" instead of "Tweak Tool". * gnu/packages/patches/gnome-tweak-tool-search-paths.patch: Rename file... * gnu/packages/patches/gnome-tweaks-search-paths.patch: ...to this. * gnu/local.mk (dist_patch_DATA): Update patch file name. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 84c3615974..47100579b8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6792,7 +6792,7 @@ existing databases over the internet.") (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -6802,7 +6802,7 @@ existing databases over the internet.") (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp")))) + "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From a68544a81dafb7e1b5bb1ce90d9200fb5a883551 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:39:55 +0100 Subject: gnu: colord: Update to 1.4.3. * gnu/packages/gnome.scm (colord): Update to 1.4.3. [build-system]: Use meson-build-system. [arguments]: Add glib-or-gtk? flag; update configure flags; remove phase "patch-/bin/true"; add phase "patch-build-system". [native-inputs]: Add glib:bin and gtk-doc. [inputs]: Add gusb and python-wrapper. --- gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 47100579b8..87e997c630 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2992,7 +2992,7 @@ keyboard shortcuts.") (define-public colord (package (name "colord") - (version "1.1.8") + (version "1.4.3") (source (origin (method url-fetch) @@ -3000,38 +3000,42 @@ keyboard shortcuts.") name "-" version ".tar.xz")) (sha256 (base32 - "01w97rgzk4qi6fp03scq5jyw0ayx11b479p7dkm2r77k84b9agph")))) - (build-system glib-or-gtk-build-system) + "1xwxahg9mgmapc16xkb4kgmc40zpadrwav33xqmn6cgaw6g6d3ls")))) + (build-system meson-build-system) (arguments - '(;; The tests want to run valgrind. Punt for now. + '(;; FIXME: One test fails: + ;; /colord/icc-store (in lib/colord/colord-self-test-private): + ;; Incorrect content type for /tmp/colord-vkve/already-exists.icc, got + ;; application/x-zerosize #:tests? #f - #:configure-flags (list "--localstatedir=/var" - ;; GUSB not packaged yet. - "--disable-gusb" + #:glib-or-gtk? #t + #:configure-flags (list "-Dlocalstatedir=/var" ;; No dep on systemd. - "--disable-systemd-login" + "-Dsystemd=false" ;; Wants to install to global completion dir; ;; punt. - "--disable-bash-completion" + "-Dbash_completion=false" ;; colord-gtk not packaged yet. - "--disable-session-example" - "--with-daemon-user=colord" - "--enable-sane" - (string-append "--with-udevrulesdir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")) + "-Dsession_example=false" + "-Ddaemon_user=colord" + "-Dsane=true" + ;; Requires spotread + "-Dargyllcms_sensor=false" + ;; TODO: Requires docbook2x + "-Dman=false") #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/true - (lambda _ - (substitute* "configure" - (("/bin/true") (which "true"))) - (substitute* "src/Makefile.in" - (("if test -w \\$\\(DESTDIR\\)\\$\\(prefix\\)/;") - "if test -w $(DESTDIR)$(localstatedir);"))))))) + (add-before 'configure 'patch-build-system + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "rules/meson.build" + (("udev.get_pkgconfig_variable\\('udevdir'\\)") + (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) + ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) ("libtool" ,libtool) ("intltool" ,intltool))) (propagated-inputs @@ -3041,10 +3045,12 @@ keyboard shortcuts.") ("lcms" ,lcms))) (inputs `(("dbus-glib" ,dbus-glib) + ("gusb" ,gusb) ("libgudev" ,libgudev) ("libusb" ,libusb) ("sqlite" ,sqlite) ("polkit" ,polkit) + ("python" ,python-wrapper) ("sane-backends" ,sane-backends))) (home-page "https://www.freedesktop.org/software/colord/") (synopsis "Color management service") -- cgit v1.2.3 From ec7d4bc7ac1e812508cbcb15bf93bb0e5cf101b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:42:02 +0100 Subject: gnu: eog: Update to 3.28.4. * gnu/packages/gnome.scm (eog): Update to 3.28.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 87e997c630..6cb78ad55d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4037,7 +4037,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (define-public eog (package (name "eog") - (version "3.28.2") + (version "3.28.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4045,7 +4045,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") name "-" version ".tar.xz")) (sha256 (base32 - "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0")))) + "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8748e29c563d9315ce34579b0a2ae26d739a5f21 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:42:31 +0100 Subject: gnu: epiphany: Update to 3.30.2. * gnu/packages/gnome.scm (epiphany): Update to 3.30.2. [inputs]: Add libdazzle. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6cb78ad55d..699026386b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4385,7 +4385,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "3.28.3.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -4393,7 +4393,7 @@ a secret password store, an adblocker, and a modern UI.") "epiphany-" version ".tar.xz")) (sha256 (base32 - "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9")))) + "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc")))) (build-system meson-build-system) (arguments @@ -4427,6 +4427,7 @@ a secret password store, an adblocker, and a modern UI.") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("json-glib" ,json-glib) ("iso-codes" ,iso-codes) + ("libdazzle" ,libdazzle) ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("libxslt" ,libxslt) -- cgit v1.2.3 From 9d029b7fc948208812be989457b28955246cbf7e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:43:01 +0100 Subject: gnu: yelp: Update to 3.30.0. * gnu/packages/gnome.scm (yelp): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 699026386b..0c10de7c18 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4527,7 +4527,7 @@ to format Docbook and Mallard documents.") (define-public yelp (package (name "yelp") - (version "3.28.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4535,7 +4535,7 @@ to format Docbook and Mallard documents.") name "-" version ".tar.xz")) (sha256 (base32 - "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8")))) + "060a902j15k76fyhk8xfl38ipvrrcc0qd7nm2mcck4ifb45b0zv4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From 9583e8a5c13dca13b1425c5e833ba1ba3d7a177e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 18:45:06 +0100 Subject: gnu: yelp-xsl: Update to 3.30.1. * gnu/packages/gnome.scm (yelp-xsl): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c10de7c18..d697bda1f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4503,7 +4503,7 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4511,7 +4511,7 @@ of running programs and invoke methods on those interfaces.") name "-" version ".tar.xz")) (sha256 (base32 - "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc")))) + "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 45caa055407b72d413d8b434c15006473fdd04ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 21:10:12 +0100 Subject: gnu: libgnome-games-support: Update to 1.4.2. * gnu/packages/gnome.scm (libgnome-games-support): Update to 1.4.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d697bda1f2..d6cf0e13d5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3668,7 +3668,7 @@ queries upon that data.") (define-public libgnome-games-support (package (name "libgnome-games-support") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3676,7 +3676,7 @@ queries upon that data.") name "-" version ".tar.xz")) (sha256 (base32 - "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1")))) + "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From b468eedcb8da62587e33e5e3671dc4bd34cfaf34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:11:43 +0100 Subject: gnu: evolution-data-server: Update to 3.30.2. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.30.2. [arguments]: Enable tests; add phase to disable failing tests; update phase "patch-paths". [inputs]: Add libcanberra. --- gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6cf0e13d5..8a30795bdd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5128,7 +5128,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.28.3") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5136,17 +5136,14 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") name "-" version ".tar.xz")) (sha256 (base32 - "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3")))) + "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) (outputs '("out" "libedataserverui")) (build-system cmake-build-system) (arguments - '(;; XXX FIXME: 11/85 tests are failing. - #:tests? #f - #:configure-flags - (let* ((lib (string-append (assoc-ref %outputs "out") - "/lib")) - (runpaths (map (lambda (s) (string-append - lib "/evolution-data-server/" s)) + '(#:configure-flags + (let* ((lib (string-append (assoc-ref %outputs "out") "/lib")) + (runpaths (map (lambda (s) + (string-append lib "/evolution-data-server/" s)) '("addressbook-backends" "calendar-backends" "camel-providers" "credential-modules" "registry-modules")))) @@ -5167,9 +5164,25 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "-DENABLE_INTROSPECTION=ON")) ;required for Vala bindings #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; tests/book-migration/test-migration.c:160:test_fetch_contacts: + ;; assertion failed (g_slist_length (contacts) == 20): (0 == 20) + (delete-file-recursively "tests/book-migration") + (substitute* "tests/CMakeLists.txt" + (("add_subdirectory\\(book-migration\\)") "")) + ;; tests/libedata-cal/test-cal-meta-backend.c:1328:test_get_attachment_uris: + ;; assertion failed (uris->data == expected_uri): + ;; ("" == "file:///tests/libedata-cal/components/event-1.ics") + (substitute* "tests/libedata-cal/CMakeLists.txt" + (("test-cal-meta-backend") "")) + #t)) (add-after 'unpack 'patch-paths (lambda _ - (substitute* "tests/test-server-utils/e-test-server-utils.c" + (substitute* '("tests/test-server-utils/e-test-server-utils.c" + "tests/libedata-book/data-test-utils.c" + "tests/libedata-book/test-book-cache-utils.c" + "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) (add-before 'configure 'dont-override-rpath @@ -5221,6 +5234,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") ("gcr" ,gcr) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("json-glib" ,json-glib) + ("libcanberra" ,libcanberra) ("libgweather" ,libgweather) ("mit-krb5" ,mit-krb5) ("openldap" ,openldap) -- cgit v1.2.3 From b63c06f1d712b2cbd336a07621e9d28bdf803620 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 4 May 2019 14:13:35 +0200 Subject: gnu: evolution-data-server: Do not split outputs. A binary in $out/libexec depends on libedataserverui libraries, so the split would require mutually recursive output dependencies. * gnu/packages/gnome.scm (evolution-data-server)[outputs]: Remove field. [arguments]: Remove "split" phase. (gnome-calendar, gnome-todo, evolution)[inputs]: Adjust. --- gnu/packages/gnome.scm | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8a30795bdd..8dc60daa92 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5137,7 +5137,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (sha256 (base32 "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) - (outputs '("out" "libedataserverui")) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -5191,28 +5190,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") ;; CMakeLists.txt hard-codes runpath to just the libdir. ;; Remove it so the configure flag is respected. (("SET\\(CMAKE_INSTALL_RPATH .*") "")) - #t)) - (add-after 'install 'split - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libedsui (assoc-ref outputs "libedataserverui"))) - (for-each (lambda (file) - (mkdir-p (dirname (string-append libedsui file))) - (rename-file (string-append out file) - (string-append libedsui file))) - '("/lib/pkgconfig/libedataserverui-1.2.pc" - "/lib/libedataserverui-1.2.so" - "/lib/libedataserverui-1.2.so.2" - "/lib/libedataserverui-1.2.so.2.0.0" - "/lib/girepository-1.0/EDataServerUI-1.2.typelib" - "/include/evolution-data-server/libedataserverui" - "/share/gir-1.0/EDataServerUI-1.2.gir" - "/share/vala/vapi/libedataserverui-1.2.vapi" - "/share/vala/vapi/libedataserverui-1.2.deps")) - (substitute* (string-append libedsui "/lib/pkgconfig/" - "libedataserverui-1.2.pc") - ((out) libedsui)) - #t)))))) + #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) @@ -6708,7 +6686,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("libdazzle" ,libdazzle) - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("geoclue" ,geoclue))) (home-page "https://wiki.gnome.org/Apps/Calendar") @@ -6756,7 +6734,7 @@ desktop. It supports multiple calendars, month, week and year view.") (inputs `(("rest" ,rest) ; For Todoist plugin ("json-glib" ,json-glib) ; For Todoist plugin - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libical" ,libical) ("libpeas" ,libpeas) ("python-pygobject" ,python-pygobject) @@ -8005,7 +7983,7 @@ generic enough to work for everyone.") ("gtkspell3" ,gtkspell3) ("highlight" ,highlight) ("libcanberra" ,libcanberra) - ("libedataserverui" ,evolution-data-server "libedataserverui") + ("libedataserverui" ,evolution-data-server) ("libgweather" ,libgweather) ("libnotify" ,libnotify) ("libsoup" ,libsoup) -- cgit v1.2.3 From 9b848f0364d296339fbd13e4de104f4eb9fa6970 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:13:26 +0100 Subject: gnu: gnome-online-accounts: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8dc60daa92..a68ddc0757 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5075,7 +5075,7 @@ window manager.") (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5083,7 +5083,7 @@ window manager.") name "-" version ".tar.xz")) (sha256 (base32 - "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47")))) + "1hyg9g7l4ypnirx2j7ms2vr8711x90aybpq3s3wa20ma8a4xin97")))) (outputs '("out" "lib")) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From 5339d2bbeb8c560237376dacd450f295de00decd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 23:26:25 +0100 Subject: gnu: gnome-maps: Update to 3.30.2.1. * gnu/packages/geo.scm (gnome-maps): Update to 3.30.2.1. [build-system]: Use meson-build-system. [arguments]: Remove configure flags; set glib-or-gtk? flag; update "wrap" phase. [native-inputs]: Add gtk+:bin. --- gnu/packages/geo.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ec5ace3519..2c511c7193 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -29,6 +29,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system scons) #:use-module (guix build-system r) @@ -103,7 +104,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.28.2") + (version "3.30.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -111,20 +112,19 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7")))) - (build-system glib-or-gtk-build-system) + "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57")))) + (build-system meson-build-system) (arguments - `(#:configure-flags ;; Ensure that geoclue is referred to by output. - (list (string-append "LDFLAGS=-L" - (assoc-ref %build-inputs "geoclue") "/lib") - (string-append "CFLAGS=-I" - (assoc-ref %build-inputs "geoclue") "/include")) + `(#:glib-or-gtk? #t #:phases (modify-phases %standard-phases (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (geocode-glib-path (string-append + (assoc-ref inputs "geocode-glib") + "/lib")) (goa-path (string-append (assoc-ref inputs "gnome-online-accounts") "/lib")) @@ -135,12 +135,15 @@ topology functions.") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) ;; There seems to be no way to embed the path of - ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37 and - ;; libjavascriptcoregtk-4.0.so.18. - `("LD_LIBRARY_PATH" ":" prefix (,goa-path ,webkitgtk-path))) + ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37, + ;; libjavascriptcoregtk-4.0.so.18, and libgeocode-glib.so.0 + `("LD_LIBRARY_PATH" ":" prefix (,goa-path + ,webkitgtk-path + ,geocode-glib-path))) #t)))))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache + ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 25e9846d113c06b7695a501803066af90a37fbff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 7 Dec 2018 09:02:16 +0100 Subject: gnu: gtksourceview: Update to 4.0.3. * gnu/packages/gtk.scm (gtksourceview): Update to 4.0.3. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1353dbb261..7f6218ee92 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -398,7 +398,7 @@ printing and other features typical of a source code editor.") (define-public gtksourceview (package (name "gtksourceview") - (version "4.0.2") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gtksourceview/" @@ -406,7 +406,7 @@ printing and other features typical of a source code editor.") "gtksourceview-" version ".tar.xz")) (sha256 (base32 - "1b2z9c0skxrgw2vh08hv6qxky8jbvamc4rgww82j0kpp533rz0hm")))) + "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From e402eae6d4593a72ff90e77422c9e9f333144c1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jan 2019 13:52:21 +0100 Subject: gnu: mutter: Update to 3.30.2. * gnu/packages/gnome.scm (mutter): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a68ddc0757..a243cf1f60 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4971,7 +4971,7 @@ to display dialog boxes from the commandline and shell scripts.") (define-public mutter (package (name "mutter") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4979,7 +4979,7 @@ to display dialog boxes from the commandline and shell scripts.") name "-" version ".tar.xz")) (sha256 (base32 - "0ighs1zvlssgq16v1h3vg280za7y448snq65gc5m1zmqqawqkymg")))) + "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z")))) ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; versions of cogl and clutter. As a result, many of the inputs, ;; propagated-inputs, and configure flags used in cogl and clutter are -- cgit v1.2.3 From bd0dc2df04a1550f41d3d5c7cc2c26ad12468b36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 7 Jan 2019 13:52:33 +0100 Subject: gnu: gnome-shell: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-shell): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a243cf1f60..a126596a09 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5917,7 +5917,7 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "3.28.2") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5925,7 +5925,7 @@ properties, screen resolution, and other GNOME parameters.") name "-" version ".tar.xz")) (sha256 (base32 - "1b9n89ij2g5nqaqp7a13jnqcd8qa2v9p55rbi71al3xvqk091ri7")) + "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2")) (patches (search-patches "gnome-shell-theme.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From b3640e79f648992fe3c58bacd931bdfbad444c1a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:56:09 +0200 Subject: gnu: yelp-xsl: Update to 3.32.1. * gnu/packages/gnome.scm (yelp-xsl): Update to 3.32.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a126596a09..e7d7e913b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4503,7 +4503,7 @@ of running programs and invoke methods on those interfaces.") (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.30.1") + (version "3.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4511,7 +4511,7 @@ of running programs and invoke methods on those interfaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw")))) + "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 6898f5b45b0441a275254a2cd1c0c9195bc08cf8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:54:21 +0200 Subject: gnu: glib: Update to 2.60.4. * gnu/packages/glib.scm (glib): Update to 2.60.4. [source](snippet): New field. [arguments]: Remove obsolete DETERMINISTIC_BUILD variable. Disable two tests, and override the 'check' phase. Remove <#:parallel-build?>. --- gnu/packages/glib.scm | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9acbfd8386..0383aec0da 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -161,7 +161,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.58.1") + (version "2.60.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -169,8 +169,14 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp")) - (patches (search-patches "glib-tests-timer.patch")))) + "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b")) + (patches (search-patches "glib-tests-timer.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "tests/spawn-test.c" + (("/bin/sh") "sh")) + #t)))) (build-system meson-build-system) (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python @@ -198,9 +204,6 @@ shared NFS home directories.") (delete 'bootstrap) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) - ;; For building deterministic pyc files - (setenv "DETERMINISTIC_BUILD" "1") - ;; For tests/gdatetime.c. (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") @@ -281,9 +284,22 @@ shared NFS home directories.") ("gio/tests/gdbus-unix-addresses.c" (;; Requires /etc/machine-id. - "/gdbus/x11-autolaunch"))))) + "/gdbus/x11-autolaunch")) + + ("gio/tests/gsocketclient-slow.c" + (;; These tests tries to resolve "localhost", and fails. + "/socket-client/happy-eyeballs/slow" + "/socket-client/happy-eyeballs/cancellation/delayed")) + + ))) (for-each (lambda (x) (apply disable x)) failing-tests) #t))) + (replace 'check + (lambda _ + (setenv "MESON_TESTTHREADS" + (number->string (parallel-job-count))) + ;; Do not run tests marked as "flaky". + (invoke "meson" "test" "--no-suite" "flaky"))) ;; TODO: meson does not permit the bindir to be outside of prefix. ;; See https://github.com/mesonbuild/meson/issues/2561 ;; We can remove this once meson is patched. @@ -302,16 +318,12 @@ shared NFS home directories.") (string-append out "/lib/pkgconfig/glib-2.0.pc")) (("bindir=\\$\\{prefix\\}/bin") "") (("=\\$\\{bindir\\}/") "=")) - #t)))) + #t)))))) ;; TODO: see above for explanation. ;; #:configure-flags (list (string-append "--bindir=" ;; (assoc-ref %outputs "bin") ;; "/bin")) - ;; In 'gio/tests', 'gdbus-test-codegen-generated.h' is #included in a - ;; file that gets compiled possibly before it has been fully generated. - #:parallel-tests? #f)) - (native-search-paths ;; This variable is not really "owned" by GLib, but several related ;; packages refer to it: gobject-introspection's tools use it as a search -- cgit v1.2.3 From 273c30bec644172e7b9300fa7fc28e6dad67941e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:56:28 +0200 Subject: gnu: gobject-introspection: Update to 1.60.2. * gnu/packages/glib.scm (gobject-introspection): Update to 1.60.2. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 0383aec0da..a4ae7b55bc 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -349,14 +349,14 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.58.1") + (version "1.60.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "12fzs3044047icdfs7cb2lsmnfi6w6fyhkci3m2rbvf5llgnhm29")) + (base32 "172ymc1vbg2rclq1rszx4y32vm900nn1mc4qg1a4mqxjiwvf5pzz")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- cgit v1.2.3 From 9644ac6f4d39492129f90188a32d5931eb30ab8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 13:56:53 +0200 Subject: gnu: harfbuzz: Update to 2.5.2. * gnu/packages/gtk.scm (harfbuzz): Update to 2.5.2. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7f6218ee92..43888ab23f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,7 +178,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -186,7 +186,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.xz")) (sha256 (base32 - "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d")))) + "12vya82hb2yfg92735kjql7d9kxpz64hs1jhjvnzagdy5fdcz3vw")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From f2a0f03b57b102c7369a787621f5839758d814ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:08:54 +0200 Subject: gnu: gobject-introspection: Build with Meson. The 1.60.x releases are the last ones to support Autotools. * gnu/packages/glib.scm (gobject-introspection)[build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove <#:parallel-build?> and <#:tests?>. [native-inputs]: Remove AUTOCONF and AUTOMAKE. --- gnu/packages/glib.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a4ae7b55bc..d8d339eebe 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -28,7 +28,6 @@ (define-module (gnu packages glib) #:use-module (gnu packages) - #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -361,15 +360,9 @@ dynamic loading, and an object system.") "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" "gobject-introspection-absolute-shlib-path.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(;; The build system has at least one race condition involving Gio-2.0.gir - ;; which causes intermittent failures, as of 1.56.0. - #:parallel-build? #f - ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes - ;; some tests to fail. - #:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'do-not-use-/usr/bin/env (lambda _ @@ -384,9 +377,7 @@ dynamic loading, and an object system.") ("python" ,python-wrapper) ("zlib" ,zlib))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("glib" ,glib "bin") + `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (propagated-inputs `(;; In practice, GIR users will need libffi when using -- cgit v1.2.3 From d93dab5d7f3c5596fca0bf9476f051c23931eb83 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:33:07 +0200 Subject: gnu: glibmm: Update to 2.60.0. * gnu/packages/glib.scm (glibmm): Update to 2.60.0. [arguments]: Remove <#:configure-flags>. --- gnu/packages/glib.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d8d339eebe..62543fe114 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -555,7 +555,7 @@ has an ease of use unmatched by other C++ callback libraries.") (define glibmm (package (name "glibmm") - (version "2.58.0") + (version "2.60.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -563,13 +563,10 @@ has an ease of use unmatched by other C++ callback libraries.") "/glibmm-" version ".tar.xz")) (sha256 (base32 - "0idnaii4h3mdym2a55gkavipyxigwvbgfmzmwql85s4rgciqjhfk")))) + "1g7jxqd270dv2d83r7pf5893mwpz7d5xib0q01na2yalh34v38d3")))) (build-system gnu-build-system) (arguments - `(;; XXX: Some tests uses C++14 features. Remove this when the default - ;; compiler is >= GCC6. - #:configure-flags '("CXXFLAGS=-std=gnu++14") - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'pre-build (lambda _ -- cgit v1.2.3 From 2d6872f6afc6dd023b676327867e2dba237b5062 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:42:33 +0200 Subject: gnu: vala: Update to 0.44.5. * gnu/packages/gnome.scm (vala): Update to 0.44.5. [native-inputs]: Remove superfluous GREP and SED. --- gnu/packages/gnome.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e7d7e913b4..5537ca6951 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2250,7 +2250,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.42.3") + (version "0.44.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2258,7 +2258,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz")))) + "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv")))) (build-system gnu-build-system) (arguments '(#:phases @@ -2277,8 +2277,6 @@ passwords in the GNOME keyring.") ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) - ("grep" ,grep) - ("sed" ,sed) ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir tests (inputs -- cgit v1.2.3 From 8bdacad26b1209dd4d95f5ca093a9178feb12f5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 14:45:14 +0200 Subject: gnu: libcroco: Update to 0.6.13. * gnu/packages/patches/libcroco-CVE-2017-7960.patch, gnu/packages/patches/libcroco-CVE-2017-7961.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (libcroco): Update to 0.6.13. [source](patches): Remove. --- gnu/local.mk | 2 - gnu/packages/gnome.scm | 7 +-- gnu/packages/patches/libcroco-CVE-2017-7960.patch | 66 ----------------------- gnu/packages/patches/libcroco-CVE-2017-7961.patch | 50 ----------------- 4 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 gnu/packages/patches/libcroco-CVE-2017-7960.patch delete mode 100644 gnu/packages/patches/libcroco-CVE-2017-7961.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2051df8d85..d375b8cd1d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -989,8 +989,6 @@ dist_patch_DATA = \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ - %D%/packages/patches/libcroco-CVE-2017-7960.patch \ - %D%/packages/patches/libcroco-CVE-2017-7961.patch \ %D%/packages/patches/libdrm-symbol-check.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5537ca6951..f8a6a774da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1256,18 +1256,15 @@ the GNOME desktop environment.") (define-public libcroco (package (name "libcroco") - (version "0.6.12") + (version "0.6.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (patches - (search-patches "libcroco-CVE-2017-7960.patch" - "libcroco-CVE-2017-7961.patch")) (sha256 (base32 - "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x")))) + "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/libcroco-CVE-2017-7960.patch b/gnu/packages/patches/libcroco-CVE-2017-7960.patch deleted file mode 100644 index 0319c7389f..0000000000 --- a/gnu/packages/patches/libcroco-CVE-2017-7960.patch +++ /dev/null @@ -1,66 +0,0 @@ -Fix CVE-2017-7960: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7960 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/libcroco/commit/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 - -From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:13:43 +0200 -Subject: input: check end of input before reading a byte - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. ---- - src/cr-input.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1..3b63a88 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status; --- -cgit v0.12 - diff --git a/gnu/packages/patches/libcroco-CVE-2017-7961.patch b/gnu/packages/patches/libcroco-CVE-2017-7961.patch deleted file mode 100644 index 675dbe4f08..0000000000 --- a/gnu/packages/patches/libcroco-CVE-2017-7961.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix CVE-2017-7961: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7961 - -Patch copied from upstream source repository: - -https://git.gnome.org/browse/libcroco/commit/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 - -From 9ad72875e9f08e4c519ef63d44cdbd94aa9504f7 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:56:09 +0200 -Subject: tknzr: support only max long rgb values - -This fixes a possible out of bound when reading rgbs which -are longer than the support MAXLONG ---- - src/cr-tknzr.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/cr-tknzr.c b/src/cr-tknzr.c -index 1a7cfeb..1548c35 100644 ---- a/src/cr-tknzr.c -+++ b/src/cr-tknzr.c -@@ -1279,6 +1279,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - red = num->val; - cr_num_destroy (num); - num = NULL; -@@ -1298,6 +1303,11 @@ cr_tknzr_parse_rgb (CRTknzr * a_this, CRRgb ** a_rgb) - status = cr_tknzr_parse_num (a_this, &num); - ENSURE_PARSING_COND ((status == CR_OK) && (num != NULL)); - -+ if (num->val > G_MAXLONG) { -+ status = CR_PARSING_ERROR; -+ goto error; -+ } -+ - PEEK_BYTE (a_this, 1, &next_bytes[0]); - if (next_bytes[0] == '%') { - SKIP_CHARS (a_this, 1); --- -cgit v0.12 - -- cgit v1.2.3 From 1dcca83afbc2a5b66f61f389971d257d2d65100d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 21 Jun 2019 18:00:17 +0200 Subject: gnu: guile: Update to 2.2.5. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.5. [arguments]: Remove. (guile-2.2.5): Remove. --- gnu/packages/guile.scm | 47 +++-------------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 25077e4f75..efb19b456f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -216,7 +216,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.4") + (version "2.2.5") (source (origin (method url-fetch) @@ -226,7 +226,7 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) + "19w5ws1jvs01dpv756qv2cgs37rsnwq1f4f07mj0wra35pqp6c7w")) (modules '((guix build utils))) (patches (search-patches "guile-2.2-skip-oom-test.patch")) @@ -247,36 +247,7 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.2"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.2/site-ccache"))))) - - (arguments - (if (%current-target-system) - (substitute-keyword-arguments (package-arguments guile-2.0) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'sacrifice-elisp-support - (lambda _ - ;; Cross-compiling language/elisp/boot.el fails, so - ;; sacrifice it. See - ;; - ;; for the upstream fix. - (substitute* "module/Makefile.in" - (("language/elisp/boot\\.el") - "\n")) - #t)) - ,@(if (hurd-target?) - `((add-after 'unpack 'allow-madvise-ENOSYS - (lambda _ - ;; Do not warn about ENOSYS on 'madvise'. This is - ;; what Guile commit - ;; 45e4ace6603e00b297e6542362273041aebe7305 does. - ;; TODO: Remove for Guile >= 2.2.5. - (substitute* "libguile/vm.c" - (("perror \\(\"madvise failed\"\\)") - "if (errno != ENOSYS) perror (\"madvised failed\");")) - #t))) - '())))) - (package-arguments guile-2.0))))) + (files '("lib/guile/2.2/site-ccache"))))))) (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used @@ -288,18 +259,6 @@ without requiring the source code to be rewritten.") (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) -(define-public guile-2.2.5 - (package - (inherit guile-2.2) - (version "2.2.5") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "19w5ws1jvs01dpv756qv2cgs37rsnwq1f4f07mj0wra35pqp6c7w")))))) - (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779") -- cgit v1.2.3 From 9c2563a80b6f1d8fb8677f5314e6180ea9916aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 21 Jun 2019 18:11:25 +0200 Subject: build-system/python: Export 'python-version'. * guix/build/python-build-system.scm (get-python-version): Rename to... (python-version): ... this. Update callers. Make public. * gnu/packages/gstreamer.scm (python-gst)[arguments]: Adjust accordingly. * gnu/packages/machine-learning.scm (ghmm)[arguments]: Likewise. * gnu/packages/openldap.scm (389-ds-base)[arguments]: Import (guix build python-build-system). Use 'python-version'. * gnu/packages/package-management.scm (conda)[arguments]: Use 'python-version'. --- gnu/packages/gstreamer.scm | 4 +--- gnu/packages/machine-learning.scm | 3 +-- gnu/packages/openldap.scm | 13 +++++-------- gnu/packages/package-management.scm | 3 +-- guix/build/python-build-system.scm | 11 ++++++----- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 2a818e078c..39a4eb5fc0 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -447,9 +447,7 @@ compression formats through the use of the libav library.") (guix build python-build-system)) #:configure-flags (let* ((python (assoc-ref %build-inputs "python")) - (python-version ((@@ (guix build python-build-system) - get-python-version) - python)) + (python-version (python-version python)) (python-sitedir (string-append "lib/python" python-version "/site-packages"))) (list (string-append diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ba7772f66b..e216b9474a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -210,8 +210,7 @@ classification.") (assoc-ref %standard-phases 'check)) (add-before 'check 'fix-PYTHONPATH (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((python-version ((@@ (guix build python-build-system) - get-python-version) + (let ((python-version (python-version (assoc-ref inputs "python")))) (setenv "PYTHONPATH" (string-append (getenv "PYTHONPATH") diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 43f111cf40..2f80920ed4 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -211,7 +211,11 @@ servers from Python programs.") (arguments `(#:modules ((srfi srfi-1) (guix build gnu-build-system) + ((guix build python-build-system) + #:select (python-version)) (guix build utils)) + #:imported-modules ((guix build python-build-system) + ,@%gnu-build-system-modules) #:configure-flags (list (string-append "--with-db=" (assoc-ref %build-inputs "bdb")) @@ -263,16 +267,9 @@ servers from Python programs.") (add-after 'unpack 'fix-install-location-of-python-tools (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (get-python-version - ;; FIXME: copied from python-build-system - (lambda (python) - (let* ((version (last (string-split python #\-))) - (components (string-split version #\.)) - (major+minor (take components 2))) - (string-join major+minor ".")))) (pythondir (string-append out "/lib/python" - (get-python-version (assoc-ref inputs "python")) + (python-version (assoc-ref inputs "python")) "/site-packages/"))) ;; Install directory must be on PYTHONPATH. (setenv "PYTHONPATH" diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index e1e7d6a5a0..81b3c321e4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -831,8 +831,7 @@ This package provides Conda as a library.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (target (string-append out "/lib/python" - ((@@ (guix build python-build-system) - get-python-version) + (python-version (assoc-ref inputs "python")) "/site-packages/"))) ;; The installer aborts if the target directory is not on diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 7c00306b3e..09bd8465c8 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015, 2016, 2018 Ludovic Courtès +;;; Copyright © 2013, 2015, 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015, 2018 Mark H Weaver @@ -32,6 +32,7 @@ #:export (%standard-phases add-installed-pythonpath site-packages + python-version python-build)) ;; Commentary: @@ -147,7 +148,7 @@ (format #t "test suite not run~%")) #t) -(define (get-python-version python) +(define (python-version python) (let* ((version (last (string-split python #\-))) (components (string-split version #\.)) (major+minor (take components 2))) @@ -158,7 +159,7 @@ (let* ((out (assoc-ref outputs "out")) (python (assoc-ref inputs "python"))) (string-append out "/lib/python" - (get-python-version python) + (python-version python) "/site-packages/"))) (define (add-installed-pythonpath inputs outputs) @@ -202,7 +203,7 @@ when running checks after installing the package." (python (assoc-ref inputs "python")) (var `("PYTHONPATH" prefix ,(cons (string-append out "/lib/python" - (get-python-version python) + (python-version python) "/site-packages") (search-path-as-string->list (or (getenv "PYTHONPATH") "")))))) @@ -222,7 +223,7 @@ installed with setuptools." (let* ((out (assoc-ref outputs "out")) (python (assoc-ref inputs "python")) (site-packages (string-append out "/lib/python" - (get-python-version python) + (python-version python) "/site-packages")) (easy-install-pth (string-append site-packages "/easy-install.pth")) (new-pth (string-append site-packages "/" name ".pth"))) -- cgit v1.2.3 From 06172df545f1253463bc51a9e2c39bf2133f3f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 29 Jun 2019 22:34:20 +0200 Subject: gnu: flex: Build bison-for-tests sequentially. This is a followup to b1593c1c4fd8f4fc6df4c43cab51334426e3aa76. * gnu/packages/flex.scm (flex)[inputs](bison-for-tests): Use 'substitute-keyword-arguments' instead of overriding them altogether. This ensures that #:parallel-build? and #:parallel-tests? are preserved. --- gnu/packages/flex.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index e08b0c13db..6038e92744 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2019 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages m4) #:use-module (gnu packages man) @@ -47,8 +48,10 @@ (let ((bison-for-tests (package (inherit bison) - ;; Disable tests, since they require flex. - (arguments '(#:tests? #f)) + (arguments + ;; Disable tests, since they require flex. + (substitute-keyword-arguments (package-arguments bison) + ((#:tests? _ #f) #f))) (inputs (alist-delete "flex" (package-inputs bison)))))) `(("bison" ,bison-for-tests) ("indent" ,indent)))) -- cgit v1.2.3 From c248e9b0222eb11e14389c30e0bfa29774b366a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 29 Jun 2019 23:04:08 +0200 Subject: gnu: gawk: Update to 5.0.1. * gnu/packages/gawk.scm (gawk): Update to 5.0.1. --- gnu/packages/gawk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 9b7b93651f..d8494e9c1c 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -30,13 +30,13 @@ (define-public gawk (package (name "gawk") - (version "5.0.0") + (version "5.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gawk/gawk-" version ".tar.xz")) (sha256 - (base32 "01j409gharghgf7h0pjzywkimhz2ldrxf85nvf3sv1dl1vnr3w2h")))) + (base32 "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9011f748a5762d8932542e0c12e030f6ae6b8f6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:10:56 +0200 Subject: gnu: harfbuzz: Update to 2.5.3. * gnu/packages/gtk.scm (harfbuzz): Update to 2.5.3. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e4d6af51c5..10e58808a5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -179,7 +179,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -187,7 +187,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.xz")) (sha256 (base32 - "12vya82hb2yfg92735kjql7d9kxpz64hs1jhjvnzagdy5fdcz3vw")))) + "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 6c6e56fe5339b8c6fd401260e8e0b507fb778f80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:11:19 +0200 Subject: gnu: nettle: Update to 3.5.1. * gnu/packages/nettle.scm (nettle): Update to 3.5.1. --- gnu/packages/nettle.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 1f91b74d8b..f5e7188ff0 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -75,14 +75,14 @@ themselves.") ;; This version is not API-compatible with version 2. In particular, lsh ;; cannot use it yet. So keep it separate. (package (inherit nettle-2) - (version "3.4.1") + (version "3.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nettle/nettle-" version ".tar.gz")) (sha256 (base32 - "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr")))) + "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m")))) (arguments (substitute-keyword-arguments (package-arguments nettle-2) ((#:configure-flags flags) -- cgit v1.2.3 From 984ab5daf96ad9a6ea676ab70109309acce712fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:11:39 +0200 Subject: gnu: poppler: Update to 0.78.0. * gnu/packages/pdf.scm (poppler): Update to 0.78.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6318a4b309..1bf171ceaf 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -85,14 +85,14 @@ (define-public poppler (package (name "poppler") - (version "0.77.0") + (version "0.78.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "0szk09hk8r98ck9cx97nqwrbzdn1q41ic8dq8j1aar6dpi6fnrvj")))) + "1hiqg4wc6lpf52x3k630w2y1x90fhb6vfqdqg0xrqcx7hwqxsbv2")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From 1b0668272cb44d78a94b65ae0e004903b78e4138 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:12:01 +0200 Subject: gnu: python-more-itertools: Update to 7.1.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 7.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3e2b5f0d7..3ae5b1248f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14446,14 +14446,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "7.0.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "0npsg9rbzvjrf176bf1p7239lkq0laqv11j81aixpn5al65p9r63")))) + "16phg2f2dvm6ci5wr49ncha5lmc0m2in3bsl33c61vzca4gkvd4b")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From 25280065814aecd7ce56baf4866b0c05acf8028b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:13:49 +0200 Subject: build-system/meson: Do not inherit the 'bootstrap' phase. * guix/build/meson-build-system.scm (%standard-phases): Remove 'bootstrap'. * gnu/packages/glib.scm (glib)[arguments]: Adjust accordingly. --- gnu/packages/glib.scm | 1 - guix/build/meson-build-system.scm | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 62543fe114..eae8297531 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -200,7 +200,6 @@ shared NFS home directories.") (arguments `(#:phases (modify-phases %standard-phases - (delete 'bootstrap) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index d0975fcab0..8043a84abb 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -108,6 +108,7 @@ for example libraries only needed for the tests." ;; from the gnu-build-system. If the glib-or-gtk? key is #f (the default) ;; then the extra phases will be removed again in (guix build-system meson). (modify-phases glib-or-gtk:%standard-phases + (delete 'bootstrap) (replace 'configure configure) (replace 'build build) (replace 'check check) -- cgit v1.2.3 From 61f34ae5bbbb492254a3e618548d7019c3b3898f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 14:18:35 +0200 Subject: gnu: libssh2: Update to 1.9.0. * gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/ssh.scm (libssh2): Update to 1.9.0. [source](patches): Remove. --- gnu/local.mk | 1 - .../libssh2-fix-build-failure-with-gcrypt.patch | 33 ---------------------- gnu/packages/ssh.scm | 14 ++------- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch diff --git a/gnu/local.mk b/gnu/local.mk index f90d0cf402..2e4faeb4c4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1020,7 +1020,6 @@ dist_patch_DATA = \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libsndfile-CVE-2017-12562.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 \ %D%/packages/patches/libtommath-fix-linkage.patch \ diff --git a/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch b/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch deleted file mode 100644 index 4133be7fc9..0000000000 --- a/gnu/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -This fixes a regression introduced in 1.8.0 where libssh2 fails to build -with the gcrypt backend. - -Upstream bug URL: - -https://github.com/libssh2/libssh2/issues/150 - -Patch copied from upstream source repository: - -https://github.com/libssh2/libssh2/commit/ced924b78a40126606797ef57a74066eb3b4b83f - -From ced924b78a40126606797ef57a74066eb3b4b83f Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 31 Oct 2016 09:04:33 +0000 -Subject: [PATCH] acinclude.m4: fix ./configure --with-libgcrypt - -diff --git a/acinclude.m4 b/acinclude.m4 -index 734ef07..c78260c 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -412,9 +412,9 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [ - - old_LDFLAGS=$LDFLAGS - old_CFLAGS=$CFLAGS -- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then -- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib" -- CFLAGS="$CFLAGS -I$use_libgcrypt/include" -+ if test -n "$with_libgcrypt_prefix" && test "$use_libgcrypt" != "no"; then -+ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib" -+ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include" - fi - AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [ - #include diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c04fa6fbfd..596bc55a12 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -111,7 +111,7 @@ applications.") (define-public libssh2 (package (name "libssh2") - (version "1.8.2") + (version "1.9.0") (source (origin (method url-fetch) (uri (string-append @@ -119,21 +119,13 @@ applications.") version ".tar.gz")) (sha256 (base32 - "0rqd37pc80nm2pz4sa2m9pfc48axys7jwq1l7z0vii5nyvchg0q8")) - (patches - (search-patches "libssh2-fix-build-failure-with-gcrypt.patch")))) + "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym")))) (build-system gnu-build-system) ;; The installed libssh2.pc file does not include paths to libgcrypt and ;; zlib libraries, so we need to propagate the inputs. (propagated-inputs `(("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) - (arguments `(#:configure-flags `("--with-libgcrypt") - #:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (invoke "autoreconf" "-v")))))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake))) + (arguments `(#:configure-flags `("--with-libgcrypt"))) (synopsis "Client-side C library implementing the SSH2 protocol") (description "libssh2 is a library intended to allow software developers access to -- cgit v1.2.3 From ca9a598e8a4bc3f3b7b5316720fc56dc7a6eb4bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 14:21:40 +0200 Subject: gnu: libuv: Update to 1.30.0. * gnu/packages/libevent.scm (libuv): Update to 1.30.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 01da7bad60..1f7a839ba5 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -99,14 +99,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.29.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "032pr9366qsxl78bd4id2c5pfrjv1j997zm5a7a8dbycllyh91hl")))) + "1rybx7fy2751551bn2fjfys0aam9i6xz3yccn3gi0iw5qgalxnsm")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From fd3594bf3881fb8d4c04f76db0f1a9cbd5fae871 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 17:08:13 +0200 Subject: Revert "gnu: meson: Update to 0.51.0." Meson 0.51.0 has problems with PKG_CONFIG_PATH. See . This reverts commit 70530036b8313d5273fca286cd62c73bd2225110. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 68d5b77d49..c435e72824 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -162,7 +162,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.51.0") + (version "0.50.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -170,7 +170,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "0gynkr02mlillh35ksizsf6zc4dfxb8gqym00df5klw6spvgsx9g")))) + "1k2fw5qk4mqjcb4j5dhp8xfn0caqphb11yh8zkw7v9w01kb5d3zn")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From 1c94df8a1bb92c66adaf85a7329790b1281f1f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 1 Jul 2019 13:51:16 +0200 Subject: gnu: guile: Update to 2.2.6. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.6. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index efb19b456f..568661c75c 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -216,7 +216,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.5") + (version "2.2.6") (source (origin (method url-fetch) @@ -226,7 +226,7 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "19w5ws1jvs01dpv756qv2cgs37rsnwq1f4f07mj0wra35pqp6c7w")) + "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) (modules '((guix build utils))) (patches (search-patches "guile-2.2-skip-oom-test.patch")) -- cgit v1.2.3 From 8aaf42c037584aa823339180b6e9cdada361bbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 1 Jul 2019 14:25:56 +0200 Subject: gnu: guile-static-stripped: Adjust patches for 2.2.6. * gnu/packages/patches/guile-2.2-default-utf8.patch, gnu/packages/patches/guile-relocatable.patch: Adjust for Guile 2.2.6. --- gnu/packages/patches/guile-2.2-default-utf8.patch | 36 +++++++++++++---------- gnu/packages/patches/guile-relocatable.patch | 18 ++++++------ 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/gnu/packages/patches/guile-2.2-default-utf8.patch b/gnu/packages/patches/guile-2.2-default-utf8.patch index 3233388874..f55a6430c1 100644 --- a/gnu/packages/patches/guile-2.2-default-utf8.patch +++ b/gnu/packages/patches/guile-2.2-default-utf8.patch @@ -4,10 +4,10 @@ available during bootstrap, so using UTF-8 avoids that (and UTF-8 has built-in conversions in glibc, too.) diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c -index 7cd753009..de92653a4 100644 +index 0ac5ea6a6..f73301e2f 100644 --- a/libguile/bytevectors.c +++ b/libguile/bytevectors.c -@@ -1918,7 +1918,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness) +@@ -1931,7 +1931,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness) if (scm_i_is_narrow_string (str)) \ { \ err = mem_iconveh (scm_i_string_chars (str), c_strlen, \ @@ -17,10 +17,10 @@ index 7cd753009..de92653a4 100644 &c_utf, &c_utf_len); \ if (SCM_UNLIKELY (err)) \ diff --git a/libguile/ports.c b/libguile/ports.c -index 2a25cd58e..bdaf921ca 100644 +index 45e62f4e4..42012f3aa 100644 --- a/libguile/ports.c +++ b/libguile/ports.c -@@ -959,7 +959,9 @@ canonicalize_encoding (const char *enc) +@@ -974,7 +974,9 @@ canonicalize_encoding (const char *enc) char *ret; int i; @@ -31,7 +31,7 @@ index 2a25cd58e..bdaf921ca 100644 return sym_ISO_8859_1; if (encoding_matches (enc, sym_UTF_8)) return sym_UTF_8; -@@ -4182,7 +4184,7 @@ scm_init_ports (void) +@@ -4198,7 +4200,7 @@ scm_init_ports (void) scm_c_define ("%default-port-conversion-strategy", scm_make_fluid_with_default (sym_substitute)); /* Use the locale as the default port encoding. */ @@ -41,10 +41,10 @@ index 2a25cd58e..bdaf921ca 100644 scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, "scm_init_ice_9_ports", diff --git a/libguile/strings.c b/libguile/strings.c -index 5c49e33d8..0131e6dc8 100644 +index 056b4c99f..63a6c050d 100644 --- a/libguile/strings.c +++ b/libguile/strings.c -@@ -1561,7 +1561,7 @@ scm_i_default_string_failed_conversion_handler (void) +@@ -1579,7 +1579,7 @@ scm_i_default_string_failed_conversion_handler (void) SCM scm_from_locale_stringn (const char *str, size_t len) { @@ -53,7 +53,7 @@ index 5c49e33d8..0131e6dc8 100644 scm_i_default_string_failed_conversion_handler ()); } -@@ -1885,7 +1885,7 @@ char * +@@ -1907,7 +1907,7 @@ char * scm_to_locale_stringn (SCM str, size_t *lenp) { return scm_to_stringn (str, lenp, @@ -62,17 +62,21 @@ index 5c49e33d8..0131e6dc8 100644 scm_i_default_string_failed_conversion_handler ()); } -@@ -2216,11 +2216,11 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, - len = 0; - enc = encoding; - if (enc == NULL) -- enc = "ISO-8859-1"; -+ enc = "UTF-8"; +@@ -2195,7 +2195,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, + scm_wrong_type_arg_msg (NULL, 0, str, "string"); + + if (encoding == NULL) +- encoding = "ISO-8859-1"; ++ encoding = "UTF-8"; + + if (c_strcasecmp (encoding, "UTF-8") == 0) + /* This is the most common case--e.g., when calling libc bindings +@@ -2247,7 +2247,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, if (scm_i_is_narrow_string (str)) { ret = mem_iconveh (scm_i_string_chars (str), ilen, -- "ISO-8859-1", enc, -+ "UTF-8", enc, +- "ISO-8859-1", encoding, ++ "UTF-8", encoding, (enum iconv_ilseq_handler) handler, NULL, &buf, &len); diff --git a/gnu/packages/patches/guile-relocatable.patch b/gnu/packages/patches/guile-relocatable.patch index 95bddcce88..464333880c 100644 --- a/gnu/packages/patches/guile-relocatable.patch +++ b/gnu/packages/patches/guile-relocatable.patch @@ -11,7 +11,7 @@ location of the `guile' binary, allowing it to be relocated. #include "libguile/_scm.h" #include "libguile/alist.h" -@@ -325,6 +326,32 @@ +@@ -326,6 +327,32 @@ scm_init_load_path () SCM cpath = SCM_EOL; #ifdef SCM_LIBRARY_DIR @@ -44,24 +44,24 @@ location of the `guile' binary, allowing it to be relocated. env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_PATH")); if (env && strcmp (env, "") == 0) /* special-case interpret system-path=="" as meaning no system path instead -@@ -333,10 +360,7 @@ +@@ -334,10 +361,7 @@ scm_init_load_path () else if (env) path = scm_parse_path (scm_from_locale_string (env), path); else -- path = scm_list_4 (scm_from_locale_string (SCM_LIBRARY_DIR), -- scm_from_locale_string (SCM_SITE_DIR), -- scm_from_locale_string (SCM_GLOBAL_SITE_DIR), -- scm_from_locale_string (SCM_PKGDATA_DIR)); +- path = scm_list_4 (scm_from_utf8_string (SCM_LIBRARY_DIR), +- scm_from_utf8_string (SCM_SITE_DIR), +- scm_from_utf8_string (SCM_GLOBAL_SITE_DIR), +- scm_from_utf8_string (SCM_PKGDATA_DIR)); + path = scm_list_1 (scm_from_locale_string (module_dir)); env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_COMPILED_PATH")); if (env && strcmp (env, "") == 0) -@@ -346,8 +370,7 @@ +@@ -347,8 +371,7 @@ scm_init_load_path () cpath = scm_parse_path (scm_from_locale_string (env), cpath); else { -- cpath = scm_list_2 (scm_from_locale_string (SCM_CCACHE_DIR), -- scm_from_locale_string (SCM_SITE_CCACHE_DIR)); +- cpath = scm_list_2 (scm_from_utf8_string (SCM_CCACHE_DIR), +- scm_from_utf8_string (SCM_SITE_CCACHE_DIR)); + cpath = scm_list_1 (scm_from_locale_string (ccache_dir)); } -- cgit v1.2.3 From 209214aaefc4248173226a2664ae6dda698b85bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 09:32:38 +0200 Subject: gnu: make-bootstrap: Remove obsolete header file. * guix/build/make-bootstrap.scm (copy-linux-headers): Do not install 'a.out.h'. --- guix/build/make-bootstrap.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index e5ef1d6d2b..0d29338ce3 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -47,7 +47,6 @@ bootstrap libc." (install-file (pk 'src (string-append kernel-headers "/include/linux/" file)) (pk 'dest (string-append incdir "/linux")))) '( - "a.out.h" ; for 2.2.5 "atalk.h" ; for 2.2.5 "errno.h" "falloc.h" -- cgit v1.2.3 From 7c836efacce165f79621fea8c2e3628cf8304f82 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 09:33:31 +0200 Subject: gnu: make-bootstrap: Restore cross-compilation workarounds. These workarounds were removed in cf8264364761857ca3550398369a0f20d7b0d512 and 218eb6e611c0a238802bf9cb5742d37cea0bb012, but were needed for %BOOTSTRAP-TARBALLS. * gnu/packages/make-bootstrap.scm (%static-inputs)[coreutils, tar]: Add <#:configure-flags>. --- gnu/packages/make-bootstrap.scm | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index ec477da7c8..561a286d26 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -150,7 +150,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "--disable-silent-rules" "--enable-no-install-program=stdbuf,libstdbuf.so" "CFLAGS=-Os -g0" ; smaller, please - "LDFLAGS=-static -pthread") + "LDFLAGS=-static -pthread" + + ;; Work around a cross-compilation bug whereby libcoreutils.a + ;; would provide '__mktime_internal', which conflicts with the + ;; one in libc.a. + ,@(if (%current-target-system) + `("gl_cv_func_working_mktime=yes") + '())) + #:tests? #f ; signal-related Gnulib tests fail ,@(package-arguments coreutils))) @@ -213,17 +221,22 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." '())))) (tar (package (inherit tar) (arguments - (substitute-keyword-arguments (package-arguments tar) - ((#:phases phases) - `(modify-phases ,phases - (replace 'set-shell-file-name - (lambda _ - ;; Do not use "/bin/sh" to run programs; see - ;; . - (substitute* "src/system.c" - (("/bin/sh") "sh") - (("execv ") "execvp ")) - #t)))))))) + `(;; Work around a cross-compilation bug whereby libgnu.a would provide + ;; '__mktime_internal', which conflicts with the one in libc.a. + ,@(if (%current-target-system) + `(#:configure-flags '("gl_cv_func_working_mktime=yes")) + '()) + ,@(substitute-keyword-arguments (package-arguments tar) + ((#:phases phases) + `(modify-phases ,phases + (replace 'set-shell-file-name + (lambda _ + ;; Do not use "/bin/sh" to run programs; see + ;; . + (substitute* "src/system.c" + (("/bin/sh") "sh") + (("execv ") "execvp ")) + #t))))))))) ;; We don't want to retain a reference to /gnu/store in the bootstrap ;; versions of egrep/fgrep, so we remove the custom phase added since ;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in -- cgit v1.2.3 From 25a54eb04d89df3bd7177c3cd91f3a61bf8768ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 09:37:21 +0200 Subject: gnu: make-bootstrap: Adjust for GCC 7. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)[native-inputs]: Add SEARCH-PATHS to CROSS-GCC, and NATIVE-SEARCH-PATHS to the native GCC. --- gnu/packages/make-bootstrap.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 561a286d26..df6b828a2d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -106,16 +106,33 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define (native-inputs) (if (%current-target-system) - (let ((target (%current-target-system))) - `(("cross-gcc" ,(cross-gcc target - #:xbinutils (cross-binutils target) - #:libc (cross-bootstrap-libc))) + (let* ((target (%current-target-system)) + (xgcc (cross-gcc + target + #:xbinutils (cross-binutils target) + #:libc (cross-bootstrap-libc)))) + `(("cross-gcc" ,(package + (inherit xgcc) + (search-paths + ;; Ensure the cross libc headers appears on the + ;; C++ system header search path. + (cons (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-search-paths gcc))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ("gcc" ,(package (inherit gcc) (outputs '("out")) ;all in one so libgcc_s is easily found + (native-search-paths + ;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc + ;; C++ headers. + (cons (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-native-search-paths gcc))) (inputs `(;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap)) -- cgit v1.2.3 From f16a866f74f39e2ae6ad708669fa2c4bc209c09b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Jun 2019 09:39:07 +0200 Subject: gnu: bootstrap-tarballs: Don't include the native Mes when cross-compiling. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[inputs]: Check %CURRENT-TARGET-SYSTEM when deciding whether to use the reduced binary seeds. --- gnu/packages/make-bootstrap.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index df6b828a2d..2163b646f6 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -825,7 +825,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." %build-inputs) #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) - ,@(match (%current-system) + ,@(match (or (%current-target-system) (%current-system)) ((or "i686-linux" "x86_64-linux") `(("bootstrap-mescc-tools" ,%mescc-tools-bootstrap-tarball) ("bootstrap-mes" ,%mes-bootstrap-tarball) -- cgit v1.2.3 From 3730e3c64e2bc9b444281a17282aa7406e20d093 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 30 Jun 2019 16:46:37 +0200 Subject: gnu: gettext: Update to 0.20.1. * gnu/packages/gettext.scm (gettext-minimal): Update to 0.20.1. [source](snippet): Remove. [inputs]: Remove EXPAT. Add LIBUNISTRING, LIBXML2, and NCURSES. [arguments]: Add #:configure-flags and a "patch-fixed-paths" phase. Delete "link-expat" phase. * gnu/packages/commencement.scm (gettext-boot0): Stay on version 0.19.8.1. [arguments]: Adjust accordingly. Co-authored-by: Miguel --- gnu/packages/commencement.scm | 47 ++++++++++++++++-------------- gnu/packages/gettext.scm | 67 ++++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 54 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 10b0bd67f5..1db28498ff 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2015,30 +2015,33 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (let ((gettext-minimal (package (inherit gettext-minimal) (name "gettext-boot0") + ;; Newer versions of GNU gettext depends on libxml2 and ncurses. To + ;; simplify the dependency chain, we stick to this version here. + (version "0.19.8.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gettext/gettext-" + version ".tar.gz")) + (sha256 + (base32 + "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z")))) (inputs '()) ;zero dependencies (arguments - (substitute-keyword-arguments - `(#:tests? #f - ,@(package-arguments gettext-minimal)) - ((#:phases phases) - `(modify-phases ,phases - ;; Build only the tools. - (add-after 'unpack 'chdir - (lambda _ - (chdir "gettext-tools") - #t)) - - ;; Some test programs require pthreads, which we don't have. - (add-before 'configure 'no-test-programs - (lambda _ - (substitute* "tests/Makefile.in" - (("^PROGRAMS =.*$") - "PROGRAMS =\n")) - #t)) - - ;; Don't try to link against libexpat. - (delete 'link-expat) - (delete 'patch-tests)))))))) + `(#:tests? #f + #:phases (modify-phases %standard-phases + ;; Build only the tools. + (add-after 'unpack 'chdir + (lambda _ + (chdir "gettext-tools") + #t)) + + ;; Some test programs require pthreads, which we don't have. + (add-before 'configure 'no-test-programs + (lambda _ + (substitute* "tests/Makefile.in" + (("^PROGRAMS =.*$") + "PROGRAMS =\n")) + #t)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs gettext-minimal %boot1-inputs diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index ef80af42ea..245fdc9ec0 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -4,10 +4,11 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Alex Kost -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Miguel ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,8 @@ #:use-module (guix build-system perl) #:use-module (gnu packages docbook) #:use-module (gnu packages emacs) + #:use-module (gnu packages libunistring) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages tex) #:use-module (gnu packages xml) @@ -41,34 +44,42 @@ (define-public gettext-minimal (package (name "gettext-minimal") - (version "0.19.8.1") + (version "0.20.1") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gettext/gettext-" - version ".tar.gz")) - (sha256 - (base32 - "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z")) - (modules '((guix build utils))) - (snippet - '(begin - ;; The gnulib test-lock test is prone to writer starvation - ;; with our glibc@2.25, which prefers readers, so disable it. - ;; The gnulib commit b20e8afb0b2 should fix this once - ;; incorporated here. - (substitute* "gettext-runtime/tests/Makefile.in" - (("TESTS = test-lock\\$\\(EXEEXT\\)") "TESTS =")) - (substitute* "gettext-tools/gnulib-tests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + (method url-fetch) + (uri (string-append "mirror://gnu/gettext/gettext-" + version ".tar.gz")) + (sha256 + (base32 + "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6")))) (build-system gnu-build-system) (outputs '("out" - "doc")) ;8 MiB of HTML + "doc")) ;9 MiB of HTML (inputs - `(("expat" ,expat))) + `(("libunistring" ,libunistring) + ("libxml2" ,libxml2) + + ;; TODO: ncurses is only needed for the 'libtextstyle' library. + ;; The next version of gettext can use a separate libtextstyle, + ;; but for now we include it here in 'gettext-minimal'. + ("ncurses" ,ncurses))) (arguments - `(#:phases + `(#:configure-flags '("--with-included-libunistring=no" + "--with-included-libxml=no") + #:phases (modify-phases %standard-phases + (add-before 'patch-source-shebangs 'patch-fixed-paths + (lambda _ + (substitute* '("gettext-tools/config.h.in" + "gettext-tools/gnulib-tests/init.sh" + "gettext-tools/tests/init.sh" + "gettext-tools/system-tests/run-test") + (("/bin/sh") "sh")) + (substitute* '("gettext-tools/src/project-id" + "gettext-tools/projects/KDE/trigger" + "gettext-tools/projects/GNOME/trigger") + (("/bin/pwd") "pwd")) + #t)) (add-before 'check 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let* ((bash (which "sh"))) @@ -92,15 +103,7 @@ (("/bin/pwd") "pwd")) - #t)))) - (add-before 'configure 'link-expat - (lambda _ - ;; Gettext defaults to opening expat via dlopen on - ;; "Linux". Change to link directly. - (substitute* "gettext-tools/configure" - (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") - (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\"")) - #t))) + #t))))) ;; When tests fail, we want to know the details. #:make-flags '("VERBOSE=yes"))) -- cgit v1.2.3 From e27916274cd85df4a097fc16af1a6159e9d647b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 13:31:55 +0200 Subject: gnu: libuninameslist: Update to 20190701. * gnu/packages/fontutils.scm (libuninameslist): Update to 20190701. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index cddd067517..818d77f127 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -529,7 +529,7 @@ smooth contours with constant curvature at the spline joins.") (define-public libuninameslist (package (name "libuninameslist") - (version "20190305") + (version "20190701") (home-page "https://github.com/fontforge/libuninameslist") (source (origin @@ -538,7 +538,7 @@ smooth contours with constant curvature at the spline joins.") "/libuninameslist-dist-" version ".tar.gz")) (sha256 (base32 - "1rwd2bgcyvign9agyjsr3v2fr9j1cg2wi6g0z2wwg1az32scknwq")))) + "18c9pcz81wm26q2m7npmvh9j3ibjs2hycxfh5xic2xgjfw40v2qn")))) (build-system gnu-build-system) (synopsis "Unicode names and annotation list") (description -- cgit v1.2.3 From 742f2deaa385e45e08264c6e41f2929e87319f66 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 17:21:05 +0200 Subject: gnu: commencement: Remove outdated comment. * gnu/packages/commencement.scm (bison-boot0): Remove bash comment, which is no longer accurate. --- gnu/packages/commencement.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1db28498ff..8a0e1c3cb1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1710,8 +1710,6 @@ exec " gcc "/bin/" program (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. - ;; It is also needed to rebuild Bash's parser, which is modified by - ;; its CVE patches. Remove it when it's no longer needed. (let* ((bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... -- cgit v1.2.3 From 1290855490baf03944dc85d8353c2b8cedac5256 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 1 Jul 2019 17:24:33 +0200 Subject: gnu: linux-libre-headers: Update to 4.19.56. * gnu/packages/linux.scm (linux-libre-headers-4.14.67): Rename to ... (linux-libre-headers-4.19.56): ... this. Adjust hash accordingly. (linux-libre-headers): Set to LINUX-LIBRE-HEADERS-4.19.56. * gnu/packages/commencement.scm (linux-libre-headers-boot0)[native-inputs]: Add FLEX-BOOT0 and BISON-BOOT0. --- gnu/packages/commencement.scm | 7 ++++++- gnu/packages/linux.scm | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 8a0e1c3cb1..230b63364a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1710,6 +1710,7 @@ exec " gcc "/bin/" program (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process. + ;; Recent versions of Linux-Libre headers also depend on this. (let* ((bison (package (inherit bison) (propagated-inputs `(("m4" ,m4))) (inputs '()) ;remove Flex... @@ -1735,7 +1736,7 @@ exec " gcc "/bin/" program (native-inputs `(("perl" ,perl-boot0)))))) (define flex-boot0 - ;; This Flex is needed to build MiG. + ;; This Flex is needed to build MiG as well as Linux-Libre headers. (let* ((flex (package (inherit flex) (native-inputs `(("bison" ,bison-boot0))) (propagated-inputs `(("m4" ,m4))) @@ -1760,6 +1761,10 @@ exec " gcc "/bin/" program ,@(package-arguments linux-libre-headers))) (native-inputs `(("perl" ,perl-boot0) + + ;; Flex and Bison are required since version 4.16. + ("flex" ,flex-boot0) + ("bison" ,bison-boot0) ,@(%boot0-inputs))))))) (define gnumach-headers-boot0 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f1fdcba311..7df83ca020 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -496,11 +496,11 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config-veyron #:extra-version "arm-veyron")) -(define-public linux-libre-headers-4.14.67 - (make-linux-libre-headers "4.14.67" - "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")) +(define-public linux-libre-headers-4.19.56 + (make-linux-libre-headers "4.19.56" + "1zqiic55viy065lhnkmhn33sz3bbbr2ykbm5f92yzd8lpc9zl7yx")) -(define-public linux-libre-headers linux-libre-headers-4.14.67) +(define-public linux-libre-headers linux-libre-headers-4.19.56) (define-public linux-libre linux-libre-5.1) (define-public linux-libre-arm-generic -- cgit v1.2.3 From 5f3f70391809f8791c55c05bd1646bc58508fa2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 16:45:17 +0200 Subject: gnu: glibc: Update to 2.29. * gnu/packages/patches/glibc-bootstrap-system.patch, gnu/packages/patches/glibc-supported-locales.patch: Adjust for glibc 2.29. * gnu/packages/patches/glibc-2.28-supported-locales.patch, gnu/packages/patches/glibc-CVE-2019-7309.patch, gnu/packages/patches/glibc-CVE-2019-9169.patch, gnu/packages/patches/glibc-2.29-git-updates.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/base.scm (glibc): Update to 2.29. [source](patches): Add 'glibc-CVE-2019-7309.patch', 'glibc-CVE-2019-9169.patch', and 'glibc-2.29-git-updates.patch'. Remove 'glibc-hurd-magic-pid.patch'. [native-inputs]: Add PYTHON-MINIMAL. (glibc-2.28): New public variable. * gnu/packages/commencement.scm (expat-sans-tests, python-boot0): New variables. (glibc-final-with-bootstrap-bash)[native-inputs]: Add PYTHON-BOOT0. * gnu/packages/python.scm (python-3.7)[arguments]: Disable test that fails with glibc 2.29. --- gnu/local.mk | 4 + gnu/packages/base.scm | 32 +- gnu/packages/commencement.scm | 40 +- .../patches/glibc-2.28-supported-locales.patch | 33 + gnu/packages/patches/glibc-2.29-git-updates.patch | 742 +++++++++++++++++++++ gnu/packages/patches/glibc-CVE-2019-7309.patch | 76 +++ gnu/packages/patches/glibc-CVE-2019-9169.patch | 22 + gnu/packages/patches/glibc-bootstrap-system.patch | 34 +- gnu/packages/patches/glibc-supported-locales.patch | 16 +- gnu/packages/python.scm | 4 +- 10 files changed, 969 insertions(+), 34 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.28-supported-locales.patch create mode 100644 gnu/packages/patches/glibc-2.29-git-updates.patch create mode 100644 gnu/packages/patches/glibc-CVE-2019-7309.patch create mode 100644 gnu/packages/patches/glibc-CVE-2019-9169.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2e4faeb4c4..d3ace6891d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -858,6 +858,8 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ + %D%/packages/patches/glibc-CVE-2019-7309.patch \ + %D%/packages/patches/glibc-CVE-2019-9169.patch \ %D%/packages/patches/glibc-allow-kernel-2.6.32.patch \ %D%/packages/patches/glibc-boot-2.16.0.patch \ %D%/packages/patches/glibc-boot-2.2.5.patch \ @@ -873,6 +875,8 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-2.27-git-fixes.patch \ %D%/packages/patches/glibc-2.28-git-fixes.patch \ + %D%/packages/patches/glibc-2.28-supported-locales.patch \ + %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 6585d2eebd..63c22017e7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages hurd) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages gettext) #:use-module (guix utils) #:use-module (guix packages) @@ -566,15 +567,13 @@ the store.") ;; version 2.28, GNU/Hurd used a different glibc branch. (package (name "glibc") - ;; Note: Always use a dot after the minor version since various places rely - ;; on "version-major+minor" to determine where locales are found. - (version "2.28") + (version "2.29") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) + "0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -586,12 +585,13 @@ the store.") #t)) (modules '((guix build utils))) (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-2.28-git-fixes.patch" + "glibc-CVE-2019-7309.patch" + "glibc-CVE-2019-9169.patch" + "glibc-2.29-git-updates.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" - "glibc-hurd-magic-pid.patch" "glibc-supported-locales.patch")))) (build-system gnu-build-system) @@ -789,6 +789,7 @@ the store.") ("perl" ,perl) ("bison" ,bison) ("gettext" ,gettext-minimal) + ("python" ,python-minimal) ,@(if (hurd-target?) `(("mig" ,mig) @@ -818,6 +819,25 @@ with the Linux kernel.") ;; Below are old libc versions, which we use mostly to build locale data in ;; the old format (which the new libc cannot cope with.) +(define-public glibc-2.28 + (package + (inherit glibc) + (version "2.28") + (source (origin + (inherit (package-source glibc)) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) + (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-2.28-git-fixes.patch" + "glibc-hidden-visibility-ldconfig.patch" + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-hurd-magic-pid.patch" + "glibc-2.28-supported-locales.patch")))))) + (define-public glibc-2.27 (package (inherit glibc) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 230b63364a..d28296449d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -44,10 +44,12 @@ #:use-module (gnu packages compression) #:use-module (gnu packages mes) #:use-module (gnu packages perl) + #:use-module (gnu packages python) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) #:use-module (gnu packages texinfo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xml) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -1843,6 +1845,41 @@ the bootstrap environment." (current-source-location) #:guile %bootstrap-guile)))) +(define expat-sans-tests + (package + (inherit expat) + (arguments + ;; XXX: Linking 'runtestscpp' fails with things like: + ;; + ;; ld: Dwarf Error: found dwarf version '3789', this reader only handles version 2 and 3 information. + ;; + ;; Skip tests altogether. + (substitute-keyword-arguments (package-arguments expat) + ((#:configure-flags flags ''()) + ;; Since we're not passing the right -Wl,-rpath flags, build the + ;; static library to avoid RUNPATH validation failure. + `(cons "--disable-shared" ,flags)) + ((#:tests? _ #f) #f))))) + +(define python-boot0 + (let ((python (package + (inherit python-minimal) + (inputs + `(("expat" ,expat-sans-tests))) ;remove OpenSSL, zlib, etc. + (arguments + (substitute-keyword-arguments (package-arguments + python-minimal) + ;; Disable features that cannot be built at this stage. + ((#:configure-flags _ ''()) + `(list "--without-ensurepip")) + ((#:make-flags _ ''()) + `(list "MODDISABLED_NAMES=_ctypes ossaudiodev")) + ((#:tests? _ #f) #f)))))) + (package-with-bootstrap-guile + (package-with-explicit-inputs python %boot0-inputs + (current-source-location) + #:guile %bootstrap-guile)))) + (define (ld-wrapper-boot0) ;; We need this so binaries on Hurd will have libmachuser and libhurduser ;; in their RUNPATH, otherwise validate-runpath will fail. @@ -1906,7 +1943,8 @@ the bootstrap environment." (native-inputs `(("bison" ,bison-boot0) ("texinfo" ,texinfo-boot0) - ("perl" ,perl-boot0))) + ("perl" ,perl-boot0) + ("python" ,python-boot0))) (inputs `(;; The boot inputs. That includes the bootstrap libc. We don't want ;; it in $CPATH, hence the 'pre-configure' phase above. diff --git a/gnu/packages/patches/glibc-2.28-supported-locales.patch b/gnu/packages/patches/glibc-2.28-supported-locales.patch new file mode 100644 index 0000000000..2888052bb8 --- /dev/null +++ b/gnu/packages/patches/glibc-2.28-supported-locales.patch @@ -0,0 +1,33 @@ +This patch is taken from debian's glibc package (generate-supported.mk). +It install the localedata/SUPPORTED file of the glibc. This file lists +all the supported locales of the glibc. + +diff --git a/localedata/Makefile.old b/localedata/Makefile +index 34877c0..a61d9b9 100644 +--- a/localedata/Makefile.old ++++ b/localedata/Makefile +@@ -91,7 +91,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -195,6 +196,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. diff --git a/gnu/packages/patches/glibc-2.29-git-updates.patch b/gnu/packages/patches/glibc-2.29-git-updates.patch new file mode 100644 index 0000000000..5750e9cac1 --- /dev/null +++ b/gnu/packages/patches/glibc-2.29-git-updates.patch @@ -0,0 +1,742 @@ +This file tracks updates from the "release/2.29/master" branch: +https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/2.29/master + +Abridged commits are appended to this file. + +From ec894251ef11723d10df04fcfd7bd2030c6e43ff Mon Sep 17 00:00:00 2001 +From: Carlos O'Donell +Date: Mon, 21 Jan 2019 22:50:12 -0500 +Subject: [PATCH] nptl: Fix pthread_rwlock_try*lock stalls (Bug 23844) +diff --git a/nptl/pthread_rwlock_tryrdlock.c b/nptl/pthread_rwlock_tryrdlock.c +index 368862ff07..2f94f17f36 100644 +--- a/nptl/pthread_rwlock_tryrdlock.c ++++ b/nptl/pthread_rwlock_tryrdlock.c +@@ -94,15 +94,22 @@ __pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock) + /* Same as in __pthread_rwlock_rdlock_full: + We started the read phase, so we are also responsible for + updating the write-phase futex. Relaxed MO is sufficient. +- Note that there can be no other reader that we have to wake +- because all other readers will see the read phase started by us +- (or they will try to start it themselves); if a writer started +- the read phase, we cannot have started it. Furthermore, we +- cannot discard a PTHREAD_RWLOCK_FUTEX_USED flag because we will +- overwrite the value set by the most recent writer (or the readers +- before it in case of explicit hand-over) and we know that there +- are no waiting readers. */ +- atomic_store_relaxed (&rwlock->__data.__wrphase_futex, 0); ++ We have to do the same steps as a writer would when handing over the ++ read phase to use because other readers cannot distinguish between ++ us and the writer. ++ Note that __pthread_rwlock_tryrdlock callers will not have to be ++ woken up because they will either see the read phase started by us ++ or they will try to start it themselves; however, callers of ++ __pthread_rwlock_rdlock_full just increase the reader count and then ++ check what state the lock is in, so they cannot distinguish between ++ us and a writer that acquired and released the lock in the ++ meantime. */ ++ if ((atomic_exchange_relaxed (&rwlock->__data.__wrphase_futex, 0) ++ & PTHREAD_RWLOCK_FUTEX_USED) != 0) ++ { ++ int private = __pthread_rwlock_get_private (rwlock); ++ futex_wake (&rwlock->__data.__wrphase_futex, INT_MAX, private); ++ } + } + + return 0; +diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c +index fd37a71ce4..fae475cc70 100644 +--- a/nptl/pthread_rwlock_trywrlock.c ++++ b/nptl/pthread_rwlock_trywrlock.c +@@ -46,8 +46,15 @@ __pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock) + &rwlock->__data.__readers, &r, + r | PTHREAD_RWLOCK_WRPHASE | PTHREAD_RWLOCK_WRLOCKED)) + { ++ /* We have become the primary writer and we cannot have shared ++ the PTHREAD_RWLOCK_FUTEX_USED flag with someone else, so we ++ can simply enable blocking (see full wrlock code). */ + atomic_store_relaxed (&rwlock->__data.__writers_futex, 1); +- atomic_store_relaxed (&rwlock->__data.__wrphase_futex, 1); ++ /* If we started a write phase, we need to enable readers to ++ wait. If we did not, we must not change it because other threads ++ may have set the PTHREAD_RWLOCK_FUTEX_USED in the meantime. */ ++ if ((r & PTHREAD_RWLOCK_WRPHASE) == 0) ++ atomic_store_relaxed (&rwlock->__data.__wrphase_futex, 1); + atomic_store_relaxed (&rwlock->__data.__cur_writer, + THREAD_GETMEM (THREAD_SELF, tid)); + return 0; +diff --git a/support/Makefile b/support/Makefile +index 432cf2fe6c..c15b93647c 100644 +--- a/support/Makefile ++++ b/support/Makefile +@@ -129,6 +129,7 @@ libsupport-routines = \ + xpthread_mutexattr_settype \ + xpthread_once \ + xpthread_rwlock_init \ ++ xpthread_rwlock_destroy \ + xpthread_rwlock_rdlock \ + xpthread_rwlock_unlock \ + xpthread_rwlock_wrlock \ +diff --git a/support/xpthread_rwlock_destroy.c b/support/xpthread_rwlock_destroy.c +new file mode 100644 +index 0000000000..6d6e953569 +--- /dev/null ++++ b/support/xpthread_rwlock_destroy.c +@@ -0,0 +1,26 @@ ++/* pthread_rwlock_destroy with error checking. ++ Copyright (C) 2019 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++void ++xpthread_rwlock_destroy (pthread_rwlock_t *rwlock) ++{ ++ xpthread_check_return ("pthread_rwlock_destroy", ++ pthread_rwlock_destroy (rwlock)); ++} +diff --git a/support/xthread.h b/support/xthread.h +index 47c23235f3..9fe1f68b3b 100644 +--- a/support/xthread.h ++++ b/support/xthread.h +@@ -84,6 +84,7 @@ void xpthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref); + void xpthread_rwlock_wrlock (pthread_rwlock_t *rwlock); + void xpthread_rwlock_rdlock (pthread_rwlock_t *rwlock); + void xpthread_rwlock_unlock (pthread_rwlock_t *rwlock); ++void xpthread_rwlock_destroy (pthread_rwlock_t *rwlock); + + __END_DECLS + +From 44113a8ba24af23d7bbb174f9087a6b83a76289a Mon Sep 17 00:00:00 2001 +From: Stefan Liebler +Date: Thu, 7 Feb 2019 15:18:36 +0100 +Subject: [PATCH] Add compiler barriers around modifications of the robust + mutex list for pthread_mutex_trylock. [BZ #24180] +diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c +index 8fe43b8f0f..bf2869eca2 100644 +--- a/nptl/pthread_mutex_trylock.c ++++ b/nptl/pthread_mutex_trylock.c +@@ -94,6 +94,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + case PTHREAD_MUTEX_ROBUST_ADAPTIVE_NP: + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, + &mutex->__data.__list.__next); ++ /* We need to set op_pending before starting the operation. Also ++ see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + + oldval = mutex->__data.__lock; + do +@@ -119,7 +122,12 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + /* But it is inconsistent unless marked otherwise. */ + mutex->__data.__owner = PTHREAD_MUTEX_INCONSISTENT; + ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + /* Note that we deliberately exist here. If we fall +@@ -135,6 +143,8 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + int kind = PTHREAD_MUTEX_TYPE (mutex); + if (kind == PTHREAD_MUTEX_ROBUST_ERRORCHECK_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. Also see comments at ENQUEUE_MUTEX. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, + NULL); + return EDEADLK; +@@ -142,6 +152,8 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + + if (kind == PTHREAD_MUTEX_ROBUST_RECURSIVE_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, + NULL); + +@@ -160,6 +172,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + id, 0); + if (oldval != 0 && (oldval & FUTEX_OWNER_DIED) == 0) + { ++ /* We haven't acquired the lock as it is already acquired by ++ another owner. We do not need to ensure ordering wrt another ++ memory access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + return EBUSY; +@@ -173,13 +188,20 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + if (oldval == id) + lll_unlock (mutex->__data.__lock, + PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); ++ /* FIXME This violates the mutex destruction requirements. See ++ __pthread_mutex_unlock_full. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + return ENOTRECOVERABLE; + } + } + while ((oldval & FUTEX_OWNER_DIED) != 0); + ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + mutex->__data.__owner = id; +@@ -211,10 +233,15 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + } + + if (robust) +- /* Note: robust PI futexes are signaled by setting bit 0. */ +- THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, +- (void *) (((uintptr_t) &mutex->__data.__list.__next) +- | 1)); ++ { ++ /* Note: robust PI futexes are signaled by setting bit 0. */ ++ THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, ++ (void *) (((uintptr_t) &mutex->__data.__list.__next) ++ | 1)); ++ /* We need to set op_pending before starting the operation. Also ++ see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); ++ } + + oldval = mutex->__data.__lock; + +@@ -223,12 +250,16 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + { + if (kind == PTHREAD_MUTEX_ERRORCHECK_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + return EDEADLK; + } + + if (kind == PTHREAD_MUTEX_RECURSIVE_NP) + { ++ /* We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + /* Just bump the counter. */ +@@ -250,6 +281,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + { + if ((oldval & FUTEX_OWNER_DIED) == 0) + { ++ /* We haven't acquired the lock as it is already acquired by ++ another owner. We do not need to ensure ordering wrt another ++ memory access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + return EBUSY; +@@ -270,6 +304,9 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + if (INTERNAL_SYSCALL_ERROR_P (e, __err) + && INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK) + { ++ /* The kernel has not yet finished the mutex owner death. ++ We do not need to ensure ordering wrt another memory ++ access. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + return EBUSY; +@@ -287,7 +324,12 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + /* But it is inconsistent unless marked otherwise. */ + mutex->__data.__owner = PTHREAD_MUTEX_INCONSISTENT; + ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + + /* Note that we deliberately exit here. If we fall +@@ -310,13 +352,20 @@ __pthread_mutex_trylock (pthread_mutex_t *mutex) + PTHREAD_ROBUST_MUTEX_PSHARED (mutex)), + 0, 0); + ++ /* To the kernel, this will be visible after the kernel has ++ acquired the mutex in the syscall. */ + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + return ENOTRECOVERABLE; + } + + if (robust) + { ++ /* We must not enqueue the mutex before we have acquired it. ++ Also see comments at ENQUEUE_MUTEX. */ ++ __asm ("" ::: "memory"); + ENQUEUE_MUTEX_PI (mutex); ++ /* We need to clear op_pending after we enqueue the mutex. */ ++ __asm ("" ::: "memory"); + THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL); + } + +From c096b008d2671028c21ac8cf01f18a2083e73c44 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 8 Feb 2019 12:54:41 +0100 +Subject: [PATCH] nptl: Avoid fork handler lock for async-signal-safe fork [BZ + #24161] +--- a/nptl/register-atfork.c ++++ b/nptl/register-atfork.c +@@ -107,13 +107,14 @@ __unregister_atfork (void *dso_handle) + } + + void +-__run_fork_handlers (enum __run_fork_handler_type who) ++__run_fork_handlers (enum __run_fork_handler_type who, _Bool do_locking) + { + struct fork_handler *runp; + + if (who == atfork_run_prepare) + { +- lll_lock (atfork_lock, LLL_PRIVATE); ++ if (do_locking) ++ lll_lock (atfork_lock, LLL_PRIVATE); + size_t sl = fork_handler_list_size (&fork_handlers); + for (size_t i = sl; i > 0; i--) + { +@@ -133,7 +134,8 @@ __run_fork_handlers (enum __run_fork_handler_type who) + else if (who == atfork_run_parent && runp->parent_handler) + runp->parent_handler (); + } +- lll_unlock (atfork_lock, LLL_PRIVATE); ++ if (do_locking) ++ lll_unlock (atfork_lock, LLL_PRIVATE); + } + } + +diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c +index bd68f18b45..14b69a6f89 100644 +--- a/sysdeps/nptl/fork.c ++++ b/sysdeps/nptl/fork.c +@@ -55,7 +55,7 @@ __libc_fork (void) + but our current fork implementation is not. */ + bool multiple_threads = THREAD_GETMEM (THREAD_SELF, header.multiple_threads); + +- __run_fork_handlers (atfork_run_prepare); ++ __run_fork_handlers (atfork_run_prepare, multiple_threads); + + /* If we are not running multiple threads, we do not have to + preserve lock state. If fork runs from a signal handler, only +@@ -134,7 +134,7 @@ __libc_fork (void) + __rtld_lock_initialize (GL(dl_load_lock)); + + /* Run the handlers registered for the child. */ +- __run_fork_handlers (atfork_run_child); ++ __run_fork_handlers (atfork_run_child, multiple_threads); + } + else + { +@@ -149,7 +149,7 @@ __libc_fork (void) + } + + /* Run the handlers registered for the parent. */ +- __run_fork_handlers (atfork_run_parent); ++ __run_fork_handlers (atfork_run_parent, multiple_threads); + } + + return pid; +diff --git a/sysdeps/nptl/fork.h b/sysdeps/nptl/fork.h +index a1c3b26b68..99ed76034b 100644 +--- a/sysdeps/nptl/fork.h ++++ b/sysdeps/nptl/fork.h +@@ -52,10 +52,12 @@ enum __run_fork_handler_type + - atfork_run_child: run all the CHILD_HANDLER and unlocks the internal + lock. + - atfork_run_parent: run all the PARENT_HANDLER and unlocks the internal +- lock. */ +-extern void __run_fork_handlers (enum __run_fork_handler_type who) +- attribute_hidden; ++ lock. ++ ++ Perform locking only if DO_LOCKING. */ ++extern void __run_fork_handlers (enum __run_fork_handler_type who, ++ _Bool do_locking) attribute_hidden; + + /* C library side function to register new fork handlers. */ + extern int __register_atfork (void (*__prepare) (void), + +From 067fc32968b601493f4b247a3ac00caeea3f3d61 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 15 Feb 2019 21:27:01 +0100 +Subject: [PATCH] nptl: Fix invalid Systemtap probe in pthread_join [BZ #24211] +diff --git a/nptl/pthread_join_common.c b/nptl/pthread_join_common.c +index ecb78ffba5..366feb376b 100644 +--- a/nptl/pthread_join_common.c ++++ b/nptl/pthread_join_common.c +@@ -86,6 +86,7 @@ __pthread_timedjoin_ex (pthread_t threadid, void **thread_return, + pthread_cleanup_pop (0); + } + ++ void *pd_result = pd->result; + if (__glibc_likely (result == 0)) + { + /* We mark the thread as terminated and as joined. */ +@@ -93,7 +94,7 @@ __pthread_timedjoin_ex (pthread_t threadid, void **thread_return, + + /* Store the return value if the caller is interested. */ + if (thread_return != NULL) +- *thread_return = pd->result; ++ *thread_return = pd_result; + + /* Free the TCB. */ + __free_tcb (pd); +@@ -101,7 +102,7 @@ __pthread_timedjoin_ex (pthread_t threadid, void **thread_return, + else + pd->joinid = NULL; + +- LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd->result); ++ LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd_result); + + return result; + } + +From bc6f839fb4066be83272c735e662850af2595777 Mon Sep 17 00:00:00 2001 +From: Stefan Liebler +Date: Wed, 13 Mar 2019 10:45:35 +0100 +Subject: [PATCH] Fix output of LD_SHOW_AUXV=1. +diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c +index 5f6c679a3f..5d19b100b2 100644 +--- a/elf/dl-sysdep.c ++++ b/elf/dl-sysdep.c +@@ -328,14 +328,9 @@ _dl_show_auxv (void) + assert (AT_NULL == 0); + assert (AT_IGNORE == 1); + +- if (av->a_type == AT_HWCAP || av->a_type == AT_HWCAP2 +- || AT_L1I_CACHEGEOMETRY || AT_L1D_CACHEGEOMETRY +- || AT_L2_CACHEGEOMETRY || AT_L3_CACHEGEOMETRY) +- { +- /* These are handled in a special way per platform. */ +- if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0) +- continue; +- } ++ /* Some entries are handled in a special way per platform. */ ++ if (_dl_procinfo (av->a_type, av->a_un.a_val) == 0) ++ continue; + + if (idx < sizeof (auxvars) / sizeof (auxvars[0]) + && auxvars[idx].form != unknown) +diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h +index f542f7318f..dfc3b33a72 100644 +--- a/sysdeps/powerpc/dl-procinfo.h ++++ b/sysdeps/powerpc/dl-procinfo.h +@@ -225,7 +225,7 @@ _dl_procinfo (unsigned int type, unsigned long int word) + break; + } + default: +- /* This should not happen. */ ++ /* Fallback to generic output mechanism. */ + return -1; + } + _dl_printf ("\n"); +diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h +index 282b8c5117..64ee267fc7 100644 +--- a/sysdeps/sparc/dl-procinfo.h ++++ b/sysdeps/sparc/dl-procinfo.h +@@ -31,8 +31,8 @@ _dl_procinfo (unsigned int type, unsigned long int word) + { + int i; + +- /* Fallback to unknown output mechanism. */ +- if (type == AT_HWCAP2) ++ /* Fallback to generic output mechanism. */ ++ if (type != AT_HWCAP) + return -1; + + _dl_printf ("AT_HWCAP: "); +diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +index 66c00297b7..05c62c8687 100644 +--- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h ++++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +@@ -67,7 +67,7 @@ _dl_procinfo (unsigned int type, unsigned long int word) + break; + } + default: +- /* This should not happen. */ ++ /* Fallback to generic output mechanism. */ + return -1; + } + _dl_printf ("\n"); +diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +index 22b43431bc..0585cdaa9c 100644 +--- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h ++++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +@@ -30,8 +30,8 @@ _dl_procinfo (unsigned int type, unsigned long int word) + in the kernel sources. */ + int i; + +- /* Fallback to unknown output mechanism. */ +- if (type == AT_HWCAP2) ++ /* Fallback to generic output mechanism. */ ++ if (type != AT_HWCAP) + return -1; + + _dl_printf ("AT_HWCAP: "); +diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +index 19329a335b..d67fde368f 100644 +--- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h ++++ b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +@@ -32,8 +32,8 @@ _dl_procinfo (unsigned int type, unsigned long int word) + in the kernel sources. */ + int i; + +- /* Fallback to unknown output mechanism. */ +- if (type == AT_HWCAP2) ++ /* Fallback to generic output mechanism. */ ++ if (type != AT_HWCAP) + return -1; + + _dl_printf ("AT_HWCAP: "); + +From e28ad442e73b00ae2047d89c8cc7f9b2a0de5436 Mon Sep 17 00:00:00 2001 +From: TAMUKI Shoichi +Date: Sat, 2 Mar 2019 21:00:28 +0900 +Subject: [PATCH] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ + #24162] +diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP +index 1fd2fee44b..9bfbb2bb9b 100644 +--- a/localedata/locales/ja_JP ++++ b/localedata/locales/ja_JP +@@ -14951,7 +14951,7 @@ era "+:2:1990//01//01:+*::%EC%Ey";/ + "+:2:1927//01//01:1989//01//07::%EC%Ey";/ + "+:1:1926//12//25:1926//12//31::%EC";/ + "+:2:1913//01//01:1926//12//24::%EC%Ey";/ +- "+:2:1912//07//30:1912//12//31::%EC";/ ++ "+:1:1912//07//30:1912//12//31::%EC";/ + "+:6:1873//01//01:1912//07//29::%EC%Ey";/ + "+:1:0001//01//01:1872//12//31::%EC%Ey";/ + "+:1:-0001//12//31:-*::%EC%Ey" + +From 0941350c20a52447e53c5169354408e3db591f73 Mon Sep 17 00:00:00 2001 +From: TAMUKI Shoichi +Date: Tue, 2 Apr 2019 16:46:55 +0900 +Subject: [PATCH] ja_JP locale: Add entry for the new Japanese era [BZ #22964] +diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP +index 9bfbb2bb9b..c64aaaff55 100644 +--- a/localedata/locales/ja_JP ++++ b/localedata/locales/ja_JP +@@ -14946,7 +14946,9 @@ am_pm "";"" + + t_fmt_ampm "%p%I%M%S" + +-era "+:2:1990//01//01:+*::%EC%Ey";/ ++era "+:2:2020//01//01:+*::%EC%Ey";/ ++ "+:1:2019//05//01:2019//12//31::%EC";/ ++ "+:2:1990//01//01:2019//04//30::%EC%Ey";/ + "+:1:1989//01//08:1989//12//31::%EC";/ + "+:2:1927//01//01:1989//01//07::%EC%Ey";/ + "+:1:1926//12//25:1926//12//31::%EC";/ + +From 52b7cd6e9a701bb203023d56e84551943dc6a4c0 Mon Sep 17 00:00:00 2001 +From: Adam Maris +Date: Thu, 14 Mar 2019 16:51:16 -0400 +Subject: [PATCH] malloc: Check for large bin list corruption when inserting + unsorted chunk +diff --git a/malloc/malloc.c b/malloc/malloc.c +index feaf7ee0bf..ce771375b6 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -3876,10 +3876,14 @@ _int_malloc (mstate av, size_t bytes) + { + victim->fd_nextsize = fwd; + victim->bk_nextsize = fwd->bk_nextsize; ++ if (__glibc_unlikely (fwd->bk_nextsize->fd_nextsize != fwd)) ++ malloc_printerr ("malloc(): largebin double linked list corrupted (nextsize)"); + fwd->bk_nextsize = victim; + victim->bk_nextsize->fd_nextsize = victim; + } + bck = fwd->bk; ++ if (bck->fd != fwd) ++ malloc_printerr ("malloc(): largebin double linked list corrupted (bk)"); + } + } + else + +From c6177be4b92d5d7df50a785652d1912db511423e Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Wed, 15 May 2019 17:09:05 +0200 +Subject: [PATCH] Fix crash in _IO_wfile_sync (bug 20568) +diff --git a/libio/wfileops.c b/libio/wfileops.c +index 78f20486e5..bab2ba4892 100644 +--- a/libio/wfileops.c ++++ b/libio/wfileops.c +@@ -508,11 +508,12 @@ _IO_wfile_sync (FILE *fp) + generate the wide characters up to the current reading + position. */ + int nread; +- ++ size_t wnread = (fp->_wide_data->_IO_read_ptr ++ - fp->_wide_data->_IO_read_base); + fp->_wide_data->_IO_state = fp->_wide_data->_IO_last_state; + nread = (*cv->__codecvt_do_length) (cv, &fp->_wide_data->_IO_state, + fp->_IO_read_base, +- fp->_IO_read_end, delta); ++ fp->_IO_read_end, wnread); + fp->_IO_read_ptr = fp->_IO_read_base + nread; + delta = -(fp->_IO_read_end - fp->_IO_read_base - nread); + } + +From e3f828b8bd6e21922da8be8dee35edef09382d8d Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Wed, 15 May 2019 17:14:01 +0200 +Subject: [PATCH] dlfcn: Guard __dlerror_main_freeres with __libc_once_get + (once) [BZ#24476] +diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c +index 27376582d0..ca42c126c1 100644 +--- a/dlfcn/dlerror.c ++++ b/dlfcn/dlerror.c +@@ -72,9 +72,16 @@ __dlerror (void) + __libc_once (once, init); + + /* Get error string. */ +- result = (struct dl_action_result *) __libc_getspecific (key); +- if (result == NULL) +- result = &last_result; ++ if (static_buf != NULL) ++ result = static_buf; ++ else ++ { ++ /* init () has been run and we don't use the static buffer. ++ So we have a valid key. */ ++ result = (struct dl_action_result *) __libc_getspecific (key); ++ if (result == NULL) ++ result = &last_result; ++ } + + /* Test whether we already returned the string. */ + if (result->returned != 0) +@@ -230,13 +237,19 @@ free_key_mem (void *mem) + void + __dlerror_main_freeres (void) + { +- void *mem; + /* Free the global memory if used. */ + check_free (&last_result); +- /* Free the TSD memory if used. */ +- mem = __libc_getspecific (key); +- if (mem != NULL) +- free_key_mem (mem); ++ ++ if (__libc_once_get (once) && static_buf == NULL) ++ { ++ /* init () has been run and we don't use the static buffer. ++ So we have a valid key. */ ++ void *mem; ++ /* Free the TSD memory if used. */ ++ mem = __libc_getspecific (key); ++ if (mem != NULL) ++ free_key_mem (mem); ++ } + } + + struct dlfcn_hook *_dlfcn_hook __attribute__((nocommon)); + +From 95d66fecaabbc92ab53027e808f0fc1929c9f21a Mon Sep 17 00:00:00 2001 +From: Wilco Dijkstra +Date: Fri, 10 May 2019 16:38:21 +0100 +Subject: [PATCH] Fix tcache count maximum (BZ #24531) +diff --git a/malloc/malloc.c b/malloc/malloc.c +index ce771375b6..0abd653be2 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -2919,6 +2919,8 @@ typedef struct tcache_perthread_struct + tcache_entry *entries[TCACHE_MAX_BINS]; + } tcache_perthread_struct; + ++#define MAX_TCACHE_COUNT 127 /* Maximum value of counts[] entries. */ ++ + static __thread bool tcache_shutting_down = false; + static __thread tcache_perthread_struct *tcache = NULL; + +@@ -5124,8 +5126,11 @@ static inline int + __always_inline + do_set_tcache_count (size_t value) + { +- LIBC_PROBE (memory_tunable_tcache_count, 2, value, mp_.tcache_count); +- mp_.tcache_count = value; ++ if (value <= MAX_TCACHE_COUNT) ++ { ++ LIBC_PROBE (memory_tunable_tcache_count, 2, value, mp_.tcache_count); ++ mp_.tcache_count = value; ++ } + return 1; + } + +From 34fb5f61d3c3f4b8fc616ea259fa19168b58ecd4 Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Wed, 13 Feb 2019 01:20:51 +0000 +Subject: [PATCH] libio: do not attempt to free wide buffers of legacy streams + [BZ #24228] +diff --git a/libio/genops.c b/libio/genops.c +index 2a0d9b81df..11a15549e8 100644 +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -789,9 +789,16 @@ _IO_unbuffer_all (void) + + for (fp = (FILE *) _IO_list_all; fp; fp = fp->_chain) + { ++ int legacy = 0; ++ ++#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) ++ if (__glibc_unlikely (_IO_vtable_offset (fp) != 0)) ++ legacy = 1; ++#endif ++ + if (! (fp->_flags & _IO_UNBUFFERED) + /* Iff stream is un-orientated, it wasn't used. */ +- && fp->_mode != 0) ++ && (legacy || fp->_mode != 0)) + { + #ifdef _IO_MTSAFE_IO + int cnt; +@@ -805,7 +812,7 @@ _IO_unbuffer_all (void) + __sched_yield (); + #endif + +- if (! dealloc_buffers && !(fp->_flags & _IO_USER_BUF)) ++ if (! legacy && ! dealloc_buffers && !(fp->_flags & _IO_USER_BUF)) + { + fp->_flags |= _IO_USER_BUF; + +@@ -816,7 +823,7 @@ _IO_unbuffer_all (void) + + _IO_SETBUF (fp, NULL, 0); + +- if (fp->_mode > 0) ++ if (! legacy && fp->_mode > 0) + _IO_wsetb (fp, NULL, NULL, 0); + + #ifdef _IO_MTSAFE_IO +@@ -827,7 +834,8 @@ _IO_unbuffer_all (void) + + /* Make sure that never again the wide char functions can be + used. */ +- fp->_mode = -1; ++ if (! legacy) ++ fp->_mode = -1; + } + + #ifdef _IO_MTSAFE_IO + diff --git a/gnu/packages/patches/glibc-CVE-2019-7309.patch b/gnu/packages/patches/glibc-CVE-2019-7309.patch new file mode 100644 index 0000000000..f9f623830a --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2019-7309.patch @@ -0,0 +1,76 @@ +Fix . + +Taken from this upstream commit, sans ChangeLog updates and tests: +. + +diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S +index 1fc487caa5..1322bb3b92 100644 +--- a/sysdeps/x86_64/memcmp.S ++++ b/sysdeps/x86_64/memcmp.S +@@ -21,14 +21,18 @@ + + .text + ENTRY (memcmp) +- test %rdx, %rdx ++#ifdef __ILP32__ ++ /* Clear the upper 32 bits. */ ++ movl %edx, %edx ++#endif ++ test %RDX_LP, %RDX_LP + jz L(finz) + cmpq $1, %rdx +- jle L(finr1b) ++ jbe L(finr1b) + subq %rdi, %rsi + movq %rdx, %r10 + cmpq $32, %r10 +- jge L(gt32) ++ jae L(gt32) + /* Handle small chunks and last block of less than 32 bytes. */ + L(small): + testq $1, %r10 +@@ -156,7 +160,7 @@ L(A32): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + /* Pre-unroll to be ready for unrolled 64B loop. */ + testq $32, %rdi + jz L(A64) +@@ -178,7 +182,7 @@ L(A64): + movq %r11, %r10 + andq $-64, %r10 + cmpq %r10, %rdi +- jge L(mt32) ++ jae L(mt32) + + L(A64main): + movdqu (%rdi,%rsi), %xmm0 +@@ -216,7 +220,7 @@ L(mt32): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + + L(A32main): + movdqu (%rdi,%rsi), %xmm0 +@@ -254,7 +258,7 @@ L(ATR): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + testq $16, %rdi + jz L(ATR32) + +@@ -325,7 +329,7 @@ L(ATR64main): + movq %r11, %r10 + andq $-32, %r10 + cmpq %r10, %rdi +- jge L(mt16) ++ jae L(mt16) + + L(ATR32res): + movdqa (%rdi,%rsi), %xmm0 diff --git a/gnu/packages/patches/glibc-CVE-2019-9169.patch b/gnu/packages/patches/glibc-CVE-2019-9169.patch new file mode 100644 index 0000000000..029b4ddbd7 --- /dev/null +++ b/gnu/packages/patches/glibc-CVE-2019-9169.patch @@ -0,0 +1,22 @@ +Fix . + +Taken from this upstream commit, sans ChangeLog updates: +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=583dd860d5b833037175247230a328f0050dbfe9 + +diff --git a/posix/regexec.c b/posix/regexec.c +index 91d5a797b8..084b1222d9 100644 +--- a/posix/regexec.c ++++ b/posix/regexec.c +@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, + else if (naccepted) + { + char *buf = (char *) re_string_get_buffer (&mctx->input); +- if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, +- naccepted) != 0) ++ if (mctx->input.valid_len - *pidx < naccepted ++ || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, ++ naccepted) ++ != 0)) + return -1; + } + } diff --git a/gnu/packages/patches/glibc-bootstrap-system.patch b/gnu/packages/patches/glibc-bootstrap-system.patch index addeed6dbd..39eb47ef26 100644 --- a/gnu/packages/patches/glibc-bootstrap-system.patch +++ b/gnu/packages/patches/glibc-bootstrap-system.patch @@ -5,26 +5,24 @@ instead uses the hard-coded absolute file name of `bash'. --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c -@@ -134,7 +134,7 @@ do_system (const char *line) - INIT_LOCK (); +@@ -140,7 +140,7 @@ do_system (const char *line) + __posix_spawnattr_setflags (&spawn_attr, + POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK); - /* Exec the shell. */ -- (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ); -+ (void) __execvpe (SHELL_NAME, (char *const *) new_argv, __environ); - _exit (127); - } - else if (pid < (pid_t) 0) - +- status = __posix_spawn (&pid, SHELL_PATH, 0, &spawn_attr, ++ status = posix_spawnp (&pid, SHELL_NAME, 0, &spawn_attr, + (char *const[]){ (char*) SHELL_NAME, + (char*) "-c", + (char *) line, NULL }, --- a/libio/iopopen.c +++ b/libio/iopopen.c -@@ -145,7 +145,7 @@ _IO_new_proc_open (fp, command, mode) - __close_nocancel (fd); - } - -- execl ("/bin/sh", "sh", "-c", command, (char *) 0); -+ execlp ("sh", "sh", "-c", command, (char *) 0); - _exit (127); +@@ -85,7 +85,7 @@ spawn_process (posix_spawn_file_actions_t *fa, FILE *fp, const char *command, + return false; } - __close_nocancel (child_end); - + +- if (__posix_spawn (&((_IO_proc_file *) fp)->pid, _PATH_BSHELL, fa, 0, ++ if (posix_spawnp (&((_IO_proc_file *) fp)->pid, "sh", fa, 0, + (char *const[]){ (char*) "sh", (char*) "-c", + (char *) command, NULL }, __environ) != 0) + return false; diff --git a/gnu/packages/patches/glibc-supported-locales.patch b/gnu/packages/patches/glibc-supported-locales.patch index 2888052bb8..05865dc7be 100644 --- a/gnu/packages/patches/glibc-supported-locales.patch +++ b/gnu/packages/patches/glibc-supported-locales.patch @@ -2,11 +2,11 @@ This patch is taken from debian's glibc package (generate-supported.mk). It install the localedata/SUPPORTED file of the glibc. This file lists all the supported locales of the glibc. -diff --git a/localedata/Makefile.old b/localedata/Makefile -index 34877c0..a61d9b9 100644 ---- a/localedata/Makefile.old +diff --git a/localedata/Makefile b/localedata/Makefile +index 65079f9eb8..14818f84e0 100644 +--- a/localedata/Makefile +++ b/localedata/Makefile -@@ -91,7 +91,8 @@ endif +@@ -169,7 +169,8 @@ endif # Files to install. install-others := $(addprefix $(inst_i18ndir)/, \ $(addsuffix .gz, $(charmaps)) \ @@ -16,7 +16,7 @@ index 34877c0..a61d9b9 100644 tests: $(objdir)/iconvdata/gconv-modules -@@ -195,6 +196,14 @@ endif +@@ -380,6 +381,14 @@ endif include SUPPORTED @@ -28,6 +28,6 @@ index 34877c0..a61d9b9 100644 + $(make-target-directory) + $(INSTALL_DATA) LOCALES $@ + - INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) - - # Sometimes the whole collection of locale files should be installed. + INSTALL-SUPPORTED-LOCALE-ARCHIVE=$(addprefix install-archive-, $(SUPPORTED-LOCALES)) + INSTALL-SUPPORTED-LOCALE-FILES=$(addprefix install-files-, $(SUPPORTED-LOCALES)) + \ No newline at end of file diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f3bea4a51d..d834cda915 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -360,7 +360,9 @@ data types.") (format #f "TESTOPTS=-j~d" (parallel-job-count)) ;; Exclude the following test, which fails as of 3.7.3 (see: ;; https://bugs.python.org/issue35998). - " --exclude test_asyncio"))) + ;; Exclude test_email, which fails with glibc 2.29 and later + ;; (see ). + " --exclude test_asyncio test_email"))) ((#:phases phases) `(modify-phases ,phases ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it -- cgit v1.2.3 From 6661b025a6c58be6572fc66c5db1073f56af30b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 20:13:03 +0200 Subject: gnu: openssl@1.0: Update to 1.0.2s. * gnu/packages/tls.scm (openssl-1.0): Update to 1.0.2s. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 912069c26d..df04cbd9ab 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -374,7 +374,7 @@ required structures.") (package (inherit openssl) (name "openssl") - (version "1.0.2r") + (version "1.0.2s") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -386,7 +386,7 @@ required structures.") "/openssl-" version ".tar.gz"))) (sha256 (base32 - "1mnh27zf6r1bhm5d9fxqq9slv2gz0d9z2ij9i679b0wapa5x0ldf")) + "15mbmg8hf7s12vr3v2bdc0pi9y4pdbnsxhzk4fyyap42jaa5rgfa")) (patches (search-patches "openssl-runpath.patch" "openssl-c-rehash-in.patch")))) (outputs '("out" -- cgit v1.2.3 From 004b4056d490cf91cea5505b1a1c7d14c4215d86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 20:19:20 +0200 Subject: gnu: tzdata-for-tests: Update to 2019b. * gnu/packages/base.scm (tzdata-for-tests)[version, source, inputs]: Remove. --- gnu/packages/base.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 0a82592a3a..f26145cb0b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1253,25 +1253,7 @@ and daylight-saving rules.") (define-public tzdata-for-tests (hidden-package (package - (inherit tzdata) - (version "2018g") - (source (origin - (method url-fetch) - (uri (string-append - "https://data.iana.org/time-zones/releases/tzdata" - version ".tar.gz")) - (sha256 - (base32 - "05kayi3w9pvhj6ljx1hvwd0r8mxfzn436fjmwhx53xkj919xxpq2")))) - (inputs - `(("tzcode" ,(origin - (method url-fetch) - (uri (string-append - "http://data.iana.org/time-zones/releases/tzcode" - version ".tar.gz")) - (sha256 - (base32 - "09y44fzcdq3c06saa8iqqa0a59cyw6ni3p31ps0j1w3hcpxz8lxa"))))))))) + (inherit tzdata)))) (define-public libiconv (package -- cgit v1.2.3 From fb82d3472d8bf5c5690d943a82b1bfa93eea58dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 20:21:13 +0200 Subject: gnu: Remove redundant icu4c@64 package. * gnu/packages/icu4c.scm (icu4c-64): Remove variable. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change ICU4C-64 to ICU4C. --- gnu/packages/chromium.scm | 6 +----- gnu/packages/icu4c.scm | 16 ---------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 79828ef589..e357556956 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -714,11 +714,7 @@ from forcing GEXP-PROMISE." ("glib" ,glib) ("gtk+" ,gtk+) ("harfbuzz" ,harfbuzz) - - ;; Build against ICU 64 to prevent a localization problem in version 75 - ;; and later: . - ("icu4c" ,icu4c-64) - + ("icu4c" ,icu4c) ("jsoncpp" ,jsoncpp) ("lcms" ,lcms) ("libevent" ,libevent) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index bc53e7ee3c..ec65aff6cb 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -85,22 +85,6 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) -(define-public icu4c-64 - (package - (inherit icu4c) - (version "64.2") - (source (origin - (inherit (package-source icu4c)) - (uri (string-append - "http://download.icu-project.org/files/icu4c/" version "/icu4c-" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - "-src.tgz")) - (sha256 - (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) - (native-inputs - `(;; For tests. - ("python" ,python))))) - (define-public java-icu4j (package (name "java-icu4j") -- cgit v1.2.3 From fefd1a7bd45f949ca062ba984a58532093dab841 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:00:03 +0200 Subject: gnu: libuv: Update to 1.30.1. * gnu/packages/libevent.scm (libuv): Update to 1.30.1. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 1f7a839ba5..e9e165a2ad 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -99,14 +99,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.30.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1rybx7fy2751551bn2fjfys0aam9i6xz3yccn3gi0iw5qgalxnsm")))) + "12s7ifwgbfxblhv46inqa8c2lsnl8cgmvd37y4a4248xhkx1d0s6")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From e7a42c4abb2f6b81c4e42b7715dd4724370b713c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:17:53 +0200 Subject: gnu: boost: Remove GCC5 workaround. * gnu/packages/patches/boost-fix-icu-build.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/boost.scm (boost)[source](patches): Remove. [arguments]: Do not pass "cxxflags". --- gnu/local.mk | 1 - gnu/packages/boost.scm | 4 +- gnu/packages/patches/boost-fix-icu-build.patch | 53 -------------------------- 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 gnu/packages/patches/boost-fix-icu-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index da5262dcf6..b0d51406d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -698,7 +698,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 73b4cff4c8..6b8eebcecb 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -56,8 +56,7 @@ version-with-underscores ".tar.bz2")))) (sha256 (base32 - "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")) - (patches (search-patches "boost-fix-icu-build.patch")))) + "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) ("zlib" ,zlib))) @@ -69,7 +68,6 @@ `(#:tests? #f #:make-flags (list "threading=multi" "link=shared" - "cxxflags=-std=c++14" ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" diff --git a/gnu/packages/patches/boost-fix-icu-build.patch b/gnu/packages/patches/boost-fix-icu-build.patch deleted file mode 100644 index 556f91b8f7..0000000000 --- a/gnu/packages/patches/boost-fix-icu-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -Pass -std=c++11 when compiling files that include the ICU headers. Without -this flag, compilation fails and causes Boost's build system to remove ICU -support. Note that $(pkg-config --variable=CXXFLAGS icu-uc) includes -"-std=c++11", but Boost's build system does not use 'pkg-config'. - ---- boost_1_66_0/libs/locale/build/Jamfile.v2.orig 2017-12-13 18:56:44.000000000 -0500 -+++ boost_1_66_0/libs/locale/build/Jamfile.v2 2018-04-08 15:18:58.673025760 -0400 -@@ -65,8 +65,8 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin shared ; -- ICU64_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin64 shared ; -+ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin shared ; -+ ICU64_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin64 shared ; - } - else - { -@@ -121,6 +121,7 @@ - explicit icuuc icudt icuin ; - - ICU_OPTS = $(ICU_PATH)/include -+ -std=c++11 - icuuc/shared/shared - icudt/shared/shared - icuin/shared/shared -@@ -180,6 +181,7 @@ - explicit icuuc_64 icudt_64 icuin_64 ; - - ICU64_OPTS = $(ICU_PATH)/include -+ -std=c++11 - icuuc_64/shared/shared - icudt_64/shared/shared - icuin_64/shared/shared ---- boost_1_66_0/libs/regex/build/Jamfile.v2.orig 2017-12-13 18:56:48.000000000 -0500 -+++ boost_1_66_0/libs/regex/build/Jamfile.v2 2018-04-08 15:20:40.865532505 -0400 -@@ -44,7 +44,7 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; -+ ICU_OPTS = $(ICU_PATH)/include -std=c++11 $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; - } - else - { -@@ -78,6 +78,7 @@ - - ICU_OPTS = - $(ICU_PATH)/include -+ -std=c++11 - shared:icuuc/shared - shared:icudt/shared - shared:icuin/shared -- cgit v1.2.3 From 7ce9139f96b207a352c7e55f7ffe7dbd992b246a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:30:43 +0200 Subject: gnu: libarchive: Remove GCC5 workaround. * gnu/packages/backup.scm (libarchive)[arguments]: Remove <#:configure-flags>. --- gnu/packages/backup.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index beb3b09077..b7ca8e171e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -257,11 +257,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") (string-append "-L" zlib "/lib -lz")) (("-lbz2") (string-append "-L" bzip2 "/lib -lbz2"))) - #t)))) - - ;; libarchive/test/test_write_format_gnutar_filenames.c needs to be - ;; compiled with C99 or C11 or a gnu variant. - #:configure-flags '("CFLAGS=-O2 -g -std=c99"))) + #t)))))) (home-page "https://libarchive.org/") (synopsis "Multi-format archive and compression library") (description -- cgit v1.2.3 From c8f2050ab6d192abee199fd0a37b1fdf2ab9c281 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 21:55:55 +0200 Subject: gnu: gtkmm: Remove GCC5 workaround. * gnu/packages/gtk.scm (gtkmm)[arguments]: Remove <#:configure-flags>. * gnu/packages/gtk.scm (gtkmm-2)[arguments]: Likewise. --- gnu/packages/gtk.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e2e3b4365a..5098019506 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1115,10 +1115,7 @@ toolkit.") ("gtk+" ,gtk+) ("glibmm" ,glibmm))) (arguments - `(;; XXX: Tests require C++14 or later. Remove this when the default - ;; compiler is >= GCC6. - #:configure-flags '("CXXFLAGS=-std=gnu++14") - #:disallowed-references (,xorg-server-for-tests) + `(#:disallowed-references (,xorg-server-for-tests) #:phases (modify-phases %standard-phases (add-before 'check 'run-xvfb (lambda* (#:key inputs #:allow-other-keys) @@ -1154,8 +1151,7 @@ extensive documentation, including API reference and a tutorial.") (sha256 (base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) - (arguments - '(#:configure-flags '("CPPFLAGS=-std=c++11"))) ; required by libsigc++ + (arguments '()) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs `(("pangomm" ,pangomm) -- cgit v1.2.3 From 9f74ec98d34465770faec5a32685aaaee913f0bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:08:12 +0200 Subject: gnu: spirv-tools: Remove GCC7 input. * gnu/packages/vulkan.scm (spirv-tools)[native-inputs]: Remove GCC-7. [arguments]: Remove <#:phases>. --- gnu/packages/vulkan.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index c16535f704..160d2615ff 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -32,7 +32,6 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages pkg-config) @@ -96,18 +95,10 @@ and for the GLSL.std.450 extended instruction set. (build-system cmake-build-system) (arguments `(#:tests? #f ; FIXME: Tests fail. - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fixgcc7 - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))) #:configure-flags (list (string-append "-DSPIRV-Headers_SOURCE_DIR=" (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) - (native-inputs `(("gcc" ,gcc-7) - ("pkg-config" ,pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "https://github.com/KhronosGroup/SPIRV-Tools") (synopsis "API and commands for processing SPIR-V modules") -- cgit v1.2.3 From 29a4fe8b59003ee28df0e902525ef5de1b505fea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:09:16 +0200 Subject: gnu: vte-ng: Remove GCC7 input. * gnu/packages/gnome.scm (vte-ng)[native-inputs]: Remove GCC-7. [arguments]: Adjust accordingly. --- gnu/packages/gnome.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b7152a3aff..ad6a70848e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -85,7 +85,6 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -2339,7 +2338,6 @@ editors, IDEs, etc.") (native-inputs `(("gtk-doc" ,gtk-doc) ("gperf" ,gperf) - ("gcc" ,gcc-7) ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) @@ -2348,9 +2346,6 @@ editors, IDEs, etc.") `(#:phases (modify-phases %standard-phases (replace 'bootstrap (lambda _ - ;; Work around GCC7 problem: . - (for-each unsetenv '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) - (setenv "NOCONFIGURE" "true") (invoke "sh" "autogen.sh")))))) (synopsis "Enhanced VTE terminal widget") -- cgit v1.2.3 From 9880bba2c8ebb30c35e34b5ff4314ece8f759528 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:13:06 +0200 Subject: gnu: ncmpc: Remove GCC8 input. * gnu/packages/mpd.scm (ncmpc)[native-inputs]: Remove GCC-8. [arguments]: Remve <#:phases>. --- gnu/packages/mpd.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 654d1e4edc..f72256fe50 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -33,7 +33,6 @@ #:use-module (guix build-system python) #:use-module (gnu packages avahi) #:use-module (gnu packages boost) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -198,19 +197,8 @@ player daemon.") ;; Otherwise, they are installed incorrectly, in ;; '$out/share/man/man/man1'. (list (string-append "-Dmandir=" (assoc-ref %outputs "out") - "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'expand-C++-include-path - ;; Make /include/c++/ext/string_conversions.h find . - (lambda* (#:key inputs #:allow-other-keys) - (let* ((path "CPLUS_INCLUDE_PATH") - (gcc (assoc-ref inputs "gcc")) - (c++ (string-append gcc "/include/c++"))) - (setenv path (string-append c++ ":" (getenv path))) - #t)))))) - (inputs `(("gcc" ,gcc-8) ; for its C++14 support - ("boost" ,boost) + "/share")))) + (inputs `(("boost" ,boost) ("pcre" ,pcre) ("libmpdclient" ,libmpdclient) ("ncurses" ,ncurses))) -- cgit v1.2.3 From b80dd5e3e08b7814db3451363c75f33749f8b797 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:18:07 +0200 Subject: gnu: waybar: Remove GCC input. * gnu/packages/wm.scm (waybar)[native-inputs]: Remove GCC-TOOLCHAIN-7. [arguments]: Remove <#:phases>. --- gnu/packages/wm.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 90bc7fc883..1747619a87 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -89,7 +89,6 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages logging) #:use-module (gnu packages serialization) - #:use-module (gnu packages commencement) ; TODO remove when default gcc version >=7 #:use-module (guix download) #:use-module (guix git-download)) @@ -1337,15 +1336,7 @@ modules for building a Wayland compositor.") (build-system meson-build-system) (arguments `(#:configure-flags - (list (string-append "-Dout=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - ;; TODO remove when issue #30756 is resolved - (add-before 'configure 'fix-gcc - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t))))) + (list (string-append "-Dout=" (assoc-ref %outputs "out"))))) (inputs `(("fmt" ,fmt) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) @@ -1356,8 +1347,7 @@ modules for building a Wayland compositor.") ("pulseaudio" ,pulseaudio) ("spdlog" ,spdlog) ("wayland" ,wayland))) - (native-inputs `(("gcc-toolchain" ,gcc-toolchain-7) ; TODO remove when default gcc version >=7 - ("glib:bin" ,glib "bin") + (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Alexays/Waybar") -- cgit v1.2.3 From 554e234ebb5e2adc1b21e518a07a66ce2c723782 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jul 2019 23:23:06 +0200 Subject: gnu: libgnomecanvasmm: Remove GCC5 workaround. * gnu/packages/gnome.scm (libgnomecanvasmm)[arguments]: Remove. --- gnu/packages/gnome.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad6a70848e..d3a348ba89 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1820,8 +1820,6 @@ creating interactive structured graphics.") (base32 "0679hcnpam2gkag2i63sm0wdm35gwvzafnz1354mg6j5gzwpfrcr")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("CXXFLAGS=-std=c++11"))) ; required by gtkmm (propagated-inputs `(("libgnomecanvas" ,libgnomecanvas))) (native-inputs `(("gtkmm-2" ,gtkmm-2) -- cgit v1.2.3 From 0d75c64d7844bf35b4e1cd09bcc50b2a1005c191 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:19:46 +0200 Subject: gnu: glib-networking: Update to 2.60.3. * gnu/packages/gnome.scm (glib-networking): Update to 2.60.3. [source](patches): Remove. [arguments]<#:phases>: Remove. * gnu/packages/patches/glib-networking-connection.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 14 ++---- .../patches/glib-networking-connection.patch | 51 ---------------------- 3 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/glib-networking-connection.patch diff --git a/gnu/local.mk b/gnu/local.mk index b0d51406d9..bac1a92741 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -846,7 +846,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/glib-tests-timer.patch \ - %D%/packages/patches/glib-networking-connection.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ %D%/packages/patches/glibc-CVE-2016-3075.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d3a348ba89..ecf39334e5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2595,7 +2595,7 @@ library.") (define-public glib-networking (package (name "glib-networking") - (version "2.58.0") + (version "2.60.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" @@ -2603,18 +2603,10 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx")) - (patches (search-patches "glib-networking-connection.patch")))) + "1mfw44qpmwvz6yzj8c6spx6z357wrmkk15byrkc5byagd82860fm")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dlibproxy_support=false") - #:phases (modify-phases %standard-phases - (add-before 'check 'disable-TLSv1.3 - (lambda _ - ;; XXX: One test fails when TLS 1.3 is enabled, fixed in 2.60.0: - ;; . - (setenv "G_TLS_GNUTLS_PRIORITY" "NORMAL:-VERS-TLS1.3") - #t))))) + `(#:configure-flags '("-Dlibproxy_support=false"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) diff --git a/gnu/packages/patches/glib-networking-connection.patch b/gnu/packages/patches/glib-networking-connection.patch deleted file mode 100644 index f64b090ae5..0000000000 --- a/gnu/packages/patches/glib-networking-connection.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://gitlab.gnome.org/GNOME/glib-networking/issues/4 -https://gitlab.gnome.org/GNOME/glib-networking/commit/55daf3e5fd4bc9e4ebad1a9eab93f852dcbf527e.patch -This ultimately rejected work-around should be removed with the next -release, as the bug has supposedly been fixed for real. - - -From 55daf3e5fd4bc9e4ebad1a9eab93f852dcbf527e Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 19 Jul 2018 11:16:35 -0500 -Subject: [PATCH] Fix intermittent failures in missing client private key test - -Because our APIs do nice things like encapsulating the TLS connection -establishment, we have our test server writing to the client after -establishing the TCP connection, because the TLS connection is -established. It's fine in theory, but results in some weirdness like the -server seeing its write having completed successfully before TLS -connection establishment. Normally that's what happens and this test -passes (server sees no error), but sometimes the server sees that the -client has already failed and the test fails. - -This is unfortunate, and tricky to fix properly, so let's just remove -the bad check. The point of the test is to ensure that the TLS -connection is not established, and the client-side check is going to -have to be sufficient, because rewriting the test to wait for the TLS -connection to be established on the server side is quite tricky: my -naive attempt resulted in both sides waiting forever on the other. - -P.S. At no point in this test does the server ever examine the client -certificate. That's not quite what I expected when I added the test, but -it's fine. - -Fixes #4 ---- - tls/tests/connection.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tls/tests/connection.c b/tls/tests/connection.c -index 94645c3..390275d 100644 ---- a/tls/tests/connection.c -+++ b/tls/tests/connection.c -@@ -1125,7 +1125,6 @@ test_client_auth_fail_missing_client_private_key (TestConnection *test, - g_main_loop_run (test->loop); - - g_assert_error (test->read_error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED); -- g_assert_no_error (test->server_error); - } - - static void --- -2.18.1 - -- cgit v1.2.3 From cdeb3e39a82853cf44b63ab0216f18e871f89eb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:42:53 +0200 Subject: gnu: ganv: Remove GCC5 workaround. * gnu/packages/gtk.scm (ganv)[arguments]: Dont set CXXFLAGS. --- gnu/packages/gtk.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5098019506..2c751667dc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -297,8 +297,6 @@ functions which were removed.") (modify-phases %standard-phases (add-before 'configure 'set-flags (lambda* (#:key outputs #:allow-other-keys) - ;; Compile with C++11, required by gtkmm. - (setenv "CXXFLAGS" "-std=c++11") ;; Allow 'bin/ganv_bench' to find libganv-1.so. (setenv "LDFLAGS" (string-append "-Wl,-rpath=" -- cgit v1.2.3 From 7af60255ba318cea7bdc38bf1b3ac4fbee3bef92 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:45:39 +0200 Subject: gnu: non-sequencer: Remove GCC5 workaround. * gnu/packages/music.scm (non-sequencer)[arguments]: Remove <#:phases>. --- gnu/packages/music.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0a0677161a..08130d3c8e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1022,14 +1022,6 @@ Guile.") (%current-system)))) '("--disable-sse") '())) - #:phases - (modify-phases %standard-phases - (add-before - 'configure 'set-flags - (lambda _ - ;; Compile with C++11, required by libsigc++. - (setenv "CXXFLAGS" "-std=c++11") - #t))) #:python ,python-2)) (inputs `(("jack" ,jack-1) -- cgit v1.2.3 From ed59057b6e1d8533b85470054bcde91947346c50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:47:29 +0200 Subject: gnu: lvtk: Remove obsolete workarounds. * gnu/packages/audio.scm (lvtk)[arguments]: Remove <#:phases>. --- gnu/packages/audio.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index eff4edeb59..44318bc450 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1948,22 +1948,7 @@ software.") #:configure-flags (list (string-append "--boost-includes=" (assoc-ref %build-inputs "boost") - "/include")) - #:phases (modify-phases %standard-phases - (add-before - 'configure 'set-flags - (lambda* (#:key inputs #:allow-other-keys) - ;; See e.g. https://github.com/lvtk/lvtk/issues/21 - (setenv "LDFLAGS" - (string-append - "-L" (assoc-ref inputs "boost") "/lib " - "-lboost_system")) - ;; Needed for gtkmm - (substitute* '("src/wscript_build" - "examples/wscript_build") - (("cxxflags.*= \\[" line) - (string-append line "\"-std=c++11\", "))) - #t))))) + "/include")))) (inputs `(("boost" ,boost) ("gtkmm" ,gtkmm-2) -- cgit v1.2.3 From 3cd9350e08161df61bef10ff76944d4f6a9160ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 00:54:28 +0200 Subject: gnu: pavucontrol: Remove GCC5 workaround. * gnu/packages/pulseaudio.scm (pavucontrol)[arguments]: Remove. --- gnu/packages/pulseaudio.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 96d15bdf9c..5f8512716d 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -221,8 +221,6 @@ sound server.") (base32 "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("CXXFLAGS=-std=c++11"))) ; required by gtkmm (inputs `(("libcanberra" ,libcanberra) ("gtkmm" ,gtkmm) -- cgit v1.2.3 From 529c9ac5e0d2483a5eee14cf09e3db8fe2405103 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 01:00:33 +0200 Subject: gnu: nitrogen: Remove redundant configure flags. * gnu/packages/wm.scm (nitrogen)[arguments]: Remove. --- gnu/packages/wm.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1747619a87..871a6b0706 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1075,10 +1075,6 @@ project derived from the original Calm Window Manager.") ("glibmm" ,glibmm))) (native-inputs `(("pkg-config" ,pkg-config))) - (arguments - `(#:configure-flags (list - (string-append "--prefix=" %output) - "CXXFLAGS=-std=c++11"))) (home-page "http://projects.l3ib.org/nitrogen/") (synopsis "Background browser and setter for X windows") (description -- cgit v1.2.3 From d0521758c6065c2520071c2652b18e18fc05acf5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 01:04:06 +0200 Subject: gnu: polkit: Remove GCC5 workaround. * gnu/packages/polkit.scm (polkit)[arguments]<#:configure-flags>: Remove "CXXFLAGS". --- gnu/packages/polkit.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index ac24adef43..7cc35f1ed9 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -100,9 +100,6 @@ ("gobject-introspection" ,gobject-introspection))) (arguments `(#:configure-flags '("--sysconfdir=/etc" - ;; XXX: MozJS 60 requires the C++11 ABI or higher. - ;; Remove when the default compiler is >= GCC 6. - "CXXFLAGS=-std=gnu++11" "--enable-man-pages") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 7960bb27c5759ae5f927eaa66a1d5637ebfbe060 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 01:08:14 +0200 Subject: gnu: libtorrent-rasterbar: Remove GCC5 workaround. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]<#:configure-flags>: Remove "CXXFLAGS". --- gnu/packages/bittorrent.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 1e171dcb6a..e622170815 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -395,8 +395,7 @@ and will take advantage of multiple processor cores where possible.") (assoc-ref %build-inputs "boost") "/lib") "--enable-python-binding" - "--enable-tests" - "CXXFLAGS=-std=c++11") ; Use std::chrono instead of boost + "--enable-tests") #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 6002a0b635f821019fd7b10d4eefe7f4eb0eee58 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 15:39:30 +0200 Subject: gnu: libtirpc: Do not build 'libtirpc.a'. * gnu/packages/onc-rpc.scm (libtirpc)[arguments]: Add <#:configure-flags>. --- gnu/packages/onc-rpc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 8f66b07527..9646fbf4bd 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -45,7 +45,8 @@ "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-after 'unpack 'remote-dangling-symlink (lambda _ -- cgit v1.2.3 From f03cda4d1e4415a5c1e83b4c8280724cd0ffa05c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 15:40:28 +0200 Subject: gnu: lash: Add dependency on libtirpc. * gnu/packages/audio.scm (lash)[arguments]: Add <#:make-flags>. [inputs]: Add LIBTIRPC. --- gnu/packages/audio.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 44318bc450..b9217dfa53 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages ncurses) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages qt) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) @@ -1683,7 +1684,12 @@ to be plugged into a wide range of audio synthesis and recording packages.") "12z1vx3krrzsfccpah9xjs68900xvr7bw92wx8np5871i2yv47iw")))) (build-system gnu-build-system) (arguments - '(#:phases + '(;; Glibc no longer includes Sun RPC support, so tell the build system + ;; to use libtirpc instead. + #:make-flags (list (string-append "CFLAGS=-I" + (assoc-ref %build-inputs "libtirpc") + "/include/tirpc -ltirpc")) + #:phases (modify-phases %standard-phases ;; lashd embeds an ancient version of sigsegv so we just skip it (add-after 'unpack 'skip-lashd @@ -1696,6 +1702,7 @@ to be plugged into a wide range of audio synthesis and recording packages.") `(("bdb" ,bdb) ("gtk" ,gtk+-2) ("jack" ,jack-1) + ("libtirpc" ,libtirpc) ("readline" ,readline) ("python" ,python-2))) ;; According to pkg-config, packages depending on lash also need to have -- cgit v1.2.3 From 1ea1ce18ade18468e4c00a23ccfa75197c3b62ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 15:41:21 +0200 Subject: gnu: sdl2: Fix FTBFS with GCC7. * gnu/packages/sdl.scm (sdl2)[arguments]: Add <#:make-flags>. --- gnu/packages/sdl.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index b6b28b7d06..c012dbced1 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,6 +122,15 @@ joystick, and graphics hardware.") ((#:configure-flags flags) `(append '("--disable-wayland-shared" "--enable-video-kmsdrm" "--disable-kmsdrm-shared") + ,flags)) + ((#:make-flags flags ''()) + ;; Add the Fcitx header files to GCCs "system header" search path + ;; in order to suppress compiler warnings induced by those: + ;; .../include/fcitx-utils/utarray.h:178:9: error: ISO C90 forbids + ;; mixed declarations and code [-Werror=declaration-after-statement] + `(append (list (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "fcitx") + "/include")) ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems -- cgit v1.2.3 From 5ab605b9520e28657a1cdb8444c1ddc2b0731ada Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jul 2019 16:16:11 +0200 Subject: gnu: libxt: Update to 1.2.0. * gnu/packages/xorg.scm (libxt): Update to 1.2.0. * gnu/packages/patches/libxt-guix-search-paths.patch: Adjust for 1.2.0. While at it, trim spurious whitespaces. --- gnu/packages/patches/libxt-guix-search-paths.patch | 42 +++++++++++----------- gnu/packages/xorg.scm | 4 +-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/patches/libxt-guix-search-paths.patch b/gnu/packages/patches/libxt-guix-search-paths.patch index c618f48da5..5419edd1bd 100644 --- a/gnu/packages/patches/libxt-guix-search-paths.patch +++ b/gnu/packages/patches/libxt-guix-search-paths.patch @@ -1,26 +1,27 @@ ---- libXt-1.1.5/src/Intrinsic.c 2015-05-01 07:36:20.000000000 +0200 -+++ Intrinsic.c 2016-12-12 00:42:16.567388450 +0100 -@@ -1303,21 +1303,101 @@ +diff --git a/src/Intrinsic.c b/src/Intrinsic.c +index c9624ec..addcdba 100644 +--- a/src/Intrinsic.c ++++ b/src/Intrinsic.c +@@ -1312,21 +1312,101 @@ static void FillInLangSubs( } else (void) strcpy(*rest, string); } --/* ++ ++ + /* - * default path used if environment variable XFILESEARCHPATH - * is not defined. Also substitued for %D. - * The exact value should be documented in the implementation - * notes for any Xt implementation. -+ -+ -+/* + Return the default search path for the function -+ XtResolvePathname to use if XFILESEARCHPATH is ++ XtResolvePathname to use if XFILESEARCHPATH is + not defined. + + It returns the combination the set of values which are the 6 "stems" below, -+ prepended with "/run/current-system/profile", and $GUIX_PROFILE and ++ prepended with "/run/current-system/profile", and $GUIX_PROFILE and + "$HOME/.guix-profile" + -+ These values provide the default paths where Guix/GuixSD can expect ++ These values provide the default paths where Guix/GuixSD can expect + to find resources for installed packages. */ -static const char *implementation_default_path(void) @@ -28,11 +29,6 @@ { -#if defined(WIN32) - static char xfilesearchpath[] = ""; -- -- return xfilesearchpath; --#else -- return XFILESEARCHPATHDEFAULT; --#endif + static const char *search_path_default_stem[] = { + "/lib/X11/%L/%T/%N%C%S", + "/lib/X11/%l/%T/%N%C%S", @@ -55,7 +51,7 @@ + char *home = getenv ("HOME"); + char *guix_profile = getenv ("GUIX_PROFILE"); + -+ size_t bytesAllocd = SIZEOF_STEMS + 1; ++ size_t bytesAllocd = SIZEOF_STEMS + 1; + + /* This function is evaluated multiple times and the calling + code assumes that it is idempotent. So we must not allow @@ -72,7 +68,11 @@ + bytesAllocd += SIZEOF_STEMS; + bytesAllocd += 6 * (1 + strlen (guix_profile)); + } -+ + +- return xfilesearchpath; +-#else +- return XFILESEARCHPATHDEFAULT; +-#endif + if (home != NULL) + { + bytesAllocd += SIZEOF_STEMS; @@ -83,7 +83,7 @@ + if (path == NULL) _XtAllocError(NULL); + + memset (path, 0, bytesAllocd); -+ ++ + for (i = 0 ; i < 6 ; ++i) + { + strcat (path, current_profile); @@ -110,17 +110,17 @@ + + /* Remove final : */ + path[strlen(path) - 1] = '\0'; -+ ++ + return path; } -@@ -1345,7 +1425,7 @@ +@@ -1354,7 +1434,7 @@ _XtString XtResolvePathname( { XtPerDisplay pd; static const char *defaultPath = NULL; - const char *impl_default = implementation_default_path(); + const char *impl_default = guix_default_path(); - int idef_len = strlen(impl_default); + int idef_len = (int) strlen(impl_default); char *massagedPath; int bytesAllocd, bytesLeft; diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index bd84c1bf3e..1653810c0d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5304,7 +5304,7 @@ draggable titlebars and borders.") (define-public libxt (package (name "libxt") - (version "1.1.5") + (version "1.2.0") (source (origin (method url-fetch) @@ -5314,7 +5314,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6")) + "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk")) (patches (search-patches "libxt-guix-search-paths.patch")))) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From 6657b0711efea3ba3633529f94f5821a8ec9b217 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 4 Jul 2019 09:57:31 +0200 Subject: gnu: Remove ghc-parsec, ghc-stm, ghc-text, ghc-xhtml. These are ghc-8.4-bundled packages, removing to avoid build conflicts. * gnu/packages/haskell.scm (ghc-parsec, ghc-stm, ghc-text): Remove. * gnu/packages/haskell-web.scm (ghc-xhtml): Remove. * gnu/packages/agda.scm (agda)[inputs]: Remove ghc-stm and ghc-text. * gnu/packages/bioinformatics.scm (ngless)[inputs]: Remove ghc-parsec and ghc-text. * gnu/packages/haskell-apps.scm (darcs)[inputs]: Remove ghc-parsec. (git-annex)[inputs]: Remove ghc-stm and ghc-text. (ghc-sdl2)[inputs]: Remove ghc-text. (ghc-sdl2-image)[inputs]: Remove ghc-text. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml)[inputs]: Remove ghc-stm. (ghc-tasty)[inputs]: Remove ghc-stm. (ghc-tasty-rerun)[inputs]: Same. (ghc-quickcheck-instances)[inputs]: Remove ghc-text. (ghc-hedgehog)[inputs]: Remove ghc-stm. * gnu/packages/haskell-crypto.scm (ghc-asn1-encoding)[inputs]: Remove ghc-text. * gnu/packages/haskell-web.scm (ghc-tagsoup)[inputs]: Remove ghc-text. (ghc-cookie)[inputs]: Same. (ghc-http-types)[inputs]: Same. (ghc-http)[inputs]: Remove ghc-parsec. (ghc-http-client)[inputs]: Remove ghc-text. (ghc-http2)[inputs]: Remove ghc-stm. (ghc-http-conduit)[native-inputs]: Remove ghc-text. (ghc-wai)[inputs]: Same. (ghc-wai-extra)[inputs]: Same. (ghc-warp)[inputs]: Remove ghc-stm and ghc-text. (ghc-xss-sanitize)[native-inputs]: Remove ghc-text. (ghc-css-text)[inputs]: Same. (ghc-mime-types)[inputs]: Same. (ghc-blaze-html)[inputs]: Same. (ghc-aeson)[inputs]: Same. (ghc-aeson-pretty)[inputs]: Same. (ghc-aeson-qq)[inputs]: Remove ghc-text and ghc-parsec. (ghc-multipart)[inputs]: Remove ghc-parsec. (ghc-uri-encode)[inputs]: Remove ghc-text. (ghc-path-pieces)[inputs]: Same. (ghc-yesod-core)[inputs]: Remove ghc-text and ghc-parsec. (ghc-yesod-persistent)[inputs]: Remove ghc-text. (ghc-yesod-form)[inputs]: Same. (ghc-yesod)[inputs]: Same. (ghc-hxt-regex-xmlschema)[inputs]: Remove ghc-parsec and ghc-text. (ghc-hxt)[inputs]: Remove ghc-parsec. * gnu/packages/haskell.scm (ghc-convertible)[inputs]: Remove ghc-text. (ghc-double-conversion)[inputs]: Same. (ghc-tree-diff)[inputs]: Remove ghc-parsec and ghc-text. [native-inputs]: Remove ghc-parsec. (ghc-cgi)[inputs]: Remove ghc-parsec. (hlint)[inputs]: Remove ghc-text. (ghc-openglraw)[inputs]: Remove ghc-text. (ghc-opengl)[inputs]: Same. (ghc-streaming-commons)[inputs]: Remove ghc-stm and ghc-text. (ghc-hackage-security)[inputs]: Remove ghc-parsec. (cabal-install)[inputs]: Remove ghc-stm. (ghc-parsec-numbers)[inputs]: Remove ghc-parsec. (ghc-safesemaphore)[inputs]: Remove ghc-stm. (ghc-text-binary)[inputs]: Remove ghc-text. (ghc-hashable)[inputs]: Remove ghc-text. (ghc-transformers-base)[inputs]: Remove ghc-stm. (ghc-indents)[inputs]: Remove ghc-parsec. (ghc-regex-tdfa-rc)[inputs]: Same. (ghc-regex-tdfa-text)[inputs]: Same. (ghc-regex)[inputs]: Remove ghc-text. (ghc-parsers)[inputs]: Remove ghc-parsec and ghc-text. (ghc-attoparsec)[inputs]: Remove ghc-text. (ghc-attoparsec-bootstrap)[inputs]: Same. (ghc-zip-archive)[inputs]: Same. (ghc-polyparse)[inputs]: Same. (ghc-reducers)[inputs]: Same. (ghc-xml)[inputs]: Same. (ghc-feed)[inputs]: Same. (ghc-exceptions)[inputs]: Remove ghc-stm. (ghc-case-insensitive)[inputs]: Remove ghc-text. (ghc-megaparsec)[inputs]: Same. (ghc-network-uri)[inputs]: Remove ghc-parsec. (ghc-monad-control)[inputs]: Remove ghc-stm. (ghc-blaze-builder)[inputs]: Remove ghc-text. (ghc-blaze-markup)[inputs]: Same. (ghc-async)[inputs]: Remove ghc-stm. (ghc-invariant)[inputs]: Same. (ghc-statevar)[inputs]: Same. (ghc-lens)[inputs]: Remove ghc-text. (ghc-cheapskate)[inputs]: Same. (ghc-semigroups)[inputs]: Same. (ghc-semigroups-bootstrap)[inputs]: Same. (ghc-fast-logger)[inputs]: Same. (ghc-scientific)[inputs]: Same. (ghc-scientific-bootstrap)[inputs]: Same. (ghc-texmath)[inputs]: Remove ghc-parsec. (ghc-highlighting-kate)[inputs]: Same. (ghc-cmark)[inputs]: Remove ghc-text. (ghc-cmark-gfm)[inputs]: Same. (ghc-th-lift-instances)[inputs]: Same. (ghc-yaml)[inputs]: Same. (ghc-hslua)[inputs]: Same. (ghc-hslua-module-text)[inputs]: Same. (ghc-skylighting-core)[inputs]: Same. (ghc-doctemplates)[inputs]: Remove ghc-text and ghc-parsec. (ghc-pandoc)[inputs]: Same. (ghc-typed-process)[inputs]: Remove ghc-stm. (ghc-conduit-extra)[inputs]: Remove ghc-stm and ghc-text. (ghc-xml-types)[inputs]: Remove ghc-text. (ghc-xml-conduit)[inputs]: Same. (ghc-pandoc-citeproc)[inputs]: Remove ghc-text and ghc-parsec. (ghc-regex-tdfa)[inputs]: Remove ghc-parsec. (ghc-wl-pprint-text)[inputs]: Remove ghc-text. (ghc-graphviz)[inputs]: Same. (ghc-system-filepath-bootstrap)[inputs]: Same. (ghc-system-fileio-bootstrap)[inputs]: Same. (ghc-shelly)[inputs]: Same. (ghc-chell)[inputs]: Same. (ghc-system-filepath)[inputs]: Same. (ghc-system-fileio)[inputs]: Same. (ghc-fsnotify)[inputs]: Same. (ghc-json)[inputs]: Remove ghc-text and ghc-parsec. (ghc-esqueleto)[inputs]: Remove ghc-text. (shellcheck)[inputs]: Remove ghc-parsec. (ghc-errors)[inputs]: Remove ghc-text. (ghc-chunked-data)[inputs]: Same. (ghc-uuid-types)[inputs]: Same. (ghc-uuid)[inputs]: Same. (ghc-rebase)[inputs]: Remove ghc-stm and ghc-text. (ghc-foldl)[inputs]: Remove ghc-text. (ghc-mono-traversable)[inputs]: Same. (ghc-conduit-combinators)[inputs]: Same. (ghc-aws)[inputs]: Same. (ghc-stm-chans)[inputs]: Remove ghc-stm. (ghc-monad-logger)[inputs]: Remove ghc-text and ghc-stm. (ghc-shakespeare)[inputs]: Remove ghc-parsec and ghc-text. (ghc-resource-pool)[inputs]: Remove ghc-stm. (ghc-attoparsec-iso8601)[inputs]: Remove ghc-text. (ghc-http-api-data)[inputs]: Same. (ghc-persistent)[inputs]: Same. (ghc-aeson-compat)[inputs]: Same. (ghc-persistent-template)[inputs]: Same. (ghc-unliftio)[inputs]: Remove ghc-stm. (ghc-persistent-sqlite)[native-inputs]: Remove ghc-text. (ghc-bytes)[inputs]: Same. (ghc-missingh)[inputs]: Remove ghc-parsec. (ghc-rio)[inputs]: Remove ghc-text. (ghc-cairo)[inputs]: Same. (ghc-atomic-write)[inputs]: Remove ghc-text. [native-inputs]: Same. (ghc-stm-conduit)[inputs]: Remove ghc-stm. (ghc-conduit-algorithms)[inputs]: Same. (ghc-interpolate)[native-inputs]: Remove ghc-text. (ghc-hpack)[inputs]: Same. (ghc-inline-c)[inputs]: Remove ghc-parsec. (ghc-configurator)[inputs]: Remove ghc-text. (ghc-c2hs)[native-inputs]: Same. (ghc-libmpd)[inputs]: Same. (ghc-concurrent-output)[inputs]: Remove ghc-stm. * gnu/packages/idris.scm (idris)[inputs]: Remove ghc-text. * gnu/packages/wm.scm (xmobar)[inputs]: Remove ghc-parsec and ghc-stm. Signed-off-by: Ricardo Wurmus --- gnu/packages/agda.scm | 2 - gnu/packages/bioinformatics.scm | 2 - gnu/packages/haskell-apps.scm | 5 - gnu/packages/haskell-check.scm | 7 +- gnu/packages/haskell-crypto.scm | 3 +- gnu/packages/haskell-web.scm | 79 ++--------- gnu/packages/haskell.scm | 295 ++++++---------------------------------- gnu/packages/idris.scm | 1 - gnu/packages/wm.scm | 2 - 9 files changed, 54 insertions(+), 342 deletions(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 646595705b..0f9b4299c3 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -64,9 +64,7 @@ ("ghc-uri-encode" ,ghc-uri-encode) ("ghc-parallel" ,ghc-parallel) ("ghc-regex-tdfa" ,ghc-regex-tdfa) - ("ghc-stm" ,ghc-stm) ("ghc-strict" ,ghc-strict) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-zlib" ,ghc-zlib))) (arguments diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9a30a0eaff..719ede495b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13973,13 +13973,11 @@ datasets.") ("ghc-intervalmap" ,ghc-intervalmap) ("ghc-missingh" ,ghc-missingh) ("ghc-optparse-applicative" ,ghc-optparse-applicative) - ("ghc-parsec" ,ghc-parsec) ("ghc-regex" ,ghc-regex) ("ghc-safe" ,ghc-safe) ("ghc-safeio" ,ghc-safeio) ("ghc-strict" ,ghc-strict) ("ghc-tar" ,ghc-tar) - ("ghc-text" ,ghc-text) ("ghc-unliftio" ,ghc-unliftio) ("ghc-unliftio-core" ,ghc-unliftio-core) ("ghc-vector" ,ghc-vector) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index d675863090..e01f796178 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -99,7 +99,6 @@ ("ghc-html" ,ghc-html) ("ghc-mmap" ,ghc-mmap) ("ghc-old-time" ,ghc-old-time) - ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) ("ghc-regex-applicative" ,ghc-regex-applicative) ("ghc-regex-compat-tdfa" ,ghc-regex-compat-tdfa) @@ -242,10 +241,8 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. ("ghc-securemem" ,ghc-securemem) ("ghc-socks" ,ghc-socks) ("ghc-split" ,ghc-split) - ("ghc-stm" ,ghc-stm) ("ghc-stm-chans" ,ghc-stm-chans) ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) @@ -285,7 +282,6 @@ used to keep a folder in sync between computers.") `(("ghc-exceptions" ,ghc-exceptions) ("ghc-linear" ,ghc-linear) ("ghc-statevar" ,ghc-statevar) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("sdl2" ,sdl2))) (native-inputs @@ -347,7 +343,6 @@ programming.") (build-system haskell-build-system) (inputs `(("ghc-sdl2" ,ghc-sdl2) - ("ghc-text" ,ghc-text) ("sdl2-image" ,sdl2-image))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 9b010fd5eb..98d5c064ff 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -54,7 +54,6 @@ (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) ("ghc-xml" ,ghc-xml) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) (home-page @@ -194,8 +193,7 @@ timer functions of different operating systems via a unified API.") "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-tagged" ,ghc-tagged) + `(("ghc-tagged" ,ghc-tagged) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-unbounded-delays" ,ghc-unbounded-delays) @@ -301,7 +299,6 @@ test-framework.") `(("ghc-optparse-applicative" ,ghc-optparse-applicative) ("ghc-reducers" ,ghc-reducers) ("ghc-split" ,ghc-split) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-tasty" ,ghc-tasty))) (home-page "https://github.com/ocharles/tasty-rerun") @@ -364,7 +361,6 @@ development.") ("ghc-old-time" ,ghc-old-time) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uuid-types" ,ghc-uuid-types) @@ -851,7 +847,6 @@ implementations of cryptographic ciphers.") ("ghc-random" ,ghc-random) ("ghc-resourcet" ,ghc-resourcet) ("ghc-semigroups" ,ghc-semigroups) - ("ghc-stm" ,ghc-stm) ("ghc-th-lift" ,ghc-th-lift) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-wl-pprint-annotated" diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 8d28a77fc1..28a1647fd1 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -69,8 +69,7 @@ format.") (build-system haskell-build-system) (inputs `(("ghc-hourglass" ,ghc-hourglass) - ("ghc-asn1-types" ,ghc-asn1-types) - ("ghc-text" ,ghc-text))) + ("ghc-asn1-types" ,ghc-asn1-types))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 6b7103562f..4bb790d93c 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -47,7 +47,6 @@ (base32 "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "http://community.haskell.org/~ndm/tagsoup/") @@ -80,7 +79,6 @@ for screen-scraping.") (inputs `(("ghc-old-locale" ,ghc-old-locale) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) @@ -136,8 +134,7 @@ requests, and the library is intended for implementing Ajax APIs.") ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) ("hspec-discover" ,hspec-discover))) (inputs - `(("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-text" ,ghc-text))) + `(("ghc-case-insensitive" ,ghc-case-insensitive))) (home-page "https://github.com/aristidb/http-types") (synopsis "Generic HTTP types for Haskell") (description "This package provides generic HTTP types for Haskell (for @@ -169,7 +166,6 @@ both client and server code).") ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-http-types" ,ghc-http-types) ("ghc-old-time" ,ghc-old-time) - ("ghc-parsec" ,ghc-parsec) ("ghc-puremd5" ,ghc-puremd5) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) @@ -215,7 +211,6 @@ responses coming back.") ("ghc-network-uri" ,ghc-network-uri) ("ghc-random" ,ghc-random) ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-hspec" ,ghc-hspec))) @@ -308,13 +303,12 @@ Date in Haskell.") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-word8" ,ghc-word8) - ("ghc-psqueues" ,ghc-psqueues) - ("ghc-stm" ,ghc-stm))) - (native-inputs - `(("ghc-glob" ,ghc-glob) - ("ghc-hspec" ,ghc-hspec) - ("ghc-doctest" ,ghc-doctest) - ("hspec-discover" ,hspec-discover))) + ("ghc-psqueues" ,ghc-psqueues))) + (native-inputs + `(("ghc-glob" ,ghc-glob) + ("ghc-hspec" ,ghc-hspec) + ("ghc-doctest" ,ghc-doctest) + ("hspec-discover" ,hspec-discover))) (home-page "https://github.com/kazu-yamamoto/http2") (synopsis "HTTP/2 library including frames, priority queues and HPACK") (description "This package provides a HTTP/2.0 library including frames @@ -358,7 +352,6 @@ and HPACK. Currently HTTP/2 16 framing and HPACK 10 is supported.") ("ghc-connection" ,ghc-connection) ("ghc-warp-tls" ,ghc-warp-tls) ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-conduit" ,ghc-conduit) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-case-insensitive" ,ghc-case-insensitive) @@ -402,7 +395,6 @@ which allow you to avoid direct usage of conduits.") ("ghc-vault" ,ghc-vault) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-network" ,ghc-network) - ("ghc-text" ,ghc-text) ("ghc-http-types" ,ghc-http-types))) (native-inputs `(("hspec-discover" ,hspec-discover) @@ -482,7 +474,6 @@ communication between web applications and web servers.") ("ghc-void" ,ghc-void) ("ghc-wai" ,ghc-wai) ("ghc-http-types" ,ghc-http-types) - ("ghc-text" ,ghc-text) ("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-unix-compat" ,ghc-unix-compat) @@ -569,9 +560,7 @@ transfers.") ("ghc-http-types" ,ghc-http-types) ("ghc-iproute" ,ghc-iproute) ("ghc-network" ,ghc-network) - ("ghc-stm" ,ghc-stm) ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-text" ,ghc-text) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-vault" ,ghc-vault) ("ghc-wai" ,ghc-wai) @@ -670,8 +659,7 @@ a WAI handler, via the native Haskell TLS implementation.") ("ghc-css-text" ,ghc-css-text) ("ghc-network-uri" ,ghc-network-uri))) (native-inputs - `(("ghc-text" ,ghc-text) - ("ghc-attoparsec" ,ghc-attoparsec) + `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/yesodweb/haskell-xss-sanitize") @@ -697,8 +685,7 @@ attacks.") "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-attoparsec" ,ghc-attoparsec) + `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "http://www.yesodweb.com/") @@ -720,8 +707,6 @@ Haskell.") (base32 "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "https://github.com/yesodweb/wai") (synopsis "Basic MIME type handling types and functions") (description @@ -751,28 +736,6 @@ Haskell.") documents.") (license license:bsd-3))) -(define-public ghc-xhtml - (package - (name "ghc-xhtml") - (version "3000.2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xhtml/xhtml-" - version - ".tar.gz")) - (sha256 - (base32 - "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w")))) - (build-system haskell-build-system) - (home-page "https://github.com/haskell/xhtml") - (synopsis "XHTML combinator library") - (description - "This package provides combinators for producing XHTML 1.0, including the -Strict, Transitional and Frameset variants.") - (license license:bsd-3))) - (define-public ghc-blaze-html (package (name "ghc-blaze-html") @@ -789,7 +752,6 @@ Strict, Transitional and Frameset variants.") (build-system haskell-build-system) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text) ("ghc-blaze-markup" ,ghc-blaze-markup))) (native-inputs `(("ghc-hunit" ,ghc-hunit) @@ -825,7 +787,6 @@ Strict, Transitional and Frameset variants.") ("ghc-hashable" ,ghc-hashable) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-th-abstraction" ,ghc-th-abstraction) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) @@ -867,7 +828,6 @@ naming: in Greek mythology, Aeson was the father of Jason.)") ("ghc-base-compat" ,ghc-base-compat) ("ghc-scientific" ,ghc-scientific) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-cmdargs" ,ghc-cmdargs))) @@ -897,12 +857,10 @@ essentially the opposite of pretty-printing.") (build-system haskell-build-system) (inputs `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-text" ,ghc-text) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-scientific" ,ghc-scientific) ("ghc-vector" ,ghc-vector) ("ghc-aeson" ,ghc-aeson) - ("ghc-parsec" ,ghc-parsec) ("ghc-haskell-src-meta" ,ghc-haskell-src-meta))) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -931,8 +889,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-stringsearch" ,ghc-stringsearch))) + `(("ghc-stringsearch" ,ghc-stringsearch))) (home-page "http://www.github.com/silkapp/multipart") (synopsis @@ -956,8 +913,7 @@ of a JSON value into a @code{Data.Aeson.Value}.") "11miwb5vvnn17m92ykz1pzg9x6s8fbpz3mmsyqs2s4b3mn55haz8")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string) + `(("ghc-utf8-string" ,ghc-utf8-string) ("ghc-network-uri" ,ghc-network-uri))) (home-page "https://hackage.haskell.org/package/uri-encode") (synopsis "Unicode aware uri-encoding") @@ -978,7 +934,6 @@ of a JSON value into a @code{Data.Aeson.Value}.") (base32 "0vx3sivcsld76058925hym2j6hm3g71f0qjr7v59f1g2afgx82q8")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-hspec" ,ghc-hspec) ("ghc-quickcheck" ,ghc-quickcheck))) @@ -1067,7 +1022,6 @@ avoid any issues with characters.") (build-system haskell-build-system) (inputs `(("ghc-wai" ,ghc-wai) ("ghc-extra" ,ghc-extra) - ("ghc-text" ,ghc-text) ("ghc-shakespeare" ,ghc-shakespeare) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-clientsession" ,ghc-clientsession) @@ -1081,7 +1035,6 @@ avoid any issues with characters.") ("ghc-cookie" ,ghc-cookie) ("ghc-http-types" ,ghc-http-types) ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-parsec" ,ghc-parsec) ("ghc-vector" ,ghc-vector) ("ghc-aeson" ,ghc-aeson) ("ghc-fast-logger" ,ghc-fast-logger) @@ -1147,8 +1100,7 @@ functions, widgets, etc.") (native-inputs `(("ghc-hspec" ,ghc-hspec) ("ghc-wai-extra" ,ghc-wai-extra) ("ghc-yesod-core" ,ghc-yesod-core) - ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) - ("ghc-text" ,ghc-text))) + ("ghc-persistent-sqlite" ,ghc-persistent-sqlite))) (home-page "http://www.yesodweb.com/") (synopsis "Helpers for using Persistent from Yesod") (description "This Haskell package provides helpers for using Persistent @@ -1179,7 +1131,6 @@ from Yesod.") ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-email-validate" ,ghc-email-validate) - ("ghc-text" ,ghc-text) ("ghc-wai" ,ghc-wai) ("ghc-blaze-html" ,ghc-blaze-html) ("ghc-blaze-markup" ,ghc-blaze-markup) @@ -1226,7 +1177,6 @@ providing richtext field using Nic editor. ") ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-yaml" ,ghc-yaml) - ("ghc-text" ,ghc-text) ("ghc-monad-logger" ,ghc-monad-logger) ("ghc-fast-logger" ,ghc-fast-logger) ("ghc-conduit" ,ghc-conduit) @@ -1309,8 +1259,6 @@ ignored.") (build-system haskell-build-system) (inputs `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) - ("ghc-parsec" ,ghc-parsec) - ("ghc-text" ,ghc-text) ("ghc-hunit" ,ghc-hunit))) (home-page "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema") (synopsis "Regular expression library for W3C XML Schema regular expressions") @@ -1336,8 +1284,7 @@ derivations of regular expressions.") "1qq3ykgn355rx242xjcbqqksgvwr6k2fdj5phw4iv28qqxff6m8d")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-hxt-charproperties" ,ghc-hxt-charproperties) + `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) ("ghc-hxt-unicode" ,ghc-hxt-unicode) ("ghc-hxt-regex-xmlschema" ,ghc-hxt-regex-xmlschema) ("ghc-network-uri" ,ghc-network-uri))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 17fddc1965..091e52323e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -607,8 +607,7 @@ determine the hostname.") (build-system haskell-build-system) (inputs `(("ghc-old-time" ,ghc-old-time) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-text" ,ghc-text))) + ("ghc-old-locale" ,ghc-old-locale))) (home-page "https://hackage.haskell.org/package/convertible") (synopsis "Typeclasses and instances for converting between types") (description @@ -633,7 +632,6 @@ function performs the conversion you desire.") (base32 "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) @@ -939,12 +937,10 @@ efficient memo functions using tries.") ("ghc-generics-sop" ,ghc-generics-sop) ("ghc-hashable" ,ghc-hashable) ("ghc-memotrie" ,ghc-memotrie) - ("ghc-parsec" ,ghc-parsec) ("ghc-parsers" ,ghc-parsers) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-scientific" ,ghc-scientific) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-uuid-types" ,ghc-uuid-types) ("ghc-vector" ,ghc-vector))) @@ -953,7 +949,6 @@ efficient memo functions using tries.") ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) - ("ghc-parsec" ,ghc-parsec) ("ghc-trifecta" ,ghc-trifecta) ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-golden" ,ghc-tasty-golden) @@ -1254,8 +1249,7 @@ tool lex or flex for C/C++.") (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") "QuickCheck >= 2.8.1 && < 2.12"))))))) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-exceptions" ,ghc-exceptions) + `(("ghc-exceptions" ,ghc-exceptions) ("ghc-multipart" ,ghc-multipart) ("ghc-network-uri" ,ghc-network-uri) ("ghc-network" ,ghc-network))) @@ -1491,7 +1485,6 @@ specify refactorings without depending on GHC.") ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-yaml" ,ghc-yaml) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-data-default" ,ghc-data-default) ("ghc-cmdargs" ,ghc-cmdargs) ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) @@ -1709,8 +1702,7 @@ arithmetic.") (inputs `(("ghc-half" ,ghc-half) ("ghc-fixed" ,ghc-fixed) - ("glu" ,glu) - ("ghc-text" ,ghc-text))) + ("glu" ,glu))) (home-page "https://www.haskell.org/haskellwiki/Opengl") (synopsis "Raw Haskell bindings for the OpenGL graphics system") (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 @@ -1791,8 +1783,7 @@ basis for a nicer interface.") "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-objectname" ,ghc-objectname) + `(("ghc-objectname" ,ghc-objectname) ("ghc-gluraw" ,ghc-gluraw) ("ghc-statevar" ,ghc-statevar) ("ghc-openglraw" ,ghc-openglraw))) @@ -1822,8 +1813,6 @@ version 1.3).") ("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) - ("ghc-stm" ,ghc-stm) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) @@ -2057,7 +2046,6 @@ MinTTY and other consoles.") ("ghc-ed25519" ,ghc-ed25519) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) - ("ghc-parsec" ,ghc-parsec) ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (native-inputs @@ -2137,7 +2125,6 @@ Unix systems.") ("ghc-network" ,ghc-network) ("ghc-random" ,ghc-random) ("ghc-resolv" ,ghc-resolv) - ("ghc-stm" ,ghc-stm) ("ghc-tar" ,ghc-tar) ("ghc-zlib" ,ghc-zlib))) (home-page "https://www.haskell.org/cabal/") @@ -2185,8 +2172,6 @@ configuration. This library provides the common bits for writing custom (sha256 (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) (build-system haskell-build-system) - (inputs - `(("ghc-parsec" ,ghc-parsec))) (home-page "https://hackage.haskell.org/package/parsec-numbers") (synopsis "Utilities for parsing numbers from strings") (description @@ -2400,34 +2385,6 @@ suitable for most tasks and for the few cases where more control is needed it provides access to the full zlib feature set.") (license license:bsd-3))) -(define-public ghc-stm - (package - (name "ghc-stm") - (version "2.4.5.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/stm/stm-" - version - ".tar.gz")) - (sha256 - (base32 - "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/stm") - (synopsis "Software Transactional Memory") - (description - "Software Transactional Memory, or STM, is an abstraction for concurrent -communication. The main benefits of STM are composability and modularity. -That is, using STM you can write concurrent abstractions that can be easily -composed with any other abstraction built using STM, without exposing the -details of how your abstraction ensures safety. This is typically not the -case with other forms of concurrent communication, such as locks or -@code{MVar}s.") - (license license:bsd-3))) - (define-public ghc-parallel (package (name "ghc-parallel") @@ -2463,8 +2420,6 @@ case with other forms of concurrent communication, such as locks or (base32 "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) (build-system haskell-build-system) - (inputs - `(("ghc-stm" ,ghc-stm))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/ChrisKuklewicz/SafeSemaphore") @@ -2474,38 +2429,6 @@ used in place of @code{QSem}, @code{QSemN}, and @code{SampleVar}, all of which are not exception safe and can be broken by @code{killThread}.") (license license:bsd-3))) -(define-public ghc-text - (package - (name "ghc-text") - (version "1.2.3.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/text/text-" - version - ".tar.gz")) - (sha256 - (base32 - "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10")))) - (build-system haskell-build-system) - ;; The test dependencies depend on ghc-text: ghc-test-framework -> ghc-xml -> ghc-text - (arguments `(#:tests? #f)) - (inputs - `(("ghc-random" ,ghc-random))) - (home-page "https://github.com/bos/text") - (synopsis "Efficient packed Unicode text type library") - (description - "An efficient packed, immutable Unicode text type (both strict and -lazy), with a powerful loop fusion optimization framework. - -The @code{Text} type represents Unicode character strings, in a time and -space-efficient manner. This package provides text processing -capabilities that are optimized for performance critical use, both -in terms of large data quantities and high speed.") - (license license:bsd-3))) - (define-public ghc-text-binary (package (name "ghc-text-binary") @@ -2520,7 +2443,6 @@ in terms of large data quantities and high speed.") (base32 "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (home-page "https://github.com/kawu/text-binary") (synopsis "Binary instances for text types") (description @@ -2566,8 +2488,7 @@ IO operations.") "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-random" ,ghc-random))) + `(("ghc-random" ,ghc-random))) (native-inputs `(("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) @@ -2749,8 +2670,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.") "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://hackage.haskell.org/package/transformers-compat") (synopsis @@ -2850,8 +2770,7 @@ isn't available, portable implementations are used.") ;; This package needs an older version of tasty. (arguments '(#:tests? #f)) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-concatenative" ,ghc-concatenative))) + `(("ghc-concatenative" ,ghc-concatenative))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) @@ -2999,8 +2918,7 @@ Haskell library @code{regex-base}.") "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3")))) (build-system haskell-build-system) (inputs - `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-parsec" ,ghc-parsec))) + `(("ghc-regex-base" ,ghc-regex-base))) (home-page "https://hackage.haskell.org/package/regex-tdfa") (synopsis "Tagged DFA regex engine for Haskell") @@ -3023,8 +2941,7 @@ Haskell library @code{regex-base}.") "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-regex-base" ,ghc-regex-base) + `(("ghc-regex-base" ,ghc-regex-base) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "http://hackage.haskell.org/package/regex-tdfa-text") @@ -3064,7 +2981,6 @@ Haskell library @code{regex-base}.") ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-regex-tdfa-text" ,ghc-regex-tdfa-text) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string))) @@ -3099,10 +3015,8 @@ copious examples.") (inputs `(("ghc-base-orphans" ,ghc-base-orphans) ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-parsec" ,ghc-parsec) ("ghc-scientific" ,ghc-scientific) ("ghc-charset" ,ghc-charset) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers))) (home-page "https://github.com/ekmett/parsers/") (synopsis "Parsing combinators") @@ -3203,8 +3117,7 @@ with slicing and Clang-style colored diagnostics.") ((", testProperty \"satisfyWith\" satisfyWith") ""))))))) (inputs - `(("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text))) + `(("ghc-scientific" ,ghc-scientific))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) @@ -3224,8 +3137,7 @@ complicated text/binary file formats.") (name "ghc-attoparsec-bootstrap") (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific" ,ghc-scientific-bootstrap) - ("ghc-text" ,ghc-text))) + `(("ghc-scientific" ,ghc-scientific-bootstrap))) (native-inputs '()) (properties '(hidden? #t)))) @@ -3247,7 +3159,6 @@ complicated text/binary file formats.") (inputs `(("ghc-digest" ,ghc-digest) ("ghc-temporary" ,ghc-temporary) - ("ghc-text" ,ghc-text) ("ghc-zlib" ,ghc-zlib))) (native-inputs `(("ghc-hunit" ,ghc-hunit) @@ -3388,8 +3299,6 @@ and mIRC chat codes.") (base32 "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "http://code.haskell.org/~malcolm/polyparse/") (synopsis @@ -3478,7 +3387,6 @@ this package makes them available back to GHC 7.2.") (inputs `(("ghc-fingertree" ,ghc-fingertree) ("ghc-hashable" ,ghc-hashable) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-semigroupoids" ,ghc-semigroupoids) ("ghc-semigroups" ,ghc-semigroups))) @@ -3626,8 +3534,6 @@ online}.") (base32 "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (home-page "http://code.galois.com") (synopsis "Simple XML library for Haskell") (description "This package provides a simple XML library for Haskell.") @@ -3654,7 +3560,6 @@ online}.") ("ghc-old-locale" ,ghc-old-locale) ("ghc-old-time" ,ghc-old-time) ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) ("ghc-time-locale-compat" ,ghc-time-locale-compat) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml-conduit" ,ghc-xml-conduit) @@ -3690,8 +3595,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.") ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-compat" ,ghc-transformers-compat))) + `(("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/ekmett/exceptions/") (synopsis "Extensible optionally-pure exceptions") (description "This library provides extensible optionally-pure exceptions @@ -3825,8 +3729,7 @@ writing to stdout and other handles.") (build-system haskell-build-system) ;; these inputs are necessary to use this library (inputs - `(("ghc-text" ,ghc-text) - ("ghc-hashable" ,ghc-hashable))) + `(("ghc-hashable" ,ghc-hashable))) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. (home-page @@ -4119,36 +4022,6 @@ splitting lists into parts, akin to the @code{split} function found in several mainstream languages.") (license license:bsd-3))) -(define-public ghc-parsec - (package - (name "ghc-parsec") - (version "3.1.13.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/parsec/parsec-" - version - ".tar.gz")) - (sha256 - (base32 "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (inputs - `(("ghc-text" ,ghc-text))) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. - (home-page - "https://github.com/aslatter/parsec") - (synopsis "Monadic parser combinators") - (description "Parsec is a parser library. It is simple, safe, well -documented, has extensive libraries, good error messages, and is fast. It is -defined as a monad transformer that can be stacked on arbitrary monads, and it -is also parametric in the input stream type.") - (license license:bsd-3))) - (define-public ghc-parser-combinators (package (name "ghc-parser-combinators") @@ -4190,8 +4063,7 @@ combinators.") (inputs `(("ghc-case-insensitive" ,ghc-case-insensitive) ("ghc-parser-combinators" ,ghc-parser-combinators) - ("ghc-scientific" ,ghc-scientific) - ("ghc-text" ,ghc-text))) + ("ghc-scientific" ,ghc-scientific))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-hspec" ,ghc-hspec) @@ -4347,11 +4219,10 @@ interface.") (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + (inputs + `(("ghc-network" ,ghc-network))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) - (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-network" ,ghc-network))) (home-page "https://github.com/haskell/network-uri") (synopsis "Library for URI manipulation") @@ -4535,8 +4406,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-transformers-base" ,ghc-transformers-base) + `(("ghc-transformers-base" ,ghc-transformers-base) ("ghc-transformers-compat" ,ghc-transformers-compat))) (home-page "https://github.com/basvandijk/monad-control") (synopsis "Monad transformers to lift control operations like exception @@ -4658,8 +4528,7 @@ pragmas in your code.") (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. (inputs - `(("ghc-text" ,ghc-text) - ("ghc-utf8-string" ,ghc-utf8-string))) + `(("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/lpsmith/blaze-builder") (synopsis "Efficient buffered output") (description "This library provides an implementation of the older @@ -4692,8 +4561,7 @@ interoperate with code that uses the new implementation.") (("tasty >= 1\\.0 && < 1\\.1") "tasty >= 1.0 && < 1.2"))))))) (inputs - `(("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-text" ,ghc-text))) + `(("ghc-blaze-builder" ,ghc-blaze-builder))) (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) @@ -4743,8 +4611,7 @@ library for Haskell.") "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) (build-system haskell-build-system) (inputs - `(("ghc-stm" ,ghc-stm) - ("ghc-hashable" ,ghc-hashable) + `(("ghc-hashable" ,ghc-hashable) ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) @@ -5052,7 +4919,6 @@ given term should not exist.") ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-statevar" ,ghc-statevar) - ("ghc-stm" ,ghc-stm) ("ghc-tagged" ,ghc-tagged) ("ghc-th-abstraction" ,ghc-th-abstraction) ("ghc-transformers-compat" ,ghc-transformers-compat) @@ -5144,8 +5010,6 @@ call stacks with different versions of the compiler.") (base32 "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) (build-system haskell-build-system) - (inputs - `(("ghc-stm" ,ghc-stm))) (home-page "https://hackage.haskell.org/package/StateVar") (synopsis "State variables for Haskell") (description "This package provides state variables, which are references @@ -5186,7 +5050,6 @@ in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") ("ghc-profunctors" ,ghc-profunctors) ("ghc-semigroups" ,ghc-semigroups) ("ghc-tagged" ,ghc-tagged) - ("ghc-text" ,ghc-text) ("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-void" ,ghc-void) @@ -5227,8 +5090,7 @@ indexed variants.") "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) (build-system haskell-build-system) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-blaze-html" ,ghc-blaze-html) + `(("ghc-blaze-html" ,ghc-blaze-html) ("ghc-xss-sanitize" ,ghc-xss-sanitize) ("ghc-data-default" ,ghc-data-default) ("ghc-syb" ,ghc-syb) @@ -5362,7 +5224,6 @@ just a @code{Semigroup} are added.") `(("ghc-nats" ,ghc-nats) ("ghc-tagged" ,ghc-tagged) ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable))) (home-page "https://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") @@ -5383,7 +5244,6 @@ semigroup.") `(("ghc-nats" ,ghc-nats-bootstrap) ("ghc-tagged" ,ghc-tagged) ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable-bootstrap))) (properties '(hidden? #t)))) @@ -5506,7 +5366,6 @@ monad transformer (instead of the IO monad).") (inputs `(("ghc-auto-update" ,ghc-auto-update) ("ghc-easy-file" ,ghc-easy-file) - ("ghc-text" ,ghc-text) ("ghc-unix-time" ,ghc-unix-time))) (native-inputs `(("hspec-discover" ,hspec-discover) @@ -5692,7 +5551,6 @@ in migrated modules.") (build-system haskell-build-system) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) (native-inputs @@ -5719,7 +5577,6 @@ notation}.") (arguments `(#:tests? #f)) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) (native-inputs '()) @@ -5848,7 +5705,6 @@ building up, manipulating and serialising @code{Pandoc} structures.") ("ghc-temporary" ,ghc-temporary) ("ghc-utf8-string" ,ghc-utf8-string) ("ghc-xml" ,ghc-xml) - ("ghc-parsec" ,ghc-parsec) ("ghc-pandoc-types" ,ghc-pandoc-types))) (home-page "https://github.com/jgm/texmath") (synopsis "Conversion between formats used to represent mathematics") @@ -5924,8 +5780,7 @@ and utilities for pretty printing.") `(("ghc-diff" ,ghc-diff) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin))) (native-inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-blaze-html" ,ghc-blaze-html) + `(("ghc-blaze-html" ,ghc-blaze-html) ("ghc-utf8-string" ,ghc-utf8-string))) (home-page "https://github.com/jgm/highlighting-kate") (synopsis "Syntax highlighting library") @@ -5952,8 +5807,6 @@ descriptions.") (base32 "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/jgm/commonmark-hs") @@ -5979,8 +5832,6 @@ sources, and does not require prior installation of the C library.") (base32 "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) (build-system haskell-build-system) - (inputs - `(("ghc-text" ,ghc-text))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) (home-page "https://github.com/kivikakk/cmark-gfm-hs") @@ -6137,7 +5988,6 @@ datatypes.") (inputs `(("ghc-th-lift" ,ghc-th-lift) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/bennofs/th-lift-instances/") (synopsis "Lift instances for template-haskell for common data types.") @@ -6397,7 +6247,6 @@ back-ends.") ("ghc-aeson" ,ghc-aeson) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) - ("ghc-text" ,ghc-text) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-scientific" ,ghc-scientific) ("ghc-semigroups" ,ghc-semigroups) @@ -6500,8 +6349,7 @@ TIFF and GIF formats.") (inputs `(("lua" ,lua) ("ghc-exceptions" ,ghc-exceptions) - ("ghc-fail" ,ghc-fail) - ("ghc-text" ,ghc-text))) + ("ghc-fail" ,ghc-fail))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) @@ -6534,8 +6382,7 @@ described in @url{https://www.lua.org/}.") `(#:cabal-revision ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) (inputs - `(("ghc-hslua" ,ghc-hslua) - ("ghc-text" ,ghc-text))) + `(("ghc-hslua" ,ghc-hslua))) (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) @@ -6733,7 +6580,6 @@ the choice of SSL/TLS, and SOCKS.") ("ghc-hxt" ,ghc-hxt) ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) ("ghc-safe" ,ghc-safe) - ("ghc-text" ,ghc-text) ("ghc-utf8-string" ,ghc-utf8-string))) (native-inputs `(("ghc-diff" ,ghc-diff) @@ -6787,9 +6633,7 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") `(("ghc-aeson" ,ghc-aeson) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) - ("ghc-parsec" ,ghc-parsec) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-scientific" ,ghc-scientific))) (native-inputs @@ -6852,7 +6696,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-network-uri" ,ghc-network-uri) ("ghc-old-locale" ,ghc-old-locale) ("ghc-pandoc-types" ,ghc-pandoc-types) - ("ghc-parsec" ,ghc-parsec) ("ghc-random" ,ghc-random) ("ghc-scientific" ,ghc-scientific) ("ghc-sha" ,ghc-sha) @@ -6862,7 +6705,6 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-temporary" ,ghc-temporary) ("ghc-texmath" ,ghc-texmath) - ("ghc-text" ,ghc-text) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-vector" ,ghc-vector) ("ghc-xml" ,ghc-xml) @@ -6950,8 +6792,7 @@ better for some purposes.") "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) (build-system haskell-build-system) (inputs - `(("ghc-async" ,ghc-async) - ("ghc-stm" ,ghc-stm))) + `(("ghc-async" ,ghc-async))) (native-inputs `(("ghc-base64-bytestring" ,ghc-base64-bytestring) ("ghc-hspec" ,ghc-hspec) @@ -6983,7 +6824,6 @@ upon it.") `(("ghc-conduit" ,ghc-conduit) ("ghc-exceptions" ,ghc-exceptions) ("ghc-monad-control" ,ghc-monad-control) - ("ghc-text" ,ghc-text) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-typed-process" ,ghc-typed-process) ("ghc-async" ,ghc-async) @@ -6992,7 +6832,6 @@ upon it.") ("ghc-network" ,ghc-network) ("ghc-primitive" ,ghc-primitive) ("ghc-resourcet" ,ghc-resourcet) - ("ghc-stm" ,ghc-stm) ("ghc-streaming-commons" ,ghc-streaming-commons) ("ghc-hspec" ,ghc-hspec) ("ghc-bytestring-builder" ,ghc-bytestring-builder) @@ -7022,7 +6861,6 @@ dependencies. The basic idea is that this package should only depend on (base32 "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr")))) (build-system haskell-build-system) - (inputs `(("ghc-text" ,ghc-text))) (home-page "https://john-millikin.com/software/haskell-xml/") (synopsis "Basic types for representing XML") (description "This package provides basic types for representing XML @@ -7047,7 +6885,6 @@ documents.") ("ghc-conduit-extra" ,ghc-conduit-extra) ("ghc-doctest" ,ghc-doctest) ("ghc-resourcet" ,ghc-resourcet) - ("ghc-text" ,ghc-text) ("ghc-xml-types" ,ghc-xml-types) ("ghc-attoparsec" ,ghc-attoparsec) ("ghc-data-default-class" ,ghc-data-default-class) @@ -7096,7 +6933,6 @@ the @code{conduit} package.") ("ghc-pandoc" ,ghc-pandoc) ("ghc-tagsoup" ,ghc-tagsoup) ("ghc-aeson" ,ghc-aeson) - ("ghc-text" ,ghc-text) ("ghc-vector" ,ghc-vector) ("ghc-xml-conduit" ,ghc-xml-conduit) ("ghc-unordered-containers" ,ghc-unordered-containers) @@ -7107,7 +6943,6 @@ the @code{conduit} package.") ("ghc-hs-bibutils" ,ghc-hs-bibutils) ("ghc-rfc5051" ,ghc-rfc5051) ("ghc-syb" ,ghc-syb) - ("ghc-parsec" ,ghc-parsec) ("ghc-old-locale" ,ghc-old-locale) ("ghc-aeson-pretty" ,ghc-aeson-pretty) ("ghc-attoparsec" ,ghc-attoparsec) @@ -7231,8 +7066,7 @@ regular expressions. Parsers can be built using Applicative interface.") "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) (build-system haskell-build-system) (inputs - `(("ghc-parsec" ,ghc-parsec) - ("ghc-regex-base" ,ghc-regex-base))) + `(("ghc-regex-base" ,ghc-regex-base))) (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") (synopsis "POSIX extended regular expressions in Haskell.") (description @@ -7493,8 +7327,7 @@ supported. A module of colour names (\"Data.Colour.Names\") is provided.") "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0")))) (build-system haskell-build-system) (inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-text" ,ghc-text))) + `(("ghc-base-compat" ,ghc-base-compat))) (home-page "https://hackage.haskell.org/package/wl-pprint-text") (synopsis "Wadler/Leijen Pretty Printer for Text values") (description @@ -7558,7 +7391,6 @@ for generating graph-like data structures.") ("ghc-fgl-arbitrary" ,ghc-fgl-arbitrary) ("ghc-polyparse" ,ghc-polyparse) ("ghc-temporary" ,ghc-temporary) - ("ghc-text" ,ghc-text) ("ghc-wl-pprint-text" ,ghc-wl-pprint-text))) (native-inputs `(("ghc-hspec" ,ghc-hspec) @@ -7666,8 +7498,7 @@ instance of @code{MonadBase} or @code{MonadBaseControl}.") (arguments `(#:tests? #f)) (inputs - `(("ghc-text" ,ghc-text) - ("ghc-quickcheck" ,ghc-quickcheck))) + `(("ghc-quickcheck" ,ghc-quickcheck))) (home-page "https://github.com/fpco/haskell-filesystem") (synopsis "High-level, byte-based file and directory path manipulations") (description @@ -7696,7 +7527,6 @@ increasing type safety.") `(#:tests? #f)) (inputs `(("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) - ("ghc-text" ,ghc-text) ("ghc-temporary" ,ghc-temporary))) (home-page "https://github.com/fpco/haskell-filesystem") (synopsis "Consistent file system interaction across GHC versions") @@ -7731,7 +7561,6 @@ which can't be decoded in the current locale encoding.") ("ghc-lifted-async" ,ghc-lifted-async) ("ghc-exceptions" ,ghc-exceptions) ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) - ("ghc-text" ,ghc-text) ("ghc-async" ,ghc-async) ("ghc-transformers-base" ,ghc-transformers-base) ("ghc-hunit" ,ghc-hunit) @@ -7788,7 +7617,6 @@ easily work with command-line options.") `(("ghc-options-bootstrap" ,ghc-options-bootstrap) ("ghc-patience" ,ghc-patience) ("ghc-random" ,ghc-random) - ("ghc-text" ,ghc-text) ("ghc-ansi-terminal" ,ghc-ansi-terminal))) (home-page "https://john-millikin.com/software/chell/") (synopsis "Simple and intuitive library for automated testing") @@ -7909,8 +7737,7 @@ easily work with command-line options.") ;; FilePath "/r2\ENQ52\t ;$/o\US=/okG\146\&6\n @@ -11485,7 +11270,6 @@ imported with the correct Haskell types.") (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-old-locale" ,ghc-old-locale) - ("ghc-text" ,ghc-text) ("ghc-data-default-class" ,ghc-data-default-class) ("ghc-network" ,ghc-network) ("ghc-utf8-string" ,ghc-utf8-string))) @@ -11679,7 +11463,6 @@ example of, \"An applicative functor that is not a monad.\"") (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) - ("ghc-stm" ,ghc-stm) ("ghc-exceptions" ,ghc-exceptions) ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-terminal-size" ,ghc-terminal-size))) diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index ec3eb15d63..4290d8c21f 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -78,7 +78,6 @@ ("ghc-safe" ,ghc-safe) ("ghc-split" ,ghc-split) ("ghc-terminal-size" ,ghc-terminal-size) - ("ghc-text" ,ghc-text) ("ghc-uniplate" ,ghc-uniplate) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 871a6b0706..d2bddef54d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -595,10 +595,8 @@ tiled on several screens.") `(("ghc-hinotify" ,ghc-hinotify) ("ghc-http" ,ghc-http) ("ghc-iwlib" ,ghc-iwlib) - ("ghc-parsec" ,ghc-parsec) ("ghc-parsec-numbers" ,ghc-parsec-numbers) ("ghc-regex-compat" ,ghc-regex-compat) - ("ghc-stm" ,ghc-stm) ("ghc-x11-xft" ,ghc-x11-xft) ("libxpm" ,libxpm))) (arguments -- cgit v1.2.3 From 1daca4f3e568e2b351bec38111368b759704bb5f Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 4 Jul 2019 09:57:30 +0200 Subject: import: hackage: Update list of ghc-included packages. It turns out the list in the release notes is incomplete. This updates the list from /gnu/store/-ghc-8.4.3/lib/ghc-8.4.3. * guix/import/hackage.scm (ghc-standard-libraries): Update list. Signed-off-by: Ricardo Wurmus --- guix/import/hackage.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 6f426af900..5fe3d85a7f 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 ng0 ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Robert Vollmert ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +53,7 @@ (define ghc-standard-libraries ;; List of libraries distributed with ghc (8.4.3). - ;; https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html + ;; Contents of ...-ghc-8.4.3/lib/ghc-8.4.3. '("ghc" "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but ;; hackage-name->package-name takes this into account. @@ -65,7 +66,9 @@ "deepseq" "directory" "filepath" + "ghc" "ghc-boot" + "ghc-boot-th" "ghc-compact" "ghc-prim" "ghci" @@ -74,8 +77,11 @@ "integer-gmp" "mtl" "parsec" + "pretty" "process" + "stm" "template-haskell" + "terminfo" "text" "time" "transformers" -- cgit v1.2.3 From 8b3dc667710db01b362e1cc449a707151465d6eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 4 Jul 2019 20:13:13 +0200 Subject: gnu: icecat: Fix FTBFS with GCC7. * gnu/packages/gnuzilla.scm (icecat)[arguments]: In the 'augment-CPATH' phase, do not attempt to read CPLUS_INCLUDE_PATH, which is no longer set. --- gnu/packages/gnuzilla.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a874878fea..3e556d0b04 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -864,8 +864,7 @@ from forcing GEXP-PROMISE." (let ((gcc (assoc-ref inputs "gcc"))) (setenv "CPLUS_INCLUDE_PATH" (string-append gcc "/include/c++" ":" - gcc "/include/c++/" build ":" - (getenv "CPLUS_INCLUDE_PATH")))) + gcc "/include/c++/" build))) #t)) (replace 'configure ;; configure does not work followed by both "SHELL=..." and -- cgit v1.2.3 From 0c6de725d814205d94ca3abb3f793c438137998a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jul 2019 20:32:17 +0200 Subject: gnu: python-pillow: Update to 6.1.0. * gnu/packages/python-xyz.scm (python-pillow): Update to 6.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e8de98814..cd74ee181e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4364,14 +4364,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "5.4.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17waygkhhzjd75kajlfw9v57mbb41lcpg6cvkdijqd7smm76ccsj")))) + "1pnrsz0f0n0c819v1pdr8j6rm8xvhc9f3kh1fv9xpdp9n5ygf108")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 4f5fe46388eb70055b6935df053f74b7ccdaf55f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:32:53 +0200 Subject: gnu: commencement: Fix Python build on non-x86 platforms. * gnu/packages/commencement.scm (python-boot0)[version, source]: Downgrade to 3.5.7. [arguments]: Remove <#:make-flags>. Add <#:phases>. [native-inputs]: Remove artifical dependency on PKG-CONFIG. --- gnu/packages/commencement.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d28296449d..d06aa0a369 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1864,16 +1864,40 @@ the bootstrap environment." (define python-boot0 (let ((python (package (inherit python-minimal) + ;; We cannot use Python 3.7 and later here, because they require + ;; pthreads, which is missing on non-x86 platforms at this stage. + ;; Python 3.6 technically supports being built without threading + ;; support, but requires additional patches. + (version "3.5.7") + (source (origin + (inherit (package-source python)) + (uri (string-append "https://www.python.org/ftp/python/" + version "/Python-" version ".tar.xz")) + (patches '()) + (sha256 + (base32 + "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18")))) (inputs `(("expat" ,expat-sans-tests))) ;remove OpenSSL, zlib, etc. + (native-inputs '()) ;and pkg-config (arguments (substitute-keyword-arguments (package-arguments python-minimal) ;; Disable features that cannot be built at this stage. ((#:configure-flags _ ''()) - `(list "--without-ensurepip")) - ((#:make-flags _ ''()) - `(list "MODDISABLED_NAMES=_ctypes ossaudiodev")) + `(list "--without-ensurepip" + "--without-threads")) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'disable-modules + (lambda _ + (substitute* "setup.py" + ;; Disable ctypes, since it requires libffi. + (("extensions\\.append\\(ctypes\\)") "") + ;; Prevent the 'ossaudiodev' extension from being + ;; built, since it requires Linux headers. + (("'linux', ") "")) + #t)))) ((#:tests? _ #f) #f)))))) (package-with-bootstrap-guile (package-with-explicit-inputs python %boot0-inputs -- cgit v1.2.3 From fcb5493793ca43c159fcb87e1b9d0b1e93430e5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:51:26 +0200 Subject: gnu: Python: Avoid needless reference on coreutils. * gnu/packages/python.scm (python-2.7)[arguments]: Pass "INSTALL" and "MKDIR_P" in <#:configure-flags>. --- gnu/packages/python.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d834cda915..68ea23ff57 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -143,6 +143,12 @@ "--with-system-ffi" ;build ctypes "--with-ensurepip=install" ;install pip and setuptools "--enable-unicode=ucs4" + + ;; Prevent the installed _sysconfigdata.py from retaining a reference + ;; to coreutils. + "INSTALL=install -c" + "MKDIR_P=mkdir -p" + (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. -- cgit v1.2.3 From a4c38f812c3eae757e4980f8f6131ff3a608e6aa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:54:15 +0200 Subject: gnu: icu4c: Use 'python-minimal' for tests. * gnu/packages/icu4c.scm (icu4c)[native-inputs]: Change PYTHON to PYTHON-MINIMAL. --- gnu/packages/icu4c.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index ec65aff6cb..d5f8b5dd04 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -47,7 +47,7 @@ (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) (native-inputs - `(("python" ,python))) + `(("python" ,python-minimal))) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From ac135287d21e098b8940fcacd5bf82537e71d100 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:55:10 +0200 Subject: gnu: icu4c: Enable tests on i686. * gnu/packages/icu4c.scm (icu4c)[arguments]: Don't override <#:tests?>. --- gnu/packages/icu4c.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index d5f8b5dd04..fc3409ed3f 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -59,12 +59,6 @@ (string-prefix? "mips" s))) '("--with-data-packaging=archive") '())) - ,@(if (string-prefix? "i686" (or (%current-target-system) - (%current-system))) - ;; FIXME: Some tests are failing on i686: - ;; . - '(#:tests? #f) - '()) #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source -- cgit v1.2.3 From 53ffc043af88920063c161d0a4c3c9617df4a502 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 16:55:52 +0200 Subject: gnu: cURL: Build against Python 3. * gnu/packages/curl.scm (curl)[native-inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/curl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 8605c12124..24932c9f99 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -72,7 +72,7 @@ ;; to enable the --manual option and make test 1026 pass ("groff" ,groff) ("pkg-config" ,pkg-config) - ("python" ,python-2))) + ("python" ,python-wrapper))) (native-search-paths ;; Note: This search path is respected by the `curl` command-line tool only. ;; Ideally we would bake this into libcurl itself so other users can benefit, -- cgit v1.2.3 From d7b63ba92d55549006f6aa7f78adc4c37d98fc41 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:00:45 +0200 Subject: gnu: itstool: Update to 2.0.6. * gnu/packages/glib.scm (itstool): Update to 2.0.6. [inputs]: Change PYTHON2-LIBXML and PYTHON-2 to PYTHON-LIBXML and PYTHON. * gnu/packages/gnome.scm (totem)[inputs]: Change PYTHON-2 to PYTHON. --- gnu/packages/glib.scm | 8 ++++---- gnu/packages/gnome.scm | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eae8297531..2f8b2bda5e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -451,19 +451,19 @@ The intltool collection can be used to do these things: (define itstool (package (name "itstool") - (version "2.0.2") + (version "2.0.6") (source (origin (method url-fetch) (uri (string-append "http://files.itstool.org/itstool/itstool-" version ".tar.bz2")) (sha256 (base32 - "0fh34wi52i0qikgvlmrcpf1vx6gc1xqdad4539l4d9hikfsrz45z")))) + "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2")))) (build-system gnu-build-system) (inputs `(("libxml2" ,libxml2) - ("python2-libxml2" ,python2-libxml2) - ("python-2" ,python-2))) + ("python-libxml2" ,python-libxml2) + ("python" ,python))) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ecf39334e5..8d4143e1da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3871,9 +3871,7 @@ for application developers.") ("gst-plugins-good" ,gst-plugins-good) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("adwaita-icon-theme" ,adwaita-icon-theme) - ;; XXX We use python-2 because libxml2 because itstool (which needs - ;; libxml) currently uses python-2. - ("python" ,python-2) + ("python" ,python) ("python-pygobject" ,python2-pygobject) ;; XXX TODO pylint needed for python support ("totem-pl-parser" ,totem-pl-parser) -- cgit v1.2.3 From cf3f7aa1970d71c69ec2c75c4ae874afc1d1fdab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:02:20 +0200 Subject: gnu: libevent: Use Python 3 for event_rpcgen.py. * gnu/packages/libevent.scm (libevent)[inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/libevent.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index e9e165a2ad..58c451a4e9 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -43,19 +43,19 @@ (name "libevent") (version "2.1.10") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/libevent/libevent/releases/download/release-" - version "-stable/libevent-" version "-stable.tar.gz")) - (sha256 - (base32 - "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78")))) + (method url-fetch) + (uri (string-append + "https://github.com/libevent/libevent/releases/download/release-" + version "-stable/libevent-" version "-stable.tar.gz")) + (sha256 + (base32 + "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78")))) (build-system gnu-build-system) (arguments - ;; This skips some of the tests which fail on armhf and aarch64. + ;; This skips some of the tests which fail on armhf and aarch64. '(#:configure-flags '("--disable-libevent-regress"))) (inputs - `(("python" ,python-2))) ; for 'event_rpcgen.py' + `(("python" ,python-wrapper))) ;for 'event_rpcgen.py' (native-inputs `(("which" ,which))) (home-page "https://libevent.org/") -- cgit v1.2.3 From b78491f857d974afa8339f778772e0a140a1c344 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:03:51 +0200 Subject: gnu: ninja: Build against Python 3. * gnu/packages/ninja.scm (ninja)[native-inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/ninja.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index 0791abe764..a115e99828 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -40,7 +40,7 @@ (base32 "1ffmzj5s9h98qhl94d9i23zcv057rsqbac9g1hdgvlzq51ccfzjx")))) (build-system gnu-build-system) - (native-inputs `(("python" ,python-2))) + (native-inputs `(("python" ,python-wrapper))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2c886af91154916a656aeecf6ba517e0cdc6fe93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:12:30 +0200 Subject: gnu: ninja: Python is a regular input. Ninja uses Python at run time, so it must not be a native input. * gnu/packages/ninja.scm (ninja)[native-inputs]: Change to ... [inputs]: ... this. --- gnu/packages/ninja.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index a115e99828..a8ad6430ba 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -40,7 +40,7 @@ (base32 "1ffmzj5s9h98qhl94d9i23zcv057rsqbac9g1hdgvlzq51ccfzjx")))) (build-system gnu-build-system) - (native-inputs `(("python" ,python-wrapper))) + (inputs `(("python" ,python-wrapper))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ee3a4d367880dd826fc74a9e4080163f92e1512a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:04:41 +0200 Subject: gnu: libpsl: Build against Python 3. * gnu/packages/web.scm (libpsl)[inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7731b1fdca..9fc7260a5b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -871,7 +871,7 @@ for efficient socket-like bidirectional reliable communication channels.") (inputs `(("libidn2" ,libidn2) ("libunistring" ,libunistring) - ("python-2" ,python-2))) + ("python" ,python-wrapper))) (home-page "https://github.com/rockdaboot/libpsl") (synopsis "C library for the Publix Suffix List") (description -- cgit v1.2.3 From d0a52e65b53d05790b307a2b99172fa38dcd7619 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 17:26:38 +0200 Subject: gnu: zziplib: Don't use unstable tarball. * gnu/packages/compression.scm (zziplib)[source]: Change to GIT-FETCH. [argumnents]: New field. --- gnu/packages/compression.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ddc43176d9..1ca88fe78c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1573,14 +1573,22 @@ recreates the stored directory structure by default.") (name "zziplib") (version "0.13.69") (home-page "https://github.com/gdraheim/zziplib") - (source - (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) - (sha256 - (base32 - "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4")))) + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fbk9k7ryas2wh2ykwkvm1pbi40i88rfvc3dydh9xyd7w2jcki92")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'make-files-writable + (lambda _ + (for-each make-file-writable + (find-files "test" #:directories? #t)) + #t))))) (inputs `(("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ; for the documentation -- cgit v1.2.3 From b0dc2454cc7288148e108156a8bedbb1947115a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:08:21 +0200 Subject: gnu: zziplib: Don't run failing tests. * gnu/packages/compression.scm (zziplib)[arguments]: Set <#:test-target>. --- gnu/packages/compression.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1ca88fe78c..1321791841 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1588,7 +1588,12 @@ recreates the stored directory structure by default.") (lambda _ (for-each make-file-writable (find-files "test" #:directories? #t)) - #t))))) + #t))) + + ;; XXX: The default test target attempts to download external resources and + ;; fails without error: . + ;; To prevent confusing log messages, just run a simple zip test that works. + #:test-target "check-readme")) (inputs `(("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ; for the documentation -- cgit v1.2.3 From c4fa39188a9f198c99de528794cc7b3c4a053911 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:53:32 +0200 Subject: gnu: graphite2: Build against Python 3. Previously, the Python tests were skipped, because they require Python 3. * gnu/packages/fontutils.scm (graphite2)[arguments]: New field. [native-inputs]: Change PYTHON-2 and PYTHON2-FONTTOOLS to PYTHON and PYTHON-FONTTOOLS. --- gnu/packages/fontutils.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 818d77f127..725d3ac878 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -438,9 +439,20 @@ applications should be.") (base32 "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx")))) (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-test-PYTHONPATH + (lambda _ + ;; Tell the build system not to override PYTHONPATH + ;; while running the Python tests. + (substitute* "Graphite.cmake" + (("ENVIRONMENT PYTHONPATH=") + (string-append "ENVIRONMENT PYTHONPATH=" + (getenv "PYTHONPATH") ":"))) + #t))))) (native-inputs - `(("python" ,python-2) ; because of "import imap" in tests - ("python-fonttools" ,python2-fonttools))) + `(("python" ,python) + ("python-fonttools" ,python-fonttools))) (inputs `(("freetype" ,freetype))) (synopsis "Reimplementation of the SIL Graphite text processing engine") -- cgit v1.2.3 From f7e25e2ec7a5755edd542ee36edd7ae5febe6399 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:55:57 +0200 Subject: gnu: libpsl: Python is a native input. * gnu/packages/web.scm (libpsl)[inputs]: Move PYTHON-WRAPPER ... [native-inputs]: ... here. --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9fc7260a5b..42c00e77a5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -867,11 +867,13 @@ for efficient socket-like bidirectional reliable communication channels.") "04pfagb7ppq3yibx4lhazd1v9nwkxdfkyy2rgcrmrf3mldsirga1")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + + ;; For tests. + ("python" ,python-wrapper))) (inputs `(("libidn2" ,libidn2) - ("libunistring" ,libunistring) - ("python" ,python-wrapper))) + ("libunistring" ,libunistring))) (home-page "https://github.com/rockdaboot/libpsl") (synopsis "C library for the Publix Suffix List") (description -- cgit v1.2.3 From c43b090326d5d73b54cab7ae41b7d1119b402d65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 19:14:04 +0200 Subject: build-system/meson: Enable compiler optimizations. * guix/build-system/meson.scm (meson-build)[#:build-type]: Set to 'debugoptimized'. --- guix/build-system/meson.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 370d185545..b29f2f4ecf 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -90,7 +90,7 @@ (outputs '("out")) (configure-flags ''()) (search-paths '()) - (build-type "plain") + (build-type "debugoptimized") (tests? #t) (test-target "test") (glib-or-gtk? #f) -- cgit v1.2.3 From 794c773d0cbc49c1bd7d112d820bb9a7a19f3667 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 19:19:39 +0200 Subject: gnu: libinput: Use the 'release' Meson build type. * gnu/packages/freedesktop.scm (libinput)[arguments]: Add <#:build-type>. --- gnu/packages/freedesktop.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d77d6c58c4..7cd959d2f1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -162,7 +162,12 @@ freedesktop.org project.") "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=false"))) + `(#:configure-flags '("-Ddocumentation=false") + + ;; XXX: Using 'debug' or 'debugoptimized' pulls in an additional test that + ;; hangs, and the comments around it suggests that we should be using this + ;; Meson target anyway. + #:build-type "release")) (native-inputs `(("check" ,check) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From ff6850490f5ebe2cd0bcb86d7c8a87650e7bb08b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 20:00:21 +0200 Subject: gnu: doxygen: Don't build against special Flex variant. * gnu/packages/documentation.scm (doxygen)[native-inputs]: Change FLEX-2.6.1 to FLEX. --- gnu/packages/documentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 6ce7827391..8e7ecda956 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -139,7 +139,7 @@ markup) can be customized and extended by the user.") (build-system cmake-build-system) (native-inputs `(("bison" ,bison) - ("flex" ,flex-2.6.1) ; sefaults with 2.6.4 + ("flex" ,flex) ("libxml2" ,libxml2) ; provides xmllint for the tests ("python" ,python-2))) ; for creating the documentation (inputs -- cgit v1.2.3 From f826ac47040641ededa75a6702d0d263cab088f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 20:07:22 +0200 Subject: gnu: doxygen: Build with Python 3. * gnu/packages/documentation.scm (doxygen)[native-inputs]: Change PYTHON-2 to PYTHON. --- gnu/packages/documentation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 8e7ecda956..19c42b00eb 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -140,8 +140,8 @@ markup) can be customized and extended by the user.") (native-inputs `(("bison" ,bison) ("flex" ,flex) - ("libxml2" ,libxml2) ; provides xmllint for the tests - ("python" ,python-2))) ; for creating the documentation + ("libxml2" ,libxml2) ;provides xmllint for the tests + ("python" ,python))) ;for creating the documentation (inputs `(("bash" ,bash-minimal))) (arguments -- cgit v1.2.3 From 6fe808f4c3272cbf5329054aacfb1bafc302c4bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 22:05:34 +0200 Subject: gnu: mesa: Use the "release" Meson build type. * gnu/packages/gl.scm (mesa)[arguments]: Add <#:build-type>. --- gnu/packages/gl.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9ed043c7ae..f615ebd71c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -331,6 +331,11 @@ also known as DXTn or DXTC) for Mesa.") "-Dllvm=true")) ; default is x86/x86_64 only (_ '("-Ddri-drivers=nouveau,r200,r100")))) + + ;; XXX: 'debugoptimized' causes LTO link failures on some drivers. The + ;; documentation recommends using 'release' for performance anyway. + #:build-type "release" + #:modules ((ice-9 match) (srfi srfi-1) (guix build utils) -- cgit v1.2.3 From 0403b04d768ab6aa52320ce9b90ac2915d0ee498 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 23:27:37 +0200 Subject: gnu: jalv: Remove GCC5 workaround. * gnu/packages/audio.scm (jalv)[arguments]: Remove <#:phases>. --- gnu/packages/audio.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7024c46bb5..83e09a731f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1595,15 +1595,7 @@ synchronous execution of all clients, and low latency operation.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-before - 'configure 'set-flags - (lambda _ - ;; Compile with C++11, required by gtkmm. - (setenv "CXXFLAGS" "-std=c++11") - #t))))) + #:python ,python-2)) (inputs `(("lv2" ,lv2) ("lilv" ,lilv) -- cgit v1.2.3 From 625801f50008dc411bba84a128fe493c5b2bfc37 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jul 2019 00:37:03 +0200 Subject: gnu: webkitgtk: Build with Python 3. * gnu/packages/webkit.scm (webkitgtk)[native-inputs]: Change PYTHON-2 to PYTHON-WRAPPER. --- gnu/packages/webkit.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b258ac860c..538c97675d 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -119,7 +119,7 @@ ("gperf" ,gperf) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-2) ; incompatible with Python 3 (print syntax) + ("python" ,python-wrapper) ("gtk-doc" ,gtk-doc) ; For documentation generation ("docbook-xml" ,docbook-xml) ; For documentation generation ("ruby" ,ruby))) -- cgit v1.2.3 From e5731c03829fa8a71aab5bcf50442c517df2a8c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jul 2019 00:58:09 +0200 Subject: gnu: python-pluggy: Update to 0.11.0. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.11.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd74ee181e..f3fae63f59 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8483,14 +8483,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.9.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "13yg2q0wgcb4l8lgdvcnzqa8db5lrw3nwn50lxjy1z5jkp7gkv0r")))) + "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From a7ed2d534c66bfedb7e3fb323cc4b7a1e2731dd0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jul 2019 00:58:31 +0200 Subject: gnu: python-pytest: Update to 4.4.2. This is necessary to fix a test failure on 32-bit platforms in 4.4.1. * gnu/packages/check.scm (python-pytest): Update to 4.4.2. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9dbef4bf76..901ee2cacb 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -683,14 +683,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "4.4.1") + (version "4.4.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1xcmic8wzaj00rn1lg4ib4prh2f4lzpiaadk35qlv8hcny1j505p")))) + "18w38kjnffdcrlbw6ny6dksgxai6x9bxpjs2m6klqmb8hfzjkcb2")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8747477deb765571c300d3eb9a4012a3c36cf7f7 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Jul 2019 11:43:07 +0100 Subject: gnu: gobject-introspection: Update absolute-shlib-path.patch. Incorporate some changes from nixpkgs to the gobject-introspection package patches. This is motivated by looking at issues with libsoup and lollypop. These changes mean that the share/gir-1.0/Soup-2.4.gir file within libsoup (and the corresponding binary typelib) references libsoup-2.4.so.1 with an absolute filename, whereas previously, the filename wasn't absolute. With an absolute filename in the typelib, loading libsoup from lollypop should work. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Incorporate changes from nixpkgs. --- ...gobject-introspection-absolute-shlib-path.patch | 141 ++++++++++++++++++++- 1 file changed, 137 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index d00cc5a420..3c0bb1c6cf 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -2,10 +2,131 @@ # add the full path. # # This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. ---- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200 -+++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200 -@@ -110,17 +110,11 @@ +# 'gobject-introspection' 1.40.0 in Nix. +# +# It has since been updated to work with newer versions of +# gobject-introspection. +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): + return group + + ++def _get_default_fallback_libpath(): ++ # Newer multiple-output-optimized stdenv has an environment variable ++ # $outputLib which in turn specifies another variable which then is used as ++ # the destination for the library contents (${!outputLib}/lib). ++ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None ++ if store_path is None: ++ outputs = os.environ.get("outputs", "out").split() ++ if "lib" in outputs: ++ # For multiple output derivations let's try whether there is a $lib ++ # environment variable and use that as the base store path. ++ store_path = os.environ.get("lib") ++ elif "out" in outputs: ++ # Otherwise we have a single output derivation, so the libraries ++ # most certainly will end up in "$out/lib". ++ store_path = os.environ.get("out") ++ ++ if store_path is not None: ++ # Even if we have a $lib as output, there still should be a $lib/lib ++ # directory. ++ return os.path.join(store_path, 'lib') ++ else: ++ # If we haven't found a possible scenario, let's return an empty string ++ # so that the shared library won't be prepended with a path. ++ # ++ # Note that this doesn't mean that all hope is lost, because after all ++ # we can still use --fallback-library-path to set one. ++ # ++ # Also, we're not returning None, because that would make it very ++ # difficult to disable adding fallback paths altogether using something ++ # like: --fallback-library-path="" ++ return "" ++ ++ + def _get_option_parser(): + parser = optparse.OptionParser('%prog [options] sources', + version='%prog ' + giscanner.__version__) +@@ -205,6 +238,10 @@ match the namespace prefix.""") + parser.add_option("", "--filelist", + action="store", dest="filelist", default=[], + help="file containing headers and sources to be scanned") ++ parser.add_option("", "--fallback-library-path", ++ action="store", dest="fallback_libpath", ++ default=_get_default_fallback_libpath(), ++ help="Path to prepend to unknown shared libraries") + + group = get_preprocessor_option_group(parser) + parser.add_option_group(group) +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): + $""" % re.escape(library_name), re.VERBOSE) + + ++def _ldd_library_guix_pattern(library_name): ++ store_dir = re.escape('/gnu/store') ++ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' ++ return re.compile(pattern % (store_dir, re.escape(library_name))) ++ ++ + # This is a what we do for non-la files. We assume that we are on an + # ELF-like system where ldd exists and the soname extracted with ldd is + # a filename that can be opened with dlopen(). +@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): + output = output.decode("utf-8", "replace") + + shlibs = resolve_from_ldd_output(libraries, output) +- return list(map(sanitize_shlib_path, shlibs)) ++ fallback_libpath = options.fallback_libpath or ""; ++ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) + + + def sanitize_shlib_path(lib): +@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): + # In case we get relative paths on macOS (like @rpath) then we fall + # back to the basename as well: + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 +- if sys.platform == "darwin": +- if not os.path.isabs(lib): +- return os.path.basename(lib) +- return lib +- else: ++ ++ # Always use absolute paths if available ++ if not os.path.isabs(lib): + return os.path.basename(lib) ++ return lib + + + def resolve_from_ldd_output(libraries, output): + patterns = {} + for library in libraries: + if not os.path.isfile(library): +- patterns[library] = _ldd_library_pattern(library) ++ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) + if len(patterns) == 0: + return [] + +@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): + if line.endswith(':'): + continue + for word in line.split(): +- for library, pattern in patterns.items(): +- m = pattern.match(word) ++ for library, (pattern, guix_pattern) in patterns.items(): ++ if line.find('/gnu/store') != -1: ++ m = guix_pattern.match(word) ++ else: ++ m = pattern.match(word) + if m: + del patterns[library] + shlibs.append(m.group()) + +--- a/giscanner/utils.py ++++ b/giscanner/utils.py +@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -28,3 +149,15 @@ def extract_libtool(la_file): +--- a/tests/scanner/test_shlibs.py ++++ b/tests/scanner/test_shlibs.py +@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): + + self.assertEqual( + sanitize_shlib_path('/foo/bar'), +- '/foo/bar' if sys.platform == 'darwin' else 'bar') ++ # Always use an absolute filename for Guix ++ '/foo/bar') + + def test_unresolved_library(self): +output = '' -- cgit v1.2.3 From 883fe9bb913ac284c6ec203b41fc22cb6212c337 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 8 Jul 2019 15:25:40 -0400 Subject: gnu: bdb: Add 4.8.30. * gnu/packages/dbm.scm (bdb-4.8): New variable. [arguments]: Configure and build from 'build_unix' directory as mentioned in documentation. (bdb-5.3): Inherit from bdb-4.8. (bdb-6): Inherit from bdb-4.8. (bdb): Point to bdb-6. --- gnu/packages/dbm.scm | 83 ++++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 48 deletions(-) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 2f1c88f112..5191c475c2 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -33,22 +33,24 @@ ;;; This module has been separated from (gnu packages databases) to reduce the ;;; number of module references for core packages. -(define-public bdb +(define-public bdb-4.8 (package (name "bdb") - (version "6.2.32") + (version "4.8.30") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")) (source (origin - (method url-fetch) - (uri (string-append "http://download.oracle.com/berkeley-db/db-" - version ".tar.gz")) - (sha256 - (base32 - "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9")))) + (method url-fetch) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0")))) (build-system gnu-build-system) (outputs '("out" ; programs, libraries, headers "doc")) ; 94 MiB of HTML docs (arguments - '(#:tests? #f ; no check target available + `(#:tests? #f ; no check target available #:disallowed-references ("doc") #:phases (modify-phases %standard-phases @@ -61,11 +63,17 @@ (("docdir[[:blank:]]*=.*") (string-append "docdir = " doc "/share/doc/bdb"))) - (invoke "./dist/configure" + (chdir "build_unix") + (invoke "../dist/configure" (string-append "--prefix=" out) (string-append "CONFIG_SHELL=" (which "bash")) (string-append "SHELL=" (which "bash")) + ;; Bdb doesn't recognize aarch64 as an architecture. + ,@(if (string=? "aarch64-linux" (%current-system)) + '("--build=aarch64-unknown-linux-gnu") + '()) + ;; Remove 7 MiB of .a files. "--disable-static" @@ -83,58 +91,37 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") ;; Starting with version 6, BDB is distributed under AGPL3. Many individual ;; files are covered by the 3-clause BSD license. - (license (list license:agpl3+ license:bsd-3)) (home-page "http://www.oracle.com/us/products/database/berkeley-db/overview/index.html"))) (define-public bdb-5.3 - (package (inherit bdb) + (package (inherit bdb-4.8) (name "bdb") (version "5.3.28") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")) (source (origin (method url-fetch) (uri (string-append "http://download.oracle.com/berkeley-db/db-" version ".tar.gz")) (sha256 (base32 - "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))) - (arguments - `(#:tests? #f ; no check target available - #:disallowed-references ("doc") - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - ;; '--docdir' is not honored, so we need to patch. - (substitute* "dist/Makefile.in" - (("docdir[[:blank:]]*=.*") - (string-append "docdir = " doc "/share/doc/bdb"))) + "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))))) - (invoke "./dist/configure" - (string-append "--prefix=" out) - (string-append "CONFIG_SHELL=" (which "bash")) - (string-append "SHELL=" (which "bash")) - - ;; Bdb doesn't recognize aarch64 as an architecture. - ,@(if (string=? "aarch64-linux" (%current-system)) - '("--build=aarch64-unknown-linux-gnu") - '()) - - ;; Remove 7 MiB of .a files. - "--disable-static" - - ;; The compatibility mode is needed by some packages, - ;; notably iproute2. - "--enable-compat185" +(define-public bdb-6 + (package (inherit bdb-4.8) + (name "bdb") + (version "6.2.32") + (source (origin + (method url-fetch) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9")))) + ;; Starting with version 6, BDB is distributed under AGPL3. Many individual + ;; files are covered by the 3-clause BSD license. + (license (list license:agpl3+ license:bsd-3)))) - ;; The following flag is needed so that the inclusion - ;; of db_cxx.h into C++ files works; it leads to - ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. - "--enable-cxx"))))))))) +(define-public bdb bdb-6) (define-public gdbm (package -- cgit v1.2.3 From bcfc54fff80ef6a11fc53c61db333a8065bbfeef Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 8 Jul 2019 15:51:33 -0400 Subject: gnu: Update to 0.18.0. * gnu/packages/finance.scm (bitcoin-core): Update to 0.18.0. [inputs]: Use bdb-4.8 for compatibility. [arguments]: Remove --with-incompatible-bdb from configure flags and add check-functional phase for functional tests. --- gnu/packages/finance.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 550354b650..972b4973d0 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -78,7 +78,7 @@ (define-public bitcoin-core (package (name "bitcoin-core") - (version "0.17.1") + (version "0.18.0") (source (origin (method url-fetch) (uri @@ -86,7 +86,7 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "0am4pnaf2cisv172jqx6jdpzx770agm8777163lkjbw3ryslymiy")))) + "0ps0vw9iknz1b1sx74rabd1yhlxvwbd0aimjzn9hlqkvw286hkjy")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -94,7 +94,7 @@ ("util-linux" ,util-linux) ; provides the hexdump command for tests ("qttools" ,qttools))) (inputs - `(("bdb" ,bdb-5.3) ; with 6.2.23, there is an error: ambiguous overload + `(("bdb" ,bdb-4.8) ; Bitcoin Core requires bdb 4.8 for compatibility ("boost" ,boost) ("libevent" ,libevent) ("miniupnpc" ,miniupnpc) @@ -104,8 +104,6 @@ (arguments `(#:configure-flags (list - ;; We use a bdb version newer than 4.8. - "--with-incompatible-bdb" ;; Boost is not found unless specified manually. (string-append "--with-boost=" (assoc-ref %build-inputs "boost")) @@ -128,6 +126,11 @@ (add-before 'check 'set-home (lambda _ (setenv "HOME" (getenv "TMPDIR")) ; Tests write to $HOME. + #t)) + (add-after 'check 'check-functional + (lambda _ + (invoke "python3" "./test/functional/test_runner.py" + (string-append "--jobs=" (number->string (parallel-job-count)))) #t))))) (home-page "https://bitcoin.org/en/") (synopsis "Bitcoin peer-to-peer client") -- cgit v1.2.3 From ca3757e1c2fdc1576d17239a57f0a493a47bc6dc Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 8 Jul 2019 21:20:17 -0400 Subject: gnu: glibc: Add 2.27 supported locales patch. The 'glibc-supported-locales.patch' was updated for glibc 2.29, breaking compatibility with 2.27. Add a 2.27-specific supported locales patch. * gnu/packages/patches/glibc-2.27-supported-locales.patch: New file. * gnu/packages/base.scm (glibc-2.27)[source](patches): Use 'glibc-2.27-supported-locales.patch' instead. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 + gnu/packages/base.scm | 2 +- .../patches/glibc-2.27-supported-locales.patch | 33 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-2.27-supported-locales.patch diff --git a/gnu/local.mk b/gnu/local.mk index bac1a92741..f63ff1ff1e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -876,6 +876,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.28-supported-locales.patch \ %D%/packages/patches/glibc-2.29-git-updates.patch \ %D%/packages/patches/glibc-supported-locales.patch \ + %D%/packages/patches/glibc-2.27-supported-locales.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f26145cb0b..5878cbec5e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -854,7 +854,7 @@ with the Linux kernel.") "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" + "glibc-2.27-supported-locales.patch" "glibc-CVE-2018-11236.patch" "glibc-CVE-2018-11237.patch")))) (properties `((lint-hidden-cve . ("CVE-2017-18269")))))) ; glibc-2.27-git-fixes diff --git a/gnu/packages/patches/glibc-2.27-supported-locales.patch b/gnu/packages/patches/glibc-2.27-supported-locales.patch new file mode 100644 index 0000000000..2888052bb8 --- /dev/null +++ b/gnu/packages/patches/glibc-2.27-supported-locales.patch @@ -0,0 +1,33 @@ +This patch is taken from debian's glibc package (generate-supported.mk). +It install the localedata/SUPPORTED file of the glibc. This file lists +all the supported locales of the glibc. + +diff --git a/localedata/Makefile.old b/localedata/Makefile +index 34877c0..a61d9b9 100644 +--- a/localedata/Makefile.old ++++ b/localedata/Makefile +@@ -91,7 +91,8 @@ endif + # Files to install. + install-others := $(addprefix $(inst_i18ndir)/, \ + $(addsuffix .gz, $(charmaps)) \ +- $(locales)) ++ $(locales)) \ ++ $(inst_i18ndir)/SUPPORTED + + tests: $(objdir)/iconvdata/gconv-modules + +@@ -195,6 +196,14 @@ endif + + include SUPPORTED + ++$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) ++ for locale in $(SUPPORTED-LOCALES); do \ ++ [ $$locale = true ] && continue; \ ++ echo $$locale | sed 's,/, ,' >> LOCALES; \ ++ done ++ $(make-target-directory) ++ $(INSTALL_DATA) LOCALES $@ ++ + INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. -- cgit v1.2.3 From d4137d84ac75edaf2739578d0868cd77dd6da43c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 4 Jul 2019 06:49:29 -0400 Subject: gnu: make-glibc-locales: Adjust patch for glibc 2.29. The patch for glibc 2.28 and earlier replaces the same content, but the context in the patch is different enough to fail to merge. * gnu/packages/base.scm (make-glibc-locales)[source]: Add patch. * gnu/packages/patches/glibc-locales.patch: Adjust for glibc 2.29 and move old file... * gnu/packages/patches/glibc-locales-2.28.patch: ...here. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/base.scm | 9 +++++++- gnu/packages/patches/glibc-locales-2.28.patch | 31 +++++++++++++++++++++++++++ gnu/packages/patches/glibc-locales.patch | 17 ++++++++------- 4 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/glibc-locales-2.28.patch diff --git a/gnu/local.mk b/gnu/local.mk index f63ff1ff1e..e142122e6b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -867,6 +867,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ + %D%/packages/patches/glibc-locales-2.28.patch \ %D%/packages/patches/glibc-o-largefile.patch \ %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch \ %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 5878cbec5e..0df40d9c50 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -999,7 +999,14 @@ with the Linux kernel.") (inherit glibc) (name "glibc-locales") (source (origin (inherit (package-source glibc)) - (patches (cons (search-patch "glibc-locales.patch") + ;; The patch for glibc 2.28 and earlier replaces the same + ;; content, but the context in the patch is different + ;; enough to fail to merge. + (patches (cons (search-patch + (if (version>=? (package-version glibc) + "2.29") + "glibc-locales.patch" + "glibc-locales-2.28.patch")) (origin-patches (package-source glibc)))))) (synopsis "All the locales supported by the GNU C Library") (description diff --git a/gnu/packages/patches/glibc-locales-2.28.patch b/gnu/packages/patches/glibc-locales-2.28.patch new file mode 100644 index 0000000000..31ee6c1ff3 --- /dev/null +++ b/gnu/packages/patches/glibc-locales-2.28.patch @@ -0,0 +1,31 @@ +This patch allows us to use glibc's build system to build locales +in a package separate from glibc. + + 1. Use 'localedef' from $PATH since we are not rebuilding it. + 2. Use '--no-archive' to avoid building the big locale archive, and + because the already-built 'localedef' would want to write it + to '/run/current-system/locale', which is not possible. + 3. Pass $(inst_complocaledir)/$$locale to install files in the right + place, and because otherwise, 'localedef' fails with: + "cannot write output files to `(null)'". + +--- glibc-2.27/localedata/Makefile ++++ glibc-2.27/localedata/Makefile +@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) + + # Sometimes the whole collection of locale files should be installed. + LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ +-$(rtld-prefix) $(common-objpfx)locale/localedef ++ localedef --no-archive + install-locales: $(INSTALL-SUPPORTED-LOCALES) + + install-locales-dir: +@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir + input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ + $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ + -i locales/$$input -f charmaps/$$charset \ +- $(addprefix --prefix=,$(install_root)) $$locale \ ++ $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ + && echo ' done'; \ + + tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP diff --git a/gnu/packages/patches/glibc-locales.patch b/gnu/packages/patches/glibc-locales.patch index 31ee6c1ff3..9329a09063 100644 --- a/gnu/packages/patches/glibc-locales.patch +++ b/gnu/packages/patches/glibc-locales.patch @@ -9,23 +9,24 @@ in a package separate from glibc. place, and because otherwise, 'localedef' fails with: "cannot write output files to `(null)'". ---- glibc-2.27/localedata/Makefile -+++ glibc-2.27/localedata/Makefile -@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) +diff -ru glibc-2.29-old/localedata/Makefile glibc-2.29-new/localedata/Makefile +--- glibc-2.29-old/localedata/Makefile 2019-01-31 11:45:36.000000000 -0500 ++++ glibc-2.29-new/localedata/Makefile 2019-07-03 22:48:35.662015071 -0400 +@@ -385,7 +385,7 @@ # Sometimes the whole collection of locale files should be installed. LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ -$(rtld-prefix) $(common-objpfx)locale/localedef + localedef --no-archive - install-locales: $(INSTALL-SUPPORTED-LOCALES) + install-locales: install-locale-archive - install-locales-dir: -@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir + # Create and install the locale-archive file. +@@ -414,7 +414,7 @@ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ -i locales/$$input -f charmaps/$$charset \ - $(addprefix --prefix=,$(install_root)) $$locale \ + $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ - && echo ' done'; \ + && echo ' done'; + endef - tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP -- cgit v1.2.3 From 680bc34da4aa067f2d35d6a4015cd33e32dfed2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 20:59:58 +0200 Subject: gnu: Python: Update to 3.7.4. * gnu/packages/python.scm (python-3.7): Update to 3.7.4. [source](snippet): Move disabled tests ... [arguments]<#:make-flags>: ... here. Enable previously failing tests. <#:phases>: Add 'set-TZDIR'. [native-inputs]: Add TZDATA-FOR-TESTS. * gnu/packages/commencement.scm (python-boot0)[arguments]: Clear <#:make-flags>. Delete 'set-TZDIR' phase. * gnu/packages/patches/python-3-fix-tests.patch: Disable two new tests that do not work in the build container. Adjust context. --- gnu/packages/commencement.scm | 6 +++- gnu/packages/patches/python-3-fix-tests.patch | 38 +++++++++++++++++------ gnu/packages/python.scm | 44 ++++++++++++++------------- 3 files changed, 57 insertions(+), 31 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d06aa0a369..ff34392865 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1887,6 +1887,9 @@ the bootstrap environment." ((#:configure-flags _ ''()) `(list "--without-ensurepip" "--without-threads")) + ;; Clear #:make-flags, such that changes to the regular + ;; Python package won't interfere with this one. + ((#:make-flags _ ''()) ''()) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'disable-modules @@ -1897,7 +1900,8 @@ the bootstrap environment." ;; Prevent the 'ossaudiodev' extension from being ;; built, since it requires Linux headers. (("'linux', ") "")) - #t)))) + #t)) + (delete 'set-TZDIR))) ((#:tests? _ #f) #f)))))) (package-with-bootstrap-guile (package-with-explicit-inputs python %boot0-inputs diff --git a/gnu/packages/patches/python-3-fix-tests.patch b/gnu/packages/patches/python-3-fix-tests.patch index e4ba728a7e..e13790bd41 100644 --- a/gnu/packages/patches/python-3-fix-tests.patch +++ b/gnu/packages/patches/python-3-fix-tests.patch @@ -85,7 +85,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing. diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py -@@ -1301,6 +1301,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): +@@ -1323,6 +1323,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self._test_create_connection_ip_addr(m_socket, False) @patch_socket @@ -128,7 +128,7 @@ diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py -@@ -2130,8 +2130,7 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): +@@ -2134,8 +2134,7 @@ class PosixPathTest(_BasePathTest, unittest.TestCase): self.assertEqual(given, expect) self.assertEqual(set(p.rglob("FILEd*")), set()) @@ -141,7 +141,7 @@ diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py --- a/Lib/test/test_pdb.py +++ b/Lib/test/test_pdb.py -@@ -1133,11 +1133,11 @@ def test_pdb_issue_20766(): +@@ -1150,11 +1150,11 @@ def test_pdb_issue_20766(): > (6)test_function() -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) (Pdb) continue @@ -158,7 +158,7 @@ diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py -@@ -764,6 +764,7 @@ class ArgsTestCase(BaseTestCase): +@@ -762,6 +762,7 @@ class ArgsTestCase(BaseTestCase): output = self.run_tests('--fromfile', filename) self.check_executed_tests(output, tests) @@ -166,12 +166,12 @@ diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py def test_interrupted(self): code = TEST_INTERRUPTED test = self.create_test('sigint', code=code) -@@ -781,6 +782,7 @@ class ArgsTestCase(BaseTestCase): +@@ -779,6 +780,7 @@ class ArgsTestCase(BaseTestCase): % (self.TESTNAME_REGEX, len(tests))) self.check_line(output, regex) + @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') - def test_slow_interrupted(self): + def test_slowest_interrupted(self): # Issue #25373: test --slowest with an interrupted test code = TEST_INTERRUPTED diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py @@ -188,7 +188,7 @@ diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py -@@ -1135,6 +1135,7 @@ class TestShutil(unittest.TestCase): +@@ -1143,6 +1143,7 @@ class TestShutil(unittest.TestCase): self.assertRaises(ValueError, make_archive, base_name, 'xxx') @support.requires_zlib @@ -196,7 +196,7 @@ diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py def test_make_archive_owner_group(self): # testing make_archive with owner and group, with various combinations # this works even if there's not gid/uid support -@@ -1163,6 +1164,7 @@ class TestShutil(unittest.TestCase): +@@ -1171,6 +1172,7 @@ class TestShutil(unittest.TestCase): @support.requires_zlib @@ -269,7 +269,7 @@ diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py -@@ -2504,9 +2504,12 @@ def root_is_uid_gid_0(): +@@ -2509,9 +2509,12 @@ def root_is_uid_gid_0(): import pwd, grp except ImportError: return False @@ -285,6 +285,26 @@ diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py return False return True +diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py +--- a/Lib/test/test_threading.py ++++ b/Lib/test/test_threading.py +@@ -1249,6 +1249,7 @@ class MiscTestCase(unittest.TestCase): + + + class InterruptMainTests(unittest.TestCase): ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.') + def test_interrupt_main_subthread(self): + # Calling start_new_thread with a function that executes interrupt_main + # should raise KeyboardInterrupt upon completion. +@@ -1260,6 +1261,8 @@ class InterruptMainTests(unittest.TestCase): + t.join() + t.join() + ++ ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build container.') + def test_interrupt_main_mainthread(self): + # Make sure that if interrupt_main is called in main thread that + # KeyboardInterrupt is raised instantly. diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 68ea23ff57..9fec18287e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -76,6 +76,7 @@ (define-module (gnu packages python) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages dbm) @@ -324,7 +325,7 @@ data types.") (define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.7.3") + (version "3.7.4") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -335,7 +336,7 @@ data types.") "python-3-search-paths.patch")) (sha256 (base32 - "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s")) + "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv")) (modules '((guix build utils))) (snippet '(begin @@ -344,33 +345,31 @@ data types.") (substitute* "Modules/Setup.dist" ;; Link Expat instead of embedding the bundled one. (("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n")) - - (for-each delete-file - '(;; This test may hang and eventually run out of - ;; memory on some systems: - ;; - "Lib/test/test_socket.py" - - ;; Delete test that fails on low-memory systems. - "Lib/test/test_mmap.py" - - ;; These tests fail on AArch64. - "Lib/ctypes/test/test_win32.py" - "Lib/test/test_fcntl.py" - "Lib/test/test_posix.py")) #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:make-flags _) `(list (string-append (format #f "TESTOPTS=-j~d" (parallel-job-count)) - ;; Exclude the following test, which fails as of 3.7.3 (see: - ;; https://bugs.python.org/issue35998). - ;; Exclude test_email, which fails with glibc 2.29 and later - ;; (see ). - " --exclude test_asyncio test_email"))) + ;; test_mmap fails on low-memory systems. + " --exclude test_mmap" + ;; test_socket may hang and eventually run out of memory + ;; on some systems: . + " test_socket" + ;; XXX: test_ctypes fails on some platforms due to a problem in + ;; libffi 3.2.1: . + ,@(if (string-prefix? "aarch64" (%current-system)) + '(" test_ctypes") + '())))) ((#:phases phases) `(modify-phases ,phases + (add-before 'check 'set-TZDIR + (lambda* (#:key inputs #:allow-other-keys) + ;; test_email requires the Olson time zone database. + (setenv "TZDIR" + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")) + #t)) ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it ;; again afterwards. See . (add-before 'check 'unset-SOURCE_DATE_EPOCH @@ -399,6 +398,9 @@ data types.") (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) #t))))))) + (native-inputs + `(("tzdata" ,tzdata-for-tests) + ,@(package-native-inputs python-2))) (native-search-paths (list (search-path-specification (variable "PYTHONPATH") -- cgit v1.2.3 From 33f460addfcc737a7a80dab244211811283b77f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 21:07:13 +0200 Subject: gnu: flex: Remove superfluous input. The configure script will warn that "make indent" is unavailable, but apart from that this input is not actually used for the build process. * gnu/packages/flex.scm (flex)[inputs]: Remove INDENT. * gnu/packages/commencement.scm (flex-boot0)[inputs]: Likewise. --- gnu/packages/commencement.scm | 3 +-- gnu/packages/flex.scm | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ff34392865..1107bb24d2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -33,7 +33,6 @@ #:use-module (gnu packages c) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) - #:use-module (gnu packages code) #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages bison) @@ -1742,7 +1741,7 @@ exec " gcc "/bin/" program (let* ((flex (package (inherit flex) (native-inputs `(("bison" ,bison-boot0))) (propagated-inputs `(("m4" ,m4))) - (inputs `(("indent" ,indent))) + (inputs '()) (arguments '(#:tests? #f))))) (package-with-bootstrap-guile (package-with-explicit-inputs flex %boot0-inputs diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 6038e92744..f9a21204d9 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -27,7 +27,6 @@ #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages bison) - #:use-module (gnu packages code) #:use-module (srfi srfi-1)) (define-public flex @@ -53,8 +52,7 @@ (substitute-keyword-arguments (package-arguments bison) ((#:tests? _ #f) #f))) (inputs (alist-delete "flex" (package-inputs bison)))))) - `(("bison" ,bison-for-tests) - ("indent" ,indent)))) + `(("bison" ,bison-for-tests)))) ;; m4 is not present in PATH when cross-building (native-inputs `(("help2man" ,help2man) -- cgit v1.2.3 From 7fe6dcf70809b8aa4a94f9bb4aa6f0743bf66d21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 21:09:47 +0200 Subject: gnu: Remove indent@2.2.10. * gnu/packages/code.scm (indent): Update to 2.2.12. [native-inputs]: Add TEXINFO. (indent-2.2.12): Remove variable. --- gnu/packages/code.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index c5dfa4aa7a..13e2c4ad44 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -626,13 +626,13 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") (define-public indent (package (name "indent") - (version "2.2.10") + (version "2.2.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/indent/indent-" version ".tar.gz")) - (sha256 (base32 - "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa")))) + (sha256 + (base32 "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7")))) (build-system gnu-build-system) (arguments `(#:phases @@ -645,6 +645,8 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") (substitute* "doc/Makefile.in" (("^docdir = .*$") "docdir = @docdir@\n")) #t))))) + (native-inputs + `(("texinfo" ,texinfo))) (synopsis "Code reformatter") (description "Indent is a program that makes source code easier to read by @@ -655,19 +657,6 @@ extensions over the standard utility.") (license license:gpl3+) (home-page "https://www.gnu.org/software/indent/"))) -(define-public indent-2.2.12 - (package - (inherit indent) - (version "2.2.12") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/indent/indent-" version - ".tar.gz")) - (sha256 - (base32 - "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7")))) - (native-inputs `(("texinfo" ,texinfo))))) - (define-public amalgamate (let* ((commit "c91f07eea1133aa184f652b8f1398eaf03586208") (revision "0") -- cgit v1.2.3 From e81b14f08d62b7fc3ffcef0fce56968d2a7eb8a4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 21:26:21 +0200 Subject: gnu: freetype: Update to 2.10.1. * gnu/packages/fontutils.scm (freetype): Update to 2.10.1. [source](uri): Adjust for new tarball name. --- gnu/packages/fontutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 725d3ac878..8a9a9b8ef7 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -58,13 +58,13 @@ (define-public freetype (package (name "freetype") - (version "2.10.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w")))) + "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn")))) (build-system gnu-build-system) (arguments ;; The use of "freetype-config" is deprecated, but other packages still -- cgit v1.2.3 From 9e13a3e05928d0f9a052909c35cb59db5c07cffc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 22:16:30 +0200 Subject: gnu: glib: Update to 2.60.5. * gnu/packages/glib.scm (glib): Update to 2.60.5. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2f8b2bda5e..f50dba03ea 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -160,7 +160,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.60.4") + (version "2.60.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -168,7 +168,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1p9k8z83272mkm4d4fhm5jhwhyw2basrwbz47yl5wbmrvk2ix51b")) + "0bk2l9mhvc44c0gfg442wrifwj2fci1w71dsp3nb50pffvsivpry")) (patches (search-patches "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 4e073dcd41d47d4e67cc398288bc35edc16ee549 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 22:17:39 +0200 Subject: gnu: glib: Remove superfluous input. * gnu/packages/glib.scm (glib)[inputs]: Remove BASH. --- gnu/packages/glib.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f50dba03ea..3d17bc768f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -30,7 +30,6 @@ #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages base) - #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -195,7 +194,6 @@ shared NFS home directories.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("perl" ,perl) ; needed by GIO tests - ("bash" ,bash) ("tzdata" ,tzdata-for-tests))) ; for tests/gdatetime.c (arguments `(#:phases -- cgit v1.2.3 From 78affefecc4a3c92a550be22ae0c357f273df659 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jul 2019 23:35:30 +0200 Subject: gnu: oath-toolkit: Fix FTBFS with GCC 7. * gnu/packages/authentication.scm (oath-toolkit)[source](patches): Add upstream patch. --- gnu/packages/authentication.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index 68a6459828..70f2a8c103 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -26,8 +26,6 @@ #:use-module (guix packages)) (define-public oath-toolkit - ;; If gcc@7 breaks this package before its next release, try patching it: - ;; . (package (name "oath-toolkit") (version "2.6.2") @@ -36,7 +34,18 @@ (method url-fetch) (uri (string-append "https://download.savannah.nongnu.org/releases/" name "/" name "-" version ".tar.gz")) - (patches (search-patches "oath-toolkit-glibc-compat.patch")) + (patches + (append (search-patches "oath-toolkit-glibc-compat.patch") + (list (origin + ;; This huge commit updates gnulib for GCC 7 compatibility. + (method url-fetch) + (uri (string-append + "https://gitlab.com/oath-toolkit/oath-toolkit/commit/" + "2fffce2a471f74a585939c84cce16ef3015e5d3d.diff")) + (file-name "oath-toolkit-update-gnulib.patch") + (sha256 + (base32 + "088c9s4ay1b54bjqc4mwfs5l3f6357zj5vpw771zlq5g4addd4s0")))))) (sha256 (base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h")))) (build-system gnu-build-system) -- cgit v1.2.3 From c1f4073ff53aa6b958441b7457692a1e146ab565 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jul 2019 00:29:32 +0200 Subject: gnu: rapidjson: Fix FTBFS with GCC 7. * gnu/packages/patches/rapidjson-gcc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/web.scm (rapidjson)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/rapidjson-gcc-compat.patch | 18 ++++++++++++++++++ gnu/packages/web.scm | 1 + 3 files changed, 20 insertions(+) create mode 100644 gnu/packages/patches/rapidjson-gcc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index e142122e6b..c8fa44d1cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1240,6 +1240,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/rapicorn-isnan.patch \ + %D%/packages/patches/rapidjson-gcc-compat.patch \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoints-sturm_and_rp_private.patch \ %D%/packages/patches/ratpoison-shell.patch \ diff --git a/gnu/packages/patches/rapidjson-gcc-compat.patch b/gnu/packages/patches/rapidjson-gcc-compat.patch new file mode 100644 index 0000000000..b5ffc0a908 --- /dev/null +++ b/gnu/packages/patches/rapidjson-gcc-compat.patch @@ -0,0 +1,18 @@ +Disable -Werror=implicit-fallthrough on GCC7 and later. Taken from upstream: +https://github.com/Tencent/rapidjson/commit/fe19b7b6016d446722621fb407738209d1a911e8 +https://github.com/Tencent/rapidjson/commit/cba45fe9de6923b858edb0780e257b7257aa4f7b + +diff --git a/include/rapidjson/internal/regex.h b/include/rapidjson/internal/regex.h +index 422a5240..d4039716 100644 +--- a/include/rapidjson/internal/regex.h ++++ b/include/rapidjson/internal/regex.h +@@ -29,6 +29,9 @@ RAPIDJSON_DIAG_OFF(implicit-fallthrough) + #ifdef __GNUC__ + RAPIDJSON_DIAG_PUSH + RAPIDJSON_DIAG_OFF(effc++) ++#if __GNUC__ >= 7 ++RAPIDJSON_DIAG_OFF(implicit-fallthrough) ++#endif + #endif + + #ifdef _MSC_VER diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 42c00e77a5..687c92e2a6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -761,6 +761,7 @@ current version of any major web browser.") (sha256 (base32 "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab")) + (patches (search-patches "rapidjson-gcc-compat.patch")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From fa0d5854ef9105b7585b9c7f9d8dcc2966e254e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jul 2019 20:23:46 +0200 Subject: gnu: ToME4: Fix FTBFS with GCC 7. * gnu/packages/games.scm (tome4)[arguments]: Preserve CPATH in 'set-sdl-paths' phase.. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a102dc962f..b6a63aba02 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4981,7 +4981,8 @@ Crowther & Woods, its original authors, in 1995. It has been known as (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2")) + "/include/SDL2:" + (getenv "CPATH"))) #t)) (delete 'check) ;; premake doesn't provide install target -- cgit v1.2.3 From ff1e80d7918df85b78216a70ab31062af320c0e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jul 2019 20:25:40 +0200 Subject: gnu: python-cram: Fix build. * gnu/packages/python-xyz.scm (python-cram)[arguments]: Do not require 100% test coverage. While here, do not move the 'check' phase, as PYTHON-BUILD-SYSTEM now runs tests after install by default. --- gnu/packages/python-xyz.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f3fae63f59..ee347a3abf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6622,12 +6622,16 @@ pseudo terminal (pty), and interact with both the process and its pty.") ;; lines, but the test expects a single line... (("env\\['COLUMNS'\\] = '80'") "env['COLUMNS'] = '160'")) + + (substitute* "Makefile" + ;; Recent versions of python-coverage have caused the test + ;; coverage to decrease (as of version 0.7). Allow that. + (("--fail-under=100") + "--fail-under=90")) + #t)) - (delete 'check) - (add-after 'install 'check + (replace 'check ;; The test phase uses the built library and executable. - ;; It's easier to run it after install since the build - ;; directory contains version-specific PATH. (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (setenv "PATH" (string-append (getenv "PATH") ":" -- cgit v1.2.3 From 568d060327291dd3fcb0e20c3b5c493047ae6902 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Jul 2019 15:40:20 +0200 Subject: gnu: libselinux: Install python bindings to separate output. This reduces the closure size of glib from 203.1 to 111.3 MiB. * gnu/packages/selinux.scm (libselinux)[outputs]: New field. [arguments]: Set PYSITEDIR to the new "python" output. --- gnu/packages/selinux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index e540a140a1..1c45cb8c7e 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -131,6 +131,7 @@ module into a binary representation.") (define-public libselinux (package (inherit libsepol) (name "libselinux") + (outputs '("out" "python")) (arguments (substitute-keyword-arguments (package-arguments libsepol) ((#:make-flags flags) @@ -139,7 +140,7 @@ module into a binary representation.") (assoc-ref %build-inputs "libsepol") "/lib/libsepol.a") (string-append "PYSITEDIR=" - (assoc-ref %outputs "out") + (assoc-ref %outputs "python") "/lib/python" ,(version-major+minor (package-version python)) "/site-packages/") -- cgit v1.2.3 From dc23bb451365919f0bc7c2b6ec5707c23bca9629 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Jul 2019 15:42:42 +0200 Subject: gnu: python-pyicu: Update to 2.3.1. * gnu/packages/python-xyz.scm (python-pyicu): Update to 2.3.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee347a3abf..952f2436fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1204,14 +1204,14 @@ Python 3.3+.") (define-public python-pyicu (package (name "python-pyicu") - (version "2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "PyICU" version)) (sha256 (base32 - "0wq9y5fi1ighgf5aws9nr87vi1w44p7q1k83rx2y3qj5d2xyhspa")))) + "1x4w8m7ifki9z2a187pgjr33z6z0rp2fii9b73djak1vhm9v9cnx")))) (build-system python-build-system) (inputs `(("icu4c" ,icu4c))) -- cgit v1.2.3 From 1c4b72cb34640638e40c5190676e5c8c352d292d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Jul 2019 19:17:57 +0200 Subject: gnu: harfbuzz: Create hb-gobject-enums.h. * gnu/packages/gtk.scm (harfbuzz)[native-inputs]: Add GLIB:BIN. --- gnu/packages/gtk.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2c751667dc..563895458c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -199,7 +199,8 @@ affine transformation (scale, rotation, shear, etc.).") ("graphite2" ,graphite2) ("icu4c" ,icu4c))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(("glib:bin" ,glib "bin") ;for glib-mkenums + ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("which" ,which))) -- cgit v1.2.3 From 60ccc1653a8ed040bbdfbc89f010614b0d9c4139 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 01:05:13 +0200 Subject: gnu: Remove expat/fixed. The merge preceding this commit (fb9a23a3f3) ignored the replacement added in 5a836ce38c (gnu: expat: fix CVE-2018-20843), because the fix is already present in Expat 2.2.7. This commit removes the remaining bits. * gnu/packages/patches/expat-CVE-2018-20843.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/xml.scm (expat/fixed): Remove variable. --- gnu/local.mk | 1 - gnu/packages/patches/expat-CVE-2018-20843.patch | 21 --------------------- gnu/packages/xml.scm | 8 -------- 3 files changed, 30 deletions(-) delete mode 100644 gnu/packages/patches/expat-CVE-2018-20843.patch diff --git a/gnu/local.mk b/gnu/local.mk index b9575ad201..75cb7b62af 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -781,7 +781,6 @@ dist_patch_DATA = \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ - %D%/packages/patches/expat-CVE-2018-20843.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ %D%/packages/patches/fastcap-mulSetup.patch \ diff --git a/gnu/packages/patches/expat-CVE-2018-20843.patch b/gnu/packages/patches/expat-CVE-2018-20843.patch deleted file mode 100644 index 216fbe9667..0000000000 --- a/gnu/packages/patches/expat-CVE-2018-20843.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix extraction of namespace prefix from XML name. -Fixes CVE-2018-20843 - -This patch comes from upstream commit 11f8838bf99ea0a6f0b76f9760c43704d00c4ff6 -https://github.com/libexpat/libexpat/commit/11f8838bf99ea0a6f0b76f9760c43704d00c4ff6 - -CVE is https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-20843 - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index 30d55c5..737d7cd 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -6071,7 +6071,7 @@ setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *elementType) - else - poolDiscard(&dtd->pool); - elementType->prefix = prefix; -- -+ break; - } - } - return 1; diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e708348006..78b9b713e5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -88,14 +88,6 @@ stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags).") (license license:expat))) -(define expat/fixed - (package - (inherit expat) - (source - (origin - (inherit (package-source expat)) - (patches (search-patches "expat-CVE-2018-20843.patch")))))) - (define-public libebml (package (name "libebml") -- cgit v1.2.3 From ee46474d54a661e87cd501c3fde6e572b3423a60 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:50:14 +0200 Subject: gnu: glib: Fix argument handling in keyfile backend. * gnu/packages/patches/glib-keyfile-arguments.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (glib)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 3 ++- gnu/packages/patches/glib-keyfile-arguments.patch | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glib-keyfile-arguments.patch diff --git a/gnu/local.mk b/gnu/local.mk index 75cb7b62af..0a34b917ce 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -851,6 +851,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ + %D%/packages/patches/glib-keyfile-arguments.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3d17bc768f..8f1b91e142 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -168,7 +168,8 @@ shared NFS home directories.") (sha256 (base32 "0bk2l9mhvc44c0gfg442wrifwj2fci1w71dsp3nb50pffvsivpry")) - (patches (search-patches "glib-tests-timer.patch")) + (patches (search-patches "glib-tests-timer.patch" + "glib-keyfile-arguments.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/glib-keyfile-arguments.patch b/gnu/packages/patches/glib-keyfile-arguments.patch new file mode 100644 index 0000000000..8d428f4192 --- /dev/null +++ b/gnu/packages/patches/glib-keyfile-arguments.patch @@ -0,0 +1,20 @@ +Fix a problem with the keyfile backend whereby instantiating it with +the default NULL value would cause an assertion error: + +https://gitlab.gnome.org/GNOME/glib/issues/1825 + +This issue showed up when running the test suites of uhttpmock and spice. + +diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c +--- a/gio/gkeyfilesettingsbackend.c ++++ b/gio/gkeyfilesettingsbackend.c +@@ -740,7 +740,8 @@ g_keyfile_settings_backend_set_property (GObject *object, + case PROP_FILENAME: + /* Construct only. */ + g_assert (kfsb->file == NULL); +- kfsb->file = g_file_new_for_path (g_value_get_string (value)); ++ if (g_value_get_string (value)) ++ kfsb->file = g_file_new_for_path (g_value_get_string (value)); + break; + + case PROP_ROOT_PATH: -- cgit v1.2.3 From 4b8f131345132c3d563374f132c2552f387c991a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:51:22 +0200 Subject: gnu: glib-networking: Remove unused input. This is a follow-up to commit 0d75c64d7844bf35b4e1cd09bcc50b2a1005c191. * gnu/packages/gnome.scm (glib-networking)[inputs]: Remove P11-KIT. --- gnu/packages/gnome.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92f5abc292..aa9731b0fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2613,8 +2613,7 @@ library.") (inputs `(("glib" ,glib) ("gnutls" ,gnutls) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("p11-kit" ,p11-kit))) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (home-page "https://www.gnome.org") (synopsis "Network-related GIO modules") (description -- cgit v1.2.3 From 03ecf85a761fce24e5c164b501f1f0823ba54342 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 16:51:57 +0200 Subject: gnu: gcr: Fix build with recent Glib. * gnu/packages/gnome.scm (gcr)[source](patches): New field. --- gnu/packages/gnome.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aa9731b0fc..ab32cd642b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -601,7 +601,20 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")))) + "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")) + (patches + (list + ;; This patch solves an ordering issue that showed up when + ;; running the test suite against newer Glib 2.60. See + ;; . + (origin + (method url-fetch) + (uri (string-append "https://gitlab.gnome.org/GNOME/gcr/commit/" + "45d637578d7643ff96c0183ac267497a0b4c6344.diff")) + (file-name "gcr-hashtable-ordering.patch") + (sha256 + (base32 + "1vsqiys8fsm1f1vvds783wwf7zwi5v282rhsai8jrsm6x7h79gbi"))))))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 44d9e575df891a45a7658e20e89deb46e95a6ce2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 17:37:32 +0200 Subject: gnu: gtksourceview: Update to 4.2.0. * gnu/packages/gtk.scm (gtksourceview): Update to 4.2.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 563895458c..9086e4945b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -398,7 +398,7 @@ printing and other features typical of a source code editor.") (define-public gtksourceview (package (name "gtksourceview") - (version "4.0.3") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gtksourceview/" @@ -406,7 +406,7 @@ printing and other features typical of a source code editor.") "gtksourceview-" version ".tar.xz")) (sha256 (base32 - "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x")))) + "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 07ace64143c7fddf4c54b56b6807559296ab44ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 17:37:54 +0200 Subject: gnu: gnome-calculator: Update to 3.32.2. * gnu/packages/gnome.scm (gnome-calculator): Update to 3.32.2. [inputs]: Change GTKSOURCEVIEW-3 to GTKSOURCEVIEW. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab32cd642b..5e90557b89 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7163,7 +7163,7 @@ handling the startup notification side.") (define-public gnome-calculator (package (name "gnome-calculator") - (version "3.30.1") + (version "3.32.2") (source (origin (method url-fetch) @@ -7172,7 +7172,7 @@ handling the startup notification side.") name "-" version ".tar.xz")) (sha256 (base32 - "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc")))) + "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) (native-inputs @@ -7184,7 +7184,7 @@ handling the startup notification side.") ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) - ("gtksourceview" ,gtksourceview-3) + ("gtksourceview" ,gtksourceview) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("mpc" ,mpc) -- cgit v1.2.3 From 56174ade333eca022626abb7ce93a03c698229c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:21:11 +0200 Subject: gnu: Add rpcsvc-proto. * gnu/packages/onc-rpc.scm (rpcsvc-proto): New public variable. --- gnu/packages/onc-rpc.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 9646fbf4bd..d3149a4629 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,6 +102,26 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") universal addresses.") (license bsd-3))) +(define-public rpcsvc-proto + (package + (name "rpcsvc-proto") + (version "1.4") + (home-page "https://github.com/thkukuk/rpcsvc-proto") + (source (origin + (method url-fetch) + (uri (string-append home-page "/releases/download/v" version + "/rpcsvc-proto-" version ".tar.xz")) + (sha256 + (base32 + "0i93wbpw5dk2gf5v4a5hq6frh814wzgjydh7saj28wlgbpqdaja1")))) + (build-system gnu-build-system) + (synopsis "RPCSVC protocol definitions") + (description + "This package provides @code{rpcsvc} @file{protocol.x} files and headers +that are not included with the @code{libtirpc} package. Additionally it +contains @command{rpcgen}, which is used to produce header files and sources +from the protocol files.") + (license bsd-3))) (define-public libnsl (package -- cgit v1.2.3 From 2f15e0a1ebf74c5b4b645354db64daf65cd18e0b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 16 Jun 2019 08:21:57 +0200 Subject: gnu: samba: Provide 'rpcgen'. Glibc no longer includes Sun/ONC RPC support since commit 3670ea70e2e932969a3ffc0acf75a714c7b42540. * gnu/packages/samba.scm (samba)[native-inputs]: Add RPCSVC-PROTO. --- gnu/packages/samba.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 812a36ca9a..4ecac8ab55 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages kerberos) #:use-module (gnu packages linux) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -225,6 +226,7 @@ anywhere.") (native-inputs `(("docbook-xsl" ,docbook-xsl) ;for generating manpages ("xsltproc" ,libxslt) ;ditto + ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen' ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From 838a52a5fd148c899f5d254147f9407aa7e179cd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 19:45:47 +0200 Subject: gnu: vte: Update to 0.56.3. * gnu/packages/gnome.scm (vte): Update to 0.56.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5e90557b89..aeeff5b92a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2302,7 +2302,7 @@ libraries written in C.") (define-public vte (package (name "vte") - (version "0.54.2") + (version "0.56.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2310,7 +2310,7 @@ libraries written in C.") name "-" version ".tar.xz")) (sha256 (base32 - "0d1q2nc7lic4zax6csy7xdxq8hxjsf7m7dq6a21s1w8s2fslhzaj")))) + "0j166gic5znssdb9r45qazq4kb4v9fial82czand5wa8i2yd988p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 70f2b0f97d9bda374bf4a6deddfde2ea3e38d016 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 19:50:28 +0200 Subject: gnu: libgnomekbd: Update to 3.26.1. * gnu/packages/gnome.scm (libgnomekbd): Update to 3.26.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aeeff5b92a..9c9f69258a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7094,7 +7094,7 @@ GLib/GObject code.") (define-public libgnomekbd (package (name "libgnomekbd") - (version "3.26.0") + (version "3.26.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7102,7 +7102,7 @@ GLib/GObject code.") name "-" version ".tar.xz")) (sha256 (base32 - "0xc8jrc44x2h24v28wv36k70k7bwxy6p2vsvxvvia1n3ay642fza")))) + "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 7555d539245ff3456848c02d61f9e601ee5af463 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jul 2019 20:07:12 +0200 Subject: gnu: gnome-online-accounts: Fix cyclic reference in outputs. This exploits a new feature of 'gobject-introspection-absolute-shlibs.patch'. * gnu/packages/gnome.scm (gnome-online-accounts)[arguments]: Set the "outputs" variable before building. --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9c9f69258a..4c7847ba94 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5089,6 +5089,9 @@ window manager.") (("@libdir@") (string-append lib "/lib")) (("@includedir@") (string-append lib "/include")) (("@datadir@") (string-append lib "/share"))) + ;; Make sure gobject-introspection knows about the output + ;; too (see ). + (setenv "outputs" "out lib") #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. -- cgit v1.2.3 From 4c482696a68fc68ddd56fad2d397873089f1d0a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 01:43:47 +0200 Subject: gnu: node: Update to 10.16.0. * gnu/packages/node.scm (node): Update to 10.16.0. [arguments]: Enable previously failing tests. Disable 'sequential/test-performance.js' and 'parallel/test-dns.js'. --- gnu/packages/node.scm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index df59a42c74..05da1ba0e1 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -45,14 +45,14 @@ (define-public node (package (name "node") - (version "10.15.3") + (version "10.16.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "1mcijznh481s44i59p571a38bfvcxm9f8x2l0l1005aly0kdj8jf")) + "0236jlb1hxhzqjlmmlxipcycrndiq92c8434iyy7zshh3n4pzqqq")) (modules '((guix build utils))) (snippet `(begin @@ -95,7 +95,8 @@ (substitute* '("lib/child_process.js" "lib/internal/v8_prof_polyfill.js" "test/parallel/test-child-process-spawnsync-shell.js" - "test/parallel/test-stdio-closed.js") + "test/parallel/test-stdio-closed.js" + "test/sequential/test-child-process-emfile.js") (("'/bin/sh'") (string-append "'" (which "sh") "'"))) @@ -109,18 +110,13 @@ ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. (for-each delete-file - '("test/async-hooks/test-ttywrap.readstream.js" - "test/parallel/test-util-inspect.js" - "test/parallel/test-v8-serdes.js" - "test/parallel/test-dgram-membership.js" - "test/parallel/test-dns-cancel-reverse-lookup.js" - "test/parallel/test-dns-resolveany.js" - "test/parallel/test-cluster-master-error.js" + '("test/parallel/test-cluster-master-error.js" "test/parallel/test-cluster-master-kill.js" - "test/parallel/test-net-listen-after-destroying-stdin.js" - "test/parallel/test-npm-install.js" - "test/sequential/test-child-process-emfile.js" - "test/sequential/test-http-regr-gh-2928.js")) + ;; See also . + "test/sequential/test-performance.js")) + + ;; This requires a DNS resolver. + (delete-file "test/parallel/test-dns.js") ;; These tests have an expiry date: they depend on the validity of ;; TLS certificates that are bundled with the source. We want this -- cgit v1.2.3 From da460865074bf3cc3b3c51e7678909e7e755787a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:50:59 +0200 Subject: gnu: python2-cython: Fix failing test. This started failing because Python no longer bundles libexpat since commit d1659c0fb27c4f71c8ddc6a85d3cd9f3a10cca97. * gnu/packages/python-xyz.scm (python2-cython)[arguments]: New field. --- gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac1c66a1d9..943ffdd4cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3239,11 +3239,39 @@ writing C extensions for Python as easy as Python itself.") (properties `((python2-variant . ,(delay python2-cython)))))) (define-public python2-cython - (package (inherit (package-with-python2 - (strip-python2-variant python-cython))) - (name "python2-cython") - (inputs - `(("python-2" ,python-2))))) ; this is not automatically changed + (let ((base (package-with-python2 (strip-python2-variant python-cython)))) + (package + (inherit base) + (name "python2-cython") + (inputs + `(("python-2" ,python-2))) ;this is not automatically changed + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'adjust-test_embed + (lambda _ + (substitute* "runtests.py" + ;; test_embed goes great lengths to find the static libpythonX.Y.a + ;; so it can give the right -L flag to GCC when embedding static + ;; builds of Python. It is unaware that the Python "config" + ;; directory (where the static library lives) was renamed in + ;; Python 3, and falls back to sysconfig.get_config_var('LIBDIR'), + ;; which works fine, because that is where the shared library is. + ;; + ;; It also appears to be unaware that the Makefile in Demos/embed + ;; already unconditionally pass the static library location to GCC, + ;; after checking sysconfig.get_config_var('LIBPL). + ;; + ;; The effect is that the linker is unable to resolve libexpat + ;; symbols when building for Python 2, because neither the Python 2 + ;; shared library nor Expat is available. To fix it, we can either + ;; add Expat as an input and make it visible to the linker, or just + ;; prevent it from overriding the Python shared library location. + ;; The end result is identical, so we take the easy route. + ((" or libname not in os\\.listdir\\(libdir\\)") + "")) + #t))))))))) ;; The RPython toolchain currently does not support Python 3. (define-public python2-rpython -- cgit v1.2.3 From e9194eb04896165f15830862c42673e96bc5c5f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:51:16 +0200 Subject: gnu: python-cython: Speed up test suite. * gnu/packages/python-xyz.scm (python-cython)[arguments]: In the CHECK phase, disable compiler optimizations and enable (some) parallel tests. --- gnu/packages/python-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 943ffdd4cc..a60e1c7e2a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3229,7 +3229,12 @@ provides additional functionality on the produced Mallard documents.") (replace 'check (lambda _ - (invoke "python" "runtests.py" "-vv")))))) + ;; Disable compiler optimizations to greatly reduce the running + ;; time of the test suite. + (setenv "CFLAGS" "-O0") + + (invoke "python" "runtests.py" "-vv" + "-j" (number->string (parallel-job-count)))))))) (home-page "https://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python -- cgit v1.2.3 From 8cae550021279668296e5462868a2c8a59d18c0b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:53:23 +0200 Subject: gnu: gexiv2: Enable tests on all platforms. * gnu/packages/gnome.scm (gexiv2)[arguments]: Remove. --- gnu/packages/gnome.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4c7847ba94..4d7f956162 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4629,14 +4629,6 @@ classes for commonly used data structures.") (base32 "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) (build-system meson-build-system) - (arguments - ;; On 32-bit platforms, the test fails with a rounding error: - ;; . Just skip it for - ;; now. - (if (and (not (%current-target-system)) - (member (%current-system) '("i686-linux" "armhf-linux"))) - '(#:tests? #f) - '())) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 33ef61ec726b6640595f82e38d4d72e6ef73e7e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 19:10:09 +0200 Subject: gnu: fontforge: Remove superfluous input. Pango propagates Glib nowadays, no need to list it eplicitly. * gnu/packages/fontutils.scm (fontforge)[inputs]: Remove GLIB. --- gnu/packages/fontutils.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 8a9a9b8ef7..fb18440bac 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -582,7 +582,6 @@ definitions.") ("fontconfig" ,fontconfig) ;dlopen'd ("freetype" ,freetype) ("gettext" ,gettext-minimal) - ("glib" ,glib) ;needed for pango detection ("libICE" ,libice) ("libSM" ,libsm) ("libX11" ,libx11) -- cgit v1.2.3 From 26a7ff6e10652270a4ef6ef9a08392b31ff86f40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 19:11:06 +0200 Subject: gnu: fontforge: Fix segfault on i686 (and possibly other platforms). * gnu/packages/fontutils.scm (fontforge)[source](patches): New field. --- gnu/packages/fontutils.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index fb18440bac..fe9e77d8c7 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -573,6 +573,19 @@ definitions.") (uri (string-append "https://github.com/fontforge/fontforge/releases/download/" version "/fontforge-" version ".tar.gz")) + (patches (list (origin + ;; This patch is required to fix a segfault on i686: + ;; . + ;; It is a squashed version of these commits: + ;; . + (method url-fetch) + (uri (string-append + "https://github.com/fontforge/fontforge/commit/" + "570e17b82079bb46af9b2be033c6fbb6b1f16c8f.patch")) + (file-name "fontforge-scripting-array-reference.patch") + (sha256 + (base32 + "1w0jbbkml149xmraxwchwrllia853i51ii6jdb3s160r2qbhvggc"))))) (sha256 (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7")))) (build-system gnu-build-system) -- cgit v1.2.3 From 145fed2a2b499e840c22c0165b6c2d062dd2ce88 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Jul 2019 11:43:03 +0100 Subject: gnu: gobject-introspection: Remove hardcoded store from patch. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Use the NIX_STORE environment variable, rather than hardcoding the store directory. --- .../patches/gobject-introspection-absolute-shlib-path.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index 3c0bb1c6cf..956fa617c3 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -61,12 +61,14 @@ parser.add_option_group(group) --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py -@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): +@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): $""" % re.escape(library_name), re.VERBOSE) +def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape('/gnu/store') ++ store_dir = re.escape( ++ os.environ.get("NIX_STORE", default="/gnu/store") ++ ) + pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' + return re.compile(pattern % (store_dir, re.escape(library_name))) + @@ -109,14 +111,15 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): +@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): - for library, pattern in patterns.items(): - m = pattern.match(word) + for library, (pattern, guix_pattern) in patterns.items(): -+ if line.find('/gnu/store') != -1: ++ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") ++ if line.find(store_dir) != -1: + m = guix_pattern.match(word) + else: + m = pattern.match(word) -- cgit v1.2.3 From 4f61513128284fab8745a317b4663e36b042da5d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 13 Jul 2019 17:40:31 -0400 Subject: gnu: Go: Use the default libgcc. * gnu/packages/golang.scm (go-1.4)[inputs]: Replace gcc-6 with gcc. --- gnu/packages/golang.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2f5396dd1e..ba683905d6 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -195,11 +195,7 @@ (inputs `(("tzdata" ,tzdata) ("pcre" ,pcre) - ;; Building Go 1.10 with the Go 1.4 bootstrap, Thread Sanitizer from GCC - ;; 5 finds a data race during the the test suite of Go 1.10. With GCC 6, - ;; the race doesn't seem to be present: - ;; https://github.com/golang/go/issues/24046 - ("gcc:lib" ,gcc-6 "lib"))) + ("gcc:lib" ,gcc "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("which" ,which) -- cgit v1.2.3 From 6005440d988b331db5ea11a475973cee9a5acce6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 13 Jul 2019 19:50:16 -0400 Subject: build-system/go: Fix typo. * guix/build/go-build-system.scm (install): Fix typo. --- guix/build/go-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm index 858068ba98..acaf06b7b8 100644 --- a/guix/build/go-build-system.scm +++ b/guix/build/go-build-system.scm @@ -234,7 +234,7 @@ unpacking." "Install the source code of IMPORT-PATH to the primary output directory. Compiled executable files (Go \"commands\") should have already been installed to the store based on $GOBIN in the build phase. -XXX We can't make us of compiled libraries (Go \"packages\")." +XXX We can't make use of compiled libraries (Go \"packages\")." (when install-source? (if (string-null? import-path) ((display "WARNING: The Go import path is unset.\n"))) -- cgit v1.2.3 From 2be878d8e54057980121e4c659ca48317b79970e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Jul 2019 22:51:48 +0100 Subject: gnu: python-pep8: Patch to fix test failure with Python 3.7. Patch from the upstream repository, see https://github.com/PyCQA/pycodestyle/issues/786 for more details. * gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch: New file. * gnu/packages/python-xyz.scm (python-pep8)[source]: Add it. --- .../python-pep8-stdlib-tokenize-compat.patch | 35 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch diff --git a/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch new file mode 100644 index 0000000000..f11d8f7be8 --- /dev/null +++ b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch @@ -0,0 +1,35 @@ +From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle +Date: Tue, 25 Sep 2018 14:58:57 +1200 +Subject: [PATCH] Keep compability with stdlib tokenize.py changes + +https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 +is not yet part of any release of Python but has been backported to all +versions in Git (includeing 2.7!). It causes the tokenize.py module to +emit a synthetic NEWLINE token for files that do not in fact end with a +newline, which confuses pycodestyle's checks for blank lines at the end +of a file. Fortunately the synthetic NEWLINE tokens are easy to detect +(the token text is ""). + +Fixes #786 +--- + pycodestyle.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pycodestyle.py b/pycodestyle.py +index 0d725d27..fbc3dca3 100755 +--- a/pep8.py ++++ b/pep8.py +@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): + """ + if line_number == total_lines: + stripped_last_line = physical_line.rstrip() +- if not stripped_last_line: ++ if physical_line and not stripped_last_line: + return 0, "W391 blank line at end of file" + if stripped_last_line == physical_line: +- return len(physical_line), "W292 no newline at end of file" ++ return len(lines[-1]), "W292 no newline at end of file" + + + @register_check diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a60e1c7e2a..ac43ef9057 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6350,7 +6350,8 @@ applications.") (uri (pypi-uri "pep8" version)) (sha256 (base32 - "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")))) + "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")) + (patches (search-patches "python-pep8-stdlib-tokenize-compat.patch")))) (build-system python-build-system) (home-page "https://pep8.readthedocs.org/") (synopsis "Python style guide checker") -- cgit v1.2.3 From a5c2e7961c21ef8620ce4cfb3569109fbd694e1e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Jul 2019 22:58:33 +0100 Subject: gnu: python-gst: Fix build failure. Building python-gst fails with: Unbound variable: python-version Therefore, add python-build-system to #:modules so that it's imported, and give it a prefix to avoid clashing with the gnu-build-system. Also, simplify the code by using the site-packages function from the python-build-system module. * gnu/packages/gstreamer.scm (python-gst)[arguments]: Rework to fix build failure. --- gnu/packages/gstreamer.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index b0f0b032b3..18c567e8b0 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -431,17 +431,14 @@ compression formats through the use of the libav library.") "0f1d9rvy2qxlymmfzyknnfr5rz1vx69jv17gp7wnamc5s6p7mp2m")))) (build-system gnu-build-system) (arguments - ;; XXX: Factorize python-sitedir with python-build-system. - `(#:imported-modules (,@%gnu-build-system-modules + `(#:modules ((guix build gnu-build-system) + ((guix build python-build-system) #:prefix python:)) + #:imported-modules (,@%gnu-build-system-modules (guix build python-build-system)) #:configure-flags - (let* ((python (assoc-ref %build-inputs "python")) - (python-version (python-version python)) - (python-sitedir (string-append - "lib/python" python-version "/site-packages"))) - (list (string-append - "--with-pygi-overrides-dir=" %output "/" python-sitedir - "/gi/overrides"))))) + (list (string-append + "--with-pygi-overrides-dir=" + (python:site-packages %build-inputs %outputs) "gi/overrides")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) -- cgit v1.2.3 From 344f358fba76f4ff576c2702819f3cfd7a6c5348 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 17:26:24 +0200 Subject: gnu: rdma-core: Update to 22.3. * gnu/packages/linux.scm (rdma-core): Update to 22.3. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5f2c86b21d..4ccf613a9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3896,7 +3896,7 @@ The package provides additional NTFS tools.") (define-public rdma-core (package (name "rdma-core") - (version "14") + (version "22.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -3904,7 +3904,7 @@ The package provides additional NTFS tools.") version ".tar.gz")) (sha256 (base32 - "0w03zd49k96bmly44qc8l0s9l671sd26k4wrilsp13xaspy048kd")))) + "0jgp1xh328x0kr6lkn4vq71cc627zd05wczr74b3j3151flhj828")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From ad60a3484c6d3221b78dbc6f173ce27bc3b1f96a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 17:30:42 +0200 Subject: gnu: gst-kaldi-nnet2-online: Adjust for GCC 7. * gnu/packages/machine-learning.scm (gst-kaldi-nnet2-online)[arguments]: Don't read CPLUS_INCLUDE_PATH, or pass -std=c++11. End phases on #t. --- gnu/packages/machine-learning.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e216b9474a..fc527363c0 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1139,16 +1139,16 @@ written in C++.") (replace 'configure (lambda* (#:key inputs #:allow-other-keys) (let ((glib (assoc-ref inputs "glib"))) - (setenv "CXXFLAGS" "-std=c++11 -fPIC") + (setenv "CXXFLAGS" "-fPIC") (setenv "CPLUS_INCLUDE_PATH" (string-append glib "/include/glib-2.0:" glib "/lib/glib-2.0/include:" (assoc-ref inputs "gstreamer") - "/include/gstreamer-1.0:" - (getenv "CPLUS_INCLUDE_PATH")))) + "/include/gstreamer-1.0"))) (substitute* "Makefile" (("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "") - (("\\$\\(error Cannot find") "#")))) + (("\\$\\(error Cannot find") "#")) + #t)) (add-before 'build 'build-depend (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "depend" make-flags))) -- cgit v1.2.3 From 97149c576762de7fd8e1a6ac8f46c97d3490b360 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 18:13:34 +0200 Subject: gnu: Adjust uses of C{,PLUS}_INCLUDE_PATH for GCC 7. These variables are no longer set in the build environment by default. GCC still respects these search paths and treats them as "system headers" so we can continue to use them, just not expect them to be available. * gnu/packages/mpi.scm (openmpi)[arguments]: Do not attempt to read from C_INCLUDE_PATH, nor CPLUS_INCLUDE_PATH. * gnu/packages/games.scm (kiki)[arguments]: Likewise. * gnu/packages/networking.scm (hcxtools)[arguments]: Likewise. * gnu/packages/synergy.scm (synergy)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (gemma, sailfish)[arguments]: Likewise. * gnu/packages/maths.scm (dune-alugrid)[arguments]: Likewise. --- gnu/packages/bioinformatics.scm | 8 ++------ gnu/packages/games.scm | 3 +-- gnu/packages/maths.scm | 3 +-- gnu/packages/mpi.scm | 6 ++---- gnu/packages/networking.scm | 3 +-- gnu/packages/synergy.scm | 3 +-- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 92bc532196..0dcbb94666 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3260,9 +3260,7 @@ comment or quality sections.") (lambda* (#:key inputs #:allow-other-keys) ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") - ":" - (assoc-ref inputs "eigen") + (string-append (assoc-ref inputs "eigen") "/include/eigen3")) #t)) (add-before 'build 'bin-mkdir @@ -11697,9 +11695,7 @@ bytes of memory space, where n is the length of the string.") ;; Ensure that Eigen headers can be found (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") - ":" - (assoc-ref inputs "eigen") + (string-append (assoc-ref inputs "eigen") "/include/eigen3")) #t))))) (inputs diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b6a63aba02..6e54abc5d0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4175,8 +4175,7 @@ over 100 user-created campaigns.") (string-append (assoc-ref inputs "sdl-union") "/include/SDL:" (assoc-ref inputs "python") - "/include/python2.7:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/python2.7")) (substitute* "src/main/main.cpp" (("#include " line) (string-append line " diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index df8bad13e0..3f9cd8be6e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4740,8 +4740,7 @@ assemble global function spaces on finite-element grids.") (add-after 'build 'build-tests (lambda* (#:key inputs make-flags #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "dune-grid") "/share:" - (getenv "CPLUS_INCLUDE_PATH"))) + (string-append (assoc-ref inputs "dune-grid") "/share")) (apply invoke "make" "build_tests" make-flags)))))) (inputs `(("dune-common" ,dune-common) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index c9cd7b1382..c02e1d2e2b 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -217,12 +217,10 @@ bind processes, and much more.") (lambda* (#:key inputs #:allow-other-keys) (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "opensm") - "/include/infiniband/:" - (getenv "C_INCLUDE_PATH"))) + "/include/infiniband")) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "opensm") - "/include/infiniband/:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/infiniband")) #t)) (add-before 'build 'remove-absolute (lambda _ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 53c11f6d95..ce9afaf16d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2289,8 +2289,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") (string-append (assoc-ref inputs "curl") "/include:" (assoc-ref inputs "libpcap") "/include:" (assoc-ref inputs "openssl") "/include:" - (assoc-ref inputs "zlib") "/include:" - (getenv "C_INCLUDE_PATH"))) + (assoc-ref inputs "zlib") "/include")) #t))))) (home-page "https://github.com/ZerBea/hcxtools") (synopsis "Capture wlan traffic to hashcat and John the Ripper") diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index da8787285f..9de3ee57e4 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -63,8 +63,7 @@ (lambda* (#:key inputs #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "avahi") - "/include/avahi-compat-libdns_sd/:" - (getenv "CPLUS_INCLUDE_PATH"))) + "/include/avahi-compat-libdns_sd")) ;; See https://github.com/symless/synergy-core/pull/6359/ (substitute* "src/gui/src/ScreenSetupView.cpp" (("#include " m) -- cgit v1.2.3 From a46cf184fecb62fe93f3510eb32cc4772cf51cb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 18:13:59 +0200 Subject: gnu: criu: Fix build with GCC 7. * gnu/packages/virtualization.scm (criu)[arguments]: Do not read from C_INCLUDE_PATH, but add LINUX-LIBRE-HEADERS on it. --- gnu/packages/virtualization.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a640a64d40..e9bf459eee 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -694,8 +694,14 @@ domains, their live performance and resource utilization statistics.") ;; The includes for libnl are located in a sub-directory. (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "libnl") - "/include/libnl3:" - (getenv "C_INCLUDE_PATH"))) + "/include/libnl3" + ;; Also add the kernel headers here so that GCC + ;; treats them as "system headers". Otherwise + ;; the build fails with -Werror because parasite.c + ;; includes both and , + ;; which define some of the same constants. + (assoc-ref inputs "kernel-headers") + "/include")) ;; Prevent xmlto from failing the install phase. (substitute* "Documentation/Makefile" (("XMLTO.*:=.*") -- cgit v1.2.3 From ab2a1aed202b881da75f7de5a07206df54d0c9ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 18:17:26 +0200 Subject: gnu: criu: Fix typo. This is a follow-up to commit a46cf184fecb62fe93f3510eb32cc4772cf51cb8. * gnu/packages/virtualization.scm (criu)[arguments]: Add missing ":". --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e9bf459eee..0a61e4403e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -694,7 +694,7 @@ domains, their live performance and resource utilization statistics.") ;; The includes for libnl are located in a sub-directory. (setenv "C_INCLUDE_PATH" (string-append (assoc-ref inputs "libnl") - "/include/libnl3" + "/include/libnl3:" ;; Also add the kernel headers here so that GCC ;; treats them as "system headers". Otherwise ;; the build fails with -Werror because parasite.c -- cgit v1.2.3 From d4ae2d15eff3a8ada5028c942c3be3831d54a00a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 23 Jun 2019 22:10:50 -0400 Subject: gnu: baobab: Update to 3.30.0. * gnu/packages/gnome.scm (baobab): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4d7f956162..e9a0166e96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6273,7 +6273,7 @@ files.") (define-public baobab (package (name "baobab") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append @@ -6282,7 +6282,7 @@ files.") name "-" version ".tar.xz")) (sha256 (base32 - "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk")))) + "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) -- cgit v1.2.3 From bd15da3a379821e3943403c5540b877d476c7f0d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 25 Jun 2019 22:01:44 -0400 Subject: gnu: font-abattis-cantarell: Update to 0.111. * gnu/packages/fonts.scm (font-cantarell): Update to 0.111. [build-system]: Use meson-build-system. [native-inputs]: Add appstream-glib and gettext-minimal. --- gnu/packages/fonts.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c24e58de0d..5b52b84a57 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -51,10 +51,13 @@ #:use-module (guix git-download) #:use-module (guix build-system font) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -182,7 +185,7 @@ itself.")))) (define-public font-cantarell (package (name "font-abattis-cantarell") - (version "0.0.25") + (version "0.111") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/cantarell-fonts/" @@ -190,8 +193,11 @@ itself.")))) "/cantarell-fonts-" version ".tar.xz")) (sha256 (base32 - "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl")))) - (build-system gnu-build-system) + "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5")))) + (build-system meson-build-system) + (native-inputs + `(("appstream-glib" ,appstream-glib) + ("gettext" ,gettext-minimal))) ;for msgfmt (home-page "https://wiki.gnome.org/Projects/CantarellFonts") (synopsis "Cantarell sans-serif typeface") (description "The Cantarell font family is a contemporary Humanist -- cgit v1.2.3 From f37dfe1ec3887315f3debf60ca51321f948be81a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 26 Jun 2019 11:48:35 -0400 Subject: gnu: epiphany: Update to 3.30.4. * gnu/packages/gnome.scm (epiphany): Update to 3.30.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e9a0166e96..f5b56fdbc8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4375,7 +4375,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "3.30.2") + (version "3.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -4383,7 +4383,7 @@ a secret password store, an adblocker, and a modern UI.") "epiphany-" version ".tar.xz")) (sha256 (base32 - "0141bb37nd8wc743g4wy491crjh6ig76ack07aj2ba4z3gjz2zlc")))) + "0nk0krzrfck6hhfs52f4sjmj93yjyvabm72bq8i8f9l1pass5vgd")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 976e7801ac6f3b4701fcde327f79627ec34f8319 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:48:21 -0400 Subject: gnu: file-roller: Update to 3.30.1. * gnu/packages/gnome.scm (file-roller): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f5b56fdbc8..99b29fb09f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4696,7 +4696,7 @@ share them with others via social networking and more.") (define-public file-roller (package (name "file-roller") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4704,7 +4704,7 @@ share them with others via social networking and more.") name "-" version ".tar.xz")) (sha256 (base32 - "15pn2m80x45bzibig4zrqybnbr0n1f9wpqx7f2p6difldns3jwf1")))) + "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1")))) (build-system meson-build-system) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database -- cgit v1.2.3 From 42f95e3476d061d17982594f74488c7cd8199c62 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:49:47 -0400 Subject: gnu: gedit: Update to 3.30.2. * gnu/packages/gnome.scm (gedit): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 99b29fb09f..03d3d888f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4866,7 +4866,7 @@ javascript engine and the GObject introspection framework.") (define-public gedit (package (name "gedit") - (version "3.28.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4874,7 +4874,7 @@ javascript engine and the GObject introspection framework.") name "-" version ".tar.xz")) (sha256 (base32 - "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i")))) + "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From 235743a62725a93121962d3cc3400863161913a6 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:52:55 -0400 Subject: gnu: zenity: Update to 3.30.0. * gnu/packages/gnome.scm (zenity): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03d3d888f2..ed27c4f70b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4926,7 +4926,7 @@ powerful general purpose text editor.") (define-public zenity (package (name "zenity") - (version "3.28.1") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4934,7 +4934,7 @@ powerful general purpose text editor.") name "-" version ".tar.xz")) (sha256 (base32 - "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv")))) + "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 29b85910f668d14b72b92874c47fdcf26e54a135 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 09:58:57 -0400 Subject: gnu: gnome-backgrounds: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ed27c4f70b..eb251498e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6309,7 +6309,7 @@ is complete it provides a graphical representation of each selected folder.") (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -6318,7 +6318,7 @@ is complete it provides a graphical representation of each selected folder.") name "-" version ".tar.xz")) (sha256 (base32 - "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj")))) + "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc")))) (build-system meson-build-system) (native-inputs `(("intltool" ,intltool))) -- cgit v1.2.3 From bba7a77ed9ad826bcdc6d9b8a183d66a23229501 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jul 2019 23:06:24 +0200 Subject: gnu: MariaDB: Disable the TokuDB plugin. Fixes . Reported by Mark H Weaver . * gnu/packages/databases.scm (mariadb)[arguments]: Pass "-DTOKUDB_OK" in <#:configure-flags>. Enable the "innodb_fts.crash_recovery" test, which likely failed because of the high I/O load induced by TokuDB. [inputs]: Remove SNAPPY. --- gnu/packages/databases.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6bfeaad9a2..26f7bb8f73 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -659,6 +659,10 @@ Language.") ;; For now, disable the features that that use libarchive (xtrabackup). "-DWITH_LIBARCHIVE=OFF" + ;; Disable the TokuDB engine, because its test suite frequently fails, + ;; and loading it crashes the server: . + "-DTOKUDB_OK=OFF" + ;; Ensure the system libraries are used. "-DWITH_JEMALLOC=yes" "-DWITH_PCRE=system" @@ -706,9 +710,6 @@ Language.") ;; 2030-12-31. See for details. "main.mysqldump" - ;; XXX: Fails sporadically. - "innodb_fts.crash_recovery" - ;; FIXME: This test fails on i686: ;; -myisampack: Can't create/write to file (Errcode: 17 "File exists") ;; +myisampack: Can't create/write to file (Errcode: 17 "File exists) @@ -786,7 +787,6 @@ Language.") ("libxml2" ,libxml2) ("ncurses" ,ncurses) ("pcre" ,pcre) - ("snappy" ,snappy) ("xz" ,xz) ("zlib" ,zlib))) (propagated-inputs -- cgit v1.2.3 From 982c0b368daa2443de6fb642d73469d6a6ca468a Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:01:12 -0400 Subject: gnu: gnome-control-center: Update to 3.30.3. * gnu/packages/gnome.scm (gnome-control-center): Update to 3.30.3. [source](patches): New field. [arguments]: Adjust "patch-paths" phase. [inputs]: Add libsecret and udisks. * gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 11 +- ...ontrol-center-use-udisks-to-get-disk-size.patch | 221 +++++++++++++++++++++ 3 files changed, 230 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a34b917ce..123ff115a6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -889,6 +889,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-control-center-use-udisks-to-get-disk-size.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eb251498e9..ea854ff38a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5809,7 +5809,7 @@ devices using the GNOME desktop.") (define-public gnome-control-center (package (name "gnome-control-center") - (version "3.28.2") + (version "3.30.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5817,7 +5817,10 @@ devices using the GNOME desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz")))) + "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r")) + (patches + (search-patches + "gnome-control-center-use-udisks-to-get-disk-size.patch")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -5834,7 +5837,7 @@ devices using the GNOME desktop.") (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) - (substitute* "panels/datetime/test-endianess.c" + (substitute* "tests/datetime/test-endianess.c" (("/usr/share/locale") (string-append libc "/share/locale"))) (substitute* "panels/region/cc-region-panel.c" @@ -5877,6 +5880,7 @@ devices using the GNOME desktop.") ("libgudev" ,libgudev) ("libgtop" ,libgtop) ("libpwquality" ,libpwquality) + ("libsecret" ,libsecret) ("libsoup" ,libsoup) ("libxml2" ,libxml2) ("libwacom" ,libwacom) @@ -5888,6 +5892,7 @@ devices using the GNOME desktop.") ("pulseaudio" ,pulseaudio) ("smbclient" ,samba) ("tzdata" ,tzdata) + ("udisks" ,udisks) ("upower" ,upower))) (synopsis "Utilities to configure the GNOME desktop") (home-page "https://www.gnome.org/") diff --git a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch new file mode 100644 index 0000000000..823684b2e9 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch @@ -0,0 +1,221 @@ +This patch is derived from upstream commit 2520aea6 and fixes upstream issues +285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. + +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + +@@ -81,9 +82,7 @@ typedef struct + + GCancellable *cancellable; + +- /* Free space */ +- GList *primary_mounts; +- guint64 total_bytes; ++ UDisksClient *client; + + GraphicsData *graphics_data; + } CcInfoOverviewPanelPrivate; +@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel + CcInfoOverviewPanelPrivate *priv; + }; + +-static void get_primary_disc_info_start (CcInfoOverviewPanel *self); +- + typedef struct + { + char *major; +@@ -486,111 +483,51 @@ get_os_type (void) + } + + static void +-query_done (GFile *file, +- GAsyncResult *res, +- CcInfoOverviewPanel *self) ++get_primary_disc_info (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv; +- g_autoptr(GFileInfo) info = NULL; +- g_autoptr(GError) error = NULL; +- +- info = g_file_query_filesystem_info_finish (file, res, &error); +- if (info != NULL) +- { +- priv = cc_info_overview_panel_get_instance_private (self); +- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); +- } +- else +- { +- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- return; +- else +- { +- g_autofree char *path = NULL; +- path = g_file_get_path (file); +- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); +- } +- } ++ GDBusObjectManager *manager; ++ g_autolist(GDBusObject) objects = NULL; ++ GList *l; ++ guint64 total_size; + +- /* And onto the next element */ +- get_primary_disc_info_start (self); +-} +- +-static void +-get_primary_disc_info_start (CcInfoOverviewPanel *self) +-{ +- GUnixMountEntry *mount; +- g_autoptr(GFile) file = NULL; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ priv = cc_info_overview_panel_get_instance_private (self); ++ total_size = 0; + +- if (priv->primary_mounts == NULL) ++ if (!priv->client) + { +- g_autofree char *size = NULL; +- +- size = g_format_size (priv->total_bytes); +- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); +- ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); + return; + } + +- mount = priv->primary_mounts->data; +- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); +- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); +- g_unix_mount_free (mount); +- +- g_file_query_filesystem_info_async (file, +- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, +- 0, +- priv->cancellable, +- (GAsyncReadyCallback) query_done, +- self); +-} +- +-static void +-get_primary_disc_info (CcInfoOverviewPanel *self) +-{ +- GList *points; +- GList *p; +- GHashTable *hash; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); +- +- hash = g_hash_table_new (g_str_hash, g_str_equal); +- points = g_unix_mount_points_get (NULL); +- +- /* If we do not have /etc/fstab around, try /etc/mtab */ +- if (points == NULL) +- points = g_unix_mounts_get (NULL); ++ manager = udisks_client_get_object_manager (priv->client); ++ objects = g_dbus_object_manager_get_objects (manager); + +- for (p = points; p != NULL; p = p->next) ++ for (l = objects; l != NULL; l = l->next) + { +- GUnixMountEntry *mount = p->data; +- const char *mount_path; +- const char *device_path; +- +- mount_path = g_unix_mount_get_mount_path (mount); +- device_path = g_unix_mount_get_device_path (mount); +- +- /* Do not count multiple mounts with same device_path, because it is +- * probably something like btrfs subvolume. Use only the first one in +- * order to count the real size. */ +- if (gsd_should_ignore_unix_mount (mount) || +- gsd_is_removable_mount (mount) || +- g_str_has_prefix (mount_path, "/media/") || +- g_str_has_prefix (mount_path, g_get_home_dir ()) || +- g_hash_table_lookup (hash, device_path) != NULL) ++ UDisksDrive *drive; ++ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); ++ ++ /* Skip removable devices */ ++ if (drive == NULL || ++ udisks_drive_get_removable (drive) || ++ udisks_drive_get_ejectable (drive)) + { +- g_unix_mount_free (mount); + continue; + } + +- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); +- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); ++ total_size += udisks_drive_get_size (drive); + } +- g_list_free (points); +- g_hash_table_destroy (hash); + +- priv->cancellable = g_cancellable_new (); +- get_primary_disc_info_start (self); ++ if (total_size > 0) ++ { ++ g_autofree gchar *size = g_format_size (total_size); ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); ++ } ++ else ++ { ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); ++ } + } + + static char * +@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) + g_clear_object (&priv->cancellable); + } + +- if (priv->primary_mounts) +- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); ++ g_clear_object (&priv->client); + + g_free (priv->gnome_version); + g_free (priv->gnome_date); +@@ -895,6 +831,7 @@ static void + cc_info_overview_panel_init (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ g_autoptr(GError) error = NULL; + + gtk_widget_init_template (GTK_WIDGET (self)); + +@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + else + gtk_widget_destroy (priv->updates_button); + ++ priv->client = udisks_client_new_sync (NULL, &error); ++ ++ if (error != NULL) ++ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", ++ error->message); ++ + info_overview_panel_setup_overview (self); + info_overview_panel_setup_virt (self); + } +diff --git a/panels/info/meson.build b/panels/info/meson.build +index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 +--- a/panels/info/meson.build ++++ b/panels/info/meson.build +@@ -61,6 +61,7 @@ sources += gnome.compile_resources( + + deps = common_deps + [ + polkit_gobject_dep, ++ dependency('udisks2', version: '>= 2.1.8'), + dependency('libgtop-2.0') + ] + -- cgit v1.2.3 From d29298ef5b79c024819569fac0297265b3e31382 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:02:28 -0400 Subject: gnu: gnome-online-accounts: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ea854ff38a..955ccbd757 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5056,7 +5056,7 @@ window manager.") (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.30.0") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5064,7 +5064,7 @@ window manager.") name "-" version ".tar.xz")) (sha256 (base32 - "1hyg9g7l4ypnirx2j7ms2vr8711x90aybpq3s3wa20ma8a4xin97")))) + "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5")))) (outputs '("out" "lib")) (build-system glib-or-gtk-build-system) (arguments -- cgit v1.2.3 From da886d6fce0510a7e404b02a11e7645ee82afc3d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:03:52 -0400 Subject: gnu: gnome-session: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-session): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 955ccbd757..a6a4bada10 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4732,7 +4732,7 @@ such as gzip tarballs.") (define-public gnome-session (package (name "gnome-session") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4740,7 +4740,7 @@ such as gzip tarballs.") name "-" version ".tar.xz")) (sha256 (base32 - "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq")))) + "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa")))) (arguments '(#:glib-or-gtk? #t #:phases -- cgit v1.2.3 From 90fdc80f776a84da4a210e3cafc049c0e1bf19b1 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:06:12 -0400 Subject: gnu: gnome-settings-daemon: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a6a4bada10..f99d5ab2c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3238,7 +3238,7 @@ services for numerous locations.") (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "3.30.1.2") + (version "3.30.2") (source (origin (method url-fetch) @@ -3247,7 +3247,7 @@ services for numerous locations.") name "-" version ".tar.xz")) (sha256 (base32 - "079dh609rvpwfyzg4m898q8km9g7x04hg18rwwb1izj1dr7zdp2w")))) + "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 5088834271a2899cd7d1a86983fbefa1b3ceb3aa Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:07:31 -0400 Subject: gnu: gnome-terminal: Update to 3.30.3. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.30.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f99d5ab2c6..8090bcd6cf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2934,7 +2934,7 @@ more fun.") (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.30.2") + (version "3.30.3") (source (origin (method url-fetch) @@ -2943,7 +2943,7 @@ more fun.") name "-" version ".tar.xz")) (sha256 (base32 - "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb")))) + "0bar8qazk39acsif31h8i408nl82mzdcdg6p7ymak4l9pxyscxf8")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 1f8b5515edbc2077387cf59d355adb9ab6d797cf Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:18:04 -0400 Subject: gnu: gucharmap: Update to 12.0.1. * gnu/packages/gnome.scm (gucharmap): Update to 12.0.1. [native-inputs]: Update unicode-files. --- gnu/packages/gnome.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8090bcd6cf..0c6942c23d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7230,20 +7230,20 @@ basically a text box in which notes can be written.") (define-public gucharmap (let ((unicode-files '(("Blocks.txt" - "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas") + "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1") ("DerivedAge.txt" - "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h") + "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6") ("NamesList.txt" - "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1") + "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61") ("Scripts.txt" - "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh") + "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx") ("UnicodeData.txt" - "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj") + "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap") ("Unihan.zip" - "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1")))) + "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf")))) (package (name "gucharmap") - (version "10.0.4") + (version "12.0.1") (source (origin (method url-fetch) @@ -7252,7 +7252,7 @@ basically a text box in which notes can be written.") name "-" version ".tar.xz")) (sha256 (base32 - "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv")))) + "0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir")))) (build-system glib-or-gtk-build-system) (arguments `(#:modules ((ice-9 match) @@ -7284,7 +7284,7 @@ basically a text box in which notes can be written.") ,(origin (method url-fetch) (uri (string-append - "http://www.unicode.org/Public/10.0.0/ucd/" + "http://www.unicode.org/Public/12.0.0/ucd/" file)) (sha256 (base32 hash)))))) unicode-files) -- cgit v1.2.3 From 12fe48467395671cb0acaed36ac208ea73d49a19 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:36:40 -0400 Subject: gnu: gvfs: Update to 1.40.1. * gnu/packages/gnome.scm (gvfs): Update to 1.40.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c6942c23d..d6d07e041a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4158,7 +4158,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.38.1") + (version "1.40.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4166,7 +4166,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") name "-" version ".tar.xz")) (sha256 (base32 - "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd")))) + "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From c71bb3f29dadf9b748e4c98d430a437274741739 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:38:15 -0400 Subject: gnu: nautilus: Update to 3.30.5. * gnu/packages/gnome.scm (nautilus): Update to 3.30.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6d07e041a..85c4cc7625 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6226,7 +6226,7 @@ shared object databases, search tools and indexing.") (define-public nautilus (package (name "nautilus") - (version "3.30.4") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6234,7 +6234,7 @@ shared object databases, search tools and indexing.") name "-" version ".tar.xz")) (sha256 (base32 - "1fcavvv85mpaz53k5kx5mls7npx7b95s8isnhrgq2iglz4kpr7s1")))) + "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 18138ab939090f11d70220e830e06101d7f6acf3 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:39:42 -0400 Subject: gnu: shared-mime-info: Update to 1.10. * gnu/packages/gnome.scm (shared-mime-info): Update to 1.10. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 85c4cc7625..25e3ee0e5a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -977,14 +977,14 @@ guidelines.") (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/~hadess/" "shared-mime-info-" version ".tar.xz")) (sha256 (base32 - "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw")))) + "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6")))) (build-system gnu-build-system) (arguments ;; The build system appears not to be parallel-safe. -- cgit v1.2.3 From 77425f04f246426421d79b1928dd7484ee811390 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 27 Jun 2019 10:46:22 -0400 Subject: gnu: totem: Update to 3.30.0. * gnu/packages/gnome.scm (totem): Update to 3.30.0. --- gnu/packages/gnome.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 25e3ee0e5a..f51f534748 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3305,7 +3305,7 @@ settings, themes, mouse settings, and startup of other daemons.") (define-public totem-pl-parser (package (name "totem-pl-parser") - (version "3.26.1") + (version "3.26.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/totem-pl-parser/" @@ -3313,7 +3313,7 @@ settings, themes, mouse settings, and startup of other daemons.") "totem-pl-parser-" version ".tar.xz")) (sha256 (base32 - "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka")))) + "13a45py2j1r9967zgww8kd24bn2fhycd4m3kzr90sxx9l2w03z8f")))) (build-system meson-build-system) (arguments ;; FIXME: Tests require gvfs. @@ -3835,7 +3835,7 @@ for application developers.") (define-public totem (package (name "totem") - (version "3.26.2") + (version "3.30.0") (source (origin (method url-fetch) @@ -3844,7 +3844,7 @@ for application developers.") name "-" version ".tar.xz")) (sha256 (base32 - "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g")) + "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0")) (patches (search-patches "totem-meson-easy-codec.patch" "totem-meson-compat.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From bea6b829b89718f789d41c99301e7ce44dd21cf5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:23:47 -0400 Subject: gnu: gcr: Update to 3.28.1. * gnu/packages/gnome.scm (gcr): Update to 3.28.1. [native-inputs]: Add vala. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f51f534748..2d6b78c907 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -593,7 +593,7 @@ and keep up to date translations of documentation.") (define-public gcr (package (name "gcr") - (version "3.28.0") + (version "3.28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -601,7 +601,7 @@ and keep up to date translations of documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m")) + "12qn7mcmxb45lz1gq3s3b34rimiyrrshkrpvxdw1fc0w26i4l84m")) (patches (list ;; This patch solves an ordering issue that showed up when @@ -643,6 +643,7 @@ and keep up to date translations of documentation.") ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("libxml2" ,libxml2) + ("vala" ,vala) ("xsltproc" ,libxslt))) ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc (propagated-inputs -- cgit v1.2.3 From 9d4d439b0a455e205da75515852a4147fe378d63 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:30:52 -0400 Subject: gnu: gnome-tweaks: Update to 3.30.2. * gnu/packages/gnome.scm (gnome-tweaks): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2d6b78c907..a20db29e2a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6781,7 +6781,7 @@ existing databases over the internet.") (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.30.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -6791,7 +6791,7 @@ existing databases over the internet.") (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "0pj6k0106dy92lnb646dd656qdvljqwbaya95xp369a016pzngpa")))) + "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From d054fbf57dacdf9bd177bb920d7f4c941dc1f9e9 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:35:02 -0400 Subject: gnu: gjs: Update to 1.56.2. * gnu/packages/gnome.scm (gjs): Update to 1.56.2. [arguments]: Adjust pre-check phase. [propagated-inputs]: Replace mozjs-52 with mozjs-60. --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a20db29e2a..3ddca75f81 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4812,7 +4812,7 @@ configuration program to choose applications starting on login.") (define-public gjs (package (name "gjs") - (version "1.52.3") + (version "1.56.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4820,7 +4820,7 @@ configuration program to choose applications starting on login.") name "-" version ".tar.xz")) (sha256 (base32 - "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff")))) + "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac")))) (build-system gnu-build-system) (arguments '(#:phases @@ -4840,6 +4840,9 @@ configuration program to choose applications starting on login.") (substitute* "installed-tests/js/testLocale.js" ((".*toBeDefined.*") "") ((".*expect\\(datestr\\).*") "")) + (substitute* "installed-tests/scripts/testCommandLine.sh" + (("Valentín") "") + (("☭") "")) #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources @@ -4853,7 +4856,7 @@ configuration program to choose applications starting on login.") ;; These are all in the Requires.private field of gjs-1.0.pc. `(("cairo" ,cairo) ("gobject-introspection" ,gobject-introspection) - ("mozjs" ,mozjs-52))) + ("mozjs" ,mozjs-60))) (inputs `(("gtk+" ,gtk+) ("readline" ,readline))) -- cgit v1.2.3 From f828d05b28ed79c63c0eb521350506ad3b42cbf8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 6 Jul 2019 05:15:16 -0400 Subject: gnu: Add amtk. * gnu/packages/gnome.scm (amtk): New variable. --- gnu/packages/gnome.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3ddca75f81..92ba991fc2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3375,6 +3375,37 @@ playlists in a variety of formats.") which are easy to play with the aid of a mouse.") (license license:gpl3+))) +(define-public amtk + (package + (name "amtk") + (version "5.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--enable-gtk-doc"))) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("glib:bin" ,glib "bin") ; for glib-mkenums + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+))) + (home-page "https://wiki.gnome.org/Projects/Amtk") + (synopsis "Actions, Menus and Toolbars Kit for GTK+ applications") + (description + "Amtk is the acronym for @acronym{Amtk, Actions Menus and Toolbars Kit}. +It is a basic GtkUIManager replacement based on GAction. It is suitable for +both a traditional UI or a modern UI with a GtkHeaderBar.") + (license license:lgpl2.1+))) + (define-public devhelp (package (name "devhelp") -- cgit v1.2.3 From 11d28bd9f654f292b61c876e093e62a5ea242660 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:36:55 -0400 Subject: gnu: devhelp: Update to 3.30.1. * gnu/packages/gnome.scm (devhelp): Update to 3.30.1. [build-system]: Use meson-build-system. [native-inputs]: Add gobject-introspection, glib:bin and gtk+:bin. [inputs]: Add amtk. --- gnu/packages/gnome.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92ba991fc2..f9727ac477 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3409,7 +3409,7 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") (define-public devhelp (package (name "devhelp") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3417,14 +3417,18 @@ both a traditional UI or a modern UI with a GtkHeaderBar.") name "-" version ".tar.xz")) (sha256 (base32 - "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s")))) - (build-system glib-or-gtk-build-system) + "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a")))) + (build-system meson-build-system) (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) + ("gobject-introspection" ,gobject-introspection) + ("glib:bin" ,glib "bin") ; for glib-mkmenus + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs - `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + `(("amtk" ,amtk) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Devhelp") (synopsis "API documentation browser for GNOME") -- cgit v1.2.3 From 7734b4a2d9b0f5f63396bff2eb3d6598800eda5b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:40:38 -0400 Subject: gnu: gdm: Update to 3.30.3. * gnu/packages/gnome.scm (gdm): Update to 3.30.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f9727ac477..d13ab8ea43 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5599,7 +5599,7 @@ libxml2.") (define-public gdm (package (name "gdm") - (version "3.30.2") + (version "3.30.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5607,7 +5607,7 @@ libxml2.") name "-" version ".tar.xz")) (sha256 (base32 - "1handy65r1n0zby09jr492b3643wszzigdkxp7q2ypgxb3hyv45y")))) + "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From b1a8b40818ed100a395b0e244457d2c6a6257912 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 6 Jul 2019 06:35:48 -0400 Subject: gnu: gexiv2: Update to 0.12.0. * gnu/packages/gnome.scm (gexiv2): Update to 0.12.0. [native-inputs]: Add gcr and vala. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d13ab8ea43..04cd56f0d0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4655,7 +4655,7 @@ classes for commonly used data structures.") (define-public gexiv2 (package (name "gexiv2") - (version "0.10.10") + (version "0.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4663,11 +4663,13 @@ classes for commonly used data structures.") name "-" version ".tar.xz")) (sha256 (base32 - "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) + "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq")))) (build-system meson-build-system) (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) + `(("gcr" ,gcr) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (propagated-inputs ;; Listed in "Requires" section of gexiv2.pc `(("exiv2" ,exiv2))) -- cgit v1.2.3 From 3b79afa6a83a2d68109afb8f85ab82596a531b3d Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:42:15 -0400 Subject: gnu: shotwell: Update to 0.30.4. * gnu/packages/gnome.scm (shotwell): Update to 0.30.4. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag. [native-inputs]: Add desktop-file-utils. Remove itstool duplicate. Order inputs alphabetically. --- gnu/packages/gnome.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 04cd56f0d0..9ccdcbd83c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4687,7 +4687,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.28.4") + (version "0.30.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4695,16 +4695,18 @@ metadata in photo and video files of various formats.") name "-" version ".tar.xz")) (sha256 (base32 - "03k7n2kmzqn11kf3733w7m6xjh2b5q9xr84za2hli11fjymzaxm9")))) - (build-system glib-or-gtk-build-system) + "1yiz3j0y2yg6985y3alb3hpkfbv68n8ibys5gpwcjdhmhf3czg5p")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t)) (propagated-inputs `(("dconf" ,dconf))) (native-inputs - `(("pkg-config" ,pkg-config) - ("itstool" ,itstool) + `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database ("gettext" ,gettext-minimal) ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("itstool" ,itstool) + ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs `(("glib:bin" ,glib "bin") -- cgit v1.2.3 From 00b14dbb09f5ba8f6057b8f98041ead17ddd1809 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:53:48 -0400 Subject: gnu: cheese: Update to 3.30.0. * gnu/packages/gnome.scm (cheese): Update to 3.30.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9ccdcbd83c..95b472a7b1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7718,7 +7718,7 @@ photo-booth-like software, such as Cheese.") (define-public cheese (package (name "cheese") - (version "3.28.0") + (version "3.30.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7726,7 +7726,7 @@ photo-booth-like software, such as Cheese.") version ".tar.xz")) (sha256 (base32 - "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw")))) + "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr")))) (arguments ;; Tests require GDK. `(#:tests? #f -- cgit v1.2.3 From 676e7cb4fa054d7a2a21967dd4bf399bef04d7d3 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:55:38 -0400 Subject: gnu: gnome-screenshot: Update to 3.30.0. * gnu/packages/gnome.scm (gnome-screenshot): Update to 3.30.0. [home-page]: Update URI. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 95b472a7b1..16b048b552 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6385,7 +6385,7 @@ can add your own files to the collection.") (define-public gnome-screenshot (package (name "gnome-screenshot") - (version "3.26.0") + (version "3.30.0") (source (origin (method url-fetch) @@ -6394,7 +6394,7 @@ can add your own files to the collection.") name "-" version ".tar.xz")) (sha256 (base32 - "1fy8fjl29i3xhj8caik03d3za06x96xgkk8r4fwz88iqbmci3g0v")))) + "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. @@ -6408,7 +6408,7 @@ can add your own files to the collection.") ("libcanberra" ,libcanberra) ("libx11" ,libx11) ("libxext" ,libxext))) - (home-page "https://git.gnome.org/browse/gnome-screenshot") + (home-page "https://gitlab.gnome.org/GNOME/gnome-screenshot") (synopsis "Take pictures of your screen") (description "GNOME Screenshot is a utility used for taking screenshots of the entire -- cgit v1.2.3 From ef9b7d4c9fa25e57035f1a825db26a9ddb37ce16 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 00:58:08 -0400 Subject: gnu: orca: Update to 3.30.2. * gnu/packages/gnome.scm (orca): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 16b048b552..62c7937360 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7461,7 +7461,7 @@ accessibility infrastructure.") (define-public orca (package (name "orca") - (version "3.28.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (string-append @@ -7470,7 +7470,7 @@ accessibility infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "04l5ccn7wf175gyq3blfpx0yh70ny06n161297jwc9idf951852g")))) + "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases -- cgit v1.2.3 From 2aabc647f2691cc10f93456b3379d57ac669204f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:00:08 -0400 Subject: gnu: gnome-shell-extensions: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-shell-extensions): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 62c7937360..101c5c009a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6882,7 +6882,7 @@ GNOME Shell appearance and extension, etc.") (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") - (version "3.28.1") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6890,7 +6890,7 @@ GNOME Shell appearance and extension, etc.") name "-" version ".tar.xz")) (sha256 (base32 - "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9")))) + "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dextension_set=all"))) -- cgit v1.2.3 From 496d7ccd4d65599020f77d97c8930eecf597e26b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:03:08 -0400 Subject: gnu: gnome-calendar: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-calendar): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 101c5c009a..d1b8cdce58 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6693,7 +6693,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") (define-public gnome-calendar (package (name "gnome-calendar") - (version "3.28.2") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6701,7 +6701,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") name "-" version ".tar.xz")) (sha256 (base32 - "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw")))) + "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 757f863bd28cc4dd21372f7e087757bd25601d3c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:05:23 -0400 Subject: gnu: gnome-clocks: Update to 3.30.1. * gnu/packages/gnome.scm (gnome-clocks): Update to 3.30.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d1b8cdce58..c7f0046109 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6655,7 +6655,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.") (define-public gnome-clocks (package (name "gnome-clocks") - (version "3.28.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6663,7 +6663,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.") name "-" version ".tar.xz")) (sha256 (base32 - "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl")))) + "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) -- cgit v1.2.3 From bc09c416317f08f8ef388ddee89f2ea38736960f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:06:47 -0400 Subject: gnu: dconf-editor: Update to 3.30.2. * gnu/packages/gnome.scm (dconf-editor): Update to 3.30.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c7f0046109..f242e7181f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6419,7 +6419,7 @@ beautifying border effects.") (define-public dconf-editor (package (name "dconf-editor") - (version "3.28.0") + (version "3.30.2") (source (origin (method url-fetch) @@ -6428,7 +6428,7 @@ beautifying border effects.") name "-" version ".tar.xz")) (sha256 (base32 - "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5")))) + "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0. -- cgit v1.2.3 From 794ce8eaf72537d05a3ca460b9c189e96e683001 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 5 Jul 2019 01:09:33 -0400 Subject: gnu: libgweather: Update to 3.28.3. * gnu/packages/gnome.scm (libgweather): Update to 3.28.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f242e7181f..ae5b85d9d0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3197,7 +3197,7 @@ service via the system message bus.") (define-public libgweather (package (name "libgweather") - (version "3.28.2") + (version "3.28.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3205,7 +3205,7 @@ service via the system message bus.") name "-" version ".tar.xz")) (sha256 (base32 - "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708")))) + "1xz60h59zgyk61y2wwzm0xlqav72i668g7v0x7rh9idz240hxls5")))) (build-system meson-build-system) (arguments `(#:tests? #f ; one of two tests requires network access -- cgit v1.2.3 From d08482f03fb8abb529b36dfdae8e53d326b8002f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 16:43:57 +0200 Subject: gnu: python-hamcrest: Update to 1.9.0-0.25fdc5f. * gnu/packages/check.scm (python-pyhamcrest): Update to 1.9.0-0.25fdc5f. [arguments]: Replace CHECK phase with custom Pytest invokation. --- gnu/packages/check.scm | 64 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 901ee2cacb..67ea968e43 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2124,33 +2124,45 @@ retried.") (package-with-python2 python-flaky)) (define-public python-pyhamcrest - (package - (name "python-pyhamcrest") - (version "1.9.0") - (source (origin - ;; Tests not distributed from pypi release. - (method git-fetch) - (uri (git-reference - (url "https://github.com/hamcrest/PyHamcrest") - (commit (string-append "V" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01qnzj9qnzz0y78qa3ing24ssvszb0adw59xc4qqmdn5wryy606b")))) - (native-inputs ; All native inputs are for tests - `(("python-pytest-cov" ,python-pytest-cov) - ("python-mock" ,python-mock) - ("python-pytest" ,python-pytest) - ("python-hypothesis" ,python-hypothesis))) - (propagated-inputs - `(("python-six" ,python-six))) - (build-system python-build-system) - (home-page "http://hamcrest.org/") - (synopsis "Hamcrest matchers for Python") - (description - "PyHamcrest is a framework for writing matcher objects, + ;; The latest release was in 2016 and its test suite does not work with recent + ;; versions of Pytest. Just take the master branch for now, which seems stable. + (let ((commit "25fdc5f00bdf3084335353bc9247253098ec4cf2") + (revision "0")) + (package + (name "python-pyhamcrest") + (version (git-version "1.9.0" revision commit)) + (source (origin + ;; Tests not distributed from pypi release. + (method git-fetch) + (uri (git-reference + (url "https://github.com/hamcrest/PyHamcrest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1miqmhhi68vaix8sqc1lvpvbm27bacffxh5anm5cbfsvk7g9n6f3")))) + (native-inputs ;all native inputs are for tests + `(("python-pytest-cov" ,python-pytest-cov) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-hypothesis" ,python-hypothesis))) + (propagated-inputs + `(("python-six" ,python-six))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "PYTHONPATH" + (string-append "build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")))))) + (home-page "http://hamcrest.org/") + (synopsis "Hamcrest matchers for Python") + (description + "PyHamcrest is a framework for writing matcher objects, allowing you to declaratively define \"match\" rules.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python2-pyhamcrest (package-with-python2 python-pyhamcrest)) -- cgit v1.2.3 From c1cb85bf765e71aef674a132df644f4edf06a8e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 16:51:16 +0200 Subject: gnu: gRPC: Re-add custom c-ares variant. Commit e8393ebe46d9ad09aceb152618db490378ba5ded updated c-ares without knowing that cmake-build-system was the most important feature of 'c-ares-next'. * gnu/packages/adns.scm (c-ares/cmake): New hidden package. * gnu/packages/machine-learning.scm (grpc)[inputs]: Change C-ARES to C-ARES/CMAKE. --- gnu/packages/adns.scm | 15 +++++++++++++++ gnu/packages/machine-learning.scm | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index f6df825e7c..541612d41a 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2015, 2016, 2018 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,3 +83,17 @@ queries without blocking, or need to perform multiple DNS queries in parallel. The primary examples of such applications are servers which communicate with multiple clients and programs with graphical user interfaces.") (license (x11-style "https://c-ares.haxx.se/license.html")))) + +;; gRPC requires a c-ares built with CMake in order to get the .cmake modules. +;; We can not build c-ares itself with CMake because that would introduce a +;; circular dependency through nghttp2. +;; XXX: It would be nice if we could extract the modules somehow and make them +;; work with the "normal" c-ares package instead of building a whole new library. +(define-public c-ares/cmake + (hidden-package + (package + (inherit c-ares) + (build-system cmake-build-system) + (arguments + `(;; XXX: Tests require name resolution (the normal variant runs no tests). + #:tests? #f))))) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index fc527363c0..ace52b4c9d 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1292,7 +1292,7 @@ Python.") "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package"))) (inputs - `(("c-ares" ,c-ares) + `(("c-ares" ,c-ares/cmake) ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs -- cgit v1.2.3 From b5b56b7f27dc902721ce23dfcbbbf777026186e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 16:56:15 +0200 Subject: gnu: python-gevent: Fix build with libev 4.25 and GCC 7. * gnu/packages/python-xyz.scm (python-gevent)[arguments]: Simplify libev unbundling, which failed with the newer libev. Use C_INCLUDE_PATH instead of CPATH. [native-inputs]: Remove (PACKAGE-SOURCE LIBEV). --- gnu/packages/python-xyz.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac43ef9057..e58acc3578 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9823,13 +9823,6 @@ graphviz.") (guix build utils) (guix build python-build-system)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-libev - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "deps/libev") - ;; FIXME: gevent requires building libev, even though - ;; it only links against the proper one. - (invoke "tar" "-xf" (assoc-ref inputs "libev-source") - "--strip-components=1" "-C" "deps/libev"))) (add-before 'patch-source-shebangs 'patch-hard-coded-paths (lambda _ (substitute* "src/gevent/subprocess.py" @@ -9847,6 +9840,11 @@ graphviz.") (setenv "CARES_EMBED" "false") (setenv "EMBED" "false") + ;; Prevent building bundled libev. + (substitute* "setup.py" + (("run_make=_BUILDING") + "run_make=False")) + (let ((greenlet (string-append (assoc-ref inputs "python-greenlet") "/include"))) @@ -9854,7 +9852,7 @@ graphviz.") (lambda (item) (string-prefix? "python" item))) ((python) - (setenv "CPATH" + (setenv "C_INCLUDE_PATH" (string-append greenlet "/" python))))) #t)) (add-before 'check 'skip-timer-test @@ -9886,8 +9884,7 @@ graphviz.") `(("python-greenlet" ,python-greenlet) ("python-objgraph" ,python-objgraph))) (native-inputs - `(("libev-source" ,(package-source libev)) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) -- cgit v1.2.3 From 0b58cb427db55ec710d54330191cf9b4ebab3e6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:13:39 +0200 Subject: gnu: python-datrie: Update to 0.8. * gnu/packages/python-xyz.scm (python-datrie): Update to 0.8. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e58acc3578..21f8a916d6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5860,23 +5860,15 @@ of the structure, dynamics, and functions of complex networks.") (define-public python-datrie (package (name "python-datrie") - (version "0.7.1") + (version "0.8") (source (origin (method url-fetch) (uri (pypi-uri "datrie" version)) (sha256 (base32 - "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs")))) + "0338r8xgmpy78556jhms0h6qkvyjr10p8bpgdvcpqzm9lrmxmmdx")))) (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'build 'cythonize - (lambda _ - ;; Regenerate Cython classes to solve ABI issues with Python - ;; 3.7.0. See . - (invoke "cython" "src/datrie.pyx" "src/cdatrie.pxd" - "src/stdio_ext.pxd" "-a")))))) (native-inputs `(("python-cython" ,python-cython) ("python-hypothesis" ,python-hypothesis) -- cgit v1.2.3 From f8e0d93ca3424a3be238b211501cef84a151ec7b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:21:47 +0200 Subject: gnu: salmon: Fix build with GCC 7. * gnu/packages/bioinformatics.scm (salmon)[arguments]: Do not read from CPLUS_INCLUDE_PATH, and add headers to CPATH only. --- gnu/packages/bioinformatics.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0dcbb94666..1372bb411a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11874,14 +11874,11 @@ The following file formats are supported: (("lib/libdivsufsort.a") "/lib/libdivsufsort.so")) ;; Ensure that all headers can be found - (setenv "CPLUS_INCLUDE_PATH" - (string-append (getenv "CPLUS_INCLUDE_PATH") + (setenv "CPATH" + (string-append (getenv "CPATH") ":" (assoc-ref inputs "eigen") "/include/eigen3")) - (setenv "CPATH" - (string-append (assoc-ref inputs "eigen") - "/include/eigen3")) #t)) ;; CMAKE_INSTALL_PREFIX does not exist when the tests are ;; run. It only exists after the install phase. -- cgit v1.2.3 From 2ec3df7019073a2825e2a105acb6ac6a111c2db7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:44:01 +0200 Subject: gnu: lua-libmpack: Do not use unstable source tarball. * gnu/packages/serialization.scm (lua-libmpack)[source]: Change to GIT-FETCH. --- gnu/packages/serialization.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 505c196abd..2d50756806 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -169,13 +169,14 @@ that implements both the msgpack and msgpack-rpc specifications.") (package (inherit libmpack) (name "lua-libmpack") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/libmpack/libmpack-lua/" - "archive/" (package-version libmpack) ".tar.gz")) - (file-name (string-append name "-" (package-version libmpack) ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libmpack/libmpack-lua") + (commit (package-version libmpack)))) + (file-name (git-file-name name (package-version libmpack))) (sha256 (base32 - "153zrrbyxhf71dgzjjhrk56rfwk3nisslpgcqyg44v8fnz1xpk6i")))) + "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92")))) (build-system gnu-build-system) (arguments `(;; FIXME: tests require "busted", which is not yet available in Guix. -- cgit v1.2.3 From adad147b4b178665606c3995d4b0d3fef0765037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:45:36 +0200 Subject: gnu: lua-libmpack: Update to 1.0.8. * gnu/packages/serialization.scm (lua-libmpack): Update to 1.0.8. --- gnu/packages/serialization.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 2d50756806..0f4cc554a8 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -168,15 +168,16 @@ that implements both the msgpack and msgpack-rpc specifications.") (define-public lua-libmpack (package (inherit libmpack) (name "lua-libmpack") + (version "1.0.8") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/libmpack/libmpack-lua") - (commit (package-version libmpack)))) - (file-name (git-file-name name (package-version libmpack))) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92")))) + "1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw")))) (build-system gnu-build-system) (arguments `(;; FIXME: tests require "busted", which is not yet available in Guix. -- cgit v1.2.3 From cdc07e6854f26f7034f424822f681f2fb578247d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:51:17 +0200 Subject: gnu: msgpack: Update to 3.2.0. * gnu/packages/serialization.scm (msgpack): Update to 3.2.0. [build-system]: Change to CMAKE-BUILD-SYSTEM. [native-inputs]: Remove AUTOCONF, AUTOMAKE and LIBTOOL. --- gnu/packages/serialization.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 0f4cc554a8..2847886d61 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 David Craven -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2019 Marius Bakke ;;; Copyright © 2016, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017 Gregor Giesen @@ -101,7 +101,7 @@ such as compact binary encodings, XML, or JSON.") (define-public msgpack (package (name "msgpack") - (version "1.4.2") + (version "3.2.0") (source (origin (method url-fetch) @@ -117,13 +117,10 @@ such as compact binary encodings, XML, or JSON.") #t)) (sha256 (base32 - "18hzmyfg3mvnp7ab03nqdzzvqagkl42gygjpi4zv4i7aca2dmwf0")))) - (build-system gnu-build-system) + "1zhsap7d9zqdm9h1qnpaw78v1sh3rx2if7gk4dszs5m3cg1jiapv")))) + (build-system cmake-build-system) (native-inputs `(("googletest" ,googletest) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (propagated-inputs `(("zlib" ,zlib))) ;; Msgpack installs two headers (zbuffer.h, -- cgit v1.2.3 From 5ba856aba340d85744cedcfeeb34319cb778de11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 19:46:40 +0200 Subject: gnu: Adjust CPATH overrides to work with GCC 7 search paths. * gnu/packages/education.scm (gcompris)[arguments]: Preserve original CPATH, if any. * gnu/packages/games.scm (ltris, prboom-plus, abbaye, red-eclipse, btanks, 4dtris, edgar)[arguments]: Likewise. --- gnu/packages/education.scm | 3 ++- gnu/packages/games.scm | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f3d8907583..493a97fdf8 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -83,7 +83,8 @@ (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-mixer") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("gtk+" ,gtk+-2) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6e54abc5d0..9ada6438e1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -906,7 +906,8 @@ Chess). It is similar to standard chess but this variant is far more complicate (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("sdl-union" ,(sdl-union (list sdl sdl-mixer))))) @@ -1118,7 +1119,8 @@ Every puzzle has a complete solution, although there may be more than one.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("fluidsynth" ,fluidsynth) @@ -1350,7 +1352,8 @@ can be explored and changed freely.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL")))) + "/include/SDL:" + (or (getenv "CPATH") ""))))) (add-after 'patch-source-shebangs 'patch-makefile (lambda* (#:key outputs #:allow-other-keys) ;; Replace /usr with package output directory. @@ -2992,7 +2995,8 @@ http://lavachat.symlynx.com/unix/") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2")) + "/include/SDL2:" + (or (getenv "CPATH") ""))) #t)) (add-after 'install 'copy-data (lambda* (#:key outputs #:allow-other-keys) @@ -6398,7 +6402,8 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t)) (add-after 'unpack 'fix-compilation-errors (lambda _ @@ -6517,7 +6522,8 @@ affected by the gravity of the planets.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl") - "/include/SDL")) + "/include/SDL:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("fontconfig" ,fontconfig) @@ -6636,7 +6642,8 @@ the desired spell.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "sdl2-union") - "/include/SDL2")) + "/include/SDL2:" + (or (getenv "CPATH") ""))) #t))))) (inputs `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) -- cgit v1.2.3 From e6e09dc9c53df38e48be331a5f930ef6d52454f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 20:09:51 +0200 Subject: gnu: sooperlooper: Adjust for GCC 7. * gnu/packages/music.scm (sooperlooper)[arguments]: Remove <#:make-flags>. Preserve CPATH in <#:phases>. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a2c2e01661..9119817056 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2942,8 +2942,7 @@ with a number of bugfixes and changes to improve IT playback.") (patches (search-patches "sooperlooper-build-with-wx-30.patch")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CXXFLAGS=-std=gnu++11") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'add-sigc++-includes (lambda* (#:key inputs #:allow-other-keys) @@ -2955,7 +2954,8 @@ with a number of bugfixes and changes to improve IT playback.") sig "/lib/sigc++-2.0/include:" xml "/include/libxml2/:" cwd "/libs/pbd:" - cwd "/libs/midi++"))) + cwd "/libs/midi++:" + (or (getenv "CPATH") "")))) (substitute* '("src/control_osc.hpp" "src/gui/app_frame.hpp" "src/gui/config_panel.hpp" -- cgit v1.2.3 From 4b70b776e5b397fc5c15f628561a332e29d1584e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 21:18:01 +0200 Subject: gnu: libnsl: Fix build with gettext 0.20. * gnu/packages/onc-rpc.scm (libnsl)[arguments]: New field. --- gnu/packages/onc-rpc.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index d3149a4629..553553e2c2 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -137,6 +137,14 @@ from the protocol files.") (base32 "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'bootstrap 'gettextize + (lambda _ + ;; Regenerate the bundled Makefile.in.in to avoid a + ;; "gettext infrastructure mismatch" because the + ;; existing version was generated by an older gettext. + (invoke "gettextize" "-f")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 464a29d3d74e7d2f27042db6ab166bfdbe1f992e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 21:19:35 +0200 Subject: gnu: libnsl: Do not build 'libnsl.a'. * gnu/packages/onc-rpc.scm (libnsl)[arguments]: Add <#:configure-flags>. --- gnu/packages/onc-rpc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 553553e2c2..7e424dd185 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -138,7 +138,8 @@ from the protocol files.") "1chzqhcgh0yia9js8mh92cmhyka7rh32ql6b3mgdk26n94dqzs8b")))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-before 'bootstrap 'gettextize (lambda _ ;; Regenerate the bundled Makefile.in.in to avoid a -- cgit v1.2.3 From d619686250d8bb15bf67031f8ac80f9cfb400a26 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 14 Jul 2019 23:47:44 -0400 Subject: gnu: evolution-data-server: Fix locale handling. * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Add a phase that patches the source code to fix a locale handling issue. --- gnu/packages/gnome.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ae5b85d9d0..f42b5064c9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5211,6 +5211,22 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) + ;; This phase fixes locale canonicalization when using newer + ;; versions of ICU. The bug has been fixed upstream, and + ;; should appear starting in version 3.33.5. + ;; . + (add-after 'unpack 'patch-locale-canonicalization + (lambda _ + (substitute* "src/libedataserver/e-collator.c" + (("len = uloc_canonicalize \\(posix_locale,.*" x) + ((lambda (xs) (string-join xs "\n" 'suffix)) + (list + "if (posix_locale && (" + " g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||" + " g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0))" + " posix_locale = \"en_US_POSIX\";" + x)))) + #t)) (add-before 'configure 'dont-override-rpath (lambda _ (substitute* "CMakeLists.txt" -- cgit v1.2.3 From 86b995dcce534363ef56ae4335e402f77740ae24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 17:11:03 +0200 Subject: gnu: Qt@4: Build with GCC 5 and OpenSSL 1.0. * gnu/packages/qt.scm (qt-4)[inputs]: Replace OPENSSL with OPENSSL-1.0. [native-inputs]: Add GCC-5. --- gnu/packages/qt.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index afc4d8dc06..e5fc40b351 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel ;;; Copyright © 2018 Eric Bavier +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) @@ -423,11 +425,16 @@ system, and the core design of Django is reused in Grantlee.") (inputs `(,@(fold alist-delete (package-inputs qt) - '("harfbuzz" "libjpeg")) + '("harfbuzz" "libjpeg" "openssl")) ("libjpeg" ,libjpeg-8) - ("libsm" ,libsm))) + ("libsm" ,libsm) + ("openssl" ,openssl-1.0))) (native-inputs - `(,@(fold alist-delete + `(;; XXX: The JavaScriptCore engine does not build with the C++11 standard. + ;; We could build it with -std=gnu++98, but then we'll get in trouble with + ;; ICU later. Just keep using GCC 5 for now. + ("gcc" ,gcc-5) + ,@(fold alist-delete (package-native-inputs qt) '("vulkan-headers")))) -- cgit v1.2.3 From 5229bea128bc225583198d76678d758eafb83023 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 28 Jun 2019 09:52:22 -0400 Subject: gnu: evolution: Update to 3.30.5. * gnu/packages/gnome.scm (evolution): Update to 3.30.5. [arguments]: Add "patch-ui-module-dir", "glib-or-gtk-compile-schemas" and "glib-or-gtk-wrap" phases. --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f42b5064c9..3b5deb2a82 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8016,7 +8016,7 @@ generic enough to work for everyone.") (define-public evolution (package (name "evolution") - (version "3.28.1") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evolution/" @@ -8024,13 +8024,34 @@ generic enough to work for everyone.") "evolution-" version ".tar.xz")) (sha256 (base32 - "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l")))) + "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:imported-modules (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:configure-flags (list "-DENABLE_PST_IMPORT=OFF" ; libpst is not packaged - "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release + "-DENABLE_LIBCRYPTUI=OFF") ; libcryptui hasn't seen a release ; in four years and cannot be built. + #:phases + (modify-phases %standard-phases + ;; The build system attempts to install user interface modules to the + ;; output directory of the "evolution-data-server" package. This + ;; change redirects that change. + (add-after 'unpack 'patch-ui-module-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/modules/alarm-notify/CMakeLists.txt" + (("\\$\\{edsuimoduledir\\}") + (string-append (assoc-ref outputs "out") + "/lib/evolution-data-server/ui-modules"))) + #t)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums ("pkg-config" ,pkg-config) -- cgit v1.2.3 From 68c3ca933d1621586b9e73944b194e5304130198 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 28 Jun 2019 08:33:25 -0400 Subject: gnu: evolution-data-server: Update to 3.30.5. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.30.5. [arguments]: Remove "-std=gnu++11" configure flag. Disable more failing tests. --- gnu/packages/gnome.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3b5deb2a82..b0bbc12cdf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5155,7 +5155,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.30.2") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5163,7 +5163,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") name "-" version ".tar.xz")) (sha256 (base32 - "0h4f71kpf2ypdgifg369z35pk4cq99daw540yzjpax52grav2fjv")))) + "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli")))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -5177,13 +5177,11 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication "-DENABLE_VALA_BINDINGS=ON" - ;; FIXME: Building against ICU 60 requires C++11 or higher. Remove - ;; "-std=gnu++11" when our default compiler is >= GCC6. ;; FIXME: Temporarily use "-DU_USING_ICU_NAMESPACE=1" until ;; evolution-data-server has been updated to qualify ICU types ;; explicitly, as required by ICU 61 and later. See: ;; - "-DCMAKE_CXX_FLAGS=-std=gnu++11 -DU_USING_ICU_NAMESPACE=1" + "-DU_USING_ICU_NAMESPACE=1" (string-append "-DCMAKE_INSTALL_RPATH=" lib ";" (string-append lib "/evolution-data-server;") (string-join runpaths ";")) -- cgit v1.2.3 From 3d0b40ad7c369534f7f4c0c148b5b3b3ddc73542 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 19:09:15 +0200 Subject: gnu: evolution-data-server: Remove obsolete workaround. * gnu/packages/gnome.scm (evolution-data-server)[arguments]: Do not pass "-DU_USING_ICU_NAMESPACE" in <#:configure-flags>. --- gnu/packages/gnome.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b0bbc12cdf..dc36d052c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5177,11 +5177,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication "-DENABLE_VALA_BINDINGS=ON" - ;; FIXME: Temporarily use "-DU_USING_ICU_NAMESPACE=1" until - ;; evolution-data-server has been updated to qualify ICU types - ;; explicitly, as required by ICU 61 and later. See: - ;; - "-DU_USING_ICU_NAMESPACE=1" (string-append "-DCMAKE_INSTALL_RPATH=" lib ";" (string-append lib "/evolution-data-server;") (string-join runpaths ";")) -- cgit v1.2.3 From 2a80d9e55299214a3f0b4f585767b4c81c9d5c7d Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 16 Jul 2019 10:04:58 -0400 Subject: system: Write the timezone to /etc/timezone. * gnu/system.scm (operating-system-etc-service): Write the operating system timezone to /etc/timezone. Fixes . --- gnu/system.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/system.scm b/gnu/system.scm index 01be1243fe..485896ba0a 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -716,6 +716,10 @@ fi\n"))) ;; to certain networks. Some discussion at ;; https://lists.gnu.org/archive/html/help-guix/2017-09/msg00037.html ("hostname" ,(plain-file "hostname" (operating-system-host-name os))) + ;; Some programs (e.g., GLib) look at /etc/timezone to find the + ;; name of the current timezone. For details, see + ;; https://lists.gnu.org/archive/html/guix-devel/2019-07/msg00166.html + ("timezone" ,(plain-file "timezone" (operating-system-timezone os))) ("localtime" ,(file-append tzdata "/share/zoneinfo/" (operating-system-timezone os))) ("sudoers" ,(operating-system-sudoers-file os)))))) -- cgit v1.2.3 From 3549e23b25303d46f4725628a50c2a302d5e59f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 20:10:17 +0200 Subject: gnu: nanopolish: Fix build with GCC 7. * gnu/packages/bioinformatics.scm (nanopolish)[arguments]: Preserve the existing CPATH variable, if any. --- gnu/packages/bioinformatics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1372bb411a..313ffa11ae 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14072,7 +14072,8 @@ choosing which reads pass the filter.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" (string-append (assoc-ref inputs "eigen") - "/include/eigen3")) + "/include/eigen3:" + (or (getenv "CPATH") ""))) #t)) (delete 'configure) (replace 'install -- cgit v1.2.3 From 7f080fb97c28fd94da1efaaa8fec8b5b830c328d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 16 Jul 2019 23:17:21 +0200 Subject: gnu: ceph: Fix build with recent CMake. * gnu/packages/storage.scm (ceph)[arguments]: Drop "-DENABLE_SHARED" from <#:configure-flags> in favor of "-DBUILD_SHARED_LIBS". Add phase to remove installed test executables. --- gnu/packages/storage.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 4f3fa05aa7..5c702e3362 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; ;;; This file is part of GNU Guix. @@ -108,7 +108,7 @@ (string-append "-DXFS_INCLUDE_DIR=" (assoc-ref %build-inputs "xfsprogs") "/include") "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" - "-DENABLE_SHARED=ON" + "-DBUILD_SHARED_LIBS=ON" "-DWITH_SYSTEM_ROCKSDB=ON" "-DWITH_SYSTEM_BOOST=ON" "-DWITH_PYTHON3=ON" @@ -279,6 +279,17 @@ (wrap-program (string-append out "/bin/" executable) `("PYTHONPATH" ":" prefix (,PYTHONPATH)))) scripts) + #t))) + (add-before 'validate-runpath 'remove-test-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; FIXME: The BUILD_SHARED_LIBS CMake flag causes the test executables + ;; to link the bundled googletest dynamically, which in turn causes + ;; RUNPATH validation failures because 'libgtest.so' and friends do + ;; not get absolute RUNPATH entries. The next version of Ceph can use + ;; an external googletest; for now just remove the test executables. + (for-each delete-file (find-files (string-append out "/bin") + "ceph_(test|perf)")) #t)))))) (outputs '("out" "lib")) -- cgit v1.2.3 From 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 17 Jul 2019 15:12:50 +0200 Subject: gnu: multipath-tools: Treat libaio headers as system headers. * gnu/packages/linux.scm (multipath-tools)[arguments]: Set C_INCLUDE_PATH in <#:make-flags>. --- gnu/packages/linux.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4ccf613a9b..22f001d040 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3271,6 +3271,12 @@ arrays when needed.") (string-append "DESTDIR=" (assoc-ref %outputs "out")) "SYSTEMDPATH=lib" + ;; Add the libaio headers to GCCs system header + ;; search path to suppress -Werror=cast-qual on + ;; the included headers. + (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "libaio") + "/include") (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 0de9a1be04a2f93bcdf81bdb0f6c2dca12225974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jul 2019 15:58:34 +0200 Subject: gnu: gnome-control-center: Shorten patch file name. * gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch: Rename to... * gnu/packages/patches/gnome-control-center-udisks.patch: ... this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/gnome.scm (gnome-control-center)[source]: Likewise. --- gnu/local.mk | 2 +- gnu/packages/gnome.scm | 3 +- .../patches/gnome-control-center-udisks.patch | 221 +++++++++++++++++++++ ...ontrol-center-use-udisks-to-get-disk-size.patch | 221 --------------------- 4 files changed, 223 insertions(+), 224 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-udisks.patch delete mode 100644 gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch diff --git a/gnu/local.mk b/gnu/local.mk index c41836ad3c..49c3826685 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -889,7 +889,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-control-center-use-udisks-to-get-disk-size.patch \ + %D%/packages/patches/gnome-control-center-udisks.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 46dd268f8f..beaba3b4c5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5941,8 +5941,7 @@ devices using the GNOME desktop.") (base32 "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r")) (patches - (search-patches - "gnome-control-center-use-udisks-to-get-disk-size.patch")))) + (search-patches "gnome-control-center-udisks.patch")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gnome-control-center-udisks.patch b/gnu/packages/patches/gnome-control-center-udisks.patch new file mode 100644 index 0000000000..823684b2e9 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-udisks.patch @@ -0,0 +1,221 @@ +This patch is derived from upstream commit 2520aea6 and fixes upstream issues +285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and +https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. + +diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c +index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 +--- a/panels/info/cc-info-overview-panel.c ++++ b/panels/info/cc-info-overview-panel.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + +@@ -81,9 +82,7 @@ typedef struct + + GCancellable *cancellable; + +- /* Free space */ +- GList *primary_mounts; +- guint64 total_bytes; ++ UDisksClient *client; + + GraphicsData *graphics_data; + } CcInfoOverviewPanelPrivate; +@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel + CcInfoOverviewPanelPrivate *priv; + }; + +-static void get_primary_disc_info_start (CcInfoOverviewPanel *self); +- + typedef struct + { + char *major; +@@ -486,111 +483,51 @@ get_os_type (void) + } + + static void +-query_done (GFile *file, +- GAsyncResult *res, +- CcInfoOverviewPanel *self) ++get_primary_disc_info (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv; +- g_autoptr(GFileInfo) info = NULL; +- g_autoptr(GError) error = NULL; +- +- info = g_file_query_filesystem_info_finish (file, res, &error); +- if (info != NULL) +- { +- priv = cc_info_overview_panel_get_instance_private (self); +- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); +- } +- else +- { +- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- return; +- else +- { +- g_autofree char *path = NULL; +- path = g_file_get_path (file); +- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); +- } +- } ++ GDBusObjectManager *manager; ++ g_autolist(GDBusObject) objects = NULL; ++ GList *l; ++ guint64 total_size; + +- /* And onto the next element */ +- get_primary_disc_info_start (self); +-} +- +-static void +-get_primary_disc_info_start (CcInfoOverviewPanel *self) +-{ +- GUnixMountEntry *mount; +- g_autoptr(GFile) file = NULL; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ priv = cc_info_overview_panel_get_instance_private (self); ++ total_size = 0; + +- if (priv->primary_mounts == NULL) ++ if (!priv->client) + { +- g_autofree char *size = NULL; +- +- size = g_format_size (priv->total_bytes); +- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); +- ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); + return; + } + +- mount = priv->primary_mounts->data; +- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); +- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); +- g_unix_mount_free (mount); +- +- g_file_query_filesystem_info_async (file, +- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, +- 0, +- priv->cancellable, +- (GAsyncReadyCallback) query_done, +- self); +-} +- +-static void +-get_primary_disc_info (CcInfoOverviewPanel *self) +-{ +- GList *points; +- GList *p; +- GHashTable *hash; +- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); +- +- hash = g_hash_table_new (g_str_hash, g_str_equal); +- points = g_unix_mount_points_get (NULL); +- +- /* If we do not have /etc/fstab around, try /etc/mtab */ +- if (points == NULL) +- points = g_unix_mounts_get (NULL); ++ manager = udisks_client_get_object_manager (priv->client); ++ objects = g_dbus_object_manager_get_objects (manager); + +- for (p = points; p != NULL; p = p->next) ++ for (l = objects; l != NULL; l = l->next) + { +- GUnixMountEntry *mount = p->data; +- const char *mount_path; +- const char *device_path; +- +- mount_path = g_unix_mount_get_mount_path (mount); +- device_path = g_unix_mount_get_device_path (mount); +- +- /* Do not count multiple mounts with same device_path, because it is +- * probably something like btrfs subvolume. Use only the first one in +- * order to count the real size. */ +- if (gsd_should_ignore_unix_mount (mount) || +- gsd_is_removable_mount (mount) || +- g_str_has_prefix (mount_path, "/media/") || +- g_str_has_prefix (mount_path, g_get_home_dir ()) || +- g_hash_table_lookup (hash, device_path) != NULL) ++ UDisksDrive *drive; ++ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); ++ ++ /* Skip removable devices */ ++ if (drive == NULL || ++ udisks_drive_get_removable (drive) || ++ udisks_drive_get_ejectable (drive)) + { +- g_unix_mount_free (mount); + continue; + } + +- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); +- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); ++ total_size += udisks_drive_get_size (drive); + } +- g_list_free (points); +- g_hash_table_destroy (hash); + +- priv->cancellable = g_cancellable_new (); +- get_primary_disc_info_start (self); ++ if (total_size > 0) ++ { ++ g_autofree gchar *size = g_format_size (total_size); ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); ++ } ++ else ++ { ++ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); ++ } + } + + static char * +@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) + g_clear_object (&priv->cancellable); + } + +- if (priv->primary_mounts) +- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); ++ g_clear_object (&priv->client); + + g_free (priv->gnome_version); + g_free (priv->gnome_date); +@@ -895,6 +831,7 @@ static void + cc_info_overview_panel_init (CcInfoOverviewPanel *self) + { + CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); ++ g_autoptr(GError) error = NULL; + + gtk_widget_init_template (GTK_WIDGET (self)); + +@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) + else + gtk_widget_destroy (priv->updates_button); + ++ priv->client = udisks_client_new_sync (NULL, &error); ++ ++ if (error != NULL) ++ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", ++ error->message); ++ + info_overview_panel_setup_overview (self); + info_overview_panel_setup_virt (self); + } +diff --git a/panels/info/meson.build b/panels/info/meson.build +index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 +--- a/panels/info/meson.build ++++ b/panels/info/meson.build +@@ -61,6 +61,7 @@ sources += gnome.compile_resources( + + deps = common_deps + [ + polkit_gobject_dep, ++ dependency('udisks2', version: '>= 2.1.8'), + dependency('libgtop-2.0') + ] + diff --git a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch b/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch deleted file mode 100644 index 823684b2e9..0000000000 --- a/gnu/packages/patches/gnome-control-center-use-udisks-to-get-disk-size.patch +++ /dev/null @@ -1,221 +0,0 @@ -This patch is derived from upstream commit 2520aea6 and fixes upstream issues -285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387, -https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and -https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302. - -diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c -index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644 ---- a/panels/info/cc-info-overview-panel.c -+++ b/panels/info/cc-info-overview-panel.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #include - -@@ -81,9 +82,7 @@ typedef struct - - GCancellable *cancellable; - -- /* Free space */ -- GList *primary_mounts; -- guint64 total_bytes; -+ UDisksClient *client; - - GraphicsData *graphics_data; - } CcInfoOverviewPanelPrivate; -@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel - CcInfoOverviewPanelPrivate *priv; - }; - --static void get_primary_disc_info_start (CcInfoOverviewPanel *self); -- - typedef struct - { - char *major; -@@ -486,111 +483,51 @@ get_os_type (void) - } - - static void --query_done (GFile *file, -- GAsyncResult *res, -- CcInfoOverviewPanel *self) -+get_primary_disc_info (CcInfoOverviewPanel *self) - { - CcInfoOverviewPanelPrivate *priv; -- g_autoptr(GFileInfo) info = NULL; -- g_autoptr(GError) error = NULL; -- -- info = g_file_query_filesystem_info_finish (file, res, &error); -- if (info != NULL) -- { -- priv = cc_info_overview_panel_get_instance_private (self); -- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE); -- } -- else -- { -- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) -- return; -- else -- { -- g_autofree char *path = NULL; -- path = g_file_get_path (file); -- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message); -- } -- } -+ GDBusObjectManager *manager; -+ g_autolist(GDBusObject) objects = NULL; -+ GList *l; -+ guint64 total_size; - -- /* And onto the next element */ -- get_primary_disc_info_start (self); --} -- --static void --get_primary_disc_info_start (CcInfoOverviewPanel *self) --{ -- GUnixMountEntry *mount; -- g_autoptr(GFile) file = NULL; -- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -+ priv = cc_info_overview_panel_get_instance_private (self); -+ total_size = 0; - -- if (priv->primary_mounts == NULL) -+ if (!priv->client) - { -- g_autofree char *size = NULL; -- -- size = g_format_size (priv->total_bytes); -- gtk_label_set_text (GTK_LABEL (priv->disk_label), size); -- -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); - return; - } - -- mount = priv->primary_mounts->data; -- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount); -- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount)); -- g_unix_mount_free (mount); -- -- g_file_query_filesystem_info_async (file, -- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, -- 0, -- priv->cancellable, -- (GAsyncReadyCallback) query_done, -- self); --} -- --static void --get_primary_disc_info (CcInfoOverviewPanel *self) --{ -- GList *points; -- GList *p; -- GHashTable *hash; -- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -- -- hash = g_hash_table_new (g_str_hash, g_str_equal); -- points = g_unix_mount_points_get (NULL); -- -- /* If we do not have /etc/fstab around, try /etc/mtab */ -- if (points == NULL) -- points = g_unix_mounts_get (NULL); -+ manager = udisks_client_get_object_manager (priv->client); -+ objects = g_dbus_object_manager_get_objects (manager); - -- for (p = points; p != NULL; p = p->next) -+ for (l = objects; l != NULL; l = l->next) - { -- GUnixMountEntry *mount = p->data; -- const char *mount_path; -- const char *device_path; -- -- mount_path = g_unix_mount_get_mount_path (mount); -- device_path = g_unix_mount_get_device_path (mount); -- -- /* Do not count multiple mounts with same device_path, because it is -- * probably something like btrfs subvolume. Use only the first one in -- * order to count the real size. */ -- if (gsd_should_ignore_unix_mount (mount) || -- gsd_is_removable_mount (mount) || -- g_str_has_prefix (mount_path, "/media/") || -- g_str_has_prefix (mount_path, g_get_home_dir ()) || -- g_hash_table_lookup (hash, device_path) != NULL) -+ UDisksDrive *drive; -+ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data)); -+ -+ /* Skip removable devices */ -+ if (drive == NULL || -+ udisks_drive_get_removable (drive) || -+ udisks_drive_get_ejectable (drive)) - { -- g_unix_mount_free (mount); - continue; - } - -- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount); -- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path); -+ total_size += udisks_drive_get_size (drive); - } -- g_list_free (points); -- g_hash_table_destroy (hash); - -- priv->cancellable = g_cancellable_new (); -- get_primary_disc_info_start (self); -+ if (total_size > 0) -+ { -+ g_autofree gchar *size = g_format_size (total_size); -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), size); -+ } -+ else -+ { -+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown")); -+ } - } - - static char * -@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object) - g_clear_object (&priv->cancellable); - } - -- if (priv->primary_mounts) -- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free); -+ g_clear_object (&priv->client); - - g_free (priv->gnome_version); - g_free (priv->gnome_date); -@@ -895,6 +831,7 @@ static void - cc_info_overview_panel_init (CcInfoOverviewPanel *self) - { - CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self); -+ g_autoptr(GError) error = NULL; - - gtk_widget_init_template (GTK_WIDGET (self)); - -@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self) - else - gtk_widget_destroy (priv->updates_button); - -+ priv->client = udisks_client_new_sync (NULL, &error); -+ -+ if (error != NULL) -+ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.", -+ error->message); -+ - info_overview_panel_setup_overview (self); - info_overview_panel_setup_virt (self); - } -diff --git a/panels/info/meson.build b/panels/info/meson.build -index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644 ---- a/panels/info/meson.build -+++ b/panels/info/meson.build -@@ -61,6 +61,7 @@ sources += gnome.compile_resources( - - deps = common_deps + [ - polkit_gobject_dep, -+ dependency('udisks2', version: '>= 2.1.8'), - dependency('libgtop-2.0') - ] - -- cgit v1.2.3 From 995c30d0d65c1ad8c98897a7b0ff08740dbed38f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 16:31:14 +0200 Subject: gnu: libmp4v2: Fix build with C++11. * gnu/packages/patches/libmp4v2-c++11.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/video.scm (libmp4v2)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/libmp4v2-c++11.patch | 14 ++++++++++++++ gnu/packages/video.scm | 1 + 3 files changed, 16 insertions(+) create mode 100644 gnu/packages/patches/libmp4v2-c++11.patch diff --git a/gnu/local.mk b/gnu/local.mk index 49c3826685..e97ff507e9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1023,6 +1023,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libreoffice-boost.patch \ diff --git a/gnu/packages/patches/libmp4v2-c++11.patch b/gnu/packages/patches/libmp4v2-c++11.patch new file mode 100644 index 0000000000..e12f89bd84 --- /dev/null +++ b/gnu/packages/patches/libmp4v2-c++11.patch @@ -0,0 +1,14 @@ +Avoid a type mismatch that shows up in C++11. +Taken from . + +--- a/src/rtphint.cpp 2012-05-20 16:11:53.000000000 -0600 ++++ b/src/rtphint.cpp 2017-05-16 10:25:26.930705191 -0600 +@@ -339,7 +339,7 @@ + pSlash = strchr(pSlash, '/'); + if (pSlash != NULL) { + pSlash++; +- if (pSlash != '\0') { ++ if (*pSlash != '\0') { + length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap); + *ppEncodingParams = (char *)MP4Calloc(length + 1); + strncpy(*ppEncodingParams, pSlash, length); diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 995f7fab15..5fa9070ba7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2746,6 +2746,7 @@ of modern, widely supported codecs.") "code-archive-downloads/v2/" "code.google.com/mp4v2/mp4v2-" version ".tar.bz2")) (file-name (string-append name "-" version ".tar.bz2")) + (patches (search-patches "libmp4v2-c++11.patch")) (sha256 (base32 "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683")))) -- cgit v1.2.3 From 4788c1ae17feda6a9a6e6897e499fcc1cc49fc73 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 16:47:11 +0200 Subject: gnu: innoextract: Fix build with Boost 1.70 and GCC 7. * gnu/packages/compression.scm (innoextract)[arguments]: Add <#:configure-flags> and <#:phases>. --- gnu/packages/compression.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 1321791841..11cc00d19c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019 Kei Kebreau -;;; Copyright © 2016, 2018 Marius Bakke +;;; Copyright © 2016, 2018, 2019 Marius Bakke ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Theodoros Foradis @@ -1793,7 +1793,21 @@ single-member files which can't be decompressed in parallel.") (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ;; No tests available. + `(#:tests? #f + ;; XXX: Work around a problem with the CMake support in Boost 1.70: + ;; . + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") + #:phases (modify-phases %standard-phases + (add-before 'configure 'glibc-is-already-a-system-library + (lambda _ + ;; Prevent the build system from passing the glibc + ;; header files to GCC as "system headers", because + ;; it conflicts with the system headers already known + ;; to GCC, causing #include_next failures. + (substitute* "CMakeLists.txt" + (("include_directories\\(SYSTEM \\$\\{iconv") + "include_directories(${iconv")) + #t))))) (inputs `(("boost" ,boost) ("libiconv" ,libiconv) ("xz" ,xz))) -- cgit v1.2.3 From 308af63460c37e0d2a58f78aa9118404de3d54ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 18:28:19 +0200 Subject: gnu: libvirt: Provide ''. * gnu/packages/virtualization.scm (libvirt)[inputs]: Add LIBTIRPC. [arguments]: Add phase 'patch-libtirpc-file-names'. --- gnu/packages/virtualization.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0a61e4403e..da971a8805 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -423,6 +424,15 @@ manage system or application containers.") (substitute* "config.h.in" (("/bin/sh") (which "sh"))) #t)) + (add-before 'configure 'patch-libtirpc-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; libvirt uses an m4 macro instead of pkg-config to determine where + ;; the RPC headers are located. Tell it to look in the right place. + (substitute* "configure" + (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 + (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc"))) + #t)) (add-before 'configure 'disable-broken-tests (lambda _ (let ((tests (list "commandtest" ; hangs idly @@ -459,8 +469,9 @@ manage system or application containers.") ("qemu" ,qemu) ("libpcap" ,libpcap) ("libnl" ,libnl) + ("libtirpc" ,libtirpc) ;for ("libuuid" ,util-linux) - ("lvm2" ,lvm2) ; for libdevmapper + ("lvm2" ,lvm2) ;for libdevmapper ("curl" ,curl) ("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 25e491691b83a54552bb22113b951cf9fad18704 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 18:48:31 +0200 Subject: gnu: openal: Build with GCC 9. * gnu/packages/audio.scm (openal)[native-inputs]: Add GCC-9. --- gnu/packages/audio.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index db7076b003..6a006b2a24 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -67,6 +67,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -1996,6 +1997,13 @@ lv2-c++-tools.") "/lib/libasound.so.2" "\")"))) #t))))) + (native-inputs + `(;; FIXME: On i686-linux, GCC 7 hits an internal compiler error + ;; upon building utils/makehrtf.c:3281: + ;; "internal compiler error: in gen_rtx_SUBREG, at emit-rtl.c:908" + ;; https://ci.guix.gnu.org/log/r2fjx9m75m9rifg2yjbnn853wqy2547n-openal-1.19.1 + ;; Remove this when the default compiler is GCC 9 or later. + ("gcc" ,gcc-9))) (inputs `(("alsa-lib" ,alsa-lib) ("pulseaudio" ,pulseaudio))) -- cgit v1.2.3 From 4b42b1067468dd7e5f3a5e11d64f16895bb16a25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 19:11:51 +0200 Subject: gnu: openimageio: Fix build with Boost 1.70 and CMake 3.14. * gnu/packages/graphics.scm (openimageio)[arguments]: Add <#:configure-flags>. --- gnu/packages/graphics.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 94a797c8f5..2d9becc3ec 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -468,7 +468,11 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") ;; FIXME: To run all tests successfully, test image sets from multiple ;; third party sources have to be present. For details see ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL - (arguments `(#:tests? #f)) + (arguments + `(#:tests? #f + ;; XXX: Work around a problem with Boost 1.70 and CMake 3.14. See + ;; for details. + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 5d1f5b305f0ddefb3d381fe320de338966e1b8a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 19:23:08 +0200 Subject: gnu: zeromq: Update to 4.3.2. * gnu/packages/networking.scm (zeromq): Update to 4.3.2. [source](uri): Adjust accordingly. --- gnu/packages/networking.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7d5b266db2..c58e3bcd83 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -273,14 +273,14 @@ transparently check connection attempts against an access control list.") (define-public zeromq (package (name "zeromq") - (version "4.0.7") + (version "4.3.2") (source (origin (method url-fetch) - (uri (string-append "http://download.zeromq.org/zeromq-" - version ".tar.gz")) + (uri (string-append "https://github.com/zeromq/libzmq/releases" + "/download/v" version "/zeromq-" version ".tar.gz")) (sha256 (base32 - "00vvwhgcdr1lva2pavicvy92iad0hj8cf71n702hv6blw1kjj2z0")))) + "0qzp80ky4y2k7k1ya09v9gkivvfbz2km813snrb8jhnn634bbmzb")))) (build-system gnu-build-system) (home-page "http://zeromq.org") (synopsis "Library for message-based applications") -- cgit v1.2.3 From e77947db06339a38979d9ef838ca9ed00d527db2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 19:25:41 +0200 Subject: gnu: openmw: Add Boost workaround. * gnu/packages/game-development.scm (openmw)[arguments]: Set "-DBoost_NO_BOOST_CMAKE=ON" in <#:configure-flags>. --- gnu/packages/game-development.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7eac935a69..5a4b81a988 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1116,7 +1116,8 @@ of use.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list "-DDESIRED_QT_VERSION=5"))) + (list "-DDESIRED_QT_VERSION=5" + "-DBoost_NO_BOOST_CMAKE=ON"))) ;work around (native-inputs `(("boost" ,boost) ("doxygen" ,doxygen) -- cgit v1.2.3 From 40a7153d198821c4111d5bb864f872d2df108013 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 23:15:50 +0200 Subject: gnu: python-flake8-polyfill: Adjust tests for Pytest 4. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[arguments]: Add substitution in setup.cfg. --- gnu/packages/python-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a7a21da5d..e2ef589acf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6541,6 +6541,12 @@ complexity of Python source code.") (modify-phases %standard-phases (replace 'check (lambda _ + ;; Be compatible with Pytest 4: + ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7 + (substitute* "setup.cfg" + (("\\[pytest\\]") + "[tool:pytest]")) + (setenv "PYTHONPATH" (string-append (getcwd) "/build/lib:" (getenv "PYTHONPATH"))) -- cgit v1.2.3 From bc2076f053d66b8293db800710bc72a7f5617396 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 23:29:07 +0200 Subject: gnu: bpp: Use the default GCC. * gnu/packages/bioinformatics.scm (bpp-core, bpp-phyl, bpp-popgen, bpp-seq, bppsuite)[inputs]: Remove GCC-5. --- gnu/packages/bioinformatics.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bfac90ecf7..e25a4e1d60 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1109,9 +1109,6 @@ relying on a complex dependency tree.") (build-system cmake-build-system) (arguments `(#:parallel-build? #f)) - (inputs - `(("gcc" ,gcc-5))) ; Compilation of bpp-phyl fails with GCC 4.9 so we - ; compile all of the bpp packages with GCC 5. (home-page "http://biopp.univ-montp2.fr") (synopsis "C++ libraries for Bioinformatics") (description @@ -1147,10 +1144,7 @@ providing them a set of re-usable tools.") #:out-of-source? #f)) (inputs `(("bpp-core" ,bpp-core) - ("bpp-seq" ,bpp-seq) - ;; GCC 4.8 fails due to an 'internal compiler error', so we use a more - ;; modern GCC. - ("gcc" ,gcc-5))) + ("bpp-seq" ,bpp-seq))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bio++ phylogenetic Library") (description @@ -1182,8 +1176,7 @@ library provides phylogenetics-related modules.") #:tests? #f)) ; There are no tests. (inputs `(("bpp-core" ,bpp-core) - ("bpp-seq" ,bpp-seq) - ("gcc" ,gcc-5))) + ("bpp-seq" ,bpp-seq))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bio++ population genetics library") (description @@ -1216,8 +1209,7 @@ library provides population genetics-related modules.") ;; so the tests fail. #:out-of-source? #f)) (inputs - `(("bpp-core" ,bpp-core) - ("gcc" ,gcc-5))) ; Use GCC 5 as per 'bpp-core'. + `(("bpp-core" ,bpp-core))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bio++ sequence library") (description @@ -1255,8 +1247,7 @@ library provides sequence-related modules.") `(("bpp-core" ,bpp-core) ("bpp-seq" ,bpp-seq) ("bpp-phyl" ,bpp-phyl) - ("bpp-phyl" ,bpp-popgen) - ("gcc" ,gcc-5))) + ("bpp-phyl" ,bpp-popgen))) (home-page "http://biopp.univ-montp2.fr") (synopsis "Bioinformatics tools written with the Bio++ libraries") (description -- cgit v1.2.3 From 3401526fcf1e3a049797b38412a46ce01b5cf435 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 00:12:14 +0200 Subject: gnu: pidentd: Build against OpenSSL 1.0. * gnu/packages/networking.scm (pidentd)[inputs]: Change OPENSSL to OPENSSL-1.0. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c58e3bcd83..9abbd1196c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1626,7 +1626,7 @@ enabled due to license conflicts between the BSD advertising clause and the GPL. (arguments `(#:tests? #f)) ; No tests are included (inputs - `(("openssl" ,openssl))) ; For the DES library + `(("openssl" ,openssl-1.0))) ;for the DES library (home-page "https://www.lysator.liu.se/~pen/pidentd/") (synopsis "Small Ident Daemon") (description -- cgit v1.2.3 From c498a07e2d5a0dbe3a68cae02355202095146697 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 00:19:42 +0200 Subject: gnu: python-pympler: Update to 0.7. * gnu/packages/python-xyz.scm (python-pympler): Update to 0.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e2ef589acf..0dc61c1099 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2207,13 +2207,13 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "19qkpaw5icwhb4c0f6ijqfmhwhj34k2k6s4m4fsvhrxc9p5cwqn2")))) + "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 96783ed6275cd2818ff56916274e6e4582f1dc9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Jul 2019 00:52:36 +0200 Subject: syscalls: 'define-as-needed' does not re-export local variables. Fixes . Reported by Timothy Sample . * guix/build/syscalls.scm (define-as-needed): Rewrite to use lower-level module primitives; define VARIABLE only if it's not already defined to avoid "re-exporting local variable" error. --- guix/build/syscalls.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 3c84d3893f..f2fdb4d9d1 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -396,17 +396,11 @@ the returned procedure is called." ((_ (proc args ...) body ...) (define-as-needed proc (lambda* (args ...) body ...))) ((_ variable value) - (begin - (when (module-defined? the-scm-module 'variable) - (re-export variable)) - - (define variable - (if (module-defined? the-scm-module 'variable) - (module-ref the-scm-module 'variable) - value)) - - (unless (module-defined? the-scm-module 'variable) - (export variable)))))) + (if (module-defined? the-scm-module 'variable) + (module-re-export! (current-module) '(variable)) + (begin + (module-define! (current-module) 'variable value) + (module-export! (current-module) '(variable))))))) ;;; -- cgit v1.2.3 From 90efc2f28e49595c3c467f3e72dd27812dd7cc54 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Jul 2019 12:15:31 +0200 Subject: gnu: ovmf: Build with GCC 5. * gnu/packages/firmware.scm (ovmf)[native-inputs]: Add GCC-5. --- gnu/packages/firmware.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 8f0b6cb15e..c473ccd920 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -249,6 +249,7 @@ coreboot.") (build-system gnu-build-system) (native-inputs `(("acpica" ,acpica) + ("gcc" ,gcc-5) ("nasm" ,nasm) ("python-2" ,python-2) ("util-linux" ,util-linux))) -- cgit v1.2.3 From 1a58e1d4442cb4ba504fd76b9567da9aef47b1b0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Jul 2019 12:30:53 +0200 Subject: gnu: john-the-ripper-jumbo: Build against OpenSSL 1.0. * gnu/packages/password-utils.scm (john-the-ripper-jumbo): Change OPENSSL to OPENSSL-1.0. --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 49024b26c4..8b1bca37e1 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -754,7 +754,7 @@ between hosts and entries in the password store.") ("krb5" ,mit-krb5) ("libpcap" ,libpcap) ("nss" ,nss) - ("openssl" ,openssl) + ("openssl" ,openssl-1.0) ("zlib" ,zlib))) (arguments `(#:configure-flags -- cgit v1.2.3 From 04842543e8231d99aad4c8ec232f41272886fbd1 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 19 Jul 2019 12:40:03 +0200 Subject: gnu: fbreader: Build with GCC 5. * gnu/packages/ebook.scm (fbreader)[native-inputs]: Add GCC-5. --- gnu/packages/ebook.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index cf424f285d..5062515cf0 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) + #:use-module (gnu packages gcc) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages glib) @@ -294,7 +295,8 @@ designed to be used in a generic text renderer.") ("sqlite" ,sqlite) ("zlib" ,zlib))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gcc" ,gcc-5) + ("pkg-config" ,pkg-config))) (arguments `(#:tests? #f ; No tests exist. #:make-flags `("CC=gcc" "TARGET_ARCH=desktop" "UI_TYPE=gtk" -- cgit v1.2.3 From 0fdec2a309bfc9c62b449524e3e71714674bca6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 14:57:06 +0200 Subject: gnu: tensorflow: Provide older setuptools version. * gnu/packages/python-xyz.scm (python-setuptools-for-tensorflow): New public variable. * gnu/packages/machine-learning.scm (tensorflow)[native-inputs]: Add it. --- gnu/packages/machine-learning.scm | 3 +++ gnu/packages/python-xyz.scm | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ace52b4c9d..e3c69948e2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1604,6 +1604,9 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("protobuf:native" ,protobuf-next) ; protoc ("protobuf:src" ,(package-source protobuf-next)) ("eigen:src" ,(package-source eigen-for-tensorflow)) + ;; install_pip_packages.sh wants setuptools 39.1.0 specifically. + ("python-setuptools" ,python-setuptools-for-tensorflow) + ;; The commit hashes and URLs for third-party source code are taken ;; from "tensorflow/workspace.bzl". ("boringssl-src" diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 65dffd33bf..6796f1c065 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -713,6 +713,19 @@ Python 3 support.") (define-public python2-setuptools (package-with-python2 python-setuptools)) +;; The setuptools provided by Python 3.7.4 is too new for Tensorflow. +(define-public python-setuptools-for-tensorflow + (hidden-package + (package + (inherit python-setuptools) + (version "39.1.0") + (source (origin + (inherit (package-source python-setuptools)) + (uri (pypi-uri "setuptools" version ".zip")) + (sha256 + (base32 + "1mzdhvfhnv4lggxa8rjl0dzqxvfx377gg5sqs57v89wrp09lwj65"))))))) + (define-public python-uniseg (package (name "python-uniseg") -- cgit v1.2.3 From f02ab17b4a664b21294f75cb6d8ef62a022565ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:00:03 +0200 Subject: gnu: czmq: Update to 4.2.0. * gnu/packages/networking.scm (czmq): Update to 4.2.0. [arguments]: Enable tests, but patch out the non-working one. --- gnu/packages/networking.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9abbd1196c..a51497c206 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -296,7 +296,7 @@ more.") (define-public czmq (package (name "czmq") - (version "4.1.1") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append @@ -305,21 +305,19 @@ more.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh")))) + "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg")))) (build-system gnu-build-system) (arguments - '(;; TODO Tests fail for some reason: - ;; * zauth: OK - ;; * zbeacon: OK (skipping test, no UDP broadcasting) - ;; E: (czmq_selftest) 18-02-24 16:25:52 No broadcast interface found, (ZSYS_INTERFACE=lo) - ;; make[2]: *** [Makefile:2245: check-local] Segmentation fault - ;; make[2]: Leaving directory '/tmp/guix-build-czmq-4.1.0.drv-0/czmq-4.1.0' - ;; make[1]: *** [Makefile:2032: check-am] Error 2 - ;; make[1]: Leaving directory '/tmp/guix-build-czmq-4.1.0.drv-0/czmq-4.1.0' - ;; make: *** [Makefile:1588: check-recursive] Error 1 - ;; phase `check' failed after 19.4 seconds - #:tests? #f - #:configure-flags '("--enable-drafts"))) + '(#:configure-flags '("--enable-drafts") + #:phases (modify-phases %standard-phases + (add-before 'check 'patch-tests + (lambda _ + ;; XXX FIXME: Disable the zproc test, which fails on some + ;; hardware: . + (substitute* "src/czmq_selftest.c" + (("\\{ \"zproc\", zproc_test.*") + "")) + #t))))) (inputs `(("zeromq" ,zeromq))) (home-page "http://zeromq.org") -- cgit v1.2.3 From 65db770833af9578642d733c4bc305c81ae5358f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:01:03 +0200 Subject: gnu: zyre: Kernel headers are system headers. * gnu/packages/networking.scm (zyre)[arguments]: Add <#:make-flags>. --- gnu/packages/networking.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a51497c206..f31e758944 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2016,6 +2016,12 @@ remotely.") (base32 "0qz2730bng1gs9xbqxhkw88qbsmszgmmrl2g9k6xrg6r3bqvsdc7")))) (build-system gnu-build-system) + (arguments + `(;; Ensure the kernel headers are treated as system headers to suppress + ;; harmless -Werror=pedantic warnings. + #:make-flags (list (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include")))) (inputs `(("zeromq" ,zeromq) ("czmq" ,czmq) ("libsodium" ,libsodium))) -- cgit v1.2.3 From ca49d732256fd768941b91b3e92404430832de27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:01:40 +0200 Subject: gnu: librime: Update to 1.5.3. * gnu/packages/ibus.scm (librime): Update to 1.5.3. [arguments]: Add <#:configure-flags>. --- gnu/packages/ibus.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index eab35dbadd..9291a74394 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -305,7 +305,7 @@ Japanese language input in most graphical applications.") (define-public librime (package (name "librime") - (version "1.4.0") + (version "1.5.3") (source (origin (method git-fetch) @@ -315,7 +315,7 @@ Japanese language input in most graphical applications.") (file-name (git-file-name name version)) (sha256 (base32 - "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd")) + "0xskhdhk7dgpc71r39pfzxi5vrlzy90aqj1gzv8nnapq91p2awhv")) (modules '((guix build utils))) (snippet '(begin @@ -325,7 +325,9 @@ Japanese language input in most graphical applications.") #t)))) (build-system cmake-build-system) (arguments - '(#:phases + '(;; XXX: Work around . + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ -- cgit v1.2.3 From b16e08279938fae329e62154da749860bdccef04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:44:26 +0200 Subject: gnu: python-keras: Add upstream patch. * gnu/packages/patches/python-keras-integration-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/machine-learning.scm (python-keras)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 1 + .../patches/python-keras-integration-test.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/python-keras-integration-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01ec94484f..35775041b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1225,6 +1225,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ + %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index e3c69948e2..3eeb9cb1e2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1853,6 +1853,7 @@ with image data, text data, and sequence data.") (origin (method url-fetch) (uri (pypi-uri "Keras" version)) + (patches (search-patches "python-keras-integration-test.patch")) (sha256 (base32 "1j8bsqzh49vjdxy6l1k4iwax5vpjzniynyd041xjavdzvfii1dlh")))) diff --git a/gnu/packages/patches/python-keras-integration-test.patch b/gnu/packages/patches/python-keras-integration-test.patch new file mode 100644 index 0000000000..aa2b1a273d --- /dev/null +++ b/gnu/packages/patches/python-keras-integration-test.patch @@ -0,0 +1,19 @@ +Fix a test failure with recent versions of ... Pytest? Python? + +Taken from upstream: +https://github.com/keras-team/keras/commit/fe35050a8f18dc52304aa8da4e463eececa25240 + +diff --git a/tests/integration_tests/applications_test.py b/tests/integration_tests/applications_test.py +index 979f2f2abd6..6e3b57fa8e2 100644 +--- a/tests/integration_tests/applications_test.py ++++ b/tests/integration_tests/applications_test.py +@@ -58,7 +58,8 @@ def _test_application_basic(app, last_dim=1000): + def _test_application_notop(app, last_dim): + output_shape = _get_output_shape( + lambda: app(weights=None, include_top=False)) +- assert output_shape == (None, None, None, last_dim) ++ assert len(output_shape) == 4 ++ assert output_shape[-1] == last_dim + + + def test_mobilenet_v2_legacy_import(): -- cgit v1.2.3 From 57d87f435fcb05a8e44a6d0545d0212429826bd0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 18:00:41 +0200 Subject: gnu: supertux: Adjust for recent GCC and Boost. * gnu/packages/patches/supertux-fix-build-with-gcc5.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/games.scm (supertux)[source](patches): Remove. [arguments]: Adjust <#:configure-flags>. --- gnu/local.mk | 1 - gnu/packages/games.scm | 6 +- .../patches/supertux-fix-build-with-gcc5.patch | 75 ---------------------- 3 files changed, 3 insertions(+), 79 deletions(-) delete mode 100644 gnu/packages/patches/supertux-fix-build-with-gcc5.patch diff --git a/gnu/local.mk b/gnu/local.mk index 35775041b8..528ad703a4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1307,7 +1307,6 @@ dist_patch_DATA = \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ - %D%/packages/patches/supertux-fix-build-with-gcc5.patch \ %D%/packages/patches/supertux-unbundle-squirrel.patch \ %D%/packages/patches/swig-guile-gc.patch \ %D%/packages/patches/swish-e-search.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8e9db1412a..1088d2ff4b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3519,12 +3519,12 @@ with the \"Stamp\" tool within Tux Paint.") (base32 "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4")) (patches - (search-patches "supertux-fix-build-with-gcc5.patch" - "supertux-unbundle-squirrel.patch")))) + (search-patches "supertux-unbundle-squirrel.patch")))) (arguments '(#:tests? #f #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin" - "-DENABLE_BOOST_STATIC_LIBS=OFF" + ;; XXX: Work around . + "-DBoost_NO_BOOST_CMAKE=ON" "-DUSE_SYSTEM_PHYSFS=ON") #:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/supertux-fix-build-with-gcc5.patch b/gnu/packages/patches/supertux-fix-build-with-gcc5.patch deleted file mode 100644 index 6393215ca1..0000000000 --- a/gnu/packages/patches/supertux-fix-build-with-gcc5.patch +++ /dev/null @@ -1,75 +0,0 @@ -Taken from https://github.com/SuperTux/supertux/commit/a75317ef0a94847d9b6a7833b9c6652ef29edde3. -This patch fixes building with gcc versions earlier than 6. - -From a75317ef0a94847d9b6a7833b9c6652ef29edde3 Mon Sep 17 00:00:00 2001 -From: Ingo Ruhnke -Date: Fri, 28 Dec 2018 22:45:35 +0100 -Subject: [PATCH] Add workaround for backwards compatibilty with gcc5 - -Fixes #1014 ---- - src/video/gl/gl_painter.cpp | 11 ++++++----- - src/video/ttf_surface.cpp | 16 +++++++++------- - 2 files changed, 15 insertions(+), 12 deletions(-) - -diff --git a/src/video/gl/gl_painter.cpp b/src/video/gl/gl_painter.cpp -index 5e0d1e7b1e..32fb7a09b6 100644 ---- a/src/video/gl/gl_painter.cpp -+++ b/src/video/gl/gl_painter.cpp -@@ -37,12 +37,13 @@ namespace { - - inline std::tuple blend_factor(Blend blend) - { -+ using B = std::tuple; - switch(blend) { -- case Blend::NONE: return {GL_ONE, GL_ZERO}; -- case Blend::BLEND: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}; -- case Blend::ADD: return {GL_SRC_ALPHA, GL_ONE}; -- case Blend::MOD: return {GL_DST_COLOR, GL_ZERO}; -- default: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}; -+ case Blend::NONE: return B(GL_ONE, GL_ZERO); -+ case Blend::BLEND: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -+ case Blend::ADD: return B(GL_SRC_ALPHA, GL_ONE); -+ case Blend::MOD: return B(GL_DST_COLOR, GL_ZERO); -+ default: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - } - } - -diff --git a/src/video/ttf_surface.cpp b/src/video/ttf_surface.cpp -index 7c9505004f..b41d67b2c8 100644 ---- a/src/video/ttf_surface.cpp -+++ b/src/video/ttf_surface.cpp -@@ -55,12 +55,13 @@ TTFSurface::create(const TTFFont& font, const std::string& text) - SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0); - SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND); - -+ using P = std::tuple; - const std::initializer_list > positions[] = { - {}, -- {{0, 0}}, -- {{-1, 0}, {1, 0}, {0, -1}, {0, 1}}, -- {{-2, 0}, {2, 0}, {0, -2}, {0, 2}, -- {-1, -1}, {1, -1}, {-1, 1}, {1, 1}} -+ {P{0, 0}}, -+ {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}}, -+ {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2}, -+ P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}} - }; - - int shadow_size = std::min(2, font.get_shadow_size()); -@@ -77,11 +78,12 @@ TTFSurface::create(const TTFFont& font, const std::string& text) - SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0); - SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND); - -+ using P = std::tuple; - const std::initializer_list > positions[] = { - {}, -- {{-1, 0}, {1, 0}, {0, -1}, {0, 1}}, -- {{-2, 0}, {2, 0}, {0, -2}, {0, 2}, -- {-1, -1}, {1, -1}, {-1, 1}, {1, 1}} -+ {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}}, -+ {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2}, -+ P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}} - }; - - int border = std::min(2, font.get_border()); -- cgit v1.2.3 From da9adfc7f7e11e6aeaa6322331e867bbafdab055 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 18:02:43 +0200 Subject: gnu: colobot, leela-zero: Add Boost workaround. This works around and incompatibility with CMake 3.14 and Boost 1.70, see . * gnu/packages/games.scm (colobot, leela-zero)[arguments]: Add "-DBoost_NO_BOOST_CMAKE=ON" in <#:configure-flags>. --- gnu/packages/games.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1088d2ff4b..30fa0463f4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5397,6 +5397,8 @@ Github or Gitlab.") (build-system cmake-build-system) (arguments `(#:tests? #f ;no test + ;; XXX: Work around . + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -7621,7 +7623,9 @@ remake of that series or any other game.") ("qtbase" ,qtbase) ("zlib" ,zlib))) (arguments - '(#:configure-flags '("-DUSE_BLAS=YES") + '(#:configure-flags '("-DUSE_BLAS=YES" + ;; XXX: Work around . + "-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-tests (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From e1f174ae284d9954840f1723ac012c0d3fbcecb4 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 19 Jul 2019 10:36:21 -0400 Subject: gnu: evolution-data-server: Use a proper patch for locales. See . * gnu/packages/patches/evolution-data-server-locales.patch: New file. * gnu/local.mk: Add it. * gnu/packages/gnome.scm (evolution-data-server): Replace the 'patch-locale-canonicalization' phase with the new patch. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 17 +---------- .../patches/evolution-data-server-locales.patch | 33 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 gnu/packages/patches/evolution-data-server-locales.patch diff --git a/gnu/local.mk b/gnu/local.mk index 528ad703a4..c95a5c8126 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -780,6 +780,7 @@ dist_patch_DATA = \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ + %D%/packages/patches/evolution-data-server-locales.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index beaba3b4c5..9190301ee9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5162,6 +5162,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (uri (string-append "mirror://gnome/sources/" name "/" (version-major+minor version) "/" name "-" version ".tar.xz")) + (patches (search-patches "evolution-data-server-locales.patch")) (sha256 (base32 "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli")))) @@ -5205,22 +5206,6 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") "tests/libedata-cal/test-cal-cache-utils.c") (("/bin/rm") (which "rm"))) #t)) - ;; This phase fixes locale canonicalization when using newer - ;; versions of ICU. The bug has been fixed upstream, and - ;; should appear starting in version 3.33.5. - ;; . - (add-after 'unpack 'patch-locale-canonicalization - (lambda _ - (substitute* "src/libedataserver/e-collator.c" - (("len = uloc_canonicalize \\(posix_locale,.*" x) - ((lambda (xs) (string-join xs "\n" 'suffix)) - (list - "if (posix_locale && (" - " g_ascii_strcasecmp(posix_locale, \"C\") == 0 ||" - " g_ascii_strcasecmp(posix_locale, \"POSIX\") == 0))" - " posix_locale = \"en_US_POSIX\";" - x)))) - #t)) (add-before 'configure 'dont-override-rpath (lambda _ (substitute* "CMakeLists.txt" diff --git a/gnu/packages/patches/evolution-data-server-locales.patch b/gnu/packages/patches/evolution-data-server-locales.patch new file mode 100644 index 0000000000..48baefb0d8 --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-locales.patch @@ -0,0 +1,33 @@ +This patch fixes locale canonicalization when using newer versions of +ICU. It comes from the upstream repo, and should appear starting in +version 3.33.5. + +From fe4ac94ce3c14f200e049a5d102fc0e4b811c71e Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 16 Jul 2019 07:22:07 +0200 +Subject: [PATCH] I#137 - POSIX locale tests fail with ICU 64.x + +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/137 +--- + src/libedataserver/e-collator.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/libedataserver/e-collator.c b/src/libedataserver/e-collator.c +index 718eac5da..ec2cf7951 100644 +--- a/src/libedataserver/e-collator.c ++++ b/src/libedataserver/e-collator.c +@@ -132,6 +132,11 @@ canonicalize_locale (const gchar *posix_locale, + gint len; + const gchar *collation_type = NULL; + ++ if (posix_locale && ( ++ g_ascii_strcasecmp (posix_locale, "C") == 0 || ++ g_ascii_strcasecmp (posix_locale, "POSIX") == 0)) ++ posix_locale = "en_US_POSIX"; ++ + len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status); + + if (U_FAILURE (status)) { +-- +2.22.0 + -- cgit v1.2.3 From 1c9b99234c8322467ca22be70a94aa1678658476 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Fri, 19 Jul 2019 12:05:58 -0400 Subject: gnu: gnome-session: Do not patch in absolute paths. This is no longer needed as upstream is now using absolute paths. * gnu/packages/gnome.scm (gnome-session): Remove phase that patches absolute paths into the session desktop entry files. --- gnu/packages/gnome.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9190301ee9..3ac5025fce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4806,14 +4806,6 @@ such as gzip tarballs.") (out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/gnome-session") `("PATH" ":" prefix (,(string-append glib "/bin")))) - #t))) - (add-after 'install 'add-absolute-paths-to-desktop-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* (map (lambda (x) - (string-append out "/share/xsessions/" x)) - '("gnome.desktop" "gnome-xorg.desktop")) - (("gnome-session") (string-append out "/bin/gnome-session"))) #t)))) #:configure-flags -- cgit v1.2.3 From d478cc043557ca3fcd5fced87d2e2c8e246eff03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 18:38:11 +0200 Subject: gnu: pybind11: Update to 2.3.0. * gnu/packages/python-xyz.scm (pybind11): Update to 2.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6796f1c065..d3744e82c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14888,7 +14888,7 @@ under Python 2.7.") (define-public pybind11 (package (name "pybind11") - (version "2.2.4") + (version "2.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -14896,7 +14896,7 @@ under Python 2.7.") (commit (string-append "v" version)))) (sha256 (base32 - "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv")) + "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From 2cf1e37c109c8d03fae75bc84f7012f3afa956e5 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 28 Jul 2019 08:49:00 -0400 Subject: gnu: gnome-maps: Update to 3.30.3.1. * gnu/packages/geo.scm (gnome-maps): Update to 3.30.3.1. [inputs]: Replace gdk-pixbuf with gdk-pixbuf+svg and gnome-online-accounts with gnome-online-accounts:lib. [arguments]: Adjust 'wrap' phase accordingly. --- gnu/packages/geo.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5dce3f9a58..09ca77e69b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -108,7 +108,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.30.2.1") + (version "3.30.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -116,7 +116,7 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57")))) + "0xqk3yrds0w8bjmpf4jw0370phvm65av82nqrx7fp1648h9nq7xi")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -130,8 +130,11 @@ topology functions.") (assoc-ref inputs "geocode-glib") "/lib")) (goa-path (string-append - (assoc-ref inputs "gnome-online-accounts") + (assoc-ref inputs "gnome-online-accounts:lib") "/lib")) + (gdk-pixbuf-path (string-append + (assoc-ref inputs "gdk-pixbuf") + "/lib")) (webkitgtk-path (string-append (assoc-ref inputs "webkitgtk") "/lib"))) @@ -140,9 +143,11 @@ topology functions.") ;; There seems to be no way to embed the path of ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37, - ;; libjavascriptcoregtk-4.0.so.18, and libgeocode-glib.so.0 + ;; libgdk_pixbuf-2.0.so, libjavascriptcoregtk-4.0.so.18, and + ;; libgeocode-glib.so.0 `("LD_LIBRARY_PATH" ":" prefix (,goa-path ,webkitgtk-path + ,gdk-pixbuf-path ,geocode-glib-path))) #t)))))) (native-inputs @@ -158,14 +163,14 @@ topology functions.") ("libsoup" ,libsoup) ("libgweather" ,libgweather) ("libxml2" ,libxml2) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("glib-networking" ,glib-networking) ("geoclue" ,geoclue) ("geocode-glib" ,geocode-glib) ("gfbgraph" ,gfbgraph) ("gjs" ,gjs) ("glib" ,glib) - ("gnome-online-accounts" ,gnome-online-accounts) + ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("rest" ,rest) ("webkitgtk" ,webkitgtk))) -- cgit v1.2.3 From c7e31cde04f6308615734f5c6fd91de87e1a60f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 25 Apr 2019 15:46:36 +0200 Subject: gnu: ftgl: Update to 2.4.0. * gnu/packages/gl.scm (ftgl): Update to 2.4.0. [home-page]: Change to maintained fork at . [source]: Change to GIT-FETCH. [native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL. --- gnu/packages/gl.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f615ebd71c..e7d50a5b8a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -149,15 +149,16 @@ the X-Consortium license.") (define-public ftgl (package (name "ftgl") - (version "2.1.3-rc5") + (version "2.4.0") + (home-page "https://github.com/frankheckenbach/ftgl") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/ftgl/FTGL%20Source/2.1.3~rc5/" - "ftgl-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l")))) + "0zjs1h9w30gajq9lndzvjsa26rsmr1081lb1fbpbj10yhcdcsc79")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) @@ -167,8 +168,10 @@ the X-Consortium license.") ("mesa" ,mesa) ("glu" ,glu))) (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://ftgl.sourceforge.net") + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (synopsis "Font rendering library for OpenGL applications") (description "FTGL is a font rendering library for OpenGL applications. Supported -- cgit v1.2.3 From e4e2bef12d1f170cc3d16812b2a1c7016500c25d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 13:26:35 +0200 Subject: gnu: prank: Update to 170427. * gnu/packages/bioinformatics.scm (prank): Update to 170427. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eb99eceb14..b1cf294177 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4829,7 +4829,7 @@ generated using the PacBio Iso-Seq protocol.") (define-public prank (package (name "prank") - (version "150803") + (version "170427") (source (origin (method url-fetch) (uri (string-append @@ -4837,7 +4837,7 @@ generated using the PacBio Iso-Seq protocol.") version ".tgz")) (sha256 (base32 - "0am4z94fs3w2n5xpfls9zda61vq7qqz4q2i7b9hlsxz5q4j3kfm4")))) + "0nc8g9c5rkdxcir46s0in9ci1sxwzbjibxrvkksf22ybnplvagk2")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From cfad3defb727ff3f0df0382531963911e9d38f1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 16:06:22 +0200 Subject: gnu: gpsbabel: Remove GCC 5 workaround. * gnu/packages/gps.scm (gpsbabel)[arguments]<#:configure-flags>: Remove "CXXFLAGS". --- gnu/packages/gps.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 852d095300..2d24a9ac22 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -66,11 +66,7 @@ ;; TODO: "make doc" requires Docbook & co. (arguments `(#:configure-flags - '("--with-zlib=system" - ;; XXX Use -fPIC to work around build problems with Qt, GCC 5, and - ;; recent binutils: - ;; https://codereview.qt-project.org/#/c/111787/ - "CXXFLAGS=-std=gnu++11 -fPIC") + '("--with-zlib=system") ;; On i686, 'raymarine.test' fails because of a rounding error: ;; . As a workaround, disable tests ;; on these platforms. -- cgit v1.2.3 From 7999d317bcc12d9c1ebc63bd519145ee4954e410 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:08:18 +0200 Subject: gnu: icu4c: Add upstream patches. This is necessary to fix a test failure in 'node' when built for i686-linux. * gnu/packages/icu4c.scm (%icu4c-patches): New variable. (icu4c)[source](patches, patch-flags): New fields. --- gnu/packages/icu4c.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index fc3409ed3f..258721963b 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -31,6 +31,28 @@ #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) +;; These patches are taken from ICUs 'maint-64' branch and will be included in +;; 64.3. The latter patch is needed because many packages use "invalid" +;; locales which misbehave with ICU 64.2. See discussion at +;; . +(define %icu4c-patches + (list (origin + (method url-fetch) + (uri (string-append "https://github.com/unicode-org/icu/commit/" + "7788f04eb9be0d7ecade6af46cf7b9825447763d.patch")) + (file-name "icu4c-datetime-regression.patch") + (sha256 + (base32 + "0gs2sbdfpzwwdjqcqr0c16fw3g7wy3gb1gbgvzs9k1ciw0bhpv4w"))) + (origin + (method url-fetch) + (uri (string-append "https://github.com/unicode-org/icu/commit/" + "cfb20862909ff105d4f2c43923c97561bc5a5815.patch")) + (file-name "icu4c-locale-mapping.patch") + (sha256 + (base32 + "0s5psb60aisj6icziblvlp9dqcz56n3887i8ib0yidbjnnrw5b97"))))) + (define-public icu4c (package (name "icu4c") @@ -43,6 +65,8 @@ "/icu4c-" (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) + (patches %icu4c-patches) + (patch-flags '("-p2")) (sha256 (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) -- cgit v1.2.3 From f73fe13ccd1ef3fe6f6e0409fa817e5feb612e40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 19:11:33 +0200 Subject: gnu: icu4c: Make 'libicudata.so' behave the same on all architectures. * gnu/packages/icu4c.scm (icu4c)[arguments]: Do not pass '--with-data-packaging=archive' in #:configure-flags. Add phase to enable use of standard libraries in libicudata.so. --- gnu/packages/icu4c.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 258721963b..922dfbd348 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -76,17 +76,19 @@ `(("perl" ,perl))) (arguments `(#:configure-flags - '("--enable-rpath" - ,@(if (let ((s (or (%current-target-system) - (%current-system)))) - (or (string-prefix? "arm" s) - (string-prefix? "mips" s))) - '("--with-data-packaging=archive") - '())) + '("--enable-rpath") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source (lambda _ (chdir "source") #t)) + (add-after 'chdir-to-source 'update-LDFLAGS + (lambda _ + ;; Do not create a "data-only" libicudata.so because it causes + ;; problems on some architectures (notably armhf and MIPS). + (substitute* "config/mh-linux" + (("LDFLAGSICUDT=-nodefaultlibs -nostdlib") + "LDFLAGSICUDT=")) + #t)) (add-after 'install 'avoid-coreutils-reference ;; Don't keep a reference to the build tools. (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 80ba43b5f8c70cd823cf0821ae32491e7b3edd3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:18:22 +0200 Subject: gnu: libarchive: Enable zstd support. CMake 3.15 has a test that expects zstd to be enabled. It adds ~1 MiB to the closure size. * gnu/packages/backup.scm (libarchive)[inputs]: Add ZSTD:LIB. Sort alphabetically. [arguments]: Adjust one of the zstd tests. Adjust libarchive.pc. --- gnu/packages/backup.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 1bb05d9d15..abb8eed259 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong +;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -212,12 +213,13 @@ backups (called chunks) to allow easy burning to CD/DVD.") "0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) - ("nettle" ,nettle) - ("lzo" ,lzo) - ("bzip2" ,bzip2) + `(("bzip2" ,bzip2) ("libxml2" ,libxml2) - ("xz" ,xz))) + ("lzo" ,lzo) + ("nettle" ,nettle) + ("xz" ,xz) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) (arguments `(#:phases (modify-phases %standard-phases @@ -232,6 +234,13 @@ backups (called chunks) to allow easy burning to CD/DVD.") ;; test_write_disk_lookup tests expect user 'root' to exist, but ;; the chroot's /etc/passwd doesn't have it. Turn off those tests. ;; + ;; XXX: Adjust test that fails with zstd 1.4.1 because the default + ;; options compresses two bytes better than this test expects. + ;; https://github.com/libarchive/libarchive/issues/1226 + (substitute* "libarchive/test/test_write_filter_zstd.c" + (("compression-level\", \"6\"") + "compression-level\", \"7\"")) + ;; The tests allow one to disable tests matching a globbing pattern. (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test") ;; XXX: This glob disables too much. @@ -246,6 +255,7 @@ backups (called chunks) to allow easy burning to CD/DVD.") (libxml2 (assoc-ref inputs "libxml2")) (xz (assoc-ref inputs "xz")) (zlib (assoc-ref inputs "zlib")) + (zstd (assoc-ref inputs "zstd")) (bzip2 (assoc-ref inputs "bzip2"))) (substitute* (string-append lib "/pkgconfig/libarchive.pc") (("-lnettle") @@ -256,6 +266,8 @@ backups (called chunks) to allow easy burning to CD/DVD.") (string-append "-L" xz "/lib -llzma")) (("-lz") (string-append "-L" zlib "/lib -lz")) + (("-lzstd") + (string-append "-L" zstd "/lib -lzstd")) (("-lbz2") (string-append "-L" bzip2 "/lib -lbz2"))) #t)))))) -- cgit v1.2.3 From f8071e9b3be91bdc0ceef7cbc8e93f58738da194 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 19:05:49 +0200 Subject: gnu: libarchive: Do not build 'libarchive.a'. * gnu/packages/backup.scm (libarchive)[arguments]: Add <#:configure-flags>. --- gnu/packages/backup.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index abb8eed259..1e9298f68c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -221,7 +221,8 @@ backups (called chunks) to allow easy burning to CD/DVD.") ("zlib" ,zlib) ("zstd" ,zstd "lib"))) (arguments - `(#:phases + `(#:configure-flags '("--disable-static") + #:phases (modify-phases %standard-phases (add-before 'build 'patch-pwd (lambda _ -- cgit v1.2.3 From 1664e2ab39b3d9f6252ce8b532468c45439aa01d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:36:26 +0200 Subject: gnu: libarchive: Embed absolute references to required libraries in .la file. * gnu/packages/backup.scm (libarchive)[arguments]: Substitute -lfoo compiler flags with absolute references in libarchive.la, in addition to libarchive.pc. --- gnu/packages/backup.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 1e9298f68c..a92c8c9aca 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -258,7 +258,9 @@ backups (called chunks) to allow easy burning to CD/DVD.") (zlib (assoc-ref inputs "zlib")) (zstd (assoc-ref inputs "zstd")) (bzip2 (assoc-ref inputs "bzip2"))) - (substitute* (string-append lib "/pkgconfig/libarchive.pc") + ;; Embed absolute references to these inputs to avoid propagation. + (substitute* (list (string-append lib "/pkgconfig/libarchive.pc") + (string-append lib "/libarchive.la")) (("-lnettle") (string-append "-L" nettle "/lib -lnettle")) (("-lxml2") -- cgit v1.2.3 From 0a6e9e13c54fb8a4574c9e1eb4e6d243f45b12ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:37:58 +0200 Subject: gnu: Remove workarounds for missing libarchive nettle propagation. * gnu/packages/gnome.scm (brasero, libgxps, aisleriot, grilo, grilo-plugins, totem, rhythmbox, gvfs, d-feet, gnome-session, gnome-autoar, tracker, nautilus)[inputs]: Remove NETTLE. * gnu/packages/linux.scm (singularity)[inputs]: Likewise. * gnu/packages/mate.scm (atril)[inputs]: Likewise. * gnu/packages/package-management.scm (rpm, libostree, flatpak)[inputs]: Likewise. --- gnu/packages/gnome.scm | 22 +++------------------- gnu/packages/linux.scm | 2 -- gnu/packages/mate.scm | 2 -- gnu/packages/package-management.scm | 4 ---- 4 files changed, 3 insertions(+), 27 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e8c26f5370..e2ecc1bb6a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -223,7 +223,6 @@ ("libnotify" ,libnotify) ("libsm" ,libsm) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (home-page "https://projects.gnome.org/brasero/") (synopsis "CD/DVD burning tool for Gnome") @@ -428,8 +427,7 @@ access the common Google services, and has full asynchronous support.") `(("gtk+" ,gtk+) ("libjpeg" ,libjpeg-turbo) ("lcms" ,lcms) - ("libtiff" ,libtiff) - ("nettle" ,nettle))) + ("libtiff" ,libtiff))) (propagated-inputs ;; In Requires of libgxps.pc. `(("cairo" ,cairo) @@ -818,10 +816,6 @@ forgotten when the session ends.") ("libcanberra" ,libcanberra) ("libsecret" ,libsecret) - ;; XXX: 'libarchive.pc' adds '-lnettle' so Nettle should really be - ;; propagated from there. - ("nettle" ,nettle) - ;; For tests. ("dogtail" ,python2-dogtail))) (native-inputs @@ -3332,8 +3326,7 @@ settings, themes, mouse settings, and startup of other daemons.") ("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2))) (inputs - `(("nettle" ,nettle) - ("libsoup" ,libsoup))) + `(("libsoup" ,libsoup))) (home-page "https://projects.gnome.org/totem") (synopsis "Library to parse and save media playlists for GNOME") (description "Totem-pl-parser is a GObjects-based library to parse and save @@ -3788,7 +3781,6 @@ as possible!") ("libxml2" ,libxml2) ("liboauth" ,liboauth) ("libsoup" ,libsoup) - ("nettle" ,nettle) ("totem-pl-parser" ,totem-pl-parser))) (arguments `(#:phases @@ -3837,7 +3829,6 @@ for application developers.") ("pkg-config" ,pkg-config))) (inputs `(("grilo" ,grilo) - ("nettle" ,nettle) ; XXX: required by libgrlpls-0.3.la ("glib" ,glib) ("libxml2" ,libxml2) ("sqlite" ,sqlite) @@ -3926,7 +3917,6 @@ for application developers.") ("totem-pl-parser" ,totem-pl-parser) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) - ("nettle" ,nettle) ("vala" ,vala))) (arguments `(#:glib-or-gtk? #t @@ -4028,7 +4018,6 @@ which can read a large number of file formats.") ("python-pygobject" ,python2-pygobject) ("vala" ,vala) ("gmime" ,gmime) - ("nettle" ,nettle) ("adwaita-icon-theme" ,adwaita-icon-theme) ("grilo" ,grilo) ("grilo-plugins" ,grilo-plugins) @@ -4244,7 +4233,6 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") ("libsmbclient" ,samba) ("libsoup" ,libsoup) ("libxml2" ,libxml2) - ("nettle" ,nettle) ; XXX: required by libarchive.pc ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) @@ -4760,7 +4748,6 @@ share them with others via social networking and more.") ("json-glib" ,json-glib) ("libarchive" ,libarchive) ("libnotify" ,libnotify) - ("nettle" ,nettle) ("itstool" ,itstool) ("libxml2" ,libxml2))) (synopsis "Graphical archive manager for GNOME") @@ -6217,8 +6204,7 @@ as SASL, TLS and VeNCrypt. Additionally it supports encoding extensions.") (propagated-inputs `(("libarchive" ,libarchive))) ; XXX document why (inputs - `(("gtk+" ,gtk+) - ("nettle" ,nettle))) ; XXX: required by libarchive.pc + `(("gtk+" ,gtk+))) (synopsis "Archives integration support for GNOME") (home-page "https://git.gnome.org/browse/gnome-autoar/") (description @@ -6286,7 +6272,6 @@ easy, safe, and automatic.") ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("sqlite" ,sqlite) - ("nettle" ,nettle) ; XXX why is this needed? ("python" ,python) ("poppler" ,poppler) ("libgsf" ,libgsf) @@ -6355,7 +6340,6 @@ shared object databases, search tools and indexing.") ("gnome-autoar" ,gnome-autoar) ("libseccomp" ,libseccomp) ("libselinux" ,libselinux) - ("nettle" ,nettle) ; XXX required by libarchive.pc via gnome-autoar ("tracker" ,tracker) ;; XXX: gtk+ is required by libnautilus-extension.pc ;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8b7a31d110..998f197304 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -90,7 +90,6 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages netpbm) - #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) #:use-module (gnu packages nss) @@ -3182,7 +3181,6 @@ thanks to the use of namespaces.") (inputs `(("libarchive" ,libarchive) ("python" ,python-wrapper) - ("nettle" ,nettle) ("zlib" ,zlib) ("squashfs-tools" ,squashfs-tools))) (home-page "https://singularity.lbl.gov/") diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 9e9fda0929..ba90ccec73 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -56,7 +56,6 @@ #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages messaging) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pdf) @@ -819,7 +818,6 @@ infamous 'Wanda the Fish'.") ("libgnome-keyring" ,libgnome-keyring) ("libarchive" ,libarchive) ("marco" ,marco) - ("nettle" ,nettle) ("openjpeg" ,openjpeg-1) ("pango" ,pango) ;;("texlive" ,texlive) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b641340a1a..84bb3542f1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -58,7 +58,6 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) - #:use-module (gnu packages nettle) #:use-module (gnu packages nss) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) @@ -542,7 +541,6 @@ symlinks to the files in a common directory such as /usr/local.") ("nss" ,nss) ("nspr" ,nspr) ("libarchive" ,libarchive) - ("nettle" ,nettle) ;XXX: actually a dependency of libarchive ("file" ,file) ("bzip2" ,bzip2) ("zlib" ,zlib) @@ -1012,7 +1010,6 @@ for packaging and deployment of cross-compiled Windows applications.") ("gpgme" ,gpgme) ("libarchive" ,libarchive) ("libsoup" ,libsoup) - ("nettle" ,nettle) ; required by 'libarchive.la' ("util-linux" ,util-linux))) (home-page "https://ostree.readthedocs.io/en/latest/") (synopsis "Operating system and container binary deployment and upgrades") @@ -1071,7 +1068,6 @@ the boot loader configuration.") ("libsoup" ,libsoup) ("libxau" ,libxau) ("libxml2" ,libxml2) - ("nettle" ,nettle) ("util-linux" ,util-linux))) (home-page "https://flatpak.org") (synopsis "System for building, distributing, and running sandboxed desktop -- cgit v1.2.3 From 14767d4466c7f7bcf32c68b2d10cc359c79d7160 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:20:55 +0200 Subject: gnu: CMake: Update to 3.15.1. * gnu/packages/cmake.scm (cmake-minimal): Update to 3.15.1. [arguments]: Do not patch /bin/sh in removed file. --- gnu/packages/cmake.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 8a0bba2e8f..387456be50 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -51,7 +51,7 @@ (define-public cmake-minimal (package (name "cmake-minimal") - (version "3.14.5") + (version "3.15.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -59,7 +59,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "01lcl6ynxfgqn09ncfz1gr24ha5pv1slk0azzaawaqrwpsgf8njh")) + "1xyprly3sf4wi0n1x79k4n22yxm6pb7fv70gqr9lvc7qv14cbphq")) (modules '((guix build utils))) (snippet '(begin @@ -125,7 +125,6 @@ (substitute* '("Modules/CompilerId/Xcode-3.pbxproj.in" "Modules/CPack.RuntimeScript.in" - "Source/cmakexbuild.cxx" "Source/cmGlobalXCodeGenerator.cxx" "Source/cmLocalUnixMakefileGenerator3.cxx" "Source/cmExecProgramCommand.cxx" -- cgit v1.2.3 From 941ef1a1e54893ca917ebbaa4b8cc14b5ce9b75c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 23 Jul 2019 19:06:23 +0200 Subject: gnu: boost: Do not install CMake files. Fixes . * gnu/packages/boost.scm (boost)[arguments]: Add "--no-cmake-config" to <#:configure-flags>. --- gnu/packages/boost.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 6b8eebcecb..a2253a9efc 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -69,6 +69,11 @@ #:make-flags (list "threading=multi" "link=shared" + ;; XXX: Disable installation of Boosts modular CMake config scripts + ;; which conflicts in 1.70.0 with the ones provided by CMake. + ;; See . + "--no-cmake-config" + ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) -- cgit v1.2.3 From 888940c2d3ad81826741f4fcdf0b330c7c7799f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:29:16 +0200 Subject: gnu: curl: Update to 7.65.3. * gnu/packages/curl.scm (curl): Update to 7.65.3. --- gnu/packages/curl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 24932c9f99..5e1e7eb400 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,14 +50,14 @@ (define-public curl (package (name "curl") - (version "7.65.1") + (version "7.65.3") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0ym7b741hp4mgrvgp2z5ia7kb0pfqzdmfc65qzmml8vzhxs21hpn")))) + "1sjz4fq7jg96mpmpqq82nd61njna6jp3c4m9yrbx2j1rh5a8ingj")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages -- cgit v1.2.3 From e23dd493606d268111c115d2948dd3f66efb9124 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Jul 2019 17:23:14 +0200 Subject: gnu: poppler: Update to 0.79.0. * gnu/packages/pdf.scm (poppler): Update to 0.79.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 046c18c345..7108386a34 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -85,14 +85,14 @@ (define-public poppler (package (name "poppler") - (version "0.78.0") + (version "0.79.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1hiqg4wc6lpf52x3k630w2y1x90fhb6vfqdqg0xrqcx7hwqxsbv2")))) + "1j18jlv1q6h21azb939gqjsgcbsh5qcd8dwxdmad54p5ixha91gr")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From d7342997cd9d28eed3602424b98b8f6a00e61efb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:21:01 +0200 Subject: gnu: libtasn1: Update to 4.14. * gnu/packages/tls.scm (libtasn1): Update to 4.14. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 999c113836..84461a70b2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -70,7 +70,7 @@ (define-public libtasn1 (package (name "libtasn1") - (version "4.13") + (version "4.14") (source (origin (method url-fetch) @@ -78,7 +78,7 @@ version ".tar.gz")) (sha256 (base32 - "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky")))) + "025sqnlzji78ss2fi78dajc0v0h5fi02wp39hws41sn8qnjlnq4y")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit v1.2.3 From bffe4305ec2daaa87cb31a0121214983b2bd5589 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:21:27 +0200 Subject: gnu: gnutls: Update to 3.6.9. * gnu/packages/tls.scm (gnutls): Update to 3.6.9. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 84461a70b2..f2e7f4ad0c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -163,7 +163,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") - (version "3.6.8") + (version "3.6.9") (source (origin (method url-fetch) (uri @@ -175,7 +175,7 @@ living in the same process.") (patches (search-patches "gnutls-skip-trust-store-test.patch")) (sha256 (base32 - "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da")))) + "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3")))) (build-system gnu-build-system) (arguments `(; Ensure we don't keep a reference to this buggy software. -- cgit v1.2.3 From 014d4c149594f8e7f0e74eefd7255a03946596f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:24:46 +0200 Subject: gnu: libice: Update to 1.0.10. * gnu/packages/xorg.scm (libice): Update to 1.0.10. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 7c5268c30b..62ff420171 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4786,7 +4786,7 @@ common definitions and porting layer.") (define-public libice (package (name "libice") - (version "1.0.9") + (version "1.0.10") (source (origin (method url-fetch) @@ -4796,7 +4796,7 @@ common definitions and porting layer.") ".tar.bz2")) (sha256 (base32 - "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g")))) + "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg")))) (build-system gnu-build-system) (propagated-inputs `(("xorgproto" ,xorgproto))) -- cgit v1.2.3 From f9f72d35361bde53b8face634c72530aa7d81edf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jul 2019 23:45:54 +0200 Subject: gnu: glib: Update to 2.60.6. * gnu/packages/patches/glib-keyfile-arguments.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (glib): Update to 2.60.6. [source](patches): Remove obsolete patch. --- gnu/local.mk | 1 - gnu/packages/glib.scm | 7 +++---- gnu/packages/patches/glib-keyfile-arguments.patch | 20 -------------------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 gnu/packages/patches/glib-keyfile-arguments.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0517578bd2..27edacbc7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -856,7 +856,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ - %D%/packages/patches/glib-keyfile-arguments.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glibc-CVE-2015-5180.patch \ %D%/packages/patches/glibc-CVE-2015-7547.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8f1b91e142..438c1f9cbc 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -159,7 +159,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.60.5") + (version "2.60.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -167,9 +167,8 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "0bk2l9mhvc44c0gfg442wrifwj2fci1w71dsp3nb50pffvsivpry")) - (patches (search-patches "glib-tests-timer.patch" - "glib-keyfile-arguments.patch")) + "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz")) + (patches (search-patches "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/glib-keyfile-arguments.patch b/gnu/packages/patches/glib-keyfile-arguments.patch deleted file mode 100644 index 8d428f4192..0000000000 --- a/gnu/packages/patches/glib-keyfile-arguments.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix a problem with the keyfile backend whereby instantiating it with -the default NULL value would cause an assertion error: - -https://gitlab.gnome.org/GNOME/glib/issues/1825 - -This issue showed up when running the test suites of uhttpmock and spice. - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -740,7 +740,8 @@ g_keyfile_settings_backend_set_property (GObject *object, - case PROP_FILENAME: - /* Construct only. */ - g_assert (kfsb->file == NULL); -- kfsb->file = g_file_new_for_path (g_value_get_string (value)); -+ if (g_value_get_string (value)) -+ kfsb->file = g_file_new_for_path (g_value_get_string (value)); - break; - - case PROP_ROOT_PATH: -- cgit v1.2.3 From 51d4c79dc28c70cde61348eb52775f45125a2ee7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:54:59 +0200 Subject: gnu: Remove workarounds for . These are no longer needed since 941ef1a1e54893ca917ebbaa4b8cc14b5ce9b75c. * gnu/packages/compression.scm (innoextract)[arguments]: Remove "-DBoost_NO_BOOST_CMAKE=ON" from <#:configure-flags>. * gnu/packages/game-development.scm (openmw)[arguments]: Likewise. * gnu/packages/games.scm (supertux, colobot, leela-zero)[arguments]: Likewise. * gnu/packages/graphics.scm (openimageio)[arguments]: Likewise. * gnu/packages/ibus.scm (librime)[arguments]: Likewise. --- gnu/packages/compression.scm | 3 --- gnu/packages/game-development.scm | 3 +-- gnu/packages/games.scm | 8 +------- gnu/packages/graphics.scm | 5 +---- gnu/packages/ibus.scm | 4 +--- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index da9e646f5f..774abad5c9 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1822,9 +1822,6 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f - ;; XXX: Work around a problem with the CMake support in Boost 1.70: - ;; . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-before 'configure 'glibc-is-already-a-system-library (lambda _ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5a4b81a988..7eac935a69 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1116,8 +1116,7 @@ of use.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list "-DDESIRED_QT_VERSION=5" - "-DBoost_NO_BOOST_CMAKE=ON"))) ;work around + (list "-DDESIRED_QT_VERSION=5"))) (native-inputs `(("boost" ,boost) ("doxygen" ,doxygen) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4e7fb2e428..66b642ebd2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3516,8 +3516,6 @@ with the \"Stamp\" tool within Tux Paint.") (arguments '(#:tests? #f #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin" - ;; XXX: Work around . - "-DBoost_NO_BOOST_CMAKE=ON" "-DUSE_SYSTEM_PHYSFS=ON") #:phases (modify-phases %standard-phases @@ -5390,8 +5388,6 @@ Github or Gitlab.") (build-system cmake-build-system) (arguments `(#:tests? #f ;no test - ;; XXX: Work around . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -7616,9 +7612,7 @@ remake of that series or any other game.") ("qtbase" ,qtbase) ("zlib" ,zlib))) (arguments - '(#:configure-flags '("-DUSE_BLAS=YES" - ;; XXX: Work around . - "-DBoost_NO_BOOST_CMAKE=ON") + '(#:configure-flags '("-DUSE_BLAS=YES") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-tests (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 66d47fdb84..f4f9228a07 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -467,10 +467,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") ;; third party sources have to be present. For details see ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL (arguments - `(#:tests? #f - ;; XXX: Work around a problem with Boost 1.70 and CMake 3.14. See - ;; for details. - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON"))) + `(#:tests? #f)) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 9291a74394..96fded0f4e 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -325,9 +325,7 @@ Japanese language input in most graphical applications.") #t)))) (build-system cmake-build-system) (arguments - '(;; XXX: Work around . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") - #:phases + '(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ -- cgit v1.2.3 From 497b2d39427af4aaddbaa8922d4a6a858bbdaee7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 16:52:39 +0200 Subject: gnu: dbus-c++: Fix build with GCC 7. * gnu/packages/patches/dbus-c++-gcc-compat.patch, gnu/packages/patches/dbus-c++-threading-mutex.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (dbus-c++)[source](patches): New field. [arguments]: End phases on #t. --- gnu/local.mk | 2 ++ gnu/packages/glib.scm | 5 ++- gnu/packages/patches/dbus-c++-gcc-compat.patch | 14 ++++++++ .../patches/dbus-c++-threading-mutex.patch | 37 ++++++++++++++++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/dbus-c++-gcc-compat.patch create mode 100644 gnu/packages/patches/dbus-c++-threading-mutex.patch diff --git a/gnu/local.mk b/gnu/local.mk index 27edacbc7e..41f4e4eec2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -750,6 +750,8 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ + %D%/packages/patches/dbus-c++-gcc-compat.patch \ + %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dealii-mpi-deprecations.patch \ %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 438c1f9cbc..3e17330447 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -791,6 +791,8 @@ This package provides the library for GLib applications.") "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/" version "/libdbus-c%2B%2B-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches "dbus-c++-gcc-compat.patch" + "dbus-c++-threading-mutex.patch")) (sha256 (base32 "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw")))) @@ -812,7 +814,8 @@ This package provides the library for GLib applications.") (lambda _ (substitute* "include/dbus-c++/eventloop-integration.h" (("#include ") - "#include \n#include "))))))) + "#include \n#include ")) + #t))))) (synopsis "D-Bus API for C++") (description "This package provides D-Bus client API bindings for the C++ programming language. It also contains the utility diff --git a/gnu/packages/patches/dbus-c++-gcc-compat.patch b/gnu/packages/patches/dbus-c++-gcc-compat.patch new file mode 100644 index 0000000000..c4f126858c --- /dev/null +++ b/gnu/packages/patches/dbus-c++-gcc-compat.patch @@ -0,0 +1,14 @@ +Fix a string comparison in C++ 11. + +Taken from Debian: +https://sources.debian.org/src/dbus-c++/0.9.0-8.1/debian/patches/06_fix_gcc-7_ftbfs.patch/ + +--- a/src/pipe.cpp ++++ b/src/pipe.cpp +@@ -83,5 +83,5 @@ ssize_t Pipe::read(void *buffer, unsigne + void Pipe::signal() + { + // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work... +- ::write(_fd_write, '\0', 1); ++ ::write(_fd_write, "\0", 1); + } diff --git a/gnu/packages/patches/dbus-c++-threading-mutex.patch b/gnu/packages/patches/dbus-c++-threading-mutex.patch new file mode 100644 index 0000000000..b201700dc0 --- /dev/null +++ b/gnu/packages/patches/dbus-c++-threading-mutex.patch @@ -0,0 +1,37 @@ +Description: Fix FTBFS if DBUS_HAS_RECURSIVE_MUTEX is undefined +Author: Peter Williams +Last-Update: 2018-01-26 + +Taken from Debian: +https://sources.debian.org/src/dbus-c++/0.9.0-8.1/debian/patches/07_fix_mutex_ftbfs.patch/ + +--- dbus-c++-0.9.0.orig/include/dbus-c++/dispatcher.h ++++ dbus-c++-0.9.0/include/dbus-c++/dispatcher.h +@@ -267,6 +267,19 @@ struct Threading + return new Mx; + } + ++#ifndef DBUS_HAS_RECURSIVE_MUTEX ++ static bool mutex_free(Mutex *mx) ++ { ++ delete mx; ++ return true; ++ } ++ ++ static bool mutex_lock(Mutex *mx) ++ { ++ mx->lock(); ++ return true; ++ } ++#else + static void mutex_free(Mutex *mx) + { + delete mx; +@@ -276,6 +289,7 @@ struct Threading + { + mx->lock(); + } ++#endif + + static void mutex_unlock(Mutex *mx) + { -- cgit v1.2.3 From 5a7c6d02b287a5134511f139406889dbf965923f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Aug 2019 15:49:28 +0200 Subject: gnu: emacs-cmake-mode: Do not inherit inputs and outputs from CMake. * gnu/packages/cmake.scm (emacs-cmake-mode)[native-inputs, inputs, outputs]: New fields. [arguments]: End phases on #t. --- gnu/packages/cmake.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 387456be50..1d8d829ec5 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -9,7 +9,6 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer - ;;; ;;; This file is part of GNU Guix. ;;; @@ -212,6 +211,9 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake) (name "emacs-cmake-mode") + (native-inputs '()) + (inputs '()) + (outputs '("out")) (build-system emacs-build-system) (arguments `(#:phases @@ -219,7 +221,8 @@ and workspaces that can be used in the compiler environment of your choice.") (add-after 'unpack 'chdir-elisp ;; Elisp directory is not in root of the source. (lambda _ - (chdir "Auxiliary")))))) + (chdir "Auxiliary") + #t))))) (synopsis "Emacs major mode for editing Cmake expressions") (description "@code{cmakeos-mode} provides an Emacs major mode for editing Cmake files. It supports syntax highlighting, indenting and refilling of -- cgit v1.2.3 From 7f5f61ae99321a7a6e08b0100cd428e11ce6a837 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Aug 2019 16:25:32 +0200 Subject: gnu: qca: Update to 2.2.1. * gnu/packages/kde.scm (qca): Update to 2.2.1. [source](uri): Adjust to current. --- gnu/packages/kde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 31b3670079..b5b1d4eb20 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -477,15 +477,15 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca") - (version "2.1.3") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/qca/" version - "/src/qca-" version ".tar.xz")) + "/qca-" version ".tar.xz")) (sha256 (base32 - "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0")))) + "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From deccffb264e2027fb439735f5d71f7d01071a4fd Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 6 Aug 2019 22:24:01 +0200 Subject: gnu: emacs-helpful: Update to 0.17. * gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.17. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 213dac78f6..ae5011c298 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11971,7 +11971,7 @@ downloading manager for Emacs.") (define-public emacs-helpful (package (name "emacs-helpful") - (version "0.16") + (version "0.17") (source (origin (method git-fetch) @@ -11980,7 +11980,7 @@ downloading manager for Emacs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1pzlx3galyryd3hd84hnd7r5s6yl9sdrfhy1s6dgz40glw41wmpr")))) + (base32 "0v2y0x9pwi08y2mgjjiw5brfb5haa7pbmy4540glw904ffxxcblj")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elisp-refs" ,emacs-elisp-refs) -- cgit v1.2.3 From 3d45d8f14bea0468494442597e005c9a6b46155b Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 21 Jul 2019 15:50:57 -0400 Subject: gnu: git-annex: Don't patch shebang used in hooks. git-annex relies on configuring Git's pre-commit and post-receive hooks. Avoid patching the shebang that git-annex embeds when generating these hooks so that the hooks don't fail if garbage collection claims the bash that was current when the annex repository was initialized. * gnu/packages/haskell-apps.scm (git-annex):[arguments]: Patch hook shebangs only temporarily for tests. Signed-off-by: Marius Bakke --- gnu/packages/haskell-apps.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index e01f796178..818e691a6e 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2015 Paul van der Walt +;;; Copyright © 2019 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -157,8 +158,13 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. '("--flags=-Android -Assistant -Pairing -S3 -Webapp -WebDAV") #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-shell + (add-before 'configure 'patch-shell-for-tests (lambda _ + ;; Shell.hs defines "/bin/sh" that is used in Git hooks. We + ;; shouldn't patch hooks with Guix's current bash because the + ;; hooks can exist after that bash is garbage collected, but + ;; let's temporarily patch it so that we can run the tests. + (copy-file "Utility/Shell.hs" "/tmp/Shell.hs") (substitute* "Utility/Shell.hs" (("/bin/sh") (which "sh"))) #t)) @@ -192,6 +198,11 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (symlink "git-annex" "git-annex-shell")) (invoke "git-annex" "test") #t)) + (add-after 'check 'unpatch-shell-and-rebuild + (lambda args + ;; Undo `patch-shell-for-tests'. + (copy-file "/tmp/Shell.hs" "Utility/Shell.hs") + (apply (assoc-ref %standard-phases 'build) args))) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From a4a41a7ba8fbd3b9fe3bf3ee0a6f6da64ffed1f3 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 21 Jul 2019 15:50:58 -0400 Subject: gnu: git-annex: Update to 7.20190708. * gnu/packages/haskell-apps.scm (git-annex): Update to 7.20190708. [inputs]: Add new dependency, ghc-concurrent-output. Signed-off-by: Marius Bakke --- gnu/packages/haskell-apps.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 818e691a6e..e77f6d113b 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -143,7 +143,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (define-public git-annex (package (name "git-annex") - (version "6.20180926") + (version "7.20190708") (source (origin (method url-fetch) @@ -151,7 +151,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. "git-annex/git-annex-" version ".tar.gz")) (sha256 (base32 - "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d")))) + "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -219,6 +219,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. ("ghc-bloomfilter" ,ghc-bloomfilter) ("ghc-byteable" ,ghc-byteable) ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-concurrent-output" ,ghc-concurrent-output) ("ghc-crypto-api" ,ghc-crypto-api) ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-data-default" ,ghc-data-default) -- cgit v1.2.3 From ae54a4c0ef830333dc6db88dac441dbd388b6d27 Mon Sep 17 00:00:00 2001 From: Dimakakos Dimos via Guix-patches Date: Sun, 21 Jul 2019 21:22:34 +0300 Subject: gnu: Add emacs-ox-hugo. gnu/packages/emacs-xyz.scm (emacs-ox-hugo): New variable Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ae5011c298..a258571006 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17111,6 +17111,29 @@ convert the resulting @code{.epub} to a @code{.mobi} file. Needs a working zip utility (default is @code{zip}).") (license license:gpl3+))) +(define-public emacs-ox-hugo + (package + (name "emacs-ox-hugo") + (version "0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kaushalmodi/ox-hugo.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11h464cyc28ld0b0zridgm4drydc1qjxbm1y24zrwlkyqqjk6yr7")))) + (build-system emacs-build-system) + (home-page "https://ox-hugo.scripter.co") + (synopsis "Hugo markdown back-end for Org export engine") + (description + "Ox-hugo is an Org exporter backend that exports Org to Hugo-compatible +Markdown, Blackfriday, and also generates the front-matter in TOML or YAML +format.") + (license license:gpl3+))) + (define-public emacs-ox-pandoc (package (name "emacs-ox-pandoc") -- cgit v1.2.3 From 5cded306f92a8641259909ee986e583168b85b17 Mon Sep 17 00:00:00 2001 From: "Jovany Leandro G.C" Date: Sat, 20 Jul 2019 06:30:22 -0500 Subject: gnu: Add cutter. * gnu/packages/engineering.scm (cutter): New variable. Signed-off-by: Marius Bakke --- gnu/packages/engineering.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 7d48414889..a1f222bed4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018, 2019 Jonathan Brielmaier ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2019 Tim Stahel +;;; Copyright © 2019 Jovany Leandro G.C ;;; ;;; This file is part of GNU Guix. ;;; @@ -2062,3 +2063,49 @@ purpose circuit simulator and can perform DC and transient analyses, fourier analysis and AC analysis. The engine is designed to do true mixed-mode simulation.") (license license:gpl3+))) + +(define-public cutter + (package + (name "cutter") + (version "1.8.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/radareorg/cutter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03f3cdckh51anx9gd1b0ndb2fg7061hqngvygf32ky29mm2m2lyv")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (radare2 (assoc-ref inputs "radare2"))) + ;; fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib + ;; override `qmake PREFIX=` + (substitute* "./src/lib_radare2.pri" + (("PREFIX") "R2PREFIX") + (("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2))) + (invoke "qmake" + (string-append "PREFIX=" out) + "./src/Cutter.pro"))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("openssl" ,openssl) + ("radare2" ,radare2))) + (home-page "https://github.com/radareorg/cutter") + (synopsis "GUI for radare2 reverse engineering framework") + (description "Cutter is a GUI for radare2 reverse engineering framework. +Its goal is making an advanced andcustomizable reverse-engineering platform +while keeping the user experience at mind. Cutter is created by reverse +engineers for reverse engineers.") + (license (list license:cc-by-sa3.0 ;the "Iconic" icon set + license:gpl3+)))) ;everything else -- cgit v1.2.3 From f7780fdf611228f7772052a3c650487cf34846c6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 8 Aug 2019 13:16:51 -0400 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.9. * gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (isc-dhcp): Update BIND version to 9.11.9. [arguments]: In the 'replace-bundled-bind' phase, apply the patch. In the 'post-configure' phase: Refine a substitute* regexp to avoid substituting an instance of "./configure.log" in the BIND Makefile. Substitute /usr/bin/file in the BIND configure script. [native-inputs]: Add 'file', 'patch', and the patch. [inputs]: Update the hash of bind-source-tarball. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 40 +++++++-- .../isc-dhcp-4.4.1-fixes-for-newer-bind.patch | 100 +++++++++++++++++++++ 3 files changed, 132 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch diff --git a/gnu/local.mk b/gnu/local.mk index f654f84d3a..f412891919 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -951,6 +951,7 @@ dist_patch_DATA = \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ + %D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/jamvm-arm.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7ffdf18609..bd3c14033e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2018, 2019 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Alex Sassmannshausen @@ -684,9 +684,9 @@ connection alive.") (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "4") - (bind-release-type "-P") ; for patch release, use "-P" - (bind-release-version "2") ; for patch release, e.g. "6" + (bind-patch-version "9") + (bind-release-type "") ; for patch release, use "-P" + (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version "." bind-minor-version @@ -710,7 +710,18 @@ connection alive.") #:phases (modify-phases %standard-phases (add-after 'unpack 'replace-bundled-bind - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; XXX TODO: Remove the following invocation of 'patch' when + ;; isc-dhcp is updated. It should be needed only for 4.4.1. + (let ((patch (string-append (assoc-ref (or native-inputs inputs) + "patch") + "/bin/patch")) + (the-patch (assoc-ref (or native-inputs inputs) + "fixes-for-newer-bind.patch"))) + (format #t "applying '~a'...~%" the-patch) + (invoke patch "--force" "--no-backup-if-mismatch" + "-p1" "--input" the-patch)) + (delete-file "bind/bind.tar.gz") (copy-file (assoc-ref inputs "bind-source-tarball") "bind/bind.tar.gz") @@ -743,15 +754,18 @@ connection alive.") ;; shell is used. (with-directory-excursion "bind" (substitute* "Makefile" - (("\\./configure") + (("\\./configure ") (let ((sh (which "sh"))) (string-append "./configure CONFIG_SHELL=" - sh " SHELL=" sh)))) + sh " SHELL=" sh " ")))) (let ((bind-directory (string-append "bind-" ,bind-version))) (invoke "tar" "xf" "bind.tar.gz") (for-each patch-shebang (find-files bind-directory ".*")) + (substitute* (string-append bind-directory "/configure") + (("/usr/bin/file") + (which "file"))) (invoke "tar" "cf" "bind.tar.gz" bind-directory ;; avoid non-determinism in the archive @@ -787,7 +801,15 @@ connection alive.") (list inetutils net-tools coreutils sed)))) #t)))))) - (native-inputs `(("perl" ,perl))) + (native-inputs + `(("perl" ,perl) + ("file" ,file) + + ;; XXX TODO: Remove the following patch, and also the 'patch' + ;; program, when isc-dhcp is updated. + ("fixes-for-newer-bind.patch" + ,(search-patch "isc-dhcp-4.4.1-fixes-for-newer-bind.patch")) + ("patch" ,patch))) (inputs `(("inetutils" ,inetutils) ("net-tools" ,net-tools) @@ -803,7 +825,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "04fq17zksd2b3w6w6padps5n7b6s2lasxpksbhl4378h56vgfnm8")))) + "03n57as73ygw6g3lqsmq2idkykajpbskzgixixdvi5a76m4g0fwn")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. diff --git a/gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch b/gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch new file mode 100644 index 0000000000..53e681ea31 --- /dev/null +++ b/gnu/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch @@ -0,0 +1,100 @@ +These fixes are needed to adapt isc-dhcp-4.4.1 to build +successfully after its bundled copy of bind has been updated. + +It is derived from the following upstream commits: + +commit 8194daabfd590f17825f0c61e9534bee5c99cc86 +Author: Thomas Markwalder +Date: Fri Sep 14 13:41:14 2018 -0400 + + [master] Added includes of new BIND9 compatibility headers, updated util/bind.sh + + Merges in rt48072. + +commit cc35f84943df44dac2499f3e16e8aaba7d54191d +Author: Thomas Markwalder +Date: Tue Mar 19 08:36:23 2019 -0400 + + [master] Avoid Bind9 python dependency + + merges [#3,!1] Avoid Bind9 python dependency + +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -23,7 +23,7 @@ exec_prefix = @exec_prefix@ + + bindconfig = --without-openssl --without-libxml2 --without-libjson \ + --without-gssapi --disable-threads --without-lmdb \ +- --includedir=@includedir@ --libdir=@libdir@ \ ++ --includedir=@includedir@ --libdir=@libdir@ --without-python\ + @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report + + @BIND_ATF_FALSE@cleandirs = ./lib ./include +diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h +index 75a87ff6..538b927f 100644 +--- a/includes/omapip/isclib.h ++++ b/includes/omapip/isclib.h +@@ -48,6 +48,9 @@ + #include + #include + ++#include ++#include ++ + #include + #include + #include +diff --git a/includes/omapip/result.h b/includes/omapip/result.h +index 91243e1b..860298f6 100644 +--- a/includes/omapip/result.h ++++ b/includes/omapip/result.h +@@ -26,6 +26,7 @@ + #ifndef DHCP_RESULT_H + #define DHCP_RESULT_H 1 + ++#include + #include + #include + #include +diff --git a/server/dhcpv6.c b/server/dhcpv6.c +index a7110f98..cde4f617 100644 +--- a/server/dhcpv6.c ++++ b/server/dhcpv6.c +@@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, + shared_name, + inet_ntop(AF_INET6, &lease->addr, + tmp_addr, sizeof(tmp_addr)), +- used, count); ++ (long long unsigned)(used), ++ (long long unsigned)(count)); + } + return; + } +@@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, + "address: %s; high threshold %d%% %llu/%llu.", + shared_name, + inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), +- poolhigh, used, count); ++ poolhigh, (long long unsigned)(used), ++ (long long unsigned)(count)); + + /* handle the low threshold now, if we don't + * have one we default to 0. */ +@@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) + log_debug("Unable to pick client address: " + "no addresses available - shared network %s: " + " 2^64-1 < total, %llu active, %llu abandoned", +- shared_name, active - abandoned, abandoned); ++ shared_name, (long long unsigned)(active - abandoned), ++ (long long unsigned)(abandoned)); + } else { + log_debug("Unable to pick client address: " + "no addresses available - shared network %s: " + "%llu total, %llu active, %llu abandoned", +- shared_name, total, active - abandoned, abandoned); ++ shared_name, (long long unsigned)(total), ++ (long long unsigned)(active - abandoned), ++ (long long unsigned)(abandoned)); + } + + return ISC_R_NORESOURCES; -- cgit v1.2.3 From 95fb1a185106d1a5dcfb035ba62c28e0fd9fb80a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 18 May 2019 19:26:39 +0200 Subject: gnu: Add vcflib. * gnu/packages/bioinformatics.scm (vcflib): New variable. (tabixpp-freebayes): New private variable. --- gnu/packages/bioinformatics.scm | 106 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e860b5b881..99648d6b74 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14868,6 +14868,24 @@ mutations from scRNA-Seq data.") some of the details of opening and jumping in tabix-indexed files.") (license license:expat))) +(define tabixpp-freebayes + ;; This version works with FreeBayes while the released + ;; version doesn't. The released creates a variable with the name \"vcf\" + ;; somewhere, which is also the name of a namespace in vcflib. + (let ((commit "bbc63a49acc52212199f92e9e3b8fba0a593e3f7")) + (package + (inherit tabixpp) + (name "tabixpp-freebayes") + (version (git-version "0.0.0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/tabixpp/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "017qsmsc2kyiyzqr9nl8cc6pfldxf16dbn8flx5i59mbqr9ydi7g"))))))) + (define-public smithwaterman ;; TODO: Upgrading smithwaterman breaks FreeBayes. (let ((commit "203218b47d45ac56ef234716f1bd4c741b289be1")) @@ -14995,3 +15013,91 @@ provides a FASTA reader and indexer that can be embedded into applications which would benefit from directly reading subsequences from FASTA files. The library automatically handles index file generation and use.") (license (list license:expat license:gpl2))))) + +(define-public vcflib + (let ((commit "5ac091365fdc716cc47cc5410bb97ee5dc2a2c92") + (revision "1")) + (package + (name "vcflib") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcflib/vcflib/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gijvcz1lcdn5kvgzb671l6iby0379qk00nqmcrszgk67hfwx6kq")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("perl" ,perl) + ("python" ,python-2) + ;; Submodules. + ;; This package builds against the .o files so we need to extract the source. + ("tabixpp-src" ,(package-source tabixpp-freebayes)) + ("smithwaterman-src" ,(package-source smithwaterman)) + ("multichoose-src" ,(package-source multichoose)) + ("fsom-src" ,(package-source fsom)) + ("filevercmp-src" ,(package-source filevercmp)) + ("fastahack-src" ,(package-source fastahack)) + ("intervaltree-src" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/intervaltree/") + (commit "dbb4c513d1ad3baac516fc1484c995daf9b42838"))) + (file-name "intervaltree-src-checkout") + (sha256 + (base32 "1fy5qbj4bg8d2bjysvaa9wfnqn2rj2sk5yra2h4l5pzvy53f23fj")))))) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (with-directory-excursion target + (if (file-is-directory? (assoc-ref inputs source)) + (copy-recursively (assoc-ref inputs source) ".") + (invoke "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and + (unpack "intervaltree-src" "intervaltree") + (unpack "fastahack-src" "fastahack") + (unpack "filevercmp-src" "filevercmp") + (unpack "fsom-src" "fsom") + (unpack "multichoose-src" "multichoose") + (unpack "smithwaterman-src" "smithwaterman") + (unpack "tabixpp-src" "tabixpp"))))) + (replace 'build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (with-directory-excursion "tabixpp" + (invoke "make")) + (invoke "make" "CC=gcc" + (string-append "CFLAGS=\"" "-Itabixpp " "\"") + "all"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (lib (string-append (assoc-ref outputs "out") "/lib"))) + (for-each (lambda (file) + (install-file file bin)) + (find-files "bin" ".*")) + ;; The header files in src/ do not interface libvcflib, + ;; therefore they are left out. + (install-file "libvcflib.a" lib)) + #t))))) + (home-page "https://github.com/vcflib/vcflib/") + (synopsis "Library for parsing and manipulating VCF files") + (description "Vcflib provides methods to manipulate and interpret +sequence variation as it can be described by VCF. It is both an API for parsing +and operating on records of genomic variation as it can be described by the VCF +format, and a collection of command-line utilities for executing complex +manipulations on VCF files.") + (license license:expat)))) -- cgit v1.2.3 From 8803dbdad80aaf5a67ace81e3b6a336efee3c60d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 18 May 2019 19:26:40 +0200 Subject: gnu: Add freebayes. * gnu/packages/bioinformatics.scm (freebayes): New variable. --- gnu/packages/bioinformatics.scm | 123 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 99648d6b74..f6a3b8422b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15101,3 +15101,126 @@ and operating on records of genomic variation as it can be described by the VCF format, and a collection of command-line utilities for executing complex manipulations on VCF files.") (license license:expat)))) + +(define-public freebayes + (let ((commit "3ce827d8ebf89bb3bdc097ee0fe7f46f9f30d5fb") + (revision "1") + (version "1.0.2")) + (package + (name "freebayes") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/freebayes.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sbzwmcbn78ybymjnhwk7qc5r912azy5vqz2y7y81616yc3ba2a2")))) + (build-system gnu-build-system) + (inputs + `(("zlib" ,zlib) + ("htslib" ,htslib))) + (native-inputs + `(("bc" ,bc) ; Needed for running tests. + ("samtools" ,samtools) ; Needed for running tests. + ("parallel" ,parallel) ; Needed for running tests. + ("perl" ,perl) ; Needed for running tests. + ("procps" ,procps) ; Needed for running tests. + ("python" ,python-2) ; Needed for running tests. + ("bamtools" ,bamtools) + ("vcflib-src" ,(package-source vcflib)) + ;; These are submodules for the vcflib version used in freebayes. + ;; This package builds against the .o files so we need to extract the source. + ("tabixpp-src" ,(package-source tabixpp-freebayes)) + ("smithwaterman-src" ,(package-source smithwaterman)) + ("multichoose-src" ,(package-source multichoose)) + ("fsom-src" ,(package-source fsom)) + ("filevercmp-src" ,(package-source filevercmp)) + ("fastahack-src" ,(package-source fastahack)) + ("intervaltree-src" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ekg/intervaltree/") + (commit "dbb4c513d1ad3baac516fc1484c995daf9b42838"))) + (file-name "intervaltree-src-checkout") + (sha256 + (base32 "1fy5qbj4bg8d2bjysvaa9wfnqn2rj2sk5yra2h4l5pzvy53f23fj")))) + ;; These submodules are needed to run the tests. + ("bash-tap-src" ,(package-source bash-tap)) + ("test-simple-bash-src" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ingydotnet/test-simple-bash/") + (commit "124673ff204b01c8e96b7fc9f9b32ee35d898acc"))) + (file-name "test-simple-bash-src-checkout") + (sha256 + (base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga")))))) + (arguments + `(#:tests? #f ; TODO: Re-enable when we have grep with perl support. + #:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (with-directory-excursion target + (if (file-is-directory? (assoc-ref inputs source)) + (copy-recursively (assoc-ref inputs source) ".") + (invoke "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and + (unpack "vcflib-src" "vcflib") + (unpack "fastahack-src" "vcflib/fastahack") + (unpack "filevercmp-src" "vcflib/filevercmp") + (unpack "fsom-src" "vcflib/fsom") + (unpack "intervaltree-src" "vcflib/intervaltree") + (unpack "multichoose-src" "vcflib/multichoose") + (unpack "smithwaterman-src" "vcflib/smithwaterman") + (unpack "tabixpp-src" "vcflib/tabixpp") + (unpack "test-simple-bash-src" "test/test-simple-bash") + (unpack "bash-tap-src" "test/bash-tap"))))) + (add-after 'unpack-submodule-sources 'fix-makefile + (lambda* (#:key inputs #:allow-other-keys) + ;; We don't have the .git folder to get the version tag from. + (substitute* '("vcflib/Makefile") + (("^GIT_VERSION.*") (string-append "GIT_VERSION = v" ,version))))) + (replace 'build + (lambda* (#:key inputs make-flags #:allow-other-keys) + (with-directory-excursion "vcflib" + (with-directory-excursion "tabixpp" + (pk "Compile tabixpp before compiling the main project.") + (let ((htslib-ref (assoc-ref inputs "htslib"))) + (invoke "make" "HTS_HEADERS=" + (string-append "HTS_LIB=" htslib-ref "/lib/libhts.a") + (string-append "LIBPATH=-L. -L" htslib-ref "/include")))) + (pk "Compile vcflib before compiling the main project.") + (invoke "make" "CC=gcc" + (string-append "CFLAGS=\"" "-Itabixpp " + "-I" (assoc-ref inputs "htslib") "/include " "\"") + "all")) + (pk "Compile the main project.") + (with-directory-excursion "src" + (substitute* "Makefile" + (("-I\\$\\(BAMTOOLS_ROOT\\)/src") "-I$(BAMTOOLS_ROOT)/include/bamtools")) + (invoke "make" + (string-append "BAMTOOLS_ROOT=" + (assoc-ref inputs "bamtools")))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "bin/freebayes" bin) + (install-file "bin/bamleftalign" bin)) + #t))))) + (home-page "https://github.com/ekg/freebayes") + (synopsis "Haplotype-based variant detector") + (description "FreeBayes is a Bayesian genetic variant detector designed to +find small polymorphisms, specifically SNPs (single-nucleotide polymorphisms), +indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and +complex events (composite insertion and substitution events) smaller than the +length of a short-read sequencing alignment.") + (license license:expat)))) -- cgit v1.2.3 From 50e20b8feeeb39369887af52f99839f4ee87f00b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 9 Aug 2019 12:12:08 +0300 Subject: gnu: 4store: Don't use unstable tarball. * gnu/packages/databases.scm (4store)[source]: Download using 'git-fetch'. --- gnu/packages/databases.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f8b8dc3431..daed93973b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -132,12 +132,13 @@ (name "4store") (version "1.1.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/4store/4store/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/4store/4store.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "004fmcf1w75zhc1x3zc6kc97j4jqn2v5nhk6yb3z3cpfrhzi9j50")) + (base32 "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk")) (patches (search-patches "4store-unset-preprocessor-directive.patch" "4store-fix-buildsystem.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 32c517a327d4f8a9319eb650545c4c88bdf83228 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 9 Aug 2019 12:13:02 +0300 Subject: gnu: 4store: Remove unneeded build phase. * gnu/packages/databases.scm (4store)[arguments]: Remove unneeded 'generate-configure phase. --- gnu/packages/databases.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index daed93973b..ea3b3eb0ef 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -161,12 +161,6 @@ ("cyrus-sasl" ,cyrus-sasl) ("openssl" ,openssl) ("util-linux" ,util-linux))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'generate-configure - (lambda _ - (invoke "sh" "autogen.sh")))))) ;; http://www.4store.org has been down for a while now. (home-page "https://github.com/4store/4store") (synopsis "Clustered RDF storage and query engine") -- cgit v1.2.3 From db18d87ac37ac063ea7ee58cfaa4eceb82818a3c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 9 Aug 2019 14:21:02 +0530 Subject: gnu: guile-email: Update to 0.2.0. * gnu/packages/guile-xyz.scm (guile-email): Update to 0.2.0. [source]: Update URI. [native-inputs]: Remove autoconf and automake. Add lzip. [arguments]: Add GUILE_AUTO_COMPILE=0 to #:make-flags. [home-page]: Update URI. [description]: Update description. --- gnu/packages/guile-xyz.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6dcdcedccf..8c36658361 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -907,27 +907,30 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") (define-public guile-email (package (name "guile-email") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (string-append - "https://git.systemreboot.net/guile-email/snapshot/guile-email-" - version ".tar.xz")) + "https://guile-email.systemreboot.net/releases/guile-email-" + version ".tar.lz")) (sha256 (base32 - "0p2v8q2kkz8m6vf2rsjvz3dj1mvnx7dxakjf72dwkndbgk3rp79f")))) + "05pm0rwdxhjdlpmvhn0kyfslph6j5m1gv76givs0hshb30nirl2x")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake))) + ("lzip" ,lzip))) (inputs `(("guile" ,guile-2.2))) - (home-page "https://git.systemreboot.net/guile-email") + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings + (home-page "https://guile-email.systemreboot.net") (synopsis "Guile email parser") - (description "This package provides an email parser written in pure -Guile.") + (description "guile-email is a collection of email utilities implemented +in pure guile. It supports parsing MIME (Multipurpose Internet Mail +Extensions) compliant email messages and reading emails from the mbox +format.") (license license:agpl3+))) (define-public guile-debbugs-next -- cgit v1.2.3 From 7cd98e868ed00898cff5ac3749194b2b42fc02bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Aug 2019 12:03:14 +0200 Subject: gnu: freebayes: Move bamtools to inputs. * gnu/packages/bioinformatics.scm (freebayes)[native-inputs]: Move bamtools from here... [inputs]: ...to here. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f6a3b8422b..3f1e6b3188 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15119,8 +15119,9 @@ manipulations on VCF files.") (base32 "1sbzwmcbn78ybymjnhwk7qc5r912azy5vqz2y7y81616yc3ba2a2")))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib) - ("htslib" ,htslib))) + `(("bamtools" ,bamtools) + ("htslib" ,htslib) + ("zlib" ,zlib))) (native-inputs `(("bc" ,bc) ; Needed for running tests. ("samtools" ,samtools) ; Needed for running tests. @@ -15128,7 +15129,6 @@ manipulations on VCF files.") ("perl" ,perl) ; Needed for running tests. ("procps" ,procps) ; Needed for running tests. ("python" ,python-2) ; Needed for running tests. - ("bamtools" ,bamtools) ("vcflib-src" ,(package-source vcflib)) ;; These are submodules for the vcflib version used in freebayes. ;; This package builds against the .o files so we need to extract the source. -- cgit v1.2.3 From c2847323d8e1be6259c18a5026f5af9c9eec598b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Aug 2019 12:06:59 +0200 Subject: gnu: freebayes: Simplify and enable tests. * gnu/packages/bioinformatics.scm (freebayes)[arguments]: Enable tests; set make flags; add phase "fix-tests"; fix both Makefiles in "fix-makefiles" phase; move build of tabixpp and vcflib to separate phase "build-tabixpp-and-vcflib"; simplify make invocations; remove custom "build" phase. --- gnu/packages/bioinformatics.scm | 52 +++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3f1e6b3188..a9e0264369 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15159,11 +15159,20 @@ manipulations on VCF files.") (sha256 (base32 "043plp6z0x9yf7mdpky1fw7zcpwn1p47px95w9mh16603zqqqpga")))))) (arguments - `(#:tests? #f ; TODO: Re-enable when we have grep with perl support. + `(#:make-flags + (list "CC=gcc" + (string-append "BAMTOOLS_ROOT=" + (assoc-ref %build-inputs "bamtools"))) #:test-target "test" #:phases (modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "test/t/01_call_variants.t" + (("grep -P \"\\(\\\\t500\\$\\|\\\\t11000\\$\\|\\\\t1000\\$\\)\"") + "grep -E ' (500|11000|1000)$'")) + #t)) (add-after 'unpack 'unpack-submodule-sources (lambda* (#:key inputs #:allow-other-keys) (let ((unpack (lambda (source target) @@ -15184,32 +15193,29 @@ manipulations on VCF files.") (unpack "tabixpp-src" "vcflib/tabixpp") (unpack "test-simple-bash-src" "test/test-simple-bash") (unpack "bash-tap-src" "test/bash-tap"))))) - (add-after 'unpack-submodule-sources 'fix-makefile - (lambda* (#:key inputs #:allow-other-keys) + (add-after 'unpack-submodule-sources 'fix-makefiles + (lambda _ ;; We don't have the .git folder to get the version tag from. - (substitute* '("vcflib/Makefile") - (("^GIT_VERSION.*") (string-append "GIT_VERSION = v" ,version))))) - (replace 'build + (substitute* "vcflib/Makefile" + (("^GIT_VERSION.*") + (string-append "GIT_VERSION = v" ,version))) + (substitute* "src/Makefile" + (("-I\\$\\(BAMTOOLS_ROOT\\)/src") + "-I$(BAMTOOLS_ROOT)/include/bamtools")) + #t)) + (add-before 'build 'build-tabixpp-and-vcflib (lambda* (#:key inputs make-flags #:allow-other-keys) (with-directory-excursion "vcflib" (with-directory-excursion "tabixpp" - (pk "Compile tabixpp before compiling the main project.") - (let ((htslib-ref (assoc-ref inputs "htslib"))) - (invoke "make" "HTS_HEADERS=" - (string-append "HTS_LIB=" htslib-ref "/lib/libhts.a") - (string-append "LIBPATH=-L. -L" htslib-ref "/include")))) - (pk "Compile vcflib before compiling the main project.") - (invoke "make" "CC=gcc" - (string-append "CFLAGS=\"" "-Itabixpp " - "-I" (assoc-ref inputs "htslib") "/include " "\"") - "all")) - (pk "Compile the main project.") - (with-directory-excursion "src" - (substitute* "Makefile" - (("-I\\$\\(BAMTOOLS_ROOT\\)/src") "-I$(BAMTOOLS_ROOT)/include/bamtools")) - (invoke "make" - (string-append "BAMTOOLS_ROOT=" - (assoc-ref inputs "bamtools")))))) + (apply invoke "make" + (string-append "HTS_LIB=" + (assoc-ref inputs "htslib") + "/lib/libhts.a") + make-flags)) + (apply invoke "make" + (string-append "CFLAGS=-Itabixpp") + "all" + make-flags)))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) -- cgit v1.2.3 From 179ab67ace72f6a3d58d4054c8eb2e9eca63ea90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Aug 2019 16:03:23 +0200 Subject: gnu: r-tidytree: Update to 0.2.6. * gnu/packages/cran.scm (r-tidytree): Update to 0.2.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d928f971d0..6cfea60eb8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9396,14 +9396,14 @@ maps.") (define-public r-tidytree (package (name "r-tidytree") - (version "0.2.5") + (version "0.2.6") (source (origin (method url-fetch) (uri (cran-uri "tidytree" version)) (sha256 (base32 - "0vfjv33352dmk9cr2qn0knzg761068rdk6jg32csd9vpmcma8awp")))) + "13mhizbsawmfqjpnzb73yw6kn1f1wlz0vhyzj3g0rj6ry880rw89")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) -- cgit v1.2.3 From 3ea548290aac8206e846d74106ad5966b468fe9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Aug 2019 16:03:34 +0200 Subject: gnu: r-ggforce: Update to 0.3.0. * gnu/packages/cran.scm (r-ggforce): Update to 0.3.0. [propagated-inputs]: Add r-tidyselect and r-withr. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6cfea60eb8..17c85fe512 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13764,14 +13764,14 @@ sets of URLs.") (define-public r-ggforce (package (name "r-ggforce") - (version "0.2.2") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "ggforce" version)) (sha256 (base32 - "0snxx9zhcccxa7pz9pf3bjqmcmv9mz4m47v81hklnhm25jj40xg2")))) + "118qyzy8h9kkkdpjd09667gxgw7xy1kbc8r87pswh54ixn8hymwk")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) @@ -13782,7 +13782,9 @@ sets of URLs.") ("r-rcppeigen" ,r-rcppeigen) ("r-rlang" ,r-rlang) ("r-scales" ,r-scales) - ("r-tweenr" ,r-tweenr))) + ("r-tidyselect" ,r-tidyselect) + ("r-tweenr" ,r-tweenr) + ("r-withr" ,r-withr))) (home-page "https://ggforce.data-imaginist.com") (synopsis "Accelerating ggplot2") (description -- cgit v1.2.3 From e33e3a14c5a87d8c6fda32ce78af0f99b5bfc0f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Aug 2019 16:03:50 +0200 Subject: gnu: r-xml2: Update to 1.2.2. * gnu/packages/statistics.scm (r-xml2): Update to 1.2.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 248bf39eff..024160ef81 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2023,14 +2023,14 @@ and environmental data in the framework of Euclidean exploratory methods.") (define-public r-xml2 (package (name "r-xml2") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "xml2" version)) (sha256 (base32 - "0186d7r36xw1z9f8ajz35a0dz4ch6hmrjl9536yc7vq78v4vn5an")))) + "1x3q3a0xv8j0nx3hs4d3pfjm5g9nvaxmfrapba9f4nrkqi3z2l1h")))) (build-system r-build-system) (inputs `(("libxml2" ,libxml2) -- cgit v1.2.3 From b22e47a1aabac2c4b0008c2f1bd4e6c402fd49bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 9 Aug 2019 16:29:21 +0200 Subject: gnu: emacs-xr: Update to 1.13. * gnu/packages/emacs-xyz.scm (emacs-xr): Update to 1.13. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a258571006..e32e7305b7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -876,7 +876,7 @@ in certain cases. It also enables recursion for anonymous functions.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) @@ -884,7 +884,7 @@ in certain cases. It also enables recursion for anonymous functions.") "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 (base32 - "1vv87h0h8ldc1mbsn45w5z1m6jq8j2js4xz23a9ixdby06g60y3g")))) + "1km4x92pii8c4bcimks4xzhmwpypdf183z0zh7raj062jz4jb74r")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") -- cgit v1.2.3 From d51f20f9b8ec2f60afde58e1b0a10fe25ab68e79 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 9 Aug 2019 00:21:50 +0200 Subject: gnu: emacs-deadgrep: Update to 0.8-1.329119c. * gnu/packages/emacs-xyz.scm (emacs-deadgrep): Update to 0.8-1.329119c. Signed-off-by: Ricardo Wurmus --- gnu/packages/emacs-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e32e7305b7..1681cecbcf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13985,12 +13985,13 @@ accept and reject GitHub pull requests.") (license license:gpl3+)))) (define-public emacs-deadgrep - (let ((commit "caeb37b8d6ab83f0eba353d6bbb29678190d4419") - (version "0.7") + ;; We prefer a newer commit (four commits newer than release) because of a + ;; bugfix for globbing. + (let ((commit "329119c65126f7917d3910bc584f4191ba8f21ac") (revision "1")) (package (name "emacs-deadgrep") - (version (git-version version revision commit)) + (version (git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -14000,7 +14001,7 @@ accept and reject GitHub pull requests.") (file-name (git-file-name name version)) (sha256 (base32 - "158fqha8nilwfzmw15lcsq8b099j8wclzq303md0j4mfr2q2gfvs")))) + "0fxf7gq9sjfkgpdfqx10w3l3nd4rwa8kv9plyxk1fqacb3s5m6ai")))) (build-system emacs-build-system) (inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 55ebb3ebf63577644e378c68c2c939a15fbced8d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 9 Aug 2019 14:20:12 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.138. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.138. (linux-libre-4.14-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a5b9f6bfed..e71a60c9cb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.137") +(define-public linux-libre-4.14-version "4.14.138") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0a72pab0zxy28i02glnzj6avzcf0a4gxxnadbdd343rh549yky4k"))) + (hash (base32 "0yw39cqpk6g42q0xcv2aq8yyzsi0kzx9nvlfbw0iyg58wcfvsl7j"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From f16109ccef689d4fb0ed28f85821e6753068be64 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 9 Aug 2019 14:21:21 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.66. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.66. (linux-libre-4.19-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e71a60c9cb..e51470828c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.65") +(define-public linux-libre-4.19-version "4.19.66") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1pyyhr2airxzk4c6n7140yl723dc7yw7igy5i5i2ih0nd4c3k6g5"))) + (hash (base32 "0r6vzarmi77fhivd1n6f667sgcw8zd54ykmhmp6rd52bbkhsp0f9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From dbc3f1f8b21fddab13d881e21fd8128a2a8ef66f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 9 Aug 2019 14:22:06 -0400 Subject: gnu: linux-libre: Update to 5.2.8. * gnu/packages/linux.scm (linux-libre-5.2-version): Update to 5.2.8. (linux-libre-5.2-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e51470828c..154ca59c69 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.2-version "5.2.7") +(define-public linux-libre-5.2-version "5.2.8") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "1aazhf0v8bv4py0wnqkdmiy80fchnix431l0hda2fkwsdf9njgnv"))) + (hash (base32 "0dv91zfjkil29lp2l35lswkrhrqbc4kjh965ciaqwih1rh3cs9x1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -- cgit v1.2.3 From c91364d36cf6c8fc4c696d151eb9fca7832cf898 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 11 Aug 2019 06:42:39 +0000 Subject: gnu: diffoscope: Update to 120. * gnu/packages/package-management (diffoscope): Update to 120. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ac9ed91722..3b003fd30f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -563,16 +563,16 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "116") + (version "120") (source (origin (method git-fetch) (uri (git-reference (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") - (commit "116"))) + (commit "120"))) (file-name (git-file-name name version)) (sha256 (base32 - "1anz2c112y0w21mh7xp6bs6z7v10dcy1i25nypkvqy3j929m0g28")))) + "07z9yclvfkw4326739l2ywzzihax5vdijiaqqpfix9rz1rb923aa")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fae0a777dc9fc47da4f8254fb0e64c6575c61e6a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 11 Aug 2019 06:35:41 +0000 Subject: gnu: Update electrum to 3.3.8. * gnu/packages/finance (electrum): Update to 3.3.8. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2163ea2152..7bfe5e62ff 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -356,7 +356,7 @@ do so.") (define-public electrum (package (name "electrum") - (version "3.3.6") + (version "3.3.8") (source (origin (method url-fetch) @@ -364,7 +364,7 @@ do so.") version "/Electrum-" version ".tar.gz")) (sha256 - (base32 "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz")) + (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 5e1ab622d99bffe07c5c26937f312dfe1f23fd46 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 11 Aug 2019 13:14:05 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.189. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.189. (linux-libre-4.4-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 154ca59c69..fa4b1b1a97 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,10 +382,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.188") +(define-public linux-libre-4.4-version "4.4.189") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1llxamm62kgqd7dig98n8m16qas8dd8rrkmwpfcdgyf8rag216ff"))) + (hash (base32 "0nc8v62gw89m3ykqg6nqf749fzm8y1n481ns8vny4gbinyikjhlp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From ffb7e5a8e4e611bb97c0a950216472a8b05b8a27 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 11 Aug 2019 13:14:59 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.189. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.189. (linux-libre-4.9-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fa4b1b1a97..301979a7a5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -374,10 +374,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.188") +(define-public linux-libre-4.9-version "4.9.189") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "08p2cfc9982b804vmkapfasgipf6969g625ih7z3062xn99rhlr7"))) + (hash (base32 "1cyhwnxkjd0qa5d48657yppjnzbi830q0p25jjv2dxs629k4bnck"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From c383c36edeb7eb358f142c52276d6e5d32bda044 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Aug 2019 19:36:24 +0200 Subject: gnu: openconnect: Update to 8.04. * gnu/packages/vpn.scm (openconnect): Update to 8.04. --- gnu/packages/vpn.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index d1a7248536..3c6db64ad7 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -239,13 +239,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (define-public openconnect (package (name "openconnect") - (version "8.03") + (version "8.04") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" "openconnect-" version ".tar.gz")) - (sha256 (base32 - "1wlypi68kqqg2mdck8wvf6aanhrmf9i7z6lngyxvcrp23jdzz34h")))) + (sha256 + (base32 "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq")))) (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) -- cgit v1.2.3 From 049915a961bc8b732eff2b3d90b66669d982f6e1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 11 Aug 2019 23:07:20 +0200 Subject: gnu: mame: Update to 0.212. * gnu/packages/emulators.scm (mame): Update to 0.212. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 257591c8d3..032ef90807 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1185,7 +1185,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.211") + (version "0.212") (source (origin (method git-fetch) @@ -1195,7 +1195,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "0gbxgncbzmmplijg0c1ibwsb87fbmfvs1kjflh002yyx8yvfw83z")) + "0p3zcb9l624dsy2gyv23ppp1k1iwd1vrg8cbn5v4fx1s44mx7f5c")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From da7e59ac41dbcd8454ab0fa44223455754c471ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Aug 2019 01:50:43 +0200 Subject: gnu: ungoogled-chromium: Update to 76.0.3809.100-0.8eba5c0 [security fixes]. This release fixes CVE-2019-5867 and CVE-2019-5868. * gnu/packages/chromium.scm (%chromium-version): Set to 76.0.3809.100. (%ungoogled-revision): Set to 8eba5c0. (%chromium-origin, %ungoogled-origin): Update hashes. --- gnu/packages/chromium.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index a014486361..4797004b33 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -238,8 +238,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "76.0.3809.87") -(define %ungoogled-revision "6ea939002bae43a27910e03569d43519d07842e7") +(define %chromium-version "76.0.3809.100") +(define %ungoogled-revision "8eba5c0df1a318012e3deab39a9add252a0d56a3") (define %debian-revision "debian/76.0.3809.87-2") (define package-revision "0") (define %package-version (string-append %chromium-version "-" @@ -254,7 +254,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "1521vh38mfgy7aj1lw1vpbdm8m6wyh52d5p7bz4x6kvvxsnacp11")))) + "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc")))) (define %ungoogled-origin (origin @@ -265,7 +265,7 @@ from forcing GEXP-PROMISE." (string-take %ungoogled-revision 7))) (sha256 (base32 - "1nhrh9fn1appbxf8d3dg49jrqjvha721s89i60s4m63d037cifzr")))) + "08fd9whfc1qky44xqxbypr7jz1rg6cma017wj4b5c5b14grxz6k6")))) (define %debian-origin (origin -- cgit v1.2.3 From e203e57b8a7466c8bbe9c38522f9bf1b03ede2f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Aug 2019 11:22:40 +0300 Subject: gnu: font-gnu-unifont: Update to 12.1.03. * gnu/packages/fonts.scm (font-gnu-unifont): Update to 12.1.03. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 2dc791c784..2dc1df45c8 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -638,7 +638,7 @@ for use at smaller text sizes"))) (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "12.1.02") + (version "12.1.03") (source (origin (method url-fetch) @@ -648,7 +648,7 @@ for use at smaller text sizes"))) (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "12wdxnlyz5gl5d7h6pazcz8d7h81fwkng1xrayxsgrzh6bqdq4p8")))) + (base32 "10mr3ax19v5pa6a791fk2j3k45fpa8n5r36kq9gs8lk95wfnxmf1")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version -- cgit v1.2.3 From 813b7210aab828be6e3b1403de98d166c8cf16e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Aug 2019 10:06:44 +0200 Subject: gnu: r-with-tests: Update to 3.6.1. * gnu/packages/statistics.scm (r-with-tests): Update to 3.6.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 024160ef81..7a124bce8e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -181,7 +181,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (define r-with-tests (package (name "r-with-tests") - (version "3.6.0") + (version "3.6.1") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -189,7 +189,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") version ".tar.gz")) (sha256 (base32 - "02bmylmzrm9sdidirmwy233lghmd2346z725ca71ari68lzarz1n")))) + "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) -- cgit v1.2.3 From fdc22edb6c915fcb6b4862008e095436bdb5cae9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Aug 2019 10:24:59 +0200 Subject: gnu: r-ggplot2: Update to 3.2.1. * gnu/packages/statistics.scm (r-ggplot2): Update to 3.2.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7a124bce8e..cdd0caec4a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1138,13 +1138,13 @@ legends.") (define-public r-ggplot2 (package (name "r-ggplot2") - (version "3.2.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (cran-uri "ggplot2" version)) (sha256 - (base32 "1cvk9pw59kxx19kamqwa15h26rbznp0vvqpn7y8kgjssnrzqkdii")))) + (base32 "0mjswqiqcwm0aqxll16bx2kwa6c9km3aql87bdj4347n1ali94g3")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit v1.2.3 From b4bd0d86a8824295b9e8f5a89937acf1c132cbdc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Aug 2019 11:51:23 +0300 Subject: gnu: vifm: Update to 0.10.1. * gnu/packages/vim.scm (vifm): Update to 0.10.1. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index e06edd5be9..8fc689a79c 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -814,7 +814,7 @@ refactor Vim in order to: (define-public vifm (package (name "vifm") - (version "0.10") + (version "0.10.1") (source (origin (method url-fetch) @@ -825,7 +825,7 @@ refactor Vim in order to: "vifm-" version ".tar.bz2"))) (sha256 (base32 - "1f380xcyjnm4xmcdazs6dj064bwddhywvn3mgm36k7r7b2gnjnp0")))) + "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-build-timestamp") -- cgit v1.2.3 From 513a66c9329cf3a57c6b225318bb67766da097f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Aug 2019 11:52:01 +0300 Subject: gnu: vifm: Re-indent package. * gnu/packages/vim.scm (vifm)[arguments]: Re-indent section. --- gnu/packages/vim.scm | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 8fc689a79c..1eede0b22a 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -828,32 +828,32 @@ refactor Vim in order to: "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-build-timestamp") - #:phases - (modify-phases %standard-phases - (add-after 'patch-source-shebangs 'patch-test-shebangs - (lambda _ - (substitute* (cons* "src/background.c" - "src/cfg/config.c" - (find-files "tests" "\\.c$")) - (("/bin/sh") (which "sh")) - (("/bin/bash") (which "bash"))) - ;; This test segfaults - (substitute* "tests/Makefile" - (("misc") "")) - #t)) - (add-after 'install 'install-vim-plugin-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (vifm (string-append out "/share/vifm")) - (vimfiles (string-append out "/share/vim/vimfiles"))) - (copy-recursively (string-append vifm "/colors") - (string-append vimfiles "/colors")) - (copy-recursively (string-append vifm "/vim") - vimfiles) - (delete-file-recursively (string-append vifm "/colors")) - (delete-file-recursively (string-append vifm "/vim"))) - #t))))) + '(#:configure-flags '("--disable-build-timestamp") + #:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-test-shebangs + (lambda _ + (substitute* (cons* "src/background.c" + "src/cfg/config.c" + (find-files "tests" "\\.c$")) + (("/bin/sh") (which "sh")) + (("/bin/bash") (which "bash"))) + ;; This test segfaults + (substitute* "tests/Makefile" + (("misc") "")) + #t)) + (add-after 'install 'install-vim-plugin-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (vifm (string-append out "/share/vifm")) + (vimfiles (string-append out "/share/vim/vimfiles"))) + (copy-recursively (string-append vifm "/colors") + (string-append vimfiles "/colors")) + (copy-recursively (string-append vifm "/vim") + vimfiles) + (delete-file-recursively (string-append vifm "/colors")) + (delete-file-recursively (string-append vifm "/vim"))) + #t))))) (native-inputs `(("groff" ,groff))) ; for the documentation (inputs -- cgit v1.2.3 From 96c71bffaa0a01a86d59cceec984198d479357dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:46:57 +0300 Subject: gnu: crates-io.scm: Sort packages alphabetically. * gnu/packages/crates-io.scm: Sort packages alphabetically. --- gnu/packages/crates-io.scm | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index db9665d1aa..064ce06692 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22,27 +22,9 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) -(define-public rust-unicode-xid - (package - (name "rust-unicode-xid") - (version "0.1.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "unicode-xid" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw")))) - (build-system cargo-build-system) - (home-page - "https://github.com/unicode-rs/unicode-xid") - (synopsis "Determine Unicode XID related properties") - (description "Determine whether characters have the XID_Start -or XID_Continue properties according to Unicode Standard Annex #31.") - ;; Dual licensed. - (license (list license:asl2.0 license:expat)))) +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; (define-public rust-proc-macro2 (package @@ -90,3 +72,25 @@ in terms of the upstream unstable API.") (description "Quasi-quoting macro quote!(...)") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) + +(define-public rust-unicode-xid + (package + (name "rust-unicode-xid") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-xid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw")))) + (build-system cargo-build-system) + (home-page + "https://github.com/unicode-rs/unicode-xid") + (synopsis "Determine Unicode XID related properties") + (description "Determine whether characters have the XID_Start +or XID_Continue properties according to Unicode Standard Annex #31.") + ;; Dual licensed. + (license (list license:asl2.0 license:expat)))) -- cgit v1.2.3 From 060958949a894f3205523fe9e1f5b5e6bde105de Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:48:46 +0300 Subject: gnu: Add rust-autocfg. * gnu/packages/crates-io.scm (rust-autocfg): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 064ce06692..d4160b6a7f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ivan Petkov +;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,28 @@ ;;; Please: Try to add new module packages in alphabetic order. ;;; +(define-public rust-autocfg + (package + (name "rust-autocfg") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "autocfg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0asl6fnc35yk5l2rxwhp25v128jgm45dp754h9z8x51b6n90w4r2")))) + (build-system cargo-build-system) + (home-page "https://github.com/cuviper/autocfg") + (synopsis "Automatic cfg for Rust compiler features") + (description "Rust library for build scripts to automatically configure +code based on compiler support. Code snippets are dynamically tested to see +if the @code{rustc} will accept them, rather than hard-coding specific version +support.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 242668bdbda579b34ce8a80852a58f4bc4e2d01d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:49:42 +0300 Subject: gnu: Add rust-bencher. * gnu/packages/crates-io.scm (rust-bencher): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d4160b6a7f..bf21497997 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49,6 +49,28 @@ support.") (license (list license:asl2.0 license:expat)))) +(define-public rust-bencher + (package + (name "rust-bencher") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "bencher" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x8p2xblgqssay8cdykp5pkfc0np0jk5bs5cx4f5av097aav9zbx")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/bencher/") + (synopsis "Port of the libtest benchmark runner to Rust stable") + (description "This package provides a port of the libtest (unstable Rust) +benchmark runner to Rust stable releases. Supports running benchmarks and +filtering based on the name. Benchmark execution works exactly the same way +and no more (caveat: black_box is still missing!).") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From dcc0069932c5ffa914e84b910731205f904316ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:50:29 +0300 Subject: gnu: Add rust-bitflags. * gnu/packages/crates-io.scm (rust-bitflags): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bf21497997..5d79833f7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -71,6 +71,26 @@ and no more (caveat: black_box is still missing!).") (license (list license:asl2.0 license:expat)))) +(define-public rust-bitflags + (package + (name "rust-bitflags") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bitflags" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zc1qb1hwsnl2d8rhzicsv9kqd5b2hwbrscrcfw5as4sfr35659x")))) + (build-system cargo-build-system) + (home-page "https://github.com/bitflags/bitflags") + (synopsis "Macro to generate structures which behave like bitflags") + (description "This package provides a macro to generate structures which +behave like a set of bitflags.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From f69bf22334e673dc622eaf9cb55ff28da83d6970 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:53:04 +0300 Subject: gnu: Add rust-cfg-if. * gnu/packages/crates-io.scm (rust-cfg-if): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d79833f7d..7ba20a0f40 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -91,6 +91,27 @@ behave like a set of bitflags.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cfg-if + (package + (name "rust-cfg-if") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "cfg-if" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0csygklgz3ybpr0670rkip49zh76m43ar3k7xgypkzbzrwycx1ml")))) + (build-system cargo-build-system) + (home-page "https://github.com/alexcrichton/cfg-if") + (synopsis "Define an item depending on parameters") + (description "This package provides a macro to ergonomically define an item +depending on a large number of #[cfg] parameters. Structured like an +@code{if-else} chain, the first matching branch is the item that gets emitted.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From b97712821231e2f846f9c14a906a191125490bb1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:53:50 +0300 Subject: gnu: Add rust-discard. * gnu/packages/crates-io.scm (rust-discard): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7ba20a0f40..3f9bc1ffb7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -112,6 +112,26 @@ depending on a large number of #[cfg] parameters. Structured like an (license (list license:asl2.0 license:expat)))) +(define-public rust-discard + (package + (name "rust-discard") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "discard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h67ni5bxvg95s91wgicily4ix7lcw7cq0a5gy9njrybaibhyb91")))) + (build-system cargo-build-system) + (home-page "https://github.com/Pauan/rust-discard") + (synopsis "Allow for intentionally leaking memory") + (description "There are situations where you need to intentionally leak some +memory but not other memory. This package provides a discard trait which allows +for intentionally leaking memory") + (license license:expat))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From f0b9ffcdee75e42ad6c8682886f35c868c433f39 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:54:34 +0300 Subject: gnu: Add rust-doc-comment. * gnu/packages/crates-io.scm (rust-doc-comment): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3f9bc1ffb7..1d80223068 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -132,6 +132,25 @@ memory but not other memory. This package provides a discard trait which allows for intentionally leaking memory") (license license:expat))) +(define-public rust-doc-comment + (package + (name "rust-doc-comment") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "doc-comment" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15rsqxgarfpb1yim9sbp9yfgj7p2dq6v51c6bq1a62paii9ylgcj")))) + (build-system cargo-build-system) + (home-page "https://github.com/GuillaumeGomez/doc-comment") + (synopsis "Macro to generate doc comments") + (description "This package provides a way to generate doc comments +from macros.") + (license license:expat))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From f3739ec0c1f2c6a59e038bd51b56d81c8f84d308 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 12:55:17 +0300 Subject: gnu: Add rust-dtoa. * gnu/packages/crates-io.scm (rust-dtoa): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1d80223068..4050484c63 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -151,6 +151,26 @@ for intentionally leaking memory") from macros.") (license license:expat))) +(define-public rust-dtoa + (package + (name "rust-dtoa") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "dtoa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0phbm7i0dpn44gzi07683zxaicjap5064w62pidci4fhhciv8mza")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/dtoa") + (synopsis "Fast functions for printing floating-point primitives") + (description "This crate provides fast functions for printing +floating-point primitives to an @code{io::Write}.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 7469d541df42f4c9a9bde78f354ecad4d7fab604 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:46:48 +0300 Subject: gnu: Add rust-fallible-iterator. * gnu/packages/crates-io.scm (rust-fallible-iterator): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4050484c63..8a0530989d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -171,6 +171,28 @@ floating-point primitives to an @code{io::Write}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-fallible-iterator + (package + (name "rust-fallible-iterator") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fallible-iterator" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4")))) + (build-system cargo-build-system) + (home-page "https://github.com/sfackler/rust-fallible-iterator") + (synopsis "Fallible iterator traits") + (description "If the @code{std} or @code{alloc} features are enabled, this +crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and +@code{BTreeSet}. If the @code{std} feature is enabled, this crate additionally +provides implementations for @code{HashMap} and @code{HashSet}.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 1816930430117f62ef92905c5d70e839af99ac96 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:47:36 +0300 Subject: gnu: Add rust-fnv. * gnu/packages/crates-io.scm (rust-fnv): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8a0530989d..3dcbb800eb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -193,6 +193,26 @@ provides implementations for @code{HashMap} and @code{HashSet}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-fnv + (package + (name "rust-fnv") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "fnv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ww56bi1r5b8id3ns9j3qxbi7w5h005rzhiryy0zi9h97raqbb9g")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/rust-fnv") + (synopsis "implementation of the Fowler-Noll-Vo hash function") + (description "The @code{fnv} hash function is a custom @code{Hasher} +implementation that is more efficient for smaller hash keys.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 6b69f9f4e362acc412b02d79216a45b2f948f622 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:48:15 +0300 Subject: gnu: Add rust-fs-extra. * gnu/packages/creates-io.scm (rust-fs-extra): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3dcbb800eb..afd7cb586a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -213,6 +213,26 @@ implementation that is more efficient for smaller hash keys.") (license (list license:asl2.0 license:expat)))) +(define-public rust-fs-extra + (package + (name "rust-fs-extra") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fs_extra" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0x6675wdhsx277k1k1235jwcv38naf20d8kwrk948ds26hh4lajz")))) + (build-system cargo-build-system) + (home-page "https://github.com/webdesus/fs_extra") + (synopsis "Extra filesystem methods") + (description "Expanding opportunities standard library @code{std::fs} and +@code{std::io}. Recursively copy folders with recept information about +process and much more.") + (license license:expat))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 1956ba239ccec1e9889e346a9cf7e1b5f50f5745 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:48:58 +0300 Subject: gnu: Add rust-futures. * gnu/packages/crates-io.scm (rust-futures): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index afd7cb586a..dedc0b8db0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -233,6 +233,26 @@ implementation that is more efficient for smaller hash keys.") process and much more.") (license license:expat))) +(define-public rust-futures + (package + (name "rust-futures") + (version "0.1.28") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0saq8ffjw1pwf1pzhw3kq1z7dfq6wpd8x93dnni6vbkc799kkp25")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-lang-nursery/futures-rs") + (synopsis "Implementation of zero-cost futures in Rust") + (description "An implementation of @code{futures} and @code{streams} +featuring zero allocations, composability, and iterator-like interfaces.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 1d5c422c4aba701c4c2bf533d652b3947cfc05eb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:49:50 +0300 Subject: gnu: Add rust-hex. * gnu/packages/crates-io.scm (rust-hex): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dedc0b8db0..da4c517174 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -253,6 +253,26 @@ featuring zero allocations, composability, and iterator-like interfaces.") (license (list license:asl2.0 license:expat)))) +(define-public rust-hex + (package + (name "rust-hex") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "hex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xsdcjiik5j750j67zk42qdnmm4ahirk3gmkmcqgq7qls2jjcl40")))) + (build-system cargo-build-system) + (home-page "https://github.com/KokaKiwi/rust-hex") + (synopsis "Encode and decode data to/from hexadecimals") + (description "This crate allows for encoding and decoding data into/from +hexadecimal representation.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 81749732dd2f79ef0cddc498c70f732137c873ff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:50:35 +0300 Subject: gnu: Add rust-itoa. * gnu/packages/creates-io.scm (rust-itoa): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index da4c517174..73f7b51a59 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -273,6 +273,26 @@ hexadecimal representation.") (license (list license:asl2.0 license:expat)))) +(define-public rust-itoa + (package + (name "rust-itoa") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "itoa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zvg2d9qv3avhf3d8ggglh6fdyw8kkwqg3r4622ly5yhxnvnc4jh")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/itoa") + (synopsis "Fast functions for printing integer primitives") + (description "This crate provides fast functions for printing integer +primitives to an @code{io::Write}.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From bfe256ba2c307764068d0c9ff6913f413bd7f122 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:51:21 +0300 Subject: gnu: Add rust-json. * gnu/packages/creates-io.scm (rust-json): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 73f7b51a59..86d6d8cd01 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -293,6 +293,26 @@ primitives to an @code{io::Write}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-json + (package + (name "rust-json") + (version "0.11.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "json" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hj8c6xj5c2aqqszi8naaflmcdbya1i9byyjrq4iybxjb4q91mq1")))) + (build-system cargo-build-system) + (home-page "https://github.com/maciejhirsz/json-rust") + (synopsis "JSON implementation in Rust") + (description "This crate provides a JSON implementation in Rust, reducing +friction with idiomatic Rust structs to ease interopability.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 9c6301319ea80eca661c65ec05c68c579bb2d104 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:52:00 +0300 Subject: gnu: Add rust-maplit. * gnu/packages/creates-io.scm (rust-maplit): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 86d6d8cd01..7c9c2acef1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -313,6 +313,26 @@ friction with idiomatic Rust structs to ease interopability.") (license (list license:asl2.0 license:expat)))) +(define-public rust-maplit + (package + (name "rust-maplit") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "maplit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hsczmvd6zkqgzqdjp5hfyg7f339n68w83n4pxvnsszrzssbdjq8")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/maplit") + (synopsis "Collection of Map macros") + (description "This crate provides a collection of @code{literal} macros for +@code{HashMap}, @code{HashSet}, @code{BTreeMap}, and @code{BTreeSet.}") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From e7ffbe2fda64d4a399ca325bc446df0837be1844 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:52:35 +0300 Subject: gnu: Add rust-matches. * gnu/packages/crates-io.scm (rust-matches): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c9c2acef1..0e379fbdb9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -333,6 +333,25 @@ friction with idiomatic Rust structs to ease interopability.") (license (list license:asl2.0 license:expat)))) +(define-public rust-matches + (package + (name "rust-matches") + (version "0.1.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "matches" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "020axl4q7rk9vz90phs7f8jas4imxal9y9kxl4z4v7a6719mrz3z")))) + (build-system cargo-build-system) + (home-page "https://github.com/SimonSapin/rust-std-candidates") + (synopsis "Macro to evaluate whether an expression matches a pattern.") + (description "This package provides a macro to evaluate, as a boolean, +whether an expression matches a pattern.") + (license license:expat))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 0c6759d87e00f954713b195100d0dc5febd3f9f6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:53:09 +0300 Subject: gnu: Add rust-md5. * gnu/packages/creates-io.scm (rust-md5): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0e379fbdb9..ac5d68ae4b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -352,6 +352,25 @@ friction with idiomatic Rust structs to ease interopability.") whether an expression matches a pattern.") (license license:expat))) +(define-public rust-md5 + (package + (name "rust-md5") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "md5" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy")))) + (build-system cargo-build-system) + (home-page "https://github.com/stainless-steel/md5") + (synopsis "MD5 hash function in Rust") + (description "The package provides the MD5 hash function.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From f22f05d901854add1208789919bca2e450f0f915 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:53:57 +0300 Subject: gnu: Add rust-peeking-take-while. * gnu/packages/crates-io.scm (rust-peeking-take-while): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac5d68ae4b..f8632518a2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -371,6 +371,29 @@ whether an expression matches a pattern.") (license (list license:asl2.0 license:expat)))) +(define-public rust-peeking-take-while + (package + (name "rust-peeking-take-while") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "peeking_take_while" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16bhqr6rdyrp12zv381cxaaqqd0pwysvm1q8h2ygihvypvfprc8r")))) + (build-system cargo-build-system) + (home-page "https://github.com/fitzgen/peeking_take_while") + (synopsis "Provides the peeking_take_while iterator adaptor method") + (description + "Like @code{Iterator::take_while}, but calls the predicate on a peeked +value. This allows you to use @code{Iterator::by_ref} and +@code{Iterator::take_while} together, and still get the first value for which +the @code{take_while} predicate returned false after dropping the @code{by_ref}.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From e11365fdadcadbcdba9ec5a76b299538a0552c03 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:54:41 +0300 Subject: gnu: Add rust-percent-encoding. * gnu/packages/creates-io.scm (rust-percent-encoding): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f8632518a2..76b70de03c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -394,6 +394,25 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (license (list license:asl2.0 license:expat)))) +(define-public rust-percent-encoding + (package + (name "rust-percent-encoding") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "percent-encoding" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m6rkp3iy11la04p6z3492rns6n693pvmx585dvfmzzlzak2hkxs")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/rust-url/") + (synopsis "Percent encoding and decoding") + (description "This crate provides percent encoding and decoding.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From b275df9cd39ed6ba1eaa7f26cc252df9671651ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:55:27 +0300 Subject: gnu: Add rust-pin-utils. * gnu/packages/creates-io.scm (rust-pin-utils): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 76b70de03c..21a01a383e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -413,6 +413,25 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (license (list license:asl2.0 license:expat)))) +(define-public rust-pin-utils + (package + (name "rust-pin-utils") + (version "0.1.0-alpha.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "pin-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11xmyx00n4m37d546by2rxb8ryxs12v55cc172i3yak1rqccd52q")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-lang-nursery/pin-utils") + (synopsis "Utilities for pinning") + (description "This crate provides utilities for pinning values on the stack.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From b1c3b9e73b477f888f144c64d6955762f54ac538 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:56:52 +0300 Subject: gnu: Add rust-plain. * gnu/packages/crates-io.scm (rust-plain): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 21a01a383e..a04a3c2781 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -432,6 +432,26 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (license (list license:asl2.0 license:expat)))) +(define-public rust-plain + (package + (name "rust-plain") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "plain" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19n1xbxb4wa7w891268bzf6cbwq4qvdb86bik1z129qb0xnnnndl")))) + (build-system cargo-build-system) + (home-page "https://github.com/randomites/plain") + (synopsis "Rust library that allows reinterpreting data safely") + (description "This package provides a small Rust library that allows users + to reinterpret data of certain types safely.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From b7d218d8cbb23536802a97173cf20b0456d158c6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:57:39 +0300 Subject: gnu: Add rust-pocket-resources. * gnu/packages/crates-io.scm (rust-pocket-resources): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a04a3c2781..f19c05a2d0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -452,6 +452,25 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (license (list license:asl2.0 license:expat)))) +(define-public rust-pocket-resources + (package + (name "rust-pocket-resources") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "pocket-resources" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n2i5vmi8fdbw89wm5nz1ws1z9f1qax911p6ksg4scmdg23z6df1")))) + (build-system cargo-build-system) + (home-page "https://github.com/tomaka/pocket-resources") + (synopsis "Include resources in your applications") + (description "This crate allows you to include resources in your +applications.") + (license license:expat))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From 3bb3a9a02148ef960d40e147819038b0b7c192e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:58:25 +0300 Subject: gnu: Add rust-ppv-lite86. * gnu/packages/crates-io.scm (rust-ppv-lite86): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f19c05a2d0..9b9d9b7593 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -471,6 +471,26 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. applications.") (license license:expat))) +(define-public rust-ppv-lite86 + (package + (name "rust-ppv-lite86") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ppv-lite86" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06snnv338w341nicfqba2jgln5dsla72ndkgrw7h1dfdb3vgkjz3")))) + (build-system cargo-build-system) + (home-page "https://github.com/cryptocorrosion/cryptocorrosion") + (synopsis "Implementation of the crypto-simd API for x86") + (description "This crate provides an implementation of the crypto-simd API +for x86.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-proc-macro2 (package (name "rust-proc-macro2") -- cgit v1.2.3 From dea7871742b14df3605dcd2199d89f63fa03f6e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 13:59:27 +0300 Subject: gnu: Add rust-quick-error. * gnu/packages/crates-io.scm (rust-quick-error): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9b9d9b7593..069f70bd39 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -516,6 +516,26 @@ in terms of the upstream unstable API.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-quick-error + (package + (name "rust-quick-error") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "quick-error" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1w6kgwwv7p7zr0yyg5rb315lkk24bimywklwx7fsvsbwi10bjx4j")))) + (build-system cargo-build-system) + (home-page "http://github.com/tailhook/quick-error") + (synopsis "Macro which makes error types pleasant to write") + (description "This crate provides a macro which makes error types pleasant +to write.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-quote (package (name "rust-quote") -- cgit v1.2.3 From f6a1efbca486f39376582796f0423ea9aa831b39 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:00:30 +0300 Subject: gnu: Add rust-rustc-std-workspace-core. * gnu/packages/crates-io.scm (rust-rustc-std-workspace-core): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 069f70bd39..f9dd78df3b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -558,6 +558,26 @@ to write.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-std-workspace-core + (package + (name "rust-rustc-std-workspace-core") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-std-workspace-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1309xhwyai9xpz128xrfjqkmnkvgjwddznmj7brbd8i8f58zamhr")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/rustc-std-workspace-core") + (synopsis "Explicitly empty crate for rust-lang/rust integration") + (description "This crate provides an explicitly empty crate for +rust-lang/rust integration.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From cbfef1f903c9b3e813abd0d1c860a5d52502f897 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:01:19 +0300 Subject: gnu: Add rust-scoped-tls. * gnu/packages/crates-io.scm (rust-scoped-tls): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f9dd78df3b..73bff909a8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -578,6 +578,27 @@ rust-lang/rust integration.") (license (list license:asl2.0 license:expat)))) +(define-public rust-scoped-tls + (package + (name "rust-scoped-tls") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "scoped-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hj8lifzvivdb1z02lfnzkshpvk85nkgzxsy2hc0zky9wf894spa")))) + (build-system cargo-build-system) + (home-page "https://github.com/alexcrichton/scoped-tls") + (synopsis "Rust library providing the old standard library's scoped_thread_local") + (description "This crate provides a library implementation of the standard +library's old @code{scoped_thread_local!} macro for providing scoped access to +@dfn{thread local storage} (TLS) so any type can be stored into TLS.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From ac3e813b846a9d1568847897d6b76390a024a760 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:01:56 +0300 Subject: gnu: Add rust-scopeguard. * gnu/packages/crates-io.scm (rust-scopeguard): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 73bff909a8..478b06b698 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -599,6 +599,29 @@ library's old @code{scoped_thread_local!} macro for providing scoped access to (license (list license:asl2.0 license:expat)))) +(define-public rust-scopeguard + (package + (name "rust-scopeguard") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "scopeguard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03aay84r1f6w87ckbpj6cc4rnsxkxcfs13n5ynxjia0qkgjiabml")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/scopeguard") + (synopsis "Scope guard which will run a closure even out of scope") + (description "This package provides a RAII scope guard that will run a +given closure when it goes out of scope, even if the code between panics +(assuming unwinding panic). Defines the macros @code{defer!}, +@code{defer_on_unwind!}, @code{defer_on_success!} as shorthands for guards +with one of the implemented strategies.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From b7ca017ad31702186b69f793059bf026011cb964 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:02:44 +0300 Subject: gnu: Add rust-semver-parser. * gnu/packages/crates-io.scm (rust-semver-parser): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 478b06b698..66e7c5bdb0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -622,6 +622,25 @@ with one of the implemented strategies.") (license (list license:asl2.0 license:expat)))) +(define-public rust-semver-parser + (package + (name "rust-semver-parser") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "semver-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ahqhvgpzhcsd28id7xnrjv4419i9yyalhm7d7zi430qx0hi2vml")))) + (build-system cargo-build-system) + (home-page "https://github.com/steveklabnik/semver-parser") + (synopsis "Parsing of the semver spec") + (description "This package provides for parsing of the semver spec.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From 9cbb0c97cea091247a6d2e1a00e8476c0cd1599a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:03:17 +0300 Subject: gnu: Add rust-shlex. * gnu/packages/crates-io.scm (rust-shlex): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 66e7c5bdb0..8e3315221a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -641,6 +641,26 @@ with one of the implemented strategies.") (license (list license:asl2.0 license:expat)))) +(define-public rust-shlex + (package + (name "rust-shlex") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "shlex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lmv6san7g8dv6jdfp14m7bdczq9ss7j7bgsfqyqjc3jnjfippvz")))) + (build-system cargo-build-system) + (home-page "https://github.com/comex/rust-shlex") + (synopsis "Split a string into shell words, like Python's shlex") + (description "This crate provides a method to split a string into shell +words, like Python's shlex.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From b158738a0480ebd82b9e9e90b5285340bbd4c302 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:03:53 +0300 Subject: gnu: Add rust-slab. * gnu/packages/crates-io.scm (rust-slab): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8e3315221a..a6019e5b96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -661,6 +661,25 @@ words, like Python's shlex.") (license (list license:asl2.0 license:expat)))) +(define-public rust-slab + (package + (name "rust-slab") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "slab" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1y59xsa27jk84sxzswjk60xcjf8b4fm5960jwpznrrcmasyva4f1")))) + (build-system cargo-build-system) + (home-page "https://github.com/carllerche/slab") + (synopsis "Pre-allocated storage for a uniform data type") + (description "This create provides a pre-allocated storage for a uniform +data type.") + (license license:expat))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From a60f26b24d3ca400488d45faca0444e0db450f32 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:04:34 +0300 Subject: gnu: Add rust-spin. * gnu/packages/crates-io.scm (rust-spin): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a6019e5b96..1a9df7f50a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -680,6 +680,26 @@ words, like Python's shlex.") data type.") (license license:expat))) +(define-public rust-spin + (package + (name "rust-spin") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "spin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m9clchsj0rf13bggsgvbv9haiy0f6rhvnvkpvkk8720a5pkydj4")))) + (build-system cargo-build-system) + (home-page "https://github.com/mvdnes/spin-rs.git") + (synopsis "Synchronization primitives based on spinning") + (description "This crate provides synchronization primitives based on +spinning. They may contain data, are usable without @code{std},and static +initializers are available.") + (license license:expat))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From 0d601e3860eba0a12ba5150153e41facc10fed34 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:05:28 +0300 Subject: gnu: Add rust-stdweb-internal-runtime. * gnu/packages/crates-io.scm (rust-stdweb-internal-runtime): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a9df7f50a..21c150c008 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -700,6 +700,26 @@ spinning. They may contain data, are usable without @code{std},and static initializers are available.") (license license:expat))) +(define-public rust-stdweb-internal-runtime + (package + (name "rust-stdweb-internal-runtime") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "stdweb-internal-runtime" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nhpyra7glbwcpakhpj5a3d7h7kx1ynif473nzshmk226m91f8ym")))) + (build-system cargo-build-system) + (home-page "https://github.com/koute/stdweb") + (synopsis "Internal runtime for the @code{stdweb} crate") + (description "This crate provides internal runtime for the @code{stdweb} +crate.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From 3ded5e3f70fe731624eab56edb396909e72e727e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:06:12 +0300 Subject: gnu: Add rust-strsim. * gnu/packages/crates-io.scm (rust-strsim): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 21c150c008..ead750fe7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -720,6 +720,26 @@ crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-strsim + (package + (name "rust-strsim") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "strsim" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xphwhf86yxxmcpvm4mikj8ls41f6nf7gqyjm98b74mfk81h6b03")))) + (build-system cargo-build-system) + (home-page "https://github.com/dguo/strsim-rs") + (synopsis "Rust implementations of string similarity metrics") + (description "This crate includes implementations of string similarity +metrics. It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, +and Jaro-Winkler.") + (license license:expat))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From eca548232c503288fa0389f0381ee507c7a9b1f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:07:10 +0300 Subject: gnu: Add rust-synstructure-test-traits. * gnu/packages/crates-io.scm (rust-synstructure-test-traits): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ead750fe7d..5c8bcf8465 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -740,6 +740,25 @@ metrics. It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.") (license license:expat))) +(define-public rust-synstructure-test-traits + (package + (name "rust-synstructure-test-traits") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "synstructure_test_traits" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1b3fs2b9kc1gy9dilaxqjbdl4z0mlrbbxjzkprdx953rif1c3q66")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/synstructure_test_traits") + (synopsis "Helper test traits for synstructure doctests") + (description + "This package provides helper test traits for synstructure doctests.") + (license license:expat))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From 92a292f14f23d236b909c8ec9c997928072a4b8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:07:45 +0300 Subject: gnu: Add rust-typenum. * gnu/packages/crates-io.scm (rust-typenum): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5c8bcf8465..9f1d4fc23e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -759,6 +759,28 @@ and Jaro-Winkler.") "This package provides helper test traits for synstructure doctests.") (license license:expat))) +(define-public rust-typenum + (package + (name "rust-typenum") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "typenum" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0sc1jirllfhdi52z1xv9yqzxzpk6v7vadd13n7wvs1wnjipn6bb1")))) + (build-system cargo-build-system) + (home-page "https://github.com/paholg/typenum") + (synopsis "Rust library for type-level numbers evaluated at compile time") + (description "Typenum is a Rust library for type-level numbers evaluated at +compile time. It currently supports bits, unsigned integers, and signed +integers. It also provides a type-level array of type-level numbers, but its +implementation is incomplete.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From f706f5dcf0d535fab7a092d1c79e797f8302eb03 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:08:34 +0300 Subject: gnu: Add rust-ucd-util. * gnu/packages/crates-io.scm (rust-ucd-util): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f1d4fc23e..fe9aa43485 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -781,6 +781,26 @@ implementation is incomplete.") (license (list license:asl2.0 license:expat)))) +(define-public rust-ucd-util + (package + (name "rust-ucd-util") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ucd-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0x088q5z0m09a2jqcfgsnq955y8syn1mgn35cl78qinkxm4kp6zs")))) + (build-system cargo-build-system) + (home-page "https://github.com/BurntSushi/ucd-generate") + (synopsis "library for working with the Unicode character database") + (description "This package provides a small utility library for working +with the Unicode character database.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From 96bb8fd0657a98eb37e63d3b90bcfa1724c5c70d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:09:25 +0300 Subject: gnu: Add rust-unicode-width. * gnu/packages/crates-io.scm (rust-unicode-width): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fe9aa43485..142f4d1d46 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -801,6 +801,26 @@ with the Unicode character database.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unicode-width + (package + (name "rust-unicode-width") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-width" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09k5lipygardwy0660jhls08fsgknrazzivmn804gps53hiqc8w8")))) + (build-system cargo-build-system) + (home-page "https://github.com/unicode-rs/unicode-width") + (synopsis "Determine displayed width according to Unicode rules") + (description "This crate allows you to determine displayed width of +@code{char} and @code{str} types according to Unicode Standard Annex #11 rules.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-xid (package (name "rust-unicode-xid") -- cgit v1.2.3 From ede033176a4aaaaacf8c914c5be3787859f5d2d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:10:11 +0300 Subject: gnu: Add rust-unindent. * gnu/packages/crates-io.scm (rust-unindent): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 142f4d1d46..0e81e1e9d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -842,3 +842,23 @@ with the Unicode character database.") or XID_Continue properties according to Unicode Standard Annex #31.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) + +(define-public rust-unindent + (package + (name "rust-unindent") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "unindent" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x21ilf78aqcq9xzb9b7i628wm10rhk0jp0chlv06rkc690l8jw3")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/indoc") + (synopsis "Remove a column of leading whitespace from a string") + (description "This crate allows you to remove a column of leading +whitespace from a string.") + (license (list license:asl2.0 + license:expat)))) -- cgit v1.2.3 From 2a13c9fa5cd51960270037ec4c805f36c0f26212 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:11:08 +0300 Subject: gnu: Add rust-wasm-bindgen-shared. * gnu/packages/crates-io.scm (rust-wasm-bindgen-shared): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0e81e1e9d3..1c78073528 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -862,3 +862,23 @@ or XID_Continue properties according to Unicode Standard Annex #31.") whitespace from a string.") (license (list license:asl2.0 license:expat)))) + +(define-public rust-wasm-bindgen-shared + (package + (name "rust-wasm-bindgen-shared") + (version "0.2.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-shared" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08rnfhjyk0f6liv8n4rdsvhx7r02glkhcbj2lp9lcbkbfpad9hnr")))) + (build-system cargo-build-system) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli") + (description "This package provides shared support between +@code{wasm-bindgen} and @code{wasm-bindgen} cli, an internal dependency.") + (license (list license:asl2.0 + license:expat)))) -- cgit v1.2.3 From 58fdf6e1f22a6bae4ba1e16673404c272f845850 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:13:55 +0300 Subject: gnu: Add rust-winapi-i686-pc-windows-gnu. * gnu/packages/crates-io.scm (rust-winapi-i686-pc-windows-gnu): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1c78073528..36632653d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -882,3 +882,24 @@ whitespace from a string.") @code{wasm-bindgen} and @code{wasm-bindgen} cli, an internal dependency.") (license (list license:asl2.0 license:expat)))) + +(define-public rust-winapi-i686-pc-windows-gnu + (package + (name "rust-winapi-i686-pc-windows-gnu") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "winapi-i686-pc-windows-gnu" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dmpa6mvcvzz16zg6d5vrfy4bxgg541wxrcip7cnshi06v38ffxc")))) + (build-system cargo-build-system) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Import libraries for the i686-pc-windows-gnu target") + (description "This crate provides import libraries for the +i686-pc-windows-gnu target. Please don't use this crate directly, depend on +@code{winapi} instead.") + (license (list license:asl2.0 + license:expat)))) -- cgit v1.2.3 From 07631e31b1b03cbf2797b8462eaa592c6b0699e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:14:46 +0300 Subject: gnu: Add rust-winapi-x86-64-pc-windows-gnu. * gnu/packages/crates-io.scm (rust-winapi-x86-64-pc-windows-gnu): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 36632653d4..23592f839b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -903,3 +903,24 @@ i686-pc-windows-gnu target. Please don't use this crate directly, depend on @code{winapi} instead.") (license (list license:asl2.0 license:expat)))) + +(define-public rust-winapi-x86-64-pc-windows-gnu + (package + (name "rust-winapi-x86-64-pc-windows-gnu") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "winapi-x86_64-pc-windows-gnu" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki")))) + (build-system cargo-build-system) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Import libraries for the x86_64-pc-windows-gnu target") + (description "This package provides import libraries for the +x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on +@code{winapi} instead.") + (license (list license:asl2.0 + license:expat)))) -- cgit v1.2.3 From c9093d27949626e61db9591d37cebc693d15ca5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Aug 2019 14:16:15 +0300 Subject: gnu: Add rust-winapi. * gnu/packages/crates-io.scm (rust-winapi): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 23592f839b..6500adb215 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -883,6 +883,32 @@ whitespace from a string.") (license (list license:asl2.0 license:expat)))) +(define-public rust-winapi + (package + (name "rust-winapi") + (version "0.3.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "winapi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0w7pbhcl087lkggxdflfp2i92rq89ahsfdkjkv44fgmiy9m3h3pi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi-i686-pc-windows-gnu" + ,rust-winapi-i686-pc-windows-gnu) + ("rust-winapi-x86-64-pc-windows-gnu" + ,rust-winapi-x86-64-pc-windows-gnu)))) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Raw FFI bindings for all of Windows API.") + (description + "Raw FFI bindings for all of Windows API.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-winapi-i686-pc-windows-gnu (package (name "rust-winapi-i686-pc-windows-gnu") -- cgit v1.2.3 From 57939283c0df16cbcec009c442a567ec6e3ff066 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 12 Aug 2019 15:39:59 +0200 Subject: gnu: mame: Fix build. * gnu/packages/emulators.scm (mame): Apply upstream patch. * gnu/packages/patches/mame-rapidjson-fix.patch: New file. * gnu/local.mk: Register file. --- gnu/local.mk | 1 + gnu/packages/emulators.scm | 4 +++ gnu/packages/patches/mame-rapidjson-fix.patch | 37 +++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 gnu/packages/patches/mame-rapidjson-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index f412891919..fa5753e511 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ + %D%/packages/patches/mame-rapidjson-fix.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 032ef90807..388611d1d8 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1196,6 +1196,10 @@ play them on systems for which they were never designed!") (sha256 (base32 "0p3zcb9l624dsy2gyv23ppp1k1iwd1vrg8cbn5v4fx1s44mx7f5c")) + (patches + ;; FIXME: Remove once 0.213 is out. Applied upstream as + ;; 0b5b13cf1e28550b49c387dec93f9801f029e313. + (search-patches "mame-rapidjson-fix.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. diff --git a/gnu/packages/patches/mame-rapidjson-fix.patch b/gnu/packages/patches/mame-rapidjson-fix.patch new file mode 100644 index 0000000000..70cf8458ea --- /dev/null +++ b/gnu/packages/patches/mame-rapidjson-fix.patch @@ -0,0 +1,37 @@ +From 0b5b13cf1e28550b49c387dec93f9801f029e313 Mon Sep 17 00:00:00 2001 +From: Julian Sikorski +Date: Mon, 5 Aug 2019 21:16:54 +0200 +Subject: [PATCH] Fix building using system rapidjson + +--- + scripts/target/mame/arcade.lua | 1 + + src/mame/video/midtunit.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua +index 964daa3572f..ef30ae3c2c2 100644 +--- a/scripts/target/mame/arcade.lua ++++ b/scripts/target/mame/arcade.lua +@@ -930,6 +930,7 @@ function createMAMEProjects(_target, _subtarget, _name) + ext_includedir("flac"), + ext_includedir("glm"), + ext_includedir("jpeg"), ++ ext_includedir("rapidjson"), + } + + end +diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp +index b4cb98abacf..b307f3f722b 100644 +--- a/src/mame/video/midtunit.cpp ++++ b/src/mame/video/midtunit.cpp +@@ -20,8 +20,8 @@ + #include "emuopts.h" // Used by PNG logging + #include "png.h" // Used by PNG logging + +-#include "rapidjson/include/rapidjson/prettywriter.h" // Used by JSON logging +-#include "rapidjson/include/rapidjson/stringbuffer.h" // Used by JSON logging ++#include // Used by JSON logging ++#include // Used by JSON logging + + DEFINE_DEVICE_TYPE(MIDTUNIT_VIDEO, midtunit_video_device, "tunitvid", "Midway T-Unit Video") + DEFINE_DEVICE_TYPE(MIDWUNIT_VIDEO, midwunit_video_device, "wunitvid", "Midway W-Unit Video") -- cgit v1.2.3 From 89ccc9ce918ec10c5da0101e28c176b9add91714 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 6 Aug 2019 23:56:22 -0400 Subject: gnu: dav1d: Update to 0.4.0. * gnu/packages/video.scm (dav1d): Update to 0.4.0. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index eda5b8fc39..ac1fe46726 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3524,7 +3524,7 @@ transitions, and effects and then export your film to many common formats.") (define-public dav1d (package (name "dav1d") - (version "0.2.2") + (version "0.4.0") (source (origin (method url-fetch) @@ -3536,7 +3536,8 @@ transitions, and effects and then export your film to many common formats.") (string-append "https://code.videolan.org/videolan/dav1d/-/" "archive/" version "/dav1d-" version ".tar.bz2"))) (sha256 - (base32 "1llf4v486avj83d31670vdd5nshbq10qrx9vwrm1j078dh4ax4q0")))) + (base32 + "08yqml01lbcpflrshdpvn88jv3xd8gm559qikiwyrh41a3kb4lr5")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit v1.2.3 From 6df4e6899d6aa82c9520c03114f73bc83fee5867 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Aug 2019 16:01:43 -0400 Subject: gnu: MPD: Update to 0.21.13. * gnu/packages/mpd.scm (mpd): Update to 0.21.13. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 51c674cb31..5468ba901e 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -91,7 +91,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.21.11") + (version "0.21.13") (source (origin (method url-fetch) (uri @@ -100,7 +100,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1gbcg8icm0pp918jw1lx1j066m39zg9wyqjla328ic848j5zhbnk")))) + "1sjyhmq50nlccwmd8xn7m0bk8xvyixvfyr24v9dy3g86hhk0pdwm")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true") ; the default is 'false'... -- cgit v1.2.3 From 8a5073461f6fbd26e15c66f574aeb343891bf810 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Aug 2019 00:16:46 -0400 Subject: gnu: go-golang-org-x-sys-unix: Update to 0.0.0-4.04f50cd. * gnu/packages/golang.scm (go-golang-org-x-sys-unix): Update to 0.0.0-4.04f50cd. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c67ef036ee..0d93f0ba8f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1222,8 +1222,8 @@ for a variety of protocols to proxy network data.") (license license:bsd-3)))) (define-public go-golang-org-x-sys-unix - (let ((commit "5ed2794edfdc1c54dfb61d619c5944285f35d444") - (revision "3")) + (let ((commit "04f50cda93cbb67f2afa353c52f342100e80e625") + (revision "4")) (package (name "go-golang-org-x-sys-unix") (version (git-version "0.0.0" revision commit)) @@ -1235,7 +1235,7 @@ for a variety of protocols to proxy network data.") (file-name (git-file-name name version)) (sha256 (base32 - "1qy8hmv5nwpcywk7sh1pg0s32jwpd4ykh492xzl4mmxy8galwsr5")))) + "0hmfsz9y1ingwsn482hlzzmzs7kr3cklm0ana0mbdk70isw2bxnw")))) (build-system go-build-system) (arguments `(#:import-path "golang.org/x/sys/unix" -- cgit v1.2.3 From e7189e0bff33cfd75f16ff20195dcf38fd14bdfa Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Aug 2019 00:18:57 -0400 Subject: gnu: go-github-com-maruel-panicparse: Update to 1.3.0. * gnu/packages/golang.scm (go-github-com-maruel-panicparse): Update to 1.3.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0d93f0ba8f..01de446ce0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3621,7 +3621,7 @@ error handling primitives in Go.") (define-public go-github-com-maruel-panicparse (package (name "go-github-com-maruel-panicparse") - (version "1.2.1") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -3630,7 +3630,7 @@ error handling primitives in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "05hf68ifb7ww4rpmxyywbj9r0kyap45p1273ncq4qy2ydv042l8j")))) + "13qkn7f64yln8jdmma37h6ra4c7anxkp3vfgvfyb6lb07dpr1ibq")))) (build-system go-build-system) (arguments '(#:import-path "github.com/maruel/panicparse")) -- cgit v1.2.3 From 158e82933cf0c56781c0ded61a3c8766bff5785e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Aug 2019 00:19:34 -0400 Subject: gnu: go-github-com-lib-pq: Update to 1.2.0. * gnu/packages/syncthing.scm (go-github-com-lib-pq): Update to 1.2.0. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c35ee8639c..340e48f6f5 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -422,7 +422,7 @@ address of the default LAN gateway.") (define-public go-github-com-lib-pq (package (name "go-github-com-lib-pq") - (version "1.1.1") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -431,7 +431,7 @@ address of the default LAN gateway.") (file-name (git-file-name name version)) (sha256 (base32 - "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km")))) + "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz")))) (build-system go-build-system) (arguments `(#:import-path "github.com/lib/pq" -- cgit v1.2.3 From e9a0e4756fc4e2c49f2fb8cd1553eae244a67c06 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Aug 2019 00:19:56 -0400 Subject: gnu: go-github-com-syncthing-notify: Update to 0.0.0-5.69c7a95. * gnu/packages/syncthing.scm (go-github-com-syncthing-notify): Update to 0.0.0-5.69c7a95. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 340e48f6f5..b2f843e6c2 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -793,8 +793,8 @@ using sh's word-splitting rules.") (license expat)))) (define-public go-github-com-syncthing-notify - (let ((commit "4e389ea6c0d84e6195eb585ffaf62c8c143306ae") - (revision "4")) + (let ((commit "69c7a957d3e261f9744f46b3dd4d608d8480ad90") + (revision "5")) (package (name "go-github-com-syncthing-notify") (version (git-version "0.0.0" revision commit)) @@ -806,7 +806,7 @@ using sh's word-splitting rules.") (file-name (git-file-name name version)) (sha256 (base32 - "19gvl14s1l9m82f8c2xsjcr8lmbqrvw1mxkayvfcpimvxfz0j61i")))) + "1mmdzyfnmjabyhbipl4bggw4w5nlxyyjp0d93qd824kj07kmsr1f")))) (build-system go-build-system) (arguments '(#:import-path "github.com/syncthing/notify")) -- cgit v1.2.3 From a797e55ca0ebeb88ede693e3eb462d1a9a54b527 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Aug 2019 00:20:29 -0400 Subject: gnu: Syncthing: Update to 1.2.1. * gnu/packages/syncthing.scm (syncthing): Update to 1.2.1. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index b2f843e6c2..0f81b8804a 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "1l7crhggg2vq4y7pgzsj8wp7k4l9hw5yblflly5bzwywzxz8ff83")) + "1b6fidpkwfa2bm6hlv4p0bzxa1ha6s88vajczhryhqi5vjfxafri")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin -- cgit v1.2.3 From 39a6852acb17d812cd476cc4466f898cc1738287 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 09:36:26 +0200 Subject: gnu: emacs-inf-ruby: Update to 2.5.2. * gnu/packages/emacs-xyz.scm (emacs-inf-ruby): Update to 2.5.2. Signed-off-by: Ricardo Wurmus --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1681cecbcf..df184134c9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2473,7 +2473,7 @@ column by drawing a thin line down the length of the editing window.") (define-public emacs-inf-ruby (package (name "emacs-inf-ruby") - (version "2.5.1") + (version "2.5.2") (source (origin (method git-fetch) @@ -2482,7 +2482,7 @@ column by drawing a thin line down the length of the editing window.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z")))) + (base32 "0a1hhvfbl6mq8rjsi77fg9fh5a91hi5scjrg9rjqc5ffbql67y0v")))) (build-system emacs-build-system) (home-page "https://github.com/nonsequitur/inf-ruby") (synopsis "Provides a REPL buffer connected to a Ruby subprocess in Emacs") -- cgit v1.2.3 From f9ccde24606fdb9ea10235e50e5898781eb913ff Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Tue, 6 Aug 2019 02:42:11 -0400 Subject: gnu: Add emacs-ebdb. * gnu/packages/emacs-xyz.scm (emacs-ebdb): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index df184134c9..cbb4c90c94 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jens Mølgaard +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; @@ -17215,3 +17216,28 @@ time.") (description "@code{mastodon.el} is an Emacs client for Mastodon, the federated microblogging social network.") (license license:gpl3+))) + +;; The last release tarball is for version 0.6. We pick a commit close to +;; version 0.6.10, which doesn't have a release tarball. +(define-public emacs-ebdb + (let ((commit "2a87f5ed2a53e3a4e91e8c88ba5afc49f5e945df") + (revision "0")) + (package + (name "emacs-ebdb") + (version (git-version "0.6.10" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/girzel/ebdb.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fidy7z0c86dpqiss97sg5s92fd3fj4bdl8pqqdgg2m00jx4mrjz")))) + (build-system emacs-build-system) + (home-page "https://github.com/girzel/ebdb") + (synopsis "EIEIO port of BBDB, Emacs's contact-management package") + (description "EBDB is a contact management/addressbook package for +Emacs. It's a re-write of the Insidious Big Brother Database (BBDB) using +Emacs Lisp's (relatively new) EIEIO object oriented libraries.") + (license license:gpl3+)))) -- cgit v1.2.3 From 77bdfe2f138e7c074c2eb94de3a44561da39d966 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Aug 2019 12:44:06 +0200 Subject: gnu: scribus: Update to 1.5.5. * gnu/packages/scribus.scm (scribus): Update to 1.5.5. [source]: Remove unnecessary patches and snippet. [description]: Change freetype to FreeType. * gnu/packages/patches/scribus-poppler.patch: Remove file. * gnu/local.mk: Apply removal. --- gnu/local.mk | 1 - gnu/packages/patches/scribus-poppler.patch | 72 --------------------------- gnu/packages/scribus.scm | 80 ++++++------------------------ 3 files changed, 14 insertions(+), 139 deletions(-) delete mode 100644 gnu/packages/patches/scribus-poppler.patch diff --git a/gnu/local.mk b/gnu/local.mk index fa5753e511..cbc741ac57 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1293,7 +1293,6 @@ dist_patch_DATA = \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ - %D%/packages/patches/scribus-poppler.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ diff --git a/gnu/packages/patches/scribus-poppler.patch b/gnu/packages/patches/scribus-poppler.patch deleted file mode 100644 index 9b969e4cb6..0000000000 --- a/gnu/packages/patches/scribus-poppler.patch +++ /dev/null @@ -1,72 +0,0 @@ -Fix build with recent Poppler. - -From d867ec3c386baaed1b8e076dd70b278863411480 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Mon, 30 Apr 2018 09:19:33 +0000 -Subject: [PATCH] =?UTF-8?q?#15289:=20FTBFS=201.5.4=20with=20error:=20inval?= - =?UTF-8?q?id=20conversion=20from=20=E2=80=98const=20GooString*=E2=80=99?= - =?UTF-8?q?=20to=20=E2=80=98GooString*=E2=80=99?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -git-svn-id: svn://scribus.net/trunk/Scribus@22498 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/importpdf.cpp | 2 +- - scribus/plugins/import/pdf/importpdf.h | 2 +- - scribus/plugins/import/pdf/slaoutput.cpp | 2 +- - scribus/plugins/import/pdf/slaoutput.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp -index c1802861aa..d4c5a9ba49 100644 ---- a/scribus/plugins/import/pdf/importpdf.cpp -+++ b/scribus/plugins/import/pdf/importpdf.cpp -@@ -1081,7 +1081,7 @@ QRectF PdfPlug::getCBox(int box, int pgNum) - return cRect; - } - --QString PdfPlug::UnicodeParsedString(GooString *s1) -+QString PdfPlug::UnicodeParsedString(const GooString *s1) - { - if ( !s1 || s1->getLength() == 0 ) - return QString(); -diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h -index c8c5efcd0d..5249562692 100644 ---- a/scribus/plugins/import/pdf/importpdf.h -+++ b/scribus/plugins/import/pdf/importpdf.h -@@ -81,7 +81,7 @@ class PdfPlug : public QObject - private: - bool convert(const QString& fn); - QRectF getCBox(int box, int pgNum); -- QString UnicodeParsedString(GooString *s1); -+ QString UnicodeParsedString(const GooString *s1); - - QList Elements; - double baseX, baseY; -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index be1815dc29..17b6357246 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -4252,7 +4252,7 @@ void SlaOutputDev::pushGroup(QString maskName, GBool forSoftMask, GBool alpha, b - m_groupStack.push(gElements); - } - --QString SlaOutputDev::UnicodeParsedString(GooString *s1) -+QString SlaOutputDev::UnicodeParsedString(const GooString *s1) - { - if ( !s1 || s1->getLength() == 0 ) - return QString(); -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index 20e8b2d311..6698c030e0 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -266,7 +266,7 @@ class SlaOutputDev : public OutputDev - int getBlendMode(GfxState *state); - void applyMask(PageItem *ite); - void pushGroup(QString maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); -- QString UnicodeParsedString(GooString *s1); -+ QString UnicodeParsedString(const GooString *s1); - bool checkClip(); - bool pathIsClosed; - QString CurrColorFill; diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 20795da275..25122c10ae 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -47,7 +47,7 @@ (define-public scribus (package (name "scribus") - (version "1.5.4") + (version "1.5.5") (source (origin (method url-fetch) @@ -55,60 +55,7 @@ version "/scribus-" version ".tar.xz")) (sha256 (base32 - "00ys0p6h3iq77kh72dkl0qrf7qvznq18qdrgiq10gfxja1995034")) - (patches (append - ;; Scribus relies heavily on Poppler internals, which have - ;; changed a lot since the latest Scribus release (2018-04). - ;; Thus, we require a bunch of patches to stay compatible. - (search-patches "scribus-poppler.patch") - (list (origin - (method url-fetch) - (uri (string-append - "https://github.com/scribusproject/scribus/commit/" - "7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch")) - (file-name "scribus-poppler-0.64.patch") - (sha256 - (base32 - "1kr27bfzkpabrh42nsrrvlqyycdg9isbavpaa5spgmrhidcg02xj"))) - (origin - (method url-fetch) - (uri (string-append - "https://github.com/scribusproject/scribus/commit/" - "76561c1a55cd07c268f8f2b2fea888532933700b.patch")) - (file-name "scribus-poppler-config.patch") - (sha256 - (base32 - "01k18xjj82c3ndzp89dlpfhhdccc8z0acf8b04r592jyr5y9rc19"))) - (origin - (method url-fetch) - (uri (string-append - "https://github.com/scribusproject/scribus/commit/" - "8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch")) - (file-name "scribus-poppler-0.69.patch") - (sha256 - (base32 - "1avdmsj5l543j0irq18nxgiw99n395jj56ih5dsal59fn0wbqk42"))) - (origin - (method url-fetch) - (uri (string-append "https://git.archlinux.org/svntogit/" - "community.git/plain/trunk/scribus-" - "poppler-0.70.patch?h=packages/scribus&id=" - "8ef43ee2fceb0753ed5a76bb0a11c84775898ffc")) - (file-name "scribus-poppler-0.70.patch") - (sha256 - (base32 - "0dw7ix3jaj0y1q97cmmqwb2qgdx760yhxx86wa8rnx0xhfi5x6qr")))))) - (modules '((guix build utils))) - (snippet - '(begin - (for-each (lambda (file) - (substitute* file - ;; These are required for compatibility with Poppler 0.71. - (("GBool") "bool") (("gTrue") "true") (("gFalse") "false") - ;; ...and this for Poppler 0.72. - (("getCString") "c_str"))) - (find-files "scribus/plugins/import/pdf")) - #t)))) + "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target @@ -118,9 +65,9 @@ (modify-phases %standard-phases (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Fix "ImportError: No module named _sysconfigdata_nd" where - ;; Scribus checks PATH and eventually runs system's Python - ;; instead of package's. + ;; Fix "ImportError: No module named _sysconfigdata_nd" + ;; runtime error where Scribus checks PATH and eventually + ;; runs system's Python instead of package's. (let* ((out (assoc-ref outputs "out")) (py2 (assoc-ref inputs "python"))) (wrap-program (string-append out "/bin/scribus") @@ -161,12 +108,13 @@ (home-page "https://www.scribus.net") (synopsis "Desktop publishing and page layout program") (description - "Scribus is a @dfn{desktop publishing} (DTP) application and can be used -for many tasks; from brochure design to newspapers, magazines, newsletters and -posters to technical documentation. Scribus supports professional DTP -features, such as CMYK color and a color management system to soft proof -images for high quality color printing, flexible PDF creation options, -Encapsulated PostScript import/export and creation of four color separations, -import of EPS/PS and SVG as native vector graphics, Unicode text including -right to left scripts such as Arabic and Hebrew via freetype.") + "Scribus is a @dfn{desktop publishing} (DTP) application and can +be used for many tasks; from brochure design to newspapers, magazines, +newsletters and posters to technical documentation. Scribus supports +professional DTP features, such as CMYK color and a color management +system to soft proof images for high quality color printing, flexible +PDF creation options, Encapsulated PostScript import/export and +creation of four color separations, import of EPS/PS and SVG as native +vector graphics, Unicode text including right to left scripts such as +Arabic and Hebrew via FreeType.") (license license:gpl2+))) -- cgit v1.2.3 From 1ae2d3a11b0de1ae46e4123158d976961c92e756 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Aug 2019 12:52:47 +0200 Subject: gnu: emacs-relint: Update to 1.10. * gnu/packages/emacs-xyz.scm (emacs-relint): Update to 1.10. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cbb4c90c94..6e612cab56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -930,7 +930,7 @@ optional minor mode which can apply this command automatically on save.") (define-public emacs-relint (package (name "emacs-relint") - (version "1.8") + (version "1.10") (source (origin (method url-fetch) @@ -938,7 +938,7 @@ optional minor mode which can apply this command automatically on save.") "https://elpa.gnu.org/packages/relint-" version ".el")) (sha256 (base32 - "1bl6m2h7131acbmr0kqfnjjpv2syiv2mxfnm61g874ynnvkmmkm3")))) + "1l0lh4pkksw7brmhhbaikwzs4zkgd2962ks1zy7m262dvkhxjfv8")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xr" ,emacs-xr))) (home-page "https://github.com/mattiase/relint") -- cgit v1.2.3 From 55fe9abdcc517a3dbec788d5c6b005a9f231fbc5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Aug 2019 04:22:10 -0400 Subject: gnu: tremc: Update to 0.9.1-0.4d50dab. * gnu/packages/bittorrent.scm (tremc): Update to 0.9.1-0.4d50dab. --- gnu/packages/bittorrent.scm | 61 ++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 1e171dcb6a..0ab165cde4 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès -;;; Copyright © 2016, 2017, 2018 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Tomáš Čech ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -183,35 +183,38 @@ XML-RPC over SCGI.") (license l:gpl2+))) (define-public tremc - (package - (name "tremc") - (version "0.9.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tremc/tremc.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1yhwvlcyv1s830p5a7q5x3mkb3mbvr5cn5nh7y62l5b6iyyynlvm")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no test suite - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - ;; The software is just a Python script that must be copied into place. - (delete 'configure) - (delete 'build)))) - (inputs - `(("python" ,python))) - (synopsis "Console client for the Transmission BitTorrent daemon") - (description "Tremc is a console client, with a curses interface, for the + (let ((commit "4d50dab7376601daca13f7be6eabc0eaa057c1b0") + (revision "0")) + (package + (name "tremc") + (version (git-version "0.9.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tremc/tremc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qpi65n8rv7l9mg8qyqx70z83inkl8v5r5nks65c99lhscdki0w7")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; The software is just a Python script that must be copied into place. + (delete 'configure) + (delete 'build)))) + (inputs + `(("python" ,python))) + (synopsis "Console client for the Transmission BitTorrent daemon") + (description "Tremc is a console client, with a curses interface, for the Transmission BitTorrent daemon.") - (home-page "https://github.com/tremc/tremc") - (license l:gpl3+))) + (home-page "https://github.com/tremc/tremc") + (license l:gpl3+)))) (define-public transmission-remote-cli (package -- cgit v1.2.3 From ecab5e3529531d685e136bdbab9a739e287c7a82 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 13 Aug 2019 17:08:50 +0200 Subject: gnu: git: Update to 2.22.1. * gnu/packages/version-control.scm (git): Update to 2.22.1. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8121c96850..850bb82296 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.22.0") + (version "2.22.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm")))) + "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "0fpfqw0h4g4v478fscic8z714i0ls5w7946vzhmq31lf7nizsb2f")))) + "17vpqv9g8li58njx7z5124b3c2zb2n63z4dalh5gw9iys7qb8446")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From d08dc99fadb0a381f868a72098ff7d7197a2cd11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Aug 2019 18:19:43 +0200 Subject: gnu: mupdf: Update to 1.16.1. * gnu/packages/pdf.scm (mupdf): Update to 1.16.1. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index de447b9486..fad5635a90 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -604,7 +604,7 @@ extracting content or merging files.") (define-public mupdf (package (name "mupdf") - (version "1.15.0") + (version "1.16.1") (source (origin (method url-fetch) @@ -612,7 +612,7 @@ extracting content or merging files.") name "-" version "-source.tar.xz")) (sha256 (base32 - "0kmcz3ivxmqmks8vg50ri1zar18q5svk829z0g1kj08lgz7kcl2n")) + "1npmy92lkj41nnc14b4fpq7z62pminy94zsdbrczj22jpn283rvg")) (modules '((guix build utils))) (snippet ;; We keep lcms2 since it is different than our lcms. -- cgit v1.2.3 From ecfdc95a72127a5a156d4664d7dd4bac2ac2c7b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Aug 2019 18:20:03 +0200 Subject: gnu: zathura-pdf-mupdf: Update to 0.3.5. * gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.3.5. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index fad5635a90..d45a78222c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -419,7 +419,7 @@ using the DjVuLibre library.") (define-public zathura-pdf-mupdf (package (name "zathura-pdf-mupdf") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri @@ -427,7 +427,7 @@ using the DjVuLibre library.") "/download/zathura-pdf-mupdf-" version ".tar.xz")) (sha256 (base32 - "166d5nz47ixzwj4pixsd5fd9qvjf5v34cdqi3p72vr23pswk2hyn")))) + "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("jbig2dec" ,jbig2dec) -- cgit v1.2.3 From da926c2503a57a9ee2f79e82fca24070bbbcc2a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Aug 2019 18:20:26 +0200 Subject: gnu: ccid: Update to 1.4.31. * gnu/packages/security-token.scm (ccid): Update to 1.4.31. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 5fb75ce617..3d6ad4f9d7 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -64,7 +64,7 @@ (define-public ccid (package (name "ccid") - (version "1.4.30") + (version "1.4.31") (source (origin (method url-fetch) (uri (string-append @@ -72,7 +72,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc")))) + "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--enable-usbdropdir=" %output -- cgit v1.2.3 From fc34abf8c1b966f2312ff7bef41ff0186b28d6ff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Aug 2019 18:20:44 +0200 Subject: gnu: xapian: Update to 1.4.12. * gnu/packages/search.scm (xapian, python-xapian-bindings): Update to 1.4.12. --- gnu/packages/search.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 9b2876c359..d786ad08d9 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -49,14 +49,14 @@ (define-public xapian (package (name "xapian") - (version "1.4.11") + (version "1.4.12") ;; Note: When updating Xapian, remember to update xapian-bindings below. (source (origin (method url-fetch) (uri (string-append "https://oligarchy.co.uk/xapian/" version "/xapian-core-" version ".tar.xz")) (sha256 - (base32 "01xwqljnp5afjf9097lyfbqc6x5bcqszfdkn9l1j86imwbrv45lz")))) + (base32 "0z5c1y9vp519h2x2igjq39v6j615nppry0wasd0xn4hphgd3d2jg")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) ("util-linux" ,util-linux))) @@ -94,7 +94,7 @@ rich set of boolean query operators.") "/xapian-bindings-" version ".tar.xz")) (sha256 (base32 - "13bi2vr5d39ys49nlwmsv64ik5pdwkz28bh08hyylrhanb45d8wx")))) + "0j9awiiw9zf97r60m848absq43k37gghpyw7acxqjazfzd71fxvm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-python3") -- cgit v1.2.3 From 2b3a10b6b5f2a48665cf4bfa27525c4caca175d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Aug 2019 20:43:08 +0200 Subject: gnu: Remove leftover patch. This patch was rendered obsolete by the preceding merge. * gnu/packages/patches/scribus-poppler-0.73.patch: Delete file. --- gnu/packages/patches/scribus-poppler-0.73.patch | 36 ------------------------- 1 file changed, 36 deletions(-) delete mode 100644 gnu/packages/patches/scribus-poppler-0.73.patch diff --git a/gnu/packages/patches/scribus-poppler-0.73.patch b/gnu/packages/patches/scribus-poppler-0.73.patch deleted file mode 100644 index 5cf4cf721d..0000000000 --- a/gnu/packages/patches/scribus-poppler-0.73.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix build with Poppler 0.73. - -This is an amalgamation of these upstream commits: -https://github.com/scribusproject/scribus/commit/d34e59bfe495250ba023ba0f99e672ee32300a27 -https://github.com/scribusproject/scribus/commit/c43a89030026f8ffab5070b6935daee8bd74838a - -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index c46448b80a..4dac7c3983 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. - #include "selection.h" - #include "vgradient.h" - -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) - #include -+#endif - #include - #include - #include -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index f6b3950377..80ac796501 100644 ---- a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -37,4 +37,11 @@ for which a new license (GPL+exception) is in place. - #define getCString c_str - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0) -+#define Guchar unsigned char -+#define Gushort unsigned short -+#define Guint unsigned int -+#define Gulong unsigned long -+#endif -+ - #endif -- cgit v1.2.3 From 13f30b546d4bfe6120435e54d5e429a21451a490 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Sun, 11 Aug 2019 21:25:14 +1000 Subject: gnu: Add opensubdiv. * gnu/packages/graphics.scm (opensubdiv): New variable. Signed-off-by: Leo Famulari --- gnu/packages/graphics.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bc3a418e99..3290d99ede 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Alex Kost ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2019 Mark H Weaver +;;; Copyright © 2019 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -971,3 +972,47 @@ your terminal. It comes bundled with predefined styles: look. The result can be uploaded on any web server without additional requirements.") (license license:gpl2+))) + +(define-public opensubdiv + (package + (name "opensubdiv") + (version "3_4_0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PixarAnimationStudios/OpenSubdiv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12")))) + (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-glew-location + (lambda* (#:key inputs #:allow-other-keys) + (setenv "GLEW_LOCATION" (assoc-ref inputs "glew")) + #t)) + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") + #t))))) + (native-inputs + `(("xorg-server" ,xorg-server))) + (inputs + `(("glew" ,glew) + ("libxrandr" ,libxrandr) + ("libxcursor" ,libxcursor) + ("libxinerama" ,libxinerama) + ("libxi" ,libxi) + ("zlib" ,zlib) + ("glfw" ,glfw))) + (home-page "http://graphics.pixar.com/opensubdiv/") + (synopsis "High performance subdivision surface evaluation") + (description "OpenSubdiv is a set of libraries that implement high +performance subdivision surface (subdiv) evaluation on massively parallel CPU +and GPU architectures.") + (license license:asl2.0))) -- cgit v1.2.3 From 588a0a335d09311197352c7f49d5541ef2717cc8 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Mon, 12 Aug 2019 20:15:11 +1000 Subject: gnu: Blender: Use opensubdiv. Fixes . * gnu/packages/graphics.scm (blender)[inputs]: Add opensubdiv. [arguments]: Add "-DWITH_OPENSUBDIV=ON" to #:configure-flags. Signed-off-by: Leo Famulari --- gnu/packages/graphics.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 3290d99ede..ee56dae54e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -105,6 +105,7 @@ "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_JACK=ON" "-DWITH_MOD_OCEANSIM=ON" + "-DWITH_OPENSUBDIV=ON" "-DWITH_PYTHON_INSTALL=OFF" (string-append "-DPYTHON_LIBRARY=python" ,python-version "m") (string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python") @@ -140,6 +141,7 @@ ("libx11" ,libx11) ("openimageio" ,openimageio) ("openexr" ,openexr) + ("opensubdiv" ,opensubdiv) ("ilmbase" ,ilmbase) ("openjpeg" ,openjpeg) ("libjpeg" ,libjpeg) -- cgit v1.2.3 From 4afdb792497472b968d818a3ed942beb70210389 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 13 Aug 2019 22:34:57 -0500 Subject: gnu: onionshare: Upgrade to 2.1. * gnu/packages/tor.scm (onionshare): Upgrade to 2.1. [arguments]: Rename "tests" phase to "check". Set home directory for tests. Remove reference to closed upstream bug. [inputs]: Add python-pycrypto and python-pysocks. [license]: Remove bsd-3 license; relevant file no longer present. --- gnu/packages/tor.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 8b5e8032ad..c330c853d5 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018 Eric Bavier +;;; Copyright © 2017, 2018, 2019 Eric Bavier ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus ;;; @@ -39,6 +39,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -157,7 +158,7 @@ networks.") (define-public onionshare (package (name "onionshare") - (version "1.3.2") + (version "2.1") (source (origin (method git-fetch) @@ -166,7 +167,7 @@ networks.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19zrz9kh7k4pdk4lh3cm0kv02ngdqkrggwma1xdskrrmp2rjkgz7")))) + (base32 "1lx21p12888qnbhsyin4lrnn4xizb39ldk77r71y53hn8mfxi54z")))) (build-system python-build-system) (arguments `(#:phases @@ -184,20 +185,21 @@ networks.") (("/usr") out)) #t))) (delete 'check) - (add-before 'strip 'tests + (add-before 'strip 'check ;; After all the patching we run the tests after installing. - ;; This is also a known issue: - ;; https://github.com/micahflee/onionshare/issues/284 (lambda _ - (invoke "pytest" "test") + (setenv "HOME" "/tmp") ; Some tests need a writable homedir + (invoke "pytest" "tests/") #t))))) (native-inputs `(("python-pytest" ,python-pytest))) (inputs - `(("python-flask" ,python-flask) + `(("python-pycrypto" ,python-pycrypto) + ("python-flask" ,python-flask) ("python-nautilus" ,python-nautilus) ("python-sip" ,python-sip) ("python-stem" ,python-stem) + ("python-pysocks" ,python-pysocks) ("python-pyqt" ,python-pyqt))) (home-page "https://onionshare.org/") (synopsis "Securely and anonymously share files") @@ -209,8 +211,7 @@ using a third party filesharing service. You host the file on your own computer and use a Tor hidden service to make it temporarily accessible over the internet. The other user just needs to use Tor Browser to download the file from you.") - (license (list license:gpl3+ - license:bsd-3)))) ; onionshare/socks.py + (license license:gpl3+))) (define-public nyx (package -- cgit v1.2.3 From 67dac6b8920755cb011047157bb7b4fae4760143 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Wed, 14 Aug 2019 13:46:53 -0400 Subject: gnu: mingw: Add x86_64 support. This patch parameterizes previously hard-coded instances of i686-w64-mingw32, adding support for x86_64-w64-mingw32. * gnu/packages/mingw.scm (make-mingw-w64): New procedure. (mingw-w64-i686, mingw-w64-x86_64): New variables. (%mingw-triplet): Remove. (mingw-w64): Update to point to 'mingw-w64-i686'. * gnu/packages/cross-base.scm (cross-gcc): Use 'libc' keyword argument if specified, instead of treating it as a boolean. (native-libc): Return the correct mingw-w64 depending on machine specified in target. * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add "x86_64-mingw". * gnu/build/cross-toolchain.scm (set-cross-path/mingw): Replace hardcoded 'i686-w64-mingw32' instances with 'target' keyword argument. (cross-gcc-build-phases): Update accordingly; use 'target-mingw?' implementation of target checking and add commentary. * gnu/ci.scm (%cross-targets): Add "x86_64-w64-mingw32". --- gnu/build/cross-toolchain.scm | 15 ++++-- gnu/ci.scm | 3 +- gnu/packages/bootstrap.scm | 2 + gnu/packages/cross-base.scm | 6 ++- gnu/packages/mingw.scm | 111 +++++++++++++++++++++++------------------- 5 files changed, 78 insertions(+), 59 deletions(-) diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index d430b8afc4..201b36ff7c 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis +;;; Copyright © 2019 Carl Dong ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,7 +96,7 @@ C_INCLUDE_PATH et al." ;; We're building the sans-libc cross-compiler, so nothing to do. #t))) -(define* (set-cross-path/mingw #:key inputs #:allow-other-keys) +(define* (set-cross-path/mingw #:key inputs target #:allow-other-keys) "Add the cross MinGW headers to CROSS_C_*_INCLUDE_PATH, and remove them from C_*INCLUDE_PATH." (let ((libc (assoc-ref inputs "libc")) @@ -112,7 +113,7 @@ C_*INCLUDE_PATH." (if libc (let ((cpath (string-append libc "/include" - ":" libc "/i686-w64-mingw32/include"))) + ":" libc "/" target "/include"))) (for-each (cut setenv <> cpath) %gcc-cross-include-paths)) @@ -142,7 +143,7 @@ C_*INCLUDE_PATH." (when libc (setenv "CROSS_LIBRARY_PATH" (string-append libc "/lib" - ":" libc "/i686-w64-mingw32/lib"))) + ":" libc "/" target "/lib"))) (setenv "CPP" (string-append gcc "/bin/cpp")) (for-each (lambda (var) @@ -168,8 +169,12 @@ C_*INCLUDE_PATH." a target triplet." (modify-phases phases (add-before 'configure 'set-cross-path - (if (string-contains target "mingw") - set-cross-path/mingw + ;; This mingw32 target checking logic should match that of target-mingw? + ;; in (guix utils), but (guix utils) is too large too copy over to the + ;; build side entirely and for now we have no way to select variables to + ;; copy over. See (gnu packages cross-base) for more details. + (if (string-suffix? "-mingw32" target) + (cut set-cross-path/mingw #:target target <...>) set-cross-path)) (add-after 'install 'make-cross-binutils-visible (cut make-cross-binutils-visible #:target target <...>)) diff --git a/gnu/ci.scm b/gnu/ci.scm index 4885870e16..aeebd4f14b 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -130,7 +130,8 @@ SYSTEM." "aarch64-linux-gnu" "powerpc-linux-gnu" "i586-pc-gnu" ;aka. GNU/Hurd - "i686-w64-mingw32")) + "i686-w64-mingw32" + "x86_64-w64-mingw32")) (define %guixsd-supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 5030b815b9..cd99425379 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2019 Carl Dong ;;; ;;; This file is part of GNU Guix. ;;; @@ -187,6 +188,7 @@ return value is ignored." ((string=? system "avr") "no-ld.so") ((string=? system "propeller-elf") "no-ld.so") ((string=? system "i686-mingw") "no-ld.so") + ((string=? system "x86_64-mingw") "no-ld.so") ((string=? system "vc4-elf") "no-ld.so") (else (error "dynamic linker name not known for this system" diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index a0341ebc5d..e277139f25 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Carl Dong ;;; ;;; This file is part of GNU Guix. ;;; @@ -249,7 +250,7 @@ target that libc." (cond ((target-mingw? target) (if libc - `(("libc" ,mingw-w64) + `(("libc" ,libc) ,@inputs) `(("mingw-source" ,(package-source mingw-w64)) ,@inputs))) @@ -509,7 +510,8 @@ and the cross tool chain." #:optional (libc glibc)) (if (target-mingw? target) - mingw-w64 + (let ((machine (substring target 0 (string-index target #\-)))) + (make-mingw-w64 machine)) libc)) (define* (cross-newlib? target diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 3e96f2c475..017f9453ab 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Carl Dong ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,56 +32,56 @@ #:use-module (guix utils) #:use-module (ice-9 match)) -(define %mingw-triplet - "i686-w64-mingw32") - -(define-public mingw-w64 - (package - (name "mingw-w64") - (version "5.0.4") - (source (origin - (method url-fetch) - (uri (string-append - "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" - "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) - (sha256 - (base32 "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm")) - (patches (search-patches "mingw-w64-5.0rc2-gcc-4.9.3.patch")))) - (native-inputs `(("xgcc-core" ,(cross-gcc %mingw-triplet)) - ("xbinutils" ,(cross-binutils %mingw-triplet)))) - (build-system gnu-build-system) - (search-paths - (list (search-path-specification - (variable "CROSS_C_INCLUDE_PATH") - (files '("include" "i686-w64-mingw32/include"))) - (search-path-specification - (variable "CROSS_LIBRARY_PATH") - (files - '("lib" "lib64" "i686-w64-mingw32/lib" "i686-w64-mingw32/lib64"))))) - (arguments - `(#:configure-flags '("--host=i686-w64-mingw32") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda* (#:key inputs #:allow-other-keys) - (let ((xgcc-core (assoc-ref inputs "xgcc-core")) - (mingw-headers (string-append (getcwd) "/mingw-w64-headers"))) - (setenv "CPP" - (string-append xgcc-core "/bin/i686-w64-mingw32-cpp")) - (setenv "CROSS_C_INCLUDE_PATH" - (string-append - mingw-headers - ":" mingw-headers "/include" - ":" mingw-headers "/crt" - ":" mingw-headers "/defaults/include" - ":" mingw-headers "/direct-x/include")))))) - #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") - #:tests? #f ; compiles and includes glibc headers - #:strip-binaries? #f)) - (home-page "https://mingw-w64.org") - (synopsis "Minimalist GNU for Windows") - (description - "Minimalist GNU for Windows (@dfn{MinGW}) is a complete software +(define-public (make-mingw-w64 machine) + (let ((triplet (string-append machine "-" "w64-mingw32"))) + (package + (name (string-append "mingw-w64" "-" machine)) + (version "5.0.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" + "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) + (sha256 + (base32 "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm")) + (patches (search-patches "mingw-w64-5.0rc2-gcc-4.9.3.patch")))) + (native-inputs `(("xgcc-core" ,(cross-gcc triplet)) + ("xbinutils" ,(cross-binutils triplet)))) + (build-system gnu-build-system) + (search-paths + (list (search-path-specification + (variable "CROSS_C_INCLUDE_PATH") + (files `("include" ,(string-append triplet "/include")))) + (search-path-specification + (variable "CROSS_LIBRARY_PATH") + (files + `("lib" "lib64" + ,(string-append triplet "/lib") + ,(string-append triplet "/lib64")))))) + (arguments + `(#:configure-flags '(,(string-append "--host=" triplet)) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda* (#:key inputs #:allow-other-keys) + (let ((xgcc-core (assoc-ref inputs "xgcc-core")) + (mingw-headers (string-append (getcwd) "/mingw-w64-headers"))) + (setenv "CPP" + (string-append xgcc-core ,(string-append "/bin/" triplet "-cpp"))) + (setenv "CROSS_C_INCLUDE_PATH" + (string-append + mingw-headers + ":" mingw-headers "/include" + ":" mingw-headers "/crt" + ":" mingw-headers "/defaults/include" + ":" mingw-headers "/direct-x/include")))))) + #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") + #:tests? #f ; compiles and includes glibc headers + #:strip-binaries? #f)) + (home-page "https://mingw-w64.org") + (synopsis "Minimalist GNU for Windows") + (description + "Minimalist GNU for Windows (@dfn{MinGW}) is a complete software development environment for creating native Microsoft Windows applications. It includes a set of Windows-specific header files and static import libraries @@ -89,4 +90,12 @@ runtime dynamic-link libraries (@dfn{DLL}s). Mingw-w64 is an advancement of the original mingw.org project and provides several new APIs such as DirectX and DDK, and 64-bit support.") - (license license:fdl1.3+))) + (license license:fdl1.3+)))) + +(define-public mingw-w64-i686 + (make-mingw-w64 "i686")) + +(define-public mingw-w64-x86_64 + (make-mingw-w64 "x86_64")) + +(define-public mingw-w64 mingw-w64-i686) -- cgit v1.2.3 From 2c8e04f13670c8c7ad8c7195c305960dd1905363 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Fri, 9 Aug 2019 14:24:57 -0400 Subject: remote: Build derivations appropriate for the remote's * gnu/machine/ssh.scm (machine-ssh-configuration): Add 'system' field. (managed-host-remote-eval): Pass 'system' field to 'remote-eval'. (machine-check-building-for-appropriate-system): New variable. (check-deployment-sanity): Add call to 'machine-check-building-for-appropriate-system'. * doc/guix.texi (Invoking guix deploy): Describe new 'system' field. * guix/ssh.scm (remote-system): New variable. * guix/remote.scm (remote-eval): Use result of 'remote-system' when lowering the G-Expression. (remote-eval): Add 'system' keyword argument. (trampoline): Return a rather than a . --- doc/guix.texi | 3 +++ gnu/machine/ssh.scm | 31 +++++++++++++++++++++++++++---- guix/remote.scm | 14 +++++++++----- guix/ssh.scm | 7 +++++++ 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 734206a4b2..a7facf4701 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25573,6 +25573,9 @@ with an @code{environment} of @code{managed-host-environment-type}. @table @asis @item @code{host-name} +@item @code{system} +The Nix system type describing the architecture of the machine being deployed +to. This should look something like ``x86_64-linux''. @item @code{port} (default: @code{22}) @item @code{user} (default: @code{"root"}) @item @code{identity} (default: @code{#f}) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index ba3e33c922..670990a633 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -36,6 +36,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:export (managed-host-environment-type @@ -68,6 +69,7 @@ machine-ssh-configuration? this-machine-ssh-configuration (host-name machine-ssh-configuration-host-name) ; string + (system machine-ssh-configuration-system) ; string (build-locally? machine-ssh-configuration-build-locally? (default #t)) (port machine-ssh-configuration-port ; integer @@ -103,10 +105,12 @@ one from the configuration's parameters if one was not provided." "Internal implementation of 'machine-remote-eval' for MACHINE instances with an environment type of 'managed-host." (maybe-raise-unsupported-configuration-error machine) - (remote-eval exp (machine-ssh-session machine) - #:build-locally? - (machine-ssh-configuration-build-locally? - (machine-configuration machine)))) + (let ((config (machine-configuration machine))) + (remote-eval exp (machine-ssh-session machine) + #:build-locally? + (machine-ssh-configuration-build-locally? config) + #:system + (machine-ssh-configuration-system config)))) ;;; @@ -240,10 +244,29 @@ MACHINE's 'system' declaration do not exist on the machine." device) (return #t))) +(define (machine-check-building-for-appropriate-system machine) + "Raise a '&message' error condition if MACHINE is configured to be built +locally and the 'system' field does not match the '%current-system' reported +by MACHINE." + (let ((config (machine-configuration machine)) + (system (remote-system (machine-ssh-session machine)))) + (when (and (machine-ssh-configuration-build-locally? config) + (not (string= system (machine-ssh-configuration-system config)))) + (raise (condition + (&message + (message (format #f (G_ "incorrect target system \ +('~a' was given, while the system reports that it is '~a')~%") + (machine-ssh-configuration-system config) + system))))))) + (with-monad %store-monad (return #t))) + (define (check-deployment-sanity machine) "Raise a '&message' error condition if it is clear that deploying MACHINE's 'system' declaration would fail." + ;; Order is important here -- an incorrect value for 'system' will cause + ;; invocations of 'remote-eval' to fail. (mbegin %store-monad + (machine-check-building-for-appropriate-system machine) (machine-check-file-system-availability machine) (machine-check-initrd-modules machine))) diff --git a/guix/remote.scm b/guix/remote.scm index 5fecd954e9..bcac64ea7a 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -24,6 +24,7 @@ #:use-module (guix monads) #:use-module (guix modules) #:use-module (guix derivations) + #:use-module (guix utils) #:use-module (ssh popen) #:use-module (srfi srfi-1) #:use-module (ice-9 match) @@ -71,7 +72,7 @@ prerequisites of EXP are already available on the host at SESSION." "Return a \"trampoline\" gexp that evaluates EXP and writes the evaluation result to the current output port using the (guix repl) protocol." (define program - (scheme-file "remote-exp.scm" exp)) + (program-file "remote-exp.scm" exp)) (with-imported-modules (source-module-closure '((guix repl))) #~(begin @@ -89,6 +90,7 @@ result to the current output port using the (guix repl) protocol." (define* (remote-eval exp session #:key (build-locally? #t) + (system (%current-system)) (module-path %load-path) (socket-name "/var/guix/daemon-socket/socket")) "Evaluate EXP, a gexp, on the host at SESSION, an SSH session. Ensure that @@ -96,10 +98,12 @@ all the elements EXP refers to are built and deployed to SESSION beforehand. When BUILD-LOCALLY? is true, said dependencies are built locally and sent to the remote store afterwards; otherwise, dependencies are built directly on the remote store." - (mlet %store-monad ((lowered (lower-gexp (trampoline exp) - #:module-path %load-path)) - (remote -> (connect-to-remote-daemon session - socket-name))) + (mlet* %store-monad ((lowered (lower-gexp (trampoline exp) + #:system system + #:guile-for-build #f + #:module-path %load-path)) + (remote -> (connect-to-remote-daemon session + socket-name))) (define inputs (cons (lowered-gexp-guile lowered) (lowered-gexp-inputs lowered))) diff --git a/guix/ssh.scm b/guix/ssh.scm index ede00133c8..9b5ca68894 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -39,6 +39,7 @@ remote-inferior remote-daemon-channel connect-to-remote-daemon + remote-system send-files retrieve-files retrieve-files* @@ -282,6 +283,12 @@ be read. When RECURSIVE? is true, the closure of FILES is exported." ,(object->string (object->string export)))))) +(define (remote-system session) + "Return the system type as expected by Nix, usually ARCHITECTURE-KERNEL, of +the machine on the other end of SESSION." + (inferior-remote-eval '(begin (use-modules (guix utils)) (%current-system)) + session)) + (define* (send-files local files remote #:key recursive? -- cgit v1.2.3 From 03cbd94d4880f1bb55d98907b48396e5120c1733 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Fri, 9 Aug 2019 14:25:54 -0400 Subject: remote: Remove '--system' argument. * gnu/services.scm (activation-script): Return a rather than a . * gnu/deploy.scm (guix-deploy): Remove handling for '--system'. (show-help): Remove documentation for '--system'. (%default-options): Remove default setting for 'system'. --- gnu/services.scm | 56 ++++++++++++++++++++++++------------------------- guix/scripts/deploy.scm | 8 ++----- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 7de78105ff..6ee05d4580 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -430,34 +430,34 @@ ACTIVATION-SCRIPT-TYPE." (define (activation-script gexps) "Return the system's activation script, which evaluates GEXPS." (define actions - (map (cut scheme-file "activate-service" <>) gexps)) - - (scheme-file "activate" - (with-imported-modules (source-module-closure - '((gnu build activation) - (guix build utils))) - #~(begin - (use-modules (gnu build activation) - (guix build utils)) - - ;; Make sure the user accounting database exists. If it - ;; does not exist, 'setutxent' does not create it and - ;; thus there is no accounting at all. - (close-port (open-file "/var/run/utmpx" "a0")) - - ;; Same for 'wtmp', which is populated by mingetty et - ;; al. - (mkdir-p "/var/log") - (close-port (open-file "/var/log/wtmp" "a0")) - - ;; Set up /run/current-system. Among other things this - ;; sets up locales, which the activation snippets - ;; executed below may expect. - (activate-current-system) - - ;; Run the services' activation snippets. - ;; TODO: Use 'load-compiled'. - (for-each primitive-load '#$actions))))) + (map (cut program-file "activate-service.scm" <>) gexps)) + + (program-file "activate.scm" + (with-imported-modules (source-module-closure + '((gnu build activation) + (guix build utils))) + #~(begin + (use-modules (gnu build activation) + (guix build utils)) + + ;; Make sure the user accounting database exists. If it + ;; does not exist, 'setutxent' does not create it and + ;; thus there is no accounting at all. + (close-port (open-file "/var/run/utmpx" "a0")) + + ;; Same for 'wtmp', which is populated by mingetty et + ;; al. + (mkdir-p "/var/log") + (close-port (open-file "/var/log/wtmp" "a0")) + + ;; Set up /run/current-system. Among other things this + ;; sets up locales, which the activation snippets + ;; executed below may expect. + (activate-current-system) + + ;; Run the services' activation snippets. + ;; TODO: Use 'load-compiled'. + (for-each primitive-load '#$actions))))) (define (gexps->activation-gexp gexps) "Return a gexp that runs the activation script containing GEXPS." diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index ebc99e52cc..81f2b33260 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -43,8 +43,6 @@ (define (show-help) (display (G_ "Usage: guix deploy [OPTION] FILE... Perform the deployment specified by FILE.\n")) - (display (G_ " - -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"")) (show-build-options-help) (newline) (display (G_ " @@ -66,8 +64,7 @@ Perform the deployment specified by FILE.\n")) %standard-build-options)) (define %default-options - `((system . ,(%current-system)) - (substitutes? . #t) + `((substitutes? . #t) (build-hook? . #t) (graft? . #t) (debug . 0) @@ -92,7 +89,6 @@ Perform the deployment specified by FILE.\n")) (set-build-options-from-command-line store opts) (for-each (lambda (machine) (info (G_ "deploying to ~a...") (machine-display-name machine)) - (parameterize ((%current-system (assq-ref opts 'system)) - (%graft? (assq-ref opts 'graft?))) + (parameterize ((%graft? (assq-ref opts 'graft?))) (run-with-store store (deploy-machine machine)))) machines)))) -- cgit v1.2.3 From 5c3f1e4306f252c7dc397ac765caa288a57f99f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Aug 2019 22:25:30 +0200 Subject: gnu: sssd: Update to 1.16.4. * gnu/packages/patches/sssd-curl-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/sssd.scm (sssd): Update to 1.16.4. [source](patches): Remove. [arguments]: Enable fixed tests. --- gnu/local.mk | 1 - gnu/packages/patches/sssd-curl-compat.patch | 18 ------------------ gnu/packages/sssd.scm | 9 ++------- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 gnu/packages/patches/sssd-curl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c6962aebd1..08bc205623 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1309,7 +1309,6 @@ dist_patch_DATA = \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ - %D%/packages/patches/sssd-curl-compat.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/strace-ipc-tests.patch \ %D%/packages/patches/streamlink-update-test.patch \ diff --git a/gnu/packages/patches/sssd-curl-compat.patch b/gnu/packages/patches/sssd-curl-compat.patch deleted file mode 100644 index ecab737153..0000000000 --- a/gnu/packages/patches/sssd-curl-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix build with curl >= 7.62. Patch taken from upstream: - -https://pagure.io/SSSD/sssd/c/4d3841ca379afc01184453ba45ab3e75ffec60da?branch=sssd-1-16 - -diff --git a/src/util/tev_curl.c b/src/util/tev_curl.c -index 6a7a580..d70a429 100644 ---- a/src/util/tev_curl.c -+++ b/src/util/tev_curl.c -@@ -97,7 +97,9 @@ static errno_t curl_code2errno(CURLcode crv) - return ETIMEDOUT; - case CURLE_SSL_ISSUER_ERROR: - case CURLE_SSL_CACERT_BADFILE: -+#if LIBCURL_VERSION_NUM < 0x073e00 - case CURLE_SSL_CACERT: -+#endif - case CURLE_SSL_CERTPROBLEM: - return ERR_INVALID_CERT; - diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm index 6d6caab0ad..7bb71dce13 100644 --- a/gnu/packages/sssd.scm +++ b/gnu/packages/sssd.scm @@ -81,15 +81,14 @@ fundamental object types for C.") (define-public sssd (package (name "sssd") - (version "1.16.2") + (version "1.16.4") (source (origin (method url-fetch) (uri (string-append "http://releases.pagure.org/SSSD/sssd/" "sssd-" version ".tar.gz")) - (patches (search-patches "sssd-curl-compat.patch")) (sha256 (base32 - "032ppk57qs1lnvz7pb7lw9ldwm9i1yagh9fzgqgn6na3bg61ynzy")))) + "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -130,10 +129,6 @@ fundamental object types for C.") (lambda _ (substitute* "src/tests/responder_socket_access-tests.c" (("tcase_add_test\\(tc_utils, resp_str_to_array_test\\);") "")) - ;; XXX: These tests fail with recent versions of ldb. See - ;; . - (substitute* "Makefile.in" - (("sysdb-tests\\$\\(EXEEXT\\)") "")) #t))))) (inputs `(("augeas" ,augeas) -- cgit v1.2.3 From ab4561489e9e3a07be121582160df128e38a44e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 14 Aug 2019 22:25:37 +0200 Subject: gnu: ruby-nio4r: Update to 2.4.0. * gnu/packages/ruby.scm (ruby-nio4r): Update to 2.4.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1b70f842ae..1efd2925f1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8453,14 +8453,14 @@ interface over different adapters.") (define-public ruby-nio4r (package (name "ruby-nio4r") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (rubygems-uri "nio4r" version)) (sha256 (base32 - "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr")))) + "0v2cpqmw6dmysa91ffzl736kgjjzmnf4xlgz6g16fk4yqhn71340")))) (build-system ruby-build-system) (arguments '(#:phases -- cgit v1.2.3 From 5ea7537b9a650cfa525401c19879080a9cf42e13 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Thu, 15 Aug 2019 04:05:04 -0400 Subject: machine: Allow non-root users to deploy. * doc/guix.texi (Invoking guix deploy): Add section describing prerequisites for deploying as a non-root user. * guix/remote.scm (remote-pipe-for-gexp): New optional 'become-command' argument. (%remote-eval): New optional 'become-command' argument. (remote-eval): New 'become-command' keyword argument. * guix/ssh.scm (remote-inferior): New optional 'become-command' argument. (inferior-remote-eval): New optional 'become-command' argument. (remote-authorize-signing-key): New optional 'become-command' argument. * gnu/machine/ssh.scm (machine-become-command): New variable. (managed-host-remote-eval): Invoke 'remote-eval' with the '#:become-command' keyword. (deploy-managed-host): Invoke 'remote-authorize-signing-key' with the '#:become-command' keyword. --- doc/guix.texi | 10 ++++++++++ gnu/machine/ssh.scm | 8 ++++++++ guix/remote.scm | 57 +++++++++++++++++++++++++++++++++-------------------- guix/ssh.scm | 25 ++++++++++++++++------- 4 files changed, 72 insertions(+), 28 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a7facf4701..e5cec7ad25 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25514,6 +25514,7 @@ evaluates to. As an example, @var{file} might contain a definition like this: (environment managed-host-environment-type) (configuration (machine-ssh-configuration (host-name "localhost") + (user "alice") (identity "./id_rsa") (port 2222))))) @end example @@ -25546,6 +25547,15 @@ accepts store items it receives from the coordinator: # guix archive --authorize < coordinator-public-key.txt @end example +@code{user}, in this example, specifies the name of the user account to log in +as to perform the deployment. Its default value is @code{root}, but root +login over SSH may be forbidden in some cases. To work around this, +@command{guix deploy} can log in as an unprivileged user and employ +@code{sudo} to escalate privileges. This will only work if @code{sudo} is +currently installed on the remote and can be invoked non-interactively as +@code{user}. That is: the line in @code{sudoers} granting @code{user} the +ability to use @code{sudo} must contain the @code{NOPASSWD} tag. + @deftp {Data Type} machine This is the data type representing a single machine in a heterogeneous Guix deployment. diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 670990a633..fb15d39e61 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -101,6 +101,14 @@ one from the configuration's parameters if one was not provided." ;;; Remote evaluation. ;;; +(define (machine-become-command machine) + "Return as a list of strings the program and arguments necessary to run a +shell command with escalated privileges for MACHINE's configuration." + (if (string= "root" (machine-ssh-configuration-user + (machine-configuration machine))) + '() + '("/run/setuid-programs/sudo" "-n" "--"))) + (define (managed-host-remote-eval machine exp) "Internal implementation of 'machine-remote-eval' for MACHINE instances with an environment type of 'managed-host." diff --git a/guix/remote.scm b/guix/remote.scm index bcac64ea7a..d8124e41ab 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -27,6 +27,8 @@ #:use-module (guix utils) #:use-module (ssh popen) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:export (remote-eval)) @@ -41,29 +43,41 @@ ;;; ;;; Code: -(define (remote-pipe-for-gexp lowered session) - "Return a remote pipe for the given SESSION to evaluate LOWERED." +(define* (remote-pipe-for-gexp lowered session #:optional become-command) + "Return a remote pipe for the given SESSION to evaluate LOWERED. If +BECOME-COMMAND is given, use that to invoke the remote Guile REPL." (define shell-quote (compose object->string object->string)) - (apply open-remote-pipe* session OPEN_READ - (string-append (derivation-input-output-path - (lowered-gexp-guile lowered)) - "/bin/guile") - "--no-auto-compile" - (append (append-map (lambda (directory) - `("-L" ,directory)) - (lowered-gexp-load-path lowered)) - (append-map (lambda (directory) - `("-C" ,directory)) - (lowered-gexp-load-path lowered)) - `("-c" - ,(shell-quote (lowered-gexp-sexp lowered)))))) + (define repl-command + (append (or become-command '()) + (list + (string-append (derivation-input-output-path + (lowered-gexp-guile lowered)) + "/bin/guile") + "--no-auto-compile") + (append-map (lambda (directory) + `("-L" ,directory)) + (lowered-gexp-load-path lowered)) + (append-map (lambda (directory) + `("-C" ,directory)) + (lowered-gexp-load-path lowered)) + `("-c" + ,(shell-quote (lowered-gexp-sexp lowered))))) -(define (%remote-eval lowered session) + (let ((pipe (apply open-remote-pipe* session OPEN_READ repl-command))) + (when (eof-object? (peek-char pipe)) + (raise (condition + (&message + (message (format #f (G_ "failed to run '~{~a~^ ~}'") + repl-command)))))) + pipe)) + +(define* (%remote-eval lowered session #:optional become-command) "Evaluate LOWERED, a lowered gexp, in SESSION. This assumes that all the -prerequisites of EXP are already available on the host at SESSION." - (let* ((pipe (remote-pipe-for-gexp lowered session)) +prerequisites of EXP are already available on the host at SESSION. If +BECOME-COMMAND is given, use that to invoke the remote Guile REPL." + (let* ((pipe (remote-pipe-for-gexp lowered session become-command)) (result (read-repl-response pipe))) (close-port pipe) result)) @@ -92,7 +106,8 @@ result to the current output port using the (guix repl) protocol." (build-locally? #t) (system (%current-system)) (module-path %load-path) - (socket-name "/var/guix/daemon-socket/socket")) + (socket-name "/var/guix/daemon-socket/socket") + (become-command #f)) "Evaluate EXP, a gexp, on the host at SESSION, an SSH session. Ensure that all the elements EXP refers to are built and deployed to SESSION beforehand. When BUILD-LOCALLY? is true, said dependencies are built locally and sent to @@ -119,7 +134,7 @@ remote store." (built-derivations inputs) ((store-lift send-files) to-send remote #:recursive? #t) (return (close-connection remote)) - (return (%remote-eval lowered session)))) + (return (%remote-eval lowered session become-command)))) (let ((to-send (append (map (compose derivation-file-name derivation-input-derivation) inputs) @@ -128,4 +143,4 @@ remote store." ((store-lift send-files) to-send remote #:recursive? #t) (return (build-derivations remote inputs)) (return (close-connection remote)) - (return (%remote-eval lowered session))))))) + (return (%remote-eval lowered session become-command))))))) diff --git a/guix/ssh.scm b/guix/ssh.scm index 9b5ca68894..90311127a1 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -98,16 +98,27 @@ specifies; otherwise use them. Throw an error on failure." (message (format #f (G_ "SSH connection to '~a' failed: ~a~%") host (get-error session)))))))))) -(define (remote-inferior session) - "Return a remote inferior for the given SESSION." - (let ((pipe (open-remote-pipe* session OPEN_BOTH - "guix" "repl" "-t" "machine"))) +(define* (remote-inferior session #:optional become-command) + "Return a remote inferior for the given SESSION. If BECOME-COMMAND is +given, use that to invoke the remote Guile REPL." + (let* ((repl-command (append (or become-command '()) + '("guix" "repl" "-t" "machine"))) + (pipe (apply open-remote-pipe* session OPEN_BOTH repl-command))) + ;; XXX: 'channel-get-exit-status' would be better here, but hangs if the + ;; process does succeed. This doesn't reflect the documentation, so it's + ;; possible that it's a bug in guile-ssh. + (when (eof-object? (peek-char pipe)) + (raise (condition + (&message + (message (format #f (G_ "failed to run '~{~a~^ ~}'") + repl-command)))))) (port->inferior pipe))) -(define (inferior-remote-eval exp session) +(define* (inferior-remote-eval exp session #:optional become-command) "Evaluate EXP in a new inferior running in SESSION, and close the inferior -right away." - (let ((inferior (remote-inferior session))) +right away. If BECOME-COMMAND is given, use that to invoke the remote Guile +REPL." + (let ((inferior (remote-inferior session become-command))) (dynamic-wind (const #t) (lambda () -- cgit v1.2.3 From 9c70c460a05b2bc60f3f3602f0a2dba0f79ce86c Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Thu, 15 Aug 2019 04:05:57 -0400 Subject: machine: Implement 'roll-back-machine'. * gnu/machine.scm (roll-back-machine, &deploy-error, deploy-error?) (deploy-error-should-roll-back) (deploy-error-captured-args): New variable. * gnu/machine/ssh.scm (roll-back-managed-host): New variable. * guix/scripts/deploy.scm (guix-deploy): Roll-back systems when a deployment fails. --- gnu/machine.scm | 27 ++++++++++++++++++- gnu/machine/ssh.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++--- guix/scripts/deploy.scm | 17 ++++++++++-- 3 files changed, 110 insertions(+), 6 deletions(-) diff --git a/gnu/machine.scm b/gnu/machine.scm index 30ae97f6ec..05b03b21d4 100644 --- a/gnu/machine.scm +++ b/gnu/machine.scm @@ -24,6 +24,7 @@ #:use-module (guix records) #:use-module (guix store) #:use-module ((guix utils) #:select (source-properties->location)) + #:use-module (srfi srfi-35) #:export (environment-type environment-type? environment-type-name @@ -40,7 +41,13 @@ machine-display-name deploy-machine - machine-remote-eval)) + roll-back-machine + machine-remote-eval + + &deploy-error + deploy-error? + deploy-error-should-roll-back + deploy-error-captured-args)) ;;; Commentary: ;;; @@ -66,6 +73,7 @@ ;; of the form '(machine-remote-eval machine exp)'. (machine-remote-eval environment-type-machine-remote-eval) ; procedure (deploy-machine environment-type-deploy-machine) ; procedure + (roll-back-machine environment-type-roll-back-machine) ; procedure ;; Metadata. (name environment-type-name) ; symbol @@ -105,3 +113,20 @@ are built and deployed to MACHINE beforehand." MACHINE, activating it on MACHINE and switching MACHINE to the new generation." (let ((environment (machine-environment machine))) ((environment-type-deploy-machine environment) machine))) + +(define (roll-back-machine machine) + "Monadic procedure rolling back to the previous system generation on +MACHINE. Return the number of the generation that was current before switching +and the new generation number." + (let ((environment (machine-environment machine))) + ((environment-type-roll-back-machine environment) machine))) + + +;;; +;;; Error types. +;;; + +(define-condition-type &deploy-error &error + deploy-error? + (should-roll-back deploy-error-should-roll-back) + (captured-args deploy-error-captured-args)) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index fb15d39e61..4b5d5fe3a2 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu machine ssh) + #:use-module (gnu bootloader) #:use-module (gnu machine) #:autoload (gnu packages gnupg) (guile-gcrypt) #:use-module (gnu system) @@ -34,6 +35,7 @@ #:use-module (guix store) #:use-module (guix utils) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -341,6 +343,18 @@ of MACHINE's system profile, ordered from most recent to oldest." (boot-parameters-kernel-arguments params)))))))) generations)))) +(define-syntax-rule (with-roll-back should-roll-back? mbody ...) + "Catch exceptions that arise when binding MBODY, a monadic expression in +%STORE-MONAD, and collect their arguments in a &deploy-error condition, with +the 'should-roll-back' field set to SHOULD-ROLL-BACK?" + (catch #t + (lambda () + mbody ...) + (lambda args + (raise (condition (&deploy-error + (should-roll-back should-roll-back?) + (captured-args args))))))) + (define (deploy-managed-host machine) "Internal implementation of 'deploy-machine' for MACHINE instances with an environment type of 'managed-host." @@ -353,9 +367,60 @@ environment type of 'managed-host." (bootloader-configuration (operating-system-bootloader os)) (bootcfg (operating-system-bootcfg os menu-entries))) (mbegin %store-monad - (switch-to-system eval os) - (upgrade-shepherd-services eval os) - (install-bootloader eval bootloader-configuration bootcfg))))) + (with-roll-back #f + (switch-to-system eval os)) + (with-roll-back #t + (mbegin %store-monad + (upgrade-shepherd-services eval os) + (install-bootloader eval bootloader-configuration bootcfg))))))) + + +;;; +;;; Roll-back. +;;; + +(define (roll-back-managed-host machine) + "Internal implementation of 'roll-back-machine' for MACHINE instances with +an environment type of 'managed-host." + (define remote-exp + (with-extensions (list guile-gcrypt) + (with-imported-modules (source-module-closure '((guix config) + (guix profiles))) + #~(begin + (use-modules (guix config) + (guix profiles)) + + (define %system-profile + (string-append %state-directory "/profiles/system")) + + (define target-generation + (relative-generation %system-profile -1)) + + (if target-generation + (switch-to-generation %system-profile target-generation) + 'error))))) + + (define roll-back-failure + (condition (&message (message (G_ "could not roll-back machine"))))) + + (mlet* %store-monad ((boot-parameters (machine-boot-parameters machine)) + (_ -> (if (< (length boot-parameters) 2) + (raise roll-back-failure))) + (entries -> (map boot-parameters->menu-entry + (list (second boot-parameters)))) + (old-entries -> (map boot-parameters->menu-entry + (drop boot-parameters 2))) + (bootloader -> (operating-system-bootloader + (machine-operating-system machine))) + (bootcfg (lower-object + ((bootloader-configuration-file-generator + (bootloader-configuration-bootloader + bootloader)) + bootloader entries + #:old-entries old-entries))) + (remote-result (machine-remote-eval machine remote-exp))) + (when (eqv? 'error remote-result) + (raise roll-back-failure)))) ;;; @@ -366,6 +431,7 @@ environment type of 'managed-host." (environment-type (machine-remote-eval managed-host-remote-eval) (deploy-machine deploy-managed-host) + (roll-back-machine roll-back-managed-host) (name 'managed-host-environment-type) (description "Provisioning for machines that are accessible over SSH and have a known host-name. This entails little more than maintaining an SSH diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 81f2b33260..6a67985c8b 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -28,6 +28,8 @@ #:use-module (guix grafts) #:use-module (ice-9 format) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) #:export (guix-deploy)) @@ -88,7 +90,18 @@ Perform the deployment specified by FILE.\n")) (with-store store (set-build-options-from-command-line store opts) (for-each (lambda (machine) - (info (G_ "deploying to ~a...") (machine-display-name machine)) + (info (G_ "deploying to ~a...~%") + (machine-display-name machine)) (parameterize ((%graft? (assq-ref opts 'graft?))) - (run-with-store store (deploy-machine machine)))) + (guard (c ((message-condition? c) + (report-error (G_ "failed to deploy ~a: '~a'~%") + (machine-display-name machine) + (condition-message c))) + ((deploy-error? c) + (when (deploy-error-should-roll-back c) + (info (G_ "rolling back ~a...~%") + (machine-display-name machine)) + (run-with-store store (roll-back-machine machine))) + (apply throw (deploy-error-captured-args c)))) + (run-with-store store (deploy-machine machine))))) machines)))) -- cgit v1.2.3 From 3033d59ac9a747b42a1fa6ca6664d4fbc62ca117 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Thu, 15 Aug 2019 04:06:41 -0400 Subject: machine: Automatically authorize the coordinator's signing key. * guix/ssh.scm (remote-authorize-signing-key): New variable. * gnu/machine/ssh.scm (deploy-managed-host): Authorize coordinator's signing key before any invocations of 'remote-eval'. (deploy-managed-host): Display an error if a signing key does not exist. * doc/guix.texi (Invoking guix deploy): Remove section describing manual signing key authorization. (Invoking guix deploy): Add section describing the 'authorize?' field. --- doc/guix.texi | 3 +++ gnu/machine/ssh.scm | 33 ++++++++++++++++++++++++++------- guix/ssh.scm | 23 +++++++++++++++++++++++ 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e5cec7ad25..d80f62970d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25586,6 +25586,9 @@ with an @code{environment} of @code{managed-host-environment-type}. @item @code{system} The Nix system type describing the architecture of the machine being deployed to. This should look something like ``x86_64-linux''. +@item @code{authorize?} (default: @code{#t}) +If true, the coordinator's signing key will be added to the remote's ACL +keyring. @item @code{port} (default: @code{22}) @item @code{user} (default: @code{"root"}) @item @code{identity} (default: @code{#f}) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 4b5d5fe3a2..ac3aa3e370 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -28,13 +28,16 @@ #:use-module (guix i18n) #:use-module (guix modules) #:use-module (guix monads) + #:use-module (guix pki) #:use-module (guix records) #:use-module (guix remote) #:use-module (guix scripts system reconfigure) #:use-module (guix ssh) #:use-module (guix store) #:use-module (guix utils) + #:use-module (gcrypt pk-crypto) #:use-module (ice-9 match) + #:use-module (ice-9 textual-ports) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) @@ -48,6 +51,7 @@ machine-ssh-configuration-host-name machine-ssh-configuration-build-locally? + machine-ssh-configuration-authorize? machine-ssh-configuration-port machine-ssh-configuration-user machine-ssh-configuration-session)) @@ -70,17 +74,19 @@ make-machine-ssh-configuration machine-ssh-configuration? this-machine-ssh-configuration - (host-name machine-ssh-configuration-host-name) ; string - (system machine-ssh-configuration-system) ; string - (build-locally? machine-ssh-configuration-build-locally? + (host-name machine-ssh-configuration-host-name) ; string + (system machine-ssh-configuration-system) ; string + (build-locally? machine-ssh-configuration-build-locally? ; boolean (default #t)) - (port machine-ssh-configuration-port ; integer + (authorize? machine-ssh-configuration-authorize? ; boolean + (default #t)) + (port machine-ssh-configuration-port ; integer (default 22)) - (user machine-ssh-configuration-user ; string + (user machine-ssh-configuration-user ; string (default "root")) - (identity machine-ssh-configuration-identity ; path to a private key + (identity machine-ssh-configuration-identity ; path to a private key (default #f)) - (session machine-ssh-configuration-session ; session + (session machine-ssh-configuration-session ; session (default #f))) (define (machine-ssh-session machine) @@ -359,6 +365,19 @@ the 'should-roll-back' field set to SHOULD-ROLL-BACK?" "Internal implementation of 'deploy-machine' for MACHINE instances with an environment type of 'managed-host." (maybe-raise-unsupported-configuration-error machine) + (when (machine-ssh-configuration-authorize? + (machine-configuration machine)) + (unless (file-exists? %public-key-file) + (raise (condition + (&message + (message (format #f (G_ "no signing key '~a'. \ +have you run 'guix archive --generate-key?'") + %public-key-file)))))) + (remote-authorize-signing-key (call-with-input-file %public-key-file + (lambda (port) + (string->canonical-sexp + (get-string-all port)))) + (machine-ssh-session machine))) (mlet %store-monad ((_ (check-deployment-sanity machine)) (boot-parameters (machine-boot-parameters machine))) (let* ((os (machine-operating-system machine)) diff --git a/guix/ssh.scm b/guix/ssh.scm index 90311127a1..24834c6f68 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -21,6 +21,7 @@ #:use-module (guix inferior) #:use-module (guix i18n) #:use-module ((guix utils) #:select (&fix-hint)) + #:use-module (gcrypt pk-crypto) #:use-module (ssh session) #:use-module (ssh auth) #:use-module (ssh key) @@ -40,6 +41,7 @@ remote-daemon-channel connect-to-remote-daemon remote-system + remote-authorize-signing-key send-files retrieve-files retrieve-files* @@ -300,6 +302,27 @@ the machine on the other end of SESSION." (inferior-remote-eval '(begin (use-modules (guix utils)) (%current-system)) session)) +(define (remote-authorize-signing-key key session) + "Send KEY, a canonical sexp containing a public key, over SESSION and add it +to the system ACL file if it has not yet been authorized." + (inferior-remote-eval + `(begin + (use-modules (guix build utils) + (guix pki) + (guix utils) + (gcrypt pk-crypto) + (srfi srfi-26)) + + (define acl (current-acl)) + (define key (string->canonical-sexp ,(canonical-sexp->string key))) + + (unless (authorized-key? key) + (let ((acl (public-keys->acl (cons key (acl->public-keys acl))))) + (mkdir-p (dirname %acl-file)) + (with-atomic-file-output %acl-file + (cut write-acl acl <>))))) + session)) + (define* (send-files local files remote #:key recursive? -- cgit v1.2.3 From 3967a946c6b36bdd51bd0f11b75ad1f7ef3d4674 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Thu, 15 Aug 2019 04:07:19 -0400 Subject: doc: Add description of 'build-locally?'. * doc/guix.texi (Invoking guix deploy): Add section describing the 'build-locally?' field of 'managed-host-environment-type'. --- doc/guix.texi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index d80f62970d..043851e418 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25583,6 +25583,8 @@ with an @code{environment} of @code{managed-host-environment-type}. @table @asis @item @code{host-name} +@item @code{build-locally?} (default: @code{#t}) +If false, system derivations will be built on the machine being deployed to. @item @code{system} The Nix system type describing the architecture of the machine being deployed to. This should look something like ``x86_64-linux''. -- cgit v1.2.3 From 5f32531770b532deafb79601ecff4913ec38d0b2 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Thu, 15 Aug 2019 04:08:22 -0400 Subject: remote: Use (%daemon-socket-uri) rather than hard-coded path. * guix/remote.scm (remote-eval): Use (%daemon-socket-uri) as the default value of 'socket-name' rather than hard-coded path. --- guix/remote.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/remote.scm b/guix/remote.scm index d8124e41ab..ae2fe17dd2 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -106,7 +106,7 @@ result to the current output port using the (guix repl) protocol." (build-locally? #t) (system (%current-system)) (module-path %load-path) - (socket-name "/var/guix/daemon-socket/socket") + (socket-name (%daemon-socket-uri)) (become-command #f)) "Evaluate EXP, a gexp, on the host at SESSION, an SSH session. Ensure that all the elements EXP refers to are built and deployed to SESSION beforehand. -- cgit v1.2.3 From 18696f7acfed09272eb9a35d2ad27d8a8e534384 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Aug 2019 17:45:01 +0200 Subject: gnu: Add vtk-6. * gnu/packages/image-processing.scm (vtk-6): New variable. --- gnu/packages/image-processing.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index e708e1366c..6680d65283 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 John Darrington -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Eric Bavier @@ -64,7 +64,8 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1)) (define-public dcmtk (package @@ -212,6 +213,22 @@ a suite of 3D interaction widgets, supports parallel processing, and integrates with various databases on GUI toolkits such as Qt and Tk.") (license license:bsd-3))) +;; itksnap needs an older variant of VTK. +(define-public vtk-6 + (package (inherit vtk) + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append "https://vtk.org/files/release/" + (version-major+minor version) + "/VTK-" version ".tar.gz")) + (sha256 + (base32 + "0pla1r5mvkgl4sl213gfdhzrypdgai0h3z5mfgm6p9jz9hsr794j")))) + (inputs + `(("jsoncpp" ,jsoncpp-for-tensorflow) + ,@(alist-delete "jsoncpp" (package-inputs vtk)))))) + (define-public opencv (package (name "opencv") -- cgit v1.2.3 From 02e1acfb2a65783d63e526da798337c91b40a5f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Aug 2019 17:46:22 +0200 Subject: gnu: Add vxl. * gnu/packages/image-processing.scm (vxl): New variable. --- gnu/packages/image-processing.scm | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 6680d65283..a4365f6009 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) + #:use-module (gnu packages geo) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -534,3 +535,45 @@ the VIPS image processing library. It's a little like a spreadsheet: you create a set of formula connecting your objects together, and on a change nip2 recalculates.") (license license:gpl2+))) + +(define-public vxl + (package + (name "vxl") + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vxl/vxl.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0949hw57szq8943f1whwqaz591xjmb19kj803hcv74hdai2b0ycg")) + (modules '((guix build utils))) + ;; TODO: vxl includes an old version of dcmtk. It won't build with + ;; version 3.6.x. + (snippet + '(begin + (for-each delete-file-recursively + '("v3p/bzlib/" + "v3p/geotiff/" + "v3p/jpeg/" + "v3p/png/" + "v3p/tiff/" + "v3p/zlib/")) + (substitute* "v3p/CMakeLists.txt" + (("add_subdirectory\\((tiff|png|jpeg|zlib|bzlib|geotiff)\\)") + "")) + #t)))) + (build-system cmake-build-system) + (inputs + `(("libgeotiff" ,libgeotiff) + ("libtiff" ,libtiff) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("zlib" ,zlib))) + (home-page "https://github.com/vxl/vxl/") + (synopsis "Collection of C++ libraries for computer vision") + (description "VXL (the Vision-something-Libraries) is a collection of C++ +libraries designed for computer vision research and implementation.") + (license license:bsd-3))) -- cgit v1.2.3 From 4243af4e5741add5de4972cbea1a8ee6acb39f15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Aug 2019 17:47:03 +0200 Subject: gnu: Add vxl-1. * gnu/packages/image-processing.scm (vxl-1): New variable. --- gnu/packages/image-processing.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index a4365f6009..9c084e111d 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -577,3 +577,34 @@ recalculates.") (description "VXL (the Vision-something-Libraries) is a collection of C++ libraries designed for computer vision research and implementation.") (license license:bsd-3))) + +(define-public vxl-1 + (package (inherit vxl) + (name "vxl") + (version "1.18.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vxl/vxl.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g4mr2cc58jwm0vasscbd4y5380wj3ahkvq121z4gs83fhavvxgz")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file-recursively + '("v3p/bzlib/" + "v3p/geotiff/" + "v3p/png/" + "v3p/tiff/" + "v3p/zlib/")) + (substitute* "v3p/CMakeLists.txt" + (("add_subdirectory\\((tiff|png|jpeg|zlib|bzlib|geotiff)\\)") + "")) + #t)))) + (arguments + `(#:configure-flags + ;; Needed for itk-snap + (list "-DVNL_CONFIG_LEGACY_METHODS=ON"))))) -- cgit v1.2.3 From d7701e1b94158c256f9b0609457cdffadaf39aee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Aug 2019 18:55:46 +0200 Subject: gnu: Add insight-toolkit. * gnu/packages/image-processing.scm (insight-toolkit): New variable. --- gnu/packages/image-processing.scm | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 9c084e111d..2f1f0ade59 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -60,6 +61,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages serialization) + #:use-module (gnu packages tbb) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xiph) @@ -608,3 +610,64 @@ libraries designed for computer vision research and implementation.") `(#:configure-flags ;; Needed for itk-snap (list "-DVNL_CONFIG_LEGACY_METHODS=ON"))))) + +(define-public insight-toolkit + (package + (name "insight-toolkit") + (version "5.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/InsightSoftwareConsortium/ITK/" + "releases/download/v" version "/InsightToolkit-" + version ".tar.xz")) + (sha256 + (base32 "0bs63mk4q8jmx38f031jy5w5n9yy5ng9x8ijwinvjyvas8cichqi")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; tests require network access and external data + #:configure-flags + '("-DITK_USE_GPU=ON" + "-DITK_USE_SYSTEM_LIBRARIES=ON" + "-DITK_USE_SYSTEM_GOOGLETEST=ON" + "-DITK_BUILD_SHARED=ON" + ;; This prevents "GTest::GTest" from being added to the ITK_LIBRARIES + ;; variable in the installed CMake files. This is necessary as other + ;; packages using insight-toolkit could not be configured otherwise. + "-DGTEST_ROOT=gtest") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-tune + (lambda _ + (substitute* "CMake/ITKSetStandardCompilerFlags.cmake" + (("-mute=native") "")) + #t))))) + (inputs + `(("eigen" ,eigen) + ("expat" ,expat) + ("fftw" ,fftw) + ("fftwf" ,fftwf) + ("hdf5" ,hdf5) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("mesa" ,mesa-opencl) + ("perl" ,perl) + ("python" ,python) + ("tbb" ,tbb) + ("vxl" ,vxl-1) + ("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/InsightSoftwareConsortium/ITK/") + (synopsis "Scientific image processing, segmentation and registration") + (description "The Insight Toolkit (ITK) is a toolkit for N-dimensional +scientific image processing, segmentation, and registration. Segmentation is +the process of identifying and classifying data found in a digitally sampled +representation. Typically the sampled representation is an image acquired +from such medical instrumentation as CT or MRI scanners. Registration is the +task of aligning or developing correspondences between data. For example, in +the medical environment, a CT scan may be aligned with a MRI scan in order to +combine the information contained in both.") + (license license:asl2.0))) -- cgit v1.2.3 From 8f4d457d93797bea5d934d9548da85d438dbd71e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Aug 2019 18:55:57 +0200 Subject: gnu: Add insight-toolkit-4. * gnu/packages/image-processing.scm (insight-toolkit-4): New variable. --- gnu/packages/image-processing.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 2f1f0ade59..00b80c1ad5 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -671,3 +671,23 @@ task of aligning or developing correspondences between data. For example, in the medical environment, a CT scan may be aligned with a MRI scan in order to combine the information contained in both.") (license license:asl2.0))) + +(define-public insight-toolkit-4 + (package (inherit insight-toolkit) + (version "4.13.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/InsightSoftwareConsortium/ITK/" + "releases/download/v" version "/InsightToolkit-" + version ".tar.xz")) + (sha256 + (base32 "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns")))) + (arguments + `(#:tests? #f ; tests require network access and external data + #:configure-flags + '("-DITKV3_COMPATIBILITY=ON" ; needed for itk-snap + "-DITK_USE_GPU=ON" + "-DITK_USE_SYSTEM_LIBRARIES=ON" + "-DITK_USE_SYSTEM_GOOGLETEST=ON" + "-DITK_USE_SYSTEM_VXL=ON"))))) -- cgit v1.2.3 From 07f36b0c53a644c11d26389de34e9d5e84469882 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Aug 2019 18:56:03 +0200 Subject: gnu: Add insight-toolkit-4.12. * gnu/packages/image-processing.scm (insight-toolkit-4.12): New variable. --- gnu/packages/image-processing.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 00b80c1ad5..3fa1be4244 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -691,3 +691,14 @@ combine the information contained in both.") "-DITK_USE_SYSTEM_LIBRARIES=ON" "-DITK_USE_SYSTEM_GOOGLETEST=ON" "-DITK_USE_SYSTEM_VXL=ON"))))) + +(define-public insight-toolkit-4.12 + (package (inherit insight-toolkit-4) + (version "4.12.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/itk/itk/4.12/" + "InsightToolkit-" version ".tar.xz")) + (sha256 + (base32 "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w")))))) -- cgit v1.2.3 From 1c4e6aa9382e90acbf12246ce29357382902346d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Aug 2019 09:26:55 +0200 Subject: gnu: Add itk-snap. * gnu/packages/image-processing.scm (itk-snap): New variable. --- gnu/packages/image-processing.scm | 139 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 3fa1be4244..b3972a2b76 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) @@ -60,6 +61,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages serialization) #:use-module (gnu packages tbb) #:use-module (gnu packages tls) @@ -702,3 +704,140 @@ combine the information contained in both.") "InsightToolkit-" version ".tar.xz")) (sha256 (base32 "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w")))))) + +(define-public itk-snap + (package + (name "itk-snap") + (version "3.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/itk-snap/src") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15i5ixpryfrbf3vrrb5rici8fb585f25k0v1ljds16bp1f1msr4q")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DSNAP_VERSION_GIT_SHA1=release" + "-DSNAP_VERSION_GIT_BRANCH=release" + "-DSNAP_VERSION_GIT_TIMESTAMP=0" + "-DSNAP_PACKAGE_QT_PLUGINS=OFF" + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + "-DCMAKE_CXX_FLAGS=-std=gnu++11 -fpermissive") + #:phases + (modify-phases %standard-phases + ;; During the installation phase all libraries provided by all + ;; dependencies will be copied to the lib directory. That's insane, + ;; so we disable this. + (add-after 'unpack 'do-not-copy-dependencies + (lambda _ + (substitute* "CMakeLists.txt" + (("install_qt5_executable\ +\\(\\$\\{SNAP_MAIN_INSTALL_DIR\\}/\\$\\{SNAP_EXE\\}\\)") + "")) + #t)) + (add-after 'unpack 'disable-gui-tests + (lambda _ + ;; The GUI tests just time out. + (substitute* "CMakeLists.txt" + ((" (Workspace|DiffSpace|ProbeIntensity|RegionCompetition\ +|RandomForest|RandomForestBailOut)") + "")) + #t)) + (add-after 'unpack 'make-reproducible + (lambda _ + (substitute* "CMakeLists.txt" + (("TODAY\\(SNAP_VERSION_COMPILE_DATE\\)") + "SET(SNAP_VERSION_COMPILE_DATE \"(removed for reproducibility)\")")) + #t)) + (add-after 'unpack 'prepare-submodules + (lambda* (#:key inputs #:allow-other-keys) + (rmdir "Submodules/c3d") + (copy-recursively (assoc-ref inputs "c3d-src") + "Submodules/c3d") + (substitute* '("Submodules/c3d/adapters/BiasFieldCorrectionN4.cxx" + "Submodules/c3d/adapters/ApplyMetric.cxx") + (("vcl_") "std::")) + (rmdir "Submodules/greedy") + (symlink (assoc-ref inputs "greedy-src") + "Submodules/greedy") + #t)) + (add-after 'unpack 'fix-includes + (lambda _ + (substitute* "GUI/Model/RegistrationModel.cxx" + (("") + "")) + #t)) + (add-before 'check 'prepare-tests + (lambda _ + ;; Needed by at least one test. + (setenv "HOME" "/tmp") + #t)) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/itksnap") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins")) + '("qtbase" "qtdeclarative")))) + #t)))))) + (inputs + `(("curl" ,curl) + ("fftw" ,fftw) + ("fftwf" ,fftwf) + ("glu" ,glu) + ("hdf5" ,hdf5) + ("mesa" ,mesa-opencl) + ;; This package does not build with either insight-toolkit 5.0.0 and + ;; not with 4.13. It really needs to be 4.12. + ("itk" ,insight-toolkit-4.12) + ("vtk" ,vtk-6) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qttools" ,qttools) + ("vxl" ,vxl-1) + ("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("c3d-src" + ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") + (revision "1") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pyushkevich/c3d.git") + (commit commit))) + (file-name (git-file-name "c3d" version)) + (sha256 + (base32 + "0kyv3rxrxwr8c3sa9zv01lsnhk95b27gx1s870k3yi8qp52h7bx3"))))) + ;; We are using an arbitrary commit from 2017 because the latest + ;; version breaks the build... + ("greedy-src" + ,(let* ((commit "97e340f7e8e66597599144947775e6039e79a0d3") + (revision "1") + (version (git-version "0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pyushkevich/greedy.git") + (commit commit))) + (file-name (git-file-name "greedy" version)) + (sha256 + (base32 + "0k5bc9za4jrc8z9dj08z1rkcp5xf0gnd1d2jmi1w9ny4vxh2q2ab"))))))) + (home-page "https://sourceforge.net/p/itk-snap/") + (synopsis "Medical image segmentation") + (description "ITK-SNAP is a tool for segmenting anatomical structures in +medical images. It provides an automatic active contour segmentation +pipeline, along with supporting a manual segmentation toolbox. ITK-SNAP has a +full-featured UI aimed at clinical researchers.") + ;; This includes the submodules greedy and c3d. + (license license:gpl3+))) -- cgit v1.2.3 From dfdd7380a164217fec6bca0f91ebcf32ade33cb4 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 15 Aug 2019 16:21:23 +0200 Subject: gnu: libinput: Update to 1.14.0. * gnu/packages/freedesktop.scm (libinput): Update to 1.14.0. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9cfdbca3fb..a0cf2c8cbf 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -152,14 +152,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.13.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk")))) + "0rzw2kx06ywc19lwf147f474xav7w83h28k0afy822wjz0j5rf3w")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From 2cbe7044ea079b7852efb5c1a96785672c4e5c5b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 15 Aug 2019 16:28:21 +0200 Subject: Revert "gnu: libinput: Update to 1.14.0." This reverts commit dfdd7380a164217fec6bca0f91ebcf32ade33cb4. libinput-minimal causes too many rebuilds. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a0cf2c8cbf..9cfdbca3fb 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -152,14 +152,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.14.0") + (version "1.13.4") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" "libinput-" version ".tar.xz")) (sha256 (base32 - "0rzw2kx06ywc19lwf147f474xav7w83h28k0afy822wjz0j5rf3w")))) + "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From 6e7553ffe09ed214e1aac362c16b526743e3c25b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Aug 2019 17:02:30 +0200 Subject: gnu: Add r-rann-l1. * gnu/packages/cran.scm (r-rann-l1): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 17c85fe512..adac3fe0c5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14945,3 +14945,26 @@ path of values for the regularization parameter.") library uses. It is also possible to control the number of threads in OpenMP.") (license license:agpl3+))) + +(define-public r-rann-l1 + (package + (name "r-rann-l1") + (version "2.5.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "RANN.L1" version)) + (sha256 + (base32 + "1hanh3my84mdr5wy6b89fawqzfc184vff1y65wy4l5ld9qza1n44")))) + (properties `((upstream-name . "RANN.L1"))) + (build-system r-build-system) + (home-page "https://github.com/jefferis/RANN/tree/master-L1") + (synopsis "Fast nearest neighbour search using L1 metric") + (description + "This package provides tools to find the k nearest neighbours for every +point in a given dataset in O(N log N) time using Arya and Mount's ANN +library. There is support for approximate as well as exact searches, fixed +radius searches and @code{bd} as well as @code{kd} trees. The distance is +computed using the L1 (Manhattan, taxicab) metric.") + (license license:gpl3+))) -- cgit v1.2.3 From 9c3bfea673f13d84d12acc9189792564b98b930f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Aug 2019 17:02:39 +0200 Subject: gnu: Add r-patchwork. * gnu/packages/cran.scm (r-patchwork): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index adac3fe0c5..ae6215b2d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14968,3 +14968,34 @@ library. There is support for approximate as well as exact searches, fixed radius searches and @code{bd} as well as @code{kd} trees. The distance is computed using the L1 (Manhattan, taxicab) metric.") (license license:gpl3+))) + +(define-public r-patchwork + ;; There has been no public release yet. + (let ((commit "fd7958bae3e7a1e30237c751952e412a0a1d1242") + (revision "1")) + (package + (name "r-patchwork") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thomasp85/patchwork.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00fq520xwy1ysg4k8x48x9b0yy9wyi8y8zj6dvxjg4bwx0yyp6s4")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-gtable" ,r-gtable))) + (home-page "https://github.com/thomasp85/patchwork") + (synopsis "Compose ggplot2 plots") + (description + "The @code{ggplot2} package provides a strong API for sequentially +building up a plot, but does not concern itself with composition of multiple +plots. Patchwork is a package that expands the API to allow for arbitrarily +complex composition of plots by providing mathmatical operators for combining +multiple plots.") + (license license:expat)))) -- cgit v1.2.3 From 86d3822862d655cfef7ee359464288d9953ec2c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Aug 2019 17:02:49 +0200 Subject: gnu: Add r-liger. * gnu/packages/cran.scm (r-liger): New variable. --- gnu/packages/cran.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae6215b2d1..26b983067b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14999,3 +14999,77 @@ plots. Patchwork is a package that expands the API to allow for arbitrarily complex composition of plots by providing mathmatical operators for combining multiple plots.") (license license:expat)))) + +(define-public r-liger + (package + (name "r-liger") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MacoskoLab/liger.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16dzwwcpw6n78pxlc5w3kraigki35ix7zhd2cbx5f3y60bbkhlmx")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "inst/java/ModularityOptimizer.jar") + #t)))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'build-java-part + (lambda* (#:key inputs #:allow-other-keys) + (invoke "unzip" (assoc-ref inputs "optimizer-src")) + (for-each (lambda (file) (invoke "javac" file)) + (find-files "." "\\.java$")) + (apply invoke "jar" "cf" "inst/java/ModularityOptimizer.jar" + (find-files "." "\\.class$")) + #t))))) + (propagated-inputs + `(("r-cowplot" ,r-cowplot) + ("r-dosnow" ,r-dosnow) + ("r-dplyr" ,r-dplyr) + ("r-fnn" ,r-fnn) + ("r-foreach" ,r-foreach) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-hmisc" ,r-hmisc) + ("r-ica" ,r-ica) + ("r-irlba" ,r-irlba) + ("r-matrix" ,r-matrix) + ("r-mclust" ,r-mclust) + ("r-patchwork" ,r-patchwork) + ("r-plyr" ,r-plyr) + ("r-rann-l1" ,r-rann-l1) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-riverplot" ,r-riverplot) + ("r-rtsne" ,r-rtsne) + ("r-snow" ,r-snow))) + (native-inputs + `(("jdk" ,icedtea "jdk") + ;; See https://github.com/MacoskoLab/liger/issues/96 + ;; The optimizer is released under the Expat license. + ("optimizer-src" + ,(origin + (method url-fetch) + (uri "http://www.ludowaltman.nl/slm/modularity_optimizer_source.zip") + (sha256 + (base32 + "01hmm6sapcmldvayknqx2w4cav3qv71mwwkdkwj4qgq6dss09g18")))) + ("unzip" ,unzip) + ("r-knitr" ,r-knitr))) ; for vignettes + (home-page "https://github.com/MacoskoLab/liger") + (synopsis "Integrate and analyze multiple single-cell datasets") + (description + "LIGER is a package for integrating and analyzing multiple single-cell +datasets, developed and maintained by the Macosko lab. It relies on +integrative non-negative matrix factorization to identify shared and +dataset-specific factors.") + (license license:gpl3))) -- cgit v1.2.3 From 19f1aac0e7405b99c96823dda36e5389f18f64ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Aug 2019 17:38:57 +0200 Subject: gnu: Add r-lda. * gnu/packages/cran.scm (r-lda): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 26b983067b..76ea2ed847 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14946,6 +14946,30 @@ library uses. It is also possible to control the number of threads in OpenMP.") (license license:agpl3+))) +(define-public r-lda + (package + (name "r-lda") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "lda" version)) + (sha256 + (base32 + "03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/lda/") + (synopsis "Collapsed Gibbs sampling methods for topic models") + (description + "This package implements @dfn{latent Dirichlet allocation} (LDA) and +related models. This includes (but is not limited to) sLDA, corrLDA, and the +mixed-membership stochastic blockmodel. Inference for all of these models is +implemented via a fast collapsed Gibbs sampler written in C. Utility +functions for reading/writing data typically used in topic models, as well as +tools for examining posterior distributions are also included.") + ;; Any version of the LGPL + (license license:lgpl3+))) + (define-public r-rann-l1 (package (name "r-rann-l1") -- cgit v1.2.3 From bb88417fb70f8881d46e2f2e8235a1aa16591a36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Aug 2019 17:39:11 +0200 Subject: gnu: Add r-rcistarget. * gnu/packages/bioconductor.scm (r-rcistarget): New variable. --- gnu/packages/bioconductor.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 74620a2cbe..0a0aee7309 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5089,6 +5089,41 @@ by a sparse number of variables, this method can reduce the complexity of data, to only emphasize the data that actually matters.") (license license:expat))) +(define-public r-rcistarget + (package + (name "r-rcistarget") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "RcisTarget" version)) + (sha256 + (base32 + "133x2vr86ifbk82q08x1c8q19zsk5za7b6qrzz77dhsyf4bhcvpd")))) + (properties `((upstream-name . "RcisTarget"))) + (build-system r-build-system) + (propagated-inputs + `(("r-aucell" ,r-aucell) + ("r-biocgenerics" ,r-biocgenerics) + ("r-data-table" ,r-data-table) + ("r-feather" ,r-feather) + ("r-gseabase" ,r-gseabase) + ("r-r-utils" ,r-r-utils) + ("r-summarizedexperiment" ,r-summarizedexperiment))) + (home-page "https://aertslab.org/#scenic") + (synopsis "Identify transcription factor binding motifs enriched on a gene list") + (description + "RcisTarget identifies @dfn{transcription factor binding motifs} (TFBS) +over-represented on a gene list. In a first step, RcisTarget selects DNA +motifs that are significantly over-represented in the surroundings of the +@dfn{transcription start site} (TSS) of the genes in the gene-set. This is +achieved by using a database that contains genome-wide cross-species rankings +for each motif. The motifs that are then annotated to TFs and those that have +a high @dfn{Normalized Enrichment Score} (NES) are retained. Finally, for +each motif and gene-set, RcisTarget predicts the candidate target genes (i.e. +genes in the gene-set that are ranked above the leading edge).") + (license license:gpl3))) + (define-public r-cicero (package (name "r-cicero") -- cgit v1.2.3 From a9815a6cf27dd0e2140038c35d4ad5ef91f6d7d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Aug 2019 17:39:16 +0200 Subject: gnu: Add r-cistopic. * gnu/packages/bioconductor.scm (r-cistopic): New variable. --- gnu/packages/bioconductor.scm | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0a0aee7309..ea43bf2fdf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5186,3 +5186,47 @@ accessibility data.") `(("r-monocle3" ,r-monocle3) ,@(alist-delete "r-monocle" (package-propagated-inputs r-cicero))))))) + +(define-public r-cistopic + (let ((commit "29abd8df9afb60ff27ac3f0a590930debe926950") + (revision "0")) + (package + (name "r-cistopic") + (version (git-version "0.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aertslab/cisTopic.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s8irpsv5d2zcv4ihanvsf1vrpignzliscxnvs4519af3jmx78h8")))) + (build-system r-build-system) + (propagated-inputs + `(("r-aucell" ,r-aucell) + ("r-data-table" ,r-data-table) + ("r-dplyr" ,r-dplyr) + ("r-dosnow" ,r-dosnow) + ("r-dt" ,r-dt) + ("r-feather" ,r-feather) + ("r-fitdistrplus" ,r-fitdistrplus) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-lda" ,r-lda) + ("r-matrix" ,r-matrix) + ("r-plyr" ,r-plyr) + ("r-rcistarget" ,r-rcistarget) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://github.com/aertslab/cisTopic") + (synopsis "Modelling of cis-regulatory topics from single cell epigenomics data") + (description + "The sparse nature of single cell epigenomics data can be overruled using +probabilistic modelling methods such as @dfn{Latent Dirichlet +Allocation} (LDA). This package allows the probabilistic modelling of +cis-regulatory topics (cisTopics) from single cell epigenomics data, and +includes functionalities to identify cell states based on the contribution of +cisTopics and explore the nature and regulatory proteins driving them.") + (license license:gpl3)))) -- cgit v1.2.3 From ef8c83bdb996146ff038c1c818ade3447272eb28 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 15 Aug 2019 19:15:15 +0200 Subject: gnu: python-responses: Update to 0.10.6. * gnu/packages/python-web.scm (python-responses): Update to 0.10.6. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8e5324b37e..735f033883 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1808,13 +1808,13 @@ Python.") (define-public python-responses (package (name "python-responses") - (version "0.5.1") + (version "0.10.6") (source (origin (method url-fetch) (uri (pypi-uri "responses" version)) (sha256 (base32 - "1spcfxixyk9k7pk82jm6zqkwk031s95lh8q0mz7539jrb7269bcc")))) + "147pacwkkqy3qf3hr33fnl1xbzgw0zsm3qppvvy9qhq8h069qbah")))) (build-system python-build-system) (arguments `(;; Test suite is not distributed: -- cgit v1.2.3 From e3a39ade716eff98d2cdc2ebfced2efc021cbcd5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 15 Aug 2019 19:40:28 +0200 Subject: gnu: Remove python2-internetarchive. This trivial package fails to build and has no reverse dependencies. * gnu/packages/web.scm (python2-internetarchive): Remove variable. (python-internetarchive)[properties]: Remove. --- gnu/packages/web.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2294e77a9f..314ed8c149 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5359,14 +5359,8 @@ command-line arguments or read from stdin.") (description "@code{ia} is a command-line tool for using @url{archive.org} from the command-line. It also emplements the internetarchive python module for programmatic access to archive.org.") - (properties - `((python2-variant . ,(delay python2-internetarchive)))) (license license:agpl3+))) -(define-public python2-internetarchive - (package-with-python2 - (strip-python2-variant python-internetarchive))) - (define-public python-clf (let ((commit-test-clf "d01d25923c599d3261910f79fb948825b4270d07")) ; 0.5.7 (package -- cgit v1.2.3 From d4cf5b018a6ec9170ca1b8c46023003c164364b9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 15 Aug 2019 21:03:19 +0300 Subject: gnu: einstein: Use mirror for source download. * gnu/packages/games.scm (einstein)[source]: Use 'mirror' syntax. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 92df556970..c37364e369 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2830,7 +2830,7 @@ players.") (version "2.0") (source (origin (method url-fetch) - (uri (string-append "http://http.debian.net/debian/pool/main/e/" + (uri (string-append "mirror://debian/pool/main/e/" "einstein/einstein_2.0.dfsg.2.orig.tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 369faa59955ffc2a81ac1a068c8b2c2fec7a4a12 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 12 Aug 2019 21:20:01 +0200 Subject: gnu: Add ruby-json-schema. * gnu/packages/ruby.scm (ruby-json-schema): New variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1b70f842ae..94a5377c46 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Mikhail Kirillov +;;; Copyright © 2019 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -8737,3 +8738,32 @@ then check out http://127.0.0.1:1080 to see the mail.") "This package provides a pure Ruby library for event-driven IO.") (home-page "https://github.com/castwide/backport") (license license:expat))) + +(define-public ruby-json-schema + (package + (name "ruby-json-schema") + (version "2.8.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "json-schema" version)) + (sha256 + (base32 + "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "gem" "build" ".gemspec")))))) + (propagated-inputs + `(("ruby-addressable" ,ruby-addressable))) + (synopsis "Ruby JSON Schema Validator") + (description "This library provides Ruby with an interface for validating +JSON objects against a JSON schema conforming to JSON Schema Draft 4. Legacy +support for JSON Schema Draft 3, JSON Schema Draft 2, and JSON Schema Draft 1 +is also included.") + (home-page "https://github.com/ruby-json-schema/json-schema") + (license license:expat))) -- cgit v1.2.3 From 4f3811f6bbdfba817601eb3168f5b3e0d2f1c3f6 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 11:42:29 +0200 Subject: guix: copy-linux-headers: Extract procedure, add headers. * guix/build/make-bootstrap.scm (copy-linux-headers): New procedure; extract from make-stripped-libc and add headers for Mes bootstrap. (make-stripped-libc): Use it. --- guix/build/make-bootstrap.scm | 72 +++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 48799f7e90..e5ef1d6d2b 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015, 2019 Ludovic Courtès +;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,7 +24,8 @@ #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (guix build utils) - #:export (make-stripped-libc)) + #:export (copy-linux-headers + make-stripped-libc)) ;; Commentary: ;; @@ -31,6 +33,53 @@ ;; ;; Code: +(define (copy-linux-headers output kernel-headers) + "Copy to OUTPUT the subset of KERNEL-HEADERS that is needed when producing a +bootstrap libc." + + (let* ((incdir (string-append output "/include"))) + (mkdir-p incdir) + + ;; Copy some of the Linux-Libre headers that glibc headers + ;; refer to. + (mkdir (string-append incdir "/linux")) + (for-each (lambda (file) + (install-file (pk 'src (string-append kernel-headers "/include/linux/" file)) + (pk 'dest (string-append incdir "/linux")))) + '( + "a.out.h" ; for 2.2.5 + "atalk.h" ; for 2.2.5 + "errno.h" + "falloc.h" + "if_addr.h" ; for 2.16.0 + "if_ether.h" ; for 2.2.5 + "if_link.h" ; for 2.16.0 + "ioctl.h" + "kernel.h" + "limits.h" + "neighbour.h" ; for 2.16.0 + "netlink.h" ; for 2.16.0 + "param.h" + "prctl.h" ; for 2.16.0 + "posix_types.h" + "rtnetlink.h" ; for 2.16.0 + "socket.h" + "stddef.h" + "swab.h" ; for 2.2.5 + "sysctl.h" + "sysinfo.h" ; for 2.2.5 + "types.h" + "version.h" ; for 2.2.5 + )) + + (copy-recursively (string-append kernel-headers "/include/asm") + (string-append incdir "/asm")) + (copy-recursively (string-append kernel-headers "/include/asm-generic") + (string-append incdir "/asm-generic")) + (copy-recursively (string-append kernel-headers "/include/linux/byteorder") + (string-append incdir "/linux/byteorder")) + #t)) + (define (make-stripped-libc output libc kernel-headers) "Copy to OUTPUT the subset of LIBC and KERNEL-HEADERS that is needed when producing a bootstrap libc." @@ -43,25 +92,10 @@ when producing a bootstrap libc." (string-append incdir "/mach")) #t)) - (define (copy-linux-headers output kernel-headers) + (define (copy-libc+linux-headers output kernel-headers) (let* ((incdir (string-append output "/include"))) (copy-recursively (string-append libc "/include") incdir) - - ;; Copy some of the Linux-Libre headers that glibc headers - ;; refer to. - (mkdir (string-append incdir "/linux")) - (for-each (lambda (file) - (install-file (string-append kernel-headers "/include/linux/" file) - (string-append incdir "/linux"))) - '("limits.h" "errno.h" "socket.h" "kernel.h" - "sysctl.h" "param.h" "ioctl.h" "types.h" - "posix_types.h" "stddef.h" "falloc.h")) - - (copy-recursively (string-append kernel-headers "/include/asm") - (string-append incdir "/asm")) - (copy-recursively (string-append kernel-headers "/include/asm-generic") - (string-append incdir "/asm-generic")) - #t)) + (copy-linux-headers output kernel-headers))) (define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\ util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\ @@ -80,6 +114,6 @@ _nonshared\\.a)$") (if (directory-exists? (string-append kernel-headers "/include/mach")) (copy-mach-headers output kernel-headers) - (copy-linux-headers output kernel-headers))) + (copy-libc+linux-headers output kernel-headers))) -- cgit v1.2.3 From 5b8c6abcfcbe97888779fdfe0cd9768f7599129b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 9 Sep 2018 11:48:10 +0200 Subject: gnu: Add linux-libre-headers-bootstrap-tarball. * gnu/packages/make-bootstrap.scm (%linux-libre-headers-stripped): New variable. (%linux-libre-headers-bootstrap-tarball): New variable. --- gnu/packages/make-bootstrap.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index c6002eb63a..af9373ad9c 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -41,6 +41,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%bootstrap-binaries-tarball + %linux-libre-headers-bootstrap-tarball %binutils-bootstrap-tarball %glibc-bootstrap-tarball %gcc-bootstrap-tarball @@ -300,6 +301,26 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (license gpl3+) (home-page #f))) +(define %linux-libre-headers-stripped + ;; The subset of Linux-Libre-Headers that we need. + (package (inherit linux-libre-headers) + (name (string-append (package-name linux-libre-headers) "-stripped")) + (build-system trivial-build-system) + (outputs '("out")) + (arguments + `(#:modules ((guix build utils) + (guix build make-bootstrap)) + #:builder + (begin + (use-modules (guix build utils) + (guix build make-bootstrap)) + + (let* ((in (assoc-ref %build-inputs "linux-libre-headers")) + (out (assoc-ref %outputs "out"))) + (copy-linux-headers out in) + #t)))) + (inputs `(("linux-libre-headers" ,linux-libre-headers))))) + (define %binutils-static ;; Statically-linked Binutils. (package (inherit binutils) @@ -660,6 +681,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked bootstrap binaries. (tarball-package %static-binaries)) +(define %linux-libre-headers-bootstrap-tarball + ;; A tarball with the statically-linked Linux-Libre-Headers programs. + (tarball-package %linux-libre-headers-stripped)) + (define %binutils-bootstrap-tarball ;; A tarball with the statically-linked Binutils programs. (tarball-package %binutils-static-stripped)) -- cgit v1.2.3 From fb925c7257104077ccc8117087e60bec8b551f45 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 22 Jul 2019 10:07:07 +0200 Subject: bootstrap: Add mescc-tools-static-stripped-tarball. * gnu/packages/make-bootstrap.scm (%mescc-tools-static, %mescc-tools-static-stripped, %mescc-tools-bootstrap-tarball): New variable. Modified-By: Mark H Weaver --- gnu/packages/make-bootstrap.scm | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index af9373ad9c..5d80f584a4 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,7 @@ #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) + #:use-module (gnu packages mes) #:use-module (gnu packages multiprecision) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -46,6 +48,7 @@ %glibc-bootstrap-tarball %gcc-bootstrap-tarball %guile-bootstrap-tarball + %mescc-tools-bootstrap-tarball %bootstrap-tarballs %guile-static-stripped)) @@ -534,6 +537,67 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("gcc" ,%gcc-static))))) +;; One package: build + remove store references +;; (define %mescc-tools-static-stripped +;; ;; A statically linked Mescc Tools with store references removed, for +;; ;; bootstrap. +;; (package +;; (inherit mescc-tools) +;; (name "mescc-tools-static-stripped") +;; (arguments +;; `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) +;; "CC=gcc -static") +;; #:test-target "test" +;; #:phases (modify-phases %standard-phases +;; (delete 'configure) +;; (add-after 'install 'strip-store-references +;; (lambda _ +;; (let* ((out (assoc-ref %outputs "out")) +;; (bin (string-append out "/bin"))) +;; (for-each (lambda (file) +;; (let ((target (string-append bin "/" file))) +;; (format #t "strippingg `~a'...~%" target) +;; (remove-store-references target))) +;; '( "M1" "blood-elf" "hex2")))))))))) + +;; Two packages: first build static, bare minimum content. +(define %mescc-tools-static + ;; A statically linked MesCC Tools. + (package + (inherit mescc-tools) + (name "mescc-tools-static") + (arguments + `(#:system "i686-linux" + ,@(substitute-keyword-arguments (package-arguments mescc-tools) + ((#:make-flags flags) + `(cons "CC=gcc -static" ,flags))))))) + +;; ... next remove store references. +(define %mescc-tools-static-stripped + ;; A statically linked Mescc Tools with store references removed, for + ;; bootstrap. + (package + (inherit %mescc-tools-static) + (name (string-append (package-name %mescc-tools-static) "-stripped")) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((in (assoc-ref %build-inputs "mescc-tools")) + (out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (for-each (lambda (file) + (let ((target (string-append bin "/" file))) + (format #t "copying `~a'...~%" file) + (copy-file (string-append in "/bin/" file) + target) + (remove-store-references target))) + '( "M1" "blood-elf" "hex2")) + #t)))) + (inputs `(("mescc-tools" ,%mescc-tools-static))))) (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search ;; .scm and .go files relative to its installation directory, rather @@ -701,6 +765,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with the statically-linked, relocatable Guile. (tarball-package %guile-static-stripped)) +(define %mescc-tools-bootstrap-tarball + ;; A tarball with statically-linked MesCC binary seed. + (tarball-package %mescc-tools-static-stripped)) + (define %bootstrap-tarballs ;; A single derivation containing all the bootstrap tarballs, for ;; convenience. -- cgit v1.2.3 From ed050b1cf51941046466d07ba7e94bd9fba02e00 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 22 Jul 2019 10:07:41 +0200 Subject: bootstrap: Add mes-minimal-stripped-tarball. * gnu/packages/make-bootstrap.scm (%mes-minimal, %mes-minimal-stripped, %mes-bootstrap-tarball): New variable. Modified-By: Mark H Weaver --- gnu/packages/make-bootstrap.scm | 92 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 5d80f584a4..cf9f8b4633 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -49,6 +49,7 @@ %gcc-bootstrap-tarball %guile-bootstrap-tarball %mescc-tools-bootstrap-tarball + %mes-bootstrap-tarball %bootstrap-tarballs %guile-static-stripped)) @@ -598,6 +599,93 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." '( "M1" "blood-elf" "hex2")) #t)))) (inputs `(("mescc-tools" ,%mescc-tools-static))))) + +;; (define-public %mes-minimal-stripped +;; ;; A minimal Mes without documentation dependencies, for bootstrap. +;; (let ((triplet "i686-unknown-linux-gnu")) +;; (package +;; (inherit mes) +;; (name "mes-minimal-stripped") +;; (native-inputs +;; `(("guile" ,guile-2.2))) +;; (arguments +;; `(#:system "i686-linux" +;; #:strip-binaries? #f +;; #:configure-flags '("--mes") +;; #:phases +;; (modify-phases %standard-phases +;; (delete 'patch-shebangs) +;; (add-after 'install 'strip-install +;; (lambda _ +;; (let* ((out (assoc-ref %outputs "out")) +;; (share (string-append out "/share"))) +;; (delete-file-recursively (string-append out "/lib/guile")) +;; (delete-file-recursively (string-append share "/guile")) +;; (delete-file-recursively (string-append share "/mes/scaffold")) + +;; (for-each delete-file +;; (find-files +;; (string-append share "/mes/lib") "\\.(h|c)")) + +;; (for-each (lambda (dir) +;; (for-each remove-store-references +;; (find-files (string-append out "/" dir) +;; ".*"))) +;; '("bin" "share/mes"))))))))))) + +;; Two packages: first build static, bare minimum content. +(define-public %mes-minimal + ;; A minimal Mes without documentation. + (let ((triplet "i686-unknown-linux-gnu")) + (package + (inherit mes) + (name "mes-minimal") + (native-inputs + `(("guile" ,guile-2.2))) + (arguments + `(#:system "i686-linux" + #:strip-binaries? #f + #:configure-flags '("--mes") + #:phases + (modify-phases %standard-phases + (delete 'patch-shebangs) + (add-after 'install 'strip-install + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (delete-file-recursively (string-append out "/lib/guile")) + (delete-file-recursively (string-append share "/guile")) + (delete-file-recursively (string-append share "/mes/scaffold")) + + (for-each delete-file + (find-files + (string-append share "/mes/lib") + "\\.(h|c)"))))))))))) + +;; next remove store references. +(define %mes-minimal-stripped + ;; A minimal Mes with store references removed, for bootstrap. + (package + (inherit %mes-minimal) + (name (string-append (package-name %mes-minimal) "-stripped")) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((in (assoc-ref %build-inputs "mes")) + (out (assoc-ref %outputs "out"))) + + (copy-recursively in out) + (for-each (lambda (dir) + (for-each remove-store-references + (find-files (string-append out "/" dir) + ".*"))) + '("bin" "share/mes")) + #t)))) + (inputs `(("mes" ,%mes-minimal))))) + (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search ;; .scm and .go files relative to its installation directory, rather @@ -769,6 +857,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; A tarball with statically-linked MesCC binary seed. (tarball-package %mescc-tools-static-stripped)) +(define %mes-bootstrap-tarball + ;; A tarball with Mes binary seed. + (tarball-package %mes-minimal-stripped)) + (define %bootstrap-tarballs ;; A single derivation containing all the bootstrap tarballs, for ;; convenience. -- cgit v1.2.3 From 6744cef5b033c60a388d1de9a6b08c917cc51a4c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 12 Aug 2019 17:43:03 -0400 Subject: bootstrap: Build the new reduced binary seed bootstrap on x86. * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[inputs]: On i686-linux and x86_64-linux, substitute linux-libre-headers, Mes, and MesCC, in place of GCC, binutils, and glibc. --- gnu/packages/make-bootstrap.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index cf9f8b4633..d3b13d9d5f 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -889,9 +889,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." %build-inputs) #t))) (inputs `(("guile-tarball" ,%guile-bootstrap-tarball) - ("gcc-tarball" ,%gcc-bootstrap-tarball) - ("binutils-tarball" ,%binutils-bootstrap-tarball) - ("glibc-tarball" ,(%glibc-bootstrap-tarball)) + ,@(match (or (%current-target-system) (%current-system)) + ((or "i686-linux" "x86_64-linux") + `(("bootstrap-mescc-tools" ,%mescc-tools-bootstrap-tarball) + ("bootstrap-mes" ,%mes-bootstrap-tarball) + ("bootstrap-linux-libre-headers" + ,%linux-libre-headers-bootstrap-tarball))) + (_ `(("gcc-tarball" ,%gcc-bootstrap-tarball) + ("binutils-tarball" ,%binutils-bootstrap-tarball) + ("glibc-tarball" ,(%glibc-bootstrap-tarball))))) ("coreutils&co-tarball" ,%bootstrap-binaries-tarball))) (synopsis "Tarballs containing all the bootstrap binaries") (description synopsis) -- cgit v1.2.3 From fe507d7a3d83169c77b6f73a66ffa0ce59f1119d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 11 Aug 2019 22:37:12 -0400 Subject: bootstrap: Build bootstrap bash deterministically. * gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/make-bootstrap.scm (static-bash-for-bootstrap): New variable. (%static-inputs): Use 'static-bash-for-bootstrap' instead of 'static-bash'. --- gnu/local.mk | 1 + gnu/packages/make-bootstrap.scm | 15 ++++++++--- .../patches/bash-4.4-linux-pgrp-pipe.patch | 30 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch diff --git a/gnu/local.mk b/gnu/local.mk index 16b63bc951..38a06e5620 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -697,6 +697,7 @@ dist_patch_DATA = \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/azr3.patch \ + %D%/packages/patches/bash-4.4-linux-pgrp-pipe.patch \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d3b13d9d5f..2f0bb30b91 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2018, 2019 Mark H Weaver ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -125,6 +125,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (current-source-location) #:native-inputs native-inputs)) +(define static-bash-for-bootstrap + (package + (inherit static-bash) + (source (origin + (inherit (package-source static-bash)) + (patches + (cons (search-patch "bash-4.4-linux-pgrp-pipe.patch") + (origin-patches (package-source static-bash)))))))) + (define %static-inputs ;; Packages that are to be used as %BOOTSTRAP-INPUTS. (let ((coreutils (package (inherit coreutils) @@ -192,7 +201,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (("-Wl,-export-dynamic") "")) #t))))))) (inputs (if (%current-target-system) - `(("bash" ,static-bash)) + `(("bash" ,static-bash-for-bootstrap)) '())))) (tar (package (inherit tar) (arguments @@ -233,7 +242,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("sed" ,sed) ("grep" ,grep) ("gawk" ,gawk))) - ("bash" ,static-bash)))) + ("bash" ,static-bash-for-bootstrap)))) (define %static-binaries (package diff --git a/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch new file mode 100644 index 0000000000..0d03d7ce37 --- /dev/null +++ b/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch @@ -0,0 +1,30 @@ +Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of +the kernel version in use on the build machine. + +--- configure.ac.orig 1969-12-31 19:00:00.000000000 -0500 ++++ configure.ac 2019-08-11 22:28:26.038841961 -0400 +@@ -1092,9 +1092,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 2.[[456789]]*|[[34]]*) AC_DEFINE(PGRP_PIPE) ;; +- esac ;; ++ AC_DEFINE(PGRP_PIPE) ;; + *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; + powerux*) LOCAL_LIBS="-lgen" ;; +--- configure.orig 1969-12-31 19:00:00.000000000 -0500 ++++ configure 2019-08-11 22:28:10.166763255 -0400 +@@ -16064,10 +16064,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 2.[456789]*|[34]*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; + *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; + powerux*) LOCAL_LIBS="-lgen" ;; -- cgit v1.2.3 From 9e6256ba0f32ab12d61c914a3fed879dac881762 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 12 Aug 2019 00:59:51 -0400 Subject: bootstrap: guile-static: Disable parallel build. * gnu/packages/make-bootstrap.scm (%guile-static)[arguments]: Override #:parallel-build? to be #f. --- gnu/packages/make-bootstrap.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 2f0bb30b91..37bf4e9744 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -753,6 +753,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ((#:tests? _ #f) ;; There are uses of `dynamic-link' in ;; {foreign,coverage}.test that don't fly here. + #f) + ((#:parallel-build? _ #f) + ;; Work around the fact that the Guile build system is + ;; not deterministic when parallel-build is enabled. #f)))))) (package-with-relocatable-glibc (static-package guile)))) -- cgit v1.2.3 From 44881cad93801de9462d469500d582af79b99959 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 12 Aug 2019 21:20:47 +0200 Subject: gnu: Add swagger-diff. * gnu/packages/ruby.scm (swagger-diff): New variable. --- gnu/packages/ruby.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 94a5377c46..cee78656cb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8767,3 +8767,43 @@ support for JSON Schema Draft 3, JSON Schema Draft 2, and JSON Schema Draft 1 is also included.") (home-page "https://github.com/ruby-json-schema/json-schema") (license license:expat))) + +(define-public swagger-diff + (package + (name "swagger-diff") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "swagger-diff" version)) + (sha256 + (base32 + "1hxx50nga1bqn254iqjcdwkc9c72364ks9lyjyw10ajz0l0ly7sn")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "spec" + #:phases + (modify-phases %standard-phases + ;; Don't run or require rubocop, the code linting tool, as this is a + ;; bit unnecessary. + (add-after 'unpack 'dont-run-rubocop + (lambda _ + (substitute* "Rakefile" + ((".*rubocop.*") "") + ((".*RuboCop.*") "")) + #t))))) + (propagated-inputs + `(("ruby-json-schema" ,ruby-json-schema))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec-core" ,ruby-rspec-core) + ("ruby-rspec-expectations" ,ruby-rspec-expectations))) + (synopsis + "Compare Open API Initiative specification files") + (description + "Swagger::Diff is a utility for comparing two different Open API +Initiative (OAI) specifications (formerly known as Swagger specifications). +It is intended to determine whether a newer API specification is +backwards-compatible with an older API specification.") + (home-page "https://github.com/civisanalytics/swagger-diff") + (license license:bsd-3))) -- cgit v1.2.3 From f1d2e4bac0b3ca338c0e93c4597f4a46eb8d2d65 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Aug 2019 05:32:01 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.139. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.139. (linux-libre-4.14-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 301979a7a5..cf8e453635 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.138") +(define-public linux-libre-4.14-version "4.14.139") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0yw39cqpk6g42q0xcv2aq8yyzsi0kzx9nvlfbw0iyg58wcfvsl7j"))) + (hash (base32 "0hkhwcbxg6bry13w9kspx48b10274w6pgv200wh91fjd8jax8qlc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 97f40332d4fc02fcdeda08669469ecdcf4c6c02b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Aug 2019 05:33:09 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.67. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.67. (linux-libre-4.19-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cf8e453635..265f18cd1c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.66") +(define-public linux-libre-4.19-version "4.19.67") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0r6vzarmi77fhivd1n6f667sgcw8zd54ykmhmp6rd52bbkhsp0f9"))) + (hash (base32 "00m5k0nfcvgff70686rbhn3w8c9wc3jxqvyddw40lylaqdh3s72s"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ccff55a25e535872d412e1a463064c1b70be2f55 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Aug 2019 05:33:54 -0400 Subject: gnu: linux-libre: Update to 5.2.9. * gnu/packages/linux.scm (linux-libre-5.2-version): Update to 5.2.9. (linux-libre-5.2-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 265f18cd1c..99087638f6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.2-version "5.2.8") +(define-public linux-libre-5.2-version "5.2.9") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "0dv91zfjkil29lp2l35lswkrhrqbc4kjh965ciaqwih1rh3cs9x1"))) + (hash (base32 "1rnlnphw9rih4qhdld9ic5lnj5jh4vy5nqbj9lqwv9bc615jmw5n"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -- cgit v1.2.3 From ddef146b894a1b1158b56bad72ca265537a55764 Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Thu, 15 Aug 2019 12:09:58 -0400 Subject: remote: Resolve missing 'G_'. * guix/remote.scm: Require (guix i18n). --- guix/remote.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/remote.scm b/guix/remote.scm index ae2fe17dd2..d0c3d04a25 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -19,6 +19,7 @@ (define-module (guix remote) #:use-module (guix ssh) #:use-module (guix gexp) + #:use-module (guix i18n) #:use-module (guix inferior) #:use-module (guix store) #:use-module (guix monads) -- cgit v1.2.3 From 4cc5e5204b503afb4536a1e93e2fd7a9f57f12bf Mon Sep 17 00:00:00 2001 From: "Jakob L. Kreuze" Date: Thu, 15 Aug 2019 12:09:11 -0400 Subject: machine: Use 'become-command'. * gnu/machine/ssh.scm (managed-host-remote-eval): Pass an appropriate 'become-command' to 'remote-eval'. * guix/ssh.scm (remote-authorize-signing-key): Add optional 'become-command' argument. All callers changed. --- gnu/machine/ssh.scm | 7 +++++-- guix/ssh.scm | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index ac3aa3e370..aafe0ccf41 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -126,7 +126,9 @@ an environment type of 'managed-host." #:build-locally? (machine-ssh-configuration-build-locally? config) #:system - (machine-ssh-configuration-system config)))) + (machine-ssh-configuration-system config) + #:become-command + (machine-become-command machine)))) ;;; @@ -377,7 +379,8 @@ have you run 'guix archive --generate-key?'") (lambda (port) (string->canonical-sexp (get-string-all port)))) - (machine-ssh-session machine))) + (machine-ssh-session machine) + (machine-become-command machine))) (mlet %store-monad ((_ (check-deployment-sanity machine)) (boot-parameters (machine-boot-parameters machine))) (let* ((os (machine-operating-system machine)) diff --git a/guix/ssh.scm b/guix/ssh.scm index 24834c6f68..7bc499a2fe 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -302,7 +302,7 @@ the machine on the other end of SESSION." (inferior-remote-eval '(begin (use-modules (guix utils)) (%current-system)) session)) -(define (remote-authorize-signing-key key session) +(define* (remote-authorize-signing-key key session #:optional become-command) "Send KEY, a canonical sexp containing a public key, over SESSION and add it to the system ACL file if it has not yet been authorized." (inferior-remote-eval @@ -321,7 +321,8 @@ to the system ACL file if it has not yet been authorized." (mkdir-p (dirname %acl-file)) (with-atomic-file-output %acl-file (cut write-acl acl <>))))) - session)) + session + become-command)) (define* (send-files local files remote #:key -- cgit v1.2.3 From c586f427b4831b9b492e5b900b2226e898b8fcfa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 16 Aug 2019 14:56:37 +0200 Subject: build-system/r: bioconductor-uri: Take optional package type. * guix/build-system/r.scm (bioconductor-uri): Take optional TYPE argument to return annotation or experiment URLs. --- guix/build-system/r.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index e7214155be..dd2a9fe8de 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -47,14 +47,22 @@ available via the first URI, the second URI points to the archived version." (string-append "mirror://cran/src/contrib/Archive/" name "/" name "_" version ".tar.gz"))) -(define (bioconductor-uri name version) +(define* (bioconductor-uri name version #:optional type) "Return a URI string for the R package archive on Bioconductor for the release corresponding to NAME and VERSION." - (list (string-append "https://bioconductor.org/packages/release/bioc/src/contrib/" - name "_" version ".tar.gz") - ;; TODO: use %bioconductor-version from (guix import cran) - (string-append "https://bioconductor.org/packages/3.9/bioc/src/contrib/Archive/" - name "_" version ".tar.gz"))) + (let ((type-url-part (match type + ('annotation "/data/annotation") + ('experiment "/data/experiment") + (_ "/bioc")))) + (list (string-append "https://bioconductor.org/packages/release" + type-url-part + "/src/contrib/" + name "_" version ".tar.gz") + ;; TODO: use %bioconductor-version from (guix import cran) + (string-append "https://bioconductor.org/packages/3.9" + type-url-part + "/src/contrib/Archive/" + name "_" version ".tar.gz")))) (define %r-build-system-modules ;; Build-side modules imported by default. -- cgit v1.2.3 From 5063deab0800ca3f75fa4671dc544cc212326608 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 16 Aug 2019 14:59:23 +0200 Subject: import: cran: Support experiment and annotation packages. * guix/import/cran.scm (%bioconductor-packages-list-url): Replace variable... (bioconductor-packages-list-url): ...with this procedure. (bioconductor-packages-list): Accept optional TYPE argument. (latest-bioconductor-package-version): Same. (fetch-description): Determine package type and use it in calls to LATEST-BIOCONDUCTOR-PACKAGE-VERSION and BIOCONDUCTOR-URI. (description->package): Pass package type to URI helper procedure; include package type in annotation or experiment packages from Bioconducter. --- guix/import/cran.scm | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 3240094444..9c964701b1 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -132,14 +132,19 @@ package definition." ;; updated together. (define %bioconductor-version "3.9") -(define %bioconductor-packages-list-url +(define* (bioconductor-packages-list-url #:optional type) (string-append "https://bioconductor.org/packages/" - %bioconductor-version "/bioc/src/contrib/PACKAGES")) - -(define (bioconductor-packages-list) + %bioconductor-version + (match type + ('annotation "/data/annotation") + ('experiment "/data/experiment") + (_ "/bioc")) + "/src/contrib/PACKAGES")) + +(define* (bioconductor-packages-list #:optional type) "Return the latest version of package NAME for the current bioconductor release." - (let ((url (string->uri %bioconductor-packages-list-url))) + (let ((url (string->uri (bioconductor-packages-list-url type)))) (guard (c ((http-get-error? c) (format (current-error-port) "error: failed to retrieve list of packages from ~s: ~a (~s)~%" @@ -153,12 +158,12 @@ release." (description->alist (string-join chunk "\n"))) (chunk-lines (read-lines (http-fetch/cached url))))))) -(define (latest-bioconductor-package-version name) +(define* (latest-bioconductor-package-version name #:optional type) "Return the version string corresponding to the latest release of the bioconductor package NAME, or #F if the package is unknown." (and=> (find (lambda (meta) (string=? (assoc-ref meta "Package") name)) - (bioconductor-packages-list)) + (bioconductor-packages-list type)) (cut assoc-ref <> "Version"))) ;; Little helper to download URLs only once. @@ -187,8 +192,12 @@ from ~s: ~a (~s)~%" ;; Currently, the bioconductor project does not offer a way to access a ;; package's DESCRIPTION file over HTTP, so we determine the version, ;; download the source tarball, and then extract the DESCRIPTION file. - (and-let* ((version (latest-bioconductor-package-version name)) - (url (car (bioconductor-uri name version))) + (and-let* ((type (or + (and (latest-bioconductor-package-version name) #t) + (and (latest-bioconductor-package-version name 'annotation) 'annotation) + (and (latest-bioconductor-package-version name 'experiment) 'experiment))) + (version (latest-bioconductor-package-version name type)) + (url (car (bioconductor-uri name version type))) (tarball (download url))) (call-with-temporary-directory (lambda (dir) @@ -198,8 +207,11 @@ from ~s: ~a (~s)~%" "--strip-components=1" "-C" dir "-f" tarball "*/DESCRIPTION")) - (description->alist (with-input-from-file - (string-append dir "/DESCRIPTION") read-string)))))))))) + (and=> (description->alist (with-input-from-file + (string-append dir "/DESCRIPTION") read-string)) + (lambda (meta) + (if (boolean? type) meta + (cons `(bioconductor-type . ,type) meta)))))))))))) (define (listify meta field) "Look up FIELD in the alist META. If FIELD contains a comma-separated @@ -306,7 +318,11 @@ from the alist META, which was derived from the R package's DESCRIPTION file." (home-page (match (listify meta "URL") ((url rest ...) url) (_ (string-append base-url name)))) - (source-url (match (uri-helper name version) + (source-url (match (apply uri-helper name version + (case repository + ((bioconductor) + (list (assoc-ref meta 'bioconductor-type))) + (else '()))) ((url rest ...) url) ((? string? url) url) (_ #f))) @@ -330,7 +346,11 @@ from the alist META, which was derived from the R package's DESCRIPTION file." (version ,version) (source (origin (method url-fetch) - (uri (,(procedure-name uri-helper) ,name version)) + (uri (,(procedure-name uri-helper) ,name version + ,@(or (and=> (assoc-ref meta 'bioconductor-type) + (lambda (type) + (list (list 'quote type)))) + '()))) (sha256 (base32 ,(bytevector->nix-base32-string (file-sha256 tarball)))))) -- cgit v1.2.3 From f781251bf25ed13f5072a0ef3b8b65aae2bbc32d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Aug 2019 21:14:22 +0200 Subject: gnu: wcslib: Update to 6.4. * gnu/packages/astronomy.scm (wcslib): Update to 6.4. --- gnu/packages/astronomy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3312fe0c47..1160feb553 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -81,15 +81,15 @@ in FITS files.") (define-public wcslib (package (name "wcslib") - (version "6.2") + (version "6.4") (source (origin (method url-fetch) (uri (string-append - "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib" version + "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version ".tar.bz2")) (sha256 - (base32 "01fqckazhbfqqhyr0wd9vcks1m2afmsh83l981alxg2r54jgwkdv")))) + (base32 "003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k")))) (inputs `(("cfitsio" ,cfitsio))) (build-system gnu-build-system) -- cgit v1.2.3 From 93b3ef1966f9860ae88b87263f8c7f6052565c3f Mon Sep 17 00:00:00 2001 From: Alva Date: Fri, 16 Aug 2019 00:52:08 +0200 Subject: gnu: font-ibm-plex: Update to 2.0.0. * gnu/packages/fonts.scm (font-ibm-plex): Update to 2.0.0. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/fonts.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 2dc1df45c8..1e28191ae1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Baptiste Strazzulla +;;; Copyright © 2019 Alva ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +64,7 @@ (define-public font-ibm-plex (package (name "font-ibm-plex") - (version "1.0.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (string-append @@ -71,7 +72,7 @@ "v" version "/OpenType.zip")) (sha256 (base32 - "0nzxw9z6waixslam248yr26ci3fbk83c7jf6m90hncnaj6zxx795")))) + "1lv65z3qnqgh2w36daf5wyz0ma9rg1qj9s9lzlnva8l7q3h8c9b8")))) (build-system font-build-system) (home-page "https://github.com/IBM/plex") (synopsis "IBM Plex typeface") -- cgit v1.2.3 From b65bd33c36dcc290193a419b34ad4d4a7b3ff14d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 16 Aug 2019 22:41:11 +0200 Subject: gnu: r-edger: Update to 3.26.7. * gnu/packages/bioinformatics.scm (r-edger): Update to 3.26.7. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a9e0264369..d729b1bc00 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7458,13 +7458,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.26.6") + (version "3.26.7") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "17vadhamjv4x0l4qqq2p2fi6j2bkllz5zd8dq761vgd5ic23zizm")))) + "1xbhb8aa1ygm5crkp1bmqs2x1601ppa2kgc2xlf2zh8jj8zqapg8")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From a7c714d3983c746d14b759707ff9e3487d580dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 16 Aug 2019 14:57:06 +0200 Subject: channels: Add 'profile-channels'. * guix/channels.scm (profile-channels): New procedure. * guix/scripts/describe.scm (display-profile-info)[channels]: Define in terms of 'profile-channels'. --- guix/channels.scm | 28 +++++++++++++++++++++++++++- guix/scripts/describe.scm | 27 +++------------------------ 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 415246cbd1..ebb2cacbc7 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -65,7 +65,9 @@ latest-channel-derivation channel-instances->manifest %channel-profile-hooks - channel-instances->derivation)) + channel-instances->derivation + + profile-channels)) ;;; Commentary: ;;; @@ -534,3 +536,27 @@ channel instances." latest instances of CHANNELS." (mlet %store-monad ((instances (latest-channel-instances* channels))) (channel-instances->derivation instances))) + +(define (profile-channels profile) + "Return the list of channels corresponding to entries in PROFILE. If +PROFILE is not a profile created by 'guix pull', return the empty list." + (filter-map (lambda (entry) + (match (assq 'source (manifest-entry-properties entry)) + (('source ('repository ('version 0) + ('url url) + ('branch branch) + ('commit commit) + _ ...)) + (channel (name (string->symbol + (manifest-entry-name entry))) + (url url) + (commit commit))) + + ;; No channel information for this manifest entry. + ;; XXX: Pre-0.15.0 Guix did not provide that information, + ;; but there's not much we can do in that case. + (_ #f))) + + ;; Show most recently installed packages last. + (reverse + (manifest-entries (profile-manifest profile))))) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index fa6b6cae37..99a88c50fa 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -153,30 +153,9 @@ in the format specified by FMT." (generation-number profile)) (define channels - (map (lambda (entry) - (match (assq 'source (manifest-entry-properties entry)) - (('source ('repository ('version 0) - ('url url) - ('branch branch) - ('commit commit) - _ ...)) - (channel (name (string->symbol (manifest-entry-name entry))) - (url url) - (commit commit))) - - ;; Pre-0.15.0 Guix does not provide that information, - ;; so there's not much we can do in that case. - (_ (channel (name 'guix) - (url "?") - (commit "?"))))) - - ;; Show most recently installed packages last. - (reverse - (manifest-entries - (profile-manifest - (if (zero? number) - profile - (generation-file-name profile number))))))) + (profile-channels (if (zero? number) + profile + (generation-file-name profile number)))) (match fmt ('human -- cgit v1.2.3 From 268896444bed7b958add74b2e1e86ff802c5f5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 16 Aug 2019 18:41:55 +0200 Subject: derivations: Delete duplicate inputs when computing derivation hash. Fixes . Reported by Carl Dong . * guix/derivations.scm (derivation/masked-inputs): Call 'delete-duplicates' on INPUTS. * tests/derivations.scm ("derivation with duplicate fixed-output inputs"): New test. --- guix/derivations.scm | 2 +- tests/derivations.scm | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index 92d50503ce..b3928920e2 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -685,7 +685,7 @@ name of each input with that input's hash." (make-derivation-input hash sub-drvs)))) inputs))) (make-derivation outputs - (sort inputs + (sort (delete-duplicates inputs) (lambda (drv1 drv2) (stringoutput-path final1) (derivation->output-path final2))))) +(test-assert "derivation with duplicate fixed-output inputs" + ;; Here we create a derivation that has two inputs, both of which are + ;; fixed-output leading to the same result. This test ensures the hash of + ;; that derivation is correctly computed, namely that duplicate inputs are + ;; coalesced. See . + (let* ((builder1 (add-text-to-store %store "fixed-builder1.sh" + "echo -n hello > $out" '())) + (builder2 (add-text-to-store %store "fixed-builder2.sh" + "echo hey; echo -n hello > $out" '())) + (hash (sha256 (string->utf8 "hello"))) + (fixed1 (derivation %store "fixed" + %bash `(,builder1) + #:hash hash #:hash-algo 'sha256)) + (fixed2 (derivation %store "fixed" + %bash `(,builder2) + #:hash hash #:hash-algo 'sha256)) + (builder3 (add-text-to-store %store "builder.sh" + "echo fake builder")) + (final (derivation %store "final" + %bash `(,builder3) + #:sources (list %bash builder3) + #:inputs (list (derivation-input fixed1) + (derivation-input fixed2))))) + (and (derivation? final) + (match (derivation-inputs final) + (((= derivation-input-derivation one) + (= derivation-input-derivation two)) + (and (not (string=? (derivation-file-name one) + (derivation-file-name two))) + (string=? (derivation->output-path one) + (derivation->output-path two)))))))) + (test-assert "multiple-output derivation" (let* ((builder (add-text-to-store %store "my-fixed-builder.sh" "echo one > $out ; echo two > $second" -- cgit v1.2.3 From 4f8b9d1a6f551697996c77b6e1741007e1f7c9cd Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 4 Mar 2018 02:09:08 +0100 Subject: linux-modules: Add "modules.alias" writer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/linux-modules.scm (write-module-alias-database): New procedure. Co-authored-by: Ludovic Courtès --- gnu/build/linux-modules.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index c66ef97012..9b9fc0d9d8 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2016, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2018 Danny Milosavljevic ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +49,9 @@ device-module-aliases known-module-aliases matching-modules - missing-modules)) + missing-modules + + write-module-alias-database)) ;;; Commentary: ;;; @@ -486,4 +489,22 @@ are required to access DEVICE." (remove (cut member <> provided) modules)) '())) +(define (write-module-alias-database directory) + "Traverse the '.ko' files in DIRECTORY and create the corresponding +'modules.alias' file." + (define aliases + (map (lambda (file) + (cons (file-name->module-name file) (module-aliases file))) + (find-files directory "\\.ko$"))) + + (call-with-output-file (string-append directory "/modules.alias") + (lambda (port) + (display "# Aliases extracted from modules themselves.\n" port) + (for-each (match-lambda + ((module . aliases) + (for-each (lambda (alias) + (format port "alias ~a ~a\n" alias module)) + aliases))) + aliases)))) + ;;; linux-modules.scm ends here -- cgit v1.2.3 From 2a693b69ca35ee942395e1adf458a666846881fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 12 Mar 2018 10:43:15 +0100 Subject: linux-modules: Add "modules.devname" writer. * gnu/build/linux-modules.scm (aliases->device-tuple) (write-module-device-database): New procedures. (%not-dash): New variable. Co-authored-by: Danny Milosavljevic . --- gnu/build/linux-modules.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index 9b9fc0d9d8..a73ccaf511 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -51,7 +51,8 @@ matching-modules missing-modules - write-module-alias-database)) + write-module-alias-database + write-module-device-database)) ;;; Commentary: ;;; @@ -507,4 +508,53 @@ are required to access DEVICE." aliases))) aliases)))) +(define (aliases->device-tuple aliases) + "Traverse ALIASES, a list of module aliases, and search for +\"char-major-M-N\", \"block-major-M-N\", or \"devname:\" aliases. When they +are found, return a tuple (DEVNAME TYPE MAJOR MINOR), otherwise return #f." + (define (char/block-major? alias) + (or (string-prefix? "char-major-" alias) + (string-prefix? "block-major-" alias))) + + (define (char/block-major->tuple alias) + (match (string-tokenize alias %not-dash) + ((type "major" (= string->number major) (= string->number minor)) + (list (match type + ("char" "c") + ("block" "b")) + major minor)))) + + (let* ((devname (any (lambda (alias) + (and (string-prefix? "devname:" alias) + (string-drop alias 8))) + aliases)) + (major/minor (match (find char/block-major? aliases) + (#f #f) + (str (char/block-major->tuple str))))) + (and devname major/minor + (cons devname major/minor)))) + +(define %not-dash + (char-set-complement (char-set #\-))) + +(define (write-module-device-database directory) + "Traverse the '.ko' files in DIRECTORY and create the corresponding +'modules.devname' file. This file contains information about modules that can +be loaded on-demand, such as file system modules." + (define aliases + (filter-map (lambda (file) + (match (aliases->device-tuple (module-aliases file)) + (#f #f) + (tuple (cons (file-name->module-name file) tuple)))) + (find-files directory "\\.ko$"))) + + (call-with-output-file (string-append directory "/modules.devname") + (lambda (port) + (display "# Device nodes to trigger on-demand module loading.\n" port) + (for-each (match-lambda + ((module devname type major minor) + (format port "~a ~a ~a~a:~a~%" + module devname type major minor))) + aliases)))) + ;;; linux-modules.scm ends here -- cgit v1.2.3 From e1a9a7f2755dc23e1f4635c8aee45e1467c01619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 9 Mar 2018 10:41:46 +0100 Subject: linux-modules: Add 'load-linux-modules-from-directory'. * gnu/build/linux-modules.scm (load-linux-modules-from-directory): New procedure. * gnu/build/linux-boot.scm (boot-system)[lookup-module]: Remove. Use 'load-linux-modules-from-directory' instead. --- gnu/build/linux-boot.scm | 9 ++------- gnu/build/linux-modules.scm | 12 ++++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 03f2ea245c..f273957d78 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -471,10 +471,6 @@ upon error." mounts) "ext4")) - (define (lookup-module name) - (string-append linux-module-directory "/" - (ensure-dot-ko name))) - (display "Welcome, this is GNU's early boot Guile.\n") (display "Use '--repl' for an initrd REPL.\n\n") @@ -489,9 +485,8 @@ upon error." (start-repl)) (display "loading kernel modules...\n") - (for-each (cut load-linux-module* <> - #:lookup-module lookup-module) - (map lookup-module linux-modules)) + (load-linux-modules-from-directory linux-modules + linux-module-directory) (when keymap-file (let ((status (system* "loadkeys" keymap-file))) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index a73ccaf511..2af7c33d42 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -43,6 +43,7 @@ modules-loaded module-loaded? load-linux-module* + load-linux-modules-from-directory current-module-debugging-port @@ -314,6 +315,17 @@ appears in BLACK-LIST are not loaded." (or (and recursive? (= EEXIST (system-error-errno args))) (apply throw args))))))) +(define (load-linux-modules-from-directory modules directory) + "Load MODULES and their dependencies from DIRECTORY, a directory containing +the '.ko' files. The '.ko' suffix is automatically added to MODULES if +needed." + (define (lookup-module name) + (string-append directory "/" (ensure-dot-ko name))) + + (for-each (cut load-linux-module* <> + #:lookup-module lookup-module) + (map lookup-module modules))) + ;;; ;;; Device modules. -- cgit v1.2.3 From c85ccf60bfe4ef58110bb61f40df7f526d2a5735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 14 Mar 2018 23:11:01 +0100 Subject: linux-modules: Define and use a module name database. Fixes . Reported by Julien Lepiller . * gnu/build/linux-modules.scm (module-formal-name): New procedure. (load-linux-modules-from-directory)[lookup-module]: Remove. [module-name->file-name]: New variable. Use it. (module-name->file-name/guess, module-name-lookup) (write-module-name-database): New procedures. * gnu/system/linux-initrd.scm (flat-linux-module-directory): Call 'write-module-name-database'. --- gnu/build/linux-modules.scm | 72 +++++++++++++++++++++++++++++++++++++++++---- gnu/system/linux-initrd.scm | 5 +++- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index 2af7c33d42..a149eff329 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -31,8 +31,10 @@ #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) + #:autoload (ice-9 pretty-print) (pretty-print) #:export (dot-ko ensure-dot-ko + module-formal-name module-aliases module-dependencies module-soft-dependencies @@ -52,6 +54,7 @@ matching-modules missing-modules + write-module-name-database write-module-alias-database write-module-device-database)) @@ -100,6 +103,14 @@ key/value pairs.." (define %not-comma (char-set-complement (char-set #\,))) +(define (module-formal-name file) + "Return the module name of FILE as it appears in its info section. Usually +the module name is the same as the base name of FILE, modulo hyphens and minus +the \".ko\" extension." + (match (assq 'name (modinfo-section-contents file)) + (('name . name) name) + (#f #f))) + (define (module-dependencies file) "Return the list of modules that FILE depends on. The returned list contains module names, not actual file names." @@ -319,12 +330,13 @@ appears in BLACK-LIST are not loaded." "Load MODULES and their dependencies from DIRECTORY, a directory containing the '.ko' files. The '.ko' suffix is automatically added to MODULES if needed." - (define (lookup-module name) - (string-append directory "/" (ensure-dot-ko name))) + (define module-name->file-name + (module-name-lookup directory)) - (for-each (cut load-linux-module* <> - #:lookup-module lookup-module) - (map lookup-module modules))) + (for-each (lambda (module) + (load-linux-module* (module-name->file-name module) + #:lookup-module module-name->file-name)) + modules)) ;;; @@ -502,6 +514,56 @@ are required to access DEVICE." (remove (cut member <> provided) modules)) '())) + +;;; +;;; Module databases. +;;; + +(define (module-name->file-name/guess directory name) + "Guess the file name corresponding to NAME, a module name. That doesn't +always work because sometimes underscores in NAME map to hyphens (e.g., +\"input-leds.ko\"), sometimes not (e.g., \"mac_hid.ko\")." + (string-append directory "/" (ensure-dot-ko name))) + +(define (module-name-lookup directory) + "Return a one argument procedure that takes a module name (e.g., +\"input_leds\") and returns its absolute file name (e.g., +\"/.../input-leds.ko\")." + (catch 'system-error + (lambda () + (define mapping + (call-with-input-file (string-append directory "/modules.name") + read)) + + (lambda (name) + (or (assoc-ref mapping name) + (module-name->file-name/guess directory name)))) + (lambda args + (if (= ENOENT (system-error-errno args)) + (cut module-name->file-name/guess directory <>) + (apply throw args))))) + +(define (write-module-name-database directory) + "Write a database that maps \"module names\" as they appear in the relevant +ELF section of '.ko' files, to actual file names. This format is +Guix-specific. It aims to deal with inconsistent naming, in particular +hyphens vs. underscores." + (define mapping + (map (lambda (file) + (match (module-formal-name file) + (#f (cons (basename file ".ko") file)) + (name (cons name file)))) + (find-files directory "\\.ko$"))) + + (call-with-output-file (string-append directory "/modules.name") + (lambda (port) + (display ";; Module name to file name mapping. +;; +;; This format is Guix-specific; it is not supported by upstream Linux tools. +\n" + port) + (pretty-print mapping port)))) + (define (write-module-alias-database directory) "Traverse the '.ko' files in DIRECTORY and create the corresponding 'modules.alias' file." diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index c90b87c023..7e9563b923 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -133,7 +133,10 @@ MODULES and taken from LINUX." (copy-file module (string-append #$output "/" (basename module)))) - (delete-duplicates modules))))) + (delete-duplicates modules)) + + ;; Hyphen or underscore? This database tells us. + (write-module-name-database #$output)))) (computed-file "linux-modules" build-exp)) -- cgit v1.2.3 From 3b165f2a401a6f890f5f93371bdf137daf09c493 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 16 Aug 2019 18:36:50 +0200 Subject: gnu: wpa-supplicant: install documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (wpa-supplicant)[arguments]: Rename 'install-man-pages' phase to 'install-documentation'; install READMEs and the example config file. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bd3c14033e..979b901c1a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1240,9 +1240,10 @@ commands and their arguments.") CONFIG_READLINE=y\n" port) (close-port port)) #t)) - (add-after 'install 'install-man-pages + (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/wpa-supplicant")) (man (string-append out "/share/man")) (man5 (string-append man "/man5")) (man8 (string-append man "/man8"))) @@ -1255,6 +1256,15 @@ commands and their arguments.") (find-files "doc/docbook" "\\.5")) (for-each (copy-man-page man8) (find-files "doc/docbook" "\\.8")) + + ;; wpa_supplicant.conf(5) does not explain all configuration + ;; options but refers to the example config file, so install it + ;; along with READMEs. + (for-each (lambda (file) + (install-file file doc)) + '("README" "README-DPP" "README-HS20" + "README-P2P" "README-WPS" + "wpa_supplicant.conf")) #t)))) #:make-flags (list "CC=gcc" @@ -1303,7 +1313,7 @@ command.") CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) (close-port port)) #t)) - (add-after 'install-man-pages 'install-dbus-conf + (add-after 'install-documentation 'install-dbus-conf (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (dir (string-append out "/etc/dbus-1/system.d"))) -- cgit v1.2.3 From 66d146639d0dfd2efaed4a429dbb845172dc4f24 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 16 Aug 2019 11:19:56 +0200 Subject: gnu: txr: Update to 223. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (txr): Update to 223. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d2bed231bd..a42369ba06 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5319,7 +5319,7 @@ port within a range.") (define-public txr (package (name "txr") - (version "216") + (version "223") (source (origin (method url-fetch) @@ -5329,7 +5329,7 @@ port within a range.") (patches (search-patches "txr-shell.patch")) (sha256 (base32 - "07cxdpc9zsqd0c2668g00dqjpd6zc4mfdn74aarr6d2hpzdhh937")))) + "0109q8idqggba3kx58dpm5ccfpdrki68npkcxm18p5ga24611fcv")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("cc=gcc") @@ -5343,7 +5343,7 @@ port within a range.") #t)) (replace 'check (lambda _ - (zero? (system* "make" "tests"))))))) + (invoke "make" "tests")))))) (native-inputs `(("bison" ,bison) ("flex" ,flex))) -- cgit v1.2.3 From 7d30b58808e17fd194000c8bde10c5e8b30d5af0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 16 Aug 2019 11:42:37 +0200 Subject: gnu: gramps: Update to 5.0.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/genealogy.scm (gramps): Update to 5.0.2. Signed-off-by: Ludovic Courtès --- gnu/packages/genealogy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm index 2db3fdb918..ec9d99400f 100644 --- a/gnu/packages/genealogy.scm +++ b/gnu/packages/genealogy.scm @@ -38,7 +38,7 @@ (define-public gramps (package (name "gramps") - (version "5.0.1") + (version "5.0.2") (source (origin (method git-fetch) @@ -48,7 +48,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1jz1fbjj6byndvir7qxzhd2ryirrd5h2kwndxpp53xdc05z1i8g7")))) + "0wg743q8ixy5dmwricgkl4zck4109vq5ppmkyi18qjmna9m0aq7r")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From a830d14d4be2f81192e49a91a21a15121808e0a8 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Wed, 14 Aug 2019 19:23:02 +0200 Subject: gnu: Add libgit2-glib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libgit2-glib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da6cbf2a05..d5e46e09c1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8283,3 +8283,35 @@ advanced image management tool") (description "The aim of the handy library is to help with developing user intefaces for mobile devices using GTK+.") (license license:lgpl2.1+))) + +(define-public libgit2-glib + (package + (name "libgit2-glib") + (version "0.28.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7")))) + (build-system meson-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") ;; For glib-mkenums + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("libssh2" ,libssh2) + ("pkg-config" ,pkg-config) + ("python-pygobject" ,python-pygobject) + ("python-wrapper" ,python-wrapper) + ("vala" ,vala))) + (inputs + `(("glib" ,glib) + ("libgit2" ,libgit2))) + (synopsis "GLib wrapper around the libgit2 Git access library") + (description "libgit2-glib is a GLib wrapper library around the libgit2 Git +access library. It only implements the core plumbing functions, not really the +higher level porcelain stuff.") + (home-page "https://wiki.gnome.org/Projects/Libgit2-glib") + (license license:gpl2+))) -- cgit v1.2.3 From 2a63974df9b6ce2ec076b24f300e63b6b3df549f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 17 Aug 2019 10:00:27 +0200 Subject: gnu: wine-staging: Update to 4.14. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.14. * gnu/packages/wine.scm (wine-staging): Update to 4.14. * gnu/packages/wine.scm (wine64-staging): Remove obsolete comment. --- gnu/packages/wine.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 43dae3cf7c..b8a2264153 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -318,7 +318,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.13") + (version "4.14") (source (origin (method git-fetch) @@ -328,7 +328,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0bbwsd2qpjilxpjscqbp78p0gl0awj1yj62g0wvybh4x89fzy8zj")))) + "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -374,7 +374,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0rqx8g394aj5q913cd18zsi60sldvxarrp178w6ja0y4rd8l25vr")))) + "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("faudio" ,faudio) ("ffmpeg" ,ffmpeg) @@ -499,7 +499,6 @@ integrated into the main branch.") (script (string-append (assoc-ref %build-inputs "wine-staging-patchset-data") "/share/wine-staging/patches/patchinstall.sh"))) - ;; Exclude specific patches that conflict with FAudio. (invoke script (string-append "DESTDIR=" ".") "--all") #t))) (add-after 'install 'copy-wine32-binaries -- cgit v1.2.3 From 02460db0474ff5ac0d867ed6d5b192c062af0abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 17 Aug 2019 20:26:58 +0800 Subject: machine: ssh: Fix sanity checks. * gnu/machine/ssh.scm (machine-check-file-system-availability)[check-labeled-file-system]: Use 'source-module-closure' for '(gnu build file-systems)'. (machine-check-initrd-modules): Unquote 'file-system-label->string' instead of 'device'. --- gnu/machine/ssh.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index aafe0ccf41..6e3ed0e092 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -166,7 +166,8 @@ MACHINE's 'system' declaration do not exist on the machine." (define (check-labeled-file-system fs) (define remote-exp - (with-imported-modules '((gnu build file-systems)) + (with-imported-modules (source-module-closure + '((gnu build file-systems))) #~(begin (use-modules (gnu build file-systems)) (find-partition-by-label #$(file-system-label->string @@ -243,7 +244,7 @@ MACHINE's 'system' declaration do not exist on the machine." #$(uuid->string device)))) ((file-system-label? device) #~(find-partition-by-label - (file-system-label->string #$device))))) + #$(file-system-label->string device))))) (missing-modules dev '#$(operating-system-initrd-modules (machine-operating-system machine))))))) -- cgit v1.2.3 From 37592014e13abead7a691d0dcb5918d1a10f5cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 15:34:24 +0200 Subject: tests: Relax expectations for the 'home-page' checker. Fixes a regression introduced in 50fc2384feb3bb2677d074f8f0deb5ae3c56b4d8. * tests/lint.scm (warning-contains?): New procedure. ("home-page: host not found"): Use 'warning-contains?' instead of testing for equality, as was the case before commit 50fc2384feb. This handles the case where the 'getaddrinfo' error is not "Name or service not known" but instead something like "System error" or "Servname not supported for ai_socktype", as is the case in the build environment. --- tests/lint.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/lint.scm b/tests/lint.scm index 8a9023a7a3..db6dd6dbe1 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -74,6 +74,12 @@ (((and (? lint-warning?) warning)) (lint-warning-message warning)))) +(define (warning-contains? str warnings) + "Return true if WARNINGS is a singleton with a warning that contains STR." + (match warnings + (((? lint-warning? warning)) + (string-contains (lint-warning-message warning) str)))) + (test-begin "lint") @@ -366,13 +372,11 @@ (single-lint-warning-message (check-home-page pkg)))) -(test-equal "home-page: host not found" - "URI http://does-not-exist domain not found: Name or service not known" +(test-assert "home-page: host not found" (let ((pkg (package (inherit (dummy-package "x")) (home-page "http://does-not-exist")))) - (single-lint-warning-message - (check-home-page pkg)))) + (warning-contains? "domain not found" (check-home-page pkg)))) (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "home-page: Connection refused" -- cgit v1.2.3 From 75a6f66815db811cc41aadbe93033a6efd3ad62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 15:40:49 +0200 Subject: tests: Move 'guix environment -C --no-cwd' test where it belongs. This ensures that this test is skipped in contexts where user namespaces are not supported, instead of failing. This is a followup to commit b6dc08393e6a8313b88ce422fc3c1e4e9c0efc6f. * tests/guix-environment.sh: Move '--container --no-cwd' test to... * tests/guix-environment-container.sh: ... here. --- tests/guix-environment-container.sh | 7 +++++++ tests/guix-environment.sh | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index 78507f76c0..32a5ba1f97 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -144,6 +144,13 @@ HOME="$tmpdir" guix environment --bootstrap --container --user=foognu \ --share="$tmpdir/umock" \ -- guile -c "$usertest" +# if not sharing CWD, chdir home +( + cd "$tmpdir" \ + && guix environment --bootstrap --container --no-cwd --user=foo \ + --ad-hoc guile-bootstrap --pure \ + -- /bin/sh -c 'test $(pwd) == "/home/foo" -a ! -d '"$tmpdir" +) # Check the exit code. diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh index 5a5a69d58c..a670db36be 100644 --- a/tests/guix-environment.sh +++ b/tests/guix-environment.sh @@ -84,14 +84,6 @@ echo "(use-modules (guix profiles) (gnu packages bootstrap)) guix environment --bootstrap --manifest=$tmpdir/manifest.scm --pure \ -- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"' -# if not sharing CWD, chdir home -( - cd "$tmpdir" \ - && guix environment --bootstrap --container --no-cwd --user=foo \ - --ad-hoc guile-bootstrap --pure \ - -- /bin/sh -c 'test $(pwd) == "/home/foo" -a ! -d '"$tmpdir" -) - # Make sure '-r' works as expected. rm -f "$gcroot" expected="`guix environment --bootstrap --ad-hoc guile-bootstrap \ -- cgit v1.2.3 From 198f560fcdf4f05b83b565acfd632153fb09bbf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 15:48:10 +0200 Subject: gnu: geeqie: Build sequentially. * gnu/packages/image-viewers.scm (geeqie)[arguments]: Add #:parallel-build?. --- gnu/packages/image-viewers.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index d33a9857c9..0c5da63053 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2017, 2018 Ludovic Courtès +;;; Copyright © 2013, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018 Efraim Flashner @@ -131,6 +131,11 @@ actions.") `( ;; Enable support for a "map" pane using GPS data. #:configure-flags '("--enable-map") + ;; Parallel builds fail with something like: + ;; image-load.c:143:9: error: ‘gq_marshal_VOID__INT_INT_INT_INT’ undeclared + ;; due to unexpressed makefile dependencies. + #:parallel-build? #f + #:phases (modify-phases %standard-phases (add-before 'bootstrap 'pre-bootstrap -- cgit v1.2.3 From c902458863d1d341ffd74970b75e69c2bb848183 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Mon, 15 Jul 2019 15:47:14 +0200 Subject: gnu: Add elm-compiler 0.19.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds the elm compiler, version 0.19.0. This provides the `elm` command, with the exception of the `elm reactor` subcommand. Named `elm-compiler`, to leave space for `elm` as the full elm including reactor. * gnu/packages/elm.scm: New module. (elm-compiler): New package. * gnu/packages/patches/elm-disable-reactor.patch: New patch. * gnu/packages/patches/elm-fix-map-key.patch: New patch. * gnu/packages/patches/elm-relax-glsl-bound.patch: New patch. * gnu/local.mk: Add new files. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 6 +- gnu/packages/elm.scm | 81 ++++++++++++++++++++++ .../patches/elm-compiler-disable-reactor.patch | 71 +++++++++++++++++++ .../patches/elm-compiler-fix-map-key.patch | 38 ++++++++++ .../patches/elm-compiler-relax-glsl-bound.patch | 19 +++++ 5 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/elm.scm create mode 100644 gnu/packages/patches/elm-compiler-disable-reactor.patch create mode 100644 gnu/packages/patches/elm-compiler-fix-map-key.patch create mode 100644 gnu/packages/patches/elm-compiler-relax-glsl-bound.patch diff --git a/gnu/local.mk b/gnu/local.mk index 16b63bc951..aab29beb0a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -161,6 +161,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/electronics.scm \ %D%/packages/elf.scm \ %D%/packages/elixir.scm \ + %D%/packages/elm.scm \ %D%/packages/embedded.scm \ %D%/packages/emacs.scm \ %D%/packages/emacs-xyz.scm \ @@ -770,9 +771,12 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-path-length.patch \ - %D%/packages/patches/einstein-build.patch \ + %D%/packages/patches/elm-compiler-disable-reactor.patch \ + %D%/packages/patches/elm-compiler-fix-map-key.patch \ + %D%/packages/patches/elm-compiler-relax-glsl-bound.patch \ %D%/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm new file mode 100644 index 0000000000..8b5ec36621 --- /dev/null +++ b/gnu/packages/elm.scm @@ -0,0 +1,81 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Robert Vollmert +;;; +;;; 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 . + +(define-module (gnu packages elm) + #:use-module (gnu packages) + #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages haskell-web) + #:use-module (guix build-system haskell) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +;; The full elm build calls out to itself via Template Haskell to +;; compile the elm reactor web app. elm reactor isn't required to +;; compile elm applications, so we take this part out of this +;; bootstrap package. +(define-public elm-compiler + (package + (name "elm-compiler") + (version "0.19.0") + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/elm/compiler/") + (commit version))) + (sha256 + (base32 "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy")) + (patches + (search-patches "elm-compiler-disable-reactor.patch" + "elm-compiler-relax-glsl-bound.patch" + "elm-compiler-fix-map-key.patch")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-edit-distance" ,ghc-edit-distance) + ("ghc-file-embed" ,ghc-file-embed) + ("ghc-http" ,ghc-http) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls) + ("ghc-http-types" ,ghc-http-types) + ("ghc-language-glsl" ,ghc-language-glsl) + ("ghc-logict" ,ghc-logict) + ("ghc-network" ,ghc-network) + ("ghc-raw-strings-qq" ,ghc-raw-strings-qq) + ("ghc-scientific" ,ghc-scientific) + ("ghc-sha" ,ghc-sha) + ("ghc-snap-core" ,ghc-snap-core) + ("ghc-snap-server" ,ghc-snap-server) + ("ghc-unordered-containers" + ,ghc-unordered-containers) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-vector" ,ghc-vector) + ("ghc-zip-archive" ,ghc-zip-archive))) + (home-page "https://elm-lang.org") + (synopsis "Programming language for Web applications") + (description + "This package provides Elm, a statically-typed functional programming +language for the browser. It includes commands for developers such as +@command{elm make} and @command{elm repl}.") + (license license:bsd-3))) diff --git a/gnu/packages/patches/elm-compiler-disable-reactor.patch b/gnu/packages/patches/elm-compiler-disable-reactor.patch new file mode 100644 index 0000000000..9871b55e8d --- /dev/null +++ b/gnu/packages/patches/elm-compiler-disable-reactor.patch @@ -0,0 +1,71 @@ +commit 20d80e2323b565a36751c9455e535d8f73fa32f7 +Author: Robert Vollmert +Date: Fri Jun 14 16:05:47 2019 +0200 + + disable reactor + +diff --git a/elm.cabal b/elm.cabal +index c75f9689..ece63c46 100644 +--- a/elm.cabal ++++ b/elm.cabal +@@ -45,9 +45,6 @@ Executable elm + builder/src + ui/terminal/src + +- other-extensions: +- TemplateHaskell +- + Main-Is: + Main.hs + +@@ -56,8 +53,6 @@ Executable elm + Develop + Develop.Generate.Help + Develop.Generate.Index +- Develop.StaticFiles +- Develop.StaticFiles.Build + Diff + Init + Install +diff --git a/ui/terminal/src/Develop.hs b/ui/terminal/src/Develop.hs +index 4b2252e1..7ed7716e 100644 +--- a/ui/terminal/src/Develop.hs ++++ b/ui/terminal/src/Develop.hs +@@ -23,7 +23,6 @@ import Snap.Util.FileServe + import qualified Elm.Project as Project + import qualified Develop.Generate.Help as Generate + import qualified Develop.Generate.Index as Index +-import qualified Develop.StaticFiles as StaticFiles + import qualified Generate.Output as Output + import qualified Json.Encode as Encode + import qualified Reporting.Exit as Exit +@@ -219,16 +218,7 @@ compileToHtmlBuilder mode file = + + + serveAssets :: Snap () +-serveAssets = +- do file <- getSafePath +- case StaticFiles.lookup file of +- Nothing -> +- pass +- +- Just (content, mimeType) -> +- do modifyResponse (setContentType (mimeType <> ";charset=utf-8")) +- writeBS content +- ++serveAssets = pass + + + -- MIME TYPES +diff --git a/ui/terminal/src/Main.hs b/terminal/src/Main.hs +index 7000f3ca..2c76965a 100644 +--- a/ui/terminal/src/Main.hs ++++ b/ui/terminal/src/Main.hs +@@ -39,7 +39,6 @@ main = + complex intro outro + [ repl + , init +- , reactor + , make + , install + , bump diff --git a/gnu/packages/patches/elm-compiler-fix-map-key.patch b/gnu/packages/patches/elm-compiler-fix-map-key.patch new file mode 100644 index 0000000000..4f05ded530 --- /dev/null +++ b/gnu/packages/patches/elm-compiler-fix-map-key.patch @@ -0,0 +1,38 @@ +commit e3512d887df41a8162c3e361171c04beca08415b +Author: Tom Stejskal +Date: Mon Nov 19 20:09:43 2018 +0100 + + Fix Map.!: given key is not an element in the map + +diff --git a/compiler/src/Elm/Compiler/Type/Extract.hs b/compiler/src/Elm/Compiler/Type/Extract.hs +index 1aafe1d4..99763392 100644 +--- a/compiler/src/Elm/Compiler/Type/Extract.hs ++++ b/compiler/src/Elm/Compiler/Type/Extract.hs +@@ -10,6 +10,7 @@ module Elm.Compiler.Type.Extract + + + import Data.Map ((!)) ++import qualified Data.Map as Map + import qualified Data.Maybe as Maybe + import qualified Data.Set as Set + +@@ -134,11 +135,15 @@ extractUnion interfaces (Opt.Global home name) = + else + let + pname = toPublicName home name +- unions = I._unions (interfaces ! home) ++ maybeUnions = I._unions <$> Map.lookup home interfaces + in +- case I.toUnionInternals (unions ! name) of +- Can.Union vars ctors _ _ -> +- T.Union pname vars <$> traverse extractCtor ctors ++ case Map.lookup name =<< maybeUnions of ++ Just union -> ++ case I.toUnionInternals union of ++ Can.Union vars ctors _ _ -> ++ T.Union pname vars <$> traverse extractCtor ctors ++ Nothing -> ++ return $ T.Union pname [] [] + + + extractCtor :: Can.Ctor -> Extractor (N.Name, [T.Type]) diff --git a/gnu/packages/patches/elm-compiler-relax-glsl-bound.patch b/gnu/packages/patches/elm-compiler-relax-glsl-bound.patch new file mode 100644 index 0000000000..3f8be810c2 --- /dev/null +++ b/gnu/packages/patches/elm-compiler-relax-glsl-bound.patch @@ -0,0 +1,19 @@ +commit 4c649a5a270aba15cc6a3913c3ad51a293047f40 +Author: Rémi Lefèvre +Date: Mon Sep 3 19:18:54 2018 +0200 + + update language-glsl maximum version + +diff --git a/elm.cabal b/elm.cabal +index 48aa84f0..464fe9d5 100644 +--- a/elm.cabal ++++ b/elm.cabal +@@ -246,7 +246,7 @@ Executable elm + http-client >= 0.5 && < 0.6, + http-client-tls >= 0.3 && < 0.4, + http-types >= 0.9 && < 1.0, +- language-glsl >= 0.0.2 && < 0.3, ++ language-glsl >= 0.0.2 && < 0.4, + logict, + mtl >= 2.2.1 && < 3, + network >= 2.4 && < 2.7, -- cgit v1.2.3 From 2eb0628a423a36bc21777d7439885baa9a9a8e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 19:13:15 +0200 Subject: gnu: guix, cuirass: Update to c902458 and 858b6b8 with Guile-JSON 3.x. * gnu/packages/package-management.scm (guix): Update to c902458. [inputs]: Switch to GUILE-JSON-3. (guix-daemon)[inputs]: Switch to GUILE-JSON-3. * gnu/packages/ci.scm (cuirass): Update to 858b6b8. [inputs]: Switch to GUILE-JSON-3. --- gnu/packages/ci.scm | 8 ++++---- gnu/packages/package-management.scm | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 4af2cdc6ea..d706e8d04b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "0b40dca734468e8b12b3ff58e3e779679f17d38e") - (revision "21")) + (let ((commit "858b6b8c8f2ae7b1ddaf4ae363147121be1f1fe8") + (revision "22")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -60,7 +60,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "1kdxs8dzdyldfs4wsz5hb64hprkbrnq5ljdll631f3bj8pbvvvc1")))) + "049hg0yaakmfp27950cn0yn43r0v7bqva75xi082n8cxzi6vadgc")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -121,7 +121,7 @@ `(("guile" ,guile-2.2) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3b003fd30f..c982cbfe5d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -111,8 +111,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "4a54ed774913480c0f8dad3caf0cd627e4fa8ebf") - (revision 3)) + (commit "c902458863d1d341ffd74970b75e69c2bb848183") + (revision 4)) (package (name "guix") @@ -128,7 +128,7 @@ (commit commit))) (sha256 (base32 - "14m4a4bn0d5hav6mrks5d7r223knx9dpswgbsc875wgr2921na2h")) + "0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -293,7 +293,7 @@ (propagated-inputs `(("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git))) @@ -325,7 +325,7 @@ the Nix package manager.") (inputs `(("gnutls" ,gnutls) ("guile-git" ,guile-git) - ("guile-json" ,guile-json-1) + ("guile-json" ,guile-json-3) ("guile-gcrypt" ,guile-gcrypt) ,@(fold alist-delete (package-inputs guix) '("boot-guile" "boot-guile/i686" "util-linux")))) -- cgit v1.2.3 From 23ab21fa9d4ed47035dc446b10e9110243d9cdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 19:14:49 +0200 Subject: derivations: Fix typo in docstring. * guix/derivations.scm (derivation-build-plan): Fix typo in the docstring. --- guix/derivations.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/derivations.scm b/guix/derivations.scm index b3928920e2..e1073ea39b 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -376,8 +376,8 @@ of SUBSTITUTABLES." (substitution-oracle store inputs #:mode mode))) "Given INPUTS, a list of derivation-inputs, return two values: the list of -derivation to build, and the list of substitutable items that, together, -allows INPUTS to be realized. +derivations to build, and the list of substitutable items that, together, +allow INPUTS to be realized. SUBSTITUTABLE-INFO must be a one-argument procedure similar to that returned by 'substitution-oracle'." -- cgit v1.2.3 From 611a64bd7e0893057cd04dcdc2a8d5e7ecc39e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 19:24:08 +0200 Subject: build: 'GUIX_CHECK_GUILE_JSON' really checks for Guile-JSON 3.x. Until now the 'guile' process would always exit with 0, as long as Guile-JSON is installed, whether it's version 1 or version 3. * m4/guix.m4 (GUIX_CHECK_GUILE_JSON): Fix array syntax and remove catch-all 'match' clause. --- m4/guix.m4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/m4/guix.m4 b/m4/guix.m4 index 716bfb08ec..8be7cca54f 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -184,9 +184,8 @@ AC_DEFUN([GUIX_CHECK_GUILE_JSON], [ [guix_cv_have_recent_guile_json], [GUILE_CHECK([retval], [(use-modules (json) (ice-9 match)) - (match (json-string->scm \"[[] { \\\"a\\\": 42 } []]\") - (#(("a" . 42)) #t) - (_ #f))]) + (match (json-string->scm \"[[ { \\\"a\\\": 42 } ]]\") + (#((("a" . 42))) #t))]) if test "$retval" = 0; then guix_cv_have_recent_guile_json="yes" else -- cgit v1.2.3 From d88b811adf389e6445caf15fe6a581ac067deab7 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 17 Aug 2019 22:49:40 +0530 Subject: gnu: guile-email: Fix source hash. * gnu/packages/guile-xyz.scm (guile-email)[source]: Fix hash. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8c36658361..16e30b9de7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -916,7 +916,7 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") version ".tar.lz")) (sha256 (base32 - "05pm0rwdxhjdlpmvhn0kyfslph6j5m1gv76givs0hshb30nirl2x")))) + "0zgvh2329zrclxfb1lh7dnqrq46jj77l0lx7j9y6y3xgbhd2d9l0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 8d64ef567f816d29a4b25fe1cfbeb8005dc7cc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 22:13:30 +0200 Subject: import: gnome: Update for Guile-JSON 3.x. This is a followup to 81c3dc32244a17241d74eea9fa265edfcb326f6d. * guix/import/gnome.scm (jsonish->upstream-source): Use 'assoc-ref' instead of 'hash-ref'. (latest-gnome-release): Match a vector containing an alist, not a hash table. Use 'fold' instead of 'hash-fold' over RELEASES. --- guix/import/gnome.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm index 1ade63e1af..436ec88ef9 100644 --- a/guix/import/gnome.scm +++ b/guix/import/gnome.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,7 +46,7 @@ source for metadata." (package name) (version version) (urls (filter-map (lambda (extension) - (match (hash-ref dictionary extension) + (match (assoc-ref dictionary extension) (#f #f) ((? string? relative-url) @@ -86,21 +86,22 @@ not be determined." (json (json->scm port))) (close-port port) (match json - ((4 (? hash-table? releases) _ ...) - (let* ((releases (hash-ref releases upstream-name)) - (latest (hash-fold (lambda (key value result) - (cond ((even-minor-version? key) - (match result - (#f - (cons key value)) - ((newest . _) - (if (version>? key newest) - (cons key value) - result)))) - (else - result))) - #f - releases))) + (#(4 releases _ ...) + (let* ((releases (assoc-ref releases upstream-name)) + (latest (fold (match-lambda* + (((key . value) result) + (cond ((even-minor-version? key) + (match result + (#f + (cons key value)) + ((newest . _) + (if (version>? key newest) + (cons key value) + result)))) + (else + result)))) + #f + releases))) (and latest (jsonish->upstream-source upstream-name latest)))))))) -- cgit v1.2.3 From 4496ea74aaf9d2497ac3eaf8f780a250bed24503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 22:48:26 +0200 Subject: refresh: Use the standard diagnostic procedures. * guix/scripts/refresh.scm (warn-no-updater): Use 'warning' instead of 'format'. (update-package): Use 'info' and 'warning' instead of 'format'. --- guix/scripts/refresh.scm | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index dd7026a6a4..4591d0f308 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -285,10 +285,9 @@ update would trigger a complete rebuild." (exit 0)) (define (warn-no-updater package) - (format (current-error-port) - (G_ "~a: warning: no updater for ~a~%") - (location->string (package-location package)) - (package-name package))) + (warning (package-location package) + (G_ "no updater for ~a~%") + (package-name package))) (define* (update-package store package updaters #:key (key-download 'interactive) warn?) @@ -306,11 +305,10 @@ warn about packages that have no matching updater." (when version (if (and=> tarball file-exists?) (begin - (format (current-error-port) - (G_ "~a: ~a: updating from version ~a to version ~a...~%") - (location->string loc) - (package-name package) - (package-version package) version) + (info loc + (G_ "~a: updating from version ~a to version ~a...~%") + (package-name package) + (package-version package) version) (for-each (lambda (change) (format (current-error-port) @@ -350,27 +348,24 @@ WARN? is true and no updater exists for PACKAGE, print a warning." (case (version-compare (upstream-source-version source) (package-version package)) ((>) - (format (current-error-port) - (G_ "~a: ~a would be upgraded from ~a to ~a~%") - (location->string loc) - (package-name package) (package-version package) - (upstream-source-version source))) + (info loc + (G_ "~a would be upgraded from ~a to ~a~%") + (package-name package) (package-version package) + (upstream-source-version source))) ((=) (when warn? - (format (current-error-port) - (G_ "~a: info: ~a is already the latest version of ~a~%") - (location->string loc) - (package-version package) - (package-name package)))) + (info loc + (G_ "~a is already the latest version of ~a~%") + (package-version package) + (package-name package)))) (else (when warn? - (format (current-error-port) - (G_ "~a: warning: ~a is greater than \ + (warning loc + (G_ "~a is greater than \ the latest known version of ~a (~a)~%") - (location->string loc) - (package-version package) - (package-name package) - (upstream-source-version source))))))) + (package-version package) + (package-name package) + (upstream-source-version source))))))) (#f (when warn? (warn-no-updater package))))) -- cgit v1.2.3 From 0ea009db9d3bf53e75be8faef77c18d39c87a16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 22:50:58 +0200 Subject: upstream: Gracefully handle archive type changes. Previously, if the currently used archive type (e.g., "bz2") was unavailable for the new version, 'guix refresh -u' would crash instead of updating to the archive with the new type. * guix/upstream.scm (package-update/url-fetch): When URL is #f, pick the first of URLS; likewise for SIGNATURE-URL. --- guix/upstream.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index 1326b3db95..d4f9c5bb45 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -362,6 +362,7 @@ SOURCE, an ." (_ "gz"))) ((url signature-url) + ;; Try to find a URL that matches ARCHIVE-TYPE. (find2 (lambda (url sig-url) ;; Some URIs lack a file extension, like ;; 'https://crates.io/???/0.1/download'. In that @@ -370,7 +371,13 @@ SOURCE, an ." (string-suffix? archive-type url))) urls (or signature-urls (circular-list #f))))) - (let ((tarball (download-tarball store url signature-url + ;; If none of URLS matches ARCHIVE-TYPE, then URL is #f; in that case, + ;; pick up the first element of URLS. + (let ((tarball (download-tarball store + (or url (first urls)) + (and (pair? signature-urls) + (or signature-url + (first signature-urls))) #:key-download key-download))) (values version tarball source)))))) -- cgit v1.2.3 From beeeb261f2bed48edbcd7e909d4edfbe268147c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 22:53:43 +0200 Subject: gnu: setxkbmap: Update to 1.3.2. * gnu/packages/xorg.scm (setxkbmap): Update to 1.3.2. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 926fb746b0..b21d3d9966 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1805,7 +1805,7 @@ used with other display managers such as gdm or kdm.") (define-public setxkbmap (package (name "setxkbmap") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) @@ -1815,7 +1815,7 @@ used with other display managers such as gdm or kdm.") ".tar.bz2")) (sha256 (base32 - "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9")))) + "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg")))) (build-system gnu-build-system) (inputs `(("libxkbfile" ,libxkbfile) -- cgit v1.2.3 From 1b1c1621245a13976ea1b4fa28b8db7f449a5e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 17 Aug 2019 22:54:00 +0200 Subject: gnu: xrandr: Update to 1.5.1. * gnu/packages/xorg.scm (xrandr): Update to 1.5.1. Change archive type to ".tar.xz". --- gnu/packages/xorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index b21d3d9966..352a28a8b1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4155,16 +4155,16 @@ an X server.") (define-public xrandr (package (name "xrandr") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/app/xrandr-" - version ".tar.bz2")) + version ".tar.xz")) (sha256 (base32 - "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1")))) + "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv")))) (build-system gnu-build-system) (inputs `(("libxrender" ,libxrender) -- cgit v1.2.3 From e764ba5225f735e06e4c06eba5fbcd21579300e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 17 Aug 2019 20:32:13 +0200 Subject: gnu: git: Update to 2.23.0. * gnu/packages/version-control.scm (git): Update to 2.23.0. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e05a4928f4..4ef46df50b 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.22.1") + (version "2.23.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "093qjgagha937w96izkpsjkhxf5drsa7rvk5snlyjivqnwxgkqac")))) + "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "17vpqv9g8li58njx7z5124b3c2zb2n63z4dalh5gw9iys7qb8446")))) + "0sllhyl0w29v4n303hqfmcc3apafnwk4sk78anyjjhpzd0zl6n4m")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From 3ff75b6403fa3be7378d42fb6127ea6b933159a0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 18 Aug 2019 12:19:45 +0200 Subject: gnu: ed: Update to 1.15. * gnu/packages/ed.scm (ed): Update to 1.15. --- gnu/packages/ed.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index d30d7bcfa8..851e11be60 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -28,14 +28,14 @@ (define-public ed (package (name "ed") - (version "1.14.2") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ed/ed-" version ".tar.lz")) (sha256 (base32 - "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm")))) + "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d")))) (build-system gnu-build-system) (native-inputs `(("lzip" ,lzip))) (arguments -- cgit v1.2.3 From 37d40fa509cbbe48a1d7db1291338d7ccaeae830 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 18 Aug 2019 12:20:53 +0200 Subject: Revert "gnu: ed: Update to 1.15." This reverts commit 3ff75b6403fa3be7378d42fb6127ea6b933159a0. Too many dependents packages for master. --- gnu/packages/ed.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm index 851e11be60..d30d7bcfa8 100644 --- a/gnu/packages/ed.scm +++ b/gnu/packages/ed.scm @@ -28,14 +28,14 @@ (define-public ed (package (name "ed") - (version "1.15") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/ed/ed-" version ".tar.lz")) (sha256 (base32 - "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d")))) + "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm")))) (build-system gnu-build-system) (native-inputs `(("lzip" ,lzip))) (arguments -- cgit v1.2.3 From 36d4926949036207581701a5628e1c23e983dc2f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 9 Aug 2019 18:15:14 +0200 Subject: gnu: emacs-magit-todos: Update to 1.4. * gnu/packages/emacs-xyz.scm (emacs-magit-todos): Update to 1.4. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6e612cab56..90f624bc57 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14385,7 +14385,7 @@ buffers – other modes on the TODO list). (define-public emacs-magit-todos (package (name "emacs-magit-todos") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) @@ -14395,7 +14395,7 @@ buffers – other modes on the TODO list). (file-name (git-file-name name version)) (sha256 (base32 - "0gfm6wn2a4v5i9lfsvvin0kwpr9n96ddm3z4yf50jd3kg2igzry1")))) + "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From a212a54c020bc491e4e6e7ce5c4d0cb30bd79cc2 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 9 Aug 2019 19:37:25 +0200 Subject: gnu: emacs-racket-mode: Update to 0.0.2-2.5300aa0. * gnu/packages/emacs-xyz.scm (emacs-racket-mode): Update to 0.0.2-2.5300aa0. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90f624bc57..46c570d03e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12421,12 +12421,11 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "b977873e6128f8399432dcd60cc39f6a6f803d9c") - (revision "2")) + (let ((commit "5300aa004f08535c3fac99f1af78462f129aca81") + (revision "3")) (package (name "emacs-racket-mode") - (version (string-append "0.0.2" "-" revision "." - (string-take commit 7))) + (version (git-version "0.0.2" revision commit)) (source (origin (method git-fetch) @@ -12436,7 +12435,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (git-file-name name version)) (sha256 (base32 - "0vp4bbbplqvmnhjpl6ajrlydmrhqzil56cfbs18m5c5fddx0zlh7")))) + "1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) -- cgit v1.2.3 From de7f3dc7ee7df3ce7cd6cc8071408d6efbb5b359 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 10 Aug 2019 00:06:41 +0200 Subject: gnu: emacs-helm-org-rifle: Update to 1.7.0. * gnu/packages/emacs-xyz.scm (emacs-helm-org-rifle): Update to 1.7.0. [inputs]: Add emacs-org. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 46c570d03e..e7c1bc44af 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7302,7 +7302,7 @@ above over the network.") (define-public emacs-helm-org-rifle (package (name "emacs-helm-org-rifle") - (version "1.6.1") + (version "1.7.0") (source (origin (method git-fetch) @@ -7312,12 +7312,13 @@ above over the network.") (file-name (git-file-name name version)) (sha256 (base32 - "1r38xhwvgbv6kn5x159phz3xgss7f1rc7icq27rnr4d8aj91wm6k")))) + "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-helm" ,emacs-helm) + ("emacs-org" ,emacs-org) ("emacs-s" ,emacs-s))) (home-page "https://github.com/alphapapa/helm-org-rifle") (synopsis "Rifle through Org files") -- cgit v1.2.3 From 196472e7f37162ecdadb2f2f7a2c02b5cba749a1 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 10 Aug 2019 08:46:38 +0200 Subject: gnu: emacs-sesman: Update to 0.3.4. * gnu/packages/emacs-xyz.scm (emacs-sesman): Update to 0.3.4. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e7c1bc44af..3acfc65c5e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14905,20 +14905,28 @@ RPC channels with users and other software.") (define-public emacs-sesman (package (name "emacs-sesman") - (version "0.3.3") + (version "0.3.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/vspinu/sesman.git") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0r32f8ma9ddczxrrdz0nadp14j3zmk10q1ch02gb82synkx3xdra")))) + "0z5jb4vpbjsi63w3wjy6d2lgz33qdfvrgfb3bszv4hcf6a96y7fc")))) (build-system emacs-build-system) (arguments - `(#:tests? #t + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-shell + ;; Setting the SHELL environment variable is required for the tests + ;; to find sh. + (lambda _ + (setenv "SHELL" (which "sh")) + #t))) + #:tests? #t #:test-command '("make" "test"))) (home-page "https://github.com/vspinu/sesman") (synopsis "Session manager for Emacs based IDEs") -- cgit v1.2.3 From 44e8358298833097476238f3481b4b28dcf16a00 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 18 Aug 2019 15:54:43 +0300 Subject: gnu: emacs-sesman: Fix source. This commit follows 196472e7f37162ecdadb2f2f7a2c02b5cba749a1. * gnu/packages/emacs-xyz.scm (emacs-sesman)[source](origin): Append "v" to a version. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3acfc65c5e..4a8820f405 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14911,7 +14911,7 @@ RPC channels with users and other software.") (method git-fetch) (uri (git-reference (url "https://github.com/vspinu/sesman.git") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 -- cgit v1.2.3 From e076ca86dba3ef344d0d3907a808698ae8211b35 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 14 Aug 2019 06:35:31 +0200 Subject: gnu: Add emacs-phi-search. * gnu/packages/emacs-xyz.scm (emacs-phi-search): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4a8820f405..7ed341885d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3460,6 +3460,28 @@ completion candidate when using the Company text completion framework.") a customizable list.") (license license:gpl3+)))) +(define-public emacs-phi-search + (let ((commit "9a089b8271cb1cff9640848850298c9ec855286c") + (revision "1")) + (package + (name "emacs-phi-search") + (version (git-version "20160630" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zk-phi/phi-search.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gr5plcbrfdc4pglfj905s89hf8x0kc083h30wcnd81bnw9jwz1x")))) + (build-system emacs-build-system) + (home-page "https://github.com/zk-phi/phi-search") + (synopsis "Interactive search compatible with @code{multiple-cursors}") + (description "This package can be used with @code{multiple-cursors} to +provide an incremental search that moves all fake cursors in sync.") + (license license:gpl2+)))) + (define-public emacs-multiple-cursors (package (name "emacs-multiple-cursors") -- cgit v1.2.3 From 0fc235a0236f182439340519b2b98f14b5e2ac3d Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 14 Aug 2019 06:35:41 +0200 Subject: gnu: Add emacs-phi-search-mc. * gnu/packages/emacs-xyz.scm (emacs-phi-search-mc): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7ed341885d..adab7d87d2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3482,6 +3482,33 @@ a customizable list.") provide an incremental search that moves all fake cursors in sync.") (license license:gpl2+)))) +(define-public emacs-phi-search-mc + (let ((commit "7aa671910f766437089aec26c3aa7814222d1356") + (revision "1")) + (package + (name "emacs-phi-search-mc") + (version (git-version "2.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/knu/phi-search-mc.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wr86ad0yl52im6b9z0b9pzmhcn39qg5m9878yfv1nbxliw40lcd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-phi-search" ,emacs-phi-search) + ("emacs-multiple-cursors" ,emacs-multiple-cursors))) + (home-page "https://github.com/knu/phi-search-mc.el") + (synopsis "Extend @code{phi-search} with additional +@code{multiple-cursors} functionality") + (description "This package provides further integration between +@code{multiple-cursors} and @code{phi-search}, a package that allows for +interactive searches to move multiple fake cursors.") + (license license:bsd-2)))) + (define-public emacs-multiple-cursors (package (name "emacs-multiple-cursors") -- cgit v1.2.3 From 49b28a740bcdb906245b1405f7dc91efeee621a3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 18 Aug 2019 15:48:16 +0200 Subject: gnu: Add compsize. * gnu/packages/linux.scm (compsize): New variable. --- gnu/packages/linux.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 99087638f6..e2acccafcd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3928,6 +3928,49 @@ repair and easy administration.") from the btrfs-progs package. It is meant to be used in initrds.") (license (package-license btrfs-progs)))) +(define-public compsize + (package + (name "compsize") + (version "1.3") + (home-page "https://github.com/kilobyte/compsize") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (sha256 + (base32 "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (inputs + `(("btrfs-progs" ,btrfs-progs))) + (arguments + `(#:tests? #f ; No tests. + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "compsize" (string-append out "/bin")) + (install-file "compsize.8" (string-append out "/share/man/man8")))))))) + (synopsis "Find compression type/ratio on Btrfs files") + (description "@command{compsize} takes a list of files (given as +arguments) on a Btrfs file system and measures used compression types and +effective compression ratio, producing a report. + +A directory has no extents but has a (recursive) list of files. A non-regular +file is silently ignored. + +As it makes no sense to talk about compression ratio of a partial extent, +every referenced extent is counted whole, exactly once -- no matter if you use +only a few bytes of a 1GB extent or reflink it a thousand times. Thus, the +uncompressed size will not match the number given by @command{tar} or +@command{du}. On the other hand, the space used should be accurate (although +obviously it can be shared with files outside our set).") + (license license:gpl2+))) + (define-public f2fs-tools-1.7 (package (name "f2fs-tools") -- cgit v1.2.3 From 64cd8e838a46ba30766eb44fe06f792237c99d01 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 17 Aug 2019 06:15:54 +0200 Subject: gnu: Add emacs-org-rich-yank. * gnu/packages/emacs-xyz.scm (emacs-org-rich-yank): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index adab7d87d2..324b8a6073 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2729,6 +2729,29 @@ naming style of a symbol. It supports different naming conventions such as: tables.") (license license:gpl2+))) +(define-public emacs-org-rich-yank + (package + (name "emacs-org-rich-yank") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/unhammer/org-rich-yank.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gxb0fnh5gxjmld0hnk5hli0cvdd8gjd27m30bk2b80kwldxlq1z")))) + (build-system emacs-build-system) + (home-page "https://github.com/unhammer/org-rich-yank") + (synopsis "Automatically surround source code pasted into Org with +@code{#+BEGIN_SRC} blocks") + (description + "This package provides a utility function for Org buffers that makes a +@code{_SRC} block with the appropriate language annotation for code that has +been copied from an Emacs major mode.") + (license license:gpl2+))) + (define-public emacs-rich-minority (package (name "emacs-rich-minority") -- cgit v1.2.3 From 3615e9e6c53c8924c23c903d62615ba609f7697c Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 17 Aug 2019 06:49:51 +0200 Subject: gnu: Add emacs-ob-restclient. * gnu/packages/emacs-xyz.scm (emacs-ob-restclient): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 324b8a6073..b393a2d88c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2752,6 +2752,29 @@ tables.") been copied from an Emacs major mode.") (license license:gpl2+))) +(define-public emacs-ob-restclient + (let ((commit "53376667eeddb1388fd6c6976f3222e7c8adcd46")) + (package + (name "emacs-ob-restclient") + (version (git-version "0.02" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alf/ob-restclient.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1djg53cp7y83gic2v71y6r5z76kwrbkp0r69hl25rs99dx6p89dy")))) + (propagated-inputs + `(("emacs-restclient" ,emacs-restclient))) + (build-system emacs-build-system) + (home-page "https://github.com/alf/ob-restclient.el") + (synopsis "Org-babel functionality for @code{restclient-mode}") + (description + "This package integrates @code{restclient-mode} with Org.") + (license license:gpl3+)))) + (define-public emacs-rich-minority (package (name "emacs-rich-minority") -- cgit v1.2.3 From 3eb245434be62ed59f7901469472d5390e07433a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 17 Aug 2019 06:59:48 +0200 Subject: gnu: Add emacs-org-now. * gnu/packages/emacs-xyz.scm (emacs-org-now): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b393a2d88c..df89aebb3f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2775,6 +2775,32 @@ been copied from an Emacs major mode.") "This package integrates @code{restclient-mode} with Org.") (license license:gpl3+)))) +(define-public emacs-org-now + (let ((commit "8f6b277a73f1c66e58ccb4b7f40d406851befc91")) + (package + (name "emacs-org-now") + (version (git-version "0.1-pre" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/org-now.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "117zzkryznznk6h4i1jqzdn888nl019xrgxm2gza0lndx8dxsg2c")))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (build-system emacs-build-system) + (home-page "https://github.com/alphapapa/org-now") + (synopsis "Show current Org tasks in a sidebar") + (description + "This package provides commands to show Org headings in a sidebar +window while working on them. After defining one heading as the \"now\" +heading, other headings can be refiled to it with one command, and back to +their original location with another.") + (license license:gpl3+)))) + (define-public emacs-rich-minority (package (name "emacs-rich-minority") -- cgit v1.2.3 From 7fd14950791c0cc254df2bcf4abffcdbff6d0bcf Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 17 Aug 2019 19:09:58 +0200 Subject: gnu: Add emacs-symbol-overlay. * gnu/packages/emacs-xyz.scm (emacs-symbol-overlay): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index df89aebb3f..84ae7a1357 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4608,6 +4608,29 @@ regardless of @code{highlight-symbol-idle-delay}. @code{highlight-symbol-query-replace} can be used to replace the symbol. ") (license license:gpl2+)))) +(define-public emacs-symbol-overlay + (let ((commit "e40a7c407f24158c45eaa5f54ed41f5e416a51dc") + (revision "1")) + (package + (name "emacs-symbol-overlay") + (version (git-version "4.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wolray/symbol-overlay.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ibz3392d3jw1l8006h9kf8s7bg6vl7jc92bmqc031a433009ic7")))) + (build-system emacs-build-system) + (home-page "https://github.com/wolray/symbol-overlay") + (synopsis "Highlight symbols and perform various search operations on them") + (description + "This package provides functions for highlighting and navigating +between symbols.") + (license license:gpl3+)))) + (define-public emacs-hl-todo (package (name "emacs-hl-todo") -- cgit v1.2.3 From eff412ed3b7add0a32fdf681950fa1e791d4af04 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 18 Aug 2019 02:16:14 +0200 Subject: gnu: Add emacs-evil-owl. * gnu/packages/emacs-xyz.scm (emacs-evil-owl): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 84ae7a1357..a4708a1d85 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6553,6 +6553,33 @@ used for reverse direction.") end of a line and increment or decrement it.") (license license:gpl3+)))) +(define-public emacs-evil-owl + (let ((commit "36a5fe057f44d48e377e3ef4f04b4eb30e1af309") + (revision "1")) + (package + (name "emacs-evil-owl") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mamapanda/evil-owl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07a6n0gqss1qx9a50dqzqqq0gj6n7a4ykbcv1a0c9qd4fnfnm90m")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-evil" ,emacs-evil) + ("emacs-posframe" ,emacs-posframe))) + (home-page "https://github.com/mamapanda/evil-owl") + (synopsis "Preview candidates when using Evil registers and marks") + (description + "This package supplements Evil's register- and mark-based commands with +a popup window for previewing candidates.") + (license license:gpl3+)))) + (define-public emacs-evil-exchange (let ((commit "47691537815150715e64e6f6ec79be7746c96120") (version "0.41") -- cgit v1.2.3 From 317879f555ac945c89423c178e280482f4b1d83d Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 18 Aug 2019 03:01:41 +0200 Subject: gnu: Add emacs-frog-menu. * gnu/packages/emacs-xyz.scm (emacs-frog-menu): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a4708a1d85..4444690e3f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10223,6 +10223,33 @@ environment variables to be retrieved from the shell, so that Emacs will see the same values you get in a terminal.") (license license:gpl3+))) +(define-public emacs-frog-menu + (let ((commit "740bbc88b8535d31f783f3b2043a2a6683afbf31") + (revision "1")) + (package + (name "emacs-frog-menu") + (version (git-version "0.2.9" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clemera/frog-menu") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1g77424jwq62qj06rvld44s5hp0dw8rw2pwmmag6gd536zf65xrj")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-posframe" ,emacs-posframe) + ("emacs-avy" ,emacs-avy))) + (home-page "https://github.com/clemera/frog-menu") + (synopsis "Quickly pick items from ad hoc menus") + (description + "This package provides a popup offering a preview of a list of +candidates on which user-defined dispatch actions can act.") + (license license:gpl3+)))) + (define-public emacs-deft (package (name "emacs-deft") -- cgit v1.2.3 From 41671813f13cc4965f3674fdf4eb17506b49caf2 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 18 Aug 2019 03:01:50 +0200 Subject: gnu: Add emacs-frog-jump-buffer. * gnu/packages/emacs-xyz.scm (emacs-frog-jump-buffer): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4444690e3f..ffc662f746 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10250,6 +10250,34 @@ the same values you get in a terminal.") candidates on which user-defined dispatch actions can act.") (license license:gpl3+)))) +(define-public emacs-frog-jump-buffer + (let ((commit "2d7b342785ae27d45f5d252272df6eb773c78e20") + (revision "1")) + (package + (name "emacs-frog-jump-buffer") + (version (git-version "0.1.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/waymondo/frog-jump-buffer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z00by8hiss1r2lwmzrl8pnz6jykia2849dqqm4l3z5rf6lwvc0f")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-frog-menu" ,emacs-frog-menu) + ("emacs-avy" ,emacs-avy))) + (home-page "https://github.com/waymondo/frog-jump-buffer") + (synopsis "Jump to any Emacs buffer with minimal keystrokes") + (description + "This package provides a preview window of buffers that can be switched +to with quicklink-style selections.") + (license license:gpl3+)))) + (define-public emacs-deft (package (name "emacs-deft") -- cgit v1.2.3 From 04b9b7bb05aff4c41f46cd79aa7bc953ace16e86 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 19 Aug 2019 09:03:44 +0200 Subject: gnu: qemu: Update to 4.1.0. * gnu/local.mk: Remove qemu-CVE-2018-16872.patch and qemu-CVE-2019-6778.patch. * gnu/packages/patches/qemu-CVE-2018-16872.patch: Remove file. * gnu/packages/patches/qemu-CVE-2019-6778.patch: Remove file. * gnu/packages/virtualization.scm (qemu): Update to 4.1.0. [source]: Remove obsolete patches. [arguments]: Add phases 'prevent-network-configuration and 'disable-unusable-tests. --- gnu/local.mk | 2 - gnu/packages/patches/qemu-CVE-2018-16872.patch | 88 -------------------------- gnu/packages/patches/qemu-CVE-2019-6778.patch | 43 ------------- gnu/packages/virtualization.scm | 19 ++++-- 4 files changed, 14 insertions(+), 138 deletions(-) delete mode 100644 gnu/packages/patches/qemu-CVE-2018-16872.patch delete mode 100644 gnu/packages/patches/qemu-CVE-2019-6778.patch diff --git a/gnu/local.mk b/gnu/local.mk index 08bc205623..0002f49409 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1253,8 +1253,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ - %D%/packages/patches/qemu-CVE-2018-16872.patch \ - %D%/packages/patches/qemu-CVE-2019-6778.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-old-kernel.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2018-16872.patch b/gnu/packages/patches/qemu-CVE-2018-16872.patch deleted file mode 100644 index 094e823ee4..0000000000 --- a/gnu/packages/patches/qemu-CVE-2018-16872.patch +++ /dev/null @@ -1,88 +0,0 @@ -Fixes CVE-2018-16872: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-16872 - -Patch copied from upstream source repository: - -https://git.qemu.org/?p=qemu.git;a=commitdiff;h=bab9df35ce73d1c8e19a37e2737717ea1c984dc1 - -From bab9df35ce73d1c8e19a37e2737717ea1c984dc1 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Thu, 13 Dec 2018 13:25:11 +0100 -Subject: [PATCH] usb-mtp: use O_NOFOLLOW and O_CLOEXEC. - -Open files and directories with O_NOFOLLOW to avoid symlinks attacks. -While being at it also add O_CLOEXEC. - -usb-mtp only handles regular files and directories and ignores -everything else, so users should not see a difference. - -Because qemu ignores symlinks, carrying out a successful symlink attack -requires swapping an existing file or directory below rootdir for a -symlink and winning the race against the inotify notification to qemu. - -Fixes: CVE-2018-16872 -Cc: Prasad J Pandit -Cc: Bandan Das -Reported-by: Michael Hanselmann -Signed-off-by: Gerd Hoffmann -Reviewed-by: Michael Hanselmann -Message-id: 20181213122511.13853-1-kraxel@redhat.com ---- - hw/usb/dev-mtp.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c -index 100b7171f4..36c43b8c20 100644 ---- a/hw/usb/dev-mtp.c -+++ b/hw/usb/dev-mtp.c -@@ -653,13 +653,18 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) - { - struct dirent *entry; - DIR *dir; -+ int fd; - - if (o->have_children) { - return; - } - o->have_children = true; - -- dir = opendir(o->path); -+ fd = open(o->path, O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW); -+ if (fd < 0) { -+ return; -+ } -+ dir = fdopendir(fd); - if (!dir) { - return; - } -@@ -1007,7 +1012,7 @@ static MTPData *usb_mtp_get_object(MTPState *s, MTPControl *c, - - trace_usb_mtp_op_get_object(s->dev.addr, o->handle, o->path); - -- d->fd = open(o->path, O_RDONLY); -+ d->fd = open(o->path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW); - if (d->fd == -1) { - usb_mtp_data_free(d); - return NULL; -@@ -1031,7 +1036,7 @@ static MTPData *usb_mtp_get_partial_object(MTPState *s, MTPControl *c, - c->argv[1], c->argv[2]); - - d = usb_mtp_data_alloc(c); -- d->fd = open(o->path, O_RDONLY); -+ d->fd = open(o->path, O_RDONLY | O_CLOEXEC | O_NOFOLLOW); - if (d->fd == -1) { - usb_mtp_data_free(d); - return NULL; -@@ -1658,7 +1663,7 @@ static void usb_mtp_write_data(MTPState *s) - 0, 0, 0, 0); - goto done; - } -- d->fd = open(path, O_CREAT | O_WRONLY, mask); -+ d->fd = open(path, O_CREAT | O_WRONLY | O_CLOEXEC | O_NOFOLLOW, mask); - if (d->fd == -1) { - usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, - 0, 0, 0, 0); --- -2.20.1 - diff --git a/gnu/packages/patches/qemu-CVE-2019-6778.patch b/gnu/packages/patches/qemu-CVE-2019-6778.patch deleted file mode 100644 index 315f2922da..0000000000 --- a/gnu/packages/patches/qemu-CVE-2019-6778.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fixes CVE-2019-6778: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6778 - -Patch copied from upstream source repository: - -https://git.qemu.org/?p=qemu.git;a=commitdiff;h=a7104eda7dab99d0cdbd3595c211864cba415905 - -From a7104eda7dab99d0cdbd3595c211864cba415905 Mon Sep 17 00:00:00 2001 -From: Prasad J Pandit -Date: Sun, 13 Jan 2019 23:29:48 +0530 -Subject: [PATCH] slirp: check data length while emulating ident function - -While emulating identification protocol, tcp_emu() does not check -available space in the 'sc_rcv->sb_data' buffer. It could lead to -heap buffer overflow issue. Add check to avoid it. - -Reported-by: Kira <864786842@qq.com> -Signed-off-by: Prasad J Pandit -Signed-off-by: Samuel Thibault ---- - slirp/tcp_subr.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c -index 4a9a5b5edc..23a841f26e 100644 ---- a/slirp/tcp_subr.c -+++ b/slirp/tcp_subr.c -@@ -634,6 +634,11 @@ tcp_emu(struct socket *so, struct mbuf *m) - socklen_t addrlen = sizeof(struct sockaddr_in); - struct sbuf *so_rcv = &so->so_rcv; - -+ if (m->m_len > so_rcv->sb_datalen -+ - (so_rcv->sb_wptr - so_rcv->sb_data)) { -+ return 1; -+ } -+ - memcpy(so_rcv->sb_wptr, m->m_data, m->m_len); - so_rcv->sb_wptr += m->m_len; - so_rcv->sb_rptr += m->m_len; --- -2.20.1 - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5535d7a421..2e5b1ce16e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -107,16 +107,14 @@ (define-public qemu (package (name "qemu") - (version "3.1.0") + (version "4.1.0") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) - (patches (search-patches "qemu-CVE-2018-16872.patch" - "qemu-CVE-2019-6778.patch")) (sha256 (base32 - "1z5bd5nfyjvhfi1s95labc82y4hjdjjkdabw931362ls0zghh1ba")))) + "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -180,13 +178,24 @@ exec smbd $@"))) (chmod "samba-wrapper" #o755) (install-file "samba-wrapper" libexec)) #t)) - (add-before 'check 'disable-test-qga + (add-before 'configure 'prevent-network-configuration (lambda _ + ;; Prevent the build from trying to use git to fetch from the net. + (substitute* "Makefile" + (("@./config.status") + "")) #t)) + (add-before 'check 'disable-unusable-tests + (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "tests/Makefile.include" ;; Comment out the test-qga test, which needs /sys and ;; fails within the build environment. (("check-unit-.* tests/test-qga" all) (string-append "# " all))) + (substitute* "tests/Makefile.include" + ;; Comment out the test-char test, which needs networking and + ;; fails within the build environment. + (("check-unit-.* tests/test-char" all) + (string-append "# " all))) #t))))) (inputs ; TODO: Add optional inputs. `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From fd88b8e4e848a3df5b3a72e0b21ff75829c99449 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 19 Aug 2019 16:30:59 +0530 Subject: gnu: rss-bridge: Update to 2019-07-06. * gnu/packages/web.scm (rss-bridge): Update to 2019-07-06. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 314ed8c149..0b7bf698f1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5417,7 +5417,7 @@ snippets on @url{https://commandlinefu.com}.") (define-public rss-bridge (package (name "rss-bridge") - (version "2019-01-13") + (version "2019-07-06") (source (origin (method git-fetch) @@ -5427,7 +5427,7 @@ snippets on @url{https://commandlinefu.com}.") (file-name (git-file-name name version)) (sha256 (base32 - "1m0dq491954f0d7k4508ddlywk09whcz9j21rc4yk3lbwpf0nd4c")))) + "0zd0c9xzvpx55mvj8xrafakfkvafnwkkvhw9b1j0bf897xdkfsyb")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) -- cgit v1.2.3 From bf9a823686575e69e8f2e5daf238183b1ea9ab04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 19 Aug 2019 16:14:25 +0200 Subject: gnu: r-lpsolve: Update to 5.6.13.3. * gnu/packages/cran.scm (r-lpsolve): Update to 5.6.13.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 76ea2ed847..a969acbd42 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2230,14 +2230,14 @@ topics for ecologists (ISBN 978-0-691-12522-0).") (define-public r-lpsolve (package (name "r-lpsolve") - (version "5.6.13.2") + (version "5.6.13.3") (source (origin (method url-fetch) (uri (cran-uri "lpSolve" version)) (sha256 (base32 - "0fc5m259ayc880f5hvnq59ih6nb2rlp394n756n1khmxbjpw1w3m")))) + "1xazby8amb47vw5n12k13awv7x3bjci3q8vdd3vk1ms0ii16ahg6")))) (properties `((upstream-name . "lpSolve"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/lpSolve") -- cgit v1.2.3 From 86e243a2e3dad8cf8e2a53c2d850ac84e2f79155 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 19 Aug 2019 16:14:35 +0200 Subject: gnu: r-rjags: Update to 4-9. * gnu/packages/cran.scm (r-rjags): Update to 4-9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a969acbd42..0301d8c785 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5851,14 +5851,14 @@ functions.") (define-public r-rjags (package (name "r-rjags") - (version "4-8") + (version "4-9") (source (origin (method url-fetch) (uri (cran-uri "rjags" version)) (sha256 (base32 - "17xmjksj69f9wk4x71jxk4cgiqhaf2fj6bjm0mgzp4qln5x84a8m")))) + "1vrmxxfnia2mkmfkp5yaq5qrlh4xg3ggab6fnj14mrp1231wb91a")))) (build-system r-build-system) (propagated-inputs `(("r-coda" ,r-coda))) -- cgit v1.2.3 From b3aa0d2f964382cc81f9078f23d9b1f1d8175316 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 19 Aug 2019 16:14:42 +0200 Subject: gnu: r-ggstance: Update to 0.3.3. * gnu/packages/cran.scm (r-ggstance): Update to 0.3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0301d8c785..d8db0ca1df 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6823,13 +6823,13 @@ and coverage methods to tune the choice of threshold.") (define-public r-ggstance (package (name "r-ggstance") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "ggstance" version)) (sha256 - (base32 "078ih9s5b0xzf582qg0vjnxvg5qad5ms1v2vdd062ckahi8zz1r8")))) + (base32 "0kdksay61hyb6612b07r84chh7a9aibjyclk3qcypvr9aang8hkh")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From 6b28386dd1f09e972cc2f200199dfb42ca8aceea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 19 Aug 2019 16:14:47 +0200 Subject: gnu: r-citr: Update to 0.3.2. * gnu/packages/cran.scm (r-citr): Update to 0.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d8db0ca1df..ae8e9c5a47 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14752,14 +14752,14 @@ into R and converted to @code{BibEntry} objects.") (define-public r-citr (package (name "r-citr") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "citr" version)) (sha256 (base32 - "0p2sg0fl7cppxxmr20qyqzs2469kglmgpsvykynw4qx501as57rc")))) + "1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From a6a19fb14c24054c6c4dc59f2cf8fd9063d2ed34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 19 Aug 2019 16:14:59 +0200 Subject: gnu: r-gviz: Update to 1.28.1. * gnu/packages/bioinformatics.scm (r-gviz): Update to 1.28.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d729b1bc00..71ea35a007 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10273,14 +10273,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.28.0") + (version "1.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "02alz27w8fnnm2ga71g3jg2b94f95ccv6r1fyszj4yb1k2g7rkxk")))) + "0chsb3ijwd8zh588s1vqgfassn2rzax5rhqrhl0ini6pi4ilchp2")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8895b2e0b624baeef4feb7ac2a11595994e9ee24 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Aug 2019 13:25:43 -0400 Subject: gnu: nmap: Update to 7.80. * gnu/packages/admin.scm (nmap): Update to 7.80. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 979b901c1a..a0e0af0549 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2134,14 +2134,14 @@ done with the @code{auditctl} utility.") (define-public nmap (package (name "nmap") - (version "7.70") + (version "7.80") (source (origin (method url-fetch) (uri (string-append "https://nmap.org/dist/nmap-" version ".tar.bz2")) (sha256 (base32 - "063fg8adx23l4irrh5kn57hsmi1xvjkar4vm4k6g94ppan4hcyw4")) + "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 28bd1b09119d7bafae31613ad16e3535602acc60 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 19 Aug 2019 09:10:35 +0300 Subject: gnu: Add emacs-refactor. * gnu/packages/emacs-xyz.scm (emacs-refactor): New variable. --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ffc662f746..17d54c94d8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17475,3 +17475,30 @@ federated microblogging social network.") Emacs. It's a re-write of the Insidious Big Brother Database (BBDB) using Emacs Lisp's (relatively new) EIEIO object oriented libraries.") (license license:gpl3+)))) + +(define-public emacs-refactor + (package + (name "emacs-refactor") + (version "0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Wilfred/emacs-refactor.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yky7vlv91501xb43xk19rr8mxlvrsxhawsc98jivf64nad5dqay")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s) + ("emacs-popup" ,emacs-popup) + ("emacs-list-utils" ,emacs-list-utils) + ("emacs-iedit" ,emacs-iedit))) + (home-page "https://github.com/Wilfred/emacs-refactor/") + (synopsis "Language-specific refactoring in Emacs") + (description "Emacs Refactor (EMR) is a framework for providing +language-specific refactoring in Emacs. It includes refactoring commands for +a variety of languages, including elisp itself.") + (license license:gpl3+))) -- cgit v1.2.3 From 9b9bfac50de8913d0a7dae4a00b0d36a1a0880c9 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 19 Aug 2019 19:27:55 +0200 Subject: gnu: emacs-evil-matchit: Update to 2.3.3. * gnu/packages/emacs-xyz.scm (emacs-evil-matchit): Update to 2.3.3. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 17d54c94d8..f33c385e98 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9805,7 +9805,7 @@ Feautures: (define-public emacs-evil-matchit (package (name "emacs-evil-matchit") - (version "2.3.0") + (version "2.3.3") (source (origin (method git-fetch) @@ -9814,7 +9814,7 @@ Feautures: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0y6q42hml7jgf060d83m7hf270h01858g5kxw12na9n4r4jjpdg1")))) + (base32 "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From a030345f0b07753a6016537ba3b8216f20cd2713 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 19 Aug 2019 19:31:34 +0200 Subject: gnu: emacs-counsel-etags: Update to 1.8.9. * gnu/packages/emacs-xyz.scm (emacs-counsel-etags): Update to 1.8.9. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f33c385e98..5938523d07 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16666,7 +16666,7 @@ previewed by scrolling up and down within a @code{dired} buffer.") (define-public emacs-counsel-etags (package (name "emacs-counsel-etags") - (version "1.8.7") + (version "1.8.9") (source (origin (method git-fetch) @@ -16676,7 +16676,7 @@ previewed by scrolling up and down within a @code{dired} buffer.") (file-name (git-file-name name version)) (sha256 (base32 - "0vjcjspfrz1csnmfi6r7p7f070a496adxkqnsxwx1gx8cpylwp1g")))) + "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) -- cgit v1.2.3 From eef77fafe38dfeac53ed17b53b43ec6edb295d87 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 02:34:30 +0200 Subject: gnu: Add emacs-org-auto-expand. * gnu/packages/emacs-xyz.scm (emacs-org-auto-expand): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5938523d07..91e111fa47 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10951,6 +10951,31 @@ tables of contents.") files, allowing for actions to be performed based on search criteria.") (license license:gpl3+))) +(define-public emacs-org-auto-expand + (let ((commit "4938d5f6460e2f8f051ba9ac000b291bfa43ef62") + (revision "1")) + (package + (name "emacs-org-auto-expand") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/org-auto-expand") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1my0c6xmkh37lwi6l472lz9d86lf20h6xcllzlxm1lxa24rhva6v")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-org" ,emacs-org) + ("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/alphapapa/org-auto-expand") + (synopsis "Automatically expand certain Org headings") + (description "This package allows a customizable set of headings in Org +files to be expanded upon opening them.") + (license license:gpl3+)))) + (define-public emacs-parsebib (package (name "emacs-parsebib") -- cgit v1.2.3 From eaca4d5f86f73d7ad782594e8a2705f1ec62b58d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Aug 2019 17:59:51 -0400 Subject: gnu: Apache httpd: Update to 2.4.41 [security fixes]. Fixes CVE-2019-{5917,10081,10082,10092,10097,10098}]. * gnu/packages/web.scm (httpd): Update to 2.4.41. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0b7bf698f1..9b2be15e20 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -133,14 +133,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.39") + (version "2.4.41") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml")))) + "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k")))) (build-system gnu-build-system) (native-inputs `(("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(("apr" ,apr) -- cgit v1.2.3 From 2bdb5716d87908c3164471ad25c398768204fb5d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 20 Aug 2019 01:47:27 +0200 Subject: gnu: Add python-branca. * gnu/packages/python-web.scm (python-branca): New variable. --- gnu/packages/python-web.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 735f033883..e622f27d6b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2017 Mark Meyer ;;; Copyright © 2018 Tomáš Čech -;;; Copyright © 2018 Nicolas Goaziou +;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian @@ -3248,3 +3248,26 @@ Python.") (description "This package provides a @command{slufigy} command and library to create slugs from unicode strings while keeping it DRY.") (license license:expat))) + +(define-public python-branca + (package + (name "python-branca") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "branca" version)) + (sha256 + (base32 + "0pmigd521j2228xf8x34vbx0niwvms7xl7za0lymywj0vydjqxiy")))) + (build-system python-build-system) + (propagated-inputs + `(("python-jinja2" ,python-jinja2) + ("python-six" ,python-six))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/python-visualization/branca") + (synopsis "Generate complex HTML+JS pages with Python") + (description "Generate complex HTML+JS pages with Python") + (license license:expat))) + -- cgit v1.2.3 From dfe8a7048e036a6d702edfd133a4ead5e879e3cf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 20 Aug 2019 01:53:49 +0200 Subject: gnu: Add python-folium. * gnu/packages/python-xyz.scm (python-folium): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 459d5d44e1..6f4c3b79d0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16058,3 +16058,34 @@ one-off scripts.") time-or-computationally-expensive properties quick and easy and works in Python 2 or 3.") (license license:bsd-3))) + +(define-public python-folium + (package + (name "python-folium") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "folium" version)) + (sha256 + (base32 + "18fzxijsgrb95r0a8anc9ba5ijyw3nlnv3rpavfbkqa5v878x84f")))) + (build-system python-build-system) + (propagated-inputs + `(("python-branca" ,python-branca) + ("python-jinja2" ,python-jinja2) + ("python-numpy" ,python-numpy) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/python-visualization/folium") + (synopsis "Make beautiful maps with Leaflet.js & Python") + (description "@code{folium} makes it easy to visualize data that’s been +manipulated in Python on an interactive leaflet map. It enables both the +binding of data to a map for @code{choropleth} visualizations as well as +passing rich vector/raster/HTML visualizations as markers on the map. + +The library has a number of built-in tilesets from OpenStreetMap, Mapbox, and +Stamen, and supports custom tilesets with Mapbox or Cloudmade API keys. It +supports Image, Video, GeoJSON and TopoJSON overlays.") + (license license:expat))) -- cgit v1.2.3 From b035a10d5843976418754856837feb35f4606221 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 19 Aug 2019 23:46:51 +0200 Subject: gnu: emacs-git-timemachine: Update to 4.11. * gnu/packages/emacs-xyz.scm (emacs-git-timemachine): Update to 4.11. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 91e111fa47..a51545c3b3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2255,7 +2255,7 @@ display and behaviour is easily customisable.") (define-public emacs-git-timemachine (package (name "emacs-git-timemachine") - (version "4.10") + (version "4.11") (source (origin (method git-fetch) @@ -2265,7 +2265,7 @@ display and behaviour is easily customisable.") (file-name (git-file-name name version)) (sha256 (base32 - "08zsn3lsnnf01wkv5ls38jga02s5dnf0j3gigy4qd6im3j3d04m1")))) + "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-transient" ,emacs-transient))) -- cgit v1.2.3 From f8f2a9449bb66abccb0a3c906c16ce020dececd0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 15 Aug 2019 14:07:44 +0200 Subject: gnu: monero: Update to 0.14.1.2. * gnu/packages/finance.scm (monero): Update to 0.14.1.2. [arguments]: Add phase to make files writable for the tests. Enable a previously skipped test. Signed-off-by: Efraim Flashner --- gnu/packages/finance.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7bfe5e62ff..fc26b77279 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -445,7 +445,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.14.1.0") + (version "0.14.1.2") (source (origin (method git-fetch) @@ -466,7 +466,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch #t)) (sha256 (base32 - "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh")))) + "00zl883c7lcd9z7g4y3vv7rxmr7ppzrxdblnhk32r9l3qzyw55r6")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -508,6 +508,11 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch (("return \\(") "return ((std::string(getenv(\"HOME\"))) / ")) #t)) + (add-after 'change-log-path 'fix-file-permissions-for-tests + (lambda _ + (for-each make-file-writable + (find-files "tests/data/" "wallet_9svHk1.*")) + #t)) ;; Only try tests that don't need access to network or system (replace 'check (lambda _ @@ -522,11 +527,6 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch "DNSResolver.DNSSECSuccess" "DNSResolver.DNSSECFailure" "DNSResolver.GetTXTRecord" - ;; TODO: Find why portability_wallet test fails - ;; Maybe the Boost version used to create the test - ;; wallet and the current Boost version are not - ;; completely compatible? - "Serialization.portability_wallet" "is_hdd.linux_os_root") ":"))) (invoke "tests/unit_tests/unit_tests" -- cgit v1.2.3 From d371112bd019f48a82f380532e0234c2949fc117 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 20 Aug 2019 11:08:42 +0300 Subject: gnu: edirect: Update to 12.1.20190819. * gnu/packages/bioinformatics.scm (edirect): Update to 12.1.20190819. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 71ea35a007..62f368c139 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2749,7 +2749,7 @@ quantitative phenotypes.") (define-public edirect (package (name "edirect") - (version "10.2.20181018") + (version "12.1.20190819") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect" @@ -2757,7 +2757,7 @@ quantitative phenotypes.") "/edirect-" version ".tar.gz")) (sha256 (base32 - "091f4aigzpbqih6h82nq566gkp3y07i72yqndmqskfgar1vwgci7")))) + "1i9s9mppcfqd60pfywpm8vdyz5vpnyslw22nd7dv0bhykrdnkz9g")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5485148c76e178c9e9ae6d8ecb5f948e0c12028f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 20 Aug 2019 22:34:09 +0200 Subject: gnu: tor: Update to 0.4.1.5. * gnu/packages/tor.scm (tor): Update to 0.4.1.5. --- gnu/packages/tor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index c330c853d5..2e8e48c8e2 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -50,14 +50,14 @@ (define-public tor (package (name "tor") - (version "0.4.0.5") + (version "0.4.1.5") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0vk9j3ybz5dwwbmqrdj1bjcsxy76pc8frmfvflkdzwfkvkqcp8mm")))) + "0984jb6hdcc10f7aq8xzl7l4jf93skp45wkv2v63z4zv0nvf0r58")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 64c70430ec80c93faff6139fdb9d3de92704b81e Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 19 Jul 2019 16:15:09 -0400 Subject: gnu: gnome-control-center: Fix info-overview panel issues. GNOME Control Center should now display the correct GNOME version and graphics information in the "Details > About" panel. * gnu/packages/gnome.scm (gnome-control-center)[arguments]: Add configure flag. Adjust 'patch-paths' phase accordingly. [inputs]: Add gnome-session. --- gnu/packages/gnome.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d5e46e09c1..bfc055eed4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5967,7 +5967,10 @@ devices using the GNOME desktop.") (arguments '(#:glib-or-gtk? #t #:configure-flags - (list "-Dcheese=false") + (list "-Dcheese=false" + (string-append "-Dgnome_session_libexecdir=" + (assoc-ref %build-inputs "gnome-session") + "/libexec")) #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths @@ -5975,7 +5978,8 @@ devices using the GNOME desktop.") (let ((libc (assoc-ref inputs "libc")) (tzdata (assoc-ref inputs "tzdata")) (libgnomekbd (assoc-ref inputs "libgnomekbd")) - (nm-applet (assoc-ref inputs "network-manager-applet"))) + (nm-applet (assoc-ref inputs "network-manager-applet")) + (gnome-desktop (assoc-ref inputs "gnome-desktop"))) (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) @@ -5995,6 +5999,10 @@ devices using the GNOME desktop.") (substitute* '("panels/user-accounts/run-passwd.c") (("/usr/bin/passwd") "/run/setuid-programs/passwd")) + (substitute* "panels/info/cc-info-overview-panel.c" + (("DATADIR \"/gnome/gnome-version.xml\"") + (string-append "\"" gnome-desktop + "/share/gnome/gnome-version.xml\""))) #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. @@ -6014,6 +6022,7 @@ devices using the GNOME desktop.") ("gnome-desktop" ,gnome-desktop) ("gnome-online-accounts" ,gnome-online-accounts) ("gnome-online-accounts:lib" ,gnome-online-accounts "lib") + ("gnome-session" ,gnome-session) ("gnome-settings-daemon" ,gnome-settings-daemon) ("grilo" ,grilo) ("ibus" ,ibus) -- cgit v1.2.3 From 439378fd9f0e3178682ceb846ea532319bd94110 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 20 Aug 2019 21:49:41 -0400 Subject: gnu: wxmaxima: Update to 19.08.0. * gnu/packages/maths.scm (wxmaxima): Update to 19.08.0. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ab3b4458b2..57deb15d7d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2967,7 +2967,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "19.05.7") + (version "19.08.0") (source (origin (method git-fetch) @@ -2977,7 +2977,7 @@ point numbers.") (file-name (git-file-name name version)) (sha256 (base32 - "0zaz71fh156b9inrxf86scnix247al5pl9v18cxhjxcm0lanqxdp")))) + "028g4g2081vsgslbdliskfy5q2wknvknw89lk3zp89py6wranxas")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) -- cgit v1.2.3 From eb936efb2a23feb9ffa6ba4a79dc0451ec07732d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Aug 2019 02:17:59 +0200 Subject: gnu: opensmtpd-next: Update to 6.4.2p1. * gnu/packages/mail.scm (opensmtpd-next): Update to 6.4.2p1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b81b15d80c..285585ed00 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2270,14 +2270,14 @@ e-mails with other systems speaking the SMTP protocol.") (define-public opensmtpd-next (package (name "opensmtpd-next") - (version "6.4.1p2") + (version "6.4.2p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn")))) + (base32 "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb) -- cgit v1.2.3 From 8d3bc0f16508a5d76351245fbd08e930fcf5e586 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sun, 21 Jul 2019 16:55:33 +0200 Subject: gnu: Add emacs-flyspell-correct. * gnu/packages/emacs-xyz.scm (emacs-flyspell-correct): New variable. --- gnu/packages/emacs-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a51545c3b3..a4a2164354 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -17527,3 +17528,32 @@ Emacs Lisp's (relatively new) EIEIO object oriented libraries.") language-specific refactoring in Emacs. It includes refactoring commands for a variety of languages, including elisp itself.") (license license:gpl3+))) + +(define-public emacs-flyspell-correct + (package + (name "emacs-flyspell-correct") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/d12frosted/flyspell-correct.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r9hmz7sihhy7npv6nxp04sy57glzmfax5d67mwn96fdnc0yhlnd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-ivy" ,emacs-ivy) + ("emacs-popup" ,emacs-popup))) + (home-page + "https://github.com/d12frosted/flyspell-correct") + (synopsis + "Correcting words with flyspell via custom interfaces") + (description + "This package provides functionality for correcting words via custom +interfaces. Several interfaces are supported beside the classic ido: popup, +helm and ivy.") + (license license:gpl3+))) -- cgit v1.2.3 From 0f4e4d8ff0e91396985b66a7b3b4ba3cdc0eed07 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sun, 21 Jul 2019 16:55:59 +0200 Subject: gnu: Add emacs-org-emms. * gnu/packages/emacs-xyz.scm (emacs-org-emms): New variable. --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a4a2164354..d3fcdaeb15 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17557,3 +17557,32 @@ a variety of languages, including elisp itself.") interfaces. Several interfaces are supported beside the classic ido: popup, helm and ivy.") (license license:gpl3+))) + +(define-public emacs-org-emms + (let ((commit "07a8917f3d628c32e5de1dbd118ac08203772533") + (revision "1")) + (package + (name "emacs-org-emms") + (version + (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jagrg/org-emms.git") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 + "1sqsm5sv311xfdk4f4rsnvprdf2v2vm7l1b3vqi7pc0g8adlnw1d")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emms" ,emacs-emms) + ("emacs-org" ,emacs-org))) + (home-page "https://gitlab.com/jagrg/org-emms") + (synopsis "Play multimedia files from org-mode") + (description + "This package provides a new org link type for playing back multimedia +files from org-mode using EMMS, The Emacs Multimedia System. If the link +contains a track position, playback will start at the specified position.") + (license license:gpl3+)))) -- cgit v1.2.3 From 04e748465c140b71e97cac80c754f08491edf09a Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sun, 21 Jul 2019 16:56:20 +0200 Subject: gnu: Add emacs-org-jira. * gnu/packages/emacs-xyz.scm (emacs-org-jira): New variable. --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d3fcdaeb15..b4622e2bd8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17586,3 +17586,30 @@ helm and ivy.") files from org-mode using EMMS, The Emacs Multimedia System. If the link contains a track position, playback will start at the specified position.") (license license:gpl3+)))) + +(define-public emacs-org-jira + (package + (name "emacs-org-jira") + (version "4.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahungry/org-jira.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-request" ,emacs-request) + ("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash) + ("emacs-org" ,emacs-org))) + (home-page "https://github.com/ahungry/org-jira") + (synopsis "Syncing between Jira and Org-mode") + (description + "This package provides an extension to org-mode for syncing issues with +JIRA issue servers.") + (license license:gpl3+))) -- cgit v1.2.3 From e6b7f90ebaabe000274c9a157c29b20f4f86a3fb Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sun, 21 Jul 2019 16:56:31 +0200 Subject: gnu: Add emacs-systemd-mode. * gnu/packages/emacs-xyz.scm (emacs-systemd-mode): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b4622e2bd8..6ea851187c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17613,3 +17613,25 @@ contains a track position, playback will start at the specified position.") "This package provides an extension to org-mode for syncing issues with JIRA issue servers.") (license license:gpl3+))) + +(define-public emacs-systemd-mode + (package + (name "emacs-systemd-mode") + (version "1.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/holomorph/systemd-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq")))) + (build-system emacs-build-system) + (arguments '(#:include '("\\.el$" "\\.txt$"))) + (home-page "https://github.com/holomorph/systemd-mode") + (synopsis + "Major mode for editing systemd units") + (description + "Major mode for editing systemd units in GNU Emacs.") + (license license:gpl3+))) -- cgit v1.2.3 From c8c42d878618271a3db4fd8c1cb11f15aa38f452 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sun, 21 Jul 2019 16:56:44 +0200 Subject: gnu: Add emacs-ssh-config-mode. * gnu/packages/emacs-xyz.scm (emacs-ssh-config-mode): New variable. --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6ea851187c..2f5bf05ff9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17635,3 +17635,31 @@ JIRA issue servers.") (description "Major mode for editing systemd units in GNU Emacs.") (license license:gpl3+))) + +(define-public emacs-ssh-config-mode + (let ((commit "4c1dfa57d452cb5654453bf186c8ff63e1e71b56") + (revision "1")) + (package + (name "emacs-ssh-config-mode") + (version (git-version "8.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/jhgorrell/ssh-config-mode-el.git") + (commit commit))) + (file-name (git-file-name name commit)) + (sha256 + (base32 + "0crglfdazzckizbwzmgl2rn6j85avfzkr1q7ijxd17rp2anvr9bd")))) + (build-system emacs-build-system) + (arguments '(#:include '("\\.el$" "\\.txt$"))) + (home-page + "https://github.com/jhgorrell/ssh-config-mode-el") + (synopsis + "Mode for fontification of ~/.ssh/config") + (description + "This packages fontifies the ssh config keywords and creates +keybindings for skipping from host section to host section.") + (license license:gpl3+)))) -- cgit v1.2.3 From cad875350b0ecf838506fa293b29ffb33ab5d3bd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 21 Aug 2019 15:09:15 +0200 Subject: gnu: emacs-helm-slime: Update to 0.4.0. * gnu/packages/emacs-xyz.scm (emacs-helm-slime): Update to 0.4.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2f5bf05ff9..06367aa991 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15023,7 +15023,7 @@ correctly.") (define-public emacs-helm-slime (package (name "emacs-helm-slime") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -15032,7 +15032,7 @@ correctly.") (file-name (git-file-name name version)) (sha256 (base32 - "1qhb9446rpj17pm0hi3miy5gs5k3ld43bq29kzy0y26bf7ivfcjv")))) + "0mrpjhpijdrq353fnfvdj9l9xfsz390qlcvifcair9732ma7i8l0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit v1.2.3 From 8a3b11d1eb21e54b4f3a3cbceffed8ce2c11512e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 6 Aug 2019 20:17:27 +0100 Subject: import: utils: Add hash-ref*. With the change to guile-json version 3, JSON objects are represented as hash tables, rather than alists. The cpan importer uses assoc-ref* on a hash table, so add an equivalent function for hash tables. * guix/import/utils.scm (hash-ref*): New procedure. --- guix/import/utils.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 2a3b7341fb..ed6c3ce6af 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -47,6 +47,7 @@ flatten assoc-ref* + hash-ref* url-fetch guix-hash-url @@ -116,6 +117,15 @@ recursively apply the procedure to the sub-list." (assoc-ref alist key) (apply assoc-ref* (assoc-ref alist key) rest))) +(define (hash-ref* hash-table key . rest) + "Return the value for KEY from HASH-TABLE. For each additional key specified, +recursively apply the procedure to the sub-hash-table." + (if (hash-table? hash-table) + (if (null? rest) + (hash-ref hash-table key) + (apply hash-ref* (hash-ref hash-table key) rest)) + #f)) ; For consistency with assoc-ref* + (define (url-fetch url file-name) "Save the contents of URL to FILE-NAME. Return #f on failure." (parameterize ((current-output-port (current-error-port))) -- cgit v1.2.3 From 01ce7af25add55514f737af48ea6c127bedfde67 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 6 Aug 2019 20:17:28 +0100 Subject: import: cpan: Adapt for the change to guile-json version 3. In guile-json version 3, JSON objects are represented as hash tables, rather than alists. * guix/import/cpan.scm (string->license): Change the match expression to match on lists, rather than vectors. (module->dist-name, cpan-source-url, cpan-version): Change assoc-ref to hash-ref. (cpan-module->sexp): Change assoc-ref to hash-ref, and assoc-ref* to hash-ref*. * tests/cpan.scm ("source-url-http", "source-url-https"): Convert the alist to a hash table. --- guix/import/cpan.scm | 30 ++++++++++++++++-------------- tests/cpan.scm | 13 ++++++++----- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index ec86f11743..0be37e715e 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -34,7 +34,7 @@ #:use-module (guix ui) #:use-module ((guix download) #:select (download-to-store url-fetch)) #:use-module ((guix import utils) #:select (factorize-uri - flatten assoc-ref*)) + flatten hash-ref*)) #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) @@ -76,8 +76,8 @@ ;; ssleay ;; sun ("zlib" 'zlib) - (#(x) (string->license x)) - (#(lst ...) `(list ,@(map string->license lst))) + ((x) (string->license x)) + ((lst ...) `(list ,@(map string->license lst))) (_ #f))) (define (module->name module) @@ -88,11 +88,11 @@ "Return the base distribution module for a given module. E.g. the 'ok' module is distributed with 'Test::Simple', so (module->dist-name \"ok\") would return \"Test-Simple\"" - (assoc-ref (json-fetch (string-append - "https://fastapi.metacpan.org/v1/module/" - module - "?fields=distribution")) - "distribution")) + (hash-ref (json-fetch (string-append + "https://fastapi.metacpan.org/v1/module/" + module + "?fields=distribution")) + "distribution")) (define (package->upstream-name package) "Return the CPAN name of PACKAGE." @@ -122,12 +122,12 @@ or #f on failure. MODULE should be e.g. \"Test::Script\"" (define (cpan-source-url meta) "Return the download URL for a module's source tarball." (regexp-substitute/global #f "http[s]?://cpan.metacpan.org" - (assoc-ref meta "download_url") + (hash-ref meta "download_url") 'pre "mirror://cpan" 'post)) (define (cpan-version meta) "Return the version number from META." - (match (assoc-ref meta "version") + (match (hash-ref meta "version") ((? number? version) ;; version is sometimes not quoted in the module json, so it gets ;; imported into Guile as a number, so convert it to a string. @@ -183,7 +183,7 @@ depend on (gnu packages perl)." "Return the `package' s-expression for a CPAN module from the metadata in META." (define name - (assoc-ref meta "distribution")) + (hash-ref meta "distribution")) (define (guix-name name) (if (string-prefix? "perl-" name) @@ -198,7 +198,9 @@ META." (match (flatten (map (lambda (ph) (filter-map (lambda (t) - (assoc-ref* meta "metadata" "prereqs" ph t)) + (and=> (hash-ref* meta "metadata" "prereqs" ph t) + (lambda (h) + (hash-map->list cons h)))) '("requires" "recommends" "suggests"))) phases)) (#f @@ -251,9 +253,9 @@ META." ,@(maybe-inputs 'propagated-inputs (convert-inputs '("runtime"))) (home-page ,(cpan-home name)) - (synopsis ,(assoc-ref meta "abstract")) + (synopsis ,(hash-ref meta "abstract")) (description fill-in-yourself!) - (license ,(string->license (assoc-ref meta "license")))))) + (license ,(string->license (hash-ref meta "license")))))) (define (cpan->guix-package module-name) "Fetch the metadata for PACKAGE-NAME from metacpan.org, and return the diff --git a/tests/cpan.scm b/tests/cpan.scm index 189dd027e6..cdd6c0e76a 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -24,7 +24,8 @@ #:use-module (guix tests) #:use-module (guix grafts) #:use-module (srfi srfi-64) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (ice-9 hash-table)) ;; Globally disable grafts because they can trigger early builds. (%graft? #f) @@ -109,14 +110,16 @@ (test-equal "source-url-http" ((@@ (guix import cpan) cpan-source-url) - `(("download_url" . - "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) + (alist->hash-table + `(("download_url" . + "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")))) "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") (test-equal "source-url-https" ((@@ (guix import cpan) cpan-source-url) - `(("download_url" . - "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) + (alist->hash-table + `(("download_url" . + "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")))) "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") (test-end "cpan") -- cgit v1.2.3 From 178f1d1f75a8d512b517f474f63da507beaebd49 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 21 Aug 2019 13:41:18 -0400 Subject: gnu: vlc: Update to 3.0.8. * gnu/packages/video.scm (vlc): Update to 3.0.8. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9b809d007f..8b7bb38fa8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1052,7 +1052,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.7.1") + (version "3.0.8") (source (origin (method url-fetch) (uri (string-append @@ -1061,7 +1061,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "1xb4c8n0hkwijzfdlbwadhxnx9z8rlhmrdq4c7q74rq9f51q0m86")))) + "1xmxjpyzdhabchwncz6lvx3kzvl7fz9c42bkv3nbj68albs9w570")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) -- cgit v1.2.3 From c17f54e73835d43f35c5bdcdf5dae7667f6a2e50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 20:47:19 +0200 Subject: gnu: help2man: Update to 1.47.11. * gnu/packages/man.scm (help2man/latest): Update to 1.47.11. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index f5c888186f..e0e15355dd 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -227,14 +227,14 @@ automatically.") (define-public help2man/latest (package (inherit help2man) - (version "1.47.10") + (version "1.47.11") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/help2man/help2man-" version ".tar.xz")) (sha256 (base32 - "1yywli520246aba12vpgj7bhr1r13swad3xm49a0cygqcgywnwgk")))))) + "123vsimgx8zq1h077sbyh3bd0hbmlc3wih2231wwh133z1bv51ar")))))) (define-public scdoc (package -- cgit v1.2.3 From d6ce8eca0707bbe04994cae5d01768bdbb1c2ab4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 20:48:03 +0200 Subject: gnu: csound: Update to 6.13.0. * gnu/packages/audio.scm (csound): Update to 6.13.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index fc0d6f80db..8d8bf18af2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -714,7 +714,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (define-public csound (package (name "csound") - (version "6.12.2") + (version "6.13.0") (source (origin (method git-fetch) (uri (git-reference @@ -723,7 +723,7 @@ emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (file-name (git-file-name name version)) (sha256 (base32 - "01krxcf0alw9k7p5sv0s707600an4sl7lhw3bymbwgqrj0v2p9z2")))) + "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh")))) (build-system cmake-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From e5e24819129bc634d2c795933e49a5f9a336a2e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 20:49:42 +0200 Subject: gnu: angband: Update to 4.2.0. * gnu/packages/games.scm (angband): Update to 4.2.0. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c37364e369..5c0d47fade 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1383,7 +1383,7 @@ that beneath its ruins lay buried an ancient evil.") (define-public angband (package (name "angband") - (version "4.1.3") + (version "4.2.0") (source (origin (method url-fetch) @@ -1392,7 +1392,7 @@ that beneath its ruins lay buried an ancient evil.") "/angband-" version ".tar.gz")) (sha256 (base32 - "0vs0314lbdc6rzxn4jnb7zp6n1p1cdb8r53savadn7k9vbwc80ll")) + "0vdm1ymm28wawp94nl1p5q3lhc0k7cnn2kkvvrkfx962gif4kqfk")) (modules '((guix build utils))) (snippet ;; So, some of the sounds/graphics/tilesets are under different @@ -1406,7 +1406,7 @@ that beneath its ruins lay buried an ancient evil.") (delete-file-recursively lib-subdir))) '("fonts" "icons" "sounds" "tiles")) (substitute* "lib/Makefile" - ;; And don't try to invoke makefiles in the directories we removed + ;; And don't try to invoke makefiles in the directories we removed. (("gamedata customize help screens fonts tiles sounds icons user") "gamedata customize help screens user")) #t)))) -- cgit v1.2.3 From f98d66f3c6e04bb49f36b6cb3cdb503dfc37e6ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 20:52:28 +0200 Subject: gnu: xlockmore: Update to 5.58. * gnu/packages/xdisorg.scm (xlockmore): Update to 5.58. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index bd30fd2fd2..4661d09afb 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -716,7 +716,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") (define-public xlockmore (package (name "xlockmore") - (version "5.57") + (version "5.58") (source (origin (method url-fetch) (uri (list (string-append "http://sillycycle.com/xlock/" @@ -727,7 +727,7 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") name "-" version ".tar.xz"))) (sha256 (base32 - "18r8rh8fzdn9miicbpc3qbdd4mm2g1jpsbcvj29sr66pxydzkb7r")))) + "1va11sbv5lbkxkp0i0msz5md3n2n82nzppk27rzdrw7y79vq37zw")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--enable-appdefaultdir=" -- cgit v1.2.3 From 3596b994e877896420afe38d8edd909d23fcf6a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 20:52:36 +0200 Subject: gnu: xlockmore: Don't use NAME in source URI. * gnu/packages/xdisorg.scm (xlockmore)[source]: Hard-code NAME. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4661d09afb..bcc61f59af 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -720,11 +720,11 @@ shows it again when the mouse cursor moves or a mouse button is pressed.") (source (origin (method url-fetch) (uri (list (string-append "http://sillycycle.com/xlock/" - name "-" version ".tar.xz") + "xlockmore-" version ".tar.xz") ;; Previous releases are moved to a subdirectory. (string-append "http://sillycycle.com/xlock/" "recent-releases/" - name "-" version ".tar.xz"))) + "xlockmore-" version ".tar.xz"))) (sha256 (base32 "1va11sbv5lbkxkp0i0msz5md3n2n82nzppk27rzdrw7y79vq37zw")))) -- cgit v1.2.3 From 2b744c21cb5b087c6e9e54b65127d06058e45f54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 21:21:53 +0200 Subject: gnu: manaplus: Update to 1.9.3.23. * gnu/packages/games.scm (manaplus): Update to 1.9.3.23. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5c0d47fade..6c4e83d061 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2337,7 +2337,7 @@ on the screen and keyboard to display letters.") (define-public manaplus (package (name "manaplus") - (version "1.7.6.10") + (version "1.9.3.23") (source (origin (method url-fetch) (uri (string-append @@ -2345,7 +2345,7 @@ on the screen and keyboard to display letters.") version "/manaplus-" version ".tar.xz")) (sha256 (base32 - "0l7swvpzq20am4w2rsjpp6fsvbjv07il6wbfy45a7h9zsdihmqhl")))) + "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 074dd909a276fa569231fc776fc65344b946fd1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 21:22:40 +0200 Subject: gnu: manaplus: Use HTTPS origin & home page. * gnu/packages/games.scm (manaplus)[source, home-page]: Use HTTPS. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6c4e83d061..870becc50b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2341,7 +2341,7 @@ on the screen and keyboard to display letters.") (source (origin (method url-fetch) (uri (string-append - "http://repo.manaplus.org/manaplus/download/" + "https://repo.manaplus.org/manaplus/download/" version "/manaplus-" version ".tar.xz")) (sha256 (base32 @@ -2360,7 +2360,7 @@ on the screen and keyboard to display letters.") ("libxml2" ,libxml2) ("mesa" ,mesa) ("sdl-union" ,(sdl-union)))) - (home-page "http://manaplus.org") + (home-page "https://manaplus.org") (synopsis "Client for 'The Mana World' and similar games") (description "ManaPlus is a 2D MMORPG client for game servers. It is the only -- cgit v1.2.3 From 8ce1b78b5be64440e5d6a611f6c0c64013a3ff4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 21:31:19 +0200 Subject: gnu: setbfree: Update to 0.8.9. * gnu/packages/music.scm (setbfree): Update to 0.8.9. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5dfa320d2c..22380c8667 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1543,7 +1543,7 @@ reverb effects.") (define-public setbfree (package (name "setbfree") - (version "0.8.8") + (version "0.8.9") (source (origin (method git-fetch) (uri (git-reference @@ -1552,7 +1552,7 @@ reverb effects.") (file-name (git-file-name name version)) (sha256 (base32 - "15dr1nyj69wc9jnjq5z8ril90a3c0mcrii4zjyz0z3h7dhia3382")))) + "1lpsa64xvwa9xbbp8zcwxy5w0daffc7fziny2pizabqh7m9xqjl2")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From 4bad41e015afd2d088989464eca8caf8f23dba69 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 21:51:35 +0200 Subject: gnu: pd: Update to 0.50-0. * gnu/packages/music.scm (pd): Update to 0.50-0. --- gnu/packages/music.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 22380c8667..d4aaecc1e2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1790,7 +1790,7 @@ export.") (define-public pd (package (name "pd") - (version "0.49-0") + (version "0.50-0") (source (origin (method url-fetch) (uri @@ -1798,10 +1798,10 @@ export.") version ".src.tar.gz")) (sha256 (base32 - "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j")))) + "0hg4n5b55f650qsc0mjx559072dp7vfza7w0pvk6rk2l831cvsps")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target + `(#:tests? #f ; no "check" target #:configure-flags (list "--enable-jack" -- cgit v1.2.3 From 240d9ef9a038f0a042db4eaa8577ede36eb44da8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 21:55:08 +0200 Subject: gnu: libabw: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libabw)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 026ce92aab..239cabdd2e 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -335,8 +335,8 @@ as Alfresco or Nuxeo.") (source (origin (method url-fetch) - (uri (string-append "https://dev-www.libreoffice.org/src/" name "/" - name "-" version ".tar.xz")) + (uri (string-append "https://dev-www.libreoffice.org/src/libabw/" + "libabw-" version ".tar.xz")) (sha256 (base32 "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb")))) (build-system gnu-build-system) -- cgit v1.2.3 From 7e14ed93f5119fb47409e5d09f4dd54207f371ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 21:58:17 +0200 Subject: gnu: getmail: Don't use NAME in source URI. * gnu/packages/mail.scm (getmail)[source]: Hard-code NAME. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 285585ed00..7e7d6be46c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1003,7 +1003,7 @@ and search library.") (origin (method url-fetch) (uri (string-append "http://pyropus.ca/software/getmail/old-versions/" - name "-" version ".tar.gz")) + "getmail-" version ".tar.gz")) (sha256 (base32 "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6")))) -- cgit v1.2.3 From 88e903a5f12ccf4bec4c5dd5f71f55d965e93983 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 22:01:04 +0200 Subject: gnu: getmail: Update to 5.14. * gnu/packages/mail.scm (getmail): Update to 5.14. --- gnu/packages/mail.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7e7d6be46c..bb3bf2bfb5 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -998,18 +998,17 @@ and search library.") (define-public getmail (package (name "getmail") - (version "5.6") + (version "5.14") (source (origin (method url-fetch) (uri (string-append "http://pyropus.ca/software/getmail/old-versions/" "getmail-" version ".tar.gz")) (sha256 - (base32 - "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6")))) + (base32 "1hcrd9h4g12f5gvl1djsbchcjry02ghq4icdr897s8v48pkrzagk")))) (build-system python-build-system) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:python ,python-2)) (home-page "http://pyropus.ca/software/getmail/") (synopsis "Mail retriever") -- cgit v1.2.3 From 94781b79ad939e342f6ee1863f0d966cb7f54b84 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 22:05:30 +0200 Subject: gnu: fluidsynth: Use GIT-FILE-NAME. * gnu/packages/audio.scm (fluidsynth)[source]: Use GIT-FILE-NAME. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8d8bf18af2..d8b7095540 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1111,7 +1111,7 @@ follower.") (uri (git-reference (url "https://github.com/FluidSynth/fluidsynth.git") (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0rv0apxbj0cgm8f8sqf5xr6kdi4q58ph92ip6cg716ha0ca5lr8y")))) -- cgit v1.2.3 From f8719b155ea959a964228ea5107ee42f425cd8c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 22:06:48 +0200 Subject: gnu: fluidsynth: Update to 2.0.6. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.6. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d8b7095540..44a49295d3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1105,7 +1105,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.5") + (version "2.0.6") (source (origin (method git-fetch) (uri (git-reference @@ -1114,7 +1114,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "0rv0apxbj0cgm8f8sqf5xr6kdi4q58ph92ip6cg716ha0ca5lr8y")))) + "0nas9pp9r8rnziznxm65x2yzf1ryg98zr3946g0br3s38sjf8l3a")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit v1.2.3 From b5b4d912510f2e22c2924c0a262a167e20d061b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 23:48:58 +0200 Subject: gnu: tmux: Use HTTPS home page. * gnu/packages/tmux.scm (tmux)[home-page]: Use HTTPS. --- gnu/packages/tmux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 730cb421de..b3b8ed75eb 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -51,7 +51,7 @@ (inputs `(("libevent" ,libevent) ("ncurses" ,ncurses))) - (home-page "http://tmux.github.io/") + (home-page "https://tmux.github.io/") (synopsis "Terminal multiplexer") (description "tmux is a terminal multiplexer: it enables a number of terminals (or -- cgit v1.2.3 From d1aca5b0370a7fa69bd525abd56c480e1424e5dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 23:49:11 +0200 Subject: gnu: tmux: Update to 2.9a. * gnu/packages/tmux.scm (tmux): Update to 2.9a. --- gnu/packages/tmux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index b3b8ed75eb..6f1ef45ae1 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -38,7 +38,7 @@ (define-public tmux (package (name "tmux") - (version "2.9") + (version "2.9a") (source (origin (method url-fetch) (uri (string-append @@ -46,7 +46,7 @@ version "/tmux-" version ".tar.gz")) (sha256 (base32 - "10195hp5ydkwwmpcr7188fgx9daqwrslb1lylgrrkzc6yhr1541l")))) + "099vn8mg2nnizbqqc87a5mxm8c46kadfhx30dgxbz9hp8mx1d7c3")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From 28553e17fd2ce7f51429891d6a82ed2d0bbadbe2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 23:51:41 +0200 Subject: gnu: hcxtools: Update to 5.2.0. * gnu/packages/networking.scm (hcxtools): Update to 5.2.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 16e04aaa13..9d208e9eb2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2283,7 +2283,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") (define-public hcxtools (package (name "hcxtools") - (version "5.1.6") + (version "5.2.0") (source (origin (method git-fetch) @@ -2291,7 +2291,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.") (url "https://github.com/ZerBea/hcxtools.git") (commit version))) (sha256 - (base32 "05sjbmv2wq3nlmammrwxqc62c4sagjjgczzddr1jcqkf6kywzkl8")) + (base32 "0k2qlq9hz5zc21nyc6yrnfqzga7hydn5mm0x3rpl2fhkwl81lxcn")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 35805bff9fabb749fc0bbe77b4ee4fc1bfe7e601 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Aug 2019 23:51:48 +0200 Subject: gnu: hcxdumptool: Update to 5.2.0. * gnu/packages/networking.scm (hcxdumptool): Update to 5.2.0. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9d208e9eb2..79262cbc27 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2326,7 +2326,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (define-public hcxdumptool (package (name "hcxdumptool") - (version "5.1.5") + (version "5.2.0") (source (origin (method git-fetch) @@ -2334,7 +2334,7 @@ packets from wireless devices for use with hashcat or John the Ripper.") (url "https://github.com/ZerBea/hcxdumptool.git") (commit version))) (sha256 - (base32 "0xkzdvwpi6dq9wsrn882f2ljb7d5v2bvarq8gs6jm8znfx3y8hi2")) + (base32 "0pg1pvg029gm4rj0fj5kcsjb32hixgn4cxsgiir7spkmacf1qm4q")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From d0d54a61d3c245d32f1de3427fe279a5de4ea9f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Jun 2019 18:50:58 +0200 Subject: gnu: lsyncd: Search $PATH for binaries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sync.scm (lsyncd)[arguments]: Add ‘search-$PATH-for-binaries’ phase. --- gnu/packages/sync.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 1c80b7978e..ccebe40e9d 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -183,8 +183,20 @@ their folder. #:test-target "tests" #:phases (modify-phases %standard-phases - ;; No install target. + (add-after 'unpack 'search-$PATH-for-binaries + ;; lsyncd requires and hard-codes absolute file names to binaries. + ;; Make it fall back to searching $PATH for relative file names. + (lambda _ + (substitute* "lsyncd.c" + (("execv\\(") "execvp(")) + (substitute* (list "lsyncd.lua" + "default-direct.lua" + "default-rsync.lua" + "default-rsyncssh.lua") + (("(|/usr)/bin/") "")) + #t)) (replace 'install + ;; No install target. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) -- cgit v1.2.3 From 3251c628f754eaceaa0515fadffcf8e64e1ca66e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 00:25:00 +0200 Subject: gnu: ccache: Update to 3.6. * gnu/packages/ccache.scm (ccache): Update to 3.6. --- gnu/packages/ccache.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 0a1112c310..b3f0cbbd95 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,15 +30,14 @@ (define-public ccache (package (name "ccache") - (version "3.5") + (version "3.6") (source (origin - (method url-fetch) - (uri (string-append "https://www.samba.org/ftp/ccache/ccache-" - version ".tar.xz")) - (sha256 - (base32 - "04n0xram2416pv98qrd7pi5lfsk0bjqyz7zgvvia41j5mrr4pm5x")))) + (method url-fetch) + (uri (string-append "https://www.samba.org/ftp/ccache/ccache-" + version ".tar.xz")) + (sha256 + (base32 "07wv75xdcxpdkfsz9h5ffrm8pjbvr1dh6wnb02nyzz18cdbjkcd6")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) -- cgit v1.2.3 From 524c0ece8ec660afc3675767c96b31e516158ea8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 11:50:21 +0200 Subject: gnu: bind: Update to 9.14.5. * gnu/packages/dns.scm (isc-bind): Update to 9.14.5. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b4d5a9ab27..824a8372bb 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -109,7 +109,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.14.4") + (version "9.14.5") (source (origin (method url-fetch) (uri (string-append @@ -117,7 +117,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.gz")) (sha256 (base32 - "0gxqws7ml15lwkjw9mdcd759gv5kk3s9m17j3vrp9448ls1gnbii")))) + "0ic0k0kpavwnbyf10rwx6yypxg66f65fprwc0dbmp61xp0n6gl0j")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From 23503abbc0615ac0446dc1e5c74cbe2ba96253bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 12:26:43 +0200 Subject: gnu: python-redis: Update to 3.3.8. * gnu/packages/databases.scm (python-redis): Update to 3.3.8. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 6ced8ac184..63ad760757 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2729,13 +2729,13 @@ reasonable substitute.") (define-public python-redis (package (name "python-redis") - (version "3.2.1") + (version "3.3.8") (source (origin (method url-fetch) (uri (pypi-uri "redis" version)) (sha256 - (base32 "0wwj8il4c3aff15xwwcjfci367zxsakq05ps1a2il6yavp91i94c")))) + (base32 "0fyxzqax7lcwzwhvnz0i0q6v62hxyv1mv52ywx3bpff9a2vjz8lq")))) (build-system python-build-system) ;; Tests require a running Redis server. (arguments '(#:tests? #f)) -- cgit v1.2.3 From 7323def37d6a1ddcb40d1409da5d6f7cc20c8ab3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 14:13:35 +0200 Subject: gnu: nnn: Update to 2.6. * gnu/packages/admin.scm (nnn): Update to 2.6. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a0e0af0549..5dacffe752 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2754,14 +2754,14 @@ you are running, what theme or icon set you are using, etc.") (define-public nnn (package (name "nnn") - (version "1.9") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1d6z12y4rlg4dzhpm30irpq2ak8hjh5zykkp2n7vxnz5m4ki89zp")))) + (base32 "0xb6crd9vig3xgjwl8m4bmgcs4azfmfdpx3g8pdpzs28jdg7i3rr")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From 29b60130d8a3d89b9562043a3ce07a1c0c644cf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 14:21:34 +0200 Subject: gnu: chafa: Update to 1.2.1. * gnu/packages/image-viewers.scm (chafa): Update to 1.2.1. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 0c5da63053..51062df7a3 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -501,14 +501,14 @@ preloading.") (define-public chafa (package (name "chafa") - (version "1.0.1") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "https://hpjansson.org/chafa/releases/chafa-" version ".tar.xz")) (sha256 (base32 - "00cf2z52az0z6bzc3hfm4l8infipy5ck410wqmbaybd2csjr3m29")))) + "1hj4vdyczby8h52ff23qxl8ng18p5jy549idngpiddwszf5s4drz")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 76eb007990fb494f5969570fe52bad4aaa7f2dbf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 15:16:58 +0200 Subject: gnu: shellcheck: Update to 0.7.0. * gnu/packages/haskell.scm (shellcheck): Update to 0.7.0. [inputs]: Add ghc-diff. --- gnu/packages/haskell.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 8787f10789..b544190895 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -8361,7 +8361,7 @@ generated SQL and optimize it for your backend.") (define-public shellcheck (package (name "shellcheck") - (version "0.5.0") + (version "0.7.0") (source (origin (method url-fetch) @@ -8369,12 +8369,12 @@ generated SQL and optimize it for your backend.") "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" version ".tar.gz")) (sha256 - (base32 - "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b")) + (base32 "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) + ("ghc-diff" ,ghc-diff) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-regex-tdfa" ,ghc-regex-tdfa))) (home-page "https://github.com/koalaman/shellcheck") -- cgit v1.2.3 From 1f10e3695ce907c0c14e39c600a02407712ec35d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 15:26:44 +0200 Subject: gnu: nsd: Update to 4.2.2. * gnu/packages/dns.scm (nsd): Update to 4.2.2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 824a8372bb..ae2e5cf8fa 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -303,14 +303,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.2.0") + (version "4.2.2") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "0k57xl3ybdnqjqw9a3dmi7l6qmhkiic6wsghkz08ir809aj1rpsi")))) + (base32 "1ys608jyp5scc957q4brm094c97sxlwymina7d2nvzi51aa37cw3")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d4ae72af47506f6fd992043e9879b4200a757d0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 15:31:54 +0200 Subject: gnu: mpd: Update to 0.21.14. * gnu/packages/mpd.scm (mpd): Update to 0.21.14. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 5468ba901e..e8b1e6e0b1 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -91,7 +91,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.21.13") + (version "0.21.14") (source (origin (method url-fetch) (uri @@ -100,7 +100,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1sjyhmq50nlccwmd8xn7m0bk8xvyixvfyr24v9dy3g86hhk0pdwm")))) + "0iknnm9xvwfgk8h82hjwrmbijpk9l0dgap0794c2nyg8i66qlb0y")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=true") ; the default is 'false'... -- cgit v1.2.3 From cc08576d9b562f60659ad17622c0e1c8e3996977 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 15:32:13 +0200 Subject: gnu: whois: Don't use NAME in source URI. * gnu/packages/networking.scm (whois)[source]: Hard-code NAME. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 79262cbc27..75677a9394 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -556,7 +556,7 @@ and up to 1 Mbit/s downstream.") (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/w/whois/" - name "_" version ".tar.xz")) + "whois_" version ".tar.xz")) (sha256 (base32 "0gbg9fis05zf2fl4264jplbphy75l50k3g92cz6mkmbsklrn7v34")))) -- cgit v1.2.3 From 15783008caef2d9ad2e988954d62d24dc3adb41e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 22 Aug 2019 15:32:21 +0200 Subject: gnu: whois: Update to 5.5.1. * gnu/packages/networking.scm (whois): Update to 5.5.1. --- gnu/packages/networking.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 75677a9394..4527c4927c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -551,15 +551,14 @@ and up to 1 Mbit/s downstream.") (define-public whois (package (name "whois") - (version "5.5.0") + (version "5.5.1") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/w/whois/" "whois_" version ".tar.xz")) (sha256 - (base32 - "0gbg9fis05zf2fl4264jplbphy75l50k3g92cz6mkmbsklrn7v34")))) + (base32 "10mc7iqhdnvd1kk8gnnhihd5ga2rw3sz69n3nd6x8fb65qpq13gf")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From e8079ba403dca8f3dd0f2b9248c18ca66574830d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:30:16 +0200 Subject: gnu: mupen64plus-ui-console: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-ui-console)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 388611d1d8..d7417c898c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -986,7 +986,7 @@ Z64 video plugin.") (string-append "COREDIR=" m64p "/lib/"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From ff452beac5dd7ffecc39556083c94435570d9c1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:39:29 +0200 Subject: gnu: mupen64plus-ui-console: Correct synopsis. * gnu/packages/emulators.scm (mupen64plus-ui-console)[synopisis]: Correct. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index d7417c898c..804edddcef 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -987,7 +987,7 @@ Z64 video plugin.") ;; There are no tests. #:tests? #f)) (home-page "https://www.mupen64plus.org/") - (synopsis "Mupen64Plus SDL input plugin") + (synopsis "Mupen64Plus command line user interface") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator which is capable of accurately playing many games. This package contains the -- cgit v1.2.3 From f5111b4d2b982d58387188bc3018e4dd2e9a9d4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Jul 2019 00:41:37 +0200 Subject: gnu: Add zutils. * gnu/packages/compression.scm (zutils): New public variable. --- gnu/packages/compression.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 9834fcbe63..bda43bfd18 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1954,3 +1954,49 @@ reading from and writing to ZIP archives. ") ;; Project is distributed under LGPL, but "quazip/z*" "quazip/unzip.*" are ;; distributed under zlib terms. (license (list license:lgpl2.1+ license:zlib)))) + +(define-public zutils + (package + (name "zutils") + ;; Check and remove the lint-hidden-cve property when updating. + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/zutils/zutils-" version ".tar.lz")) + (sha256 + (base32 "0dx35mv78fgqgz6sszs05ng8ipz2xy09ry9vpmka2rmy08b7x907")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--sysconfdir=/etc") + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install" + (string-append "sysconfdir=" (assoc-ref outputs "out") + "/etc") + make-flags)))))) + (native-inputs + ;; Needed to extract the source tarball and run the test suite. + `(("lzip" ,lzip))) + (properties `((lint-hidden-cve . ("CVE-2018-1000637")))) + (home-page "https://www.nongnu.org/zutils/zutils.html") + (synopsis "Utilities that transparently operate on compressed files") + (description + "Zutils is a collection of utilities able to process any combination of +compressed and uncompressed files transparently. If any given file, including +standard input, is compressed, its decompressed content is used instead. + +@command{zcat}, @command{zcmp}, @command{zdiff}, and @command{zgrep} are +improved replacements for the shell scripts provided by GNU gzip. +@command{ztest} tests the integrity of supported compressed files. +@command{zupdate} recompresses files with lzip, similar to gzip's +@command{znew}. + +Supported compression formats are bzip2, gzip, lzip, and xz. Zutils uses +external compressors: the compressor to be used for each format is configurable +at run time, and must be installed separately.") + (license (list license:bsd-2 ; arg_parser.{cc,h} + license:gpl2+)))) ; the rest -- cgit v1.2.3 From ad64f271de2737c40571c413845548c61a2462e3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 21 Aug 2019 16:46:50 -0400 Subject: gnu: vidstab: Update to 1.1.0-0.aeabc8d. * gnu/packages/video.scm (vidstab): Update to 1.1.0-0.aeabc8d. --- gnu/packages/video.scm | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8b7bb38fa8..dfb28a9309 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3373,30 +3373,32 @@ online.") (license license:expat))) (define-public vidstab - (package - (name "vidstab") - (version "1.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/georgmartius/vid.stab.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38")))) - (build-system cmake-build-system) - (arguments - '(#:tests? #f)) ; tests are not run as part of standard build process - (home-page "http://public.hronopik.de/vid.stab/") - (synopsis "Video stabilization library") - (description "Vidstab is a video stabilization library which can be used + (let ((commit "aeabc8daa7904f9edf7441a11f293965a5ef53b8") + (revision "0")) + (package + (name "vidstab") + (version (git-version "1.1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/georgmartius/vid.stab.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "042iy0f3khwzr68djzvqgn301sy21ljvkf52rnc2c73q7ircnzzn")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ; tests are not run as part of standard build process + (home-page "http://public.hronopik.de/vid.stab/") + (synopsis "Video stabilization library") + (description "Vidstab is a video stabilization library which can be used with FFmpeg. A video acquired using a hand-held camera or a camera mounted on a vehicle typically suffers from undesirable shakes and jitters. Activities such as surfing, skiing, riding and walking while shooting videos are especially prone to erratic camera shakes. Vidstab targets these video contents to help create smoother and stable videos.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public libopenshot (package -- cgit v1.2.3 From 6d0fb469ed9de2ec9d51ba0631f4b9b42b7f6f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 22 Aug 2019 17:30:08 +0200 Subject: gnu: freeipmi: Update to 1.6.4. * gnu/packages/freeipmi.scm (freeipmi): Update to 1.6.4. --- gnu/packages/freeipmi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freeipmi.scm b/gnu/packages/freeipmi.scm index 5f1931e7fe..57fe527cbe 100644 --- a/gnu/packages/freeipmi.scm +++ b/gnu/packages/freeipmi.scm @@ -28,14 +28,14 @@ (define-public freeipmi (package (name "freeipmi") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freeipmi/freeipmi-" version ".tar.gz")) (sha256 (base32 - "1sg12ycig2g5yv9l3vx25wsjmz7ybnrsvji0vs51yjmclwsygm5a")))) + "0g0s4iwx0ng4rv7hp5cc3kkx4drahsc89981gwjblf04lfavppv5")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt))) -- cgit v1.2.3 From af012922776cc249be45604aa295ac086a243473 Mon Sep 17 00:00:00 2001 From: swedebugia Date: Thu, 1 Aug 2019 22:31:42 +0200 Subject: gnu: Add bitcoin-abc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/finance.scm (bitcoin-abc): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/finance.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index fc26b77279..377cb3a405 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1111,3 +1111,31 @@ information.") (description "This allows a Trezor hardware wallet to communicate to the Trezor wallet.") (license license:lgpl3+))) + +(define-public bitcoin-abc + (package + (inherit bitcoin-core) + (name "bitcoin-abc") + (version "0.19.8") + (source (origin + (method url-fetch) + (uri (string-append "https://download.bitcoinabc.org/" + version "/linux/src/bitcoin-abc-" + version ".tar.gz")) + (sha256 + (base32 + "0ndvkxv5m8346bdhfqzgdiz1k9wyjycj05jp7daf9pml3cw79sz5")))) + (home-page "https://www.bitcoinabc.org/") + (synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol") + (description + "Bitcoin Cash brings sound money to the world, fulfilling the original +promise of Bitcoin as Peer-to-Peer Electronic Cash. Merchants and users are +empowered with low fees and reliable confirmations is a digital currency that +enables instant payments to anyone anywhere in the world. It uses +peer-to-peer technology to operate without central authority: managing +transactions and issuing money are carried out collectively by the network. +As a fork it implemented changes lowering the time between blocks and now +offers confimations after less than 5 seconds and have significantly lower +fees that BTC. Bitcoin ABC is the reference implementation of the Bitcoin +Cash protocol. This package provides the Bitcoin Cash command line client and +a client based on Qt. This is a fork of Bitcoin Core."))) -- cgit v1.2.3 From 74a98b5cddd0430dd7229d4045f4885191c624b7 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 16 Aug 2019 10:45:43 -0700 Subject: services: console-fonts: Update docstring. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/base (console-font-service-type): Add documentation about valid arguments. Co-authored-by: Ludovic Courtès --- gnu/services/base.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 537d30add5..dcb7278f0f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -801,10 +802,14 @@ to add @var{device} to the kernel's entropy pool. The service will fail if (description "Install the given fonts on the specified ttys (fonts are per virtual console on GNU/Linux). The value of this service is a list of -tty/font pairs like: +tty/font pairs. The font can be the name of a font provided by the @code{kbd} +package or any valid argument to @command{setfont}, as in this example: @example -'((\"tty1\" . \"LatGrkCyr-8x16\")) +'((\"tty1\" . \"LatGrkCyr-8x16\") + (\"tty2\" . (file-append + font-tamzen + \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\"))) @end example\n"))) (define* (console-font-service tty #:optional (font "LatGrkCyr-8x16")) -- cgit v1.2.3 From 403b4e06854728ee857509053ef2b4c87024baea Mon Sep 17 00:00:00 2001 From: Reza Alizadeh Majd Date: Thu, 1 Aug 2019 20:29:06 +0430 Subject: gnu: Add lxqt-archiver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxqt.scm (lxqt-archiver): New Variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lxqt.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a8699b3d09..e72f5b82d9 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -1245,6 +1245,39 @@ easily publishing them on internet image hosting services.") (license license:gpl2+))) +(define-public lxqt-archiver + (package + (name "lxqt-archiver") + (version "0.0.96") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/lxqt/" name ".git")) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09rw774vxj96wcpxxncz6nr9bmw7l4l0kwylmz1saq6rpa2yvn2i")))) + (build-system cmake-build-system) + (inputs + `(("glib" ,glib) + ("json-glib" ,json-glib) + ("libfm-qt" ,libfm-qt) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("lxqt-build-tools" ,lxqt-build-tools) + ("qttools" ,qttools))) + (arguments + '(#:tests? #f)) + (home-page "https://lxqt.org/") + (synopsis "Simple & lightweight desktop-agnostic Qt file archiver") + (description + "This package provides a Qt graphical interface to archiving programs +like @command{tar} and @command{zip}.") + (license license:gpl2+))) + ;; The LXQt Desktop Environment (define-public lxqt -- cgit v1.2.3 From a83e2a01fb5438c660166e12b0d7df5c470b9e4a Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Thu, 1 Aug 2019 21:25:58 +0200 Subject: gnu: Add pixiewps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (pixiewps): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/networking.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4527c4927c..a8f98c54df 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2019 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -946,6 +947,34 @@ attacking, testing, and cracking. All tools are command-line driven, which allows for heavy scripting.") (license (list license:gpl2+ license:bsd-3)))) +(define-public pixiewps + (package + (name "pixiewps") + (version "1.4.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/wiire-a/pixiewps/releases/" + "download/v" version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "07nym6bqml0k9v29vnj003nrgnwrywgjvnljb7cdpsvnwilhbp64")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:tests? #f)) ; there are no tests + (home-page "https://github.com/wiire-a/pixiewps/") + (synopsis "Offline brute-force tool for Wi-Fi Protected Setup") + (description "Pixiewps implements the pixie-dust attack to brute +force the Wi-Fi Protected Setup (WPS) PIN by exploiting the low or +non-existing entropy of some access points.") + (license license:gpl3+))) + (define-public perl-danga-socket (package (name "perl-danga-socket") -- cgit v1.2.3 From 5094da0b83a413778c2d364641c3972aae0a900f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Thu, 1 Aug 2019 21:25:59 +0200 Subject: gnu: Add reaver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (reaver): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/networking.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a8f98c54df..9383e1a1d8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -975,6 +975,54 @@ force the Wi-Fi Protected Setup (WPS) PIN by exploiting the low or non-existing entropy of some access points.") (license license:gpl3+))) +(define-public reaver + (package + (name "reaver") + (version "1.6.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/t6x/reaver-wps-fork-t6x/releases/" + "download/v" version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "0sva3g0kwgv143n9l3lg4qp5iiqz7nk76nr0hwivsnglbhk9sbil")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + ;; Save session files to current directory instead of /var. + (list "--enable-savetocurrent" + "--localstatedir=/tmp/dummy") ; prevent creating /var during install + #:phases + (modify-phases %standard-phases + (add-before 'configure 'change-directory + (lambda _ + (chdir "src") + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (chdir "../docs") + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (man1 (string-append out "/share/man/man1"))) + (for-each (lambda (file) (install-file file doc)) + (find-files "." "README.*")) + (install-file "reaver.1" man1) + #t)))) + #:tests? #f)) ; there are no tests + (inputs + `(("libpcap" ,libpcap))) + (propagated-inputs + `(("aircrack-ng" ,aircrack-ng) + ("pixiewps" ,pixiewps))) + (home-page "https://github.com/t6x/reaver-wps-fork-t6x/") + (synopsis "Attack tool for Wi-Fi Protected Setup") + (description "Reaver performs a brute force attack against an access +point's Wi-Fi Protected Setup (WPS) PIN. Once the PIN is found, the WPA +passphrase can be recovered and the AP's wireless settings can be +reconfigured.") + (license license:gpl2+))) + (define-public perl-danga-socket (package (name "perl-danga-socket") -- cgit v1.2.3 From 46c1193a2914151bd594c79546b168c41cdb38d1 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 3 Aug 2019 13:24:50 +0100 Subject: gnu: Add emacs-mu4e-jump-to-list. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-mu4e-jump-to-list): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 06367aa991..eb9121fba3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -40,7 +40,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms -;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018, 2019 Brett Gilio ;;; Copyright © 2019 Dimakakos Dimos ;;; Copyright © 2019 Brian Leung @@ -7305,6 +7305,34 @@ Additionally it can display the number of unread emails in the mode-line.") (license license:gpl3+))) +(define-public emacs-mu4e-jump-to-list + (let ((commit "358bba003543b49ffa266e503e54aebd0ebe614b") + (revision "1")) + (package + (name "emacs-mu4e-jump-to-list") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/wavexx/mu4e-jump-to-list.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00y9nap61q1z2cdql4k9g7fgi2gdgd9iy5s5lzrd9a4agbx6r7sv")))) + (build-system emacs-build-system) + (propagated-inputs + `(("mu" ,mu))) + (home-page "https://gitlab.com/wavexx/mu4e-jump-to-list.el") + (synopsis "Select and view mailing lists in mu4e") + (description + "@code{mu4e-jump-to-list} allows you to select and view mailing lists +automatically using existing List-ID headers in your mu database. Just press +\"l\" in the headers view and any mailing list you've subscribed to will be +automatically discovered and presented in recency order.") + (license license:gpl3+)))) + (define-public emacs-pretty-mode (package (name "emacs-pretty-mode") -- cgit v1.2.3 From 47c95c94b4ef432ceee9afd3a41bd582c506cf8f Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 3 Aug 2019 13:29:15 +0100 Subject: gnu: Add emacs-mu4e-patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-mu4e-patch): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eb9121fba3..de7e85aa5a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7333,6 +7333,32 @@ automatically using existing List-ID headers in your mu database. Just press automatically discovered and presented in recency order.") (license license:gpl3+)))) +(define-public emacs-mu4e-patch + (let ((commit "522da46c1653b1cacc79cde91d6534da7ae9517d") + (revision "1")) + (package + (name "emacs-mu4e-patch") + (version (git-version "0.1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/seanfarley/mu4e-patch") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10lzf3b70pk6rzdrgx0ww0gc94v0ydh9zj1gbsa20xw27ds7hmfn")))) + (build-system emacs-build-system) + (propagated-inputs + `(("mu" ,mu))) + (home-page "https://github.com/seanfarley/mu4e-patch") + (synopsis "Colorize patch-like emails in mu4e") + (description + "Extension for mu4e to colorize patch-like emails with diff-mode. +This is based on Frank Terbeck's @code{gnus-article-treat-patch.el} but has +been adapted to work with mu4e.") + (license license:gpl3+)))) + (define-public emacs-pretty-mode (package (name "emacs-pretty-mode") -- cgit v1.2.3 From d020821c0bd2206a5f3d4db155f2a9a3de7dc670 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 22 Aug 2019 14:24:11 -0400 Subject: Revert "import: cpan: Adapt for the change to guile-json version 3." This reverts commit 01ce7af25add55514f737af48ea6c127bedfde67. --- guix/import/cpan.scm | 30 ++++++++++++++---------------- tests/cpan.scm | 13 +++++-------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 0be37e715e..ec86f11743 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -34,7 +34,7 @@ #:use-module (guix ui) #:use-module ((guix download) #:select (download-to-store url-fetch)) #:use-module ((guix import utils) #:select (factorize-uri - flatten hash-ref*)) + flatten assoc-ref*)) #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) @@ -76,8 +76,8 @@ ;; ssleay ;; sun ("zlib" 'zlib) - ((x) (string->license x)) - ((lst ...) `(list ,@(map string->license lst))) + (#(x) (string->license x)) + (#(lst ...) `(list ,@(map string->license lst))) (_ #f))) (define (module->name module) @@ -88,11 +88,11 @@ "Return the base distribution module for a given module. E.g. the 'ok' module is distributed with 'Test::Simple', so (module->dist-name \"ok\") would return \"Test-Simple\"" - (hash-ref (json-fetch (string-append - "https://fastapi.metacpan.org/v1/module/" - module - "?fields=distribution")) - "distribution")) + (assoc-ref (json-fetch (string-append + "https://fastapi.metacpan.org/v1/module/" + module + "?fields=distribution")) + "distribution")) (define (package->upstream-name package) "Return the CPAN name of PACKAGE." @@ -122,12 +122,12 @@ or #f on failure. MODULE should be e.g. \"Test::Script\"" (define (cpan-source-url meta) "Return the download URL for a module's source tarball." (regexp-substitute/global #f "http[s]?://cpan.metacpan.org" - (hash-ref meta "download_url") + (assoc-ref meta "download_url") 'pre "mirror://cpan" 'post)) (define (cpan-version meta) "Return the version number from META." - (match (hash-ref meta "version") + (match (assoc-ref meta "version") ((? number? version) ;; version is sometimes not quoted in the module json, so it gets ;; imported into Guile as a number, so convert it to a string. @@ -183,7 +183,7 @@ depend on (gnu packages perl)." "Return the `package' s-expression for a CPAN module from the metadata in META." (define name - (hash-ref meta "distribution")) + (assoc-ref meta "distribution")) (define (guix-name name) (if (string-prefix? "perl-" name) @@ -198,9 +198,7 @@ META." (match (flatten (map (lambda (ph) (filter-map (lambda (t) - (and=> (hash-ref* meta "metadata" "prereqs" ph t) - (lambda (h) - (hash-map->list cons h)))) + (assoc-ref* meta "metadata" "prereqs" ph t)) '("requires" "recommends" "suggests"))) phases)) (#f @@ -253,9 +251,9 @@ META." ,@(maybe-inputs 'propagated-inputs (convert-inputs '("runtime"))) (home-page ,(cpan-home name)) - (synopsis ,(hash-ref meta "abstract")) + (synopsis ,(assoc-ref meta "abstract")) (description fill-in-yourself!) - (license ,(string->license (hash-ref meta "license")))))) + (license ,(string->license (assoc-ref meta "license")))))) (define (cpan->guix-package module-name) "Fetch the metadata for PACKAGE-NAME from metacpan.org, and return the diff --git a/tests/cpan.scm b/tests/cpan.scm index cdd6c0e76a..189dd027e6 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -24,8 +24,7 @@ #:use-module (guix tests) #:use-module (guix grafts) #:use-module (srfi srfi-64) - #:use-module (ice-9 match) - #:use-module (ice-9 hash-table)) + #:use-module (ice-9 match)) ;; Globally disable grafts because they can trigger early builds. (%graft? #f) @@ -110,16 +109,14 @@ (test-equal "source-url-http" ((@@ (guix import cpan) cpan-source-url) - (alist->hash-table - `(("download_url" . - "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")))) + `(("download_url" . + "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") (test-equal "source-url-https" ((@@ (guix import cpan) cpan-source-url) - (alist->hash-table - `(("download_url" . - "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")))) + `(("download_url" . + "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") (test-end "cpan") -- cgit v1.2.3 From 888e477bf82452028fb188ec94e793bd04f98d55 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 22 Aug 2019 14:24:37 -0400 Subject: Revert "import: utils: Add hash-ref*." This reverts commit 8a3b11d1eb21e54b4f3a3cbceffed8ce2c11512e. --- guix/import/utils.scm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index ed6c3ce6af..2a3b7341fb 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -47,7 +47,6 @@ flatten assoc-ref* - hash-ref* url-fetch guix-hash-url @@ -117,15 +116,6 @@ recursively apply the procedure to the sub-list." (assoc-ref alist key) (apply assoc-ref* (assoc-ref alist key) rest))) -(define (hash-ref* hash-table key . rest) - "Return the value for KEY from HASH-TABLE. For each additional key specified, -recursively apply the procedure to the sub-hash-table." - (if (hash-table? hash-table) - (if (null? rest) - (hash-ref hash-table key) - (apply hash-ref* (hash-ref hash-table key) rest)) - #f)) ; For consistency with assoc-ref* - (define (url-fetch url file-name) "Save the contents of URL to FILE-NAME. Return #f on failure." (parameterize ((current-output-port (current-error-port))) -- cgit v1.2.3 From 0ccc9a0f5bb89b239d56157ea66f8420fcec5ba6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 22 Aug 2019 14:54:20 -0400 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.10. * gnu/packages/admin.scm (isc-dhcp)[bind-patch-version]: Update to 10. [inputs]: Update hash of bind-source-tarball. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5dacffe752..eb298dca3b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -684,7 +684,7 @@ connection alive.") (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "9") + (bind-patch-version "10") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -825,7 +825,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "03n57as73ygw6g3lqsmq2idkykajpbskzgixixdvi5a76m4g0fwn")))) + "1hvhdaar9swh5087kzkbmav1nbn19rxh0m60x0d7gri0v8689fxj")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. -- cgit v1.2.3 From d78bc23411b1351ff9495a511c22b27d17f9226f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 21 Aug 2019 00:15:18 +0200 Subject: gnu: Add emacs-ample-regexps. * gnu/packages/emacs-xyz.scm (emacs-ample-regexps): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index de7e85aa5a..b6c972043d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -905,6 +905,35 @@ skip set strings, which are arguments to @code{skip-chars-forward} and @code{skip-chars-backward}.") (license license:gpl3+))) +(define-public emacs-ample-regexps + (let ((commit "cbe91e148cac1ee8e223874dc956ed4cf607f046") + (revision "1")) + (package + (name "emacs-ample-regexps") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/immerrr/ample-regexps.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mm4icrwx4mscp7kbbmlc34995r164dhrfczn5ybkyxjzzf76jn1")))) + (build-system emacs-build-system) + (native-inputs + `(("ert-runner" ,emacs-ert-runner))) + (arguments + `(#:tests? #t + #:test-command '("ert-runner" "-l" "ample-regexps"))) + (home-page "https://github.com/immerrr/ample-regexps.el") + (synopsis "Compose and reuse Emacs regexps") + (description + "This package allows common parts of regexps to be easily picked out +and reused.") + (license license:gpl3+)))) + (define-public emacs-reformatter (package (name "emacs-reformatter") -- cgit v1.2.3 From b908fcd8c02c26b1e6cdc636b63306a01a21b994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 23 Aug 2019 17:45:17 +0200 Subject: pack: '-R' honors the requested output. Fixes . Reported by Jesse Gibbons . * guix/scripts/pack.scm (wrapped-package): Add 'output*' parameter. [build]: Define 'input' and 'target'; use them instead of #$package and #$output, respectively. (wrapped-manifest-entry): New procedure. (map-manifest-entries): Call PROC directly. (guix-pack): Pass WRAPPED-MANIFEST-ENTRY to 'map-manifest-entries'. --- guix/scripts/pack.scm | 49 ++++++++++++++++++++++++++++-------------- tests/guix-pack-relocatable.sh | 6 ++++++ 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index fdb98983bf..794d2ee390 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -611,8 +611,13 @@ please email '~a'~%") ;;; (define* (wrapped-package package - #:optional (compiler (c-compiler)) + #:optional + (output* "out") + (compiler (c-compiler)) #:key proot?) + "Return the OUTPUT of PACKAGE with its binaries wrapped such that they are +relocatable. When PROOT? is true, include PRoot in the result and use it as a +last resort for relocation." (define runner (local-file (search-auxiliary-file "run-in-namespace.c"))) @@ -629,6 +634,14 @@ please email '~a'~%") (ice-9 ftw) (ice-9 match)) + (define input + ;; The OUTPUT* output of PACKAGE. + (ungexp package output*)) + + (define target + ;; The output we are producing. + (ungexp output output*)) + (define (strip-store-prefix file) ;; Given a file name like "/gnu/store/…-foo-1.2/bin/foo", return ;; "/bin/foo". @@ -648,7 +661,7 @@ please email '~a'~%") (("@STORE_DIRECTORY@") (%store-directory))) (let* ((base (strip-store-prefix program)) - (result (string-append #$output "/" base)) + (result (string-append target "/" base)) (proot #$(and proot? #~(string-drop #$(file-append (proot) "/bin/proot") @@ -667,18 +680,18 @@ please email '~a'~%") ;; Link the top-level files of PACKAGE so that search paths are ;; properly defined in PROFILE/etc/profile. - (mkdir #$output) + (mkdir target) (for-each (lambda (file) (unless (member file '("." ".." "bin" "sbin" "libexec")) - (let ((file* (string-append #$package "/" file))) - (symlink (relative-file-name #$output file*) - (string-append #$output "/" file))))) - (scandir #$package)) + (let ((file* (string-append input "/" file))) + (symlink (relative-file-name target file*) + (string-append target "/" file))))) + (scandir input)) (for-each build-wrapper - (append (find-files #$(file-append package "/bin")) - (find-files #$(file-append package "/sbin")) - (find-files #$(file-append package "/libexec"))))))) + (append (find-files (string-append input "/bin")) + (find-files (string-append input "/sbin")) + (find-files (string-append input "/libexec"))))))) (computed-file (string-append (cond ((package? package) @@ -691,14 +704,18 @@ please email '~a'~%") "R") build)) +(define (wrapped-manifest-entry entry . args) + (manifest-entry + (inherit entry) + (item (apply wrapped-package + (manifest-entry-item entry) + (manifest-entry-output entry) + args)))) + (define (map-manifest-entries proc manifest) "Apply PROC to all the entries of MANIFEST and return a new manifest." (make-manifest - (map (lambda (entry) - (manifest-entry - (inherit entry) - (item (proc (manifest-entry-item entry))))) - (manifest-entries manifest)))) + (map proc (manifest-entries manifest)))) ;;; @@ -960,7 +977,7 @@ Create a bundle of PACKAGE.\n")) ;; 'glibc-bootstrap' lacks 'libc.a'. (if relocatable? (map-manifest-entries - (cut wrapped-package <> #:proot? proot?) + (cut wrapped-manifest-entry <> #:proot? proot?) manifest) manifest))) (pack-format (assoc-ref opts 'format)) diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh index ebada62c01..e93610eedc 100644 --- a/tests/guix-pack-relocatable.sh +++ b/tests/guix-pack-relocatable.sh @@ -78,3 +78,9 @@ else "$test_directory/Bin/sed" --version > "$test_directory/output" fi grep 'GNU sed' "$test_directory/output" +chmod -Rf +w "$test_directory"; rm -rf "$test_directory"/* + +# Ensure '-R' works with outputs other than "out". +tarball="`guix pack -R -S /share=share groff:doc`" +(cd "$test_directory"; tar xvf "$tarball") +test -d "$test_directory/share/doc/groff/html" -- cgit v1.2.3 From 90c98b5a89038c41a0db0add9e2a3d4d1a1b6102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 23 Aug 2019 18:16:13 +0200 Subject: swh: 'swh-download' checks return value of 'vault-fetch'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Björn Höfling in . * guix/swh.scm (swh-download): Check whether 'vault-fetch' return false before calling 'dump-port'. --- guix/swh.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index df2a138f04..1c416c8dd5 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -547,19 +547,22 @@ wait until it becomes available, which could take several minutes." ((? revision? revision) (call-with-temporary-directory (lambda (directory) - (let ((input (vault-fetch (revision-directory revision) 'directory)) - (tar (open-pipe* OPEN_WRITE "tar" "-C" directory "-xzvf" "-"))) - (dump-port input tar) - (close-port input) - (let ((status (close-pipe tar))) - (unless (zero? status) - (error "tar extraction failure" status))) - - (match (scandir directory) - (("." ".." sub-directory) - (copy-recursively (string-append directory "/" sub-directory) - output - #:log (%make-void-port "w")) - #t)))))) + (match (vault-fetch (revision-directory revision) 'directory) + (#f + #f) + ((? port? input) + (let ((tar (open-pipe* OPEN_WRITE "tar" "-C" directory "-xzvf" "-"))) + (dump-port input tar) + (close-port input) + (let ((status (close-pipe tar))) + (unless (zero? status) + (error "tar extraction failure" status))) + + (match (scandir directory) + (("." ".." sub-directory) + (copy-recursively (string-append directory "/" sub-directory) + output + #:log (%make-void-port "w")) + #t)))))))) (#f #f))) -- cgit v1.2.3 From 9dd5f4752844c1445fd1b1dd3927ca8e9e4f8abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 23 Aug 2019 18:41:05 +0200 Subject: gnu: Add JUBE. * gnu/packages/python-xyz.scm (jube): New variable. Co-authored-by: Florent Pruvost --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f4c3b79d0..135ff05237 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16089,3 +16089,28 @@ The library has a number of built-in tilesets from OpenStreetMap, Mapbox, and Stamen, and supports custom tilesets with Mapbox or Cloudmade API keys. It supports Image, Video, GeoJSON and TopoJSON overlays.") (license license:expat))) + +(define-public jube + (package + ;; This is a command-line tool, so no "python-" prefix. + (name "jube") + (version "2.2.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://apps.fz-juelich.de/jsc/jube/jube2/download.php?version=" + version)) + (sha256 + (base32 + "0xq4k1q63s1p6swgyp61vahlrd1fqmgbm0gm5kpj8ikwy0yc0nqk")) + (file-name (string-append "jube-" version ".tar.gz")))) + (build-system python-build-system) + (home-page "https://apps.fz-juelich.de/jsc/jube/jube2/docu/index.html") + (synopsis "Benchmarking environment") + (description + "JUBE helps perform and analyze benchmarks in a systematic way. For each +benchmarked application, benchmark data is stored in a format that allows JUBE +to deduct the desired information. This data can be parsed by automatic pre- +and post-processing scripts that draw information and store it more densely +for manual interpretation.") + (license license:expat))) -- cgit v1.2.3 From d9d1421a4fdc9ab3c99a6dc07af09c548e7d177c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 23 Aug 2019 16:31:26 +0200 Subject: gnu: parallel: Update to 20190822. * gnu/packages/parallel.scm (parallel): Update to 20190822. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index cdc35b4703..3b7ce4c150 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -52,14 +52,14 @@ (define-public parallel (package (name "parallel") - (version "20190522") + (version "20190822") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0y3z9wybs3gak3zwgsby8r5gg6dwd3qlrkch0q4fn0i1j1jhmijv")))) + (base32 "1mi3a18fdwcx50jg51pw1ks1fkmc2slyinff0yb3xhihi2szbskp")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From b1bd6b54b1d5f42bd048233fa2bba217c38ae99b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 23 Aug 2019 22:32:02 +0200 Subject: gnu: foo2zjs: Update to 20190517. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The (unversioned) tarball was modified to replace mention of ‘yum’ with ‘dnf’. * gnu/packages/cups.scm (foo2zjs): Update to 20190517. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 467aa5d84c..9080362eb2 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -639,14 +639,14 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20190413") + (version "20190517") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "0djzp3ddslmzyxkjhzkhkg6qqqm02whjfnfvh5glprkshcskzlg9")))) + "13gzsd26nq4brx1xzpwmg1qnr4nk7ykgi94qr1hbjqfi561prki4")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 8d515ce6e935a4b7bbc40aee1dc1b0cf29e94a24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 23 Aug 2019 22:32:54 +0200 Subject: gnu: foomatic-filters: Don't use NAME in source URI. * gnu/packages/cups.scm (foomatic-filters)[source]: Hard-code NAME. --- gnu/packages/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 9080362eb2..22b87460ab 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -594,7 +594,7 @@ should only be used as part of the Guix cups-pk-helper service.") (method url-fetch) (uri (string-append "http://www.openprinting.org/download/foomatic/" - name "-" version ".tar.gz")) + "foomatic-filters-" version ".tar.gz")) (sha256 (base32 "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2")) -- cgit v1.2.3 From a9f3396014461a29e9d0256dcd5a87c19f850f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 23 Aug 2019 19:14:32 +0200 Subject: gnu: jube: Fix license. * gnu/packages/python-xyz.scm (jube)[license]: Change to GPL3+. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 135ff05237..ec7017eb7e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16113,4 +16113,4 @@ benchmarked application, benchmark data is stored in a format that allows JUBE to deduct the desired information. This data can be parsed by automatic pre- and post-processing scripts that draw information and store it more densely for manual interpretation.") - (license license:expat))) + (license license:gpl3+))) -- cgit v1.2.3 From a88ac044bc8ffd0386b28609ecb7a2d619e52495 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 22:23:58 +0200 Subject: gnu: ruby-mini-portile-2: Update to 2.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-mini-portile-2): Update to 2.4.0. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cee78656cb..4eeca0bdc0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3638,13 +3638,13 @@ to reproduce user environments.") (define-public ruby-mini-portile-2 (package (inherit ruby-mini-portile) - (version "2.2.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (rubygems-uri "mini_portile2" version)) (sha256 (base32 - "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm")))))) + "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy")))))) (define-public ruby-nokogiri (package -- cgit v1.2.3 From 99d17bb5532bd3c0ae1544fa0b39ac21211e65e3 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 08:04:19 +0200 Subject: gnu: ruby-simplecov: Update to 0.17.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-simplecov): Update to 0.17.0. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4eeca0bdc0..d3482cbda0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2035,13 +2035,13 @@ the SimpleCov code coverage tool for Ruby version 1.9 and above.") (define-public ruby-simplecov (package (name "ruby-simplecov") - (version "0.12.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (rubygems-uri "simplecov" version)) (sha256 (base32 - "0ffhyrfnq2zm2mc1742a4hqy475g3qa1zf6yfldwg1ldh5sn3qbx")))) + "0dq0nkaxvbsnl70hkimy35g4yjfs3blx4s7nbpzbvgqx72hxgv5v")))) (build-system ruby-build-system) ;; Simplecov depends on rubocop for code style checking at build time. ;; Rubocop needs simplecov at build time. -- cgit v1.2.3 From ab8c52a2193c1323f6ae2cb98fb92a0b60e31d13 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 08:14:16 +0200 Subject: gnu: ruby-nokogiri: Update to 1.10.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-nokogiri): Update to 1.10.4. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d3482cbda0..8f6b81a8eb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3649,13 +3649,13 @@ to reproduce user environments.") (define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.8.0") + (version "1.10.4") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn")))) + "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv")))) (build-system ruby-build-system) (arguments ;; Tests fail because Nokogiri can only test with an installed extension, -- cgit v1.2.3 From 9e065a8aa2e993e1683962190d0023161f84532c Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 22:28:20 +0200 Subject: gnu: Add ruby-reverse-markdown. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-reverse-markdown): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8f6b81a8eb..93a47b7afa 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Mikhail Kirillov ;;; Copyright © 2019 Jelle Licht +;;; Copyright © 2019 Brian Leung ;;; ;;; This file is part of GNU Guix. ;;; @@ -8807,3 +8808,39 @@ It is intended to determine whether a newer API specification is backwards-compatible with an older API specification.") (home-page "https://github.com/civisanalytics/swagger-diff") (license license:bsd-3))) + +(define-public ruby-reverse-markdown + (package + (name "ruby-reverse-markdown") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "reverse_markdown" version)) + (sha256 + (base32 + "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-nokogiri" ,ruby-nokogiri))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-kramdown" ,ruby-kramdown) + ("ruby-simplecov" ,ruby-simplecov))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (synopsis "Convert HTML into Markdown") + (description + "This Ruby module allows you to map simple HTML back into +Markdown---e.g., if you want to import existing HTML data in your +application.") + (home-page "https://github.com/xijo/reverse_markdown") + (license license:wtfpl2))) + -- cgit v1.2.3 From 7bddb6aa53d396bc5540a08f2d7d91394d12645a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 06:44:20 +0200 Subject: gnu: Add ruby-htmlentities. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-htmlentities): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 93a47b7afa..63b3facd29 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8572,6 +8572,33 @@ characteristics.") (home-page "https://github.com/sinatra/mustermann") (license license:expat))) +(define-public ruby-htmlentities + (package + (name "ruby-htmlentities") + (version "4.3.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "htmlentities" version)) + (sha256 + (base32 + "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj")))) + (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (map (lambda (file) + (invoke "ruby" "-Itest" file)) + (find-files "./test" ".*_test\\.rb"))))))) + (synopsis "Encode and decode (X)HTML entities") + (description + "This package provides a module for encoding and decoding (X)HTML +entities.") + (home-page "https://github.com/threedaymonk/htmlentities") + (license license:expat))) + (define-public ruby-sinatra (package (name "ruby-sinatra") -- cgit v1.2.3 From a9e2de7e3a5e773f2ce35c30c22b62bac18423c4 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 23:45:29 +0200 Subject: gnu: Add ruby-solargraph. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-solargraph): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 63b3facd29..ef9792bc0f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8871,3 +8871,56 @@ application.") (home-page "https://github.com/xijo/reverse_markdown") (license license:wtfpl2))) +(define-public ruby-solargraph + (package + (name "ruby-solargraph") + (version "0.36.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "solargraph" version)) + (sha256 + (base32 + "0b93xzkgd1h06da9gdnwivj1mzbil8lc072y2838dy6i7bxgpy9i")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-backport" ,ruby-backport) + ("bundler" ,bundler) + ("ruby-htmlentities" ,ruby-htmlentities) + ("ruby-jaro-winkler" ,ruby-jaro-winkler) + ("ruby-maruku" ,ruby-maruku) + ("ruby-nokogiri" ,ruby-nokogiri) + ("ruby-parser" ,ruby-parser) + ("ruby-reverse-markdown" ,ruby-reverse-markdown) + ("ruby-rubocop" ,ruby-rubocop) + ("ruby-thor" ,ruby-thor) + ("ruby-tilt" ,ruby-tilt) + ("ruby-yard" ,ruby-yard))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-pry" ,ruby-pry) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-webmock" ,ruby-webmock-2))) + ;; FIXME: can't figure out how to run the tests properly: + + ;; An error occurred while loading spec_helper. + ;; Failure/Error: return gem_original_require(path) + ;; LoadError: + ;; cannot load such file -- spec_helper + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")) + #t))))) + (synopsis + "IDE tools for code completion, inline documentation, and static analysis") + (description + "Solargraph provides a comprehensive suite of tools for Ruby +programming: intellisense, diagnostics, inline documentation, and type +checking.") + (home-page "https://solargraph.org/") + (license license:expat))) -- cgit v1.2.3 From 64fa66ba3d7a5c186dffca983634d177aeb949cf Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 20 Aug 2019 11:23:02 +0200 Subject: gnu: libdazzle: Update to 3.33.90. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libdazzle): Update to 3.33.90. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bfc055eed4..6ef6fdfc42 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8051,7 +8051,7 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") (define-public libdazzle (package (name "libdazzle") - (version "3.28.5") + (version "3.33.90") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libdazzle/" @@ -8059,17 +8059,11 @@ hexadecimal or ASCII. It is useful for editing binary files in general.") "libdazzle-" version ".tar.xz")) (sha256 (base32 - "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) + "189m7q88d1a7bq0yyal9f3yhm9kz46lb61379nn4wsnnhpa1d0qs")))) (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - ;; Disable failing test. - (substitute* "tests/meson.build" - (("test\\('test-application") "#")) - #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. -- cgit v1.2.3 From cd4fec577cbd9d2a740a17e62db61ae97bdc2ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 24 Aug 2019 10:43:54 +0800 Subject: gnu: go-ipfs: Update to 0.4.22. * gnu/packages/ipfs.scm (go-ipfs): Update from 0.4.19 to 0.4.22. --- gnu/packages/ipfs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 4f61f2ba66..2dd2097075 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -219,7 +219,7 @@ written in Go.") (define-public go-ipfs (package (name "go-ipfs") - (version "0.4.19") + (version "0.4.22") (source (origin (method url-fetch/tarbomb) @@ -227,7 +227,7 @@ written in Go.") "https://dist.ipfs.io/go-ipfs/v" version "/go-ipfs-source.tar.gz")) (sha256 - (base32 "0s04ap14p6hnipjm27nm5k8s28zv9k5g9mziyh3ibgwn7dzb1kpx")) + (base32 "1gyz9yqb4y7p6vdjbcm66nvm6gjs4mdrjygdn79z3misv1pb5nkg")) (file-name (string-append name "-" version "-source")))) (build-system go-build-system) (arguments -- cgit v1.2.3 From d5be746a8505c4c6b3f8f7506a582188a07883d1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Aug 2019 01:06:51 +0200 Subject: gnu: python-pyodbc: Update to 4.0.27. * gnu/packages/databases.scm (python-pyodbc): Update to 4.0.27. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 63ad760757..333a88b8c7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2101,20 +2101,19 @@ for ODBC.") (define-public python-pyodbc (package (name "python-pyodbc") - (version "4.0.26") + (version "4.0.27") (source (origin (method url-fetch) (uri (pypi-uri "pyodbc" version)) (sha256 - (base32 "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5")) + (base32 "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (inputs `(("unixodbc" ,unixodbc))) (arguments - `(;; No unit tests exist. - #:tests? #f)) + `(#:tests? #f)) ; no unit tests exist (home-page "https://github.com/mkleehammer/pyodbc") (synopsis "Python ODBC Library") (description "@code{python-pyodbc} provides a Python DB-API driver -- cgit v1.2.3 From 8a8e449147cced332354994c2ef65e9755a185c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Aug 2019 01:07:04 +0200 Subject: gnu: python-pyscard: Update to 1.9.9. * gnu/packages/security-token.scm (python-pyscard): Update to 1.9.9. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 3d6ad4f9d7..90892a57e8 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -353,7 +353,7 @@ retrieve a YubiKey's serial number, and so forth.") (define-public python-pyscard (package (name "python-pyscard") - (version "1.9.8") + (version "1.9.9") (source (origin (method url-fetch) ;; The maintainer publishes releases on various sites, but @@ -363,7 +363,7 @@ retrieve a YubiKey's serial number, and so forth.") version "/pyscard-" version ".tar.gz")) (sha256 (base32 - "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm")))) + "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 70fcf8167e81ecaef0748ef7b06d69df61c803e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Aug 2019 01:44:26 +0200 Subject: gnu: python-acme: Update to 0.37.2. * gnu/packages/tls.scm (python-acme): Update to 0.37.2. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 20dc69282a..35ade85468 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -532,13 +532,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.35.1") + (version "0.37.2") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "08y4ankn0di34c9d1c3pqd9by9n0ckzz7b5ld1g0fx6c32sbi259")))) + "0p3zqhna9p8iy5i9mfhzdf5bmjigs05r6rlwnxykk4n67fp8yyc8")))) (build-system python-build-system) (arguments `(#:phases @@ -589,7 +589,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri name version)) (sha256 (base32 - "0q0855qvsvs4mgglss5iim7f1p22rv4rn1n6j731vv869v0yrs6p")))) + "1xbfv4fwkgfp9qqzlk8wxbhchc61349m26q9fg35j9fnm253cm74")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From b380463b50268875474bd385ec159908e51d2b8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Aug 2019 01:44:50 +0200 Subject: gnu: certbot: Don't use NAME in source URI. * gnu/packages/tls.scm (certbot)[source]: Hard-code NAME. --- gnu/packages/tls.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 35ade85468..833a3715af 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -586,7 +586,7 @@ netcat implementation that supports TLS.") (version (package-version python-acme)) (source (origin (method url-fetch) - (uri (pypi-uri name version)) + (uri (pypi-uri "certbot" version)) (sha256 (base32 "1xbfv4fwkgfp9qqzlk8wxbhchc61349m26q9fg35j9fnm253cm74")))) -- cgit v1.2.3 From fdfad2fc4e291030bd7b864a7a1fa5885bfe8eea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Aug 2019 04:08:16 +0200 Subject: gnu: python-twisted: Update to 19.7.0. * gnu/packages/python-xyz.scm (python-twisted): Update to 19.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ec7017eb7e..40e6a01dd7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9978,13 +9978,13 @@ format.") (define-public python-twisted (package (name "python-twisted") - (version "19.2.1") + (version "19.7.0") (source (origin (method url-fetch) (uri (pypi-uri "Twisted" version ".tar.bz2")) (sha256 (base32 - "0liymyd4pzphizjlpwkncxjpm9akyr3lkfkm77yfg6wasv108b7s")))) + "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: some tests fail -- cgit v1.2.3 From 7929f1f5307ab22aae627f6beaa35b0946625ba6 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 24 Aug 2019 11:54:16 +0200 Subject: gnu: wine: Update to 4.0.2. * gnu/packages/wine.scm (wine): Update to 4.0.2. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index b8a2264153..4cf1a3ac4b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -72,7 +72,7 @@ (define-public wine (package (name "wine") - (version "4.0.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -80,7 +80,7 @@ "/wine-" version ".tar.xz")) (sha256 (base32 - "0j29df0px6dzin4j0cbxgza4msvf9spmwranv25krq1g9kq959nk")))) + "0x5x9pvhryzhq1m7i8gx5wwwj341zz05zymadlhfw5w45xlm0h4r")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From 52e7295fc18cd554ee1fd018d490d40740b62e66 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 14 Aug 2019 17:35:47 +0200 Subject: gnu: Add fet. * gnu/packages/education.scm (fet): New variable. --- gnu/packages/education.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0bb9c099fb..440746a28c 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -480,3 +480,43 @@ use the computer and at the same time teach them a little math, letters of the alphabet, spelling, eye-hand coordination, etc.") (home-page "http://www.schoolsplay.org") (license license:gpl3+))) + +(define-public fet + (package + (name "fet") + (version "5.39.0") + (source (origin + (method url-fetch) + (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" + "fet-" version ".tar.bz2")) + (sha256 + (base32 + "100bmggkychqs2cavqxy7015lr4icw6k99qb03im0v4jasqqmyix")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hardcoded-directories + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (list "fet.pro" + "src/src.pro" + "src/src-cl.pro" + "src/interface/fet.cpp") + (("/usr") (assoc-ref outputs "out"))) + #t)) + (replace 'configure + (lambda _ (invoke "qmake" "fet.pro")))))) + (inputs + `(("qtbase" ,qtbase))) + (home-page "https://www.lalescu.ro/liviu/fet/") + (synopsis "Timetabling software") + (description "FET is a program for automatically scheduling the +timetable of a school, high-school or university. It uses a fast and +efficient timetabling algorithm. + +Usually, FET is able to solve a complicated timetable in maximum 5-20 +minutes. For simpler timetables, it may take a shorter time, under +5 minutes (in some cases, a matter of seconds). For extremely +difficult timetables, it may take a longer time, a matter of hours.") + (license license:agpl3+))) + -- cgit v1.2.3 From 9119f7aba8f254aeb892e9c670fbf6f541b90607 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 24 Aug 2019 11:29:53 +0200 Subject: gnu: Add rust-libc. * gnu/packages/crates-io.scm (rust-libc): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6500adb215..c54920548c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -313,6 +314,38 @@ friction with idiomatic Rust structs to ease interopability.") (license (list license:asl2.0 license:expat)))) +(define-public rust-libc + (package + (name "rust-libc") + (version "0.2.62") + (source + (origin + (method url-fetch) + (uri (crate-uri "libc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fh69kpjg8hqff36kdczx7sax98gk4qs4ws1dwvjz0rgip0d5z1l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core)))) + (home-page "https://github.com/rust-lang/libc") + (synopsis "Raw FFI bindings to platform libraries like libc") + (description + "libc provides all of the definitions necessary to easily +interoperate with C code (or \"C-like\" code) on each of the platforms +that Rust supports. This includes type definitions (e.g., c_int), +constants (e.g., EINVAL) as well as function headers (e.g., malloc). + +This crate exports all underlying platform types, functions, and +constants under the crate root, so all items are accessible as +@samp{libc::foo}. The types and values of all the exported APIs match +the platform that libc is compiled for.") + (license (list license:expat + license:asl2.0)))) + (define-public rust-maplit (package (name "rust-maplit") @@ -950,3 +983,4 @@ x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on @code{winapi} instead.") (license (list license:asl2.0 license:expat)))) + -- cgit v1.2.3 From 03551c17deeb5b634b95de9602ac8d2b438f443f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 24 Aug 2019 11:54:38 +0200 Subject: gnu: Add rust-num-traits. * gnu/packages/crates-io.scm (rust-num-traits): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c54920548c..0fd0827a12 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -404,6 +404,30 @@ whether an expression matches a pattern.") (license (list license:asl2.0 license:expat)))) +(define-public rust-num-traits + (package + (name "rust-num-traits") + (version "0.2.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-traits" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg)))) + (home-page "https://github.com/rust-num/num-traits") + (synopsis "Numeric traits for generic mathematics") + (description "Numeric traits for generic mathematics.") + ;; Dual licensed. + (license (list license:asl2.0 + license:expat)))) + (define-public rust-peeking-take-while (package (name "rust-peeking-take-while") -- cgit v1.2.3 From fc4a03544567f34ef5f4e3cfea10fe4d6d2805e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 24 Aug 2019 11:55:55 +0200 Subject: gnu: Add rust-num-integer. * gnu/packages/crates-io.scm (rust-num-integer): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0fd0827a12..aeebed4334 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -404,6 +404,32 @@ whether an expression matches a pattern.") (license (list license:asl2.0 license:expat)))) +(define-public rust-num-integer + (package + (name "rust-num-integer") + (version "0.1.41") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-integer" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02dwjjpfbi16c71fq689s4sw3ih52cvfzr5z5gs6qpr5z0g58pmq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits)) + #:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg)))) + (home-page "https://github.com/rust-num/num-integer") + (synopsis "Integer traits and functions") + (description "Integer traits and functions.") + ;; Dual licensed. + (license (list license:asl2.0 + license:expat)))) + (define-public rust-num-traits (package (name "rust-num-traits") -- cgit v1.2.3 From 9e4422d6831b2d71416028d09516d3ad97d65592 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 24 Aug 2019 16:51:33 +0200 Subject: gnu: Add rust-wasi. * gnu/packages/crates-io.scm (rust-wasi): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aeebed4334..17ca952830 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -946,6 +946,26 @@ whitespace from a string.") (license (list license:asl2.0 license:expat)))) +(define-public rust-wasi + (package + (name "rust-wasi") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasi" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ir3pd4phdfml0cbziw9bqp7mnk0vfp9biy8bh25lln6raml4m7x")))) + (build-system cargo-build-system) + (home-page "https://github.com/CraneStation/rust-wasi") + (synopsis "Experimental WASI API bindings for Rust") + (description "This package contains experimental WASI API bindings +in Rust.") + (license license:asl2.0))) + (define-public rust-wasm-bindgen-shared (package (name "rust-wasm-bindgen-shared") -- cgit v1.2.3 From 5c8b9a43819e174801597a249d4b46ab2526ca3b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 24 Aug 2019 18:25:53 +0200 Subject: gnu: sbcl: Enable core compression and xref for internals. * gnu/packages/lisp.scm (sbcl): Do it. --- gnu/packages/lisp.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a42369ba06..0c94283cc5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -364,7 +364,8 @@ an interpreter, a compiler, a debugger, and much more.") ("inetutils" ,inetutils) ;for hostname(1) ("ed" ,ed) ("texlive" ,(texlive-union (list texlive-tex-texinfo))) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("zlib" ,zlib))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -422,6 +423,8 @@ an interpreter, a compiler, a debugger, and much more.") ;; them in HOME, so it needs to be writeable. (add-before 'build 'set-HOME (lambda _ (setenv "HOME" "/tmp") #t)) + ;; TODO: We need to install the source as well (`src/code' directory) + ;; so that "go do definition" can work. (replace 'build (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" "gcc") @@ -431,7 +434,9 @@ an interpreter, a compiler, a debugger, and much more.") (_ `("clisp"))) (string-append "--prefix=" - (assoc-ref outputs "out"))))) + (assoc-ref outputs "out")) + "--with-sb-core-compression" + "--with-sb-xref-for-internals"))) (replace 'install (lambda _ (invoke "sh" "install.sh"))) -- cgit v1.2.3 From 0908f93149dd97702ba638701724ac9177cca80b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 24 Aug 2019 18:43:03 +0200 Subject: gnu: sbcl: Update to 1.5.5. * gnu/packages/lisp.scm (sbcl): Update to 1.5.5. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 0c94283cc5..1945a1bdd8 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -327,14 +327,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "1.5.1") + (version "1.5.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "08z62qba0kmm15k93s2rq7ipi769895g8iwigcp20qjh6amwnwph")) + (base32 "1qmapk2hyxxqd3ajiqacz4isij0ibx7gn10n8dbmq33gm3kgliyb")) (modules '((guix build utils))) (snippet ;; Add sbcl-bundle-systems to 'default-system-source-registry'. -- cgit v1.2.3 From 2cb81e1ebedc49a5af549d1bcd520add38d9062d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Aug 2019 22:13:36 +0200 Subject: gnu: libextractor: Adapt to exiv2 0.27. This fixes a compilation error. * gnu/packages/patches/libextractor-exiv2.patch: New file. * gnu/packages/gnunet.scm (libextractor)[sources]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gnunet.scm | 3 +- gnu/packages/patches/libextractor-exiv2.patch | 124 ++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libextractor-exiv2.patch diff --git a/gnu/local.mk b/gnu/local.mk index aab29beb0a..8b1b5ce6b4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1016,6 +1016,7 @@ dist_patch_DATA = \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ %D%/packages/patches/libexif-CVE-2018-20030.patch \ + %D%/packages/patches/libextractor-exiv2.patch \ %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-avoid-python.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 2653645c5d..2d82f47d99 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -75,7 +75,8 @@ version ".tar.gz")) (sha256 (base32 - "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")))) + "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh")) + (patches (search-patches "libextractor-exiv2.patch")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; not to be a symbolic link to /run/shm. diff --git a/gnu/packages/patches/libextractor-exiv2.patch b/gnu/packages/patches/libextractor-exiv2.patch new file mode 100644 index 0000000000..b92fef3ca1 --- /dev/null +++ b/gnu/packages/patches/libextractor-exiv2.patch @@ -0,0 +1,124 @@ +This patch allows us to build libextractor against exiv2 0.27.x. +Adapted from this upstream commit: + + commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c + Author: Christian Grothoff + Date: Mon Jul 29 17:58:18 2019 +0200 + + importing patch from Gentoo/AS to address exiv2 build issue (#5820) + +diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc +index 8741d40..ef402a8 100644 +--- a/src/plugins/exiv2_extractor.cc ++++ b/src/plugins/exiv2_extractor.cc +@@ -27,10 +27,7 @@ + #include + #include + #include +-#include +-#include +-#include +-#include ++#include + + /** + * Enable debugging to get error messages. +@@ -180,7 +177,7 @@ public: + * + * @return -1 on error + */ +-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++#if EXIV2_TEST_VERSION(0,26,0) + virtual size_t size (void) const; + #else + virtual long int size (void) const; +@@ -316,7 +313,11 @@ ExtractorIO::getb () + const unsigned char *r; + + if (1 != ec->read (ec->cls, &data, 1)) ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError (42 /* error code */); ++#endif + r = (const unsigned char *) data; + return *r; + } +@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) + void + ExtractorIO::transfer (Exiv2::BasicIo& src) + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError (42 /* error code */); ++#endif + } + + +@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, + Exiv2::byte * + ExtractorIO::mmap (bool isWritable) + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError (42 /* error code */); ++#endif + } + + +@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const + * + * @return -1 on error + */ +-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) ++#if EXIV2_TEST_VERSION(0,26,0) + size_t + #else + long int +@@ -504,7 +513,11 @@ ExtractorIO::eof () const + std::string + ExtractorIO::path () const + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError (42 /* error code */); ++#endif + } + + +@@ -517,7 +530,11 @@ ExtractorIO::path () const + std::wstring + ExtractorIO::wpath () const + { ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError (42 /* error code */); ++#endif + } + #endif + +@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr + ExtractorIO::temporary () const + { + fprintf (stderr, "throwing temporary error\n"); ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); ++#else + throw Exiv2::BasicError (42 /* error code */); ++#endif + } + + +@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) + { + try + { +-#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION ++#if !EXIV2_TEST_VERSION(0,24,0) + Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); + #endif + std::auto_ptr eio(new ExtractorIO (ec)); -- cgit v1.2.3 From 3d76112769d2149e81b7cc774d859469d1f1909e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 25 Aug 2019 12:11:15 +0800 Subject: gnu: sysstat: Update to 12.1.6. * gnu/packages/linux.scm (sysstat): Update from 11.4.3 to 12.1.6. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e2acccafcd..01bb4d01a0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4842,14 +4842,14 @@ running boot option, and more.") (define-public sysstat (package (name "sysstat") - (version "11.4.3") + (version "12.1.6") (source (origin (method url-fetch) (uri (string-append "http://perso.orange.fr/sebastien.godard/" "sysstat-" version ".tar.xz")) (sha256 (base32 - "1ryf9myjzpa2279i3rvsh6fr5psm6qvr5r9kbm1sxyspapxcms82")))) + "0agi17n82k363mf9f7cky3isq195hw112vs98v26yfhm0v2g6lpp")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No test suite. -- cgit v1.2.3 From d0480ca1a218361c449defbc653fe460f5f2f329 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Aug 2019 12:28:28 +0200 Subject: gnu: sbcl: Include source so that standard symbol definitions can be examined. * gnu/packages/lisp.scm (sbcl)[arguments]: Add build-source phase to install source directories "src" and "contrib". --- gnu/packages/lisp.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1945a1bdd8..d32f4b19bd 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -423,8 +423,6 @@ an interpreter, a compiler, a debugger, and much more.") ;; them in HOME, so it needs to be writeable. (add-before 'build 'set-HOME (lambda _ (setenv "HOME" "/tmp") #t)) - ;; TODO: We need to install the source as well (`src/code' directory) - ;; so that "go do definition" can work. (replace 'build (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" "gcc") @@ -445,6 +443,21 @@ an interpreter, a compiler, a debugger, and much more.") (with-directory-excursion "doc/manual" (and (invoke "make" "info") (invoke "make" "dist"))))) + (add-after 'build 'build-source + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rc (string-append out "/lib/sbcl/sbclrc")) + (source-dir (string-append out "/share/sbcl"))) + (for-each (lambda (p) + (copy-recursively p (string-append source-dir "/" p))) + '("src" "contrib")) + (mkdir-p (dirname rc)) + (with-output-to-file rc + (lambda () + (display + (string-append "(sb-ext:set-sbcl-source-location \"" + source-dir "\")") ))) + #t))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 72cef4227c031143cc3b148393ea4028f23e57b3 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 21 Aug 2019 09:02:35 +0200 Subject: gnu: Add emacs-evil-mc. * gnu/packages/emacs-xyz.scm (emacs-evil-mc): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b6c972043d..6367074f04 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13646,6 +13646,32 @@ integrating @code{iedit-mode} into Evil mode with an attempt at sensible defaults.") (license license:gpl3+))) +(define-public emacs-evil-mc + (let ((commit "5205fe671803465149e578849bbbe803c23a8e4e") + (revision "1")) + (package + (name "emacs-evil-mc") + (version (git-version "0.0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gabesoft/evil-mc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-evil" ,emacs-evil))) + (native-inputs + `(("emacs-espuds" ,emacs-espuds))) + (home-page "https://github.com/gabesoft/evil-mc") + (synopsis "Interactive search compatible with @code{multiple-cursors}") + (description "This package can be used with @code{multiple-cursors} to +provide an incremental search that moves all fake cursors in sync.") + (license license:expat)))) + (define-public emacs-evil-org (let ((commit "b6d652a9163d3430a9e0933a554bdbee5244bbf6")) (package -- cgit v1.2.3 From 3f13a4ec26607d1b9a2644c083007b6ad0e00a98 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 23 Aug 2019 08:16:44 +0200 Subject: gnu: emacs-helm-swoop: Update to 2.0.0. * gnu/packages/emacs-xyz.scm (emacs-helm-swoop): Update to 2.0.0. [source]: Use the new url. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6367074f04..f744a7c793 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6275,20 +6275,20 @@ not tied in the trap of backward compatibility.") (define-public emacs-helm-swoop (package (name "emacs-helm-swoop") - (version "1.7.4") + (version "2.0.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ShingoFukuyama/helm-swoop.git") + (url "https://github.com/emacsorphanage/helm-swoop.git") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk")))) + (base32 "0k0ns92g45x8dbymqpl6ylk5mj3wiw2h03f48q5cy1z8in0c4rjd")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) - (home-page "https://github.com/ShingoFukuyama/helm-swoop") + (home-page "https://github.com/emacsorphanage/helm-swoop") (synopsis "Filter and jump to lines in an Emacs buffer using Helm") (description "This package builds on the Helm interface to provide several commands -- cgit v1.2.3 From d558700a0c6a0eb56f773fd52d70c782b01b6bd7 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 24 Aug 2019 19:02:13 +0200 Subject: gnu: emacs-undo-propose-el: Update to 3.0.0-1.21a5cdc. * gnu/packages/emacs-xyz.scm (emacs-undo-propose-el): Update to 3.0.0-1.21a5cdc. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f744a7c793..90910b15ce 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16184,12 +16184,11 @@ packages with a consistent way to use them.") (license license:gpl3+)))) (define-public emacs-undo-propose-el - (let ((commit "5f1fa99a04369a959aad01b476fe4f34229f28cd") - (version "1.0.0") + (let ((commit "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c") (revision "1")) (package (name "emacs-undo-propose-el") - (version (git-version version revision commit)) + (version (git-version "3.0.0" revision commit)) (source (origin (method git-fetch) @@ -16199,7 +16198,7 @@ packages with a consistent way to use them.") (file-name (git-file-name name version)) (sha256 (base32 - "1p9h1fqmva07mcs46rqrg9vqn537b615as84s9b7xh76k1r8h1c0")))) + "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny")))) (build-system emacs-build-system) (home-page "https://github.com/jackkamm/undo-propose-el") (synopsis "Simple and safe navigation of @code{undo} history") -- cgit v1.2.3 From 1407ebeaa1b0bb88caf1aa44d192600399d67ab3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 1 Aug 2019 07:34:17 +0900 Subject: doc: Document the use of `program-file' for mcron jobs. * doc/guix.texi (Scheduled Job Execution): Explain why using `program-file' for an mcron job can be necessary. Add an example. --- doc/guix.texi | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 043851e418..8f2608d5af 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12442,6 +12442,40 @@ gexps to introduce job definitions that are passed to mcron %base-services))) @end lisp +For more complex jobs defined in Scheme where you need control over the top +level, for instance to introduce a @code{use-modules} form that defines syntax +(macros), you can move your code to a separate program using the +@code{program-file} procedure of the @code{(guix gexp)} module +(@pxref{G-Expressions}). The example below illustrates that. + +@lisp +(define %battery-alert-job + ;; Beep when the battery percentage falls below %MIN-LEVEL. + #~(job + '(next-minute (range 0 60 1)) + #$(program-file + "battery-alert.scm" + (with-imported-modules (source-module-closure + '((guix build utils))) + #~(begin + (define %min-level 20) + (use-modules (guix build utils) + (ice-9 popen) + (ice-9 regex) + (ice-9 textual-ports) + (srfi srfi-2)) + (setenv "LC_ALL" "C") ;ensure English output + (and-let* ((input-pipe (open-pipe* + OPEN_READ + #$(file-append acpi "/bin/acpi"))) + (output (get-string-all input-pipe)) + (m (string-match "Discharging, ([0-9]+)%" output)) + (level (string->number (match:substring m 1))) + ((< level %min-level))) + (format #t "warning: Battery level is low (~a%)~%" level) + (invoke #$(file-append beep "/bin/beep") "-r5"))))))) +@end lisp + @xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, for more information on mcron job specifications. Below is the reference of the mcron service. -- cgit v1.2.3 From 6063a56140619b52d6f2e61de64ec3d19df9bf1e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 25 Aug 2019 20:59:34 +0200 Subject: gnu: emacs-slime: Update to 2.24. * gnu/packages/emacs-xyz.scm (emacs-slime): Update to 2.24. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90910b15ce..5183486eac 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3905,7 +3905,7 @@ in @code{html-mode}.") (define-public emacs-slime (package (name "emacs-slime") - (version "2.23") + (version "2.24") (source (origin (method git-fetch) @@ -3914,7 +3914,7 @@ in @code{html-mode}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0i637n0ragpbj39hqx65nx5k99xf0464c4w6w1qpzykm6z42grky")))) + (base32 "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From 8c1379ba404b4db2f0afcf431a4ff720b72a7a19 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 19 Aug 2019 20:36:22 +0000 Subject: gnu: Update diffoscope to 121. * gnu/packages/package-management (diffoscope): Update to 121. [version] Only define version once. [arguments] Add writeable-test-data phase. --- gnu/packages/package-management.scm | 140 +++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 66 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c982cbfe5d..98be212382 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -561,75 +561,83 @@ transactions from C or Python.") (license license:gpl2+))) (define-public diffoscope - (package - (name "diffoscope") - (version "120") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") - (commit "120"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07z9yclvfkw4326739l2ywzzihax5vdijiaqqpfix9rz1rb923aa")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - ;; setup.py mistakenly requires python-magic from PyPi, even - ;; though the Python bindings of `file` are sufficient. - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 - (add-after 'unpack 'dependency-on-python-magic - (lambda _ - (substitute* "setup.py" - (("'python-magic',") "")))) - ;; This test is broken because our `file` package has a - ;; bug in berkeley-db file type detection. - (add-after 'unpack 'remove-berkeley-test - (lambda _ - (delete-file "tests/comparators/test_berkeley_db.py") - #t)) - (add-after 'unpack 'embed-tool-references - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "diffoscope/comparators/utils/compare.py" - (("\\['xxd',") - (string-append "['" (which "xxd") "',"))) - (substitute* "diffoscope/comparators/elf.py" - (("@tool_required\\('readelf'\\)") "") - (("get_tool_name\\('readelf'\\)") - (string-append "'" (which "readelf") "'"))) - (substitute* "diffoscope/comparators/directory.py" - (("@tool_required\\('stat'\\)") "") - (("@tool_required\\('getfacl'\\)") "") - (("\\['stat',") - (string-append "['" (which "stat") "',")) - (("\\['getfacl',") - (string-append "['" (which "getfacl") "',"))) - #t)) - (add-before 'check 'delete-failing-test - (lambda _ - ;; this requires /sbin to be on the path - (delete-file "tests/test_tools.py") - #t))))) - (inputs `(("rpm" ,rpm) ;for rpm-python - ("python-file" ,python-file) - ("python-debian" ,python-debian) - ("python-libarchive-c" ,python-libarchive-c) - ("python-tlsh" ,python-tlsh) - ("acl" ,acl) ;for getfacl - ("colordiff" ,colordiff) - ("xxd" ,xxd))) - ;; Below are modules used for tests. - (native-inputs `(("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet))) - (home-page "https://diffoscope.org/") - (synopsis "Compare files, archives, and directories in depth") - (description - "Diffoscope tries to get to the bottom of what makes files or directories + (let ((version "121")) + (package + (name "diffoscope") + (version version) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bw7s8qs1vnr93vhifl6pj6h6w6r6nrpc5anzhh9wx2gcaipkb3m")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; setup.py mistakenly requires python-magic from PyPi, even + ;; though the Python bindings of `file` are sufficient. + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 + (add-after 'unpack 'dependency-on-python-magic + (lambda _ + (substitute* "setup.py" + (("'python-magic',") "")))) + ;; This test is broken because our `file` package has a + ;; bug in berkeley-db file type detection. + (add-after 'unpack 'remove-berkeley-test + (lambda _ + (delete-file "tests/comparators/test_berkeley_db.py") + #t)) + (add-after 'unpack 'embed-tool-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "diffoscope/comparators/utils/compare.py" + (("\\['xxd',") + (string-append "['" (which "xxd") "',"))) + (substitute* "diffoscope/comparators/elf.py" + (("@tool_required\\('readelf'\\)") "") + (("get_tool_name\\('readelf'\\)") + (string-append "'" (which "readelf") "'"))) + (substitute* "diffoscope/comparators/directory.py" + (("@tool_required\\('stat'\\)") "") + (("@tool_required\\('getfacl'\\)") "") + (("\\['stat',") + (string-append "['" (which "stat") "',")) + (("\\['getfacl',") + (string-append "['" (which "getfacl") "',"))) + #t)) + (add-before 'check 'writable-test-data + (lambda _ + ;; tests/comparators/test_elf.py needs write access to + ;; test data + (make-file-writable + "tests/data/ignore_readelf_errors_expected_diff") + #t)) + (add-before 'check 'delete-failing-test + (lambda _ + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") + #t))))) + (inputs `(("rpm" ,rpm) ;for rpm-python + ("python-file" ,python-file) + ("python-debian" ,python-debian) + ("python-libarchive-c" ,python-libarchive-c) + ("python-tlsh" ,python-tlsh) + ("acl" ,acl) ;for getfacl + ("colordiff" ,colordiff) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet))) + (home-page "https://diffoscope.org/") + (synopsis "Compare files, archives, and directories in depth") + (description + "Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms various binary formats into more human readable forms to compare them. It can compare two tarballs, ISO images, or PDFs just as easily.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public trydiffoscope (package -- cgit v1.2.3 From 466ff55c72959ba1499ce3ec69f534b3038eb30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Aug 2019 21:14:27 +0200 Subject: gnu: ghostscript: Add a new variant that depends on Freetype. Fixes . Reported by Diego Nicola Barbato and sirmacik . * gnu/packages/ghostscript.scm (ghostscript/fixed): New variable. --- gnu/packages/ghostscript.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 53a9b60fdb..bcd853d1e3 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Leo Famulari @@ -269,6 +269,26 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) +(define-public ghostscript/fixed + ;; This adds the Freetype dependency (among other things), which fixes the + ;; rendering issues described in . + (package/inherit + ghostscript + (version (string-append (package-version ghostscript) "-1")) + (arguments + (substitute-keyword-arguments (package-arguments ghostscript) + ((#:configure-flags flags ''()) + `(append (list "--disable-compile-inits" + (string-append "--with-fontpath=" + (assoc-ref %build-inputs "gs-fonts") + "/share/fonts/type1/ghostscript")) + ,flags)))) + (native-inputs `(("pkg-config" ,pkg-config) ;needed for freetype + ,@(package-native-inputs ghostscript))) + (inputs `(("gs-fonts" ,gs-fonts) + ("fontconfig" ,fontconfig) + ,@(package-inputs ghostscript))))) + (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) -- cgit v1.2.3 From 0b859092a7346f3b4d0a3a4dac878fd64fd70b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Aug 2019 21:32:06 +0200 Subject: gnu: ghostscript: Replace with the "fixed" Ghostscript. * gnu/packages/ghostscript.scm (ghostscript)[replacement]: New field. (ghostscript/fixed)[version]: Remove, to comply with the same-length constraint of grafts. --- gnu/packages/ghostscript.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index bcd853d1e3..139682b5d0 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -145,6 +145,12 @@ printing, and psresize, for adjusting page sizes.") (package (name "ghostscript") (version "9.26") + + ;; The problems addressed by GHOSTSCRIPT/FIXED are not security-related, + ;; but they have a significant impact on usability, hence this graft. + ;; TODO: Ungraft on next update cycle. + (replacement ghostscript/fixed) + (source (origin (method url-fetch) @@ -274,7 +280,6 @@ output file formats and printers.") ;; rendering issues described in . (package/inherit ghostscript - (version (string-append (package-version ghostscript) "-1")) (arguments (substitute-keyword-arguments (package-arguments ghostscript) ((#:configure-flags flags ''()) -- cgit v1.2.3 From 61a224adc3426d9fd0932b755205642650e89367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Aug 2019 22:16:37 +0200 Subject: maint: Add 'download-po' rule. * Makefile.am (make-download-po-rule): New definition. Add top-level 'eval' and calls to 'make-download-po-rule' to generate 'download-po.DOMAIN' rules. (download-po): New rule. --- Makefile.am | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0bd85e8fcf..fa6bf8fe80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -851,6 +851,39 @@ cuirass-jobs.scm: $(GOBJECTS) .PHONY: clean-go make-go as-derivation .PHONY: update-guix-package update-NEWS release +# Downloading up-to-date PO files. + +# make-download-po-rule DOMAIN DIRECTORY [FILE-NAME-PREFIX] +define make-download-po-rule + +download-po.$(1): + if [ -f "$(top_srcdir)/$(2)/LINGUAS" ]; then \ + LINGUAS="`grep -v '^[[:blank:]]*#' < $(top_srcdir)/$(2)/LINGUAS`" ; \ + else \ + LINGUAS="`(cd $(top_srcdir)/$(2); \ + for i in *.po; do echo $$$$i; done) | cut -d . -f 2`" ; \ + fi ; \ + for lang in $$$$LINGUAS; do \ + if wget -nv -O "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \ + "https://translationproject.org/latest/$(1)/$$$$lang.po" ; \ + then \ + mv "$(top_srcdir)/$(2)/$(3)$$$$lang.po"{.tmp,} ; \ + else \ + rm "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" ; \ + fi ; \ + done + +.PHONY: download-po.$(1) + +endef + +$(eval $(call make-download-po-rule,guix,po/guix)) +$(eval $(call make-download-po-rule,guix-packages,po/packages)) +$(eval $(call make-download-po-rule,guix-manual,po/doc,guix-manual.)) + +download-po: $(foreach domain,guix guix-packages guix-manual,download-po.$(domain)) +.PHONY: download-po + ## -------------- ## ## Silent rules. ## ## -------------- ## -- cgit v1.2.3 From 3bbd30e9b011d6f41e05de362c52c828bc07c8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Aug 2019 22:24:23 +0200 Subject: nls: Update 'fr' translation. --- po/doc/guix-manual.fr.po | 109 ++++++++++++++++++++++++++++++++--------------- po/guix/fr.po | 6 +-- 2 files changed, 77 insertions(+), 38 deletions(-) diff --git a/po/doc/guix-manual.fr.po b/po/doc/guix-manual.fr.po index d7fc262cbc..06708874c9 100644 --- a/po/doc/guix-manual.fr.po +++ b/po/doc/guix-manual.fr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: guix-manual 1.0.1-pre1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" "POT-Creation-Date: 2019-05-10 20:53+0200\n" -"PO-Revision-Date: 2019-05-12 11:55+0200\n" +"PO-Revision-Date: 2019-07-20 11:50+0200\n" "Last-Translator: Julien Lepiller \n" "Language-Team: French \n" "Language: fr\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Offlate 0.1\n" +"X-Generator: Poedit 2.2.1\n" #. #-#-#-#-# contributing.pot (guix 1.0.1-pre1) #-#-#-#-# #. type: chapter @@ -1432,6 +1432,8 @@ msgstr "version-fr.texi" #. type: copying #: doc/guix.texi:66 +#, fuzzy +#| msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@*" msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@*" msgstr "" "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@*\n" @@ -1449,7 +1451,7 @@ msgstr "" "Copyright @copyright{} 2016 John Darrington@*\n" "Copyright @copyright{} 2016, 2017 ng0@*\n" "Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@*\n" -"Copyright @copyright{} 2016, 2018, 2019 Julien Lepiller@*\n" +"Copyright @copyright{} 2016 Julien Lepiller@*\n" "Copyright @copyright{} 2016 Alex ter Weele@*\n" "Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@*\n" "Copyright @copyright{} 2017, 2018 Clément Lassieur@*\n" @@ -1472,10 +1474,11 @@ msgstr "" "Copyright @copyright{} 2018 Mike Gerwitz@*\n" "Copyright @copyright{} 2018 Pierre-Antoine Rouby@*\n" "Copyright @copyright{} 2018 Gábor Boskovits@*\n" -"Copyright @copyright{} 2018 Florian Pelz@*\n" +"Copyright @copyright{} 2018, 2019 Florian Pelz@*\n" "Copyright @copyright{} 2018 Laura Lazzati@*\n" "Copyright @copyright{} 2018 Alex Vong@*\n" -"Copyright @copyright{} 2019 Josh Holland@*" +"Copyright @copyright{} 2019 Josh Holland@*\n" +"Copyright @copyright{} 2019 Diego Nicola Barbato@*" #. type: copying #: doc/guix.texi:73 @@ -1610,8 +1613,10 @@ msgstr "Cette documentation décrit GNU Guix version @value{VERSION}, un outil d #. type: Plain text #: doc/guix.texi:123 +#, fuzzy +#| msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), and Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." -msgstr "Ce manuel est aussi disponible en anglais (@pxref{Top,,, guix, GNU Guix Reference Manual}), en allemand (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), en chinois simplifié (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}) et en espagnol (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}). Si vous souhaitez nous aider à traduire ce manuel en français, vous pouvez nous rejoindre sur le @uref{https://translationproject.org/domain/guix-manual.html, projet de traduction} et sur la liste de diffusion @uref{https://listes.traduc.org/mailman/listinfo/traduc/, traduc@@traduc.org}." +msgstr "Ce manuel est aussi disponible en anglais (@pxref{Top,,, guix, GNU Guix Reference Manual}), en allemand (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), en chinois simplifié (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), en espagnol (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}) et en russe (@pxref{Top,,, guix.ru, Руководство GNU Guix}). Si vous souhaitez nous aider à traduire ce manuel en français, vous pouvez nous rejoindre sur le @uref{https://translationproject.org/domain/guix-manual.html, projet de traduction} et sur la liste de diffusion @uref{https://listes.traduc.org/mailman/listinfo/traduc/, traduc@@traduc.org}." #. type: chapter #: doc/guix.texi:139 doc/guix.texi:149 doc/guix.texi:312 doc/guix.texi:313 @@ -3280,7 +3285,7 @@ msgstr "i686-linux" #. type: table #: doc/guix.texi:434 msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel;" -msgstr "l'architecture Intel 32-bits (IA32) avec le noyau Linux-libre ;" +msgstr "l'architecture Intel 32 bits (IA32) avec le noyau Linux-libre ;" #. type: item #: doc/guix.texi:435 @@ -3312,8 +3317,10 @@ msgstr "mips64el-linux" #. type: table #: doc/guix.texi:448 +#, fuzzy +#| msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel." msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel." -msgstr "les processeurs MIPS 64-bits little-endian, spécifiquement la série Loongson, ABI n32, avec le noyau Linux-libre." +msgstr "les processeurs 64 bits ARMv8-A en little-endian, avec le noyau Linux-libre." #. type: Plain text #: doc/guix.texi:458 @@ -4086,7 +4093,7 @@ msgstr "crochet de construction" #. type: Plain text #: doc/guix.texi:1020 msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}. When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}. Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine." -msgstr "Si vous le souhaitez, le démon de construction peut @dfn{décharger} des constructions de dérivations sur d'autres machines Guix avec le @dfn{crochet de construction} @code{offload}@footnote{Cette fonctionnalité n'est disponible que si @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} est présent.}. Lorsque cette fonctionnalité est activée, Guix lit une liste de machines de constructions spécifiée par l'utilisateur dans @file{/etc/guix/machines.scm} ; à chaque fois qu'une construction est demandée, par exemple par @code{guix build}, le démon essaie de la décharger sur une des machines qui satisfont les contraintes de la dérivation, en particulier le type de système, p.@: ex.@: @file{x86_64-linux}. Les prérequis manquants pour la construction sont copiés par SSH sur la machine de construction qui procède ensuite à la construction ; si elle réussi, les sorties de la construction sont copiés vers la machine de départ." +msgstr "Si vous le souhaitez, le démon de construction peut @dfn{décharger} des constructions de dérivations sur d'autres machines Guix avec le @dfn{crochet de construction} @code{offload}@footnote{Cette fonctionnalité n'est disponible que si @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} est présent.}. Lorsque cette fonctionnalité est activée, Guix lit une liste de machines de constructions spécifiée par l'utilisateur dans @file{/etc/guix/machines.scm} ; à chaque fois qu'une construction est demandée, par exemple par @code{guix build}, le démon essaie de la décharger sur une des machines qui satisfont les contraintes de la dérivation, en particulier le type de système, p.@: ex.@: @file{x86_64-linux}. Les prérequis manquants pour la construction sont copiés par SSH sur la machine de construction qui procède ensuite à la construction ; si elle réussit, les sorties de la construction sont copiés vers la machine de départ." #. type: Plain text #: doc/guix.texi:1022 @@ -6289,7 +6296,7 @@ msgstr "transactions" #. type: Plain text #: doc/guix.texi:2544 msgid "The command provides the obvious install, remove, and upgrade operations. Each invocation is actually a @emph{transaction}: either the specified operation succeeds, or nothing happens. Thus, if the @command{guix package} process is terminated during the transaction, or if a power outage occurs during the transaction, then the user's profile remains in its previous state, and remains usable." -msgstr "La commande fournit les opérations évidentes d'installation, de suppression et de mise à jour. Chaque invocation est en fait une @emph{transaction} : soit l'opération demandée réussi, soit rien ne se passe. Ainsi, si le processus @command{guix package} est terminé pendant la transaction ou si une panne de courant arrive pendant la transaction, le profil de l'utilisateur reste dans son état précédent et reste utilisable." +msgstr "La commande fournit les opérations évidentes d'installation, de suppression et de mise à jour. Chaque invocation est en fait une @emph{transaction} : soit l'opération demandée réussit, soit rien ne se passe. Ainsi, si le processus @command{guix package} est terminé pendant la transaction ou si une panne de courant arrive pendant la transaction, le profil de l'utilisateur reste dans son état précédent et reste utilisable." #. type: Plain text #: doc/guix.texi:2552 @@ -6299,7 +6306,7 @@ msgstr "En plus, il est possible @emph{d'annuler} toute transaction sur les paqu #. type: Plain text #: doc/guix.texi:2559 msgid "All packages in the package store may be @emph{garbage-collected}. Guix can determine which packages are still referenced by user profiles, and remove those that are provably no longer referenced (@pxref{Invoking guix gc}). Users may also explicitly remove old generations of their profile so that the packages they refer to can be collected." -msgstr "Tous les paquets du dépôt des paquets peut être @emph{glané}. Guix peut déterminer quels paquets sont toujours référencés par les profils des utilisateurs et supprimer ceux qui ne sont plus référencés de manière prouvable (@pxref{Invoking guix gc}). Les utilisateurs peuvent toujours explicitement supprimer les anciennes générations de leur profil pour que les paquets auxquels elles faisaient référence puissent être glanés." +msgstr "Tout paquet du dépôt des paquets peut être @emph{glané}. Guix peut déterminer quels paquets sont toujours référencés par les profils des utilisateurs et supprimer ceux qui ne sont plus référencés de manière prouvable (@pxref{Invoking guix gc}). Les utilisateurs peuvent toujours explicitement supprimer les anciennes générations de leur profil pour que les paquets auxquels elles faisaient référence puissent être glanés." #. type: cindex #: doc/guix.texi:2560 doc/guix.texi:4087 @@ -6310,7 +6317,7 @@ msgstr "reproductibilité" #. type: Plain text #: doc/guix.texi:2572 msgid "Guix takes a @dfn{purely functional} approach to package management, as described in the introduction (@pxref{Introduction}). Each @file{/gnu/store} package directory name contains a hash of all the inputs that were used to build that package---compiler, libraries, build scripts, etc. This direct correspondence allows users to make sure a given package installation matches the current state of their distribution. It also helps maximize @dfn{build reproducibility}: thanks to the isolated build environments that are used, a given build is likely to yield bit-identical files when performed on different machines (@pxref{Invoking guix-daemon, container})." -msgstr "Guix prend une approche @dfn{purement fonctionnelle} de la gestion de paquets, telle que décrite dans l'introduction (@pxref{Introduction}). Chaque nom de répertoire de paquet dans @file{/gnu/store} contient un hash de toutes les entrées qui ont été utilisées pendant la construction de ce paquet — le compilateur, les bibliothèques, les scripts de construction, etc. Cette correspondance directe permet aux utilisateurs de s'assurer que l'installation d'un paquet donné correspond à l'état actuel de leur distribution. Elle aide aussi à maximiser la @dfn{reproductibilité} : grâce aux environnements de construction utilisés, une construction donnée à de forte chances de donner des fichiers identiques bit-à-bit lorsqu'elle est effectuée sur des machines différents (@pxref{Invoking guix-daemon, container})." +msgstr "Guix prend une approche @dfn{purement fonctionnelle} de la gestion de paquets, telle que décrite dans l'introduction (@pxref{Introduction}). Chaque nom de répertoire de paquet dans @file{/gnu/store} contient un hash de toutes les entrées qui ont été utilisées pendant la construction de ce paquet — le compilateur, les bibliothèques, les scripts de construction, etc. Cette correspondance directe permet aux utilisateurs de s'assurer que l'installation d'un paquet donné correspond à l'état actuel de leur distribution. Elle aide aussi à maximiser la @dfn{reproductibilité} : grâce aux environnements de construction utilisés, une construction donnée a de forte chances de donner des fichiers identiques bit-à-bit lorsqu'elle est effectuée sur des machines différentes (@pxref{Invoking guix-daemon, container})." #. type: Plain text #: doc/guix.texi:2583 @@ -6472,7 +6479,7 @@ msgstr "" #. type: Plain text #: doc/guix.texi:2678 msgid "In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to (@pxref{Invoking guix gc}). That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @code{--localstatedir}, and @var{user} is the user name. The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created by @command{guix package}." -msgstr "Dans un environnement multi-utilisateur, les profils utilisateurs sont stockés comme une @dfn{racine du ramasse-miettes}, vers laquelle pointe @file{$HOME/.guix-profile} (@pxref{Invoking guix gc}). Ce répertoire est normalement @code{@var{localstatedir}/guix/profiles/per-user/@var{utilisateur}}, où @var{localstatedir} est la valeur passée à @code{configure} avec @code{--localstatedir} et @var{utilisateur} le nom d'utilisateur. Le répertoire @file{per-user} est créé lorsque @command{guix-daemon} est démarré et sous-répertoire @var{utilisateur} est créé par @command{guix package}." +msgstr "Dans un environnement multi-utilisateur, les profils utilisateurs sont stockés comme une @dfn{racine du ramasse-miettes}, vers laquelle pointe @file{$HOME/.guix-profile} (@pxref{Invoking guix gc}). Ce répertoire est normalement @code{@var{localstatedir}/guix/profiles/per-user/@var{utilisateur}}, où @var{localstatedir} est la valeur passée à @code{configure} avec @code{--localstatedir} et @var{utilisateur} le nom d'utilisateur. Le répertoire @file{per-user} est créé lorsque @command{guix-daemon} est démarré et le sous-répertoire @var{user} est créé par @command{guix package}." #. type: Plain text #: doc/guix.texi:2680 @@ -7243,7 +7250,7 @@ msgstr "@emph{Des intervalles}. @code{--list-generations=2..9} affiche les" #. type: itemize #: doc/guix.texi:3061 msgid "specified generations and everything in between. Note that the start of a range must be smaller than its end." -msgstr "générations demandées et tout ce qui se trouvent entre elles. Remarquez que le début d'un intervalle doit être plus petit que sa fin." +msgstr "générations demandées et tout ce qui se trouve entre elles. Remarquez que le début d'un intervalle doit être plus petit que sa fin." #. type: itemize #: doc/guix.texi:3065 @@ -7455,7 +7462,7 @@ msgstr "signatures numériques" #. type: Plain text #: doc/guix.texi:3230 msgid "Guix detects and raises an error when attempting to use a substitute that has been tampered with. Likewise, it ignores substitutes that are not signed, or that are not signed by one of the keys listed in the ACL." -msgstr "Guix détecte et lève une erreur lorsqu'il essaye d'utiliser un substituts qui a été modifié. De même, il ignore les substituts qui ne sont pas signés ou qui ne sont pas signés par l'une des clefs listés dans l'ACL." +msgstr "Guix détecte et lève une erreur lorsqu'il essaye d'utiliser un substitut qui a été modifié. De même, il ignore les substituts qui ne sont pas signés ou qui ne sont pas signés par l'une des clefs listées dans l'ACL." #. type: Plain text #: doc/guix.texi:3236 @@ -7654,7 +7661,7 @@ msgstr "Ramasse les miettes — c.-à-d.@: les fichiers inaccessibles de @file{/ #. type: table #: doc/guix.texi:3443 msgid "When @var{min} is given, stop once @var{min} bytes have been collected. @var{min} may be a number of bytes, or it may include a unit as a suffix, such as @code{MiB} for mebibytes and @code{GB} for gigabytes (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." -msgstr "Lorsque @var{min} est donné, s'arrêter une fois que @var{min} octets ont été collectés. @var{min} pour être un nombre d'octets ou inclure un suffixe d'unité, comme @code{MiB} pour mébioctet et @code{GB} pour gigaoctet (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." +msgstr "Lorsque @var{min} est donné, s'arrêter une fois que @var{min} octets ont été collectés. @var{min} peut être un nombre d'octets ou inclure un suffixe d'unité, comme @code{MiB} pour mébioctet et @code{GB} pour gigaoctet (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." #. type: table #: doc/guix.texi:3445 @@ -8006,7 +8013,7 @@ msgstr "À la fin, @command{guix package} utilisera les paquets et les versions #. type: Plain text #: doc/guix.texi:3614 msgid "Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who run @command{guix pull}. For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, and vice versa." -msgstr "Chaque utilisateur peut mettre à jour sa copie de Guix avec @command{guix pull} et l'effet est limité à l'utilisateur qui a lancé @command{guix pull}. Par exemple, lorsque l'utilisateur @code{root} lance @command{guix pull}, cela n'a pas d'effet sur la version de Guix que vois @code{alice} et vice-versa." +msgstr "Chaque utilisateur peut mettre à jour sa copie de Guix avec @command{guix pull} et l'effet est limité à l'utilisateur qui a lancé @command{guix pull}. Par exemple, lorsque l'utilisateur @code{root} lance @command{guix pull}, cela n'a pas d'effet sur la version de Guix que voit @code{alice} et vice-versa." #. type: Plain text #: doc/guix.texi:3620 @@ -8102,7 +8109,7 @@ msgstr "@xref{Invoking guix describe, @command{guix describe}}, pour d'autres ma #. type: Plain text #: doc/guix.texi:3663 msgid "This @code{~/.config/guix/current} profile works like any other profile created by @command{guix package} (@pxref{Invoking guix package}). That is, you can list generations, roll back to the previous generation---i.e., the previous Guix---and so on:" -msgstr "Ce profil @code{~/.config/guix/current} fonctionne comme les autres profils créés par @command{guix package} (@pxref{Invoking guix package}). C'est-à-dire que vous pouvez lister les générations, revenir en arrière à une génération précédente — c.-à-d.@: la version de Guix précédente — etc :" +msgstr "Ce profil @code{~/.config/guix/current} fonctionne comme les autres profils créés par @command{guix package} (@pxref{Invoking guix package}). C'est-à-dire que vous pouvez lister les générations, revenir en arrière à une génération précédente — c.-à-d.@: la version de Guix précédente — etc.@: :" #. type: example #: doc/guix.texi:3669 @@ -8121,7 +8128,7 @@ msgstr "" #. type: Plain text #: doc/guix.texi:3673 msgid "The @command{guix pull} command is usually invoked with no arguments, but it supports the following options:" -msgstr "La commande @command{guix pull} est typiquement invoquée sans arguments mais il supporte les options suivantes :" +msgstr "La commande @command{guix pull} est typiquement invoquée sans arguments mais elle prend en charge les options suivantes :" #. type: item #: doc/guix.texi:3675 @@ -9095,7 +9102,7 @@ msgstr "" #. type: Plain text #: doc/guix.texi:4226 msgid "However, note that, in both examples, all of @code{emacs} and the profile as well as all of their dependencies are transferred (due to @code{-r}), regardless of what is already available in the store on the target machine. The @code{--missing} option can help figure out which items are missing from the target store. The @command{guix copy} command simplifies and optimizes this whole process, so this is probably what you should use in this case (@pxref{Invoking guix copy})." -msgstr "Cependant, remarquez que, dans les deux exemples, le paquet @code{emacs}, le profil ainsi que toutes leurs dépendances sont transférées (à cause de @code{-r}), indépendamment du fait qu'ils soient disponibles dans le dépôt de la machine cible. L'option @code{--missing} peut vous aider à comprendre les éléments qui manquent dans le dépôt de la machine cible. La commande @command{guix copy} simplifie et optimise ce processus, c'est donc ce que vous devriez utiliser dans ce cas (@pxref{Invoking guix copy})." +msgstr "Cependant, remarquez que, dans les deux exemples, le paquet @code{emacs}, le profil ainsi que toutes leurs dépendances sont transférés (à cause de @code{-r}), indépendamment du fait qu'ils soient ou non disponibles dans le dépôt de la machine cible. L'option @code{--missing} peut vous aider à comprendre les éléments qui manquent dans le dépôt de la machine cible. La commande @command{guix copy} simplifie et optimise ce processus, c'est donc ce que vous devriez utiliser dans ce cas (@pxref{Invoking guix copy})." #. type: cindex #: doc/guix.texi:4227 @@ -9388,7 +9395,7 @@ msgstr "$ ls \"$GUIX_ENVIRONMENT/bin\"\n" #. type: Plain text #: doc/guix.texi:4417 msgid "Additionally, more than one package may be specified, in which case the union of the inputs for the given packages are used. For example, the command below spawns a shell where all of the dependencies of both Guile and Emacs are available:" -msgstr "En plus, plus d'un paquet peut être spécifié, auquel cas l'union des entrées des paquets données est utilisée. Par exemple, la commande ci-dessous crée un shell où toutes les dépendances de Guile et Emacs sont disponibles :" +msgstr "De surcroît, plus d'un paquet peut être spécifié, auquel cas l'union des entrées des paquets données est utilisée. Par exemple, la commande ci-dessous crée un shell où toutes les dépendances de Guile et Emacs sont disponibles :" #. type: example #: doc/guix.texi:4420 @@ -9662,7 +9669,7 @@ msgstr "" #. type: table #: doc/guix.texi:4585 msgid "This example runs @command{mpirun} in a context where the only environment variables defined are @code{PATH}, environment variables whose name starts with @code{SLURM}, as well as the usual ``precious'' variables (@code{HOME}, @code{USER}, etc.)" -msgstr "Cet exemple exécute @command{mpirun} dans un contexte où les seules variables d'environnement défines sont @code{PATH}, les variables d'environnement dont le nom commence par @code{SLURM}, ainsi que les variables « importante » habituelles (@code{HOME}, @code{USER}, etc)." +msgstr "Cet exemple exécute @command{mpirun} dans un contexte où les seules variables d'environnement défines sont @code{PATH}, les variables d'environnement dont le nom commence par @code{SLURM}, ainsi que les variables « importante » habituelles (@code{HOME}, @code{USER}, etc.)." #. type: item #: doc/guix.texi:4586 @@ -9925,7 +9932,7 @@ msgstr "binaires repositionnables, avec @command{guix pack}" #. type: Plain text #: doc/guix.texi:4752 msgid "What if the recipient of your pack does not have root privileges on their machine, and thus cannot unpack it in the root file system? In that case, you will want to use the @code{--relocatable} option (see below). This option produces @dfn{relocatable binaries}, meaning they they can be placed anywhere in the file system hierarchy: in the example above, users can unpack your tarball in their home directory and directly run @file{./opt/gnu/bin/guile}." -msgstr "Et si le destinataire de votre pack n'a pas les privilèges root sur sa machine, et ne peut donc pas le décompresser dans le système de fichiers racine ? Dans ce cas, vous pourriez utiliser l'option @code{--relocatable} (voir plus bas). Cette option produite des @dfn{binaire repositionnables}, ce qui signifie qu'ils peuvent être placés n'importe où dans l'arborescence du système de fichiers : dans l'exemple au-dessus, les utilisateurs peuvent décompresser votre archive dans leur répertoire personnel et lancer directement @file{./opt/gnu/bin/guile}." +msgstr "Et si le destinataire de votre pack n'a pas les privilèges root sur sa machine, et ne peut donc pas le décompresser dans le système de fichiers racine ? Dans ce cas, vous pourriez utiliser l'option @code{--relocatable} (voir plus bas). Cette option produit des @dfn{binaire repositionnables}, ce qui signifie qu'ils peuvent être placés n'importe où dans l'arborescence du système de fichiers : dans l'exemple au-dessus, les utilisateurs peuvent décompresser votre archive dans leur répertoire personnel et lancer directement @file{./opt/gnu/bin/guile}." #. type: cindex #: doc/guix.texi:4753 @@ -13248,7 +13255,7 @@ msgstr "strate de code" #. type: Plain text #: doc/guix.texi:6979 msgid "It should come as no surprise that we like to write these build actions in Scheme. When we do that, we end up with two @dfn{strata} of Scheme code@footnote{The term @dfn{stratum} in this context was coined by Manuel Serrano et al.@: in the context of their work on Hop. Oleg Kiselyov, who has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on this topic}, refers to this kind of code generation as @dfn{staging}.}: the ``host code''---code that defines packages, talks to the daemon, etc.---and the ``build code''---code that actually performs build actions, such as making directories, invoking @command{make}, etc." -msgstr "Ça ne devrait pas vous surprendre, mais nous aimons écrire ces actions de construction en Scheme. Lorsqu'on fait ça, on fini avec deux @dfn{strates} de code Scheme@footnote{Le terme @dfn{strate} dans ce contexte a été inventé par Manuel Serrano et ses collaborateurs dans le contexte de leur travaux sur Hop. Oleg Kiselyov, qui a écrit des @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essais perspicaces et du code sur le sujet}, utilise le terme de « mise en scène » pour ce genre de génération de code.} : le « code hôte » — le code qui défini les paquets, parle au démon, etc — et le « code côté construction » — le code qui effectue effectivement les actions de construction, comme créer des répertoires, invoquer @code{make}, etc." +msgstr "Ça ne devrait pas vous surprendre, mais nous aimons écrire ces actions de construction en Scheme. Lorsqu'on fait ça, on fini avec deux @dfn{strates} de code Scheme@footnote{Le terme @dfn{strate} dans ce contexte a été inventé par Manuel Serrano et ses collaborateurs dans le contexte de leur travaux sur Hop. Oleg Kiselyov, qui a écrit des @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essais perspicaces et du code sur le sujet}, utilise le terme de « mise en scène » pour ce genre de génération de code.} : le « code hôte » — le code qui définit les paquets, parle au démon, etc.@: — et le « code côté construction » — le code qui effectue effectivement les actions de construction, comme créer des répertoires, invoquer @code{make}, etc." #. type: Plain text #: doc/guix.texi:6986 @@ -15250,7 +15257,7 @@ msgstr "Maintenant, vous pouvez invoquer les commandes comme si vous étiez le d #. type: Plain text #: doc/guix.texi:8217 msgid "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})." -msgstr "Parfois il arrive que, par exemple, les tests d'un paquet réussissent lorsque vous les lancez manuellement mais échouent quand ils sont lancés par le démon. Cela peut arriver parce que le démon tourne dans un conteneur où, contrairement à notre environnement au-dessus, l'accès réseau est indisponible, @file{/bin/sh} n'existe pas, etc (@pxref{Build Environment Setup})." +msgstr "Parfois il arrive que, par exemple, les tests d'un paquet réussissent lorsque vous les lancez manuellement mais échouent quand ils sont lancés par le démon. Cela peut arriver parce que le démon tourne dans un conteneur où, contrairement à notre environnement au-dessus, l'accès réseau est indisponible, @file{/bin/sh} n'existe pas, etc.@: (@pxref{Build Environment Setup})." #. type: Plain text #: doc/guix.texi:8220 @@ -15512,7 +15519,7 @@ msgstr "-x" #. type: table #: doc/guix.texi:8388 msgid "When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)" -msgstr "Lorsqu'elle est combinée à @option{--recursive}, exclut les répertoires de système de contrôle de version (@file{.bzr}, @file{.git}, @file{.hg}, etc)." +msgstr "Lorsqu'elle est combinée à @option{--recursive}, exclut les répertoires de système de contrôle de version (@file{.bzr}, @file{.git}, @file{.hg}, etc.)" #. type: table #: doc/guix.texi:8393 @@ -20082,7 +20089,7 @@ msgstr "disposition clavier" #. type: Plain text #: doc/guix.texi:11134 msgid "To specify what each key of your keyboard does, you need to tell the operating system what @dfn{keyboard layout} you want to use. The default, when nothing is specified, is the US English QWERTY layout for 105-key PC keyboards. However, German speakers will usually prefer the German QWERTZ layout, French speakers will want the AZERTY layout, and so on; hackers might prefer Dvorak or bépo, and they might even want to further customize the effect of some of the keys. This section explains how to get that done." -msgstr "Pour spécifier ce que fait chaque touche de votre clavier, vous devez dire au système d'exploitation quel @dfn{disposition du clavier} vous voulez utiliser. Par défaut, lorsque rien n'est spécifié, la disposition QWERTY pour l'anglais américain pour les claviers 105 touches est utilisée. Cependant, les germanophones préfèrent généralement la disposition QWERTZ, les francophones la disposition AZERTY etc ; les hackers peuvent préférer Dvorak ou bépo, et peuvent même vouloir personnaliser plus en détails l'effet de certaines touches. Cette section explique comment faire cela." +msgstr "Pour spécifier ce que fait chaque touche de votre clavier, vous devez dire au système d'exploitation quel @dfn{disposition du clavier} vous voulez utiliser. Par défaut, lorsque rien n'est spécifié, la disposition QWERTY pour l'anglais américain pour les claviers 105 touches est utilisée. Cependant, les germanophones préfèrent généralement la disposition QWERTZ, les francophones la disposition AZERTY etc.@: ; les hackers peuvent préférer Dvorak ou bépo, et peuvent même vouloir personnaliser plus en détails l'effet de certaines touches. Cette section explique comment faire cela." #. type: cindex #: doc/guix.texi:11135 @@ -20892,7 +20899,7 @@ msgstr "Sinon et s'il y a une valeur pour une option @code{console} avec un tty #. type: table #: doc/guix.texi:11633 msgid "In both cases, agetty will leave the other serial device settings (baud rate etc.)@: alone---in the hope that Linux pinned them to the correct values." -msgstr "Dans les deux cas, agetty laissera les autres paramètres du périphérique série (baud, etc) sans y toucher — dans l'espoir que Linux leur a assigné les bonnes valeurs." +msgstr "Dans les deux cas, agetty laissera les autres paramètres du périphérique série (baud, etc.) sans y toucher — dans l'espoir que Linux leur a assigné les bonnes valeurs." #. type: item #: doc/guix.texi:11634 @@ -25673,7 +25680,7 @@ msgstr "{Procédure Scheme} xorg-start-command [@var{config}]" #. type: deffn #: doc/guix.texi:13744 msgid "Return a @code{startx} script in which the modules, fonts, etc. specified in @var{config}, are available. The result should be used in place of @code{startx}." -msgstr "Renvoie un script @code{startx} dans lequel les modules, les polices, etc, spécifiés dans @var{config} sont disponibles. Le résultat devrait être utilisé à la place de @code{startx}." +msgstr "Renvoie un script @code{startx} dans lequel les modules, les polices, etc., spécifiés dans @var{config} sont disponibles. Le résultat devrait être utilisé à la place de @code{startx}." #. type: deffn #: doc/guix.texi:13746 @@ -27321,8 +27328,10 @@ msgstr "C'est la liste des services qui étend @var{%base-services} en ajoutant #. type: defvr #: doc/guix.texi:14629 +#, fuzzy +#| msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}) with modem support (@pxref{Networking Services, @code{modem-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." -msgstr "En particulier, il ajoute un gestionnaire de connexion graphique (@pxref{X Window, @code{gdm-service-type}}), des verrouilleurs d'écran, un outil de gestion réseau (@pxref{Networking Services, @code{network-manager-service-type}}), des services de gestion de l'énergie et des couleurs, le gestionnaire de connexion et de session @code{elogind}, le service de privilèges Polkit, le service de géolocalisation GeoClue, le démon Accounts Service qui permet aux utilisateurs autorisés de changer les mots de passe du système, un client NTP (@pxref{Networking Services}), le démon Avahi, et le service name service switch est configuré pour pouvoir utiliser @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." +msgstr "En particulier, elle ajoute un gestionnaire de connexion graphique (@pxref{X Window, @code{gdm-service-type}}), des verrouilleurs d'écran, un outil de gestion réseau (@pxref{Networking Services, @code{network-manager-service-type}}) avec la prise en charge des modems (@pxref{Networking Services, @code{modem-manager-service-type}}), des services de gestion de l'énergie et des couleurs, le gestionnaire de connexion et de session @code{elogind}, le service de privilèges Polkit, le service de géolocalisation GeoClue, le démon Accounts Service qui permet aux utilisateurs autorisés de changer les mots de passe du système, un client NTP (@pxref{Networking Services}), le démon Avahi, et le service name service switch est configuré pour pouvoir utiliser @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." #. type: Plain text #: doc/guix.texi:14634 @@ -30216,7 +30225,7 @@ msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list #. type: deftypevr #: doc/guix.texi:16152 msgid "List of plugins to load for all services. Plugins specific to IMAP, LDA, etc.@: are added to this list in their own .conf files. Defaults to @samp{()}." -msgstr "Liste des greffons à charger pour tous les services. Les greffons spécifiques à IMAP, LDA, etc sont ajoutés à cette liste dans leur propre fichiers .conf. La valeur par défaut est @samp{()}." +msgstr "Liste des greffons à charger pour tous les services. Les greffons spécifiques à IMAP, LDA, etc.@: sont ajoutés à cette liste dans leur propre fichiers .conf. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:16154 @@ -35832,7 +35841,7 @@ msgstr "Des améliorations à FastCGI, comme fastcgi_finish_request() -" #. type: itemize #: doc/guix.texi:19139 msgid "a special function to finish request & flush all data while continuing to do something time-consuming (video converting, stats processing, etc.)" -msgstr "une fonction spéciale pour terminer la requête et nettoyer toutes les données tout en continuant à faire d'autres choses qui prennent du temps (conversion vidéo, gestion des stats, etc…)." +msgstr "une fonction spéciale pour terminer la requête et nettoyer toutes les données tout en continuant à faire d'autres choses qui prennent du temps (conversion vidéo, gestion des stats, etc.)." #. type: Plain text #: doc/guix.texi:19141 @@ -45339,8 +45348,10 @@ msgstr "" #. type: table #: doc/guix.texi:24514 +#, fuzzy +#| msgid "Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker create}." msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker run}." -msgstr "Cette commande démarre un nouveau conteneur Docker à partir de l'image spécifiée. Il démarrera le système Guix de la manière habituelle, ce qui signifie qu'il démarrera tous les services que vous avez définis dans la configuration du système d'exploitation. En fonction de ce que vous lancez dans le conteneur Docker, il peut être nécessaire de donner des permissions supplémentaires au conteneur. Par exemple, si vous voulez construire des paquets avec Guix dans le conteneur Docker, vous devriez passer @option{--privileged} à @code{docker run}." +msgstr "En fonction de ce que vous lancez dans le conteneur Docker, il peut être nécessaire de donner des permissions supplémentaires au conteneur. Par exemple, si vous voulez construire des paquets avec Guix dans le conteneur Docker, vous devriez passer @option{--privileged} à @code{docker create}." #. type: table #: doc/guix.texi:24522 @@ -46565,9 +46576,10 @@ msgstr "Ce sont les noms qui peuvent être passés à @command{herd start}, @com #. type: item #: doc/guix.texi:25282 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "@code{requirement} (default: @code{'()})" msgid "@code{requirements} (default: @code{'()})" -msgstr "@code{requirements} (par défaut : @code{'()})" +msgstr "@code{requirement} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:25284 @@ -47350,6 +47362,33 @@ msgstr "license, GNU Free Documentation License" msgid "fdl-1.3.texi" msgstr "fdl-1.3.texi" +#~ msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully supported; in particular, the project's build farms no longer provide substitutes for this architecture." +#~ msgstr "les processeurs 64 bits MIPS en little-endian, spécifiquement la série Loongson, ABI n32, avec le noyau Linux-libre. Cette configuration n'est plus totalement prise en charge ; en particulier, les fermes de construction du projet de fournissent plus de substituts pour cette architecture." + +#~ msgid "" +#~ "image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" +#~ "container_id=\"`docker create $image_id`\"\n" +#~ "docker start $container_id\n" +#~ msgstr "" +#~ "image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" +#~ "container_id=\"`docker create $image_id`\"\n" +#~ "docker start $container_id\n" + +#~ msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. You can get an interactive shell running in the container using @command{docker exec}:" +#~ msgstr "Cette commande démarre un nouveau conteneur Docker à partir de l'image spécifiée. Il démarrera le système Guix de la manière habituelle, ce qui signifie qu'il démarrera tous les services que vous avez définis dans la configuration du système d'exploitation. Vous pouvez obtenir un shell interactif dans le conteneur en utilisant @command{docker exec} :" + +#~ msgid "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" +#~ msgstr "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" + +#~ msgid "For the @code{container} action, allow containers to access the host network, that is, do not create a network namespace." +#~ msgstr "Pour l'action @code{container}, permet aux conteneurs d'accéder au réseau de l'hôte, c'est-à-dire, ne crée pas pas d'espace de nom réseau." + +#~ msgid "@code{auto-start?} (default: @code{#t})" +#~ msgstr "@code{auto-start?} (par défaut : @code{#t})" + +#~ msgid "Whether this service should be started automatically by the Shepherd. If it is @code{#f} the service has to be started manually with @code{herd start}." +#~ msgstr "Indique si ce service doit être démarré automatiquement par le Shepherd. Si la valeur est @code{#f}, le service doit être démarré manuellement avec @code{herd start}." + #~ msgid "The @code{guix} package must remain available in @code{root}'s profile, or it would become subject to garbage collection---in which case you would find yourself badly handicapped by the lack of the @command{guix} command. In other words, do not remove @code{guix} by running @code{guix package -r guix}." #~ msgstr "Le paquet @code{guix} doit rester disponible dans le profil de @code{root} ou il pourrait être sujet au ramassage de miettes — dans ce cas vous vous retrouveriez gravement handicapé par l'absence de la commande @command{guix}. En d'autres termes, ne supprimez pas @code{guix} en lançant @code{guix package -r guix}." diff --git a/po/guix/fr.po b/po/guix/fr.po index 4cdb0f5dd6..77d859ebfd 100644 --- a/po/guix/fr.po +++ b/po/guix/fr.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: guix 1.0.1-pre1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" "POT-Creation-Date: 2019-05-10 20:54+0200\n" -"PO-Revision-Date: 2019-05-12 17:38+0200\n" +"PO-Revision-Date: 2019-07-27 09:07+0200\n" "Last-Translator: Julien Lepiller \n" "Language-Team: French \n" "Language: fr\n" @@ -28,7 +28,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Offlate 0.1\n" +"X-Generator: Poedit 2.2.1\n" #: gnu.scm:83 #, scheme-format @@ -1393,7 +1393,7 @@ msgid "" " -v, --verbosity=LEVEL use the given verbosity LEVEL" msgstr "" "\n" -" --verbosity=NIVEAU utiliser le NIVEAU de verbosité donné" +" -v, --verbosity=NIVEAU utiliser le NIVEAU de verbosité donné" #: guix/scripts/build.scm:676 msgid "" -- cgit v1.2.3 From 127a07152fa4f36e073ecdd216adae8200b6a049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Aug 2019 22:26:42 +0200 Subject: nls: Update 'de' translation. --- po/doc/guix-manual.de.po | 20256 +++++++++++++++++++++++---------------------- 1 file changed, 10243 insertions(+), 10013 deletions(-) diff --git a/po/doc/guix-manual.de.po b/po/doc/guix-manual.de.po index 059b248e90..7a598cfc64 100644 --- a/po/doc/guix-manual.de.po +++ b/po/doc/guix-manual.de.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: guix-manual 1.0.1-after-pre1\n" +"Project-Id-Version: guix-manual 1.0.1-pre1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2019-05-16 22:44+0200\n" -"PO-Revision-Date: 2019-05-17 00:29+0200\n" +"POT-Creation-Date: 2019-05-10 20:53+0200\n" +"PO-Revision-Date: 2019-08-24 00:03+0200\n" "Last-Translator: Florian Pelz \n" "Language-Team: German \n" "Language: de\n" @@ -19,11 +19,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#. #-#-#-#-# contributing.pot (guix 1.0.0.697-481ec) #-#-#-#-# +#. #-#-#-#-# contributing.pot (guix 1.0.1-pre1) #-#-#-#-# #. type: chapter -#. #-#-#-#-# guix.pot (guix 1.0.0.697-481ec) #-#-#-#-# +#. #-#-#-#-# guix.pot (guix 1.0.1-pre1) #-#-#-#-# #. type: menuentry -#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:141 +#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:139 #, no-wrap msgid "Contributing" msgstr "Mitwirken" @@ -67,7 +67,8 @@ msgid "The latest and greatest." msgstr "Das Neueste und Beste." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:103 doc/contributing.texi:104 +#: doc/contributing.texi:29 doc/contributing.texi:103 +#: doc/contributing.texi:104 #, no-wrap msgid "Running Guix Before It Is Installed" msgstr "Guix vor der Installation ausführen" @@ -78,7 +79,8 @@ msgid "Hacker tricks." msgstr "Hacker-Tricks." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:167 doc/contributing.texi:168 +#: doc/contributing.texi:29 doc/contributing.texi:167 +#: doc/contributing.texi:168 #, no-wrap msgid "The Perfect Setup" msgstr "Perfekt eingerichtet" @@ -89,7 +91,8 @@ msgid "The right tools." msgstr "Die richtigen Werkzeuge." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:231 doc/contributing.texi:232 +#: doc/contributing.texi:29 doc/contributing.texi:231 +#: doc/contributing.texi:232 #, no-wrap msgid "Packaging Guidelines" msgstr "Paketrichtlinien" @@ -100,7 +103,8 @@ msgid "Growing the distribution." msgstr "Die Distribution wachsen lassen." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:680 doc/contributing.texi:681 +#: doc/contributing.texi:29 doc/contributing.texi:680 +#: doc/contributing.texi:681 #, no-wrap msgid "Coding Style" msgstr "Code-Stil" @@ -111,7 +115,8 @@ msgid "Hygiene of the contributor." msgstr "Wie Mitwirkende hygienisch arbeiten." #. type: section -#: doc/contributing.texi:29 doc/contributing.texi:778 doc/contributing.texi:779 +#: doc/contributing.texi:29 doc/contributing.texi:778 +#: doc/contributing.texi:779 #, no-wrap msgid "Submitting Patches" msgstr "Einreichen von Patches" @@ -950,7 +955,7 @@ msgid "For Java packages containing a single class or a small class hierarchy, w msgstr "Bei Java-Paketen, die eine einzelne Klasse oder eine kleine Klassenhierarchie enthalten, benutzen wir den Klassennamen in Kleinbuchstaben und ersetzen dabei alle Vorkommen von @code{.} durch Striche und setzen das Präfix @code{java-} davor. Die Klasse @code{apache.commons.cli} wird also zum Paket @code{java-apache-commons-cli}." #. type: cindex -#: doc/contributing.texi:645 doc/guix.texi:1667 +#: doc/contributing.texi:645 doc/guix.texi:1665 #, no-wrap msgid "fonts" msgstr "Schriftarten" @@ -1143,7 +1148,7 @@ msgstr "Die Entwicklung wird mit Hilfe des verteilten Versionskontrollsystems Gi #. type: Plain text #: doc/contributing.texi:792 msgid "This mailing list is backed by a Debbugs instance accessible at @uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of submissions. Each message sent to that mailing list gets a new tracking number assigned; people can then follow up on the submission by sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking number (@pxref{Sending a Patch Series})." -msgstr "Diese Mailing-Liste setzt auf einer Debbugs-Instanz auf, die zugänglich ist unter @uref{https://bugs.gnu.org/guix-patches}, wodurch wir den Überblick über Eingereichtes behalten können. Jede an diese Mailing-Liste gesendete Nachricht bekommt eine neue Folgenummer zugewiesen, so dass man eine Folge-Email zur Einreichung an @code{@var{NNN}@@debbugs.gnu.org} senden kann, wobei @var{NNN} für die Folgenummer steht (siehe @ref{Sending a Patch Series})." +msgstr "Diese Mailing-Liste setzt auf einer Debbugs-Instanz auf, die zugänglich ist unter @uref{https://bugs.gnu.org/guix-patches}, wodurch wir den Überblick über Eingereichtes behalten können. Jede an diese Mailing-Liste gesendete Nachricht bekommt eine neue Folgenummer zugewiesen, so dass man eine Folge-E-Mail zur Einreichung an @code{@var{NNN}@@debbugs.gnu.org} senden kann, wobei @var{NNN} für die Folgenummer steht (siehe @ref{Sending a Patch Series})." #. type: Plain text #: doc/contributing.texi:796 @@ -1414,7 +1419,7 @@ msgstr "" "@frenchspacing on" #. type: title -#: doc/guix.texi:7 doc/guix.texi:93 +#: doc/guix.texi:7 doc/guix.texi:92 #, no-wrap msgid "GNU Guix Reference Manual" msgstr "Referenzhandbuch zu GNU Guix" @@ -1426,1836 +1431,1840 @@ msgid "version.texi" msgstr "version-de.texi" #. type: copying -#: doc/guix.texi:67 -msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@*" +#: doc/guix.texi:66 +#, fuzzy +#| msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@*" +msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@*" msgstr "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018, 2019 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019 Diego Nicola Barbato@*" #. type: copying -#: doc/guix.texi:74 +#: doc/guix.texi:73 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''." msgstr "Es ist Ihnen gestattet, dieses Dokument zu vervielfältigen, weiterzugeben und/oder zu verändern, unter den Bedingungen der GNU Free Documentation License, entweder gemäß Version 1.3 der Lizenz oder (nach Ihrer Option) einer späteren Version, die von der Free Software Foundation veröffentlicht wurde, ohne unveränderliche Abschnitte, ohne vorderen Umschlagtext und ohne hinteren Umschlagtext. Eine Kopie der Lizenz finden Sie im Abschnitt mit dem Titel „GNU Free Documentation License“." #. type: dircategory -#: doc/guix.texi:76 +#: doc/guix.texi:75 #, no-wrap msgid "System administration" msgstr "Systemadministration" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Guix: (guix)" msgstr "Guix: (guix.de)" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Manage installed software and system configuration." msgstr "Installierte Software und Systemkonfigurationen verwalten." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix package: (guix)Invoking guix package" msgstr "guix package: (guix.de)guix package aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Installing, removing, and upgrading packages." msgstr "Pakete installieren, entfernen und aktualisieren." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix gc: (guix)Invoking guix gc" msgstr "guix gc: (guix.de)guix gc aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Reclaiming unused disk space." msgstr "Unbenutzten Plattenspeicher wieder freigeben." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix pull: (guix)Invoking guix pull" msgstr "guix pull: (guix.de)guix pull aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Update the list of available packages." msgstr "Die Liste verfügbarer Pakete aktualisieren." #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "guix system: (guix)Invoking guix system" msgstr "guix system: (guix.de)guix system aufrufen" #. type: menuentry -#: doc/guix.texi:83 +#: doc/guix.texi:82 msgid "Manage the operating system configuration." msgstr "Die Betriebssystemkonfiguration verwalten." #. type: dircategory -#: doc/guix.texi:85 +#: doc/guix.texi:84 #, no-wrap msgid "Software development" msgstr "Softwareentwicklung" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "guix environment: (guix)Invoking guix environment" msgstr "guix environment: (guix.de)guix environment aufrufen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "Building development environments with Guix." msgstr "Umgebungen für Entwickler erstellen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "guix build: (guix)Invoking guix build" msgstr "guix build: (guix.de)guix build aufrufen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "Building packages." msgstr "Erstellen von Paketen." #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "guix pack: (guix)Invoking guix pack" msgstr "guix pack: (guix.de)guix pack aufrufen" #. type: menuentry -#: doc/guix.texi:90 +#: doc/guix.texi:89 msgid "Creating binary bundles." msgstr "Bündel aus Binärdateien erstellen." #. type: subtitle -#: doc/guix.texi:94 +#: doc/guix.texi:93 #, no-wrap msgid "Using the GNU Guix Functional Package Manager" msgstr "Den funktionalen Paketmanager GNU Guix benutzen" #. type: author -#: doc/guix.texi:95 +#: doc/guix.texi:94 #, no-wrap msgid "The GNU Guix Developers" msgstr "Die GNU-Guix-Entwickler" #. type: titlepage -#: doc/guix.texi:101 +#: doc/guix.texi:100 msgid "Edition @value{EDITION} @* @value{UPDATED} @*" msgstr "Edition @value{EDITION} @* @value{UPDATED} @*" #. type: node -#: doc/guix.texi:108 +#: doc/guix.texi:107 #, no-wrap msgid "Top" msgstr "Top" #. type: top -#: doc/guix.texi:109 +#: doc/guix.texi:108 #, no-wrap msgid "GNU Guix" msgstr "GNU Guix" #. type: Plain text -#: doc/guix.texi:113 +#: doc/guix.texi:112 msgid "This document describes GNU Guix version @value{VERSION}, a functional package management tool written for the GNU system." msgstr "Dieses Dokument beschreibt GNU Guix, Version @value{VERSION}, ein Werkzeug zur funktionalen Verwaltung von Softwarepaketen, das für das GNU-System geschrieben wurde." #. type: Plain text -#: doc/guix.texi:125 -msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." +#: doc/guix.texi:123 +#, fuzzy +#| msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." +msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), and Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." msgstr "Dieses Handbuch ist auch auf Englisch (siehe @ref{Top,,, guix, GNU Guix Reference Manual}), in Vereinfachtem Chinesisch (siehe @ref{Top,,, guix.zh_CN, GNU Guix参考手册}), auf Französisch (siehe @ref{Top,,, guix.fr, Manuel de référence de GNU Guix}), auf Spanisch (siehe @ref{Top,,, guix.es, Manual de referencia de GNU Guix}) und auf Russisch verfügbar (siehe @ref{Top,,, guix.ru, Руководство GNU Guix}). Wenn Sie es in Ihre eigene Sprache übersetzen möchten, dann sind Sie beim @uref{https://translationproject.org/domain/guix-manual.html, Translation Project} herzlich willkommen." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:151 doc/guix.texi:314 doc/guix.texi:315 +#: doc/guix.texi:139 doc/guix.texi:149 doc/guix.texi:312 doc/guix.texi:313 #, no-wrap msgid "Introduction" msgstr "Einführung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "What is Guix about?" msgstr "Was ist Guix überhaupt?" #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:156 doc/guix.texi:473 doc/guix.texi:474 +#: doc/guix.texi:139 doc/guix.texi:154 doc/guix.texi:471 doc/guix.texi:472 #, no-wrap msgid "Installation" msgstr "Installation" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Installing Guix." msgstr "Guix installieren." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:171 doc/guix.texi:1770 doc/guix.texi:1771 +#: doc/guix.texi:139 doc/guix.texi:169 doc/guix.texi:1768 doc/guix.texi:1769 #, no-wrap msgid "System Installation" msgstr "Systeminstallation" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Installing the whole operating system." msgstr "Das ganze Betriebssystem installieren." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:188 doc/guix.texi:2481 doc/guix.texi:2482 +#: doc/guix.texi:139 doc/guix.texi:186 doc/guix.texi:2479 doc/guix.texi:2480 #, no-wrap msgid "Package Management" msgstr "Paketverwaltung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Package installation, upgrade, etc." msgstr "Pakete installieren, aktualisieren usw." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:210 doc/guix.texi:4333 doc/guix.texi:4334 +#: doc/guix.texi:139 doc/guix.texi:208 doc/guix.texi:4331 doc/guix.texi:4332 #, no-wrap msgid "Development" msgstr "Entwicklung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Guix-aided software development." msgstr "Von Guix unterstützte Softwareentwicklung." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:215 doc/guix.texi:4957 doc/guix.texi:4958 +#: doc/guix.texi:139 doc/guix.texi:213 doc/guix.texi:4955 doc/guix.texi:4956 #, no-wrap msgid "Programming Interface" msgstr "Programmierschnittstelle" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Using Guix in Scheme." msgstr "Guix in Scheme verwenden." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:231 doc/guix.texi:7585 doc/guix.texi:7586 +#: doc/guix.texi:139 doc/guix.texi:229 doc/guix.texi:7583 doc/guix.texi:7584 #, no-wrap msgid "Utilities" msgstr "Zubehör" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Package management commands." msgstr "Befehle zur Paketverwaltung." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:256 doc/guix.texi:10196 doc/guix.texi:10197 +#: doc/guix.texi:139 doc/guix.texi:254 doc/guix.texi:10194 doc/guix.texi:10195 #, no-wrap msgid "System Configuration" msgstr "Systemkonfiguration" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Configuring the operating system." msgstr "Das Betriebssystem konfigurieren." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25410 doc/guix.texi:25411 +#: doc/guix.texi:139 doc/guix.texi:25392 doc/guix.texi:25393 #, no-wrap msgid "Documentation" msgstr "Dokumentation" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Browsing software user manuals." msgstr "Wie man Nutzerhandbücher von Software liest." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25474 doc/guix.texi:25475 +#: doc/guix.texi:139 doc/guix.texi:25456 doc/guix.texi:25457 #, no-wrap msgid "Installing Debugging Files" msgstr "Dateien zur Fehlersuche installieren" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Feeding the debugger." msgstr "Womit man seinen Debugger füttert." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25540 doc/guix.texi:25541 +#: doc/guix.texi:139 doc/guix.texi:25522 doc/guix.texi:25523 #, no-wrap msgid "Security Updates" msgstr "Sicherheitsaktualisierungen" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Deploying security fixes quickly." msgstr "Sicherheits-Patches schnell einspielen." #. type: chapter -#: doc/guix.texi:141 doc/guix.texi:25660 doc/guix.texi:25661 +#: doc/guix.texi:139 doc/guix.texi:25642 doc/guix.texi:25643 #, no-wrap msgid "Bootstrapping" msgstr "Bootstrapping" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "GNU/Linux built from scratch." msgstr "GNU/Linux von Grund auf selbst erstellen." #. type: node -#: doc/guix.texi:141 doc/guix.texi:25844 +#: doc/guix.texi:139 doc/guix.texi:25826 #, no-wrap msgid "Porting" msgstr "Portierung" #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Targeting another platform or kernel." msgstr "Guix auf andere Plattformen und Kernels bringen." #. type: menuentry -#: doc/guix.texi:141 +#: doc/guix.texi:139 msgid "Your help needed!" msgstr "Ihre Hilfe ist nötig!" #. type: chapter -#: doc/guix.texi:146 doc/guix.texi:25892 doc/guix.texi:25893 +#: doc/guix.texi:144 doc/guix.texi:25874 doc/guix.texi:25875 #, no-wrap msgid "Acknowledgments" msgstr "Danksagungen" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "Thanks!" msgstr "Danke!" #. type: appendix -#: doc/guix.texi:146 doc/guix.texi:25914 doc/guix.texi:25915 +#: doc/guix.texi:144 doc/guix.texi:25896 doc/guix.texi:25897 #, no-wrap msgid "GNU Free Documentation License" msgstr "GNU-Lizenz für freie Dokumentation" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "The license of this manual." msgstr "Die Lizenz dieses Handbuchs." #. type: unnumbered -#: doc/guix.texi:146 doc/guix.texi:25920 doc/guix.texi:25921 +#: doc/guix.texi:144 doc/guix.texi:25902 doc/guix.texi:25903 #, no-wrap msgid "Concept Index" msgstr "Konzeptverzeichnis" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "Concepts." msgstr "Konzepte." #. type: unnumbered -#: doc/guix.texi:146 doc/guix.texi:25924 doc/guix.texi:25925 +#: doc/guix.texi:144 doc/guix.texi:25906 doc/guix.texi:25907 #, no-wrap msgid "Programming Index" msgstr "Programmierverzeichnis" #. type: menuentry -#: doc/guix.texi:146 +#: doc/guix.texi:144 msgid "Data types, functions, and variables." msgstr "Datentypen, Funktionen und Variable." #. type: menuentry -#: doc/guix.texi:149 +#: doc/guix.texi:147 msgid "--- The Detailed Node Listing ---" msgstr "--- Detaillierte Liste der Knoten ---" #. type: section -#: doc/guix.texi:154 doc/guix.texi:341 doc/guix.texi:343 doc/guix.texi:344 +#: doc/guix.texi:152 doc/guix.texi:339 doc/guix.texi:341 doc/guix.texi:342 #, no-wrap msgid "Managing Software the Guix Way" msgstr "Auf Guix-Art Software verwalten" #. type: menuentry -#: doc/guix.texi:154 doc/guix.texi:341 +#: doc/guix.texi:152 doc/guix.texi:339 msgid "What's special." msgstr "Was Guix besonders macht." #. type: section -#: doc/guix.texi:154 doc/guix.texi:341 doc/guix.texi:398 doc/guix.texi:399 +#: doc/guix.texi:152 doc/guix.texi:339 doc/guix.texi:396 doc/guix.texi:397 #, no-wrap msgid "GNU Distribution" msgstr "GNU-Distribution" #. type: menuentry -#: doc/guix.texi:154 doc/guix.texi:341 +#: doc/guix.texi:152 doc/guix.texi:339 msgid "The packages and tools." msgstr "Die Pakete und Werkzeuge." #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:514 doc/guix.texi:515 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:512 doc/guix.texi:513 #, no-wrap msgid "Binary Installation" msgstr "Aus Binärdatei installieren" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Getting Guix running in no time!" msgstr "Guix installieren, ohne Zeit zu verlieren!" #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:716 doc/guix.texi:717 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:714 doc/guix.texi:715 #, no-wrap msgid "Requirements" msgstr "Voraussetzungen" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Software needed to build and run Guix." msgstr "Zum Erstellen und Benutzen von Guix nötige Software." #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:800 doc/guix.texi:801 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:798 doc/guix.texi:799 #, no-wrap msgid "Running the Test Suite" msgstr "Den Testkatalog laufen lassen" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Testing Guix." msgstr "Guix testen." #. type: section -#: doc/guix.texi:163 doc/guix.texi:165 doc/guix.texi:512 doc/guix.texi:865 -#: doc/guix.texi:866 +#: doc/guix.texi:161 doc/guix.texi:163 doc/guix.texi:510 doc/guix.texi:863 +#: doc/guix.texi:864 #, no-wrap msgid "Setting Up the Daemon" msgstr "Den Daemon einrichten" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Preparing the build daemon's environment." msgstr "Wie man die Umgebung des Erstellungs-Daemons einrichtet." #. type: node -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:1296 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:1294 #, no-wrap msgid "Invoking guix-daemon" msgstr "Aufruf des guix-daemon" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Running the build daemon." msgstr "Den Erstellungs-Daemon laufen lassen." #. type: section -#: doc/guix.texi:163 doc/guix.texi:512 doc/guix.texi:1564 doc/guix.texi:1565 +#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:1562 doc/guix.texi:1563 #, no-wrap msgid "Application Setup" msgstr "Anwendungen einrichten" #. type: menuentry -#: doc/guix.texi:163 doc/guix.texi:512 +#: doc/guix.texi:161 doc/guix.texi:510 msgid "Application-specific setup." msgstr "Anwendungsspezifische Einstellungen." #. type: subsection -#: doc/guix.texi:169 doc/guix.texi:885 doc/guix.texi:887 doc/guix.texi:888 +#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:885 doc/guix.texi:886 #, no-wrap msgid "Build Environment Setup" msgstr "Einrichten der Erstellungsumgebung" #. type: menuentry -#: doc/guix.texi:169 doc/guix.texi:885 +#: doc/guix.texi:167 doc/guix.texi:883 msgid "Preparing the isolated build environment." msgstr "Die isolierte Umgebung zum Erstellen vorbereiten." #. type: node -#: doc/guix.texi:169 doc/guix.texi:885 doc/guix.texi:1004 +#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:1002 #, no-wrap msgid "Daemon Offload Setup" msgstr "Auslagern des Daemons einrichten" #. type: menuentry -#: doc/guix.texi:169 doc/guix.texi:885 +#: doc/guix.texi:167 doc/guix.texi:883 msgid "Offloading builds to remote machines." msgstr "Erstellungen auf entfernte Maschinen auslagern." #. type: subsection -#: doc/guix.texi:169 doc/guix.texi:885 doc/guix.texi:1210 doc/guix.texi:1211 +#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:1208 doc/guix.texi:1209 #, no-wrap msgid "SELinux Support" msgstr "SELinux-Unterstützung" #. type: menuentry -#: doc/guix.texi:169 doc/guix.texi:885 +#: doc/guix.texi:167 doc/guix.texi:883 msgid "Using an SELinux policy for the daemon." msgstr "Wie man eine SELinux-Richtlinie für den Daemon einrichtet." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1246 doc/guix.texi:1804 doc/guix.texi:1806 -#: doc/guix.texi:1807 +#: doc/guix.texi:179 doc/guix.texi:1244 doc/guix.texi:1802 doc/guix.texi:1804 +#: doc/guix.texi:1805 #, no-wrap msgid "Limitations" msgstr "Einschränkungen" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "What you can expect." msgstr "Was Sie erwarten dürfen." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1835 doc/guix.texi:1836 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1833 doc/guix.texi:1834 #, no-wrap msgid "Hardware Considerations" msgstr "Hardware-Überlegungen" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Supported hardware." msgstr "Unterstützte Hardware." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1870 doc/guix.texi:1871 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1868 doc/guix.texi:1869 #, no-wrap msgid "USB Stick and DVD Installation" msgstr "Installation von USB-Stick oder DVD" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Preparing the installation medium." msgstr "Das Installationsmedium vorbereiten." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1969 doc/guix.texi:1970 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1967 doc/guix.texi:1968 #, no-wrap msgid "Preparing for Installation" msgstr "Vor der Installation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Networking, partitioning, etc." msgstr "Netzwerkanbindung, Partitionierung etc." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:1992 doc/guix.texi:1993 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1990 doc/guix.texi:1991 #, no-wrap msgid "Guided Graphical Installation" msgstr "Geführte grafische Installation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Easy graphical installation." msgstr "Leichte grafische Installation." #. type: section -#: doc/guix.texi:181 doc/guix.texi:183 doc/guix.texi:1804 doc/guix.texi:2023 -#: doc/guix.texi:2024 +#: doc/guix.texi:179 doc/guix.texi:181 doc/guix.texi:1802 doc/guix.texi:2021 +#: doc/guix.texi:2022 #, no-wrap msgid "Manual Installation" msgstr "Manuelle Installation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Manual installation for wizards." msgstr "Manuelle Installation für Zauberer." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:2366 doc/guix.texi:2367 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2364 doc/guix.texi:2365 #, no-wrap msgid "After System Installation" msgstr "Nach der Systeminstallation" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "When installation succeeded." msgstr "Wenn die Installation erfolgreich war." #. type: node -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:2394 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2392 #, no-wrap msgid "Installing Guix in a VM" msgstr "Guix in einer VM installieren" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "Guix System playground." msgstr "Ein „Guix System“-Spielplatz." #. type: section -#: doc/guix.texi:181 doc/guix.texi:1804 doc/guix.texi:2448 doc/guix.texi:2449 +#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2446 doc/guix.texi:2447 #, no-wrap msgid "Building the Installation Image" msgstr "Ein Abbild zur Installation erstellen" #. type: menuentry -#: doc/guix.texi:181 doc/guix.texi:1804 +#: doc/guix.texi:179 doc/guix.texi:1802 msgid "How this comes to be." msgstr "Wie ein solches entsteht." #. type: node -#: doc/guix.texi:186 doc/guix.texi:2041 doc/guix.texi:2043 +#: doc/guix.texi:184 doc/guix.texi:2039 doc/guix.texi:2041 #, no-wrap msgid "Keyboard Layout and Networking and Partitioning" msgstr "Tastaturbelegung und Netzwerkanbindung und Partitionierung" #. type: menuentry -#: doc/guix.texi:186 doc/guix.texi:2041 +#: doc/guix.texi:184 doc/guix.texi:2039 msgid "Initial setup." msgstr "Erstes Einrichten." #. type: subsection -#: doc/guix.texi:186 doc/guix.texi:2041 doc/guix.texi:2278 doc/guix.texi:2279 +#: doc/guix.texi:184 doc/guix.texi:2039 doc/guix.texi:2276 doc/guix.texi:2277 #, no-wrap msgid "Proceeding with the Installation" msgstr "Fortfahren mit der Installation" #. type: menuentry -#: doc/guix.texi:186 doc/guix.texi:2041 +#: doc/guix.texi:184 doc/guix.texi:2039 msgid "Installing." msgstr "Installieren." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:2515 doc/guix.texi:2516 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:2513 doc/guix.texi:2514 #, no-wrap msgid "Features" msgstr "Funktionalitäten" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "How Guix will make your life brighter." msgstr "Wie Guix Ihr Leben schöner machen wird." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:2601 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:2599 #, no-wrap msgid "Invoking guix package" msgstr "Aufruf von guix package" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Package installation, removal, etc." msgstr "Pakete installieren, entfernen usw." #. type: section -#: doc/guix.texi:199 doc/guix.texi:201 doc/guix.texi:2513 doc/guix.texi:3102 -#: doc/guix.texi:3103 +#: doc/guix.texi:197 doc/guix.texi:199 doc/guix.texi:2511 doc/guix.texi:3100 +#: doc/guix.texi:3101 #, no-wrap msgid "Substitutes" msgstr "Substitute" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Downloading pre-built binaries." msgstr "Vorerstelle Binärdateien herunterladen." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3330 doc/guix.texi:3331 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3328 doc/guix.texi:3329 #, no-wrap msgid "Packages with Multiple Outputs" msgstr "Pakete mit mehreren Ausgaben." #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Single source package, multiple outputs." msgstr "Ein Quellpaket, mehrere Ausgaben." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3384 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3382 #, no-wrap msgid "Invoking guix gc" msgstr "Aufruf von guix gc" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Running the garbage collector." msgstr "Den Müllsammler laufen lassen." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3590 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3588 #, no-wrap msgid "Invoking guix pull" msgstr "Aufruf von guix pull" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Fetching the latest Guix and distribution." msgstr "Das neueste Guix samt Distribution laden." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3745 doc/guix.texi:3746 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3743 doc/guix.texi:3744 #, no-wrap msgid "Channels" msgstr "Kanäle" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Customizing the package collection." msgstr "Die Paketsammlung anpassen." #. type: section -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:3958 doc/guix.texi:3959 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3956 doc/guix.texi:3957 #, no-wrap msgid "Inferiors" msgstr "Untergeordnete" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Interacting with another revision of Guix." msgstr "Mit einer anderen Version von Guix interagieren." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:4086 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:4084 #, no-wrap msgid "Invoking guix describe" msgstr "Aufruf von guix describe" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Display information about your Guix revision." msgstr "Informationen über Ihre Guix-Version anzeigen." #. type: node -#: doc/guix.texi:199 doc/guix.texi:2513 doc/guix.texi:4167 +#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:4165 #, no-wrap msgid "Invoking guix archive" msgstr "Aufruf von guix archive" #. type: menuentry -#: doc/guix.texi:199 doc/guix.texi:2513 +#: doc/guix.texi:197 doc/guix.texi:2511 msgid "Exporting and importing store files." msgstr "Import und Export von Store-Dateien." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3127 doc/guix.texi:3128 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3125 doc/guix.texi:3126 #, no-wrap msgid "Official Substitute Server" msgstr "Offizieller Substitut-Server" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "One particular source of substitutes." msgstr "Eine besondere Quelle von Substituten." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3157 doc/guix.texi:3158 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3155 doc/guix.texi:3156 #, no-wrap msgid "Substitute Server Authorization" msgstr "Substitut-Server autorisieren" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How to enable or disable substitutes." msgstr "Wie man Substitute an- und abschaltet." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3225 doc/guix.texi:3226 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3223 doc/guix.texi:3224 #, no-wrap msgid "Substitute Authentication" msgstr "Substitutauthentifizierung" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How Guix verifies substitutes." msgstr "Wie Guix Substitute verifiziert." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3260 doc/guix.texi:3261 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3258 doc/guix.texi:3259 #, no-wrap msgid "Proxy Settings" msgstr "Proxy-Einstellungen" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How to get substitutes via proxy." msgstr "Wie Sie Substitute über einen Proxy beziehen." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3272 doc/guix.texi:3273 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3270 doc/guix.texi:3271 #, no-wrap msgid "Substitution Failure" msgstr "Fehler bei der Substitution" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "What happens when substitution fails." msgstr "Was passiert, wenn die Substitution fehlschlägt." #. type: subsection -#: doc/guix.texi:208 doc/guix.texi:3125 doc/guix.texi:3300 doc/guix.texi:3301 +#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3298 doc/guix.texi:3299 #, no-wrap msgid "On Trusting Binaries" msgstr "Vom Vertrauen gegenüber Binärdateien" #. type: menuentry -#: doc/guix.texi:208 doc/guix.texi:3125 +#: doc/guix.texi:206 doc/guix.texi:3123 msgid "How can you trust that binary blob?" msgstr "Wie können Sie diesem binären Blob trauen?" #. type: node -#: doc/guix.texi:213 doc/guix.texi:4350 doc/guix.texi:4352 +#: doc/guix.texi:211 doc/guix.texi:4348 doc/guix.texi:4350 #, no-wrap msgid "Invoking guix environment" msgstr "Aufruf von guix environment" #. type: menuentry -#: doc/guix.texi:213 doc/guix.texi:4350 +#: doc/guix.texi:211 doc/guix.texi:4348 msgid "Setting up development environments." msgstr "Entwicklungsumgebungen einrichten." #. type: node -#: doc/guix.texi:213 doc/guix.texi:4350 doc/guix.texi:4691 +#: doc/guix.texi:211 doc/guix.texi:4348 doc/guix.texi:4689 #, no-wrap msgid "Invoking guix pack" msgstr "Aufruf von guix pack" #. type: menuentry -#: doc/guix.texi:213 doc/guix.texi:4350 +#: doc/guix.texi:211 doc/guix.texi:4348 msgid "Creating software bundles." msgstr "Software-Bündel erstellen." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:4996 doc/guix.texi:4997 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:4994 doc/guix.texi:4995 #, no-wrap msgid "Package Modules" msgstr "Paketmodule" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Packages from the programmer's viewpoint." msgstr "Pakete aus Sicht des Programmierers." #. type: section -#: doc/guix.texi:224 doc/guix.texi:226 doc/guix.texi:4994 doc/guix.texi:5058 -#: doc/guix.texi:5059 +#: doc/guix.texi:222 doc/guix.texi:224 doc/guix.texi:4992 doc/guix.texi:5056 +#: doc/guix.texi:5057 #, no-wrap msgid "Defining Packages" msgstr "Pakete definieren" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Defining new packages." msgstr "Wie Sie neue Pakete definieren." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:5561 doc/guix.texi:5562 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:5559 doc/guix.texi:5560 #, no-wrap msgid "Build Systems" msgstr "Erstellungssysteme" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Specifying how packages are built." msgstr "Angeben, wie Pakete erstellt werden." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6299 doc/guix.texi:6300 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6297 doc/guix.texi:6298 #, no-wrap msgid "The Store" msgstr "Der Store" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Manipulating the package store." msgstr "Den Paket-Store verändern." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6449 doc/guix.texi:6450 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6447 doc/guix.texi:6448 #, no-wrap msgid "Derivations" msgstr "Ableitungen" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Low-level interface to package derivations." msgstr "Systemnahe Schnittstelle für Paketableitungen." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6643 doc/guix.texi:6644 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6641 doc/guix.texi:6642 #, no-wrap msgid "The Store Monad" msgstr "Die Store-Monade" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Purely functional interface to the store." msgstr "Rein funktionale Schnittstelle zum Store." #. type: section -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:6958 doc/guix.texi:6959 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6956 doc/guix.texi:6957 #, no-wrap msgid "G-Expressions" msgstr "G-Ausdrücke" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Manipulating build expressions." msgstr "Erstellungsausdrücke verarbeiten." #. type: node -#: doc/guix.texi:224 doc/guix.texi:4994 doc/guix.texi:7532 +#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:7530 #, no-wrap msgid "Invoking guix repl" msgstr "Aufruf von guix repl" #. type: menuentry -#: doc/guix.texi:224 doc/guix.texi:4994 +#: doc/guix.texi:222 doc/guix.texi:4992 msgid "Fiddling with Guix interactively." msgstr "Interaktiv an Guix herumbasteln." #. type: node -#: doc/guix.texi:229 doc/guix.texi:5326 doc/guix.texi:5329 +#: doc/guix.texi:227 doc/guix.texi:5324 doc/guix.texi:5327 #, no-wrap msgid "package Reference" msgstr "„package“-Referenz" #. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:5326 +#: doc/guix.texi:227 doc/guix.texi:5324 msgid "The package data type." msgstr "Der Datentyp für Pakete." #. type: node -#: doc/guix.texi:229 doc/guix.texi:5326 doc/guix.texi:5473 +#: doc/guix.texi:227 doc/guix.texi:5324 doc/guix.texi:5471 #, no-wrap msgid "origin Reference" msgstr "„origin“-Referenz" #. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:5326 +#: doc/guix.texi:227 doc/guix.texi:5324 msgid "The origin data type." msgstr "Datentyp für Paketursprünge." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:7611 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:7609 #, no-wrap msgid "Invoking guix build" msgstr "Aufruf von guix build" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Building packages from the command line." msgstr "Pakete aus der Befehlszeile heraus erstellen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8262 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8260 #, no-wrap msgid "Invoking guix edit" msgstr "Aufruf von guix edit" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Editing package definitions." msgstr "Paketdefinitionen bearbeiten." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8288 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8286 #, no-wrap msgid "Invoking guix download" msgstr "Aufruf von guix download" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Downloading a file and printing its hash." msgstr "Herunterladen einer Datei und Ausgabe ihres Hashes." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8341 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8339 #, no-wrap msgid "Invoking guix hash" msgstr "Aufruf von guix hash" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Computing the cryptographic hash of a file." msgstr "Den kryptografischen Hash einer Datei berechnen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8403 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8401 #, no-wrap msgid "Invoking guix import" msgstr "Aufruf von guix import" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Importing package definitions." msgstr "Paketdefinitionen importieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:8801 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8799 #, no-wrap msgid "Invoking guix refresh" msgstr "Aufruf von guix refresh" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Updating package definitions." msgstr "Paketdefinitionen aktualisieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9112 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9110 #, no-wrap msgid "Invoking guix lint" msgstr "Aufruf von guix lint" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Finding errors in package definitions." msgstr "Fehler in Paketdefinitionen finden." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9228 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9226 #, no-wrap msgid "Invoking guix size" msgstr "Aufruf von guix size" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Profiling disk usage." msgstr "Plattenplatzverbrauch profilieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9352 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9350 #, no-wrap msgid "Invoking guix graph" msgstr "Aufruf von guix graph" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Visualizing the graph of packages." msgstr "Den Paketgraphen visualisieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9555 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9553 #, no-wrap msgid "Invoking guix publish" msgstr "Aufruf von guix publish" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Sharing substitutes." msgstr "Substitute teilen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9772 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9770 #, no-wrap msgid "Invoking guix challenge" msgstr "Aufruf von guix challenge" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Challenging substitute servers." msgstr "Die Substitut-Server anfechten." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9911 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9909 #, no-wrap msgid "Invoking guix copy" msgstr "Aufruf von guix copy" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Copying to and from a remote store." msgstr "Mit einem entfernten Store Dateien austauschen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:9974 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9972 #, no-wrap msgid "Invoking guix container" msgstr "Aufruf von guix container" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Process isolation." msgstr "Prozesse isolieren." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:10028 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:10026 #, no-wrap msgid "Invoking guix weather" msgstr "Aufruf von guix weather" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Assessing substitute availability." msgstr "Die Verfügbarkeit von Substituten einschätzen." #. type: node -#: doc/guix.texi:247 doc/guix.texi:7609 doc/guix.texi:10139 +#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:10137 #, no-wrap msgid "Invoking guix processes" msgstr "Aufruf von guix processes" #. type: menuentry -#: doc/guix.texi:247 doc/guix.texi:7609 +#: doc/guix.texi:245 doc/guix.texi:7607 msgid "Listing client processes." msgstr "Auflisten der Client-Prozesse" #. type: section -#: doc/guix.texi:249 doc/guix.texi:7612 +#: doc/guix.texi:247 doc/guix.texi:7610 #, no-wrap msgid "Invoking @command{guix build}" msgstr "Aufruf von @command{guix build}" #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:7665 doc/guix.texi:7666 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7663 doc/guix.texi:7664 #, no-wrap msgid "Common Build Options" msgstr "Gemeinsame Erstellungsoptionen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Build options for most commands." msgstr "Erstellungsoptionen für die meisten Befehle." #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:7821 doc/guix.texi:7822 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7819 doc/guix.texi:7820 #, no-wrap msgid "Package Transformation Options" msgstr "Paketumwandlungsoptionen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Creating variants of packages." msgstr "Varianten von Paketen erzeugen." #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:7970 doc/guix.texi:7971 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7968 doc/guix.texi:7969 #, no-wrap msgid "Additional Build Options" msgstr "Zusätzliche Erstellungsoptionen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Options specific to 'guix build'." msgstr "Optionen spezifisch für „guix build“." #. type: subsection -#: doc/guix.texi:254 doc/guix.texi:7663 doc/guix.texi:8182 doc/guix.texi:8183 +#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:8180 doc/guix.texi:8181 #, no-wrap msgid "Debugging Build Failures" msgstr "Fehlschläge beim Erstellen untersuchen" #. type: menuentry -#: doc/guix.texi:254 doc/guix.texi:7663 +#: doc/guix.texi:252 doc/guix.texi:7661 msgid "Real life packaging experience." msgstr "Praxiserfahrung bei der Paketerstellung." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10240 -#: doc/guix.texi:10241 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10238 +#: doc/guix.texi:10239 #, no-wrap msgid "Using the Configuration System" msgstr "Das Konfigurationssystem nutzen" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Customizing your GNU system." msgstr "Ihr GNU-System anpassen." #. type: node -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10476 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10474 #, no-wrap msgid "operating-system Reference" msgstr "„operating-system“-Referenz" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Detail of operating-system declarations." msgstr "Details der Betriebssystem-Deklarationen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10680 -#: doc/guix.texi:10681 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10678 +#: doc/guix.texi:10679 #, no-wrap msgid "File Systems" msgstr "Dateisysteme" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Configuring file system mounts." msgstr "Die Dateisystemeinbindungen konfigurieren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10850 -#: doc/guix.texi:10851 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10848 +#: doc/guix.texi:10849 #, no-wrap msgid "Mapped Devices" msgstr "Zugeordnete Geräte" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Block device extra processing." msgstr "Näheres zu blockorientierten Speichermedien." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:10971 -#: doc/guix.texi:10972 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10969 +#: doc/guix.texi:10970 #, no-wrap msgid "User Accounts" msgstr "Benutzerkonten" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Specifying user accounts." msgstr "Benutzerkonten festlegen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:2050 doc/guix.texi:10238 doc/guix.texi:11124 -#: doc/guix.texi:11125 +#: doc/guix.texi:271 doc/guix.texi:2048 doc/guix.texi:10236 +#: doc/guix.texi:11122 doc/guix.texi:11123 #, no-wrap msgid "Keyboard Layout" msgstr "Tastaturbelegung" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "How the system interprets key strokes." msgstr "Wie das System Tastendrücke interpretiert." #. type: section -#: doc/guix.texi:273 doc/guix.texi:1572 doc/guix.texi:10238 doc/guix.texi:11256 -#: doc/guix.texi:11257 +#: doc/guix.texi:271 doc/guix.texi:1570 doc/guix.texi:10236 +#: doc/guix.texi:11254 doc/guix.texi:11255 #, no-wrap msgid "Locales" msgstr "Locales" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Language and cultural convention settings." msgstr "Sprache und kulturelle Konventionen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:275 doc/guix.texi:10238 doc/guix.texi:11396 -#: doc/guix.texi:11397 +#: doc/guix.texi:271 doc/guix.texi:273 doc/guix.texi:10236 doc/guix.texi:11394 +#: doc/guix.texi:11395 #, no-wrap msgid "Services" msgstr "Dienste" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Specifying system services." msgstr "Systemdienste festlegen." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:23610 -#: doc/guix.texi:23611 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:23607 +#: doc/guix.texi:23608 #, no-wrap msgid "Setuid Programs" msgstr "Setuid-Programme" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Programs running with root privileges." msgstr "Mit Administratorrechten startende Programme." #. type: section -#: doc/guix.texi:273 doc/guix.texi:1717 doc/guix.texi:10238 doc/guix.texi:23656 -#: doc/guix.texi:23657 +#: doc/guix.texi:271 doc/guix.texi:1715 doc/guix.texi:10236 +#: doc/guix.texi:23653 doc/guix.texi:23654 #, no-wrap msgid "X.509 Certificates" msgstr "X.509-Zertifikate" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Authenticating HTTPS servers." msgstr "HTTPS-Server authentifizieren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:1615 doc/guix.texi:10238 doc/guix.texi:23719 -#: doc/guix.texi:23720 +#: doc/guix.texi:271 doc/guix.texi:1613 doc/guix.texi:10236 +#: doc/guix.texi:23716 doc/guix.texi:23717 #, no-wrap msgid "Name Service Switch" msgstr "Name Service Switch" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Configuring libc's name service switch." msgstr "Den Name Service Switch von libc konfigurieren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:23857 -#: doc/guix.texi:23858 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:23854 +#: doc/guix.texi:23855 #, no-wrap msgid "Initial RAM Disk" msgstr "Initiale RAM-Disk" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Linux-Libre bootstrapping." msgstr "Linux-libre hochfahren." #. type: section -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:24031 -#: doc/guix.texi:24032 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24028 +#: doc/guix.texi:24029 #, no-wrap msgid "Bootloader Configuration" msgstr "Bootloader-Konfiguration" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Configuring the boot loader." msgstr "Den Bootloader konfigurieren." #. type: node -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:24228 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24225 #, no-wrap msgid "Invoking guix system" msgstr "Aufruf von guix system" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Instantiating a system configuration." msgstr "Instanziierung einer Systemkonfiguration." #. type: node -#: doc/guix.texi:273 doc/guix.texi:10238 doc/guix.texi:24694 +#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24680 #, no-wrap msgid "Running Guix in a VM" msgstr "Guix in einer VM starten" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "How to run Guix System in a virtual machine." msgstr "Wie man „Guix System“ in einer virtuellen Maschine startet." #. type: section -#: doc/guix.texi:273 doc/guix.texi:304 doc/guix.texi:10238 doc/guix.texi:24824 -#: doc/guix.texi:24825 +#: doc/guix.texi:271 doc/guix.texi:302 doc/guix.texi:10236 doc/guix.texi:24810 +#: doc/guix.texi:24811 #, no-wrap msgid "Defining Services" msgstr "Dienste definieren" #. type: menuentry -#: doc/guix.texi:273 doc/guix.texi:10238 +#: doc/guix.texi:271 doc/guix.texi:10236 msgid "Adding new service definitions." msgstr "Neue Dienstdefinitionen hinzufügen." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:11475 -#: doc/guix.texi:11476 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:11473 +#: doc/guix.texi:11474 #, no-wrap msgid "Base Services" msgstr "Basisdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Essential system services." msgstr "Essenzielle Systemdienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:12268 -#: doc/guix.texi:12269 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12266 +#: doc/guix.texi:12267 #, no-wrap msgid "Scheduled Job Execution" msgstr "Geplante Auftragsausführung" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The mcron service." msgstr "Der mcron-Dienst." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:12369 -#: doc/guix.texi:12370 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12367 +#: doc/guix.texi:12368 #, no-wrap msgid "Log Rotation" msgstr "Log-Rotation" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The rottlog service." msgstr "Der rottlog-Dienst." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:12471 -#: doc/guix.texi:12472 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12469 +#: doc/guix.texi:12470 #, no-wrap msgid "Networking Services" msgstr "Netzwerkdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Network setup, SSH daemon, etc." msgstr "Netzwerkeinrichtung, SSH-Daemon etc." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:13417 -#: doc/guix.texi:13418 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:13415 +#: doc/guix.texi:13416 #, no-wrap msgid "X Window" msgstr "X Window" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Graphical display." msgstr "Grafische Anzeige." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:13764 -#: doc/guix.texi:13765 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:13762 +#: doc/guix.texi:13763 #, no-wrap msgid "Printing Services" msgstr "Druckdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Local and remote printer support." msgstr "Unterstützung für lokale und entfernte Drucker." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:14605 -#: doc/guix.texi:14606 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:14603 +#: doc/guix.texi:14604 #, no-wrap msgid "Desktop Services" msgstr "Desktop-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "D-Bus and desktop services." msgstr "D-Bus- und Desktop-Dienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:15007 -#: doc/guix.texi:15008 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15004 +#: doc/guix.texi:15005 #, no-wrap msgid "Sound Services" msgstr "Tondienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "ALSA and Pulseaudio services." msgstr "Dienste für ALSA und Pulseaudio." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:15088 -#: doc/guix.texi:15089 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15085 +#: doc/guix.texi:15086 #, no-wrap msgid "Database Services" msgstr "Datenbankdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "SQL databases, key-value stores, etc." msgstr "SQL-Datenbanken, Schlüssel-Wert-Speicher etc." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:15248 -#: doc/guix.texi:15249 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15245 +#: doc/guix.texi:15246 #, no-wrap msgid "Mail Services" msgstr "Mail-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "IMAP, POP3, SMTP, and all that." msgstr "IMAP, POP3, SMTP und so weiter." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:16749 -#: doc/guix.texi:16750 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:16746 +#: doc/guix.texi:16747 #, no-wrap msgid "Messaging Services" msgstr "Kurznachrichtendienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Messaging services." msgstr "Dienste für Kurznachrichten." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:17251 -#: doc/guix.texi:17252 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17248 +#: doc/guix.texi:17249 #, no-wrap msgid "Telephony Services" msgstr "Telefondienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Telephony services." msgstr "Telefoniedienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:17456 -#: doc/guix.texi:17457 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17453 +#: doc/guix.texi:17454 #, no-wrap msgid "Monitoring Services" msgstr "Systemüberwachungsdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Monitoring services." msgstr "Dienste zur Systemüberwachung." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:17961 -#: doc/guix.texi:17962 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17958 +#: doc/guix.texi:17959 #, no-wrap msgid "Kerberos Services" msgstr "Kerberos-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Kerberos services." msgstr "Kerberos-Dienste." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:18565 -#: doc/guix.texi:18566 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:18562 +#: doc/guix.texi:18563 #, no-wrap msgid "Web Services" msgstr "Web-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Web servers." msgstr "Web-Server." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:19366 -#: doc/guix.texi:19367 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:19363 +#: doc/guix.texi:19364 #, no-wrap msgid "Certificate Services" msgstr "Zertifikatsdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "TLS certificates via Let's Encrypt." msgstr "TLS-Zertifikate via Let’s Encrypt." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:19532 -#: doc/guix.texi:19533 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:19529 +#: doc/guix.texi:19530 #, no-wrap msgid "DNS Services" msgstr "DNS-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "DNS daemons." msgstr "DNS-Daemons." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20153 -#: doc/guix.texi:20154 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20150 +#: doc/guix.texi:20151 #, no-wrap msgid "VPN Services" msgstr "VPN-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "VPN daemons." msgstr "VPN-Daemons." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20511 -#: doc/guix.texi:20512 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20508 +#: doc/guix.texi:20509 #, no-wrap msgid "Network File System" msgstr "Network File System" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "NFS related services." msgstr "Dienste mit Bezug zum Netzwerkdateisystem." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20626 -#: doc/guix.texi:20627 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20623 +#: doc/guix.texi:20624 #, no-wrap msgid "Continuous Integration" msgstr "Kontinuierliche Integration" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The Cuirass service." msgstr "Der Cuirass-Dienst." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:20743 -#: doc/guix.texi:20744 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20740 +#: doc/guix.texi:20741 #, no-wrap msgid "Power Management Services" msgstr "Dienste zur Stromverbrauchsverwaltung" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Extending battery life." msgstr "Den Akku schonen." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:21277 -#: doc/guix.texi:21278 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:21274 +#: doc/guix.texi:21275 #, no-wrap msgid "Audio Services" msgstr "Audio-Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "The MPD." msgstr "Der MPD." #. type: node -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:21336 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:21333 #, no-wrap msgid "Virtualization Services" msgstr "Virtualisierungsdienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Virtualization services." msgstr "Dienste für virtuelle Maschinen." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:22129 -#: doc/guix.texi:22130 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:22126 +#: doc/guix.texi:22127 #, no-wrap msgid "Version Control Services" msgstr "Versionskontrolldienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Providing remote access to Git repositories." msgstr "Entfernten Zugang zu Git-Repositorys bieten." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:23317 -#: doc/guix.texi:23318 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:23314 +#: doc/guix.texi:23315 #, no-wrap msgid "Game Services" msgstr "Spieldienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Game servers." msgstr "Spielserver." #. type: subsection -#: doc/guix.texi:302 doc/guix.texi:11473 doc/guix.texi:23348 -#: doc/guix.texi:23349 +#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:23345 +#: doc/guix.texi:23346 #, no-wrap msgid "Miscellaneous Services" msgstr "Verschiedene Dienste" #. type: menuentry -#: doc/guix.texi:302 doc/guix.texi:11473 +#: doc/guix.texi:300 doc/guix.texi:11471 msgid "Other services." msgstr "Andere Dienste." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:24838 -#: doc/guix.texi:24839 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:24824 +#: doc/guix.texi:24825 #, no-wrap msgid "Service Composition" msgstr "Dienstkompositionen" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "The model for composing services." msgstr "Wie Dienste zusammengestellt werden." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:24894 -#: doc/guix.texi:24895 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:24880 +#: doc/guix.texi:24881 #, no-wrap msgid "Service Types and Services" msgstr "Diensttypen und Dienste" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "Types and services." msgstr "Typen und Dienste." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:25031 -#: doc/guix.texi:25032 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:25017 +#: doc/guix.texi:25018 #, no-wrap msgid "Service Reference" msgstr "Service-Referenz" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "API reference." msgstr "Referenz zur Programmierschnittstelle." #. type: subsection -#: doc/guix.texi:309 doc/guix.texi:24836 doc/guix.texi:25256 -#: doc/guix.texi:25257 +#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:25242 +#: doc/guix.texi:25243 #, no-wrap msgid "Shepherd Services" msgstr "Shepherd-Dienste" #. type: menuentry -#: doc/guix.texi:309 doc/guix.texi:24836 +#: doc/guix.texi:307 doc/guix.texi:24822 msgid "A particular type of service." msgstr "Eine spezielle Art von Dienst." #. type: cindex -#: doc/guix.texi:317 +#: doc/guix.texi:315 #, no-wrap msgid "purpose" msgstr "Zweck" #. type: Plain text -#: doc/guix.texi:325 +#: doc/guix.texi:323 msgid "GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using the international phonetic alphabet (IPA).} is a package management tool for and distribution of the GNU system. Guix makes it easy for unprivileged users to install, upgrade, or remove software packages, to roll back to a previous package set, to build packages from source, and generally assists with the creation and maintenance of software environments." -msgstr "GNU Guix@footnote{„Guix“ wird wie „geeks“ ausgesprochen, also als „ɡiːks“ in der Notation des Internationalen Phonetischen Alphabets (IPA).} ist ein Werkzeug zur Verwaltung von Softwarepaketen für das GNU-System und eine Distribution desselbigen GNU-Systems. Guix macht es @emph{nicht} mit besonderen Berechtigungen ausgestatteten, „unprivilegierten“ Nutzern leicht, Softwarepakete zu installieren, zu aktualisieren oder zu entfernen, zu einem vorherigen Satz von Paketen zurückzuwechseln, Pakete aus ihrem Quellcode heraus zu erstellen und hilft allgemein bei der Erzeugung und Wartung von Software-Umgebungen." +msgstr "GNU Guix@footnote{„Guix“ wird wie „geeks“ ausgesprochen, also als „ɡiːks“ in der Notation des Internationalen Phonetischen Alphabets (IPA).} ist ein Werkzeug zur Verwaltung von Softwarepaketen für das GNU-System und eine Distribution (eine „Verteilung“) desselbigen GNU-Systems. Guix macht es @emph{nicht} mit besonderen Berechtigungen ausgestatteten, „unprivilegierten“ Nutzern leicht, Softwarepakete zu installieren, zu aktualisieren oder zu entfernen, zu einem vorherigen Satz von Paketen zurückzuwechseln, Pakete aus ihrem Quellcode heraus zu erstellen und hilft allgemein bei der Erzeugung und Wartung von Software-Umgebungen." #. type: cindex -#: doc/guix.texi:326 doc/guix.texi:401 +#: doc/guix.texi:324 doc/guix.texi:399 #, no-wrap msgid "Guix System" msgstr "Guix System" #. type: cindex -#: doc/guix.texi:327 +#: doc/guix.texi:325 #, no-wrap msgid "GuixSD, now Guix System" msgstr "GuixSD, was jetzt Guix System heißt" #. type: cindex -#: doc/guix.texi:328 +#: doc/guix.texi:326 #, no-wrap msgid "Guix System Distribution, now Guix System" msgstr "Guix System Distribution, welche jetzt Guix System heißt" #. type: Plain text -#: doc/guix.texi:337 +#: doc/guix.texi:335 msgid "You can install GNU@tie{}Guix on top of an existing GNU/Linux system where it complements the available tools without interference (@pxref{Installation}), or you can use it as a standalone operating system distribution, @dfn{Guix@tie{}System}@footnote{We used to refer to Guix System as ``Guix System Distribution'' or ``GuixSD''. We now consider it makes more sense to group everything under the ``Guix'' banner since, after all, Guix System is readily available through the @command{guix system} command, even if you're using a different distro underneath!}. @xref{GNU Distribution}." msgstr "Sie können GNU@tie{}Guix auf ein bestehendes GNU/Linux-System aufsetzen, wo es die bereits verfügbaren Werkzeuge ergänzt, ohne zu stören (siehe @ref{Installation}), oder Sie können es als eine eigenständige Betriebssystem-Distribution namens @dfn{Guix@tie{}System} verwenden@footnote{Der Name @dfn{Guix@tie{}System} wird auf englische Weise ausgesprochen. Früher hatten wir „Guix System“ als „Guix System Distribution“ bezeichnet und mit „GuixSD“ abgekürzt. Wir denken mittlerweile aber, dass es sinnvoller ist, alles unter der Fahne von Guix zu gruppieren, weil schließlich „Guix System“ auch über den Befehl @command{guix system} verfügbar ist, selbst wenn Sie Guix auf einer fremden Distribution benutzen!}. Siehe @ref{GNU Distribution}." #. type: cindex -#: doc/guix.texi:346 +#: doc/guix.texi:344 #, no-wrap msgid "user interfaces" msgstr "Benutzeroberflächen" #. type: Plain text -#: doc/guix.texi:352 +#: doc/guix.texi:350 msgid "Guix provides a command-line package management interface (@pxref{Package Management}), tools to help with software development (@pxref{Development}), command-line utilities for more advanced usage, (@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})." msgstr "Guix bietet eine befehlszeilenbasierte Paketverwaltungsschnittstelle (siehe @ref{Invoking guix package}), Werkzeuge als Hilfestellung bei der Software-Entwicklung (siehe @ref{Development}), Befehlszeilenwerkzeuge für fortgeschrittenere Nutzung (siehe @ref{Utilities}) sowie Schnittstellen zur Programmierung in Scheme (siehe @ref{Programming Interface})." #. type: cindex -#: doc/guix.texi:352 +#: doc/guix.texi:350 #, no-wrap msgid "build daemon" msgstr "Erstellungs-Daemon" #. type: Plain text -#: doc/guix.texi:356 +#: doc/guix.texi:354 msgid "Its @dfn{build daemon} is responsible for building packages on behalf of users (@pxref{Setting Up the Daemon}) and for downloading pre-built binaries from authorized sources (@pxref{Substitutes})." msgstr "Der @dfn{Erstellungs-Daemon} ist für das Erstellen von Paketen im Auftrag von Nutzern verantwortlich (siehe @ref{Setting Up the Daemon}) und für das Herunterladen vorerstellter Binärdateien aus autorisierten Quellen (siehe @ref{Substitutes})." #. type: cindex -#: doc/guix.texi:357 +#: doc/guix.texi:355 #, no-wrap msgid "extensibility of the distribution" msgstr "Erweiterbarkeit der Distribution" #. type: cindex -#: doc/guix.texi:358 doc/guix.texi:5018 +#: doc/guix.texi:356 doc/guix.texi:5016 #, no-wrap msgid "customization, of packages" msgstr "Anpassung, von Paketen" #. type: Plain text -#: doc/guix.texi:367 +#: doc/guix.texi:365 msgid "Guix includes package definitions for many GNU and non-GNU packages, all of which @uref{https://www.gnu.org/philosophy/free-sw.html, respect the user's computing freedom}. It is @emph{extensible}: users can write their own package definitions (@pxref{Defining Packages}) and make them available as independent package modules (@pxref{Package Modules}). It is also @emph{customizable}: users can @emph{derive} specialized package definitions from existing ones, including from the command line (@pxref{Package Transformation Options})." -msgstr "Guix enthält Paketdefinitionen für viele Pakete, von GNU und nicht von GNU, die alle @uref{https://www.gnu.org/philosophy/free-sw.html, die Freiheit des Computernutzers respektieren}. Es ist @emph{erweiterbar}: Nutzer können ihre eigenen Paketdefinitionen schreiben (siehe @ref{Defining Packages}) und sie als unabhängige Paketmodule verfügbar machen (siehe @ref{Package Modules}). Es ist auch @emph{anpassbar}: Nutzer können spezialisierte Paketdefinitionen aus bestehenden @emph{ableiten}, auch von der Befehlszeile (siehe @ref{Package Transformation Options})." +msgstr "Guix enthält Paketdefinitionen für viele Pakete, manche aus GNU und andere nicht aus GNU, die alle @uref{https://www.gnu.org/philosophy/free-sw.html, die Freiheit des Computernutzers respektieren}. Es ist @emph{erweiterbar}: Nutzer können ihre eigenen Paketdefinitionen schreiben (siehe @ref{Defining Packages}) und sie als unabhängige Paketmodule verfügbar machen (siehe @ref{Package Modules}). Es ist auch @emph{anpassbar}: Nutzer können spezialisierte Paketdefinitionen aus bestehenden @emph{ableiten}, auch von der Befehlszeile (siehe @ref{Package Transformation Options})." #. type: cindex -#: doc/guix.texi:368 +#: doc/guix.texi:366 #, no-wrap msgid "functional package management" msgstr "funktionale Paketverwaltung" #. type: cindex -#: doc/guix.texi:369 +#: doc/guix.texi:367 #, no-wrap msgid "isolation" msgstr "Isolierung" #. type: Plain text -#: doc/guix.texi:384 +#: doc/guix.texi:382 msgid "Under the hood, Guix implements the @dfn{functional package management} discipline pioneered by Nix (@pxref{Acknowledgments}). In Guix, the package build and installation process is seen as a @emph{function}, in the mathematical sense. That function takes inputs, such as build scripts, a compiler, and libraries, and returns an installed package. As a pure function, its result depends solely on its inputs---for instance, it cannot refer to software or scripts that were not explicitly passed as inputs. A build function always produces the same result when passed a given set of inputs. It cannot alter the environment of the running system in any way; for instance, it cannot create, modify, or delete files outside of its build and installation directories. This is achieved by running build processes in isolated environments (or @dfn{containers}), where only their explicit inputs are visible." msgstr "Intern implementiert Guix die Disziplin der @dfn{funktionalen Paketverwaltung}, zu der Nix schon die Pionierarbeit geleistet hat (siehe @ref{Acknowledgments}). In Guix wird der Prozess, ein Paket zu erstellen und zu installieren, als eine @emph{Funktion} im mathematischen Sinn aufgefasst. Diese Funktion hat Eingaben, wie zum Beispiel Erstellungs-Skripts, einen Compiler und Bibliotheken, und liefert ein installiertes Paket. Als eine reine Funktion hängt sein Ergebnis allein von seinen Eingaben ab — zum Beispiel kann er nicht auf Software oder Skripts Bezug nehmen, die nicht ausdrücklich als Eingaben übergeben wurden. Eine Erstellungsfunktion führt immer zum selben Ergebnis, wenn ihr die gleiche Menge an Eingaben übergeben wurde. Sie kann die Umgebung des laufenden Systems auf keine Weise beeinflussen, zum Beispiel kann sie keine Dateien außerhalb ihrer Erstellungs- und Installationsverzeichnisse verändern. Um dies zu erreichen, laufen Erstellungsprozesse in isolieren Umgebungen (sogenannte @dfn{Container}), wo nur ausdrückliche Eingaben sichtbar sind." #. type: cindex -#: doc/guix.texi:385 doc/guix.texi:6302 +#: doc/guix.texi:383 doc/guix.texi:6300 #, no-wrap msgid "store" msgstr "Store" #. type: Plain text -#: doc/guix.texi:392 +#: doc/guix.texi:390 msgid "The result of package build functions is @dfn{cached} in the file system, in a special directory called @dfn{the store} (@pxref{The Store}). Each package is installed in a directory of its own in the store---by default under @file{/gnu/store}. The directory name contains a hash of all the inputs used to build that package; thus, changing an input yields a different directory name." msgstr "Das Ergebnis von Paketerstellungsfunktionen wird im Dateisystem @dfn{zwischengespeichert} in einem besonderen Verzeichnis, was als @dfn{der Store} bezeichnet wird (siehe @ref{The Store}). Jedes Paket wird in sein eigenes Verzeichnis im Store installiert — standardmäßig ist er unter @file{/gnu/store} zu finden. Der Verzeichnisname enthält einen Hash aller Eingaben, anhand derer das Paket erzeugt wurde, somit hat das Ändern einer Eingabe einen völlig anderen Verzeichnisnamen zur Folge." #. type: Plain text -#: doc/guix.texi:396 +#: doc/guix.texi:394 msgid "This approach is the foundation for the salient features of Guix: support for transactional package upgrade and rollback, per-user installation, and garbage collection of packages (@pxref{Features})." -msgstr "Dieses Vorgehen ist die Grundlage für die Guix auszeichnenden Funktionalitäten: Unterstützung transaktionsbasierter Paketaktualisierungen und -rücksetzungen, Installation von Paketen als einfacher Nutzer sowie Garbage Collection für Pakete (siehe @ref{Features})." +msgstr "Dieses Vorgehen ist die Grundlage für die Guix auszeichnenden Funktionalitäten: Unterstützung transaktionsbasierter Paketaktualisierungen und -rücksetzungen, Installation von Paketen für jeden Nutzer sowie Garbage Collection für Pakete (siehe @ref{Features})." #. type: Plain text -#: doc/guix.texi:411 +#: doc/guix.texi:409 msgid "Guix comes with a distribution of the GNU system consisting entirely of free software@footnote{The term ``free'' here refers to the @url{https://www.gnu.org/philosophy/free-sw.html,freedom provided to users of that software}.}. The distribution can be installed on its own (@pxref{System Installation}), but it is also possible to install Guix as a package manager on top of an installed GNU/Linux system (@pxref{Installation}). When we need to distinguish between the two, we refer to the standalone distribution as Guix@tie{}System." -msgstr "Mit Guix kommt eine Distribution des GNU-Systems, die nur aus freier Software@footnote{Die Bezeichnung „frei“ steht hier für die @url{https://www.gnu.org/philosophy/free-sw.html,Freiheiten, die Nutzern der Software geboten werden}.} besteht. Die Distribution kann für sich allein installiert werden (siehe @ref{System Installation}), aber Guix kann auch auf einem bestehenden GNU/Linux-System installiert werden. Wenn wir die Anwendungsfälle unterscheiden möchten, bezeichnen wir die alleinstehende Distribution als „Guix@tie{}System“ (mit englischer Aussprache)." +msgstr "Mit Guix kommt eine Distribution des GNU-Systems, die nur aus freier Software@footnote{Die Bezeichnung „frei“ steht hier für die @url{https://www.gnu.org/philosophy/free-sw.html,Freiheiten@comma{} die Nutzern der Software geboten werden}.} besteht. Die Distribution kann für sich allein installiert werden (siehe @ref{System Installation}), aber Guix kann auch auf einem bestehenden GNU/Linux-System installiert werden. Wenn wir die Anwendungsfälle unterscheiden möchten, bezeichnen wir die alleinstehende Distribution als „Guix@tie{}System“ (mit englischer Aussprache)." #. type: Plain text -#: doc/guix.texi:417 +#: doc/guix.texi:415 msgid "The distribution provides core GNU packages such as GNU libc, GCC, and Binutils, as well as many GNU and non-GNU applications. The complete list of available packages can be browsed @url{https://www.gnu.org/software/guix/packages,on-line} or by running @command{guix package} (@pxref{Invoking guix package}):" msgstr "Die Distribution stellt den Kern der GNU-Pakete, also insbesondere GNU libc, GCC und Binutils, sowie zahlreiche zum GNU-Projekt gehörende und nicht dazu gehörende Anwendungen zur Verfügung. Die vollständige Liste verfügbarer Pakete können Sie @url{https://www.gnu.org/software/guix/packages,online} einsehen, oder indem Sie @command{guix package} ausführen (siehe @ref{Invoking guix package}):" #. type: example -#: doc/guix.texi:420 +#: doc/guix.texi:418 #, no-wrap msgid "guix package --list-available\n" msgstr "guix package --list-available\n" #. type: Plain text -#: doc/guix.texi:426 +#: doc/guix.texi:424 msgid "Our goal is to provide a practical 100% free software distribution of Linux-based and other variants of GNU, with a focus on the promotion and tight integration of GNU components, and an emphasis on programs and tools that help users exert that freedom." msgstr "Unser Ziel ist, eine zu 100% freie Software-Distribution von Linux-basierten und von anderen GNU-Varianten anzubieten, mit dem Fokus darauf, das GNU-Projekt und die enge Zusammenarbeit seiner Bestandteile zu befördern, sowie die Programme und Werkzeuge hervorzuheben, die die Nutzer dabei unterstützen, von dieser Freiheit Gebrauch zu machen." #. type: Plain text -#: doc/guix.texi:428 +#: doc/guix.texi:426 msgid "Packages are currently available on the following platforms:" msgstr "Pakete sind zur Zeit auf folgenden Plattformen verfügbar:" #. type: item -#: doc/guix.texi:431 doc/guix.texi:1879 +#: doc/guix.texi:429 doc/guix.texi:1877 #, no-wrap msgid "x86_64-linux" msgstr "x86_64-linux" #. type: table -#: doc/guix.texi:433 +#: doc/guix.texi:431 msgid "Intel/AMD @code{x86_64} architecture, Linux-Libre kernel;" msgstr "Intel/AMD-@code{x86_64}-Architektur, Linux-Libre als Kernel," #. type: item -#: doc/guix.texi:434 doc/guix.texi:1882 +#: doc/guix.texi:432 doc/guix.texi:1880 #, no-wrap msgid "i686-linux" msgstr "i686-linux" #. type: table -#: doc/guix.texi:436 +#: doc/guix.texi:434 msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel;" msgstr "Intel-32-Bit-Architektur (IA-32), Linux-Libre als Kernel," #. type: item -#: doc/guix.texi:437 +#: doc/guix.texi:435 #, no-wrap msgid "armhf-linux" msgstr "armhf-linux" #. type: table -#: doc/guix.texi:441 +#: doc/guix.texi:439 msgid "ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI hard-float application binary interface (ABI), and Linux-Libre kernel." msgstr "ARMv7-A-Architektur mit „hard float“, Thumb-2 und NEON, für die EABI „hard-float application binary interface“, mit Linux-Libre als Kernel," #. type: item -#: doc/guix.texi:442 +#: doc/guix.texi:440 #, no-wrap msgid "aarch64-linux" msgstr "aarch64-linux" #. type: table #: doc/guix.texi:444 -msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel." -msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, mit Linux-Libre als Kernel," +msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. This is currently in an experimental stage, with limited support. @xref{Contributing}, for how to help!" +msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, Linux-Libre als Kernel. Derzeit ist dies noch in der Erprobungsphase mit begrenzter Unterstützung. Unter @ref{Contributing} steht, wie Sie dabei helfen können!" #. type: item #: doc/guix.texi:445 @@ -3264,126 +3273,128 @@ msgid "mips64el-linux" msgstr "mips64el-linux" #. type: table -#: doc/guix.texi:450 -msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully supported; in particular, the project's build farms no longer provide substitutes for this architecture." -msgstr "64-Bit-MIPS-Prozessoren, little-endian, speziell die Loongson-Reihe, n32-ABI, mit Linux-Libre als Kernel. Diese Konfiguration wird nicht länger in vollem Umfang unterstützt; insbesondere werden von der Build-Farm des Guix-Projekts keine Substitute mehr für diese Architektur angeboten." +#: doc/guix.texi:448 +#, fuzzy +#| msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel." +msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel." +msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, mit Linux-Libre als Kernel," #. type: Plain text -#: doc/guix.texi:460 +#: doc/guix.texi:458 msgid "With Guix@tie{}System, you @emph{declare} all aspects of the operating system configuration and Guix takes care of instantiating the configuration in a transactional, reproducible, and stateless fashion (@pxref{System Configuration}). Guix System uses the Linux-libre kernel, the Shepherd initialization system (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}), the well-known GNU utilities and tool chain, as well as the graphical environment or system services of your choice." msgstr "Mit Guix@tie{}System @emph{deklarieren} Sie alle Aspekte der Betriebssystemkonfiguration und Guix kümmert sich darum, die Konfiguration auf transaktionsbasierte, reproduzierbare und zustandslose Weise zu instanziieren (siehe @ref{System Configuration}). Guix System benutzt den Kernel Linux-libre, das Shepherd-Initialisierungssystem (siehe @ref{Introduction,,, shepherd, The GNU Shepherd Manual}), die wohlbekannten GNU-Werkzeuge mit der zugehörigen Werkzeugkette sowie die grafische Umgebung und Systemdienste Ihrer Wahl." #. type: Plain text -#: doc/guix.texi:463 +#: doc/guix.texi:461 msgid "Guix System is available on all the above platforms except @code{mips64el-linux}." msgstr "Guix System ist auf allen oben genannten Plattformen außer @code{mips64el-linux} verfügbar." #. type: Plain text -#: doc/guix.texi:467 +#: doc/guix.texi:465 msgid "For information on porting to other architectures or kernels, @pxref{Porting}." msgstr "Informationen, wie auf andere Architekturen oder Kernels portiert werden kann, finden Sie im Abschnitt @ref{Porting}." #. type: Plain text -#: doc/guix.texi:470 +#: doc/guix.texi:468 msgid "Building this distribution is a cooperative effort, and you are invited to join! @xref{Contributing}, for information about how you can help." msgstr "Diese Distribution aufzubauen basiert auf Kooperation, und Sie sind herzlich eingeladen, dabei mitzumachen! Im Abschnitt @ref{Contributing} stehen weitere Informationen, wie Sie uns helfen können." #. type: cindex -#: doc/guix.texi:476 +#: doc/guix.texi:474 #, no-wrap msgid "installing Guix" msgstr "Guix installieren" #. type: quotation -#: doc/guix.texi:478 doc/guix.texi:526 doc/guix.texi:1550 doc/guix.texi:1781 -#: doc/guix.texi:1986 doc/guix.texi:2188 doc/guix.texi:2383 doc/guix.texi:3182 -#: doc/guix.texi:3962 doc/guix.texi:4178 doc/guix.texi:4467 doc/guix.texi:4699 -#: doc/guix.texi:4846 doc/guix.texi:6321 doc/guix.texi:6389 doc/guix.texi:8075 -#: doc/guix.texi:8087 doc/guix.texi:9978 doc/guix.texi:10515 -#: doc/guix.texi:11064 doc/guix.texi:13546 doc/guix.texi:19355 -#: doc/guix.texi:24110 doc/guix.texi:24305 doc/guix.texi:24424 -#: doc/guix.texi:24545 doc/guix.texi:25563 +#: doc/guix.texi:476 doc/guix.texi:524 doc/guix.texi:1548 doc/guix.texi:1779 +#: doc/guix.texi:1984 doc/guix.texi:2186 doc/guix.texi:2381 doc/guix.texi:3180 +#: doc/guix.texi:3960 doc/guix.texi:4176 doc/guix.texi:4465 doc/guix.texi:4697 +#: doc/guix.texi:4844 doc/guix.texi:6319 doc/guix.texi:6387 doc/guix.texi:8073 +#: doc/guix.texi:8085 doc/guix.texi:9976 doc/guix.texi:10513 +#: doc/guix.texi:11062 doc/guix.texi:13544 doc/guix.texi:19352 +#: doc/guix.texi:24107 doc/guix.texi:24302 doc/guix.texi:24421 +#: doc/guix.texi:24536 doc/guix.texi:25545 #, no-wrap msgid "Note" msgstr "Anmerkung" #. type: quotation -#: doc/guix.texi:488 +#: doc/guix.texi:486 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script} to install Guix on top of a running GNU/Linux system, thereafter called a @dfn{foreign distro}.@footnote{This section is concerned with the installation of the package manager, which can be done on top of a running GNU/Linux system. If, instead, you want to install the complete GNU operating system, @pxref{System Installation}.} The script automates the download, installation, and initial configuration of Guix. It should be run as the root user." msgstr "Wir empfehlen, dieses @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, Shell-basierte Installationsskript} zu benutzen, um Guix auf ein bestehendes GNU/Linux-System zu installieren — im Folgenden als @dfn{Fremddistribution} bezeichnet.@footnote{Dieser Abschnitt bezieht sich auf die Installation des Paketverwaltungswerkzeugs, das auf ein bestehendes GNU/Linux-System aufsetzend installiert werden kann. Wenn Sie stattdessen das vollständige GNU-Betriebssystem installieren möchten, lesen Sie @ref{System Installation}.} Das Skript automatisiert das Herunterladen, das Installieren und die anfängliche Konfiguration von Guix. Es sollte als der Administratornutzer „root“ ausgeführt werden." #. type: cindex -#: doc/guix.texi:490 doc/guix.texi:1567 +#: doc/guix.texi:488 doc/guix.texi:1565 #, no-wrap msgid "foreign distro" msgstr "Fremddistribution" #. type: cindex -#: doc/guix.texi:491 +#: doc/guix.texi:489 #, no-wrap msgid "directories related to foreign distro" msgstr "Verzeichnisse auf einer Fremddistribution" #. type: Plain text -#: doc/guix.texi:496 +#: doc/guix.texi:494 msgid "When installed on a foreign distro, GNU@tie{}Guix complements the available tools without interference. Its data lives exclusively in two directories, usually @file{/gnu/store} and @file{/var/guix}; other files on your system, such as @file{/etc}, are left untouched." msgstr "Wenn es auf einer Fremddistribution installiert wird, ergänzt GNU@tie{}Guix die verfügbaren Werkzeuge, ohne dass sie sich gegenseitig stören. Guix’ Daten befinden sich ausschließlich in zwei Verzeichnissen, üblicherweise @file{/gnu/store} und @file{/var/guix}; andere Dateien auf Ihrem System wie @file{/etc} bleiben unberührt." #. type: Plain text -#: doc/guix.texi:499 +#: doc/guix.texi:497 msgid "Once installed, Guix can be updated by running @command{guix pull} (@pxref{Invoking guix pull})." msgstr "Sobald es installiert ist, kann Guix durch Ausführen von @command{guix pull} aktualisiert werden (siehe @ref{Invoking guix pull})." #. type: Plain text -#: doc/guix.texi:504 +#: doc/guix.texi:502 msgid "If you prefer to perform the installation steps manually or want to tweak them, you may find the following subsections useful. They describe the software requirements of Guix, as well as how to install it manually and get ready to use it." msgstr "Sollten Sie es vorziehen, die Installationsschritte manuell durchzuführen, oder falls Sie Anpassungen daran vornehmen möchten, könnten sich die folgenden Unterabschnitte als nützlich erweisen. Diese beschreiben die Software-Voraussetzungen von Guix und wie man es manuell installiert, so dass man es benutzen kann." #. type: cindex -#: doc/guix.texi:517 +#: doc/guix.texi:515 #, no-wrap msgid "installing Guix from binaries" msgstr "Guix aus Binärdateien installieren" #. type: cindex -#: doc/guix.texi:518 +#: doc/guix.texi:516 #, no-wrap msgid "installer script" msgstr "Installations-Skript" #. type: Plain text -#: doc/guix.texi:524 +#: doc/guix.texi:522 msgid "This section describes how to install Guix on an arbitrary system from a self-contained tarball providing binaries for Guix and for all its dependencies. This is often quicker than installing from source, which is described in the next sections. The only requirement is to have GNU@tie{}tar and Xz." msgstr "Dieser Abschnitt beschreibt, wie sich Guix auf einem beliebigen System aus einem alle Komponenten umfassenden Tarball installieren lässt, der Binärdateien für Guix und all seine Abhängigkeiten liefert. Dies geht in der Regel schneller, als Guix aus seinen Quelldateien zu installieren, was in den nächsten Abschnitten beschrieben wird. Vorausgesetzt wird hier lediglich, dass GNU@tie{}tar und Xz verfügbar sind." #. type: quotation -#: doc/guix.texi:532 +#: doc/guix.texi:530 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}. The script automates the download, installation, and initial configuration steps described below. It should be run as the root user." msgstr "Wir empfehlen, dass Sie dieses @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, Installations-Skript für die Shell} verwenden, welches Guix automatisch herunterlädt, installiert und eine erste Konfiguration von Guix mit sich bringt. Es sollte als der Administratornutzer (als „root“) ausgeführt werden." #. type: Plain text -#: doc/guix.texi:535 +#: doc/guix.texi:533 msgid "Installing goes along these lines:" msgstr "Die Installation läuft so ab:" #. type: cindex -#: doc/guix.texi:538 +#: doc/guix.texi:536 #, no-wrap msgid "downloading Guix binary" msgstr "Guix-Binärdatei herunterladen" #. type: enumerate -#: doc/guix.texi:543 +#: doc/guix.texi:541 msgid "Download the binary tarball from @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine already running the kernel Linux, and so on." msgstr "Laden Sie den binären Tarball von @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{System}.tar.xz} herunter, wobei @var{System} für @code{x86_64-linux} steht, falls Sie es auf einer Maschine mit @code{x86_64}-Architektur einrichten, auf der bereits der Linux-Kernel läuft, oder entsprechend für andere Maschinen." #. type: enumerate -#: doc/guix.texi:547 +#: doc/guix.texi:545 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines:" msgstr "Achten Sie darauf, auch die zugehörige @file{.sig}-Datei herunterzuladen und verifizieren Sie damit die Authentizität des Tarballs, ungefähr so:" #. type: example -#: doc/guix.texi:551 +#: doc/guix.texi:549 #, no-wrap msgid "" "$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n" @@ -3393,12 +3404,12 @@ msgstr "" "$ gpg --verify guix-binary-@value{VERSION}.@var{System}.tar.xz.sig\n" #. type: Plain text -#: doc/guix.texi:555 doc/guix.texi:1897 +#: doc/guix.texi:553 doc/guix.texi:1895 msgid "If that command fails because you do not have the required public key, then run this command to import it:" msgstr "Falls dieser Befehl fehlschlägt, weil Sie nicht über den nötigen öffentlichen Schlüssel verfügen, können Sie ihn mit diesem Befehl importieren:" #. type: example -#: doc/guix.texi:559 doc/guix.texi:1901 +#: doc/guix.texi:557 doc/guix.texi:1899 #, no-wrap msgid "" "$ gpg --keyserver @value{KEY-SERVER} \\\n" @@ -3408,17 +3419,17 @@ msgstr "" " --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n" #. type: Plain text -#: doc/guix.texi:564 doc/guix.texi:1906 +#: doc/guix.texi:562 doc/guix.texi:1904 msgid "and rerun the @code{gpg --verify} command." msgstr "und den Befehl @code{gpg --verify} erneut ausführen." #. type: enumerate -#: doc/guix.texi:568 +#: doc/guix.texi:566 msgid "Now, you need to become the @code{root} user. Depending on your distribution, you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run:" msgstr "Nun müssen Sie zum Administratornutzer @code{root} wechseln. Abhängig von Ihrer Distribution müssen Sie dazu etwa @code{su -} oder @code{sudo -i} ausführen. Danach führen Sie als @code{root}-Nutzer aus:" #. type: example -#: doc/guix.texi:574 +#: doc/guix.texi:572 #, no-wrap msgid "" "# cd /tmp\n" @@ -3432,27 +3443,27 @@ msgstr "" "# mv var/guix /var/ && mv gnu /\n" #. type: enumerate -#: doc/guix.texi:579 +#: doc/guix.texi:577 msgid "This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}. The latter contains a ready-to-use profile for @code{root} (see next step.)" msgstr "Dadurch wird @file{/gnu/store} (siehe @ref{The Store}) und @file{/var/guix} erzeugt. Letzteres enthält ein fertiges Guix-Profil für den Administratornutzer @code{root} (wie im nächsten Schritt beschrieben)." #. type: enumerate -#: doc/guix.texi:582 +#: doc/guix.texi:580 msgid "Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files." msgstr "Entpacken Sie den Tarball @emph{nicht} auf einem schon funktionierenden Guix-System, denn es würde seine eigenen essenziellen Dateien überschreiben." #. type: enumerate -#: doc/guix.texi:592 +#: doc/guix.texi:590 msgid "The @code{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent versions are fine.) They stem from the fact that all the files in the archive have their modification time set to zero (which means January 1st, 1970.) This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible." msgstr "Die Befehlszeilenoption @code{--warning=no-timestamp} stellt sicher, dass GNU@tie{}tar nicht vor „unplausibel alten Zeitstempeln“ warnt (solche Warnungen traten bei GNU@tie{}tar 1.26 und älter auf, neue Versionen machen keine Probleme). Sie treten auf, weil alle Dateien im Archiv als Änderungszeitpunkt null eingetragen bekommen haben (das bezeichnet den 1. Januar 1970). Das ist Absicht, damit der Inhalt des Archivs nicht davon abhängt, wann es erstellt wurde, und es somit reproduzierbar wird." #. type: enumerate -#: doc/guix.texi:596 +#: doc/guix.texi:594 msgid "Make the profile available under @file{~root/.config/guix/current}, which is where @command{guix pull} will install updates (@pxref{Invoking guix pull}):" msgstr "Machen Sie das Profil als @file{~root/.config/guix/current} verfügbar, wo @command{guix pull} es aktualisieren kann (siehe @ref{Invoking guix pull}):" #. type: example -#: doc/guix.texi:601 +#: doc/guix.texi:599 #, no-wrap msgid "" "# mkdir -p ~root/.config/guix\n" @@ -3464,12 +3475,12 @@ msgstr "" " ~root/.config/guix/current\n" #. type: enumerate -#: doc/guix.texi:605 +#: doc/guix.texi:603 msgid "Source @file{etc/profile} to augment @code{PATH} and other relevant environment variables:" msgstr "„Sourcen“ Sie @file{etc/profile}, um @code{PATH} und andere relevante Umgebungsvariable zu ergänzen:" #. type: example -#: doc/guix.texi:609 +#: doc/guix.texi:607 #, no-wrap msgid "" "# GUIX_PROFILE=\"`echo ~root`/.config/guix/current\" ; \\\n" @@ -3479,22 +3490,22 @@ msgstr "" " source $GUIX_PROFILE/etc/profile\n" #. type: enumerate -#: doc/guix.texi:614 +#: doc/guix.texi:612 msgid "Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup})." msgstr "Erzeugen Sie Nutzergruppe und Nutzerkonten für die Erstellungs-Benutzer wie folgt (siehe @ref{Build Environment Setup})." #. type: enumerate -#: doc/guix.texi:617 +#: doc/guix.texi:615 msgid "Run the daemon, and set it to automatically start on boot." msgstr "Führen Sie den Daemon aus, und lassen Sie ihn automatisch bei jedem Hochfahren starten." #. type: enumerate -#: doc/guix.texi:620 +#: doc/guix.texi:618 msgid "If your host distro uses the systemd init system, this can be achieved with these commands:" msgstr "Wenn Ihre Wirts-Distribution systemd als „init“-System verwendet, können Sie das mit folgenden Befehlen veranlassen:" #. type: example -#: doc/guix.texi:632 +#: doc/guix.texi:630 #, no-wrap msgid "" "# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \\\n" @@ -3506,12 +3517,12 @@ msgstr "" "# systemctl start guix-daemon && systemctl enable guix-daemon\n" #. type: itemize -#: doc/guix.texi:635 doc/guix.texi:9762 +#: doc/guix.texi:633 doc/guix.texi:9760 msgid "If your host distro uses the Upstart init system:" msgstr "Wenn Ihre Wirts-Distribution als „init“-System Upstart verwendet:" #. type: example -#: doc/guix.texi:641 +#: doc/guix.texi:639 #, no-wrap msgid "" "# initctl reload-configuration\n" @@ -3525,12 +3536,12 @@ msgstr "" "# start guix-daemon\n" #. type: enumerate -#: doc/guix.texi:644 +#: doc/guix.texi:642 msgid "Otherwise, you can still start the daemon manually with:" msgstr "Andernfalls können Sie den Daemon immer noch manuell starten, mit:" #. type: example -#: doc/guix.texi:648 +#: doc/guix.texi:646 #, no-wrap msgid "" "# ~root/.config/guix/current/bin/guix-daemon \\\n" @@ -3540,12 +3551,12 @@ msgstr "" " --build-users-group=guixbuild\n" #. type: enumerate -#: doc/guix.texi:653 +#: doc/guix.texi:651 msgid "Make the @command{guix} command available to other users on the machine, for instance with:" msgstr "Stellen Sie den @command{guix}-Befehl auch anderen Nutzern Ihrer Maschine zur Verfügung, zum Beispiel so:" #. type: example -#: doc/guix.texi:658 +#: doc/guix.texi:656 #, no-wrap msgid "" "# mkdir -p /usr/local/bin\n" @@ -3557,12 +3568,12 @@ msgstr "" "# ln -s /var/guix/profiles/per-user/root/current-guix/bin/guix\n" #. type: enumerate -#: doc/guix.texi:662 +#: doc/guix.texi:660 msgid "It is also a good idea to make the Info version of this manual available there:" msgstr "Es ist auch eine gute Idee, die Info-Version dieses Handbuchs ebenso verfügbar zu machen:" #. type: example -#: doc/guix.texi:668 +#: doc/guix.texi:666 #, no-wrap msgid "" "# mkdir -p /usr/local/share/info\n" @@ -3576,23 +3587,23 @@ msgstr "" " do ln -s $i ; done\n" #. type: enumerate -#: doc/guix.texi:674 +#: doc/guix.texi:672 msgid "That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info search path.)" msgstr "Auf diese Art wird, unter der Annahme, dass bei Ihnen @file{/usr/local/share/info} im Suchpfad eingetragen ist, das Ausführen von @command{info guix.de} dieses Handbuch öffnen (siehe @ref{Other Info Directories,,, texinfo, GNU Texinfo} hat weitere Details, wie Sie den Info-Suchpfad ändern können)." #. type: cindex -#: doc/guix.texi:676 doc/guix.texi:3161 doc/guix.texi:11982 +#: doc/guix.texi:674 doc/guix.texi:3159 doc/guix.texi:11980 #, no-wrap msgid "substitutes, authorization thereof" msgstr "Substitute, deren Autorisierung" #. type: enumerate -#: doc/guix.texi:679 +#: doc/guix.texi:677 msgid "To use substitutes from @code{@value{SUBSTITUTE-SERVER}} or one of its mirrors (@pxref{Substitutes}), authorize them:" msgstr "Um Substitute von @code{@value{SUBSTITUTE-SERVER}} oder einem Spiegelserver davon zu benutzen (siehe @ref{Substitutes}), müssen sie erst autorisiert werden:" #. type: example -#: doc/guix.texi:683 +#: doc/guix.texi:681 #, no-wrap msgid "" "# guix archive --authorize < \\\n" @@ -3602,44 +3613,44 @@ msgstr "" " ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER}.pub\n" #. type: enumerate -#: doc/guix.texi:688 +#: doc/guix.texi:686 msgid "Each user may need to perform a few additional steps to make their Guix environment ready for use, @pxref{Application Setup}." msgstr "Alle Nutzer müssen womöglich ein paar zusätzliche Schritte ausführen, damit ihre Guix-Umgebung genutzt werden kann, siehe @ref{Application Setup}." #. type: Plain text -#: doc/guix.texi:691 +#: doc/guix.texi:689 msgid "Voilà, the installation is complete!" msgstr "Voilà, die Installation ist fertig!" #. type: Plain text -#: doc/guix.texi:694 +#: doc/guix.texi:692 msgid "You can confirm that Guix is working by installing a sample package into the root profile:" msgstr "Sie können nachprüfen, dass Guix funktioniert, indem Sie ein Beispielpaket in das root-Profil installieren:" #. type: example -#: doc/guix.texi:697 +#: doc/guix.texi:695 #, no-wrap msgid "# guix install hello\n" msgstr "# guix install hello\n" #. type: Plain text -#: doc/guix.texi:701 +#: doc/guix.texi:699 msgid "The binary installation tarball can be (re)produced and verified simply by running the following command in the Guix source tree:" msgstr "Der Tarball zur Installation aus einer Binärdatei kann einfach durch Ausführung des folgenden Befehls im Guix-Quellbaum (re-)produziert und verifiziert werden:" #. type: example -#: doc/guix.texi:704 +#: doc/guix.texi:702 #, no-wrap msgid "make guix-binary.@var{system}.tar.xz\n" msgstr "make guix-binary.@var{System}.tar.xz\n" #. type: Plain text -#: doc/guix.texi:708 +#: doc/guix.texi:706 msgid "...@: which, in turn, runs:" msgstr "…@: was wiederum dies ausführt:" #. type: example -#: doc/guix.texi:712 +#: doc/guix.texi:710 #, no-wrap msgid "" "guix pack -s @var{system} --localstatedir \\\n" @@ -3649,277 +3660,277 @@ msgstr "" " --profile-name=current-guix guix\n" #. type: Plain text -#: doc/guix.texi:715 +#: doc/guix.texi:713 msgid "@xref{Invoking guix pack}, for more info on this handy tool." msgstr "Siehe @ref{Invoking guix pack} für weitere Informationen zu diesem praktischen Werkzeug." #. type: Plain text -#: doc/guix.texi:723 +#: doc/guix.texi:721 msgid "This section lists requirements when building Guix from source. The build procedure for Guix is the same as for other GNU software, and is not covered here. Please see the files @file{README} and @file{INSTALL} in the Guix source tree for additional details." msgstr "Dieser Abschnitt listet Voraussetzungen auf, um Guix aus seinem Quellcode zu erstellen. Der Erstellungsprozess für Guix ist derselbe wie für andere GNU-Software und wird hier nicht beschrieben. Bitte lesen Sie die Dateien @file{README} und @file{INSTALL} im Guix-Quellbaum, um weitere Details zu erfahren." #. type: cindex -#: doc/guix.texi:724 +#: doc/guix.texi:722 #, no-wrap msgid "official website" -msgstr "Offizielle Webpräsenz" +msgstr "Offizieller Webauftritt" #. type: Plain text -#: doc/guix.texi:727 +#: doc/guix.texi:725 msgid "GNU Guix is available for download from its website at @url{https://www.gnu.org/software/guix/}." -msgstr "GNU Guix kann von seiner Webpräsenz unter @url{http://www.gnu.org/software/guix/} heruntergeladen werden." +msgstr "GNU Guix kann von seinem Webauftritt unter @url{http://www.gnu.org/software/guix/} heruntergeladen werden." #. type: Plain text -#: doc/guix.texi:729 +#: doc/guix.texi:727 msgid "GNU Guix depends on the following packages:" msgstr "GNU Guix hat folgende Pakete als Abhängigkeiten:" #. type: item -#: doc/guix.texi:731 +#: doc/guix.texi:729 #, no-wrap msgid "@url{https://gnu.org/software/guile/, GNU Guile}, version 2.2.x;" msgstr "@url{https://gnu.org/software/guile/, GNU Guile}, Version 2.2.x," #. type: item -#: doc/guix.texi:732 +#: doc/guix.texi:730 #, no-wrap msgid "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version" msgstr "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, Version" #. type: itemize -#: doc/guix.texi:734 +#: doc/guix.texi:732 msgid "0.1.0 or later;" msgstr "0.1.0 oder neuer," #. type: itemize -#: doc/guix.texi:738 +#: doc/guix.texi:736 msgid "@uref{https://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile});" msgstr "@uref{https://gnutls.org/, GnuTLS}, im Speziellen dessen Anbindungen für Guile (siehe @ref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile})," #. type: itemize -#: doc/guix.texi:741 +#: doc/guix.texi:739 msgid "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0 or later;" msgstr "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, Version 0.1.0 oder neuer," #. type: itemize -#: doc/guix.texi:745 +#: doc/guix.texi:743 msgid "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later;" msgstr "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, vom August 2017 oder neuer," #. type: item -#: doc/guix.texi:745 +#: doc/guix.texi:743 #, no-wrap msgid "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON};" msgstr "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}," #. type: item -#: doc/guix.texi:746 +#: doc/guix.texi:744 #, no-wrap msgid "@url{https://zlib.net, zlib};" msgstr "@url{https://zlib.net, zlib}," #. type: item -#: doc/guix.texi:747 +#: doc/guix.texi:745 #, no-wrap msgid "@url{https://www.gnu.org/software/make/, GNU Make}." msgstr "@url{https://www.gnu.org/software/make/, GNU Make}." #. type: Plain text -#: doc/guix.texi:751 +#: doc/guix.texi:749 msgid "The following dependencies are optional:" msgstr "Folgende Abhängigkeiten sind optional:" #. type: itemize -#: doc/guix.texi:759 +#: doc/guix.texi:757 msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later." msgstr "Unterstützung für das Auslagern von Erstellungen (siehe @ref{Daemon Offload Setup}) und @command{guix copy} (siehe @ref{Invoking guix copy}) hängt von @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, Version 0.10.2 oder neuer, ab." #. type: itemize -#: doc/guix.texi:763 +#: doc/guix.texi:761 msgid "When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} can use it to compress build logs." msgstr "Wenn @url{http://www.bzip.org, libbz2} verfügbar ist, kann @command{guix-daemon} damit Erstellungsprotokolle komprimieren." #. type: Plain text -#: doc/guix.texi:767 +#: doc/guix.texi:765 msgid "Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed:" msgstr "Sofern nicht @code{--disable-daemon} beim Aufruf von @command{configure} übergeben wurde, benötigen Sie auch folgende Pakete:" #. type: item -#: doc/guix.texi:769 +#: doc/guix.texi:767 #, no-wrap msgid "@url{https://gnupg.org/, GNU libgcrypt};" msgstr "@url{https://gnupg.org/, GNU libgcrypt}," #. type: item -#: doc/guix.texi:770 +#: doc/guix.texi:768 #, no-wrap msgid "@url{https://sqlite.org, SQLite 3};" msgstr "@url{https://sqlite.org, SQLite 3}," #. type: item -#: doc/guix.texi:771 +#: doc/guix.texi:769 #, no-wrap msgid "@url{https://gcc.gnu.org, GCC's g++}, with support for the" msgstr "@url{https://gcc.gnu.org, GCC's g++} mit Unterstützung für den" #. type: itemize -#: doc/guix.texi:773 +#: doc/guix.texi:771 msgid "C++11 standard." msgstr "C++11-Standard." #. type: cindex -#: doc/guix.texi:775 +#: doc/guix.texi:773 #, no-wrap msgid "state directory" msgstr "Zustandsverzeichnis" #. type: Plain text -#: doc/guix.texi:783 +#: doc/guix.texi:781 msgid "When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing installation using the @code{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}). The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})." msgstr "Sollten Sie Guix auf einem System konfigurieren, auf dem Guix bereits installiert ist, dann stellen Sie sicher, dasselbe Zustandsverzeichnis wie für die bestehende Installation zu verwenden. Benutzen Sie dazu die Befehlszeilenoption @code{--localstatedir} des @command{configure}-Skripts (siehe @ref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}). Das @command{configure}-Skript schützt vor ungewollter Fehlkonfiguration der @var{localstatedir}, damit sie nicht versehentlich Ihren Store verfälschen (siehe @ref{The Store})." #. type: cindex -#: doc/guix.texi:784 +#: doc/guix.texi:782 #, no-wrap msgid "Nix, compatibility" msgstr "Nix, Kompatibilität" #. type: Plain text -#: doc/guix.texi:789 +#: doc/guix.texi:787 msgid "When a working installation of @url{https://nixos.org/nix/, the Nix package manager} is available, you can instead configure Guix with @code{--disable-daemon}. In that case, Nix replaces the three dependencies above." msgstr "Wenn eine funktionierende Installation von @url{https://nixos.org/nix/, dem Nix-Paketverwaltungswerkzeug} verfügbar ist, können Sie Guix stattdessen mit @code{--disable-daemon} konfigurieren. In diesem Fall ersetzt Nix die drei oben genannten Abhängigkeiten." #. type: Plain text -#: doc/guix.texi:799 +#: doc/guix.texi:797 msgid "Guix is compatible with Nix, so it is possible to share the same store between both. To do so, you must pass @command{configure} not only the same @code{--with-store-dir} value, but also the same @code{--localstatedir} value. The latter is essential because it specifies where the database that stores metadata about the store is located, among other things. The default values for Nix are @code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}. Note that @code{--disable-daemon} is not required if your goal is to share the store with Nix." msgstr "Guix ist mit Nix kompatibel, daher ist es möglich, denselben Store für beide zu verwenden. Dazu müssen Sie an @command{configure} nicht nur denselben Wert für @code{--with-store-dir} übergeben, sondern auch denselben Wert für @code{--localstatedir}. Letzterer ist deswegen essenziell, weil er unter anderem angibt, wo die Datenbank liegt, in der sich die Metainformationen über den Store befinden. Für Nix sind die Werte standardmäßig @code{--with-store-dir=/nix/store} und @code{--localstatedir=/nix/var}. Beachten Sie, dass @code{--disable-daemon} nicht erforderlich ist, wenn Sie die Absicht haben, den Store mit Nix zu teilen." #. type: cindex -#: doc/guix.texi:803 +#: doc/guix.texi:801 #, no-wrap msgid "test suite" msgstr "Testkatalog" #. type: Plain text -#: doc/guix.texi:809 +#: doc/guix.texi:807 msgid "After a successful @command{configure} and @code{make} run, it is a good idea to run the test suite. It can help catch issues with the setup or environment, or bugs in Guix itself---and really, reporting test failures is a good way to help improve the software. To run the test suite, type:" msgstr "Nachdem @command{configure} und @code{make} erfolgreich durchgelaufen sind, ist es ratsam, den Testkatalog auszuführen. Er kann dabei helfen, Probleme mit der Einrichtung oder Systemumgebung zu finden, oder auch Probleme in Guix selbst — und Testfehler zu melden ist eine wirklich gute Art und Weise, bei der Verbesserung von Guix mitzuhelfen. Um den Testkatalog auszuführen, geben Sie Folgendes ein:" #. type: example -#: doc/guix.texi:812 +#: doc/guix.texi:810 #, no-wrap msgid "make check\n" msgstr "make check\n" #. type: Plain text -#: doc/guix.texi:819 +#: doc/guix.texi:817 msgid "Test cases can run in parallel: you can use the @code{-j} option of GNU@tie{}make to speed things up. The first run may take a few minutes on a recent machine; subsequent runs will be faster because the store that is created for test purposes will already have various things in cache." msgstr "Testfälle können parallel ausgeführt werden. Sie können die Befehlszeiltenoption @code{-j} von GNU@tie{}make benutzen, damit es schneller geht. Der erste Durchlauf kann auf neuen Maschinen ein paar Minuten dauern, nachfolgende Ausführungen werden schneller sein, weil der für die Tests erstellte Store schon einige Dinge zwischengespeichert haben wird." #. type: Plain text -#: doc/guix.texi:822 +#: doc/guix.texi:820 msgid "It is also possible to run a subset of the tests by defining the @code{TESTS} makefile variable as in this example:" msgstr "Es ist auch möglich, eine Teilmenge der Tests laufen zu lassen, indem Sie die @code{TESTS}-Variable des Makefiles ähnlich wie in diesem Beispiel definieren:" #. type: example -#: doc/guix.texi:825 +#: doc/guix.texi:823 #, no-wrap msgid "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n" msgstr "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n" #. type: Plain text -#: doc/guix.texi:830 +#: doc/guix.texi:828 msgid "By default, tests results are displayed at a file level. In order to see the details of every individual test cases, it is possible to define the @code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example:" msgstr "Standardmäßig werden Testergebnisse pro Datei angezeigt. Um die Details jedes einzelnen Testfalls zu sehen, können Sie wie in diesem Beispiel die @code{SCM_LOG_DRIVER_FLAGS}-Variable des Makefiles definieren:" #. type: example -#: doc/guix.texi:833 +#: doc/guix.texi:831 #, no-wrap msgid "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n" msgstr "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n" #. type: Plain text -#: doc/guix.texi:839 +#: doc/guix.texi:837 msgid "Upon failure, please email @email{bug-guix@@gnu.org} and attach the @file{test-suite.log} file. Please specify the Guix version being used as well as version numbers of the dependencies (@pxref{Requirements}) in your message." msgstr "Kommt es zum Fehlschlag, senden Sie bitte eine E-Mail an @email{bug-guix@@gnu.org} und fügen Sie die Datei @file{test-suite.log} als Anhang bei. Bitte geben Sie dabei in Ihrer Nachricht die benutzte Version von Guix an sowie die Versionsnummern der Abhängigkeiten (siehe @ref{Requirements})." #. type: Plain text -#: doc/guix.texi:843 +#: doc/guix.texi:841 msgid "Guix also comes with a whole-system test suite that tests complete Guix System instances. It can only run on systems where Guix is already installed, using:" msgstr "Guix wird auch mit einem Testkatalog für das ganze System ausgeliefert, der vollständige Instanzen des „Guix System“-Betriebssystems testet. Er kann nur auf Systemen benutzt werden, auf denen Guix bereits installiert ist, mit folgendem Befehl:" #. type: example -#: doc/guix.texi:846 +#: doc/guix.texi:844 #, no-wrap msgid "make check-system\n" msgstr "make check-system\n" #. type: Plain text -#: doc/guix.texi:850 +#: doc/guix.texi:848 msgid "or, again, by defining @code{TESTS} to select a subset of tests to run:" msgstr "Oder, auch hier, indem Sie @code{TESTS} definieren, um eine Teilmenge der auszuführenden Tests anzugeben:" #. type: example -#: doc/guix.texi:853 +#: doc/guix.texi:851 #, no-wrap msgid "make check-system TESTS=\"basic mcron\"\n" msgstr "make check-system TESTS=\"basic mcron\"\n" #. type: Plain text -#: doc/guix.texi:861 +#: doc/guix.texi:859 msgid "These system tests are defined in the @code{(gnu tests @dots{})} modules. They work by running the operating systems under test with lightweight instrumentation in a virtual machine (VM). They can be computationally intensive or rather cheap, depending on whether substitutes are available for their dependencies (@pxref{Substitutes}). Some of them require a lot of storage space to hold VM images." msgstr "Diese Systemtests sind in den @code{(gnu tests …)}-Modulen definiert. Sie funktionieren, indem Sie das getestete Betriebssystem mitsamt schlichter Instrumentierung in einer virtuellen Maschine (VM) ausführen. Die Tests können aufwendige Berechnungen durchführen oder sie günstig umgehen, je nachdem, ob für ihre Abhängigkeiten Substitute zur Verfügung stehen (siehe @ref{Substitutes}). Manche von ihnen nehmen viel Speicherplatz in Anspruch, um die VM-Abbilder zu speichern." #. type: Plain text -#: doc/guix.texi:864 +#: doc/guix.texi:862 msgid "Again in case of test failures, please send @email{bug-guix@@gnu.org} all the details." msgstr "Auch hier gilt: Falls Testfehler auftreten, senden Sie bitte alle Details an @email{bug-guix@@gnu.org}." #. type: cindex -#: doc/guix.texi:868 +#: doc/guix.texi:866 #, no-wrap msgid "daemon" msgstr "Daemon" #. type: Plain text -#: doc/guix.texi:876 +#: doc/guix.texi:874 msgid "Operations such as building a package or running the garbage collector are all performed by a specialized process, the @dfn{build daemon}, on behalf of clients. Only the daemon may access the store and its associated database. Thus, any operation that manipulates the store goes through the daemon. For instance, command-line tools such as @command{guix package} and @command{guix build} communicate with the daemon (@i{via} remote procedure calls) to instruct it what to do." msgstr "Operationen wie das Erstellen eines Pakets oder Laufenlassen des Müllsammlers werden alle durch einen spezialisierten Prozess durchgeführt, den @dfn{Erstellungs-Daemon}, im Auftrag seiner Kunden (den Clients). Nur der Daemon darf auf den Store und seine zugehörige Datenbank zugreifen. Daher wird jede den Store verändernde Operation durch den Daemon durchgeführt. Zum Beispiel kommunizieren Befehlszeilenwerkzeuge wie @command{guix package} und @command{guix build} mit dem Daemon (mittels entfernter Prozeduraufrufe), um ihm Anweisungen zu geben, was er tun soll." #. type: Plain text -#: doc/guix.texi:880 +#: doc/guix.texi:878 msgid "The following sections explain how to prepare the build daemon's environment. See also @ref{Substitutes}, for information on how to allow the daemon to download pre-built binaries." msgstr "Folgende Abschnitte beschreiben, wie Sie die Umgebung des Erstellungs-Daemons ausstatten sollten. Siehe auch @ref{Substitutes} für Informationen darüber, wie Sie es dem Daemon ermöglichen, vorerstellte Binärdateien herunterzuladen." #. type: cindex -#: doc/guix.texi:890 doc/guix.texi:1313 +#: doc/guix.texi:888 doc/guix.texi:1311 #, no-wrap msgid "build environment" msgstr "Erstellungsumgebung" #. type: Plain text -#: doc/guix.texi:898 +#: doc/guix.texi:896 msgid "In a standard multi-user setup, Guix and its daemon---the @command{guix-daemon} program---are installed by the system administrator; @file{/gnu/store} is owned by @code{root} and @command{guix-daemon} runs as @code{root}. Unprivileged users may use Guix tools to build packages or otherwise access the store, and the daemon will do it on their behalf, ensuring that the store is kept in a consistent state, and allowing built packages to be shared among users." msgstr "In einem normalen Mehrbenutzersystem werden Guix und sein Daemon — das Programm @command{guix-daemon} — vom Systemadministrator installiert; @file{/gnu/store} gehört @code{root} und @command{guix-daemon} läuft als @code{root}. Nicht mit erweiterten Rechten ausgestattete Nutzer können Guix-Werkzeuge benutzen, um Pakete zu erstellen oder anderweitig auf den Store zuzugreifen, und der Daemon wird dies für sie erledigen und dabei sicherstellen, dass der Store in einem konsistenten Zustand verbleibt und sich die Nutzer erstellte Pakete teilen." #. type: cindex -#: doc/guix.texi:899 +#: doc/guix.texi:897 #, no-wrap msgid "build users" msgstr "Erstellungsbenutzer" #. type: Plain text -#: doc/guix.texi:910 +#: doc/guix.texi:908 msgid "When @command{guix-daemon} runs as @code{root}, you may not want package build processes themselves to run as @code{root} too, for obvious security reasons. To avoid that, a special pool of @dfn{build users} should be created for use by build processes started by the daemon. These build users need not have a shell and a home directory: they will just be used when the daemon drops @code{root} privileges in build processes. Having several such users allows the daemon to launch distinct build processes under separate UIDs, which guarantees that they do not interfere with each other---an essential feature since builds are regarded as pure functions (@pxref{Introduction})." msgstr "Wenn @command{guix-daemon} als Administratornutzer @code{root} läuft, wollen Sie aber vielleicht dennoch nicht, dass Paketerstellungsprozesse auch als @code{root} ablaufen, aus offensichtlichen Sicherheitsgründen. Um dies zu vermeiden, sollte ein besonderer Pool aus @dfn{Erstellungsbenutzern} geschaffen werden, damit vom Daemon gestartete Erstellungsprozesse ihn benutzen. Diese Erstellungsbenutzer müssen weder eine Shell noch ein Persönliches Verzeichnis zugewiesen bekommen, sie werden lediglich benutzt, wenn der Daemon @code{root}-Rechte in Erstellungsprozessen ablegt. Mehrere solche Benutzer zu haben, ermöglicht es dem Daemon, verschiedene Erstellungsprozessen unter verschiedenen Benutzeridentifikatoren (UIDs) zu starten, was garantiert, dass sie einander nicht stören — eine essenzielle Funktionalität, da Erstellungen als reine Funktionen angesehen werden (siehe @ref{Introduction})." #. type: Plain text -#: doc/guix.texi:913 +#: doc/guix.texi:911 msgid "On a GNU/Linux system, a build user pool may be created like this (using Bash syntax and the @code{shadow} commands):" msgstr "Auf einem GNU/Linux-System kann ein Pool von Erstellungsbenutzern wie folgt erzeugt werden (mit Bash-Syntax und den Befehlen von @code{shadow}):" #. type: example -#: doc/guix.texi:925 +#: doc/guix.texi:923 #, no-wrap msgid "" "# groupadd --system guixbuild\n" @@ -3941,113 +3952,113 @@ msgstr "" " done\n" #. type: Plain text -#: doc/guix.texi:935 +#: doc/guix.texi:933 msgid "The number of build users determines how many build jobs may run in parallel, as specified by the @option{--max-jobs} option (@pxref{Invoking guix-daemon, @option{--max-jobs}}). To use @command{guix system vm} and related commands, you may need to add the build users to the @code{kvm} group so they can access @file{/dev/kvm}, using @code{-G guixbuild,kvm} instead of @code{-G guixbuild} (@pxref{Invoking guix system})." msgstr "Die Anzahl der Erstellungsbenutzer entscheidet, wieviele Erstellungsaufträge parallel ausgeführt werden können, wie es mit der Befehlszeilenoption @option{--max-jobs} vorgegeben werden kann (siehe @ref{Invoking guix-daemon, @option{--max-jobs}}). Um @command{guix system vm} und ähnliche Befehle nutzen zu können, müssen Sie die Erstellungsbenutzer unter Umständen zur @code{kvm}-Benutzergruppe hinzufügen, damit sie Zugriff auf @file{/dev/kvm} haben, mit @code{-G guixbuild,kvm} statt @code{-G guixbuild} (siehe @ref{Invoking guix system})." #. type: Plain text -#: doc/guix.texi:944 +#: doc/guix.texi:942 msgid "The @code{guix-daemon} program may then be run as @code{root} with the following command@footnote{If your machine uses the systemd init system, dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service} file in @file{/etc/systemd/system} will ensure that @command{guix-daemon} is automatically started. Similarly, if your machine uses the Upstart init system, drop the @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} file in @file{/etc/init}.}:" msgstr "Das Programm @code{guix-daemon} kann mit dem folgenden Befehl als @code{root} gestartet werden@footnote{Wenn Ihre Maschine systemd als „init“-System verwendet, genügt es, die Datei @file{@var{prefix}/lib/systemd/system/guix-daemon.service} in @file{/etc/systemd/system} zu platzieren, damit @command{guix-daemon} automatisch gestartet wird. Ebenso können Sie, wenn Ihre Maschine Upstart als „init“-System benutzt, die Datei @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} in @file{/etc/init} platzieren.}:" #. type: example -#: doc/guix.texi:947 doc/guix.texi:1306 +#: doc/guix.texi:945 doc/guix.texi:1304 #, no-wrap msgid "# guix-daemon --build-users-group=guixbuild\n" msgstr "# guix-daemon --build-users-group=guixbuild\n" #. type: cindex -#: doc/guix.texi:949 doc/guix.texi:1311 +#: doc/guix.texi:947 doc/guix.texi:1309 #, no-wrap msgid "chroot" msgstr "chroot" #. type: Plain text -#: doc/guix.texi:954 +#: doc/guix.texi:952 msgid "This way, the daemon starts build processes in a chroot, under one of the @code{guixbuilder} users. On GNU/Linux, by default, the chroot environment contains nothing but:" msgstr "Auf diese Weise startet der Daemon Erstellungsprozesse in einem chroot als einer der @code{guixbuilder}-Benutzer. Auf GNU/Linux enthält die chroot-Umgebung standardmäßig nichts außer:" #. type: itemize -#: doc/guix.texi:962 +#: doc/guix.texi:960 msgid "a minimal @code{/dev} directory, created mostly independently from the host @code{/dev}@footnote{``Mostly'', because while the set of files that appear in the chroot's @code{/dev} is fixed, most of these files can only be created if the host has them.};" msgstr "einem minimalen @code{/dev}-Verzeichnis, was größtenteils vom @code{/dev} des Wirtssystems unabhängig erstellt wurde@footnote{„Größtenteils“, denn obwohl die Menge an Dateien, die im @code{/dev} des chroots vorkommen, fest ist, können die meisten dieser Dateien nur dann erstellt werden, wenn das Wirtssystem sie auch hat.}," #. type: itemize -#: doc/guix.texi:966 +#: doc/guix.texi:964 msgid "the @code{/proc} directory; it only shows the processes of the container since a separate PID name space is used;" msgstr "dem @code{/proc}-Verzeichnis, es zeigt nur die Prozesse des Containers, weil ein separater Namensraum für Prozess-IDs (PIDs) benutzt wird," #. type: itemize -#: doc/guix.texi:970 +#: doc/guix.texi:968 msgid "@file{/etc/passwd} with an entry for the current user and an entry for user @file{nobody};" msgstr "@file{/etc/passwd} mit einem Eintrag für den aktuellen Benutzer und einem Eintrag für den Benutzer @file{nobody}," #. type: itemize -#: doc/guix.texi:973 +#: doc/guix.texi:971 msgid "@file{/etc/group} with an entry for the user's group;" msgstr "@file{/etc/group} mit einem Eintrag für die Gruppe des Benutzers," #. type: itemize -#: doc/guix.texi:977 +#: doc/guix.texi:975 msgid "@file{/etc/hosts} with an entry that maps @code{localhost} to @code{127.0.0.1};" msgstr "@file{/etc/hosts} mit einem Eintrag, der @code{localhost} auf @code{127.0.0.1} abbildet," #. type: itemize -#: doc/guix.texi:980 +#: doc/guix.texi:978 msgid "a writable @file{/tmp} directory." msgstr "einem @file{/tmp}-Verzeichnis mit Schreibrechten." #. type: Plain text -#: doc/guix.texi:989 +#: doc/guix.texi:987 msgid "You can influence the directory where the daemon stores build trees @i{via} the @code{TMPDIR} environment variable. However, the build tree within the chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where @var{name} is the derivation name---e.g., @code{coreutils-8.24}. This way, the value of @code{TMPDIR} does not leak inside build environments, which avoids discrepancies in cases where build processes capture the name of their build tree." msgstr "Sie können beeinflussen, in welchem Verzeichnis der Daemon Verzeichnisbäume zur Erstellung unterbringt, indem sie den Wert der Umgebungsvariablen @code{TMPDIR} ändern. Allerdings heißt innerhalb des chroots der Erstellungsbaum immer @file{/tmp/guix-build-@var{Name}.drv-0}, wobei @var{Name} der Ableitungsname ist — z.B.@: @code{coreutils-8.24}. Dadurch hat der Wert von @code{TMPDIR} keinen Einfluss auf die Erstellungsumgebung, wodurch Unterschiede vermieden werden, falls Erstellungsprozesse den Namen ihres Erstellungsbaumes einfangen." #. type: vindex -#: doc/guix.texi:990 doc/guix.texi:3263 +#: doc/guix.texi:988 doc/guix.texi:3261 #, no-wrap msgid "http_proxy" msgstr "http_proxy" #. type: Plain text -#: doc/guix.texi:994 +#: doc/guix.texi:992 msgid "The daemon also honors the @code{http_proxy} environment variable for HTTP downloads it performs, be it for fixed-output derivations (@pxref{Derivations}) or for substitutes (@pxref{Substitutes})." msgstr "Der Daemon befolgt außerdem den Wert der Umgebungsvariablen @code{http_proxy} für von ihm durchgeführte HTTP-Downloads, sei es für Ableitungen mit fester Ausgabe (siehe @ref{Derivations}) oder für Substitute (siehe @ref{Substitutes})." #. type: Plain text -#: doc/guix.texi:1002 +#: doc/guix.texi:1000 msgid "If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @code{--disable-chroot}. However, build processes will not be isolated from one another, and not from the rest of the system. Thus, build processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it much harder to view them as @emph{pure} functions." msgstr "Wenn Sie Guix als ein Benutzer ohne erweiterte Rechte installieren, ist es dennoch möglich, @command{guix-daemon} auszuführen, sofern Sie @code{--disable-chroot} übergeben. Allerdings können Erstellungsprozesse dann nicht voneinander und vom Rest des Systems isoliert werden. Daher können sich Erstellungsprozesse gegenseitig stören und auf Programme, Bibliotheken und andere Dateien zugreifen, die dem restlichen System zur Verfügung stehen — was es deutlich schwerer macht, sie als @emph{reine} Funktionen aufzufassen." #. type: subsection -#: doc/guix.texi:1005 +#: doc/guix.texi:1003 #, no-wrap msgid "Using the Offload Facility" msgstr "Nutzung der Auslagerungsfunktionalität" #. type: cindex -#: doc/guix.texi:1007 +#: doc/guix.texi:1005 #, no-wrap msgid "offloading" msgstr "auslagern" #. type: cindex -#: doc/guix.texi:1008 doc/guix.texi:1369 +#: doc/guix.texi:1006 doc/guix.texi:1367 #, no-wrap msgid "build hook" msgstr "Build-Hook" #. type: Plain text -#: doc/guix.texi:1022 +#: doc/guix.texi:1020 msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}. When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}. Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine." msgstr "Wenn erwünscht, kann der Erstellungs-Daemon Ableitungserstellungen auf andere Maschinen @dfn{auslagern}, auf denen Guix läuft, mit Hilfe des @code{offload}-@dfn{Build-Hooks}@footnote{Diese Funktionalität ist nur verfügbar, wenn @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} vorhanden ist.}. Wenn diese Funktionalität aktiviert ist, wird eine nutzerspezifizierte Liste von Erstellungsmaschinen aus @file{/etc/guix/machines.scm} gelesen. Wann immer eine Erstellung angefragt wird, zum Beispiel durch @code{guix build}, versucht der Daemon, sie an eine der Erstellungsmaschinen auszulagern, die die Einschränkungen der Ableitung erfüllen, insbesondere ihren Systemtyp — z.B.@: @file{x86_64-linux}. Fehlende Voraussetzungen für die Erstellung werden über SSH auf die Zielmaschine kopiert, welche dann mit der Erstellung weitermacht. Hat sie Erfolg damit, so werden die Ausgabe oder Ausgaben der Erstellung zurück auf die ursprüngliche Maschine kopiert." #. type: Plain text -#: doc/guix.texi:1024 +#: doc/guix.texi:1022 msgid "The @file{/etc/guix/machines.scm} file typically looks like this:" msgstr "Die Datei @file{/etc/guix/machines.scm} sieht normalerweise so aus:" #. type: example -#: doc/guix.texi:1032 +#: doc/guix.texi:1030 #, no-wrap msgid "" "(list (build-machine\n" @@ -4067,7 +4078,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:1041 +#: doc/guix.texi:1039 #, no-wrap msgid "" " (build-machine\n" @@ -4089,93 +4100,93 @@ msgstr "" " \"/.ssh/identität-für-guix\"))))\n" #. type: Plain text -#: doc/guix.texi:1047 +#: doc/guix.texi:1045 msgid "In the example above we specify a list of two build machines, one for the @code{x86_64} architecture and one for the @code{mips64el} architecture." msgstr "Im obigen Beispiel geben wir eine Liste mit zwei Erstellungsmaschinen vor, eine für die @code{x86_64}-Architektur und eine für die @code{mips64el}-Architektur." #. type: Plain text -#: doc/guix.texi:1056 +#: doc/guix.texi:1054 msgid "In fact, this file is---not surprisingly!---a Scheme file that is evaluated when the @code{offload} hook is started. Its return value must be a list of @code{build-machine} objects. While this example shows a fixed list of build machines, one could imagine, say, using DNS-SD to return a list of potential build machines discovered in the local network (@pxref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}). The @code{build-machine} data type is detailed below." msgstr "Tatsächlich ist diese Datei — wenig überraschend! — eine Scheme-Datei, die ausgewertet wird, wenn der @code{offload}-Hook gestartet wird. Der Wert, den sie zurückliefert, muss eine Liste von @code{build-machine}-Objekten sein. Obwohl dieses Beispiel eine feste Liste von Erstellungsmaschinen zeigt, könnte man auch auf die Idee kommen, etwa mit DNS-SD eine Liste möglicher im lokalen Netzwerk entdeckter Erstellungsmaschinen zu liefern (siehe @ref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}). Der Datentyp @code{build-machine} wird im Folgenden weiter ausgeführt." #. type: deftp -#: doc/guix.texi:1057 +#: doc/guix.texi:1055 #, no-wrap msgid "{Data Type} build-machine" msgstr "{Datentyp} build-machine" #. type: deftp -#: doc/guix.texi:1060 +#: doc/guix.texi:1058 msgid "This data type represents build machines to which the daemon may offload builds. The important fields are:" msgstr "Dieser Datentyp repräsentiert Erstellungsmaschinen, an die der Daemon Erstellungen auslagern darf. Die wichtigen Felder sind:" #. type: item -#: doc/guix.texi:1063 doc/guix.texi:5339 doc/guix.texi:11006 -#: doc/guix.texi:11088 doc/guix.texi:11315 doc/guix.texi:12899 -#: doc/guix.texi:17437 doc/guix.texi:18022 doc/guix.texi:18633 -#: doc/guix.texi:18941 doc/guix.texi:18982 doc/guix.texi:23526 -#: doc/guix.texi:23543 doc/guix.texi:23836 doc/guix.texi:25144 -#: doc/guix.texi:25354 +#: doc/guix.texi:1061 doc/guix.texi:5337 doc/guix.texi:11004 +#: doc/guix.texi:11086 doc/guix.texi:11313 doc/guix.texi:12897 +#: doc/guix.texi:17434 doc/guix.texi:18019 doc/guix.texi:18630 +#: doc/guix.texi:18938 doc/guix.texi:18979 doc/guix.texi:23523 +#: doc/guix.texi:23540 doc/guix.texi:23833 doc/guix.texi:25130 +#: doc/guix.texi:25336 #, no-wrap msgid "name" msgstr "name" #. type: table -#: doc/guix.texi:1065 +#: doc/guix.texi:1063 msgid "The host name of the remote machine." msgstr "Der Hostname (d.h.@: der Rechnername) der entfernten Maschine." #. type: item -#: doc/guix.texi:1066 +#: doc/guix.texi:1064 #, no-wrap msgid "system" msgstr "system" #. type: table -#: doc/guix.texi:1068 +#: doc/guix.texi:1066 msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}." msgstr "Der Systemtyp der entfernten Maschine — z.B.@: @code{\"x86_64-linux\"}." #. type: code{#1} -#: doc/guix.texi:1069 doc/guix.texi:12909 +#: doc/guix.texi:1067 doc/guix.texi:12907 #, no-wrap msgid "user" msgstr "user" #. type: table -#: doc/guix.texi:1073 +#: doc/guix.texi:1071 msgid "The user account to use when connecting to the remote machine over SSH. Note that the SSH key pair must @emph{not} be passphrase-protected, to allow non-interactive logins." msgstr "Das Benutzerkonto, mit dem eine Verbindung zur entfernten Maschine über SSH aufgebaut werden soll. Beachten Sie, dass das SSH-Schlüsselpaar @emph{nicht} durch eine Passphrase geschützt sein darf, damit nicht-interaktive Anmeldungen möglich sind." #. type: item -#: doc/guix.texi:1074 +#: doc/guix.texi:1072 #, no-wrap msgid "host-key" msgstr "host-key" #. type: table -#: doc/guix.texi:1078 +#: doc/guix.texi:1076 msgid "This must be the machine's SSH @dfn{public host key} in OpenSSH format. This is used to authenticate the machine when we connect to it. It is a long string that looks like this:" msgstr "Dies muss der @dfn{öffentliche SSH-Host-Schlüssel} der Maschine im OpenSSH-Format sein. Er wird benutzt, um die Identität der Maschine zu prüfen, wenn wir uns mit ihr verbinden. Er ist eine lange Zeichenkette, die ungefähr so aussieht:" #. type: example -#: doc/guix.texi:1081 +#: doc/guix.texi:1079 #, no-wrap msgid "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n" msgstr "ssh-ed25519 AAAAC3NzaC…mde+UhL hint@@example.org\n" #. type: table -#: doc/guix.texi:1086 +#: doc/guix.texi:1084 msgid "If the machine is running the OpenSSH daemon, @command{sshd}, the host key can be found in a file such as @file{/etc/ssh/ssh_host_ed25519_key.pub}." msgstr "Wenn auf der Maschine der OpenSSH-Daemon, @command{sshd}, läuft, ist der Host-Schlüssel in einer Datei wie @file{/etc/ssh/ssh_host_ed25519_key.pub} zu finden." #. type: table -#: doc/guix.texi:1091 +#: doc/guix.texi:1089 msgid "If the machine is running the SSH daemon of GNU@tie{}lsh, @command{lshd}, the host key is in @file{/etc/lsh/host-key.pub} or a similar file. It can be converted to the OpenSSH format using @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}):" msgstr "Wenn auf der Maschine der SSH-Daemon von GNU@tie{}lsh, nämlich @command{lshd}, läuft, befindet sich der Host-Schlüssel in @file{/etc/lsh/host-key.pub} oder einer ähnlichen Datei. Er kann ins OpenSSH-Format umgewandelt werden durch @command{lsh-export-key} (siehe @ref{Converting keys,,, lsh, LSH Manual}):" #. type: example -#: doc/guix.texi:1095 +#: doc/guix.texi:1093 #, no-wrap msgid "" "$ lsh-export-key --openssh < /etc/lsh/host-key.pub \n" @@ -4185,840 +4196,840 @@ msgstr "" "ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV…\n" #. type: deftp -#: doc/guix.texi:1100 +#: doc/guix.texi:1098 msgid "A number of optional fields may be specified:" msgstr "Eine Reihe optionaler Felder kann festgelegt werden:" #. type: item -#: doc/guix.texi:1103 +#: doc/guix.texi:1101 #, no-wrap msgid "@code{port} (default: @code{22})" msgstr "@code{port} (Vorgabe: @code{22})" #. type: table -#: doc/guix.texi:1105 +#: doc/guix.texi:1103 msgid "Port number of SSH server on the machine." msgstr "Portnummer des SSH-Servers auf der Maschine." #. type: item -#: doc/guix.texi:1106 +#: doc/guix.texi:1104 #, no-wrap msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})" msgstr "@code{private-key} (Vorgabe: @file{~root/.ssh/id_rsa})" #. type: table -#: doc/guix.texi:1109 +#: doc/guix.texi:1107 msgid "The SSH private key file to use when connecting to the machine, in OpenSSH format. This key must not be protected with a passphrase." msgstr "Die Datei mit dem privaten SSH-Schlüssel, der beim Verbinden zur Maschine genutzt werden soll, im OpenSSH-Format. Dieser Schlüssel darf nicht mit einer Passphrase geschützt sein." #. type: table -#: doc/guix.texi:1112 +#: doc/guix.texi:1110 msgid "Note that the default value is the private key @emph{of the root account}. Make sure it exists if you use the default." msgstr "Beachten Sie, dass als Vorgabewert der private Schlüssel @emph{des root-Benutzers} genommen wird. Vergewissern Sie sich, dass er existiert, wenn Sie die Standardeinstellung verwenden." #. type: item -#: doc/guix.texi:1113 +#: doc/guix.texi:1111 #, no-wrap msgid "@code{compression} (default: @code{\"zlib@@openssh.com,zlib\"})" msgstr "@code{compression} (Vorgabe: @code{\"zlib@@openssh.com,zlib\"})" #. type: item -#: doc/guix.texi:1114 doc/guix.texi:12202 +#: doc/guix.texi:1112 doc/guix.texi:12200 #, no-wrap msgid "@code{compression-level} (default: @code{3})" msgstr "@code{compression-level} (Vorgabe: @code{3})" #. type: table -#: doc/guix.texi:1116 +#: doc/guix.texi:1114 msgid "The SSH-level compression methods and compression level requested." msgstr "Die Kompressionsmethoden auf SSH-Ebene und das angefragte Kompressionsniveau." #. type: table -#: doc/guix.texi:1119 +#: doc/guix.texi:1117 msgid "Note that offloading relies on SSH compression to reduce bandwidth usage when transferring files to and from build machines." msgstr "Beachten Sie, dass Auslagerungen SSH-Kompression benötigen, um beim Übertragen von Dateien an Erstellungsmaschinen und zurück weniger Bandbreite zu benutzen." #. type: item -#: doc/guix.texi:1120 +#: doc/guix.texi:1118 #, no-wrap msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})" msgstr "@code{daemon-socket} (Vorgabe: @code{\"/var/guix/daemon-socket/socket\"})" #. type: table -#: doc/guix.texi:1123 +#: doc/guix.texi:1121 msgid "File name of the Unix-domain socket @command{guix-daemon} is listening to on that machine." msgstr "Dateiname des Unix-Sockets, auf dem @command{guix-daemon} auf der Maschine lauscht." #. type: item -#: doc/guix.texi:1124 +#: doc/guix.texi:1122 #, no-wrap msgid "@code{parallel-builds} (default: @code{1})" msgstr "@code{parallel-builds} (Vorgabe: @code{1})" #. type: table -#: doc/guix.texi:1126 +#: doc/guix.texi:1124 msgid "The number of builds that may run in parallel on the machine." msgstr "Die Anzahl der Erstellungen, die auf der Maschine parallel ausgeführt werden können." #. type: item -#: doc/guix.texi:1127 +#: doc/guix.texi:1125 #, no-wrap msgid "@code{speed} (default: @code{1.0})" msgstr "@code{speed} (Vorgabe: @code{1.0})" #. type: table -#: doc/guix.texi:1130 +#: doc/guix.texi:1128 msgid "A ``relative speed factor''. The offload scheduler will tend to prefer machines with a higher speed factor." msgstr "Ein „relativer Geschwindigkeitsfaktor“. Der Auslagerungsplaner gibt tendenziell Maschinen mit höherem Geschwindigkeitsfaktor den Vorrang." #. type: item -#: doc/guix.texi:1131 +#: doc/guix.texi:1129 #, no-wrap msgid "@code{features} (default: @code{'()})" msgstr "@code{features} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:1136 +#: doc/guix.texi:1134 msgid "A list of strings denoting specific features supported by the machine. An example is @code{\"kvm\"} for machines that have the KVM Linux modules and corresponding hardware support. Derivations can request features by name, and they will be scheduled on matching build machines." msgstr "Eine Liste von Zeichenketten, die besondere von der Maschine unterstützte Funktionalitäten bezeichnen. Ein Beispiel ist @code{\"kvm\"} für Maschinen, die über die KVM-Linux-Module zusammen mit entsprechender Hardware-Unterstützung verfügen. Ableitungen können Funktionalitäten dem Namen nach anfragen und werden dann auf passenden Erstellungsmaschinen eingeplant." #. type: Plain text -#: doc/guix.texi:1142 +#: doc/guix.texi:1140 msgid "The @command{guix} command must be in the search path on the build machines. You can check whether this is the case by running:" msgstr "Der Befehl @code{guix} muss sich im Suchpfad der Erstellungsmaschinen befinden. Um dies nachzuprüfen, können Sie Folgendes ausführen:" #. type: example -#: doc/guix.texi:1145 +#: doc/guix.texi:1143 #, no-wrap msgid "ssh build-machine guix repl --version\n" msgstr "ssh build-machine guix repl --version\n" #. type: Plain text -#: doc/guix.texi:1152 +#: doc/guix.texi:1150 msgid "There is one last thing to do once @file{machines.scm} is in place. As explained above, when offloading, files are transferred back and forth between the machine stores. For this to work, you first need to generate a key pair on each machine to allow the daemon to export signed archives of files from the store (@pxref{Invoking guix archive}):" msgstr "Es gibt noch eine weitere Sache zu tun, sobald @file{machines.scm} eingerichtet ist. Wie zuvor erklärt, werden beim Auslagern Dateien zwischen den Stores der Maschinen hin- und hergeschickt. Damit das funktioniert, müssen Sie als Erstes ein Schlüsselpaar auf jeder Maschine erzeugen, damit der Daemon signierte Archive mit den Dateien aus dem Store versenden kann (siehe @ref{Invoking guix archive}):" #. type: example -#: doc/guix.texi:1155 +#: doc/guix.texi:1153 #, no-wrap msgid "# guix archive --generate-key\n" msgstr "# guix archive --generate-key\n" #. type: Plain text -#: doc/guix.texi:1160 +#: doc/guix.texi:1158 msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:" msgstr "Jede Erstellungsmaschine muss den Schlüssel der Hauptmaschine autorisieren, damit diese Store-Objekte von der Hauptmaschine empfangen kann:" #. type: example -#: doc/guix.texi:1163 +#: doc/guix.texi:1161 #, no-wrap msgid "# guix archive --authorize < master-public-key.txt\n" msgstr "# guix archive --authorize < öffentlicher-schlüssel-hauptmaschine.txt\n" #. type: Plain text -#: doc/guix.texi:1167 +#: doc/guix.texi:1165 msgid "Likewise, the master machine must authorize the key of each build machine." msgstr "Andersherum muss auch die Hauptmaschine den jeweiligen Schlüssel jeder Erstellungsmaschine autorisieren." #. type: Plain text -#: doc/guix.texi:1173 +#: doc/guix.texi:1171 msgid "All the fuss with keys is here to express pairwise mutual trust relations between the master and the build machines. Concretely, when the master receives files from a build machine (and @i{vice versa}), its build daemon can make sure they are genuine, have not been tampered with, and that they are signed by an authorized key." msgstr "Der ganze Umstand mit den Schlüsseln soll ausdrücken, dass sich Haupt- und Erstellungsmaschinen paarweise gegenseitig vertrauen. Konkret kann der Erstellungs-Daemon auf der Hauptmaschine die Echtheit von den Erstellungsmaschinen empfangener Dateien gewährleisten (und umgekehrt), und auch dass sie nicht sabotiert wurden und mit einem autorisierten Schlüssel signiert wurden." #. type: cindex -#: doc/guix.texi:1174 +#: doc/guix.texi:1172 #, no-wrap msgid "offload test" msgstr "Auslagerung testen" #. type: Plain text -#: doc/guix.texi:1177 +#: doc/guix.texi:1175 msgid "To test whether your setup is operational, run this command on the master node:" msgstr "Um zu testen, ob Ihr System funktioniert, führen Sie diesen Befehl auf der Hauptmaschine aus:" #. type: example -#: doc/guix.texi:1180 +#: doc/guix.texi:1178 #, no-wrap msgid "# guix offload test\n" msgstr "# guix offload test\n" #. type: Plain text -#: doc/guix.texi:1186 +#: doc/guix.texi:1184 msgid "This will attempt to connect to each of the build machines specified in @file{/etc/guix/machines.scm}, make sure Guile and the Guix modules are available on each machine, attempt to export to the machine and import from it, and report any error in the process." msgstr "Dadurch wird versucht, zu jeder Erstellungsmaschine eine Verbindung herzustellen, die in @file{/etc/guix/machines.scm} angegeben wurde, sichergestellt, dass auf jeder Guile und die Guix-Module nutzbar sind, und jeweils versucht, etwas auf die Erstellungsmaschine zu exportieren und von dort zu imporieren. Dabei auftretende Fehler werden gemeldet." #. type: Plain text -#: doc/guix.texi:1189 +#: doc/guix.texi:1187 msgid "If you want to test a different machine file, just specify it on the command line:" msgstr "Wenn Sie stattdessen eine andere Maschinendatei verwenden möchten, geben Sie diese einfach auf der Befehlszeile an:" #. type: example -#: doc/guix.texi:1192 +#: doc/guix.texi:1190 #, no-wrap msgid "# guix offload test machines-qualif.scm\n" msgstr "# guix offload test maschinen-qualif.scm\n" #. type: Plain text -#: doc/guix.texi:1196 +#: doc/guix.texi:1194 msgid "Last, you can test the subset of the machines whose name matches a regular expression like this:" msgstr "Letztendlich können Sie hiermit nur die Teilmenge der Maschinen testen, deren Name zu einem regulären Ausdruck passt:" #. type: example -#: doc/guix.texi:1199 +#: doc/guix.texi:1197 #, no-wrap msgid "# guix offload test machines.scm '\\.gnu\\.org$'\n" msgstr "# guix offload test maschinen.scm '\\.gnu\\.org$'\n" #. type: cindex -#: doc/guix.texi:1201 +#: doc/guix.texi:1199 #, no-wrap msgid "offload status" msgstr "Auslagerungs-Lagebericht" #. type: Plain text -#: doc/guix.texi:1204 +#: doc/guix.texi:1202 msgid "To display the current load of all build hosts, run this command on the main node:" msgstr "Um die momentane Auslastung aller Erstellungs-Hosts anzuzeigen, führen Sie diesen Befehl auf dem Hauptknoten aus:" #. type: example -#: doc/guix.texi:1207 +#: doc/guix.texi:1205 #, no-wrap msgid "# guix offload status\n" msgstr "# guix offload status\n" #. type: cindex -#: doc/guix.texi:1213 +#: doc/guix.texi:1211 #, no-wrap msgid "SELinux, daemon policy" msgstr "SELinux, Policy für den Daemon" #. type: cindex -#: doc/guix.texi:1214 +#: doc/guix.texi:1212 #, no-wrap msgid "mandatory access control, SELinux" msgstr "Mandatory Access Control, SELinux" #. type: cindex -#: doc/guix.texi:1215 +#: doc/guix.texi:1213 #, no-wrap msgid "security, guix-daemon" msgstr "Sicherheit, des guix-daemon" #. type: Plain text -#: doc/guix.texi:1221 +#: doc/guix.texi:1219 msgid "Guix includes an SELinux policy file at @file{etc/guix-daemon.cil} that can be installed on a system where SELinux is enabled, in order to label Guix files and to specify the expected behavior of the daemon. Since Guix System does not provide an SELinux base policy, the daemon policy cannot be used on Guix System." msgstr "Guix enthält eine SELinux-Richtliniendatei („Policy“) unter @file{etc/guix-daemon.cil}, die auf einem System installiert werden kann, auf dem SELinux aktiviert ist, damit Guix-Dateien gekennzeichnet sind und um das erwartete Verhalten des Daemons anzugeben. Da Guix System keine Grundrichtlinie („Base Policy“) für SELinux bietet, kann diese Richtlinie für den Daemon auf Guix System nicht benutzt werden." #. type: subsubsection -#: doc/guix.texi:1222 +#: doc/guix.texi:1220 #, no-wrap msgid "Installing the SELinux policy" msgstr "Installieren der SELinux-Policy" #. type: cindex -#: doc/guix.texi:1223 +#: doc/guix.texi:1221 #, no-wrap msgid "SELinux, policy installation" msgstr "SELinux, Policy installieren" #. type: Plain text -#: doc/guix.texi:1225 +#: doc/guix.texi:1223 msgid "To install the policy run this command as root:" msgstr "Um die Richtlinie (Policy) zu installieren, führen Sie folgenden Befehl mit Administratorrechten aus:" #. type: example -#: doc/guix.texi:1228 +#: doc/guix.texi:1226 #, no-wrap msgid "semodule -i etc/guix-daemon.cil\n" msgstr "semodule -i etc/guix-daemon.cil\n" #. type: Plain text -#: doc/guix.texi:1232 +#: doc/guix.texi:1230 msgid "Then relabel the file system with @code{restorecon} or by a different mechanism provided by your system." msgstr "Kennzeichnen Sie dann das Dateisystem neu mit @code{restorecon} oder einem anderen, von Ihrem System angebotenen Mechanismus." #. type: Plain text -#: doc/guix.texi:1237 +#: doc/guix.texi:1235 msgid "Once the policy is installed, the file system has been relabeled, and the daemon has been restarted, it should be running in the @code{guix_daemon_t} context. You can confirm this with the following command:" msgstr "Sobald die Richtlinie installiert ist, das Dateisystem neu gekennzeichnet wurde und der Daemon neugestartet wurde, sollte er im Kontext @code{guix_daemon_t} laufen. Sie können dies mit dem folgenden Befehl nachprüfen:" #. type: example -#: doc/guix.texi:1240 +#: doc/guix.texi:1238 #, no-wrap msgid "ps -Zax | grep guix-daemon\n" msgstr "ps -Zax | grep guix-daemon\n" #. type: Plain text -#: doc/guix.texi:1245 +#: doc/guix.texi:1243 msgid "Monitor the SELinux log files as you run a command like @code{guix build hello} to convince yourself that SELinux permits all necessary operations." msgstr "Beobachten Sie die Protokolldateien von SELinux, wenn Sie einen Befehl wie @code{guix build hello} ausführen, um sich zu überzeugen, dass SELinux alle notwendigen Operationen gestattet." #. type: cindex -#: doc/guix.texi:1247 +#: doc/guix.texi:1245 #, no-wrap msgid "SELinux, limitations" msgstr "SELinux, Einschränkungen" #. type: Plain text -#: doc/guix.texi:1252 +#: doc/guix.texi:1250 msgid "This policy is not perfect. Here is a list of limitations or quirks that should be considered when deploying the provided SELinux policy for the Guix daemon." msgstr "Diese Richtlinie ist nicht perfekt. Im Folgenden finden Sie eine Liste von Einschränkungen oder merkwürdigen Verhaltensweisen, die bedacht werden sollten, wenn man die mitgelieferte SELinux-Richtlinie für den Guix-Daemon einspielt." #. type: enumerate -#: doc/guix.texi:1259 +#: doc/guix.texi:1257 msgid "@code{guix_daemon_socket_t} isn’t actually used. None of the socket operations involve contexts that have anything to do with @code{guix_daemon_socket_t}. It doesn’t hurt to have this unused label, but it would be preferrable to define socket rules for only this label." msgstr "@code{guix_daemon_socket_t} wird nicht wirklich benutzt. Keine der Socket-Operationen benutzt Kontexte, die irgendetwas mit @code{guix_daemon_socket_t} zu tun haben. Es schadet nicht, diese ungenutzte Kennzeichnung zu haben, aber es wäre besser, für die Kennzeichnung auch Socket-Regeln festzulegen." #. type: enumerate -#: doc/guix.texi:1270 +#: doc/guix.texi:1268 msgid "@code{guix gc} cannot access arbitrary links to profiles. By design, the file label of the destination of a symlink is independent of the file label of the link itself. Although all profiles under $localstatedir are labelled, the links to these profiles inherit the label of the directory they are in. For links in the user’s home directory this will be @code{user_home_t}. But for links from the root user’s home directory, or @file{/tmp}, or the HTTP server’s working directory, etc, this won’t work. @code{guix gc} would be prevented from reading and following these links." msgstr "@code{guix gc} kann nicht auf beliebige Verknüpfungen zu Profilen zugreifen. Die Kennzeichnung des Ziels einer symbolischen Verknüpfung ist notwendigerweise unabhängig von der Dateikennzeichnung der Verknüpfung. Obwohl alle Profile unter $localstatedir gekennzeichnet sind, erben die Verknüpfungen auf diese Profile die Kennzeichnung desjenigen Verzeichnisses, in dem sie sich befinden. Für Verknüpfungen im Persönlichen Verzeichnis des Benutzers ist das @code{user_home_t}, aber Verknüpfungen aus dem Persönlichen Verzeichnis des Administratornutzers, oder @file{/tmp}, oder das Arbeitsverzeichnis des HTTP-Servers, etc., funktioniert das nicht. @code{guix gc} würde es nicht gestattet, diese Verknüpfungen auszulesen oder zu verfolgen." #. type: enumerate -#: doc/guix.texi:1275 +#: doc/guix.texi:1273 msgid "The daemon’s feature to listen for TCP connections might no longer work. This might require extra rules, because SELinux treats network sockets differently from files." msgstr "Die vom Daemon gebotene Funktionalität, auf TCP-Verbindungen zu lauschen, könnte nicht mehr funktionieren. Dies könnte zusätzliche Regeln brauchen, weil SELinux Netzwerk-Sockets anders behandelt als Dateien." #. type: enumerate -#: doc/guix.texi:1286 +#: doc/guix.texi:1284 msgid "Currently all files with a name matching the regular expression @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the label @code{guix_daemon_exec_t}; this means that @emph{any} file with that name in any profile would be permitted to run in the @code{guix_daemon_t} domain. This is not ideal. An attacker could build a package that provides this executable and convince a user to install and run it, which lifts it into the @code{guix_daemon_t} domain. At that point SELinux could not prevent it from accessing files that are allowed for processes in that domain." msgstr "Derzeit wird allen Dateien mit einem Namen, der zum regulären Ausdruck @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} passt, die Kennzeichnung @code{guix_daemon_exec_t} zugewiesen, wodurch @emph{jede beliebige} Datei mit diesem Namen in irgendeinem Profil gestattet wäre, in der Domäne @code{guix_daemon_t} ausgeführt zu werden. Das ist nicht ideal. Ein Angreifer könnte ein Paket erstellen, dass solch eine ausführbare Datei enthält, und den Nutzer überzeugen, es zu installieren und auszuführen. Dadurch käme es in die Domäne @code{guix_daemon_t}. Ab diesem Punkt könnte SELinux nicht mehr verhindern, dass es auf Dateien zugreift, auf die Prozesse in dieser Domäne zugreifen dürfen." #. type: enumerate -#: doc/guix.texi:1294 +#: doc/guix.texi:1292 msgid "We could generate a much more restrictive policy at installation time, so that only the @emph{exact} file name of the currently installed @code{guix-daemon} executable would be labelled with @code{guix_daemon_exec_t}, instead of using a broad regular expression. The downside is that root would have to install or upgrade the policy at installation time whenever the Guix package that provides the effectively running @code{guix-daemon} executable is upgraded." msgstr "Wir könnten zum Zeitpunkt der Installation eine wesentlich restriktivere Richtlinie generieren, für die nur @emph{genau derselbe} Dateiname des gerade installierten @code{guix-daemon}-Programms als @code{guix_daemon_exec_t} gekennzeichnet würde, statt einen vieles umfassenden regulären Ausdruck zu benutzen. Aber dann müsste der Administratornutzer zum Zeitpunkt der Installation jedes Mal die Richtlinie installieren oder aktualisieren müssen, sobald das Guix-Paket aktualisiert wird, dass das tatsächlich in Benutzung befindliche @code{guix-daemon}-Programm enthält." #. type: section -#: doc/guix.texi:1297 +#: doc/guix.texi:1295 #, no-wrap msgid "Invoking @command{guix-daemon}" msgstr "Aufruf von @command{guix-daemon}" #. type: Plain text -#: doc/guix.texi:1303 +#: doc/guix.texi:1301 msgid "The @command{guix-daemon} program implements all the functionality to access the store. This includes launching build processes, running the garbage collector, querying the availability of a build result, etc. It is normally run as @code{root} like this:" msgstr "Das Programm @command{guix-daemon} implementiert alle Funktionalitäten, um auf den Store zuzugreifen. Dazu gehört das Starten von Erstellungsprozessen, das Ausführen des Müllsammlers, das Abfragen, ob ein Erstellungsergebnis verfügbar ist, etc. Normalerweise wird er so als Administratornutzer (@code{root}) gestartet:" #. type: Plain text -#: doc/guix.texi:1310 +#: doc/guix.texi:1308 msgid "For details on how to set it up, @pxref{Setting Up the Daemon}." msgstr "Details, wie Sie ihn einrichten, finden Sie im Abschnitt @ref{Setting Up the Daemon}." #. type: cindex -#: doc/guix.texi:1312 +#: doc/guix.texi:1310 #, no-wrap msgid "container, build environment" msgstr "Container, Erstellungsumgebung" #. type: cindex -#: doc/guix.texi:1314 doc/guix.texi:2563 doc/guix.texi:3244 doc/guix.texi:9775 +#: doc/guix.texi:1312 doc/guix.texi:2561 doc/guix.texi:3242 doc/guix.texi:9773 #, no-wrap msgid "reproducible builds" msgstr "Reproduzierbare Erstellungen" #. type: Plain text -#: doc/guix.texi:1326 +#: doc/guix.texi:1324 msgid "By default, @command{guix-daemon} launches build processes under different UIDs, taken from the build group specified with @code{--build-users-group}. In addition, each build process is run in a chroot environment that only contains the subset of the store that the build process depends on, as specified by its derivation (@pxref{Programming Interface, derivation}), plus a set of specific system directories. By default, the latter contains @file{/dev} and @file{/dev/pts}. Furthermore, on GNU/Linux, the build environment is a @dfn{container}: in addition to having its own file system tree, it has a separate mount name space, its own PID name space, network name space, etc. This helps achieve reproducible builds (@pxref{Features})." msgstr "Standardmäßig führt @command{guix-daemon} Erstellungsprozesse mit unterschiedlichen UIDs aus, die aus der Erstellungsgruppe stammen, deren Name mit @code{--build-users-group} übergeben wurde. Außerdem läuft jeder Erstellungsprozess in einer chroot-Umgebung, die nur die Teilmenge des Stores enthält, von der der Erstellungsprozess abhängt, entsprechend seiner Ableitung (siehe @ref{Programming Interface, derivation}), und ein paar bestimmte Systemverzeichnisse, darunter standardmäßig auch @file{/dev} und @file{/dev/pts}. Zudem ist die Erstellungsumgebung auf GNU/Linux ein @dfn{Container}: Nicht nur hat er seinen eigenen Dateisystembaum, er hat auch einen separaten Namensraum zum Einhängen von Dateisystemen, seinen eigenen Namensraum für PIDs, für Netzwerke, etc. Dies hilft dabei, reproduzierbare Erstellungen zu garantieren (siehe @ref{Features})." #. type: Plain text -#: doc/guix.texi:1332 +#: doc/guix.texi:1330 msgid "When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory specified by its @code{TMPDIR} environment variable. This directory is shared with the container for the duration of the build, though within the container, the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}." msgstr "Wenn der Daemon im Auftrag des Nutzers eine Erstellung durchführt, erzeugt er ein Erstellungsverzeichnis, entweder in @file{/tmp} oder im Verzeichnis, das durch die Umgebungsvariable @code{TMPDIR} angegeben wurde. Dieses Verzeichnis wird mit dem Container geteilt, solange die Erstellung noch läuft, allerdings trägt es im Container stattdessen immer den Namen „/tmp/guix-build-NAME.drv-0“." #. type: Plain text -#: doc/guix.texi:1336 +#: doc/guix.texi:1334 msgid "The build directory is automatically deleted upon completion, unless the build failed and the client specified @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}})." msgstr "Nach Abschluss der Erstellung wird das Erstellungsverzeichnis automatisch entfernt, außer wenn die Erstellung fehlgeschlagen ist und der Client @option{--keep-failed} angegeben hat (siehe @ref{Invoking guix build, @option{--keep-failed}})." #. type: Plain text -#: doc/guix.texi:1342 +#: doc/guix.texi:1340 msgid "The daemon listens for connections and spawns one sub-process for each session started by a client (one of the @command{guix} sub-commands.) The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients. @xref{Invoking guix processes}, for more information." msgstr "Der Daemon lauscht auf Verbindungen und erstellt jeweils einen Unterprozess für jede von einem Client begonnene Sitzung (d.h.@: von einem der @command{guix}-Unterbefehle). Der Befehl @command{guix processes} zeigt Ihnen eine Übersicht solcher Systemaktivitäten; damit werden Ihnen alle aktiven Sitzungen und Clients gezeigt. Weitere Informationen finden Sie unter @ref{Invoking guix processes}." #. type: Plain text -#: doc/guix.texi:1344 +#: doc/guix.texi:1342 msgid "The following command-line options are supported:" msgstr "Die folgenden Befehlszeilenoptionen werden unterstützt:" #. type: item -#: doc/guix.texi:1346 +#: doc/guix.texi:1344 #, no-wrap msgid "--build-users-group=@var{group}" msgstr "--build-users-group=@var{Gruppe}" #. type: table -#: doc/guix.texi:1349 +#: doc/guix.texi:1347 msgid "Take users from @var{group} to run build processes (@pxref{Setting Up the Daemon, build users})." msgstr "Verwende die Benutzerkonten aus der @var{Gruppe}, um Erstellungsprozesse auszuführen (siehe @ref{Setting Up the Daemon, build users})." #. type: item -#: doc/guix.texi:1350 doc/guix.texi:7725 +#: doc/guix.texi:1348 doc/guix.texi:7723 #, no-wrap msgid "--no-substitutes" msgstr "--no-substitutes" #. type: cindex -#: doc/guix.texi:1351 doc/guix.texi:2575 doc/guix.texi:3105 +#: doc/guix.texi:1349 doc/guix.texi:2573 doc/guix.texi:3103 #, no-wrap msgid "substitutes" msgstr "Substitute" #. type: table -#: doc/guix.texi:1355 doc/guix.texi:7729 +#: doc/guix.texi:1353 doc/guix.texi:7727 msgid "Do not use substitutes for build products. That is, always build things locally instead of allowing downloads of pre-built binaries (@pxref{Substitutes})." msgstr "Benutze keine Substitute für Erstellungsergebnisse. Das heißt, dass alle Objekte lokal erstellt werden müssen, und kein Herunterladen von vorab erstellten Binärdateien erlaubt ist (siehe @ref{Substitutes})." #. type: table -#: doc/guix.texi:1359 +#: doc/guix.texi:1357 msgid "When the daemon runs with @code{--no-substitutes}, clients can still explicitly enable substitution @i{via} the @code{set-build-options} remote procedure call (@pxref{The Store})." msgstr "Wenn der Daemon mit @code{--no-substitutes} ausgeführt wird, können Clients trotzdem Substitute explizit aktivieren über den entfernten Prozeduraufruf @code{set-build-options} (siehe @ref{The Store})." #. type: item -#: doc/guix.texi:1360 doc/guix.texi:7712 doc/guix.texi:9319 doc/guix.texi:9900 -#: doc/guix.texi:10090 +#: doc/guix.texi:1358 doc/guix.texi:7710 doc/guix.texi:9317 doc/guix.texi:9898 +#: doc/guix.texi:10088 #, no-wrap msgid "--substitute-urls=@var{urls}" msgstr "--substitute-urls=@var{URLs}" #. type: anchor{#1} -#: doc/guix.texi:1365 +#: doc/guix.texi:1363 msgid "daemon-substitute-urls" msgstr "daemon-substitute-urls" #. type: table -#: doc/guix.texi:1365 +#: doc/guix.texi:1363 msgid "Consider @var{urls} the default whitespace-separated list of substitute source URLs. When this option is omitted, @indicateurl{https://@value{SUBSTITUTE-SERVER}} is used." msgstr "@var{URLs} als standardmäßige, leerzeichengetrennte Liste der Quell-URLs für Substitute benutzen. Wenn diese Befehlszeilenoption @emph{nicht} angegeben wird, wird @indicateurl{https://@value{SUBSTITUTE-SERVER}} verwendet." #. type: table -#: doc/guix.texi:1368 +#: doc/guix.texi:1366 msgid "This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature (@pxref{Substitutes})." msgstr "Das hat zur Folge, dass Substitute von den @var{URLs} heruntergeladen werden können, solange sie mit einer Signatur versehen sind, der vertraut wird (siehe @ref{Substitutes})." #. type: item -#: doc/guix.texi:1370 doc/guix.texi:7750 +#: doc/guix.texi:1368 doc/guix.texi:7748 #, no-wrap msgid "--no-build-hook" msgstr "--no-build-hook" #. type: table -#: doc/guix.texi:1372 +#: doc/guix.texi:1370 msgid "Do not use the @dfn{build hook}." msgstr "Den @dfn{Build-Hook} nicht benutzen." #. type: table -#: doc/guix.texi:1376 +#: doc/guix.texi:1374 msgid "The build hook is a helper program that the daemon can start and to which it submits build requests. This mechanism is used to offload builds to other machines (@pxref{Daemon Offload Setup})." msgstr "„Build-Hook“ ist der Name eines Hilfsprogramms, das der Daemon starten kann und an das er Erstellungsanfragen übermittelt. Durch diesen Mechanismus können Erstellungen an andere Maschinen ausgelagert werden (siehe @ref{Daemon Offload Setup})." #. type: item -#: doc/guix.texi:1377 +#: doc/guix.texi:1375 #, no-wrap msgid "--cache-failures" msgstr "--cache-failures" #. type: table -#: doc/guix.texi:1379 +#: doc/guix.texi:1377 msgid "Cache build failures. By default, only successful builds are cached." msgstr "Fehler bei der Erstellung zwischenspeichern. Normalerweise werden nur erfolgreiche Erstellungen gespeichert." #. type: table -#: doc/guix.texi:1384 +#: doc/guix.texi:1382 msgid "When this option is used, @command{guix gc --list-failures} can be used to query the set of store items marked as failed; @command{guix gc --clear-failures} removes store items from the set of cached failures. @xref{Invoking guix gc}." msgstr "Wenn diese Befehlszeilenoption benutzt wird, kann @command{guix gc --list-failures} benutzt werden, um die Menge an Store-Objekten abzufragen, die als Fehlschläge markiert sind; @command{guix gc --clear-failures} entfernt Store-Objekte aus der Menge zwischengespeicherter Fehlschläge. Siehe @ref{Invoking guix gc}." #. type: item -#: doc/guix.texi:1385 doc/guix.texi:7779 +#: doc/guix.texi:1383 doc/guix.texi:7777 #, no-wrap msgid "--cores=@var{n}" msgstr "--cores=@var{n}" #. type: itemx -#: doc/guix.texi:1386 doc/guix.texi:7780 +#: doc/guix.texi:1384 doc/guix.texi:7778 #, no-wrap msgid "-c @var{n}" msgstr "-c @var{n}" #. type: table -#: doc/guix.texi:1389 +#: doc/guix.texi:1387 msgid "Use @var{n} CPU cores to build each derivation; @code{0} means as many as available." msgstr "@var{n} CPU-Kerne zum Erstellen jeder Ableitung benutzen; @code{0} heißt, so viele wie verfügbar sind." #. type: table -#: doc/guix.texi:1393 +#: doc/guix.texi:1391 msgid "The default value is @code{0}, but it may be overridden by clients, such as the @code{--cores} option of @command{guix build} (@pxref{Invoking guix build})." msgstr "Der Vorgabewert ist @code{0}, jeder Client kann jedoch eine abweichende Anzahl vorgeben, zum Beispiel mit der Befehlszeilenoption @code{--cores} von @command{guix build} (siehe @ref{Invoking guix build})." #. type: table -#: doc/guix.texi:1397 +#: doc/guix.texi:1395 msgid "The effect is to define the @code{NIX_BUILD_CORES} environment variable in the build process, which can then use it to exploit internal parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}." msgstr "Dadurch wird die Umgebungsvariable @code{NIX_BUILD_CORES} im Erstellungsprozess definiert, welcher sie benutzen kann, um intern parallele Ausführungen zuzulassen — zum Beispiel durch Nutzung von @code{make -j$NIX_BUILD_CORES}." #. type: item -#: doc/guix.texi:1398 doc/guix.texi:7784 +#: doc/guix.texi:1396 doc/guix.texi:7782 #, no-wrap msgid "--max-jobs=@var{n}" msgstr "--max-jobs=@var{n}" #. type: itemx -#: doc/guix.texi:1399 doc/guix.texi:7785 +#: doc/guix.texi:1397 doc/guix.texi:7783 #, no-wrap msgid "-M @var{n}" msgstr "-M @var{n}" #. type: table -#: doc/guix.texi:1404 +#: doc/guix.texi:1402 msgid "Allow at most @var{n} build jobs in parallel. The default value is @code{1}. Setting it to @code{0} means that no builds will be performed locally; instead, the daemon will offload builds (@pxref{Daemon Offload Setup}), or simply fail." msgstr "Höchstenss @var{n} Erstellungsaufträge parallel bearbeiten. Der Vorgabewert liegt bei @code{1}. Wird er auf @code{0} gesetzt, werden keine Erstellungen lokal durchgeführt, stattdessen lagert der Daemon sie nur aus (siehe @ref{Daemon Offload Setup}) oder sie schlagen einfach fehl." #. type: item -#: doc/guix.texi:1405 doc/guix.texi:7755 +#: doc/guix.texi:1403 doc/guix.texi:7753 #, no-wrap msgid "--max-silent-time=@var{seconds}" msgstr "--max-silent-time=@var{Sekunden}" #. type: table -#: doc/guix.texi:1408 doc/guix.texi:7758 +#: doc/guix.texi:1406 doc/guix.texi:7756 msgid "When the build or substitution process remains silent for more than @var{seconds}, terminate it and report a build failure." msgstr "Wenn der Erstellungs- oder Substitutionsprozess länger als @var{Sekunden}-lang keine Ausgabe erzeugt, wird er abgebrochen und ein Fehler beim Erstellen gemeldet." #. type: table -#: doc/guix.texi:1410 doc/guix.texi:1419 +#: doc/guix.texi:1408 doc/guix.texi:1417 msgid "The default value is @code{0}, which disables the timeout." msgstr "Der Vorgabewert ist @code{0}, was bedeutet, dass es keine Zeitbeschränkung gibt." #. type: table -#: doc/guix.texi:1413 +#: doc/guix.texi:1411 msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--max-silent-time}})." msgstr "Clients können einen anderen Wert als den hier angegebenen verwenden lassen (siehe @ref{Common Build Options, @code{--max-silent-time}})." #. type: item -#: doc/guix.texi:1414 doc/guix.texi:7762 +#: doc/guix.texi:1412 doc/guix.texi:7760 #, no-wrap msgid "--timeout=@var{seconds}" msgstr "--timeout=@var{Sekunden}" #. type: table -#: doc/guix.texi:1417 doc/guix.texi:7765 +#: doc/guix.texi:1415 doc/guix.texi:7763 msgid "Likewise, when the build or substitution process lasts for more than @var{seconds}, terminate it and report a build failure." msgstr "Entsprechend wird hier der Erstellungs- oder Substitutionsprozess abgebrochen und als Fehlschlag gemeldet, wenn er mehr als @var{Sekunden}-lang dauert." #. type: table -#: doc/guix.texi:1422 +#: doc/guix.texi:1420 msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--timeout}})." msgstr "Clients können einen anderen Wert verwenden lassen (siehe @ref{Common Build Options, @code{--timeout}})." #. type: item -#: doc/guix.texi:1423 +#: doc/guix.texi:1421 #, no-wrap msgid "--rounds=@var{N}" msgstr "--rounds=@var{N}" #. type: table -#: doc/guix.texi:1428 +#: doc/guix.texi:1426 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical. Note that this setting can be overridden by clients such as @command{guix build} (@pxref{Invoking guix build})." msgstr "Jede Ableitung @var{n}-mal hintereinander erstellen und einen Fehler melden, wenn nacheinander ausgewertete Erstellungsergebnisse nicht Bit für Bit identisch sind. Beachten Sie, dass Clients wie @command{guix build} einen anderen Wert verwenden lassen können (siehe @ref{Invoking guix build})." #. type: table -#: doc/guix.texi:1432 doc/guix.texi:8124 +#: doc/guix.texi:1430 doc/guix.texi:8122 msgid "When used in conjunction with @option{--keep-failed}, the differing output is kept in the store, under @file{/gnu/store/@dots{}-check}. This makes it easy to look for differences between the two results." msgstr "Wenn dies zusammen mit @option{--keep-failed} benutzt wird, bleiben die sich unterscheidenden Ausgaben im Store unter dem Namen @file{/gnu/store/…-check}. Dadurch können Unterschiede zwischen den beiden Ergebnissen leicht erkannt werden." #. type: item -#: doc/guix.texi:1433 +#: doc/guix.texi:1431 #, no-wrap msgid "--debug" msgstr "--debug" #. type: table -#: doc/guix.texi:1435 +#: doc/guix.texi:1433 msgid "Produce debugging output." msgstr "Informationen zur Fehlersuche ausgeben." #. type: table -#: doc/guix.texi:1439 +#: doc/guix.texi:1437 msgid "This is useful to debug daemon start-up issues, but then it may be overridden by clients, for example the @code{--verbosity} option of @command{guix build} (@pxref{Invoking guix build})." msgstr "Dies ist nützlich, um Probleme beim Starten des Daemons nachzuvollziehen; Clients könn aber auch ein abweichenden Wert verwenden lassen, zum Beispiel mit der Befehlszeilenoption @code{--verbosity} von @command{guix build} (siehe @ref{Invoking guix build})." #. type: item -#: doc/guix.texi:1440 +#: doc/guix.texi:1438 #, no-wrap msgid "--chroot-directory=@var{dir}" msgstr "--chroot-directory=@var{Verzeichnis}" #. type: table -#: doc/guix.texi:1442 +#: doc/guix.texi:1440 msgid "Add @var{dir} to the build chroot." msgstr "Füge das @var{Verzeichnis} zum chroot von Erstellungen hinzu." #. type: table -#: doc/guix.texi:1448 +#: doc/guix.texi:1446 msgid "Doing this may change the result of build processes---for instance if they use optional dependencies found in @var{dir} when it is available, and not otherwise. For that reason, it is not recommended to do so. Instead, make sure that each derivation declares all the inputs that it needs." msgstr "Dadurch kann sich das Ergebnis von Erstellungsprozessen ändern — zum Beispiel, wenn diese optionale Abhängigkeiten aus dem @var{Verzeichnis} verwenden, wenn sie verfügbar sind, und nicht, wenn es fehlt. Deshalb ist es nicht empfohlen, dass Sie diese Befehlszeilenoption verwenden, besser sollten Sie dafür sorgen, dass jede Ableitung alle von ihr benötigten Eingabgen deklariert." #. type: item -#: doc/guix.texi:1449 +#: doc/guix.texi:1447 #, no-wrap msgid "--disable-chroot" msgstr "--disable-chroot" #. type: table -#: doc/guix.texi:1451 +#: doc/guix.texi:1449 msgid "Disable chroot builds." msgstr "Erstellungen ohne chroot durchführen." #. type: table -#: doc/guix.texi:1456 +#: doc/guix.texi:1454 msgid "Using this option is not recommended since, again, it would allow build processes to gain access to undeclared dependencies. It is necessary, though, when @command{guix-daemon} is running under an unprivileged user account." msgstr "Diese Befehlszeilenoption zu benutzen, wird nicht empfohlen, denn auch dadurch bekämen Erstellungsprozesse Zugriff auf nicht deklarierte Abhängigkeiten. Sie ist allerdings unvermeidlich, wenn @command{guix-daemon} auf einem Benutzerkonto ohne ausreichende Berechtigungen ausgeführt wird." #. type: item -#: doc/guix.texi:1457 +#: doc/guix.texi:1455 #, no-wrap msgid "--log-compression=@var{type}" msgstr "--log-compression=@var{Typ}" #. type: table -#: doc/guix.texi:1460 +#: doc/guix.texi:1458 msgid "Compress build logs according to @var{type}, one of @code{gzip}, @code{bzip2}, or @code{none}." msgstr "Erstellungsprotokolle werden entsprechend dem @var{Typ} komprimiert, der entweder @code{gzip}, @code{bzip2} oder @code{none} (für keine Kompression) sein muss." #. type: table -#: doc/guix.texi:1464 +#: doc/guix.texi:1462 msgid "Unless @code{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}. To save space, the daemon automatically compresses them with bzip2 by default." msgstr "Sofern nicht @code{--lose-logs} angegeben wurde, werden alle Erstellungsprotokolle in der @var{localstatedir} gespeichert. Um Platz zu sparen, komprimiert sie der Daemon standardmäßig automatisch mit bzip2." #. type: item -#: doc/guix.texi:1465 +#: doc/guix.texi:1463 #, no-wrap msgid "--disable-deduplication" msgstr "--disable-deduplication" #. type: cindex -#: doc/guix.texi:1466 doc/guix.texi:3578 +#: doc/guix.texi:1464 doc/guix.texi:3576 #, no-wrap msgid "deduplication" msgstr "Deduplizieren" #. type: table -#: doc/guix.texi:1468 +#: doc/guix.texi:1466 msgid "Disable automatic file ``deduplication'' in the store." msgstr "Automatische Dateien-„Deduplizierung“ im Store ausschalten." #. type: table -#: doc/guix.texi:1475 +#: doc/guix.texi:1473 msgid "By default, files added to the store are automatically ``deduplicated'': if a newly added file is identical to another one found in the store, the daemon makes the new file a hard link to the other file. This can noticeably reduce disk usage, at the expense of slightly increased input/output load at the end of a build process. This option disables this optimization." msgstr "Standardmäßig werden zum Store hinzugefügte Objekte automatisch „dedupliziert“: Wenn eine neue Datei mit einer anderen im Store übereinstimmt, wird die neue Datei stattdessen als harte Verknüpfung auf die andere Datei angelegt. Dies reduziert den Speicherverbrauch auf der Platte merklich, jedoch steigt andererseits die Auslastung bei der Ein-/Ausgabe im Erstellungsprozess geringfügig. Durch diese Option wird keine solche Optimierung durchgeführt." #. type: item -#: doc/guix.texi:1476 +#: doc/guix.texi:1474 #, no-wrap msgid "--gc-keep-outputs[=yes|no]" msgstr "--gc-keep-outputs[=yes|no]" #. type: table -#: doc/guix.texi:1479 +#: doc/guix.texi:1477 msgid "Tell whether the garbage collector (GC) must keep outputs of live derivations." msgstr "Gibt an, ob der Müllsammler (Garbage Collector, GC) die Ausgaben lebendiger Ableitungen behalten muss („yes“) oder nicht („no“)." #. type: cindex -#: doc/guix.texi:1480 doc/guix.texi:3395 +#: doc/guix.texi:1478 doc/guix.texi:3393 #, no-wrap msgid "GC roots" msgstr "GC-Wurzeln" #. type: cindex -#: doc/guix.texi:1481 doc/guix.texi:3396 +#: doc/guix.texi:1479 doc/guix.texi:3394 #, no-wrap msgid "garbage collector roots" msgstr "Müllsammlerwurzeln" #. type: table -#: doc/guix.texi:1486 +#: doc/guix.texi:1484 msgid "When set to ``yes'', the GC will keep the outputs of any live derivation available in the store---the @code{.drv} files. The default is ``no'', meaning that derivation outputs are kept only if they are reachable from a GC root. @xref{Invoking guix gc}, for more on GC roots." msgstr "Für „yes“ behält der Müllsammler die Ausgaben aller lebendigen Ableitungen im Store — die @code{.drv}-Dateien. Der Vorgabewert ist aber „no“, so dass Ableitungsausgaben nur vorgehalten werden, wenn sie von einer Müllsammlerwurzel aus erreichbar sind. Siehe den Abschnitt @ref{Invoking guix gc} für weitere Informationen zu Müllsammlerwurzeln." #. type: item -#: doc/guix.texi:1487 +#: doc/guix.texi:1485 #, no-wrap msgid "--gc-keep-derivations[=yes|no]" msgstr "--gc-keep-derivations[=yes|no]" #. type: table -#: doc/guix.texi:1490 +#: doc/guix.texi:1488 msgid "Tell whether the garbage collector (GC) must keep derivations corresponding to live outputs." msgstr "Gibt an, ob der Müllsammler (GC) Ableitungen behalten muss („yes“), wenn sie lebendige Ausgaben haben, oder nicht („no“)." #. type: table -#: doc/guix.texi:1495 +#: doc/guix.texi:1493 msgid "When set to ``yes'', as is the case by default, the GC keeps derivations---i.e., @code{.drv} files---as long as at least one of their outputs is live. This allows users to keep track of the origins of items in their store. Setting it to ``no'' saves a bit of disk space." msgstr "Für „yes“, den Vorgabewert, behält der Müllsammler Ableitungen — z.B.@: @code{.drv}-Dateien —, solange zumindest eine ihrer Ausgaben lebendig ist. Dadurch können Nutzer den Ursprung der Dateien in ihrem Store nachvollziehen. Setzt man den Wert auf „no“, wird ein bisschen weniger Speicher auf der Platte verbraucht." #. type: table -#: doc/guix.texi:1503 +#: doc/guix.texi:1501 msgid "In this way, setting @code{--gc-keep-derivations} to ``yes'' causes liveness to flow from outputs to derivations, and setting @code{--gc-keep-outputs} to ``yes'' causes liveness to flow from derivations to outputs. When both are set to ``yes'', the effect is to keep all the build prerequisites (the sources, compiler, libraries, and other build-time tools) of live objects in the store, regardless of whether these prerequisites are reachable from a GC root. This is convenient for developers since it saves rebuilds or downloads." msgstr "Auf diese Weise überträgt sich, wenn @code{--gc-keep-derivations} auf „yes“ steht, die Lebendigkeit von Ausgaben auf Ableitungen, und wenn @code{--gc-keep-outputs} auf „yes“ steht, die Lebendigkeit von Ableitungen auf Ausgaben. Stehen beide auf „yes“, bleiben so alle Erstellungsvoraussetzungen wie Quelldateien, Compiler, Bibliotheken und andere Erstellungswerkzeuge lebendiger Objekte im Store erhalten, ob sie von einer Müllsammlerwurzel aus erreichbar sind oder nicht. Entwickler können sich so erneute Erstellungen oder erneutes Herunterladen sparen." #. type: item -#: doc/guix.texi:1504 +#: doc/guix.texi:1502 #, no-wrap msgid "--impersonate-linux-2.6" msgstr "--impersonate-linux-2.6" #. type: table -#: doc/guix.texi:1507 +#: doc/guix.texi:1505 msgid "On Linux-based systems, impersonate Linux 2.6. This means that the kernel's @code{uname} system call will report 2.6 as the release number." msgstr "Auf Linux-basierten Systemen wird hiermit vorgetäuscht, dass es sich um Linux 2.6 handeln würde, indem der Kernel für einen @code{uname}-Systemaufruf als Version der Veröffentlichung mit 2.6 antwortet." #. type: table -#: doc/guix.texi:1510 +#: doc/guix.texi:1508 msgid "This might be helpful to build programs that (usually wrongfully) depend on the kernel version number." msgstr "Dies kann hilfreich sein, um Programme zu erstellen, die (normalerweise zu Unrecht) von der Kernel-Versionsnummer abhängen." #. type: item -#: doc/guix.texi:1511 +#: doc/guix.texi:1509 #, no-wrap msgid "--lose-logs" msgstr "--lose-logs" #. type: table -#: doc/guix.texi:1514 +#: doc/guix.texi:1512 msgid "Do not keep build logs. By default they are kept under @code{@var{localstatedir}/guix/log}." msgstr "Keine Protokolle der Erstellungen vorhalten. Normalerweise würden solche in @code{@var{localstatedir}/guix/log} gespeichert." #. type: item -#: doc/guix.texi:1515 doc/guix.texi:3724 doc/guix.texi:4592 doc/guix.texi:4885 -#: doc/guix.texi:8068 doc/guix.texi:9346 doc/guix.texi:9545 doc/guix.texi:10095 -#: doc/guix.texi:23938 doc/guix.texi:24564 +#: doc/guix.texi:1513 doc/guix.texi:3722 doc/guix.texi:4590 doc/guix.texi:4883 +#: doc/guix.texi:8066 doc/guix.texi:9344 doc/guix.texi:9543 +#: doc/guix.texi:10093 doc/guix.texi:23935 doc/guix.texi:24555 #, no-wrap msgid "--system=@var{system}" msgstr "--system=@var{System}" #. type: table -#: doc/guix.texi:1519 +#: doc/guix.texi:1517 msgid "Assume @var{system} as the current system type. By default it is the architecture/kernel pair found at configure time, such as @code{x86_64-linux}." msgstr "Verwende @var{System} als aktuellen Systemtyp. Standardmäßig ist dies das Paar aus Befehlssatz und Kernel, welches beim Aufruf von @code{configure} erkannt wurde, wie zum Beispiel @code{x86_64-linux}." #. type: item -#: doc/guix.texi:1520 doc/guix.texi:7570 +#: doc/guix.texi:1518 doc/guix.texi:7568 #, no-wrap msgid "--listen=@var{endpoint}" msgstr "--listen=@var{Endpunkt}" #. type: table -#: doc/guix.texi:1525 +#: doc/guix.texi:1523 msgid "Listen for connections on @var{endpoint}. @var{endpoint} is interpreted as the file name of a Unix-domain socket if it starts with @code{/} (slash sign). Otherwise, @var{endpoint} is interpreted as a host name or host name and port to listen to. Here are a few examples:" msgstr "Lausche am @var{Endpunkt} auf Verbindungen. Dabei wird der @var{Endpunkt} als Dateiname eines Unix-Sockets verstanden, wenn er mit einem @code{/} (Schrägstrich) beginnt. Andernfalls wird der @var{Endpunkt} als Hostname (d.h.@: Rechnername) oder als Hostname-Port-Paar verstanden, auf dem gelauscht wird. Hier sind ein paar Beispiele:" #. type: item -#: doc/guix.texi:1527 +#: doc/guix.texi:1525 #, no-wrap msgid "--listen=/gnu/var/daemon" msgstr "--listen=/gnu/var/daemon" #. type: table -#: doc/guix.texi:1530 +#: doc/guix.texi:1528 msgid "Listen for connections on the @file{/gnu/var/daemon} Unix-domain socket, creating it if needed." msgstr "Lausche auf Verbindungen am Unix-Socket @file{/gnu/var/daemon}, falls nötig wird er dazu erstellt." #. type: item -#: doc/guix.texi:1531 +#: doc/guix.texi:1529 #, no-wrap msgid "--listen=localhost" msgstr "--listen=localhost" #. type: cindex -#: doc/guix.texi:1532 doc/guix.texi:6351 +#: doc/guix.texi:1530 doc/guix.texi:6349 #, no-wrap msgid "daemon, remote access" msgstr "Daemon, Fernzugriff" #. type: cindex -#: doc/guix.texi:1533 doc/guix.texi:6352 +#: doc/guix.texi:1531 doc/guix.texi:6350 #, no-wrap msgid "remote access to the daemon" msgstr "Fernzugriff auf den Daemon" #. type: cindex -#: doc/guix.texi:1534 doc/guix.texi:6353 +#: doc/guix.texi:1532 doc/guix.texi:6351 #, no-wrap msgid "daemon, cluster setup" msgstr "Daemon, Einrichten auf Clustern" #. type: cindex -#: doc/guix.texi:1535 doc/guix.texi:6354 +#: doc/guix.texi:1533 doc/guix.texi:6352 #, no-wrap msgid "clusters, daemon setup" msgstr "Cluster, Einrichtung des Daemons" #. type: table -#: doc/guix.texi:1538 +#: doc/guix.texi:1536 msgid "Listen for TCP connections on the network interface corresponding to @code{localhost}, on port 44146." msgstr "Lausche auf TCP-Verbindungen an der Netzwerkschnittstelle, die @code{localhost} entspricht, auf Port 44146." #. type: item -#: doc/guix.texi:1539 +#: doc/guix.texi:1537 #, no-wrap msgid "--listen=128.0.0.42:1234" msgstr "--listen=128.0.0.42:1234" #. type: table -#: doc/guix.texi:1542 +#: doc/guix.texi:1540 msgid "Listen for TCP connections on the network interface corresponding to @code{128.0.0.42}, on port 1234." msgstr "Lausche auf TCP-Verbindungen an der Netzwerkschnittstelle, die @code{128.0.0.42} entspricht, auf Port 1234." #. type: table -#: doc/guix.texi:1549 +#: doc/guix.texi:1547 msgid "This option can be repeated multiple times, in which case @command{guix-daemon} accepts connections on all the specified endpoints. Users can tell client commands what endpoint to connect to by setting the @code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})." msgstr "Diese Befehlszeilenoption kann mehrmals wiederholt werden. In diesem Fall akzeptiert @command{guix-daemon} Verbindungen auf allen angegebenen Endpunkten. Benutzer können bei Client-Befehlen angeben, mit welchem Endpunkt sie sich verbinden möchten, indem sie die Umgebungsvariable @code{GUIX_DAEMON_SOCKET} festlegen (siehe @ref{The Store, @code{GUIX_DAEMON_SOCKET}})." #. type: quotation -#: doc/guix.texi:1556 +#: doc/guix.texi:1554 msgid "The daemon protocol is @emph{unauthenticated and unencrypted}. Using @code{--listen=@var{host}} is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon. In other cases where remote access to the daemon is needed, we recommend using Unix-domain sockets along with SSH." msgstr "Das Daemon-Protokoll ist @emph{weder authentifiziert noch verschlüsselt}. Die Benutzung von @code{--listen=@var{Host}} eignet sich für lokale Netzwerke, wie z.B.@: in Rechen-Clustern, wo sich nur solche Knoten mit dem Daemon verbinden, denen man vertraut. In Situationen, wo ein Fernzugriff auf den Daemon durchgeführt wird, empfehlen wir, über Unix-Sockets in Verbindung mit SSH zuzugreifen." #. type: table -#: doc/guix.texi:1561 +#: doc/guix.texi:1559 msgid "When @code{--listen} is omitted, @command{guix-daemon} listens for connections on the Unix-domain socket located at @file{@var{localstatedir}/guix/daemon-socket/socket}." msgstr "Wird @code{--listen} nicht angegeben, lauscht @command{guix-daemon} auf Verbindungen auf dem Unix-Socket, der sich unter @file{@var{localstatedir}/guix/daemon-socket/socket} befindet." #. type: Plain text -#: doc/guix.texi:1571 +#: doc/guix.texi:1569 msgid "When using Guix on top of GNU/Linux distribution other than Guix System---a so-called @dfn{foreign distro}---a few additional steps are needed to get everything in place. Here are some of them." msgstr "Läuft Guix aufgesetzt auf einer GNU/Linux-Distribution außer Guix System — einer sogenannten @dfn{Fremddistribution} —, so sind ein paar zusätzliche Schritte bei der Einrichtung nötig. Hier finden Sie manche davon." #. type: anchor{#1} -#: doc/guix.texi:1575 +#: doc/guix.texi:1573 msgid "locales-and-locpath" msgstr "locales-and-locpath" #. type: cindex -#: doc/guix.texi:1575 +#: doc/guix.texi:1573 #, no-wrap msgid "locales, when not on Guix System" msgstr "Locales, nicht auf Guix System" #. type: vindex -#: doc/guix.texi:1576 doc/guix.texi:11299 +#: doc/guix.texi:1574 doc/guix.texi:11297 #, no-wrap msgid "LOCPATH" msgstr "LOCPATH" #. type: vindex -#: doc/guix.texi:1577 +#: doc/guix.texi:1575 #, no-wrap msgid "GUIX_LOCPATH" msgstr "GUIX_LOCPATH" #. type: Plain text -#: doc/guix.texi:1582 +#: doc/guix.texi:1580 msgid "Packages installed @i{via} Guix will not use the locale data of the host system. Instead, you must first install one of the locale packages available with Guix and then define the @code{GUIX_LOCPATH} environment variable:" msgstr "Über Guix installierte Pakete benutzen nicht die Daten zu Regions- und Spracheinstellungen (Locales) des Wirtssystems. Stattdessen müssen Sie erst eines der Locale-Pakete installieren, die für Guix verfügbar sind, und dann den Wert Ihrer Umgebungsvariablen @code{GUIX_LOCPATH} passend festlegen:" #. type: example -#: doc/guix.texi:1586 +#: doc/guix.texi:1584 #, no-wrap msgid "" "$ guix install glibc-locales\n" @@ -5028,363 +5039,363 @@ msgstr "" "$ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale\n" #. type: Plain text -#: doc/guix.texi:1592 +#: doc/guix.texi:1590 msgid "Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around 110@tie{}MiB. Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales." msgstr "Beachten Sie, dass das Paket @code{glibc-locales} Daten für alle von GNU@tie{}libc unterstützten Locales enthält und deswegen um die 110@tie{}MiB wiegt. Alternativ gibt es auch @code{glibc-utf8-locales}, was kleiner, aber auf ein paar UTF-8-Locales beschränkt ist." #. type: Plain text -#: doc/guix.texi:1596 +#: doc/guix.texi:1594 msgid "The @code{GUIX_LOCPATH} variable plays a role similar to @code{LOCPATH} (@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}). There are two important differences though:" msgstr "Die Variable @code{GUIX_LOCPATH} spielt eine ähnliche Rolle wie @code{LOCPATH} (siehe @ref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}). Es gibt jedoch zwei wichtige Unterschiede:" #. type: enumerate -#: doc/guix.texi:1603 +#: doc/guix.texi:1601 msgid "@code{GUIX_LOCPATH} is honored only by the libc in Guix, and not by the libc provided by foreign distros. Thus, using @code{GUIX_LOCPATH} allows you to make sure the programs of the foreign distro will not end up loading incompatible locale data." msgstr "@code{GUIX_LOCPATH} wird nur von der libc in Guix beachtet und nicht der von Fremddistributionen bereitgestellten libc. Mit @code{GUIX_LOCPATH} können Sie daher sicherstellen, dass die Programme der Fremddistribution keine inkompatiblen Locale-Daten von Guix laden." #. type: enumerate -#: doc/guix.texi:1610 +#: doc/guix.texi:1608 msgid "libc suffixes each entry of @code{GUIX_LOCPATH} with @code{/X.Y}, where @code{X.Y} is the libc version---e.g., @code{2.22}. This means that, should your Guix profile contain a mixture of programs linked against different libc version, each libc version will only try to load locale data in the right format." msgstr "libc hängt an jeden @code{GUIX_LOCPATH}-Eintrag @code{/X.Y} an, wobei @code{X.Y} die Version von libc ist — z.B.@: @code{2.22}. Sollte Ihr Guix-Profil eine Mischung aus Programmen enthalten, die an verschiedene libc-Versionen gebunden sind, wird jede nur die Locale-Daten im richtigen Format zu laden versuchen." #. type: Plain text -#: doc/guix.texi:1614 +#: doc/guix.texi:1612 msgid "This is important because the locale data format used by different libc versions may be incompatible." msgstr "Das ist wichtig, weil das Locale-Datenformat verschiedener libc-Versionen inkompatibel sein könnte." #. type: cindex -#: doc/guix.texi:1617 +#: doc/guix.texi:1615 #, no-wrap msgid "name service switch, glibc" msgstr "Name Service Switch, glibc" #. type: cindex -#: doc/guix.texi:1618 +#: doc/guix.texi:1616 #, no-wrap msgid "NSS (name service switch), glibc" msgstr "NSS (Name Service Switch), glibc" #. type: cindex -#: doc/guix.texi:1619 +#: doc/guix.texi:1617 #, no-wrap msgid "nscd (name service caching daemon)" msgstr "nscd (Name Service Caching Daemon)" #. type: cindex -#: doc/guix.texi:1620 +#: doc/guix.texi:1618 #, no-wrap msgid "name service caching daemon (nscd)" msgstr "Name Service Caching Daemon (nscd)" #. type: Plain text -#: doc/guix.texi:1627 +#: doc/guix.texi:1625 msgid "When using Guix on a foreign distro, we @emph{strongly recommend} that the system run the GNU C library's @dfn{name service cache daemon}, @command{nscd}, which should be listening on the @file{/var/run/nscd/socket} socket. Failing to do that, applications installed with Guix may fail to look up host names or user accounts, or may even crash. The next paragraphs explain why." msgstr "Wenn Sie Guix auf einer Fremddistribution verwenden, @emph{empfehlen wir stärkstens}, dass Sie den @dfn{Name Service Cache Daemon} der GNU-C-Bibliothek, @command{nscd}, laufen lassen, welcher auf dem Socket @file{/var/run/nscd/socket} lauschen sollte. Wenn Sie das nicht tun, könnten mit Guix installierte Anwendungen Probleme beim Auflösen von Hostnamen (d.h.@: Rechnernamen) oder Benutzerkonten haben, oder sogar abstürzen. Die nächsten Absätze erklären warum." #. type: file{#1} -#: doc/guix.texi:1628 +#: doc/guix.texi:1626 #, no-wrap msgid "nsswitch.conf" msgstr "nsswitch.conf" #. type: Plain text -#: doc/guix.texi:1633 +#: doc/guix.texi:1631 msgid "The GNU C library implements a @dfn{name service switch} (NSS), which is an extensible mechanism for ``name lookups'' in general: host name resolution, user accounts, and more (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." msgstr "Die GNU-C-Bibliothek implementiert einen @dfn{Name Service Switch} (NSS), welcher einen erweiterbaren Mechanismus zur allgemeinen „Namensauflösung“ darstellt: Hostnamensauflösung, Benutzerkonten und weiteres (siehe @ref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." #. type: cindex -#: doc/guix.texi:1634 +#: doc/guix.texi:1632 #, no-wrap msgid "Network information service (NIS)" msgstr "Network Information Service (NIS)" #. type: cindex -#: doc/guix.texi:1635 +#: doc/guix.texi:1633 #, no-wrap msgid "NIS (Network information service)" msgstr "NIS (Network Information Service)" #. type: Plain text -#: doc/guix.texi:1644 +#: doc/guix.texi:1642 msgid "Being extensible, the NSS supports @dfn{plugins}, which provide new name lookup implementations: for example, the @code{nss-mdns} plugin allow resolution of @code{.local} host names, the @code{nis} plugin allows user account lookup using the Network information service (NIS), and so on. These extra ``lookup services'' are configured system-wide in @file{/etc/nsswitch.conf}, and all the programs running on the system honor those settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})." msgstr "Für die Erweiterbarkeit unterstützt der NSS @dfn{Plugins}, welche neue Implementierungen zur Namensauflösung bieten: Zum Beispiel ermöglicht das Plugin @code{nss-mdns} die Namensauflösung für @code{.local}-Hostnamen, das Plugin @code{nis} gestattet die Auflösung von Benutzerkonten über den Network Information Service (NIS) und so weiter. Diese zusätzlichen „Auflösungsdienste“ werden systemweit konfiguriert in @file{/etc/nsswitch.conf} und alle auf dem System laufenden Programme halten sich an diese Einstellungen (siehe @ref{NSS Configuration File,,, libc, The GNU C Reference Manual})." #. type: Plain text -#: doc/guix.texi:1654 +#: doc/guix.texi:1652 msgid "When they perform a name lookup---for instance by calling the @code{getaddrinfo} function in C---applications first try to connect to the nscd; on success, nscd performs name lookups on their behalf. If the nscd is not running, then they perform the name lookup by themselves, by loading the name lookup services into their own address space and running it. These name lookup services---the @file{libnss_*.so} files---are @code{dlopen}'d, but they may come from the host system's C library, rather than from the C library the application is linked against (the C library coming from Guix)." msgstr "Wenn sie eine Namensauflösung durchführen — zum Beispiel, indem sie die @code{getaddrinfo}-Funktion in C aufrufen — versuchen die Anwendungen als Erstes, sich mit dem nscd zu verbinden; ist dies erfolgreich, führt nscd für sie die weiteren Namensauflösungen durch. Falls nscd nicht läuft, führen sie selbst die Namensauflösungen durch, indem sie die Namensauflösungsdienste in ihren eigenen Adressraum laden und ausführen. Diese Namensauflösungsdienste — die @file{libnss_*.so}-Dateien — werden mit @code{dlopen} geladen, aber sie kommen von der C-Bibliothek des Wirtssystems und nicht von der C-Bibliothek, mit der die Anwendung gebunden wurde (also der C-Bibliothek von Guix)." #. type: Plain text -#: doc/guix.texi:1659 +#: doc/guix.texi:1657 msgid "And this is where the problem is: if your application is linked against Guix's C library (say, glibc 2.24) and tries to load NSS plugins from another C library (say, @code{libnss_mdns.so} for glibc 2.22), it will likely crash or have its name lookups fail unexpectedly." msgstr "Und hier kommt es zum Problem: Wenn die Anwendung mit der C-Bibliothek von Guix (etwa glibc 2.24) gebunden wurde und die NSS-Plugins von einer anderen C-Bibliothek (etwa @code{libnss_mdns.so} für glibc 2.22) zu laden versucht, wird sie vermutlich abstürzen oder die Namensauflösungen werden unerwartet fehlschlagen." #. type: Plain text -#: doc/guix.texi:1664 +#: doc/guix.texi:1662 msgid "Running @command{nscd} on the system, among other advantages, eliminates this binary incompatibility problem because those @code{libnss_*.so} files are loaded in the @command{nscd} process, not in applications themselves." msgstr "Durch das Ausführen von @command{nscd} auf dem System wird, neben anderen Vorteilen, dieses Problem der binären Inkompatibilität vermieden, weil diese @code{libnss_*.so}-Dateien vom @command{nscd}-Prozess geladen werden, nicht in den Anwendungen selbst." #. type: subsection -#: doc/guix.texi:1665 +#: doc/guix.texi:1663 #, no-wrap msgid "X11 Fonts" msgstr "X11-Schriftarten" #. type: Plain text -#: doc/guix.texi:1675 +#: doc/guix.texi:1673 msgid "The majority of graphical applications use Fontconfig to locate and load fonts and perform X11-client-side rendering. The @code{fontconfig} package in Guix looks for fonts in @file{$HOME/.guix-profile} by default. Thus, to allow graphical applications installed with Guix to display fonts, you have to install fonts with Guix as well. Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and @code{font-gnu-freefont-ttf}." msgstr "Die Mehrheit der grafischen Anwendungen benutzen Fontconfig zum Finden und Laden von Schriftarten und für die Darstellung im X11-Client. Im Paket @code{fontconfig} in Guix werden Schriftarten standardmäßig in @file{$HOME/.guix-profile} gesucht. Um es grafischen Anwendungen, die mit Guix installiert wurden, zu ermöglichen, Schriftarten anzuzeigen, müssen Sie die Schriftarten auch mit Guix installieren. Essenzielle Pakete für Schriftarten sind unter anderem @code{gs-fonts}, @code{font-dejavu} und @code{font-gnu-freefont-ttf}." #. type: Plain text -#: doc/guix.texi:1682 +#: doc/guix.texi:1680 msgid "To display text written in Chinese languages, Japanese, or Korean in graphical applications, consider installing @code{font-adobe-source-han-sans} or @code{font-wqy-zenhei}. The former has multiple outputs, one per language family (@pxref{Packages with Multiple Outputs}). For instance, the following command installs fonts for Chinese languages:" msgstr "Um auf Chinesisch, Japanisch oder Koreanisch verfassten Text in grafischen Anwendungen anzeigen zu können, möchten Sie vielleicht @code{font-adobe-source-han-sans} oder @code{font-wqy-zenhei} installieren. Ersteres hat mehrere Ausgaben, für jede Sprachfamilie eine (siehe @ref{Packages with Multiple Outputs}). Zum Beispiel installiert folgender Befehl Schriftarten für chinesische Sprachen:" #. type: example -#: doc/guix.texi:1685 +#: doc/guix.texi:1683 #, no-wrap msgid "guix install font-adobe-source-han-sans:cn\n" msgstr "guix install font-adobe-source-han-sans:cn\n" #. type: code{#1} -#: doc/guix.texi:1687 +#: doc/guix.texi:1685 #, no-wrap msgid "xterm" msgstr "xterm" #. type: Plain text -#: doc/guix.texi:1691 +#: doc/guix.texi:1689 msgid "Older programs such as @command{xterm} do not use Fontconfig and instead rely on server-side font rendering. Such programs require to specify a full name of a font using XLFD (X Logical Font Description), like this:" msgstr "Ältere Programme wie @command{xterm} benutzen kein Fontconfig, sondern X-Server-seitige Schriftartendarstellung. Solche Programme setzen voraus, dass der volle Name einer Schriftart mit XLFD (X Logical Font Description) angegeben wird, z.B.@: so:" #. type: example -#: doc/guix.texi:1694 +#: doc/guix.texi:1692 #, no-wrap msgid "-*-dejavu sans-medium-r-normal-*-*-100-*-*-*-*-*-1\n" msgstr "-*-dejavu sans-medium-r-normal-*-*-100-*-*-*-*-*-1\n" #. type: Plain text -#: doc/guix.texi:1698 +#: doc/guix.texi:1696 msgid "To be able to use such full names for the TrueType fonts installed in your Guix profile, you need to extend the font path of the X server:" msgstr "Um solche vollen Namen für die in Ihrem Guix-Profil installierten TrueType-Schriftarten zu verwenden, müssen Sie den Pfad für Schriftarten (Font Path) des X-Servers anpassen:" #. type: example -#: doc/guix.texi:1703 +#: doc/guix.texi:1701 #, no-wrap msgid "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n" msgstr "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n" #. type: code{#1} -#: doc/guix.texi:1705 +#: doc/guix.texi:1703 #, no-wrap msgid "xlsfonts" msgstr "xlsfonts" #. type: Plain text -#: doc/guix.texi:1708 +#: doc/guix.texi:1706 msgid "After that, you can run @code{xlsfonts} (from @code{xlsfonts} package) to make sure your TrueType fonts are listed there." msgstr "Danach können Sie den Befehl @code{xlsfonts} ausführen (aus dem Paket @code{xlsfonts}), um sicherzustellen, dass dort Ihre TrueType-Schriftarten aufgeführt sind." #. type: code{#1} -#: doc/guix.texi:1709 +#: doc/guix.texi:1707 #, no-wrap msgid "fc-cache" msgstr "fc-cache" #. type: cindex -#: doc/guix.texi:1710 +#: doc/guix.texi:1708 #, no-wrap msgid "font cache" msgstr "Font-Cache" #. type: Plain text -#: doc/guix.texi:1716 +#: doc/guix.texi:1714 msgid "After installing fonts you may have to refresh the font cache to use them in applications. The same applies when applications installed via Guix do not seem to find fonts. To force rebuilding of the font cache run @code{fc-cache -f}. The @code{fc-cache} command is provided by the @code{fontconfig} package." msgstr "Nach der Installation der Schriftarten müssen Sie unter Umständen den Schriftarten-Zwischenspeicher (Font-Cache) erneuern, um diese in Anwendungen benutzen zu können. Gleiches gilt, wenn mit Guix installierte Anwendungen anscheinend keine Schriftarten finden können. Um das Erneuern des Font-Caches zu erzwingen, führen Sie @code{fc-cache -f} aus. Der Befehl @code{fc-cache} wird vom Paket @code{fontconfig} angeboten." #. type: code{#1} -#: doc/guix.texi:1719 doc/guix.texi:23677 +#: doc/guix.texi:1717 doc/guix.texi:23674 #, no-wrap msgid "nss-certs" msgstr "nss-certs" #. type: Plain text -#: doc/guix.texi:1722 +#: doc/guix.texi:1720 msgid "The @code{nss-certs} package provides X.509 certificates, which allow programs to authenticate Web servers accessed over HTTPS." msgstr "Das Paket @code{nss-certs} bietet X.509-Zertifikate, womit Programme die Identität von Web-Servern authentifizieren können, auf die über HTTPS zugegriffen wird." #. type: Plain text -#: doc/guix.texi:1727 +#: doc/guix.texi:1725 msgid "When using Guix on a foreign distro, you can install this package and define the relevant environment variables so that packages know where to look for certificates. @xref{X.509 Certificates}, for detailed information." msgstr "Wenn Sie Guix auf einer Fremddistribution verwenden, können Sie dieses Paket installieren und die relevanten Umgebungsvariablen festlegen, damit Pakete wissen, wo sie Zertifikate finden. Unter @ref{X.509 Certificates} stehen genaue Informationen." #. type: subsection -#: doc/guix.texi:1728 +#: doc/guix.texi:1726 #, no-wrap msgid "Emacs Packages" msgstr "Emacs-Pakete" #. type: code{#1} -#: doc/guix.texi:1730 +#: doc/guix.texi:1728 #, no-wrap msgid "emacs" msgstr "emacs" #. type: Plain text -#: doc/guix.texi:1741 +#: doc/guix.texi:1739 msgid "When you install Emacs packages with Guix, the elisp files may be placed either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in sub-directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}. The latter directory exists because potentially there may exist thousands of Emacs packages and storing all their files in a single directory may not be reliable (because of name conflicts). So we think using a separate directory for each package is a good idea. It is very similar to how the Emacs package system organizes the file structure (@pxref{Package Files,,, emacs, The GNU Emacs Manual})." msgstr "Wenn Sie mit Guix Pakete für Emacs installieren, werden deren elisp-Dateien entweder in @file{$HOME/.guix-profile/share/emacs/site-lisp/} oder in Unterverzeichnissen von @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/} gespeichert. Letzteres Verzeichnis gibt es, weil es Tausende von Emacs-Paketen gibt und sie alle im selben Verzeichnis zu speichern vielleicht nicht verlässlich funktioniert (wegen Namenskonflikten). Daher halten wir es für richtig, für jedes Paket ein anderes Verzeichnis zu benutzen. Das Emacs-Paketsystem organisiert die Dateistruktur ähnlich (siehe @ref{Package Files,,, emacs, The GNU Emacs Manual})." #. type: Plain text -#: doc/guix.texi:1747 +#: doc/guix.texi:1745 msgid "By default, Emacs (installed with Guix) ``knows'' where these packages are placed, so you do not need to perform any configuration. If, for some reason, you want to avoid auto-loading Emacs packages installed with Guix, you can do so by running Emacs with @code{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})." msgstr "Standardmäßig „weiß“ Emacs (wenn er mit Guix installiert wurde), wo diese Pakete liegen, Sie müssen also nichts selbst konfigurieren. Wenn Sie aber aus irgendeinem Grund mit Guix installierte Pakete nicht automatisch laden lassen möchten, können Sie Emacs mit der Befehlszeilenoption @code{--no-site-file} starten (siehe @ref{Init File,,, emacs, The GNU Emacs Manual})." #. type: subsection -#: doc/guix.texi:1748 +#: doc/guix.texi:1746 #, no-wrap msgid "The GCC toolchain" msgstr "GCC-Toolchain" #. type: cindex -#: doc/guix.texi:1750 +#: doc/guix.texi:1748 #, no-wrap msgid "GCC" msgstr "GCC" #. type: cindex -#: doc/guix.texi:1751 +#: doc/guix.texi:1749 #, no-wrap msgid "ld-wrapper" msgstr "ld-wrapper" #. type: Plain text -#: doc/guix.texi:1760 +#: doc/guix.texi:1758 msgid "Guix offers individual compiler packages such as @code{gcc} but if you are in need of a complete toolchain for compiling and linking source code what you really want is the @code{gcc-toolchain} package. This package provides a complete GCC toolchain for C/C++ development, including GCC itself, the GNU C Library (headers and binaries, plus debugging symbols in the @code{debug} output), Binutils, and a linker wrapper." msgstr "Guix bietet individuelle Compiler-Pakete wie etwa @code{gcc}, aber wenn Sie einen vollständigen Satz an Werkzeugen zum Kompilieren und Binden von Quellcode brauchen, werden Sie eigentlich das Paket @code{gcc-toolchain} haben wollen. Das Paket bietet eine vollständige GCC-Toolchain für die Entwicklung mit C/C++, einschließlich GCC selbst, der GNU-C-Bibliothek (Header-Dateien und Binärdateien samt Symbolen zur Fehlersuche/Debugging in der @code{debug}-Ausgabe), Binutils und einen Wrapper für den Binder/Linker." #. type: Plain text -#: doc/guix.texi:1766 +#: doc/guix.texi:1764 msgid "The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches passed to the linker, add corresponding @code{-rpath} arguments, and invoke the actual linker with this new set of arguments. You can instruct the wrapper to refuse to link against libraries not in the store by setting the @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}." msgstr "Der Zweck des Wrappers ist, die an den Binder übergebenen Befehlszeilenoptionen mit @code{-L} und @code{-l} zu überprüfen und jeweils passende Argumente mit @code{-rpath} anzufügen, womit dann der echte Binder aufgerufen wird. Standardmäßig weigert sich der Binder-Wrapper, mit Bibliotheken außerhalb des Stores zu binden, um „Reinheit“ zu gewährleisten. Das kann aber stören, wenn man die Toolchain benutzt, um mit lokalen Bibliotheken zu binden. Um Referenzen auf Bibliotheken außerhalb des Stores zu erlauben, müssen Sie die Umgebungsvariable @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} setzen." #. type: cindex -#: doc/guix.texi:1773 +#: doc/guix.texi:1771 #, no-wrap msgid "installing Guix System" msgstr "Installieren von Guix System" #. type: cindex -#: doc/guix.texi:1774 +#: doc/guix.texi:1772 #, no-wrap msgid "Guix System, installation" msgstr "Guix System, Installation" #. type: Plain text -#: doc/guix.texi:1779 +#: doc/guix.texi:1777 msgid "This section explains how to install Guix System on a machine. Guix, as a package manager, can also be installed on top of a running GNU/Linux system, @pxref{Installation}." msgstr "Dieser Abschnitt beschreibt, wie Sie „Guix System“ auf einer Maschine installieren. Guix kann auch als Paketverwaltungswerkzeug ein bestehendes GNU/Linux-System ergänzen, mehr dazu finden Sie im Abschnitt @ref{Installation}." #. type: quotation -#: doc/guix.texi:1788 +#: doc/guix.texi:1786 msgid "You are reading this documentation with an Info reader. For details on how to use it, hit the @key{RET} key (``return'' or ``enter'') on the link that follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}. Hit @kbd{l} afterwards to come back here." msgstr "Sie lesen diese Dokumentation mit einem Info-Betrachter. Details, wie Sie ihn bedienen, erfahren Sie, indem Sie die Eingabetaste (auch „Return“ oder „Enter“ genannt) auf folgender Verknüpfung drücken: @ref{Top, Info reader,, info-stnd, Stand-alone GNU Info}. Drücken Sie danach @kbd{l}, um hierher zurückzukommen." #. type: quotation -#: doc/guix.texi:1791 +#: doc/guix.texi:1789 msgid "Alternately, run @command{info info} in another tty to keep the manual available." msgstr "Führen Sie alternativ @command{info info} auf einer anderen Konsole (tty) aus, um dieses Handbuch offen zu lassen." #. type: Plain text -#: doc/guix.texi:1812 +#: doc/guix.texi:1810 msgid "We consider Guix System to be ready for a wide range of ``desktop'' and server use cases. The reliability guarantees it provides---transactional upgrades and rollbacks, reproducibility---make it a solid foundation." msgstr "Wir denken, dass Guix System für viele Anwendungszwecke von Heim- und Bürorechnern bis hin zu Servern geeignet ist. Die Verlässlichkeitsgarantien, die es einem bietet — transaktionelle Aktualisierungen und Rücksetzungen, Reproduzierbarkeit — machen es zu einer soliden Grundlage." #. type: Plain text -#: doc/guix.texi:1815 +#: doc/guix.texi:1813 msgid "Nevertheless, before you proceed with the installation, be aware of the following noteworthy limitations applicable to version @value{VERSION}:" msgstr "Bevor Sie mit der Installation fortfahren, sollten Sie dennoch die folgenden merklichen Einschränkungen der Version @value{VERSION} beachten:" #. type: itemize -#: doc/guix.texi:1819 +#: doc/guix.texi:1817 msgid "Support for the Logical Volume Manager (LVM) is missing." msgstr "Der Logical Volume Manager (LVM) wird nicht unterstützt." #. type: itemize -#: doc/guix.texi:1823 +#: doc/guix.texi:1821 msgid "More and more system services are provided (@pxref{Services}), but some may be missing." msgstr "Immer mehr Systemdienste sind verfügbar (siehe @ref{Services}), aber manche könnten noch fehlen." #. type: itemize -#: doc/guix.texi:1828 +#: doc/guix.texi:1826 msgid "GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}), as well as a number of X11 window managers. However, KDE is currently missing." msgstr "GNOME, Xfce, LXDE und Enlightenment stehen zur Verfügung (siehe @ref{Desktop Services}), ebenso eine Reihe von X11-Fensterverwaltungsprogrammen, allerdings fehlt KDE zur Zeit noch." #. type: Plain text -#: doc/guix.texi:1833 +#: doc/guix.texi:1831 msgid "More than a disclaimer, this is an invitation to report issues (and success stories!), and to join us in improving it. @xref{Contributing}, for more info." msgstr "Dies soll allerdings nicht nur ein Hinweis sein, sondern auch als Einladung aufgefasst werden, uns Fehler (und Erfolgsgeschichten!) zu melden und bei uns mitzumachen, um Guix zu verbessern. Siehe den Abschnitt @ref{Contributing}." #. type: cindex -#: doc/guix.texi:1838 +#: doc/guix.texi:1836 #, no-wrap msgid "hardware support on Guix System" msgstr "Hardwareunterstützung von Guix System" #. type: Plain text -#: doc/guix.texi:1847 +#: doc/guix.texi:1845 msgid "GNU@tie{}Guix focuses on respecting the user's computing freedom. It builds around the kernel Linux-libre, which means that only hardware for which free software drivers and firmware exist is supported. Nowadays, a wide range of off-the-shelf hardware is supported on GNU/Linux-libre---from keyboards to graphics cards to scanners and Ethernet controllers. Unfortunately, there are still areas where hardware vendors deny users control over their own computing, and such hardware is not supported on Guix System." msgstr "GNU@tie{}Guix legt den Fokus darauf, die Freiheit des Nutzers auf seinem Rechner zu respektieren. Es baut auf Linux-libre als Kernel auf, wodurch nur Hardware unterstützt wird, für die Treiber und Firmware existieren, die freie Software sind. Heutzutage wird ein großer Teil der handelsüblichen Hardware von GNU/Linux-libre unterstützt — von Tastaturen bis hin zu Grafikkarten, Scannern und Ethernet-Adaptern. Leider gibt es noch Bereiche, wo die Hardwareanbieter ihren Nutzern die Kontrolle über ihren eigenen Rechner verweigern. Solche Hardware wird von Guix System nicht unterstützt." #. type: cindex -#: doc/guix.texi:1848 +#: doc/guix.texi:1846 #, no-wrap msgid "WiFi, hardware support" msgstr "WLAN, Hardware-Unterstützung" #. type: Plain text -#: doc/guix.texi:1857 +#: doc/guix.texi:1855 msgid "One of the main areas where free drivers or firmware are lacking is WiFi devices. WiFi devices known to work include those using Atheros chips (AR9271 and AR7010), which corresponds to the @code{ath9k} Linux-libre driver, and those using Broadcom/AirForce chips (BCM43xx with Wireless-Core Revision 5), which corresponds to the @code{b43-open} Linux-libre driver. Free firmware exists for both and is available out-of-the-box on Guix System, as part of @code{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})." msgstr "Einer der wichtigsten Bereiche, wo es an freien Treibern und freier Firmware mangelt, sind WLAN-Geräte. WLAN-Geräte, von denen wir wissen, dass sie funktionieren, sind unter anderem solche, die die Atheros-Chips AR9271 und AR7010 verbauen, welche der Linux-libre-Treiber @code{ath9k} unterstützt, und die, die Broadcom/AirForce-Chips BCM43xx (mit Wireless-Core Revision 5) verbauen, welche der Linux-libre-Treiber @code{b43-open} unterstützt. Freie Firmware gibt es für beide und sie wird von Haus aus mit Guix System als ein Teil von @code{%base-firmware} mitgeliefert (siehe @ref{operating-system Reference, @code{firmware}})." #. type: cindex -#: doc/guix.texi:1858 +#: doc/guix.texi:1856 #, no-wrap msgid "RYF, Respects Your Freedom" msgstr "RYF, Respects Your Freedom" #. type: Plain text -#: doc/guix.texi:1864 +#: doc/guix.texi:1862 msgid "The @uref{https://www.fsf.org/, Free Software Foundation} runs @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a certification program for hardware products that respect your freedom and your privacy and ensure that you have control over your device. We encourage you to check the list of RYF-certified devices." msgstr "Die @uref{https://www.fsf.org/, Free Software Foundation} betreibt @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), ein Zertifizierungsprogramm für Hardware-Produkte, die Ihre Freiheit respektieren, Datenschutz gewährleisten und sicherstellen, dass Sie die Kontrolle über Ihr Gerät haben. Wir ermutigen Sie dazu, die Liste RYF-zertifizierter Geräte zu beachten." #. type: Plain text -#: doc/guix.texi:1868 +#: doc/guix.texi:1866 msgid "Another useful resource is the @uref{https://www.h-node.org/, H-Node} web site. It contains a catalog of hardware devices with information about their support in GNU/Linux." msgstr "Eine weitere nützliche Ressource ist die Website @uref{https://www.h-node.org/, H-Node}. Dort steht ein Katalog von Hardware-Geräten mit Informationen darüber, wie gut sie von GNU/Linux unterstützt werden." #. type: Plain text -#: doc/guix.texi:1877 +#: doc/guix.texi:1875 msgid "An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is one of:" msgstr "Sie können ein ISO-9660-Installationsabbild von @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{System}.iso.xz} herunterladen, dass Sie auf einen USB-Stick aufspielen oder auf eine DVD brennen können, wobei Sie für @var{System} eines der folgenden schreiben müssen:" #. type: table -#: doc/guix.texi:1881 +#: doc/guix.texi:1879 msgid "for a GNU/Linux system on Intel/AMD-compatible 64-bit CPUs;" msgstr "für ein GNU/Linux-System auf Intel/AMD-kompatiblen 64-Bit-Prozessoren," #. type: table -#: doc/guix.texi:1884 +#: doc/guix.texi:1882 msgid "for a 32-bit GNU/Linux system on Intel-compatible CPUs." msgstr "für ein 32-Bit-GNU/Linux-System auf Intel-kompatiblen Prozessoren." #. type: Plain text -#: doc/guix.texi:1889 +#: doc/guix.texi:1887 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines:" msgstr "Laden Sie auch die entsprechende @file{.sig}-Datei herunter und verifizieren Sie damit die Authentizität Ihres Abbilds, indem Sie diese Befehle eingeben:" #. type: example -#: doc/guix.texi:1893 +#: doc/guix.texi:1891 #, no-wrap msgid "" "$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n" @@ -5394,39 +5405,39 @@ msgstr "" "$ gpg --verify guix-system-install-@value{VERSION}.@var{System}.iso.xz.sig\n" #. type: Plain text -#: doc/guix.texi:1909 +#: doc/guix.texi:1907 msgid "This image contains the tools necessary for an installation. It is meant to be copied @emph{as is} to a large-enough USB stick or DVD." msgstr "Dieses Abbild enthält die Werkzeuge, die Sie zur Installation brauchen. Es ist dafür gedacht, @emph{so wie es ist} auf einen hinreichend großen USB-Stick oder eine DVD kopiert zu werden." #. type: unnumberedsubsec -#: doc/guix.texi:1910 +#: doc/guix.texi:1908 #, no-wrap msgid "Copying to a USB Stick" msgstr "Kopieren auf einen USB-Stick" #. type: Plain text -#: doc/guix.texi:1913 +#: doc/guix.texi:1911 msgid "To copy the image to a USB stick, follow these steps:" msgstr "Um das Abbild auf einen USB-Stick zu kopieren, führen Sie folgende Schritte durch:" #. type: enumerate -#: doc/guix.texi:1917 doc/guix.texi:1942 +#: doc/guix.texi:1915 doc/guix.texi:1940 msgid "Decompress the image using the @command{xz} command:" msgstr "Entpacken Sie das Abbild mit dem @command{xz}-Befehl:" #. type: example -#: doc/guix.texi:1920 doc/guix.texi:1945 +#: doc/guix.texi:1918 doc/guix.texi:1943 #, no-wrap msgid "xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz\n" msgstr "xz -d guix-system-install-@value{VERSION}.@var{System}.iso.xz\n" #. type: enumerate -#: doc/guix.texi:1926 +#: doc/guix.texi:1924 msgid "Insert a USB stick of 1@tie{}GiB or more into your machine, and determine its device name. Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with:" msgstr "Stecken Sie einen USB-Stick in Ihren Rechner ein, der mindestens 1@tie{}GiB groß ist, und bestimmen Sie seinen Gerätenamen. Ist der Gerätename des USB-Sticks @file{/dev/sdX}, dann kopieren Sie das Abbild mit dem Befehl:" #. type: example -#: doc/guix.texi:1930 +#: doc/guix.texi:1928 #, no-wrap msgid "" "dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX\n" @@ -5436,237 +5447,237 @@ msgstr "" "sync\n" #. type: enumerate -#: doc/guix.texi:1933 +#: doc/guix.texi:1931 msgid "Access to @file{/dev/sdX} usually requires root privileges." msgstr "Sie benötigen in der Regel Administratorrechte, um auf @file{/dev/sdX} zuzugreifen." #. type: unnumberedsubsec -#: doc/guix.texi:1935 +#: doc/guix.texi:1933 #, no-wrap msgid "Burning on a DVD" msgstr "Auf eine DVD brennen" #. type: Plain text -#: doc/guix.texi:1938 +#: doc/guix.texi:1936 msgid "To copy the image to a DVD, follow these steps:" msgstr "Um das Abbild auf eine DVD zu kopieren, führen Sie diese Schritte durch:" #. type: enumerate -#: doc/guix.texi:1951 +#: doc/guix.texi:1949 msgid "Insert a blank DVD into your machine, and determine its device name. Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with:" msgstr "Legen Sie eine unbespielte DVD in Ihren Rechner ein und bestimmen Sie ihren Gerätenamen. Angenommen der Name des DVD-Laufwerks ist @file{/dev/srX}, kopieren Sie das Abbild mit:" #. type: example -#: doc/guix.texi:1954 +#: doc/guix.texi:1952 #, no-wrap msgid "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso\n" msgstr "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{System}.iso\n" #. type: enumerate -#: doc/guix.texi:1957 +#: doc/guix.texi:1955 msgid "Access to @file{/dev/srX} usually requires root privileges." msgstr "Der Zugriff auf @file{/dev/srX} setzt in der Regel Administratorrechte voraus." #. type: unnumberedsubsec -#: doc/guix.texi:1959 +#: doc/guix.texi:1957 #, no-wrap msgid "Booting" msgstr "Das System starten" #. type: Plain text -#: doc/guix.texi:1964 +#: doc/guix.texi:1962 msgid "Once this is done, you should be able to reboot the system and boot from the USB stick or DVD. The latter usually requires you to get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick." msgstr "Sobald das erledigt ist, sollten Sie Ihr System neu starten und es vom USB-Stick oder der DVD hochfahren („booten“) können. Dazu müssen Sie wahrscheinlich beim Starten des Rechners in das BIOS- oder UEFI-Boot-Menü gehen, von wo aus Sie auswählen können, dass vom USB-Stick gebootet werden soll." #. type: Plain text -#: doc/guix.texi:1967 +#: doc/guix.texi:1965 msgid "@xref{Installing Guix in a VM}, if, instead, you would like to install Guix System in a virtual machine (VM)." msgstr "Lesen Sie den Abschnitt @ref{Installing Guix in a VM}, wenn Sie Guix System stattdessen in einer virtuellen Maschine (VM) installieren möchten." #. type: Plain text -#: doc/guix.texi:1977 +#: doc/guix.texi:1975 msgid "Once you have booted, you can use the guided graphical installer, which makes it easy to get started (@pxref{Guided Graphical Installation}). Alternately, if you are already familiar with GNU/Linux and if you want more control than what the graphical installer provides, you can choose the ``manual'' installation process (@pxref{Manual Installation})." msgstr "Wenn Sie Ihren Rechner gebootet haben, können Sie sich vom grafischen Installationsprogramm durch den Installationsvorgang führen lassen, was den Einstieg leicht macht (siehe @ref{Guided Graphical Installation}). Alternativ können Sie sich auch für einen „manuellen“ Installationsvorgang entscheiden, wenn Sie bereits mit GNU/Linux vertraut sind und mehr Kontrolle haben möchten, als sie das grafische Installationsprogramm bietet (siehe @ref{Manual Installation})." #. type: Plain text -#: doc/guix.texi:1985 +#: doc/guix.texi:1983 msgid "The graphical installer is available on TTY1. You can obtain root shells on TTYs 3 to 6 by hitting @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, etc. TTY2 shows this documentation and you can reach it with @kbd{ctrl-alt-f2}. Documentation is browsable using the Info reader commands (@pxref{Top,,, info-stnd, Stand-alone GNU Info}). The installation system runs the GPM mouse daemon, which allows you to select text with the left mouse button and to paste it with the middle button." msgstr "Das grafische Installationsprogramm steht Ihnen auf TTY1 zur Verfügung. Auf den TTYs 3 bis 6 können Sie vor sich eine Eingabeaufforderung für den Administratornutzer „root“ sehen, nachdem Sie @kbd{strg-alt-f3}, @kbd{strg-alt-f4} usw.@: gedrückt haben. TTY2 zeigt Ihnen dieses Handbuch, das Sie über die Tastenkombination @kbd{strg-alt-f2} erreichen. In dieser Dokumentation können Sie mit den Steuerungsbefehlen Ihres Info-Betrachters blättern (siehe @ref{Top,,, info-stnd, Stand-alone GNU Info}). Auf dem Installationssystem läuft der GPM-Maus-Daemon, wodurch Sie Text mit der linken Maustaste markieren und ihn mit der mittleren Maustaste einfügen können." #. type: quotation -#: doc/guix.texi:1990 +#: doc/guix.texi:1988 msgid "Installation requires access to the Internet so that any missing dependencies of your system configuration can be downloaded. See the ``Networking'' section below." msgstr "Für die Installation benötigen Sie Zugang zum Internet, damit fehlende Abhängigkeiten Ihrer Systemkonfiguration heruntergeladen werden können. Im Abschnitt „Netzwerkkonfiguration“ weiter unten finden Sie mehr Informationen dazu." #. type: Plain text -#: doc/guix.texi:1997 +#: doc/guix.texi:1995 msgid "The graphical installer is a text-based user interface. It will guide you, with dialog boxes, through the steps needed to install GNU@tie{}Guix System." msgstr "Das grafische Installationsprogramm ist mit einer textbasierten Benutzeroberfläche ausgestattet. Es kann Sie mit Dialogfeldern durch die Schritte führen, mit denen Sie GNU@tie{}Guix System installieren." #. type: Plain text -#: doc/guix.texi:2002 +#: doc/guix.texi:2000 msgid "The first dialog boxes allow you to set up the system as you use it during the installation: you can choose the language, keyboard layout, and set up networking, which will be used during the installation. The image below shows the networking dialog." msgstr "Die ersten Dialogfelder ermöglichen es Ihnen, das System aufzusetzen, wie Sie es bei der Installation benutzen: Sie können die Sprache und Tastaturbelegung festlegen und die Netzwerkanbindung einrichten, die während der Installation benutzt wird. Das folgende Bild zeigt den Dialog zur Einrichtung der Netzwerkanbindung." #. type: Plain text -#: doc/guix.texi:2004 +#: doc/guix.texi:2002 msgid "@image{images/installer-network,5in,, networking setup with the graphical installer}" msgstr "@image{images/installer-network,5in,, Netzwerkanbindung einrichten mit dem grafischen Installationsprogramm}" #. type: Plain text -#: doc/guix.texi:2009 +#: doc/guix.texi:2007 msgid "Later steps allow you to partition your hard disk, as shown in the image below, to choose whether or not to use encrypted file systems, to enter the host name and root password, and to create an additional account, among other things." msgstr "Mit den danach kommenden Schritten können Sie Ihre Festplatte partitionieren, wie im folgenden Bild gezeigt, und auswählen, ob Ihre Dateisysteme verschlüsselt werden sollen oder nicht. Sie können Ihren Rechnernamen und das Administratorpasswort (das „root“-Passwort) festlegen und ein Benutzerkonto einrichten, und noch mehr." #. type: Plain text -#: doc/guix.texi:2011 +#: doc/guix.texi:2009 msgid "@image{images/installer-partitions,5in,, partitioning with the graphical installer}" msgstr "@image{images/installer-partitions,5in,, Partitionieren mit dem grafischen Installationsprogramm}" #. type: Plain text -#: doc/guix.texi:2014 +#: doc/guix.texi:2012 msgid "Note that, at any time, the installer allows you to exit the current installation step and resume at a previous step, as show in the image below." msgstr "Beachten Sie, dass Sie mit dem Installationsprogramm jederzeit den aktuellen Installationsschritt verlassen und zu einem vorherigen Schritt zurückkehren können, wie Sie im folgenden Bild sehen können." #. type: Plain text -#: doc/guix.texi:2016 +#: doc/guix.texi:2014 msgid "@image{images/installer-resume,5in,, resuming the installation process}" msgstr "@image{images/installer-resume,5in,, Mit einem Installationsschritt fortfahren}" #. type: Plain text -#: doc/guix.texi:2021 +#: doc/guix.texi:2019 msgid "Once you're done, the installer produces an operating system configuration and displays it (@pxref{Using the Configuration System}). At that point you can hit ``OK'' and installation will proceed. On success, you can reboot into the new system and enjoy. @xref{After System Installation}, for what's next!" msgstr "Sobald Sie fertig sind, erzeugt das Installationsprogramm eine Betriebssystemkonfiguration und zeigt sie an (siehe @ref{Using the Configuration System}). Zu diesem Zeitpunkt können Sie auf „OK“ drücken und die Installation wird losgehen. Ist sie erfolgreich, können Sie neu starten und Ihr neues System genießen. Siehe @ref{After System Installation} für Informationen, wie es weitergeht!" #. type: Plain text -#: doc/guix.texi:2031 +#: doc/guix.texi:2029 msgid "This section describes how you would ``manually'' install GNU@tie{}Guix System on your machine. This option requires familiarity with GNU/Linux, with the shell, and with common administration tools. If you think this is not for you, consider using the guided graphical installer (@pxref{Guided Graphical Installation})." msgstr "Dieser Abschnitt beschreibt, wie Sie GNU@tie{}Guix System auf manuelle Weise auf Ihrer Maschine installieren. Diese Alternative setzt voraus, dass Sie bereits mit GNU/Linux, der Shell und üblichen Administrationswerkzeugen vertraut sind. Wenn Sie glauben, dass das nichts für Sie ist, dann möchten Sie vielleicht das geführte grafische Installationsprogramm benutzen (siehe @ref{Guided Graphical Installation})." #. type: Plain text -#: doc/guix.texi:2037 +#: doc/guix.texi:2035 msgid "The installation system provides root shells on TTYs 3 to 6; press @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, and so on to reach them. It includes many common tools needed to install the system. But it is also a full-blown Guix System, which means that you can install additional packages, should you need it, using @command{guix package} (@pxref{Invoking guix package})." msgstr "Das Installationssystem macht Eingabeaufforderungen auf den TTYs 3 bis 6 zugänglich, auf denen Sie als Administratornutzer Befehle eingeben können; Sie erreichen diese, indem Sie die Tastenkombinationen @kbd{strg-alt-f3}, @kbd{strg-alt-f4} und so weiter benutzen. Es enthält viele übliche Werkzeuge, mit denen Sie diese Aufgabe bewältigen können. Da es sich auch um ein vollständiges „Guix System“-System handelt, können Sie aber auch andere Pakete mit dem Befehl @command{guix package} nachinstallieren, wenn Sie sie brauchen (siehe @ref{Invoking guix package})." #. type: subsection -#: doc/guix.texi:2044 +#: doc/guix.texi:2042 #, no-wrap msgid "Keyboard Layout, Networking, and Partitioning" msgstr "Tastaturbelegung, Netzwerkanbindung und Partitionierung" #. type: Plain text -#: doc/guix.texi:2049 +#: doc/guix.texi:2047 msgid "Before you can install the system, you may want to adjust the keyboard layout, set up networking, and partition your target hard disk. This section will guide you through this." msgstr "Bevor Sie das System installieren können, wollen Sie vielleicht die Tastaturbelegung ändern, eine Netzwerkverbindung herstellen und die Zielfestplatte partitionieren. Dieser Abschnitt wird Sie durch diese Schritte führen." #. type: cindex -#: doc/guix.texi:2052 doc/guix.texi:11127 +#: doc/guix.texi:2050 doc/guix.texi:11125 #, no-wrap msgid "keyboard layout" msgstr "Tastaturbelegung" #. type: Plain text -#: doc/guix.texi:2056 +#: doc/guix.texi:2054 msgid "The installation image uses the US qwerty keyboard layout. If you want to change it, you can use the @command{loadkeys} command. For example, the following command selects the Dvorak keyboard layout:" msgstr "Das Installationsabbild verwendet die US-amerikanische QWERTY-Tastaturbelegung. Wenn Sie dies ändern möchten, können Sie den @command{loadkeys}-Befehl benutzen. Mit folgendem Befehl würden Sie zum Beispiel die Dvorak-Tastaturbelegung auswählen:" #. type: example -#: doc/guix.texi:2059 +#: doc/guix.texi:2057 #, no-wrap msgid "loadkeys dvorak\n" msgstr "loadkeys dvorak\n" #. type: Plain text -#: doc/guix.texi:2064 +#: doc/guix.texi:2062 msgid "See the files under @file{/run/current-system/profile/share/keymaps} for a list of available keyboard layouts. Run @command{man loadkeys} for more information." msgstr "Schauen Sie sich an, welche Dateien im Verzeichnis @file{/run/current-system/profile/share/keymaps} stehen, um eine Liste verfügbarer Tastaturbelegungen zu sehen. Wenn Sie mehr Informationen brauchen, führen Sie @command{man loadkeys} aus." #. type: subsubsection -#: doc/guix.texi:2065 +#: doc/guix.texi:2063 #, no-wrap msgid "Networking" msgstr "Netzwerkkonfiguration" #. type: Plain text -#: doc/guix.texi:2068 +#: doc/guix.texi:2066 msgid "Run the following command to see what your network interfaces are called:" msgstr "Führen Sie folgenden Befehl aus, um zu sehen, wie Ihre Netzwerkschnittstellen benannt sind:" #. type: example -#: doc/guix.texi:2071 +#: doc/guix.texi:2069 #, no-wrap msgid "ifconfig -a\n" msgstr "ifconfig -a\n" #. type: Plain text -#: doc/guix.texi:2075 +#: doc/guix.texi:2073 msgid "@dots{} or, using the GNU/Linux-specific @command{ip} command:" msgstr "…@: oder mit dem GNU/Linux-eigenen @command{ip}-Befehl:" #. type: example -#: doc/guix.texi:2078 +#: doc/guix.texi:2076 #, no-wrap msgid "ip a\n" msgstr "ip a\n" #. type: Plain text -#: doc/guix.texi:2085 +#: doc/guix.texi:2083 msgid "Wired interfaces have a name starting with @samp{e}; for example, the interface corresponding to the first on-board Ethernet controller is called @samp{eno1}. Wireless interfaces have a name starting with @samp{w}, like @samp{w1p2s0}." msgstr "Der Name kabelgebundener Schnittstellen (engl. Interfaces) beginnt mit dem Buchstaben @samp{e}, zum Beispiel heißt die dem ersten fest eingebauten Ethernet-Adapter entsprechende Schnittstelle @samp{eno1}. Drahtlose Schnittstellen werden mit einem Namen bezeichnet, der mit dem Buchstaben @samp{w} beginnt, etwa @samp{w1p2s0}." #. type: item -#: doc/guix.texi:2087 +#: doc/guix.texi:2085 #, no-wrap msgid "Wired connection" msgstr "Kabelverbindung" #. type: table -#: doc/guix.texi:2090 +#: doc/guix.texi:2088 msgid "To configure a wired network run the following command, substituting @var{interface} with the name of the wired interface you want to use." msgstr "Um ein kabelgebundenes Netzwerk einzurichten, führen Sie den folgenden Befehl aus, wobei Sie statt @var{Schnittstelle} den Namen der kabelgebundenen Schnittstelle eintippen, die Sie benutzen möchten." #. type: example -#: doc/guix.texi:2093 +#: doc/guix.texi:2091 #, no-wrap msgid "ifconfig @var{interface} up\n" msgstr "ifconfig @var{Schnittstelle} up\n" #. type: item -#: doc/guix.texi:2095 +#: doc/guix.texi:2093 #, no-wrap msgid "Wireless connection" msgstr "Drahtlose Verbindung" #. type: cindex -#: doc/guix.texi:2096 doc/guix.texi:12558 +#: doc/guix.texi:2094 doc/guix.texi:12556 #, no-wrap msgid "wireless" msgstr "WLAN" #. type: cindex -#: doc/guix.texi:2097 doc/guix.texi:12559 +#: doc/guix.texi:2095 doc/guix.texi:12557 #, no-wrap msgid "WiFi" msgstr "WiFi" #. type: table -#: doc/guix.texi:2102 +#: doc/guix.texi:2100 msgid "To configure wireless networking, you can create a configuration file for the @command{wpa_supplicant} configuration tool (its location is not important) using one of the available text editors such as @command{nano}:" msgstr "Um Drahtlosnetzwerke einzurichten, können Sie eine Konfigurationsdatei für das Konfigurationswerkzeug des @command{wpa_supplicant} schreiben (wo Sie sie speichern, ist nicht wichtig), indem Sie eines der verfügbaren Textbearbeitungsprogramme wie etwa @command{nano} benutzen:" #. type: example -#: doc/guix.texi:2105 +#: doc/guix.texi:2103 #, no-wrap msgid "nano wpa_supplicant.conf\n" msgstr "nano wpa_supplicant.conf\n" #. type: table -#: doc/guix.texi:2110 +#: doc/guix.texi:2108 msgid "As an example, the following stanza can go to this file and will work for many wireless networks, provided you give the actual SSID and passphrase for the network you are connecting to:" msgstr "Zum Beispiel können Sie die folgende Formulierung in der Datei speichern, die für viele Drahtlosnetzwerke funktioniert, sofern Sie die richtige SSID und Passphrase für das Netzwerk eingeben, mit dem Sie sich verbinden möchten:" #. type: example -#: doc/guix.texi:2117 +#: doc/guix.texi:2115 #, no-wrap msgid "" "network=@{\n" @@ -5682,184 +5693,184 @@ msgstr "" "@}\n" #. type: table -#: doc/guix.texi:2122 +#: doc/guix.texi:2120 msgid "Start the wireless service and run it in the background with the following command (substitute @var{interface} with the name of the network interface you want to use):" msgstr "Starten Sie den Dienst für Drahtlosnetzwerke und lassen Sie ihn im Hintergrund laufen, indem Sie folgenden Befehl eintippen (ersetzen Sie dabei @var{Schnittstelle} durch den Namen der Netzwerkschnittstelle, die Sie benutzen möchten):" #. type: example -#: doc/guix.texi:2125 +#: doc/guix.texi:2123 #, no-wrap msgid "wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B\n" msgstr "wpa_supplicant -c wpa_supplicant.conf -i @var{Schnittstelle} -B\n" #. type: table -#: doc/guix.texi:2128 +#: doc/guix.texi:2126 msgid "Run @command{man wpa_supplicant} for more information." msgstr "Führen Sie @command{man wpa_supplicant} aus, um mehr Informationen zu erhalten." #. type: cindex -#: doc/guix.texi:2130 +#: doc/guix.texi:2128 #, no-wrap msgid "DHCP" msgstr "DHCP" #. type: Plain text -#: doc/guix.texi:2133 +#: doc/guix.texi:2131 msgid "At this point, you need to acquire an IP address. On a network where IP addresses are automatically assigned @i{via} DHCP, you can run:" msgstr "Zu diesem Zeitpunkt müssen Sie sich eine IP-Adresse beschaffen. Auf einem Netzwerk, wo IP-Adressen automatisch @i{via} DHCP zugewiesen werden, können Sie das hier ausführen:" #. type: example -#: doc/guix.texi:2136 +#: doc/guix.texi:2134 #, no-wrap msgid "dhclient -v @var{interface}\n" msgstr "dhclient -v @var{Schnittstelle}\n" #. type: Plain text -#: doc/guix.texi:2139 +#: doc/guix.texi:2137 msgid "Try to ping a server to see if networking is up and running:" msgstr "Versuchen Sie, einen Server zu pingen, um zu prüfen, ob sie mit dem Internet verbunden sind und alles richtig funktioniert:" #. type: example -#: doc/guix.texi:2142 +#: doc/guix.texi:2140 #, no-wrap msgid "ping -c 3 gnu.org\n" msgstr "ping -c 3 gnu.org\n" #. type: Plain text -#: doc/guix.texi:2146 +#: doc/guix.texi:2144 msgid "Setting up network access is almost always a requirement because the image does not contain all the software and tools that may be needed." msgstr "Einen Internetzugang herzustellen, ist in jedem Fall nötig, weil das Abbild nicht alle Software und Werkzeuge enthält, die nötig sein könnten." #. type: cindex -#: doc/guix.texi:2147 +#: doc/guix.texi:2145 #, no-wrap msgid "installing over SSH" msgstr "Über SSH installieren" #. type: Plain text -#: doc/guix.texi:2150 +#: doc/guix.texi:2148 msgid "If you want to, you can continue the installation remotely by starting an SSH server:" msgstr "Wenn Sie möchten, können Sie die weitere Installation auch per Fernwartung durchführen, indem Sie einen SSH-Server starten:" #. type: example -#: doc/guix.texi:2153 +#: doc/guix.texi:2151 #, no-wrap msgid "herd start ssh-daemon\n" msgstr "herd start ssh-daemon\n" #. type: Plain text -#: doc/guix.texi:2157 +#: doc/guix.texi:2155 msgid "Make sure to either set a password with @command{passwd}, or configure OpenSSH public key authentication before logging in." msgstr "Vergewissern Sie sich vorher, dass Sie entweder ein Passwort mit @command{passwd} festgelegt haben, oder dass Sie für OpenSSH eine Authentifizierung über öffentliche Schlüssel eingerichtet haben, bevor Sie sich anmelden." #. type: subsubsection -#: doc/guix.texi:2158 +#: doc/guix.texi:2156 #, no-wrap msgid "Disk Partitioning" msgstr "Plattenpartitionierung" #. type: Plain text -#: doc/guix.texi:2162 +#: doc/guix.texi:2160 msgid "Unless this has already been done, the next step is to partition, and then format the target partition(s)." msgstr "Sofern nicht bereits geschehen, ist der nächste Schritt, zu partitionieren und dann die Zielpartition zu formatieren." #. type: Plain text -#: doc/guix.texi:2167 +#: doc/guix.texi:2165 msgid "The installation image includes several partitioning tools, including Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk}, and @command{cfdisk}. Run it and set up your disk with the partition layout you want:" msgstr "Auf dem Installationsabbild sind mehrere Partitionierungswerkzeuge zu finden, einschließlich (siehe @ref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk} und @command{cfdisk}. Starten Sie eines davon und partitionieren Sie Ihre Festplatte oder sonstigen Massenspeicher:" #. type: example -#: doc/guix.texi:2170 +#: doc/guix.texi:2168 #, no-wrap msgid "cfdisk\n" msgstr "cfdisk\n" #. type: Plain text -#: doc/guix.texi:2176 +#: doc/guix.texi:2174 msgid "If your disk uses the GUID Partition Table (GPT) format and you plan to install BIOS-based GRUB (which is the default), make sure a BIOS Boot Partition is available (@pxref{BIOS installation,,, grub, GNU GRUB manual})." msgstr "Wenn Ihre Platte mit einer „GUID Partition Table“ (GPT) formatiert ist, und Sie vorhaben, die BIOS-basierte Variante des GRUB-Bootloaders zu installieren (was der Vorgabe entspricht), stellen Sie sicher, dass eine Partition als BIOS-Boot-Partition ausgewiesen ist (siehe @ref{BIOS installation,,, grub, GNU GRUB manual})." #. type: cindex -#: doc/guix.texi:2177 +#: doc/guix.texi:2175 #, no-wrap msgid "EFI, installation" msgstr "EFI, Installation" #. type: cindex -#: doc/guix.texi:2178 +#: doc/guix.texi:2176 #, no-wrap msgid "UEFI, installation" msgstr "UEFI, Installation" #. type: cindex -#: doc/guix.texi:2179 +#: doc/guix.texi:2177 #, no-wrap msgid "ESP, EFI system partition" msgstr "ESP, EFI-Systempartition" #. type: Plain text -#: doc/guix.texi:2183 +#: doc/guix.texi:2181 msgid "If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System Partition} (ESP) is required. This partition can be mounted at @file{/boot/efi} for instance and must have the @code{esp} flag set. E.g., for @command{parted}:" msgstr "Falls Sie stattdessen einen EFI-basierten GRUB installieren möchten, muss auf der Platte eine FAT32-formatierte @dfn{EFI-Systempartition} (ESP) vorhanden sein. Diese Partition kann unter dem Pfad @file{/boot/efi} eingebunden („gemountet“) werden und die @code{esp}-Flag der Partition muss gesetzt sein. Dazu würden Sie beispielsweise in @command{parted} eintippen:" #. type: example -#: doc/guix.texi:2186 +#: doc/guix.texi:2184 #, no-wrap msgid "parted /dev/sda set 1 esp on\n" msgstr "parted /dev/sda set 1 esp on\n" #. type: vindex -#: doc/guix.texi:2189 doc/guix.texi:24067 +#: doc/guix.texi:2187 doc/guix.texi:24064 #, no-wrap msgid "grub-bootloader" msgstr "grub-bootloader" #. type: vindex -#: doc/guix.texi:2190 doc/guix.texi:24061 +#: doc/guix.texi:2188 doc/guix.texi:24058 #, no-wrap msgid "grub-efi-bootloader" msgstr "grub-efi-bootloader" #. type: quotation -#: doc/guix.texi:2197 +#: doc/guix.texi:2195 msgid "Unsure whether to use EFI- or BIOS-based GRUB? If the directory @file{/sys/firmware/efi} exists in the installation image, then you should probably perform an EFI installation, using @code{grub-efi-bootloader}. Otherwise you should use the BIOS-based GRUB, known as @code{grub-bootloader}. @xref{Bootloader Configuration}, for more info on bootloaders." msgstr "Falls Sie nicht wissen, ob Sie einen EFI- oder BIOS-basierten GRUB installieren möchten: Wenn bei Ihnen das Verzeichnis @file{/sys/firmware/efi} im Dateisystem existiert, möchten Sie vermutlich eine EFI-Installation durchführen, wozu Sie in Ihrer Konfiguration @code{grub-efi-bootloader} benutzen. Ansonsten sollten Sie den BIOS-basierten GRUB benutzen, der mit @code{grub-bootloader} bezeichnet wird. Siehe @ref{Bootloader Configuration}, wenn Sie mehr Informationen über Bootloader brauchen." #. type: Plain text -#: doc/guix.texi:2205 +#: doc/guix.texi:2203 msgid "Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently Guix System only supports ext4 and btrfs file systems. In particular, code that reads file system UUIDs and labels only works for these file system types.}. For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:" msgstr "Sobald Sie die Platte fertig partitioniert haben, auf die Sie installieren möchten, müssen Sie ein Dateisystem auf Ihrer oder Ihren für Guix System vorgesehenen Partition(en) erzeugen@footnote{Derzeit unterstützt Guix System nur die Dateisystemtypen ext4 und btrfs. Insbesondere funktioniert Guix-Code, der Dateisystem-UUIDs und -Labels ausliest, nur auf diesen Dateisystemtypen.}. Wenn Sie eine ESP brauchen und dafür die Partition @file{/dev/sda1} vorgesehen haben, müssen Sie diesen Befehl ausführen:" #. type: example -#: doc/guix.texi:2208 +#: doc/guix.texi:2206 #, no-wrap msgid "mkfs.fat -F32 /dev/sda1\n" msgstr "mkfs.fat -F32 /dev/sda1\n" #. type: Plain text -#: doc/guix.texi:2216 +#: doc/guix.texi:2214 msgid "Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations (@pxref{File Systems}). This is typically done using the @code{-L} option of @command{mkfs.ext4} and related commands. So, assuming the target root partition lives at @file{/dev/sda2}, a file system with the label @code{my-root} can be created with:" msgstr "Geben Sie Ihren Dateisystemen auch besser eine Bezeichnung („Label“), damit Sie sie zuverlässig wiedererkennen und später in den @code{file-system}-Deklarationen darauf Bezug nehmen können (siehe @ref{File Systems}). Dazu benutzen Sie typischerweise die Befehlszeilenoption @code{-L} des Befehls @command{mkfs.ext4} oder entsprechende Optionen für andere Befehle. Wenn wir also annehmen, dass @file{/dev/sda2} die Partition ist, auf der Ihr Wurzeldateisystem (englisch „root“) wohnen soll, können Sie dort mit diesem Befehl ein Dateisystem mit der Bezeichnung @code{my-root} erstellen:" #. type: example -#: doc/guix.texi:2219 +#: doc/guix.texi:2217 #, no-wrap msgid "mkfs.ext4 -L my-root /dev/sda2\n" msgstr "mkfs.ext4 -L my-root /dev/sda2\n" #. type: cindex -#: doc/guix.texi:2221 doc/guix.texi:10384 +#: doc/guix.texi:2219 doc/guix.texi:10382 #, no-wrap msgid "encrypted disk" msgstr "verschlüsselte Partition" #. type: Plain text -#: doc/guix.texi:2228 +#: doc/guix.texi:2226 msgid "If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information.) Assuming you want to store the root partition on @file{/dev/sda2}, the command sequence would be along these lines:" msgstr "Falls Sie aber vorhaben, die Partition mit dem Wurzeldateisystem zu verschlüsseln, können Sie dazu die Cryptsetup-/LUKS-Werkzeuge verwenden (siehe @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}}, um mehr darüber zu erfahren). Angenommen Sie wollen die Partition für das Wurzeldateisystem verschlüsselt auf @file{/dev/sda2} installieren, dann brauchen Sie eine Befehlsfolge ähnlich wie diese:" #. type: example -#: doc/guix.texi:2233 +#: doc/guix.texi:2231 #, no-wrap msgid "" "cryptsetup luksFormat /dev/sda2\n" @@ -5871,28 +5882,28 @@ msgstr "" "mkfs.ext4 -L my-root /dev/mapper/my-partition\n" #. type: Plain text -#: doc/guix.texi:2238 +#: doc/guix.texi:2236 msgid "Once that is done, mount the target file system under @file{/mnt} with a command like (again, assuming @code{my-root} is the label of the root file system):" msgstr "Sobald das erledigt ist, binden Sie dieses Dateisystem als Installationsziel mit dem Einhängepunkt @file{/mnt} ein, wozu Sie einen Befehl wie hier eintippen (auch hier unter der Annahme, dass @code{my-root} die Bezeichnung des künftigen Wurzeldateisystems ist):" #. type: example -#: doc/guix.texi:2241 +#: doc/guix.texi:2239 #, no-wrap msgid "mount LABEL=my-root /mnt\n" msgstr "mount LABEL=my-root /mnt\n" #. type: Plain text -#: doc/guix.texi:2247 +#: doc/guix.texi:2245 msgid "Also mount any other file systems you would like to use on the target system relative to this path. If you have opted for @file{/boot/efi} as an EFI mount point for example, mount it at @file{/mnt/boot/efi} now so it is found by @code{guix system init} afterwards." msgstr "Binden Sie auch alle anderen Dateisysteme ein, die Sie auf dem Zielsystem benutzen möchten, mit Einhängepunkten relativ zu diesem Pfad. Wenn Sie sich zum Beispiel für einen Einhängepunkt @file{/boot/efi} für die EFI-Systempartition entschieden haben, binden Sie sie jetzt als @file{/mnt/boot/efi} ein, damit @code{guix system init} sie später findet." #. type: Plain text -#: doc/guix.texi:2252 +#: doc/guix.texi:2250 msgid "Finally, if you plan to use one or more swap partitions (@pxref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), make sure to initialize them with @command{mkswap}. Assuming you have one swap partition on @file{/dev/sda3}, you would run:" msgstr "Wenn Sie zudem auch vorhaben, eine oder mehrere Swap-Partitionen zu benutzen (siehe @ref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), initialisieren Sie diese nun mit @command{mkswap}. Angenommen Sie haben eine Swap-Partition auf @file{/dev/sda3}, dann würde der Befehl so lauten:" #. type: example -#: doc/guix.texi:2256 +#: doc/guix.texi:2254 #, no-wrap msgid "" "mkswap /dev/sda3\n" @@ -5902,12 +5913,12 @@ msgstr "" "swapon /dev/sda3\n" #. type: Plain text -#: doc/guix.texi:2264 +#: doc/guix.texi:2262 msgid "Alternatively, you may use a swap file. For example, assuming that in the new system you want to use the file @file{/swapfile} as a swap file, you would run@footnote{This example will work for many types of file systems (e.g., ext4). However, for copy-on-write file systems (e.g., btrfs), the required steps may be different. For details, see the manual pages for @command{mkswap} and @command{swapon}.}:" msgstr "Alternativ können Sie eine Swap-Datei benutzen. Angenommen, Sie wollten die Datei @file{/swapdatei} im neuen System als eine Swapdatei benutzen, dann müssten Sie Folgendes ausführen@footnote{Dieses Beispiel wird auf vielen Arten von Dateisystemen funktionieren (z.B.@: auf ext4). Auf Dateisystemen mit Copy-on-Write (wie z.B.@: btrfs) können sich die nötigen Schritte unterscheiden. Details finden Sie in der Dokumentation auf den Handbuchseiten von @command{mkswap} und @command{swapon}.}:" #. type: example -#: doc/guix.texi:2272 +#: doc/guix.texi:2270 #, no-wrap msgid "" "# This is 10 GiB of swap space. Adjust \"count\" to change the size.\n" @@ -5925,38 +5936,38 @@ msgstr "" "swapon /mnt/swapfile\n" #. type: Plain text -#: doc/guix.texi:2277 +#: doc/guix.texi:2275 msgid "Note that if you have encrypted the root partition and created a swap file in its file system as described above, then the encryption also protects the swap file, just like any other file in that file system." msgstr "Bedenken Sie, dass, wenn Sie die Partition für das Wurzeldateisystem („root“) verschlüsselt und eine Swap-Datei in diesem Dateisystem wie oben beschrieben erstellt haben, die Verschlüsselung auch die Swap-Datei schützt, genau wie jede andere Datei in dem Dateisystem." #. type: Plain text -#: doc/guix.texi:2283 +#: doc/guix.texi:2281 msgid "With the target partitions ready and the target root mounted on @file{/mnt}, we're ready to go. First, run:" msgstr "Wenn die Partitionen des Installationsziels bereit sind und dessen Wurzeldateisystem unter @file{/mnt} eingebunden wurde, kann es losgehen mit der Installation. Führen Sie zuerst aus:" #. type: example -#: doc/guix.texi:2286 +#: doc/guix.texi:2284 #, no-wrap msgid "herd start cow-store /mnt\n" msgstr "herd start cow-store /mnt\n" #. type: Plain text -#: doc/guix.texi:2293 +#: doc/guix.texi:2291 msgid "This makes @file{/gnu/store} copy-on-write, such that packages added to it during the installation phase are written to the target disk on @file{/mnt} rather than kept in memory. This is necessary because the first phase of the @command{guix system init} command (see below) entails downloads or builds to @file{/gnu/store} which, initially, is an in-memory file system." msgstr "Dadurch wird @file{/gnu/store} copy-on-write, d.h.@: dorthin von Guix erstellte Pakete werden in ihrer Installationsphase auf dem unter @file{/mnt} befindlichen Zieldateisystem gespeichert, statt den Arbeitsspeicher auszulasten. Das ist nötig, weil die erste Phase des Befehls @command{guix system init} (siehe unten) viele Dateien nach @file{/gnu/store} herunterlädt oder sie erstellt, Änderungen am @file{/gnu/store} aber bis dahin wie das übrige Installationssystem nur im Arbeitsspeicher gelagert werden konnten." #. type: Plain text -#: doc/guix.texi:2304 +#: doc/guix.texi:2302 msgid "Next, you have to edit a file and provide the declaration of the operating system to be installed. To that end, the installation system comes with three text editors. We recommend GNU nano (@pxref{Top,,, nano, GNU nano Manual}), which supports syntax highlighting and parentheses matching; other editors include GNU Zile (an Emacs clone), and nvi (a clone of the original BSD @command{vi} editor). We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}. Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system." msgstr "Als Nächstes müssen Sie eine Datei bearbeiten und dort eine Deklaration des Betriebssystems, das Sie installieren möchten, hineinschreiben. Zu diesem Zweck sind im Installationssystem drei Texteditoren enthalten. Wir empfehlen, dass Sie GNU nano benutzen (siehe @ref{Top,,, nano, GNU nano Manual}), welcher Syntax und zueinander gehörende Klammern hervorheben kann. Andere mitgelieferte Texteditoren, die Sie benutzen können, sind GNU Zile (ein Emacs-Klon) und nvi (ein Klon des ursprünglichen @command{vi}-Editors von BSD). Wir empfehlen sehr, dass Sie diese Datei im Zieldateisystem der Installation speichern, etwa als @file{/mnt/etc/config.scm}, weil Sie Ihre Konfigurationsdatei im frisch installierten System noch brauchen werden." #. type: Plain text -#: doc/guix.texi:2311 +#: doc/guix.texi:2309 msgid "@xref{Using the Configuration System}, for an overview of the configuration file. The example configurations discussed in that section are available under @file{/etc/configuration} in the installation image. Thus, to get started with a system configuration providing a graphical display server (a ``desktop'' system), you can run something along these lines:" msgstr "Der Abschnitt @ref{Using the Configuration System} gibt einen Überblick über die Konfigurationsdatei. Die in dem Abschnitt diskutierten Beispielkonfigurationen sind im Installationsabbild im Verzeichnis @file{/etc/configuration} zu finden. Um also mit einer Systemkonfiguration anzufangen, die einen grafischen Anzeigeserver (einen „Display-Server“ zum Darstellen einer „Desktop“-Arbeitsumgebung) bietet, könnten Sie so etwas ausführen:" #. type: example -#: doc/guix.texi:2316 +#: doc/guix.texi:2314 #, no-wrap msgid "" "# mkdir /mnt/etc\n" @@ -5968,53 +5979,53 @@ msgstr "" "# nano /mnt/etc/config.scm\n" #. type: Plain text -#: doc/guix.texi:2320 +#: doc/guix.texi:2318 msgid "You should pay attention to what your configuration file contains, and in particular:" msgstr "Achten Sie darauf, was in Ihrer Konfigurationsdatei steht, und besonders auf Folgendes:" #. type: itemize -#: doc/guix.texi:2331 +#: doc/guix.texi:2329 msgid "Make sure the @code{bootloader-configuration} form refers to the target you want to install GRUB on. It should mention @code{grub-bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems. For legacy systems, the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path to a mounted EFI partition, like @code{/boot/efi}; do make sure the path is currently mounted and a @code{file-system} entry is specified in your configuration." msgstr "Ihre @code{bootloader-configuration}-Form muss sich auf dasjenige Ziel beziehen, auf das Sie GRUB installieren möchten. Sie sollte genau dann @code{grub-bootloader} nennen, wenn Sie GRUB im alten BIOS-Modus installieren, und für neuere UEFI-Systeme sollten Sie @code{grub-efi-bootloader} nennen. Bei Altsystemen bezeichnet das @code{target}-Feld ein Gerät wie @code{/dev/sda}, bei UEFI-Systemen bezeichnet es den Pfad zu einer eingebundenen EFI-Partition wie @code{/boot/efi}; stellen Sie sicher, dass die ESP tatsächlich dort eingebunden ist und ein @code{file-system}-Eintrag dafür in Ihrer Konfiguration festgelegt wurde." #. type: itemize -#: doc/guix.texi:2337 +#: doc/guix.texi:2335 msgid "Be sure that your file system labels match the value of their respective @code{device} fields in your @code{file-system} configuration, assuming your @code{file-system} configuration uses the @code{file-system-label} procedure in its @code{device} field." msgstr "Dateisystembezeichnungen müssen mit den jeweiligen @code{device}-Feldern in Ihrer @code{file-system}-Konfiguration übereinstimmen, sofern Sie in Ihrer @code{file-system}-Konfiguration die Prozedur @code{file-system-label} für ihre @code{device}-Felder benutzen." #. type: itemize -#: doc/guix.texi:2341 +#: doc/guix.texi:2339 msgid "If there are encrypted or RAID partitions, make sure to add a @code{mapped-devices} field to describe them (@pxref{Mapped Devices})." msgstr "Gibt es verschlüsselte Partitionen oder RAID-Partitionen, dann müssen sie im @code{mapped-devices}-Feld genannt werden (siehe @ref{Mapped Devices})." #. type: Plain text -#: doc/guix.texi:2346 +#: doc/guix.texi:2344 msgid "Once you are done preparing the configuration file, the new system must be initialized (remember that the target root file system is mounted under @file{/mnt}):" msgstr "Wenn Sie damit fertig sind, Ihre Konfigurationsdatei vorzubereiten, können Sie das neue System initialisieren (denken Sie daran, dass zukünftige Wurzeldateisystem muss unter @file{/mnt} wie bereits beschrieben eingebunden sein):" #. type: example -#: doc/guix.texi:2349 +#: doc/guix.texi:2347 #, no-wrap msgid "guix system init /mnt/etc/config.scm /mnt\n" msgstr "guix system init /mnt/etc/config.scm /mnt\n" #. type: Plain text -#: doc/guix.texi:2356 +#: doc/guix.texi:2354 msgid "This copies all the necessary files and installs GRUB on @file{/dev/sdX}, unless you pass the @option{--no-bootloader} option. For more information, @pxref{Invoking guix system}. This command may trigger downloads or builds of missing packages, which can take some time." msgstr "Dies kopiert alle notwendigen Dateien und installiert GRUB auf @file{/dev/sdX}, sofern Sie nicht noch die Befehlszeilenoption @option{--no-bootloader} benutzen. Weitere Informationen finden Sie im Abschnitt @ref{Invoking guix system}. Der Befehl kann das Herunterladen oder Erstellen fehlender Softwarepakete auslösen, was einige Zeit in Anspruch nehmen kann." #. type: Plain text -#: doc/guix.texi:2364 +#: doc/guix.texi:2362 msgid "Once that command has completed---and hopefully succeeded!---you can run @command{reboot} and boot into the new system. The @code{root} password in the new system is initially empty; other users' passwords need to be initialized by running the @command{passwd} command as @code{root}, unless your configuration specifies otherwise (@pxref{user-account-password, user account passwords}). @xref{After System Installation}, for what's next!" msgstr "Sobald der Befehl erfolgreich — hoffentlich! — durchgelaufen ist, können Sie mit dem Befehl @command{reboot} das neue System booten lassen. Der Administratornutzer @code{root} hat im neuen System zunächst ein leeres Passwort, und Passwörter der anderen Nutzer müssen Sie später setzen, indem Sie den Befehl @command{passwd} als @code{root} ausführen, außer Ihre Konfiguration enthält schon Passwörter (siehe @ref{user-account-password, user account passwords}). Siehe @ref{After System Installation} für Informationen, wie es weiter geht!" #. type: Plain text -#: doc/guix.texi:2371 +#: doc/guix.texi:2369 msgid "Success, you've now booted into Guix System! From then on, you can update the system whenever you want by running, say:" msgstr "Sie haben es geschafft: Sie haben Guix System erfolgreich gebootet! Von jetzt an können Sie Guix System aktualisieren, wann Sie möchten, indem Sie zum Beispiel das hier ausführen:" #. type: example -#: doc/guix.texi:2375 +#: doc/guix.texi:2373 #, no-wrap msgid "" "guix pull\n" @@ -6024,88 +6035,88 @@ msgstr "" "sudo guix system reconfigure /etc/config.scm\n" #. type: Plain text -#: doc/guix.texi:2381 +#: doc/guix.texi:2379 msgid "This builds a new system generation with the latest packages and services (@pxref{Invoking guix system}). We recommend doing that regularly so that your system includes the latest security updates (@pxref{Security Updates})." msgstr "Dadurch wird eine neue Systemgeneration aus den neuesten Paketen und Diensten erstellt (siehe @ref{Invoking guix system}). Wir empfehlen, diese Schritte regelmäßig zu wiederholen, damit Ihr System die aktuellen Sicherheitsaktualisierungen benutzt (siehe @ref{Security Updates})." #. type: cindex -#: doc/guix.texi:2384 +#: doc/guix.texi:2382 #, no-wrap msgid "sudo vs. @command{guix pull}" msgstr "sudo, Wirkung auf @command{guix pull}" #. type: quotation -#: doc/guix.texi:2388 +#: doc/guix.texi:2386 msgid "Note that @command{sudo guix} runs your user's @command{guix} command and @emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged. To explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}." msgstr "Beachten Sie, dass bei Nutzung von @command{sudo guix} der @command{guix}-Befehl des aktiven Benutzers ausgeführt wird und @emph{nicht} der des Administratornutzers „root“, weil @command{sudo} die Umgebungsvariable @code{PATH} unverändert lässt. Um ausdrücklich das @command{guix}-Programm des Administrators aufzurufen, müssen Sie @command{sudo -i guix …} eintippen." #. type: Plain text -#: doc/guix.texi:2392 +#: doc/guix.texi:2390 msgid "Join us on @code{#guix} on the Freenode IRC network or on @email{guix-devel@@gnu.org} to share your experience!" msgstr "Besuchen Sie uns auf @code{#guix} auf dem Freenode-IRC-Netzwerk oder auf der Mailing-Liste @file{guix-devel@@gnu.org}, um uns Rückmeldung zu geben!" #. type: section -#: doc/guix.texi:2395 +#: doc/guix.texi:2393 #, no-wrap msgid "Installing Guix in a Virtual Machine" msgstr "Guix in einer virtuellen Maschine installieren" #. type: cindex -#: doc/guix.texi:2397 +#: doc/guix.texi:2395 #, no-wrap msgid "virtual machine, Guix System installation" msgstr "virtuelle Maschine, Guix System installieren" #. type: cindex -#: doc/guix.texi:2398 +#: doc/guix.texi:2396 #, no-wrap msgid "virtual private server (VPS)" msgstr "Virtual Private Server (VPS)" #. type: cindex -#: doc/guix.texi:2399 +#: doc/guix.texi:2397 #, no-wrap msgid "VPS (virtual private server)" msgstr "VPS (Virtual Private Server)" #. type: Plain text -#: doc/guix.texi:2403 +#: doc/guix.texi:2401 msgid "If you'd like to install Guix System in a virtual machine (VM) or on a virtual private server (VPS) rather than on your beloved machine, this section is for you." msgstr "Wenn Sie Guix System auf einer virtuellen Maschine (VM) oder einem „Virtual Private Server“ (VPS) statt auf Ihrer echten Maschine installieren möchten, ist dieser Abschnitt hier richtig für Sie." #. type: Plain text -#: doc/guix.texi:2406 +#: doc/guix.texi:2404 msgid "To boot a @uref{https://qemu.org/,QEMU} VM for installing Guix System in a disk image, follow these steps:" msgstr "Um eine virtuelle Maschine für @uref{https://qemu.org/,QEMU} aufzusetzen, mit der Sie Guix System in ein „Disk-Image“ installieren können (also in eine Datei mit einem Abbild eines Plattenspeichers), gehen Sie so vor:" #. type: enumerate -#: doc/guix.texi:2411 +#: doc/guix.texi:2409 msgid "First, retrieve and decompress the Guix system installation image as described previously (@pxref{USB Stick and DVD Installation})." msgstr "Zunächst laden Sie das Installationsabbild des Guix-Systems wie zuvor beschrieben herunter und entpacken es (siehe @ref{USB Stick and DVD Installation})." #. type: enumerate -#: doc/guix.texi:2415 +#: doc/guix.texi:2413 msgid "Create a disk image that will hold the installed system. To make a qcow2-formatted disk image, use the @command{qemu-img} command:" msgstr "Legen Sie nun ein Disk-Image an, das das System nach der Installation enthalten soll. Um ein qcow2-formatiertes Disk-Image zu erstellen, benutzen Sie den Befehl @command{qemu-img}:" #. type: example -#: doc/guix.texi:2418 +#: doc/guix.texi:2416 #, no-wrap msgid "qemu-img create -f qcow2 guixsd.img 50G\n" msgstr "qemu-img create -f qcow2 guixsd.img 50G\n" #. type: enumerate -#: doc/guix.texi:2422 +#: doc/guix.texi:2420 msgid "The resulting file will be much smaller than 50 GB (typically less than 1 MB), but it will grow as the virtualized storage device is filled up." msgstr "Die Datei, die Sie herausbekommen, wird wesentlich kleiner als 50 GB sein (typischerweise kleiner als 1 MB), vergrößert sich aber, wenn der virtualisierte Speicher gefüllt wird." #. type: enumerate -#: doc/guix.texi:2425 +#: doc/guix.texi:2423 msgid "Boot the USB installation image in an VM:" msgstr "Starten Sie das USB-Installationsabbild auf einer virtuellen Maschine:" #. type: example -#: doc/guix.texi:2431 +#: doc/guix.texi:2429 #, no-wrap msgid "" "qemu-system-x86_64 -m 1024 -smp 1 \\\n" @@ -6119,38 +6130,38 @@ msgstr "" " -drive file=guixsd.img\n" #. type: enumerate -#: doc/guix.texi:2434 +#: doc/guix.texi:2432 msgid "The ordering of the drives matters." msgstr "Halten Sie obige Reihenfolge der @option{-drive}-Befehlszeilenoptionen für die Laufwerke ein." #. type: enumerate -#: doc/guix.texi:2438 +#: doc/guix.texi:2436 msgid "In the VM console, quickly press the @kbd{F12} key to enter the boot menu. Then press the @kbd{2} key and the @kbd{RET} key to validate your selection." msgstr "Drücken Sie auf der Konsole der virtuellen Maschine schnell die @kbd{F12}-Taste, um ins Boot-Menü zu gelangen. Drücken Sie dort erst die Taste @kbd{2} und dann die Eingabetaste @kbd{RET}, um Ihre Auswahl zu bestätigen." #. type: enumerate -#: doc/guix.texi:2442 +#: doc/guix.texi:2440 msgid "You're now root in the VM, proceed with the installation process. @xref{Preparing for Installation}, and follow the instructions." msgstr "Sie sind nun in der virtuellen Maschine als Administratornutzer @code{root} angemeldet und können mit der Installation wie gewohnt fortfahren. Folgen Sie der Anleitung im Abschnitt @ref{Preparing for Installation}." #. type: Plain text -#: doc/guix.texi:2447 +#: doc/guix.texi:2445 msgid "Once installation is complete, you can boot the system that's on your @file{guixsd.img} image. @xref{Running Guix in a VM}, for how to do that." msgstr "Wurde die Installation abgeschlossen, können Sie das System starten, das sich nun als Abbild in der Datei @file{guixsd.img} befindet. Der Abschnitt @ref{Running Guix in a VM} erklärt, wie Sie das tun können." #. type: cindex -#: doc/guix.texi:2451 +#: doc/guix.texi:2449 #, no-wrap msgid "installation image" msgstr "Installationsabbild" #. type: Plain text -#: doc/guix.texi:2454 +#: doc/guix.texi:2452 msgid "The installation image described above was built using the @command{guix system} command, specifically:" msgstr "Das oben beschriebene Installationsabbild wurde mit dem Befehl @command{guix system} erstellt, genauer gesagt mit:" #. type: example -#: doc/guix.texi:2458 +#: doc/guix.texi:2456 #, no-wrap msgid "" "guix system disk-image --file-system-type=iso9660 \\\n" @@ -6160,260 +6171,260 @@ msgstr "" " gnu/system/install.scm\n" #. type: Plain text -#: doc/guix.texi:2463 +#: doc/guix.texi:2461 msgid "Have a look at @file{gnu/system/install.scm} in the source tree, and see also @ref{Invoking guix system} for more information about the installation image." msgstr "Die Datei @file{gnu/system/install.scm} finden Sie im Quellbaum von Guix. Schauen Sie sich die Datei und auch den Abschnitt @ref{Invoking guix system} an, um mehr Informationen über das Installationsabbild zu erhalten." #. type: section -#: doc/guix.texi:2464 +#: doc/guix.texi:2462 #, no-wrap msgid "Building the Installation Image for ARM Boards" msgstr "Abbild zur Installation für ARM-Rechner erstellen" #. type: Plain text -#: doc/guix.texi:2468 +#: doc/guix.texi:2466 msgid "Many ARM boards require a specific variant of the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot} bootloader." msgstr "Viele ARM-Chips funktionieren nur mit ihrer eigenen speziellen Variante des @uref{https://www.denx.de/wiki/U-Boot/, U-Boot-Bootloaders}." #. type: Plain text -#: doc/guix.texi:2472 +#: doc/guix.texi:2470 msgid "If you build a disk image and the bootloader is not available otherwise (on another boot drive etc), it's advisable to build an image that includes the bootloader, specifically:" msgstr "Wenn Sie ein Disk-Image erstellen und der Bootloader nicht anderweitig schon installiert ist (auf einem anderen Laufwerk), ist es ratsam, ein Disk-Image zu erstellen, was den Bootloader enthält, mit dem Befehl:" #. type: example -#: doc/guix.texi:2475 +#: doc/guix.texi:2473 #, no-wrap msgid "guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n" msgstr "guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n" #. type: Plain text -#: doc/guix.texi:2479 +#: doc/guix.texi:2477 msgid "@code{A20-OLinuXino-Lime2} is the name of the board. If you specify an invalid board, a list of possible boards will be printed." msgstr "@code{A20-OLinuXino-Lime2} ist der Name des Chips. Wenn Sie einen ungültigen Namen eingeben, wird eine Liste möglicher Chip-Namen ausgegeben." #. type: cindex -#: doc/guix.texi:2484 +#: doc/guix.texi:2482 #, no-wrap msgid "packages" msgstr "Pakete" #. type: Plain text -#: doc/guix.texi:2489 +#: doc/guix.texi:2487 msgid "The purpose of GNU Guix is to allow users to easily install, upgrade, and remove software packages, without having to know about their build procedures or dependencies. Guix also goes beyond this obvious set of features." msgstr "Der Zweck von GNU Guix ist, Benutzern die leichte Installation, Aktualisierung und Entfernung von Software-Paketen zu ermöglichen, ohne dass sie ihre Erstellungsprozeduren oder Abhängigkeiten kennen müssen. Guix kann natürlich noch mehr als diese offensichtlichen Funktionalitäten." #. type: Plain text -#: doc/guix.texi:2497 +#: doc/guix.texi:2495 msgid "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 the Emacs-Guix 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):" msgstr "Dieses Kapitel beschreibt die Hauptfunktionalitäten von Guix, sowie die von Guix angebotenen Paketverwaltungswerkzeuge. Zusätzlich von den im Folgenden beschriebenen Befehlszeilen-Benutzerschnittstellen (siehe @ref{Invoking guix package, @code{guix package}}) können Sie auch mit der Emacs-Guix-Schnittstelle (siehe @ref{Top,,, emacs-guix, The Emacs-Guix Reference Manual}) arbeiten, nachdem Sie das Paket @code{emacs-guix} installiert haben (führen Sie zum Einstieg in Emacs-Guix den Emacs-Befehl @kbd{M-x guix-help} aus):" #. type: example -#: doc/guix.texi:2500 +#: doc/guix.texi:2498 #, no-wrap msgid "guix install emacs-guix\n" msgstr "guix install emacs-guix\n" #. type: Plain text -#: doc/guix.texi:2521 +#: doc/guix.texi:2519 msgid "When using Guix, each package ends up in the @dfn{package store}, in its own directory---something that resembles @file{/gnu/store/xxx-package-1.2}, where @code{xxx} is a base32 string." msgstr "Wenn Sie Guix benutzen, landet jedes Paket schließlich im @dfn{Paket-Store} in seinem eigenen Verzeichnis — der Name ist ähnlich wie @file{/gnu/store/xxx-package-1.2}, wobei @code{xxx} eine Zeichenkette in Base32-Darstellung ist." #. type: Plain text -#: doc/guix.texi:2526 +#: doc/guix.texi:2524 msgid "Instead of referring to these directories, users have their own @dfn{profile}, which points to the packages that they actually want to use. These profiles are stored within each user's home directory, at @code{$HOME/.guix-profile}." msgstr "Statt diese Verzeichnisse direkt anzugeben, haben Nutzer ihr eigenes @dfn{Profil}, welches auf diejenigen Pakete zeigt, die sie tatsächlich benutzen wollen. Diese Profile sind im Persönlichen Verzeichnis des jeweiligen Nutzers gespeichert als @code{$HOME/.guix-profile}." #. type: Plain text -#: doc/guix.texi:2534 +#: doc/guix.texi:2532 msgid "For example, @code{alice} installs GCC 4.7.2. As a result, @file{/home/alice/.guix-profile/bin/gcc} points to @file{/gnu/store/@dots{}-gcc-4.7.2/bin/gcc}. Now, on the same machine, @code{bob} had already installed GCC 4.8.0. The profile of @code{bob} simply continues to point to @file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC coexist on the same system without any interference." msgstr "Zum Beispiel installiert @code{alice} GCC 4.7.2. Dadurch zeigt dann @file{/home/alice/.guix-profile/bin/gcc} auf @file{/gnu/store/…-gcc-4.7.2/bin/gcc}. Auf demselben Rechner hat @code{bob} bereits GCC 4.8.0 installiert. Das Profil von @code{bob} zeigt dann einfach weiterhin auf @file{/gnu/store/…-gcc-4.8.0/bin/gcc} — d.h.@: beide Versionen von GCC koexistieren auf demselben System, ohne sich zu stören." #. type: Plain text -#: doc/guix.texi:2538 +#: doc/guix.texi:2536 msgid "The @command{guix package} command is the central tool to manage packages (@pxref{Invoking guix package}). It operates on the per-user profiles, and can be used @emph{with normal user privileges}." msgstr "Der Befehl @command{guix package} ist das zentrale Werkzeug, um Pakete zu verwalten (siehe @ref{Invoking guix package}). Es arbeitet auf dem eigenen Profil jedes Nutzers und kann @emph{mit normalen Benutzerrechten} ausgeführt werden." #. type: cindex -#: doc/guix.texi:2539 doc/guix.texi:2618 +#: doc/guix.texi:2537 doc/guix.texi:2616 #, no-wrap msgid "transactions" msgstr "Transaktionen" #. type: Plain text -#: doc/guix.texi:2546 +#: doc/guix.texi:2544 msgid "The command provides the obvious install, remove, and upgrade operations. Each invocation is actually a @emph{transaction}: either the specified operation succeeds, or nothing happens. Thus, if the @command{guix package} process is terminated during the transaction, or if a power outage occurs during the transaction, then the user's profile remains in its previous state, and remains usable." msgstr "Der Befehl stellt die offensichtlichen Installations-, Entfernungs- und Aktualisierungsoperationen zur Verfügung. Jeder Aufruf ist tatsächlich eine eigene @emph{Transaktion}: Entweder die angegebene Operation wird erfolgreich durchgeführt, oder gar nichts passiert. Wenn also der Prozess von @command{guix package} während der Transaktion beendet wird, oder es zum Stromausfall während der Transaktion kommt, dann bleibt der alte, nutzbare Zustands des Nutzerprofils erhalten." #. type: Plain text -#: doc/guix.texi:2554 +#: doc/guix.texi:2552 msgid "In addition, any package transaction may be @emph{rolled back}. So, if, for example, an upgrade installs a new version of a package that turns out to have a serious bug, users may roll back to the previous instance of their profile, which was known to work well. Similarly, the global system configuration on Guix is subject to transactional upgrades and roll-back (@pxref{Using the Configuration System})." msgstr "Zudem kann jede Pakettransaktion @emph{zurückgesetzt} werden (Rollback). Wird also zum Beispiel durch eine Aktualisierung eine neue Version eines Pakets installiert, die einen schwerwiegenden Fehler zur Folge hat, können Nutzer ihr Profil einfach auf die vorherige Profilinstanz zurücksetzen, von der sie wissen, dass sie gut lief. Ebenso unterliegt bei Guix auch die globale Systemkonfiguration transaktionellen Aktualisierungen und Rücksetzungen (siehe @ref{Using the Configuration System})." #. type: Plain text -#: doc/guix.texi:2561 +#: doc/guix.texi:2559 msgid "All packages in the package store may be @emph{garbage-collected}. Guix can determine which packages are still referenced by user profiles, and remove those that are provably no longer referenced (@pxref{Invoking guix gc}). Users may also explicitly remove old generations of their profile so that the packages they refer to can be collected." msgstr "Alle Pakete im Paket-Store können vom @emph{Müllsammler} (Garbage Collector) gelöscht werden. Guix ist in der Lage, festzustellen, welche Pakete noch durch Benutzerprofile referenziert werden, und entfernt nur diese, die nachweislich nicht mehr referenziert werden (siehe @ref{Invoking guix gc}). Benutzer können auch ausdrücklich alte Generationen ihres Profils löschen, damit die zugehörigen Pakete vom Müllsammler gelöscht werden können." #. type: cindex -#: doc/guix.texi:2562 doc/guix.texi:4089 +#: doc/guix.texi:2560 doc/guix.texi:4087 #, no-wrap msgid "reproducibility" msgstr "Reproduzierbarkeit" #. type: Plain text -#: doc/guix.texi:2574 +#: doc/guix.texi:2572 msgid "Guix takes a @dfn{purely functional} approach to package management, as described in the introduction (@pxref{Introduction}). Each @file{/gnu/store} package directory name contains a hash of all the inputs that were used to build that package---compiler, libraries, build scripts, etc. This direct correspondence allows users to make sure a given package installation matches the current state of their distribution. It also helps maximize @dfn{build reproducibility}: thanks to the isolated build environments that are used, a given build is likely to yield bit-identical files when performed on different machines (@pxref{Invoking guix-daemon, container})." msgstr "Guix verfolgt einen @dfn{rein funktionalen} Ansatz bei der Paketverwaltung, wie er in der Einleitung beschrieben wurde (siehe @ref{Introduction}). Jedes Paketverzeichnis im @file{/gnu/store} hat einen Hash all seiner bei der Erstellung benutzten Eingaben im Namen — Compiler, Bibliotheken, Erstellungs-Skripts etc. Diese direkte Entsprechung ermöglicht es Benutzern, eine Paketinstallation zu benutzen, die sicher dem aktuellen Stand ihrer Distribution entspricht. Sie maximiert auch die @dfn{Reproduzierbarkeit der Erstellungen} zu maximieren: Dank der isolierten Erstellungsumgebungen, die benutzt werden, resultiert eine Erstellung wahrscheinlich in bitweise identischen Dateien, auch wenn sie auf unterschiedlichen Maschinen durchgeführt wird (siehe @ref{Invoking guix-daemon, container})." #. type: Plain text -#: doc/guix.texi:2585 +#: doc/guix.texi:2583 msgid "This foundation allows Guix to support @dfn{transparent binary/source deployment}. When a pre-built binary for a @file{/gnu/store} item is available from an external source---a @dfn{substitute}, Guix just downloads it and unpacks it; otherwise, it builds the package from source, locally (@pxref{Substitutes}). Because build results are usually bit-for-bit reproducible, users do not have to trust servers that provide substitutes: they can force a local build and @emph{challenge} providers (@pxref{Invoking guix challenge})." msgstr "Auf dieser Grundlage kann Guix @dfn{transparent Binär- oder Quelldateien ausliefern}. Wenn eine vorerstellte Binärdatei für ein @file{/gnu/store}-Objekt von einer externen Quelle verfügbar ist — ein @dfn{Substitut} —, lädt Guix sie einfach herunter und entpackt sie, andernfalls erstellt Guix das Paket lokal aus seinem Quellcode (siehe @ref{Substitutes}). Weil Erstellungsergebnisse normalerweise Bit für Bit reproduzierbar sind, müssen die Nutzer den Servern, die Substitute anbieten, nicht blind vertrauen; sie können eine lokale Erstellung erzwingen und Substitute @emph{anfechten} (siehe @ref{Invoking guix challenge})." #. type: Plain text -#: doc/guix.texi:2591 +#: doc/guix.texi:2589 msgid "Control over the build environment is a feature that is also useful for developers. The @command{guix environment} command allows developers of a package to quickly set up the right development environment for their package, without having to manually install the dependencies of the package into their profile (@pxref{Invoking guix environment})." msgstr "Kontrolle über die Erstellungsumgebung ist eine auch für Entwickler nützliche Funktionalität. Der Befehl @command{guix environment} ermöglicht es Entwicklern eines Pakets, schnell die richtige Entwicklungsumgebung für ihr Paket einzurichten, ohne manuell die Abhängigkeiten des Pakets in ihr Profil installieren zu müssen (siehe @ref{Invoking guix environment})." #. type: cindex -#: doc/guix.texi:2592 +#: doc/guix.texi:2590 #, no-wrap msgid "replication, of software environments" msgstr "Nachbildung, von Software-Umgebungen" #. type: cindex -#: doc/guix.texi:2593 +#: doc/guix.texi:2591 #, no-wrap msgid "provenance tracking, of software artifacts" msgstr "Provenienzverfolgung, von Software-Artefakten" #. type: Plain text -#: doc/guix.texi:2600 +#: doc/guix.texi:2598 msgid "All of Guix and its package definitions is version-controlled, and @command{guix pull} allows you to ``travel in time'' on the history of Guix itself (@pxref{Invoking guix pull}). This makes it possible to replicate a Guix instance on a different machine or at a later point in time, which in turn allows you to @emph{replicate complete software environments}, while retaining precise @dfn{provenance tracking} of the software." msgstr "Ganz Guix und all seine Paketdefinitionen stehen unter Versionskontrolle und @command{guix pull} macht es möglich, auf dem Verlauf der Entwicklung von Guix selbst „in der Zeit zu reisen“ (siehe @ref{Invoking guix pull}). Dadurch kann eine Instanz von Guix auf einer anderen Maschine oder zu einem späteren Zeitpunkt genau nachgebildet werden, wodurch auch @emph{vollständige Software-Umgebungen gänzlich nachgebildet} werden können, mit genauer @dfn{Provenienzverfolgung}, wo diese Software herkommt." #. type: section -#: doc/guix.texi:2602 +#: doc/guix.texi:2600 #, no-wrap msgid "Invoking @command{guix package}" msgstr "Invoking @command{guix package}" #. type: cindex -#: doc/guix.texi:2604 +#: doc/guix.texi:2602 #, no-wrap msgid "installing packages" msgstr "Installieren von Paketen" #. type: cindex -#: doc/guix.texi:2605 +#: doc/guix.texi:2603 #, no-wrap msgid "removing packages" msgstr "Entfernen von Paketen" #. type: cindex -#: doc/guix.texi:2606 +#: doc/guix.texi:2604 #, no-wrap msgid "package installation" msgstr "Paketinstallation" #. type: cindex -#: doc/guix.texi:2607 +#: doc/guix.texi:2605 #, no-wrap msgid "package removal" msgstr "Paketentfernung" #. type: Plain text -#: doc/guix.texi:2613 +#: doc/guix.texi:2611 msgid "The @command{guix package} command is the tool that allows users to install, upgrade, and remove packages, as well as rolling back to previous configurations. It operates only on the user's own profile, and works with normal user privileges (@pxref{Features}). Its syntax is:" msgstr "Der Befehl @command{guix package} ist ein Werkzeug, womit Nutzer Pakete installieren, aktualisieren, entfernen und auf vorherige Konfigurationen zurücksetzen können. Dabei wird nur das eigene Profil des Nutzers verwendet, und es funktioniert mit normalen Benutzerrechten, ohne Administratorrechte (siehe @ref{Funktionalitäten}). Die Syntax ist:" #. type: example -#: doc/guix.texi:2616 +#: doc/guix.texi:2614 #, no-wrap msgid "guix package @var{options}\n" msgstr "guix package @var{Optionen}\n" #. type: Plain text -#: doc/guix.texi:2623 +#: doc/guix.texi:2621 msgid "Primarily, @var{options} specifies the operations to be performed during the transaction. Upon completion, a new profile is created, but previous @dfn{generations} of the profile remain available, should the user want to roll back." msgstr "In erster Linie geben die @var{Optionen} an, welche Operationen in der Transaktion durchgeführt werden sollen. Nach Abschluss wird ein neues Profil erzeugt, aber vorherige @dfn{Generationen} des Profils bleiben verfügbar, falls der Benutzer auf sie zurückwechseln will." #. type: Plain text -#: doc/guix.texi:2626 +#: doc/guix.texi:2624 msgid "For example, to remove @code{lua} and install @code{guile} and @code{guile-cairo} in a single transaction:" msgstr "Um zum Beispiel @code{lua} zu entfernen und @code{guile} und @code{guile-cairo} in einer einzigen Transaktion zu installieren:" #. type: example -#: doc/guix.texi:2629 +#: doc/guix.texi:2627 #, no-wrap msgid "guix package -r lua -i guile guile-cairo\n" msgstr "guix package -r lua -i guile guile-cairo\n" #. type: cindex -#: doc/guix.texi:2631 +#: doc/guix.texi:2629 #, no-wrap msgid "aliases, for @command{guix package}" msgstr "Alias-Namen für @command{guix package}" #. type: Plain text -#: doc/guix.texi:2633 +#: doc/guix.texi:2631 msgid "For your convenience, we also provide the following aliases:" msgstr "Um es Ihnen einfacher zu machen, bieten wir auch die folgenden Alias-Namen an:" #. type: itemize -#: doc/guix.texi:2637 +#: doc/guix.texi:2635 msgid "@command{guix search} is an alias for @command{guix package -s}," msgstr "@command{guix search} ist eine andere Schreibweise für @command{guix package -s}," #. type: itemize -#: doc/guix.texi:2639 +#: doc/guix.texi:2637 msgid "@command{guix install} is an alias for @command{guix package -i}," msgstr "@command{guix install} ist eine andere Schreibweise für @command{guix package -i}," #. type: itemize -#: doc/guix.texi:2641 +#: doc/guix.texi:2639 msgid "@command{guix remove} is an alias for @command{guix package -r}," msgstr "@command{guix remove} ist eine andere Schreibweise für @command{guix package -r}" #. type: itemize -#: doc/guix.texi:2643 +#: doc/guix.texi:2641 msgid "and @command{guix upgrade} is an alias for @command{guix package -u}." msgstr "und @command{guix upgrade} ist eine andere Schreibweise für @command{guix package -u}." #. type: Plain text -#: doc/guix.texi:2648 +#: doc/guix.texi:2646 msgid "These aliases are less expressive than @command{guix package} and provide fewer options, so in some cases you'll probably want to use @command{guix package} directly." msgstr "Diese Alias-Namen sind weniger ausdrucksstark als @command{guix package} und stellen weniger Befehlszeilenoptionen bereit, deswegen werden Sie vermutlich manchmal @command{guix package} direkt benutzen wollen." #. type: Plain text -#: doc/guix.texi:2653 +#: doc/guix.texi:2651 msgid "@command{guix package} also supports a @dfn{declarative approach} whereby the user specifies the exact set of packages to be available and passes it @i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--manifest}})." msgstr "@command{guix package} unterstützt auch ein @dfn{deklaratives Vorgehen}, wobei der Nutzer die genaue Menge an Paketen, die verfügbar sein sollen, festlegt und über die Befehlszeilenoption @option{--manifest} übergibt (siehe @ref{profile-manifest, @option{--manifest}})." #. type: cindex -#: doc/guix.texi:2654 +#: doc/guix.texi:2652 #, no-wrap msgid "profile" msgstr "Profil" #. type: Plain text -#: doc/guix.texi:2660 +#: doc/guix.texi:2658 msgid "For each user, a symlink to the user's default profile is automatically created in @file{$HOME/.guix-profile}. This symlink always points to the current generation of the user's default profile. Thus, users can add @file{$HOME/.guix-profile/bin} to their @code{PATH} environment variable, and so on." msgstr "Für jeden Benutzer wird automatisch eine symbolische Verknüpfung zu seinem Standardprofil angelegt als @file{$HOME/.guix-profile}. Diese symbolische Verknüpfung zeigt immer auf die aktuelle Generation des Standardprofils des Benutzers. Somit können Nutzer @file{$HOME/.guix-profile/bin} z.B.@: zu ihrer Umgebungsvariablen @code{PATH} hinzufügen." #. type: cindex -#: doc/guix.texi:2660 doc/guix.texi:2857 +#: doc/guix.texi:2658 doc/guix.texi:2855 #, no-wrap msgid "search paths" msgstr "Suchpfade" #. type: Plain text -#: doc/guix.texi:2665 +#: doc/guix.texi:2663 msgid "If you are not using Guix System, consider adding the following lines to your @file{~/.bash_profile} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}) so that newly-spawned shells get all the right environment variable definitions:" msgstr "Wenn Sie @emph{nicht} Guix System benutzen, sollten Sie in Betracht ziehen, folgende Zeilen zu Ihrem @file{~/.bash_profile} hinzuzufügen (siehe @ref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}), damit in neu erzeugten Shells alle Umgebungsvariablen richtig definiert werden:" #. type: example -#: doc/guix.texi:2669 +#: doc/guix.texi:2667 #, no-wrap msgid "" "GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\\n" @@ -6423,249 +6434,249 @@ msgstr "" "source \"$HOME/.guix-profile/etc/profile\"\n" #. type: Plain text -#: doc/guix.texi:2680 +#: doc/guix.texi:2678 msgid "In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to (@pxref{Invoking guix gc}). That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @code{--localstatedir}, and @var{user} is the user name. The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created by @command{guix package}." msgstr "Ist Ihr System für mehrere Nutzer eingerichtet, werden Nutzerprofile an einem Ort gespeichert, der als @dfn{Müllsammlerwurzel} registriert ist, auf die @file{$HOME/.guix-profile} zeigt (siehe @ref{Invoking guix gc}). Dieses Verzeichnis ist normalerweise @code{@var{localstatedir}/guix/profiles/per-user/@var{Benutzer}}, wobei @var{localstatedir} der an @code{configure} als @code{--localstatedir} übergebene Wert ist und @var{Benutzer} für den jeweiligen Benutzernamen steht. Das @file{per-user}-Verzeichnis wird erstellt, wenn @command{guix-daemon} gestartet wird, und das Unterverzeichnis @var{Benutzer} wird durch @command{guix package} erstellt." #. type: Plain text -#: doc/guix.texi:2682 +#: doc/guix.texi:2680 msgid "The @var{options} can be among the following:" msgstr "Als @var{Optionen} kann vorkommen:" #. type: item -#: doc/guix.texi:2685 +#: doc/guix.texi:2683 #, no-wrap msgid "--install=@var{package} @dots{}" msgstr "--install=@var{Paket} …" #. type: itemx -#: doc/guix.texi:2686 +#: doc/guix.texi:2684 #, no-wrap msgid "-i @var{package} @dots{}" msgstr "-i @var{Paket} …" #. type: table -#: doc/guix.texi:2688 +#: doc/guix.texi:2686 msgid "Install the specified @var{package}s." msgstr "Die angegebenen @var{Paket}e installieren." #. type: table -#: doc/guix.texi:2693 +#: doc/guix.texi:2691 msgid "Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter case, the newest version prefixed by @code{1.8} is selected.)" msgstr "Jedes @var{Paket} kann entweder einfach durch seinen Paketnamen aufgeführt werden, wie @code{guile}, oder als Paketname gefolgt von einem At-Zeichen @@ und einer Versionsnummer, wie @code{guile@@1.8.8} oder auch nur @code{guile@@1.8} (in letzterem Fall wird die neueste Version mit Präfix @code{1.8} ausgewählt.)" #. type: table -#: doc/guix.texi:2701 +#: doc/guix.texi:2699 msgid "If no version number is specified, the newest available version will be selected. In addition, @var{package} may contain a colon, followed by the name of one of the outputs of the package, as in @code{gcc:doc} or @code{binutils@@2.22:lib} (@pxref{Packages with Multiple Outputs}). Packages with a corresponding name (and optionally version) are searched for among the GNU distribution modules (@pxref{Package Modules})." msgstr "Wird keine Versionsnummer angegeben, wird die neueste verfügbare Version ausgewählt. Zudem kann im @var{Paket} ein Doppelpunkt auftauchen, gefolgt vom Namen einer der Ausgaben des Pakets, wie @code{gcc:doc} oder @code{binutils@@2.22:lib} (siehe @ref{Packages with Multiple Outputs}). Pakete mit zugehörigem Namen (und optional der Version) werden unter den Modulen der GNU-Distribution gesucht (siehe @ref{Package Modules})." #. type: cindex -#: doc/guix.texi:2702 +#: doc/guix.texi:2700 #, no-wrap msgid "propagated inputs" msgstr "propagierte Eingaben" #. type: table -#: doc/guix.texi:2708 +#: doc/guix.texi:2706 msgid "Sometimes packages have @dfn{propagated inputs}: these are dependencies that automatically get installed along with the required package (@pxref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects}, for information about propagated inputs in package definitions)." msgstr "Manchmal haben Pakete @dfn{propagierte Eingaben}: Als solche werden Abhängigkeiten bezeichnet, die automatisch zusammen mit dem angeforderten Paket installiert werden (im Abschnitt @ref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects} sind weitere Informationen über propagierte Eingaben in Paketdefinitionen zu finden)." #. type: anchor{#1} -#: doc/guix.texi:2715 +#: doc/guix.texi:2713 msgid "package-cmd-propagated-inputs" msgstr "package-cmd-propagated-inputs" #. type: table -#: doc/guix.texi:2715 +#: doc/guix.texi:2713 msgid "An example is the GNU MPC library: its C header files refer to those of the GNU MPFR library, which in turn refer to those of the GMP library. Thus, when installing MPC, the MPFR and GMP libraries also get installed in the profile; removing MPC also removes MPFR and GMP---unless they had also been explicitly installed by the user." msgstr "Ein Beispiel ist die GNU-MPC-Bibliothek: Ihre C-Headerdateien verweisen auf die der GNU-MPFR-Bibliothek, welche wiederum auf die der GMP-Bibliothek verweisen. Wenn also MPC installiert wird, werden auch die MPFR- und GMP-Bibliotheken in das Profil installiert; entfernt man MPC, werden auch MPFR und GMP entfernt — außer sie wurden noch auf andere Art ausdrücklich vom Nutzer installiert." #. type: table -#: doc/guix.texi:2720 +#: doc/guix.texi:2718 msgid "Besides, packages sometimes rely on the definition of environment variables for their search paths (see explanation of @code{--search-paths} below). Any missing or possibly incorrect environment variable definitions are reported here." msgstr "Abgesehen davon setzen Pakete manchmal die Definition von Umgebungsvariablen für ihre Suchpfade voraus (siehe die Erklärung von @code{--search-paths} weiter unten). Alle fehlenden oder womöglich falschen Definitionen von Umgebungsvariablen werden hierbei gemeldet." #. type: item -#: doc/guix.texi:2721 +#: doc/guix.texi:2719 #, no-wrap msgid "--install-from-expression=@var{exp}" msgstr "--install-from-expression=@var{Ausdruck}" #. type: itemx -#: doc/guix.texi:2722 +#: doc/guix.texi:2720 #, no-wrap msgid "-e @var{exp}" msgstr "-e @var{Ausdruck}" #. type: table -#: doc/guix.texi:2724 +#: doc/guix.texi:2722 msgid "Install the package @var{exp} evaluates to." msgstr "Das Paket installieren, zu dem der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:2729 +#: doc/guix.texi:2727 msgid "@var{exp} must be a Scheme expression that evaluates to a @code{} object. This option is notably useful to disambiguate between same-named variants of a package, with expressions such as @code{(@@ (gnu packages base) guile-final)}." msgstr "Beim @var{Ausdruck} muss es sich um einen Scheme-Ausdruck handeln, der zu einem @code{}-Objekt ausgewertet wird. Diese Option ist besonders nützlich, um zwischen gleichnamigen Varianten eines Pakets zu unterscheiden, durch Ausdrücke wie @code{(@@ (gnu packages base) guile-final)}." #. type: table -#: doc/guix.texi:2733 +#: doc/guix.texi:2731 msgid "Note that this option installs the first output of the specified package, which may be insufficient when needing a specific output of a multiple-output package." msgstr "Beachten Sie, dass mit dieser Option die erste Ausgabe des angegebenen Pakets installiert wird, was unzureichend sein kann, wenn eine bestimmte Ausgabe eines Pakets mit mehreren Ausgaben gewünscht ist." #. type: item -#: doc/guix.texi:2734 +#: doc/guix.texi:2732 #, no-wrap msgid "--install-from-file=@var{file}" msgstr "--install-from-file=@var{Datei}" #. type: itemx -#: doc/guix.texi:2735 doc/guix.texi:7985 +#: doc/guix.texi:2733 doc/guix.texi:7983 #, no-wrap msgid "-f @var{file}" msgstr "-f @var{Datei}" #. type: table -#: doc/guix.texi:2737 +#: doc/guix.texi:2735 msgid "Install the package that the code within @var{file} evaluates to." msgstr "Das Paket installieren, zu dem der Code in der @var{Datei} ausgewertet wird." #. type: table -#: doc/guix.texi:2740 doc/guix.texi:4526 +#: doc/guix.texi:2738 doc/guix.texi:4524 msgid "As an example, @var{file} might contain a definition like this (@pxref{Defining Packages}):" msgstr "Zum Beispiel könnte die @var{Datei} eine Definition wie diese enthalten (siehe @ref{Defining Packages}):" #. type: example -#: doc/guix.texi:2743 doc/guix.texi:7994 +#: doc/guix.texi:2741 doc/guix.texi:7992 #, no-wrap msgid "@verbatiminclude package-hello.scm\n" msgstr "@verbatiminclude package-hello.scm\n" #. type: table -#: doc/guix.texi:2749 +#: doc/guix.texi:2747 msgid "Developers may find it useful to include such a @file{guix.scm} file in the root of their project source tree that can be used to test development snapshots and create reproducible development environments (@pxref{Invoking guix environment})." msgstr "Entwickler könnten es für nützlich erachten, eine solche @file{guix.scm}-Datei im Quellbaum ihres Projekts abzulegen, mit der Zwischenstände der Entwicklung getestet und reproduzierbare Erstellungsumgebungen aufgebaut werden können (siehe @ref{Invoking guix environment})." #. type: item -#: doc/guix.texi:2750 +#: doc/guix.texi:2748 #, no-wrap msgid "--remove=@var{package} @dots{}" msgstr "--remove=@var{Paket} …" #. type: itemx -#: doc/guix.texi:2751 +#: doc/guix.texi:2749 #, no-wrap msgid "-r @var{package} @dots{}" msgstr "-r @var{Paket} …" #. type: table -#: doc/guix.texi:2753 +#: doc/guix.texi:2751 msgid "Remove the specified @var{package}s." msgstr "Die angegebenen @var{Paket}e entfernen." #. type: table -#: doc/guix.texi:2758 +#: doc/guix.texi:2756 msgid "As for @code{--install}, each @var{package} may specify a version number and/or output name in addition to the package name. For instance, @code{-r glibc:debug} would remove the @code{debug} output of @code{glibc}." msgstr "Wie auch bei @code{--install} kann jedes @var{Paket} neben dem Paketnamen auch eine Versionsnummer und/oder eine Ausgabe benennen. Zum Beispiel würde @code{-r glibc:debug} die @code{debug}-Ausgabe von @code{glibc} aus dem Profil entfernen." #. type: item -#: doc/guix.texi:2759 +#: doc/guix.texi:2757 #, no-wrap msgid "--upgrade[=@var{regexp} @dots{}]" msgstr "--upgrade[=@var{Regexp} …]" #. type: itemx -#: doc/guix.texi:2760 +#: doc/guix.texi:2758 #, no-wrap msgid "-u [@var{regexp} @dots{}]" msgstr "-u [@var{Regexp} …]" #. type: cindex -#: doc/guix.texi:2761 +#: doc/guix.texi:2759 #, no-wrap msgid "upgrading packages" msgstr "Pakete aktualisieren" #. type: table -#: doc/guix.texi:2765 +#: doc/guix.texi:2763 msgid "Upgrade all the installed packages. If one or more @var{regexp}s are specified, upgrade only installed packages whose name matches a @var{regexp}. Also see the @code{--do-not-upgrade} option below." msgstr "Alle installierten Pakete aktualisieren. Wenn einer oder mehr reguläre Ausdrücke (Regexps) angegeben wurden, werden nur diejenigen installierten Pakete aktualisiert, deren Name zu einer der @var{Regexp}s passt. Siehe auch weiter unten die Befehlszeilenoption @code{--do-not-upgrade}." #. type: table -#: doc/guix.texi:2770 +#: doc/guix.texi:2768 msgid "Note that this upgrades package to the latest version of packages found in the distribution currently installed. To update your distribution, you should regularly run @command{guix pull} (@pxref{Invoking guix pull})." msgstr "Beachten Sie, dass das Paket so auf die neueste Version unter den Paketen gebracht wird, die in der aktuell installierten Distribution vorliegen. Um jedoch Ihre Distribution zu aktualisieren, sollten Sie regelmäßig @command{guix pull} ausführen (siehe @ref{Invoking guix pull})." #. type: item -#: doc/guix.texi:2771 +#: doc/guix.texi:2769 #, no-wrap msgid "--do-not-upgrade[=@var{regexp} @dots{}]" msgstr "--do-not-upgrade[=@var{Regexp} …]" #. type: table -#: doc/guix.texi:2776 +#: doc/guix.texi:2774 msgid "When used together with the @code{--upgrade} option, do @emph{not} upgrade any packages whose name matches a @var{regexp}. For example, to upgrade all packages in the current profile except those containing the substring ``emacs'':" msgstr "In Verbindung mit der Befehlszeilenoption @code{--upgrade}, führe @emph{keine} Aktualisierung von Paketen durch, deren Name zum regulären Ausdruck @var{Regexp} passt. Um zum Beispiel alle Pakete im aktuellen Profil zu aktualisieren mit Ausnahme derer, die „emacs“ im Namen haben:" #. type: example -#: doc/guix.texi:2779 +#: doc/guix.texi:2777 #, no-wrap msgid "$ guix package --upgrade . --do-not-upgrade emacs\n" msgstr "$ guix package --upgrade . --do-not-upgrade emacs\n" #. type: anchor{#1} -#: doc/guix.texi:2781 +#: doc/guix.texi:2779 #, no-wrap msgid "profile-manifest" msgstr "profile-manifest" #. type: item -#: doc/guix.texi:2781 doc/guix.texi:4531 doc/guix.texi:4872 doc/guix.texi:8918 -#: doc/guix.texi:10101 +#: doc/guix.texi:2779 doc/guix.texi:4529 doc/guix.texi:4870 doc/guix.texi:8916 +#: doc/guix.texi:10099 #, no-wrap msgid "--manifest=@var{file}" msgstr "--manifest=@var{Datei}" #. type: itemx -#: doc/guix.texi:2782 doc/guix.texi:4532 doc/guix.texi:4873 doc/guix.texi:8919 +#: doc/guix.texi:2780 doc/guix.texi:4530 doc/guix.texi:4871 doc/guix.texi:8917 #, no-wrap msgid "-m @var{file}" msgstr "-m @var{Datei}" #. type: cindex -#: doc/guix.texi:2783 +#: doc/guix.texi:2781 #, no-wrap msgid "profile declaration" msgstr "Profildeklaration" #. type: cindex -#: doc/guix.texi:2784 +#: doc/guix.texi:2782 #, no-wrap msgid "profile manifest" msgstr "Profilmanifest" #. type: table -#: doc/guix.texi:2787 +#: doc/guix.texi:2785 msgid "Create a new generation of the profile from the manifest object returned by the Scheme code in @var{file}." msgstr "Erstellt eine neue Generation des Profils aus dem vom Scheme-Code in @var{Datei} gelieferten Manifest-Objekt." #. type: table -#: doc/guix.texi:2793 +#: doc/guix.texi:2791 msgid "This allows you to @emph{declare} the profile's contents rather than constructing it through a sequence of @code{--install} and similar commands. The advantage is that @var{file} can be put under version control, copied to different machines to reproduce the same profile, and so on." msgstr "Dadurch könnrn Sie den Inhalt des Profils @emph{deklarieren}, statt ihn durch eine Folge von Befehlen wie @code{--install} u.Ä. zu generieren. Der Vorteil ist, dass die @var{Datei} unter Versionskontrolle gestellt werden kann, auf andere Maschinen zum Reproduzieren desselben Profils kopiert werden kann und Ähnliches." #. type: table -#: doc/guix.texi:2797 +#: doc/guix.texi:2795 msgid "@var{file} must return a @dfn{manifest} object, which is roughly a list of packages:" msgstr "Der Code in der @var{Datei} muss ein @dfn{Manifest}-Objekt liefern, was ungefähr einer Liste von Paketen entspricht:" #. type: findex -#: doc/guix.texi:2798 +#: doc/guix.texi:2796 #, no-wrap msgid "packages->manifest" msgstr "packages->manifest" #. type: example -#: doc/guix.texi:2801 +#: doc/guix.texi:2799 #, no-wrap msgid "" "(use-package-modules guile emacs)\n" @@ -6675,7 +6686,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2807 +#: doc/guix.texi:2805 #, no-wrap msgid "" "(packages->manifest\n" @@ -6691,18 +6702,18 @@ msgstr "" " (list guile-2.0 \"debug\")))\n" #. type: findex -#: doc/guix.texi:2809 +#: doc/guix.texi:2807 #, no-wrap msgid "specifications->manifest" msgstr "specifications->manifest" #. type: table -#: doc/guix.texi:2816 +#: doc/guix.texi:2814 msgid "In this example we have to know which modules define the @code{emacs} and @code{guile-2.0} variables to provide the right @code{use-package-modules} line, which can be cumbersome. We can instead provide regular package specifications and let @code{specifications->manifest} look up the corresponding package objects, like this:" msgstr "In diesem Beispiel müssen wir wissen, welche Module die Variablen @code{emacs} und @code{guile-2.0} definieren, um die richtige Angabe mit @code{use-package-modules} machen zu können, was umständlich sein kann. Wir können auch normale Paketnamen angeben und sie durch @code{specifications->manifest} zu den entsprechenden Paketobjekten auflösen, zum Beispiel so:" #. type: example -#: doc/guix.texi:2820 +#: doc/guix.texi:2818 #, no-wrap msgid "" "(specifications->manifest\n" @@ -6712,121 +6723,121 @@ msgstr "" " '(\"emacs\" \"guile@@2.2\" \"guile@@2.2:debug\"))\n" #. type: item -#: doc/guix.texi:2822 +#: doc/guix.texi:2820 #, no-wrap msgid "--roll-back" msgstr "--roll-back" #. type: cindex -#: doc/guix.texi:2823 doc/guix.texi:24357 +#: doc/guix.texi:2821 doc/guix.texi:24354 #, no-wrap msgid "rolling back" msgstr "rücksetzen" #. type: cindex -#: doc/guix.texi:2824 +#: doc/guix.texi:2822 #, no-wrap msgid "undoing transactions" msgstr "Zurücksetzen von Transaktionen" #. type: cindex -#: doc/guix.texi:2825 +#: doc/guix.texi:2823 #, no-wrap msgid "transactions, undoing" msgstr "Transaktionen, zurücksetzen" #. type: table -#: doc/guix.texi:2828 +#: doc/guix.texi:2826 msgid "Roll back to the previous @dfn{generation} of the profile---i.e., undo the last transaction." msgstr "Wechselt zur vorherigen @dfn{Generation} des Profils zurück — d.h.@: macht die letzte Transaktion rückgängig." #. type: table -#: doc/guix.texi:2831 +#: doc/guix.texi:2829 msgid "When combined with options such as @code{--install}, roll back occurs before any other actions." msgstr "In Verbindung mit Befehlszeilenoptionen wie @code{--install} wird zuerst zurückgesetzt, bevor andere Aktionen durchgeführt werden." #. type: table -#: doc/guix.texi:2835 +#: doc/guix.texi:2833 msgid "When rolling back from the first generation that actually contains installed packages, the profile is made to point to the @dfn{zeroth generation}, which contains no files apart from its own metadata." msgstr "Ein Rücksetzen der ersten Generation, die installierte Pakete enthält, wechselt das Profil zur @dfn{nullten Generation}, die keinerlei Dateien enthält, abgesehen von Metadaten über sich selbst." #. type: table -#: doc/guix.texi:2839 +#: doc/guix.texi:2837 msgid "After having rolled back, installing, removing, or upgrading packages overwrites previous future generations. Thus, the history of the generations in a profile is always linear." msgstr "Nach dem Zurücksetzen überschreibt das Installieren, Entfernen oder Aktualisieren von Paketen vormals zukünftige Generationen, d.h.@: der Verlauf der Generationen eines Profils ist immer linear." #. type: item -#: doc/guix.texi:2840 +#: doc/guix.texi:2838 #, no-wrap msgid "--switch-generation=@var{pattern}" msgstr "--switch-generation=@var{Muster}" #. type: itemx -#: doc/guix.texi:2841 +#: doc/guix.texi:2839 #, no-wrap msgid "-S @var{pattern}" msgstr "-S @var{Muster}" #. type: cindex -#: doc/guix.texi:2842 doc/guix.texi:3038 doc/guix.texi:24315 +#: doc/guix.texi:2840 doc/guix.texi:3036 doc/guix.texi:24312 #, no-wrap msgid "generations" msgstr "Generationen" #. type: table -#: doc/guix.texi:2844 +#: doc/guix.texi:2842 msgid "Switch to a particular generation defined by @var{pattern}." msgstr "Wechselt zu der bestimmten Generation, die durch das @var{Muster} bezeichnet wird." #. type: table -#: doc/guix.texi:2850 +#: doc/guix.texi:2848 msgid "@var{pattern} may be either a generation number or a number prefixed with ``+'' or ``-''. The latter means: move forward/backward by a specified number of generations. For example, if you want to return to the latest generation after @code{--roll-back}, use @code{--switch-generation=+1}." msgstr "Als @var{Muster} kann entweder die Nummer einer Generation oder eine Nummer mit vorangestelltem „+“ oder „-“ dienen. Letzteres springt die angegebene Anzahl an Generationen vor oder zurück. Zum Beispiel kehrt @code{--switch-generation=+1} nach einem Zurücksetzen wieder zur neueren Generation zurück." #. type: table -#: doc/guix.texi:2855 +#: doc/guix.texi:2853 msgid "The difference between @code{--roll-back} and @code{--switch-generation=-1} is that @code{--switch-generation} will not make a zeroth generation, so if a specified generation does not exist, the current generation will not be changed." msgstr "Der Unterschied zwischen @code{--roll-back} und @code{--switch-generation=-1} ist, dass @code{--switch-generation} keine nullte Generation erzeugen wird; existiert die angegebene Generation nicht, bleibt schlicht die aktuelle Generation erhalten." #. type: item -#: doc/guix.texi:2856 +#: doc/guix.texi:2854 #, no-wrap msgid "--search-paths[=@var{kind}]" msgstr "--search-paths[=@var{Art}]" #. type: table -#: doc/guix.texi:2862 +#: doc/guix.texi:2860 msgid "Report environment variable definitions, in Bash syntax, that may be needed in order to use the set of installed packages. These environment variables are used to specify @dfn{search paths} for files used by some of the installed packages." msgstr "Führe die Definitionen von Umgebungsvariablen auf, in Bash-Syntax, die nötig sein könnten, um alle installierten Pakete nutzen zu können. Diese Umgebungsvariablen werden benutzt, um die @dfn{Suchpfade} für Dateien festzulegen, die von einigen installierten Paketen benutzt werden." #. type: table -#: doc/guix.texi:2870 +#: doc/guix.texi:2868 msgid "For example, GCC needs the @code{CPATH} and @code{LIBRARY_PATH} environment variables to be defined so it can look for headers and libraries in the user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). If GCC and, say, the C library are installed in the profile, then @code{--search-paths} will suggest setting these variables to @code{@var{profile}/include} and @code{@var{profile}/lib}, respectively." msgstr "Zum Beispiel braucht GCC die Umgebungsvariablen @code{CPATH} und @code{LIBRARY_PATH}, um zu wissen, wo sich im Benutzerprofil Header und Bibliotheken befinden (siehe @ref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). Wenn GCC und, sagen wir, die C-Bibliothek im Profil installiert sind, schlägt @code{--search-paths} also vor, diese Variablen jeweils auf @code{@var{profile}/include} und @code{@var{profile}/lib} verweisen zu lassen." #. type: table -#: doc/guix.texi:2873 +#: doc/guix.texi:2871 msgid "The typical use case is to define these environment variables in the shell:" msgstr "Die typische Nutzung ist, in der Shell diese Variablen zu definieren:" #. type: example -#: doc/guix.texi:2876 +#: doc/guix.texi:2874 #, no-wrap msgid "$ eval `guix package --search-paths`\n" msgstr "$ eval `guix package --search-paths`\n" #. type: table -#: doc/guix.texi:2882 +#: doc/guix.texi:2880 msgid "@var{kind} may be one of @code{exact}, @code{prefix}, or @code{suffix}, meaning that the returned environment variable definitions will either be exact settings, or prefixes or suffixes of the current value of these variables. When omitted, @var{kind} defaults to @code{exact}." msgstr "Als @var{Art} kann entweder @code{exact}, @code{prefix} oder @code{suffix} gewählt werden, wodurch die gelieferten Definitionen der Umgebungsvariablen entweder exakt die Einstellungen für Guix meldet, oder sie als Präfix oder Suffix an den aktuellen Wert dieser Variablen anhängt. Gibt man keine @var{Art} an, wird der Vorgabewert @code{exact} verwendet." #. type: table -#: doc/guix.texi:2885 +#: doc/guix.texi:2883 msgid "This option can also be used to compute the @emph{combined} search paths of several profiles. Consider this example:" msgstr "Diese Befehlszeilenoption kann auch benutzt werden, um die @emph{kombinierten} Suchpfade mehrerer Profile zu berechnen. Betrachten Sie dieses Beispiel:" #. type: example -#: doc/guix.texi:2890 +#: doc/guix.texi:2888 #, no-wrap msgid "" "$ guix package -p foo -i guile\n" @@ -6838,107 +6849,107 @@ msgstr "" "$ guix package -p foo -p bar --search-paths\n" #. type: table -#: doc/guix.texi:2895 +#: doc/guix.texi:2893 msgid "The last command above reports about the @code{GUILE_LOAD_PATH} variable, even though, taken individually, neither @file{foo} nor @file{bar} would lead to that recommendation." msgstr "Der letzte Befehl oben meldet auch die Definition der Umgebungsvariablen @code{GUILE_LOAD_PATH}, obwohl für sich genommen weder @file{foo} noch @file{bar} zu dieser Empfehlung führen würden." #. type: item -#: doc/guix.texi:2897 doc/guix.texi:3715 doc/guix.texi:4162 +#: doc/guix.texi:2895 doc/guix.texi:3713 doc/guix.texi:4160 #, no-wrap msgid "--profile=@var{profile}" msgstr "--profile=@var{Profil}" #. type: itemx -#: doc/guix.texi:2898 doc/guix.texi:3716 doc/guix.texi:4163 +#: doc/guix.texi:2896 doc/guix.texi:3714 doc/guix.texi:4161 #, no-wrap msgid "-p @var{profile}" msgstr "-p @var{Profil}" #. type: table -#: doc/guix.texi:2900 +#: doc/guix.texi:2898 msgid "Use @var{profile} instead of the user's default profile." msgstr "Auf @var{Profil} anstelle des Standardprofils des Benutzers arbeiten." #. type: cindex -#: doc/guix.texi:2901 +#: doc/guix.texi:2899 #, no-wrap msgid "collisions, in a profile" msgstr "Kollisionen, in einem Profil" #. type: cindex -#: doc/guix.texi:2902 +#: doc/guix.texi:2900 #, no-wrap msgid "colliding packages in profiles" msgstr "Paketkollisionen in Profilen" #. type: cindex -#: doc/guix.texi:2903 +#: doc/guix.texi:2901 #, no-wrap msgid "profile collisions" msgstr "Profilkollisionen" #. type: item -#: doc/guix.texi:2904 +#: doc/guix.texi:2902 #, no-wrap msgid "--allow-collisions" msgstr "--allow-collisions" #. type: table -#: doc/guix.texi:2906 +#: doc/guix.texi:2904 msgid "Allow colliding packages in the new profile. Use at your own risk!" msgstr "Kollidierende Pakete im neuen Profil zulassen. Benutzung auf eigene Gefahr!" #. type: table -#: doc/guix.texi:2910 +#: doc/guix.texi:2908 msgid "By default, @command{guix package} reports as an error @dfn{collisions} in the profile. Collisions happen when two or more different versions or variants of a given package end up in the profile." msgstr "Standardmäßig wird @command{guix package} @dfn{Kollisionen} als Fehler auffassen und melden. Zu Kollisionen kommt es, wenn zwei oder mehr verschiedene Versionen oder Varianten desselben Pakets im Profil landen." #. type: item -#: doc/guix.texi:2911 doc/guix.texi:3732 doc/guix.texi:4946 +#: doc/guix.texi:2909 doc/guix.texi:3730 doc/guix.texi:4944 #, no-wrap msgid "--bootstrap" msgstr "--bootstrap" #. type: table -#: doc/guix.texi:2914 +#: doc/guix.texi:2912 msgid "Use the bootstrap Guile to build the profile. This option is only useful to distribution developers." msgstr "Erstellt das Profil mit dem Bootstrap-Guile. Diese Option ist nur für Entwickler der Distribution nützlich." #. type: Plain text -#: doc/guix.texi:2920 +#: doc/guix.texi:2918 msgid "In addition to these actions, @command{guix package} supports the following options to query the current state of a profile, or the availability of packages:" msgstr "Zusätzlich zu diesen Aktionen unterstützt @command{guix package} folgende Befehlszeilenoptionen, um den momentanen Zustand eines Profils oder die Verfügbarkeit von Paketen nachzulesen:" #. type: item -#: doc/guix.texi:2923 +#: doc/guix.texi:2921 #, no-wrap msgid "--search=@var{regexp}" msgstr "--search=@var{Regexp}" #. type: itemx -#: doc/guix.texi:2924 +#: doc/guix.texi:2922 #, no-wrap msgid "-s @var{regexp}" msgstr "-s @var{Regexp}" #. type: cindex -#: doc/guix.texi:2925 +#: doc/guix.texi:2923 #, no-wrap msgid "searching for packages" msgstr "Suche nach Paketen" #. type: table -#: doc/guix.texi:2931 +#: doc/guix.texi:2929 msgid "List the available packages whose name, synopsis, or description matches @var{regexp} (in a case-insensitive fashion), sorted by relevance. Print all the metadata of matching packages in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." msgstr "Führt alle verfügbaren Pakete auf, deren Name, Zusammenfassung oder Beschreibung zum regulären Ausdruck @var{Regexp} passt, ohne Groß- und Kleinschreibung zu unterscheiden und sortiert nach ihrer Relevanz. Alle Metadaten passender Pakete werden im @code{recutils}-Format geliefert (siehe @ref{Top, GNU recutils databases,, recutils, GNU recutils manual})." #. type: table -#: doc/guix.texi:2934 +#: doc/guix.texi:2932 msgid "This allows specific fields to be extracted using the @command{recsel} command, for instance:" msgstr "So können bestimmte Felder mit dem Befehl @command{recsel} extrahiert werden, zum Beispiel:" #. type: example -#: doc/guix.texi:2940 +#: doc/guix.texi:2938 #, no-wrap msgid "" "$ guix package -s malloc | recsel -p name,version,relevance\n" @@ -6954,7 +6965,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2944 +#: doc/guix.texi:2942 #, no-wrap msgid "" "name: glibc\n" @@ -6968,7 +6979,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2948 +#: doc/guix.texi:2946 #, no-wrap msgid "" "name: libgc\n" @@ -6980,12 +6991,12 @@ msgstr "" "relevance: 1\n" #. type: table -#: doc/guix.texi:2952 +#: doc/guix.texi:2950 msgid "Similarly, to show the name of all the packages available under the terms of the GNU@tie{}LGPL version 3:" msgstr "Ebenso kann der Name aller zu den Bedingungen der GNU@tie{}LGPL, Version 3, verfügbaren Pakete ermittelt werden:" #. type: example -#: doc/guix.texi:2956 +#: doc/guix.texi:2954 #, no-wrap msgid "" "$ guix package -s \"\" | recsel -p name -e 'license ~ \"LGPL 3\"'\n" @@ -6997,7 +7008,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:2959 +#: doc/guix.texi:2957 #, no-wrap msgid "" "name: gmp\n" @@ -7007,12 +7018,12 @@ msgstr "" "…\n" #. type: table -#: doc/guix.texi:2965 +#: doc/guix.texi:2963 msgid "It is also possible to refine search results using several @code{-s} flags to @command{guix package}, or several arguments to @command{guix search}. For example, the following command returns a list of board games (this time using the @command{guix search} alias):" msgstr "Es ist auch möglich, Suchergebnisse näher einzuschränken, indem Sie @code{-s} mehrmals an @command{guix package} übergeben, oder mehrere Argumente an @command{guix search} übergeben. Zum Beispiel liefert folgender Befehl eines Liste von Brettspielen:" #. type: example -#: doc/guix.texi:2970 +#: doc/guix.texi:2968 #, no-wrap msgid "" "$ guix search '\\' game | recsel -p name\n" @@ -7024,17 +7035,17 @@ msgstr "" "…\n" #. type: table -#: doc/guix.texi:2976 +#: doc/guix.texi:2974 msgid "If we were to omit @code{-s game}, we would also get software packages that deal with printed circuit boards; removing the angle brackets around @code{board} would further add packages that have to do with keyboards." msgstr "Würden wir @code{-s game} weglassen, bekämen wir auch Software-Pakete aufgelistet, die mit „printed circuit boards“ (elektronischen Leiterplatten) zu tun haben; ohne die spitzen Klammern um @code{board} bekämen wir auch Pakete, die mit „keyboards“ (Tastaturen, oder musikalischen Keyboard) zu tun haben." #. type: table -#: doc/guix.texi:2980 +#: doc/guix.texi:2978 msgid "And now for a more elaborate example. The following command searches for cryptographic libraries, filters out Haskell, Perl, Python, and Ruby libraries, and prints the name and synopsis of the matching packages:" msgstr "Es ist Zeit für ein komplexeres Beispiel. Folgender Befehl sucht kryptografische Bibliotheken, filtert Haskell-, Perl-, Python- und Ruby-Bibliotheken heraus und gibt Namen und Zusammenfassung passender Pakete aus:" #. type: example -#: doc/guix.texi:2984 +#: doc/guix.texi:2982 #, no-wrap msgid "" "$ guix search crypto library | \\\n" @@ -7044,23 +7055,23 @@ msgstr "" " recsel -e '! (name ~ \"^(ghc|perl|python|ruby)\")' -p name,synopsis\n" #. type: table -#: doc/guix.texi:2989 +#: doc/guix.texi:2987 msgid "@xref{Selection Expressions,,, recutils, GNU recutils manual}, for more information on @dfn{selection expressions} for @code{recsel -e}." msgstr "Siehe @ref{Selection Expressions,,, recutils, GNU recutils manual}, es enthält weitere Informationen über @dfn{Auswahlausdrücke} mit @code{recsel -e}." #. type: item -#: doc/guix.texi:2990 +#: doc/guix.texi:2988 #, no-wrap msgid "--show=@var{package}" msgstr "--show=@var{Paket}" #. type: table -#: doc/guix.texi:2994 +#: doc/guix.texi:2992 msgid "Show details about @var{package}, taken from the list of available packages, in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." msgstr "Zeigt Details über das @var{Paket} aus der Liste verfügbarer Pakete, im @code{recutils}-Format (siehe @ref{Top, GNU recutils databases,, recutils, GNU recutils manual})." #. type: example -#: doc/guix.texi:2999 +#: doc/guix.texi:2997 #, no-wrap msgid "" "$ guix package --show=python | recsel -p name,version\n" @@ -7074,7 +7085,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:3002 +#: doc/guix.texi:3000 #, no-wrap msgid "" "name: python\n" @@ -7084,12 +7095,12 @@ msgstr "" "version: 3.3.5\n" #. type: table -#: doc/guix.texi:3006 +#: doc/guix.texi:3004 msgid "You may also specify the full name of a package to only get details about a specific version of it:" msgstr "Sie können auch den vollständigen Namen eines Pakets angeben, um Details nur über diese Version angezeigt zu bekommen:" #. type: example -#: doc/guix.texi:3010 +#: doc/guix.texi:3008 #, no-wrap msgid "" "$ guix package --show=python@@3.4 | recsel -p name,version\n" @@ -7101,245 +7112,245 @@ msgstr "" "version: 3.4.3\n" #. type: item -#: doc/guix.texi:3014 +#: doc/guix.texi:3012 #, no-wrap msgid "--list-installed[=@var{regexp}]" msgstr "--list-installed[=@var{Regexp}]" #. type: itemx -#: doc/guix.texi:3015 +#: doc/guix.texi:3013 #, no-wrap msgid "-I [@var{regexp}]" msgstr "-I [@var{Regexp}]" #. type: table -#: doc/guix.texi:3019 +#: doc/guix.texi:3017 msgid "List the currently installed packages in the specified profile, with the most recently installed packages shown last. When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}." msgstr "Listet die derzeit installierten Pakete im angegebenen Profil auf, die zuletzt installierten Pakete zuletzt. Wenn ein regulärer Ausdruck @var{Regexp} angegeben wird, werden nur installierte Pakete aufgeführt, deren Name zu @var{Regexp} passt." #. type: table -#: doc/guix.texi:3025 +#: doc/guix.texi:3023 msgid "For each installed package, print the following items, separated by tabs: the package name, its version string, the part of the package that is installed (for instance, @code{out} for the default output, @code{include} for its headers, etc.), and the path of this package in the store." msgstr "Zu jedem installierten Paket werden folgende Informationen angezeigt, durch Tabulatorzeichen getrennt: der Paketname, die Version als Zeichenkette, welche Teile des Pakets installiert sind (zum Beispiel @code{out}, wenn die Standard-Paketausgabe installiert ist, @code{include}, wenn seine Header installiert sind, usw.)@: und an welchem Pfad das Paket im Store zu finden ist." #. type: item -#: doc/guix.texi:3026 +#: doc/guix.texi:3024 #, no-wrap msgid "--list-available[=@var{regexp}]" msgstr "--list-available[=@var{Regexp}]" #. type: itemx -#: doc/guix.texi:3027 +#: doc/guix.texi:3025 #, no-wrap msgid "-A [@var{regexp}]" msgstr "-A [@var{Regexp}]" #. type: table -#: doc/guix.texi:3031 +#: doc/guix.texi:3029 msgid "List packages currently available in the distribution for this system (@pxref{GNU Distribution}). When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}." msgstr "Listet Pakete auf, die in der aktuell installierten Distribution dieses Systems verfügbar sind (siehe @ref{GNU Distribution}). Wenn ein regulärer Ausdruck @var{Regexp} angegeben wird, werden nur Pakete aufgeführt, deren Name zum regulären Ausdruck @var{Regexp} passt." #. type: table -#: doc/guix.texi:3035 +#: doc/guix.texi:3033 msgid "For each package, print the following items separated by tabs: its name, its version string, the parts of the package (@pxref{Packages with Multiple Outputs}), and the source location of its definition." msgstr "Zu jedem Paket werden folgende Informationen getrennt durch Tabulatorzeichen ausgegeben: der Name, die Version als Zeichenkette, die Teile des Programms (siehe @ref{Packages with Multiple Outputs}) und die Stelle im Quellcode, an der das Paket definiert ist." #. type: item -#: doc/guix.texi:3036 doc/guix.texi:3705 +#: doc/guix.texi:3034 doc/guix.texi:3703 #, no-wrap msgid "--list-generations[=@var{pattern}]" msgstr "--list-generations[=@var{Muster}]" #. type: itemx -#: doc/guix.texi:3037 doc/guix.texi:3706 +#: doc/guix.texi:3035 doc/guix.texi:3704 #, no-wrap msgid "-l [@var{pattern}]" msgstr "-l [@var{Muster}]" #. type: table -#: doc/guix.texi:3043 +#: doc/guix.texi:3041 msgid "Return a list of generations along with their creation dates; for each generation, show the installed packages, with the most recently installed packages shown last. Note that the zeroth generation is never shown." msgstr "Liefert eine Liste der Generationen zusammen mit dem Datum, an dem sie erzeugt wurden; zu jeder Generation werden zudem die installierten Pakete angezeigt, zuletzt installierte Pakete zuletzt. Beachten Sie, dass die nullte Generation niemals angezeigt wird." #. type: table -#: doc/guix.texi:3048 +#: doc/guix.texi:3046 msgid "For each installed package, print the following items, separated by tabs: the name of a package, its version string, the part of the package that is installed (@pxref{Packages with Multiple Outputs}), and the location of this package in the store." msgstr "Zu jedem installierten Paket werden folgende Informationen durch Tabulatorzeichen getrennt angezeigt: der Name des Pakets, die Version als Zeichenkette, welcher Teil des Pakets installiert ist (siehe @ref{Packages with Multiple Outputs}) und an welcher Stelle sich das Paket im Store befindet." #. type: table -#: doc/guix.texi:3051 +#: doc/guix.texi:3049 msgid "When @var{pattern} is used, the command returns only matching generations. Valid patterns include:" msgstr "Wenn ein @var{Muster} angegeben wird, liefert der Befehl nur dazu passende Generationen. Gültige Muster sind zum Beispiel:" #. type: item -#: doc/guix.texi:3053 +#: doc/guix.texi:3051 #, no-wrap msgid "@emph{Integers and comma-separated integers}. Both patterns denote" msgstr "@emph{Ganze Zahlen und kommagetrennte ganze Zahlen}. Beide Muster bezeichnen" #. type: itemize -#: doc/guix.texi:3056 +#: doc/guix.texi:3054 msgid "generation numbers. For instance, @code{--list-generations=1} returns the first one." msgstr "Generationsnummern. Zum Beispiel liefert @code{--list-generations=1} die erste Generation." #. type: itemize -#: doc/guix.texi:3059 +#: doc/guix.texi:3057 msgid "And @code{--list-generations=1,8,2} outputs three generations in the specified order. Neither spaces nor trailing commas are allowed." msgstr "Durch @code{--list-generations=1,8,2} werden drei Generationen in der angegebenen Reihenfolge angezeigt. Weder Leerzeichen noch ein Komma am Schluss der Liste ist erlaubt." #. type: item -#: doc/guix.texi:3060 +#: doc/guix.texi:3058 #, no-wrap msgid "@emph{Ranges}. @code{--list-generations=2..9} prints the" msgstr "@emph{Bereiche}. @code{--list-generations=2..9} gibt die" #. type: itemize -#: doc/guix.texi:3063 +#: doc/guix.texi:3061 msgid "specified generations and everything in between. Note that the start of a range must be smaller than its end." msgstr "angegebenen Generationen und alles dazwischen aus. Beachten Sie, dass der Bereichsanfang eine kleinere Zahl als das Bereichsende sein muss." #. type: itemize -#: doc/guix.texi:3067 +#: doc/guix.texi:3065 msgid "It is also possible to omit the endpoint. For example, @code{--list-generations=2..}, returns all generations starting from the second one." msgstr "Sie können auch kein Bereichsende angeben, zum Beispiel liefert @code{--list-generations=2..} alle Generationen ab der zweiten." #. type: item -#: doc/guix.texi:3068 +#: doc/guix.texi:3066 #, no-wrap msgid "@emph{Durations}. You can also get the last @emph{N}@tie{}days, weeks," msgstr "@emph{Zeitdauern}. Sie können auch die letzten @emph{N}@tie{}Tage, Wochen" #. type: itemize -#: doc/guix.texi:3072 +#: doc/guix.texi:3070 msgid "or months by passing an integer along with the first letter of the duration. For example, @code{--list-generations=20d} lists generations that are up to 20 days old." msgstr "oder Monate angeben, indem Sie eine ganze Zahl gefolgt von jeweils „d“, „w“ oder „m“ angeben (dem ersten Buchstaben der Maßeinheit der Dauer im Englischen). Zum Beispiel listet @code{--list-generations=20d} die Generationen auf, die höchstens 20 Tage alt sind." #. type: item -#: doc/guix.texi:3074 +#: doc/guix.texi:3072 #, no-wrap msgid "--delete-generations[=@var{pattern}]" msgstr "--delete-generations[=@var{Muster}]" #. type: itemx -#: doc/guix.texi:3075 +#: doc/guix.texi:3073 #, no-wrap msgid "-d [@var{pattern}]" msgstr "-d [@var{Muster}]" #. type: table -#: doc/guix.texi:3078 +#: doc/guix.texi:3076 msgid "When @var{pattern} is omitted, delete all generations except the current one." msgstr "Wird kein @var{Muster} angegeben, werden alle Generationen außer der aktuellen entfernt." #. type: table -#: doc/guix.texi:3084 +#: doc/guix.texi:3082 msgid "This command accepts the same patterns as @option{--list-generations}. When @var{pattern} is specified, delete the matching generations. When @var{pattern} specifies a duration, generations @emph{older} than the specified duration match. For instance, @code{--delete-generations=1m} deletes generations that are more than one month old." msgstr "Dieser Befehl akzeptiert dieselben Muster wie @option{--list-generations}. Wenn ein @var{Muster} angegeben wird, werden die passenden Generationen gelöscht. Wenn das @var{Muster} für eine Zeitdauer steht, werden diejenigen Generationen gelöscht, die @emph{älter} als die angegebene Dauer sind. Zum Beispiel löscht @code{--delete-generations=1m} die Generationen, die mehr als einen Monat alt sind." #. type: table -#: doc/guix.texi:3087 +#: doc/guix.texi:3085 msgid "If the current generation matches, it is @emph{not} deleted. Also, the zeroth generation is never deleted." msgstr "Falls die aktuelle Generation zum Muster passt, wird sie @emph{nicht} gelöscht. Auch die nullte Generation wird niemals gelöscht." #. type: table -#: doc/guix.texi:3090 +#: doc/guix.texi:3088 msgid "Note that deleting generations prevents rolling back to them. Consequently, this command must be used with care." msgstr "Beachten Sie, dass Sie auf gelöschte Generationen nicht zurückwechseln können. Dieser Befehl sollte also nur mit Vorsicht benutzt werden." #. type: Plain text -#: doc/guix.texi:3101 +#: doc/guix.texi:3099 msgid "Finally, since @command{guix package} may actually start build processes, it supports all the common build options (@pxref{Common Build Options}). It also supports package transformation options, such as @option{--with-source} (@pxref{Package Transformation Options}). However, note that package transformations are lost when upgrading; to preserve transformations across upgrades, you should define your own package variant in a Guile module and add it to @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})." msgstr "Zu guter Letzt können Sie, da @command{guix package} Erstellungsprozesse zu starten vermag, auch alle gemeinsamen Erstellungsoptionen (siehe @ref{Common Build Options}) verwenden. Auch Paketumwandlungsoptionen wie @option{--with-source} sind möglich (siehe @ref{Package Transformation Options}). Beachten Sie jedoch, dass die verwendeten Paketumwandlungsoptionen verloren gehen, nachdem Sie die Pakete aktualisiert haben. Damit Paketumwandlungen über Aktualisierungen hinweg erhalten bleiben, sollten Sie Ihre eigene Paketvariante in einem Guile-Modul definieren und zur Umgebungsvariablen @code{GUIX_PACKAGE_PATH} hinzufügen (siehe @ref{Defining Packages})." #. type: cindex -#: doc/guix.texi:3106 +#: doc/guix.texi:3104 #, no-wrap msgid "pre-built binaries" msgstr "vorerstellte Binärdateien" #. type: Plain text -#: doc/guix.texi:3112 +#: doc/guix.texi:3110 msgid "Guix supports transparent source/binary deployment, which means that it can either build things locally, or download pre-built items from a server, or both. We call these pre-built items @dfn{substitutes}---they are substitutes for local build results. In many cases, downloading a substitute is much faster than building things locally." msgstr "Guix kann transparent Binär- oder Quelldateien ausliefern. Das heißt, Dinge können sowohl lokal erstellt, als auch als vorerstellte Objekte von einem Server heruntergeladen werden, oder beides gemischt. Wir bezeichnen diese vorerstellten Objekte als @dfn{Substitute} — sie substituieren lokale Erstellungsergebnisse. In vielen Fällen geht das Herunterladen eines Substituts wesentlich schneller, als Dinge lokal zu erstellen." #. type: Plain text -#: doc/guix.texi:3117 +#: doc/guix.texi:3115 msgid "Substitutes can be anything resulting from a derivation build (@pxref{Derivations}). Of course, in the common case, they are pre-built package binaries, but source tarballs, for instance, which also result from derivation builds, can be available as substitutes." msgstr "Substitute können alles sein, was das Ergebnis einer Ableitungserstellung ist (siehe @ref{Derivations}). Natürlich sind sie üblicherweise vorerstellte Paket-Binärdateien, aber wenn zum Beispiel ein Quell-Tarball das Ergebnis einer Ableitungserstellung ist, kann auch er als Substitut verfügbar sein." #. type: cindex -#: doc/guix.texi:3130 +#: doc/guix.texi:3128 #, no-wrap msgid "hydra" msgstr "Hydra" #. type: cindex -#: doc/guix.texi:3131 +#: doc/guix.texi:3129 #, no-wrap msgid "build farm" msgstr "Build-Farm" #. type: Plain text -#: doc/guix.texi:3141 +#: doc/guix.texi:3139 msgid "The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official build farm that builds packages from Guix continuously for some architectures, and makes them available as substitutes. This is the default source of substitutes; it can be overridden by passing the @option{--substitute-urls} option either to @command{guix-daemon} (@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}}) or to client tools such as @command{guix package} (@pxref{client-substitute-urls,, client @option{--substitute-urls} option})." msgstr "Der Server @code{@value{SUBSTITUTE-SERVER}} ist die Fassade für eine offizielle „Build-Farm“, ein Erstellungswerk, das kontinuierlich Guix-Pakete für einige Prozessorarchitekturen erstellt und sie als Substitute zur Verfügung stellt. Dies ist die standardmäßige Quelle von Substituten; durch Übergeben der Befehlszeilenoption @option{--substitute-urls} an entweder den @command{guix-daemon} (siehe @ref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}}) oder Client-Werkzeuge wie @command{guix package} (siehe @ref{client-substitute-urls,, die Befehlszeilenoption @option{--substitute-urls} beim Client}) kann eine abweichende Einstellung benutzt werden." #. type: Plain text -#: doc/guix.texi:3147 +#: doc/guix.texi:3145 msgid "Substitute URLs can be either HTTP or HTTPS. HTTPS is recommended because communications are encrypted; conversely, using HTTP makes all communications visible to an eavesdropper, who could use the information gathered to determine, for instance, whether your system has unpatched security vulnerabilities." msgstr "Substitut-URLs können entweder HTTP oder HTTPS sein. HTTPS wird empfohlen, weil die Kommunikation verschlüsselt ist; umgekehrt kann bei HTTP die Kommunikation belauscht werden, wodurch der Angreifer zum Beispiel erfahren könnte, ob Ihr System über noch nicht behobene Sicherheitsschwachstellen verfügt." #. type: Plain text -#: doc/guix.texi:3156 +#: doc/guix.texi:3154 msgid "Substitutes from the official build farm are enabled by default when using Guix System (@pxref{GNU Distribution}). However, they are disabled by default when using Guix on a foreign distribution, unless you have explicitly enabled them via one of the recommended installation steps (@pxref{Installation}). The following paragraphs describe how to enable or disable substitutes for the official build farm; the same procedure can also be used to enable substitutes for any other substitute server." msgstr "Substitute von der offiziellen Build-Farm sind standardmäßig erlaubt, wenn Sie Guix System verwenden (siehe @ref{GNU Distribution}). Auf Fremddistributionen sind sie allerdings standardmäßig ausgeschaltet, solange Sie sie nicht ausdrücklich in einem der empfohlenen Installationsschritte erlaubt haben (siehe @ref{Installation}). Die folgenden Absätze beschreiben, wie Sie Substitute für die offizielle Build-Farm an- oder ausschalten; dieselbe Prozedur kann auch benutzt werden, um Substitute für einen beliebigen anderen Substitutsserver zu erlauben." #. type: cindex -#: doc/guix.texi:3160 +#: doc/guix.texi:3158 #, no-wrap msgid "security" msgstr "Sicherheit" #. type: cindex -#: doc/guix.texi:3162 +#: doc/guix.texi:3160 #, no-wrap msgid "access control list (ACL), for substitutes" msgstr "Access Control List (ACL), für Substitute" #. type: cindex -#: doc/guix.texi:3163 +#: doc/guix.texi:3161 #, no-wrap msgid "ACL (access control list), for substitutes" msgstr "ACL (Access Control List), für Substitute" #. type: Plain text -#: doc/guix.texi:3170 +#: doc/guix.texi:3168 msgid "To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER}} or a mirror thereof, you must add its public key to the access control list (ACL) of archive imports, using the @command{guix archive} command (@pxref{Invoking guix archive}). Doing so implies that you trust @code{@value{SUBSTITUTE-SERVER}} to not be compromised and to serve genuine substitutes." msgstr "Um es Guix zu gestatten, Substitute von @code{@value{SUBSTITUTE-SERVER}} oder einem Spiegelserver davon herunterzuladen, müssen Sie den zugehörigen öffentlichen Schlüssel zur Access Control List (ACL, Zugriffssteuerungsliste) für Archivimporte hinzufügen, mit Hilfe des Befehls @command{guix archive} (siehe @ref{Invoking guix archive}). Dies impliziert, dass Sie darauf vertrauen, dass @code{@value{SUBSTITUTE-SERVER}} nicht kompromittiert wurde und echte Substitute liefert." #. type: Plain text -#: doc/guix.texi:3177 +#: doc/guix.texi:3175 msgid "The public key for @code{@value{SUBSTITUTE-SERVER}} is installed along with Guix, in @code{@var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub}, where @var{prefix} is the installation prefix of Guix. If you installed Guix from source, make sure you checked the GPG signature of @file{guix-@value{VERSION}.tar.gz}, which contains this public key file. Then, you can run something like this:" msgstr "Der öffentliche Schlüssel für @code{@value{SUBSTITUTE-SERVER}} wird zusammen mit Guix installiert, in das Verzeichnis @code{@var{prefix}/share/guix/hydra.gnu.org.pub}, wobei @var{prefix} das bei der Installation angegebene Präfix von Guix ist. Wenn Sie Guix aus seinem Quellcode heraus installieren, sollten Sie sichergehen, dass Sie die GPG-Signatur (auch „Beglaubigung“ genannt) von @file{guix-@value{VERSION}.tar.gz} prüfen, worin sich dieser öffentliche Schlüssel befindet. Dann können Sie so etwas wie hier ausführen:" #. type: example -#: doc/guix.texi:3180 +#: doc/guix.texi:3178 #, no-wrap msgid "# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub\n" msgstr "# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub\n" #. type: quotation -#: doc/guix.texi:3186 +#: doc/guix.texi:3184 msgid "Similarly, the @file{hydra.gnu.org.pub} file contains the public key of an independent build farm also run by the project, reachable at @indicateurl{https://mirror.hydra.gnu.org}." msgstr "Genauso enthält die Datei @file{hydra.gnu.org.pub} den öffentlichen Schlüssel für eine unabhängige Build-Farm, die auch vom Guix-Projekt betrieben wird. Sie ist unter @indicateurl{https://mirror.hydra.gnu.org} erreichbar ist." #. type: Plain text -#: doc/guix.texi:3190 +#: doc/guix.texi:3188 msgid "Once this is in place, the output of a command like @code{guix build} should change from something like:" msgstr "Sobald es eingerichtet wurde, sollte sich die Ausgabe eines Befehls wie @code{guix build} von so etwas:" #. type: example -#: doc/guix.texi:3199 +#: doc/guix.texi:3197 #, no-wrap msgid "" "$ guix build emacs --dry-run\n" @@ -7359,12 +7370,12 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:3203 +#: doc/guix.texi:3201 msgid "to something like:" msgstr "in so etwas verwandeln:" #. type: example -#: doc/guix.texi:3212 +#: doc/guix.texi:3210 #, no-wrap msgid "" "$ guix build emacs --dry-run\n" @@ -7384,590 +7395,590 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:3217 +#: doc/guix.texi:3215 msgid "This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when possible, for future builds." msgstr "Das zeigt an, dass Substitute von @code{@value{SUBSTITUTE-SERVER}} nutzbar sind und für zukünftige Erstellungen heruntergeladen werden, wann immer es möglich ist." #. type: cindex -#: doc/guix.texi:3218 +#: doc/guix.texi:3216 #, no-wrap msgid "substitutes, how to disable" msgstr "Substitute, wie man sie ausschaltet" #. type: Plain text -#: doc/guix.texi:3224 +#: doc/guix.texi:3222 msgid "The substitute mechanism can be disabled globally by running @code{guix-daemon} with @code{--no-substitutes} (@pxref{Invoking guix-daemon}). It can also be disabled temporarily by passing the @code{--no-substitutes} option to @command{guix package}, @command{guix build}, and other command-line tools." msgstr "Der Substitutsmechanismus kann global ausgeschaltet werden, indem Sie dem @code{guix-daemon} beim Starten die Befehlszeilenoption @code{--no-substitutes} übergeben (siehe @ref{Invoking guix-daemon}). Er kann auch temporär ausgeschaltet werden, indem Sie @code{--no-substitutes} an @command{guix package}, @command{guix build} und andere Befehlszeilenwerkzeuge übergeben." #. type: cindex -#: doc/guix.texi:3228 +#: doc/guix.texi:3226 #, no-wrap msgid "digital signatures" msgstr "digitale Signaturen" #. type: Plain text -#: doc/guix.texi:3232 +#: doc/guix.texi:3230 msgid "Guix detects and raises an error when attempting to use a substitute that has been tampered with. Likewise, it ignores substitutes that are not signed, or that are not signed by one of the keys listed in the ACL." msgstr "Guix erkennt, wenn ein verfälschtes Substitut benutzt würde, und meldet einen Fehler. Ebenso werden Substitute ignoriert, die nich signiert sind, oder nicht mit einem in der ACL aufgelisteten Schlüssel signiert sind." #. type: Plain text -#: doc/guix.texi:3238 +#: doc/guix.texi:3236 msgid "There is one exception though: if an unauthorized server provides substitutes that are @emph{bit-for-bit identical} to those provided by an authorized server, then the unauthorized server becomes eligible for downloads. For example, assume we have chosen two substitute servers with this option:" msgstr "Es gibt nur eine Ausnahme: Wenn ein unautorisierter Server Substitute anbietet, die @emph{Bit für Bit identisch} mit denen von einem autorisierten Server sind, können sie auch vom unautorisierten Server heruntergeladen werden. Zum Beispiel, angenommen wir haben zwei Substitutserver mit dieser Befehlszeilenoption ausgewählt:" #. type: example -#: doc/guix.texi:3241 +#: doc/guix.texi:3239 #, no-wrap msgid "--substitute-urls=\"https://a.example.org https://b.example.org\"\n" msgstr "--substitute-urls=\"https://a.example.org https://b.example.org\"\n" #. type: Plain text -#: doc/guix.texi:3252 +#: doc/guix.texi:3250 msgid "If the ACL contains only the key for @code{b.example.org}, and if @code{a.example.org} happens to serve the @emph{exact same} substitutes, then Guix will download substitutes from @code{a.example.org} because it comes first in the list and can be considered a mirror of @code{b.example.org}. In practice, independent build machines usually produce the same binaries, thanks to bit-reproducible builds (see below)." msgstr "Wenn in der ACL nur der Schlüssel für @code{b.example.org} aufgeführt wurde, aber @code{a.example.org} @emph{exakt dieselben} Substitute anbietet, wird Guix auch Substitute von @code{a.example.org} herunterladen, weil es in der Liste zuerst kommt und als Spiegelserver für @code{b.example.org} aufgefasst werden kann. In der Praxis haben unabhängige Maschinen bei der Erstellung normalerweise dieselben Binärdateien als Ergebnis, dank bit-reproduzierbarer Erstellungen (siehe unten)." #. type: Plain text -#: doc/guix.texi:3259 +#: doc/guix.texi:3257 msgid "When using HTTPS, the server's X.509 certificate is @emph{not} validated (in other words, the server is not authenticated), contrary to what HTTPS clients such as Web browsers usually do. This is because Guix authenticates substitute information itself, as explained above, which is what we care about (whereas X.509 certificates are about authenticating bindings between domain names and public keys.)" msgstr "Wenn Sie HTTPS benutzen, wird das X.509-Zertifikat des Servers @emph{nicht} validiert (mit anderen Worten, die Identität des Servers wird nicht authentifiziert), entgegen dem, was HTTPS-Clients wie Web-Browser normalerweise tun. Da Guix Substitutinformationen selbst überprüft, wie oben erklärt, wäre es unnötig (wohingegen mit X.509-Zertifikaten geprüft wird, ob ein Domain-Name zu öffentlichen Schlüsseln passt)." #. type: Plain text -#: doc/guix.texi:3271 +#: doc/guix.texi:3269 msgid "Substitutes are downloaded over HTTP or HTTPS. The @code{http_proxy} environment variable can be set in the environment of @command{guix-daemon} and is honored for downloads of substitutes. Note that the value of @code{http_proxy} in the environment where @command{guix build}, @command{guix package}, and other client commands are run has @emph{absolutely no effect}." msgstr "Substitute werden über HTTP oder HTTPS heruntergeladen. Die Umgebungsvariable @code{http_proxy} kann in der Umgebung von @command{guix-daemon} definiert werden und wirkt sich dann auf das Herunterladen von Substituten aus. Beachten Sie, dass der Wert von @code{http_proxy} in der Umgebung, in der @command{guix build}, @command{guix package} und andere Client-Befehle ausgeführt werden, @emph{keine Rolle spielt}." #. type: Plain text -#: doc/guix.texi:3280 +#: doc/guix.texi:3278 msgid "Even when a substitute for a derivation is available, sometimes the substitution attempt will fail. This can happen for a variety of reasons: the substitute server might be offline, the substitute may recently have been deleted, the connection might have been interrupted, etc." msgstr "Selbst wenn ein Substitut für eine Ableitung verfügbar ist, schlägt die versuchte Substitution manchmal fehl. Das kann aus vielen Gründen geschehen: die Substitutsserver könnten offline sein, das Substitut könnte kürzlich gelöscht worden sein, die Netzwerkverbindunge könnte unterbrochen worden sein, usw." #. type: Plain text -#: doc/guix.texi:3294 +#: doc/guix.texi:3292 msgid "When substitutes are enabled and a substitute for a derivation is available, but the substitution attempt fails, Guix will attempt to build the derivation locally depending on whether or not @code{--fallback} was given (@pxref{fallback-option,, common build option @code{--fallback}}). Specifically, if @code{--fallback} was omitted, then no local build will be performed, and the derivation is considered to have failed. However, if @code{--fallback} was given, then Guix will attempt to build the derivation locally, and the success or failure of the derivation depends on the success or failure of the local build. Note that when substitutes are disabled or no substitute is available for the derivation in question, a local build will @emph{always} be performed, regardless of whether or not @code{--fallback} was given." msgstr "Wenn Substitute aktiviert sind und ein Substitut für eine Ableitung zwar verfügbar ist, aber die versuchte Substitution fehlschlägt, kann Guix versuchen, die Ableitung lokal zu erstellen, je nachdem, ob @code{--fallback} übergeben wurde (siehe @ref{fallback-option,, common build option @code{--fallback}}). Genauer gesagt, wird keine lokale Erstellung durchgeführt, solange kein @code{--fallback} angegeben wurde, und die Ableitung wird als Fehlschlag angesehen. Wenn @code{--fallback} übergeben wurde, wird Guix versuchen, die Ableitung lokal zu erstellen, und ob die Ableitung erfolgreich ist oder nicht, hängt davon ab, ob die lokale Erstellung erfolgreich ist oder nicht. Beachten Sie, dass, falls Substitute ausgeschaltet oder erst gar kein Substitut verfügbar ist, @emph{immer} eine lokale Erstellung durchgeführt wird, egal ob @code{--fallback} übergeben wurde oder nicht." #. type: Plain text -#: doc/guix.texi:3299 +#: doc/guix.texi:3297 msgid "To get an idea of how many substitutes are available right now, you can try running the @command{guix weather} command (@pxref{Invoking guix weather}). This command provides statistics on the substitutes provided by a server." msgstr "Um eine Vorstellung zu bekommen, wieviele Substitute gerade verfügbar sind, können Sie den Befehl @command{guix weather} benutzen (siehe @ref{Invoking guix weather}). Dieser Befehl zeigt Statistiken darüber an, wie es um die von einem Server verfügbaren Substitute steht." #. type: cindex -#: doc/guix.texi:3303 +#: doc/guix.texi:3301 #, no-wrap msgid "trust, of pre-built binaries" msgstr "Vertrauen, gegenüber vorerstellten Binärdateien" #. type: Plain text -#: doc/guix.texi:3313 +#: doc/guix.texi:3311 msgid "Today, each individual's control over their own computing is at the mercy of institutions, corporations, and groups with enough power and determination to subvert the computing infrastructure and exploit its weaknesses. While using @code{@value{SUBSTITUTE-SERVER}} substitutes can be convenient, we encourage users to also build on their own, or even run their own build farm, such that @code{@value{SUBSTITUTE-SERVER}} is less of an interesting target. One way to help is by publishing the software you build using @command{guix publish} so that others have one more choice of server to download substitutes from (@pxref{Invoking guix publish})." msgstr "Derzeit hängt die Kontrolle jedes Individuums über seine Rechner von Institutionen, Unternehmen und solchen Gruppierungen ab, die über genug Macht und Entschlusskraft verfügen, die Rechnerinfrastruktur zu sabotieren und ihre Schwachstellen auszunutzen. Auch wenn es bequem ist, Substitute von @code{@value{SUBSTITUTE-SERVER}} zu benutzen, ermuntern wir Nutzer, auch selbst Erstellungen durchzuführen oder gar ihre eigene Build-Farm zu betreiben, damit @code{@value{SUBSTITUTE-SERVER}} ein weniger interessantes Ziel wird. Eine Art, uns zu helfen, ist, die von Ihnen erstellte Software mit dem Befehl @command{guix publish} zu veröffentlichen, damit andere eine größere Auswahl haben, von welchem Server sie Substitute beziehen möchten (siehe @ref{Invoking guix publish})." #. type: Plain text -#: doc/guix.texi:3325 +#: doc/guix.texi:3323 msgid "Guix has the foundations to maximize build reproducibility (@pxref{Features}). In most cases, independent builds of a given package or derivation should yield bit-identical results. Thus, through a diverse set of independent package builds, we can strengthen the integrity of our systems. The @command{guix challenge} command aims to help users assess substitute servers, and to assist developers in finding out about non-deterministic package builds (@pxref{Invoking guix challenge}). Similarly, the @option{--check} option of @command{guix build} allows users to check whether previously-installed substitutes are genuine by rebuilding them locally (@pxref{build-check, @command{guix build --check}})." msgstr "Guix hat die richtigen Grundlagen, um die Reproduzierbarkeit von Erstellungen zu maximieren (siehe @ref{Features}). In den meisten Fällen sollten unabhängige Erstellungen eines bestimmten Pakets zu bitweise identischen Ergebnissen führen. Wir können also mit Hilfe einer vielschichtigen Menge an unabhängigen Paketerstellungen die Integrität unseres Systems besser gewährleisten. Der Befehl @command{guix challenge} hat das Ziel, Nutzern zu ermöglichen, Substitutserver zu beurteilen, und Entwickler dabei zu unterstützen, nichtdeterministische Paketerstellungen zu finden (siehe @ref{Invoking guix challenge}). Ebenso ermöglicht es die Befehlszeilenoption @option{--check} von @command{guix build}, dass Nutzer bereits installierte Substitute auf Echtheit zu prüfen, indem sie lokal nachgebaut werden (siehe @ref{build-check, @command{guix build --check}})." #. type: Plain text -#: doc/guix.texi:3329 +#: doc/guix.texi:3327 msgid "In the future, we want Guix to have support to publish and retrieve binaries to/from other users, in a peer-to-peer fashion. If you would like to discuss this project, join us on @email{guix-devel@@gnu.org}." -msgstr "In Zukunft wollen wir, dass Guix Binärdateien an und von Nutzern peer-to-peer veröffentlichen kann. Wenn Sie mit uns dieses Projekt diskutieren möchten, kommen Sie auf unsere Mailing-Liste @email{guix-devel@@gnu.org}." +msgstr "In Zukunft wollen wir, dass Sie mit Guix Binärdateien von Netzwerkteilnehmer zu Netzwerkteilnehmer („peer-to-peer“) veröffentlichen und empfangen können. Wenn Sie mit uns dieses Projekt diskutieren möchten, kommen Sie auf unsere Mailing-Liste @email{guix-devel@@gnu.org}." #. type: cindex -#: doc/guix.texi:3333 +#: doc/guix.texi:3331 #, no-wrap msgid "multiple-output packages" msgstr "mehrere Ausgaben, bei Paketen" #. type: cindex -#: doc/guix.texi:3334 +#: doc/guix.texi:3332 #, no-wrap msgid "package outputs" msgstr "Paketausgaben" #. type: cindex -#: doc/guix.texi:3335 +#: doc/guix.texi:3333 #, no-wrap msgid "outputs" msgstr "Ausgaben" #. type: Plain text -#: doc/guix.texi:3345 +#: doc/guix.texi:3343 msgid "Often, packages defined in Guix have a single @dfn{output}---i.e., the source package leads to exactly one directory in the store. When running @command{guix install glibc}, one installs the default output of the GNU libc package; the default output is called @code{out}, but its name can be omitted as shown in this command. In this particular case, the default output of @code{glibc} contains all the C header files, shared libraries, static libraries, Info documentation, and other supporting files." msgstr "Oft haben in Guix definierte Pakete eine einzige @dfn{Ausgabe} — d.h.@: aus dem Quellpaket entsteht genau ein Verzeichnis im Store. Wenn Sie @command{guix install glibc} ausführen, wird die Standard-Paketausgabe des GNU-libc-Pakets installiert; die Standardausgabe wird @code{out} genannt, aber ihr Name kann weggelassen werden, wie Sie am obigen Befehl sehen. In diesem speziellen Fall enthält die Standard-Paketausgabe von @code{glibc} alle C-Headerdateien, gemeinsamen Bibliotheken („Shared Libraries“), statischen Bibliotheken („Static Libraries“), Dokumentation für Info sowie andere zusätzliche Dateien." #. type: Plain text -#: doc/guix.texi:3353 +#: doc/guix.texi:3351 msgid "Sometimes it is more appropriate to separate the various types of files produced from a single source package into separate outputs. For instance, the GLib C library (used by GTK+ and related packages) installs more than 20 MiB of reference documentation as HTML pages. To save space for users who do not need it, the documentation goes to a separate output, called @code{doc}. To install the main GLib output, which contains everything but the documentation, one would run:" msgstr "Manchmal ist es besser, die verschiedenen Arten von Dateien, die aus einem einzelnen Quellpaket hervorgehen, in getrennte Ausgaben zu unterteilen. Zum Beispiel installiert die GLib-C-Bibliothek (die von GTK und damit zusammenhängenden Paketen benutzt wird) mehr als 20 MiB an HTML-Seiten mit Referenzdokumentation. Um den Nutzern, die das nicht brauchen, Platz zu sparen, wird die Dokumentation in einer separaten Ausgabe abgelegt, genannt @code{doc}. Um also die Hauptausgabe von GLib zu installieren, zu der alles außer der Dokumentation gehört, ist der Befehl:" #. type: example -#: doc/guix.texi:3356 +#: doc/guix.texi:3354 #, no-wrap msgid "guix install glib\n" msgstr "guix install glib\n" #. type: item -#: doc/guix.texi:3358 doc/guix.texi:25332 doc/guix.texi:25357 +#: doc/guix.texi:3356 doc/guix.texi:25314 doc/guix.texi:25339 #, no-wrap msgid "documentation" msgstr "Dokumentation" #. type: Plain text -#: doc/guix.texi:3360 +#: doc/guix.texi:3358 msgid "The command to install its documentation is:" msgstr "Der Befehl, um die Dokumentation zu installieren, ist:" #. type: example -#: doc/guix.texi:3363 +#: doc/guix.texi:3361 #, no-wrap msgid "guix install glib:doc\n" msgstr "guix install glib:doc\n" #. type: Plain text -#: doc/guix.texi:3374 +#: doc/guix.texi:3372 msgid "Some packages install programs with different ``dependency footprints''. For instance, the WordNet package installs both command-line tools and graphical user interfaces (GUIs). The former depend solely on the C library, whereas the latter depend on Tcl/Tk and the underlying X libraries. In this case, we leave the command-line tools in the default output, whereas the GUIs are in a separate output. This allows users who do not need the GUIs to save space. The @command{guix size} command can help find out about such situations (@pxref{Invoking guix size}). @command{guix graph} can also be helpful (@pxref{Invoking guix graph})." msgstr "Manche Pakete installieren Programme mit unterschiedlich großem „Abhängigkeiten-Fußabdruck“. Zum Beispiel installiert das Paket WordNet sowohl Befehlszeilenwerkzeuge als auch grafische Benutzerschnittstellen (GUIs). Erstere hängen nur von der C-Bibliothek ab, während Letztere auch von Tcl/Tk und den zu Grunde liegenden X-Bibliotheken abhängen. Jedenfalls belassen wir deshalb die Befehlszeilenwerkzeuge in der Standard-Paketausgabe, während sich die GUIs in einer separaten Ausgabe befinden. So können Benutzer, die die GUIs nicht brauchen, Platz sparen. Der Befehl @command{guix size} kann dabei helfen, solche Situationen zu erkennen (siehe @ref{Invoking guix size}). @command{guix graph} kann auch helfen (siehe @ref{Invoking guix graph})." #. type: Plain text -#: doc/guix.texi:3382 +#: doc/guix.texi:3380 msgid "There are several such multiple-output packages in the GNU distribution. Other conventional output names include @code{lib} for libraries and possibly header files, @code{bin} for stand-alone programs, and @code{debug} for debugging information (@pxref{Installing Debugging Files}). The outputs of a packages are listed in the third column of the output of @command{guix package --list-available} (@pxref{Invoking guix package})." msgstr "In der GNU-Distribution gibt es viele solche Pakete mit mehreren Ausgaben. Andere Konventionen für Ausgabenamen sind zum Beispiel @code{lib} für Bibliotheken und eventuell auch ihre Header-Dateien,, @code{bin} für eigenständige Programme und @code{debug} für Informationen zur Fehlerbehandlung (siehe @ref{Installing Debugging Files}). Die Ausgaben eines Pakets stehen in der dritten Spalte der Anzeige von @command{guix package --list-available} (siehe @ref{Invoking guix package})." #. type: section -#: doc/guix.texi:3385 +#: doc/guix.texi:3383 #, no-wrap msgid "Invoking @command{guix gc}" msgstr "@command{guix gc} aufrufen" #. type: cindex -#: doc/guix.texi:3387 +#: doc/guix.texi:3385 #, no-wrap msgid "garbage collector" msgstr "Müllsammler" #. type: cindex -#: doc/guix.texi:3388 +#: doc/guix.texi:3386 #, no-wrap msgid "disk space" msgstr "Plattenspeicher" #. type: Plain text -#: doc/guix.texi:3394 +#: doc/guix.texi:3392 msgid "Packages that are installed, but not used, may be @dfn{garbage-collected}. The @command{guix gc} command allows users to explicitly run the garbage collector to reclaim space from the @file{/gnu/store} directory. It is the @emph{only} way to remove files from @file{/gnu/store}---removing files or directories manually may break it beyond repair!" msgstr "Pakete, die zwar installiert sind, aber nicht benutzt werden, können vom @dfn{Müllsammler} entfernt werden. Mit dem Befehl @command{guix gc} können Benutzer den Müllsammler ausdrücklich aufrufen, um Speicher im Verzeichnis @file{/gnu/store} freizugeben. Dies ist der @emph{einzige} Weg, Dateien aus @file{/gnu/store} zu entfernen — das manuelle Entfernen von Dateien kann den Store irreparabel beschädigen!" #. type: Plain text -#: doc/guix.texi:3405 +#: doc/guix.texi:3403 msgid "The garbage collector has a set of known @dfn{roots}: any file under @file{/gnu/store} reachable from a root is considered @dfn{live} and cannot be deleted; any other file is considered @dfn{dead} and may be deleted. The set of garbage collector roots (``GC roots'' for short) includes default user profiles; by default, the symlinks under @file{/var/guix/gcroots} represent these GC roots. New GC roots can be added with @command{guix build --root}, for example (@pxref{Invoking guix build}). The @command{guix gc --list-roots} command lists them." msgstr "Der Müllsammler kennt eine Reihe von @dfn{Wurzeln}: Jede Datei in @file{/gnu/store}, die von einer Wurzel aus erreichbar ist, gilt als @dfn{lebendig} und kann nicht entfernt werden; jede andere Datei gilt als @dfn{tot} und ist ein Kandidat, gelöscht zu werden. Die Menge der Müllsammlerwurzeln (kurz auch „GC-Wurzeln“, von englisch „Garbage Collector“) umfasst Standard-Benutzerprofile; standardmäßig werden diese Müllsammlerwurzeln durch symbolische Verknüpfungen in @file{/var/guix/gcroots} dargestellt. Neue Müllsammlerwurzeln können zum Beispiel mit @command{guix build --root} festgelegt werden (siehe @ref{Invoking guix build}). Der Befehl @command{guix gc --list-roots} listet sie auf." #. type: Plain text -#: doc/guix.texi:3411 +#: doc/guix.texi:3409 msgid "Prior to running @code{guix gc --collect-garbage} to make space, it is often useful to remove old generations from user profiles; that way, old package builds referenced by those generations can be reclaimed. This is achieved by running @code{guix package --delete-generations} (@pxref{Invoking guix package})." msgstr "Bevor Sie mit @code{guix gc --collect-garbage} Speicher freimachen, wollen Sie vielleicht alte Generationen von Benutzerprofilen löschen, damit alte Paketerstellungen von diesen Generationen entfernt werden können. Führen Sie dazu @code{guix package --delete-generations} aus (siehe @ref{Invoking guix package})." #. type: Plain text -#: doc/guix.texi:3415 +#: doc/guix.texi:3413 msgid "Our recommendation is to run a garbage collection periodically, or when you are short on disk space. For instance, to guarantee that at least 5@tie{}GB are available on your disk, simply run:" msgstr "Unsere Empfehlung ist, dass Sie den Müllsammler regelmäßig laufen lassen und wenn Sie wenig freien Speicherplatz zur Verfügung haben. Um zum Beispiel sicherzustellen, dass Sie mindestens 5@tie{}GB auf Ihrer Platte zur Verfügung haben, benutzen Sie einfach:" #. type: example -#: doc/guix.texi:3418 +#: doc/guix.texi:3416 #, no-wrap msgid "guix gc -F 5G\n" msgstr "guix gc -F 5G\n" #. type: Plain text -#: doc/guix.texi:3427 +#: doc/guix.texi:3425 msgid "It is perfectly safe to run as a non-interactive periodic job (@pxref{Scheduled Job Execution}, for how to set up such a job). Running @command{guix gc} with no arguments will collect as much garbage as it can, but that is often inconvenient: you may find yourself having to rebuild or re-download software that is ``dead'' from the GC viewpoint but that is necessary to build other pieces of software---e.g., the compiler tool chain." msgstr "Es ist völlig sicher, dafür eine nicht interaktive, regelmäßige Auftragsausführung vorzugeben (siehe @ref{Scheduled Job Execution} für eine Erklärung, wie man das tun kann). @command{guix gc} ohne Befehlszeilenargumente auszuführen, lässt so viel Müll wie möglich sammeln, aber das ist oft nicht, was man will, denn so muss man unter Umständen Software erneut erstellen oder erneut herunterladen, weil der Müllsammler sie als „tot“ ansieht, sie aber zur Erstellung anderer Software wieder gebraucht wird — das trifft zum Beispiel auf die Compiler-Toolchain zu." #. type: Plain text -#: doc/guix.texi:3433 +#: doc/guix.texi:3431 msgid "The @command{guix gc} command has three modes of operation: it can be used to garbage-collect any dead files (the default), to delete specific files (the @code{--delete} option), to print garbage-collector information, or for more advanced queries. The garbage collection options are as follows:" msgstr "Der Befehl @command{guix gc} hat drei Arbeitsmodi: Er kann benutzt werden, um als Müllsammler tote Dateien zu entfernen (das Standardverhalten), um ganz bestimmte, angegebene Datein zu löschen (mit der Befehlszeilenoption @code{--delete}), um Müllsammlerinformationen auszugeben oder fortgeschrittenere Anfragen zu verarbeiten. Die Müllsammler-Befehlszeilenoptionen sind wie folgt:" #. type: item -#: doc/guix.texi:3435 +#: doc/guix.texi:3433 #, no-wrap msgid "--collect-garbage[=@var{min}]" msgstr "--collect-garbage[=@var{Minimum}]" #. type: itemx -#: doc/guix.texi:3436 +#: doc/guix.texi:3434 #, no-wrap msgid "-C [@var{min}]" msgstr "-C [@var{Minimum}]" #. type: table -#: doc/guix.texi:3440 +#: doc/guix.texi:3438 msgid "Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-directories. This is the default operation when no option is specified." msgstr "Lässt Müll sammeln — z.B.@: nicht erreichbare Dateien in @file{/gnu/store} und seinen Unterverzeichnissen. Wird keine andere Befehlszeilenoption angegeben, wird standardmäßig diese durchgeführt." #. type: table -#: doc/guix.texi:3445 +#: doc/guix.texi:3443 msgid "When @var{min} is given, stop once @var{min} bytes have been collected. @var{min} may be a number of bytes, or it may include a unit as a suffix, such as @code{MiB} for mebibytes and @code{GB} for gigabytes (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." msgstr "Wenn ein @var{Minimum} angegeben wurde, hört der Müllsammler auf, sobald @var{Minimum} Bytes gesammelt wurden. Das @var{Minimum} kann die Anzahl der Bytes bezeichnen oder mit einer Einheit als Suffix versehen sein, wie etwa @code{MiB} für Mebibytes und @code{GB} für Gigabytes (siehe @ref{Block size, size specifications,, coreutils, GNU Coreutils})." #. type: table -#: doc/guix.texi:3447 +#: doc/guix.texi:3445 msgid "When @var{min} is omitted, collect all the garbage." msgstr "Wird kein @var{Minimum} angegeben, sammelt der Müllsammler allen Müll." #. type: item -#: doc/guix.texi:3448 +#: doc/guix.texi:3446 #, no-wrap msgid "--free-space=@var{free}" msgstr "--free-space=@var{Menge}" #. type: itemx -#: doc/guix.texi:3449 +#: doc/guix.texi:3447 #, no-wrap msgid "-F @var{free}" msgstr "-F @var{Menge}" #. type: table -#: doc/guix.texi:3453 +#: doc/guix.texi:3451 msgid "Collect garbage until @var{free} space is available under @file{/gnu/store}, if possible; @var{free} denotes storage space, such as @code{500MiB}, as described above." msgstr "Sammelt Müll, bis die angegebene @var{Menge} an freiem Speicher in @file{/gnu/store} zur Verfügung steht, falls möglich; die @var{Menge} ist eine Speichergröße wie @code{500MiB}, wie oben beschrieben." #. type: table -#: doc/guix.texi:3456 +#: doc/guix.texi:3454 msgid "When @var{free} or more is already available in @file{/gnu/store}, do nothing and exit immediately." msgstr "Wenn die angegebene @var{Menge} oder mehr bereits in @file{/gnu/store} frei verfügbar ist, passiert nichts." #. type: item -#: doc/guix.texi:3457 +#: doc/guix.texi:3455 #, no-wrap msgid "--delete-generations[=@var{duration}]" msgstr "--delete-generations[=@var{Dauer}]" #. type: itemx -#: doc/guix.texi:3458 +#: doc/guix.texi:3456 #, no-wrap msgid "-d [@var{duration}]" msgstr "-d [@var{Dauer}]" #. type: table -#: doc/guix.texi:3462 +#: doc/guix.texi:3460 msgid "Before starting the garbage collection process, delete all the generations older than @var{duration}, for all the user profiles; when run as root, this applies to all the profiles @emph{of all the users}." msgstr "Bevor der Müllsammelvorgang beginnt, werden hiermit alle Generationen von allen Benutzerprofilen gelöscht, die älter sind als die angegebene @var{Dauer}; wird es als Administratornutzer „root“ ausgeführt, geschieht dies mit den Profilen @emph{von allen Benutzern}." #. type: table -#: doc/guix.texi:3466 +#: doc/guix.texi:3464 msgid "For example, this command deletes all the generations of all your profiles that are older than 2 months (except generations that are current), and then proceeds to free space until at least 10 GiB are available:" msgstr "Zum Beispiel löscht der folgende Befehl alle Generationen Ihrer Profile, die älter als zwei Monate sind (ausgenommen die momentanen Generationen), und schmeißt dann den Müllsammler an, um Platz freizuräumen, bis mindestens 10 GiB verfügbar sind:" #. type: example -#: doc/guix.texi:3469 +#: doc/guix.texi:3467 #, no-wrap msgid "guix gc -d 2m -F 10G\n" msgstr "guix gc -d 2m -F 10G\n" #. type: item -#: doc/guix.texi:3471 +#: doc/guix.texi:3469 #, no-wrap msgid "--delete" msgstr "--delete" #. type: itemx -#: doc/guix.texi:3472 +#: doc/guix.texi:3470 #, no-wrap msgid "-D" msgstr "-D" #. type: table -#: doc/guix.texi:3476 +#: doc/guix.texi:3474 msgid "Attempt to delete all the store files and directories specified as arguments. This fails if some of the files are not in the store, or if they are still live." msgstr "Versucht, alle als Argumente angegebenen Dateien oder Verzeichnisse im Store zu löschen. Dies schlägt fehl, wenn manche der Dateien oder Verzeichnisse nicht im Store oder noch immer lebendig sind." #. type: item -#: doc/guix.texi:3477 +#: doc/guix.texi:3475 #, no-wrap msgid "--list-failures" msgstr "--list-failures" #. type: table -#: doc/guix.texi:3479 +#: doc/guix.texi:3477 msgid "List store items corresponding to cached build failures." msgstr "Store-Objekte auflisten, die zwischengespeicherten Erstellungsfehlern entsprechen." #. type: table -#: doc/guix.texi:3483 +#: doc/guix.texi:3481 msgid "This prints nothing unless the daemon was started with @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})." msgstr "Hierbei wird nichts ausgegeben, sofern der Daemon nicht mit @option{--cache-failures} gestartet wurde (siehe @ref{Invoking guix-daemon, @option{--cache-failures}})." #. type: item -#: doc/guix.texi:3484 +#: doc/guix.texi:3482 #, no-wrap msgid "--list-roots" msgstr "--list-roots" #. type: table -#: doc/guix.texi:3487 +#: doc/guix.texi:3485 msgid "List the GC roots owned by the user; when run as root, list @emph{all} the GC roots." msgstr "Die Müllsammlerwurzeln auflisten, die dem Nutzer gehören. Wird der Befehl als Administratornutzer ausgeführt, werden @emph{alle} Müllsammlerwurzeln aufgelistet." #. type: item -#: doc/guix.texi:3488 +#: doc/guix.texi:3486 #, no-wrap msgid "--clear-failures" msgstr "--clear-failures" #. type: table -#: doc/guix.texi:3490 +#: doc/guix.texi:3488 msgid "Remove the specified store items from the failed-build cache." msgstr "Die angegebenen Store-Objekte aus dem Zwischenspeicher für fehlgeschlagene Erstellungen entfernen." #. type: table -#: doc/guix.texi:3493 +#: doc/guix.texi:3491 msgid "Again, this option only makes sense when the daemon is started with @option{--cache-failures}. Otherwise, it does nothing." msgstr "Auch diese Option macht nur Sinn, wenn der Daemon mit @option{--cache-failures} gestartet wurde. Andernfalls passiert nichts." #. type: item -#: doc/guix.texi:3494 +#: doc/guix.texi:3492 #, no-wrap msgid "--list-dead" msgstr "--list-dead" #. type: table -#: doc/guix.texi:3497 +#: doc/guix.texi:3495 msgid "Show the list of dead files and directories still present in the store---i.e., files and directories no longer reachable from any root." msgstr "Zeigt die Liste toter Dateien und Verzeichnisse an, die sich noch im Store befinden — das heißt, Dateien, die von keiner Wurzel mehr erreichbar sind." #. type: item -#: doc/guix.texi:3498 +#: doc/guix.texi:3496 #, no-wrap msgid "--list-live" msgstr "--list-live" #. type: table -#: doc/guix.texi:3500 +#: doc/guix.texi:3498 msgid "Show the list of live store files and directories." msgstr "Zeige die Liste lebendiger Store-Dateien und -Verzeichnisse." #. type: Plain text -#: doc/guix.texi:3504 +#: doc/guix.texi:3502 msgid "In addition, the references among existing store files can be queried:" msgstr "Außerdem können Referenzen unter bestehenden Store-Dateien gefunden werden:" #. type: item -#: doc/guix.texi:3507 +#: doc/guix.texi:3505 #, no-wrap msgid "--references" msgstr "--references" #. type: itemx -#: doc/guix.texi:3508 +#: doc/guix.texi:3506 #, no-wrap msgid "--referrers" msgstr "--referrers" #. type: cindex -#: doc/guix.texi:3509 doc/guix.texi:9357 +#: doc/guix.texi:3507 doc/guix.texi:9355 #, no-wrap msgid "package dependencies" msgstr "Paketabhängigkeiten" #. type: table -#: doc/guix.texi:3512 +#: doc/guix.texi:3510 msgid "List the references (respectively, the referrers) of store files given as arguments." msgstr "Listet die referenzierten bzw. sie referenzierenden Objekte der angegebenen Store-Dateien auf." #. type: item -#: doc/guix.texi:3513 +#: doc/guix.texi:3511 #, no-wrap msgid "--requisites" msgstr "--requisites" #. type: itemx -#: doc/guix.texi:3514 doc/guix.texi:4812 +#: doc/guix.texi:3512 doc/guix.texi:4810 #, no-wrap msgid "-R" msgstr "-R" #. type: item -#: doc/guix.texi:3515 doc/guix.texi:9233 doc/guix.texi:9261 doc/guix.texi:9329 +#: doc/guix.texi:3513 doc/guix.texi:9231 doc/guix.texi:9259 doc/guix.texi:9327 #, no-wrap msgid "closure" msgstr "Abschluss" #. type: table -#: doc/guix.texi:3520 +#: doc/guix.texi:3518 msgid "List the requisites of the store files passed as arguments. Requisites include the store files themselves, their references, and the references of these, recursively. In other words, the returned list is the @dfn{transitive closure} of the store files." msgstr "Listet alle Voraussetzungen der als Argumente übergebenen Store-Dateien auf. Voraussetzungen sind die Store-Dateien selbst, ihre Referenzen sowie die Referenzen davon, rekursiv. Mit anderen Worten, die zurückgelieferte Liste ist der @dfn{transitive Abschluss} dieser Store-Dateien." #. type: table -#: doc/guix.texi:3524 +#: doc/guix.texi:3522 msgid "@xref{Invoking guix size}, for a tool to profile the size of the closure of an element. @xref{Invoking guix graph}, for a tool to visualize the graph of references." msgstr "Der Abschnitt @ref{Invoking guix size} erklärt ein Werkzeug, um den Speicherbedarf des Abschlusses eines Elements zu ermitteln. Siehe @ref{Invoking guix graph} für ein Werkzeug, um den Referenzgraphen zu veranschaulichen." #. type: item -#: doc/guix.texi:3525 +#: doc/guix.texi:3523 #, no-wrap msgid "--derivers" msgstr "--derivers" #. type: item -#: doc/guix.texi:3526 doc/guix.texi:4973 doc/guix.texi:9458 +#: doc/guix.texi:3524 doc/guix.texi:4971 doc/guix.texi:9456 #, no-wrap msgid "derivation" msgstr "Ableitung" #. type: table -#: doc/guix.texi:3529 +#: doc/guix.texi:3527 msgid "Return the derivation(s) leading to the given store items (@pxref{Derivations})." msgstr "Liefert die Ableitung(en), die zu den angegebenen Store-Objekten führen (siehe @ref{Derivations})." #. type: table -#: doc/guix.texi:3531 +#: doc/guix.texi:3529 msgid "For example, this command:" msgstr "Zum Beispiel liefert dieser Befehl:" #. type: example -#: doc/guix.texi:3534 +#: doc/guix.texi:3532 #, no-wrap msgid "guix gc --derivers `guix package -I ^emacs$ | cut -f4`\n" msgstr "guix gc --derivers `guix package -I ^emacs$ | cut -f4`\n" #. type: table -#: doc/guix.texi:3539 +#: doc/guix.texi:3537 msgid "returns the @file{.drv} file(s) leading to the @code{emacs} package installed in your profile." msgstr "die @file{.drv}-Datei(en), die zum in Ihrem Profil installierten @code{emacs}-Paket führen." #. type: table -#: doc/guix.texi:3543 +#: doc/guix.texi:3541 msgid "Note that there may be zero matching @file{.drv} files, for instance because these files have been garbage-collected. There can also be more than one matching @file{.drv} due to fixed-output derivations." msgstr "Beachten Sie, dass es auch sein kann, dass keine passenden @file{.drv}-Dateien existieren, zum Beispiel wenn diese Dateien bereits dem Müllsammler zum Opfer gefallen sind. Es kann auch passieren, dass es mehr als eine passende @file{.drv} gibt, bei Ableitungen mit fester Ausgabe." #. type: Plain text -#: doc/guix.texi:3547 +#: doc/guix.texi:3545 msgid "Lastly, the following options allow you to check the integrity of the store and to control disk usage." msgstr "Zuletzt können Sie mit folgenden Befehlszeilenoptionen die Integrität des Stores prüfen und den Plattenspeicherverbrauch im Zaum halten." #. type: item -#: doc/guix.texi:3550 +#: doc/guix.texi:3548 #, no-wrap msgid "--verify[=@var{options}]" msgstr "--verify[=@var{Optionen}]" #. type: cindex -#: doc/guix.texi:3551 +#: doc/guix.texi:3549 #, no-wrap msgid "integrity, of the store" msgstr "Integrität, des Stores" #. type: cindex -#: doc/guix.texi:3552 +#: doc/guix.texi:3550 #, no-wrap msgid "integrity checking" msgstr "Integritätsprüfung" #. type: table -#: doc/guix.texi:3554 +#: doc/guix.texi:3552 msgid "Verify the integrity of the store." msgstr "Die Integrität des Stores verifizieren" #. type: table -#: doc/guix.texi:3557 +#: doc/guix.texi:3555 msgid "By default, make sure that all the store items marked as valid in the database of the daemon actually exist in @file{/gnu/store}." msgstr "Standardmäßig wird sichergestellt, dass alle Store-Objekte, die in der Datenbank des Daemons als gültig markiert wurden, auch tatsächlich in @file{/gnu/store} existieren." #. type: table -#: doc/guix.texi:3560 +#: doc/guix.texi:3558 msgid "When provided, @var{options} must be a comma-separated list containing one or more of @code{contents} and @code{repair}." msgstr "Wenn angegeben, müssen die @var{Optionen} eine kommagetrennte Liste aus mindestens einem der Worte @code{contents} und @code{repair} sein." #. type: table -#: doc/guix.texi:3566 +#: doc/guix.texi:3564 msgid "When passing @option{--verify=contents}, the daemon computes the content hash of each store item and compares it against its hash in the database. Hash mismatches are reported as data corruptions. Because it traverses @emph{all the files in the store}, this command can take a long time, especially on systems with a slow disk drive." msgstr "Wenn Sie @option{--verify=contents} übergeben, berechnet der Daemon den Hash des Inhalts jedes Store-Objekts und vergleicht ihn mit dem Hash in der Datenbank. Sind die Hashes ungleich, wird eine Datenbeschädigung gemeldet. Weil dabei @emph{alle Dateien im Store} durchlaufen werden, kann der Befehl viel Zeit brauchen, besonders auf Systemen mit langsamer Platte." #. type: cindex -#: doc/guix.texi:3567 +#: doc/guix.texi:3565 #, no-wrap msgid "repairing the store" msgstr "Store, reparieren" #. type: cindex -#: doc/guix.texi:3568 doc/guix.texi:8127 +#: doc/guix.texi:3566 doc/guix.texi:8125 #, no-wrap msgid "corruption, recovering from" msgstr "Datenbeschädigung, Behebung" #. type: table -#: doc/guix.texi:3576 +#: doc/guix.texi:3574 msgid "Using @option{--verify=repair} or @option{--verify=contents,repair} causes the daemon to try to repair corrupt store items by fetching substitutes for them (@pxref{Substitutes}). Because repairing is not atomic, and thus potentially dangerous, it is available only to the system administrator. A lightweight alternative, when you know exactly which items in the store are corrupt, is @command{guix build --repair} (@pxref{Invoking guix build})." msgstr "Mit @option{--verify=repair} oder @option{--verify=contents,repair} versucht der Daemon, beschädigte Store-Objekte zu reparieren, indem er Substitute für selbige herunterlädt (siehe @ref{Substitutes}). Weil die Reparatur nicht atomar und daher womöglich riskant ist, kann nur der Systemadministrator den Befehl benutzen. Eine weniger aufwendige Alternative, wenn Sie wissen, welches Objekt beschädigt ist, ist, @command{guix build --repair} zu benutzen (siehe @ref{Invoking guix build})." #. type: item -#: doc/guix.texi:3577 +#: doc/guix.texi:3575 #, no-wrap msgid "--optimize" msgstr "--optimize" #. type: table -#: doc/guix.texi:3581 +#: doc/guix.texi:3579 msgid "Optimize the store by hard-linking identical files---this is @dfn{deduplication}." msgstr "Den Store durch Nutzung harter Verknüpfungen für identische Dateien optimieren — mit anderen Worten wird der Store @dfn{dedupliziert}." #. type: table -#: doc/guix.texi:3587 +#: doc/guix.texi:3585 msgid "The daemon performs deduplication after each successful build or archive import, unless it was started with @code{--disable-deduplication} (@pxref{Invoking guix-daemon, @code{--disable-deduplication}}). Thus, this option is primarily useful when the daemon was running with @code{--disable-deduplication}." msgstr "Der Daemon führt Deduplizierung automatisch nach jeder erfolgreichen Erstellung und jedem Importieren eines Archivs durch, sofern er nicht mit @code{--disable-deduplication} (siehe @ref{Invoking guix-daemon, @code{--disable-deduplication}}) gestartet wurde. Diese Befehlszeilenoption brauchen Sie also in erster Linie dann, wenn der Daemon zuvor mit @code{--disable-deduplication} gestartet worden ist." #. type: section -#: doc/guix.texi:3591 +#: doc/guix.texi:3589 #, no-wrap msgid "Invoking @command{guix pull}" msgstr "@command{guix pull} aufrufen" #. type: cindex -#: doc/guix.texi:3593 +#: doc/guix.texi:3591 #, no-wrap msgid "upgrading Guix" msgstr "Aktualisieren von Guix" #. type: cindex -#: doc/guix.texi:3594 +#: doc/guix.texi:3592 #, no-wrap msgid "updating Guix" msgstr "Updaten von Guix" #. type: command{#1} -#: doc/guix.texi:3595 +#: doc/guix.texi:3593 #, no-wrap msgid "guix pull" msgstr "guix pull" #. type: cindex -#: doc/guix.texi:3596 +#: doc/guix.texi:3594 #, no-wrap msgid "pull" msgstr "pull" #. type: Plain text -#: doc/guix.texi:3604 +#: doc/guix.texi:3602 msgid "Packages are installed or upgraded to the latest version available in the distribution currently available on your local machine. To update that distribution, along with the Guix tools, you must run @command{guix pull}: the command downloads the latest Guix source code and package descriptions, and deploys it. Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official GNU@tie{}Guix repository, though this can be customized." msgstr "Nach der Installation oder Aktualisierung wird stets die neueste Version von Paketen verwendet, die in der aktuell installierten Distribution verfügbar ist. Um die Distribution und die Guix-Werkzeuge zu aktualisieren, führen Sie @command{guix pull} aus. Der Befehl lädt den neuesten Guix-Quellcode einschließlich Paketbeschreibungen herunter und installiert ihn. Quellcode wird aus einem @uref{https://git-scm.com, Git-Repository} geladen, standardmäßig dem offiziellen Repository von GNU@tie{}Guix, was Sie aber auch ändern können." #. type: Plain text -#: doc/guix.texi:3610 +#: doc/guix.texi:3608 msgid "On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix. Not only that, but all the Guix commands and Scheme modules will also be taken from that latest version. New @command{guix} sub-commands added by the update also become available." msgstr "Danach wird @command{guix package} Pakete und ihre Versionen entsprechend der gerade heruntergeladenen Kopie von Guix benutzen. Nicht nur das, auch alle Guix-Befehle und Scheme-Module werden aus der neuesten Version von Guix kommen. Neue @command{guix}-Unterbefehle, die durch die Aktualisierung hinzugekommen sind, werden also auch verfügbar." #. type: Plain text -#: doc/guix.texi:3616 +#: doc/guix.texi:3614 msgid "Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who run @command{guix pull}. For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, and vice versa." msgstr "Jeder Nutzer kann seine Kopie von Guix mittels @command{guix pull} aktualisieren, wodurch sich nur für den Nutzer etwas verändert, der @command{guix pull} ausgeführt hat. Wenn also zum Beispiel der Administratornutzer @code{root} den Befehl @command{guix pull} ausführt, hat das keine Auswirkungen auf die für den Benutzer @code{alice} sichtbare Guix-Version, und umgekehrt." #. type: Plain text -#: doc/guix.texi:3622 +#: doc/guix.texi:3620 msgid "The result of running @command{guix pull} is a @dfn{profile} available under @file{~/.config/guix/current} containing the latest Guix. Thus, make sure to add it to the beginning of your search path so that you use the latest version, and similarly for the Info manual (@pxref{Documentation}):" msgstr "Das Ergebnis von @command{guix pull} ist ein als @file{~/.config/guix/current} verfügbares @dfn{Profil} mit dem neuesten Guix. Stellen Sie sicher, dass es am Anfang Ihres Suchpfades steht, damit Sie auch wirklich das neueste Guix und sein Info-Handbuch sehen (siehe @ref{Documentation}):" #. type: example -#: doc/guix.texi:3626 +#: doc/guix.texi:3624 #, no-wrap msgid "" "export PATH=\"$HOME/.config/guix/current/bin:$PATH\"\n" @@ -7977,12 +7988,12 @@ msgstr "" "export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"\n" #. type: Plain text -#: doc/guix.texi:3630 +#: doc/guix.texi:3628 msgid "The @code{--list-generations} or @code{-l} option lists past generations produced by @command{guix pull}, along with details about their provenance:" msgstr "Die Befehlszeilenoption @code{--list-generations} oder kurz @code{-l} listet ältere von @command{guix pull} erzeugte Generationen auf, zusammen mit Informationen zu deren Provenienz." #. type: example -#: doc/guix.texi:3638 +#: doc/guix.texi:3636 #, no-wrap msgid "" "$ guix pull -l\n" @@ -8002,7 +8013,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:3648 +#: doc/guix.texi:3646 #, no-wrap msgid "" "Generation 2\tJun 11 2018 11:02:49\n" @@ -8028,7 +8039,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:3656 +#: doc/guix.texi:3654 #, no-wrap msgid "" "Generation 3\tJun 13 2018 23:31:07\t(current)\n" @@ -8048,17 +8059,17 @@ msgstr "" " 69 packages upgraded: borg@@1.1.6, cheese@@3.28.0, …\n" #. type: Plain text -#: doc/guix.texi:3660 +#: doc/guix.texi:3658 msgid "@xref{Invoking guix describe, @command{guix describe}}, for other ways to describe the current status of Guix." msgstr "Im Abschnitt @ref{Invoking guix describe, @command{guix describe}} werden andere Möglichkeiten erklärt, sich den momentanen Zustand von Guix beschreiben zu lassen." #. type: Plain text -#: doc/guix.texi:3665 +#: doc/guix.texi:3663 msgid "This @code{~/.config/guix/current} profile works like any other profile created by @command{guix package} (@pxref{Invoking guix package}). That is, you can list generations, roll back to the previous generation---i.e., the previous Guix---and so on:" msgstr "Das Profil @code{~/.config/guix/current} verhält sich genau wie jedes andere Profil, das von @command{guix package} erzeugt wurde (siehe @ref{Invoking guix package}). Das bedeutet, Sie können seine Generationen auflisten und es auf die vorherige Generation — also das vorherige Guix — zurücksetzen und so weiter:" #. type: example -#: doc/guix.texi:3671 +#: doc/guix.texi:3669 #, no-wrap msgid "" "$ guix package -p ~/.config/guix/current --roll-back\n" @@ -8072,196 +8083,196 @@ msgstr "" "deleting /var/guix/profiles/per-user/charlie/current-guix-1-link\n" #. type: Plain text -#: doc/guix.texi:3675 +#: doc/guix.texi:3673 msgid "The @command{guix pull} command is usually invoked with no arguments, but it supports the following options:" msgstr "Der Befehl @command{guix pull} wird in der Regel ohne Befehlszeilenargumente aufgerufen, aber er versteht auch folgende Befehlszeilenoptionen:" #. type: item -#: doc/guix.texi:3677 +#: doc/guix.texi:3675 #, no-wrap msgid "--url=@var{url}" msgstr "--url=@var{URL}" #. type: itemx -#: doc/guix.texi:3678 +#: doc/guix.texi:3676 #, no-wrap msgid "--commit=@var{commit}" msgstr "--commit=@var{Commit}" #. type: itemx -#: doc/guix.texi:3679 +#: doc/guix.texi:3677 #, no-wrap msgid "--branch=@var{branch}" msgstr "--branch=@var{Branch}" #. type: table -#: doc/guix.texi:3683 +#: doc/guix.texi:3681 msgid "Download code for the @code{guix} channel from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}." msgstr "Code wird für den @code{guix}-Kanal von der angegebenen @var{URL} für den angegebenen @var{Commit} (eine gültige Commit-ID, dargestellt als hexadezimale Zeichenkette) oder @var{Branch} heruntergeladen." #. type: cindex -#: doc/guix.texi:3684 doc/guix.texi:3749 +#: doc/guix.texi:3682 doc/guix.texi:3747 #, no-wrap msgid "@file{channels.scm}, configuration file" msgstr "@file{channels.scm}, Konfigurationsdatei" #. type: cindex -#: doc/guix.texi:3685 doc/guix.texi:3750 +#: doc/guix.texi:3683 doc/guix.texi:3748 #, no-wrap msgid "configuration file for channels" msgstr "Konfigurationsdatei für Kanäle" #. type: table -#: doc/guix.texi:3689 +#: doc/guix.texi:3687 msgid "These options are provided for convenience, but you can also specify your configuration in the @file{~/.config/guix/channels.scm} file or using the @option{--channels} option (see below)." msgstr "Diese Befehlszeilenoptionen sind manchmal bequemer, aber Sie können Ihre Konfiguration auch in der Datei @file{~/.config/guix/channels.scm} oder über die Option @option{--channels} angeben (siehe unten)." #. type: item -#: doc/guix.texi:3690 +#: doc/guix.texi:3688 #, no-wrap msgid "--channels=@var{file}" msgstr "--channels=@var{Datei}" #. type: itemx -#: doc/guix.texi:3691 +#: doc/guix.texi:3689 #, no-wrap msgid "-C @var{file}" msgstr "-C @var{Datei}" #. type: table -#: doc/guix.texi:3696 +#: doc/guix.texi:3694 msgid "Read the list of channels from @var{file} instead of @file{~/.config/guix/channels.scm}. @var{file} must contain Scheme code that evaluates to a list of channel objects. @xref{Channels}, for more information." msgstr "Die Liste der Kanäle aus der angegebenen @var{Datei} statt aus @file{~/.config/guix/channels.scm} auslesen. Die @var{Datei} muss Scheme-Code enthalten, der zu einer Liste von Kanalobjekten ausgewertet wird. Siehe @ref{Channels} für nähere Informationen." #. type: item -#: doc/guix.texi:3697 +#: doc/guix.texi:3695 #, no-wrap msgid "--news" msgstr "--news" #. type: itemx -#: doc/guix.texi:3698 doc/guix.texi:4610 doc/guix.texi:24598 +#: doc/guix.texi:3696 doc/guix.texi:4608 #, no-wrap msgid "-N" msgstr "-N" #. type: table -#: doc/guix.texi:3700 +#: doc/guix.texi:3698 msgid "Display the list of packages added or upgraded since the previous generation." msgstr "Anzeigen, welche Pakete seit der letzten Generation hinzugefügt oder aktualisiert wurden." #. type: table -#: doc/guix.texi:3704 +#: doc/guix.texi:3702 msgid "This is the same information as displayed upon @command{guix pull} completion, but without ellipses; it is also similar to the output of @command{guix pull -l} for the last generation (see below)." msgstr "Die Information ist dieselbe, die auch nach Abschluss von @command{guix pull} angezeigt wird, aber ohne Auslassungen; sie ähnelt auch der Ausgabe von @command{guix pull -l} für die neueste Generation (siehe unten)." #. type: table -#: doc/guix.texi:3711 +#: doc/guix.texi:3709 msgid "List all the generations of @file{~/.config/guix/current} or, if @var{pattern} is provided, the subset of generations that match @var{pattern}. The syntax of @var{pattern} is the same as with @code{guix package --list-generations} (@pxref{Invoking guix package})." msgstr "Alle Generationen von @file{~/.config/guix/current} bzw., wenn ein @var{Muster} angegeben wird, die dazu passenden Generationen auflisten. Die Syntax für das @var{Muster} ist dieselbe wie bei @code{guix package --list-generations} (siehe @ref{Invoking guix package})." #. type: table -#: doc/guix.texi:3714 +#: doc/guix.texi:3712 msgid "@xref{Invoking guix describe}, for a way to display information about the current generation only." msgstr "Im Abschnitt @ref{Invoking guix describe, @command{guix describe}} wird eine Möglichkeit erklärt, sich Informationen nur über die aktuelle Generation anzeigen zu lassen." #. type: table -#: doc/guix.texi:3718 +#: doc/guix.texi:3716 msgid "Use @var{profile} instead of @file{~/.config/guix/current}." msgstr "Auf @var{Profil} anstelle von @file{~/.config/guix/current} arbeiten." #. type: item -#: doc/guix.texi:3719 doc/guix.texi:7703 +#: doc/guix.texi:3717 doc/guix.texi:7701 #, no-wrap msgid "--dry-run" msgstr "--dry-run" #. type: itemx -#: doc/guix.texi:3720 doc/guix.texi:7704 +#: doc/guix.texi:3718 doc/guix.texi:7702 #, no-wrap msgid "-n" msgstr "-n" #. type: table -#: doc/guix.texi:3723 +#: doc/guix.texi:3721 msgid "Show which channel commit(s) would be used and what would be built or substituted but do not actually do it." msgstr "Anzeigen, welche(r) Commit(s) für die Kanäle benutzt würde(n) und was jeweils erstellt oder substituiert würde, ohne es tatsächlich durchzuführen." #. type: itemx -#: doc/guix.texi:3725 doc/guix.texi:4593 doc/guix.texi:4886 doc/guix.texi:8069 -#: doc/guix.texi:9347 doc/guix.texi:9546 doc/guix.texi:10096 -#: doc/guix.texi:24565 +#: doc/guix.texi:3723 doc/guix.texi:4591 doc/guix.texi:4884 doc/guix.texi:8067 +#: doc/guix.texi:9345 doc/guix.texi:9544 doc/guix.texi:10094 +#: doc/guix.texi:24556 #, no-wrap msgid "-s @var{system}" msgstr "-s @var{System}" #. type: table -#: doc/guix.texi:3728 doc/guix.texi:4889 +#: doc/guix.texi:3726 doc/guix.texi:4887 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host." msgstr "Versuchen, für die angegebene Art von @var{System} geeignete Binärdateien zu erstellen — z.B.@: @code{i686-linux} — statt für die Art von System, das die Erstellung durchführt." #. type: item -#: doc/guix.texi:3729 doc/guix.texi:9904 +#: doc/guix.texi:3727 doc/guix.texi:9902 #, no-wrap msgid "--verbose" msgstr "--verbose" #. type: table -#: doc/guix.texi:3731 +#: doc/guix.texi:3729 msgid "Produce verbose output, writing build logs to the standard error output." msgstr "Ausführliche Informationen ausgeben und Erstellungsprotokolle auf der Standardfehlerausgabe ausgeben." #. type: table -#: doc/guix.texi:3735 +#: doc/guix.texi:3733 msgid "Use the bootstrap Guile to build the latest Guix. This option is only useful to Guix developers." msgstr "Das neueste Guix mit dem Bootstrap-Guile erstellen. Diese Befehlszeilenoption ist nur für Guix-Entwickler von Nutzen." #. type: Plain text -#: doc/guix.texi:3741 +#: doc/guix.texi:3739 msgid "The @dfn{channel} mechanism allows you to instruct @command{guix pull} which repository and branch to pull from, as well as @emph{additional} repositories containing package modules that should be deployed. @xref{Channels}, for more information." msgstr "Mit Hilfe von @dfn{Kanälen} können Sie @command{guix pull} anweisen, von welchem Repository und welchem Branch Guix aktualisiert werden soll, sowie von welchen @emph{weiteren} Repositorys Paketmodule bezogen werden sollen. Im Abschnitt @ref{Channels} finden Sie nähere Informationen." #. type: Plain text -#: doc/guix.texi:3744 +#: doc/guix.texi:3742 msgid "In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options})." msgstr "Außerdem unterstützt @command{guix pull} alle gemeinsamen Erstellungsoptionen (siehe @ref{Common Build Options})." #. type: item -#: doc/guix.texi:3748 doc/guix.texi:4151 +#: doc/guix.texi:3746 doc/guix.texi:4149 #, no-wrap msgid "channels" msgstr "Kanäle" #. type: cindex -#: doc/guix.texi:3751 +#: doc/guix.texi:3749 #, no-wrap msgid "@command{guix pull}, configuration file" msgstr "@command{guix pull}, Konfigurationsdatei" #. type: cindex -#: doc/guix.texi:3752 +#: doc/guix.texi:3750 #, no-wrap msgid "configuration of @command{guix pull}" msgstr "Konfiguration von @command{guix pull}" #. type: Plain text -#: doc/guix.texi:3761 +#: doc/guix.texi:3759 msgid "Guix and its package collection are updated by running @command{guix pull} (@pxref{Invoking guix pull}). By default @command{guix pull} downloads and deploys Guix itself from the official GNU@tie{}Guix repository. This can be customized by defining @dfn{channels} in the @file{~/.config/guix/channels.scm} file. A channel specifies a URL and branch of a Git repository to be deployed, and @command{guix pull} can be instructed to pull from one or more channels. In other words, channels can be used to @emph{customize} and to @emph{extend} Guix, as we will see below." msgstr "Guix und die Sammlung darin verfügbarer Pakete können Sie durch Ausführen von @command{guix pull} aktualisieren (siehe @ref{Invoking guix pull}). Standardmäßig lädt @command{guix pull} Guix selbst vom offiziellen Repository von GNU@tie{}Guix herunter und installiert es. Diesen Vorgang können Sie anpassen, indem Sie @dfn{Kanäle} in der Datei @file{~/.config/guix/channels.scm} angeben. Ein Kanal enthält eine Angabe einer URL und eines Branches eines zu installierenden Git-Repositorys und Sie können @command{guix pull} veranlassen, die Aktualisierungen von einem oder mehreren Kanälen zu beziehen. Mit anderen Worten können Kanäle benutzt werden, um Guix @emph{anzupassen} und zu @emph{erweitern}, wie wir im Folgenden sehen werden." #. type: subsection -#: doc/guix.texi:3762 +#: doc/guix.texi:3760 #, no-wrap msgid "Using a Custom Guix Channel" msgstr "Einen eigenen Guix-Kanal benutzen" #. type: Plain text -#: doc/guix.texi:3769 +#: doc/guix.texi:3767 msgid "The channel called @code{guix} specifies where Guix itself---its command-line tools as well as its package collection---should be downloaded. For instance, suppose you want to update from your own copy of the Guix repository at @code{example.org}, and specifically the @code{super-hacks} branch, you can write in @code{~/.config/guix/channels.scm} this specification:" msgstr "Der Kanal namens @code{guix} gibt an, wovon Guix selbst — seine Befehlszeilenwerkzeuge und seine Paketsammlung — heruntergeladen werden sollten. Wenn Sie zum Beispiel mit Ihrer eigenen Kopie des Guix-Repositorys arbeiten möchten und diese auf @code{example.org} zu finden ist, und zwar im Branch namens @code{super-hacks}, dann schreiben Sie folgende Spezifikation in @code{~/.config/guix/channels.scm}:" #. type: lisp -#: doc/guix.texi:3776 +#: doc/guix.texi:3774 #, no-wrap msgid "" ";; Tell 'guix pull' to use my own repo.\n" @@ -8277,83 +8288,83 @@ msgstr "" " (branch \"super-hacks\")))\n" #. type: Plain text -#: doc/guix.texi:3781 +#: doc/guix.texi:3779 msgid "From there on, @command{guix pull} will fetch code from the @code{super-hacks} branch of the repository at @code{example.org}." msgstr "Ab dann wird @command{guix pull} seinen Code vom Branch @code{super-hacks} des Repositorys auf @code{example.org} beziehen." #. type: subsection -#: doc/guix.texi:3782 +#: doc/guix.texi:3780 #, no-wrap msgid "Specifying Additional Channels" msgstr "Weitere Kanäle angeben" #. type: cindex -#: doc/guix.texi:3784 +#: doc/guix.texi:3782 #, no-wrap msgid "extending the package collection (channels)" msgstr "Paketsammlung erweitern (Kanäle)" #. type: cindex -#: doc/guix.texi:3785 +#: doc/guix.texi:3783 #, no-wrap msgid "personal packages (channels)" msgstr "Eigene Pakete (Kanäle)" #. type: cindex -#: doc/guix.texi:3786 +#: doc/guix.texi:3784 #, no-wrap msgid "channels, for personal packages" msgstr "Kanäle, für eigene Pakete" #. type: Plain text -#: doc/guix.texi:3794 +#: doc/guix.texi:3792 msgid "You can also specify @emph{additional channels} to pull from. Let's say you have a bunch of custom package variants or personal packages that you think would make little sense to contribute to the Guix project, but would like to have these packages transparently available to you at the command line. You would first write modules containing those package definitions (@pxref{Package Modules}), maintain them in a Git repository, and then you and anyone else can use it as an additional channel to get packages from. Neat, no?" msgstr "Sie können auch @emph{weitere Kanäle} als Bezugsquelle angeben. Sagen wir, Sie haben ein paar eigene Paketvarianten oder persönliche Pakete, von denen Sie meinen, dass sie @emph{nicht} geeignet sind, ins Guix-Projekt selbst aufgenommen zu werden, die Ihnen aber dennoch wie andere Pakete auf der Befehlszeile zur Verfügung stehen sollen. Dann würden Sie zunächst Module mit diesen Paketdefinitionen schreiben (siehe @ref{Package Modules}) und diese dann in einem Git-Repository verwalten, welches Sie selbst oder jeder andere dann als zusätzlichen Kanal eintragen können, von dem Pakete geladen werden. Klingt gut, oder?" #. type: quotation -#: doc/guix.texi:3798 +#: doc/guix.texi:3796 #, no-wrap msgid "Warning" msgstr "Warnung" #. type: quotation -#: doc/guix.texi:3802 +#: doc/guix.texi:3800 msgid "Before you, dear user, shout---``woow this is @emph{soooo coool}!''---and publish your personal channel to the world, we would like to share a few words of caution:" msgstr "Bevor Sie, verehrter Nutzer, ausrufen: „Wow, das ist @emph{soooo coool}!“, und Ihren eigenen Kanal der Welt zur Verfügung stellen, möchten wir Ihnen auch ein paar Worte der Warnung mit auf den Weg geben:" #. type: itemize -#: doc/guix.texi:3810 +#: doc/guix.texi:3808 msgid "Before publishing a channel, please consider contributing your package definitions to Guix proper (@pxref{Contributing}). Guix as a project is open to free software of all sorts, and packages in Guix proper are readily available to all Guix users and benefit from the project's quality assurance process." msgstr "Bevor Sie einen Kanal veröffentlichen, überlegen Sie sich bitte erst, ob Sie die Pakete nicht besser zum eigentlichen Guix-Projekt beisteuern (siehe @ref{Contributing}). Das Guix-Projekt ist gegenüber allen Arten freier Software offen und zum eigentlichen Guix gehörende Pakete stehen allen Guix-Nutzern zur Verfügung, außerdem profitieren sie von Guix’ Qualitätssicherungsprozess." #. type: itemize -#: doc/guix.texi:3819 +#: doc/guix.texi:3817 msgid "When you maintain package definitions outside Guix, we, Guix developers, consider that @emph{the compatibility burden is on you}. Remember that package modules and package definitions are just Scheme code that uses various programming interfaces (APIs). We want to remain free to change these APIs to keep improving Guix, possibly in ways that break your channel. We never change APIs gratuitously, but we will @emph{not} commit to freezing APIs either." msgstr "Wenn Sie Paketdefinitionen außerhalb von Guix betreuen, sehen wir Guix-Entwickler es als @emph{Ihre Aufgabe an, deren Kompatibilität sicherzstellen}. Bedenken Sie, dass Paketmodule und Paketdefinitionen nur Scheme-Code sind, der verschiedene Programmierschnittstellen (APIs) benutzt. Wir nehmen uns das Recht heraus, diese APIs jederzeit zu ändern, damit wir Guix besser machen können, womöglich auf eine Art, wodurch Ihr Kanal nicht mehr funktioniert. Wir ändern APIs nie einfach so, werden aber auch @emph{nicht} versprechen, APIs nicht zu verändern." #. type: itemize -#: doc/guix.texi:3823 +#: doc/guix.texi:3821 msgid "Corollary: if you're using an external channel and that channel breaks, please @emph{report the issue to the channel authors}, not to the Guix project." msgstr "Das bedeutet auch, dass Sie, wenn Sie einen externen Kanal verwenden und dieser kaputt geht, Sie dies bitte @emph{den Autoren des Kanals} und nicht dem Guix-Projekt melden." #. type: quotation -#: doc/guix.texi:3830 +#: doc/guix.texi:3828 msgid "You've been warned! Having said this, we believe external channels are a practical way to exert your freedom to augment Guix' package collection and to share your improvements, which are basic tenets of @uref{https://www.gnu.org/philosophy/free-sw.html, free software}. Please email us at @email{guix-devel@@gnu.org} if you'd like to discuss this." msgstr "Wir haben Sie gewarnt! Allerdings denken wir auch, dass externe Kanäle eine praktische Möglichkeit sind, die Paketsammlung von Guix zu ergänzen und Ihre Verbesserungen mit anderen zu teilen, wie es dem Grundgedanken @uref{https://www.gnu.org/philosophy/free-sw.html, freier Software} entspricht. Bitte schicken Sie eine E-Mail an @email{guix-devel@@gnu.org}, wenn Sie dies diskutieren möchten." #. type: Plain text -#: doc/guix.texi:3835 +#: doc/guix.texi:3833 msgid "To use a channel, write @code{~/.config/guix/channels.scm} to instruct @command{guix pull} to pull from it @emph{in addition} to the default Guix channel(s):" msgstr "Um einen Kanal zu benutzen, tragen Sie ihn in @code{~/.config/guix/channels.scm} ein, damit @command{guix pull} diesen Kanal @emph{zusätzlich} zu den standardmäßigen Guix-Kanälen als Paketquelle verwendet:" #. type: vindex -#: doc/guix.texi:3836 +#: doc/guix.texi:3834 #, no-wrap msgid "%default-channels" msgstr "%default-channels" #. type: lisp -#: doc/guix.texi:3843 +#: doc/guix.texi:3841 #, no-wrap msgid "" ";; Add my personal packages to those Guix provides.\n" @@ -8369,12 +8380,12 @@ msgstr "" " %default-channels)\n" #. type: Plain text -#: doc/guix.texi:3853 +#: doc/guix.texi:3851 msgid "Note that the snippet above is (as always!)@: Scheme code; we use @code{cons} to add a channel the list of channels that the variable @code{%default-channels} is bound to (@pxref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}). With this file in place, @command{guix pull} builds not only Guix but also the package modules from your own repository. The result in @file{~/.config/guix/current} is the union of Guix with your own package modules:" msgstr "Beachten Sie, dass der obige Schnipsel (wie immer!)@: Scheme-Code ist; mit @code{cons} fügen wir einen Kanal zur Liste der Kanäle hinzu, an die die Variable @code{%default-channels} gebunden ist (siehe @ref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}). Mit diesem Dateiinhalt wird @command{guix pull} nun nicht mehr nur Guix, sondern auch die Paketmodule aus Ihrem Repository erstellen. Das Ergebnis in @file{~/.config/guix/current} ist so die Vereinigung von Guix und Ihren eigenen Paketmodulen." #. type: example -#: doc/guix.texi:3868 +#: doc/guix.texi:3866 #, no-wrap msgid "" "$ guix pull --list-generations\n" @@ -8406,45 +8417,45 @@ msgstr "" " 4 packages upgraded: emacs-racket-mode@@0.0.2-2.1b78827, …\n" #. type: Plain text -#: doc/guix.texi:3876 +#: doc/guix.texi:3874 msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{my-personal-packages} channel. Among the new and upgraded packages that are listed, some like @code{my-gimp} and @code{my-emacs-with-cool-features} might come from @code{my-personal-packages}, while others come from the Guix default channel." msgstr "Obige Ausgabe von @command{guix pull} zeigt an, dass Generation@tie{}19 sowohl Guix als auch Pakete aus dem Kanal @code{meine-persönlichen-pakete} enthält. Unter den aufgeführten neuen und aktualisierten Paketen kommen vielleicht manche wie @code{mein-gimp} und @code{mein-emacs-mit-coolen-features} aus @code{meine-persönlichen-pakete}, während andere aus dem Standard-Guix-Kanal kommen." #. type: Plain text -#: doc/guix.texi:3887 +#: doc/guix.texi:3885 msgid "To create a channel, create a Git repository containing your own package modules and make it available. The repository can contain anything, but a useful channel will contain Guile modules that export packages. Once you start using a channel, Guix will behave as if the root directory of that channel's Git repository has been added to the Guile load path (@pxref{Load Paths,,, guile, GNU Guile Reference Manual}). For example, if your channel contains a file at @file{my-packages/my-tools.scm} that defines a Guile module, then the module will be available under the name @code{(my-packages my-tools)}, and you will be able to use it like any other module (@pxref{Modules,,, guile, GNU Guile Reference Manual})." msgstr "Um einen Kanal zu erzeugen, müssen Sie ein Git-Repository mit Ihren eigenen Paketmodulen erzeugen und den Zugriff darauf ermöglichen. Das Repository kann beliebigen Inhalt haben, aber wenn es ein nützlicher Kanal sein soll, muss es Guile-Module enthalten, die Pakete exportieren. Sobald Sie anfangen, einen Kanal zu benutzen, verhält sich Guix, als wäre das Wurzelverzeichnis des Git-Repositorys des Kanals in Guiles Ladepfad enthalten (siehe @ref{Load Paths,,, guile, GNU Guile Reference Manual}). Wenn Ihr Kanal also zum Beispiel eine Datei als @file{my-packages/my-tools.scm} enthält, die ein Guile-Modul definiert, dann wird das Modul unter dem Namen @code{(my-packages my-tools)} verfügbar sein und Sie werden es wie jedes andere Modul benutzen können (siehe @ref{Modules,,, guile, GNU Guile Reference Manual})." #. type: cindex -#: doc/guix.texi:3888 +#: doc/guix.texi:3886 #, no-wrap msgid "dependencies, channels" msgstr "Abhängigkeiten, bei Kanälen" #. type: cindex -#: doc/guix.texi:3889 +#: doc/guix.texi:3887 #, no-wrap msgid "meta-data, channels" msgstr "Metadaten, bei Kanälen" #. type: subsection -#: doc/guix.texi:3890 +#: doc/guix.texi:3888 #, no-wrap msgid "Declaring Channel Dependencies" msgstr "Kanalabhängigkeiten deklarieren" #. type: Plain text -#: doc/guix.texi:3896 +#: doc/guix.texi:3894 msgid "Channel authors may decide to augment a package collection provided by other channels. They can declare their channel to be dependent on other channels in a meta-data file @file{.guix-channel}, which is to be placed in the root of the channel repository." msgstr "Kanalautoren können auch beschließen, die Paketsammlung von anderen Kanälen zu erweitern. Dazu können sie in einer Metadatendatei @file{.guix-channel} deklarieren, dass ihr Kanal von anderen Kanälen abhängt. Diese Datei muss im Wurzelverzeichnis des Kanal-Repositorys platziert werden." #. type: Plain text -#: doc/guix.texi:3898 +#: doc/guix.texi:3896 msgid "The meta-data file should contain a simple S-expression like this:" msgstr "Die Metadatendatei sollte einen einfachen S-Ausdruck wie diesen enthalten:" #. type: lisp -#: doc/guix.texi:3910 +#: doc/guix.texi:3908 #, no-wrap msgid "" "(channel\n" @@ -8470,46 +8481,46 @@ msgstr "" " (branch \"testing\"))))\n" #. type: Plain text -#: doc/guix.texi:3916 +#: doc/guix.texi:3914 msgid "In the above example this channel is declared to depend on two other channels, which will both be fetched automatically. The modules provided by the channel will be compiled in an environment where the modules of all these declared channels are available." msgstr "Im Beispiel oben wird deklariert, dass dieser Kanal von zwei anderen Kanälen abhängt, die beide automatisch geladen werden. Die vom Kanal angebotenen Module werden in einer Umgebung kompiliert, in der die Module all dieser deklarierten Kanäle verfügbar sind." #. type: Plain text -#: doc/guix.texi:3920 +#: doc/guix.texi:3918 msgid "For the sake of reliability and maintainability, you should avoid dependencies on channels that you don't control, and you should aim to keep the number of dependencies to a minimum." msgstr "Um Verlässlichkeit und Wartbarkeit zu gewährleisten, sollen Sie darauf verzichten, eine Abhängigkeit von Kanälen herzustellen, die Sie nicht kontrollieren, außerdem sollten Sie sich auf eine möglichst kleine Anzahl von Abhängigkeiten beschränken." #. type: subsection -#: doc/guix.texi:3921 +#: doc/guix.texi:3919 #, no-wrap msgid "Replicating Guix" msgstr "Guix nachbilden" #. type: cindex -#: doc/guix.texi:3923 +#: doc/guix.texi:3921 #, no-wrap msgid "pinning, channels" msgstr "Festsetzen, bei Kanälen" #. type: cindex -#: doc/guix.texi:3924 doc/guix.texi:4090 +#: doc/guix.texi:3922 doc/guix.texi:4088 #, no-wrap msgid "replicating Guix" msgstr "Nachbilden von Guix" #. type: cindex -#: doc/guix.texi:3925 +#: doc/guix.texi:3923 #, no-wrap msgid "reproducibility, of Guix" msgstr "Reproduzierbarkeit von Guix" #. type: Plain text -#: doc/guix.texi:3930 +#: doc/guix.texi:3928 msgid "The @command{guix pull --list-generations} output above shows precisely which commits were used to build this instance of Guix. We can thus replicate it, say, on another machine, by providing a channel specification in @file{~/.config/guix/channels.scm} that is ``pinned'' to these commits:" msgstr "Die Ausgabe von @command{guix pull --list-generations} oben zeigt genau, aus welchen Commits diese Guix-Instanz erstellt wurde. Wir können Guix so zum Beispiel auf einer anderen Maschine nachbilden, indem wir eine Kanalspezifikation in @file{~/.config/guix/channels.scm} angeben, die auf diese Commits „festgesetzt“ ist." #. type: lisp -#: doc/guix.texi:3941 +#: doc/guix.texi:3939 #, no-wrap msgid "" ";; Deploy specific commits of my channels of interest.\n" @@ -8533,60 +8544,60 @@ msgstr "" " (branch \"dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb\")))\n" #. type: Plain text -#: doc/guix.texi:3945 +#: doc/guix.texi:3943 msgid "The @command{guix describe --format=channels} command can even generate this list of channels directly (@pxref{Invoking guix describe})." msgstr "Der Befehl @command{guix describe --format=channels} kann diese Kanalliste sogar direkt erzeugen (siehe @ref{Invoking guix describe})." #. type: Plain text -#: doc/guix.texi:3952 +#: doc/guix.texi:3950 msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}. The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine. It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines." msgstr "Somit läuft auf beiden Maschinen @emph{genau dasselbe Guix} und es hat Zugang zu @emph{genau denselben Paketen}. Die Ausgabe von @command{guix build gimp} auf der einen Maschine wird Bit für Bit genau dieselbe wie die desselben Befehls auf der anderen Maschine sein. Das bedeutet auch, dass beide Maschinen Zugang zum gesamten Quellcode von Guix und daher auch transitiv Zugang zum Quellcode jedes davon definierten Pakets haben." #. type: Plain text -#: doc/guix.texi:3957 +#: doc/guix.texi:3955 msgid "This gives you super powers, allowing you to track the provenance of binary artifacts with very fine grain, and to reproduce software environments at will---some sort of ``meta reproducibility'' capabilities, if you will. @xref{Inferiors}, for another way to take advantage of these super powers." msgstr "Das verleiht Ihnen Superkräfte, mit denen Sie die Provenienz binärer Artefakte sehr feinkörnig nachverfolgen können und Software-Umgebungen nach Belieben nachbilden können. Sie können es als eine Art Fähigkeit zur „Meta-Reproduzierbarkeit“ auffassen, wenn Sie möchten. Der Abschnitt @ref{Inferiors} beschreibt eine weitere Möglichkeit, diese Superkräfte zu nutzen." #. type: quotation -#: doc/guix.texi:3965 +#: doc/guix.texi:3963 msgid "The functionality described here is a ``technology preview'' as of version @value{VERSION}. As such, the interface is subject to change." msgstr "Die hier beschriebenen Funktionalitäten sind in der Version @value{VERSION} bloß eine „Technologie-Vorschau“, daher kann sich die Schnittstelle in Zukunft noch ändern." #. type: cindex -#: doc/guix.texi:3967 doc/guix.texi:7549 +#: doc/guix.texi:3965 doc/guix.texi:7547 #, no-wrap msgid "inferiors" msgstr "Untergeordnete" #. type: cindex -#: doc/guix.texi:3968 +#: doc/guix.texi:3966 #, no-wrap msgid "composition of Guix revisions" msgstr "Mischen von Guix-Versionen" #. type: Plain text -#: doc/guix.texi:3973 +#: doc/guix.texi:3971 msgid "Sometimes you might need to mix packages from the revision of Guix you're currently running with packages available in a different revision of Guix. Guix @dfn{inferiors} allow you to achieve that by composing different Guix revisions in arbitrary ways." msgstr "Manchmal könnten Sie Pakete aus der gerade laufenden Fassung von Guix mit denen mischen wollen, die in einer anderen Guix-Version verfügbar sind. Guix-@dfn{Untergeordnete} ermöglichen dies, indem Sie verschiedene Guix-Versionen beliebig mischen können." #. type: cindex -#: doc/guix.texi:3974 doc/guix.texi:4039 +#: doc/guix.texi:3972 doc/guix.texi:4037 #, no-wrap msgid "inferior packages" msgstr "untergeordnete Pakete" #. type: Plain text -#: doc/guix.texi:3980 +#: doc/guix.texi:3978 msgid "Technically, an ``inferior'' is essentially a separate Guix process connected to your main Guix process through a REPL (@pxref{Invoking guix repl}). The @code{(guix inferior)} module allows you to create inferiors and to communicate with them. It also provides a high-level interface to browse and manipulate the packages that an inferior provides---@dfn{inferior packages}." msgstr "Aus technischer Sicht ist ein „Untergeordneter“ im Kern ein separater Guix-Prozess, der über eine REPL (siehe @ref{Invoking guix repl}) mit Ihrem Haupt-Guix-Prozess verbunden ist. Das Modul @code{(guix inferior)} ermöglicht es Ihnen, Untergeordnete zu erstellen und mit ihnen zu kommunizieren. Dadurch steht Ihnen auch eine hochsprachliche Schnittstelle zur Verfügung, um die von einem Untergeordneten angebotenen Pakete zu durchsuchen und zu verändern — @dfn{untergeordnete Pakete}." #. type: Plain text -#: doc/guix.texi:3990 +#: doc/guix.texi:3988 msgid "When combined with channels (@pxref{Channels}), inferiors provide a simple way to interact with a separate revision of Guix. For example, let's assume you want to install in your profile the current @code{guile} package, along with the @code{guile-json} as it existed in an older revision of Guix---perhaps because the newer @code{guile-json} has an incompatible API and you want to run your code against the old API@. To do that, you could write a manifest for use by @code{guix package --manifest} (@pxref{Invoking guix package}); in that manifest, you would create an inferior for that old Guix revision you care about, and you would look up the @code{guile-json} package in the inferior:" msgstr "In Kombination mit Kanälen (siehe @ref{Channels}) bieten Untergeordnete eine einfache Möglichkeit, mit einer anderen Version von Guix zu interagieren. Nehmen wir zum Beispiel an, Sie wollen das aktuelle @code{guile}-Paket in Ihr Profil installieren, zusammen mit dem @code{guile-json}, wie es in einer früheren Guix-Version existiert hat — vielleicht weil das neuere @code{guile-json} eine inkompatible API hat und Sie daher Ihren Code mit der alten API benutzen möchten. Dazu könnten Sie ein Manifest für @code{guix package --manifest} schreiben (siehe @ref{Invoking guix package}); in diesem Manifest würden Sie einen Untergeordneten für diese alte Guix-Version erzeugen, für die Sie sich interessieren, und aus diesem Untergeordneten das @code{guile-json}-Paket holen:" #. type: lisp -#: doc/guix.texi:3994 +#: doc/guix.texi:3992 #, no-wrap msgid "" "(use-modules (guix inferior) (guix channels)\n" @@ -8598,7 +8609,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:4003 +#: doc/guix.texi:4001 #, no-wrap msgid "" "(define channels\n" @@ -8622,7 +8633,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:4007 +#: doc/guix.texi:4005 #, no-wrap msgid "" "(define inferior\n" @@ -8636,7 +8647,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:4013 +#: doc/guix.texi:4011 #, no-wrap msgid "" ";; Now create a manifest with the current \"guile\" package\n" @@ -8652,186 +8663,186 @@ msgstr "" " (specification->package \"guile\")))\n" #. type: Plain text -#: doc/guix.texi:4018 +#: doc/guix.texi:4016 msgid "On its first run, @command{guix package --manifest} might have to build the channel you specified before it can create the inferior; subsequent runs will be much faster because the Guix revision will be cached." msgstr "Bei seiner ersten Ausführung könnte für @command{guix package --manifest} erst der angegebene Kanal erstellt werden müssen, bevor der Untergeordnete erstellt werden kann; nachfolgende Durchläufe sind wesentlich schneller, weil diese Guix-Version bereits zwischengespeichert ist." #. type: Plain text -#: doc/guix.texi:4021 +#: doc/guix.texi:4019 msgid "The @code{(guix inferior)} module provides the following procedures to open an inferior:" msgstr "Folgende Prozeduren werden im Modul @code{(guix inferior)} angeboten, um einen Untergeordneten zu öffnen:" #. type: deffn -#: doc/guix.texi:4022 +#: doc/guix.texi:4020 #, no-wrap msgid "{Scheme Procedure} inferior-for-channels @var{channels} @" msgstr "{Scheme-Prozedur} inferior-for-channels @var{Kanäle} @" #. type: deffn -#: doc/guix.texi:4027 +#: doc/guix.texi:4025 msgid "[#:cache-directory] [#:ttl] Return an inferior for @var{channels}, a list of channels. Use the cache at @var{cache-directory}, where entries can be reclaimed after @var{ttl} seconds. This procedure opens a new connection to the build daemon." msgstr "[#:cache-directory] [#:ttl] Liefert einen Untergeordneten für die @var{Kanäle}, einer Liste von Kanälen. Dazu wird der Zwischenspeicher im Verzeichnis @var{cache-directory} benutzt, dessen Einträge nach @var{ttl} Sekunden gesammelt werden dürfen. Mit dieser Prozedur wird eine neue Verbindung zum Erstellungs-Daemon geöffnet." #. type: deffn -#: doc/guix.texi:4030 +#: doc/guix.texi:4028 msgid "As a side effect, this procedure may build or substitute binaries for @var{channels}, which can take time." msgstr "Als Nebenwirkung erstellt oder substituiert diese Prozedur unter Umständen Binärdateien für die @var{Kanäle}, was einige Zeit in Anspruch nehmen kann." #. type: deffn -#: doc/guix.texi:4032 +#: doc/guix.texi:4030 #, no-wrap msgid "{Scheme Procedure} open-inferior @var{directory} @" msgstr "{Scheme-Prozedur} open-inferior @var{Verzeichnis} @" #. type: deffn -#: doc/guix.texi:4037 +#: doc/guix.texi:4035 msgid "[#:command \"bin/guix\"] Open the inferior Guix in @var{directory}, running @code{@var{directory}/@var{command} repl} or equivalent. Return @code{#f} if the inferior could not be launched." msgstr "[#:command \"bin/guix\"] Öffnet das untergeordnete Guix mit dem Befehl @var{command} im angegebenen @var{Verzeichnis} durch Ausführung von @code{@var{Verzeichnis}/@var{command} repl} oder entsprechend. Liefert @code{#f}, wenn der Untergeordnete nicht gestartet werden konnte." #. type: Plain text -#: doc/guix.texi:4042 +#: doc/guix.texi:4040 msgid "The procedures listed below allow you to obtain and manipulate inferior packages." msgstr "Die im Folgenden aufgeführten Prozeduren ermöglichen es Ihnen, untergeordnete Pakete abzurufen und zu verändern." #. type: deffn -#: doc/guix.texi:4043 +#: doc/guix.texi:4041 #, no-wrap msgid "{Scheme Procedure} inferior-packages @var{inferior}" msgstr "{Scheme-Prozedur} inferior-packages @var{Untergeordneter}" #. type: deffn -#: doc/guix.texi:4045 +#: doc/guix.texi:4043 msgid "Return the list of packages known to @var{inferior}." msgstr "Liefert die Liste der Pakete in @var{Untergeordneter}." #. type: deffn -#: doc/guix.texi:4047 +#: doc/guix.texi:4045 #, no-wrap msgid "{Scheme Procedure} lookup-inferior-packages @var{inferior} @var{name} @" msgstr "{Scheme-Prozedur} lookup-inferior-packages @var{Untergeordneter} @var{Name} @" #. type: deffn -#: doc/guix.texi:4052 +#: doc/guix.texi:4050 msgid "[@var{version}] Return the sorted list of inferior packages matching @var{name} in @var{inferior}, with highest version numbers first. If @var{version} is true, return only packages with a version number prefixed by @var{version}." msgstr "[@var{Version}] Liefert die sortierte Liste der untergeordneten Pakete in @var{Untergeordneter}, die zum Muster @var{Name} in @var{Untergeordneter} passen, dabei kommen höhere Versionsnummern zuerst. Wenn @var{Version} auf wahr gesetzt ist, werden nur Pakete geliefert, deren Versionsnummer mit dem Präfix @var{Version} beginnt." #. type: deffn -#: doc/guix.texi:4054 +#: doc/guix.texi:4052 #, no-wrap msgid "{Scheme Procedure} inferior-package? @var{obj}" msgstr "{Scheme-Prozedur} inferior-package? @var{Objekt}" #. type: deffn -#: doc/guix.texi:4056 +#: doc/guix.texi:4054 msgid "Return true if @var{obj} is an inferior package." msgstr "Liefert wahr, wenn das @var{obj} ein Untergeordneter ist." #. type: deffn -#: doc/guix.texi:4058 +#: doc/guix.texi:4056 #, no-wrap msgid "{Scheme Procedure} inferior-package-name @var{package}" msgstr "{Scheme-Prozedur} inferior-package-name @var{Paket}" #. type: deffnx -#: doc/guix.texi:4059 +#: doc/guix.texi:4057 #, no-wrap msgid "{Scheme Procedure} inferior-package-version @var{package}" msgstr "{Scheme-Prozedur} inferior-package-version @var{Paket}" #. type: deffnx -#: doc/guix.texi:4060 +#: doc/guix.texi:4058 #, no-wrap msgid "{Scheme Procedure} inferior-package-synopsis @var{package}" msgstr "{Scheme-Prozedur} inferior-package-synopsis @var{Paket}" #. type: deffnx -#: doc/guix.texi:4061 +#: doc/guix.texi:4059 #, no-wrap msgid "{Scheme Procedure} inferior-package-description @var{package}" msgstr "{Scheme-Prozedur} inferior-package-description @var{Paket}" #. type: deffnx -#: doc/guix.texi:4062 +#: doc/guix.texi:4060 #, no-wrap msgid "{Scheme Procedure} inferior-package-home-page @var{package}" msgstr "{Scheme-Prozedur} inferior-package-home-page @var{Paket}" #. type: deffnx -#: doc/guix.texi:4063 +#: doc/guix.texi:4061 #, no-wrap msgid "{Scheme Procedure} inferior-package-location @var{package}" msgstr "{Scheme-Prozedur} inferior-package-location @var{Paket}" #. type: deffnx -#: doc/guix.texi:4064 +#: doc/guix.texi:4062 #, no-wrap msgid "{Scheme Procedure} inferior-package-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4065 +#: doc/guix.texi:4063 #, no-wrap msgid "{Scheme Procedure} inferior-package-native-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-native-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4066 +#: doc/guix.texi:4064 #, no-wrap msgid "{Scheme Procedure} inferior-package-propagated-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-propagated-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4067 +#: doc/guix.texi:4065 #, no-wrap msgid "{Scheme Procedure} inferior-package-transitive-propagated-inputs @var{package}" msgstr "{Scheme-Prozedur} inferior-package-transitive-propagated-inputs @var{Paket}" #. type: deffnx -#: doc/guix.texi:4068 +#: doc/guix.texi:4066 #, no-wrap msgid "{Scheme Procedure} inferior-package-native-search-paths @var{package}" msgstr "{Scheme-Prozedur} inferior-package-native-search-paths @var{Paket}" #. type: deffnx -#: doc/guix.texi:4069 +#: doc/guix.texi:4067 #, no-wrap msgid "{Scheme Procedure} inferior-package-transitive-native-search-paths @var{package}" msgstr "{Scheme-Prozedur} inferior-package-transitive-native-search-paths @var{Paket}" #. type: deffnx -#: doc/guix.texi:4070 +#: doc/guix.texi:4068 #, no-wrap msgid "{Scheme Procedure} inferior-package-search-paths @var{package}" msgstr "{Scheme-Prozedur} inferior-package-search-paths @var{Paket}" #. type: deffn -#: doc/guix.texi:4075 +#: doc/guix.texi:4073 msgid "These procedures are the counterpart of package record accessors (@pxref{package Reference}). Most of them work by querying the inferior @var{package} comes from, so the inferior must still be live when you call these procedures." msgstr "Diese Prozeduren sind das Gegenstück zu den Zugriffsmethoden des Verbunds „package“ für Pakete (siehe @ref{package Reference}). Die meisten davon funktionieren durch eine Abfrage auf dem Untergeordneten, von dem das @var{Paket} kommt, weshalb der Untergeordnete noch lebendig sein muss, wenn Sie diese Prozeduren aufrufen." #. type: Plain text -#: doc/guix.texi:4085 +#: doc/guix.texi:4083 msgid "Inferior packages can be used transparently like any other package or file-like object in G-expressions (@pxref{G-Expressions}). They are also transparently handled by the @code{packages->manifest} procedure, which is commonly use in manifests (@pxref{Invoking guix package, the @option{--manifest} option of @command{guix package}}). Thus you can insert an inferior package pretty much anywhere you would insert a regular package: in manifests, in the @code{packages} field of your @code{operating-system} declaration, and so on." msgstr "Untergeordnete Pakete können transparent wie jedes andere Paket oder dateiartige Objekt in G-Ausdrücken verwendet werden (siehe @ref{G-Expressions}). Sie werden auch transparent wie reguläre Pakete von der Prozedur @code{packages->manifest} behandelt, welche oft in Manifesten benutzt wird (siehe @ref{Invoking guix package, siehe die Befehlszeilenoption @option{--manifest} von @command{guix package}}). Somit können Sie ein untergeordnetes Paket ziemlich überall dort verwenden, wo Sie ein reguläres Paket einfügen würden: in Manifesten, im Feld @code{packages} Ihrer @code{operating-system}-Deklaration und so weiter." #. type: section -#: doc/guix.texi:4087 +#: doc/guix.texi:4085 #, no-wrap msgid "Invoking @command{guix describe}" msgstr "@command{guix describe} aufrufen" #. type: Plain text -#: doc/guix.texi:4098 +#: doc/guix.texi:4096 msgid "Often you may want to answer questions like: ``Which revision of Guix am I using?'' or ``Which channels am I using?'' This is useful information in many situations: if you want to @emph{replicate} an environment on a different machine or user account, if you want to report a bug or to determine what change in the channels you are using caused it, or if you want to record your system state for reproducibility purposes. The @command{guix describe} command answers these questions." msgstr "Sie könnten sich des Öfteren Fragen stellen wie: „Welche Version von Guix benutze ich gerade?“ oder „Welche Kanäle benutze ich?“ Diese Informationen sind in vielen Situationen nützlich: wenn Sie eine Umgebung auf einer anderen Maschine oder mit einem anderen Benutzerkonto @emph{nachbilden} möchten, wenn Sie einen Fehler melden möchten, wenn Sie festzustellen versuchen, welche Änderung an den von Ihnen verwendeten Kanälen diesen Fehler verursacht hat, oder wenn Sie Ihren Systemzustand zum Zweck der Reproduzierbarkeit festhalten möchten. Der Befehl @command{guix describe} gibt Ihnen Antwort auf diese Fragen." #. type: Plain text -#: doc/guix.texi:4102 +#: doc/guix.texi:4100 msgid "When run from a @command{guix pull}ed @command{guix}, @command{guix describe} displays the channel(s) that it was built from, including their repository URL and commit IDs (@pxref{Channels}):" msgstr "Wenn Sie ihn aus einem mit @command{guix pull} bezogenen @command{guix} heraus ausführen, zeigt Ihnen @command{guix describe} die Kanäle an, aus denen es erstellt wurde, jeweils mitsamt ihrer Repository-URL und Commit-ID (siehe @ref{Channels}):" #. type: example -#: doc/guix.texi:4110 +#: doc/guix.texi:4108 #, no-wrap msgid "" "$ guix describe\n" @@ -8849,17 +8860,17 @@ msgstr "" " commit: e0fa68c7718fffd33d81af415279d6ddb518f727\n" #. type: Plain text -#: doc/guix.texi:4119 +#: doc/guix.texi:4117 msgid "If you're familiar with the Git version control system, this is similar in spirit to @command{git describe}; the output is also similar to that of @command{guix pull --list-generations}, but limited to the current generation (@pxref{Invoking guix pull, the @option{--list-generations} option}). Because the Git commit ID shown above unambiguously refers to a snapshot of Guix, this information is all it takes to describe the revision of Guix you're using, and also to replicate it." msgstr "Wenn Sie mit dem Versionskontrollsystem Git vertraut sind, erkennen Sie vielleicht die Ähnlichkeit zu @command{git describe}; die Ausgabe ähnelt auch der von @command{guix pull --list-generations} eingeschränkt auf die aktuelle Generation (siehe @ref{Invoking guix pull, die Befehlszeilenoption @option{--list-generations}}). Weil die oben gezeigte Git-Commit-ID eindeutig eine bestimmte Version von Guix bezeichnet, genügt diese Information, um die von Ihnen benutzte Version von Guix zu beschreiben, und auch, um sie nachzubilden." #. type: Plain text -#: doc/guix.texi:4122 +#: doc/guix.texi:4120 msgid "To make it easier to replicate Guix, @command{guix describe} can also be asked to return a list of channels instead of the human-readable description above:" msgstr "Damit es leichter ist, Guix nachzubilden, kann Ihnen @command{guix describe} auch eine Liste der Kanäle statt einer menschenlesbaren Beschreibung wie oben liefern:" #. type: example -#: doc/guix.texi:4130 +#: doc/guix.texi:4128 #, no-wrap msgid "" "$ guix describe -f channels\n" @@ -8877,160 +8888,160 @@ msgstr "" " \"e0fa68c7718fffd33d81af415279d6ddb518f727\")))\n" #. type: Plain text -#: doc/guix.texi:4139 +#: doc/guix.texi:4137 msgid "You can save this to a file and feed it to @command{guix pull -C} on some other machine or at a later point in time, which will instantiate @emph{this exact Guix revision} (@pxref{Invoking guix pull, the @option{-C} option}). From there on, since you're able to deploy the same revision of Guix, you can just as well @emph{replicate a complete software environment}. We humbly think that this is @emph{awesome}, and we hope you'll like it too!" msgstr "Sie können die Ausgabe in einer Datei speichern, die Sie an @command{guix pull -C} auf einer anderen Maschine oder zu einem späteren Zeitpunkt übergeben, wodurch dann eine Instanz @emph{von genau derselben Guix-Version} installiert wird (siehe @ref{Invoking guix pull, die Befehlszeilenoption @option{-C}}). Daraufhin können Sie, weil Sie jederzeit dieselbe Version von Guix installieren können, auch gleich @emph{eine vollständige Softwareumgebung genau nachbilden}. Wir halten das trotz aller Bescheidenheit für @emph{klasse} und hoffen, dass Ihnen das auch gefällt!" #. type: Plain text -#: doc/guix.texi:4142 +#: doc/guix.texi:4140 msgid "The details of the options supported by @command{guix describe} are as follows:" msgstr "Die genauen Befehlszeilenoptionen, die @command{guix describe} unterstützt, lauten wie folgt:" #. type: item -#: doc/guix.texi:4144 doc/guix.texi:4788 +#: doc/guix.texi:4142 doc/guix.texi:4786 #, no-wrap msgid "--format=@var{format}" msgstr "--format=@var{Format}" #. type: itemx -#: doc/guix.texi:4145 doc/guix.texi:4789 +#: doc/guix.texi:4143 doc/guix.texi:4787 #, no-wrap msgid "-f @var{format}" msgstr "-f @var{Format}" #. type: table -#: doc/guix.texi:4147 +#: doc/guix.texi:4145 msgid "Produce output in the specified @var{format}, one of:" msgstr "Die Ausgabe im angegebenen @var{Format} generieren, was eines der Folgenden sein muss:" #. type: item -#: doc/guix.texi:4149 +#: doc/guix.texi:4147 #, no-wrap msgid "human" msgstr "human" #. type: table -#: doc/guix.texi:4151 +#: doc/guix.texi:4149 msgid "produce human-readable output;" msgstr "für menschenlesbare Ausgabe," #. type: table -#: doc/guix.texi:4155 +#: doc/guix.texi:4153 msgid "produce a list of channel specifications that can be passed to @command{guix pull -C} or installed as @file{~/.config/guix/channels.scm} (@pxref{Invoking guix pull});" msgstr "eine Liste von Kanalspezifikationen erzeugen, die an @command{guix pull -C} übergeben werden oder als @file{~/.config/guix/channels.scm} eingesetzt werden können (siehe @ref{Invoking guix pull})," #. type: item -#: doc/guix.texi:4155 doc/guix.texi:8586 +#: doc/guix.texi:4153 doc/guix.texi:8584 #, no-wrap msgid "json" msgstr "json" #. type: cindex -#: doc/guix.texi:4156 +#: doc/guix.texi:4154 #, no-wrap msgid "JSON" msgstr "JSON" #. type: table -#: doc/guix.texi:4158 +#: doc/guix.texi:4156 msgid "produce a list of channel specifications in JSON format;" msgstr "generiert eine Liste von Kanalspezifikationen im JSON-Format," #. type: item -#: doc/guix.texi:4158 +#: doc/guix.texi:4156 #, no-wrap msgid "recutils" msgstr "recutils" #. type: table -#: doc/guix.texi:4160 +#: doc/guix.texi:4158 msgid "produce a list of channel specifications in Recutils format." msgstr "generiert eine Liste von Kanalspezifikationen im Recutils-Format." #. type: table -#: doc/guix.texi:4165 +#: doc/guix.texi:4163 msgid "Display information about @var{profile}." msgstr "Informationen über das @var{Profil} anzeigen." #. type: section -#: doc/guix.texi:4168 +#: doc/guix.texi:4166 #, no-wrap msgid "Invoking @command{guix archive}" msgstr "@command{guix archive} aufrufen" #. type: command{#1} -#: doc/guix.texi:4170 +#: doc/guix.texi:4168 #, no-wrap msgid "guix archive" msgstr "guix archive" #. type: cindex -#: doc/guix.texi:4171 +#: doc/guix.texi:4169 #, no-wrap msgid "archive" msgstr "Archivdateien" #. type: Plain text -#: doc/guix.texi:4177 +#: doc/guix.texi:4175 msgid "The @command{guix archive} command allows users to @dfn{export} files from the store into a single archive, and to later @dfn{import} them on a machine that runs Guix. In particular, it allows store files to be transferred from one machine to the store on another machine." msgstr "Der Befehl @command{guix archive} ermöglicht es Nutzern, Dateien im Store in eine einzelne Archivdatei zu @dfn{exportieren} und diese später auf einer Maschine, auf der Guix läuft, zu @dfn{importieren}. Insbesondere können so Store-Objekte von einer Maschine in den Store einer anderen Maschine übertragen werden." #. type: quotation -#: doc/guix.texi:4181 +#: doc/guix.texi:4179 msgid "If you're looking for a way to produce archives in a format suitable for tools other than Guix, @pxref{Invoking guix pack}." msgstr "Wenn Sie nach einer Möglichkeit suchen, Archivdateien für andere Werkzeuge als Guix zu erstellen, finden Sie Informationen dazu im Abschnitt @ref{Invoking guix pack}." #. type: cindex -#: doc/guix.texi:4183 +#: doc/guix.texi:4181 #, no-wrap msgid "exporting store items" msgstr "Store-Objekte exportieren" #. type: Plain text -#: doc/guix.texi:4185 +#: doc/guix.texi:4183 msgid "To export store files as an archive to standard output, run:" msgstr "Führen Sie Folgendes aus, um Store-Dateien als ein Archiv auf die Standardausgabe zu exportieren:" #. type: example -#: doc/guix.texi:4188 +#: doc/guix.texi:4186 #, no-wrap msgid "guix archive --export @var{options} @var{specifications}...\n" msgstr "guix archive --export @var{Optionen} @var{Spezifikationen}…\n" #. type: Plain text -#: doc/guix.texi:4195 +#: doc/guix.texi:4193 msgid "@var{specifications} may be either store file names or package specifications, as for @command{guix package} (@pxref{Invoking guix package}). For instance, the following command creates an archive containing the @code{gui} output of the @code{git} package and the main output of @code{emacs}:" msgstr "@var{Spezifikationen} sind dabei entweder die Namen von Store-Dateien oder Paketspezifikationen wie bei @command{guix package} (siehe @ref{Invoking guix package}). Zum Beispiel erzeugt der folgende Befehl ein Archiv der @code{gui}-Ausgabe des Pakets @code{git} sowie die Hauptausgabe von @code{emacs}:" #. type: example -#: doc/guix.texi:4198 +#: doc/guix.texi:4196 #, no-wrap msgid "guix archive --export git:gui /gnu/store/...-emacs-24.3 > great.nar\n" msgstr "guix archive --export git:gui /gnu/store/…-emacs-24.3 > groß.nar\n" #. type: Plain text -#: doc/guix.texi:4203 +#: doc/guix.texi:4201 msgid "If the specified packages are not built yet, @command{guix archive} automatically builds them. The build process may be controlled with the common build options (@pxref{Common Build Options})." msgstr "Wenn die angegebenen Pakete noch nicht erstellt worden sind, werden sie durch @command{guix archive} automatisch erstellt. Der Erstellungsprozess kann durch die gemeinsamen Erstellungsoptionen gesteuert werden (siehe @ref{Common Build Options})." #. type: Plain text -#: doc/guix.texi:4206 +#: doc/guix.texi:4204 msgid "To transfer the @code{emacs} package to a machine connected over SSH, one would run:" msgstr "Um das @code{emacs}-Paket auf eine über SSH verbundene Maschine zu übertragen, würde man dies ausführen:" #. type: example -#: doc/guix.texi:4209 +#: doc/guix.texi:4207 #, no-wrap msgid "guix archive --export -r emacs | ssh the-machine guix archive --import\n" msgstr "guix archive --export -r emacs | ssh die-maschine guix archive --import\n" #. type: Plain text -#: doc/guix.texi:4214 +#: doc/guix.texi:4212 msgid "Similarly, a complete user profile may be transferred from one machine to another like this:" msgstr "Auf gleiche Art kann auch ein vollständiges Benutzerprofil von einer Maschine auf eine andere übertragen werden:" #. type: example -#: doc/guix.texi:4218 +#: doc/guix.texi:4216 #, no-wrap msgid "" "guix archive --export -r $(readlink -f ~/.guix-profile) | \\\n" @@ -9040,162 +9051,162 @@ msgstr "" " ssh die-maschine guix-archive --import\n" #. type: Plain text -#: doc/guix.texi:4228 +#: doc/guix.texi:4226 msgid "However, note that, in both examples, all of @code{emacs} and the profile as well as all of their dependencies are transferred (due to @code{-r}), regardless of what is already available in the store on the target machine. The @code{--missing} option can help figure out which items are missing from the target store. The @command{guix copy} command simplifies and optimizes this whole process, so this is probably what you should use in this case (@pxref{Invoking guix copy})." msgstr "Jedoch sollten Sie in beiden Beispielen beachten, dass alles, was zu @code{emacs}, dem Profil oder deren Abhängigkeiten (wegen @code{-r}) gehört, übertragen wird, egal ob es schon im Store der Zielmaschine vorhanden ist oder nicht. Mit der Befehlszeilenoption @code{--missing} lässt sich herausfinden, welche Objekte im Ziel-Store noch fehlen. Der Befehl @command{guix copy} vereinfacht und optimiert diesen gesamten Prozess, ist also, was Sie in diesem Fall wahrscheinlich eher benutzen wollten (siehe @ref{Invoking guix copy})." #. type: cindex -#: doc/guix.texi:4229 +#: doc/guix.texi:4227 #, no-wrap msgid "nar, archive format" msgstr "Nar, Archivformat" #. type: cindex -#: doc/guix.texi:4230 +#: doc/guix.texi:4228 #, no-wrap msgid "normalized archive (nar)" msgstr "Normalisiertes Archiv (Nar)" #. type: Plain text -#: doc/guix.texi:4240 +#: doc/guix.texi:4238 msgid "Archives are stored in the ``normalized archive'' or ``nar'' format, which is comparable in spirit to `tar', but with differences that make it more appropriate for our purposes. First, rather than recording all Unix metadata for each file, the nar format only mentions the file type (regular, directory, or symbolic link); Unix permissions and owner/group are dismissed. Second, the order in which directory entries are stored always follows the order of file names according to the C locale collation order. This makes archive production fully deterministic." msgstr "Archive werden als „Normalisiertes Archiv“, kurz „Nar“, formatiert. Diese Technik folgt einem ähnlichen Gedanken wie beim „tar“-Format, unterscheidet sich aber auf eine für unsere Zwecke angemessene Art. Erstens werden im Nar-Format nicht sämtliche Unix-Metadaten aller Dateien aufgenommen, sondern nur der Dateityp (ob es sich um eine reguläre Datei, ein Verzeichnis oder eine symbolische Verknüpfung handelt). Unix-Dateiberechtigungen sowie Besitzer und Gruppe werden nicht gespeichert. Zweitens entspricht die Reihenfolge, in der der Inhalt von Verzeichnissen abgelegt wird, immer der Reihenfolge, in der die Dateinamen gemäß der C-Locale sortiert würden. Dadurch wird die Erstellung von Archivdateien völlig deterministisch." #. type: Plain text -#: doc/guix.texi:4246 +#: doc/guix.texi:4244 msgid "When exporting, the daemon digitally signs the contents of the archive, and that digital signature is appended. When importing, the daemon verifies the signature and rejects the import in case of an invalid signature or if the signing key is not authorized." msgstr "Beim Exportieren versieht der Daemon den Inhalt des Archivs mit einer digitalen Signatur, auch Beglaubigung genannt. Diese digitale Signatur wird an das Archiv angehängt. Beim Importieren verifiziert der Daemon die Signatur und lehnt den Import ab, falls die Signatur ungültig oder der signierende Schlüssel nicht autorisiert ist." #. type: Plain text -#: doc/guix.texi:4248 +#: doc/guix.texi:4246 msgid "The main options are:" msgstr "Die wichtigsten Befehlszeilenoptionen sind:" #. type: item -#: doc/guix.texi:4250 +#: doc/guix.texi:4248 #, no-wrap msgid "--export" msgstr "--export" #. type: table -#: doc/guix.texi:4253 +#: doc/guix.texi:4251 msgid "Export the specified store files or packages (see below.) Write the resulting archive to the standard output." msgstr "Exportiert die angegebenen Store-Dateien oder Pakete (siehe unten) und schreibt das resultierende Archiv auf die Standardausgabe." #. type: table -#: doc/guix.texi:4256 +#: doc/guix.texi:4254 msgid "Dependencies are @emph{not} included in the output, unless @code{--recursive} is passed." msgstr "Abhängigkeiten @emph{fehlen} in der Ausgabe, außer wenn @code{--recursive} angegeben wurde." #. type: itemx -#: doc/guix.texi:4257 doc/guix.texi:8374 doc/guix.texi:8471 doc/guix.texi:8496 -#: doc/guix.texi:8691 doc/guix.texi:8732 doc/guix.texi:8779 +#: doc/guix.texi:4255 doc/guix.texi:8372 doc/guix.texi:8469 doc/guix.texi:8494 +#: doc/guix.texi:8689 doc/guix.texi:8730 doc/guix.texi:8777 #, no-wrap msgid "-r" msgstr "-r" #. type: item -#: doc/guix.texi:4258 doc/guix.texi:8373 doc/guix.texi:8470 doc/guix.texi:8495 -#: doc/guix.texi:8690 doc/guix.texi:8731 doc/guix.texi:8778 doc/guix.texi:8835 +#: doc/guix.texi:4256 doc/guix.texi:8371 doc/guix.texi:8468 doc/guix.texi:8493 +#: doc/guix.texi:8688 doc/guix.texi:8729 doc/guix.texi:8776 doc/guix.texi:8833 #, no-wrap msgid "--recursive" msgstr "--recursive" #. type: table -#: doc/guix.texi:4263 +#: doc/guix.texi:4261 msgid "When combined with @code{--export}, this instructs @command{guix archive} to include dependencies of the given items in the archive. Thus, the resulting archive is self-contained: it contains the closure of the exported store items." msgstr "Zusammen mit @code{--export} wird @command{guix archive} hiermit angewiesen, Abhängigkeiten der angegebenen Objekte auch ins Archiv aufzunehmen. Das resultierende Archiv ist somit eigenständig; es enthält den Abschluss der exportierten Store-Objekte." #. type: item -#: doc/guix.texi:4264 +#: doc/guix.texi:4262 #, no-wrap msgid "--import" msgstr "--import" #. type: table -#: doc/guix.texi:4269 +#: doc/guix.texi:4267 msgid "Read an archive from the standard input, and import the files listed therein into the store. Abort if the archive has an invalid digital signature, or if it is signed by a public key not among the authorized keys (see @code{--authorize} below.)" msgstr "Ein Archiv von der Standardeingabe lesen und darin enthaltende Dateien in den Store importieren. Der Import bricht ab, wenn das Archiv keine gültige digitale Signatur hat oder wenn es von einem öffentlichen Schlüssel signiert wurde, der keiner der autorisierten Schlüssel ist (siehe @code{--authorize} weiter unten)." #. type: item -#: doc/guix.texi:4270 +#: doc/guix.texi:4268 #, no-wrap msgid "--missing" msgstr "--missing" #. type: table -#: doc/guix.texi:4274 +#: doc/guix.texi:4272 msgid "Read a list of store file names from the standard input, one per line, and write on the standard output the subset of these files missing from the store." msgstr "Eine Liste der Store-Dateinamen von der Standardeingabe lesen, je ein Name pro Zeile, und auf die Standardausgabe die Teilmenge dieser Dateien schreiben, die noch nicht im Store vorliegt." #. type: item -#: doc/guix.texi:4275 +#: doc/guix.texi:4273 #, no-wrap msgid "--generate-key[=@var{parameters}]" msgstr "--generate-key[=@var{Parameter}]" #. type: cindex -#: doc/guix.texi:4276 +#: doc/guix.texi:4274 #, no-wrap msgid "signing, archives" msgstr "Signieren, von Archiven" #. type: table -#: doc/guix.texi:4281 +#: doc/guix.texi:4279 msgid "Generate a new key pair for the daemon. This is a prerequisite before archives can be exported with @code{--export}. Note that this operation usually takes time, because it needs to gather enough entropy to generate the key pair." msgstr "Ein neues Schlüsselpaar für den Daemon erzeugen. Dies ist erforderlich, damit Archive mit @code{--export} exportiert werden können. Beachten Sie, dass diese Option normalerweise einige Zeit in Anspruch nimmt, da erst Entropie für die Erzeugung des Schlüsselpaares gesammelt werden muss." #. type: table -#: doc/guix.texi:4291 +#: doc/guix.texi:4289 msgid "The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} (private key, which must be kept secret.) When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key. Alternatively, @var{parameters} can specify @code{genkey} parameters suitable for Libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})." msgstr "Das erzeugte Schlüsselpaar wird typischerweise unter @file{/etc/guix} gespeichert, in den Dateien @file{signing-key.pub} (für den öffentlichen Schlüssel) und @file{signing-key.sec} (für den privaten Schlüssel, der geheim gehalten werden muss). Wurden keine @var{Parameters} angegeben, wird ein ECDSA-Schlüssel unter Verwendung der Kurve Ed25519 erzeugt, oder, falls die Libgcrypt-Version älter als 1.6.0 ist, ein 4096-Bit-RSA-Schlüssel. Sonst geben die @var{Parameter} für Libgcrypt geeignete Parameter für @code{genkey} an (siehe @ref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})." #. type: item -#: doc/guix.texi:4292 +#: doc/guix.texi:4290 #, no-wrap msgid "--authorize" msgstr "--authorize" #. type: cindex -#: doc/guix.texi:4293 +#: doc/guix.texi:4291 #, no-wrap msgid "authorizing, archives" msgstr "Autorisieren, von Archiven" #. type: table -#: doc/guix.texi:4297 +#: doc/guix.texi:4295 msgid "Authorize imports signed by the public key passed on standard input. The public key must be in ``s-expression advanced format''---i.e., the same format as the @file{signing-key.pub} file." msgstr "Mit dem auf der Standardeingabe übergebenen öffentlichen Schlüssel signierte Importe autorisieren. Der öffentliche Schlüssel muss als „advanced“-formatierter S-Ausdruck gespeichert sein, d.h.@: im selben Format wie die Datei @file{signing-key.pub}." #. type: table -#: doc/guix.texi:4304 +#: doc/guix.texi:4302 msgid "The list of authorized keys is kept in the human-editable file @file{/etc/guix/acl}. The file contains @url{https://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format s-expressions''} and is structured as an access-control list in the @url{https://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)}." msgstr "Die Liste autorisierter Schlüssel wird in der Datei @file{/etc/guix/acl} gespeichert, die auch von Hand bearbeitet werden kann. Die Datei enthält @url{https://people.csail.mit.edu/rivest/Sexp.txt, „advanced“-formatierte S-Ausdrücke} und ist als eine Access Control List für die @url{https://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)} aufgebaut." #. type: item -#: doc/guix.texi:4305 +#: doc/guix.texi:4303 #, no-wrap msgid "--extract=@var{directory}" msgstr "--extract=@var{Verzeichnis}" #. type: itemx -#: doc/guix.texi:4306 +#: doc/guix.texi:4304 #, no-wrap msgid "-x @var{directory}" msgstr "-x @var{Verzeichnis}" #. type: table -#: doc/guix.texi:4310 +#: doc/guix.texi:4308 msgid "Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and extract it to @var{directory}. This is a low-level operation needed in only very narrow use cases; see below." msgstr "Ein Archiv mit einem einzelnen Objekt lesen, wie es von Substitutservern geliefert wird (siehe @ref{Substitutes}) und ins @var{Verzeichnis} entpacken. Dies ist eine systemnahe Operation, die man nur selten direkt benutzt; siehe unten." #. type: table -#: doc/guix.texi:4313 +#: doc/guix.texi:4311 msgid "For example, the following command extracts the substitute for Emacs served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:" msgstr "Zum Beispiel entpackt folgender Befehl das Substitut für Emacs, wie es von @code{@value{SUBSTITUTE-SERVER}} geliefert wird, nach @file{/tmp/emacs}:" #. type: example -#: doc/guix.texi:4318 +#: doc/guix.texi:4316 #, no-wrap msgid "" "$ wget -O - \\\n" @@ -9207,108 +9218,108 @@ msgstr "" " | bunzip2 | guix archive -x /tmp/emacs\n" #. type: table -#: doc/guix.texi:4325 +#: doc/guix.texi:4323 msgid "Single-item archives are different from multiple-item archives produced by @command{guix archive --export}; they contain a single store item, and they do @emph{not} embed a signature. Thus this operation does @emph{no} signature verification and its output should be considered unsafe." msgstr "Archive mit nur einem einzelnen Objekt unterscheiden sich von Archiven für mehrere Dateien, wie sie @command{guix archive --export} erzeugt; sie enthalten nur ein einzelnes Store-Objekt und @emph{keine} eingebettete Signatur. Beim Entpacken findet also @emph{keine} Signaturprüfung statt und ihrer Ausgabe sollte so erst einmal nicht vertraut werden." #. type: table -#: doc/guix.texi:4328 +#: doc/guix.texi:4326 msgid "The primary purpose of this operation is to facilitate inspection of archive contents coming from possibly untrusted substitute servers." msgstr "Der eigentliche Zweck dieser Operation ist, die Inspektion von Archivinhalten von Substitutservern möglich zu machen, auch wenn diesen unter Umständen nicht vertraut wird." #. type: cindex -#: doc/guix.texi:4336 +#: doc/guix.texi:4334 #, no-wrap msgid "software development" msgstr "Softwareentwicklung" #. type: Plain text -#: doc/guix.texi:4340 +#: doc/guix.texi:4338 msgid "If you are a software developer, Guix provides tools that you should find helpful---independently of the language you're developing in. This is what this chapter is about." msgstr "Wenn Sie ein Software-Entwickler sind, gibt Ihnen Guix Werkzeuge an die Hand, die Sie für hilfreich erachten dürften — ganz unabhängig davon, in welcher Sprache Sie entwickeln. Darum soll es in diesem Kapitel gehen." #. type: Plain text -#: doc/guix.texi:4346 +#: doc/guix.texi:4344 msgid "The @command{guix environment} command provides a convenient way to set up @dfn{development environments} containing all the dependencies and tools necessary to work on the software package of your choice. The @command{guix pack} command allows you to create @dfn{application bundles} that can be easily distributed to users who do not run Guix." msgstr "Der Befehl @command{guix environment} stellt eine bequeme Möglichkeit dar, wie Sie eine @dfn{Entwicklungsumgebung} aufsetzen können, in der all die Abhängigkeiten und Werkzeuge enthalten sind, die Sie brauchen, wenn Sie an Ihrem Lieblingssoftwarepaket arbeiten. Der Befehl @command{guix pack} macht es Ihnen möglich, @dfn{Anwendungsbündel} zu erstellen, die leicht an Nutzer verteilt werden können, die kein Guix benutzen." #. type: section -#: doc/guix.texi:4353 +#: doc/guix.texi:4351 #, no-wrap msgid "Invoking @command{guix environment}" msgstr "@command{guix environment} aufrufen" #. type: cindex -#: doc/guix.texi:4355 +#: doc/guix.texi:4353 #, no-wrap msgid "reproducible build environments" msgstr "reproduzierbare Erstellungsumgebungen" #. type: cindex -#: doc/guix.texi:4356 +#: doc/guix.texi:4354 #, no-wrap msgid "development environments" msgstr "Entwicklungsumgebungen" #. type: command{#1} -#: doc/guix.texi:4357 +#: doc/guix.texi:4355 #, no-wrap msgid "guix environment" msgstr "guix environment" #. type: cindex -#: doc/guix.texi:4358 +#: doc/guix.texi:4356 #, no-wrap msgid "environment, package build environment" msgstr "Umgebung, Paketerstellungsumgebung" #. type: Plain text -#: doc/guix.texi:4364 +#: doc/guix.texi:4362 msgid "The purpose of @command{guix environment} is to assist hackers in creating reproducible development environments without polluting their package profile. The @command{guix environment} tool takes one or more packages, builds all of their inputs, and creates a shell environment to use them." msgstr "Der Zweck von @command{guix environment} ist es, Hacker beim Aufbau einer reproduzierbaren Entwicklungsumgebung zu unterstützen, ohne dass diese ihr Paketprofil verunreinigen müssen. Das Werkzeug @command{guix environment} nimmt eines oder mehrere Pakete entgegen und erstellt erst all ihre Eingaben, um dann eine Shell-Umgebung herzustellen, in der diese benutzt werden können." #. type: Plain text -#: doc/guix.texi:4366 doc/guix.texi:7623 doc/guix.texi:8351 doc/guix.texi:8418 -#: doc/guix.texi:9207 doc/guix.texi:9580 doc/guix.texi:9885 doc/guix.texi:9951 -#: doc/guix.texi:9990 +#: doc/guix.texi:4364 doc/guix.texi:7621 doc/guix.texi:8349 doc/guix.texi:8416 +#: doc/guix.texi:9205 doc/guix.texi:9578 doc/guix.texi:9883 doc/guix.texi:9949 +#: doc/guix.texi:9988 msgid "The general syntax is:" msgstr "Die allgemeine Syntax lautet:" #. type: example -#: doc/guix.texi:4369 +#: doc/guix.texi:4367 #, no-wrap msgid "guix environment @var{options} @var{package}@dots{}\n" msgstr "guix environment @var{Optionen} @var{Paket}…\n" #. type: Plain text -#: doc/guix.texi:4373 +#: doc/guix.texi:4371 msgid "The following example spawns a new shell set up for the development of GNU@tie{}Guile:" msgstr "Folgendes Beispiel zeigt, wie eine neue Shell gestartet wird, auf der alles für die Entwicklung von GNU@tie{}Guile eingerichtet ist:" #. type: example -#: doc/guix.texi:4376 +#: doc/guix.texi:4374 #, no-wrap msgid "guix environment guile\n" msgstr "guix environment guile\n" #. type: Plain text -#: doc/guix.texi:4393 +#: doc/guix.texi:4391 msgid "If the needed dependencies are not built yet, @command{guix environment} automatically builds them. The environment of the new shell is an augmented version of the environment that @command{guix environment} was run in. It contains the necessary search paths for building the given package added to the existing environment variables. To create a ``pure'' environment, in which the original environment variables have been unset, use the @code{--pure} option@footnote{Users sometimes wrongfully augment environment variables such as @code{PATH} in their @file{~/.bashrc} file. As a consequence, when @code{guix environment} launches it, Bash may read @file{~/.bashrc}, thereby introducing ``impurities'' in these environment variables. It is an error to define such environment variables in @file{.bashrc}; instead, they should be defined in @file{.bash_profile}, which is sourced only by log-in shells. @xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for details on Bash start-up files.}." msgstr "Wenn benötigte Abhängigkeiten noch nicht erstellt worden sind, wird @command{guix environment} sie automatisch erstellen lassen. Die Umgebung der neuen Shell ist eine ergänzte Version der Umgebung, in der @command{guix environment} ausgeführt wurde. Sie enthält neben den existierenden Umgebungsvariablen auch die nötigen Suchpfade, um das angegebene Paket erstellen zu können. Um eine „reine“ Umgebung zu erstellen, in der die ursprünglichen Umgebungsvariablen nicht mehr vorkommen, kann die Befehlszeilenoption @code{--pure} benutzt werden@footnote{Manchmal ergänzen Nutzer fälschlicherweise Umgebungsvariable wie @code{PATH} in ihrer @file{~/.bashrc}-Datei. Das hat zur Folge, dass wenn @code{guix environment} Bash startet, selbige @file{~/.bashrc} von Bash gelesen wird und die neuen Umgebungen somit „verunreinigt“. Es ist ein Fehler, solche Umgebungsvariable in @file{.bashrc} zu definieren, stattdessen sollten sie in @file{.bash_profile} geschrieben werden, was nur von Login-Shells mit „source“ geladen wird. Siehe @ref{Bash Startup Files,,, bash, The GNU Bash Reference Manual} für Details über beim Starten von Bash gelesene Dateien}." #. type: vindex -#: doc/guix.texi:4394 +#: doc/guix.texi:4392 #, no-wrap msgid "GUIX_ENVIRONMENT" msgstr "GUIX_ENVIRONMENT" #. type: Plain text -#: doc/guix.texi:4400 +#: doc/guix.texi:4398 msgid "@command{guix environment} defines the @code{GUIX_ENVIRONMENT} variable in the shell it spawns; its value is the file name of the profile of this environment. This allows users to, say, define a specific prompt for development environments in their @file{.bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):" msgstr "@command{guix environment} definiert die Variable @code{GUIX_ENVIRONMENT} in der neu erzeugten Shell. Ihr Wert ist der Dateiname des Profils dieser neuen Umgebung. Das könnten Nutzer verwenden, um zum Beispiel eine besondere Prompt als Eingabeaufforderung für Entwicklungsumgebungen in ihrer @file{.bashrc} festzulegen (siehe @ref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):" #. type: example -#: doc/guix.texi:4406 +#: doc/guix.texi:4404 #, no-wrap msgid "" "if [ -n \"$GUIX_ENVIRONMENT\" ]\n" @@ -9322,282 +9333,282 @@ msgstr "" "fi\n" #. type: Plain text -#: doc/guix.texi:4410 +#: doc/guix.texi:4408 msgid "...@: or to browse the profile:" msgstr "…@: oder um ihr Profil durchzusehen:" #. type: example -#: doc/guix.texi:4413 +#: doc/guix.texi:4411 #, no-wrap msgid "$ ls \"$GUIX_ENVIRONMENT/bin\"\n" msgstr "$ ls \"$GUIX_ENVIRONMENT/bin\"\n" #. type: Plain text -#: doc/guix.texi:4419 +#: doc/guix.texi:4417 msgid "Additionally, more than one package may be specified, in which case the union of the inputs for the given packages are used. For example, the command below spawns a shell where all of the dependencies of both Guile and Emacs are available:" msgstr "Des Weiteren kann mehr als ein Paket angegeben werden. In diesem Fall wird die Vereinigung der Eingaben der jeweiligen Pakete zugänglich gemacht. Zum Beispiel erzeugt der folgende Befehl eine Shell, in der alle Abhängigkeiten von sowohl Guile als auch Emacs verfügbar sind:" #. type: example -#: doc/guix.texi:4422 +#: doc/guix.texi:4420 #, no-wrap msgid "guix environment guile emacs\n" msgstr "guix environment guile emacs\n" #. type: Plain text -#: doc/guix.texi:4427 +#: doc/guix.texi:4425 msgid "Sometimes an interactive shell session is not desired. An arbitrary command may be invoked by placing the @code{--} token to separate the command from the rest of the arguments:" msgstr "Manchmal will man keine interaktive Shell-Sitzung. Ein beliebiger Befehl kann aufgerufen werden, indem man nach Angabe der Pakete noch @code{--} vor den gewünschten Befehl schreibt, um ihn von den übrigen Argumenten abzutrennen:" #. type: example -#: doc/guix.texi:4430 +#: doc/guix.texi:4428 #, no-wrap msgid "guix environment guile -- make -j4\n" msgstr "guix environment guile -- make -j4\n" #. type: Plain text -#: doc/guix.texi:4436 +#: doc/guix.texi:4434 msgid "In other situations, it is more convenient to specify the list of packages needed in the environment. For example, the following command runs @command{python} from an environment containing Python@tie{}2.7 and NumPy:" msgstr "In anderen Situationen ist es bequemer, aufzulisten, welche Pakete in der Umgebung benötigt werden. Zum Beispiel führt der folgende Befehl @command{python} aus einer Umgebung heraus aus, in der Python@tie{}2.7 und NumPy enthalten sind:" #. type: example -#: doc/guix.texi:4439 +#: doc/guix.texi:4437 #, no-wrap msgid "guix environment --ad-hoc python2-numpy python-2.7 -- python\n" msgstr "guix environment --ad-hoc python2-numpy python-2.7 -- python\n" #. type: Plain text -#: doc/guix.texi:4450 +#: doc/guix.texi:4448 msgid "Furthermore, one might want the dependencies of a package and also some additional packages that are not build-time or runtime dependencies, but are useful when developing nonetheless. Because of this, the @code{--ad-hoc} flag is positional. Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment. Packages appearing after are interpreted as packages that will be added to the environment directly. For example, the following command creates a Guix development environment that additionally includes Git and strace:" msgstr "Man kann auch sowohl die Abhängigkeiten eines Pakets haben wollen, als auch ein paar zusätzliche Pakete, die nicht Erstellungs- oder Laufzeitabhängigkeiten davon sind, aber trotzdem bei der Entwicklung nützlich sind. Deshalb hängt die Wirkung von der Position der Befehlszeilenoption @code{--ad-hoc} ab. Pakete, die links von @code{--ad-hoc} stehen, werden als Pakete interpretiert, deren Abhängigkeiten zur Umgebung hinzugefügt werden. Pakete, die rechts stehen, werden selbst zur Umgebung hinzugefügt. Zum Beispiel erzeugt der folgende Befehl eine Guix-Entwicklungsumgebung, die zusätzlich Git und strace umfasst:" #. type: example -#: doc/guix.texi:4453 +#: doc/guix.texi:4451 #, no-wrap msgid "guix environment guix --ad-hoc git strace\n" msgstr "guix environment guix --ad-hoc git strace\n" #. type: Plain text -#: doc/guix.texi:4462 +#: doc/guix.texi:4460 msgid "Sometimes it is desirable to isolate the environment as much as possible, for maximal purity and reproducibility. In particular, when using Guix on a host distro that is not Guix System, it is desirable to prevent access to @file{/usr/bin} and other system-wide resources from the development environment. For example, the following command spawns a Guile REPL in a ``container'' where only the store and the current working directory are mounted:" msgstr "Manchmal ist es wünschenswert, die Umgebung so viel wie möglich zu isolieren, um maximale Reinheit und Reproduzierbarkeit zu bekommen. Insbesondere ist es wünschenswert, den Zugriff auf @file{/usr/bin} und andere Systemressourcen aus der Entwicklungsumgebung heraus zu verhindern, wenn man Guix auf einer fremden Wirtsdistribution benutzt, die nicht Guix System ist. Zum Beispiel startet der folgende Befehl eine Guile-REPL in einer isolierten Umgebung, einem sogenannten „Container“, in der nur der Store und das aktuelle Arbeitsverzeichnis eingebunden sind:" #. type: example -#: doc/guix.texi:4465 +#: doc/guix.texi:4463 #, no-wrap msgid "guix environment --ad-hoc --container guile -- guile\n" msgstr "guix environment --ad-hoc --container guile -- guile\n" #. type: quotation -#: doc/guix.texi:4469 +#: doc/guix.texi:4467 msgid "The @code{--container} option requires Linux-libre 3.19 or newer." msgstr "Die Befehlszeilenoption @code{--container} funktioniert nur mit Linux-libre 3.19 oder neuer." #. type: Plain text -#: doc/guix.texi:4472 +#: doc/guix.texi:4470 msgid "The available options are summarized below." msgstr "Im Folgenden werden die verfügbaren Befehlszeilenoptionen zusammengefasst." #. type: item -#: doc/guix.texi:4474 doc/guix.texi:8138 doc/guix.texi:24602 +#: doc/guix.texi:4472 doc/guix.texi:8136 doc/guix.texi:24588 #, no-wrap msgid "--root=@var{file}" msgstr "--root=@var{Datei}" #. type: itemx -#: doc/guix.texi:4475 doc/guix.texi:8139 doc/guix.texi:24603 +#: doc/guix.texi:4473 doc/guix.texi:8137 doc/guix.texi:24589 #, no-wrap msgid "-r @var{file}" msgstr "-r @var{Datei}" #. type: cindex -#: doc/guix.texi:4476 +#: doc/guix.texi:4474 #, no-wrap msgid "persistent environment" msgstr "persistente Umgebung" #. type: cindex -#: doc/guix.texi:4477 +#: doc/guix.texi:4475 #, no-wrap msgid "garbage collector root, for environments" msgstr "Müllsammlerwurzel, für Umgebungen" #. type: table -#: doc/guix.texi:4480 +#: doc/guix.texi:4478 msgid "Make @var{file} a symlink to the profile for this environment, and register it as a garbage collector root." msgstr "Die @var{Datei} zu einer symbolischen Verknüpfung auf das Profil dieser Umgebung machen und als eine Müllsammlerwurzel registrieren." #. type: table -#: doc/guix.texi:4483 +#: doc/guix.texi:4481 msgid "This is useful if you want to protect your environment from garbage collection, to make it ``persistent''." msgstr "Das ist nützlich, um seine Umgebung vor dem Müllsammler zu schützen und sie „persistent“ zu machen." #. type: table -#: doc/guix.texi:4489 +#: doc/guix.texi:4487 msgid "When this option is omitted, the environment is protected from garbage collection only for the duration of the @command{guix environment} session. This means that next time you recreate the same environment, you could have to rebuild or re-download packages. @xref{Invoking guix gc}, for more on GC roots." msgstr "Wird diese Option weggelassen, ist die Umgebung nur, solange die Sitzung von @command{guix environment} besteht, vor dem Müllsammler sicher. Das bedeutet, wenn Sie das nächste Mal dieselbe Umgebung neu erzeugen, müssen Sie vielleicht Pakete neu erstellen oder neu herunterladen. @ref{Invoking guix gc} hat mehr Informationen über Müllsammlerwurzeln." #. type: item -#: doc/guix.texi:4490 doc/guix.texi:4864 doc/guix.texi:7996 doc/guix.texi:8877 -#: doc/guix.texi:9535 doc/guix.texi:24556 +#: doc/guix.texi:4488 doc/guix.texi:4862 doc/guix.texi:7994 doc/guix.texi:8875 +#: doc/guix.texi:9533 doc/guix.texi:24547 #, no-wrap msgid "--expression=@var{expr}" msgstr "--expression=@var{Ausdruck}" #. type: itemx -#: doc/guix.texi:4491 doc/guix.texi:4865 doc/guix.texi:7997 doc/guix.texi:8878 -#: doc/guix.texi:9536 doc/guix.texi:24557 +#: doc/guix.texi:4489 doc/guix.texi:4863 doc/guix.texi:7995 doc/guix.texi:8876 +#: doc/guix.texi:9534 doc/guix.texi:24548 #, no-wrap msgid "-e @var{expr}" msgstr "-e @var{Ausdruck}" #. type: table -#: doc/guix.texi:4494 +#: doc/guix.texi:4492 msgid "Create an environment for the package or list of packages that @var{expr} evaluates to." msgstr "Eine Umgebung für das Paket oder die Liste von Paketen erzeugen, zu der der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:4496 +#: doc/guix.texi:4494 msgid "For example, running:" msgstr "Zum Beispiel startet dies:" #. type: example -#: doc/guix.texi:4499 +#: doc/guix.texi:4497 #, no-wrap msgid "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n" msgstr "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n" #. type: table -#: doc/guix.texi:4503 +#: doc/guix.texi:4501 msgid "starts a shell with the environment for this specific variant of the PETSc package." msgstr "eine Shell mit der Umgebung für eben diese bestimmte Variante des Pakets PETSc." #. type: table -#: doc/guix.texi:4505 +#: doc/guix.texi:4503 msgid "Running:" msgstr "Wenn man dies ausführt:" #. type: example -#: doc/guix.texi:4508 +#: doc/guix.texi:4506 #, no-wrap msgid "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n" msgstr "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n" #. type: table -#: doc/guix.texi:4511 +#: doc/guix.texi:4509 msgid "starts a shell with all the base system packages available." msgstr "bekommt man eine Shell, in der alle Basis-Pakete verfügbar sind." #. type: table -#: doc/guix.texi:4514 +#: doc/guix.texi:4512 msgid "The above commands only use the default output of the given packages. To select other outputs, two element tuples can be specified:" msgstr "Die obigen Befehle benutzen nur die Standard-Ausgabe des jeweiligen Pakets. Um andere Ausgaben auszuwählen, können zweielementige Tupel spezifiziert werden:" #. type: example -#: doc/guix.texi:4517 +#: doc/guix.texi:4515 #, no-wrap msgid "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n" msgstr "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n" #. type: item -#: doc/guix.texi:4519 +#: doc/guix.texi:4517 #, no-wrap msgid "--load=@var{file}" msgstr "--load=@var{Datei}" #. type: itemx -#: doc/guix.texi:4520 +#: doc/guix.texi:4518 #, no-wrap msgid "-l @var{file}" msgstr "-l @var{Datei}" #. type: table -#: doc/guix.texi:4523 +#: doc/guix.texi:4521 msgid "Create an environment for the package or list of packages that the code within @var{file} evaluates to." msgstr "Eine Umgebung erstellen für das Paket oder die Liste von Paketen, zu der der Code in der @var{Datei} ausgewertet wird." #. type: example -#: doc/guix.texi:4529 +#: doc/guix.texi:4527 #, no-wrap msgid "@verbatiminclude environment-gdb.scm\n" msgstr "@verbatiminclude environment-gdb.scm\n" #. type: table -#: doc/guix.texi:4535 +#: doc/guix.texi:4533 msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}." msgstr "Eine Umgebung für die Pakete erzeugen, die im Manifest-Objekt enthalten sind, das vom Scheme-Code in der @var{Datei} geliefert wird." #. type: table -#: doc/guix.texi:4539 +#: doc/guix.texi:4537 msgid "This is similar to the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files." msgstr "Dies verhält sich ähnlich wie die gleichnamige Option des Befehls @command{guix package} (siehe @ref{profile-manifest, @option{--manifest}}) und benutzt auch dieselben Manifestdateien." #. type: item -#: doc/guix.texi:4540 +#: doc/guix.texi:4538 #, no-wrap msgid "--ad-hoc" msgstr "--ad-hoc" #. type: table -#: doc/guix.texi:4545 +#: doc/guix.texi:4543 msgid "Include all specified packages in the resulting environment, as if an @i{ad hoc} package were defined with them as inputs. This option is useful for quickly creating an environment without having to write a package expression to contain the desired inputs." msgstr "Alle angegebenen Pakete in der resultierenden Umgebung einschließen, als wären sie Eingaben eines @i{ad hoc} definierten Pakets. Diese Befehlszeilenoption ist nützlich, um schnell Umgebungen aufzusetzen, ohne dafür einen Paketausdruck schreiben zu müssen, der die gewünschten Eingaben enthält." #. type: table -#: doc/guix.texi:4547 +#: doc/guix.texi:4545 msgid "For instance, the command:" msgstr "Zum Beispiel wird mit diesem Befehl:" #. type: example -#: doc/guix.texi:4550 +#: doc/guix.texi:4548 #, no-wrap msgid "guix environment --ad-hoc guile guile-sdl -- guile\n" msgstr "guix environment --ad-hoc guile guile-sdl -- guile\n" #. type: table -#: doc/guix.texi:4554 +#: doc/guix.texi:4552 msgid "runs @command{guile} in an environment where Guile and Guile-SDL are available." msgstr "@command{guile} in einer Umgebung ausgeführt, in der sowohl Guile als auch Guile-SDL zur Verfügung stehen." #. type: table -#: doc/guix.texi:4559 +#: doc/guix.texi:4557 msgid "Note that this example implicitly asks for the default output of @code{guile} and @code{guile-sdl}, but it is possible to ask for a specific output---e.g., @code{glib:bin} asks for the @code{bin} output of @code{glib} (@pxref{Packages with Multiple Outputs})." msgstr "Beachten Sie, dass in diesem Beispiel implizit die vorgegebene Ausgabe von @code{guile} und @code{guile-sdl} verwendet wird, es aber auch möglich ist, eine bestimmte Ausgabe auszuwählen — z.B.@: wird mit @code{glib:bin} die Ausgabe @code{bin} von @code{glib} gewählt (siehe @ref{Packages with Multiple Outputs})." #. type: table -#: doc/guix.texi:4565 +#: doc/guix.texi:4563 msgid "This option may be composed with the default behavior of @command{guix environment}. Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment, the default behavior. Packages appearing after are interpreted as packages that will be added to the environment directly." msgstr "Diese Befehlszeilenoption kann mit dem standardmäßigen Verhalten von @command{guix environment} verbunden werden. Pakete, die vor @code{--ad-hoc} aufgeführt werden, werden als Pakete interpretiert, deren Abhängigkeiten zur Umgebung hinzugefügt werden, was dem standardmäßigen Verhalten entspricht. Pakete, die danach aufgeführt werden, werden selbst zur Umgebung hinzugefügt." #. type: item -#: doc/guix.texi:4566 +#: doc/guix.texi:4564 #, no-wrap msgid "--pure" msgstr "--pure" #. type: table -#: doc/guix.texi:4570 +#: doc/guix.texi:4568 msgid "Unset existing environment variables when building the new environment, except those specified with @option{--preserve} (see below.) This has the effect of creating an environment in which search paths only contain package inputs." msgstr "Bestehende Umgebungsvariable deaktivieren, wenn die neue Umgebung erzeugt wird, mit Ausnahme der mit @option{--preserve} angegebenen Variablen (siehe unten). Dies bewirkt, dass eine Umgebung erzeugt wird, in der die Suchpfade nur Paketeingaben nennen und sonst nichts." #. type: item -#: doc/guix.texi:4571 +#: doc/guix.texi:4569 #, no-wrap msgid "--preserve=@var{regexp}" msgstr "--preserve=@var{Regexp}" #. type: itemx -#: doc/guix.texi:4572 +#: doc/guix.texi:4570 #, no-wrap msgid "-E @var{regexp}" msgstr "-E @var{Regexp}" #. type: table -#: doc/guix.texi:4577 +#: doc/guix.texi:4575 msgid "When used alongside @option{--pure}, preserve the environment variables matching @var{regexp}---in other words, put them on a ``white list'' of environment variables that must be preserved. This option can be repeated several times." msgstr "Wenn das hier zusammen mit @option{--pure} angegeben wird, bleiben die zum regulären Ausdruck @var{Regexp} passenden Umgebungsvariablen erhalten — mit anderen Worten werden sie auf eine „weiße Liste“ von Umgebungsvariablen gesetzt, die erhalten bleiben müssen. Diese Befehlszeilenoption kann mehrmals wiederholt werden." #. type: example -#: doc/guix.texi:4581 +#: doc/guix.texi:4579 #, no-wrap msgid "" "guix environment --pure --preserve=^SLURM --ad-hoc openmpi @dots{} \\\n" @@ -9607,111 +9618,111 @@ msgstr "" " -- mpirun …\n" #. type: table -#: doc/guix.texi:4587 +#: doc/guix.texi:4585 msgid "This example runs @command{mpirun} in a context where the only environment variables defined are @code{PATH}, environment variables whose name starts with @code{SLURM}, as well as the usual ``precious'' variables (@code{HOME}, @code{USER}, etc.)" msgstr "In diesem Beispiel wird @command{mpirun} in einem Kontext ausgeführt, in dem die einzig definierten Umgebungsvariablen @code{PATH} und solche sind, deren Name mit @code{SLURM} beginnt, sowie die üblichen besonders „kostbaren“ Variablen (@code{HOME}, @code{USER}, etc.)." #. type: item -#: doc/guix.texi:4588 +#: doc/guix.texi:4586 #, no-wrap msgid "--search-paths" msgstr "--search-paths" #. type: table -#: doc/guix.texi:4591 +#: doc/guix.texi:4589 msgid "Display the environment variable definitions that make up the environment." msgstr "Die Umgebungsvariablendefinitionen anzeigen, aus denen die Umgebung besteht." #. type: table -#: doc/guix.texi:4595 +#: doc/guix.texi:4593 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}." msgstr "Versuchen, für das angegebene @var{System} zu erstellen — z.B.@: @code{i686-linux}." #. type: item -#: doc/guix.texi:4596 +#: doc/guix.texi:4594 #, no-wrap msgid "--container" msgstr "--container" #. type: itemx -#: doc/guix.texi:4597 +#: doc/guix.texi:4595 #, no-wrap msgid "-C" msgstr "-C" #. type: item -#: doc/guix.texi:4598 doc/guix.texi:9976 doc/guix.texi:24524 +#: doc/guix.texi:4596 doc/guix.texi:9974 doc/guix.texi:24515 #, no-wrap msgid "container" msgstr "container" #. type: table -#: doc/guix.texi:4604 +#: doc/guix.texi:4602 msgid "Run @var{command} within an isolated container. The current working directory outside the container is mapped inside the container. Additionally, unless overridden with @code{--user}, a dummy home directory is created that matches the current user's home directory, and @file{/etc/passwd} is configured accordingly." msgstr "Den @var{Befehl} in einer isolierten Umgebung (einem sogenannten „Container“) ausführen. Das aktuelle Arbeitsverzeichnis außerhalb des Containers wird in den Container zugeordnet. Zusätzlich wird, wenn es mit der Befehlszeilenoption @code{--user} nicht anders spezifiziert wurde, ein stellvertretendes persönliches Verzeichnis erzeugt, dessen Inhalt der des wirklichen persönlichen Verzeichnisses ist, sowie eine passend konfigurierte Datei @file{/etc/passwd}." #. type: table -#: doc/guix.texi:4608 +#: doc/guix.texi:4606 msgid "The spawned process runs as the current user outside the container. Inside the container, it has the same UID and GID as the current user, unless @option{--user} is passed (see below.)" msgstr "Der erzeugte Prozess läuft außerhalb des Containers als der momentane Nutzer. Innerhalb des Containers hat er dieselbe UID und GID wie der momentane Nutzer, außer die Befehlszeilenoption @option{--user} wird übergeben (siehe unten)." #. type: item -#: doc/guix.texi:4609 doc/guix.texi:24597 +#: doc/guix.texi:4607 #, no-wrap msgid "--network" msgstr "--network" #. type: table -#: doc/guix.texi:4614 +#: doc/guix.texi:4612 msgid "For containers, share the network namespace with the host system. Containers created without this flag only have access to the loopback device." msgstr "Bei isolierten Umgebungen („Containern“) wird hiermit der Netzwerk-Namensraum mit dem des Wirtssystems geteilt. Container, die ohne diese Befehlszeilenoption erzeugt wurden, haben nur Zugriff auf das Loopback-Gerät." #. type: item -#: doc/guix.texi:4615 +#: doc/guix.texi:4613 #, no-wrap msgid "--link-profile" msgstr "--link-profile" #. type: itemx -#: doc/guix.texi:4616 +#: doc/guix.texi:4614 #, no-wrap msgid "-P" msgstr "-P" #. type: table -#: doc/guix.texi:4623 +#: doc/guix.texi:4621 msgid "For containers, link the environment profile to @file{~/.guix-profile} within the container. This is equivalent to running the command @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} within the container. Linking will fail and abort the environment if the directory already exists, which will certainly be the case if @command{guix environment} was invoked in the user's home directory." msgstr "Bei isolierten Umgebungen („Containern“) wird das Umgebungsprofil im Container als @file{~/.guix-profile} verknüpft. Das ist äquivalent dazu, den Befehl @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} im Container auszuführen. Wenn das Verzeichnis bereits existiert, schlägt das Verknüpfen fehl und die Umgebung wird nicht hergestellt. Dieser Fehler wird immer eintreten, wenn @command{guix environment} im persönlichen Verzeichnis des Benutzers aufgerufen wurde." #. type: table -#: doc/guix.texi:4630 +#: doc/guix.texi:4628 msgid "Certain packages are configured to look in @code{~/.guix-profile} for configuration files and data;@footnote{For example, the @code{fontconfig} package inspects @file{~/.guix-profile/share/fonts} for additional fonts.} @code{--link-profile} allows these programs to behave as expected within the environment." msgstr "Bestimmte Pakete sind so eingerichtet, dass sie in @code{~/.guix-profile} nach Konfigurationsdateien und Daten suchen,@footnote{Zum Beispiel inspiziert das Paket @code{fontconfig} das Verzeichnis @file{~/.guix-profile/share/fonts}, um zusätzliche Schriftarten zu finden.} weshalb @code{--link-profile} benutzt werden kann, damit sich diese Programme auch in der isolierten Umgebung wie erwartet verhalten." #. type: item -#: doc/guix.texi:4631 doc/guix.texi:9648 +#: doc/guix.texi:4629 doc/guix.texi:9646 #, no-wrap msgid "--user=@var{user}" msgstr "--user=@var{Benutzer}" #. type: itemx -#: doc/guix.texi:4632 doc/guix.texi:9649 +#: doc/guix.texi:4630 doc/guix.texi:9647 #, no-wrap msgid "-u @var{user}" msgstr "-u @var{Benutzer}" #. type: table -#: doc/guix.texi:4639 +#: doc/guix.texi:4637 msgid "For containers, use the username @var{user} in place of the current user. The generated @file{/etc/passwd} entry within the container will contain the name @var{user}, the home directory will be @file{/home/@var{user}}, and no user GECOS data will be copied. Furthermore, the UID and GID inside the container are 1000. @var{user} need not exist on the system." msgstr "Bei isolierten Umgebungen („Containern“) wird der Benutzername @var{Benutzer} anstelle des aktuellen Benutzers benutzt. Der erzeugte Eintrag in @file{/etc/passwd} im Container wird also den Namen @var{Benutzer} enthalten und das persönliche Verzeichnis wird den Namen @file{/home/BENUTZER} tragen; keine GECOS-Daten über den Nutzer werden in die Umgebung übernommen. Des Weiteren sind UID und GID innerhalb der isolierten Umgebung auf 1000 gesetzt. @var{Benutzer} muss auf dem System nicht existieren." #. type: table -#: doc/guix.texi:4644 +#: doc/guix.texi:4642 msgid "Additionally, any shared or exposed path (see @code{--share} and @code{--expose} respectively) whose target is within the current user's home directory will be remapped relative to @file{/home/USER}; this includes the automatic mapping of the current working directory." msgstr "Zusätzlich werden alle geteilten oder exponierten Pfade (siehe jeweils @code{--share} und @code{--expose}), deren Ziel innerhalb des persönlichen Verzeichnisses des aktuellen Benutzers liegt, relativ zu @file{/home/BENUTZER} erscheinen, einschließlich der automatischen Zuordnung des aktuellen Arbeitsverzeichnisses." #. type: example -#: doc/guix.texi:4651 +#: doc/guix.texi:4649 #, no-wrap msgid "" "# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target\n" @@ -9727,111 +9738,111 @@ msgstr "" " --expose=/tmp/target=$HOME/target\n" #. type: table -#: doc/guix.texi:4656 +#: doc/guix.texi:4654 msgid "While this will limit the leaking of user identity through home paths and each of the user fields, this is only one useful component of a broader privacy/anonymity solution---not one in and of itself." msgstr "Obwohl dies das Datenleck von Nutzerdaten durch Pfade im persönlichen Verzeichnis und die Benutzereinträge begrenzt, kann dies nur als Teil einer größeren Lösung für Datenschutz und Anonymität sinnvoll eingesetzt werden. Es sollte nicht für sich allein dazu eingesetzt werden." #. type: item -#: doc/guix.texi:4657 +#: doc/guix.texi:4655 #, no-wrap msgid "--expose=@var{source}[=@var{target}]" msgstr "--expose=@var{Quelle}[=@var{Ziel}]" #. type: table -#: doc/guix.texi:4662 +#: doc/guix.texi:4660 msgid "For containers, expose the file system @var{source} from the host system as the read-only file system @var{target} within the container. If @var{target} is not specified, @var{source} is used as the target mount point in the container." msgstr "Bei isolierten Umgebungen („Containern“) wird das Dateisystem unter @var{Quelle} vom Wirtssystem als Nur-Lese-Dateisystem @var{Ziel} im Container zugänglich gemacht. Wenn kein @var{Ziel} angegeben wurde, wird die @var{Quelle} auch als Ziel-Einhängepunkt in der isolierten Umgebung benutzt." #. type: table -#: doc/guix.texi:4666 +#: doc/guix.texi:4664 msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible read-only via the @file{/exchange} directory:" msgstr "Im folgenden Beispiel wird eine Guile-REPL in einer isolierten Umgebung gestartet, in der das persönliche Verzeichnis des Benutzers als Verzeichnis @file{/austausch} nur für Lesezugriffe zugänglich gemacht wurde:" #. type: example -#: doc/guix.texi:4669 +#: doc/guix.texi:4667 #, no-wrap msgid "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n" msgstr "guix environment --container --expose=$HOME=/austausch --ad-hoc guile -- guile\n" #. type: item -#: doc/guix.texi:4671 +#: doc/guix.texi:4669 #, no-wrap msgid "--share=@var{source}[=@var{target}]" msgstr "--share=@var{Quelle}[=@var{Ziel}]" #. type: table -#: doc/guix.texi:4676 +#: doc/guix.texi:4674 msgid "For containers, share the file system @var{source} from the host system as the writable file system @var{target} within the container. If @var{target} is not specified, @var{source} is used as the target mount point in the container." msgstr "Bei isolierten Umgebungen („Containern“) wird das Dateisystem unter @var{Quelle} vom Wirtssystem als beschreibbares Dateisystem @var{Ziel} im Container zugänglich gemacht. Wenn kein @var{Ziel} angegeben wurde, wird die @var{Quelle} auch als Ziel-Einhängepunkt in der isolierten Umgebung benutzt." #. type: table -#: doc/guix.texi:4680 +#: doc/guix.texi:4678 msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible for both reading and writing via the @file{/exchange} directory:" msgstr "Im folgenden Beispiel wird eine Guile-REPL in einer isolierten Umgebung gestartet, in der das persönliche Verzeichnis des Benutzers als Verzeichnis @file{/austausch} sowohl für Lese- als auch für Schreibzugriffe zugänglich gemacht wurde:" #. type: example -#: doc/guix.texi:4683 +#: doc/guix.texi:4681 #, no-wrap msgid "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n" msgstr "guix environment --container --share=$HOME=/austausch --ad-hoc guile -- guile\n" #. type: Plain text -#: doc/guix.texi:4690 +#: doc/guix.texi:4688 msgid "@command{guix environment} also supports all of the common build options that @command{guix build} supports (@pxref{Common Build Options}) as well as package transformation options (@pxref{Package Transformation Options})." msgstr "@command{guix environment} unterstützt auch alle gemeinsamen Erstellungsoptionen, die von @command{guix build} unterstützt werden (siehe @ref{Common Build Options}), und die Paketumwandlungsoptionen (siehe @ref{Package Transformation Options})." #. type: section -#: doc/guix.texi:4692 +#: doc/guix.texi:4690 #, no-wrap msgid "Invoking @command{guix pack}" msgstr "@command{guix pack} aufrufen" #. type: Plain text -#: doc/guix.texi:4698 +#: doc/guix.texi:4696 msgid "Occasionally you want to pass software to people who are not (yet!) lucky enough to be using Guix. You'd tell them to run @command{guix package -i @var{something}}, but that's not possible in this case. This is where @command{guix pack} comes in." msgstr "Manchmal möchten Sie Software an Leute weitergeben, die (noch!) nicht das Glück haben, Guix zu benutzen. Mit Guix würden sie nur @command{guix package -i @var{irgendetwas}} einzutippen brauchen, aber wenn sie kein Guix haben, muss es anders gehen. Hier kommt @command{guix pack} ins Spiel." #. type: quotation -#: doc/guix.texi:4703 +#: doc/guix.texi:4701 msgid "If you are looking for ways to exchange binaries among machines that already run Guix, @pxref{Invoking guix copy}, @ref{Invoking guix publish}, and @ref{Invoking guix archive}." msgstr "Wenn Sie aber nach einer Möglichkeit suchen, Binärdateien unter Maschinen auszutauschen, auf denen Guix bereits läuft, sollten Sie einen Blick auf die Abschnitte @ref{Invoking guix copy}, @ref{Invoking guix publish} und @ref{Invoking guix archive} werfen." #. type: cindex -#: doc/guix.texi:4705 +#: doc/guix.texi:4703 #, no-wrap msgid "pack" msgstr "Pack" #. type: cindex -#: doc/guix.texi:4706 +#: doc/guix.texi:4704 #, no-wrap msgid "bundle" msgstr "Bündel" #. type: cindex -#: doc/guix.texi:4707 +#: doc/guix.texi:4705 #, no-wrap msgid "application bundle" msgstr "Anwendungsbündel" #. type: cindex -#: doc/guix.texi:4708 +#: doc/guix.texi:4706 #, no-wrap msgid "software bundle" msgstr "Software-Bündel" #. type: Plain text -#: doc/guix.texi:4717 +#: doc/guix.texi:4715 msgid "The @command{guix pack} command creates a shrink-wrapped @dfn{pack} or @dfn{software bundle}: it creates a tarball or some other archive containing the binaries of the software you're interested in, and all its dependencies. The resulting archive can be used on any machine that does not have Guix, and people can run the exact same binaries as those you have with Guix. The pack itself is created in a bit-reproducible fashion, so anyone can verify that it really contains the build results that you pretend to be shipping." msgstr "Der Befehl @command{guix pack} erzeugt ein gut verpacktes @dfn{Software-Bündel}: Konkret wird dadurch ein Tarball oder eine andere Art von Archiv mit den Binärdateien der Software erzeugt, die Sie sich gewünscht haben, zusammen mit all ihren Abhängigkeiten. Der resultierende Archiv kann auch auf jeder Maschine genutzt werden, die kein Guix hat, und jeder kann damit genau dieselben Binärdateien benutzen, die Ihnen unter Guix zur Verfügung stehen. Das Bündel wird dabei auf eine Bit für Bit reproduzierbare Art erzeugt, damit auch jeder nachprüfen kann, dass darin wirklich diejenigen Binärdateien enthalten sind, von denen Sie es behaupten." #. type: Plain text -#: doc/guix.texi:4720 +#: doc/guix.texi:4718 msgid "For example, to create a bundle containing Guile, Emacs, Geiser, and all their dependencies, you can run:" msgstr "Um zum Beispiel ein Bündel mit Guile, Emacs, Geiser und all ihren Abhängigkeiten zu erzeugen, führen Sie diesen Befehl aus:" #. type: example -#: doc/guix.texi:4725 +#: doc/guix.texi:4723 #, no-wrap msgid "" "$ guix pack guile emacs geiser\n" @@ -9843,175 +9854,175 @@ msgstr "" "/gnu/store/…-pack.tar.gz\n" #. type: Plain text -#: doc/guix.texi:4733 +#: doc/guix.texi:4731 msgid "The result here is a tarball containing a @file{/gnu/store} directory with all the relevant packages. The resulting tarball contains a @dfn{profile} with the three packages of interest; the profile is the same as would be created by @command{guix package -i}. It is this mechanism that is used to create Guix's own standalone binary tarball (@pxref{Binary Installation})." msgstr "Als Ergebnis erhalten Sie einen Tarball mit einem Verzeichnis @file{/gnu/store}, worin sich alles relevanten Pakete befinden. Der resultierende Tarball enthält auch ein @dfn{Profil} mit den drei angegebenen Paketen; es ist dieselbe Art von Profil, die auch @command{guix package -i} erzeugen würde. Mit diesem Mechanismus wird auch der binäre Tarball zur Installation von Guix erzeugt (siehe @ref{Binary Installation})." #. type: Plain text -#: doc/guix.texi:4738 +#: doc/guix.texi:4736 msgid "Users of this pack would have to run @file{/gnu/store/@dots{}-profile/bin/guile} to run Guile, which you may find inconvenient. To work around it, you can create, say, a @file{/opt/gnu/bin} symlink to the profile:" msgstr "Benutzer des Bündels müssten dann aber zum Beispiel @file{/gnu/store/…-profile/bin/guile} eintippen, um Guile auszuführen, was Ihnen zu unbequem sein könnte. Ein Ausweg wäre, dass Sie etwa eine symbolische Verknüpfung @file{/opt/gnu/bin} auf das Profil anlegen:" #. type: example -#: doc/guix.texi:4741 +#: doc/guix.texi:4739 #, no-wrap msgid "guix pack -S /opt/gnu/bin=bin guile emacs geiser\n" msgstr "guix pack -S /opt/gnu/bin=bin guile emacs geiser\n" #. type: Plain text -#: doc/guix.texi:4745 +#: doc/guix.texi:4743 msgid "That way, users can happily type @file{/opt/gnu/bin/guile} and enjoy." msgstr "Benutzer müssten dann nur noch @file{/opt/gnu/bin/guile} eintippen, um Guile zu genießen." #. type: cindex -#: doc/guix.texi:4746 +#: doc/guix.texi:4744 #, no-wrap msgid "relocatable binaries, with @command{guix pack}" msgstr "pfad-agnostische Binärdateien, mit @command{guix pack}" #. type: Plain text -#: doc/guix.texi:4754 +#: doc/guix.texi:4752 msgid "What if the recipient of your pack does not have root privileges on their machine, and thus cannot unpack it in the root file system? In that case, you will want to use the @code{--relocatable} option (see below). This option produces @dfn{relocatable binaries}, meaning they they can be placed anywhere in the file system hierarchy: in the example above, users can unpack your tarball in their home directory and directly run @file{./opt/gnu/bin/guile}." msgstr "Doch was ist, wenn die Empfängerin Ihres Bündels keine Administratorrechte auf ihrer Maschine hat, das Bündel also nicht ins Wurzelverzeichnis ihres Dateisystems entpacken kann? Dann möchten Sie vielleicht die Befehlszeilenoption @code{--relocatable} benutzen (siehe weiter unten). Mit dieser Option werden @dfn{pfad-agnostische Binärdateien} erzeugt, die auch in einem beliebigen anderen Verzeichnis in der Dateisystemhierarchie abgelegt und von dort ausgeführt werden können. In obigem Beispiel würden Benutzer Ihren Tarball in ihr Persönliches Verzeichnis (das „Home“-Verzeichnis) entpacken und von dort den Befehl @file{./opt/gnu/bin/guile} ausführen." #. type: cindex -#: doc/guix.texi:4755 +#: doc/guix.texi:4753 #, no-wrap msgid "Docker, build an image with guix pack" msgstr "Docker, ein Abbild erstellen mit guix pack" #. type: Plain text -#: doc/guix.texi:4758 +#: doc/guix.texi:4756 msgid "Alternatively, you can produce a pack in the Docker image format using the following command:" msgstr "Eine weitere Möglichkeit ist, das Bündel im Format eines Docker-Abbilds (englisch Docker-Image) zu erzeugen. Das geht mit dem folgenden Befehl:" #. type: example -#: doc/guix.texi:4761 +#: doc/guix.texi:4759 #, no-wrap msgid "guix pack -f docker guile emacs geiser\n" msgstr "guix pack -f docker guile emacs geiser\n" #. type: Plain text -#: doc/guix.texi:4768 +#: doc/guix.texi:4766 msgid "The result is a tarball that can be passed to the @command{docker load} command. See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information." msgstr "Das Ergebnis ist ein Tarball, der dem Befehl @command{docker load} übergeben werden kann. In der @uref{https://docs.docker.com/engine/reference/commandline/load/, Dokumentation von Docker} finden Sie nähere Informationen." #. type: cindex -#: doc/guix.texi:4769 +#: doc/guix.texi:4767 #, no-wrap msgid "Singularity, build an image with guix pack" msgstr "Singularity, ein Abbild erstellen mit guix pack" #. type: cindex -#: doc/guix.texi:4770 +#: doc/guix.texi:4768 #, no-wrap msgid "SquashFS, build an image with guix pack" msgstr "SquashFS, ein Abbild erstellen mit guix pack" #. type: Plain text -#: doc/guix.texi:4773 +#: doc/guix.texi:4771 msgid "Yet another option is to produce a SquashFS image with the following command:" msgstr "Und noch eine weitere Möglichkeit ist, dass Sie ein SquashFS-Abbild mit folgendem Befehl erzeugen:" #. type: example -#: doc/guix.texi:4776 +#: doc/guix.texi:4774 #, no-wrap msgid "guix pack -f squashfs guile emacs geiser\n" msgstr "guix pack -f squashfs guile emacs geiser\n" #. type: Plain text -#: doc/guix.texi:4784 +#: doc/guix.texi:4782 msgid "The result is a SquashFS file system image that can either be mounted or directly be used as a file system container image with the @uref{https://singularity.lbl.gov, Singularity container execution environment}, using commands like @command{singularity shell} or @command{singularity exec}." msgstr "Das Ergebnis ist ein SquashFS-Dateisystemabbild, dass entweder als Dateisystem eingebunden oder mit Hilfe der @uref{https://singularity.lbl.gov, Singularity-Container-Ausführungsumgebung} als Dateisystemcontainer benutzt werden kann, mit Befehlen wie @command{singularity shell} oder @command{singularity exec}." #. type: Plain text -#: doc/guix.texi:4786 +#: doc/guix.texi:4784 msgid "Several command-line options allow you to customize your pack:" msgstr "Es gibt mehrere Befehlszeilenoptionen, mit denen Sie Ihr Bündel anpassen können:" #. type: table -#: doc/guix.texi:4791 +#: doc/guix.texi:4789 msgid "Produce a pack in the given @var{format}." msgstr "Generiert ein Bündel im angegebenen @var{Format}." #. type: table -#: doc/guix.texi:4793 +#: doc/guix.texi:4791 msgid "The available formats are:" msgstr "Die verfügbaren Formate sind:" #. type: item -#: doc/guix.texi:4795 +#: doc/guix.texi:4793 #, no-wrap msgid "tarball" msgstr "tarball" #. type: table -#: doc/guix.texi:4798 +#: doc/guix.texi:4796 msgid "This is the default format. It produces a tarball containing all the specified binaries and symlinks." msgstr "Das standardmäßig benutzte Format. Damit wird ein Tarball generiert, der alle angegebenen Binärdateien und symbolischen Verknüpfungen enthält." #. type: item -#: doc/guix.texi:4799 +#: doc/guix.texi:4797 #, no-wrap msgid "docker" msgstr "docker" #. type: table -#: doc/guix.texi:4803 +#: doc/guix.texi:4801 msgid "This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image Specification}." msgstr "Generiert einen Tarball gemäß der @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Spezifikation für Docker-Abbilder}." #. type: item -#: doc/guix.texi:4804 +#: doc/guix.texi:4802 #, no-wrap msgid "squashfs" msgstr "squashfs" #. type: table -#: doc/guix.texi:4808 +#: doc/guix.texi:4806 msgid "This produces a SquashFS image containing all the specified binaries and symlinks, as well as empty mount points for virtual file systems like procfs." msgstr "Generiert ein SquashFS-Abbild, das alle angegebenen Binärdateien und symbolischen Verknüpfungen enthält, sowie leere Einhängepunkte für virtuelle Dateisysteme wie procfs." #. type: cindex -#: doc/guix.texi:4810 +#: doc/guix.texi:4808 #, no-wrap msgid "relocatable binaries" msgstr "pfad-agnostische Binärdateien" #. type: item -#: doc/guix.texi:4811 +#: doc/guix.texi:4809 #, no-wrap msgid "--relocatable" msgstr "--relocatable" #. type: table -#: doc/guix.texi:4815 +#: doc/guix.texi:4813 msgid "Produce @dfn{relocatable binaries}---i.e., binaries that can be placed anywhere in the file system hierarchy and run from there." msgstr "Erzeugt @dfn{pfad-agnostische Binärdateien} — also „portable“ Binärdateien, die an einer beliebigen Stelle in der Dateisystemhierarchie platziert und von dort ausgeführt werden können." #. type: table -#: doc/guix.texi:4823 +#: doc/guix.texi:4821 msgid "When this option is passed once, the resulting binaries require support for @dfn{user namespaces} in the kernel Linux; when passed @emph{twice}@footnote{Here's a trick to memorize it: @code{-RR}, which adds PRoot support, can be thought of as the abbreviation of ``Really Relocatable''. Neat, isn't it?}, relocatable binaries fall to back to PRoot if user namespaces are unavailable, and essentially work anywhere---see below for the implications." msgstr "Wenn diese Befehlszeilenoption einmal übergeben wird, funktionieren die erzeugten Binärdateien nur dann, wenn @dfn{Benutzernamensräume} des Linux-Kernels unterstützt werden. Wenn sie @emph{zweimal}@footnote{Es gibt einen Trick, wie Sie sich das merken können: @code{-RR}, womit PRoot-Unterstützung hinzugefügt wird, kann man sich als Abkürzung für „Rundum Relocatable“ oder englisch „Really Relocatable“ vorstellen. Ist das nicht prima?} übergeben wird, laufen die Binärdateien notfalls mit PRoot, wenn keine Benutzernamensräume zur Verfügung stehen, funktionieren also ziemlich überall — siehe unten für die Auswirkungen." #. type: table -#: doc/guix.texi:4825 +#: doc/guix.texi:4823 msgid "For example, if you create a pack containing Bash with:" msgstr "Zum Beispiel können Sie ein Bash enthalltendes Bündel erzeugen mit:" #. type: example -#: doc/guix.texi:4828 +#: doc/guix.texi:4826 #, no-wrap msgid "guix pack -RR -S /mybin=bin bash\n" msgstr "guix pack -RR -S /mybin=bin bash\n" #. type: table -#: doc/guix.texi:4833 +#: doc/guix.texi:4831 msgid "...@: you can copy that pack to a machine that lacks Guix, and from your home directory as a normal user, run:" msgstr "…@: Sie können dieses dann auf eine Maschine ohne Guix kopieren und als normaler Nutzer aus Ihrem Persönlichen Verzeichnis (auch „Home“-Verzeichnis genannt) dann ausführen mit:" #. type: example -#: doc/guix.texi:4837 +#: doc/guix.texi:4835 #, no-wrap msgid "" "tar xf pack.tar.gz\n" @@ -10021,243 +10032,243 @@ msgstr "" "./meine-bin/sh\n" #. type: table -#: doc/guix.texi:4845 +#: doc/guix.texi:4843 msgid "In that shell, if you type @code{ls /gnu/store}, you'll notice that @file{/gnu/store} shows up and contains all the dependencies of @code{bash}, even though the machine actually lacks @file{/gnu/store} altogether! That is probably the simplest way to deploy Guix-built software on a non-Guix machine." msgstr "Wenn Sie in der so gestarteten Shell dann @code{ls /gnu/store} eintippen, sehen Sie, dass Ihnen angezeigt wird, in @file{/gnu/store} befänden sich alle Abhängigkeiten von @code{bash}, obwohl auf der Maschine überhaupt kein Verzeichnis @file{/gnu/store} existiert! Dies ist vermutlich die einfachste Art, mit Guix erstellte Software für eine Maschine ohne Guix auszuliefern." #. type: quotation -#: doc/guix.texi:4851 +#: doc/guix.texi:4849 msgid "By default, relocatable binaries rely on the @dfn{user namespace} feature of the kernel Linux, which allows unprivileged users to mount or change root. Old versions of Linux did not support it, and some GNU/Linux distributions turn it off." msgstr "Wenn die Voreinstellung verwendet wird, funktionieren pfad-agnostische Binärdateien nur mit @dfn{Benutzernamensräumen} (englisch @dfn{User namespaces}), einer Funktionalität des Linux-Kernels, mit der Benutzer ohne besondere Berechtigungen Dateisysteme einbinden (englisch „mount“) oder die Wurzel des Dateisystems wechseln können („change root“, kurz „chroot“). Alte Versionen von Linux haben diese Funktionalität noch nicht unterstützt und manche Distributionen von GNU/Linux schalten sie ab." #. type: quotation -#: doc/guix.texi:4856 +#: doc/guix.texi:4854 msgid "To produce relocatable binaries that work even in the absence of user namespaces, pass @option{--relocatable} or @option{-R} @emph{twice}. In that case, binaries will try user namespace support and fall back to PRoot if user namespaces are not supported." msgstr "Um pfad-agnostische Binärdateien zu erzeugen, die auch ohne Benutzernamensräume funktionieren, können Sie die Befehlszeilenoption @option{--relocatable} oder @option{-R} @emph{zweimal} angeben. In diesem Fall werden die Binärdateien zuerst überprüfen, ob Benutzernamensräume unterstützt werden, und sonst notfalls PRoot benutzen, um das Programm auszuführen, wenn Benutzernamensräume nicht unterstützt werden." #. type: quotation -#: doc/guix.texi:4862 +#: doc/guix.texi:4860 msgid "The @uref{https://proot-me.github.io/, PRoot} program provides the necessary support for file system virtualization. It achieves that by using the @code{ptrace} system call on the running program. This approach has the advantage to work without requiring special kernel support, but it incurs run-time overhead every time a system call is made." msgstr "Das Programm @uref{https://proot-me.github.io/, PRoot} bietet auch Unterstützung für Dateisystemvirtualisierung, indem der Systemaufruf @code{ptrace} auf das laufende Programm angewendet wird. Dieser Ansatz funktioniert auch ohne besondere Kernel-Unterstützung, aber das Programm braucht mehr Zeit, um selbst Systemaufrufe durchzuführen." #. type: table -#: doc/guix.texi:4867 doc/guix.texi:8880 doc/guix.texi:9538 +#: doc/guix.texi:4865 doc/guix.texi:8878 doc/guix.texi:9536 msgid "Consider the package @var{expr} evaluates to." msgstr "Als Paket benutzen, wozu der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:4871 +#: doc/guix.texi:4869 msgid "This has the same purpose as the same-named option in @command{guix build} (@pxref{Additional Build Options, @code{--expression} in @command{guix build}})." msgstr "Der Zweck hiervon ist derselbe wie bei der gleichnamigen Befehlszeilenoption in @command{guix build} (siehe @ref{Additional Build Options, @code{--expression} in @command{guix build}})." #. type: table -#: doc/guix.texi:4876 +#: doc/guix.texi:4874 msgid "Use the packages contained in the manifest object returned by the Scheme code in @var{file}." msgstr "Die Pakete benutzen, die im Manifest-Objekt aufgeführt sind, das vom Scheme-Code in der angegebenen @var{Datei} geliefert wird." #. type: table -#: doc/guix.texi:4884 +#: doc/guix.texi:4882 msgid "This has a similar purpose as the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files. It allows you to define a collection of packages once and use it both for creating profiles and for creating archives for use on machines that do not have Guix installed. Note that you can specify @emph{either} a manifest file @emph{or} a list of packages, but not both." msgstr "Dies hat einen ähnlichen Zweck wie die gleichnamige Befehlszeilenoption in @command{guix package} (siehe @ref{profile-manifest, @option{--manifest}}) und benutzt dieselben Regeln für Manifest-Dateien. Damit können Sie eine Reihe von Paketen einmal definieren und dann sowohl zum Erzeugen von Profilesn als auch zum Erzeugen von Archiven benutzen, letztere für Maschinen, auf denen Guix nicht installiert ist. Beachten Sie, dass Sie @emph{entweder} eine Manifest-Datei @emph{oder} eine Liste von Paketen angeben können, aber nicht beides." #. type: item -#: doc/guix.texi:4890 doc/guix.texi:8102 +#: doc/guix.texi:4888 doc/guix.texi:8100 #, no-wrap msgid "--target=@var{triplet}" msgstr "--target=@var{Tripel}" #. type: cindex -#: doc/guix.texi:4891 doc/guix.texi:5237 doc/guix.texi:8103 +#: doc/guix.texi:4889 doc/guix.texi:5235 doc/guix.texi:8101 #, no-wrap msgid "cross-compilation" msgstr "Cross-Kompilieren" #. type: table -#: doc/guix.texi:4895 +#: doc/guix.texi:4893 msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})." msgstr "Lässt für das angegebene @var{Tripel} cross-erstellen, dieses muss ein gültiges GNU-Tripel wie z.B.@: @code{\"mips64el-linux-gnu\"} sein (siehe @ref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})." #. type: item -#: doc/guix.texi:4896 +#: doc/guix.texi:4894 #, no-wrap msgid "--compression=@var{tool}" msgstr "--compression=@var{Werkzeug}" #. type: itemx -#: doc/guix.texi:4897 +#: doc/guix.texi:4895 #, no-wrap msgid "-C @var{tool}" msgstr "-C @var{Werkzeug}" #. type: table -#: doc/guix.texi:4900 +#: doc/guix.texi:4898 msgid "Compress the resulting tarball using @var{tool}---one of @code{gzip}, @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression." msgstr "Komprimiert den resultierenden Tarball mit dem angegebenen @var{Werkzeug} — dieses kann @code{gzip}, @code{bzip2}, @code{xz}, @code{lzip} oder @code{none} für keine Kompression sein." #. type: item -#: doc/guix.texi:4901 +#: doc/guix.texi:4899 #, no-wrap msgid "--symlink=@var{spec}" msgstr "--symlink=@var{Spezifikation}" #. type: itemx -#: doc/guix.texi:4902 +#: doc/guix.texi:4900 #, no-wrap msgid "-S @var{spec}" msgstr "-S @var{Spezifikation}" #. type: table -#: doc/guix.texi:4905 +#: doc/guix.texi:4903 msgid "Add the symlinks specified by @var{spec} to the pack. This option can appear several times." msgstr "Fügt die in der @var{Spezifikation} festgelegten symbolischen Verknüpfungen zum Bündel hinzu. Diese Befehlszeilenoption darf mehrmals vorkommen." #. type: table -#: doc/guix.texi:4909 +#: doc/guix.texi:4907 msgid "@var{spec} has the form @code{@var{source}=@var{target}}, where @var{source} is the symlink that will be created and @var{target} is the symlink target." msgstr "Die @var{Spezifikation} muss von der Form @code{@var{Quellort}=@var{Zielort}} sein, wobei der @var{Quellort} der Ort der symbolischen Verknüpfung, die erstellt wird, und @var{Zielort} das Ziel der symbolischen Verknüpfung ist." #. type: table -#: doc/guix.texi:4912 +#: doc/guix.texi:4910 msgid "For instance, @code{-S /opt/gnu/bin=bin} creates a @file{/opt/gnu/bin} symlink pointing to the @file{bin} sub-directory of the profile." msgstr "Zum Beispiel wird mit @code{-S /opt/gnu/bin=bin} eine symbolische Verknüpfung @file{/opt/gnu/bin} auf das Unterverzeichnis @file{bin} im Profil erzeugt." #. type: item -#: doc/guix.texi:4913 +#: doc/guix.texi:4911 #, no-wrap msgid "--save-provenance" msgstr "--save-provenance" #. type: table -#: doc/guix.texi:4917 +#: doc/guix.texi:4915 msgid "Save provenance information for the packages passed on the command line. Provenance information includes the URL and commit of the channels in use (@pxref{Channels})." msgstr "Provenienzinformationen für die auf der Befehlszeile übergebenen Pakete speichern. Zu den Provenienzinformationen gehören die URL und der Commit jedes benutzten Kanals (siehe @ref{Channels})." #. type: table -#: doc/guix.texi:4923 +#: doc/guix.texi:4921 msgid "Provenance information is saved in the @file{/gnu/store/@dots{}-profile/manifest} file in the pack, along with the usual package metadata---the name and version of each package, their propagated inputs, and so on. It is useful information to the recipient of the pack, who then knows how the pack was (supposedly) obtained." msgstr "Provenienzinformationen werden in der Datei @file{/gnu/store/…-profile/manifest} im Bündel zusammen mit den üblichen Paketmetadaten abgespeichert — also Name und Version jedes Pakets, welche Eingaben dabei propagiert werden und so weiter. Die Informationen nützen den Empfängern des Bündels, weil sie dann wissen, woraus das Bündel (angeblich) besteht." #. type: table -#: doc/guix.texi:4929 +#: doc/guix.texi:4927 msgid "This option is not enabled by default because, like timestamps, provenance information contributes nothing to the build process. In other words, there is an infinity of channel URLs and commit IDs that can lead to the same pack. Recording such ``silent'' metadata in the output thus potentially breaks the source-to-binary bitwise reproducibility property." msgstr "Der Vorgabe nach wird diese Befehlszeilenoption @emph{nicht} verwendet, weil Provenienzinformationen genau wie Zeitstempel nichts zum Erstellungsprozess beitragen. Mit anderen Worten gibt es unendlich viele Kanal-URLs und Commit-IDs, aus denen dasselbe Bündel stammen könnte. Wenn solche „stillen“ Metadaten Teil des Ausgabe sind, dann wird also die bitweise Reproduzierbarkeit von Quellcode zu Binärdateien eingeschränkt." #. type: item -#: doc/guix.texi:4930 +#: doc/guix.texi:4928 #, no-wrap msgid "--localstatedir" msgstr "--localstatedir" #. type: itemx -#: doc/guix.texi:4931 +#: doc/guix.texi:4929 #, no-wrap msgid "--profile-name=@var{name}" msgstr "--profile-name=@var{Name}" #. type: table -#: doc/guix.texi:4936 +#: doc/guix.texi:4934 msgid "Include the ``local state directory'', @file{/var/guix}, in the resulting pack, and notably the @file{/var/guix/profiles/per-user/root/@var{name}} profile---by default @var{name} is @code{guix-profile}, which corresponds to @file{~root/.guix-profile}." msgstr "Das „lokale Zustandsverzeichnis“ @file{/var/guix} ins resultierende Bündel aufnehmen, speziell auch das Profil @file{/var/guix/profiles/per-user/root/@var{Name}} — der vorgegebene @var{Name} ist @code{guix-profile}, was @file{~root/.guix-profile} entspricht." #. type: table -#: doc/guix.texi:4942 +#: doc/guix.texi:4940 msgid "@file{/var/guix} contains the store database (@pxref{The Store}) as well as garbage-collector roots (@pxref{Invoking guix gc}). Providing it in the pack means that the store is ``complete'' and manageable by Guix; not providing it pack means that the store is ``dead'': items cannot be added to it or removed from it after extraction of the pack." msgstr "@file{/var/guix} enthält die Store-Datenbank (siehe @ref{The Store}) sowie die Müllsammlerwurzeln (siehe @ref{Invoking guix gc}). Es ins Bündel aufzunehmen, bedeutet, dass der enthaltene Store „vollständig“ ist und von Guix verwaltet werden kann, andernfalls wäre der Store im Bündel „tot“ und nach dem Auspacken des Bündels könnte Guix keine Objekte mehr dort hinzufügen oder entfernen." #. type: table -#: doc/guix.texi:4945 +#: doc/guix.texi:4943 msgid "One use case for this is the Guix self-contained binary tarball (@pxref{Binary Installation})." msgstr "Ein Anwendungsfall hierfür ist der eigenständige, alle Komponenten umfassende binäre Tarball von Guix (siehe @ref{Binary Installation})." #. type: table -#: doc/guix.texi:4949 +#: doc/guix.texi:4947 msgid "Use the bootstrap binaries to build the pack. This option is only useful to Guix developers." msgstr "Mit den Bootstrap-Binärdateien das Bündel erstellen. Diese Option ist nur für Guix-Entwickler nützlich." #. type: Plain text -#: doc/guix.texi:4954 +#: doc/guix.texi:4952 msgid "In addition, @command{guix pack} supports all the common build options (@pxref{Common Build Options}) and all the package transformation options (@pxref{Package Transformation Options})." msgstr "Außerdem unterstützt @command{guix pack} alle gemeinsamen Erstellungsoptionen (siehe @ref{Common Build Options}) und alle Paketumwandlungsoptionen (siehe @ref{Package Transformation Options})." #. type: Plain text -#: doc/guix.texi:4966 +#: doc/guix.texi:4964 msgid "GNU Guix provides several Scheme programming interfaces (APIs) to define, build, and query packages. The first interface allows users to write high-level package definitions. These definitions refer to familiar packaging concepts, such as the name and version of a package, its build system, and its dependencies. These definitions can then be turned into concrete build actions." msgstr "GNU Guix bietet mehrere Programmierschnittstellen (APIs) in der Programmiersprache Scheme an, mit denen Software-Pakete definiert, erstellt und gesucht werden können. Die erste Schnittstelle erlaubt es Nutzern, ihre eigenen Paketdefinitionen in einer Hochsprache zu schreiben. Diese Definitionen nehmen Bezug auf geläufige Konzepte der Paketverwaltung, wie den Namen und die Version eines Pakets, sein Erstellungssystem (Build System) und seine Abhängigkeiten (Dependencies). Diese Definitionen können dann in konkrete Erstellungsaktionen umgewandelt werden." #. type: Plain text -#: doc/guix.texi:4972 +#: doc/guix.texi:4970 msgid "Build actions are performed by the Guix daemon, on behalf of users. In a standard setup, the daemon has write access to the store---the @file{/gnu/store} directory---whereas users do not. The recommended setup also has the daemon perform builds in chroots, under a specific build users, to minimize interference with the rest of the system." msgstr "Erstellungsaktionen werden vom Guix-Daemon für dessen Nutzer durchgeführt. Bei einer normalen Konfiguration hat der Daemon Schreibzugriff auf den Store, also das Verzeichnis @file{/gnu/store}, Nutzer hingegen nicht. Die empfohlene Konfiguration lässt den Daemon die Erstellungen in chroot-Umgebungen durchführen, mit eigenen Benutzerkonten für „Erstellungsbenutzer“, um gegenseitige Beeinflussung der Erstellung und des übrigen Systems zu minimieren." #. type: Plain text -#: doc/guix.texi:4981 +#: doc/guix.texi:4979 msgid "Lower-level APIs are available to interact with the daemon and the store. To instruct the daemon to perform a build action, users actually provide it with a @dfn{derivation}. A derivation is a low-level representation of the build actions to be taken, and the environment in which they should occur---derivations are to package definitions what assembly is to C programs. The term ``derivation'' comes from the fact that build results @emph{derive} from them." msgstr "Systemnahe APIs stehen zur Verfügung, um mit dem Daemon und dem Store zu interagieren. Um den Daemon anzuweisen, eine Erstellungsaktion durchzuführen, versorgen ihn Nutzer jeweils mit einer @dfn{Ableitung}. Eine Ableitung ist, wie durchzuführende Erstellungsaktionen, sowie die Umgebungen, in denen sie durchzuführen sind, in Guix eigentlich intern dargestellt werden. Ableitungen verhalten sich zu Paketdefinitionen vergleichbar mit Assembler-Code zu C-Programmen. Der Begriff „Ableitung“ kommt daher, dass Erstellungsergebnisse daraus @emph{abgeleitet} werden." #. type: Plain text -#: doc/guix.texi:4984 +#: doc/guix.texi:4982 msgid "This chapter describes all these APIs in turn, starting from high-level package definitions." msgstr "Dieses Kapitel beschreibt der Reihe nach all diese Programmierschnittstellen (APIs), angefangen mit hochsprachlichen Paketdefinitionen." #. type: Plain text -#: doc/guix.texi:5010 +#: doc/guix.texi:5008 msgid "From a programming viewpoint, the package definitions of the GNU distribution are provided by Guile modules in the @code{(gnu packages @dots{})} name space@footnote{Note that packages under the @code{(gnu packages @dots{})} module name space are not necessarily ``GNU packages''. This module naming scheme follows the usual Guile module naming convention: @code{gnu} means that these modules are distributed as part of the GNU system, and @code{packages} identifies modules that define packages.} (@pxref{Modules, Guile modules,, guile, GNU Guile Reference Manual}). For instance, the @code{(gnu packages emacs)} module exports a variable named @code{emacs}, which is bound to a @code{} object (@pxref{Defining Packages})." msgstr "Aus Programmierersicht werden die Paketdefinitionen der GNU-Distribution als Guile-Module in Namensräumen wie @code{(gnu packages …)} sichtbar gemacht@footnote{Beachten Sie, dass Pakete unter dem Modulnamensraum @code{(gnu packages …)} nicht notwendigerweise auch „GNU-Pakete“ sind. Dieses Schema für die Benennung von Modulen folgt lediglich den üblichen Guile-Konventionen: @code{gnu} bedeutet, dass die Module als Teil des GNU-Systems ausgeliefert werden, und @code{packages} gruppiert Module mit Paketdefinitionen.} (siehe @ref{Modules, Guile modules,, guile, GNU Guile Reference Manual}). Zum Beispiel exportiert das Modul @code{(gnu packages emacs)} eine Variable namens @code{emacs}, die an ein @code{}-Objekt gebunden ist (siehe @ref{Defining Packages})." #. type: Plain text -#: doc/guix.texi:5017 +#: doc/guix.texi:5015 msgid "The @code{(gnu packages @dots{})} module name space is automatically scanned for packages by the command-line tools. For instance, when running @code{guix install emacs}, all the @code{(gnu packages @dots{})} modules are scanned until one that exports a package object whose name is @code{emacs} is found. This package search facility is implemented in the @code{(gnu packages)} module." msgstr "Der Modulnamensraum @code{(gnu packages …)} wird von Befehlszeilenwerkzeugen automatisch nach Paketen durchsucht. Wenn Sie zum Beispiel @code{guix install emacs} ausführen, werden alle @code{(gnu packages …)}-Module durchlaufen, bis eines gefunden wird, das ein Paketobjekt mit dem Namen @code{emacs} exportiert. Diese Paketsuchfunktion ist im Modul @code{(gnu packages)} implementiert." #. type: cindex -#: doc/guix.texi:5019 +#: doc/guix.texi:5017 #, no-wrap msgid "package module search path" msgstr "Paketmodulsuchpfad" #. type: Plain text -#: doc/guix.texi:5028 +#: doc/guix.texi:5026 msgid "Users can store package definitions in modules with different names---e.g., @code{(my-packages emacs)}@footnote{Note that the file name and module name must match. For instance, the @code{(my-packages emacs)} module must be stored in a @file{my-packages/emacs.scm} file relative to the load path specified with @option{--load-path} or @code{GUIX_PACKAGE_PATH}. @xref{Modules and the File System,,, guile, GNU Guile Reference Manual}, for details.}. There are two ways to make these package definitions visible to the user interfaces:" msgstr "Benutzer können Paketdefinitionen auch in Modulen mit anderen Namen unterbringen — z.B.@: @code{(my-packages emacs)}@footnote{Beachten Sie, dass Dateiname und Modulname übereinstimmen müssen. Zum Beispiel muss das Modul @code{(my-packages emacs)} in einer Datei @file{my-packages/emacs.scm} relativ zum mit @option{--load-path} oder @code{GUIX_PACKAGE_PATH} angegebenen Ladepfad stehen. Siehe @ref{Modules and the File System,,, guile, GNU Guile Reference Manual} für Details.}. Es gibt zwei Arten, solche Paketdefinitionen für die Benutzungsschnittstelle sichtbar zu machen:" #. type: enumerate -#: doc/guix.texi:5035 +#: doc/guix.texi:5033 msgid "By adding the directory containing your package modules to the search path with the @code{-L} flag of @command{guix package} and other commands (@pxref{Common Build Options}), or by setting the @code{GUIX_PACKAGE_PATH} environment variable described below." msgstr "Eine Möglichkeit ist, das Verzeichnis, in dem Ihre Paketmodule stehen, mit der Befehlszeilenoption @code{-L} von @command{guix package} und anderen Befehlen (siehe @ref{Common Build Options}) oder durch Setzen der unten beschriebenen Umgebungsvariablen @code{GUIX_PACKAGE_PATH} zum Suchpfad hinzuzufügen." #. type: enumerate -#: doc/guix.texi:5041 +#: doc/guix.texi:5039 msgid "By defining a @dfn{channel} and configuring @command{guix pull} so that it pulls from it. A channel is essentially a Git repository containing package modules. @xref{Channels}, for more information on how to define and use channels." msgstr "Die andere Möglichkeit ist, einen @dfn{Kanal} zu definieren und @command{guix pull} so zu konfigurieren, dass es davon seine Module bezieht. Ein Kanal ist im Kern nur ein Git-Repository, in welchem Paketmodule liegen. Siehe @ref{Channels} für mehr Informationen, wie Kanäle definiert und benutzt werden." #. type: Plain text -#: doc/guix.texi:5044 +#: doc/guix.texi:5042 msgid "@code{GUIX_PACKAGE_PATH} works similarly to other search path variables:" msgstr "@code{GUIX_PACKAGE_PATH} funktioniert ähnlich wie andere Variable mit Suchpfaden:" #. type: defvr -#: doc/guix.texi:5045 +#: doc/guix.texi:5043 #, no-wrap msgid "{Environment Variable} GUIX_PACKAGE_PATH" msgstr "{Umgebungsvariable} GUIX_PACKAGE_PATH" #. type: defvr -#: doc/guix.texi:5049 +#: doc/guix.texi:5047 msgid "This is a colon-separated list of directories to search for additional package modules. Directories listed in this variable take precedence over the own modules of the distribution." msgstr "Dies ist eine doppelpunktgetrennte Liste von Verzeichnissen, die nach zusätzlichen Paketmodulen durchsucht werden. In dieser Variablen aufgelistete Verzeichnisse haben Vorrang vor den Modulen, die zur Distribution gehören." #. type: Plain text -#: doc/guix.texi:5057 +#: doc/guix.texi:5055 msgid "The distribution is fully @dfn{bootstrapped} and @dfn{self-contained}: each package is built based solely on other packages in the distribution. The root of this dependency graph is a small set of @dfn{bootstrap binaries}, provided by the @code{(gnu packages bootstrap)} module. For more information on bootstrapping, @pxref{Bootstrapping}." msgstr "Die Distribution wird komplett von Grund auf initialisiert — man sagt zur Initialisierung auch @dfn{Bootstrapping} — und sie ist @dfn{eigenständig} („self-contained“): Jedes Paket wird nur auf Basis von anderen Paketen in der Distribution erstellt. Die Wurzel dieses Abhängigkeitsgraphen ist ein kleiner Satz von Initialisierungsbinärdateien, den @dfn{Bootstrap-Binärdateien}, die im Modul @code{(gnu packages bootstrap)} verfügbar gemacht werden. Für mehr Informationen über Bootstrapping, siehe @ref{Bootstrapping}." #. type: Plain text -#: doc/guix.texi:5065 +#: doc/guix.texi:5063 msgid "The high-level interface to package definitions is implemented in the @code{(guix packages)} and @code{(guix build-system)} modules. As an example, the package definition, or @dfn{recipe}, for the GNU Hello package looks like this:" msgstr "Mit den Modulen @code{(guix packages)} und @code{(guix build-system)} können Paketdefinitionen auf einer hohen Abstraktionsebene geschrieben werden. Zum Beispiel sieht die Paketdefinition bzw. das @dfn{Rezept} für das Paket von GNU Hello so aus:" #. type: example -#: doc/guix.texi:5073 +#: doc/guix.texi:5071 #, no-wrap msgid "" "(define-module (gnu packages hello)\n" @@ -10277,7 +10288,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:5092 +#: doc/guix.texi:5090 #, no-wrap msgid "" "(define-public hello\n" @@ -10319,277 +10330,277 @@ msgstr "" " (license gpl3+)))\n" #. type: Plain text -#: doc/guix.texi:5102 +#: doc/guix.texi:5100 msgid "Without being a Scheme expert, the reader may have guessed the meaning of the various fields here. This expression binds the variable @code{hello} to a @code{} object, which is essentially a record (@pxref{SRFI-9, Scheme records,, guile, GNU Guile Reference Manual}). This package object can be inspected using procedures found in the @code{(guix packages)} module; for instance, @code{(package-name hello)} returns---surprise!---@code{\"hello\"}." msgstr "Auch ohne ein Experte in Scheme zu sein, könnten Leser erraten haben, was die verschiedenen Felder dabei bedeuten. Dieser Ausdruck bindet die Variable @code{hello} an ein @code{}-Objekt, was an sich nur ein Verbund (Record) ist (siehe @ref{SRFI-9, Scheme records,, guile, GNU Guile Reference Manual}). Die Felder dieses Paket-Objekts lassen sich mit den Prozeduren aus dem Modul @code{(guix packages)} auslesen, zum Beispiel liefert @code{(package-name hello)} — Überraschung! — @code{\"hello\"}." #. type: Plain text -#: doc/guix.texi:5106 +#: doc/guix.texi:5104 msgid "With luck, you may be able to import part or all of the definition of the package you are interested in from another repository, using the @code{guix import} command (@pxref{Invoking guix import})." msgstr "Mit etwas Glück können Sie die Definition vielleicht teilweise oder sogar ganz aus einer anderen Paketsammlung importieren, indem Sie den Befehl @code{guix import} verwenden (siehe @ref{Invoking guix import})." #. type: Plain text -#: doc/guix.texi:5112 +#: doc/guix.texi:5110 msgid "In the example above, @var{hello} is defined in a module of its own, @code{(gnu packages hello)}. Technically, this is not strictly necessary, but it is convenient to do so: all the packages defined in modules under @code{(gnu packages @dots{})} are automatically known to the command-line tools (@pxref{Package Modules})." msgstr "In obigem Beispiel wurde @var{hello} in einem eigenen Modul ganz für sich alleine definiert, und zwar @code{(gnu packages hello)}. Technisch gesehen muss es nicht unbedingt in einem solchen Modul definiert werden, aber es ist bequem, denn alle Module unter @code{(gnu packages …)} werden automatisch von den Befehlszeilenwerkzeugen gefunden (siehe @ref{Package Modules})." #. type: Plain text -#: doc/guix.texi:5114 +#: doc/guix.texi:5112 msgid "There are a few points worth noting in the above package definition:" msgstr "Ein paar Dinge sind noch erwähnenswert in der obigen Paketdefinition:" #. type: itemize -#: doc/guix.texi:5121 +#: doc/guix.texi:5119 msgid "The @code{source} field of the package is an @code{} object (@pxref{origin Reference}, for the complete reference). Here, the @code{url-fetch} method from @code{(guix download)} is used, meaning that the source is a file to be downloaded over FTP or HTTP." msgstr "Das @code{source}-Feld für die Quelle des Pakets ist ein @code{}-Objekt, was den Paketursprung angibt (siehe @ref{origin Reference} für eine vollständige Referenz). Hier wird dafür die Methode @code{url-fetch} aus dem Modul @code{(guix download)} benutzt, d.h.@: die Quelle ist eine Datei, die über FTP oder HTTP heruntergeladen werden soll." #. type: itemize -#: doc/guix.texi:5124 +#: doc/guix.texi:5122 msgid "The @code{mirror://gnu} prefix instructs @code{url-fetch} to use one of the GNU mirrors defined in @code{(guix download)}." msgstr "Das Präfix @code{mirror://gnu} lässt @code{url-fetch} einen der GNU-Spiegelserver benutzen, die in @code{(guix download)} definiert sind." #. type: itemize -#: doc/guix.texi:5131 +#: doc/guix.texi:5129 msgid "The @code{sha256} field specifies the expected SHA256 hash of the file being downloaded. It is mandatory, and allows Guix to check the integrity of the file. The @code{(base32 @dots{})} form introduces the base32 representation of the hash. You can obtain this information with @code{guix download} (@pxref{Invoking guix download}) and @code{guix hash} (@pxref{Invoking guix hash})." msgstr "Das Feld @code{sha256} legt den erwarteten SHA256-Hashwert der herunterzuladenden Datei fest. Ihn anzugeben ist Pflicht und er ermöglicht es Guix, die Integrität der Datei zu überprüfen. Die Form @code{(base32 …)} geht der base32-Darstellung des Hash-Wertes voraus. Sie finden die base32-Darstellung mit Hilfe der Befehle @code{guix download} (siehe @ref{Invoking guix download}) und @code{guix hash} (siehe @ref{Invoking guix hash})." #. type: cindex -#: doc/guix.texi:5132 +#: doc/guix.texi:5130 #, no-wrap msgid "patches" msgstr "Patches" #. type: itemize -#: doc/guix.texi:5136 +#: doc/guix.texi:5134 msgid "When needed, the @code{origin} form can also have a @code{patches} field listing patches to be applied, and a @code{snippet} field giving a Scheme expression to modify the source code." msgstr "Wenn nötig kann in der @code{origin}-Form auch ein @code{patches}-Feld stehen, wo anzuwendende Patches aufgeführt werden, sowie ein @code{snippet}-Feld mit einem Scheme-Ausdruck mit den Anweisungen, wie der Quellcode zu modifizieren ist." #. type: cindex -#: doc/guix.texi:5138 +#: doc/guix.texi:5136 #, no-wrap msgid "GNU Build System" msgstr "GNU-Erstellungssystem" #. type: itemize -#: doc/guix.texi:5144 +#: doc/guix.texi:5142 msgid "The @code{build-system} field specifies the procedure to build the package (@pxref{Build Systems}). Here, @var{gnu-build-system} represents the familiar GNU Build System, where packages may be configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence." msgstr "Das Feld @code{build-system} legt fest, mit welcher Prozedur das Paket erstellt werden soll (siehe @ref{Build Systems}). In diesem Beispiel steht @var{gnu-build-system} für das wohlbekannte GNU-Erstellungssystem, wo Pakete mit der üblichen Befehlsfolge @code{./configure && make && make check && make install} konfiguriert, erstellt und installiert werden." #. type: itemize -#: doc/guix.texi:5150 +#: doc/guix.texi:5148 msgid "The @code{arguments} field specifies options for the build system (@pxref{Build Systems}). Here it is interpreted by @var{gnu-build-system} as a request run @file{configure} with the @code{--enable-silent-rules} flag." msgstr "Das Feld @code{arguments} gibt an, welche Optionen dem Erstellungssystem mitgegeben werden sollen (siehe @ref{Build Systems}). In diesem Fall interpretiert @var{gnu-build-system} diese als Auftrag, @file{configure} mit der Befehlszeilenoption @code{--enable-silent-rules} auszuführen." #. type: findex -#: doc/guix.texi:5151 doc/guix.texi:5154 +#: doc/guix.texi:5149 doc/guix.texi:5152 #, no-wrap msgid "quote" msgstr "quote" #. type: cindex -#: doc/guix.texi:5152 +#: doc/guix.texi:5150 #, no-wrap msgid "quoting" msgstr "Maskierung" #. type: findex -#: doc/guix.texi:5153 +#: doc/guix.texi:5151 #, no-wrap msgid "'" msgstr "'" #. type: itemize -#: doc/guix.texi:5162 +#: doc/guix.texi:5160 msgid "What about these quote (@code{'}) characters? They are Scheme syntax to introduce a literal list; @code{'} is synonymous with @code{quote}. @xref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual}, for details. Here the value of the @code{arguments} field is a list of arguments passed to the build system down the road, as with @code{apply} (@pxref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})." msgstr "Was hat es mit diesen einfachen Anführungszeichen (@code{'}) auf sich? Sie gehören zur Syntax von Scheme und führen eine wörtlich zu interpretierende Datenlisten ein; dies nennt sich Maskierung oder Quotierung. @code{'} ist synonym mit @code{quote}. @ref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual} enthält weitere Details. Hierbei ist also der Wert des @code{arguments}-Feldes eine Liste von Argumenten, die an das Erstellungssystem weitergereicht werden, wie bei @code{apply} (siehe @ref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})." #. type: itemize -#: doc/guix.texi:5168 +#: doc/guix.texi:5166 msgid "The hash-colon (@code{#:}) sequence defines a Scheme @dfn{keyword} (@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and @code{#:configure-flags} is a keyword used to pass a keyword argument to the build system (@pxref{Coding With Keywords,,, guile, GNU Guile Reference Manual})." msgstr "Ein Doppelkreuz gefolgt von einem Doppelpunkt (@code{#:}) definiert ein Scheme-@dfn{Schlüsselwort} (siehe @ref{Keywords,,, guile, GNU Guile Reference Manual}) und @code{#:configure-flags} ist ein Schlüsselwort, um eine Befehlszeilenoption an das Erstellungssystem mitzugeben (siehe @ref{Coding With Keywords,,, guile, GNU Guile Reference Manual})." #. type: itemize -#: doc/guix.texi:5174 +#: doc/guix.texi:5172 msgid "The @code{inputs} field specifies inputs to the build process---i.e., build-time or run-time dependencies of the package. Here, we define an input called @code{\"gawk\"} whose value is that of the @var{gawk} variable; @var{gawk} is itself bound to a @code{} object." msgstr "Das Feld @code{inputs} legt Eingaben an den Erstellungsprozess fest — d.h.@: Abhängigkeiten des Pakets zur Erstellungs- oder Laufzeit. Hier definieren wir eine Eingabe namens @code{\"gawk\"}, deren Wert wir auf den Wert der @var{gawk}-Variablen festlegen; @var{gawk} ist auch selbst wiederum an ein @code{}-Objekt als Variablenwert gebunden." #. type: cindex -#: doc/guix.texi:5175 +#: doc/guix.texi:5173 #, no-wrap msgid "backquote (quasiquote)" msgstr "Backquote (Quasimaskierung)" #. type: findex -#: doc/guix.texi:5176 +#: doc/guix.texi:5174 #, no-wrap msgid "`" msgstr "`" #. type: findex -#: doc/guix.texi:5177 +#: doc/guix.texi:5175 #, no-wrap msgid "quasiquote" msgstr "quasiquote" #. type: cindex -#: doc/guix.texi:5178 +#: doc/guix.texi:5176 #, no-wrap msgid "comma (unquote)" msgstr "Komma (Demaskierung)" #. type: findex -#: doc/guix.texi:5179 +#: doc/guix.texi:5177 #, no-wrap msgid "," msgstr "," #. type: findex -#: doc/guix.texi:5180 +#: doc/guix.texi:5178 #, no-wrap msgid "unquote" msgstr "unquote" #. type: findex -#: doc/guix.texi:5181 +#: doc/guix.texi:5179 #, no-wrap msgid ",@@" msgstr ",@@" #. type: findex -#: doc/guix.texi:5182 +#: doc/guix.texi:5180 #, no-wrap msgid "unquote-splicing" msgstr "unquote-splicing" #. type: itemize -#: doc/guix.texi:5188 +#: doc/guix.texi:5186 msgid "Again, @code{`} (a backquote, synonymous with @code{quasiquote}) allows us to introduce a literal list in the @code{inputs} field, while @code{,} (a comma, synonymous with @code{unquote}) allows us to insert a value in that list (@pxref{Expression Syntax, unquote,, guile, GNU Guile Reference Manual})." msgstr "Auch mit @code{`} (einem Backquote, stattdessen kann man auch das längere Synonym @code{quasiquote} schreiben) können wir eine wörtlich als Daten interpretierte Liste im @code{inputs}-Feld einführen, aber bei dieser „Quasimaskierung“ kann @code{,} (ein Komma, oder dessen Synonym @code{unquote}) benutzt werden, um den ausgewerteten Wert eines Ausdrucks in diese Liste einzufügen (siehe @ref{Expression Syntax, unquote,, guile, GNU Guile Reference Manual})." #. type: itemize -#: doc/guix.texi:5192 +#: doc/guix.texi:5190 msgid "Note that GCC, Coreutils, Bash, and other essential tools do not need to be specified as inputs here. Instead, @var{gnu-build-system} takes care of ensuring that they are present (@pxref{Build Systems})." msgstr "Beachten Sie, dass GCC, Coreutils, Bash und andere essenzielle Werkzeuge hier nicht als Eingaben aufgeführt werden müssen. Stattdessen sorgt schon @var{gnu-build-system} dafür, dass diese vorhanden sein müssen (siehe @ref{Build Systems})." #. type: itemize -#: doc/guix.texi:5196 +#: doc/guix.texi:5194 msgid "However, any other dependencies need to be specified in the @code{inputs} field. Any dependency not specified here will simply be unavailable to the build process, possibly leading to a build failure." msgstr "Sämtliche anderen Abhängigkeiten müssen aber im @code{inputs}-Feld aufgezählt werden. Jede hier nicht angegebene Abhängigkeit wird während des Erstellungsprozesses schlicht nicht verfügbar sein, woraus ein Erstellungsfehler resultieren kann." #. type: Plain text -#: doc/guix.texi:5199 +#: doc/guix.texi:5197 msgid "@xref{package Reference}, for a full description of possible fields." msgstr "Siehe @ref{package Reference} für eine umfassende Beschreibung aller erlaubten Felder." #. type: Plain text -#: doc/guix.texi:5210 +#: doc/guix.texi:5208 msgid "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}), 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 more information on how to test package definitions, and @ref{Invoking guix lint}, for information on how to check a definition for style conformance." msgstr "Sobald eine Paketdefinition eingesetzt wurde, können Sie das Paket mit Hilfe des Befehlszeilenwerkzeugs @code{guix build} dann auch tatsächlich erstellen (siehe @ref{Invoking guix build}) und dabei jegliche Erstellungsfehler, auf die Sie stoßen, beseitigen (siehe @ref{Debugging Build Failures}). Sie können den Befehl @command{guix edit} benutzen, um leicht zur Paketdefinition zurückzuspringen (siehe @ref{Invoking guix edit}). Unter @ref{Packaging Guidelines} finden Sie mehr Informationen darüber, wie Sie Paketdefinitionen testen, und unter @ref{Invoking guix lint} finden Sie Informationen, wie Sie prüfen, ob eine Definition alle Stilkonventionen einhält." #. type: vindex -#: doc/guix.texi:5210 +#: doc/guix.texi:5208 #, no-wrap msgid "GUIX_PACKAGE_PATH" msgstr "GUIX_PACKAGE_PATH" #. type: Plain text -#: doc/guix.texi:5214 +#: doc/guix.texi:5212 msgid "Lastly, @pxref{Channels}, for information on how to extend the distribution by adding your own package definitions in a ``channel''." msgstr "Zuletzt finden Sie unter @ref{Channels} Informationen, wie Sie die Distribution um Ihre eigenen Pakete in einem „Kanal“ erweitern." #. type: Plain text -#: doc/guix.texi:5218 +#: doc/guix.texi:5216 msgid "Finally, updating the package definition to a new upstream version can be partly automated by the @command{guix refresh} command (@pxref{Invoking guix refresh})." msgstr "Zu all dem sei auch erwähnt, dass Sie das Aktualisieren einer Paketdefinition auf eine vom Anbieter neu veröffentlichte Version mit dem Befehl @command{guix refresh} teilweise automatisieren können (siehe @ref{Invoking guix refresh})." #. type: Plain text -#: doc/guix.texi:5224 +#: doc/guix.texi:5222 msgid "Behind the scenes, a derivation corresponding to the @code{} object is first computed by the @code{package-derivation} procedure. That derivation is stored in a @code{.drv} file under @file{/gnu/store}. The build actions it prescribes may then be realized by using the @code{build-derivations} procedure (@pxref{The Store})." msgstr "Hinter den Kulissen wird die einem @code{}-Objekt entsprechende Ableitung zuerst durch @code{package-derivation} berechnet. Diese Ableitung wird in der @code{.drv}-Datei unter @file{/gnu/store} gespeichert. Die von ihr vorgeschriebenen Erstellungsaktionen können dann durch die Prozedur @code{build-derivations} umgesetzt werden (siehe @ref{The Store})." #. type: deffn -#: doc/guix.texi:5225 +#: doc/guix.texi:5223 #, no-wrap msgid "{Scheme Procedure} package-derivation @var{store} @var{package} [@var{system}]" msgstr "{Scheme-Prozedur} package-derivation @var{Store} @var{Paket} [@var{System}]" #. type: deffn -#: doc/guix.texi:5228 +#: doc/guix.texi:5226 msgid "Return the @code{} object of @var{package} for @var{system} (@pxref{Derivations})." msgstr "Das @code{}-Objekt zum @var{Paket} für das angegebene @var{System} liefern (siehe @ref{Derivations})." #. type: deffn -#: doc/guix.texi:5234 +#: doc/guix.texi:5232 msgid "@var{package} must be a valid @code{} object, and @var{system} must be a string denoting the target system type---e.g., @code{\"x86_64-linux\"} for an x86_64 Linux-based GNU system. @var{store} must be a connection to the daemon, which operates on the store (@pxref{The Store})." msgstr "Als @var{Paket} muss ein gültiges @code{}-Objekt angegeben werden und das @var{System} muss eine Zeichenkette sein, die das Zielsystem angibt — z.B.@: @code{\"x86_64-linux\"} für ein auf x86_64 laufendes, Linux-basiertes GNU-System. @var{Store} muss eine Verbindung zum Daemon sein, der die Operationen auf dem Store durchführt (siehe @ref{The Store})." #. type: Plain text -#: doc/guix.texi:5240 +#: doc/guix.texi:5238 msgid "Similarly, it is possible to compute a derivation that cross-builds a package for some other system:" msgstr "Auf ähnliche Weise kann eine Ableitung berechnet werden, die ein Paket für ein anderes System cross-erstellt." #. type: deffn -#: doc/guix.texi:5241 +#: doc/guix.texi:5239 #, no-wrap msgid "{Scheme Procedure} package-cross-derivation @var{store} @" msgstr "{Scheme-Prozedur} package-cross-derivation @var{Store} @" #. type: deffn -#: doc/guix.texi:5245 +#: doc/guix.texi:5243 msgid "@var{package} @var{target} [@var{system}] Return the @code{} object of @var{package} cross-built from @var{system} to @var{target}." msgstr "@var{Paket} @var{Ziel} [@var{System}] Liefert das @code{}-Objekt, um das @var{Paket} zu cross-erstellen vom @var{System} aus für das @var{Ziel}-System." #. type: deffn -#: doc/guix.texi:5249 +#: doc/guix.texi:5247 msgid "@var{target} must be a valid GNU triplet denoting the target hardware and operating system, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets,,, autoconf, Autoconf})." msgstr "Als @var{Ziel} muss ein gültiges GNU-Tripel angegeben werden, was die Ziel-Hardware und das zugehörige Betriebssystem beschreibt, wie z.B.@: @code{\"mips64el-linux-gnu\"} (siehe @ref{Specifying Target Triplets,,, autoconf, Autoconf})." #. type: cindex -#: doc/guix.texi:5251 +#: doc/guix.texi:5249 #, no-wrap msgid "package transformations" msgstr "Paketumwandlungen" #. type: cindex -#: doc/guix.texi:5252 +#: doc/guix.texi:5250 #, no-wrap msgid "input rewriting" msgstr "Eingaben umschreiben" #. type: cindex -#: doc/guix.texi:5253 +#: doc/guix.texi:5251 #, no-wrap msgid "dependency tree rewriting" msgstr "Abhängigkeitsbaum umschreiben" #. type: Plain text -#: doc/guix.texi:5257 +#: doc/guix.texi:5255 msgid "Packages can be manipulated in arbitrary ways. An example of a useful transformation is @dfn{input rewriting}, whereby the dependency tree of a package is rewritten by replacing specific inputs by others:" msgstr "Pakete können auf beliebige Art verändert werden. Ein Beispiel für eine nützliche Veränderung ist das @dfn{Umschreiben von Eingaben}, womit der Abhängigkeitsbaum eines Pakets umgeschrieben wird, indem bestimmte Eingaben durch andere ersetzt werden:" #. type: deffn -#: doc/guix.texi:5258 +#: doc/guix.texi:5256 #, no-wrap msgid "{Scheme Procedure} package-input-rewriting @var{replacements} @" msgstr "{Scheme-Prozedur} package-input-rewriting @var{Ersetzungen} @" #. type: deffn -#: doc/guix.texi:5265 +#: doc/guix.texi:5263 msgid "[@var{rewrite-name}] Return a procedure that, when passed a package, replaces its direct and indirect dependencies (but not its implicit inputs) according to @var{replacements}. @var{replacements} is a list of package pairs; the first element of each pair is the package to replace, and the second one is the replacement." msgstr "[@var{umgeschriebener-Name}] Eine Prozedur liefern, die für ein ihr übergebenes Paket dessen direkte und indirekte Abhängigkeit (aber nicht dessen implizite Eingaben) gemäß den @var{Ersetzungen} umschreibt. @var{Ersetzungen} ist eine Liste von Paketpaaren; das erste Element eines Paares ist das zu ersetzende Paket und das zweite ist, wodurch es ersetzt werden soll." #. type: deffn -#: doc/guix.texi:5268 +#: doc/guix.texi:5266 msgid "Optionally, @var{rewrite-name} is a one-argument procedure that takes the name of a package and returns its new name after rewrite." msgstr "Optional kann als @var{umgeschriebener-Name} eine ein Argument nehmende Prozedur angegeben werden, die einen Paketnamen nimmt und den Namen nach dem Umschreiben zurückliefert." #. type: Plain text -#: doc/guix.texi:5272 +#: doc/guix.texi:5270 msgid "Consider this example:" msgstr "Betrachten Sie dieses Beispiel:" #. type: example -#: doc/guix.texi:5278 +#: doc/guix.texi:5276 #, no-wrap msgid "" "(define libressl-instead-of-openssl\n" @@ -10605,7 +10616,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:5281 +#: doc/guix.texi:5279 #, no-wrap msgid "" "(define git-with-libressl\n" @@ -10615,33 +10626,33 @@ msgstr "" " (libressl-statt-openssl git))\n" #. type: Plain text -#: doc/guix.texi:5289 +#: doc/guix.texi:5287 msgid "Here we first define a rewriting procedure that replaces @var{openssl} with @var{libressl}. Then we use it to define a @dfn{variant} of the @var{git} package that uses @var{libressl} instead of @var{openssl}. This is exactly what the @option{--with-input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}})." msgstr "Hier definieren wir zuerst eine Umschreibeprozedur, die @var{openssl} durch @var{libressl} ersetzt. Dann definieren wir damit eine @dfn{Variante} des @var{git}-Pakets, die @var{libressl} statt @var{openssl} benutzt. Das ist genau, was auch die Befehlszeilenoption @option{--with-input} tut (siehe @ref{Package Transformation Options, @option{--with-input}})." #. type: Plain text -#: doc/guix.texi:5292 +#: doc/guix.texi:5290 msgid "The following variant of @code{package-input-rewriting} can match packages to be replaced by name rather than by identity." msgstr "Die folgende Variante von @code{package-input-rewriting} kann für die Ersetzung passende Pakete anhand ihres Namens finden, statt zu prüfen, ob der Wert identisch ist." #. type: deffn -#: doc/guix.texi:5293 +#: doc/guix.texi:5291 #, no-wrap msgid "{Scheme Procedure} package-input-rewriting/spec @var{replacements}" msgstr "{Scheme-Prozedur} package-input-rewriting/spec @var{Ersetzungen}" #. type: deffn -#: doc/guix.texi:5299 +#: doc/guix.texi:5297 msgid "Return a procedure that, given a package, applies the given @var{replacements} to all the package graph (excluding implicit inputs). @var{replacements} is a list of spec/procedures pair; each spec is a package specification such as @code{\"gcc\"} or @code{\"guile@@2\"}, and each procedure takes a matching package and returns a replacement for that package." msgstr "Liefert eine Prozedur, die für ein gegebenes Paket die angegebenen @var{Ersetzungen} auf dessen gesamten Paketgraphen anwendet (außer auf implizite Eingaben). @var{Ersetzungen} muss dabei eine Liste von Paaren aus je einer Spezifikation und Prozedur sein. Dabei ist jede Spezifikation eine Paketspezifikation wie @code{\"gcc\"} oder @code{\"guile@@2\"} und jede Prozedur nimmt ein passendes Paket und liefert dafür einen Ersatz für das Paket." #. type: Plain text -#: doc/guix.texi:5302 +#: doc/guix.texi:5300 msgid "The example above could be rewritten this way:" msgstr "Das obige Beispiel könnte auch so geschrieben werden:" #. type: example -#: doc/guix.texi:5307 +#: doc/guix.texi:5305 #, no-wrap msgid "" "(define libressl-instead-of-openssl\n" @@ -10653,129 +10664,129 @@ msgstr "" " (package-input-rewriting/spec `((\"openssl\" . ,(const libressl)))))\n" #. type: Plain text -#: doc/guix.texi:5312 +#: doc/guix.texi:5310 msgid "The key difference here is that, this time, packages are matched by spec and not by identity. In other words, any package in the graph that is called @code{openssl} will be replaced." msgstr "Der Hauptunterschied ist hier, dass diesmal Pakete zur Spezifikation passen müssen und nicht deren Wert identisch sein muss, damit sie ersetzt werden. Mit anderen Worten wird jedes Paket im Graphen ersetzt, das @code{openssl} heißt." #. type: Plain text -#: doc/guix.texi:5316 +#: doc/guix.texi:5314 msgid "A more generic procedure to rewrite a package dependency graph is @code{package-mapping}: it supports arbitrary changes to nodes in the graph." msgstr "Eine allgemeiner anwendbare Prozedur, um den Abhängigkeitsgraphen eines Pakets umzuschreiben, ist @code{package-mapping}. Sie unterstützt beliebige Änderungen an den Knoten des Graphen." #. type: deffn -#: doc/guix.texi:5317 +#: doc/guix.texi:5315 #, no-wrap msgid "{Scheme Procedure} package-mapping @var{proc} [@var{cut?}]" msgstr "{Scheme-Prozedur} package-mapping @var{Prozedur} [@var{Schnitt?}]" #. type: deffn -#: doc/guix.texi:5321 +#: doc/guix.texi:5319 msgid "Return a procedure that, given a package, applies @var{proc} to all the packages depended on and returns the resulting package. The procedure stops recursion when @var{cut?} returns true for a given package." msgstr "Liefert eine Prozedur, die, wenn ihr ein Paket übergeben wird, die an @code{package-mapping} übergebene @var{Prozedur} auf alle vom Paket abhängigen Pakete anwendet. Die Prozedur liefert das resultierende Paket. Wenn @var{Schnitt?} für ein Paket davon einen wahren Wert liefert, findet kein rekursiver Abstieg in dessen Abhängigkeiten statt." #. type: subsection -#: doc/guix.texi:5330 +#: doc/guix.texi:5328 #, no-wrap msgid "@code{package} Reference" msgstr "@code{package}-Referenz" #. type: Plain text -#: doc/guix.texi:5334 +#: doc/guix.texi:5332 msgid "This section summarizes all the options available in @code{package} declarations (@pxref{Defining Packages})." msgstr "Dieser Abschnitt fasst alle in @code{package}-Deklarationen zur Verfügung stehenden Optionen zusammen (siehe @ref{Defining Packages})." #. type: deftp -#: doc/guix.texi:5335 +#: doc/guix.texi:5333 #, no-wrap msgid "{Data Type} package" msgstr "{Datentyp} package" #. type: deftp -#: doc/guix.texi:5337 +#: doc/guix.texi:5335 msgid "This is the data type representing a package recipe." msgstr "Dieser Datentyp steht für ein Paketrezept." #. type: table -#: doc/guix.texi:5341 +#: doc/guix.texi:5339 msgid "The name of the package, as a string." msgstr "Der Name des Pakets als Zeichenkette." #. type: code{#1} -#: doc/guix.texi:5342 +#: doc/guix.texi:5340 #, no-wrap msgid "version" msgstr "version" #. type: table -#: doc/guix.texi:5344 +#: doc/guix.texi:5342 msgid "The version of the package, as a string." msgstr "Die Version des Pakets als Zeichenkette." #. type: code{#1} -#: doc/guix.texi:5345 doc/guix.texi:9132 doc/guix.texi:10881 -#: doc/guix.texi:11319 +#: doc/guix.texi:5343 doc/guix.texi:9130 doc/guix.texi:10879 +#: doc/guix.texi:11317 #, no-wrap msgid "source" msgstr "source" #. type: table -#: doc/guix.texi:5352 +#: doc/guix.texi:5350 msgid "An object telling how the source code for the package should be acquired. Most of the time, this is an @code{origin} object, which denotes a file fetched from the Internet (@pxref{origin Reference}). It can also be any other ``file-like'' object such as a @code{local-file}, which denotes a file from the local file system (@pxref{G-Expressions, @code{local-file}})." msgstr "Ein Objekt, das beschreibt, wie der Quellcode des Pakets bezogen werden soll. Meistens ist es ein @code{origin}-Objekt, welches für eine aus dem Internet heruntergeladene Datei steht (siehe @ref{origin Reference}). Es kann aber auch ein beliebiges anderes „dateiähnliches“ Objekt sein, wie z.B.@: ein @code{local-file}, was eine Datei im lokalen Dateisystem bezeichnet (siehe @ref{G-Expressions, @code{local-file}})." #. type: code{#1} -#: doc/guix.texi:5353 +#: doc/guix.texi:5351 #, no-wrap msgid "build-system" msgstr "build-system" #. type: table -#: doc/guix.texi:5356 +#: doc/guix.texi:5354 msgid "The build system that should be used to build the package (@pxref{Build Systems})." msgstr "Das Erstellungssystem, mit dem das Paket erstellt werden soll (siehe @ref{Build Systems})." #. type: item -#: doc/guix.texi:5357 doc/guix.texi:12917 +#: doc/guix.texi:5355 doc/guix.texi:12915 #, no-wrap msgid "@code{arguments} (default: @code{'()})" msgstr "@code{arguments} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5360 +#: doc/guix.texi:5358 msgid "The arguments that should be passed to the build system. This is a list, typically containing sequential keyword-value pairs." msgstr "Die Argumente, die an das Erstellungssystem übergeben werden sollen. Dies ist eine Liste, typischerweise eine Reihe von Schlüssel-Wert-Paaren." #. type: item -#: doc/guix.texi:5361 +#: doc/guix.texi:5359 #, no-wrap msgid "@code{inputs} (default: @code{'()})" msgstr "@code{inputs} (Vorgabe: @code{'()})" #. type: itemx -#: doc/guix.texi:5362 +#: doc/guix.texi:5360 #, no-wrap msgid "@code{native-inputs} (default: @code{'()})" msgstr "@code{native-inputs} (Vorgabe: @code{'()})" #. type: itemx -#: doc/guix.texi:5363 +#: doc/guix.texi:5361 #, no-wrap msgid "@code{propagated-inputs} (default: @code{'()})" msgstr "@code{propagated-inputs} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:5364 +#: doc/guix.texi:5362 #, no-wrap msgid "inputs, of packages" msgstr "Eingaben, von Paketen" #. type: table -#: doc/guix.texi:5372 +#: doc/guix.texi:5370 msgid "These fields list dependencies of the package. Each one is a list of tuples, where each tuple has a label for the input (a string) as its first element, a package, origin, or derivation as its second element, and optionally the name of the output thereof that should be used, which defaults to @code{\"out\"} (@pxref{Packages with Multiple Outputs}, for more on package outputs). For example, the list below specifies three inputs:" msgstr "In diesen Feldern werden die Abhängigkeiten des Pakets aufgeführt. Jedes dieser Felder enthält eine Liste von Tupeln, wobei jedes Tupel eine Bezeichnung für die Eingabe (als Zeichenkette) als erstes Element, dann ein „package“-, „origin“- oder „derivation“-Objekt (Paket, Ursprung oder Ableitung) als zweites Element und optional die Benennung der davon zu benutzenden Ausgabe umfasst; letztere hat als Vorgabewert @code{\"out\"} (siehe @ref{Packages with Multiple Outputs} für mehr Informationen zu Paketausgaben). Im folgenden Beispiel etwa werden drei Eingaben festgelegt:" #. type: example -#: doc/guix.texi:5377 +#: doc/guix.texi:5375 #, no-wrap msgid "" "`((\"libffi\" ,libffi)\n" @@ -10787,181 +10798,181 @@ msgstr "" " (\"glib:bin\" ,glib \"bin\")) ;Ausgabe \"bin\" von Glib\n" #. type: cindex -#: doc/guix.texi:5379 +#: doc/guix.texi:5377 #, no-wrap msgid "cross compilation, package dependencies" msgstr "Cross-Kompilieren, Paketabhängigkeiten" #. type: table -#: doc/guix.texi:5385 +#: doc/guix.texi:5383 msgid "The distinction between @code{native-inputs} and @code{inputs} is necessary when considering cross-compilation. When cross-compiling, dependencies listed in @code{inputs} are built for the @emph{target} architecture; conversely, dependencies listed in @code{native-inputs} are built for the architecture of the @emph{build} machine." msgstr "Die Unterscheidung zwischen @code{native-inputs} und @code{inputs} ist wichtig, damit Cross-Kompilieren möglich ist. Beim Cross-Kompilieren werden als @code{inputs} aufgeführte Abhängigkeiten für die Ziel-Prozessorarchitektur (@emph{target}) erstellt, andersherum werden als @code{native-inputs} aufgeführte Abhängigkeiten für die Prozessorarchitektur der erstellenden Maschine (@emph{build}) erstellt." #. type: table -#: doc/guix.texi:5390 +#: doc/guix.texi:5388 msgid "@code{native-inputs} is typically used to list tools needed at build time, but not at run time, such as Autoconf, Automake, pkg-config, Gettext, or Bison. @command{guix lint} can report likely mistakes in this area (@pxref{Invoking guix lint})." msgstr "@code{native-inputs} listet typischerweise die Werkzeuge auf, die während der Erstellung gebraucht werden, aber nicht zur Laufzeit des Programms gebraucht werden. Beispiele sind Autoconf, Automake, pkg-config, Gettext oder Bison. @command{guix lint} kann melden, ob wahrscheinlich Fehler in der Auflistung sind (siehe @ref{Invoking guix lint})." #. type: anchor{#1} -#: doc/guix.texi:5397 +#: doc/guix.texi:5395 msgid "package-propagated-inputs" msgstr "package-propagated-inputs" #. type: table -#: doc/guix.texi:5397 +#: doc/guix.texi:5395 msgid "Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed alongside the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix package} deals with propagated inputs.)" msgstr "Schließlich ist @code{propagated-inputs} ähnlich wie @code{inputs}, aber die angegebenen Pakete werden automatisch mit ins Profil installiert, wenn das Paket installiert wird, zu dem sie gehören (siehe @ref{package-cmd-propagated-inputs, @command{guix package}} für Informationen darüber, wie @command{guix package} mit propagierten Eingaben umgeht)." #. type: table -#: doc/guix.texi:5401 +#: doc/guix.texi:5399 msgid "For example this is necessary when a C/C++ library needs headers of another library to compile, or when a pkg-config file refers to another one @i{via} its @code{Requires} field." msgstr "Dies ist zum Beispiel nötig, wenn eine C-/C++-Bibliothek Header-Dateien einer anderen Bibliothek braucht, um mit ihr kompilieren zu können, oder wenn sich eine pkg-config-Datei auf eine andere über ihren @code{Requires}-Eintrag bezieht." #. type: table -#: doc/guix.texi:5408 +#: doc/guix.texi:5406 msgid "Another example where @code{propagated-inputs} is useful is for languages that lack a facility to record the run-time search path akin to the @code{RUNPATH} of ELF files; this includes Guile, Python, Perl, and more. To ensure that libraries written in those languages can find library code they depend on at run time, run-time dependencies must be listed in @code{propagated-inputs} rather than @code{inputs}." msgstr "Noch ein Beispiel, wo @code{propagated-inputs} nützlich ist, sind Sprachen, die den Laufzeit-Suchpfad @emph{nicht} zusammen mit dem Programm abspeichern (@emph{nicht} wie etwa im @code{RUNPATH} bei ELF-Dateien), also Sprachen wie Guile, Python, Perl und weitere. Damit auch in solchen Sprachen geschriebene Bibliotheken zur Laufzeit den von ihnen benötigten Code finden können, müssen deren Laufzeit-Abhängigkeiten in @code{propagated-inputs} statt in @code{inputs} aufgeführt werden." #. type: item -#: doc/guix.texi:5409 +#: doc/guix.texi:5407 #, no-wrap msgid "@code{outputs} (default: @code{'(\"out\")})" msgstr "@code{outputs} (Vorgabe: @code{'(\"out\")})" #. type: table -#: doc/guix.texi:5412 +#: doc/guix.texi:5410 msgid "The list of output names of the package. @xref{Packages with Multiple Outputs}, for typical uses of additional outputs." msgstr "Die Liste der Benennungen der Ausgaben des Pakets. Der Abschnitt @ref{Packages with Multiple Outputs} beschreibt übliche Nutzungen zusätzlicher Ausgaben." #. type: item -#: doc/guix.texi:5413 +#: doc/guix.texi:5411 #, no-wrap msgid "@code{native-search-paths} (default: @code{'()})" msgstr "@code{native-search-paths} (Vorgabe: @code{'()})" #. type: itemx -#: doc/guix.texi:5414 +#: doc/guix.texi:5412 #, no-wrap msgid "@code{search-paths} (default: @code{'()})" msgstr "@code{search-paths} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5417 +#: doc/guix.texi:5415 msgid "A list of @code{search-path-specification} objects describing search-path environment variables honored by the package." msgstr "Eine Liste von @code{search-path-specification}-Objekten, die Umgebungsvariable für von diesem Paket beachtete Suchpfade („search paths“) beschreiben." #. type: item -#: doc/guix.texi:5418 +#: doc/guix.texi:5416 #, no-wrap msgid "@code{replacement} (default: @code{#f})" msgstr "@code{replacement} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5422 +#: doc/guix.texi:5420 msgid "This must be either @code{#f} or a package object that will be used as a @dfn{replacement} for this package. @xref{Security Updates, grafts}, for details." msgstr "Dies muss entweder @code{#f} oder ein package-Objekt sein, das als Ersatz (@dfn{replacement}) dieses Pakets benutzt werden soll. Im Abschnitt @ref{Security Updates, grafts} wird dies erklärt." #. type: item -#: doc/guix.texi:5423 doc/guix.texi:9124 +#: doc/guix.texi:5421 doc/guix.texi:9122 #, no-wrap msgid "synopsis" msgstr "synopsis" #. type: table -#: doc/guix.texi:5425 +#: doc/guix.texi:5423 msgid "A one-line description of the package." msgstr "Eine einzeilige Beschreibung des Pakets." #. type: item -#: doc/guix.texi:5426 doc/guix.texi:9125 doc/guix.texi:25017 +#: doc/guix.texi:5424 doc/guix.texi:9123 doc/guix.texi:25003 #, no-wrap msgid "description" msgstr "description" #. type: table -#: doc/guix.texi:5428 +#: doc/guix.texi:5426 msgid "A more elaborate description of the package." msgstr "Eine ausführlichere Beschreibung des Pakets." #. type: code{#1} -#: doc/guix.texi:5429 +#: doc/guix.texi:5427 #, no-wrap msgid "license" msgstr "license" #. type: cindex -#: doc/guix.texi:5430 +#: doc/guix.texi:5428 #, no-wrap msgid "license, of packages" msgstr "Lizenz, von Paketen" #. type: table -#: doc/guix.texi:5433 +#: doc/guix.texi:5431 msgid "The license of the package; a value from @code{(guix licenses)}, or a list of such values." msgstr "Die Lizenz des Pakets; benutzt werden kann ein Wert aus dem Modul @code{(guix licenses)} oder eine Liste solcher Werte." #. type: itemx -#: doc/guix.texi:5434 doc/guix.texi:9133 +#: doc/guix.texi:5432 doc/guix.texi:9131 #, no-wrap msgid "home-page" msgstr "home-page" #. type: table -#: doc/guix.texi:5436 +#: doc/guix.texi:5434 msgid "The URL to the home-page of the package, as a string." msgstr "Die URL, die die Homepage des Pakets angibt, als Zeichenkette." #. type: item -#: doc/guix.texi:5437 +#: doc/guix.texi:5435 #, no-wrap msgid "@code{supported-systems} (default: @var{%supported-systems})" msgstr "@code{supported-systems} (Vorgabe: @var{%supported-systems})" #. type: table -#: doc/guix.texi:5440 +#: doc/guix.texi:5438 msgid "The list of systems supported by the package, as strings of the form @code{architecture-kernel}, for example @code{\"x86_64-linux\"}." msgstr "Die Liste der vom Paket unterstützten Systeme als Zeichenketten der Form @code{Architektur-Kernel}, zum Beispiel @code{\"x86_64-linux\"}." #. type: item -#: doc/guix.texi:5441 +#: doc/guix.texi:5439 #, no-wrap msgid "@code{maintainers} (default: @code{'()})" msgstr "@code{maintainers} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5443 +#: doc/guix.texi:5441 msgid "The list of maintainers of the package, as @code{maintainer} objects." msgstr "Die Liste der Betreuer (Maintainer) des Pakets als @code{maintainer}-Objekte." #. type: item -#: doc/guix.texi:5444 +#: doc/guix.texi:5442 #, no-wrap msgid "@code{location} (default: source location of the @code{package} form)" msgstr "@code{location} (Vorgabe: die Stelle im Quellcode, wo die @code{package}-Form steht)" #. type: table -#: doc/guix.texi:5448 +#: doc/guix.texi:5446 msgid "The source location of the package. It is useful to override this when inheriting from another package, in which case this field is not automatically corrected." msgstr "Wo im Quellcode das Paket definiert wurde. Es ist sinnvoll, dieses Feld manuell zuzuweisen, wenn das Paket von einem anderen Paket erbt, weil dann dieses Feld nicht automatisch berichtigt wird." #. type: deffn -#: doc/guix.texi:5451 +#: doc/guix.texi:5449 #, no-wrap msgid "{Scheme Syntax} this-package" msgstr "{Scheme-Syntax} this-package" #. type: deffn -#: doc/guix.texi:5454 +#: doc/guix.texi:5452 msgid "When used in the @emph{lexical scope} of a package field definition, this identifier resolves to the package being defined." msgstr "Wenn dies im @emph{lexikalischen Geltungsbereich} der Definition eines Feldes im Paket steht, bezieht sich dieser Bezeichner auf das Paket, das gerade definiert wird." #. type: deffn -#: doc/guix.texi:5457 +#: doc/guix.texi:5455 msgid "The example below shows how to add a package as a native input of itself when cross-compiling:" msgstr "Das folgende Beispiel zeigt, wie man ein Paket als native Eingabe von sich selbst beim Cross-Kompilieren deklariert:" #. type: example -#: doc/guix.texi:5462 +#: doc/guix.texi:5460 #, no-wrap msgid "" "(package\n" @@ -10975,7 +10986,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:5468 +#: doc/guix.texi:5466 #, no-wrap msgid "" " ;; When cross-compiled, Guile, for example, depends on\n" @@ -10992,89 +11003,89 @@ msgstr "" " '())))\n" #. type: deffn -#: doc/guix.texi:5471 +#: doc/guix.texi:5469 msgid "It is an error to refer to @code{this-package} outside a package definition." msgstr "Es ist ein Fehler, außerhalb einer Paketdefinition auf @code{this-package} zu verweisen." #. type: subsection -#: doc/guix.texi:5474 +#: doc/guix.texi:5472 #, no-wrap msgid "@code{origin} Reference" msgstr "@code{origin}-Referenz" #. type: Plain text -#: doc/guix.texi:5478 +#: doc/guix.texi:5476 msgid "This section summarizes all the options available in @code{origin} declarations (@pxref{Defining Packages})." msgstr "Dieser Abschnitt fasst alle Optionen zusammen, die in @code{origin}-Deklarationen zur Verfügung stehen (siehe @ref{Defining Packages})." #. type: deftp -#: doc/guix.texi:5479 +#: doc/guix.texi:5477 #, no-wrap msgid "{Data Type} origin" msgstr "{Datentyp} origin" #. type: deftp -#: doc/guix.texi:5481 +#: doc/guix.texi:5479 msgid "This is the data type representing a source code origin." msgstr "Mit diesem Datentyp wird ein Ursprung, von dem Quellcode geladen werden kann, beschrieben." #. type: code{#1} -#: doc/guix.texi:5483 doc/guix.texi:18960 +#: doc/guix.texi:5481 doc/guix.texi:18957 #, no-wrap msgid "uri" msgstr "uri" #. type: table -#: doc/guix.texi:5488 +#: doc/guix.texi:5486 msgid "An object containing the URI of the source. The object type depends on the @code{method} (see below). For example, when using the @var{url-fetch} method of @code{(guix download)}, the valid @code{uri} values are: a URL represented as a string, or a list thereof." msgstr "Ein Objekt, was die URI des Quellcodes enthält. Der Objekttyp hängt von der @code{Methode} ab (siehe unten). Zum Beispiel sind, wenn die @var{url-fetch}-Methode aus @code{(guix download)} benutzt wird, die gültigen Werte für @code{uri}: eine URL dargestellt als Zeichenkette oder eine Liste solcher URLs." #. type: code{#1} -#: doc/guix.texi:5489 +#: doc/guix.texi:5487 #, no-wrap msgid "method" msgstr "method" #. type: table -#: doc/guix.texi:5491 +#: doc/guix.texi:5489 msgid "A procedure that handles the URI." msgstr "Eine Prozedur, die die URI verwertet." #. type: table -#: doc/guix.texi:5493 +#: doc/guix.texi:5491 msgid "Examples include:" msgstr "Beispiele sind unter anderem:" #. type: item -#: doc/guix.texi:5495 +#: doc/guix.texi:5493 #, no-wrap msgid "@var{url-fetch} from @code{(guix download)}" msgstr "@var{url-fetch} aus @code{(guix download)}" #. type: table -#: doc/guix.texi:5498 +#: doc/guix.texi:5496 msgid "download a file from the HTTP, HTTPS, or FTP URL specified in the @code{uri} field;" msgstr "Herunterladen einer Datei von einer HTTP-, HTTPS- oder FTP-URL, die im @code{uri}-Feld angegeben wurde." #. type: vindex -#: doc/guix.texi:5499 doc/guix.texi:8391 +#: doc/guix.texi:5497 doc/guix.texi:8389 #, no-wrap msgid "git-fetch" msgstr "git-fetch" #. type: item -#: doc/guix.texi:5500 +#: doc/guix.texi:5498 #, no-wrap msgid "@var{git-fetch} from @code{(guix git-download)}" msgstr "@var{git-fetch} aus @code{(guix git-download)}" #. type: table -#: doc/guix.texi:5504 +#: doc/guix.texi:5502 msgid "clone the Git version control repository, and check out the revision specified in the @code{uri} field as a @code{git-reference} object; a @code{git-reference} looks like this:" msgstr "Das im @code{uri}-Feld spezifizierte Repository des Git-Versionskontrollsystems klonen und davon den im @code{uri}-Feld als ein @code{git-reference}-Objekt angegebenen Commit benutzen; eine @code{git-reference} sieht so aus:" #. type: example -#: doc/guix.texi:5509 +#: doc/guix.texi:5507 #, no-wrap msgid "" "(git-reference\n" @@ -11086,1415 +11097,1415 @@ msgstr "" " (commit \"v4.1.5.1\"))\n" #. type: code{#1} -#: doc/guix.texi:5512 +#: doc/guix.texi:5510 #, no-wrap msgid "sha256" msgstr "sha256" #. type: table -#: doc/guix.texi:5516 +#: doc/guix.texi:5514 msgid "A bytevector containing the SHA-256 hash of the source. Typically the @code{base32} form is used here to generate the bytevector from a base-32 string." msgstr "Ein Bytevektor, der den SHA-256-Hash der Quelldateien enthält. Typischerweise wird hier mit der @code{base32}-Form der Bytevektor aus einer Base-32-Zeichenkette generiert." #. type: table -#: doc/guix.texi:5520 +#: doc/guix.texi:5518 msgid "You can obtain this information using @code{guix download} (@pxref{Invoking guix download}) or @code{guix hash} (@pxref{Invoking guix hash})." msgstr "Diese Informationen liefert Ihnen der Befehl @code{guix download} (siehe @ref{Invoking guix download}) oder @code{guix hash} (siehe @ref{Invoking guix hash})." #. type: item -#: doc/guix.texi:5521 +#: doc/guix.texi:5519 #, no-wrap msgid "@code{file-name} (default: @code{#f})" msgstr "@code{file-name} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5527 +#: doc/guix.texi:5525 msgid "The file name under which the source code should be saved. When this is @code{#f}, a sensible default value will be used in most cases. In case the source is fetched from a URL, the file name from the URL will be used. For version control checkouts, it is recommended to provide the file name explicitly because the default is not very descriptive." msgstr "Der Dateiname, unter dem der Quellcode abgespeichert werden sollte. Wenn er auf @code{#f} steht, wird ein vernünftiger Name automatisch gewählt. Falls der Quellcode von einer URL geladen wird, wird der Dateiname aus der URL genommen. Wenn der Quellcode von einem Versionskontrollsystem bezogen wird, empfiehlt es sich, den Dateinamen ausdrücklich anzugeben, weil dann keine sprechende Benennung automatisch gefunden werden kann." #. type: item -#: doc/guix.texi:5528 +#: doc/guix.texi:5526 #, no-wrap msgid "@code{patches} (default: @code{'()})" msgstr "@code{patches} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5531 +#: doc/guix.texi:5529 msgid "A list of file names, origins, or file-like objects (@pxref{G-Expressions, file-like objects}) pointing to patches to be applied to the source." msgstr "Eine Liste von Dateinamen, Ursprüngen oder dateiähnlichen Objekten (siehe @ref{G-Expressions, file-like objects}) mit Patches, welche auf den Quellcode anzuwenden sind." #. type: table -#: doc/guix.texi:5535 +#: doc/guix.texi:5533 msgid "This list of patches must be unconditional. In particular, it cannot depend on the value of @code{%current-system} or @code{%current-target-system}." msgstr "Die Liste von Patches kann nicht von Parametern der Erstellung abhängen. Insbesondere kann sie nicht vom Wert von @code{%current-system} oder @code{%current-target-system} abḧängen." #. type: item -#: doc/guix.texi:5536 +#: doc/guix.texi:5534 #, no-wrap msgid "@code{snippet} (default: @code{#f})" msgstr "@code{snippet} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5540 +#: doc/guix.texi:5538 msgid "A G-expression (@pxref{G-Expressions}) or S-expression that will be run in the source directory. This is a convenient way to modify the source, sometimes more convenient than a patch." msgstr "Ein im Quellcode-Verzeichnis auszuführender G-Ausdruck (siehe @ref{G-Expressions}) oder S-Ausdruck. Hiermit kann der Quellcode bequem modifiziert werden, manchmal ist dies bequemer als mit einem Patch." #. type: item -#: doc/guix.texi:5541 +#: doc/guix.texi:5539 #, no-wrap msgid "@code{patch-flags} (default: @code{'(\"-p1\")})" msgstr "@code{patch-flags} (Vorgabe: @code{'(\"-p1\")})" #. type: table -#: doc/guix.texi:5544 +#: doc/guix.texi:5542 msgid "A list of command-line flags that should be passed to the @code{patch} command." msgstr "Eine Liste der Befehlszeilenoptionen, die dem @code{patch}-Befehl übergeben werden sollen." #. type: item -#: doc/guix.texi:5545 +#: doc/guix.texi:5543 #, no-wrap msgid "@code{patch-inputs} (default: @code{#f})" msgstr "@code{patch-inputs} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5549 +#: doc/guix.texi:5547 msgid "Input packages or derivations to the patching process. When this is @code{#f}, the usual set of inputs necessary for patching are provided, such as GNU@tie{}Patch." msgstr "Eingabepakete oder -ableitungen für den Patch-Prozess. Bei @code{#f} werden die üblichen Patcheingaben wie GNU@tie{}Patch bereitgestellt." #. type: item -#: doc/guix.texi:5550 +#: doc/guix.texi:5548 #, no-wrap msgid "@code{modules} (default: @code{'()})" msgstr "@code{modules} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:5553 +#: doc/guix.texi:5551 msgid "A list of Guile modules that should be loaded during the patching process and while running the code in the @code{snippet} field." msgstr "Eine Liste von Guile-Modulen, die während des Patch-Prozesses und während der Ausführung des @code{snippet}-Felds geladen werden sollten." #. type: item -#: doc/guix.texi:5554 +#: doc/guix.texi:5552 #, no-wrap msgid "@code{patch-guile} (default: @code{#f})" msgstr "@code{patch-guile} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:5557 +#: doc/guix.texi:5555 msgid "The Guile package that should be used in the patching process. When this is @code{#f}, a sensible default is used." msgstr "Welches Guile-Paket für den Patch-Prozess benutzt werden sollte. Bei @code{#f} wird ein vernünftiger Vorgabewert angenommen." #. type: cindex -#: doc/guix.texi:5564 +#: doc/guix.texi:5562 #, no-wrap msgid "build system" msgstr "Erstellungssystem" #. type: Plain text -#: doc/guix.texi:5569 +#: doc/guix.texi:5567 msgid "Each package definition specifies a @dfn{build system} and arguments for that build system (@pxref{Defining Packages}). This @code{build-system} field represents the build procedure of the package, as well as implicit dependencies of that build procedure." msgstr "Jede Paketdefinition legt ein @dfn{Erstellungssystem} („build system“) sowie dessen Argumente fest (siehe @ref{Defining Packages}). Das @code{build-system}-Feld steht für die Erstellungsprozedur des Pakets sowie für weitere implizite Eingaben für die Erstellungsprozedur." #. type: Plain text -#: doc/guix.texi:5573 +#: doc/guix.texi:5571 msgid "Build systems are @code{} objects. The interface to create and manipulate them is provided by the @code{(guix build-system)} module, and actual build systems are exported by specific modules." msgstr "Erstellungssysteme sind @code{}-Objekte. Die Schnittstelle, um solche zu erzeugen und zu verändern, ist im Modul @code{(guix build-system)} zu finden, und die eigentlichen Erstellungssysteme werden jeweils von ihren eigenen Modulen exportiert." #. type: cindex -#: doc/guix.texi:5574 +#: doc/guix.texi:5572 #, no-wrap msgid "bag (low-level package representation)" msgstr "Bag (systemnahe Paketrepräsentation)" #. type: Plain text -#: doc/guix.texi:5581 +#: doc/guix.texi:5579 msgid "Under the hood, build systems first compile package objects to @dfn{bags}. A @dfn{bag} is like a package, but with less ornamentation---in other words, a bag is a lower-level representation of a package, which includes all the inputs of that package, including some that were implicitly added by the build system. This intermediate representation is then compiled to a derivation (@pxref{Derivations})." msgstr "Intern funktionieren Erstellungssysteme, indem erst Paketobjekte zu @dfn{Bags} kompiliert werden. Eine Bag (deutsch: Beutel, Sack) ist wie ein Paket, aber mit weniger Zierrat — anders gesagt ist eine Bag eine systemnähere Darstellung eines Pakets, die sämtliche Eingaben des Pakets einschließlich vom Erstellungssystem hinzugefügter Eingaben enthält. Diese Zwischendarstellung wird dann zur eigentlichen Ableitung kompiliert (siehe @ref{Derivations})." #. type: Plain text -#: doc/guix.texi:5589 +#: doc/guix.texi:5587 msgid "Build systems accept an optional list of @dfn{arguments}. In package definitions, these are passed @i{via} the @code{arguments} field (@pxref{Defining Packages}). They are typically keyword arguments (@pxref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile Reference Manual}). The value of these arguments is usually evaluated in the @dfn{build stratum}---i.e., by a Guile process launched by the daemon (@pxref{Derivations})." msgstr "Erstellungssysteme akzeptieren optional eine Liste von @dfn{Argumenten}. In Paketdefinitionen werden diese über das @code{arguments}-Feld übergeben (siehe @ref{Defining Packages}). Sie sind in der Regel Schlüsselwort-Argumente (siehe @ref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile Reference Manual}). Der Wert dieser Argumente wird normalerweise vom Erstellungssystem in der @dfn{Erstellungsschicht} ausgewertet, d.h.@: von einem durch den Daemon gestarteten Guile-Prozess (siehe @ref{Derivations})." #. type: Plain text -#: doc/guix.texi:5593 +#: doc/guix.texi:5591 msgid "The main build system is @var{gnu-build-system}, which implements the standard build procedure for GNU and many other packages. It is provided by the @code{(guix build-system gnu)} module." msgstr "Das häufigste Erstellungssystem ist @var{gnu-build-system}, was die übliche Erstellungsprozedur für GNU-Pakete und viele andere Pakete darstellt. Es wird vom Modul @code{(guix build-system gnu)} bereitgestellt." #. type: defvr -#: doc/guix.texi:5594 +#: doc/guix.texi:5592 #, no-wrap msgid "{Scheme Variable} gnu-build-system" msgstr "{Scheme-Variable} gnu-build-system" #. type: defvr -#: doc/guix.texi:5598 +#: doc/guix.texi:5596 msgid "@var{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})." msgstr "@var{gnu-build-system} steht für das GNU-Erstellungssystem und Varianten desselben (siehe @ref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})." #. type: cindex -#: doc/guix.texi:5599 doc/guix.texi:6261 +#: doc/guix.texi:5597 doc/guix.texi:6259 #, no-wrap msgid "build phases" msgstr "Erstellungsphasen" #. type: defvr -#: doc/guix.texi:5606 +#: doc/guix.texi:5604 msgid "In a nutshell, packages using it are configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence. In practice, a few additional steps are often needed. All these steps are split up in separate @dfn{phases}, notably@footnote{Please see the @code{(guix build gnu-build-system)} modules for more details about the build phases.}:" msgstr "Kurz gefasst werden Pakete, die es benutzen, konfiguriert, erstellt und installiert mit der üblichen Befehlsfolge @code{./configure && make && make check && make install}. In der Praxis braucht man oft noch ein paar weitere Schritte. Alle Schritte sind in voneinander getrennte @dfn{Phasen} unterteilt. Erwähnt werden sollten@footnote{Bitte schauen Sie in den Modulen unter @code{(guix build gnu-build-system)}, wenn Sie mehr Details zu Erstellungsphasen brauchen.}:" #. type: item -#: doc/guix.texi:5608 +#: doc/guix.texi:5606 #, no-wrap msgid "unpack" msgstr "unpack" #. type: table -#: doc/guix.texi:5612 +#: doc/guix.texi:5610 msgid "Unpack the source tarball, and change the current directory to the extracted source tree. If the source is actually a directory, copy it to the build tree, and enter that directory." msgstr "Den Quell-Tarball entpacken und das Arbeitsverzeichnis wechseln in den entpackten Quellbaum. Wenn die Quelle bereits ein Verzeichnis ist, wird es in den Quellbaum kopiert und dorthin gewechselt." #. type: item -#: doc/guix.texi:5613 +#: doc/guix.texi:5611 #, no-wrap msgid "patch-source-shebangs" msgstr "patch-source-shebangs" #. type: table -#: doc/guix.texi:5617 +#: doc/guix.texi:5615 msgid "Patch shebangs encountered in source files so they refer to the right store file names. For instance, this changes @code{#!/bin/sh} to @code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}." msgstr "„Shebangs“ in Quelldateien beheben, damit Sie sich auf die richtigen Store-Dateipfade beziehen. Zum Beispiel könnte @code{#!/bin/sh} zu @code{#!/gnu/store/…-bash-4.3/bin/sh} geändert werden." #. type: item -#: doc/guix.texi:5618 doc/guix.texi:6219 doc/guix.texi:6267 +#: doc/guix.texi:5616 doc/guix.texi:6217 doc/guix.texi:6265 #, no-wrap msgid "configure" msgstr "configure" #. type: table -#: doc/guix.texi:5622 +#: doc/guix.texi:5620 msgid "Run the @file{configure} script with a number of default options, such as @code{--prefix=/gnu/store/@dots{}}, as well as the options specified by the @code{#:configure-flags} argument." msgstr "Das Skript @file{configure} mit einigen vorgegebenen Befehlszeilenoptionen ausführen, wie z.B.@: mit @code{--prefix=/gnu/store/…}, sowie mit den im @code{#:configure-flags}-Argument angegebenen Optionen." #. type: item -#: doc/guix.texi:5623 doc/guix.texi:5812 doc/guix.texi:6224 doc/guix.texi:6271 -#: doc/guix.texi:24393 +#: doc/guix.texi:5621 doc/guix.texi:5810 doc/guix.texi:6222 doc/guix.texi:6269 +#: doc/guix.texi:24390 #, no-wrap msgid "build" msgstr "build" #. type: table -#: doc/guix.texi:5627 +#: doc/guix.texi:5625 msgid "Run @code{make} with the list of flags specified with @code{#:make-flags}. If the @code{#:parallel-build?} argument is true (the default), build with @code{make -j}." msgstr "@code{make} ausführen mit den Optionen aus der Liste in @code{#:make-flags}. Wenn das Argument @code{#:parallel-build?} auf wahr gesetzt ist (was der Vorgabewert ist), wird @code{make -j} zum Erstellen ausgeführt." #. type: item -#: doc/guix.texi:5628 doc/guix.texi:5822 doc/guix.texi:6228 +#: doc/guix.texi:5626 doc/guix.texi:5820 doc/guix.texi:6226 #, no-wrap msgid "check" msgstr "check" #. type: table -#: doc/guix.texi:5633 +#: doc/guix.texi:5631 msgid "Run @code{make check}, or some other target specified with @code{#:test-target}, unless @code{#:tests? #f} is passed. If the @code{#:parallel-tests?} argument is true (the default), run @code{make check -j}." msgstr "@code{make check} (oder statt @code{check} ein anderes bei @code{#:test-target} angegebenes Ziel) ausführen, außer falls @code{#:tests? #f} gesetzt ist. Wenn das Argument @code{#:parallel-tests?} auf wahr gesetzt ist (der Vorgabewert), führe @code{make check -j} aus." #. type: item -#: doc/guix.texi:5634 doc/guix.texi:5830 doc/guix.texi:6232 doc/guix.texi:6275 +#: doc/guix.texi:5632 doc/guix.texi:5828 doc/guix.texi:6230 doc/guix.texi:6273 #, no-wrap msgid "install" msgstr "install" #. type: table -#: doc/guix.texi:5636 +#: doc/guix.texi:5634 msgid "Run @code{make install} with the flags listed in @code{#:make-flags}." msgstr "@code{make install} mit den in @code{#:make-flags} aufgelisteten Optionen ausführen." #. type: item -#: doc/guix.texi:5637 +#: doc/guix.texi:5635 #, no-wrap msgid "patch-shebangs" msgstr "patch-shebangs" #. type: table -#: doc/guix.texi:5639 +#: doc/guix.texi:5637 msgid "Patch shebangs on the installed executable files." msgstr "Shebangs in den installierten ausführbaren Dateien beheben." #. type: item -#: doc/guix.texi:5640 +#: doc/guix.texi:5638 #, no-wrap msgid "strip" msgstr "strip" #. type: table -#: doc/guix.texi:5644 +#: doc/guix.texi:5642 msgid "Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} is false), copying them to the @code{debug} output when available (@pxref{Installing Debugging Files})." msgstr "Symbole zur Fehlerbehebung aus ELF-Dateien entfernen (außer @code{#:strip-binaries?} ist auf falsch gesetzt) und in die @code{debug}-Ausgabe kopieren, falls diese verfügbar ist (siehe @ref{Installing Debugging Files})." #. type: vindex -#: doc/guix.texi:5646 +#: doc/guix.texi:5644 #, no-wrap msgid "%standard-phases" msgstr "%standard-phases" #. type: defvr -#: doc/guix.texi:5651 +#: doc/guix.texi:5649 msgid "The build-side module @code{(guix build gnu-build-system)} defines @var{%standard-phases} as the default list of build phases. @var{%standard-phases} is a list of symbol/procedure pairs, where the procedure implements the actual phase." msgstr "Das erstellungsseitige Modul @code{(guix build gnu-build-system)} definiert @var{%standard-phases} als die vorgegebene Liste der Erstellungsphasen. @var{%standard-phases} ist eine Liste von Paaren aus je einem Symbol und einer Prozedur. Letztere implementiert die eigentliche Phase." #. type: defvr -#: doc/guix.texi:5654 +#: doc/guix.texi:5652 msgid "The list of phases used for a particular package can be changed with the @code{#:phases} parameter. For instance, passing:" msgstr "Die Liste der Phasen, die für ein bestimmtes Paket verwendet werden sollen, kann vom Parameter @code{#:phases} überschrieben werden. Zum Beispiel werden bei Übergabe von:" #. type: example -#: doc/guix.texi:5657 +#: doc/guix.texi:5655 #, no-wrap msgid "#:phases (modify-phases %standard-phases (delete 'configure))\n" msgstr "#:phases (modify-phases %standard-phases (delete 'configure))\n" #. type: defvr -#: doc/guix.texi:5661 +#: doc/guix.texi:5659 msgid "means that all the phases described above will be used, except the @code{configure} phase." msgstr "alle oben beschriebenen Phasen benutzt außer der @code{configure}-Phase." #. type: defvr -#: doc/guix.texi:5668 +#: doc/guix.texi:5666 msgid "In addition, this build system ensures that the ``standard'' environment for GNU packages is available. This includes tools such as GCC, libc, Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-system gnu)} module for a complete list). We call these the @dfn{implicit inputs} of a package, because package definitions do not have to mention them." msgstr "Zusätzlich stellt dieses Erstellungssystem sicher, dass die „Standard“-Umgebung für GNU-Pakete zur Verfügung steht. Diese umfasst Werkzeuge wie GCC, libc, Coreutils, Bash, Make, Diffutils, grep und sed (siehe das Modul @code{(guix build-system gnu)} für eine vollständige Liste). Wir bezeichnen sie als @dfn{implizite Eingaben} eines Pakets, weil Paketdefinitionen sie nicht aufführen müssen." #. type: Plain text -#: doc/guix.texi:5675 +#: doc/guix.texi:5673 msgid "Other @code{} objects are defined to support other conventions and tools used by free software packages. They inherit most of @var{gnu-build-system}, and differ mainly in the set of inputs implicitly added to the build process, and in the list of phases executed. Some of these build systems are listed below." msgstr "Andere @code{}-Objekte werden definiert, um andere Konventionen und Werkzeuge von Paketen für freie Software zu unterstützen. Die anderen Erstellungssysteme erben den Großteil vom @var{gnu-build-system} und unterscheiden sich hauptsächlich darin, welche Eingaben dem Erstellungsprozess implizit hinzugefügt werden und welche Liste von Phasen durchlaufen wird. Manche dieser Erstellungssysteme sind im Folgenden aufgeführt." #. type: defvr -#: doc/guix.texi:5676 +#: doc/guix.texi:5674 #, no-wrap msgid "{Scheme Variable} ant-build-system" msgstr "{Scheme-Variable} ant-build-system" #. type: defvr -#: doc/guix.texi:5680 +#: doc/guix.texi:5678 msgid "This variable is exported by @code{(guix build-system ant)}. It implements the build procedure for Java packages that can be built with @url{https://ant.apache.org/, Ant build tool}." msgstr "Diese Variable wird vom Modul @code{(guix build-system ant)} exportiert. Sie implementiert die Erstellungsprozedur für Java-Pakete, die mit dem @url{https://ant.apache.org/, Ant build tool} erstellt werden können." #. type: defvr -#: doc/guix.texi:5685 +#: doc/guix.texi:5683 msgid "It adds both @code{ant} and the @dfn{Java Development Kit} (JDK) as provided by the @code{icedtea} package to the set of inputs. Different packages can be specified with the @code{#:ant} and @code{#:jdk} parameters, respectively." msgstr "Sowohl @code{ant} als auch der @dfn{Java Development Kit} (JDK), wie er vom Paket @code{icedtea} bereitgestellt wird, werden zu den Eingaben hinzugefügt. Wenn andere Pakete dafür benutzt werden sollen, können sie jeweils mit den Parametern @code{#:ant} und @code{#:jdk} festgelegt werden." #. type: defvr -#: doc/guix.texi:5691 +#: doc/guix.texi:5689 msgid "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. In this case the parameter @code{#:source-dir} can be used to specify the source sub-directory, defaulting to ``src''." msgstr "Falls das ursprüngliche Paket über keine nutzbare Ant-Erstellungsdatei („Ant-Buildfile“) verfügt, kann aus der Angabe im Parameter @code{#:jar-name} eine minimale Ant-Erstellungsdatei @file{build.xml} erzeugt werden, in der die für die Erstellung durchzuführenden Aufgaben (Tasks) für die Erstellung des angegebenen Jar-Archivs stehen. In diesem Fall kann der Parameter @code{#:source-dir} benutzt werden, um das Unterverzeichnis mit dem Quellcode anzugeben; sein Vorgabewert ist „src“." #. type: defvr -#: doc/guix.texi:5699 +#: doc/guix.texi:5697 msgid "The @code{#:main-class} parameter can be used with the minimal ant buildfile to specify the main class of the resulting jar. This makes the jar file executable. The @code{#:test-include} parameter can be used to specify the list of junit tests to run. It defaults to @code{(list \"**/*Test.java\")}. The @code{#:test-exclude} can be used to disable some tests. It defaults to @code{(list \"**/Abstract*.java\")}, because abstract classes cannot be run as tests." msgstr "Der Parameter @code{#:main-class} kann mit einer minimalen Ant-Erstellungsdatei benutzt werden, um die Hauptklasse des resultierenden Jar-Archivs anzugeben. Dies ist nötig, wenn die Jar-Datei ausführbar sein soll. Mit dem Parameter @code{#:test-include} kann eine Liste angegeben werden, welche Junit-Tests auszuführen sind. Der Vorgabewert ist @code{(list \"**/*Test.java\")}. Mit @code{#:test-exclude} kann ein Teil der Testdateien ignoriert werden. Der Vorgabewert ist @code{(list \"**/Abstract*.java\")}, weil abstrakte Klassen keine ausführbaren Tests enthalten können." #. type: defvr -#: doc/guix.texi:5703 +#: doc/guix.texi:5701 msgid "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 ``jar'' task will be run." msgstr "Der Parameter @code{#:build-target} kann benutzt werden, um die Ant-Aufgabe (Task) anzugeben, die während der @code{build}-Phase ausgeführt werden soll. Vorgabe ist, dass die Aufgabe (Task) „jar“ ausgeführt wird." #. type: defvr -#: doc/guix.texi:5706 +#: doc/guix.texi:5704 #, no-wrap msgid "{Scheme Variable} android-ndk-build-system" msgstr "{Scheme-Variable} android-ndk-build-system" #. type: cindex -#: doc/guix.texi:5707 +#: doc/guix.texi:5705 #, no-wrap msgid "Android distribution" msgstr "Android-Distribution" #. type: cindex -#: doc/guix.texi:5708 +#: doc/guix.texi:5706 #, no-wrap msgid "Android NDK build system" msgstr "Android-NDK-Erstellungssystem" #. type: defvr -#: doc/guix.texi:5712 +#: doc/guix.texi:5710 msgid "This variable is exported by @code{(guix build-system android-ndk)}. It implements a build procedure for Android NDK (native development kit) packages using a Guix-specific build process." msgstr "Diese Variable wird von @code{(guix build-system android-ndk)} exportiert. Sie implementiert eine Erstellungsprozedur für das Android NDK (Native Development Kit) benutzende Pakete mit einem Guix-spezifischen Erstellungsprozess." #. type: defvr -#: doc/guix.texi:5716 +#: doc/guix.texi:5714 msgid "The build system assumes that packages install their public interface (header) files to the subdirectory \"include\" of the \"out\" output and their libraries to the subdirectory \"lib\" of the \"out\" output." msgstr "Für das Erstellungssystem wird angenommen, dass Pakete die zu ihrer öffentlichen Schnittstelle gehörenden Header-Dateien im Unterverzeichnis \"include\" der Ausgabe \"out\" und ihre Bibliotheken im Unterverzeichnis \"lib\" der Ausgabe \"out\" platzieren." #. type: defvr -#: doc/guix.texi:5719 +#: doc/guix.texi:5717 msgid "It's also assumed that the union of all the dependencies of a package has no conflicting files." msgstr "Ebenso wird angenommen, dass es keine im Konflikt stehenden Dateien unter der Vereinigung aller Abhängigkeiten gibt." #. type: defvr -#: doc/guix.texi:5722 +#: doc/guix.texi:5720 msgid "For the time being, cross-compilation is not supported - so right now the libraries and header files are assumed to be host tools." msgstr "Derzeit wird Cross-Kompilieren hierfür nicht unterstützt, also wird dabei vorausgesetzt, dass Bibliotheken und Header-Dateien dieselben wie im Wirtssystem sind." #. type: defvr -#: doc/guix.texi:5725 +#: doc/guix.texi:5723 #, no-wrap msgid "{Scheme Variable} asdf-build-system/source" msgstr "{Scheme-Variable} asdf-build-system/source" #. type: defvrx -#: doc/guix.texi:5726 +#: doc/guix.texi:5724 #, no-wrap msgid "{Scheme Variable} asdf-build-system/sbcl" msgstr "{Scheme-Variable} asdf-build-system/sbcl" #. type: defvrx -#: doc/guix.texi:5727 +#: doc/guix.texi:5725 #, no-wrap msgid "{Scheme Variable} asdf-build-system/ecl" msgstr "{Scheme-Variable} asdf-build-system/ecl" #. type: defvr -#: doc/guix.texi:5733 +#: doc/guix.texi:5731 msgid "These variables, exported by @code{(guix build-system asdf)}, implement build procedures for Common Lisp packages using @url{https://common-lisp.net/project/asdf/, ``ASDF''}. ASDF is a system definition facility for Common Lisp programs and libraries." msgstr "Diese Variablen, die vom Modul @code{(guix build-system asdf)} exportiert werden, implementieren Erstellungsprozeduren für Common-Lisp-Pakete, welche @url{https://common-lisp.net/project/asdf/, „ASDF“} benutzen. ASDF dient der Systemdefinition für Common-Lisp-Programme und -Bibliotheken." #. type: defvr -#: doc/guix.texi:5740 +#: doc/guix.texi:5738 msgid "The @code{asdf-build-system/source} system installs the packages in source form, and can be loaded using any common lisp implementation, via ASDF. The others, such as @code{asdf-build-system/sbcl}, install binary systems in the format which a particular implementation understands. These build systems can also be used to produce executable programs, or lisp images which contain a set of packages pre-loaded." msgstr "Das Erstellungssystem @code{asdf-build-system/source} installiert die Pakete in Quellcode-Form und kann @i{via} ASDF mit jeder Common-Lisp-Implementierung geladen werden. Die anderen Erstellungssysteme wie @code{asdf-build-system/sbcl} installieren binäre Systeme in dem Format, das von einer bestimmten Implementierung verstanden wird. Diese Erstellungssysteme können auch benutzt werden, um ausführbare Programme zu erzeugen oder um Lisp-Abbilder mit einem vorab geladenen Satz von Paketen zu erzeugen." #. type: defvr -#: doc/guix.texi:5744 +#: doc/guix.texi:5742 msgid "The build system uses naming conventions. For binary packages, the package name should be prefixed with the lisp implementation, such as @code{sbcl-} for @code{asdf-build-system/sbcl}." msgstr "Das Erstellungssystem benutzt gewisse Namenskonventionen. Bei Binärpaketen sollte dem Paketnamen die Lispimplementierung als Präfix vorangehen, z.B.@: @code{sbcl-} für @code{asdf-build-system/sbcl}." #. type: defvr -#: doc/guix.texi:5748 +#: doc/guix.texi:5746 msgid "Additionally, the corresponding source package should be labeled using the same convention as python packages (see @ref{Python Modules}), using the @code{cl-} prefix." msgstr "Zudem sollte das entsprechende Quellcode-Paket mit der Konvention wie bei Python-Paketen (siehe @ref{Python Modules}) ein @code{cl-} als Präfix bekommen." #. type: defvr -#: doc/guix.texi:5753 +#: doc/guix.texi:5751 msgid "For binary packages, each system should be defined as a Guix package. If one package @code{origin} contains several systems, package variants can be created in order to build all the systems. Source packages, which use @code{asdf-build-system/source}, may contain several systems." msgstr "Für Binärpakete sollte für jedes System ein Guix-Paket definiert werden. Wenn für einen Ursprung im @code{origin} mehrere Systeme enthalten sind, können Paketvarianten geschrieben werden, mit denen alle Systeme erstellt werden. Quellpakete, die @code{asdf-build-system/source} benutzen, können mehrere Systeme enthalten." #. type: defvr -#: doc/guix.texi:5760 +#: doc/guix.texi:5758 msgid "In order to create executable programs and images, the build-side procedures @code{build-program} and @code{build-image} can be used. They should be called in a build phase after the @code{create-symlinks} phase, so that the system which was just built can be used within the resulting image. @code{build-program} requires a list of Common Lisp expressions to be passed as the @code{#:entry-program} argument." msgstr "Um ausführbare Programme und Abbilder zu erzeugen, können die erstellungsseitigen Prozeduren @code{build-program} und @code{build-image} benutzt werden. Sie sollten in einer Erstellungsphase nach der @code{create-symlinks}-Phase aufgerufen werden, damit das gerade erstellte System Teil des resultierenden Abbilds sein kann. An @code{build-program} muss eine Liste von Common-Lisp-Ausdrücken über das Argument @code{#:entry-program} übergeben werden." #. type: defvr -#: doc/guix.texi:5769 +#: doc/guix.texi:5767 msgid "If the system is not defined within its own @code{.asd} file of the same name, then the @code{#:asd-file} parameter should be used to specify which file the system is defined in. Furthermore, if the package defines a system for its tests in a separate file, it will be loaded before the tests are run if it is specified by the @code{#:test-asd-file} parameter. If it is not set, the files @code{-tests.asd}, @code{-test.asd}, @code{tests.asd}, and @code{test.asd} will be tried if they exist." msgstr "Wenn das System nicht in seiner eigenen gleichnamigen @code{.asd}-Datei definiert ist, sollte der Parameter @code{#:asd-file} benutzt werden, um anzugeben, in welcher Datei das System definiert ist. Außerdem wird bei Paketen, für deren Tests ein System in einer separaten Datei definiert wurde, dieses System geladen, bevor die Tests ablaufen, wenn es im Parameter @code{#:test-asd-file} steht. Ist dafür kein Wert gesetzt, werden die Dateien @code{-tests.asd}, @code{-test.asd}, @code{tests.asd} und @code{test.asd} durchsucht, wenn sie existieren." #. type: defvr -#: doc/guix.texi:5773 +#: doc/guix.texi:5771 msgid "If for some reason the package must be named in a different way than the naming conventions suggest, the @code{#:asd-system-name} parameter can be used to specify the name of the system." msgstr "Wenn aus irgendeinem Grund der Paketname nicht den Namenskonventionen folgen kann, kann der Parameter @code{#:asd-system-name} benutzt werden, um den Namen des Systems anzugeben." #. type: defvr -#: doc/guix.texi:5776 +#: doc/guix.texi:5774 #, no-wrap msgid "{Scheme Variable} cargo-build-system" msgstr "{Scheme-Variable} cargo-build-system" #. type: cindex -#: doc/guix.texi:5777 +#: doc/guix.texi:5775 #, no-wrap msgid "Rust programming language" msgstr "Rust-Programmiersprache" #. type: cindex -#: doc/guix.texi:5778 +#: doc/guix.texi:5776 #, no-wrap msgid "Cargo (Rust build system)" msgstr "Cargo (Rust-Erstellungssystem)" #. type: defvr -#: doc/guix.texi:5782 +#: doc/guix.texi:5780 msgid "This variable is exported by @code{(guix build-system cargo)}. It supports builds of packages using Cargo, the build tool of the @uref{https://www.rust-lang.org, Rust programming language}." msgstr "Diese Variable wird vom Modul @code{(guix build-system cargo)} exportiert. Damit können Pakete mit Cargo erstellt werden, dem Erstellungswerkzeug der @uref{https://www.rust-lang.org, Rust-Programmiersprache}." #. type: defvr -#: doc/guix.texi:5787 +#: doc/guix.texi:5785 msgid "In its @code{configure} phase, this build system replaces dependencies specified in the @file{Cargo.toml} file with inputs to the Guix package. The @code{install} phase installs the binaries, and it also installs the source code and @file{Cargo.toml} file." msgstr "In seiner @code{configure}-Phase ersetzt dieses Erstellungssystem in der Datei @file{Cargo.toml} angegebene Abhängigkeiten durch Eingaben im Guix-Paket. Die Phase @code{install} installiert die Binärdateien und auch den Quellcode und die @file{Cargo.toml}-Datei." #. type: cindex -#: doc/guix.texi:5789 +#: doc/guix.texi:5787 #, no-wrap msgid "Clojure (programming language)" msgstr "Clojure (Programmiersprache)" #. type: cindex -#: doc/guix.texi:5790 +#: doc/guix.texi:5788 #, no-wrap msgid "simple Clojure build system" msgstr "einfaches Clojure-Erstellungssystem" #. type: defvr -#: doc/guix.texi:5791 +#: doc/guix.texi:5789 #, no-wrap msgid "{Scheme Variable} clojure-build-system" msgstr "{Scheme-Variable} clojure-build-system" #. type: defvr -#: doc/guix.texi:5796 +#: doc/guix.texi:5794 msgid "This variable is exported by @code{(guix build-system clojure)}. It implements a simple build procedure for @uref{https://clojure.org/, Clojure} packages using plain old @code{compile} in Clojure. Cross-compilation is not supported yet." msgstr "Diese Variable wird durch das Modul @code{(guix build-system clojure)} exportiert. Sie implementiert eine einfache Erstellungsprozedur für in @uref{https://clojure.org/, Clojure} geschriebene Pakete mit dem guten alten @code{compile} in Clojure. Cross-Kompilieren wird noch nicht unterstützt." #. type: defvr -#: doc/guix.texi:5800 +#: doc/guix.texi:5798 msgid "It adds @code{clojure}, @code{icedtea} and @code{zip} to the set of inputs. Different packages can be specified with the @code{#:clojure}, @code{#:jdk} and @code{#:zip} parameters, respectively." msgstr "Das Erstellungssystem fügt @code{clojure}, @code{icedtea} und @code{zip} zu den Eingaben hinzu. Sollen stattdessen andere Pakete benutzt werden, können diese jeweils mit den Parametern @code{#:clojure}, @code{#:jdk} und @code{#:zip} spezifiziert werden." #. type: defvr -#: doc/guix.texi:5806 +#: doc/guix.texi:5804 msgid "A list of source directories, test directories and jar names can be specified with the @code{#:source-dirs}, @code{#:test-dirs} and @code{#:jar-names} parameters, respectively. Compile directory and main class can be specified with the @code{#:compile-dir} and @code{#:main-class} parameters, respectively. Other parameters are documented below." msgstr "Eine Liste der Quellcode-Verzeichnisse, Test-Verzeichnisse und Namen der Jar-Dateien können jeweils über die Parameter @code{#:source-dirs}, @code{#:test-dirs} und @code{#:jar-names} angegeben werden. Das Verzeichnis, in das kompiliert wird, sowie die Hauptklasse können jeweils mit den Parametern @code{#:compile-dir} und @code{#:main-class} angegeben werden. Andere Parameter sind im Folgenden dokumentiert." #. type: defvr -#: doc/guix.texi:5809 +#: doc/guix.texi:5807 msgid "This build system is an extension of @var{ant-build-system}, but with the following phases changed:" msgstr "Dieses Erstellungssystem ist eine Erweiterung des @var{ant-build-system}, bei der aber die folgenden Phasen geändert wurden:" #. type: table -#: doc/guix.texi:5821 +#: doc/guix.texi:5819 msgid "This phase calls @code{compile} in Clojure to compile source files and runs @command{jar} to create jars from both source files and compiled files according to the include list and exclude list specified in @code{#:aot-include} and @code{#:aot-exclude}, respectively. The exclude list has priority over the include list. These lists consist of symbols representing Clojure libraries or the special keyword @code{#:all} representing all Clojure libraries found under the source directories. The parameter @code{#:omit-source?} decides if source should be included into the jars." msgstr "Diese Phase ruft @code{compile} in Clojure auf, um Quelldateien zu kompilieren, und führt @command{jar} aus, um Jar-Dateien aus sowohl Quelldateien als auch kompilierten Dateien zu erzeugen, entsprechend der jeweils in @code{#:aot-include} und @code{#:aot-exclude} festgelegten Listen aus in der Menge der Quelldateien eingeschlossenen und ausgeschlossenen Bibliotheken. Die Ausschlussliste hat Vorrang vor der Einschlussliste. Diese Listen setzen sich aus Symbolen zusammen, die für Clojure-Bibliotheken stehen oder dem Schlüsselwort @code{#:all} entsprechen, was für alle im Quellverzeichis gefundenen Clojure-Bibliotheken steht. Der Parameter @code{#:omit-source?} entscheidet, ob Quelldateien in die Jar-Archive aufgenommen werden sollten." #. type: table -#: doc/guix.texi:5829 +#: doc/guix.texi:5827 msgid "This phase runs tests according to the include list and exclude list specified in @code{#:test-include} and @code{#:test-exclude}, respectively. Their meanings are analogous to that of @code{#:aot-include} and @code{#:aot-exclude}, except that the special keyword @code{#:all} now stands for all Clojure libraries found under the test directories. The parameter @code{#:tests?} decides if tests should be run." msgstr "In dieser Phase werden Tests auf die durch Einschluss- und Ausschlussliste @code{#:test-include} bzw. @code{#:test-exclude} angegebenen Dateien ausgeführt. Deren Bedeutung ist analog zu @code{#:aot-include} und @code{#:aot-exclude}, außer dass das besondere Schlüsselwort @code{#:all} jetzt für alle Clojure-Bibliotheken in den Test-Verzeichnissen steht. Der Parameter @code{#:tests?} entscheidet, ob Tests ausgeführt werden sollen." #. type: table -#: doc/guix.texi:5832 +#: doc/guix.texi:5830 msgid "This phase installs all jars built previously." msgstr "In dieser Phase werden alle zuvor erstellten Jar-Dateien installiert." #. type: defvr -#: doc/guix.texi:5835 +#: doc/guix.texi:5833 msgid "Apart from the above, this build system also contains an additional phase:" msgstr "Zusätzlich zu den bereits angegebenen enthält dieses Erstellungssystem noch eine weitere Phase." #. type: item -#: doc/guix.texi:5838 +#: doc/guix.texi:5836 #, no-wrap msgid "install-doc" msgstr "install-doc" #. type: table -#: doc/guix.texi:5843 +#: doc/guix.texi:5841 msgid "This phase installs all top-level files with base name matching @var{%doc-regex}. A different regex can be specified with the @code{#:doc-regex} parameter. All files (recursively) inside the documentation directories specified in @code{#:doc-dirs} are installed as well." msgstr "Diese Phase installiert alle Dateien auf oberster Ebene, deren Basisnamen ohne Verzeichnisangabe zu @var{%doc-regex} passen. Ein anderer regulärer Ausdruck kann mit dem Parameter @code{#:doc-regex} verwendet werden. All die so gefundenen oder (rekursiv) in den mit @code{#:doc-dirs} angegebenen Dokumentationsverzeichnissen liegenden Dateien werden installiert." #. type: defvr -#: doc/guix.texi:5846 +#: doc/guix.texi:5844 #, no-wrap msgid "{Scheme Variable} cmake-build-system" msgstr "{Scheme-Variable} cmake-build-system" #. type: defvr -#: doc/guix.texi:5850 +#: doc/guix.texi:5848 msgid "This variable is exported by @code{(guix build-system cmake)}. It implements the build procedure for packages using the @url{https://www.cmake.org, CMake build tool}." msgstr "Diese Variable wird von @code{(guix build-system cmake)} exportiert. Sie implementiert die Erstellungsprozedur für Pakete, die das @url{https://www.cmake.org, CMake-Erstellungswerkzeug} benutzen." #. type: defvr -#: doc/guix.texi:5854 +#: doc/guix.texi:5852 msgid "It automatically adds the @code{cmake} package to the set of inputs. Which package is used can be specified with the @code{#:cmake} parameter." msgstr "Das Erstellungssystem fügt automatisch das Paket @code{cmake} zu den Eingaben hinzu. Welches Paket benutzt wird, kann mit dem Parameter @code{#:cmake} geändert werden." #. type: defvr -#: doc/guix.texi:5861 +#: doc/guix.texi:5859 msgid "The @code{#:configure-flags} parameter is taken as a list of flags passed to the @command{cmake} command. The @code{#:build-type} parameter specifies in abstract terms the flags passed to the compiler; it defaults to @code{\"RelWithDebInfo\"} (short for ``release mode with debugging information''), which roughly means that code is compiled with @code{-O2 -g}, as is the case for Autoconf-based packages by default." msgstr "Der Parameter @code{#:configure-flags} wird als Liste von Befehlszeilenoptionen aufgefasst, die an den Befehl @command{cmake} übergeben werden. Der Parameter @code{#:build-type} abstrahiert, welche Befehlszeilenoptionen dem Compiler übergeben werden; der Vorgabewert ist @code{\"RelWithDebInfo\"} (kurz für „release mode with debugging information“), d.h.@: kompiliert wird für eine Produktionsumgebung und Informationen zur Fehlerbehebung liegen bei, was ungefähr @code{-O2 -g} entspricht, wie bei der Vorgabe für Autoconf-basierte Pakete." #. type: defvr -#: doc/guix.texi:5863 +#: doc/guix.texi:5861 #, no-wrap msgid "{Scheme Variable} dune-build-system" msgstr "{Scheme-Variable} dune-build-system" #. type: defvr -#: doc/guix.texi:5870 +#: doc/guix.texi:5868 msgid "This variable is exported by @code{(guix build-system dune)}. It supports builds of packages using @uref{https://dune.build/, Dune}, a build tool for the OCaml programming language. It is implemented as an extension of the @code{ocaml-build-system} which is described below. As such, the @code{#:ocaml} and @code{#:findlib} parameters can be passed to this build system." msgstr "Diese Variable wird vom Modul @code{(guix build-system dune)} exportiert. Sie unterstützt es, Pakete mit @uref{https://dune.build/, Dune} zu erstellen, einem Erstellungswerkzeug für die Programmiersprache OCaml, und ist als Erweiterung des unten beschriebenen OCaml-Erstellungssystems @code{ocaml-build-system} implementiert. Als solche können auch die Parameter @code{#:ocaml} und @code{#:findlib} an dieses Erstellungssystem übergeben werden." #. type: defvr -#: doc/guix.texi:5874 +#: doc/guix.texi:5872 msgid "It automatically adds the @code{dune} package to the set of inputs. Which package is used can be specified with the @code{#:dune} parameter." msgstr "Das Erstellungssystem fügt automatisch das Paket @code{dune} zu den Eingaben hinzu. Welches Paket benutzt wird, kann mit dem Parameter @code{#:dune} geändert werden." #. type: defvr -#: doc/guix.texi:5878 +#: doc/guix.texi:5876 msgid "There is no @code{configure} phase because dune packages typically don't need to be configured. The @code{#:build-flags} parameter is taken as a list of flags passed to the @code{dune} command during the build." msgstr "Es gibt keine @code{configure}-Phase, weil dune-Pakete typischerweise nicht konfiguriert werden müssen. Vom Parameter @code{#:build-flags} wird erwartet, dass es sich um eine Liste von Befehlszeilenoptionen handelt, die zur Erstellung an den @code{dune}-Befehl übergeben werden." #. type: defvr -#: doc/guix.texi:5882 +#: doc/guix.texi:5880 msgid "The @code{#:jbuild?} parameter can be passed to use the @code{jbuild} command instead of the more recent @code{dune} command while building a package. Its default value is @code{#f}." msgstr "Der Parameter @code{#:jbuild?} kann übergeben werden, um den Befehl @code{jbuild} anstelle des neueren @code{dune}-Befehls aufzurufen, um das Paket zu erstellen. Der Vorgabewert ist @code{#f}." #. type: defvr -#: doc/guix.texi:5887 +#: doc/guix.texi:5885 msgid "The @code{#:package} parameter can be passed to specify a package name, which is useful when a package contains multiple packages and you want to build only one of them. This is equivalent to passing the @code{-p} argument to @code{dune}." msgstr "Mit dem Parameter @code{#:package} kann ein Paketname angegeben werden, wenn im Paket mehrere Pakete enthalten sind und nur eines davon erstellt werden soll. Es ist äquivalent dazu, die Befehlszeilenoption @code{-p} an @code{dune} zu übergeben." #. type: defvr -#: doc/guix.texi:5889 +#: doc/guix.texi:5887 #, no-wrap msgid "{Scheme Variable} go-build-system" msgstr "{Scheme-Variable} go-build-system" #. type: defvr -#: doc/guix.texi:5894 +#: doc/guix.texi:5892 msgid "This variable is exported by @code{(guix build-system go)}. It implements a build procedure for Go packages using the standard @url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go build mechanisms}." msgstr "Diese Variable wird vom Modul @code{(guix build-system go)} exportiert. Mit ihr ist eine Erstellungsprozedur für Go-Pakete implementiert, die dem normalen @url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go-Erstellungsmechanismus} entspricht." #. type: defvr -#: doc/guix.texi:5905 +#: doc/guix.texi:5903 msgid "The user is expected to provide a value for the key @code{#:import-path} and, in some cases, @code{#:unpack-path}. The @url{https://golang.org/doc/code.html#ImportPaths, import path} corresponds to the file system path expected by the package's build scripts and any referring packages, and provides a unique way to refer to a Go package. It is typically based on a combination of the package source code's remote URI and file system hierarchy structure. In some cases, you will need to unpack the package's source code to a different directory structure than the one indicated by the import path, and @code{#:unpack-path} should be used in such cases." msgstr "Beim Aufruf wird ein Wert für den Schlüssel @code{#:import-path} und manchmal auch für @code{#:unpack-path} erwartet. Der @url{https://golang.org/doc/code.html#ImportPaths, „import path“} entspricht dem Dateisystempfad, den die Erstellungsskripts des Pakets und darauf Bezug nehmende Pakete erwarten; durch ihn wird ein Go-Paket eindeutig bezeichnet. Typischerweise setzt er sich aus einer Kombination der entfernten URI des Paketquellcodes und der Dateisystemhierarchie zusammen. Manchmal ist es nötig, den Paketquellcode in ein anderes als das vom „import path“ bezeichnete Verzeichnis zu entpacken; diese andere Verzeichnisstruktur sollte dann als @code{#:unpack-path} angegeben werden." #. type: defvr -#: doc/guix.texi:5910 +#: doc/guix.texi:5908 msgid "Packages that provide Go libraries should install their source code into the built output. The key @code{#:install-source?}, which defaults to @code{#t}, controls whether or not the source code is installed. It can be set to @code{#f} for packages that only provide executable files." msgstr "Pakete, die Go-Bibliotheken zur Verfügung stellen, sollten ihren Quellcode auch in die Erstellungsausgabe installieren. Der Schlüssel @code{#:install-source?}, sein Vorgabewert ist @code{#t}, steuert, ob Quellcode installiert wird. Bei Paketen, die nur ausführbare Dateien liefern, kann der Wert auf @code{#f} gesetzt werden." #. type: defvr -#: doc/guix.texi:5912 +#: doc/guix.texi:5910 #, no-wrap msgid "{Scheme Variable} glib-or-gtk-build-system" msgstr "{Scheme-Variable} glib-or-gtk-build-system" #. type: defvr -#: doc/guix.texi:5915 +#: doc/guix.texi:5913 msgid "This variable is exported by @code{(guix build-system glib-or-gtk)}. It is intended for use with packages making use of GLib or GTK+." msgstr "Diese Variable wird vom Modul @code{(guix build-system glib-or-gtk)} exportiert. Sie ist für Pakete gedacht, die GLib oder GTK benutzen." #. type: defvr -#: doc/guix.texi:5918 +#: doc/guix.texi:5916 msgid "This build system adds the following two phases to the ones defined by @var{gnu-build-system}:" msgstr "Dieses Erstellungssystem fügt die folgenden zwei Phasen zu denen von @var{gnu-build-system} hinzu:" #. type: item -#: doc/guix.texi:5920 doc/guix.texi:6248 +#: doc/guix.texi:5918 doc/guix.texi:6246 #, no-wrap msgid "glib-or-gtk-wrap" msgstr "glib-or-gtk-wrap" #. type: table -#: doc/guix.texi:5927 +#: doc/guix.texi:5925 msgid "The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are able to find GLib ``schemas'' and @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK+ modules}. This is achieved by wrapping the programs in launch scripts that appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH} environment variables." msgstr "Die Phase @code{glib-or-gtk-wrap} stellt sicher, dass Programme in @file{bin/} in der Lage sind, GLib-„Schemata“ und @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK-Module} zu finden. Dazu wird für das Programm ein Wrapper-Skript erzeugt, dass das eigentliche Programm mit den richtigen Werten für die Umgebungsvariablen @code{XDG_DATA_DIRS} und @code{GTK_PATH} aufruft." #. type: table -#: doc/guix.texi:5934 +#: doc/guix.texi:5932 msgid "It is possible to exclude specific package outputs from that wrapping process by listing their names in the @code{#:glib-or-gtk-wrap-excluded-outputs} parameter. This is useful when an output is known not to contain any GLib or GTK+ binaries, and where wrapping would gratuitously add a dependency of that output on GLib and GTK+." msgstr "Es ist möglich, bestimmte Paketausgaben von diesem Wrapping-Prozess auszunehmen, indem Sie eine Liste ihrer Namen im Parameter @code{#:glib-or-gtk-wrap-excluded-outputs} angeben. Das ist nützlich, wenn man von einer Ausgabe weiß, dass sie keine Binärdateien enthält, die GLib oder GTK benutzen, und diese Ausgabe durch das Wrappen ohne Not eine weitere Abhängigkeit von GLib und GTK bekäme." #. type: item -#: doc/guix.texi:5935 doc/guix.texi:6252 +#: doc/guix.texi:5933 doc/guix.texi:6250 #, no-wrap msgid "glib-or-gtk-compile-schemas" msgstr "glib-or-gtk-compile-schemas" #. type: table -#: doc/guix.texi:5943 +#: doc/guix.texi:5941 msgid "The phase @code{glib-or-gtk-compile-schemas} makes sure that all @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, GSettings schemas} of GLib are compiled. Compilation is performed by the @command{glib-compile-schemas} program. It is provided by the package @code{glib:bin} which is automatically imported by the build system. The @code{glib} package providing @command{glib-compile-schemas} can be specified with the @code{#:glib} parameter." msgstr "Mit der Phase @code{glib-or-gtk-compile-schemas} wird sichergestellt, dass alle @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, GSettings-Schemata} für GLib kompiliert werden. Dazu wird das Programm @command{glib-compile-schemas} ausgeführt. Es kommt aus dem Paket @code{glib:bin}, was automatisch vom Erstellungssystem importiert wird. Welches @code{glib}-Paket dieses @command{glib-compile-schemas} bereitstellt, kann mit dem Parameter @code{#:glib} spezifiziert werden." #. type: defvr -#: doc/guix.texi:5946 +#: doc/guix.texi:5944 msgid "Both phases are executed after the @code{install} phase." msgstr "Beide Phasen finden nach der @code{install}-Phase statt." #. type: defvr -#: doc/guix.texi:5948 +#: doc/guix.texi:5946 #, no-wrap msgid "{Scheme Variable} guile-build-system" msgstr "{Scheme-Variable} guile-build-system" #. type: defvr -#: doc/guix.texi:5955 +#: doc/guix.texi:5953 msgid "This build system is for Guile packages that consist exclusively of Scheme code and that are so lean that they don't even have a makefile, let alone a @file{configure} script. It compiles Scheme code using @command{guild compile} (@pxref{Compilation,,, guile, GNU Guile Reference Manual}) and installs the @file{.scm} and @file{.go} files in the right place. It also installs documentation." msgstr "Dieses Erstellungssystem ist für Guile-Pakete gedacht, die nur aus Scheme-Code bestehen und so schlicht sind, dass sie nicht einmal ein Makefile und erst recht keinen @file{configure}-Skript enthalten. Hierzu wird Scheme-Code mit @command{guild compile} kompiliert (siehe @ref{Compilation,,, guile, GNU Guile Reference Manual}) und die @file{.scm}- und @file{.go}-Dateien an den richtigen Pfad installiert. Auch Dokumentation wird installiert." #. type: defvr -#: doc/guix.texi:5958 +#: doc/guix.texi:5956 msgid "This build system supports cross-compilation by using the @code{--target} option of @command{guild compile}." msgstr "Das Erstellungssystem unterstützt Cross-Kompilieren durch die Befehlszeilenoption @code{--target} für @command{guild compile}." #. type: defvr -#: doc/guix.texi:5961 +#: doc/guix.texi:5959 msgid "Packages built with @code{guile-build-system} must provide a Guile package in their @code{native-inputs} field." msgstr "Mit @code{guile-build-system} erstellte Pakete müssen ein Guile-Paket in ihrem @code{native-inputs}-Feld aufführen." #. type: defvr -#: doc/guix.texi:5963 +#: doc/guix.texi:5961 #, no-wrap msgid "{Scheme Variable} minify-build-system" msgstr "{Scheme-Variable} minify-build-system" #. type: defvr -#: doc/guix.texi:5966 +#: doc/guix.texi:5964 msgid "This variable is exported by @code{(guix build-system minify)}. It implements a minification procedure for simple JavaScript packages." msgstr "Diese Variable wird vom Modul @code{(guix build-system minify)} exportiert. Sie implementiert eine Prozedur zur Minifikation einfacher JavaScript-Pakete." #. type: defvr -#: doc/guix.texi:5972 +#: doc/guix.texi:5970 msgid "It adds @code{uglify-js} to the set of inputs and uses it to compress all JavaScript files in the @file{src} directory. A different minifier package can be specified with the @code{#:uglify-js} parameter, but it is expected that the package writes the minified code to the standard output." msgstr "Es fügt @code{uglify-js} zur Menge der Eingaben hinzu und komprimiert damit alle JavaScript-Dateien im @file{src}-Verzeichnis. Ein anderes Programm zur Minifikation kann verwendet werden, indem es mit dem Parameter @code{#:uglify-js} angegeben wird; es wird erwartet, dass das angegebene Paket den minifizierten Code auf der Standardausgabe ausgibt." #. type: defvr -#: doc/guix.texi:5976 +#: doc/guix.texi:5974 msgid "When the input JavaScript files are not all located in the @file{src} directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier." msgstr "Wenn die Eingabe-JavaScript-Dateien nicht alle im @file{src}-Verzeichnis liegen, kann mit dem Parameter @code{#:javascript-files} eine Liste der Dateinamen übergeben werden, auf die das Minifikationsprogramm aufgerufen wird." #. type: defvr -#: doc/guix.texi:5978 +#: doc/guix.texi:5976 #, no-wrap msgid "{Scheme Variable} ocaml-build-system" msgstr "{Scheme-Variable} ocaml-build-system" #. type: defvr -#: doc/guix.texi:5984 +#: doc/guix.texi:5982 msgid "This variable is exported by @code{(guix build-system ocaml)}. It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists of choosing the correct set of commands to run for each package. OCaml packages can expect many different commands to be run. This build system will try some of them." msgstr "Diese Variable wird vom Modul @code{(guix build-system ocaml)} exportiert. Mit ihr ist ein Erstellungssystem für @uref{https://ocaml.org, OCaml-Pakete} implementiert, was bedeutet, dass es die richtigen auszuführenden Befehle für das jeweilige Paket auswählt. OCaml-Pakete können sehr unterschiedliche Befehle erwarten. Dieses Erstellungssystem probiert manche davon durch." #. type: defvr -#: doc/guix.texi:5994 +#: doc/guix.texi:5992 msgid "When the package has a @file{setup.ml} file present at the top-level, it will run @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} and @code{ocaml setup.ml -install}. The build system will assume that this file was generated by @uref{http://oasis.forge.ocamlcore.org/, OASIS} and will take care of setting the prefix and enabling tests if they are not disabled. You can pass configure and build flags with the @code{#:configure-flags} and @code{#:build-flags}. The @code{#:test-flags} key can be passed to change the set of flags used to enable tests. The @code{#:use-make?} key can be used to bypass this system in the build and install phases." msgstr "Wenn im Paket eine Datei @file{setup.ml} auf oberster Ebene vorhanden ist, wird @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} und @code{ocaml setup.ml -install} ausgeführt. Das Erstellungssystem wird annehmen, dass die Datei durch @uref{http://oasis.forge.ocamlcore.org/, OASIS} erzeugt wurde, und wird das Präfix setzen und Tests aktivieren, wenn diese nicht abgeschaltet wurden. Sie können Befehlszeilenoptionen zum Konfigurieren und Erstellen mit den Parametern @code{#:configure-flags} und @code{#:build-flags} übergeben. Der Schlüssel @code{#:test-flags} kann übergeben werden, um die Befehlszeilenoptionen zu ändern, mit denen die Tests aktiviert werden. Mit dem Parameter @code{#:use-make?} kann dieses Erstellungssystem für die build- und install-Phasen abgeschaltet werden." #. type: defvr -#: doc/guix.texi:5999 +#: doc/guix.texi:5997 msgid "When the package has a @file{configure} file, it is assumed that it is a hand-made configure script that requires a different argument format than in the @code{gnu-build-system}. You can add more flags with the @code{#:configure-flags} key." msgstr "Verfügt das Paket über eine @file{configure}-Datei, wird angenommen, dass diese von Hand geschrieben wurde mit einem anderen Format für Argumente als bei einem Skript des @code{gnu-build-system}. Sie können weitere Befehlszeilenoptionen mit dem Schlüssel @code{#:configure-flags} hinzufügen." #. type: defvr -#: doc/guix.texi:6003 +#: doc/guix.texi:6001 msgid "When the package has a @file{Makefile} file (or @code{#:use-make?} is @code{#t}), it will be used and more flags can be passed to the build and install phases with the @code{#:make-flags} key." msgstr "Falls dem Paket ein @file{Makefile} beiliegt (oder @code{#:use-make?} auf @code{#t} gesetzt wurde), wird dieses benutzt und weitere Befehlszeilenoptionen können mit dem Schlüssel @code{#:make-flags} zu den build- und install-Phasen hinzugefügt werden." #. type: defvr -#: doc/guix.texi:6011 +#: doc/guix.texi:6009 msgid "Finally, some packages do not have these files and use a somewhat standard location for its build system. In that case, the build system will run @code{ocaml pkg/pkg.ml} or @code{ocaml pkg/build.ml} and take care of providing the path to the required findlib module. Additional flags can be passed via the @code{#:build-flags} key. Install is taken care of by @command{opam-installer}. In this case, the @code{opam} package must be added to the @code{native-inputs} field of the package definition." msgstr "Letztlich gibt es in manchen Pakete keine solchen Dateien, sie halten sich aber an bestimmte Konventionen, wo ihr eigenes Erstellungssystem zu finden ist. In diesem Fall führt Guix’ OCaml-Erstellungssystem @code{ocaml pkg/pkg.ml} oder @code{ocaml pkg/build.ml} aus und kümmert sich darum, dass der Pfad zu dem benötigten findlib-Modul passt. Weitere Befehlszeilenoptionen können über den Schlüssel @code{#:build-flags} übergeben werden. Um die Installation kümmert sich @command{opam-installer}. In diesem Fall muss das @code{opam}-Paket im @code{native-inputs}-Feld der Paketdefinition stehen." #. type: defvr -#: doc/guix.texi:6019 +#: doc/guix.texi:6017 msgid "Note that most OCaml packages assume they will be installed in the same directory as OCaml, which is not what we want in guix. In particular, they will install @file{.so} files in their module's directory, which is usually fine because it is in the OCaml compiler directory. In guix though, these libraries cannot be found and we use @code{CAML_LD_LIBRARY_PATH}. This variable points to @file{lib/ocaml/site-lib/stubslibs} and this is where @file{.so} libraries should be installed." msgstr "Beachten Sie, dass die meisten OCaml-Pakete davon ausgehen, dass sie in dasselbe Verzeichnis wie OCaml selbst installiert werden, was wir in Guix aber nicht so haben wollen. Solche Pakete installieren ihre @file{.so}-Dateien in das Verzeichnis ihres Moduls, was für die meisten anderen Einrichtungen funktioniert, weil es im OCaml-Compilerverzeichnis liegt. Jedoch können so in Guix die Bibliotheken nicht gefunden werden, deswegen benutzen wir @code{CAML_LD_LIBRARY_PATH}. Diese Umgebungsvariable zeigt auf @file{lib/ocaml/site-lib/stubslibs} und dorthin sollten @file{.so}-Bibliotheken installiert werden." #. type: defvr -#: doc/guix.texi:6021 +#: doc/guix.texi:6019 #, no-wrap msgid "{Scheme Variable} python-build-system" msgstr "{Scheme-Variable} python-build-system" #. type: defvr -#: doc/guix.texi:6026 +#: doc/guix.texi:6024 msgid "This variable is exported by @code{(guix build-system python)}. It implements the more or less standard build procedure used by Python packages, which consists in running @code{python setup.py build} and then @code{python setup.py install --prefix=/gnu/store/@dots{}}." msgstr "Diese Variable wird vom Modul @code{(guix build-system python)} exportiert. Sie implementiert mehr oder weniger die konventionelle Erstellungsprozedur, wie sie für Python-Pakete üblich ist, d.h.@: erst wird @code{python setup.py build} ausgeführt und dann @code{python setup.py install --prefix=/gnu/store/…}." #. type: defvr -#: doc/guix.texi:6030 +#: doc/guix.texi:6028 msgid "For packages that install stand-alone Python programs under @code{bin/}, it takes care of wrapping these programs so that their @code{PYTHONPATH} environment variable points to all the Python libraries they depend on." msgstr "Für Pakete, die eigenständige Python-Programme nach @code{bin/} installieren, sorgt dieses Erstellungssystem dafür, dass die Programme in ein Wrapper-Skript verpackt werden, welches die eigentlichen Programme mit einer Umgebungsvariablen @code{PYTHONPATH} aufruft, die alle Python-Bibliotheken auflistet, von denen die Programme abhängen." #. type: defvr -#: doc/guix.texi:6036 +#: doc/guix.texi:6034 msgid "Which Python package is used to perform the build can be specified with the @code{#:python} parameter. This is a useful way to force a package to be built for a specific version of the Python interpreter, which might be necessary if the package is only compatible with a single interpreter version." msgstr "Welches Python-Paket benutzt wird, um die Erstellung durchzuführen, kann mit dem Parameter @code{#:python} bestimmt werden. Das ist nützlich, wenn wir erzwingen wollen, dass ein Paket mit einer bestimmten Version des Python-Interpretierers arbeitet, was nötig sein kann, wenn das Programm nur mit einer einzigen Interpretiererversion kompatibel ist." #. type: defvr -#: doc/guix.texi:6041 +#: doc/guix.texi:6039 msgid "By default guix calls @code{setup.py} under control of @code{setuptools}, much like @command{pip} does. Some packages are not compatible with setuptools (and pip), thus you can disable this by setting the @code{#:use-setuptools} parameter to @code{#f}." msgstr "Standardmäßig ruft Guix @code{setup.py} auf, was zu @code{setuptools} gehört, ähnlich wie es auch @command{pip} tut. Manche Pakete sind mit setuptools (und pip) inkompatibel, deswegen können Sie diese Einstellung abschalten, indem Sie den Parameter @code{#:use-setuptools} auf @code{#f} setzen." #. type: defvr -#: doc/guix.texi:6043 +#: doc/guix.texi:6041 #, no-wrap msgid "{Scheme Variable} perl-build-system" msgstr "{Scheme-Variable} perl-build-system" #. type: defvr -#: doc/guix.texi:6055 +#: doc/guix.texi:6053 msgid "This variable is exported by @code{(guix build-system perl)}. It implements the standard build procedure for Perl packages, which either consists in running @code{perl Build.PL --prefix=/gnu/store/@dots{}}, followed by @code{Build} and @code{Build install}; or in running @code{perl Makefile.PL PREFIX=/gnu/store/@dots{}}, followed by @code{make} and @code{make install}, depending on which of @code{Build.PL} or @code{Makefile.PL} is present in the package distribution. Preference is given to the former if both @code{Build.PL} and @code{Makefile.PL} exist in the package distribution. This preference can be reversed by specifying @code{#t} for the @code{#:make-maker?} parameter." msgstr "Diese Variable wird vom Modul @code{(guix build-system perl)} exportiert. Mit ihr wird die Standard-Erstellungsprozedur für Perl-Pakete implementiert, welche entweder darin besteht, @code{perl Build.PL --prefix=/gnu/store/…} gefolgt von @code{Build} und @code{Build install} auszuführen, oder @code{perl Makefile.PL PREFIX=/gnu/store/…} gefolgt von @code{make} und @code{make install} auszuführen, je nachdem, ob eine Datei @code{Build.PL} oder eine Datei @code{Makefile.PL} in der Paketdistribution vorliegt. Den Vorrang hat erstere, wenn sowohl @code{Build.PL} als auch @code{Makefile.PL} in der Paketdistribution existieren. Der Vorrang kann umgekehrt werden, indem @code{#t} für den Parameter @code{#:make-maker?} angegeben wird." #. type: defvr -#: doc/guix.texi:6059 +#: doc/guix.texi:6057 msgid "The initial @code{perl Makefile.PL} or @code{perl Build.PL} invocation passes flags specified by the @code{#:make-maker-flags} or @code{#:module-build-flags} parameter, respectively." msgstr "Der erste Aufruf von @code{perl Makefile.PL} oder @code{perl Build.PL} übergibt die im Parameter @code{#:make-maker-flags} bzw. @code{#:module-build-flags} angegebenen Befehlszeilenoptionen, je nachdem, was verwendet wird." #. type: defvr -#: doc/guix.texi:6061 +#: doc/guix.texi:6059 msgid "Which Perl package is used can be specified with @code{#:perl}." msgstr "Welches Perl-Paket dafür benutzt wird, kann mit @code{#:perl} angegeben werden." #. type: defvr -#: doc/guix.texi:6063 +#: doc/guix.texi:6061 #, no-wrap msgid "{Scheme Variable} r-build-system" msgstr "{Scheme-Variable} r-build-system" #. type: defvr -#: doc/guix.texi:6071 +#: doc/guix.texi:6069 msgid "This variable is exported by @code{(guix build-system r)}. It implements the build procedure used by @uref{https://r-project.org, R} packages, which essentially is little more than running @code{R CMD INSTALL --library=/gnu/store/@dots{}} in an environment where @code{R_LIBS_SITE} contains the paths to all R package inputs. Tests are run after installation using the R function @code{tools::testInstalledPackage}." msgstr "Diese Variable wird vom Modul @code{(guix build-system r)} exportiert. Sie entspricht einer Implementierung der durch @uref{https://r-project.org, R-Pakete} genutzten Erstellungsprozedur, die wenig mehr tut, als @code{R CMD INSTALL --library=/gnu/store/…} in einer Umgebung auszuführen, in der die Umgebungsvariable @code{R_LIBS_SITE} die Pfade aller R-Pakete unter den Paketeingaben enthält. Tests werden nach der Installation mit der R-Funktion @code{tools::testInstalledPackage} ausgeführt." #. type: defvr -#: doc/guix.texi:6073 +#: doc/guix.texi:6071 #, no-wrap msgid "{Scheme Variable} rakudo-build-system" msgstr "{Scheme-Variable} rakudo-build-system" #. type: defvr -#: doc/guix.texi:6081 +#: doc/guix.texi:6079 msgid "This variable is exported by @code{(guix build-system rakudo)}. It implements the build procedure used by @uref{https://rakudo.org/, Rakudo} for @uref{https://perl6.org/, Perl6} packages. It installs the package to @code{/gnu/store/@dots{}/NAME-VERSION/share/perl6} and installs the binaries, library files and the resources, as well as wrap the files under the @code{bin/} directory. Tests can be skipped by passing @code{#f} to the @code{tests?} parameter." msgstr "Diese Variable wird vom Modul @code{(guix build-system rakudo)} exportiert. Sie implementiert die Erstellungsprozedur, die von @uref{https://rakudo.org/, Rakudo} für @uref{https://perl6.org/, Perl6-Pakete} benutzt wird. Pakete werden ins Verzeichnis @code{/gnu/store/…/NAME-VERSION/share/perl6} abgelegt und Binärdateien, Bibliotheksdateien und Ressourcen werden installiert, zudem werden die Dateien im Verzeichnis @code{bin/} in Wrapper-Skripte verpackt. Tests können übersprungen werden, indem man @code{#f} im Parameter @code{tests?} übergibt." #. type: defvr -#: doc/guix.texi:6089 +#: doc/guix.texi:6087 msgid "Which rakudo package is used can be specified with @code{rakudo}. Which perl6-tap-harness package used for the tests can be specified with @code{#:prove6} or removed by passing @code{#f} to the @code{with-prove6?} parameter. Which perl6-zef package used for tests and installing can be specified with @code{#:zef} or removed by passing @code{#f} to the @code{with-zef?} parameter." msgstr "Welches rakudo-Paket benutzt werden soll, kann mit dem Parameter @code{rakudo} angegeben werden. Das perl6-tap-harness-Paket, das für die Tests benutzt wird, kann mit @code{#:prove6} ausgewählt werden; es kann auch entfernt werden, indem man @code{#f} für den Parameter @code{with-prove6?} übergibt. Welches perl6-zef-Paket für Tests und Installation verwendet wird, kann mit dem Parameter @code{#:zef} angegeben werden; es kann auch entfernt werden, indem man @code{#f} für den Parameter @code{with-zef?} übergibt." #. type: defvr -#: doc/guix.texi:6091 +#: doc/guix.texi:6089 #, no-wrap msgid "{Scheme Variable} texlive-build-system" msgstr "{Scheme-Variable} texlive-build-system" #. type: defvr -#: doc/guix.texi:6096 +#: doc/guix.texi:6094 msgid "This variable is exported by @code{(guix build-system texlive)}. It is used to build TeX packages in batch mode with a specified engine. The build system sets the @code{TEXINPUTS} variable to find all TeX source files in the inputs." msgstr "Diese Variable wird vom Modul @code{(guix build-system texlive)} exportiert. Mit ihr werden TeX-Pakete in Stapelverarbeitung („batch mode“) mit der angegebenen Engine erstellt. Das Erstellungssystem setzt die Variable @code{TEXINPUTS} so, dass alle TeX-Quelldateien unter den Eingaben gefunden werden können." #. type: defvr -#: doc/guix.texi:6105 +#: doc/guix.texi:6103 msgid "By default it runs @code{luatex} on all files ending on @code{ins}. A different engine and format can be specified with the @code{#:tex-format} argument. Different build targets can be specified with the @code{#:build-targets} argument, which expects a list of file names. The build system adds only @code{texlive-bin} and @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the inputs. Both can be overridden with the arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, respectively." msgstr "Standardmäßig wird @code{luatex} auf allen Dateien mit der Dateiendung @code{ins} ausgeführt. Eine andere Engine oder ein anderes Format kann mit dem Argument @code{#:tex-format} angegeben werden. Verschiedene Erstellungsziele können mit dem Argument @code{#:build-targets} festgelegt werden, das eine Liste von Dateinamen erwartet. Das Erstellungssystem fügt nur @code{texlive-bin} und @code{texlive-latex-base} zu den Eingaben hinzu (beide kommen aus dem Modul @code{(gnu packages tex}). Für beide kann das zu benutzende Paket jeweils mit den Argumenten @code{#:texlive-bin} oder @code{#:texlive-latex-base} geändert werden." #. type: defvr -#: doc/guix.texi:6108 +#: doc/guix.texi:6106 msgid "The @code{#:tex-directory} parameter tells the build system where to install the built files under the texmf tree." msgstr "Der Parameter @code{#:tex-directory} sagt dem Erstellungssystem, wohin die installierten Dateien im texmf-Verzeichnisbaum installiert werden sollen." #. type: defvr -#: doc/guix.texi:6110 +#: doc/guix.texi:6108 #, no-wrap msgid "{Scheme Variable} ruby-build-system" msgstr "{Scheme-Variable} ruby-build-system" #. type: defvr -#: doc/guix.texi:6114 +#: doc/guix.texi:6112 msgid "This variable is exported by @code{(guix build-system ruby)}. It implements the RubyGems build procedure used by Ruby packages, which involves running @code{gem build} followed by @code{gem install}." msgstr "Diese Variable wird vom Modul @code{(guix build-system ruby)} exportiert. Sie steht für eine Implementierung der RubyGems-Erstellungsprozedur, die für Ruby-Pakete benutzt wird, wobei @code{gem build} gefolgt von @code{gem install} ausgeführt wird." #. type: defvr -#: doc/guix.texi:6122 +#: doc/guix.texi:6120 msgid "The @code{source} field of a package that uses this build system typically references a gem archive, since this is the format that Ruby developers use when releasing their software. The build system unpacks the gem archive, potentially patches the source, runs the test suite, repackages the gem, and installs it. Additionally, directories and tarballs may be referenced to allow building unreleased gems from Git or a traditional source release tarball." msgstr "Das @code{source}-Feld eines Pakets, das dieses Erstellungssystem benutzt, verweist typischerweise auf ein Gem-Archiv, weil Ruby-Entwickler dieses Format benutzen, wenn sie ihre Software veröffentlichen. Das Erstellungssystem entpackt das Gem-Archiv, spielt eventuell Patches für den Quellcode ein, führt die Tests aus, verpackt alles wieder in ein Gem-Archiv und installiert dieses. Neben Gem-Archiven darf das Feld auch auf Verzeichnisse und Tarballs verweisen, damit es auch möglich ist, unveröffentlichte Gems aus einem Git-Repository oder traditionelle Quellcode-Veröffentlichungen zu benutzen." #. type: defvr -#: doc/guix.texi:6126 +#: doc/guix.texi:6124 msgid "Which Ruby package is used can be specified with the @code{#:ruby} parameter. A list of additional flags to be passed to the @command{gem} command can be specified with the @code{#:gem-flags} parameter." msgstr "Welches Ruby-Paket benutzt werden soll, kann mit dem Parameter @code{#:ruby} festgelegt werden. Eine Liste zusätzlicher Befehlszeilenoptionen für den Aufruf des @command{gem}-Befehls kann mit dem Parameter @code{#:gem-flags} angegeben werden." #. type: defvr -#: doc/guix.texi:6128 +#: doc/guix.texi:6126 #, no-wrap msgid "{Scheme Variable} waf-build-system" msgstr "{Scheme-Variable} waf-build-system" #. type: defvr -#: doc/guix.texi:6134 +#: doc/guix.texi:6132 msgid "This variable is exported by @code{(guix build-system waf)}. It implements a build procedure around the @code{waf} script. The common phases---@code{configure}, @code{build}, and @code{install}---are implemented by passing their names as arguments to the @code{waf} script." msgstr "Diese Variable wird durch das Modul @code{(guix build-system waf)} exportiert. Damit ist eine Erstellungsprozedur rund um das @code{waf}-Skript implementiert. Die üblichen Phasen — @code{configure}, @code{build} und @code{install} — sind implementiert, indem deren Namen als Argumente an das @code{waf}-Skript übergeben werden." #. type: defvr -#: doc/guix.texi:6138 +#: doc/guix.texi:6136 msgid "The @code{waf} script is executed by the Python interpreter. Which Python package is used to run the script can be specified with the @code{#:python} parameter." msgstr "Das @code{waf}-Skript wird vom Python-Interpetierer ausgeführt. Mit welchem Python-Paket das Skript ausgeführt werden soll, kann mit dem Parameter @code{#:python} angegeben werden." #. type: defvr -#: doc/guix.texi:6140 +#: doc/guix.texi:6138 #, no-wrap msgid "{Scheme Variable} scons-build-system" msgstr "{Scheme-Variable} scons-build-system" #. type: defvr -#: doc/guix.texi:6146 +#: doc/guix.texi:6144 msgid "This variable is exported by @code{(guix build-system scons)}. It implements the build procedure used by the SCons software construction tool. This build system runs @code{scons} to build the package, @code{scons test} to run tests, and then @code{scons install} to install the package." msgstr "Diese Variable wird vom Modul @code{(guix build-system scons)} exportiert. Sie steht für eine Implementierung der Erstellungsprozedur, die das SCons-Softwarekonstruktionswerkzeug („software construction tool“) benutzt. Das Erstellungssystem führt @code{scons} aus, um das Paket zu erstellen, führt mit @code{scons test} Tests aus und benutzt @code{scons install}, um das Paket zu installieren." #. type: defvr -#: doc/guix.texi:6151 +#: doc/guix.texi:6149 msgid "Additional flags to be passed to @code{scons} can be specified with the @code{#:scons-flags} parameter. The version of Python used to run SCons can be specified by selecting the appropriate SCons package with the @code{#:scons} parameter." msgstr "Zusätzliche Optionen, die an @code{scons} übergeben werden sollen, können mit dem Parameter @code{#:scons-flags} angegeben werden. Die Python-Version, die benutzt werden soll, um SCons auszuführen, kann festgelegt werden, indem das passende SCons-Paket mit dem Parameter @code{#:scons} ausgewählt wird." #. type: defvr -#: doc/guix.texi:6153 +#: doc/guix.texi:6151 #, no-wrap msgid "{Scheme Variable} haskell-build-system" msgstr "{Scheme-Variable} haskell-build-system" #. type: defvr -#: doc/guix.texi:6167 +#: doc/guix.texi:6165 msgid "This variable is exported by @code{(guix build-system haskell)}. It implements the Cabal build procedure used by Haskell packages, which involves running @code{runhaskell Setup.hs configure --prefix=/gnu/store/@dots{}} and @code{runhaskell Setup.hs build}. Instead of installing the package by running @code{runhaskell Setup.hs install}, to avoid trying to register libraries in the read-only compiler store directory, the build system uses @code{runhaskell Setup.hs copy}, followed by @code{runhaskell Setup.hs register}. In addition, the build system generates the package documentation by running @code{runhaskell Setup.hs haddock}, unless @code{#:haddock? #f} is passed. Optional Haddock parameters can be passed with the help of the @code{#:haddock-flags} parameter. If the file @code{Setup.hs} is not found, the build system looks for @code{Setup.lhs} instead." msgstr "Diese Variable wird vom Modul @code{(guix build-system haskell)} exportiert. Sie bietet Zugang zur Cabal-Erstellungsprozedur, die von Haskell-Paketen benutzt wird, was bedeutet, @code{runhaskell Setup.hs configure --prefix=/gnu/store/…} und @code{runhaskell Setup.hs build} auszuführen. Statt das Paket mit dem Befehl @code{runhaskell Setup.hs install} zu installieren, benutzt das Erstellungssystem @code{runhaskell Setup.hs copy} gefolgt von @code{runhaskell Setup.hs register}, um keine Bibliotheken im Store-Verzeichnis des Compilers zu speichern, auf dem keine Schreibberechtigung besteht. Zusätzlich generiert das Erstellungssystem Dokumentation durch Ausführen von @code{runhaskell Setup.hs haddock}, außer @code{#:haddock? #f} wurde übergeben. Optional können an Haddock Parameter mit Hilfe des Parameters @code{#:haddock-flags} übergeben werden. Wird die Datei @code{Setup.hs} nicht gefunden, sucht das Erstellungssystem stattdessen nach @code{Setup.lhs}." #. type: defvr -#: doc/guix.texi:6170 +#: doc/guix.texi:6168 msgid "Which Haskell compiler is used can be specified with the @code{#:haskell} parameter which defaults to @code{ghc}." msgstr "Welcher Haskell-Compiler benutzt werden soll, kann über den @code{#:haskell}-Parameter angegeben werden. Als Vorgabewert verwendet er @code{ghc}." #. type: defvr -#: doc/guix.texi:6172 +#: doc/guix.texi:6170 #, no-wrap msgid "{Scheme Variable} dub-build-system" msgstr "{Scheme-Variable} dub-build-system" #. type: defvr -#: doc/guix.texi:6177 +#: doc/guix.texi:6175 msgid "This variable is exported by @code{(guix build-system dub)}. It implements the Dub build procedure used by D packages, which involves running @code{dub build} and @code{dub run}. Installation is done by copying the files manually." msgstr "Diese Variable wird vom Modul @code{(guix build-system dub)} exportiert. Sie verweist auf eine Implementierung des Dub-Erstellungssystems, das von D-Paketen benutzt wird. Dabei werden @code{dub build} und @code{dub run} ausgeführt. Die Installation wird durch manuelles Kopieren der Dateien durchgeführt." #. type: defvr -#: doc/guix.texi:6180 +#: doc/guix.texi:6178 msgid "Which D compiler is used can be specified with the @code{#:ldc} parameter which defaults to @code{ldc}." msgstr "Welcher D-Compiler benutzt wird, kann mit dem Parameter @code{#:ldc} festgelegt werden, was als Vorgabewert @code{ldc} benutzt." #. type: defvr -#: doc/guix.texi:6182 +#: doc/guix.texi:6180 #, no-wrap msgid "{Scheme Variable} emacs-build-system" msgstr "{Scheme-Variable} emacs-build-system" #. type: defvr -#: doc/guix.texi:6186 +#: doc/guix.texi:6184 msgid "This variable is exported by @code{(guix build-system emacs)}. It implements an installation procedure similar to the packaging system of Emacs itself (@pxref{Packages,,, emacs, The GNU Emacs Manual})." msgstr "Diese Variable wird vom Modul @code{(guix build-system emacs)} exportiert. Darin wird eine Installationsprozedur ähnlich der des Paketsystems von Emacs selbst implementiert (siehe @ref{Packages,,, emacs, The GNU Emacs Manual})." #. type: defvr -#: doc/guix.texi:6193 +#: doc/guix.texi:6191 msgid "It first creates the @code{@var{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files. Differently from the Emacs packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is deleted. Each package is installed in its own directory under @file{share/emacs/site-lisp/guix.d}." msgstr "Zunächst wird eine Datei @code{@var{Paket}-autoloads.el} erzeugt, dann werden alle Emacs-Lisp-Dateien zu Bytecode kompiliert. Anders als beim Emacs-Paketsystem werden die Info-Dokumentationsdateien in das Standardverzeichnis für Dokumentation verschoben und die Datei @file{dir} gelöscht. Jedes Paket wird in sein eigenes Verzeichnis unter @file{share/emacs/site-lisp/guix.d} installiert." #. type: defvr -#: doc/guix.texi:6195 +#: doc/guix.texi:6193 #, no-wrap msgid "{Scheme Variable} font-build-system" msgstr "{Scheme-Variable} font-build-system" #. type: defvr -#: doc/guix.texi:6201 +#: doc/guix.texi:6199 msgid "This variable is exported by @code{(guix build-system font)}. It implements an installation procedure for font packages where upstream provides pre-compiled TrueType, OpenType, etc.@: font files that merely need to be copied into place. It copies font files to standard locations in the output directory." msgstr "Diese Variable wird vom Modul @code{(guix build-system font)} exportiert. Mit ihr steht eine Installationsprozedur für Schriftarten-Pakete zur Verfügung für vom Anbieter vorkompilierte TrueType-, OpenType- und andere Schriftartendateien, die nur an die richtige Stelle kopiert werden müssen. Dieses Erstellungssystem kopiert die Schriftartendateien an den Konventionen folgende Orte im Ausgabeverzeichnis." #. type: defvr -#: doc/guix.texi:6203 +#: doc/guix.texi:6201 #, no-wrap msgid "{Scheme Variable} meson-build-system" msgstr "{Scheme-Variable} meson-build-system" #. type: defvr -#: doc/guix.texi:6207 +#: doc/guix.texi:6205 msgid "This variable is exported by @code{(guix build-system meson)}. It implements the build procedure for packages that use @url{https://mesonbuild.com, Meson} as their build system." msgstr "Diese Variable wird vom Modul @code{(guix build-system meson)} exportiert. Sie enthält die Erstellungsprozedur für Pakete, die @url{https://mesonbuild.com, Meson} als ihr Erstellungssystem benutzen." #. type: defvr -#: doc/guix.texi:6213 +#: doc/guix.texi:6211 msgid "It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set of inputs, and they can be changed with the parameters @code{#:meson} and @code{#:ninja} if needed. The default Meson is @code{meson-for-build}, which is special because it doesn't clear the @code{RUNPATH} of binaries and libraries when they are installed." msgstr "Mit ihr werden sowohl Meson als auch @uref{https://ninja-build.org/, Ninja} zur Menge der Eingaben hinzugefügt; die Pakete dafür können mit den Parametern @code{#:meson} und @code{#:ninja} geändert werden, wenn nötig. Das vorgegebene Meson-Paket ist @code{meson-for-build}, ein besonderes Paket, dessen Besonderheit darin besteht, den @code{RUNPATH} von Binärdateien und Bibliotheken @emph{nicht} zu entfernen, wenn sie installiert werden." #. type: defvr -#: doc/guix.texi:6216 +#: doc/guix.texi:6214 msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed to some specific for Meson:" msgstr "Dieses Erstellungssystem ist eine Erweiterung für das @var{gnu-build-system}, aber mit Änderungen an den folgenden Phasen, die Meson-spezifisch sind:" #. type: table -#: doc/guix.texi:6223 +#: doc/guix.texi:6221 msgid "The phase runs @code{meson} with the flags specified in @code{#:configure-flags}. The flag @code{--build-type} is always set to @code{plain} unless something else is specified in @code{#:build-type}." msgstr "Diese Phase führt den @code{meson}-Befehl mit den in @code{#:configure-flags} angegebenen Befehlszeilenoptionen aus. Die Befehlszeilenoption @code{--build-type} wird immer auf @code{plain} gesetzt, solange nichts anderes mit dem Parameter @code{#:build-type} angegeben wurde." #. type: table -#: doc/guix.texi:6227 +#: doc/guix.texi:6225 msgid "The phase runs @code{ninja} to build the package in parallel by default, but this can be changed with @code{#:parallel-build?}." msgstr "Diese Phase ruft @code{ninja} auf, um das Paket standardmäßig parallel zu erstellen. Die Vorgabeeinstellung, dass parallel erstellt wird, kann verändert werden durch Setzen von @code{#:parallel-build?}." #. type: table -#: doc/guix.texi:6231 +#: doc/guix.texi:6229 msgid "The phase runs @code{ninja} with the target specified in @code{#:test-target}, which is @code{\"test\"} by default." msgstr "Diese Phase führt @code{ninja} mit dem als @code{#:test-target} spezifizierten Ziel für Tests auf, der Vorgabewert ist das Ziel namens @code{\"test\"}." #. type: table -#: doc/guix.texi:6234 +#: doc/guix.texi:6232 msgid "The phase runs @code{ninja install} and can not be changed." msgstr "Diese Phase führt @code{ninja install} aus und kann nicht verändert werden." #. type: defvr -#: doc/guix.texi:6237 +#: doc/guix.texi:6235 msgid "Apart from that, the build system also adds the following phases:" msgstr "Dazu fügt das Erstellungssystem noch folgende neue Phasen:" #. type: item -#: doc/guix.texi:6240 +#: doc/guix.texi:6238 #, no-wrap msgid "fix-runpath" msgstr "fix-runpath" #. type: table -#: doc/guix.texi:6247 +#: doc/guix.texi:6245 msgid "This phase ensures that all binaries can find the libraries they need. It searches for required libraries in subdirectories of the package being built, and adds those to @code{RUNPATH} where needed. It also removes references to libraries left over from the build phase by @code{meson-for-build}, such as test dependencies, that aren't actually required for the program to run." msgstr "In dieser Phase wird sichergestellt, dass alle Binärdateien die von ihnen benötigten Bibliotheken finden können. Die benötigten Bibliotheken werden in den Unterverzeichnissen des Pakets, das erstellt wird, gesucht, und zum @code{RUNPATH} hinzugefügt, wann immer es nötig ist. Auch werden diejenigen Referenzen zu Bibliotheken aus der Erstellungsphase wieder entfernt, die bei @code{meson-for-build} hinzugefügt wurden, aber eigentlich zur Laufzeit nicht gebraucht werden, wie Abhängigkeiten nur für Tests." #. type: table -#: doc/guix.texi:6251 doc/guix.texi:6255 +#: doc/guix.texi:6249 doc/guix.texi:6253 msgid "This phase is the phase provided by @code{glib-or-gtk-build-system}, and it is not enabled by default. It can be enabled with @code{#:glib-or-gtk?}." msgstr "Diese Phase ist dieselbe, die auch im @code{glib-or-gtk-build-system} zur Verfügung gestellt wird, und mit Vorgabeeinstellungen wird sie nicht durchlaufen. Wenn sie gebraucht wird, kann sie mit dem Parameter @code{#:glib-or-gtk?} aktiviert werden." #. type: defvr -#: doc/guix.texi:6258 +#: doc/guix.texi:6256 #, no-wrap msgid "{Scheme Variable} linux-module-build-system" msgstr "{Scheme-Variable} linux-module-build-system" #. type: defvr -#: doc/guix.texi:6260 +#: doc/guix.texi:6258 msgid "@var{linux-module-build-system} allows building Linux kernel modules." msgstr "Mit @var{linux-module-build-system} können Linux-Kernelmodule erstellt werden." #. type: defvr -#: doc/guix.texi:6264 +#: doc/guix.texi:6262 msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed:" msgstr "Dieses Erstellungssystem ist eine Erweiterung des @var{gnu-build-system}, bei der aber die folgenden Phasen geändert wurden:" #. type: table -#: doc/guix.texi:6270 +#: doc/guix.texi:6268 msgid "This phase configures the environment so that the Linux kernel's Makefile can be used to build the external kernel module." msgstr "Diese Phase konfiguriert die Umgebung so, dass das externe Kernel-Modul durch das Makefile des Linux-Kernels erstellt werden kann." #. type: table -#: doc/guix.texi:6274 +#: doc/guix.texi:6272 msgid "This phase uses the Linux kernel's Makefile in order to build the external kernel module." msgstr "Diese Phase benutzt das Makefile des Linux-Kernels, um das externe Kernel-Modul zu erstellen." #. type: table -#: doc/guix.texi:6278 +#: doc/guix.texi:6276 msgid "This phase uses the Linux kernel's Makefile in order to install the external kernel module." msgstr "Diese Phase benutzt das Makefile des Linux-Kernels zur Installation des externen Kernel-Moduls." #. type: defvr -#: doc/guix.texi:6283 +#: doc/guix.texi:6281 msgid "It is possible and useful to specify the Linux kernel to use for building the module (in the \"arguments\" form of a package using the linux-module-build-system, use the key #:linux to specify it)." msgstr "Es ist möglich und hilfreich, den für die Erstellung des Moduls zu benutzenden Linux-Kernel anzugeben (in der „arguments“-Form eines Pakets, dass das linux-module-build-system als Erstellungssystem benutzt, wird dazu der Schlüssel #:linux benutzt)." #. type: Plain text -#: doc/guix.texi:6289 +#: doc/guix.texi:6287 msgid "Lastly, for packages that do not need anything as sophisticated, a ``trivial'' build system is provided. It is trivial in the sense that it provides basically no support: it does not pull any implicit inputs, and does not have a notion of build phases." msgstr "Letztlich gibt es für die Pakete, die bei weitem nichts so komplexes brauchen, ein „triviales“ Erstellungssystem. Es ist in dem Sinn trivial, dass es praktisch keine Hilfestellungen gibt: Es fügt keine impliziten Eingaben hinzu und hat kein Konzept von Erstellungsphasen." #. type: defvr -#: doc/guix.texi:6290 +#: doc/guix.texi:6288 #, no-wrap msgid "{Scheme Variable} trivial-build-system" msgstr "{Scheme-Variable} trivial-build-system" #. type: defvr -#: doc/guix.texi:6292 +#: doc/guix.texi:6290 msgid "This variable is exported by @code{(guix build-system trivial)}." msgstr "Diese Variable wird vom Modul @code{(guix build-system trivial)} exportiert." #. type: defvr -#: doc/guix.texi:6297 +#: doc/guix.texi:6295 msgid "This build system requires a @code{#:builder} argument. This argument must be a Scheme expression that builds the package output(s)---as with @code{build-expression->derivation} (@pxref{Derivations, @code{build-expression->derivation}})." msgstr "Diesem Erstellungssystem muss im Argument @code{#:builder} ein Scheme-Ausdruck übergeben werden, der die Paketausgabe(n) erstellt — wie bei @code{build-expression->derivation} (siehe @ref{Derivations, @code{build-expression->derivation}})." #. type: cindex -#: doc/guix.texi:6303 +#: doc/guix.texi:6301 #, no-wrap msgid "store items" msgstr "Store-Objekte" #. type: cindex -#: doc/guix.texi:6304 +#: doc/guix.texi:6302 #, no-wrap msgid "store paths" msgstr "Store-Pfade" #. type: Plain text -#: doc/guix.texi:6315 +#: doc/guix.texi:6313 msgid "Conceptually, the @dfn{store} is the place where derivations that have been built successfully are stored---by default, @file{/gnu/store}. Sub-directories in the store are referred to as @dfn{store items} or sometimes @dfn{store paths}. The store has an associated database that contains information such as the store paths referred to by each store path, and the list of @emph{valid} store items---results of successful builds. This database resides in @file{@var{localstatedir}/guix/db}, where @var{localstatedir} is the state directory specified @i{via} @option{--localstatedir} at configure time, usually @file{/var}." msgstr "Konzeptionell ist der @dfn{Store} der Ort, wo Ableitungen nach erfolgreicher Erstellung gespeichert werden — standardmäßig finden Sie ihn in @file{/gnu/store}. Unterverzeichnisse im Store werden @dfn{Store-Objekte} oder manchmal auch @dfn{Store-Pfade} genannt. Mit dem Store ist eine Datenbank assoziiert, die Informationen enthält wie zum Beispiel, welche Store-Pfade jeder Store-Pfad jeweils referenziert, und eine Liste, welche Store-Objekte @emph{gültig} sind, also Ergebnisse erfolgreicher Erstellungen sind. Die Datenbank befindet sich in @file{@var{localstatedir}/guix/db}, wobei @var{localstatedir} das mit @option{--localstatedir} bei der Ausführung von „configure“ angegebene Zustandsverzeichnis ist, normalerweise @file{/var}." #. type: Plain text -#: doc/guix.texi:6320 +#: doc/guix.texi:6318 msgid "The store is @emph{always} accessed by the daemon on behalf of its clients (@pxref{Invoking guix-daemon}). To manipulate the store, clients connect to the daemon over a Unix-domain socket, send requests to it, and read the result---these are remote procedure calls, or RPCs." msgstr "Auf den Store wird @emph{nur} durch den Daemon im Auftrag seiner Clients zugegriffen (siehe @ref{Invoking guix-daemon}). Um den Store zu verändern, verbinden sich Clients über einen Unix-Socket mit dem Daemon, senden ihm entsprechende Anfragen und lesen dann dessen Antwort — so etwas nennt sich entfernter Prozeduraufruf (englisch „Remote Procedure Call“ oder kurz RPC)." #. type: quotation -#: doc/guix.texi:6325 +#: doc/guix.texi:6323 msgid "Users must @emph{never} modify files under @file{/gnu/store} directly. This would lead to inconsistencies and break the immutability assumptions of Guix's functional model (@pxref{Introduction})." msgstr "Benutzer dürfen @emph{niemals} Dateien in @file{/gnu/store} direkt verändern, sonst wären diese nicht mehr konsistent und die Grundannahmen im funktionalen Modell von Guix, dass die Objekte unveränderlich sind, wären dahin (siehe @ref{Introduction})." #. type: quotation -#: doc/guix.texi:6329 +#: doc/guix.texi:6327 msgid "@xref{Invoking guix gc, @command{guix gc --verify}}, for information on how to check the integrity of the store and attempt recovery from accidental modifications." msgstr "Siehe @ref{Invoking guix gc, @command{guix gc --verify}} für Informationen, wie die Integrität des Stores überprüft und nach versehentlichen Veränderungen unter Umständen wiederhergestellt werden kann." #. type: Plain text -#: doc/guix.texi:6336 +#: doc/guix.texi:6334 msgid "The @code{(guix store)} module provides procedures to connect to the daemon, and to perform RPCs. These are described below. By default, @code{open-connection}, and thus all the @command{guix} commands, connect to the local daemon or to the URI specified by the @code{GUIX_DAEMON_SOCKET} environment variable." msgstr "Das Modul @code{(guix store)} bietet Prozeduren an, um sich mit dem Daemon zu verbinden und entfernte Prozeduraufrufe durchzuführen. Diese werden im Folgenden beschrieben. Das vorgegebene Verhalten von @code{open-connection}, und daher allen @command{guix}-Befehlen, ist, sich mit dem lokalen Daemon oder dem an der in der Umgebungsvariablen @code{GUIX_DAEMON_SOCKET} angegeben URL zu verbinden." #. type: defvr -#: doc/guix.texi:6337 +#: doc/guix.texi:6335 #, no-wrap msgid "{Environment Variable} GUIX_DAEMON_SOCKET" msgstr "{Umgebungsvariable} GUIX_DAEMON_SOCKET" #. type: defvr -#: doc/guix.texi:6342 +#: doc/guix.texi:6340 msgid "When set, the value of this variable should be a file name or a URI designating the daemon endpoint. When it is a file name, it denotes a Unix-domain socket to connect to. In addition to file names, the supported URI schemes are:" msgstr "Ist diese Variable gesetzt, dann sollte ihr Wert ein Dateipfad oder eine URI sein, worüber man sich mit dem Daemon verbinden kann. Ist der Wert der Pfad zu einer Datei, bezeichnet dieser einen Unix-Socket, mit dem eine Verbindung hergestellt werden soll. Ist er eine URI, so werden folgende URI-Schemata unterstützt:" #. type: code{#1} -#: doc/guix.texi:6344 doc/guix.texi:18636 +#: doc/guix.texi:6342 doc/guix.texi:18633 #, no-wrap msgid "file" msgstr "file" #. type: itemx -#: doc/guix.texi:6345 +#: doc/guix.texi:6343 #, no-wrap msgid "unix" msgstr "unix" #. type: table -#: doc/guix.texi:6349 +#: doc/guix.texi:6347 msgid "These are for Unix-domain sockets. @code{file:///var/guix/daemon-socket/socket} is equivalent to @file{/var/guix/daemon-socket/socket}." msgstr "Für Unix-Sockets. @code{file:///var/guix/daemon-socket/socket} kann gleichbedeutend auch als @file{/var/guix/daemon-socket/socket} angegeben werden." #. type: item -#: doc/guix.texi:6350 +#: doc/guix.texi:6348 #, no-wrap msgid "guix" msgstr "guix" #. type: table -#: doc/guix.texi:6358 +#: doc/guix.texi:6356 msgid "These URIs denote connections over TCP/IP, without encryption nor authentication of the remote host. The URI must specify the host name and optionally a port number (by default port 44146 is used):" msgstr "Solche URIs benennen Verbindungen über TCP/IP ohne Verschlüsselung oder Authentifizierung des entfernten Rechners. Die URI muss den Hostnamen, also den Rechnernamen des entfernten Rechners, und optional eine Port-Nummer angeben (sonst wird als Vorgabe der Port 44146 benutzt):" #. type: example -#: doc/guix.texi:6361 +#: doc/guix.texi:6359 #, no-wrap msgid "guix://master.guix.example.org:1234\n" msgstr "guix://master.guix.example.org:1234\n" #. type: table -#: doc/guix.texi:6366 +#: doc/guix.texi:6364 msgid "This setup is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon at @code{master.guix.example.org}." msgstr "Diese Konfiguration ist für lokale Netzwerke wie etwa in Rechen-Clustern geeignet, wo sich nur vertrauenswürdige Knoten mit dem Erstellungs-Daemon z.B.@: unter @code{master.guix.example.org} verbinden können." #. type: table -#: doc/guix.texi:6370 +#: doc/guix.texi:6368 msgid "The @code{--listen} option of @command{guix-daemon} can be used to instruct it to listen for TCP connections (@pxref{Invoking guix-daemon, @code{--listen}})." msgstr "Die Befehlszeilenoption @code{--listen} von @command{guix-daemon} kann benutzt werden, damit er auf TCP-Verbindungen lauscht (siehe @ref{Invoking guix-daemon, @code{--listen}})." #. type: item -#: doc/guix.texi:6371 +#: doc/guix.texi:6369 #, no-wrap msgid "ssh" msgstr "ssh" #. type: cindex -#: doc/guix.texi:6372 +#: doc/guix.texi:6370 #, no-wrap msgid "SSH access to build daemons" msgstr "SSH-Zugriff auf Erstellungs-Daemons" #. type: table -#: doc/guix.texi:6376 +#: doc/guix.texi:6374 msgid "These URIs allow you to connect to a remote daemon over SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}. A typical URL might look like this:" msgstr "Mit solchen URIs kann eine Verbindung zu einem entfernten Daemon über SSH hergestellt werden@footnote{Diese Funktionalitäts setzt Guile-SSH voraus (siehe @ref{Requirements}).}. Eine typische URL sieht so aus:" #. type: example -#: doc/guix.texi:6379 +#: doc/guix.texi:6377 #, no-wrap msgid "ssh://charlie@@guix.example.org:22\n" msgstr "ssh://charlie@@guix.example.org:22\n" #. type: table -#: doc/guix.texi:6383 +#: doc/guix.texi:6381 msgid "As for @command{guix copy}, the usual OpenSSH client configuration files are honored (@pxref{Invoking guix copy})." msgstr "Was @command{guix copy} betrifft, richtet es sich nach den üblichen OpenSSH-Client-Konfigurationsdateien (siehe @ref{Invoking guix copy})." #. type: defvr -#: doc/guix.texi:6386 +#: doc/guix.texi:6384 msgid "Additional URI schemes may be supported in the future." msgstr "In Zukunft könnten weitere URI-Schemata unterstützt werden." #. type: quotation -#: doc/guix.texi:6393 +#: doc/guix.texi:6391 msgid "The ability to connect to remote build daemons is considered experimental as of @value{VERSION}. Please get in touch with us to share any problems or suggestions you may have (@pxref{Contributing})." msgstr "Die Fähigkeit, sich mit entfernten Erstellungs-Daemons zu verbinden, sehen wir als experimentell an, Stand @value{VERSION}. Bitte diskutieren Sie mit uns jegliche Probleme oder Vorschläge, die Sie haben könnten (siehe @ref{Contributing})." #. type: deffn -#: doc/guix.texi:6396 +#: doc/guix.texi:6394 #, no-wrap msgid "{Scheme Procedure} open-connection [@var{uri}] [#:reserve-space? #t]" msgstr "{Scheme-Prozedur} open-connection [@var{Uri}] [#:reserve-space? #t]" #. type: deffn -#: doc/guix.texi:6401 +#: doc/guix.texi:6399 msgid "Connect to the daemon over the Unix-domain socket at @var{uri} (a string). When @var{reserve-space?} is true, instruct it to reserve a little bit of extra space on the file system so that the garbage collector can still operate should the disk become full. Return a server object." msgstr "Sich mit dem Daemon über den Unix-Socket an @var{Uri} verbinden (einer Zeichenkette). Wenn @var{reserve-space?} wahr ist, lässt ihn das etwas zusätzlichen Speicher im Dateisystem reservieren, damit der Müllsammler auch dann noch funktioniert, wenn die Platte zu voll wird. Liefert ein Server-Objekt." #. type: deffn -#: doc/guix.texi:6404 +#: doc/guix.texi:6402 msgid "@var{file} defaults to @var{%default-socket-path}, which is the normal location given the options that were passed to @command{configure}." msgstr "@var{Uri} nimmt standardmäßig den Wert von @var{%default-socket-path} an, was dem bei der Installation mit dem Aufruf von @command{configure} ausgewählten Vorgabeort entspricht, gemäß den Befehlszeilenoptionen, mit denen @command{configure} aufgerufen wurde." #. type: deffn -#: doc/guix.texi:6406 +#: doc/guix.texi:6404 #, no-wrap msgid "{Scheme Procedure} close-connection @var{server}" msgstr "{Scheme-Prozedur} close-connection @var{Server}" #. type: deffn -#: doc/guix.texi:6408 +#: doc/guix.texi:6406 msgid "Close the connection to @var{server}." msgstr "Die Verbindung zum @var{Server} trennen." #. type: defvr -#: doc/guix.texi:6410 +#: doc/guix.texi:6408 #, no-wrap msgid "{Scheme Variable} current-build-output-port" msgstr "{Scheme-Variable} current-build-output-port" #. type: defvr -#: doc/guix.texi:6413 +#: doc/guix.texi:6411 msgid "This variable is bound to a SRFI-39 parameter, which refers to the port where build and error logs sent by the daemon should be written." msgstr "Diese Variable ist an einen SRFI-39-Parameter gebunden, der auf den Scheme-Port verweist, an den vom Daemon empfangene Erstellungsprotokolle und Fehlerprotokolle geschrieben werden sollen." #. type: Plain text -#: doc/guix.texi:6417 +#: doc/guix.texi:6415 msgid "Procedures that make RPCs all take a server object as their first argument." msgstr "Prozeduren, die entfernte Prozeduraufrufe durchführen, nehmen immer ein Server-Objekt als ihr erstes Argument." #. type: deffn -#: doc/guix.texi:6418 +#: doc/guix.texi:6416 #, no-wrap msgid "{Scheme Procedure} valid-path? @var{server} @var{path}" msgstr "{Scheme-Prozedur} valid-path? @var{Server} @var{Pfad}" #. type: cindex -#: doc/guix.texi:6419 +#: doc/guix.texi:6417 #, no-wrap msgid "invalid store items" msgstr "ungültige Store-Objekte" #. type: deffn -#: doc/guix.texi:6424 +#: doc/guix.texi:6422 msgid "Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still be invalid, for instance because it is the result of an aborted or failed build.)" msgstr "Liefert @code{#t}, wenn der @var{Pfad} ein gültiges Store-Objekt benennt, und sonst @code{#f} (ein ungültiges Objekt kann auf der Platte gespeichert sein, tatsächlich aber ungültig sein, zum Beispiel weil es das Ergebnis einer abgebrochenen oder fehlgeschlagenen Erstellung ist)." #. type: deffn -#: doc/guix.texi:6427 +#: doc/guix.texi:6425 msgid "A @code{&store-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store})." msgstr "Ein @code{&store-protocol-error}-Fehlerzustand wird ausgelöst, wenn der @var{Pfad} nicht mit dem Store-Verzeichnis als Präfix beginnt (@file{/gnu/store})." #. type: deffn -#: doc/guix.texi:6429 +#: doc/guix.texi:6427 #, no-wrap msgid "{Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]" msgstr "{Scheme-Prozedur} add-text-to-store @var{Server} @var{Name} @var{Text} [@var{Referenzen}]" #. type: deffn -#: doc/guix.texi:6433 +#: doc/guix.texi:6431 msgid "Add @var{text} under file @var{name} in the store, and return its store path. @var{references} is the list of store paths referred to by the resulting store path." msgstr "Den @var{Text} im Store in einer Datei namens @var{Name} ablegen und ihren Store-Pfad zurückliefern. @var{Referenzen} ist die Liste der Store-Pfade, die der Store-Pfad dann referenzieren soll." #. type: deffn -#: doc/guix.texi:6435 +#: doc/guix.texi:6433 #, no-wrap msgid "{Scheme Procedure} build-derivations @var{server} @var{derivations}" msgstr "{Scheme-Prozedur} build-derivations @var{Server} @var{Ableitungen}" #. type: deffn -#: doc/guix.texi:6439 +#: doc/guix.texi:6437 msgid "Build @var{derivations} (a list of @code{} objects or derivation paths), and return when the worker is done building them. Return @code{#t} on success." msgstr "Die @var{Ableitungen} erstellen (eine Liste von @code{}-Objekten oder von Pfaden zu Ableitungen) und terminieren, sobald der Worker-Prozess mit dem Erstellen fertig ist. Liefert @code{#t} bei erfolgreicher Erstellung." #. type: Plain text -#: doc/guix.texi:6445 +#: doc/guix.texi:6443 msgid "Note that the @code{(guix monads)} module provides a monad as well as monadic versions of the above procedures, with the goal of making it more convenient to work with code that accesses the store (@pxref{The Store Monad})." msgstr "Es sei erwähnt, dass im Modul @code{(guix monads)} eine Monade sowie monadische Versionen obiger Prozeduren angeboten werden, damit an Code, der auf den Store zugreift, bequemer gearbeitet werden kann (siehe @ref{The Store Monad})." #. type: i{#1} -#: doc/guix.texi:6448 +#: doc/guix.texi:6446 msgid "This section is currently incomplete." msgstr "Dieser Abschnitt ist im Moment noch unvollständig." #. type: cindex -#: doc/guix.texi:6452 +#: doc/guix.texi:6450 #, no-wrap msgid "derivations" msgstr "Ableitungen" #. type: Plain text -#: doc/guix.texi:6456 +#: doc/guix.texi:6454 msgid "Low-level build actions and the environment in which they are performed are represented by @dfn{derivations}. A derivation contains the following pieces of information:" msgstr "Systemnahe Erstellungsaktionen sowie die Umgebung, in der selbige durchzuführen sind, werden durch @dfn{Ableitungen} dargestellt. Eine Ableitung enthält folgende Informationen:" #. type: itemize -#: doc/guix.texi:6461 +#: doc/guix.texi:6459 msgid "The outputs of the derivation---derivations produce at least one file or directory in the store, but may produce more." msgstr "Die Ausgaben, die die Ableitung hat. Ableitungen erzeugen mindestens eine Datei bzw. ein Verzeichnis im Store, können aber auch mehrere erzeugen." #. type: cindex -#: doc/guix.texi:6463 +#: doc/guix.texi:6461 #, no-wrap msgid "build-time dependencies" msgstr "Erstellungszeitabhängigkeiten" #. type: cindex -#: doc/guix.texi:6464 +#: doc/guix.texi:6462 #, no-wrap msgid "dependencies, build-time" msgstr "Abhängigkeiten zur Erstellungszeit" #. type: itemize -#: doc/guix.texi:6468 +#: doc/guix.texi:6466 msgid "The inputs of the derivations---i.e., its build-time dependencies---which may be other derivations or plain files in the store (patches, build scripts, etc.)" msgstr "Die Eingaben der Ableitung, also Abhängigkeiten zur Zeit ihrer Erstellung, die entweder andere Ableitungen oder einfache Dateien im Store sind (wie Patches, Erstellungsskripts usw.)." #. type: itemize -#: doc/guix.texi:6471 +#: doc/guix.texi:6469 msgid "The system type targeted by the derivation---e.g., @code{x86_64-linux}." msgstr "Das System, wofür mit der Ableitung erstellt wird, also ihr Ziel — z.B.@: @code{x86_64-linux}." #. type: itemize -#: doc/guix.texi:6475 +#: doc/guix.texi:6473 msgid "The file name of a build script in the store, along with the arguments to be passed." msgstr "Der Dateiname eines Erstellungsskripts im Store, zusammen mit den Argumenten, mit denen es aufgerufen werden soll." #. type: itemize -#: doc/guix.texi:6478 +#: doc/guix.texi:6476 msgid "A list of environment variables to be defined." msgstr "Eine Liste zu definierender Umgebungsvariabler." #. type: cindex -#: doc/guix.texi:6481 +#: doc/guix.texi:6479 #, no-wrap msgid "derivation path" msgstr "Ableitungspfad" #. type: Plain text -#: doc/guix.texi:6489 +#: doc/guix.texi:6487 msgid "Derivations allow clients of the daemon to communicate build actions to the store. They exist in two forms: as an in-memory representation, both on the client- and daemon-side, and as files in the store whose name end in @code{.drv}---these files are referred to as @dfn{derivation paths}. Derivations paths can be passed to the @code{build-derivations} procedure to perform the build actions they prescribe (@pxref{The Store})." msgstr "Ableitungen ermöglichen es den Clients des Daemons, diesem Erstellungsaktionen für den Store mitzuteilen. Es gibt davon zwei Arten, sowohl Darstellungen im Arbeitsspeicher jeweils für Client und Daemon, als auch Dateien im Store, deren Namen auf @code{.drv} enden — diese Dateien werden als @dfn{Ableitungspfade} bezeichnet. Ableitungspfade können an die Prozedur @code{build-derivations} übergeben werden, damit die darin niedergeschriebenen Erstellungsaktionen durchgeführt werden (siehe @ref{The Store})." #. type: cindex -#: doc/guix.texi:6490 +#: doc/guix.texi:6488 #, no-wrap msgid "fixed-output derivations" msgstr "Ableitungen mit fester Ausgabe" #. type: Plain text -#: doc/guix.texi:6497 +#: doc/guix.texi:6495 msgid "Operations such as file downloads and version-control checkouts for which the expected content hash is known in advance are modeled as @dfn{fixed-output derivations}. Unlike regular derivations, the outputs of a fixed-output derivation are independent of its inputs---e.g., a source code download produces the same result regardless of the download method and tools being used." msgstr "Operationen wie das Herunterladen von Dateien und Checkouts von unter Versionskontrolle stehenden Quelldateien, bei denen der Hash des Inhalts im Voraus bekannt ist, werden als @dfn{Ableitungen mit fester Ausgabe} modelliert. Anders als reguläre Ableitungen sind die Ausgaben von Ableitungen mit fester Ausgabe unabhängig von ihren Eingaben — z.B.@: liefert das Herunterladen desselben Quellcodes dasselbe Ergebnis unabhängig davon, mit welcher Methode und welchen Werkzeugen er heruntergeladen wurde." #. type: item -#: doc/guix.texi:6498 doc/guix.texi:9485 +#: doc/guix.texi:6496 doc/guix.texi:9483 #, no-wrap msgid "references" msgstr "references" #. type: cindex -#: doc/guix.texi:6499 +#: doc/guix.texi:6497 #, no-wrap msgid "run-time dependencies" msgstr "Laufzeitabhängigkeiten" #. type: cindex -#: doc/guix.texi:6500 +#: doc/guix.texi:6498 #, no-wrap msgid "dependencies, run-time" msgstr "Abhängigkeiten, zur Laufzeit" #. type: Plain text -#: doc/guix.texi:6507 +#: doc/guix.texi:6505 msgid "The outputs of derivations---i.e., the build results---have a set of @dfn{references}, as reported by the @code{references} RPC or the @command{guix gc --references} command (@pxref{Invoking guix gc}). References are the set of run-time dependencies of the build results. References are a subset of the inputs of the derivation; this subset is automatically computed by the build daemon by scanning all the files in the outputs." msgstr "Den Ausgaben von Ableitungen — d.h.@: Erstellungergebnissen — ist eine Liste von @dfn{Referenzen} zugeordnet, die auch der entfernte Prozeduraufruf @code{references} oder der Befehl @command{guix gc --references} liefert (siehe @ref{Invoking guix gc}). Referenzen sind die Menge der Laufzeitabhängigkeiten von Erstellungsergebnissen. Referenzen sind eine Teilmenge der Eingaben von Ableitungen; die Teilmenge wird automatisch ermittelt, indem der Erstellungsdaemon alle Dateien unter den Ausgaben nach Referenzen durchsucht." #. type: Plain text -#: doc/guix.texi:6512 +#: doc/guix.texi:6510 msgid "The @code{(guix derivations)} module provides a representation of derivations as Scheme objects, along with procedures to create and otherwise manipulate derivations. The lowest-level primitive to create a derivation is the @code{derivation} procedure:" msgstr "Das Modul @code{(guix derivations)} stellt eine Repräsentation von Ableitungen als Scheme-Objekte zur Verfügung, zusammen mit Prozeduren, um Ableitungen zu erzeugen und zu manipulieren. Die am wenigsten abstrahierte Methode, eine Ableitung zu erzeugen, ist mit der Prozedur @code{derivation}:" #. type: deffn -#: doc/guix.texi:6513 +#: doc/guix.texi:6511 #, no-wrap msgid "{Scheme Procedure} derivation @var{store} @var{name} @var{builder} @" msgstr "{Scheme-Prozedur} derivation @var{Store} @var{Name} @var{Ersteller} @" #. type: deffn -#: doc/guix.texi:6522 +#: doc/guix.texi:6520 msgid "@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:substitutable? #t] [#:properties '()] Build a derivation with the given arguments, and return the resulting @code{} object." msgstr "@var{Argumente} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:substitutable? #t] [#:properties '()] Eine Ableitungen mit den @var{Argumente}n erstellen und das resultierende @code{}-Objekt liefern." #. type: deffn -#: doc/guix.texi:6529 +#: doc/guix.texi:6527 msgid "When @var{hash} and @var{hash-algo} are given, a @dfn{fixed-output derivation} is created---i.e., one whose result is known in advance, such as a file download. If, in addition, @var{recursive?} is true, then that fixed output may be an executable file or a directory and @var{hash} must be the hash of an archive containing this output." msgstr "Wurden @var{hash} und @var{hash-algo} angegeben, wird eine @dfn{Ableitung mit fester Ausgabe} erzeugt — d.h.@: eine, deren Ausgabe schon im Voraus bekannt ist, wie z.B.@: beim Herunterladen einer Datei. Wenn des Weiteren auch @var{recursive?} wahr ist, darf die Ableitung mit fester Ausgabe eine ausführbare Datei oder ein Verzeichnis sein und @var{hash} muss die Prüfsumme eines Archivs mit dieser Ausgabe sein." #. type: deffn -#: doc/guix.texi:6534 +#: doc/guix.texi:6532 msgid "When @var{references-graphs} is true, it must be a list of file name/store path pairs. In that case, the reference graph of each store path is exported in the build environment in the corresponding file, in a simple text format." msgstr "Ist @var{references-graphs} wahr, dann muss es eine Liste von Paaren aus je einem Dateinamen und einem Store-Pfad sein. In diesem Fall wird der Referenzengraph jedes Store-Pfads in einer Datei mit dem angegebenen Namen in der Erstellungsumgebung zugänglich gemacht, in einem einfachen Text-Format." #. type: deffn -#: doc/guix.texi:6539 +#: doc/guix.texi:6537 msgid "When @var{allowed-references} is true, it must be a list of store items or outputs that the derivation's output may refer to. Likewise, @var{disallowed-references}, if true, must be a list of things the outputs may @emph{not} refer to." msgstr "Ist @var{allowed-references} ein wahr, muss es eine Liste von Store-Objekten oder Ausgaben sein, die die Ausgabe der Ableitung referenzieren darf. Ebenso muss @var{disallowed-references}, wenn es auf wahr gesetzt ist, eine Liste von Dingen bezeichnen, die die Ausgaben @emph{nicht} referenzieren dürfen." #. type: deffn -#: doc/guix.texi:6546 +#: doc/guix.texi:6544 msgid "When @var{leaked-env-vars} is true, it must be a list of strings denoting environment variables that are allowed to ``leak'' from the daemon's environment to the build environment. This is only applicable to fixed-output derivations---i.e., when @var{hash} is true. The main use is to allow variables such as @code{http_proxy} to be passed to derivations that download files." msgstr "Ist @var{leaked-env-vars} wahr, muss es eine Liste von Zeichenketten sein, die Umgebungsvariable benennen, die aus der Umgebung des Daemons in die Erstellungsumgebung überlaufen — ein „Leck“, englisch „leak“. Dies kann nur in Ableitungen mit fester Ausgabe benutzt werden, also wenn @var{hash} wahr ist. So ein Leck kann zum Beispiel benutzt werden, um Variable wie @code{http_proxy} an Ableitungen zu übergeben, die darüber Dateien herunterladen." #. type: deffn -#: doc/guix.texi:6551 +#: doc/guix.texi:6549 msgid "When @var{local-build?} is true, declare that the derivation is not a good candidate for offloading and should rather be built locally (@pxref{Daemon Offload Setup}). This is the case for small derivations where the costs of data transfers would outweigh the benefits." msgstr "Ist @var{local-build?} wahr, wird die Ableitung als schlechter Kandidat für das Auslagern deklariert, der besser lokal erstellt werden sollte (siehe @ref{Daemon Offload Setup}). Dies betrifft kleine Ableitungen, wo das Übertragen der Daten aufwendiger als ihre Erstellung ist." #. type: deffn -#: doc/guix.texi:6556 +#: doc/guix.texi:6554 msgid "When @var{substitutable?} is false, declare that substitutes of the derivation's output should not be used (@pxref{Substitutes}). This is useful, for instance, when building packages that capture details of the host CPU instruction set." msgstr "Ist @var{substitutable?} falsch, wird deklariert, dass für die Ausgabe der Ableitung keine Substitute benutzt werden sollen (siehe @ref{Substitutes}). Das ist nützlich, wenn Pakete erstellt werden, die Details über den Prozessorbefehlssatz des Wirtssystems auslesen." #. type: deffn -#: doc/guix.texi:6559 +#: doc/guix.texi:6557 msgid "@var{properties} must be an association list describing ``properties'' of the derivation. It is kept as-is, uninterpreted, in the derivation." msgstr "@var{properties} muss eine assoziative Liste enthalten, die „Eigenschaften“ der Ableitungen beschreibt. Sie wird genau so, wie sie ist, in der Ableitung gespeichert." #. type: Plain text -#: doc/guix.texi:6565 +#: doc/guix.texi:6563 msgid "Here's an example with a shell script as its builder, assuming @var{store} is an open connection to the daemon, and @var{bash} points to a Bash executable in the store:" msgstr "Hier ist ein Beispiel mit einem Shell-Skript, das als Ersteller benutzt wird. Es wird angenommen, dass @var{Store} eine offene Verbindung zum Daemon ist und @var{bash} auf eine ausführbare Bash im Store verweist:" #. type: lisp -#: doc/guix.texi:6570 +#: doc/guix.texi:6568 #, no-wrap msgid "" "(use-modules (guix utils)\n" @@ -12508,7 +12519,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:6579 +#: doc/guix.texi:6577 #, no-wrap msgid "" "(let ((builder ; add the Bash script to the store\n" @@ -12530,48 +12541,48 @@ msgstr "" "@result{} # /gnu/store/…-foo>\n" #. type: Plain text -#: doc/guix.texi:6586 +#: doc/guix.texi:6584 msgid "As can be guessed, this primitive is cumbersome to use directly. A better approach is to write build scripts in Scheme, of course! The best course of action for that is to write the build code as a ``G-expression'', and to pass it to @code{gexp->derivation}. For more information, @pxref{G-Expressions}." msgstr "Wie man sehen kann, ist es umständlich, diese grundlegende Methode direkt zu benutzen. Natürlich ist es besser, Erstellungsskripts in Scheme zu schreiben! Am besten schreibt man den Erstellungscode als „G-Ausdruck“ und übergibt ihn an @code{gexp->derivation}. Mehr Informationen finden Sie im Abschnitt @ref{G-Expressions}." #. type: Plain text -#: doc/guix.texi:6591 +#: doc/guix.texi:6589 msgid "Once upon a time, @code{gexp->derivation} did not exist and constructing derivations with build code written in Scheme was achieved with @code{build-expression->derivation}, documented below. This procedure is now deprecated in favor of the much nicer @code{gexp->derivation}." msgstr "Doch es gab einmal eine Zeit, zu der @code{gexp->derivation} noch nicht existiert hatte und wo das Zusammenstellen von Ableitungen mit Scheme-Erstellungscode noch mit @code{build-expression->derivation} bewerkstelligt wurde, was im Folgenden beschrieben wird. Diese Prozedur gilt als veraltet und man sollte nunmehr die viel schönere Prozedur @code{gexp->derivation} benutzen." #. type: deffn -#: doc/guix.texi:6592 +#: doc/guix.texi:6590 #, no-wrap msgid "{Scheme Procedure} build-expression->derivation @var{store} @" msgstr "{Scheme-Prozedur} build-expression->derivation @var{Store} @" #. type: deffn -#: doc/guix.texi:6608 +#: doc/guix.texi:6606 msgid "@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f] Return a derivation that executes Scheme expression @var{exp} as a builder for derivation @var{name}. @var{inputs} must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} is omitted, @code{\"out\"} is assumed. @var{modules} is a list of names of Guile modules from the current search path to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}." msgstr "@var{Name} @var{Ausdruck} @ [#:system (%current-system)] [#:inputs '()] @ [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f] Liefert eine Ableitung, die den Scheme-Ausdruck @var{Ausdruck} als Ersteller einer Ableitung namens @var{Name} ausführt. @var{inputs} muss die Liste der Eingaben enthalten, jeweils als Tupel @code{(Name Ableitungspfad Unterableitung)}; wird keine @var{Unterableitung} angegeben, wird @code{\"out\"} angenommen. @var{Module} ist eine Liste der Namen von Guile-Modulen im momentanen Suchpfad, die in den Store kopiert, kompiliert und zur Verfügung gestellt werden, wenn der @var{Ausdruck} ausgeführt wird — z.B.@: @code{((guix build utils) (guix build gnu-build-system))}." #. type: deffn -#: doc/guix.texi:6616 +#: doc/guix.texi:6614 msgid "@var{exp} is evaluated in an environment where @code{%outputs} is bound to a list of output/path pairs, and where @code{%build-inputs} is bound to a list of string/output-path pairs made from @var{inputs}. Optionally, @var{env-vars} is a list of string pairs specifying the name and value of environment variables visible to the builder. The builder terminates by passing the result of @var{exp} to @code{exit}; thus, when @var{exp} returns @code{#f}, the build is considered to have failed." msgstr "Der @var{Ausdruck} wird in einer Umgebung ausgewertet, in der @code{%outputs} an eine Liste von Ausgabe-/Pfad-Paaren gebunden wurde und in der @code{%build-inputs} an eine Liste von Zeichenkette-/Ausgabepfad-Paaren gebunden wurde, die aus den @var{inputs}-Eingaben konstruiert worden ist. Optional kann in @var{env-vars} eine Liste von Paaren aus Zeichenketten stehen, die Name und Wert von für den Ersteller sichtbaren Umgebungsvariablen angeben. Der Ersteller terminiert, indem er @code{exit} mit dem Ergebnis des @var{Ausdruck}s aufruft; wenn also der @var{Ausdruck} den Wert @code{#f} liefert, wird angenommen, dass die Erstellung fehlgeschlagen ist." #. type: deffn -#: doc/guix.texi:6620 +#: doc/guix.texi:6618 msgid "@var{exp} is built using @var{guile-for-build} (a derivation). When @var{guile-for-build} is omitted or is @code{#f}, the value of the @code{%guile-for-build} fluid is used instead." msgstr "@var{Ausdruck} wird mit einer Ableitung @var{guile-for-build} erstellt. Wird kein @var{guile-for-build} angegeben oder steht es auf @code{#f}, wird stattdessen der Wert der Fluiden @code{%guile-for-build} benutzt." #. type: deffn -#: doc/guix.texi:6625 +#: doc/guix.texi:6623 msgid "See the @code{derivation} procedure for the meaning of @var{references-graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-build?}, and @var{substitutable?}." msgstr "Siehe die Erklärungen zur Prozedur @code{derivation} für die Bedeutung von @var{references-graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-build?} und @var{substitutable?}." #. type: Plain text -#: doc/guix.texi:6630 +#: doc/guix.texi:6628 msgid "Here's an example of a single-output derivation that creates a directory containing one file:" msgstr "Hier ist ein Beispiel einer Ableitung mit nur einer Ausgabe, die ein Verzeichnis erzeugt, in dem eine einzelne Datei enthalten ist:" #. type: lisp -#: doc/guix.texi:6638 +#: doc/guix.texi:6636 #, no-wrap msgid "" "(let ((builder '(let ((out (assoc-ref %outputs \"out\")))\n" @@ -12592,51 +12603,51 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:6640 +#: doc/guix.texi:6638 #, no-wrap msgid "@result{} # @dots{}>\n" msgstr "@result{} # …>\n" #. type: cindex -#: doc/guix.texi:6646 +#: doc/guix.texi:6644 #, no-wrap msgid "monad" msgstr "Monade" #. type: Plain text -#: doc/guix.texi:6652 +#: doc/guix.texi:6650 msgid "The procedures that operate on the store described in the previous sections all take an open connection to the build daemon as their first argument. Although the underlying model is functional, they either have side effects or depend on the current state of the store." msgstr "Die auf dem Store arbeitenden Prozeduren, die in den vorigen Abschnitten beschrieben wurden, nehmen alle eine offene Verbindung zum Erstellungs-Daemon als ihr erstes Argument entgegen. Obwohl das ihnen zu Grunde liegende Modell funktional ist, weisen sie doch alle Nebenwirkungen auf oder hängen vom momentanen Zustand des Stores ab." #. type: Plain text -#: doc/guix.texi:6658 +#: doc/guix.texi:6656 msgid "The former is inconvenient: the connection to the build daemon has to be carried around in all those functions, making it impossible to compose functions that do not take that parameter with functions that do. The latter can be problematic: since store operations have side effects and/or depend on external state, they have to be properly sequenced." msgstr "Ersteres ist umständlich, weil die Verbindung zum Erstellungs-Daemon zwischen all diesen Funktionen durchgereicht werden muss, so dass eine Komposition mit Funktionen ohne diesen Parameter unmöglich wird. Letzteres kann problematisch sein, weil Operationen auf dem Store Nebenwirkungen und/oder Abhängigkeiten von externem Zustand haben und ihre Ausführungsreihenfolge deswegen eine Rolle spielt." #. type: cindex -#: doc/guix.texi:6659 +#: doc/guix.texi:6657 #, no-wrap msgid "monadic values" msgstr "monadische Werte" #. type: cindex -#: doc/guix.texi:6660 +#: doc/guix.texi:6658 #, no-wrap msgid "monadic functions" msgstr "monadische Funktionen" #. type: Plain text -#: doc/guix.texi:6670 +#: doc/guix.texi:6668 msgid "This is where the @code{(guix monads)} module comes in. This module provides a framework for working with @dfn{monads}, and a particularly useful monad for our uses, the @dfn{store monad}. Monads are a construct that allows two things: associating ``context'' with values (in our case, the context is the store), and building sequences of computations (here computations include accesses to the store). Values in a monad---values that carry this additional context---are called @dfn{monadic values}; procedures that return such values are called @dfn{monadic procedures}." msgstr "Hier kommt das Modul @code{(guix monads)} ins Spiel. Im Rahmen dieses Moduls können @dfn{Monaden} benutzt werden und dazu gehört insbesondere eine für unsere Zwecke sehr nützliche Monade, die @dfn{Store-Monade}. Monaden sind ein Konstrukt, mit dem zwei Dinge möglich sind: eine Assoziation von Werten mit einem „Kontext“ (in unserem Fall ist das die Verbindung zum Store) und das Festlegen einer Reihenfolge für Berechnungen (hiermit sind auch Zugriffe auf den Store gemeint). Werte in einer Monade — solche, die mit weiterem Kontext assoziiert sind — werden @dfn{monadische Werte} genannt; Prozeduren, die solche Werte liefern, heißen @dfn{monadische Prozeduren}." #. type: Plain text -#: doc/guix.texi:6672 +#: doc/guix.texi:6670 msgid "Consider this ``normal'' procedure:" msgstr "Betrachten Sie folgende „normale“ Prozedur:" #. type: example -#: doc/guix.texi:6681 +#: doc/guix.texi:6679 #, no-wrap msgid "" "(define (sh-symlink store)\n" @@ -12657,12 +12668,12 @@ msgstr "" " `(symlink ,sh %output))))\n" #. type: Plain text -#: doc/guix.texi:6685 +#: doc/guix.texi:6683 msgid "Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten as a monadic function:" msgstr "Unter Verwendung von @code{(guix monads)} und @code{(guix gexp)} lässt sie sich als monadische Funktion aufschreiben:" #. type: example -#: doc/guix.texi:6693 +#: doc/guix.texi:6691 #, no-wrap msgid "" "(define (sh-symlink)\n" @@ -12680,17 +12691,17 @@ msgstr "" " #$output))))\n" #. type: Plain text -#: doc/guix.texi:6700 +#: doc/guix.texi:6698 msgid "There are several things to note in the second version: the @code{store} parameter is now implicit and is ``threaded'' in the calls to the @code{package->derivation} and @code{gexp->derivation} monadic procedures, and the monadic value returned by @code{package->derivation} is @dfn{bound} using @code{mlet} instead of plain @code{let}." msgstr "An der zweiten Version lassen sich mehrere Dinge beobachten: Der Parameter @code{Store} ist jetzt implizit geworden und wurde in die Aufrufe der monadischen Prozeduren @code{package->derivation} und @code{gexp->derivation} „eingefädelt“ und der von @code{package->derivation} gelieferte monadische Wert wurde mit @code{mlet} statt einem einfachen @code{let} @dfn{gebunden}." #. type: Plain text -#: doc/guix.texi:6704 +#: doc/guix.texi:6702 msgid "As it turns out, the call to @code{package->derivation} can even be omitted since it will take place implicitly, as we will see later (@pxref{G-Expressions}):" msgstr "Wie sich herausstellt, muss man den Aufruf von @code{package->derivation} nicht einmal aufschreiben, weil er implizit geschieht, wie wir später sehen werden (siehe @ref{G-Expressions}):" #. type: example -#: doc/guix.texi:6710 +#: doc/guix.texi:6708 #, no-wrap msgid "" "(define (sh-symlink)\n" @@ -12704,12 +12715,12 @@ msgstr "" " #$output)))\n" #. type: Plain text -#: doc/guix.texi:6719 +#: doc/guix.texi:6717 msgid "Calling the monadic @code{sh-symlink} has no effect. As someone once said, ``you exit a monad like you exit a building on fire: by running''. So, to exit the monad and get the desired effect, one must use @code{run-with-store}:" msgstr "Die monadische @code{sh-symlink} einfach aufzurufen, bewirkt nichts. Wie jemand einst sagte: „Mit einer Monade geht man um, wie mit Gefangenen, gegen die man keine Beweise hat: Man muss sie laufen lassen.“ Um also aus der Monade auszubrechen und die gewünschte Wirkung zu erzielen, muss man @code{run-with-store} benutzen:" #. type: example -#: doc/guix.texi:6723 +#: doc/guix.texi:6721 #, no-wrap msgid "" "(run-with-store (open-connection) (sh-symlink))\n" @@ -12719,12 +12730,12 @@ msgstr "" "@result{} /gnu/store/…-sh-symlink\n" #. type: Plain text -#: doc/guix.texi:6729 +#: doc/guix.texi:6727 msgid "Note that the @code{(guix monad-repl)} module extends the Guile REPL with new ``meta-commands'' to make it easier to deal with monadic procedures: @code{run-in-store}, and @code{enter-store-monad}. The former is used to ``run'' a single monadic value through the store:" msgstr "Erwähnenswert ist, dass das Modul @code{(guix monad-repl)} die REPL von Guile um neue „Meta-Befehle“ erweitert, mit denen es leichter ist, mit monadischen Prozeduren umzugehen: @code{run-in-store} und @code{enter-store-monad}. Mit Ersterer wird ein einzelner monadischer Wert durch den Store „laufen gelassen“:" #. type: example -#: doc/guix.texi:6733 +#: doc/guix.texi:6731 #, no-wrap msgid "" "scheme@@(guile-user)> ,run-in-store (package->derivation hello)\n" @@ -12734,12 +12745,12 @@ msgstr "" "$1 = # …>\n" #. type: Plain text -#: doc/guix.texi:6737 +#: doc/guix.texi:6735 msgid "The latter enters a recursive REPL, where all the return values are automatically run through the store:" msgstr "Mit Letzterer wird rekursiv eine weitere REPL betreten, in der alle Rückgabewerte automatisch durch den Store laufen gelassen werden:" #. type: example -#: doc/guix.texi:6746 +#: doc/guix.texi:6744 #, no-wrap msgid "" "scheme@@(guile-user)> ,enter-store-monad\n" @@ -12759,50 +12770,50 @@ msgstr "" "scheme@@(guile-user)>\n" #. type: Plain text -#: doc/guix.texi:6751 +#: doc/guix.texi:6749 msgid "Note that non-monadic values cannot be returned in the @code{store-monad} REPL." msgstr "Beachten Sie, dass in einer @code{store-monad}-REPL keine nicht-monadischen Werte zurückgeliefert werden können." #. type: Plain text -#: doc/guix.texi:6754 +#: doc/guix.texi:6752 msgid "The main syntactic forms to deal with monads in general are provided by the @code{(guix monads)} module and are described below." msgstr "Die wichtigsten syntaktischen Formen, um mit Monaden im Allgemeinen umzugehen, werden im Modul @code{(guix monads)} bereitgestellt und sind im Folgenden beschrieben." #. type: deffn -#: doc/guix.texi:6755 +#: doc/guix.texi:6753 #, no-wrap msgid "{Scheme Syntax} with-monad @var{monad} @var{body} ..." msgstr "{Scheme-Syntax} with-monad @var{Monade} @var{Rumpf} ..." #. type: deffn -#: doc/guix.texi:6758 +#: doc/guix.texi:6756 msgid "Evaluate any @code{>>=} or @code{return} forms in @var{body} as being in @var{monad}." msgstr "Alle @code{>>=}- oder @code{return}-Formen im @var{Rumpf} in der @var{Monade} auswerten." #. type: deffn -#: doc/guix.texi:6760 +#: doc/guix.texi:6758 #, no-wrap msgid "{Scheme Syntax} return @var{val}" msgstr "{Scheme-Syntax} return @var{Wert}" #. type: deffn -#: doc/guix.texi:6762 +#: doc/guix.texi:6760 msgid "Return a monadic value that encapsulates @var{val}." msgstr "Einen monadischen Wert liefern, der den übergebenen @var{Wert} kapselt." #. type: deffn -#: doc/guix.texi:6764 +#: doc/guix.texi:6762 #, no-wrap msgid "{Scheme Syntax} >>= @var{mval} @var{mproc} ..." msgstr "{Scheme-Syntax} >>= @var{mWert} @var{mProz} ..." #. type: deffn -#: doc/guix.texi:6771 +#: doc/guix.texi:6769 msgid "@dfn{Bind} monadic value @var{mval}, passing its ``contents'' to monadic procedures @var{mproc}@dots{}@footnote{This operation is commonly referred to as ``bind'', but that name denotes an unrelated procedure in Guile. Thus we use this somewhat cryptic symbol inherited from the Haskell language.}. There can be one @var{mproc} or several of them, as in this example:" msgstr "Den monadischen Wert @var{mWert} @dfn{binden}, wobei sein „Inhalt“ an die monadischen Prozeduren @var{mProz}…@: übergeben wird@footnote{Diese Operation wird gemeinhin „bind“ genannt, aber mit diesem Begriff wird in Guile eine völlig andere Prozedur bezeichnet, die nichts damit zu tun hat. Also benutzen wir dieses etwas kryptische Symbol als Erbe der Haskell-Programmiersprache.}. Es kann eine einzelne @var{mProz} oder mehrere davon geben, wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:6779 +#: doc/guix.texi:6777 #, no-wrap msgid "" "(run-with-state\n" @@ -12822,7 +12833,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:6782 +#: doc/guix.texi:6780 #, no-wrap msgid "" "@result{} 4\n" @@ -12832,99 +12843,99 @@ msgstr "" "@result{} irgendein-Zustand\n" #. type: deffn -#: doc/guix.texi:6785 +#: doc/guix.texi:6783 #, no-wrap msgid "{Scheme Syntax} mlet @var{monad} ((@var{var} @var{mval}) ...) @" msgstr "{Scheme-Syntax} mlet @var{Monade} ((@var{Variable} @var{mWert}) ...) @" #. type: deffn -#: doc/guix.texi:6787 +#: doc/guix.texi:6785 msgid "@var{body} ..." msgstr "@var{Rumpf} ..." #. type: deffnx -#: doc/guix.texi:6787 +#: doc/guix.texi:6785 #, no-wrap msgid "{Scheme Syntax} mlet* @var{monad} ((@var{var} @var{mval}) ...) @" msgstr "{Scheme-Syntax} mlet* @var{Monade} ((@var{Variable} @var{mWert}) ...) @" #. type: deffn -#: doc/guix.texi:6799 +#: doc/guix.texi:6797 msgid "@var{body} ... Bind the variables @var{var} to the monadic values @var{mval} in @var{body}, which is a sequence of expressions. As with the bind operator, this can be thought of as ``unpacking'' the raw, non-monadic value ``contained'' in @var{mval} and making @var{var} refer to that raw, non-monadic value within the scope of the @var{body}. The form (@var{var} -> @var{val}) binds @var{var} to the ``normal'' value @var{val}, as per @code{let}. The binding operations occur in sequence from left to right. The last expression of @var{body} must be a monadic expression, and its result will become the result of the @code{mlet} or @code{mlet*} when run in the @var{monad}." msgstr "@var{Rumpf} ... Die @var{Variable}n an die monadischen Werte @var{mWert} im @var{Rumpf} binden, der eine Folge von Ausdrücken ist. Wie beim bind-Operator kann man es sich vorstellen als „Auspacken“ des rohen, nicht-monadischen Werts, der im @var{mWert} steckt, wobei anschließend dieser rohe, nicht-monadische Wert im Sichtbarkeitsbereich des @var{Rumpf}s von der @var{Variable}n bezeichnet wird. Die Form (@var{Variable} -> @var{Wert}) bindet die @var{Variable} an den „normalen“ @var{Wert}, wie es @code{let} tun würde. Die Bindungsoperation geschieht in der Reihenfolge von links nach rechts. Der letzte Ausdruck des @var{Rumpfs} muss ein monadischer Ausdruck sein und dessen Ergebnis wird das Ergebnis von @code{mlet} oder @code{mlet*} werden, wenn es durch die @var{Monad} laufen gelassen wurde." #. type: deffn -#: doc/guix.texi:6802 +#: doc/guix.texi:6800 msgid "@code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})." msgstr "@code{mlet*} verhält sich gegenüber @code{mlet} wie @code{let*} gegenüber @code{let} (siehe @ref{Local Bindings,,, guile, GNU Guile Reference Manual})." #. type: deffn -#: doc/guix.texi:6804 +#: doc/guix.texi:6802 #, no-wrap msgid "{Scheme System} mbegin @var{monad} @var{mexp} ..." msgstr "{Scheme-System} mbegin @var{Monade} @var{mAusdruck} ..." #. type: deffn -#: doc/guix.texi:6808 +#: doc/guix.texi:6806 msgid "Bind @var{mexp} and the following monadic expressions in sequence, returning the result of the last expression. Every expression in the sequence must be a monadic expression." msgstr "Der Reihe nach den @var{mAusdruck} und die nachfolgenden monadischen Ausdrücke binden und als Ergebnis das des letzten Ausdrucks liefern. Jeder Ausdruck in der Abfolge muss ein monadischer Ausdruck sein." #. type: deffn -#: doc/guix.texi:6812 +#: doc/guix.texi:6810 msgid "This is akin to @code{mlet}, except that the return values of the monadic expressions are ignored. In that sense, it is analogous to @code{begin}, but applied to monadic expressions." msgstr "Dies verhält sich ähnlich wie @code{mlet}, außer dass die Rückgabewerte der monadischen Prozeduren ignoriert werden. In diesem Sinn verhält es sich analog zu @code{begin}, nur auf monadischen Ausdrücken." #. type: deffn -#: doc/guix.texi:6814 +#: doc/guix.texi:6812 #, no-wrap msgid "{Scheme System} mwhen @var{condition} @var{mexp0} @var{mexp*} ..." msgstr "{Scheme-System} mwhen @var{Bedingung} @var{mAusdr0} @var{mAusdr*} ..." #. type: deffn -#: doc/guix.texi:6819 +#: doc/guix.texi:6817 msgid "When @var{condition} is true, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}. When @var{condition} is false, return @code{*unspecified*} in the current monad. Every expression in the sequence must be a monadic expression." msgstr "Wenn die @var{Bedingung} wahr ist, wird die Folge monadischer Ausdrücke @var{mAusdr0}..@var{mAusdr*} wie bei @code{mbegin} ausgewertet. Wenn die @var{Bedingung} falsch ist, wird @code{*unspecified*} in der momentanen Monade zurückgeliefert. Jeder Ausdruck in der Folge muss ein monadischer Ausdruck sein." #. type: deffn -#: doc/guix.texi:6821 +#: doc/guix.texi:6819 #, no-wrap msgid "{Scheme System} munless @var{condition} @var{mexp0} @var{mexp*} ..." msgstr "{Scheme-System} munless @var{Bedingung} @var{mAusdr0} @var{mAusdr*} ..." #. type: deffn -#: doc/guix.texi:6826 +#: doc/guix.texi:6824 msgid "When @var{condition} is false, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}. When @var{condition} is true, return @code{*unspecified*} in the current monad. Every expression in the sequence must be a monadic expression." msgstr "Wenn die @var{Bedingung} falsch ist, wird die Folge monadischer Ausdrücke @var{mAusdr0}..@var{mAusdr*} wie bei @code{mbegin} ausgewertet. Wenn die @var{Bedingung} wahr ist, wird @code{*unspecified*} in der momentanen Monade zurückgeliefert. Jeder Ausdruck in der Folge muss ein monadischer Ausdruck sein." #. type: cindex -#: doc/guix.texi:6828 +#: doc/guix.texi:6826 #, no-wrap msgid "state monad" msgstr "Zustandsmonade" #. type: Plain text -#: doc/guix.texi:6832 +#: doc/guix.texi:6830 msgid "The @code{(guix monads)} module provides the @dfn{state monad}, which allows an additional value---the state---to be @emph{threaded} through monadic procedure calls." msgstr "Das Modul @code{(guix monads)} macht die @dfn{Zustandsmonade} (englisch „state monad“) verfügbar, mit der ein zusätzlicher Wert — der Zustand — durch die monadischen Prozeduraufrufe @emph{gefädelt} werden kann." #. type: defvr -#: doc/guix.texi:6833 +#: doc/guix.texi:6831 #, no-wrap msgid "{Scheme Variable} %state-monad" msgstr "{Scheme-Variable} %state-monad" #. type: defvr -#: doc/guix.texi:6836 +#: doc/guix.texi:6834 msgid "The state monad. Procedures in the state monad can access and change the state that is threaded." msgstr "Die Zustandsmonade. Prozeduren in der Zustandsmonade können auf den gefädelten Zustand zugreifen und ihn verändern." #. type: defvr -#: doc/guix.texi:6840 +#: doc/guix.texi:6838 msgid "Consider the example below. The @code{square} procedure returns a value in the state monad. It returns the square of its argument, but also increments the current state value:" msgstr "Betrachten Sie das folgende Beispiel. Die Prozedur @code{Quadrat} liefert einen Wert in der Zustandsmonade zurück. Sie liefert das Quadrat ihres Arguments, aber sie inkrementiert auch den momentanen Zustandswert:" #. type: example -#: doc/guix.texi:6847 +#: doc/guix.texi:6845 #, no-wrap msgid "" "(define (square x)\n" @@ -12942,7 +12953,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:6851 +#: doc/guix.texi:6849 #, no-wrap msgid "" "(run-with-state (sequence %state-monad (map square (iota 3))) 0)\n" @@ -12954,147 +12965,147 @@ msgstr "" "@result{} 3\n" #. type: defvr -#: doc/guix.texi:6855 +#: doc/guix.texi:6853 msgid "When ``run'' through @var{%state-monad}, we obtain that additional state value, which is the number of @code{square} calls." msgstr "Wird das „durch“ die Zustandsmonade @var{%state-monad} laufen gelassen, erhalten wir jenen zusätzlichen Zustandswert, der der Anzahl der Aufrufe von @code{Quadrat} entspricht." #. type: deffn -#: doc/guix.texi:6857 +#: doc/guix.texi:6855 #, no-wrap msgid "{Monadic Procedure} current-state" msgstr "{Monadische Prozedur} current-state" #. type: deffn -#: doc/guix.texi:6859 +#: doc/guix.texi:6857 msgid "Return the current state as a monadic value." msgstr "Liefert den momentanen Zustand als einen monadischen Wert." #. type: deffn -#: doc/guix.texi:6861 +#: doc/guix.texi:6859 #, no-wrap msgid "{Monadic Procedure} set-current-state @var{value}" msgstr "{Monadische Prozedur} set-current-state @var{Wert}" #. type: deffn -#: doc/guix.texi:6864 +#: doc/guix.texi:6862 msgid "Set the current state to @var{value} and return the previous state as a monadic value." msgstr "Setzt den momentanen Zustand auf @var{Wert} und liefert den vorherigen Zustand als einen monadischen Wert." #. type: deffn -#: doc/guix.texi:6866 +#: doc/guix.texi:6864 #, no-wrap msgid "{Monadic Procedure} state-push @var{value}" msgstr "{Monadische Prozedur} state-push @var{Wert}" #. type: deffn -#: doc/guix.texi:6869 +#: doc/guix.texi:6867 msgid "Push @var{value} to the current state, which is assumed to be a list, and return the previous state as a monadic value." msgstr "Hängt den @var{Wert} vorne an den momentanen Zustand an, der eine Liste sein muss. Liefert den vorherigen Zustand als monadischen Wert." #. type: deffn -#: doc/guix.texi:6871 +#: doc/guix.texi:6869 #, no-wrap msgid "{Monadic Procedure} state-pop" msgstr "{Monadische Prozedur} state-pop" #. type: deffn -#: doc/guix.texi:6874 +#: doc/guix.texi:6872 msgid "Pop a value from the current state and return it as a monadic value. The state is assumed to be a list." msgstr "Entfernt einen Wert vorne vom momentanen Zustand und liefert ihn als monadischen Wert zurück. Dabei wird angenommen, dass es sich beim Zustand um eine Liste handelt." #. type: deffn -#: doc/guix.texi:6876 +#: doc/guix.texi:6874 #, no-wrap msgid "{Scheme Procedure} run-with-state @var{mval} [@var{state}]" msgstr "{Scheme-Prozedur} run-with-state @var{mWert} [@var{Zustand}]" #. type: deffn -#: doc/guix.texi:6879 +#: doc/guix.texi:6877 msgid "Run monadic value @var{mval} starting with @var{state} as the initial state. Return two values: the resulting value, and the resulting state." msgstr "Den monadischen Wert @var{mWert} mit @var{Zustand} als initialem Zustand laufen lassen. Dies liefert zwei Werte: den Ergebniswert und den Ergebniszustand." #. type: Plain text -#: doc/guix.texi:6883 +#: doc/guix.texi:6881 msgid "The main interface to the store monad, provided by the @code{(guix store)} module, is as follows." msgstr "Die zentrale Schnittstelle zur Store-Monade, wie sie vom Modul @code{(guix store)} angeboten wird, ist die Folgende:" #. type: defvr -#: doc/guix.texi:6884 +#: doc/guix.texi:6882 #, no-wrap msgid "{Scheme Variable} %store-monad" msgstr "{Scheme-Variable} %store-monad" #. type: defvr -#: doc/guix.texi:6886 +#: doc/guix.texi:6884 msgid "The store monad---an alias for @var{%state-monad}." msgstr "Die Store-Monade — ein anderer Name für @var{%state-monad}." #. type: defvr -#: doc/guix.texi:6890 +#: doc/guix.texi:6888 msgid "Values in the store monad encapsulate accesses to the store. When its effect is needed, a value of the store monad must be ``evaluated'' by passing it to the @code{run-with-store} procedure (see below.)" msgstr "Werte in der Store-Monade kapseln Zugriffe auf den Store. Sobald seine Wirkung gebraucht wird, muss ein Wert der Store-Monade „ausgewertet“ werden, indem er an die Prozedur @code{run-with-store} übergeben wird (siehe unten)." #. type: deffn -#: doc/guix.texi:6892 +#: doc/guix.texi:6890 #, no-wrap msgid "{Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]" msgstr "{Scheme-Prozedur} run-with-store @var{Store} @var{mWert} [#:guile-for-build] [#:system (%current-system)]" #. type: deffn -#: doc/guix.texi:6895 +#: doc/guix.texi:6893 msgid "Run @var{mval}, a monadic value in the store monad, in @var{store}, an open store connection." msgstr "Den @var{mWert}, einen monadischen Wert in der Store-Monade, in der offenen Verbindung @var{Store} laufen lassen." #. type: deffn -#: doc/guix.texi:6897 +#: doc/guix.texi:6895 #, no-wrap msgid "{Monadic Procedure} text-file @var{name} @var{text} [@var{references}]" msgstr "{Monadische Prozedur} text-file @var{Name} @var{Text} [@var{Referenzen}]" #. type: deffn -#: doc/guix.texi:6901 +#: doc/guix.texi:6899 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{text}, a string. @var{references} is a list of store items that the resulting text file refers to; it defaults to the empty list." msgstr "Als monadischen Wert den absoluten Dateinamen im Store für eine Datei liefern, deren Inhalt der der Zeichenkette @var{Text} ist. @var{Referenzen} ist dabei eine Liste von Store-Objekten, die die Ergebnis-Textdatei referenzieren wird; der Vorgabewert ist die leere Liste." #. type: deffn -#: doc/guix.texi:6903 +#: doc/guix.texi:6901 #, no-wrap msgid "{Monadic Procedure} binary-file @var{name} @var{data} [@var{references}]" msgstr "{Monadische Prozedur} binary-file @var{Name} @var{Daten} [@var{Referenzen}]" #. type: deffn -#: doc/guix.texi:6907 +#: doc/guix.texi:6905 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{data}, a bytevector. @var{references} is a list of store items that the resulting binary file refers to; it defaults to the empty list." msgstr "Den absoluten Dateinamen im Store als monadischen Wert für eine Datei liefern, deren Inhalt der des Byte-Vektors @var{Daten} ist. @var{Referenzen} ist dabei eine Liste von Store-Objekten, die die Ergebnis-Binärdatei referenzieren wird; der Vorgabewert ist die leere Liste." #. type: deffn -#: doc/guix.texi:6909 +#: doc/guix.texi:6907 #, no-wrap msgid "{Monadic Procedure} interned-file @var{file} [@var{name}] @" msgstr "{Monadische Prozedur} interned-file @var{Datei} [@var{Name}] @" #. type: deffn -#: doc/guix.texi:6914 +#: doc/guix.texi:6912 msgid "[#:recursive? #t] [#:select? (const #t)] Return the name of @var{file} once interned in the store. Use @var{name} as its store name, or the basename of @var{file} if @var{name} is omitted." msgstr "[#:recursive? #t] [#:select? (const #t)] Liefert den Namen der @var{Datei}, nachdem sie in den Store interniert wurde. Dabei wird der @var{Name} als ihr Store-Name verwendet, oder, wenn kein @var{Name} angegeben wurde, der Basisname der @var{Datei}." #. type: deffn -#: doc/guix.texi:6918 doc/guix.texi:7331 +#: doc/guix.texi:6916 doc/guix.texi:7329 msgid "When @var{recursive?} is true, the contents of @var{file} are added recursively; if @var{file} designates a flat file and @var{recursive?} is true, its contents are added, and its permission bits are kept." msgstr "Ist @var{recursive?} wahr, werden in der @var{Datei} enthaltene Dateien rekursiv hinzugefügt; ist die @var{Datei} eine flache Datei und @var{recursive?} ist wahr, wird ihr Inhalt in den Store eingelagert und ihre Berechtigungs-Bits übernommen." #. type: deffn -#: doc/guix.texi:6923 doc/guix.texi:7336 +#: doc/guix.texi:6921 doc/guix.texi:7334 msgid "When @var{recursive?} is true, call @code{(@var{select?} @var{file} @var{stat})} for each directory entry, where @var{file} is the entry's absolute file name and @var{stat} is the result of @code{lstat}; exclude entries for which @var{select?} does not return true." msgstr "Steht @var{recursive?} auf wahr, wird @code{(@var{select?} @var{Datei} @var{Stat})} für jeden Verzeichniseintrag aufgerufen, wobei @var{Datei} der absolute Dateiname und @var{Stat} das Ergebnis von @code{lstat} ist, außer auf den Einträgen, wo @var{select?} keinen wahren Wert liefert." #. type: deffn -#: doc/guix.texi:6925 +#: doc/guix.texi:6923 msgid "The example below adds a file to the store, under two different names:" msgstr "Folgendes Beispiel fügt eine Datei unter zwei verschiedenen Namen in den Store ein:" #. type: example -#: doc/guix.texi:6931 +#: doc/guix.texi:6929 #, no-wrap msgid "" "(run-with-store (open-connection)\n" @@ -13110,115 +13121,115 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:6933 +#: doc/guix.texi:6931 #, no-wrap msgid "@result{} (\"/gnu/store/rwm@dots{}-README\" \"/gnu/store/44i@dots{}-LEGU-MIN\")\n" msgstr "@result{} (\"/gnu/store/rwm…-README\" \"/gnu/store/44i…-LEGU-MIN\")\n" #. type: Plain text -#: doc/guix.texi:6939 +#: doc/guix.texi:6937 msgid "The @code{(guix packages)} module exports the following package-related monadic procedures:" msgstr "Das Modul @code{(guix packages)} exportiert die folgenden paketbezogenen monadischen Prozeduren:" #. type: deffn -#: doc/guix.texi:6940 +#: doc/guix.texi:6938 #, no-wrap msgid "{Monadic Procedure} package-file @var{package} [@var{file}] @" msgstr "{Monadische Prozedur} package-file @var{Paket} [@var{Datei}] @" #. type: deffn -#: doc/guix.texi:6948 +#: doc/guix.texi:6946 msgid "[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Return as a monadic value in the absolute file name of @var{file} within the @var{output} directory of @var{package}. When @var{file} is omitted, return the name of the @var{output} directory of @var{package}. When @var{target} is true, use it as a cross-compilation target triplet." msgstr "[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Liefert als monadischen Wert den absoluten Dateinamen der @var{Datei} innerhalb des Ausgabeverzeichnisses @var{output} des @var{Paket}s. Wird keine @var{Datei} angegeben, wird der Name des Ausgabeverzeichnisses @var{output} für das @var{Paket} zurückgeliefert. Ist @var{target} wahr, wird sein Wert als das Zielsystem bezeichnendes Tripel zum Cross-Kompilieren benutzt." #. type: deffn -#: doc/guix.texi:6950 +#: doc/guix.texi:6948 #, no-wrap msgid "{Monadic Procedure} package->derivation @var{package} [@var{system}]" msgstr "{Monadische Prozedur} package->derivation @var{Paket} [@var{System}]" #. type: deffnx -#: doc/guix.texi:6951 +#: doc/guix.texi:6949 #, no-wrap msgid "{Monadic Procedure} package->cross-derivation @var{package} @" msgstr "{Monadische Prozedur} package->cross-derivation @var{Paket} @" #. type: deffn -#: doc/guix.texi:6955 +#: doc/guix.texi:6953 msgid "@var{target} [@var{system}] Monadic version of @code{package-derivation} and @code{package-cross-derivation} (@pxref{Defining Packages})." msgstr "@var{Ziel} [@var{System}] Monadische Version von @code{package-derivation} und @code{package-cross-derivation} (siehe @ref{Defining Packages})." #. type: cindex -#: doc/guix.texi:6961 +#: doc/guix.texi:6959 #, no-wrap msgid "G-expression" msgstr "G-Ausdruck" #. type: cindex -#: doc/guix.texi:6962 +#: doc/guix.texi:6960 #, no-wrap msgid "build code quoting" msgstr "Erstellungscode maskieren" #. type: Plain text -#: doc/guix.texi:6968 +#: doc/guix.texi:6966 msgid "So we have ``derivations'', which represent a sequence of build actions to be performed to produce an item in the store (@pxref{Derivations}). These build actions are performed when asking the daemon to actually build the derivations; they are run by the daemon in a container (@pxref{Invoking guix-daemon})." msgstr "Es gibt also „Ableitungen“, die eine Abfolge von Erstellungsaktionen repräsentieren, die durchgeführt werden müssen, um ein Objekt im Store zu erzeugen (siehe @ref{Derivations}). Diese Erstellungsaktionen werden durchgeführt, nachdem der Daemon gebeten wurde, die Ableitungen tatsächlich zu erstellen; dann führt der Daemon sie in einer isolierten Umgebung (einem sogenannten Container) aus (siehe @ref{Invoking guix-daemon})." #. type: cindex -#: doc/guix.texi:6969 +#: doc/guix.texi:6967 #, no-wrap msgid "strata of code" msgstr "Schichten von Code" #. type: Plain text -#: doc/guix.texi:6981 +#: doc/guix.texi:6979 msgid "It should come as no surprise that we like to write these build actions in Scheme. When we do that, we end up with two @dfn{strata} of Scheme code@footnote{The term @dfn{stratum} in this context was coined by Manuel Serrano et al.@: in the context of their work on Hop. Oleg Kiselyov, who has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on this topic}, refers to this kind of code generation as @dfn{staging}.}: the ``host code''---code that defines packages, talks to the daemon, etc.---and the ``build code''---code that actually performs build actions, such as making directories, invoking @command{make}, etc." msgstr "Wenig überraschend ist, dass wir diese Erstellungsaktionen gerne in Scheme schreiben würden. Wenn wir das tun, bekommen wir zwei verschiedene @dfn{Schichten} von Scheme-Code@footnote{Der Begriff @dfn{Schicht}, englisch Stratum, wurde in diesem Kontext von Manuel Serrano et al.@: in ihrer Arbeit an Hop geprägt. Oleg Kiselyov, der aufschlussreiche @url{http://okmij.org/ftp/meta-programming/#meta-scheme, Essays und Code zu diesem Thema} geschrieben hat, nennt diese Art der Code-Generierung @dfn{Staging}, deutsch etwa Inszenierung bzw.@: Aufführung.}: den „wirtsseitigen Code“ („host code“) — also Code, der Pakete definiert, mit dem Daemon kommuniziert etc.@: — und den „erstellungsseitigen Code“ („build code“) — also Code, der die Erstellungsaktionen auch wirklich umsetzt, indem Dateien erstellt werden, @command{make} aufgerufen wird etc." #. type: Plain text -#: doc/guix.texi:6988 +#: doc/guix.texi:6986 msgid "To describe a derivation and its build actions, one typically needs to embed build code inside host code. It boils down to manipulating build code as data, and the homoiconicity of Scheme---code has a direct representation as data---comes in handy for that. But we need more than the normal @code{quasiquote} mechanism in Scheme to construct build expressions." msgstr "Um eine Ableitung und ihre Erstellungsaktionen zu beschreiben, muss man normalerweise erstellungsseitigen Code im wirtsseitigen Code einbetten. Das bedeutet, man behandelt den erstellungsseitigen Code als Daten, was wegen der Homoikonizität von Scheme — dass Code genauso als Daten repräsentiert werden kann — sehr praktisch ist. Doch brauchen wir hier mehr als nur den normalen Quasimaskierungsmechanismus mit @code{quasiquote} in Scheme, wenn wir Erstellungsausdrücke konstruieren möchten." #. type: Plain text -#: doc/guix.texi:6997 +#: doc/guix.texi:6995 msgid "The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of S-expressions adapted to build expressions. G-expressions, or @dfn{gexps}, consist essentially of three syntactic forms: @code{gexp}, @code{ungexp}, and @code{ungexp-splicing} (or simply: @code{#~}, @code{#$}, and @code{#$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and @code{unquote-splicing}, respectively (@pxref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}). However, there are major differences:" msgstr "Das Modul @code{(guix gexp)} implementiert @dfn{G-Ausdrücke}, eine Form von S-Ausdrücken, die zu Erstellungsausdrücken angepasst wurden. G-Ausdrücke (englisch „G-expressions“, kurz @dfn{Gexps}) setzen sich grundlegend aus drei syntaktischen Formen zusammen: @code{gexp}, @code{ungexp} und @code{ungexp-splicing} (alternativ einfach: @code{#~}, @code{#$} und @code{#$@@}), die jeweils mit @code{quasiquote}, @code{unquote} und @code{unquote-splicing} vergleichbar sind (siehe @ref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}). Es gibt aber auch erhebliche Unterschiede:" #. type: itemize -#: doc/guix.texi:7002 +#: doc/guix.texi:7000 msgid "Gexps are meant to be written to a file and run or manipulated by other processes." msgstr "G-Ausdrücke sind dafür gedacht, in eine Datei geschrieben zu werden, wo sie von anderen Prozessen ausgeführt oder manipuliert werden können." #. type: itemize -#: doc/guix.texi:7007 +#: doc/guix.texi:7005 msgid "When a high-level object such as a package or derivation is unquoted inside a gexp, the result is as if its output file name had been introduced." msgstr "Wenn ein abstraktes Objekt wie ein Paket oder eine Ableitung innerhalb eines G-Ausdrücks demaskiert wird, ist das Ergebnis davon dasselbe, wie wenn dessen Ausgabedateiname genannt worden wäre." #. type: itemize -#: doc/guix.texi:7012 +#: doc/guix.texi:7010 msgid "Gexps carry information about the packages or derivations they refer to, and these dependencies are automatically added as inputs to the build processes that use them." msgstr "G-Ausdrücke tragen Informationen über die Pakete oder Ableitungen mit sich, auf die sie sich beziehen, und diese Abhängigkeiten werden automatisch zu den sie benutzenden Erstellungsprozessen als Eingaben hinzugefügt." #. type: cindex -#: doc/guix.texi:7014 doc/guix.texi:7518 +#: doc/guix.texi:7012 doc/guix.texi:7516 #, no-wrap msgid "lowering, of high-level objects in gexps" msgstr "Herunterbrechen, von abstrakten Objekten in G-Ausdrücken" #. type: Plain text -#: doc/guix.texi:7024 +#: doc/guix.texi:7022 msgid "This mechanism is not limited to package and derivation objects: @dfn{compilers} able to ``lower'' other high-level objects to derivations or files in the store can be defined, such that these objects can also be inserted into gexps. For example, a useful type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and to refer to them in derivations and such (see @code{local-file} and @code{plain-file} below.)" msgstr "Dieser Mechanismus ist nicht auf Pakete und Ableitung beschränkt: Es können @dfn{Compiler} definiert werden, die weitere abstrakte, hochsprachliche Objekte auf Ableitungen oder Dateien im Store „herunterbrechen“, womit diese Objekte dann auch in G-Ausdrücken eingefügt werden können. Zum Beispiel sind „dateiartige Objekte“ ein nützlicher Typ solcher abstrakter Objekte. Mit ihnen können Dateien leicht in den Store eingefügt und von Ableitungen und anderem referenziert werden (siehe unten @code{local-file} und @code{plain-file})." #. type: Plain text -#: doc/guix.texi:7026 +#: doc/guix.texi:7024 msgid "To illustrate the idea, here is an example of a gexp:" msgstr "Zur Veranschaulichung dieser Idee soll uns dieses Beispiel eines G-Ausdrucks dienen:" #. type: example -#: doc/guix.texi:7034 +#: doc/guix.texi:7032 #, no-wrap msgid "" "(define build-exp\n" @@ -13236,34 +13247,34 @@ msgstr "" " \"list-files\")))\n" #. type: Plain text -#: doc/guix.texi:7039 +#: doc/guix.texi:7037 msgid "This gexp can be passed to @code{gexp->derivation}; we obtain a derivation that builds a directory containing exactly one symlink to @file{/gnu/store/@dots{}-coreutils-8.22/bin/ls}:" msgstr "Indem wir diesen G-Ausdruck an @code{gexp->derivation} übergeben, bekommen wir eine Ableitung, die ein Verzeichnis mit genau einer symbolischen Verknüpfung auf @file{/gnu/store/…-coreutils-8.22/bin/ls} erstellt:" #. type: example -#: doc/guix.texi:7042 +#: doc/guix.texi:7040 #, no-wrap msgid "(gexp->derivation \"the-thing\" build-exp)\n" msgstr "(gexp->derivation \"das-ding\" build-exp)\n" #. type: Plain text -#: doc/guix.texi:7050 +#: doc/guix.texi:7048 msgid "As one would expect, the @code{\"/gnu/store/@dots{}-coreutils-8.22\"} string is substituted to the reference to the @var{coreutils} package in the actual build code, and @var{coreutils} is automatically made an input to the derivation. Likewise, @code{#$output} (equivalent to @code{(ungexp output)}) is replaced by a string containing the directory name of the output of the derivation." msgstr "Wie man es erwarten würde, wird die Zeichenkette @code{\"/gnu/store/…-coreutils-8.22\"} anstelle der Referenzen auf das Paket @var{coreutils} im eigentlichen Erstellungscode eingefügt und @var{coreutils} automatisch zu einer Eingabe der Ableitung gemacht. Genauso wird auch @code{#$output} (was äquivalent zur Schreibweise @code{(ungexp output)} ist) ersetzt durch eine Zeichenkette mit dem Namen der Ausgabe der Ableitung." #. type: cindex -#: doc/guix.texi:7051 +#: doc/guix.texi:7049 #, no-wrap msgid "cross compilation" msgstr "Cross-Kompilieren" #. type: Plain text -#: doc/guix.texi:7057 +#: doc/guix.texi:7055 msgid "In a cross-compilation context, it is useful to distinguish between references to the @emph{native} build of a package---that can run on the host---versus references to cross builds of a package. To that end, the @code{#+} plays the same role as @code{#$}, but is a reference to a native package build:" msgstr "Im Kontext der Cross-Kompilierung bietet es sich an, zwischen Referenzen auf die @emph{native} Erstellung eines Pakets — also der, die auf dem Wirtssystem ausgeführt werden kann — und Referenzen auf Cross-Erstellungen eines Pakets zu unterscheiden. Hierfür spielt @code{#+} dieselbe Rolle wie @code{#$}, steht aber für eine Referenz auf eine native Paketerstellung." #. type: example -#: doc/guix.texi:7067 +#: doc/guix.texi:7065 #, no-wrap msgid "" "(gexp->derivation \"vi\"\n" @@ -13285,29 +13296,29 @@ msgstr "" " #:target \"mips64el-linux-gnu\")\n" #. type: Plain text -#: doc/guix.texi:7073 +#: doc/guix.texi:7071 msgid "In the example above, the native build of @var{coreutils} is used, so that @command{ln} can actually run on the host; but then the cross-compiled build of @var{emacs} is referenced." msgstr "Im obigen Beispiel wird die native Erstellung der @var{coreutils} benutzt, damit @command{ln} tatsächlich auf dem Wirtssystem ausgeführt werden kann, aber danach die cross-kompilierte Erstellung von @var{emacs} referenziert." #. type: cindex -#: doc/guix.texi:7074 +#: doc/guix.texi:7072 #, no-wrap msgid "imported modules, for gexps" msgstr "importierte Module, in G-Ausdrücken" #. type: findex -#: doc/guix.texi:7075 +#: doc/guix.texi:7073 #, no-wrap msgid "with-imported-modules" msgstr "with-imported-modules" #. type: Plain text -#: doc/guix.texi:7080 +#: doc/guix.texi:7078 msgid "Another gexp feature is @dfn{imported modules}: sometimes you want to be able to use certain Guile modules from the ``host environment'' in the gexp, so those modules should be imported in the ``build environment''. The @code{with-imported-modules} form allows you to express that:" msgstr "Eine weitere Funktionalität von G-Ausdrücken stellen @dfn{importierte Module} dar. Manchmal will man bestimmte Guile-Module von der „wirtsseitigen Umgebung“ im G-Ausdruck benutzen können, deswegen sollten diese Module in die „erstellungsseitige Umgebung“ importiert werden. Die @code{with-imported-modules}-Form macht das möglich:" #. type: example -#: doc/guix.texi:7091 +#: doc/guix.texi:7089 #, no-wrap msgid "" "(let ((build (with-imported-modules '((guix build utils))\n" @@ -13331,29 +13342,29 @@ msgstr "" " #t)))\n" #. type: Plain text -#: doc/guix.texi:7097 +#: doc/guix.texi:7095 msgid "In this example, the @code{(guix build utils)} module is automatically pulled into the isolated build environment of our gexp, such that @code{(use-modules (guix build utils))} works as expected." msgstr "In diesem Beispiel wird das Modul @code{(guix build utils)} automatisch in die isolierte Erstellungsumgebung unseres G-Ausdrucks geholt, so dass @code{(use-modules (guix build utils))} wie erwartet funktioniert." #. type: cindex -#: doc/guix.texi:7098 +#: doc/guix.texi:7096 #, no-wrap msgid "module closure" msgstr "Modulabschluss" #. type: findex -#: doc/guix.texi:7099 +#: doc/guix.texi:7097 #, no-wrap msgid "source-module-closure" msgstr "source-module-closure" #. type: Plain text -#: doc/guix.texi:7106 +#: doc/guix.texi:7104 msgid "Usually you want the @emph{closure} of the module to be imported---i.e., the module itself and all the modules it depends on---rather than just the module; failing to do that, attempts to use the module will fail because of missing dependent modules. The @code{source-module-closure} procedure computes the closure of a module by looking at its source file headers, which comes in handy in this case:" msgstr "Normalerweise möchten Sie, dass der @emph{Abschluss} eines Moduls importiert wird — also das Modul und alle Module, von denen es abhängt — statt nur das Modul selbst. Ansonsten scheitern Versuche, das Modul zu benutzen, weil seine Modulabhängigkeiten fehlen. Die Prozedur @code{source-module-closure} berechnet den Abschluss eines Moduls, indem es den Kopf seiner Quelldatei analysiert, deswegen schafft die Prozedur hier Abhilfe:" #. type: example -#: doc/guix.texi:7109 +#: doc/guix.texi:7107 #, no-wrap msgid "" "(use-modules (guix modules)) ;for 'source-module-closure'\n" @@ -13363,7 +13374,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:7118 +#: doc/guix.texi:7116 #, no-wrap msgid "" "(with-imported-modules (source-module-closure\n" @@ -13378,31 +13389,31 @@ msgstr "" "(with-imported-modules (source-module-closure\n" " '((guix build utils)\n" " (gnu build vm)))\n" -" (gexp->derivation \"etwas-mit-vms\"\n" +" (gexp->derivation \"etwas-mit-vm\"\n" " #~(begin\n" " (use-modules (guix build utils)\n" " (gnu build vm))\n" " …)))\n" #. type: cindex -#: doc/guix.texi:7120 +#: doc/guix.texi:7118 #, no-wrap msgid "extensions, for gexps" msgstr "Erweiterungen, für G-Ausdrücke" #. type: findex -#: doc/guix.texi:7121 +#: doc/guix.texi:7119 #, no-wrap msgid "with-extensions" msgstr "with-extensions" #. type: Plain text -#: doc/guix.texi:7126 +#: doc/guix.texi:7124 msgid "In the same vein, sometimes you want to import not just pure-Scheme modules, but also ``extensions'' such as Guile bindings to C libraries or other ``full-blown'' packages. Say you need the @code{guile-json} package available on the build side, here's how you would do it:" msgstr "Auf die gleiche Art können Sie auch vorgehen, wenn Sie nicht bloß reine Scheme-Module importieren möchten, sondern auch „Erweiterungen“ wie Guile-Anbindungen von C-Bibliotheken oder andere „vollumfängliche“ Pakete. Sagen wir, Sie bräuchten das Paket @code{guile-json} auf der Erstellungsseite, dann könnten Sie es hiermit bekommen:" #. type: example -#: doc/guix.texi:7129 +#: doc/guix.texi:7127 #, no-wrap msgid "" "(use-modules (gnu packages guile)) ;for 'guile-json'\n" @@ -13412,7 +13423,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:7135 +#: doc/guix.texi:7133 #, no-wrap msgid "" "(with-extensions (list guile-json)\n" @@ -13428,184 +13439,184 @@ msgstr "" " …)))\n" #. type: Plain text -#: doc/guix.texi:7138 +#: doc/guix.texi:7136 msgid "The syntactic form to construct gexps is summarized below." msgstr "Die syntaktische Form, in der G-Ausdrücke konstruiert werden, ist im Folgenden zusammengefasst." #. type: deffn -#: doc/guix.texi:7139 +#: doc/guix.texi:7137 #, no-wrap msgid "{Scheme Syntax} #~@var{exp}" msgstr "{Scheme-Syntax} #~@var{Ausdruck}" #. type: deffnx -#: doc/guix.texi:7140 +#: doc/guix.texi:7138 #, no-wrap msgid "{Scheme Syntax} (gexp @var{exp})" msgstr "{Scheme-Syntax} (gexp @var{Ausdruck})" #. type: deffn -#: doc/guix.texi:7143 +#: doc/guix.texi:7141 msgid "Return a G-expression containing @var{exp}. @var{exp} may contain one or more of the following forms:" msgstr "Liefert einen G-Ausdruck, der den @var{Ausdruck} enthält. Der @var{Ausdruck} kann eine oder mehrere der folgenden Formen enthalten:" #. type: item -#: doc/guix.texi:7145 +#: doc/guix.texi:7143 #, no-wrap msgid "#$@var{obj}" msgstr "#$@var{Objekt}" #. type: itemx -#: doc/guix.texi:7146 +#: doc/guix.texi:7144 #, no-wrap msgid "(ungexp @var{obj})" msgstr "(ungexp @var{Objekt})" #. type: table -#: doc/guix.texi:7151 +#: doc/guix.texi:7149 msgid "Introduce a reference to @var{obj}. @var{obj} may have one of the supported types, for example a package or a derivation, in which case the @code{ungexp} form is replaced by its output file name---e.g., @code{\"/gnu/store/@dots{}-coreutils-8.22}." msgstr "Eine Referenz auf das @var{Objekt} einführen. Das @var{Objekt} kann einen der unterstützten Typen haben, zum Beispiel ein Paket oder eine Ableitung, so dass die @code{ungexp}-Form durch deren Ausgabedateiname ersetzt wird — z.B.@: @code{\"/gnu/store/…-coreutils-8.22}." #. type: table -#: doc/guix.texi:7154 +#: doc/guix.texi:7152 msgid "If @var{obj} is a list, it is traversed and references to supported objects are substituted similarly." msgstr "Wenn das @var{Objekt} eine Liste ist, wird diese durchlaufen und alle unterstützten Objekte darin auf diese Weise ersetzt." #. type: table -#: doc/guix.texi:7157 +#: doc/guix.texi:7155 msgid "If @var{obj} is another gexp, its contents are inserted and its dependencies are added to those of the containing gexp." msgstr "Wenn das @var{Objekt} ein anderer G-Ausdruck ist, wird sein Inhalt eingefügt und seine Abhängigkeiten zu denen des äußeren G-Ausdrucks hinzugefügt." #. type: table -#: doc/guix.texi:7159 +#: doc/guix.texi:7157 msgid "If @var{obj} is another kind of object, it is inserted as is." msgstr "Wenn das @var{Objekt} eine andere Art von Objekt ist, wird es so wie es ist eingefügt." #. type: item -#: doc/guix.texi:7160 +#: doc/guix.texi:7158 #, no-wrap msgid "#$@var{obj}:@var{output}" msgstr "#$@var{Objekt}:@var{Ausgabe}" #. type: itemx -#: doc/guix.texi:7161 +#: doc/guix.texi:7159 #, no-wrap msgid "(ungexp @var{obj} @var{output})" msgstr "(ungexp @var{Objekt} @var{Ausgabe})" #. type: table -#: doc/guix.texi:7165 +#: doc/guix.texi:7163 msgid "This is like the form above, but referring explicitly to the @var{output} of @var{obj}---this is useful when @var{obj} produces multiple outputs (@pxref{Packages with Multiple Outputs})." msgstr "Dies verhält sich wie die Form oben, bezieht sich aber ausdrücklich auf die angegebene @var{Ausgabe} des @var{Objekt}s — dies ist nützlich, wenn das @var{Objekt} mehrere Ausgaben generiert (siehe @ref{Packages with Multiple Outputs})." #. type: item -#: doc/guix.texi:7166 +#: doc/guix.texi:7164 #, no-wrap msgid "#+@var{obj}" msgstr "#+@var{Objekt}" #. type: itemx -#: doc/guix.texi:7167 +#: doc/guix.texi:7165 #, no-wrap msgid "#+@var{obj}:output" msgstr "#+@var{Objekt}:@var{Ausgabe}" #. type: itemx -#: doc/guix.texi:7168 +#: doc/guix.texi:7166 #, no-wrap msgid "(ungexp-native @var{obj})" msgstr "(ungexp-native @var{Objekt})" #. type: itemx -#: doc/guix.texi:7169 +#: doc/guix.texi:7167 #, no-wrap msgid "(ungexp-native @var{obj} @var{output})" msgstr "(ungexp-native @var{Objekt} @var{Ausgabe})" #. type: table -#: doc/guix.texi:7172 +#: doc/guix.texi:7170 msgid "Same as @code{ungexp}, but produces a reference to the @emph{native} build of @var{obj} when used in a cross compilation context." msgstr "Das Gleiche wie @code{ungexp}, jedoch wird im Kontext einer Cross-Kompilierung eine Referenz auf die @emph{native} Erstellung des @var{Objekt}s eingefügt." #. type: item -#: doc/guix.texi:7173 +#: doc/guix.texi:7171 #, no-wrap msgid "#$output[:@var{output}]" msgstr "#$output[:@var{Ausgabe}]" #. type: itemx -#: doc/guix.texi:7174 +#: doc/guix.texi:7172 #, no-wrap msgid "(ungexp output [@var{output}])" msgstr "(ungexp output [@var{Ausgabe}])" #. type: table -#: doc/guix.texi:7177 +#: doc/guix.texi:7175 msgid "Insert a reference to derivation output @var{output}, or to the main output when @var{output} is omitted." msgstr "Fügt eine Referenz auf die angegebene @var{Ausgabe} dieser Ableitung ein, oder auf die Hauptausgabe, wenn keine @var{Ausgabe} angegeben wurde." #. type: table -#: doc/guix.texi:7179 +#: doc/guix.texi:7177 msgid "This only makes sense for gexps passed to @code{gexp->derivation}." msgstr "Dies ist nur bei G-Ausdrücken sinnvoll, die an @code{gexp->derivation} übergeben werden." #. type: item -#: doc/guix.texi:7180 +#: doc/guix.texi:7178 #, no-wrap msgid "#$@@@var{lst}" msgstr "#$@@@var{Liste}" #. type: itemx -#: doc/guix.texi:7181 +#: doc/guix.texi:7179 #, no-wrap msgid "(ungexp-splicing @var{lst})" msgstr "(ungexp-splicing @var{Liste})" #. type: table -#: doc/guix.texi:7184 +#: doc/guix.texi:7182 msgid "Like the above, but splices the contents of @var{lst} inside the containing list." msgstr "Das Gleiche wie oben, jedoch wird nur der Inhalt der @var{Liste} in die äußere Liste eingespleißt." #. type: item -#: doc/guix.texi:7185 +#: doc/guix.texi:7183 #, no-wrap msgid "#+@@@var{lst}" msgstr "#+@@@var{Liste}" #. type: itemx -#: doc/guix.texi:7186 +#: doc/guix.texi:7184 #, no-wrap msgid "(ungexp-native-splicing @var{lst})" msgstr "(ungexp-native-splicing @var{Liste})" #. type: table -#: doc/guix.texi:7189 +#: doc/guix.texi:7187 msgid "Like the above, but refers to native builds of the objects listed in @var{lst}." msgstr "Das Gleiche, aber referenziert werden native Erstellungen der Objekte in der @var{Liste}." #. type: deffn -#: doc/guix.texi:7194 +#: doc/guix.texi:7192 msgid "G-expressions created by @code{gexp} or @code{#~} are run-time objects of the @code{gexp?} type (see below.)" msgstr "G-Ausdrücke, die mit @code{gexp} oder @code{#~} erzeugt wurden, sind zur Laufzeit Objekte vom Typ @code{gexp?} (siehe unten)." #. type: deffn -#: doc/guix.texi:7196 +#: doc/guix.texi:7194 #, no-wrap msgid "{Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{}" msgstr "{Scheme-Syntax} with-imported-modules @var{Module} @var{Rumpf}…" #. type: deffn -#: doc/guix.texi:7199 +#: doc/guix.texi:7197 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{modules} in their execution environment." msgstr "Markiert die in @var{Rumpf}…@: definierten G-Ausdrücke, dass sie in ihrer Ausführungsumgebung die angegebenen @var{Module} brauchen." #. type: deffn -#: doc/guix.texi:7203 +#: doc/guix.texi:7201 msgid "Each item in @var{modules} can be the name of a module, such as @code{(guix build utils)}, or it can be a module name, followed by an arrow, followed by a file-like object:" msgstr "Jedes Objekt unter den @var{Module}n kann der Name eines Moduls wie @code{(guix build utils)} sein, oder es kann nacheinander ein Modulname, ein Pfeil und ein dateiartiges Objekt sein:" #. type: example -#: doc/guix.texi:7209 +#: doc/guix.texi:7207 #, no-wrap msgid "" "`((guix build utils)\n" @@ -13619,80 +13630,80 @@ msgstr "" " #~(define-module …))))\n" #. type: deffn -#: doc/guix.texi:7214 +#: doc/guix.texi:7212 msgid "In the example above, the first two modules are taken from the search path, and the last one is created from the given file-like object." msgstr "Im Beispiel oben werden die ersten beiden Module vom Suchpfad genommen und das letzte aus dem angegebenen dateiartigen Objekt erzeugt." #. type: deffn -#: doc/guix.texi:7218 +#: doc/guix.texi:7216 msgid "This form has @emph{lexical} scope: it has an effect on the gexps directly defined in @var{body}@dots{}, but not on those defined, say, in procedures called from @var{body}@dots{}." msgstr "Diese Form hat einen @emph{lexikalischen} Sichtbarkeitsbereich: Sie wirkt sich auf die direkt in @var{Rumpf}…@: definierten G-Ausdrücke aus, aber nicht auf jene, die, sagen wir, in aus @var{Rumpf}…@: heraus aufgerufenen Prozeduren definiert wurden." #. type: deffn -#: doc/guix.texi:7220 +#: doc/guix.texi:7218 #, no-wrap msgid "{Scheme Syntax} with-extensions @var{extensions} @var{body}@dots{}" msgstr "{Scheme-Syntax} with-extensions @var{Erweiterungen} @var{Rumpf}…" #. type: deffn -#: doc/guix.texi:7225 +#: doc/guix.texi:7223 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{extensions} in their build and execution environment. @var{extensions} is typically a list of package objects such as those defined in the @code{(gnu packages guile)} module." msgstr "Markiert die in @var{Rumpf}…@: definierten G-Ausdrücke, dass sie @var{Erweiterungen} in ihrer Erstellungs- und Ausführungsumgebung benötigen. @var{Erweiterungen} sind typischerweise eine Liste von Paketobjekten wie zum Beispiel die im Modul @code{(gnu packages guile)} definierten." #. type: deffn -#: doc/guix.texi:7230 +#: doc/guix.texi:7228 msgid "Concretely, the packages listed in @var{extensions} are added to the load path while compiling imported modules in @var{body}@dots{}; they are also added to the load path of the gexp returned by @var{body}@dots{}." msgstr "Konkret werden die unter den @var{Erweiterungen} aufgeführten Pakete zum Ladepfad hinzugefügt, während die in @var{Rumpf}…@: aufgeführten importierten Module kompiliert werden und sie werden auch zum Ladepfad des von @var{Rumpf}…@: gelieferten G-Ausdrucks hinzugefügt." #. type: deffn -#: doc/guix.texi:7232 +#: doc/guix.texi:7230 #, no-wrap msgid "{Scheme Procedure} gexp? @var{obj}" msgstr "{Scheme-Prozedur} gexp? @var{Objekt}" #. type: deffn -#: doc/guix.texi:7234 +#: doc/guix.texi:7232 msgid "Return @code{#t} if @var{obj} is a G-expression." msgstr "Liefert @code{#t}, wenn das @var{Objekt} ein G-Ausdruck ist." #. type: Plain text -#: doc/guix.texi:7240 +#: doc/guix.texi:7238 msgid "G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store. The monadic procedures below allow you to do that (@pxref{The Store Monad}, for more information about monads.)" msgstr "G-Ausdrücke sind dazu gedacht, auf die Platte geschrieben zu werden, entweder als Code, der eine Ableitung erstellt, oder als einfache Dateien im Store. Die monadischen Prozeduren unten ermöglichen Ihnen das (siehe @ref{The Store Monad}, wenn Sie mehr Informationen über Monaden suchen)." #. type: deffn -#: doc/guix.texi:7241 +#: doc/guix.texi:7239 #, no-wrap msgid "{Monadic Procedure} gexp->derivation @var{name} @var{exp} @" msgstr "{Monadische Prozedur} gexp->derivation @var{Name} @var{Ausdruck} @" #. type: deffn -#: doc/guix.texi:7259 +#: doc/guix.texi:7257 msgid "[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:module-path @var{%load-path}] @ [#:effective-version \"2.2\"] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] [#:substitutable? #t] @ [#:properties '()] [#:guile-for-build #f] Return a derivation @var{name} that runs @var{exp} (a gexp) with @var{guile-for-build} (a derivation) on @var{system}; @var{exp} is stored in a file called @var{script-name}. When @var{target} is true, it is used as the cross-compilation target triplet for packages referred to by @var{exp}." msgstr "[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:module-path @var{%load-path}] @ [#:effective-version \"2.2\"] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{Name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] [#:substitutable? #t] @ [#:properties '()] [#:guile-for-build #f] Liefert eine Ableitung unter dem @var{Name}n, die jeden @var{Ausdruck} (ein G-Ausdruck) mit @var{guile-for-build} (eine Ableitung) für das @var{System} erstellt; der @var{Ausdruck} wird dabei in einer Datei namens @var{script-name} gespeichert. Wenn „@var{target}“ wahr ist, wird es beim Cross-Kompilieren als Zieltripel für mit @var{Ausdruck} bezeichnete Pakete benutzt." #. type: deffn -#: doc/guix.texi:7267 +#: doc/guix.texi:7265 msgid "@var{modules} is deprecated in favor of @code{with-imported-modules}. Its meaning is to make @var{modules} available in the evaluation context of @var{exp}; @var{modules} is a list of names of Guile modules searched in @var{module-path} to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}." msgstr "@var{modules} gilt als veraltet; stattdessen sollte @code{with-imported-modules} benutzt werden. Die Bedeutung ist, dass die @var{Module} im Ausführungskontext des @var{Ausdruck}s verfügbar gemacht werden; @var{modules} ist dabei eine Liste von Namen von Guile-Modulen, die im Modulpfad @var{module-path} gesucht werden, um sie in den Store zu kopieren, zu kompilieren und im Ladepfad während der Ausführung des @var{Ausdruck}s verfügbar zu machen — z.B.@: @code{((guix build utils) (guix build gnu-build-system))}." #. type: deffn -#: doc/guix.texi:7270 +#: doc/guix.texi:7268 msgid "@var{effective-version} determines the string to use when adding extensions of @var{exp} (see @code{with-extensions}) to the search path---e.g., @code{\"2.2\"}." msgstr "@var{effective-version} bestimmt, unter welcher Zeichenkette die Erweiterungen des @var{Ausdruck}s zum Suchpfad hinzugefügt werden (siehe @code{with-extensions}) — z.B.@: @code{\"2.2\"}." #. type: deffn -#: doc/guix.texi:7273 +#: doc/guix.texi:7271 msgid "@var{graft?} determines whether packages referred to by @var{exp} should be grafted when applicable." msgstr "@var{graft?} bestimmt, ob vom @var{Ausdruck} benannte Pakete veredelt werden sollen, falls Veredelungen zur Verfügung stehen." #. type: deffn -#: doc/guix.texi:7276 +#: doc/guix.texi:7274 msgid "When @var{references-graphs} is true, it must be a list of tuples of one of the following forms:" msgstr "Ist @var{references-graphs} wahr, muss es eine Liste von Tupeln in einer der folgenden Formen sein:" #. type: example -#: doc/guix.texi:7283 +#: doc/guix.texi:7281 #, no-wrap msgid "" "(@var{file-name} @var{package})\n" @@ -13708,38 +13719,38 @@ msgstr "" "(@var{Dateiname} @var{Store-Objekt})\n" #. type: deffn -#: doc/guix.texi:7289 +#: doc/guix.texi:7287 msgid "The right-hand-side of each element of @var{references-graphs} is automatically made an input of the build process of @var{exp}. In the build environment, each @var{file-name} contains the reference graph of the corresponding item, in a simple text format." msgstr "Bei jedem Element von @var{references-graphs} wird das rechts Stehende automatisch zu einer Eingabe des Erstellungsprozesses vom @var{Ausdruck} gemacht. In der Erstellungsumgebung enthält das, was mit @var{Dateiname} bezeichnet wird, den Referenzgraphen des entsprechenden Objekts in einem einfachen Textformat." #. type: deffn -#: doc/guix.texi:7295 +#: doc/guix.texi:7293 msgid "@var{allowed-references} must be either @code{#f} or a list of output names and packages. In the latter case, the list denotes store items that the result is allowed to refer to. Any reference to another store item will lead to a build error. Similarly for @var{disallowed-references}, which can list items that must not be referenced by the outputs." msgstr "@var{allowed-references} muss entweder @code{#f} oder eine Liste von Ausgabenamen und Paketen sein. Eine solche Liste benennt Store-Objekte, die das Ergebnis referenzieren darf. Jede Referenz auf ein nicht dort aufgeführtes Store-Objekt löst einen Erstellungsfehler aus. Genauso funktioniert @var{disallowed-references}, was eine Liste von Objekten sein kann, die von den Ausgaben nicht referenziert werden dürfen." #. type: deffn -#: doc/guix.texi:7298 +#: doc/guix.texi:7296 msgid "@var{deprecation-warnings} determines whether to show deprecation warnings while compiling modules. It can be @code{#f}, @code{#t}, or @code{'detailed}." msgstr "@var{deprecation-warnings} bestimmt, ob beim Kompilieren von Modulen Warnungen angezeigt werden sollen, wenn auf als veraltet markierten Code zugegriffen wird („deprecation warnings“). @var{deprecation-warnings} kann @code{#f}, @code{#t} oder @code{'detailed} (detailliert) sein." #. type: deffn -#: doc/guix.texi:7300 +#: doc/guix.texi:7298 msgid "The other arguments are as for @code{derivation} (@pxref{Derivations})." msgstr "Die anderen Argumente verhalten sich wie bei @code{derivation} (siehe @ref{Derivations})." #. type: cindex -#: doc/guix.texi:7302 +#: doc/guix.texi:7300 #, no-wrap msgid "file-like objects" msgstr "dateiartige Objekte" #. type: Plain text -#: doc/guix.texi:7307 +#: doc/guix.texi:7305 msgid "The @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file}, and @code{scheme-file} procedures below return @dfn{file-like objects}. That is, when unquoted in a G-expression, these objects lead to a file in the store. Consider this G-expression:" msgstr "Die im Folgenden erklärten Prozeduren @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file} und @code{scheme-file} liefern @dfn{dateiartige Objekte}. Das bedeutet, dass diese Objekte, wenn sie in einem G-Ausdruck demaskiert werden, zu einer Datei im Store führen. Betrachten Sie zum Beispiel diesen G-Ausdruck:" #. type: example -#: doc/guix.texi:7311 +#: doc/guix.texi:7309 #, no-wrap msgid "" "#~(system* #$(file-append glibc \"/sbin/nscd\") \"-f\"\n" @@ -13749,76 +13760,76 @@ msgstr "" " #$(local-file \"/tmp/my-nscd.conf\"))\n" #. type: Plain text -#: doc/guix.texi:7320 +#: doc/guix.texi:7318 msgid "The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it to the store. Once expanded, for instance @i{via} @code{gexp->derivation}, the G-expression refers to that copy under @file{/gnu/store}; thus, modifying or removing the file in @file{/tmp} does not have any effect on what the G-expression does. @code{plain-file} can be used similarly; it differs in that the file content is directly passed as a string." msgstr "Der Effekt hiervon ist, dass @file{/tmp/my-nscd.conf} „interniert“ wird, indem es in den Store kopiert wird. Sobald er umgeschrieben wurde, zum Beispiel über @code{gexp->derivation}, referenziert der G-Ausdruck diese Kopie im @file{/gnu/store}. Die Datei in @file{/tmp} zu bearbeiten oder zu löschen, hat dann keinen Effekt mehr darauf, was der G-Ausdruck tut. @code{plain-file} kann in ähnlicher Weise benutzt werden, es unterscheidet sich aber darin, dass dort der Prozedur der Inhalt der Datei als eine Zeichenkette übergeben wird." #. type: deffn -#: doc/guix.texi:7321 +#: doc/guix.texi:7319 #, no-wrap msgid "{Scheme Procedure} local-file @var{file} [@var{name}] @" msgstr "{Scheme-Prozedur} local-file @var{Datei} [@var{Name}] @" #. type: deffn -#: doc/guix.texi:7327 +#: doc/guix.texi:7325 msgid "[#:recursive? #f] [#:select? (const #t)] Return an object representing local file @var{file} to add to the store; this object can be used in a gexp. If @var{file} is a relative file name, it is looked up relative to the source file where this form appears. @var{file} will be added to the store under @var{name}--by default the base name of @var{file}." msgstr "[#:recursive? #f] [#:select? (const #t)] Liefert ein Objekt, dass die lokale Datei @var{Datei} repräsentiert und sie zum Store hinzufügen lässt; dieses Objekt kann in einem G-Ausdruck benutzt werden. Wurde für die @var{Datei} ein relativer Dateiname angegeben, wird sie relativ zur Quelldatei gesucht, in der diese Form steht. Die @var{Datei} wird unter dem angegebenen @var{Name}n im Store abgelegt — als Vorgabe wird dabei der Basisname der @var{Datei} genommen." #. type: deffn -#: doc/guix.texi:7339 +#: doc/guix.texi:7337 msgid "This is the declarative counterpart of the @code{interned-file} monadic procedure (@pxref{The Store Monad, @code{interned-file}})." msgstr "Dies ist das deklarative Gegenstück zur monadischen Prozedur @code{interned-file} (siehe @ref{The Store Monad, @code{interned-file}})." #. type: deffn -#: doc/guix.texi:7341 +#: doc/guix.texi:7339 #, no-wrap msgid "{Scheme Procedure} plain-file @var{name} @var{content}" msgstr "{Scheme-Prozedur} plain-file @var{Name} @var{Inhalt}" #. type: deffn -#: doc/guix.texi:7344 +#: doc/guix.texi:7342 msgid "Return an object representing a text file called @var{name} with the given @var{content} (a string or a bytevector) to be added to the store." msgstr "Liefert ein Objekt, das eine Textdatei mit dem angegebenen @var{Name}n repräsentiert, die den angegebenen @var{Inhalt} hat (eine Zeichenkette oder ein Bytevektor), welche zum Store hinzugefügt werden soll." #. type: deffn -#: doc/guix.texi:7346 +#: doc/guix.texi:7344 msgid "This is the declarative counterpart of @code{text-file}." msgstr "Dies ist das deklarative Gegenstück zu @code{text-file}." #. type: deffn -#: doc/guix.texi:7348 +#: doc/guix.texi:7346 #, no-wrap msgid "{Scheme Procedure} computed-file @var{name} @var{gexp} @" msgstr "{Scheme-Prozedur} computed-file @var{Name} @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:7353 +#: doc/guix.texi:7351 msgid "[#:options '(#:local-build? #t)] Return an object representing the store item @var{name}, a file or directory computed by @var{gexp}. @var{options} is a list of additional arguments to pass to @code{gexp->derivation}." msgstr "[#:options '(#:local-build? #t)] Liefert ein Objekt, das das Store-Objekt mit dem @var{Name}n repräsentiert, eine Datei oder ein Verzeichnis, das vom @var{G-Ausdruck} berechnet wurde. @var{options} ist eine Liste zusätzlicher Argumente, die an @code{gexp->derivation} übergeben werden." #. type: deffn -#: doc/guix.texi:7355 +#: doc/guix.texi:7353 msgid "This is the declarative counterpart of @code{gexp->derivation}." msgstr "Dies ist das deklarative Gegenstück zu @code{gexp->derivation}." #. type: deffn -#: doc/guix.texi:7357 +#: doc/guix.texi:7355 #, no-wrap msgid "{Monadic Procedure} gexp->script @var{name} @var{exp} @" msgstr "{Monadische Prozedur} gexp->script @var{Name} @var{Ausdruck} @" #. type: deffn -#: doc/guix.texi:7362 +#: doc/guix.texi:7360 msgid "[#:guile (default-guile)] [#:module-path %load-path] Return an executable script @var{name} that runs @var{exp} using @var{guile}, with @var{exp}'s imported modules in its search path. Look up @var{exp}'s modules in @var{module-path}." msgstr "[#:guile (default-guile)] [#:module-path %load-path] Liefert ein ausführbares Skript namens @var{Name}, das den @var{Ausdruck} mit dem angegebenen @var{guile} ausführt, wobei vom @var{Ausdruck} importierte Module in seinem Suchpfad stehen. Die Module des @var{Ausdruck}s werden dazu im Modulpfad @var{module-path} gesucht." #. type: deffn -#: doc/guix.texi:7365 +#: doc/guix.texi:7363 msgid "The example below builds a script that simply invokes the @command{ls} command:" msgstr "Folgendes Beispiel erstellt ein Skript, das einfach nur den Befehl @command{ls} ausführt:" #. type: example -#: doc/guix.texi:7368 +#: doc/guix.texi:7366 #, no-wrap msgid "" "(use-modules (guix gexp) (gnu packages base))\n" @@ -13828,7 +13839,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:7372 +#: doc/guix.texi:7370 #, no-wrap msgid "" "(gexp->script \"list-files\"\n" @@ -13840,12 +13851,12 @@ msgstr "" " \"ls\"))\n" #. type: deffn -#: doc/guix.texi:7377 +#: doc/guix.texi:7375 msgid "When ``running'' it through the store (@pxref{The Store Monad, @code{run-with-store}}), we obtain a derivation that produces an executable file @file{/gnu/store/@dots{}-list-files} along these lines:" msgstr "Lässt man es durch den Store „laufen“ (siehe @ref{The Store Monad, @code{run-with-store}}), erhalten wir eine Ableitung, die eine ausführbare Datei @file{/gnu/store/…-list-files} generiert, ungefähr so:" #. type: example -#: doc/guix.texi:7382 +#: doc/guix.texi:7380 #, no-wrap msgid "" "#!/gnu/store/@dots{}-guile-2.0.11/bin/guile -ds\n" @@ -13857,76 +13868,76 @@ msgstr "" "(execl \"/gnu/store/…-coreutils-8.22\"/bin/ls\" \"ls\")\n" #. type: deffn -#: doc/guix.texi:7385 +#: doc/guix.texi:7383 #, no-wrap msgid "{Scheme Procedure} program-file @var{name} @var{exp} @" msgstr "{Scheme-Prozedur} program-file @var{Name} @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:7390 +#: doc/guix.texi:7388 msgid "[#:guile #f] [#:module-path %load-path] Return an object representing the executable store item @var{name} that runs @var{gexp}. @var{guile} is the Guile package used to execute that script. Imported modules of @var{gexp} are looked up in @var{module-path}." msgstr "[#:guile #f] [#:module-path %load-path] Liefert ein Objekt, das eine ausführbare Store-Datei @var{Name} repräsentiert, die den @var{G-Ausdruck} ausführt. @var{guile} ist das zu verwendende Guile-Paket, mit dem das Skript ausgeführt werden kann. Importierte Module des @var{G-Ausdruck}s werden im Modulpfad @var{module-path} gesucht." #. type: deffn -#: doc/guix.texi:7392 +#: doc/guix.texi:7390 msgid "This is the declarative counterpart of @code{gexp->script}." msgstr "Dies ist das deklarative Gegenstück zu @code{gexp->script}." #. type: deffn -#: doc/guix.texi:7394 +#: doc/guix.texi:7392 #, no-wrap msgid "{Monadic Procedure} gexp->file @var{name} @var{exp} @" msgstr "{Monadische Prozedur} gexp->file @var{Name} @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:7401 +#: doc/guix.texi:7399 msgid "[#:set-load-path? #t] [#:module-path %load-path] @ [#:splice? #f] @ [#:guile (default-guile)] Return a derivation that builds a file @var{name} containing @var{exp}. When @var{splice?} is true, @var{exp} is considered to be a list of expressions that will be spliced in the resulting file." msgstr "[#:set-load-path? #t] [#:module-path %load-path] @ [#:splice? #f] @ [#:guile (default-guile)] Liefert eine Ableitung, die eine Datei @var{Name} erstellen wird, deren Inhalt der @var{G-Ausdruck} ist. Ist @var{splice?} wahr, dann wird @var{G-Ausdruck} stattdessen als eine Liste von mehreren G-Ausdrücken behandelt, die alle in die resultierende Datei gespleißt werden." #. type: deffn -#: doc/guix.texi:7406 +#: doc/guix.texi:7404 msgid "When @var{set-load-path?} is true, emit code in the resulting file to set @code{%load-path} and @code{%load-compiled-path} to honor @var{exp}'s imported modules. Look up @var{exp}'s modules in @var{module-path}." msgstr "Ist @var{set-load-path?} wahr, wird in die resultierende Datei Code hinzugefügt, der den Ladepfad @code{%load-path} und den Ladepfad für kompilierte Dateien @code{%load-compiled-path} festlegt, die für die importierten Module des @var{G-Ausdruck}s nötig sind. Die Module des @var{G-Ausdruck}s werden im Modulpfad @var{module-path} gesucht." #. type: deffn -#: doc/guix.texi:7409 +#: doc/guix.texi:7407 msgid "The resulting file holds references to all the dependencies of @var{exp} or a subset thereof." msgstr "Die resultierende Datei referenziert alle Abhängigkeiten des @var{G-Ausdruck}s oder eine Teilmenge davon." #. type: deffn -#: doc/guix.texi:7411 +#: doc/guix.texi:7409 #, no-wrap msgid "{Scheme Procedure} scheme-file @var{name} @var{exp} [#:splice? #f]" msgstr "{Scheme-Prozedur} scheme-file @var{Name} @var{G-Ausdruck} [#:splice? #f]" #. type: deffn -#: doc/guix.texi:7414 +#: doc/guix.texi:7412 msgid "Return an object representing the Scheme file @var{name} that contains @var{exp}." msgstr "Liefert ein Objekt, das die Scheme-Datei @var{Name} mit dem @var{G-Ausdruck} als Inhalt repräsentiert." #. type: deffn -#: doc/guix.texi:7416 +#: doc/guix.texi:7414 msgid "This is the declarative counterpart of @code{gexp->file}." msgstr "Dies ist das deklarative Gegenstück zu @code{gexp->file}." #. type: deffn -#: doc/guix.texi:7418 +#: doc/guix.texi:7416 #, no-wrap msgid "{Monadic Procedure} text-file* @var{name} @var{text} @dots{}" msgstr "{Monadische Prozedur} text-file* @var{Name} @var{Text} …" #. type: deffn -#: doc/guix.texi:7424 +#: doc/guix.texi:7422 msgid "Return as a monadic value a derivation that builds a text file containing all of @var{text}. @var{text} may list, in addition to strings, objects of any type that can be used in a gexp: packages, derivations, local file objects, etc. The resulting store file holds references to all these." msgstr "Liefert eine Ableitung als monadischen Wert, welche eine Textdatei erstellt, in der der gesamte @var{Text} enthalten ist. @var{Text} kann eine Folge nicht nur von Zeichenketten, sondern auch Objekten beliebigen Typs sein, die in einem G-Ausdruck benutzt werden können, also Paketen, Ableitungen, Objekte lokaler Dateien und so weiter. Die resultierende Store-Datei referenziert alle davon." #. type: deffn -#: doc/guix.texi:7429 +#: doc/guix.texi:7427 msgid "This variant should be preferred over @code{text-file} anytime the file to create will reference items from the store. This is typically the case when building a configuration file that embeds store file names, like this:" msgstr "Diese Variante sollte gegenüber @code{text-file} bevorzugt verwendet werden, wann immer die zu erstellende Datei Objekte im Store referenzieren wird. Typischerweise ist das der Fall, wenn eine Konfigurationsdatei erstellt wird, die Namen von Store-Dateien enthält, so wie hier:" #. type: example -#: doc/guix.texi:7437 +#: doc/guix.texi:7435 #, no-wrap msgid "" "(define (profile.sh)\n" @@ -13944,23 +13955,23 @@ msgstr "" " grep \"/bin:\" sed \"/bin\\n\"))\n" #. type: deffn -#: doc/guix.texi:7442 +#: doc/guix.texi:7440 msgid "In this example, the resulting @file{/gnu/store/@dots{}-profile.sh} file will reference @var{coreutils}, @var{grep}, and @var{sed}, thereby preventing them from being garbage-collected during its lifetime." msgstr "In diesem Beispiel wird die resultierende Datei @file{/gnu/store/…-profile.sh} sowohl @var{coreutils}, @var{grep} als auch @var{sed} referenzieren, so dass der Müllsammler diese nicht löscht, während die resultierende Datei noch lebendig ist." #. type: deffn -#: doc/guix.texi:7444 +#: doc/guix.texi:7442 #, no-wrap msgid "{Scheme Procedure} mixed-text-file @var{name} @var{text} @dots{}" msgstr "{Scheme-Prozedur} mixed-text-file @var{Name} @var{Text} …" #. type: deffn -#: doc/guix.texi:7448 +#: doc/guix.texi:7446 msgid "Return an object representing store file @var{name} containing @var{text}. @var{text} is a sequence of strings and file-like objects, as in:" msgstr "Liefert ein Objekt, was die Store-Datei @var{Name} repräsentiert, die @var{Text} enthält. @var{Text} ist dabei eine Folge von Zeichenketten und dateiartigen Objekten wie zum Beispiel:" #. type: example -#: doc/guix.texi:7452 +#: doc/guix.texi:7450 #, no-wrap msgid "" "(mixed-text-file \"profile\"\n" @@ -13970,23 +13981,23 @@ msgstr "" " \"export PATH=\" coreutils \"/bin:\" grep \"/bin\")\n" #. type: deffn -#: doc/guix.texi:7455 +#: doc/guix.texi:7453 msgid "This is the declarative counterpart of @code{text-file*}." msgstr "Dies ist das deklarative Gegenstück zu @code{text-file*}." #. type: deffn -#: doc/guix.texi:7457 +#: doc/guix.texi:7455 #, no-wrap msgid "{Scheme Procedure} file-union @var{name} @var{files}" msgstr "{Scheme-Prozedur} file-union @var{Name} @var{Dateien}" #. type: deffn -#: doc/guix.texi:7462 +#: doc/guix.texi:7460 msgid "Return a @code{} that builds a directory containing all of @var{files}. Each item in @var{files} must be a two-element list where the first element is the file name to use in the new directory, and the second element is a gexp denoting the target file. Here's an example:" msgstr "Liefert ein @code{}, das ein Verzeichnis mit allen @var{Dateien} enthält. Jedes Objekt in @var{Dateien} muss eine zweielementige Liste sein, deren erstes Element der im neuen Verzeichnis zu benutzende Dateiname ist und deren zweites Element ein G-Ausdruck ist, der die Zieldatei benennt. Hier ist ein Beispiel:" #. type: example -#: doc/guix.texi:7469 +#: doc/guix.texi:7467 #, no-wrap msgid "" "(file-union \"etc\"\n" @@ -14002,50 +14013,50 @@ msgstr "" " \"alias ls='ls --color=auto'\"))))\n" #. type: deffn -#: doc/guix.texi:7472 +#: doc/guix.texi:7470 msgid "This yields an @code{etc} directory containing these two files." msgstr "Dies liefert ein Verzeichnis @code{etc}, das zwei Dateien enthält." #. type: deffn -#: doc/guix.texi:7474 +#: doc/guix.texi:7472 #, no-wrap msgid "{Scheme Procedure} directory-union @var{name} @var{things}" msgstr "{Scheme-Prozedur} directory-union @var{Name} @var{Dinge}" #. type: deffn -#: doc/guix.texi:7477 +#: doc/guix.texi:7475 msgid "Return a directory that is the union of @var{things}, where @var{things} is a list of file-like objects denoting directories. For example:" msgstr "Liefert ein Verzeichnis, was die Vereinigung (englisch „Union“) der @var{Dinge} darstellt, wobei @var{Dinge} eine Liste dateiartiger Objekte sein muss, die Verzeichnisse bezeichnen. Zum Beispiel:" #. type: example -#: doc/guix.texi:7480 +#: doc/guix.texi:7478 #, no-wrap msgid "(directory-union \"guile+emacs\" (list guile emacs))\n" msgstr "(directory-union \"guile+emacs\" (list guile emacs))\n" #. type: deffn -#: doc/guix.texi:7483 +#: doc/guix.texi:7481 msgid "yields a directory that is the union of the @code{guile} and @code{emacs} packages." msgstr "Das liefert ein Verzeichnis, welches die Vereinigung der Pakete @code{guile} und @code{emacs} ist." #. type: deffn -#: doc/guix.texi:7485 +#: doc/guix.texi:7483 #, no-wrap msgid "{Scheme Procedure} file-append @var{obj} @var{suffix} @dots{}" msgstr "{Scheme-Prozedur} file-append @var{Objekt} @var{Suffix} …" #. type: deffn -#: doc/guix.texi:7489 +#: doc/guix.texi:7487 msgid "Return a file-like object that expands to the concatenation of @var{obj} and @var{suffix}, where @var{obj} is a lowerable object and each @var{suffix} is a string." msgstr "Liefert ein dateiartiges Objekt, das zur Aneinanderreihung von @var{Objekt} und @var{Suffix} umgeschrieben wird, wobei das @var{Objekt} ein herunterbrechbares Objekt und jedes @var{Suffix} eine Zeichenkette sein muss." #. type: deffn -#: doc/guix.texi:7491 +#: doc/guix.texi:7489 msgid "As an example, consider this gexp:" msgstr "Betrachten Sie zum Beispiel diesen G-Ausdruck:" #. type: example -#: doc/guix.texi:7496 +#: doc/guix.texi:7494 #, no-wrap msgid "" "(gexp->script \"run-uname\"\n" @@ -14057,12 +14068,12 @@ msgstr "" " \"/bin/uname\")))\n" #. type: deffn -#: doc/guix.texi:7499 +#: doc/guix.texi:7497 msgid "The same effect could be achieved with:" msgstr "Denselben Effekt könnte man erreichen mit:" #. type: example -#: doc/guix.texi:7504 +#: doc/guix.texi:7502 #, no-wrap msgid "" "(gexp->script \"run-uname\"\n" @@ -14074,50 +14085,50 @@ msgstr "" " \"/bin/uname\")))\n" #. type: deffn -#: doc/guix.texi:7510 +#: doc/guix.texi:7508 msgid "There is one difference though: in the @code{file-append} case, the resulting script contains the absolute file name as a string, whereas in the second case, the resulting script contains a @code{(string-append @dots{})} expression to construct the file name @emph{at run time}." msgstr "Es gibt jedoch einen Unterschied, nämlich enthält das resultierende Skript bei @code{file-append} tatsächlich den absoluten Dateinamen als Zeichenkette, während im anderen Fall das resultierende Skript einen Ausdruck @code{(string-append …)} enthält, der den Dateinamen erst @emph{zur Laufzeit} zusammensetzt." #. type: Plain text -#: doc/guix.texi:7517 +#: doc/guix.texi:7515 msgid "Of course, in addition to gexps embedded in ``host'' code, there are also modules containing build tools. To make it clear that they are meant to be used in the build stratum, these modules are kept in the @code{(guix build @dots{})} name space." msgstr "Natürlich gibt es zusätzlich zu in „wirtsseitigem“ Code eingebetteten G-Ausdrücken auch Module mit „erstellungsseitig“ nutzbaren Werkzeugen. Um klarzustellen, dass sie dafür gedacht sind, in der Erstellungsschicht benutzt zu werden, bleiben diese Module im Namensraum @code{(guix build …)}." #. type: Plain text -#: doc/guix.texi:7523 +#: doc/guix.texi:7521 msgid "Internally, high-level objects are @dfn{lowered}, using their compiler, to either derivations or store items. For instance, lowering a package yields a derivation, and lowering a @code{plain-file} yields a store item. This is achieved using the @code{lower-object} monadic procedure." msgstr "Intern werden hochsprachliche, abstrakte Objekte mit ihrem Compiler entweder zu Ableitungen oder zu Store-Objekten @dfn{heruntergebrochen}. Wird zum Beispiel ein Paket heruntergebrochen, bekommt man eine Ableitung, während ein @code{plain-file} zu einem Store-Objekt heruntergebrochen wird. Das wird mit der monadischen Prozedur @code{lower-object} bewerkstelligt." #. type: deffn -#: doc/guix.texi:7524 +#: doc/guix.texi:7522 #, no-wrap msgid "{Monadic Procedure} lower-object @var{obj} [@var{system}] @" msgstr "{Monadische Prozedur} lower-object @var{Objekt} [@var{System}] @" #. type: deffn -#: doc/guix.texi:7530 +#: doc/guix.texi:7528 msgid "[#:target #f] Return as a value in @var{%store-monad} the derivation or store item corresponding to @var{obj} for @var{system}, cross-compiling for @var{target} if @var{target} is true. @var{obj} must be an object that has an associated gexp compiler, such as a @code{}." msgstr "[#:target #f] Liefert die Ableitung oder das Store-Objekt, das dem @var{Objekt} für @var{System} als Wert in der Store-Monade @var{%store-monad} entspricht, cross-kompiliert für das Zieltripel @var{target}, wenn @var{target} wahr ist. Das @var{Objekt} muss ein Objekt sein, für das es einen mit ihm assoziierten G-Ausdruck-Compiler gibt, wie zum Beispiel ein @code{}." #. type: section -#: doc/guix.texi:7533 +#: doc/guix.texi:7531 #, no-wrap msgid "Invoking @command{guix repl}" msgstr "@command{guix repl} aufrufen" #. type: cindex -#: doc/guix.texi:7535 +#: doc/guix.texi:7533 #, no-wrap msgid "REPL, read-eval-print loop" msgstr "REPL (Lese-Auswerten-Schreiben-Schleife)" #. type: Plain text -#: doc/guix.texi:7541 +#: doc/guix.texi:7539 msgid "The @command{guix repl} command spawns a Guile @dfn{read-eval-print loop} (REPL) for interactive programming (@pxref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}). Compared to just launching the @command{guile} command, @command{guix repl} guarantees that all the Guix modules and all its dependencies are available in the search path. You can use it this way:" msgstr "Der Befehl @command{guix repl} startet eine Guile-REPL (@dfn{Read-Eval-Print Loop}, kurz REPL, deutsch Lese-Auswerten-Schreiben-Schleife) zur interaktiven Programmierung (siehe @ref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}). Im Vergleich dazu, einfach den Befehl @command{guile} aufzurufen, garantiert @command{guix repl}, dass alle Guix-Module und deren Abhängigkeiten im Suchpfad verfügbar sind. Sie können die REPL so benutzen:" #. type: example -#: doc/guix.texi:7547 +#: doc/guix.texi:7545 #, no-wrap msgid "" "$ guix repl\n" @@ -14131,127 +14142,127 @@ msgstr "" "$1 = #\n" #. type: Plain text -#: doc/guix.texi:7554 +#: doc/guix.texi:7552 msgid "In addition, @command{guix repl} implements a simple machine-readable REPL protocol for use by @code{(guix inferior)}, a facility to interact with @dfn{inferiors}, separate processes running a potentially different revision of Guix." msgstr "@command{guix repl} implementiert zusätzlich ein einfaches maschinenlesbares Protokoll für die REPL, das von @code{(guix inferior)} benutzt wird, um mit @dfn{Untergeordneten} zu interagieren, also mit getrennten Prozessen einer womöglich anderen Version von Guix." #. type: Plain text -#: doc/guix.texi:7556 +#: doc/guix.texi:7554 msgid "The available options are as follows:" msgstr "Folgende @var{Optionen} gibt es:" #. type: item -#: doc/guix.texi:7558 doc/guix.texi:9518 +#: doc/guix.texi:7556 doc/guix.texi:9516 #, no-wrap msgid "--type=@var{type}" msgstr "--type=@var{Typ}" #. type: itemx -#: doc/guix.texi:7559 doc/guix.texi:9519 doc/guix.texi:24575 +#: doc/guix.texi:7557 doc/guix.texi:9517 doc/guix.texi:24566 #, no-wrap msgid "-t @var{type}" msgstr "-t @var{Typ}" #. type: table -#: doc/guix.texi:7561 +#: doc/guix.texi:7559 msgid "Start a REPL of the given @var{TYPE}, which can be one of the following:" msgstr "Startet eine REPL des angegebenen @var{Typ}s, der einer der Folgenden sein darf:" #. type: item -#: doc/guix.texi:7563 +#: doc/guix.texi:7561 #, no-wrap msgid "guile" msgstr "guile" #. type: table -#: doc/guix.texi:7565 +#: doc/guix.texi:7563 msgid "This is default, and it spawns a standard full-featured Guile REPL." msgstr "Die Voreinstellung, mit der eine normale, voll funktionsfähige Guile-REPL gestartet wird." #. type: item -#: doc/guix.texi:7565 +#: doc/guix.texi:7563 #, no-wrap msgid "machine" msgstr "machine" #. type: table -#: doc/guix.texi:7568 +#: doc/guix.texi:7566 msgid "Spawn a REPL that uses the machine-readable protocol. This is the protocol that the @code{(guix inferior)} module speaks." msgstr "Startet eine REPL, die ein maschinenlesbares Protokoll benutzt. Dieses Protokoll wird vom Modul @code{(guix inferior)} gesprochen." #. type: table -#: doc/guix.texi:7574 +#: doc/guix.texi:7572 msgid "By default, @command{guix repl} reads from standard input and writes to standard output. When this option is passed, it will instead listen for connections on @var{endpoint}. Here are examples of valid options:" msgstr "Der Vorgabe nach würde @command{guix repl} von der Standardeingabe lesen und auf die Standardausgabe schreiben. Wird diese Befehlszeilenoption angegeben, lauscht die REPL stattdessen auf dem @var{Endpunkt} auf Verbindungen. Hier sind Beispiele gültiger Befehlszeilenoptionen:" #. type: item -#: doc/guix.texi:7576 +#: doc/guix.texi:7574 #, no-wrap msgid "--listen=tcp:37146" msgstr "--listen=tcp:37146" #. type: table -#: doc/guix.texi:7578 +#: doc/guix.texi:7576 msgid "Accept connections on localhost on port 37146." msgstr "Verbindungen mit dem „localhost“ auf Port 37146 akzeptieren." #. type: item -#: doc/guix.texi:7579 +#: doc/guix.texi:7577 #, no-wrap msgid "--listen=unix:/tmp/socket" msgstr "--listen=unix:/tmp/socket" #. type: table -#: doc/guix.texi:7581 +#: doc/guix.texi:7579 msgid "Accept connections on the Unix-domain socket @file{/tmp/socket}." msgstr "Verbindungen zum Unix-Socket @file{/tmp/socket} akzeptieren." #. type: Plain text -#: doc/guix.texi:7592 +#: doc/guix.texi:7590 msgid "This section describes Guix command-line utilities. Some of them are primarily targeted at developers and users who write new package definitions, while others are more generally useful. They complement the Scheme programming interface of Guix in a convenient way." msgstr "Dieser Abschnitt beschreibt die Befehlszeilenwerkzeuge von Guix. Manche davon richten sich hauptsächlich an Entwickler und solche Nutzer, die neue Paketdefinitionen schreiben, andere sind auch für ein breiteres Publikum nützlich. Sie ergänzen die Scheme-Programmierschnittstelle um bequeme Befehle." #. type: cindex -#: doc/guix.texi:7614 +#: doc/guix.texi:7612 #, no-wrap msgid "package building" msgstr "Paketerstellung" #. type: command{#1} -#: doc/guix.texi:7615 +#: doc/guix.texi:7613 #, no-wrap msgid "guix build" msgstr "guix build" #. type: Plain text -#: doc/guix.texi:7621 +#: doc/guix.texi:7619 msgid "The @command{guix build} command builds packages or derivations and their dependencies, and prints the resulting store paths. Note that it does not modify the user's profile---this is the job of the @command{guix package} command (@pxref{Invoking guix package}). Thus, it is mainly useful for distribution developers." msgstr "Der Befehl @command{guix build} lässt Pakete oder Ableitungen samt ihrer Abhängigkeiten erstellen und gibt die resultierenden Pfade im Store aus. Beachten Sie, dass das Nutzerprofil dadurch nicht modifiziert wird — eine solche Installation bewirkt der Befehl @command{guix package} (siehe @ref{Invoking guix package}). @command{guix build} wird also hauptsächlich von Entwicklern der Distribution benutzt." #. type: example -#: doc/guix.texi:7626 +#: doc/guix.texi:7624 #, no-wrap msgid "guix build @var{options} @var{package-or-derivation}@dots{}\n" msgstr "guix build @var{Optionen} @var{Paket-oder-Ableitung}…\n" #. type: Plain text -#: doc/guix.texi:7631 +#: doc/guix.texi:7629 msgid "As an example, the following command builds the latest versions of Emacs and of Guile, displays their build logs, and finally displays the resulting directories:" msgstr "Zum Beispiel wird mit folgendem Befehl die neueste Version von Emacs und von Guile erstellt, das zugehörige Erstellungsprotokoll angezeigt und letztendlich werden die resultierenden Verzeichnisse ausgegeben:" #. type: example -#: doc/guix.texi:7634 +#: doc/guix.texi:7632 #, no-wrap msgid "guix build emacs guile\n" msgstr "guix build emacs guile\n" #. type: Plain text -#: doc/guix.texi:7637 +#: doc/guix.texi:7635 msgid "Similarly, the following command builds all the available packages:" msgstr "Folgender Befehl erstellt alle Pakete, die zur Verfügung stehen:" #. type: example -#: doc/guix.texi:7641 +#: doc/guix.texi:7639 #, no-wrap msgid "" "guix build --quiet --keep-going \\\n" @@ -14261,334 +14272,334 @@ msgstr "" " `guix package -A | cut -f1,2 --output-delimiter=@@`\n" #. type: Plain text -#: doc/guix.texi:7649 +#: doc/guix.texi:7647 msgid "@var{package-or-derivation} may be either the name of a package found in the software distribution such as @code{coreutils} or @code{coreutils@@8.20}, or a derivation such as @file{/gnu/store/@dots{}-coreutils-8.19.drv}. In the former case, a package with the corresponding name (and optionally version) is searched for among the GNU distribution modules (@pxref{Package Modules})." msgstr "Als @var{Paket-oder-Ableitung} muss entweder der Name eines in der Software-Distribution zu findenden Pakets, wie etwa @code{coreutils} oder @code{coreutils@@8.20}, oder eine Ableitung wie @file{/gnu/store/…-coreutils-8.19.drv} sein. Im ersten Fall wird nach einem Paket mit entsprechendem Namen (und optional der entsprechenden Version) in den Modulen der GNU-Distribution gesucht (siehe @ref{Package Modules})." #. type: Plain text -#: doc/guix.texi:7654 +#: doc/guix.texi:7652 msgid "Alternatively, the @code{--expression} option may be used to specify a Scheme expression that evaluates to a package; this is useful when disambiguating among several same-named packages or package variants is needed." msgstr "Alternativ kann die Befehlszeilenoption @code{--expression} benutzt werden, um einen Scheme-Ausdruck anzugeben, der zu einem Paket ausgewertet wird; dies ist nützlich, wenn zwischen mehreren gleichnamigen Paketen oder Paket-Varianten unterschieden werden muss." #. type: Plain text -#: doc/guix.texi:7657 +#: doc/guix.texi:7655 msgid "There may be zero or more @var{options}. The available options are described in the subsections below." msgstr "Null oder mehr @var{Optionen} können angegeben werden. Zur Verfügung stehen die in den folgenden Unterabschnitten beschriebenen Befehlszeilenoptionen." #. type: Plain text -#: doc/guix.texi:7672 +#: doc/guix.texi:7670 msgid "A number of options that control the build process are common to @command{guix build} and other commands that can spawn builds, such as @command{guix package} or @command{guix archive}. These are the following:" msgstr "Einige dieser Befehlszeilenoptionen zur Steuerung des Erstellungsprozess haben @command{guix build} und andere Befehle, mit denen Erstellungen ausgelöst werden können, wie @command{guix package} oder @command{guix archive}, gemeinsam. Das sind folgende:" #. type: item -#: doc/guix.texi:7675 +#: doc/guix.texi:7673 #, no-wrap msgid "--load-path=@var{directory}" msgstr "--load-path=@var{Verzeichnis}" #. type: itemx -#: doc/guix.texi:7676 +#: doc/guix.texi:7674 #, no-wrap msgid "-L @var{directory}" msgstr "-L @var{Verzeichnis}" #. type: table -#: doc/guix.texi:7679 +#: doc/guix.texi:7677 msgid "Add @var{directory} to the front of the package module search path (@pxref{Package Modules})." msgstr "Das @var{Verzeichnis} vorne an den Suchpfad für Paketmodule anfügen (siehe @ref{Package Modules})." #. type: table -#: doc/guix.texi:7682 +#: doc/guix.texi:7680 msgid "This allows users to define their own packages and make them visible to the command-line tools." msgstr "Damit können Nutzer dafür sorgen, dass ihre eigenen selbstdefinierten Pakete für die Befehlszeilenwerkzeuge sichtbar sind." #. type: item -#: doc/guix.texi:7683 +#: doc/guix.texi:7681 #, no-wrap msgid "--keep-failed" msgstr "--keep-failed" #. type: itemx -#: doc/guix.texi:7684 +#: doc/guix.texi:7682 #, no-wrap msgid "-K" msgstr "-K" #. type: table -#: doc/guix.texi:7690 +#: doc/guix.texi:7688 msgid "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." msgstr "Den Verzeichnisbaum, in dem fehlgeschlagene Erstellungen durchgeführt wurden, behalten. Wenn also eine Erstellung fehlschlägt, bleibt ihr Erstellungsbaum in @file{/tmp} erhalten. Der Name dieses Unterverzeichnisses wird am Ende dem Erstellungsprotokolls ausgegeben. Dies hilft bei der Suche nach Fehlern in Erstellungen. Der Abschnitt @ref{Debugging Build Failures} zeigt Ihnen Hinweise und Tricks, wie Erstellungsfehler untersucht werden können." #. type: table -#: doc/guix.texi:7694 +#: doc/guix.texi:7692 msgid "This option has no effect when connecting to a remote daemon with a @code{guix://} URI (@pxref{The Store, the @code{GUIX_DAEMON_SOCKET} variable})." msgstr "Diese Option hat keine Auswirkungen, wenn eine Verbindung zu einem entfernten Daemon über eine @code{guix://}-URI verwendet wurde (siehe @ref{The Store, the @code{GUIX_DAEMON_SOCKET} variable})." #. type: item -#: doc/guix.texi:7695 +#: doc/guix.texi:7693 #, no-wrap msgid "--keep-going" msgstr "--keep-going" #. type: itemx -#: doc/guix.texi:7696 +#: doc/guix.texi:7694 #, no-wrap msgid "-k" msgstr "-k" #. type: table -#: doc/guix.texi:7699 +#: doc/guix.texi:7697 msgid "Keep going when some of the derivations fail to build; return only once all the builds have either completed or failed." msgstr "Weitermachen, auch wenn ein Teil der Erstellungen fehlschlägt. Das bedeutet, dass der Befehl erst terminiert, wenn alle Erstellungen erfolgreich oder mit Fehler durchgeführt wurden." #. type: table -#: doc/guix.texi:7702 +#: doc/guix.texi:7700 msgid "The default behavior is to stop as soon as one of the specified derivations has failed." msgstr "Das normale Verhalten ist, abzubrechen, sobald eine der angegebenen Ableitungen fehlschlägt." #. type: table -#: doc/guix.texi:7706 +#: doc/guix.texi:7704 msgid "Do not build the derivations." msgstr "Die Ableitungen nicht erstellen." #. type: anchor{#1} -#: doc/guix.texi:7708 +#: doc/guix.texi:7706 msgid "fallback-option" msgstr "fallback-option" #. type: item -#: doc/guix.texi:7708 +#: doc/guix.texi:7706 #, no-wrap msgid "--fallback" msgstr "--fallback" #. type: table -#: doc/guix.texi:7711 +#: doc/guix.texi:7709 msgid "When substituting a pre-built binary fails, fall back to building packages locally (@pxref{Substitution Failure})." -msgstr "Wenn das Substituieren vorerstellter Binärdateien fehlschlägt, diese als „Fallback“ lokal selbst erstellen (siehe @ref{Substitution Failure})." +msgstr "Wenn das Substituieren vorerstellter Binärdateien fehlschlägt, diese ersatzweise lokal selbst erstellen (siehe @ref{Substitution Failure})." #. type: anchor{#1} -#: doc/guix.texi:7717 +#: doc/guix.texi:7715 msgid "client-substitute-urls" msgstr "client-substitute-urls" #. type: table -#: doc/guix.texi:7717 +#: doc/guix.texi:7715 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs, overriding the default list of URLs of @command{guix-daemon} (@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs})." msgstr "Die @var{urls} als durch Leerraumzeichen getrennte Liste von Quell-URLs für Substitute anstelle der vorgegebenen URL-Liste für den @command{guix-daemon} verwenden (siehe @ref{daemon-substitute-urls,, @command{guix-daemon} URLs})." #. type: table -#: doc/guix.texi:7721 +#: doc/guix.texi:7719 msgid "This means that substitutes may be downloaded from @var{urls}, provided they are signed by a key authorized by the system administrator (@pxref{Substitutes})." msgstr "Das heißt, die Substitute dürfen von den @var{urls} heruntergeladen werden, sofern sie mit einem durch den Systemadministrator autorisierten Schlüssel signiert worden sind (siehe @ref{Substitutes})." #. type: table -#: doc/guix.texi:7724 +#: doc/guix.texi:7722 msgid "When @var{urls} is the empty string, substitutes are effectively disabled." msgstr "Wenn als @var{urls} eine leere Zeichenkette angegeben wurde, verhält es sich, als wären Substitute abgeschaltet." #. type: item -#: doc/guix.texi:7730 +#: doc/guix.texi:7728 #, no-wrap msgid "--no-grafts" msgstr "--no-grafts" #. type: table -#: doc/guix.texi:7734 +#: doc/guix.texi:7732 msgid "Do not ``graft'' packages. In practice, this means that package updates available as grafts are not applied. @xref{Security Updates}, for more information on grafts." msgstr "Pakete nicht „veredeln“ (engl. „graft“). Praktisch heißt das, dass als Veredelungen verfügbare Paketaktualisierungen nicht angewandt werden. Der Abschnitt @ref{Security Updates} hat weitere Informationen zu Veredelungen." #. type: item -#: doc/guix.texi:7735 +#: doc/guix.texi:7733 #, no-wrap msgid "--rounds=@var{n}" msgstr "--rounds=@var{n}" #. type: table -#: doc/guix.texi:7738 +#: doc/guix.texi:7736 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical." msgstr "Jede Ableitung @var{n}-mal nacheinander erstellen und einen Fehler melden, wenn die aufeinanderfolgenden Erstellungsergebnisse nicht Bit für Bit identisch sind." #. type: table -#: doc/guix.texi:7743 +#: doc/guix.texi:7741 msgid "This is a useful way to detect non-deterministic builds processes. Non-deterministic build processes are a problem because they make it practically impossible for users to @emph{verify} whether third-party binaries are genuine. @xref{Invoking guix challenge}, for more." msgstr "Das ist eine nützliche Methode, um nicht-deterministische Erstellungsprozesse zu erkennen. Nicht-deterministische Erstellungsprozesse sind ein Problem, weil Nutzer dadurch praktisch nicht @emph{verifizieren} können, ob von Drittanbietern bereitgestellte Binärdateien echt sind. Der Abschnitt @ref{Invoking guix challenge} erklärt dies genauer." #. type: table -#: doc/guix.texi:7749 +#: doc/guix.texi:7747 msgid "Note that, currently, the differing build results are not kept around, so you will have to manually investigate in case of an error---e.g., by stashing one of the build results with @code{guix archive --export} (@pxref{Invoking guix archive}), then rebuilding, and finally comparing the two results." msgstr "Beachten Sie, dass die sich unterscheidenden Erstellungsergebnisse nicht erhalten bleiben, so dass Sie eventuelle Fehler manuell untersuchen müssen, z.B.@: indem Sie eines oder mehrere der Erstellungsergebnisse @code{guix archive --export} auslagern (siehe @ref{Invoking guix archive}), dann neu erstellen und letztlich die beiden Erstellungsergebnisse vergleichen." #. type: table -#: doc/guix.texi:7754 +#: doc/guix.texi:7752 msgid "Do not attempt to offload builds @i{via} the ``build hook'' of the daemon (@pxref{Daemon Offload Setup}). That is, always build things locally instead of offloading builds to remote machines." msgstr "Nicht versuchen, Erstellungen über den „Build-Hook“ des Daemons auszulagern (siehe @ref{Daemon Offload Setup}). Somit wird lokal erstellt, statt Erstellungen auf entfernte Maschinen auszulagern." #. type: table -#: doc/guix.texi:7761 +#: doc/guix.texi:7759 msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--max-silent-time}})." msgstr "Standardmäßig wird die Einstellung für den Daemon benutzt (siehe @ref{Invoking guix-daemon, @code{--max-silent-time}})." #. type: table -#: doc/guix.texi:7768 +#: doc/guix.texi:7766 msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--timeout}})." msgstr "Standardmäßig wird die Einstellung für den Daemon benutzt (siehe @ref{Invoking guix-daemon, @code{--timeout}})." #. type: cindex -#: doc/guix.texi:7771 +#: doc/guix.texi:7769 #, no-wrap msgid "verbosity, of the command-line tools" msgstr "Ausführlichkeit der Befehlszeilenwerkzeuge" #. type: cindex -#: doc/guix.texi:7772 +#: doc/guix.texi:7770 #, no-wrap msgid "build logs, verbosity" msgstr "Erstellungsprotokolle, Ausführlichkeit" #. type: item -#: doc/guix.texi:7773 +#: doc/guix.texi:7771 #, no-wrap msgid "-v @var{level}" msgstr "-v @var{Stufe}" #. type: itemx -#: doc/guix.texi:7774 +#: doc/guix.texi:7772 #, no-wrap msgid "--verbosity=@var{level}" msgstr "--verbosity=@var{Stufe}" #. type: table -#: doc/guix.texi:7778 +#: doc/guix.texi:7776 msgid "Use the given verbosity @var{level}, an integer. Choosing 0 means that no output is produced, 1 is for quiet output, and 2 shows all the build log output on standard error." msgstr "Die angegebene Ausführlichkeitsstufe verwenden. Als @var{Stufe} muss eine ganze Zahl angegeben werden. Wird 0 gewählt, wird keine Ausgabe zur Fehlersuche angezeigt, 1 bedeutet eine knappe Ausgabe und 2 lässt alle Erstellungsprotokollausgaben auf die Standardfehlerausgabe schreiben." #. type: table -#: doc/guix.texi:7783 +#: doc/guix.texi:7781 msgid "Allow the use of up to @var{n} CPU cores for the build. The special value @code{0} means to use as many CPU cores as available." msgstr "Die Nutzung von bis zu @var{n} Prozessorkernen für die Erstellungen gestatten. Der besondere Wert @code{0} bedeutet, dass so viele wie möglich benutzt werden." #. type: table -#: doc/guix.texi:7789 +#: doc/guix.texi:7787 msgid "Allow at most @var{n} build jobs in parallel. @xref{Invoking guix-daemon, @code{--max-jobs}}, for details about this option and the equivalent @command{guix-daemon} option." msgstr "Höchstens @var{n} gleichzeitige Erstellungsaufträge erlauben. Im Abschnitt @ref{Invoking guix-daemon, @code{--max-jobs}} finden Sie Details zu dieser Option und der äquivalenten Option des @command{guix-daemon}." #. type: item -#: doc/guix.texi:7790 +#: doc/guix.texi:7788 #, no-wrap msgid "--debug=@var{level}" msgstr "--debug=@var{Stufe}" #. type: table -#: doc/guix.texi:7794 +#: doc/guix.texi:7792 msgid "Produce debugging output coming from the build daemon. @var{level} must be an integer between 0 and 5; higher means more verbose output. Setting a level of 4 or more may be helpful when debugging setup issues with the build daemon." msgstr "Ein Protokoll zur Fehlersuche ausgeben, das vom Erstellungsdaemon kommt. Als @var{Stufe} muss eine ganze Zahl zwischen 0 und 5 angegeben werden; höhere Zahlen stehen für ausführlichere Ausgaben. Stufe 4 oder höher zu wählen, kann bei der Suche nach Fehlern, wie der Erstellungs-Daemon eingerichtet ist, helfen." #. type: Plain text -#: doc/guix.texi:7801 +#: doc/guix.texi:7799 msgid "Behind the scenes, @command{guix build} is essentially an interface to the @code{package-derivation} procedure of the @code{(guix packages)} module, and to the @code{build-derivations} procedure of the @code{(guix derivations)} module." msgstr "Intern ist @command{guix build} im Kern eine Schnittstelle zur Prozedur @code{package-derivation} aus dem Modul @code{(guix packages)} und zu der Prozedur @code{build-derivations} des Moduls @code{(guix derivations)}." #. type: Plain text -#: doc/guix.texi:7805 +#: doc/guix.texi:7803 msgid "In addition to options explicitly passed on the command line, @command{guix build} and other @command{guix} commands that support building honor the @code{GUIX_BUILD_OPTIONS} environment variable." msgstr "Neben auf der Befehlszeile übergebenen Optionen beachten @command{guix build} und andere @command{guix}-Befehle, die Erstellungen durchführen lassen, die Umgebungsvariable @code{GUIX_BUILD_OPTIONS}." #. type: defvr -#: doc/guix.texi:7806 +#: doc/guix.texi:7804 #, no-wrap msgid "{Environment Variable} GUIX_BUILD_OPTIONS" msgstr "{Umgebungsvariable} GUIX_BUILD_OPTIONS" #. type: defvr -#: doc/guix.texi:7811 +#: doc/guix.texi:7809 msgid "Users can define this variable to a list of command line options that will automatically be used by @command{guix build} and other @command{guix} commands that can perform builds, as in the example below:" msgstr "Nutzer können diese Variable auf eine Liste von Befehlszeilenoptionen definieren, die automatisch von @command{guix build} und anderen @command{guix}-Befehlen, die Erstellungen durchführen lassen, benutzt wird, wie in folgendem Beispiel:" #. type: example -#: doc/guix.texi:7814 +#: doc/guix.texi:7812 #, no-wrap msgid "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n" msgstr "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n" #. type: defvr -#: doc/guix.texi:7818 +#: doc/guix.texi:7816 msgid "These options are parsed independently, and the result is appended to the parsed command-line options." msgstr "Diese Befehlszeilenoptionen werden unabhängig von den auf der Befehlszeile übergebenen Befehlszeilenoptionen grammatikalisch analysiert und das Ergebnis an die bereits analysierten auf der Befehlszeile übergebenen Befehlszeilenoptionen angehängt." #. type: cindex -#: doc/guix.texi:7824 +#: doc/guix.texi:7822 #, no-wrap msgid "package variants" msgstr "Paketvarianten" #. type: Plain text -#: doc/guix.texi:7832 +#: doc/guix.texi:7830 msgid "Another set of command-line options supported by @command{guix build} and also @command{guix package} are @dfn{package transformation options}. These are options that make it possible to define @dfn{package variants}---for instance, packages built from different source code. This is a convenient way to create customized packages on the fly without having to type in the definitions of package variants (@pxref{Defining Packages})." msgstr "Eine weitere Gruppe von Befehlszeilenoptionen, die @command{guix build} und auch @command{guix package} unterstützen, sind @dfn{Paketumwandlungsoptionen}. Diese Optionen ermöglichen es, @dfn{Paketvarianten} zu definieren — zum Beispiel können Pakete aus einem anderen Quellcode als normalerweise erstellt werden. Damit ist es leicht, angepasste Pakete schnell zu erstellen, ohne die vollständigen Definitionen von Paketvarianten einzutippen (siehe @ref{Defining Packages})." #. type: item -#: doc/guix.texi:7835 +#: doc/guix.texi:7833 #, no-wrap msgid "--with-source=@var{source}" msgstr "--with-source=@var{Quelle}" #. type: itemx -#: doc/guix.texi:7836 +#: doc/guix.texi:7834 #, no-wrap msgid "--with-source=@var{package}=@var{source}" msgstr "--with-source=@var{Paket}=@var{Quelle}" #. type: itemx -#: doc/guix.texi:7837 +#: doc/guix.texi:7835 #, no-wrap msgid "--with-source=@var{package}@@@var{version}=@var{source}" msgstr "--with-source=@var{Paket}@@@var{Version}=@var{Quelle}" #. type: table -#: doc/guix.texi:7842 +#: doc/guix.texi:7840 msgid "Use @var{source} as the source of @var{package}, and @var{version} as its version number. @var{source} must be a file name or a URL, as for @command{guix download} (@pxref{Invoking guix download})." msgstr "Den Paketquellcode für das @var{Paket} von der angegebenen @var{Quelle} holen und die @var{Version} als seine Versionsnummer verwenden. Die @var{Quelle} muss ein Dateiname oder eine URL sein wie bei @command{guix download} (siehe @ref{Invoking guix download})." #. type: table -#: doc/guix.texi:7848 +#: doc/guix.texi:7846 msgid "When @var{package} is omitted, it is taken to be the package name specified on the command line that matches the base of @var{source}---e.g., if @var{source} is @code{/src/guile-2.0.10.tar.gz}, the corresponding package is @code{guile}." msgstr "Wird kein @var{Paket} angegeben, wird als Paketname derjenige auf der Befehlszeile angegebene Paketname angenommen, der zur Basis am Ende der @var{Quelle} passt — wenn z.B.@: als @var{Quelle} die Datei @code{/src/guile-2.0.10.tar.gz} angegeben wurde, entspricht das dem @code{guile}-Paket." #. type: table -#: doc/guix.texi:7851 +#: doc/guix.texi:7849 msgid "Likewise, when @var{version} is omitted, the version string is inferred from @var{source}; in the previous example, it is @code{2.0.10}." msgstr "Ebenso wird, wenn keine @var{Version} angegeben wurde, die Version als Zeichenkette aus der @var{Quelle} abgeleitet; im vorherigen Beispiel wäre sie @code{2.0.10}." #. type: table -#: doc/guix.texi:7856 +#: doc/guix.texi:7854 msgid "This option allows users to try out versions of packages other than the one provided by the distribution. The example below downloads @file{ed-1.7.tar.gz} from a GNU mirror and uses that as the source for the @code{ed} package:" msgstr "Mit dieser Option können Nutzer versuchen, eine andere Version ihres Pakets auszuprobieren, als die in der Distribution enthaltene Version. Folgendes Beispiel lädt @file{ed-1.7.tar.gz} von einem GNU-Spiegelserver herunter und benutzt es als Quelle für das @code{ed}-Paket:" #. type: example -#: doc/guix.texi:7859 +#: doc/guix.texi:7857 #, no-wrap msgid "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n" msgstr "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n" #. type: table -#: doc/guix.texi:7863 +#: doc/guix.texi:7861 msgid "As a developer, @code{--with-source} makes it easy to test release candidates:" msgstr "Für Entwickler wird es einem durch @code{--with-source} leicht gemacht, „Release Candidates“, also Vorabversionen, zu testen:" #. type: example -#: doc/guix.texi:7866 +#: doc/guix.texi:7864 #, no-wrap msgid "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n" msgstr "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n" #. type: table -#: doc/guix.texi:7869 +#: doc/guix.texi:7867 msgid "@dots{} or to build from a checkout in a pristine environment:" msgstr "…@: oder ein Checkout eines versionskontrollierten Repositorys in einer isolierten Umgebung zu erstellen:" #. type: example -#: doc/guix.texi:7873 +#: doc/guix.texi:7871 #, no-wrap msgid "" "$ git clone git://git.sv.gnu.org/guix.git\n" @@ -14598,94 +14609,94 @@ msgstr "" "$ guix build guix --with-source=guix@@1.0=./guix\n" #. type: item -#: doc/guix.texi:7875 +#: doc/guix.texi:7873 #, no-wrap msgid "--with-input=@var{package}=@var{replacement}" msgstr "--with-input=@var{Paket}=@var{Ersatz}" #. type: table -#: doc/guix.texi:7880 +#: doc/guix.texi:7878 msgid "Replace dependency on @var{package} by a dependency on @var{replacement}. @var{package} must be a package name, and @var{replacement} must be a package specification such as @code{guile} or @code{guile@@1.8}." msgstr "Abhängigkeiten vom @var{Paket} durch eine Abhängigkeit vom @var{Ersatz}-Paket ersetzen. Als @var{Paket} muss ein Paketname angegeben werden und als @var{Ersatz} eine Paketspezifikation wie @code{guile} oder @code{guile@@1.8}." #. type: table -#: doc/guix.texi:7884 +#: doc/guix.texi:7882 msgid "For instance, the following command builds Guix, but replaces its dependency on the current stable version of Guile with a dependency on the legacy version of Guile, @code{guile@@2.0}:" msgstr "Mit folgendem Befehl wird zum Beispiel Guix erstellt, aber statt der aktuellen stabilen Guile-Version hängt es von der alten Guile-Version @code{guile@@2.0} ab:" #. type: example -#: doc/guix.texi:7887 +#: doc/guix.texi:7885 #, no-wrap msgid "guix build --with-input=guile=guile@@2.0 guix\n" msgstr "guix build --with-input=guile=guile@@2.0 guix\n" #. type: table -#: doc/guix.texi:7892 +#: doc/guix.texi:7890 msgid "This is a recursive, deep replacement. So in this example, both @code{guix} and its dependency @code{guile-json} (which also depends on @code{guile}) get rebuilt against @code{guile@@2.0}." msgstr "Die Ersetzung ist rekursiv und umfassend. In diesem Beispiel würde nicht nur @code{guix}, sondern auch seine Abhängigkeit @code{guile-json} (was auch von @code{guile} abhängt) für @code{guile@@2.0} neu erstellt." #. type: table -#: doc/guix.texi:7895 +#: doc/guix.texi:7893 msgid "This is implemented using the @code{package-input-rewriting} Scheme procedure (@pxref{Defining Packages, @code{package-input-rewriting}})." msgstr "Implementiert wird das alles mit der Scheme-Prozedur @code{package-input-rewriting} (siehe @ref{Defining Packages, @code{package-input-rewriting}})." #. type: item -#: doc/guix.texi:7896 +#: doc/guix.texi:7894 #, no-wrap msgid "--with-graft=@var{package}=@var{replacement}" msgstr "--with-graft=@var{Paket}=@var{Ersatz}" #. type: table -#: doc/guix.texi:7902 +#: doc/guix.texi:7900 msgid "This is similar to @code{--with-input} but with an important difference: instead of rebuilding the whole dependency chain, @var{replacement} is built and then @dfn{grafted} onto the binaries that were initially referring to @var{package}. @xref{Security Updates}, for more information on grafts." msgstr "Dies verhält sich ähnlich wie mit @code{--with-input}, aber mit dem wichtigen Unterschied, dass nicht die gesamte Abhängigkeitskette neu erstellt wird, sondern das @var{Ersatz}-Paket erstellt und die ursprünglichen Binärdateien, die auf das @var{Paket} verwiesen haben, damit @dfn{veredelt} werden. Im Abschnitt @ref{Security Updates} finden Sie weitere Informationen über Veredelungen." #. type: table -#: doc/guix.texi:7906 +#: doc/guix.texi:7904 msgid "For example, the command below grafts version 3.5.4 of GnuTLS onto Wget and all its dependencies, replacing references to the version of GnuTLS they currently refer to:" msgstr "Zum Beispiel veredelt folgender Befehl Wget und alle Abhängigkeiten davon mit der Version 3.5.4 von GnuTLS, indem Verweise auf die ursprünglich verwendete GnuTLS-Version ersetzt werden:" #. type: example -#: doc/guix.texi:7909 +#: doc/guix.texi:7907 #, no-wrap msgid "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n" msgstr "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n" #. type: table -#: doc/guix.texi:7918 +#: doc/guix.texi:7916 msgid "This has the advantage of being much faster than rebuilding everything. But there is a caveat: it works if and only if @var{package} and @var{replacement} are strictly compatible---for example, if they provide a library, the application binary interface (ABI) of those libraries must be compatible. If @var{replacement} is somehow incompatible with @var{package}, then the resulting package may be unusable. Use with care!" msgstr "Das hat den Vorteil, dass es viel schneller geht, als alles neu zu erstellen. Die Sache hat aber einen Haken: Veredelung funktioniert nur, wenn das @var{Paket} und sein @var{Ersatz} miteinander streng kompatibel sind — zum Beispiel muss, wenn diese eine Programmbibliothek zur Verfügung stellen, deren Binärschnittstelle („Application Binary Interface“, kurz ABI) kompatibel sein. Wenn das @var{Ersatz}-Paket auf irgendeine Art inkompatibel mit dem @var{Paket} ist, könnte das Ergebnispaket unbrauchbar sein. Vorsicht ist also geboten!" #. type: item -#: doc/guix.texi:7919 +#: doc/guix.texi:7917 #, no-wrap msgid "--with-git-url=@var{package}=@var{url}" msgstr "--with-git-url=@var{Paket}=@var{URL}" #. type: cindex -#: doc/guix.texi:7920 +#: doc/guix.texi:7918 #, no-wrap msgid "Git, using the latest commit" msgstr "Git, den neuesten Commit benutzen" #. type: cindex -#: doc/guix.texi:7921 +#: doc/guix.texi:7919 #, no-wrap msgid "latest commit, building" msgstr "neuester Commit, davon erstellen" #. type: table -#: doc/guix.texi:7925 +#: doc/guix.texi:7923 msgid "Build @var{package} from the latest commit of the @code{master} branch of the Git repository at @var{url}. Git sub-modules of the repository are fetched, recursively." msgstr "Das @var{Paket} aus dem neuesten Commit im @code{master}-Branch des unter der @var{URL} befindlichen Git-Repositorys erstellen. Git-Submodule des Repositorys werden dabei rekursiv geladen." #. type: table -#: doc/guix.texi:7928 +#: doc/guix.texi:7926 msgid "For example, the following command builds the NumPy Python library against the latest commit of the master branch of Python itself:" msgstr "Zum Beispiel erstellt der folgende Befehl die NumPy-Python-Bibliothek unter Verwendung des neuesten Commits von Python auf dessen „master“-Branch." #. type: example -#: doc/guix.texi:7932 +#: doc/guix.texi:7930 #, no-wrap msgid "" "guix build python-numpy \\\n" @@ -14695,179 +14706,179 @@ msgstr "" " --with-git-url=python=https://github.com/python/cpython\n" #. type: table -#: doc/guix.texi:7936 +#: doc/guix.texi:7934 msgid "This option can also be combined with @code{--with-branch} or @code{--with-commit} (see below)." msgstr "Diese Befehlszeilenoption kann auch mit @code{--with-branch} oder @code{--with-commit} kombiniert werden (siehe unten)." #. type: cindex -#: doc/guix.texi:7937 doc/guix.texi:20629 +#: doc/guix.texi:7935 doc/guix.texi:20626 #, no-wrap msgid "continuous integration" msgstr "Kontinuierliche Integration" #. type: table -#: doc/guix.texi:7943 +#: doc/guix.texi:7941 msgid "Obviously, since it uses the latest commit of the given branch, the result of such a command varies over time. Nevertheless it is a convenient way to rebuild entire software stacks against the latest commit of one or more packages. This is particularly useful in the context of continuous integration (CI)." msgstr "Da es den neuesten Commit auf dem verwendeten Branch benutzt, ändert sich das Ergebnis natürlich mit der Zeit. Nichtsdestoweniger ist es eine bequeme Möglichkeit, ganze Softwarestapel auf dem neuesten Commit von einem oder mehr Paketen aufbauen zu lassen. Es ist besonders nützlich im Kontext Kontinuierlicher Integration (englisch „Continuous Integration“, kurz CI)." #. type: table -#: doc/guix.texi:7947 +#: doc/guix.texi:7945 msgid "Checkouts are kept in a cache under @file{~/.cache/guix/checkouts} to speed up consecutive accesses to the same repository. You may want to clean it up once in a while to save disk space." msgstr "Checkouts bleiben zwischengespeichert als @file{~/.cache/guix/checkouts}, damit danach schneller auf dasselbe Repository zugegriffen werden kann. Eventuell möchten Sie das Verzeichnis ab und zu bereinigen, um Plattenplatz zu sparen." #. type: item -#: doc/guix.texi:7948 +#: doc/guix.texi:7946 #, no-wrap msgid "--with-branch=@var{package}=@var{branch}" msgstr "--with-branch=@var{Paket}=@var{Branch}" #. type: table -#: doc/guix.texi:7954 +#: doc/guix.texi:7952 msgid "Build @var{package} from the latest commit of @var{branch}. If the @code{source} field of @var{package} is an origin with the @code{git-fetch} method (@pxref{origin Reference}) or a @code{git-checkout} object, the repository URL is taken from that @code{source}. Otherwise you have to use @code{--with-git-url} to specify the URL of the Git repository." msgstr "Das @var{Paket} aus dem neuesten Commit auf dem @var{Branch} erstellen. Wenn das @code{source}-Feld des @var{Paket}s ein origin-Objekt mit der Methode @code{git-fetch} (siehe @ref{origin Reference}) oder ein @code{git-checkout}-Objekt ist, wird die URL des Repositorys vom @code{source}-Feld genommen. Andernfalls müssen Sie die Befehlszeilenoption @code{--with-git-url} benutzen, um die URL des Git-Repositorys anzugeben." #. type: table -#: doc/guix.texi:7959 +#: doc/guix.texi:7957 msgid "For instance, the following command builds @code{guile-sqlite3} from the latest commit of its @code{master} branch, and then builds @code{guix} (which depends on it) and @code{cuirass} (which depends on @code{guix}) against this specific @code{guile-sqlite3} build:" msgstr "Zum Beispiel wird mit dem folgenden Befehl @code{guile-sqlite3} aus dem neuesten Commit seines @code{master}-Branches erstellt und anschließend @code{guix} (was von @code{guile-sqlite3} abhängt) und @code{cuirass} (was von @code{guix} abhängt) unter Nutzung genau dieser @code{guile-sqlite3}-Erstellung erstellt:" #. type: example -#: doc/guix.texi:7962 +#: doc/guix.texi:7960 #, no-wrap msgid "guix build --with-branch=guile-sqlite3=master cuirass\n" msgstr "guix build --with-branch=guile-sqlite3=master cuirass\n" #. type: item -#: doc/guix.texi:7964 +#: doc/guix.texi:7962 #, no-wrap msgid "--with-commit=@var{package}=@var{commit}" msgstr "--with-commit=@var{Paket}=@var{Commit}" #. type: table -#: doc/guix.texi:7968 +#: doc/guix.texi:7966 msgid "This is similar to @code{--with-branch}, except that it builds from @var{commit} rather than the tip of a branch. @var{commit} must be a valid Git commit SHA1 identifier." msgstr "Dies verhält sich ähnlich wie @code{--with-branch}, außer dass es den angegebenen @var{Commit} benutzt statt die Spitze eines angegebenen Branches. Als @var{Commit} muss ein gültiger SHA1-Bezeichner für einen Git-Commit angegeben werden." #. type: Plain text -#: doc/guix.texi:7975 +#: doc/guix.texi:7973 msgid "The command-line options presented below are specific to @command{guix build}." msgstr "Die unten aufgeführten Befehlszeilenoptionen funktionieren nur mit @command{guix build}." #. type: item -#: doc/guix.texi:7978 +#: doc/guix.texi:7976 #, no-wrap msgid "--quiet" msgstr "--quiet" #. type: itemx -#: doc/guix.texi:7979 +#: doc/guix.texi:7977 #, no-wrap msgid "-q" msgstr "-q" #. type: table -#: doc/guix.texi:7983 +#: doc/guix.texi:7981 msgid "Build quietly, without displaying the build log; this is equivalent to @code{--verbosity=0}. Upon completion, the build log is kept in @file{/var} (or similar) and can always be retrieved using the @option{--log-file} option." msgstr "Schweigend erstellen, ohne das Erstellungsprotokoll anzuzeigen — dies ist äquivalent zu @code{--verbosity=0}. Nach Abschluss der Erstellung ist das Protokoll in @file{/var} (oder einem entsprechenden Ort) einsehbar und kann jederzeit mit der Befehlszeilenoption @option{--log-file} gefunden werden." #. type: item -#: doc/guix.texi:7984 +#: doc/guix.texi:7982 #, no-wrap msgid "--file=@var{file}" msgstr "--file=@var{Datei}" #. type: table -#: doc/guix.texi:7988 +#: doc/guix.texi:7986 msgid "Build the package, derivation, or other file-like object that the code within @var{file} evaluates to (@pxref{G-Expressions, file-like objects})." msgstr "Das Paket, die Ableitung oder das dateiähnliche Objekt erstellen, zu dem der Code in der @var{Datei} ausgewertet wird (siehe @ref{G-Expressions, file-like objects})." #. type: table -#: doc/guix.texi:7991 +#: doc/guix.texi:7989 msgid "As an example, @var{file} might contain a package definition like this (@pxref{Defining Packages}):" msgstr "Zum Beispiel könnte in der @var{Datei} so eine Paketdefinition stehen (siehe @ref{Defining Packages}):" #. type: table -#: doc/guix.texi:7999 +#: doc/guix.texi:7997 msgid "Build the package or derivation @var{expr} evaluates to." msgstr "Das Paket oder die Ableitung erstellen, zu der der @var{Ausdruck} ausgewertet wird." #. type: table -#: doc/guix.texi:8003 +#: doc/guix.texi:8001 msgid "For example, @var{expr} may be @code{(@@ (gnu packages guile) guile-1.8)}, which unambiguously designates this specific variant of version 1.8 of Guile." msgstr "Zum Beispiel kann der @var{Ausdruck} @code{(@@ (gnu packages guile) guile-1.8)} sein, was diese bestimmte Variante der Version 1.8 von Guile eindeutig bezeichnet." #. type: table -#: doc/guix.texi:8007 +#: doc/guix.texi:8005 msgid "Alternatively, @var{expr} may be a G-expression, in which case it is used as a build program passed to @code{gexp->derivation} (@pxref{G-Expressions})." msgstr "Alternativ kann der @var{Ausdruck} ein G-Ausdruck sein. In diesem Fall wird er als Erstellungsprogramm an @code{gexp->derivation} übergeben (siehe @ref{G-Expressions})." #. type: table -#: doc/guix.texi:8011 +#: doc/guix.texi:8009 msgid "Lastly, @var{expr} may refer to a zero-argument monadic procedure (@pxref{The Store Monad}). The procedure must return a derivation as a monadic value, which is then passed through @code{run-with-store}." msgstr "Zudem kann der @var{Ausdruck} eine monadische Prozedur mit null Argumenten bezeichnen (siehe @ref{The Store Monad}). Die Prozedur muss eine Ableitung als monadischen Wert zurückliefern, die dann durch @code{run-with-store} laufen gelassen wird." #. type: item -#: doc/guix.texi:8012 +#: doc/guix.texi:8010 #, no-wrap msgid "--source" msgstr "--source" #. type: itemx -#: doc/guix.texi:8013 +#: doc/guix.texi:8011 #, no-wrap msgid "-S" msgstr "-S" #. type: table -#: doc/guix.texi:8016 +#: doc/guix.texi:8014 msgid "Build the source derivations of the packages, rather than the packages themselves." msgstr "Die Quellcode-Ableitung der Pakete statt die Pakete selbst erstellen." #. type: table -#: doc/guix.texi:8020 +#: doc/guix.texi:8018 msgid "For instance, @code{guix build -S gcc} returns something like @file{/gnu/store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source tarball." msgstr "Zum Beispiel liefert @code{guix build -S gcc} etwas in der Art von @file{/gnu/store/…-gcc-4.7.2.tar.bz2}, also den Tarball mit dem GCC-Quellcode." #. type: table -#: doc/guix.texi:8024 +#: doc/guix.texi:8022 msgid "The returned source tarball is the result of applying any patches and code snippets specified in the package @code{origin} (@pxref{Defining Packages})." msgstr "Der gelieferte Quell-Tarball ist das Ergebnis davon, alle Patches und Code-Schnipsel aufzuspielen, die im @code{origin}-Objekt des Pakets festgelegt wurden (siehe @ref{Defining Packages})." #. type: item -#: doc/guix.texi:8025 +#: doc/guix.texi:8023 #, no-wrap msgid "--sources" msgstr "--sources" #. type: table -#: doc/guix.texi:8032 +#: doc/guix.texi:8030 msgid "Fetch and return the source of @var{package-or-derivation} and all their dependencies, recursively. This is a handy way to obtain a local copy of all the source code needed to build @var{packages}, allowing you to eventually build them even without network access. It is an extension of the @code{--source} option and can accept one of the following optional argument values:" msgstr "Den Quellcode für @var{Paket-oder-Ableitung} und alle Abhängigkeiten davon rekursiv herunterladen und zurückliefern. Dies ist eine praktische Methode, eine lokale Kopie des gesamten Quellcodes zu beziehen, der nötig ist, um die Pakete zu erstellen, damit Sie diese später auch ohne Netzwerkzugang erstellen lassen können. Es handelt sich um eine Erweiterung der Befehlszeilenoption @code{--source}, die jeden der folgenden Argumentwerte akzeptiert:" #. type: item -#: doc/guix.texi:8034 doc/guix.texi:9396 +#: doc/guix.texi:8032 doc/guix.texi:9394 #, no-wrap msgid "package" msgstr "package" #. type: table -#: doc/guix.texi:8037 +#: doc/guix.texi:8035 msgid "This value causes the @code{--sources} option to behave in the same way as the @code{--source} option." msgstr "Mit diesem Wert verhält sich die Befehlszeilenoption @code{--sources} auf genau die gleiche Weise wie die Befehlszeilenoption @code{--source}." #. type: item -#: doc/guix.texi:8038 doc/guix.texi:13889 +#: doc/guix.texi:8036 doc/guix.texi:13887 #, no-wrap msgid "all" msgstr "all" #. type: table -#: doc/guix.texi:8041 +#: doc/guix.texi:8039 msgid "Build the source derivations of all packages, including any source that might be listed as @code{inputs}. This is the default value." msgstr "Erstellt die Quellcode-Ableitungen aller Pakete einschließlich allen Quellcodes, der als Teil der Eingaben im @code{inputs}-Feld aufgelistet ist. Dies ist der vorgegebene Wert, wenn sonst keiner angegeben wird." #. type: example -#: doc/guix.texi:8047 +#: doc/guix.texi:8045 #, no-wrap msgid "" "$ guix build --sources tzdata\n" @@ -14881,18 +14892,18 @@ msgstr "" " /gnu/store/…-tzcode2015b.tar.gz.drv\n" #. type: item -#: doc/guix.texi:8049 +#: doc/guix.texi:8047 #, no-wrap msgid "transitive" msgstr "transitive" #. type: table -#: doc/guix.texi:8053 +#: doc/guix.texi:8051 msgid "Build the source derivations of all packages, as well of all transitive inputs to the packages. This can be used e.g.@: to prefetch package source for later offline building." msgstr "Die Quellcode-Ableitungen aller Pakete sowie aller transitiven Eingaben der Pakete erstellen. Damit kann z.B.@: Paket-Quellcode vorab heruntergeladen und später offline erstellt werden." #. type: example -#: doc/guix.texi:8064 +#: doc/guix.texi:8062 #, no-wrap msgid "" "$ guix build --sources=transitive tzdata\n" @@ -14916,158 +14927,158 @@ msgstr "" "…\n" #. type: table -#: doc/guix.texi:8074 +#: doc/guix.texi:8072 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host. The @command{guix build} command allows you to repeat this option several times, in which case it builds for all the specified systems; other commands ignore extraneous @option{-s} options." msgstr "Versuchen, für das angegebene @var{System} — z.B.@: @code{i686-linux} — statt für denselben Systemtyp wie auf dem Wirtssystem zu erstellen. Beim Befehl @command{guix build} können Sie diese Befehlszeilenoption mehrmals wiederholen, wodurch für jedes angegebene System eine Erstellung durchgeführt wird; andere Befehle ignorieren überzählige @option{-s}-Befehlszeilenoptionen." #. type: quotation -#: doc/guix.texi:8079 +#: doc/guix.texi:8077 msgid "The @code{--system} flag is for @emph{native} compilation and must not be confused with cross-compilation. See @code{--target} below for information on cross-compilation." msgstr "Die Befehlszeilenoption @code{--system} dient der @emph{nativen} Kompilierung (nicht zu verwechseln mit Cross-Kompilierung). Siehe @code{--target} unten für Informationen zur Cross-Kompilierung." #. type: table -#: doc/guix.texi:8086 +#: doc/guix.texi:8084 msgid "An example use of this is on Linux-based systems, which can emulate different personalities. For instance, passing @code{--system=i686-linux} on an @code{x86_64-linux} system or @code{--system=armhf-linux} on an @code{aarch64-linux} system allows you to build packages in a complete 32-bit environment." msgstr "Ein Beispiel sind Linux-basierte Systeme, die verschiedene Persönlichkeiten emulieren können. Zum Beispiel können Sie @code{--system=i686-linux} auf einem @code{x86_64-linux}-System oder @code{--system=armhf-linux} auf einem @code{aarch64-linux}-System angeben, um Pakete in einer vollständigen 32-Bit-Umgebung zu erstellen." #. type: quotation -#: doc/guix.texi:8091 +#: doc/guix.texi:8089 msgid "Building for an @code{armhf-linux} system is unconditionally enabled on @code{aarch64-linux} machines, although certain aarch64 chipsets do not allow for this functionality, notably the ThunderX." msgstr "Das Erstellen für ein @code{armhf-linux}-System ist ungeprüft auf allen @code{aarch64-linux}-Maschinen aktiviert, obwohl bestimmte aarch64-Chipsätze diese Funktionalität nicht unterstützen, darunter auch ThunderX." #. type: table -#: doc/guix.texi:8097 +#: doc/guix.texi:8095 msgid "Similarly, when transparent emulation with QEMU and @code{binfmt_misc} is enabled (@pxref{Virtualization Services, @code{qemu-binfmt-service-type}}), you can build for any system for which a QEMU @code{binfmt_misc} handler is installed." msgstr "Ebenso können Sie, wenn transparente Emulation mit QEMU und @code{binfmt_misc} aktiviert sind (siehe @ref{Virtualization Services, @code{qemu-binfmt-service-type}}), für jedes System Erstellungen durchführen, für das ein QEMU-@code{binfmt_misc}-Handler installiert ist." #. type: table -#: doc/guix.texi:8101 +#: doc/guix.texi:8099 msgid "Builds for a system other than that of the machine you are using can also be offloaded to a remote machine of the right architecture. @xref{Daemon Offload Setup}, for more information on offloading." msgstr "Erstellungen für ein anderes System, das nicht dem System der Maschine, die Sie benutzen, entspricht, können auch auf eine entfernte Maschine mit der richtigen Architektur ausgelagert werden. Siehe @ref{Daemon Offload Setup} für mehr Informationen über das Auslagern." #. type: table -#: doc/guix.texi:8107 +#: doc/guix.texi:8105 msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf})." msgstr "Lässt für das angegebene @var{Tripel} cross-erstellen, dieses muss ein gültiges GNU-Tripel wie z.B.@: @code{\"mips64el-linux-gnu\"} sein (siehe @ref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf})." #. type: anchor{#1} -#: doc/guix.texi:8109 +#: doc/guix.texi:8107 msgid "build-check" msgstr "build-check" #. type: item -#: doc/guix.texi:8109 +#: doc/guix.texi:8107 #, no-wrap msgid "--check" msgstr "--check" #. type: cindex -#: doc/guix.texi:8110 +#: doc/guix.texi:8108 #, no-wrap msgid "determinism, checking" msgstr "Determinismus, Überprüfung" #. type: cindex -#: doc/guix.texi:8111 +#: doc/guix.texi:8109 #, no-wrap msgid "reproducibility, checking" msgstr "Reproduzierbarkeit, Überprüfung" #. type: table -#: doc/guix.texi:8115 +#: doc/guix.texi:8113 msgid "Rebuild @var{package-or-derivation}, which are already available in the store, and raise an error if the build results are not bit-for-bit identical." msgstr "@var{Paket-oder-Ableitung} erneut erstellen, wenn diese bereits im Store verfügbar ist, und einen Fehler melden, wenn die Erstellungsergebnisse nicht Bit für Bit identisch sind." #. type: table -#: doc/guix.texi:8120 +#: doc/guix.texi:8118 msgid "This mechanism allows you to check whether previously installed substitutes are genuine (@pxref{Substitutes}), or whether the build result of a package is deterministic. @xref{Invoking guix challenge}, for more background information and tools." msgstr "Mit diesem Mechanismus können Sie überprüfen, ob zuvor installierte Substitute unverfälscht sind (siehe @ref{Substitutes}) oder auch ob das Erstellungsergebnis eines Pakets deterministisch ist. Siehe @ref{Invoking guix challenge} für mehr Hintergrundinformationen und Werkzeuge." #. type: item -#: doc/guix.texi:8125 +#: doc/guix.texi:8123 #, no-wrap msgid "--repair" msgstr "--repair" #. type: cindex -#: doc/guix.texi:8126 +#: doc/guix.texi:8124 #, no-wrap msgid "repairing store items" msgstr "Reparieren von Store-Objekten" #. type: table -#: doc/guix.texi:8130 +#: doc/guix.texi:8128 msgid "Attempt to repair the specified store items, if they are corrupt, by re-downloading or rebuilding them." msgstr "Versuchen, die angegebenen Store-Objekte zu reparieren, wenn sie beschädigt sind, indem sie neu heruntergeladen oder neu erstellt werden." #. type: table -#: doc/guix.texi:8132 +#: doc/guix.texi:8130 msgid "This operation is not atomic and thus restricted to @code{root}." msgstr "Diese Operation ist nicht atomar und nur der Administratornutzer @code{root} kann sie verwenden." #. type: item -#: doc/guix.texi:8133 +#: doc/guix.texi:8131 #, no-wrap msgid "--derivations" msgstr "--derivations" #. type: itemx -#: doc/guix.texi:8134 doc/guix.texi:24570 +#: doc/guix.texi:8132 doc/guix.texi:24561 #, no-wrap msgid "-d" msgstr "-d" #. type: table -#: doc/guix.texi:8137 +#: doc/guix.texi:8135 msgid "Return the derivation paths, not the output paths, of the given packages." msgstr "Liefert die Ableitungspfade und @emph{nicht} die Ausgabepfade für die angegebenen Pakete." #. type: cindex -#: doc/guix.texi:8140 +#: doc/guix.texi:8138 #, no-wrap msgid "GC roots, adding" msgstr "GC-Wurzeln, Hinzufügen" #. type: cindex -#: doc/guix.texi:8141 +#: doc/guix.texi:8139 #, no-wrap msgid "garbage collector roots, adding" msgstr "Müllsammlerwurzeln, Hinzufügen" #. type: table -#: doc/guix.texi:8144 doc/guix.texi:24606 +#: doc/guix.texi:8142 doc/guix.texi:24592 msgid "Make @var{file} a symlink to the result, and register it as a garbage collector root." msgstr "Die @var{Datei} zu einer symbolischen Verknüpfung auf das Ergebnis machen und als Müllsammlerwurzel registrieren." #. type: table -#: doc/guix.texi:8150 +#: doc/guix.texi:8148 msgid "Consequently, the results of this @command{guix build} invocation are protected from garbage collection until @var{file} is removed. When that option is omitted, build results are eligible for garbage collection as soon as the build completes. @xref{Invoking guix gc}, for more on GC roots." msgstr "Dadurch wird das Ergebnis dieses Aufrufs von @command{guix build} vor dem Müllsammler geschützt, bis die @var{Datei} gelöscht wird. Wird diese Befehlszeilenoption @emph{nicht} angegeben, können Erstellungsergebnisse vom Müllsammler geholt werden, sobald die Erstellung abgeschlossen ist. Siehe @ref{Invoking guix gc} für mehr Informationen zu Müllsammlerwurzeln." #. type: item -#: doc/guix.texi:8151 +#: doc/guix.texi:8149 #, no-wrap msgid "--log-file" msgstr "--log-file" #. type: cindex -#: doc/guix.texi:8152 +#: doc/guix.texi:8150 #, no-wrap msgid "build logs, access" msgstr "Erstellungsprotokolle, Zugriff" #. type: table -#: doc/guix.texi:8156 +#: doc/guix.texi:8154 msgid "Return the build log file names or URLs for the given @var{package-or-derivation}, or raise an error if build logs are missing." msgstr "Liefert die Dateinamen oder URLs der Erstellungsprotokolle für das angegebene @var{Paket-oder-Ableitung} oder meldet einen Fehler, falls Protokolldateien fehlen." #. type: table -#: doc/guix.texi:8159 +#: doc/guix.texi:8157 msgid "This works regardless of how packages or derivations are specified. For instance, the following invocations are equivalent:" msgstr "Dies funktioniert, egal wie die Pakete oder Ableitungen angegeben werden. Zum Beispiel sind folgende Aufrufe alle äquivalent:" #. type: example -#: doc/guix.texi:8165 +#: doc/guix.texi:8163 #, no-wrap msgid "" "guix build --log-file `guix build -d guile`\n" @@ -15081,17 +15092,17 @@ msgstr "" "guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)'\n" #. type: table -#: doc/guix.texi:8170 +#: doc/guix.texi:8168 msgid "If a log is unavailable locally, and unless @code{--no-substitutes} is passed, the command looks for a corresponding log on one of the substitute servers (as specified with @code{--substitute-urls}.)" msgstr "Wenn ein Protokoll lokal nicht verfügbar ist und sofern @code{--no-substitutes} nicht übergeben wurde, sucht der Befehl nach einem entsprechenden Protokoll auf einem der Substitutserver (die mit @code{--substitute-urls} angegeben werden können)." #. type: table -#: doc/guix.texi:8173 +#: doc/guix.texi:8171 msgid "So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine:" msgstr "Stellen Sie sich zum Beispiel vor, sie wollten das Erstellungsprotokoll von GDB auf einem MIPS-System sehen, benutzen aber selbst eine @code{x86_64}-Maschine:" #. type: example -#: doc/guix.texi:8177 +#: doc/guix.texi:8175 #, no-wrap msgid "" "$ guix build --log-file gdb -s mips64el-linux\n" @@ -15101,33 +15112,33 @@ msgstr "" "https://@value{SUBSTITUTE-SERVER}/log/…-gdb-7.10\n" #. type: table -#: doc/guix.texi:8180 +#: doc/guix.texi:8178 msgid "You can freely access a huge library of build logs!" msgstr "So haben Sie umsonst Zugriff auf eine riesige Bibliothek von Erstellungsprotokollen!" #. type: cindex -#: doc/guix.texi:8185 +#: doc/guix.texi:8183 #, no-wrap msgid "build failures, debugging" msgstr "Erstellungsfehler, Fehlersuche" #. type: Plain text -#: doc/guix.texi:8191 +#: doc/guix.texi:8189 msgid "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." msgstr "Wenn Sie ein neues Paket definieren (siehe @ref{Defining Packages}), werden Sie sich vermutlich einige Zeit mit der Fehlersuche beschäftigen und die Erstellung so lange anpassen, bis sie funktioniert. Dazu müssen Sie die Erstellungsbefehle selbst in einer Umgebung benutzen, die der, die der Erstellungsdaemon aufbaut, so ähnlich wie möglich ist." #. type: Plain text -#: doc/guix.texi:8196 +#: doc/guix.texi:8194 msgid "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}})." msgstr "Das Erste, was Sie dafür tun müssen, ist die Befehlszeilenoption @option{--keep-failed} oder @option{-K} von @command{guix build} einzusetzen, wodurch Verzeichnisbäume fehlgeschlagener Erstellungen in @file{/tmp} oder dem von Ihnen als @code{TMPDIR} ausgewiesenen Verzeichnis erhalten und nicht gelöscht werden (siehe @ref{Invoking guix build, @code{--keep-failed}})." #. type: Plain text -#: doc/guix.texi:8202 +#: doc/guix.texi:8200 msgid "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:" msgstr "Im Anschluss können Sie mit @command{cd} in die Verzeichnisse dieses fehlgeschlagenen Erstellungsbaums wechseln und mit @command{source} dessen @file{environment-variables}-Datei laden, die alle Umgebungsvariablendefinitionen enthält, die zum Zeitpunkt des Fehlschlags der Erstellung galten. Sagen wir, Sie suchen Fehler in einem Paket @code{foo}, dann würde eine typische Sitzung so aussehen:" #. type: example -#: doc/guix.texi:8209 +#: doc/guix.texi:8207 #, no-wrap msgid "" "$ guix build foo -K\n" @@ -15143,22 +15154,22 @@ msgstr "" "$ cd foo-1.2\n" #. type: Plain text -#: doc/guix.texi:8213 +#: doc/guix.texi:8211 msgid "Now, you can invoke commands as if you were the daemon (almost) and troubleshoot your build process." msgstr "Nun können Sie Befehle (fast) so aufrufen, als wären Sie der Daemon, und Fehlerursachen in Ihrem Erstellungsprozess ermitteln." #. type: Plain text -#: doc/guix.texi:8219 +#: doc/guix.texi:8217 msgid "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})." msgstr "Manchmal passiert es, dass zum Beispiel die Tests eines Pakets erfolgreich sind, wenn Sie sie manuell aufrufen, aber scheitern, wenn der Daemon sie ausführt. Das kann passieren, weil der Daemon Erstellungen in isolierten Umgebungen („Containern“) durchführt, wo, anders als in der obigen Umgebung, kein Netzwerkzugang möglich ist, @file{/bin/sh} nicht exisiert usw.@: (siehe @ref{Build Environment Setup})." #. type: Plain text -#: doc/guix.texi:8222 +#: doc/guix.texi:8220 msgid "In such cases, you may need to run inspect the build process from within a container similar to the one the build daemon creates:" msgstr "In solchen Fällen müssen Sie den Erstellungsprozess womöglich aus einer zu der des Daemons ähnlichen isolierten Umgebung heraus ausprobieren:" #. type: example -#: doc/guix.texi:8230 +#: doc/guix.texi:8228 #, no-wrap msgid "" "$ guix build -K foo\n" @@ -15176,251 +15187,251 @@ msgstr "" "[env]# cd foo-1.2\n" #. type: Plain text -#: doc/guix.texi:8239 +#: doc/guix.texi:8237 msgid "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. The @option{--no-grafts} option makes sure we get the exact same environment, with ungrafted packages (@pxref{Security Updates}, for more info on grafts)." msgstr "Hierbei erzeugt @command{guix environment -C} eine isolierte Umgebung und öffnet darin eine Shell (siehe @ref{Invoking guix environment}). Der Teil mit @command{--ad-hoc strace gdb} fügt die Befehle @command{strace} und @command{gdb} zur isolierten Umgebung hinzu, die Sie gut gebrauchen könnten, während Sie Fehler suchen. Wegen der Befehlszeilenoption @option{--no-grafts} bekommen Sie haargenau dieselbe Umgebung ohne veredelte Pakete (siehe @ref{Security Updates} für mehr Informationen zu Veredelungen)." #. type: Plain text -#: doc/guix.texi:8242 +#: doc/guix.texi:8240 msgid "To get closer to a container like that used by the build daemon, we can remove @file{/bin/sh}:" msgstr "Um der isolierten Umgebung des Erstellungsdaemons noch näher zu kommen, können wir @file{/bin/sh} entfernen:" #. type: example -#: doc/guix.texi:8245 +#: doc/guix.texi:8243 #, no-wrap msgid "[env]# rm /bin/sh\n" msgstr "[env]# rm /bin/sh\n" #. type: Plain text -#: doc/guix.texi:8249 +#: doc/guix.texi:8247 msgid "(Don't worry, this is harmless: this is all happening in the throw-away container created by @command{guix environment}.)" msgstr "(Keine Sorge, das ist harmlos: All dies passiert nur in der zuvor von @command{guix environment} erzeugten Wegwerf-Umgebung.)" #. type: Plain text -#: doc/guix.texi:8252 +#: doc/guix.texi:8250 msgid "The @command{strace} command is probably not in the search path, but we can run:" msgstr "Der Befehl @command{strace} befindet sich wahrscheinlich nicht in Ihrem Suchpfad, aber wir können ihn so benutzen:" #. type: example -#: doc/guix.texi:8255 +#: doc/guix.texi:8253 #, no-wrap msgid "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n" msgstr "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n" #. type: Plain text -#: doc/guix.texi:8260 +#: doc/guix.texi:8258 msgid "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." msgstr "Auf diese Weise haben Sie nicht nur die Umgebungsvariablen, die der Daemon benutzt, nachgebildet, sondern lassen auch den Erstellungsprozess in einer isolierten Umgebung ähnlich der des Daemons laufen." #. type: section -#: doc/guix.texi:8263 +#: doc/guix.texi:8261 #, no-wrap msgid "Invoking @command{guix edit}" msgstr "@command{guix edit} aufrufen" #. type: command{#1} -#: doc/guix.texi:8265 +#: doc/guix.texi:8263 #, no-wrap msgid "guix edit" msgstr "guix edit" #. type: cindex -#: doc/guix.texi:8266 +#: doc/guix.texi:8264 #, no-wrap msgid "package definition, editing" msgstr "Paketdefinition, Bearbeiten" #. type: Plain text -#: doc/guix.texi:8271 +#: doc/guix.texi:8269 msgid "So many packages, so many source files! The @command{guix edit} command facilitates the life of users and packagers by pointing their editor at the source file containing the definition of the specified packages. For instance:" msgstr "So viele Pakete, so viele Quelldateien! Der Befehl @command{guix edit} erleichtert das Leben von sowohl Nutzern als auch Paketentwicklern, indem er Ihren Editor anweist, die Quelldatei mit der Definition des jeweiligen Pakets zu bearbeiten. Zum Beispiel startet dies:" #. type: example -#: doc/guix.texi:8274 +#: doc/guix.texi:8272 #, no-wrap msgid "guix edit gcc@@4.9 vim\n" msgstr "guix edit gcc@@4.9 vim\n" #. type: Plain text -#: doc/guix.texi:8280 +#: doc/guix.texi:8278 msgid "launches the program specified in the @code{VISUAL} or in the @code{EDITOR} environment variable to view the recipe of GCC@tie{}4.9.3 and that of Vim." msgstr "das mit der Umgebungsvariablen @code{VISUAL} ode @code{EDITOR} angegebene Programm und lässt es das Rezept von GCC@tie{}4.9.3 und von Vim anzeigen." #. type: Plain text -#: doc/guix.texi:8286 +#: doc/guix.texi:8284 msgid "If you are using a Guix Git checkout (@pxref{Building from Git}), or have created your own packages on @code{GUIX_PACKAGE_PATH} (@pxref{Package Modules}), you will be able to edit the package recipes. In other cases, you will be able to examine the read-only recipes for packages currently in the store." msgstr "Wenn Sie ein Git-Checkout von Guix benutzen (siehe @ref{Building from Git}) oder Ihre eigenen Pakete im @code{GUIX_PACKAGE_PATH} erstellt haben (siehe @ref{Package Modules}), werden Sie damit die Paketrezepte auch bearbeiten können. Andernfalls werden Sie zumindest in die Lage versetzt, die nur lesbaren Rezepte für sich im Moment im Store befindliche Pakete zu untersuchen." #. type: section -#: doc/guix.texi:8289 +#: doc/guix.texi:8287 #, no-wrap msgid "Invoking @command{guix download}" msgstr "@command{guix download} aufrufen" #. type: command{#1} -#: doc/guix.texi:8291 +#: doc/guix.texi:8289 #, no-wrap msgid "guix download" msgstr "guix download" #. type: cindex -#: doc/guix.texi:8292 +#: doc/guix.texi:8290 #, no-wrap msgid "downloading package sources" msgstr "Paketquellcode herunterladen" #. type: Plain text -#: doc/guix.texi:8299 +#: doc/guix.texi:8297 msgid "When writing a package definition, developers typically need to download a source tarball, compute its SHA256 hash, and write that hash in the package definition (@pxref{Defining Packages}). The @command{guix download} tool helps with this task: it downloads a file from the given URI, adds it to the store, and prints both its file name in the store and its SHA256 hash." msgstr "Wenn Entwickler einer Paketdefinition selbige schreiben, müssen diese normalerweise einen Quellcode-Tarball herunterladen, seinen SHA256-Hash als Prüfsumme berechnen und diese in der Paketdefinition eintragen (siehe @ref{Defining Packages}). Das Werkzeug @command{guix download} hilft bei dieser Aufgabe: Damit wird eine Datei von der angegebenen URI heruntergeladen, in den Store eingelagert und sowohl ihr Dateiname im Store als auch ihr SHA256-Hash als Prüfsumme angezeigt." #. type: Plain text -#: doc/guix.texi:8306 +#: doc/guix.texi:8304 msgid "The fact that the downloaded file is added to the store saves bandwidth: when the developer eventually tries to build the newly defined package with @command{guix build}, the source tarball will not have to be downloaded again because it is already in the store. It is also a convenient way to temporarily stash files, which may be deleted eventually (@pxref{Invoking guix gc})." msgstr "Dadurch, dass die heruntergeladene Datei in den Store eingefügt wird, wird Bandbreite gespart: Wenn der Entwickler schließlich versucht, das neu definierte Paket mit @command{guix build} zu erstellen, muss der Quell-Tarball nicht erneut heruntergeladen werden, weil er sich bereits im Store befindet. Es ist auch eine bequeme Methode, Dateien temporär aufzubewahren, die letztlich irgendwann gelöscht werden (siehe @ref{Invoking guix gc})." #. type: Plain text -#: doc/guix.texi:8314 +#: doc/guix.texi:8312 msgid "The @command{guix download} command supports the same URIs as used in package definitions. In particular, it supports @code{mirror://} URIs. @code{https} URIs (HTTP over TLS) are supported @emph{provided} the Guile bindings for GnuTLS are available in the user's environment; when they are not available, an error is raised. @xref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, for more information." msgstr "Der Befehl @command{guix download} unterstützt dieselben URIs, die in Paketdefinitionen verwendet werden. Insbesondere unterstützt er @code{mirror://}-URIs. @code{https}-URIs (HTTP über TLS) werden unterstützt, @emph{vorausgesetzt} die Guile-Anbindungen für GnuTLS sind in der Umgebung des Benutzers verfügbar; wenn nicht, wird ein Fehler gemeldet. Siehe @ref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, hat mehr Informationen." #. type: Plain text -#: doc/guix.texi:8319 +#: doc/guix.texi:8317 msgid "@command{guix download} verifies HTTPS server certificates by loading the certificates of X.509 authorities from the directory pointed to by the @code{SSL_CERT_DIR} environment variable (@pxref{X.509 Certificates}), unless @option{--no-check-certificate} is used." msgstr "Mit @command{guix download} werden HTTPS-Serverzertifikate verifiziert, indem die Zertifikate der X.509-Autoritäten in das durch die Umgebungsvariable @code{SSL_CERT_DIR} bezeichnete Verzeichnis heruntergeladen werden (siehe @ref{X.509 Certificates}), außer @option{--no-check-certificate} wird benutzt." #. type: Plain text -#: doc/guix.texi:8321 doc/guix.texi:9638 +#: doc/guix.texi:8319 doc/guix.texi:9636 msgid "The following options are available:" msgstr "Folgende Befehlszeilenoptionen stehen zur Verfügung:" #. type: item -#: doc/guix.texi:8323 doc/guix.texi:8362 +#: doc/guix.texi:8321 doc/guix.texi:8360 #, no-wrap msgid "--format=@var{fmt}" msgstr "--format=@var{Format}" #. type: itemx -#: doc/guix.texi:8324 doc/guix.texi:8363 +#: doc/guix.texi:8322 doc/guix.texi:8361 #, no-wrap msgid "-f @var{fmt}" msgstr "-f @var{Format}" #. type: table -#: doc/guix.texi:8327 +#: doc/guix.texi:8325 msgid "Write the hash in the format specified by @var{fmt}. For more information on the valid values for @var{fmt}, @pxref{Invoking guix hash}." msgstr "Die Hash-Prüfsumme im angegebenen @var{Format} ausgeben. Für weitere Informationen, was gültige Werte für das @var{Format} sind, siehe @ref{Invoking guix hash}." #. type: item -#: doc/guix.texi:8328 +#: doc/guix.texi:8326 #, no-wrap msgid "--no-check-certificate" msgstr "--no-check-certificate" #. type: table -#: doc/guix.texi:8330 +#: doc/guix.texi:8328 msgid "Do not validate the X.509 certificates of HTTPS servers." msgstr "X.509-Zertifikate von HTTPS-Servern @emph{nicht} validieren." #. type: table -#: doc/guix.texi:8334 +#: doc/guix.texi:8332 msgid "When using this option, you have @emph{absolutely no guarantee} that you are communicating with the authentic server responsible for the given URL, which makes you vulnerable to ``man-in-the-middle'' attacks." msgstr "Wenn Sie diese Befehlszeilenoption benutzen, haben Sie @emph{keinerlei Garantie}, dass Sie tatsächlich mit dem authentischen Server, der für die angegebene URL verantwortlich ist, kommunizieren. Das macht Sie anfällig gegen sogenannte „Man-in-the-Middle“-Angriffe." #. type: item -#: doc/guix.texi:8335 +#: doc/guix.texi:8333 #, no-wrap msgid "--output=@var{file}" msgstr "--output=@var{Datei}" #. type: itemx -#: doc/guix.texi:8336 +#: doc/guix.texi:8334 #, no-wrap msgid "-o @var{file}" msgstr "-o @var{Datei}" #. type: table -#: doc/guix.texi:8339 +#: doc/guix.texi:8337 msgid "Save the downloaded file to @var{file} instead of adding it to the store." msgstr "Die heruntergeladene Datei @emph{nicht} in den Store, sondern in die angegebene @var{Datei} abspeichern." #. type: section -#: doc/guix.texi:8342 +#: doc/guix.texi:8340 #, no-wrap msgid "Invoking @command{guix hash}" msgstr "@command{guix hash} aufrufen" #. type: command{#1} -#: doc/guix.texi:8344 +#: doc/guix.texi:8342 #, no-wrap msgid "guix hash" msgstr "guix hash" #. type: Plain text -#: doc/guix.texi:8349 +#: doc/guix.texi:8347 msgid "The @command{guix hash} command computes the SHA256 hash of a file. It is primarily a convenience tool for anyone contributing to the distribution: it computes the cryptographic hash of a file, which can be used in the definition of a package (@pxref{Defining Packages})." msgstr "Der Befehl @command{guix hash} berechnet den SHA256-Hash einer Datei. Er ist primär ein Werkzeug, dass es bequemer macht, etwas zur Distribution beizusteuern: Damit wird die kryptografische Hash-Prüfsumme berechnet, die bei der Definition eines Pakets benutzt werden kann (siehe @ref{Defining Packages})." #. type: example -#: doc/guix.texi:8354 +#: doc/guix.texi:8352 #, no-wrap msgid "guix hash @var{option} @var{file}\n" msgstr "guix hash @var{Option} @var{Datei}\n" #. type: Plain text -#: doc/guix.texi:8359 +#: doc/guix.texi:8357 msgid "When @var{file} is @code{-} (a hyphen), @command{guix hash} computes the hash of data read from standard input. @command{guix hash} has the following options:" msgstr "Wird als @var{Datei} ein Bindestrich @code{-} angegeben, berechnet @command{guix hash} den Hash der von der Standardeingabe gelesenen Daten. @command{guix hash} unterstützt die folgenden Optionen:" #. type: table -#: doc/guix.texi:8365 +#: doc/guix.texi:8363 msgid "Write the hash in the format specified by @var{fmt}." msgstr "Gibt die Prüfsumme im angegebenen @var{Format} aus." #. type: table -#: doc/guix.texi:8368 +#: doc/guix.texi:8366 msgid "Supported formats: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well)." msgstr "Unterstützte Formate: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} und @code{hexadecimal} können auch benutzt werden)." #. type: table -#: doc/guix.texi:8372 +#: doc/guix.texi:8370 msgid "If the @option{--format} option is not specified, @command{guix hash} will output the hash in @code{nix-base32}. This representation is used in the definitions of packages." msgstr "Wird keine Befehlszeilenoption @option{--format} angegeben, wird @command{guix hash} die Prüfsumme im @code{nix-base32}-Format ausgeben. Diese Darstellung wird bei der Definition von Paketen benutzt." #. type: table -#: doc/guix.texi:8376 +#: doc/guix.texi:8374 msgid "Compute the hash on @var{file} recursively." msgstr "Die Prüfsumme der @var{Datei} rekursiv berechnen." #. type: table -#: doc/guix.texi:8385 +#: doc/guix.texi:8383 msgid "In this case, the hash is computed on an archive containing @var{file}, including its children if it is a directory. Some of the metadata of @var{file} is part of the archive; for instance, when @var{file} is a regular file, the hash is different depending on whether @var{file} is executable or not. Metadata such as time stamps has no impact on the hash (@pxref{Invoking guix archive})." msgstr "In diesem Fall wird die Prüfsumme eines Archivs berechnet, das die @var{Datei} enthält, und auch ihre Kinder, wenn es sich um ein Verzeichnis handelt. Einige der Metadaten der @var{Datei} sind Teil dieses Archivs. Zum Beispiel unterscheidet sich die berechnete Prüfsumme, wenn die @var{Datei} eine reguläre Datei ist, je nachdem, ob die @var{Datei} ausführbar ist oder nicht. Metadaten wie der Zeitstempel haben keinen Einfluss auf die Prüfsumme (siehe @ref{Invoking guix archive})." #. type: item -#: doc/guix.texi:8386 +#: doc/guix.texi:8384 #, no-wrap msgid "--exclude-vcs" msgstr "--exclude-vcs" #. type: itemx -#: doc/guix.texi:8387 +#: doc/guix.texi:8385 #, no-wrap msgid "-x" msgstr "-x" #. type: table -#: doc/guix.texi:8390 +#: doc/guix.texi:8388 msgid "When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)" msgstr "Wenn dies zusammen mit der Befehlszeilenoption @option{--recursive} angegeben wird, werden Verzeichnisse zur Versionskontrolle (@file{.bzr}, @file{.git}, @file{.hg}, etc.)@: vom Archiv ausgenommen." #. type: table -#: doc/guix.texi:8395 +#: doc/guix.texi:8393 msgid "As an example, here is how you would compute the hash of a Git checkout, which is useful when using the @code{git-fetch} method (@pxref{origin Reference}):" msgstr "Zum Beispiel würden Sie auf diese Art die Prüfsumme eines Git-Checkouts berechnen, was nützlich ist, wenn Sie die Prüfsumme für die Methode @code{git-fetch} benutzen (siehe @ref{origin Reference}):" #. type: example -#: doc/guix.texi:8400 +#: doc/guix.texi:8398 #, no-wrap msgid "" "$ git clone http://example.org/foo.git\n" @@ -15432,299 +15443,299 @@ msgstr "" "$ guix hash -rx .\n" #. type: cindex -#: doc/guix.texi:8404 doc/guix.texi:8409 +#: doc/guix.texi:8402 doc/guix.texi:8407 #, no-wrap msgid "Invoking @command{guix import}" msgstr "@command{guix import} aufrufen" #. type: cindex -#: doc/guix.texi:8406 +#: doc/guix.texi:8404 #, no-wrap msgid "importing packages" msgstr "Pakete importieren" #. type: cindex -#: doc/guix.texi:8407 +#: doc/guix.texi:8405 #, no-wrap msgid "package import" msgstr "Paketimport" #. type: cindex -#: doc/guix.texi:8408 +#: doc/guix.texi:8406 #, no-wrap msgid "package conversion" msgstr "Pakete an Guix anpassen" #. type: Plain text -#: doc/guix.texi:8416 +#: doc/guix.texi:8414 msgid "The @command{guix import} command is useful for people who would like to add a package to the distribution with as little work as possible---a legitimate demand. The command knows of a few repositories from which it can ``import'' package metadata. The result is a package definition, or a template thereof, in the format we know (@pxref{Defining Packages})." msgstr "Der Befehl @command{guix import} ist für Leute hilfreich, die ein Paket gerne mit so wenig Arbeit wie möglich zur Distribution hinzufügen würden — ein legitimer Anspruch. Der Befehl kennt ein paar Sammlungen, aus denen mit ihm Paketmetadaten „importiert“ werden können. Das Ergebnis ist eine Paketdefinition oder eine Vorlage dafür in dem uns bekannten Format (siehe @ref{Defining Packages})." #. type: example -#: doc/guix.texi:8421 +#: doc/guix.texi:8419 #, no-wrap msgid "guix import @var{importer} @var{options}@dots{}\n" msgstr "guix import @var{Importer} @var{Optionen}…\n" #. type: Plain text -#: doc/guix.texi:8427 +#: doc/guix.texi:8425 msgid "@var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and other options specific to @var{importer}. Currently, the available ``importers'' are:" msgstr "Der @var{Importer} gibt die Quelle an, aus der Paketmetadaten importiert werden, und die @var{Optionen} geben eine Paketbezeichnung und andere vom @var{Importer} abhängige Daten an. Derzeit sind folgende „Importer“ verfügbar:" #. type: item -#: doc/guix.texi:8429 doc/guix.texi:8929 +#: doc/guix.texi:8427 doc/guix.texi:8927 #, no-wrap msgid "gnu" msgstr "gnu" #. type: table -#: doc/guix.texi:8433 +#: doc/guix.texi:8431 msgid "Import metadata for the given GNU package. This provides a template for the latest version of that GNU package, including the hash of its source tarball, and its canonical synopsis and description." msgstr "Metadaten für das angegebene GNU-Paket importieren. Damit wird eine Vorlage für die neueste Version dieses GNU-Pakets zur Verfügung gestellt, einschließlich der Prüfsumme seines Quellcode-Tarballs, seiner kanonischen Zusammenfassung und seiner Beschreibung." #. type: table -#: doc/guix.texi:8436 +#: doc/guix.texi:8434 msgid "Additional information such as the package dependencies and its license needs to be figured out manually." msgstr "Zusätzliche Informationen wie Paketabhängigkeiten und seine Lizenz müssen noch manuell ermittelt werden." #. type: table -#: doc/guix.texi:8439 +#: doc/guix.texi:8437 msgid "For example, the following command returns a package definition for GNU@tie{}Hello:" msgstr "Zum Beispiel liefert der folgende Befehl eine Paketdefinition für GNU@tie{}Hello:" #. type: example -#: doc/guix.texi:8442 +#: doc/guix.texi:8440 #, no-wrap msgid "guix import gnu hello\n" msgstr "guix import gnu hello\n" #. type: table -#: doc/guix.texi:8445 doc/guix.texi:8672 doc/guix.texi:8722 doc/guix.texi:8751 +#: doc/guix.texi:8443 doc/guix.texi:8670 doc/guix.texi:8720 doc/guix.texi:8749 msgid "Specific command-line options are:" msgstr "Speziell für diesen Importer stehen noch folgende Befehlszeilenoptionen zur Verfügung:" #. type: item -#: doc/guix.texi:8447 doc/guix.texi:9078 +#: doc/guix.texi:8445 doc/guix.texi:9076 #, no-wrap msgid "--key-download=@var{policy}" msgstr "--key-download=@var{Richtlinie}" #. type: table -#: doc/guix.texi:8451 +#: doc/guix.texi:8449 msgid "As for @code{guix refresh}, specify the policy to handle missing OpenPGP keys when verifying the package signature. @xref{Invoking guix refresh, @code{--key-download}}." msgstr "Die Richtlinie zum Umgang mit fehlenden OpenPGP-Schlüsseln beim Verifizieren der Paketsignatur (auch „Beglaubigung“ genannt) festlegen, wie bei @code{guix refresh}. Siehe @ref{Invoking guix refresh, @code{--key-download}}." #. type: item -#: doc/guix.texi:8453 doc/guix.texi:8454 doc/guix.texi:8947 +#: doc/guix.texi:8451 doc/guix.texi:8452 doc/guix.texi:8945 #, no-wrap msgid "pypi" msgstr "pypi" #. type: table -#: doc/guix.texi:8461 +#: doc/guix.texi:8459 msgid "Import metadata from the @uref{https://pypi.python.org/, Python Package Index}. Information is taken from the JSON-formatted description available at @code{pypi.python.org} and usually includes all the relevant information, including package dependencies. For maximum efficiency, it is recommended to install the @command{unzip} utility, so that the importer can unzip Python wheels and gather data from them." msgstr "Metadaten aus dem @uref{https://pypi.python.org/, Python Package Index} importieren. Informationen stammen aus der JSON-formatierten Beschreibung, die unter @code{pypi.python.org} verfügbar ist, und enthalten meistens alle relevanten Informationen einschließlich der Abhängigkeiten des Pakets. Für maximale Effizienz wird empfohlen, das Hilfsprogramm @command{unzip} zu installieren, damit der Importer „Python Wheels“ entpacken und daraus Daten beziehen kann." #. type: table -#: doc/guix.texi:8464 +#: doc/guix.texi:8462 msgid "The command below imports metadata for the @code{itsdangerous} Python package:" msgstr "Der folgende Befehl importiert Metadaten für das Python-Paket namens @code{itsdangerous}:" #. type: example -#: doc/guix.texi:8467 +#: doc/guix.texi:8465 #, no-wrap msgid "guix import pypi itsdangerous\n" msgstr "guix import pypi itsdangerous\n" #. type: table -#: doc/guix.texi:8475 doc/guix.texi:8500 doc/guix.texi:8695 doc/guix.texi:8736 -#: doc/guix.texi:8783 +#: doc/guix.texi:8473 doc/guix.texi:8498 doc/guix.texi:8693 doc/guix.texi:8734 +#: doc/guix.texi:8781 msgid "Traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix." msgstr "Den Abhängigkeitsgraphen des angegebenen Pakets beim Anbieter rekursiv durchlaufen und Paketausdrücke für alle solchen Pakete erzeugen, die es in Guix noch nicht gibt." #. type: item -#: doc/guix.texi:8477 doc/guix.texi:8478 doc/guix.texi:8949 +#: doc/guix.texi:8475 doc/guix.texi:8476 doc/guix.texi:8947 #, no-wrap msgid "gem" msgstr "gem" #. type: table -#: doc/guix.texi:8487 +#: doc/guix.texi:8485 msgid "Import metadata from @uref{https://rubygems.org/, RubyGems}. Information is taken from the JSON-formatted description available at @code{rubygems.org} and includes most relevant information, including runtime dependencies. There are some caveats, however. The metadata doesn't distinguish between synopses and descriptions, so the same string is used for both fields. Additionally, the details of non-Ruby dependencies required to build native extensions is unavailable and left as an exercise to the packager." msgstr "Metadaten von @uref{https://rubygems.org/, RubyGems} importieren. Informationen kommen aus der JSON-formatierten Beschreibung, die auf @code{rubygems.org} verfügbar ist, und enthält die relevantesten Informationen einschließlich der Laufzeitabhängigkeiten. Dies hat aber auch Schattenseiten — die Metadaten unterscheiden nicht zwischen Zusammenfassungen und Beschreibungen, daher wird dieselbe Zeichenkette für beides eingesetzt. Zudem fehlen Informationen zu nicht in Ruby geschriebenen Abhängigkeiten, die benötigt werden, um native Erweiterungen zu in Ruby geschriebenem Code zu erstellen. Diese herauszufinden bleibt dem Paketentwickler überlassen." #. type: table -#: doc/guix.texi:8489 +#: doc/guix.texi:8487 msgid "The command below imports metadata for the @code{rails} Ruby package:" msgstr "Der folgende Befehl importiert Metadaten aus dem Ruby-Paket @code{rails}." #. type: example -#: doc/guix.texi:8492 +#: doc/guix.texi:8490 #, no-wrap msgid "guix import gem rails\n" msgstr "guix import gem rails\n" #. type: item -#: doc/guix.texi:8502 doc/guix.texi:8945 +#: doc/guix.texi:8500 doc/guix.texi:8943 #, no-wrap msgid "cpan" msgstr "cpan" #. type: cindex -#: doc/guix.texi:8503 +#: doc/guix.texi:8501 #, no-wrap msgid "CPAN" msgstr "CPAN" #. type: table -#: doc/guix.texi:8511 +#: doc/guix.texi:8509 msgid "Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}. Information is taken from the JSON-formatted metadata provided through @uref{https://fastapi.metacpan.org/, MetaCPAN's API} and includes most relevant information, such as module dependencies. License information should be checked closely. If Perl is available in the store, then the @code{corelist} utility will be used to filter core modules out of the list of dependencies." msgstr "Importiert Metadaten von @uref{https://www.metacpan.org/, MetaCPAN}. Informationen werden aus den JSON-formatierten Metadaten genommen, die über die @uref{https://fastapi.metacpan.org/, Programmierschnittstelle („API“) von MetaCPAN} angeboten werden, und enthalten die relevantesten Informationen wie zum Beispiel Modulabhängigkeiten. Lizenzinformationen sollten genau nachgeprüft werden. Wenn Perl im Store verfügbar ist, wird das Werkzeug @code{corelist} benutzt, um Kernmodule in der Abhängigkeitsliste wegzulassen." #. type: table -#: doc/guix.texi:8514 +#: doc/guix.texi:8512 msgid "The command command below imports metadata for the @code{Acme::Boolean} Perl module:" msgstr "Folgender Befehl importiert Metadaten für das Perl-Modul @code{Acme::Boolean}:" #. type: example -#: doc/guix.texi:8517 +#: doc/guix.texi:8515 #, no-wrap msgid "guix import cpan Acme::Boolean\n" msgstr "guix import cpan Acme::Boolean\n" #. type: item -#: doc/guix.texi:8519 doc/guix.texi:8941 +#: doc/guix.texi:8517 doc/guix.texi:8939 #, no-wrap msgid "cran" msgstr "cran" #. type: cindex -#: doc/guix.texi:8520 +#: doc/guix.texi:8518 #, no-wrap msgid "CRAN" msgstr "CRAN" #. type: cindex -#: doc/guix.texi:8521 +#: doc/guix.texi:8519 #, no-wrap msgid "Bioconductor" msgstr "Bioconductor" #. type: table -#: doc/guix.texi:8525 +#: doc/guix.texi:8523 msgid "Import metadata from @uref{https://cran.r-project.org/, CRAN}, the central repository for the @uref{https://r-project.org, GNU@tie{}R statistical and graphical environment}." msgstr "Metadaten aus dem @uref{https://cran.r-project.org/, CRAN} importieren, der zentralen Sammlung für die @uref{https://r-project.org, statistische und grafische Umgebung GNU@tie{}R}." #. type: table -#: doc/guix.texi:8527 +#: doc/guix.texi:8525 msgid "Information is extracted from the @code{DESCRIPTION} file of the package." msgstr "Informationen werden aus der Datei namens @code{DESCRIPTION} des Pakets extrahiert." #. type: table -#: doc/guix.texi:8530 +#: doc/guix.texi:8528 msgid "The command command below imports metadata for the @code{Cairo} R package:" msgstr "Der folgende Befehl importiert Metadaten für das @code{Cairo}-R-Paket:" #. type: example -#: doc/guix.texi:8533 +#: doc/guix.texi:8531 #, no-wrap msgid "guix import cran Cairo\n" msgstr "guix import cran Cairo\n" #. type: table -#: doc/guix.texi:8538 +#: doc/guix.texi:8536 msgid "When @code{--recursive} is added, the importer will traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix." msgstr "Wird zudem @code{--recursive} angegeben, wird der Importer den Abhängigkeitsgraphen des angegebenen Pakets beim Anbieter rekursiv durchlaufen und Paketausdrücke für all die Pakete erzeugen, die noch nicht Teil von Guix sind." #. type: table -#: doc/guix.texi:8543 +#: doc/guix.texi:8541 msgid "When @code{--archive=bioconductor} is added, metadata is imported from @uref{https://www.bioconductor.org/, Bioconductor}, a repository of R packages for for the analysis and comprehension of high-throughput genomic data in bioinformatics." msgstr "Wird @code{--archive=bioconductor} angegeben, werden Metadaten vom @uref{https://www.bioconductor.org/, Bioconductor} importiert, einer Sammlung von R-Paketen zur Analyse und zum Verständnis von großen Mengen genetischer Daten in der Bioinformatik." #. type: table -#: doc/guix.texi:8546 +#: doc/guix.texi:8544 msgid "Information is extracted from the @code{DESCRIPTION} file of a package published on the web interface of the Bioconductor SVN repository." msgstr "Informationen werden aus der @code{DESCRIPTION}-Datei im Paket extrahiert, das auf der Weboberfläche des Bioconductor-SVN-Repositorys veröffentlicht wurde." #. type: table -#: doc/guix.texi:8549 +#: doc/guix.texi:8547 msgid "The command below imports metadata for the @code{GenomicRanges} R package:" msgstr "Der folgende Befehl importiert Metadaten für das R-Paket @code{GenomicRanges}:" #. type: example -#: doc/guix.texi:8552 +#: doc/guix.texi:8550 #, no-wrap msgid "guix import cran --archive=bioconductor GenomicRanges\n" msgstr "guix import cran --archive=bioconductor GenomicRanges\n" #. type: item -#: doc/guix.texi:8554 +#: doc/guix.texi:8552 #, no-wrap msgid "texlive" msgstr "texlive" #. type: cindex -#: doc/guix.texi:8555 +#: doc/guix.texi:8553 #, no-wrap msgid "TeX Live" msgstr "TeX Live" #. type: cindex -#: doc/guix.texi:8556 +#: doc/guix.texi:8554 #, no-wrap msgid "CTAN" msgstr "CTAN" #. type: table -#: doc/guix.texi:8560 +#: doc/guix.texi:8558 msgid "Import metadata from @uref{https://www.ctan.org/, CTAN}, the comprehensive TeX archive network for TeX packages that are part of the @uref{https://www.tug.org/texlive/, TeX Live distribution}." msgstr "Metadaten aus @uref{https://www.ctan.org/, CTAN}, dem umfassenden TeX-Archivnetzwerk, herunterladen, was für TeX-Pakete benutzt wird, die Teil der @uref{https://www.tug.org/texlive/, TeX-Live-Distribution} sind." #. type: table -#: doc/guix.texi:8565 +#: doc/guix.texi:8563 msgid "Information about the package is obtained through the XML API provided by CTAN, while the source code is downloaded from the SVN repository of the Tex Live project. This is done because the CTAN does not keep versioned archives." msgstr "Informationen über das Paket werden über die von CTAN angebotene XML-Programmierschnittstelle bezogen, wohingegen der Quellcode aus dem SVN-Repository des TeX-Live-Projekts heruntergeladen wird. Das wird so gemacht, weil CTAN keine versionierten Archive vorhält." #. type: table -#: doc/guix.texi:8568 +#: doc/guix.texi:8566 msgid "The command command below imports metadata for the @code{fontspec} TeX package:" msgstr "Der folgende Befehl importiert Metadaten für das TeX-Paket @code{fontspec}:" #. type: example -#: doc/guix.texi:8571 +#: doc/guix.texi:8569 #, no-wrap msgid "guix import texlive fontspec\n" msgstr "guix import texlive fontspec\n" #. type: table -#: doc/guix.texi:8577 +#: doc/guix.texi:8575 msgid "When @code{--archive=DIRECTORY} is added, the source code is downloaded not from the @file{latex} sub-directory of the @file{texmf-dist/source} tree in the TeX Live SVN repository, but from the specified sibling directory under the same root." msgstr "Wenn @code{--archive=VERZEICHNIS} angegeben wird, wird der Quellcode @emph{nicht} aus dem Unterverzeichnis @file{latex} des @file{texmf-dist/source}-Baums im SVN-Repository von TeX Live heruntergeladen, sondern aus dem angegebenen Schwesterverzeichnis im selben Wurzelverzeichnis." #. type: table -#: doc/guix.texi:8581 +#: doc/guix.texi:8579 msgid "The command below imports metadata for the @code{ifxetex} package from CTAN while fetching the sources from the directory @file{texmf/source/generic}:" msgstr "Der folgende Befehl importiert Metadaten für das Paket @code{ifxetex} aus CTAN und lädt die Quelldateien aus dem Verzeichnis @file{texmf/source/generic}:" #. type: example -#: doc/guix.texi:8584 +#: doc/guix.texi:8582 #, no-wrap msgid "guix import texlive --archive=generic ifxetex\n" msgstr "guix import texlive --archive=generic ifxetex\n" #. type: cindex -#: doc/guix.texi:8587 +#: doc/guix.texi:8585 #, no-wrap msgid "JSON, import" msgstr "JSON, Import" #. type: table -#: doc/guix.texi:8590 +#: doc/guix.texi:8588 msgid "Import package metadata from a local JSON file. Consider the following example package definition in JSON format:" msgstr "Paketmetadaten aus einer lokalen JSON-Datei importieren. Betrachten Sie folgende Beispiel-Paketdefinition im JSON-Format:" #. type: example -#: doc/guix.texi:8603 +#: doc/guix.texi:8601 #, no-wrap msgid "" "@{\n" @@ -15752,17 +15763,17 @@ msgstr "" "@}\n" #. type: table -#: doc/guix.texi:8609 +#: doc/guix.texi:8607 msgid "The field names are the same as for the @code{} record (@xref{Defining Packages}). References to other packages are provided as JSON lists of quoted package specification strings such as @code{guile} or @code{guile@@2.0}." msgstr "Die Felder sind genauso benannt wie bei einem @code{}-Verbundstyp (siehe @ref{Defining Packages}). Referenzen zu anderen Paketen stehen darin als JSON-Liste von mit Anführungszeichen quotierten Zeichenketten wie @code{guile} oder @code{guile@@2.0}." #. type: table -#: doc/guix.texi:8612 +#: doc/guix.texi:8610 msgid "The importer also supports a more explicit source definition using the common fields for @code{} records:" msgstr "Der Importer unterstützt auch eine ausdrücklichere Definition der Quelldateien mit den üblichen Feldern eines @code{}-Verbunds:" #. type: example -#: doc/guix.texi:8625 +#: doc/guix.texi:8623 #, no-wrap msgid "" "@{\n" @@ -15790,288 +15801,288 @@ msgstr "" "@}\n" #. type: table -#: doc/guix.texi:8629 +#: doc/guix.texi:8627 msgid "The command below reads metadata from the JSON file @code{hello.json} and outputs a package expression:" msgstr "Der folgende Befehl liest Metadaten aus der JSON-Datei @code{hello.json} und gibt einen Paketausdruck aus:" #. type: example -#: doc/guix.texi:8632 +#: doc/guix.texi:8630 #, no-wrap msgid "guix import json hello.json\n" msgstr "guix import json hello.json\n" #. type: item -#: doc/guix.texi:8634 +#: doc/guix.texi:8632 #, no-wrap msgid "nix" msgstr "nix" #. type: table -#: doc/guix.texi:8643 +#: doc/guix.texi:8641 msgid "Import metadata from a local copy of the source of the @uref{https://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This relies on the @command{nix-instantiate} command of @uref{https://nixos.org/nix/, Nix}.}. Package definitions in Nixpkgs are typically written in a mixture of Nix-language and Bash code. This command only imports the high-level package structure that is written in the Nix language. It normally includes all the basic fields of a package definition." msgstr "Metadaten aus einer lokalen Kopie des Quellcodes der @uref{https://nixos.org/nixpkgs/, Nixpkgs-Distribution} importieren@footnote{Dazu wird der Befehl @command{nix-instantiate} von @uref{https://nixos.org/nix/, Nix} verwendet.}. Paketdefinitionen in Nixpkgs werden typischerweise in einer Mischung aus der Sprache von Nix und aus Bash-Code geschrieben. Dieser Befehl wird nur die abstrakte Paketstruktur, die in der Nix-Sprache geschrieben ist, importieren. Dazu gehören normalerweise alle grundlegenden Felder einer Paketdefinition." #. type: table -#: doc/guix.texi:8646 +#: doc/guix.texi:8644 msgid "When importing a GNU package, the synopsis and descriptions are replaced by their canonical upstream variant." msgstr "Beim Importieren eines GNU-Pakets werden Zusammenfassung und Beschreibung stattdessen durch deren kanonische Variante bei GNU ersetzt." #. type: table -#: doc/guix.texi:8648 +#: doc/guix.texi:8646 msgid "Usually, you will first need to do:" msgstr "Normalerweise würden Sie zunächst dies ausführen:" #. type: example -#: doc/guix.texi:8651 +#: doc/guix.texi:8649 #, no-wrap msgid "export NIX_REMOTE=daemon\n" msgstr "export NIX_REMOTE=daemon\n" #. type: table -#: doc/guix.texi:8655 +#: doc/guix.texi:8653 msgid "so that @command{nix-instantiate} does not try to open the Nix database." msgstr "damit @command{nix-instantiate} nicht versucht, die Nix-Datenbank zu öffnen." #. type: table -#: doc/guix.texi:8659 +#: doc/guix.texi:8657 msgid "As an example, the command below imports the package definition of LibreOffice (more precisely, it imports the definition of the package bound to the @code{libreoffice} top-level attribute):" msgstr "Zum Beispiel importiert der Befehl unten die Paketdefinition von LibreOffice (genauer gesagt importiert er die Definition des an das Attribut @code{libreoffice} auf oberster Ebene gebundenen Pakets):" #. type: example -#: doc/guix.texi:8662 +#: doc/guix.texi:8660 #, no-wrap msgid "guix import nix ~/path/to/nixpkgs libreoffice\n" msgstr "guix import nix ~/path/to/nixpkgs libreoffice\n" #. type: item -#: doc/guix.texi:8664 doc/guix.texi:8665 doc/guix.texi:8953 +#: doc/guix.texi:8662 doc/guix.texi:8663 doc/guix.texi:8951 #, no-wrap msgid "hackage" msgstr "hackage" #. type: table -#: doc/guix.texi:8670 +#: doc/guix.texi:8668 msgid "Import metadata from the Haskell community's central package archive @uref{https://hackage.haskell.org/, Hackage}. Information is taken from Cabal files and includes all the relevant information, including package dependencies." msgstr "Metadaten aus @uref{https://hackage.haskell.org/, Hackage}, dem zentralen Paketarchiv der Haskell-Gemeinde, importieren. Informationen werden aus Cabal-Dateien ausgelesen. Darin sind alle relevanten Informationen einschließlich der Paketabhängigkeiten enthalten." #. type: item -#: doc/guix.texi:8674 +#: doc/guix.texi:8672 #, no-wrap msgid "--stdin" msgstr "--stdin" #. type: itemx -#: doc/guix.texi:8675 +#: doc/guix.texi:8673 #, no-wrap msgid "-s" msgstr "-s" #. type: table -#: doc/guix.texi:8677 +#: doc/guix.texi:8675 msgid "Read a Cabal file from standard input." msgstr "Eine Cabal-Datei von der Standardeingabe lesen." #. type: item -#: doc/guix.texi:8677 doc/guix.texi:8724 +#: doc/guix.texi:8675 doc/guix.texi:8722 #, no-wrap msgid "--no-test-dependencies" msgstr "--no-test-dependencies" #. type: itemx -#: doc/guix.texi:8678 doc/guix.texi:8725 +#: doc/guix.texi:8676 doc/guix.texi:8723 #, no-wrap msgid "-t" msgstr "-t" #. type: table -#: doc/guix.texi:8680 doc/guix.texi:8727 +#: doc/guix.texi:8678 doc/guix.texi:8725 msgid "Do not include dependencies required only by the test suites." msgstr "Keine Abhängigkeiten übernehmen, die nur von Testkatalogen benötigt werden." #. type: item -#: doc/guix.texi:8680 +#: doc/guix.texi:8678 #, no-wrap msgid "--cabal-environment=@var{alist}" msgstr "--cabal-environment=@var{Aliste}" #. type: itemx -#: doc/guix.texi:8681 +#: doc/guix.texi:8679 #, no-wrap msgid "-e @var{alist}" msgstr "-e @var{Aliste}" #. type: table -#: doc/guix.texi:8690 +#: doc/guix.texi:8688 msgid "@var{alist} is a Scheme alist defining the environment in which the Cabal conditionals are evaluated. The accepted keys are: @code{os}, @code{arch}, @code{impl} and a string representing the name of a flag. The value associated with a flag has to be either the symbol @code{true} or @code{false}. The value associated with other keys has to conform to the Cabal file format definition. The default value associated with the keys @code{os}, @code{arch} and @code{impl} is @samp{linux}, @samp{x86_64} and @samp{ghc}, respectively." msgstr "@var{Aliste} muss eine assoziative Liste der Scheme-Programmiersprache sein, die die Umgebung definiert, in der bedingte Ausdrücke von Cabal ausgewertet werden. Dabei werden folgende Schlüssel akzeptiert: @code{os}, @code{arch}, @code{impl} und eine Zeichenkette, die dem Namen einer Option (einer „Flag“) entspricht. Der mit einer „Flag“ assoziierte Wert muss entweder das Symbol @code{true} oder @code{false} sein. Der anderen Schlüsseln zugeordnete Wert muss mit der Definition des Cabal-Dateiformats konform sein. Der vorgegebene Wert zu den Schlüsseln @code{os}, @code{arch} and @code{impl} ist jeweils @samp{linux}, @samp{x86_64} bzw. @samp{ghc}." #. type: table -#: doc/guix.texi:8700 +#: doc/guix.texi:8698 msgid "The command below imports metadata for the latest version of the @code{HTTP} Haskell package without including test dependencies and specifying the value of the flag @samp{network-uri} as @code{false}:" msgstr "Der folgende Befehl importiert Metadaten für die neuste Version des Haskell-@code{HTTP}-Pakets, ohne Testabhängigkeiten zu übernehmen und bei Übergabe von @code{false} als Wert der Flag @samp{network-uri}:" #. type: example -#: doc/guix.texi:8703 +#: doc/guix.texi:8701 #, no-wrap msgid "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n" msgstr "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n" #. type: table -#: doc/guix.texi:8707 +#: doc/guix.texi:8705 msgid "A specific package version may optionally be specified by following the package name by an at-sign and a version number as in the following example:" msgstr "Eine ganz bestimmte Paketversion kann optional ausgewählt werden, indem man nach dem Paketnamen anschließend ein At-Zeichen und eine Versionsnummer angibt wie in folgendem Beispiel:" #. type: example -#: doc/guix.texi:8710 +#: doc/guix.texi:8708 #, no-wrap msgid "guix import hackage mtl@@2.1.3.1\n" msgstr "guix import hackage mtl@@2.1.3.1\n" #. type: item -#: doc/guix.texi:8712 doc/guix.texi:8713 doc/guix.texi:8955 +#: doc/guix.texi:8710 doc/guix.texi:8711 doc/guix.texi:8953 #, no-wrap msgid "stackage" msgstr "stackage" #. type: table -#: doc/guix.texi:8720 +#: doc/guix.texi:8718 msgid "The @code{stackage} importer is a wrapper around the @code{hackage} one. It takes a package name, looks up the package version included in a long-term support (LTS) @uref{https://www.stackage.org, Stackage} release and uses the @code{hackage} importer to retrieve its metadata. Note that it is up to you to select an LTS release compatible with the GHC compiler used by Guix." msgstr "Der @code{stackage}-Importer ist ein Wrapper um den @code{hackage}-Importer. Er nimmt einen Paketnamen und schaut dafür die Paketversion nach, die Teil einer @uref{https://www.stackage.org, Stackage-Veröffentlichung} mit Langzeitunterstützung (englisch „Long-Term Support“, kurz LTS) ist, deren Metadaten er dann mit dem @code{hackage}-Importer bezieht. Beachten Sie, dass es Ihre Aufgabe ist, eine LTS-Veröffentlichung auszuwählen, die mit dem von Guix benutzten GHC-Compiler kompatibel ist." #. type: item -#: doc/guix.texi:8727 +#: doc/guix.texi:8725 #, no-wrap msgid "--lts-version=@var{version}" msgstr "--lts-version=@var{Version}" #. type: itemx -#: doc/guix.texi:8728 +#: doc/guix.texi:8726 #, no-wrap msgid "-l @var{version}" msgstr "-l @var{Version}" #. type: table -#: doc/guix.texi:8731 +#: doc/guix.texi:8729 msgid "@var{version} is the desired LTS release version. If omitted the latest release is used." msgstr "@var{Version} ist die gewünschte Version der LTS-Veröffentlichung. Wird keine angegeben, wird die neueste benutzt." #. type: table -#: doc/guix.texi:8740 +#: doc/guix.texi:8738 msgid "The command below imports metadata for the @code{HTTP} Haskell package included in the LTS Stackage release version 7.18:" msgstr "Der folgende Befehl importiert Metadaten für dasjenige @code{HTTP}-Haskell-Paket, das in der LTS-Stackage-Veröffentlichung mit Version 7.18 vorkommt:" #. type: example -#: doc/guix.texi:8743 +#: doc/guix.texi:8741 #, no-wrap msgid "guix import stackage --lts-version=7.18 HTTP\n" msgstr "guix import stackage --lts-version=7.18 HTTP\n" #. type: item -#: doc/guix.texi:8745 doc/guix.texi:8746 doc/guix.texi:8939 +#: doc/guix.texi:8743 doc/guix.texi:8744 doc/guix.texi:8937 #, no-wrap msgid "elpa" msgstr "elpa" #. type: table -#: doc/guix.texi:8749 +#: doc/guix.texi:8747 msgid "Import metadata from an Emacs Lisp Package Archive (ELPA) package repository (@pxref{Packages,,, emacs, The GNU Emacs Manual})." msgstr "Metadaten aus der Paketsammlung „Emacs Lisp Package Archive“ (ELPA) importieren (siehe @ref{Packages,,, emacs, The GNU Emacs Manual})." #. type: item -#: doc/guix.texi:8753 +#: doc/guix.texi:8751 #, no-wrap msgid "--archive=@var{repo}" msgstr "--archive=@var{Repo}" #. type: itemx -#: doc/guix.texi:8754 +#: doc/guix.texi:8752 #, no-wrap msgid "-a @var{repo}" msgstr "-a @var{Repo}" #. type: table -#: doc/guix.texi:8758 +#: doc/guix.texi:8756 msgid "@var{repo} identifies the archive repository from which to retrieve the information. Currently the supported repositories and their identifiers are:" msgstr "Mit @var{Repo} wird die Archiv-Sammlung (ein „Repository“) bezeichnet, von dem die Informationen bezogen werden sollen. Derzeit sind die unterstützten Repositorys und ihre Bezeichnungen folgende:" #. type: itemize -#: doc/guix.texi:8762 +#: doc/guix.texi:8760 msgid "@uref{https://elpa.gnu.org/packages, GNU}, selected by the @code{gnu} identifier. This is the default." msgstr "@uref{https://elpa.gnu.org/packages, GNU}, bezeichnet mit @code{gnu}. Dies ist die Vorgabe." #. type: itemize -#: doc/guix.texi:8768 +#: doc/guix.texi:8766 msgid "Packages from @code{elpa.gnu.org} are signed with one of the keys contained in the GnuPG keyring at @file{share/emacs/25.1/etc/package-keyring.gpg} (or similar) in the @code{emacs} package (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual})." msgstr "Pakete aus @code{elpa.gnu.org} wurden mit einem der Schlüssel im GnuPG-Schlüsselbund in @file{share/emacs/25.1/etc/package-keyring.gpg} (oder einem ähnlichen Pfad) des @code{emacs}-Pakets signiert (siehe @ref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual})." #. type: itemize -#: doc/guix.texi:8772 +#: doc/guix.texi:8770 msgid "@uref{https://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier." msgstr "@uref{https://stable.melpa.org/packages, MELPA-Stable}, bezeichnet mit @code{melpa-stable}." #. type: itemize -#: doc/guix.texi:8776 +#: doc/guix.texi:8774 msgid "@uref{https://melpa.org/packages, MELPA}, selected by the @code{melpa} identifier." msgstr "@uref{https://melpa.org/packages, MELPA}, bezeichnet mit @code{melpa}." #. type: item -#: doc/guix.texi:8785 doc/guix.texi:8786 doc/guix.texi:8957 +#: doc/guix.texi:8783 doc/guix.texi:8784 doc/guix.texi:8955 #, no-wrap msgid "crate" msgstr "crate" #. type: table -#: doc/guix.texi:8789 +#: doc/guix.texi:8787 msgid "Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}." msgstr "Metadaten aus der Paketsammlung crates.io für Rust importieren @uref{https://crates.io, crates.io}." #. type: item -#: doc/guix.texi:8790 +#: doc/guix.texi:8788 #, no-wrap msgid "opam" msgstr "opam" #. type: cindex -#: doc/guix.texi:8791 +#: doc/guix.texi:8789 #, no-wrap msgid "OPAM" msgstr "OPAM" #. type: cindex -#: doc/guix.texi:8792 +#: doc/guix.texi:8790 #, no-wrap msgid "OCaml" msgstr "OCaml" #. type: table -#: doc/guix.texi:8795 +#: doc/guix.texi:8793 msgid "Import metadata from the @uref{https://opam.ocaml.org/, OPAM} package repository used by the OCaml community." msgstr "Metadaten aus der Paketsammlung @uref{https://opam.ocaml.org/, OPAM} der OCaml-Gemeinde importieren." #. type: Plain text -#: doc/guix.texi:8800 +#: doc/guix.texi:8798 msgid "The structure of the @command{guix import} code is modular. It would be useful to have more importers for other package formats, and your help is welcome here (@pxref{Contributing})." msgstr "@command{guix import} verfügt über eine modulare Code-Struktur. Mehr Importer für andere Paketformate zu haben, wäre nützlich, und Ihre Hilfe ist hierbei gerne gesehen (siehe @ref{Contributing})." #. type: section -#: doc/guix.texi:8802 +#: doc/guix.texi:8800 #, no-wrap msgid "Invoking @command{guix refresh}" msgstr "@command{guix refresh} aufrufen" #. type: command{#1} -#: doc/guix.texi:8804 +#: doc/guix.texi:8802 #, no-wrap msgid "guix refresh" msgstr "guix refresh" #. type: Plain text -#: doc/guix.texi:8809 +#: doc/guix.texi:8807 msgid "The primary audience of the @command{guix refresh} command is developers of the GNU software distribution. By default, it reports any packages provided by the distribution that are outdated compared to the latest upstream version, like this:" msgstr "Die Zielgruppe des Befehls @command{guix refresh} zum Auffrischen von Paketen sind in erster Linie Entwickler der GNU-Software-Distribution. Nach Vorgabe werden damit alle Pakete in der Distribution gemeldet, die nicht der neuesten Version des Anbieters entsprechen, indem Sie dies ausführen:" #. type: example -#: doc/guix.texi:8814 +#: doc/guix.texi:8812 #, no-wrap msgid "" "$ guix refresh\n" @@ -16083,12 +16094,12 @@ msgstr "" "gnu/packages/glib.scm:77:12: glib would be upgraded from 2.34.3 to 2.37.0\n" #. type: Plain text -#: doc/guix.texi:8818 +#: doc/guix.texi:8816 msgid "Alternately, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater:" msgstr "Alternativ können die zu betrachtenden Pakete dabei angegeben werden, was zur Ausgabe einer Warnung führt, wenn es für Pakete kein Aktualisierungsprogramm gibt:" #. type: example -#: doc/guix.texi:8823 +#: doc/guix.texi:8821 #, no-wrap msgid "" "$ guix refresh coreutils guile guile-ssh\n" @@ -16100,17 +16111,17 @@ msgstr "" "gnu/packages/guile.scm:136:12: guile would be upgraded from 2.0.12 to 2.0.13\n" #. type: Plain text -#: doc/guix.texi:8832 +#: doc/guix.texi:8830 msgid "@command{guix refresh} browses the upstream repository of each package and determines the highest version number of the releases therein. The command knows how to update specific types of packages: GNU packages, ELPA packages, etc.---see the documentation for @option{--type} below. There are many packages, though, for which it lacks a method to determine whether a new upstream release is available. However, the mechanism is extensible, so feel free to get in touch with us to add a new method!" msgstr "@command{guix refresh} durchsucht die Paketsammlung beim Anbieter jedes Pakets und bestimmt, was die höchste Versionsnummer ist, zu der es dort eine Veröffentlichung gibt. Zum Befehl gehören Aktualisierungsprogramme, mit denen bestimmte Typen von Paketen automatisch aktualisiert werden können: GNU-Pakete, ELPA-Pakete usw.@: — siehe die Dokumentation von @option{--type} unten. Es gibt jedoch auch viele Pakete, für die noch keine Methode enthalten ist, um das Vorhandensein einer neuen Veröffentlichung zu prüfen. Der Mechanismus ist aber erweiterbar, also können Sie gerne mit uns in Kontakt treten, wenn Sie eine neue Methode hinzufügen möchten!" #. type: table -#: doc/guix.texi:8837 +#: doc/guix.texi:8835 msgid "Consider the packages specified, and all the packages upon which they depend." msgstr "Hiermit werden die angegebenen Pakete betrachtet und außerdem alle Pakete, von denen sie abhängen." #. type: example -#: doc/guix.texi:8845 +#: doc/guix.texi:8843 #, no-wrap msgid "" "$ guix refresh --recursive coreutils\n" @@ -16128,12 +16139,12 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:8853 +#: doc/guix.texi:8851 msgid "Sometimes the upstream name differs from the package name used in Guix, and @command{guix refresh} needs a little help. Most updaters honor the @code{upstream-name} property in package definitions, which can be used to that effect:" msgstr "Manchmal unterscheidet sich der vom Anbieter benutzte Name von dem Paketnamen, der in Guix verwendet wird, so dass @command{guix refresh} etwas Unterstützung braucht. Die meisten Aktualisierungsprogramme folgen der Eigenschaft @code{upstream-name} in Paketdefinitionen, die diese Unterstützung bieten kann." #. type: example -#: doc/guix.texi:8860 +#: doc/guix.texi:8858 #, no-wrap msgid "" "(define-public network-manager\n" @@ -16149,237 +16160,237 @@ msgstr "" " (properties '((upstream-name . \"NetworkManager\")))))\n" #. type: Plain text -#: doc/guix.texi:8872 +#: doc/guix.texi:8870 msgid "When passed @code{--update}, it modifies distribution source files to update the version numbers and source tarball hashes of those package recipes (@pxref{Defining Packages}). This is achieved by downloading each package's latest source tarball and its associated OpenPGP signature, authenticating the downloaded tarball against its signature using @command{gpg}, and finally computing its hash. When the public key used to sign the tarball is missing from the user's keyring, an attempt is made to automatically retrieve it from a public key server; when this is successful, the key is added to the user's keyring; otherwise, @command{guix refresh} reports an error." msgstr "Wenn @code{--update} übergeben wird, werden die Quelldateien der Distribution verändert, so dass für diese Paketrezepte die aktuelle Version und die aktuelle Hash-Prüfsumme des Quellcode-Tarballs eingetragen wird (siehe @ref{Defining Packages}). Dazu werden der neueste Quellcode-Tarball jedes Pakets sowie die jeweils zugehörige OpenPGP-Signatur heruntergeladen; mit Letzterer wird der heruntergeladene Tarball gegen seine Signatur mit @command{gpg} authentifiziert und schließlich dessen Hash berechnet. Wenn der öffentliche Schlüssel, mit dem der Tarball signiert wurde, im Schlüsselbund des Benutzers fehlt, wird versucht, ihn automatisch von einem Schlüssel-Server zu holen; wenn das klappt, wird der Schlüssel zum Schlüsselbund des Benutzers hinzugefügt, ansonsten meldet @command{guix refresh} einen Fehler." #. type: Plain text -#: doc/guix.texi:8874 +#: doc/guix.texi:8872 msgid "The following options are supported:" msgstr "Die folgenden Befehlszeilenoptionen werden unterstützt:" #. type: table -#: doc/guix.texi:8882 doc/guix.texi:9540 +#: doc/guix.texi:8880 doc/guix.texi:9538 msgid "This is useful to precisely refer to a package, as in this example:" msgstr "Dies ist nützlich, um genau ein bestimmtes Paket zu referenzieren, wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:8885 +#: doc/guix.texi:8883 #, no-wrap msgid "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n" msgstr "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n" #. type: table -#: doc/guix.texi:8889 +#: doc/guix.texi:8887 msgid "This command lists the dependents of the ``final'' libc (essentially all the packages.)" msgstr "Dieser Befehls listet auf, was alles von der „endgültigen“ Erstellung von libc abhängt (praktisch alle Pakete)." #. type: item -#: doc/guix.texi:8890 +#: doc/guix.texi:8888 #, no-wrap msgid "--update" msgstr "--update" #. type: itemx -#: doc/guix.texi:8891 +#: doc/guix.texi:8889 #, no-wrap msgid "-u" msgstr "-u" #. type: table -#: doc/guix.texi:8895 +#: doc/guix.texi:8893 msgid "Update distribution source files (package recipes) in place. This is usually run from a checkout of the Guix source tree (@pxref{Running Guix Before It Is Installed}):" msgstr "Die Quelldateien der Distribution (die Paketrezepte) werden direkt „in place“ verändert. Normalerweise führen Sie dies aus einem Checkout des Guix-Quellbaums heraus aus (siehe @ref{Running Guix Before It Is Installed}):" #. type: example -#: doc/guix.texi:8898 +#: doc/guix.texi:8896 #, no-wrap msgid "$ ./pre-inst-env guix refresh -s non-core -u\n" msgstr "$ ./pre-inst-env guix refresh -s non-core -u\n" #. type: table -#: doc/guix.texi:8901 +#: doc/guix.texi:8899 msgid "@xref{Defining Packages}, for more information on package definitions." msgstr "Siehe @ref{Defining Packages} für mehr Informationen zu Paketdefinitionen." #. type: item -#: doc/guix.texi:8902 +#: doc/guix.texi:8900 #, no-wrap msgid "--select=[@var{subset}]" msgstr "--select=[@var{Teilmenge}]" #. type: itemx -#: doc/guix.texi:8903 +#: doc/guix.texi:8901 #, no-wrap msgid "-s @var{subset}" msgstr "-s @var{Teilmenge}" #. type: table -#: doc/guix.texi:8906 +#: doc/guix.texi:8904 msgid "Select all the packages in @var{subset}, one of @code{core} or @code{non-core}." msgstr "Wählt alle Pakete aus der @var{Teilmenge} aus, die entweder @code{core} oder @code{non-core} sein muss." #. type: table -#: doc/guix.texi:8913 +#: doc/guix.texi:8911 msgid "The @code{core} subset refers to all the packages at the core of the distribution---i.e., packages that are used to build ``everything else''. This includes GCC, libc, Binutils, Bash, etc. Usually, changing one of these packages in the distribution entails a rebuild of all the others. Thus, such updates are an inconvenience to users in terms of build time or bandwidth used to achieve the upgrade." msgstr "Die @code{core}-Teilmenge bezieht sich auf alle Pakete, die den Kern der Distribution ausmachen, d.h.@: Pakete, aus denen heraus „alles andere“ erstellt wird. Dazu gehören GCC, libc, Binutils, Bash und so weiter. In der Regel ist die Folge einer Änderung an einem dieser Pakete in der Distribution, dass alle anderen neu erstellt werden müssen. Daher sind solche Änderungen unangenehm für Nutzer, weil sie einiges an Erstellungszeit oder Bandbreite investieren müssen, um die Aktualisierung abzuschließen." #. type: table -#: doc/guix.texi:8917 +#: doc/guix.texi:8915 msgid "The @code{non-core} subset refers to the remaining packages. It is typically useful in cases where an update of the core packages would be inconvenient." msgstr "Die @code{non-core}-Teilmenge bezieht sich auf die übrigen Pakete. Sie wird typischerweise dann benutzt, wenn eine Aktualisierung der Kernpakete zu viele Umstände machen würde." #. type: table -#: doc/guix.texi:8922 +#: doc/guix.texi:8920 msgid "Select all the packages from the manifest in @var{file}. This is useful to check if any packages of the user manifest can be updated." msgstr "Wählt alle Pakete im in der @var{Datei} stehenden Manifest aus. Das ist nützlich, um zu überprüfen, welche Pakete aus dem Manifest des Nutzers aktualisiert werden können." #. type: item -#: doc/guix.texi:8923 +#: doc/guix.texi:8921 #, no-wrap msgid "--type=@var{updater}" msgstr "--type=@var{Aktualisierungsprogramm}" #. type: itemx -#: doc/guix.texi:8924 +#: doc/guix.texi:8922 #, no-wrap msgid "-t @var{updater}" msgstr "-t @var{Aktualisierungsprogramm}" #. type: table -#: doc/guix.texi:8927 +#: doc/guix.texi:8925 msgid "Select only packages handled by @var{updater} (may be a comma-separated list of updaters). Currently, @var{updater} may be one of:" msgstr "Nur solche Pakete auswählen, die vom angegebenen @var{Aktualisierungsprogramm} behandelt werden. Es darf auch eine kommagetrennte Liste mehrerer Aktualisierungsprogramme angegeben werden. Zur Zeit kann als @var{Aktualisierungsprogramm} eines der folgenden angegeben werden:" #. type: table -#: doc/guix.texi:8931 +#: doc/guix.texi:8929 msgid "the updater for GNU packages;" msgstr "Aktualisierungsprogramm für GNU-Pakete," #. type: item -#: doc/guix.texi:8931 +#: doc/guix.texi:8929 #, no-wrap msgid "gnome" msgstr "gnome" #. type: table -#: doc/guix.texi:8933 +#: doc/guix.texi:8931 msgid "the updater for GNOME packages;" msgstr "Aktualisierungsprogramm für GNOME-Pakete," #. type: item -#: doc/guix.texi:8933 +#: doc/guix.texi:8931 #, no-wrap msgid "kde" msgstr "kde" #. type: table -#: doc/guix.texi:8935 +#: doc/guix.texi:8933 msgid "the updater for KDE packages;" msgstr "Aktualisierungsprogramm für KDE-Pakete," #. type: item -#: doc/guix.texi:8935 +#: doc/guix.texi:8933 #, no-wrap msgid "xorg" msgstr "xorg" #. type: table -#: doc/guix.texi:8937 +#: doc/guix.texi:8935 msgid "the updater for X.org packages;" msgstr "Aktualisierungsprogramm für X.org-Pakete," #. type: item -#: doc/guix.texi:8937 +#: doc/guix.texi:8935 #, no-wrap msgid "kernel.org" msgstr "kernel.org" #. type: table -#: doc/guix.texi:8939 +#: doc/guix.texi:8937 msgid "the updater for packages hosted on kernel.org;" msgstr "Aktualisierungsprogramm auf kernel.org angebotener Pakete," #. type: table -#: doc/guix.texi:8941 +#: doc/guix.texi:8939 msgid "the updater for @uref{https://elpa.gnu.org/, ELPA} packages;" msgstr "Aktualisierungsprogramm für @uref{https://elpa.gnu.org/, ELPA-Pakete}," #. type: table -#: doc/guix.texi:8943 +#: doc/guix.texi:8941 msgid "the updater for @uref{https://cran.r-project.org/, CRAN} packages;" msgstr "Aktualisierungsprogramm für @uref{https://cran.r-project.org/, CRAN-Pakete}," #. type: item -#: doc/guix.texi:8943 +#: doc/guix.texi:8941 #, no-wrap msgid "bioconductor" msgstr "bioconductor" #. type: table -#: doc/guix.texi:8945 +#: doc/guix.texi:8943 msgid "the updater for @uref{https://www.bioconductor.org/, Bioconductor} R packages;" msgstr "Aktualisierungsprogramm für R-Pakete vom @uref{https://www.bioconductor.org/, Bioconductor}," #. type: table -#: doc/guix.texi:8947 +#: doc/guix.texi:8945 msgid "the updater for @uref{https://www.cpan.org/, CPAN} packages;" msgstr "Aktualisierungsprogramm für @uref{https://www.cpan.org/, CPAN-Pakete}," #. type: table -#: doc/guix.texi:8949 +#: doc/guix.texi:8947 msgid "the updater for @uref{https://pypi.python.org, PyPI} packages." msgstr "Aktualisierungsprogramm für @uref{https://pypi.python.org, PyPI-Pakete}," #. type: table -#: doc/guix.texi:8951 +#: doc/guix.texi:8949 msgid "the updater for @uref{https://rubygems.org, RubyGems} packages." msgstr "Aktualisierungsprogramm für @uref{https://rubygems.org, RubyGems-Pakete}." #. type: item -#: doc/guix.texi:8951 +#: doc/guix.texi:8949 #, no-wrap msgid "github" msgstr "github" #. type: table -#: doc/guix.texi:8953 +#: doc/guix.texi:8951 msgid "the updater for @uref{https://github.com, GitHub} packages." msgstr "Aktualisierungsprogramm für @uref{https://github.com, GitHub-Pakete}." #. type: table -#: doc/guix.texi:8955 +#: doc/guix.texi:8953 msgid "the updater for @uref{https://hackage.haskell.org, Hackage} packages." msgstr "Aktualisierungsprogramm für @uref{https://hackage.haskell.org, Hackage-Pakete}." #. type: table -#: doc/guix.texi:8957 +#: doc/guix.texi:8955 msgid "the updater for @uref{https://www.stackage.org, Stackage} packages." msgstr "Aktualisierungsprogramm für @uref{https://www.stackage.org, Stackage-Pakete}." #. type: table -#: doc/guix.texi:8959 +#: doc/guix.texi:8957 msgid "the updater for @uref{https://crates.io, Crates} packages." msgstr "Aktualisierungsprogramm für @uref{https://crates.io, Crates-Pakete}." #. type: item -#: doc/guix.texi:8959 +#: doc/guix.texi:8957 #, no-wrap msgid "launchpad" msgstr "launchpad" #. type: table -#: doc/guix.texi:8961 +#: doc/guix.texi:8959 msgid "the updater for @uref{https://launchpad.net, Launchpad} packages." msgstr "Aktualisierungsprogramm für @uref{https://launchpad.net, Launchpad}." #. type: table -#: doc/guix.texi:8965 +#: doc/guix.texi:8963 msgid "For instance, the following command only checks for updates of Emacs packages hosted at @code{elpa.gnu.org} and for updates of CRAN packages:" msgstr "Zum Beispiel prüft folgender Befehl nur auf mögliche Aktualisierungen von auf @code{elpa.gnu.org} angebotenen Emacs-Paketen und von CRAN-Paketen:" #. type: example -#: doc/guix.texi:8970 +#: doc/guix.texi:8968 #, no-wrap msgid "" "$ guix refresh --type=elpa,cran\n" @@ -16391,77 +16402,77 @@ msgstr "" "gnu/packages/emacs.scm:856:13: emacs-auctex would be upgraded from 11.88.6 to 11.88.9\n" #. type: Plain text -#: doc/guix.texi:8976 +#: doc/guix.texi:8974 msgid "In addition, @command{guix refresh} can be passed one or more package names, as in this example:" msgstr "An @command{guix refresh} können auch ein oder mehrere Paketnamen übergeben werden wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:8979 +#: doc/guix.texi:8977 #, no-wrap msgid "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n" msgstr "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n" #. type: Plain text -#: doc/guix.texi:8985 +#: doc/guix.texi:8983 msgid "The command above specifically updates the @code{emacs} and @code{idutils} packages. The @code{--select} option would have no effect in this case." msgstr "Der Befehl oben aktualisiert speziell das @code{emacs}- und das @code{idutils}-Paket. Eine Befehlszeilenoption @code{--select} hätte dann keine Wirkung." #. type: Plain text -#: doc/guix.texi:8990 +#: doc/guix.texi:8988 msgid "When considering whether to upgrade a package, it is sometimes convenient to know which packages would be affected by the upgrade and should be checked for compatibility. For this the following option may be used when passing @command{guix refresh} one or more package names:" msgstr "Wenn Sie sich fragen, ob ein Paket aktualisiert werden sollte oder nicht, kann es helfen, sich anzuschauen, welche Pakete von der Aktualisierung betroffen wären und auf Kompatibilität hin geprüft werden sollten. Dazu kann die folgende Befehlszeilenoption zusammen mit einem oder mehreren Paketnamen an @command{guix refresh} übergeben werden:" #. type: item -#: doc/guix.texi:8993 +#: doc/guix.texi:8991 #, no-wrap msgid "--list-updaters" msgstr "--list-updaters" #. type: itemx -#: doc/guix.texi:8994 +#: doc/guix.texi:8992 #, no-wrap msgid "-L" msgstr "-L" #. type: table -#: doc/guix.texi:8996 +#: doc/guix.texi:8994 msgid "List available updaters and exit (see @option{--type} above.)" msgstr "Eine Liste verfügbarer Aktualisierungsprogramme anzeigen und terminieren (siehe @option{--type} oben)." #. type: table -#: doc/guix.texi:8999 +#: doc/guix.texi:8997 msgid "For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these updaters." msgstr "Für jedes Aktualisierungsprogramm den Anteil der davon betroffenen Pakete anzeigen; zum Schluss wird der Gesamtanteil von irgendeinem Aktualisierungsprogramm betroffener Pakete angezeigt." #. type: item -#: doc/guix.texi:9000 +#: doc/guix.texi:8998 #, no-wrap msgid "--list-dependent" msgstr "--list-dependent" #. type: itemx -#: doc/guix.texi:9001 doc/guix.texi:9217 +#: doc/guix.texi:8999 doc/guix.texi:9215 #, no-wrap msgid "-l" msgstr "-l" #. type: table -#: doc/guix.texi:9004 +#: doc/guix.texi:9002 msgid "List top-level dependent packages that would need to be rebuilt as a result of upgrading one or more packages." msgstr "Auflisten, welche abhängigen Pakete auf oberster Ebene neu erstellt werden müssten, wenn eines oder mehrere Pakete aktualisiert würden." #. type: table -#: doc/guix.texi:9008 +#: doc/guix.texi:9006 msgid "@xref{Invoking guix graph, the @code{reverse-package} type of @command{guix graph}}, for information on how to visualize the list of dependents of a package." msgstr "Siehe @ref{Invoking guix graph, den @code{reverse-package}-Typ von @command{guix graph}} für Informationen dazu, wie Sie die Liste der Abhängigen eines Pakets visualisieren können." #. type: Plain text -#: doc/guix.texi:9014 +#: doc/guix.texi:9012 msgid "Be aware that the @code{--list-dependent} option only @emph{approximates} the rebuilds that would be required as a result of an upgrade. More rebuilds might be required under some circumstances." msgstr "Bedenken Sie, dass die Befehlszeilenoption @code{--list-dependent} das Ausmaß der nach einer Aktualisierungen benötigten Neuerstellungen nur @emph{annähert}. Es könnten auch unter Umständen mehr Neuerstellungen anfallen." #. type: example -#: doc/guix.texi:9019 +#: doc/guix.texi:9017 #, no-wrap msgid "" "$ guix refresh --list-dependent flex\n" @@ -16473,23 +16484,23 @@ msgstr "" "hop@@2.4.0 geiser@@0.4 notmuch@@0.18 mu@@0.9.9.5 cflow@@1.4 idutils@@4.6 …\n" #. type: Plain text -#: doc/guix.texi:9023 +#: doc/guix.texi:9021 msgid "The command above lists a set of packages that could be built to check for compatibility with an upgraded @code{flex} package." msgstr "Der oben stehende Befehl gibt einen Satz von Paketen aus, die Sie erstellen wollen könnten, um die Kompatibilität einer Aktualisierung des @code{flex}-Pakets beurteilen zu können." #. type: item -#: doc/guix.texi:9026 +#: doc/guix.texi:9024 #, no-wrap msgid "--list-transitive" msgstr "--list-transitive" #. type: table -#: doc/guix.texi:9028 +#: doc/guix.texi:9026 msgid "List all the packages which one or more packages depend upon." msgstr "Die Pakete auflisten, von denen eines oder mehrere Pakete abhängen." #. type: example -#: doc/guix.texi:9033 +#: doc/guix.texi:9031 #, no-wrap msgid "" "$ guix refresh --list-transitive flex\n" @@ -16501,60 +16512,60 @@ msgstr "" "bison@@3.0.5 indent@@2.2.10 tar@@1.30 gzip@@1.9 bzip2@@1.0.6 xz@@5.2.4 file@@5.33 …\n" #. type: Plain text -#: doc/guix.texi:9039 +#: doc/guix.texi:9037 msgid "The command above lists a set of packages which, when changed, would cause @code{flex} to be rebuilt." msgstr "Der oben stehende Befehl gibt einen Satz von Paketen aus, die, wenn sie geändert würden, eine Neuerstellung des @code{flex}-Pakets auslösen würden." #. type: Plain text -#: doc/guix.texi:9041 +#: doc/guix.texi:9039 msgid "The following options can be used to customize GnuPG operation:" msgstr "Mit den folgenden Befehlszeilenoptionen können Sie das Verhalten von GnuPG anpassen:" #. type: item -#: doc/guix.texi:9044 +#: doc/guix.texi:9042 #, no-wrap msgid "--gpg=@var{command}" msgstr "--gpg=@var{Befehl}" #. type: table -#: doc/guix.texi:9047 +#: doc/guix.texi:9045 msgid "Use @var{command} as the GnuPG 2.x command. @var{command} is searched for in @code{$PATH}." msgstr "Den @var{Befehl} als GnuPG-2.x-Befehl einsetzen. Der @var{Befehl} wird im @code{$PATH} gesucht." #. type: item -#: doc/guix.texi:9048 +#: doc/guix.texi:9046 #, no-wrap msgid "--keyring=@var{file}" msgstr "--keyring=@var{Datei}" #. type: table -#: doc/guix.texi:9054 +#: doc/guix.texi:9052 msgid "Use @var{file} as the keyring for upstream keys. @var{file} must be in the @dfn{keybox format}. Keybox files usually have a name ending in @file{.kbx} and the GNU@tie{}Privacy Guard (GPG) can manipulate these files (@pxref{kbxutil, @command{kbxutil},, gnupg, Using the GNU Privacy Guard}, for information on a tool to manipulate keybox files)." msgstr "Die @var{Datei} als Schlüsselbund mit Anbieterschlüsseln verwenden. Die @var{Datei} muss im @dfn{Keybox-Format} vorliegen. Keybox-Dateien haben normalerweise einen Namen, der auf @file{.kbx} endet. Sie können mit Hilfe von GNU@tie{}Privacy Guard (GPG) bearbeitet werden (siehe @ref{kbxutil, @command{kbxutil},, gnupg, Using the GNU Privacy Guard} für Informationen über ein Werkzeug zum Bearbeiten von Keybox-Dateien)." #. type: table -#: doc/guix.texi:9060 +#: doc/guix.texi:9058 msgid "When this option is omitted, @command{guix refresh} uses @file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream signing keys. OpenPGP signatures are checked against keys from this keyring; missing keys are downloaded to this keyring as well (see @option{--key-download} below.)" msgstr "Wenn diese Befehlszeilenoption nicht angegeben wird, benutzt @command{guix refresh} die Keybox-Datei @file{~/.config/guix/upstream/trustedkeys.kbx} als Schlüsselbund für Signierschlüssel von Anbietern. OpenPGP-Signaturen werden mit Schlüsseln aus diesem Schlüsselbund überprüft; fehlende Schlüssel werden auch in diesen Schlüsselbund heruntergeladen (siehe @option{--key-download} unten)." #. type: table -#: doc/guix.texi:9063 +#: doc/guix.texi:9061 msgid "You can export keys from your default GPG keyring into a keybox file using commands like this one:" msgstr "Sie können Schlüssel aus Ihrem normalerweise benutzten GPG-Schlüsselbund in eine Keybox-Datei exportieren, indem Sie Befehle wie diesen benutzen:" #. type: example -#: doc/guix.texi:9066 +#: doc/guix.texi:9064 #, no-wrap msgid "gpg --export rms@@gnu.org | kbxutil --import-openpgp >> mykeyring.kbx\n" msgstr "gpg --export rms@@gnu.org | kbxutil --import-openpgp >> mykeyring.kbx\n" #. type: table -#: doc/guix.texi:9069 +#: doc/guix.texi:9067 msgid "Likewise, you can fetch keys to a specific keybox file like this:" msgstr "Ebenso können Sie wie folgt Schlüssel in eine bestimmte Keybox-Datei herunterladen:" #. type: example -#: doc/guix.texi:9073 +#: doc/guix.texi:9071 #, no-wrap msgid "" "gpg --no-default-keyring --keyring mykeyring.kbx \\\n" @@ -16564,187 +16575,187 @@ msgstr "" " --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n" #. type: table -#: doc/guix.texi:9077 +#: doc/guix.texi:9075 msgid "@ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU Privacy Guard}, for more information on GPG's @option{--keyring} option." msgstr "Siehe @ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU Privacy Guard} für mehr Informationen zur Befehlszeilenoption @option{--keyring} von GPG." #. type: table -#: doc/guix.texi:9081 +#: doc/guix.texi:9079 msgid "Handle missing OpenPGP keys according to @var{policy}, which may be one of:" msgstr "Fehlende OpenPGP-Schlüssel gemäß dieser @var{Richtlinie} behandeln, für die eine der Folgenden angegeben werden kann:" #. type: item -#: doc/guix.texi:9083 doc/guix.texi:16051 +#: doc/guix.texi:9081 doc/guix.texi:16048 #, no-wrap msgid "always" msgstr "always" #. type: table -#: doc/guix.texi:9086 +#: doc/guix.texi:9084 msgid "Always download missing OpenPGP keys from the key server, and add them to the user's GnuPG keyring." msgstr "Immer fehlende OpenPGP-Schlüssel herunterladen und zum GnuPG-Schlüsselbund des Nutzers hinzufügen." #. type: item -#: doc/guix.texi:9087 doc/guix.texi:16053 +#: doc/guix.texi:9085 doc/guix.texi:16050 #, no-wrap msgid "never" msgstr "never" #. type: table -#: doc/guix.texi:9089 +#: doc/guix.texi:9087 msgid "Never try to download missing OpenPGP keys. Instead just bail out." msgstr "Niemals fehlende OpenPGP-Schlüssel herunterladen, sondern einfach abbrechen." #. type: item -#: doc/guix.texi:9090 +#: doc/guix.texi:9088 #, no-wrap msgid "interactive" msgstr "interactive" #. type: table -#: doc/guix.texi:9093 +#: doc/guix.texi:9091 msgid "When a package signed with an unknown OpenPGP key is encountered, ask the user whether to download it or not. This is the default behavior." msgstr "Ist ein Paket mit einem unbekannten OpenPGP-Schlüssel signiert, wird der Nutzer gefragt, ob der Schlüssel heruntergeladen werden soll oder nicht. Dies entspricht dem vorgegebenen Verhalten." #. type: item -#: doc/guix.texi:9095 +#: doc/guix.texi:9093 #, no-wrap msgid "--key-server=@var{host}" msgstr "--key-server=@var{Host}" #. type: table -#: doc/guix.texi:9097 +#: doc/guix.texi:9095 msgid "Use @var{host} as the OpenPGP key server when importing a public key." msgstr "Den mit @var{Host} bezeichneten Rechner als Schlüsselserver für OpenPGP benutzen, wenn ein öffentlicher Schlüssel importiert wird." #. type: Plain text -#: doc/guix.texi:9110 +#: doc/guix.texi:9108 msgid "The @code{github} updater uses the @uref{https://developer.github.com/v3/, GitHub API} to query for new releases. When used repeatedly e.g.@: when refreshing all packages, GitHub will eventually refuse to answer any further API requests. By default 60 API requests per hour are allowed, and a full refresh on all GitHub packages in Guix requires more than this. Authentication with GitHub through the use of an API token alleviates these limits. To use an API token, set the environment variable @code{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/settings/tokens} or otherwise." msgstr "Das @code{github}-Aktualisierungsprogramm benutzt die @uref{https://developer.github.com/v3/, GitHub-Programmierschnittstelle} (die „Github-API“), um Informationen über neue Veröffentlichungen einzuholen. Geschieht dies oft, z.B.@: beim Auffrischen aller Pakete, so wird GitHub irgendwann aufhören, weitere API-Anfragen zu beantworten. Normalerweise sind 60 API-Anfragen pro Stunde erlaubt, für eine vollständige Auffrischung aller GitHub-Pakete in Guix werden aber mehr benötigt. Wenn Sie sich bei GitHub mit Ihrem eigenen API-Token authentisieren, gelten weniger einschränkende Grenzwerte. Um einen API-Token zu benutzen, setzen Sie die Umgebungsvariable @code{GUIX_GITHUB_TOKEN} auf einen von @uref{https://github.com/settings/tokens} oder anderweitig bezogenen API-Token." #. type: section -#: doc/guix.texi:9113 +#: doc/guix.texi:9111 #, no-wrap msgid "Invoking @command{guix lint}" msgstr "@command{guix lint} aufrufen" #. type: command{#1} -#: doc/guix.texi:9115 +#: doc/guix.texi:9113 #, no-wrap msgid "guix lint" msgstr "guix lint" #. type: cindex -#: doc/guix.texi:9116 +#: doc/guix.texi:9114 #, no-wrap msgid "package, checking for errors" msgstr "Pakete, auf Fehler prüfen" #. type: Plain text -#: doc/guix.texi:9122 +#: doc/guix.texi:9120 msgid "The @command{guix lint} command is meant to help package developers avoid common errors and use a consistent style. It runs a number of checks on a given set of packages in order to find common mistakes in their definitions. Available @dfn{checkers} include (see @code{--list-checkers} for a complete list):" msgstr "Den Befehl @command{guix lint} gibt es, um Paketentwicklern beim Vermeiden häufiger Fehler und bei der Einhaltung eines konsistenten Code-Stils zu helfen. Er führt eine Reihe von Prüfungen auf einer angegebenen Menge von Paketen durch, um in deren Definition häufige Fehler aufzuspüren. Zu den verfügbaren @dfn{Prüfern} gehören (siehe @code{--list-checkers} für eine vollständige Liste):" #. type: table -#: doc/guix.texi:9128 +#: doc/guix.texi:9126 msgid "Validate certain typographical and stylistic rules about package descriptions and synopses." msgstr "Überprüfen, ob bestimmte typografische und stilistische Regeln in Paketbeschreibungen und -zusammenfassungen eingehalten wurden." #. type: item -#: doc/guix.texi:9129 +#: doc/guix.texi:9127 #, no-wrap msgid "inputs-should-be-native" msgstr "inputs-should-be-native" #. type: table -#: doc/guix.texi:9131 +#: doc/guix.texi:9129 msgid "Identify inputs that should most likely be native inputs." msgstr "Eingaben identifizieren, die wahrscheinlich native Eingaben sein sollten." #. type: itemx -#: doc/guix.texi:9134 +#: doc/guix.texi:9132 #, no-wrap msgid "mirror-url" msgstr "mirror-url" #. type: itemx -#: doc/guix.texi:9135 +#: doc/guix.texi:9133 #, no-wrap msgid "github-url" msgstr "github-url" #. type: itemx -#: doc/guix.texi:9136 +#: doc/guix.texi:9134 #, no-wrap msgid "source-file-name" msgstr "source-file-name" #. type: table -#: doc/guix.texi:9143 +#: doc/guix.texi:9141 msgid "Probe @code{home-page} and @code{source} URLs and report those that are invalid. Suggest a @code{mirror://} URL when applicable. If the @code{source} URL redirects to a GitHub URL, recommend usage of the GitHub URL. Check that the source file name is meaningful, e.g.@: is not just a version number or ``git-checkout'', without a declared @code{file-name} (@pxref{origin Reference})." msgstr "Die URLs für die Felder @code{home-page} und @code{source} anrufen und nicht erreichbare URLs melden. Wenn passend, wird eine @code{mirror://}-URL vorgeschlagen. Wenn die Quell-URL auf eine GitHub-URL weiterleitet, wird eine Empfehlung ausgegeben, direkt letztere zu verwenden. Es wird geprüft, dass der Quell-Dateiname aussagekräftig ist, dass er also z.B.@: nicht nur aus einer Versionsnummer besteht oder als „git-checkout“ angegeben wurde, ohne dass ein @code{Dateiname} deklariert wurde (siehe @ref{origin Reference})." #. type: item -#: doc/guix.texi:9144 +#: doc/guix.texi:9142 #, no-wrap msgid "source-unstable-tarball" msgstr "source-unstable-tarball" #. type: table -#: doc/guix.texi:9148 +#: doc/guix.texi:9146 msgid "Parse the @code{source} URL to determine if a tarball from GitHub is autogenerated or if it is a release tarball. Unfortunately GitHub's autogenerated tarballs are sometimes regenerated." msgstr "Analysiert die @code{source}-URL, um zu bestimmen, ob der Tarball von GitHub automatisch generiert wurde oder zu einer Veröffentlichung gehört. Leider werden GitHubs automatisch generierte Tarballs manchmal neu generiert." #. type: item -#: doc/guix.texi:9149 +#: doc/guix.texi:9147 #, no-wrap msgid "cve" msgstr "cve" #. type: cindex -#: doc/guix.texi:9150 doc/guix.texi:25544 +#: doc/guix.texi:9148 doc/guix.texi:25526 #, no-wrap msgid "security vulnerabilities" msgstr "Sicherheitslücken" #. type: cindex -#: doc/guix.texi:9151 +#: doc/guix.texi:9149 #, no-wrap msgid "CVE, Common Vulnerabilities and Exposures" msgstr "CVE, Common Vulnerabilities and Exposures" #. type: table -#: doc/guix.texi:9156 +#: doc/guix.texi:9154 msgid "Report known vulnerabilities found in the Common Vulnerabilities and Exposures (CVE) databases of the current and past year @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, published by the US NIST}." msgstr "Bekannte Sicherheitslücken melden, die in den Datenbanken der „Common Vulnerabilities and Exposures“ (CVE) aus diesem und dem letzten Jahr vorkommen, @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, wie sie von der US-amerikanischen NIST veröffentlicht werden}." #. type: table -#: doc/guix.texi:9158 +#: doc/guix.texi:9156 msgid "To view information about a particular vulnerability, visit pages such as:" msgstr "Um Informationen über eine bestimmte Sicherheitslücke angezeigt zu bekommen, besuchen Sie Webseiten wie:" #. type: indicateurl{#1} -#: doc/guix.texi:9162 +#: doc/guix.texi:9160 msgid "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD" msgstr "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD" #. type: indicateurl{#1} -#: doc/guix.texi:9164 +#: doc/guix.texi:9162 msgid "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD" msgstr "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD" #. type: table -#: doc/guix.texi:9169 +#: doc/guix.texi:9167 msgid "where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g., @code{CVE-2015-7554}." msgstr "wobei Sie statt @code{CVE-YYYY-ABCD} die CVE-Kennnummer angeben — z.B.@: @code{CVE-2015-7554}." #. type: table -#: doc/guix.texi:9174 +#: doc/guix.texi:9172 msgid "Package developers can specify in package recipes the @uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} name and version of the package when they differ from the name or version that Guix uses, as in this example:" msgstr "Paketentwickler können in ihren Paketrezepten den Namen und die Version des Pakets in der @uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} angeben, falls sich diese von dem in Guix benutzten Namen und der Version unterscheiden, zum Beispiel so:" #. type: example -#: doc/guix.texi:9182 +#: doc/guix.texi:9180 #, no-wrap msgid "" "(package\n" @@ -16762,12 +16773,12 @@ msgstr "" " (cpe-version . \"2.3\")))\n" #. type: table -#: doc/guix.texi:9189 +#: doc/guix.texi:9187 msgid "Some entries in the CVE database do not specify which version of a package they apply to, and would thus ``stick around'' forever. Package developers who found CVE alerts and verified they can be ignored can declare them as in this example:" msgstr "Manche Einträge in der CVE-Datenbank geben die Version des Pakets nicht an, auf das sie sich beziehen, und würden daher bis in alle Ewigkeit Warnungen auslösen. Paketentwickler, die CVE-Warnmeldungen gefunden und geprüft haben, dass diese ignoriert werden können, können sie wie in diesem Beispiel deklarieren:" #. type: example -#: doc/guix.texi:9199 +#: doc/guix.texi:9197 #, no-wrap msgid "" "(package\n" @@ -16790,91 +16801,91 @@ msgstr "" " \"CVE-2011-5244\")))))\n" #. type: item -#: doc/guix.texi:9201 +#: doc/guix.texi:9199 #, no-wrap msgid "formatting" msgstr "Formatierung" #. type: table -#: doc/guix.texi:9204 +#: doc/guix.texi:9202 msgid "Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc." msgstr "Offensichtliche Fehler bei der Formatierung von Quellcode melden, z.B.@: Leerraum-Zeichen am Zeilenende oder Nutzung von Tabulatorzeichen." #. type: example -#: doc/guix.texi:9210 +#: doc/guix.texi:9208 #, no-wrap msgid "guix lint @var{options} @var{package}@dots{}\n" msgstr "guix lint @var{Optionen} @var{Pakete}…\n" #. type: Plain text -#: doc/guix.texi:9214 +#: doc/guix.texi:9212 msgid "If no package is given on the command line, then all packages are checked. The @var{options} may be zero or more of the following:" msgstr "Wird kein Paket auf der Befehlszeile angegeben, dann werden alle Pakete geprüft, die es gibt. Als @var{Optionen} können null oder mehr der folgenden Befehlszeilenoptionen übergeben werden:" #. type: item -#: doc/guix.texi:9216 +#: doc/guix.texi:9214 #, no-wrap msgid "--list-checkers" msgstr "--list-checkers" #. type: table -#: doc/guix.texi:9220 +#: doc/guix.texi:9218 msgid "List and describe all the available checkers that will be run on packages and exit." msgstr "Alle verfügbaren Prüfer für die Pakete auflisten und beschreiben." #. type: item -#: doc/guix.texi:9221 +#: doc/guix.texi:9219 #, no-wrap msgid "--checkers" msgstr "--checkers" #. type: itemx -#: doc/guix.texi:9222 +#: doc/guix.texi:9220 #, no-wrap msgid "-c" msgstr "-c" #. type: table -#: doc/guix.texi:9225 +#: doc/guix.texi:9223 msgid "Only enable the checkers specified in a comma-separated list using the names returned by @code{--list-checkers}." msgstr "Nur die Prüfer aktivieren, die hiernach in einer kommagetrennten Liste aus von @code{--list-checkers} aufgeführten Prüfern vorkommen." #. type: section -#: doc/guix.texi:9229 +#: doc/guix.texi:9227 #, no-wrap msgid "Invoking @command{guix size}" msgstr "@command{guix size} aufrufen" #. type: cindex -#: doc/guix.texi:9231 +#: doc/guix.texi:9229 #, no-wrap msgid "size" msgstr "Größe" #. type: cindex -#: doc/guix.texi:9232 +#: doc/guix.texi:9230 #, no-wrap msgid "package size" msgstr "Paketgröße" #. type: command{#1} -#: doc/guix.texi:9234 +#: doc/guix.texi:9232 #, no-wrap msgid "guix size" msgstr "guix size" #. type: Plain text -#: doc/guix.texi:9241 +#: doc/guix.texi:9239 msgid "The @command{guix size} command helps package developers profile the disk usage of packages. It is easy to overlook the impact of an additional dependency added to a package, or the impact of using a single output for a package that could easily be split (@pxref{Packages with Multiple Outputs}). Such are the typical issues that @command{guix size} can highlight." msgstr "Der Befehl @command{guix size} hilft Paketentwicklern dabei, den Plattenplatzverbrauch von Paketen zu profilieren. Es ist leicht, die Auswirkungen zu unterschätzen, die das Hinzufügen zusätzlicher Abhängigkeiten zu einem Paket hat oder die das Verwenden einer einzelnen Ausgabe für ein leicht aufteilbares Paket ausmacht (siehe @ref{Packages with Multiple Outputs}). Das sind typische Probleme, auf die @command{guix size} aufmerksam machen kann." #. type: Plain text -#: doc/guix.texi:9246 +#: doc/guix.texi:9244 msgid "The command can be passed one or more package specifications such as @code{gcc@@4.8} or @code{guile:debug}, or a file name in the store. Consider this example:" msgstr "Dem Befehl können eine oder mehrere Paketspezifikationen wie @code{gcc@@4.8} oder @code{guile:debug} übergeben werden, oder ein Dateiname im Store. Betrachten Sie dieses Beispiel:" #. type: example -#: doc/guix.texi:9259 +#: doc/guix.texi:9257 #, no-wrap msgid "" "$ guix size coreutils\n" @@ -16902,43 +16913,43 @@ msgstr "" "Gesamt: 78.9 MiB\n" #. type: Plain text -#: doc/guix.texi:9265 +#: doc/guix.texi:9263 msgid "The store items listed here constitute the @dfn{transitive closure} of Coreutils---i.e., Coreutils and all its dependencies, recursively---as would be returned by:" msgstr "Die hier aufgelisteten Store-Objekte bilden den @dfn{transitiven Abschluss} der Coreutils — d.h.@: die Coreutils und all ihre Abhängigkeiten und deren Abhängigkeiten, rekursiv —, wie sie hiervon angezeigt würden: dag.pdf\n" msgstr "guix graph coreutils | dot -Tpdf > dag.pdf\n" #. type: Plain text -#: doc/guix.texi:9384 +#: doc/guix.texi:9382 msgid "The output looks like this:" msgstr "Die Ausgabe sieht so aus:" #. type: Plain text -#: doc/guix.texi:9386 +#: doc/guix.texi:9384 msgid "@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}" msgstr "@image{images/coreutils-graph,2in,,Abhängigkeitsgraph der GNU Coreutils}" #. type: Plain text -#: doc/guix.texi:9388 +#: doc/guix.texi:9386 msgid "Nice little graph, no?" msgstr "Ein netter, kleiner Graph, oder?" #. type: Plain text -#: doc/guix.texi:9394 +#: doc/guix.texi:9392 msgid "But there is more than one graph! The one above is concise: it is the graph of package objects, omitting implicit inputs such as GCC, libc, grep, etc. It is often useful to have such a concise graph, but sometimes one may want to see more details. @command{guix graph} supports several types of graphs, allowing you to choose the level of detail:" msgstr "Aber es gibt mehr als eine Art von Graph! Der Graph oben ist kurz und knapp: Es ist der Graph der Paketobjekte, ohne implizite Eingaben wie GCC, libc, grep und so weiter. Oft möchte man einen knappen Graphen sehen, aber manchmal will man auch mehr Details sehen. @command{guix graph} unterstützt mehrere Typen von Graphen; Sie können den Detailgrad auswählen." #. type: table -#: doc/guix.texi:9400 +#: doc/guix.texi:9398 msgid "This is the default type used in the example above. It shows the DAG of package objects, excluding implicit dependencies. It is concise, but filters out many details." msgstr "Der vorgegebene Typ aus dem Beispiel oben. Er zeigt den DAG der Paketobjekte ohne implizite Abhängigkeiten. Er ist knapp, filtert aber viele Details heraus." #. type: item -#: doc/guix.texi:9401 +#: doc/guix.texi:9399 #, no-wrap msgid "reverse-package" msgstr "reverse-package" #. type: table -#: doc/guix.texi:9403 +#: doc/guix.texi:9401 msgid "This shows the @emph{reverse} DAG of packages. For example:" msgstr "Dies zeigt den @emph{umgekehrten} DAG der Pakete. Zum Beispiel liefert" #. type: example -#: doc/guix.texi:9406 +#: doc/guix.texi:9404 #, no-wrap msgid "guix graph --type=reverse-package ocaml\n" msgstr "guix graph --type=reverse-package ocaml\n" #. type: table -#: doc/guix.texi:9411 +#: doc/guix.texi:9409 msgid "...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if you are also interested in cases where OCaml is an implicit dependency, see @code{reverse-bag} below.)" msgstr "…@: den Graphen der Pakete, die @emph{explizit} von OCaml abhängen (wenn Sie auch an Fällen interessiert sind, bei denen OCaml eine implizite Abhängigkeit ist, siehe @code{reverse-bag} weiter unten)." #. type: table -#: doc/guix.texi:9416 +#: doc/guix.texi:9414 msgid "Note that for core packages this can yield huge graphs. If all you want is to know the number of packages that depend on a given package, use @command{guix refresh --list-dependent} (@pxref{Invoking guix refresh, @option{--list-dependent}})." msgstr "Beachten Sie, dass für Kernpakete damit gigantische Graphen entstehen können. Wenn Sie nur die Anzahl der Pakete wissen wollen, die von einem gegebenen Paket abhängen, benutzen Sie @command{guix refresh --list-dependent} (siehe @ref{Invoking guix refresh, @option{--list-dependent}})." #. type: item -#: doc/guix.texi:9417 +#: doc/guix.texi:9415 #, no-wrap msgid "bag-emerged" msgstr "bag-emerged" #. type: table -#: doc/guix.texi:9419 +#: doc/guix.texi:9417 msgid "This is the package DAG, @emph{including} implicit inputs." msgstr "Dies ist der Paket-DAG @emph{einschließlich} impliziter Eingaben." #. type: table -#: doc/guix.texi:9421 +#: doc/guix.texi:9419 msgid "For instance, the following command:" msgstr "Zum Beispiel liefert der folgende Befehl" #. type: example -#: doc/guix.texi:9424 +#: doc/guix.texi:9422 #, no-wrap msgid "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n" msgstr "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n" #. type: table -#: doc/guix.texi:9427 +#: doc/guix.texi:9425 msgid "...@: yields this bigger graph:" msgstr "…@: diesen größeren Graphen:" #. type: table -#: doc/guix.texi:9429 +#: doc/guix.texi:9427 msgid "@image{images/coreutils-bag-graph,,5in,Detailed dependency graph of the GNU Coreutils}" msgstr "@image{images/coreutils-bag-graph,,5in,Detaillierter Abhängigkeitsgraph der GNU Coreutils}" #. type: table -#: doc/guix.texi:9432 +#: doc/guix.texi:9430 msgid "At the bottom of the graph, we see all the implicit inputs of @var{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})." msgstr "Am unteren Rand des Graphen sehen wir alle impliziten Eingaben des @var{gnu-build-system} (siehe @ref{Build Systems, @code{gnu-build-system}})." #. type: table -#: doc/guix.texi:9436 +#: doc/guix.texi:9434 msgid "Now, note that the dependencies of these implicit inputs---that is, the @dfn{bootstrap dependencies} (@pxref{Bootstrapping})---are not shown here, for conciseness." msgstr "Beachten Sie dabei aber, dass auch hier die Abhängigkeiten dieser impliziten Eingaben — d.h.@: die @dfn{Bootstrap-Abhängigkeiten} (siehe @ref{Bootstrapping}) — nicht gezeigt werden, damit der Graph knapper bleibt." #. type: item -#: doc/guix.texi:9437 +#: doc/guix.texi:9435 #, no-wrap msgid "bag" msgstr "bag" #. type: table -#: doc/guix.texi:9440 +#: doc/guix.texi:9438 msgid "Similar to @code{bag-emerged}, but this time including all the bootstrap dependencies." msgstr "Ähnlich wie @code{bag-emerged}, aber diesmal mit allen Bootstrap-Abhängigkeiten." #. type: item -#: doc/guix.texi:9441 +#: doc/guix.texi:9439 #, no-wrap msgid "bag-with-origins" msgstr "bag-with-origins" #. type: table -#: doc/guix.texi:9443 +#: doc/guix.texi:9441 msgid "Similar to @code{bag}, but also showing origins and their dependencies." msgstr "Ähnlich wie @code{bag}, aber auch mit den Ursprüngen und deren Abhängigkeiten." #. type: item -#: doc/guix.texi:9444 +#: doc/guix.texi:9442 #, no-wrap msgid "reverse-bag" msgstr "reverse-bag" #. type: table -#: doc/guix.texi:9447 +#: doc/guix.texi:9445 msgid "This shows the @emph{reverse} DAG of packages. Unlike @code{reverse-package}, it also takes implicit dependencies into account. For example:" msgstr "Dies zeigt den @emph{umgekehrten} DAG der Pakete. Anders als @code{reverse-package} werden auch implizite Abhängigkeiten berücksichtigt. Zum Beispiel liefert" #. type: example -#: doc/guix.texi:9450 +#: doc/guix.texi:9448 #, no-wrap msgid "guix graph -t reverse-bag dune\n" msgstr "guix graph -t reverse-bag dune\n" #. type: table -#: doc/guix.texi:9457 +#: doc/guix.texi:9455 msgid "...@: yields the graph of all packages that depend on Dune, directly or indirectly. Since Dune is an @emph{implicit} dependency of many packages @i{via} @code{dune-build-system}, this shows a large number of packages, whereas @code{reverse-package} would show very few if any." msgstr "…@: den Graphen aller Pakete, die von Dune direkt oder indirekt abhängen. Weil Dune eine @emph{implizite} Abhängigkeit von vielen Paketen über das @code{dune-build-system} ist, zeigt er eine große Zahl von Paketen, während bei @code{reverse-package} nur sehr wenige bis gar keine zu sehen sind." #. type: table -#: doc/guix.texi:9463 +#: doc/guix.texi:9461 msgid "This is the most detailed representation: It shows the DAG of derivations (@pxref{Derivations}) and plain store items. Compared to the above representation, many additional nodes are visible, including build scripts, patches, Guile modules, etc." msgstr "Diese Darstellung ist am detailliertesten: Sie zeigt den DAG der Ableitungen (siehe @ref{Derivations}) und der einfachen Store-Objekte. Verglichen mit obiger Darstellung sieht man viele zusätzliche Knoten einschließlich Erstellungs-Skripts, Patches, Guile-Module usw." #. type: table -#: doc/guix.texi:9466 +#: doc/guix.texi:9464 msgid "For this type of graph, it is also possible to pass a @file{.drv} file name instead of a package name, as in:" msgstr "Für diesen Typ Graph kann auch der Name einer @file{.drv}-Datei anstelle eines Paketnamens angegeben werden, etwa so:" #. type: example -#: doc/guix.texi:9469 +#: doc/guix.texi:9467 #, no-wrap msgid "guix graph -t derivation `guix system build -d my-config.scm`\n" msgstr "guix graph -t derivation `guix system build -d my-config.scm`\n" #. type: item -#: doc/guix.texi:9471 +#: doc/guix.texi:9469 #, no-wrap msgid "module" msgstr "module" #. type: table -#: doc/guix.texi:9475 +#: doc/guix.texi:9473 msgid "This is the graph of @dfn{package modules} (@pxref{Package Modules}). For example, the following command shows the graph for the package module that defines the @code{guile} package:" msgstr "Dies ist der Graph der @dfn{Paketmodule} (siehe @ref{Package Modules}). Zum Beispiel zeigt der folgende Befehl den Graph für das Paketmodul an, das das @code{guile}-Paket definiert:" #. type: example -#: doc/guix.texi:9478 +#: doc/guix.texi:9476 #, no-wrap msgid "guix graph -t module guile | dot -Tpdf > module-graph.pdf\n" msgstr "guix graph -t module guile | dot -Tpdf > modul-graph.pdf\n" #. type: Plain text -#: doc/guix.texi:9483 +#: doc/guix.texi:9481 msgid "All the types above correspond to @emph{build-time dependencies}. The following graph type represents the @emph{run-time dependencies}:" msgstr "Alle oben genannten Typen entsprechen @emph{Abhängigkeiten zur Erstellungszeit}. Der folgende Graphtyp repräsentiert die @emph{Abhängigkeiten zur Laufzeit}:" #. type: table -#: doc/guix.texi:9488 +#: doc/guix.texi:9486 msgid "This is the graph of @dfn{references} of a package output, as returned by @command{guix gc --references} (@pxref{Invoking guix gc})." msgstr "Dies ist der Graph der @dfn{Referenzen} einer Paketausgabe, wie @command{guix gc --references} sie liefert (siehe @ref{Invoking guix gc})." #. type: table -#: doc/guix.texi:9491 +#: doc/guix.texi:9489 msgid "If the given package output is not available in the store, @command{guix graph} attempts to obtain dependency information from substitutes." msgstr "Wenn die angegebene Paketausgabe im Store nicht verfügbar ist, versucht @command{guix graph}, die Abhängigkeitsinformationen aus Substituten zu holen." #. type: table -#: doc/guix.texi:9495 +#: doc/guix.texi:9493 msgid "Here you can also pass a store file name instead of a package name. For example, the command below produces the reference graph of your profile (which can be big!):" msgstr "Hierbei können Sie auch einen Store-Dateinamen statt eines Paketnamens angeben. Zum Beispiel generiert der Befehl unten den Referenzgraphen Ihres Profils (der sehr groß werden kann!):" #. type: example -#: doc/guix.texi:9498 +#: doc/guix.texi:9496 #, no-wrap msgid "guix graph -t references `readlink -f ~/.guix-profile`\n" msgstr "guix graph -t references `readlink -f ~/.guix-profile`\n" #. type: item -#: doc/guix.texi:9500 +#: doc/guix.texi:9498 #, no-wrap msgid "referrers" msgstr "referrers" #. type: table -#: doc/guix.texi:9503 +#: doc/guix.texi:9501 msgid "This is the graph of the @dfn{referrers} of a store item, as returned by @command{guix gc --referrers} (@pxref{Invoking guix gc})." msgstr "Dies ist der Graph der ein Store-Objekt @dfn{referenzierenden} Objekte, wie @command{guix gc --referrers} sie liefern würde (siehe @ref{Invoking guix gc})." #. type: table -#: doc/guix.texi:9509 +#: doc/guix.texi:9507 msgid "This relies exclusively on local information from your store. For instance, let us suppose that the current Inkscape is available in 10 profiles on your machine; @command{guix graph -t referrers inkscape} will show a graph rooted at Inkscape and with those 10 profiles linked to it." msgstr "Er basiert ausschließlich auf lokalen Informationen aus Ihrem Store. Nehmen wir zum Beispiel an, dass das aktuelle Inkscape in 10 Profilen verfügbar ist, dann wird @command{guix graph -t referrers inkscape} einen Graph zeigen, der bei Inkscape gewurzelt ist und Kanten zu diesen 10 Profilen hat." #. type: table -#: doc/guix.texi:9512 +#: doc/guix.texi:9510 msgid "It can help determine what is preventing a store item from being garbage collected." msgstr "Ein solcher Graph kann dabei helfen, herauszufinden, weshalb ein Store-Objekt nicht vom Müllsammler abgeholt werden kann." #. type: Plain text -#: doc/guix.texi:9516 +#: doc/guix.texi:9514 msgid "The available options are the following:" msgstr "Folgendes sind die verfügbaren Befehlszeilenoptionen:" #. type: table -#: doc/guix.texi:9522 +#: doc/guix.texi:9520 msgid "Produce a graph output of @var{type}, where @var{type} must be one of the values listed above." msgstr "Eine Graph-Ausgabe dieses @var{Typ}s generieren. Dieser @var{Typ} muss einer der oben genannten Werte sein." #. type: item -#: doc/guix.texi:9523 +#: doc/guix.texi:9521 #, no-wrap msgid "--list-types" msgstr "--list-types" #. type: table -#: doc/guix.texi:9525 +#: doc/guix.texi:9523 msgid "List the supported graph types." msgstr "Die unterstützten Graph-Typen auflisten." #. type: item -#: doc/guix.texi:9526 +#: doc/guix.texi:9524 #, no-wrap msgid "--backend=@var{backend}" msgstr "--backend=@var{Backend}" #. type: itemx -#: doc/guix.texi:9527 +#: doc/guix.texi:9525 #, no-wrap msgid "-b @var{backend}" msgstr "-b @var{Backend}" #. type: table -#: doc/guix.texi:9529 +#: doc/guix.texi:9527 msgid "Produce a graph using the selected @var{backend}." msgstr "Einen Graph mit Hilfe des ausgewählten @var{Backend}s generieren." #. type: item -#: doc/guix.texi:9530 +#: doc/guix.texi:9528 #, no-wrap msgid "--list-backends" msgstr "--list-backends" #. type: table -#: doc/guix.texi:9532 +#: doc/guix.texi:9530 msgid "List the supported graph backends." msgstr "Die unterstützten Graph-Backends auflisten." #. type: table -#: doc/guix.texi:9534 +#: doc/guix.texi:9532 msgid "Currently, the available backends are Graphviz and d3.js." msgstr "Derzeit sind die verfügbaren Backends Graphviz und d3.js." #. type: example -#: doc/guix.texi:9543 +#: doc/guix.texi:9541 #, no-wrap msgid "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n" msgstr "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n" #. type: table -#: doc/guix.texi:9548 +#: doc/guix.texi:9546 msgid "Display the graph for @var{system}---e.g., @code{i686-linux}." msgstr "Den Graphen für das @var{System} anzeigen — z.B.@: @code{i686-linux}." #. type: table -#: doc/guix.texi:9551 +#: doc/guix.texi:9549 msgid "The package dependency graph is largely architecture-independent, but there are some architecture-dependent bits that this option allows you to visualize." msgstr "Der Abhängigkeitsgraph ist größtenteils von der Systemarchitektur unabhängig, aber ein paar architekturabhängige Teile können Ihnen mit dieser Befehlszeilenoption visualisiert werden." #. type: section -#: doc/guix.texi:9556 +#: doc/guix.texi:9554 #, no-wrap msgid "Invoking @command{guix publish}" msgstr "@command{guix publish} aufrufen" #. type: command{#1} -#: doc/guix.texi:9558 +#: doc/guix.texi:9556 #, no-wrap msgid "guix publish" msgstr "guix publish" #. type: Plain text -#: doc/guix.texi:9562 +#: doc/guix.texi:9560 msgid "The purpose of @command{guix publish} is to enable users to easily share their store with others, who can then use it as a substitute server (@pxref{Substitutes})." msgstr "Der Zweck von @command{guix publish} ist, es Nutzern zu ermöglichen, ihren Store auf einfache Weise mit anderen zu teilen, die ihn dann als Substitutserver einsetzen können (siehe @ref{Substitutes})." #. type: Plain text -#: doc/guix.texi:9568 +#: doc/guix.texi:9566 msgid "When @command{guix publish} runs, it spawns an HTTP server which allows anyone with network access to obtain substitutes from it. This means that any machine running Guix can also act as if it were a build farm, since the HTTP interface is compatible with Hydra, the software behind the @code{@value{SUBSTITUTE-SERVER}} build farm." msgstr "Wenn @command{guix publish} ausgeführt wird, wird dadurch ein HTTP-Server gestartet, so dass jeder mit Netzwerkzugang davon Substitute beziehen kann. Das bedeutet, dass jede Maschine, auf der Guix läuft, auch als Build-Farm fungieren kann, weil die HTTP-Schnittstelle mit Hydra, der Software, mit der die offizielle Build-Farm @code{@value{SUBSTITUTE-SERVER}} betrieben wird, kompatibel ist." #. type: Plain text -#: doc/guix.texi:9574 +#: doc/guix.texi:9572 msgid "For security, each substitute is signed, allowing recipients to check their authenticity and integrity (@pxref{Substitutes}). Because @command{guix publish} uses the signing key of the system, which is only readable by the system administrator, it must be started as root; the @code{--user} option makes it drop root privileges early on." msgstr "Um Sicherheit zu gewährleisten, wird jedes Substitut signiert, so dass Empfänger dessen Authentizität und Integrität nachprüfen können (siehe @ref{Substitutes}). Weil @command{guix publish} den Signierschlüssel des Systems benutzt, der nur vom Systemadministrator gelesen werden kann, muss es als der Administratornutzer „root“ gestartet werden. Mit der Befehlszeilenoption @code{--user} werden Administratorrechte bald nach dem Start wieder abgelegt." #. type: Plain text -#: doc/guix.texi:9578 +#: doc/guix.texi:9576 msgid "The signing key pair must be generated before @command{guix publish} is launched, using @command{guix archive --generate-key} (@pxref{Invoking guix archive})." msgstr "Das Schlüsselpaar zum Signieren muss erzeugt werden, bevor @command{guix publish} gestartet wird. Dazu können Sie @command{guix archive --generate-key} ausführen (siehe @ref{Invoking guix archive})." #. type: example -#: doc/guix.texi:9583 +#: doc/guix.texi:9581 #, no-wrap msgid "guix publish @var{options}@dots{}\n" msgstr "guix publish @var{Optionen}…\n" #. type: Plain text -#: doc/guix.texi:9587 +#: doc/guix.texi:9585 msgid "Running @command{guix publish} without any additional arguments will spawn an HTTP server on port 8080:" msgstr "Wird @command{guix publish} ohne weitere Argumente ausgeführt, wird damit ein HTTP-Server gestartet, der auf Port 8080 lauscht:" #. type: example -#: doc/guix.texi:9590 +#: doc/guix.texi:9588 #, no-wrap msgid "guix publish\n" msgstr "guix publish\n" #. type: Plain text -#: doc/guix.texi:9594 +#: doc/guix.texi:9592 msgid "Once a publishing server has been authorized (@pxref{Invoking guix archive}), the daemon may download substitutes from it:" msgstr "Sobald ein Server zum Veröffentlichen autorisiert wurde (siehe @ref{Invoking guix archive}), kann der Daemon davon Substitute herunterladen:" #. type: example -#: doc/guix.texi:9597 +#: doc/guix.texi:9595 #, no-wrap msgid "guix-daemon --substitute-urls=http://example.org:8080\n" msgstr "guix-daemon --substitute-urls=http://example.org:8080\n" #. type: Plain text -#: doc/guix.texi:9606 +#: doc/guix.texi:9604 msgid "By default, @command{guix publish} compresses archives on the fly as it serves them. This ``on-the-fly'' mode is convenient in that it requires no setup and is immediately available. However, when serving lots of clients, we recommend using the @option{--cache} option, which enables caching of the archives before they are sent to clients---see below for details. The @command{guix weather} command provides a handy way to check what a server provides (@pxref{Invoking guix weather})." msgstr "Nach den Voreinstellungen komprimiert @command{guix publish} Archive erst dann, wenn sie angefragt werden. Dieser „dynamische“ Modus bietet sich an, weil so nichts weiter eingerichtet werden muss und er direkt verfügbar ist. Wenn Sie allerdings viele Clients bedienen wollen, empfehlen wir, dass Sie die Befehlszeilenoption @option{--cache} benutzen, die das Zwischenspeichern der komprimierten Archive aktiviert, bevor diese an die Clients geschickt werden — siehe unten für Details. Mit dem Befehl @command{guix weather} haben Sie eine praktische Methode zur Hand, zu überprüfen, was so ein Server anbietet (siehe @ref{Invoking guix weather})." #. type: Plain text -#: doc/guix.texi:9613 +#: doc/guix.texi:9611 msgid "As a bonus, @command{guix publish} also serves as a content-addressed mirror for source files referenced in @code{origin} records (@pxref{origin Reference}). For instance, assuming @command{guix publish} is running on @code{example.org}, the following URL returns the raw @file{hello-2.10.tar.gz} file with the given SHA256 hash (represented in @code{nix-base32} format, @pxref{Invoking guix hash}):" msgstr "Als Bonus dient @command{guix publish} auch als inhaltsadressierbarer Spiegelserver für Quelldateien, die in @code{origin}-Verbundsobjekten eingetragen sind (siehe @ref{origin Reference}). Wenn wir zum Beispiel annehmen, dass @command{guix publish} auf @code{example.org} läuft, liefert folgende URL die rohe @file{hello-2.10.tar.gz}-Datei mit dem angegebenen SHA256-Hash als ihre Prüfsumme (dargestellt im @code{nix-base32}-Format, siehe @ref{Invoking guix hash}):" #. type: example -#: doc/guix.texi:9616 +#: doc/guix.texi:9614 #, no-wrap msgid "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1@dots{}ndq1i\n" msgstr "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1…ndq1i\n" #. type: Plain text -#: doc/guix.texi:9620 +#: doc/guix.texi:9618 msgid "Obviously, these URLs only work for files that are in the store; in other cases, they return 404 (``Not Found'')." msgstr "Offensichtlich funktionieren diese URLs nur mit solchen Dateien, die auch im Store vorliegen; in anderen Fällen werden sie 404 („Nicht gefunden“) zurückliefern." #. type: cindex -#: doc/guix.texi:9621 +#: doc/guix.texi:9619 #, no-wrap msgid "build logs, publication" msgstr "Erstellungsprotokolle, Veröffentlichen" #. type: Plain text -#: doc/guix.texi:9623 +#: doc/guix.texi:9621 msgid "Build logs are available from @code{/log} URLs like:" msgstr "Erstellungsprotokolle sind unter @code{/log}-URLs abrufbar:" #. type: example -#: doc/guix.texi:9626 +#: doc/guix.texi:9624 #, no-wrap msgid "http://example.org/log/gwspk@dots{}-guile-2.2.3\n" msgstr "http://example.org/log/gwspk…-guile-2.2.3\n" #. type: Plain text -#: doc/guix.texi:9636 +#: doc/guix.texi:9634 msgid "When @command{guix-daemon} is configured to save compressed build logs, as is the case by default (@pxref{Invoking guix-daemon}), @code{/log} URLs return the compressed log as-is, with an appropriate @code{Content-Type} and/or @code{Content-Encoding} header. We recommend running @command{guix-daemon} with @code{--log-compression=gzip} since Web browsers can automatically decompress it, which is not the case with bzip2 compression." msgstr "Ist der @command{guix-daemon} so eingestellt, dass er Erstellungsprotokolle komprimiert abspeichert, wie es voreingestellt ist (siehe @ref{Invoking guix-daemon}), liefern @code{/log}-URLs das unveränderte komprimierte Protokoll, mit einer entsprechenden @code{Content-Type}- und/oder @code{Content-Encoding}-Kopfzeile. Wir empfehlen dabei, dass Sie den @command{guix-daemon} mit @code{--log-compression=gzip} ausführen, weil Web-Browser dieses Format automatisch dekomprimieren können, was bei bzip2-Kompression nicht der Fall ist." #. type: item -#: doc/guix.texi:9640 +#: doc/guix.texi:9638 #, no-wrap msgid "--port=@var{port}" msgstr "--port=@var{Port}" #. type: itemx -#: doc/guix.texi:9641 +#: doc/guix.texi:9639 #, no-wrap msgid "-p @var{port}" msgstr "-p @var{Port}" #. type: table -#: doc/guix.texi:9643 +#: doc/guix.texi:9641 msgid "Listen for HTTP requests on @var{port}." msgstr "Auf HTTP-Anfragen auf diesem @var{Port} lauschen." #. type: item -#: doc/guix.texi:9644 doc/guix.texi:20716 +#: doc/guix.texi:9642 doc/guix.texi:20713 #, no-wrap msgid "--listen=@var{host}" msgstr "--listen=@var{Host}" #. type: table -#: doc/guix.texi:9647 +#: doc/guix.texi:9645 msgid "Listen on the network interface for @var{host}. The default is to accept connections from any interface." msgstr "Auf der Netzwerkschnittstelle für den angegebenen @var{Host}, also der angegebenen Rechneradresse, lauschen. Vorgegeben ist, Verbindungen mit jeder Schnittstelle zu akzeptieren." #. type: table -#: doc/guix.texi:9652 +#: doc/guix.texi:9650 msgid "Change privileges to @var{user} as soon as possible---i.e., once the server socket is open and the signing key has been read." msgstr "So früh wie möglich alle über die Berechtigungen des @var{Benutzer}s hinausgehenden Berechtigungen ablegen — d.h.@: sobald der Server-Socket geöffnet und der Signierschlüssel gelesen wurde." #. type: item -#: doc/guix.texi:9653 +#: doc/guix.texi:9651 #, no-wrap msgid "--compression[=@var{level}]" msgstr "--compression[=@var{Stufe}]" #. type: itemx -#: doc/guix.texi:9654 +#: doc/guix.texi:9652 #, no-wrap msgid "-C [@var{level}]" msgstr "-C [@var{Stufe}]" #. type: table -#: doc/guix.texi:9659 +#: doc/guix.texi:9657 msgid "Compress data using the given @var{level}. When @var{level} is zero, disable compression. The range 1 to 9 corresponds to different gzip compression levels: 1 is the fastest, and 9 is the best (CPU-intensive). The default is 3." msgstr "Daten auf der angegebenen Kompressions-@var{Stufe} komprimieren. Wird als @var{Stufe} null angegeben, wird Kompression deaktiviert. Der Bereich von 1 bis 9 entspricht unterschiedlichen gzip-Kompressionsstufen: 1 ist am schnellsten, während 9 am besten komprimiert (aber den Prozessor mehr auslastet). Der Vorgabewert ist 3." #. type: table -#: doc/guix.texi:9668 +#: doc/guix.texi:9666 msgid "Unless @option{--cache} is used, compression occurs on the fly and the compressed streams are not cached. Thus, to reduce load on the machine that runs @command{guix publish}, it may be a good idea to choose a low compression level, to run @command{guix publish} behind a caching proxy, or to use @option{--cache}. Using @option{--cache} has the advantage that it allows @command{guix publish} to add @code{Content-Length} HTTP header to its responses." msgstr "Wenn @option{--cache} nicht übergeben wird, werden Daten dynamisch immer erst dann komprimiert, wenn sie abgeschickt werden; komprimierte Datenströme landen in keinem Zwischenspeicher. Um also die Auslastung der Maschine, auf der @command{guix publish} läuft, zu reduzieren, kann es eine gute Idee sein, eine niedrige Kompressionsstufe zu wählen, @command{guix publish} einen Proxy mit Zwischenspeicher (einen „Caching Proxy“) voranzuschalten, oder @option{--cache} zu benutzen. @option{--cache} zu benutzen, hat den Vorteil, dass @command{guix publish} damit eine @code{Content-Length}-HTTP-Kopfzeile seinen Antworten beifügen kann." #. type: item -#: doc/guix.texi:9669 +#: doc/guix.texi:9667 #, no-wrap msgid "--cache=@var{directory}" msgstr "--cache=@var{Verzeichnis}" #. type: itemx -#: doc/guix.texi:9670 +#: doc/guix.texi:9668 #, no-wrap msgid "-c @var{directory}" msgstr "-c @var{Verzeichnis}" #. type: table -#: doc/guix.texi:9673 +#: doc/guix.texi:9671 msgid "Cache archives and meta-data (@code{.narinfo} URLs) to @var{directory} and only serve archives that are in cache." msgstr "Archive und Metadaten (@code{.narinfo}-URLs) in das @var{Verzeichnis} zwischenspeichern und nur solche Archive versenden, die im Zwischenspeicher vorliegen." #. type: table -#: doc/guix.texi:9681 +#: doc/guix.texi:9679 msgid "When this option is omitted, archives and meta-data are created on-the-fly. This can reduce the available bandwidth, especially when compression is enabled, since this may become CPU-bound. Another drawback of the default mode is that the length of archives is not known in advance, so @command{guix publish} does not add a @code{Content-Length} HTTP header to its responses, which in turn prevents clients from knowing the amount of data being downloaded." msgstr "Wird diese Befehlszeilenoption weggelassen, dann werden Archive und Metadaten „dynamisch“ erst auf eine Anfrage hin erzeugt. Dadurch kann die verfügbare Bandbreite reduziert werden, besonders wenn Kompression aktiviert ist, weil die Operation dann durch die Prozessorleistung beschränkt sein kann. Noch ein Nachteil des voreingestellten Modus ist, dass die Länge der Archive nicht im Voraus bekannt ist, @command{guix publish} also keine @code{Content-Length}-HTTP-Kopfzeile an seine Antworten anfügt, wodurch Clients nicht wissen können, welche Datenmenge noch heruntergeladen werden muss." #. type: table -#: doc/guix.texi:9689 +#: doc/guix.texi:9687 msgid "Conversely, when @option{--cache} is used, the first request for a store item (@i{via} a @code{.narinfo} URL) returns 404 and triggers a background process to @dfn{bake} the archive---computing its @code{.narinfo} and compressing the archive, if needed. Once the archive is cached in @var{directory}, subsequent requests succeed and are served directly from the cache, which guarantees that clients get the best possible bandwidth." msgstr "Im Gegensatz dazu liefert, wenn @option{--cache} benutzt wird, die erste Anfrage nach einem Store-Objekt (über dessen @code{.narinfo}-URL) den Fehlercode 404, und im Hintergrund wird ein Prozess gestartet, der das Archiv in den Zwischenspeicher einlagert (auf Englisch sagen wir „@dfn{bake} the archive“), d.h.@: seine @code{.narinfo} wird berechnet und das Archiv, falls nötig, komprimiert. Sobald das Archiv im @var{Verzeichnis} zwischengespeichert wurde, werden nachfolgende Anfragen erfolgreich sein und direkt aus dem Zwischenspeicher bedient, der garantiert, dass Clients optimale Bandbreite genießen." #. type: table -#: doc/guix.texi:9693 +#: doc/guix.texi:9691 msgid "The ``baking'' process is performed by worker threads. By default, one thread per CPU core is created, but this can be customized. See @option{--workers} below." msgstr "Der Prozess zum Einlagern wird durch Worker-Threads umgesetzt. Der Vorgabe entsprechend wird dazu pro Prozessorkern ein Thread erzeugt, aber dieses Verhalten kann angepasst werden. Siehe @option{--workers} weiter unten." #. type: table -#: doc/guix.texi:9696 +#: doc/guix.texi:9694 msgid "When @option{--ttl} is used, cached entries are automatically deleted when they have expired." msgstr "Wird @option{--ttl} verwendet, werden zwischengespeicherte Einträge automatisch gelöscht, sobald die dabei angegebene Zeit abgelaufen ist." #. type: item -#: doc/guix.texi:9697 +#: doc/guix.texi:9695 #, no-wrap msgid "--workers=@var{N}" msgstr "--workers=@var{N}" #. type: table -#: doc/guix.texi:9700 +#: doc/guix.texi:9698 msgid "When @option{--cache} is used, request the allocation of @var{N} worker threads to ``bake'' archives." msgstr "Wird @option{--cache} benutzt, wird die Reservierung von @var{N} Worker-Threads angefragt, um Archive einzulagern." #. type: item -#: doc/guix.texi:9701 +#: doc/guix.texi:9699 #, no-wrap msgid "--ttl=@var{ttl}" msgstr "--ttl=@var{ttl}" #. type: table -#: doc/guix.texi:9705 +#: doc/guix.texi:9703 msgid "Produce @code{Cache-Control} HTTP headers that advertise a time-to-live (TTL) of @var{ttl}. @var{ttl} must denote a duration: @code{5d} means 5 days, @code{1m} means 1 month, and so on." msgstr "@code{Cache-Control}-HTTP-Kopfzeilen erzeugen, die eine Time-to-live (TTL) von @var{ttl} signalisieren. Für @var{ttl} muss eine Dauer (mit dem Anfangsbuchstaben der Maßeinheit der Dauer im Englischen) angegeben werden: @code{5d} bedeutet 5 Tage, @code{1m} bedeutet 1 Monat und so weiter." #. type: table -#: doc/guix.texi:9710 +#: doc/guix.texi:9708 msgid "This allows the user's Guix to keep substitute information in cache for @var{ttl}. However, note that @code{guix publish} does not itself guarantee that the store items it provides will indeed remain available for as long as @var{ttl}." msgstr "Das ermöglicht es Guix, Substitutinformationen @var{ttl} lang zwischenzuspeichern. Beachten Sie allerdings, dass @code{guix publish} selbst @emph{nicht} garantiert, dass die davon angebotenen Store-Objekte so lange verfügbar bleiben, wie es die @var{ttl} vorsieht." #. type: table -#: doc/guix.texi:9714 +#: doc/guix.texi:9712 msgid "Additionally, when @option{--cache} is used, cached entries that have not been accessed for @var{ttl} and that no longer have a corresponding item in the store, may be deleted." msgstr "Des Weiteren können bei Nutzung von @option{--cache} die zwischengespeicherten Einträge gelöscht werden, wenn auf sie @var{ttl} lang nicht zugegriffen wurde und kein ihnen entsprechendes Objekt mehr im Store existiert." #. type: item -#: doc/guix.texi:9715 +#: doc/guix.texi:9713 #, no-wrap msgid "--nar-path=@var{path}" msgstr "--nar-path=@var{Pfad}" #. type: table -#: doc/guix.texi:9718 +#: doc/guix.texi:9716 msgid "Use @var{path} as the prefix for the URLs of ``nar'' files (@pxref{Invoking guix archive, normalized archives})." msgstr "Den @var{Pfad} als Präfix für die URLs von „nar“-Dateien benutzen (siehe @ref{Invoking guix archive, normalized archives})." #. type: table -#: doc/guix.texi:9722 +#: doc/guix.texi:9720 msgid "By default, nars are served at a URL such as @code{/nar/gzip/@dots{}-coreutils-8.25}. This option allows you to change the @code{/nar} part to @var{path}." msgstr "Vorgegeben ist, dass Nars unter einer URL mit @code{/nar/gzip/…-coreutils-8.25} angeboten werden. Mit dieser Befehlszeilenoption können Sie den @code{/nar}-Teil durch den angegebenen @var{Pfad} ersetzen." #. type: item -#: doc/guix.texi:9723 +#: doc/guix.texi:9721 #, no-wrap msgid "--public-key=@var{file}" msgstr "--public-key=@var{Datei}" #. type: itemx -#: doc/guix.texi:9724 +#: doc/guix.texi:9722 #, no-wrap msgid "--private-key=@var{file}" msgstr "--private-key=@var{Datei}" #. type: table -#: doc/guix.texi:9727 +#: doc/guix.texi:9725 msgid "Use the specific @var{file}s as the public/private key pair used to sign the store items being published." msgstr "Die angegebenen @var{Datei}en als das Paar aus öffentlichem und privatem Schlüssel zum Signieren veröffentlichter Store-Objekte benutzen." #. type: table -#: doc/guix.texi:9734 +#: doc/guix.texi:9732 msgid "The files must correspond to the same key pair (the private key is used for signing and the public key is merely advertised in the signature metadata). They must contain keys in the canonical s-expression format as produced by @command{guix archive --generate-key} (@pxref{Invoking guix archive}). By default, @file{/etc/guix/signing-key.pub} and @file{/etc/guix/signing-key.sec} are used." msgstr "Die Dateien müssen demselben Schlüsselpaar entsprechen (der private Schlüssel wird zum Signieren benutzt, der öffentliche Schlüssel wird lediglich in den Metadaten der Signatur aufgeführt). Die Dateien müssen Schlüssel im kanonischen („canonical“) S-Ausdruck-Format enthalten, wie es von @command{guix archive --generate-key} erzeugt wird (siehe @ref{Invoking guix archive}). Vorgegeben ist, dass @file{/etc/guix/signing-key.pub} und @file{/etc/guix/signing-key.sec} benutzt werden." #. type: item -#: doc/guix.texi:9735 +#: doc/guix.texi:9733 #, no-wrap msgid "--repl[=@var{port}]" msgstr "--repl[=@var{Port}]" #. type: itemx -#: doc/guix.texi:9736 +#: doc/guix.texi:9734 #, no-wrap msgid "-r [@var{port}]" msgstr "-r [@var{Port}]" #. type: table -#: doc/guix.texi:9740 +#: doc/guix.texi:9738 msgid "Spawn a Guile REPL server (@pxref{REPL Servers,,, guile, GNU Guile Reference Manual}) on @var{port} (37146 by default). This is used primarily for debugging a running @command{guix publish} server." msgstr "Einen Guile-REPL-Server (siehe @ref{REPL Servers,,, guile, GNU Guile Reference Manual}) auf diesem @var{Port} starten (37146 ist voreingestellt). Dies kann zur Fehlersuche auf einem laufenden „@command{guix publish}“-Server benutzt werden." #. type: Plain text -#: doc/guix.texi:9746 +#: doc/guix.texi:9744 msgid "Enabling @command{guix publish} on Guix System is a one-liner: just instantiate a @code{guix-publish-service-type} service in the @code{services} field of the @code{operating-system} declaration (@pxref{guix-publish-service-type, @code{guix-publish-service-type}})." msgstr "@command{guix publish} auf einem „Guix System“-System zu aktivieren ist ein Einzeiler: Instanziieren Sie einfach einen @code{guix-publish-service-type}-Dienst im @code{services}-Feld Ihres @code{operating-system}-Objekts zur Betriebssystemdeklaration (siehe @ref{guix-publish-service-type, @code{guix-publish-service-type}})." #. type: Plain text -#: doc/guix.texi:9749 +#: doc/guix.texi:9747 msgid "If you are instead running Guix on a ``foreign distro'', follow these instructions:”" msgstr "Falls Sie Guix aber auf einer „Fremddistribution“ laufen lassen, folgen Sie folgenden Anweisungen:" #. type: itemize -#: doc/guix.texi:9753 +#: doc/guix.texi:9751 msgid "If your host distro uses the systemd init system:" msgstr "Wenn Ihre Wirtsdistribution systemd als „init“-System benutzt:" #. type: example -#: doc/guix.texi:9758 +#: doc/guix.texi:9756 #, no-wrap msgid "" "# ln -s ~root/.guix-profile/lib/systemd/system/guix-publish.service \\\n" @@ -17670,7 +17681,7 @@ msgstr "" "# systemctl start guix-publish && systemctl enable guix-publish\n" #. type: example -#: doc/guix.texi:9766 +#: doc/guix.texi:9764 #, no-wrap msgid "" "# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n" @@ -17680,56 +17691,56 @@ msgstr "" "# start guix-publish\n" #. type: itemize -#: doc/guix.texi:9770 +#: doc/guix.texi:9768 msgid "Otherwise, proceed similarly with your distro's init system." msgstr "Verfahren Sie andernfalls auf die gleiche Art für das „init“-System, das Ihre Distribution verwendet." #. type: section -#: doc/guix.texi:9773 +#: doc/guix.texi:9771 #, no-wrap msgid "Invoking @command{guix challenge}" msgstr "@command{guix challenge} aufrufen" #. type: cindex -#: doc/guix.texi:9776 +#: doc/guix.texi:9774 #, no-wrap msgid "verifiable builds" msgstr "verifizierbare Erstellungen" #. type: command{#1} -#: doc/guix.texi:9777 +#: doc/guix.texi:9775 #, no-wrap msgid "guix challenge" msgstr "guix challenge" #. type: cindex -#: doc/guix.texi:9778 +#: doc/guix.texi:9776 #, no-wrap msgid "challenge" msgstr "Anfechten" #. type: Plain text -#: doc/guix.texi:9783 +#: doc/guix.texi:9781 msgid "Do the binaries provided by this server really correspond to the source code it claims to build? Is a package build process deterministic? These are the questions the @command{guix challenge} command attempts to answer." msgstr "Entsprechen die von diesem Server gelieferten Binärdateien tatsächlich dem Quellcode, aus dem sie angeblich erzeugt wurden? Ist ein Paketerstellungsprozess deterministisch? Diese Fragen versucht @command{guix challenge} zu beantworten." #. type: Plain text -#: doc/guix.texi:9791 +#: doc/guix.texi:9789 msgid "The former is obviously an important question: Before using a substitute server (@pxref{Substitutes}), one had better @emph{verify} that it provides the right binaries, and thus @emph{challenge} it. The latter is what enables the former: If package builds are deterministic, then independent builds of the package should yield the exact same result, bit for bit; if a server provides a binary different from the one obtained locally, it may be either corrupt or malicious." msgstr "Die erste Frage ist offensichtlich wichtig: Bevor man einen Substitutserver benutzt (siehe @ref{Substitutes}), @emph{verifiziert} man besser, dass er die richtigen Binärdateien liefert, d.h.@: man @emph{fechtet sie an}. Die letzte Frage macht die erste möglich: Wenn Paketerstellungen deterministisch sind, müssten voneinander unabhängige Erstellungen genau dasselbe Ergebnis liefern, Bit für Bit; wenn ein Server mit einer anderen Binärdatei als der lokal erstellten Binärdatei antwortet, ist diese entweder beschädigt oder bösartig." #. type: Plain text -#: doc/guix.texi:9800 +#: doc/guix.texi:9798 msgid "We know that the hash that shows up in @file{/gnu/store} file names is the hash of all the inputs of the process that built the file or directory---compilers, libraries, build scripts, etc. (@pxref{Introduction}). Assuming deterministic build processes, one store file name should map to exactly one build output. @command{guix challenge} checks whether there is, indeed, a single mapping by comparing the build outputs of several independent builds of any given store item." msgstr "Wir wissen, dass die in @file{/gnu/store}-Dateinamen auftauchende Hash-Prüfsumme der Hash aller Eingaben des Prozesses ist, mit dem die Datei oder das Verzeichnis erstellt wurde — Compiler, Bibliotheken, Erstellungsskripts und so weiter (siehe @ref{Introduction}). Wenn wir von deterministischen Erstellungen ausgehen, sollte ein Store-Dateiname also auf genau eine Erstellungsausgabe abgebildet werden. Mit @command{guix challenge} prüft man, ob es tatsächlich eine eindeutige Abbildung gibt, indem die Erstellungsausgaben mehrerer unabhängiger Erstellungen jedes angegebenen Store-Objekts verglichen werden." #. type: Plain text -#: doc/guix.texi:9802 +#: doc/guix.texi:9800 msgid "The command output looks like this:" msgstr "Die Ausgabe des Befehls sieht so aus:" #. type: smallexample -#: doc/guix.texi:9819 +#: doc/guix.texi:9817 #, no-wrap msgid "" "$ guix challenge --substitute-urls=\"https://@value{SUBSTITUTE-SERVER} https://guix.example.org\"\n" @@ -17767,7 +17778,7 @@ msgstr "" "\n" #. type: smallexample -#: doc/guix.texi:9821 +#: doc/guix.texi:9819 #, no-wrap msgid "" "@dots{}\n" @@ -17777,7 +17788,7 @@ msgstr "" "\n" #. type: smallexample -#: doc/guix.texi:9826 +#: doc/guix.texi:9824 #, no-wrap msgid "" "6,406 store items were analyzed:\n" @@ -17791,28 +17802,28 @@ msgstr "" " — 1,132 (17.7%) blieben ergebnislos\n" #. type: Plain text -#: doc/guix.texi:9834 +#: doc/guix.texi:9832 msgid "In this example, @command{guix challenge} first scans the store to determine the set of locally-built derivations---as opposed to store items that were downloaded from a substitute server---and then queries all the substitute servers. It then reports those store items for which the servers obtained a result different from the local build." msgstr "In diesem Beispiel wird mit @command{guix challenge} zuerst die Menge lokal erstellter Ableitungen im Store ermittelt — im Gegensatz zu von einem Substitserver heruntergeladenen Store-Objekten — und dann werden alle Substitutserver angefragt. Diejenigen Store-Objekte, bei denen der Server ein anderes Ergebnis berechnet hat als die lokale Erstellung, werden gemeldet." #. type: cindex -#: doc/guix.texi:9835 +#: doc/guix.texi:9833 #, no-wrap msgid "non-determinism, in package builds" msgstr "Nichtdeterminismus, in Paketerstellungen" #. type: Plain text -#: doc/guix.texi:9846 +#: doc/guix.texi:9844 msgid "As an example, @code{guix.example.org} always gets a different answer. Conversely, @code{@value{SUBSTITUTE-SERVER}} agrees with local builds, except in the case of Git. This might indicate that the build process of Git is non-deterministic, meaning that its output varies as a function of various things that Guix does not fully control, in spite of building packages in isolated environments (@pxref{Features}). Most common sources of non-determinism include the addition of timestamps in build results, the inclusion of random numbers, and directory listings sorted by inode number. See @uref{https://reproducible-builds.org/docs/}, for more information." msgstr "Nehmen wir zum Beispiel an, @code{guix.example.org} gibt uns immer eine verschiedene Antwort, aber @code{@value{SUBSTITUTE-SERVER}} stimmt mit lokalen Erstellungen überein, @emph{außer} im Fall von Git. Das könnte ein Hinweis sein, dass der Erstellungsprozess von Git nichtdeterministisch ist; das bedeutet, seine Ausgabe variiert abhängig von verschiedenen Umständen, die Guix nicht vollends kontrollieren kann, obwohl es Pakete in isolierten Umgebungen erstellt (siehe @ref{Features}). Zu den häufigsten Quellen von Nichtdeterminismus gehören das Einsetzen von Zeitstempeln innerhalb der Erstellungsgebnisse, das Einsetzen von Zufallszahlen und von Auflistungen eines Verzeichnisinhalts sortiert nach der Inode-Nummer. Siehe @uref{https://reproducible-builds.org/docs/} für mehr Informationen." #. type: Plain text -#: doc/guix.texi:9849 +#: doc/guix.texi:9847 msgid "To find out what is wrong with this Git binary, we can do something along these lines (@pxref{Invoking guix archive}):" msgstr "Um herauszufinden, was mit dieser Git-Binärdatei nicht stimmt, können wir so etwas machen (siehe @ref{Invoking guix archive}):" #. type: example -#: doc/guix.texi:9854 +#: doc/guix.texi:9852 #, no-wrap msgid "" "$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \\\n" @@ -17824,100 +17835,100 @@ msgstr "" "$ diff -ur --no-dereference /gnu/store/…-git.2.5.0 /tmp/git\n" #. type: Plain text -#: doc/guix.texi:9863 +#: doc/guix.texi:9861 msgid "This command shows the difference between the files resulting from the local build, and the files resulting from the build on @code{@value{SUBSTITUTE-SERVER}} (@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}). The @command{diff} command works great for text files. When binary files differ, a better option is @uref{https://diffoscope.org/, Diffoscope}, a tool that helps visualize differences for all kinds of files." msgstr "Dieser Befehl zeigt die Unterschiede zwischen den Dateien, die sich aus der lokalen Erstellung ergeben, und den Dateien, die sich aus der Erstellung auf @code{@value{SUBSTITUTE-SERVER}} ergeben (siehe @ref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}). Der Befehl @command{diff} funktioniert großartig für Textdateien. Wenn sich Binärdateien unterscheiden, ist @uref{https://diffoscope.org/, Diffoscope} die bessere Wahl: Es ist ein hilfreiches Werkzeug, das Unterschiede in allen Arten von Dateien visualisiert." #. type: Plain text -#: doc/guix.texi:9871 +#: doc/guix.texi:9869 msgid "Once you have done that work, you can tell whether the differences are due to a non-deterministic build process or to a malicious server. We try hard to remove sources of non-determinism in packages to make it easier to verify substitutes, but of course, this is a process that involves not just Guix, but a large part of the free software community. In the meantime, @command{guix challenge} is one tool to help address the problem." msgstr "Sobald Sie mit dieser Arbeit fertig sind, können Sie erkennen, ob die Unterschiede aufgrund eines nichtdeterministischen Erstellungsprozesses oder wegen einem bösartigen Server zustande kommen. Wir geben uns Mühe, Quellen von Nichtdeterminismus in Paketen zu entfernen, damit Substitute leichter verifiziert werden können, aber natürlich ist an diesem Prozess nicht nur Guix, sondern ein großer Teil der Freie-Software-Gemeinschaft beteiligt. In der Zwischenzeit ist @command{guix challenge} eines der Werkzeuge, die das Problem anzugehen helfen." #. type: Plain text -#: doc/guix.texi:9875 +#: doc/guix.texi:9873 msgid "If you are writing packages for Guix, you are encouraged to check whether @code{@value{SUBSTITUTE-SERVER}} and other substitute servers obtain the same build result as you did with:" msgstr "Wenn Sie ein Paket für Guix schreiben, ermutigen wir Sie, zu überprüfen, ob @code{@value{SUBSTITUTE-SERVER}} und andere Substitutserver dasselbe Erstellungsergebnis bekommen, das Sie bekommen haben. Das geht so:" #. type: example -#: doc/guix.texi:9878 +#: doc/guix.texi:9876 #, no-wrap msgid "$ guix challenge @var{package}\n" msgstr "$ guix challenge @var{Paket}\n" #. type: Plain text -#: doc/guix.texi:9883 +#: doc/guix.texi:9881 msgid "where @var{package} is a package specification such as @code{guile@@2.0} or @code{glibc:debug}." msgstr "Dabei wird mit @var{Paket} eine Paketspezifikation wie @code{guile@@2.0} oder @code{glibc:debug} bezeichnet." #. type: example -#: doc/guix.texi:9888 +#: doc/guix.texi:9886 #, no-wrap msgid "guix challenge @var{options} [@var{packages}@dots{}]\n" msgstr "guix challenge @var{Optionen} [@var{Pakete}…]\n" #. type: Plain text -#: doc/guix.texi:9895 +#: doc/guix.texi:9893 msgid "When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes denote other kinds of errors.)" msgstr "Wird ein Unterschied zwischen der Hash-Prüfsumme des lokal erstellten Objekts und dem vom Server gelieferten Substitut festgestellt, oder zwischen den Substituten von unterschiedlichen Servern, dann wird der Befehl dies wie im obigen Beispiel anzeigen und mit dem Exit-Code 2 terminieren (andere Exit-Codes außer null stehen für andere Arten von Fehlern)." #. type: Plain text -#: doc/guix.texi:9897 +#: doc/guix.texi:9895 msgid "The one option that matters is:" msgstr "Die eine, wichtige Befehlszeilenoption ist:" #. type: table -#: doc/guix.texi:9903 +#: doc/guix.texi:9901 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs to compare to." msgstr "Die @var{URLs} als durch Leerraumzeichen getrennte Liste von Substitut-Quell-URLs benutzen. mit denen verglichen wird." #. type: itemx -#: doc/guix.texi:9905 +#: doc/guix.texi:9903 #, no-wrap msgid "-v" msgstr "-v" #. type: table -#: doc/guix.texi:9908 +#: doc/guix.texi:9906 msgid "Show details about matches (identical contents) in addition to information about mismatches." msgstr "Details auch zu Übereinstimmungen (deren Inhalt identisch ist) ausgeben, zusätzlich zu Informationen über Unterschiede." #. type: section -#: doc/guix.texi:9912 +#: doc/guix.texi:9910 #, no-wrap msgid "Invoking @command{guix copy}" msgstr "@command{guix copy} aufrufen" #. type: cindex -#: doc/guix.texi:9914 +#: doc/guix.texi:9912 #, no-wrap msgid "copy, of store items, over SSH" msgstr "Kopieren, von Store-Objekten, über SSH" #. type: cindex -#: doc/guix.texi:9915 +#: doc/guix.texi:9913 #, no-wrap msgid "SSH, copy of store items" msgstr "SSH, Kopieren von Store-Objekten" #. type: cindex -#: doc/guix.texi:9916 +#: doc/guix.texi:9914 #, no-wrap msgid "sharing store items across machines" msgstr "Store-Objekte zwischen Maschinen teilen" #. type: cindex -#: doc/guix.texi:9917 +#: doc/guix.texi:9915 #, no-wrap msgid "transferring store items across machines" msgstr "Übertragen von Store-Objekten zwischen Maschinen" #. type: Plain text -#: doc/guix.texi:9924 +#: doc/guix.texi:9922 msgid "The @command{guix copy} command copies items from the store of one machine to that of another machine over a secure shell (SSH) connection@footnote{This command is available only when Guile-SSH was found. @xref{Requirements}, for details.}. For example, the following command copies the @code{coreutils} package, the user's profile, and all their dependencies over to @var{host}, logged in as @var{user}:" msgstr "Der Befehl @command{guix copy} kopiert Objekte aus dem Store einer Maschine in den Store einer anderen Maschine mittels einer Secure-Shell-Verbindung (kurz SSH-Verbindung)@footnote{Dieser Befehl steht nur dann zur Verfügung, wenn Guile-SSH gefunden werden kann. Siehe @ref{Requirements} für Details.}. Zum Beispiel kopiert der folgende Befehl das Paket @code{coreutils}, das Profil des Benutzers und all deren Abhängigkeiten auf den anderen @var{Rechner}, dazu meldet sich Guix als @var{Benutzer} an:" #. type: example -#: doc/guix.texi:9928 +#: doc/guix.texi:9926 #, no-wrap msgid "" "guix copy --to=@var{user}@@@var{host} \\\n" @@ -17927,192 +17938,192 @@ msgstr "" " coreutils `readlink -f ~/.guix-profile`\n" #. type: Plain text -#: doc/guix.texi:9932 +#: doc/guix.texi:9930 msgid "If some of the items to be copied are already present on @var{host}, they are not actually sent." msgstr "Wenn manche der zu kopierenden Objekte schon auf dem anderen @var{Rechner} vorliegen, werden sie tatsächlich @emph{nicht} übertragen." #. type: Plain text -#: doc/guix.texi:9935 +#: doc/guix.texi:9933 msgid "The command below retrieves @code{libreoffice} and @code{gimp} from @var{host}, assuming they are available there:" msgstr "Der folgende Befehl bezieht @code{libreoffice} und @code{gimp} von dem @var{Rechner}, vorausgesetzt sie sind dort verfügbar:" #. type: example -#: doc/guix.texi:9938 +#: doc/guix.texi:9936 #, no-wrap msgid "guix copy --from=@var{host} libreoffice gimp\n" msgstr "guix copy --from=@var{host} libreoffice gimp\n" #. type: Plain text -#: doc/guix.texi:9943 +#: doc/guix.texi:9941 msgid "The SSH connection is established using the Guile-SSH client, which is compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} and @file{~/.ssh/config}, and uses the SSH agent for authentication." msgstr "Die SSH-Verbindung wird mit dem Guile-SSH-Client hergestellt, der mit OpenSSH kompatibel ist: Er berücksichtigt @file{~/.ssh/known_hosts} und @file{~/.ssh/config} und verwendet den SSH-Agenten zur Authentifizierung." #. type: Plain text -#: doc/guix.texi:9949 +#: doc/guix.texi:9947 msgid "The key used to sign items that are sent must be accepted by the remote machine. Likewise, the key used by the remote machine to sign items you are retrieving must be in @file{/etc/guix/acl} so it is accepted by your own daemon. @xref{Invoking guix archive}, for more information about store item authentication." msgstr "Der Schlüssel, mit dem gesendete Objekte signiert sind, muss von der entfernten Maschine akzeptiert werden. Ebenso muss der Schlüssel, mit dem die Objekte signiert sind, die Sie von der entfernten Maschine empfangen, in Ihrer Datei @file{/etc/guix/acl} eingetragen sein, damit Ihr Daemon sie akzeptiert. Siehe @ref{Invoking guix archive} für mehr Informationen über die Authentifizierung von Store-Objekten." #. type: example -#: doc/guix.texi:9954 +#: doc/guix.texi:9952 #, no-wrap msgid "guix copy [--to=@var{spec}|--from=@var{spec}] @var{items}@dots{}\n" msgstr "guix copy [--to=@var{Spezifikation}|--from=@var{Spezifikation}] @var{Objekte}…\n" #. type: Plain text -#: doc/guix.texi:9957 +#: doc/guix.texi:9955 msgid "You must always specify one of the following options:" msgstr "Sie müssen immer eine der folgenden Befehlszeilenoptionen angeben:" #. type: item -#: doc/guix.texi:9959 +#: doc/guix.texi:9957 #, no-wrap msgid "--to=@var{spec}" msgstr "--to=@var{Spezifikation}" #. type: itemx -#: doc/guix.texi:9960 +#: doc/guix.texi:9958 #, no-wrap msgid "--from=@var{spec}" msgstr "--from=@var{Spezifikation}" #. type: table -#: doc/guix.texi:9964 +#: doc/guix.texi:9962 msgid "Specify the host to send to or receive from. @var{spec} must be an SSH spec such as @code{example.org}, @code{charlie@@example.org}, or @code{charlie@@example.org:2222}." msgstr "Gibt den Rechner (den „Host“) an, an den oder von dem gesendet bzw. empfangen wird. Die @var{Spezifikation} muss eine SSH-Spezifikation sein wie @code{example.org}, @code{charlie@@example.org} oder @code{charlie@@example.org:2222}." #. type: Plain text -#: doc/guix.texi:9968 +#: doc/guix.texi:9966 msgid "The @var{items} can be either package names, such as @code{gimp}, or store items, such as @file{/gnu/store/@dots{}-idutils-4.6}." msgstr "Die @var{Objekte} können entweder Paketnamen wie @code{gimp} oder Store-Objekte wie @file{/gnu/store/…-idutils-4.6} sein." #. type: Plain text -#: doc/guix.texi:9972 +#: doc/guix.texi:9970 msgid "When specifying the name of a package to send, it is first built if needed, unless @option{--dry-run} was specified. Common build options are supported (@pxref{Common Build Options})." msgstr "Wenn ein zu sendendes Paket mit Namen angegeben wird, wird es erst erstellt, falls es nicht im Store vorliegt, außer @option{--dry-run} wurde angegeben wurde. Alle gemeinsamen Erstellungsoptionen werden unterstützt (siehe @ref{Common Build Options})." #. type: section -#: doc/guix.texi:9975 +#: doc/guix.texi:9973 #, no-wrap msgid "Invoking @command{guix container}" msgstr "@command{guix container} aufrufen" #. type: command{#1} -#: doc/guix.texi:9977 +#: doc/guix.texi:9975 #, no-wrap msgid "guix container" msgstr "guix container" #. type: quotation -#: doc/guix.texi:9981 +#: doc/guix.texi:9979 msgid "As of version @value{VERSION}, this tool is experimental. The interface is subject to radical change in the future." msgstr "Dieses Werkzeug ist noch experimentell, Stand Version @value{VERSION}. Die Schnittstelle wird sich in Zukunft grundlegend verändern." #. type: Plain text -#: doc/guix.texi:9988 +#: doc/guix.texi:9986 msgid "The purpose of @command{guix container} is to manipulate processes running within an isolated environment, commonly known as a ``container'', typically created by the @command{guix environment} (@pxref{Invoking guix environment}) and @command{guix system container} (@pxref{Invoking guix system}) commands." msgstr "Der Zweck von @command{guix container} ist, in einer isolierten Umgebung (gemeinhin als „Container“ bezeichnet) laufende Prozesse zu manipulieren, die typischerweise durch die Befehle @command{guix environment} (siehe @ref{Invoking guix environment}) und @command{guix system container} (siehe @ref{Invoking guix system}) erzeugt werden." #. type: example -#: doc/guix.texi:9993 +#: doc/guix.texi:9991 #, no-wrap msgid "guix container @var{action} @var{options}@dots{}\n" msgstr "guix container @var{Aktion} @var{Optionen}…\n" #. type: Plain text -#: doc/guix.texi:9997 +#: doc/guix.texi:9995 msgid "@var{action} specifies the operation to perform with a container, and @var{options} specifies the context-specific arguments for the action." msgstr "Mit @var{Aktion} wird die Operation angegeben, die in der isolierten Umgebung durchgeführt werden soll, und mit @var{Optionen} werden die kontextabhängigen Argumente an die Aktion angegeben." #. type: Plain text -#: doc/guix.texi:9999 +#: doc/guix.texi:9997 msgid "The following actions are available:" msgstr "Folgende Aktionen sind verfügbar:" #. type: item -#: doc/guix.texi:10001 +#: doc/guix.texi:9999 #, no-wrap msgid "exec" msgstr "exec" #. type: table -#: doc/guix.texi:10003 +#: doc/guix.texi:10001 msgid "Execute a command within the context of a running container." msgstr "Führt einen Befehl im Kontext der laufenden isolierten Umgebung aus." #. type: table -#: doc/guix.texi:10005 +#: doc/guix.texi:10003 msgid "The syntax is:" msgstr "Die Syntax ist:" #. type: example -#: doc/guix.texi:10008 +#: doc/guix.texi:10006 #, no-wrap msgid "guix container exec @var{pid} @var{program} @var{arguments}@dots{}\n" msgstr "guix container exec @var{PID} @var{Programm} @var{Argumente}…\n" #. type: table -#: doc/guix.texi:10014 +#: doc/guix.texi:10012 msgid "@var{pid} specifies the process ID of the running container. @var{program} specifies an executable file name within the root file system of the container. @var{arguments} are the additional options that will be passed to @var{program}." msgstr "@var{PID} gibt die Prozess-ID der laufenden isolierten Umgebung an. Als @var{Programm} muss eine ausführbare Datei im Wurzeldateisystem der isolierten Umgebung angegeben werden. Die @var{Argumente} sind die zusätzlichen Befehlszeilenoptionen, die an das @var{Programm} übergeben werden." #. type: table -#: doc/guix.texi:10018 +#: doc/guix.texi:10016 msgid "The following command launches an interactive login shell inside a Guix system container, started by @command{guix system container}, and whose process ID is 9001:" msgstr "Der folgende Befehl startet eine interaktive Anmelde-Shell innerhalb einer isolierten Guix-Systemumgebung, gestartet durch @command{guix system container}, dessen Prozess-ID 9001 ist:" #. type: example -#: doc/guix.texi:10021 +#: doc/guix.texi:10019 #, no-wrap msgid "guix container exec 9001 /run/current-system/profile/bin/bash --login\n" msgstr "guix container exec 9001 /run/current-system/profile/bin/bash --login\n" #. type: table -#: doc/guix.texi:10025 +#: doc/guix.texi:10023 msgid "Note that the @var{pid} cannot be the parent process of a container. It must be PID 1 of the container or one of its child processes." msgstr "Beachten Sie, dass die @var{PID} nicht der Elternprozess der isolierten Umgebung sein darf, sondern PID 1 in der isolierten Umgebung oder einer seiner Kindprozesse sein muss." #. type: section -#: doc/guix.texi:10029 +#: doc/guix.texi:10027 #, no-wrap msgid "Invoking @command{guix weather}" msgstr "@command{guix weather} aufrufen" #. type: Plain text -#: doc/guix.texi:10038 +#: doc/guix.texi:10036 msgid "Occasionally you're grumpy because substitutes are lacking and you end up building packages by yourself (@pxref{Substitutes}). The @command{guix weather} command reports on substitute availability on the specified servers so you can have an idea of whether you'll be grumpy today. It can sometimes be useful info as a user, but it is primarily useful to people running @command{guix publish} (@pxref{Invoking guix publish})." msgstr "Manchmal werden Sie schlecht gelaunt sein, weil es zu wenige Substitute gibt und die Pakete bei Ihnen selbst erstellt werden müssen (siehe @ref{Substitutes}). Der Befehl @command{guix weather} zeigt einen Bericht über die Verfügbarkeit von Substituten auf den angegebenen Servern an, damit Sie sich eine Vorstellung davon machen können, wie es heute um Ihre Laune bestellt sein wird. Manchmal bekommt man als Nutzer so hilfreiche Informationen, aber in erster Linie nützt der Befehl den Leuten, die @command{guix publish} benutzen (siehe @ref{Invoking guix publish})." #. type: cindex -#: doc/guix.texi:10039 +#: doc/guix.texi:10037 #, no-wrap msgid "statistics, for substitutes" msgstr "Statistik, für Substitute" #. type: cindex -#: doc/guix.texi:10040 +#: doc/guix.texi:10038 #, no-wrap msgid "availability of substitutes" msgstr "Verfügbarkeit von Substituten" #. type: cindex -#: doc/guix.texi:10041 +#: doc/guix.texi:10039 #, no-wrap msgid "substitute availability" msgstr "Substitutverfügbarkeit" #. type: cindex -#: doc/guix.texi:10042 +#: doc/guix.texi:10040 #, no-wrap msgid "weather, substitute availability" msgstr "Wetter, Substitutverfügbarkeit" #. type: Plain text -#: doc/guix.texi:10044 +#: doc/guix.texi:10042 msgid "Here's a sample run:" msgstr "Hier ist ein Beispiel für einen Aufruf davon:" #. type: example -#: doc/guix.texi:10056 +#: doc/guix.texi:10054 #, no-wrap msgid "" "$ guix weather --substitute-urls=https://guix.example.org\n" @@ -18140,7 +18151,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10066 +#: doc/guix.texi:10064 #, no-wrap msgid "" " 9.8% (342 out of 3,470) of the missing items are queued\n" @@ -18164,60 +18175,60 @@ msgstr "" " aarch64-linux: 6,41 Erstellungen pro Stunde\n" #. type: cindex -#: doc/guix.texi:10068 +#: doc/guix.texi:10066 #, no-wrap msgid "continuous integration, statistics" msgstr "Kontinuierliche Integration, Statistik" #. type: Plain text -#: doc/guix.texi:10079 +#: doc/guix.texi:10077 msgid "As you can see, it reports the fraction of all the packages for which substitutes are available on the server---regardless of whether substitutes are enabled, and regardless of whether this server's signing key is authorized. It also reports the size of the compressed archives (``nars'') provided by the server, the size the corresponding store items occupy in the store (assuming deduplication is turned off), and the server's throughput. The second part gives continuous integration (CI) statistics, if the server supports it. In addition, using the @option{--coverage} option, @command{guix weather} can list ``important'' package substitutes missing on the server (see below)." msgstr "Wie Sie sehen können, wird der Anteil unter allen Paketen angezeigt, für die auf dem Server Substitute verfügbar sind — unabhängig davon, ob Substitute aktiviert sind, und unabhängig davon, ob der signierende Schlüssel des Servers autorisiert ist. Es wird auch über die Größe der komprimierten Archive (die „Nars“) berichtet, die vom Server angeboten werden, sowie über die Größe, die die zugehörigen Store-Objekte im Store belegen würden (unter der Annahme, dass Deduplizierung abgeschaltet ist) und über den Durchsatz des Servers. Der zweite Teil sind Statistiken zur Kontinuierlichen Integration (englisch „Continuous Integration“, kurz CI), wenn der Server dies unterstützt. Des Weiteren kann @command{guix weather}, wenn es mit der Befehlszeilenoption @option{--coverage} aufgerufen wird, „wichtige“ Paketsubstitute, die auf dem Server fehlen, auflisten (siehe unten)." #. type: Plain text -#: doc/guix.texi:10085 +#: doc/guix.texi:10083 msgid "To achieve that, @command{guix weather} queries over HTTP(S) meta-data (@dfn{narinfos}) for all the relevant store items. Like @command{guix challenge}, it ignores signatures on those substitutes, which is innocuous since the command only gathers statistics and cannot install those substitutes." msgstr "Dazu werden mit @command{guix weather} Anfragen über HTTP(S) zu Metadaten (@dfn{Narinfos}) für alle relevanten Store-Objekte gestellt. Wie @command{guix challenge} werden die Signaturen auf den Substituten ignoriert, was harmlos ist, weil der Befehl nur Statistiken sammelt und keine Substitute installieren kann." #. type: Plain text -#: doc/guix.texi:10088 +#: doc/guix.texi:10086 msgid "Among other things, it is possible to query specific system types and specific package sets. The available options are listed below." msgstr "Neben anderen Dingen ist es möglich, bestimmte Systemtypen und bestimmte Paketmengen anzufragen. Die verfügbaren Befehlszeilenoptionen sind folgende:" #. type: table -#: doc/guix.texi:10094 +#: doc/guix.texi:10092 msgid "@var{urls} is the space-separated list of substitute server URLs to query. When this option is omitted, the default set of substitute servers is queried." msgstr "@var{URLs} ist eine leerzeichengetrennte Liste anzufragender Substitutserver-URLs. Wird diese Befehlszeilenoption weggelassen, wird die vorgegebene Menge an Substitutservern angefragt." #. type: table -#: doc/guix.texi:10100 +#: doc/guix.texi:10098 msgid "Query substitutes for @var{system}---e.g., @code{aarch64-linux}. This option can be repeated, in which case @command{guix weather} will query substitutes for several system types." msgstr "Substitute für das @var{System} anfragen — z.B.@: für @code{aarch64-linux}. Diese Befehlszeilenoption kann mehrmals angegeben werden, wodurch @command{guix weather} die Substitute für mehrere Systemtypen anfragt." #. type: table -#: doc/guix.texi:10106 +#: doc/guix.texi:10104 msgid "Instead of querying substitutes for all the packages, only ask for those specified in @var{file}. @var{file} must contain a @dfn{manifest}, as with the @code{-m} option of @command{guix package} (@pxref{Invoking guix package})." msgstr "Anstatt die Substitute für alle Pakete anzufragen, werden nur die in der @var{Datei} angegebenen Pakete erfragt. Die @var{Datei} muss ein @dfn{Manifest} enthalten, wie bei der Befehlszeilenoption @code{-m} von @command{guix package} (siehe @ref{Invoking guix package})." #. type: item -#: doc/guix.texi:10107 +#: doc/guix.texi:10105 #, no-wrap msgid "--coverage[=@var{count}]" msgstr "--coverage[=@var{Anzahl}]" #. type: itemx -#: doc/guix.texi:10108 +#: doc/guix.texi:10106 #, no-wrap msgid "-c [@var{count}]" msgstr "-c [@var{Anzahl}]" #. type: table -#: doc/guix.texi:10114 +#: doc/guix.texi:10112 msgid "Report on substitute coverage for packages: list packages with at least @var{count} dependents (zero by default) for which substitutes are unavailable. Dependent packages themselves are not listed: if @var{b} depends on @var{a} and @var{a} has no substitutes, only @var{a} is listed, even though @var{b} usually lacks substitutes as well. The result looks like this:" msgstr "Einen Bericht über die Substitutabdeckung für Pakete ausgeben, d.h.@: Pakete mit mindestens @var{Anzahl}-vielen Abhängigen (voreingestellt mindestens null) anzeigen, für die keine Substitute verfügbar sind. Die abhängigen Pakete werden selbst nicht aufgeführt: Wenn @var{b} von @var{a} abhängt und Substitute für @var{a} fehlen, wird nur @var{a} aufgeführt, obwohl dann in der Regel auch die Substitute für @var{b} fehlen. Das Ergebnis sieht so aus:" #. type: example -#: doc/guix.texi:10128 +#: doc/guix.texi:10126 #, no-wrap msgid "" "$ guix weather --substitute-urls=@value{SUBSTITUTE-URL} -c 10\n" @@ -18247,28 +18258,28 @@ msgstr "" " …\n" #. type: table -#: doc/guix.texi:10133 +#: doc/guix.texi:10131 msgid "What this example shows is that @code{kcoreaddons} and presumably the 58 packages that depend on it have no substitutes at @code{ci.guix.info}; likewise for @code{qgpgme} and the 46 packages that depend on it." msgstr "Was man hier in diesem Beispiel sehen kann, ist, dass es für @code{kcoreaddons} und vermutlich die 58 Pakete, die davon abhängen, auf @code{ci.guix.info} keine Substitute gibt; Gleiches gilt für @code{qgpgme} und die 46 Pakete, die davon abhängen." #. type: table -#: doc/guix.texi:10137 +#: doc/guix.texi:10135 msgid "If you are a Guix developer, or if you are taking care of this build farm, you'll probably want to have a closer look at these packages: they may simply fail to build." msgstr "Wenn Sie ein Guix-Entwickler sind oder sich um diese Build-Farm kümmern, wollen Sie sich diese Pakete vielleicht genauer anschauen. Es kann sein, dass sie schlicht nie erfolgreich erstellt werden können." #. type: section -#: doc/guix.texi:10140 +#: doc/guix.texi:10138 #, no-wrap msgid "Invoking @command{guix processes}" msgstr "@command{guix processes} aufrufen" #. type: Plain text -#: doc/guix.texi:10148 +#: doc/guix.texi:10146 msgid "The @command{guix processes} command can be useful to developers and system administrators, especially on multi-user machines and on build farms: it lists the current sessions (connections to the daemon), as well as information about the processes involved@footnote{Remote sessions, when @command{guix-daemon} is started with @option{--listen} specifying a TCP endpoint, are @emph{not} listed.}. Here's an example of the information it returns:" msgstr "Der Befehl @command{guix processes} kann sich für Entwickler und Systemadministratoren als nützlich erweisen, besonders auf Maschinen mit mehreren Nutzern und auf Build-Farms. Damit werden die aktuellen Sitzungen (also Verbindungen zum Daemon) sowie Informationen über die beteiligten Prozesse aufgelistet@footnote{Entfernte Sitzungen, wenn @command{guix-daemon} mit @option{--listen} unter Angabe eines TCP-Endpunkts gestartet wurde, werden @emph{nicht} aufgelistet.}. Hier ist ein Beispiel für die davon gelieferten Informationen:" #. type: example -#: doc/guix.texi:10154 +#: doc/guix.texi:10152 #, no-wrap msgid "" "$ sudo guix processes\n" @@ -18284,7 +18295,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10158 +#: doc/guix.texi:10156 #, no-wrap msgid "" "SessionPID: 19402\n" @@ -18298,7 +18309,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10168 +#: doc/guix.texi:10166 #, no-wrap msgid "" "SessionPID: 19444\n" @@ -18322,22 +18333,22 @@ msgstr "" "ChildProcess: 27793: guix offload x86_64-linux 7200 1 28800\n" #. type: Plain text -#: doc/guix.texi:10175 +#: doc/guix.texi:10173 msgid "In this example we see that @command{guix-daemon} has three clients: @command{guix environment}, @command{guix publish}, and the Cuirass continuous integration tool; their process identifier (PID) is given by the @code{ClientPID} field. The @code{SessionPID} field gives the PID of the @command{guix-daemon} sub-process of this particular session." msgstr "In diesem Beispiel sehen wir, dass @command{guix-daemon} drei Clients hat: @command{guix environment}, @command{guix publish} und das Werkzeug Cuirass zur Kontinuierlichen Integration. Deren Prozesskennung (PID) ist jeweils im @code{ClientPID}-Feld zu sehen. Das Feld @code{SessionPID} zeigt die PID des @command{guix-daemon}-Unterprozesses dieser bestimmten Sitzung." #. type: Plain text -#: doc/guix.texi:10182 +#: doc/guix.texi:10180 msgid "The @code{LockHeld} fields show which store items are currently locked by this session, which corresponds to store items being built or substituted (the @code{LockHeld} field is not displayed when @command{guix processes} is not running as root.) Last, by looking at the @code{ChildProcess} field, we understand that these three builds are being offloaded (@pxref{Daemon Offload Setup})." msgstr "Das Feld @code{LockHeld} zeigt an, welche Store-Objekte derzeit durch die Sitzung gesperrt sind, d.h.@: welche Store-Objekte zur Zeit erstellt oder substituiert werden (das @code{LockHeld}-Feld wird nicht angezeigt, wenn @command{guix processes} nicht als Administratornutzer root ausgeführt wird). Letztlich sehen wir am @code{ChildProcess}-Feld oben, dass diese drei Erstellungen hier ausgelagert (englisch „offloaded“) werden (siehe @ref{Daemon Offload Setup})." #. type: Plain text -#: doc/guix.texi:10187 +#: doc/guix.texi:10185 msgid "The output is in Recutils format so we can use the handy @command{recsel} command to select sessions of interest (@pxref{Selection Expressions,,, recutils, GNU recutils manual}). As an example, the command shows the command line and PID of the client that triggered the build of a Perl package:" msgstr "Die Ausgabe ist im Recutils-Format, damit wir den praktischen @command{recsel}-Befehl benutzen können, um uns interessierende Sitzungen auszuwählen (siehe @ref{Selection Expressions,,, recutils, GNU recutils manual}). Zum Beispiel zeigt dieser Befehl die Befehlszeile und PID des Clients an, der die Erstellung des Perl-Pakets ausgelöst hat:" #. type: example -#: doc/guix.texi:10193 +#: doc/guix.texi:10191 #, no-wrap msgid "" "$ sudo guix processes | \\\n" @@ -18351,90 +18362,90 @@ msgstr "" "ClientCommand: cuirass --cache-directory /var/cache/cuirass …\n" #. type: cindex -#: doc/guix.texi:10199 +#: doc/guix.texi:10197 #, no-wrap msgid "system configuration" msgstr "Systemkonfiguration" #. type: Plain text -#: doc/guix.texi:10205 +#: doc/guix.texi:10203 msgid "Guix System supports a consistent whole-system configuration mechanism. By that we mean that all aspects of the global system configuration---such as the available system services, timezone and locale settings, user accounts---are declared in a single place. Such a @dfn{system configuration} can be @dfn{instantiated}---i.e., effected." msgstr "Guix System unterstützt einen Mechanismus zur konsistenten Konfiguration des gesamten Systems. Damit meinen wir, dass alle Aspekte der globalen Systemkonfiguration an einem Ort stehen, d.h.@: die zur Verfügung gestellten Systemdienste, die Zeitzone und Einstellungen zur Locale (also die Anpassung an regionale Gepflogenheiten und Sprachen) sowie Benutzerkonten. Sie alle werden an derselben Stelle deklariert. So eine @dfn{Systemkonfiguration} kann @dfn{instanziiert}, also umgesetzt, werden." #. type: Plain text -#: doc/guix.texi:10215 +#: doc/guix.texi:10213 msgid "One of the advantages of putting all the system configuration under the control of Guix is that it supports transactional system upgrades, and makes it possible to roll back to a previous system instantiation, should something go wrong with the new one (@pxref{Features}). Another advantage is that it makes it easy to replicate the exact same configuration across different machines, or at different points in time, without having to resort to additional administration tools layered on top of the own tools of the system." msgstr "Einer der Vorteile, die ganze Systemkonfiguration unter die Kontrolle von Guix zu stellen, ist, dass so transaktionelle Systemaktualisierungen möglich werden und dass diese rückgängig gemacht werden können, wenn das aktualisierte System nicht richtig funktioniert (siehe @ref{Features}). Ein anderer Vorteil ist, dass dieselbe Systemkonfiguration leicht auf einer anderen Maschine oder zu einem späteren Zeitpunkt benutzt werden kann, ohne dazu eine weitere Schicht administrativer Werkzeuge über den systemeigenen Werkzeugen einsetzen zu müssen." #. type: Plain text -#: doc/guix.texi:10220 +#: doc/guix.texi:10218 msgid "This section describes this mechanism. First we focus on the system administrator's viewpoint---explaining how the system is configured and instantiated. Then we show how this mechanism can be extended, for instance to support new system services." msgstr "In diesem Abschnitt wird dieser Mechanismus beschrieben. Zunächst betrachten wir ihn aus der Perspektive eines Administrators. Dabei wird erklärt, wie das System konfiguriert und instanziiert werden kann. Dann folgt eine Demonstration, wie der Mechanismus erweitert werden kann, etwa um neue Systemdienste zu unterstützen." #. type: Plain text -#: doc/guix.texi:10248 +#: doc/guix.texi:10246 msgid "The operating system is configured by providing an @code{operating-system} declaration in a file that can then be passed to the @command{guix system} command (@pxref{Invoking guix system}). A simple setup, with the default system services, the default Linux-Libre kernel, initial RAM disk, and boot loader looks like this:" msgstr "Das Betriebssystem können Sie konfigurieren, indem Sie eine @code{operating-system}-Deklaration in einer Datei speichern, die Sie dann dem Befehl @command{guix system} übergeben (siehe @ref{Invoking guix system}). Eine einfache Konfiguration mit den vorgegebenen Systemdiensten und dem vorgegebenen Linux-Libre als Kernel und mit einer initialen RAM-Disk und einem Bootloader, sieht so aus:" #. type: findex -#: doc/guix.texi:10249 +#: doc/guix.texi:10247 #, no-wrap msgid "operating-system" msgstr "operating-system" #. type: include -#: doc/guix.texi:10251 +#: doc/guix.texi:10249 #, no-wrap msgid "os-config-bare-bones.texi" msgstr "os-config-bare-bones.texi" #. type: Plain text -#: doc/guix.texi:10258 +#: doc/guix.texi:10256 msgid "This example should be self-describing. Some of the fields defined above, such as @code{host-name} and @code{bootloader}, are mandatory. Others, such as @code{packages} and @code{services}, can be omitted, in which case they get a default value." msgstr "Dieses Beispiel sollte selbsterklärend sein. Manche der Felder oben, wie etwa @code{host-name} und @code{bootloader}, müssen angegeben werden. Andere sind optional, wie etwa @code{packages} und @code{services}, sind optional; werden sie nicht angegeben, nehmen sie einen Vorgabewert an." #. type: Plain text -#: doc/guix.texi:10263 +#: doc/guix.texi:10261 msgid "Below we discuss the effect of some of the most important fields (@pxref{operating-system Reference}, for details about all the available fields), and how to @dfn{instantiate} the operating system using @command{guix system}." msgstr "Im Folgenden werden die Effekte von einigen der wichtigsten Feldern erläutert (siehe @ref{operating-system Reference} für Details zu allen verfügbaren Feldern), dann wird beschrieben, wie man das Betriebssystem mit @command{guix system} @dfn{instanziieren} kann." #. type: unnumberedsubsec -#: doc/guix.texi:10264 +#: doc/guix.texi:10262 #, no-wrap msgid "Bootloader" msgstr "Bootloader" #. type: cindex -#: doc/guix.texi:10266 +#: doc/guix.texi:10264 #, no-wrap msgid "legacy boot, on Intel machines" msgstr "Legacy-Boot, auf Intel-Maschinen" #. type: cindex -#: doc/guix.texi:10267 +#: doc/guix.texi:10265 #, no-wrap msgid "BIOS boot, on Intel machines" msgstr "BIOS-Boot, auf Intel-Maschinen" #. type: cindex -#: doc/guix.texi:10268 +#: doc/guix.texi:10266 #, no-wrap msgid "UEFI boot" msgstr "UEFI-Boot" #. type: cindex -#: doc/guix.texi:10269 +#: doc/guix.texi:10267 #, no-wrap msgid "EFI boot" msgstr "EFI-Boot" #. type: Plain text -#: doc/guix.texi:10275 +#: doc/guix.texi:10273 msgid "The @code{bootloader} field describes the method that will be used to boot your system. Machines based on Intel processors can boot in ``legacy'' BIOS mode, as in the example above. However, more recent machines rely instead on the @dfn{Unified Extensible Firmware Interface} (UEFI) to boot. In that case, the @code{bootloader} field should contain something along these lines:" msgstr "Das @code{bootloader}-Feld beschreibt, mit welcher Methode Ihr System „gebootet“ werden soll. Maschinen, die auf Intel-Prozessoren basieren, können im alten „Legacy“-BIOS-Modus gebootet werden, wie es im obigen Beispiel der Fall wäre. Neuere Maschinen benutzen stattdessen das @dfn{Unified Extensible Firmware Interface} (UEFI) zum Booten. In diesem Fall sollte das @code{bootloader}-Feld in etwa so aussehen:" #. type: example -#: doc/guix.texi:10280 +#: doc/guix.texi:10278 #, no-wrap msgid "" "(bootloader-configuration\n" @@ -18446,29 +18457,29 @@ msgstr "" " (target \"/boot/efi\"))\n" #. type: Plain text -#: doc/guix.texi:10284 +#: doc/guix.texi:10282 msgid "@xref{Bootloader Configuration}, for more information on the available configuration options." msgstr "Siehe den Abschnitt @ref{Bootloader Configuration} für weitere Informationen zu den verfügbaren Konfigurationsoptionen." #. type: unnumberedsubsec -#: doc/guix.texi:10285 +#: doc/guix.texi:10283 #, no-wrap msgid "Globally-Visible Packages" msgstr "global sichtbare Pakete" #. type: vindex -#: doc/guix.texi:10287 +#: doc/guix.texi:10285 #, no-wrap msgid "%base-packages" msgstr "%base-packages" #. type: Plain text -#: doc/guix.texi:10300 +#: doc/guix.texi:10298 msgid "The @code{packages} field lists packages that will be globally visible on the system, for all user accounts---i.e., in every user's @code{PATH} environment variable---in addition to the per-user profiles (@pxref{Invoking guix package}). The @var{%base-packages} variable 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 GNU@tie{}Screen to those, taken from the @code{(gnu packages screen)} module (@pxref{Package Modules}). The @code{(list package output)} syntax can be used to add a specific output of a package:" msgstr "Im Feld @code{packages} werden Pakete aufgeführt, die auf dem System für alle Benutzerkonten global sichtbar sein sollen, d.h.@: in der @code{PATH}-Umgebungsvariablen jedes Nutzers, zusätzlich zu den nutzereigenen Profilen (siehe @ref{Invoking guix package}). Die Variable @var{%base-packages} bietet alle Werkzeuge, die man für grundlegende Nutzer- und Administratortätigkeiten erwarten würde, einschließlich der GNU Core Utilities, der GNU Networking Utilities, des leichtgewichtigen Texteditors GNU Zile, @command{find}, @command{grep} und so weiter. Obiges Beispiel fügt zu diesen noch das Programm GNU@tie{}Screen hinzu, welches aus dem Modul @code{(gnu packages screen)} genommen wird (siehe @ref{Package Modules}). Die Syntax @code{(list package output)} kann benutzt werden, um eine bestimmte Ausgabe eines Pakets auszuwählen:" #. type: lisp -#: doc/guix.texi:10304 +#: doc/guix.texi:10302 #, no-wrap msgid "" "(use-modules (gnu packages))\n" @@ -18480,7 +18491,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:10309 +#: doc/guix.texi:10307 #, no-wrap msgid "" "(operating-system\n" @@ -18494,18 +18505,18 @@ msgstr "" " %base-packages)))\n" #. type: findex -#: doc/guix.texi:10311 +#: doc/guix.texi:10309 #, no-wrap msgid "specification->package" msgstr "specification->package" #. type: Plain text -#: doc/guix.texi:10320 +#: doc/guix.texi:10318 msgid "Referring to packages by variable name, like @code{bind} above, has the advantage of being unambiguous; it also allows typos and such to be diagnosed right away as ``unbound variables''. The downside is that one needs to know which module defines which package, and to augment the @code{use-package-modules} line accordingly. To avoid that, one can use the @code{specification->package} procedure of the @code{(gnu packages)} module, which returns the best package for a given name or name and version:" msgstr "Sich auf Pakete anhand ihres Variablennamens zu beziehen, wie oben bei @code{bind}, hat den Vorteil, dass der Name eindeutig ist; Tippfehler werden direkt als „unbound variables“ gemeldet. Der Nachteil ist, dass man wissen muss, in welchem Modul ein Paket definiert wird, um die Zeile mit @code{use-package-modules} entsprechend zu ergänzen. Um dies zu vermeiden, kann man auch die Prozedur @code{specification->package} aus dem Modul @code{(gnu packages)} aufrufen, welche das einem angegebenen Namen oder Name-Versions-Paar zu Grunde liegende Paket liefert:" #. type: lisp -#: doc/guix.texi:10323 +#: doc/guix.texi:10321 #, no-wrap msgid "" "(use-modules (gnu packages))\n" @@ -18515,7 +18526,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:10329 +#: doc/guix.texi:10327 #, no-wrap msgid "" "(operating-system\n" @@ -18531,52 +18542,52 @@ msgstr "" " %base-packages)))\n" #. type: unnumberedsubsec -#: doc/guix.texi:10331 +#: doc/guix.texi:10329 #, no-wrap msgid "System Services" msgstr "Systemdienste" #. type: cindex -#: doc/guix.texi:10333 doc/guix.texi:23823 doc/guix.texi:24841 +#: doc/guix.texi:10331 doc/guix.texi:23820 doc/guix.texi:24827 #, no-wrap msgid "services" msgstr "services" #. type: vindex -#: doc/guix.texi:10334 +#: doc/guix.texi:10332 #, no-wrap msgid "%base-services" msgstr "%base-services" #. type: Plain text -#: doc/guix.texi:10344 +#: doc/guix.texi:10342 msgid "The @code{services} field lists @dfn{system services} to be made available when the system starts (@pxref{Services}). The @code{operating-system} declaration above specifies that, in addition to the basic services, we want the OpenSSH secure shell daemon listening on port 2222 (@pxref{Networking Services, @code{openssh-service-type}}). Under the hood, @code{openssh-service-type} arranges so that @command{sshd} is started with the right command-line options, possibly with supporting configuration files generated as needed (@pxref{Defining Services})." msgstr "Das Feld @code{services} listet @dfn{Systemdienste} auf, die zur Verfügung stehen sollen, wenn das System startet (siehe @ref{Services}). Die @code{operating-system}-Deklaration oben legt fest, dass wir neben den grundlegenden Basis-Diensten auch wollen, dass der OpenSSH-Secure-Shell-Daemon auf Port 2222 lauscht (siehe @ref{Networking Services, @code{openssh-service-type}}). Intern sorgt der @code{openssh-service-type} dafür, dass @code{sshd} mit den richtigen Befehlszeilenoptionen aufgerufen wird, je nach Systemkonfiguration werden auch für dessen Betrieb nötige Konfigurationsdateien erstellt (siehe @ref{Defining Services})." #. type: cindex -#: doc/guix.texi:10345 +#: doc/guix.texi:10343 #, no-wrap msgid "customization, of services" msgstr "Anpassung, von Diensten" #. type: findex -#: doc/guix.texi:10346 +#: doc/guix.texi:10344 #, no-wrap msgid "modify-services" msgstr "modify-services" #. type: Plain text -#: doc/guix.texi:10350 +#: doc/guix.texi:10348 msgid "Occasionally, instead of using the base services as is, you will want to customize them. To do this, use @code{modify-services} (@pxref{Service Reference, @code{modify-services}}) to modify the list." msgstr "Gelegentlich werden Sie die Basis-Dienste nicht einfach so, wie sie sind, benutzen, sondern anpassen wollen. Benutzen Sie @code{modify-services} (siehe @ref{Service Reference, @code{modify-services}}), um die Liste der Basis-Dienste zu modifizieren." #. type: Plain text -#: doc/guix.texi:10355 +#: doc/guix.texi:10353 msgid "For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @var{%base-services} list (@pxref{Base Services, @code{%base-services}}). To do that, you can write the following in your operating system declaration:" msgstr "Wenn Sie zum Beispiel @code{guix-daemon} und Mingetty (das Programm, womit Sie sich auf der Konsole anmelden) in der @var{%base-services}-Liste modifizieren möchten (siehe @ref{Base Services, @code{%base-services}}), schreiben Sie das Folgende in Ihre Betriebssystemdeklaration:" #. type: lisp -#: doc/guix.texi:10368 +#: doc/guix.texi:10366 #, no-wrap msgid "" "(define %my-services\n" @@ -18606,7 +18617,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:10372 +#: doc/guix.texi:10370 #, no-wrap msgid "" "(operating-system\n" @@ -18618,49 +18629,49 @@ msgstr "" " (services %my-services))\n" #. type: Plain text -#: doc/guix.texi:10383 +#: doc/guix.texi:10381 msgid "This changes the configuration---i.e., the service parameters---of the @code{guix-service-type} instance, and that of all the @code{mingetty-service-type} instances in the @var{%base-services} list. Observe how this is accomplished: first, we arrange for the original configuration to be bound to the identifier @code{config} in the @var{body}, and then we write the @var{body} so that it evaluates to the desired configuration. In particular, notice how we use @code{inherit} to create a new configuration which has the same values as the old configuration, but with a few modifications." msgstr "Dadurch ändert sich die Konfiguration — d.h.@: die Dienst-Parameter — der @code{guix-service-type}-Instanz und die aller @code{mingetty-service-type}-Instanzen in der @var{%base-services}-Liste. Das funktioniert so: Zunächst arrangieren wir, dass die ursprüngliche Konfiguration an den Bezeichner @code{config} im @var{Rumpf} gebunden wird, dann schreiben wir den @var{Rumpf}, damit er zur gewünschten Konfiguration ausgewertet wird. Beachten Sie insbesondere, wie wir mit @code{inherit} eine neue Konfiguration erzeugen, die dieselben Werte wie die alte Konfiguration hat, aber mit ein paar Modifikationen." #. type: Plain text -#: doc/guix.texi:10390 +#: doc/guix.texi:10388 msgid "The configuration for a typical ``desktop'' usage, with an encrypted root partition, the X11 display server, GNOME and Xfce (users can choose which of these desktop environments to use at the log-in screen by pressing @kbd{F1}), network management, power management, and more, would look like this:" msgstr "Die Konfiguration für typische Nutzung auf Heim- und Arbeitsrechnern, mit einer verschlüsselten Partition für das Wurzeldateisystem, einem X11-Anzeigeserver, GNOME und Xfce (Benutzer können im Anmeldebildschirm auswählen, welche dieser Arbeitsumgebungen sie möchten, indem sie die Taste @kbd{F1} drücken), Netzwerkverwaltung, Verwaltungswerkzeugen für den Energieverbrauch, und Weiteres, würde so aussehen:" #. type: include -#: doc/guix.texi:10392 +#: doc/guix.texi:10390 #, no-wrap msgid "os-config-desktop.texi" msgstr "os-config-desktop.texi" #. type: Plain text -#: doc/guix.texi:10397 +#: doc/guix.texi:10395 msgid "A graphical system with a choice of lightweight window managers instead of full-blown desktop environments would look like this:" msgstr "Ein grafisches System mit einer Auswahl an leichtgewichtigen Fenster-Managern statt voll ausgestatteten Arbeitsumgebungen würde so aussehen:" #. type: include -#: doc/guix.texi:10399 +#: doc/guix.texi:10397 #, no-wrap msgid "os-config-lightweight-desktop.texi" msgstr "os-config-lightweight-desktop.texi" #. type: Plain text -#: doc/guix.texi:10405 +#: doc/guix.texi:10403 msgid "This example refers to the @file{/boot/efi} file system by its UUID, @code{1234-ABCD}. Replace this UUID with the right UUID on your system, as returned by the @command{blkid} command." msgstr "Dieses Beispiel bezieht sich auf das Dateisystem hinter @file{/boot/efi} über dessen UUID, @code{1234-ABCD}. Schreiben Sie statt dieser UUID die richtige UUID für Ihr System, wie sie der Befehl @command{blkid} liefert." #. type: Plain text -#: doc/guix.texi:10409 +#: doc/guix.texi:10407 msgid "@xref{Desktop Services}, for the exact list of services provided by @var{%desktop-services}. @xref{X.509 Certificates}, for background information about the @code{nss-certs} package that is used here." msgstr "Im Abschnitt @ref{Desktop Services} finden Sie eine genaue Liste der unter @var{%desktop-services} angebotenen Dienste. Der Abschnitt @ref{X.509 Certificates} hat Hintergrundinformationen über das @code{nss-certs}-Paket, das hier benutzt wird." #. type: Plain text -#: doc/guix.texi:10416 +#: doc/guix.texi:10414 msgid "Again, @var{%desktop-services} is just a list of service objects. If you want to remove services from there, you can do so using the procedures for list filtering (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}). For instance, the following expression returns a list that contains all the services in @var{%desktop-services} minus the Avahi service:" msgstr "Beachten Sie, dass @var{%desktop-services} nur eine Liste von die Dienste repräsentierenden service-Objekten ist. Wenn Sie Dienste daraus entfernen möchten, können Sie dazu die Prozeduren zum Filtern von Listen benutzen (siehe @ref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}). Beispielsweise liefert der folgende Ausdruck eine Liste mit allen Diensten von @var{%desktop-services} außer dem Avahi-Dienst." #. type: example -#: doc/guix.texi:10421 +#: doc/guix.texi:10419 #, no-wrap msgid "" "(remove (lambda (service)\n" @@ -18672,320 +18683,320 @@ msgstr "" " %desktop-services)\n" #. type: unnumberedsubsec -#: doc/guix.texi:10423 +#: doc/guix.texi:10421 #, no-wrap msgid "Instantiating the System" msgstr "Das System instanziieren" #. type: Plain text -#: doc/guix.texi:10430 +#: doc/guix.texi:10428 msgid "Assuming the @code{operating-system} declaration is stored in the @file{my-system-config.scm} file, the @command{guix system reconfigure my-system-config.scm} command instantiates that configuration, and makes it the default GRUB boot entry (@pxref{Invoking guix system})." msgstr "Angenommen, Sie haben die @code{operating-system}-Deklaration in einer Datei @file{my-system-config.scm} gespeichert, dann instanziiert der Befehl @command{guix system reconfigure my-system-config.scm} diese Konfiguration und macht sie zum voreingestellten GRUB-Boot-Eintrag (siehe @ref{Invoking guix system})." #. type: Plain text -#: doc/guix.texi:10438 +#: doc/guix.texi:10436 msgid "The normal way to change the system configuration is by updating this file and re-running @command{guix system reconfigure}. One should never have to touch files in @file{/etc} or to run commands that modify the system state such as @command{useradd} or @command{grub-install}. In fact, you must avoid that since that would not only void your warranty but also prevent you from rolling back to previous versions of your system, should you ever need to." msgstr "Der normale Weg, die Systemkonfiguration nachträglich zu ändern, ist, die Datei zu aktualisieren und @command{guix system reconfigure} erneut auszuführen. Man sollte nie die Dateien in @file{/etc} bearbeiten oder den Systemzustand mit Befehlen wie @command{useradd} oder @command{grub-install} verändern. Tatsächlich müssen Sie das ausdrücklich vermeiden, sonst verfällt nicht nur Ihre Garantie, sondern Sie können Ihr System auch nicht mehr auf eine alte Version des Systems zurücksetzen, falls das jemals notwendig wird." #. type: cindex -#: doc/guix.texi:10439 +#: doc/guix.texi:10437 #, no-wrap msgid "roll-back, of the operating system" msgstr "Zurücksetzen, des Betriebssystems" #. type: Plain text -#: doc/guix.texi:10449 +#: doc/guix.texi:10447 msgid "Speaking of roll-back, each time you run @command{guix system reconfigure}, a new @dfn{generation} of the system is created---without modifying or deleting previous generations. Old system generations get an entry in the bootloader boot menu, allowing you to boot them in case something went wrong with the latest generation. Reassuring, no? The @command{guix system list-generations} command lists the system generations available on disk. It is also possible to roll back the system via the commands @command{guix system roll-back} and @command{guix system switch-generation}." msgstr "Zurücksetzen bezieht sich hierbei darauf, dass jedes Mal, wenn Sie @command{guix system reconfigure} ausführen, eine neue @dfn{Generation} des Systems erzeugt wird — ohne vorherige Generationen zu verändern. Alte Systemgenerationen bekommen einen Eintrag im Boot-Menü des Bootloaders, womit Sie alte Generationen beim Starten des Rechners auswählen können, wenn mit der neuesten Generation etwas nicht stimmt. Eine beruhigende Vorstellung, oder? Der Befehl @command{guix system list-generations} führt die auf der Platte verfügbaren Systemgenerationen auf. Es ist auch möglich, das System mit den Befehlen @command{guix system roll-back} und @command{guix system switch-generation} zurückzusetzen." #. type: Plain text -#: doc/guix.texi:10455 +#: doc/guix.texi:10453 msgid "Although the @command{guix system reconfigure} command will not modify previous generations, you must take care when the current generation is not the latest (e.g., after invoking @command{guix system roll-back}), since the operation might overwrite a later generation (@pxref{Invoking guix system})." msgstr "Obwohl der Befehl @command{guix system reconfigure} vorherige Generationen nicht verändern wird, müssen Sie Acht geben, dass wenn die momentan aktuelle Generation nicht die neueste ist (z.B.@: nach einem Aufruf von @command{guix system roll-back}), weil @command{guix system reconfigure} alle neueren Generationen überschreibt (siehe @ref{Invoking guix system})." #. type: unnumberedsubsec -#: doc/guix.texi:10456 +#: doc/guix.texi:10454 #, no-wrap msgid "The Programming Interface" msgstr "Die Programmierschnittstelle" #. type: Plain text -#: doc/guix.texi:10461 +#: doc/guix.texi:10459 msgid "At the Scheme level, the bulk of an @code{operating-system} declaration is instantiated with the following monadic procedure (@pxref{The Store Monad}):" msgstr "Auf der Ebene von Scheme wird der Großteil der @code{operating-system}-Deklaration mit der folgenden monadischen Prozedur instanziiert (siehe @ref{The Store Monad}):" #. type: deffn -#: doc/guix.texi:10462 +#: doc/guix.texi:10460 #, no-wrap msgid "{Monadic Procedure} operating-system-derivation os" msgstr "{Monadische Prozedur} operating-system-derivation os" #. type: deffn -#: doc/guix.texi:10465 +#: doc/guix.texi:10463 msgid "Return a derivation that builds @var{os}, an @code{operating-system} object (@pxref{Derivations})." msgstr "Liefert eine Ableitung, mit der ein @code{operating-system}-Objekt @var{os} erstellt wird (siehe @ref{Derivations})." #. type: deffn -#: doc/guix.texi:10469 +#: doc/guix.texi:10467 msgid "The output of the derivation is a single directory that refers to all the packages, configuration files, and other supporting files needed to instantiate @var{os}." msgstr "Die Ausgabe der Ableitung ist ein einzelnes Verzeichnis mit Verweisen auf alle Pakete, Konfigurationsdateien und andere unterstützenden Dateien, die nötig sind, um @var{os} zu instanziieren." #. type: Plain text -#: doc/guix.texi:10474 +#: doc/guix.texi:10472 msgid "This procedure is provided by the @code{(gnu system)} module. Along with @code{(gnu services)} (@pxref{Services}), this module contains the guts of Guix System. Make sure to visit it!" msgstr "Diese Prozedur wird vom Modul @code{(gnu system)} angeboten. Zusammen mit @code{(gnu services)} (siehe @ref{Services}) deckt dieses Modul den Kern von „Guix System“ ab. Schauen Sie es sich mal an!" #. type: section -#: doc/guix.texi:10477 +#: doc/guix.texi:10475 #, no-wrap msgid "@code{operating-system} Reference" msgstr "@code{operating-system}-Referenz" #. type: Plain text -#: doc/guix.texi:10482 +#: doc/guix.texi:10480 msgid "This section summarizes all the options available in @code{operating-system} declarations (@pxref{Using the Configuration System})." msgstr "Dieser Abschnitt fasst alle Optionen zusammen, die für @code{operating-system}-Deklarationen zur Verfügung stehen (siehe @ref{Using the Configuration System})." #. type: deftp -#: doc/guix.texi:10483 +#: doc/guix.texi:10481 #, no-wrap msgid "{Data Type} operating-system" msgstr "{Datentyp} operating-system" #. type: deftp -#: doc/guix.texi:10487 +#: doc/guix.texi:10485 msgid "This is the data type representing an operating system configuration. By that, we mean all the global system configuration, not per-user configuration (@pxref{Using the Configuration System})." msgstr "Der die Betriebssystemkonfiguration repräsentierende Datentyp. Damit meinen wir die globale Konfiguration des Systems und nicht die, die sich nur auf einzelne Nutzer bezieht (siehe @ref{Using the Configuration System})." #. type: item -#: doc/guix.texi:10489 +#: doc/guix.texi:10487 #, no-wrap msgid "@code{kernel} (default: @var{linux-libre})" msgstr "@code{kernel} (Vorgabe: @var{linux-libre})" #. type: table -#: doc/guix.texi:10493 +#: doc/guix.texi:10491 msgid "The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is supported. In the future, it will be possible to use the GNU@tie{}Hurd.}." msgstr "Das Paket für den zu nutzenden Betriebssystem-Kernel als „package“-Objekt@footnote{Derzeit wird nur der Kernel Linux-libre unterstützt. In der Zukunft wird man auch GNU@tie{}Hurd benutzen können.}." #. type: item -#: doc/guix.texi:10494 +#: doc/guix.texi:10492 #, no-wrap msgid "@code{kernel-arguments} (default: @code{'(\"quiet\")})" msgstr "@code{kernel-arguments} (Vorgabe: @code{'(\"quiet\")})" #. type: table -#: doc/guix.texi:10497 +#: doc/guix.texi:10495 msgid "List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{(\"console=ttyS0\")}." msgstr "Eine Liste aus Zeichenketten oder G-Ausdrücken, die für zusätzliche Argumente an den Kernel stehen, die ihm auf seiner Befehlszeile übergeben werden — wie z.B.@: @code{(\"console=ttyS0\")}." #. type: code{#1} -#: doc/guix.texi:10498 doc/guix.texi:24034 doc/guix.texi:24053 +#: doc/guix.texi:10496 doc/guix.texi:24031 doc/guix.texi:24050 #, no-wrap msgid "bootloader" msgstr "bootloader" #. type: table -#: doc/guix.texi:10500 +#: doc/guix.texi:10498 msgid "The system bootloader configuration object. @xref{Bootloader Configuration}." msgstr "Das Konfigurationsobjekt für den Bootloader, mit dem das System gestartet wird. Siehe @ref{Bootloader Configuration}." #. type: code{#1} -#: doc/guix.texi:10501 doc/guix.texi:24173 +#: doc/guix.texi:10499 doc/guix.texi:24170 #, no-wrap msgid "label" msgstr "label" #. type: table -#: doc/guix.texi:10504 +#: doc/guix.texi:10502 msgid "This is the label (a string) as it appears in the bootloader's menu entry. The default label includes the kernel name and version." msgstr "Diese Bezeichnung (eine Zeichenkette) wird für den Menüeintrag im Bootloader verwendet. Die Vorgabe ist eine Bezeichnung, die den Namen des Kernels und seine Version enthält." #. type: item -#: doc/guix.texi:10505 doc/guix.texi:13711 doc/guix.texi:24103 +#: doc/guix.texi:10503 doc/guix.texi:13709 doc/guix.texi:24100 #, no-wrap msgid "@code{keyboard-layout} (default: @code{#f})" msgstr "@code{keyboard-layout} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10509 +#: doc/guix.texi:10507 msgid "This field specifies the keyboard layout to use in the console. It can be either @code{#f}, in which case the default keyboard layout is used (usually US English), or a @code{} record." msgstr "Dieses Feld gibt an, welche Tastaturbelegung auf der Konsole benutzt werden soll. Es kann entweder auf @code{#f} gesetzt sein, damit die voreingestellte Tastaturbelegung benutzt wird (in der Regel ist diese „US English“), oder ein @code{}-Verbundsobjekt sein." #. type: table -#: doc/guix.texi:10514 +#: doc/guix.texi:10512 msgid "This keyboard layout is in effect as soon as the kernel has booted. For instance, it is the keyboard layout in effect when you type a passphrase if your root file system is on a @code{luks-device-mapping} mapped device (@pxref{Mapped Devices})." msgstr "Diese Tastaturbelegung wird benutzt, sobald der Kernel gebootet wurde. Diese Tastaturbelegung wird zum Beispiel auch verwendet, wenn Sie eine Passphrase eintippen, falls sich Ihr Wurzeldateisystem auf einem mit @code{luks-device-mapping} zugeordneten Gerät befindet (siehe @ref{Mapped Devices})." #. type: quotation -#: doc/guix.texi:10521 +#: doc/guix.texi:10519 msgid "This does @emph{not} specify the keyboard layout used by the bootloader, nor that used by the graphical display server. @xref{Bootloader Configuration}, for information on how to specify the bootloader's keyboard layout. @xref{X Window}, for information on how to specify the keyboard layout used by the X Window System." msgstr "Damit wird @emph{nicht} angegeben, welche Tastaturbelegung der Bootloader benutzt, und auch nicht, welche der grafische Anzeigeserver verwendet. Siehe @ref{Bootloader Configuration} für Informationen darüber, wie Sie die Tastaturbelegung des Bootloaders angeben können. Siehe @ref{X Window} für Informationen darüber, wie Sie die Tastaturbelegung angeben können, die das X-Fenstersystem verwendet." #. type: item -#: doc/guix.texi:10523 +#: doc/guix.texi:10521 #, no-wrap msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})" msgstr "@code{initrd-modules} (Vorgabe: @code{%base-initrd-modules})" #. type: code{#1} -#: doc/guix.texi:10524 doc/guix.texi:23860 doc/guix.texi:23963 -#: doc/guix.texi:24198 +#: doc/guix.texi:10522 doc/guix.texi:23857 doc/guix.texi:23960 +#: doc/guix.texi:24195 #, no-wrap msgid "initrd" msgstr "initrd" #. type: cindex -#: doc/guix.texi:10525 doc/guix.texi:23861 doc/guix.texi:23964 +#: doc/guix.texi:10523 doc/guix.texi:23858 doc/guix.texi:23961 #, no-wrap msgid "initial RAM disk" msgstr "initiale RAM-Disk" #. type: table -#: doc/guix.texi:10528 +#: doc/guix.texi:10526 msgid "The list of Linux kernel modules that need to be available in the initial RAM disk. @xref{Initial RAM Disk}." msgstr "Die Liste der Linux-Kernel-Module, die in der initialen RAM-Disk zur Verfügung stehen sollen. Siehe @ref{Initial RAM Disk}." #. type: item -#: doc/guix.texi:10529 +#: doc/guix.texi:10527 #, no-wrap msgid "@code{initrd} (default: @code{base-initrd})" msgstr "@code{initrd} (Vorgabe: @code{base-initrd})" #. type: table -#: doc/guix.texi:10533 +#: doc/guix.texi:10531 msgid "A procedure that returns an initial RAM disk for the Linux kernel. This field is provided to support low-level customization and should rarely be needed for casual use. @xref{Initial RAM Disk}." msgstr "Eine Prozedur, die eine initiale RAM-Disk für den Linux-Kernel liefert. Dieses Feld gibt es, damit auch sehr systemnahe Anpassungen vorgenommen werden können, aber für die normale Nutzung sollte man es kaum brauchen. Siehe @ref{Initial RAM Disk}." #. type: item -#: doc/guix.texi:10534 +#: doc/guix.texi:10532 #, no-wrap msgid "@code{firmware} (default: @var{%base-firmware})" msgstr "@code{firmware} (Vorgabe: @var{%base-firmware})" #. type: cindex -#: doc/guix.texi:10535 +#: doc/guix.texi:10533 #, no-wrap msgid "firmware" msgstr "Firmware" #. type: table -#: doc/guix.texi:10537 +#: doc/guix.texi:10535 msgid "List of firmware packages loadable by the operating system kernel." msgstr "Eine Liste der Firmware-Pakete, die vom Betriebssystem-Kernel geladen werden können." #. type: table -#: doc/guix.texi:10542 +#: doc/guix.texi:10540 msgid "The default includes firmware needed for Atheros- and Broadcom-based WiFi devices (Linux-libre modules @code{ath9k} and @code{b43-open}, respectively). @xref{Hardware Considerations}, for more info on supported hardware." msgstr "Vorgegeben ist, dass für Atheros- und Broadcom-basierte WLAN-Geräte nötige Firmware geladen werden kann (genauer jeweils die Linux-libre-Module @code{ath9k} und @code{b43-open}). Siehe den Abschnitt @ref{Hardware Considerations} für mehr Informationen zu unterstützter Hardware." #. type: code{#1} -#: doc/guix.texi:10543 +#: doc/guix.texi:10541 #, no-wrap msgid "host-name" msgstr "host-name" #. type: table -#: doc/guix.texi:10545 +#: doc/guix.texi:10543 msgid "The host name." msgstr "Der Hostname" #. type: code{#1} -#: doc/guix.texi:10546 +#: doc/guix.texi:10544 #, no-wrap msgid "hosts-file" msgstr "hosts-file" #. type: cindex -#: doc/guix.texi:10547 +#: doc/guix.texi:10545 #, no-wrap msgid "hosts file" msgstr "hosts-Datei" #. type: table -#: doc/guix.texi:10552 +#: doc/guix.texi:10550 msgid "A file-like object (@pxref{G-Expressions, file-like objects}) for use as @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). The default is a file with entries for @code{localhost} and @var{host-name}." msgstr "Ein dateiartiges Objekt (siehe @ref{G-Expressions, file-like objects}), das für @file{/etc/hosts} benutzt werden soll (siehe @ref{Host Names,,, libc, The GNU C Library Reference Manual}). Der Vorgabewert ist eine Datei mit Einträgen für @code{localhost} und @var{host-name}." #. type: item -#: doc/guix.texi:10553 +#: doc/guix.texi:10551 #, no-wrap msgid "@code{mapped-devices} (default: @code{'()})" msgstr "@code{mapped-devices} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:10555 +#: doc/guix.texi:10553 msgid "A list of mapped devices. @xref{Mapped Devices}." msgstr "Eine Liste zugeordneter Geräte („mapped devices“). Siehe @ref{Mapped Devices}." #. type: code{#1} -#: doc/guix.texi:10556 +#: doc/guix.texi:10554 #, no-wrap msgid "file-systems" msgstr "file-systems" #. type: table -#: doc/guix.texi:10558 +#: doc/guix.texi:10556 msgid "A list of file systems. @xref{File Systems}." msgstr "Eine Liste von Dateisystemen. Siehe @ref{File Systems}." #. type: item -#: doc/guix.texi:10559 +#: doc/guix.texi:10557 #, no-wrap msgid "@code{swap-devices} (default: @code{'()})" msgstr "@code{swap-devices} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:10560 +#: doc/guix.texi:10558 #, no-wrap msgid "swap devices" msgstr "Swap-Geräte" #. type: table -#: doc/guix.texi:10567 +#: doc/guix.texi:10565 msgid "A list of strings identifying devices or files to be used for ``swap space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}). For example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}. It is possible to specify a swap file in a file system on a mapped device, provided that the necessary device mapping and file system are also specified. @xref{Mapped Devices} and @ref{File Systems}." msgstr "Eine Liste von Zeichenketten, die Geräte identifizieren oder als „Swap-Speicher“ genutzte Dateien identifizieren (siehe @ref{Memory Concepts,,, libc, The GNU C Library Reference Manual}). Beispiele wären etwa @code{'(\"/dev/sda3\")} oder @code{'(\"/swapdatei\")}. Es ist möglich, eine Swap-Datei auf dem Dateisystem eines zugeordneten Geräts anzugeben, sofern auch die Gerätezuordnung und das Dateisystem mit angegeben werden. Siehe @ref{Mapped Devices} und @ref{File Systems}." #. type: item -#: doc/guix.texi:10568 +#: doc/guix.texi:10566 #, no-wrap msgid "@code{users} (default: @code{%base-user-accounts})" msgstr "@code{users} (Vorgabe: @code{%base-user-accounts})" #. type: itemx -#: doc/guix.texi:10569 +#: doc/guix.texi:10567 #, no-wrap msgid "@code{groups} (default: @var{%base-groups})" msgstr "@code{groups} (Vorgabe: @var{%base-groups})" #. type: table -#: doc/guix.texi:10571 +#: doc/guix.texi:10569 msgid "List of user accounts and groups. @xref{User Accounts}." msgstr "Liste der Benutzerkonten und Benutzergruppen. Siehe @ref{User Accounts}." #. type: table -#: doc/guix.texi:10574 +#: doc/guix.texi:10572 msgid "If the @code{users} list lacks a user account with UID@tie{}0, a ``root'' account with UID@tie{}0 is automatically added." msgstr "Wenn in der @code{users}-Liste kein Benutzerkonto mit der UID-Kennung@tie{}0 aufgeführt wird, wird automatisch für den Administrator ein „root“-Benutzerkonto mit UID-Kennung@tie{}0 hinzugefügt." #. type: item -#: doc/guix.texi:10575 +#: doc/guix.texi:10573 #, no-wrap msgid "@code{skeletons} (default: @code{(default-skeletons)})" msgstr "@code{skeletons} (Vorgabe: @code{(default-skeletons)})" #. type: table -#: doc/guix.texi:10579 +#: doc/guix.texi:10577 msgid "A list target file name/file-like object tuples (@pxref{G-Expressions, file-like objects}). These are the skeleton files that will be added to the home directory of newly-created user accounts." msgstr "Eine Liste von Tupeln aus je einem Ziel-Dateinamen und einem dateiähnlichen Objekt (siehe @ref{G-Expressions, file-like objects}). Diese Objekte werden als Skeleton-Dateien im Persönlichen Verzeichnis („Home“-Verzeichnis) jedes neuen Benutzerkontos angelegt." #. type: table -#: doc/guix.texi:10581 +#: doc/guix.texi:10579 msgid "For instance, a valid value may look like this:" msgstr "Ein gültiger Wert könnte zum Beispiel so aussehen:" #. type: example -#: doc/guix.texi:10587 +#: doc/guix.texi:10585 #, no-wrap msgid "" "`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n" @@ -18999,194 +19010,194 @@ msgstr "" " (activate-readline)\")))\n" #. type: item -#: doc/guix.texi:10589 +#: doc/guix.texi:10587 #, no-wrap msgid "@code{issue} (default: @var{%default-issue})" msgstr "@code{issue} (Vorgabe: @var{%default-issue})" #. type: table -#: doc/guix.texi:10592 +#: doc/guix.texi:10590 msgid "A string denoting the contents of the @file{/etc/issue} file, which is displayed when users log in on a text console." msgstr "Eine Zeichenkette, die als Inhalt der Datei @file{/etc/issue} verwendet werden soll, der jedes Mal angezeigt wird, wenn sich ein Nutzer auf einer Textkonsole anmeldet." #. type: item -#: doc/guix.texi:10593 +#: doc/guix.texi:10591 #, no-wrap msgid "@code{packages} (default: @var{%base-packages})" msgstr "@code{packages} (Vorgabe: @var{%base-packages})" #. type: table -#: doc/guix.texi:10596 +#: doc/guix.texi:10594 msgid "The set of packages installed in the global profile, which is accessible at @file{/run/current-system/profile}." msgstr "Die Menge der Pakete, die ins globale Profil installiert werden sollen, welches unter @file{/run/current-system/profile} zu finden ist." #. type: table -#: doc/guix.texi:10600 +#: doc/guix.texi:10598 msgid "The default set includes core utilities and it is good practice to install non-core utilities in user profiles (@pxref{Invoking guix package})." msgstr "Die vorgegebene Paketmenge umfasst zum Kern des Systems gehörende Werkzeuge („core utilities“). Es ist empfehlenswert, nicht zum Kern gehörende Werkzeuge („non-core“) stattdessen in Nutzerprofile zu installieren (siehe @ref{Invoking guix package})." #. type: code{#1} -#: doc/guix.texi:10601 +#: doc/guix.texi:10599 #, no-wrap msgid "timezone" msgstr "timezone" #. type: table -#: doc/guix.texi:10603 +#: doc/guix.texi:10601 msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}." msgstr "Eine Zeichenkette, die die Zeitzone bezeichnet, wie z.B.@: @code{\"Europe/Berlin\"}." #. type: table -#: doc/guix.texi:10607 +#: doc/guix.texi:10605 msgid "You can run the @command{tzselect} command to find out which timezone string corresponds to your region. Choosing an invalid timezone name causes @command{guix system} to fail." msgstr "Mit dem Befehl @command{tzselect} können Sie herausfinden, welche Zeichenkette der Zeitzone Ihrer Region entspricht. Wenn Sie eine ungültige Zeichenkette angeben, schlägt @command{guix system} fehl." #. type: item -#: doc/guix.texi:10608 +#: doc/guix.texi:10606 #, no-wrap msgid "@code{locale} (default: @code{\"en_US.utf8\"})" msgstr "@code{locale} (Vorgabe: @code{\"en_US.utf8\"})" #. type: table -#: doc/guix.texi:10611 +#: doc/guix.texi:10609 msgid "The name of the default locale (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}). @xref{Locales}, for more information." msgstr "Der Name der als Voreinstellung zu verwendenden Locale (siehe @ref{Locale Names,,, libc, The GNU C Library Reference Manual}). Siehe @ref{Locales} für weitere Informationen." #. type: item -#: doc/guix.texi:10612 +#: doc/guix.texi:10610 #, no-wrap msgid "@code{locale-definitions} (default: @var{%default-locale-definitions})" msgstr "@code{locale-definitions} (Vorgabe: @var{%default-locale-definitions})" #. type: table -#: doc/guix.texi:10615 +#: doc/guix.texi:10613 msgid "The list of locale definitions to be compiled and that may be used at run time. @xref{Locales}." msgstr "Die Liste der Locale-Definitionen, die kompiliert werden sollen und dann im laufenden System benutzt werden können. Siehe @ref{Locales}." #. type: item -#: doc/guix.texi:10616 +#: doc/guix.texi:10614 #, no-wrap msgid "@code{locale-libcs} (default: @code{(list @var{glibc})})" msgstr "@code{locale-libcs} (Vorgabe: @code{(list @var{glibc})})" #. type: table -#: doc/guix.texi:10620 +#: doc/guix.texi:10618 msgid "The list of GNU@tie{}libc packages whose locale data and tools are used to build the locale definitions. @xref{Locales}, for compatibility considerations that justify this option." msgstr "Die Liste der GNU-libc-Pakete, deren Locale-Daten und -Werkzeuge zum Erzeugen der Locale-Definitionen verwendet werden sollen. Siehe @ref{Locales} für eine Erläuterung der Kompatibilitätsauswirkungen, deretwegen man diese Option benutzen wollen könnte." #. type: item -#: doc/guix.texi:10621 +#: doc/guix.texi:10619 #, no-wrap msgid "@code{name-service-switch} (default: @var{%default-nss})" msgstr "@code{name-service-switch} (Vorgabe: @var{%default-nss})" #. type: table -#: doc/guix.texi:10625 +#: doc/guix.texi:10623 msgid "Configuration of the libc name service switch (NSS)---a @code{} object. @xref{Name Service Switch}, for details." msgstr "Die Konfiguration des Name Service Switch (NSS) der libc — ein @code{}-Objekt. Siehe @ref{Name Service Switch} für Details." #. type: item -#: doc/guix.texi:10626 +#: doc/guix.texi:10624 #, no-wrap msgid "@code{services} (default: @var{%base-services})" msgstr "@code{services} (Vorgabe: @var{%base-services})" #. type: table -#: doc/guix.texi:10628 +#: doc/guix.texi:10626 msgid "A list of service objects denoting system services. @xref{Services}." msgstr "Eine Liste von „service“-Objekten, die die Systemdienste repräsentieren. Siehe @ref{Services}." #. type: cindex -#: doc/guix.texi:10629 +#: doc/guix.texi:10627 #, no-wrap msgid "essential services" msgstr "essenzielle Dienste" #. type: item -#: doc/guix.texi:10630 +#: doc/guix.texi:10628 #, no-wrap msgid "@code{essential-services} (default: ...)" msgstr "@code{essential-services} (Vorgabe: …)" #. type: table -#: doc/guix.texi:10635 +#: doc/guix.texi:10633 msgid "The list of ``essential services''---i.e., things like instances of @code{system-service-type} and @code{host-name-service-type} (@pxref{Service Reference}), which are derived from the operating system definition itself. As a user you should @emph{never} need to touch this field." msgstr "Die Liste „essenzieller Dienste“ — d.h.@: Dinge wie Instanzen von @code{system-service-type} und @code{host-name-service-type} (siehe @ref{Service Reference}), die aus der Betriebssystemdefinition an sich abgeleitet werden. Als normaler Benutzer sollten Sie dieses Feld @emph{niemals} ändern müssen." #. type: item -#: doc/guix.texi:10636 +#: doc/guix.texi:10634 #, no-wrap msgid "@code{pam-services} (default: @code{(base-pam-services)})" msgstr "@code{pam-services} (Vorgabe: @code{(base-pam-services)})" #. type: cindex -#: doc/guix.texi:10637 +#: doc/guix.texi:10635 #, no-wrap msgid "PAM" msgstr "PAM" #. type: cindex -#: doc/guix.texi:10638 +#: doc/guix.texi:10636 #, no-wrap msgid "pluggable authentication modules" msgstr "Pluggable Authentication Modules" #. type: table -#: doc/guix.texi:10641 +#: doc/guix.texi:10639 msgid "Linux @dfn{pluggable authentication module} (PAM) services." msgstr "Dienste für @dfn{Pluggable Authentication Modules} (PAM) von Linux." #. type: item -#: doc/guix.texi:10642 +#: doc/guix.texi:10640 #, no-wrap msgid "@code{setuid-programs} (default: @var{%setuid-programs})" msgstr "@code{setuid-programs} (Vorgabe: @var{%setuid-programs})" #. type: table -#: doc/guix.texi:10645 +#: doc/guix.texi:10643 msgid "List of string-valued G-expressions denoting setuid programs. @xref{Setuid Programs}." msgstr "Eine Liste von Zeichenketten liefernden G-Ausdrücken, die setuid-Programme bezeichnen. Siehe @ref{Setuid Programs}." #. type: item -#: doc/guix.texi:10646 +#: doc/guix.texi:10644 #, no-wrap msgid "@code{sudoers-file} (default: @var{%sudoers-specification})" msgstr "@code{sudoers-file} (Vorgabe: @var{%sudoers-specification})" #. type: cindex -#: doc/guix.texi:10647 +#: doc/guix.texi:10645 #, no-wrap msgid "sudoers file" msgstr "sudoers-Datei" #. type: table -#: doc/guix.texi:10650 +#: doc/guix.texi:10648 msgid "The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-Expressions, @code{local-file} and @code{plain-file}})." msgstr "Der Inhalt der Datei @file{/etc/sudoers} als ein dateiähnliches Objekt (siehe @ref{G-Expressions, @code{local-file} und @code{plain-file}})." #. type: table -#: doc/guix.texi:10655 +#: doc/guix.texi:10653 msgid "This file specifies which users can use the @command{sudo} command, what they are allowed to do, and what privileges they may gain. The default is that only @code{root} and members of the @code{wheel} group may use @code{sudo}." msgstr "Diese Datei gibt an, welche Nutzer den Befehl @command{sudo} benutzen dürfen, was sie damit tun und welche Berechtigungen sie so erhalten können. Die Vorgabe ist, dass nur der Administratornutzer @code{root} und Mitglieder der Benutzergruppe @code{wheel} den @code{sudo}-Befehl verwenden dürfen." #. type: deffn -#: doc/guix.texi:10658 +#: doc/guix.texi:10656 #, no-wrap msgid "{Scheme Syntax} this-operating-system" msgstr "{Scheme-Syntax} this-operating-system" #. type: deffn -#: doc/guix.texi:10661 +#: doc/guix.texi:10659 msgid "When used in the @emph{lexical scope} of an operating system field definition, this identifier resolves to the operating system being defined." msgstr "Wenn dies im @emph{lexikalischen Geltungsbereich} der Definition eines Feldes im Betriebssystem steht, bezieht sich dieser Bezeichner auf das Betriebssystem, das gerade definiert wird." #. type: deffn -#: doc/guix.texi:10664 +#: doc/guix.texi:10662 msgid "The example below shows how to refer to the operating system being defined in the definition of the @code{label} field:" msgstr "Das folgende Beispiel zeigt, wie man auf das Betriebssystem, das gerade definiert wird, verweist, während man die Definition des @code{label}-Felds schreibt:" #. type: example -#: doc/guix.texi:10667 doc/guix.texi:13332 +#: doc/guix.texi:10665 doc/guix.texi:13330 #, no-wrap msgid "" "(use-modules (gnu) (guix))\n" @@ -19196,7 +19207,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:10672 +#: doc/guix.texi:10670 #, no-wrap msgid "" "(operating-system\n" @@ -19210,17 +19221,17 @@ msgstr "" " (operating-system-kernel this-operating-system))))\n" #. type: deffn -#: doc/guix.texi:10676 +#: doc/guix.texi:10674 msgid "It is an error to refer to @code{this-operating-system} outside an operating system definition." msgstr "Es ist ein Fehler, außerhalb einer Betriebssystemdefinition auf @code{this-operating-system} zu verweisen." #. type: Plain text -#: doc/guix.texi:10687 +#: doc/guix.texi:10685 msgid "The list of file systems to be mounted is specified in the @code{file-systems} field of the operating system declaration (@pxref{Using the Configuration System}). Each file system is declared using the @code{file-system} form, like this:" msgstr "Die Liste der Dateisysteme, die eingebunden werden sollen, steht im @code{file-systems}-Feld der Betriebssystemdeklaration (siehe @ref{Using the Configuration System}). Jedes Dateisystem wird mit der @code{file-system}-Form deklariert, etwa so:" #. type: example -#: doc/guix.texi:10693 +#: doc/guix.texi:10691 #, no-wrap msgid "" "(file-system\n" @@ -19234,67 +19245,67 @@ msgstr "" " (type \"ext4\"))\n" #. type: Plain text -#: doc/guix.texi:10697 +#: doc/guix.texi:10695 msgid "As usual, some of the fields are mandatory---those shown in the example above---while others can be omitted. These are described below." msgstr "Wie immer müssen manche Felder angegeben werden — die, die im Beispiel oben stehen —, während andere optional sind. Die Felder werden nun beschrieben." #. type: deftp -#: doc/guix.texi:10698 +#: doc/guix.texi:10696 #, no-wrap msgid "{Data Type} file-system" msgstr "{Datentyp} file-system" #. type: deftp -#: doc/guix.texi:10701 +#: doc/guix.texi:10699 msgid "Objects of this type represent file systems to be mounted. They contain the following members:" msgstr "Objekte dieses Typs repräsentieren einzubindende Dateisysteme. Sie weisen folgende Komponenten auf:" #. type: item -#: doc/guix.texi:10703 doc/guix.texi:10894 +#: doc/guix.texi:10701 doc/guix.texi:10892 #, no-wrap msgid "type" msgstr "type" #. type: table -#: doc/guix.texi:10706 +#: doc/guix.texi:10704 msgid "This is a string specifying the type of the file system---e.g., @code{\"ext4\"}." msgstr "Eine Zeichenkette, die den Typ des Dateisystems spezifiziert, z.B.@: @code{\"ext4\"}." #. type: code{#1} -#: doc/guix.texi:10707 +#: doc/guix.texi:10705 #, no-wrap msgid "mount-point" msgstr "mount-point" #. type: table -#: doc/guix.texi:10709 +#: doc/guix.texi:10707 msgid "This designates the place where the file system is to be mounted." msgstr "Der Einhängepunkt, d.h.@: der Pfad, an dem das Dateisystem eingebunden werden soll." #. type: code{#1} -#: doc/guix.texi:10710 +#: doc/guix.texi:10708 #, no-wrap msgid "device" msgstr "device" #. type: table -#: doc/guix.texi:10720 +#: doc/guix.texi:10718 msgid "This names the ``source'' of the file system. It can be one of three things: a file system label, a file system UUID, or the name of a @file{/dev} node. Labels and UUIDs offer a way to refer to file systems without having to hard-code their actual device name@footnote{Note that, while it is tempting to use @file{/dev/disk/by-uuid} and similar device names to achieve the same result, this is not recommended: These special device nodes are created by the udev daemon and may be unavailable at the time the device is mounted.}." msgstr "Hiermit wird die „Quelle“ des Dateisystems bezeichnet. Sie kann eines von drei Dingen sein: die Bezeichnung („Labels“) eines Dateisystems, die UUID-Kennung des Dateisystems oder der Name eines @file{/dev}-Knotens. Mit Bezeichnungen und UUIDs kann man Dateisysteme benennen, ohne den Gerätenamen festzuschreiben@footnote{Beachten Sie: Obwohl es verführerisch ist, mit @file{/dev/disk/by-uuid} und ähnlichen Gerätenamen dasselbe Resultat bekommen zu wollen, raten wir davon ab: Diese speziellen Gerätenamen werden erst vom udev-Daemon erzeugt und sind, wenn die Geräte eingebunden werden, vielleicht noch nicht verfügbar.}." #. type: findex -#: doc/guix.texi:10721 +#: doc/guix.texi:10719 #, no-wrap msgid "file-system-label" msgstr "file-system-label" #. type: table -#: doc/guix.texi:10726 +#: doc/guix.texi:10724 msgid "File system labels are created using the @code{file-system-label} procedure, UUIDs are created using @code{uuid}, and @file{/dev} node are plain strings. Here's an example of a file system referred to by its label, as shown by the @command{e2label} command:" msgstr "Dateisystem-Bezeichnungen („Labels“) werden mit der Prozedur @code{file-system-label} erzeugt und UUID-Kennungen werden mit @code{uuid} erzeugt, während Knoten in @file{/dev} mit ihrem Pfad als einfache Zeichenketten aufgeführt werden. Hier ist ein Beispiel, wie wir ein Dateisystem anhand seiner Bezeichnung aufführen, wie sie vom Befehl @command{e2label} angezeigt wird:" #. type: example -#: doc/guix.texi:10732 +#: doc/guix.texi:10730 #, no-wrap msgid "" "(file-system\n" @@ -19308,18 +19319,18 @@ msgstr "" " (device (file-system-label \"my-home\")))\n" #. type: findex -#: doc/guix.texi:10734 +#: doc/guix.texi:10732 #, no-wrap msgid "uuid" msgstr "uuid" #. type: table -#: doc/guix.texi:10742 +#: doc/guix.texi:10740 msgid "UUIDs are converted from their string representation (as shown by the @command{tune2fs -l} command) using the @code{uuid} form@footnote{The @code{uuid} form expects 16-byte UUIDs as defined in @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}. This is the form of UUID used by the ext2 family of file systems and others, but it is different from ``UUIDs'' found in FAT file systems, for instance.}, like this:" msgstr "UUID-Kennungen werden mit der @code{uuid}-Form von ihrer Darstellung als Zeichenkette (wie sie vom Befehl @command{tune2fs -l} angezeigt wird) konvertiert@footnote{Die @code{uuid}-Form nimmt 16-Byte-UUIDs entgegen, wie sie in @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122} definiert sind. Diese Form der UUID wird unter anderem von der ext2-Familie von Dateisystemen verwendet, sie unterscheidet sich jedoch zum Beispiel von den „UUID“ genannten Kennungen, wie man sie bei FAT-Dateisystemen findet.} wie hier:" #. type: example -#: doc/guix.texi:10748 +#: doc/guix.texi:10746 #, no-wrap msgid "" "(file-system\n" @@ -19333,268 +19344,268 @@ msgstr "" " (device (uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\")))\n" #. type: table -#: doc/guix.texi:10756 +#: doc/guix.texi:10754 msgid "When the source of a file system is a mapped device (@pxref{Mapped Devices}), its @code{device} field @emph{must} refer to the mapped device name---e.g., @file{\"/dev/mapper/root-partition\"}. This is required so that the system knows that mounting the file system depends on having the corresponding device mapping established." msgstr "Wenn die Quelle eines Dateisystems ein zugeordnetes Gerät (siehe @ref{Mapped Devices}) ist, @emph{muss} sich das @code{device}-Feld auf den zugeordneten Gerätenamen beziehen — z.B.@: @file{\"/dev/mapper/root-partition\"}. Das ist nötig, damit das System weiß, dass das Einbinden des Dateisystems davon abhängt, die entsprechende Gerätezuordnung hergestellt zu haben." #. type: item -#: doc/guix.texi:10757 +#: doc/guix.texi:10755 #, no-wrap msgid "@code{flags} (default: @code{'()})" msgstr "@code{flags} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:10764 +#: doc/guix.texi:10762 msgid "This is a list of symbols denoting mount flags. Recognized flags include @code{read-only}, @code{bind-mount}, @code{no-dev} (disallow access to special files), @code{no-suid} (ignore setuid and setgid bits), @code{no-atime} (do not update file access times), and @code{no-exec} (disallow program execution). @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for more information on these flags." msgstr "Eine Liste von Symbolen, die Einbinde-Flags („mount flags“) bezeichnen. Erkannt werden unter anderem @code{read-only}, @code{bind-mount}, @code{no-dev} (Zugang zu besonderen Dateien verweigern), @code{no-suid} (setuid- und setgid-Bits ignorieren), @code{no-atime} (Dateizugriffs-Zeitstempel nicht aktualisieren) und @code{no-exec} (Programmausführungen verweigern). Siehe @ref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual} für mehr Informationen zu diesen Einbinde-Optionen." #. type: item -#: doc/guix.texi:10765 +#: doc/guix.texi:10763 #, no-wrap msgid "@code{options} (default: @code{#f})" msgstr "@code{options} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10770 +#: doc/guix.texi:10768 msgid "This is either @code{#f}, or a string denoting mount options passed to the file system driver. @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for details and run @command{man 8 mount} for options for various file systems." msgstr "Entweder @code{#f} oder eine Zeichenkette mit Einbinde-Optionen („mount options“), die an den Dateisystemtreiber übergeben werden. Siehe @ref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual} für Details; führen Sie @command{man 8 mount} aus, um die Einbinde-Optionen verschiedener Dateisysteme zu sehen." #. type: item -#: doc/guix.texi:10771 +#: doc/guix.texi:10769 #, no-wrap msgid "@code{mount?} (default: @code{#t})" msgstr "@code{mount?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:10776 +#: doc/guix.texi:10774 msgid "This value indicates whether to automatically mount the file system when the system is brought up. When set to @code{#f}, the file system gets an entry in @file{/etc/fstab} (read by the @command{mount} command) but is not automatically mounted." msgstr "Dieser Wert zeigt an, ob das Dateisystem automatisch eingebunden werden soll, wenn das System gestartet wird. Ist der Wert @code{#f}, dann erhält das Dateisystem nur einen Eintrag in der Datei @file{/etc/fstab} (welche vom @command{mount}-Befehl zum Einbinden gelesen wird), es wird aber nicht automatisch eingebunden." #. type: item -#: doc/guix.texi:10777 +#: doc/guix.texi:10775 #, no-wrap msgid "@code{needed-for-boot?} (default: @code{#f})" msgstr "@code{needed-for-boot?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10782 +#: doc/guix.texi:10780 msgid "This Boolean value indicates whether the file system is needed when booting. If that is true, then the file system is mounted when the initial RAM disk (initrd) is loaded. This is always the case, for instance, for the root file system." msgstr "Dieser boolesche Wert gibt an, ob das Dateisystem zum Hochfahren des Systems notwendig ist. In diesem Fall wird das Dateisystem eingebunden, wenn die initiale RAM-Disk (initrd) geladen wird. Für zum Beispiel das Wurzeldateisystem ist dies ohnehin immer der Fall." #. type: item -#: doc/guix.texi:10783 +#: doc/guix.texi:10781 #, no-wrap msgid "@code{check?} (default: @code{#t})" msgstr "@code{check?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:10786 +#: doc/guix.texi:10784 msgid "This Boolean indicates whether the file system needs to be checked for errors before being mounted." msgstr "Dieser boolesche Wert sagt aus, ob das Dateisystem vor dem Einbinden auf Fehler hin geprüft werden soll." #. type: item -#: doc/guix.texi:10787 +#: doc/guix.texi:10785 #, no-wrap msgid "@code{create-mount-point?} (default: @code{#f})" msgstr "@code{create-mount-point?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:10789 +#: doc/guix.texi:10787 msgid "When true, the mount point is created if it does not exist yet." msgstr "Steht dies auf wahr, wird der Einhängepunkt vor dem Einbinden erstellt, wenn er noch nicht existiert." #. type: item -#: doc/guix.texi:10790 +#: doc/guix.texi:10788 #, no-wrap msgid "@code{dependencies} (default: @code{'()})" msgstr "@code{dependencies} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:10794 +#: doc/guix.texi:10792 msgid "This is a list of @code{} or @code{} objects representing file systems that must be mounted or mapped devices that must be opened before (and unmounted or closed after) this one." msgstr "Dies ist eine Liste von @code{}- oder @code{}-Objekten, die Dateisysteme repräsentieren, die vor diesem Dateisystem eingebunden oder zugeordnet werden müssen (und nach diesem ausgehängt oder geschlossen werden müssen)." #. type: table -#: doc/guix.texi:10798 +#: doc/guix.texi:10796 msgid "As an example, consider a hierarchy of mounts: @file{/sys/fs/cgroup} is a dependency of @file{/sys/fs/cgroup/cpu} and @file{/sys/fs/cgroup/memory}." msgstr "Betrachten Sie zum Beispiel eine Hierarchie von Einbindungen: @file{/sys/fs/cgroup} ist eine Abhängigkeit von @file{/sys/fs/cgroup/cpu} und @file{/sys/fs/cgroup/memory}." #. type: table -#: doc/guix.texi:10801 +#: doc/guix.texi:10799 msgid "Another example is a file system that depends on a mapped device, for example for an encrypted partition (@pxref{Mapped Devices})." msgstr "Ein weiteres Beispiel ist ein Dateisystem, was von einem zugeordneten Gerät abhängt, zum Beispiel zur Verschlüsselung einer Partition (siehe @ref{Mapped Devices})." #. type: Plain text -#: doc/guix.texi:10806 +#: doc/guix.texi:10804 msgid "The @code{(gnu system file-systems)} exports the following useful variables." msgstr "Das Modul @code{(gnu system file-systems)} exportiert die folgenden nützlichen Variablen." #. type: defvr -#: doc/guix.texi:10807 +#: doc/guix.texi:10805 #, no-wrap msgid "{Scheme Variable} %base-file-systems" msgstr "{Scheme-Variable} %base-file-systems" #. type: defvr -#: doc/guix.texi:10812 +#: doc/guix.texi:10810 msgid "These are essential file systems that are required on normal systems, such as @var{%pseudo-terminal-file-system} and @var{%immutable-store} (see below.) Operating system declarations should always contain at least these." msgstr "Hiermit werden essenzielle Dateisysteme bezeichnet, die für normale Systeme unverzichtbar sind, wie zum Beispiel @var{%pseudo-terminal-file-system} und @var{%immutable-store} (siehe unten). Betriebssystemdeklaration sollten auf jeden Fall mindestens diese enthalten." #. type: defvr -#: doc/guix.texi:10814 +#: doc/guix.texi:10812 #, no-wrap msgid "{Scheme Variable} %pseudo-terminal-file-system" msgstr "{Scheme-Variable} %pseudo-terminal-file-system" #. type: defvr -#: doc/guix.texi:10820 +#: doc/guix.texi:10818 msgid "This is the file system to be mounted as @file{/dev/pts}. It supports @dfn{pseudo-terminals} created @i{via} @code{openpty} and similar functions (@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}). Pseudo-terminals are used by terminal emulators such as @command{xterm}." msgstr "Das als @file{/dev/pts} einzubindende Dateisystem. Es unterstützt über @code{openpty} und ähnliche Funktionen erstellte @dfn{Pseudo-Terminals} (siehe @ref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}). Pseudo-Terminals werden von Terminal-Emulatoren wie @command{xterm} benutzt." #. type: defvr -#: doc/guix.texi:10822 +#: doc/guix.texi:10820 #, no-wrap msgid "{Scheme Variable} %shared-memory-file-system" msgstr "{Scheme-Variable} %shared-memory-file-system" #. type: defvr -#: doc/guix.texi:10826 +#: doc/guix.texi:10824 msgid "This file system is mounted as @file{/dev/shm} and is used to support memory sharing across processes (@pxref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})." msgstr "Dieses Dateisystem wird als @file{/dev/shm} eingebunden, um Speicher zwischen Prozessen teilen zu können (siehe @ref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})." #. type: defvr -#: doc/guix.texi:10828 +#: doc/guix.texi:10826 #, no-wrap msgid "{Scheme Variable} %immutable-store" msgstr "{Scheme-Variable} %immutable-store" #. type: defvr -#: doc/guix.texi:10833 +#: doc/guix.texi:10831 msgid "This file system performs a read-only ``bind mount'' of @file{/gnu/store}, making it read-only for all the users including @code{root}. This prevents against accidental modification by software running as @code{root} or by system administrators." msgstr "Dieses Dateisystem vollzieht einen „bind mount“ des @file{/gnu/store}, um ihn für alle Nutzer einschließlich des Administratornutzers @code{root} nur lesbar zu machen, d.h.@: Schreibrechte zu entziehen. Dadurch kann als @code{root} ausgeführte Software, oder der Systemadministrator, nicht aus Versehen den Store modifizieren." #. type: defvr -#: doc/guix.texi:10836 +#: doc/guix.texi:10834 msgid "The daemon itself is still able to write to the store: it remounts it read-write in its own ``name space.''" msgstr "Der Daemon kann weiterhin in den Store schreiben, indem er ihn selbst mit Schreibrechten in seinem eigenen „Namensraum“ einbindet." #. type: defvr -#: doc/guix.texi:10838 +#: doc/guix.texi:10836 #, no-wrap msgid "{Scheme Variable} %binary-format-file-system" msgstr "{Scheme-Variable} %binary-format-file-system" #. type: defvr -#: doc/guix.texi:10842 +#: doc/guix.texi:10840 msgid "The @code{binfmt_misc} file system, which allows handling of arbitrary executable file types to be delegated to user space. This requires the @code{binfmt.ko} kernel module to be loaded." msgstr "Das @code{binfmt_misc}-Dateisystem, durch das beliebige Dateitypen als ausführbare Dateien auf der Anwendungsebene (dem User Space) zugänglich gemacht werden können. Es setzt voraus, dass das Kernel-Modul @code{binfmt.ko} geladen wurde." #. type: defvr -#: doc/guix.texi:10844 +#: doc/guix.texi:10842 #, no-wrap msgid "{Scheme Variable} %fuse-control-file-system" msgstr "{Scheme-Variable} %fuse-control-file-system" #. type: defvr -#: doc/guix.texi:10848 +#: doc/guix.texi:10846 msgid "The @code{fusectl} file system, which allows unprivileged users to mount and unmount user-space FUSE file systems. This requires the @code{fuse.ko} kernel module to be loaded." msgstr "Das @code{fusectl}-Dateisystem, womit „unprivilegierte“ Nutzer ohne besondere Berechtigungen im User Space FUSE-Dateisysteme einbinden und aushängen können. Dazu muss das Kernel-Modul @code{fuse.ko} geladen sein." #. type: cindex -#: doc/guix.texi:10853 +#: doc/guix.texi:10851 #, no-wrap msgid "device mapping" msgstr "Gerätezuordnung" #. type: cindex -#: doc/guix.texi:10854 +#: doc/guix.texi:10852 #, no-wrap msgid "mapped devices" msgstr "zugeordnete Geräte" #. type: Plain text -#: doc/guix.texi:10872 +#: doc/guix.texi:10870 msgid "The Linux kernel has a notion of @dfn{device mapping}: a block device, such as a hard disk partition, can be @dfn{mapped} into another device, usually in @code{/dev/mapper/}, with additional processing over the data that flows through it@footnote{Note that the GNU@tie{}Hurd makes no difference between the concept of a ``mapped device'' and that of a file system: both boil down to @emph{translating} input/output operations made on a file to operations on its backing store. Thus, the Hurd implements mapped devices, like file systems, using the generic @dfn{translator} mechanism (@pxref{Translators,,, hurd, The GNU Hurd Reference Manual}).}. A typical example is encryption device mapping: all writes to the mapped device are encrypted, and all reads are deciphered, transparently. Guix extends this notion by considering any device or set of devices that are @dfn{transformed} in some way to create a new device; for instance, RAID devices are obtained by @dfn{assembling} several other devices, such as hard disks or partitions, into a new one that behaves as one partition. Other examples, not yet implemented, are LVM logical volumes." msgstr "Der Linux-Kernel unterstützt das Konzept der @dfn{Gerätezuordnung}: Ein blockorientiertes Gerät wie eine Festplattenpartition kann einem neuen Gerät @dfn{zugeordnet} werden, gewöhnlich unter @code{/dev/mapper/}, wobei das neue Gerät durchlaufende Daten zusätzlicher Verarbeitung unterzogen werden@footnote{Beachten Sie, dass mit GNU@tie{}Hurd kein Unterschied zwischen dem Konzept eines „zugeordneten Geräts“ und dem eines Dateisystems besteht: Dort werden bei beiden Ein- und Ausgabeoperationen auf eine Datei in Operationen auf dessen Hintergrundspeicher @emph{übersetzt}. Hurd implementiert zugeordnete Geräte genau wie Dateisysteme mit dem generischen @dfn{Übersetzer}-Mechanismus (siehe @ref{Translators,,, hurd, The GNU Hurd Reference Manual}).}. Ein typisches Beispiel ist eine Gerätezuordnung zur Verschlüsselung: Jeder Schreibzugriff auf das zugeordnete Gerät wird transparent verschlüsselt und jeder Lesezugriff ebenso entschlüsselt. Guix erweitert dieses Konzept, indem es darunter jedes Gerät und jede Menge von Geräten versteht, die auf irgendeine Weise @dfn{umgewandelt} wird, um ein neues Gerät zu bilden; zum Beispiel entstehen auch RAID-Geräte aus einem @dfn{Verbund} mehrerer anderer Geräte, wie etwa Festplatten oder Partition zu einem einzelnen Gerät, das sich wie eine Partition verhält. Ein weiteres Beispiel, das noch nicht in Guix implementiert wurde, sind „LVM logical volumes“." #. type: Plain text -#: doc/guix.texi:10875 +#: doc/guix.texi:10873 msgid "Mapped devices are declared using the @code{mapped-device} form, defined as follows; for examples, see below." msgstr "Zugeordnete Geräte werden mittels einer @code{mapped-device}-Form deklariert, die wie folgt definiert ist; Beispiele folgen weiter unten." #. type: deftp -#: doc/guix.texi:10876 +#: doc/guix.texi:10874 #, no-wrap msgid "{Data Type} mapped-device" msgstr "{Datentyp} mapped-device" #. type: deftp -#: doc/guix.texi:10879 +#: doc/guix.texi:10877 msgid "Objects of this type represent device mappings that will be made when the system boots up." msgstr "Objekte dieses Typs repräsentieren Gerätezuordnungen, die gemacht werden, wenn das System hochfährt." #. type: table -#: doc/guix.texi:10885 +#: doc/guix.texi:10883 msgid "This is either a string specifying the name of the block device to be mapped, such as @code{\"/dev/sda3\"}, or a list of such strings when several devices need to be assembled for creating a new one." msgstr "Es handelt sich entweder um eine Zeichenkette, die den Namen eines zuzuordnenden blockorientierten Geräts angibt, wie @code{\"/dev/sda3\"}, oder um eine Liste solcher Zeichenketten, sofern mehrere Geräts zu einem neuen Gerät verbunden werden." #. type: code{#1} -#: doc/guix.texi:10886 doc/guix.texi:24078 +#: doc/guix.texi:10884 doc/guix.texi:24075 #, no-wrap msgid "target" msgstr "target" #. type: table -#: doc/guix.texi:10893 +#: doc/guix.texi:10891 msgid "This string specifies the name of the resulting mapped device. For kernel mappers such as encrypted devices of type @code{luks-device-mapping}, specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/mapper/my-partition\"} device. For RAID devices of type @code{raid-device-mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given." msgstr "Diese Zeichenkette gibt den Namen des neuen zugeordneten Geräts an. Bei Kernel-Zuordnern, wie verschlüsselten Geräten vom Typ @code{luks-device-mapping}, wird durch Angabe von @code{\"my-partition\"} ein Gerät @code{\"/dev/mapper/my-partition\"} erzeugt. Bei RAID-Geräten vom Typ @code{raid-device-mapping} muss der Gerätename als voller Pfad wie zum Beispiel @code{\"/dev/md0\"} angegeben werden." #. type: table -#: doc/guix.texi:10897 +#: doc/guix.texi:10895 msgid "This must be a @code{mapped-device-kind} object, which specifies how @var{source} is mapped to @var{target}." msgstr "Dies muss ein @code{mapped-device-kind}-Objekt sein, das angibt, wie die Quelle @var{source} dem Ziel @var{target} zugeordnet wird." #. type: defvr -#: doc/guix.texi:10900 +#: doc/guix.texi:10898 #, no-wrap msgid "{Scheme Variable} luks-device-mapping" msgstr "{Scheme-Variable} luks-device-mapping" #. type: defvr -#: doc/guix.texi:10904 +#: doc/guix.texi:10902 msgid "This defines LUKS block device encryption using the @command{cryptsetup} command from the package with the same name. It relies on the @code{dm-crypt} Linux kernel module." msgstr "Hiermit wird ein blockorientiertes Gerät mit LUKS verschlüsselt, mit Hilfe des Befehls @command{cryptsetup} aus dem gleichnamigen Paket. Dazu wird das Linux-Kernel-Modul @code{dm-crypt} vorausgesetzt." #. type: defvr -#: doc/guix.texi:10906 +#: doc/guix.texi:10904 #, no-wrap msgid "{Scheme Variable} raid-device-mapping" msgstr "{Scheme-Variable} raid-device-mapping" #. type: defvr -#: doc/guix.texi:10911 +#: doc/guix.texi:10909 msgid "This defines a RAID device, which is assembled using the @code{mdadm} command from the package with the same name. It requires a Linux kernel module for the appropriate RAID level to be loaded, such as @code{raid456} for RAID-4, RAID-5 or RAID-6, or @code{raid10} for RAID-10." msgstr "Dies definiert ein RAID-Gerät, das mit dem Befehl @code{mdadm} aus dem gleichnamigen Paket als Verbund zusammengestellt wird. Es setzt voraus, dass das Linux-Kernel-Modul für das entsprechende RAID-Level geladen ist, z.B.@: @code{raid456} für RAID-4, RAID-5 oder RAID-6, oder @code{raid10} für RAID-10." #. type: cindex -#: doc/guix.texi:10913 +#: doc/guix.texi:10911 #, no-wrap msgid "disk encryption" msgstr "Laufwerksverschlüsselung" #. type: cindex -#: doc/guix.texi:10914 +#: doc/guix.texi:10912 #, no-wrap msgid "LUKS" msgstr "LUKS" #. type: Plain text -#: doc/guix.texi:10922 +#: doc/guix.texi:10920 msgid "The following example specifies a mapping from @file{/dev/sda3} to @file{/dev/mapper/home} using LUKS---the @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, a standard mechanism for disk encryption. The @file{/dev/mapper/home} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems})." msgstr "Das folgende Beispiel gibt eine Zuordnung von @file{/dev/sda3} auf @file{/dev/mapper/home} mit LUKS an — dem @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, einem Standardmechanismus zur Plattenverschlüsselung. Das Gerät @file{/dev/mapper/home} kann dann als @code{device} einer @code{file-system}-Deklaration benutzt werden (siehe @ref{File Systems})." #. type: example -#: doc/guix.texi:10928 +#: doc/guix.texi:10926 #, no-wrap msgid "" "(mapped-device\n" @@ -19608,23 +19619,23 @@ msgstr "" " (type luks-device-mapping))\n" #. type: Plain text -#: doc/guix.texi:10933 +#: doc/guix.texi:10931 msgid "Alternatively, to become independent of device numbering, one may obtain the LUKS UUID (@dfn{unique identifier}) of the source device by a command like:" msgstr "Um nicht davon abhängig zu sein, wie Ihre Geräte nummeriert werden, können Sie auch die LUKS-UUID (@dfn{unique identifier}, d.h.@: den eindeutigen Bezeichner) des Quellgeräts auf der Befehlszeile ermitteln:" #. type: example -#: doc/guix.texi:10936 +#: doc/guix.texi:10934 #, no-wrap msgid "cryptsetup luksUUID /dev/sda3\n" msgstr "cryptsetup luksUUID /dev/sda3\n" #. type: Plain text -#: doc/guix.texi:10939 +#: doc/guix.texi:10937 msgid "and use it as follows:" msgstr "und wie folgt benutzen:" #. type: example -#: doc/guix.texi:10945 +#: doc/guix.texi:10943 #, no-wrap msgid "" "(mapped-device\n" @@ -19638,23 +19649,23 @@ msgstr "" " (type luks-device-mapping))\n" #. type: cindex -#: doc/guix.texi:10947 +#: doc/guix.texi:10945 #, no-wrap msgid "swap encryption" msgstr "Swap-Verschlüsselung" #. type: Plain text -#: doc/guix.texi:10953 +#: doc/guix.texi:10951 msgid "It is also desirable to encrypt swap space, since swap space may contain sensitive data. One way to accomplish that is to use a swap file in a file system on a device mapped via LUKS encryption. In this way, the swap file is encrypted because the entire device is encrypted. @xref{Preparing for Installation,,Disk Partitioning}, for an example." msgstr "Es ist auch wünschenswert, Swap-Speicher zu verschlüsseln, da in den Swap-Speicher sensible Daten ausgelagert werden können. Eine Möglichkeit ist, eine Swap-Datei auf einem mit LUKS-Verschlüsselung zugeordneten Dateisystem zu verwenden. Dann wird die Swap-Datei verschlüsselt, weil das ganze Gerät verschlüsselt wird. Ein Beispiel finden Sie im Abschnitt @ref{Preparing for Installation,,Disk Partitioning}." #. type: Plain text -#: doc/guix.texi:10956 +#: doc/guix.texi:10954 msgid "A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows:" msgstr "Ein RAID-Gerät als Verbund der Partitionen @file{/dev/sda1} und @file{/dev/sdb1} kann wie folgt deklariert werden:" #. type: example -#: doc/guix.texi:10962 +#: doc/guix.texi:10960 #, no-wrap msgid "" "(mapped-device\n" @@ -19668,35 +19679,35 @@ msgstr "" " (type raid-device-mapping))\n" #. type: Plain text -#: doc/guix.texi:10969 +#: doc/guix.texi:10967 msgid "The @file{/dev/md0} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems}). Note that the RAID level need not be given; it is chosen during the initial creation and formatting of the RAID device and is determined automatically later." msgstr "Das Gerät @file{/dev/md0} kann als @code{device} in einer @code{file-system}-Deklaration dienen (siehe @ref{File Systems}). Beachten Sie, dass das RAID-Level dabei nicht angegeben werden muss; es wird während der initialen Erstellung und Formatierung des RAID-Geräts festgelegt und später automatisch bestimmt." #. type: cindex -#: doc/guix.texi:10974 +#: doc/guix.texi:10972 #, no-wrap msgid "users" msgstr "Benutzer" #. type: cindex -#: doc/guix.texi:10975 +#: doc/guix.texi:10973 #, no-wrap msgid "accounts" msgstr "Konten" #. type: cindex -#: doc/guix.texi:10976 +#: doc/guix.texi:10974 #, no-wrap msgid "user accounts" msgstr "Benutzerkonten" #. type: Plain text -#: doc/guix.texi:10980 +#: doc/guix.texi:10978 msgid "User accounts and groups are entirely managed through the @code{operating-system} declaration. They are specified with the @code{user-account} and @code{user-group} forms:" msgstr "Benutzerkonten und Gruppen werden allein durch die @code{operating-system}-Deklaration des Betriebssystems verwaltet. Sie werden mit den @code{user-account}- und @code{user-group}-Formen angegeben:" #. type: example -#: doc/guix.texi:10991 +#: doc/guix.texi:10989 #, no-wrap msgid "" "(user-account\n" @@ -19720,149 +19731,149 @@ msgstr "" " (home-directory \"/home/alice\"))\n" #. type: Plain text -#: doc/guix.texi:11000 +#: doc/guix.texi:10998 msgid "When booting or upon completion of @command{guix system reconfigure}, the system ensures that only the user accounts and groups specified in the @code{operating-system} declaration exist, and with the specified properties. Thus, account or group creations or modifications made by directly invoking commands such as @command{useradd} are lost upon reconfiguration or reboot. This ensures that the system remains exactly as declared." msgstr "Beim Hochfahren oder nach Abschluss von @command{guix system reconfigure} stellt das System sicher, dass nur die in der @code{operating-system}-Deklaration angegebenen Benutzerkonten und Gruppen existieren, mit genau den angegebenen Eigenschaften. Daher gehen durch direkten Aufruf von Befehlen wie @command{useradd} erwirkte Erstellungen oder Modifikationen von Konten oder Gruppen verloren, sobald rekonfiguriert oder neugestartet wird. So wird sichergestellt, dass das System genau so funktioniert, wie es deklariert wurde." #. type: deftp -#: doc/guix.texi:11001 +#: doc/guix.texi:10999 #, no-wrap msgid "{Data Type} user-account" msgstr "{Datentyp} user-account" #. type: deftp -#: doc/guix.texi:11004 +#: doc/guix.texi:11002 msgid "Objects of this type represent user accounts. The following members may be specified:" msgstr "Objekte dieses Typs repräsentieren Benutzerkonten. Darin können folgende Komponenten aufgeführt werden:" #. type: table -#: doc/guix.texi:11008 +#: doc/guix.texi:11006 msgid "The name of the user account." msgstr "Der Name des Benutzerkontos." #. type: itemx -#: doc/guix.texi:11009 doc/guix.texi:23814 +#: doc/guix.texi:11007 doc/guix.texi:23811 #, no-wrap msgid "group" msgstr "group" #. type: cindex -#: doc/guix.texi:11010 doc/guix.texi:11077 +#: doc/guix.texi:11008 doc/guix.texi:11075 #, no-wrap msgid "groups" msgstr "Gruppen" #. type: table -#: doc/guix.texi:11013 +#: doc/guix.texi:11011 msgid "This is the name (a string) or identifier (a number) of the user group this account belongs to." msgstr "Dies ist der Name (als Zeichenkette) oder die Bezeichnung (als Zahl) der Benutzergruppe, zu der dieses Konto gehört." #. type: item -#: doc/guix.texi:11014 +#: doc/guix.texi:11012 #, no-wrap msgid "@code{supplementary-groups} (default: @code{'()})" msgstr "@code{supplementary-groups} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:11017 +#: doc/guix.texi:11015 msgid "Optionally, this can be defined as a list of group names that this account belongs to." msgstr "Dies kann optional als Liste von Gruppennamen angegeben werden, zu denen dieses Konto auch gehört." #. type: item -#: doc/guix.texi:11018 +#: doc/guix.texi:11016 #, no-wrap msgid "@code{uid} (default: @code{#f})" msgstr "@code{uid} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11022 +#: doc/guix.texi:11020 msgid "This is the user ID for this account (a number), or @code{#f}. In the latter case, a number is automatically chosen by the system when the account is created." msgstr "Dies ist entweder der Benutzeridentifikator dieses Kontos (seine „User ID“) als Zahl oder @code{#f}. Bei Letzterem wird vom System automatisch eine Zahl gewählt, wenn das Benutzerkonto erstellt wird." #. type: item -#: doc/guix.texi:11023 +#: doc/guix.texi:11021 #, no-wrap msgid "@code{comment} (default: @code{\"\"})" msgstr "@code{comment} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:11025 +#: doc/guix.texi:11023 msgid "A comment about the account, such as the account owner's full name." msgstr "Ein Kommentar zu dem Konto, wie etwa der vollständige Name des Kontoinhabers." #. type: code{#1} -#: doc/guix.texi:11026 +#: doc/guix.texi:11024 #, no-wrap msgid "home-directory" msgstr "home-directory" #. type: table -#: doc/guix.texi:11028 +#: doc/guix.texi:11026 msgid "This is the name of the home directory for the account." msgstr "Der Name des Persönlichen Verzeichnisses („Home“-Verzeichnis) für dieses Konto." #. type: item -#: doc/guix.texi:11029 +#: doc/guix.texi:11027 #, no-wrap msgid "@code{create-home-directory?} (default: @code{#t})" msgstr "@code{create-home-directory?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11032 +#: doc/guix.texi:11030 msgid "Indicates whether the home directory of this account should be created if it does not exist yet." msgstr "Zeigt an, ob das Persönliche Verzeichnis für das Konto automatisch erstellt werden soll, falls es noch nicht existiert." #. type: item -#: doc/guix.texi:11033 +#: doc/guix.texi:11031 #, no-wrap msgid "@code{shell} (default: Bash)" msgstr "@code{shell} (Vorgabe: Bash)" #. type: table -#: doc/guix.texi:11036 +#: doc/guix.texi:11034 msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions})." msgstr "Ein G-Ausdruck, der den Dateinamen des Programms angibt, das dem Benutzer als Shell dienen soll (siehe @ref{G-Expressions})." #. type: item -#: doc/guix.texi:11037 doc/guix.texi:11095 +#: doc/guix.texi:11035 doc/guix.texi:11093 #, no-wrap msgid "@code{system?} (default: @code{#f})" msgstr "@code{system?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11041 +#: doc/guix.texi:11039 msgid "This Boolean value indicates whether the account is a ``system'' account. System accounts are sometimes treated specially; for instance, graphical login managers do not list them." msgstr "Dieser boolesche Wert zeigt an, ob das Konto ein „System“-Benutzerkonto ist. Systemkonten werden manchmal anders behandelt, zum Beispiel werden sie auf grafischen Anmeldebildschirmen nicht aufgeführt." #. type: anchor{#1} -#: doc/guix.texi:11043 +#: doc/guix.texi:11041 msgid "user-account-password" msgstr "user-account-password" #. type: cindex -#: doc/guix.texi:11043 +#: doc/guix.texi:11041 #, no-wrap msgid "password, for user accounts" msgstr "Passwort, für Benutzerkonten" #. type: item -#: doc/guix.texi:11044 doc/guix.texi:11099 +#: doc/guix.texi:11042 doc/guix.texi:11097 #, no-wrap msgid "@code{password} (default: @code{#f})" msgstr "@code{password} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11050 +#: doc/guix.texi:11048 msgid "You would normally leave this field to @code{#f}, initialize user passwords as @code{root} with the @command{passwd} command, and then let users change it with @command{passwd}. Passwords set with @command{passwd} are of course preserved across reboot and reconfiguration." msgstr "Normalerweise lassen Sie dieses Feld auf @code{#f} und initialisieren Benutzerpasswörter als @code{root} mit dem @command{passwd}-Befehl. Die Benutzer lässt man ihr eigenes Passwort dann mit @command{passwd} ändern. Mit @command{passwd} festgelegte Passwörter bleiben natürlich beim Neustarten und beim Rekonfigurieren erhalten." #. type: table -#: doc/guix.texi:11054 +#: doc/guix.texi:11052 msgid "If you @emph{do} want to set an initial password for an account, then this field must contain the encrypted password, as a string. You can use the @code{crypt} procedure for this purpose:" msgstr "Wenn Sie aber @emph{doch} ein anfängliches Passwort für ein Konto voreinstellen möchten, muss dieses Feld hier das verschlüsselte Passwort als Zeichenkette enthalten. Sie können dazu die Prozedur @code{crypt} benutzen." #. type: example -#: doc/guix.texi:11059 +#: doc/guix.texi:11057 #, no-wrap msgid "" "(user-account\n" @@ -19876,7 +19887,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11062 +#: doc/guix.texi:11060 #, no-wrap msgid "" " ;; Specify a SHA-512-hashed initial password.\n" @@ -19886,150 +19897,150 @@ msgstr "" " (password (crypt \"InitialPassword!\" \"$6$abc\")))\n" #. type: quotation -#: doc/guix.texi:11068 +#: doc/guix.texi:11066 msgid "The hash of this initial password will be available in a file in @file{/gnu/store}, readable by all the users, so this method must be used with care." msgstr "Der Hash dieses initialen Passworts wird in einer Datei im @file{/gnu/store} abgelegt, auf die alle Benutzer Lesezugriff haben, daher ist Vorsicht geboten, wenn Sie diese Methode verwenden." #. type: table -#: doc/guix.texi:11073 +#: doc/guix.texi:11071 msgid "@xref{Passphrase Storage,,, libc, The GNU C Library Reference Manual}, for more information on password encryption, and @ref{Encryption,,, guile, GNU Guile Reference Manual}, for information on Guile's @code{crypt} procedure." msgstr "Siehe @ref{Passphrase Storage,,, libc, The GNU C Library Reference Manual} für weitere Informationen über Passwortverschlüsselung und @ref{Encryption,,, guile, GNU Guile Reference Manual} für Informationen über die Prozedur @code{crypt} in Guile." #. type: Plain text -#: doc/guix.texi:11079 +#: doc/guix.texi:11077 msgid "User group declarations are even simpler:" msgstr "Benutzergruppen-Deklarationen sind noch einfacher aufgebaut:" #. type: example -#: doc/guix.texi:11082 +#: doc/guix.texi:11080 #, no-wrap msgid "(user-group (name \"students\"))\n" msgstr "(user-group (name \"students\"))\n" #. type: deftp -#: doc/guix.texi:11084 +#: doc/guix.texi:11082 #, no-wrap msgid "{Data Type} user-group" msgstr "{Datentyp} user-group" #. type: deftp -#: doc/guix.texi:11086 +#: doc/guix.texi:11084 msgid "This type is for, well, user groups. There are just a few fields:" msgstr "Dieser Typ gibt, nun ja, eine Benutzergruppe an. Es gibt darin nur ein paar Felder:" #. type: table -#: doc/guix.texi:11090 +#: doc/guix.texi:11088 msgid "The name of the group." msgstr "Der Name der Gruppe." #. type: item -#: doc/guix.texi:11091 +#: doc/guix.texi:11089 #, no-wrap msgid "@code{id} (default: @code{#f})" msgstr "@code{id} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11094 +#: doc/guix.texi:11092 msgid "The group identifier (a number). If @code{#f}, a new number is automatically allocated when the group is created." msgstr "Der Gruppenbezeichner (eine Zahl). Wird er als @code{#f} angegeben, wird automatisch eine neue Zahl reserviert, wenn die Gruppe erstellt wird." #. type: table -#: doc/guix.texi:11098 +#: doc/guix.texi:11096 msgid "This Boolean value indicates whether the group is a ``system'' group. System groups have low numerical IDs." msgstr "Dieser boolesche Wert gibt an, ob es sich um eine „System“-Gruppe handelt. Systemgruppen sind solche mit einer kleinen Zahl als Bezeichner." #. type: table -#: doc/guix.texi:11102 +#: doc/guix.texi:11100 msgid "What, user groups can have a password? Well, apparently yes. Unless @code{#f}, this field specifies the password of the group." msgstr "Wie, Benutzergruppen können ein Passwort haben? Nun ja, anscheinend schon. Wenn es nicht auf @code{#f} steht, gibt dieses Feld das Passwort der Gruppe an." #. type: Plain text -#: doc/guix.texi:11108 +#: doc/guix.texi:11106 msgid "For convenience, a variable lists all the basic user groups one may expect:" msgstr "Um Ihnen das Leben zu erleichtern, gibt es eine Variable, worin alle grundlegenden Benutzergruppen aufgeführt sind, die man erwarten könnte:" #. type: defvr -#: doc/guix.texi:11109 +#: doc/guix.texi:11107 #, no-wrap msgid "{Scheme Variable} %base-groups" msgstr "{Scheme-Variable} %base-groups" #. type: defvr -#: doc/guix.texi:11114 +#: doc/guix.texi:11112 msgid "This is the list of basic user groups that users and/or packages expect to be present on the system. This includes groups such as ``root'', ``wheel'', and ``users'', as well as groups used to control access to specific devices such as ``audio'', ``disk'', and ``cdrom''." msgstr "Die Liste von Basis-Benutzergruppen, von denen Benutzer und/oder Pakete erwarten könnten, dass sie auf dem System existieren. Dazu gehören Gruppen wie „root“, „wheel“ und „users“, sowie Gruppen, um den Zugriff auf bestimmte Geräte einzuschränken, wie „audio“, „disk“ und „cdrom“." #. type: defvr -#: doc/guix.texi:11116 +#: doc/guix.texi:11114 #, no-wrap msgid "{Scheme Variable} %base-user-accounts" msgstr "{Scheme-Variable} %base-user-accounts" #. type: defvr -#: doc/guix.texi:11119 +#: doc/guix.texi:11117 msgid "This is the list of basic system accounts that programs may expect to find on a GNU/Linux system, such as the ``nobody'' account." msgstr "Diese Liste enthält Basis-Systembenutzerkonten, von denen Programme erwarten können, dass sie auf einem GNU/Linux-System existieren, wie das Konto „nobody“." #. type: defvr -#: doc/guix.texi:11122 +#: doc/guix.texi:11120 msgid "Note that the ``root'' account is not included here. It is a special-case and is automatically added whether or not it is specified." msgstr "Beachten Sie, dass das Konto „root“ für den Administratornutzer nicht dazugehört. Es ist ein Sonderfall und wird automatisch erzeugt, egal ob es spezifiziert wurde oder nicht." #. type: cindex -#: doc/guix.texi:11128 +#: doc/guix.texi:11126 #, no-wrap msgid "keymap" msgstr "Keymap" #. type: Plain text -#: doc/guix.texi:11136 +#: doc/guix.texi:11134 msgid "To specify what each key of your keyboard does, you need to tell the operating system what @dfn{keyboard layout} you want to use. The default, when nothing is specified, is the US English QWERTY layout for 105-key PC keyboards. However, German speakers will usually prefer the German QWERTZ layout, French speakers will want the AZERTY layout, and so on; hackers might prefer Dvorak or bépo, and they might even want to further customize the effect of some of the keys. This section explains how to get that done." msgstr "Um anzugeben, was jede Taste auf Ihrer Tastatur tut, müssen Sie angeben, welche @dfn{Tastaturbelegung} das Betriebssystem benutzen soll. Wenn nichts angegeben wird, ist die „US English“-QWERTY-Tastaturbelegung für PC-Tastaturen mit 105 Tasten voreingestellt. Allerdings bevorzugen Deutsch sprechende Nutzer meistens die deutsche QWERTZ-Tastaturbelegung, Französisch sprechende haben lieber die AZERTY-Belegung und so weiter; Hacker wollen vielleicht Dvorak oder Bépo als Tastaturbelegung benutzen oder sogar eigene Anpassungen bei manchen Tasten vornehmen. Dieser Abschnitt erklärt, wie das geht." #. type: cindex -#: doc/guix.texi:11137 +#: doc/guix.texi:11135 #, no-wrap msgid "keyboard layout, definition" msgstr "Tastaturbelegung, Definition" #. type: Plain text -#: doc/guix.texi:11139 +#: doc/guix.texi:11137 msgid "There are three components that will want to know about your keyboard layout:" msgstr "Die Informationen über Ihre Tastaturbelegung werden an drei Stellen gebraucht:" #. type: itemize -#: doc/guix.texi:11146 +#: doc/guix.texi:11144 msgid "The @emph{bootloader} may want to know what keyboard layout you want to use (@pxref{Bootloader Configuration, @code{keyboard-layout}}). This is useful if you want, for instance, to make sure that you can type the passphrase of your encrypted root partition using the right layout." msgstr "Der @emph{Bootloader} muss auslesen können, welche Tastaturbelegung Sie benutzen möchten (siehe @ref{Bootloader Configuration, @code{keyboard-layout}}). Das ist praktisch, wenn Sie zum Beispiel die Passphrase Ihrer verschlüsselten Wurzelpartition mit der richtigen Tastaturbelegung eintippen wollen." #. type: itemize -#: doc/guix.texi:11151 +#: doc/guix.texi:11149 msgid "The @emph{operating system kernel}, Linux, will need that so that the console is properly configured (@pxref{operating-system Reference, @code{keyboard-layout}})." msgstr "Der @emph{Kernel des Betriebssystems}, Linux, braucht die Information, damit die Konsole richtig eingestellt ist (siehe @ref{operating-system Reference, @code{keyboard-layout}})." #. type: itemize -#: doc/guix.texi:11155 +#: doc/guix.texi:11153 msgid "The @emph{graphical display server}, usually Xorg, also has its own idea of the keyboard layout (@pxref{X Window, @code{keyboard-layout}})." msgstr "Der @emph{grafische Anzeigeserver}, meistens ist das Xorg, hat auch seine eigene Konfiguration der Tastaturbelegung (siehe @ref{X Window, @code{keyboard-layout}})." #. type: Plain text -#: doc/guix.texi:11159 +#: doc/guix.texi:11157 msgid "Guix allows you to configure all three separately but, fortunately, it allows you to share the same keyboard layout for all three components." msgstr "Mit Guix können Sie alle drei Komponenten separat konfigurieren, aber zum Glück können Sie damit auch dieselbe Konfiguration der Tastaturbelegung für alle drei benutzen." #. type: cindex -#: doc/guix.texi:11160 +#: doc/guix.texi:11158 #, no-wrap msgid "XKB, keyboard layouts" msgstr "XKB, Tastaturbelegungen" #. type: Plain text -#: doc/guix.texi:11168 +#: doc/guix.texi:11166 msgid "Keyboard layouts are represented by records created by the @code{keyboard-layout} procedure of @code{(gnu system keyboard)}. Following the X Keyboard extension (XKB), each layout has four attributes: a name (often a language code such as ``fi'' for Finnish or ``jp'' for Japanese), an optional variant name, an optional keyboard model name, and a possibly empty list of additional options. In most cases the layout name is all you care about. Here are a few example:" msgstr "Tastaturbelegungen werden durch Verbundsobjekte repräsentiert, die mit der Prozedur @code{keyboard-layout} aus dem Modul @code{(gnu system keyboard)} angelegt werden. Entsprechend der „X-Keyboard“-Erweiterung (XKB) verfügt jede Tastaturbelegung über vier Attribute: einen Namen (oft ist das ein Sprachkürzel wie „fi“ für Finnisch oder „jp“ für Japanisch), ein optionaler Variantenname, ein optionaler Tastaturmodellname und eine möglicherweise leere Liste zusätzlicher Optionen. In den meisten Fällen interessiert Sie nur der Name der Tastaturbelegung. Hier sind ein paar Beispiele:" #. type: example -#: doc/guix.texi:11173 +#: doc/guix.texi:11171 #, no-wrap msgid "" ";; The German QWERTZ layout. Here we assume a standard\n" @@ -20043,7 +20054,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11176 +#: doc/guix.texi:11174 #, no-wrap msgid "" ";; The bépo variant of the French layout.\n" @@ -20055,7 +20066,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11179 +#: doc/guix.texi:11177 #, no-wrap msgid "" ";; The Catalan layout.\n" @@ -20067,7 +20078,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11186 +#: doc/guix.texi:11184 #, no-wrap msgid "" ";; The Latin American Spanish layout. In addition, the\n" @@ -20088,7 +20099,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11189 +#: doc/guix.texi:11187 #, no-wrap msgid "" ";; The Russian layout for a ThinkPad keyboard.\n" @@ -20100,7 +20111,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11194 +#: doc/guix.texi:11192 #, no-wrap msgid "" ";; The \"US international\" layout, which is the US layout plus\n" @@ -20114,29 +20125,29 @@ msgstr "" "(keyboard-layout \"us\" \"intl\" #:model \"macbook78\")\n" #. type: Plain text -#: doc/guix.texi:11198 +#: doc/guix.texi:11196 msgid "See the @file{share/X11/xkb} directory of the @code{xkeyboard-config} package for a complete list of supported layouts, variants, and models." msgstr "Im Verzeichnis @file{share/X11/xkb} des @code{xkeyboard-config}-Pakets finden Sie eine vollständige Liste der unterstützten Tastaturbelegungen, Varianten und Modelle." #. type: cindex -#: doc/guix.texi:11199 +#: doc/guix.texi:11197 #, no-wrap msgid "keyboard layout, configuration" msgstr "Tastaturbelegung, Konfiguration" #. type: Plain text -#: doc/guix.texi:11203 +#: doc/guix.texi:11201 msgid "Let's say you want your system to use the Turkish keyboard layout throughout your system---bootloader, console, and Xorg. Here's what your system configuration would look like:" msgstr "Sagen wir, Sie würden gerne die türkische Tastaturbelegung für Ihr gesamtes System — Bootloader, Konsole und Xorg — verwenden. Dann würde Ihre Systemkonfiguration so aussehen:" #. type: findex -#: doc/guix.texi:11204 +#: doc/guix.texi:11202 #, no-wrap msgid "set-xorg-configuration" msgstr "set-xorg-configuration" #. type: lisp -#: doc/guix.texi:11208 +#: doc/guix.texi:11206 #, no-wrap msgid "" ";; Using the Turkish layout for the bootloader, the console,\n" @@ -20148,7 +20159,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:11220 +#: doc/guix.texi:11218 #, no-wrap msgid "" "(operating-system\n" @@ -20176,76 +20187,76 @@ msgstr "" " %desktop-services)))\n" #. type: Plain text -#: doc/guix.texi:11227 +#: doc/guix.texi:11225 msgid "In the example above, for GRUB and for Xorg, we just refer to the @code{keyboard-layout} field defined above, but we could just as well refer to a different layout. The @code{set-xorg-configuration} procedure communicates the desired Xorg configuration to the graphical log-in manager, by default GDM." msgstr "Im obigen Beispiel beziehen wir uns für GRUB und Xorg einfach auf das @code{keyboard-layout}-Feld, was wir darüber definiert haben, wir könnten aber auch eine andere Tastaturbelegung angeben. Die Prozedur @code{set-xorg-configuration} kommuniziert an die grafische Anmeldeverwaltung (d.h.@: nach Vorgabe an GDM), welche Xorg-Konfiguration verwendet werden soll." #. type: Plain text -#: doc/guix.texi:11230 +#: doc/guix.texi:11228 msgid "We've discussed how to specify the @emph{default} keyboard layout of your system when it starts, but you can also adjust it at run time:" msgstr "Wir haben uns bisher damit auseinandergesetzt, wie die @emph{Voreinstellung} für die Tastaturbelegung ausgewählt werden kann, die das System annimmt, wenn es startet, aber zur Laufzeit kann sie geändert werden:" #. type: itemize -#: doc/guix.texi:11235 +#: doc/guix.texi:11233 msgid "If you're using GNOME, its settings panel has a ``Region & Language'' entry where you can select one or more keyboard layouts." msgstr "Wenn Sie GNOME benutzen, können Sie in den Einstellungen dazu einen Eintrag „Region und Sprache“ finden, in dem Sie eine oder mehrere Tastaturbelegungen auswählen können." #. type: itemize -#: doc/guix.texi:11240 +#: doc/guix.texi:11238 msgid "Under Xorg, the @command{setxkbmap} command (from the same-named package) allows you to change the current layout. For example, this is how you would change the layout to US Dvorak:" msgstr "Unter Xorg können Sie den Befehl @command{setxkbmap} (aus dem gleichnamigen Paket) zum Anpassen der momentan aktiven Tastaturbelegung benutzen. Zum Beispiel würden Sie so die Belegung auf US Dvorak wechseln:" #. type: example -#: doc/guix.texi:11243 +#: doc/guix.texi:11241 #, no-wrap msgid "setxkbmap us dvorak\n" msgstr "setxkbmap us dvorak\n" #. type: itemize -#: doc/guix.texi:11250 +#: doc/guix.texi:11248 msgid "The @code{loadkeys} command changes the keyboard layout in effect in the Linux console. However, note that @code{loadkeys} does @emph{not} use the XKB keyboard layout categorization described above. The command below loads the French bépo layout:" msgstr "Mit dem Befehl @code{loadkeys} ändern Sie die für die Linux-Konsole geltende Tastaturbelegung. Allerdings ist zu beachten, dass @code{loadkeys} @emph{nicht} die Kategorisierung der Tastaturbelegungen von XKB benutzt. Der Befehl, um die französische Bépo-Belegung zu laden, wäre folgender:" #. type: example -#: doc/guix.texi:11253 +#: doc/guix.texi:11251 #, no-wrap msgid "loadkeys fr-bepo\n" msgstr "loadkeys fr-bepo\n" #. type: cindex -#: doc/guix.texi:11259 +#: doc/guix.texi:11257 #, no-wrap msgid "locale" msgstr "Locale" #. type: Plain text -#: doc/guix.texi:11266 +#: doc/guix.texi:11264 msgid "A @dfn{locale} defines cultural conventions for a particular language and region of the world (@pxref{Locales,,, libc, The GNU C Library Reference Manual}). Each locale has a name that typically has the form @code{@var{language}_@var{territory}.@var{codeset}}---e.g., @code{fr_LU.utf8} designates the locale for the French language, with cultural conventions from Luxembourg, and using the UTF-8 encoding." msgstr "Eine @dfn{Locale} legt die kulturellen Konventionen einer bestimmten Sprache und Region auf der Welt fest (siehe @ref{Locales,,, libc, The GNU C Library Reference Manual}). Jede Locale hat einen Namen, der typischerweise von der Form @code{@var{Sprache}_@var{Gebiet}.@var{Kodierung}} — z.B.@: benennt @code{fr_LU.utf8} die Locale für französische Sprache mit den kulturellen Konventionen aus Luxemburg unter Verwendung der UTF-8-Kodierung." #. type: cindex -#: doc/guix.texi:11267 +#: doc/guix.texi:11265 #, no-wrap msgid "locale definition" msgstr "Locale-Definition" #. type: Plain text -#: doc/guix.texi:11271 +#: doc/guix.texi:11269 msgid "Usually, you will want to specify the default locale for the machine using the @code{locale} field of the @code{operating-system} declaration (@pxref{operating-system Reference, @code{locale}})." msgstr "Normalerweise werden Sie eine standardmäßig zu verwendende Locale für die Maschine vorgeben wollen, indem Sie das @code{locale}-Feld der @code{operating-system}-Deklaration verwenden (siehe @ref{operating-system Reference, @code{locale}})." #. type: Plain text -#: doc/guix.texi:11280 +#: doc/guix.texi:11278 msgid "The selected locale is automatically added to the @dfn{locale definitions} known to the system if needed, with its codeset inferred from its name---e.g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} codeset. Additional locale definitions can be specified in the @code{locale-definitions} slot of @code{operating-system}---this is useful, for instance, if the codeset could not be inferred from the locale name. The default set of locale definitions includes some widely used locales, but not all the available locales, in order to save space." msgstr "Die ausgewählte Locale wird automatisch zu den dem System bekannten @dfn{Locale-Definitionen} hinzugefügt, falls nötig, und ihre Kodierung wird aus dem Namen hergeleitet — z.B.@: wird angenommen, dass @code{bo_CN.utf8} als Kodierung @code{UTF-8} verwendet. Zusätzliche Locale-Definitionen können im Feld @code{locale-definitions} vom @code{operating-system} festgelegt werden — das ist zum Beispiel dann nützlich, wenn die Kodierung nicht aus dem Locale-Namen hergeleitet werden konnte. Die vorgegebene Menge an Locale-Definitionen enthält manche weit verbreiteten Locales, aber um Platz zu sparen, nicht alle verfügbaren Locales." #. type: Plain text -#: doc/guix.texi:11283 +#: doc/guix.texi:11281 msgid "For instance, to add the North Frisian locale for Germany, the value of that field may be:" msgstr "Um zum Beispiel die nordfriesische Locale für Deutschland hinzuzufügen, könnte der Wert des Feldes wie folgt aussehen:" #. type: example -#: doc/guix.texi:11288 +#: doc/guix.texi:11286 #, no-wrap msgid "" "(cons (locale-definition\n" @@ -20257,12 +20268,12 @@ msgstr "" " %default-locale-definitions)\n" #. type: Plain text -#: doc/guix.texi:11292 +#: doc/guix.texi:11290 msgid "Likewise, to save space, one might want @code{locale-definitions} to list only the locales that are actually used, as in:" msgstr "Um Platz zu sparen, könnte man auch wollen, dass @code{locale-definitions} nur die tatsächlich benutzen Locales aufführt, wie etwa:" #. type: example -#: doc/guix.texi:11297 +#: doc/guix.texi:11295 #, no-wrap msgid "" "(list (locale-definition\n" @@ -20274,114 +20285,114 @@ msgstr "" " (charset \"EUC-JP\")))\n" #. type: Plain text -#: doc/guix.texi:11306 +#: doc/guix.texi:11304 msgid "The compiled locale definitions are available at @file{/run/current-system/locale/X.Y}, where @code{X.Y} is the libc version, which is the default location where the GNU@tie{}libc provided by Guix looks for locale data. This can be overridden using the @code{LOCPATH} environment variable (@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})." msgstr "Die kompilierten Locale-Definitionen sind unter @file{/run/current-system/locale/X.Y} verfügbar, wobei @code{X.Y} die Version von libc bezeichnet. Dies entspricht dem Pfad, an dem eine von Guix ausgelieferte GNU@tie{}libc standardmäßig nach Locale-Daten sucht. Er kann überschrieben werden durch die Umgebungsvariable @code{LOCPATH} (siehe @ref{locales-and-locpath, @code{LOCPATH} und Locale-Pakete})." #. type: Plain text -#: doc/guix.texi:11309 +#: doc/guix.texi:11307 msgid "The @code{locale-definition} form is provided by the @code{(gnu system locale)} module. Details are given below." msgstr "Die @code{locale-definition}-Form wird vom Modul @code{(gnu system locale)} zur Verfügung gestellt. Details folgen unten." #. type: deftp -#: doc/guix.texi:11310 +#: doc/guix.texi:11308 #, no-wrap msgid "{Data Type} locale-definition" msgstr "{Datentyp} locale-definition" #. type: deftp -#: doc/guix.texi:11312 +#: doc/guix.texi:11310 msgid "This is the data type of a locale definition." msgstr "Dies ist der Datentyp einer Locale-Definition." #. type: table -#: doc/guix.texi:11318 +#: doc/guix.texi:11316 msgid "The name of the locale. @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, for more information on locale names." msgstr "Der Name der Locale. Siehe @ref{Locale Names,,, libc, The GNU C Library Reference Manual} für mehr Informationen zu Locale-Namen." #. type: table -#: doc/guix.texi:11322 +#: doc/guix.texi:11320 msgid "The name of the source for that locale. This is typically the @code{@var{language}_@var{territory}} part of the locale name." msgstr "Der Name der Quelle der Locale. Typischerweise ist das der Teil @code{@var{Sprache}_@var{Gebiet}} des Locale-Namens." #. type: item -#: doc/guix.texi:11323 +#: doc/guix.texi:11321 #, no-wrap msgid "@code{charset} (default: @code{\"UTF-8\"})" msgstr "@code{charset} (Vorgabe: @code{\"UTF-8\"})" #. type: table -#: doc/guix.texi:11327 +#: doc/guix.texi:11325 msgid "The ``character set'' or ``code set'' for that locale, @uref{https://www.iana.org/assignments/character-sets, as defined by IANA}." msgstr "Der „Zeichensatz“ oder das „Code set“, d.h.@: die Kodierung dieser Locale, @uref{https://www.iana.org/assignments/character-sets, wie die IANA sie definiert}." #. type: defvr -#: doc/guix.texi:11331 +#: doc/guix.texi:11329 #, no-wrap msgid "{Scheme Variable} %default-locale-definitions" msgstr "{Scheme-Variable} %default-locale-definitions" #. type: defvr -#: doc/guix.texi:11335 +#: doc/guix.texi:11333 msgid "A list of commonly used UTF-8 locales, used as the default value of the @code{locale-definitions} field of @code{operating-system} declarations." msgstr "Eine Liste häufig benutzter UTF-8-Locales, die als Vorgabewert des @code{locale-definitions}-Feldes in @code{operating-system}-Deklarationen benutzt wird." #. type: cindex -#: doc/guix.texi:11336 +#: doc/guix.texi:11334 #, no-wrap msgid "locale name" msgstr "Locale-Name" #. type: cindex -#: doc/guix.texi:11337 +#: doc/guix.texi:11335 #, no-wrap msgid "normalized codeset in locale names" msgstr "Normalisiertes Codeset in Locale-Namen" #. type: defvr -#: doc/guix.texi:11343 +#: doc/guix.texi:11341 msgid "These locale definitions use the @dfn{normalized codeset} for the part that follows the dot in the name (@pxref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}). So for instance it has @code{uk_UA.utf8} but @emph{not}, say, @code{uk_UA.UTF-8}." msgstr "Diese Locale-Definitionen benutzen das @dfn{normalisierte Codeset} für den Teil des Namens, der nach dem Punkt steht (siehe @ref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}). Zum Beispiel ist @code{uk_UA.utf8} enthalten, dagegen ist etwa @code{uk_UA.UTF-8} darin @emph{nicht} enthalten." #. type: subsection -#: doc/guix.texi:11345 +#: doc/guix.texi:11343 #, no-wrap msgid "Locale Data Compatibility Considerations" msgstr "Kompatibilität der Locale-Daten" #. type: cindex -#: doc/guix.texi:11347 +#: doc/guix.texi:11345 #, no-wrap msgid "incompatibility, of locale data" msgstr "Inkompatibilität, von Locale-Daten" #. type: Plain text -#: doc/guix.texi:11354 +#: doc/guix.texi:11352 msgid "@code{operating-system} declarations provide a @code{locale-libcs} field to specify the GNU@tie{}libc packages that are used to compile locale declarations (@pxref{operating-system Reference}). ``Why would I care?'', you may ask. Well, it turns out that the binary format of locale data is occasionally incompatible from one libc version to another." msgstr "@code{operating-system}-Deklarationen verfügen über ein @code{locale-libcs}-Feld, um die GNU@tie{}libc-Pakete anzugeben, die zum Kompilieren von Locale-Deklarationen verwendet werden sollen (siehe @ref{operating-system Reference}). „Was interessiert mich das?“, könnten Sie fragen. Naja, leider ist das binäre Format der Locale-Daten von einer libc-Version auf die nächste manchmal nicht miteinander kompatibel." #. type: Plain text -#: doc/guix.texi:11366 +#: doc/guix.texi:11364 msgid "For instance, a program linked against libc version 2.21 is unable to read locale data produced with libc 2.22; worse, that program @emph{aborts} instead of simply ignoring the incompatible locale data@footnote{Versions 2.23 and later of GNU@tie{}libc will simply skip the incompatible locale data, which is already an improvement.}. Similarly, a program linked against libc 2.22 can read most, but not all, of the locale data from libc 2.21 (specifically, @code{LC_COLLATE} data is incompatible); thus calls to @code{setlocale} may fail, but programs will not abort." msgstr "Zum Beispiel kann ein mit der libc-Version 2.21 gebundenes Programm keine mit libc 2.22 erzeugten Locale-Daten lesen; schlimmer noch, das Programm @emph{terminiert} statt einfach die inkompatiblen Locale-Daten zu ignorieren@footnote{Versionen 2.23 von GNU@tie{}libc und neuere werden inkompatible Locale-Daten nur mehr überspringen, was schon einmal eine Verbesserung ist.}. Ähnlich kann ein gegen libc 2.22 gebundenes Programm die meisten, aber nicht alle, Locale-Daten von libc 2.21 lesen (Daten zu @code{LC_COLLATE} sind aber zum Beispiel inkompatibel); somit schlagen Aufrufe von @code{setlocale} vielleicht fehl, aber das Programm läuft weiter." #. type: Plain text -#: doc/guix.texi:11371 +#: doc/guix.texi:11369 msgid "The ``problem'' with Guix is that users have a lot of freedom: They can choose whether and when to upgrade software in their profiles, and might be using a libc version different from the one the system administrator used to build the system-wide locale data." msgstr "Das „Problem“ mit Guix ist, dass Nutzer viel Freiheit genießen: Sie können wählen, ob und wann sie die Software in ihren Profilen aktualisieren und benutzen vielleicht eine andere libc-Version als sie der Systemadministrator benutzt hat, um die systemweiten Locale-Daten zu erstellen." #. type: Plain text -#: doc/guix.texi:11375 +#: doc/guix.texi:11373 msgid "Fortunately, unprivileged users can also install their own locale data and define @var{GUIX_LOCPATH} accordingly (@pxref{locales-and-locpath, @code{GUIX_LOCPATH} and locale packages})." msgstr "Glücklicherweise können „unprivilegierte“ Nutzer ohne zusätzliche Berechtigungen dann zumindest ihre eigenen Locale-Daten installieren und @var{GUIX_LOCPATH} entsprechend definieren (siehe @ref{locales-and-locpath, @code{GUIX_LOCPATH} und Locale-Pakete})." #. type: Plain text -#: doc/guix.texi:11382 +#: doc/guix.texi:11380 msgid "Still, it is best if the system-wide locale data at @file{/run/current-system/locale} is built for all the libc versions actually in use on the system, so that all the programs can access it---this is especially crucial on a multi-user system. To do that, the administrator can specify several libc packages in the @code{locale-libcs} field of @code{operating-system}:" msgstr "Trotzdem ist es am besten, wenn die systemweiten Locale-Daten unter @file{/run/current-system/locale} für alle libc-Versionen erstellt werden, die auf dem System noch benutzt werden, damit alle Programme auf sie zugreifen können — was auf einem Mehrbenutzersystem ganz besonders wichtig ist. Dazu kann der Administrator des Systems mehrere libc-Pakete im @code{locale-libcs}-Feld vom @code{operating-system} angeben:" #. type: example -#: doc/guix.texi:11385 +#: doc/guix.texi:11383 #, no-wrap msgid "" "(use-package-modules base)\n" @@ -20391,7 +20402,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11389 +#: doc/guix.texi:11387 #, no-wrap msgid "" "(operating-system\n" @@ -20403,39 +20414,39 @@ msgstr "" " (locale-libcs (list glibc-2.21 (canonical-package glibc))))\n" #. type: Plain text -#: doc/guix.texi:11394 +#: doc/guix.texi:11392 msgid "This example would lead to a system containing locale definitions for both libc 2.21 and the current version of libc in @file{/run/current-system/locale}." msgstr "Mit diesem Beispiel ergäbe sich ein System, was Locale-Definitionen sowohl für libc 2.21 als auch die aktuelle Version von libc in @file{/run/current-system/locale} hat." #. type: cindex -#: doc/guix.texi:11399 +#: doc/guix.texi:11397 #, no-wrap msgid "system services" msgstr "Systemdienste" #. type: Plain text -#: doc/guix.texi:11405 +#: doc/guix.texi:11403 msgid "An important part of preparing an @code{operating-system} declaration is listing @dfn{system services} and their configuration (@pxref{Using the Configuration System}). System services are typically daemons launched when the system boots, or other actions needed at that time---e.g., configuring network access." msgstr "Ein wichtiger Bestandteil des Schreibens einer @code{operating-system}-Deklaration ist das Auflisten der @dfn{Systemdienste} und ihrer Konfiguration (siehe @ref{Using the Configuration System}). Systemdienste sind typischerweise im Hintergrund laufende Daemon-Programme, die beim Hochfahren des Systems gestartet werden, oder andere Aktionen, die zu dieser Zeit durchgeführt werden müssen — wie das Konfigurieren des Netzwerkzugangs." #. type: Plain text -#: doc/guix.texi:11412 +#: doc/guix.texi:11410 msgid "Guix has a broad definition of ``service'' (@pxref{Service Composition}), but many services are managed by the GNU@tie{}Shepherd (@pxref{Shepherd Services}). On a running system, the @command{herd} command allows you to list the available services, show their status, start and stop them, or do other specific operations (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}). For example:" msgstr "Guix hat eine weit gefasste Definition, was ein „Dienst“ ist (siehe @ref{Service Composition}), aber viele Dienste sind solche, die von GNU@tie{}Shepherd verwaltet werden (siehe @ref{Shepherd Services}). Auf einem laufenden System kann der @command{herd}-Befehl benutzt werden, um verfügbare Dienste aufzulisten, ihren Status anzuzeigen, sie zu starten und zu stoppen oder andere angebotene Operationen durchzuführen (siehe @ref{Jump Start,,, shepherd, The GNU Shepherd Manual}). Zum Beispiel:" #. type: example -#: doc/guix.texi:11415 +#: doc/guix.texi:11413 #, no-wrap msgid "# herd status\n" msgstr "# herd status\n" #. type: Plain text -#: doc/guix.texi:11420 +#: doc/guix.texi:11418 msgid "The above command, run as @code{root}, lists the currently defined services. The @command{herd doc} command shows a synopsis of the given service and its associated actions:" msgstr "Dieser Befehl, durchgeführt als @code{root}, listet die momentan definierten Dienste auf. Der Befehl @command{herd doc} fasst kurz zusammen, was ein gegebener Dienst ist und welche Aktionen mit ihm assoziiert sind:" #. type: example -#: doc/guix.texi:11424 +#: doc/guix.texi:11422 #, no-wrap msgid "" "# herd doc nscd\n" @@ -20447,7 +20458,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:11427 +#: doc/guix.texi:11425 #, no-wrap msgid "" "# herd doc nscd action invalidate\n" @@ -20457,12 +20468,12 @@ msgstr "" "invalidate: Invalidate the given cache--e.g., 'hosts' for host name lookups.\n" #. type: Plain text -#: doc/guix.texi:11432 +#: doc/guix.texi:11430 msgid "The @command{start}, @command{stop}, and @command{restart} sub-commands have the effect you would expect. For instance, the commands below stop the nscd service and restart the Xorg display server:" msgstr "Die Unterbefehle @command{start}, @command{stop} und @command{restart} haben die Wirkung, die man erwarten würde. Zum Beispiel kann mit folgenden Befehlen der nscd-Dienst angehalten und der Xorg-Anzeigeserver neu gestartet werden:" #. type: example -#: doc/guix.texi:11439 +#: doc/guix.texi:11437 #, no-wrap msgid "" "# herd stop nscd\n" @@ -20478,44 +20489,44 @@ msgstr "" "Service xorg-server has been started.\n" #. type: Plain text -#: doc/guix.texi:11444 +#: doc/guix.texi:11442 msgid "The following sections document the available services, starting with the core services, that may be used in an @code{operating-system} declaration." msgstr "Die folgenden Abschnitte dokumentieren die verfügbaren Dienste, die in einer @code{operating-system}-Deklaration benutzt werden können, angefangen mit den Diensten im Kern des Systems („core services“)" #. type: subsection -#: doc/guix.texi:11473 doc/guix.texi:18087 doc/guix.texi:18088 +#: doc/guix.texi:11471 doc/guix.texi:18084 doc/guix.texi:18085 #, no-wrap msgid "LDAP Services" msgstr "LDAP-Dienste" #. type: menuentry -#: doc/guix.texi:11473 +#: doc/guix.texi:11471 msgid "LDAP services." msgstr "LDAP-Dienste." #. type: Plain text -#: doc/guix.texi:11481 +#: doc/guix.texi:11479 msgid "The @code{(gnu services base)} module provides definitions for the basic services that one expects from the system. The services exported by this module are listed below." msgstr "Das Modul @code{(gnu services base)} stellt Definitionen für Basis-Dienste zur Verfügung, von denen man erwartet, dass das System sie anbietet. Im Folgenden sind die von diesem Modul exportierten Dienste aufgeführt." #. type: defvr -#: doc/guix.texi:11482 +#: doc/guix.texi:11480 #, no-wrap msgid "{Scheme Variable} %base-services" msgstr "{Scheme-Variable} %base-services" #. type: defvr -#: doc/guix.texi:11488 +#: doc/guix.texi:11486 msgid "This variable contains a list of basic services (@pxref{Service Types and Services}, for more information on service objects) one would expect from the system: a login service (mingetty) on each tty, syslogd, the libc name service cache daemon (nscd), the udev device manager, and more." msgstr "Diese Variable enthält eine Liste von Basis-Diensten, die man auf einem System vorzufinden erwartet (siehe @ref{Service Types and Services} für weitere Informationen zu Dienstobjekten): ein Anmeldungsdienst (mingetty) auf jeder Konsole (jedem „tty“), syslogd, den Name Service Cache Daemon (nscd) von libc, die udev-Geräteverwaltung und weitere." #. type: defvr -#: doc/guix.texi:11493 +#: doc/guix.texi:11491 msgid "This is the default value of the @code{services} field of @code{operating-system} declarations. Usually, when customizing a system, you will want to append services to @var{%base-services}, like this:" msgstr "Dies ist der Vorgabewert für das @code{services}-Feld für die Dienste von @code{operating-system}-Deklarationen. Normalerweise werden Sie, wenn Sie ein Betriebssystem anpassen, Dienste an die @var{%base-services}-Liste anhängen, wie hier gezeigt:" #. type: example -#: doc/guix.texi:11498 +#: doc/guix.texi:11496 #, no-wrap msgid "" "(append (list (service avahi-service-type)\n" @@ -20527,58 +20538,58 @@ msgstr "" " %base-services)\n" #. type: defvr -#: doc/guix.texi:11501 +#: doc/guix.texi:11499 #, no-wrap msgid "{Scheme Variable} special-files-service-type" msgstr "{Scheme-Variable} special-files-service-type" #. type: defvr -#: doc/guix.texi:11504 +#: doc/guix.texi:11502 msgid "This is the service that sets up ``special files'' such as @file{/bin/sh}; an instance of it is part of @code{%base-services}." msgstr "Dieser Dienst richtet „besondere Dateien“ wie @file{/bin/sh} ein; eine Instanz des Dienstes ist Teil der @code{%base-services}." #. type: defvr -#: doc/guix.texi:11508 +#: doc/guix.texi:11506 msgid "The value associated with @code{special-files-service-type} services must be a list of tuples where the first element is the ``special file'' and the second element is its target. By default it is:" msgstr "Der mit @code{special-files-service-type}-Diensten assoziierte Wert muss eine Liste von Tupeln sein, deren erstes Element eine „besondere Datei“ und deren zweites Element deren Zielpfad ist. Der Vorgabewert ist:" #. type: file{#1} -#: doc/guix.texi:11509 +#: doc/guix.texi:11507 #, no-wrap msgid "/bin/sh" msgstr "/bin/sh" #. type: cindex -#: doc/guix.texi:11510 +#: doc/guix.texi:11508 #, no-wrap msgid "@file{sh}, in @file{/bin}" msgstr "@file{sh}, in @file{/bin}" #. type: example -#: doc/guix.texi:11513 +#: doc/guix.texi:11511 #, no-wrap msgid "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" msgstr "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" #. type: file{#1} -#: doc/guix.texi:11515 +#: doc/guix.texi:11513 #, no-wrap msgid "/usr/bin/env" msgstr "/usr/bin/env" #. type: cindex -#: doc/guix.texi:11516 +#: doc/guix.texi:11514 #, no-wrap msgid "@file{env}, in @file{/usr/bin}" msgstr "@file{env}, in @file{/usr/bin}" #. type: defvr -#: doc/guix.texi:11519 +#: doc/guix.texi:11517 msgid "If you want to add, say, @code{/usr/bin/env} to your system, you can change it to:" msgstr "Wenn Sie zum Beispiel auch @code{/usr/bin/env} zu Ihrem System hinzufügen möchten, können Sie den Wert ändern auf:" #. type: example -#: doc/guix.texi:11523 +#: doc/guix.texi:11521 #, no-wrap msgid "" "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n" @@ -20588,28 +20599,28 @@ msgstr "" " (\"/usr/bin/env\" ,(file-append @var{coreutils} \"/bin/env\")))\n" #. type: defvr -#: doc/guix.texi:11530 +#: doc/guix.texi:11528 msgid "Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files (@pxref{Service Reference, @code{modify-services}}). But the simple way to add a special file is @i{via} the @code{extra-special-file} procedure (see below.)" msgstr "Da dieser Dienst Teil der @code{%base-services} ist, können Sie @code{modify-services} benutzen, um die Liste besonderer Dateien abzuändern (siehe @ref{Service Reference, @code{modify-services}}). Die leichte Alternative, um eine besondere Datei hinzuzufügen, ist über die Prozedur @code{extra-special-file} (siehe unten)." #. type: deffn -#: doc/guix.texi:11532 +#: doc/guix.texi:11530 #, no-wrap msgid "{Scheme Procedure} extra-special-file @var{file} @var{target}" msgstr "{Scheme-Prozedur} extra-special-file @var{Datei} @var{Ziel}" #. type: deffn -#: doc/guix.texi:11534 +#: doc/guix.texi:11532 msgid "Use @var{target} as the ``special file'' @var{file}." msgstr "Das @var{Ziel} als „besondere Datei“ @var{Datei} verwenden." #. type: deffn -#: doc/guix.texi:11538 +#: doc/guix.texi:11536 msgid "For example, adding the following lines to the @code{services} field of your operating system declaration leads to a @file{/usr/bin/env} symlink:" msgstr "Beispielsweise können Sie die folgenden Zeilen in das @code{services}-Feld Ihrer Betriebssystemdeklaration einfügen für eine symbolische Verknüpfung @file{/usr/bin/env}:" #. type: example -#: doc/guix.texi:11542 +#: doc/guix.texi:11540 #, no-wrap msgid "" "(extra-special-file \"/usr/bin/env\"\n" @@ -20619,1150 +20630,1150 @@ msgstr "" " (file-append coreutils \"/bin/env\"))\n" #. type: deffn -#: doc/guix.texi:11545 +#: doc/guix.texi:11543 #, no-wrap msgid "{Scheme Procedure} host-name-service @var{name}" msgstr "{Scheme-Prozedur} host-name-service @var{Name}" #. type: deffn -#: doc/guix.texi:11547 +#: doc/guix.texi:11545 msgid "Return a service that sets the host name to @var{name}." msgstr "Liefert einen Dienst, der den Rechnernamen (den „Host“-Namen des Rechners) als @var{Name} festlegt." #. type: deffn -#: doc/guix.texi:11549 +#: doc/guix.texi:11547 #, no-wrap msgid "{Scheme Procedure} login-service @var{config}" msgstr "{Scheme-Prozedur} login-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11553 +#: doc/guix.texi:11551 msgid "Return a service to run login according to @var{config}, a @code{} object, which specifies the message of the day, among other things." msgstr "Liefert einen Dienst, der die Benutzeranmeldung möglich macht. Dazu verwendet er die angegebene @var{Konfiguration}, ein @code{}-Objekt, das unter anderem die beim Anmelden angezeigte Mitteilung des Tages („Message of the Day“) festlegt." #. type: deftp -#: doc/guix.texi:11555 +#: doc/guix.texi:11553 #, no-wrap msgid "{Data Type} login-configuration" msgstr "{Datentyp} login-configuration" #. type: deftp -#: doc/guix.texi:11557 +#: doc/guix.texi:11555 msgid "This is the data type representing the configuration of login." msgstr "Dies ist der Datentyp, der die Anmeldekonfiguration repräsentiert." #. type: code{#1} -#: doc/guix.texi:11560 +#: doc/guix.texi:11558 #, no-wrap msgid "motd" msgstr "motd" #. type: cindex -#: doc/guix.texi:11561 +#: doc/guix.texi:11559 #, no-wrap msgid "message of the day" msgstr "Message of the Day" #. type: table -#: doc/guix.texi:11563 +#: doc/guix.texi:11561 msgid "A file-like object containing the ``message of the day''." msgstr "Ein dateiartiges Objekt, das die „Message of the Day“ enthält." #. type: item -#: doc/guix.texi:11564 doc/guix.texi:13524 +#: doc/guix.texi:11562 doc/guix.texi:13522 #, no-wrap msgid "@code{allow-empty-passwords?} (default: @code{#t})" msgstr "@code{allow-empty-passwords?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11567 +#: doc/guix.texi:11565 msgid "Allow empty passwords by default so that first-time users can log in when the 'root' account has just been created." msgstr "Leere Passwörter standardmäßig zulassen, damit sich neue Anwender anmelden können, direkt nachdem das Benutzerkonto „root“ für den Administrator angelegt wurde." #. type: deffn -#: doc/guix.texi:11571 +#: doc/guix.texi:11569 #, no-wrap msgid "{Scheme Procedure} mingetty-service @var{config}" msgstr "{Scheme-Prozedur} mingetty-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11575 +#: doc/guix.texi:11573 msgid "Return a service to run mingetty according to @var{config}, a @code{} object, which specifies the tty to run, among other things." msgstr "Liefert einen Dienst, der mingetty nach den Vorgaben der @var{Konfiguration} ausführt, einem @code{}-Objekt, das unter anderem die Konsole (das „tty“) festlegt, auf der mingetty laufen soll." #. type: deftp -#: doc/guix.texi:11577 +#: doc/guix.texi:11575 #, no-wrap msgid "{Data Type} mingetty-configuration" msgstr "{Datentyp} mingetty-configuration" #. type: deftp -#: doc/guix.texi:11580 +#: doc/guix.texi:11578 msgid "This is the data type representing the configuration of Mingetty, which provides the default implementation of virtual console log-in." msgstr "Dieser Datentyp repräsentiert die Konfiguration von Mingetty, der vorgegebenen Implementierung zur Anmeldung auf einer virtuellen Konsole." #. type: code{#1} -#: doc/guix.texi:11583 doc/guix.texi:11619 +#: doc/guix.texi:11581 doc/guix.texi:11617 #, no-wrap msgid "tty" msgstr "tty" #. type: table -#: doc/guix.texi:11585 +#: doc/guix.texi:11583 msgid "The name of the console this Mingetty runs on---e.g., @code{\"tty1\"}." msgstr "Der Name der Konsole, auf der diese Mingetty-Instanz läuft — z.B.@: @code{\"tty1\"}." #. type: item -#: doc/guix.texi:11586 doc/guix.texi:11648 doc/guix.texi:11807 +#: doc/guix.texi:11584 doc/guix.texi:11646 doc/guix.texi:11805 #, no-wrap msgid "@code{auto-login} (default: @code{#f})" msgstr "@code{auto-login} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11590 +#: doc/guix.texi:11588 msgid "When true, this field must be a string denoting the user name under which the system automatically logs in. When it is @code{#f}, a user name and password must be entered to log in." msgstr "Steht dieses Feld auf wahr, muss es eine Zeichenkette sein, die den Benutzernamen angibt, als der man vom System automatisch angemeldet wird. Ist es @code{#f}, so muss zur Anmeldung ein Benutzername und ein Passwort eingegeben werden." #. type: item -#: doc/guix.texi:11591 +#: doc/guix.texi:11589 #, no-wrap msgid "@code{login-program} (default: @code{#f})" msgstr "@code{login-program} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11595 +#: doc/guix.texi:11593 msgid "This must be either @code{#f}, in which case the default log-in program is used (@command{login} from the Shadow tool suite), or a gexp denoting the name of the log-in program." msgstr "Dies muss entweder @code{#f} sein, dann wird das voreingestellte Anmeldeprogramm benutzt (@command{login} aus dem Shadow-Werkzeugsatz) oder der Name des Anmeldeprogramms als G-Ausdruck." #. type: item -#: doc/guix.texi:11596 +#: doc/guix.texi:11594 #, no-wrap msgid "@code{login-pause?} (default: @code{#f})" msgstr "@code{login-pause?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11599 +#: doc/guix.texi:11597 msgid "When set to @code{#t} in conjunction with @var{auto-login}, the user will have to press a key before the log-in shell is launched." msgstr "Ist es auf @code{#t} gesetzt, sorgt es in Verbindung mit @var{auto-login} dafür, dass der Benutzer eine Taste drücken muss, ehe eine Anmelde-Shell gestartet wird." #. type: item -#: doc/guix.texi:11600 +#: doc/guix.texi:11598 #, no-wrap msgid "@code{mingetty} (default: @var{mingetty})" msgstr "@code{mingetty} (Vorgabe: @var{mingetty})" #. type: table -#: doc/guix.texi:11602 +#: doc/guix.texi:11600 msgid "The Mingetty package to use." msgstr "Welches Mingetty-Paket benutzt werden soll." #. type: deffn -#: doc/guix.texi:11606 +#: doc/guix.texi:11604 #, no-wrap msgid "{Scheme Procedure} agetty-service @var{config}" msgstr "{Scheme-Prozedur} agetty-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11610 +#: doc/guix.texi:11608 msgid "Return a service to run agetty according to @var{config}, an @code{} object, which specifies the tty to run, among other things." msgstr "Liefert einen Dienst, um agetty entsprechend der @var{Konfiguration} auszuführen, welche ein @code{}-Objekt sein muss, das unter anderem festlegt, auf welchem tty es laufen soll." #. type: deftp -#: doc/guix.texi:11612 +#: doc/guix.texi:11610 #, no-wrap msgid "{Data Type} agetty-configuration" msgstr "{Datentyp} agetty-configuration" #. type: deftp -#: doc/guix.texi:11616 +#: doc/guix.texi:11614 msgid "This is the data type representing the configuration of agetty, which implements virtual and serial console log-in. See the @code{agetty(8)} man page for more information." msgstr "Dies ist der Datentyp, der die Konfiguration von agetty repräsentiert, was Anmeldungen auf einer virtuellen oder seriellen Konsole implementiert. Siehe die Handbuchseite @code{agetty(8)} für mehr Informationen." #. type: table -#: doc/guix.texi:11623 +#: doc/guix.texi:11621 msgid "The name of the console this agetty runs on, as a string---e.g., @code{\"ttyS0\"}. This argument is optional, it will default to a reasonable default serial port used by the kernel Linux." msgstr "Der Name der Konsole, auf der diese Instanz von agetty läuft, als Zeichenkette — z.B.@: @code{\"ttyS0\"}. Dieses Argument ist optional, sein Vorgabewert ist eine vernünftige Wahl unter den seriellen Schnittstellen, auf deren Benutzung der Linux-Kernel eingestellt ist." #. type: table -#: doc/guix.texi:11627 +#: doc/guix.texi:11625 msgid "For this, if there is a value for an option @code{agetty.tty} in the kernel command line, agetty will extract the device name of the serial port from it and use that." msgstr "Hierzu wird, wenn in der Kernel-Befehlszeile ein Wert für eine Option namens @code{agetty.tty} festgelegt wurde, der Gerätename daraus für agetty extrahiert und benutzt." #. type: table -#: doc/guix.texi:11631 +#: doc/guix.texi:11629 msgid "If not and if there is a value for an option @code{console} with a tty in the Linux command line, agetty will extract the device name of the serial port from it and use that." msgstr "Andernfalls wird agetty, falls auf der Kernel-Befehlszeile eine Option @code{console} mit einem tty vorkommt, den daraus extrahierten Gerätenamen der seriellen Schnittstelle benutzen." #. type: table -#: doc/guix.texi:11635 +#: doc/guix.texi:11633 msgid "In both cases, agetty will leave the other serial device settings (baud rate etc.)@: alone---in the hope that Linux pinned them to the correct values." msgstr "In beiden Fällen wird agetty nichts an den anderen Einstellungen für serielle Geräte verändern (Baud-Rate etc.), in der Hoffnung, dass Linux sie auf die korrekten Werte festgelegt hat." #. type: item -#: doc/guix.texi:11636 +#: doc/guix.texi:11634 #, no-wrap msgid "@code{baud-rate} (default: @code{#f})" msgstr "@code{baud-rate} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11639 +#: doc/guix.texi:11637 msgid "A string containing a comma-separated list of one or more baud rates, in descending order." msgstr "Eine Zeichenkette, die aus einer kommagetrennten Liste von einer oder mehreren Baud-Raten besteht, absteigend sortiert." #. type: item -#: doc/guix.texi:11640 +#: doc/guix.texi:11638 #, no-wrap msgid "@code{term} (default: @code{#f})" msgstr "@code{term} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11643 +#: doc/guix.texi:11641 msgid "A string containing the value used for the @code{TERM} environment variable." msgstr "Eine Zeichenkette, die den Wert enthält, der für die Umgebungsvariable @code{TERM} benutzt werden soll." #. type: item -#: doc/guix.texi:11644 +#: doc/guix.texi:11642 #, no-wrap msgid "@code{eight-bits?} (default: @code{#f})" msgstr "@code{eight-bits?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11647 +#: doc/guix.texi:11645 msgid "When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection is disabled." msgstr "Steht dies auf @code{#t}, wird angenommen, dass das tty 8-Bit-korrekt ist, so dass die Paritätserkennung abgeschaltet wird." #. type: table -#: doc/guix.texi:11651 doc/guix.texi:11810 +#: doc/guix.texi:11649 doc/guix.texi:11808 msgid "When passed a login name, as a string, the specified user will be logged in automatically without prompting for their login name or password." msgstr "Wird hier ein Anmeldename als eine Zeichenkette übergeben, wird der angegebene Nutzer automatisch angemeldet, ohne nach einem Anmeldenamen oder Passwort zu fragen." #. type: item -#: doc/guix.texi:11652 +#: doc/guix.texi:11650 #, no-wrap msgid "@code{no-reset?} (default: @code{#f})" msgstr "@code{no-reset?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11654 +#: doc/guix.texi:11652 msgid "When @code{#t}, don't reset terminal cflags (control modes)." msgstr "Steht dies auf @code{#t}, werden die Cflags des Terminals (d.h.@: dessen Steuermodi) nicht zurückgesetzt." #. type: item -#: doc/guix.texi:11655 +#: doc/guix.texi:11653 #, no-wrap msgid "@code{host} (default: @code{#f})" msgstr "@code{host} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11658 +#: doc/guix.texi:11656 msgid "This accepts a string containing the \"login_host\", which will be written into the @file{/var/run/utmpx} file." msgstr "Dies akzeptiert eine Zeichenkette mit dem einzutragenden Anmeldungs-Rechnernamen \"login_host\", der in die Datei @file{/var/run/utmpx} geschrieben wird." #. type: item -#: doc/guix.texi:11659 +#: doc/guix.texi:11657 #, no-wrap msgid "@code{remote?} (default: @code{#f})" msgstr "@code{remote?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11663 +#: doc/guix.texi:11661 msgid "When set to @code{#t} in conjunction with @var{host}, this will add an @code{-r} fakehost option to the command line of the login program specified in @var{login-program}." msgstr "Ist dies auf @code{#t} gesetzt, wird in Verbindung mit @var{host} eine Befehlszeilenoption @code{-r} für einen falschen Rechnernamen („Fakehost“) in der Befehlszeile des mit @var{login-program} angegebenen Anmeldeprogramms übergeben." #. type: item -#: doc/guix.texi:11664 +#: doc/guix.texi:11662 #, no-wrap msgid "@code{flow-control?} (default: @code{#f})" msgstr "@code{flow-control?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11666 +#: doc/guix.texi:11664 msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control." msgstr "Ist dies auf @code{#t} gesetzt, wird Hardware-Flusssteuerung (RTS/CTS) aktiviert." #. type: item -#: doc/guix.texi:11667 +#: doc/guix.texi:11665 #, no-wrap msgid "@code{no-issue?} (default: @code{#f})" msgstr "@code{no-issue?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11670 +#: doc/guix.texi:11668 msgid "When set to @code{#t}, the contents of the @file{/etc/issue} file will not be displayed before presenting the login prompt." msgstr "Ist dies auf @code{#t} gesetzt, wird der Inhalt der Datei @file{/etc/issue} @emph{nicht} angezeigt, bevor die Anmeldeaufforderung zu sehen ist." #. type: item -#: doc/guix.texi:11671 +#: doc/guix.texi:11669 #, no-wrap msgid "@code{init-string} (default: @code{#f})" msgstr "@code{init-string} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11674 +#: doc/guix.texi:11672 msgid "This accepts a string that will be sent to the tty or modem before sending anything else. It can be used to initialize a modem." msgstr "Dies akzeptiert eine Zeichenkette, die zum tty oder zum Modem zuerst vor allem anderen gesendet wird. Es kann benutzt werden, um ein Modem zu initialisieren." #. type: item -#: doc/guix.texi:11675 +#: doc/guix.texi:11673 #, no-wrap msgid "@code{no-clear?} (default: @code{#f})" msgstr "@code{no-clear?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11678 +#: doc/guix.texi:11676 msgid "When set to @code{#t}, agetty will not clear the screen before showing the login prompt." msgstr "Ist dies auf @code{#t} gesetzt, wird agetty den Bildschirm @emph{nicht} löschen, bevor es die Anmeldeaufforderung anzeigt." #. type: item -#: doc/guix.texi:11679 +#: doc/guix.texi:11677 #, no-wrap msgid "@code{login-program} (default: (file-append shadow \"/bin/login\"))" msgstr "@code{login-program} (Vorgabe: (file-append shadow \"/bin/login\"))" #. type: table -#: doc/guix.texi:11683 +#: doc/guix.texi:11681 msgid "This must be either a gexp denoting the name of a log-in program, or unset, in which case the default value is the @command{login} from the Shadow tool suite." msgstr "Hier muss entweder ein G-Ausdruck mit dem Namen eines Anmeldeprogramms übergeben werden, oder dieses Feld wird nicht gesetzt, so dass als Vorgabewert das Programm @command{login} aus dem Shadow-Werkzeugsatz verwendet wird." #. type: item -#: doc/guix.texi:11684 +#: doc/guix.texi:11682 #, no-wrap msgid "@code{local-line} (default: @code{#f})" msgstr "@code{local-line} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11688 +#: doc/guix.texi:11686 msgid "Control the CLOCAL line flag. This accepts one of three symbols as arguments, @code{'auto}, @code{'always}, or @code{'never}. If @code{#f}, the default value chosen by agetty is @code{'auto}." msgstr "Steuert den Leitungsschalter CLOCAL. Hierfür wird eines von drei Symbolen als Argument akzeptiert, @code{'auto}, @code{'always} oder @code{'never}. Für @code{#f} wählt agetty als Vorgabewert @code{'auto}." #. type: item -#: doc/guix.texi:11689 +#: doc/guix.texi:11687 #, no-wrap msgid "@code{extract-baud?} (default: @code{#f})" msgstr "@code{extract-baud?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11692 +#: doc/guix.texi:11690 msgid "When set to @code{#t}, instruct agetty to try to extract the baud rate from the status messages produced by certain types of modems." msgstr "Ist dies auf @code{#t} gesetzt, so wird agetty angewiesen, die Baud-Rate aus den Statusmeldungen mancher Arten von Modem abzulesen." #. type: item -#: doc/guix.texi:11693 +#: doc/guix.texi:11691 #, no-wrap msgid "@code{skip-login?} (default: @code{#f})" msgstr "@code{skip-login?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11697 +#: doc/guix.texi:11695 msgid "When set to @code{#t}, do not prompt the user for a login name. This can be used with @var{login-program} field to use non-standard login systems." msgstr "Ist dies auf @code{#t} gesetzt, wird der Benutzer nicht aufgefordert, einen Anmeldenamen einzugeben. Dies kann zusammen mit dem @var{login-program}-Feld benutzt werden, um nicht standardkonforme Anmeldesysteme zu benutzen." #. type: item -#: doc/guix.texi:11698 +#: doc/guix.texi:11696 #, no-wrap msgid "@code{no-newline?} (default: @code{#f})" msgstr "@code{no-newline?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11701 +#: doc/guix.texi:11699 msgid "When set to @code{#t}, do not print a newline before printing the @file{/etc/issue} file." msgstr "Ist dies auf @code{#t} gesetzt, wird @emph{kein} Zeilenumbruch ausgegeben, bevor die Datei @file{/etc/issue} ausgegeben wird." #. type: item -#: doc/guix.texi:11703 +#: doc/guix.texi:11701 #, no-wrap msgid "@code{login-options} (default: @code{#f})" msgstr "@code{login-options} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11708 +#: doc/guix.texi:11706 msgid "This option accepts a string containing options that are passed to the login program. When used with the @var{login-program}, be aware that a malicious user could try to enter a login name containing embedded options that could be parsed by the login program." msgstr "Dieses Feld akzeptiert eine Zeichenkette mit den Befehlszeilenoptionen für das Anmeldeprogramm. Beachten Sie, dass bei einem selbst gewählten @var{login-program} ein böswilliger Nutzer versuchen könnte, als Anmeldenamen etwas mit eingebetteten Befehlszeilenoptionen anzugeben, die vom Anmeldeprogramm interpretiert werden könnten." #. type: item -#: doc/guix.texi:11709 +#: doc/guix.texi:11707 #, no-wrap msgid "@code{login-pause} (default: @code{#f})" msgstr "@code{login-pause} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11713 +#: doc/guix.texi:11711 msgid "When set to @code{#t}, wait for any key before showing the login prompt. This can be used in conjunction with @var{auto-login} to save memory by lazily spawning shells." msgstr "Ist dies auf @code{#t} gesetzt, wird auf das Drücken einer beliebigen Taste gewartet, bevor die Anmeldeaufforderung angezeigt wird. Hiermit kann in Verbindung mit @var{auto-login} weniger Speicher verbraucht werden, indem man Shells erst erzeugt, wenn sie benötigt werden." #. type: item -#: doc/guix.texi:11714 +#: doc/guix.texi:11712 #, no-wrap msgid "@code{chroot} (default: @code{#f})" msgstr "@code{chroot} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11717 +#: doc/guix.texi:11715 msgid "Change root to the specified directory. This option accepts a directory path as a string." msgstr "Wechselt die Wurzel des Dateisystems auf das angegebene Verzeichnis. Dieses Feld akzeptiert einen Verzeichnispfad als Zeichenkette." #. type: item -#: doc/guix.texi:11718 +#: doc/guix.texi:11716 #, no-wrap msgid "@code{hangup?} (default: @code{#f})" msgstr "@code{hangup?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11721 +#: doc/guix.texi:11719 msgid "Use the Linux system call @code{vhangup} to do a virtual hangup of the specified terminal." msgstr "Mit dem Linux-Systemaufruf @code{vhangup} auf dem angegebenen Terminal virtuell auflegen." #. type: item -#: doc/guix.texi:11722 +#: doc/guix.texi:11720 #, no-wrap msgid "@code{keep-baud?} (default: @code{#f})" msgstr "@code{keep-baud?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11726 +#: doc/guix.texi:11724 msgid "When set to @code{#t}, try to keep the existing baud rate. The baud rates from @var{baud-rate} are used when agetty receives a @key{BREAK} character." msgstr "Ist dies auf @code{#t} gesetzt, wird versucht, die bestehende Baud-Rate beizubehalten. Die Baud-Raten aus dem Feld @var{baud-rate} werden benutzt, wenn agetty ein @key{BREAK}-Zeichen empfängt." #. type: item -#: doc/guix.texi:11727 +#: doc/guix.texi:11725 #, no-wrap msgid "@code{timeout} (default: @code{#f})" msgstr "@code{timeout} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11730 +#: doc/guix.texi:11728 msgid "When set to an integer value, terminate if no user name could be read within @var{timeout} seconds." msgstr "Ist dies auf einen ganzzahligen Wert gesetzt, wird terminiert, falls kein Benutzername innerhalb von @var{timeout} Sekunden eingelesen werden konnte." #. type: item -#: doc/guix.texi:11731 +#: doc/guix.texi:11729 #, no-wrap msgid "@code{detect-case?} (default: @code{#f})" msgstr "@code{detect-case?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11737 +#: doc/guix.texi:11735 msgid "When set to @code{#t}, turn on support for detecting an uppercase-only terminal. This setting will detect a login name containing only uppercase letters as indicating an uppercase-only terminal and turn on some upper-to-lower case conversions. Note that this will not support Unicode characters." msgstr "Ist dies auf @code{#t} gesetzt, wird Unterstützung für die Erkennung von Terminals aktiviert, die nur Großschreibung beherrschen. Mit dieser Einstellung wird, wenn ein Anmeldename nur aus Großbuchstaben besteht, dieser als Anzeichen dafür aufgefasst, dass das Terminal nur Großbuchstaben beherrscht, und einige Umwandlungen von Groß- in Kleinbuchstaben aktiviert. Beachten Sie, dass dabei @emph{keine} Unicode-Zeichen unterstützt werden." #. type: item -#: doc/guix.texi:11738 +#: doc/guix.texi:11736 #, no-wrap msgid "@code{wait-cr?} (default: @code{#f})" msgstr "@code{wait-cr?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11743 +#: doc/guix.texi:11741 msgid "When set to @code{#t}, wait for the user or modem to send a carriage-return or linefeed character before displaying @file{/etc/issue} or login prompt. This is typically used with the @var{init-string} option." msgstr "Wenn dies auf @code{#t} gesetzt ist, wird gewartet, bis der Benutzer oder das Modem einen Wagenrücklauf („Carriage Return“) oder einen Zeilenvorschub („Linefeed“) absendet, ehe @file{/etc/issue} oder eine Anmeldeaufforderung angezeigt wird. Dies wird typischerweise zusammen mit dem Feld @var{init-string} benutzt." #. type: item -#: doc/guix.texi:11744 +#: doc/guix.texi:11742 #, no-wrap msgid "@code{no-hints?} (default: @code{#f})" msgstr "@code{no-hints?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11747 +#: doc/guix.texi:11745 msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks." msgstr "Ist es auf @code{#t} gesetzt, werden @emph{keine} Hinweise zu den Feststelltasten Num-Taste, Umschaltsperre („Caps Lock“) und Rollen-Taste („Scroll Lock“) angezeigt." #. type: item -#: doc/guix.texi:11748 +#: doc/guix.texi:11746 #, no-wrap msgid "@code{no-hostname?} (default: @code{#f})" msgstr "@code{no-hostname?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11751 +#: doc/guix.texi:11749 msgid "By default, the hostname is printed. When this option is set to @code{#t}, no hostname will be shown at all." msgstr "Das vorgegebene Verhalten ist, den Rechnernamen auszugeben. Ist dieses Feld auf @code{#t} gesetzt, wird überhaupt kein Rechnername angezeigt." #. type: item -#: doc/guix.texi:11752 +#: doc/guix.texi:11750 #, no-wrap msgid "@code{long-hostname?} (default: @code{#f})" msgstr "@code{long-hostname?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11756 +#: doc/guix.texi:11754 msgid "By default, the hostname is only printed until the first dot. When this option is set to @code{#t}, the fully qualified hostname by @code{gethostname} or @code{getaddrinfo} is shown." msgstr "Das vorgegebene Verhalten ist, den Rechnernamen nur bis zu seinem ersten Punkt anzuzeigen. Ist dieses Feld auf @code{#t} gesetzt, wird der vollständige Rechnername (der „Fully Qualified Hostname“), wie ihn @code{gethostname} oder @code{getaddrinfo} liefern, angezeigt." #. type: item -#: doc/guix.texi:11757 +#: doc/guix.texi:11755 #, no-wrap msgid "@code{erase-characters} (default: @code{#f})" msgstr "@code{erase-characters} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11760 +#: doc/guix.texi:11758 msgid "This option accepts a string of additional characters that should be interpreted as backspace when the user types their login name." msgstr "Dieses Feld akzeptiert eine Zeichenkette aus Zeichen, die auch als Rücktaste (zum Löschen) interpretiert werden sollen, wenn der Benutzer seinen Anmeldenamen eintippt." #. type: item -#: doc/guix.texi:11761 +#: doc/guix.texi:11759 #, no-wrap msgid "@code{kill-characters} (default: @code{#f})" msgstr "@code{kill-characters} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11765 +#: doc/guix.texi:11763 msgid "This option accepts a string that should be interpreted to mean \"ignore all previous characters\" (also called a \"kill\" character) when the user types their login name." msgstr "Dieses Feld akzeptiert eine Zeichenkette aus Zeichen, deren Eingabe als „ignoriere alle vorherigen Zeichen“ interpretiert werden soll (auch „Kill“-Zeichen genannt), wenn der Benutzer seinen Anmeldenamen eintippt." #. type: item -#: doc/guix.texi:11766 +#: doc/guix.texi:11764 #, no-wrap msgid "@code{chdir} (default: @code{#f})" msgstr "@code{chdir} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11769 +#: doc/guix.texi:11767 msgid "This option accepts, as a string, a directory path that will be changed to before login." msgstr "Dieses Feld akzeptiert eine Zeichenkette, die einen Verzeichnispfad angibt, zu dem vor der Anmeldung gewechselt wird." #. type: item -#: doc/guix.texi:11770 +#: doc/guix.texi:11768 #, no-wrap msgid "@code{delay} (default: @code{#f})" msgstr "@code{delay} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11773 +#: doc/guix.texi:11771 msgid "This options accepts, as an integer, the number of seconds to sleep before opening the tty and displaying the login prompt." msgstr "Dieses Feld akzeptiert eine ganze Zahl mit der Anzahl Sekunden, die gewartet werden soll, bis ein tty geöffnet und die Anmeldeaufforderung angezeigt wird." #. type: item -#: doc/guix.texi:11774 +#: doc/guix.texi:11772 #, no-wrap msgid "@code{nice} (default: @code{#f})" msgstr "@code{nice} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:11777 +#: doc/guix.texi:11775 msgid "This option accepts, as an integer, the nice value with which to run the @command{login} program." msgstr "Dieses Feld akzeptiert eine ganze Zahl mit dem „nice“-Wert, mit dem das Anmeldeprogramm ausgeführt werden soll." #. type: item -#: doc/guix.texi:11778 doc/guix.texi:12009 doc/guix.texi:12696 -#: doc/guix.texi:19067 +#: doc/guix.texi:11776 doc/guix.texi:12007 doc/guix.texi:12694 +#: doc/guix.texi:19064 #, no-wrap msgid "@code{extra-options} (default: @code{'()})" msgstr "@code{extra-options} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:11781 +#: doc/guix.texi:11779 msgid "This option provides an \"escape hatch\" for the user to provide arbitrary command-line arguments to @command{agetty} as a list of strings." msgstr "Dieses Feld ist ein „Notausstieg“, mit dem Nutzer beliebige Befehlszeilenoptionen direkt an @command{agetty} übergeben können. Diese müssen hier als eine Liste von Zeichenketten angegeben werden." #. type: deffn -#: doc/guix.texi:11785 +#: doc/guix.texi:11783 #, no-wrap msgid "{Scheme Procedure} kmscon-service-type @var{config}" msgstr "{Scheme-Prozedur} kmscon-service-type @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11789 +#: doc/guix.texi:11787 msgid "Return a service to run @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} according to @var{config}, a @code{} object, which specifies the tty to run, among other things." msgstr "Liefert einen Dienst, um @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} entsprechend der @var{Konfiguration} auszuführen. Diese ist ein @code{}-Objekt, das unter anderem angibt, auf welchem tty es ausgeführt werden soll." #. type: deftp -#: doc/guix.texi:11791 +#: doc/guix.texi:11789 #, no-wrap msgid "{Data Type} kmscon-configuration" msgstr "{Datentyp} kmscon-configuration" #. type: deftp -#: doc/guix.texi:11794 +#: doc/guix.texi:11792 msgid "This is the data type representing the configuration of Kmscon, which implements virtual console log-in." msgstr "Dieser Datentyp repräsentiert die Konfiguration von Kmscon, die das Anmelden auf virtuellen Konsolen ermöglicht." #. type: code{#1} -#: doc/guix.texi:11797 +#: doc/guix.texi:11795 #, no-wrap msgid "virtual-terminal" msgstr "virtual-terminal" #. type: table -#: doc/guix.texi:11799 +#: doc/guix.texi:11797 msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}." msgstr "Der Name der Konsole, auf der diese Kmscon läuft — z.B.@: @code{\"tty1\"}." #. type: item -#: doc/guix.texi:11800 +#: doc/guix.texi:11798 #, no-wrap msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})" msgstr "@code{login-program} (Vorgabe: @code{#~(string-append #$shadow \"/bin/login\")})" #. type: table -#: doc/guix.texi:11803 +#: doc/guix.texi:11801 msgid "A gexp denoting the name of the log-in program. The default log-in program is @command{login} from the Shadow tool suite." msgstr "Ein G-Ausdruck, der den Namen des Anmeldeprogramms angibt. Als Vorgabe wird das Anmeldeprogramm @command{login} aus dem Shadow-Werkzeugsatz verwendet." #. type: item -#: doc/guix.texi:11804 +#: doc/guix.texi:11802 #, no-wrap msgid "@code{login-arguments} (default: @code{'(\"-p\")})" msgstr "@code{login-arguments} (Vorgabe: @code{'(\"-p\")})" #. type: table -#: doc/guix.texi:11806 +#: doc/guix.texi:11804 msgid "A list of arguments to pass to @command{login}." msgstr "Eine Liste der Argumente, die an @command{login} übergeben werden sollen." #. type: item -#: doc/guix.texi:11811 +#: doc/guix.texi:11809 #, no-wrap msgid "@code{hardware-acceleration?} (default: #f)" msgstr "@code{hardware-acceleration?} (Vorgabe: #f)" #. type: table -#: doc/guix.texi:11813 +#: doc/guix.texi:11811 msgid "Whether to use hardware acceleration." msgstr "Ob Hardware-Beschleunigung verwendet werden soll." #. type: item -#: doc/guix.texi:11814 +#: doc/guix.texi:11812 #, no-wrap msgid "@code{kmscon} (default: @var{kmscon})" msgstr "@code{kmscon} (Vorgabe: @var{kmscon})" #. type: table -#: doc/guix.texi:11816 +#: doc/guix.texi:11814 msgid "The Kmscon package to use." msgstr "Das Kmscon-Paket, das benutzt werden soll." #. type: cindex -#: doc/guix.texi:11820 +#: doc/guix.texi:11818 #, no-wrap msgid "name service cache daemon" msgstr "Name Service Cache Daemon" #. type: cindex -#: doc/guix.texi:11821 +#: doc/guix.texi:11819 #, no-wrap msgid "nscd" msgstr "nscd" #. type: deffn -#: doc/guix.texi:11822 +#: doc/guix.texi:11820 #, no-wrap msgid "{Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @" msgstr "{Scheme-Prozedur} nscd-service [@var{Konfiguration}] [#:glibc glibc] @" #. type: deffn -#: doc/guix.texi:11827 +#: doc/guix.texi:11825 msgid "[#:name-services '()] Return a service that runs the libc name service cache daemon (nscd) with the given @var{config}---an @code{} object. @xref{Name Service Switch}, for an example." msgstr "[#:name-services '()] Liefert einen Dienst, der den Name Service Cache Daemon (nscd) von libc mit der angegebenen @var{Konfiguration} ausführt — diese muss ein @code{}-Objekt sein. Siehe @ref{Name Service Switch} für ein Beispiel." #. type: deffn -#: doc/guix.texi:11829 +#: doc/guix.texi:11827 msgid "For convenience, the Shepherd service for nscd provides the following actions:" msgstr "Der Einfachheit halber bietet der Shepherd-Dienst für nscd die folgenden Aktionen an:" #. type: item -#: doc/guix.texi:11831 +#: doc/guix.texi:11829 #, no-wrap msgid "invalidate" msgstr "invalidate" #. type: cindex -#: doc/guix.texi:11832 +#: doc/guix.texi:11830 #, no-wrap msgid "cache invalidation, nscd" msgstr "Zwischenspeicher ungültig machen, nscd" #. type: cindex -#: doc/guix.texi:11833 +#: doc/guix.texi:11831 #, no-wrap msgid "nscd, cache invalidation" msgstr "nscd, Ungültigmachen des Zwischenspeichers" #. type: table -#: doc/guix.texi:11835 +#: doc/guix.texi:11833 msgid "This invalidate the given cache. For instance, running:" msgstr "Dies macht den angegebenen Zwischenspeicher ungültig. Wenn Sie zum Beispiel:" #. type: example -#: doc/guix.texi:11838 +#: doc/guix.texi:11836 #, no-wrap msgid "herd invalidate nscd hosts\n" msgstr "herd invalidate nscd hosts\n" #. type: table -#: doc/guix.texi:11842 +#: doc/guix.texi:11840 msgid "invalidates the host name lookup cache of nscd." msgstr "ausführen, wird der Zwischenspeicher für die Auflösung von Rechnernamen (von „Host“-Namen) des nscd ungültig." #. type: item -#: doc/guix.texi:11843 +#: doc/guix.texi:11841 #, no-wrap msgid "statistics" msgstr "statistics" #. type: table -#: doc/guix.texi:11846 +#: doc/guix.texi:11844 msgid "Running @command{herd statistics nscd} displays information about nscd usage and caches." msgstr "Wenn Sie @command{herd statistics nscd} ausführen, werden Ihnen Informationen angezeigt, welche Ihnen Informationen über den nscd-Zustand und die Zwischenspeicher angezeigt." #. type: defvr -#: doc/guix.texi:11850 +#: doc/guix.texi:11848 #, no-wrap msgid "{Scheme Variable} %nscd-default-configuration" msgstr "{Scheme-Variable} %nscd-default-configuration" #. type: defvr -#: doc/guix.texi:11854 +#: doc/guix.texi:11852 msgid "This is the default @code{} value (see below) used by @code{nscd-service}. It uses the caches defined by @var{%nscd-default-caches}; see below." msgstr "Dies ist der vorgegebene Wert für die @code{} (siehe unten), die @code{nscd-service} benutzt. Die Konfiguration benutzt die Zwischenspeicher, die in @var{%nscd-default-caches} definiert sind; siehe unten." #. type: deftp -#: doc/guix.texi:11856 +#: doc/guix.texi:11854 #, no-wrap msgid "{Data Type} nscd-configuration" msgstr "{Datentyp} nscd-configuration" #. type: deftp -#: doc/guix.texi:11859 +#: doc/guix.texi:11857 msgid "This is the data type representing the name service cache daemon (nscd) configuration." msgstr "Dieser Datentyp repräsentiert die Konfiguration des Name Service Caching Daemon (kurz „nscd“)." #. type: item -#: doc/guix.texi:11862 +#: doc/guix.texi:11860 #, no-wrap msgid "@code{name-services} (default: @code{'()})" msgstr "@code{name-services} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:11865 +#: doc/guix.texi:11863 msgid "List of packages denoting @dfn{name services} that must be visible to the nscd---e.g., @code{(list @var{nss-mdns})}." msgstr "Liste von Paketen, die @dfn{Namensdienste} bezeichnen, die für den nscd sichtbar sein müssen, z.B.@: @code{(list @var{nss-mdns})}." #. type: item -#: doc/guix.texi:11866 +#: doc/guix.texi:11864 #, no-wrap msgid "@code{glibc} (default: @var{glibc})" msgstr "@code{glibc} (Vorgabe: @var{glibc})" #. type: table -#: doc/guix.texi:11869 +#: doc/guix.texi:11867 msgid "Package object denoting the GNU C Library providing the @command{nscd} command." msgstr "Ein Paket-Objekt, das die GNU-C-Bibliothek angibt, woraus der @command{nscd}-Befehl genommen werden soll." #. type: item -#: doc/guix.texi:11870 +#: doc/guix.texi:11868 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})" msgstr "@code{log-file} (Vorgabe: @code{\"/var/log/nscd.log\"})" #. type: table -#: doc/guix.texi:11873 +#: doc/guix.texi:11871 msgid "Name of the nscd log file. This is where debugging output goes when @code{debug-level} is strictly positive." msgstr "Name der nscd-Protokolldatei. Hierhin werden Ausgaben zur Fehlersuche geschrieben, falls @code{debug-level} echt positiv ist." #. type: item -#: doc/guix.texi:11874 +#: doc/guix.texi:11872 #, no-wrap msgid "@code{debug-level} (default: @code{0})" msgstr "@code{debug-level} (Vorgabe: @code{0})" #. type: table -#: doc/guix.texi:11877 +#: doc/guix.texi:11875 msgid "Integer denoting the debugging levels. Higher numbers mean that more debugging output is logged." msgstr "Eine ganze Zahl, die den Detailgrad der Ausgabe zur Fehlersuche angibt. Größere Zahlen bewirken eine ausführlichere Ausgabe." #. type: item -#: doc/guix.texi:11878 +#: doc/guix.texi:11876 #, no-wrap msgid "@code{caches} (default: @var{%nscd-default-caches})" msgstr "@code{caches} (Vorgabe: @var{%nscd-default-caches})" #. type: table -#: doc/guix.texi:11881 +#: doc/guix.texi:11879 msgid "List of @code{} objects denoting things to be cached; see below." msgstr "Liste der @code{}-Objekte, die repräsentieren, was alles zwischengespeichert werden soll; siehe unten." #. type: deftp -#: doc/guix.texi:11885 +#: doc/guix.texi:11883 #, no-wrap msgid "{Data Type} nscd-cache" msgstr "{Datentyp} nscd-cache" #. type: deftp -#: doc/guix.texi:11887 +#: doc/guix.texi:11885 msgid "Data type representing a cache database of nscd and its parameters." msgstr "Ein Datentyp, der eine Zwischenspeicher-Datenbank von nscd mitsamt ihren Parametern definiert." #. type: cindex -#: doc/guix.texi:11890 doc/guix.texi:15091 +#: doc/guix.texi:11888 doc/guix.texi:15088 #, no-wrap msgid "database" msgstr "Datenbank" #. type: table -#: doc/guix.texi:11895 +#: doc/guix.texi:11893 msgid "This is a symbol representing the name of the database to be cached. Valid values are @code{passwd}, @code{group}, @code{hosts}, and @code{services}, which designate the corresponding NSS database (@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual})." msgstr "Dies ist ein Symbol, was den Namen der Datenbank repräsentiert, die zwischengespeichert werden soll. Gültige Werte sind @code{passwd}, @code{group}, @code{hosts} und @code{services}, womit jeweils die entsprechende NSS-Datenbank bezeichnet wird (siehe @ref{NSS Basics,,, libc, The GNU C Library Reference Manual})." #. type: code{#1} -#: doc/guix.texi:11896 +#: doc/guix.texi:11894 #, no-wrap msgid "positive-time-to-live" msgstr "positive-time-to-live" #. type: itemx -#: doc/guix.texi:11897 +#: doc/guix.texi:11895 #, no-wrap msgid "@code{negative-time-to-live} (default: @code{20})" msgstr "@code{negative-time-to-live} (Vorgabe: @code{20})" #. type: table -#: doc/guix.texi:11900 +#: doc/guix.texi:11898 msgid "A number representing the number of seconds during which a positive or negative lookup result remains in cache." msgstr "Eine Zahl, die für die Anzahl an Sekunden steht, die ein erfolgreiches (positives) oder erfolgloses (negatives) Nachschlageresultat im Zwischenspeicher verbleibt." #. type: item -#: doc/guix.texi:11901 +#: doc/guix.texi:11899 #, no-wrap msgid "@code{check-files?} (default: @code{#t})" msgstr "@code{check-files?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11904 +#: doc/guix.texi:11902 msgid "Whether to check for updates of the files corresponding to @var{database}." msgstr "Ob auf Änderungen an den der @var{database} entsprechenden Dateien reagiert werden soll." #. type: table -#: doc/guix.texi:11908 +#: doc/guix.texi:11906 msgid "For instance, when @var{database} is @code{hosts}, setting this flag instructs nscd to check for updates in @file{/etc/hosts} and to take them into account." msgstr "Wenn @var{database} zum Beispiel @code{hosts} ist, wird, wenn dieses Feld gesetzt ist, nscd Änderungen an @file{/etc/hosts} beobachten und berücksichtigen." #. type: item -#: doc/guix.texi:11909 +#: doc/guix.texi:11907 #, no-wrap msgid "@code{persistent?} (default: @code{#t})" msgstr "@code{persistent?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11911 +#: doc/guix.texi:11909 msgid "Whether the cache should be stored persistently on disk." msgstr "Ob der Zwischenspeicher dauerhaft auf der Platte gespeichert werden soll." #. type: item -#: doc/guix.texi:11912 +#: doc/guix.texi:11910 #, no-wrap msgid "@code{shared?} (default: @code{#t})" msgstr "@code{shared?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11914 +#: doc/guix.texi:11912 msgid "Whether the cache should be shared among users." msgstr "Ob der Zwischenspeicher zwischen den Nutzern geteilt werden soll." #. type: item -#: doc/guix.texi:11915 +#: doc/guix.texi:11913 #, no-wrap msgid "@code{max-database-size} (default: 32@tie{}MiB)" msgstr "@code{max-database-size} (Vorgabe: 32@tie{}MiB)" #. type: table -#: doc/guix.texi:11917 +#: doc/guix.texi:11915 msgid "Maximum size in bytes of the database cache." msgstr "Die Maximalgröße des Datenbank-Zwischenspeichers in Bytes." #. type: defvr -#: doc/guix.texi:11924 +#: doc/guix.texi:11922 #, no-wrap msgid "{Scheme Variable} %nscd-default-caches" msgstr "{Scheme-Variable} %nscd-default-caches" #. type: defvr -#: doc/guix.texi:11927 +#: doc/guix.texi:11925 msgid "List of @code{} objects used by default by @code{nscd-configuration} (see above)." msgstr "Liste von @code{}-Objekten, die von der vorgegebenen @code{nscd-configuration} benutzt werden (siehe oben)." #. type: defvr -#: doc/guix.texi:11933 +#: doc/guix.texi:11931 msgid "It enables persistent and aggressive caching of service and host name lookups. The latter provides better host name lookup performance, resilience in the face of unreliable name servers, and also better privacy---often the result of host name lookups is in local cache, so external name servers do not even need to be queried." msgstr "Damit wird dauerhaftes und aggressives Zwischenspeichern beim Nachschlagen von Dienst- und Rechnernamen („Host“-Namen) aktiviert. Letzteres verbessert die Leistungsfähigkeit beim Nachschlagen von Rechnernamen, sorgt für mehr Widerstandsfähigkeit gegenüber unverlässlichen Namens-Servern und bietet außerdem einen besseren Datenschutz — oftmals befindet sich das Ergebnis einer Anfrage nach einem Rechnernamen bereits im lokalen Zwischenspeicher und externe Namens-Server müssen nicht miteinbezogen werden." #. type: anchor{#1} -#: doc/guix.texi:11936 +#: doc/guix.texi:11934 msgid "syslog-configuration-type" msgstr "syslog-configuration-type" #. type: cindex -#: doc/guix.texi:11936 doc/guix.texi:11952 +#: doc/guix.texi:11934 doc/guix.texi:11950 #, no-wrap msgid "syslog" msgstr "syslog" #. type: cindex -#: doc/guix.texi:11937 doc/guix.texi:12374 +#: doc/guix.texi:11935 doc/guix.texi:12372 #, no-wrap msgid "logging" msgstr "Protokollierung" #. type: deftp -#: doc/guix.texi:11938 +#: doc/guix.texi:11936 #, no-wrap msgid "{Data Type} syslog-configuration" msgstr "{Datentyp} syslog-configuration" #. type: deftp -#: doc/guix.texi:11940 +#: doc/guix.texi:11938 msgid "This data type represents the configuration of the syslog daemon." msgstr "Dieser Datentyp repräsentiert die Konfiguration des syslog-Daemons." #. type: item -#: doc/guix.texi:11942 +#: doc/guix.texi:11940 #, no-wrap msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" msgstr "@code{syslogd} (Vorgabe: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" #. type: table -#: doc/guix.texi:11944 +#: doc/guix.texi:11942 msgid "The syslog daemon to use." msgstr "Welcher Syslog-Daemon benutzt werden soll." #. type: item -#: doc/guix.texi:11945 +#: doc/guix.texi:11943 #, no-wrap msgid "@code{config-file} (default: @code{%default-syslog.conf})" msgstr "@code{config-file} (Vorgabe: @code{%default-syslog.conf})" #. type: table -#: doc/guix.texi:11947 +#: doc/guix.texi:11945 msgid "The syslog configuration file to use." msgstr "Die zu benutzende syslog-Konfigurationsdatei." #. type: anchor{#1} -#: doc/guix.texi:11952 +#: doc/guix.texi:11950 msgid "syslog-service" msgstr "syslog-service" #. type: deffn -#: doc/guix.texi:11953 +#: doc/guix.texi:11951 #, no-wrap msgid "{Scheme Procedure} syslog-service @var{config}" msgstr "{Scheme-Prozedur} syslog-service @var{Konfiguration}" #. type: deffn -#: doc/guix.texi:11955 +#: doc/guix.texi:11953 msgid "Return a service that runs a syslog daemon according to @var{config}." msgstr "Liefert einen Dienst, der einen syslog-Daemon entsprechend der @var{Konfiguration} ausführt." #. type: deffn -#: doc/guix.texi:11958 +#: doc/guix.texi:11956 msgid "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information on the configuration file syntax." msgstr "Siehe @ref{syslogd invocation,,, inetutils, GNU Inetutils} für weitere Informationen über die Syntax der Konfiguration." #. type: defvr -#: doc/guix.texi:11960 +#: doc/guix.texi:11958 #, no-wrap msgid "{Scheme Variable} guix-service-type" msgstr "{Scheme-Variable} guix-service-type" #. type: defvr -#: doc/guix.texi:11964 +#: doc/guix.texi:11962 msgid "This is the type of the service that runs the build daemon, @command{guix-daemon} (@pxref{Invoking guix-daemon}). Its value must be a @code{guix-configuration} record as described below." msgstr "Dies ist der Typ für den Dienst, der den Erstellungs-Daemon @command{guix-daemon} ausführt (siehe @ref{Invoking guix-daemon}). Als Wert muss ein @code{guix-configuration}-Verbundsobjekt verwendet werden, wie unten beschrieben." #. type: anchor{#1} -#: doc/guix.texi:11967 +#: doc/guix.texi:11965 msgid "guix-configuration-type" msgstr "guix-configuration-type" #. type: deftp -#: doc/guix.texi:11967 +#: doc/guix.texi:11965 #, no-wrap msgid "{Data Type} guix-configuration" msgstr "{Datentyp} guix-configuration" #. type: deftp -#: doc/guix.texi:11970 +#: doc/guix.texi:11968 msgid "This data type represents the configuration of the Guix build daemon. @xref{Invoking guix-daemon}, for more information." msgstr "Dieser Datentyp repräsentiert die Konfiguration des Erstellungs-Daemons von Guix. Siehe @ref{Invoking guix-daemon} für weitere Informationen." #. type: item -#: doc/guix.texi:11972 +#: doc/guix.texi:11970 #, no-wrap msgid "@code{guix} (default: @var{guix})" msgstr "@code{guix} (Vorgabe: @var{guix})" #. type: table -#: doc/guix.texi:11974 doc/guix.texi:12194 +#: doc/guix.texi:11972 doc/guix.texi:12192 msgid "The Guix package to use." msgstr "Das zu verwendende Guix-Paket." #. type: item -#: doc/guix.texi:11975 +#: doc/guix.texi:11973 #, no-wrap msgid "@code{build-group} (default: @code{\"guixbuild\"})" msgstr "@code{build-group} (Vorgabe: @code{\"guixbuild\"})" #. type: table -#: doc/guix.texi:11977 +#: doc/guix.texi:11975 msgid "Name of the group for build user accounts." msgstr "Der Name der Gruppe, zu der die Erstellungs-Benutzerkonten gehören." #. type: item -#: doc/guix.texi:11978 +#: doc/guix.texi:11976 #, no-wrap msgid "@code{build-accounts} (default: @code{10})" msgstr "@code{build-accounts} (Vorgabe: @code{10})" #. type: table -#: doc/guix.texi:11980 +#: doc/guix.texi:11978 msgid "Number of build user accounts to create." msgstr "Die Anzahl zu erzeugender Erstellungs-Benutzerkonten." #. type: item -#: doc/guix.texi:11981 +#: doc/guix.texi:11979 #, no-wrap msgid "@code{authorize-key?} (default: @code{#t})" msgstr "@code{authorize-key?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11986 +#: doc/guix.texi:11984 msgid "Whether to authorize the substitute keys listed in @code{authorized-keys}---by default that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})." msgstr "Ob die unter @code{authorized-keys} aufgelisteten Substitutschlüssel autorisiert werden sollen — vorgegeben ist, den von @code{@value{SUBSTITUTE-SERVER}} zu autorisieren (siehe @ref{Substitutes})." #. type: vindex -#: doc/guix.texi:11987 +#: doc/guix.texi:11985 #, no-wrap msgid "%default-authorized-guix-keys" msgstr "%default-authorized-guix-keys" #. type: item -#: doc/guix.texi:11988 +#: doc/guix.texi:11986 #, no-wrap msgid "@code{authorized-keys} (default: @var{%default-authorized-guix-keys})" msgstr "@code{authorized-keys} (Vorgabe: @var{%default-authorized-guix-keys})" #. type: table -#: doc/guix.texi:11992 +#: doc/guix.texi:11990 msgid "The list of authorized key files for archive imports, as a list of string-valued gexps (@pxref{Invoking guix archive}). By default, it contains that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})." msgstr "Die Liste der Dateien mit autorisierten Schlüsseln, d.h.@: eine Liste von Zeichenketten als G-Ausdrücke (siehe @ref{Invoking guix archive}). Der vorgegebene Inhalt ist der Schlüssel von @code{@value{SUBSTITUTE-SERVER}} (siehe @ref{Substitutes})." #. type: item -#: doc/guix.texi:11993 +#: doc/guix.texi:11991 #, no-wrap msgid "@code{use-substitutes?} (default: @code{#t})" msgstr "@code{use-substitutes?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:11995 +#: doc/guix.texi:11993 msgid "Whether to use substitutes." msgstr "Ob Substitute benutzt werden sollen." #. type: item -#: doc/guix.texi:11996 +#: doc/guix.texi:11994 #, no-wrap msgid "@code{substitute-urls} (default: @var{%default-substitute-urls})" msgstr "@code{substitute-urls} (Vorgabe: @var{%default-substitute-urls})" #. type: table -#: doc/guix.texi:11998 +#: doc/guix.texi:11996 msgid "The list of URLs where to look for substitutes by default." msgstr "Die Liste der URLs, auf denen nach Substituten gesucht wird, wenn nicht anders angegeben." #. type: item -#: doc/guix.texi:11999 +#: doc/guix.texi:11997 #, no-wrap msgid "@code{max-silent-time} (default: @code{0})" msgstr "@code{max-silent-time} (Vorgabe: @code{0})" #. type: itemx -#: doc/guix.texi:12000 +#: doc/guix.texi:11998 #, no-wrap msgid "@code{timeout} (default: @code{0})" msgstr "@code{timeout} (Vorgabe: @code{0})" #. type: table -#: doc/guix.texi:12004 +#: doc/guix.texi:12002 msgid "The number of seconds of silence and the number of seconds of activity, respectively, after which a build process times out. A value of zero disables the timeout." msgstr "Die Anzahl an Sekunden, die jeweils nichts in die Ausgabe geschrieben werden darf bzw. die es insgesamt dauern darf, bis ein Erstellungsprozess abgebrochen wird. Beim Wert null wird nie abgebrochen." #. type: item -#: doc/guix.texi:12005 +#: doc/guix.texi:12003 #, no-wrap msgid "@code{log-compression} (default: @code{'bzip2})" msgstr "@code{log-compression} (Vorgabe: @code{'bzip2})" #. type: table -#: doc/guix.texi:12008 +#: doc/guix.texi:12006 msgid "The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}." msgstr "Die für Erstellungsprotokolle zu benutzende Kompressionsmethode — entweder @code{gzip}, @code{bzip2} oder @code{none}." #. type: table -#: doc/guix.texi:12011 +#: doc/guix.texi:12009 msgid "List of extra command-line options for @command{guix-daemon}." msgstr "Eine Liste zusätzlicher Befehlszeilenoptionen zu @command{guix-daemon}." #. type: item -#: doc/guix.texi:12012 +#: doc/guix.texi:12010 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})" msgstr "@code{log-file} (Vorgabe: @code{\"/var/log/guix-daemon.log\"})" #. type: table -#: doc/guix.texi:12015 +#: doc/guix.texi:12013 msgid "File where @command{guix-daemon}'s standard output and standard error are written." msgstr "Die Datei, in die die Standardausgabe und die Standardfehlerausgabe von @command{guix-daemon} geschrieben werden." #. type: item -#: doc/guix.texi:12016 +#: doc/guix.texi:12014 #, no-wrap msgid "@code{http-proxy} (default: @code{#f})" msgstr "@code{http-proxy} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12019 +#: doc/guix.texi:12017 msgid "The HTTP proxy used for downloading fixed-output derivations and substitutes." msgstr "Der für das Herunterladen von Ableitungen mit fester Ausgabe und von Substituten zu verwendende HTTP-Proxy." #. type: item -#: doc/guix.texi:12020 +#: doc/guix.texi:12018 #, no-wrap msgid "@code{tmpdir} (default: @code{#f})" msgstr "@code{tmpdir} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12022 +#: doc/guix.texi:12020 msgid "A directory path where the @command{guix-daemon} will perform builds." msgstr "Ein Verzeichnispfad, der angibt, wo @command{guix-daemon} seine Erstellungen durchführt." #. type: deffn -#: doc/guix.texi:12026 +#: doc/guix.texi:12024 #, no-wrap msgid "{Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]" msgstr "{Scheme-Prozedur} udev-service [#:udev @var{eudev} #:rules @code{'()}]" #. type: deffn -#: doc/guix.texi:12031 +#: doc/guix.texi:12029 msgid "Run @var{udev}, which populates the @file{/dev} directory dynamically. udev rules can be provided as a list of files through the @var{rules} variable. The procedures @code{udev-rule} and @code{file->udev-rule} from @code{(gnu services base)} simplify the creation of such rule files." msgstr "Führt @var{udev} aus, was zur Laufzeit Gerätedateien ins Verzeichnis @file{/dev} einfügt. udev-Regeln können über die @var{rules}-Variable als eine Liste von Dateien übergeben werden. Die Prozeduren @code{udev-rule} und @code{file->udev-rule} aus @code{(gnu services base)} vereinfachen die Erstellung einer solchen Regeldatei." #. type: deffn -#: doc/guix.texi:12033 +#: doc/guix.texi:12031 #, no-wrap msgid "{Scheme Procedure} udev-rule [@var{file-name} @var{contents}]" msgstr "{Scheme-Prozedur} udev-rule [@var{Dateiname} @var{Inhalt}]" #. type: deffn -#: doc/guix.texi:12036 +#: doc/guix.texi:12034 msgid "Return a udev-rule file named @var{file-name} containing the rules defined by the @var{contents} literal." msgstr "Liefert eine udev-Regeldatei mit dem angegebenen @var{Dateiname}n, in der die vom Literal @var{Inhalt} definierten Regeln stehen." #. type: deffn -#: doc/guix.texi:12040 +#: doc/guix.texi:12038 msgid "In the following example, a rule for a USB device is defined to be stored in the file @file{90-usb-thing.rules}. The rule runs a script upon detecting a USB device with a given product identifier." msgstr "Im folgenden Beispiel wird eine Regel für ein USB-Gerät definiert und in der Datei @file{90-usb-ding.rules} gespeichert. Mit der Regel wird ein Skript ausgeführt, sobald ein USB-Gerät mit der angegebenen Produktkennung erkannt wird." #. type: example -#: doc/guix.texi:12048 +#: doc/guix.texi:12046 #, no-wrap msgid "" "(define %example-udev-rule\n" @@ -21780,17 +21791,17 @@ msgstr "" " \"RUN+=\\\"/pfad/zum/skript\\\"\")))\n" #. type: deffn -#: doc/guix.texi:12052 +#: doc/guix.texi:12050 msgid "The @command{herd rules udev} command, as root, returns the name of the directory containing all the active udev rules." msgstr "Der Befehl @command{herd rules udev} liefert, wenn er als Administratornutzer „root“ ausgeführt wird, Namen und Verzeichnis von allen aktiven udev-Regeln." #. type: Plain text -#: doc/guix.texi:12055 +#: doc/guix.texi:12053 msgid "Here we show how the default @var{udev-service} can be extended with it." msgstr "Hier zeigen wir, wie man den vorgegebenen @var{udev-service} um sie erweitern kann." #. type: example -#: doc/guix.texi:12065 +#: doc/guix.texi:12063 #, no-wrap msgid "" "(operating-system\n" @@ -21812,23 +21823,23 @@ msgstr "" " (list %beispiel-udev-rule))))))))\n" #. type: deffn -#: doc/guix.texi:12067 +#: doc/guix.texi:12065 #, no-wrap msgid "{Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]" msgstr "{Scheme-Prozedur} file->udev-rule [@var{Dateiname} @var{Datei}]" #. type: deffn -#: doc/guix.texi:12070 +#: doc/guix.texi:12068 msgid "Return a udev file named @var{file-name} containing the rules defined within @var{file}, a file-like object." msgstr "Liefert eine udev-Datei mit dem angegebenen @var{Dateiname}n, in der alle in der @var{Datei}, einem dateiartigen Objekt, definierten Regeln stehen." #. type: deffn -#: doc/guix.texi:12072 +#: doc/guix.texi:12070 msgid "The following example showcases how we can use an existing rule file." msgstr "Folgendes Beispiel stellt dar, wie wir eine bestehende Regeldatei verwenden können." #. type: example -#: doc/guix.texi:12077 +#: doc/guix.texi:12075 #, no-wrap msgid "" "(use-modules (guix download) ;for url-fetch\n" @@ -21842,7 +21853,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12088 +#: doc/guix.texi:12086 #, no-wrap msgid "" "(define %android-udev-rules\n" @@ -21868,17 +21879,17 @@ msgstr "" " (base32 \"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n" #. type: Plain text -#: doc/guix.texi:12097 +#: doc/guix.texi:12095 msgid "Additionally, Guix package definitions can be included in @var{rules} in order to extend the udev rules with the definitions found under their @file{lib/udev/rules.d} sub-directory. In lieu of the previous @var{file->udev-rule} example, we could have used the @var{android-udev-rules} package which exists in Guix in the @code{(gnu packages android)} module." msgstr "Zusätzlich können Guix-Paketdefinitionen unter den @var{rules} aufgeführt werden, um die udev-Regeln um diejenigen Definitionen zu ergänzen, die im Unterverzeichnis @file{lib/udev/rules.d} des jeweiligen Pakets aufgeführt sind. Statt des bisherigen Beispiels zu @var{file->udev-rule} hätten wir also auch das Paket @var{android-udev-rules} benutzen können, das in Guix im Modul @code{(gnu packages android)} vorhanden ist." #. type: Plain text -#: doc/guix.texi:12106 +#: doc/guix.texi:12104 msgid "The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices without root privileges. It also details how to create the @code{adbusers} group, which is required for the proper functioning of the rules defined within the @var{android-udev-rules} package. To create such a group, we must define it both as part of the @var{supplementary-groups} of our @var{user-account} declaration, as well as in the @var{groups} field of the @var{operating-system} record." msgstr "Das folgende Beispiel zeit, wie dieses Paket @var{android-udev-rules} benutzt werden kann, damit das „Android-Tool“ @command{adb} Geräte erkennen kann, ohne dafür Administratorrechte vorauszusetzen. Man sieht hier auch, wie die Benutzergruppe @code{adbusers} erstellt werden kann, die existieren muss, damit die im Paket @var{android-udev-rules} definierten Regeln richtig funktionieren. Um so eine Benutzergruppe zu erzeugen, müssen wir sie sowohl unter den @var{supplementary-groups} unserer @var{user-account}-Deklaration aufführen, als auch sie im @var{groups}-Feld des @var{operating-system}-Verbundsobjekts aufführen." #. type: example -#: doc/guix.texi:12111 +#: doc/guix.texi:12109 #, no-wrap msgid "" "(use-modules (gnu packages android) ;for android-udev-rules\n" @@ -21892,7 +21903,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12120 +#: doc/guix.texi:12118 #, no-wrap msgid "" "(operating-system\n" @@ -21916,7 +21927,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12123 +#: doc/guix.texi:12121 #, no-wrap msgid "" " (groups (cons (user-group (system? #t) (name \"adbusers\"))\n" @@ -21928,7 +21939,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12125 +#: doc/guix.texi:12123 #, no-wrap msgid "" " ;; @dots{}\n" @@ -21938,7 +21949,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:12133 +#: doc/guix.texi:12131 #, no-wrap msgid "" " (services\n" @@ -21958,266 +21969,266 @@ msgstr "" " (udev-configuration-rules config))))))))\n" #. type: defvr -#: doc/guix.texi:12135 +#: doc/guix.texi:12133 #, no-wrap msgid "{Scheme Variable} urandom-seed-service-type" msgstr "{Scheme-Variable} urandom-seed-service-type" #. type: defvr -#: doc/guix.texi:12140 +#: doc/guix.texi:12138 msgid "Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom} when rebooting. It also tries to seed @file{/dev/urandom} from @file{/dev/hwrng} while booting, if @file{/dev/hwrng} exists and is readable." msgstr "Etwas Entropie in der Datei @var{%random-seed-file} aufsparen, die als Startwert (als sogenannter „Seed“) für @file{/dev/urandom} dienen kann, nachdem das System neu gestartet wurde. Es wird auch versucht, @file{/dev/urandom} beim Hochfahren mit Werten aus @file{/dev/hwrng} zu starten, falls @file{/dev/hwrng} existiert und lesbar ist." #. type: defvr -#: doc/guix.texi:12142 +#: doc/guix.texi:12140 #, no-wrap msgid "{Scheme Variable} %random-seed-file" msgstr "{Scheme-Variable} %random-seed-file" #. type: defvr -#: doc/guix.texi:12146 +#: doc/guix.texi:12144 msgid "This is the name of the file where some random bytes are saved by @var{urandom-seed-service} to seed @file{/dev/urandom} when rebooting. It defaults to @file{/var/lib/random-seed}." msgstr "Der Name der Datei, in der einige zufällige Bytes vom @var{urandom-seed-service} abgespeichert werden, um sie nach einem Neustart von dort als Startwert für @file{/dev/urandom} auslesen zu können. Als Vorgabe wird @file{/var/lib/random-seed} verwendet." #. type: cindex -#: doc/guix.texi:12148 +#: doc/guix.texi:12146 #, no-wrap msgid "mouse" msgstr "Maus" #. type: cindex -#: doc/guix.texi:12149 +#: doc/guix.texi:12147 #, no-wrap msgid "gpm" msgstr "gpm" #. type: defvr -#: doc/guix.texi:12150 +#: doc/guix.texi:12148 #, no-wrap msgid "{Scheme Variable} gpm-service-type" msgstr "{Scheme-Variable} gpm-service-type" #. type: defvr -#: doc/guix.texi:12155 +#: doc/guix.texi:12153 msgid "This is the type of the service that runs GPM, the @dfn{general-purpose mouse daemon}, which provides mouse support to the Linux console. GPM allows users to use the mouse in the console, notably to select, copy, and paste text." msgstr "Dieser Typ wird für den Dienst verwendet, der GPM ausführt, den @dfn{General-Purpose Mouse Daemon}, welcher zur Linux-Konsole Mausunterstützung hinzufügt. GPM ermöglicht es seinen Benutzern, auch in der Konsole die Maus zu benutzen und damit etwa Text auszuwählen, zu kopieren und einzufügen." #. type: defvr -#: doc/guix.texi:12158 +#: doc/guix.texi:12156 msgid "The value for services of this type must be a @code{gpm-configuration} (see below). This service is not part of @var{%base-services}." msgstr "Der Wert für Dienste dieses Typs muss eine @code{gpm-configuration} sein (siehe unten). Dieser Dienst gehört @emph{nicht} zu den @var{%base-services}." #. type: deftp -#: doc/guix.texi:12160 +#: doc/guix.texi:12158 #, no-wrap msgid "{Data Type} gpm-configuration" msgstr "{Datentyp} gpm-configuration" #. type: deftp -#: doc/guix.texi:12162 +#: doc/guix.texi:12160 msgid "Data type representing the configuration of GPM." msgstr "Repräsentiert die Konfiguration von GPM." #. type: item -#: doc/guix.texi:12164 +#: doc/guix.texi:12162 #, no-wrap msgid "@code{options} (default: @code{%default-gpm-options})" msgstr "@code{options} (Vorgabe: @code{%default-gpm-options})" #. type: table -#: doc/guix.texi:12169 +#: doc/guix.texi:12167 msgid "Command-line options passed to @command{gpm}. The default set of options instruct @command{gpm} to listen to mouse events on @file{/dev/input/mice}. @xref{Command Line,,, gpm, gpm manual}, for more information." msgstr "Befehlszeilenoptionen, die an @command{gpm} übergeben werden. Die vorgegebenen Optionen weisen @command{gpm} an, auf Maus-Ereignisse auf der Datei @file{/dev/input/mice} zu lauschen. Siehe @ref{Command Line,,, gpm, gpm manual} für weitere Informationen." #. type: item -#: doc/guix.texi:12170 +#: doc/guix.texi:12168 #, no-wrap msgid "@code{gpm} (default: @code{gpm})" msgstr "@code{gpm} (Vorgabe: @code{gpm})" #. type: table -#: doc/guix.texi:12172 +#: doc/guix.texi:12170 msgid "The GPM package to use." msgstr "Das GPM-Paket, was benutzt werden soll." #. type: anchor{#1} -#: doc/guix.texi:12177 +#: doc/guix.texi:12175 msgid "guix-publish-service-type" msgstr "guix-publish-service-type" #. type: deffn -#: doc/guix.texi:12177 +#: doc/guix.texi:12175 #, no-wrap msgid "{Scheme Variable} guix-publish-service-type" msgstr "{Scheme-Variable} guix-publish-service-type" #. type: deffn -#: doc/guix.texi:12181 +#: doc/guix.texi:12179 msgid "This is the service type for @command{guix publish} (@pxref{Invoking guix publish}). Its value must be a @code{guix-configuration} object, as described below." msgstr "Dies ist der Diensttyp für @command{guix publish} (siehe @ref{Invoking guix publish}). Sein Wert muss ein @code{guix-publish-configuration}-Objekt sein, wie im Folgenden beschrieben." #. type: deffn -#: doc/guix.texi:12185 +#: doc/guix.texi:12183 msgid "This assumes that @file{/etc/guix} already contains a signing key pair as created by @command{guix archive --generate-key} (@pxref{Invoking guix archive}). If that is not the case, the service will fail to start." msgstr "Hierbei wird angenommen, dass @file{/etc/guix} bereits ein mit @command{guix archive --generate-key} erzeugtes Schlüsselpaar zum Signieren enthält (siehe @ref{Invoking guix archive}). Falls nicht, wird der Dienst beim Starten fehlschlagen." #. type: deftp -#: doc/guix.texi:12187 +#: doc/guix.texi:12185 #, no-wrap msgid "{Data Type} guix-publish-configuration" msgstr "{Datentyp} guix-publish-configuration" #. type: deftp -#: doc/guix.texi:12190 +#: doc/guix.texi:12188 msgid "Data type representing the configuration of the @code{guix publish} service." msgstr "Der Datentyp, der die Konfiguration des „@code{guix publish}“-Dienstes repräsentiert." #. type: item -#: doc/guix.texi:12192 +#: doc/guix.texi:12190 #, no-wrap msgid "@code{guix} (default: @code{guix})" msgstr "@code{guix} (Vorgabe: @code{guix})" #. type: item -#: doc/guix.texi:12195 +#: doc/guix.texi:12193 #, no-wrap msgid "@code{port} (default: @code{80})" msgstr "@code{port} (Vorgabe: @code{80})" #. type: table -#: doc/guix.texi:12197 +#: doc/guix.texi:12195 msgid "The TCP port to listen for connections." msgstr "Der TCP-Port, auf dem auf Verbindungen gelauscht werden soll." #. type: item -#: doc/guix.texi:12198 +#: doc/guix.texi:12196 #, no-wrap msgid "@code{host} (default: @code{\"localhost\"})" msgstr "@code{host} (Vorgabe: @code{\"localhost\"})" #. type: table -#: doc/guix.texi:12201 +#: doc/guix.texi:12199 msgid "The host (and thus, network interface) to listen to. Use @code{\"0.0.0.0\"} to listen on all the network interfaces." msgstr "Unter welcher Rechneradresse (welchem „Host“, also welcher Netzwerkschnittstelle) auf Verbindungen gelauscht wird. Benutzen Sie @code{\"0.0.0.0\"}, wenn auf allen verfügbaren Netzwerkschnittstellen gelauscht werden soll." #. type: table -#: doc/guix.texi:12206 +#: doc/guix.texi:12204 msgid "The gzip compression level at which substitutes are compressed. Use @code{0} to disable compression altogether, and @code{9} to get the best compression ratio at the expense of increased CPU usage." msgstr "Die gzip-Kompressionsstufe, mit der Substitute komprimiert werden sollen. Benutzen Sie @code{0}, um Kompression völlig abzuschalten, und @code{9} für das höchste Kompressionsverhältnis, zu Lasten von zusätzlicher Prozessorauslastung." #. type: item -#: doc/guix.texi:12207 +#: doc/guix.texi:12205 #, no-wrap msgid "@code{nar-path} (default: @code{\"nar\"})" msgstr "@code{nar-path} (Vorgabe: @code{\"nar\"})" #. type: table -#: doc/guix.texi:12210 +#: doc/guix.texi:12208 msgid "The URL path at which ``nars'' can be fetched. @xref{Invoking guix publish, @code{--nar-path}}, for details." msgstr "Der URL-Pfad, unter dem „Nars“ zum Herunterladen angeboten werden. Siehe @ref{Invoking guix publish, @code{--nar-path}} für Details." #. type: item -#: doc/guix.texi:12211 +#: doc/guix.texi:12209 #, no-wrap msgid "@code{cache} (default: @code{#f})" msgstr "@code{cache} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12217 +#: doc/guix.texi:12215 msgid "When it is @code{#f}, disable caching and instead generate archives on demand. Otherwise, this should be the name of a directory---e.g., @code{\"/var/cache/guix/publish\"}---where @command{guix publish} caches archives and meta-data ready to be sent. @xref{Invoking guix publish, @option{--cache}}, for more information on the tradeoffs involved." msgstr "Wenn dies @code{#f} ist, werden Archive nicht zwischengespeichert, sondern erst bei einer Anfrage erzeugt. Andernfalls sollte dies der Name eines Verzeichnisses sein — z.B.@: @code{\"/var/cache/guix/publish\"} —, in das @command{guix publish} fertige Archive und Metadaten zwischenspeichern soll. Siehe @ref{Invoking guix publish, @option{--cache}} für weitere Informationen über die jeweiligen Vor- und Nachteile." #. type: item -#: doc/guix.texi:12218 +#: doc/guix.texi:12216 #, no-wrap msgid "@code{workers} (default: @code{#f})" msgstr "@code{workers} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12222 +#: doc/guix.texi:12220 msgid "When it is an integer, this is the number of worker threads used for caching; when @code{#f}, the number of processors is used. @xref{Invoking guix publish, @option{--workers}}, for more information." msgstr "Ist dies eine ganze Zahl, gibt es die Anzahl der Worker-Threads an, die zum Zwischenspeichern benutzt werden; ist es @code{#f}, werden so viele benutzt, wie es Prozessoren gibt. Siehe @ref{Invoking guix publish, @option{--workers}} für mehr Informationen." #. type: item -#: doc/guix.texi:12223 +#: doc/guix.texi:12221 #, no-wrap msgid "@code{ttl} (default: @code{#f})" msgstr "@code{ttl} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12227 +#: doc/guix.texi:12225 msgid "When it is an integer, this denotes the @dfn{time-to-live} in seconds of the published archives. @xref{Invoking guix publish, @option{--ttl}}, for more information." msgstr "Wenn dies eine ganze Zahl ist, bezeichnet sie die @dfn{Time-to-live} als die Anzahl der Sekunden, die heruntergeladene veröffentlichte Archive zwischengespeichert werden dürfen. Siehe @ref{Invoking guix publish, @option{--ttl}} für mehr Informationen." #. type: anchor{#1} -#: doc/guix.texi:12231 +#: doc/guix.texi:12229 msgid "rngd-service" msgstr "rngd-service" #. type: deffn -#: doc/guix.texi:12231 +#: doc/guix.texi:12229 #, no-wrap msgid "{Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @" msgstr "{Scheme-Prozedur} rngd-service [#:rng-tools @var{rng-tools}] @" #. type: deffn -#: doc/guix.texi:12236 +#: doc/guix.texi:12234 msgid "[#:device \"/dev/hwrng\"] Return a service that runs the @command{rngd} program from @var{rng-tools} to add @var{device} to the kernel's entropy pool. The service will fail if @var{device} does not exist." msgstr "[#:device \"/dev/hwrng\"] Liefert einen Dienst, der das @command{rngd}-Programm aus den @var{rng-tools} benutzt, um das mit @var{device} bezeichnete Gerät zum Entropie-Pool des Kernels hinzuzufügen. Dieser Dienst wird fehlschlagen, falls das mit @var{device} bezeichnete Gerät nicht existiert." #. type: anchor{#1} -#: doc/guix.texi:12239 +#: doc/guix.texi:12237 msgid "pam-limits-service" msgstr "pam-limits-service" #. type: cindex -#: doc/guix.texi:12239 +#: doc/guix.texi:12237 #, no-wrap msgid "session limits" msgstr "Sitzungs-Limits" #. type: cindex -#: doc/guix.texi:12240 +#: doc/guix.texi:12238 #, no-wrap msgid "ulimit" msgstr "ulimit" #. type: cindex -#: doc/guix.texi:12241 +#: doc/guix.texi:12239 #, no-wrap msgid "priority" msgstr "Priorität" #. type: cindex -#: doc/guix.texi:12242 +#: doc/guix.texi:12240 #, no-wrap msgid "realtime" msgstr "Echtzeit" #. type: cindex -#: doc/guix.texi:12243 +#: doc/guix.texi:12241 #, no-wrap msgid "jackd" msgstr "jackd" #. type: deffn -#: doc/guix.texi:12244 +#: doc/guix.texi:12242 #, no-wrap msgid "{Scheme Procedure} pam-limits-service [#:limits @code{'()}]" msgstr "{Scheme-Prozedur} pam-limits-service [#:limits @code{'()}]" #. type: deffn -#: doc/guix.texi:12251 +#: doc/guix.texi:12249 msgid "Return a service that installs a configuration file for the @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits} module}. The procedure optionally takes a list of @code{pam-limits-entry} values, which can be used to specify @code{ulimit} limits and nice priority limits to user sessions." msgstr "Liefert einen Dienst, der eine Konfigurationsdatei für das @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits}-Modul} installiert. Diese Prozedur nimmt optional eine Liste von @code{pam-limits-entry}-Werten entgegen, die benutzt werden können, um @code{ulimit}-Limits und nice-Prioritäten für Benutzersitzungen festzulegen." #. type: deffn -#: doc/guix.texi:12254 +#: doc/guix.texi:12252 msgid "The following limits definition sets two hard and soft limits for all login sessions of users in the @code{realtime} group:" msgstr "Die folgenden Limit-Definitionen setzen zwei harte und weiche Limits für alle Anmeldesitzungen für Benutzer in der @code{realtime}-Gruppe." #. type: example -#: doc/guix.texi:12260 +#: doc/guix.texi:12258 #, no-wrap msgid "" "(pam-limits-service\n" @@ -22231,40 +22242,40 @@ msgstr "" " (pam-limits-entry \"@@realtime\" 'both 'memlock 'unlimited)))\n" #. type: deffn -#: doc/guix.texi:12266 +#: doc/guix.texi:12264 msgid "The first entry increases the maximum realtime priority for non-privileged processes; the second entry lifts any restriction of the maximum address space that can be locked in memory. These settings are commonly used for real-time audio systems." msgstr "Der erste Eintrag erhöht die maximale Echtzeit-Priorität für unprivilegierte Prozesse ohne zusätzliche Berechtigungen; der zweite Eintrag hebt jegliche Einschränkungen des maximalen Adressbereichs auf, der im Speicher reserviert werden darf. Diese Einstellungen werden in dieser Form oft für Echtzeit-Audio-Systeme verwendet." #. type: cindex -#: doc/guix.texi:12271 +#: doc/guix.texi:12269 #, no-wrap msgid "cron" msgstr "cron" #. type: cindex -#: doc/guix.texi:12272 +#: doc/guix.texi:12270 #, no-wrap msgid "mcron" msgstr "mcron" #. type: cindex -#: doc/guix.texi:12273 +#: doc/guix.texi:12271 #, no-wrap msgid "scheduling jobs" msgstr "Planen von Aufträgen" #. type: Plain text -#: doc/guix.texi:12280 +#: doc/guix.texi:12278 msgid "The @code{(gnu services mcron)} module provides an interface to GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, GNU@tie{}mcron}). GNU@tie{}mcron is similar to the traditional Unix @command{cron} daemon; the main difference is that it is implemented in Guile Scheme, which provides a lot of flexibility when specifying the scheduling of jobs and their actions." msgstr "Das Modul @code{(gnu services mcron)} enthält eine Schnittstelle zu GNU@tie{}mcron, einem Daemon, der gemäß einem vorher festgelegten Zeitplan Aufträge (sogenannte „Jobs“) ausführt (siehe @ref{Top,,, mcron, GNU@tie{}mcron}). GNU@tie{}mcron ist ähnlich zum traditionellen @command{cron}-Daemon aus Unix; der größte Unterschied ist, dass mcron in Guile Scheme implementiert ist, wodurch einem viel Flexibilität bei der Spezifikation von Aufträgen und ihren Aktionen offen steht." #. type: Plain text -#: doc/guix.texi:12288 +#: doc/guix.texi:12286 msgid "The example below defines an operating system that runs the @command{updatedb} (@pxref{Invoking updatedb,,, find, Finding Files}) and the @command{guix gc} commands (@pxref{Invoking guix gc}) daily, as well as the @command{mkid} command on behalf of an unprivileged user (@pxref{mkid invocation,,, idutils, ID Database Utilities}). It uses gexps to introduce job definitions that are passed to mcron (@pxref{G-Expressions})." msgstr "Das folgende Beispiel definiert ein Betriebssystem, das täglich die Befehle @command{updatedb} (siehe @ref{Invoking updatedb,,, find, Finding Files}) und @command{guix gc} (siehe @ref{Invoking guix gc}) ausführt sowie den Befehl @command{mkid} im Namen eines „unprivilegierten“ Nutzers ohne besondere Berechtigungen laufen lässt (siehe @ref{mkid invocation,,, idutils, ID Database Utilities}). Zum Anlegen von Auftragsdefinitionen benutzt es G-Ausdrücke, die dann an mcron übergeben werden (siehe @ref{G-Expressions})." #. type: lisp -#: doc/guix.texi:12292 +#: doc/guix.texi:12290 #, no-wrap msgid "" "(use-modules (guix) (gnu) (gnu services mcron))\n" @@ -22276,7 +22287,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12301 +#: doc/guix.texi:12299 #, no-wrap msgid "" "(define updatedb-job\n" @@ -22300,7 +22311,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12307 +#: doc/guix.texi:12305 #, no-wrap msgid "" "(define garbage-collector-job\n" @@ -22318,7 +22329,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12314 +#: doc/guix.texi:12312 #, no-wrap msgid "" "(define idutils-job\n" @@ -22339,7 +22350,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12323 +#: doc/guix.texi:12321 #, no-wrap msgid "" "(operating-system\n" @@ -22361,105 +22372,105 @@ msgstr "" " %base-services)))\n" #. type: Plain text -#: doc/guix.texi:12328 +#: doc/guix.texi:12326 msgid "@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, for more information on mcron job specifications. Below is the reference of the mcron service." msgstr "Siehe @ref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron} für weitere Informationen zu mcron-Auftragsspezifikationen. Nun folgt die Referenz des mcron-Dienstes." #. type: Plain text -#: doc/guix.texi:12331 +#: doc/guix.texi:12329 msgid "On a running system, you can use the @code{schedule} action of the service to visualize the mcron jobs that will be executed next:" msgstr "Wenn das System läuft, können Sie mit der Aktion @code{schedule} des Dienstes visualisieren lassen, welche mcron-Aufträge als Nächstes ausgeführt werden:" #. type: example -#: doc/guix.texi:12334 +#: doc/guix.texi:12332 #, no-wrap msgid "# herd schedule mcron\n" msgstr "# herd schedule mcron\n" #. type: Plain text -#: doc/guix.texi:12339 +#: doc/guix.texi:12337 msgid "The example above lists the next five tasks that will be executed, but you can also specify the number of tasks to display:" msgstr "Das vorangehende Beispiel listet die nächsten fünf Aufgaben auf, die ausgeführt werden, aber Sie können auch angeben, wieviele Aufgaben angezeigt werden sollen:" #. type: example -#: doc/guix.texi:12342 +#: doc/guix.texi:12340 #, no-wrap msgid "# herd schedule mcron 10\n" msgstr "# herd schedule mcron 10\n" #. type: defvr -#: doc/guix.texi:12344 +#: doc/guix.texi:12342 #, no-wrap msgid "{Scheme Variable} mcron-service-type" msgstr "{Scheme-Variable} mcron-service-type" #. type: defvr -#: doc/guix.texi:12347 +#: doc/guix.texi:12345 msgid "This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object." msgstr "Dies ist der Diensttyp des @code{mcron}-Dienstes. Als Wert verwendet er ein @code{mcron-configuration}-Objekt." #. type: defvr -#: doc/guix.texi:12352 +#: doc/guix.texi:12350 msgid "This service type can be the target of a service extension that provides it additional job specifications (@pxref{Service Composition}). In other words, it is possible to define services that provide additional mcron jobs to run." msgstr "Dieser Diensttyp kann als Ziel einer Diensterweiterung verwendet werden, die ihn mit zusätzlichen Auftragsspezifikationen versorgt (siehe @ref{Service Composition}). Mit anderen Worten ist es möglich, Dienste zu definieren, die weitere mcron-Aufträge ausführen lassen." #. type: deftp -#: doc/guix.texi:12354 +#: doc/guix.texi:12352 #, no-wrap msgid "{Data Type} mcron-configuration" msgstr "{Datentyp} mcron-configuration" #. type: deftp -#: doc/guix.texi:12356 +#: doc/guix.texi:12354 msgid "Data type representing the configuration of mcron." msgstr "Datentyp, der die Konfiguration von mcron repräsentiert." #. type: item -#: doc/guix.texi:12358 +#: doc/guix.texi:12356 #, no-wrap msgid "@code{mcron} (default: @var{mcron})" msgstr "@code{mcron} (Vorgabe: @var{mcron})" #. type: table -#: doc/guix.texi:12360 +#: doc/guix.texi:12358 msgid "The mcron package to use." msgstr "Welches mcron-Paket benutzt werden soll." #. type: code{#1} -#: doc/guix.texi:12361 doc/guix.texi:12420 +#: doc/guix.texi:12359 doc/guix.texi:12418 #, no-wrap msgid "jobs" msgstr "jobs" #. type: table -#: doc/guix.texi:12365 +#: doc/guix.texi:12363 msgid "This is a list of gexps (@pxref{G-Expressions}), where each gexp corresponds to an mcron job specification (@pxref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})." msgstr "Dies muss eine Liste von G-Ausdrücken sein (siehe @ref{G-Expressions}), die jeweils einer mcron-Auftragsspezifikation (der Spezifikation eines „Jobs“) entsprechen (siehe @ref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})." #. type: cindex -#: doc/guix.texi:12372 +#: doc/guix.texi:12370 #, no-wrap msgid "rottlog" msgstr "rottlog" #. type: cindex -#: doc/guix.texi:12373 +#: doc/guix.texi:12371 #, no-wrap msgid "log rotation" msgstr "Log-Rotation" #. type: Plain text -#: doc/guix.texi:12380 +#: doc/guix.texi:12378 msgid "Log files such as those found in @file{/var/log} tend to grow endlessly, so it's a good idea to @dfn{rotate} them once in a while---i.e., archive their contents in separate files, possibly compressed. The @code{(gnu services admin)} module provides an interface to GNU@tie{}Rot[t]log, a log rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})." msgstr "Protokolldateien wie die in @file{/var/log} neigen dazu, bis ins Unendliche zu wachsen, deshalb ist es eine gute Idee, sie von Zeit zu Zeit zu @dfn{rotieren} — d.h.@: ihren Inhalt in separaten Dateien zu archivieren, welche optional auch komprimiert werden. Das Modul @code{(gnu services admin)} stellt eine Schnittstelle zu GNU@tie{}Rot[t]log bereit, einem Werkzeug, um Protokolldateien („Log“-Dateien) zu rotieren (siehe @ref{Top,,, rottlog, GNU Rot[t]log Manual})." #. type: Plain text -#: doc/guix.texi:12383 +#: doc/guix.texi:12381 msgid "The example below defines an operating system that provides log rotation with the default settings, for commonly encountered log files." msgstr "Im folgenden Beispiel wird ein Betriebssystem definiert, das Log-Rotation mit den Vorgabeeinstellungen für übliche Log-Dateien durchführt." #. type: lisp -#: doc/guix.texi:12388 +#: doc/guix.texi:12386 #, no-wrap msgid "" "(use-modules (guix) (gnu))\n" @@ -22473,7 +22484,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:12393 +#: doc/guix.texi:12391 #, no-wrap msgid "" "(operating-system\n" @@ -22487,93 +22498,93 @@ msgstr "" " %base-services)))\n" #. type: defvr -#: doc/guix.texi:12395 +#: doc/guix.texi:12393 #, no-wrap msgid "{Scheme Variable} rottlog-service-type" msgstr "{Scheme-Variable} rottlog-service-type" #. type: defvr -#: doc/guix.texi:12398 +#: doc/guix.texi:12396 msgid "This is the type of the Rottlog service, whose value is a @code{rottlog-configuration} object." msgstr "Dies ist der Typ des Rottlog-Dienstes, dessen Wert ein @code{rottlog-configuration}-Objekt ist." #. type: defvr -#: doc/guix.texi:12401 +#: doc/guix.texi:12399 msgid "Other services can extend this one with new @code{log-rotation} objects (see below), thereby augmenting the set of files to be rotated." msgstr "Andere Dienste können diesen Dienst um neue @code{log-rotation}-Objekte erweitern (siehe unten), wodurch die Auswahl an zu rotierenden Dateien ausgeweitet wird." #. type: defvr -#: doc/guix.texi:12404 +#: doc/guix.texi:12402 msgid "This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to run the rottlog service." msgstr "Dieser Diensttyp kann mcron-Aufträge definieren (siehe @ref{Scheduled Job Execution}), die den rottlog-Dienst ausführen." #. type: deftp -#: doc/guix.texi:12406 +#: doc/guix.texi:12404 #, no-wrap msgid "{Data Type} rottlog-configuration" msgstr "{Datentyp} rottlog-configuration" #. type: deftp -#: doc/guix.texi:12408 +#: doc/guix.texi:12406 msgid "Data type representing the configuration of rottlog." msgstr "Datentyp, der die Konfiguration von rottlog repräsentiert." #. type: item -#: doc/guix.texi:12410 +#: doc/guix.texi:12408 #, no-wrap msgid "@code{rottlog} (default: @code{rottlog})" msgstr "@code{rottlog} (Vorgabe: @code{rottlog})" #. type: table -#: doc/guix.texi:12412 +#: doc/guix.texi:12410 msgid "The Rottlog package to use." msgstr "Das Rottlog-Paket, das verwendet werden soll." #. type: item -#: doc/guix.texi:12413 +#: doc/guix.texi:12411 #, no-wrap msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})" msgstr "@code{rc-file} (Vorgabe: @code{(file-append rottlog \"/etc/rc\")})" #. type: table -#: doc/guix.texi:12416 +#: doc/guix.texi:12414 msgid "The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." msgstr "Die zu benutzende Rottlog-Konfigurationsdatei (siehe @ref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." #. type: item -#: doc/guix.texi:12417 +#: doc/guix.texi:12415 #, no-wrap msgid "@code{rotations} (default: @code{%default-rotations})" msgstr "@code{rotations} (Vorgabe: @code{%default-rotations})" #. type: table -#: doc/guix.texi:12419 +#: doc/guix.texi:12417 msgid "A list of @code{log-rotation} objects as defined below." msgstr "Eine Liste von @code{log-rotation}-Objekten, wie wir sie weiter unten definieren." #. type: table -#: doc/guix.texi:12423 +#: doc/guix.texi:12421 msgid "This is a list of gexps where each gexp corresponds to an mcron job specification (@pxref{Scheduled Job Execution})." msgstr "Dies ist eine Liste von G-Ausdrücken. Jeder G-Ausdruck darin entspricht einer mcron-Auftragsspezifikation (siehe @ref{Scheduled Job Execution})." #. type: deftp -#: doc/guix.texi:12426 +#: doc/guix.texi:12424 #, no-wrap msgid "{Data Type} log-rotation" msgstr "{Datentyp} log-rotation" #. type: deftp -#: doc/guix.texi:12428 +#: doc/guix.texi:12426 msgid "Data type representing the rotation of a group of log files." msgstr "Datentyp, der die Rotation einer Gruppe von Protokolldateien repräsentiert." #. type: deftp -#: doc/guix.texi:12432 +#: doc/guix.texi:12430 msgid "Taking an example from the Rottlog manual (@pxref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be defined like this:" msgstr "Um ein Beispiel aus dem Rottlog-Handbuch (siehe @ref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}) aufzugreifen: Eine Log-Rotation kann auf folgende Art definiert werden:" #. type: example -#: doc/guix.texi:12441 +#: doc/guix.texi:12439 #, no-wrap msgid "" "(log-rotation\n" @@ -22593,111 +22604,111 @@ msgstr "" " \"nocompress\")))\n" #. type: deftp -#: doc/guix.texi:12444 +#: doc/guix.texi:12442 msgid "The list of fields is as follows:" msgstr "Die Liste der Felder ist folgendermaßen aufgebaut:" #. type: item -#: doc/guix.texi:12446 +#: doc/guix.texi:12444 #, no-wrap msgid "@code{frequency} (default: @code{'weekly})" msgstr "@code{frequency} (Vorgabe: @code{'weekly})" #. type: table -#: doc/guix.texi:12448 +#: doc/guix.texi:12446 msgid "The log rotation frequency, a symbol." msgstr "Die Häufigkeit der Log-Rotation, dargestellt als englischsprachiges Symbol." #. type: code{#1} -#: doc/guix.texi:12449 +#: doc/guix.texi:12447 #, no-wrap msgid "files" msgstr "files" #. type: table -#: doc/guix.texi:12451 +#: doc/guix.texi:12449 msgid "The list of files or file glob patterns to rotate." msgstr "Die Liste der Dateien oder Glob-Muster für Dateien, die rotiert werden sollen." #. type: item -#: doc/guix.texi:12452 +#: doc/guix.texi:12450 #, no-wrap msgid "@code{options} (default: @code{'()})" msgstr "@code{options} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12455 +#: doc/guix.texi:12453 msgid "The list of rottlog options for this rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})." msgstr "Die Liste der Rottlog-Optionen für diese Rotation (siehe @ref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})." #. type: item -#: doc/guix.texi:12456 +#: doc/guix.texi:12454 #, no-wrap msgid "@code{post-rotate} (default: @code{#f})" msgstr "@code{post-rotate} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12458 +#: doc/guix.texi:12456 msgid "Either @code{#f} or a gexp to execute once the rotation has completed." msgstr "Entweder @code{#f} oder ein G-Ausdruck, der nach Abschluss der Rotation einmal ausgeführt wird." #. type: defvr -#: doc/guix.texi:12461 +#: doc/guix.texi:12459 #, no-wrap msgid "{Scheme Variable} %default-rotations" msgstr "{Scheme-Variable} %default-rotations" #. type: defvr -#: doc/guix.texi:12464 +#: doc/guix.texi:12462 msgid "Specifies weekly rotation of @var{%rotated-files} and a couple of other files." msgstr "Gibt wöchentliche Rotationen der @var{%rotated-files} und von ein paar anderen Dateien an." #. type: defvr -#: doc/guix.texi:12466 +#: doc/guix.texi:12464 #, no-wrap msgid "{Scheme Variable} %rotated-files" msgstr "{Scheme-Variable} %rotated-files" #. type: defvr -#: doc/guix.texi:12469 +#: doc/guix.texi:12467 msgid "The list of syslog-controlled files to be rotated. By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\")}." msgstr "Die Liste der von Syslog verwalteten Dateien, die rotiert werden sollen. Vorgegeben ist @code{'(\"/var/log/messages\" \"/var/log/secure\")}." #. type: Plain text -#: doc/guix.texi:12476 +#: doc/guix.texi:12474 msgid "The @code{(gnu services networking)} module provides services to configure the network interface." msgstr "Das Modul @code{(gnu services networking)} bietet Dienste zum Konfigurieren des Netzwerks an." #. type: cindex -#: doc/guix.texi:12477 +#: doc/guix.texi:12475 #, no-wrap msgid "DHCP, networking service" msgstr "DHCP, Netzwerkdienst" #. type: defvr -#: doc/guix.texi:12478 +#: doc/guix.texi:12476 #, no-wrap msgid "{Scheme Variable} dhcp-client-service-type" msgstr "{Scheme-Variable} dhcp-client-service-type" #. type: defvr -#: doc/guix.texi:12482 +#: doc/guix.texi:12480 msgid "This is the type of services that run @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces. Its value is the DHCP client package to use, @code{isc-dhcp} by default." msgstr "Dies ist der Diensttyp für den Dienst, der @var{dhcp} ausführt, einen Client für das „Dynamic Host Configuration Protocol“ (DHCP), der auf allen Netzwerkschnittstellen außer „loopback“ läuft. Sein Wert ist das zu verwendende DHCP-Client-Paket; vorgegeben ist @code{isc-dhcp}." #. type: deffn -#: doc/guix.texi:12484 +#: doc/guix.texi:12482 #, no-wrap msgid "{Scheme Procedure} dhcpd-service-type" msgstr "{Scheme-Prozedur} dhcpd-service-type" #. type: deffn -#: doc/guix.texi:12488 +#: doc/guix.texi:12486 msgid "This type defines a service that runs a DHCP daemon. To create a service of this type, you must supply a @code{}. For example:" msgstr "Dieser Diensttyp definiert einen Dienst, der einen DHCP-Daemon ausführt. Um einen Dienst zu diesem Typ anzugeben, müssen Sie eine @code{} bereitstellen. Zum Beispiel so:" #. type: example -#: doc/guix.texi:12494 +#: doc/guix.texi:12492 #, no-wrap msgid "" "(service dhcpd-service-type\n" @@ -22711,111 +22722,111 @@ msgstr "" " (interfaces '(\"enp0s25\"))))\n" #. type: deftp -#: doc/guix.texi:12497 +#: doc/guix.texi:12495 #, no-wrap msgid "{Data Type} dhcpd-configuration" msgstr "{Datentyp} dhcpd-configuration" #. type: item -#: doc/guix.texi:12499 +#: doc/guix.texi:12497 #, no-wrap msgid "@code{package} (default: @code{isc-dhcp})" msgstr "@code{package} (Vorgabe: @code{isc-dhcp})" #. type: table -#: doc/guix.texi:12504 +#: doc/guix.texi:12502 msgid "The package that provides the DHCP daemon. This package is expected to provide the daemon at @file{sbin/dhcpd} relative to its output directory. The default package is the @uref{https://www.isc.org/products/DHCP, ISC's DHCP server}." msgstr "Das Paket, das den DHCP-Daemon zur Verfügung stellt. Von diesem Paket wird erwartet, dass es den Daemon unter dem Pfad @file{sbin/dhcpd} relativ zum Verzeichnis der Paketausgabe bereitstellt. Das vorgegebene Paket ist @uref{https://www.isc.org/products/DHCP, der DHCP-Server vom ISC}." #. type: item -#: doc/guix.texi:12504 doc/guix.texi:12693 doc/guix.texi:16681 +#: doc/guix.texi:12502 doc/guix.texi:12691 doc/guix.texi:16678 #, no-wrap msgid "@code{config-file} (default: @code{#f})" msgstr "@code{config-file} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12509 +#: doc/guix.texi:12507 msgid "The configuration file to use. This is required. It will be passed to @code{dhcpd} via its @code{-cf} option. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}). See @code{man dhcpd.conf} for details on the configuration file syntax." msgstr "Die Konfigurationsdatei, die benutzt werden soll. Sie @emph{muss} angegeben werden und wird an @code{dhcpd} mittels seiner Befehlszeilenoption @code{-cf} übergeben. Ein beliebiges „dateiartiges“ Objekt kann dafür angegeben werden (siehe @ref{G-Expressions, file-like objects}). Siehe @code{man dhcpd.conf} für Details, welcher Syntax die Konfigurationsdatei genügen muss." #. type: item -#: doc/guix.texi:12509 +#: doc/guix.texi:12507 #, no-wrap msgid "@code{version} (default: @code{\"4\"})" msgstr "@code{version} (Vorgabe: @code{\"4\"})" #. type: table -#: doc/guix.texi:12514 +#: doc/guix.texi:12512 msgid "The DHCP version to use. The ISC DHCP server supports the values ``4'', ``6'', and ``4o6''. These correspond to the @code{dhcpd} program options @code{-4}, @code{-6}, and @code{-4o6}. See @code{man dhcpd} for details." msgstr "Die DHCP-Version, die benutzt werden soll. Der ISC-DHCP-Server unterstützt die Werte „4“, „6“ und „4o6“. Das Feld entspricht den Befehlszeilenoptionen @code{-4}, @code{-6} und @code{-4o6} von @code{dhcpd}. Siehe @code{man dhcpd} für Details." #. type: item -#: doc/guix.texi:12514 +#: doc/guix.texi:12512 #, no-wrap msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})" msgstr "@code{run-directory} (Vorgabe: @code{\"/run/dhcpd\"})" #. type: table -#: doc/guix.texi:12517 +#: doc/guix.texi:12515 msgid "The run directory to use. At service activation time, this directory will be created if it does not exist." msgstr "Das zu benutzende Laufzeit-Verzeichnis („run“-Verzeichnis). Wenn der Dienst aktiviert wird, wird dieses Verzeichnis erzeugt, wenn es noch nicht existiert." #. type: item -#: doc/guix.texi:12517 +#: doc/guix.texi:12515 #, no-wrap msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/run/dhcpd/dhcpd.pid\"})" #. type: table -#: doc/guix.texi:12520 +#: doc/guix.texi:12518 msgid "The PID file to use. This corresponds to the @code{-pf} option of @code{dhcpd}. See @code{man dhcpd} for details." msgstr "Die zu benutzende PID-Datei. Dieses Feld entspricht der Befehlszeilenoption @code{-pf} von @code{dhcpd}. Siehe @code{man dhcpd} für Details." #. type: item -#: doc/guix.texi:12520 +#: doc/guix.texi:12518 #, no-wrap msgid "@code{interfaces} (default: @code{'()})" msgstr "@code{interfaces} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12526 +#: doc/guix.texi:12524 msgid "The names of the network interfaces on which dhcpd should listen for broadcasts. If this list is not empty, then its elements (which must be strings) will be appended to the @code{dhcpd} invocation when starting the daemon. It may not be necessary to explicitly specify any interfaces here; see @code{man dhcpd} for details." msgstr "Die Namen der Netzwerkschnittstelle, auf der dhcpd auf Broadcast-Nachrichten lauscht. Wenn diese Liste nicht leer ist, werden ihre Elemente (diese müssen Zeichenketten sein) an den @code{dhcpd}-Aufruf beim Starten des Daemons angehängt. Es ist unter Umständen @emph{nicht} nötig, hier Schnittstellen ausdrücklich anzugeben; siehe @code{man dhcpd} für Details." #. type: defvr -#: doc/guix.texi:12529 +#: doc/guix.texi:12527 #, no-wrap msgid "{Scheme Variable} static-networking-service-type" msgstr "{Scheme-Variable} static-networking-service-type" #. type: defvr -#: doc/guix.texi:12532 +#: doc/guix.texi:12530 msgid "This is the type for statically-configured network interfaces." msgstr "Dies ist der Typ für statisch konfigurierte Netzwerkschnittstellen." #. type: deffn -#: doc/guix.texi:12534 +#: doc/guix.texi:12532 #, no-wrap msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @" msgstr "{Scheme-Prozedur} static-networking-service @var{Schnittstelle} @var{IP} @" #. type: deffn -#: doc/guix.texi:12542 +#: doc/guix.texi:12540 msgid "[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] @ [#:requirement @code{'(udev)}] Return a service that starts @var{interface} with address @var{ip}. If @var{netmask} is true, use it as the network mask. If @var{gateway} is true, it must be a string specifying the default network gateway. @var{requirement} can be used to declare a dependency on another service before configuring the interface." msgstr "[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] @ [#:requirement @code{'(udev)}] Liefert einen Dienst, der die @var{Schnittstelle} auf dieser @var{IP}-Adresse startet. Wenn @var{netmask} wahr ist, wird es als Netzwerkmaske benutzt. Wenn @var{gateway} wahr ist, muss es eine Zeichenkette sein, die den voreingestellten Netzwerk-Zugang („Netzwerk-Gateway“) angibt. Als @var{requirement} („Anforderung“) können Abhängigkeiten von anderen Diensten deklariert werden, die vor dem Konfigurieren der Schnittstelle gestartet sein müssen." #. type: deffn -#: doc/guix.texi:12547 +#: doc/guix.texi:12545 msgid "This procedure can be called several times, one for each network interface of interest. Behind the scenes what it does is extend @code{static-networking-service-type} with additional network interfaces to handle." msgstr "Diese Prozedur kann mehrmals aufgerufen werden, einmal pro Netzwerkschnittstelle, die Sie möchten. Intern funktioniert sie, indem sie @code{static-networking-service-type} mit zusätzlichen Netzwerkschnittstellen erweitert, um die sich der Dienst kümmern soll." #. type: deffn -#: doc/guix.texi:12549 +#: doc/guix.texi:12547 msgid "For example:" msgstr "Zum Beispiel:" #. type: example -#: doc/guix.texi:12554 +#: doc/guix.texi:12552 #, no-wrap msgid "" "(static-networking-service \"eno1\" \"192.168.1.82\"\n" @@ -22827,195 +22838,195 @@ msgstr "" " #:name-servers '(\"192.168.1.2\"))\n" #. type: cindex -#: doc/guix.texi:12557 +#: doc/guix.texi:12555 #, no-wrap msgid "wicd" msgstr "wicd" #. type: cindex -#: doc/guix.texi:12560 +#: doc/guix.texi:12558 #, no-wrap msgid "network management" msgstr "Netzwerkverwaltung" #. type: deffn -#: doc/guix.texi:12561 +#: doc/guix.texi:12559 #, no-wrap msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]" msgstr "{Scheme-Prozedur} wicd-service [#:wicd @var{wicd}]" #. type: deffn -#: doc/guix.texi:12564 +#: doc/guix.texi:12562 msgid "Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network management daemon that aims to simplify wired and wireless networking." msgstr "Liefert einen Dienst, der @url{https://launchpad.net/wicd,Wicd} ausführt, einen Netzwerkverwaltungsdaemon, um ein einfacheres Einrichten kabelgebundener und drahtloser Netzwerkanbindungen zu ermöglichen." #. type: deffn -#: doc/guix.texi:12569 +#: doc/guix.texi:12567 msgid "This service adds the @var{wicd} package to the global profile, providing several commands to interact with the daemon and configure networking: @command{wicd-client}, a graphical user interface, and the @command{wicd-cli} and @command{wicd-curses} user interfaces." msgstr "Dieser Dienst fügt das @var{wicd}-Paket zum globalen Profil hinzu und stellt dadurch mehrere Befehle zur Verfügung, um mit dem Daemon zu interagieren und Netzwerke einzurichten: @command{wicd-client}, eine grafische Benutzeroberfläche, und die Benutzungsschnittstellen @command{wicd-cli} und @command{wicd-curses}." #. type: cindex -#: doc/guix.texi:12571 +#: doc/guix.texi:12569 #, no-wrap msgid "ModemManager" msgstr "ModemManager" #. type: defvr -#: doc/guix.texi:12573 +#: doc/guix.texi:12571 #, no-wrap msgid "{Scheme Variable} modem-manager-service-type" msgstr "{Scheme-Variable} modem-manager-service-type" #. type: defvr -#: doc/guix.texi:12578 +#: doc/guix.texi:12576 msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager} service. The value for this service type is a @code{modem-manager-configuration} record." msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager-Dienst}. Der Wert dieses Diensttyps ist ein @code{modem-manager-configuration}-Verbundsobjekt." #. type: defvr -#: doc/guix.texi:12581 doc/guix.texi:12603 +#: doc/guix.texi:12579 doc/guix.texi:12601 msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})." msgstr "Dieser Dienst gehört zu den @code{%desktop-services} (siehe @ref{Desktop Services})." #. type: deftp -#: doc/guix.texi:12583 +#: doc/guix.texi:12581 #, no-wrap msgid "{Data Type} modem-manager-configuration" msgstr "{Datentyp} modem-manager-configuration" #. type: deftp -#: doc/guix.texi:12585 +#: doc/guix.texi:12583 msgid "Data type representing the configuration of ModemManager." msgstr "Repräsentiert die Konfiguration vom ModemManager." #. type: item -#: doc/guix.texi:12587 +#: doc/guix.texi:12585 #, no-wrap msgid "@code{modem-manager} (default: @code{modem-manager})" msgstr "@code{modem-manager} (Vorgabe: @code{modem-manager})" #. type: table -#: doc/guix.texi:12589 +#: doc/guix.texi:12587 msgid "The ModemManager package to use." msgstr "Das ModemManager-Paket, was benutzt werden soll." #. type: cindex -#: doc/guix.texi:12593 +#: doc/guix.texi:12591 #, no-wrap msgid "NetworkManager" msgstr "NetworkManager" #. type: defvr -#: doc/guix.texi:12595 +#: doc/guix.texi:12593 #, no-wrap msgid "{Scheme Variable} network-manager-service-type" msgstr "{Scheme-Variable} network-manager-service-type" #. type: defvr -#: doc/guix.texi:12600 +#: doc/guix.texi:12598 msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager} service. The value for this service type is a @code{network-manager-configuration} record." msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager-Dienst}. Der Wert dieses Diensttyps ist ein @code{network-manager-configuration}-Verbundsobjekt." #. type: deftp -#: doc/guix.texi:12605 +#: doc/guix.texi:12603 #, no-wrap msgid "{Data Type} network-manager-configuration" msgstr "{Datentyp} network-manager-configuration" #. type: deftp -#: doc/guix.texi:12607 +#: doc/guix.texi:12605 msgid "Data type representing the configuration of NetworkManager." msgstr "Datentyp, der die Konfiguration von NetworkManager repräsentiert." #. type: item -#: doc/guix.texi:12609 +#: doc/guix.texi:12607 #, no-wrap msgid "@code{network-manager} (default: @code{network-manager})" msgstr "@code{network-manager} (Vorgabe: @code{network-manager})" #. type: table -#: doc/guix.texi:12611 +#: doc/guix.texi:12609 msgid "The NetworkManager package to use." msgstr "Das zu verwendende NetworkManager-Paket." #. type: item -#: doc/guix.texi:12612 +#: doc/guix.texi:12610 #, no-wrap msgid "@code{dns} (default: @code{\"default\"})" msgstr "@code{dns} (Vorgabe: @code{\"default\"})" #. type: table -#: doc/guix.texi:12615 +#: doc/guix.texi:12613 msgid "Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file." msgstr "Der Verarbeitungsmodus für DNS-Anfragen. Er hat Einfluss darauf, wie NetworkManager mit der Konfigurationsdatei @code{resolv.conf} verfährt." #. type: item -#: doc/guix.texi:12617 +#: doc/guix.texi:12615 #, no-wrap msgid "default" msgstr "default" #. type: table -#: doc/guix.texi:12620 +#: doc/guix.texi:12618 msgid "NetworkManager will update @code{resolv.conf} to reflect the nameservers provided by currently active connections." msgstr "NetworkManager aktualisiert @code{resolv.conf}, damit sie die Nameserver enthält, die von zur Zeit aktiven Verbindungen benutzt werden." #. type: item -#: doc/guix.texi:12621 +#: doc/guix.texi:12619 #, no-wrap msgid "dnsmasq" msgstr "dnsmasq" #. type: table -#: doc/guix.texi:12625 +#: doc/guix.texi:12623 msgid "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a \"split DNS\" configuration if you are connected to a VPN, and then update @code{resolv.conf} to point to the local nameserver." msgstr "NetworkManager führt @code{dnsmasq} als lokal zwischenspeichernden Nameserver aus und aktualisiert @code{resolv.conf} so, dass es auf den lokalen Nameserver verweist. Falls Sie mit einem VPN verbunden sind, wird dafür eine getrennte DNS-Auflösung verwendet („Split DNS“)." #. type: item -#: doc/guix.texi:12626 doc/guix.texi:13886 +#: doc/guix.texi:12624 doc/guix.texi:13884 #, no-wrap msgid "none" msgstr "none" #. type: table -#: doc/guix.texi:12628 +#: doc/guix.texi:12626 msgid "NetworkManager will not modify @code{resolv.conf}." msgstr "NetworkManager verändert @code{resolv.conf} nicht." #. type: item -#: doc/guix.texi:12630 +#: doc/guix.texi:12628 #, no-wrap msgid "@code{vpn-plugins} (default: @code{'()})" msgstr "@code{vpn-plugins} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12634 +#: doc/guix.texi:12632 msgid "This is the list of available plugins for virtual private networks (VPNs). An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN." msgstr "Dies ist die Liste der verfügbaren Plugins für virtuelle private Netzwerke (VPN). Zum Beispiel kann das Paket @code{network-manager-openvpn} angegeben werden, womit NetworkManager virtuelle private Netzwerke mit OpenVPN verwalten kann." #. type: cindex -#: doc/guix.texi:12638 +#: doc/guix.texi:12636 #, no-wrap msgid "Connman" msgstr "Connman" #. type: deffn -#: doc/guix.texi:12639 +#: doc/guix.texi:12637 #, no-wrap msgid "{Scheme Variable} connman-service-type" msgstr "{Scheme-Variable} connman-service-type" #. type: deffn -#: doc/guix.texi:12642 +#: doc/guix.texi:12640 msgid "This is the service type to run @url{https://01.org/connman,Connman}, a network connection manager." msgstr "Mit diesem Diensttyp wird @url{https://01.org/connman,Connman} ausgeführt, ein Programm zum Verwalten von Netzwerkverbindungen." #. type: deffn -#: doc/guix.texi:12645 +#: doc/guix.texi:12643 msgid "Its value must be an @code{connman-configuration} record as in this example:" msgstr "Sein Wert muss ein @code{connman-configuration}-Verbundsobjekt wie im folgenden Beispiel sein:" #. type: example -#: doc/guix.texi:12650 +#: doc/guix.texi:12648 #, no-wrap msgid "" "(service connman-service-type\n" @@ -23027,149 +23038,149 @@ msgstr "" " (disable-vpn? #t)))\n" #. type: deffn -#: doc/guix.texi:12653 +#: doc/guix.texi:12651 msgid "See below for details about @code{connman-configuration}." msgstr "Weiter unten werden Details der @code{connman-configuration} erklärt." #. type: deftp -#: doc/guix.texi:12655 +#: doc/guix.texi:12653 #, no-wrap msgid "{Data Type} connman-configuration" msgstr "{Datentyp} connman-configuration" #. type: deftp -#: doc/guix.texi:12657 +#: doc/guix.texi:12655 msgid "Data Type representing the configuration of connman." msgstr "Datentyp, der die Konfiguration von Connman repräsentiert." #. type: item -#: doc/guix.texi:12659 +#: doc/guix.texi:12657 #, no-wrap msgid "@code{connman} (default: @var{connman})" msgstr "@code{connman} (Vorgabe: @var{connman})" #. type: table -#: doc/guix.texi:12661 +#: doc/guix.texi:12659 msgid "The connman package to use." msgstr "Das zu verwendende Connman-Paket." #. type: item -#: doc/guix.texi:12662 +#: doc/guix.texi:12660 #, no-wrap msgid "@code{disable-vpn?} (default: @code{#f})" msgstr "@code{disable-vpn?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12664 +#: doc/guix.texi:12662 msgid "When true, disable connman's vpn plugin." msgstr "Falls dies auf wahr gesetzt ist, wird Connmans VPN-Plugin deaktiviert." #. type: cindex -#: doc/guix.texi:12667 +#: doc/guix.texi:12665 #, no-wrap msgid "WPA Supplicant" msgstr "WPA-Supplikant" #. type: defvr -#: doc/guix.texi:12668 +#: doc/guix.texi:12666 #, no-wrap msgid "{Scheme Variable} wpa-supplicant-service-type" msgstr "{Scheme-Variable} wpa-supplicant-service-type" #. type: defvr -#: doc/guix.texi:12672 +#: doc/guix.texi:12670 msgid "This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA supplicant}, an authentication daemon required to authenticate against encrypted WiFi or ethernet networks." msgstr "Dies ist der Diensttyp, um @url{https://w1.fi/wpa_supplicant/,WPA Supplicant} auszuführen. Dabei handelt es sich um einen Authentisierungsdaemon, der notwendig ist, um sich gegenüber verschlüsselten WLAN- oder Ethernet-Netzwerken zu authentisieren." #. type: deftp -#: doc/guix.texi:12674 +#: doc/guix.texi:12672 #, no-wrap msgid "{Data Type} wpa-supplicant-configuration" msgstr "{Datentyp} wpa-supplicant-configuration" #. type: deftp -#: doc/guix.texi:12676 +#: doc/guix.texi:12674 msgid "Data type representing the configuration of WPA Supplicant." msgstr "Repräsentiert die Konfiguration des WPA-Supplikanten." #. type: deftp -#: doc/guix.texi:12678 +#: doc/guix.texi:12676 msgid "It takes the following parameters:" msgstr "Sie hat folgende Parameter:" #. type: item -#: doc/guix.texi:12680 +#: doc/guix.texi:12678 #, no-wrap msgid "@code{wpa-supplicant} (default: @code{wpa-supplicant})" msgstr "@code{wpa-supplicant} (Vorgabe: @code{wpa-supplicant})" #. type: table -#: doc/guix.texi:12682 +#: doc/guix.texi:12680 msgid "The WPA Supplicant package to use." msgstr "Das WPA-Supplicant-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:12683 +#: doc/guix.texi:12681 #, no-wrap msgid "@code{dbus?} (default: @code{#t})" msgstr "@code{dbus?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:12685 +#: doc/guix.texi:12683 msgid "Whether to listen for requests on D-Bus." msgstr "Ob auf Anfragen auf D-Bus gelauscht werden soll." #. type: item -#: doc/guix.texi:12686 +#: doc/guix.texi:12684 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/wpa_supplicant.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/wpa_supplicant.pid\"})" #. type: table -#: doc/guix.texi:12688 +#: doc/guix.texi:12686 msgid "Where to store the PID file." msgstr "Wo die PID-Datei abgelegt wird." #. type: item -#: doc/guix.texi:12689 +#: doc/guix.texi:12687 #, no-wrap msgid "@code{interface} (default: @code{#f})" msgstr "@code{interface} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12692 +#: doc/guix.texi:12690 msgid "If this is set, it must specify the name of a network interface that WPA supplicant will control." msgstr "Wenn dieses Feld gesetzt ist, muss es den Namen einer Netzwerkschnittstelle angeben, die von WPA Supplicant verwaltet werden soll." #. type: table -#: doc/guix.texi:12695 +#: doc/guix.texi:12693 msgid "Optional configuration file to use." msgstr "Optionale Konfigurationsdatei." #. type: table -#: doc/guix.texi:12698 +#: doc/guix.texi:12696 msgid "List of additional command-line arguments to pass to the daemon." msgstr "Liste zusätzlicher Befehlszeilenoptionen, die an den Daemon übergeben werden." #. type: cindex -#: doc/guix.texi:12701 +#: doc/guix.texi:12699 #, no-wrap msgid "iptables" msgstr "iptables" #. type: defvr -#: doc/guix.texi:12702 +#: doc/guix.texi:12700 #, no-wrap msgid "{Scheme Variable} iptables-service-type" msgstr "{Scheme-Variable} iptables-service-type" #. type: defvr -#: doc/guix.texi:12708 +#: doc/guix.texi:12706 msgid "This is the service type to set up an iptables configuration. iptables is a packet filtering framework supported by the Linux kernel. This service supports configuring iptables for both IPv4 and IPv6. A simple example configuration rejecting all incoming connections except those to the ssh port 22 is shown below." msgstr "Mit diesem Diensttyp wird eine iptables-Konfiguration eingerichtet. iptables ist ein Netzwerkpaketfilter, der vom Linux-Kernel unterstützt wird. Der Dienst unterstützt die Konfiguration von iptables für sowohl IPv4 als auch IPv6. Eine einfache Beispielkonfiguration, die alle eingehenden Verbindungen verweigert, die nicht an den SSH-Port 22 gehen, können Sie hier sehen:" #. type: lisp -#: doc/guix.texi:12728 +#: doc/guix.texi:12726 #, no-wrap msgid "" "(service iptables-service-type\n" @@ -23211,151 +23222,151 @@ msgstr "" "\"))))\n" #. type: deftp -#: doc/guix.texi:12731 +#: doc/guix.texi:12729 #, no-wrap msgid "{Data Type} iptables-configuration" msgstr "{Datentyp} iptables-configuration" #. type: deftp -#: doc/guix.texi:12733 +#: doc/guix.texi:12731 msgid "The data type representing the configuration of iptables." msgstr "Repräsentiert die iptables-Konfiguration." #. type: item -#: doc/guix.texi:12735 +#: doc/guix.texi:12733 #, no-wrap msgid "@code{iptables} (default: @code{iptables})" msgstr "@code{iptables} (Vorgabe: @code{iptables})" #. type: table -#: doc/guix.texi:12738 +#: doc/guix.texi:12736 msgid "The iptables package that provides @code{iptables-restore} and @code{ip6tables-restore}." msgstr "Das zu benutzende iptables-Paket, das @code{iptables-restore} und @code{ip6tables-restore} zur Verfügung stellt." #. type: item -#: doc/guix.texi:12738 +#: doc/guix.texi:12736 #, no-wrap msgid "@code{ipv4-rules} (default: @code{%iptables-accept-all-rules})" msgstr "@code{ipv4-rules} (Vorgabe: @code{%iptables-accept-all-rules})" #. type: table -#: doc/guix.texi:12742 +#: doc/guix.texi:12740 msgid "The iptables rules to use. It will be passed to @code{iptables-restore}. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})." msgstr "Die zu benutzenden iptables-Regeln. Diese werden an @code{iptables-restore} übergeben. Als Regeln kann jedes „dateiartige“ Objekt angegeben werden (siehe @ref{G-Expressions, file-like objects})." #. type: item -#: doc/guix.texi:12742 +#: doc/guix.texi:12740 #, no-wrap msgid "@code{ipv6-rules} (default: @code{%iptables-accept-all-rules})" msgstr "@code{ipv6-rules} (Vorgabe: @code{%iptables-accept-all-rules})" #. type: table -#: doc/guix.texi:12746 +#: doc/guix.texi:12744 msgid "The ip6tables rules to use. It will be passed to @code{ip6tables-restore}. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})." msgstr "Die zu benutzenden ip6tables-Regeln. Diese werden an @code{ip6tables-restore} übergeben. Als Regeln kann jedes „dateiartige“ Objekt angegeben werden (siehe @ref{G-Expressions, file-like objects})." #. type: cindex -#: doc/guix.texi:12749 +#: doc/guix.texi:12747 #, no-wrap msgid "NTP (Network Time Protocol), service" msgstr "NTP (Network Time Protocol), Dienst" #. type: cindex -#: doc/guix.texi:12750 +#: doc/guix.texi:12748 #, no-wrap msgid "real time clock" msgstr "Echtzeituhr" #. type: defvr -#: doc/guix.texi:12751 +#: doc/guix.texi:12749 #, no-wrap msgid "{Scheme Variable} ntp-service-type" msgstr "{Scheme-Variable} ntp-service-type" #. type: defvr -#: doc/guix.texi:12755 +#: doc/guix.texi:12753 msgid "This is the type of the service running the @uref{http://www.ntp.org, Network Time Protocol (NTP)} daemon, @command{ntpd}. The daemon will keep the system clock synchronized with that of the specified NTP servers." msgstr "Dies ist der Typ des Dienstes, der den @command{ntpd}-Daemon für das @uref{http://www.ntp.org, Network Time Protocol}, kurz NTP, ausführt. Mit diesem Daemon wird die Systemuhr mit der Uhr auf den angegebenen NTP-Servern synchronisiert." #. type: defvr -#: doc/guix.texi:12758 +#: doc/guix.texi:12756 msgid "The value of this service is an @code{ntpd-configuration} object, as described below." msgstr "Der Wert dieses Dienstes ist ein @code{ntpd-configuration}-Objekt, wie im Folgenden beschrieben." #. type: deftp -#: doc/guix.texi:12760 +#: doc/guix.texi:12758 #, no-wrap msgid "{Data Type} ntp-configuration" msgstr "{Datentyp} ntp-configuration" #. type: deftp -#: doc/guix.texi:12762 +#: doc/guix.texi:12760 msgid "This is the data type for the NTP service configuration." msgstr "Der Datentyp für die Dienstkonfiguration des NTP-Dienstes." #. type: item -#: doc/guix.texi:12764 +#: doc/guix.texi:12762 #, no-wrap msgid "@code{servers} (default: @code{%ntp-servers})" msgstr "@code{servers} (Vorgabe: @code{%ntp-servers})" #. type: table -#: doc/guix.texi:12767 +#: doc/guix.texi:12765 msgid "This is the list of servers (host names) with which @command{ntpd} will be synchronized." msgstr "Dies ist die Liste der Server (also von deren Rechnernamen/„Host“-Namen), mit denen @command{ntpd} synchronisiert wird." #. type: item -#: doc/guix.texi:12768 doc/guix.texi:12829 +#: doc/guix.texi:12766 doc/guix.texi:12827 #, no-wrap msgid "@code{allow-large-adjustment?} (default: @code{#f})" msgstr "@code{allow-large-adjustment?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12771 +#: doc/guix.texi:12769 msgid "This determines whether @command{ntpd} is allowed to make an initial adjustment of more than 1,000 seconds." msgstr "Hiermit wird festgelegt, ob @command{ntpd} die Uhr beim ersten Umstellen um mehr als 1.000 Sekunden ändern darf." #. type: item -#: doc/guix.texi:12772 +#: doc/guix.texi:12770 #, no-wrap msgid "@code{ntp} (default: @code{ntp})" msgstr "@code{ntp} (Vorgabe: @code{ntp})" #. type: table -#: doc/guix.texi:12774 +#: doc/guix.texi:12772 msgid "The NTP package to use." msgstr "Das NTP-Paket, was benutzt werden soll." #. type: defvr -#: doc/guix.texi:12777 +#: doc/guix.texi:12775 #, no-wrap msgid "{Scheme Variable} %ntp-servers" msgstr "{Scheme-Variable} %ntp-servers" #. type: defvr -#: doc/guix.texi:12780 +#: doc/guix.texi:12778 msgid "List of host names used as the default NTP servers. These are servers of the @uref{https://www.ntppool.org/en/, NTP Pool Project}." msgstr "Liste der Rechnernamen („Host“-Namen), die als vorgegebene NTP-Server benutzt werden. Dabei handelt es sich um die Server des @uref{https://www.ntppool.org/en/, NTP Pool Project}." #. type: cindex -#: doc/guix.texi:12782 +#: doc/guix.texi:12780 #, no-wrap msgid "OpenNTPD" msgstr "OpenNTPD" #. type: deffn -#: doc/guix.texi:12783 +#: doc/guix.texi:12781 #, no-wrap msgid "{Scheme Procedure} openntpd-service-type" msgstr "{Scheme-Prozedur} openntpd-service-type" #. type: deffn -#: doc/guix.texi:12787 +#: doc/guix.texi:12785 msgid "Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}. The daemon will keep the system clock synchronized with that of the given servers." msgstr "Hiermit wird @command{ntpd}, der Network-Time-Protocol-Daemon (NTP-Daemon), ausgeführt, in seiner @uref{http://www.openntpd.org, OpenNTPD-Implementierung}. Der Daemon sorgt dafür, dass die Systemuhr mit den Uhren der eingestellten Server synchron bleibt." #. type: example -#: doc/guix.texi:12797 +#: doc/guix.texi:12795 #, no-wrap msgid "" "(service\n" @@ -23379,128 +23390,128 @@ msgstr "" "\n" #. type: deftp -#: doc/guix.texi:12801 +#: doc/guix.texi:12799 #, no-wrap msgid "{Data Type} openntpd-configuration" msgstr "{Datentyp} openntpd-configuration" #. type: item -#: doc/guix.texi:12803 +#: doc/guix.texi:12801 #, no-wrap msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})" msgstr "@code{openntpd} (Vorgabe: @code{(file-append openntpd \"/sbin/ntpd\")})" #. type: table -#: doc/guix.texi:12805 +#: doc/guix.texi:12803 msgid "The openntpd executable to use." msgstr "Das openntpd-Programm, das benutzt werden soll." #. type: item -#: doc/guix.texi:12805 +#: doc/guix.texi:12803 #, no-wrap msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})" msgstr "@code{listen-on} (Vorgabe: @code{'(\"127.0.0.1\" \"::1\")})" #. type: table -#: doc/guix.texi:12807 +#: doc/guix.texi:12805 msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on." msgstr "Eine Liste von lokalen IP-Adressen oder Rechnernamen („Host“-Namen), auf denen der ntpd-Daemon lauschen soll." #. type: item -#: doc/guix.texi:12807 +#: doc/guix.texi:12805 #, no-wrap msgid "@code{query-from} (default: @code{'()})" msgstr "@code{query-from} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12809 +#: doc/guix.texi:12807 msgid "A list of local IP address the ntpd daemon should use for outgoing queries." msgstr "Eine Liste von lokalen IP-Adressen, die der ntpd-Daemon für ausgehende Anfragen benutzen soll." #. type: item -#: doc/guix.texi:12809 +#: doc/guix.texi:12807 #, no-wrap msgid "@code{sensor} (default: @code{'()})" msgstr "@code{sensor} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12814 +#: doc/guix.texi:12812 msgid "Specify a list of timedelta sensor devices ntpd should use. @code{ntpd} will listen to each sensor that actually exists and ignore non-existent ones. See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more information." msgstr "Hiermit geben Sie eine Liste von Zeitdifferenz-Sensorgeräten an, die ntpd benutzen soll. @code{ntpd} wird auf jeden Sensor lauschen, der auch tatsächlich existiert, und solche, die nicht existieren, ignorieren. Siehe die @uref{https://man.openbsd.org/ntpd.conf, Dokumentation beim Anbieter} für weitere Informationen." #. type: item -#: doc/guix.texi:12814 +#: doc/guix.texi:12812 #, no-wrap msgid "@code{server} (default: @var{%ntp-servers})" msgstr "@code{server} (Vorgabe: @var{%ntp-servers})" #. type: table -#: doc/guix.texi:12816 +#: doc/guix.texi:12814 msgid "Specify a list of IP addresses or hostnames of NTP servers to synchronize to." msgstr "Hiermit geben Sie eine Liste von IP-Adressen oder Rechnernamen von NTP-Servern an, mit denen synchronisiert werden soll." #. type: item -#: doc/guix.texi:12816 doc/guix.texi:20032 +#: doc/guix.texi:12814 doc/guix.texi:20029 #, no-wrap msgid "@code{servers} (default: @code{'()})" msgstr "@code{servers} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12818 +#: doc/guix.texi:12816 msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to." msgstr "Hiermit geben Sie eine Liste von IP-Adressen oder Rechnernamen von NTP-Pools an, mit denen synchronisiert werden soll." #. type: item -#: doc/guix.texi:12818 +#: doc/guix.texi:12816 #, no-wrap msgid "@code{constraint-from} (default: @code{'()})" msgstr "@code{constraint-from} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12825 +#: doc/guix.texi:12823 msgid "@code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers via TLS. This time information is not used for precision but acts as an authenticated constraint, thereby reducing the impact of unauthenticated NTP man-in-the-middle attacks. Specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint." msgstr "@code{ntpd} kann so eingestellt werden, dass es das Datum aus der „Date“-Kopfzeile bei mit TLS übermittelten Anfragen an HTTPS-Server, denen vertraut wird, ausliest. Diese Zeitinformation wird nicht für Genauigkeit benutzt, sondern um mit authentifizierten Informationen die Auswirkungen eines Man-in-the-Middle-Angriffs auf unauthentifizierte NTP-Kommunikation einzuschränken. Geben Sie hierzu eine Liste von URLs, IP-Adressen oder Rechnernamen („Host“-Namen) von HTTPS-Servern an, um eine solche Beschränkung („Constraint“) einzurichten." #. type: item -#: doc/guix.texi:12825 +#: doc/guix.texi:12823 #, no-wrap msgid "@code{constraints-from} (default: @code{'()})" msgstr "@code{constraints-from} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12829 +#: doc/guix.texi:12827 msgid "As with constraint from, specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint. Should the hostname resolve to multiple IP addresses, @code{ntpd} will calculate a median constraint from all of them." msgstr "Wie bei @code{constraint-from} geben Sie auch hier eine Liste von URLs, IP-Adressen oder Rechnernamen von HTTPS-Servern an, um eine Beschränkung einzurichten. Falls der Rechnername zu mehreren IP-Adressen aufgelöst wird, berechnet @code{ntpd} den Median von allen als Beschränkung." #. type: table -#: doc/guix.texi:12832 +#: doc/guix.texi:12830 msgid "Determines if @code{ntpd} is allowed to make an initial adjustment of more than 180 seconds." msgstr "Legt fest, ob @code{ntpd} die Uhr beim ersten Umstellen um mehr als 180 Sekunden verstellen darf." #. type: cindex -#: doc/guix.texi:12835 +#: doc/guix.texi:12833 #, no-wrap msgid "inetd" msgstr "inetd" #. type: deffn -#: doc/guix.texi:12836 +#: doc/guix.texi:12834 #, no-wrap msgid "{Scheme variable} inetd-service-type" msgstr "{Scheme-Variable} inetd-service-type" #. type: deffn -#: doc/guix.texi:12841 +#: doc/guix.texi:12839 msgid "This service runs the @command{inetd} (@pxref{inetd invocation,,, inetutils, GNU Inetutils}) daemon. @command{inetd} listens for connections on internet sockets, and lazily starts the specified server program when a connection is made on one of these sockets." msgstr "Dieser Dienst führt den @command{inetd}-Daemon aus (siehe @ref{inetd invocation,,, inetutils, GNU Inetutils}). @command{inetd} lauscht auf Verbindungen mit Internet-Sockets und startet bei Bedarf das entsprechende Server-Programm, sobald eine Verbindung mit einem dieser Sockets hergestellt wird." #. type: deffn -#: doc/guix.texi:12847 +#: doc/guix.texi:12845 msgid "The value of this service is an @code{inetd-configuration} object. The following example configures the @command{inetd} daemon to provide the built-in @command{echo} service, as well as an smtp service which forwards smtp traffic over ssh to a server @code{smtp-server} behind a gateway @code{hostname}:" msgstr "Der Wert dieses Dienstes ist ein @code{inetd-configuration}-Objekt. Im folgenden Beispiel wird der @command{inetd}-Daemon konfiguriert, um den eingebauten @command{echo}-Dienst sowie einen SMTP-Dienst anzubieten, wobei letzterer SMTP-Kommunikation über SSH an einen Server @code{smtp-server} über einen vom @code{rechnername}n bezeichneten Zugang („Gateway“) weiterleitet:" #. type: example -#: doc/guix.texi:12870 +#: doc/guix.texi:12868 #, no-wrap msgid "" "(service\n" @@ -23548,220 +23559,220 @@ msgstr "" " \"-W\" \"smtp-server:25\" \"benutzer@@rechnername\")))))\n" #. type: deffn -#: doc/guix.texi:12873 +#: doc/guix.texi:12871 msgid "See below for more details about @code{inetd-configuration}." msgstr "Siehe unten für mehr Details über @code{inetd-configuration}." #. type: deftp -#: doc/guix.texi:12875 +#: doc/guix.texi:12873 #, no-wrap msgid "{Data Type} inetd-configuration" msgstr "{Datentyp} inetd-configuration" #. type: deftp -#: doc/guix.texi:12877 +#: doc/guix.texi:12875 msgid "Data type representing the configuration of @command{inetd}." msgstr "Datentyp, der die Konfiguration von @command{inetd} repräsentiert." #. type: item -#: doc/guix.texi:12879 +#: doc/guix.texi:12877 #, no-wrap msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})" msgstr "@code{program} (Vorgabe: @code{(file-append inetutils \"/libexec/inetd\")})" #. type: table -#: doc/guix.texi:12881 +#: doc/guix.texi:12879 msgid "The @command{inetd} executable to use." msgstr "Das @command{inetd}-Programm, das benutzt werden soll." #. type: item -#: doc/guix.texi:12882 doc/guix.texi:19686 +#: doc/guix.texi:12880 doc/guix.texi:19683 #, no-wrap msgid "@code{entries} (default: @code{'()})" msgstr "@code{entries} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12885 +#: doc/guix.texi:12883 msgid "A list of @command{inetd} service entries. Each entry should be created by the @code{inetd-entry} constructor." msgstr "Eine Liste von @command{inetd}-Diensteinträgen. Jeder Eintrag sollte von einem @code{inetd-entry}-Konstruktor erzeugt werden." #. type: deftp -#: doc/guix.texi:12888 +#: doc/guix.texi:12886 #, no-wrap msgid "{Data Type} inetd-entry" msgstr "{Datentyp} inetd-entry" #. type: deftp -#: doc/guix.texi:12892 +#: doc/guix.texi:12890 msgid "Data type representing an entry in the @command{inetd} configuration. Each entry corresponds to a socket where @command{inetd} will listen for requests." msgstr "Datentyp, der einen Eintrag in der @command{inetd}-Konfiguration repräsentiert. Jeder Eintrag entspricht einem Socket, auf dem @command{inetd} auf Anfragen lauscht." #. type: item -#: doc/guix.texi:12894 +#: doc/guix.texi:12892 #, no-wrap msgid "@code{node} (default: @code{#f})" msgstr "@code{node} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:12899 +#: doc/guix.texi:12897 msgid "Optional string, a comma-separated list of local addresses @command{inetd} should use when listening for this service. @xref{Configuration file,,, inetutils, GNU Inetutils} for a complete description of all options." msgstr "Optional sollte hier als Zeichenkette eine kommagetrennte Liste lokaler Adressen angegeben werden, die @command{inetd} benutzen soll, wenn er stellvertretend für den angegebenen Dienst lauscht. Siehe @ref{Configuration file,,, inetutils, GNU Inetutils} für eine vollständige Beschreibung aller Optionen." #. type: table -#: doc/guix.texi:12901 +#: doc/guix.texi:12899 msgid "A string, the name must correspond to an entry in @code{/etc/services}." msgstr "Eine Zeichenkette. Dieser Name muss einem Eintrag in @code{/etc/services} entsprechen." #. type: code{#1} -#: doc/guix.texi:12901 +#: doc/guix.texi:12899 #, no-wrap msgid "socket-type" msgstr "socket-type" #. type: table -#: doc/guix.texi:12904 +#: doc/guix.texi:12902 msgid "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or @code{'seqpacket}." msgstr "Entweder @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} oder @code{'seqpacket}." #. type: code{#1} -#: doc/guix.texi:12904 +#: doc/guix.texi:12902 #, no-wrap msgid "protocol" msgstr "protocol" #. type: table -#: doc/guix.texi:12906 +#: doc/guix.texi:12904 msgid "A string, must correspond to an entry in @code{/etc/protocols}." msgstr "Eine Zeichenkette, die einem Eintrag in @code{/etc/protocols} entsprechen muss." #. type: item -#: doc/guix.texi:12906 +#: doc/guix.texi:12904 #, no-wrap msgid "@code{wait?} (default: @code{#t})" msgstr "@code{wait?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:12909 +#: doc/guix.texi:12907 msgid "Whether @command{inetd} should wait for the server to exit before listening to new service requests." msgstr "Ob @command{inetd} warten soll, bis der Server beendet ist, bevor es wieder auf neue Anfragen an den Dienst lauscht." #. type: table -#: doc/guix.texi:12914 +#: doc/guix.texi:12912 msgid "A string containing the user (and, optionally, group) name of the user as whom the server should run. The group name can be specified in a suffix, separated by a colon or period, i.e.@: @code{\"user\"}, @code{\"user:group\"} or @code{\"user.group\"}." msgstr "Eine Zeichenkette mit dem Benutzernamen (und optional dem Gruppennamen) des Benutzers, als der dieser Server ausgeführt werden soll. Der Gruppenname kann als Suffix angegeben werden, getrennt durch einen Doppelpunkt oder Punkt, d.h.@: @code{\"benutzer\"}, @code{\"benutzer:gruppe\"} oder @code{\"benutzer.gruppe\"}." #. type: item -#: doc/guix.texi:12914 +#: doc/guix.texi:12912 #, no-wrap msgid "@code{program} (default: @code{\"internal\"})" msgstr "@code{program} (Vorgabe: @code{\"internal\"})" #. type: table -#: doc/guix.texi:12917 +#: doc/guix.texi:12915 msgid "The server program which will serve the requests, or @code{\"internal\"} if @command{inetd} should use a built-in service." msgstr "Das Serverprogramm, das die Anfragen bedienen soll, oder @code{\"internal\"}, wenn @command{inetd} einen eingebauten Dienst verwenden soll." #. type: table -#: doc/guix.texi:12922 +#: doc/guix.texi:12920 msgid "A list strings or file-like objects, which are the server program's arguments, starting with the zeroth argument, i.e.@: the name of the program itself. For @command{inetd}'s internal services, this entry must be @code{'()} or @code{'(\"internal\")}." msgstr "Eine Liste von Zeichenketten oder dateiartigen Objekten, die dem Serverprogramm als Argumente übergeben werden, angefangen mit dem nullten Argument, d.h.@: dem Namen selbigen Serverprogramms. Bei in @command{inetd} eingebauten Diensten muss dieser Eintrag auf @code{'()} oder @code{'(\"internal\")} gesetzt sein." #. type: deftp -#: doc/guix.texi:12926 +#: doc/guix.texi:12924 msgid "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed discussion of each configuration field." msgstr "Siehe @ref{Configuration file,,, inetutils, GNU Inetutils} für eine mehr ins Detail gehende Erörterung jedes Konfigurationsfeldes." #. type: cindex -#: doc/guix.texi:12928 +#: doc/guix.texi:12926 #, no-wrap msgid "Tor" msgstr "Tor" #. type: defvr -#: doc/guix.texi:12929 +#: doc/guix.texi:12927 #, no-wrap msgid "{Scheme Variable} tor-service-type" msgstr "{Scheme-Variable} tor-service-type" #. type: defvr -#: doc/guix.texi:12934 +#: doc/guix.texi:12932 msgid "This is the type for a service that runs the @uref{https://torproject.org, Tor} anonymous networking daemon. The service is configured using a @code{} record. By default, the Tor daemon runs as the @code{tor} unprivileged user, which is a member of the @code{tor} group." msgstr "Dies ist der Diensttyp für den Dienst, der den @uref{https://torproject.org, Tor-Daemon} für anonyme Netzwerkrouten ausführt. Der Dienst benutzt für seine Konfiguration ein @code{}-Verbundsobjekt. Vorgegeben ist, dass der Tor-Daemon als „unprivilegierter“ Nutzer @code{tor} ausgeführt wird, einem Mitglied der @code{tor}-Benutzergruppe ohne besondere Berechtigungen." #. type: deftp -#: doc/guix.texi:12937 +#: doc/guix.texi:12935 #, no-wrap msgid "{Data Type} tor-configuration" msgstr "{Datentyp} tor-configuration" #. type: item -#: doc/guix.texi:12939 +#: doc/guix.texi:12937 #, no-wrap msgid "@code{tor} (default: @code{tor})" msgstr "@code{tor} (Vorgabe: @code{tor})" #. type: table -#: doc/guix.texi:12944 +#: doc/guix.texi:12942 msgid "The package that provides the Tor daemon. This package is expected to provide the daemon at @file{bin/tor} relative to its output directory. The default package is the @uref{https://www.torproject.org, Tor Project's} implementation." msgstr "Das Paket, das den Tor-Daemon zur Verfügung stellt. Von diesem Paket wird erwartet, dass es den Daemon unter dem Pfad @file{bin/tor} relativ zum Ausgabeverzeichnis verfügbar macht. Das vorgegebene Paket ist die Implementierung des @uref{https://www.torproject.org, Tor-Projekts}." #. type: item -#: doc/guix.texi:12945 +#: doc/guix.texi:12943 #, no-wrap msgid "@code{config-file} (default: @code{(plain-file \"empty\" \"\")})" msgstr "@code{config-file} (Vorgabe: @code{(plain-file \"empty\" \"\")})" #. type: table -#: doc/guix.texi:12951 +#: doc/guix.texi:12949 msgid "The configuration file to use. It will be appended to a default configuration file, and the final configuration file will be passed to @code{tor} via its @code{-f} option. This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}). See @code{man tor} for details on the configuration file syntax." msgstr "Die Konfigurationsdatei, die benutzt werden soll. Sie wird an eine vorgegebene Konfigurationsdatei angehängt und die sich daraus ergebende Konfigurationsdatei wird dann an @code{tor} über dessen Befehlszeilenoption @code{-f} übergeben. Hier kann jedes „dateiartige“ Objekt (siehe @ref{G-Expressions, file-like objects}) angegeben werden. Siehe @code{man tor} für Details zur Syntax der Konfigurationsdatei." #. type: item -#: doc/guix.texi:12952 +#: doc/guix.texi:12950 #, no-wrap msgid "@code{hidden-services} (default: @code{'()})" msgstr "@code{hidden-services} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:12958 +#: doc/guix.texi:12956 msgid "The list of @code{} records to use. For any hidden service you include in this list, appropriate configuration to enable the hidden service will be automatically added to the default configuration file. You may conveniently create @code{} records using the @code{tor-hidden-service} procedure described below." msgstr "Die Liste der zu benutzenden „versteckten Dienste“ als @code{}-Verbundsobjekte. Für jeden versteckten Dienst, den Sie in dieser Liste eintragen, werden automatisch entsprechende Einstellungen zur vorgefertigten Konfigurationsdatei hinzugefügt. Sie können @code{}-Verbundsobjekte bequem mit der unten beschriebenen Prozedur @code{tor-hidden-service} erzeugen lassen." #. type: item -#: doc/guix.texi:12959 +#: doc/guix.texi:12957 #, no-wrap msgid "@code{socks-socket-type} (default: @code{'tcp})" msgstr "@code{socks-socket-type} (Vorgabe: @code{'tcp})" #. type: table -#: doc/guix.texi:12966 +#: doc/guix.texi:12964 msgid "The default socket type that Tor should use for its SOCKS socket. This must be either @code{'tcp} or @code{'unix}. If it is @code{'tcp}, then by default Tor will listen on TCP port 9050 on the loopback interface (i.e., localhost). If it is @code{'unix}, then Tor will listen on the UNIX domain socket @file{/var/run/tor/socks-sock}, which will be made writable by members of the @code{tor} group." msgstr "Welche Art von Socket Tor für seinen SOCKS-Socket in der Voreinstellung benutzen soll. Dafür muss entweder @code{'tcp} oder @code{'unix} angegeben werden. Für @code{'tcp} wird Tor nach Voreinstellung auf dem TCP-Port 9050 auf der loopback-Schnittstelle (d.h.@: localhost) lauschen. Für @code{'unix} wird Tor auf dem UNIX-Socket @file{/var/run/tor/socks-sock} lauschen, auf den Mitglieder der @code{tor}-Benutzergruppe Schreibberechtigung erhalten." #. type: table -#: doc/guix.texi:12971 +#: doc/guix.texi:12969 msgid "If you want to customize the SOCKS socket in more detail, leave @code{socks-socket-type} at its default value of @code{'tcp} and use @code{config-file} to override the default by providing your own @code{SocksPort} option." msgstr "Wenn Sie detailliertere Anpassungen am SOCKS-Socket vornehmen wollen, belassen Sie @code{socks-socket-type} bei seinem vorgegebenen Wert @code{'tcp} und benutzen Sie @code{config-file}, um diese Voreinstellung mit Ihrer eigenen @code{SocksPort}-Option zu überspielen." #. type: cindex -#: doc/guix.texi:12974 +#: doc/guix.texi:12972 #, no-wrap msgid "hidden service" msgstr "versteckter Dienst" #. type: deffn -#: doc/guix.texi:12975 +#: doc/guix.texi:12973 #, no-wrap msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}" msgstr "{Scheme-Prozedur} tor-hidden-service @var{Name} @var{Zuordnung}" #. type: deffn -#: doc/guix.texi:12978 +#: doc/guix.texi:12976 msgid "Define a new Tor @dfn{hidden service} called @var{name} and implementing @var{mapping}. @var{mapping} is a list of port/host tuples, such as:" msgstr "Hiermit wird ein neuer @dfn{versteckter Dienst} von Tor mit diesem @var{Name}n definiert, der die @var{Zuordnung} herstellt. Die @var{Zuordnung} ist eine Liste von Port-/Rechner-Tupeln wie hier:" #. type: example -#: doc/guix.texi:12982 +#: doc/guix.texi:12980 #, no-wrap msgid "" " '((22 \"127.0.0.1:22\")\n" @@ -23771,288 +23782,288 @@ msgstr "" " (80 \"127.0.0.1:8080\"))\n" #. type: deffn -#: doc/guix.texi:12986 +#: doc/guix.texi:12984 msgid "In this example, port 22 of the hidden service is mapped to local port 22, and port 80 is mapped to local port 8080." msgstr "In diesem Beispiel wird Port 22 des versteckten Dienstes an den ihm zugeordneten lokalen Port 22 weitergeleitet und Port 80 wird an den lokalen Port 8080 weitergeleitet." #. type: deffn -#: doc/guix.texi:12990 +#: doc/guix.texi:12988 msgid "This creates a @file{/var/lib/tor/hidden-services/@var{name}} directory, where the @file{hostname} file contains the @code{.onion} host name for the hidden service." msgstr "Dadurch wird ein Verzeichnis @file{/var/lib/tor/hidden-services/@var{Name}} erstellt, worin sich in der Datei @file{hostname} der @code{.onion}-Rechnername („Host“-Name) des versteckten Dienstes befindet." #. type: deffn -#: doc/guix.texi:12993 +#: doc/guix.texi:12991 msgid "See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information." msgstr "Siehe @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, die Dokumentation des Tor-Projekts} für weitere Informationen." #. type: Plain text -#: doc/guix.texi:12996 +#: doc/guix.texi:12994 msgid "The @code{(gnu services rsync)} module provides the following services:" msgstr "Das Modul @code{(gnu services rsync)} bietet die folgenden Dienste an:" #. type: Plain text -#: doc/guix.texi:13000 +#: doc/guix.texi:12998 msgid "You might want an rsync daemon if you have files that you want available so anyone (or just yourself) can download existing files or upload new files." msgstr "Sie könnten einen rsync-Daemon einsetzen wollen, um Dateien verfügbar zu machen, damit jeder (oder nur Sie) bestehende Dateien herunterladen oder neue Dateien hochladen kann." #. type: deffn -#: doc/guix.texi:13001 +#: doc/guix.texi:12999 #, no-wrap msgid "{Scheme Variable} rsync-service-type" msgstr "{Scheme-Variable} rsync-service-type" #. type: deffn -#: doc/guix.texi:13005 +#: doc/guix.texi:13003 msgid "This is the service type for the @uref{https://rsync.samba.org, rsync} daemon, The value for this service type is a @command{rsync-configuration} record as in this example:" msgstr "Dies ist der Diensttyp für den @uref{https://rsync.samba.org, rsync-Daemon}, er benutzt ein @command{rsync-configuration}-Verbundsobjekt wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:13008 +#: doc/guix.texi:13006 #, no-wrap msgid "(service rsync-service-type)\n" msgstr "(service rsync-service-type)\n" #. type: deffn -#: doc/guix.texi:13011 +#: doc/guix.texi:13009 msgid "See below for details about @code{rsync-configuration}." msgstr "Siehe unten für Details zur @code{rsync-configuration}." #. type: deftp -#: doc/guix.texi:13013 +#: doc/guix.texi:13011 #, no-wrap msgid "{Data Type} rsync-configuration" msgstr "{Datentyp} rsync-configuration" #. type: deftp -#: doc/guix.texi:13015 +#: doc/guix.texi:13013 msgid "Data type representing the configuration for @code{rsync-service}." msgstr "Datentyp, der die Konfiguration für den @code{rsync-service} repräsentiert." #. type: item -#: doc/guix.texi:13017 +#: doc/guix.texi:13015 #, no-wrap msgid "@code{package} (default: @var{rsync})" msgstr "@code{package} (Vorgabe: @var{rsync})" #. type: table -#: doc/guix.texi:13019 +#: doc/guix.texi:13017 msgid "@code{rsync} package to use." msgstr "Zu benutzendes @code{rsync}-Paket." #. type: item -#: doc/guix.texi:13020 +#: doc/guix.texi:13018 #, no-wrap msgid "@code{port-number} (default: @code{873})" msgstr "@code{port-number} (Vorgabe: @code{873})" #. type: table -#: doc/guix.texi:13024 +#: doc/guix.texi:13022 msgid "TCP port on which @command{rsync} listens for incoming connections. If port is less than @code{1024} @command{rsync} needs to be started as the @code{root} user and group." msgstr "Der TCP-Port, auf dem @command{rsync} auf eingehende Verbindungen lauscht. Wenn die Portnummer kleiner als @code{1024} ist, muss @command{rsync} als Administratornutzer @code{root} und auch mit dieser Benutzergruppe gestartet werden." #. type: item -#: doc/guix.texi:13025 +#: doc/guix.texi:13023 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/rsyncd/rsyncd.pid\"})" #. type: table -#: doc/guix.texi:13027 +#: doc/guix.texi:13025 msgid "Name of the file where @command{rsync} writes its PID." msgstr "Der Name der Datei, in die @command{rsync} seine PID schreibt." #. type: item -#: doc/guix.texi:13028 +#: doc/guix.texi:13026 #, no-wrap msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})" msgstr "@code{lock-file} (Vorgabe: @code{\"/var/run/rsyncd/rsyncd.lock\"})" #. type: table -#: doc/guix.texi:13030 +#: doc/guix.texi:13028 msgid "Name of the file where @command{rsync} writes its lock file." msgstr "Der Name der Datei, die @command{rsync} als seine Sperrdatei verwendet." #. type: item -#: doc/guix.texi:13031 +#: doc/guix.texi:13029 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})" msgstr "@code{log-file} (Vorgabe: @code{\"/var/log/rsyncd.log\"})" #. type: table -#: doc/guix.texi:13033 +#: doc/guix.texi:13031 msgid "Name of the file where @command{rsync} writes its log file." msgstr "Der Name der Datei, in die @command{rsync} seine Protokolle schreibt." #. type: item -#: doc/guix.texi:13034 +#: doc/guix.texi:13032 #, no-wrap msgid "@code{use-chroot?} (default: @var{#t})" msgstr "@code{use-chroot?} (Vorgabe: @var{#t})" #. type: table -#: doc/guix.texi:13036 +#: doc/guix.texi:13034 msgid "Whether to use chroot for @command{rsync} shared directory." msgstr "Ob chroot auf das über @command{rsync} geteilte Verzeichnis angewandt werden soll." #. type: item -#: doc/guix.texi:13037 +#: doc/guix.texi:13035 #, no-wrap msgid "@code{share-path} (default: @file{/srv/rsync})" msgstr "@code{share-path} (Vorgabe: @file{/srv/rsync})" #. type: table -#: doc/guix.texi:13039 +#: doc/guix.texi:13037 msgid "Location of the @command{rsync} shared directory." msgstr "Der Ort des Verzeichnisses, das @command{rsync} teilt, d.h.@: seine „Shared Directory“." #. type: item -#: doc/guix.texi:13040 +#: doc/guix.texi:13038 #, no-wrap msgid "@code{share-comment} (default: @code{\"Rsync share\"})" msgstr "@code{share-comment} (Vorgabe: @code{\"Rsync share\"})" #. type: table -#: doc/guix.texi:13042 +#: doc/guix.texi:13040 msgid "Comment of the @command{rsync} shared directory." msgstr "Kommentar zum von @command{rsync} geteilten Verzeichnis." #. type: item -#: doc/guix.texi:13043 +#: doc/guix.texi:13041 #, no-wrap msgid "@code{read-only?} (default: @var{#f})" msgstr "@code{read-only?} (Vorgabe: @var{#f})" #. type: table -#: doc/guix.texi:13045 +#: doc/guix.texi:13043 msgid "Read-write permissions to shared directory." msgstr "Bestimmt die Lese- und Schreibberechtigungen für das gemeinsame Verzeichnis." #. type: item -#: doc/guix.texi:13046 +#: doc/guix.texi:13044 #, no-wrap msgid "@code{timeout} (default: @code{300})" msgstr "@code{timeout} (Vorgabe: @code{300})" #. type: table -#: doc/guix.texi:13048 +#: doc/guix.texi:13046 msgid "I/O timeout in seconds." msgstr "Ein-/Ausgabe-Zeitbeschränkung in Sekunden." #. type: item -#: doc/guix.texi:13049 +#: doc/guix.texi:13047 #, no-wrap msgid "@code{user} (default: @var{\"root\"})" msgstr "@code{user} (Vorgabe: @var{\"root\"})" #. type: table -#: doc/guix.texi:13051 +#: doc/guix.texi:13049 msgid "Owner of the @code{rsync} process." msgstr "Das Benutzerkonto, dem der @code{rsync}-Prozess gehören soll." #. type: item -#: doc/guix.texi:13052 +#: doc/guix.texi:13050 #, no-wrap msgid "@code{group} (default: @var{\"root\"})" msgstr "@code{group} (Vorgabe: @var{\"root\"})" #. type: table -#: doc/guix.texi:13054 +#: doc/guix.texi:13052 msgid "Group of the @code{rsync} process." msgstr "Die Benutzergruppe des @code{rsync}-Prozesses." #. type: item -#: doc/guix.texi:13055 +#: doc/guix.texi:13053 #, no-wrap msgid "@code{uid} (default: @var{\"rsyncd\"})" msgstr "@code{uid} (Vorgabe: @var{\"rsyncd\"})" #. type: table -#: doc/guix.texi:13058 +#: doc/guix.texi:13056 msgid "User name or user ID that file transfers to and from that module should take place as when the daemon was run as @code{root}." msgstr "Der Benutzername oder der Benutzeridentifikator (d.h.@: die „User-ID“), mit dem Dateiübertragungen zum und vom Modul stattfinden sollen, wenn der Daemon als Administratornutzer @code{root} läuft." #. type: item -#: doc/guix.texi:13059 +#: doc/guix.texi:13057 #, no-wrap msgid "@code{gid} (default: @var{\"rsyncd\"})" msgstr "@code{gid} (Vorgabe: @var{\"rsyncd\"})" #. type: table -#: doc/guix.texi:13061 +#: doc/guix.texi:13059 msgid "Group name or group ID that will be used when accessing the module." msgstr "Benutzergruppenname oder Gruppenidentifikator („Group-ID“), mit dem auf das Modul zugegriffen wird." #. type: Plain text -#: doc/guix.texi:13066 +#: doc/guix.texi:13064 msgid "Furthermore, @code{(gnu services ssh)} provides the following services." msgstr "Des Weiteren bietet das Modul @code{(gnu services ssh)} die folgenden Dienste an." #. type: cindex -#: doc/guix.texi:13066 doc/guix.texi:13105 doc/guix.texi:24782 +#: doc/guix.texi:13064 doc/guix.texi:13103 doc/guix.texi:24768 #, no-wrap msgid "SSH" msgstr "SSH" #. type: cindex -#: doc/guix.texi:13067 doc/guix.texi:13106 doc/guix.texi:24783 +#: doc/guix.texi:13065 doc/guix.texi:13104 doc/guix.texi:24769 #, no-wrap msgid "SSH server" msgstr "SSH-Server" #. type: deffn -#: doc/guix.texi:13069 +#: doc/guix.texi:13067 #, no-wrap msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" msgstr "{Scheme-Prozedur} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" #. type: deffn -#: doc/guix.texi:13078 +#: doc/guix.texi:13076 msgid "[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-key-authentication? #t] [#:initialize? #t] Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}. @var{host-key} must designate a file containing the host key, and readable only by root." msgstr "[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-key-authentication? #t] [#:initialize? #t] Das @command{lshd}-Programm auf dem @var{lsh}-Paket so ausführen, dass es auf dem Port mit Portnummer @var{port-number} lauscht. @var{host-key} muss eine Datei angeben, die den Wirtsschlüssel enthält, die nur für den Administratornutzer lesbar sein darf." #. type: deffn -#: doc/guix.texi:13084 +#: doc/guix.texi:13082 msgid "When @var{daemonic?} is true, @command{lshd} will detach from the controlling terminal and log its output to syslogd, unless one sets @var{syslog-output?} to false. Obviously, it also makes lsh-service depend on existence of syslogd service. When @var{pid-file?} is true, @command{lshd} writes its PID to the file called @var{pid-file}." msgstr "Wenn @var{daemonic?} wahr ist, entkoppelt sich @command{lshd} vom Terminal, auf dem er läuft, und schickt seine Protokolle an syslogd, außer @var{syslog-output?} ist auf falsch gesetzt. Selbstverständlich hängt der lsh-service dann auch von der Existenz eines syslogd-Dienstes ab. Wenn @var{pid-file?} wahr ist, schreibt @command{lshd} seine PID in die Datei namens @var{pid-file}." #. type: deffn -#: doc/guix.texi:13088 +#: doc/guix.texi:13086 msgid "When @var{initialize?} is true, automatically create the seed and host key upon service activation if they do not exist yet. This may take long and require interaction." msgstr "Wenn @var{initialize?} wahr ist, wird der Startwert zur Verschlüsselung ebenso wie der Wirtsschlüssel bei der Dienstaktivierung erstellt, falls sie noch nicht existieren. Das kann lange dauern und Anwenderinteraktion kann dabei erforderlich sein." #. type: deffn -#: doc/guix.texi:13093 +#: doc/guix.texi:13091 msgid "When @var{initialize?} is false, it is up to the user to initialize the randomness generator (@pxref{lsh-make-seed,,, lsh, LSH Manual}), and to create a key pair with the private key stored in file @var{host-key} (@pxref{lshd basics,,, lsh, LSH Manual})." msgstr "Wenn @var{initialize?} falsch ist, bleibt es dem Nutzer überlassen, den Zufallsgenerator zu initialisieren (siehe @ref{lsh-make-seed,,, lsh, LSH Manual}) und ein Schlüsselpaar zu erzeugen, dessen privater Schlüssel in der mit @var{host-key} angegebenen Datei steht (siehe @ref{lshd basics,,, lsh, LSH Manual})." #. type: deffn -#: doc/guix.texi:13097 +#: doc/guix.texi:13095 msgid "When @var{interfaces} is empty, lshd listens for connections on all the network interfaces; otherwise, @var{interfaces} must be a list of host names or addresses." msgstr "Wenn @var{interfaces} leer ist, lauscht lshd an allen Netzwerkschnittstellen auf Verbindungen, andernfalls muss @var{interfaces} eine Liste von Rechnernamen („Host“-Namen) oder Adressen bezeichnen." #. type: deffn -#: doc/guix.texi:13101 +#: doc/guix.texi:13099 msgid "@var{allow-empty-passwords?} specifies whether to accept log-ins with empty passwords, and @var{root-login?} specifies whether to accept log-ins as root." msgstr "@var{allow-empty-passwords?} gibt an, ob Anmeldungen mit leeren Passwörtern akzeptiert werden sollen, und @var{root-login?} gibt an, ob Anmeldungen als Administratornutzer „root“ akzeptiert werden sollen." #. type: deffn -#: doc/guix.texi:13103 +#: doc/guix.texi:13101 msgid "The other options should be self-descriptive." msgstr "Die anderen Felder sollten selbsterklärend sein." #. type: deffn -#: doc/guix.texi:13107 +#: doc/guix.texi:13105 #, no-wrap msgid "{Scheme Variable} openssh-service-type" msgstr "{Scheme-Variable} openssh-service-type" #. type: deffn -#: doc/guix.texi:13111 +#: doc/guix.texi:13109 msgid "This is the type for the @uref{http://www.openssh.org, OpenSSH} secure shell daemon, @command{sshd}. Its value must be an @code{openssh-configuration} record as in this example:" msgstr "Dies ist der Diensttyp für den @uref{http://www.openssh.org, OpenSSH-Secure-Shell-Daemon}, @command{sshd}. Sein Wert muss ein @code{openssh-configuration}-Verbundsobjekt wie in diesem Beispiel sein:" #. type: example -#: doc/guix.texi:13120 +#: doc/guix.texi:13118 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -24072,17 +24083,17 @@ msgstr "" " (\"bob\" ,(local-file \"bob.pub\"))))))\n" #. type: deffn -#: doc/guix.texi:13123 +#: doc/guix.texi:13121 msgid "See below for details about @code{openssh-configuration}." msgstr "Siehe unten für Details zur @code{openssh-configuration}." #. type: deffn -#: doc/guix.texi:13126 +#: doc/guix.texi:13124 msgid "This service can be extended with extra authorized keys, as in this example:" msgstr "Dieser Dienst kann mit weiteren autorisierten Schlüsseln erweitert werden, wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:13131 +#: doc/guix.texi:13129 #, no-wrap msgid "" "(service-extension openssh-service-type\n" @@ -24094,192 +24105,192 @@ msgstr "" " ,(local-file \"charlie.pub\")))))\n" #. type: deftp -#: doc/guix.texi:13134 +#: doc/guix.texi:13132 #, no-wrap msgid "{Data Type} openssh-configuration" msgstr "{Datentyp} openssh-configuration" #. type: deftp -#: doc/guix.texi:13136 +#: doc/guix.texi:13134 msgid "This is the configuration record for OpenSSH's @command{sshd}." msgstr "Dies ist der Verbundstyp für die Konfiguration von OpenSSHs @command{sshd}." #. type: item -#: doc/guix.texi:13138 +#: doc/guix.texi:13136 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/sshd.pid\"})" #. type: table -#: doc/guix.texi:13140 +#: doc/guix.texi:13138 msgid "Name of the file where @command{sshd} writes its PID." msgstr "Der Name der Datei, in die @command{sshd} seine PID schreibt." #. type: item -#: doc/guix.texi:13141 +#: doc/guix.texi:13139 #, no-wrap msgid "@code{port-number} (default: @code{22})" msgstr "@code{port-number} (Vorgabe: @code{22})" #. type: table -#: doc/guix.texi:13143 +#: doc/guix.texi:13141 msgid "TCP port on which @command{sshd} listens for incoming connections." msgstr "Der TCP-Port, auf dem @command{sshd} auf eingehende Verbindungen lauscht." #. type: item -#: doc/guix.texi:13144 +#: doc/guix.texi:13142 #, no-wrap msgid "@code{permit-root-login} (default: @code{#f})" msgstr "@code{permit-root-login} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13149 +#: doc/guix.texi:13147 msgid "This field determines whether and when to allow logins as root. If @code{#f}, root logins are disallowed; if @code{#t}, they are allowed. If it's the symbol @code{'without-password}, then root logins are permitted but not with password-based authentication." msgstr "Dieses Feld bestimmt, ob und wann Anmeldungen als Administratornutzer „root“ erlaubt sind. Wenn es @code{#f} ist, sind Anmeldungen als Administrator gesperrt, bei @code{#t} sind sie erlaubt. Wird hier das Symbol @code{'without-password} angegeben, dann sind Anmeldungen als Administrator erlaubt, aber nur, wenn keine passwortbasierte Authentifizierung verwendet wird." #. type: item -#: doc/guix.texi:13150 doc/guix.texi:13311 +#: doc/guix.texi:13148 doc/guix.texi:13309 #, no-wrap msgid "@code{allow-empty-passwords?} (default: @code{#f})" msgstr "@code{allow-empty-passwords?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13153 +#: doc/guix.texi:13151 msgid "When true, users with empty passwords may log in. When false, they may not." msgstr "Wenn dies auf wahr gesetzt ist, können sich Nutzer, deren Passwort leer ist, anmelden. Ist es falsch, können sie es nicht." #. type: item -#: doc/guix.texi:13154 doc/guix.texi:13314 +#: doc/guix.texi:13152 doc/guix.texi:13312 #, no-wrap msgid "@code{password-authentication?} (default: @code{#t})" msgstr "@code{password-authentication?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13157 +#: doc/guix.texi:13155 msgid "When true, users may log in with their password. When false, they have other authentication methods." msgstr "Wenn dies wahr ist, können sich Benutzer mit ihrem Passwort anmelden. Wenn es falsch ist, müssen sie andere Authentizierungsmethoden benutzen." #. type: item -#: doc/guix.texi:13158 +#: doc/guix.texi:13156 #, no-wrap msgid "@code{public-key-authentication?} (default: @code{#t})" msgstr "@code{public-key-authentication?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13161 +#: doc/guix.texi:13159 msgid "When true, users may log in using public key authentication. When false, users have to use other authentication method." msgstr "Wenn dies wahr ist, können Benutzer zur Anmeldung mit ihrem öffentlichen Schlüssel authentifiziert werden. Wenn es falsch ist, müssen sie andere Authentizierungsmethoden benutzen." #. type: table -#: doc/guix.texi:13164 +#: doc/guix.texi:13162 msgid "Authorized public keys are stored in @file{~/.ssh/authorized_keys}. This is used only by protocol version 2." msgstr "Autorisierte öffentliche Schlüssel werden in @file{~/.ssh/authorized_keys} gespeichert. Dies wird nur für Protokollversion 2 benutzt." #. type: item -#: doc/guix.texi:13165 +#: doc/guix.texi:13163 #, no-wrap msgid "@code{x11-forwarding?} (default: @code{#f})" msgstr "@code{x11-forwarding?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13169 +#: doc/guix.texi:13167 msgid "When true, forwarding of X11 graphical client connections is enabled---in other words, @command{ssh} options @option{-X} and @option{-Y} will work." msgstr "Wenn dies auf wahr gesetzt ist, ist das Weiterleiten von Verbindungen an grafische X11-Clients erlaubt — mit anderen Worten funktionieren dann die @command{ssh}-Befehlszeilenoptionen @option{-X} und @option{-Y}." #. type: item -#: doc/guix.texi:13170 +#: doc/guix.texi:13168 #, no-wrap msgid "@code{allow-agent-forwarding?} (default: @code{#t})" msgstr "@code{allow-agent-forwarding?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13172 +#: doc/guix.texi:13170 msgid "Whether to allow agent forwarding." msgstr "Ob Weiterleitung an den SSH-Agenten zugelassen werden soll." #. type: item -#: doc/guix.texi:13173 +#: doc/guix.texi:13171 #, no-wrap msgid "@code{allow-tcp-forwarding?} (default: @code{#t})" msgstr "@code{allow-tcp-forwarding?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13175 +#: doc/guix.texi:13173 msgid "Whether to allow TCP forwarding." msgstr "Ob Weiterleitung von TCP-Kommunikation zugelassen werden soll." #. type: item -#: doc/guix.texi:13176 +#: doc/guix.texi:13174 #, no-wrap msgid "@code{gateway-ports?} (default: @code{#f})" msgstr "@code{gateway-ports?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13178 +#: doc/guix.texi:13176 msgid "Whether to allow gateway ports." msgstr "Ob Ports als Zugang für eingehende Verbindungen („Gateway-Ports“) weitergeleitet werden dürfen." #. type: item -#: doc/guix.texi:13179 +#: doc/guix.texi:13177 #, no-wrap msgid "@code{challenge-response-authentication?} (default: @code{#f})" msgstr "@code{challenge-response-authentication?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13182 +#: doc/guix.texi:13180 msgid "Specifies whether challenge response authentication is allowed (e.g.@: via PAM)." msgstr "Gibt an, ob „Challenge-Response“-Authentifizierung zugelassen wird (z.B.@: über PAM)." #. type: item -#: doc/guix.texi:13183 +#: doc/guix.texi:13181 #, no-wrap msgid "@code{use-pam?} (default: @code{#t})" msgstr "@code{use-pam?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13189 +#: doc/guix.texi:13187 msgid "Enables the Pluggable Authentication Module interface. If set to @code{#t}, this will enable PAM authentication using @code{challenge-response-authentication?} and @code{password-authentication?}, in addition to PAM account and session module processing for all authentication types." msgstr "Aktiviert die Pluggable-Authentication-Module-Schnittstelle. Wenn es auf @code{#t} gesetzt ist, wird dadurch PAM-Authentizierung über @code{challenge-response-authentication?} und @code{password-authentication?} aktiviert, zusätzlich zur Verarbeitung von PAM-Konten und Sitzungsmodulen für alle Authentizierungsarten." #. type: table -#: doc/guix.texi:13194 +#: doc/guix.texi:13192 msgid "Because PAM challenge response authentication usually serves an equivalent role to password authentication, you should disable either @code{challenge-response-authentication?} or @code{password-authentication?}." msgstr "Weil PAM-Challenge-Response-Authentizierung oft für dieselben Zwecke wie Passwortauthentizierung eingesetzt wird, sollten Sie entweder @code{challenge-response-authentication?} oder @code{password-authentication?} deaktivieren." #. type: item -#: doc/guix.texi:13195 +#: doc/guix.texi:13193 #, no-wrap msgid "@code{print-last-log?} (default: @code{#t})" msgstr "@code{print-last-log?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13198 +#: doc/guix.texi:13196 msgid "Specifies whether @command{sshd} should print the date and time of the last user login when a user logs in interactively." msgstr "Hiermit wird angegeben, ob @command{sshd} Datum und Uhrzeit der letzten Anmeldung anzeigen soll, wenn sich ein Benutzer interaktiv anmeldet." #. type: item -#: doc/guix.texi:13199 +#: doc/guix.texi:13197 #, no-wrap msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})" msgstr "@code{subsystems} (Vorgabe: @code{'((\"sftp\" \"internal-sftp\"))})" #. type: table -#: doc/guix.texi:13201 +#: doc/guix.texi:13199 msgid "Configures external subsystems (e.g.@: file transfer daemon)." msgstr "Hiermit werden externe Subsysteme konfiguriert (z.B.@: ein Dateiübertragungsdaemon)." #. type: table -#: doc/guix.texi:13205 +#: doc/guix.texi:13203 msgid "This is a list of two-element lists, each of which containing the subsystem name and a command (with optional arguments) to execute upon subsystem request." msgstr "Diese werden als Liste von zweielementigen Listen angegeben, von denen jede den Namen des Subsystems und einen Befehl (mit optionalen Befehlszeilenargumenten) benennt, der bei einer Anfrage an das Subsystem ausgeführt werden soll." #. type: table -#: doc/guix.texi:13208 +#: doc/guix.texi:13206 msgid "The command @command{internal-sftp} implements an in-process SFTP server. Alternately, one can specify the @command{sftp-server} command:" msgstr "Der Befehl @command{internal-sftp} implementiert einen SFTP-Server im selben Prozess. Alternativ kann man den @command{sftp-server}-Befehl angeben:" #. type: example -#: doc/guix.texi:13213 +#: doc/guix.texi:13211 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -24293,28 +24304,28 @@ msgstr "" " `((\"sftp\" ,(file-append openssh \"/libexec/sftp-server\"))))))\n" #. type: item -#: doc/guix.texi:13215 +#: doc/guix.texi:13213 #, no-wrap msgid "@code{accepted-environment} (default: @code{'()})" msgstr "@code{accepted-environment} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13217 +#: doc/guix.texi:13215 msgid "List of strings describing which environment variables may be exported." msgstr "Eine Liste von Zeichenketten, die die Umgebungsvariablen benennen, die exportiert werden dürfen." #. type: table -#: doc/guix.texi:13220 +#: doc/guix.texi:13218 msgid "Each string gets on its own line. See the @code{AcceptEnv} option in @code{man sshd_config}." msgstr "Jede Zeichenkette wird zu einer eigenen Zeile in der Konfigurationsdatei. Siehe die Option @code{AcceptEnv} in @code{man sshd_config}." #. type: table -#: doc/guix.texi:13225 +#: doc/guix.texi:13223 msgid "This example allows ssh-clients to export the @code{COLORTERM} variable. It is set by terminal emulators, which support colors. You can use it in your shell's ressource file to enable colors for the prompt and commands if this variable is set." msgstr "Mit diesem Beispiel können SSH-Clients die Umgebungsvariable @code{COLORTERM} exportieren. Sie wird von Terminal-Emulatoren gesetzt, die Farben unterstützen. Sie können Sie in der Ressourcendatei Ihrer Shell benutzen, um Farben in der Eingabeaufforderung und in Befehlen zu aktivieren, wenn diese Variable gesetzt ist." #. type: example -#: doc/guix.texi:13230 +#: doc/guix.texi:13228 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -24326,30 +24337,30 @@ msgstr "" " (accepted-environment '(\"COLORTERM\"))))\n" #. type: item -#: doc/guix.texi:13232 +#: doc/guix.texi:13230 #, no-wrap msgid "@code{authorized-keys} (default: @code{'()})" msgstr "@code{authorized-keys} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:13233 +#: doc/guix.texi:13231 #, no-wrap msgid "authorized keys, SSH" msgstr "Autorisierte Schlüssel, SSH" #. type: cindex -#: doc/guix.texi:13234 +#: doc/guix.texi:13232 #, no-wrap msgid "SSH authorized keys" msgstr "SSH, autorisierte Schlüssel" #. type: table -#: doc/guix.texi:13238 +#: doc/guix.texi:13236 msgid "This is the list of authorized keys. Each element of the list is a user name followed by one or more file-like objects that represent SSH public keys. For example:" msgstr "Dies ist die Liste der autorisierten Schlüssel. Jedes Element der Liste ist ein Benutzername gefolgt von einem oder mehr dateiartigen Objekten, die öffentliche SSH-Schlüssel repräsentieren. Zum Beispiel werden mit" #. type: example -#: doc/guix.texi:13245 +#: doc/guix.texi:13243 #, no-wrap msgid "" "(openssh-configuration\n" @@ -24365,44 +24376,44 @@ msgstr "" " (\"root\" ,(local-file \"rekado.pub\") ,(local-file \"chris.pub\")))))\n" #. type: table -#: doc/guix.texi:13250 +#: doc/guix.texi:13248 msgid "registers the specified public keys for user accounts @code{rekado}, @code{chris}, and @code{root}." msgstr "die angegebenen öffentlichen Schlüssel für die Benutzerkonten @code{rekado}, @code{chris} und @code{root} registriert." #. type: table -#: doc/guix.texi:13253 +#: doc/guix.texi:13251 msgid "Additional authorized keys can be specified @i{via} @code{service-extension}." msgstr "Weitere autorisierte Schlüssel können als @code{service-extension} hinzugefügt werden." #. type: table -#: doc/guix.texi:13256 +#: doc/guix.texi:13254 msgid "Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}." msgstr "Beachten Sie, dass das hier neben @file{~/.ssh/authorized_keys} @emph{ohne} sich zu stören benutzt werden kann." #. type: item -#: doc/guix.texi:13257 +#: doc/guix.texi:13255 #, no-wrap msgid "@code{log-level} (default: @code{'info})" msgstr "@code{log-level} (Vorgabe: @code{'info})" #. type: table -#: doc/guix.texi:13261 +#: doc/guix.texi:13259 msgid "This is a symbol specifying the logging level: @code{quiet}, @code{fatal}, @code{error}, @code{info}, @code{verbose}, @code{debug}, etc. See the man page for @file{sshd_config} for the full list of level names." msgstr "Dieses Symbol gibt die Stufe der Protokollierung an: @code{quiet} (schweigsam), @code{fatal}, @code{error}, @code{info}, @code{verbose} (ausführlich), @code{debug} etc. Siehe die Handbuchseite für @file{sshd_config} für die vollständige Liste der Stufenbezeichnungen." #. type: item -#: doc/guix.texi:13262 doc/guix.texi:18877 +#: doc/guix.texi:13260 doc/guix.texi:18874 #, no-wrap msgid "@code{extra-content} (default: @code{\"\"})" msgstr "@code{extra-content} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:13267 +#: doc/guix.texi:13265 msgid "This field can be used to append arbitrary text to the configuration file. It is especially useful for elaborate configurations that cannot be expressed otherwise. This configuration, for example, would generally disable root logins, but permit them from one specific IP address:" msgstr "Dieses Feld kann benutzt werden, um beliebigen Text an die Konfigurationsdatei anzuhängen. Es ist besonders bei ausgeklügelten Konfigurationen nützlich, die anders nicht ausgedrückt werden können. Zum Beispiel würden mit dieser Konfiguration Anmeldungen als Administratornutzer „root“ grundsätzlich untersagt, lediglich für eine bestimmte IP-Adresse wären sie zugelassen:" #. type: example -#: doc/guix.texi:13273 +#: doc/guix.texi:13271 #, no-wrap msgid "" "(openssh-configuration\n" @@ -24416,23 +24427,23 @@ msgstr "" " PermitRootLogin yes\"))\n" #. type: deffn -#: doc/guix.texi:13278 +#: doc/guix.texi:13276 #, no-wrap msgid "{Scheme Procedure} dropbear-service [@var{config}]" msgstr "{Scheme-Prozedur} dropbear-service [@var{Konfiguration}]" #. type: deffn -#: doc/guix.texi:13282 +#: doc/guix.texi:13280 msgid "Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH daemon} with the given @var{config}, a @code{} object." msgstr "Den @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear-SSH-Daemon} mit der angegebenen @var{Konfiguration} ausführen, einem @code{}-Objekt." #. type: deffn -#: doc/guix.texi:13285 +#: doc/guix.texi:13283 msgid "For example, to specify a Dropbear service listening on port 1234, add this call to the operating system's @code{services} field:" msgstr "Wenn Sie zum Beispiel einen Dropbear-Dienst angeben möchten, der auf Port 1234 lauscht, dann fügen Sie diesen Aufruf ins @code{services}-Feld des Betriebssystems ein:" #. type: example -#: doc/guix.texi:13289 +#: doc/guix.texi:13287 #, no-wrap msgid "" "(dropbear-service (dropbear-configuration\n" @@ -24442,99 +24453,99 @@ msgstr "" " (port-number 1234)))\n" #. type: deftp -#: doc/guix.texi:13292 +#: doc/guix.texi:13290 #, no-wrap msgid "{Data Type} dropbear-configuration" msgstr "{Datentyp} dropbear-configuration" #. type: deftp -#: doc/guix.texi:13294 +#: doc/guix.texi:13292 msgid "This data type represents the configuration of a Dropbear SSH daemon." msgstr "Dieser Datentyp repräsentiert die Konfiguration eines Dropbear-SSH-Daemons." #. type: item -#: doc/guix.texi:13296 +#: doc/guix.texi:13294 #, no-wrap msgid "@code{dropbear} (default: @var{dropbear})" msgstr "@code{dropbear} (Vorgabe: @var{dropbear})" #. type: table -#: doc/guix.texi:13298 +#: doc/guix.texi:13296 msgid "The Dropbear package to use." msgstr "Das zu benutzende Dropbear-Paket." #. type: item -#: doc/guix.texi:13299 +#: doc/guix.texi:13297 #, no-wrap msgid "@code{port-number} (default: 22)" msgstr "@code{port-number} (Vorgabe: 22)" #. type: table -#: doc/guix.texi:13301 +#: doc/guix.texi:13299 msgid "The TCP port where the daemon waits for incoming connections." msgstr "Die Portnummer des TCP-Ports, auf dem der Daemon auf eingehende Verbindungen wartet." #. type: item -#: doc/guix.texi:13302 +#: doc/guix.texi:13300 #, no-wrap msgid "@code{syslog-output?} (default: @code{#t})" msgstr "@code{syslog-output?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13304 +#: doc/guix.texi:13302 msgid "Whether to enable syslog output." msgstr "Ob eine Ausgabe für Syslog aktiviert sein soll." #. type: item -#: doc/guix.texi:13305 +#: doc/guix.texi:13303 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/dropbear.pid\"})" #. type: table -#: doc/guix.texi:13307 +#: doc/guix.texi:13305 msgid "File name of the daemon's PID file." msgstr "Der Dateiname der PID-Datei des Daemons." #. type: item -#: doc/guix.texi:13308 +#: doc/guix.texi:13306 #, no-wrap msgid "@code{root-login?} (default: @code{#f})" msgstr "@code{root-login?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13310 +#: doc/guix.texi:13308 msgid "Whether to allow @code{root} logins." msgstr "Ob Anmeldungen als Administratornutzer @code{root} möglich sein sollen." #. type: table -#: doc/guix.texi:13313 +#: doc/guix.texi:13311 msgid "Whether to allow empty passwords." msgstr "Ob leere Passwörter zugelassen sein sollen." #. type: table -#: doc/guix.texi:13316 +#: doc/guix.texi:13314 msgid "Whether to enable password-based authentication." msgstr "Ob passwortbasierte Authentizierung zugelassen sein soll." #. type: defvr -#: doc/guix.texi:13319 +#: doc/guix.texi:13317 #, no-wrap msgid "{Scheme Variable} %facebook-host-aliases" msgstr "{Scheme-Variable} %facebook-host-aliases" #. type: defvr -#: doc/guix.texi:13325 +#: doc/guix.texi:13323 msgid "This variable contains a string for use in @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). Each line contains a entry that maps a known server name of the Facebook on-line service---e.g., @code{www.facebook.com}---to the local host---@code{127.0.0.1} or its IPv6 equivalent, @code{::1}." msgstr "Diese Variable enthält eine Zeichenkette, die Sie für @file{/etc/hosts} benutzen können (siehe @ref{Host Names,,, libc, The GNU C Library Reference Manual}). Jede Zeile enthält einen Eintrag, der einen bekannten Servernamen des Facebook-Online-Dienstes — z.B.@: @code{www.facebook.com} — an den lokalen Rechner umleitet — also an @code{127.0.0.1} oder dessen IPv6-Gegenstück @code{::1}." #. type: defvr -#: doc/guix.texi:13329 +#: doc/guix.texi:13327 msgid "This variable is typically used in the @code{hosts-file} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @file{/etc/hosts}}):" msgstr "Normalerweise wird diese Variable im Feld @code{hosts-file} einer @code{operating-system}-Betriebssystemdeklaration benutzt (siehe @ref{operating-system Reference, @file{/etc/hosts}}):" #. type: example -#: doc/guix.texi:13342 +#: doc/guix.texi:13340 #, no-wrap msgid "" "(operating-system\n" @@ -24560,348 +24571,348 @@ msgstr "" " %facebook-host-aliases))))\n" #. type: defvr -#: doc/guix.texi:13346 +#: doc/guix.texi:13344 msgid "This mechanism can prevent programs running locally, such as Web browsers, from accessing Facebook." msgstr "Dieser Mechanismus kann verhindern, dass lokal laufende Programme, wie z.B.@: Web-Browser, auf Facebook zugreifen." #. type: Plain text -#: doc/guix.texi:13349 +#: doc/guix.texi:13347 msgid "The @code{(gnu services avahi)} provides the following definition." msgstr "Das Modul @code{(gnu services avahi)} stellt die folgende Definition zur Verfügung." #. type: defvr -#: doc/guix.texi:13350 +#: doc/guix.texi:13348 #, no-wrap msgid "{Scheme Variable} avahi-service-type" msgstr "{Scheme-Variable} avahi-service-type" #. type: defvr -#: doc/guix.texi:13355 +#: doc/guix.texi:13353 msgid "This is the service that runs @command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for service discovery and ``zero-configuration'' host name lookups (see @uref{https://avahi.org/}). Its value must be a @code{zero-configuration} record---see below." msgstr "Dieser Dienst führt den @command{avahi-daemon} aus, einen systemweiten mDNS-/DNS-SD-Anbieter, mit dem im lokalen Netzwerk befindliche Geräte erkannt werden können („Service Discovery“) und Rechnernamen selbstständig aufgelöst werden können („Zero-Configuration“) (siehe @uref{https://avahi.org/}). Sein Wert muss ein @code{zero-configuration}-Verbundsobjekt sein — siehe unten." #. type: defvr -#: doc/guix.texi:13360 +#: doc/guix.texi:13358 msgid "This service extends the name service cache daemon (nscd) so that it can resolve @code{.local} host names using @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}. @xref{Name Service Switch}, for information on host name resolution." msgstr "Dieser Dienst erweitert den Name Service Cache Daemon (nscd), damit er @code{.local}-Rechnernamen mit @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns} auflösen kann. Siehe @ref{Name Service Switch} für Informationen zur Auflösung von Rechnernamen." #. type: defvr -#: doc/guix.texi:13363 +#: doc/guix.texi:13361 msgid "Additionally, add the @var{avahi} package to the system profile so that commands such as @command{avahi-browse} are directly usable." msgstr "Des Weiteren wird das @var{avahi}-Paket zum Systemprofil hinzugefügt, damit Befehle wie @command{avahi-browse} einfach benutzt werden können." #. type: deftp -#: doc/guix.texi:13365 +#: doc/guix.texi:13363 #, no-wrap msgid "{Data Type} avahi-configuration" msgstr "{Datentyp} avahi-configuration" #. type: deftp -#: doc/guix.texi:13367 +#: doc/guix.texi:13365 msgid "Data type representation the configuration for Avahi." msgstr "Dieser Datentyp repräsentiert die Konfiguration von Avahi." #. type: item -#: doc/guix.texi:13370 +#: doc/guix.texi:13368 #, no-wrap msgid "@code{host-name} (default: @code{#f})" msgstr "@code{host-name} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13373 +#: doc/guix.texi:13371 msgid "If different from @code{#f}, use that as the host name to publish for this machine; otherwise, use the machine's actual host name." msgstr "Wenn dies auf etwas anderes als @code{#f} gesetzt ist, wird es anderen als Rechnername für diese Maschine mitgeteilt, andernfalls wird der tatsächliche Rechnername anderen mitgeteilt." #. type: item -#: doc/guix.texi:13374 +#: doc/guix.texi:13372 #, no-wrap msgid "@code{publish?} (default: @code{#t})" msgstr "@code{publish?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13377 +#: doc/guix.texi:13375 msgid "When true, allow host names and services to be published (broadcast) over the network." msgstr "Wenn es auf wahr gesetzt ist, dürfen Rechnernamen und Avahi-Dienste über das Netzwerk mitgeteilt werden (als Broadcast)." #. type: item -#: doc/guix.texi:13378 +#: doc/guix.texi:13376 #, no-wrap msgid "@code{publish-workstation?} (default: @code{#t})" msgstr "@code{publish-workstation?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13382 +#: doc/guix.texi:13380 msgid "When true, @command{avahi-daemon} publishes the machine's host name and IP address via mDNS on the local network. To view the host names published on your local network, you can run:" msgstr "Wenn es auf wahr gesetzt ist, teilt @command{avahi-daemon} den Rechnernamen dieser Maschine und die IP-Adresse über mDNS auf dem lokalen Netzwerk öffentlich mit. Um die auf Ihrem lokalen Netzwerk mitgeteilten Rechnernamen zu sehen, können Sie das hier ausführen:" #. type: example -#: doc/guix.texi:13385 +#: doc/guix.texi:13383 #, no-wrap msgid "avahi-browse _workstation._tcp\n" msgstr "avahi-browse _workstation._tcp\n" #. type: item -#: doc/guix.texi:13387 +#: doc/guix.texi:13385 #, no-wrap msgid "@code{wide-area?} (default: @code{#f})" msgstr "@code{wide-area?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13389 +#: doc/guix.texi:13387 msgid "When true, DNS-SD over unicast DNS is enabled." msgstr "Wenn dies auf wahr gesetzt ist, ist DNS-SD über „Unicast DNS“ aktiviert." #. type: item -#: doc/guix.texi:13390 +#: doc/guix.texi:13388 #, no-wrap msgid "@code{ipv4?} (default: @code{#t})" msgstr "@code{ipv4?} (Vorgabe: @code{#t})" #. type: itemx -#: doc/guix.texi:13391 +#: doc/guix.texi:13389 #, no-wrap msgid "@code{ipv6?} (default: @code{#t})" msgstr "@code{ipv6?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:13393 +#: doc/guix.texi:13391 msgid "These fields determine whether to use IPv4/IPv6 sockets." msgstr "Mit diesen Feldern wird festgelegt, ob IPv4-/IPv6-Sockets verwendet werden." #. type: item -#: doc/guix.texi:13394 +#: doc/guix.texi:13392 #, no-wrap msgid "@code{domains-to-browse} (default: @code{'()})" msgstr "@code{domains-to-browse} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13396 +#: doc/guix.texi:13394 msgid "This is a list of domains to browse." msgstr "Dies ist eine Liste von Domänen, die durchsucht werden." #. type: deffn -#: doc/guix.texi:13399 +#: doc/guix.texi:13397 #, no-wrap msgid "{Scheme Variable} openvswitch-service-type" msgstr "{Scheme-Variable} openvswitch-service-type" #. type: deffn -#: doc/guix.texi:13403 +#: doc/guix.texi:13401 msgid "This is the type of the @uref{https://www.openvswitch.org, Open vSwitch} service, whose value should be an @code{openvswitch-configuration} object." msgstr "Dies ist der Diensttyp des @uref{https://www.openvswitch.org, Open-vSwitch-Dienstes}, der als Wert ein @code{openvswitch-configuration}-Objekt hat." #. type: deftp -#: doc/guix.texi:13405 +#: doc/guix.texi:13403 #, no-wrap msgid "{Data Type} openvswitch-configuration" msgstr "{Datentyp} openvswitch-configuration" #. type: deftp -#: doc/guix.texi:13409 +#: doc/guix.texi:13407 msgid "Data type representing the configuration of Open vSwitch, a multilayer virtual switch which is designed to enable massive network automation through programmatic extension." msgstr "Der Datentyp, der die Konfiguration von Open vSwitch repräsentiert, einem auf mehreren Schichten arbeitenden („multilayer“) virtuellen Switch, der für massenhafte Netzwerkautomatisierung durch programmatische Erweiterungen eingesetzt werden kann." #. type: item -#: doc/guix.texi:13411 +#: doc/guix.texi:13409 #, no-wrap msgid "@code{package} (default: @var{openvswitch})" msgstr "@code{package} (Vorgabe: @var{openvswitch})" #. type: table -#: doc/guix.texi:13413 +#: doc/guix.texi:13411 msgid "Package object of the Open vSwitch." msgstr "Das Paketobjekt vom Open vSwitch." #. type: cindex -#: doc/guix.texi:13420 +#: doc/guix.texi:13418 #, no-wrap msgid "X11" msgstr "X11" #. type: cindex -#: doc/guix.texi:13421 +#: doc/guix.texi:13419 #, no-wrap msgid "X Window System" msgstr "X Window System" #. type: cindex -#: doc/guix.texi:13422 doc/guix.texi:13671 +#: doc/guix.texi:13420 doc/guix.texi:13669 #, no-wrap msgid "login manager" msgstr "Anmeldeverwaltung" #. type: Plain text -#: doc/guix.texi:13427 +#: doc/guix.texi:13425 msgid "Support for the X Window graphical display system---specifically Xorg---is provided by the @code{(gnu services xorg)} module. Note that there is no @code{xorg-service} procedure. Instead, the X server is started by the @dfn{login manager}, by default the GNOME Display Manager (GDM)." msgstr "Unterstützung für das grafische Anzeigesystem X Window — insbesondere Xorg — wird vom Modul @code{(gnu services xorg)} zur Verfügung gestellt. Beachten Sie, dass es @emph{keine} @code{xorg-service}-Prozedur gibt, sondern der X-Server durch eine Software zur @dfn{Anmeldeverwaltung} gestartet wird (ein „Login Manager“). Vorgegeben ist, dass zur Anzeigenverwaltung der GNOME Display Manager (GDM) benutzt wird." #. type: cindex -#: doc/guix.texi:13428 +#: doc/guix.texi:13426 #, no-wrap msgid "GDM" msgstr "GDM" #. type: cindex -#: doc/guix.texi:13429 +#: doc/guix.texi:13427 #, no-wrap msgid "GNOME, login manager" msgstr "GNOME, Anmeldeverwaltung" #. type: Plain text -#: doc/guix.texi:13433 +#: doc/guix.texi:13431 msgid "GDM of course allows users to log in into window managers and desktop environments other than GNOME; for those using GNOME, GDM is required for features such as automatic screen locking." msgstr "GDM ermöglicht es seinen Nutzern natürlich auch, sich bei anderen Fensterverwaltungssystemen und Arbeitsumgebungen als GNOME anzumelden. Wer GNOME benutzt, kann Funktionalitäten wie eine automatische Bildschirmsperre nur verwenden, wenn die Anmeldung über GDM läuft." #. type: cindex -#: doc/guix.texi:13434 +#: doc/guix.texi:13432 #, no-wrap msgid "window manager" msgstr "Fensterverwaltung" #. type: Plain text -#: doc/guix.texi:13439 +#: doc/guix.texi:13437 msgid "To use X11, you must install at least one @dfn{window manager}---for example the @code{windowmaker} or @code{openbox} packages---preferably by adding it to the @code{packages} field of your operating system definition (@pxref{operating-system Reference, system-wide packages})." msgstr "Um X11 zu benutzen, müssen Sie ein Programme zur @dfn{Fensterverwaltung} („Window-Manager“) oder mehrere davon installieren — zum Beispiel die Pakete @code{windowmaker} oder @code{openbox} —, vorzugsweise indem Sie sie in das @code{packages}-Feld Ihrer Betriebssystemdefinition eintragen (siehe @ref{operating-system Reference, system-wide packages})." #. type: defvr -#: doc/guix.texi:13440 +#: doc/guix.texi:13438 #, no-wrap msgid "{Scheme Variable} gdm-service-type" msgstr "{Scheme-Variable} gdm-service-type" #. type: defvr -#: doc/guix.texi:13445 +#: doc/guix.texi:13443 msgid "This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager} (GDM), a program that manages graphical display servers and handles graphical user logins. Its value must be a @code{gdm-configuration} (see below.)" msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager}, GDM, ein Programm zur Verwaltung grafischer Anzeigeserver, das grafische Benutzeranmeldungen durchführt. Sein Wert muss eine @code{gdm-configuration} sein (siehe unten)." #. type: cindex -#: doc/guix.texi:13446 +#: doc/guix.texi:13444 #, no-wrap msgid "session types (X11)" msgstr "Sitzungstypen (X11)" #. type: cindex -#: doc/guix.texi:13447 +#: doc/guix.texi:13445 #, no-wrap msgid "X11 session types" msgstr "X11-Sitzungstypen" #. type: defvr -#: doc/guix.texi:13453 +#: doc/guix.texi:13451 msgid "GDM looks for @dfn{session types} described by the @file{.desktop} files in @file{/run/current-system/profile/share/xsessions} and allows users to choose a session from the log-in screen. Packages such as @code{gnome}, @code{xfce}, and @code{i3} provide @file{.desktop} files; adding them to the system-wide set of packages automatically makes them available at the log-in screen." msgstr "GDM liest die in den @file{.desktop}-Dateien in @file{/run/current-system/profile/share/xsessions} befindlichen @dfn{Sitzungstypen} ein und stellt diese seinen Nutzern zur Auswahl auf dem Anmeldebildschirm. Pakete wie @code{gnome}, @code{xfce} und @code{i3} stellen @file{.desktop}-Dateien bereit; wenn diese Pakete zu den systemweit verfügbaren Paketen hinzugefügt werden, werden diese automatisch auf dem Anmeldebildschirm angezeigt." #. type: defvr -#: doc/guix.texi:13457 +#: doc/guix.texi:13455 msgid "In addition, @file{~/.xsession} files are honored. When available, @file{~/.xsession} must be an executable that starts a window manager and/or other X clients." msgstr "Des Weiteren werden @file{~/.xsession}-Dateien berücksichtigt. Wenn es vorhanden ist, muss @file{~/.xsession} eine ausführbare Datei sein, die ein Programm zur Fensterverwaltung und/oder andere X-Clients startet." #. type: deftp -#: doc/guix.texi:13459 +#: doc/guix.texi:13457 #, no-wrap msgid "{Data Type} gdm-configuration" msgstr "{Datentyp} gdm-configuration" #. type: item -#: doc/guix.texi:13461 doc/guix.texi:13527 +#: doc/guix.texi:13459 doc/guix.texi:13525 #, no-wrap msgid "@code{auto-login?} (default: @code{#f})" msgstr "@code{auto-login?} (Vorgabe: @code{#f})" #. type: itemx -#: doc/guix.texi:13462 +#: doc/guix.texi:13460 #, no-wrap msgid "@code{default-user} (default: @code{#f})" msgstr "@code{default-user} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13464 +#: doc/guix.texi:13462 msgid "When @code{auto-login?} is false, GDM presents a log-in screen." msgstr "Wenn @code{auto-login?} falsch ist, zeigt GDM einen Anmeldebildschirm an." #. type: table -#: doc/guix.texi:13467 +#: doc/guix.texi:13465 msgid "When @code{auto-login?} is true, GDM logs in directly as @code{default-user}." msgstr "Wenn @code{auto-login?} wahr ist, meldet GDM automatisch den in @code{default-user} angegebenen voreingestellten Benutzer an." #. type: item -#: doc/guix.texi:13468 +#: doc/guix.texi:13466 #, no-wrap msgid "@code{gnome-shell-assets} (default: ...)" msgstr "@code{gnome-shell-assets} (Vorgabe: …)" #. type: table -#: doc/guix.texi:13470 +#: doc/guix.texi:13468 msgid "List of GNOME Shell assets needed by GDM: icon theme, fonts, etc." msgstr "Liste der GNOME-Shell-„Assets“, die GDM benötigt, d.h.@: Symbolthema, Schriftarten etc." #. type: item -#: doc/guix.texi:13471 +#: doc/guix.texi:13469 #, no-wrap msgid "@code{xorg-configuration} (default: @code{(xorg-configuration)})" msgstr "@code{xorg-configuration} (Vorgabe: @code{(xorg-configuration)})" #. type: table -#: doc/guix.texi:13473 doc/guix.texi:13554 doc/guix.texi:13637 +#: doc/guix.texi:13471 doc/guix.texi:13552 doc/guix.texi:13635 msgid "Configuration of the Xorg graphical server." msgstr "Xorg-Server für grafische Oberflächen konfigurieren." #. type: item -#: doc/guix.texi:13474 +#: doc/guix.texi:13472 #, no-wrap msgid "@code{xsession} (default: @code{(xinitrc)})" msgstr "@code{xsession} (Vorgabe: @code{(xinitrc)})" #. type: table -#: doc/guix.texi:13476 doc/guix.texi:13652 +#: doc/guix.texi:13474 doc/guix.texi:13650 msgid "Script to run before starting a X session." msgstr "Das Skript, das vor dem Starten einer X-Sitzung ausgeführt werden soll." #. type: item -#: doc/guix.texi:13477 +#: doc/guix.texi:13475 #, no-wrap msgid "@code{dbus-daemon} (default: @code{dbus-daemon-wrapper})" msgstr "@code{dbus-daemon} (Vorgabe: @code{dbus-daemon-wrapper})" #. type: table -#: doc/guix.texi:13479 +#: doc/guix.texi:13477 msgid "File name of the @code{dbus-daemon} executable." msgstr "Der Dateiname der ausführbaren Datei des @code{dbus-daemon}-Programms." #. type: item -#: doc/guix.texi:13480 +#: doc/guix.texi:13478 #, no-wrap msgid "@code{gdm} (default: @code{gdm})" msgstr "@code{gdm} (Vorgabe: @code{gdm})" #. type: table -#: doc/guix.texi:13482 +#: doc/guix.texi:13480 msgid "The GDM package to use." msgstr "Das GDM-Paket, was benutzt werden soll." #. type: defvr -#: doc/guix.texi:13485 +#: doc/guix.texi:13483 #, no-wrap msgid "{Scheme Variable} slim-service-type" msgstr "{Scheme-Variable} slim-service-type" #. type: defvr -#: doc/guix.texi:13487 +#: doc/guix.texi:13485 msgid "This is the type for the SLiM graphical login manager for X11." msgstr "Dies ist der Diensttyp für die schlanke grafische Anmeldungsverwaltung SLiM für X11." #. type: defvr -#: doc/guix.texi:13491 +#: doc/guix.texi:13489 msgid "Like GDM, SLiM looks for session types described by @file{.desktop} files and allows users to choose a session from the log-in screen using @kbd{F1}. It also honors @file{~/.xsession} files." msgstr "Wie GDM liest SLiM die in @file{.desktop}-Dateien beschriebenen Sitzungstypen aus und ermöglicht es Nutzern, eine Sitzung darunter im Anmeldebildschirm durch Drücken von @kbd{F1} auszuwählen. Auch @file{~/.xsession}-Dateien können benutzt werden." #. type: defvr -#: doc/guix.texi:13498 +#: doc/guix.texi:13496 msgid "Unlike GDM, SLiM does not spawn the user session on a different VT after logging in, which means that you can only start one graphical session. If you want to be able to run multiple graphical sessions at the same time you have to add multiple SLiM services to your system services. The following example shows how to replace the default GDM service with two SLiM services on tty7 and tty8." msgstr "Anders als GDM wird durch SLiM die Benutzersitzung nicht auf einem anderen virtuellen Terminal gestartet, nachdem man sich anmeldet. Die Folge davon ist, dass man nur eine einzige grafische Sitzung starten kann. Wenn Sie mehrere, gleichzeitig laufende grafische Sitzungen starten können möchten, müssen Sie mehrere SLiM-Dienste zu ihren Systemdiensten hinzufügen. Das folgende Beispiel zeigt, wie Sie den vorgegebenen GDM-Dienst durch zwei SLiM-Dienste auf tty7 und tty8 ersetzen." #. type: lisp -#: doc/guix.texi:13504 +#: doc/guix.texi:13502 #, no-wrap msgid "" "(use-modules (gnu services)\n" @@ -24917,7 +24928,7 @@ msgstr "" "\n" #. type: lisp -#: doc/guix.texi:13516 +#: doc/guix.texi:13514 #, no-wrap msgid "" "(operating-system\n" @@ -24945,475 +24956,475 @@ msgstr "" " %desktop-services))))\n" #. type: deftp -#: doc/guix.texi:13520 +#: doc/guix.texi:13518 #, no-wrap msgid "{Data Type} slim-configuration" msgstr "{Datentyp} slim-configuration" #. type: deftp -#: doc/guix.texi:13522 +#: doc/guix.texi:13520 msgid "Data type representing the configuration of @code{slim-service-type}." msgstr "Datentyp, der die Konfiguration des @code{slim-service-type} repräsentiert." #. type: table -#: doc/guix.texi:13526 +#: doc/guix.texi:13524 msgid "Whether to allow logins with empty passwords." msgstr "Ob Anmeldungen mit leeren Passwörtern möglich sein sollen." #. type: itemx -#: doc/guix.texi:13528 +#: doc/guix.texi:13526 #, no-wrap msgid "@code{default-user} (default: @code{\"\"})" msgstr "@code{default-user} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:13530 +#: doc/guix.texi:13528 msgid "When @code{auto-login?} is false, SLiM presents a log-in screen." msgstr "Wenn @code{auto-login?} falsch ist, zeigt SLiM einen Anmeldebildschirm an." #. type: table -#: doc/guix.texi:13533 +#: doc/guix.texi:13531 msgid "When @code{auto-login?} is true, SLiM logs in directly as @code{default-user}." msgstr "Wenn @code{auto-login?} wahr ist, meldet SLiM automatisch den in @code{default-user} angegebenen voreingestellten Benutzer an." #. type: item -#: doc/guix.texi:13534 +#: doc/guix.texi:13532 #, no-wrap msgid "@code{theme} (default: @code{%default-slim-theme})" msgstr "@code{theme} (Vorgabe: @code{%default-slim-theme})" #. type: itemx -#: doc/guix.texi:13535 +#: doc/guix.texi:13533 #, no-wrap msgid "@code{theme-name} (default: @code{%default-slim-theme-name})" msgstr "@code{theme-name} (Vorgabe: @code{%default-slim-theme-name})" #. type: table -#: doc/guix.texi:13537 +#: doc/guix.texi:13535 msgid "The graphical theme to use and its name." msgstr "Das grafische Thema, was benutzt werden soll, mit seinem Namen." #. type: item -#: doc/guix.texi:13538 +#: doc/guix.texi:13536 #, no-wrap msgid "@code{auto-login-session} (default: @code{#f})" msgstr "@code{auto-login-session} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:13541 +#: doc/guix.texi:13539 msgid "If true, this must be the name of the executable to start as the default session---e.g., @code{(file-append windowmaker \"/bin/windowmaker\")}." msgstr "Wenn es wahr ist, muss es den Namen der ausführbaren Datei angeben, die als voreingestellte Sitzung gestartet werden soll — z.B.@: @code{(file-append windowmaker \"/bin/windowmaker\")}." #. type: table -#: doc/guix.texi:13545 +#: doc/guix.texi:13543 msgid "If false, a session described by one of the available @file{.desktop} files in @code{/run/current-system/profile} and @code{~/.guix-profile} will be used." msgstr "Wenn es falsch ist, wird eine von einer der @file{.desktop}-Dateien in @code{/run/current-system/profile} und @code{~/.guix-profile} beschriebenen Sitzungen benutzt." #. type: quotation -#: doc/guix.texi:13550 +#: doc/guix.texi:13548 msgid "You must install at least one window manager in the system profile or in your user profile. Failing to do that, if @code{auto-login-session} is false, you will be unable to log in." msgstr "Sie müssen mindestens ein Fensterverwaltungsprogramm in das Systemprofil oder Ihr Benutzerprofil installieren, ansonsten können Sie sich, sofern @code{auto-login-session} falsch ist, nicht anmelden." #. type: item -#: doc/guix.texi:13552 doc/guix.texi:13635 +#: doc/guix.texi:13550 doc/guix.texi:13633 #, no-wrap msgid "@code{xorg-configuration} (default @code{(xorg-configuration)})" msgstr "@code{xorg-configuration} (Vorgabe: @code{(xorg-configuration)})" #. type: item -#: doc/guix.texi:13555 +#: doc/guix.texi:13553 #, no-wrap msgid "@code{display} (default @code{\":0\"})" msgstr "@code{display} (Vorgabe: @code{\":0\"})" #. type: table -#: doc/guix.texi:13557 +#: doc/guix.texi:13555 msgid "The display on which to start the Xorg graphical server." msgstr "Die Anzeige, auf welcher der Xorg-Server für grafische Oberflächen gestartet werden soll." #. type: item -#: doc/guix.texi:13558 +#: doc/guix.texi:13556 #, no-wrap msgid "@code{vt} (default @code{\"vt7\"})" msgstr "@code{vt} (Vorgabe: @code{\"vt7\"})" #. type: table -#: doc/guix.texi:13560 +#: doc/guix.texi:13558 msgid "The VT on which to start the Xorg graphical server." msgstr "Das virtuelle Terminal, auf dem der Xorg-Server für grafische Oberflächen gestartet werden soll." #. type: item -#: doc/guix.texi:13561 +#: doc/guix.texi:13559 #, no-wrap msgid "@code{xauth} (default: @code{xauth})" msgstr "@code{xauth} (Vorgabe: @code{xauth})" #. type: table -#: doc/guix.texi:13563 +#: doc/guix.texi:13561 msgid "The XAuth package to use." msgstr "Das XAuth-Paket, das benutzt werden soll." #. type: item -#: doc/guix.texi:13564 +#: doc/guix.texi:13562 #, no-wrap msgid "@code{shepherd} (default: @code{shepherd})" msgstr "@code{shepherd} (Vorgabe: @code{shepherd})" #. type: table -#: doc/guix.texi:13567 +#: doc/guix.texi:13565 msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}." msgstr "Das Shepherd-Paket, das benutzt wird, wenn @command{halt} und @command{reboot} aufgerufen werden." #. type: item -#: doc/guix.texi:13568 +#: doc/guix.texi:13566 #, no-wrap msgid "@code{sessreg} (default: @code{sessreg})" msgstr "@code{sessreg} (Vorgabe: @code{sessreg})" #. type: table -#: doc/guix.texi:13570 +#: doc/guix.texi:13568 msgid "The sessreg package used in order to register the session." msgstr "Das sessreg-Paket, das zum Registrieren der Sitzung benutzt werden soll." #. type: item -#: doc/guix.texi:13571 +#: doc/guix.texi:13569 #, no-wrap msgid "@code{slim} (default: @code{slim})" msgstr "@code{slim} (Vorgabe: @code{slim})" #. type: table -#: doc/guix.texi:13573 +#: doc/guix.texi:13571 msgid "The SLiM package to use." msgstr "Das zu benutzende SLiM-Paket." #. type: defvr -#: doc/guix.texi:13576 doc/guix.texi:24218 +#: doc/guix.texi:13574 doc/guix.texi:24215 #, no-wrap msgid "{Scheme Variable} %default-theme" msgstr "{Scheme-Variable} %default-theme" #. type: defvrx -#: doc/guix.texi:13577 +#: doc/guix.texi:13575 #, no-wrap msgid "{Scheme Variable} %default-theme-name" msgstr "{Scheme-Variable} %default-theme-name" #. type: defvr -#: doc/guix.texi:13579 +#: doc/guix.texi:13577 msgid "The default SLiM theme and its name." msgstr "Das vorgegebene Thema für das Aussehen von SLiM mit seinem Namen." #. type: deftp -#: doc/guix.texi:13582 +#: doc/guix.texi:13580 #, no-wrap msgid "{Data Type} sddm-configuration" msgstr "{Datentyp} sddm-configuration" #. type: deftp -#: doc/guix.texi:13584 +#: doc/guix.texi:13582 msgid "This is the data type representing the sddm service configuration." msgstr "Dieser Datentyp repräsentiert die Konfiguration des SDDM-Dienstes." #. type: item -#: doc/guix.texi:13586 +#: doc/guix.texi:13584 #, no-wrap msgid "@code{display-server} (default: \"x11\")" msgstr "@code{display-server} (Vorgabe: \"x11\")" #. type: table -#: doc/guix.texi:13589 +#: doc/guix.texi:13587 msgid "Select display server to use for the greeter. Valid values are \"x11\" or \"wayland\"." msgstr "Einen Anzeigeserver auswählen, der für den Anmeldebildschirm verwendet werden soll. Zulässige Werte sind \"x11\" oder \"wayland\"." #. type: item -#: doc/guix.texi:13590 +#: doc/guix.texi:13588 #, no-wrap msgid "@code{numlock} (default: \"on\")" msgstr "@code{numlock} (Vorgabe: \"on\")" #. type: table -#: doc/guix.texi:13592 +#: doc/guix.texi:13590 msgid "Valid values are \"on\", \"off\" or \"none\"." msgstr "Gültige Werte sind \"on\", \"off\" oder \"none\"." #. type: item -#: doc/guix.texi:13593 +#: doc/guix.texi:13591 #, no-wrap msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})" msgstr "@code{halt-command} (Vorgabe: @code{#~(string-apppend #$shepherd \"/sbin/halt\")})" #. type: table -#: doc/guix.texi:13595 +#: doc/guix.texi:13593 msgid "Command to run when halting." msgstr "Der Befehl, der zum Anhalten des Systems ausgeführt wird." #. type: item -#: doc/guix.texi:13596 +#: doc/guix.texi:13594 #, no-wrap msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})" msgstr "@code{reboot-command} (Vorgabe: @code{#~(string-append #$shepherd \"/sbin/reboot\")})" #. type: table -#: doc/guix.texi:13598 +#: doc/guix.texi:13596 msgid "Command to run when rebooting." msgstr "Der Befehl, der zum Neustarten des Systems ausgeführt wird." #. type: item -#: doc/guix.texi:13599 +#: doc/guix.texi:13597 #, no-wrap msgid "@code{theme} (default \"maldives\")" msgstr "@code{theme} (Vorgabe: \"maldives\")" #. type: table -#: doc/guix.texi:13601 +#: doc/guix.texi:13599 msgid "Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"." msgstr "Welches Thema für das Aussehen benutzt werden soll. Mit SDDM mitgelieferte Themen sind \"elarun\" und \"maldives\"." #. type: item -#: doc/guix.texi:13602 +#: doc/guix.texi:13600 #, no-wrap msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")" msgstr "@code{themes-directory} (Vorgabe: \"/run/current-system/profile/share/sddm/themes\")" #. type: table -#: doc/guix.texi:13604 +#: doc/guix.texi:13602 msgid "Directory to look for themes." msgstr "Verzeichnis, wo Themen gefunden werden können." #. type: item -#: doc/guix.texi:13605 +#: doc/guix.texi:13603 #, no-wrap msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")" msgstr "@code{faces-directory} (Vorgabe: \"/run/current-system/profile/share/sddm/faces\")" #. type: table -#: doc/guix.texi:13607 +#: doc/guix.texi:13605 msgid "Directory to look for faces." msgstr "Verzeichnis, wo Avatarbilder gefunden werden können.<" #. type: item -#: doc/guix.texi:13608 +#: doc/guix.texi:13606 #, no-wrap msgid "@code{default-path} (default \"/run/current-system/profile/bin\")" msgstr "@code{default-path} (Vorgabe: \"/run/current-system/profile/bin\")" #. type: table -#: doc/guix.texi:13610 +#: doc/guix.texi:13608 msgid "Default PATH to use." msgstr "Welcher PATH voreingestellt sein soll." #. type: item -#: doc/guix.texi:13611 +#: doc/guix.texi:13609 #, no-wrap msgid "@code{minimum-uid} (default 1000)" msgstr "@code{minimum-uid} (Vorgabe: 1000)" #. type: table -#: doc/guix.texi:13613 +#: doc/guix.texi:13611 msgid "Minimum UID to display in SDDM." msgstr "Der kleinste Benutzeridentifikator (UID), mit dem Benutzer in SDDM angezeigt werden." #. type: item -#: doc/guix.texi:13614 +#: doc/guix.texi:13612 #, no-wrap msgid "@code{maximum-uid} (default 2000)" msgstr "@code{maximum-uid} (Vorgabe: 2000)" #. type: table -#: doc/guix.texi:13616 +#: doc/guix.texi:13614 msgid "Maximum UID to display in SDDM" msgstr "Der größte Benutzeridentifikator (UID), mit dem Benutzer in SDDM angezeigt werden.<" #. type: item -#: doc/guix.texi:13617 +#: doc/guix.texi:13615 #, no-wrap msgid "@code{remember-last-user?} (default #t)" msgstr "@code{remember-last-user?} (Vorgabe: #t)" #. type: table -#: doc/guix.texi:13619 +#: doc/guix.texi:13617 msgid "Remember last user." msgstr "Den zuletzt ausgewählten Benutzer voreinstellen." #. type: item -#: doc/guix.texi:13620 +#: doc/guix.texi:13618 #, no-wrap msgid "@code{remember-last-session?} (default #t)" msgstr "@code{remember-last-session?} (Vorgabe: #t)" #. type: table -#: doc/guix.texi:13622 +#: doc/guix.texi:13620 msgid "Remember last session." msgstr "Die zuletzt ausgewählte Sitzung voreinstellen." #. type: item -#: doc/guix.texi:13623 +#: doc/guix.texi:13621 #, no-wrap msgid "@code{hide-users} (default \"\")" msgstr "@code{hide-users} (Vorgabe: \"\")" #. type: table -#: doc/guix.texi:13625 +#: doc/guix.texi:13623 msgid "Usernames to hide from SDDM greeter." msgstr "Benutzernamen, die in SDDM @emph{nicht} sichtbar sein sollen." #. type: item -#: doc/guix.texi:13626 +#: doc/guix.texi:13624 #, no-wrap msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})" msgstr "@code{hide-shells} (Vorgabe: @code{#~(string-append #$shadow \"/sbin/nologin\")})" #. type: table -#: doc/guix.texi:13628 +#: doc/guix.texi:13626 msgid "Users with shells listed will be hidden from the SDDM greeter." msgstr "Benutzerkonten, für die als Shell eine davon eingestellt ist, wird SDDM @emph{nicht} anzeigen." #. type: item -#: doc/guix.texi:13629 +#: doc/guix.texi:13627 #, no-wrap msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})" msgstr "@code{session-command} (Vorgabe: @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})" #. type: table -#: doc/guix.texi:13631 +#: doc/guix.texi:13629 msgid "Script to run before starting a wayland session." msgstr "Das Skript, das vor dem Starten einer Wayland-Sitzung ausgeführt werden soll." #. type: item -#: doc/guix.texi:13632 +#: doc/guix.texi:13630 #, no-wrap msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")" msgstr "@code{sessions-directory} (Vorgabe: \"/run/current-system/profile/share/wayland-sessions\")" #. type: table -#: doc/guix.texi:13634 +#: doc/guix.texi:13632 msgid "Directory to look for desktop files starting wayland sessions." msgstr "Verzeichnis, das nach .desktop-Dateien zum Starten von Wayland-Sitzungen durchsucht wird." #. type: item -#: doc/guix.texi:13638 +#: doc/guix.texi:13636 #, no-wrap msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})" msgstr "@code{xauth-path} (Vorgabe: @code{#~(string-append #$xauth \"/bin/xauth\")})" #. type: table -#: doc/guix.texi:13640 +#: doc/guix.texi:13638 msgid "Path to xauth." msgstr "Pfad von xauth." #. type: item -#: doc/guix.texi:13641 +#: doc/guix.texi:13639 #, no-wrap msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})" msgstr "@code{xephyr-path} (Vorgabe: @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})" #. type: table -#: doc/guix.texi:13643 +#: doc/guix.texi:13641 msgid "Path to Xephyr." msgstr "Pfad von Xephyr." #. type: item -#: doc/guix.texi:13644 +#: doc/guix.texi:13642 #, no-wrap msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})" msgstr "@code{xdisplay-start} (Vorgabe: @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})" #. type: table -#: doc/guix.texi:13646 +#: doc/guix.texi:13644 msgid "Script to run after starting xorg-server." msgstr "Skript, das nach dem Starten vom Xorg-Server ausgeführt wird." #. type: item -#: doc/guix.texi:13647 +#: doc/guix.texi:13645 #, no-wrap msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})" msgstr "@code{xdisplay-stop} (Vorgabe: @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})" #. type: table -#: doc/guix.texi:13649 +#: doc/guix.texi:13647 msgid "Script to run before stopping xorg-server." msgstr "Skript, das vor dem Stoppen vom Xorg-Server ausgeführt wird." #. type: item -#: doc/guix.texi:13650 +#: doc/guix.texi:13648 #, no-wrap msgid "@code{xsession-command} (default: @code{xinitrc})" msgstr "@code{xsession-command} (Vorgabe: @code{xinitrc})" #. type: item -#: doc/guix.texi:13653 +#: doc/guix.texi:13651 #, no-wrap msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")" msgstr "@code{xsessions-directory} (Vorgabe: \"/run/current-system/profile/share/xsessions\")" #. type: table -#: doc/guix.texi:13655 +#: doc/guix.texi:13653 msgid "Directory to look for desktop files starting X sessions." msgstr "Verzeichnis, das nach .desktop-Dateien zum Starten von X-Sitzungen durchsucht wird.<" #. type: item -#: doc/guix.texi:13656 +#: doc/guix.texi:13654 #, no-wrap msgid "@code{minimum-vt} (default: 7)" msgstr "@code{minimum-vt} (default: 7)" #. type: table -#: doc/guix.texi:13658 +#: doc/guix.texi:13656 msgid "Minimum VT to use." msgstr "Das kleinste virtuelle Terminal, das benutzt werden darf." #. type: item -#: doc/guix.texi:13659 +#: doc/guix.texi:13657 #, no-wrap msgid "@code{auto-login-user} (default \"\")" msgstr "@code{auto-login-user} (Vorgabe: \"\")" #. type: table -#: doc/guix.texi:13661 +#: doc/guix.texi:13659 msgid "User to use for auto-login." msgstr "Benutzer, der bei automatischer Anmeldung angemeldet wird." #. type: item -#: doc/guix.texi:13662 +#: doc/guix.texi:13660 #, no-wrap msgid "@code{auto-login-session} (default \"\")" msgstr "@code{auto-login-session} (Vorgabe: \"\")" #. type: table -#: doc/guix.texi:13664 +#: doc/guix.texi:13662 msgid "Desktop file to use for auto-login." msgstr "Desktop-Datei für die automatische Anmeldung." #. type: item -#: doc/guix.texi:13665 +#: doc/guix.texi:13663 #, no-wrap msgid "@code{relogin?} (default #f)" msgstr "@code{relogin?} (Vorgabe: #f)" #. type: table -#: doc/guix.texi:13667 +#: doc/guix.texi:13665 msgid "Relogin after logout." msgstr "Ob nach dem Abmelden neu angemeldet werden soll." #. type: cindex -#: doc/guix.texi:13672 +#: doc/guix.texi:13670 #, no-wrap msgid "X11 login" msgstr "X11-Anmeldung" #. type: deffn -#: doc/guix.texi:13673 +#: doc/guix.texi:13671 #, no-wrap msgid "{Scheme Procedure} sddm-service config" msgstr "{Scheme-Prozedur} sddm-service config" #. type: deffn -#: doc/guix.texi:13676 +#: doc/guix.texi:13674 msgid "Return a service that spawns the SDDM graphical login manager for config of type @code{}." msgstr "Liefert einen Dienst, der SDDM zur grafischen Anmeldeverwaltung startet, mit einer Konfiguration vom Typ @code{}." #. type: example -#: doc/guix.texi:13681 +#: doc/guix.texi:13679 #, no-wrap msgid "" " (sddm-service (sddm-configuration\n" @@ -25425,215 +25436,215 @@ msgstr "" " (auto-login-session \"xfce.desktop\")))\n" #. type: cindex -#: doc/guix.texi:13684 +#: doc/guix.texi:13682 #, no-wrap msgid "Xorg, configuration" msgstr "Xorg, Konfiguration" #. type: deftp -#: doc/guix.texi:13685 +#: doc/guix.texi:13683 #, no-wrap msgid "{Data Type} xorg-configuration" msgstr "{Datentyp} xorg-configuration" #. type: deftp -#: doc/guix.texi:13690 +#: doc/guix.texi:13688 msgid "This data type represents the configuration of the Xorg graphical display server. Note that there is not Xorg service; instead, the X server is started by a ``display manager'' such as GDM, SDDM, and SLiM. Thus, the configuration of these display managers aggregates an @code{xorg-configuration} record." msgstr "Dieser Datentyp repräsentiert die Konfiguration des grafischen Anzeigeservers Xorg. Beachten Sie, dass es keinen Xorg-Dienst gibt, sondern der X-Server von einer „Anzeigenverwaltung“ wie GDM, SDDM oder SLiM gestartet wird. Deswegen wird aus der Konfiguration dieser Anzeigenverwaltungen ein @code{xorg-configuration}-Verbundsobjekt konstruiert." #. type: item -#: doc/guix.texi:13692 +#: doc/guix.texi:13690 #, no-wrap msgid "@code{modules} (default: @code{%default-xorg-modules})" msgstr "@code{modules} (Vorgabe: @code{%default-xorg-modules})" #. type: table -#: doc/guix.texi:13695 +#: doc/guix.texi:13693 msgid "This is a list of @dfn{module packages} loaded by the Xorg server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so on." msgstr "Dies ist eine Liste von @dfn{Modulpaketen}, die vom Xorg-Server geladen werden — z.B.@: @code{xf86-video-vesa}, @code{xf86-input-keyboard} und so weiter." #. type: item -#: doc/guix.texi:13696 +#: doc/guix.texi:13694 #, no-wrap msgid "@code{fonts} (default: @code{%default-xorg-fonts})" msgstr "@code{fonts} (Vorgabe: @code{%default-xorg-fonts})" #. type: table -#: doc/guix.texi:13698 +#: doc/guix.texi:13696 msgid "This is a list of font directories to add to the server's @dfn{font path}." msgstr "Dies ist eine Liste von Verzeichnissen mit Schriftarten, die zum Schriftartensuchpfad („Font Path“) des Servers hinzugefügt werden." #. type: item -#: doc/guix.texi:13699 +#: doc/guix.texi:13697 #, no-wrap msgid "@code{drivers} (default: @code{'()})" msgstr "@code{drivers} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13703 +#: doc/guix.texi:13701 msgid "This must be either the empty list, in which case Xorg chooses a graphics driver automatically, or a list of driver names that will be tried in this order---e.g., @code{(\"modesetting\" \"vesa\")}." msgstr "Dies muss entweder die leere Liste sein — in diesem Fall wird durch Xorg automatisch ein Grafiktreiber ausgewählt — oder eine Liste von Treibernamen, die in dieser Reihenfolge durchprobiert werden — z.B.@: @code{(\"modesetting\" \"vesa\")}." #. type: item -#: doc/guix.texi:13704 +#: doc/guix.texi:13702 #, no-wrap msgid "@code{resolutions} (default: @code{'()})" msgstr "@code{resolutions} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13708 +#: doc/guix.texi:13706 msgid "When @code{resolutions} is the empty list, Xorg chooses an appropriate screen resolution. Otherwise, it must be a list of resolutions---e.g., @code{((1024 768) (640 480))}." msgstr "Wenn @code{resolutions} die leere Liste ist, wird automatisch durch Xorg eine passende Bildschirmauflösung gewählt. Andernfalls muss hier eine Liste von Bildschirmauflösungen angegeben werden — z.B.@: @code{((1024 768) (640 480))}." #. type: cindex -#: doc/guix.texi:13709 +#: doc/guix.texi:13707 #, no-wrap msgid "keyboard layout, for Xorg" msgstr "Tastaturbelegung, für Xorg" #. type: cindex -#: doc/guix.texi:13710 +#: doc/guix.texi:13708 #, no-wrap msgid "keymap, for Xorg" msgstr "Keymap, für Xorg" #. type: table -#: doc/guix.texi:13714 +#: doc/guix.texi:13712 msgid "If this is @code{#f}, Xorg uses the default keyboard layout---usually US English (``qwerty'') for a 105-key PC keyboard." msgstr "Wenn es auf @code{#f} gesetzt ist, benutzt Xorg die voreingestellte Tastaturbelegung, also normalerweise US English („QWERTY“) für eine PC-Tastatur mit 105 Tasten." #. type: table -#: doc/guix.texi:13718 +#: doc/guix.texi:13716 msgid "Otherwise this must be a @code{keyboard-layout} object specifying the keyboard layout in use when Xorg is running. @xref{Keyboard Layout}, for more information on how to specify the keyboard layout." msgstr "Andernfalls muss hier ein @code{keyboard-layout}-Objekt stehen, das angibt, welche Tastaturbelegung aktiv sein soll, während Xorg läuft. Siehe @ref{Keyboard Layout} für mehr Informationen, wie die Tastaturbelegung angegeben werden kann." #. type: item -#: doc/guix.texi:13719 +#: doc/guix.texi:13717 #, no-wrap msgid "@code{extra-config} (default: @code{'()})" msgstr "@code{extra-config} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:13722 +#: doc/guix.texi:13720 msgid "This is a list of strings or objects appended to the configuration file. It is used to pass extra text to be added verbatim to the configuration file." msgstr "Dies ist eine Liste von Zeichenketten oder Objekten, die an die Konfigurationsdatei angehängt werden. Mit ihnen wird zusätzlicher Text wortwörtlich zur Konfigurationsdatei hinzugefügt." #. type: item -#: doc/guix.texi:13723 +#: doc/guix.texi:13721 #, no-wrap msgid "@code{server} (default: @code{xorg-server})" msgstr "@code{server} (Vorgabe: @code{xorg-server})" #. type: table -#: doc/guix.texi:13725 +#: doc/guix.texi:13723 msgid "This is the package providing the Xorg server." msgstr "Dieses Paket stellt den Xorg-Server zur Verfügung." #. type: item -#: doc/guix.texi:13726 +#: doc/guix.texi:13724 #, no-wrap msgid "@code{server-arguments} (default: @code{%default-xorg-server-arguments})" msgstr "@code{server-arguments} (Vorgabe: @code{%default-xorg-server-arguments})" #. type: table -#: doc/guix.texi:13729 +#: doc/guix.texi:13727 msgid "This is the list of command-line arguments to pass to the X server. The default is @code{-nolisten tcp}." msgstr "Dies ist die Liste der Befehlszeilenargumente, die an den X-Server übergeben werden. Die Vorgabe ist @code{-nolisten tcp}." #. type: deffn -#: doc/guix.texi:13732 +#: doc/guix.texi:13730 #, no-wrap msgid "{Scheme Procedure} set-xorg-configuration @var{config} @" msgstr "{Scheme-Prozedur} set-xorg-configuration @var{Konfiguration} @" #. type: deffn -#: doc/guix.texi:13736 +#: doc/guix.texi:13734 msgid "[@var{login-manager-service-type}] Tell the log-in manager (of type @var{login-manager-service-type}) to use @var{config}, an @code{} record." msgstr "[@var{login-manager-service-type}] Benennt, welche @var{Konfiguration} die Anmeldeverwaltung (vom Typ @var{login-manager-service-type}) benutzen soll, als ein @code{}-Verbundsobjekt." #. type: deffn -#: doc/guix.texi:13740 +#: doc/guix.texi:13738 msgid "Since the Xorg configuration is embedded in the log-in manager's configuration---e.g., @code{gdm-configuration}---this procedure provides a shorthand to set the Xorg configuration." msgstr "Da die Xorg-Konfiguration in die Konfiguration der Anmeldeverwaltung eingebettet ist — z.B.@: in einer @code{gdm-configuration} —, bietet diese Prozedur eine Kurzschreibweise zum Ändern der Xorg-Konfiguration." #. type: deffn -#: doc/guix.texi:13742 +#: doc/guix.texi:13740 #, no-wrap msgid "{Scheme Procedure} xorg-start-command [@var{config}]" msgstr "{Scheme-Prozedur} xorg-start-command [@var{Konfiguration}]" #. type: deffn -#: doc/guix.texi:13746 +#: doc/guix.texi:13744 msgid "Return a @code{startx} script in which the modules, fonts, etc. specified in @var{config}, are available. The result should be used in place of @code{startx}." msgstr "Hier wird ein @code{startx}-Skript geliefert, in welchem die Module, Schriftarten usw.@: verfügbar sind, die in der @var{Konfiguration} angegeben wurden. Das Ergebnis soll anstelle von @code{startx} benutzt werden." #. type: deffn -#: doc/guix.texi:13748 +#: doc/guix.texi:13746 msgid "Usually the X server is started by a login manager." msgstr "Normalerweise wird der X-Server von der Anmeldeverwaltung gestartet." #. type: deffn -#: doc/guix.texi:13751 +#: doc/guix.texi:13749 #, no-wrap msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]" msgstr "{Scheme Procedure} screen-locker-service @var{Paket} [@var{Programm}]" #. type: deffn -#: doc/guix.texi:13755 +#: doc/guix.texi:13753 msgid "Add @var{package}, a package for a screen locker or screen saver whose command is @var{program}, to the set of setuid programs and add a PAM entry for it. For example:" msgstr "Das @var{Paket} zur Menge der setuid-Programme hinzufügen, worin sich ein Programm zum Sperren des Bildschirms oder ein Bildschirmschoner befinden muss, der mit dem Befehl @var{Programm} gestartet wird, und einen PAM-Eintrag dafür hinzufügen. Zum Beispiel macht" #. type: lisp -#: doc/guix.texi:13758 +#: doc/guix.texi:13756 #, no-wrap msgid "(screen-locker-service xlockmore \"xlock\")\n" msgstr "(screen-locker-service xlockmore \"xlock\")\n" #. type: deffn -#: doc/guix.texi:13761 +#: doc/guix.texi:13759 msgid "makes the good ol' XlockMore usable." msgstr "das gute alte XlockMore benutzbar." #. type: cindex -#: doc/guix.texi:13767 +#: doc/guix.texi:13765 #, no-wrap msgid "printer support with CUPS" msgstr "Druckerunterstützung mit CUPS" #. type: Plain text -#: doc/guix.texi:13771 +#: doc/guix.texi:13769 msgid "The @code{(gnu services cups)} module provides a Guix service definition for the CUPS printing service. To add printer support to a Guix system, add a @code{cups-service} to the operating system definition:" msgstr "Das Modul @code{(gnu services cups)} stellt eine Guix-Dienstdefinition für den CUPS-Druckdienst zur Verfügung. Wenn Sie Druckerunterstützung zu einem Guix-System hinzufügen möchten, dann fügen Sie einen @code{cups-service}-Dienst in die Betriebssystemdefinition ein." #. type: deffn -#: doc/guix.texi:13772 +#: doc/guix.texi:13770 #, no-wrap msgid "{Scheme Variable} cups-service-type" msgstr "{Scheme-Variable} cups-service-type" #. type: deffn -#: doc/guix.texi:13776 +#: doc/guix.texi:13774 msgid "The service type for the CUPS print server. Its value should be a valid CUPS configuration (see below). To use the default settings, simply write:" msgstr "Der Diensttyp für den CUPS-Druckserver. Als Wert muss eine gültige CUPS-Konfiguration angegeben werden (siehe unten). Um die Voreinstellungen zu verwenden, schreiben Sie einfach nur:" #. type: example -#: doc/guix.texi:13778 +#: doc/guix.texi:13776 #, no-wrap msgid "(service cups-service-type)\n" msgstr "(service cups-service-type)\n" #. type: Plain text -#: doc/guix.texi:13788 +#: doc/guix.texi:13786 msgid "The CUPS configuration controls the basic things about your CUPS installation: what interfaces it listens on, what to do if a print job fails, how much logging to do, and so on. To actually add a printer, you have to visit the @url{http://localhost:631} URL, or use a tool such as GNOME's printer configuration services. By default, configuring a CUPS service will generate a self-signed certificate if needed, for secure connections to the print server." msgstr "Mit der CUPS-Konfiguration stellen Sie die grundlegenden Merkmale Ihrer CUPS-Installation ein: Auf welcher Schnittstelle sie lauscht, wie mit einem fehlgeschlagenen Druckauftrag umzugehen ist, wieviel in Protokolle geschrieben werden soll und so weiter. Um einen Drucker hinzuzufügen, müssen Sie jedoch die URL @url{http://localhost:631} besuchen oder ein Werkzeug wie die Druckereinstellungsdienste von GNOME benutzen. Die Vorgabe ist, dass beim Konfigurieren eines CUPS-Dienstes ein selbstsigniertes Zertifikat erzeugt wird, um sichere Verbindungen mit dem Druckserver zu ermöglichen." #. type: Plain text -#: doc/guix.texi:13793 +#: doc/guix.texi:13791 msgid "Suppose you want to enable the Web interface of CUPS and also add support for Epson printers @i{via} the @code{escpr} package and for HP printers @i{via} the @code{hplip-minimal} package. You can do that directly, like this (you need to use the @code{(gnu packages cups)} module):" msgstr "Nehmen wir an, Sie wollen die Weboberfläche von CUPS aktivieren und Unterstützung für Epson-Drucker über das @code{escpr}-Paket und für HP-Drucker über das @code{hplip-minimal}-Paket aktivieren. Sie können das auf diese Weise gleich machen (dazu müssen Sie vorher angeben, dass das Modul @code{(gnu packages cups)} benutzt werden soll):" #. type: example -#: doc/guix.texi:13800 +#: doc/guix.texi:13798 #, no-wrap msgid "" "(service cups-service-type\n" @@ -25649,1535 +25660,1535 @@ msgstr "" " (list cups-filters escpr hplip-minimal))))\n" #. type: Plain text -#: doc/guix.texi:13805 +#: doc/guix.texi:13803 msgid "Note: If you wish to use the Qt5 based GUI which comes with the hplip package then it is suggested that you install the @code{hplip} package, either in your OS configuration file or as your user." msgstr "Anmerkung: Wenn Sie die Qt5-basierte grafische Benutzeroberfläche benutzen möchten, die dem hplip-Paket beiliegt, sollten Sie das @code{hplip}-Paket installieren, entweder in die Konfigurationsdatei Ihres Betriebssystems oder für Ihr Benutzerkonto." #. type: Plain text -#: doc/guix.texi:13812 +#: doc/guix.texi:13810 msgid "The available configuration parameters follow. Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings. There is also a way to specify the configuration as a string, if you have an old @code{cupsd.conf} file that you want to port over from some other system; see the end for more details." msgstr "Im Folgenden sehen Sie die verfügbaren Konfigurationsparameter. Vor jeder Parameterdefinition wird ihr Typ angegeben, zum Beispiel steht @samp{Zeichenketten-Liste foo} für einen Parameter @code{foo}, der als Liste von Zeichenketten angegeben werden muss. Sie können die Konfiguration aber auch in einer einzigen Zeichenkette angeben, wenn Sie eine alte @code{cupsd.conf}-Datei von einem anderen System weiterbenutzen möchten; siehe das Abschnittsende für mehr Details." #. type: Plain text -#: doc/guix.texi:13823 +#: doc/guix.texi:13821 msgid "Available @code{cups-configuration} fields are:" msgstr "Die verfügbaren @code{cups-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:13824 +#: doc/guix.texi:13822 #, no-wrap msgid "{@code{cups-configuration} parameter} package cups" msgstr "{@code{cups-configuration}-Parameter} „package“ cups" #. type: deftypevr -#: doc/guix.texi:13826 doc/guix.texi:14583 +#: doc/guix.texi:13824 doc/guix.texi:14581 msgid "The CUPS package." msgstr "Das CUPS-Paket." #. type: deftypevr -#: doc/guix.texi:13828 +#: doc/guix.texi:13826 #, no-wrap msgid "{@code{cups-configuration} parameter} package-list extensions" msgstr "{@code{cups-configuration}-Parameter} „package“-Liste extensions" #. type: deftypevr -#: doc/guix.texi:13830 +#: doc/guix.texi:13828 msgid "Drivers and other extensions to the CUPS package." msgstr "Treiber und andere Erweiterungen für das CUPS-Paket." #. type: deftypevr -#: doc/guix.texi:13832 +#: doc/guix.texi:13830 #, no-wrap msgid "{@code{cups-configuration} parameter} files-configuration files-configuration" msgstr "{@code{cups-configuration}-Parameter} „files-configuration“ files-configuration" #. type: deftypevr -#: doc/guix.texi:13835 +#: doc/guix.texi:13833 msgid "Configuration of where to write logs, what directories to use for print spools, and related privileged configuration parameters." msgstr "Konfiguration, wo Protokolle abgelegt werden sollen, welche Verzeichnisse für Druckspoolerwarteschlangen benutzt werden sollen und ähnliche Berechtigungen erfordernde Konfigurationsparameter." #. type: deftypevr -#: doc/guix.texi:13837 +#: doc/guix.texi:13835 msgid "Available @code{files-configuration} fields are:" msgstr "Verfügbare Felder einer @code{files-configuration} sind:" #. type: deftypevr -#: doc/guix.texi:13838 +#: doc/guix.texi:13836 #, no-wrap msgid "{@code{files-configuration} parameter} log-location access-log" msgstr "{@code{files-configuration}-Parameter} Protokollpfad access-log" #. type: deftypevr -#: doc/guix.texi:13846 +#: doc/guix.texi:13844 msgid "Defines the access log filename. Specifying a blank filename disables access log generation. The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background. The value @code{syslog} causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-access_log}." msgstr "Hiermit wird der Dateiname des Zugriffsprotokolls („Access Log“) festgelegt. Wenn ein leerer Name angegeben wird, wird kein Protokoll erzeugt. Der Wert @code{stderr} lässt Protokolleinträge in die Standardfehlerdatei schreiben, wenn das Druckplanungsprogramm im Vordergrund läuft, oder an den Systemprotokolldaemon (also Syslog), wenn es im Hintergrund läuft. Der Wert @code{syslog} bewirkt, dass Protokolleinträge an den Systemprotokolldaemon geschickt werden. Der Servername darf in Dateinamen als die Zeichenkette @code{%s} angegeben werden, so kann etwa @code{/var/log/cups/%s-access_log} angegeben werden." #. type: deftypevr -#: doc/guix.texi:13848 +#: doc/guix.texi:13846 msgid "Defaults to @samp{\"/var/log/cups/access_log\"}." msgstr "Die Vorgabe ist @samp{\"/var/log/cups/access_log\"}." #. type: deftypevr -#: doc/guix.texi:13850 +#: doc/guix.texi:13848 #, no-wrap msgid "{@code{files-configuration} parameter} file-name cache-dir" msgstr "{@code{files-configuration}-Parameter} Dateiname cache-dir" #. type: deftypevr -#: doc/guix.texi:13852 +#: doc/guix.texi:13850 msgid "Where CUPS should cache data." msgstr "Wo CUPS zwischengespeicherte Daten ablegen soll." #. type: deftypevr -#: doc/guix.texi:13854 +#: doc/guix.texi:13852 msgid "Defaults to @samp{\"/var/cache/cups\"}." msgstr "Die Vorgabe ist @samp{\"/var/cache/cups\"}." #. type: deftypevr -#: doc/guix.texi:13856 +#: doc/guix.texi:13854 #, no-wrap msgid "{@code{files-configuration} parameter} string config-file-perm" msgstr "{@code{files-configuration}-Parameter} Zeichenkette config-file-perm" #. type: deftypevr -#: doc/guix.texi:13859 +#: doc/guix.texi:13857 msgid "Specifies the permissions for all configuration files that the scheduler writes." msgstr "Gibt die Berechtigungen für alle Konfigurationsdateien an, die das Planungsprogramm schreibt." #. type: deftypevr -#: doc/guix.texi:13865 +#: doc/guix.texi:13863 msgid "Note that the permissions for the printers.conf file are currently masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. There is no way to disable this security feature." msgstr "Beachten Sie, dass auf die Berechtigungen der Datei printers.conf eine Maske gelegt wird, wodurch Zugriffe nur durch das planende Benutzerkonto erlaubt werden (in der Regel der Administratornutzer „root“). Der Grund dafür ist, dass Druckergeräte-URIs manchmal sensible Authentizierungsdaten enthalten, die nicht allgemein auf dem System bekannt sein sollten. Es gibt keine Möglichkeit, diese Sicherheitsmaßnahme abzuschalten." #. type: deftypevr -#: doc/guix.texi:13867 +#: doc/guix.texi:13865 msgid "Defaults to @samp{\"0640\"}." msgstr "Die Vorgabe ist @samp{\"0640\"}." #. type: deftypevr -#: doc/guix.texi:13869 +#: doc/guix.texi:13867 #, no-wrap msgid "{@code{files-configuration} parameter} log-location error-log" msgstr "{@code{files-configuration}-Parameter} Protokollpfad error-log" #. type: deftypevr -#: doc/guix.texi:13877 +#: doc/guix.texi:13875 msgid "Defines the error log filename. Specifying a blank filename disables error log generation. The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background. The value @code{syslog} causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-error_log}." msgstr "Hiermit wird der Dateiname des Fehlerprotokolls („Error Log“) festgelegt. Wenn ein leerer Name angegeben wird, wird kein Fehlerprotokoll erzeugt. Der Wert @code{stderr} lässt Protokolleinträge in die Standardfehlerdatei schreiben, wenn das Planungsprogramm im Vordergrund läuft, oder an den Systemprotokolldaemon (also Syslog), wenn es im Hintergrund läuft. Der Wert @code{syslog} bewirkt, dass Protokolleinträge an den Systemprotokolldaemon geschickt werden. Der Servername darf in Dateinamen als die Zeichenkette @code{%s} angegeben werden, so kann etwa @code{/var/log/cups/%s-error_log} angegeben werden." #. type: deftypevr -#: doc/guix.texi:13879 +#: doc/guix.texi:13877 msgid "Defaults to @samp{\"/var/log/cups/error_log\"}." msgstr "Die Vorgabe ist @samp{\"/var/log/cups/error_log\"}." #. type: deftypevr -#: doc/guix.texi:13881 +#: doc/guix.texi:13879 #, no-wrap msgid "{@code{files-configuration} parameter} string fatal-errors" msgstr "{@code{files-configuration}-Parameter} Zeichenkette fatal-errors" #. type: deftypevr -#: doc/guix.texi:13884 +#: doc/guix.texi:13882 msgid "Specifies which errors are fatal, causing the scheduler to exit. The kind strings are:" msgstr "Gibt an, bei welchen Fehlern das Druckplanungsprogramm terminieren soll. Die Zeichenketten für die Arten sind:" #. type: table -#: doc/guix.texi:13888 +#: doc/guix.texi:13886 msgid "No errors are fatal." msgstr "Keine Fehler führen zur Beendigung." #. type: table -#: doc/guix.texi:13891 +#: doc/guix.texi:13889 msgid "All of the errors below are fatal." msgstr "Jeder der im Folgenden aufgeführten Fehler terminiert den Druckplaner." #. type: item -#: doc/guix.texi:13892 +#: doc/guix.texi:13890 #, no-wrap msgid "browse" msgstr "browse" #. type: table -#: doc/guix.texi:13895 +#: doc/guix.texi:13893 msgid "Browsing initialization errors are fatal, for example failed connections to the DNS-SD daemon." msgstr "Fehler bei der Suche während der Initialisierung terminieren den Druckplaner, zum Beispiel wenn keine Verbindung zum DNS-SD-Daemon aufgebaut werden kann." #. type: item -#: doc/guix.texi:13896 +#: doc/guix.texi:13894 #, no-wrap msgid "config" msgstr "config" #. type: table -#: doc/guix.texi:13898 +#: doc/guix.texi:13896 msgid "Configuration file syntax errors are fatal." msgstr "Syntaxfehler in der Konfigurationsdatei terminieren den Druckplaner." #. type: item -#: doc/guix.texi:13899 +#: doc/guix.texi:13897 #, no-wrap msgid "listen" msgstr "listen" #. type: table -#: doc/guix.texi:13902 +#: doc/guix.texi:13900 msgid "Listen or Port errors are fatal, except for IPv6 failures on the loopback or @code{any} addresses." msgstr "Fehler beim Lauschen oder Portfehler (entsprechend der Direktiven „Listen“ oder „Port“) terminieren den Druckplaner; ausgenommen sind Fehler bei IPv6 auf Loopback- oder @code{any}-Adressen." #. type: item -#: doc/guix.texi:13903 +#: doc/guix.texi:13901 #, no-wrap msgid "log" msgstr "log" #. type: table -#: doc/guix.texi:13905 +#: doc/guix.texi:13903 msgid "Log file creation or write errors are fatal." msgstr "Fehler beim Erzeugen von Protokolldateien terminieren den Druckplaner." #. type: item -#: doc/guix.texi:13906 +#: doc/guix.texi:13904 #, no-wrap msgid "permissions" msgstr "permissions" #. type: table -#: doc/guix.texi:13909 +#: doc/guix.texi:13907 msgid "Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions." msgstr "Falsche Zugriffsberechtigungen auf zum Starten benötigten Dateien terminieren den Druckplaner, zum Beispiel wenn auf gemeinsame TLS-Zertifikats- und Schlüsseldateien von allen lesend zugegriffen werden kann." #. type: deftypevr -#: doc/guix.texi:13912 +#: doc/guix.texi:13910 msgid "Defaults to @samp{\"all -browse\"}." msgstr "Die Vorgabe ist @samp{\"all -browse\"}." #. type: deftypevr -#: doc/guix.texi:13914 +#: doc/guix.texi:13912 #, no-wrap msgid "{@code{files-configuration} parameter} boolean file-device?" msgstr "{@code{files-configuration}-Parameter} Boolescher-Ausdruck file-device?" #. type: deftypevr -#: doc/guix.texi:13917 +#: doc/guix.texi:13915 msgid "Specifies whether the file pseudo-device can be used for new printer queues. The URI @uref{file:///dev/null} is always allowed." msgstr "Gibt an, welches Pseudogerät für neue Druckerwarteschlangen benutzt werden kann. Die URI @uref{file:///dev/null} wird immer zugelassen." #. type: deftypevr -#: doc/guix.texi:13919 doc/guix.texi:13989 doc/guix.texi:14025 -#: doc/guix.texi:14037 doc/guix.texi:14043 doc/guix.texi:14059 -#: doc/guix.texi:14147 doc/guix.texi:14241 doc/guix.texi:14557 -#: doc/guix.texi:14570 doc/guix.texi:20265 doc/guix.texi:20279 -#: doc/guix.texi:20401 doc/guix.texi:20422 doc/guix.texi:20443 -#: doc/guix.texi:20450 doc/guix.texi:20495 doc/guix.texi:20502 -#: doc/guix.texi:20929 doc/guix.texi:20943 doc/guix.texi:21115 -#: doc/guix.texi:21160 doc/guix.texi:21247 doc/guix.texi:21388 -#: doc/guix.texi:21421 doc/guix.texi:21561 doc/guix.texi:21572 -#: doc/guix.texi:21822 doc/guix.texi:22464 doc/guix.texi:22473 -#: doc/guix.texi:22481 doc/guix.texi:22489 doc/guix.texi:22505 -#: doc/guix.texi:22521 doc/guix.texi:22529 doc/guix.texi:22537 -#: doc/guix.texi:22546 doc/guix.texi:22555 doc/guix.texi:22571 -#: doc/guix.texi:22635 doc/guix.texi:22741 doc/guix.texi:22749 -#: doc/guix.texi:22757 doc/guix.texi:22782 doc/guix.texi:22836 -#: doc/guix.texi:22884 doc/guix.texi:23085 doc/guix.texi:23092 +#: doc/guix.texi:13917 doc/guix.texi:13987 doc/guix.texi:14023 +#: doc/guix.texi:14035 doc/guix.texi:14041 doc/guix.texi:14057 +#: doc/guix.texi:14145 doc/guix.texi:14239 doc/guix.texi:14555 +#: doc/guix.texi:14568 doc/guix.texi:20262 doc/guix.texi:20276 +#: doc/guix.texi:20398 doc/guix.texi:20419 doc/guix.texi:20440 +#: doc/guix.texi:20447 doc/guix.texi:20492 doc/guix.texi:20499 +#: doc/guix.texi:20926 doc/guix.texi:20940 doc/guix.texi:21112 +#: doc/guix.texi:21157 doc/guix.texi:21244 doc/guix.texi:21385 +#: doc/guix.texi:21418 doc/guix.texi:21558 doc/guix.texi:21569 +#: doc/guix.texi:21819 doc/guix.texi:22461 doc/guix.texi:22470 +#: doc/guix.texi:22478 doc/guix.texi:22486 doc/guix.texi:22502 +#: doc/guix.texi:22518 doc/guix.texi:22526 doc/guix.texi:22534 +#: doc/guix.texi:22543 doc/guix.texi:22552 doc/guix.texi:22568 +#: doc/guix.texi:22632 doc/guix.texi:22738 doc/guix.texi:22746 +#: doc/guix.texi:22754 doc/guix.texi:22779 doc/guix.texi:22833 +#: doc/guix.texi:22881 doc/guix.texi:23082 doc/guix.texi:23089 msgid "Defaults to @samp{#f}." msgstr "Vorgegeben ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:13921 +#: doc/guix.texi:13919 #, no-wrap msgid "{@code{files-configuration} parameter} string group" msgstr "{@code{files-configuration}-Parameter} Zeichenkette group" #. type: deftypevr -#: doc/guix.texi:13924 +#: doc/guix.texi:13922 msgid "Specifies the group name or ID that will be used when executing external programs." msgstr "Gibt Namen oder Identifikator der Benutzergruppe an, die zum Ausführen von externen Programmen verwendet wird." #. type: deftypevr -#: doc/guix.texi:13926 doc/guix.texi:14006 +#: doc/guix.texi:13924 doc/guix.texi:14004 msgid "Defaults to @samp{\"lp\"}." msgstr "Die Vorgabe ist @samp{\"lp\"}." #. type: deftypevr -#: doc/guix.texi:13928 +#: doc/guix.texi:13926 #, no-wrap msgid "{@code{files-configuration} parameter} string log-file-perm" msgstr "{@code{files-configuration}-Parameter} Zeichenkette log-file-perm" #. type: deftypevr -#: doc/guix.texi:13930 +#: doc/guix.texi:13928 msgid "Specifies the permissions for all log files that the scheduler writes." msgstr "Gibt die Berechtigungen für alle Protokolldateien an, die das Planungsprogramm schreibt." #. type: deftypevr -#: doc/guix.texi:13932 +#: doc/guix.texi:13930 msgid "Defaults to @samp{\"0644\"}." msgstr "Die Vorgabe ist @samp{\"0644\"}." #. type: deftypevr -#: doc/guix.texi:13934 +#: doc/guix.texi:13932 #, no-wrap msgid "{@code{files-configuration} parameter} log-location page-log" msgstr "{@code{files-configuration}-Parameter} log-location page-log" #. type: deftypevr -#: doc/guix.texi:13942 +#: doc/guix.texi:13940 msgid "Defines the page log filename. Specifying a blank filename disables page log generation. The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background. The value @code{syslog} causes log entries to be sent to the system log daemon. The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-page_log}." msgstr "Hiermit wird der Dateiname des Seitenprotokolls („Page Log“) festgelegt. Wenn ein leerer Name angegeben wird, wird kein Seitenprotokoll erzeugt. Der Wert @code{stderr} lässt Protokolleinträge in die Standardfehlerdatei schreiben, wenn das Planungsprogramm im Vordergrund läuft, oder an den Systemprotokolldaemon (also Syslog), wenn es im Hintergrund läuft. Der Wert @code{syslog} bewirkt, dass Protokolleinträge an den Systemprotokolldaemon geschickt werden. Der Servername darf in Dateinamen als die Zeichenkette @code{%s} angegeben werden, so kann etwa @code{/var/log/cups/%s-page_log} angegeben werden." #. type: deftypevr -#: doc/guix.texi:13944 +#: doc/guix.texi:13942 msgid "Defaults to @samp{\"/var/log/cups/page_log\"}." msgstr "Die Vorgabe ist @samp{\"/var/log/cups/page_log\"}." #. type: deftypevr -#: doc/guix.texi:13946 +#: doc/guix.texi:13944 #, no-wrap msgid "{@code{files-configuration} parameter} string remote-root" msgstr "{@code{files-configuration}-Parameter} Zeichenkette remote-root" #. type: deftypevr -#: doc/guix.texi:13949 +#: doc/guix.texi:13947 msgid "Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user. The default is @code{remroot}." msgstr "Gibt den Benutzernamen an, der für unauthentifizierte Zugriffe durch Clients verwendet wird, die sich als der Administratornutzer „root“ anmelden. Vorgegeben ist @code{remroot}." #. type: deftypevr -#: doc/guix.texi:13951 +#: doc/guix.texi:13949 msgid "Defaults to @samp{\"remroot\"}." msgstr "Die Vorgabe ist @samp{\"remroot\"}." #. type: deftypevr -#: doc/guix.texi:13953 +#: doc/guix.texi:13951 #, no-wrap msgid "{@code{files-configuration} parameter} file-name request-root" msgstr "{@code{files-configuration}-Parameter} Dateiname request-root" #. type: deftypevr -#: doc/guix.texi:13956 +#: doc/guix.texi:13954 msgid "Specifies the directory that contains print jobs and other HTTP request data." msgstr "Gibt das Verzeichnis an, in dem Druckaufträge und andere Daten zu HTTP-Anfragen abgelegt werden." #. type: deftypevr -#: doc/guix.texi:13958 +#: doc/guix.texi:13956 msgid "Defaults to @samp{\"/var/spool/cups\"}." msgstr "Die Vorgabe ist @samp{\"/var/spool/cups\"}." #. type: deftypevr -#: doc/guix.texi:13960 +#: doc/guix.texi:13958 #, no-wrap msgid "{@code{files-configuration} parameter} sandboxing sandboxing" msgstr "{@code{files-configuration}-Parameter} Isolierung sandboxing" #. type: deftypevr -#: doc/guix.texi:13965 +#: doc/guix.texi:13963 msgid "Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler; either @code{relaxed} or @code{strict}. This directive is currently only used/supported on macOS." msgstr "Gibt die Stufe der Sicherheitsisolierung („Sandboxing“) an, die auf Druckfilter, Hintergrundsysteme (Backends) und andere Kindprozesse des Planungsprogramms angewandt wird; entweder @code{relaxed} („locker“) oder @code{strict} („strikt“). Diese Direktive wird zur Zeit nur auf macOS benutzt/unterstützt." #. type: deftypevr -#: doc/guix.texi:13967 +#: doc/guix.texi:13965 msgid "Defaults to @samp{strict}." msgstr "Die Vorgabe ist @samp{strict}." #. type: deftypevr -#: doc/guix.texi:13969 +#: doc/guix.texi:13967 #, no-wrap msgid "{@code{files-configuration} parameter} file-name server-keychain" msgstr "{@code{files-configuration}-Parameter} Dateiname server-keychain" #. type: deftypevr -#: doc/guix.texi:13974 +#: doc/guix.texi:13972 msgid "Specifies the location of TLS certificates and private keys. CUPS will look for public and private keys in this directory: a @code{.crt} files for PEM-encoded certificates and corresponding @code{.key} files for PEM-encoded private keys." msgstr "Gibt an, wo TLS-Zertifikate und private Schlüssel gespeichert sind. CUPS wird in diesem Verzeichnis öffentliche und private Schlüssel suchen: @code{.crt}-Dateien für PEM-kodierte Zertifikate und zugehörige @code{.key}-Dateien für PEM-kodierte private Schlüssel." #. type: deftypevr -#: doc/guix.texi:13976 +#: doc/guix.texi:13974 msgid "Defaults to @samp{\"/etc/cups/ssl\"}." msgstr "Die Vorgabe ist @samp{\"/etc/cups/ssl\"}." #. type: deftypevr -#: doc/guix.texi:13978 +#: doc/guix.texi:13976 #, no-wrap msgid "{@code{files-configuration} parameter} file-name server-root" msgstr "{@code{files-configuration}-Parameter} Dateiname server-root" #. type: deftypevr -#: doc/guix.texi:13980 +#: doc/guix.texi:13978 msgid "Specifies the directory containing the server configuration files." msgstr "Gibt das Verzeichnis an, das die Serverkonfigurationsdateien enthält." #. type: deftypevr -#: doc/guix.texi:13982 +#: doc/guix.texi:13980 msgid "Defaults to @samp{\"/etc/cups\"}." msgstr "Die Vorgabe ist @samp{\"/etc/cups\"}." #. type: deftypevr -#: doc/guix.texi:13984 +#: doc/guix.texi:13982 #, no-wrap msgid "{@code{files-configuration} parameter} boolean sync-on-close?" msgstr "{@code{files-configuration}-Parameter} Boolescher-Ausdruck sync-on-close?" #. type: deftypevr -#: doc/guix.texi:13987 +#: doc/guix.texi:13985 msgid "Specifies whether the scheduler calls fsync(2) after writing configuration or state files." msgstr "Gibt an, ob das Planungsprogramm fsync(2) aufrufen soll, nachdem es in Konfigurations- oder Zustandsdateien geschrieben hat." #. type: deftypevr -#: doc/guix.texi:13991 +#: doc/guix.texi:13989 #, no-wrap msgid "{@code{files-configuration} parameter} space-separated-string-list system-group" msgstr "{@code{files-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste system-group" #. type: deftypevr -#: doc/guix.texi:13993 +#: doc/guix.texi:13991 msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication." msgstr "Gibt die Benutzergruppe(n) an, die als die @code{@@SYSTEM}-Gruppen für die Authentizierung benutzt werden können." #. type: deftypevr -#: doc/guix.texi:13995 +#: doc/guix.texi:13993 #, no-wrap msgid "{@code{files-configuration} parameter} file-name temp-dir" msgstr "{@code{files-configuration}-Parameter} Dateiname temp-dir" #. type: deftypevr -#: doc/guix.texi:13997 +#: doc/guix.texi:13995 msgid "Specifies the directory where temporary files are stored." msgstr "Gibt das Verzeichnis an, in das temporäre Dateien gespeichert werden." #. type: deftypevr -#: doc/guix.texi:13999 +#: doc/guix.texi:13997 msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}." msgstr "Die Vorgabe ist @samp{\"/var/spool/cups/tmp\"}." #. type: deftypevr -#: doc/guix.texi:14001 +#: doc/guix.texi:13999 #, no-wrap msgid "{@code{files-configuration} parameter} string user" msgstr "{@code{files-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:14004 +#: doc/guix.texi:14002 msgid "Specifies the user name or ID that is used when running external programs." msgstr "Gibt den Benutzernamen oder -identifikator an, mit dessen Benutzerkonto externe Programme ausgeführt werden." #. type: deftypevr -#: doc/guix.texi:14009 +#: doc/guix.texi:14007 #, no-wrap msgid "{@code{cups-configuration} parameter} access-log-level access-log-level" msgstr "{@code{cups-configuration}-Parameter} Zugriffsprotokollstufe access-log-level" #. type: deftypevr -#: doc/guix.texi:14016 +#: doc/guix.texi:14014 msgid "Specifies the logging level for the AccessLog file. The @code{config} level logs when printers and classes are added, deleted, or modified and when configuration files are accessed or updated. The @code{actions} level logs when print jobs are submitted, held, released, modified, or canceled, and any of the conditions for @code{config}. The @code{all} level logs all requests." msgstr "Gibt an, mit welcher Detailstufe das Protokoll in der AccessLog-Datei geführt wird. Bei der Stufe @code{config} wird protokolliert, wenn Drucker und Klassen hinzugefügt, entfernt oder verändert werden, und wenn auf Konfigurationsdateien zugegriffen oder sie aktualisiert werden. Bei der Stufe @code{actions} wird protokolliert, wenn Druckaufträge eingereicht, gehalten, freigegeben, geändert oder abgebrochen werden sowie alles, was bei @code{config} Protokollierung auslöst. Bei der Stufe @code{all} wird jede Anfrage protokolliert." #. type: deftypevr -#: doc/guix.texi:14018 +#: doc/guix.texi:14016 msgid "Defaults to @samp{actions}." msgstr "Die Vorgabe ist @samp{actions}." #. type: deftypevr -#: doc/guix.texi:14020 +#: doc/guix.texi:14018 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck auto-purge-jobs?" #. type: deftypevr -#: doc/guix.texi:14023 +#: doc/guix.texi:14021 msgid "Specifies whether to purge job history data automatically when it is no longer required for quotas." msgstr "Gibt an, ob Daten über den Auftragsverlauf automatisch gelöscht werden sollen, wenn Sie nicht mehr zur Berechnung von Druckkontingenten benötigt werden." #. type: deftypevr -#: doc/guix.texi:14027 +#: doc/guix.texi:14025 #, no-wrap msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols" msgstr "{@code{cups-configuration}-Parameter} Protokolle-zur-lokalen-Suche browse-local-protocols" #. type: deftypevr -#: doc/guix.texi:14029 +#: doc/guix.texi:14027 msgid "Specifies which protocols to use for local printer sharing." msgstr "Gibt an, welche Protokolle zum lokalen Teilen („Freigeben“) von Druckern benutzt werden sollen." #. type: deftypevr -#: doc/guix.texi:14031 +#: doc/guix.texi:14029 msgid "Defaults to @samp{dnssd}." msgstr "Die Vorgabe ist @samp{dnssd}." #. type: deftypevr -#: doc/guix.texi:14033 +#: doc/guix.texi:14031 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean browse-web-if?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck browse-web-if?" #. type: deftypevr -#: doc/guix.texi:14035 +#: doc/guix.texi:14033 msgid "Specifies whether the CUPS web interface is advertised." msgstr "Gibt an, ob die Weboberfläche von CUPS anderen mitgeteilt wird." #. type: deftypevr -#: doc/guix.texi:14039 +#: doc/guix.texi:14037 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean browsing?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck browsing?" #. type: deftypevr -#: doc/guix.texi:14041 +#: doc/guix.texi:14039 msgid "Specifies whether shared printers are advertised." msgstr "Gibt an, ob geteilte Drucker bei Druckersuchen mitgeteilt werden." #. type: deftypevr -#: doc/guix.texi:14045 +#: doc/guix.texi:14043 #, no-wrap msgid "{@code{cups-configuration} parameter} string classification" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette classification" #. type: deftypevr -#: doc/guix.texi:14050 +#: doc/guix.texi:14048 msgid "Specifies the security classification of the server. Any valid banner name can be used, including \"classified\", \"confidential\", \"secret\", \"topsecret\", and \"unclassified\", or the banner can be omitted to disable secure printing functions." msgstr "Gibt die Geheimhaltungsstufe des Servers an. Jeder gültige Deckblattname („Banner“-Name) kann benutzt werden, einschließlich „classified“, „confidential“, „secret“, „topsecret“ und „unclassified“. Wird kein Deckblatt angegeben, werden Funktionen für sicheres Drucken abgeschaltet." #. type: deftypevr -#: doc/guix.texi:14052 doc/guix.texi:14389 doc/guix.texi:15993 -#: doc/guix.texi:16005 doc/guix.texi:17707 doc/guix.texi:17733 -#: doc/guix.texi:17769 doc/guix.texi:17834 doc/guix.texi:17873 -#: doc/guix.texi:17932 doc/guix.texi:17941 doc/guix.texi:21527 -#: doc/guix.texi:21535 doc/guix.texi:21543 doc/guix.texi:21551 -#: doc/guix.texi:21829 doc/guix.texi:22307 doc/guix.texi:22315 -#: doc/guix.texi:22323 doc/guix.texi:22431 doc/guix.texi:22456 -#: doc/guix.texi:22587 doc/guix.texi:22595 doc/guix.texi:22603 -#: doc/guix.texi:22611 doc/guix.texi:22619 doc/guix.texi:22627 -#: doc/guix.texi:22650 doc/guix.texi:22658 doc/guix.texi:22710 -#: doc/guix.texi:22726 doc/guix.texi:22734 doc/guix.texi:22773 -#: doc/guix.texi:22796 doc/guix.texi:22818 doc/guix.texi:22825 -#: doc/guix.texi:22860 doc/guix.texi:22868 doc/guix.texi:22892 -#: doc/guix.texi:22924 doc/guix.texi:22953 doc/guix.texi:22960 -#: doc/guix.texi:22967 doc/guix.texi:22975 doc/guix.texi:22989 -#: doc/guix.texi:22998 doc/guix.texi:23008 doc/guix.texi:23015 -#: doc/guix.texi:23022 doc/guix.texi:23029 doc/guix.texi:23100 -#: doc/guix.texi:23107 doc/guix.texi:23114 doc/guix.texi:23123 -#: doc/guix.texi:23139 doc/guix.texi:23146 doc/guix.texi:23153 -#: doc/guix.texi:23160 doc/guix.texi:23168 doc/guix.texi:23176 +#: doc/guix.texi:14050 doc/guix.texi:14387 doc/guix.texi:15990 +#: doc/guix.texi:16002 doc/guix.texi:17704 doc/guix.texi:17730 +#: doc/guix.texi:17766 doc/guix.texi:17831 doc/guix.texi:17870 +#: doc/guix.texi:17929 doc/guix.texi:17938 doc/guix.texi:21524 +#: doc/guix.texi:21532 doc/guix.texi:21540 doc/guix.texi:21548 +#: doc/guix.texi:21826 doc/guix.texi:22304 doc/guix.texi:22312 +#: doc/guix.texi:22320 doc/guix.texi:22428 doc/guix.texi:22453 +#: doc/guix.texi:22584 doc/guix.texi:22592 doc/guix.texi:22600 +#: doc/guix.texi:22608 doc/guix.texi:22616 doc/guix.texi:22624 +#: doc/guix.texi:22647 doc/guix.texi:22655 doc/guix.texi:22707 +#: doc/guix.texi:22723 doc/guix.texi:22731 doc/guix.texi:22770 +#: doc/guix.texi:22793 doc/guix.texi:22815 doc/guix.texi:22822 +#: doc/guix.texi:22857 doc/guix.texi:22865 doc/guix.texi:22889 +#: doc/guix.texi:22921 doc/guix.texi:22950 doc/guix.texi:22957 +#: doc/guix.texi:22964 doc/guix.texi:22972 doc/guix.texi:22986 +#: doc/guix.texi:22995 doc/guix.texi:23005 doc/guix.texi:23012 +#: doc/guix.texi:23019 doc/guix.texi:23026 doc/guix.texi:23097 +#: doc/guix.texi:23104 doc/guix.texi:23111 doc/guix.texi:23120 +#: doc/guix.texi:23136 doc/guix.texi:23143 doc/guix.texi:23150 +#: doc/guix.texi:23157 doc/guix.texi:23165 doc/guix.texi:23173 msgid "Defaults to @samp{\"\"}." msgstr "Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:14054 +#: doc/guix.texi:14052 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean classify-override?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck classify-override?" #. type: deftypevr -#: doc/guix.texi:14057 +#: doc/guix.texi:14055 msgid "Specifies whether users may override the classification (cover page) of individual print jobs using the @code{job-sheets} option." msgstr "Gibt an, ob Nutzer bei einzelnen Druckaufträgen eine andere als die voreingestellte Geheimhaltungsstufe (für das Deckblatt) vorgeben können, indem sie die Option @code{job-sheets} einstellen." #. type: deftypevr -#: doc/guix.texi:14061 +#: doc/guix.texi:14059 #, no-wrap msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type" msgstr "{@code{cups-configuration}-Parameter} Voreingestelle-Authentifizierungsart default-auth-type" #. type: deftypevr -#: doc/guix.texi:14063 +#: doc/guix.texi:14061 msgid "Specifies the default type of authentication to use." msgstr "Gibt an, wie man nach Voreinstellung authentifiziert wird." #. type: deftypevr -#: doc/guix.texi:14065 +#: doc/guix.texi:14063 msgid "Defaults to @samp{Basic}." msgstr "Die Vorgabe ist @samp{Basic}." #. type: deftypevr -#: doc/guix.texi:14067 +#: doc/guix.texi:14065 #, no-wrap msgid "{@code{cups-configuration} parameter} default-encryption default-encryption" msgstr "{@code{cups-configuration}-Parameter} Voreingestellte-Verschlüsselung default-encryption" #. type: deftypevr -#: doc/guix.texi:14069 +#: doc/guix.texi:14067 msgid "Specifies whether encryption will be used for authenticated requests." msgstr "Gibt an, ob für authentifizierte Anfragen Verschlüsselung benutzt wird." #. type: deftypevr -#: doc/guix.texi:14071 +#: doc/guix.texi:14069 msgid "Defaults to @samp{Required}." msgstr "Die Vorgabe ist @samp{Required}." #. type: deftypevr -#: doc/guix.texi:14073 +#: doc/guix.texi:14071 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-language" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette default-language" #. type: deftypevr -#: doc/guix.texi:14075 +#: doc/guix.texi:14073 msgid "Specifies the default language to use for text and web content." msgstr "Gibt an, welche Sprache für Text und Weboberfläche voreingestellt benutzt werden soll." #. type: deftypevr -#: doc/guix.texi:14077 +#: doc/guix.texi:14075 msgid "Defaults to @samp{\"en\"}." msgstr "Die Vorgabe ist @samp{\"en\"}." #. type: deftypevr -#: doc/guix.texi:14079 +#: doc/guix.texi:14077 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-paper-size" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette default-paper-size" #. type: deftypevr -#: doc/guix.texi:14084 +#: doc/guix.texi:14082 msgid "Specifies the default paper size for new print queues. @samp{\"Auto\"} uses a locale-specific default, while @samp{\"None\"} specifies there is no default paper size. Specific size names are typically @samp{\"Letter\"} or @samp{\"A4\"}." msgstr "Gibt das voreingestellte Papierformat für neue Druckwarteschlangen an. Bei @samp{\"Auto\"} wird eine der Locale entsprechende Voreinstellung gewählt, während bei @samp{\"None\"} kein Papierformat voreingestellt ist. Verfügbare Formatbezeichnungen sind typischerweise @samp{\"Letter\"} oder @samp{\"A4\"}." #. type: deftypevr -#: doc/guix.texi:14086 +#: doc/guix.texi:14084 msgid "Defaults to @samp{\"Auto\"}." msgstr "Die Vorgabe ist @samp{\"Auto\"}." #. type: deftypevr -#: doc/guix.texi:14088 +#: doc/guix.texi:14086 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-policy" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette default-policy" #. type: deftypevr -#: doc/guix.texi:14090 +#: doc/guix.texi:14088 msgid "Specifies the default access policy to use." msgstr "Gibt die voreingestellte Zugriffsrichtlinie an, die benutzt werden soll." #. type: deftypevr -#: doc/guix.texi:14092 +#: doc/guix.texi:14090 msgid "Defaults to @samp{\"default\"}." msgstr "Die Vorgabe ist @samp{\"default\"}." #. type: deftypevr -#: doc/guix.texi:14094 +#: doc/guix.texi:14092 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean default-shared?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck default-shared?" #. type: deftypevr -#: doc/guix.texi:14096 +#: doc/guix.texi:14094 msgid "Specifies whether local printers are shared by default." msgstr "Gibt an, ob lokale Drucker nach Voreinstellung geteilt werden sollen." #. type: deftypevr -#: doc/guix.texi:14098 doc/guix.texi:14178 doc/guix.texi:14474 -#: doc/guix.texi:20087 doc/guix.texi:20115 doc/guix.texi:20235 -#: doc/guix.texi:20242 doc/guix.texi:20250 doc/guix.texi:20272 -#: doc/guix.texi:20286 doc/guix.texi:20371 doc/guix.texi:20378 -#: doc/guix.texi:20386 doc/guix.texi:20796 doc/guix.texi:20936 -#: doc/guix.texi:21122 doc/guix.texi:21129 doc/guix.texi:21151 -#: doc/guix.texi:21190 doc/guix.texi:21210 doc/guix.texi:21224 -#: doc/guix.texi:21376 doc/guix.texi:22409 doc/guix.texi:22497 -#: doc/guix.texi:22513 doc/guix.texi:22563 +#: doc/guix.texi:14096 doc/guix.texi:14176 doc/guix.texi:14472 +#: doc/guix.texi:20084 doc/guix.texi:20112 doc/guix.texi:20232 +#: doc/guix.texi:20239 doc/guix.texi:20247 doc/guix.texi:20269 +#: doc/guix.texi:20283 doc/guix.texi:20368 doc/guix.texi:20375 +#: doc/guix.texi:20383 doc/guix.texi:20793 doc/guix.texi:20933 +#: doc/guix.texi:21119 doc/guix.texi:21126 doc/guix.texi:21148 +#: doc/guix.texi:21187 doc/guix.texi:21207 doc/guix.texi:21221 +#: doc/guix.texi:21373 doc/guix.texi:22406 doc/guix.texi:22494 +#: doc/guix.texi:22510 doc/guix.texi:22560 msgid "Defaults to @samp{#t}." msgstr "Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:14100 +#: doc/guix.texi:14098 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl dirty-clean-interval" #. type: deftypevr -#: doc/guix.texi:14104 +#: doc/guix.texi:14102 msgid "Specifies the delay for updating of configuration and state files, in seconds. A value of 0 causes the update to happen as soon as possible, typically within a few milliseconds." msgstr "Gibt an, mit welcher Verzögerung Konfigurations- und Zustandsdateien aktualisiert werden sollen. Der Wert 0 lässt die Aktualisierung so bald wie möglich stattfinden, in der Regel nach ein paar Millisekunden." #. type: deftypevr -#: doc/guix.texi:14106 doc/guix.texi:14154 doc/guix.texi:14163 -#: doc/guix.texi:14184 doc/guix.texi:14481 +#: doc/guix.texi:14104 doc/guix.texi:14152 doc/guix.texi:14161 +#: doc/guix.texi:14182 doc/guix.texi:14479 msgid "Defaults to @samp{30}." msgstr "Die Vorgabe ist @samp{30}." #. type: deftypevr -#: doc/guix.texi:14108 +#: doc/guix.texi:14106 #, no-wrap msgid "{@code{cups-configuration} parameter} error-policy error-policy" msgstr "{@code{cups-configuration}-Parameter} Fehlerrichtlinie error-policy" #. type: deftypevr -#: doc/guix.texi:14114 +#: doc/guix.texi:14112 msgid "Specifies what to do when an error occurs. Possible values are @code{abort-job}, which will discard the failed print job; @code{retry-job}, which will retry the job at a later time; @code{retry-this-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer." msgstr "Gibt an, wie beim Auftreten eines Fehlers verfahren werden soll. Mögliche Werte sind @code{abort-job}, wodurch der fehlgeschlagene Druckauftrag verworfen wird, @code{retry-job}, wodurch der Druckauftrag später erneut versucht wird, @code{retry-this-job}, wodurch der fehlgeschlagene Druckauftrag sofort erneut versucht wird, und @code{stop-printer}, wodurch der Drucker angehalten wird." #. type: deftypevr -#: doc/guix.texi:14116 +#: doc/guix.texi:14114 msgid "Defaults to @samp{stop-printer}." msgstr "Die Vorgabe ist @samp{stop-printer}." #. type: deftypevr -#: doc/guix.texi:14118 +#: doc/guix.texi:14116 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl filter-limit" #. type: deftypevr -#: doc/guix.texi:14126 +#: doc/guix.texi:14124 msgid "Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems. A limit of 0 disables filter limiting. An average print to a non-PostScript printer needs a filter limit of about 200. A PostScript printer needs about half that (100). Setting the limit below these thresholds will effectively limit the scheduler to printing a single job at any time." msgstr "Gibt die Maximalkosten von Filtern an, die nebenläufig ausgeführt werden, wodurch Probleme durch Platten-, Arbeitsspeicher- und Prozessorressourcennutzung minimiert werden können. Eine Beschränkung von 0 deaktiviert die Filterbeschränkung. Ein durchschnittlicher Druck mit einem Nicht-PostScript-Drucker erfordert eine Filterbeschränkung von mindestens ungefähr 200. Ein PostScript-Drucker erfordert eine halb so hohe Filterbeschränkung (100). Wird die Beschränkung unterhalb dieser Schwellwerte angesetzt, kann das Planungsprogramm effektiv nur noch einen einzelnen Druckauftrag gleichzeitig abarbeiten." #. type: deftypevr -#: doc/guix.texi:14128 doc/guix.texi:14136 doc/guix.texi:14191 -#: doc/guix.texi:14307 doc/guix.texi:14321 doc/guix.texi:14328 -#: doc/guix.texi:15435 doc/guix.texi:15451 doc/guix.texi:16097 -#: doc/guix.texi:16109 doc/guix.texi:20812 doc/guix.texi:21137 -#: doc/guix.texi:22402 doc/guix.texi:22702 doc/guix.texi:22876 +#: doc/guix.texi:14126 doc/guix.texi:14134 doc/guix.texi:14189 +#: doc/guix.texi:14305 doc/guix.texi:14319 doc/guix.texi:14326 +#: doc/guix.texi:15432 doc/guix.texi:15448 doc/guix.texi:16094 +#: doc/guix.texi:16106 doc/guix.texi:20809 doc/guix.texi:21134 +#: doc/guix.texi:22399 doc/guix.texi:22699 doc/guix.texi:22873 msgid "Defaults to @samp{0}." msgstr "Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:14130 +#: doc/guix.texi:14128 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl filter-nice" #. type: deftypevr -#: doc/guix.texi:14134 +#: doc/guix.texi:14132 msgid "Specifies the scheduling priority of filters that are run to print a job. The nice value ranges from 0, the highest priority, to 19, the lowest priority." msgstr "Gibt die Planungspriorität von Filtern an, die zum Drucken eines Druckauftrags ausgeführt werden. Der nice-Wert kann zwischen 0, der höchsten Priorität, und 19, der niedrigsten Priorität, liegen." #. type: deftypevr -#: doc/guix.texi:14138 +#: doc/guix.texi:14136 #, no-wrap msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups" msgstr "{@code{cups-configuration}-Parameter} Rechnernamensauflösungen host-name-lookups" #. type: deftypevr -#: doc/guix.texi:14145 +#: doc/guix.texi:14143 msgid "Specifies whether to do reverse lookups on connecting clients. The @code{double} setting causes @code{cupsd} to verify that the hostname resolved from the address matches one of the addresses returned for that hostname. Double lookups also prevent clients with unregistered addresses from connecting to your server. Only set this option to @code{#t} or @code{double} if absolutely required." -msgstr "Gibt an, ob umgekehrte Namensauflösungen („Reverse Lookups“) bei sich verbindenden Clients durchgeführt werden sollen. Die Einstellung @code{double} lässt @code{cupsd} verifizieren, dass der anhand der Adresse aufgelöste Rechnername zu einer der für den Rechnernamen zurückgelieferten Adressen passt. „Double“-Namensauflösungen verhindern auch, dass sich Clients mit unregistrierten Adressen mit Ihrem Server verbinden können. Setzen Sie diese Option nur dann auf @code{#t} oder @code{double}, wenn es unbedingt notwendig ist." +msgstr "Gibt an, ob inverse Namensauflösungen („Reverse Lookups“) bei sich verbindenden Clients durchgeführt werden sollen. Die Einstellung @code{double} lässt @code{cupsd} verifizieren, dass der anhand der Adresse aufgelöste Rechnername zu einer der für den Rechnernamen zurückgelieferten Adressen passt. „Double“-Namensauflösungen verhindern auch, dass sich Clients mit unregistrierten Adressen mit Ihrem Server verbinden können. Setzen Sie diese Option nur dann auf @code{#t} oder @code{double}, wenn es unbedingt notwendig ist." #. type: deftypevr -#: doc/guix.texi:14149 +#: doc/guix.texi:14147 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl job-kill-delay" #. type: deftypevr -#: doc/guix.texi:14152 +#: doc/guix.texi:14150 msgid "Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job." msgstr "Gibt die Anzahl an Sekunden an, wie lange vor dem Abwürgen der mit einem abgebrochenen oder gehaltenen Druckauftrag assoziierten Filter- und Hintergrundprozesse (dem „Backend“) gewartet wird." #. type: deftypevr -#: doc/guix.texi:14156 +#: doc/guix.texi:14154 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl job-retry-interval" #. type: deftypevr -#: doc/guix.texi:14161 +#: doc/guix.texi:14159 msgid "Specifies the interval between retries of jobs in seconds. This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}." msgstr "Gibt das Zeitintervall zwischen erneuten Versuchen von Druckaufträgen in Sekunden an. Dies wird in der Regel für Fax-Warteschlangen benutzt, kann aber auch für normale Druckwarteschlangen benutzt werden, deren Fehlerrichtlinie @code{retry-job} oder @code{retry-current-job} ist." #. type: deftypevr -#: doc/guix.texi:14165 +#: doc/guix.texi:14163 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl job-retry-limit" #. type: deftypevr -#: doc/guix.texi:14170 +#: doc/guix.texi:14168 msgid "Specifies the number of retries that are done for jobs. This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}." msgstr "Gibt die Anzahl an, wie oft ein Druckauftrag erneut versucht wird. Dies wird in der Regel für Fax-Warteschlangen benutzt, kann aber auch für normale Druckwarteschlangen benutzt werden, deren Fehlerrichtlinie @code{retry-job} oder @code{retry-current-job} ist." #. type: deftypevr -#: doc/guix.texi:14172 doc/guix.texi:21628 doc/guix.texi:21648 -#: doc/guix.texi:21664 doc/guix.texi:21678 doc/guix.texi:21685 -#: doc/guix.texi:21692 doc/guix.texi:21699 doc/guix.texi:21858 -#: doc/guix.texi:21874 doc/guix.texi:21881 doc/guix.texi:21888 -#: doc/guix.texi:21899 doc/guix.texi:22354 doc/guix.texi:22362 -#: doc/guix.texi:22370 doc/guix.texi:22394 +#: doc/guix.texi:14170 doc/guix.texi:21625 doc/guix.texi:21645 +#: doc/guix.texi:21661 doc/guix.texi:21675 doc/guix.texi:21682 +#: doc/guix.texi:21689 doc/guix.texi:21696 doc/guix.texi:21855 +#: doc/guix.texi:21871 doc/guix.texi:21878 doc/guix.texi:21885 +#: doc/guix.texi:21896 doc/guix.texi:22351 doc/guix.texi:22359 +#: doc/guix.texi:22367 doc/guix.texi:22391 msgid "Defaults to @samp{5}." msgstr "Die Vorgabe ist @samp{5}." #. type: deftypevr -#: doc/guix.texi:14174 +#: doc/guix.texi:14172 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean keep-alive?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck keep-alive?" #. type: deftypevr -#: doc/guix.texi:14176 +#: doc/guix.texi:14174 msgid "Specifies whether to support HTTP keep-alive connections." msgstr "Gibt an, ob HTTP-„keep-alive“ für Verbindungen unterstützt wird." #. type: deftypevr -#: doc/guix.texi:14180 +#: doc/guix.texi:14178 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl keep-alive-timeout" #. type: deftypevr -#: doc/guix.texi:14182 +#: doc/guix.texi:14180 msgid "Specifies how long an idle client connection remains open, in seconds." msgstr "Gibt an, wie lange eine Clientverbindung ohne Aktivität offen bleibt, in Sekunden." #. type: deftypevr -#: doc/guix.texi:14186 +#: doc/guix.texi:14184 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl limit-request-body" #. type: deftypevr -#: doc/guix.texi:14189 +#: doc/guix.texi:14187 msgid "Specifies the maximum size of print files, IPP requests, and HTML form data. A limit of 0 disables the limit check." msgstr "Gibt die Maximalgröße von zu druckenden Dateien, IPP-Anfragen und HTML-Formulardaten an. Eine Beschränkung von 0 deaktiviert die Beschränkung." #. type: deftypevr -#: doc/guix.texi:14193 +#: doc/guix.texi:14191 #, no-wrap msgid "{@code{cups-configuration} parameter} multiline-string-list listen" msgstr "{@code{cups-configuration}-Parameter} Mehrzeilige-Zeichenketten-Liste listen" #. type: deftypevr -#: doc/guix.texi:14200 +#: doc/guix.texi:14198 msgid "Listens on the specified interfaces for connections. Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses. Values can also be file names of local UNIX domain sockets. The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks." msgstr "Lauscht auf den angegebenen Schnittstellen auf Verbindungen. Gültige Werte haben die Form @var{Adresse}:@var{Port}, wobei die @var{Adresse} entweder eine von eckigen Klammern umschlossene IPv6-Adresse, eine IPv4-Adresse oder @code{*} ist; letztere steht für alle Adressen. Werte können auch Dateinamen lokaler UNIX-Sockets sein. Die Listen-Direktive ähnelt der Port-Direktive, macht es aber möglich, den Zugriff für bestimmte Schnittstellen oder Netzwerke einzuschränken." #. type: deftypevr -#: doc/guix.texi:14202 +#: doc/guix.texi:14200 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl listen-back-log" #. type: deftypevr -#: doc/guix.texi:14209 +#: doc/guix.texi:14207 msgid "Specifies the number of pending connections that will be allowed. This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections. When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones." msgstr "Gibt die Anzahl ausstehender Verbindungen an, die möglich sein soll. Normalerweise betrifft dies nur sehr ausgelastete Server, die die MaxClients-Beschränkung erreicht haben. Es kann aber auch eine Rolle spielen, wenn versucht wird, gleichzeitig sehr viele Verbindungen herzustellen. Wenn die Beschränkung erreicht wird, sperrt das Betriebssystem den Aufbau weiterer Verbindungen, bis das Druckplanungsprogramm die ausstehenden akzeptieren konnte." #. type: deftypevr -#: doc/guix.texi:14211 +#: doc/guix.texi:14209 msgid "Defaults to @samp{128}." msgstr "Die Vorgabe ist @samp{128}." #. type: deftypevr -#: doc/guix.texi:14213 +#: doc/guix.texi:14211 #, no-wrap msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls" msgstr "{@code{cups-configuration}-Parameter} „location-access-controls“-Liste location-access-controls" #. type: deftypevr -#: doc/guix.texi:14215 +#: doc/guix.texi:14213 msgid "Specifies a set of additional access controls." msgstr "Gibt eine Liste zusätzlicher Zugriffssteuerungen („Access Controls“) an." #. type: deftypevr -#: doc/guix.texi:14217 +#: doc/guix.texi:14215 msgid "Available @code{location-access-controls} fields are:" msgstr "Verfügbare @code{location-access-controls}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14218 +#: doc/guix.texi:14216 #, no-wrap msgid "{@code{location-access-controls} parameter} file-name path" msgstr "{@code{location-access-controls}-Parameter} Dateiname path" #. type: deftypevr -#: doc/guix.texi:14220 +#: doc/guix.texi:14218 msgid "Specifies the URI path to which the access control applies." msgstr "Gibt den URI-Pfad an, für den die Zugriffssteuerung gilt." #. type: deftypevr -#: doc/guix.texi:14222 +#: doc/guix.texi:14220 #, no-wrap msgid "{@code{location-access-controls} parameter} access-control-list access-controls" msgstr "{@code{location-access-controls}-Parameter} Zugriffssteuerungs-Liste access-controls" #. type: deftypevr -#: doc/guix.texi:14225 +#: doc/guix.texi:14223 msgid "Access controls for all access to this path, in the same format as the @code{access-controls} of @code{operation-access-control}." msgstr "Zugriffssteuerungen für jeden Zugriff auf diesen Pfad, im selben Format wie die @code{access-controls} bei @code{operation-access-control}." #. type: deftypevr -#: doc/guix.texi:14227 doc/guix.texi:14233 doc/guix.texi:14247 -#: doc/guix.texi:14254 doc/guix.texi:14396 doc/guix.texi:14455 -#: doc/guix.texi:14539 doc/guix.texi:14550 doc/guix.texi:16583 -#: doc/guix.texi:17777 doc/guix.texi:17881 doc/guix.texi:18306 -#: doc/guix.texi:18314 doc/guix.texi:18559 doc/guix.texi:20146 -#: doc/guix.texi:20293 doc/guix.texi:20481 doc/guix.texi:21519 -#: doc/guix.texi:21579 doc/guix.texi:21587 doc/guix.texi:22417 -#: doc/guix.texi:22424 doc/guix.texi:22766 doc/guix.texi:22844 -#: doc/guix.texi:22938 doc/guix.texi:22946 doc/guix.texi:22982 -#: doc/guix.texi:23132 doc/guix.texi:23183 doc/guix.texi:23192 +#: doc/guix.texi:14225 doc/guix.texi:14231 doc/guix.texi:14245 +#: doc/guix.texi:14252 doc/guix.texi:14394 doc/guix.texi:14453 +#: doc/guix.texi:14537 doc/guix.texi:14548 doc/guix.texi:16580 +#: doc/guix.texi:17774 doc/guix.texi:17878 doc/guix.texi:18303 +#: doc/guix.texi:18311 doc/guix.texi:18556 doc/guix.texi:20143 +#: doc/guix.texi:20290 doc/guix.texi:20478 doc/guix.texi:21516 +#: doc/guix.texi:21576 doc/guix.texi:21584 doc/guix.texi:22414 +#: doc/guix.texi:22421 doc/guix.texi:22763 doc/guix.texi:22841 +#: doc/guix.texi:22935 doc/guix.texi:22943 doc/guix.texi:22979 +#: doc/guix.texi:23129 doc/guix.texi:23180 doc/guix.texi:23189 msgid "Defaults to @samp{()}." msgstr "Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:14229 +#: doc/guix.texi:14227 #, no-wrap msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls" msgstr "{@code{location-access-controls}-Parameter} „method-access-controls“-Liste method-access-controls" #. type: deftypevr -#: doc/guix.texi:14231 +#: doc/guix.texi:14229 msgid "Access controls for method-specific access to this path." msgstr "Zugriffssteuerungen für methodenspezifische Zugriffe auf diesen Pfad." #. type: deftypevr -#: doc/guix.texi:14235 +#: doc/guix.texi:14233 msgid "Available @code{method-access-controls} fields are:" msgstr "Verfügbare @code{method-access-controls}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14236 +#: doc/guix.texi:14234 #, no-wrap msgid "{@code{method-access-controls} parameter} boolean reverse?" msgstr "{@code{method-access-controls}-Parameter} Boolescher-Ausdruck reverse?" #. type: deftypevr -#: doc/guix.texi:14239 +#: doc/guix.texi:14237 msgid "If @code{#t}, apply access controls to all methods except the listed methods. Otherwise apply to only the listed methods." msgstr "Falls dies @code{#t} ist, gelten die Zugriffssteuerungen für alle Methoden außer den aufgelisteten Methoden. Andernfalls gelten sie nur für die aufgelisteten Methoden." #. type: deftypevr -#: doc/guix.texi:14243 +#: doc/guix.texi:14241 #, no-wrap msgid "{@code{method-access-controls} parameter} method-list methods" msgstr "{@code{method-access-controls}-Parameter} Methoden-Liste methods" #. type: deftypevr -#: doc/guix.texi:14245 +#: doc/guix.texi:14243 msgid "Methods to which this access control applies." msgstr "Methoden, für die diese Zugriffssteuerung gilt." #. type: deftypevr -#: doc/guix.texi:14249 +#: doc/guix.texi:14247 #, no-wrap msgid "{@code{method-access-controls} parameter} access-control-list access-controls" msgstr "{@code{method-access-controls}-Parameter} Zugriffssteuerungs-Liste access-controls" #. type: deftypevr -#: doc/guix.texi:14252 +#: doc/guix.texi:14250 msgid "Access control directives, as a list of strings. Each string should be one directive, such as \"Order allow,deny\"." msgstr "Zugriffssteuerungsdirektiven als eine Liste von Zeichenketten. Jede Zeichenkette steht für eine Direktive wie z.B.@: \"Order allow,deny\"." #. type: deftypevr -#: doc/guix.texi:14258 +#: doc/guix.texi:14256 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl log-debug-history" #. type: deftypevr -#: doc/guix.texi:14262 +#: doc/guix.texi:14260 msgid "Specifies the number of debugging messages that are retained for logging if an error occurs in a print job. Debug messages are logged regardless of the LogLevel setting." msgstr "Gibt die Anzahl der Nachrichten zur Fehlersuche an, die für Protokolle vorgehalten werden, wenn ein Fehler in einem Druckauftrag auftritt. Nachrichten zur Fehlersuche werden unabhängig von der LogLevel-Einstellung protokolliert." #. type: deftypevr -#: doc/guix.texi:14264 doc/guix.texi:14285 doc/guix.texi:14292 -#: doc/guix.texi:16343 doc/guix.texi:20466 +#: doc/guix.texi:14262 doc/guix.texi:14283 doc/guix.texi:14290 +#: doc/guix.texi:16340 doc/guix.texi:20463 msgid "Defaults to @samp{100}." msgstr "Die Vorgabe ist @samp{100}." #. type: deftypevr -#: doc/guix.texi:14266 +#: doc/guix.texi:14264 #, no-wrap msgid "{@code{cups-configuration} parameter} log-level log-level" msgstr "{@code{cups-configuration}-Parameter} Protokollstufe log-level" #. type: deftypevr -#: doc/guix.texi:14269 +#: doc/guix.texi:14267 msgid "Specifies the level of logging for the ErrorLog file. The value @code{none} stops all logging while @code{debug2} logs everything." msgstr "Gibt die Stufe der Protokollierung in die ErrorLog-Datei an. Der Wert @code{none} stoppt alle Protokollierung, während @code{debug2} alles protokollieren lässt." #. type: deftypevr -#: doc/guix.texi:14271 +#: doc/guix.texi:14269 msgid "Defaults to @samp{info}." msgstr "Die Vorgabe ist @samp{info}." #. type: deftypevr -#: doc/guix.texi:14273 +#: doc/guix.texi:14271 #, no-wrap msgid "{@code{cups-configuration} parameter} log-time-format log-time-format" msgstr "{@code{cups-configuration}-Parameter} Protokollzeitformat log-time-format" #. type: deftypevr -#: doc/guix.texi:14276 +#: doc/guix.texi:14274 msgid "Specifies the format of the date and time in the log files. The value @code{standard} logs whole seconds while @code{usecs} logs microseconds." msgstr "Gibt das Format von Datum und Uhrzeit in Protokolldateien an. Der Wert @code{standard} lässt ganze Sekunden ins Protokoll schreiben, während bei @code{usecs} Mikrosekunden protokolliert werden." #. type: deftypevr -#: doc/guix.texi:14278 +#: doc/guix.texi:14276 msgid "Defaults to @samp{standard}." msgstr "Die Vorgabe ist @samp{standard}." #. type: deftypevr -#: doc/guix.texi:14280 +#: doc/guix.texi:14278 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-clients" #. type: deftypevr -#: doc/guix.texi:14283 +#: doc/guix.texi:14281 msgid "Specifies the maximum number of simultaneous clients that are allowed by the scheduler." msgstr "Gibt die Maximalzahl gleichzeitig bedienter Clients an, die vom Planer zugelassen werden." #. type: deftypevr -#: doc/guix.texi:14287 +#: doc/guix.texi:14285 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-clients-per-host" #. type: deftypevr -#: doc/guix.texi:14290 +#: doc/guix.texi:14288 msgid "Specifies the maximum number of simultaneous clients that are allowed from a single address." msgstr "Gibt die Maximalzahl gleichzeitiger Clients von derselben Adresse an, die zugelassen werden." #. type: deftypevr -#: doc/guix.texi:14294 +#: doc/guix.texi:14292 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-copies" #. type: deftypevr -#: doc/guix.texi:14297 +#: doc/guix.texi:14295 msgid "Specifies the maximum number of copies that a user can print of each job." msgstr "Gibt die Maximalzahl der Kopien an, die ein Nutzer vom selben Druckauftrag ausdrucken lassen kann." #. type: deftypevr -#: doc/guix.texi:14299 +#: doc/guix.texi:14297 msgid "Defaults to @samp{9999}." msgstr "Die Vorgabe ist @samp{9999}." #. type: deftypevr -#: doc/guix.texi:14301 +#: doc/guix.texi:14299 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-hold-time" #. type: deftypevr -#: doc/guix.texi:14305 +#: doc/guix.texi:14303 msgid "Specifies the maximum time a job may remain in the @code{indefinite} hold state before it is canceled. A value of 0 disables cancellation of held jobs." msgstr "Gibt die maximale Zeitdauer an, die ein Druckauftrag im Haltezustand @code{indefinite} bleiben darf, bevor er abgebrochen wird. Ein Wert von 0 deaktiviert ein Abbrechen gehaltener Druckaufträge." #. type: deftypevr -#: doc/guix.texi:14309 +#: doc/guix.texi:14307 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-jobs" #. type: deftypevr -#: doc/guix.texi:14312 +#: doc/guix.texi:14310 msgid "Specifies the maximum number of simultaneous jobs that are allowed. Set to 0 to allow an unlimited number of jobs." msgstr "Gibt die Maximalzahl gleichzeitiger Druckaufträge an, die noch zugelassen wird. Wenn Sie es auf 0 setzen, wird die Anzahl Druckaufträge @emph{nicht} beschränkt." #. type: deftypevr -#: doc/guix.texi:14314 +#: doc/guix.texi:14312 msgid "Defaults to @samp{500}." msgstr "Die Vorgabe ist @samp{500}." #. type: deftypevr -#: doc/guix.texi:14316 +#: doc/guix.texi:14314 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-jobs-per-printer" #. type: deftypevr -#: doc/guix.texi:14319 +#: doc/guix.texi:14317 msgid "Specifies the maximum number of simultaneous jobs that are allowed per printer. A value of 0 allows up to MaxJobs jobs per printer." msgstr "Gibt die Maximalzahl gleichzeitiger Druckaufträge an, die pro Drucker zugelassen werden. Ein Wert von 0 lässt bis zu MaxJobs-viele Druckaufträge pro Drucker zu." #. type: deftypevr -#: doc/guix.texi:14323 +#: doc/guix.texi:14321 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-jobs-per-user" #. type: deftypevr -#: doc/guix.texi:14326 +#: doc/guix.texi:14324 msgid "Specifies the maximum number of simultaneous jobs that are allowed per user. A value of 0 allows up to MaxJobs jobs per user." msgstr "Gibt die Maximalzahl gleichzeitiger Druckaufträge an, die pro Benutzer zugelassen werden. Ein Wert von 0 lässt bis zu MaxJobs-viele Druckaufträge pro Benutzer zu." #. type: deftypevr -#: doc/guix.texi:14330 +#: doc/guix.texi:14328 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-job-time" #. type: deftypevr -#: doc/guix.texi:14333 +#: doc/guix.texi:14331 msgid "Specifies the maximum time a job may take to print before it is canceled, in seconds. Set to 0 to disable cancellation of \"stuck\" jobs." msgstr "Gibt die maximale Anzahl an, wie oft das Drucken eines Druckauftrags versucht werden kann, bis er abgebrochen wird, in Sekunden. Wenn Sie es auf 0 setzen, wird das Abbrechen „feststeckender“ Druckaufträge deaktiviert." #. type: deftypevr -#: doc/guix.texi:14335 +#: doc/guix.texi:14333 msgid "Defaults to @samp{10800}." msgstr "Die Vorgabe ist @samp{10800}." #. type: deftypevr -#: doc/guix.texi:14337 +#: doc/guix.texi:14335 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl max-log-size" #. type: deftypevr -#: doc/guix.texi:14340 +#: doc/guix.texi:14338 msgid "Specifies the maximum size of the log files before they are rotated, in bytes. The value 0 disables log rotation." msgstr "Gibt die Maximalgröße der Protokolldateien an, bevor sie rotiert werden, in Bytes. Beim Wert 0 wird Protokollrotation deaktiviert." #. type: deftypevr -#: doc/guix.texi:14342 +#: doc/guix.texi:14340 msgid "Defaults to @samp{1048576}." msgstr "Die Vorgabe ist @samp{1048576}." #. type: deftypevr -#: doc/guix.texi:14344 +#: doc/guix.texi:14342 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl multiple-operation-timeout" #. type: deftypevr -#: doc/guix.texi:14347 +#: doc/guix.texi:14345 msgid "Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds." msgstr "Gibt die maximale Zeitdauer an, wie lange es zwischen Dateien in einem Druckauftrag mit mehreren Dateien dauern darf, in Sekunden." #. type: deftypevr -#: doc/guix.texi:14349 doc/guix.texi:14563 doc/guix.texi:20080 +#: doc/guix.texi:14347 doc/guix.texi:14561 doc/guix.texi:20077 msgid "Defaults to @samp{300}." msgstr "Die Vorgabe ist @samp{300}." #. type: deftypevr -#: doc/guix.texi:14351 +#: doc/guix.texi:14349 #, no-wrap msgid "{@code{cups-configuration} parameter} string page-log-format" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette page-log-format" #. type: deftypevr -#: doc/guix.texi:14356 +#: doc/guix.texi:14354 msgid "Specifies the format of PageLog lines. Sequences beginning with percent (@samp{%}) characters are replaced with the corresponding information, while all other characters are copied literally. The following percent sequences are recognized:" msgstr "Gibt das Format der Zeilen im PageLog-Seitenprotokoll an. Folgen, die mit Prozentzeichen (@samp{%}) beginnen, werden durch die jeweils zugehörigen Informationen ersetzt, während alle anderen Zeichen wortwörtlich übernommen werden. Die folgenden Prozentfolgen werden erkannt:" #. type: item -#: doc/guix.texi:14358 +#: doc/guix.texi:14356 #, no-wrap msgid "%%" msgstr "%%" #. type: table -#: doc/guix.texi:14360 +#: doc/guix.texi:14358 msgid "insert a single percent character" msgstr "ein einzelnes Prozentzeichen einfügen" #. type: item -#: doc/guix.texi:14361 +#: doc/guix.texi:14359 #, no-wrap msgid "%@{name@}" msgstr "%@{name@}" #. type: table -#: doc/guix.texi:14363 +#: doc/guix.texi:14361 msgid "insert the value of the specified IPP attribute" msgstr "den Wert des angegebenen IPP-Attributs einfügen" #. type: item -#: doc/guix.texi:14364 +#: doc/guix.texi:14362 #, no-wrap msgid "%C" msgstr "%C" #. type: table -#: doc/guix.texi:14366 +#: doc/guix.texi:14364 msgid "insert the number of copies for the current page" msgstr "die Anzahl der Kopien der aktuellen Seite einfügen" #. type: item -#: doc/guix.texi:14367 +#: doc/guix.texi:14365 #, no-wrap msgid "%P" msgstr "%P" #. type: table -#: doc/guix.texi:14369 +#: doc/guix.texi:14367 msgid "insert the current page number" msgstr "die aktuelle Seitenzahl einfügen" #. type: item -#: doc/guix.texi:14370 +#: doc/guix.texi:14368 #, no-wrap msgid "%T" msgstr "%T" #. type: table -#: doc/guix.texi:14372 +#: doc/guix.texi:14370 msgid "insert the current date and time in common log format" msgstr "das aktuelle Datum und Uhrzeit im allgemeinen Protokollformat einfügen" #. type: item -#: doc/guix.texi:14373 +#: doc/guix.texi:14371 #, no-wrap msgid "%j" msgstr "%j" #. type: table -#: doc/guix.texi:14375 +#: doc/guix.texi:14373 msgid "insert the job ID" msgstr "den Druckauftragsidentifikator („Job-ID“) einfügen" #. type: item -#: doc/guix.texi:14376 doc/guix.texi:15953 +#: doc/guix.texi:14374 doc/guix.texi:15950 #, no-wrap msgid "%p" msgstr "%p" #. type: table -#: doc/guix.texi:14378 +#: doc/guix.texi:14376 msgid "insert the printer name" msgstr "den Druckernamen einfügen" #. type: item -#: doc/guix.texi:14379 doc/guix.texi:15976 +#: doc/guix.texi:14377 doc/guix.texi:15973 #, no-wrap msgid "%u" msgstr "%u" #. type: table -#: doc/guix.texi:14381 +#: doc/guix.texi:14379 msgid "insert the username" msgstr "den Benutzernamen einfügen" #. type: deftypevr -#: doc/guix.texi:14387 +#: doc/guix.texi:14385 msgid "A value of the empty string disables page logging. The string @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} %@{media@} %@{sides@}} creates a page log with the standard items." msgstr "Wird die leere Zeichenkette als Wert angegeben, wird Seitenprotokollierung abgeschaltet. Die Zeichenkette @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} %@{media@} %@{sides@}} erzeugt ein Seitenprotokoll mit den üblichen Elementen." #. type: deftypevr -#: doc/guix.texi:14391 +#: doc/guix.texi:14389 #, no-wrap msgid "{@code{cups-configuration} parameter} environment-variables environment-variables" msgstr "{@code{cups-configuration}-Parameter} Umgebungsvariable environment-variables" #. type: deftypevr -#: doc/guix.texi:14394 +#: doc/guix.texi:14392 msgid "Passes the specified environment variable(s) to child processes; a list of strings." msgstr "Übergibt die angegebene(n) Umgebungsvariable(n) an Kindprozesse, als Liste von Zeichenketten." #. type: deftypevr -#: doc/guix.texi:14398 +#: doc/guix.texi:14396 #, no-wrap msgid "{@code{cups-configuration} parameter} policy-configuration-list policies" msgstr "{@code{cups-configuration}-Parameter} „policy-configuration“-Liste policies" #. type: deftypevr -#: doc/guix.texi:14400 +#: doc/guix.texi:14398 msgid "Specifies named access control policies." msgstr "Gibt die benannten Zugriffssteuerungsrichtlinien an." #. type: deftypevr -#: doc/guix.texi:14402 +#: doc/guix.texi:14400 msgid "Available @code{policy-configuration} fields are:" msgstr "Verfügbare @code{policy-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14403 +#: doc/guix.texi:14401 #, no-wrap msgid "{@code{policy-configuration} parameter} string name" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:14405 +#: doc/guix.texi:14403 msgid "Name of the policy." msgstr "Der Name der Richtlinie." #. type: deftypevr -#: doc/guix.texi:14407 +#: doc/guix.texi:14405 #, no-wrap msgid "{@code{policy-configuration} parameter} string job-private-access" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette job-private-access" #. type: deftypevr -#: doc/guix.texi:14417 +#: doc/guix.texi:14415 msgid "Specifies an access list for a job's private values. @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. @code{@@OWNER} maps to the job's owner. @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file. Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group. The access list may also be simply @code{all} or @code{default}." msgstr "Gibt eine Zugriffsliste der privaten Werte eines Druckauftrags an. @code{@@ACL} wird auf die Werte von requesting-user-name-allowed oder requesting-user-name-denied des Druckers abgebildet. @code{@@OWNER} wird auf den Besitzer des Druckauftrags abgebildet. @code{@@SYSTEM} wird auf die Gruppen abgebildet, die im @code{system-group}-Feld der @code{files-config}-Konfiguration aufgelistet sind, aus der die Datei @code{cups-files.conf(5)} erzeugt wird. Zu den anderen möglichen Elementen der Zugriffsliste gehören Namen bestimmer Benutzerkonten und @code{@@@var{Benutzergruppe}}, was für Mitglieder einer bestimmten Benutzergruppe steht. Die Zugriffsliste kann auch einfach als @code{all} oder @code{default} festgelegt werden." #. type: deftypevr -#: doc/guix.texi:14419 doc/guix.texi:14441 +#: doc/guix.texi:14417 doc/guix.texi:14439 msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}." msgstr "Die Vorgabe ist @samp{\"@@OWNER @@SYSTEM\"}." #. type: deftypevr -#: doc/guix.texi:14421 +#: doc/guix.texi:14419 #, no-wrap msgid "{@code{policy-configuration} parameter} string job-private-values" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette job-private-values" #. type: deftypevr -#: doc/guix.texi:14424 doc/guix.texi:14446 +#: doc/guix.texi:14422 doc/guix.texi:14444 msgid "Specifies the list of job values to make private, or @code{all}, @code{default}, or @code{none}." msgstr "Gibt die Liste der Druckauftragswerte an, die geschützt werden sollten, oder @code{all}, @code{default} oder @code{none}." #. type: deftypevr -#: doc/guix.texi:14427 +#: doc/guix.texi:14425 msgid "Defaults to @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}." msgstr "Die Vorgabe ist @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}." #. type: deftypevr -#: doc/guix.texi:14429 +#: doc/guix.texi:14427 #, no-wrap msgid "{@code{policy-configuration} parameter} string subscription-private-access" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette subscription-private-access" #. type: deftypevr -#: doc/guix.texi:14439 +#: doc/guix.texi:14437 msgid "Specifies an access list for a subscription's private values. @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values. @code{@@OWNER} maps to the job's owner. @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file. Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group. The access list may also be simply @code{all} or @code{default}." msgstr "Gibt eine Zugriffsliste für die privaten Werte eines Abonnements an. @code{@@ACL} wird auf die Werte von requesting-user-name-allowed oder requesting-user-name-denied des Druckers abgebildet. @code{@@OWNER} wird auf den Besitzer des Druckauftrags abgebildet. @code{@@SYSTEM} wird auf die Gruppen abgebildet, die im @code{system-group}-Feld der @code{files-config}-Konfiguration aufgelistet sind, aus der die Datei @code{cups-files.conf(5)} erzeugt wird. Zu den anderen möglichen Elementen der Zugriffsliste gehören Namen bestimmer Benutzerkonten und @code{@@@var{Benutzergruppe}}, was für Mitglieder einer bestimmten Benutzergruppe steht. Die Zugriffsliste kann auch einfach als @code{all} oder @code{default} festgelegt werden." #. type: deftypevr -#: doc/guix.texi:14443 +#: doc/guix.texi:14441 #, no-wrap msgid "{@code{policy-configuration} parameter} string subscription-private-values" msgstr "{@code{policy-configuration}-Parameter} Zeichenkette subscription-private-values" #. type: deftypevr -#: doc/guix.texi:14449 +#: doc/guix.texi:14447 msgid "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}." msgstr "Die Vorgabe ist @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}." #. type: deftypevr -#: doc/guix.texi:14451 +#: doc/guix.texi:14449 #, no-wrap msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls" msgstr "{@code{policy-configuration}-Parameter} „operation-access-controls“-Liste access-controls" #. type: deftypevr -#: doc/guix.texi:14453 +#: doc/guix.texi:14451 msgid "Access control by IPP operation." msgstr "Zugriffssteuerung durch IPP-Betrieb." #. type: deftypevr -#: doc/guix.texi:14458 +#: doc/guix.texi:14456 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck-oder-Nichtnegative-ganze-Zahl preserve-job-files" #. type: deftypevr -#: doc/guix.texi:14463 +#: doc/guix.texi:14461 msgid "Specifies whether job files (documents) are preserved after a job is printed. If a numeric value is specified, job files are preserved for the indicated number of seconds after printing. Otherwise a boolean value applies indefinitely." msgstr "Gibt an, ob die Dateien eines Druckauftrags (Dokumente) erhalten bleiben, nachdem ein Druckauftrag ausgedruckt wurde. Wenn eine Zahl angegeben wird, bleiben die Dateien des Druckauftrags für die angegebene Zahl von Sekunden nach dem Drucken erhalten. Ein boolescher Wert bestimmt ansonsten, ob sie auf unbestimmte Zeit erhalten bleiben." #. type: deftypevr -#: doc/guix.texi:14465 +#: doc/guix.texi:14463 msgid "Defaults to @samp{86400}." msgstr "Die Vorgabe ist @samp{86400}." #. type: deftypevr -#: doc/guix.texi:14467 +#: doc/guix.texi:14465 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history" -msgstr "{@code{cups-configuration} parameter} Boolescher-Ausdruck-oder-Nichtnegative-ganze-Zahl preserve-job-history" +msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck-oder-Nichtnegative-ganze-Zahl preserve-job-history" #. type: deftypevr -#: doc/guix.texi:14472 +#: doc/guix.texi:14470 msgid "Specifies whether the job history is preserved after a job is printed. If a numeric value is specified, the job history is preserved for the indicated number of seconds after printing. If @code{#t}, the job history is preserved until the MaxJobs limit is reached." msgstr "Gibt an, ob der Druckauftragsverlauf nach dem Drucken eines Druckauftrags erhalten bleibt. Wenn eine Zahl angegeben wird, bleibt der Druckauftragsverlauf für die angegebene Zahl von Sekunden nach dem Drucken erhalten. Bei @code{#t} bleibt der Druckauftragsverlauf so lange erhalten, bis die MaxJobs-Beschränkung erreicht wurde." #. type: deftypevr -#: doc/guix.texi:14476 +#: doc/guix.texi:14474 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl reload-timeout" #. type: deftypevr -#: doc/guix.texi:14479 +#: doc/guix.texi:14477 msgid "Specifies the amount of time to wait for job completion before restarting the scheduler." msgstr "Gibt an, wie lange vor dem Neustart des Planungsprogramms auf den Abschluss eines Druckauftrages gewartet wird." #. type: deftypevr -#: doc/guix.texi:14483 +#: doc/guix.texi:14481 #, no-wrap msgid "{@code{cups-configuration} parameter} string rip-cache" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette rip-cache" #. type: deftypevr -#: doc/guix.texi:14486 +#: doc/guix.texi:14484 msgid "Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer." msgstr "Gibt die maximale Menge an genutztem Arbeitsspeicher für das Konvertieren von Dokumenten in eine Rastergrafik (eine „Bitmap“) für einen Drucker an." #. type: deftypevr -#: doc/guix.texi:14488 +#: doc/guix.texi:14486 msgid "Defaults to @samp{\"128m\"}." msgstr "Die Vorgabe ist @samp{\"128m\"}." #. type: deftypevr -#: doc/guix.texi:14490 +#: doc/guix.texi:14488 #, no-wrap msgid "{@code{cups-configuration} parameter} string server-admin" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette server-admin" #. type: deftypevr -#: doc/guix.texi:14492 +#: doc/guix.texi:14490 msgid "Specifies the email address of the server administrator." msgstr "Gibt die E-Mail-Adresse des Serveradministrators an." #. type: deftypevr -#: doc/guix.texi:14494 +#: doc/guix.texi:14492 msgid "Defaults to @samp{\"root@@localhost.localdomain\"}." msgstr "Die Vorgabe ist @samp{\"root@@localhost.localdomain\"}." #. type: deftypevr -#: doc/guix.texi:14496 +#: doc/guix.texi:14494 #, no-wrap msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias" msgstr "{@code{cups-configuration}-Parameter} Rechnernamens-Liste-oder-* server-alias" #. type: deftypevr -#: doc/guix.texi:14504 +#: doc/guix.texi:14502 msgid "The ServerAlias directive is used for HTTP Host header validation when clients connect to the scheduler from external interfaces. Using the special name @code{*} can expose your system to known browser-based DNS rebinding attacks, even when accessing sites through a firewall. If the auto-discovery of alternate names does not work, we recommend listing each alternate name with a ServerAlias directive instead of using @code{*}." msgstr "Die ServerAlias-Direktive wird zur Prüfung der HTTP-Host-Kopfzeile benutzt, wenn sich Clients mit dem Planungsprogramm über externe Schnittstellen verbinden. Wenn der besondere Name @code{*} benutzt wird, könnte Ihr System möglicherweise bekannten browserbasierten DNS-Rebinding-Angriffen ausgesetzt werden, selbst wenn auf die Angebote nur über eine Firewall zugegriffen wird. Wenn alternative Namen nicht automatisch erkannt werden, empfehlen wir, jeden alternativen Namen in der ServerAlias-Direktive aufzulisten, statt @code{*} zu benutzen." #. type: deftypevr -#: doc/guix.texi:14506 +#: doc/guix.texi:14504 msgid "Defaults to @samp{*}." msgstr "Die Vorgabe ist @samp{*}." #. type: deftypevr -#: doc/guix.texi:14508 +#: doc/guix.texi:14506 #, no-wrap msgid "{@code{cups-configuration} parameter} string server-name" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette server-name" #. type: deftypevr -#: doc/guix.texi:14510 +#: doc/guix.texi:14508 msgid "Specifies the fully-qualified host name of the server." msgstr "Gibt den vollständigen Rechnernamen („Fully-Qualified Host Name“) des Servers an." #. type: deftypevr -#: doc/guix.texi:14512 doc/guix.texi:17904 doc/guix.texi:17948 +#: doc/guix.texi:14510 doc/guix.texi:17901 doc/guix.texi:17945 msgid "Defaults to @samp{\"localhost\"}." msgstr "Die Vorgabe ist @samp{\"localhost\"}." #. type: deftypevr -#: doc/guix.texi:14514 +#: doc/guix.texi:14512 #, no-wrap msgid "{@code{cups-configuration} parameter} server-tokens server-tokens" msgstr "{@code{cups-configuration}-Parameter} Server-Tokens server-tokens" #. type: deftypevr -#: doc/guix.texi:14522 +#: doc/guix.texi:14520 msgid "Specifies what information is included in the Server header of HTTP responses. @code{None} disables the Server header. @code{ProductOnly} reports @code{CUPS}. @code{Major} reports @code{CUPS 2}. @code{Minor} reports @code{CUPS 2.0}. @code{Minimal} reports @code{CUPS 2.0.0}. @code{OS} reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the @code{uname} command. @code{Full} reports @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}." msgstr "Gibt an, welche Informationen in der Server-Kopfzeile von HTTP-Antworten vorkommen. @code{None} deaktiviert die Server-Kopfzeile. @code{ProductOnly} liefert @code{CUPS}. @code{Major} liefert @code{CUPS 2}. @code{Minor} liefert @code{CUPS 2.0}. @code{Minimal} liefert @code{CUPS 2.0.0}. @code{OS} liefert @code{CUPS 2.0.0 (@var{uname})}, wobei @var{uname} die Ausgabe des Befehls @code{uname} ist. @code{Full} liefert @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}." #. type: deftypevr -#: doc/guix.texi:14524 +#: doc/guix.texi:14522 msgid "Defaults to @samp{Minimal}." msgstr "Die Vorgabe ist @samp{Minimal}." #. type: deftypevr -#: doc/guix.texi:14526 +#: doc/guix.texi:14524 #, no-wrap msgid "{@code{cups-configuration} parameter} string set-env" msgstr "{@code{cups-configuration}-Parameter} Zeichenkette set-env" #. type: deftypevr -#: doc/guix.texi:14528 +#: doc/guix.texi:14526 msgid "Set the specified environment variable to be passed to child processes." msgstr "Legt die angegebene Umgebungsvariable auf einen Wert (englisch „Value“) fest, die an Kindprozesse übergeben wird." #. type: deftypevr -#: doc/guix.texi:14530 +#: doc/guix.texi:14528 msgid "Defaults to @samp{\"variable value\"}." msgstr "Die Vorgabe ist @samp{\"variable value\"}." #. type: deftypevr -#: doc/guix.texi:14532 +#: doc/guix.texi:14530 #, no-wrap msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen" msgstr "{@code{cups-configuration}-Parameter} Mehrzeilige-Zeichenketten-Liste ssl-listen" #. type: deftypevr -#: doc/guix.texi:14537 +#: doc/guix.texi:14535 msgid "Listens on the specified interfaces for encrypted connections. Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses." msgstr "Lauscht auf den angegebenen Schnittstellen auf verschlüsselte Verbindungen. Gültige Werte haben die Form @var{Adresse}:@var{Port}, wobei die @var{Adresse} entweder eine von eckigen Klammern umschlossene IPv6-Adresse, eine IPv4-Adresse oder @code{*} ist; letztere steht für alle Adressen." #. type: deftypevr -#: doc/guix.texi:14541 +#: doc/guix.texi:14539 #, no-wrap msgid "{@code{cups-configuration} parameter} ssl-options ssl-options" msgstr "{@code{cups-configuration}-Parameter} SSL-Optionen ssl-options" #. type: deftypevr -#: doc/guix.texi:14548 +#: doc/guix.texi:14546 msgid "Sets encryption options. By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. The @code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0." msgstr "Legt Verschlüsselungsoptionen fest. Nach Vorgabe unterstützt CUPS nur Verschlüsselung mit TLS v1.0 oder höher mit bekannten, sicheren „Cipher Suites“. Die Option @code{AllowRC4} aktiviert die 128-Bit-RC4-Cipher-Suites, die manche alten Clients brauchen, weil sie neuere nicht implementieren. Die Option @code{AllowSSL3} aktiviert SSL v3.0, das manche alte Clients brauchen, die TLS v1.0 nicht implementieren." #. type: deftypevr -#: doc/guix.texi:14552 +#: doc/guix.texi:14550 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean strict-conformance?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck strict-conformance?" #. type: deftypevr -#: doc/guix.texi:14555 +#: doc/guix.texi:14553 msgid "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications." msgstr "Gibt an, ob das Druckplanungsprogramm von Clients fordert, dass sie sich strikt an die IPP-Spezifikationen halten." #. type: deftypevr -#: doc/guix.texi:14559 +#: doc/guix.texi:14557 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer timeout" msgstr "{@code{cups-configuration}-Parameter} Nichtnegative-ganze-Zahl timeout" #. type: deftypevr -#: doc/guix.texi:14561 +#: doc/guix.texi:14559 msgid "Specifies the HTTP request timeout, in seconds." msgstr "Gibt die Zeitbeschränkung für HTTP-Anfragen an, in Sekunden." #. type: deftypevr -#: doc/guix.texi:14566 +#: doc/guix.texi:14564 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean web-interface?" msgstr "{@code{cups-configuration}-Parameter} Boolescher-Ausdruck web-interface?" #. type: deftypevr -#: doc/guix.texi:14568 +#: doc/guix.texi:14566 msgid "Specifies whether the web interface is enabled." msgstr "Gibt an, ob die Weboberfläche zur Verfügung gestellt wird." #. type: Plain text -#: doc/guix.texi:14578 +#: doc/guix.texi:14576 msgid "At this point you're probably thinking ``oh dear, Guix manual, I like you but you can stop already with the configuration options''. Indeed. However, one more point: it could be that you have an existing @code{cupsd.conf} that you want to use. In that case, you can pass an @code{opaque-cups-configuration} as the configuration of a @code{cups-service-type}." msgstr "Mittlerweile denken Sie wahrscheinlich: „Ich bitte dich, Guix-Handbuch, ich mag dich, aber kannst du jetzt bitte mit den Konfigurationsoptionen aufhören?“ Damit hätten Sie recht. Allerdings sollte ein weitere Punkt noch erwähnt werden: Vielleicht haben Sie eine bestehende @code{cupsd.conf}, die Sie verwenden möchten. In diesem Fall können Sie eine @code{opaque-cups-configuration} als die Konfiguration eines @code{cups-service-type} übergeben." #. type: Plain text -#: doc/guix.texi:14580 +#: doc/guix.texi:14578 msgid "Available @code{opaque-cups-configuration} fields are:" msgstr "Verfügbare @code{opaque-cups-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:14581 +#: doc/guix.texi:14579 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} package cups" msgstr "{@code{opaque-cups-configuration}-Parameter} „package“ cups" #. type: deftypevr -#: doc/guix.texi:14585 +#: doc/guix.texi:14583 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf" msgstr "{@code{opaque-cups-configuration}-Parameter} Zeichenkette cupsd.conf" #. type: deftypevr -#: doc/guix.texi:14587 +#: doc/guix.texi:14585 msgid "The contents of the @code{cupsd.conf}, as a string." msgstr "Der Inhalt der Datei @code{cupsd.conf} als eine Zeichenkette." #. type: deftypevr -#: doc/guix.texi:14589 +#: doc/guix.texi:14587 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf" msgstr "{@code{opaque-cups-configuration}-Parameter} Zeichenkette cups-files.conf" #. type: deftypevr -#: doc/guix.texi:14591 +#: doc/guix.texi:14589 msgid "The contents of the @code{cups-files.conf} file, as a string." msgstr "Der Inhalt der Datei @code{cups-files.conf} als eine Zeichenkette." #. type: Plain text -#: doc/guix.texi:14596 +#: doc/guix.texi:14594 msgid "For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in strings of the same name, you could instantiate a CUPS service like this:" msgstr "Wenn Ihre @code{cupsd.conf} und @code{cups-files.conf} zum Beispiel in Zeichenketten mit dem entsprechenden Namen definiert sind, könnten Sie auf diese Weise einen CUPS-Dienst instanziieren:" #. type: example -#: doc/guix.texi:14602 +#: doc/guix.texi:14600 #, no-wrap msgid "" "(service cups-service-type\n" @@ -27191,195 +27202,197 @@ msgstr "" " (cups-files.conf cups-files.conf)))\n" #. type: Plain text -#: doc/guix.texi:14613 +#: doc/guix.texi:14611 msgid "The @code{(gnu services desktop)} module provides services that are usually useful in the context of a ``desktop'' setup---that is, on a machine running a graphical display server, possibly with graphical user interfaces, etc. It also defines services that provide specific desktop environments like GNOME, Xfce or MATE." msgstr "Das Modul @code{(gnu services desktop)} stellt Dienste zur Verfügung, die meistens bei „Desktop“-Einrichtungen für grafische Nutzung praktisch sind — also auf einer Maschine mit einem grafischem Anzeigeserver, vielleicht mit einer grafischen Benutzeroberfläche, usw. Im Modul werden auch Dienste definiert, die bestimmte Arbeitsumgebungen wie GNOME, Xfce oder MATE bereitstellen." #. type: Plain text -#: doc/guix.texi:14617 +#: doc/guix.texi:14615 msgid "To simplify things, the module defines a variable containing the set of services that users typically expect on a machine with a graphical environment and networking:" msgstr "Um es einfacher zu machen, definiert das Modul auch eine Variable mit denjenigen Diensten, die man auf einer Maschine mit einer grafischen Umgebung und Netzwerkunterstützung erwarten würde:" #. type: defvr -#: doc/guix.texi:14618 +#: doc/guix.texi:14616 #, no-wrap msgid "{Scheme Variable} %desktop-services" msgstr "{Scheme-Variable} %desktop-services" #. type: defvr -#: doc/guix.texi:14621 +#: doc/guix.texi:14619 msgid "This is a list of services that builds upon @var{%base-services} and adds or adjusts services for a typical ``desktop'' setup." msgstr "Dies ist eine Liste von Diensten, die @var{%base-services} ergänzt und weitere Dienste hinzufügt oder bestehende anpasst, um für eine normale „Desktop“-Nutzung geeignet zu sein." #. type: defvr -#: doc/guix.texi:14632 -msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}) with modem support (@pxref{Networking Services, @code{modem-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." +#: doc/guix.texi:14629 +#, fuzzy +#| msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}) with modem support (@pxref{Networking Services, @code{modem-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." +msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." msgstr "Insbesondere wird eine grafische Anmeldeverwaltung hinzugefügt (siehe @ref{X Window, @code{gdm-service-type}}), ebenso Programme zur Bildschirmsperre, ein Werkzeug zur Netzwerkverwaltung (siehe @ref{Networking Services, @code{network-manager-service-type}}) mit Unterstützung für Modems (siehe @ref{Networking Services, @code{modem-manager-service-type}}), Energieverbrauchs- und Farbverwaltungsdienste, Anmeldungs- und Sitzungsverwaltung über @code{elogind}, der Berechtigungsdienst Polkit, der Ortungsdienst GeoClue, der AccountsService-Daemon, mit dem autorisierte Benutzer Systempasswörter ändern können, ein NTP-Client (siehe @ref{Networking Services}) und der Avahi-Daemon. Außerdem wird der Name Service Switch konfiguriert, damit er @code{nss-mdns} benutzt (siehe @ref{Name Service Switch, mDNS})." #. type: Plain text -#: doc/guix.texi:14637 +#: doc/guix.texi:14634 msgid "The @var{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}})." msgstr "Die @var{%desktop-services}-Variable kann als das @code{services}-Feld einer @code{operating-system}-Deklaration genutzt werden (siehe @ref{operating-system Reference, @code{services}})." #. type: Plain text -#: doc/guix.texi:14660 +#: doc/guix.texi:14657 msgid "Additionally, the @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type} and @code{enlightenment-desktop-service-type} procedures can add GNOME, Xfce, MATE and/or Enlightenment to a system. To ``add GNOME'' means that system-level services like the backlight adjustment helpers and the power management utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, adding a service made by @code{gnome-desktop-service-type} adds the GNOME metapackage to the system profile. Likewise, adding the Xfce service not only adds the @code{xfce} metapackage to the system profile, but it also gives the Thunar file manager the ability to open a ``root-mode'' file management window, if the user authenticates using the administrator's password via the standard polkit graphical interface. To ``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces. Additionally, adding a service of type @code{mate-desktop-service-type} adds the MATE metapackage to the system profile. ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other functionality to work as expetected." msgstr "Daneben können die Prozeduren @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type} und @code{enlightenment-desktop-service-type} jeweils GNOME, Xfce, MATE und/oder Enlightenment zu einem System hinzufügen. „GNOME hinzufügen“ bedeutet, dass Dienste auf Systemebene wie z.B.@: Hilfsprogramme zur Anpassung der Hintergrundbeleuchtung und des Energieverbrauchs zum System hinzugefügt werden und @code{polkit} und @code{dbus} entsprechend erweitert werden, wodurch GNOME mit erhöhten Berechtigungen auf eine begrenzte Zahl von speziellen Systemschnittstellen zugreifen kann. Zusätzlich bedeutet das Hinzufügen eines durch @code{gnome-desktop-service-type} erzeugten Dienstes, dass das GNOME-Metapaket ins Systemprofil eingefügt wird. Genauso wird beim Einfügen des Xfce-Dienstes nicht nur das @code{xfce}-Metapaket zum Systemprofil hinzugefügt, sondern dem Thunar-Dateiverwaltungsprogramm wird auch die Berechtigung gegeben, ein Fenster mit Administratorrechten zu öffnen, wenn der Benutzer sich mit dem Administratorpasswort über die standardmäßige grafische Oberfläche von Polkit authentiziert. „MATE hinzufügen“ bedeutet, dass @code{polkit} und @code{dbus} entsprechend erweitert werden, wodurch MATE mit erhöhten Berechtigungen auf eine begrenzte Zahl von speziellen Systemschnittstellen zugreifen kann. Zusätzlich bedeutet das Hinzufügen eines durch @code{mate-desktop-service-type} erzeugten Dienstes, dass das MATE-Metapaket ins Systemprofil eingefügt wird. „Enlightenment hinzufügen“ bedeutet, dass @code{dbus} entsprechend erweitert wird und mehrere Binärdateien von Enlightenment als setuid eingerichtet werden, wodurch das Programm zum Sperren des Bildschirms und andere Funktionen von Enlightenment wie erwartet funktionieren." #. type: Plain text -#: doc/guix.texi:14669 +#: doc/guix.texi:14666 msgid "The desktop environments in Guix use the Xorg display server by default. If you'd like to use the newer display server protocol called Wayland, you need to use the @code{sddm-service} instead of GDM as the graphical login manager. You should then select the ``GNOME (Wayland)'' session in SDDM. Alternatively you can also try starting GNOME on Wayland manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session``. Currently only GNOME has support for Wayland." msgstr "Die Arbeitsumgebungen in Guix benutzen standardmäßig den Xorg-Anzeigeserver. Falls Sie das neuere Anzeigeserverprotokoll namens Wayland benutzen möchten, müssen Sie den Dienst @code{sddm-service} anstelle von GDM für die grafische Anmeldeverwaltung einrichten. Dann sollten Sie in SDDM die Sitzung „GNOME (Wayland)“ auswählen. Alternativ können Sie auch versuchen, GNOME mit Wayland manuell aus einer Konsole (TTY) mit dem Befehl „XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session“ zu starten. Derzeit wird Wayland nur von GNOME unterstützt." #. type: defvr -#: doc/guix.texi:14670 +#: doc/guix.texi:14667 #, no-wrap msgid "{Scheme Variable} gnome-desktop-service-type" msgstr "{Scheme-Variable} gnome-desktop-service-type" #. type: defvr -#: doc/guix.texi:14674 +#: doc/guix.texi:14671 msgid "This is the type of the service that adds the @uref{https://www.gnome.org, GNOME} desktop environment. Its value is a @code{gnome-desktop-configuration} object (see below.)" msgstr "Dies ist der Typ des Dienstes, der die @uref{https://www.gnome.org, GNOME-Arbeitsumgebung} bereitstellt. Sein Wert ist ein @code{gnome-desktop-configuration}-Objekt (siehe unten)." #. type: defvr -#: doc/guix.texi:14677 +#: doc/guix.texi:14674 msgid "This service adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}." msgstr "Dieser Dienst fügt das @code{gnome}-Paket zum Systemprofil hinzu und erweitert Polkit um die von @code{gnome-settings-daemon} benötigten Aktionen." #. type: deftp -#: doc/guix.texi:14679 +#: doc/guix.texi:14676 #, no-wrap msgid "{Data Type} gnome-desktop-configuration" msgstr "{Datentyp} gnome-desktop-configuration" #. type: deftp -#: doc/guix.texi:14681 +#: doc/guix.texi:14678 msgid "Configuration record for the GNOME desktop environment." msgstr "Verbundsobjekt für die Konfiguration der GNOME-Arbeitsumgebung." #. type: item -#: doc/guix.texi:14683 +#: doc/guix.texi:14680 #, no-wrap msgid "@code{gnome} (default: @code{gnome})" msgstr "@code{gnome} (Vorgabe: @code{gnome})" #. type: table -#: doc/guix.texi:14685 +#: doc/guix.texi:14682 msgid "The GNOME package to use." msgstr "Welches GNOME-Paket benutzt werden soll." #. type: defvr -#: doc/guix.texi:14688 +#: doc/guix.texi:14685 #, no-wrap msgid "{Scheme Variable} xfce-desktop-service-type" msgstr "{Scheme-Variable} xfce-desktop-service-type" #. type: defvr -#: doc/guix.texi:14692 +#: doc/guix.texi:14689 msgid "This is the type of a service to run the @uref{Xfce, https://xfce.org/} desktop environment. Its value is an @code{xfce-desktop-configuration} object (see below.)" msgstr "Der Typ des Dienstes, um die @uref{https://xfce.org/, Xfce-Arbeitsumgebung} auszuführen. Sein Wert ist ein @code{xfce-desktop-configuration}-Objekt (siehe unten)." #. type: defvr -#: doc/guix.texi:14697 +#: doc/guix.texi:14694 msgid "This service adds the @code{xfce} package to the system profile, and extends polkit with the ability for @code{thunar} to manipulate the file system as root from within a user session, after the user has authenticated with the administrator's password." msgstr "Dieser Dienst fügt das Paket @code{xfce} zum Systemprofil hinzu und erweitert Polkit, damit @code{thunar} befähigt wird, das Dateisystem aus einer Benutzersitzung heraus mit Administratorrechten zu bearbeiten, nachdem sich der Benutzer mit dem Administratorpasswort authentiziert hat." #. type: deftp -#: doc/guix.texi:14699 +#: doc/guix.texi:14696 #, no-wrap msgid "{Data Type} xfce-desktop-configuration" msgstr "{Datentyp} xfce-desktop-configuration" #. type: deftp -#: doc/guix.texi:14701 +#: doc/guix.texi:14698 msgid "Configuration record for the Xfce desktop environment." msgstr "Verbundstyp für Einstellungen zur Xfce-Arbeitsumgebung." #. type: item -#: doc/guix.texi:14703 +#: doc/guix.texi:14700 #, no-wrap msgid "@code{xfce} (default: @code{xfce})" msgstr "@code{xfce} (Vorgabe: @code{xfce})" #. type: table -#: doc/guix.texi:14705 +#: doc/guix.texi:14702 msgid "The Xfce package to use." msgstr "Das Xfce-Paket, was benutzt werden soll." #. type: deffn -#: doc/guix.texi:14708 +#: doc/guix.texi:14705 #, no-wrap msgid "{Scheme Variable} mate-desktop-service-type" msgstr "{Scheme-Variable} mate-desktop-service-type" #. type: deffn -#: doc/guix.texi:14712 +#: doc/guix.texi:14709 msgid "This is the type of the service that runs the @uref{https://mate-desktop.org/, MATE desktop environment}. Its value is a @code{mate-desktop-configuration} object (see below.)" msgstr "Dies ist der Typ des Dienstes, um die @uref{https://mate-desktop.org/, MATE-Arbeitsumgebung} auszuführen. Sein Wert ist ein @code{mate-desktop-configuration}-Objekt (siehe unten)." #. type: deffn -#: doc/guix.texi:14716 +#: doc/guix.texi:14713 msgid "This service adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}." msgstr "Dieser Dienst fügt das Paket @code{mate} ins Systemprofil ein und erweitert Polkit um die Aktionen aus dem @code{mate-settings-daemon}." #. type: deftp -#: doc/guix.texi:14718 +#: doc/guix.texi:14715 #, no-wrap msgid "{Data Type} mate-desktop-configuration" msgstr "{Datentyp} mate-desktop-configuration" #. type: deftp -#: doc/guix.texi:14720 +#: doc/guix.texi:14717 msgid "Configuration record for the MATE desktop environment." msgstr "Verbundstyp für die Einstellungen der MATE-Arbeitsumgebung." #. type: item -#: doc/guix.texi:14722 +#: doc/guix.texi:14719 #, no-wrap msgid "@code{mate} (default: @code{mate})" msgstr "@code{mate} (Vorgabe: @code{mate})" #. type: table -#: doc/guix.texi:14724 +#: doc/guix.texi:14721 msgid "The MATE package to use." msgstr "Das MATE-Paket, was benutzt werden soll." #. type: deffn -#: doc/guix.texi:14727 +#: doc/guix.texi:14724 #, no-wrap msgid "{Scheme Variable} enlightenment-desktop-service-type" msgstr "{Scheme-Variable} enlightenment-desktop-service-type" #. type: deffn -#: doc/guix.texi:14730 +#: doc/guix.texi:14727 msgid "Return a service that adds the @code{enlightenment} package to the system profile, and extends dbus with actions from @code{efl}." msgstr "Liefert einen Dienst, der das @code{enlightenment}-Paket zum Systemprofil hinzufügt und D-Bus mit den Aktionen aus @code{efl} erweitert." #. type: deftp -#: doc/guix.texi:14732 +#: doc/guix.texi:14729 #, no-wrap msgid "{Data Type} enlightenment-desktop-service-configuration" msgstr "{Datentyp} enlightenment-desktop-service-configuration" #. type: item -#: doc/guix.texi:14734 +#: doc/guix.texi:14731 #, no-wrap msgid "@code{enlightenment} (default: @code{enlightenment})" msgstr "@code{enlightenment} (Vorgabe: @code{enlightenment})" #. type: table -#: doc/guix.texi:14736 +#: doc/guix.texi:14733 msgid "The enlightenment package to use." msgstr "Das Enlightenment-Paket, was benutzt werden soll." #. type: Plain text -#: doc/guix.texi:14744 +#: doc/guix.texi:14741 msgid "Because the GNOME, Xfce and MATE desktop services pull in so many packages, the default @code{%desktop-services} variable doesn't include any of them by default. To add GNOME, Xfce or MATE, just @code{cons} them onto @code{%desktop-services} in the @code{services} field of your @code{operating-system}:" msgstr "Weil die Desktopdienste GNOME, Xfce und MATE so viele Pakete ins System mitnehmen, gehören diese nicht zu den Vorgaben in der @code{%desktop-services}-Variablen. Um GNOME, Xfce oder MATE hinzuzufügen, benutzen Sie einfach @code{cons} zum Anhängen an die @code{%desktop-services} im @code{services}-Feld Ihrer @code{operating-system}-Deklaration:" #. type: example -#: doc/guix.texi:14755 +#: doc/guix.texi:14752 #, no-wrap msgid "" "(use-modules (gnu))\n" @@ -27403,666 +27416,666 @@ msgstr "" " …)\n" #. type: Plain text -#: doc/guix.texi:14759 +#: doc/guix.texi:14756 msgid "These desktop environments will then be available as options in the graphical login window." msgstr "Diese Arbeitsumgebungen stehen dann im grafischen Anmeldefenster zur Auswahl." #. type: Plain text -#: doc/guix.texi:14763 +#: doc/guix.texi:14760 msgid "The actual service definitions included in @code{%desktop-services} and provided by @code{(gnu services dbus)} and @code{(gnu services desktop)} are described below." msgstr "Die eigentlichen Dienstdefinitionen, die in @code{%desktop-services} stehen und durch @code{(gnu services dbus)} und @code{(gnu services desktop)} zur Verfügung gestellt werden, werden im Folgenden beschrieben." #. type: deffn -#: doc/guix.texi:14764 +#: doc/guix.texi:14761 #, no-wrap msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]" msgstr "{Scheme-Prozedur} dbus-service [#:dbus @var{dbus}] [#:services '()]" #. type: deffn -#: doc/guix.texi:14767 +#: doc/guix.texi:14764 msgid "Return a service that runs the ``system bus'', using @var{dbus}, with support for @var{services}." msgstr "Liefert einen Dienst, der den „Systembus“ mit @var{dbus} ausführt, mit Unterstützung für die als @var{services} übergebenen Dienste." #. type: deffn -#: doc/guix.texi:14771 +#: doc/guix.texi:14768 msgid "@uref{https://dbus.freedesktop.org/, D-Bus} is an inter-process communication facility. Its system bus is used to allow system services to communicate and to be notified of system-wide events." msgstr "@uref{https://dbus.freedesktop.org/, D-Bus} ist eine Einrichtung zur Interprozesskommunikation. Deren Systembus wird benutzt, damit Systemdienste miteinander kommunizieren können und damit sie bei systemweiten Ereignissen benachrichtigt werden können." #. type: deffn -#: doc/guix.texi:14776 +#: doc/guix.texi:14773 msgid "@var{services} must be a list of packages that provide an @file{etc/dbus-1/system.d} directory containing additional D-Bus configuration and policy files. For example, to allow avahi-daemon to use the system bus, @var{services} must be equal to @code{(list avahi)}." msgstr "Als @var{services} muss eine Liste von Paketen übergeben werden, die ein Verzeichnis @file{etc/dbus-1/system.d} mit zusätzlichen D-Bus-Konfigurations- und Richtliniendateien enthalten. Damit zum Beispiel der Avahi-Daemon den Systembus benutzen kann, muss @var{services} gleich @code{(list avahi)} sein." #. type: deffn -#: doc/guix.texi:14778 +#: doc/guix.texi:14775 #, no-wrap msgid "{Scheme Procedure} elogind-service [#:config @var{config}]" msgstr "{Scheme-Prozedur} elogind-service [#:config @var{Konfiguration}]" #. type: deffn -#: doc/guix.texi:14784 +#: doc/guix.texi:14781 msgid "Return a service that runs the @code{elogind} login and seat management daemon. @uref{https://github.com/elogind/elogind, Elogind} exposes a D-Bus interface that can be used to know which users are logged in, know what kind of sessions they have open, suspend the system, inhibit system suspend, reboot the system, and other tasks." msgstr "Liefert einen Dienst, der den Anmelde- und Sitzungsdaemon @code{elogind} ausführt. @uref{https://github.com/elogind/elogind, Elogind} stellt eine D-Bus-Schnittstelle bereit, über die ausgelesen werden kann, welche Benutzer angemeldet sind und welche Sitzungen sie geöffnet haben, und außerdem das System in Bereitschaft versetzt werden kann, der Bereitschaftsmodus unterdrückt werden kann, das System neu gestartet werden kann und anderes." #. type: deffn -#: doc/guix.texi:14788 +#: doc/guix.texi:14785 msgid "Elogind handles most system-level power events for a computer, for example suspending the system when a lid is closed, or shutting it down when the power button is pressed." msgstr "Die meisten Energieereignisse auf Systemebene in einem Rechner werden von elogind behandelt, wie etwa ein Versetzen des Systems in Bereitschaft, wenn der Rechner zugeklappt wird, oder ein Herunterfahren beim Drücken des Stromschalters." #. type: deffn -#: doc/guix.texi:14793 +#: doc/guix.texi:14790 msgid "The @var{config} keyword argument specifies the configuration for elogind, and should be the result of an @code{(elogind-configuration (@var{parameter} @var{value})...)} invocation. Available parameters and their default values are:" msgstr "Das @var{config}-Schlüsselwort gibt die Konfiguration für elogind an und sollte das Ergebnis eines Aufrufs von @code{(elogind-configuration (@var{Parameter} @var{Wert})...)} sein. Verfügbare Parameter und ihre Vorgabewerte sind:" #. type: item -#: doc/guix.texi:14795 +#: doc/guix.texi:14792 #, no-wrap msgid "kill-user-processes?" msgstr "kill-user-processes?" #. type: code{#1} -#: doc/guix.texi:14797 doc/guix.texi:14815 doc/guix.texi:14817 -#: doc/guix.texi:14819 doc/guix.texi:14831 +#: doc/guix.texi:14794 doc/guix.texi:14812 doc/guix.texi:14814 +#: doc/guix.texi:14816 doc/guix.texi:14828 msgid "#f" msgstr "#f" #. type: item -#: doc/guix.texi:14797 +#: doc/guix.texi:14794 #, no-wrap msgid "kill-only-users" msgstr "kill-only-users" #. type: code{#1} -#: doc/guix.texi:14799 doc/guix.texi:14837 +#: doc/guix.texi:14796 doc/guix.texi:14834 msgid "()" msgstr "()" #. type: item -#: doc/guix.texi:14799 +#: doc/guix.texi:14796 #, no-wrap msgid "kill-exclude-users" msgstr "kill-exclude-users" #. type: code{#1} -#: doc/guix.texi:14801 +#: doc/guix.texi:14798 msgid "(\"root\")" msgstr "(\"root\")" #. type: item -#: doc/guix.texi:14801 +#: doc/guix.texi:14798 #, no-wrap msgid "inhibit-delay-max-seconds" msgstr "inhibit-delay-max-seconds" #. type: code{#1} -#: doc/guix.texi:14803 +#: doc/guix.texi:14800 msgid "5" msgstr "5" #. type: item -#: doc/guix.texi:14803 +#: doc/guix.texi:14800 #, no-wrap msgid "handle-power-key" msgstr "handle-power-key" #. type: code{#1} -#: doc/guix.texi:14805 +#: doc/guix.texi:14802 msgid "poweroff" msgstr "poweroff" #. type: item -#: doc/guix.texi:14805 +#: doc/guix.texi:14802 #, no-wrap msgid "handle-suspend-key" msgstr "handle-suspend-key" #. type: code{#1} -#: doc/guix.texi:14807 doc/guix.texi:14811 +#: doc/guix.texi:14804 doc/guix.texi:14808 msgid "suspend" msgstr "suspend" #. type: item -#: doc/guix.texi:14807 +#: doc/guix.texi:14804 #, no-wrap msgid "handle-hibernate-key" msgstr "handle-hibernate-key" #. type: code{#1} -#: doc/guix.texi:14809 +#: doc/guix.texi:14806 msgid "hibernate" msgstr "hibernate" #. type: item -#: doc/guix.texi:14809 +#: doc/guix.texi:14806 #, no-wrap msgid "handle-lid-switch" msgstr "handle-lid-switch" #. type: item -#: doc/guix.texi:14811 +#: doc/guix.texi:14808 #, no-wrap msgid "handle-lid-switch-docked" msgstr "handle-lid-switch-docked" #. type: code{#1} -#: doc/guix.texi:14813 doc/guix.texi:14825 +#: doc/guix.texi:14810 doc/guix.texi:14822 msgid "ignore" msgstr "ignore" #. type: item -#: doc/guix.texi:14813 +#: doc/guix.texi:14810 #, no-wrap msgid "power-key-ignore-inhibited?" msgstr "power-key-ignore-inhibited?" #. type: item -#: doc/guix.texi:14815 +#: doc/guix.texi:14812 #, no-wrap msgid "suspend-key-ignore-inhibited?" msgstr "suspend-key-ignore-inhibited?" #. type: item -#: doc/guix.texi:14817 +#: doc/guix.texi:14814 #, no-wrap msgid "hibernate-key-ignore-inhibited?" msgstr "hibernate-key-ignore-inhibited?" #. type: item -#: doc/guix.texi:14819 +#: doc/guix.texi:14816 #, no-wrap msgid "lid-switch-ignore-inhibited?" msgstr "lid-switch-ignore-inhibited?" #. type: code{#1} -#: doc/guix.texi:14821 doc/guix.texi:14833 +#: doc/guix.texi:14818 doc/guix.texi:14830 msgid "#t" msgstr "#t" #. type: item -#: doc/guix.texi:14821 +#: doc/guix.texi:14818 #, no-wrap msgid "holdoff-timeout-seconds" msgstr "holdoff-timeout-seconds" #. type: code{#1} -#: doc/guix.texi:14823 +#: doc/guix.texi:14820 msgid "30" msgstr "30" #. type: item -#: doc/guix.texi:14823 +#: doc/guix.texi:14820 #, no-wrap msgid "idle-action" msgstr "idle-action" #. type: item -#: doc/guix.texi:14825 +#: doc/guix.texi:14822 #, no-wrap msgid "idle-action-seconds" msgstr "idle-action-seconds" #. type: code{#1} -#: doc/guix.texi:14827 +#: doc/guix.texi:14824 msgid "(* 30 60)" msgstr "(* 30 60)" #. type: item -#: doc/guix.texi:14827 +#: doc/guix.texi:14824 #, no-wrap msgid "runtime-directory-size-percent" msgstr "runtime-directory-size-percent" #. type: code{#1} -#: doc/guix.texi:14829 +#: doc/guix.texi:14826 msgid "10" msgstr "10" #. type: item -#: doc/guix.texi:14829 +#: doc/guix.texi:14826 #, no-wrap msgid "runtime-directory-size" msgstr "runtime-directory-size" #. type: item -#: doc/guix.texi:14831 +#: doc/guix.texi:14828 #, no-wrap msgid "remove-ipc?" msgstr "remove-ipc?" #. type: item -#: doc/guix.texi:14833 +#: doc/guix.texi:14830 #, no-wrap msgid "suspend-state" msgstr "suspend-state" #. type: code{#1} -#: doc/guix.texi:14835 +#: doc/guix.texi:14832 msgid "(\"mem\" \"standby\" \"freeze\")" msgstr "(\"mem\" \"standby\" \"freeze\")" #. type: item -#: doc/guix.texi:14835 +#: doc/guix.texi:14832 #, no-wrap msgid "suspend-mode" msgstr "suspend-mode" #. type: item -#: doc/guix.texi:14837 +#: doc/guix.texi:14834 #, no-wrap msgid "hibernate-state" msgstr "hibernate-state" #. type: code{#1} -#: doc/guix.texi:14839 doc/guix.texi:14843 +#: doc/guix.texi:14836 doc/guix.texi:14840 msgid "(\"disk\")" msgstr "(\"disk\")" #. type: item -#: doc/guix.texi:14839 +#: doc/guix.texi:14836 #, no-wrap msgid "hibernate-mode" msgstr "hibernate-mode" #. type: code{#1} -#: doc/guix.texi:14841 +#: doc/guix.texi:14838 msgid "(\"platform\" \"shutdown\")" msgstr "(\"platform\" \"shutdown\")" #. type: item -#: doc/guix.texi:14841 +#: doc/guix.texi:14838 #, no-wrap msgid "hybrid-sleep-state" msgstr "hybrid-sleep-state" #. type: item -#: doc/guix.texi:14843 +#: doc/guix.texi:14840 #, no-wrap msgid "hybrid-sleep-mode" msgstr "hybrid-sleep-mode" #. type: code{#1} -#: doc/guix.texi:14845 +#: doc/guix.texi:14842 msgid "(\"suspend\" \"platform\" \"shutdown\")" msgstr "(\"suspend\" \"platform\" \"shutdown\")" #. type: deffn -#: doc/guix.texi:14848 +#: doc/guix.texi:14845 #, no-wrap msgid "{Scheme Procedure} accountsservice-service @" msgstr "{Scheme-Prozedur} accountsservice-service @" #. type: deffn -#: doc/guix.texi:14856 +#: doc/guix.texi:14853 msgid "[#:accountsservice @var{accountsservice}] Return a service that runs AccountsService, a system service that can list available accounts, change their passwords, and so on. AccountsService integrates with PolicyKit to enable unprivileged users to acquire the capability to modify their system configuration. @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the accountsservice web site} for more information." -msgstr "" +msgstr "[#:accountsservice @var{accountsservice}] Liefert einen Dienst, der AccountsService ausführt. Dabei handelt es sich um einen Systemdienst, mit dem verfügbare Benutzerkonten aufgelistet und deren Passwörter geändert werden können, und Ähnliches. AccountsService arbeitet mit PolicyKit zusammen, um es Benutzern ohne besondere Berechtigungen zu ermöglichen, ihre Systemkonfiguration zu ändern. Siehe @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, den Webauftritt von AccountsService} für weitere Informationen." #. type: deffn -#: doc/guix.texi:14859 +#: doc/guix.texi:14856 msgid "The @var{accountsservice} keyword argument is the @code{accountsservice} package to expose as a service." -msgstr "" +msgstr "Das Schlüsselwortargument @var{accountsservice} gibt das @code{accountsservice}-Paket an, das als Dienst verfügbar gemacht wird." #. type: deffn -#: doc/guix.texi:14861 +#: doc/guix.texi:14858 #, no-wrap msgid "{Scheme Procedure} polkit-service @" -msgstr "" +msgstr "{Scheme-Prozedur} polkit-service @" #. type: deffn -#: doc/guix.texi:14870 +#: doc/guix.texi:14867 msgid "[#:polkit @var{polkit}] Return a service that runs the @uref{https://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, which allows system administrators to grant access to privileged operations in a structured way. By querying the Polkit service, a privileged system component can know when it should grant additional capabilities to ordinary users. For example, an ordinary user can be granted the capability to suspend the system if the user is logged in locally." -msgstr "" +msgstr "[#:polkit @var{polkit}] Liefert einen Dienst, der @uref{https://www.freedesktop.org/wiki/Software/polkit/, Polkit als Dienst zur Verwaltung von Berechtigungen} ausführt, wodurch Systemadministratoren auf strukturierte Weise den Zugang zu „privilegierten“ Operationen gewähren können, die erweiterte Berechtigungen erfordern. Indem der Polkit-Dienst angefragt wird, kann eine mit Berechtigungen ausgestattete Systemkomponente die Information erhalten, ob normalen Benutzern Berechtigungen gewährt werden dürfen. Zum Beispiel kann einer normalen Nutzerin die Berechtigung gegeben werden, das System in den Bereitschaftsmodus zu versetzen, unter der Voraussetzung, dass sie lokal vor Ort angemeldet ist." #. type: defvr -#: doc/guix.texi:14872 +#: doc/guix.texi:14869 #, no-wrap msgid "{Scheme Variable} upower-service-type" msgstr "{Scheme-Variable} upower-service-type" #. type: defvr -#: doc/guix.texi:14876 +#: doc/guix.texi:14873 msgid "Service that runs @uref{https://upower.freedesktop.org/, @command{upowerd}}, a system-wide monitor for power consumption and battery levels, with the given configuration settings." msgstr "Typ des Dienstes, der @uref{https://upower.freedesktop.org/, @command{upowerd}} ausführt, ein Programm zur systemweiten Überwachung des Energieverbrauchs und der Akkuladung. Er hat die angegebenen Konfigurationseinstellungen." #. type: defvr -#: doc/guix.texi:14879 +#: doc/guix.texi:14876 msgid "It implements the @code{org.freedesktop.UPower} D-Bus interface, and is notably used by GNOME." -msgstr "" +msgstr "Er implementiert die D-Bus-Schnittstelle @code{org.freedesktop.UPower}. Insbesondere wird UPower auch von GNOME benutzt." #. type: deftp -#: doc/guix.texi:14881 +#: doc/guix.texi:14878 #, no-wrap msgid "{Data Type} upower-configuration" msgstr "{Datentyp} upower-configuration" #. type: deftp -#: doc/guix.texi:14883 +#: doc/guix.texi:14880 msgid "Data type representation the configuration for UPower." msgstr "Repräsentiert die Konfiguration von UPower." #. type: item -#: doc/guix.texi:14886 +#: doc/guix.texi:14883 #, no-wrap msgid "@code{upower} (default: @var{upower})" msgstr "@code{upower} (Vorgabe: @var{upower})" #. type: table -#: doc/guix.texi:14888 +#: doc/guix.texi:14885 msgid "Package to use for @code{upower}." -msgstr "" +msgstr "Das Paket, das für @code{upower} benutzt werden soll." #. type: item -#: doc/guix.texi:14889 +#: doc/guix.texi:14886 #, no-wrap msgid "@code{watts-up-pro?} (default: @code{#f})" msgstr "@code{watts-up-pro?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:14891 +#: doc/guix.texi:14888 msgid "Enable the Watts Up Pro device." -msgstr "" +msgstr "Aktiviert das Watts-Up-Pro-Gerät." #. type: item -#: doc/guix.texi:14892 +#: doc/guix.texi:14889 #, no-wrap msgid "@code{poll-batteries?} (default: @code{#t})" msgstr "@code{poll-batteries?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:14894 +#: doc/guix.texi:14891 msgid "Enable polling the kernel for battery level changes." -msgstr "" +msgstr "Aktiviert das regelmäßige Abfragen des Kernels bezüglich Änderungen am Stand der Akku-Ladung." #. type: item -#: doc/guix.texi:14895 +#: doc/guix.texi:14892 #, no-wrap msgid "@code{ignore-lid?} (default: @code{#f})" msgstr "@code{ignore-lid?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:14897 +#: doc/guix.texi:14894 msgid "Ignore the lid state, this can be useful if it's incorrect on a device." -msgstr "" +msgstr "Ignorieren, ob der Rechner zugeklappt ist. Das kann gewünscht sein, wenn Auf- und Zuklappen nicht richtig erkannt werden." #. type: item -#: doc/guix.texi:14898 +#: doc/guix.texi:14895 #, no-wrap msgid "@code{use-percentage-for-policy?} (default: @code{#f})" msgstr "@code{use-percentage-for-policy?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:14901 +#: doc/guix.texi:14898 msgid "Whether battery percentage based policy should be used. The default is to use the time left, change to @code{#t} to use the percentage." -msgstr "" +msgstr "Ob sich die Richtlinie am Akku-Ladestand in Prozent orientieren soll. Die Vorgabe ist, sich an der verbleibenden Zeit zu orientieren. Wenn Sie sie auf @code{#t} ändern, dient der Prozentstand als Orientierung." #. type: item -#: doc/guix.texi:14902 +#: doc/guix.texi:14899 #, no-wrap msgid "@code{percentage-low} (default: @code{10})" msgstr "@code{percentage-low} (Vorgabe: @code{10})" #. type: table -#: doc/guix.texi:14905 +#: doc/guix.texi:14902 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered low." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#t} gesetzt ist, wird hiermit der Prozentstand festgelegt, ab dem der Akku-Ladestand als niedrig gilt." #. type: item -#: doc/guix.texi:14906 +#: doc/guix.texi:14903 #, no-wrap msgid "@code{percentage-critical} (default: @code{3})" msgstr "@code{percentage-critical} (Vorgabe: @code{3})" #. type: table -#: doc/guix.texi:14909 +#: doc/guix.texi:14906 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered critical." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#t} gesetzt ist, wird hiermit der Prozentstand festgelegt, ab dem der Akku-Ladestand als kritisch gilt." #. type: item -#: doc/guix.texi:14910 +#: doc/guix.texi:14907 #, no-wrap msgid "@code{percentage-action} (default: @code{2})" msgstr "@code{percentage-action} (Vorgabe: @code{2})" #. type: table -#: doc/guix.texi:14913 +#: doc/guix.texi:14910 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which action will be taken." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#t} gesetzt ist, wird hiermit der Prozentstand festgelegt, ab dem Maßnahmen eingeleitet werden." #. type: item -#: doc/guix.texi:14914 +#: doc/guix.texi:14911 #, no-wrap msgid "@code{time-low} (default: @code{1200})" msgstr "@code{time-low} (Vorgabe: @code{1200})" #. type: table -#: doc/guix.texi:14917 +#: doc/guix.texi:14914 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered low." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#f} gesetzt ist, wird hiermit die verbleibende Zeit in Sekunden festgelegt, ab der der Akku-Ladestand als niedrig gilt." #. type: item -#: doc/guix.texi:14918 +#: doc/guix.texi:14915 #, no-wrap msgid "@code{time-critical} (default: @code{300})" msgstr "@code{time-critical} (Vorgabe: @code{300})" #. type: table -#: doc/guix.texi:14921 +#: doc/guix.texi:14918 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered critical." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#f} gesetzt ist, wird hiermit die verbleibende Zeit in Sekunden festgelegt, ab der der Akku-Ladestand als kritisch gilt." #. type: item -#: doc/guix.texi:14922 +#: doc/guix.texi:14919 #, no-wrap msgid "@code{time-action} (default: @code{120})" msgstr "@code{time-action} (Vorgabe: @code{120})" #. type: table -#: doc/guix.texi:14925 +#: doc/guix.texi:14922 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which action will be taken." -msgstr "" +msgstr "Wenn @code{use-percentage-for-policy?} auf @code{#f} gesetzt ist, wird hiermit die verbleibende Zeit in Sekunden festgelegt, ab der Maßnahmen eingeleitet werden." #. type: item -#: doc/guix.texi:14926 +#: doc/guix.texi:14923 #, no-wrap msgid "@code{critical-power-action} (default: @code{'hybrid-sleep})" msgstr "@code{critical-power-action} (Vorgabe: @code{'hybrid-sleep})" #. type: table -#: doc/guix.texi:14929 +#: doc/guix.texi:14926 msgid "The action taken when @code{percentage-action} or @code{time-action} is reached (depending on the configuration of @code{use-percentage-for-policy?})." -msgstr "" +msgstr "Welche Maßnahme eingeleitet wird, wenn die @code{percentage-action} oder @code{time-action} erreicht wurde (je nachdem, wie @code{use-percentage-for-policy?} eingestellt wurde)." #. type: table -#: doc/guix.texi:14931 +#: doc/guix.texi:14928 msgid "Possible values are:" -msgstr "" +msgstr "Mögliche Werte sind:" #. type: code{#1} -#: doc/guix.texi:14935 +#: doc/guix.texi:14932 msgid "'power-off" -msgstr "" +msgstr "'power-off" #. type: code{#1} -#: doc/guix.texi:14938 +#: doc/guix.texi:14935 msgid "'hibernate" -msgstr "" +msgstr "'hibernate" #. type: itemize -#: doc/guix.texi:14941 +#: doc/guix.texi:14938 msgid "@code{'hybrid-sleep}." -msgstr "" +msgstr "@code{'hybrid-sleep}." #. type: deffn -#: doc/guix.texi:14946 +#: doc/guix.texi:14943 #, no-wrap msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]" -msgstr "" +msgstr "{Scheme-Prozedur} udisks-service [#:udisks @var{udisks}]" #. type: deffn -#: doc/guix.texi:14951 +#: doc/guix.texi:14948 msgid "Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks. Programs that talk to UDisks include the @command{udisksctl} command, part of UDisks, and GNOME Disks." -msgstr "" +msgstr "Liefert einen Dienst für @uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, einen Daemon zur @dfn{Datenträgerverwaltung}, der Benutzeroberflächen mit Benachrichtigungen und Möglichkeiten zum Einbinden und Aushängen von Datenträgern versorgt. Zu den Programmen, die mit UDisks kommunizieren, gehört der Befehl @command{udisksctl}, der Teil von UDisks ist, sowie GNOME Disks." #. type: deffn -#: doc/guix.texi:14953 +#: doc/guix.texi:14950 #, no-wrap msgid "{Scheme Procedure} colord-service [#:colord @var{colord}]" -msgstr "" +msgstr "{Scheme-Prozedur} colord-service [#:colord @var{colord}]" #. type: deffn -#: doc/guix.texi:14959 +#: doc/guix.texi:14956 msgid "Return a service that runs @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners. It is notably used by the GNOME Color Manager graphical tool. See @uref{https://www.freedesktop.org/software/colord/, the colord web site} for more information." -msgstr "" +msgstr "Liefert einen Dienst, der @command{colord} ausführt. Dabei handelt es sich um einen Systemdienst mit einer D-Bus-Schnittstelle, um die Farbprofile von Ein- und Ausgabegeräten wie Bildschirmen oder Scannern zu verwalten. Insbesondere wird colord vom grafischen GNOME-Farbverwaltungswerkzeug benutzt. Siehe @uref{https://www.freedesktop.org/software/colord/, den Webauftritt von colord} für weitere Informationen." #. type: deffn -#: doc/guix.texi:14961 +#: doc/guix.texi:14958 #, no-wrap msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]" -msgstr "" +msgstr "{Scheme-Prozedur} geoclue-application Name [#:allowed? #t] [#:system? #f] [#:users '()]" #. type: deffn -#: doc/guix.texi:14970 +#: doc/guix.texi:14967 msgid "Return a configuration allowing an application to access GeoClue location data. @var{name} is the Desktop ID of the application, without the @code{.desktop} part. If @var{allowed?} is true, the application will have access to location information by default. The boolean @var{system?} value indicates whether an application is a system component or not. Finally @var{users} is a list of UIDs of all users for which this application is allowed location info access. An empty users list means that all users are allowed." -msgstr "" +msgstr "Liefert eine Konfiguration, mit der eine Anwendung auf Ortungsdaten von GeoClue zugreifen kann. Als @var{Name} wird die Desktop-ID der Anwendung angegeben, ohne die Pfadkomponente mit @code{.desktop}-Endung. Wenn @var{allowed?} wahr ist, hat die Anwendung standardmäßig Zugriff auf Ortungsinformationen. Der boolesche Wert @var{system?} zeigt an, ob die Anwendung eine Systemkomponente ist oder nicht. Zum Schluss wird für @var{users} eine Liste von Benutzeridentifikatoren (UIDs) aller Benutzerkonten angegeben, für die diese Anwendung Zugriff auf Ortungsinformationen gewährt bekommt. Eine leere Benutzerliste bedeutet, dass dies für alle Benutzer gewährt wird." #. type: defvr -#: doc/guix.texi:14972 +#: doc/guix.texi:14969 #, no-wrap msgid "{Scheme Variable} %standard-geoclue-applications" -msgstr "" +msgstr "{Scheme-Variable} %standard-geoclue-applications" #. type: defvr -#: doc/guix.texi:14979 +#: doc/guix.texi:14976 msgid "The standard list of well-known GeoClue application configurations, granting authority to the GNOME date-and-time utility to ask for the current location in order to set the time zone, and allowing the IceCat and Epiphany web browsers to request location information. IceCat and Epiphany both query the user before allowing a web page to know the user's location." -msgstr "" +msgstr "Die Standardliste wohlbekannter GeoClue-Anwendungskonfigurationen, mit der das GNOME-Werkzeug für Datum und Uhrzeit die Berechtigung bekommt, den aktuellen Ort abzufragen, um die Zeitzone festzulegen, und die Webbrowser IceCat und Epiphany Ortsinformationen abfragen dürfen. IceCat und Epiphany fragen beide zuerst beim Benutzer nach, bevor sie einer Webseite gestatten, den Ort des Benutzer abzufragen." #. type: deffn -#: doc/guix.texi:14981 +#: doc/guix.texi:14978 #, no-wrap msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @" -msgstr "" +msgstr "{Scheme-Prozedur} geoclue-service [#:colord @var{colord}] @" #. type: deffn -#: doc/guix.texi:14994 +#: doc/guix.texi:14991 msgid "[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-applications] Return a service that runs the GeoClue location service. This service provides a D-Bus interface to allow applications to request access to a user's physical location, and optionally to add information to online location databases. See @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, the GeoClue web site} for more information." -msgstr "" +msgstr "[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-applications] Liefert einen Dienst, der den Ortungsdienst GeoClue ausführt. Dieser Dienst bietet eine D-Bus-Schnittstelle an, mit der Anwendungen Zugriff auf den physischen Ort eines Benutzers anfragen können, und optional Informationen in Online-Ortsdatenbanken eintragen können. Siehe @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, den Webauftritt von GeoClue} für weitere Informationen." #. type: deffn -#: doc/guix.texi:14996 +#: doc/guix.texi:14993 #, no-wrap msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @" -msgstr "" +msgstr "{Scheme-Prozedur} bluetooth-service [#:bluez @var{bluez}] @" #. type: deffn -#: doc/guix.texi:15003 +#: doc/guix.texi:15000 msgid "[@w{#:auto-enable? #f}] Return a service that runs the @command{bluetoothd} daemon, which manages all the Bluetooth devices and provides a number of D-Bus interfaces. When AUTO-ENABLE? is true, the bluetooth controller is powered automatically at boot, which can be useful when using a bluetooth keyboard or mouse." -msgstr "" +msgstr "[@w{#:auto-enable? #f}] Liefert einen Dienst, der den @command{bluetoothd}-Daemon ausführt, welcher alle Bluetooth-Geräte verwaltet, und eine Reihe von D-Bus-Schnittstellen zur Verfügung stellt. Wenn AUTO-ENABLE? wahr ist, wird die Bluetooth-Steuerung automatisch beim Hochfahren gestartet, was sich als nützlich erweisen kann, wenn man eine Bluetooth-Tastatur oder -Maus benutzt." #. type: deffn -#: doc/guix.texi:15005 +#: doc/guix.texi:15002 msgid "Users need to be in the @code{lp} group to access the D-Bus service." -msgstr "" +msgstr "Benutzer müssen zur @code{lp}-Benutzergruppe gehören, damit sie Zugriff auf den D-Bus-Dienst bekommen." #. type: cindex -#: doc/guix.texi:15010 +#: doc/guix.texi:15007 #, no-wrap msgid "sound support" -msgstr "" +msgstr "Sound-Unterstützung" #. type: cindex -#: doc/guix.texi:15011 +#: doc/guix.texi:15008 #, no-wrap msgid "ALSA" -msgstr "" +msgstr "ALSA" #. type: cindex -#: doc/guix.texi:15012 +#: doc/guix.texi:15009 #, no-wrap msgid "PulseAudio, sound support" -msgstr "" +msgstr "PulseAudio, Sound-Unterstützung" #. type: Plain text -#: doc/guix.texi:15017 +#: doc/guix.texi:15014 msgid "The @code{(gnu services sound)} module provides a service to configure the Advanced Linux Sound Architecture (ALSA) system, which makes PulseAudio the preferred ALSA output driver." -msgstr "" +msgstr "Das Modul @code{(gnu services sound)} stellt einen Dienst zur Verfügung, um das Advanced-Linux-Sound-Architecture-System (ALSA) zu konfigurieren, so dass PulseAudio als bevorzugter ALSA-Ausgabetreiber benutzt wird." #. type: deffn -#: doc/guix.texi:15018 +#: doc/guix.texi:15015 #, no-wrap msgid "{Scheme Variable} alsa-service-type" -msgstr "" +msgstr "{Scheme-Variable} alsa-service-type" #. type: deffn -#: doc/guix.texi:15023 +#: doc/guix.texi:15020 msgid "This is the type for the @uref{https://alsa-project.org/, Advanced Linux Sound Architecture} (ALSA) system, which generates the @file{/etc/asound.conf} configuration file. The value for this type is a @command{alsa-configuration} record as in this example:" -msgstr "" +msgstr "Dies ist der Typ des Dienstes für das als @uref{https://alsa-project.org/, Advanced Linux Sound Architecture (ALSA)} bekannte System, das die Konfigurationsdatei @file{/etc/asound.conf} erzeugt. Der Wert für diesen Diensttyp ist ein @command{alsa-configuration}-Verbundsobjekt wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:15026 +#: doc/guix.texi:15023 #, no-wrap msgid "(service alsa-service-type)\n" -msgstr "" +msgstr "(service alsa-service-type)\n" #. type: deffn -#: doc/guix.texi:15029 +#: doc/guix.texi:15026 msgid "See below for details about @code{alsa-configuration}." -msgstr "" +msgstr "Siehe die folgenden Details zur @code{alsa-configuration}." #. type: deftp -#: doc/guix.texi:15031 +#: doc/guix.texi:15028 #, no-wrap msgid "{Data Type} alsa-configuration" msgstr "{Datentyp} alsa-configuration" #. type: deftp -#: doc/guix.texi:15033 +#: doc/guix.texi:15030 msgid "Data type representing the configuration for @code{alsa-service}." msgstr "Repräsentiert die Konfiguration für den Dienst @code{alsa-service}." #. type: item -#: doc/guix.texi:15035 +#: doc/guix.texi:15032 #, no-wrap msgid "@code{alsa-plugins} (default: @var{alsa-plugins})" msgstr "@code{alsa-plugins} (Vorgabe: @var{alsa-plugins})" #. type: table -#: doc/guix.texi:15037 +#: doc/guix.texi:15034 msgid "@code{alsa-plugins} package to use." msgstr "@code{alsa-plugins}-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:15038 +#: doc/guix.texi:15035 #, no-wrap msgid "@code{pulseaudio?} (default: @var{#t})" msgstr "@code{pulseaudio?} (Vorgabe: @var{#t})" #. type: table -#: doc/guix.texi:15041 +#: doc/guix.texi:15038 msgid "Whether ALSA applications should transparently be made to use the @uref{http://www.pulseaudio.org/, PulseAudio} sound server." -msgstr "" +msgstr "Ob ALSA-Anwendungen transparent den @uref{http://www.pulseaudio.org/, PulseAudio-Audioserver} benutzen sollen." #. type: table -#: doc/guix.texi:15045 +#: doc/guix.texi:15042 msgid "Using PulseAudio allows you to run several sound-producing applications at the same time and to individual control them @i{via} @command{pavucontrol}, among other things." -msgstr "" +msgstr "Wenn PulseAudio benutzt wird, können Sie gleichzeitig mehrere Anwendungen mit Tonausgabe ausführen und sie unter anderem mit @command{pavucontrol} einzeln einstellen." #. type: item -#: doc/guix.texi:15046 +#: doc/guix.texi:15043 #, no-wrap msgid "@code{extra-options} (default: @var{\"\"})" msgstr "@code{extra-options} (Vorgabe: @var{\"\"})" #. type: table -#: doc/guix.texi:15048 +#: doc/guix.texi:15045 msgid "String to append to the @file{/etc/asound.conf} file." -msgstr "" +msgstr "Die Zeichenkette, die an die Datei @file{/etc/asound.conf} angehängt werden soll." #. type: Plain text -#: doc/guix.texi:15054 +#: doc/guix.texi:15051 msgid "Individual users who want to override the system configuration of ALSA can do it with the @file{~/.asoundrc} file:" -msgstr "" +msgstr "Wenn einzelne Benutzer von ALSAs Systemkonfiguration abweichende Einstellungen vornehmen möchten, können Sie das mit der Konfigurationsdatei @file{~/.asoundrc} tun:" #. type: example -#: doc/guix.texi:15060 +#: doc/guix.texi:15057 #, no-wrap msgid "" "# In guix, we have to specify the absolute path for plugins.\n" @@ -28071,9 +28084,14 @@ msgid "" "@}\n" "\n" msgstr "" +"# In Guix müssen wir den absoluten Pfad von Plugins angeben.\n" +"pcm_type.jack @{\n" +" lib \"/home/alice/.guix-profile/lib/alsa-lib/libasound_module_pcm_jack.so\"\n" +"@}\n" +"\n" #. type: example -#: doc/guix.texi:15069 +#: doc/guix.texi:15066 #, no-wrap msgid "" "# Routing ALSA to jack:\n" @@ -28086,9 +28104,18 @@ msgid "" " @}\n" "\n" msgstr "" +"# ALSA an jack weiterleiten:\n" +"# .\n" +"pcm.rawjack @{\n" +" type jack\n" +" playback_ports @{\n" +" 0 system:playback_1\n" +" 1 system:playback_2\n" +" @}\n" +"\n" #. type: example -#: doc/guix.texi:15075 +#: doc/guix.texi:15072 #, no-wrap msgid "" " capture_ports @{\n" @@ -28098,9 +28125,15 @@ msgid "" "@}\n" "\n" msgstr "" +" capture_ports @{\n" +" 0 system:capture_1\n" +" 1 system:capture_2\n" +" @}\n" +"@}\n" +"\n" #. type: example -#: doc/guix.texi:15082 +#: doc/guix.texi:15079 #, no-wrap msgid "" "pcm.!default @{\n" @@ -28110,58 +28143,64 @@ msgid "" " @}\n" "@}\n" msgstr "" +"pcm.!default @{\n" +" type plug\n" +" slave @{\n" +" pcm \"rawjack\"\n" +" @}\n" +"@}\n" #. type: Plain text -#: doc/guix.texi:15086 +#: doc/guix.texi:15083 msgid "See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the details." -msgstr "" +msgstr "Siehe @uref{https://www.alsa-project.org/main/index.php/Asoundrc} für die Details." #. type: cindex -#: doc/guix.texi:15092 +#: doc/guix.texi:15089 #, no-wrap msgid "SQL" -msgstr "" +msgstr "SQL" #. type: Plain text -#: doc/guix.texi:15094 +#: doc/guix.texi:15091 msgid "The @code{(gnu services databases)} module provides the following services." -msgstr "" +msgstr "Das Modul @code{(gnu services databases)} stellt die folgenden Dienste zur Verfügung." #. type: deffn -#: doc/guix.texi:15095 +#: doc/guix.texi:15092 #, no-wrap msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @" -msgstr "" +msgstr "{Scheme-Prozedur} postgresql-service [#:postgresql postgresql] @" #. type: deffn -#: doc/guix.texi:15100 +#: doc/guix.texi:15097 msgid "[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port 5432] [#:locale ``en_US.utf8''] [#:extension-packages '()] Return a service that runs @var{postgresql}, the PostgreSQL database server." -msgstr "" +msgstr "[#:config-file] [#:data-directory \"/var/lib/postgresql/data\"] @ [#:port 5432] [#:locale \"en_US.utf8\"] [#:extension-packages '()] Liefert einen Dienst, der @var{postgresql}, den PostgreSQL-Datenbankserver, ausführt." #. type: deffn -#: doc/guix.texi:15104 +#: doc/guix.texi:15101 msgid "The PostgreSQL daemon loads its runtime configuration from @var{config-file}, creates a database cluster with @var{locale} as the default locale, stored in @var{data-directory}. It then listens on @var{port}." -msgstr "" +msgstr "Der PostgreSQL-Daemon lädt seine Laufzeitkonfiguration aus der bei @var{config-file} angegebenen Konfigurationsdatei, erzeugt einen Datenbankverbund mit der angegebenen @var{locale} als voreingestellte Locale, gespeichert im bei @var{data-directory} angegebenen Verzeichnis. Er lauscht dann auf dem @var{port}." #. type: cindex -#: doc/guix.texi:15105 +#: doc/guix.texi:15102 #, no-wrap msgid "postgresql extension-packages" -msgstr "" +msgstr "PostgreSQL-Erweiterungspakete" #. type: deffn -#: doc/guix.texi:15110 +#: doc/guix.texi:15107 msgid "Additional extensions are loaded from packages listed in @var{extension-packages}. Extensions are available at runtime. For instance, to create a geographic database using the @code{postgis} extension, a user can configure the postgresql-service as in this example:" -msgstr "" +msgstr "Zusätzliche Erweiterungen werden aus den unter @var{extension-packages} aufgeführten Paketen geladen. Erweiterungen sind zur Laufzeit verfügbar. Zum Beispiel kann ein Nutzer den postgresql-service-Dienst wie in diesem Beispiel konfigurieren, um eine geografische Datenbank mit Hilfe der @code{postgis}-Erweiterung zu erzeugen:" #. type: cindex -#: doc/guix.texi:15111 +#: doc/guix.texi:15108 #, no-wrap msgid "postgis" -msgstr "" +msgstr "postgis" #. type: example -#: doc/guix.texi:15114 +#: doc/guix.texi:15111 #, no-wrap msgid "" "(use-package-modules databases geo)\n" @@ -28171,7 +28210,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:15124 +#: doc/guix.texi:15121 #, no-wrap msgid "" "(operating-system\n" @@ -28195,12 +28234,12 @@ msgstr "" " %base-services)))\n" #. type: deffn -#: doc/guix.texi:15128 +#: doc/guix.texi:15125 msgid "Then the extension becomes visible and you can initialise an empty geographic database in this way:" msgstr "Dann wird die Erweiterung sichtbar und Sie können eine leere geografische Datenbak auf diese Weise initialisieren:" #. type: example -#: doc/guix.texi:15135 +#: doc/guix.texi:15132 #, no-wrap msgid "" "psql -U postgres\n" @@ -28216,2910 +28255,2925 @@ msgstr "" "> create extension postgis_topology;\n" #. type: deffn -#: doc/guix.texi:15140 +#: doc/guix.texi:15137 msgid "There is no need to add this field for contrib extensions such as hstore or dblink as they are already loadable by postgresql. This field is only required to add extensions provided by other packages." -msgstr "" +msgstr "Es ist nicht notwendig, dieses Feld für contrib-Erweiterungen wie hstore oder dblink hinzuzufügen, weil sie bereits durch postgresql geladen werden können. Dieses Feld wird nur benötigt, um Erweiterungen hinzuzufügen, die von anderen Paketen zur Verfügung gestellt werden." #. type: deffn -#: doc/guix.texi:15142 +#: doc/guix.texi:15139 #, no-wrap msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]" -msgstr "" +msgstr "{Scheme-Prozedur} mysql-service [#:config (mysql-configuration)]" #. type: deffn -#: doc/guix.texi:15145 +#: doc/guix.texi:15142 msgid "Return a service that runs @command{mysqld}, the MySQL or MariaDB database server." -msgstr "" +msgstr "Liefert einen Dienst, der @command{mysqld}, den Datenbankserver von MySQL oder MariaDB, ausführt." #. type: deffn -#: doc/guix.texi:15148 +#: doc/guix.texi:15145 msgid "The optional @var{config} argument specifies the configuration for @command{mysqld}, which should be a @code{} object." -msgstr "" +msgstr "Als optionales @var{config}-Argument wird die Konfiguration für @command{mysqld} angegeben, die ein @code{}-Objekt sein sollte." #. type: deftp -#: doc/guix.texi:15150 +#: doc/guix.texi:15147 #, no-wrap msgid "{Data Type} mysql-configuration" -msgstr "" +msgstr "{Datentyp} mysql-configuration" #. type: deftp -#: doc/guix.texi:15152 +#: doc/guix.texi:15149 msgid "Data type representing the configuration of @var{mysql-service}." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration des @var{mysql-service} repräsentiert." #. type: item -#: doc/guix.texi:15154 +#: doc/guix.texi:15151 #, no-wrap msgid "@code{mysql} (default: @var{mariadb})" -msgstr "" +msgstr "@code{mysql} (Vorgabe: @var{mariadb})" #. type: table -#: doc/guix.texi:15157 +#: doc/guix.texi:15154 msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}." -msgstr "" +msgstr "Das Paketobjekt des MySQL-Datenbankservers; es kann entweder @var{mariadb} oder @var{mysql} sein." #. type: table -#: doc/guix.texi:15160 +#: doc/guix.texi:15157 msgid "For MySQL, a temporary root password will be displayed at activation time. For MariaDB, the root password is empty." -msgstr "" +msgstr "Für MySQL wird bei der Aktivierung des Dienstes ein temporäres Administratorpasswort („root“-Passwort) angezeigt. Für MariaDB ist das „root“-Passwort leer." #. type: item -#: doc/guix.texi:15161 +#: doc/guix.texi:15158 #, no-wrap msgid "@code{port} (default: @code{3306})" -msgstr "" +msgstr "@code{port} (Vorgabe: @code{3306})" #. type: table -#: doc/guix.texi:15163 +#: doc/guix.texi:15160 msgid "TCP port on which the database server listens for incoming connections." -msgstr "" +msgstr "Der TCP-Port, auf dem der Datenbankserver auf eingehende Verbindungen lauscht." #. type: defvr -#: doc/guix.texi:15166 +#: doc/guix.texi:15163 #, no-wrap msgid "{Scheme Variable} memcached-service-type" -msgstr "" +msgstr "{Scheme-Variable} memcached-service-type" #. type: defvr -#: doc/guix.texi:15170 +#: doc/guix.texi:15167 msgid "This is the service type for the @uref{https://memcached.org/, Memcached} service, which provides a distributed in memory cache. The value for the service type is a @code{memcached-configuration} object." -msgstr "" +msgstr "Dies ist der Diensttyp für den @uref{https://memcached.org/, Memcached-Dienst}, der einen verteilten Zwischenspeicher im Arbeitsspeicher (einen „In-Memory-Cache“) zur Verfügung stellt. Der Wert dieses Dienstes ist ein @code{memcached-configuration}-Objekt." #. type: example -#: doc/guix.texi:15174 +#: doc/guix.texi:15171 #, no-wrap msgid "(service memcached-service-type)\n" -msgstr "" +msgstr "(service memcached-service-type)\n" #. type: deftp -#: doc/guix.texi:15176 +#: doc/guix.texi:15173 #, no-wrap msgid "{Data Type} memcached-configuration" -msgstr "" +msgstr "{Datentyp} memcached-configuration" #. type: deftp -#: doc/guix.texi:15178 +#: doc/guix.texi:15175 msgid "Data type representing the configuration of memcached." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration von memcached repräsentiert." #. type: item -#: doc/guix.texi:15180 +#: doc/guix.texi:15177 #, no-wrap msgid "@code{memcached} (default: @code{memcached})" -msgstr "" +msgstr "@code{memcached} (Vorgabe: @code{memcached})" #. type: table -#: doc/guix.texi:15182 +#: doc/guix.texi:15179 msgid "The Memcached package to use." -msgstr "" +msgstr "Das Memcached-Paket, das benutzt werden soll." #. type: item -#: doc/guix.texi:15183 +#: doc/guix.texi:15180 #, no-wrap msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})" -msgstr "" +msgstr "@code{interfaces} (Vorgabe: @code{'(\"0.0.0.0\")})" #. type: table -#: doc/guix.texi:15185 +#: doc/guix.texi:15182 msgid "Network interfaces on which to listen." -msgstr "" +msgstr "Auf welchen Netzwerkschnittstellen gelauscht werden soll." #. type: item -#: doc/guix.texi:15186 +#: doc/guix.texi:15183 #, no-wrap msgid "@code{tcp-port} (default: @code{11211})" -msgstr "" +msgstr "@code{tcp-port} (Vorgabe: @code{11211})" #. type: table -#: doc/guix.texi:15188 +#: doc/guix.texi:15185 msgid "Port on which to accept connections on," -msgstr "" +msgstr "Der Port, auf dem Verbindungen akzeptiert werden." #. type: item -#: doc/guix.texi:15189 +#: doc/guix.texi:15186 #, no-wrap msgid "@code{udp-port} (default: @code{11211})" -msgstr "" +msgstr "@code{udp-port} (Vorgabe: @code{11211})" #. type: table -#: doc/guix.texi:15192 +#: doc/guix.texi:15189 msgid "Port on which to accept UDP connections on, a value of 0 will disable listening on a UDP socket." -msgstr "" +msgstr "Der Port, auf dem UDP-Verbindungen akzeptiert werden. Ist der Wert 0, wird @emph{nicht} auf einem UDP-Socket gelauscht." #. type: item -#: doc/guix.texi:15193 +#: doc/guix.texi:15190 #, no-wrap msgid "@code{additional-options} (default: @code{'()})" -msgstr "" +msgstr "@code{additional-options} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:15195 +#: doc/guix.texi:15192 msgid "Additional command line options to pass to @code{memcached}." -msgstr "" +msgstr "Zusätzliche Befehlszeilenoptionen, die an @code{memcached} übergeben werden." #. type: defvr -#: doc/guix.texi:15198 +#: doc/guix.texi:15195 #, no-wrap msgid "{Scheme Variable} mongodb-service-type" -msgstr "" +msgstr "{Scheme-Variable} mongodb-service-type" #. type: defvr -#: doc/guix.texi:15201 +#: doc/guix.texi:15198 msgid "This is the service type for @uref{https://www.mongodb.com/, MongoDB}. The value for the service type is a @code{mongodb-configuration} object." -msgstr "" +msgstr "Dies ist der Diensttyp für @uref{https://www.mongodb.com/, MongoDB}. Der Wert dieses Diensttyps ist ein @code{mongodb-configuration}-Objekt." #. type: example -#: doc/guix.texi:15205 +#: doc/guix.texi:15202 #, no-wrap msgid "(service mongodb-service-type)\n" -msgstr "" +msgstr "(service mongodb-service-type)\n" #. type: deftp -#: doc/guix.texi:15207 +#: doc/guix.texi:15204 #, no-wrap msgid "{Data Type} mongodb-configuration" -msgstr "" +msgstr "{Datentyp} mongodb-configuration" #. type: deftp -#: doc/guix.texi:15209 +#: doc/guix.texi:15206 msgid "Data type representing the configuration of mongodb." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration von mongodb repräsentiert." #. type: item -#: doc/guix.texi:15211 +#: doc/guix.texi:15208 #, no-wrap msgid "@code{mongodb} (default: @code{mongodb})" -msgstr "" +msgstr "@code{mongodb} (Vorgabe: @code{mongodb})" #. type: table -#: doc/guix.texi:15213 +#: doc/guix.texi:15210 msgid "The MongoDB package to use." -msgstr "" +msgstr "Das zu benutzende MongoDB-Paket." #. type: item -#: doc/guix.texi:15214 +#: doc/guix.texi:15211 #, no-wrap msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})" -msgstr "" +msgstr "@code{config-file} (Vorgabe: @code{%default-mongodb-configuration-file})" #. type: table -#: doc/guix.texi:15216 +#: doc/guix.texi:15213 msgid "The configuration file for MongoDB." -msgstr "" +msgstr "Die Konfigurationsdatei für MongoDB." #. type: item -#: doc/guix.texi:15217 +#: doc/guix.texi:15214 #, no-wrap msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})" -msgstr "" +msgstr "@code{data-directory} (Vorgabe: @code{\"/var/lib/mongodb\"})" #. type: table -#: doc/guix.texi:15221 +#: doc/guix.texi:15218 msgid "This value is used to create the directory, so that it exists and is owned by the mongodb user. It should match the data-directory which MongoDB is configured to use through the configuration file." -msgstr "" +msgstr "Dieser Wert wird benutzt, um das Verzeichnis so zu erstellen, dass es existiert und zum Benutzer mongodb gehört. Es sollte mit dem Verzeichnis übereinstimmen, das in der Konfigurationsdatei von MongoDB als „data-directory“ angegeben wird." #. type: defvr -#: doc/guix.texi:15224 +#: doc/guix.texi:15221 #, no-wrap msgid "{Scheme Variable} redis-service-type" -msgstr "" +msgstr "{Scheme-Variable} redis-service-type" #. type: defvr -#: doc/guix.texi:15227 +#: doc/guix.texi:15224 msgid "This is the service type for the @uref{https://redis.io/, Redis} key/value store, whose value is a @code{redis-configuration} object." -msgstr "" +msgstr "Dies ist der Diensttyp für den Schlüssel-/Wert-Speicher @uref{https://redis.io/, Redis}, dessen Wert ein @code{redis-configuration}-Objekt ist." #. type: deftp -#: doc/guix.texi:15229 +#: doc/guix.texi:15226 #, no-wrap msgid "{Data Type} redis-configuration" -msgstr "" +msgstr "{Datentyp} redis-configuration" #. type: deftp -#: doc/guix.texi:15231 +#: doc/guix.texi:15228 msgid "Data type representing the configuration of redis." -msgstr "" +msgstr "Der Datentyp, der die Konfiguration von redis repräsentiert." #. type: item -#: doc/guix.texi:15233 +#: doc/guix.texi:15230 #, no-wrap msgid "@code{redis} (default: @code{redis})" -msgstr "" +msgstr "@code{redis} (Vorgabe: @code{redis})" #. type: table -#: doc/guix.texi:15235 +#: doc/guix.texi:15232 msgid "The Redis package to use." -msgstr "" +msgstr "Das zu benutzende Redis-Paket." #. type: item -#: doc/guix.texi:15236 +#: doc/guix.texi:15233 #, no-wrap msgid "@code{bind} (default: @code{\"127.0.0.1\"})" -msgstr "" +msgstr "@code{bind} (Vorgabe: @code{\"127.0.0.1\"})" #. type: table -#: doc/guix.texi:15238 +#: doc/guix.texi:15235 msgid "Network interface on which to listen." -msgstr "" +msgstr "Die Netzwerkschnittstelle, auf der gelauscht wird." #. type: item -#: doc/guix.texi:15239 +#: doc/guix.texi:15236 #, no-wrap msgid "@code{port} (default: @code{6379})" -msgstr "" +msgstr "@code{port} (Vorgabe: @code{6379})" #. type: table -#: doc/guix.texi:15242 +#: doc/guix.texi:15239 msgid "Port on which to accept connections on, a value of 0 will disable listening on a TCP socket." -msgstr "" +msgstr "Der Port, auf dem Verbindungen akzeptiert werden. Ist der Wert 0, wird das Lauschen auf einem TCP-Socket deaktiviert." #. type: item -#: doc/guix.texi:15243 +#: doc/guix.texi:15240 #, no-wrap msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})" -msgstr "" +msgstr "@code{working-directory} (Vorgabe: @code{\"/var/lib/redis\"})" #. type: table -#: doc/guix.texi:15245 +#: doc/guix.texi:15242 msgid "Directory in which to store the database and related files." -msgstr "" +msgstr "Das Verzeichnis, in dem die Datenbank und damit zu tun habende Dateien gespeichert werden." #. type: cindex -#: doc/guix.texi:15251 +#: doc/guix.texi:15248 #, no-wrap msgid "mail" -msgstr "" +msgstr "Mail" #. type: code{#1} -#: doc/guix.texi:15252 doc/guix.texi:19452 +#: doc/guix.texi:15249 doc/guix.texi:19449 #, no-wrap msgid "email" -msgstr "" +msgstr "E-Mail" #. type: Plain text -#: doc/guix.texi:15257 +#: doc/guix.texi:15254 msgid "The @code{(gnu services mail)} module provides Guix service definitions for email services: IMAP, POP3, and LMTP servers, as well as mail transport agents (MTAs). Lots of acronyms! These services are detailed in the subsections below." -msgstr "" +msgstr "Das Modul @code{(gnu services mail)} stellt Guix-Dienstdefinitionen für E-Mail-Dienste zur Verfügung: IMAP-, POP3- und LMTP-Server sowie Mail Transport Agents (MTAs). Jede Menge Akronyme! Auf diese Dienste wird in den folgenden Unterabschnitten im Detail eingegangen." #. type: subsubheading -#: doc/guix.texi:15258 +#: doc/guix.texi:15255 #, no-wrap msgid "Dovecot Service" -msgstr "" +msgstr "Dovecot-Dienst" #. type: deffn -#: doc/guix.texi:15260 +#: doc/guix.texi:15257 #, no-wrap msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]" -msgstr "" +msgstr "{Scheme-Prozedur} dovecot-service [#:config (dovecot-configuration)]" #. type: deffn -#: doc/guix.texi:15262 +#: doc/guix.texi:15259 msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server." -msgstr "" +msgstr "Liefert einen Dienst, der den IMAP-/POP3-/LMTP-Mailserver Dovecot ausführt." #. type: Plain text -#: doc/guix.texi:15272 +#: doc/guix.texi:15269 msgid "By default, Dovecot does not need much configuration; the default configuration object created by @code{(dovecot-configuration)} will suffice if your mail is delivered to @code{~/Maildir}. A self-signed certificate will be generated for TLS-protected connections, though Dovecot will also listen on cleartext ports by default. There are a number of options, though, which mail administrators might need to change, and as is the case with other services, Guix allows the system administrator to specify these parameters via a uniform Scheme interface." -msgstr "" +msgstr "Normalerweise muss für Dovecot nicht viel eingestellt werden; das vorgegebene Konfigurationsobjekt, das mit @code{(dovecot-configuration)} erzeugt wird, wird genügen, wenn Ihre Mails in @code{~/Maildir} gespeichert werden. Ein selbstsigniertes Zertifikat wird für durch TLS geschützte Verbindungen generiert, aber Dovecot lauscht nach Vorgabe auch auf unverschlüsselten Ports. Es gibt jedoch eine Reihe von Optionen, die Mail-Administratoren unter Umständen ändern müssen, was Guix — wie auch bei anderen Diensten — mit einer einheitlichen Scheme-Schnittstelle möglich macht." #. type: Plain text -#: doc/guix.texi:15275 +#: doc/guix.texi:15272 msgid "For example, to specify that mail is located at @code{maildir~/.mail}, one would instantiate the Dovecot service like this:" -msgstr "" +msgstr "Um zum Beispiel anzugeben, dass sich Mails in @code{maildir~/.mail} befinden, würde man den Dovecot-Dienst wie folgt instanziieren:" #. type: example -#: doc/guix.texi:15280 +#: doc/guix.texi:15277 #, no-wrap msgid "" "(dovecot-service #:config\n" " (dovecot-configuration\n" " (mail-location \"maildir:~/.mail\")))\n" msgstr "" +"(dovecot-service #:config\n" +" (dovecot-configuration\n" +" (mail-location \"maildir:~/.mail\")))\n" #. type: Plain text -#: doc/guix.texi:15288 +#: doc/guix.texi:15285 msgid "The available configuration parameters follow. Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings. There is also a way to specify the configuration as a string, if you have an old @code{dovecot.conf} file that you want to port over from some other system; see the end for more details." -msgstr "" +msgstr "Im Folgenden sehen Sie die verfügbaren Konfigurationsparameter. Jeder Parameterdefinition ist ihr Typ vorangestellt; zum Beispiel bedeutet @samp{Zeichenketten-Liste foo}, dass der Parameter @code{foo} als eine Liste von Zeichenketten angegeben werden sollte. Es ist auch möglich, die Konfiguration als Zeichenkette anzugeben, wenn Sie eine alte @code{dovecot.conf}-Datei haben, die Sie von einem anderen System übernehmen möchten; am Ende finden Sie mehr Details dazu." #. type: Plain text -#: doc/guix.texi:15298 +#: doc/guix.texi:15295 msgid "Available @code{dovecot-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{dovecot-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15299 +#: doc/guix.texi:15296 #, no-wrap msgid "{@code{dovecot-configuration} parameter} package dovecot" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „package“ dovecot" #. type: deftypevr -#: doc/guix.texi:15301 doc/guix.texi:16607 +#: doc/guix.texi:15298 doc/guix.texi:16604 msgid "The dovecot package." -msgstr "" +msgstr "Das Dovecot-Paket." #. type: deftypevr -#: doc/guix.texi:15303 +#: doc/guix.texi:15300 #, no-wrap msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Kommagetrennte-Zeichenketten-Liste listen" #. type: deftypevr -#: doc/guix.texi:15309 +#: doc/guix.texi:15306 msgid "A list of IPs or hosts where to listen for connections. @samp{*} listens on all IPv4 interfaces, @samp{::} listens on all IPv6 interfaces. If you want to specify non-default ports or anything more complex, customize the address and port fields of the @samp{inet-listener} of the specific services you are interested in." -msgstr "" +msgstr "Eine Liste der IPs oder der Rechnernamen („Hosts“), auf denen auf Verbindungen gelauscht wird. @samp{*} bedeutet, auf allen IPv4-Schnittstellen zu lauschen; @samp{::} lässt auf allen IPv6-Schnittstellen lauschen. Wenn Sie nicht der Vorgabe entsprechende Ports oder komplexere Einstellungen festlegen möchten, sollten Sie die Adress- und Portfelder des @samp{inet-listener} beim jeweiligen Dienst anpassen, für den Sie sich interessieren." #. type: deftypevr -#: doc/guix.texi:15311 +#: doc/guix.texi:15308 #, no-wrap msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „protocol-configuration“-Liste protocols" #. type: deftypevr -#: doc/guix.texi:15314 +#: doc/guix.texi:15311 msgid "List of protocols we want to serve. Available protocols include @samp{imap}, @samp{pop3}, and @samp{lmtp}." -msgstr "" +msgstr "Die Liste der Protokolle, die angeboten werden sollen. Zu den verfügbaren Protokollen gehören @samp{imap}, @samp{pop3} und @samp{lmtp}." #. type: deftypevr -#: doc/guix.texi:15316 +#: doc/guix.texi:15313 msgid "Available @code{protocol-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{protocol-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15317 +#: doc/guix.texi:15314 #, no-wrap msgid "{@code{protocol-configuration} parameter} string name" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:15319 +#: doc/guix.texi:15316 msgid "The name of the protocol." -msgstr "" +msgstr "Der Name des Protokolls." #. type: deftypevr -#: doc/guix.texi:15321 +#: doc/guix.texi:15318 #, no-wrap msgid "{@code{protocol-configuration} parameter} string auth-socket-path" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Zeichenkette auth-socket-path" #. type: deftypevr -#: doc/guix.texi:15325 +#: doc/guix.texi:15322 msgid "UNIX socket path to the master authentication server to find users. This is used by imap (for shared users) and lda. It defaults to @samp{\"/var/run/dovecot/auth-userdb\"}." -msgstr "" +msgstr "Der Pfad des UNIX-Sockets zum Hauptauthentifizierungsserver, um Benutzer zu finden. Er wird von imap (für geteilte Benutzer) und lda benutzt. Die Vorgabe ist @samp{\"/var/run/dovecot/auth-userdb\"}." #. type: deftypevr -#: doc/guix.texi:15327 +#: doc/guix.texi:15324 #, no-wrap msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mail-plugins" #. type: deftypevr -#: doc/guix.texi:15329 +#: doc/guix.texi:15326 msgid "Space separated list of plugins to load." -msgstr "" +msgstr "Leerzeichengetrennte Liste der zu ladenden Plugins." #. type: deftypevr -#: doc/guix.texi:15331 +#: doc/guix.texi:15328 #, no-wrap msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections" -msgstr "" +msgstr "{@code{protocol-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-max-userip-connections" #. type: deftypevr -#: doc/guix.texi:15335 +#: doc/guix.texi:15332 msgid "Maximum number of IMAP connections allowed for a user from each IP address. NOTE: The username is compared case-sensitively. Defaults to @samp{10}." -msgstr "" +msgstr "Die Maximalzahl der IMAP-Verbindungen, die jeder Nutzer von derselben IP-Adresse aus benutzen kann. @emph{Anmerkung}: Beim Vergleichen des Benutzernamens wird Groß- und Kleinschreibung unterschieden. Die Vorgabe ist @samp{10}." #. type: deftypevr -#: doc/guix.texi:15339 +#: doc/guix.texi:15336 #, no-wrap msgid "{@code{dovecot-configuration} parameter} service-configuration-list services" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „service-configuration“-Liste services" #. type: deftypevr -#: doc/guix.texi:15343 +#: doc/guix.texi:15340 msgid "List of services to enable. Available services include @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and @samp{lmtp}." -msgstr "" +msgstr "Die Liste der zu aktivierenden Dienste. Zu den verfügbaren Diensten gehören @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth} und @samp{lmtp}." #. type: deftypevr -#: doc/guix.texi:15345 +#: doc/guix.texi:15342 msgid "Available @code{service-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{service-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15346 +#: doc/guix.texi:15343 #, no-wrap msgid "{@code{service-configuration} parameter} string kind" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Zeichenkette kind" #. type: deftypevr -#: doc/guix.texi:15351 +#: doc/guix.texi:15348 msgid "The service kind. Valid values include @code{director}, @code{imap-login}, @code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, @code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning}, or anything else." -msgstr "" +msgstr "Die Dienstart (englisch „kind“). Zu den gültigen Werten gehören @code{director}, @code{imap-login}, @code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, @code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning} oder alles andere." #. type: deftypevr -#: doc/guix.texi:15353 +#: doc/guix.texi:15350 #, no-wrap msgid "{@code{service-configuration} parameter} listener-configuration-list listeners" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} „listener-configuration“-Liste listeners" #. type: deftypevr -#: doc/guix.texi:15358 +#: doc/guix.texi:15355 msgid "Listeners for the service. A listener is either a @code{unix-listener-configuration}, a @code{fifo-listener-configuration}, or an @code{inet-listener-configuration}. Defaults to @samp{()}." -msgstr "" +msgstr "„Listener“ für den Dienst, also Lauscher auf neue Verbindungen. Als Listener kann entweder eine @code{unix-listener-configuration}, eine @code{fifo-listener-configuration} oder eine @code{inet-listener-configuration} angegeben werden. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15360 +#: doc/guix.texi:15357 msgid "Available @code{unix-listener-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{unix-listener-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15361 +#: doc/guix.texi:15358 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string path" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette path" #. type: deftypevr -#: doc/guix.texi:15364 doc/guix.texi:15387 +#: doc/guix.texi:15361 doc/guix.texi:15384 msgid "Path to the file, relative to @code{base-dir} field. This is also used as the section name." -msgstr "" +msgstr "Der Pfad zur Datei, relativ zum Feld @code{base-dir}. Er wird auch als der Abschnittsname verwendet." #. type: deftypevr -#: doc/guix.texi:15366 +#: doc/guix.texi:15363 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string mode" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette mode" #. type: deftypevr -#: doc/guix.texi:15369 doc/guix.texi:15392 +#: doc/guix.texi:15366 doc/guix.texi:15389 msgid "The access mode for the socket. Defaults to @samp{\"0600\"}." -msgstr "" +msgstr "Der Zugriffsmodus des Sockets. Die Vorgabe ist @samp{\"0600\"}." #. type: deftypevr -#: doc/guix.texi:15371 +#: doc/guix.texi:15368 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string user" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:15374 doc/guix.texi:15397 +#: doc/guix.texi:15371 doc/guix.texi:15394 msgid "The user to own the socket. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der Benutzer, dem der Socket gehört. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15376 +#: doc/guix.texi:15373 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string group" -msgstr "" +msgstr "{@code{unix-listener-configuration}-Parameter} Zeichenkette group" #. type: deftypevr -#: doc/guix.texi:15379 doc/guix.texi:15402 +#: doc/guix.texi:15376 doc/guix.texi:15399 msgid "The group to own the socket. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Gruppe, der der Socket gehört. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15383 +#: doc/guix.texi:15380 msgid "Available @code{fifo-listener-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{fifo-listener-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15384 +#: doc/guix.texi:15381 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string path" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette path" #. type: deftypevr -#: doc/guix.texi:15389 +#: doc/guix.texi:15386 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string mode" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette mode" #. type: deftypevr -#: doc/guix.texi:15394 +#: doc/guix.texi:15391 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string user" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:15399 +#: doc/guix.texi:15396 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string group" -msgstr "" +msgstr "{@code{fifo-listener-configuration}-Parameter} Zeichenkette group" #. type: deftypevr -#: doc/guix.texi:15406 +#: doc/guix.texi:15403 msgid "Available @code{inet-listener-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{inet-listener-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15407 +#: doc/guix.texi:15404 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} string protocol" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Zeichenkette protocol" #. type: deftypevr -#: doc/guix.texi:15409 +#: doc/guix.texi:15406 msgid "The protocol to listen for." -msgstr "" +msgstr "Das Protokoll, auf das gelauscht wird." #. type: deftypevr -#: doc/guix.texi:15411 +#: doc/guix.texi:15408 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} string address" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Zeichenkette address" #. type: deftypevr -#: doc/guix.texi:15414 +#: doc/guix.texi:15411 msgid "The address on which to listen, or empty for all addresses. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Adresse, auf der gelauscht wird. Bleibt das Feld leer, wird auf allen Adressen gelauscht. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15416 +#: doc/guix.texi:15413 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Nichtnegative-ganze-Zahl port" #. type: deftypevr -#: doc/guix.texi:15418 +#: doc/guix.texi:15415 msgid "The port on which to listen." -msgstr "" +msgstr "Der Port, auf dem gelauscht werden soll." #. type: deftypevr -#: doc/guix.texi:15420 +#: doc/guix.texi:15417 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} boolean ssl?" -msgstr "" +msgstr "{@code{inet-listener-configuration}-Parameter} Boolescher-Ausdruck ssl?" #. type: deftypevr -#: doc/guix.texi:15424 +#: doc/guix.texi:15421 msgid "Whether to use SSL for this service; @samp{yes}, @samp{no}, or @samp{required}. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob für diesen Dienst SSL benutzt werden kann: @samp{yes} für ja, @samp{no} für nein oder @samp{required} für „verpflichtend“. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15428 +#: doc/guix.texi:15425 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer client-limit" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl client-limit" #. type: deftypevr -#: doc/guix.texi:15433 +#: doc/guix.texi:15430 msgid "Maximum number of simultaneous client connections per process. Once this number of connections is received, the next incoming connection will prompt Dovecot to spawn another process. If set to 0, @code{default-client-limit} is used instead." -msgstr "" +msgstr "Die maximale Anzahl gleichzeitiger Verbindungen mit Clients pro Prozess. Sobald diese Anzahl von Verbindungen eingegangen ist, bewirkt das Eingehen der nächsten Verbindung, dass Dovecot einen weiteren Prozess startet. Ist sie auf 0 gesetzt, benutzt Dovecot stattdessen @code{default-client-limit}." #. type: deftypevr -#: doc/guix.texi:15438 +#: doc/guix.texi:15435 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer service-count" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl service-count" #. type: deftypevr -#: doc/guix.texi:15443 +#: doc/guix.texi:15440 msgid "Number of connections to handle before starting a new process. Typically the only useful values are 0 (unlimited) or 1. 1 is more secure, but 0 is faster. . Defaults to @samp{1}." -msgstr "" +msgstr "Die Anzahl Verbindungen, die behandelt werden, bevor ein neuer Prozess gestartet wird. Typischerweise sind die einzig sinnvollen Werte 0 (unbeschränkt) oder 1. 1 ist sicherer, aber 0 ist schneller. Siehe . Die Vorgabe ist @samp{1}." #. type: deftypevr -#: doc/guix.texi:15446 +#: doc/guix.texi:15443 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer process-limit" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl process-limit" #. type: deftypevr -#: doc/guix.texi:15449 +#: doc/guix.texi:15446 msgid "Maximum number of processes that can exist for this service. If set to 0, @code{default-process-limit} is used instead." -msgstr "" +msgstr "Die maximale Anzahl von Prozessen, die für diesen Dienst existieren können. Wenn sie auf 0 gesetzt ist, benutzt Dovecot stattdessen @code{default-process-limit}." #. type: deftypevr -#: doc/guix.texi:15454 +#: doc/guix.texi:15451 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl process-min-avail" #. type: deftypevr -#: doc/guix.texi:15457 +#: doc/guix.texi:15454 msgid "Number of processes to always keep waiting for more connections. Defaults to @samp{0}." -msgstr "" +msgstr "Die Anzahl der Prozesse, mit denen immer auf neue Verbindungen gewartet wird. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:15459 +#: doc/guix.texi:15456 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit" -msgstr "" +msgstr "{@code{service-configuration}-Parameter} Nichtnegative-ganze-Zahl vsz-limit" #. type: deftypevr -#: doc/guix.texi:15463 +#: doc/guix.texi:15460 msgid "If you set @samp{service-count 0}, you probably need to grow this. Defaults to @samp{256000000}." -msgstr "" +msgstr "Wenn Sie @samp{service-count 0} festlegen, müssen Sie hierfür wahrscheinlich eine größere Zahl wählen. Die Vorgabe ist @samp{256000000}." #. type: deftypevr -#: doc/guix.texi:15467 +#: doc/guix.texi:15464 #, no-wrap msgid "{@code{dovecot-configuration} parameter} dict-configuration dict" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} dict-configuration dict" #. type: deftypevr -#: doc/guix.texi:15470 +#: doc/guix.texi:15467 msgid "Dict configuration, as created by the @code{dict-configuration} constructor." -msgstr "" +msgstr "Die Wörterbuchkonfiguration, wie sie der @code{dict-configuration}-Konstruktor erzeugt." #. type: deftypevr -#: doc/guix.texi:15472 +#: doc/guix.texi:15469 msgid "Available @code{dict-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{dict-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15473 +#: doc/guix.texi:15470 #, no-wrap msgid "{@code{dict-configuration} parameter} free-form-fields entries" -msgstr "" +msgstr "{@code{dict-configuration}-Parameter} Formlose-Felder entries" #. type: deftypevr -#: doc/guix.texi:15476 +#: doc/guix.texi:15473 msgid "A list of key-value pairs that this dict should hold. Defaults to @samp{()}." -msgstr "" +msgstr "Eine Liste von Schlüssel-Wert-Paaren, die in diesem Wörterbuch enthalten sein sollen. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15480 +#: doc/guix.texi:15477 #, no-wrap msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „passdb-configuration“-Liste passdbs" #. type: deftypevr -#: doc/guix.texi:15483 +#: doc/guix.texi:15480 msgid "A list of passdb configurations, each one created by the @code{passdb-configuration} constructor." -msgstr "" +msgstr "Eine Liste von Passwortdatenbankkonfigurationen, die jeweils mit dem @code{passdb-configuration}-Konstruktor erzeugt werden." #. type: deftypevr -#: doc/guix.texi:15485 +#: doc/guix.texi:15482 msgid "Available @code{passdb-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{passdb-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15486 +#: doc/guix.texi:15483 #, no-wrap msgid "{@code{passdb-configuration} parameter} string driver" -msgstr "" +msgstr "{@code{passdb-configuration}-Parameter} Zeichenkette driver" #. type: deftypevr -#: doc/guix.texi:15491 +#: doc/guix.texi:15488 msgid "The driver that the passdb should use. Valid values include @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth}, and @samp{static}. Defaults to @samp{\"pam\"}." -msgstr "" +msgstr "Der Treiber, den die Passwortdatenbank benutzen soll. Zu den gültigen Werten gehören @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth} und @samp{static}. Die Vorgabe ist @samp{\"pam\"}." #. type: deftypevr -#: doc/guix.texi:15493 +#: doc/guix.texi:15490 #, no-wrap msgid "{@code{passdb-configuration} parameter} space-separated-string-list args" -msgstr "" +msgstr "{@code{passdb-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste args" #. type: deftypevr -#: doc/guix.texi:15496 +#: doc/guix.texi:15493 msgid "Space separated list of arguments to the passdb driver. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Leerzeichengetrennte Liste der Argumente an den Passwortdatenbanktreiber. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15500 +#: doc/guix.texi:15497 #, no-wrap msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „userdb-configuration“-Liste userdbs" #. type: deftypevr -#: doc/guix.texi:15503 +#: doc/guix.texi:15500 msgid "List of userdb configurations, each one created by the @code{userdb-configuration} constructor." -msgstr "" +msgstr "Liste der Benutzerdatenbankkonfigurationen, die jeweils mit dem @code{userdb-configuration}-Konstruktor erzeugt werden." #. type: deftypevr -#: doc/guix.texi:15505 +#: doc/guix.texi:15502 msgid "Available @code{userdb-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{userdb-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15506 +#: doc/guix.texi:15503 #, no-wrap msgid "{@code{userdb-configuration} parameter} string driver" -msgstr "" +msgstr "{@code{userdb-configuration}-Parameter} Zeichenkette driver" #. type: deftypevr -#: doc/guix.texi:15510 +#: doc/guix.texi:15507 msgid "The driver that the userdb should use. Valid values include @samp{passwd} and @samp{static}. Defaults to @samp{\"passwd\"}." -msgstr "" +msgstr "Der Treiber, den die Benutzerdatenbank benutzen soll. Zu den gültigen Werten gehören @samp{passwd} und @samp{static}. Die Vorgabe ist @samp{\"passwd\"}." #. type: deftypevr -#: doc/guix.texi:15512 +#: doc/guix.texi:15509 #, no-wrap msgid "{@code{userdb-configuration} parameter} space-separated-string-list args" -msgstr "" +msgstr "{@code{userdb-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste args" #. type: deftypevr -#: doc/guix.texi:15515 +#: doc/guix.texi:15512 msgid "Space separated list of arguments to the userdb driver. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Leerzeichengetrennte Liste der Argumente an den Benutzerdatenbanktreiber. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15517 +#: doc/guix.texi:15514 #, no-wrap msgid "{@code{userdb-configuration} parameter} free-form-args override-fields" -msgstr "" +msgstr "{@code{userdb-configuration}-Parameter} Formlose-Argumente override-fields" #. type: deftypevr -#: doc/guix.texi:15520 +#: doc/guix.texi:15517 msgid "Override fields from passwd. Defaults to @samp{()}." -msgstr "" +msgstr "Einträge, die Vorrang vor den Feldern aus passwd haben. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15524 +#: doc/guix.texi:15521 #, no-wrap msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „plugin-configuration“ plugin-configuration" #. type: deftypevr -#: doc/guix.texi:15527 +#: doc/guix.texi:15524 msgid "Plug-in configuration, created by the @code{plugin-configuration} constructor." -msgstr "" +msgstr "Die Plugin-Konfiguration, die vom @code{plugin-configuration}-Konstruktor erzeugt wird." #. type: deftypevr -#: doc/guix.texi:15529 +#: doc/guix.texi:15526 #, no-wrap msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} „namespace-configuration“-Liste namespaces" #. type: deftypevr -#: doc/guix.texi:15532 +#: doc/guix.texi:15529 msgid "List of namespaces. Each item in the list is created by the @code{namespace-configuration} constructor." -msgstr "" +msgstr "Liste der Namensräume. Jedes Objekt in der Liste wird durch den @code{namespace-configuration}-Konstruktor erzeugt." #. type: deftypevr -#: doc/guix.texi:15534 +#: doc/guix.texi:15531 msgid "Available @code{namespace-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{namespace-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15535 +#: doc/guix.texi:15532 #, no-wrap msgid "{@code{namespace-configuration} parameter} string name" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:15537 +#: doc/guix.texi:15534 msgid "Name for this namespace." -msgstr "" +msgstr "Der Name dieses Namensraums." #. type: deftypevr -#: doc/guix.texi:15539 +#: doc/guix.texi:15536 #, no-wrap msgid "{@code{namespace-configuration} parameter} string type" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette type" #. type: deftypevr -#: doc/guix.texi:15542 +#: doc/guix.texi:15539 msgid "Namespace type: @samp{private}, @samp{shared} or @samp{public}. Defaults to @samp{\"private\"}." -msgstr "" +msgstr "Namensraum-Typ: @samp{private}, @samp{shared} oder @samp{public}. Die Vorgabe ist @samp{\"private\"}." #. type: deftypevr -#: doc/guix.texi:15544 +#: doc/guix.texi:15541 #, no-wrap msgid "{@code{namespace-configuration} parameter} string separator" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette separator" #. type: deftypevr -#: doc/guix.texi:15550 +#: doc/guix.texi:15547 msgid "Hierarchy separator to use. You should use the same separator for all namespaces or some clients get confused. @samp{/} is usually a good one. The default however depends on the underlying mail storage format. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Welche Trennzeichen in der Hierarchie von Namensräumen benutzt werden sollen. Sie sollten denselben Trenner für alle Namensräume benutzen, sonst führt es zu Verwirrung bei manchen Clients. Meistens ist @samp{/} eine gute Wahl, die Voreinstellung ist allerdings abhängig vom darunterliegenden Mail-Speicher-Format. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15552 +#: doc/guix.texi:15549 #, no-wrap msgid "{@code{namespace-configuration} parameter} string prefix" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette prefix" #. type: deftypevr -#: doc/guix.texi:15556 +#: doc/guix.texi:15553 msgid "Prefix required to access this namespace. This needs to be different for all namespaces. For example @samp{Public/}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Das Präfix, das für Zugang auf diesen Namensraum angegeben werden muss. Es muss für jeden Namensraum ein anderes gewählt werden. Ein Beispiel ist @samp{Public/}. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15558 +#: doc/guix.texi:15555 #, no-wrap msgid "{@code{namespace-configuration} parameter} string location" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Zeichenkette location" #. type: deftypevr -#: doc/guix.texi:15562 +#: doc/guix.texi:15559 msgid "Physical location of the mailbox. This is in the same format as mail_location, which is also the default for it. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der physische Ort, an dem sich dieses Postfach („Mailbox“) befindet. Das Format ist dasselbe wie beim Mail-Ort („mail location“), der auch als Voreinstellung hierfür benutzt wird. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15564 +#: doc/guix.texi:15561 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean inbox?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck inbox?" #. type: deftypevr -#: doc/guix.texi:15568 +#: doc/guix.texi:15565 msgid "There can be only one INBOX, and this setting defines which namespace has it. Defaults to @samp{#f}." -msgstr "" +msgstr "Es kann nur eine INBOX geben; hiermit wird festgelegt, zu welchem Namensraum sie gehört. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15570 +#: doc/guix.texi:15567 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean hidden?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck hidden?" #. type: deftypevr -#: doc/guix.texi:15578 +#: doc/guix.texi:15575 msgid "If namespace is hidden, it's not advertised to clients via NAMESPACE extension. You'll most likely also want to set @samp{list? #f}. This is mostly useful when converting from another server with different namespaces which you want to deprecate but still keep working. For example you can create hidden namespaces with prefixes @samp{~/mail/}, @samp{~%u/mail/} and @samp{mail/}. Defaults to @samp{#f}." -msgstr "" +msgstr "Wenn der Namensraum versteckt ist, wird er Clients gegenüber @emph{nicht} über die NAMESPACE-Erweiterung mitgeteilt. Wahrscheinlich möchten Sie auch @samp{list? #f} festlegen. Das ist in erster Linie dann nützlich, wenn Sie von einem anderen Server mit anderen Namensräumen umziehen, die Sie ersetzen möchten, die aber trotzdem noch weiterhin funktionieren sollen. Zum Beispiel können Sie versteckte Namensräume mit Präfixen @samp{~/mail/}, @samp{~%u/mail/} und @samp{mail/} anlegen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15580 +#: doc/guix.texi:15577 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean list?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck list?" #. type: deftypevr -#: doc/guix.texi:15586 +#: doc/guix.texi:15583 msgid "Show the mailboxes under this namespace with the LIST command. This makes the namespace visible for clients that do not support the NAMESPACE extension. The special @code{children} value lists child mailboxes, but hides the namespace prefix. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob die Postfächer („Mailboxes“) unter diesem Namensraum mit dem LIST-Befehl angezeigt werden können. Dadurch wird der Namensraum für Clients sichtbar, die die NAMESPACE-Erweiterung nicht unterstützen. Mit dem besonderen Wert @code{children} werden auch Kind-Postfächer aufgelistet, aber das Namensraumpräfix verborgen. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15588 +#: doc/guix.texi:15585 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean subscriptions?" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} Boolescher-Ausdruck subscriptions?" #. type: deftypevr -#: doc/guix.texi:15593 +#: doc/guix.texi:15590 msgid "Namespace handles its own subscriptions. If set to @code{#f}, the parent namespace handles them. The empty prefix should always have this as @code{#t}). Defaults to @samp{#t}." -msgstr "" +msgstr "Die Abonnements werden im Namensraum selbst behandelt. Wenn es auf @code{#f} gesetzt ist, werden sie im Elternnamensraum behandelt. Das leere Präfix sollte hier immer @code{#t} haben. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15595 +#: doc/guix.texi:15592 #, no-wrap msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes" -msgstr "" +msgstr "{@code{namespace-configuration}-Parameter} „mailbox-configuration“-Liste mailboxes" #. type: deftypevr -#: doc/guix.texi:15598 +#: doc/guix.texi:15595 msgid "List of predefined mailboxes in this namespace. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der in diesem Namensraum vordefinierten Postfächer. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15600 +#: doc/guix.texi:15597 msgid "Available @code{mailbox-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{mailbox-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:15601 +#: doc/guix.texi:15598 #, no-wrap msgid "{@code{mailbox-configuration} parameter} string name" -msgstr "" +msgstr "{@code{mailbox-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:15603 +#: doc/guix.texi:15600 msgid "Name for this mailbox." -msgstr "" +msgstr "Der Name dieses Postfachs (dieser „Mailbox“)." #. type: deftypevr -#: doc/guix.texi:15605 +#: doc/guix.texi:15602 #, no-wrap msgid "{@code{mailbox-configuration} parameter} string auto" -msgstr "" +msgstr "{@code{mailbox-configuration}-Parameter} Zeichenkette auto" #. type: deftypevr -#: doc/guix.texi:15609 +#: doc/guix.texi:15606 msgid "@samp{create} will automatically create this mailbox. @samp{subscribe} will both create and subscribe to the mailbox. Defaults to @samp{\"no\"}." -msgstr "" +msgstr "Bei @samp{create} wird dieses Postfach automatisch erzeugt. Bei @samp{subscribe} wird dieses Postfach sowohl automatisch erzeugt als auch automatisch abonniert. Die Vorgabe ist @samp{\"no\"}." #. type: deftypevr -#: doc/guix.texi:15611 +#: doc/guix.texi:15608 #, no-wrap msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use" -msgstr "" +msgstr "{@code{mailbox-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste special-use" #. type: deftypevr -#: doc/guix.texi:15616 +#: doc/guix.texi:15613 msgid "List of IMAP @code{SPECIAL-USE} attributes as specified by RFC 6154. Valid values are @code{\\All}, @code{\\Archive}, @code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent}, and @code{\\Trash}. Defaults to @samp{()}." -msgstr "" +msgstr "Liste der @code{SPECIAL-USE}-Attribute von IMAP, wie sie im RFC 6154 festgelegt wurden. Gültige Werte sind @code{\\All}, @code{\\Archive}, @code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent} und @code{\\Trash}. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15622 +#: doc/guix.texi:15619 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name base-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname base-dir" #. type: deftypevr -#: doc/guix.texi:15625 +#: doc/guix.texi:15622 msgid "Base directory where to store runtime data. Defaults to @samp{\"/var/run/dovecot/\"}." -msgstr "" +msgstr "Das Basisverzeichnis, in dem Laufzeitdaten gespeichert werden. Die Vorgabe ist @samp{\"/var/run/dovecot/\"}." #. type: deftypevr -#: doc/guix.texi:15627 +#: doc/guix.texi:15624 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string login-greeting" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette login-greeting" #. type: deftypevr -#: doc/guix.texi:15630 +#: doc/guix.texi:15627 msgid "Greeting message for clients. Defaults to @samp{\"Dovecot ready.\"}." -msgstr "" +msgstr "Begrüßungsnachricht für Clients. Die Vorgabe ist @samp{\"Dovecot ready.\"}." #. type: deftypevr -#: doc/guix.texi:15632 +#: doc/guix.texi:15629 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste login-trusted-networks" #. type: deftypevr -#: doc/guix.texi:15639 +#: doc/guix.texi:15636 msgid "List of trusted network ranges. Connections from these IPs are allowed to override their IP addresses and ports (for logging and for authentication checks). @samp{disable-plaintext-auth} is also ignored for these networks. Typically you would specify your IMAP proxy servers here. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Netzwerkbereiche, denen vertraut wird. Für Verbindungen von diesen IP-Adressen können abweichende IP-Adressen und Ports angegeben werden (zur Protokollierung und zur Authentifizierung). @samp{disable-plaintext-auth} wird für diese Netzwerke außerdem ignoriert. Normalerweise würden Sie hier Ihre IMAP-Proxy-Server eintragen. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15641 +#: doc/guix.texi:15638 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste login-access-sockets" #. type: deftypevr -#: doc/guix.texi:15644 +#: doc/guix.texi:15641 msgid "List of login access check sockets (e.g.@: tcpwrap). Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Sockets zur Zugriffsprüfung beim Anmelden (z.B.@: tcpwrap). Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15646 +#: doc/guix.texi:15643 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck verbose-proctitle?" #. type: deftypevr -#: doc/guix.texi:15652 +#: doc/guix.texi:15649 msgid "Show more verbose process titles (in ps). Currently shows user name and IP address. Useful for seeing who is actually using the IMAP processes (e.g.@: shared mailboxes or if the same uid is used for multiple accounts). Defaults to @samp{#f}." -msgstr "" +msgstr "Ausführlichere Prozessnamen anzeigen (mit „ps“). Nach Voreinstellung werden Benutzername und IP-Adresse angezeigt. Die Einstellung ist nützlich, wenn man sehen können will, wer tatsächlich IMAP-Prozesse benutzt (z.B.@: gemeinsam genutzte Postfächer oder wenn derselbe Benutzeridentifikator/„UID“ für mehrere Konten benutzt wird). Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15654 +#: doc/guix.texi:15651 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck shutdown-clients?" #. type: deftypevr -#: doc/guix.texi:15660 +#: doc/guix.texi:15657 msgid "Should all processes be killed when Dovecot master process shuts down. Setting this to @code{#f} means that Dovecot can be upgraded without forcing existing client connections to close (although that could also be a problem if the upgrade is e.g.@: due to a security fix). Defaults to @samp{#t}." -msgstr "" +msgstr "Ob alle Prozesse abgewürgt werden sollen, wenn der Haupt-Dovecot-Prozess terminiert. Ist dies auf @code{#f} gesetzt, kann Dovecot aktualisiert werden, ohne dass bestehende Client-Verbindungen zwangsweise geschlossen werden (jedoch kann das problematisch sein, wenn die Aktualisierung z.B.@: eine Sicherheitslücke schließen soll). Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15662 +#: doc/guix.texi:15659 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl doveadm-worker-count" #. type: deftypevr -#: doc/guix.texi:15666 +#: doc/guix.texi:15663 msgid "If non-zero, run mail commands via this many connections to doveadm server, instead of running them directly in the same process. Defaults to @samp{0}." -msgstr "" +msgstr "Ist dies @emph{nicht} null, werden Mail-Befehle über die angegebene Anzahl von Verbindungen an den doveadm-Server geschickt, statt sie direkt im selben Prozess auszuführen. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:15668 +#: doc/guix.texi:15665 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette doveadm-socket-path" #. type: deftypevr -#: doc/guix.texi:15671 +#: doc/guix.texi:15668 msgid "UNIX socket or host:port used for connecting to doveadm server. Defaults to @samp{\"doveadm-server\"}." -msgstr "" +msgstr "Der UNIX-Socket oder das „Host:Port“-Paar, mit dem Verbindungen zum doveadm-Server hergestellt werden. Die Vorgabe ist @samp{\"doveadm-server\"}." #. type: deftypevr -#: doc/guix.texi:15673 +#: doc/guix.texi:15670 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste import-environment" #. type: deftypevr -#: doc/guix.texi:15677 +#: doc/guix.texi:15674 msgid "List of environment variables that are preserved on Dovecot startup and passed down to all of its child processes. You can also give key=value pairs to always set specific settings." -msgstr "" +msgstr "Die Liste der Umgebungsvariablen, die beim Starten von Dovecot erhalten bleiben und allen Kindprozessen davon mitgegeben werden. Sie können auch „Schlüssel=Wert“-Paare angeben, um wie immer bestimmte Zuweisungen festzulegen." #. type: deftypevr -#: doc/guix.texi:15679 +#: doc/guix.texi:15676 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck disable-plaintext-auth?" #. type: deftypevr -#: doc/guix.texi:15686 +#: doc/guix.texi:15683 msgid "Disable LOGIN command and all other plaintext authentications unless SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP matches the local IP (i.e.@: you're connecting from the same computer), the connection is considered secure and plaintext authentication is allowed. See also ssl=required setting. Defaults to @samp{#t}." -msgstr "" +msgstr "Deaktiviert den LOGIN-Befehl und alle anderen Klartext-Authentizierungsverfahren, solange kein SSL/TLS benutzt wird (die LOGINDISABLED-Capability). Beachten Sie, dass, wenn die entfernte IP-Adresse mit der lokalen IP-Adresse identisch ist (Sie sich also vom selben Rechner aus verbinden), die Verbindung als sicher aufgefasst und Klartext-Authentizierung möglich ist. Siehe auch die „ssl=required“-Einstellung. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:15688 +#: doc/guix.texi:15685 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl auth-cache-size" #. type: deftypevr -#: doc/guix.texi:15693 +#: doc/guix.texi:15690 msgid "Authentication cache size (e.g.@: @samp{#e10e6}). 0 means it's disabled. Note that bsdauth, PAM and vpopmail require @samp{cache-key} to be set for caching to be used. Defaults to @samp{0}." -msgstr "" +msgstr "Die Größe des Zwischenspeichers für Authentifizierungen (z.B.@: @samp{#e10e6}). Bei 0 ist er deaktiviert. Beachten Sie, dass für bsdauth, PAM und vpopmail die Einstellung @samp{cache-key} festgelegt sein muss, damit ein Zwischenspeicher benutzt wird. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:15695 +#: doc/guix.texi:15692 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-cache-ttl" #. type: deftypevr -#: doc/guix.texi:15703 +#: doc/guix.texi:15700 msgid "Time to live for cached data. After TTL expires the cached record is no longer used, *except* if the main database lookup returns internal failure. We also try to handle password changes automatically: If user's previous authentication was successful, but this one wasn't, the cache isn't used. For now this works only with plaintext authentication. Defaults to @samp{\"1 hour\"}." -msgstr "" +msgstr "Wie lange Daten im Zwischenspeicher gültig bleiben („Time to live“). Nachdem die TTL ausläuft, wird der zwischengespeicherte Eintrag nicht mehr benutzt, @emph{außer} wenn eine Auflösung über die Hauptdatenbank zu einem internen Fehler führt. Dovecot versucht zudem, Passwortänderungen automatisch zu behandeln: Wenn die letzte Authentizierung erfolgreich war, diese jetzt aber nicht, wird der Zwischenspeicher @emph{nicht} benutzt. Derzeit funktioniert dies nur bei Klartext-Authentizierung. Die Vorgabe ist @samp{\"1 hour\"} für 1 Stunde." #. type: deftypevr -#: doc/guix.texi:15705 +#: doc/guix.texi:15702 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-cache-negative-ttl" #. type: deftypevr -#: doc/guix.texi:15709 +#: doc/guix.texi:15706 msgid "TTL for negative hits (user not found, password mismatch). 0 disables caching them completely. Defaults to @samp{\"1 hour\"}." -msgstr "" +msgstr "TTL beim Zwischenspeichern negativer Ergebnisse („negative Hits“, z.B.@: wenn der Benutzer nicht gefunden wurde oder das Passwort nicht stimmt). 0 deaktiviert das Zwischenspeichern davon vollständig. Die Vorgabe ist @samp{\"1 hour\"} für 1 Stunde." #. type: deftypevr -#: doc/guix.texi:15711 +#: doc/guix.texi:15708 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste auth-realms" #. type: deftypevr -#: doc/guix.texi:15717 +#: doc/guix.texi:15714 msgid "List of realms for SASL authentication mechanisms that need them. You can leave it empty if you don't want to support multiple realms. Many clients simply use the first one listed here, so keep the default realm first. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Administrationsbereiche („Realms“) für SASL-Authentizierungsmechanismen, die solche benötigen. Sie können dieses Feld leer lassen, wenn Sie @emph{keine} Unterstützung für mehrere Administrationsbereiche wollen. Viele Clients benutzen den ersten hier aufgelisteten Administrationsbereich, also sollte der als Voreinstellung gewünschte Bereich vorne stehen. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15719 +#: doc/guix.texi:15716 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-default-realm" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-default-realm" #. type: deftypevr -#: doc/guix.texi:15724 +#: doc/guix.texi:15721 msgid "Default realm/domain to use if none was specified. This is used for both SASL realms and appending @@domain to username in plaintext logins. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der voreingestellte Administrationsbereich bzw.@: die Domain, falls keiner angegeben wurde. Dies wird sowohl für SASL-Administrationsbereiche als auch zum Anhängen von @@domain an den Benutzernamen bei Klartextanmeldungen benutzt. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15726 +#: doc/guix.texi:15723 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-chars" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-username-chars" #. type: deftypevr -#: doc/guix.texi:15733 +#: doc/guix.texi:15730 msgid "List of allowed characters in username. If the user-given username contains a character not listed in here, the login automatically fails. This is just an extra check to make sure user can't exploit any potential quote escaping vulnerabilities with SQL/LDAP databases. If you want to allow all characters, set this value to empty. Defaults to @samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}." -msgstr "" +msgstr "Die Liste der in Benutzernamen zulässigen Zeichen. Wenn der vom Benutzer angegebene Benutzername ein hier nicht aufgelistetes Zeichen enthält, wird die Authentizierung automatisch abgelehnt. Dies dient bloß als eine weitere Überprüfung, um zu gewährleisten, dass mögliche Schwachstellen bei der Maskierung von Anführungszeichen in SQL-/LDAP-Datenbanken nicht ausgenutzt werden können. Wenn Sie alle Zeichen zulassen möchten, setzen Sie dieses Feld auf eine leere Zeichenkette. Die Vorgabe ist @samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}." #. type: deftypevr -#: doc/guix.texi:15735 +#: doc/guix.texi:15732 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-translation" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-username-translation" #. type: deftypevr -#: doc/guix.texi:15741 +#: doc/guix.texi:15738 msgid "Username character translations before it's looked up from databases. The value contains series of from -> to characters. For example @samp{#@@/@@} means that @samp{#} and @samp{/} characters are translated to @samp{@@}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Wie Zeichen in Benutzernamen ersetzt werden sollen, bevor der Name mit Datenbanken aufgelöst wird. Der Wert besteht aus einer Reihe von Angaben, welches Zeichen durch welches zu ersetzen ist. Zum Beispiel werden für @samp{#@@/@@} die Zeichen @samp{#} und @samp{/} beide durch @samp{@@} ersetzt. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15743 +#: doc/guix.texi:15740 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-username-format" #. type: deftypevr -#: doc/guix.texi:15750 +#: doc/guix.texi:15747 msgid "Username formatting before it's looked up from databases. You can use the standard variables here, e.g.@: %Lu would lowercase the username, %n would drop away the domain if it was given, or @samp{%n-AT-%d} would change the @samp{@@} into @samp{-AT-}. This translation is done after @samp{auth-username-translation} changes. Defaults to @samp{\"%Lu\"}." -msgstr "" +msgstr "Formatierungsanweisungen, die auf jeden Benutzernamen angewandt werden, bevor er mit einer Datenbank aufgelöst wird. Sie können hierzu die Standardvariablen verwenden, z.B.@: würde %Lu den Benutzernamen in Kleinbuchstaben umschreiben („lowercase“), %n würde den Domainnamen weglassen, wenn einer angegeben wurde, und @samp{%n-AT-%d} würde alle @samp{@@} durch @samp{-AT-} ersetzen. Diese Übersetzung wird durchgeführt, nachdem die Änderungen aus @samp{auth-username-translation} angewandt wurden. Die Vorgabe ist @samp{\"%Lu\"}." #. type: deftypevr -#: doc/guix.texi:15752 +#: doc/guix.texi:15749 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-master-user-separator" #. type: deftypevr -#: doc/guix.texi:15760 +#: doc/guix.texi:15757 msgid "If you want to allow master users to log in by specifying the master username within the normal username string (i.e.@: not using SASL mechanism's support for it), you can specify the separator character here. The format is then . UW-IMAP uses @samp{*} as the separator, so that could be a good choice. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Wenn Sie es für „Master“-Benutzer erlauben möchten, sich durch Angeben des Master-Benutzernamens als Teil einer normalen Benutzernamens-Zeichenkette als jemand anders anzumelden (also ohne Verwendung der Unterstützung davon durch den SASL-Mechanismus), können Sie hier die Trennzeichen dazwischen angeben. Das Format ist dann . UW-IMAP benutzt @samp{*} als Trennzeichen, also könnte das eine gute Wahl sein. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15762 +#: doc/guix.texi:15759 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-anonymous-username" #. type: deftypevr -#: doc/guix.texi:15766 +#: doc/guix.texi:15763 msgid "Username to use for users logging in with ANONYMOUS SASL mechanism. Defaults to @samp{\"anonymous\"}." -msgstr "" +msgstr "Der Benutzername, der verwendet wird, wenn sich Benutzer mit dem SASL-Mechanismus „ANONYMOUS“ anmelden. Die Vorgabe ist @samp{\"anonymous\"}." #. type: deftypevr -#: doc/guix.texi:15768 +#: doc/guix.texi:15765 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl auth-worker-max-count" #. type: deftypevr -#: doc/guix.texi:15773 +#: doc/guix.texi:15770 msgid "Maximum number of dovecot-auth worker processes. They're used to execute blocking passdb and userdb queries (e.g.@: MySQL and PAM). They're automatically created and destroyed as needed. Defaults to @samp{30}." -msgstr "" +msgstr "Die maximale Anzahl von dovecot-auth-Arbeiterprozessen. Diese werden benutzt, um blockierende Anfragen an die Passwortdatenbank („passdb“) und an die Benutzerdatenbank („userdb“) zu stellen (z.B.@: MySQL und PAM). Sie werden automatisch erzeugt und gelöscht, je nachdem, wann sie gebraucht werden. Die Vorgabe ist @samp{30}." #. type: deftypevr -#: doc/guix.texi:15775 +#: doc/guix.texi:15772 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-gssapi-hostname" #. type: deftypevr -#: doc/guix.texi:15780 +#: doc/guix.texi:15777 msgid "Host name to use in GSSAPI principal names. The default is to use the name returned by gethostname(). Use @samp{$ALL} (with quotes) to allow all keytab entries. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Der Rechnername, der in GSSAPI-Prinzipalnamen benutzt wird. Nach Voreinstellung wird der durch gethostname() zurückgelieferte Name verwendet. Benutzen Sie @samp{$ALL} (mit Anführungszeichen), damit alle Einträge in der Schlüsseltabelle („Keytab“) akzeptiert werden. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15782 +#: doc/guix.texi:15779 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-krb5-keytab" #. type: deftypevr -#: doc/guix.texi:15788 +#: doc/guix.texi:15785 msgid "Kerberos keytab to use for the GSSAPI mechanism. Will use the system default (usually @file{/etc/krb5.keytab}) if not specified. You may need to change the auth service to run as root to be able to read this file. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Kerberos-Schlüsseltabelle („Keytab“), die für den GSSAPI-Mechanismus benutzt werden soll. Wenn sie nicht angegeben wird, wird die Voreinstellung des Systems benutzt (in der Regel @file{/etc/krb5.keytab}). Eventuell müssen Sie den Auth-Dienst als Administratornutzer „root“ ausführen lassen, um Lesezugriffe auf diese Datei zu ermöglichen. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15790 +#: doc/guix.texi:15787 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-use-winbind?" #. type: deftypevr -#: doc/guix.texi:15795 +#: doc/guix.texi:15792 msgid "Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and @samp{ntlm-auth} helper. . Defaults to @samp{#f}." -msgstr "" +msgstr "NTLM-Authentifizierung und GSS-SPNEGO-Authentifizierung mit dem winbind-Daemon und dem @samp{ntlm-auth}-Hilfsprogramm von Samba durchführen. Siehe . Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15797 +#: doc/guix.texi:15794 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname auth-winbind-helper-path" #. type: deftypevr -#: doc/guix.texi:15800 +#: doc/guix.texi:15797 msgid "Path for Samba's @samp{ntlm-auth} helper binary. Defaults to @samp{\"/usr/bin/ntlm_auth\"}." -msgstr "" +msgstr "Der Pfad zur Binärdatei @samp{ntlm-auth} von Samba. Die Vorgabe ist @samp{\"/usr/bin/ntlm_auth\"}." #. type: deftypevr -#: doc/guix.texi:15802 +#: doc/guix.texi:15799 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-failure-delay" #. type: deftypevr -#: doc/guix.texi:15805 +#: doc/guix.texi:15802 msgid "Time to delay before replying to failed authentications. Defaults to @samp{\"2 secs\"}." -msgstr "" +msgstr "Die Zeit, wie lange vor der Antwort auf eine fehlgeschlagene Authentizierung gewartet wird. Die Vorgabe ist @samp{\"2 secs\"} für 2 Sekunden." #. type: deftypevr -#: doc/guix.texi:15807 +#: doc/guix.texi:15804 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-ssl-require-client-cert?" #. type: deftypevr -#: doc/guix.texi:15811 +#: doc/guix.texi:15808 msgid "Require a valid SSL client certificate or the authentication fails. Defaults to @samp{#f}." -msgstr "" +msgstr "Es wird ein gültiges SSL-Client-Zertifikat verlangt, andernfalls schlägt die Authentizierung fehl. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15813 +#: doc/guix.texi:15810 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-ssl-username-from-cert?" #. type: deftypevr -#: doc/guix.texi:15818 +#: doc/guix.texi:15815 msgid "Take the username from client's SSL certificate, using @code{X509_NAME_get_text_by_NID()} which returns the subject's DN's CommonName. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob der Benutzername aus dem SSL-Zertifikat des Clients ausgelesen werden soll, indem @code{X509_NAME_get_text_by_NID()} benutzt wird, um den Distinguished Name („DN“) als Gebräuchlicher Name („CommonName“) des Zertifikatinhabers („Subject“) auszulesen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15820 +#: doc/guix.texi:15817 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste auth-mechanisms" #. type: deftypevr -#: doc/guix.texi:15826 +#: doc/guix.texi:15823 msgid "List of wanted authentication mechanisms. Supported mechanisms are: @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey}, and @samp{gss-spnego}. NOTE: See also @samp{disable-plaintext-auth} setting." -msgstr "" +msgstr "Die Liste der erwünschten Authentizierungsmechanismen. Unterstützte Mechanismen sind: @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey} und @samp{gss-spnego}. @emph{Anmerkung}: Siehe auch die Einstellung zu @samp{disable-plaintext-auth}." #. type: deftypevr -#: doc/guix.texi:15828 +#: doc/guix.texi:15825 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste director-servers" #. type: deftypevr -#: doc/guix.texi:15833 +#: doc/guix.texi:15830 msgid "List of IPs or hostnames to all director servers, including ourself. Ports can be specified as ip:port. The default port is the same as what director service's @samp{inet-listener} is using. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der IP-Adressen oder Rechnernamen („Hostnames“) für alle Direktorserver, einschließlich dieses Servers selbst. Ports können wie in „IP:Port“ angegeben werden. Der voreingestellte Port ist derselbe wie der, der beim @samp{inet-listener} des Direktordienstes benutzt wird. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15835 +#: doc/guix.texi:15832 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste director-mail-servers" #. type: deftypevr -#: doc/guix.texi:15839 +#: doc/guix.texi:15836 msgid "List of IPs or hostnames to all backend mail servers. Ranges are allowed too, like 10.0.0.10-10.0.0.30. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der IP-Adressen oder Rechnernamen („Hostnames“), um alle Hintergrund-Mailserver zu erreichen. Auch Bereiche können angegeben werden, wie 10.0.0.10-10.0.0.30. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:15841 +#: doc/guix.texi:15838 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string director-user-expire" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette director-user-expire" #. type: deftypevr -#: doc/guix.texi:15845 +#: doc/guix.texi:15842 msgid "How long to redirect users to a specific server after it no longer has any connections. Defaults to @samp{\"15 min\"}." -msgstr "" +msgstr "Wie lange Benutzer zum selben Server weitergeleitet werden, sobald dieser keine Verbindungen mehr hat. Die Vorgabe ist @samp{\"15 min\"}." #. type: deftypevr -#: doc/guix.texi:15847 +#: doc/guix.texi:15844 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string director-username-hash" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette director-username-hash" #. type: deftypevr -#: doc/guix.texi:15852 +#: doc/guix.texi:15849 msgid "How the username is translated before being hashed. Useful values include %Ln if user can log in with or without @@domain, %Ld if mailboxes are shared within domain. Defaults to @samp{\"%Lu\"}." -msgstr "" +msgstr "Wie der Benutzername umgeschrieben wird, bevor er gehasht wird. Zu den sinnvollen Werten gehören %Ln, wenn der Nutzer sich mit oder ohne @@domain anmelden kann, oder %Ld, wenn Postfächer innerhalb der Domain gemeinsam genutzt werden. Die Vorgabe ist @samp{\"%Lu\"}." #. type: deftypevr -#: doc/guix.texi:15854 +#: doc/guix.texi:15851 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string log-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette log-path" #. type: deftypevr -#: doc/guix.texi:15858 +#: doc/guix.texi:15855 msgid "Log file to use for error messages. @samp{syslog} logs to syslog, @samp{/dev/stderr} logs to stderr. Defaults to @samp{\"syslog\"}." -msgstr "" +msgstr "Die Protokolldatei, die für Fehlermeldungen benutzt werden soll. Bei @samp{syslog} wird das Protokoll an syslog geschrieben, bei @samp{/dev/stderr} an die Standardfehlerausgabe. Die Vorgabe ist @samp{\"syslog\"}." #. type: deftypevr -#: doc/guix.texi:15860 +#: doc/guix.texi:15857 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string info-log-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette info-log-path" #. type: deftypevr -#: doc/guix.texi:15864 +#: doc/guix.texi:15861 msgid "Log file to use for informational messages. Defaults to @samp{log-path}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Protokolldatei, die für Informationsmeldungen benutzt werden soll. Die Voreinstellung ist @samp{log-path}. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15866 +#: doc/guix.texi:15863 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string debug-log-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette debug-log-path" #. type: deftypevr -#: doc/guix.texi:15870 +#: doc/guix.texi:15867 msgid "Log file to use for debug messages. Defaults to @samp{info-log-path}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Protokolldatei, die für Meldungen zur Fehlersuche benutzt werden soll. Die Voreinstellung ist @samp{info-log-path}. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:15872 +#: doc/guix.texi:15869 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string syslog-facility" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette syslog-facility" #. type: deftypevr -#: doc/guix.texi:15877 +#: doc/guix.texi:15874 msgid "Syslog facility to use if you're logging to syslog. Usually if you don't want to use @samp{mail}, you'll use local0..local7. Also other standard facilities are supported. Defaults to @samp{\"mail\"}." -msgstr "" +msgstr "Als welche Syslog-Einrichtung Protokolle an Syslog übermittelt werden sollen. Falls Sie @samp{mail} hierbei @emph{nicht} benutzen wollen, eignen sich normalerweise local0–local7. Andere Standardeinrichtungen werden auch unterstützt. Die Vorgabe ist @samp{\"mail\"}." #. type: deftypevr -#: doc/guix.texi:15879 +#: doc/guix.texi:15876 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-verbose?" #. type: deftypevr -#: doc/guix.texi:15883 +#: doc/guix.texi:15880 msgid "Log unsuccessful authentication attempts and the reasons why they failed. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob gescheiterte Anmeldeversuche und die Gründe, warum diese nicht erfolgreich waren, protokolliert werden sollen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15885 +#: doc/guix.texi:15882 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-verbose-passwords" msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette auth-verbose-passwords" #. type: deftypevr -#: doc/guix.texi:15892 +#: doc/guix.texi:15889 msgid "In case of password mismatches, log the attempted password. Valid values are no, plain and sha1. sha1 can be useful for detecting brute force password attempts vs. user simply trying the same password over and over again. You can also truncate the value to n chars by appending \":n\" (e.g.@: sha1:6). Defaults to @samp{\"no\"}." -msgstr "" +msgstr "Ob bei falschen Passwörtern das versuchte falsche Passwort ins Protokoll geschrieben werden soll. Gültige Werte sind \"no\" („nein“), \"plain\" (als Klartext) und \"sha1\". Den SHA1-Hash zu speichern kann nützlich sein, um zu erkennen, wenn jemand versucht, sehr viele Passwörter durchzuprobieren (ein „Brute-Force“-Angriff) oder ob Benutzer einfach nur dasselbe Passwort immer wieder probieren. Sie können auch nur die ersten n Zeichen des Wertes protokollieren, indem Sie \":n\" anhängen (z.B.@: sha1:6). Die Vorgabe ist @samp{\"no\"}." #. type: deftypevr -#: doc/guix.texi:15894 +#: doc/guix.texi:15891 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-debug?" #. type: deftypevr -#: doc/guix.texi:15898 +#: doc/guix.texi:15895 msgid "Even more verbose logging for debugging purposes. Shows for example SQL queries. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob zur Fehlersuche noch ausführlichere Protokolle geschrieben werden sollen. Zum Beispiel werden SQL-Anfragen protokolliert. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15900 +#: doc/guix.texi:15897 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck auth-debug-passwords?" #. type: deftypevr -#: doc/guix.texi:15905 +#: doc/guix.texi:15902 msgid "In case of password mismatches, log the passwords and used scheme so the problem can be debugged. Enabling this also enables @samp{auth-debug}. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob bei falschen Passwörtern das versuchte falsche Passwort und das benutzte Passwortschema ins Protokoll geschrieben werden soll, damit das Problem untersucht werden kann. Wenn dies aktiviert wird, wird auch @samp{auth-debug} aktiviert. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15907 +#: doc/guix.texi:15904 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-debug?" #. type: deftypevr -#: doc/guix.texi:15911 +#: doc/guix.texi:15908 msgid "Enable mail process debugging. This can help you figure out why Dovecot isn't finding your mails. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob die Fehlersuche beim Mail-Prozess ermöglicht werden soll. Dies kann Ihnen dabei helfen, herauszufinden, warum Dovecot Ihre E-Mails nicht findet. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15913 +#: doc/guix.texi:15910 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck verbose-ssl?" #. type: deftypevr -#: doc/guix.texi:15916 +#: doc/guix.texi:15913 msgid "Show protocol level SSL errors. Defaults to @samp{#f}." -msgstr "" +msgstr "SSL-Fehler auf Protokollebene anzeigen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:15918 +#: doc/guix.texi:15915 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string log-timestamp" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette log-timestamp" #. type: deftypevr -#: doc/guix.texi:15922 +#: doc/guix.texi:15919 msgid "Prefix for each line written to log file. % codes are in strftime(3) format. Defaults to @samp{\"\\\"%b %d %H:%M:%S \\\"\"}." -msgstr "" +msgstr "Das Präfix für jede Zeile, die ins Protokoll geschrieben wird. %-Codes sind im Format von strftime(3). Die Vorgabe ist @samp{\"\\\"%b %d %H:%M:%S \\\"\"}." #. type: deftypevr -#: doc/guix.texi:15924 +#: doc/guix.texi:15921 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste login-log-format-elements" #. type: deftypevr -#: doc/guix.texi:15928 +#: doc/guix.texi:15925 msgid "List of elements we want to log. The elements which have a non-empty variable value are joined together to form a comma-separated string." -msgstr "" +msgstr "Eine Liste der Elemente, die protokolliert werden sollen. Die Elemente, deren Variablenwerte nicht leer sind, werden zu einer kommagetrennten Zeichenkette zusammengefügt." #. type: deftypevr -#: doc/guix.texi:15930 +#: doc/guix.texi:15927 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string login-log-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette login-log-format" #. type: deftypevr -#: doc/guix.texi:15934 +#: doc/guix.texi:15931 msgid "Login log format. %s contains @samp{login-log-format-elements} string, %$ contains the data we want to log. Defaults to @samp{\"%$: %s\"}." -msgstr "" +msgstr "Das Format des Anmeldeprogramms. %s umfasst die Zeichenkette @samp{login-log-format-elements}, %$ enthält die Daten, die man protokollieren lassen möchte. Die Vorgabe ist @samp{\"%$: %s\"}." #. type: deftypevr -#: doc/guix.texi:15936 +#: doc/guix.texi:15933 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-log-prefix" #. type: deftypevr -#: doc/guix.texi:15940 +#: doc/guix.texi:15937 msgid "Log prefix for mail processes. See doc/wiki/Variables.txt for list of possible variables you can use. Defaults to @samp{\"\\\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}." -msgstr "" +msgstr "Das Präfix, das Protokollen für Mailprozesse vorangestellt wird. Siehe doc/wiki/Variables.txt für eine Liste der benutzbaren Variablen. Die Vorgabe ist @samp{\"\\\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}." #. type: deftypevr -#: doc/guix.texi:15942 +#: doc/guix.texi:15939 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string deliver-log-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette deliver-log-format" #. type: deftypevr -#: doc/guix.texi:15944 +#: doc/guix.texi:15941 msgid "Format to use for logging mail deliveries. You can use variables:" -msgstr "" +msgstr "Welches Format zur Protokollierung von Mailzustellungen verwendet werden soll. Sie können die folgenden Variablen benutzen:" #. type: item -#: doc/guix.texi:15945 +#: doc/guix.texi:15942 #, no-wrap msgid "%$" -msgstr "" +msgstr "%$" #. type: table -#: doc/guix.texi:15947 +#: doc/guix.texi:15944 msgid "Delivery status message (e.g.@: @samp{saved to INBOX})" -msgstr "" +msgstr "Zustellungsstatusnachricht (z.B.@: @samp{saved to INBOX})" #. type: item -#: doc/guix.texi:15947 +#: doc/guix.texi:15944 #, no-wrap msgid "%m" -msgstr "" +msgstr "%m" #. type: table -#: doc/guix.texi:15949 +#: doc/guix.texi:15946 msgid "Message-ID" -msgstr "" +msgstr "Nachrichtenidentifikator („Message-ID“)" #. type: item -#: doc/guix.texi:15949 doc/guix.texi:16481 +#: doc/guix.texi:15946 doc/guix.texi:16478 #, no-wrap msgid "%s" -msgstr "" +msgstr "%s" #. type: table -#: doc/guix.texi:15951 +#: doc/guix.texi:15948 msgid "Subject" -msgstr "" +msgstr "Betreff („Subject“)" #. type: item -#: doc/guix.texi:15951 +#: doc/guix.texi:15948 #, no-wrap msgid "%f" -msgstr "" +msgstr "%f" #. type: table -#: doc/guix.texi:15953 +#: doc/guix.texi:15950 msgid "From address" -msgstr "" +msgstr "Absendeadresse („From“)" #. type: table -#: doc/guix.texi:15955 +#: doc/guix.texi:15952 msgid "Physical size" -msgstr "" +msgstr "Physische Größe" #. type: item -#: doc/guix.texi:15955 +#: doc/guix.texi:15952 #, no-wrap msgid "%w" -msgstr "" +msgstr "%w" #. type: table -#: doc/guix.texi:15957 +#: doc/guix.texi:15954 msgid "Virtual size." -msgstr "" +msgstr "Virtuelle Größe." #. type: deftypevr -#: doc/guix.texi:15959 +#: doc/guix.texi:15956 msgid "Defaults to @samp{\"msgid=%m: %$\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"msgid=%m: %$\"}." #. type: deftypevr -#: doc/guix.texi:15961 +#: doc/guix.texi:15958 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-location" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-location" #. type: deftypevr -#: doc/guix.texi:15966 +#: doc/guix.texi:15963 msgid "Location for users' mailboxes. The default is empty, which means that Dovecot tries to find the mailboxes automatically. This won't work if the user doesn't yet have any mail, so you should explicitly tell Dovecot the full location." -msgstr "" +msgstr "Wo die Postfächer (die „Mailboxes“) der Benutzer gespeichert sind. Die Vorgabe ist die leere Zeichenkette, was bedeutet, dass Dovecot die Postfächer automatisch zu finden versucht. Das funktioniert nur, wenn der Nutzer bereits E-Mails gespeichert hat, also sollten Sie Dovecot den vollständigen Pfad mitteilen." #. type: deftypevr -#: doc/guix.texi:15972 +#: doc/guix.texi:15969 msgid "If you're using mbox, giving a path to the INBOX file (e.g.@: /var/mail/%u) isn't enough. You'll also need to tell Dovecot where the other mailboxes are kept. This is called the \"root mail directory\", and it must be the first path given in the @samp{mail-location} setting." -msgstr "" +msgstr "Wenn Sie das mbox-Format benutzen, genügt es @emph{nicht}, den Pfad zur INBOX-Datei (z.B.@: /var/mail/%u) anzugeben. Sie müssen Dovecot @emph{auch} mitteilen, wo die anderen Postfächer gespeichert sind. Dieses Verzeichnis nennt sich Wurzelmailverzeichnis („Root Mail Directory“) und es muss als erster Pfad in der @samp{mail-location}-Einstellung angegeben werden." #. type: deftypevr -#: doc/guix.texi:15974 +#: doc/guix.texi:15971 msgid "There are a few special variables you can use, eg.:" -msgstr "" +msgstr "Es gibt ein paar besondere Variable, die Sie verwenden können, z.B.:" #. type: table -#: doc/guix.texi:15978 +#: doc/guix.texi:15975 msgid "username" -msgstr "" +msgstr "Benutzername" #. type: item -#: doc/guix.texi:15978 doc/guix.texi:16477 +#: doc/guix.texi:15975 doc/guix.texi:16474 #, no-wrap msgid "%n" -msgstr "" +msgstr "%n" #. type: table -#: doc/guix.texi:15980 +#: doc/guix.texi:15977 msgid "user part in user@@domain, same as %u if there's no domain" -msgstr "" +msgstr "Benutzerteil in Benutzer@@Domain; sonst dasselbe wie %u, wenn es keine Domain gibt" #. type: item -#: doc/guix.texi:15980 +#: doc/guix.texi:15977 #, no-wrap msgid "%d" -msgstr "" +msgstr "%d" #. type: table -#: doc/guix.texi:15982 +#: doc/guix.texi:15979 msgid "domain part in user@@domain, empty if there's no domain" -msgstr "" +msgstr "Domainteil in Benutzer@@Domain; sonst leer, wenn es keine Domain gibt" #. type: item -#: doc/guix.texi:15982 +#: doc/guix.texi:15979 #, no-wrap msgid "%h" -msgstr "" +msgstr "%h" #. type: table -#: doc/guix.texi:15984 +#: doc/guix.texi:15981 msgid "home director" -msgstr "" +msgstr "Persönliches Verzeichnis" #. type: deftypevr -#: doc/guix.texi:15987 +#: doc/guix.texi:15984 msgid "See doc/wiki/Variables.txt for full list. Some examples:" -msgstr "" +msgstr "Siehe doc/wiki/Variables.txt für die vollständige Liste. Einige Beispiele:" #. type: item -#: doc/guix.texi:15988 +#: doc/guix.texi:15985 #, no-wrap msgid "maildir:~/Maildir" -msgstr "" +msgstr "maildir:~/Maildir" #. type: item -#: doc/guix.texi:15989 +#: doc/guix.texi:15986 #, no-wrap msgid "mbox:~/mail:INBOX=/var/mail/%u" -msgstr "" +msgstr "mbox:~/mail:INBOX=/var/mail/%u" #. type: item -#: doc/guix.texi:15990 +#: doc/guix.texi:15987 #, no-wrap msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%" -msgstr "" +msgstr "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%" #. type: deftypevr -#: doc/guix.texi:15995 +#: doc/guix.texi:15992 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-uid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-uid" #. type: deftypevr -#: doc/guix.texi:16000 +#: doc/guix.texi:15997 msgid "System user and group used to access mails. If you use multiple, userdb can override these by returning uid or gid fields. You can use either numbers or names. . Defaults to @samp{\"\"}." -msgstr "" +msgstr "Systembenutzer und -gruppe, die benutzt werden sollen, um auf Mails zuzugreifen. Wenn Sie mehrere Benutzerkonten verwenden, kann auch die Benutzerdatenbank „userdb“ vorrangig verwendet werden, indem sie zu Benutzer- oder Gruppenidentifikatoren (UIDs und GIDs) auflöst. Sie können hier Zahlen oder Namen angeben. Siehe . Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16002 +#: doc/guix.texi:15999 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-gid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-gid" #. type: deftypevr -#: doc/guix.texi:16007 +#: doc/guix.texi:16004 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-privileged-group" #. type: deftypevr -#: doc/guix.texi:16013 +#: doc/guix.texi:16010 msgid "Group to enable temporarily for privileged operations. Currently this is used only with INBOX when either its initial creation or dotlocking fails. Typically this is set to \"mail\" to give access to /var/mail. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Die Benutzergruppe, die zwischenzeitlich benutzt wird, um Operationen mit besonderen Berechtigungen auszuführen. Derzeit wird dies nur mit dem INBOX-Postfach benutzt, wenn dessen anfängliche Erzeugung oder Sperrung per „Dotlocking“-Datei fehlschlägt. Typischerweise wird es auf \"mail\" gesetzt, damit Zugriffe auf /var/mail möglich sind. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16015 +#: doc/guix.texi:16012 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-access-groups" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-access-groups" #. type: deftypevr -#: doc/guix.texi:16023 +#: doc/guix.texi:16020 msgid "Grant access to these supplementary groups for mail processes. Typically these are used to set up access to shared mailboxes. Note that it may be dangerous to set these if users can create symlinks (e.g.@: if \"mail\" group is set here, ln -s /var/mail ~/mail/var could allow a user to delete others' mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). Defaults to @samp{\"\"}." -msgstr "" +msgstr "Mail-Prozessen Zugriff auf diese zusätzlichen Benutzergruppen gewähren. Typischerweise werden sie benutzt, um gemeinsam genutzte Postfächer („Mailboxes“) so einzurichten, dass alle aus der Gruppe zugreifen können. Beachten Sie, dass es gefährlich sein kann, dies zu erlauben, wenn Benutzer symbolische Verknüpfungen einrichten können (z.B.@: kann jeder, wenn hier die \"mail\"-Gruppe festgelegt wurde, „ln -s /var/mail ~/mail/var“ benutzen, um die Postfächer der anderen zu löschen, oder „ln -s /secret/shared/box ~/mail/mybox“, um sie zu lesen). Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16025 +#: doc/guix.texi:16022 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-full-filesystem-access?" #. type: deftypevr -#: doc/guix.texi:16031 +#: doc/guix.texi:16028 msgid "Allow full file system access to clients. There's no access checks other than what the operating system does for the active UID/GID. It works with both maildir and mboxes, allowing you to prefix mailboxes names with e.g.@: /path/ or ~user/. Defaults to @samp{#f}." -msgstr "" +msgstr "Clients vollen Dateisystemzugriff gestatten. Damit gibt es keine Zugriffsüberprüfungen mehr, abgesehen von denen, die das Betriebssystem für die aktiven Benutzer- und Gruppenidentifikatoren (UID und GID) durchführt. Es ist sowohl für maildir- als auch mbox-Formate verwendbar und Sie können dadurch für Namen von Postfächern („Mailboxes“) Präfixe wie z.B.@: /pfad/ oder ~benutzer/ wählen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16033 +#: doc/guix.texi:16030 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mmap-disable?" #. type: deftypevr -#: doc/guix.texi:16037 +#: doc/guix.texi:16034 msgid "Don't use mmap() at all. This is required if you store indexes to shared file systems (NFS or clustered file system). Defaults to @samp{#f}." -msgstr "" +msgstr "Überhaupt kein mmap() benutzen. Das ist erforderlich, wenn Sie Indizes auf geteilten Dateisystemen speichern (wie NFS oder Cluster-Dateisystemen). Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16039 +#: doc/guix.texi:16036 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck dotlock-use-excl?" #. type: deftypevr -#: doc/guix.texi:16044 +#: doc/guix.texi:16041 msgid "Rely on @samp{O_EXCL} to work when creating dotlock files. NFS supports @samp{O_EXCL} since version 3, so this should be safe to use nowadays by default. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob sich Dovecot darauf verlassen kann, dass @samp{O_EXCL} funktioniert, wenn es Sperrdateien als „Dotlock“ erstellt. NFS unterstützt @samp{O_EXCL} seit Version 3, also sollte es heutzutage kein Problem mehr sein, dies als Voreinstellung zu benutzen. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16046 +#: doc/guix.texi:16043 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-fsync" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-fsync" #. type: deftypevr -#: doc/guix.texi:16048 +#: doc/guix.texi:16045 msgid "When to use fsync() or fdatasync() calls:" -msgstr "" +msgstr "Wann fsync() oder fdatasync() aufgerufen werden soll:" #. type: item -#: doc/guix.texi:16049 +#: doc/guix.texi:16046 #, no-wrap msgid "optimized" -msgstr "" +msgstr "optimized" #. type: table -#: doc/guix.texi:16051 +#: doc/guix.texi:16048 msgid "Whenever necessary to avoid losing important data" -msgstr "" +msgstr "Wann immer es nötig ist, um keine wichtigen Daten zu verlieren" #. type: table -#: doc/guix.texi:16053 +#: doc/guix.texi:16050 msgid "Useful with e.g.@: NFS when write()s are delayed" -msgstr "" +msgstr "Praktisch bei z.B.@: NFS, wenn Schreibzugriffe mit write() verzögert sind" #. type: table -#: doc/guix.texi:16055 +#: doc/guix.texi:16052 msgid "Never use it (best performance, but crashes can lose data)." -msgstr "" +msgstr "Niemals benutzen (ist am schnellsten, aber Abstürze können zu Datenverlusten führen)" #. type: deftypevr -#: doc/guix.texi:16057 +#: doc/guix.texi:16054 msgid "Defaults to @samp{\"optimized\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"optimized\"}." #. type: deftypevr -#: doc/guix.texi:16059 +#: doc/guix.texi:16056 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-nfs-storage?" #. type: deftypevr -#: doc/guix.texi:16064 +#: doc/guix.texi:16061 msgid "Mail storage exists in NFS. Set this to yes to make Dovecot flush NFS caches whenever needed. If you're using only a single mail server this isn't needed. Defaults to @samp{#f}." -msgstr "" +msgstr "Mails werden in NFS gespeichert. Setzen Sie dies auf ja, damit Dovecot NFS-Zwischenspeicher zurückschreiben kann, wann immer es nötig ist. Wenn Sie nur einen einzigen Mail-Server benutzen, brauchen Sie es @emph{nicht}. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16066 +#: doc/guix.texi:16063 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-nfs-index?" #. type: deftypevr -#: doc/guix.texi:16070 +#: doc/guix.texi:16067 msgid "Mail index files also exist in NFS. Setting this to yes requires @samp{mmap-disable? #t} and @samp{fsync-disable? #f}. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob die Index-Dateien für Mails auch in NFS gespeichert sind. Wenn dies auf ja gesetzt ist, muss @samp{mmap-disable? #t} und @samp{fsync-disable? #f} gesetzt sein. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16072 +#: doc/guix.texi:16069 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string lock-method" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette lock-method" #. type: deftypevr -#: doc/guix.texi:16078 +#: doc/guix.texi:16075 msgid "Locking method for index files. Alternatives are fcntl, flock and dotlock. Dotlocking uses some tricks which may create more disk I/O than other locking methods. NFS users: flock doesn't work, remember to change @samp{mmap-disable}. Defaults to @samp{\"fcntl\"}." -msgstr "" +msgstr "Die Sperrmethode für Indexdateien. Die Alternativen sind fcntl, flock und dotlock. Bei Dotlocking werden ein paar Tricks benutzt, die mehr Plattenein- und -ausgaben als andere Sperrmethoden zur Folge haben. Für NFS-Benutzer gilt: flock funktioniert nicht, also denken Sie bitte daran, @samp{mmap-disable} zu ändern. Die Vorgabe ist @samp{\"fcntl\"}." #. type: deftypevr -#: doc/guix.texi:16080 +#: doc/guix.texi:16077 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname mail-temp-dir" #. type: deftypevr -#: doc/guix.texi:16084 +#: doc/guix.texi:16081 msgid "Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. Defaults to @samp{\"/tmp\"}." -msgstr "" +msgstr "Das Verzeichnis, in dem LDA/LMTP zwischenzeitlich eingehende E-Mails >128 kB speichert. Die Vorgabe ist @samp{\"/tmp\"}." #. type: deftypevr -#: doc/guix.texi:16086 +#: doc/guix.texi:16083 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl first-valid-uid" #. type: deftypevr -#: doc/guix.texi:16092 +#: doc/guix.texi:16089 msgid "Valid UID range for users. This is mostly to make sure that users can't log in as daemons or other system users. Note that denying root logins is hardcoded to dovecot binary and can't be done even if @samp{first-valid-uid} is set to 0. Defaults to @samp{500}." -msgstr "" +msgstr "Der Bereich, in dem die Benutzerkennungen („UIDs“) von sich bei Dovecot anmeldenden Benutzern liegen müssen. Das dient hauptsächlich dazu, sicherzustellen, dass sich Anwender nicht mit den Benutzerkonten von Daemons oder sonstigen Systembenutzerkonten anmelden können. Beachten Sie, dass eine Anmeldung als Administrator „root“ grundsätzlich vom Code des Dovecot-Programms verboten wird und selbst dann @emph{nicht} möglich ist, wenn Sie @samp{first-valid-uid} auf 0 setzen. Die Vorgabe ist @samp{500}." #. type: deftypevr -#: doc/guix.texi:16094 +#: doc/guix.texi:16091 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl last-valid-uid" #. type: deftypevr -#: doc/guix.texi:16099 +#: doc/guix.texi:16096 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl first-valid-gid" #. type: deftypevr -#: doc/guix.texi:16104 +#: doc/guix.texi:16101 msgid "Valid GID range for users. Users having non-valid GID as primary group ID aren't allowed to log in. If user belongs to supplementary groups with non-valid GIDs, those groups are not set. Defaults to @samp{1}." -msgstr "" +msgstr "Der Bereich, in dem die Gruppenkennungen („GIDs“) von sich bei Dovecot anmeldenden Benutzern liegen müssen. Benutzerkonten, deren primäre Gruppe keine gültige GID hat, können sich nicht anmelden. Wenn das Benutzerkonto zu zusätzlichen Gruppen mit ungültiger GID gehört, werden diese Gruppen-Berechtigungen von Dovecot wieder abgegeben. Die Vorgabe ist @samp{1}." #. type: deftypevr -#: doc/guix.texi:16106 +#: doc/guix.texi:16103 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl last-valid-gid" #. type: deftypevr -#: doc/guix.texi:16111 +#: doc/guix.texi:16108 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-max-keyword-length" #. type: deftypevr -#: doc/guix.texi:16115 +#: doc/guix.texi:16112 msgid "Maximum allowed length for mail keyword name. It's only forced when trying to create new keywords. Defaults to @samp{50}." -msgstr "" +msgstr "Die maximale zulässige Länge eines Mail-Schlüsselwort-Namens. Sie wirkt sich nur aus, wenn Sie neue Schlüsselwörter anzulegen versuchen. Die Vorgabe ist @samp{50}." #. type: deftypevr -#: doc/guix.texi:16117 +#: doc/guix.texi:16114 #, no-wrap msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Doppelpunktgetrennte-Dateinamen-Liste valid-chroot-dirs" #. type: deftypevr -#: doc/guix.texi:16127 +#: doc/guix.texi:16124 msgid "List of directories under which chrooting is allowed for mail processes (i.e.@: /var/mail will allow chrooting to /var/mail/foo/bar too). This setting doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot settings. If this setting is empty, \"/./\" in home dirs are ignored. WARNING: Never add directories here which local users can modify, that may lead to root exploit. Usually this should be done only if you don't allow shell access for users. . Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Verzeichnisse, in die Mail-Prozesse per „chroot“ das Wurzelverzeichnis wechseln können (d.h.@: für /var/mail wird auch ein chroot nach /var/mail/foo/bar möglich). Diese Einstellung hat keinen Einfluss auf @samp{login-chroot}, @samp{mail-chroot} oder Authentifizierungs-„chroot“-Einstellungen. Wenn diese Einstellung leer gelassen wird, werden chroots per „/./“ in Persönlichen Verzeichnissen ignoriert. @emph{Warnung}: Fügen Sie niemals Verzeichnisse hinzu, die lokale Benutzer verändern können, weil diese dann eventuell über eine Rechteausweitung Administratorrechte an sich reißen können. In der Regel sollte man ein solches Verzeichnis nur eintragen, wenn Nutzer keinen Shell-Zugriff erhalten können. Siehe . Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:16129 +#: doc/guix.texi:16126 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-chroot" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-chroot" #. type: deftypevr -#: doc/guix.texi:16138 +#: doc/guix.texi:16135 msgid "Default chroot directory for mail processes. This can be overridden for specific users in user database by giving /./ in user's home directory (e.g.@: /home/./user chroots into /home). Note that usually there is no real need to do chrooting, Dovecot doesn't allow users to access files outside their mail directory anyway. If your home directories are prefixed with the chroot directory, append \"/.\"@: to @samp{mail-chroot}. . Defaults to @samp{\"\"}." -msgstr "" +msgstr "Das voreingestellte „chroot“-Verzeichnis für Mail-Prozesse. Es kann für einzelne Nutzer in der Benutzerdatenbank außer Kraft gesetzt werden, indem „/./“ als Teil der Angabe zum Persönlichen Verzeichnis des Benutzers verwendet wird (z.B.@: lässt /home/./benutzer das Wurzelverzeichnis per „chroot“ nach /home wechseln). Beachten Sie, dass es in der Regel @emph{nicht} unbedingt notwendig ist, Chrooting zu betreiben, weil Dovecot es Benutzern ohnehin nicht erlaubt, auf Dateien außerhalb ihres Mail-Verzeichnisses zuzugreifen. Wenn Ihren Persönlichen Verzeichnissen das Chroot-Verzeichnis vorangestellt ist, sollten Sie \"/.\"@: an @samp{mail-chroot} anhängen. Siehe . Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16140 +#: doc/guix.texi:16137 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname auth-socket-path" #. type: deftypevr -#: doc/guix.texi:16144 +#: doc/guix.texi:16141 msgid "UNIX socket path to master authentication server to find users. This is used by imap (for shared users) and lda. Defaults to @samp{\"/var/run/dovecot/auth-userdb\"}." -msgstr "" +msgstr "Der UNIX-Socket-Pfad, unter dem der Hauptauthentifizierungsserver zu finden ist, mit dem Nutzer gefunden werden können. Er wird von IMAP (für gemeinsame Benutzerkonten) und von LDA benutzt. Die Vorgabe ist @samp{\"/var/run/dovecot/auth-userdb\"}." #. type: deftypevr -#: doc/guix.texi:16146 +#: doc/guix.texi:16143 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Dateiname mail-plugin-dir" #. type: deftypevr -#: doc/guix.texi:16149 +#: doc/guix.texi:16146 msgid "Directory where to look up mail plugins. Defaults to @samp{\"/usr/lib/dovecot\"}." -msgstr "" +msgstr "Das Verzeichnis, in dem Mailplugins zu finden sind. Die Vorgabe ist @samp{\"/usr/lib/dovecot\"}." #. type: deftypevr -#: doc/guix.texi:16151 +#: doc/guix.texi:16148 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mail-plugins" #. type: deftypevr -#: doc/guix.texi:16155 +#: doc/guix.texi:16152 msgid "List of plugins to load for all services. Plugins specific to IMAP, LDA, etc.@: are added to this list in their own .conf files. Defaults to @samp{()}." -msgstr "" +msgstr "Die Liste der Plugins, die für alle Dienste geladen werden sollen. Plugins, die nur für IMAP, LDA, etc.@: gedacht sind, werden in ihren eigenen .conf-Dateien zu dieser Liste hinzugefügt. Die Vorgabe ist @samp{()}." #. type: deftypevr -#: doc/guix.texi:16157 +#: doc/guix.texi:16154 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-cache-min-mail-count" #. type: deftypevr -#: doc/guix.texi:16162 +#: doc/guix.texi:16159 msgid "The minimum number of mails in a mailbox before updates are done to cache file. This allows optimizing Dovecot's behavior to do less disk writes at the cost of more disk reads. Defaults to @samp{0}." -msgstr "" +msgstr "Die kleinste Anzahl an Mails in einem Postfach, bevor Aktualisierungen an der Zwischenspeicherdatei vorgenommen werden. Damit kann das Verhalten von Dovecot optimiert werden, um weniger Schreibzugriffe auf die Platte durchzuführen, wofür allerdings mehr Lesezugriffe notwendig werden. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:16164 +#: doc/guix.texi:16161 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mailbox-idle-check-interval" #. type: deftypevr -#: doc/guix.texi:16171 +#: doc/guix.texi:16168 msgid "When IDLE command is running, mailbox is checked once in a while to see if there are any new mails or other changes. This setting defines the minimum time to wait between those checks. Dovecot can also use dnotify, inotify and kqueue to find out immediately when changes occur. Defaults to @samp{\"30 secs\"}." -msgstr "" +msgstr "Während der IDLE-Befehl läuft, wird ab und zu im Postfach (der „Mailbox“) nachgeschaut, ob es neue Mails oder andere Änderungen gibt. Mit dieser Einstellung wird festgelegt, wie lange zwischen diesen Überprüfungen höchstens gewartet wird. Dovecot kann auch dnotify, inotify und kqueue benutzen, um sofort über Änderungen informiert zu werden. Die Vorgabe ist @samp{\"30 secs\"}." #. type: deftypevr -#: doc/guix.texi:16173 +#: doc/guix.texi:16170 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mail-save-crlf?" #. type: deftypevr -#: doc/guix.texi:16180 +#: doc/guix.texi:16177 msgid "Save mails with CR+LF instead of plain LF. This makes sending those mails take less CPU, especially with sendfile() syscall with Linux and FreeBSD. But it also creates a bit more disk I/O which may just make it slower. Also note that if other software reads the mboxes/maildirs, they may handle the extra CRs wrong and cause problems. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob Mails mit CR+LF-Kodierung für Zeilenumbrüche statt einfacher LF gespeichert werden sollen. Dadurch wird das Versenden dieser Mails den Prozessor weniger beanspruchen, dies gilt besonders für den Systemaufruf sendfile() unter Linux und FreeBSD. Allerdings werden auch ein bisschen mehr Ein- und Ausgaben auf der Platte notwendig, wodurch es insgesamt langsamer werden könnte. Beachten Sie außerdem, dass andere Software, die die mboxes/maildirs ausliest, mit den CRs falsch umgehen und Probleme verursachen könnte. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16182 +#: doc/guix.texi:16179 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck maildir-stat-dirs?" #. type: deftypevr -#: doc/guix.texi:16190 +#: doc/guix.texi:16187 msgid "By default LIST command returns all entries in maildir beginning with a dot. Enabling this option makes Dovecot return only entries which are directories. This is done by stat()ing each entry, so it causes more disk I/O. (For systems setting struct @samp{dirent->d_type} this check is free and it's done always regardless of this setting). Defaults to @samp{#f}." -msgstr "" +msgstr "Nach Voreinstellung liefert der LIST-Befehl alle Einträge im Mailverzeichnis („Maildir“), die mit einem Punkt beginnen. Wenn diese Option aktiviert wird, liefert Dovecot nur solche Einträge, die für Verzeichnisse stehen. Dazu wird auf jedem Eintrag stat() aufgerufen, wodurch mehr Ein- und Ausgaben auf der Platte anfallen. (Bei Systemen, die einen Struktureintrag @samp{dirent->d_type} machen, ist diese Überprüfung unnötig, daher werden dort nur Verzeichnisse geliefert, egal was hier eingestellt ist.) Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16192 +#: doc/guix.texi:16189 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck maildir-copy-with-hardlinks?" #. type: deftypevr -#: doc/guix.texi:16197 +#: doc/guix.texi:16194 msgid "When copying a message, do it with hard links whenever possible. This makes the performance much better, and it's unlikely to have any side effects. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob zum Kopieren einer Nachricht statt einer Kopie so weit möglich harte Verknüpfungen („Hard Links“) verwendet werden sollen. Dadurch wird das System wesentlich weniger ausgelastet und Nebenwirkungen sind unwahrscheinlich. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16199 +#: doc/guix.texi:16196 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck maildir-very-dirty-syncs?" #. type: deftypevr -#: doc/guix.texi:16204 +#: doc/guix.texi:16201 msgid "Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only when its mtime changes unexpectedly or when we can't find the mail otherwise. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob Dovecot annehmen darf, dass es der einzige MUA ist, der auf Maildir zugreift. Dann wird das cur/-Verzeichnis nur bei unerwarteten Änderungen an seiner mtime durchsucht oder wenn die Mail sonst nicht gefunden werden kann. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16206 +#: doc/guix.texi:16203 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mbox-read-locks" #. type: deftypevr -#: doc/guix.texi:16209 +#: doc/guix.texi:16206 msgid "Which locking methods to use for locking mbox. There are four available:" -msgstr "" +msgstr "Welche Sperrmethoden zum Sperren des mbox-Postfachs (der „Mailbox“) benutzt werden. Es stehen vier Methoden zur Auswahl:" #. type: item -#: doc/guix.texi:16211 +#: doc/guix.texi:16208 #, no-wrap msgid "dotlock" -msgstr "" +msgstr "dotlock" #. type: table -#: doc/guix.texi:16215 +#: doc/guix.texi:16212 msgid "Create .lock file. This is the oldest and most NFS-safe solution. If you want to use /var/mail/ like directory, the users will need write access to that directory." -msgstr "" +msgstr "Hier wird eine Datei namens .lock erzeugt. Es handelt sich um die älteste und am ehesten mit NFS verwendbare Lösung. Wenn Sie ein Verzeichnis wie /var/mail/ benutzen, müssen die Benutzer Schreibzugriff darauf haben." #. type: item -#: doc/guix.texi:16215 +#: doc/guix.texi:16212 #, no-wrap msgid "dotlock-try" -msgstr "" +msgstr "dotlock-try" #. type: table -#: doc/guix.texi:16218 +#: doc/guix.texi:16215 msgid "Same as dotlock, but if it fails because of permissions or because there isn't enough disk space, just skip it." -msgstr "" +msgstr "Genau wie dotlock, aber wenn es mangels Berechtigungen fehlschlägt oder nicht genug Plattenplatz verfügbar ist, wird einfach nicht gesperrt." #. type: item -#: doc/guix.texi:16218 +#: doc/guix.texi:16215 #, no-wrap msgid "fcntl" -msgstr "" +msgstr "fcntl" #. type: table -#: doc/guix.texi:16220 +#: doc/guix.texi:16217 msgid "Use this if possible. Works with NFS too if lockd is used." -msgstr "" +msgstr "Benutzen Sie diese Einstellung wenn möglich. Sie funktioniert auch mit NFS, sofern lockd benutzt wird." #. type: item -#: doc/guix.texi:16220 +#: doc/guix.texi:16217 #, no-wrap msgid "flock" -msgstr "" +msgstr "flock" #. type: table -#: doc/guix.texi:16222 doc/guix.texi:16224 +#: doc/guix.texi:16219 doc/guix.texi:16221 msgid "May not exist in all systems. Doesn't work with NFS." -msgstr "" +msgstr "Existiert vielleicht nicht auf allen Systemen. Funktioniert nicht mit NFS." #. type: item -#: doc/guix.texi:16222 +#: doc/guix.texi:16219 #, no-wrap msgid "lockf" -msgstr "" +msgstr "lockf" #. type: deftypevr -#: doc/guix.texi:16230 +#: doc/guix.texi:16227 msgid "You can use multiple locking methods; if you do the order they're declared in is important to avoid deadlocks if other MTAs/MUAs are using multiple locking methods as well. Some operating systems don't allow using some of them simultaneously." -msgstr "" +msgstr "Sie können mehrere Sperrmethoden angeben; wenn ja, dann ist deren Reihenfolge entscheidend, um Verklemmungen („Deadlocks“) zu vermeiden, wenn andere MTAs/MUAs auch mehrere Sperrmethoden benutzen. Manche Betriebssysteme erlauben es nicht, manche davon gleichzeitig zu benutzen." #. type: deftypevr -#: doc/guix.texi:16232 +#: doc/guix.texi:16229 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste mbox-write-locks" #. type: deftypevr -#: doc/guix.texi:16236 +#: doc/guix.texi:16233 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mbox-lock-timeout" #. type: deftypevr -#: doc/guix.texi:16239 +#: doc/guix.texi:16236 msgid "Maximum time to wait for lock (all of them) before aborting. Defaults to @samp{\"5 mins\"}." -msgstr "" +msgstr "Wie lange höchstens auf Sperren (irgendeiner Art) gewartet wird, bevor abgebrochen wird. Die Vorgabe ist @samp{\"5 mins\"}." #. type: deftypevr -#: doc/guix.texi:16241 +#: doc/guix.texi:16238 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mbox-dotlock-change-timeout" #. type: deftypevr -#: doc/guix.texi:16245 +#: doc/guix.texi:16242 msgid "If dotlock exists but the mailbox isn't modified in any way, override the lock file after this much time. Defaults to @samp{\"2 mins\"}." -msgstr "" +msgstr "Wenn eine Dotlock-Sperrdatei existiert, das Postfach (die „Mailbox“) aber auf keine Weise geändert wurde, wird die Sperrdatei nach der hier angegebenen Zeit außer Kraft gesetzt. Die Vorgabe ist @samp{\"2 mins\"}." #. type: deftypevr -#: doc/guix.texi:16247 +#: doc/guix.texi:16244 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mbox-dirty-syncs?" #. type: deftypevr -#: doc/guix.texi:16258 +#: doc/guix.texi:16255 msgid "When mbox changes unexpectedly we have to fully read it to find out what changed. If the mbox is large this can take a long time. Since the change is usually just a newly appended mail, it'd be faster to simply read the new mails. If this setting is enabled, Dovecot does this but still safely fallbacks to re-reading the whole mbox file whenever something in mbox isn't how it's expected to be. The only real downside to this setting is that if some other MUA changes message flags, Dovecot doesn't notice it immediately. Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK commands. Defaults to @samp{#t}." -msgstr "" +msgstr "Wenn sich das mbox-Postfach unerwartet ändert, müssen wir es gänzlich neu einlesen, um herauszufinden, was sich geändert hat. Wenn die mbox groß ist, kann das viel Zeit in Anspruch nehmen. Weil es sich bei der Änderung meistens nur um eine neu angefügte Mail handelt, wäre es schneller, nur die neuen Mails zu lesen. Wenn diese Einstellung hier aktiviert ist, arbeitet Dovecot nach dem eben beschriebenen Prinzip, liest aber doch die ganze mbox-Datei neu ein, sobald es etwas nicht wie erwartet vorfindet. Der einzige wirkliche Nachteil bei dieser Einstellung ist, dass es Dovecot nicht sofort erkennt, wenn ein anderer MUA die Statusindikatoren („Flags“) ändert. Beachten Sie, dass eine komplette Synchronisation bei den Befehlen SELECT, EXAMINE, EXPUNGE und CHECK durchgeführt wird. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16260 +#: doc/guix.texi:16257 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mbox-very-dirty-syncs?" #. type: deftypevr -#: doc/guix.texi:16265 +#: doc/guix.texi:16262 msgid "Like @samp{mbox-dirty-syncs}, but don't do full syncs even with SELECT, EXAMINE, EXPUNGE or CHECK commands. If this is set, @samp{mbox-dirty-syncs} is ignored. Defaults to @samp{#f}." -msgstr "" +msgstr "Wie @samp{mbox-dirty-syncs}, aber ohne dass komplette Synchronisationen selbst bei den Befehlen SELECT, EXAMINE, EXPUNGE oder CHECK durchgeführt werden. Wenn dies hier aktiviert ist, wird @samp{mbox-dirty-syncs} ignoriert. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16267 +#: doc/guix.texi:16264 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mbox-lazy-writes?" #. type: deftypevr -#: doc/guix.texi:16273 +#: doc/guix.texi:16270 msgid "Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK commands and when closing the mailbox). This is especially useful for POP3 where clients often delete all mails. The downside is that our changes aren't immediately visible to other MUAs. Defaults to @samp{#t}." -msgstr "" +msgstr "Ob das Schreiben von mbox-Kopfzeilen hinausgezögert wird, bis eine komplette Schreibsynchronisation durchgeführt wird (bei den Befehlen EXPUNGE und CHECK, und beim Schließen des Postfachs, d.h.@: der „Mailbox“). Das wird besonders nützlich, wenn Clients POP3 verwenden, wo es oft vorkommt, dass die Clients alle Mails löschen. Der Nachteil ist, dass Dovecots Änderungen nicht sofort für andere MUAs sichtbar werden. Die Vorgabe ist @samp{#t}." #. type: deftypevr -#: doc/guix.texi:16275 +#: doc/guix.texi:16272 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mbox-min-index-size" #. type: deftypevr -#: doc/guix.texi:16280 +#: doc/guix.texi:16277 msgid "If mbox size is smaller than this (e.g.@: 100k), don't write index files. If an index file already exists it's still read, just not updated. Defaults to @samp{0}." -msgstr "" +msgstr "Wenn die Größe des mbox-Postfaches kleiner als die angegebene Größe (z.B.@: 100k) ist, werden keine Index-Dateien geschrieben. Wenn bereits eine Index-Datei existiert, wird sie weiterhin gelesen und nur nicht aktualisiert. Die Vorgabe ist @samp{0}." #. type: deftypevr -#: doc/guix.texi:16282 +#: doc/guix.texi:16279 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mdbox-rotate-size" #. type: deftypevr -#: doc/guix.texi:16285 +#: doc/guix.texi:16282 msgid "Maximum dbox file size until it's rotated. Defaults to @samp{10000000}." -msgstr "" +msgstr "Die maximale Größe der dbox-Datei, bis sie rotiert wird. Die Vorgabe ist @samp{10000000}." #. type: deftypevr -#: doc/guix.texi:16287 +#: doc/guix.texi:16284 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mdbox-rotate-interval" #. type: deftypevr -#: doc/guix.texi:16292 +#: doc/guix.texi:16289 msgid "Maximum dbox file age until it's rotated. Typically in days. Day begins from midnight, so 1d = today, 2d = yesterday, etc. 0 = check disabled. Defaults to @samp{\"1d\"}." -msgstr "" +msgstr "Das maximale Alter der dbox-Datei, bis sie rotiert wird. Typischerweise wird es in Tagen angegeben. Der Tag beginnt um Mitternacht, also steht 1d für heute, 2d für gestern, etc. 0 heißt, die Überprüfung ist abgeschaltet. Die Vorgabe ist @samp{\"1d\"}." #. type: deftypevr -#: doc/guix.texi:16294 +#: doc/guix.texi:16291 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck mdbox-preallocate-space?" #. type: deftypevr -#: doc/guix.texi:16299 +#: doc/guix.texi:16296 msgid "When creating new mdbox files, immediately preallocate their size to @samp{mdbox-rotate-size}. This setting currently works only in Linux with some file systems (ext4, xfs). Defaults to @samp{#f}." -msgstr "" +msgstr "Ob beim Erstellen neuer mdbox-Postfachdateien gleich am Anfang eine Datei der Größe @samp{mdbox-rotate-size} vorab angelegt werden soll. Diese Einstellung funktioniert derzeit nur mit Linux auf manchen Dateisystemen (ext4, xfs). Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16301 +#: doc/guix.texi:16298 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-attachment-dir" #. type: deftypevr -#: doc/guix.texi:16305 +#: doc/guix.texi:16302 msgid "sdbox and mdbox support saving mail attachments to external files, which also allows single instance storage for them. Other backends don't support this for now." -msgstr "" +msgstr "Postfächer in den Formaten sdbox und mdbox unterstützen es, Mail-Anhänge in externen Dateien zu speichern, wodurch sie mit Einzelinstanz-Speicherung („Single-Instance Storage“) dedupliziert werden können. Andere Hintergrundsysteme („Backends“) bieten dafür noch keine Unterstützung." #. type: deftypevr -#: doc/guix.texi:16307 +#: doc/guix.texi:16304 msgid "WARNING: This feature hasn't been tested much yet. Use at your own risk." -msgstr "" +msgstr "@emph{Warnung}: Diese Funktionalität wurde noch nicht ausgiebig getestet. Benutzen Sie sie auf eigene Gefahr." #. type: deftypevr -#: doc/guix.texi:16310 +#: doc/guix.texi:16307 msgid "Directory root where to store mail attachments. Disabled, if empty. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Das Wurzelverzeichnis, in dem Mail-Anhänge gespeichert werden. Wenn es leer gelassen wird, ist es deaktiviert. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16312 +#: doc/guix.texi:16309 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl mail-attachment-min-size" #. type: deftypevr -#: doc/guix.texi:16317 +#: doc/guix.texi:16314 msgid "Attachments smaller than this aren't saved externally. It's also possible to write a plugin to disable saving specific attachments externally. Defaults to @samp{128000}." -msgstr "" +msgstr "Anhänge, die kleiner sind als hier angegeben, werden @emph{nicht} extern gespeichert. Es ist auch möglich, ein Plugin zu schreiben, das externes Speichern bestimmter Anhänge deaktiviert. Die Vorgabe ist @samp{128000}." #. type: deftypevr -#: doc/guix.texi:16319 +#: doc/guix.texi:16316 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-attachment-fs" #. type: deftypevr -#: doc/guix.texi:16321 +#: doc/guix.texi:16318 msgid "File system backend to use for saving attachments:" -msgstr "" +msgstr "Ein Dateisystemhintergrundprogramm, mit dem Anhänge gespeichert werden:" #. type: item -#: doc/guix.texi:16322 +#: doc/guix.texi:16319 #, no-wrap msgid "posix" -msgstr "" +msgstr "posix" #. type: table -#: doc/guix.texi:16324 +#: doc/guix.texi:16321 msgid "No SiS done by Dovecot (but this might help FS's own deduplication)" -msgstr "" +msgstr "Dovecot führt keine Einzelinstanzspeicherung durch (aber das Dateisystem kann so leichter selbst deduplizieren)" #. type: item -#: doc/guix.texi:16324 +#: doc/guix.texi:16321 #, no-wrap msgid "sis posix" -msgstr "" +msgstr "sis posix" #. type: table -#: doc/guix.texi:16326 +#: doc/guix.texi:16323 msgid "SiS with immediate byte-by-byte comparison during saving" -msgstr "" +msgstr "Einzelinstanzspeicherung wird durch einen sofortigen Byte-für-Byte-Vergleich beim Speichern umgesetzt" #. type: item -#: doc/guix.texi:16326 +#: doc/guix.texi:16323 #, no-wrap msgid "sis-queue posix" -msgstr "" +msgstr "sis-queue posix" #. type: table -#: doc/guix.texi:16328 +#: doc/guix.texi:16325 msgid "SiS with delayed comparison and deduplication." -msgstr "" +msgstr "Einzelinstanzspeicherung mit verzögertem Vergleich und Deduplizierung." #. type: deftypevr -#: doc/guix.texi:16330 +#: doc/guix.texi:16327 msgid "Defaults to @samp{\"sis posix\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"sis posix\"}." #. type: deftypevr -#: doc/guix.texi:16332 +#: doc/guix.texi:16329 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette mail-attachment-hash" #. type: deftypevr -#: doc/guix.texi:16338 +#: doc/guix.texi:16335 msgid "Hash format to use in attachment filenames. You can add any text and variables: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, @code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}. Variables can be truncated, e.g.@: @code{%@{sha256:80@}} returns only first 80 bits. Defaults to @samp{\"%@{sha1@}\"}." -msgstr "" +msgstr "Welches Hash-Format die Dateinamen von Anhängen bestimmt. Sie können beliebigen Text und Variable beifügen: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, @code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}. Es können auch nur Teile der Variablen benutzt werden, z.B.@: liefert @code{%@{sha256:80@}} nur die ersten 80 Bits. Die Vorgabe ist @samp{\"%@{sha1@}\"}." #. type: deftypevr -#: doc/guix.texi:16340 +#: doc/guix.texi:16337 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl default-process-limit" #. type: deftypevr -#: doc/guix.texi:16345 +#: doc/guix.texi:16342 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl default-client-limit" #. type: deftypevr -#: doc/guix.texi:16348 doc/guix.texi:21613 +#: doc/guix.texi:16345 doc/guix.texi:21610 msgid "Defaults to @samp{1000}." -msgstr "" +msgstr "Die Vorgabe ist @samp{1000}." #. type: deftypevr -#: doc/guix.texi:16350 +#: doc/guix.texi:16347 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl default-vsz-limit" #. type: deftypevr -#: doc/guix.texi:16355 +#: doc/guix.texi:16352 msgid "Default VSZ (virtual memory size) limit for service processes. This is mainly intended to catch and kill processes that leak memory before they eat up everything. Defaults to @samp{256000000}." -msgstr "" +msgstr "Die vorgegebene Beschränkung der VSZ („Virtual Memory Size“, virtuelle Speichergröße) für Dienstprozesse. Dies ist hauptsächlich dafür gedacht, Prozessen, die ein Speicherleck aufweisen, rechtzeitig Einhalt zu gebieten und sie abzuwürgen, bevor sie allen Speicher aufbrauchen. Die Vorgabe ist @samp{256000000}." #. type: deftypevr -#: doc/guix.texi:16357 +#: doc/guix.texi:16354 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string default-login-user" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette default-login-user" #. type: deftypevr -#: doc/guix.texi:16362 +#: doc/guix.texi:16359 msgid "Login user is internally used by login processes. This is the most untrusted user in Dovecot system. It shouldn't have access to anything at all. Defaults to @samp{\"dovenull\"}." -msgstr "" +msgstr "Der Anmeldebenutzer, der intern von Anmeldeprozessen benutzt wird. Der Anmeldebenutzer ist derjenige Benutzer im Dovecot-System, dem am wenigsten Vertrauen zugeschrieben wird. Er sollte auf überhaupt nichts Zugriff haben. Die Vorgabe ist @samp{\"dovenull\"}." #. type: deftypevr -#: doc/guix.texi:16364 +#: doc/guix.texi:16361 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string default-internal-user" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette default-internal-user" #. type: deftypevr -#: doc/guix.texi:16369 +#: doc/guix.texi:16366 msgid "Internal user is used by unprivileged processes. It should be separate from login user, so that login processes can't disturb other processes. Defaults to @samp{\"dovecot\"}." -msgstr "" +msgstr "Der interne Benutzer, der von Prozessen ohne besondere Berechtigungen benutzt wird. Er sollte sich vom Anmeldebenutzer unterscheiden, damit Anmeldeprozesse keine anderen Prozesse stören können. Die Vorgabe ist @samp{\"dovecot\"}." #. type: deftypevr -#: doc/guix.texi:16371 +#: doc/guix.texi:16368 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette ssl?" #. type: deftypevr -#: doc/guix.texi:16374 +#: doc/guix.texi:16371 msgid "SSL/TLS support: yes, no, required. . Defaults to @samp{\"required\"}." -msgstr "" +msgstr "SSL/TLS-Unterstützung: yes für ja, no für nein, oder required, wenn SSL/TLS verpflichtend benutzt werden muss. Siehe . Die Vorgabe ist @samp{\"required\"}." #. type: deftypevr -#: doc/guix.texi:16376 +#: doc/guix.texi:16373 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-cert" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette ssl-cert" #. type: deftypevr -#: doc/guix.texi:16379 +#: doc/guix.texi:16376 msgid "PEM encoded X.509 SSL/TLS certificate (public key). Defaults to @samp{\" was automatically rejected:%n%r\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"Your message to <%t> was automatically rejected:%n%r\"}." #. type: deftypevr -#: doc/guix.texi:16489 +#: doc/guix.texi:16486 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette recipient-delimiter" #. type: deftypevr -#: doc/guix.texi:16493 +#: doc/guix.texi:16490 msgid "Delimiter character between local-part and detail in email address. Defaults to @samp{\"+\"}." -msgstr "" +msgstr "Trennzeichen zwischen dem eigentlichen Lokalteil („local-part“) und Detailangaben in der E-Mail-Adresse. Die Vorgabe ist @samp{\"+\"}." #. type: deftypevr -#: doc/guix.texi:16495 +#: doc/guix.texi:16492 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette lda-original-recipient-header" #. type: deftypevr -#: doc/guix.texi:16501 +#: doc/guix.texi:16498 msgid "Header where the original recipient address (SMTP's RCPT TO: address) is taken from if not available elsewhere. With dovecot-lda -a parameter overrides this. A commonly used header for this is X-Original-To. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Aus welcher Kopfzeile die Adresse des Ursprünglichen Empfängers (SMTPs „RCPT TO:“-Adresse) genommen wird, wenn sie nicht anderweitig eingetragen ist. Wird die Befehlszeilenoption @option{-a} von dovecot-lda angegeben, hat sie Vorrang vor diesem Feld. Oft wird die Kopfzeile X-Original-To hierfür verwendet. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16503 +#: doc/guix.texi:16500 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck lda-mailbox-autocreate?" #. type: deftypevr -#: doc/guix.texi:16507 +#: doc/guix.texi:16504 msgid "Should saving a mail to a nonexistent mailbox automatically create it?. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob ein nicht existierendes Postfach (eine „Mailbox“) automatisch erzeugt werden soll, wenn eine Mail darin abgespeichert wird. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16509 +#: doc/guix.texi:16506 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Boolescher-Ausdruck lda-mailbox-autosubscribe?" #. type: deftypevr -#: doc/guix.texi:16513 +#: doc/guix.texi:16510 msgid "Should automatically created mailboxes be also automatically subscribed?. Defaults to @samp{#f}." -msgstr "" +msgstr "Ob automatisch erzeugte Postfächer („Mailboxes“) auch automatisch abonniert werden sollen. Die Vorgabe ist @samp{#f}." #. type: deftypevr -#: doc/guix.texi:16515 +#: doc/guix.texi:16512 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Nichtnegative-ganze-Zahl imap-max-line-length" #. type: deftypevr -#: doc/guix.texi:16521 +#: doc/guix.texi:16518 msgid "Maximum IMAP command line length. Some clients generate very long command lines with huge mailboxes, so you may need to raise this if you get \"Too long argument\" or \"IMAP command line too large\" errors often. Defaults to @samp{64000}." -msgstr "" +msgstr "Die maximale Länge einer IMAP-Befehlszeile. Manche Clients erzeugen sehr lange Befehlszeilen bei riesigen Postfächern, daher müssen Sie diesen Wert gegebenenfalls anheben, wenn Sie Fehlermeldungen wie „Too long argument“ oder „IMAP command line too large“ häufig sehen. Die Vorgabe ist @samp{64000}." #. type: deftypevr -#: doc/guix.texi:16523 +#: doc/guix.texi:16520 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-logout-format" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-logout-format" #. type: deftypevr -#: doc/guix.texi:16525 +#: doc/guix.texi:16522 msgid "IMAP logout format string:" -msgstr "" +msgstr "Formatzeichenkette für das Abmelden bei IMAP:" #. type: item -#: doc/guix.texi:16526 +#: doc/guix.texi:16523 #, no-wrap msgid "%i" -msgstr "" +msgstr "%i" #. type: table -#: doc/guix.texi:16528 +#: doc/guix.texi:16525 msgid "total number of bytes read from client" -msgstr "" +msgstr "Gesamtzahl vom Client empfangener Bytes" #. type: item -#: doc/guix.texi:16528 +#: doc/guix.texi:16525 #, no-wrap msgid "%o" -msgstr "" +msgstr "%o" #. type: table -#: doc/guix.texi:16530 +#: doc/guix.texi:16527 msgid "total number of bytes sent to client." -msgstr "" +msgstr "Gesamtzahl zum Client versandter Bytes" #. type: deftypevr -#: doc/guix.texi:16533 +#: doc/guix.texi:16530 msgid "See @file{doc/wiki/Variables.txt} for a list of all the variables you can use. Defaults to @samp{\"in=%i out=%o deleted=%@{deleted@} expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}\"}." -msgstr "" +msgstr "Siehe @file{doc/wiki/Variables.txt} für eine Liste aller Variablen, die Sie benutzen können. Die Vorgabe ist @samp{\"in=%i out=%o deleted=%@{deleted@} expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}\"}." #. type: deftypevr -#: doc/guix.texi:16535 +#: doc/guix.texi:16532 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-capability" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-capability" #. type: deftypevr -#: doc/guix.texi:16539 +#: doc/guix.texi:16536 msgid "Override the IMAP CAPABILITY response. If the value begins with '+', add the given capabilities on top of the defaults (e.g.@: +XFOO XBAR). Defaults to @samp{\"\"}." -msgstr "" +msgstr "Ersetzt die Antworten auf IMAP-CAPABILITY-Anfragen. Wenn der Wert mit „+“ beginnt, werden die angegebenen Capabilitys zu den voreingestellten hinzugefügt (z.B.@: +XFOO XBAR). Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16541 +#: doc/guix.texi:16538 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-idle-notify-interval" #. type: deftypevr -#: doc/guix.texi:16545 +#: doc/guix.texi:16542 msgid "How long to wait between \"OK Still here\" notifications when client is IDLEing. Defaults to @samp{\"2 mins\"}." -msgstr "" +msgstr "Wie lange zwischen „OK Still here“-Benachrichtigungen gewartet wird, wenn der Client auf IDLE steht. Die Vorgabe ist @samp{\"2 mins\"}." #. type: deftypevr -#: doc/guix.texi:16547 +#: doc/guix.texi:16544 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-id-send" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-id-send" #. type: deftypevr -#: doc/guix.texi:16553 +#: doc/guix.texi:16550 msgid "ID field names and values to send to clients. Using * as the value makes Dovecot use the default value. The following fields have default values currently: name, version, os, os-version, support-url, support-email. Defaults to @samp{\"\"}." -msgstr "" +msgstr "ID-Feldnamen und -werte, die an Clients versandt werden sollen. Wenn * als der Wert angegeben wird, benutzt Dovecot dafür den voreingestellten Wert. Die folgenden Felder verfügen derzeit über voreingestellte Werte: name, version, os, os-version, support-url, support-email. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16555 +#: doc/guix.texi:16552 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-id-log" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Zeichenkette imap-id-log" #. type: deftypevr -#: doc/guix.texi:16558 +#: doc/guix.texi:16555 msgid "ID fields sent by client to log. * means everything. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Welche vom Client übermittelten ID-Felder protokolliert werden. * bedeutet alle. Die Vorgabe ist @samp{\"\"}." #. type: deftypevr -#: doc/guix.texi:16560 +#: doc/guix.texi:16557 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds" -msgstr "" +msgstr "{@code{dovecot-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste imap-client-workarounds" #. type: deftypevr -#: doc/guix.texi:16562 +#: doc/guix.texi:16559 msgid "Workarounds for various client bugs:" -msgstr "" +msgstr "Maßnahmen, um verschiedene Fehler in Clients zu umgehen:" #. type: item -#: doc/guix.texi:16564 +#: doc/guix.texi:16561 #, no-wrap msgid "delay-newmail" -msgstr "" +msgstr "delay-newmail" #. type: table -#: doc/guix.texi:16571 +#: doc/guix.texi:16568 msgid "Send EXISTS/RECENT new mail notifications only when replying to NOOP and CHECK commands. Some clients ignore them otherwise, for example OSX Mail (' before setting it here, to get a feel for which cipher suites you will get. After setting this option, it is recommend that you inspect your Murmur log to ensure that Murmur is using the cipher suites that you expected it to." -msgstr "" +msgstr "Es wird empfohlen, dass Sie Ihre Cipher-Zeichenkette mit „openssl ciphers “ prüfen, bevor Sie sie hier einsetzen, um ein Gefühl dafür zu bekommen, was für eine Cipher-Suite sie damit bekommen. Nachdem Sie diese Option festgelegt haben, wird empfohlen, dass Sie Ihr Murmur-Protokoll durchsehen und sicherstellen, dass Murmur auch wirklich die Cipher-Suites benutzt, die Sie erwarten." #. type: table -#: doc/guix.texi:17417 +#: doc/guix.texi:17414 msgid "Note: Changing this option may impact the backwards compatibility of your Murmur server, and can remove the ability for older Mumble clients to be able to connect to it." -msgstr "" +msgstr "Beachten Sie: Änderungen hieran können die Rückwärtskompatibilität Ihres Murmur-Servers beeinträchtigen; dadurch kann es für ältere Mumblie-Clients unmöglich werden, sich damit zu verbinden." #. type: item -#: doc/guix.texi:17418 +#: doc/guix.texi:17415 #, no-wrap msgid "@code{public-registration} (default: @code{#f})" -msgstr "" +msgstr "@code{public-registration} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:17420 +#: doc/guix.texi:17417 msgid "Must be a @code{} record or @code{#f}." -msgstr "" +msgstr "Hier muss ein @code{}-Verbundsobjekt oder @code{#f} angegeben werden." #. type: table -#: doc/guix.texi:17425 +#: doc/guix.texi:17422 msgid "You can optionally register your server in the public server list that the @code{mumble} client shows on startup. You cannot register your server if you have set a @code{server-password}, or set @code{allow-ping} to @code{#f}." -msgstr "" +msgstr "Sie können Ihren Server optional in die öffentliche Serverliste eintragen lassen, die der Mumble-Client @code{mumble} beim Start anzeigt. Sie können Ihren Server nicht registrieren, wenn Sie ein @code{server-password} festgelegt oder @code{allow-ping} auf @code{#f} gesetzt haben." #. type: table -#: doc/guix.texi:17427 +#: doc/guix.texi:17424 msgid "It might take a few hours until it shows up in the public list." -msgstr "" +msgstr "Es könnte ein paar Stunden dauern, bis er in der öffentlichen Liste zu finden ist." #. type: item -#: doc/guix.texi:17428 doc/guix.texi:18859 +#: doc/guix.texi:17425 doc/guix.texi:18856 #, no-wrap msgid "@code{file} (default: @code{#f})" -msgstr "" +msgstr "@code{file} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:17430 +#: doc/guix.texi:17427 msgid "Optional alternative override for this configuration." -msgstr "" +msgstr "Optional kann hier eine vorrangig benutzte alternative Konfiguration festgelegt werden." #. type: deftp -#: doc/guix.texi:17433 +#: doc/guix.texi:17430 #, no-wrap msgid "{Data Type} murmur-public-registration-configuration" -msgstr "" +msgstr "{Datentyp} murmur-public-registration-configuration" #. type: deftp -#: doc/guix.texi:17435 +#: doc/guix.texi:17432 msgid "Configuration for public registration of a murmur service." -msgstr "" +msgstr "Konfiguration für das öffentliche Registrieren eines Murmur-Dienstes." #. type: table -#: doc/guix.texi:17439 +#: doc/guix.texi:17436 msgid "This is a display name for your server. Not to be confused with the hostname." -msgstr "" +msgstr "Dies ist ein Anzeigename für Ihren Server. Er ist nicht zu verwechseln mit dem Rechnernamen („Hostname“)." #. type: itemx -#: doc/guix.texi:17440 doc/guix.texi:23820 +#: doc/guix.texi:17437 doc/guix.texi:23817 #, no-wrap msgid "password" -msgstr "" +msgstr "password" #. type: table -#: doc/guix.texi:17443 +#: doc/guix.texi:17440 msgid "A password to identify your registration. Subsequent updates will need the same password. Don't lose your password." -msgstr "" +msgstr "Ein Passwort, um Ihre Registrierung zu identifizieren. Nachfolgende Aktualisierungen müssen dasselbe Passwort benutzen. Verlieren Sie Ihr Passwort nicht." #. type: code{#1} -#: doc/guix.texi:17444 +#: doc/guix.texi:17441 #, no-wrap msgid "url" -msgstr "" +msgstr "url" #. type: table -#: doc/guix.texi:17447 +#: doc/guix.texi:17444 msgid "This should be a @code{http://} or @code{https://} link to your web site." -msgstr "" +msgstr "Dies sollte ein Link mit @code{http://} oder @code{https://} auf Ihren Webauftritt sein." #. type: item -#: doc/guix.texi:17448 +#: doc/guix.texi:17445 #, no-wrap msgid "@code{hostname} (default: @code{#f})" -msgstr "" +msgstr "@code{hostname} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:17451 +#: doc/guix.texi:17448 msgid "By default your server will be listed by its IP address. If it is set your server will be linked by this host name instead." -msgstr "" +msgstr "Nach Vorgabe wird Ihr Server über seine IP-Adresse aufgeführt. Wenn dies gesetzt ist, wird er stattdessen mit diesem Rechnernamen verknüpft." #. type: subsubheading -#: doc/guix.texi:17459 +#: doc/guix.texi:17456 #, no-wrap msgid "Tailon Service" -msgstr "" +msgstr "Tailon-Dienst" #. type: Plain text -#: doc/guix.texi:17463 +#: doc/guix.texi:17460 msgid "@uref{https://tailon.readthedocs.io/, Tailon} is a web application for viewing and searching log files." -msgstr "" +msgstr "@uref{https://tailon.readthedocs.io/, Tailon} ist eine Web-Anwendung, um Protokolldateien zu betrachten und zu durchsuchen." #. type: Plain text -#: doc/guix.texi:17466 +#: doc/guix.texi:17463 msgid "The following example will configure the service with default values. By default, Tailon can be accessed on port 8080 (@code{http://localhost:8080})." -msgstr "" +msgstr "Das folgende Beispiel zeigt, wie Sie den Dienst mit den Vorgabewerten konfigurieren. Nach Vorgabe kann auf Tailon auf Port 8080 zugegriffen werden (@code{http://localhost:8080})." #. type: example -#: doc/guix.texi:17469 +#: doc/guix.texi:17466 #, no-wrap msgid "(service tailon-service-type)\n" -msgstr "" +msgstr "(service tailon-service-type)\n" #. type: Plain text -#: doc/guix.texi:17473 +#: doc/guix.texi:17470 msgid "The following example customises more of the Tailon configuration, adding @command{sed} to the list of allowed commands." -msgstr "" +msgstr "Im folgenden Beispiel werden mehr Anpassungen an der Tailon-Konfiguration vorgenommen: @command{sed} gehört dort auch zur Liste der erlaubten Befehle dazu." #. type: example -#: doc/guix.texi:17480 +#: doc/guix.texi:17477 #, no-wrap msgid "" "(service tailon-service-type\n" @@ -32644,188 +32721,196 @@ msgid "" " (tailon-configuration-file\n" " (allowed-commands '(\"tail\" \"grep\" \"awk\" \"sed\"))))))\n" msgstr "" +"(service tailon-service-type\n" +" (tailon-configuration\n" +" (config-file\n" +" (tailon-configuration-file\n" +" (allowed-commands '(\"tail\" \"grep\" \"awk\" \"sed\"))))))\n" #. type: deftp -#: doc/guix.texi:17483 +#: doc/guix.texi:17480 #, no-wrap msgid "{Data Type} tailon-configuration" -msgstr "" +msgstr "{Datentyp} tailon-configuration" #. type: deftp -#: doc/guix.texi:17486 +#: doc/guix.texi:17483 msgid "Data type representing the configuration of Tailon. This type has the following parameters:" -msgstr "" +msgstr "Der Datentyp, der die Konfiguration von Tailon repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:17488 +#: doc/guix.texi:17485 #, no-wrap msgid "@code{config-file} (default: @code{(tailon-configuration-file)})" -msgstr "" +msgstr "@code{config-file} (Vorgabe: @code{(tailon-configuration-file)})" #. type: table -#: doc/guix.texi:17492 +#: doc/guix.texi:17489 msgid "The configuration file to use for Tailon. This can be set to a @dfn{tailon-configuration-file} record value, or any gexp (@pxref{G-Expressions})." -msgstr "" +msgstr "Die Konfigurationsdatei, die für Tailon benutzt werden soll. Als Wert kann ein @dfn{tailon-configuration-file}-Verbundsobjekt oder ein beliebiger G-Ausdruck dienen (siehe @ref{G-Expressions})." #. type: table -#: doc/guix.texi:17495 +#: doc/guix.texi:17492 msgid "For example, to instead use a local file, the @code{local-file} function can be used:" -msgstr "" +msgstr "Um zum Beispiel stattdessen eine lokale Datei zu benutzen, kann von der Funktion @code{local-file} Gebrauch gemacht werden." #. type: example -#: doc/guix.texi:17500 +#: doc/guix.texi:17497 #, no-wrap msgid "" "(service tailon-service-type\n" " (tailon-configuration\n" " (config-file (local-file \"./my-tailon.conf\"))))\n" msgstr "" +"(service tailon-service-type\n" +" (tailon-configuration\n" +" (config-file (local-file \"./my-tailon.conf\"))))\n" #. type: item -#: doc/guix.texi:17502 +#: doc/guix.texi:17499 #, no-wrap msgid "@code{package} (default: @code{tailon})" -msgstr "" +msgstr "@code{package} (Vorgabe: @code{tailon})" #. type: table -#: doc/guix.texi:17504 +#: doc/guix.texi:17501 msgid "The tailon package to use." -msgstr "" +msgstr "Das tailon-Paket, das benutzt werden soll." #. type: deftp -#: doc/guix.texi:17508 +#: doc/guix.texi:17505 #, no-wrap msgid "{Data Type} tailon-configuration-file" -msgstr "" +msgstr "{Datentyp} tailon-configuration-file" #. type: deftp -#: doc/guix.texi:17511 +#: doc/guix.texi:17508 msgid "Data type representing the configuration options for Tailon. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfigurationsoptionen für Tailon repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:17513 +#: doc/guix.texi:17510 #, no-wrap msgid "@code{files} (default: @code{(list \"/var/log\")})" -msgstr "" +msgstr "@code{files} (Vorgabe: @code{(list \"/var/log\")})" #. type: table -#: doc/guix.texi:17518 +#: doc/guix.texi:17515 msgid "List of files to display. The list can include strings for a single file or directory, or a list, where the first item is the name of a subsection, and the remaining items are the files or directories in that subsection." -msgstr "" +msgstr "Die Liste der anzuzeigenden Dateien. In der Liste dürfen Zeichenketten stehen, die jeweils für eine einzelne Datei oder ein Verzeichnis stehen, oder auch Listen, deren erstes Element den Namen eines Unterbereichs angibt und deren übrige Elemente die Dateien oder Verzeichnisse in diesem Unterbereich benennen." #. type: item -#: doc/guix.texi:17519 +#: doc/guix.texi:17516 #, no-wrap msgid "@code{bind} (default: @code{\"localhost:8080\"})" -msgstr "" +msgstr "@code{bind} (Vorgabe: @code{\"localhost:8080\"})" #. type: table -#: doc/guix.texi:17521 +#: doc/guix.texi:17518 msgid "Address and port to which Tailon should bind on." -msgstr "" +msgstr "Adresse und Port, an die sich Tailon binden soll." #. type: item -#: doc/guix.texi:17522 +#: doc/guix.texi:17519 #, no-wrap msgid "@code{relative-root} (default: @code{#f})" -msgstr "" +msgstr "@code{relative-root} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:17524 +#: doc/guix.texi:17521 msgid "URL path to use for Tailon, set to @code{#f} to not use a path." -msgstr "" +msgstr "Welcher URL-Pfad für Tailon benutzt werden soll. Wenn Sie hierfür @code{#f} angeben, wird kein Pfad benutzt." #. type: item -#: doc/guix.texi:17525 +#: doc/guix.texi:17522 #, no-wrap msgid "@code{allow-transfers?} (default: @code{#t})" -msgstr "" +msgstr "@code{allow-transfers?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:17527 +#: doc/guix.texi:17524 msgid "Allow downloading the log files in the web interface." -msgstr "" +msgstr "Ob es möglich sein soll, die Protokolldateien über die Weboberfläche herunterzuladen." #. type: item -#: doc/guix.texi:17528 +#: doc/guix.texi:17525 #, no-wrap msgid "@code{follow-names?} (default: @code{#t})" -msgstr "" +msgstr "@code{follow-names?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:17530 +#: doc/guix.texi:17527 msgid "Allow tailing of not-yet existent files." -msgstr "" +msgstr "Ob noch nicht existierende Dateien „getailt“ werden können." #. type: item -#: doc/guix.texi:17531 +#: doc/guix.texi:17528 #, no-wrap msgid "@code{tail-lines} (default: @code{200})" -msgstr "" +msgstr "@code{tail-lines} (Vorgabe: @code{200})" #. type: table -#: doc/guix.texi:17533 +#: doc/guix.texi:17530 msgid "Number of lines to read initially from each file." -msgstr "" +msgstr "Wieviele Zeilen am Anfang aus jeder Datei gelesen werden." #. type: item -#: doc/guix.texi:17534 +#: doc/guix.texi:17531 #, no-wrap msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})" -msgstr "" +msgstr "@code{allowed-commands} (Vorgabe: @code{(list \"tail\" \"grep\" \"awk\")})" #. type: table -#: doc/guix.texi:17536 +#: doc/guix.texi:17533 msgid "Commands to allow running. By default, @code{sed} is disabled." -msgstr "" +msgstr "Welche Befehle ausgeführt werden dürfen. Nach Vorgabe wird @code{sed} @emph{nicht} erlaubt." #. type: item -#: doc/guix.texi:17537 +#: doc/guix.texi:17534 #, no-wrap msgid "@code{debug?} (default: @code{#f})" -msgstr "" +msgstr "@code{debug?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:17539 +#: doc/guix.texi:17536 msgid "Set @code{debug?} to @code{#t} to show debug messages." -msgstr "" +msgstr "Legen Sie @code{debug?} als @code{#t} fest, um Nachrichten zur Fehlersuche anzuzeigen." #. type: item -#: doc/guix.texi:17540 +#: doc/guix.texi:17537 #, no-wrap msgid "@code{wrap-lines} (default: @code{#t})" -msgstr "" +msgstr "@code{wrap-lines} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:17544 +#: doc/guix.texi:17541 msgid "Initial line wrapping state in the web interface. Set to @code{#t} to initially wrap lines (the default), or to @code{#f} to initially not wrap lines." -msgstr "" +msgstr "Ob lange Zeilen nach der Anfangseinstellung in der Weboberfläche umgebrochen werden sollen. Setzen Sie es auf @code{#t}, werden Zeilen in der Anfangseinstellung umgebrochen (die Vorgabe), bei @code{#f} werden sie anfänglich nicht umgebrochen." #. type: item -#: doc/guix.texi:17545 +#: doc/guix.texi:17542 #, no-wrap msgid "@code{http-auth} (default: @code{#f})" -msgstr "" +msgstr "@code{http-auth} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:17549 +#: doc/guix.texi:17546 msgid "HTTP authentication type to use. Set to @code{#f} to disable authentication (the default). Supported values are @code{\"digest\"} or @code{\"basic\"}." -msgstr "" +msgstr "Welcher HTTP-Authentifizierungstyp benutzt werden soll. Setzen Sie dies auf @code{#f}, damit sich Benutzer nicht authentizieren müssen (die Vorgabe). Unterstützte Werte sind @code{\"digest\"} oder @code{\"basic\"}." #. type: item -#: doc/guix.texi:17550 +#: doc/guix.texi:17547 #, no-wrap msgid "@code{users} (default: @code{#f})" -msgstr "" +msgstr "@code{users} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:17555 +#: doc/guix.texi:17552 msgid "If HTTP authentication is enabled (see @code{http-auth}), access will be restricted to the credentials provided here. To configure users, use a list of pairs, where the first element of the pair is the username, and the 2nd element of the pair is the password." -msgstr "" +msgstr "Wenn HTTP-Authentifizierung aktiviert ist (siehe @code{http-auth}), wird der Zugriff nur gewährt, nachdem die hier angegebenen Zugangsinformationen eingegeben wurden. Um Nutzer hinzuzufügen, geben Sie hier eine Liste von Paaren an, deren erstes Element jeweils der Benutzername und deren zweites Element das Passwort ist." #. type: example -#: doc/guix.texi:17561 +#: doc/guix.texi:17558 #, no-wrap msgid "" "(tailon-configuration-file\n" @@ -32833,751 +32918,761 @@ msgid "" " (users '((\"user1\" . \"password1\")\n" " (\"user2\" . \"password2\"))))\n" msgstr "" +"(tailon-configuration-file\n" +" (http-auth \"basic\")\n" +" (users '((\"benutzer1\" . \"passwort1\")\n" +" (\"benutzer2\" . \"passwort2\"))))\n" #. type: subsubheading -#: doc/guix.texi:17567 +#: doc/guix.texi:17564 #, no-wrap msgid "Darkstat Service" -msgstr "" +msgstr "Darkstat-Dienst" #. type: cindex -#: doc/guix.texi:17568 +#: doc/guix.texi:17565 #, no-wrap msgid "darkstat" -msgstr "" +msgstr "darkstat" #. type: Plain text -#: doc/guix.texi:17571 +#: doc/guix.texi:17568 msgid "Darkstat is a packet sniffer that captures network traffic, calculates statistics about usage, and serves reports over HTTP." -msgstr "" +msgstr "Darkstat ist ein Netzwerkanalyseprogramm, das Pakete im Datenverkehr aufzeichnet, Statistiken zur Netzwerknutzung berechnet und über HTTP Berichte dazu bereitstellt." #. type: defvar -#: doc/guix.texi:17572 +#: doc/guix.texi:17569 #, no-wrap msgid "{Scheme Variable} darkstat-service-type" -msgstr "" +msgstr "{Scheme-Variable} darkstat-service-type" #. type: defvar -#: doc/guix.texi:17577 +#: doc/guix.texi:17574 msgid "This is the service type for the @uref{https://unix4lyfe.org/darkstat/, darkstat} service, its value must be a @code{darkstat-configuration} record as in this example:" -msgstr "" +msgstr "Dies ist der Diensttyp für den @uref{https://unix4lyfe.org/darkstat/, darkstat-Dienst}. Sein Wert muss ein @code{darkstat-configuration}-Verbundsobjekt sein, wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:17582 +#: doc/guix.texi:17579 #, no-wrap msgid "" "(service darkstat-service-type\n" " (darkstat-configuration\n" " (interface \"eno1\")))\n" msgstr "" +"(service darkstat-service-type\n" +" (darkstat-configuration\n" +" (interface \"eno1\")))\n" #. type: deftp -#: doc/guix.texi:17585 +#: doc/guix.texi:17582 #, no-wrap msgid "{Data Type} darkstat-configuration" -msgstr "" +msgstr "{Datentyp} darkstat-configuration" #. type: deftp -#: doc/guix.texi:17587 +#: doc/guix.texi:17584 msgid "Data type representing the configuration of @command{darkstat}." -msgstr "" +msgstr "Datentyp, der die Konfiguration von @command{darkstat} repräsentiert." #. type: item -#: doc/guix.texi:17589 +#: doc/guix.texi:17586 #, no-wrap msgid "@code{package} (default: @code{darkstat})" -msgstr "" +msgstr "@code{package} (Vorgabe: @code{darkstat})" #. type: table -#: doc/guix.texi:17591 +#: doc/guix.texi:17588 msgid "The darkstat package to use." -msgstr "" +msgstr "Welches darkstat-Paket verwendet werden soll." #. type: code{#1} -#: doc/guix.texi:17592 +#: doc/guix.texi:17589 #, no-wrap msgid "interface" -msgstr "" +msgstr "interface" #. type: table -#: doc/guix.texi:17594 +#: doc/guix.texi:17591 msgid "Capture traffic on the specified network interface." -msgstr "" +msgstr "Datenverkehr an der angegebenen Netzwerkschnittstelle mitschneiden." #. type: item -#: doc/guix.texi:17595 +#: doc/guix.texi:17592 #, no-wrap msgid "@code{port} (default: @code{\"667\"})" -msgstr "" +msgstr "@code{port} (Vorgabe: @code{\"667\"})" #. type: table -#: doc/guix.texi:17597 +#: doc/guix.texi:17594 msgid "Bind the web interface to the specified port." -msgstr "" +msgstr "Bindet die Weboberfläche an den angegebenen Port." #. type: item -#: doc/guix.texi:17598 +#: doc/guix.texi:17595 #, no-wrap msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})" -msgstr "" +msgstr "@code{bind-address} (Vorgabe: @code{\"127.0.0.1\"})" #. type: table -#: doc/guix.texi:17600 doc/guix.texi:17638 +#: doc/guix.texi:17597 doc/guix.texi:17635 msgid "Bind the web interface to the specified address." -msgstr "" +msgstr "Bindet die Weboberfläche an die angegebene Adresse." #. type: item -#: doc/guix.texi:17601 +#: doc/guix.texi:17598 #, no-wrap msgid "@code{base} (default: @code{\"/\"})" -msgstr "" +msgstr "@code{base} (Vorgabe: @code{\"/\"})" #. type: table -#: doc/guix.texi:17604 +#: doc/guix.texi:17601 msgid "Specify the path of the base URL. This can be useful if @command{darkstat} is accessed via a reverse proxy." -msgstr "" +msgstr "Geben Sie den Pfad der Basis-URL an. Das kann nützlich sein, wenn auf @command{darkstat} über einen inversen Proxy („Reverse Proxy“) zugegriffen wird." #. type: subsubheading -#: doc/guix.texi:17608 +#: doc/guix.texi:17605 #, no-wrap msgid "Prometheus Node Exporter Service" -msgstr "" +msgstr "Prometheus-Node-Exporter-Dienst" #. type: cindex -#: doc/guix.texi:17610 +#: doc/guix.texi:17607 #, no-wrap msgid "prometheus-node-exporter" -msgstr "" +msgstr "prometheus-node-exporter" #. type: Plain text -#: doc/guix.texi:17615 +#: doc/guix.texi:17612 msgid "The Prometheus ``node exporter'' makes hardware and operating system statistics provided by the Linux kernel available for the Prometheus monitoring system. This service should be deployed on all physical nodes and virtual machines, where monitoring these statistics is desirable." -msgstr "" +msgstr "Der Prometheus-„Node-Exporter“ stellt Statistiken über Hardware und Betriebssystem für das Prometheus-Systemüberwachungssystem bereit, die vom Linux-Kernel geliefert werden. Dieser Dienst sollte auf allen physischen Netzwerkknoten und virtuellen Maschinen installiert werden, für die eine Überwachung ihrer Statistiken gewünscht wird." #. type: defvar -#: doc/guix.texi:17616 +#: doc/guix.texi:17613 #, no-wrap msgid "{Scheme variable} prometheus-node-exporter-service-type" -msgstr "" +msgstr "{Scheme-Variable} prometheus-node-exporter-service-type" #. type: defvar -#: doc/guix.texi:17621 +#: doc/guix.texi:17618 msgid "This is the service type for the @uref{https://github.com/prometheus/node_exporter/, prometheus-node-exporter} service, its value must be a @code{prometheus-node-exporter-configuration} record as in this example:" -msgstr "" +msgstr "Dies ist der Diensttyp für den @uref{https://github.com/prometheus/node_exporter/, „prometheus-node-exporter“-Dienst}. Sein Wert muss ein @code{prometheus-node-exporter-configuration}-Verbundsobjekt wie in diesem Beispiel sein:" #. type: example -#: doc/guix.texi:17626 +#: doc/guix.texi:17623 #, no-wrap msgid "" "(service prometheus-node-exporter-service-type\n" " (prometheus-node-exporter-configuration\n" " (web-listen-address \":9100\")))\n" msgstr "" +"(service prometheus-node-exporter-service-type\n" +" (prometheus-node-exporter-configuration\n" +" (web-listen-address \":9100\")))\n" #. type: deftp -#: doc/guix.texi:17629 +#: doc/guix.texi:17626 #, no-wrap msgid "{Data Type} prometheus-node-exporter-configuration" -msgstr "" +msgstr "{Datentyp} prometheus-node-exporter-configuration" #. type: deftp -#: doc/guix.texi:17631 +#: doc/guix.texi:17628 msgid "Data type representing the configuration of @command{node_exporter}." msgstr "Repräsentiert die Konfiguration von @command{node_exporter}." #. type: item -#: doc/guix.texi:17633 +#: doc/guix.texi:17630 #, no-wrap msgid "@code{package} (default: @code{go-github-com-prometheus-node-exporter})" msgstr "@code{package} (Vorgabe: @code{go-github-com-prometheus-node-exporter})" #. type: table -#: doc/guix.texi:17635 +#: doc/guix.texi:17632 msgid "The prometheus-node-exporter package to use." msgstr "Das Paket für den prometheus-node-exporter, was benutzt werden soll." #. type: item -#: doc/guix.texi:17636 +#: doc/guix.texi:17633 #, no-wrap msgid "@code{web-listen-address} (default: @code{\":9100\"})" msgstr "@code{web-listen-address} (Vorgabe: @code{\":9100\"})" #. type: subsubheading -#: doc/guix.texi:17642 +#: doc/guix.texi:17639 #, no-wrap msgid "Zabbix server" msgstr "Zabbix-Server" #. type: cindex -#: doc/guix.texi:17643 +#: doc/guix.texi:17640 #, no-wrap msgid "zabbix zabbix-server" -msgstr "" +msgstr "Zabbix, Zabbix-Server" #. type: Plain text -#: doc/guix.texi:17646 +#: doc/guix.texi:17643 msgid "Zabbix provides monitoring metrics, among others network utilization, CPU load and disk space consumption:" -msgstr "" +msgstr "Zabbix stellt Metriken zur Systemüberwachung zur Verfügung, unter anderem die Netzwerk- und Prozessorauslastung sowie den Plattenplatzverbrauch, und bietet dabei:" #. type: item -#: doc/guix.texi:17648 +#: doc/guix.texi:17645 #, no-wrap msgid "High performance, high capacity (able to monitor hundreds of thousands of devices)." -msgstr "" +msgstr "Hohe Leistungsfähigkeit und hohe Kapazität (hunderttausende Geräte können überwacht werden)." #. type: item -#: doc/guix.texi:17649 +#: doc/guix.texi:17646 #, no-wrap msgid "Auto-discovery of servers and network devices and interfaces." -msgstr "" +msgstr "Automatische Erkennung von Servern, Netzwerkgeräten und -schnittstellen." #. type: item -#: doc/guix.texi:17650 +#: doc/guix.texi:17647 #, no-wrap msgid "Low-level discovery, allows to automatically start monitoring new items, file systems or network interfaces among others." -msgstr "" +msgstr "Systemnahe Erkennung, wodurch automatisch mit der Überwachung neuer Objekte, Dateisysteme, Netzwerkschnittstellen und anderer Dinge begonnen werden kann." #. type: item -#: doc/guix.texi:17651 +#: doc/guix.texi:17648 #, no-wrap msgid "Distributed monitoring with centralized web administration." -msgstr "" +msgstr "Verteilte Überwachung mit zentralisierter Web-Administrierbarkeit." #. type: item -#: doc/guix.texi:17652 +#: doc/guix.texi:17649 #, no-wrap msgid "Native high performance agents." -msgstr "" +msgstr "Native Hochleistungsagenten." #. type: item -#: doc/guix.texi:17653 +#: doc/guix.texi:17650 #, no-wrap msgid "SLA, and ITIL KPI metrics on reporting." -msgstr "" +msgstr "Berichte zum SLA und über ITIL-KPI-Metriken." #. type: item -#: doc/guix.texi:17654 +#: doc/guix.texi:17651 #, no-wrap msgid "High-level (business) view of monitored resources through user-defined visual console screens and dashboards." -msgstr "" +msgstr "Überblickssicht (geschäftlich) auf die überwachten Ressourcen über benutzerdefinierte visuelle Konsolenbildschirme und Dashboards." #. type: item -#: doc/guix.texi:17655 +#: doc/guix.texi:17652 #, no-wrap msgid "Remote command execution through Zabbix proxies." -msgstr "" +msgstr "Entfernte Befehlsausführung über Zabbix-Proxys." #. type: Plain text -#: doc/guix.texi:17661 +#: doc/guix.texi:17658 msgid "Available @code{zabbix-server-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{zabbix-server-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:17662 +#: doc/guix.texi:17659 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} package zabbix-server" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} „package“ zabbix-server" #. type: deftypevr -#: doc/guix.texi:17664 +#: doc/guix.texi:17661 msgid "The zabbix-server package." msgstr "Das zabbix-server-Paket." #. type: deftypevr -#: doc/guix.texi:17667 +#: doc/guix.texi:17664 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string user" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:17669 +#: doc/guix.texi:17666 msgid "User who will run the Zabbix server." -msgstr "" +msgstr "Das Benutzerkonto, mit dem der Zabbix-Server ausgeführt wird." #. type: deftypevr -#: doc/guix.texi:17671 doc/guix.texi:17678 doc/guix.texi:17692 -#: doc/guix.texi:17699 doc/guix.texi:17800 doc/guix.texi:17807 -#: doc/guix.texi:17918 doc/guix.texi:17925 +#: doc/guix.texi:17668 doc/guix.texi:17675 doc/guix.texi:17689 +#: doc/guix.texi:17696 doc/guix.texi:17797 doc/guix.texi:17804 +#: doc/guix.texi:17915 doc/guix.texi:17922 msgid "Defaults to @samp{\"zabbix\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"zabbix\"}." #. type: deftypevr -#: doc/guix.texi:17674 +#: doc/guix.texi:17671 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} group group" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Gruppe group" #. type: deftypevr -#: doc/guix.texi:17676 +#: doc/guix.texi:17673 msgid "Group who will run the Zabbix server." -msgstr "" +msgstr "Die Gruppe, mit der der Zabbix-Server ausgeführt wird." #. type: deftypevr -#: doc/guix.texi:17681 +#: doc/guix.texi:17678 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-host" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette db-host" #. type: deftypevr -#: doc/guix.texi:17683 doc/guix.texi:17902 +#: doc/guix.texi:17680 doc/guix.texi:17899 msgid "Database host name." msgstr "Rechnername der Datenbank." #. type: deftypevr -#: doc/guix.texi:17685 +#: doc/guix.texi:17682 msgid "Defaults to @samp{\"127.0.0.1\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"127.0.0.1\"}." #. type: deftypevr -#: doc/guix.texi:17688 +#: doc/guix.texi:17685 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-name" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette db-name" #. type: deftypevr -#: doc/guix.texi:17690 doc/guix.texi:17916 +#: doc/guix.texi:17687 doc/guix.texi:17913 msgid "Database name." msgstr "Datenbankname." #. type: deftypevr -#: doc/guix.texi:17695 +#: doc/guix.texi:17692 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-user" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette db-user" #. type: deftypevr -#: doc/guix.texi:17697 doc/guix.texi:17923 +#: doc/guix.texi:17694 doc/guix.texi:17920 msgid "Database user." msgstr "Benutzerkonto der Datenbank." #. type: deftypevr -#: doc/guix.texi:17702 +#: doc/guix.texi:17699 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string db-password" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette db-password" #. type: deftypevr -#: doc/guix.texi:17705 +#: doc/guix.texi:17702 msgid "Database password. Please, use @code{include-files} with @code{DBPassword=SECRET} inside a specified file instead." -msgstr "" +msgstr "Das Datenbankpasswort. Bitte benutzen Sie stattdessen @code{include-files} mit @code{DBPassword=SECRET} in einer angegebenen Datei." #. type: deftypevr -#: doc/guix.texi:17710 +#: doc/guix.texi:17707 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} number db-port" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zahl db-port" #. type: deftypevr -#: doc/guix.texi:17712 doc/guix.texi:17909 +#: doc/guix.texi:17709 doc/guix.texi:17906 msgid "Database port." msgstr "Datenbank-Portnummer." #. type: deftypevr -#: doc/guix.texi:17714 doc/guix.texi:17911 +#: doc/guix.texi:17711 doc/guix.texi:17908 msgid "Defaults to @samp{5432}." -msgstr "" +msgstr "Die Vorgabe ist @samp{5432}." #. type: deftypevr -#: doc/guix.texi:17717 +#: doc/guix.texi:17714 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string log-type" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette log-type" #. type: deftypevr -#: doc/guix.texi:17719 doc/guix.texi:17820 +#: doc/guix.texi:17716 doc/guix.texi:17817 msgid "Specifies where log messages are written to:" -msgstr "" +msgstr "Gibt an, wohin Protokollnachrichten geschrieben werden." #. type: itemize -#: doc/guix.texi:17723 doc/guix.texi:17824 +#: doc/guix.texi:17720 doc/guix.texi:17821 msgid "@code{system} - syslog." -msgstr "" +msgstr "@code{system} - Syslog." #. type: itemize -#: doc/guix.texi:17726 doc/guix.texi:17827 +#: doc/guix.texi:17723 doc/guix.texi:17824 msgid "@code{file} - file specified with @code{log-file} parameter." -msgstr "" +msgstr "@code{file} - Die im @code{log-file}-Parameter angegebene Datei." #. type: itemize -#: doc/guix.texi:17729 doc/guix.texi:17830 +#: doc/guix.texi:17726 doc/guix.texi:17827 msgid "@code{console} - standard output." -msgstr "" +msgstr "@code{console} - Standardausgabe." #. type: deftypevr -#: doc/guix.texi:17736 +#: doc/guix.texi:17733 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string log-file" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette log-file" #. type: deftypevr -#: doc/guix.texi:17738 doc/guix.texi:17839 +#: doc/guix.texi:17735 doc/guix.texi:17836 msgid "Log file name for @code{log-type} @code{file} parameter." -msgstr "" +msgstr "Protokolldateiname für den @code{file}-Parameter von @code{log-type}." #. type: deftypevr -#: doc/guix.texi:17740 +#: doc/guix.texi:17737 msgid "Defaults to @samp{\"/var/log/zabbix/server.log\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/log/zabbix/server.log\"}." #. type: deftypevr -#: doc/guix.texi:17743 +#: doc/guix.texi:17740 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string pid-file" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette pid-file" #. type: deftypevr -#: doc/guix.texi:17745 doc/guix.texi:17846 +#: doc/guix.texi:17742 doc/guix.texi:17843 msgid "Name of PID file." msgstr "Name der PID-Datei." #. type: deftypevr -#: doc/guix.texi:17747 +#: doc/guix.texi:17744 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_server.pid\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/run/zabbix/zabbix_server.pid\"}." #. type: deftypevr -#: doc/guix.texi:17750 +#: doc/guix.texi:17747 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string ssl-ca-location" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette ssl-ca-location" #. type: deftypevr -#: doc/guix.texi:17753 +#: doc/guix.texi:17750 msgid "The location of certificate authority (CA) files for SSL server certificate verification." -msgstr "" +msgstr "Der Ort mit den Dateien über die Zertifikatsautoritäten (Certificate Authoritys, CAs) zur Prüfung der SSL-Serverzertifikate." #. type: deftypevr -#: doc/guix.texi:17755 +#: doc/guix.texi:17752 msgid "Defaults to @samp{\"/etc/ssl/certs/ca-certificates.crt\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/ssl/certs/ca-certificates.crt\"}." #. type: deftypevr -#: doc/guix.texi:17758 +#: doc/guix.texi:17755 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string ssl-cert-location" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette ssl-cert-location" #. type: deftypevr -#: doc/guix.texi:17760 +#: doc/guix.texi:17757 msgid "Location of SSL client certificates." -msgstr "" +msgstr "Der Ort mit den SSL-Client-Zertifikaten." #. type: deftypevr -#: doc/guix.texi:17762 +#: doc/guix.texi:17759 msgid "Defaults to @samp{\"/etc/ssl/certs\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/ssl/certs\"}." #. type: deftypevr -#: doc/guix.texi:17765 +#: doc/guix.texi:17762 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} string extra-options" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Zeichenkette extra-options" #. type: deftypevr -#: doc/guix.texi:17767 doc/guix.texi:17871 +#: doc/guix.texi:17764 doc/guix.texi:17868 msgid "Extra options will be appended to Zabbix server configuration file." -msgstr "" +msgstr "Zusätzliche Optionen werden an die Zabbix-Server-Konfigurationsdatei angehängt." #. type: deftypevr -#: doc/guix.texi:17772 +#: doc/guix.texi:17769 #, no-wrap msgid "{@code{zabbix-server-configuration} parameter} include-files include-files" -msgstr "" +msgstr "{@code{zabbix-server-configuration}-Parameter} Einzubindende-Dateien include-files" #. type: deftypevr -#: doc/guix.texi:17775 doc/guix.texi:17879 +#: doc/guix.texi:17772 doc/guix.texi:17876 msgid "You may include individual files or all files in a directory in the configuration file." -msgstr "" +msgstr "Sie können einzelne Dateien oder alle Dateien in einem Verzeichnis in die Konfigurationsdatei einbinden." #. type: subsubheading -#: doc/guix.texi:17782 +#: doc/guix.texi:17779 #, no-wrap msgid "Zabbix agent" -msgstr "" +msgstr "Zabbix-Agent" #. type: cindex -#: doc/guix.texi:17783 +#: doc/guix.texi:17780 #, no-wrap msgid "zabbix zabbix-agent" -msgstr "" +msgstr "Zabbix, Zabbix-Agent" #. type: Plain text -#: doc/guix.texi:17786 +#: doc/guix.texi:17783 msgid "Zabbix agent gathers information for Zabbix server." -msgstr "" +msgstr "Der Zabbix-Agent sammelt Informationen für den Zabbix-Server." #. type: Plain text -#: doc/guix.texi:17790 +#: doc/guix.texi:17787 msgid "Available @code{zabbix-agent-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{zabbix-agent-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:17791 +#: doc/guix.texi:17788 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} package zabbix-agent" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} „package“ zabbix-agent" #. type: deftypevr -#: doc/guix.texi:17793 +#: doc/guix.texi:17790 msgid "The zabbix-agent package." msgstr "Das zabbix-agent-Paket." #. type: deftypevr -#: doc/guix.texi:17796 +#: doc/guix.texi:17793 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string user" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:17798 +#: doc/guix.texi:17795 msgid "User who will run the Zabbix agent." -msgstr "" +msgstr "Das Benutzerkonto, mit dem der Zabbix-Agent ausgeführt wird." #. type: deftypevr -#: doc/guix.texi:17803 +#: doc/guix.texi:17800 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} group group" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Gruppe group" #. type: deftypevr -#: doc/guix.texi:17805 +#: doc/guix.texi:17802 msgid "Group who will run the Zabbix agent." -msgstr "" +msgstr "Die Gruppe, mit der der Zabbix-Agent ausgeführt wird." #. type: deftypevr -#: doc/guix.texi:17810 +#: doc/guix.texi:17807 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string hostname" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Zeichenkette hostname" #. type: deftypevr -#: doc/guix.texi:17813 +#: doc/guix.texi:17810 msgid "Unique, case sensitive hostname which is required for active checks and must match hostname as configured on the server." -msgstr "" +msgstr "Der eindeutige Rechnername in richtiger Groß-/Kleinschreibung, der für aktive Überprüfungen benötigt wird und dem im Server eingestellten Rechnernamen entsprechen muss." #. type: deftypevr -#: doc/guix.texi:17815 +#: doc/guix.texi:17812 msgid "Defaults to @samp{\"Zabbix server\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"Zabbix server\"}." #. type: deftypevr -#: doc/guix.texi:17818 +#: doc/guix.texi:17815 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string log-type" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Zeichenkette log-type" #. type: deftypevr -#: doc/guix.texi:17837 +#: doc/guix.texi:17834 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string log-file" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Zeichenkette log-file" #. type: deftypevr -#: doc/guix.texi:17841 +#: doc/guix.texi:17838 msgid "Defaults to @samp{\"/var/log/zabbix/agent.log\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/log/zabbix/agent.log\"}." #. type: deftypevr -#: doc/guix.texi:17844 +#: doc/guix.texi:17841 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string pid-file" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Zeichenkette pid-file" #. type: deftypevr -#: doc/guix.texi:17848 +#: doc/guix.texi:17845 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_agent.pid\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/run/zabbix/zabbix_agent.pid\"}." #. type: deftypevr -#: doc/guix.texi:17851 +#: doc/guix.texi:17848 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} list server" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Liste server" #. type: deftypevr -#: doc/guix.texi:17855 +#: doc/guix.texi:17852 msgid "List of IP addresses, optionally in CIDR notation, or hostnames of Zabbix servers and Zabbix proxies. Incoming connections will be accepted only from the hosts listed here." -msgstr "" +msgstr "Die Liste der IP-Adressen, optional in CIDR-Notation angegeben, oder die Rechnernamen von Zabbix-Servern und Zabbix-Proxys. Eingehende Verbindungen werden nur dann angenommen, wenn sie von hier angegebenen Rechnern stammen." #. type: deftypevr -#: doc/guix.texi:17857 doc/guix.texi:17866 +#: doc/guix.texi:17854 doc/guix.texi:17863 msgid "Defaults to @samp{(\"127.0.0.1\")}." -msgstr "" +msgstr "Die Vorgabe ist @samp{(\"127.0.0.1\")}." #. type: deftypevr -#: doc/guix.texi:17860 +#: doc/guix.texi:17857 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} list server-active" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Liste server-active" #. type: deftypevr -#: doc/guix.texi:17864 +#: doc/guix.texi:17861 msgid "List of IP:port (or hostname:port) pairs of Zabbix servers and Zabbix proxies for active checks. If port is not specified, default port is used. If this parameter is not specified, active checks are disabled." -msgstr "" +msgstr "Die Liste aus IP:Port-Paaren (oder Rechnername:Port-Paaren) von Zabbix-Servern und Zabbix-Proxys für aktive Überprüfungen. Wenn kein Port angegeben wurde, wird der Vorgabeport benutzt. Wenn dieser Parameter @emph{nicht} angegeben wird, werden aktive Überprüfungen deaktiviert." #. type: deftypevr -#: doc/guix.texi:17869 +#: doc/guix.texi:17866 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} string extra-options" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Zeichenkette extra-options" #. type: deftypevr -#: doc/guix.texi:17876 +#: doc/guix.texi:17873 #, no-wrap msgid "{@code{zabbix-agent-configuration} parameter} include-files include-files" -msgstr "" +msgstr "{@code{zabbix-agent-configuration}-Parameter} Einzubindende-Dateien include-files" #. type: subsubheading -#: doc/guix.texi:17886 +#: doc/guix.texi:17883 #, no-wrap msgid "Zabbix front-end" -msgstr "" +msgstr "Zabbix-Frontend" #. type: cindex -#: doc/guix.texi:17887 +#: doc/guix.texi:17884 #, no-wrap msgid "zabbix zabbix-front-end" -msgstr "" +msgstr "Zabbix, Zabbix-Frontend" #. type: Plain text -#: doc/guix.texi:17890 +#: doc/guix.texi:17887 msgid "This service provides a WEB interface to Zabbix server." -msgstr "" +msgstr "Dieser Dienst stellt eine Weboberfläche als Vordergrundsystem (@dfn{Frontend}) für den Zabbix-Server zur Verfügung." #. type: Plain text -#: doc/guix.texi:17894 +#: doc/guix.texi:17891 msgid "Available @code{zabbix-front-end-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{zabbix-front-end-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:17895 +#: doc/guix.texi:17892 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} nginx-server-configuration-list nginx" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} „nginx-server-configuration“-Liste nginx" #. type: deftypevr -#: doc/guix.texi:17897 doc/guix.texi:22299 +#: doc/guix.texi:17894 doc/guix.texi:22296 msgid "NGINX configuration." -msgstr "" +msgstr "NGINX-Konfiguration." #. type: deftypevr -#: doc/guix.texi:17900 +#: doc/guix.texi:17897 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-host" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zeichenkette db-host" #. type: deftypevr -#: doc/guix.texi:17907 +#: doc/guix.texi:17904 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} number db-port" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zahl db-port" #. type: deftypevr -#: doc/guix.texi:17914 +#: doc/guix.texi:17911 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-name" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zeichenkette db-name" #. type: deftypevr -#: doc/guix.texi:17921 +#: doc/guix.texi:17918 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-user" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zeichenkette db-user" #. type: deftypevr -#: doc/guix.texi:17928 +#: doc/guix.texi:17925 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-password" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zeichenkette db-password" #. type: deftypevr -#: doc/guix.texi:17930 +#: doc/guix.texi:17927 msgid "Database password. Please, use @code{db-secret-file} instead." -msgstr "" +msgstr "Das Datenbankpasswort. Bitte benutzen Sie stattdessen @code{db-secret-file}." #. type: deftypevr -#: doc/guix.texi:17935 +#: doc/guix.texi:17932 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string db-secret-file" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zeichenkette db-secret-file" #. type: deftypevr -#: doc/guix.texi:17939 +#: doc/guix.texi:17936 msgid "Secret file which will be appended to @file{zabbix.conf.php} file. This file contains credentials for use by Zabbix front-end. You are expected to create it manually." -msgstr "" +msgstr "Die Datei mit den Geheimnis-Informationen, die an die @file{zabbix.conf.php}-Datei angehängt wird. Diese Datei enthält Zugangsdaten für die Nutzung durch das Zabbix-Frontend. Es wird von Ihnen erwartet, dass Sie sie manuell erzeugen." #. type: deftypevr -#: doc/guix.texi:17944 +#: doc/guix.texi:17941 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} string zabbix-host" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zeichenkette zabbix-host" #. type: deftypevr -#: doc/guix.texi:17946 +#: doc/guix.texi:17943 msgid "Zabbix server hostname." -msgstr "" +msgstr "Zabbix-Server-Rechnername." #. type: deftypevr -#: doc/guix.texi:17951 +#: doc/guix.texi:17948 #, no-wrap msgid "{@code{zabbix-front-end-configuration} parameter} number zabbix-port" -msgstr "" +msgstr "{@code{zabbix-front-end-configuration}-Parameter} Zahl zabbix-port" #. type: deftypevr -#: doc/guix.texi:17953 +#: doc/guix.texi:17950 msgid "Zabbix server port." -msgstr "" +msgstr "Zabbix-Server-Port." #. type: deftypevr -#: doc/guix.texi:17955 +#: doc/guix.texi:17952 msgid "Defaults to @samp{10051}." -msgstr "" +msgstr "Die Vorgabe ist @samp{10051}." #. type: cindex -#: doc/guix.texi:17963 +#: doc/guix.texi:17960 #, no-wrap msgid "Kerberos" -msgstr "" +msgstr "Kerberos" #. type: Plain text -#: doc/guix.texi:17967 +#: doc/guix.texi:17964 msgid "The @code{(gnu services kerberos)} module provides services relating to the authentication protocol @dfn{Kerberos}." -msgstr "" +msgstr "Das @code{(gnu services kerberos)}-Modul stellt Dienste zur Verfügung, die mit dem Authentifizierungsprotokoll @dfn{Kerberos} zu tun haben." #. type: subsubheading -#: doc/guix.texi:17968 +#: doc/guix.texi:17965 #, no-wrap msgid "Krb5 Service" -msgstr "" +msgstr "Krb5-Dienst" #. type: Plain text -#: doc/guix.texi:17975 +#: doc/guix.texi:17972 msgid "Programs using a Kerberos client library normally expect a configuration file in @file{/etc/krb5.conf}. This service generates such a file from a definition provided in the operating system declaration. It does not cause any daemon to be started." -msgstr "" +msgstr "Programme, die eine Kerberos-Clientbibliothek benutzen, erwarten meist, dass sich eine Konfigurationsdatei in @file{/etc/krb5.conf} befindet. Dieser Dienst erzeugt eine solche Datei aus einer Definition, die in der Betriebssystemdeklaration angegebenen wurde. Durch ihn wird kein Daemon gestartet." #. type: Plain text -#: doc/guix.texi:17979 +#: doc/guix.texi:17976 msgid "No ``keytab'' files are provided by this service---you must explicitly create them. This service is known to work with the MIT client library, @code{mit-krb5}. Other implementations have not been tested." -msgstr "" +msgstr "Keine „Schlüsseltabellen“-Dateien werden durch diesen Dienst zur Verfügung gestellt — Sie müssen sie ausdrücklich selbst anlegen. Dieser Dienst funktioniert bekanntermaßen mit der MIT-Clientbibliothek @code{mit-krb5}. Andere Implementierungen wurden nicht getestet." #. type: defvr -#: doc/guix.texi:17980 +#: doc/guix.texi:17977 #, no-wrap msgid "{Scheme Variable} krb5-service-type" -msgstr "" +msgstr "{Scheme-Variable} krb5-service-type" #. type: defvr -#: doc/guix.texi:17982 +#: doc/guix.texi:17979 msgid "A service type for Kerberos 5 clients." -msgstr "" +msgstr "Ein Diensttyp für Kerberos-5-Clients." #. type: Plain text -#: doc/guix.texi:17986 +#: doc/guix.texi:17983 msgid "Here is an example of its use:" -msgstr "" +msgstr "Hier ist ein Beispiel, wie man ihn benutzt:" #. type: lisp -#: doc/guix.texi:18000 +#: doc/guix.texi:17997 #, no-wrap msgid "" "(service krb5-service-type\n" @@ -33594,208 +33689,221 @@ msgid "" " (admin-server \"kerb-admin.argrx.edu\")\n" " (kdc \"keys.argrx.edu\"))))))\n" msgstr "" +"(service krb5-service-type\n" +" (krb5-configuration\n" +" (default-realm \"EXAMPLE.COM\")\n" +" (allow-weak-crypto? #t)\n" +" (realms (list\n" +" (krb5-realm\n" +" (name \"EXAMPLE.COM\")\n" +" (admin-server \"groucho.example.com\")\n" +" (kdc \"karl.example.com\"))\n" +" (krb5-realm\n" +" (name \"ARGRX.EDU\")\n" +" (admin-server \"kerb-admin.argrx.edu\")\n" +" (kdc \"keys.argrx.edu\"))))))\n" #. type: Plain text -#: doc/guix.texi:18004 +#: doc/guix.texi:18001 msgid "This example provides a Kerberos@tie{}5 client configuration which:" -msgstr "" +msgstr "Dieses Beispiel stellt eine Client-Konfiguration für Kerberos@tie{}5 zur Verfügung, mit der:" #. type: item -#: doc/guix.texi:18005 +#: doc/guix.texi:18002 #, no-wrap msgid "Recognizes two realms, @i{viz:} ``EXAMPLE.COM'' and ``ARGRX.EDU'', both" -msgstr "" +msgstr "Zwei Administrationsbereiche erkannt werden, nämlich: „EXAMPLE.COM“" #. type: itemize -#: doc/guix.texi:18007 +#: doc/guix.texi:18004 msgid "of which have distinct administration servers and key distribution centers;" -msgstr "" +msgstr "und „ARGRX.EDU“, die beide verschiedene Administrationsserver und Schlüsselverteilungszentren haben," #. type: item -#: doc/guix.texi:18007 +#: doc/guix.texi:18004 #, no-wrap msgid "Will default to the realm ``EXAMPLE.COM'' if the realm is not explicitly" -msgstr "" +msgstr "als Vorgabe der Administrationsbereich „EXAMPLE.COM“ verwendet wird," #. type: itemize -#: doc/guix.texi:18009 +#: doc/guix.texi:18006 msgid "specified by clients;" -msgstr "" +msgstr "falls der Administrationsbereich von Clients nicht ausdrücklich angegeben wurde, und" #. type: item -#: doc/guix.texi:18009 +#: doc/guix.texi:18006 #, no-wrap msgid "Accepts services which only support encryption types known to be weak." -msgstr "" +msgstr "auch Dienste angenommen werden, die nur Verschlüsselungstypen unterstützen, die bekanntermaßen schwach sind." #. type: Plain text -#: doc/guix.texi:18017 +#: doc/guix.texi:18014 msgid "The @code{krb5-realm} and @code{krb5-configuration} types have many fields. Only the most commonly used ones are described here. For a full list, and more detailed explanation of each, see the MIT @uref{https://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} documentation." -msgstr "" +msgstr "Die Typen @code{krb5-realm} und @code{krb5-configuration} haben viele Felder. Hier werden nur die am häufigsten benutzten beschrieben. Eine vollständige Liste und jeweils detailliertere Erklärungen finden Sie in der Dokumentation von @uref{https://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} vom MIT." #. type: deftp -#: doc/guix.texi:18019 +#: doc/guix.texi:18016 #, no-wrap msgid "{Data Type} krb5-realm" -msgstr "" +msgstr "{Datentyp} krb5-realm" #. type: cindex -#: doc/guix.texi:18020 +#: doc/guix.texi:18017 #, no-wrap msgid "realm, kerberos" -msgstr "" +msgstr "Administrationsbereich, Kerberos" #. type: table -#: doc/guix.texi:18026 +#: doc/guix.texi:18023 msgid "This field is a string identifying the name of the realm. A common convention is to use the fully qualified DNS name of your organization, converted to upper case." -msgstr "" +msgstr "Dieses Feld enthält eine Zeichenkette, die den Namen des Administrationsbereichs bezeichnet. Üblich ist, den vollständigen DNS-Namen („Fully Qualified DNS Name“) Ihrer Organisation nur in Großbuchstaben zu benutzen." #. type: code{#1} -#: doc/guix.texi:18027 +#: doc/guix.texi:18024 #, no-wrap msgid "admin-server" -msgstr "" +msgstr "admin-server" #. type: table -#: doc/guix.texi:18030 +#: doc/guix.texi:18027 msgid "This field is a string identifying the host where the administration server is running." -msgstr "" +msgstr "Dieses Feld enthält eine Zeichenkette, die den Rechner benennt, auf dem der Administrationsserver läuft." #. type: code{#1} -#: doc/guix.texi:18031 +#: doc/guix.texi:18028 #, no-wrap msgid "kdc" -msgstr "" +msgstr "kdc" #. type: table -#: doc/guix.texi:18034 +#: doc/guix.texi:18031 msgid "This field is a string identifying the key distribution center for the realm." -msgstr "" +msgstr "Dieses Feld enthält eine Zeichenkette, die das Schlüsselverteilungszentrum für den Administrationsbereich angibt." #. type: deftp -#: doc/guix.texi:18037 +#: doc/guix.texi:18034 #, no-wrap msgid "{Data Type} krb5-configuration" -msgstr "" +msgstr "{Datentyp} krb5-configuration" #. type: item -#: doc/guix.texi:18040 +#: doc/guix.texi:18037 #, no-wrap msgid "@code{allow-weak-crypto?} (default: @code{#f})" -msgstr "" +msgstr "@code{allow-weak-crypto?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18043 +#: doc/guix.texi:18040 msgid "If this flag is @code{#t} then services which only offer encryption algorithms known to be weak will be accepted." -msgstr "" +msgstr "Wenn diese Option auf @code{#t} gesetzt ist, werden auch Dienste akzeptiert, die nur Verschlüsselungsalgorithmen anbieten, die bekanntermaßen schwach sind." #. type: item -#: doc/guix.texi:18044 +#: doc/guix.texi:18041 #, no-wrap msgid "@code{default-realm} (default: @code{#f})" -msgstr "" +msgstr "@code{default-realm} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18051 +#: doc/guix.texi:18048 msgid "This field should be a string identifying the default Kerberos realm for the client. You should set this field to the name of your Kerberos realm. If this value is @code{#f} then a realm must be specified with every Kerberos principal when invoking programs such as @command{kinit}." -msgstr "" +msgstr "Dieses Feld sollte eine Zeichenkette enthalten, die den voreingestellten Kerberos-Administrationsbereich für den Client angibt. Sie sollten in diesem Feld den Namen Ihres Kerberos-Administrationsbereichs eintragen. Wenn der Wert @code{#f} ist, dann muss ein Administrationsbereich mit jedem Kerberos-Prinzipal zusammen angegeben werden, wenn Programme wie @command{kinit} aufgerufen werden." #. type: code{#1} -#: doc/guix.texi:18052 +#: doc/guix.texi:18049 #, no-wrap msgid "realms" -msgstr "" +msgstr "realms" #. type: table -#: doc/guix.texi:18057 +#: doc/guix.texi:18054 msgid "This should be a non-empty list of @code{krb5-realm} objects, which clients may access. Normally, one of them will have a @code{name} field matching the @code{default-realm} field." -msgstr "" +msgstr "Hierin sollte eine nichtleere Liste von je einem @code{krb5-realm}-Objekt pro Administrationsbereich stehen, auf den Clients zugreifen können. Normalerweise hat einer davon ein @code{name}-Feld, das mit dem @code{default-realm}-Feld übereinstimmt." #. type: subsubheading -#: doc/guix.texi:18061 +#: doc/guix.texi:18058 #, no-wrap msgid "PAM krb5 Service" -msgstr "" +msgstr "PAM-krb5-Dienst" #. type: cindex -#: doc/guix.texi:18062 +#: doc/guix.texi:18059 #, no-wrap msgid "pam-krb5" -msgstr "" +msgstr "pam-krb5" #. type: Plain text -#: doc/guix.texi:18068 +#: doc/guix.texi:18065 msgid "The @code{pam-krb5} service allows for login authentication and password management via Kerberos. You will need this service if you want PAM enabled applications to authenticate users using Kerberos." -msgstr "" +msgstr "Der @code{pam-krb5}-Dienst ermöglicht es, bei der Anmeldung und Passwortverwaltung Benutzer über Kerberos zu authentifizieren. Sie brauchen diesen Dienst, damit Anwendungen, die PAM benutzen können, Nutzer über Kerberos authentifizieren können." #. type: defvr -#: doc/guix.texi:18069 +#: doc/guix.texi:18066 #, no-wrap msgid "{Scheme Variable} pam-krb5-service-type" -msgstr "" +msgstr "{Scheme-Variable} pam-krb5-service-type" #. type: defvr -#: doc/guix.texi:18071 +#: doc/guix.texi:18068 msgid "A service type for the Kerberos 5 PAM module." -msgstr "" +msgstr "Ein Diensttyp für das PAM-Modul zu Kerberos@tie{}5." #. type: deftp -#: doc/guix.texi:18073 +#: doc/guix.texi:18070 #, no-wrap msgid "{Data Type} pam-krb5-configuration" -msgstr "" +msgstr "{Datentyp} pam-krb5-configuration" #. type: deftp -#: doc/guix.texi:18076 +#: doc/guix.texi:18073 msgid "Data type representing the configuration of the Kerberos 5 PAM module. This type has the following parameters:" -msgstr "Der Datentyp, der die Konfiguration eines PAM-Moduls für Kerberos 5 repräsentiert. Dieser Typ hat die folgenden Parameter:" +msgstr "Der Datentyp, der die Konfiguration des PAM-Moduls für Kerberos 5 repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:18077 +#: doc/guix.texi:18074 #, no-wrap msgid "@code{pam-krb5} (default: @code{pam-krb5})" -msgstr "" +msgstr "@code{pam-krb5} (Vorgabe: @code{pam-krb5})" #. type: table -#: doc/guix.texi:18079 +#: doc/guix.texi:18076 msgid "The pam-krb5 package to use." -msgstr "" +msgstr "Das pam-krb5-Paket, das benutzt werden soll." #. type: item -#: doc/guix.texi:18080 +#: doc/guix.texi:18077 #, no-wrap msgid "@code{minimum-uid} (default: @code{1000})" -msgstr "" +msgstr "@code{minimum-uid} (Vorgabe: @code{1000})" #. type: table -#: doc/guix.texi:18083 +#: doc/guix.texi:18080 msgid "The smallest user ID for which Kerberos authentications should be attempted. Local accounts with lower values will silently fail to authenticate." -msgstr "" +msgstr "Der kleinste Benutzeridentifikator (UID), für den Authentifizierung über Kerberos versucht werden sollte. Lokale Benutzerkonten mit niedrigeren Zahlwerten können sich nicht authentizieren und bekommen dazu keine Meldung angezeigt." #. type: cindex -#: doc/guix.texi:18089 +#: doc/guix.texi:18086 #, no-wrap msgid "LDAP" -msgstr "" +msgstr "LDAP" #. type: cindex -#: doc/guix.texi:18090 +#: doc/guix.texi:18087 #, no-wrap msgid "nslcd, LDAP service" -msgstr "" +msgstr "nslcd, LDAP-Dienst" #. type: Plain text -#: doc/guix.texi:18097 +#: doc/guix.texi:18094 msgid "The @code{(gnu services authentication)} module provides the @code{nslcd-service-type}, which can be used to authenticate against an LDAP server. In addition to configuring the service itself, you may want to add @code{ldap} as a name service to the Name Service Switch. @xref{Name Service Switch} for detailed information." -msgstr "" +msgstr "Das Modul @code{(gnu services authentication)} stellt den Diensttyp @code{nslcd-service-type} zur Verfügung, mit dem sich Benutzer gegenüber einem LDAP-Server authentizieren können. Sie möchten dabei wahrscheinlich nicht nur den Dienst konfigurieren, sondern auch @code{ldap} als einen Namensdienst („Name Service“) für den Name Service Switch hinzufügen. Siehe @ref{Name Service Switch} für Details." #. type: Plain text -#: doc/guix.texi:18101 +#: doc/guix.texi:18098 msgid "Here is a simple operating system declaration with a default configuration of the @code{nslcd-service-type} and a Name Service Switch configuration that consults the @code{ldap} name service last:" -msgstr "" +msgstr "Hier ist ein Beispiel für eine einfache Betriebssystemdeklaration mit einer der Vorgabe entsprechenden Konfiguration des @code{nslcd-service-type} und einer Konfiguration des Name Service Switch, die den @code{ldap}-Namensdienst zuletzt prüft:" #. type: example -#: doc/guix.texi:18124 +#: doc/guix.texi:18121 #, no-wrap msgid "" "(use-service-modules authentication)\n" @@ -33819,674 +33927,695 @@ msgid "" " (group services)\n" " (netgroup services)\n" " (gshadow services)))))\n" -msgstr "" +msgstr "" +"(use-service-modules authentication)\n" +"(use-modules (gnu system nss))\n" +"...\n" +"(operating-system\n" +" ...\n" +" (services\n" +" (cons*\n" +" (service nslcd-service-type)\n" +" (service dhcp-client-service-type)\n" +" %base-services))\n" +" (name-service-switch\n" +" (let ((services (list (name-service (name \"db\"))\n" +" (name-service (name \"files\"))\n" +" (name-service (name \"ldap\")))))\n" +" (name-service-switch\n" +" (inherit %mdns-host-lookup-nss)\n" +" (password services)\n" +" (shadow services)\n" +" (group services)\n" +" (netgroup services)\n" +" (gshadow services)))))\n" #. type: Plain text -#: doc/guix.texi:18129 +#: doc/guix.texi:18126 msgid "Available @code{nslcd-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{nslcd-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:18130 +#: doc/guix.texi:18127 #, no-wrap msgid "{@code{nslcd-configuration} parameter} package nss-pam-ldapd" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} „package“ nss-pam-ldapd" #. type: deftypevr -#: doc/guix.texi:18132 +#: doc/guix.texi:18129 msgid "The @code{nss-pam-ldapd} package to use." msgstr "Das @code{nss-pam-ldapd}-Paket, was benutzt werden soll." #. type: deftypevr -#: doc/guix.texi:18135 +#: doc/guix.texi:18132 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number threads" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl threads" #. type: deftypevr -#: doc/guix.texi:18139 +#: doc/guix.texi:18136 msgid "The number of threads to start that can handle requests and perform LDAP queries. Each thread opens a separate connection to the LDAP server. The default is to start 5 threads." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18141 doc/guix.texi:18183 doc/guix.texi:18191 -#: doc/guix.texi:18199 doc/guix.texi:18207 doc/guix.texi:18216 -#: doc/guix.texi:18224 doc/guix.texi:18231 doc/guix.texi:18239 -#: doc/guix.texi:18247 doc/guix.texi:18257 doc/guix.texi:18264 -#: doc/guix.texi:18288 doc/guix.texi:18296 doc/guix.texi:18322 -#: doc/guix.texi:18331 doc/guix.texi:18340 doc/guix.texi:18349 -#: doc/guix.texi:18358 doc/guix.texi:18367 doc/guix.texi:18375 -#: doc/guix.texi:18383 doc/guix.texi:18390 doc/guix.texi:18398 -#: doc/guix.texi:18405 doc/guix.texi:18413 doc/guix.texi:18421 -#: doc/guix.texi:18430 doc/guix.texi:18439 doc/guix.texi:18447 -#: doc/guix.texi:18455 doc/guix.texi:18463 doc/guix.texi:18474 -#: doc/guix.texi:18484 doc/guix.texi:18495 doc/guix.texi:18504 -#: doc/guix.texi:18514 doc/guix.texi:18522 doc/guix.texi:18533 -#: doc/guix.texi:18542 doc/guix.texi:18552 doc/guix.texi:20842 -#: doc/guix.texi:20849 doc/guix.texi:20856 doc/guix.texi:20863 -#: doc/guix.texi:20870 doc/guix.texi:20877 doc/guix.texi:20885 -#: doc/guix.texi:20893 doc/guix.texi:20900 doc/guix.texi:20907 -#: doc/guix.texi:20914 doc/guix.texi:20921 doc/guix.texi:20951 -#: doc/guix.texi:20989 doc/guix.texi:20996 doc/guix.texi:21005 -#: doc/guix.texi:21027 doc/guix.texi:21035 doc/guix.texi:21042 -#: doc/guix.texi:21197 doc/guix.texi:21217 doc/guix.texi:21232 -#: doc/guix.texi:21239 doc/guix.texi:23037 doc/guix.texi:23045 -#: doc/guix.texi:23053 doc/guix.texi:23061 doc/guix.texi:23069 -#: doc/guix.texi:23077 +msgstr "Die Anzahl zu startender Threads, die Anfragen bearbeiten und LDAP-Abfragen durchführen können. Jeder Thread öffnet eine separate Verbindung zum LDAP-Server. Die Vorgabe ist, 5 Threads zu starten." + +#. type: deftypevr +#: doc/guix.texi:18138 doc/guix.texi:18180 doc/guix.texi:18188 +#: doc/guix.texi:18196 doc/guix.texi:18204 doc/guix.texi:18213 +#: doc/guix.texi:18221 doc/guix.texi:18228 doc/guix.texi:18236 +#: doc/guix.texi:18244 doc/guix.texi:18254 doc/guix.texi:18261 +#: doc/guix.texi:18285 doc/guix.texi:18293 doc/guix.texi:18319 +#: doc/guix.texi:18328 doc/guix.texi:18337 doc/guix.texi:18346 +#: doc/guix.texi:18355 doc/guix.texi:18364 doc/guix.texi:18372 +#: doc/guix.texi:18380 doc/guix.texi:18387 doc/guix.texi:18395 +#: doc/guix.texi:18402 doc/guix.texi:18410 doc/guix.texi:18418 +#: doc/guix.texi:18427 doc/guix.texi:18436 doc/guix.texi:18444 +#: doc/guix.texi:18452 doc/guix.texi:18460 doc/guix.texi:18471 +#: doc/guix.texi:18481 doc/guix.texi:18492 doc/guix.texi:18501 +#: doc/guix.texi:18511 doc/guix.texi:18519 doc/guix.texi:18530 +#: doc/guix.texi:18539 doc/guix.texi:18549 doc/guix.texi:20839 +#: doc/guix.texi:20846 doc/guix.texi:20853 doc/guix.texi:20860 +#: doc/guix.texi:20867 doc/guix.texi:20874 doc/guix.texi:20882 +#: doc/guix.texi:20890 doc/guix.texi:20897 doc/guix.texi:20904 +#: doc/guix.texi:20911 doc/guix.texi:20918 doc/guix.texi:20948 +#: doc/guix.texi:20986 doc/guix.texi:20993 doc/guix.texi:21002 +#: doc/guix.texi:21024 doc/guix.texi:21032 doc/guix.texi:21039 +#: doc/guix.texi:21194 doc/guix.texi:21214 doc/guix.texi:21229 +#: doc/guix.texi:21236 doc/guix.texi:23034 doc/guix.texi:23042 +#: doc/guix.texi:23050 doc/guix.texi:23058 doc/guix.texi:23066 +#: doc/guix.texi:23074 msgid "Defaults to @samp{disabled}." msgstr "Der Vorgabewert ist @samp{disabled} (d.h.@: deaktiviert)." #. type: deftypevr -#: doc/guix.texi:18144 +#: doc/guix.texi:18141 #, no-wrap msgid "{@code{nslcd-configuration} parameter} string uid" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Zeichenkette uid" #. type: deftypevr -#: doc/guix.texi:18146 +#: doc/guix.texi:18143 msgid "This specifies the user id with which the daemon should be run." -msgstr "" +msgstr "Gibt den Benutzeridentifikator an, unter dem der Daemon ausgeführt werden soll." #. type: deftypevr -#: doc/guix.texi:18148 doc/guix.texi:18155 +#: doc/guix.texi:18145 doc/guix.texi:18152 msgid "Defaults to @samp{\"nslcd\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"nslcd\"}." #. type: deftypevr -#: doc/guix.texi:18151 +#: doc/guix.texi:18148 #, no-wrap msgid "{@code{nslcd-configuration} parameter} string gid" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Zeichenkette gid" #. type: deftypevr -#: doc/guix.texi:18153 +#: doc/guix.texi:18150 msgid "This specifies the group id with which the daemon should be run." -msgstr "" +msgstr "Gibt den Gruppenidentifikator an, unter dem der Daemon ausgeführt werden soll." #. type: deftypevr -#: doc/guix.texi:18158 +#: doc/guix.texi:18155 #, no-wrap msgid "{@code{nslcd-configuration} parameter} log-option log" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Protokolleinstellung log" #. type: deftypevr -#: doc/guix.texi:18165 +#: doc/guix.texi:18162 msgid "This option controls the way logging is done via a list containing SCHEME and LEVEL. The SCHEME argument may either be the symbols \"none\" or \"syslog\", or an absolute file name. The LEVEL argument is optional and specifies the log level. The log level may be one of the following symbols: \"crit\", \"error\", \"warning\", \"notice\", \"info\" or \"debug\". All messages with the specified log level or higher are logged." -msgstr "" +msgstr "Diese Einstellung steuert über eine Liste aus SCHEMA und STUFE, wie protokolliert wird. Als SCHEMA-Argument darf entweder eines der Symbole \"none\" (keines) oder \"syslog\" angegeben werden oder ein absoluter Dateiname. Das Argument STUFE ist optional und legt die Protokollierungsstufe fest. Die Protokollierungsstufe kann als eines der folgenden Symbole angegeben werden: \"crit\" (kritisch), \"error\" (Fehler), \"warning\" (Warnung), \"notice\" (Benachrichtigung), \"info\" (Information) oder \"debug\" (Fehlersuche). Alle Mitteilungen mit der angegebenen Protokollierungsstufe oder einer höheren werden protokolliert." #. type: deftypevr -#: doc/guix.texi:18167 +#: doc/guix.texi:18164 msgid "Defaults to @samp{(\"/var/log/nslcd\" info)}." -msgstr "" +msgstr "Die Vorgabe ist @samp{(\"/var/log/nslcd\" info)}." #. type: deftypevr -#: doc/guix.texi:18170 +#: doc/guix.texi:18167 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list uri" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Liste uri" #. type: deftypevr -#: doc/guix.texi:18173 +#: doc/guix.texi:18170 msgid "The list of LDAP server URIs. Normally, only the first server will be used with the following servers as fall-back." -msgstr "" +msgstr "Die Liste der LDAP-Server-URIs. Normalerweise wird nur der erste Server benutzt; nachfolgende Server dienen als Ersatz." #. type: deftypevr -#: doc/guix.texi:18175 +#: doc/guix.texi:18172 msgid "Defaults to @samp{(\"ldap://localhost:389/\")}." -msgstr "" +msgstr "Die Vorgabe ist @samp{(\"ldap://localhost:389/\")}." #. type: deftypevr -#: doc/guix.texi:18178 +#: doc/guix.texi:18175 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string ldap-version" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette ldap-version" #. type: deftypevr -#: doc/guix.texi:18181 +#: doc/guix.texi:18178 msgid "The version of the LDAP protocol to use. The default is to use the maximum version supported by the LDAP library." -msgstr "" +msgstr "Die zu benutzende Version des LDAP-Protokolls. Nach Vorgabe wird die höchste Version benutzt, die von der LDAP-Bibliothek unterstützt wird." #. type: deftypevr -#: doc/guix.texi:18186 +#: doc/guix.texi:18183 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string binddn" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette binddn" #. type: deftypevr -#: doc/guix.texi:18189 +#: doc/guix.texi:18186 msgid "Specifies the distinguished name with which to bind to the directory server for lookups. The default is to bind anonymously." -msgstr "" +msgstr "Gibt den „Distinguished Name“ an, der an den Verzeichnisserver („Directory Server“) gebunden wird, um Einträge aufzulösen. Nach Vorgabe wird anonym gebunden." #. type: deftypevr -#: doc/guix.texi:18194 +#: doc/guix.texi:18191 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string bindpw" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette bindpw" #. type: deftypevr -#: doc/guix.texi:18197 +#: doc/guix.texi:18194 msgid "Specifies the credentials with which to bind. This option is only applicable when used with binddn." -msgstr "" +msgstr "Gibt die Zugangsinformationen an, mit denen gebunden wird. Diese Einstellung ist nur dann wirksam, wenn sie mit binddn benutzt wird." #. type: deftypevr -#: doc/guix.texi:18202 +#: doc/guix.texi:18199 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmoddn" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette rootpwmoddn" #. type: deftypevr -#: doc/guix.texi:18205 +#: doc/guix.texi:18202 msgid "Specifies the distinguished name to use when the root user tries to modify a user's password using the PAM module." -msgstr "" +msgstr "Gibt den „Distinguished Name“ an, der benutzt wird, wenn der Administratornutzer „root“ versucht, das Passwort eines Benutzers mit Hilfe des PAM-Moduls zu verändern." #. type: deftypevr -#: doc/guix.texi:18210 +#: doc/guix.texi:18207 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmodpw" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette rootpwmodpw" #. type: deftypevr -#: doc/guix.texi:18214 +#: doc/guix.texi:18211 msgid "Specifies the credentials with which to bind if the root user tries to change a user's password. This option is only applicable when used with rootpwmoddn" -msgstr "" +msgstr "Gibt die Zugangsinformationen an, die benutzt werden, wenn der Administratornutzer „root“ versucht, das Passwort eines Benutzers zu verändern. Diese Einstellung ist nur dann wirksam, wenn sie mit rootpwmoddn benutzt wird." #. type: deftypevr -#: doc/guix.texi:18219 +#: doc/guix.texi:18216 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-mech" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette sasl-mech" #. type: deftypevr -#: doc/guix.texi:18222 +#: doc/guix.texi:18219 msgid "Specifies the SASL mechanism to be used when performing SASL authentication." -msgstr "" +msgstr "Gibt an, welcher SASL-Mechanismus benutzt werden soll, um Authentifizierung über SASL durchzuführen." #. type: deftypevr -#: doc/guix.texi:18227 +#: doc/guix.texi:18224 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-realm" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette sasl-realm" #. type: deftypevr -#: doc/guix.texi:18229 +#: doc/guix.texi:18226 msgid "Specifies the SASL realm to be used when performing SASL authentication." -msgstr "" +msgstr "Gibt den SASL-Administrationsbereich an, um Authentifizierungen über SASL durchzuführen." #. type: deftypevr -#: doc/guix.texi:18234 +#: doc/guix.texi:18231 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authcid" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette sasl-authcid" #. type: deftypevr -#: doc/guix.texi:18237 +#: doc/guix.texi:18234 msgid "Specifies the authentication identity to be used when performing SASL authentication." -msgstr "" +msgstr "Gibt die Authentizierungsidentität an, um Authentifizierungen über SASL durchzuführen." #. type: deftypevr -#: doc/guix.texi:18242 +#: doc/guix.texi:18239 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authzid" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette sasl-authzid" #. type: deftypevr -#: doc/guix.texi:18245 +#: doc/guix.texi:18242 msgid "Specifies the authorization identity to be used when performing SASL authentication." -msgstr "" +msgstr "Gibt die Autorisierungsidentität an, um Authentifizierungen über SASL durchzuführen." #. type: deftypevr -#: doc/guix.texi:18250 +#: doc/guix.texi:18247 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean sasl-canonicalize?" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck sasl-canonicalize?" #. type: deftypevr -#: doc/guix.texi:18255 +#: doc/guix.texi:18252 msgid "Determines whether the LDAP server host name should be canonicalised. If this is enabled the LDAP library will do a reverse host name lookup. By default, it is left up to the LDAP library whether this check is performed or not." -msgstr "" +msgstr "Legt fest, ob der kanonische Rechnername („Hostname“) des LDAP-Servers ermittelt werden soll. Wenn ja, wird die LDAP-Bibliothek eine inverse Auflösung („Reverse Lookup“) des Rechnernamens durchführen. Die Vorgabe ist, es der LDAP-Bibliothek zu überlassen, ob eine solche Überprüfung durchgeführt wird." #. type: deftypevr -#: doc/guix.texi:18260 +#: doc/guix.texi:18257 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string krb5-ccname" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette krb5-ccname" #. type: deftypevr -#: doc/guix.texi:18262 +#: doc/guix.texi:18259 msgid "Set the name for the GSS-API Kerberos credentials cache." -msgstr "" +msgstr "Legt den Namen für den Zwischenspeicher der GSS-API-Kerberos-Zugangsdaten fest." #. type: deftypevr -#: doc/guix.texi:18267 +#: doc/guix.texi:18264 #, no-wrap msgid "{@code{nslcd-configuration} parameter} string base" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Zeichenkette base" #. type: deftypevr -#: doc/guix.texi:18269 +#: doc/guix.texi:18266 msgid "The directory search base." msgstr "Basis für die Verzeichnissuche." #. type: deftypevr -#: doc/guix.texi:18271 +#: doc/guix.texi:18268 msgid "Defaults to @samp{\"dc=example,dc=com\"}." msgstr "Vorgegeben ist @samp{\"dc=example,dc=com\"}." #. type: deftypevr -#: doc/guix.texi:18274 +#: doc/guix.texi:18271 #, no-wrap msgid "{@code{nslcd-configuration} parameter} scope-option scope" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Suchbereichs-Einstellung scope" #. type: deftypevr -#: doc/guix.texi:18278 +#: doc/guix.texi:18275 msgid "Specifies the search scope (subtree, onelevel, base or children). The default scope is subtree; base scope is almost never useful for name service lookups; children scope is not supported on all servers." -msgstr "" +msgstr "Legt den Suchbereich fest als subtree (Teilbaum), onelevel (eine Ebene), base (Basis) oder children (Kinder). Die Vorgabe für den Suchbereich ist subtree; base ist fast nie geeignet für Namensdienstauflösungen; children wird nicht auf allen Servern unterstützt." #. type: deftypevr -#: doc/guix.texi:18280 +#: doc/guix.texi:18277 msgid "Defaults to @samp{(subtree)}." -msgstr "" +msgstr "Die Vorgabe ist @samp{(subtree)}." #. type: deftypevr -#: doc/guix.texi:18283 +#: doc/guix.texi:18280 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-deref-option deref" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Deref-Einstellung deref" #. type: deftypevr -#: doc/guix.texi:18286 +#: doc/guix.texi:18283 msgid "Specifies the policy for dereferencing aliases. The default policy is to never dereference aliases." -msgstr "" +msgstr "Legt die Richtlinie für das Dereferenzieren von Alias-Namen fest. Die vorgegebene Richtlinie ist, Alias-Namen niemals zu dereferenzieren." #. type: deftypevr -#: doc/guix.texi:18291 +#: doc/guix.texi:18288 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean referrals" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck referrals" #. type: deftypevr -#: doc/guix.texi:18294 +#: doc/guix.texi:18291 msgid "Specifies whether automatic referral chasing should be enabled. The default behaviour is to chase referrals." -msgstr "" +msgstr "Gibt an, ob Verweise („Referrals“) automatisch verfolgt werden sollen. Das vorgegebene Verhalten ist, sie zu verfolgen." #. type: deftypevr -#: doc/guix.texi:18299 +#: doc/guix.texi:18296 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list-of-map-entries maps" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Liste-von-Abbildungseinträgen maps" #. type: deftypevr -#: doc/guix.texi:18304 +#: doc/guix.texi:18301 msgid "This option allows for custom attributes to be looked up instead of the default RFC 2307 attributes. It is a list of maps, each consisting of the name of a map, the RFC 2307 attribute to match and the query expression for the attribute as it is available in the directory." -msgstr "" +msgstr "Diese Option ermöglicht es, eigene Attribute bei der Auflösung anstelle der vorgegebenen RFC-2307-Attribute zu verwenden. Es ist eine Liste von Abbildungen („Maps“), von denen jede aus dem Namen der Abbildung, dem abzubildenden RFC-2307-Attribut und einem Anfrageausdruck besteht, mit dem es anhand des Verzeichnisses aufgelöst wird." #. type: deftypevr -#: doc/guix.texi:18309 +#: doc/guix.texi:18306 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list-of-filter-entries filters" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Liste-von-Filtereinträgen filters" #. type: deftypevr -#: doc/guix.texi:18312 +#: doc/guix.texi:18309 msgid "A list of filters consisting of the name of a map to which the filter applies and an LDAP search filter expression." -msgstr "" +msgstr "Eine Liste von Filtern, von denen jeder aus dem Namen einer Abbildung, auf die sich der Filter auswirkt, und einem LDAP-Suchfilter-Ausdruck besteht." #. type: deftypevr -#: doc/guix.texi:18317 +#: doc/guix.texi:18314 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number bind-timelimit" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl bind-timelimit" #. type: deftypevr -#: doc/guix.texi:18320 +#: doc/guix.texi:18317 msgid "Specifies the time limit in seconds to use when connecting to the directory server. The default value is 10 seconds." -msgstr "" +msgstr "Gibt die Zeitbeschränkung in Sekunden an, wie lange eine Verbindung zum Verzeichnisserver dauern darf. Die Vorgabe ist 10 Sekunden." #. type: deftypevr -#: doc/guix.texi:18325 +#: doc/guix.texi:18322 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number timelimit" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl timelimit" #. type: deftypevr -#: doc/guix.texi:18329 +#: doc/guix.texi:18326 msgid "Specifies the time limit (in seconds) to wait for a response from the LDAP server. A value of zero, which is the default, is to wait indefinitely for searches to be completed." -msgstr "" +msgstr "Gibt die Zeitbeschränkung (in Sekunden) an, wie lange auf eine Antwort vom LDAP-Server gewartet wird. Ein Wert von null, was die Vorgabe ist, bewirkt, dass beliebig lange gewartet wird, bis Suchen abgeschlossen sind." #. type: deftypevr -#: doc/guix.texi:18334 +#: doc/guix.texi:18331 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number idle-timelimit" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl idle-timelimit" #. type: deftypevr -#: doc/guix.texi:18338 +#: doc/guix.texi:18335 msgid "Specifies the period if inactivity (in seconds) after which the con‐ nection to the LDAP server will be closed. The default is not to time out connections." -msgstr "" +msgstr "Gibt an, wie lange bei Inaktivität gewartet wird (in Sekunden), bis die Verbindung zum LDAP-Server geschlossen wird. Die Vorgabe ist, dass es zu keiner Zeitüberschreitung bei Verbindungen kommen kann." #. type: deftypevr -#: doc/guix.texi:18343 +#: doc/guix.texi:18340 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-sleeptime" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl reconnect-sleeptime" #. type: deftypevr -#: doc/guix.texi:18347 +#: doc/guix.texi:18344 msgid "Specifies the number of seconds to sleep when connecting to all LDAP servers fails. By default one second is waited between the first failure and the first retry." -msgstr "" +msgstr "Gibt die Anzahl an Sekunden an, wie lange „schlafend“ gewartet wird, wenn zu @emph{keinem} LDAP-Server eine Verbindung hergestellt werden kann. Die Vorgabe ist, zwischen dem ersten Fehlversuch und dem ersten neuen Versuch 1@tie{}Sekunde zu warten." #. type: deftypevr -#: doc/guix.texi:18352 +#: doc/guix.texi:18349 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-retrytime" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl reconnect-retrytime" #. type: deftypevr -#: doc/guix.texi:18356 +#: doc/guix.texi:18353 msgid "Specifies the time after which the LDAP server is considered to be permanently unavailable. Once this time is reached retries will be done only once per this time period. The default value is 10 seconds." -msgstr "" +msgstr "Gibt an, nach wieviel Zeit der LDAP-Server als dauerhaft nicht verfügbar angesehen wird. Sobald dieser Fall eintritt, wird eine Verbindungsaufnahme nur noch einmal pro weiterem Ablauf dieser Zeitperiode versucht. Der Vorgabewert beträgt 10@tie{}Sekunden." #. type: deftypevr -#: doc/guix.texi:18361 +#: doc/guix.texi:18358 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-ssl-option ssl" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-SSL-Einstellung ssl" #. type: deftypevr -#: doc/guix.texi:18365 +#: doc/guix.texi:18362 msgid "Specifies whether to use SSL/TLS or not (the default is not to). If 'start-tls is specified then StartTLS is used rather than raw LDAP over SSL." -msgstr "" +msgstr "Gibt an, ob SSL/TLS benutzt werden soll oder nicht (die Vorgabe ist, es @emph{nicht} zu benutzen). Wenn 'start-tls angegeben wird, dann wird StartTLS statt schlichtem LDAP über SSL benutzt." #. type: deftypevr -#: doc/guix.texi:18370 +#: doc/guix.texi:18367 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-tls-reqcert-option tls-reqcert" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-„tls-reqcert“-Einstellung tls-reqcert" #. type: deftypevr -#: doc/guix.texi:18373 +#: doc/guix.texi:18370 msgid "Specifies what checks to perform on a server-supplied certificate. The meaning of the values is described in the ldap.conf(5) manual page." -msgstr "" +msgstr "Gibt an, welche Überprüfungen auf einem vom Server empfangenen Zertifikat durchgeführt werden sollen. Die Bedeutung der Werte wird auf der Handbuchseite zu ldap.conf(5) beschrieben." #. type: deftypevr -#: doc/guix.texi:18378 +#: doc/guix.texi:18375 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertdir" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette tls-cacertdir" #. type: deftypevr -#: doc/guix.texi:18381 +#: doc/guix.texi:18378 msgid "Specifies the directory containing X.509 certificates for peer authen‐ tication. This parameter is ignored when using GnuTLS." -msgstr "" +msgstr "Gibt das Verzeichnis an, das X.509-Zertifikate zur Authentifikation von Kommunikationspartnern enthält. Dieser Parameter wird ignoriert, wenn Sie GnuTLS benutzen lassen." #. type: deftypevr -#: doc/guix.texi:18386 +#: doc/guix.texi:18383 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertfile" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette tls-cacertfile" #. type: deftypevr -#: doc/guix.texi:18388 +#: doc/guix.texi:18385 msgid "Specifies the path to the X.509 certificate for peer authentication." -msgstr "" +msgstr "Gibt den Dateipfad zu dem X.509-Zertifikat zur Authentifikation von Kommunikationspartnern an." #. type: deftypevr -#: doc/guix.texi:18393 +#: doc/guix.texi:18390 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-randfile" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette tls-randfile" #. type: deftypevr -#: doc/guix.texi:18396 +#: doc/guix.texi:18393 msgid "Specifies the path to an entropy source. This parameter is ignored when using GnuTLS." -msgstr "" +msgstr "Gibt den Pfad zu einer Entropiequelle an. Dieser Parameter wird ignoriert, wenn Sie GnuTLS benutzen lassen." #. type: deftypevr -#: doc/guix.texi:18401 +#: doc/guix.texi:18398 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-ciphers" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette tls-ciphers" #. type: deftypevr -#: doc/guix.texi:18403 +#: doc/guix.texi:18400 msgid "Specifies the ciphers to use for TLS as a string." -msgstr "" +msgstr "Gibt als eine Zeichenkette an, welche Ciphers für TLS benutzt werden sollen." #. type: deftypevr -#: doc/guix.texi:18408 +#: doc/guix.texi:18405 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cert" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette tls-cert" #. type: deftypevr -#: doc/guix.texi:18411 +#: doc/guix.texi:18408 msgid "Specifies the path to the file containing the local certificate for client TLS authentication." -msgstr "" +msgstr "Gibt den Pfad zu der Datei an, die das lokale Zertifikat zur TLS-Authentizierung als Client enthält." #. type: deftypevr -#: doc/guix.texi:18416 +#: doc/guix.texi:18413 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string tls-key" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette tls-key" #. type: deftypevr -#: doc/guix.texi:18419 +#: doc/guix.texi:18416 msgid "Specifies the path to the file containing the private key for client TLS authentication." -msgstr "" +msgstr "Gibt den Pfad zu der Datei an, die den privaten Schlüssel zur TLS-Authentizierung als Client enthält." #. type: deftypevr -#: doc/guix.texi:18424 +#: doc/guix.texi:18421 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number pagesize" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl pagesize" #. type: deftypevr -#: doc/guix.texi:18428 +#: doc/guix.texi:18425 msgid "Set this to a number greater than 0 to request paged results from the LDAP server in accordance with RFC2696. The default (0) is to not request paged results." -msgstr "" +msgstr "Geben Sie hier eine Zahl größer als 0 an, um beim LDAP-Server seitenweise Antworten anzufordern, entsprechend RFC2696. Die Vorgabe (0) fordert alle Ergebnisse auf einmal an." #. type: deftypevr -#: doc/guix.texi:18433 +#: doc/guix.texi:18430 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-ignore-users-option nss-initgroups-ignoreusers" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-„ignore-users“-Einstellung nss-initgroups-ignoreusers" #. type: deftypevr -#: doc/guix.texi:18437 +#: doc/guix.texi:18434 msgid "This option prevents group membership lookups through LDAP for the specified users. Alternatively, the value 'all-local may be used. With that value nslcd builds a full list of non-LDAP users on startup." -msgstr "" +msgstr "Diese Einstellung verhindert, dass für die angegebenen Benutzer die Gruppenmitgliedschaft über LDAP aufgelöst wird. Alternativ kann der Wert 'all-local verwendet werden. Für diesen Wert erzeugt nslcd eine vollständige Liste aller Nicht-LDAP-Benutzer, wenn es startet." #. type: deftypevr -#: doc/guix.texi:18442 +#: doc/guix.texi:18439 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number nss-min-uid" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl nss-min-uid" #. type: deftypevr -#: doc/guix.texi:18445 +#: doc/guix.texi:18442 msgid "This option ensures that LDAP users with a numeric user id lower than the specified value are ignored." -msgstr "" +msgstr "Diese Einstellung lässt sicherstellen, dass LDAP-Benutzer, deren numerischer Benutzeridentifikator kleiner als der angegebene Wert ist, ignoriert werden." #. type: deftypevr -#: doc/guix.texi:18450 +#: doc/guix.texi:18447 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number nss-uid-offset" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl nss-uid-offset" #. type: deftypevr -#: doc/guix.texi:18453 +#: doc/guix.texi:18450 msgid "This option specifies an offset that is added to all LDAP numeric user ids. This can be used to avoid user id collisions with local users." -msgstr "" +msgstr "Diese Einstellung gibt einen Versatz an, der auf den numerischen Benutzeridentifikator jedes LDAP-Nutzers aufaddiert wird. Damit können Konflikte zwischen den Benutzeridentifikatoren lokaler Benutzerkonten und LDAP vermieden werden." #. type: deftypevr -#: doc/guix.texi:18458 +#: doc/guix.texi:18455 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-number nss-gid-offset" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zahl nss-gid-offset" #. type: deftypevr -#: doc/guix.texi:18461 +#: doc/guix.texi:18458 msgid "This option specifies an offset that is added to all LDAP numeric group ids. This can be used to avoid user id collisions with local groups." -msgstr "" +msgstr "Diese Einstellung gibt einen Versatz an, der auf den numerischen Gruppenidentifikator jedes LDAP-Nutzers aufaddiert wird. Damit können Konflikte zwischen den Gruppenidentifikatoren lokaler Gruppen und LDAP vermieden werden." #. type: deftypevr -#: doc/guix.texi:18466 +#: doc/guix.texi:18463 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-nested-groups" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck nss-nested-groups" #. type: deftypevr -#: doc/guix.texi:18472 +#: doc/guix.texi:18469 msgid "If this option is set, the member attribute of a group may point to another group. Members of nested groups are also returned in the higher level group and parent groups are returned when finding groups for a specific user. The default is not to perform extra searches for nested groups." -msgstr "" +msgstr "Wenn diese Einstellung aktiviert ist, können die Attribute einer Gruppe auch wieder Verweise auf eine andere Gruppe sein. Attribute darin genisteter Gruppen werden für die Gruppe auf höherer Ebene ebenfalls zurückgeliefert und Elterngruppen werden zurückgeliefert, wenn nach den Gruppen eines bestimmten Nutzers gesucht wird. Die Vorgabe ist, keine zusätzlichen Suchen nach genisteten Gruppen durchzuführen." #. type: deftypevr -#: doc/guix.texi:18477 +#: doc/guix.texi:18474 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-getgrent-skipmembers" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck nss-getgrent-skipmembers" #. type: deftypevr -#: doc/guix.texi:18482 +#: doc/guix.texi:18479 msgid "If this option is set, the group member list is not retrieved when looking up groups. Lookups for finding which groups a user belongs to will remain functional so the user will likely still get the correct groups assigned on login." -msgstr "" +msgstr "Wenn diese Einstellung aktiviert ist, wird die Liste der Gruppenmitglieder beim Auflösen von Gruppen nicht angefragt. Zu welchen Gruppen ein Benutzer gehört, kann weiterhin angefragt werden, damit dem Benutzer bei der Anmeldung wahrscheinlich dennoch die richtigen Gruppen zugeordnet werden." #. type: deftypevr -#: doc/guix.texi:18487 +#: doc/guix.texi:18484 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-disable-enumeration" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck nss-disable-enumeration" #. type: deftypevr -#: doc/guix.texi:18493 +#: doc/guix.texi:18490 msgid "If this option is set, functions which cause all user/group entries to be loaded from the directory will not succeed in doing so. This can dramatically reduce LDAP server load in situations where there are a great number of users and/or groups. This option is not recommended for most configurations." -msgstr "" +msgstr "Wenn diese Einstellung aktiviert ist, scheitern Funktionen, die alle Benutzer-/Gruppeneinträge aus dem Verzeichnis zu laden versuchen. Dadurch kann die Auslastung von LDAP-Servern wesentlich reduziert werden, wenn es eine große Anzahl von Benutzern und/oder Gruppen gibt. Diese Einstellung wird für die meisten Konfigurationen @emph{nicht} empfohlen." #. type: deftypevr -#: doc/guix.texi:18498 +#: doc/guix.texi:18495 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string validnames" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette validnames" #. type: deftypevr -#: doc/guix.texi:18502 +#: doc/guix.texi:18499 msgid "This option can be used to specify how user and group names are verified within the system. This pattern is used to check all user and group names that are requested and returned from LDAP." -msgstr "" +msgstr "Mit dieser Einstellung kann festgelegt werden, wie Benutzer- und Gruppennamen vom System geprüft werden. Das angegebene Muster wird zur Prüfung aller Benutzer- und Gruppennamen benutzt, die über LDAP angefragt und zurückgeliefert werden." #. type: deftypevr -#: doc/guix.texi:18507 +#: doc/guix.texi:18504 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean ignorecase" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck ignorecase" #. type: deftypevr -#: doc/guix.texi:18512 +#: doc/guix.texi:18509 msgid "This specifies whether or not to perform searches using case-insensitive matching. Enabling this could open up the system to authorization bypass vulnerabilities and introduce nscd cache poisoning vulnerabilities which allow denial of service." -msgstr "" +msgstr "Hiermit wird festgelegt, ob bei Suchen nach passenden Einträgen @emph{nicht} auf Groß- und Kleinschreibung geachtet wird. Wenn Sie dies aktivieren, könnte es zu Sicherheitslücken kommen, mit denen Autorisierungen umgangen („Authorization Bypass“) oder der nscd-Zwischenspeicher vergiftet werden kann („Cache Poisoning“), was gezielte Überlastungen ermöglichen würde („Denial of Service“)." #. type: deftypevr -#: doc/guix.texi:18517 +#: doc/guix.texi:18514 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-boolean pam-authc-ppolicy" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck pam-authc-ppolicy" #. type: deftypevr -#: doc/guix.texi:18520 +#: doc/guix.texi:18517 msgid "This option specifies whether password policy controls are requested and handled from the LDAP server when performing user authentication." -msgstr "" +msgstr "Mit dieser Einstellung wird festgelegt, ob Passwortrichtliniensteuerung vom LDAP-Server angefragt und behandelt wird, wenn Nutzer authentifiziert werden." #. type: deftypevr -#: doc/guix.texi:18525 +#: doc/guix.texi:18522 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authc-search" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette pam-authc-search" #. type: deftypevr -#: doc/guix.texi:18531 +#: doc/guix.texi:18528 msgid "By default nslcd performs an LDAP search with the user's credentials after BIND (authentication) to ensure that the BIND operation was successful. The default search is a simple check to see if the user's DN exists. A search filter can be specified that will be used instead. It should return at least one entry." -msgstr "" +msgstr "Nach Vorgabe führt nslcd eine LDAP-Suche nach jeder BIND-Operation (zur Authentizierung) durch, um sicherzustellen, dass die BIND-Operation erfolgreich durchgeführt wurde. Die vorgegebene Suche ist eine einfache Überprüfung, ob der DN eines Benutzers existiert. Hier kann ein Suchfilter angegeben werden, der stattdessen benutzt werden soll. Er sollte mindestens einen Eintrag liefern." #. type: deftypevr -#: doc/guix.texi:18536 +#: doc/guix.texi:18533 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authz-search" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette pam-authz-search" #. type: deftypevr -#: doc/guix.texi:18540 +#: doc/guix.texi:18537 msgid "This option allows flexible fine tuning of the authorisation check that should be performed. The search filter specified is executed and if any entries match, access is granted, otherwise access is denied." -msgstr "" +msgstr "Diese Einstellung ermöglicht flexible Feineinstellungen an der durchzuführenden Autorisierungsprüfung. Der angegebene Suchfilter wird ausgeführt, woraufhin Zugriff gewährt wird, wenn mindestens ein Eintrag passt, andernfall wird der Zugriff verweigert." #. type: deftypevr -#: doc/guix.texi:18545 +#: doc/guix.texi:18542 #, no-wrap msgid "{@code{nslcd-configuration} parameter} maybe-string pam-password-prohibit-message" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Vielleicht-Zeichenkette pam-password-prohibit-message" #. type: deftypevr -#: doc/guix.texi:18550 +#: doc/guix.texi:18547 msgid "If this option is set password modification using pam_ldap will be denied and the specified message will be presented to the user instead. The message can be used to direct the user to an alternative means of changing their password." -msgstr "" +msgstr "Wenn diese Einstellung festgelegt wurde, werden Passwortänderungen über pam_ldap abgelehnt und dem Anwender wird stattdessen die festgelegte Nachricht gezeigt. Die Nachricht kann benutzt werden, um den Anwender auf alternative Methoden aufmerksam zu machen, wie er sein Passwort ändern kann." #. type: deftypevr -#: doc/guix.texi:18555 +#: doc/guix.texi:18552 #, no-wrap msgid "{@code{nslcd-configuration} parameter} list pam-services" -msgstr "" +msgstr "{@code{nslcd-configuration}-Parameter} Liste pam-services" #. type: deftypevr -#: doc/guix.texi:18557 +#: doc/guix.texi:18554 msgid "List of pam service names for which LDAP authentication should suffice." -msgstr "" +msgstr "Die Liste der PAM-Dienstnamen, für die eine LDAP-Authentizierung als ausreichend gilt." #. type: cindex -#: doc/guix.texi:18568 +#: doc/guix.texi:18565 #, no-wrap msgid "web" msgstr "Web" #. type: cindex -#: doc/guix.texi:18569 +#: doc/guix.texi:18566 #, no-wrap msgid "www" msgstr "WWW" #. type: cindex -#: doc/guix.texi:18570 +#: doc/guix.texi:18567 #, no-wrap msgid "HTTP" msgstr "HTTP" #. type: Plain text -#: doc/guix.texi:18573 +#: doc/guix.texi:18570 msgid "The @code{(gnu services web)} module provides the Apache HTTP Server, the nginx web server, and also a fastcgi wrapper daemon." msgstr "Das Modul @code{(gnu services web)} stellt den Apache-HTTP-Server, den nginx-Webserver und auch einen fastcgi-Wrapperdienst bereit." #. type: subsubheading -#: doc/guix.texi:18574 +#: doc/guix.texi:18571 #, no-wrap msgid "Apache HTTP Server" msgstr "Apache-HTTP-Server" #. type: deffn -#: doc/guix.texi:18576 +#: doc/guix.texi:18573 #, no-wrap msgid "{Scheme Variable} httpd-service-type" msgstr "{Scheme-Variable} httpd-service-type" #. type: deffn -#: doc/guix.texi:18580 +#: doc/guix.texi:18577 msgid "Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}). The value for this service type is a @code{httpd-configuration} record." msgstr "Diensttyp für den @uref{https://httpd.apache.org/,Apache-HTTP-Server} @dfn{httpd}. Der Wert dieses Diensttyps ist ein @code{httpd-configuration}-Verbund." #. type: deffn -#: doc/guix.texi:18582 doc/guix.texi:18763 +#: doc/guix.texi:18579 doc/guix.texi:18760 msgid "A simple example configuration is given below." msgstr "Es folgt ein einfaches Beispiel der Konfiguration." #. type: example -#: doc/guix.texi:18590 +#: doc/guix.texi:18587 #, no-wrap msgid "" "(service httpd-service-type\n" @@ -34504,12 +34633,12 @@ msgstr "" " (document-root \"/srv/http/www.example.com\")))))\n" #. type: deffn -#: doc/guix.texi:18594 +#: doc/guix.texi:18591 msgid "Other services can also extend the @code{httpd-service-type} to add to the configuration." msgstr "Andere Dienste können den @code{httpd-service-type} auch erweitern, um etwas zur Konfiguration hinzuzufügen." #. type: example -#: doc/guix.texi:18603 doc/guix.texi:18743 +#: doc/guix.texi:18600 doc/guix.texi:18740 #, no-wrap msgid "" "(simple-service 'my-extra-server httpd-service-type\n" @@ -34529,115 +34658,115 @@ msgstr "" " DocumentRoot \\\"/srv/http/www.example.com\\\"\")))))\n" #. type: Plain text -#: doc/guix.texi:18609 +#: doc/guix.texi:18606 msgid "The details for the @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} and @code{httpd-virtualhost} record types are given below." msgstr "Nun folgt eine Beschreibung der Verbundstypen @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} und @code{httpd-virtualhost}." #. type: deffn -#: doc/guix.texi:18610 +#: doc/guix.texi:18607 #, no-wrap msgid "{Data Type} httpd-configuration" msgstr "{Datentyp} httpd-configuration" #. type: deffn -#: doc/guix.texi:18612 +#: doc/guix.texi:18609 msgid "This data type represents the configuration for the httpd service." msgstr "Dieser Datentyp repräsentiert die Konfiguration des httpd-Dienstes." #. type: item -#: doc/guix.texi:18614 +#: doc/guix.texi:18611 #, no-wrap msgid "@code{package} (default: @code{httpd})" msgstr "@code{package} (Vorgabe: @code{httpd})" #. type: table -#: doc/guix.texi:18616 +#: doc/guix.texi:18613 msgid "The httpd package to use." msgstr "Das zu benutzende httpd-Paket." #. type: item -#: doc/guix.texi:18617 doc/guix.texi:18706 +#: doc/guix.texi:18614 doc/guix.texi:18703 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})" msgstr "@code{pid-file} (Vorgabe: @code{\"/var/run/httpd\"})" #. type: table -#: doc/guix.texi:18619 +#: doc/guix.texi:18616 msgid "The pid file used by the shepherd-service." msgstr "Die vom Shepherd-Dienst benutzte PID-Datei." #. type: item -#: doc/guix.texi:18620 +#: doc/guix.texi:18617 #, no-wrap msgid "@code{config} (default: @code{(httpd-config-file)})" msgstr "@code{config} (Vorgabe: @code{(httpd-config-file)})" #. type: table -#: doc/guix.texi:18625 +#: doc/guix.texi:18622 msgid "The configuration file to use with the httpd service. The default value is a @code{httpd-config-file} record, but this can also be a different G-expression that generates a file, for example a @code{plain-file}. A file outside of the store can also be specified through a string." msgstr "Die vom httpd-Dienst zu benutzende Konfigurationsdatei. Vorgegeben ist ein @code{httpd-config-file}-Verbundsobjekt, aber als Wert kann auch ein anderer G-Ausdruck benutzt werden, der eine Datei erzeugt, zum Beispiel ein @code{plain-file}. Es kann auch eine Datei außerhalb des Stores mit einer Zeichenkette angegeben werden." #. type: deffn -#: doc/guix.texi:18629 +#: doc/guix.texi:18626 #, no-wrap msgid "{Data Type} httpd-module" msgstr "{Datentyp} httpd-module" #. type: deffn -#: doc/guix.texi:18631 +#: doc/guix.texi:18628 msgid "This data type represents a module for the httpd service." msgstr "Dieser Datentyp steht für ein Modul des httpd-Dienstes." #. type: table -#: doc/guix.texi:18635 +#: doc/guix.texi:18632 msgid "The name of the module." msgstr "Der Name des Moduls." #. type: table -#: doc/guix.texi:18641 +#: doc/guix.texi:18638 msgid "The file for the module. This can be relative to the httpd package being used, the absolute location of a file, or a G-expression for a file within the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}." msgstr "Die Datei, in der das Modul steht. Sie kann relativ zum benutzten httpd-Paket oder als absoluter Pfad einer Datei oder als ein G-Ausdruck für eine Datei im Store angegeben werden, zum Beispiel @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}." #. type: defvr -#: doc/guix.texi:18645 +#: doc/guix.texi:18642 #, no-wrap msgid "{Scheme Variable} %default-httpd-modules" msgstr "{Scheme-Variable} %default-httpd-modules" #. type: defvr -#: doc/guix.texi:18647 +#: doc/guix.texi:18644 msgid "A default list of @code{httpd-module} objects." msgstr "Eine vorgegebene Liste von @code{httpd-module}-Objekten." #. type: deffn -#: doc/guix.texi:18649 +#: doc/guix.texi:18646 #, no-wrap msgid "{Data Type} httpd-config-file" msgstr "{Datentyp} httpd-config-file" #. type: deffn -#: doc/guix.texi:18651 +#: doc/guix.texi:18648 msgid "This data type represents a configuration file for the httpd service." msgstr "Dieser Datentyp repräsentiert eine Konfigurationsdatei für den httpd-Dienst." #. type: item -#: doc/guix.texi:18653 +#: doc/guix.texi:18650 #, no-wrap msgid "@code{modules} (default: @code{%default-httpd-modules})" msgstr "@code{modules} (Vorgabe: @code{%default-httpd-modules})" #. type: table -#: doc/guix.texi:18656 +#: doc/guix.texi:18653 msgid "The modules to load. Additional modules can be added here, or loaded by additional configuration." msgstr "Welche Module geladen werden sollen. Zusätzliche Module können hier eingetragen werden oder durch eine zusätzliche Konfigurationsangabe geladen werden." #. type: table -#: doc/guix.texi:18659 +#: doc/guix.texi:18656 msgid "For example, in order to handle requests for PHP files, you can use Apache’s @code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:" msgstr "Um zum Beispiel Anfragen nach PHP-Dateien zu behandeln, können Sie das Modul @code{mod_proxy_fcgi} von Apache zusammen mit @code{php-fpm-service-type} benutzen:" #. type: example -#: doc/guix.texi:18681 +#: doc/guix.texi:18678 #, no-wrap msgid "" "(service httpd-service-type\n" @@ -34683,165 +34812,165 @@ msgstr "" " (socket-group \"httpd\")))\n" #. type: item -#: doc/guix.texi:18683 +#: doc/guix.texi:18680 #, no-wrap msgid "@code{server-root} (default: @code{httpd})" msgstr "@code{server-root} (Vorgabe: @code{httpd})" #. type: table -#: doc/guix.texi:18687 +#: doc/guix.texi:18684 msgid "The @code{ServerRoot} in the configuration file, defaults to the httpd package. Directives including @code{Include} and @code{LoadModule} are taken as relative to the server root." msgstr "Die @code{ServerRoot} in der Konfigurationsdatei, vorgegeben ist das httpd-Paket. Direktiven wie @code{Include} und @code{LoadModule} werden relativ zur ServerRoot interpretiert." #. type: item -#: doc/guix.texi:18688 +#: doc/guix.texi:18685 #, no-wrap msgid "@code{server-name} (default: @code{#f})" msgstr "@code{server-name} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18692 +#: doc/guix.texi:18689 msgid "The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to identify itself." msgstr "Der @code{ServerName} in der Konfigurationsdatei, mit dem das Anfrageschema (Request Scheme), der Rechnername (Hostname) und Port angegeben wird, mit denen sich der Server identifiziert." #. type: table -#: doc/guix.texi:18696 +#: doc/guix.texi:18693 msgid "This doesn't need to be set in the server config, and can be specifyed in virtual hosts. The default is @code{#f} to not specify a @code{ServerName}." msgstr "Es muss nicht als Teil der Server-Konfiguration festgelegt werden, sondern kann auch in virtuellen Rechnern (Virtual Hosts) festgelegt werden. Vorgegeben ist @code{#f}, wodurch kein @code{ServerName} festgelegt wird." #. type: item -#: doc/guix.texi:18697 +#: doc/guix.texi:18694 #, no-wrap msgid "@code{document-root} (default: @code{\"/srv/http\"})" msgstr "@code{document-root} (Vorgabe: @code{\"/srv/http\"})" #. type: table -#: doc/guix.texi:18699 +#: doc/guix.texi:18696 msgid "The @code{DocumentRoot} from which files will be served." msgstr "Das @code{DocumentRoot}-Verzeichnis, in dem sich die Dateien befinden, die man vom Server abrufen kann." #. type: item -#: doc/guix.texi:18700 +#: doc/guix.texi:18697 #, no-wrap msgid "@code{listen} (default: @code{'(\"80\")})" msgstr "@code{listen} (Vorgabe: @code{'(\"80\")})" #. type: table -#: doc/guix.texi:18705 +#: doc/guix.texi:18702 msgid "The list of values for the @code{Listen} directives in the config file. The value should be a list of strings, when each string can specify the port number to listen on, and optionally the IP address and protocol to use." msgstr "Die Liste der Werte für die @code{Listen}-Direktive in der Konfigurationsdatei. Als Wert sollte eine Liste von Zeichenketten angegeben werden, die jeweils die Portnummer, auf der gelauscht wird, und optional auch die zu benutzende IP-Adresse und das Protokoll angeben." #. type: table -#: doc/guix.texi:18710 +#: doc/guix.texi:18707 msgid "The @code{PidFile} to use. This should match the @code{pid-file} set in the @code{httpd-configuration} so that the Shepherd service is configured correctly." msgstr "Hiermit wird die PID-Datei als @code{PidFile}-Direktive angegeben. Der Wert sollte mit der @code{pid-file}-Datei in der @code{httpd-configuration} übereinstimmen, damit der Shepherd-Dienst richtig konfiguriert ist." #. type: item -#: doc/guix.texi:18711 +#: doc/guix.texi:18708 #, no-wrap msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})" msgstr "@code{error-log} (Vorgabe: @code{\"/var/log/httpd/error_log\"})" #. type: table -#: doc/guix.texi:18713 +#: doc/guix.texi:18710 msgid "The @code{ErrorLog} to which the server will log errors." msgstr "Der Ort, an den der Server mit der @code{ErrorLog}-Direktive Fehlerprotokolle schreibt." #. type: item -#: doc/guix.texi:18714 +#: doc/guix.texi:18711 #, no-wrap msgid "@code{user} (default: @code{\"httpd\"})" msgstr "@code{user} (Vorgabe: @code{\"httpd\"})" #. type: table -#: doc/guix.texi:18716 +#: doc/guix.texi:18713 msgid "The @code{User} which the server will answer requests as." msgstr "Der Benutzer, als der der Server durch die @code{User}-Direktive Anfragen beantwortet." #. type: item -#: doc/guix.texi:18717 +#: doc/guix.texi:18714 #, no-wrap msgid "@code{group} (default: @code{\"httpd\"})" msgstr "@code{group} (Vorgabe: @code{\"httpd\"})" #. type: table -#: doc/guix.texi:18719 +#: doc/guix.texi:18716 msgid "The @code{Group} which the server will answer requests as." msgstr "Die Gruppe, mit der der Server durch die @code{Group}-Direktive Anfragen beantwortet." #. type: item -#: doc/guix.texi:18720 +#: doc/guix.texi:18717 #, no-wrap msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})" msgstr "@code{extra-config} (Vorgabe: @code{(list \"TypesConfig etc/httpd/mime.types\")})" #. type: table -#: doc/guix.texi:18723 +#: doc/guix.texi:18720 msgid "A flat list of strings and G-expressions which will be added to the end of the configuration file." msgstr "Eine flache Liste von Zeichenketten und G-Ausdrücken, die am Ende der Konfigurationsdatei hinzugefügt werden." #. type: table -#: doc/guix.texi:18726 +#: doc/guix.texi:18723 msgid "Any values which the service is extended with will be appended to this list." msgstr "Alle Werte, mit denen dieser Dienst erweitert wird, werden an die Liste angehängt." #. type: deffn -#: doc/guix.texi:18730 +#: doc/guix.texi:18727 #, no-wrap msgid "{Data Type} httpd-virtualhost" msgstr "{Datentyp} httpd-virtualhost" #. type: deffn -#: doc/guix.texi:18732 +#: doc/guix.texi:18729 msgid "This data type represents a virtualhost configuration block for the httpd service." msgstr "Dieser Datentyp repräsentiert einen Konfigurationsblock für einen virtuellen Rechner (Virtual Host) des httpd-Dienstes." #. type: deffn -#: doc/guix.texi:18734 +#: doc/guix.texi:18731 msgid "These should be added to the extra-config for the httpd-service." msgstr "Sie sollten zur zusätzlichen Konfiguration extra-config des httpd-Dienstes hinzugefügt werden." #. type: code{#1} -#: doc/guix.texi:18746 +#: doc/guix.texi:18743 #, no-wrap msgid "addresses-and-ports" msgstr "addresses-and-ports" #. type: table -#: doc/guix.texi:18748 +#: doc/guix.texi:18745 msgid "The addresses and ports for the @code{VirtualHost} directive." msgstr "Adressen und Ports für die @code{VirtualHost}-Direktive." #. type: code{#1} -#: doc/guix.texi:18749 +#: doc/guix.texi:18746 #, no-wrap msgid "contents" msgstr "contents" #. type: table -#: doc/guix.texi:18752 +#: doc/guix.texi:18749 msgid "The contents of the @code{VirtualHost} directive, this should be a list of strings and G-expressions." msgstr "Der Inhalt der @code{VirtualHost}-Direktive. Er sollte als Liste von Zeichenketten und G-Ausdrücken angegeben werden." #. type: subsubheading -#: doc/guix.texi:18756 +#: doc/guix.texi:18753 #, no-wrap msgid "NGINX" msgstr "NGINX" #. type: deffn -#: doc/guix.texi:18758 +#: doc/guix.texi:18755 #, no-wrap msgid "{Scheme Variable} nginx-service-type" msgstr "{Scheme-Variable} nginx-service-type" #. type: deffn -#: doc/guix.texi:18761 +#: doc/guix.texi:18758 msgid "Service type for the @uref{https://nginx.org/,NGinx} web server. The value for this service type is a @code{} record." msgstr "Diensttyp für den @uref{https://nginx.org/,NGinx-Webserver}. Der Wert des Dienstes ist ein @code{}-Verbundsobjekt." #. type: example -#: doc/guix.texi:18771 doc/guix.texi:18825 +#: doc/guix.texi:18768 doc/guix.texi:18822 #, no-wrap msgid "" "(service nginx-service-type\n" @@ -34859,12 +34988,12 @@ msgstr "" " (root \"/srv/http/www.example.com\"))))))\n" #. type: deffn -#: doc/guix.texi:18776 +#: doc/guix.texi:18773 msgid "In addition to adding server blocks to the service configuration directly, this service can be extended by other services to add server blocks, as in this example:" msgstr "Außer durch direktes Hinzufügen von Server-Blöcken zur Dienstkonfiguration kann der Dienst auch durch andere Dienste erweitert werden, um Server-Blöcke hinzuzufügen, wie man im folgenden Beispiel sieht:" #. type: example -#: doc/guix.texi:18782 +#: doc/guix.texi:18779 #, no-wrap msgid "" "(simple-service 'my-extra-server nginx-service-type\n" @@ -34878,88 +35007,88 @@ msgstr "" " (try-files (list \"$uri\" \"$uri/index.html\")))))\n" #. type: Plain text -#: doc/guix.texi:18793 +#: doc/guix.texi:18790 msgid "At startup, @command{nginx} has not yet read its configuration file, so it uses a default file to log error messages. If it fails to load its configuration file, that is where error messages are logged. After the configuration file is loaded, the default error log file changes as per configuration. In our case, startup error messages can be found in @file{/var/run/nginx/logs/error.log}, and after configuration in @file{/var/log/nginx/error.log}. The second location can be changed with the @var{log-directory} configuration option." msgstr "Beim Starten hat @command{nginx} seine Konfigurationsdatei noch nicht gelesen und benutzt eine vorgegebene Datei, um Fehlermeldungen zu protokollieren. Wenn er seine Konfigurationsdatei nicht laden kann, landen Fehlermeldungen also dort. Nachdem die Konfigurationsdatei geladen ist, werden Fehlerprotokolle nach Voreinstellung in die Datei geschrieben, die in der Konfiguration angegeben ist. In unserem Fall können Sie Fehlermeldungen beim Starten in @file{/var/run/nginx/logs/error.log} finden und nachdem die Konfiguration eingelesen wurde, finden Sie sie in @file{/var/log/nginx/error.log}. Letzterer Ort kann mit der Konfigurationsoption @var{log-directory} geändert werden." #. type: deffn -#: doc/guix.texi:18794 +#: doc/guix.texi:18791 #, no-wrap msgid "{Data Type} nginx-configuration" msgstr "{Datentyp} nginx-configuration" #. type: deffn -#: doc/guix.texi:18798 +#: doc/guix.texi:18795 msgid "This data type represents the configuration for NGinx. Some configuration can be done through this and the other provided record types, or alternatively, a config file can be provided." msgstr "Dieser Datentyp repräsentiert die Konfiguration von NGinx. Ein Teil der Konfiguration kann hierüber und über die anderen zu Ihrer Verfügung stehenden Verbundstypen geschehen, alternativ können Sie eine Konfigurationsdatei mitgeben." #. type: item -#: doc/guix.texi:18800 +#: doc/guix.texi:18797 #, no-wrap msgid "@code{nginx} (default: @code{nginx})" msgstr "@code{nginx} (Vorgabe: @code{nginx})" #. type: table -#: doc/guix.texi:18802 +#: doc/guix.texi:18799 msgid "The nginx package to use." msgstr "Das zu benutzende nginx-Paket." #. type: item -#: doc/guix.texi:18803 +#: doc/guix.texi:18800 #, no-wrap msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})" msgstr "@code{log-directory} (Vorgabe: @code{\"/var/log/nginx\"})" #. type: table -#: doc/guix.texi:18805 +#: doc/guix.texi:18802 msgid "The directory to which NGinx will write log files." msgstr "In welches Verzeichnis NGinx Protokolldateien schreiben wird." #. type: item -#: doc/guix.texi:18806 +#: doc/guix.texi:18803 #, no-wrap msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})" msgstr "@code{run-directory} (Vorgabe: @code{\"/var/run/nginx\"})" #. type: table -#: doc/guix.texi:18809 +#: doc/guix.texi:18806 msgid "The directory in which NGinx will create a pid file, and write temporary files." msgstr "In welchem Verzeichnis NGinx eine PID-Datei anlegen und temporäre Dateien ablegen wird." #. type: item -#: doc/guix.texi:18810 +#: doc/guix.texi:18807 #, no-wrap msgid "@code{server-blocks} (default: @code{'()})" msgstr "@code{server-blocks} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18814 +#: doc/guix.texi:18811 msgid "A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{}." msgstr "Eine Liste von @dfn{Server-Blöcken}, die in der erzeugten Konfigurationsdatei stehen sollen. Die Elemente davon sollten den Typ @code{} haben." #. type: table -#: doc/guix.texi:18818 +#: doc/guix.texi:18815 msgid "The following example would setup NGinx to serve @code{www.example.com} from the @code{/srv/http/www.example.com} directory, without using HTTPS." msgstr "Im folgenden Beispiel wäre NGinx so eingerichtet, dass Anfragen an @code{www.example.com} mit Dateien aus dem Verzeichnis @code{/srv/http/www.example.com} beantwortet werden, ohne HTTPS zu benutzen." #. type: item -#: doc/guix.texi:18827 +#: doc/guix.texi:18824 #, no-wrap msgid "@code{upstream-blocks} (default: @code{'()})" msgstr "@code{upstream-blocks} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18831 +#: doc/guix.texi:18828 msgid "A list of @dfn{upstream blocks} to create in the generated configuration file, the elements should be of type @code{}." msgstr "Eine Liste von @dfn{Upstream-Blöcken}, die in der erzeugten Konfigurationsdatei stehen sollen. Ihre Elemente sollten den Typ @code{} haben." #. type: table -#: doc/guix.texi:18838 +#: doc/guix.texi:18835 msgid "Configuring upstreams through the @code{upstream-blocks} can be useful when combined with @code{locations} in the @code{} records. The following example creates a server configuration with one location configuration, that will proxy requests to a upstream configuration, which will handle requests with two servers." msgstr "Upstreams als @code{upstream-blocks} zu konfigurieren, kann hilfreich sein, wenn es mit @code{locations} in @code{} verbunden wird. Das folgende Beispiel erzeugt eine Server-Konfiguration mit einer Location-Konfiguration, bei der Anfragen als Proxy entsprechend einer Upstream-Konfiguration weitergeleitet werden, wodurch zwei Server diese beantworten können." #. type: example -#: doc/guix.texi:18857 +#: doc/guix.texi:18854 #, no-wrap msgid "" "(service\n" @@ -34999,344 +35128,344 @@ msgstr "" " \"server2.example.com\")))))))\n" #. type: table -#: doc/guix.texi:18865 +#: doc/guix.texi:18862 msgid "If a configuration @var{file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}. For proper operation, these arguments should match what is in @var{file} to ensure that the directories are created when the service is activated." msgstr "Wenn eine Konfigurationsdatei als @var{file} angegeben wird, dann wird diese benutzt und @emph{keine} Konfigurationsdatei anhand der angegebenen @code{log-directory}, @code{run-directory}, @code{server-blocks} und @code{upstream-blocks} erzeugt. Trotzdem sollten diese Argumente bei einer richtigen Konfiguration mit denen in der Datei @var{file} übereinstimmen, damit die Verzeichnisse bei Aktivierung des Dienstes erzeugt werden." #. type: table -#: doc/guix.texi:18869 +#: doc/guix.texi:18866 msgid "This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts of the nginx-configuration record." msgstr "Das kann nützlich sein, wenn Sie schon eine bestehende Konfigurationsdatei haben oder das, was Sie brauchen, nicht mit anderen Teilen eines nginx-configuration-Verbundsobjekts umgesetzt werden kann." #. type: item -#: doc/guix.texi:18870 +#: doc/guix.texi:18867 #, no-wrap msgid "@code{server-names-hash-bucket-size} (default: @code{#f})" msgstr "@code{server-names-hash-bucket-size} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18873 +#: doc/guix.texi:18870 msgid "Bucket size for the server names hash tables, defaults to @code{#f} to use the size of the processors cache line." msgstr "Größe der Behälter (englisch „Buckets“) für die Hashtabelle der Servernamen; vorgegeben ist @code{#f}, wodurch die Größe der Cache-Lines des Prozessors verwendet wird." #. type: item -#: doc/guix.texi:18874 +#: doc/guix.texi:18871 #, no-wrap msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})" msgstr "@code{server-names-hash-bucket-max-size} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18876 +#: doc/guix.texi:18873 msgid "Maximum bucket size for the server names hash tables." msgstr "Maximale Behältergröße für die Hashtabelle der Servernamen." #. type: table -#: doc/guix.texi:18880 +#: doc/guix.texi:18877 msgid "Extra content for the @code{http} block. Should be string or a string valued G-expression." msgstr "Zusätzlicher Inhalt des @code{http}-Blocks. Er sollte eine Zeichenkette oder ein zeichenkettenwertiger G-Ausdruck." #. type: deftp -#: doc/guix.texi:18884 +#: doc/guix.texi:18881 #, no-wrap msgid "{Data Type} nginx-server-configuration" msgstr "{Datentyp} nginx-server-configuration" #. type: deftp -#: doc/guix.texi:18887 +#: doc/guix.texi:18884 msgid "Data type representing the configuration of an nginx server block. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration eines nginx-Serverblocks repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:18889 +#: doc/guix.texi:18886 #, no-wrap msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})" msgstr "@code{listen} (Vorgabe: @code{'(\"80\" \"443 ssl\")})" #. type: table -#: doc/guix.texi:18894 +#: doc/guix.texi:18891 msgid "Each @code{listen} directive sets the address and port for IP, or the path for a UNIX-domain socket on which the server will accept requests. Both address and port, or only address or only port can be specified. An address may also be a hostname, for example:" msgstr "Jede @code{listen}-Direktive legt Adresse und Port für eine IP fest oder gibt einen Unix-Socket an, auf dem der Server Anfragen beantwortet. Es können entweder sowohl Adresse als auch Port oder nur die Adresse oder nur der Port angegeben werden. Als Adresse kann auch ein Rechnername („Hostname“) angegeben werden, zum Beispiel:" #. type: example -#: doc/guix.texi:18897 +#: doc/guix.texi:18894 #, no-wrap msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" msgstr "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" #. type: item -#: doc/guix.texi:18899 +#: doc/guix.texi:18896 #, no-wrap msgid "@code{server-name} (default: @code{(list 'default)})" msgstr "@code{server-name} (Vorgabe: @code{(list 'default)})" #. type: table -#: doc/guix.texi:18902 +#: doc/guix.texi:18899 msgid "A list of server names this server represents. @code{'default} represents the default server for connections matching no other server." msgstr "Eine Liste von Servernamen, die dieser Server repräsentiert. @code{'default} repräsentiert den voreingestellten Server, der für Verbindungen verwendet wird, die zu keinem anderen Server passen." #. type: item -#: doc/guix.texi:18903 +#: doc/guix.texi:18900 #, no-wrap msgid "@code{root} (default: @code{\"/srv/http\"})" msgstr "@code{root} (Vorgabe: @code{\"/srv/http\"})" #. type: table -#: doc/guix.texi:18905 +#: doc/guix.texi:18902 msgid "Root of the website nginx will serve." -msgstr "Wurzelverzeichnis der Webpräsenz, die über nginx abgerufen werden kann." +msgstr "Wurzelverzeichnis des Webauftritts, der über nginx abgerufen werden kann." #. type: item -#: doc/guix.texi:18906 +#: doc/guix.texi:18903 #, no-wrap msgid "@code{locations} (default: @code{'()})" msgstr "@code{locations} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18910 +#: doc/guix.texi:18907 msgid "A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-configuration} records to use within this server block." msgstr "Eine Liste von @dfn{nginx-location-configuration}- oder @dfn{nginx-named-location-configuration}-Verbundsobjekten, die innerhalb des Serverblocks benutzt werden." #. type: item -#: doc/guix.texi:18911 +#: doc/guix.texi:18908 #, no-wrap msgid "@code{index} (default: @code{(list \"index.html\")})" msgstr "@code{index} (Vorgabe: @code{(list \"index.html\")})" #. type: table -#: doc/guix.texi:18914 +#: doc/guix.texi:18911 msgid "Index files to look for when clients ask for a directory. If it cannot be found, Nginx will send the list of files in the directory." msgstr "Index-Dateien, mit denen Anfragen nach einem Verzeichnis beantwortet werden. Wenn @emph{keine} davon gefunden wird, antwortet Nginx mit der Liste der Dateien im Verzeichnis." #. type: item -#: doc/guix.texi:18915 +#: doc/guix.texi:18912 #, no-wrap msgid "@code{try-files} (default: @code{'()})" msgstr "@code{try-files} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18918 +#: doc/guix.texi:18915 msgid "A list of files whose existence is checked in the specified order. @code{nginx} will use the first file it finds to process the request." msgstr "Eine Liste der Dateien, bei denen in der angegebenen Reihenfolge geprüft wird, ob sie existieren. @code{nginx} beantwortet die Anfrage mit der ersten Datei, die es findet." #. type: item -#: doc/guix.texi:18919 +#: doc/guix.texi:18916 #, no-wrap msgid "@code{ssl-certificate} (default: @code{#f})" msgstr "@code{ssl-certificate} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18922 +#: doc/guix.texi:18919 msgid "Where to find the certificate for secure connections. Set it to @code{#f} if you don't have a certificate or you don't want to use HTTPS." msgstr "Wo das Zertifikat für sichere Verbindungen gespeichert ist. Sie sollten es auf @code{#f} setzen, wenn Sie kein Zertifikat haben oder kein HTTPS benutzen möchten." #. type: item -#: doc/guix.texi:18923 +#: doc/guix.texi:18920 #, no-wrap msgid "@code{ssl-certificate-key} (default: @code{#f})" msgstr "@code{ssl-certificate-key} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18926 +#: doc/guix.texi:18923 msgid "Where to find the private key for secure connections. Set it to @code{#f} if you don't have a key or you don't want to use HTTPS." msgstr "Wo der private Schlüssel für sichere Verbindungen gespeichert ist. Sie sollten ihn auf @code{#f} setzen, wenn Sie keinen Schlüssel haben oder kein HTTPS benutzen möchten." #. type: item -#: doc/guix.texi:18927 +#: doc/guix.texi:18924 #, no-wrap msgid "@code{server-tokens?} (default: @code{#f})" msgstr "@code{server-tokens?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:18929 +#: doc/guix.texi:18926 msgid "Whether the server should add its configuration to response." msgstr "Ob der Server Informationen über seine Konfiguration bei Antworten beilegen soll." #. type: item -#: doc/guix.texi:18930 +#: doc/guix.texi:18927 #, no-wrap msgid "@code{raw-content} (default: @code{'()})" msgstr "@code{raw-content} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:18932 +#: doc/guix.texi:18929 msgid "A list of raw lines added to the server block." msgstr "Eine Liste von Zeilen, die unverändert in den Serverblock eingefügt werden." #. type: deftp -#: doc/guix.texi:18936 +#: doc/guix.texi:18933 #, no-wrap msgid "{Data Type} nginx-upstream-configuration" msgstr "{Datentyp} nginx-upstream-configuration" #. type: deftp -#: doc/guix.texi:18939 +#: doc/guix.texi:18936 msgid "Data type representing the configuration of an nginx @code{upstream} block. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration eines nginx-@code{upstream}-Blocks repräsentiert. Dieser Typ hat folgende Parameter:" #. type: table -#: doc/guix.texi:18943 +#: doc/guix.texi:18940 msgid "Name for this group of servers." msgstr "Der Name dieser Servergruppe." #. type: code{#1} -#: doc/guix.texi:18944 +#: doc/guix.texi:18941 #, no-wrap msgid "servers" msgstr "servers" #. type: table -#: doc/guix.texi:18951 +#: doc/guix.texi:18948 msgid "Specify the addresses of the servers in the group. The address can be specified as a IP address (e.g.@: @samp{127.0.0.1}), domain name (e.g.@: @samp{backend1.example.com}) or a path to a UNIX socket using the prefix @samp{unix:}. For addresses using an IP address or domain name, the default port is 80, and a different port can be specified explicitly." msgstr "Gibt die Adressen der Server in der Gruppe an. Die Adresse kann als IP-Adresse (z.B.@: @samp{127.0.0.1}), Domänenname (z.B.@: @samp{backend1.example.com}) oder als Pfad eines Unix-Sockets mit dem vorangestellten Präfix @samp{unix:} angegeben werden. Wenn Adressen eine IP-Adresse oder einen Domänennamen benutzen, ist der voreingestellte Port 80, aber ein abweichender Port kann auch explizit angegeben werden." #. type: deftp -#: doc/guix.texi:18955 +#: doc/guix.texi:18952 #, no-wrap msgid "{Data Type} nginx-location-configuration" msgstr "{Datentyp} nginx-location-configuration" #. type: deftp -#: doc/guix.texi:18958 +#: doc/guix.texi:18955 msgid "Data type representing the configuration of an nginx @code{location} block. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration eines nginx-@code{location}-Blocks angibt. Der Typ hat die folgenden Parameter:" #. type: table -#: doc/guix.texi:18962 +#: doc/guix.texi:18959 msgid "URI which this location block matches." msgstr "Die URI, die auf diesen Block passt." #. type: anchor{#1} -#: doc/guix.texi:18964 +#: doc/guix.texi:18961 msgid "nginx-location-configuration body" msgstr "nginx-location-configuration body" #. type: code{#1} -#: doc/guix.texi:18964 doc/guix.texi:18985 +#: doc/guix.texi:18961 doc/guix.texi:18982 #, no-wrap msgid "body" msgstr "body" #. type: table -#: doc/guix.texi:18971 +#: doc/guix.texi:18968 msgid "Body of the location block, specified as a list of strings. This can contain many configuration directives. For example, to pass requests to a upstream server group defined using an @code{nginx-upstream-configuration} block, the following directive would be specified in the body @samp{(list \"proxy_pass http://upstream-name;\")}." msgstr "Der Rumpf des location-Blocks, der als eine Liste von Zeichenketten angegeben werden muss. Er kann viele Konfigurationsdirektiven enthalten, zum Beispiel können Anfragen an eine Upstream-Servergruppe weitergeleitet werden, die mit einem @code{nginx-upstream-configuration}-Block angegeben wurde, indem diese Direktive im Rumpf angegeben wird: @samp{(list \"proxy_pass http://upstream-name;\")}." #. type: deftp -#: doc/guix.texi:18975 +#: doc/guix.texi:18972 #, no-wrap msgid "{Data Type} nginx-named-location-configuration" msgstr "{Datentyp} nginx-named-location-configuration" #. type: deftp -#: doc/guix.texi:18980 +#: doc/guix.texi:18977 msgid "Data type representing the configuration of an nginx named location block. Named location blocks are used for request redirection, and not used for regular request processing. This type has the following parameters:" msgstr "Der Datentyp repräsentiert die Konfiguration eines mit Namen versehenen nginx-location-Blocks („Named Location Block“). Ein mit Namen versehener location-Block wird zur Umleitung von Anfragen benutzt und nicht für die normale Anfrageverarbeitung. Dieser Typ hat die folgenden Parameter:" #. type: table -#: doc/guix.texi:18984 +#: doc/guix.texi:18981 msgid "Name to identify this location block." msgstr "Der Name, mit dem dieser location-Block identifiziert wird." #. type: table -#: doc/guix.texi:18990 +#: doc/guix.texi:18987 msgid "@xref{nginx-location-configuration body}, as the body for named location blocks can be used in a similar way to the @code{nginx-location-configuration body}. One restriction is that the body of a named location block cannot contain location blocks." msgstr "Siehe @ref{nginx-location-configuration body}, weil der Rumpf („Body“) eines mit Namen versehenen location-Blocks wie ein @code{nginx-location-configuration body} benutzt werden kann. Eine Einschränkung ist, dass der Rumpf eines mit Namen versehenen location-Blocks keine location-Blöcke enthalten kann." #. type: subsubheading -#: doc/guix.texi:18994 +#: doc/guix.texi:18991 #, no-wrap msgid "Varnish Cache" msgstr "Varnish Cache" #. type: cindex -#: doc/guix.texi:18995 +#: doc/guix.texi:18992 #, no-wrap msgid "Varnish" msgstr "Varnish" #. type: Plain text -#: doc/guix.texi:19000 +#: doc/guix.texi:18997 msgid "Varnish is a fast cache server that sits in between web applications and end users. It proxies requests from clients and caches the accessed URLs such that multiple requests for the same resource only creates one request to the back-end." msgstr "Varnish ist ein schneller zwischenspeichernder Server, der zwischen Web-Anwendungen und deren Endbenutzern sitzt. Er leitet Anfragen von Clients weiter und lagert die URLs, auf die zugegriffen wird, in einen Zwischenspeicher ein, damit bei mehreren Anfragen auf dieselbe Ressource nur eine Anfrage an die Hintergrundanwendung gestellt wird." #. type: defvr -#: doc/guix.texi:19001 +#: doc/guix.texi:18998 #, no-wrap msgid "{Scheme Variable} varnish-service-type" msgstr "{Scheme-Variable} varnish-service-type" #. type: defvr -#: doc/guix.texi:19003 +#: doc/guix.texi:19000 msgid "Service type for the Varnish daemon." msgstr "Diensttyp für den Varnish-Daemon." #. type: deftp -#: doc/guix.texi:19005 +#: doc/guix.texi:19002 #, no-wrap msgid "{Data Type} varnish-configuration" msgstr "{Datentyp} varnish-configuration" #. type: deftp -#: doc/guix.texi:19008 +#: doc/guix.texi:19005 msgid "Data type representing the @code{varnish} service configuration. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration des @code{varnish}-Dienstes repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:19010 +#: doc/guix.texi:19007 #, no-wrap msgid "@code{package} (default: @code{varnish})" msgstr "@code{package} (Vorgabe: @code{varnish})" #. type: table -#: doc/guix.texi:19012 +#: doc/guix.texi:19009 msgid "The Varnish package to use." msgstr "Das Varnish-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:19013 +#: doc/guix.texi:19010 #, no-wrap msgid "@code{name} (default: @code{\"default\"})" msgstr "@code{name} (Vorgabe: @code{\"default\"})" #. type: table -#: doc/guix.texi:19018 +#: doc/guix.texi:19015 msgid "A name for this Varnish instance. Varnish will create a directory in @file{/var/varnish/} with this name and keep temporary files there. If the name starts with a forward slash, it is interpreted as an absolute directory name." msgstr "Ein Name für diese Varnish-Instanz. Varnish wird ein Verzeichnis in @file{/var/varnish/} mit diesem Namen erzeugen und dort temporäre Dateien speichern. Wenn der Name mit einem Schrägstrich beginnt, wird er als absoluter Verzeichnispfad interpretiert." #. type: table -#: doc/guix.texi:19021 +#: doc/guix.texi:19018 msgid "Pass the @code{-n} argument to other Varnish programs to connect to the named instance, e.g.@: @command{varnishncsa -n default}." msgstr "Übergeben Sie die Befehlszeilenoption @code{-n} an andere Varnish-Programme, um sich mit der Instanz diesen Namens zu verbinden, z.B.@: @command{varnishncsa -n default}." #. type: item -#: doc/guix.texi:19022 +#: doc/guix.texi:19019 #, no-wrap msgid "@code{backend} (default: @code{\"localhost:8080\"})" msgstr "@code{backend} (Vorgabe: @code{\"localhost:8080\"})" #. type: table -#: doc/guix.texi:19024 +#: doc/guix.texi:19021 msgid "The backend to use. This option has no effect if @code{vcl} is set." msgstr "Welcher Hintergrunddienst benutzt werden soll. Diese Option wird ignoriert, wenn @code{vcl} gesetzt ist." #. type: item -#: doc/guix.texi:19025 +#: doc/guix.texi:19022 #, no-wrap msgid "@code{vcl} (default: #f)" msgstr "@code{vcl} (Vorgabe: #f)" #. type: table -#: doc/guix.texi:19030 +#: doc/guix.texi:19027 msgid "The @dfn{VCL} (Varnish Configuration Language) program to run. If this is @code{#f}, Varnish will proxy @code{backend} using the default configuration. Otherwise this must be a file-like object with valid VCL syntax." msgstr "Das @dfn{VCL}-Programm (in der Varnish Configuration Language), das ausgeführt werden soll. Ist dies auf @code{#f} gesetzt, fungiert Varnish als Proxy für den Hintergrunddienst @code{backend} mit der voreingestellten Konfiguration. Andernfalls muss dies ein dateiartiges Objekt mit gültiger VCL-Syntax sein." #. type: table -#: doc/guix.texi:19034 +#: doc/guix.texi:19031 msgid "For example, to mirror @url{http://www.gnu.org,www.gnu.org} with VCL you can do something along these lines:" msgstr "Um zum Beispiel mit VCL einen Spiegelserver für @url{http://www.gnu.org,www.gnu.org} einzurichten, können Sie so etwas benutzen:" #. type: example -#: doc/guix.texi:19041 +#: doc/guix.texi:19038 #, no-wrap msgid "" "(define %gnu-mirror\n" @@ -35354,7 +35483,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:19049 +#: doc/guix.texi:19046 #, no-wrap msgid "" "(operating-system\n" @@ -35374,554 +35503,554 @@ msgstr "" " %base-services)))\n" #. type: table -#: doc/guix.texi:19053 +#: doc/guix.texi:19050 msgid "The configuration of an already running Varnish instance can be inspected and changed using the @command{varnishadm} program." msgstr "Die Konfiguration einer bereits laufenden Varnish-Instanz kann mit dem Programm @command{varnishadm} eingesehen und verändert werden." #. type: table -#: doc/guix.texi:19057 +#: doc/guix.texi:19054 msgid "Consult the @url{https://varnish-cache.org/docs/,Varnish User Guide} and @url{https://book.varnish-software.com/4.0/,Varnish Book} for comprehensive documentation on Varnish and its configuration language." msgstr "Ziehen Sie die @url{https://varnish-cache.org/docs/,Varnish User Guide} und das @url{https://book.varnish-software.com/4.0/,Varnish Book} zu Rate, wenn Sie eine umfassende Dokumentation zu Varnish und seiner Konfigurationssprache suchen." #. type: item -#: doc/guix.texi:19058 +#: doc/guix.texi:19055 #, no-wrap msgid "@code{listen} (default: @code{'(\"localhost:80\")})" msgstr "@code{listen} (Vorgabe: @code{'(\"localhost:80\")})" #. type: table -#: doc/guix.texi:19060 +#: doc/guix.texi:19057 msgid "List of addresses Varnish will listen on." msgstr "Liste der Adressen, auf denen Varnish lauschen soll." #. type: item -#: doc/guix.texi:19061 +#: doc/guix.texi:19058 #, no-wrap msgid "@code{storage} (default: @code{'(\"malloc,128m\")})" msgstr "@code{storage} (Vorgabe: @code{'(\"malloc,128m\")})" #. type: table -#: doc/guix.texi:19063 +#: doc/guix.texi:19060 msgid "List of storage backends that will be available in VCL." msgstr "Liste der Speicher-Hintergrunddienste („Storage Backends“), die von der VCL aus benutzt werden können." #. type: item -#: doc/guix.texi:19064 +#: doc/guix.texi:19061 #, no-wrap msgid "@code{parameters} (default: @code{'()})" msgstr "@code{parameters} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19066 +#: doc/guix.texi:19063 msgid "List of run-time parameters in the form @code{'((\"parameter\" . \"value\"))}." msgstr "Liste der Laufzeitparameter von der Form @code{'((\"Parameter\" . \"Wert\"))}." #. type: table -#: doc/guix.texi:19069 +#: doc/guix.texi:19066 msgid "Additional arguments to pass to the @command{varnishd} process." msgstr "Zusätzliche Argumente, die an den @command{varnishd}-Prozess übergeben werden." #. type: subsubheading -#: doc/guix.texi:19073 +#: doc/guix.texi:19070 #, no-wrap msgid "FastCGI" msgstr "FastCGI" #. type: cindex -#: doc/guix.texi:19074 +#: doc/guix.texi:19071 #, no-wrap msgid "fastcgi" msgstr "fastcgi" #. type: cindex -#: doc/guix.texi:19075 +#: doc/guix.texi:19072 #, no-wrap msgid "fcgiwrap" msgstr "fcgiwrap" #. type: Plain text -#: doc/guix.texi:19082 +#: doc/guix.texi:19079 msgid "FastCGI is an interface between the front-end and the back-end of a web service. It is a somewhat legacy facility; new web services should generally just talk HTTP between the front-end and the back-end. However there are a number of back-end services such as PHP or the optimized HTTP Git repository access that use FastCGI, so we have support for it in Guix." msgstr "FastCGI ist eine Schnittstelle zwischen den Anwendungen im Vordergrund („Front-End“) und Hintergrund („Back-End“) eines Webdienstes. Die Rolle, die es ausübt, ist nicht mehr ganz aktuell, weil neue Webdienste im Allgemeinen einfach über HTTP zwischen Vorder- und Hintergrund kommunizieren sollten. Allerdings gibt es eine Menge von Hintergrunddiensten wie PHP oder den optimierten Git-Repository-Zugang über HTTP, welche FastCGI benutzen, also wird es auch in Guix unterstützt." #. type: Plain text -#: doc/guix.texi:19089 +#: doc/guix.texi:19086 msgid "To use FastCGI, you configure the front-end web server (e.g., nginx) to dispatch some subset of its requests to the fastcgi backend, which listens on a local TCP or UNIX socket. There is an intermediary @code{fcgiwrap} program that sits between the actual backend process and the web server. The front-end indicates which backend program to run, passing that information to the @code{fcgiwrap} process." msgstr "Um FastCGI zu benutzen, konfigurieren Sie den Webserver im Vordergrund (z.B.@: nginx) so, dass er eine Teilmenge der Anfragen an die fastcgi-Hintergrundanwendung weiterleitet, dass auf einem lokalen TCP- oder Unix-Socket lauscht. Ein dazwischenliegendes @code{fcgiwrap}-Programm sitzt zwischen dem eigentlichen Hintergrundprozess und dem Webserver. Vom Vordergrund wird angezeigt, welches Hintergrundprogramm ausgeführt werden soll. Diese Informationen werden an den @code{fcgiwrap}-Prozess übermittelt." #. type: defvr -#: doc/guix.texi:19090 +#: doc/guix.texi:19087 #, no-wrap msgid "{Scheme Variable} fcgiwrap-service-type" msgstr "{Scheme-Variable} fcgiwrap-service-type" #. type: defvr -#: doc/guix.texi:19092 +#: doc/guix.texi:19089 msgid "A service type for the @code{fcgiwrap} FastCGI proxy." msgstr "Ein Diensttyp für den @code{fcgiwrap}-FastCGI-Proxy." #. type: deftp -#: doc/guix.texi:19094 +#: doc/guix.texi:19091 #, no-wrap msgid "{Data Type} fcgiwrap-configuration" msgstr "{Datentyp} fcgiwrap-configuration" #. type: deftp -#: doc/guix.texi:19097 +#: doc/guix.texi:19094 msgid "Data type representing the configuration of the @code{fcgiwrap} service. This type has the following parameters:" msgstr "Der Datentyp, der die Konfiguration des @code{fcgiwrap}-Dienstes repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:19098 +#: doc/guix.texi:19095 #, no-wrap msgid "@code{package} (default: @code{fcgiwrap})" msgstr "@code{package} (Vorgabe: @code{fcgiwrap})" #. type: table -#: doc/guix.texi:19100 +#: doc/guix.texi:19097 msgid "The fcgiwrap package to use." msgstr "Welches fcgiwrap-Paket benutzt werden soll." #. type: item -#: doc/guix.texi:19101 +#: doc/guix.texi:19098 #, no-wrap msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})" msgstr "@code{socket} (Vorgabe: @code{tcp:127.0.0.1:9000})" #. type: table -#: doc/guix.texi:19107 +#: doc/guix.texi:19104 msgid "The socket on which the @code{fcgiwrap} process should listen, as a string. Valid @var{socket} values include @code{unix:@var{/path/to/unix/socket}}, @code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:port}." msgstr "Der Socket, auf dem der @code{fcgiwrap}-Prozess lauschen soll, als eine Zeichenkette. Gültige Werte für @var{socket} wären unter anderem @code{unix:@var{/pfad/zum/unix/socket}}, @code{tcp:@var{vier.teile.gepunkt.et}:@var{Port}} und @code{tcp6:[@var{IPv6-Adresse}]:Port}." #. type: item -#: doc/guix.texi:19108 +#: doc/guix.texi:19105 #, no-wrap msgid "@code{user} (default: @code{fcgiwrap})" msgstr "@code{user} (Vorgabe: @code{fcgiwrap})" #. type: itemx -#: doc/guix.texi:19109 +#: doc/guix.texi:19106 #, no-wrap msgid "@code{group} (default: @code{fcgiwrap})" msgstr "@code{group} (Vorgabe: @code{fcgiwrap})" #. type: table -#: doc/guix.texi:19114 +#: doc/guix.texi:19111 msgid "The user and group names, as strings, under which to run the @code{fcgiwrap} process. The @code{fastcgi} service will ensure that if the user asks for the specific user or group names @code{fcgiwrap} that the corresponding user and/or group is present on the system." msgstr "Die Benutzerkonten- und Gruppennamen als Zeichenketten, unter denen der @code{fcgiwrap}-Prozess ausgeführt werden soll. Der @code{fastcgi}-Dienst wird sicherstellen, dass, wenn der Nutzer den Benutzer- oder Gruppennamen @code{fcgiwrap} verlangt, der entsprechende Benutzer und/oder Gruppe auch auf dem System existiert." #. type: table -#: doc/guix.texi:19121 +#: doc/guix.texi:19118 msgid "It is possible to configure a FastCGI-backed web service to pass HTTP authentication information from the front-end to the back-end, and to allow @code{fcgiwrap} to run the back-end process as a corresponding local user. To enable this capability on the back-end., run @code{fcgiwrap} as the @code{root} user and group. Note that this capability also has to be configured on the front-end as well." msgstr "Es ist möglich, einen FastCGI-gestützten Webdienst so zu konfigurieren, dass er HTTP-Authentizierungsinformationen vom Vordergrundserver an das Hintergrundsystem weiterreicht und es @code{fcgiwrap} möglich macht, den Hintergrundprozess als ein entsprechender lokaler Nutzer auszuführen. Um dem Hintergrundsystem diese Funktionalität anzubieten, lassen Sie @code{fcgiwrap} als der Administratornutzer @code{root} mit selbiger Gruppe ausführen. Beachten Sie, dass die Funktionalität auch auf dem Vordergrundsystem erst eingerichtet werden muss." #. type: cindex -#: doc/guix.texi:19124 +#: doc/guix.texi:19121 #, no-wrap msgid "php-fpm" msgstr "php-fpm" #. type: Plain text -#: doc/guix.texi:19127 +#: doc/guix.texi:19124 msgid "PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI implementation with some additional features useful for sites of any size." -msgstr "PHP-FPM (FastCGI Process Manager) ist eine alternative PHP-FastCGI-Implementierung, die über einige zusätzliche Funktionalitäten verfügt, die für Webpräsenzen jeder Größe nützlich sind." +msgstr "PHP-FPM (FastCGI Process Manager) ist eine alternative PHP-FastCGI-Implementierung, die über einige zusätzliche Funktionalitäten verfügt, die für Webauftritte jeder Größe nützlich sind." #. type: Plain text -#: doc/guix.texi:19129 +#: doc/guix.texi:19126 msgid "These features include:" msgstr "Zu diesen Funktionalitäten gehören:" #. type: item -#: doc/guix.texi:19130 +#: doc/guix.texi:19127 #, no-wrap msgid "Adaptive process spawning" msgstr "Prozesserzeugung nach Bedarf" #. type: item -#: doc/guix.texi:19131 +#: doc/guix.texi:19128 #, no-wrap msgid "Basic statistics (similar to Apache's mod_status)" msgstr "Grundlegende Statistiken (ähnlich wie Apaches mod_status)" #. type: item -#: doc/guix.texi:19132 +#: doc/guix.texi:19129 #, no-wrap msgid "Advanced process management with graceful stop/start" msgstr "Fortschrittliche Prozessverwaltung mit sanftem Stoppen und Starten" #. type: item -#: doc/guix.texi:19133 +#: doc/guix.texi:19130 #, no-wrap msgid "Ability to start workers with different uid/gid/chroot/environment" msgstr "Die Möglichkeit, Arbeiter-Threads mit verschiedenen UIDs, GIDs, Chroot- oder Umgebungseinstellungen zu starten" #. type: itemize -#: doc/guix.texi:19135 +#: doc/guix.texi:19132 msgid "and different php.ini (replaces safe_mode)" -msgstr "Und verschiedene php.ini (als Ersatz für safe_mode)" +msgstr "und mit verschiedener php.ini (als Ersatz für safe_mode)" #. type: item -#: doc/guix.texi:19135 +#: doc/guix.texi:19132 #, no-wrap msgid "Stdout & stderr logging" msgstr "Protokollierung der Standard- und Standardfehlerausgabe" #. type: item -#: doc/guix.texi:19136 +#: doc/guix.texi:19133 #, no-wrap msgid "Emergency restart in case of accidental opcode cache destruction" msgstr "Neustart im Notfall einer ungewollten Zerstörung des Befehlscode-Zwischenspeichers" #. type: item -#: doc/guix.texi:19137 +#: doc/guix.texi:19134 #, no-wrap msgid "Accelerated upload support" msgstr "Unterstützung für beschleunigtes Hochladen" #. type: item -#: doc/guix.texi:19138 +#: doc/guix.texi:19135 #, no-wrap msgid "Support for a \"slowlog\"" msgstr "Unterstützung für „langsames Protokollieren“ („slowlog“)" #. type: item -#: doc/guix.texi:19139 +#: doc/guix.texi:19136 #, no-wrap msgid "Enhancements to FastCGI, such as fastcgi_finish_request() -" msgstr "Verbesserungen gegenüber FastCGI, wie z.B.@: fastcgi_finish_request() —" #. type: itemize -#: doc/guix.texi:19142 +#: doc/guix.texi:19139 msgid "a special function to finish request & flush all data while continuing to do something time-consuming (video converting, stats processing, etc.)" msgstr "eine besondere Funktion, um eine Anfrage fertig abzuarbeiten und alle Daten zu Ende zu verarbeiten, während etwas Zeitintensives abläuft (Videokonvertierung, Statistikverarbeitung usw.)" #. type: Plain text -#: doc/guix.texi:19144 +#: doc/guix.texi:19141 msgid "...@: and much more." msgstr "…@: und vieles mehr." #. type: defvr -#: doc/guix.texi:19145 +#: doc/guix.texi:19142 #, no-wrap msgid "{Scheme Variable} php-fpm-service-type" msgstr "{Scheme-Variable} php-fpm-service-type" #. type: defvr -#: doc/guix.texi:19147 +#: doc/guix.texi:19144 msgid "A Service type for @code{php-fpm}." msgstr "Ein Diensttyp für @code{php-fpm}." #. type: deftp -#: doc/guix.texi:19149 +#: doc/guix.texi:19146 #, no-wrap msgid "{Data Type} php-fpm-configuration" msgstr "{Datentyp} php-fpm-configuration" #. type: deftp -#: doc/guix.texi:19151 +#: doc/guix.texi:19148 msgid "Data Type for php-fpm service configuration." msgstr "Datentyp für die Konfiguration des php-fpm-Dienstes." #. type: item -#: doc/guix.texi:19152 +#: doc/guix.texi:19149 #, no-wrap msgid "@code{php} (default: @code{php})" msgstr "@code{php} (Vorgabe: @code{php})" #. type: table -#: doc/guix.texi:19154 +#: doc/guix.texi:19151 msgid "The php package to use." msgstr "Das zu benutzende PHP-Paket." #. type: item -#: doc/guix.texi:19154 +#: doc/guix.texi:19151 #, no-wrap msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" msgstr "@code{socket} (Vorgabe: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" #. type: table -#: doc/guix.texi:19156 +#: doc/guix.texi:19153 msgid "The address on which to accept FastCGI requests. Valid syntaxes are:" msgstr "Die Adresse, auf der FastCGI-Anfragen angenommen werden. Gültige Syntax hierfür ist:" #. type: code{#1} -#: doc/guix.texi:19157 +#: doc/guix.texi:19154 #, no-wrap msgid "\"ip.add.re.ss:port\"" msgstr "\"ip.ad.res.se:Port\"" #. type: table -#: doc/guix.texi:19159 +#: doc/guix.texi:19156 msgid "Listen on a TCP socket to a specific address on a specific port." -msgstr "" +msgstr "Lässt auf einem TCP-Socket auf der angegebenen Adresse auf dem angegebenen Port lauschen." #. type: code{#1} -#: doc/guix.texi:19159 +#: doc/guix.texi:19156 #, no-wrap msgid "\"port\"" -msgstr "" +msgstr "\"port\"" #. type: table -#: doc/guix.texi:19161 +#: doc/guix.texi:19158 msgid "Listen on a TCP socket to all addresses on a specific port." -msgstr "" +msgstr "Lässt auf einem TCP-Socket auf allen Adressen auf dem angegebenen Port lauschen." #. type: code{#1} -#: doc/guix.texi:19161 +#: doc/guix.texi:19158 #, no-wrap msgid "\"/path/to/unix/socket\"" -msgstr "" +msgstr "\"/pfad/zum/unix/socket\"" #. type: table -#: doc/guix.texi:19163 +#: doc/guix.texi:19160 msgid "Listen on a unix socket." -msgstr "" +msgstr "Lässt auf einem Unix-Socket lauschen." #. type: item -#: doc/guix.texi:19165 +#: doc/guix.texi:19162 #, no-wrap msgid "@code{user} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{user} (Vorgabe: @code{php-fpm})" #. type: table -#: doc/guix.texi:19167 +#: doc/guix.texi:19164 msgid "User who will own the php worker processes." -msgstr "" +msgstr "Der Benutzer, dem die PHP-Arbeiterprozesse gehören werden." #. type: item -#: doc/guix.texi:19167 +#: doc/guix.texi:19164 #, no-wrap msgid "@code{group} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{group} (Vorgabe: @code{php-fpm})" #. type: table -#: doc/guix.texi:19169 +#: doc/guix.texi:19166 msgid "Group of the worker processes." -msgstr "" +msgstr "Die Gruppe für die Arbeiterprozesse." #. type: item -#: doc/guix.texi:19169 +#: doc/guix.texi:19166 #, no-wrap msgid "@code{socket-user} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{socket-user} (Vorgabe: @code{php-fpm})" #. type: table -#: doc/guix.texi:19171 +#: doc/guix.texi:19168 msgid "User who can speak to the php-fpm socket." -msgstr "" +msgstr "Der Benutzer, der mit dem php-fpm-Socket kommunizieren kann." #. type: item -#: doc/guix.texi:19171 +#: doc/guix.texi:19168 #, no-wrap msgid "@code{socket-group} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{socket-group} (Vorgabe: @code{php-fpm})" #. type: table -#: doc/guix.texi:19173 +#: doc/guix.texi:19170 msgid "Group that can speak to the php-fpm socket." -msgstr "" +msgstr "Die Gruppe, die mit dem php-fpm-Socket kommunizieren kann." #. type: item -#: doc/guix.texi:19173 +#: doc/guix.texi:19170 #, no-wrap msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" -msgstr "" +msgstr "@code{pid-file} (Vorgabe: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" #. type: table -#: doc/guix.texi:19176 +#: doc/guix.texi:19173 msgid "The process id of the php-fpm process is written to this file once the service has started." -msgstr "" +msgstr "Der Prozessidentifikator des php-fpm-Prozesses wird in diese Datei geschrieben, sobald der Dienst gestartet wurde." #. type: item -#: doc/guix.texi:19176 +#: doc/guix.texi:19173 #, no-wrap msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})" -msgstr "" +msgstr "@code{log-file} (Vorgabe: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})" #. type: table -#: doc/guix.texi:19178 +#: doc/guix.texi:19175 msgid "Log for the php-fpm master process." -msgstr "" +msgstr "Wohin das Protokoll für den php-fpm-Hauptprozess geschrieben wird." #. type: item -#: doc/guix.texi:19178 +#: doc/guix.texi:19175 #, no-wrap msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})" -msgstr "" +msgstr "@code{process-manager} (Vorgabe: @code{(php-fpm-dynamic-process-manager-configuration)})" #. type: table -#: doc/guix.texi:19181 +#: doc/guix.texi:19178 msgid "Detailed settings for the php-fpm process manager. Must be either:" -msgstr "" +msgstr "Detaillierte Einstellungen für die php-fpm-Prozessverwaltung. Sie müssen eines der Folgenden sein:" #. type: code{#1} -#: doc/guix.texi:19182 +#: doc/guix.texi:19179 #, no-wrap msgid "" -msgstr "" +msgstr "" #. type: code{#1} -#: doc/guix.texi:19183 +#: doc/guix.texi:19180 #, no-wrap msgid "" -msgstr "" +msgstr "" #. type: code{#1} -#: doc/guix.texi:19184 +#: doc/guix.texi:19181 #, no-wrap msgid "" -msgstr "" +msgstr "" #. type: item -#: doc/guix.texi:19186 +#: doc/guix.texi:19183 #, no-wrap msgid "@code{display-errors} (default @code{#f})" -msgstr "" +msgstr "@code{display-errors} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19191 +#: doc/guix.texi:19188 msgid "Determines whether php errors and warning should be sent to clients and displayed in their browsers. This is useful for local php development, but a security risk for public sites, as error messages can reveal passwords and personal data." -msgstr "" +msgstr "Legt fest, ob PHP-Fehler und Warnungen an Clients geschickt und in ihren Browsern angezeigt werden. Dies ist nützlich für lokale PHP-Entwicklung, aber ein Sicherheitsrisiko für öffentliche Webauftritte, weil Fehlermeldungen Passwörter und Passwortdaten offenlegen können." #. type: item -#: doc/guix.texi:19191 +#: doc/guix.texi:19188 #, no-wrap msgid "@code{timezone} (default @code{#f})" msgstr "@code{timezone} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19193 +#: doc/guix.texi:19190 msgid "Specifies @code{php_admin_value[date.timezone]} parameter." -msgstr "" +msgstr "Legt den Parameter @code{php_admin_value[date.timezone]} fest." #. type: item -#: doc/guix.texi:19193 +#: doc/guix.texi:19190 #, no-wrap msgid "@code{workers-logfile} (default @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})" -msgstr "" +msgstr "@code{workers-logfile} (Vorgabe: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})" #. type: table -#: doc/guix.texi:19196 +#: doc/guix.texi:19193 msgid "This file will log the @code{stderr} outputs of php worker processes. Can be set to @code{#f} to disable logging." -msgstr "" +msgstr "In dieser Datei werden @code{stderr}-Ausgaben von PHP-Arbeiterprozessen protokolliert. Das Feld kann auf @code{#f} gesetzt werden, damit nicht protokolliert wird." #. type: item -#: doc/guix.texi:19196 +#: doc/guix.texi:19193 #, no-wrap msgid "@code{file} (default @code{#f})" -msgstr "" +msgstr "@code{file} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19199 +#: doc/guix.texi:19196 msgid "An optional override of the whole configuration. You can use the @code{mixed-text-file} function or an absolute filepath for it." -msgstr "" +msgstr "Optional kann hier ein vorrangig benutzter Ersatz für die gesamte Konfigurationsdatei angegeben werden. Sie können dafür die @code{mixed-text-file}-Funktion oder einen absoluten Dateipfad verwenden." #. type: deftp -#: doc/guix.texi:19202 +#: doc/guix.texi:19199 #, no-wrap msgid "{Data type} php-fpm-dynamic-process-manager-configuration" -msgstr "" +msgstr "{Datentyp} php-fpm-dynamic-process-manager-configuration" #. type: deftp -#: doc/guix.texi:19206 +#: doc/guix.texi:19203 msgid "Data Type for the @code{dynamic} php-fpm process manager. With the @code{dynamic} process manager, spare worker processes are kept around based on it's configured limits." -msgstr "" +msgstr "Datentyp für die @emph{dynamische} Prozessverwaltung durch php-fpm. Bei der @emph{dynamischen} Prozessverwaltung bleiben Arbeiterprozesse nach Abschluss ihrer Aufgabe weiterhin erhalten, solange die konfigurierten Beschränkungen eingehalten werden." #. type: item -#: doc/guix.texi:19207 doc/guix.texi:19223 doc/guix.texi:19233 +#: doc/guix.texi:19204 doc/guix.texi:19220 doc/guix.texi:19230 #, no-wrap msgid "@code{max-children} (default: @code{5})" -msgstr "" +msgstr "@code{max-children} (Vorgabe: @code{5})" #. type: table -#: doc/guix.texi:19209 doc/guix.texi:19225 doc/guix.texi:19235 +#: doc/guix.texi:19206 doc/guix.texi:19222 doc/guix.texi:19232 msgid "Maximum of worker processes." -msgstr "" +msgstr "Die maximale Anzahl an Arbeiterprozessen." #. type: item -#: doc/guix.texi:19209 +#: doc/guix.texi:19206 #, no-wrap msgid "@code{start-servers} (default: @code{2})" -msgstr "" +msgstr "@code{start-servers} (Vorgabe: @code{2})" #. type: table -#: doc/guix.texi:19211 +#: doc/guix.texi:19208 msgid "How many worker processes should be started on start-up." -msgstr "" +msgstr "Wieviele Arbeiterprozesse gleich zu Beginn gestartet werden sollen." #. type: item -#: doc/guix.texi:19211 +#: doc/guix.texi:19208 #, no-wrap msgid "@code{min-spare-servers} (default: @code{1})" -msgstr "" +msgstr "@code{min-spare-servers} (Vorgabe: @code{1})" #. type: table -#: doc/guix.texi:19213 +#: doc/guix.texi:19210 msgid "How many spare worker processes should be kept around at minimum." -msgstr "" +msgstr "Wieviele untätige Arbeiterprozesse mindestens weiterhin vorgehalten bleiben sollen." #. type: item -#: doc/guix.texi:19213 +#: doc/guix.texi:19210 #, no-wrap msgid "@code{max-spare-servers} (default: @code{3})" -msgstr "" +msgstr "@code{max-spare-servers} (Vorgabe: @code{3})" #. type: table -#: doc/guix.texi:19215 +#: doc/guix.texi:19212 msgid "How many spare worker processes should be kept around at maximum." -msgstr "" +msgstr "Wieviele untätige Arbeiterprozesse höchstens weiterhin vorgehalten bleiben sollen." #. type: deftp -#: doc/guix.texi:19218 +#: doc/guix.texi:19215 #, no-wrap msgid "{Data type} php-fpm-static-process-manager-configuration" -msgstr "" +msgstr "{Datentyp} php-fpm-static-process-manager-configuration" #. type: deftp -#: doc/guix.texi:19222 +#: doc/guix.texi:19219 msgid "Data Type for the @code{static} php-fpm process manager. With the @code{static} process manager, an unchanging number of worker processes are created." -msgstr "" +msgstr "Datentyp für die @emph{statische} Prozessverwaltung durch php-fpm. Bei der @emph{statischen} Prozessverwaltung wird eine unveränderliche Anzahl an Arbeiterprozessen erzeugt." #. type: deftp -#: doc/guix.texi:19228 +#: doc/guix.texi:19225 #, no-wrap msgid "{Data type} php-fpm-on-demand-process-manager-configuration" -msgstr "" +msgstr "{Datentyp} php-fpm-on-demand-process-manager-configuration" #. type: deftp -#: doc/guix.texi:19232 +#: doc/guix.texi:19229 msgid "Data Type for the @code{on-demand} php-fpm process manager. With the @code{on-demand} process manager, worker processes are only created as requests arrive." -msgstr "" +msgstr "Datentyp für die Prozessverwaltung @emph{nach Bedarf} durch php-fpm. Bei der Prozessverwaltung @emph{nach Bedarf} werden Arbeiterprozesse erst erzeugt, wenn Anfragen vorliegen." #. type: item -#: doc/guix.texi:19235 +#: doc/guix.texi:19232 #, no-wrap msgid "@code{process-idle-timeout} (default: @code{10})" -msgstr "" +msgstr "@code{process-idle-timeout} (Vorgabe: @code{10})" #. type: table -#: doc/guix.texi:19237 +#: doc/guix.texi:19234 msgid "The time in seconds after which a process with no requests is killed." -msgstr "" +msgstr "Die Zeit in Sekunden, nach der ein Prozess ohne Anfragen abgewürgt wird." #. type: deffn -#: doc/guix.texi:19241 +#: doc/guix.texi:19238 #, no-wrap msgid "{Scheme Procedure} nginx-php-fpm-location @" msgstr "{Scheme-Prozedur} nginx-php-fpm-location @" #. type: deffn -#: doc/guix.texi:19247 +#: doc/guix.texi:19244 msgid "[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")] A helper function to quickly add php to an @code{nginx-server-configuration}." msgstr "[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")] Eine Hilfsfunktion, mit der in kurzer Zeit PHP zu einer @code{nginx-server-configuration} hinzugefügt werden kann." #. type: Plain text -#: doc/guix.texi:19250 +#: doc/guix.texi:19247 msgid "A simple services setup for nginx with php can look like this:" msgstr "Eine einfache Art, die Dienste für nginx mit PHP einzurichten, kann so aussehen:" #. type: example -#: doc/guix.texi:19263 +#: doc/guix.texi:19260 #, no-wrap msgid "" "(services (cons* (service dhcp-client-service-type)\n" @@ -35951,34 +36080,34 @@ msgstr "" " %base-services))\n" #. type: cindex -#: doc/guix.texi:19265 +#: doc/guix.texi:19262 #, no-wrap msgid "cat-avatar-generator" -msgstr "" +msgstr "cat-avatar-generator" #. type: Plain text -#: doc/guix.texi:19269 +#: doc/guix.texi:19266 msgid "The cat avatar generator is a simple service to demonstrate the use of php-fpm in @code{Nginx}. It is used to generate cat avatar from a seed, for instance the hash of a user's email address." -msgstr "" +msgstr "Der Cat Avatar Generator („Katzenavatargenerator“) ist ein einfacher Dienst, um die Nutzung von php-fpm in @code{Nginx} zu demonstrieren. Mit ihm können Katzenavatarbilder aus einem Startwert („Seed“) heraus erzeugt werden, zum Beispiel aus dem Hash der E-Mail-Adresse eines Benutzers." #. type: deffn -#: doc/guix.texi:19270 +#: doc/guix.texi:19267 #, no-wrap msgid "{Scheme Procedure} cat-avatar-generator-service @" msgstr "{Scheme-Prozedur} cat-avatar-generator-service @" #. type: deffn -#: doc/guix.texi:19278 +#: doc/guix.texi:19275 msgid "[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-server-configuration that inherits @code{configuration}. It extends the nginx configuration to add a server block that serves @code{package}, a version of cat-avatar-generator. During execution, cat-avatar-generator will be able to use @code{cache-dir} as its cache directory." -msgstr "" +msgstr "[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Liefert ein nginx-server-configuration-Objekt, das von der in @code{configuration} angegebenen Konfiguration erbt. Es erweitert die Nginx-Konfiguration, indem es einen Server-Block hinzufügt, der die in @code{package} angegebene Version vom cat-avatar-generator anbietet. Bei der Ausführung wird dem cat-avatar-generator Zugriff auf sein in @code{cache-dir} angegebenes Zwischenspeicherverzeichnis gewährt." #. type: Plain text -#: doc/guix.texi:19281 +#: doc/guix.texi:19278 msgid "A simple setup for cat-avatar-generator can look like this:" -msgstr "" +msgstr "Eine einfache Konfiguration des cat-avatar-generator kann so aussehen:" #. type: example -#: doc/guix.texi:19288 +#: doc/guix.texi:19285 #, no-wrap msgid "" "(services (cons* (cat-avatar-generator-service\n" @@ -35988,157 +36117,163 @@ msgid "" " ...\n" " %base-services))\n" msgstr "" +"(services (cons* (cat-avatar-generator-service\n" +" #:configuration\n" +" (nginx-server-configuration\n" +" (server-name '(\"example.com\"))))\n" +" ...\n" +" %base-services))\n" #. type: subsubheading -#: doc/guix.texi:19290 +#: doc/guix.texi:19287 #, no-wrap msgid "Hpcguix-web" -msgstr "" +msgstr "Hpcguix-web" #. type: cindex -#: doc/guix.texi:19292 +#: doc/guix.texi:19289 #, no-wrap msgid "hpcguix-web" -msgstr "" +msgstr "hpcguix-web" #. type: Plain text -#: doc/guix.texi:19297 +#: doc/guix.texi:19294 msgid "The @uref{hpcguix-web, https://github.com/UMCUGenetics/hpcguix-web/} program is a customizable web interface to browse Guix packages, initially designed for users of high-performance computing (HPC) clusters." -msgstr "" +msgstr "Das Programm @uref{hpcguix-web, https://github.com/UMCUGenetics/hpcguix-web/} ist eine anpassbare Weboberfläche, um Guix-Pakete zu suchen. Am Anfang war es für Nutzer von Hochleistungs-Rechenclustern gedacht („High-Performance Computing“, kurz HPC)." #. type: defvr -#: doc/guix.texi:19298 +#: doc/guix.texi:19295 #, no-wrap msgid "{Scheme Variable} hpcguix-web-service-type" -msgstr "" +msgstr "{Scheme-Variable} hpcguix-web-service-type" #. type: defvr -#: doc/guix.texi:19300 +#: doc/guix.texi:19297 msgid "The service type for @code{hpcguix-web}." -msgstr "" +msgstr "Der Diensttyp für @code{hpcguix-web}." #. type: deftp -#: doc/guix.texi:19302 +#: doc/guix.texi:19299 #, no-wrap msgid "{Data Type} hpcguix-web-configuration" -msgstr "" +msgstr "{Datentyp} hpcguix-web-configuration" #. type: deftp -#: doc/guix.texi:19304 +#: doc/guix.texi:19301 msgid "Data type for the hpcguix-web service configuration." -msgstr "" +msgstr "Datentyp für die Konfiguration des hpcguix-web-Dienstes." #. type: code{#1} -#: doc/guix.texi:19306 +#: doc/guix.texi:19303 #, no-wrap msgid "specs" -msgstr "" +msgstr "specs" #. type: table -#: doc/guix.texi:19309 +#: doc/guix.texi:19306 msgid "A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service configuration. The main items available in this spec are:" -msgstr "" +msgstr "Ein G-Ausdruck (siehe @ref{G-Expressions}), der die Konfiguration des hpcguix-web-Dienstes festlegt. In dieser Spezifikation („Spec“) sollten vor allem diese Sachen angegeben werden:" #. type: item -#: doc/guix.texi:19311 +#: doc/guix.texi:19308 #, no-wrap msgid "@code{title-prefix} (default: @code{\"hpcguix | \"})" msgstr "@code{title-prefix} (Vorgabe: @code{\"hpcguix | \"})" #. type: table -#: doc/guix.texi:19313 +#: doc/guix.texi:19310 msgid "The page title prefix." msgstr "Das Präfix der Webseitentitel." #. type: item -#: doc/guix.texi:19314 +#: doc/guix.texi:19311 #, no-wrap msgid "@code{guix-command} (default: @code{\"guix\"})" msgstr "@code{guix-command} (Vorgabe: @code{\"guix\"})" #. type: table -#: doc/guix.texi:19316 +#: doc/guix.texi:19313 msgid "The @command{guix} command." msgstr "Der @command{guix}-Befehl." #. type: item -#: doc/guix.texi:19317 +#: doc/guix.texi:19314 #, no-wrap msgid "@code{package-filter-proc} (default: @code{(const #t)})" msgstr "@code{package-filter-proc} (Vorgabe: @code{(const #t)})" #. type: table -#: doc/guix.texi:19319 +#: doc/guix.texi:19316 msgid "A procedure specifying how to filter packages that are displayed." msgstr "Eine Prozedur, die festlegt, wie anzuzeigende Pakete gefiltert werden." #. type: item -#: doc/guix.texi:19320 +#: doc/guix.texi:19317 #, no-wrap msgid "@code{package-page-extension-proc} (default: @code{(const '())})" msgstr "@code{package-page-extension-proc} (Vorgabe: @code{(const '())})" #. type: table -#: doc/guix.texi:19322 +#: doc/guix.texi:19319 msgid "Extension package for @code{hpcguix-web}." msgstr "Erweiterungspaket für @code{hpcguix-web}." #. type: item -#: doc/guix.texi:19323 +#: doc/guix.texi:19320 #, no-wrap msgid "@code{menu} (default: @code{'()})" msgstr "@code{menu} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19325 +#: doc/guix.texi:19322 msgid "Additional entry in page @code{menu}." -msgstr "" +msgstr "Zusätzlicher Eintrag auf der Menüseite." #. type: item -#: doc/guix.texi:19326 +#: doc/guix.texi:19323 #, no-wrap msgid "@code{channels} (default: @code{%default-channels})" msgstr "@code{channels} (Vorgabe: @code{%default-channels})" #. type: table -#: doc/guix.texi:19328 +#: doc/guix.texi:19325 msgid "List of channels from which the package list is built (@pxref{Channels})." msgstr "Liste der Kanäle, aus denen die Paketliste erstellt wird (siehe @ref{Channels})." #. type: item -#: doc/guix.texi:19329 +#: doc/guix.texi:19326 #, no-wrap msgid "@code{package-list-expiration} (default: @code{(* 12 3600)})" msgstr "@code{package-list-expiration} (Vorgabe: @code{(* 12 3600)})" #. type: table -#: doc/guix.texi:19332 +#: doc/guix.texi:19329 msgid "The expiration time, in seconds, after which the package list is rebuilt from the latest instances of the given channels." -msgstr "" +msgstr "Nach wieviel Zeit in Sekunden die Paketliste aus den neuesten Instanzen der angegebenen Kanäle neu erzeugt wird." #. type: table -#: doc/guix.texi:19337 +#: doc/guix.texi:19334 msgid "See the hpcguix-web repository for a @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, complete example}." -msgstr "" +msgstr "Siehe das Repository von hpcguix-web für ein @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, vollständiges Beispiel}." #. type: item -#: doc/guix.texi:19338 +#: doc/guix.texi:19335 #, no-wrap msgid "@code{package} (default: @code{hpcguix-web})" msgstr "@code{package} (Vorgabe: @code{hpcguix-web})" #. type: table -#: doc/guix.texi:19340 +#: doc/guix.texi:19337 msgid "The hpcguix-web package to use." msgstr "Das hpcguix-web-Paket, was benutzt werden soll." #. type: Plain text -#: doc/guix.texi:19344 +#: doc/guix.texi:19341 msgid "A typical hpcguix-web service declaration looks like this:" -msgstr "" +msgstr "Eine typische Deklaration eines hpcguix-web-Dienstes sieht so aus:" #. type: example -#: doc/guix.texi:19353 +#: doc/guix.texi:19350 #, no-wrap msgid "" "(service hpcguix-web-service-type\n" @@ -36149,79 +36284,86 @@ msgid "" " (title-prefix \"Guix-HPC - \")\n" " (menu '((\"/about\" \"ABOUT\"))))))))\n" msgstr "" +"(service hpcguix-web-service-type\n" +" (hpcguix-web-configuration\n" +" (specs\n" +" #~(define site-config\n" +" (hpcweb-configuration\n" +" (title-prefix \"Guix-HPC - \")\n" +" (menu '((\"/about\" \"ABOUT\"))))))))\n" #. type: quotation -#: doc/guix.texi:19360 +#: doc/guix.texi:19357 msgid "The hpcguix-web service periodically updates the package list it publishes by pulling channels from Git. To that end, it needs to access X.509 certificates so that it can authenticate Git servers when communicating over HTTPS, and it assumes that @file{/etc/ssl/certs} contains those certificates." -msgstr "" +msgstr "Der hpcguix-web-Dienst aktualisiert die Liste der Pakete, die er veröffentlicht, periodisch, indem er die Kanäle über einen Git-„Pull“ lädt. Dazu muss er auf X.509-Zertifikate zugreifen, damit Git-Server authentifiziert werden können, wenn mit diesen über HTTPS kommuniziert wird, wofür der Dienst davon ausgeht, dass sich jene Zertifikate in @file{/etc/ssl/certs} befinden." #. type: quotation -#: doc/guix.texi:19364 +#: doc/guix.texi:19361 msgid "Thus, make sure to add @code{nss-certs} or another certificate package to the @code{packages} field of your configuration. @ref{X.509 Certificates}, for more information on X.509 certificates." -msgstr "" +msgstr "Stellen Sie also sicher, dass @code{nss-certs} oder ein anderes Zertifikatspaket im @code{packages}-Feld ihrer Konfiguration steht. Siehe @ref{X.509 Certificates} für weitere Informationen zu X.509-Zertifikaten." #. type: cindex -#: doc/guix.texi:19369 +#: doc/guix.texi:19366 #, no-wrap msgid "Web" -msgstr "" +msgstr "Web" #. type: cindex -#: doc/guix.texi:19370 +#: doc/guix.texi:19367 #, no-wrap msgid "HTTP, HTTPS" -msgstr "" +msgstr "HTTP, HTTPS" #. type: cindex -#: doc/guix.texi:19371 +#: doc/guix.texi:19368 #, no-wrap msgid "Let's Encrypt" -msgstr "" +msgstr "Let's Encrypt" #. type: cindex -#: doc/guix.texi:19372 +#: doc/guix.texi:19369 #, no-wrap msgid "TLS certificates" -msgstr "" +msgstr "TLS-Zertifikate" #. type: Plain text -#: doc/guix.texi:19379 +#: doc/guix.texi:19376 msgid "The @code{(gnu services certbot)} module provides a service to automatically obtain a valid TLS certificate from the Let's Encrypt certificate authority. These certificates can then be used to serve content securely over HTTPS or other TLS-based protocols, with the knowledge that the client will be able to verify the server's authenticity." msgstr "Das Modul @code{(gnu services certbot)} stellt einen Dienst zur Verfügung, um automatisch ein gültiges TLS-Zertifikat von der Zertifikatsautorität Let’s Encrypt zu beziehen. Mit diesen Zertifikaten können Informationen sicher über HTTPS oder andere TLS-basierte Protokolle übertragen werden, im Wissen, dass der Client die Authentizität des Servers überprüfen wird können." #. type: Plain text -#: doc/guix.texi:19391 +#: doc/guix.texi:19388 msgid "@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} tool to automate the certification process. This tool first securely generates a key on the server. It then makes a request to the Let's Encrypt certificate authority (CA) to sign the key. The CA checks that the request originates from the host in question by using a challenge-response protocol, requiring the server to provide its response over HTTP. If that protocol completes successfully, the CA signs the key, resulting in a certificate. That certificate is valid for a limited period of time, and therefore to continue to provide TLS services, the server needs to periodically ask the CA to renew its signature." msgstr "@url{https://letsencrypt.org/, Let’s Encrypt} macht das @code{certbot}-Werkzeug verfügbar, mit dem der Zertifizierungsvorgang automatisiert werden kann. Das Werkzeug erzeugt zunächst auf sichere Weise einen Schlüssel auf dem Server und stellt dann eine Anfrage an die Let’s-Encrypt-Zertifikatsautorität („Certificate Authority“, kurz CA), den Schlüssel zu signieren. Die Zertifikatsautorität prüft mit einem Challenge-Response-Protokoll, dass die Anfrage auch wirklich vom fraglichen Rechner (auch „Host“ genannt) kommt, wozu der Server über HTTP seine Antwort geben muss. Wenn dieses Protokoll erfolgreich befolgt wurde, signiert die Zertifikatsautorität den Schlüssel, woraus sich ein Zertifikat ergibt. Dieses Zertifikat ist eine begrenzte Zeit lang gültig, daher muss der Server für eine andauernde Bereitstellung von TLS-Leistungen immer wieder neu der Zertifikatsautorität eine Bitte um die Erneuerung der Signatur zukommen lassen." #. type: Plain text -#: doc/guix.texi:19398 +#: doc/guix.texi:19395 msgid "The certbot service automates this process: the initial key generation, the initial certification request to the Let's Encrypt service, the web server challenge/response integration, writing the certificate to disk, the automated periodic renewals, and the deployment tasks associated with the renewal (e.g.@: reloading services, copying keys with different permissions)." -msgstr "" +msgstr "Mit dem certbot-Dienst wird dieser Prozess automatisiert. Er sorgt dafür, dass am Anfang Schlüssel erzeugt werden und eine erste Zertifizierungsanfrage an den Dienst von Let’s Encrypt gestellt wird. Weiterhin ist das Challenge-/Response-Verfahren per Web-Server integriert. Das Zertifikat wird auf die Platte geschrieben und automatisch periodisch erneuert und bei der Erneuerung anfallende Aufgaben werden erledigt (z.B.@: das Neuladen von Diensten und das Kopieren von Schlüsseln mit abweichenden Berechtigungen)." #. type: Plain text -#: doc/guix.texi:19404 +#: doc/guix.texi:19401 msgid "Certbot is run twice a day, at a random minute within the hour. It won't do anything until your certificates are due for renewal or revoked, but running it regularly would give your service a chance of staying online in case a Let's Encrypt-initiated revocation happened for some reason." -msgstr "" +msgstr "Certbot wird zweimal täglich zu einer zufälligen Minute der Stunde ausgeführt. Es tut so lange nichts, bis eine Erneuerung Ihrer Zertifikate fällig wird oder sie gesperrt wurden, durch regelmäßige Ausführung bekommen Sie aber die Chance, dass Ihr Server am Netz bleibt, wenn Let’s Encrypt eine Sperrung aus irgendeinem Grund anordnet." #. type: Plain text -#: doc/guix.texi:19408 +#: doc/guix.texi:19405 msgid "By using this service, you agree to the ACME Subscriber Agreement, which can be found there: @url{https://acme-v01.api.letsencrypt.org/directory}." msgstr "Durch die Nutzung dieses Dienstes stimmen Sie dem „ACME Subscriber Agreement“ zu, das Sie hier finden:: @url{https://acme-v01.api.letsencrypt.org/directory}." #. type: defvr -#: doc/guix.texi:19409 +#: doc/guix.texi:19406 #, no-wrap msgid "{Scheme Variable} certbot-service-type" -msgstr "" +msgstr "{Scheme-Variable} certbot-service-type" #. type: defvr -#: doc/guix.texi:19412 +#: doc/guix.texi:19409 msgid "A service type for the @code{certbot} Let's Encrypt client. Its value must be a @code{certbot-configuration} record as in this example:" -msgstr "" +msgstr "Ein Diensttyp für den @code{certbot}-Client für Let’s Encrypt. Sein Wert muss ein @code{certbot-configuration}-Verbundsobjekt wie in diesem Beispiel sein:" #. type: example -#: doc/guix.texi:19419 +#: doc/guix.texi:19416 #, no-wrap msgid "" "(define %nginx-deploy-hook\n" @@ -36231,9 +36373,15 @@ msgid "" " (kill pid SIGHUP))))\n" "\n" msgstr "" +"(define %nginx-deploy-hook\n" +" (program-file\n" +" \"nginx-deploy-hook\"\n" +" #~(let ((pid (call-with-input-file \"/var/run/nginx/pid\" read)))\n" +" (kill pid SIGHUP))))\n" +"\n" #. type: example -#: doc/guix.texi:19430 +#: doc/guix.texi:19427 #, no-wrap msgid "" "(service certbot-service-type\n" @@ -36247,215 +36395,225 @@ msgid "" " (certificate-configuration\n" " (domains '(\"bar.example.net\")))))))\n" msgstr "" +"(service certbot-service-type\n" +" (certbot-configuration\n" +" (email \"foo@@example.net\")\n" +" (certificates\n" +" (list\n" +" (certificate-configuration\n" +" (domains '(\"example.net\" \"www.example.net\"))\n" +" (deploy-hook %nginx-deploy-hook))\n" +" (certificate-configuration\n" +" (domains '(\"bar.example.net\")))))))\n" #. type: defvr -#: doc/guix.texi:19433 +#: doc/guix.texi:19430 msgid "See below for details about @code{certbot-configuration}." -msgstr "" +msgstr "Siehe unten für Details zur @code{certbot-configuration}." #. type: deftp -#: doc/guix.texi:19435 +#: doc/guix.texi:19432 #, no-wrap msgid "{Data Type} certbot-configuration" -msgstr "" +msgstr "{Datentyp} certbot-configuration" #. type: deftp -#: doc/guix.texi:19438 +#: doc/guix.texi:19435 msgid "Data type representing the configuration of the @code{certbot} service. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration des @code{certbot}-Dienstes repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:19440 +#: doc/guix.texi:19437 #, no-wrap msgid "@code{package} (default: @code{certbot})" -msgstr "" +msgstr "@code{package} (Vorgabe: @code{certbot})" #. type: table -#: doc/guix.texi:19442 +#: doc/guix.texi:19439 msgid "The certbot package to use." -msgstr "" +msgstr "Das certbot-Paket, das benutzt werden soll." #. type: item -#: doc/guix.texi:19443 +#: doc/guix.texi:19440 #, no-wrap msgid "@code{webroot} (default: @code{/var/www})" -msgstr "" +msgstr "@code{webroot} (Vorgabe: @code{/var/www})" #. type: table -#: doc/guix.texi:19446 +#: doc/guix.texi:19443 msgid "The directory from which to serve the Let's Encrypt challenge/response files." -msgstr "" +msgstr "Das Verzeichnis, aus dem heraus die Dateien für den Challenge-/Response-Prozess von Let’s Encrypt angeboten werden sollen." #. type: item -#: doc/guix.texi:19447 +#: doc/guix.texi:19444 #, no-wrap msgid "@code{certificates} (default: @code{()})" -msgstr "" +msgstr "@code{certificates} (Vorgabe: @code{()})" #. type: table -#: doc/guix.texi:19451 +#: doc/guix.texi:19448 msgid "A list of @code{certificates-configuration}s for which to generate certificates and request signatures. Each certificate has a @code{name} and several @code{domains}." -msgstr "" +msgstr "Eine Liste der @code{certificates-configuration}-Objekte, für die Zertifikate und Anfragesignaturen erzeugt werden. Für jedes Zertifikat gibt es einen @code{name}-Eintrag und mehrere @code{domains}." #. type: table -#: doc/guix.texi:19455 +#: doc/guix.texi:19452 msgid "Mandatory email used for registration, recovery contact, and important account notifications." -msgstr "" +msgstr "Die E-Mail-Adresse, die für die Registrierung, als Kontaktadresse bei der Wiederherstellung und für wichtige Kontenbenachrichtigungen angegeben werden @emph{muss}." #. type: item -#: doc/guix.texi:19456 +#: doc/guix.texi:19453 #, no-wrap msgid "@code{rsa-key-size} (default: @code{2048})" -msgstr "" +msgstr "@code{rsa-key-size} (Vorgabe: @code{2048})" #. type: table -#: doc/guix.texi:19458 +#: doc/guix.texi:19455 msgid "Size of the RSA key." -msgstr "" +msgstr "Wie groß der RSA-Schlüssel sein soll." #. type: item -#: doc/guix.texi:19459 +#: doc/guix.texi:19456 #, no-wrap msgid "@code{default-location} (default: @i{see below})" -msgstr "" +msgstr "@code{default-location} (Vorgabe: @i{siehe unten})" #. type: table -#: doc/guix.texi:19468 +#: doc/guix.texi:19465 msgid "The default @code{nginx-location-configuration}. Because @code{certbot} needs to be able to serve challenges and responses, it needs to be able to run a web server. It does so by extending the @code{nginx} web service with an @code{nginx-server-configuration} listening on the @var{domains} on port 80, and which has a @code{nginx-location-configuration} for the @code{/.well-known/} URI path subspace used by Let's Encrypt. @xref{Web Services}, for more on these nginx configuration data types." -msgstr "" +msgstr "Die vorgegebene @code{nginx-location-configuration}. Weil @code{certbot} „Challenges“ und „Responses“ anbieten muss, muss durch ihn ein Web-Server ausgeführt werden können. Das tut er, indem er den @code{nginx}-Webdienst mit einer @code{nginx-server-configuration} erweitert, die auf den @var{domains} auf Port 80 lauscht und eine @code{nginx-location-configuration} für den URI-Pfad-Teilraum @code{/.well-known/} umfasst, der von Let’s Encrypt benutzt wird. Siehe @ref{Web Services} für mehr Informationen über diese nginx-Konfigurationsdatentypen." #. type: table -#: doc/guix.texi:19472 +#: doc/guix.texi:19469 msgid "Requests to other URL paths will be matched by the @code{default-location}, which if present is added to all @code{nginx-server-configuration}s." -msgstr "" +msgstr "Anfragen an andere URL-Pfade werden mit der @code{default-location} abgeglichen. Wenn sie angegeben wurde, wird sie zu jeder @code{nginx-server-configuration} hinzugefügt." #. type: table -#: doc/guix.texi:19476 +#: doc/guix.texi:19473 msgid "By default, the @code{default-location} will issue a redirect from @code{http://@var{domain}/...} to @code{https://@var{domain}/...}, leaving you to define what to serve on your site via @code{https}." -msgstr "" +msgstr "Nach Vorgabe stellt die @code{default-location} eine Weiterleitung von @code{http://@var{domain}/…} nach @code{https://@var{domain}/…} her. Sie müssen dann nur noch festlegen, was Sie auf Ihrem Webauftritt über @code{https} anbieten wollen." #. type: table -#: doc/guix.texi:19478 +#: doc/guix.texi:19475 msgid "Pass @code{#f} to not issue a default location." -msgstr "" +msgstr "Übergeben Sie @code{#f}, um keine @code{default-location} vorzugeben." #. type: deftp -#: doc/guix.texi:19481 +#: doc/guix.texi:19478 #, no-wrap msgid "{Data Type} certificate-configuration" -msgstr "" +msgstr "{Datentyp} certificate-configuration" #. type: deftp -#: doc/guix.texi:19484 +#: doc/guix.texi:19481 msgid "Data type representing the configuration of a certificate. This type has the following parameters:" -msgstr "" +msgstr "Der Datentyp, der die Konfiguration eines Zertifikats repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:19486 +#: doc/guix.texi:19483 #, no-wrap msgid "@code{name} (default: @i{see below})" -msgstr "" +msgstr "@code{name} (Vorgabe: @i{siehe unten})" #. type: table -#: doc/guix.texi:19490 +#: doc/guix.texi:19487 msgid "This name is used by Certbot for housekeeping and in file paths; it doesn't affect the content of the certificate itself. To see certificate names, run @code{certbot certificates}." -msgstr "" +msgstr "Dieser Name wird vom Certbot intern zum Aufräumen und in Dateipfaden benutzt; er hat keinen Einfluss auf den Inhalt des erzeugten Zertifikats. Um Zertifikatsnamen einzusehen, führen Sie @code{certbot certificates} aus." #. type: table -#: doc/guix.texi:19492 +#: doc/guix.texi:19489 msgid "Its default is the first provided domain." -msgstr "" +msgstr "Die Vorgabe ist die erste angegebene Domain." #. type: item -#: doc/guix.texi:19493 +#: doc/guix.texi:19490 #, no-wrap msgid "@code{domains} (default: @code{()})" -msgstr "" +msgstr "@code{domains} (Vorgabe: @code{()})" #. type: table -#: doc/guix.texi:19496 +#: doc/guix.texi:19493 msgid "The first domain provided will be the subject CN of the certificate, and all domains will be Subject Alternative Names on the certificate." -msgstr "" +msgstr "Die erste angegebene Domain wird als Name des Zertifikatseigentümers („Subject CN“) benutzt und alle Domains werden als alternative Namen („Subject Alternative Names“) auf dem Zertifikat stehen." #. type: item -#: doc/guix.texi:19497 +#: doc/guix.texi:19494 #, no-wrap msgid "@code{challenge} (default: @code{#f})" msgstr "@code{challenge} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19502 +#: doc/guix.texi:19499 msgid "The challenge type that has to be run by certbot. If @code{#f} is specified, default to the HTTP challenge. If a value is specified, defaults to the manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and the documentation at @url{https://certbot.eff.org/docs/using.html#hooks})." -msgstr "" +msgstr "Welche Art von Challenge durch den Certbot ausgeführt wird. Wenn @code{#f} angegeben wird, wird die HTTP-Challenge voreingestellt. Wenn ein Wert angegeben wird, wird das Plugin benutzt, das auch bei manuellen Ausführungen benutzt wird (siehe @code{authentication-hook}, @code{cleanup-hook} und die Dokumentation unter @url{https://certbot.eff.org/docs/using.html#hooks})." #. type: item -#: doc/guix.texi:19503 +#: doc/guix.texi:19500 #, no-wrap msgid "@code{authentication-hook} (default: @code{#f})" msgstr "@code{authentication-hook} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19509 +#: doc/guix.texi:19506 msgid "Command to be run in a shell once for each certificate challenge to be answered. For this command, the shell variable @code{$CERTBOT_DOMAIN} will contain the domain being authenticated, @code{$CERTBOT_VALIDATION} contains the validation string and @code{$CERTBOT_TOKEN} contains the file name of the resource requested when performing an HTTP-01 challenge." -msgstr "" +msgstr "Welcher Befehl in einer Shell zum Antworten auf eine Zertifikats-„Challenge“ einmalig ausgeführt wird. Für diesen Befehl wird die Shell-Variable @code{$CERTBOT_DOMAIN} die Domain enthalten, für die sich der Certbot authentiziert, @code{$CERTBOT_VALIDATION} enthält die Validierungs-Zeichenkette und @code{$CERTBOT_TOKEN} enthält den Dateinamen der bei einer HTTP-01-Challenge angefragten Ressource." #. type: item -#: doc/guix.texi:19510 +#: doc/guix.texi:19507 #, no-wrap msgid "@code{cleanup-hook} (default: @code{#f})" msgstr "@code{cleanup-hook} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19516 +#: doc/guix.texi:19513 msgid "Command to be run in a shell once for each certificate challenge that have been answered by the @code{auth-hook}. For this command, the shell variables available in the @code{auth-hook} script are still available, and additionally @code{$CERTBOT_AUTH_OUTPUT} will contain the standard output of the @code{auth-hook} script." -msgstr "" +msgstr "Welcher Befehl in einer Shell für jede Zertifikat-„Challenge“ einmalig ausgeführt wird, die vom @code{auth-hook} beantwortet wurde. Für diesen Befehl bleiben die Shell-Variablen weiterhin verfügbar, die im @code{auth-hook}-Skript zur Verfügung standen, und außerdem wird @code{$CERTBOT_AUTH_OUTPUT} die Standardausgabe des @code{auth-hook}-Skripts enthalten." #. type: item -#: doc/guix.texi:19517 +#: doc/guix.texi:19514 #, no-wrap msgid "@code{deploy-hook} (default: @code{#f})" -msgstr "" +msgstr "@code{deploy-hook} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19525 +#: doc/guix.texi:19522 msgid "Command to be run in a shell once for each successfully issued certificate. For this command, the shell variable @code{$RENEWED_LINEAGE} will point to the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/example.com\"}) containing the new certificates and keys; the shell variable @code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed certificate domains (for example, @samp{\"example.com www.example.com\"}." -msgstr "" +msgstr "Welcher Befehl in einer Shell für jedes erfolgreich ausgestellte Zertifikat einmalig ausgeführt wird. Bei diesem Befehl wird die Shell-Variable @code{$RENEWED_LINEAGE} auf das Unterverzeichnis für die aktuelle Konfiguration zeigen (zum Beispiel @samp{\"/etc/letsencrypt/live/example.com\"}), in dem sich die neuen Zertifikate und Schlüssel befinden. Die Shell-Variable @code{$RENEWED_DOMAINS} wird eine leerzeichengetrennte Liste der erneuerten Zertifikatsdomänen enthalten (zum Beispiel @samp{\"example.com www.example.com\"}." #. type: Plain text -#: doc/guix.texi:19532 +#: doc/guix.texi:19529 msgid "For each @code{certificate-configuration}, the certificate is saved to @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the key is saved to @code{/etc/letsencrypt/live/@var{name}/privkey.pem}." -msgstr "" +msgstr "Für jede @code{certificate-configuration} wird das Zertifikat in @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} und der Schlüssel in @code{/etc/letsencrypt/live/@var{name}/privkey.pem} gespeichert." #. type: cindex -#: doc/guix.texi:19534 +#: doc/guix.texi:19531 #, no-wrap msgid "DNS (domain name system)" -msgstr "" +msgstr "DNS (Domain Name System)" #. type: cindex -#: doc/guix.texi:19535 +#: doc/guix.texi:19532 #, no-wrap msgid "domain name system (DNS)" -msgstr "" +msgstr "Domain Name System (DNS)" #. type: Plain text -#: doc/guix.texi:19543 +#: doc/guix.texi:19540 msgid "The @code{(gnu services dns)} module provides services related to the @dfn{domain name system} (DNS). It provides a server service for hosting an @emph{authoritative} DNS server for multiple zones, slave or master. This service uses @uref{https://www.knot-dns.cz/, Knot DNS}. And also a caching and forwarding DNS server for the LAN, which uses @uref{http://www.thekelleys.org.uk/dnsmasq/doc.html, dnsmasq}." -msgstr "" +msgstr "Das Modul @code{(gnu services dns)} stellt Dienste zur Verfügung, die mit dem @dfn{Domain Name System} (DNS) zu tun haben. Es bietet einen Server-Dienst an, mit dem ein @emph{autoritativer} DNS-Server für mehrere Zonen betrieben werden kann, jeweils als untergeordneter „Slave“ oder als „Master“. Dieser Dienst benutzt @uref{https://www.knot-dns.cz/, Knot DNS}. Außerdem wird ein zwischenspeichernder und weiterleitender DNS-Server für das LAN bereitgestellt, der @uref{http://www.thekelleys.org.uk/dnsmasq/doc.html, dnsmasq} benutzt." #. type: subsubheading -#: doc/guix.texi:19544 +#: doc/guix.texi:19541 #, no-wrap msgid "Knot Service" msgstr "Knot-Dienst" #. type: Plain text -#: doc/guix.texi:19548 +#: doc/guix.texi:19545 msgid "An example configuration of an authoritative server for two zones, one master and one slave, is:" -msgstr "" +msgstr "Eine Beispielkonfiguration eines autoritativen Servers für zwei Zonen, eine „Master“, eine „Slave“, wäre:" #. type: lisp -#: doc/guix.texi:19555 +#: doc/guix.texi:19552 #, no-wrap msgid "" "(define-zone-entries example.org.zone\n" @@ -36465,9 +36623,15 @@ msgid "" " (\"ns\" \"\" \"IN\" \"A\" \"127.0.0.1\"))\n" "\n" msgstr "" +"(define-zone-entries example.org.zone\n" +";; Name TTL Class Type Data\n" +" (\"@@\" \"\" \"IN\" \"A\" \"127.0.0.1\")\n" +" (\"@@\" \"\" \"IN\" \"NS\" \"ns\")\n" +" (\"ns\" \"\" \"IN\" \"A\" \"127.0.0.1\"))\n" +"\n" #. type: lisp -#: doc/guix.texi:19562 +#: doc/guix.texi:19559 #, no-wrap msgid "" "(define master-zone\n" @@ -36478,9 +36642,16 @@ msgid "" " (entries example.org.zone)))))\n" "\n" msgstr "" +"(define master-zone\n" +" (knot-zone-configuration\n" +" (domain \"example.org\")\n" +" (zone (zone-file\n" +" (origin \"example.org\")\n" +" (entries example.org.zone)))))\n" +"\n" #. type: lisp -#: doc/guix.texi:19568 +#: doc/guix.texi:19565 #, no-wrap msgid "" "(define slave-zone\n" @@ -36490,9 +36661,15 @@ msgid "" " (master (list \"plop-master\"))))\n" "\n" msgstr "" +"(define slave-zone\n" +" (knot-zone-configuration\n" +" (domain \"plop.org\")\n" +" (dnssec-policy \"default\")\n" +" (master (list \"plop-master\"))))\n" +"\n" #. type: lisp -#: doc/guix.texi:19573 +#: doc/guix.texi:19570 #, no-wrap msgid "" "(define plop-master\n" @@ -36501,9 +36678,14 @@ msgid "" " (address (list \"208.76.58.171\"))))\n" "\n" msgstr "" +"(define plop-master\n" +" (knot-remote-configuration\n" +" (id \"plop-master\")\n" +" (address (list \"208.76.58.171\"))))\n" +"\n" #. type: lisp -#: doc/guix.texi:19582 +#: doc/guix.texi:19579 #, no-wrap msgid "" "(operating-system\n" @@ -36515,969 +36697,977 @@ msgid "" " ;; ...\n" " %base-services)))\n" msgstr "" +"(operating-system\n" +" ;; ...\n" +" (services (cons* (service knot-service-type\n" +" (knot-configuration\n" +" (remotes (list plop-master))\n" +" (zones (list master-zone slave-zone))))\n" +" ;; ...\n" +" %base-services)))\n" #. type: deffn -#: doc/guix.texi:19584 +#: doc/guix.texi:19581 #, no-wrap msgid "{Scheme Variable} knot-service-type" -msgstr "" +msgstr "{Scheme-Variable} knot-service-type" #. type: deffn -#: doc/guix.texi:19586 +#: doc/guix.texi:19583 msgid "This is the type for the Knot DNS server." -msgstr "" +msgstr "Dies ist der Diensttyp für den Knot-DNS-Server." #. type: deffn -#: doc/guix.texi:19594 +#: doc/guix.texi:19591 msgid "Knot DNS is an authoritative DNS server, meaning that it can serve multiple zones, that is to say domain names you would buy from a registrar. This server is not a resolver, meaning that it can only resolve names for which it is authoritative. This server can be configured to serve zones as a master server or a slave server as a per-zone basis. Slave zones will get their data from masters, and will serve it as an authoritative server. From the point of view of a resolver, there is no difference between master and slave." -msgstr "" +msgstr "Knot DNS ist ein autoritativer DNS-Server, das heißt, er kann mehrere Zonen bedienen, also mehrere Domainnamen, die Sie von einem Registrar kaufen würden. Dieser Server ist kein „Resolver“, er dient also nur zur Auflösung von Namen, für die er autoritativ ist. Dieser Server kann so konfiguriert werden, dass er Zonen als „Master“-Server oder als „Slave“-Server bereitstellt, je nachdem, wie er für die jeweilige Zone eingestellt ist. Server für „Slave“-Zonen erhalten ihre Daten von „Master“-Servern und stellen mit ihnen einen autoritativen Server zur Verfügung. Für einen „Resolver“ macht es keinen Unterschied, ob er Namen auflöst, indem er einen „Master“ oder einen „Slave“ danach fragt." #. type: deffn -#: doc/guix.texi:19596 +#: doc/guix.texi:19593 msgid "The following data types are used to configure the Knot DNS server:" -msgstr "" +msgstr "Die folgenden Datentypen werden benutzt, um den Knot-DNS-Server zu konfigurieren:" #. type: deftp -#: doc/guix.texi:19598 +#: doc/guix.texi:19595 #, no-wrap msgid "{Data Type} knot-key-configuration" -msgstr "" +msgstr "{Datentyp} knot-key-configuration" #. type: deftp -#: doc/guix.texi:19601 +#: doc/guix.texi:19598 msgid "Data type representing a key. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der einen Schlüssel repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: item -#: doc/guix.texi:19603 doc/guix.texi:19623 doc/guix.texi:19738 -#: doc/guix.texi:19764 doc/guix.texi:19799 +#: doc/guix.texi:19600 doc/guix.texi:19620 doc/guix.texi:19735 +#: doc/guix.texi:19761 doc/guix.texi:19796 #, no-wrap msgid "@code{id} (default: @code{\"\"})" -msgstr "" +msgstr "@code{id} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:19606 +#: doc/guix.texi:19603 msgid "An identifier for other configuration fields to refer to this key. IDs must be unique and must not be empty." -msgstr "" +msgstr "Ein Identifikator, mit dem sich andere Konfigurationsfelder auf diesen Schlüssel beziehen können. IDs müssen eindeutig sein und dürfen @emph{nicht} leer sein." #. type: item -#: doc/guix.texi:19607 +#: doc/guix.texi:19604 #, no-wrap msgid "@code{algorithm} (default: @code{#f})" -msgstr "" +msgstr "@code{algorithm} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19611 +#: doc/guix.texi:19608 msgid "The algorithm to use. Choose between @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-sha384} and @code{'hmac-sha512}." -msgstr "" +msgstr "Der Algorithmus, der benutzt werden soll. Wählen Sie zwischen @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-sha384} und @code{'hmac-sha512}." #. type: item -#: doc/guix.texi:19612 +#: doc/guix.texi:19609 #, no-wrap msgid "@code{secret} (default: @code{\"\"})" -msgstr "" +msgstr "@code{secret} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:19614 +#: doc/guix.texi:19611 msgid "The secret key itself." -msgstr "" +msgstr "Was dabei der geheime Schlüssel sein soll." #. type: deftp -#: doc/guix.texi:19618 +#: doc/guix.texi:19615 #, no-wrap msgid "{Data Type} knot-acl-configuration" -msgstr "" +msgstr "{Datentyp} knot-acl-configuration" #. type: deftp -#: doc/guix.texi:19621 +#: doc/guix.texi:19618 msgid "Data type representing an Access Control List (ACL) configuration. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration einer Zugriffssteuerungsliste („Access Control List“, ACL) repräsentiert. Dieser Typ hat die folgenden Parameter:" #. type: table -#: doc/guix.texi:19626 +#: doc/guix.texi:19623 msgid "An identifier for ether configuration fields to refer to this key. IDs must be unique and must not be empty." -msgstr "" +msgstr "Ein Identifikator, mit dem sich andere Konfigurationsfelder auf diesen Schlüssel beziehen können. IDs müssen eindeutig sein und dürfen @emph{nicht} leer sein." #. type: item -#: doc/guix.texi:19627 doc/guix.texi:19742 +#: doc/guix.texi:19624 doc/guix.texi:19739 #, no-wrap msgid "@code{address} (default: @code{'()})" -msgstr "" +msgstr "@code{address} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19631 +#: doc/guix.texi:19628 msgid "An ordered list of IP addresses, network subnets, or network ranges represented with strings. The query must match one of them. Empty value means that address match is not required." -msgstr "" +msgstr "Eine geordnete Liste aus IP-Adresse, Netzwerk-Subnetzen oder Netzwerkbereichen, die jeweils als Zeichenketten angegeben werden. Die Anfrage muss zu einem davon passen. Ein leerer Wert bedeutet, dass die Adresse nicht passen muss." #. type: item -#: doc/guix.texi:19632 +#: doc/guix.texi:19629 #, no-wrap msgid "@code{key} (default: @code{'()})" -msgstr "" +msgstr "@code{key} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19636 +#: doc/guix.texi:19633 msgid "An ordered list of references to keys represented with strings. The string must match a key ID defined in a @code{knot-key-configuration}. No key means that a key is not require to match that ACL." -msgstr "" +msgstr "Eine geordnete Liste von Referenzen auf Schlüssel, die jeweils als Zeichenketten angegeben werden. Die Zeichenkette muss zu einem Schlüsselidentifikator passen, der in einem der @code{knot-key-configuration}-Objekte definiert wurde. Wenn kein Schlüssel angegeben wird, bedeutet das, dass kein Schlüssel zu dieser Zugriffssteuerungsliste passen muss." #. type: item -#: doc/guix.texi:19637 +#: doc/guix.texi:19634 #, no-wrap msgid "@code{action} (default: @code{'()})" -msgstr "" +msgstr "@code{action} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19641 +#: doc/guix.texi:19638 msgid "An ordered list of actions that are permitted or forbidden by this ACL. Possible values are lists of zero or more elements from @code{'transfer}, @code{'notify} and @code{'update}." -msgstr "" +msgstr "Eine geordete Liste der Aktionen, die von dieser Zugriffssteuerungsliste zugelassen oder gesperrt werden. Mögliche Werte sind Listen aus null oder mehr Elementen, die jeweils @code{'transfer}, @code{'notify} oder @code{'update} sind." #. type: item -#: doc/guix.texi:19642 +#: doc/guix.texi:19639 #, no-wrap msgid "@code{deny?} (default: @code{#f})" -msgstr "" +msgstr "@code{deny?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19645 +#: doc/guix.texi:19642 msgid "When true, the ACL defines restrictions. Listed actions are forbidden. When false, listed actions are allowed." -msgstr "" +msgstr "Wenn dies auf wahr steht, werden mit der Zugriffssteuerungsliste Einschränkungen festgelegt, d.h.@: aufgelistet Aktionen werden gesperrt. Steht es auf falsch, werden aufgelistete Aktionen zugelassen." #. type: deftp -#: doc/guix.texi:19649 +#: doc/guix.texi:19646 #, no-wrap msgid "{Data Type} zone-entry" -msgstr "" +msgstr "{Datentyp} zone-entry" #. type: deftp -#: doc/guix.texi:19652 +#: doc/guix.texi:19649 msgid "Data type represnting a record entry in a zone file. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der einen Eintrag in einer Zonendatei repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:19654 +#: doc/guix.texi:19651 #, no-wrap msgid "@code{name} (default: @code{\"@@\"})" -msgstr "" +msgstr "@code{name} (Vorgabe: @code{\"@@\"})" #. type: table -#: doc/guix.texi:19660 +#: doc/guix.texi:19657 msgid "The name of the record. @code{\"@@\"} refers to the origin of the zone. Names are relative to the origin of the zone. For example, in the @code{example.org} zone, @code{\"ns.example.org\"} actually refers to @code{ns.example.org.example.org}. Names ending with a dot are absolute, which means that @code{\"ns.example.org.\"} refers to @code{ns.example.org}." -msgstr "" +msgstr "Der Name des Eintrags. @code{\"@@\"} bezieht sich auf den Ursprung der Zone. Namen sind relativ zum Ursprung der Zone. Zum Beispiel bezieht sich in einer Zone @code{example.org} der Eintrag @code{\"ns.example.org\"} tatsächlich auf @code{ns.example.org.example.org}. Namen, die auf einen Punkt enden, sind absolut. Das bedeutet, dass sich @code{\"ns.example.org.\"} auf @code{ns.example.org} bezieht." #. type: item -#: doc/guix.texi:19661 +#: doc/guix.texi:19658 #, no-wrap msgid "@code{ttl} (default: @code{\"\"})" -msgstr "" +msgstr "@code{ttl} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:19663 +#: doc/guix.texi:19660 msgid "The Time-To-Live (TTL) of this record. If not set, the default TTL is used." -msgstr "" +msgstr "Wie lange dieser Eintrag zwischengespeichert werden darf, d.h.@: seine „Time-To-Live“ (TTL). Ist sie nicht festgelegt, wird die voreingestellte TTL benutzt." #. type: item -#: doc/guix.texi:19664 +#: doc/guix.texi:19661 #, no-wrap msgid "@code{class} (default: @code{\"IN\"})" -msgstr "" +msgstr "@code{class} (Vorgabe: @code{\"IN\"})" #. type: table -#: doc/guix.texi:19667 +#: doc/guix.texi:19664 msgid "The class of the record. Knot currently supports only @code{\"IN\"} and partially @code{\"CH\"}." -msgstr "" +msgstr "Welche Klasse der Eintrag hat. Derzeit unterstützt Knot nur @code{\"IN\"} und teilweise @code{\"CH\"}." #. type: item -#: doc/guix.texi:19668 +#: doc/guix.texi:19665 #, no-wrap msgid "@code{type} (default: @code{\"A\"})" -msgstr "" +msgstr "@code{type} (Vorgabe: @code{\"A\"})" #. type: table -#: doc/guix.texi:19672 +#: doc/guix.texi:19669 msgid "The type of the record. Common types include A (IPv4 address), AAAA (IPv6 address), NS (Name Server) and MX (Mail eXchange). Many other types are defined." -msgstr "" +msgstr "Der Typ des Eintrags. Zu den üblichen Typen gehören A (für eine IPv4-Adresse), AAAA (für eine IPv6-Adresse), NS (der Namens-Server) und MX („Mail eXchange“ für E-Mails). Viele andere Typen sind auch definiert." #. type: item -#: doc/guix.texi:19673 +#: doc/guix.texi:19670 #, no-wrap msgid "@code{data} (default: @code{\"\"})" -msgstr "" +msgstr "@code{data} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:19677 +#: doc/guix.texi:19674 msgid "The data contained in the record. For instance an IP address associated with an A record, or a domain name associated with an NS record. Remember that domain names are relative to the origin unless they end with a dot." -msgstr "" +msgstr "Die Daten, die im Eintrag stehen, zum Beispiel eine IP-Adresse bei einem A-Eintrag oder ein Domain-Name bei einem NS-Eintrag. Bedenken Sie, dass Domain-Namen relativ zum Ursprung angegeben werden, außer wenn sie auf einen Punkt enden." #. type: deftp -#: doc/guix.texi:19681 +#: doc/guix.texi:19678 #, no-wrap msgid "{Data Type} zone-file" -msgstr "" +msgstr "{Datentyp} zone-file" #. type: deftp -#: doc/guix.texi:19684 +#: doc/guix.texi:19681 msgid "Data type representing the content of a zone file. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der den Inhalt einer Zonendatei repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: table -#: doc/guix.texi:19693 +#: doc/guix.texi:19690 msgid "The list of entries. The SOA record is taken care of, so you don't need to put it in the list of entries. This list should probably contain an entry for your primary authoritative DNS server. Other than using a list of entries directly, you can use @code{define-zone-entries} to define a object containing the list of entries more easily, that you can later pass to the @code{entries} field of the @code{zone-file}." -msgstr "" +msgstr "Die Liste der Einträge. Für den SOA-Eintrag wird automatisch gesorgt, also müssen Sie ihn nicht zur Liste der Einträge hinzufügen. In der Liste sollte vermutlich ein Eintrag für Ihren primären autoritativen DNS-Server stehen. Abgesehen vom direkten Aufzählen der Einträge können Sie @code{define-zone-entries} verwenden, um ein Objekt zu definieren, worin eine Liste von Einträgen leichter angegeben werden kann, und was sie dann im @code{entries}-Feld des @code{zone-file} angeben können." #. type: item -#: doc/guix.texi:19694 +#: doc/guix.texi:19691 #, no-wrap msgid "@code{origin} (default: @code{\"\"})" -msgstr "" +msgstr "@code{origin} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:19696 +#: doc/guix.texi:19693 msgid "The name of your zone. This parameter cannot be empty." -msgstr "" +msgstr "Der Name Ihrer Zone. Dieser Parameter darf nicht leer sein." #. type: item -#: doc/guix.texi:19697 +#: doc/guix.texi:19694 #, no-wrap msgid "@code{ns} (default: @code{\"ns\"})" -msgstr "" +msgstr "@code{ns} (Vorgabe: @code{\"ns\"})" #. type: table -#: doc/guix.texi:19702 +#: doc/guix.texi:19699 msgid "The domain of your primary authoritative DNS server. The name is relative to the origin, unless it ends with a dot. It is mandatory that this primary DNS server corresponds to an NS record in the zone and that it is associated to an IP address in the list of entries." -msgstr "" +msgstr "Die Domain Ihres primären autoritativen DNS-Servers. Der Name wird relativ zum Ursprung angegeben, außer wenn er auf einen Punkt endet. Dieser primäre DNS-Server @emph{muss} verpflichtend einem NS-Eintrag in der Zone entsprechen, dem eine IP-Adresse in der Liste der Einträge zugeordnet werden muss." #. type: item -#: doc/guix.texi:19703 +#: doc/guix.texi:19700 #, no-wrap msgid "@code{mail} (default: @code{\"hostmaster\"})" -msgstr "" +msgstr "@code{mail} (Vorgabe: @code{\"hostmaster\"})" #. type: table -#: doc/guix.texi:19706 +#: doc/guix.texi:19703 msgid "An email address people can contact you at, as the owner of the zone. This is translated as @code{@@}." -msgstr "" +msgstr "Eine E-Mail-Adresse, unter der man Sie als für diese Zone Verantwortlichen („Besitzer“/„Owner“) kontaktieren kann. Sie wird zu @code{@@} umgeschrieben." #. type: item -#: doc/guix.texi:19707 +#: doc/guix.texi:19704 #, no-wrap msgid "@code{serial} (default: @code{1})" -msgstr "" +msgstr "@code{serial} (Vorgabe: @code{1})" #. type: table -#: doc/guix.texi:19711 +#: doc/guix.texi:19708 msgid "The serial number of the zone. As this is used to keep track of changes by both slaves and resolvers, it is mandatory that it @emph{never} decreases. Always increment it when you make a change in your zone." -msgstr "" +msgstr "Die Seriennummer der Zone. Da sie von sowohl „Slaves“ als auch „Resolvern“ benutzt wird, um bei Änderungen auf dem Laufenden zu bleiben, ist es notwendig, dass sie @emph{niemals} kleiner gemacht wird. Erhöhen Sie sie, wann immer Sie eine Änderung an Ihrer Zone durchführen." #. type: item -#: doc/guix.texi:19712 +#: doc/guix.texi:19709 #, no-wrap msgid "@code{refresh} (default: @code{(* 2 24 3600)})" -msgstr "" +msgstr "@code{refresh} (Vorgabe: @code{(* 2 24 3600)})" #. type: table -#: doc/guix.texi:19716 +#: doc/guix.texi:19713 msgid "The frequency at which slaves will do a zone transfer. This value is a number of seconds. It can be computed by multiplications or with @code{(string->duration)}." -msgstr "" +msgstr "Die Häufigkeit, wie oft Slaves eine Zonenübertragung („Zone Transfer“) durchführen. Als Wert wird eine Anzahl von Sekunden angegeben. Sie kann über eine Multiplikation oder mit @code{(string->duration)} angegeben werden." #. type: item -#: doc/guix.texi:19717 +#: doc/guix.texi:19714 #, no-wrap msgid "@code{retry} (default: @code{(* 15 60)})" -msgstr "" +msgstr "@code{retry} (Vorgabe: @code{(* 15 60)})" #. type: table -#: doc/guix.texi:19720 +#: doc/guix.texi:19717 msgid "The period after which a slave will retry to contact its master when it fails to do so a first time." -msgstr "" +msgstr "Nach welcher Zeitperiode ein Slave versuchen wird, Kontakt mit seinem Master aufzunehmen, wenn er ihn beim ersten Mal nicht erreichen kann." #. type: item -#: doc/guix.texi:19721 +#: doc/guix.texi:19718 #, no-wrap msgid "@code{expiry} (default: @code{(* 14 24 3600)})" -msgstr "" +msgstr "@code{expiry} (Vorgabe: @code{(* 14 24 3600)})" #. type: table -#: doc/guix.texi:19725 +#: doc/guix.texi:19722 msgid "Default TTL of records. Existing records are considered correct for at most this amount of time. After this period, resolvers will invalidate their cache and check again that it still exists." -msgstr "" +msgstr "Die Voreinstellung, welche TTL für Einträge verwendet werden soll. Bestehende Einträge werden für höchstens diese Zeitspanne als korrekt angesehen. Nach Ablauf dieser Zeitspanne werden „Resolver“ ihren Zwischenspeicher als ungültig markieren und erneut prüfen, ob der Eintrag noch existiert." #. type: item -#: doc/guix.texi:19726 +#: doc/guix.texi:19723 #, no-wrap msgid "@code{nx} (default: @code{3600})" -msgstr "" +msgstr "@code{nx} (Vorgabe: @code{3600})" #. type: table -#: doc/guix.texi:19729 +#: doc/guix.texi:19726 msgid "Default TTL of inexistant records. This delay is usually short because you want your new domains to reach everyone quickly." -msgstr "" +msgstr "Die voreingestellte TTL der @emph{nicht} existierenden Einträge. Sie stellt normalerweise eine kurze Verzögerung dar, weil Sie möchten, dass neue Domains für jeden schnell erkannt werden." #. type: deftp -#: doc/guix.texi:19733 +#: doc/guix.texi:19730 #, no-wrap msgid "{Data Type} knot-remote-configuration" -msgstr "" +msgstr "{Datentyp} knot-remote-configuration" #. type: deftp -#: doc/guix.texi:19736 +#: doc/guix.texi:19733 msgid "Data type representing a remote configuration. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration eines entfernten Servers („Remote“) repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: table -#: doc/guix.texi:19741 +#: doc/guix.texi:19738 msgid "An identifier for other configuration fields to refer to this remote. IDs must be unique and must not be empty." -msgstr "" +msgstr "Ein Identifikator, mit dem man sich in anderen Konfigurationsfeldern auf diesen entfernten Server („Remote“) beziehen kann. IDs müssen eindeutig sein und dürfen @emph{nicht} leer sein." #. type: table -#: doc/guix.texi:19746 +#: doc/guix.texi:19743 msgid "An ordered list of destination IP addresses. Addresses are tried in sequence. An optional port can be given with the @@ separator. For instance: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}. Default port is 53." -msgstr "" +msgstr "Eine geordnete Liste der Empfänger-IP-Adressen. Adressen werden der Reihe nach durchprobiert. Optional kann eine Portnummer nach dem Trennzeichen @@ angegeben werden, zum Beispiel als @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}. Die Vorgabe ist 53." #. type: item -#: doc/guix.texi:19747 +#: doc/guix.texi:19744 #, no-wrap msgid "@code{via} (default: @code{'()})" -msgstr "" +msgstr "@code{via} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19751 +#: doc/guix.texi:19748 msgid "An ordered list of source IP addresses. An empty list will have Knot choose an appropriate source IP. An optional port can be given with the @@ separator. The default is to choose at random." -msgstr "" +msgstr "Eine geordnete Liste der Quell-IP-Adressen. Eine leere Liste wird Knot eine sinnvolle Quell-IP-Adresse auswählen lassen. Optional kann eine Portnummer nach dem Trennzeichen @@ angegeben werden. Die Vorgabe wird zufällig ausgewählt." #. type: item -#: doc/guix.texi:19752 +#: doc/guix.texi:19749 #, no-wrap msgid "@code{key} (default: @code{#f})" -msgstr "" +msgstr "@code{key} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19755 +#: doc/guix.texi:19752 msgid "A reference to a key, that is a string containing the identifier of a key defined in a @code{knot-key-configuration} field." -msgstr "" +msgstr "Ein Verweis auf einen Schlüssel („Key“), also eine Zeichenkette, die den Identifikator eines Schlüssels enthält, der in einem @code{knot-key-configuration}-Feld festgelegt wurde." #. type: deftp -#: doc/guix.texi:19759 +#: doc/guix.texi:19756 #, no-wrap msgid "{Data Type} knot-keystore-configuration" -msgstr "" +msgstr "{Datentyp} knot-keystore-configuration" #. type: deftp -#: doc/guix.texi:19762 +#: doc/guix.texi:19759 msgid "Data type representing a keystore to hold dnssec keys. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der einen Schlüsselspeicher („Keystore“) repräsentiert, um DNSSEC-Schlüssel zu fassen. Dieser Typ verfügt über die folgenden Parameter:" #. type: table -#: doc/guix.texi:19766 +#: doc/guix.texi:19763 msgid "The id of the keystore. It must not be empty." -msgstr "" +msgstr "Der Identifikator des Schlüsselspeichers. Er darf nicht leer gelassen werden." #. type: item -#: doc/guix.texi:19767 +#: doc/guix.texi:19764 #, no-wrap msgid "@code{backend} (default: @code{'pem})" -msgstr "" +msgstr "@code{backend} (Vorgabe: @code{'pem})" #. type: table -#: doc/guix.texi:19769 +#: doc/guix.texi:19766 msgid "The backend to store the keys in. Can be @code{'pem} or @code{'pkcs11}." -msgstr "" +msgstr "Die Art von Hintergrundspeicher, in dem Schlüssel eingetragen werden. Sie kann @code{'pem} oder @code{'pkcs11} sein." #. type: item -#: doc/guix.texi:19770 +#: doc/guix.texi:19767 #, no-wrap msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})" -msgstr "" +msgstr "@code{config} (Vorgabe: @code{\"/var/lib/knot/keys/keys\"})" #. type: table -#: doc/guix.texi:19774 +#: doc/guix.texi:19771 msgid "The configuration string of the backend. An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}. For the pem backend, the string reprensents a path in the file system." -msgstr "" +msgstr "Die Zeichenkette mit der Konfiguration des Hintergrundspeichers. Ein Beispiel für die PKCS#11 ist @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/…/lib/pkcs11/libsofthsm2.so\"}. Für pem als Hintergrundspeicher repräsentiert die Zeichenkette einen Pfad im Dateisystem." #. type: deftp -#: doc/guix.texi:19778 +#: doc/guix.texi:19775 #, no-wrap msgid "{Data Type} knot-policy-configuration" -msgstr "" +msgstr "{Datentyp} knot-policy-configuration" #. type: deftp -#: doc/guix.texi:19782 +#: doc/guix.texi:19779 msgid "Data type representing a dnssec policy. Knot DNS is able to automatically sign your zones. It can either generate and manage your keys automatically or use keys that you generate." -msgstr "" +msgstr "Datentyp, der die DNSSEC-Richtlinie repräsentiert. Knot DNS kann Ihre Zonen automatisch signieren. Der Dienst kann Ihre Schlüssel automatisch erzeugen und verwalten oder Schlüssel benutzen, die Sie selbst erzeugen." #. type: deftp -#: doc/guix.texi:19789 +#: doc/guix.texi:19786 msgid "Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that is used to sign the second, and a Zone Signing Key (ZSK) that is used to sign the zone. In order to be trusted, the KSK needs to be present in the parent zone (usually a top-level domain). If your registrar supports dnssec, you will have to send them your KSK's hash so they can add a DS record in their zone. This is not automated and need to be done each time you change your KSK." -msgstr "" +msgstr "DNSSEC wird in der Regel mit zwei Schlüsseln implementiert: Ein Schlüssel, mit dem Schlüssel signiert werden („Key Signing Key“, KSK), signiert den zweiten Schlüssel, einen Schlüssel, der Zonen signiert („Zone Signing Key“, ZSK), mit dem die Zone signiert wird. Damit er als vertrauenswürdig angesehen wird, muss der KSK in der Elternzone stehen (meistens ist das eine Top-Level-Domain). Wenn Ihr Registrar DNSSEC unterstützt, müssen Sie ihm den Hash Ihres KSK übermitteln, damit er einen DS-Eintrag für Ihre Zone hinzufügen kann. Das passiert nicht automatisch und muss jedes Mal wiederholt werden, wenn Sie Ihren KSK ändern." #. type: deftp -#: doc/guix.texi:19795 +#: doc/guix.texi:19792 msgid "The policy also defines the lifetime of keys. Usually, ZSK can be changed easily and use weaker cryptographic functions (they use lower parameters) in order to sign records quickly, so they are changed often. The KSK however requires manual interaction with the registrar, so they are changed less often and use stronger parameters because they sign only one record." -msgstr "" +msgstr "Die Richtlinie legt auch fest, wie lange Ihre Schlüssel gültig bleiben. Normalerweise kann der ZSK leicht geändert werden und benutzt kryptografisch schwächere Funktionen (also niedrigere Parameter), damit Einträge schnell signiert werden können, wodurch man sie oft verändern kann. Der KSK setzt jedoch eine manuelle Interaktion mit dem Registrar voraus, also werden sie weniger oft geändert und verwenden stärkere Parameter, weil mit ihnen nur ein einziger Eintrag signiert wird." #. type: deftp -#: doc/guix.texi:19797 +#: doc/guix.texi:19794 msgid "This type has the following parameters:" -msgstr "" +msgstr "Dieser Typ verfügt über die folgenden Parameter:" #. type: table -#: doc/guix.texi:19801 +#: doc/guix.texi:19798 msgid "The id of the policy. It must not be empty." -msgstr "" +msgstr "Der Identifikator der Richtlinie. Er darf nicht leer sein." #. type: item -#: doc/guix.texi:19802 +#: doc/guix.texi:19799 #, no-wrap msgid "@code{keystore} (default: @code{\"default\"})" -msgstr "" +msgstr "@code{keystore} (Vorgabe: @code{\"default\"})" #. type: table -#: doc/guix.texi:19807 +#: doc/guix.texi:19804 msgid "A reference to a keystore, that is a string containing the identifier of a keystore defined in a @code{knot-keystore-configuration} field. The @code{\"default\"} identifier means the default keystore (a kasp database that was setup by this service)." -msgstr "" +msgstr "Eine Referenz auf einen Schlüsselspeicher („Keystore“), also eine Zeichenkette, die den Identifikator eines Schlüsselspeichers enthält, der in einem @code{knot-keystore-configuration}-Feld gespeichert ist. Der Identifikator @code{\"default\"} sorgt dafür, dass der vorgegebene Schlüsselspeicher verwendet wird (eine KASP-Datenbank, die durch diesen Dienst eingerichtet wurde)." #. type: item -#: doc/guix.texi:19808 +#: doc/guix.texi:19805 #, no-wrap msgid "@code{manual?} (default: @code{#f})" -msgstr "" +msgstr "@code{manual?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19810 +#: doc/guix.texi:19807 msgid "Whether the key management is manual or automatic." -msgstr "" +msgstr "Ob Schlüssel manuell verwaltet werden sollen; andernfalls werden sie automatisch verwaltet." #. type: item -#: doc/guix.texi:19811 +#: doc/guix.texi:19808 #, no-wrap msgid "@code{single-type-signing?} (default: @code{#f})" -msgstr "" +msgstr "@code{single-type-signing?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19813 +#: doc/guix.texi:19810 msgid "When @code{#t}, use the Single-Type Signing Scheme." -msgstr "" +msgstr "Wenn es auf @code{#t} steht, werden dieselben Schlüssel als KSK und ZSK verwendet („Single-Type Signing Scheme“)." #. type: item -#: doc/guix.texi:19814 +#: doc/guix.texi:19811 #, no-wrap msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})" -msgstr "" +msgstr "@code{algorithm} (Vorgabe: @code{\"ecdsap256sha256\"})" #. type: table -#: doc/guix.texi:19816 +#: doc/guix.texi:19813 msgid "An algorithm of signing keys and issued signatures." -msgstr "" +msgstr "Ein Algorithmus für zum Signieren verwendete Schlüssel und ausgestellte Signaturen." #. type: item -#: doc/guix.texi:19817 +#: doc/guix.texi:19814 #, no-wrap msgid "@code{ksk-size} (default: @code{256})" -msgstr "" +msgstr "@code{ksk-size} (Vorgabe: @code{256})" #. type: table -#: doc/guix.texi:19820 +#: doc/guix.texi:19817 msgid "The length of the KSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms." -msgstr "" +msgstr "Die Länge des KSK. Beachten Sie, dass dieser Wert für den vorgegebenen Algorithmus korrekt ist, aber für andere Algorithmen @emph{nicht} sicher wäre." #. type: item -#: doc/guix.texi:19821 +#: doc/guix.texi:19818 #, no-wrap msgid "@code{zsk-size} (default: @code{256})" -msgstr "" +msgstr "@code{zsk-size} (Vorgabe: @code{256})" #. type: table -#: doc/guix.texi:19824 +#: doc/guix.texi:19821 msgid "The length of the ZSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms." -msgstr "" +msgstr "Die Länge des ZSK. Beachten Sie, dass dieser Wert für den vorgegebenen Algorithmus korrekt ist, aber für andere Algorithmen @emph{nicht} sicher wäre." #. type: item -#: doc/guix.texi:19825 +#: doc/guix.texi:19822 #, no-wrap msgid "@code{dnskey-ttl} (default: @code{'default})" -msgstr "" +msgstr "@code{dnskey-ttl} (Vorgabe: @code{'default})" #. type: table -#: doc/guix.texi:19828 +#: doc/guix.texi:19825 msgid "The TTL value for DNSKEY records added into zone apex. The special @code{'default} value means same as the zone SOA TTL." -msgstr "" +msgstr "Der TTL-Wert für DNSKEY-Einträge, die die Wurzel der Zone betreffen. Der besondere Wert @code{'default} bedeutet, dass dieselbe TTL wie für den SOA-Eintrag der Zone verwendet wird." #. type: item -#: doc/guix.texi:19829 +#: doc/guix.texi:19826 #, no-wrap msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})" -msgstr "" +msgstr "@code{zsk-lifetime} (Vorgabe: @code{(* 30 24 3600)})" #. type: table -#: doc/guix.texi:19831 +#: doc/guix.texi:19828 msgid "The period between ZSK publication and the next rollover initiation." -msgstr "" +msgstr "Die Zeitspanne zwischen der Veröffentlichung eines ZSK und dem Anfang des nächsten Schlüsselübergangs („Key Rollover“)." #. type: item -#: doc/guix.texi:19832 +#: doc/guix.texi:19829 #, no-wrap msgid "@code{propagation-delay} (default: @code{(* 24 3600)})" -msgstr "" +msgstr "@code{propagation-delay} (Vorgabe: @code{(* 24 3600)})" #. type: table -#: doc/guix.texi:19835 +#: doc/guix.texi:19832 msgid "An extra delay added for each key rollover step. This value should be high enough to cover propagation of data from the master server to all slaves." -msgstr "" +msgstr "Eine zusätzliche Verlängerung, die bei jedem Schritt im Schlüsselübergang („Key Rollover“) gewartet wird. Dieser Wert sollte hoch genug sein, damit in dieser Zeit Daten vom Master-Server alle Slaves erreichen." #. type: item -#: doc/guix.texi:19836 +#: doc/guix.texi:19833 #, no-wrap msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})" -msgstr "" +msgstr "@code{rrsig-lifetime} (Vorgabe: @code{(* 14 24 3600)})" #. type: table -#: doc/guix.texi:19838 +#: doc/guix.texi:19835 msgid "A validity period of newly issued signatures." -msgstr "" +msgstr "Wie lange neu ausgestellte Signaturen gültig bleiben." #. type: item -#: doc/guix.texi:19839 +#: doc/guix.texi:19836 #, no-wrap msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})" -msgstr "" +msgstr "@code{rrsig-refresh} (Vorgabe: @code{(* 7 24 3600)})" #. type: table -#: doc/guix.texi:19841 +#: doc/guix.texi:19838 msgid "A period how long before a signature expiration the signature will be refreshed." -msgstr "" +msgstr "Wie lange im Voraus vor einem Auslaufen der Signatur diese Signatur erneuert werden soll." #. type: item -#: doc/guix.texi:19842 +#: doc/guix.texi:19839 #, no-wrap msgid "@code{nsec3?} (default: @code{#f})" -msgstr "" +msgstr "@code{nsec3?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19844 +#: doc/guix.texi:19841 msgid "When @code{#t}, NSEC3 will be used instead of NSEC." -msgstr "" +msgstr "Ist es auf @code{#t} gesetzt, wird NSEC3 statt NSEC benutzt." #. type: item -#: doc/guix.texi:19845 +#: doc/guix.texi:19842 #, no-wrap msgid "@code{nsec3-iterations} (default: @code{5})" -msgstr "" +msgstr "@code{nsec3-iterations} (Vorgabe: @code{5})" #. type: table -#: doc/guix.texi:19847 +#: doc/guix.texi:19844 msgid "The number of additional times the hashing is performed." -msgstr "" +msgstr "Wie oft zusätzlich gehasht werden soll." #. type: item -#: doc/guix.texi:19848 +#: doc/guix.texi:19845 #, no-wrap msgid "@code{nsec3-salt-length} (default: @code{8})" -msgstr "" +msgstr "@code{nsec3-salt-length} (Vorgabe: @code{8})" #. type: table -#: doc/guix.texi:19851 +#: doc/guix.texi:19848 msgid "The length of a salt field in octets, which is appended to the original owner name before hashing." -msgstr "" +msgstr "Wie lange das kryptografische „Salt“ sein soll, als Anzahl von Oktetten. Es wird vor dem Hashen an den Namen des ursprünglichen Besitzers angehängt." #. type: item -#: doc/guix.texi:19852 +#: doc/guix.texi:19849 #, no-wrap msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})" -msgstr "" +msgstr "@code{nsec3-salt-lifetime} (Vorgabe: @code{(* 30 24 3600)})" #. type: table -#: doc/guix.texi:19854 +#: doc/guix.texi:19851 msgid "The validity period of newly issued salt field." -msgstr "" +msgstr "Wie lange das neu ausgestellte Salt-Feld gültig bleiben soll." #. type: deftp -#: doc/guix.texi:19858 +#: doc/guix.texi:19855 #, no-wrap msgid "{Data Type} knot-zone-configuration" -msgstr "" +msgstr "{Datentyp} knot-zone-configuration" #. type: deftp -#: doc/guix.texi:19861 +#: doc/guix.texi:19858 msgid "Data type representing a zone served by Knot. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der eine durch Knot verfügbar gemachte Zone repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:19863 +#: doc/guix.texi:19860 #, no-wrap msgid "@code{domain} (default: @code{\"\"})" -msgstr "" +msgstr "@code{domain} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:19865 +#: doc/guix.texi:19862 msgid "The domain served by this configuration. It must not be empty." -msgstr "" +msgstr "Die Domain, die durch diese Konfiguration zur Verfügung gestellt wird. Sie darf nicht leer sein." #. type: item -#: doc/guix.texi:19866 +#: doc/guix.texi:19863 #, no-wrap msgid "@code{file} (default: @code{\"\"})" -msgstr "" +msgstr "@code{file} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:19869 +#: doc/guix.texi:19866 msgid "The file where this zone is saved. This parameter is ignored by master zones. Empty means default location that depends on the domain name." -msgstr "" +msgstr "Die Datei, in der diese Zone abgespeichert wird. Dieser Parameter wird bei Master-Zonen ignoriert. Bleibt er leer, wird die vom Domain-Namen abhängige Voreinstellung benutzt." #. type: item -#: doc/guix.texi:19870 +#: doc/guix.texi:19867 #, no-wrap msgid "@code{zone} (default: @code{(zone-file)})" -msgstr "" +msgstr "@code{zone} (Vorgabe: @code{(zone-file)})" #. type: table -#: doc/guix.texi:19873 +#: doc/guix.texi:19870 msgid "The content of the zone file. This parameter is ignored by slave zones. It must contain a zone-file record." -msgstr "" +msgstr "Der Inhalt der Zonendatei. Dieser Parameter wird bei Slave-Zonen ignoriert. Er muss ein Verbundsobjekt vom Typ @code{zone-file} enthalten." #. type: item -#: doc/guix.texi:19874 +#: doc/guix.texi:19871 #, no-wrap msgid "@code{master} (default: @code{'()})" -msgstr "" +msgstr "@code{master} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19877 +#: doc/guix.texi:19874 msgid "A list of master remotes. When empty, this zone is a master. When set, this zone is a slave. This is a list of remotes identifiers." -msgstr "" +msgstr "Eine Liste von als „Master“ geltenden entfernten Servern. Ist sie leer, ist diese Zone ein Master, sonst ein Slave. Es handelt sich um eine Liste von Identifikatoren entfernter Server („Remotes“)." #. type: item -#: doc/guix.texi:19878 +#: doc/guix.texi:19875 #, no-wrap msgid "@code{ddns-master} (default: @code{#f})" -msgstr "" +msgstr "@code{ddns-master} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19881 +#: doc/guix.texi:19878 msgid "The main master. When empty, it defaults to the first master in the list of masters." -msgstr "" +msgstr "Der vorrangige „Master“. Ist dies leer, wird hierfür der erste Master aus der Liste der Master benutzt." #. type: item -#: doc/guix.texi:19882 +#: doc/guix.texi:19879 #, no-wrap msgid "@code{notify} (default: @code{'()})" -msgstr "" +msgstr "@code{notify} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19884 +#: doc/guix.texi:19881 msgid "A list of slave remote identifiers." -msgstr "" +msgstr "Eine Liste der Identifikatoren von entfernten Slave-Servern („Remotes“)." #. type: item -#: doc/guix.texi:19885 +#: doc/guix.texi:19882 #, no-wrap msgid "@code{acl} (default: @code{'()})" -msgstr "" +msgstr "@code{acl} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19887 +#: doc/guix.texi:19884 msgid "A list of acl identifiers." -msgstr "" +msgstr "Eine Liste von Identifikatoren von Zugriffssteuerungslisten." #. type: item -#: doc/guix.texi:19888 +#: doc/guix.texi:19885 #, no-wrap msgid "@code{semantic-checks?} (default: @code{#f})" -msgstr "" +msgstr "@code{semantic-checks?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19890 +#: doc/guix.texi:19887 msgid "When set, this adds more semantic checks to the zone." -msgstr "" +msgstr "Wenn dies festgelegt ist, werden für die Zone mehr semantische Überprüfungen durchgeführt." #. type: item -#: doc/guix.texi:19891 +#: doc/guix.texi:19888 #, no-wrap msgid "@code{disable-any?} (default: @code{#f})" -msgstr "" +msgstr "@code{disable-any?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19893 +#: doc/guix.texi:19890 msgid "When set, this forbids queries of the ANY type." -msgstr "" +msgstr "Wenn dies gesetzt ist, werden Anfragen vom Typ ANY gesperrt." #. type: item -#: doc/guix.texi:19894 +#: doc/guix.texi:19891 #, no-wrap msgid "@code{zonefile-sync} (default: @code{0})" -msgstr "" +msgstr "@code{zonefile-sync} (Vorgabe: @code{0})" #. type: table -#: doc/guix.texi:19897 +#: doc/guix.texi:19894 msgid "The delay between a modification in memory and on disk. 0 means immediate synchronization." -msgstr "" +msgstr "Wie lange nach einer Änderung der im Arbeitsspeicher zwischengespeicherten Daten gewartet wird, bis die Daten auf die Platte geschrieben werden. Bei 0 werden sie sofort synchronisiert." #. type: item -#: doc/guix.texi:19898 +#: doc/guix.texi:19895 #, no-wrap msgid "@code{zonefile-load} (default: @code{#f})" msgstr "@code{zonefile-load} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19901 +#: doc/guix.texi:19898 msgid "The way the zone file contents are applied during zone load. Possible values are:" -msgstr "" +msgstr "Wie die in der Zonendatei gespeicherten Daten benutzt werden, wenn die Zone geladen wird. Mögliche Werte sind:" #. type: item -#: doc/guix.texi:19903 +#: doc/guix.texi:19900 #, no-wrap msgid "@code{#f} for using the default value from Knot," -msgstr "" +msgstr "@code{#f} sorgt dafür, dass nach der Voreinstellung von Knot verfahren wird," #. type: item -#: doc/guix.texi:19904 +#: doc/guix.texi:19901 #, no-wrap msgid "@code{'none} for not using the zone file at all," -msgstr "" +msgstr "@code{'none} bewirkt, dass die Zonendatei überhaupt nicht benutzt wird," #. type: item -#: doc/guix.texi:19905 +#: doc/guix.texi:19902 #, no-wrap msgid "@code{'difference} for computing the difference between already available" -msgstr "" +msgstr "@code{'difference} lässt den Unterschied zwischen den bereits vorliegenden" #. type: itemize -#: doc/guix.texi:19907 +#: doc/guix.texi:19904 msgid "contents and zone contents and applying it to the current zone contents," -msgstr "" +msgstr "Daten und dem gespeicherten Inhalt der Zone berechnen, welcher dann zum vorliegenden Zoneninhalt hinzugenommen wird," #. type: item -#: doc/guix.texi:19907 +#: doc/guix.texi:19904 #, no-wrap msgid "@code{'difference-no-serial} for the same as @code{'difference}, but" -msgstr "" +msgstr "@code{'difference-no-serial} für dasselbe wie bei @code{'difference}," #. type: itemize -#: doc/guix.texi:19910 +#: doc/guix.texi:19907 msgid "ignoring the SOA serial in the zone file, while the server takes care of it automatically." -msgstr "" +msgstr "aber die SOA-Seriennummer in der Zonendatei wird ignoriert und der Server kümmert sich automatisch darum." #. type: item -#: doc/guix.texi:19910 +#: doc/guix.texi:19907 #, no-wrap msgid "@code{'whole} for loading zone contents from the zone file." -msgstr "" +msgstr "@code{'whole} lässt den ganzen Inhalt der Zone aus der Zonendatei auslesen." #. type: item -#: doc/guix.texi:19913 +#: doc/guix.texi:19910 #, no-wrap msgid "@code{journal-content} (default: @code{#f})" msgstr "@code{journal-content} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19918 +#: doc/guix.texi:19915 msgid "The way the journal is used to store zone and its changes. Possible values are @code{'none} to not use it at all, @code{'changes} to store changes and @code{'all} to store contents. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "Wie in den Aufzeichnungen die Zone und Änderungen daran gespeichert werden sollen. Mögliche Werte sind @code{'none}, um keine Aufzeichnungen zu führen, @code{'changes}, um Änderungen zu speichern, und @code{'all}, wodurch der gesamte Inhalt gespeichert wird. Für @code{#f} wird dieser Wert nicht gesetzt, so dass der in Knot voreingestellte Wert benutzt wird." #. type: item -#: doc/guix.texi:19919 +#: doc/guix.texi:19916 #, no-wrap msgid "@code{max-journal-usage} (default: @code{#f})" msgstr "@code{max-journal-usage} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19922 +#: doc/guix.texi:19919 msgid "The maximum size for the journal on disk. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "Die maximale Größe, die Aufzeichnungen für die Wiederherstellbarkeit („Journal“) auf der Platte einnehmen können. Für @code{#f} wird dieser Wert nicht gesetzt, so dass der in Knot voreingestellte Wert benutzt wird." #. type: item -#: doc/guix.texi:19923 +#: doc/guix.texi:19920 #, no-wrap msgid "@code{max-journal-depth} (default: @code{#f})" msgstr "@code{max-journal-depth} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19926 +#: doc/guix.texi:19923 msgid "The maximum size of the history. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "Wieviele Aufzeichnungen höchstens im Änderungsverlauf gespeichert werden. Für @code{#f} wird dieser Wert nicht gesetzt, so dass der in Knot voreingestellte Wert benutzt wird." #. type: item -#: doc/guix.texi:19927 +#: doc/guix.texi:19924 #, no-wrap msgid "@code{max-zone-size} (default: @code{#f})" msgstr "@code{max-zone-size} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19931 +#: doc/guix.texi:19928 msgid "The maximum size of the zone file. This limit is enforced for incoming transfer and updates. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "Die maximale Größe der Zonendatei. Diese Beschränkung wird auf eingehende Übertragungen und Aktualisierungen angewandt. Für @code{#f} wird dieser Wert nicht gesetzt, so dass der in Knot voreingestellte Wert benutzt wird." #. type: item -#: doc/guix.texi:19932 +#: doc/guix.texi:19929 #, no-wrap msgid "@code{dnssec-policy} (default: @code{#f})" msgstr "@code{dnssec-policy} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:19936 +#: doc/guix.texi:19933 msgid "A reference to a @code{knot-policy-configuration} record, or the special name @code{\"default\"}. If the value is @code{#f}, there is no dnssec signing on this zone." -msgstr "" +msgstr "Ein Verweis auf ein @code{knot-policy-configuration}-Verbundsobjekt oder der besondere Name @code{\"default\"}, um die Voreinstellung von Knot zu verwenden. Wenn dies als der Wert @code{#f} angegeben wurde, findet in dieser Zone kein Signieren mit DNSSEC statt." #. type: item -#: doc/guix.texi:19937 +#: doc/guix.texi:19934 #, no-wrap msgid "@code{serial-policy} (default: @code{'increment})" -msgstr "" +msgstr "@code{serial-policy} (Vorgabe: @code{'increment})" #. type: table -#: doc/guix.texi:19939 +#: doc/guix.texi:19936 msgid "A policy between @code{'increment} and @code{'unixtime}." -msgstr "" +msgstr "Eine Richtlinie; entweder @code{'increment} (Seriennummer hochzählen) oder @code{'unixtime} (Unix-Zeitstempel verwenden)." #. type: deftp -#: doc/guix.texi:19943 +#: doc/guix.texi:19940 #, no-wrap msgid "{Data Type} knot-configuration" -msgstr "" +msgstr "{Datentyp} knot-configuration" #. type: deftp -#: doc/guix.texi:19946 +#: doc/guix.texi:19943 msgid "Data type representing the Knot configuration. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration von Knot repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:19948 +#: doc/guix.texi:19945 #, no-wrap msgid "@code{knot} (default: @code{knot})" -msgstr "" +msgstr "@code{knot} (Vorgabe: @code{knot})" #. type: table -#: doc/guix.texi:19950 +#: doc/guix.texi:19947 msgid "The Knot package." -msgstr "" +msgstr "Das Knot-Paket." #. type: item -#: doc/guix.texi:19951 +#: doc/guix.texi:19948 #, no-wrap msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})" -msgstr "" +msgstr "@code{run-directory} (Vorgabe: @code{\"/var/run/knot\"})" #. type: table -#: doc/guix.texi:19953 +#: doc/guix.texi:19950 msgid "The run directory. This directory will be used for pid file and sockets." -msgstr "" +msgstr "Das Laufzeit-Verzeichnis („run“-Verzeichnis). In diesem Verzeichnis werden die PID-Datei mit dem Prozessidentifikator und Sockets gespeichert." #. type: item -#: doc/guix.texi:19954 +#: doc/guix.texi:19951 #, no-wrap msgid "@code{includes} (default: @code{'()})" msgstr "@code{includes} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19957 +#: doc/guix.texi:19954 msgid "A list of strings or file-like objects denoting other files that must be included at the top of the configuration file." msgstr "Eine flache Liste von Zeichenketten oder dateiartigen Objekten, die oben in der Konfigurationsdatei eingebunden werden müssen." #. type: cindex -#: doc/guix.texi:19958 +#: doc/guix.texi:19955 #, no-wrap msgid "secrets, Knot service" msgstr "Geheimnisse, Knot-Dienst" #. type: table -#: doc/guix.texi:19964 +#: doc/guix.texi:19961 msgid "This can be used to manage secrets out-of-band. For example, secret keys may be stored in an out-of-band file not managed by Guix, and thus not visible in @file{/gnu/store}---e.g., you could store secret key configuration in @file{/etc/knot/secrets.conf} and add this file to the @code{includes} list." -msgstr "" +msgstr "Hiermit können Geheimnisse abseits von Guix’ Zuständigkeitsbereich gespeichert werden. Zum Beispiel können Sie geheime Schlüssel so in einer externen Datei speichern, die nicht von Guix verwaltet und daher auch nicht von jedem in @file{/gnu/store} ausgelesen werden kann — Sie können etwa Ihre geheime Schlüsselkonfiguration in @file{/etc/knot/secrets.conf} speichern und diese Datei dann zu Ihrer @code{includes}-Liste hinzufügen." #. type: table -#: doc/guix.texi:19966 +#: doc/guix.texi:19963 msgid "It can also be used to add configuration not supported by this interface." -msgstr "" +msgstr "Sie können die @code{includes} auch benutzen, um von der Guix-Schnittstelle nicht unterstützte Einstellungen festzulegen." #. type: item -#: doc/guix.texi:19967 +#: doc/guix.texi:19964 #, no-wrap msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})" -msgstr "" +msgstr "@code{listen-v4} (Vorgabe: @code{\"0.0.0.0\"})" #. type: table -#: doc/guix.texi:19969 doc/guix.texi:19972 +#: doc/guix.texi:19966 doc/guix.texi:19969 msgid "An ip address on which to listen." -msgstr "" +msgstr "Eine IP-Adresse, auf der gelauscht werden soll." #. type: item -#: doc/guix.texi:19970 +#: doc/guix.texi:19967 #, no-wrap msgid "@code{listen-v6} (default: @code{\"::\"})" -msgstr "" +msgstr "@code{listen-v6} (Vorgabe: @code{\"::\"})" #. type: item -#: doc/guix.texi:19973 +#: doc/guix.texi:19970 #, no-wrap msgid "@code{listen-port} (default: @code{53})" -msgstr "" +msgstr "@code{listen-port} (Vorgabe: @code{53})" #. type: table -#: doc/guix.texi:19975 +#: doc/guix.texi:19972 msgid "A port on which to listen." -msgstr "" +msgstr "Ein Port, auf dem gelauscht werden soll." #. type: item -#: doc/guix.texi:19976 +#: doc/guix.texi:19973 #, no-wrap msgid "@code{keys} (default: @code{'()})" -msgstr "" +msgstr "@code{keys} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19978 +#: doc/guix.texi:19975 msgid "The list of knot-key-configuration used by this configuration." -msgstr "" +msgstr "Die Liste der @code{knot-key-configuration}-Objekte, die von dieser Konfiguration benutzt werden sollen." #. type: item -#: doc/guix.texi:19979 +#: doc/guix.texi:19976 #, no-wrap msgid "@code{acls} (default: @code{'()})" -msgstr "" +msgstr "@code{acls} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19981 +#: doc/guix.texi:19978 msgid "The list of knot-acl-configuration used by this configuration." -msgstr "" +msgstr "Die Liste der @code{knot-acl-configuration}-Objekte, die von dieser Konfiguration benutzt werden sollen." #. type: item -#: doc/guix.texi:19982 +#: doc/guix.texi:19979 #, no-wrap msgid "@code{remotes} (default: @code{'()})" -msgstr "" +msgstr "@code{remotes} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19984 +#: doc/guix.texi:19981 msgid "The list of knot-remote-configuration used by this configuration." -msgstr "" +msgstr "Die Liste der @code{knot-remote-configuration}-Objekte, die von dieser Konfiguration benutzt werden sollen." #. type: item -#: doc/guix.texi:19985 +#: doc/guix.texi:19982 #, no-wrap msgid "@code{zones} (default: @code{'()})" -msgstr "" +msgstr "@code{zones} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:19987 +#: doc/guix.texi:19984 msgid "The list of knot-zone-configuration used by this configuration." -msgstr "" +msgstr "Die Liste der @code{knot-zone-configuration}-Objekte, die von dieser Konfiguration benutzt werden sollen." #. type: subsubheading -#: doc/guix.texi:19991 +#: doc/guix.texi:19988 #, no-wrap msgid "Dnsmasq Service" msgstr "Dnsmasq-Dienst" #. type: deffn -#: doc/guix.texi:19993 +#: doc/guix.texi:19990 #, no-wrap msgid "{Scheme Variable} dnsmasq-service-type" -msgstr "" +msgstr "{Scheme-Variable} dnsmasq-service-type" #. type: deffn -#: doc/guix.texi:19996 +#: doc/guix.texi:19993 msgid "This is the type of the dnsmasq service, whose value should be an @code{dnsmasq-configuration} object as in this example:" -msgstr "" +msgstr "Dies ist der Diensttyp des dnsmasq-Dienstes, dessen Wert ein @code{dnsmasq-configuration}-Objekt wie in diesem Beispiel sein sollte:" #. type: example -#: doc/guix.texi:20002 +#: doc/guix.texi:19999 #, no-wrap msgid "" "(service dnsmasq-service-type\n" @@ -37485,1160 +37675,1164 @@ msgid "" " (no-resolv? #t)\n" " (servers '(\"192.168.1.1\"))))\n" msgstr "" +"(service dnsmasq-service-type\n" +" (dnsmasq-configuration\n" +" (no-resolv? #t)\n" +" (servers '(\"192.168.1.1\"))))\n" #. type: deftp -#: doc/guix.texi:20005 +#: doc/guix.texi:20002 #, no-wrap msgid "{Data Type} dnsmasq-configuration" msgstr "{Datentyp} dnsmasq-configuration" #. type: deftp -#: doc/guix.texi:20007 +#: doc/guix.texi:20004 msgid "Data type representing the configuration of dnsmasq." msgstr "Repräsentiert die dnsmasq-Konfiguration." #. type: item -#: doc/guix.texi:20009 +#: doc/guix.texi:20006 #, no-wrap msgid "@code{package} (default: @var{dnsmasq})" msgstr "@code{package} (Vorgabe: @var{dnsmasq})" #. type: table -#: doc/guix.texi:20011 +#: doc/guix.texi:20008 msgid "Package object of the dnsmasq server." -msgstr "" +msgstr "Paketobjekt des dnsmasq-Servers." #. type: item -#: doc/guix.texi:20012 +#: doc/guix.texi:20009 #, no-wrap msgid "@code{no-hosts?} (default: @code{#f})" msgstr "@code{no-hosts?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20014 +#: doc/guix.texi:20011 msgid "When true, don't read the hostnames in /etc/hosts." -msgstr "" +msgstr "Ist es auf wahr gesetzt, werden keine Rechnernamen („Hostnames“) aus /etc/hosts ausgelesen." #. type: item -#: doc/guix.texi:20015 +#: doc/guix.texi:20012 #, no-wrap msgid "@code{port} (default: @code{53})" msgstr "@code{port} (Vorgabe: @code{53})" #. type: table -#: doc/guix.texi:20018 +#: doc/guix.texi:20015 msgid "The port to listen on. Setting this to zero completely disables DNS responses, leaving only DHCP and/or TFTP functions." -msgstr "" +msgstr "Der Port, auf dem gelauscht werden soll. Wird dies auf null gesetzt, werden keinerlei DNS-Anfragen beantwortet und es bleiben nur DHCP- und/oder TFTP-Funktionen." #. type: item -#: doc/guix.texi:20019 +#: doc/guix.texi:20016 #, no-wrap msgid "@code{local-service?} (default: @code{#t})" msgstr "@code{local-service?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:20022 +#: doc/guix.texi:20019 msgid "Accept DNS queries only from hosts whose address is on a local subnet, ie a subnet for which an interface exists on the server." -msgstr "" +msgstr "DNS-Anfragen nur von Rechnern akzeptieren, deren Adresse auf einem lokalen Subnetz liegt, d.h.@: einem Subnetz, für dem auf dem Server eine Schnittstelle existiert." #. type: item -#: doc/guix.texi:20023 +#: doc/guix.texi:20020 #, no-wrap msgid "@code{listen-addresses} (default: @code{'()})" msgstr "@code{listen-addresses} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:20025 +#: doc/guix.texi:20022 msgid "Listen on the given IP addresses." -msgstr "" +msgstr "Lässt auf den angegebenen IP-Adressen lauschen." #. type: item -#: doc/guix.texi:20026 +#: doc/guix.texi:20023 #, no-wrap msgid "@code{resolv-file} (default: @code{\"/etc/resolv.conf\"})" msgstr "@code{resolv-file} (Vorgabe: @code{\"/etc/resolv.conf\"})" #. type: table -#: doc/guix.texi:20028 +#: doc/guix.texi:20025 msgid "The file to read the IP address of the upstream nameservers from." -msgstr "" +msgstr "Aus welcher Datei die IP-Adresse der zu verwendenden Namensserver gelesen werden sollen." #. type: item -#: doc/guix.texi:20029 +#: doc/guix.texi:20026 #, no-wrap msgid "@code{no-resolv?} (default: @code{#f})" msgstr "@code{no-resolv?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20031 +#: doc/guix.texi:20028 msgid "When true, don't read @var{resolv-file}." -msgstr "" +msgstr "Wenn es auf wahr steht, wird das @var{resolv-file} nicht gelesen." #. type: table -#: doc/guix.texi:20034 +#: doc/guix.texi:20031 msgid "Specify IP address of upstream servers directly." -msgstr "" +msgstr "Geben Sie die IP-Adresse von anzufragenden Servern direkt an." #. type: item -#: doc/guix.texi:20035 +#: doc/guix.texi:20032 #, no-wrap msgid "@code{cache-size} (default: @code{150})" msgstr "@code{cache-size} (Vorgabe: @code{150})" #. type: table -#: doc/guix.texi:20038 +#: doc/guix.texi:20035 msgid "Set the size of dnsmasq's cache. Setting the cache size to zero disables caching." -msgstr "" +msgstr "Bestimmt die Größe des Zwischenspeichers von dnsmasq. Wird die Zwischenspeichergröße auf null festgelegt, wird kein Zwischenspeicher benutzt." #. type: item -#: doc/guix.texi:20039 +#: doc/guix.texi:20036 #, no-wrap msgid "@code{negative-cache?} (default: @code{#t})" msgstr "@code{negative-cache?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:20041 +#: doc/guix.texi:20038 msgid "When false, disable negative caching." -msgstr "" +msgstr "Ist dies auf falsch gesetzt, werden Negativergebnisse nicht zwischengespeichert." #. type: subsubheading -#: doc/guix.texi:20045 +#: doc/guix.texi:20042 #, no-wrap msgid "ddclient Service" msgstr "ddclient-Dienst" #. type: cindex -#: doc/guix.texi:20047 +#: doc/guix.texi:20044 #, no-wrap msgid "ddclient" -msgstr "" +msgstr "ddclient" #. type: Plain text -#: doc/guix.texi:20051 +#: doc/guix.texi:20048 msgid "The ddclient service described below runs the ddclient daemon, which takes care of automatically updating DNS entries for service providers such as @uref{https://dyn.com/dns/, Dyn}." -msgstr "" +msgstr "Der im Folgenden beschriebene ddclient-Dienst führt den ddclient-Daemon aus, der dafür sorgt, dass DNS-Einträge für Dienstanbieter wie @uref{https://dyn.com/dns/, Dyn} automatisch aktualisiert werden." #. type: Plain text -#: doc/guix.texi:20054 +#: doc/guix.texi:20051 msgid "The following example show instantiates the service with its default configuration:" -msgstr "" +msgstr "Das folgende Beispiel zeigt, wie man den Dienst mit seiner Vorgabekonfiguration instanziiert:" #. type: example -#: doc/guix.texi:20057 +#: doc/guix.texi:20054 #, no-wrap msgid "(service ddclient-service-type)\n" -msgstr "" +msgstr "(service ddclient-service-type)\n" #. type: Plain text -#: doc/guix.texi:20066 +#: doc/guix.texi:20063 msgid "Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see @code{secret-file} below.) You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be world-readable @i{via} @file{/gnu/store}.) See the examples in the @file{share/ddclient} directory of the @code{ddclient} package." -msgstr "" +msgstr "Beachten Sie, dass der ddclient auf Zugangsdaten zugreifen muss, die in einer @dfn{Geheimnisdatei} („Secret File“) stehen; nach Vorgabe wird sie in @file{/etc/ddclient/secrets} gesucht (siehe @code{secret-file} unten). Es wird erwartet, dass Sie diese Datei manuell erstellen, ohne Guix dafür zu benutzen (theoretisch @emph{könnten} Sie die Datei zu einem Teil Ihrer Dienstkonfiguration machen, indem Sie z.B.@: @code{plain-file} benutzen, aber dann könnte jeder über @file{/gnu/store} ihren Inhalt einsehen). Siehe die Beispiele im Verzeichnis @file{share/ddclient} des @code{ddclient}-Pakets." #. type: Plain text -#: doc/guix.texi:20070 +#: doc/guix.texi:20067 msgid "Available @code{ddclient-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{ddclient-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:20071 +#: doc/guix.texi:20068 #, no-wrap msgid "{@code{ddclient-configuration} parameter} package ddclient" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} „package“ ddclient" #. type: deftypevr -#: doc/guix.texi:20073 +#: doc/guix.texi:20070 msgid "The ddclient package." msgstr "Das ddclient-Paket." #. type: deftypevr -#: doc/guix.texi:20076 +#: doc/guix.texi:20073 #, no-wrap msgid "{@code{ddclient-configuration} parameter} integer daemon" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Ganze-Zahl daemon" #. type: deftypevr -#: doc/guix.texi:20078 +#: doc/guix.texi:20075 msgid "The period after which ddclient will retry to check IP and domain name." -msgstr "" +msgstr "Nach wieviel Zeit ddclient erneut versuchen wird, IP und Domain-Namen zu überprüfen." #. type: deftypevr -#: doc/guix.texi:20083 +#: doc/guix.texi:20080 #, no-wrap msgid "{@code{ddclient-configuration} parameter} boolean syslog" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Boolescher-Ausdruck syslog" #. type: deftypevr -#: doc/guix.texi:20085 +#: doc/guix.texi:20082 msgid "Use syslog for the output." -msgstr "" +msgstr "Ob die Ausgabe an Syslog gehen soll." #. type: deftypevr -#: doc/guix.texi:20090 +#: doc/guix.texi:20087 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string mail" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Zeichenkette mail" #. type: deftypevr -#: doc/guix.texi:20092 +#: doc/guix.texi:20089 msgid "Mail to user." -msgstr "" +msgstr "An welchen Benutzer Mitteilungen gemailt werden sollen." #. type: deftypevr -#: doc/guix.texi:20094 doc/guix.texi:20101 doc/guix.texi:21438 +#: doc/guix.texi:20091 doc/guix.texi:20098 doc/guix.texi:21435 msgid "Defaults to @samp{\"root\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"root\"}." #. type: deftypevr -#: doc/guix.texi:20097 +#: doc/guix.texi:20094 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string mail-failure" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Zeichenkette mail-failure" #. type: deftypevr -#: doc/guix.texi:20099 +#: doc/guix.texi:20096 msgid "Mail failed update to user." msgstr "Den Nutzer per Mail bei fehlgeschlagenen Aktualisierungen benachrichtigen." #. type: deftypevr -#: doc/guix.texi:20104 +#: doc/guix.texi:20101 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string pid" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Zeichenkette pid" #. type: deftypevr -#: doc/guix.texi:20106 +#: doc/guix.texi:20103 msgid "The ddclient PID file." msgstr "PID-Datei für den ddclient." #. type: deftypevr -#: doc/guix.texi:20108 +#: doc/guix.texi:20105 msgid "Defaults to @samp{\"/var/run/ddclient/ddclient.pid\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/run/ddclient/ddclient.pid\"}." #. type: deftypevr -#: doc/guix.texi:20111 +#: doc/guix.texi:20108 #, no-wrap msgid "{@code{ddclient-configuration} parameter} boolean ssl" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Boolescher-Ausdruck ssl" #. type: deftypevr -#: doc/guix.texi:20113 +#: doc/guix.texi:20110 msgid "Enable SSL support." -msgstr "" +msgstr "SSL-Unterstützung aktivieren." #. type: deftypevr -#: doc/guix.texi:20118 +#: doc/guix.texi:20115 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string user" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Zeichenkette user" #. type: deftypevr -#: doc/guix.texi:20121 +#: doc/guix.texi:20118 msgid "Specifies the user name or ID that is used when running ddclient program." -msgstr "" +msgstr "Gibt den Namen oder Identifikator des Benutzerkontos an, unter dem das ddclient-Programm laufen soll." #. type: deftypevr -#: doc/guix.texi:20123 doc/guix.texi:20130 +#: doc/guix.texi:20120 doc/guix.texi:20127 msgid "Defaults to @samp{\"ddclient\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"ddclient\"}." #. type: deftypevr -#: doc/guix.texi:20126 +#: doc/guix.texi:20123 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string group" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Zeichenkette group" #. type: deftypevr -#: doc/guix.texi:20128 +#: doc/guix.texi:20125 msgid "Group of the user who will run the ddclient program." -msgstr "" +msgstr "Die Gruppe des Benutzers, mit dem das ddclient-Programm läuft." #. type: deftypevr -#: doc/guix.texi:20133 +#: doc/guix.texi:20130 #, no-wrap msgid "{@code{ddclient-configuration} parameter} string secret-file" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Zeichenkette secret-file" #. type: deftypevr -#: doc/guix.texi:20137 +#: doc/guix.texi:20134 msgid "Secret file which will be appended to @file{ddclient.conf} file. This file contains credentials for use by ddclient. You are expected to create it manually." -msgstr "" +msgstr "Die Geheimnisdatei („Secret File“), die an die erzeugte @file{ddclient.conf}-Datei angehängt wird. Diese Datei enthält die Zugangsdaten, die ddclient benutzen soll. Es wird erwartet, dass Sie sie manuell erzeugen." #. type: deftypevr -#: doc/guix.texi:20139 +#: doc/guix.texi:20136 msgid "Defaults to @samp{\"/etc/ddclient/secrets.conf\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/ddclient/secrets.conf\"}." #. type: deftypevr -#: doc/guix.texi:20142 +#: doc/guix.texi:20139 #, no-wrap msgid "{@code{ddclient-configuration} parameter} list extra-options" -msgstr "" +msgstr "{@code{ddclient-configuration}-Parameter} Liste extra-options" #. type: deftypevr -#: doc/guix.texi:20144 +#: doc/guix.texi:20141 msgid "Extra options will be appended to @file{ddclient.conf} file." -msgstr "" +msgstr "Zusätzliche Einstellungsoptionen, die an die @file{ddclient.conf}-Datei angehängt werden." #. type: cindex -#: doc/guix.texi:20155 +#: doc/guix.texi:20152 #, no-wrap msgid "VPN (virtual private network)" -msgstr "" +msgstr "VPN (Virtual Private Network)" #. type: cindex -#: doc/guix.texi:20156 +#: doc/guix.texi:20153 #, no-wrap msgid "virtual private network (VPN)" -msgstr "" +msgstr "Virtual Private Network (VPN)" #. type: Plain text -#: doc/guix.texi:20162 +#: doc/guix.texi:20159 msgid "The @code{(gnu services vpn)} module provides services related to @dfn{virtual private networks} (VPNs). It provides a @emph{client} service for your machine to connect to a VPN, and a @emph{server} service for your machine to host a VPN. Both services use @uref{https://openvpn.net/, OpenVPN}." -msgstr "" +msgstr "Das Modul @code{(gnu services vpn)} stellt Dienste zur Verfügung, die mit @dfn{Virtual Private Networks} (VPNs) zu tun haben. Darin wird ein @emph{Client}-Dienst angeboten, mit dem sich Ihre Maschine mit einem VPN verbinden kann, sowie ein @emph{Server}-Dienst, mit dem Sie auf Ihrer Maschine ein VPN betreiben können. Beide Dienste benutzen @uref{https://openvpn.net/, OpenVPN}." #. type: deffn -#: doc/guix.texi:20163 +#: doc/guix.texi:20160 #, no-wrap msgid "{Scheme Procedure} openvpn-client-service @" -msgstr "" +msgstr "{Scheme-Prozedur} openvpn-client-service @" #. type: deffn -#: doc/guix.texi:20165 +#: doc/guix.texi:20162 msgid "[#:config (openvpn-client-configuration)]" -msgstr "" +msgstr "[#:config (openvpn-client-configuration)]" #. type: deffn -#: doc/guix.texi:20167 +#: doc/guix.texi:20164 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a client." -msgstr "" +msgstr "Liefert einen Dienst, der den VPN-Daemon @command{openvpn} als Client ausführt." #. type: deffn -#: doc/guix.texi:20169 +#: doc/guix.texi:20166 #, no-wrap msgid "{Scheme Procedure} openvpn-server-service @" -msgstr "" +msgstr "{Scheme-Prozedur} openvpn-server-service @" #. type: deffn -#: doc/guix.texi:20171 +#: doc/guix.texi:20168 msgid "[#:config (openvpn-server-configuration)]" -msgstr "" +msgstr "[#:config (openvpn-server-configuration)]" #. type: deffn -#: doc/guix.texi:20173 +#: doc/guix.texi:20170 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a server." -msgstr "" +msgstr "Liefert einen Dienst, der den VPN-Daemon @command{openvpn} als Server ausführt." #. type: deffn -#: doc/guix.texi:20175 +#: doc/guix.texi:20172 msgid "Both can be run simultaneously." -msgstr "" +msgstr "Beide können zeitgleich laufen gelassen werden." #. type: Plain text -#: doc/guix.texi:20180 +#: doc/guix.texi:20177 msgid "Available @code{openvpn-client-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{openvpn-client-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:20181 +#: doc/guix.texi:20178 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} package openvpn" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} „package“ openvpn" #. type: deftypevr -#: doc/guix.texi:20183 doc/guix.texi:20319 +#: doc/guix.texi:20180 doc/guix.texi:20316 msgid "The OpenVPN package." -msgstr "" +msgstr "Das OpenVPN-Paket." #. type: deftypevr -#: doc/guix.texi:20186 +#: doc/guix.texi:20183 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string pid-file" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Zeichenkette pid-file" #. type: deftypevr -#: doc/guix.texi:20188 doc/guix.texi:20324 +#: doc/guix.texi:20185 doc/guix.texi:20321 msgid "The OpenVPN pid file." -msgstr "" +msgstr "Die Datei für den Prozessidentifikator („PID“) von OpenVPN." #. type: deftypevr -#: doc/guix.texi:20190 doc/guix.texi:20326 +#: doc/guix.texi:20187 doc/guix.texi:20323 msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/run/openvpn/openvpn.pid\"}." #. type: deftypevr -#: doc/guix.texi:20193 +#: doc/guix.texi:20190 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} proto proto" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Protokoll proto" #. type: deftypevr -#: doc/guix.texi:20196 doc/guix.texi:20332 +#: doc/guix.texi:20193 doc/guix.texi:20329 msgid "The protocol (UDP or TCP) used to open a channel between clients and servers." -msgstr "" +msgstr "Das Protokoll (UDP oder TCP), das benutzt werden soll, um einen Kommunikationskanal zwischen Clients und Servern herzustellen." #. type: deftypevr -#: doc/guix.texi:20198 doc/guix.texi:20334 +#: doc/guix.texi:20195 doc/guix.texi:20331 msgid "Defaults to @samp{udp}." -msgstr "" +msgstr "Die Vorgabe ist @samp{udp}." #. type: deftypevr -#: doc/guix.texi:20201 +#: doc/guix.texi:20198 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} dev dev" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Gerät dev" #. type: deftypevr -#: doc/guix.texi:20203 doc/guix.texi:20339 +#: doc/guix.texi:20200 doc/guix.texi:20336 msgid "The device type used to represent the VPN connection." -msgstr "" +msgstr "Der Gerätetyp, mit dem die VPN-Verbindung repräsentiert werden soll." #. type: deftypevr -#: doc/guix.texi:20205 doc/guix.texi:20341 +#: doc/guix.texi:20202 doc/guix.texi:20338 msgid "Defaults to @samp{tun}." -msgstr "" +msgstr "Die Vorgabe ist @samp{tun}." #. type: deftypevr -#: doc/guix.texi:20208 +#: doc/guix.texi:20205 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string ca" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Zeichenkette ca" #. type: deftypevr -#: doc/guix.texi:20210 doc/guix.texi:20346 +#: doc/guix.texi:20207 doc/guix.texi:20343 msgid "The certificate authority to check connections against." -msgstr "" +msgstr "Die Zertifikatsautorität, mit der Verbindungen geprüft werden." #. type: deftypevr -#: doc/guix.texi:20212 doc/guix.texi:20348 +#: doc/guix.texi:20209 doc/guix.texi:20345 msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/openvpn/ca.crt\"}." #. type: deftypevr -#: doc/guix.texi:20215 +#: doc/guix.texi:20212 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string cert" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Zeichenkette cert" #. type: deftypevr -#: doc/guix.texi:20218 doc/guix.texi:20354 +#: doc/guix.texi:20215 doc/guix.texi:20351 msgid "The certificate of the machine the daemon is running on. It should be signed by the authority given in @code{ca}." -msgstr "" +msgstr "Das Zertifikat der Maschine, auf der der Daemon läuft. Es sollte von der in @code{ca} angegebenen Zertifikatsautorität signiert sein." #. type: deftypevr -#: doc/guix.texi:20220 doc/guix.texi:20356 +#: doc/guix.texi:20217 doc/guix.texi:20353 msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/openvpn/client.crt\"}." #. type: deftypevr -#: doc/guix.texi:20223 +#: doc/guix.texi:20220 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string key" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Zeichenkette key" #. type: deftypevr -#: doc/guix.texi:20226 doc/guix.texi:20362 +#: doc/guix.texi:20223 doc/guix.texi:20359 msgid "The key of the machine the daemon is running on. It must be the key whose certificate is @code{cert}." -msgstr "" +msgstr "Der Schlüssel der Maschine, auf der der Daemon läuft. Er muss der Schlüssel zum in @code{cert} angegebenen Zertifikat sein." #. type: deftypevr -#: doc/guix.texi:20228 doc/guix.texi:20364 +#: doc/guix.texi:20225 doc/guix.texi:20361 msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/openvpn/client.key\"}." #. type: deftypevr -#: doc/guix.texi:20231 +#: doc/guix.texi:20228 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Boolescher-Ausdruck comp-lzo?" #. type: deftypevr -#: doc/guix.texi:20233 doc/guix.texi:20369 +#: doc/guix.texi:20230 doc/guix.texi:20366 msgid "Whether to use the lzo compression algorithm." -msgstr "" +msgstr "Ob der Kompressionsalgorithmus lzo benutzt werden soll." #. type: deftypevr -#: doc/guix.texi:20238 +#: doc/guix.texi:20235 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Boolescher-Ausdruck persist-key?" #. type: deftypevr -#: doc/guix.texi:20240 doc/guix.texi:20376 +#: doc/guix.texi:20237 doc/guix.texi:20373 msgid "Don't re-read key files across SIGUSR1 or --ping-restart." -msgstr "" +msgstr "Die Schlüsseldateien nach Auftreten von SIGUSR1 oder --ping-restart @emph{nicht} erneut einlesen." #. type: deftypevr -#: doc/guix.texi:20245 +#: doc/guix.texi:20242 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Boolescher-Ausdruck persist-tun?" #. type: deftypevr -#: doc/guix.texi:20248 doc/guix.texi:20384 +#: doc/guix.texi:20245 doc/guix.texi:20381 msgid "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts." -msgstr "" +msgstr "Nach dem Auftreten von SIGUSR1 oder --ping-restart TUN/TAP-Geräte @emph{nicht} schließen und wieder öffnen und auch keine Start-/Stop-Skripte ausführen." #. type: deftypevr -#: doc/guix.texi:20253 +#: doc/guix.texi:20250 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} number verbosity" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Zahl verbosity" #. type: deftypevr -#: doc/guix.texi:20255 doc/guix.texi:20391 +#: doc/guix.texi:20252 doc/guix.texi:20388 msgid "Verbosity level." -msgstr "" +msgstr "Ausführlichkeitsstufe." #. type: deftypevr -#: doc/guix.texi:20257 doc/guix.texi:20393 doc/guix.texi:21706 -#: doc/guix.texi:21929 +#: doc/guix.texi:20254 doc/guix.texi:20390 doc/guix.texi:21703 +#: doc/guix.texi:21926 msgid "Defaults to @samp{3}." -msgstr "" +msgstr "Die Vorgabe ist @samp{3}." #. type: deftypevr -#: doc/guix.texi:20260 +#: doc/guix.texi:20257 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} „tls-auth“-Clienteinstellung tls-auth" #. type: deftypevr -#: doc/guix.texi:20263 doc/guix.texi:20399 +#: doc/guix.texi:20260 doc/guix.texi:20396 msgid "Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks." -msgstr "" +msgstr "Eine weitere HMAC-Authentifizierung zusätzlich zum TLS-Steuerungskanal einsetzen, um das System vor gezielten Überlastungsangriffen („Denial of Service“) zu schützen." #. type: deftypevr -#: doc/guix.texi:20268 +#: doc/guix.texi:20265 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Schlüsselprüfung verify-key-usage?" #. type: deftypevr -#: doc/guix.texi:20270 +#: doc/guix.texi:20267 msgid "Whether to check the server certificate has server usage extension." -msgstr "" +msgstr "Ob sichergestellt werden soll, dass das Server-Zertifikat auch über eine Erweiterung („Extension“) verfügt, dass es für die Nutzung als Server gültig ist." #. type: deftypevr -#: doc/guix.texi:20275 +#: doc/guix.texi:20272 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} bind bind?" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} bind bind?" #. type: deftypevr -#: doc/guix.texi:20277 +#: doc/guix.texi:20274 msgid "Bind to a specific local port number." -msgstr "" +msgstr "Ob an immer dieselbe, feste lokale Portnummer gebunden wird." #. type: deftypevr -#: doc/guix.texi:20282 +#: doc/guix.texi:20279 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} Erneut-Auflösen resolv-retry?" #. type: deftypevr -#: doc/guix.texi:20284 +#: doc/guix.texi:20281 msgid "Retry resolving server address." -msgstr "" +msgstr "Ob, wenn die Server-Adresse nicht aufgelöst werden konnte, die Auflösung erneut versucht wird." #. type: deftypevr -#: doc/guix.texi:20289 +#: doc/guix.texi:20286 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote" -msgstr "" +msgstr "{@code{openvpn-client-configuration}-Parameter} „openvpn-remote-configuration“-Liste remote" #. type: deftypevr -#: doc/guix.texi:20291 +#: doc/guix.texi:20288 msgid "A list of remote servers to connect to." -msgstr "" +msgstr "Eine Liste entfernter Servern, mit denen eine Verbindung hergestellt werden soll." #. type: deftypevr -#: doc/guix.texi:20295 +#: doc/guix.texi:20292 msgid "Available @code{openvpn-remote-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{openvpn-remote-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:20296 +#: doc/guix.texi:20293 #, no-wrap msgid "{@code{openvpn-remote-configuration} parameter} string name" -msgstr "" +msgstr "{@code{openvpn-remote-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:20298 +#: doc/guix.texi:20295 msgid "Server name." -msgstr "" +msgstr "Der Servername." #. type: deftypevr -#: doc/guix.texi:20300 +#: doc/guix.texi:20297 msgid "Defaults to @samp{\"my-server\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"my-server\"}." #. type: deftypevr -#: doc/guix.texi:20303 +#: doc/guix.texi:20300 #, no-wrap msgid "{@code{openvpn-remote-configuration} parameter} number port" -msgstr "" +msgstr "{@code{openvpn-remote-configuration}-Parameter} Zahl port" #. type: deftypevr -#: doc/guix.texi:20305 +#: doc/guix.texi:20302 msgid "Port number the server listens to." -msgstr "" +msgstr "Die Portnummer, auf der der Server lauscht." #. type: deftypevr -#: doc/guix.texi:20307 doc/guix.texi:20408 +#: doc/guix.texi:20304 doc/guix.texi:20405 msgid "Defaults to @samp{1194}." -msgstr "" +msgstr "Die Vorgabe ist @samp{1194}." #. type: Plain text -#: doc/guix.texi:20316 +#: doc/guix.texi:20313 msgid "Available @code{openvpn-server-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{openvpn-server-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:20317 +#: doc/guix.texi:20314 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} package openvpn" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} „package“ openvpn" #. type: deftypevr -#: doc/guix.texi:20322 +#: doc/guix.texi:20319 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string pid-file" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zeichenkette pid-file" #. type: deftypevr -#: doc/guix.texi:20329 +#: doc/guix.texi:20326 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} proto proto" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Protokoll proto" #. type: deftypevr -#: doc/guix.texi:20337 +#: doc/guix.texi:20334 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} dev dev" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Gerät dev" #. type: deftypevr -#: doc/guix.texi:20344 +#: doc/guix.texi:20341 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string ca" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zeichenkette ca" #. type: deftypevr -#: doc/guix.texi:20351 +#: doc/guix.texi:20348 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string cert" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zeichenkette cert" #. type: deftypevr -#: doc/guix.texi:20359 +#: doc/guix.texi:20356 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string key" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zeichenkette key" #. type: deftypevr -#: doc/guix.texi:20367 +#: doc/guix.texi:20364 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Boolescher-Ausdruck comp-lzo?" #. type: deftypevr -#: doc/guix.texi:20374 +#: doc/guix.texi:20371 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Boolescher-Ausdruck persist-key?" #. type: deftypevr -#: doc/guix.texi:20381 +#: doc/guix.texi:20378 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Boolescher-Ausdruck persist-tun?" #. type: deftypevr -#: doc/guix.texi:20389 +#: doc/guix.texi:20386 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number verbosity" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zahl verbosity" #. type: deftypevr -#: doc/guix.texi:20396 +#: doc/guix.texi:20393 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} „tls-auth“-Servereinstellung tls-auth" #. type: deftypevr -#: doc/guix.texi:20404 +#: doc/guix.texi:20401 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number port" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zahl port" #. type: deftypevr -#: doc/guix.texi:20406 +#: doc/guix.texi:20403 msgid "Specifies the port number on which the server listens." -msgstr "" +msgstr "Gibt die Portnummer an, auf der der Server lauscht." #. type: deftypevr -#: doc/guix.texi:20411 +#: doc/guix.texi:20408 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} ip-mask server" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} IP-und-Maske server" #. type: deftypevr -#: doc/guix.texi:20413 +#: doc/guix.texi:20410 msgid "An ip and mask specifying the subnet inside the virtual network." -msgstr "" +msgstr "Eine IP-Adresse gefolgt von deren Maske, die das Subnetz im virtuellen Netzwerk angibt." #. type: deftypevr -#: doc/guix.texi:20415 +#: doc/guix.texi:20412 msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"10.8.0.0 255.255.255.0\"}." #. type: deftypevr -#: doc/guix.texi:20418 +#: doc/guix.texi:20415 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} cidr6 server-ipv6" #. type: deftypevr -#: doc/guix.texi:20420 +#: doc/guix.texi:20417 msgid "A CIDR notation specifying the IPv6 subnet inside the virtual network." -msgstr "" +msgstr "Eine CIDR-Notation, mit der das IPv6-Subnetz im virtuellen Netzwerk angegeben wird." #. type: deftypevr -#: doc/guix.texi:20425 +#: doc/guix.texi:20422 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string dh" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zeichenkette dh" #. type: deftypevr -#: doc/guix.texi:20427 +#: doc/guix.texi:20424 msgid "The Diffie-Hellman parameters file." -msgstr "" +msgstr "Die Datei mit den Diffie-Hellman-Parametern." #. type: deftypevr -#: doc/guix.texi:20429 +#: doc/guix.texi:20426 msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/openvpn/dh2048.pem\"}." #. type: deftypevr -#: doc/guix.texi:20432 +#: doc/guix.texi:20429 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zeichenkette ifconfig-pool-persist" #. type: deftypevr -#: doc/guix.texi:20434 +#: doc/guix.texi:20431 msgid "The file that records client IPs." -msgstr "" +msgstr "Die Datei, in der Client-IPs eingetragen werden." #. type: deftypevr -#: doc/guix.texi:20436 +#: doc/guix.texi:20433 msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/etc/openvpn/ipp.txt\"}." #. type: deftypevr -#: doc/guix.texi:20439 +#: doc/guix.texi:20436 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zugang redirect-gateway?" #. type: deftypevr -#: doc/guix.texi:20441 +#: doc/guix.texi:20438 msgid "When true, the server will act as a gateway for its clients." -msgstr "" +msgstr "Wenn dies auf wahr steht, fungiert der Server als Zugang („Gateway“) für seine Clients." #. type: deftypevr -#: doc/guix.texi:20446 +#: doc/guix.texi:20443 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Boolescher-Ausdruck client-to-client?" #. type: deftypevr -#: doc/guix.texi:20448 +#: doc/guix.texi:20445 msgid "When true, clients are allowed to talk to each other inside the VPN." -msgstr "" +msgstr "Wenn dies auf wahr steht, ist es zugelassen, dass Clients untereinander innerhalb des VPNs kommunizieren." #. type: deftypevr -#: doc/guix.texi:20453 +#: doc/guix.texi:20450 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Aufrechterhaltung keepalive" #. type: deftypevr -#: doc/guix.texi:20459 +#: doc/guix.texi:20456 msgid "Causes ping-like messages to be sent back and forth over the link so that each side knows when the other side has gone down. @code{keepalive} requires a pair. The first element is the period of the ping sending, and the second element is the timeout before considering the other side down." -msgstr "" +msgstr "Lässt ping-artige Nachrichtigen in beide Richtungen über die Leitung übertragen, damit beide Seiten bemerken, wenn der Kommunikationspartner offline geht. Für @code{keepalive} muss ein Paar angegeben werden. Das erste Element ist die Periode, nach der das Pingsignal wieder gesendet werden soll, und das zweite ist eine Zeitbegrenzung, in der eines ankommen muss, damit die andere Seite nicht als offline gilt." #. type: deftypevr -#: doc/guix.texi:20462 +#: doc/guix.texi:20459 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number max-clients" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zahl max-clients" #. type: deftypevr -#: doc/guix.texi:20464 +#: doc/guix.texi:20461 msgid "The maximum number of clients." -msgstr "" +msgstr "Wieviele Clients es höchstens geben kann." #. type: deftypevr -#: doc/guix.texi:20469 +#: doc/guix.texi:20466 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string status" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} Zeichenkette status" #. type: deftypevr -#: doc/guix.texi:20472 +#: doc/guix.texi:20469 msgid "The status file. This file shows a small report on current connection. It is truncated and rewritten every minute." -msgstr "" +msgstr "Die Datei für einen Zustandsbericht („Status File“). Diese Datei enthält einen kurzen Bericht über die momentane Verbindung. Sie wird jede Minute gekürzt und neu geschrieben." #. type: deftypevr -#: doc/guix.texi:20474 +#: doc/guix.texi:20471 msgid "Defaults to @samp{\"/var/run/openvpn/status\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/run/openvpn/status\"}." #. type: deftypevr -#: doc/guix.texi:20477 +#: doc/guix.texi:20474 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir" -msgstr "" +msgstr "{@code{openvpn-server-configuration}-Parameter} „openvpn-ccd-configuration“-Liste client-config-dir" #. type: deftypevr -#: doc/guix.texi:20479 +#: doc/guix.texi:20476 msgid "The list of configuration for some clients." -msgstr "" +msgstr "Die Liste der Konfigurationen für einige Clients." #. type: deftypevr -#: doc/guix.texi:20483 +#: doc/guix.texi:20480 msgid "Available @code{openvpn-ccd-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{openvpn-ccd-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:20484 +#: doc/guix.texi:20481 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} string name" -msgstr "" +msgstr "{@code{openvpn-ccd-configuration}-Parameter} Zeichenkette name" #. type: deftypevr -#: doc/guix.texi:20486 +#: doc/guix.texi:20483 msgid "Client name." -msgstr "" +msgstr "Der Client-Name." #. type: deftypevr -#: doc/guix.texi:20488 +#: doc/guix.texi:20485 msgid "Defaults to @samp{\"client\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"client\"}." #. type: deftypevr -#: doc/guix.texi:20491 +#: doc/guix.texi:20488 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute" -msgstr "" +msgstr "{@code{openvpn-ccd-configuration}-Parameter} IP-und-Maske iroute" #. type: deftypevr -#: doc/guix.texi:20493 +#: doc/guix.texi:20490 msgid "Client own network" -msgstr "" +msgstr "Das eigene Netzwerk des Clients." #. type: deftypevr -#: doc/guix.texi:20498 +#: doc/guix.texi:20495 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push" -msgstr "" +msgstr "{@code{openvpn-ccd-configuration}-Parameter} IP-und-Maske ifconfig-push" #. type: deftypevr -#: doc/guix.texi:20500 +#: doc/guix.texi:20497 msgid "Client VPN IP." -msgstr "" +msgstr "VPN-IP-Adresse des Clients." #. type: cindex -#: doc/guix.texi:20513 +#: doc/guix.texi:20510 #, no-wrap msgid "NFS" -msgstr "" +msgstr "NFS" #. type: Plain text -#: doc/guix.texi:20518 +#: doc/guix.texi:20515 msgid "The @code{(gnu services nfs)} module provides the following services, which are most commonly used in relation to mounting or exporting directory trees as @dfn{network file systems} (NFS)." -msgstr "" +msgstr "Das Modul @code{(gnu services nfs)} stellt die folgenden Dienste zur Verfügung, die meistens dazu benutzt werden, Verzeichnisbäume als Netzwerkdateisysteme, englisch @dfn{Network File Systems} (NFS), einzubinden oder an andere zu exportieren." #. type: subsubheading -#: doc/guix.texi:20519 +#: doc/guix.texi:20516 #, no-wrap msgid "RPC Bind Service" -msgstr "" +msgstr "RPC-Bind-Dienst" #. type: cindex -#: doc/guix.texi:20520 +#: doc/guix.texi:20517 #, no-wrap msgid "rpcbind" -msgstr "" +msgstr "rpcbind" #. type: Plain text -#: doc/guix.texi:20526 +#: doc/guix.texi:20523 msgid "The RPC Bind service provides a facility to map program numbers into universal addresses. Many NFS related services use this facility. Hence it is automatically started when a dependent service starts." -msgstr "" +msgstr "Mit dem RPC-Bind-Dienst können Programmnummern auf universelle Adressen abgebildet werden. Viele Dienste, die mit dem NFS zu tun haben, benutzen diese Funktion, daher wird sie automatisch gestartet, sobald ein davon abhängiger Dienst startet." #. type: defvr -#: doc/guix.texi:20527 +#: doc/guix.texi:20524 #, no-wrap msgid "{Scheme Variable} rpcbind-service-type" -msgstr "" +msgstr "{Scheme-Variable} rpcbind-service-type" #. type: defvr -#: doc/guix.texi:20529 +#: doc/guix.texi:20526 msgid "A service type for the RPC portmapper daemon." -msgstr "" +msgstr "Ein Diensttyp für den RPC-Portplaner-Daemon („Portmapper“)." #. type: deftp -#: doc/guix.texi:20532 +#: doc/guix.texi:20529 #, no-wrap msgid "{Data Type} rpcbind-configuration" -msgstr "" +msgstr "{Datentyp} rpcbind-configuration" #. type: deftp -#: doc/guix.texi:20535 +#: doc/guix.texi:20532 msgid "Data type representing the configuration of the RPC Bind Service. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration des RPC-Bind-Dienstes repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:20536 +#: doc/guix.texi:20533 #, no-wrap msgid "@code{rpcbind} (default: @code{rpcbind})" -msgstr "" +msgstr "@code{rpcbind} (Vorgabe: @code{rpcbind})" #. type: table -#: doc/guix.texi:20538 +#: doc/guix.texi:20535 msgid "The rpcbind package to use." -msgstr "" +msgstr "Das rpcbind-Paket, das benutzt werden soll." #. type: item -#: doc/guix.texi:20539 +#: doc/guix.texi:20536 #, no-wrap msgid "@code{warm-start?} (default: @code{#t})" -msgstr "" +msgstr "@code{warm-start?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:20543 +#: doc/guix.texi:20540 msgid "If this parameter is @code{#t}, then the daemon will read a state file on startup thus reloading state information saved by a previous instance." -msgstr "" +msgstr "Wenn dieser Parameter @code{#t} ist, wird der Daemon beim Starten eine Zustandsdatei („State File“) lesen, aus der er die von der vorherigen Instanz gespeicherten Zustandsinformationen wiederherstellt." #. type: subsubheading -#: doc/guix.texi:20547 +#: doc/guix.texi:20544 #, no-wrap msgid "Pipefs Pseudo File System" -msgstr "" +msgstr "Pipefs-Pseudodateisystem" #. type: cindex -#: doc/guix.texi:20548 +#: doc/guix.texi:20545 #, no-wrap msgid "pipefs" -msgstr "" +msgstr "pipefs" #. type: cindex -#: doc/guix.texi:20549 +#: doc/guix.texi:20546 #, no-wrap msgid "rpc_pipefs" -msgstr "" +msgstr "rpc_pipefs" #. type: Plain text -#: doc/guix.texi:20553 +#: doc/guix.texi:20550 msgid "The pipefs file system is used to transfer NFS related data between the kernel and user space programs." -msgstr "" +msgstr "Mit dem Pipefs-Dateisystem können NFS-bezogene Daten zwischen dem Kernel und Programmen auf der Anwendungsebene (dem „User Space“) übertragen werden." #. type: defvr -#: doc/guix.texi:20554 +#: doc/guix.texi:20551 #, no-wrap msgid "{Scheme Variable} pipefs-service-type" -msgstr "" +msgstr "{Scheme-Variable} pipefs-service-type" #. type: defvr -#: doc/guix.texi:20556 +#: doc/guix.texi:20553 msgid "A service type for the pipefs pseudo file system." -msgstr "" +msgstr "Ein Diensttyp für das Pseudodateisystem „Pipefs“." #. type: deftp -#: doc/guix.texi:20558 +#: doc/guix.texi:20555 #, no-wrap msgid "{Data Type} pipefs-configuration" -msgstr "" +msgstr "{Datentyp} pipefs-configuration" #. type: deftp -#: doc/guix.texi:20561 +#: doc/guix.texi:20558 msgid "Data type representing the configuration of the pipefs pseudo file system service. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration des Pipefs-Pseudodateisystemdienstes repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:20562 +#: doc/guix.texi:20559 #, no-wrap msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" -msgstr "" +msgstr "@code{mount-point} (Vorgabe: @code{\"/var/lib/nfs/rpc_pipefs\"})" #. type: table -#: doc/guix.texi:20564 +#: doc/guix.texi:20561 msgid "The directory to which the file system is to be attached." -msgstr "" +msgstr "Das Verzeichnis, unter dem das Dateisystem eingebunden werden soll." #. type: subsubheading -#: doc/guix.texi:20568 +#: doc/guix.texi:20565 #, no-wrap msgid "GSS Daemon Service" -msgstr "" +msgstr "GSS-Daemon-Dienst" #. type: cindex -#: doc/guix.texi:20569 +#: doc/guix.texi:20566 #, no-wrap msgid "GSSD" -msgstr "" +msgstr "GSSD" #. type: cindex -#: doc/guix.texi:20570 +#: doc/guix.texi:20567 #, no-wrap msgid "GSS" -msgstr "" +msgstr "GSS" #. type: cindex -#: doc/guix.texi:20571 +#: doc/guix.texi:20568 #, no-wrap msgid "global security system" -msgstr "" +msgstr "Global Security System" #. type: Plain text -#: doc/guix.texi:20578 +#: doc/guix.texi:20575 msgid "The @dfn{global security system} (GSS) daemon provides strong security for RPC based protocols. Before exchanging RPC requests an RPC client must establish a security context. Typically this is done using the Kerberos command @command{kinit} or automatically at login time using PAM services (@pxref{Kerberos Services})." -msgstr "" +msgstr "Der Daemon des @dfn{Global Security System} (GSS) ermöglicht starke Informationssicherheit für RPC-basierte Protokolle. Vor dem Austausch von Anfragen über entfernte Prozeduraufrufe („Remote Procedure Calls“, kurz RPC) muss ein RPC-Client einen Sicherheitskontext („Security Context“) herstellen. Typischerweise wird dazu der @command{kinit}-Befehl von Kerberos benutzt, oder er wird automatisch bei der Anmeldung über PAM-Dienste hergestellt (siehe @ref{Kerberos Services})." #. type: defvr -#: doc/guix.texi:20579 +#: doc/guix.texi:20576 #, no-wrap msgid "{Scheme Variable} gss-service-type" -msgstr "" +msgstr "{Scheme-Variable} gss-service-type" #. type: defvr -#: doc/guix.texi:20581 +#: doc/guix.texi:20578 msgid "A service type for the Global Security System (GSS) daemon." -msgstr "" +msgstr "Ein Diensttyp für den Daemon des Global Security System (GSS)." #. type: deftp -#: doc/guix.texi:20583 +#: doc/guix.texi:20580 #, no-wrap msgid "{Data Type} gss-configuration" -msgstr "" +msgstr "{Datentyp} gss-configuration" #. type: deftp -#: doc/guix.texi:20586 +#: doc/guix.texi:20583 msgid "Data type representing the configuration of the GSS daemon service. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration des GSS-Daemon-Dienstes repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: item -#: doc/guix.texi:20587 doc/guix.texi:20612 +#: doc/guix.texi:20584 doc/guix.texi:20609 #, no-wrap msgid "@code{nfs-utils} (default: @code{nfs-utils})" -msgstr "" +msgstr "@code{nfs-utils} (Vorgabe: @code{nfs-utils})" #. type: table -#: doc/guix.texi:20589 +#: doc/guix.texi:20586 msgid "The package in which the @command{rpc.gssd} command is to be found." -msgstr "" +msgstr "Das Paket, in dem der Befehl @command{rpc.gssd} gesucht werden soll." #. type: item -#: doc/guix.texi:20590 doc/guix.texi:20615 +#: doc/guix.texi:20587 doc/guix.texi:20612 #, no-wrap msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" -msgstr "" +msgstr "@code{pipefs-directory} (Vorgabe: @code{\"/var/lib/nfs/rpc_pipefs\"})" #. type: table -#: doc/guix.texi:20592 doc/guix.texi:20617 +#: doc/guix.texi:20589 doc/guix.texi:20614 msgid "The directory where the pipefs file system is mounted." -msgstr "" +msgstr "Das Verzeichnis, unter dem das Pipefs-Dateisystem eingebunden wurde." #. type: subsubheading -#: doc/guix.texi:20597 +#: doc/guix.texi:20594 #, no-wrap msgid "IDMAP Daemon Service" -msgstr "" +msgstr "IDMAP-Daemon-Dienst" #. type: cindex -#: doc/guix.texi:20598 +#: doc/guix.texi:20595 #, no-wrap msgid "idmapd" -msgstr "" +msgstr "idmapd" #. type: cindex -#: doc/guix.texi:20599 +#: doc/guix.texi:20596 #, no-wrap msgid "name mapper" -msgstr "" +msgstr "Name-Mapper" #. type: Plain text -#: doc/guix.texi:20603 +#: doc/guix.texi:20600 msgid "The idmap daemon service provides mapping between user IDs and user names. Typically it is required in order to access file systems mounted via NFSv4." -msgstr "" +msgstr "Der idmap-Daemon-Dienst ermöglicht eine Abbildung zwischen Benutzeridentifikatoren und Benutzernamen. Er wird in der Regel dafür benötigt, auf über NFSv4 eingebundene Dateisysteme zuzugreifen." #. type: defvr -#: doc/guix.texi:20604 +#: doc/guix.texi:20601 #, no-wrap msgid "{Scheme Variable} idmap-service-type" -msgstr "" +msgstr "{Scheme-Variable} idmap-service-type" #. type: defvr -#: doc/guix.texi:20606 +#: doc/guix.texi:20603 msgid "A service type for the Identity Mapper (IDMAP) daemon." -msgstr "" +msgstr "Ein Diensttyp für den Identity-Mapper-Daemon (IDMAP)." #. type: deftp -#: doc/guix.texi:20608 +#: doc/guix.texi:20605 #, no-wrap msgid "{Data Type} idmap-configuration" -msgstr "" +msgstr "{Datentyp} idmap-configuration" #. type: deftp -#: doc/guix.texi:20611 +#: doc/guix.texi:20608 msgid "Data type representing the configuration of the IDMAP daemon service. This type has the following parameters:" -msgstr "" +msgstr "Datentyp, der die Konfiguration des IDMAP-Daemon-Dienstes repräsentiert. Dieser Typ verfügt über die folgenden Parameter:" #. type: table -#: doc/guix.texi:20614 +#: doc/guix.texi:20611 msgid "The package in which the @command{rpc.idmapd} command is to be found." -msgstr "" +msgstr "Das Paket, in dem der Befehl @command{rpc.idmapd} gesucht werden soll." #. type: item -#: doc/guix.texi:20618 +#: doc/guix.texi:20615 #, no-wrap msgid "@code{domain} (default: @code{#f})" -msgstr "" +msgstr "@code{domain} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20622 +#: doc/guix.texi:20619 msgid "The local NFSv4 domain name. This must be a string or @code{#f}. If it is @code{#f} then the daemon will use the host's fully qualified domain name." -msgstr "" +msgstr "Der lokale NFSv4-Domain-Name. Für ihn muss eine Zeichenkette oder @code{#f} angegeben werden. Wenn @code{#f} angegeben wird, benutzt der Daemon den vollständigen Domain-Namen („Fully Qualified Domain Name“) des Rechners." #. type: Plain text -#: doc/guix.texi:20633 +#: doc/guix.texi:20630 msgid "@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} is a continuous integration tool for Guix. It can be used both for development and for providing substitutes to others (@pxref{Substitutes})." -msgstr "" +msgstr "@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} ist ein Werkzeug zur kontinuierlichen Integration für Guix. Es kann sowohl bei der Entwicklung helfen als auch beim Anbieten von Substituten für andere (siehe @ref{Substitutes})." #. type: Plain text -#: doc/guix.texi:20635 +#: doc/guix.texi:20632 msgid "The @code{(gnu services cuirass)} module provides the following service." -msgstr "" +msgstr "Das Modul @code{(gnu services cuirass)} stellt den folgenden Dienst zur Verfügung:" #. type: defvr -#: doc/guix.texi:20636 +#: doc/guix.texi:20633 #, no-wrap msgid "{Scheme Procedure} cuirass-service-type" -msgstr "" +msgstr "{Scheme-Prozedur} cuirass-service-type" #. type: defvr -#: doc/guix.texi:20639 +#: doc/guix.texi:20636 msgid "The type of the Cuirass service. Its value must be a @code{cuirass-configuration} object, as described below." -msgstr "" +msgstr "Der Diensttyp des Cuirass-Dienstes. Sein Wert muss ein @code{cuirass-configuration}-Verbundsobjekt sein, wie im Folgenden beschrieben." #. type: Plain text -#: doc/guix.texi:20646 +#: doc/guix.texi:20643 msgid "To add build jobs, you have to set the @code{specifications} field of the configuration. Here is an example of a service that polls the Guix repository and builds the packages from a manifest. Some of the packages are defined in the @code{\"custom-packages\"} input, which is the equivalent of @code{GUIX_PACKAGE_PATH}." -msgstr "" +msgstr "Um Erstellungsaufträge („Build Jobs“) hinzuzufügen, müssen Sie sie im @code{specifications}-Feld der Konfiguration eintragen. Hier ist ein Beispiel für einen Dienst, der das Guix-Repository regelmäßig lädt und die Pakete aus einem der Manifeste erstellt. Manche der Pakete werden in der Eingabe @code{\"eigene-pakete\"} definiert, was als @code{GUIX_PACKAGE_PATH} benutzt wird." #. type: example -#: doc/guix.texi:20674 +#: doc/guix.texi:20671 #, no-wrap msgid "" "(define %cuirass-specs\n" @@ -38669,1116 +38863,1146 @@ msgid "" " (#:no-compile? . #t)))))))\n" "\n" msgstr "" +"(define %cuirass-specs\n" +" #~(list\n" +" '((#:name . \"my-manifest\")\n" +" (#:load-path-inputs . (\"guix\"))\n" +" (#:package-path-inputs . (\"eigene-pakete\"))\n" +" (#:proc-input . \"guix\")\n" +" (#:proc-file . \"build-aux/cuirass/gnu-system.scm\")\n" +" (#:proc . cuirass-jobs)\n" +" (#:proc-args . ((subset . \"manifests\")\n" +" (systems . (\"x86_64-linux\"))\n" +" (manifests . ((\"config\" . \"guix/manifest.scm\")))))\n" +" (#:inputs . (((#:name . \"guix\")\n" +" (#:url . \"git://git.savannah.gnu.org/guix.git\")\n" +" (#:load-path . \".\")\n" +" (#:branch . \"master\")\n" +" (#:no-compile? . #t))\n" +" ((#:name . \"config\")\n" +" (#:url . \"git://git.example.org/config.git\")\n" +" (#:load-path . \".\")\n" +" (#:branch . \"master\")\n" +" (#:no-compile? . #t))\n" +" ((#:name . \"eigene-pakete\")\n" +" (#:url . \"git://git.example.org/eigene-pakete.git\")\n" +" (#:load-path . \".\")\n" +" (#:branch . \"master\")\n" +" (#:no-compile? . #t)))))))\n" +"\n" #. type: example -#: doc/guix.texi:20678 +#: doc/guix.texi:20675 #, no-wrap msgid "" "(service cuirass-service-type\n" " (cuirass-configuration\n" " (specifications %cuirass-specs)))\n" msgstr "" +"(service cuirass-service-type\n" +" (cuirass-configuration\n" +" (specifications %cuirass-specs)))\n" #. type: Plain text -#: doc/guix.texi:20683 +#: doc/guix.texi:20680 msgid "While information related to build jobs is located directly in the specifications, global settings for the @command{cuirass} process are accessible in other @code{cuirass-configuration} fields." -msgstr "" +msgstr "Die Informationen, die sich auf Erstellungsaufträge beziehen, werden direkt in deren Spezifikation festgelegt, aber globale Einstellungen des @command{cuirass}-Prozesses sind über andere Felder der @code{cuirass-configuration} zugänglich." #. type: deftp -#: doc/guix.texi:20684 +#: doc/guix.texi:20681 #, no-wrap msgid "{Data Type} cuirass-configuration" -msgstr "" +msgstr "{Datentyp} cuirass-configuration" #. type: deftp -#: doc/guix.texi:20686 +#: doc/guix.texi:20683 msgid "Data type representing the configuration of Cuirass." -msgstr "" +msgstr "Datentyp, der die Konfiguration von Cuirass repräsentiert." #. type: item -#: doc/guix.texi:20688 +#: doc/guix.texi:20685 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})" -msgstr "" +msgstr "@code{log-file} (Vorgabe: @code{\"/var/log/cuirass.log\"})" #. type: table -#: doc/guix.texi:20690 +#: doc/guix.texi:20687 msgid "Location of the log file." -msgstr "" +msgstr "An welchen Ort die Protokolldatei geschrieben wird." #. type: item -#: doc/guix.texi:20691 +#: doc/guix.texi:20688 #, no-wrap msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})" -msgstr "" +msgstr "@code{cache-directory} (Vorgabe: @code{\"/var/cache/cuirass\"})" #. type: table -#: doc/guix.texi:20693 +#: doc/guix.texi:20690 msgid "Location of the repository cache." -msgstr "" +msgstr "Ort, wo Repositorys zwischengespeichert werden." #. type: item -#: doc/guix.texi:20694 +#: doc/guix.texi:20691 #, no-wrap msgid "@code{user} (default: @code{\"cuirass\"})" -msgstr "" +msgstr "@code{user} (Vorgabe: @code{\"cuirass\"})" #. type: table -#: doc/guix.texi:20696 +#: doc/guix.texi:20693 msgid "Owner of the @code{cuirass} process." -msgstr "" +msgstr "Besitzer des @code{cuirass}-Prozesses." #. type: item -#: doc/guix.texi:20697 +#: doc/guix.texi:20694 #, no-wrap msgid "@code{group} (default: @code{\"cuirass\"})" -msgstr "" +msgstr "@code{group} (Vorgabe: @code{\"cuirass\"})" #. type: table -#: doc/guix.texi:20699 +#: doc/guix.texi:20696 msgid "Owner's group of the @code{cuirass} process." -msgstr "" +msgstr "Gruppe des Besitzers des @code{cuirass}-Prozesses." #. type: item -#: doc/guix.texi:20700 +#: doc/guix.texi:20697 #, no-wrap msgid "@code{interval} (default: @code{60})" -msgstr "" +msgstr "@code{interval} (Vorgabe: @code{60})" #. type: table -#: doc/guix.texi:20703 +#: doc/guix.texi:20700 msgid "Number of seconds between the poll of the repositories followed by the Cuirass jobs." -msgstr "" +msgstr "Anzahl der Sekunden, bevor ein Repository wieder neu geladen wird und danach Cuirass-Aufträge behandelt werden." #. type: item -#: doc/guix.texi:20704 +#: doc/guix.texi:20701 #, no-wrap msgid "@code{database} (default: @code{\"/var/lib/cuirass/cuirass.db\"})" msgstr "@code{database} (Vorgabe: @code{\"/var/lib/cuirass/cuirass.db\"})" #. type: table -#: doc/guix.texi:20707 +#: doc/guix.texi:20704 msgid "Location of sqlite database which contains the build results and previously added specifications." -msgstr "" +msgstr "An welchem Ort sich die sqlite-Datenbank befinden soll, die die Erstellungsergebnisse und bisher hinzugefügte Spezifikationen speichert." #. type: item -#: doc/guix.texi:20708 +#: doc/guix.texi:20705 #, no-wrap msgid "@code{ttl} (default: @code{(* 30 24 3600)})" msgstr "@code{ttl} (Vorgabe: @code{(* 30 24 3600)})" #. type: table -#: doc/guix.texi:20712 +#: doc/guix.texi:20709 msgid "Specifies the time-to-live (TTL) in seconds of garbage collector roots that are registered for build results. This means that build results are protected from garbage collection for at least @var{ttl} seconds." -msgstr "" +msgstr "Gibt an, wieviele Sekunden für Erstellungsergebnisse registrierte Müllsammlerwurzeln gültig bleiben („Time-to-live“, kurz TTL). Dadurch werden Erstellungsergebnisse für mindestens @var{ttl}-viele Sekunden geschützt." #. type: item -#: doc/guix.texi:20713 +#: doc/guix.texi:20710 #, no-wrap msgid "@code{port} (default: @code{8081})" -msgstr "" +msgstr "@code{port} (Vortrag: @code{8081})" #. type: table -#: doc/guix.texi:20715 +#: doc/guix.texi:20712 msgid "Port number used by the HTTP server." -msgstr "" +msgstr "Portnummer, die vom HTTP-Server benutzt wird." #. type: table -#: doc/guix.texi:20719 +#: doc/guix.texi:20716 msgid "Listen on the network interface for @var{host}. The default is to accept connections from localhost." -msgstr "" +msgstr "Auf der Netzwerkschnittstelle für den Rechnernamen @var{host} lauschen. Nach Vorgabe werden Verbindungen vom lokalen Rechner @code{localhost} akzeptiert." #. type: item -#: doc/guix.texi:20720 +#: doc/guix.texi:20717 #, no-wrap msgid "@code{specifications} (default: @code{#~'()})" -msgstr "" +msgstr "@code{specifications} (Vorgabe: @code{#~'()})" #. type: table -#: doc/guix.texi:20726 +#: doc/guix.texi:20723 msgid "A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, where a specification is an association list (@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-example}) as shown in the example above." -msgstr "" +msgstr "Ein G-Ausdruck (siehe @ref{G-Expressions}), der zu einer Liste von Spezifikationen ausgewertet wird, wobei jede Spezifikation eine assoziative Liste ist (siehe @ref{Associations Lists,,, guile, GNU Guile Reference Manual}), deren Schlüssel Schlüsselwörter sind („Keywords“ wie z.B.@: @code{#:beispiel-für-ein-schlüsselwort}), wie im Beispiel oben gezeigt." #. type: item -#: doc/guix.texi:20727 +#: doc/guix.texi:20724 #, no-wrap msgid "@code{use-substitutes?} (default: @code{#f})" -msgstr "" +msgstr "@code{use-substitutes?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20730 +#: doc/guix.texi:20727 msgid "This allows using substitutes to avoid building every dependencies of a job from source." -msgstr "" +msgstr "Hierdurch wird zugelassen, Substitute zu benutzen, damit @emph{nicht} jede Abhängigkeit eines Auftrags erst aus ihrem Quellcode heraus erstellt werden muss." #. type: item -#: doc/guix.texi:20731 doc/guix.texi:25300 +#: doc/guix.texi:20728 doc/guix.texi:25286 #, no-wrap msgid "@code{one-shot?} (default: @code{#f})" -msgstr "" +msgstr "@code{one-shot?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20733 +#: doc/guix.texi:20730 msgid "Only evaluate specifications and build derivations once." -msgstr "" +msgstr "Spezifikationen nur einmal auswerten und Ableitungen nur einmal erstellen." #. type: item -#: doc/guix.texi:20734 +#: doc/guix.texi:20731 #, no-wrap msgid "@code{fallback?} (default: @code{#f})" -msgstr "" +msgstr "@code{fallback?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:20737 +#: doc/guix.texi:20734 msgid "When substituting a pre-built binary fails, fall back to building packages locally." -msgstr "" +msgstr "Pakete lokal erstellen, wenn das Substituieren einer vorerstellten Binärdatei fehlschlägt." #. type: item -#: doc/guix.texi:20738 +#: doc/guix.texi:20735 #, no-wrap msgid "@code{cuirass} (default: @code{cuirass})" -msgstr "" +msgstr "@code{cuirass} (Vorgabe: @code{cuirass})" #. type: table -#: doc/guix.texi:20740 +#: doc/guix.texi:20737 msgid "The Cuirass package to use." -msgstr "" +msgstr "Das Cuirass-Paket, das benutzt werden soll." #. type: cindex -#: doc/guix.texi:20746 +#: doc/guix.texi:20743 #, no-wrap msgid "tlp" -msgstr "" +msgstr "TLP" #. type: cindex -#: doc/guix.texi:20747 +#: doc/guix.texi:20744 #, no-wrap msgid "power management with TLP" -msgstr "" +msgstr "Stromverbrauch mit TLP verwalten" #. type: subsubheading -#: doc/guix.texi:20748 +#: doc/guix.texi:20745 #, no-wrap msgid "TLP daemon" msgstr "TLP-Daemon" #. type: Plain text -#: doc/guix.texi:20752 +#: doc/guix.texi:20749 msgid "The @code{(gnu services pm)} module provides a Guix service definition for the Linux power management tool TLP." -msgstr "" +msgstr "Das Modul @code{(gnu services pm)} stellt eine Guix-Dienstdefinition für das Linux-Werkzeug TLP zur Stromverbrauchsverwaltung zur Verfügung." #. type: Plain text -#: doc/guix.texi:20758 +#: doc/guix.texi:20755 msgid "TLP enables various powersaving modes in userspace and kernel. Contrary to @code{upower-service}, it is not a passive, monitoring tool, as it will apply custom settings each time a new power source is detected. More information can be found at @uref{https://linrunner.de/en/tlp/tlp.html, TLP home page}." -msgstr "" +msgstr "TLP macht mehrere Stromspar-Modi auf Anwendungsebene („User Space“) und im Kernel verfügbar. Im Gegensatz zum @code{upower-service} handelt es sich um kein passives Werkzeug zur Überwachung, sondern TLP passt selbst jedes Mal Einstellungen an, wenn eine neue Stromquelle erkannt wird. Mehr Informationen finden Sie auf der @uref{https://linrunner.de/en/tlp/tlp.html, TLP-Homepage}." #. type: deffn -#: doc/guix.texi:20759 +#: doc/guix.texi:20756 #, no-wrap msgid "{Scheme Variable} tlp-service-type" -msgstr "" +msgstr "{Scheme-Variable} tlp-service-type" #. type: deffn -#: doc/guix.texi:20763 +#: doc/guix.texi:20760 msgid "The service type for the TLP tool. Its value should be a valid TLP configuration (see below). To use the default settings, simply write:" -msgstr "" +msgstr "Der Diensttyp für das TLP-Werkzeug. Sein Wert sollte eine gültige TLP-Konfiguration sein (siehe unten). Um die Vorgabeeinstellungen zu verwenden, schreiben Sie einfach:" #. type: example -#: doc/guix.texi:20765 +#: doc/guix.texi:20762 #, no-wrap msgid "(service tlp-service-type)\n" -msgstr "" +msgstr "(service tlp-service-type)\n" #. type: Plain text -#: doc/guix.texi:20770 +#: doc/guix.texi:20767 msgid "By default TLP does not need much configuration but most TLP parameters can be tweaked using @code{tlp-configuration}." -msgstr "" +msgstr "Um die Vorgaben für TLP zu benutzen, müssen Sie also nur wenig in die Konfiguration schreiben, aber Sie können die meisten TLP-Parameter über die @code{tlp-configuration} anpassen." #. type: Plain text -#: doc/guix.texi:20776 +#: doc/guix.texi:20773 msgid "Each parameter definition is preceded by its type; for example, @samp{boolean foo} indicates that the @code{foo} parameter should be specified as a boolean. Types starting with @code{maybe-} denote parameters that won't show up in TLP config file when their value is @code{'disabled}." -msgstr "" +msgstr "Im Folgenden ist jeder Parameterdefinition ihr Typ vorangestellt. Zum Beispiel bedeutet @samp{Boolescher-Ausdruck foo}, dass der Parameter @code{foo} als boolescher Ausdruck festgelegt werden sollte. Typen, die mit @code{Vielleicht-} beginnen, bezeichnen Parameter, die nicht in der TLP-Konfigurationsdatei vorkommen, wenn @code{'disabled} als ihr Wert angegeben wurde." #. type: Plain text -#: doc/guix.texi:20786 +#: doc/guix.texi:20783 msgid "Available @code{tlp-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{tlp-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:20787 +#: doc/guix.texi:20784 #, no-wrap msgid "{@code{tlp-configuration} parameter} package tlp" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} „package“ tlp" #. type: deftypevr -#: doc/guix.texi:20789 +#: doc/guix.texi:20786 msgid "The TLP package." -msgstr "" +msgstr "Das TLP-Paket." #. type: deftypevr -#: doc/guix.texi:20792 +#: doc/guix.texi:20789 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck tlp-enable?" #. type: deftypevr -#: doc/guix.texi:20794 +#: doc/guix.texi:20791 msgid "Set to true if you wish to enable TLP." -msgstr "" +msgstr "Setzen Sie dies auf wahr, wenn Sie TLP aktivieren möchten." #. type: deftypevr -#: doc/guix.texi:20799 +#: doc/guix.texi:20796 #, no-wrap msgid "{@code{tlp-configuration} parameter} string tlp-default-mode" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette tlp-default-mode" #. type: deftypevr -#: doc/guix.texi:20802 +#: doc/guix.texi:20799 msgid "Default mode when no power supply can be detected. Alternatives are AC and BAT." -msgstr "" +msgstr "Der vorgegebene Modus, wenn keine Stromversorgung gefunden werden kann. Angegeben werden können AC (am Stromnetz) und BAT (Batterie/Akku)." #. type: deftypevr -#: doc/guix.texi:20804 +#: doc/guix.texi:20801 msgid "Defaults to @samp{\"AC\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"AC\"}." #. type: deftypevr -#: doc/guix.texi:20807 +#: doc/guix.texi:20804 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Nichtnegative-ganze-Zahl disk-idle-secs-on-ac" #. type: deftypevr -#: doc/guix.texi:20810 +#: doc/guix.texi:20807 msgid "Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC." -msgstr "" +msgstr "Die Anzahl an Sekunden, die der Linux-Kernel warten muss, bis er sich mit dem Plattenspeicher synchronisiert, wenn die Stromversorgung auf AC steht." #. type: deftypevr -#: doc/guix.texi:20815 +#: doc/guix.texi:20812 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Nichtnegative-ganze-Zahl disk-idle-secs-on-bat" #. type: deftypevr -#: doc/guix.texi:20817 +#: doc/guix.texi:20814 msgid "Same as @code{disk-idle-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{disk-idle-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20819 +#: doc/guix.texi:20816 msgid "Defaults to @samp{2}." -msgstr "" +msgstr "Die Vorgabe ist @samp{2}." #. type: deftypevr -#: doc/guix.texi:20822 +#: doc/guix.texi:20819 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Nichtnegative-ganze-Zahl max-lost-work-secs-on-ac" #. type: deftypevr -#: doc/guix.texi:20824 +#: doc/guix.texi:20821 msgid "Dirty pages flushing periodicity, expressed in seconds." -msgstr "" +msgstr "Periodizität, mit der im Zwischenspeicher geänderte Speicherseiten („Dirty Pages“) synchronisiert werden („Cache Flush“), ausgedrückt in Sekunden." #. type: deftypevr -#: doc/guix.texi:20826 doc/guix.texi:21049 doc/guix.texi:22378 -#: doc/guix.texi:22386 +#: doc/guix.texi:20823 doc/guix.texi:21046 doc/guix.texi:22375 +#: doc/guix.texi:22383 msgid "Defaults to @samp{15}." -msgstr "" +msgstr "Die Vorgabe ist @samp{15}." #. type: deftypevr -#: doc/guix.texi:20829 +#: doc/guix.texi:20826 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Nichtnegative-ganze-Zahl max-lost-work-secs-on-bat" #. type: deftypevr -#: doc/guix.texi:20831 +#: doc/guix.texi:20828 msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{max-lost-work-secs-on-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20833 +#: doc/guix.texi:20830 msgid "Defaults to @samp{60}." -msgstr "" +msgstr "Die Vorgabe ist @samp{60}." #. type: deftypevr -#: doc/guix.texi:20836 +#: doc/guix.texi:20833 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Leerzeichengetrennte-Zeichenketten-Liste cpu-scaling-governor-on-ac" #. type: deftypevr -#: doc/guix.texi:20840 +#: doc/guix.texi:20837 msgid "CPU frequency scaling governor on AC mode. With intel_pstate driver, alternatives are powersave and performance. With acpi-cpufreq driver, alternatives are ondemand, powersave, performance and conservative." -msgstr "" +msgstr "Regulator der Frequenzskalierung der CPUs („Frequency Scaling Governor“) im AC-Modus. Beim intel_pstate-Treiber stehen powersave (stromsparend) und performance (leistungsfähig) zur Auswahl. Beim acpi-cpufreq-Treiber stehen ondemand, powersave, performance und conservative zur Auswahl." #. type: deftypevr -#: doc/guix.texi:20845 +#: doc/guix.texi:20842 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Leerzeichengetrennte-Zeichenketten-Liste cpu-scaling-governor-on-bat" #. type: deftypevr -#: doc/guix.texi:20847 +#: doc/guix.texi:20844 msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{cpu-scaling-governor-on-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20852 +#: doc/guix.texi:20849 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-scaling-min-freq-on-ac" #. type: deftypevr -#: doc/guix.texi:20854 +#: doc/guix.texi:20851 msgid "Set the min available frequency for the scaling governor on AC." -msgstr "" +msgstr "Legt die minimale verfügbare Frequenz für den Skalierungsregulator im AC-Modus fest." #. type: deftypevr -#: doc/guix.texi:20859 +#: doc/guix.texi:20856 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-scaling-max-freq-on-ac" #. type: deftypevr -#: doc/guix.texi:20861 +#: doc/guix.texi:20858 msgid "Set the max available frequency for the scaling governor on AC." -msgstr "" +msgstr "Legt die maximale verfügbare Frequenz für den Skalierungsregulator im AC-Modus fest." #. type: deftypevr -#: doc/guix.texi:20866 +#: doc/guix.texi:20863 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-scaling-min-freq-on-bat" #. type: deftypevr -#: doc/guix.texi:20868 +#: doc/guix.texi:20865 msgid "Set the min available frequency for the scaling governor on BAT." -msgstr "" +msgstr "Legt die minimale verfügbare Frequenz für den Skalierungsregulator im BAT-Modus fest." #. type: deftypevr -#: doc/guix.texi:20873 +#: doc/guix.texi:20870 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-scaling-max-freq-on-bat" #. type: deftypevr -#: doc/guix.texi:20875 +#: doc/guix.texi:20872 msgid "Set the max available frequency for the scaling governor on BAT." -msgstr "" +msgstr "Legt die maximale verfügbare Frequenz für den Skalierungsregulator im BAT-Modus fest." #. type: deftypevr -#: doc/guix.texi:20880 +#: doc/guix.texi:20877 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-min-perf-on-ac" #. type: deftypevr -#: doc/guix.texi:20883 +#: doc/guix.texi:20880 msgid "Limit the min P-state to control the power dissipation of the CPU, in AC mode. Values are stated as a percentage of the available performance." -msgstr "" +msgstr "Beschränkt den minimalen Leistungszustand („P-State“), um die Stromverteilung („Power Dissipation“) der CPU im AC-Modus zu regulieren. Werte können als Prozentsatz bezüglich der verfügbaren Leistung angegeben werden." #. type: deftypevr -#: doc/guix.texi:20888 +#: doc/guix.texi:20885 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-max-perf-on-ac" #. type: deftypevr -#: doc/guix.texi:20891 +#: doc/guix.texi:20888 msgid "Limit the max P-state to control the power dissipation of the CPU, in AC mode. Values are stated as a percentage of the available performance." -msgstr "" +msgstr "Beschränkt den maximalen Leistungszustand („P-State“), um die Stromverteilung („Power Dissipation“) der CPU im AC-Modus zu regulieren. Werte können als Prozentsatz bezüglich der verfügbaren Leistung angegeben werden." #. type: deftypevr -#: doc/guix.texi:20896 +#: doc/guix.texi:20893 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-min-perf-on-bat" #. type: deftypevr -#: doc/guix.texi:20898 +#: doc/guix.texi:20895 msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode." -msgstr "" +msgstr "Wie @code{cpu-min-perf-on-ac} im BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20903 +#: doc/guix.texi:20900 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Nichtnegative-ganze-Zahl cpu-max-perf-on-bat" #. type: deftypevr -#: doc/guix.texi:20905 +#: doc/guix.texi:20902 msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode." -msgstr "" +msgstr "Wie @code{cpu-max-perf-on-ac} im BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20910 +#: doc/guix.texi:20907 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck cpu-boost-on-ac?" #. type: deftypevr -#: doc/guix.texi:20912 +#: doc/guix.texi:20909 msgid "Enable CPU turbo boost feature on AC mode." -msgstr "" +msgstr "Die CPU-Turbo-Boost-Funktionen im AC-Modus aktivieren." #. type: deftypevr -#: doc/guix.texi:20917 +#: doc/guix.texi:20914 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck cpu-boost-on-bat?" #. type: deftypevr -#: doc/guix.texi:20919 +#: doc/guix.texi:20916 msgid "Same as @code{cpu-boost-on-ac?} on BAT mode." -msgstr "" +msgstr "Wie @code{cpu-boost-on-ac?} im BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20924 +#: doc/guix.texi:20921 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck sched-powersave-on-ac?" #. type: deftypevr -#: doc/guix.texi:20927 +#: doc/guix.texi:20924 msgid "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions." -msgstr "" +msgstr "Dem Linux-Kernel erlauben, die Anzahl benutzter CPU-Kerne und Hyperthreads anzupassen, wenn er unter leichter Last steht." #. type: deftypevr -#: doc/guix.texi:20932 +#: doc/guix.texi:20929 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck sched-powersave-on-bat?" #. type: deftypevr -#: doc/guix.texi:20934 +#: doc/guix.texi:20931 msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode." -msgstr "" +msgstr "Wie @code{sched-powersave-on-ac?}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20939 +#: doc/guix.texi:20936 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck nmi-watchdog?" #. type: deftypevr -#: doc/guix.texi:20941 +#: doc/guix.texi:20938 msgid "Enable Linux kernel NMI watchdog." -msgstr "" +msgstr "Ob die rechtzeitige Behandlung nichtmaskierbarer Unterbrechungen durch den „NMI-Watchdog“ des Linux-Kernels überprüft werden soll." #. type: deftypevr -#: doc/guix.texi:20946 +#: doc/guix.texi:20943 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Zeichenkette phc-controls" #. type: deftypevr -#: doc/guix.texi:20949 +#: doc/guix.texi:20946 msgid "For Linux kernels with PHC patch applied, change CPU voltages. An example value would be @samp{\"F:V F:V F:V F:V\"}." -msgstr "" +msgstr "Auf Linux-Kernels, auf die der PHC-Patch angewandt wurde, wird hierdurch die Prozessorspannung angepasst. Ein Beispielwert wäre @samp{\"F:V F:V F:V F:V\"}." #. type: deftypevr -#: doc/guix.texi:20954 +#: doc/guix.texi:20951 #, no-wrap msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette energy-perf-policy-on-ac" #. type: deftypevr -#: doc/guix.texi:20957 +#: doc/guix.texi:20954 msgid "Set CPU performance versus energy saving policy on AC. Alternatives are performance, normal, powersave." -msgstr "" +msgstr "Legt das Verhältnis von Prozessorleistung zu Stromsparsamkeit im AC-Modus fest. Angegeben werden können performance (hohe Leistung), normal, powersave (wenig Stromverbrauch)." #. type: deftypevr -#: doc/guix.texi:20959 doc/guix.texi:21057 doc/guix.texi:21087 +#: doc/guix.texi:20956 doc/guix.texi:21054 doc/guix.texi:21084 msgid "Defaults to @samp{\"performance\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"performance\"}." #. type: deftypevr -#: doc/guix.texi:20962 +#: doc/guix.texi:20959 #, no-wrap msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette energy-perf-policy-on-bat" #. type: deftypevr -#: doc/guix.texi:20964 +#: doc/guix.texi:20961 msgid "Same as @code{energy-perf-policy-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{energy-perf-policy-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20966 doc/guix.texi:21064 +#: doc/guix.texi:20963 doc/guix.texi:21061 msgid "Defaults to @samp{\"powersave\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"powersave\"}." #. type: deftypevr -#: doc/guix.texi:20969 +#: doc/guix.texi:20966 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste disks-devices" #. type: deftypevr -#: doc/guix.texi:20971 +#: doc/guix.texi:20968 msgid "Hard disk devices." -msgstr "" +msgstr "Festplattengeräte." #. type: deftypevr -#: doc/guix.texi:20974 +#: doc/guix.texi:20971 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste disk-apm-level-on-ac" #. type: deftypevr -#: doc/guix.texi:20976 +#: doc/guix.texi:20973 msgid "Hard disk advanced power management level." -msgstr "" +msgstr "Stufe für das „Advanced Power Management“ auf Festplatten." #. type: deftypevr -#: doc/guix.texi:20979 +#: doc/guix.texi:20976 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste disk-apm-level-on-bat" #. type: deftypevr -#: doc/guix.texi:20981 +#: doc/guix.texi:20978 msgid "Same as @code{disk-apm-bat} but on BAT mode." -msgstr "" +msgstr "Wie @code{disk-apm-bat}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20984 +#: doc/guix.texi:20981 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Leerzeichengetrennte-Zeichenketten-Liste disk-spindown-timeout-on-ac" #. type: deftypevr -#: doc/guix.texi:20987 +#: doc/guix.texi:20984 msgid "Hard disk spin down timeout. One value has to be specified for each declared hard disk." -msgstr "" +msgstr "Zeitspanne, bis die Festplatte inaktiv wird (ein „Spin-Down“). Für jede deklarierte Festplatte muss hier je ein Wert angegeben werden." #. type: deftypevr -#: doc/guix.texi:20992 +#: doc/guix.texi:20989 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Leerzeichengetrennte-Zeichenketten-Liste disk-spindown-timeout-on-bat" #. type: deftypevr -#: doc/guix.texi:20994 +#: doc/guix.texi:20991 msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{disk-spindown-timeout-on-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:20999 +#: doc/guix.texi:20996 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Leerzeichengetrennte-Zeichenketten-Liste disk-iosched" #. type: deftypevr -#: doc/guix.texi:21003 +#: doc/guix.texi:21000 msgid "Select IO scheduler for disk devices. One value has to be specified for each declared hard disk. Example alternatives are cfq, deadline and noop." -msgstr "" +msgstr "Ein-/Ausgaben-Planungsprogramm für Plattengeräte auswählen. Für jede deklarierte Festplatte muss ein Wert angegeben werden. Möglich sind zum Beispiel cfq, deadline und noop." #. type: deftypevr -#: doc/guix.texi:21008 +#: doc/guix.texi:21005 #, no-wrap msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette sata-linkpwr-on-ac" #. type: deftypevr -#: doc/guix.texi:21011 +#: doc/guix.texi:21008 msgid "SATA aggressive link power management (ALPM) level. Alternatives are min_power, medium_power, max_performance." -msgstr "" +msgstr "Stufe des „Aggressive Link Power Management“ (ALPM) für SATA. Angegeben werden können min_power (wenigster Stromverbrauch), medium_power (mittlerer Stromverbrauch), max_performance (maximale Leistung)." #. type: deftypevr -#: doc/guix.texi:21013 +#: doc/guix.texi:21010 msgid "Defaults to @samp{\"max_performance\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"max_performance\"}." #. type: deftypevr -#: doc/guix.texi:21016 +#: doc/guix.texi:21013 #, no-wrap msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette sata-linkpwr-on-bat" #. type: deftypevr -#: doc/guix.texi:21018 +#: doc/guix.texi:21015 msgid "Same as @code{sata-linkpwr-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{sata-linkpwr-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21020 +#: doc/guix.texi:21017 msgid "Defaults to @samp{\"min_power\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"min_power\"}." #. type: deftypevr -#: doc/guix.texi:21023 +#: doc/guix.texi:21020 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Zeichenkette sata-linkpwr-blacklist" #. type: deftypevr -#: doc/guix.texi:21025 +#: doc/guix.texi:21022 msgid "Exclude specified SATA host devices for link power management." -msgstr "" +msgstr "Bestimmte SATA-Geräte („SATA-Host-Devices“) vom Link Power Management ausschließen." #. type: deftypevr -#: doc/guix.texi:21030 +#: doc/guix.texi:21027 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-An-Aus-Boolescher-Ausdruck ahci-runtime-pm-on-ac?" #. type: deftypevr -#: doc/guix.texi:21033 +#: doc/guix.texi:21030 msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode." -msgstr "" +msgstr "Verwaltung des Stromverbrauchs zur Laufzeit für AHCI-Steuerungseinheiten („Controller“) und AHCI-Platten im AC-Modus aktivieren." #. type: deftypevr -#: doc/guix.texi:21038 +#: doc/guix.texi:21035 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-An-Aus-Boolescher-Ausdruck ahci-runtime-pm-on-bat?" #. type: deftypevr -#: doc/guix.texi:21040 +#: doc/guix.texi:21037 msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode." -msgstr "" +msgstr "Wie @code{ahci-runtime-pm-on-ac} im BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21045 +#: doc/guix.texi:21042 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Nichtnegative-ganze-Zahl ahci-runtime-pm-timeout" #. type: deftypevr -#: doc/guix.texi:21047 +#: doc/guix.texi:21044 msgid "Seconds of inactivity before disk is suspended." -msgstr "" +msgstr "Nach wievielen Sekunden der Inaktivität die Platten in den Ruhezustand gehen („Suspended“)." #. type: deftypevr -#: doc/guix.texi:21052 +#: doc/guix.texi:21049 #, no-wrap msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette pcie-aspm-on-ac" #. type: deftypevr -#: doc/guix.texi:21055 +#: doc/guix.texi:21052 msgid "PCI Express Active State Power Management level. Alternatives are default, performance, powersave." -msgstr "" +msgstr "Stufe des „PCI Express Active State Power Management“. Zur Auswahl stehen default (Voreinstellung), performance (hohe Leistung), powersave (wenig Stromverbrauch)." #. type: deftypevr -#: doc/guix.texi:21060 +#: doc/guix.texi:21057 #, no-wrap msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette pcie-aspm-on-bat" #. type: deftypevr -#: doc/guix.texi:21062 +#: doc/guix.texi:21059 msgid "Same as @code{pcie-aspm-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{pcie-aspm-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21067 +#: doc/guix.texi:21064 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette radeon-power-profile-on-ac" #. type: deftypevr -#: doc/guix.texi:21070 +#: doc/guix.texi:21067 msgid "Radeon graphics clock speed level. Alternatives are low, mid, high, auto, default." -msgstr "" +msgstr "Taktgeschwindigkeitsstufe („Clock Speed Level“) für Radeon-Grafik. Zur Auswahl stehen low (niedrig), mid (mittel), high (hoch), auto (automatisch), default (Voreinstellung)." #. type: deftypevr -#: doc/guix.texi:21072 +#: doc/guix.texi:21069 msgid "Defaults to @samp{\"high\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"high\"}." #. type: deftypevr -#: doc/guix.texi:21075 +#: doc/guix.texi:21072 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette radeon-power-profile-on-bat" #. type: deftypevr -#: doc/guix.texi:21077 +#: doc/guix.texi:21074 msgid "Same as @code{radeon-power-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{radeon-power-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21079 +#: doc/guix.texi:21076 msgid "Defaults to @samp{\"low\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"low\"}." #. type: deftypevr -#: doc/guix.texi:21082 +#: doc/guix.texi:21079 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette radeon-dpm-state-on-ac" #. type: deftypevr -#: doc/guix.texi:21085 +#: doc/guix.texi:21082 msgid "Radeon dynamic power management method (DPM). Alternatives are battery, performance." -msgstr "" +msgstr "Methode für die dynamische Energieverwaltung („Dynamic Power Management“, DPM) auf Radeon. Zur Auswahl stehen battery (Batterie), performance (Leistung)." #. type: deftypevr -#: doc/guix.texi:21090 +#: doc/guix.texi:21087 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette radeon-dpm-state-on-bat" #. type: deftypevr -#: doc/guix.texi:21092 +#: doc/guix.texi:21089 msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{radeon-dpm-state-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21094 +#: doc/guix.texi:21091 msgid "Defaults to @samp{\"battery\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"battery\"}." #. type: deftypevr -#: doc/guix.texi:21097 +#: doc/guix.texi:21094 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette radeon-dpm-perf-level-on-ac" #. type: deftypevr -#: doc/guix.texi:21099 +#: doc/guix.texi:21096 msgid "Radeon DPM performance level. Alternatives are auto, low, high." -msgstr "" +msgstr "Leistungsstufe („Performance Level“) des Radeon-DPM. Zur Auswahl stehen auto (automatisch), low (niedrig), high (hoch)." #. type: deftypevr -#: doc/guix.texi:21101 doc/guix.texi:21108 doc/guix.texi:21182 +#: doc/guix.texi:21098 doc/guix.texi:21105 doc/guix.texi:21179 msgid "Defaults to @samp{\"auto\"}." -msgstr "" +msgstr "Die Voreinstellung ist @samp{\"auto\"}." #. type: deftypevr -#: doc/guix.texi:21104 +#: doc/guix.texi:21101 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette radeon-dpm-perf-level-on-bat" #. type: deftypevr -#: doc/guix.texi:21106 +#: doc/guix.texi:21103 msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{radeon-dpm-perf-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21111 +#: doc/guix.texi:21108 #, no-wrap msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} An-Aus-Boolescher-Ausdruck wifi-pwr-on-ac?" #. type: deftypevr -#: doc/guix.texi:21113 +#: doc/guix.texi:21110 msgid "Wifi power saving mode." -msgstr "" +msgstr "WLAN-Stromsparmodus." #. type: deftypevr -#: doc/guix.texi:21118 +#: doc/guix.texi:21115 #, no-wrap msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} An-Aus-Boolescher-Ausdruck wifi-pwr-on-bat?" #. type: deftypevr -#: doc/guix.texi:21120 +#: doc/guix.texi:21117 msgid "Same as @code{wifi-power-ac?} but on BAT mode." -msgstr "" +msgstr "Wie @code{wifi-power-ac?}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21125 +#: doc/guix.texi:21122 #, no-wrap msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Ja-Nein-Boolescher-Ausdruck wol-disable?" #. type: deftypevr -#: doc/guix.texi:21127 +#: doc/guix.texi:21124 msgid "Disable wake on LAN." -msgstr "" +msgstr "Rechnerstart nach Netzwerkanforderung („Wake on LAN“) deaktivieren." #. type: deftypevr -#: doc/guix.texi:21132 +#: doc/guix.texi:21129 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Nichtnegative-ganze-Zahl sound-power-save-on-ac" #. type: deftypevr -#: doc/guix.texi:21135 +#: doc/guix.texi:21132 msgid "Timeout duration in seconds before activating audio power saving on Intel HDA and AC97 devices. A value of 0 disables power saving." -msgstr "" +msgstr "Nach wievielen Sekunden der Stromsparmodus für die Audioverarbeitung auf Intel-HDA- und AC97-Geräten aktiviert wird. Ein Wert von 0 deaktiviert den Stromsparmodus." #. type: deftypevr -#: doc/guix.texi:21140 +#: doc/guix.texi:21137 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Nichtnegative-ganze-Zahl sound-power-save-on-bat" #. type: deftypevr -#: doc/guix.texi:21142 +#: doc/guix.texi:21139 msgid "Same as @code{sound-powersave-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{sound-powersave-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21144 doc/guix.texi:21671 doc/guix.texi:21815 +#: doc/guix.texi:21141 doc/guix.texi:21668 doc/guix.texi:21812 msgid "Defaults to @samp{1}." -msgstr "" +msgstr "Die Vorgabe ist @samp{1}." #. type: deftypevr -#: doc/guix.texi:21147 +#: doc/guix.texi:21144 #, no-wrap msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Ja-Nein-Boolescher-Ausdruck sound-power-save-controller?" #. type: deftypevr -#: doc/guix.texi:21149 +#: doc/guix.texi:21146 msgid "Disable controller in powersaving mode on Intel HDA devices." -msgstr "" +msgstr "Steuerungseinheit („Controller“) im Stromsparmodus auf Intel-HDA-Geräten deaktivieren." #. type: deftypevr -#: doc/guix.texi:21154 +#: doc/guix.texi:21151 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck bay-poweroff-on-bat?" #. type: deftypevr -#: doc/guix.texi:21158 +#: doc/guix.texi:21155 msgid "Enable optical drive in UltraBay/MediaBay on BAT mode. Drive can be powered on again by releasing (and reinserting) the eject lever or by pressing the disc eject button on newer models." -msgstr "" +msgstr "Optisches Laufwerk in einer UltraBay/MediaBay im BAT-Modus aktivieren. Laufwerke können erneut gestartet werden, indem Sie den Hebel zum Auswerfen lösen (und wieder einsetzen) oder, auf neueren Modellen, indem Sie den Knopf zum Auswerfen des eingelegten Datenträgers drücken." #. type: deftypevr -#: doc/guix.texi:21163 +#: doc/guix.texi:21160 #, no-wrap msgid "{@code{tlp-configuration} parameter} string bay-device" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette bay-device" #. type: deftypevr -#: doc/guix.texi:21165 +#: doc/guix.texi:21162 msgid "Name of the optical drive device to power off." -msgstr "" +msgstr "Name des Geräts für das optische Laufwerk, das gestartet werden soll." #. type: deftypevr -#: doc/guix.texi:21167 +#: doc/guix.texi:21164 msgid "Defaults to @samp{\"sr0\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"sr0\"}." #. type: deftypevr -#: doc/guix.texi:21170 +#: doc/guix.texi:21167 #, no-wrap msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette runtime-pm-on-ac" #. type: deftypevr -#: doc/guix.texi:21173 +#: doc/guix.texi:21170 msgid "Runtime Power Management for PCI(e) bus devices. Alternatives are on and auto." -msgstr "" +msgstr "Laufzeitenergieverwaltung („Runtime Power Management“) von PCI(e)-Bus-Geräten. Zur Auswahl stehen on (angeschaltet) und auto (automatisch)." #. type: deftypevr -#: doc/guix.texi:21175 +#: doc/guix.texi:21172 msgid "Defaults to @samp{\"on\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"on\"}." #. type: deftypevr -#: doc/guix.texi:21178 +#: doc/guix.texi:21175 #, no-wrap msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Zeichenkette runtime-pm-on-bat" #. type: deftypevr -#: doc/guix.texi:21180 +#: doc/guix.texi:21177 msgid "Same as @code{runtime-pm-ac} but on BAT mode." -msgstr "" +msgstr "Wie @code{runtime-pm-ac}, aber für den BAT-Modus." #. type: deftypevr -#: doc/guix.texi:21185 +#: doc/guix.texi:21182 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck runtime-pm-all?" #. type: deftypevr -#: doc/guix.texi:21188 +#: doc/guix.texi:21185 msgid "Runtime Power Management for all PCI(e) bus devices, except blacklisted ones." msgstr "" #. type: deftypevr -#: doc/guix.texi:21193 +#: doc/guix.texi:21190 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Leerzeichengetrennte-Zeichenketten-Liste runtime-pm-blacklist" #. type: deftypevr -#: doc/guix.texi:21195 +#: doc/guix.texi:21192 msgid "Exclude specified PCI(e) device addresses from Runtime Power Management." -msgstr "" +msgstr "Die angegebenen PCI(e)-Geräteadressen von der Laufzeitenergieverwaltung („Runtime Power Management“) ausnehmen." #. type: deftypevr -#: doc/guix.texi:21200 +#: doc/guix.texi:21197 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Leerzeichengetrennte-Zeichenketten-Liste runtime-pm-driver-blacklist" #. type: deftypevr -#: doc/guix.texi:21203 +#: doc/guix.texi:21200 msgid "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management." -msgstr "" +msgstr "PCI(e)-Geräte von der Laufzeitenergieverwaltung („Runtime Power Management“) ausnehmen, wenn sie den angegebenen Treibern zugeordnet sind." #. type: deftypevr -#: doc/guix.texi:21206 +#: doc/guix.texi:21203 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck usb-autosuspend?" #. type: deftypevr -#: doc/guix.texi:21208 +#: doc/guix.texi:21205 msgid "Enable USB autosuspend feature." -msgstr "" +msgstr "USB-Geräte automatisch in den Ruhezustand versetzen („USB-Autosuspend“)." #. type: deftypevr -#: doc/guix.texi:21213 +#: doc/guix.texi:21210 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Zeichenkette usb-blacklist" #. type: deftypevr -#: doc/guix.texi:21215 +#: doc/guix.texi:21212 msgid "Exclude specified devices from USB autosuspend." -msgstr "" +msgstr "Die angegebenen Geräte vom USB-Autosuspend ausnehmen." #. type: deftypevr -#: doc/guix.texi:21220 +#: doc/guix.texi:21217 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck usb-blacklist-wwan?" #. type: deftypevr -#: doc/guix.texi:21222 +#: doc/guix.texi:21219 msgid "Exclude WWAN devices from USB autosuspend." -msgstr "" +msgstr "WWAN-Geräte vom USB-Autosuspend ausnehmen." #. type: deftypevr -#: doc/guix.texi:21227 +#: doc/guix.texi:21224 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Zeichenkette usb-whitelist" #. type: deftypevr -#: doc/guix.texi:21230 +#: doc/guix.texi:21227 msgid "Include specified devices into USB autosuspend, even if they are already excluded by the driver or via @code{usb-blacklist-wwan?}." -msgstr "" +msgstr "Für die angegebenen Geräte USB-Autosuspend aktivieren, selbst wenn Autosuspend durch den Treiber oder wegen @code{usb-blacklist-wwan?} deaktiviert werden würde." #. type: deftypevr -#: doc/guix.texi:21235 +#: doc/guix.texi:21232 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Vielleicht-Boolescher-Ausdruck usb-autosuspend-disable-on-shutdown?" #. type: deftypevr -#: doc/guix.texi:21237 +#: doc/guix.texi:21234 msgid "Enable USB autosuspend before shutdown." -msgstr "" +msgstr "USB-Autosuspend vor dem Herunterfahren aktivieren." #. type: deftypevr -#: doc/guix.texi:21242 +#: doc/guix.texi:21239 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?" -msgstr "" +msgstr "{@code{tlp-configuration}-Parameter} Boolescher-Ausdruck restore-device-state-on-startup?" #. type: deftypevr -#: doc/guix.texi:21245 +#: doc/guix.texi:21242 msgid "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup." -msgstr "" +msgstr "Zustand von funkfähigen Geräten (Bluetooth, WLAN, WWAN) vom letzten Herunterfahren beim Hochfahren des Systems wiederherstellen." #. type: cindex -#: doc/guix.texi:21250 +#: doc/guix.texi:21247 #, no-wrap msgid "thermald" -msgstr "" +msgstr "thermald" #. type: cindex -#: doc/guix.texi:21251 +#: doc/guix.texi:21248 #, no-wrap msgid "CPU frequency scaling with thermald" -msgstr "" +msgstr "CPU-Frequenzskalierung mit Thermald" #. type: subsubheading -#: doc/guix.texi:21252 +#: doc/guix.texi:21249 #, no-wrap msgid "Thermald daemon" msgstr "Thermald-Daemon" #. type: Plain text -#: doc/guix.texi:21256 +#: doc/guix.texi:21253 msgid "The @code{(gnu services pm)} module provides an interface to thermald, a CPU frequency scaling service which helps prevent overheating." -msgstr "" +msgstr "Das Modul @code{(gnu services pm)} stellt eine Schnittstelle zu Thermald zur Verfügung, einem Dienst zur CPU-Frequenzskalierung („CPU Frequency Scaling“), mit dem Überhitzung verhindert wird." #. type: defvr -#: doc/guix.texi:21257 +#: doc/guix.texi:21254 #, no-wrap msgid "{Scheme Variable} thermald-service-type" -msgstr "" +msgstr "{Scheme-Variable} thermald-service-type" #. type: defvr -#: doc/guix.texi:21262 +#: doc/guix.texi:21259 msgid "This is the service type for @uref{https://01.org/linux-thermal-daemon/, thermald}, the Linux Thermal Daemon, which is responsible for controlling the thermal state of processors and preventing overheating." -msgstr "" +msgstr "Dies ist der Diensttyp für @uref{https://01.org/linux-thermal-daemon/, Thermald}, den @dfn{Linux Thermal Daemon}, der für die Hitzeregulierung von Prozessoren zuständig ist. Er ändert deren thermischen Zustand („Thermal State“) und verhindert, dass sie überhitzen." #. type: deftp -#: doc/guix.texi:21264 +#: doc/guix.texi:21261 #, no-wrap msgid "{Data Type} thermald-configuration" -msgstr "" +msgstr "{Datentyp} thermald-configuration" #. type: deftp -#: doc/guix.texi:21266 +#: doc/guix.texi:21263 msgid "Data type representing the configuration of @code{thermald-service-type}." -msgstr "" +msgstr "Datentyp, der die Konfiguration des @code{thermald-service-type} repräsentiert." #. type: item -#: doc/guix.texi:21268 +#: doc/guix.texi:21265 #, no-wrap msgid "@code{ignore-cpuid-check?} (default: @code{#f})" -msgstr "" +msgstr "@code{ignore-cpuid-check?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:21270 +#: doc/guix.texi:21267 msgid "Ignore cpuid check for supported CPU models." -msgstr "" +msgstr "Ergebnis der Prüfung per CPUID auf unterstützte Prozessormodelle ignorieren." #. type: item -#: doc/guix.texi:21271 +#: doc/guix.texi:21268 #, no-wrap msgid "@code{thermald} (default: @var{thermald})" -msgstr "" +msgstr "@code{thermald} (Vorgabe: @var{thermald})" #. type: table -#: doc/guix.texi:21273 +#: doc/guix.texi:21270 msgid "Package object of thermald." -msgstr "" +msgstr "Paketobjekt von thermald." #. type: Plain text -#: doc/guix.texi:21282 +#: doc/guix.texi:21279 msgid "The @code{(gnu services audio)} module provides a service to start MPD (the Music Player Daemon)." -msgstr "" +msgstr "Das Modul @code{(gnu services audio)} stellt einen Dienst zur Verfügung, um MPD (den Music Player Daemon) zu starten." #. type: cindex -#: doc/guix.texi:21283 +#: doc/guix.texi:21280 #, no-wrap msgid "mpd" -msgstr "" +msgstr "mpd" #. type: subsubheading -#: doc/guix.texi:21284 +#: doc/guix.texi:21281 #, no-wrap msgid "Music Player Daemon" -msgstr "" +msgstr "Music Player Daemon" #. type: Plain text -#: doc/guix.texi:21289 +#: doc/guix.texi:21286 msgid "The Music Player Daemon (MPD) is a service that can play music while being controlled from the local machine or over the network by a variety of clients." -msgstr "" +msgstr "Der Music Player Daemon (MPD) ist ein Dienst, der Musik abspielen kann und der dabei vom lokalen Rechner oder über das Netzwerk durch verschiedene Clients angesteuert werden kann." #. type: Plain text -#: doc/guix.texi:21292 +#: doc/guix.texi:21289 msgid "The following example shows how one might run @code{mpd} as user @code{\"bob\"} on port @code{6666}. It uses pulseaudio for output." -msgstr "" +msgstr "Das folgende Beispiel zeigt, wie man @code{mpd} als Benutzer @code{\"bob\"} auf Port @code{6666} ausführen könnte. Dabei wird Pulseaudio zur Ausgabe verwendet." #. type: example -#: doc/guix.texi:21298 +#: doc/guix.texi:21295 #, no-wrap msgid "" "(service mpd-service-type\n" @@ -39786,152 +40010,156 @@ msgid "" " (user \"bob\")\n" " (port \"6666\")))\n" msgstr "" +"(service mpd-service-type\n" +" (mpd-configuration\n" +" (user \"bob\")\n" +" (port \"6666\")))\n" #. type: defvr -#: doc/guix.texi:21300 +#: doc/guix.texi:21297 #, no-wrap msgid "{Scheme Variable} mpd-service-type" -msgstr "" +msgstr "{Scheme-Variable} mpd-service-type" #. type: defvr -#: doc/guix.texi:21302 +#: doc/guix.texi:21299 msgid "The service type for @command{mpd}" -msgstr "" +msgstr "Der Diensttyp für @command{mpd}." #. type: deftp -#: doc/guix.texi:21304 +#: doc/guix.texi:21301 #, no-wrap msgid "{Data Type} mpd-configuration" -msgstr "" +msgstr "{Datentyp} mpd-configuration" #. type: deftp -#: doc/guix.texi:21306 +#: doc/guix.texi:21303 msgid "Data type representing the configuration of @command{mpd}." -msgstr "" +msgstr "Datentyp, der die Konfiguration von @command{mpd} repräsentiert." #. type: item -#: doc/guix.texi:21308 +#: doc/guix.texi:21305 #, no-wrap msgid "@code{user} (default: @code{\"mpd\"})" -msgstr "" +msgstr "@code{user} (Vorgabe: @code{\"mpd\"})" #. type: table -#: doc/guix.texi:21310 +#: doc/guix.texi:21307 msgid "The user to run mpd as." -msgstr "" +msgstr "Das Benutzerkonto, mit dem mpd ausgeführt wird." #. type: item -#: doc/guix.texi:21311 +#: doc/guix.texi:21308 #, no-wrap msgid "@code{music-dir} (default: @code{\"~/Music\"})" -msgstr "" +msgstr "@code{music-dir} (Vorgabe: @code{\"~/Music\"})" #. type: table -#: doc/guix.texi:21313 +#: doc/guix.texi:21310 msgid "The directory to scan for music files." -msgstr "" +msgstr "Das Verzeichis, in dem nach Musikdateien gesucht wird." #. type: item -#: doc/guix.texi:21314 +#: doc/guix.texi:21311 #, no-wrap msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})" -msgstr "" +msgstr "@code{playlist-dir} (Vorgabe: @code{\"~/.mpd/playlists\"})" #. type: table -#: doc/guix.texi:21316 +#: doc/guix.texi:21313 msgid "The directory to store playlists." -msgstr "" +msgstr "Das Verzeichnis, um Wiedergabelisten („Playlists“) zu speichern." #. type: item -#: doc/guix.texi:21317 +#: doc/guix.texi:21314 #, no-wrap msgid "@code{db-file} (default: @code{\"~/.mpd/tag_cache\"})" msgstr "@code{db-file} (Vorgabe: @code{\"~/.mpd/tag_cache\"})" #. type: table -#: doc/guix.texi:21319 +#: doc/guix.texi:21316 msgid "The location of the music database." msgstr "Der Ort, an dem die Musikdatenbank gespeichert wird." #. type: item -#: doc/guix.texi:21320 +#: doc/guix.texi:21317 #, no-wrap msgid "@code{state-file} (default: @code{\"~/.mpd/state\"})" msgstr "@code{state-file} (Vorgabe: @code{\"~/.mpd/state\"})" #. type: table -#: doc/guix.texi:21322 +#: doc/guix.texi:21319 msgid "The location of the file that stores current MPD's state." msgstr "Der Ort, an dem die Datei mit dem aktuellen Zustand von MPD gespeichert wird." #. type: item -#: doc/guix.texi:21323 +#: doc/guix.texi:21320 #, no-wrap msgid "@code{sticker-file} (default: @code{\"~/.mpd/sticker.sql\"})" msgstr "@code{sticker-file} (Vorgabe: @code{\"~/.mpd/sticker.sql\"})" #. type: table -#: doc/guix.texi:21325 +#: doc/guix.texi:21322 msgid "The location of the sticker database." msgstr "Der Ort, an dem die Sticker-Datenbank gespeichert wird." #. type: item -#: doc/guix.texi:21326 +#: doc/guix.texi:21323 #, no-wrap msgid "@code{port} (default: @code{\"6600\"})" -msgstr "" +msgstr "@code{port} (Vorgabe: @code{\"6600\"})" #. type: table -#: doc/guix.texi:21328 +#: doc/guix.texi:21325 msgid "The port to run mpd on." -msgstr "" +msgstr "Der Port, auf dem mpd ausgeführt wird." #. type: item -#: doc/guix.texi:21329 +#: doc/guix.texi:21326 #, no-wrap msgid "@code{address} (default: @code{\"any\"})" -msgstr "" +msgstr "@code{address} (Vorgabe: @code{\"any\"})" #. type: table -#: doc/guix.texi:21332 +#: doc/guix.texi:21329 msgid "The address that mpd will bind to. To use a Unix domain socket, an absolute path can be specified here." -msgstr "" +msgstr "Die Adresse, an die sich mpd binden wird. Um einen Unix-Socket zu benutzen, kann hier ein absoluter Pfad angegeben werden." #. type: subsection -#: doc/guix.texi:21337 +#: doc/guix.texi:21334 #, no-wrap msgid "Virtualization services" -msgstr "" +msgstr "Virtualisierungsdienste" #. type: Plain text -#: doc/guix.texi:21342 +#: doc/guix.texi:21339 msgid "The @code{(gnu services virtualization)} module provides services for the libvirt and virtlog daemons, as well as other virtualization-related services." -msgstr "" +msgstr "Das Modul @code{(gnu services virtualization)} bietet Dienste für die Daemons von libvirt und virtlog, sowie andere virtualisierungsbezogene Dienste." #. type: subsubheading -#: doc/guix.texi:21343 +#: doc/guix.texi:21340 #, no-wrap msgid "Libvirt daemon" -msgstr "" +msgstr "Libvirt-Daemon" #. type: Plain text -#: doc/guix.texi:21347 +#: doc/guix.texi:21344 msgid "@code{libvirtd} is the server side daemon component of the libvirt virtualization management system. This daemon runs on host servers and performs required management tasks for virtualized guests." -msgstr "" +msgstr "@code{libvirtd} ist die serverseitige Daemon-Komponente des libvirt-Systems zur Virtualisierungsverwaltung. Dieser Daemon läuft auf als Wirt dienenden Servern und führt anfallende Verwaltungsaufgaben für virtualisierte Gäste durch." #. type: deffn -#: doc/guix.texi:21348 +#: doc/guix.texi:21345 #, no-wrap msgid "{Scheme Variable} libvirt-service-type" -msgstr "" +msgstr "{Scheme-Variable} libvirt-service-type" #. type: deffn -#: doc/guix.texi:21351 +#: doc/guix.texi:21348 msgid "This is the type of the @uref{https://libvirt.org, libvirt daemon}. Its value must be a @code{libvirt-configuration}." -msgstr "" +msgstr "Dies ist der Diensttyp des @uref{https://libvirt.org, libvirt-Daemons}. Sein Wert muss ein @code{libvirt-configuration}-Verbundsobjekt sein." #. type: example -#: doc/guix.texi:21357 +#: doc/guix.texi:21354 #, no-wrap msgid "" "(service libvirt-service-type\n" @@ -39939,985 +40167,992 @@ msgid "" " (unix-sock-group \"libvirt\")\n" " (tls-port \"16555\")))\n" msgstr "" +"(service libvirt-service-type\n" +" (libvirt-configuration\n" +" (unix-sock-group \"libvirt\")\n" +" (tls-port \"16555\")))\n" #. type: Plain text -#: doc/guix.texi:21362 +#: doc/guix.texi:21359 msgid "Available @code{libvirt-configuration} fields are:" -msgstr "" +msgstr "Verfügbare @code{libvirt-configuration}-Felder sind:" #. type: deftypevr -#: doc/guix.texi:21363 +#: doc/guix.texi:21360 #, no-wrap msgid "{@code{libvirt-configuration} parameter} package libvirt" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} „package“ libvirt" #. type: deftypevr -#: doc/guix.texi:21365 +#: doc/guix.texi:21362 msgid "Libvirt package." -msgstr "" +msgstr "Libvirt-Paket." #. type: deftypevr -#: doc/guix.texi:21368 +#: doc/guix.texi:21365 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Boolescher-Ausdruck listen-tls?" #. type: deftypevr -#: doc/guix.texi:21371 +#: doc/guix.texi:21368 msgid "Flag listening for secure TLS connections on the public TCP/IP port. must set @code{listen} for this to have any effect." -msgstr "" +msgstr "Option zum Lauschen auf sichere TLS-Verbindungen über den öffentlichen TCP/IP-Port. @code{listen} muss gesetzt sein, damit dies eine Wirkung hat." #. type: deftypevr -#: doc/guix.texi:21374 +#: doc/guix.texi:21371 msgid "It is necessary to setup a CA and issue server certificates before using this capability." -msgstr "" +msgstr "Bevor Sie diese Funktionalität nutzen können, muss eine Zertifikatsautorität eingerichtet worden sein und Server-Zertifikate ausgestellt worden sein." #. type: deftypevr -#: doc/guix.texi:21379 +#: doc/guix.texi:21376 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Boolescher-Ausdruck listen-tcp?" #. type: deftypevr -#: doc/guix.texi:21382 +#: doc/guix.texi:21379 msgid "Listen for unencrypted TCP connections on the public TCP/IP port. must set @code{listen} for this to have any effect." -msgstr "" +msgstr "Auf unverschlüsselte TCP-Verbindungen auf dem öffentlichen TCP/IP-Port lauschen. @code{listen} muss gesetzt sein, damit dies eine Wirkung hat." #. type: deftypevr -#: doc/guix.texi:21386 +#: doc/guix.texi:21383 msgid "Using the TCP socket requires SASL authentication by default. Only SASL mechanisms which support data encryption are allowed. This is DIGEST_MD5 and GSSAPI (Kerberos5)" -msgstr "" +msgstr "Nach Voreinstellung kann auf dem TCP-Socket nur gelauscht werden, wenn SASL-Authentifizierung möglich ist. Nur solche SASL-Mechanismen, die Datenverschlüsselung unterstützen, sind zugelassen. Das sind DIGEST_MD5 und GSSAPI (Kerberos5)" #. type: deftypevr -#: doc/guix.texi:21391 +#: doc/guix.texi:21388 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tls-port" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette tls-port" #. type: deftypevr -#: doc/guix.texi:21394 +#: doc/guix.texi:21391 msgid "Port for accepting secure TLS connections This can be a port number, or service name" -msgstr "" +msgstr "Der Port, um sichere TLS-Verbindungen zu akzeptieren. Dies kann eine Portnummer oder ein Dienstname sein." #. type: deftypevr -#: doc/guix.texi:21396 +#: doc/guix.texi:21393 msgid "Defaults to @samp{\"16514\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"16514\"}." #. type: deftypevr -#: doc/guix.texi:21399 +#: doc/guix.texi:21396 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tcp-port" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette tcp-port" #. type: deftypevr -#: doc/guix.texi:21402 +#: doc/guix.texi:21399 msgid "Port for accepting insecure TCP connections This can be a port number, or service name" -msgstr "" +msgstr "Der Port, um unsichere TCP-Verbindungen zu akzeptieren. Dies kann eine Portnummer oder ein Dienstname sein." #. type: deftypevr -#: doc/guix.texi:21404 +#: doc/guix.texi:21401 msgid "Defaults to @samp{\"16509\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"16509\"}." #. type: deftypevr -#: doc/guix.texi:21407 +#: doc/guix.texi:21404 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string listen-addr" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette listen-addr" #. type: deftypevr -#: doc/guix.texi:21409 +#: doc/guix.texi:21406 msgid "IP address or hostname used for client connections." -msgstr "" +msgstr "IP-Adresse oder Rechnername („Hostname“), der für von Clients ausgehende Verbindungen benutzt wird." #. type: deftypevr -#: doc/guix.texi:21411 +#: doc/guix.texi:21408 msgid "Defaults to @samp{\"0.0.0.0\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"0.0.0.0\"}." #. type: deftypevr -#: doc/guix.texi:21414 +#: doc/guix.texi:21411 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Boolescher-Ausdruck mdns-adv?" #. type: deftypevr -#: doc/guix.texi:21416 +#: doc/guix.texi:21413 msgid "Flag toggling mDNS advertisement of the libvirt service." -msgstr "" +msgstr "Einstellung, ob der libvirt-Dienst mDNS-Mitteilungen sendet." #. type: deftypevr -#: doc/guix.texi:21419 +#: doc/guix.texi:21416 msgid "Alternatively can disable for all services on a host by stopping the Avahi daemon." -msgstr "" +msgstr "Dies kann alternativ für alle Dienste auf einem Rechner deaktiviert werden, indem man den Avahi-Daemon anhält." #. type: deftypevr -#: doc/guix.texi:21424 +#: doc/guix.texi:21421 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string mdns-name" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette mdns-name" #. type: deftypevr -#: doc/guix.texi:21427 +#: doc/guix.texi:21424 msgid "Default mDNS advertisement name. This must be unique on the immediate broadcast network." -msgstr "" +msgstr "Der voreingestellte Name in mDNS-Mitteilungen. Er muss auf dem direkten Broadcast-Netzwerk eindeutig sein." #. type: deftypevr -#: doc/guix.texi:21429 +#: doc/guix.texi:21426 msgid "Defaults to @samp{\"Virtualization Host \"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"Virtualization Host \"}." #. type: deftypevr -#: doc/guix.texi:21432 +#: doc/guix.texi:21429 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-group" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette unix-sock-group" #. type: deftypevr -#: doc/guix.texi:21436 +#: doc/guix.texi:21433 msgid "UNIX domain socket group ownership. This can be used to allow a 'trusted' set of users access to management capabilities without becoming root." -msgstr "" +msgstr "Besitzergruppe des UNIX-Sockets. Diese Einstellung kann benutzt werden, um einer als vertrauenswürdig geltenden Gruppe von Benutzern Zugriff auf Verwaltungsfunktionen zu gewähren, ohne dass diese als Administratornutzer root ausgeführt werden müssen." #. type: deftypevr -#: doc/guix.texi:21441 +#: doc/guix.texi:21438 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette unix-sock-ro-perms" #. type: deftypevr -#: doc/guix.texi:21444 +#: doc/guix.texi:21441 msgid "UNIX socket permissions for the R/O socket. This is used for monitoring VM status only." -msgstr "" +msgstr "UNIX-Socket-Berechtigungen für den Socket nur mit Lesezugriff („read only“). Dies wird nur zur Überwachung des Zustands der VM benutzt." #. type: deftypevr -#: doc/guix.texi:21446 doc/guix.texi:21464 +#: doc/guix.texi:21443 doc/guix.texi:21461 msgid "Defaults to @samp{\"0777\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"0777\"}." #. type: deftypevr -#: doc/guix.texi:21449 +#: doc/guix.texi:21446 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette unix-sock-rw-perms" #. type: deftypevr -#: doc/guix.texi:21453 +#: doc/guix.texi:21450 msgid "UNIX socket permissions for the R/W socket. Default allows only root. If PolicyKit is enabled on the socket, the default will change to allow everyone (eg, 0777)" -msgstr "" +msgstr "UNIX-Socket-Berechtigungen für den Socket mit Schreib- und Lesezugriff („read/write“). Nach Vorgabe kann nur der Administratornutzer root zugreifen. Wenn auf dem Socket PolicyKit aktiviert ist, wird die Vorgabe geändert, dass jeder zugreifen kann (z.B.@: zu 0777)" #. type: deftypevr -#: doc/guix.texi:21455 +#: doc/guix.texi:21452 msgid "Defaults to @samp{\"0770\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"0770\"}." #. type: deftypevr -#: doc/guix.texi:21458 +#: doc/guix.texi:21455 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette unix-sock-admin-perms" #. type: deftypevr -#: doc/guix.texi:21462 +#: doc/guix.texi:21459 msgid "UNIX socket permissions for the admin socket. Default allows only owner (root), do not change it unless you are sure to whom you are exposing the access to." -msgstr "" +msgstr "UNIX-Socket-Berechtigungen für den Administrator-Socket. Nach Vorgabg hat nur der Besitzer (der Administratornutzer root) hierauf Zugriff; ändern Sie es nur, wenn Sie sicher wissen, wer dann alles Zugriff bekommt." #. type: deftypevr -#: doc/guix.texi:21467 +#: doc/guix.texi:21464 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette unix-sock-dir" #. type: deftypevr -#: doc/guix.texi:21469 +#: doc/guix.texi:21466 msgid "The directory in which sockets will be found/created." -msgstr "" +msgstr "Das Verzeichnis, in dem Sockets gefunden werden können bzw. erstellt werden." #. type: deftypevr -#: doc/guix.texi:21471 +#: doc/guix.texi:21468 msgid "Defaults to @samp{\"/var/run/libvirt\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"/var/run/libvirt\"}." #. type: deftypevr -#: doc/guix.texi:21474 +#: doc/guix.texi:21471 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette auth-unix-ro" #. type: deftypevr -#: doc/guix.texi:21477 +#: doc/guix.texi:21474 msgid "Authentication scheme for UNIX read-only sockets. By default socket permissions allow anyone to connect" -msgstr "" +msgstr "Authentifizierungsschema für nur lesbare UNIX-Sockets. Nach Vorgabe gestatten es die Socket-Berechtigungen jedem Nutzer, sich zu verbinden." #. type: deftypevr -#: doc/guix.texi:21479 doc/guix.texi:21488 +#: doc/guix.texi:21476 doc/guix.texi:21485 msgid "Defaults to @samp{\"polkit\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"polkit\"}." #. type: deftypevr -#: doc/guix.texi:21482 +#: doc/guix.texi:21479 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette auth-unix-rw" #. type: deftypevr -#: doc/guix.texi:21486 +#: doc/guix.texi:21483 msgid "Authentication scheme for UNIX read-write sockets. By default socket permissions only allow root. If PolicyKit support was compiled into libvirt, the default will be to use 'polkit' auth." -msgstr "" +msgstr "Authentifizierungsschema für UNIX-Sockets mit Schreib- und Lesezugriff. Nach Vorgabe erlauben die Socket-Berechtigungen nur dem Administratornutzer root Zugriff. Wenn libvirt mit Unterstützung für PolicyKit kompiliert wurde, ist die Vorgabe, Authentifizierung über „polkit“ durchzuführen." #. type: deftypevr -#: doc/guix.texi:21491 +#: doc/guix.texi:21488 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-tcp" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette auth-tcp" #. type: deftypevr -#: doc/guix.texi:21495 +#: doc/guix.texi:21492 msgid "Authentication scheme for TCP sockets. If you don't enable SASL, then all TCP traffic is cleartext. Don't do this outside of a dev/test scenario." -msgstr "" +msgstr "Authentifizierungsschema für TCP-Sockets. Wenn Sie SASL nicht aktivieren, dann wird alle TCP-Kommunikation im Klartext verschickt. Tun Sie dies @emph{nicht}, außer Sie benutzen libvirt nur als Entwickler oder zum Testen." #. type: deftypevr -#: doc/guix.texi:21497 +#: doc/guix.texi:21494 msgid "Defaults to @samp{\"sasl\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"sasl\"}." #. type: deftypevr -#: doc/guix.texi:21500 +#: doc/guix.texi:21497 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-tls" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette auth-tls" #. type: deftypevr -#: doc/guix.texi:21504 +#: doc/guix.texi:21501 msgid "Authentication scheme for TLS sockets. TLS sockets already have encryption provided by the TLS layer, and limited authentication is done by certificates." -msgstr "" +msgstr "Authentifizierungsschema für TLS-Sockets. Für TLS-Sockets wird bereits durch die TLS-Schicht Verschlüsselung bereitgestellt und eingeschränkte Authentifizierung wird über Zertifikate durchgeführt." #. type: deftypevr -#: doc/guix.texi:21507 +#: doc/guix.texi:21504 msgid "It is possible to make use of any SASL authentication mechanism as well, by using 'sasl' for this option" -msgstr "" +msgstr "Es ist möglich, auch hier den SASL-Authentifizierungsmechanismus anzuwenden, indem Sie für diese Option „sasl“ eintragen." #. type: deftypevr -#: doc/guix.texi:21509 +#: doc/guix.texi:21506 msgid "Defaults to @samp{\"none\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"none\"}, d.h.@: keine zusätzliche Authentifizierung." #. type: deftypevr -#: doc/guix.texi:21512 +#: doc/guix.texi:21509 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Optional-nichtleere-Liste access-drivers" #. type: deftypevr -#: doc/guix.texi:21514 +#: doc/guix.texi:21511 msgid "API access control scheme." -msgstr "" +msgstr "Welche Schemata zur Zugriffskontrolle auf Programmierschnittstellen (APIs) benutzt werden." #. type: deftypevr -#: doc/guix.texi:21517 +#: doc/guix.texi:21514 msgid "By default an authenticated user is allowed access to all APIs. Access drivers can place restrictions on this." -msgstr "" +msgstr "Nach Vorgabe kann ein authentifizierter Nutzer auf alle Programmierschnittstellen zugreifen. Zugriffstreiber können dies einschränken." #. type: deftypevr -#: doc/guix.texi:21522 +#: doc/guix.texi:21519 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string key-file" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette key-file" #. type: deftypevr -#: doc/guix.texi:21525 +#: doc/guix.texi:21522 msgid "Server key file path. If set to an empty string, then no private key is loaded." -msgstr "" +msgstr "Pfad zur Schlüsseldatei für den Server. Wenn er auf eine leere Zeichenkette gesetzt ist, dann wird kein privater Schlüssel geladen." #. type: deftypevr -#: doc/guix.texi:21530 +#: doc/guix.texi:21527 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string cert-file" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette cert-file" #. type: deftypevr -#: doc/guix.texi:21533 +#: doc/guix.texi:21530 msgid "Server key file path. If set to an empty string, then no certificate is loaded." -msgstr "" +msgstr "Pfad zur Zertifikatsdatei für den Server. Wenn er auf eine leere Zeichenkette gesetzt ist, dann wird kein Zertifikat geladen." #. type: deftypevr -#: doc/guix.texi:21538 +#: doc/guix.texi:21535 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string ca-file" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette ca-file" #. type: deftypevr -#: doc/guix.texi:21541 +#: doc/guix.texi:21538 msgid "Server key file path. If set to an empty string, then no CA certificate is loaded." -msgstr "" +msgstr "Pfad zur Datei mit dem Zertifikat der Zertifikatsautorität. Wenn er auf eine leere Zeichenkette gesetzt ist, dann wird kein Zertifikat der Zertifikatsautorität geladen." #. type: deftypevr -#: doc/guix.texi:21546 +#: doc/guix.texi:21543 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string crl-file" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette crl-file" #. type: deftypevr -#: doc/guix.texi:21549 +#: doc/guix.texi:21546 msgid "Certificate revocation list path. If set to an empty string, then no CRL is loaded." -msgstr "" +msgstr "Pfad zur Zertifikatssperrliste („Certificate Revocation List“). Wenn er auf eine leere Zeichenkette gesetzt ist, dann wird keine Zertifikatssperrliste geladen." #. type: deftypevr -#: doc/guix.texi:21554 +#: doc/guix.texi:21551 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Boolescher-Ausdruck tls-no-sanity-cert" #. type: deftypevr -#: doc/guix.texi:21556 +#: doc/guix.texi:21553 msgid "Disable verification of our own server certificates." -msgstr "" +msgstr "Keine Überprüfung unseres eigenen Serverzertifikats durchführen." #. type: deftypevr -#: doc/guix.texi:21559 +#: doc/guix.texi:21556 msgid "When libvirtd starts it performs some sanity checks against its own certificates." -msgstr "" +msgstr "Beim Start vom libvirtd prüft dieser, ob bei seinem eigenen Zertifikat alles in Ordnung ist." #. type: deftypevr -#: doc/guix.texi:21564 +#: doc/guix.texi:21561 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Boolescher-Ausdruck tls-no-verify-cert" #. type: deftypevr -#: doc/guix.texi:21566 +#: doc/guix.texi:21563 msgid "Disable verification of client certificates." -msgstr "" +msgstr "Keine Überprüfung von Clientzertifikaten durchführen." #. type: deftypevr -#: doc/guix.texi:21570 +#: doc/guix.texi:21567 msgid "Client certificate verification is the primary authentication mechanism. Any client which does not present a certificate signed by the CA will be rejected." -msgstr "" +msgstr "Die Überprüfung des Zertifikats eines Clients ist der primäre Authentifizierungsmechanismus. Jeder Client, der kein von der Zertifikatsautorität signiertes Zertifikat vorweist, wird abgelehnt." #. type: deftypevr -#: doc/guix.texi:21575 +#: doc/guix.texi:21572 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Optional-nichtleere-Liste tls-allowed-dn-list" #. type: deftypevr -#: doc/guix.texi:21577 +#: doc/guix.texi:21574 msgid "Whitelist of allowed x509 Distinguished Name." -msgstr "" +msgstr "Liste der erlaubten Einträge für den „Distinguished Name“ bei x509." #. type: deftypevr -#: doc/guix.texi:21582 +#: doc/guix.texi:21579 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Optional-nichtleere-Liste sasl-allowed-usernames" #. type: deftypevr -#: doc/guix.texi:21585 +#: doc/guix.texi:21582 msgid "Whitelist of allowed SASL usernames. The format for username depends on the SASL authentication mechanism." -msgstr "" +msgstr "Liste der erlaubten Einträge für SASL-Benutzernamen. Wie Benutzernamen aussehen müssen, ist abhängig vom jeweiligen SASL-Mechanismus." #. type: deftypevr -#: doc/guix.texi:21590 +#: doc/guix.texi:21587 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tls-priority" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette tls-priority" #. type: deftypevr -#: doc/guix.texi:21594 +#: doc/guix.texi:21591 msgid "Override the compile time default TLS priority string. The default is usually \"NORMAL\" unless overridden at build time. Only set this is it is desired for libvirt to deviate from the global default settings." -msgstr "" +msgstr "Dies wird vorrangig statt der beim Kompilieren voreingestellten TLS-Prioritätszeichenkette verwendet. Die Voreinstellung ist in der Regel \"NORMAL\", solange dies nicht bei der Erstellung geändert wurde. Ändern Sie dies nur, wenn die Einstellungen für libvirt von den globalen Voreinstellungen abweichen sollen." #. type: deftypevr -#: doc/guix.texi:21596 +#: doc/guix.texi:21593 msgid "Defaults to @samp{\"NORMAL\"}." -msgstr "" +msgstr "Die Vorgabe @samp{\"NORMAL\"}." #. type: deftypevr -#: doc/guix.texi:21599 +#: doc/guix.texi:21596 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-clients" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl max-clients" #. type: deftypevr -#: doc/guix.texi:21602 doc/guix.texi:22025 +#: doc/guix.texi:21599 doc/guix.texi:22022 msgid "Maximum number of concurrent client connections to allow over all sockets combined." -msgstr "" +msgstr "Maximalzahl gleichzeitiger Client-Verbindungen, die für alle Sockets zusammen zugelassen werden sollen." #. type: deftypevr -#: doc/guix.texi:21604 +#: doc/guix.texi:21601 msgid "Defaults to @samp{5000}." -msgstr "" +msgstr "Die Vorgabe ist @samp{5000}." #. type: deftypevr -#: doc/guix.texi:21607 +#: doc/guix.texi:21604 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl max-queued-clients" #. type: deftypevr -#: doc/guix.texi:21611 +#: doc/guix.texi:21608 msgid "Maximum length of queue of connections waiting to be accepted by the daemon. Note, that some protocols supporting retransmission may obey this so that a later reattempt at connection succeeds." -msgstr "" +msgstr "Maximale Länge der Warteschlange für Verbindungen, die darauf warten, vom Daemon angenommen zu werden. Beachten Sie, dass sich manche Protokolle, die Neuübertragung unterstützen, danach richten könnten, damit ein erneuter Verbindungsversuch angenommen wird." #. type: deftypevr -#: doc/guix.texi:21616 +#: doc/guix.texi:21613 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl max-anonymous-clients" #. type: deftypevr -#: doc/guix.texi:21619 +#: doc/guix.texi:21616 msgid "Maximum length of queue of accepted but not yet authenticated clients. Set this to zero to turn this feature off" -msgstr "" +msgstr "Maximale Länge der Warteschlange für Clients, die angenommen wurden, aber noch nicht authentifiziert wurden. Setzen Sie dies auf null, um diese Funktionalität abzuschalten." #. type: deftypevr -#: doc/guix.texi:21621 doc/guix.texi:21639 doc/guix.texi:21655 +#: doc/guix.texi:21618 doc/guix.texi:21636 doc/guix.texi:21652 msgid "Defaults to @samp{20}." -msgstr "" +msgstr "Die Vorgabe ist @samp{20}." #. type: deftypevr -#: doc/guix.texi:21624 +#: doc/guix.texi:21621 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer min-workers" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl min-workers" #. type: deftypevr -#: doc/guix.texi:21626 +#: doc/guix.texi:21623 msgid "Number of workers to start up initially." -msgstr "" +msgstr "Anzahl an Arbeiter-Threads, die am Anfang gestartet werden sollen." #. type: deftypevr -#: doc/guix.texi:21631 +#: doc/guix.texi:21628 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-workers" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl max-workers" #. type: deftypevr -#: doc/guix.texi:21633 +#: doc/guix.texi:21630 msgid "Maximum number of worker threads." -msgstr "" +msgstr "Maximale Anzahl an Arbeiter-Threads." #. type: deftypevr -#: doc/guix.texi:21637 +#: doc/guix.texi:21634 msgid "If the number of active clients exceeds @code{min-workers}, then more threads are spawned, up to max_workers limit. Typically you'd want max_workers to equal maximum number of clients allowed." -msgstr "" +msgstr "Wenn die Anzahl aktiver Clients die @code{min-workers} übersteigt, werden weitere Threads erzeugt, bis die max_workers-Beschränkung erreicht wurde. Typischerweise würden Sie für max_workers die maximale Anzahl zugelassener Clients angeben." #. type: deftypevr -#: doc/guix.texi:21642 +#: doc/guix.texi:21639 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer prio-workers" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl prio-workers" #. type: deftypevr -#: doc/guix.texi:21646 +#: doc/guix.texi:21643 msgid "Number of priority workers. If all workers from above pool are stuck, some calls marked as high priority (notably domainDestroy) can be executed in this pool." -msgstr "" +msgstr "Die Anzahl priorisierter Arbeiter-Threads. Wenn alle Arbeiter aus diesem Pool festhängen, können manche, mit hoher Priorität versehene Aufrufe (speziell domainDestroy) in diesem Pool hier ausgeführt werden." #. type: deftypevr -#: doc/guix.texi:21651 +#: doc/guix.texi:21648 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-requests" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl max-requests" #. type: deftypevr -#: doc/guix.texi:21653 +#: doc/guix.texi:21650 msgid "Total global limit on concurrent RPC calls." -msgstr "" +msgstr "Wieviele nebenläufige RPC-Aufrufe global ausgeführt werden können." #. type: deftypevr -#: doc/guix.texi:21658 +#: doc/guix.texi:21655 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-client-requests" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl max-client-requests" #. type: deftypevr -#: doc/guix.texi:21662 +#: doc/guix.texi:21659 msgid "Limit on concurrent requests from a single client connection. To avoid one client monopolizing the server this should be a small fraction of the global max_requests and max_workers parameter." -msgstr "" +msgstr "Wieviele nebenläufige Anfragen von einer einzelnen Client-Verbindung ausgehen können. Um zu verhindern, dass ein einzelner Client den gesamten Server für sich beansprucht, sollte der Wert hier nur einen kleinen Teil der globalen max_requests- und max_workers-Parameter ausmachen." #. type: deftypevr -#: doc/guix.texi:21667 +#: doc/guix.texi:21664 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl admin-min-workers" #. type: deftypevr -#: doc/guix.texi:21669 +#: doc/guix.texi:21666 msgid "Same as @code{min-workers} but for the admin interface." -msgstr "" +msgstr "Wie bei @code{min-workers}, aber für die Administratorschnittstelle." #. type: deftypevr -#: doc/guix.texi:21674 +#: doc/guix.texi:21671 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl admin-max-workers" #. type: deftypevr -#: doc/guix.texi:21676 +#: doc/guix.texi:21673 msgid "Same as @code{max-workers} but for the admin interface." -msgstr "" +msgstr "Wie bei @code{max-workers}, aber für die Administratorschnittstelle." #. type: deftypevr -#: doc/guix.texi:21681 +#: doc/guix.texi:21678 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl admin-max-clients" #. type: deftypevr -#: doc/guix.texi:21683 +#: doc/guix.texi:21680 msgid "Same as @code{max-clients} but for the admin interface." -msgstr "" +msgstr "Wie bei @code{max-clients}, aber für die Administratorschnittstelle." #. type: deftypevr -#: doc/guix.texi:21688 +#: doc/guix.texi:21685 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl admin-max-queued-clients" #. type: deftypevr -#: doc/guix.texi:21690 +#: doc/guix.texi:21687 msgid "Same as @code{max-queued-clients} but for the admin interface." -msgstr "" +msgstr "Wie bei @code{max-queued-clients}, aber für die Administratorschnittstelle." #. type: deftypevr -#: doc/guix.texi:21695 +#: doc/guix.texi:21692 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl admin-max-client-requests" #. type: deftypevr -#: doc/guix.texi:21697 +#: doc/guix.texi:21694 msgid "Same as @code{max-client-requests} but for the admin interface." -msgstr "" +msgstr "Wie bei @code{max-client-requests}, aber für die Administratorschnittstelle." #. type: deftypevr -#: doc/guix.texi:21702 +#: doc/guix.texi:21699 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer log-level" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl log-level" #. type: deftypevr -#: doc/guix.texi:21704 doc/guix.texi:21927 +#: doc/guix.texi:21701 doc/guix.texi:21924 msgid "Logging level. 4 errors, 3 warnings, 2 information, 1 debug." -msgstr "" +msgstr "Protokollstufe. 4 für Fehler, 3 für Warnungen, 2 für Informationen, 1 zur Fehlersuche." #. type: deftypevr -#: doc/guix.texi:21709 +#: doc/guix.texi:21706 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string log-filters" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette log-filters" #. type: deftypevr -#: doc/guix.texi:21711 doc/guix.texi:21934 +#: doc/guix.texi:21708 doc/guix.texi:21931 msgid "Logging filters." -msgstr "" +msgstr "Protokollfilter." #. type: deftypevr -#: doc/guix.texi:21714 doc/guix.texi:21937 +#: doc/guix.texi:21711 doc/guix.texi:21934 msgid "A filter allows to select a different logging level for a given category of logs The format for a filter is one of:" -msgstr "" +msgstr "Ein Filter ermöglicht es, für eine bestimmte Kategorie von Protokollen eine andere Protokollierungsstufe festzulegen. Filter müssen eines der folgenden Formate haben:" #. type: itemize -#: doc/guix.texi:21718 doc/guix.texi:21941 +#: doc/guix.texi:21715 doc/guix.texi:21938 msgid "x:name" -msgstr "" +msgstr "x:Name" #. type: itemize -#: doc/guix.texi:21721 doc/guix.texi:21944 +#: doc/guix.texi:21718 doc/guix.texi:21941 msgid "x:+name" -msgstr "" +msgstr "x:+Name" #. type: deftypevr -#: doc/guix.texi:21731 doc/guix.texi:21954 +#: doc/guix.texi:21728 doc/guix.texi:21951 msgid "where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., \"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a substring of the full category name, in order to match multiple similar categories), the optional \"+\" prefix tells libvirt to log stack trace for each message matching name, and @code{x} is the minimal level where matching messages should be logged:" -msgstr "" +msgstr "wobei @code{Name} eine Zeichenkette ist, die zu einer in der Umgebungsvariablen @code{VIR_LOG_INIT()} am Anfang jeder Quelldatei von libvirt angegebenen Kategorie passen muss, z.B.@: „remote“, „qemu“ oder „util.json“ (der Name im Filter kann auch nur ein Teil des vollständigen Kategoriennamens sein, wodurch mehrere, ähnliche passende Kategoriennamen möglich sind). Das optionale Präfix „+“ bedeutet, dass libvirt eine Rückverfolgung (d.h.@: ein „Stack Trace“) für jede zum Namen passende Nachricht ins Protokoll schreiben soll. @code{x} benennt jeweils die kleinste Stufe, deren passende Nachrichten protokolliert werden sollen." + +#. type: itemize +#: doc/guix.texi:21732 doc/guix.texi:21777 doc/guix.texi:21955 +#: doc/guix.texi:22000 +msgid "1: DEBUG" +msgstr "1: Fehlersuche („DEBUG“)" #. type: itemize #: doc/guix.texi:21735 doc/guix.texi:21780 doc/guix.texi:21958 #: doc/guix.texi:22003 -msgid "1: DEBUG" -msgstr "" +msgid "2: INFO" +msgstr "2: Informationen („INFO“)" #. type: itemize #: doc/guix.texi:21738 doc/guix.texi:21783 doc/guix.texi:21961 #: doc/guix.texi:22006 -msgid "2: INFO" -msgstr "" +msgid "3: WARNING" +msgstr "3: Warnungen („WARNING“)" #. type: itemize #: doc/guix.texi:21741 doc/guix.texi:21786 doc/guix.texi:21964 #: doc/guix.texi:22009 -msgid "3: WARNING" -msgstr "" - -#. type: itemize -#: doc/guix.texi:21744 doc/guix.texi:21789 doc/guix.texi:21967 -#: doc/guix.texi:22012 msgid "4: ERROR" -msgstr "" +msgstr "4: Fehler („ERROR“)" #. type: deftypevr -#: doc/guix.texi:21749 doc/guix.texi:21972 +#: doc/guix.texi:21746 doc/guix.texi:21969 msgid "Multiple filters can be defined in a single filters statement, they just need to be separated by spaces." -msgstr "" +msgstr "Mehrere Filter können in einer einzelnen Filteranweisung definiert werden; sie müssen nur durch Leerzeichen voneinander getrennt werden." #. type: deftypevr -#: doc/guix.texi:21751 doc/guix.texi:21974 +#: doc/guix.texi:21748 doc/guix.texi:21971 msgid "Defaults to @samp{\"3:remote 4:event\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"3:remote 4:event\"}." #. type: deftypevr -#: doc/guix.texi:21754 +#: doc/guix.texi:21751 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string log-outputs" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette log-outputs" #. type: deftypevr -#: doc/guix.texi:21756 doc/guix.texi:21979 +#: doc/guix.texi:21753 doc/guix.texi:21976 msgid "Logging outputs." -msgstr "" +msgstr "Ausgaben für die Protokollierung." #. type: deftypevr -#: doc/guix.texi:21759 +#: doc/guix.texi:21756 msgid "An output is one of the places to save logging information. The format for an output can be:" -msgstr "" +msgstr "Eine Ausgabe ist einer der Orte, wohin Informationen aus der Protokollierung gespeichert werden. Eine Ausgabe kann auf eine der folgenden Arten angegeben werden:" #. type: item -#: doc/guix.texi:21761 doc/guix.texi:21984 +#: doc/guix.texi:21758 doc/guix.texi:21981 #, no-wrap msgid "x:stderr" -msgstr "" +msgstr "x:stderr" #. type: table -#: doc/guix.texi:21763 doc/guix.texi:21986 +#: doc/guix.texi:21760 doc/guix.texi:21983 msgid "output goes to stderr" -msgstr "" +msgstr "Protokolle werden auf der Standardausgabe („Stderr“) ausgegeben." #. type: item -#: doc/guix.texi:21764 doc/guix.texi:21987 +#: doc/guix.texi:21761 doc/guix.texi:21984 #, no-wrap msgid "x:syslog:name" -msgstr "" +msgstr "x:syslog:Name" #. type: table -#: doc/guix.texi:21766 doc/guix.texi:21989 +#: doc/guix.texi:21763 doc/guix.texi:21986 msgid "use syslog for the output and use the given name as the ident" -msgstr "" +msgstr "Syslog wird zur Ausgabe benutzt. Der Name dient dabei als Identifikator für libvirt-Protokolle." #. type: item -#: doc/guix.texi:21767 doc/guix.texi:21990 +#: doc/guix.texi:21764 doc/guix.texi:21987 #, no-wrap msgid "x:file:file_path" -msgstr "" +msgstr "x:file:Dateipfad" #. type: table -#: doc/guix.texi:21769 doc/guix.texi:21992 +#: doc/guix.texi:21766 doc/guix.texi:21989 msgid "output to a file, with the given filepath" -msgstr "" +msgstr "Protokolle werden in die Datei unter dem angegebenen Dateipfad ausgegeben." #. type: item -#: doc/guix.texi:21770 doc/guix.texi:21993 +#: doc/guix.texi:21767 doc/guix.texi:21990 #, no-wrap msgid "x:journald" -msgstr "" +msgstr "x:journald" #. type: table -#: doc/guix.texi:21772 doc/guix.texi:21995 +#: doc/guix.texi:21769 doc/guix.texi:21992 msgid "output to journald logging system" -msgstr "" +msgstr "Die Ausgabe läuft über das journald-Protokollsystem." #. type: deftypevr -#: doc/guix.texi:21776 doc/guix.texi:21999 +#: doc/guix.texi:21773 doc/guix.texi:21996 msgid "In all case the x prefix is the minimal level, acting as a filter" -msgstr "" +msgstr "In allen Fällen steht das x vorne für die kleinste Stufe und wirkt als Filter." #. type: deftypevr -#: doc/guix.texi:21794 doc/guix.texi:22017 +#: doc/guix.texi:21791 doc/guix.texi:22014 msgid "Multiple outputs can be defined, they just need to be separated by spaces." -msgstr "" +msgstr "Mehrere Ausgaben können definiert werden, dazu müssen sie nur durch Leerzeichen getrennt hier angegeben werden." #. type: deftypevr -#: doc/guix.texi:21796 doc/guix.texi:22019 +#: doc/guix.texi:21793 doc/guix.texi:22016 msgid "Defaults to @samp{\"3:stderr\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"3:stderr\"}." #. type: deftypevr -#: doc/guix.texi:21799 +#: doc/guix.texi:21796 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer audit-level" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl audit-level" #. type: deftypevr -#: doc/guix.texi:21801 +#: doc/guix.texi:21798 msgid "Allows usage of the auditing subsystem to be altered" -msgstr "" +msgstr "Ermöglicht Anpassungen am Auditierungs-Subsystem." #. type: itemize -#: doc/guix.texi:21805 +#: doc/guix.texi:21802 msgid "0: disable all auditing" -msgstr "" +msgstr "0: Jegliche Auditierung deaktivieren." #. type: itemize -#: doc/guix.texi:21808 +#: doc/guix.texi:21805 msgid "1: enable auditing, only if enabled on host" -msgstr "" +msgstr "1: Auditierung nur aktivieren, wenn sie beim Wirtssystem aktiviert ist." #. type: itemize -#: doc/guix.texi:21811 +#: doc/guix.texi:21808 msgid "2: enable auditing, and exit if disabled on host." -msgstr "" +msgstr "2: Auditierung aktivieren. Beenden, wenn das Wirtssystem Auditierung deaktiviert hat." #. type: deftypevr -#: doc/guix.texi:21818 +#: doc/guix.texi:21815 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean audit-logging" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Boolescher-Ausdruck audit-logging" #. type: deftypevr -#: doc/guix.texi:21820 +#: doc/guix.texi:21817 msgid "Send audit messages via libvirt logging infrastructure." -msgstr "" +msgstr "Audit-Nachrichten über die Protokollinfrastruktur von libvirt versenden." #. type: deftypevr -#: doc/guix.texi:21825 +#: doc/guix.texi:21822 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Optional-nichtleere-Zeichenkette host-uuid" #. type: deftypevr -#: doc/guix.texi:21827 +#: doc/guix.texi:21824 msgid "Host UUID. UUID must not have all digits be the same." -msgstr "" +msgstr "Für das Wirtssystem zu verwendende UUID. Bei der UUID dürfen nicht alle Ziffern gleich sein." #. type: deftypevr -#: doc/guix.texi:21832 +#: doc/guix.texi:21829 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string host-uuid-source" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Zeichenkette host-uuid-source" #. type: deftypevr -#: doc/guix.texi:21834 +#: doc/guix.texi:21831 msgid "Source to read host UUID." -msgstr "" +msgstr "Die Quelle, von der die UUID des Wirtssystems genommen wird." #. type: itemize -#: doc/guix.texi:21838 +#: doc/guix.texi:21835 msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}" -msgstr "" +msgstr "@code{smbios}: Die UUID von @code{dmidecode -s system-uuid} holen." #. type: itemize -#: doc/guix.texi:21841 +#: doc/guix.texi:21838 msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}" -msgstr "" +msgstr "@code{machine-id}: Die UUID aus @code{/etc/machine-id} holen." #. type: deftypevr -#: doc/guix.texi:21846 +#: doc/guix.texi:21843 msgid "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated." -msgstr "" +msgstr "Falls @code{dmidecode} keine gültige UUID liefert, wird eine temporäre UUID generiert." #. type: deftypevr -#: doc/guix.texi:21848 +#: doc/guix.texi:21845 msgid "Defaults to @samp{\"smbios\"}." -msgstr "" +msgstr "Die Vorgabe ist @samp{\"smbios\"}." #. type: deftypevr -#: doc/guix.texi:21851 +#: doc/guix.texi:21848 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl keepalive-interval" #. type: deftypevr -#: doc/guix.texi:21856 +#: doc/guix.texi:21853 msgid "A keepalive message is sent to a client after @code{keepalive_interval} seconds of inactivity to check if the client is still responding. If set to -1, libvirtd will never send keepalive requests; however clients can still send them and the daemon will send responses." -msgstr "" +msgstr "Einem Client wird eine Nachricht zum Aufrechterhalten der Verbindung gesendet, nachdem @code{keepalive_interval} Sekunden lang keine Aktivität stattgefunden hat. Damit kann überprüft werden, ob der Client noch antwortet. Wird dieses Feld auf -1 gesetzt, wird libvirtd niemals Aufrechterhaltungsanfragen senden; Clients können diese aber weiterhin dem Daemon schicken und er wird auf diese antworten." #. type: deftypevr -#: doc/guix.texi:21861 +#: doc/guix.texi:21858 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer keepalive-count" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl keepalive-count" #. type: deftypevr -#: doc/guix.texi:21865 +#: doc/guix.texi:21862 msgid "Maximum number of keepalive messages that are allowed to be sent to the client without getting any response before the connection is considered broken." -msgstr "" +msgstr "Wieviele Aufrechterhaltungsnachrichten höchstens zum Client geschickt werden dürfen, ohne dass eine Antwort zurückgekommen ist, bevor die Verbindung als abgebrochen gilt." #. type: deftypevr -#: doc/guix.texi:21872 +#: doc/guix.texi:21869 msgid "In other words, the connection is automatically closed approximately after @code{keepalive_interval * (keepalive_count + 1)} seconds since the last message received from the client. When @code{keepalive-count} is set to 0, connections will be automatically closed after @code{keepalive-interval} seconds of inactivity without sending any keepalive messages." -msgstr "" +msgstr "Mit anderen Worten wird die Verbindung ungefähr dann automatisch geschlossen, wenn @code{keepalive_interval * (keepalive_count + 1)} Sekunden seit der letzten vom Client empfangenen Nachricht vergangen sind. Wenn @code{keepalive-count} auf 0 gesetzt wurde, werden Verbindungen dann automatisch geschlossen, wenn @code{keepalive-interval} Sekunden der Inaktivität vorausgegangen sind, ohne dass eine Aufrechterhaltungsnachricht versandt wurde." #. type: deftypevr -#: doc/guix.texi:21877 +#: doc/guix.texi:21874 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl admin-keepalive-interval" #. type: deftypevr -#: doc/guix.texi:21879 doc/guix.texi:21886 +#: doc/guix.texi:21876 doc/guix.texi:21883 msgid "Same as above but for admin interface." -msgstr "" +msgstr "Wie oben, aber für die Administratorschnittstelle." #. type: deftypevr -#: doc/guix.texi:21884 +#: doc/guix.texi:21881 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl admin-keepalive-count" #. type: deftypevr -#: doc/guix.texi:21891 +#: doc/guix.texi:21888 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout" -msgstr "" +msgstr "{@code{libvirt-configuration}-Parameter} Ganze-Zahl ovs-timeout" #. type: deftypevr -#: doc/guix.texi:21893 +#: doc/guix.texi:21890 msgid "Timeout for Open vSwitch calls." -msgstr "" +msgstr "Zeitbeschränkung für Aufrufe über Open vSwitch." #. type: deftypevr -#: doc/guix.texi:21897 +#: doc/guix.texi:21894 msgid "The @code{ovs-vsctl} utility is used for the configuration and its timeout option is set by default to 5 seconds to avoid potential infinite waits blocking libvirt." -msgstr "" +msgstr "Das Werkzeug @code{ovs-vsctl} wird zur Konfiguration benutzt; die dort eingestellte Zeitbeschränkung ist nach Voreinstellung auf 5 Sekunden festgelegt, um zu verhindern, dass libvirt durch unbegrenztes Warten blockiert werden kann." #. type: subsubheading -#: doc/guix.texi:21904 +#: doc/guix.texi:21901 #, no-wrap msgid "Virtlog daemon" -msgstr "" +msgstr "Virtlog-Daemon" #. type: Plain text -#: doc/guix.texi:21907 +#: doc/guix.texi:21904 msgid "The virtlogd service is a server side daemon component of libvirt that is used to manage logs from virtual machine consoles." -msgstr "" +msgstr "Der virtlogd-Dienst ist eine serverseitige Daemon-Komponente von libvirt, die benutzt wird, um Protokolle der Konsolen von virtuellen Maschinen zu verwalten." #. type: Plain text -#: doc/guix.texi:21913 +#: doc/guix.texi:21910 msgid "This daemon is not used directly by libvirt client applications, rather it is called on their behalf by @code{libvirtd}. By maintaining the logs in a standalone daemon, the main @code{libvirtd} daemon can be restarted without risk of losing logs. The @code{virtlogd} daemon has the ability to re-exec() itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime." -msgstr "" +msgstr "Dieser Daemon wird von libvirt-Clientanwendungen nicht direkt benutzt, sondern wird an deren Stelle vom @code{libvirtd} aufgerufen. Indem die Protokolle in einem eigenständigen Daemon vorgehalten werden, kann der eigentliche @code{libvirtd}-Daemon neu gestartet werden, ohne dass man riskiert, Protokolle zu verlieren. Der @code{virtlogd}-Daemon hat die Fähigkeit, sich selbst erneut mit exec() zu starten, wenn er @code{SIGUSR1} empfängt, damit Aktualisierungen ohne Ausfall möglich sind." #. type: deffn -#: doc/guix.texi:21914 +#: doc/guix.texi:21911 #, no-wrap msgid "{Scheme Variable} virtlog-service-type" -msgstr "" +msgstr "{Scheme-Variable} virtlog-service-type" #. type: deffn -#: doc/guix.texi:21917 +#: doc/guix.texi:21914 msgid "This is the type of the virtlog daemon. Its value must be a @code{virtlog-configuration}." -msgstr "" +msgstr "Dies ist der Diensttyp des virtlog-Daemons. Sein Wert muss eine @code{virtlog-configuration} sein." #. type: example -#: doc/guix.texi:21922 +#: doc/guix.texi:21919 #, no-wrap msgid "" "(service virtlog-service-type\n" " (virtlog-configuration\n" " (max-clients 1000)))\n" msgstr "" +"(service virtlog-service-type\n" +" (virtlog-configuration\n" +" (max-clients 1000)))\n" #. type: deftypevr -#: doc/guix.texi:21925 +#: doc/guix.texi:21922 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer log-level" -msgstr "" +msgstr "{@code{virtlog-configuration}-Parameter} Ganze-Zahl log-level" #. type: deftypevr -#: doc/guix.texi:21932 +#: doc/guix.texi:21929 #, no-wrap msgid "{@code{virtlog-configuration} parameter} string log-filters" -msgstr "" +msgstr "{@code{virtlog-configuration}-Parameter} Zeichenkette log-filters" #. type: deftypevr -#: doc/guix.texi:21977 +#: doc/guix.texi:21974 #, no-wrap msgid "{@code{virtlog-configuration} parameter} string log-outputs" -msgstr "" +msgstr "{@code{virtlog-configuration}-Parameter} Zeichenkette log-outputs" #. type: deftypevr -#: doc/guix.texi:21982 +#: doc/guix.texi:21979 msgid "An output is one of the places to save logging information The format for an output can be:" -msgstr "" +msgstr "Als Ausgabe bezeichnen wir einen der Orte, an denen Protokollinformationen gespeichert werden. Eine Ausgabe wird auf eine der folgenden Arten angegeben:" #. type: deftypevr -#: doc/guix.texi:22022 +#: doc/guix.texi:22019 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-clients" -msgstr "" +msgstr "{@code{virtlog-configuration}-Parameter} Ganze-Zahl max-clients" #. type: deftypevr -#: doc/guix.texi:22027 +#: doc/guix.texi:22024 msgid "Defaults to @samp{1024}." -msgstr "" +msgstr "Die Vorgabe ist @samp{1024}." #. type: deftypevr -#: doc/guix.texi:22030 +#: doc/guix.texi:22027 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-size" -msgstr "" +msgstr "{@code{virtlog-configuration}-Parameter} Ganze-Zahl max-size" #. type: deftypevr -#: doc/guix.texi:22032 +#: doc/guix.texi:22029 msgid "Maximum file size before rolling over." -msgstr "" +msgstr "Wie groß eine Protokolldatei werden darf, bevor eine neue begonnen wird." #. type: deftypevr -#: doc/guix.texi:22034 +#: doc/guix.texi:22031 msgid "Defaults to @samp{2MB}" -msgstr "" +msgstr "Die Vorgabe ist @samp{2MB}." #. type: deftypevr -#: doc/guix.texi:22037 +#: doc/guix.texi:22034 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-backups" -msgstr "" +msgstr "{@code{virtlog-configuration}-Parameter} Ganze-Zahl max-backups" #. type: deftypevr -#: doc/guix.texi:22039 +#: doc/guix.texi:22036 msgid "Maximum number of backup files to keep." -msgstr "" +msgstr "Wieviele Dateien mit Sicherungskopien gespeichert bleiben sollen." #. type: deftypevr -#: doc/guix.texi:22041 +#: doc/guix.texi:22038 msgid "Defaults to @samp{3}" -msgstr "" +msgstr "Die Vorgabe ist @samp{3}." #. type: subsubheading -#: doc/guix.texi:22044 +#: doc/guix.texi:22041 #, no-wrap msgid "Transparent Emulation with QEMU" -msgstr "" +msgstr "Transparente Emulation mit QEMU" #. type: cindex -#: doc/guix.texi:22046 +#: doc/guix.texi:22043 #, no-wrap msgid "emulation" -msgstr "" +msgstr "Emulation" #. type: code{#1} -#: doc/guix.texi:22047 +#: doc/guix.texi:22044 #, no-wrap msgid "binfmt_misc" -msgstr "" +msgstr "binfmt_misc" #. type: Plain text -#: doc/guix.texi:22053 +#: doc/guix.texi:22050 msgid "@code{qemu-binfmt-service-type} provides support for transparent emulation of program binaries built for different architectures---e.g., it allows you to transparently execute an ARMv7 program on an x86_64 machine. It achieves this by combining the @uref{https://www.qemu.org, QEMU} emulator and the @code{binfmt_misc} feature of the kernel Linux." -msgstr "" +msgstr "Mit @code{qemu-binfmt-service-type} wird transparente Emulation von Programm-Binärdateien, die für unterschiedliche Architekturen erstellt wurden, ermöglicht. Z.B.@: können Sie ein ARMv7-Programm „einfach so“ transparent auf einer x86_64-Maschine ausführen. Dazu wird der @uref{https://www.qemu.org, QEMU-Emulator} mit der @code{binfmt_misc}-Funktionalität des Kernels Linux kombiniert." #. type: defvr -#: doc/guix.texi:22054 +#: doc/guix.texi:22051 #, no-wrap msgid "{Scheme Variable} qemu-binfmt-service-type" msgstr "{Scheme-Variable} qemu-binfmt-service-type" #. type: defvr -#: doc/guix.texi:22059 +#: doc/guix.texi:22056 msgid "This is the type of the QEMU/binfmt service for transparent emulation. Its value must be a @code{qemu-binfmt-configuration} object, which specifies the QEMU package to use as well as the architecture we want to emulated:" msgstr "Dies ist der Diensttyp des QEMU/binfmt-Dienstes für transparente Emulation. Sein Wert muss ein @code{qemu-binfmt-configuration}-Objekt sein, das das QEMU-Paket angibt, das benutzt werden soll, sowie die Architektur, die wir emulieren möchten." #. type: example -#: doc/guix.texi:22064 +#: doc/guix.texi:22061 #, no-wrap msgid "" "(service qemu-binfmt-service-type\n" @@ -40929,50 +41164,50 @@ msgstr "" " (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))))\n" #. type: defvr -#: doc/guix.texi:22070 +#: doc/guix.texi:22067 msgid "In this example, we enable transparent emulation for the ARM and aarch64 platforms. Running @code{herd stop qemu-binfmt} turns it off, and running @code{herd start qemu-binfmt} turns it back on (@pxref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})." msgstr "In diesem Beispiel aktivieren wir transparente Emulation für die Plattformen ARM und aarch64. Wenn wir @code{herd stop qemu-binfmt} ausführen, wird diese abgeschaltet, und mit @code{herd start qemu-binfmt} wird sie wieder aktiv (siehe @ref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})." #. type: deftp -#: doc/guix.texi:22072 +#: doc/guix.texi:22069 #, no-wrap msgid "{Data Type} qemu-binfmt-configuration" -msgstr "" +msgstr "{Datentyp} qemu-binfmt-configuration" #. type: deftp -#: doc/guix.texi:22074 +#: doc/guix.texi:22071 msgid "This is the configuration for the @code{qemu-binfmt} service." -msgstr "" +msgstr "Dies ist die Konfiguration des @code{qemu-binfmt}-Dienstes." #. type: item -#: doc/guix.texi:22076 +#: doc/guix.texi:22073 #, no-wrap msgid "@code{platforms} (default: @code{'()})" -msgstr "" +msgstr "@code{platforms} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:22079 +#: doc/guix.texi:22076 msgid "The list of emulated QEMU platforms. Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see below)." -msgstr "" +msgstr "Die Liste der emulierten QEMU-Plattformen. Jeder Eintrag muss ein @dfn{Plattformobjekt} sein, wie @code{lookup-qemu-platforms} eines zurückliefert (siehe unten)." #. type: item -#: doc/guix.texi:22080 +#: doc/guix.texi:22077 #, no-wrap msgid "@code{guix-support?} (default: @code{#f})" -msgstr "" +msgstr "@code{guix-support?} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:22086 +#: doc/guix.texi:22083 msgid "When it is true, QEMU and all its dependencies are added to the build environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, @code{--chroot-directory} option}). This allows the @code{binfmt_misc} handlers to be used within the build environment, which in turn means that you can transparently build programs for another architecture." -msgstr "" +msgstr "Wenn es auf wahr gesetzt ist, werden QEMU und all seine Abhängigkeiten zur Erstellungsumgebung des @command{guix-daemon} hinzugefügt (siehe @ref{Invoking guix-daemon, @code{--chroot-directory}-Option}). Dadurch können die @code{binfmt_misc}-Handler innerhalb der Erstellungsumgebung benutzt werden, wodurch Sie Programme transparent für eine andere Architektur erstellen können." #. type: table -#: doc/guix.texi:22089 +#: doc/guix.texi:22086 msgid "For example, let's suppose you're on an x86_64 machine and you have this service:" -msgstr "" +msgstr "Wenn wir zum Beispiel annehmen, Sie arbeiten auf einer x86_64-Maschine und haben diesen Dienst eingerichtet:" #. type: example -#: doc/guix.texi:22095 +#: doc/guix.texi:22092 #, no-wrap msgid "" "(service qemu-binfmt-service-type\n" @@ -40980,264 +41215,268 @@ msgid "" " (platforms (lookup-qemu-platforms \"arm\"))\n" " (guix-support? #t)))\n" msgstr "" +"(service qemu-binfmt-service-type\n" +" (qemu-binfmt-configuration\n" +" (platforms (lookup-qemu-platforms \"arm\"))\n" +" (guix-support? #t)))\n" #. type: table -#: doc/guix.texi:22098 +#: doc/guix.texi:22095 msgid "You can run:" -msgstr "" +msgstr "Dann können Sie das hier ausführen:" #. type: example -#: doc/guix.texi:22101 +#: doc/guix.texi:22098 #, no-wrap msgid "guix build -s armhf-linux inkscape\n" -msgstr "" +msgstr "guix build -s armhf-linux inkscape\n" #. type: table -#: doc/guix.texi:22108 +#: doc/guix.texi:22105 msgid "and it will build Inkscape for ARMv7 @emph{as if it were a native build}, transparently using QEMU to emulate the ARMv7 CPU. Pretty handy if you'd like to test a package build for an architecture you don't have access to!" -msgstr "" +msgstr "und alles verhält sich so, als würden Sie Inkscape für ARMv7 @emph{wie „nativ“ auf einem ARM-Rechner erstellen}, wozu QEMU transparent benutzt wird, um den ARMv7-Prozessor zu emulieren. Das ist ganz schön praktisch, wenn Sie testen wollen, ob ein Paket für eine Architektur erstellt werden kann, die Ihnen nicht zur Verfügung steht." #. type: item -#: doc/guix.texi:22109 +#: doc/guix.texi:22106 #, no-wrap msgid "@code{qemu} (default: @code{qemu})" -msgstr "" +msgstr "@code{qemu} (Vorgabe: @code{qemu})" #. type: table -#: doc/guix.texi:22111 +#: doc/guix.texi:22108 msgid "The QEMU package to use." -msgstr "" +msgstr "Das QEMU-Paket, das benutzt werden soll." #. type: deffn -#: doc/guix.texi:22114 +#: doc/guix.texi:22111 #, no-wrap msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}" -msgstr "" +msgstr "{Scheme-Prozedur} lookup-qemu-platforms @var{Plattformen}@dots{}" #. type: deffn -#: doc/guix.texi:22119 +#: doc/guix.texi:22116 msgid "Return the list of QEMU platform objects corresponding to @var{platforms}@dots{}. @var{platforms} must be a list of strings corresponding to platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"}, and so on." -msgstr "" +msgstr "Liefert die Liste der QEMU-Plattformobjekte, die den @var{Plattformen}@dots{} entsprechen. @var{Plattformen} muss eine Liste von Zeichenketten sein, die den Namen der Plattformen entsprechen, wie z.B.@: @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"} und so weiter." #. type: deffn -#: doc/guix.texi:22121 +#: doc/guix.texi:22118 #, no-wrap msgid "{Scheme Procedure} qemu-platform? @var{obj}" -msgstr "" +msgstr "{Scheme-Prozedur} qemu-platform? @var{Objekt}" #. type: deffn -#: doc/guix.texi:22123 +#: doc/guix.texi:22120 msgid "Return true if @var{obj} is a platform object." -msgstr "" +msgstr "Liefert wahr, wenn das @var{Objekt} ein Plattformobjekt ist." #. type: deffn -#: doc/guix.texi:22125 +#: doc/guix.texi:22122 #, no-wrap msgid "{Scheme Procedure} qemu-platform-name @var{platform}" -msgstr "" +msgstr "{Scheme-Prozedur} qemu-platform-name @var{Plattform}" #. type: deffn -#: doc/guix.texi:22127 +#: doc/guix.texi:22124 msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}." -msgstr "" +msgstr "Liefert den Namen der @var{Plattform}, also eine Zeichenkette wie z.B.@: @code{\"arm\"}." #. type: Plain text -#: doc/guix.texi:22139 +#: doc/guix.texi:22136 msgid "The @code{(gnu services version-control)} module provides a service to allow remote access to local Git repositories. There are three options: the @code{git-daemon-service}, which provides access to repositories via the @code{git://} unsecured TCP-based protocol, extending the @code{nginx} web server to proxy some requests to @code{git-http-backend}, or providing a web interface with @code{cgit-service-type}." msgstr "" #. type: deffn -#: doc/guix.texi:22140 +#: doc/guix.texi:22137 #, no-wrap msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]" msgstr "" #. type: deffn -#: doc/guix.texi:22144 +#: doc/guix.texi:22141 msgid "Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous access." msgstr "" #. type: deffn -#: doc/guix.texi:22150 +#: doc/guix.texi:22147 msgid "The optional @var{config} argument should be a @code{} object, by default it allows read-only access to exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the repository directory.} repositories under @file{/srv/git}." msgstr "" #. type: deftp -#: doc/guix.texi:22153 +#: doc/guix.texi:22150 #, no-wrap msgid "{Data Type} git-daemon-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:22155 +#: doc/guix.texi:22152 msgid "Data type representing the configuration for @code{git-daemon-service}." msgstr "" #. type: item -#: doc/guix.texi:22157 doc/guix.texi:22213 +#: doc/guix.texi:22154 doc/guix.texi:22210 #, no-wrap msgid "@code{package} (default: @var{git})" msgstr "" #. type: table -#: doc/guix.texi:22159 doc/guix.texi:22215 +#: doc/guix.texi:22156 doc/guix.texi:22212 msgid "Package object of the Git distributed version control system." msgstr "" #. type: item -#: doc/guix.texi:22160 doc/guix.texi:22219 +#: doc/guix.texi:22157 doc/guix.texi:22216 #, no-wrap msgid "@code{export-all?} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:22163 +#: doc/guix.texi:22160 msgid "Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file." msgstr "" #. type: item -#: doc/guix.texi:22164 +#: doc/guix.texi:22161 #, no-wrap msgid "@code{base-path} (default: @file{/srv/git})" msgstr "" #. type: table -#: doc/guix.texi:22169 +#: doc/guix.texi:22166 msgid "Whether to remap all the path requests as relative to the given path. If you run git daemon with @var{(base-path \"/srv/git\")} on example.com, then if you later try to pull @code{git://example.com/hello.git}, git daemon will interpret the path as @code{/srv/git/hello.git}." msgstr "" #. type: item -#: doc/guix.texi:22170 +#: doc/guix.texi:22167 #, no-wrap msgid "@code{user-path} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:22177 +#: doc/guix.texi:22174 msgid "Whether to allow @code{~user} notation to be used in requests. When specified with empty string, requests to @code{git://host/~alice/foo} is taken as a request to access @code{foo} repository in the home directory of user @code{alice}. If @var{(user-path \"path\")} is specified, the same request is taken as a request to access @code{path/foo} repository in the home directory of user @code{alice}." msgstr "" #. type: item -#: doc/guix.texi:22178 +#: doc/guix.texi:22175 #, no-wrap msgid "@code{listen} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:22181 +#: doc/guix.texi:22178 msgid "Whether to listen on specific IP addresses or hostnames, defaults to all." msgstr "" #. type: item -#: doc/guix.texi:22182 +#: doc/guix.texi:22179 #, no-wrap msgid "@code{port} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:22184 +#: doc/guix.texi:22181 msgid "Whether to listen on an alternative port, which defaults to 9418." msgstr "" #. type: item -#: doc/guix.texi:22185 +#: doc/guix.texi:22182 #, no-wrap msgid "@code{whitelist} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:22187 +#: doc/guix.texi:22184 msgid "If not empty, only allow access to this list of directories." msgstr "" #. type: item -#: doc/guix.texi:22188 +#: doc/guix.texi:22185 #, no-wrap msgid "@code{extra-options} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:22191 +#: doc/guix.texi:22188 msgid "Extra options will be passed to @code{git daemon}, please run @command{man git-daemon} for more information." msgstr "" #. type: Plain text -#: doc/guix.texi:22205 +#: doc/guix.texi:22202 msgid "The @code{git://} protocol lacks authentication. When you pull from a repository fetched via @code{git://}, you don't know that the data you receive was modified is really coming from the specified host, and you have your connection is subject to eavesdropping. It's better to use an authenticated and encrypted transport, such as @code{https}. Although Git allows you to serve repositories using unsophisticated file-based web servers, there is a faster protocol implemented by the @code{git-http-backend} program. This program is the back-end of a proper Git web service. It is designed to sit behind a FastCGI proxy. @xref{Web Services}, for more on running the necessary @code{fcgiwrap} daemon." msgstr "" #. type: Plain text -#: doc/guix.texi:22208 +#: doc/guix.texi:22205 msgid "Guix has a separate configuration data type for serving Git repositories over HTTP." msgstr "" #. type: deftp -#: doc/guix.texi:22209 +#: doc/guix.texi:22206 #, no-wrap msgid "{Data Type} git-http-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:22211 +#: doc/guix.texi:22208 msgid "Data type representing the configuration for @code{git-http-service}." msgstr "" #. type: item -#: doc/guix.texi:22216 +#: doc/guix.texi:22213 #, no-wrap msgid "@code{git-root} (default: @file{/srv/git})" msgstr "" #. type: table -#: doc/guix.texi:22218 +#: doc/guix.texi:22215 msgid "Directory containing the Git repositories to expose to the world." msgstr "" #. type: table -#: doc/guix.texi:22222 +#: doc/guix.texi:22219 msgid "Whether to expose access for all Git repositories in @var{git-root}, even if they do not have the @file{git-daemon-export-ok} file." msgstr "" #. type: item -#: doc/guix.texi:22223 +#: doc/guix.texi:22220 #, no-wrap msgid "@code{uri-path} (default: @file{/git/})" msgstr "" #. type: table -#: doc/guix.texi:22228 +#: doc/guix.texi:22225 msgid "Path prefix for Git access. With the default @code{/git/} prefix, this will map @code{http://@var{server}/git/@var{repo}.git} to @code{/srv/git/@var{repo}.git}. Requests whose URI paths do not begin with this prefix are not passed on to this Git instance." msgstr "" #. type: item -#: doc/guix.texi:22229 +#: doc/guix.texi:22226 #, no-wrap msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})" msgstr "" #. type: table -#: doc/guix.texi:22232 +#: doc/guix.texi:22229 msgid "The socket on which the @code{fcgiwrap} daemon is listening. @xref{Web Services}." msgstr "" #. type: Plain text -#: doc/guix.texi:22239 +#: doc/guix.texi:22236 msgid "There is no @code{git-http-service-type}, currently; instead you can create an @code{nginx-location-configuration} from a @code{git-http-configuration} and then add that location to a web server." msgstr "" #. type: deffn -#: doc/guix.texi:22240 +#: doc/guix.texi:22237 #, no-wrap msgid "{Scheme Procedure} git-http-nginx-location-configuration @" msgstr "" #. type: deffn -#: doc/guix.texi:22245 +#: doc/guix.texi:22242 msgid "[config=(git-http-configuration)] Compute an @code{nginx-location-configuration} that corresponds to the given Git http configuration. An example nginx service definition to serve the default @file{/srv/git} over HTTPS might be:" msgstr "" #. type: example -#: doc/guix.texi:22262 +#: doc/guix.texi:22259 #, no-wrap msgid "" "(service nginx-service-type\n" @@ -41258,1420 +41497,1420 @@ msgid "" msgstr "" #. type: deffn -#: doc/guix.texi:22269 +#: doc/guix.texi:22266 msgid "This example assumes that you are using Let's Encrypt to get your TLS certificate. @xref{Certificate Services}. The default @code{certbot} service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS. You will also need to add an @code{fcgiwrap} proxy to your system services. @xref{Web Services}." msgstr "" #. type: subsubheading -#: doc/guix.texi:22271 +#: doc/guix.texi:22268 #, no-wrap msgid "Cgit Service" msgstr "" #. type: cindex -#: doc/guix.texi:22273 +#: doc/guix.texi:22270 #, no-wrap msgid "Cgit service" msgstr "" #. type: cindex -#: doc/guix.texi:22274 +#: doc/guix.texi:22271 #, no-wrap msgid "Git, web interface" msgstr "" #. type: Plain text -#: doc/guix.texi:22277 +#: doc/guix.texi:22274 msgid "@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git repositories written in C." msgstr "" #. type: Plain text -#: doc/guix.texi:22280 +#: doc/guix.texi:22277 msgid "The following example will configure the service with default values. By default, Cgit can be accessed on port 80 (@code{http://localhost:80})." msgstr "" #. type: example -#: doc/guix.texi:22283 +#: doc/guix.texi:22280 #, no-wrap msgid "(service cgit-service-type)\n" msgstr "" #. type: Plain text -#: doc/guix.texi:22287 +#: doc/guix.texi:22284 msgid "The @code{file-object} type designates either a file-like object (@pxref{G-Expressions, file-like objects}) or a string." msgstr "" #. type: Plain text -#: doc/guix.texi:22291 +#: doc/guix.texi:22288 msgid "Available @code{cgit-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:22292 +#: doc/guix.texi:22289 #, no-wrap msgid "{@code{cgit-configuration} parameter} package package" msgstr "" #. type: deftypevr -#: doc/guix.texi:22294 +#: doc/guix.texi:22291 msgid "The CGIT package." msgstr "" #. type: deftypevr -#: doc/guix.texi:22297 +#: doc/guix.texi:22294 #, no-wrap msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx" msgstr "" #. type: deftypevr -#: doc/guix.texi:22302 +#: doc/guix.texi:22299 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object about-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22305 +#: doc/guix.texi:22302 msgid "Specifies a command which will be invoked to format the content of about pages (both top-level and for each repository)." msgstr "" #. type: deftypevr -#: doc/guix.texi:22310 +#: doc/guix.texi:22307 #, no-wrap msgid "{@code{cgit-configuration} parameter} string agefile" msgstr "" #. type: deftypevr -#: doc/guix.texi:22313 +#: doc/guix.texi:22310 msgid "Specifies a path, relative to each repository path, which can be used to specify the date and time of the youngest commit in the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22318 +#: doc/guix.texi:22315 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object auth-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22321 +#: doc/guix.texi:22318 msgid "Specifies a command that will be invoked for authenticating repository access." msgstr "" #. type: deftypevr -#: doc/guix.texi:22326 +#: doc/guix.texi:22323 #, no-wrap msgid "{@code{cgit-configuration} parameter} string branch-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22329 +#: doc/guix.texi:22326 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set @samp{name} enables ordering by branch name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22331 +#: doc/guix.texi:22328 msgid "Defaults to @samp{\"name\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22334 +#: doc/guix.texi:22331 #, no-wrap msgid "{@code{cgit-configuration} parameter} string cache-root" msgstr "" #. type: deftypevr -#: doc/guix.texi:22336 +#: doc/guix.texi:22333 msgid "Path used to store the cgit cache entries." msgstr "" #. type: deftypevr -#: doc/guix.texi:22338 +#: doc/guix.texi:22335 msgid "Defaults to @samp{\"/var/cache/cgit\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22341 +#: doc/guix.texi:22338 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22344 +#: doc/guix.texi:22341 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed with a fixed SHA1." msgstr "" #. type: deftypevr -#: doc/guix.texi:22346 doc/guix.texi:22789 +#: doc/guix.texi:22343 doc/guix.texi:22786 msgid "Defaults to @samp{-1}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22349 +#: doc/guix.texi:22346 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22352 +#: doc/guix.texi:22349 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed without a fixed SHA1." msgstr "" #. type: deftypevr -#: doc/guix.texi:22357 +#: doc/guix.texi:22354 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22360 +#: doc/guix.texi:22357 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository summary page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22365 +#: doc/guix.texi:22362 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22368 +#: doc/guix.texi:22365 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22373 +#: doc/guix.texi:22370 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22376 +#: doc/guix.texi:22373 msgid "Number which specifies the time-to-live, in minutes, for the result of scanning a path for Git repositories." msgstr "" #. type: deftypevr -#: doc/guix.texi:22381 +#: doc/guix.texi:22378 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22384 +#: doc/guix.texi:22381 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository about page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22389 +#: doc/guix.texi:22386 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl" msgstr "" #. type: deftypevr -#: doc/guix.texi:22392 +#: doc/guix.texi:22389 msgid "Number which specifies the time-to-live, in minutes, for the cached version of snapshots." msgstr "" #. type: deftypevr -#: doc/guix.texi:22397 +#: doc/guix.texi:22394 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-size" msgstr "" #. type: deftypevr -#: doc/guix.texi:22400 +#: doc/guix.texi:22397 msgid "The maximum number of entries in the cgit cache. When set to @samp{0}, caching is disabled." msgstr "" #. type: deftypevr -#: doc/guix.texi:22405 +#: doc/guix.texi:22402 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22407 +#: doc/guix.texi:22404 msgid "Sort items in the repo list case sensitively." msgstr "" #. type: deftypevr -#: doc/guix.texi:22412 +#: doc/guix.texi:22409 #, no-wrap msgid "{@code{cgit-configuration} parameter} list clone-prefix" msgstr "" #. type: deftypevr -#: doc/guix.texi:22415 +#: doc/guix.texi:22412 msgid "List of common prefixes which, when combined with a repository URL, generates valid clone URLs for the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22420 +#: doc/guix.texi:22417 #, no-wrap msgid "{@code{cgit-configuration} parameter} list clone-url" msgstr "" #. type: deftypevr -#: doc/guix.texi:22422 +#: doc/guix.texi:22419 msgid "List of @code{clone-url} templates." msgstr "" #. type: deftypevr -#: doc/guix.texi:22427 +#: doc/guix.texi:22424 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object commit-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22429 +#: doc/guix.texi:22426 msgid "Command which will be invoked to format commit messages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22434 +#: doc/guix.texi:22431 #, no-wrap msgid "{@code{cgit-configuration} parameter} string commit-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22438 doc/guix.texi:22996 +#: doc/guix.texi:22435 doc/guix.texi:22993 msgid "Flag which, when set to @samp{date}, enables strict date ordering in the commit log, and when set to @samp{topo} enables strict topological ordering." msgstr "" #. type: deftypevr -#: doc/guix.texi:22440 +#: doc/guix.texi:22437 msgid "Defaults to @samp{\"git log\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22443 +#: doc/guix.texi:22440 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object css" msgstr "" #. type: deftypevr -#: doc/guix.texi:22445 +#: doc/guix.texi:22442 msgid "URL which specifies the css document to include in all cgit pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22447 +#: doc/guix.texi:22444 msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22450 +#: doc/guix.texi:22447 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object email-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22454 +#: doc/guix.texi:22451 msgid "Specifies a command which will be invoked to format names and email address of committers, authors, and taggers, as represented in various places throughout the cgit interface." msgstr "" #. type: deftypevr -#: doc/guix.texi:22459 +#: doc/guix.texi:22456 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean embedded?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22462 +#: doc/guix.texi:22459 msgid "Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment suitable for embedding in other HTML pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22467 +#: doc/guix.texi:22464 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22471 +#: doc/guix.texi:22468 msgid "Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit history graph to the left of the commit messages in the repository log page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22476 +#: doc/guix.texi:22473 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22479 +#: doc/guix.texi:22476 msgid "Flag which, when set to @samp{#t}, allows all filter settings to be overridden in repository-specific cgitrc files." msgstr "" #. type: deftypevr -#: doc/guix.texi:22484 +#: doc/guix.texi:22481 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22487 +#: doc/guix.texi:22484 msgid "Flag which, when set to @samp{#t}, allows users to follow a file in the log view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22492 +#: doc/guix.texi:22489 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22495 +#: doc/guix.texi:22492 msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones." msgstr "" #. type: deftypevr -#: doc/guix.texi:22500 +#: doc/guix.texi:22497 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22503 +#: doc/guix.texi:22500 msgid "Flag which, when set to @samp{#t}, will make cgit generate extra links \"summary\", \"commit\", \"tree\" for each repo in the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:22508 +#: doc/guix.texi:22505 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22511 +#: doc/guix.texi:22508 msgid "Flag which, when set to @samp{#t}, will make cgit display the owner of each repo in the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:22516 +#: doc/guix.texi:22513 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22519 +#: doc/guix.texi:22516 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of modified files for each commit on the repository log page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22524 +#: doc/guix.texi:22521 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22527 +#: doc/guix.texi:22524 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of added and removed lines for each commit on the repository log page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22532 +#: doc/guix.texi:22529 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22535 doc/guix.texi:23059 +#: doc/guix.texi:22532 doc/guix.texi:23056 msgid "Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views." msgstr "" #. type: deftypevr -#: doc/guix.texi:22540 +#: doc/guix.texi:22537 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22544 +#: doc/guix.texi:22541 msgid "Flag which, when set to @code{1}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22549 +#: doc/guix.texi:22546 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22553 +#: doc/guix.texi:22550 msgid "Flag which, when set to @samp{#t}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22558 +#: doc/guix.texi:22555 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22561 +#: doc/guix.texi:22558 msgid "Flag which, when set to @samp{#t}, will make cgit generate linenumber links for plaintext blobs printed in the tree view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22566 +#: doc/guix.texi:22563 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22569 +#: doc/guix.texi:22566 msgid "Flag which, when set to @samp{#f}, will allow cgit to use Git config to set any repo specific settings." msgstr "" #. type: deftypevr -#: doc/guix.texi:22574 +#: doc/guix.texi:22571 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object favicon" msgstr "" #. type: deftypevr -#: doc/guix.texi:22576 +#: doc/guix.texi:22573 msgid "URL used as link to a shortcut icon for cgit." msgstr "" #. type: deftypevr -#: doc/guix.texi:22578 +#: doc/guix.texi:22575 msgid "Defaults to @samp{\"/favicon.ico\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22581 +#: doc/guix.texi:22578 #, no-wrap msgid "{@code{cgit-configuration} parameter} string footer" msgstr "" #. type: deftypevr -#: doc/guix.texi:22585 +#: doc/guix.texi:22582 msgid "The content of the file specified with this option will be included verbatim at the bottom of all pages (i.e.@: it replaces the standard \"generated by...\"@: message)." msgstr "" #. type: deftypevr -#: doc/guix.texi:22590 +#: doc/guix.texi:22587 #, no-wrap msgid "{@code{cgit-configuration} parameter} string head-include" msgstr "" #. type: deftypevr -#: doc/guix.texi:22593 +#: doc/guix.texi:22590 msgid "The content of the file specified with this option will be included verbatim in the HTML HEAD section on all pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22598 +#: doc/guix.texi:22595 #, no-wrap msgid "{@code{cgit-configuration} parameter} string header" msgstr "" #. type: deftypevr -#: doc/guix.texi:22601 +#: doc/guix.texi:22598 msgid "The content of the file specified with this option will be included verbatim at the top of all pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22606 +#: doc/guix.texi:22603 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object include" msgstr "" #. type: deftypevr -#: doc/guix.texi:22609 +#: doc/guix.texi:22606 msgid "Name of a configfile to include before the rest of the current config- file is parsed." msgstr "" #. type: deftypevr -#: doc/guix.texi:22614 +#: doc/guix.texi:22611 #, no-wrap msgid "{@code{cgit-configuration} parameter} string index-header" msgstr "" #. type: deftypevr -#: doc/guix.texi:22617 +#: doc/guix.texi:22614 msgid "The content of the file specified with this option will be included verbatim above the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:22622 +#: doc/guix.texi:22619 #, no-wrap msgid "{@code{cgit-configuration} parameter} string index-info" msgstr "" #. type: deftypevr -#: doc/guix.texi:22625 +#: doc/guix.texi:22622 msgid "The content of the file specified with this option will be included verbatim below the heading on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22630 +#: doc/guix.texi:22627 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean local-time?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22633 +#: doc/guix.texi:22630 msgid "Flag which, if set to @samp{#t}, makes cgit print commit and tag times in the servers timezone." msgstr "" #. type: deftypevr -#: doc/guix.texi:22638 +#: doc/guix.texi:22635 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object logo" msgstr "" #. type: deftypevr -#: doc/guix.texi:22641 +#: doc/guix.texi:22638 msgid "URL which specifies the source of an image which will be used as a logo on all cgit pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22643 +#: doc/guix.texi:22640 msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22646 +#: doc/guix.texi:22643 #, no-wrap msgid "{@code{cgit-configuration} parameter} string logo-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:22648 doc/guix.texi:23105 +#: doc/guix.texi:22645 doc/guix.texi:23102 msgid "URL loaded when clicking on the cgit logo image." msgstr "" #. type: deftypevr -#: doc/guix.texi:22653 +#: doc/guix.texi:22650 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object owner-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22656 +#: doc/guix.texi:22653 msgid "Command which will be invoked to format the Owner column of the main page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22661 +#: doc/guix.texi:22658 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-atom-items" msgstr "" #. type: deftypevr -#: doc/guix.texi:22663 +#: doc/guix.texi:22660 msgid "Number of items to display in atom feeds view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22665 doc/guix.texi:22900 doc/guix.texi:22908 -#: doc/guix.texi:22916 +#: doc/guix.texi:22662 doc/guix.texi:22897 doc/guix.texi:22905 +#: doc/guix.texi:22913 msgid "Defaults to @samp{10}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22668 +#: doc/guix.texi:22665 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-commit-count" msgstr "" #. type: deftypevr -#: doc/guix.texi:22670 +#: doc/guix.texi:22667 msgid "Number of entries to list per page in \"log\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22672 doc/guix.texi:22687 +#: doc/guix.texi:22669 doc/guix.texi:22684 msgid "Defaults to @samp{50}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22675 +#: doc/guix.texi:22672 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-message-length" msgstr "" #. type: deftypevr -#: doc/guix.texi:22677 +#: doc/guix.texi:22674 msgid "Number of commit message characters to display in \"log\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22679 doc/guix.texi:22695 +#: doc/guix.texi:22676 doc/guix.texi:22692 msgid "Defaults to @samp{80}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22682 +#: doc/guix.texi:22679 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-repo-count" msgstr "" #. type: deftypevr -#: doc/guix.texi:22685 +#: doc/guix.texi:22682 msgid "Specifies the number of entries to list per page on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22690 +#: doc/guix.texi:22687 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length" msgstr "" #. type: deftypevr -#: doc/guix.texi:22693 +#: doc/guix.texi:22690 msgid "Specifies the maximum number of repo description characters to display on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22698 +#: doc/guix.texi:22695 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-blob-size" msgstr "" #. type: deftypevr -#: doc/guix.texi:22700 +#: doc/guix.texi:22697 msgid "Specifies the maximum size of a blob to display HTML for in KBytes." msgstr "" #. type: deftypevr -#: doc/guix.texi:22705 +#: doc/guix.texi:22702 #, no-wrap msgid "{@code{cgit-configuration} parameter} string max-stats" msgstr "" #. type: deftypevr -#: doc/guix.texi:22708 +#: doc/guix.texi:22705 msgid "Maximum statistics period. Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22713 +#: doc/guix.texi:22710 #, no-wrap msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype" msgstr "" #. type: deftypevr -#: doc/guix.texi:22715 +#: doc/guix.texi:22712 msgid "Mimetype for the specified filename extension." msgstr "" #. type: deftypevr -#: doc/guix.texi:22719 +#: doc/guix.texi:22716 msgid "Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png \"image/png\") (svg \"image/svg+xml\"))}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22722 +#: doc/guix.texi:22719 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object mimetype-file" msgstr "" #. type: deftypevr -#: doc/guix.texi:22724 +#: doc/guix.texi:22721 msgid "Specifies the file to use for automatic mimetype lookup." msgstr "" #. type: deftypevr -#: doc/guix.texi:22729 +#: doc/guix.texi:22726 #, no-wrap msgid "{@code{cgit-configuration} parameter} string module-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:22732 +#: doc/guix.texi:22729 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing." msgstr "" #. type: deftypevr -#: doc/guix.texi:22737 +#: doc/guix.texi:22734 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean nocache?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22739 +#: doc/guix.texi:22736 msgid "If set to the value @samp{#t} caching will be disabled." msgstr "" #. type: deftypevr -#: doc/guix.texi:22744 +#: doc/guix.texi:22741 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean noplainemail?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22747 +#: doc/guix.texi:22744 msgid "If set to @samp{#t} showing full author email addresses will be disabled." msgstr "" #. type: deftypevr -#: doc/guix.texi:22752 +#: doc/guix.texi:22749 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean noheader?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22755 +#: doc/guix.texi:22752 msgid "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:22760 +#: doc/guix.texi:22757 #, no-wrap msgid "{@code{cgit-configuration} parameter} project-list project-list" msgstr "" #. type: deftypevr -#: doc/guix.texi:22764 +#: doc/guix.texi:22761 msgid "A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories. An empty list means that all subdirectories will be loaded." msgstr "" #. type: deftypevr -#: doc/guix.texi:22769 +#: doc/guix.texi:22766 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object readme" msgstr "" #. type: deftypevr -#: doc/guix.texi:22771 +#: doc/guix.texi:22768 msgid "Text which will be used as default value for @code{cgit-repo-readme}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22776 +#: doc/guix.texi:22773 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22780 +#: doc/guix.texi:22777 msgid "If set to @code{#t} and @code{repository-directory} is enabled, if any repositories are found with a suffix of @code{.git}, this suffix will be removed for the URL and name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22785 +#: doc/guix.texi:22782 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer renamelimit" msgstr "" #. type: deftypevr -#: doc/guix.texi:22787 +#: doc/guix.texi:22784 msgid "Maximum number of files to consider when detecting renames." msgstr "" #. type: deftypevr -#: doc/guix.texi:22792 +#: doc/guix.texi:22789 #, no-wrap msgid "{@code{cgit-configuration} parameter} string repository-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22794 +#: doc/guix.texi:22791 msgid "The way in which repositories in each section are sorted." msgstr "" #. type: deftypevr -#: doc/guix.texi:22799 +#: doc/guix.texi:22796 #, no-wrap msgid "{@code{cgit-configuration} parameter} robots-list robots" msgstr "" #. type: deftypevr -#: doc/guix.texi:22801 +#: doc/guix.texi:22798 msgid "Text used as content for the @code{robots} meta-tag." msgstr "" #. type: deftypevr -#: doc/guix.texi:22803 +#: doc/guix.texi:22800 msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22806 +#: doc/guix.texi:22803 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-desc" msgstr "" #. type: deftypevr -#: doc/guix.texi:22808 +#: doc/guix.texi:22805 msgid "Text printed below the heading on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22810 +#: doc/guix.texi:22807 msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22813 +#: doc/guix.texi:22810 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-readme" msgstr "" #. type: deftypevr -#: doc/guix.texi:22816 +#: doc/guix.texi:22813 msgid "The content of the file specified with this option will be included verbatim below thef \"about\" link on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22821 +#: doc/guix.texi:22818 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-title" msgstr "" #. type: deftypevr -#: doc/guix.texi:22823 +#: doc/guix.texi:22820 msgid "Text printed as heading on the repository index page." msgstr "" #. type: deftypevr -#: doc/guix.texi:22828 +#: doc/guix.texi:22825 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path" msgstr "" #. type: deftypevr -#: doc/guix.texi:22834 +#: doc/guix.texi:22831 msgid "If set to @samp{#t} and repository-directory is enabled, repository-directory will recurse into directories whose name starts with a period. Otherwise, repository-directory will stay away from such directories, considered as \"hidden\". Note that this does not apply to the \".git\" directory in non-bare repos." msgstr "" #. type: deftypevr -#: doc/guix.texi:22839 +#: doc/guix.texi:22836 #, no-wrap msgid "{@code{cgit-configuration} parameter} list snapshots" msgstr "" #. type: deftypevr -#: doc/guix.texi:22842 +#: doc/guix.texi:22839 msgid "Text which specifies the default set of snapshot formats that cgit generates links for." msgstr "" #. type: deftypevr -#: doc/guix.texi:22847 +#: doc/guix.texi:22844 #, no-wrap msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory" msgstr "" #. type: deftypevr -#: doc/guix.texi:22850 +#: doc/guix.texi:22847 msgid "Name of the directory to scan for repositories (represents @code{scan-path})." msgstr "" #. type: deftypevr -#: doc/guix.texi:22852 +#: doc/guix.texi:22849 msgid "Defaults to @samp{\"/srv/git\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22855 +#: doc/guix.texi:22852 #, no-wrap msgid "{@code{cgit-configuration} parameter} string section" msgstr "" #. type: deftypevr -#: doc/guix.texi:22858 doc/guix.texi:23174 +#: doc/guix.texi:22855 doc/guix.texi:23171 msgid "The name of the current repository section - all repositories defined after this option will inherit the current section name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22863 +#: doc/guix.texi:22860 #, no-wrap msgid "{@code{cgit-configuration} parameter} string section-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22866 +#: doc/guix.texi:22863 msgid "Flag which, when set to @samp{1}, will sort the sections on the repository listing by name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22871 +#: doc/guix.texi:22868 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer section-from-path" msgstr "" #. type: deftypevr -#: doc/guix.texi:22874 +#: doc/guix.texi:22871 msgid "A number which, if defined prior to repository-directory, specifies how many path elements from each repo path to use as a default section name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22879 +#: doc/guix.texi:22876 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?" msgstr "" #. type: deftypevr -#: doc/guix.texi:22882 +#: doc/guix.texi:22879 msgid "If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default." msgstr "" #. type: deftypevr -#: doc/guix.texi:22887 +#: doc/guix.texi:22884 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object source-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22890 +#: doc/guix.texi:22887 msgid "Specifies a command which will be invoked to format plaintext blobs in the tree view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22895 +#: doc/guix.texi:22892 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-branches" msgstr "" #. type: deftypevr -#: doc/guix.texi:22898 +#: doc/guix.texi:22895 msgid "Specifies the number of branches to display in the repository \"summary\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22903 +#: doc/guix.texi:22900 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-log" msgstr "" #. type: deftypevr -#: doc/guix.texi:22906 +#: doc/guix.texi:22903 msgid "Specifies the number of log entries to display in the repository \"summary\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22911 +#: doc/guix.texi:22908 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-tags" msgstr "" #. type: deftypevr -#: doc/guix.texi:22914 +#: doc/guix.texi:22911 msgid "Specifies the number of tags to display in the repository \"summary\" view." msgstr "" #. type: deftypevr -#: doc/guix.texi:22919 +#: doc/guix.texi:22916 #, no-wrap msgid "{@code{cgit-configuration} parameter} string strict-export" msgstr "" #. type: deftypevr -#: doc/guix.texi:22922 +#: doc/guix.texi:22919 msgid "Filename which, if specified, needs to be present within the repository for cgit to allow access to that repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22927 +#: doc/guix.texi:22924 #, no-wrap msgid "{@code{cgit-configuration} parameter} string virtual-root" msgstr "" #. type: deftypevr -#: doc/guix.texi:22929 +#: doc/guix.texi:22926 msgid "URL which, if specified, will be used as root for all cgit links." msgstr "" #. type: deftypevr -#: doc/guix.texi:22931 +#: doc/guix.texi:22928 msgid "Defaults to @samp{\"/\"}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22934 +#: doc/guix.texi:22931 #, no-wrap msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories" msgstr "" #. type: deftypevr -#: doc/guix.texi:22936 +#: doc/guix.texi:22933 msgid "A list of @dfn{cgit-repo} records to use with config." msgstr "" #. type: deftypevr -#: doc/guix.texi:22940 +#: doc/guix.texi:22937 msgid "Available @code{repository-cgit-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:22941 +#: doc/guix.texi:22938 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots" msgstr "" #. type: deftypevr -#: doc/guix.texi:22944 +#: doc/guix.texi:22941 msgid "A mask of snapshot formats for this repo that cgit generates links for, restricted by the global @code{snapshots} setting." msgstr "" #. type: deftypevr -#: doc/guix.texi:22949 +#: doc/guix.texi:22946 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22951 +#: doc/guix.texi:22948 msgid "Override the default @code{source-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22956 +#: doc/guix.texi:22953 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string url" msgstr "" #. type: deftypevr -#: doc/guix.texi:22958 +#: doc/guix.texi:22955 msgid "The relative URL used to access the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:22963 +#: doc/guix.texi:22960 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22965 +#: doc/guix.texi:22962 msgid "Override the default @code{about-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22970 +#: doc/guix.texi:22967 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:22973 +#: doc/guix.texi:22970 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set to @samp{name} enables ordering by branch name." msgstr "" #. type: deftypevr -#: doc/guix.texi:22978 +#: doc/guix.texi:22975 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url" msgstr "" #. type: deftypevr -#: doc/guix.texi:22980 +#: doc/guix.texi:22977 msgid "A list of URLs which can be used to clone repo." msgstr "" #. type: deftypevr -#: doc/guix.texi:22985 +#: doc/guix.texi:22982 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:22987 +#: doc/guix.texi:22984 msgid "Override the default @code{commit-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:22992 +#: doc/guix.texi:22989 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort" msgstr "" #. type: deftypevr -#: doc/guix.texi:23001 +#: doc/guix.texi:22998 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch" msgstr "" #. type: deftypevr -#: doc/guix.texi:23006 +#: doc/guix.texi:23003 msgid "The name of the default branch for this repository. If no such branch exists in the repository, the first branch name (when sorted) is used as default instead. By default branch pointed to by HEAD, or \"master\" if there is no suitable HEAD." msgstr "" #. type: deftypevr -#: doc/guix.texi:23011 +#: doc/guix.texi:23008 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string desc" msgstr "" #. type: deftypevr -#: doc/guix.texi:23013 +#: doc/guix.texi:23010 msgid "The value to show as repository description." msgstr "" #. type: deftypevr -#: doc/guix.texi:23018 +#: doc/guix.texi:23015 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage" msgstr "" #. type: deftypevr -#: doc/guix.texi:23020 +#: doc/guix.texi:23017 msgid "The value to show as repository homepage." msgstr "" #. type: deftypevr -#: doc/guix.texi:23025 +#: doc/guix.texi:23022 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:23027 +#: doc/guix.texi:23024 msgid "Override the default @code{email-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23032 +#: doc/guix.texi:23029 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-commit-graph?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23035 +#: doc/guix.texi:23032 msgid "A flag which can be used to disable the global setting @code{enable-commit-graph?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23040 +#: doc/guix.texi:23037 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-filecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23043 +#: doc/guix.texi:23040 msgid "A flag which can be used to disable the global setting @code{enable-log-filecount?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23048 +#: doc/guix.texi:23045 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-linecount?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23051 +#: doc/guix.texi:23048 msgid "A flag which can be used to disable the global setting @code{enable-log-linecount?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23056 +#: doc/guix.texi:23053 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-remote-branches?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23064 +#: doc/guix.texi:23061 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-subject-links?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23067 +#: doc/guix.texi:23064 msgid "A flag which can be used to override the global setting @code{enable-subject-links?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23072 +#: doc/guix.texi:23069 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-html-serving?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23075 +#: doc/guix.texi:23072 msgid "A flag which can be used to override the global setting @code{enable-html-serving?}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23080 +#: doc/guix.texi:23077 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23083 +#: doc/guix.texi:23080 msgid "Flag which, when set to @code{#t}, hides the repository from the repository index." msgstr "" #. type: deftypevr -#: doc/guix.texi:23088 +#: doc/guix.texi:23085 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?" msgstr "" #. type: deftypevr -#: doc/guix.texi:23090 +#: doc/guix.texi:23087 msgid "Flag which, when set to @samp{#t}, ignores the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:23095 +#: doc/guix.texi:23092 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo" msgstr "" #. type: deftypevr -#: doc/guix.texi:23098 +#: doc/guix.texi:23095 msgid "URL which specifies the source of an image which will be used as a logo on this repo’s pages." msgstr "" #. type: deftypevr -#: doc/guix.texi:23103 +#: doc/guix.texi:23100 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:23110 +#: doc/guix.texi:23107 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter" msgstr "" #. type: deftypevr -#: doc/guix.texi:23112 +#: doc/guix.texi:23109 msgid "Override the default @code{owner-filter}." msgstr "" #. type: deftypevr -#: doc/guix.texi:23117 +#: doc/guix.texi:23114 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link" msgstr "" #. type: deftypevr -#: doc/guix.texi:23121 +#: doc/guix.texi:23118 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing. The arguments for the formatstring are the path and SHA1 of the submodule commit." msgstr "" #. type: deftypevr -#: doc/guix.texi:23126 +#: doc/guix.texi:23123 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path" msgstr "" #. type: deftypevr -#: doc/guix.texi:23130 +#: doc/guix.texi:23127 msgid "Text which will be used as the formatstring for a hyperlink when a submodule with the specified subdirectory path is printed in a directory listing." msgstr "" #. type: deftypevr -#: doc/guix.texi:23135 +#: doc/guix.texi:23132 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats" msgstr "" #. type: deftypevr -#: doc/guix.texi:23137 +#: doc/guix.texi:23134 msgid "Override the default maximum statistics period." msgstr "" #. type: deftypevr -#: doc/guix.texi:23142 +#: doc/guix.texi:23139 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string name" msgstr "" #. type: deftypevr -#: doc/guix.texi:23144 +#: doc/guix.texi:23141 msgid "The value to show as repository name." msgstr "" #. type: deftypevr -#: doc/guix.texi:23149 +#: doc/guix.texi:23146 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string owner" msgstr "" #. type: deftypevr -#: doc/guix.texi:23151 +#: doc/guix.texi:23148 msgid "A value used to identify the owner of the repository." msgstr "" #. type: deftypevr -#: doc/guix.texi:23156 +#: doc/guix.texi:23153 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string path" msgstr "" #. type: deftypevr -#: doc/guix.texi:23158 +#: doc/guix.texi:23155 msgid "An absolute path to the repository directory." msgstr "" #. type: deftypevr -#: doc/guix.texi:23163 +#: doc/guix.texi:23160 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string readme" msgstr "" #. type: deftypevr -#: doc/guix.texi:23166 +#: doc/guix.texi:23163 msgid "A path (relative to repo) which specifies a file to include verbatim as the \"About\" page for this repo." msgstr "" #. type: deftypevr -#: doc/guix.texi:23171 +#: doc/guix.texi:23168 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string section" msgstr "" #. type: deftypevr -#: doc/guix.texi:23179 +#: doc/guix.texi:23176 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options" msgstr "" #. type: deftypevr -#: doc/guix.texi:23181 doc/guix.texi:23190 +#: doc/guix.texi:23178 doc/guix.texi:23187 msgid "Extra options will be appended to cgitrc file." msgstr "" #. type: deftypevr -#: doc/guix.texi:23188 +#: doc/guix.texi:23185 #, no-wrap msgid "{@code{cgit-configuration} parameter} list extra-options" msgstr "" #. type: Plain text -#: doc/guix.texi:23202 +#: doc/guix.texi:23199 msgid "However, it could be that you just want to get a @code{cgitrc} up and running. In that case, you can pass an @code{opaque-cgit-configuration} as a record to @code{cgit-service-type}. As its name indicates, an opaque configuration does not have easy reflective capabilities." msgstr "" #. type: Plain text -#: doc/guix.texi:23204 +#: doc/guix.texi:23201 msgid "Available @code{opaque-cgit-configuration} fields are:" msgstr "" #. type: deftypevr -#: doc/guix.texi:23205 +#: doc/guix.texi:23202 #, no-wrap msgid "{@code{opaque-cgit-configuration} parameter} package cgit" msgstr "" #. type: deftypevr -#: doc/guix.texi:23207 +#: doc/guix.texi:23204 msgid "The cgit package." msgstr "" #. type: deftypevr -#: doc/guix.texi:23209 +#: doc/guix.texi:23206 #, no-wrap msgid "{@code{opaque-cgit-configuration} parameter} string string" msgstr "" #. type: deftypevr -#: doc/guix.texi:23211 +#: doc/guix.texi:23208 msgid "The contents of the @code{cgitrc}, as a string." msgstr "" #. type: Plain text -#: doc/guix.texi:23215 +#: doc/guix.texi:23212 msgid "For example, if your @code{cgitrc} is just the empty string, you could instantiate a cgit service like this:" msgstr "" #. type: example -#: doc/guix.texi:23220 +#: doc/guix.texi:23217 #, no-wrap msgid "" "(service cgit-service-type\n" @@ -42680,40 +42919,40 @@ msgid "" msgstr "" #. type: subsubheading -#: doc/guix.texi:23222 +#: doc/guix.texi:23219 #, no-wrap msgid "Gitolite Service" msgstr "Gitolite-Dienst" #. type: cindex -#: doc/guix.texi:23224 +#: doc/guix.texi:23221 #, no-wrap msgid "Gitolite service" msgstr "Gitolite-Dienst" #. type: cindex -#: doc/guix.texi:23225 +#: doc/guix.texi:23222 #, no-wrap msgid "Git, hosting" msgstr "" #. type: Plain text -#: doc/guix.texi:23228 +#: doc/guix.texi:23225 msgid "@uref{https://gitolite.com/gitolite/, Gitolite} is a tool for hosting Git repositories on a central server." msgstr "" #. type: Plain text -#: doc/guix.texi:23231 +#: doc/guix.texi:23228 msgid "Gitolite can handle multiple repositories and users, and supports flexible configuration of the permissions for the users on the repositories." msgstr "" #. type: Plain text -#: doc/guix.texi:23234 +#: doc/guix.texi:23231 msgid "The following example will configure Gitolite using the default @code{git} user, and the provided SSH public key." msgstr "" #. type: example -#: doc/guix.texi:23241 +#: doc/guix.texi:23238 #, no-wrap msgid "" "(service gitolite-service-type\n" @@ -42724,300 +42963,300 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:23246 +#: doc/guix.texi:23243 msgid "Gitolite is configured through a special admin repository which you can clone, for example, if you setup Gitolite on @code{example.com}, you would run the following command to clone the admin repository." msgstr "" #. type: example -#: doc/guix.texi:23249 +#: doc/guix.texi:23246 #, no-wrap msgid "git clone git@@example.com:gitolite-admin\n" msgstr "" #. type: Plain text -#: doc/guix.texi:23255 +#: doc/guix.texi:23252 msgid "When the Gitolite service is activated, the provided @code{admin-pubkey} will be inserted in to the @file{keydir} directory in the gitolite-admin repository. If this results in a change in the repository, it will be committed using the message ``gitolite setup by GNU Guix''." msgstr "" #. type: deftp -#: doc/guix.texi:23256 +#: doc/guix.texi:23253 #, no-wrap msgid "{Data Type} gitolite-configuration" msgstr "{Datentyp} gitolite-configuration" #. type: deftp -#: doc/guix.texi:23258 +#: doc/guix.texi:23255 msgid "Data type representing the configuration for @code{gitolite-service-type}." msgstr "Repräsentiert die Konfiguration vom @code{gitolite-service-type}." #. type: item -#: doc/guix.texi:23260 +#: doc/guix.texi:23257 #, no-wrap msgid "@code{package} (default: @var{gitolite})" msgstr "@code{package} (Vorgabe: @var{gitolite})" #. type: table -#: doc/guix.texi:23262 +#: doc/guix.texi:23259 msgid "Gitolite package to use." msgstr "Welches Gitolite-Paket benutzt werden soll." #. type: item -#: doc/guix.texi:23263 +#: doc/guix.texi:23260 #, no-wrap msgid "@code{user} (default: @var{git})" msgstr "@code{user} (Vorgabe: @var{git})" #. type: table -#: doc/guix.texi:23266 +#: doc/guix.texi:23263 msgid "User to use for Gitolite. This will be user that you use when accessing Gitolite over SSH." msgstr "" #. type: item -#: doc/guix.texi:23267 +#: doc/guix.texi:23264 #, no-wrap msgid "@code{group} (default: @var{git})" msgstr "@code{group} (Vorgabe: @var{git})" #. type: table -#: doc/guix.texi:23269 +#: doc/guix.texi:23266 msgid "Group to use for Gitolite." msgstr "" #. type: item -#: doc/guix.texi:23270 +#: doc/guix.texi:23267 #, no-wrap msgid "@code{home-directory} (default: @var{\"/var/lib/gitolite\"})" msgstr "@code{home-directory} (Vorgabe: @var{\"/var/lib/gitolite\"})" #. type: table -#: doc/guix.texi:23272 +#: doc/guix.texi:23269 msgid "Directory in which to store the Gitolite configuration and repositories." msgstr "" #. type: item -#: doc/guix.texi:23273 +#: doc/guix.texi:23270 #, no-wrap msgid "@code{rc-file} (default: @var{(gitolite-rc-file)})" msgstr "@code{rc-file} (Vorgabe: @var{(gitolite-rc-file)})" #. type: table -#: doc/guix.texi:23276 +#: doc/guix.texi:23273 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the configuration for Gitolite." msgstr "" #. type: item -#: doc/guix.texi:23277 +#: doc/guix.texi:23274 #, no-wrap msgid "@code{admin-pubkey} (default: @var{#f})" msgstr "@code{admin-pubkey} (Vorgabe: @var{#f})" #. type: table -#: doc/guix.texi:23281 +#: doc/guix.texi:23278 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite. This will be inserted in to the @file{keydir} directory within the gitolite-admin repository." msgstr "" #. type: table -#: doc/guix.texi:23283 +#: doc/guix.texi:23280 msgid "To specify the SSH key as a string, use the @code{plain-file} function." msgstr "" #. type: example -#: doc/guix.texi:23286 +#: doc/guix.texi:23283 #, no-wrap msgid "(plain-file \"yourname.pub\" \"ssh-rsa AAAA... guix@@example.com\")\n" msgstr "" #. type: deftp -#: doc/guix.texi:23291 +#: doc/guix.texi:23288 #, no-wrap msgid "{Data Type} gitolite-rc-file" msgstr "{Datentyp} gitolite-rc-file" #. type: deftp -#: doc/guix.texi:23293 +#: doc/guix.texi:23290 msgid "Data type representing the Gitolite RC file." msgstr "Repräsentiert die Gitolie-RC-Datei." #. type: item -#: doc/guix.texi:23295 +#: doc/guix.texi:23292 #, no-wrap msgid "@code{umask} (default: @code{#o0077})" msgstr "@code{umask} (Vorgabe: @code{#o0077})" #. type: table -#: doc/guix.texi:23298 +#: doc/guix.texi:23295 msgid "This controls the permissions Gitolite sets on the repositories and their contents." msgstr "" #. type: table -#: doc/guix.texi:23302 +#: doc/guix.texi:23299 msgid "A value like @code{#o0027} will give read access to the group used by Gitolite (by default: @code{git}). This is necessary when using Gitolite with software like cgit or gitweb." msgstr "" #. type: item -#: doc/guix.texi:23303 +#: doc/guix.texi:23300 #, no-wrap msgid "@code{git-config-keys} (default: @code{\"\"})" msgstr "@code{git-config-keys} (Vorgabe: @code{\"\"})" #. type: table -#: doc/guix.texi:23306 +#: doc/guix.texi:23303 msgid "Gitolite allows you to set git config values using the \"config\" keyword. This setting allows control over the config keys to accept." msgstr "" #. type: item -#: doc/guix.texi:23307 +#: doc/guix.texi:23304 #, no-wrap msgid "@code{roles} (default: @code{'((\"READERS\" . 1) (\"WRITERS\" . ))})" msgstr "@code{roles} (Vorgabe: @code{'((\"READERS\" . 1) (\"WRITERS\" . ))})" #. type: table -#: doc/guix.texi:23309 +#: doc/guix.texi:23306 msgid "Set the role names allowed to be used by users running the perms command." msgstr "" #. type: item -#: doc/guix.texi:23310 +#: doc/guix.texi:23307 #, no-wrap msgid "@code{enable} (default: @code{'(\"help\" \"desc\" \"info\" \"perms\" \"writable\" \"ssh-authkeys\" \"git-config\" \"daemon\" \"gitweb\")})" msgstr "" #. type: table -#: doc/guix.texi:23312 +#: doc/guix.texi:23309 msgid "This setting controls the commands and features to enable within Gitolite." msgstr "" #. type: subsubheading -#: doc/guix.texi:23320 +#: doc/guix.texi:23317 #, no-wrap msgid "The Battle for Wesnoth Service" msgstr "" #. type: cindex -#: doc/guix.texi:23321 +#: doc/guix.texi:23318 #, no-wrap msgid "wesnothd" msgstr "" #. type: Plain text -#: doc/guix.texi:23325 +#: doc/guix.texi:23322 msgid "@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn based tactical strategy game, with several single player campaigns, and multiplayer games (both networked and local)." msgstr "" #. type: defvar -#: doc/guix.texi:23326 +#: doc/guix.texi:23323 #, no-wrap msgid "{Scheme Variable} wesnothd-service-type" msgstr "" #. type: defvar -#: doc/guix.texi:23330 +#: doc/guix.texi:23327 msgid "Service type for the wesnothd service. Its value must be a @code{wesnothd-configuration} object. To run wesnothd in the default configuration, instantiate it as:" msgstr "" #. type: example -#: doc/guix.texi:23333 +#: doc/guix.texi:23330 #, no-wrap msgid "(service wesnothd-service-type)\n" msgstr "" #. type: deftp -#: doc/guix.texi:23336 +#: doc/guix.texi:23333 #, no-wrap msgid "{Data Type} wesnothd-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:23338 +#: doc/guix.texi:23335 msgid "Data type representing the configuration of @command{wesnothd}." msgstr "" #. type: item -#: doc/guix.texi:23340 +#: doc/guix.texi:23337 #, no-wrap msgid "@code{package} (default: @code{wesnoth-server})" msgstr "" #. type: table -#: doc/guix.texi:23342 +#: doc/guix.texi:23339 msgid "The wesnoth server package to use." msgstr "" #. type: item -#: doc/guix.texi:23343 +#: doc/guix.texi:23340 #, no-wrap msgid "@code{port} (default: @code{15000})" msgstr "" #. type: table -#: doc/guix.texi:23345 +#: doc/guix.texi:23342 msgid "The port to bind the server to." msgstr "" #. type: cindex -#: doc/guix.texi:23351 +#: doc/guix.texi:23348 #, no-wrap msgid "fingerprint" msgstr "" #. type: subsubheading -#: doc/guix.texi:23352 +#: doc/guix.texi:23349 #, no-wrap msgid "Fingerprint Service" msgstr "Fingerabdrucklese-Dienst" #. type: Plain text -#: doc/guix.texi:23356 +#: doc/guix.texi:23353 msgid "The @code{(gnu services authentication)} module provides a DBus service to read and identify fingerprints via a fingerprint sensor." msgstr "Das Modul @code{(gnu services authentication)} stellt einen DBus-Dienst zur Verfügung, mit dem Fingerabdrücke mit Hilfe eines Fingerabdrucksensors gelesen und identifiziert werden können." #. type: defvr -#: doc/guix.texi:23357 +#: doc/guix.texi:23354 #, no-wrap msgid "{Scheme Variable} fprintd-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:23360 +#: doc/guix.texi:23357 msgid "The service type for @command{fprintd}, which provides the fingerprint reading capability." msgstr "" #. type: example -#: doc/guix.texi:23363 +#: doc/guix.texi:23360 #, no-wrap msgid "(service fprintd-service-type)\n" msgstr "" #. type: cindex -#: doc/guix.texi:23366 +#: doc/guix.texi:23363 #, no-wrap msgid "sysctl" msgstr "" #. type: subsubheading -#: doc/guix.texi:23367 +#: doc/guix.texi:23364 #, no-wrap msgid "System Control Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23371 +#: doc/guix.texi:23368 msgid "The @code{(gnu services sysctl)} provides a service to configure kernel parameters at boot." msgstr "" #. type: defvr -#: doc/guix.texi:23372 +#: doc/guix.texi:23369 #, no-wrap msgid "{Scheme Variable} sysctl-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:23376 +#: doc/guix.texi:23373 msgid "The service type for @command{sysctl}, which modifies kernel parameters under @file{/proc/sys/}. To enable IPv4 forwarding, it can be instantiated as:" msgstr "" #. type: example -#: doc/guix.texi:23381 +#: doc/guix.texi:23378 #, no-wrap msgid "" "(service sysctl-service-type\n" @@ -43026,442 +43265,442 @@ msgid "" msgstr "" #. type: deftp -#: doc/guix.texi:23384 +#: doc/guix.texi:23381 #, no-wrap msgid "{Data Type} sysctl-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:23386 +#: doc/guix.texi:23383 msgid "The data type representing the configuration of @command{sysctl}." msgstr "" #. type: item -#: doc/guix.texi:23388 +#: doc/guix.texi:23385 #, no-wrap msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})" msgstr "" #. type: table -#: doc/guix.texi:23390 +#: doc/guix.texi:23387 msgid "The @command{sysctl} executable to use." msgstr "" #. type: item -#: doc/guix.texi:23391 +#: doc/guix.texi:23388 #, no-wrap msgid "@code{settings} (default: @code{'()})" msgstr "" #. type: table -#: doc/guix.texi:23393 +#: doc/guix.texi:23390 msgid "An association list specifies kernel parameters and their values." msgstr "" #. type: cindex -#: doc/guix.texi:23396 +#: doc/guix.texi:23393 #, no-wrap msgid "pcscd" msgstr "" #. type: subsubheading -#: doc/guix.texi:23397 +#: doc/guix.texi:23394 #, no-wrap msgid "PC/SC Smart Card Daemon Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23404 +#: doc/guix.texi:23401 msgid "The @code{(gnu services security-token)} module provides the following service to run @command{pcscd}, the PC/SC Smart Card Daemon. @command{pcscd} is the daemon program for pcsc-lite and the MuscleCard framework. It is a resource manager that coordinates communications with smart card readers, smart cards and cryptographic tokens that are connected to the system." msgstr "" #. type: defvr -#: doc/guix.texi:23405 +#: doc/guix.texi:23402 #, no-wrap msgid "{Scheme Variable} pcscd-service-type" msgstr "" #. type: defvr -#: doc/guix.texi:23409 +#: doc/guix.texi:23406 msgid "Service type for the @command{pcscd} service. Its value must be a @code{pcscd-configuration} object. To run pcscd in the default configuration, instantiate it as:" msgstr "" #. type: example -#: doc/guix.texi:23412 +#: doc/guix.texi:23409 #, no-wrap msgid "(service pcscd-service-type)\n" msgstr "" #. type: deftp -#: doc/guix.texi:23415 +#: doc/guix.texi:23412 #, no-wrap msgid "{Data Type} pcscd-configuration" msgstr "{Datentyp} pcscd-configuration" #. type: deftp -#: doc/guix.texi:23417 +#: doc/guix.texi:23414 msgid "The data type representing the configuration of @command{pcscd}." msgstr "Repräsentiert die Konfiguration von @command{pcscd}." #. type: item -#: doc/guix.texi:23419 +#: doc/guix.texi:23416 #, no-wrap msgid "@code{pcsc-lite} (default: @code{pcsc-lite})" msgstr "@code{pcsc-lite} (Vorgabe: @code{pcsc-lite})" #. type: table -#: doc/guix.texi:23421 +#: doc/guix.texi:23418 msgid "The pcsc-lite package that provides pcscd." msgstr "" #. type: item -#: doc/guix.texi:23421 +#: doc/guix.texi:23418 #, no-wrap msgid "@code{usb-drivers} (default: @code{(list ccid)})" msgstr "@code{usb-drivers} (Vorgabe: @code{(list ccid)})" #. type: table -#: doc/guix.texi:23424 +#: doc/guix.texi:23421 msgid "List of packages that provide USB drivers to pcscd. Drivers are expected to be under @file{pcsc/drivers} in the store directory of the package." msgstr "" #. type: cindex -#: doc/guix.texi:23427 +#: doc/guix.texi:23424 #, no-wrap msgid "lirc" msgstr "" #. type: subsubheading -#: doc/guix.texi:23428 +#: doc/guix.texi:23425 #, no-wrap msgid "Lirc Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23431 +#: doc/guix.texi:23428 msgid "The @code{(gnu services lirc)} module provides the following service." msgstr "" #. type: deffn -#: doc/guix.texi:23432 +#: doc/guix.texi:23429 #, no-wrap msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @" msgstr "" #. type: deffn -#: doc/guix.texi:23437 +#: doc/guix.texi:23434 msgid "[#:device #f] [#:driver #f] [#:config-file #f] @ [#:extra-options '()] Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that decodes infrared signals from remote controls." msgstr "" #. type: deffn -#: doc/guix.texi:23441 +#: doc/guix.texi:23438 msgid "Optionally, @var{device}, @var{driver} and @var{config-file} (configuration file name) may be specified. See @command{lircd} manual for details." msgstr "" #. type: deffn -#: doc/guix.texi:23444 +#: doc/guix.texi:23441 msgid "Finally, @var{extra-options} is a list of additional command-line options passed to @command{lircd}." msgstr "" #. type: cindex -#: doc/guix.texi:23446 +#: doc/guix.texi:23443 #, no-wrap msgid "spice" msgstr "" #. type: subsubheading -#: doc/guix.texi:23447 +#: doc/guix.texi:23444 #, no-wrap msgid "Spice Service" msgstr "" #. type: Plain text -#: doc/guix.texi:23450 +#: doc/guix.texi:23447 msgid "The @code{(gnu services spice)} module provides the following service." msgstr "" #. type: deffn -#: doc/guix.texi:23451 +#: doc/guix.texi:23448 #, no-wrap msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]" msgstr "" #. type: deffn -#: doc/guix.texi:23455 +#: doc/guix.texi:23452 msgid "Returns a service that runs @url{https://www.spice-space.org,VDAGENT}, a daemon that enables sharing the clipboard with a vm and setting the guest display resolution when the graphical console window resizes." msgstr "" #. type: cindex -#: doc/guix.texi:23457 +#: doc/guix.texi:23454 #, no-wrap msgid "inputattach" msgstr "inputattach" #. type: subsubheading -#: doc/guix.texi:23458 +#: doc/guix.texi:23455 #, no-wrap msgid "inputattach Service" msgstr "inputattach-Dienst" #. type: cindex -#: doc/guix.texi:23460 +#: doc/guix.texi:23457 #, no-wrap msgid "tablet input, for Xorg" msgstr "Tablett-Eingaben, für Xorg" #. type: cindex -#: doc/guix.texi:23461 +#: doc/guix.texi:23458 #, no-wrap msgid "touchscreen input, for Xorg" msgstr "Tastbildschirm-Eingaben, für Xorg" #. type: Plain text -#: doc/guix.texi:23465 +#: doc/guix.texi:23462 msgid "The @uref{https://linuxwacom.github.io/, inputattach} service allows you to use input devices such as Wacom tablets, touchscreens, or joysticks with the Xorg display server." msgstr "Der @uref{https://linuxwacom.github.io/, inputattach-Dienst} macht es Ihnen möglich, Eingabegeräte wie Wacom-Tabletts, Tastbildschirme („Touchscreens“) oder Joysticks mit dem Xorg-Anzeigeserver zu benutzen." #. type: deffn -#: doc/guix.texi:23466 +#: doc/guix.texi:23463 #, no-wrap msgid "{Scheme Variable} inputattach-service-type" msgstr "{Scheme-Variable} inputattach-service-type" #. type: deffn -#: doc/guix.texi:23469 +#: doc/guix.texi:23466 msgid "Type of a service that runs @command{inputattach} on a device and dispatches events from it." msgstr "" #. type: deftp -#: doc/guix.texi:23471 +#: doc/guix.texi:23468 #, no-wrap msgid "{Data Type} inputattach-configuration" msgstr "{Datentyp} inputattach-configuration" #. type: item -#: doc/guix.texi:23473 +#: doc/guix.texi:23470 #, no-wrap msgid "@code{device-type} (default: @code{\"wacom\"})" msgstr "@code{device-type} (Vorgabe: @code{\"wacom\"})" #. type: table -#: doc/guix.texi:23476 +#: doc/guix.texi:23473 msgid "The type of device to connect to. Run @command{inputattach --help}, from the @code{inputattach} package, to see the list of supported device types." msgstr "" #. type: item -#: doc/guix.texi:23477 +#: doc/guix.texi:23474 #, no-wrap msgid "@code{device} (default: @code{\"/dev/ttyS0\"})" msgstr "@code{device} (Vorgabe: @code{\"/dev/ttyS0\"})" #. type: table -#: doc/guix.texi:23479 +#: doc/guix.texi:23476 msgid "The device file to connect to the device." msgstr "" #. type: item -#: doc/guix.texi:23480 +#: doc/guix.texi:23477 #, no-wrap msgid "@code{log-file} (default: @code{#f})" msgstr "@code{log-file} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:23482 +#: doc/guix.texi:23479 msgid "If true, this must be the name of a file to log messages to." msgstr "" #. type: subsection -#: doc/guix.texi:23485 +#: doc/guix.texi:23482 #, no-wrap msgid "Dictionary Services" msgstr "" #. type: cindex -#: doc/guix.texi:23486 +#: doc/guix.texi:23483 #, no-wrap msgid "dictionary" msgstr "" #. type: Plain text -#: doc/guix.texi:23488 +#: doc/guix.texi:23485 msgid "The @code{(gnu services dict)} module provides the following service:" msgstr "" #. type: deffn -#: doc/guix.texi:23489 +#: doc/guix.texi:23486 #, no-wrap msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]" msgstr "" #. type: deffn -#: doc/guix.texi:23492 +#: doc/guix.texi:23489 msgid "Return a service that runs the @command{dicod} daemon, an implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})." msgstr "" #. type: deffn -#: doc/guix.texi:23496 +#: doc/guix.texi:23493 msgid "The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{} object, by default it serves the GNU Collaborative International Dictonary of English." msgstr "" #. type: deffn -#: doc/guix.texi:23500 +#: doc/guix.texi:23497 msgid "You can add @command{open localhost} to your @file{~/.dico} file to make @code{localhost} the default server for @command{dico} client (@pxref{Initialization File,,, dico, GNU Dico Manual})." msgstr "" #. type: deftp -#: doc/guix.texi:23502 +#: doc/guix.texi:23499 #, no-wrap msgid "{Data Type} dicod-configuration" msgstr "" #. type: deftp -#: doc/guix.texi:23504 +#: doc/guix.texi:23501 msgid "Data type representing the configuration of dicod." msgstr "" #. type: item -#: doc/guix.texi:23506 +#: doc/guix.texi:23503 #, no-wrap msgid "@code{dico} (default: @var{dico})" msgstr "" #. type: table -#: doc/guix.texi:23508 +#: doc/guix.texi:23505 msgid "Package object of the GNU Dico dictionary server." msgstr "" #. type: item -#: doc/guix.texi:23509 +#: doc/guix.texi:23506 #, no-wrap msgid "@code{interfaces} (default: @var{'(\"localhost\")})" msgstr "" #. type: table -#: doc/guix.texi:23513 +#: doc/guix.texi:23510 msgid "This is the list of IP addresses and ports and possibly socket file names to listen to (@pxref{Server Settings, @code{listen} directive,, dico, GNU Dico Manual})." msgstr "" #. type: item -#: doc/guix.texi:23514 +#: doc/guix.texi:23511 #, no-wrap msgid "@code{handlers} (default: @var{'()})" msgstr "" #. type: table -#: doc/guix.texi:23516 +#: doc/guix.texi:23513 msgid "List of @code{} objects denoting handlers (module instances)." msgstr "" #. type: item -#: doc/guix.texi:23517 +#: doc/guix.texi:23514 #, no-wrap msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})" msgstr "" #. type: table -#: doc/guix.texi:23519 +#: doc/guix.texi:23516 msgid "List of @code{} objects denoting dictionaries to be served." msgstr "" #. type: deftp -#: doc/guix.texi:23522 +#: doc/guix.texi:23519 #, no-wrap msgid "{Data Type} dicod-handler" msgstr "" #. type: deftp -#: doc/guix.texi:23524 +#: doc/guix.texi:23521 msgid "Data type representing a dictionary handler (module instance)." msgstr "" #. type: table -#: doc/guix.texi:23528 +#: doc/guix.texi:23525 msgid "Name of the handler (module instance)." msgstr "" #. type: item -#: doc/guix.texi:23529 +#: doc/guix.texi:23526 #, no-wrap msgid "@code{module} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:23533 +#: doc/guix.texi:23530 msgid "Name of the dicod module of the handler (instance). If it is @code{#f}, the module has the same name as the handler. (@pxref{Modules,,, dico, GNU Dico Manual})." msgstr "" #. type: code{#1} -#: doc/guix.texi:23534 doc/guix.texi:23554 +#: doc/guix.texi:23531 doc/guix.texi:23551 #, no-wrap msgid "options" msgstr "" #. type: table -#: doc/guix.texi:23536 +#: doc/guix.texi:23533 msgid "List of strings or gexps representing the arguments for the module handler" msgstr "" #. type: deftp -#: doc/guix.texi:23539 +#: doc/guix.texi:23536 #, no-wrap msgid "{Data Type} dicod-database" msgstr "" #. type: deftp -#: doc/guix.texi:23541 +#: doc/guix.texi:23538 msgid "Data type representing a dictionary database." msgstr "" #. type: table -#: doc/guix.texi:23545 +#: doc/guix.texi:23542 msgid "Name of the database, will be used in DICT commands." msgstr "" #. type: code{#1} -#: doc/guix.texi:23546 +#: doc/guix.texi:23543 #, no-wrap msgid "handler" msgstr "" #. type: table -#: doc/guix.texi:23549 +#: doc/guix.texi:23546 msgid "Name of the dicod handler (module instance) used by this database (@pxref{Handlers,,, dico, GNU Dico Manual})." msgstr "" #. type: item -#: doc/guix.texi:23550 +#: doc/guix.texi:23547 #, no-wrap msgid "@code{complex?} (default: @var{#f})" msgstr "" #. type: table -#: doc/guix.texi:23553 +#: doc/guix.texi:23550 msgid "Whether the database configuration complex. The complex configuration will need a corresponding @code{} object, otherwise not." msgstr "" #. type: table -#: doc/guix.texi:23557 +#: doc/guix.texi:23554 msgid "List of strings or gexps representing the arguments for the database (@pxref{Databases,,, dico, GNU Dico Manual})." msgstr "" #. type: defvr -#: doc/guix.texi:23560 +#: doc/guix.texi:23557 #, no-wrap msgid "{Scheme Variable} %dicod-database:gcide" msgstr "" #. type: defvr -#: doc/guix.texi:23563 +#: doc/guix.texi:23560 msgid "A @code{} object serving the GNU Collaborative International Dictionary of English using the @code{gcide} package." msgstr "" #. type: Plain text -#: doc/guix.texi:23566 +#: doc/guix.texi:23563 msgid "The following is an example @code{dicod-service} configuration." msgstr "" #. type: example -#: doc/guix.texi:23581 +#: doc/guix.texi:23578 #, no-wrap msgid "" "(dicod-service #:config\n" @@ -43480,169 +43719,169 @@ msgid "" msgstr "" #. type: cindex -#: doc/guix.texi:23583 +#: doc/guix.texi:23580 #, no-wrap msgid "Docker" msgstr "Docker" #. type: subsubheading -#: doc/guix.texi:23584 +#: doc/guix.texi:23581 #, no-wrap msgid "Docker Service" msgstr "Docker-Dienst" #. type: Plain text -#: doc/guix.texi:23587 +#: doc/guix.texi:23584 msgid "The @code{(gnu services docker)} module provides the following service." msgstr "Das Modul @code{(gnu services docker)} stellt den folgenden Dienst zur Verfügung." #. type: defvr -#: doc/guix.texi:23588 +#: doc/guix.texi:23585 #, no-wrap msgid "{Scheme Variable} docker-service-type" msgstr "{Scheme-Variable} docker-service-type" #. type: defvr -#: doc/guix.texi:23593 +#: doc/guix.texi:23590 msgid "This is the type of the service that runs @url{https://www.docker.com,Docker}, a daemon that can execute application bundles (sometimes referred to as ``containers'') in isolated environments." msgstr "" #. type: deftp -#: doc/guix.texi:23596 +#: doc/guix.texi:23593 #, no-wrap msgid "{Data Type} docker-configuration" msgstr "{Datentyp} docker-configuration" #. type: deftp -#: doc/guix.texi:23598 +#: doc/guix.texi:23595 msgid "This is the data type representing the configuration of Docker and Containerd." msgstr "Dies ist der Datentyp, der die Konfiguration von Docker und Containerd repräsentiert." #. type: item -#: doc/guix.texi:23601 +#: doc/guix.texi:23598 #, no-wrap msgid "@code{package} (default: @code{docker})" msgstr "@code{package} (Vorgabe: @code{docker})" #. type: table -#: doc/guix.texi:23603 +#: doc/guix.texi:23600 msgid "The Docker package to use." msgstr "Das Docker-Paket, was benutzt werden soll." #. type: item -#: doc/guix.texi:23604 +#: doc/guix.texi:23601 #, no-wrap msgid "@code{containerd} (default: @var{containerd})" msgstr "@code{containerd} (Vorgabe: @var{containerd})" #. type: table -#: doc/guix.texi:23606 +#: doc/guix.texi:23603 msgid "The Containerd package to use." msgstr "Das Containerd-Paket, was benutzt werden soll." #. type: cindex -#: doc/guix.texi:23613 +#: doc/guix.texi:23610 #, no-wrap msgid "setuid programs" msgstr "setuid-Programme" #. type: Plain text -#: doc/guix.texi:23623 +#: doc/guix.texi:23620 msgid "Some programs need to run with ``root'' privileges, even when they are launched by unprivileged users. A notorious example is the @command{passwd} program, which users can run to change their password, and which needs to access the @file{/etc/passwd} and @file{/etc/shadow} files---something normally restricted to root, for obvious security reasons. To address that, these executables are @dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, for more info about the setuid mechanism.)" msgstr "Manche Programme müssen mit Administratorrechten (also den Berechtigungen des „root“-Benutzers) ausgeführt werden, selbst wenn Nutzer ohne besondere Berechtigungen sie starten. Ein bekanntes Beispiel ist das Programm @command{passwd}, womit Nutzer ihr Passwort ändern können, wozu das Programm auf die Dateien @file{/etc/passwd} und @file{/etc/shadow} zugreifen muss — was normalerweise nur der „root“-Nutzer darf, aus offensichtlichen Gründen der Informationssicherheit. Deswegen sind diese ausführbaren Programmdateien @dfn{setuid-root}, d.h.@: sie laufen immer mit den Administratorrechten des root-Nutzers, egal wer sie startet (siehe @ref{How Change Persona,,, libc, The GNU C Library Reference Manual} für mehr Informationen über den setuid-Mechanismus)." #. type: Plain text -#: doc/guix.texi:23630 +#: doc/guix.texi:23627 msgid "The store itself @emph{cannot} contain setuid programs: that would be a security issue since any user on the system can write derivations that populate the store (@pxref{The Store}). Thus, a different mechanism is used: instead of changing the setuid bit directly on files that are in the store, we let the system administrator @emph{declare} which programs should be setuid root." msgstr "Der Store selbst kann @emph{keine} setuid-Programme enthalten: Das wäre eine Sicherheitslücke, weil dann jeder Nutzer auf dem System Ableitungen schreiben könnte, die in den Store solche Dateien einfügen würden (siehe @ref{The Store}). Wir benutzen also einen anderen Mechanismus: Statt auf den ausführbaren Dateien im Store selbst deren setuid-Bit zu setzen, lassen wir den Systemadministrator @emph{deklarieren}, welche Programme mit setuid-root gestartet werden." #. type: Plain text -#: doc/guix.texi:23636 +#: doc/guix.texi:23633 msgid "The @code{setuid-programs} field of an @code{operating-system} declaration contains a list of G-expressions denoting the names of programs to be setuid-root (@pxref{Using the Configuration System}). For instance, the @command{passwd} program, which is part of the Shadow package, can be designated by this G-expression (@pxref{G-Expressions}):" msgstr "Das Feld @code{setuid-programs} einer @code{operating-system}-Deklaration enthält eine Liste von G-Ausdrücken, die die Namen der Programme angeben, die setuid-root sein sollen (siehe @ref{Using the Configuration System}). Zum Beispiel kann das Programm @command{passwd}, was Teil des Shadow-Pakets ist, durch diesen G-Ausdruck bezeichnet werden (siehe @ref{G-Expressions}):" #. type: example -#: doc/guix.texi:23639 +#: doc/guix.texi:23636 #, no-wrap msgid "#~(string-append #$shadow \"/bin/passwd\")\n" msgstr "#~(string-append #$shadow \"/bin/passwd\")\n" #. type: Plain text -#: doc/guix.texi:23643 +#: doc/guix.texi:23640 msgid "A default set of setuid programs is defined by the @code{%setuid-programs} variable of the @code{(gnu system)} module." msgstr "Eine vorgegebene Menge von setuid-Programmen wird durch die Variable @code{%setuid-programs} aus dem Modul @code{(gnu system)} definiert." #. type: defvr -#: doc/guix.texi:23644 +#: doc/guix.texi:23641 #, no-wrap msgid "{Scheme Variable} %setuid-programs" msgstr "{Scheme-Variable} %setuid-programs" #. type: defvr -#: doc/guix.texi:23646 +#: doc/guix.texi:23643 msgid "A list of G-expressions denoting common programs that are setuid-root." msgstr "Eine Liste von G-Ausdrücken, die übliche Programme angeben, die setuid-root sein müssen." #. type: defvr -#: doc/guix.texi:23649 +#: doc/guix.texi:23646 msgid "The list includes commands such as @command{passwd}, @command{ping}, @command{su}, and @command{sudo}." msgstr "Die Liste enthält Befehle wie @command{passwd}, @command{ping}, @command{su} und @command{sudo}." #. type: Plain text -#: doc/guix.texi:23655 +#: doc/guix.texi:23652 msgid "Under the hood, the actual setuid programs are created in the @file{/run/setuid-programs} directory at system activation time. The files in this directory refer to the ``real'' binaries, which are in the store." msgstr "Intern erzeugt Guix die eigentlichen setuid-Programme im Verzeichnis @file{/run/setuid-programs}, wenn das System aktiviert wird. Die Dateien in diesem Verzeichnis verweisen auf die „echten“ Binärdateien im Store." #. type: cindex -#: doc/guix.texi:23659 +#: doc/guix.texi:23656 #, no-wrap msgid "HTTPS, certificates" msgstr "HTTPS, Zertifikate" #. type: cindex -#: doc/guix.texi:23660 +#: doc/guix.texi:23657 #, no-wrap msgid "X.509 certificates" msgstr "X.509-Zertifikate" #. type: cindex -#: doc/guix.texi:23661 +#: doc/guix.texi:23658 #, no-wrap msgid "TLS" msgstr "TLS" #. type: Plain text -#: doc/guix.texi:23668 +#: doc/guix.texi:23665 msgid "Web servers available over HTTPS (that is, HTTP over the transport-layer security mechanism, TLS) send client programs an @dfn{X.509 certificate} that the client can then use to @emph{authenticate} the server. To do that, clients verify that the server's certificate is signed by a so-called @dfn{certificate authority} (CA). But to verify the CA's signature, clients must have first acquired the CA's certificate." msgstr "Über HTTPS verfügbare Webserver (also HTTP mit gesicherter Transportschicht, englisch „Transport-Layer Security“, kurz TLS) senden Client-Programmen ein @dfn{X.509-Zertifikat}, mit dem der Client den Server dann @emph{authentifizieren} kann. Dazu verifiziert der Client, dass das Zertifikat des Servers von einer sogenannten Zertifizierungsstelle signiert wurde (@dfn{Certificate Authority}, kurz CA). Damit er aber die Signatur der Zertifizierungsstelle verifizieren kann, muss jeder Client das Zertifikat der Zertifizierungsstelle besitzen." #. type: Plain text -#: doc/guix.texi:23672 +#: doc/guix.texi:23669 msgid "Web browsers such as GNU@tie{}IceCat include their own set of CA certificates, such that they are able to verify CA signatures out-of-the-box." msgstr "Web-Browser wie GNU@tie{}IceCat liefern ihre eigenen CA-Zertifikate mit, damit sie von Haus aus Zertifikate verifizieren können." #. type: Plain text -#: doc/guix.texi:23676 +#: doc/guix.texi:23673 msgid "However, most other programs that can talk HTTPS---@command{wget}, @command{git}, @command{w3m}, etc.---need to be told where CA certificates can be found." msgstr "Den meisten anderen Programmen, die HTTPS sprechen können — @command{wget}, @command{git}, @command{w3m} etc.@: — muss allerdings erst mitgeteilt werden, wo die CA-Zertifikate installiert sind." #. type: Plain text -#: doc/guix.texi:23683 +#: doc/guix.texi:23680 msgid "In Guix, this is done by adding a package that provides certificates to the @code{packages} field of the @code{operating-system} declaration (@pxref{operating-system Reference}). Guix includes one such package, @code{nss-certs}, which is a set of CA certificates provided as part of Mozilla's Network Security Services." msgstr "In Guix müssen Sie dazu ein Paket, das Zertifikate enthält, in das @code{packages}-Feld der @code{operating-system}-Deklaration des Betriebssystems hinzufügen (siehe @ref{operating-system Reference}). Guix liefert ein solches Paket mit, @code{nss-certs}, was als Teil von Mozillas „Network Security Services“ angeboten wird." #. type: Plain text -#: doc/guix.texi:23688 +#: doc/guix.texi:23685 msgid "Note that it is @emph{not} part of @var{%base-packages}, so you need to explicitly add it. The @file{/etc/ssl/certs} directory, which is where most applications and libraries look for certificates by default, points to the certificates installed globally." msgstr "Beachten Sie, dass es @emph{nicht} zu den @var{%base-packages} gehört, Sie es also ausdrücklich hinzufügen müssen. Das Verzeichnis @file{/etc/ssl/certs}, wo die meisten Anwendungen und Bibliotheken ihren Voreinstellungen entsprechend nach Zertifikaten suchen, verweist auf die global installierten Zertifikate." #. type: Plain text -#: doc/guix.texi:23698 +#: doc/guix.texi:23695 msgid "Unprivileged users, including users of Guix on a foreign distro, can also install their own certificate package in their profile. A number of environment variables need to be defined so that applications and libraries know where to find them. Namely, the OpenSSL library honors the @code{SSL_CERT_DIR} and @code{SSL_CERT_FILE} variables. Some applications add their own environment variables; for instance, the Git version control system honors the certificate bundle pointed to by the @code{GIT_SSL_CAINFO} environment variable. Thus, you would typically run something like:" msgstr "Unprivilegierte Benutzer, wie die, die Guix auf einer Fremddistribution benutzen, können sich auch lokal ihre eigenen Pakete mit Zertifikaten in ihr Profil installieren. Eine Reihe von Umgebungsvariablen muss dazu definiert werden, damit Anwendungen und Bibliotheken wissen, wo diese Zertifikate zu finden sind. Und zwar folgt die OpenSSL-Bibliothek den Umgebungsvariablen @code{SSL_CERT_DIR} und @code{SSL_CERT_FILE}, manche Anwendungen benutzen stattdessen aber ihre eigenen Umgebungsvariablen. Das Versionskontrollsystem Git liest den Ort zum Beispiel aus der Umgebungsvariablen @code{GIT_SSL_CAINFO} aus. Sie würden typischerweise also so etwas ausführen:" #. type: example -#: doc/guix.texi:23704 +#: doc/guix.texi:23701 #, no-wrap msgid "" "$ guix install nss-certs\n" @@ -43656,12 +43895,12 @@ msgstr "" "$ export GIT_SSL_CAINFO=\"$SSL_CERT_FILE\"\n" #. type: Plain text -#: doc/guix.texi:23709 +#: doc/guix.texi:23706 msgid "As another example, R requires the @code{CURL_CA_BUNDLE} environment variable to point to a certificate bundle, so you would have to run something like this:" msgstr "Ein weiteres Beispiel ist R, was voraussetzt, dass die Umgebungsvariable @code{CURL_CA_BUNDLE} auf ein Zertifikatsbündel verweist, weshalb Sie etwas wie hier ausführen müssten:" #. type: example -#: doc/guix.texi:23713 +#: doc/guix.texi:23710 #, no-wrap msgid "" "$ guix install nss-certs\n" @@ -43671,51 +43910,51 @@ msgstr "" "$ export CURL_CA_BUNDLE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n" #. type: Plain text -#: doc/guix.texi:23717 +#: doc/guix.texi:23714 msgid "For other applications you may want to look up the required environment variable in the relevant documentation." msgstr "Für andere Anwendungen möchten Sie die Namen der benötigten Umgebungsvariablen vielleicht in deren Dokumentation nachschlagen." #. type: cindex -#: doc/guix.texi:23722 +#: doc/guix.texi:23719 #, no-wrap msgid "name service switch" msgstr "Name Service Switch" #. type: cindex -#: doc/guix.texi:23723 +#: doc/guix.texi:23720 #, no-wrap msgid "NSS" msgstr "NSS" #. type: Plain text -#: doc/guix.texi:23732 +#: doc/guix.texi:23729 msgid "The @code{(gnu system nss)} module provides bindings to the configuration file of the libc @dfn{name service switch} or @dfn{NSS} (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). In a nutshell, the NSS is a mechanism that allows libc to be extended with new ``name'' lookup methods for system databases, which includes host names, service names, user accounts, and more (@pxref{Name Service Switch, System Databases and Name Service Switch,, libc, The GNU C Library Reference Manual})." msgstr "Das Modul @code{(gnu system nss)} enthält Anbindungen für die Konfiguration des @dfn{Name Service Switch} (NSS) der libc (siehe @ref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). Kurz gesagt ist der NSS ein Mechanismus, mit dem die libc um neue „Namens“-Auflösungsmethoden für Systemdatenbanken erweitert werden kann; dazu gehören Rechnernamen (auch bekannt als „Host“-Namen), Dienstnamen, Benutzerkonten und mehr (siehe @ref{Name Service Switch, System Databases and Name Service Switch,, libc, The GNU C Library Reference Manual})." #. type: Plain text -#: doc/guix.texi:23739 +#: doc/guix.texi:23736 msgid "The NSS configuration specifies, for each system database, which lookup method is to be used, and how the various methods are chained together---for instance, under which circumstances NSS should try the next method in the list. The NSS configuration is given in the @code{name-service-switch} field of @code{operating-system} declarations (@pxref{operating-system Reference, @code{name-service-switch}})." msgstr "Die NSS-Konfiguration legt für jede Systemdatenbank fest, mit welcher Methode der Name nachgeschlagen („aufgelöst“) werden kann und welche Methoden zusammenhängen — z.B.@: unter welchen Umständen der NSS es mit der nächsten Methode auf seiner Liste versuchen sollte. Die NSS-Konfiguration wird im Feld @code{name-service-switch} von @code{operating-system}-Deklarationen angegeben (siehe @ref{operating-system Reference, @code{name-service-switch}})." #. type: cindex -#: doc/guix.texi:23740 +#: doc/guix.texi:23737 #, no-wrap msgid "nss-mdns" msgstr "nss-mdns" #. type: cindex -#: doc/guix.texi:23741 +#: doc/guix.texi:23738 #, no-wrap msgid ".local, host name lookup" msgstr ".local, Rechnernamensauflösung" #. type: Plain text -#: doc/guix.texi:23746 +#: doc/guix.texi:23743 msgid "As an example, the declaration below configures the NSS to use the @uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-end}, which supports host name lookups over multicast DNS (mDNS) for host names ending in @code{.local}:" msgstr "Zum Beispiel konfigurieren die folgenden Deklarationen den NSS so, dass er das @uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns}-Backend} benutzt, wodurch er auf @code{.local} endende Rechnernamen über Multicast-DNS (mDNS) auflöst:" #. type: example -#: doc/guix.texi:23750 +#: doc/guix.texi:23747 #, no-wrap msgid "" "(name-service-switch\n" @@ -43727,7 +43966,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23755 +#: doc/guix.texi:23752 #, no-wrap msgid "" " ;; If the above did not succeed, try\n" @@ -43743,7 +43982,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23761 +#: doc/guix.texi:23758 #, no-wrap msgid "" " ;; 'mdns_minimal' is authoritative for\n" @@ -43763,7 +44002,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23765 +#: doc/guix.texi:23762 #, no-wrap msgid "" " ;; Then fall back to DNS.\n" @@ -43777,7 +44016,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:23769 +#: doc/guix.texi:23766 #, no-wrap msgid "" " ;; Finally, try with the \"full\" 'mdns'.\n" @@ -43790,157 +44029,157 @@ msgstr "" " (name \"mdns\")))))\n" #. type: Plain text -#: doc/guix.texi:23774 +#: doc/guix.texi:23771 msgid "Do not worry: the @code{%mdns-host-lookup-nss} variable (see below) contains this configuration, so you will not have to type it if all you want is to have @code{.local} host lookup working." msgstr "Keine Sorge: Die Variable @code{%mdns-host-lookup-nss} (siehe unten) enthält diese Konfiguration bereits. Statt das alles selst einzutippen, können Sie sie benutzen, wenn alles, was Sie möchten, eine funktionierende Namensauflösung für @code{.local}-Rechner ist." #. type: Plain text -#: doc/guix.texi:23782 +#: doc/guix.texi:23779 msgid "Note that, in this case, in addition to setting the @code{name-service-switch} of the @code{operating-system} declaration, you also need to use @code{avahi-service-type} (@pxref{Networking Services, @code{avahi-service-type}}), or @var{%desktop-services}, which includes it (@pxref{Desktop Services}). Doing this makes @code{nss-mdns} accessible to the name service cache daemon (@pxref{Base Services, @code{nscd-service}})." msgstr "Beachten Sie dabei, dass es zusätzlich zum Festlegen des @code{name-service-switch} in der @code{operating-system}-Deklaration auch erforderlich ist, den @code{avahi-service-type} zu benutzen (siehe @ref{Networking Services, @code{avahi-service-type}}). Es genügt auch, wenn Sie die @var{%desktop-services} benutzen, weil er darin enthalten ist (siehe @ref{Desktop Services}). Dadurch wird @code{nss-mdns} für den Name Service Cache Daemon nutzbar (siehe @ref{Base Services, @code{nscd-service}})." #. type: Plain text -#: doc/guix.texi:23785 +#: doc/guix.texi:23782 msgid "For convenience, the following variables provide typical NSS configurations." msgstr "Um sich eine lange Konfiguration zu ersparen, können Sie auch einfach die folgenden Variablen für typische NSS-Konfigurationen benutzen." #. type: defvr -#: doc/guix.texi:23786 +#: doc/guix.texi:23783 #, no-wrap msgid "{Scheme Variable} %default-nss" msgstr "{Scheme-Variable} %default-nss" #. type: defvr -#: doc/guix.texi:23789 +#: doc/guix.texi:23786 msgid "This is the default name service switch configuration, a @code{name-service-switch} object." msgstr "Die vorgegebene Konfiguration des Name Service Switch als ein @code{name-service-switch}-Objekt." #. type: defvr -#: doc/guix.texi:23791 +#: doc/guix.texi:23788 #, no-wrap msgid "{Scheme Variable} %mdns-host-lookup-nss" msgstr "{Scheme-Variable} %mdns-host-lookup-nss" #. type: defvr -#: doc/guix.texi:23794 +#: doc/guix.texi:23791 msgid "This is the name service switch configuration with support for host name lookup over multicast DNS (mDNS) for host names ending in @code{.local}." msgstr "Die Name-Service-Switch-Konfiguration mit Unterstützung für Rechnernamensauflösung über „Multicast DNS“ (mDNS) für auf @code{.local} endende Rechnernamen." #. type: Plain text -#: doc/guix.texi:23804 +#: doc/guix.texi:23801 msgid "The reference for name service switch configuration is given below. It is a direct mapping of the configuration file format of the C library , so please refer to the C library manual for more information (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). Compared to the configuration file format of libc NSS, it has the advantage not only of adding this warm parenthetic feel that we like, but also static checks: you will know about syntax errors and typos as soon as you run @command{guix system}." msgstr "Im Folgenden finden Sie eine Referenz, wie eine Name-Service-Switch-Konfiguration aussehen muss. Sie hat eine direkte Entsprechung zum Konfigurationsdateiformat der C-Bibliothek, lesen Sie weitere Informationen also bitte im Handbuch der C-Bibliothek nach (siehe @ref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}). Gegenüber dem Konfigurationsdateiformat des libc-NSS bekommen Sie mit unserer Syntax nicht nur ein warm umklammerndes Gefühl, sondern auch eine statische Analyse: Wenn Sie Syntax- und Schreibfehler machen, werden Sie darüber benachrichtigt, sobald Sie @command{guix system} aufrufen." #. type: deftp -#: doc/guix.texi:23805 +#: doc/guix.texi:23802 #, no-wrap msgid "{Data Type} name-service-switch" msgstr "{Datentyp} name-service-switch" #. type: deftp -#: doc/guix.texi:23810 +#: doc/guix.texi:23807 msgid "This is the data type representation the configuration of libc's name service switch (NSS). Each field below represents one of the supported system databases." msgstr "Der Datentyp, der die Konfiguration des Name Service Switch (NSS) der libc repräsentiert. Jedes im Folgenden aufgeführte Feld repräsentiert eine der unterstützten Systemdatenbanken." #. type: item -#: doc/guix.texi:23812 +#: doc/guix.texi:23809 #, no-wrap msgid "aliases" msgstr "aliases" #. type: itemx -#: doc/guix.texi:23813 +#: doc/guix.texi:23810 #, no-wrap msgid "ethers" msgstr "ethers" #. type: itemx -#: doc/guix.texi:23815 +#: doc/guix.texi:23812 #, no-wrap msgid "gshadow" msgstr "gshadow" #. type: itemx -#: doc/guix.texi:23816 +#: doc/guix.texi:23813 #, no-wrap msgid "hosts" msgstr "hosts" #. type: itemx -#: doc/guix.texi:23817 +#: doc/guix.texi:23814 #, no-wrap msgid "initgroups" msgstr "initgroups" #. type: itemx -#: doc/guix.texi:23818 +#: doc/guix.texi:23815 #, no-wrap msgid "netgroup" msgstr "netgroup" #. type: itemx -#: doc/guix.texi:23819 +#: doc/guix.texi:23816 #, no-wrap msgid "networks" msgstr "networks" #. type: itemx -#: doc/guix.texi:23821 +#: doc/guix.texi:23818 #, no-wrap msgid "public-key" msgstr "public-key" #. type: itemx -#: doc/guix.texi:23822 +#: doc/guix.texi:23819 #, no-wrap msgid "rpc" msgstr "rpc" #. type: itemx -#: doc/guix.texi:23824 +#: doc/guix.texi:23821 #, no-wrap msgid "shadow" msgstr "shadow" #. type: table -#: doc/guix.texi:23827 +#: doc/guix.texi:23824 msgid "The system databases handled by the NSS. Each of these fields must be a list of @code{} objects (see below)." msgstr "Das sind die Systemdatenbanken, um die sich NSS kümmern kann. Jedes dieser Felder muss eine Liste aus @code{}-Objekten sein (siehe unten)." #. type: deftp -#: doc/guix.texi:23830 +#: doc/guix.texi:23827 #, no-wrap msgid "{Data Type} name-service" msgstr "{Datentyp} name-service" #. type: deftp -#: doc/guix.texi:23834 +#: doc/guix.texi:23831 msgid "This is the data type representing an actual name service and the associated lookup action." msgstr "Der einen eigentlichen Namensdienst repräsentierende Datentyp zusammen mit der zugehörigen Auflösungsaktion." #. type: table -#: doc/guix.texi:23839 +#: doc/guix.texi:23836 msgid "A string denoting the name service (@pxref{Services in the NSS configuration,,, libc, The GNU C Library Reference Manual})." msgstr "Eine Zeichenkette, die den Namensdienst bezeichnet (siehe @ref{Services in the NSS configuration,,, libc, The GNU C Library Reference Manual})." #. type: table -#: doc/guix.texi:23844 +#: doc/guix.texi:23841 msgid "Note that name services listed here must be visible to nscd. This is achieved by passing the @code{#:name-services} argument to @code{nscd-service} the list of packages providing the needed name services (@pxref{Base Services, @code{nscd-service}})." msgstr "Beachten Sie, dass hier aufgeführte Namensdienste für den nscd sichtbar sein müssen. Dazu übergeben Sie im Argument @code{#:name-services} des @code{nscd-service} die Liste der Pakete, die die entsprechenden Namensdienste anbieten (siehe @ref{Base Services, @code{nscd-service}})." #. type: item -#: doc/guix.texi:23845 +#: doc/guix.texi:23842 #, no-wrap msgid "reaction" msgstr "reaction" #. type: table -#: doc/guix.texi:23849 +#: doc/guix.texi:23846 msgid "An action specified using the @code{lookup-specification} macro (@pxref{Actions in the NSS configuration,,, libc, The GNU C Library Reference Manual}). For example:" msgstr "Eine mit Hilfe des Makros @code{lookup-specification} angegebene Aktion (siehe @ref{Actions in the NSS configuration,,, libc, The GNU C Library Reference Manual}). Zum Beispiel:" #. type: example -#: doc/guix.texi:23853 +#: doc/guix.texi:23850 #, no-wrap msgid "" "(lookup-specification (unavailable => continue)\n" @@ -43950,17 +44189,17 @@ msgstr "" " (success => return))\n" #. type: Plain text -#: doc/guix.texi:23867 +#: doc/guix.texi:23864 msgid "For bootstrapping purposes, the Linux-Libre kernel is passed an @dfn{initial RAM disk}, or @dfn{initrd}. An initrd contains a temporary root file system as well as an initialization script. The latter is responsible for mounting the real root file system, and for loading any kernel modules that may be needed to achieve that." msgstr "Um ihn zu initialisieren (zu „bootstrappen“), wird für den Kernel Linux-Libre eine @dfn{initiale RAM-Disk} angegeben (kurz @dfn{initrd}). Eine initrd enthält ein temporäres Wurzeldateisystem sowie ein Skript zur Initialisierung. Letzteres ist dafür zuständig, das echte Wurzeldateisystem einzubinden und alle Kernel-Module zu laden, die dafür nötig sein könnten." #. type: Plain text -#: doc/guix.texi:23876 +#: doc/guix.texi:23873 msgid "The @code{initrd-modules} field of an @code{operating-system} declaration allows you to specify Linux-libre kernel modules that must be available in the initrd. In particular, this is where you would list modules needed to actually drive the hard disk where your root partition is---although the default value of @code{initrd-modules} should cover most use cases. For example, assuming you need the @code{megaraid_sas} module in addition to the default modules to be able to access your root file system, you would write:" msgstr "Mit dem Feld @code{initrd-modules} einer @code{operating-system}-Deklaration können Sie angeben, welche Kernel-Module für Linux-libre in der initrd verfügbar sein müssen. Insbesondere müssen hier die Module aufgeführt werden, um die Festplatte zu betreiben, auf der sich Ihre Wurzelpartition befindet — allerdings sollte der vorgegebene Wert der @code{initrd-modules} in dem meisten Fällen genügen. Wenn Sie aber zum Beispiel das Kernel-Modul @code{megaraid_sas} zusätzlich zu den vorgegebenen Modulen brauchen, um auf Ihr Wurzeldateisystem zugreifen zu können, würden Sie das so schreiben:" #. type: example -#: doc/guix.texi:23881 +#: doc/guix.texi:23878 #, no-wrap msgid "" "(operating-system\n" @@ -43972,28 +44211,28 @@ msgstr "" " (initrd-modules (cons \"megaraid_sas\" %base-initrd-modules)))\n" #. type: defvr -#: doc/guix.texi:23883 +#: doc/guix.texi:23880 #, no-wrap msgid "{Scheme Variable} %base-initrd-modules" msgstr "{Scheme-Variable} %base-initrd-modules" #. type: defvr -#: doc/guix.texi:23885 +#: doc/guix.texi:23882 msgid "This is the list of kernel modules included in the initrd by default." msgstr "Der Vorgabewert für die Liste der Kernel-Module, die in der initrd enthalten sein sollen." #. type: Plain text -#: doc/guix.texi:23893 +#: doc/guix.texi:23890 msgid "Furthermore, if you need lower-level customization, the @code{initrd} field of an @code{operating-system} declaration allows you to specify which initrd you would like to use. The @code{(gnu system linux-initrd)} module provides three ways to build an initrd: the high-level @code{base-initrd} procedure and the low-level @code{raw-initrd} and @code{expression->initrd} procedures." msgstr "Wenn Sie noch systemnähere Anpassungen durchführen wollen, können Sie im Feld @code{initrd} einer @code{operating-system}-Deklaration angeben, was für eine Art von initrd Sie benutzen möchten. Das Modul @code{(gnu system linux-initrd)} enthält drei Arten, eine initrd zu erstellen: die abstrakte Prozedur @code{base-initrd} und die systemnahen Prozeduren @code{raw-initrd} und @code{expression->initrd}." #. type: Plain text -#: doc/guix.texi:23898 +#: doc/guix.texi:23895 msgid "The @code{base-initrd} procedure is intended to cover most common uses. For example, if you want to add a bunch of kernel modules to be loaded at boot time, you can define the @code{initrd} field of the operating system declaration like this:" msgstr "Mit der Prozedur @code{base-initrd} sollten Sie die häufigsten Anwendungszwecke abdecken können. Wenn Sie zum Beispiel ein paar Kernel-Module zur Boot-Zeit laden lassen möchten, können Sie das @code{initrd}-Feld auf diese Art definieren:" #. type: example -#: doc/guix.texi:23906 +#: doc/guix.texi:23903 #, no-wrap msgid "" "(initrd (lambda (file-systems . rest)\n" @@ -44012,369 +44251,369 @@ msgstr "" " rest)))\n" #. type: Plain text -#: doc/guix.texi:23911 +#: doc/guix.texi:23908 msgid "The @code{base-initrd} procedure also handles common use cases that involves using the system as a QEMU guest, or as a ``live'' system with volatile root file system." msgstr "Die Prozedur @code{base-initrd} kann auch mit üblichen Anwendungszwecken umgehen, um das System als QEMU-Gastsystem zu betreiben oder als ein „Live“-System ohne ein dauerhaft gespeichertes Wurzeldateisystem." #. type: Plain text -#: doc/guix.texi:23918 +#: doc/guix.texi:23915 msgid "The @code{base-initrd} procedure is built from @code{raw-initrd} procedure. Unlike @code{base-initrd}, @code{raw-initrd} doesn't do anything high-level, such as trying to guess which kernel modules and packages should be included to the initrd. An example use of @code{raw-initrd} is when a user has a custom Linux kernel configuration and default kernel modules included by @code{base-initrd} are not available." msgstr "Die Prozedur @code{base-initrd} baut auf der Prozedur @code{raw-initrd} auf. Anders als @code{base-initrd} hat @code{raw-initrd} keinerlei Zusatzfunktionalitäten: Es wird kein Versuch unternommen, für die initrd notwendige Kernel-Module und Pakete automatisch hinzuzunehmen. @code{raw-initrd} kann zum Beispiel benutzt werden, wenn ein Nutzer eine eigene Konfiguration des Linux-Kernels verwendet und die Standard-Kernel-Module, die mit @code{base-initrd} hinzugenommen würden, nicht verfügbar sind." #. type: Plain text -#: doc/guix.texi:23923 +#: doc/guix.texi:23920 msgid "The initial RAM disk produced by @code{base-initrd} or @code{raw-initrd} honors several options passed on the Linux kernel command line (that is, arguments passed @i{via} the @code{linux} command of GRUB, or the @code{-append} option of QEMU), notably:" msgstr "Die initiale RAM-Disk, wie sie von @code{base-initrd} oder @code{raw-initrd} erzeugt wird, richtet sich nach verschiedenen Optionen, die auf der Kernel-Befehlszeile übergeben werden (also über GRUBs @code{linux}-Befehl oder die @code{-append}-Befehlszeilenoption von QEMU). Erwähnt werden sollten:" #. type: item -#: doc/guix.texi:23925 +#: doc/guix.texi:23922 #, no-wrap msgid "--load=@var{boot}" msgstr "--load=@var{boot}" #. type: table -#: doc/guix.texi:23928 +#: doc/guix.texi:23925 msgid "Tell the initial RAM disk to load @var{boot}, a file containing a Scheme program, once it has mounted the root file system." msgstr "Die initiale RAM-Disk eine Datei @var{boot}, in der ein Scheme-Programm steht, laden lassen, nachdem das Wurzeldateisystem eingebunden wurde." #. type: table -#: doc/guix.texi:23932 +#: doc/guix.texi:23929 msgid "Guix uses this option to yield control to a boot program that runs the service activation programs and then spawns the GNU@tie{}Shepherd, the initialization system." msgstr "Guix übergibt mit dieser Befehlszeilenoption die Kontrolle an ein Boot-Programm, das die Dienstaktivierungsprogramme ausführt und anschließend den GNU@tie{}Shepherd startet, das Initialisierungssystem („init“-System) von Guix System." #. type: item -#: doc/guix.texi:23933 +#: doc/guix.texi:23930 #, no-wrap msgid "--root=@var{root}" msgstr "--root=@var{Wurzel}" #. type: table -#: doc/guix.texi:23937 +#: doc/guix.texi:23934 msgid "Mount @var{root} as the root file system. @var{root} can be a device name like @code{/dev/sda1}, a file system label, or a file system UUID." msgstr "Das mit @var{Wurzel} bezeichnete Dateisystem als Wurzeldateisystem einbinden. @var{Wurzel} kann ein Geratename wie @code{/dev/sda1}, eine Dateisystembezeichnung (d.h.@: ein Dateisystem-„Label“) oder eine Dateisystem-UUID sein." #. type: table -#: doc/guix.texi:23941 +#: doc/guix.texi:23938 msgid "Have @file{/run/booted-system} and @file{/run/current-system} point to @var{system}." msgstr "@file{/run/booted-system} und @file{/run/current-system} auf das @var{System} zeigen lassen." #. type: item -#: doc/guix.texi:23942 +#: doc/guix.texi:23939 #, no-wrap msgid "modprobe.blacklist=@var{modules}@dots{}" msgstr "modprobe.blacklist=@var{Module}…" #. type: cindex -#: doc/guix.texi:23943 +#: doc/guix.texi:23940 #, no-wrap msgid "module, black-listing" msgstr "Kernel-Module, Sperrliste" #. type: cindex -#: doc/guix.texi:23944 +#: doc/guix.texi:23941 #, no-wrap msgid "black list, of kernel modules" msgstr "Sperrliste, von Kernel-Modulen" #. type: table -#: doc/guix.texi:23949 +#: doc/guix.texi:23946 msgid "Instruct the initial RAM disk as well as the @command{modprobe} command (from the kmod package) to refuse to load @var{modules}. @var{modules} must be a comma-separated list of module names---e.g., @code{usbkbd,9pnet}." msgstr "Die initiale RAM-Disk sowie den Befehl @command{modprobe} (aus dem kmod-Paket) anweisen, das Laden der angegebenen @var{Module} zu verweigern. Als @var{Module} muss eine kommagetrennte Liste von Kernel-Modul-Namen angegeben werden — z.B.@: @code{usbkbd,9pnet}." #. type: item -#: doc/guix.texi:23950 +#: doc/guix.texi:23947 #, no-wrap msgid "--repl" msgstr "--repl" #. type: table -#: doc/guix.texi:23956 +#: doc/guix.texi:23953 msgid "Start a read-eval-print loop (REPL) from the initial RAM disk before it tries to load kernel modules and to mount the root file system. Our marketing team calls it @dfn{boot-to-Guile}. The Schemer in you will love it. @xref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}, for more information on Guile's REPL." msgstr "Eine Lese-Auswerten-Schreiben-Schleife (englisch „Read-Eval-Print Loop“, kurz REPL) von der initialen RAM-Disk starten, bevor diese die Kernel-Module zu laden versucht und das Wurzeldateisystem einbindet. Unsere Marketingabteilung nennt das @dfn{boot-to-Guile}. Der Schemer in Ihnen wird das lieben. Siehe @ref{Using Guile Interactively,,, guile, GNU Guile Reference Manual} für mehr Informationen über die REPL von Guile." #. type: Plain text -#: doc/guix.texi:23962 +#: doc/guix.texi:23959 msgid "Now that you know all the features that initial RAM disks produced by @code{base-initrd} and @code{raw-initrd} provide, here is how to use it and customize it further." msgstr "Jetzt wo Sie wissen, was für Funktionalitäten eine durch @code{base-initrd} und @code{raw-initrd} erzeugte initiale RAM-Disk so haben kann, möchten Sie vielleicht auch wissen, wie man Sie benutzt und weiter anpasst:" #. type: deffn -#: doc/guix.texi:23965 +#: doc/guix.texi:23962 #, no-wrap msgid "{Scheme Procedure} raw-initrd @var{file-systems} @" msgstr "{Scheme-Prozedur} raw-initrd @var{Dateisysteme} @" #. type: deffn -#: doc/guix.texi:23978 +#: doc/guix.texi:23975 msgid "[#:linux-modules '()] [#:mapped-devices '()] @ [#:keyboard-layout #f] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a derivation that builds a raw initrd. @var{file-systems} is a list of file systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}. @var{linux-modules} is a list of kernel modules to be loaded at boot time. @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted (@pxref{Mapped Devices}). @var{helper-packages} is a list of packages to be copied in the initrd. It may include @code{e2fsck/static} or other packages needed by the initrd to check the root file system." msgstr "[#:linux-modules '()] [#:mapped-devices '()] @ [#:keyboard-layout #f] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Liefert eine Ableitung, die eine rohe („raw“) initrd erstellt. @var{Dateisysteme} bezeichnet eine Liste von durch die initrd einzubindenden Dateisystemen, unter Umständen zusätzlich zum auf der Kernel-Befehlszeile mit @code{--root} angegebenen Wurzeldateisystem. @var{linux-modules} ist eine Liste von Kernel-Modulen, die zur Boot-Zeit geladen werden sollen. @var{mapped-devices} ist eine Liste von Gerätezuordnungen, die hergestellt sein müssen, bevor die unter @var{file-systems} aufgeführten Dateisysteme eingebunden werden (siehe @ref{Mapped Devices}). @var{helper-packages} ist eine Liste von Paketen, die in die initrd kopiert werden. Darunter kann @code{e2fsck/static} oder andere Pakete aufgeführt werden, mit denen durch die initrd das Wurzeldateisystem auf Fehler hin geprüft werden kann." #. type: deffn -#: doc/guix.texi:23984 doc/guix.texi:24008 +#: doc/guix.texi:23981 doc/guix.texi:24005 msgid "When true, @var{keyboard-layout} is a @code{} record denoting the desired console keyboard layout. This is done before @var{mapped-devices} are set up and before @var{file-systems} are mounted such that, should the user need to enter a passphrase or use the REPL, this happens using the intended keyboard layout." msgstr "Ist es auf einen wahren Wert gesetzt, dann muss @var{keyboard-layout} eine Tastaturbelegung als @code{}-Verbundsobjekt angeben, die die gewünschte Tastaturbelegung für die Konsole bezeichnet. Sie wird verwendet, noch bevor die Gerätezuordnungen in @var{mapped-devices} hergestellt werden und bevor die Dateisysteme in @var{file-systems} eingebunden werden, damit der Anwender dabei die gewollte Tastaturbelegung beim Eingeben einer Passphrase und bei der Nutzung einer REPL verwenden kann." #. type: deffn -#: doc/guix.texi:23988 +#: doc/guix.texi:23985 msgid "When @var{qemu-networking?} is true, set up networking with the standard QEMU parameters. When @var{virtio?} is true, load additional modules so that the initrd can be used as a QEMU guest with para-virtualized I/O drivers." msgstr "Wenn @var{qemu-networking?} wahr ist, wird eine Netzwerkverbindung mit den Standard-QEMU-Parametern hergestellt. Wenn @var{virtio?} wahr ist, werden zusätzliche Kernel-Module geladen, damit die initrd als ein QEMU-Gast paravirtualisierte Ein-/Ausgabetreiber benutzen kann." #. type: deffn -#: doc/guix.texi:23991 +#: doc/guix.texi:23988 msgid "When @var{volatile-root?} is true, the root file system is writable but any changes to it are lost." msgstr "Wenn @var{volatile-root?} wahr ist, ist Schreiben auf das Wurzeldateisystem möglich, aber Änderungen daran bleiben nicht erhalten." #. type: deffn -#: doc/guix.texi:23993 +#: doc/guix.texi:23990 #, no-wrap msgid "{Scheme Procedure} base-initrd @var{file-systems} @" msgstr "{Scheme-Prozedur} base-initrd @var{Dateisysteme} @" #. type: deffn -#: doc/guix.texi:24002 +#: doc/guix.texi:23999 msgid "[#:mapped-devices '()] [#:keyboard-layout #f] @ [#:qemu-networking? #f] [#:volatile-root? #f] @ [#:linux-modules '()] Return as a file-like object a generic initrd, with kernel modules taken from @var{linux}. @var{file-systems} is a list of file-systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}. @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted." msgstr "[#:mapped-devices '()] [#:keyboard-layout #f] @ [#:qemu-networking? #f] [#:volatile-root? #f] @ [#:linux-modules '()] Liefert eine allgemein anwendbare, generische initrd als dateiartiges Objekt mit den Kernel-Modulen aus @var{linux}. Die @var{file-systems} sind eine Liste von durch die initrd einzubindenden Dateisystemen, unter Umständen zusätzlich zum Wurzeldateisystem, das auf der Kernel-Befehlszeile mit @code{--root} angegeben wurde. Die @var{mapped-devices} sind eine Liste von Gerätezuordnungen, die hergestellt sein müssen, bevor die @var{file-systems} eingebunden werden." #. type: deffn -#: doc/guix.texi:24010 +#: doc/guix.texi:24007 msgid "@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-initrd}." msgstr "@var{qemu-networking?} und @var{volatile-root?} verhalten sich wie bei @code{raw-initrd}." #. type: deffn -#: doc/guix.texi:24015 +#: doc/guix.texi:24012 msgid "The initrd is automatically populated with all the kernel modules necessary for @var{file-systems} and for the given options. Additional kernel modules can be listed in @var{linux-modules}. They will be added to the initrd, and loaded at boot time in the order in which they appear." msgstr "In die initrd werden automatisch alle Kernel-Module eingefügt, die für die unter @var{file-systems} angegebenen Dateisysteme und die angegebenen Optionen nötig sind. Zusätzliche Kernel-Module können unter den @var{linux-modules} aufgeführt werden. Diese werden zur initrd hinzugefügt und zur Boot-Zeit in der Reihenfolge geladen, in der sie angegeben wurden." #. type: Plain text -#: doc/guix.texi:24022 +#: doc/guix.texi:24019 msgid "Needless to say, the initrds we produce and use embed a statically-linked Guile, and the initialization program is a Guile program. That gives a lot of flexibility. The @code{expression->initrd} procedure builds such an initrd, given the program to run in that initrd." msgstr "Selbstverständlich betten die hier erzeugten und benutzten initrds ein statisch gebundenes Guile ein und das Initialisierungsprogramm ist ein Guile-Programm. Dadurch haben wir viel Flexibilität. Die Prozedur @code{expression->initrd} erstellt eine solche initrd für ein an sie übergebenes Programm." #. type: deffn -#: doc/guix.texi:24023 +#: doc/guix.texi:24020 #, no-wrap msgid "{Scheme Procedure} expression->initrd @var{exp} @" msgstr "{Scheme-Prozedur} expression->initrd @var{G-Ausdruck} @" #. type: deffn -#: doc/guix.texi:24029 +#: doc/guix.texi:24026 msgid "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return as a file-like object a Linux initrd (a gzipped cpio archive) containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting. All the derivations referenced by @var{exp} are automatically copied to the initrd." msgstr "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Liefert eine Linux-initrd (d.h.@: ein gzip-komprimiertes cpio-Archiv) als dateiartiges Objekt, in dem @var{guile} enthalten ist, womit der @var{G-Ausdruck} nach dem Booten ausgewertet wird. Alle vom @var{G-Ausdruck} referenzierten Ableitungen werden automatisch in die initrd kopiert." #. type: cindex -#: doc/guix.texi:24035 +#: doc/guix.texi:24032 #, no-wrap msgid "boot loader" msgstr "Bootloader" #. type: Plain text -#: doc/guix.texi:24042 +#: doc/guix.texi:24039 msgid "The operating system supports multiple bootloaders. The bootloader is configured using @code{bootloader-configuration} declaration. All the fields of this structure are bootloader agnostic except for one field, @code{bootloader} that indicates the bootloader to be configured and installed." msgstr "Das Betriebssystem unterstützt mehrere Bootloader. Der gewünschte Bootloader wird mit der @code{bootloader-configuration}-Deklaration konfiguriert. Alle Felder dieser Struktur sind für alle Bootloader gleich außer dem einen Feld @code{bootloader}, das angibt, welcher Bootloader konfiguriert und installiert werden soll." #. type: Plain text -#: doc/guix.texi:24047 +#: doc/guix.texi:24044 msgid "Some of the bootloaders do not honor every field of @code{bootloader-configuration}. For instance, the extlinux bootloader does not support themes and thus ignores the @code{theme} field." msgstr "Manche der Bootloader setzen nicht alle Felder einer @code{bootloader-configuration} um. Zum Beispiel ignoriert der extlinux-Bootloader das @code{theme}-Feld, weil er keine eigenen Themen unterstützt." #. type: deftp -#: doc/guix.texi:24048 +#: doc/guix.texi:24045 #, no-wrap msgid "{Data Type} bootloader-configuration" msgstr "{Datentyp} bootloader-configuration" #. type: deftp -#: doc/guix.texi:24050 +#: doc/guix.texi:24047 msgid "The type of a bootloader configuration declaration." msgstr "Der Typ der Deklaration einer Bootloader-Konfiguration." #. type: cindex -#: doc/guix.texi:24054 +#: doc/guix.texi:24051 #, no-wrap msgid "EFI, bootloader" msgstr "EFI, Bootloader" #. type: cindex -#: doc/guix.texi:24055 +#: doc/guix.texi:24052 #, no-wrap msgid "UEFI, bootloader" msgstr "UEFI, Bootloader" #. type: cindex -#: doc/guix.texi:24056 +#: doc/guix.texi:24053 #, no-wrap msgid "BIOS, bootloader" msgstr "BIOS, Bootloader" #. type: table -#: doc/guix.texi:24060 +#: doc/guix.texi:24057 msgid "The bootloader to use, as a @code{bootloader} object. For now @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} and @code{u-boot-bootloader} are supported." msgstr "Der zu benutzende Bootloader als ein @code{bootloader}-Objekt. Zur Zeit werden @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} und @code{u-boot-bootloader} unterstützt." #. type: table -#: doc/guix.texi:24066 +#: doc/guix.texi:24063 msgid "@code{grub-efi-bootloader} allows to boot on modern systems using the @dfn{Unified Extensible Firmware Interface} (UEFI). This is what you should use if the installation image contains a @file{/sys/firmware/efi} directory when you boot it on your system." msgstr "@code{grub-efi-bootloader} macht es möglich, auf modernen Systemen mit @dfn{Unified Extensible Firmware Interface} (UEFI) zu booten. Sie sollten das hier benutzen, wenn im Installationsabbild ein Verzeichnis @file{/sys/firmware/efi} vorhanden ist, wenn Sie davon auf Ihrem System booten." #. type: table -#: doc/guix.texi:24070 +#: doc/guix.texi:24067 msgid "@code{grub-bootloader} allows you to boot in particular Intel-based machines in ``legacy'' BIOS mode." msgstr "Mit @code{grub-bootloader} können Sie vor allem auf Intel-basierten Maschinen im alten „Legacy“-BIOS-Modus booten." #. type: cindex -#: doc/guix.texi:24071 +#: doc/guix.texi:24068 #, no-wrap msgid "ARM, bootloaders" msgstr "ARM, Bootloader" #. type: cindex -#: doc/guix.texi:24072 +#: doc/guix.texi:24069 #, no-wrap msgid "AArch64, bootloaders" msgstr "AArch64, Bootloader" #. type: table -#: doc/guix.texi:24077 +#: doc/guix.texi:24074 msgid "Available bootloaders are described in @code{(gnu bootloader @dots{})} modules. In particular, @code{(gnu bootloader u-boot)} contains definitions of bootloaders for a wide range of ARM and AArch64 systems, using the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot bootloader}." msgstr "Verfügbare Bootloader werden in den Modulen @code{(gnu bootloader …)} beschrieben. Insbesondere enthält @code{(gnu bootloader u-boot)} Definitionen für eine Vielzahl von ARM- und AArch64-Systemen, die den @uref{https://www.denx.de/wiki/U-Boot/, U-Boot-Bootloader} benutzen." #. type: table -#: doc/guix.texi:24081 +#: doc/guix.texi:24078 msgid "This is a string denoting the target onto which to install the bootloader." msgstr "Eine Zeichenkette, die angibt, auf welches Ziel der Bootloader installiert werden soll." #. type: table -#: doc/guix.texi:24088 +#: doc/guix.texi:24085 msgid "The interpretation depends on the bootloader in question. For @code{grub-bootloader}, for example, it should be a device name understood by the bootloader @command{installer} command, such as @code{/dev/sda} or @code{(hd0)} (@pxref{Invoking grub-install,,, grub, GNU GRUB Manual}). For @code{grub-efi-bootloader}, it should be the mount point of the EFI file system, usually @file{/boot/efi}." msgstr "Was das bedeutet, hängt vom jeweiligen Bootloader ab. Für @code{grub-bootloader} sollte hier zum Beispiel ein Gerätename angegeben werden, der vom @command{installer}-Befehl des Bootloaders verstanden wird, etwa @code{/dev/sda} oder @code{(hd0)} (siehe @ref{Invoking grub-install,,, grub, GNU GRUB Manual}). Für @code{grub-efi-bootloader} sollte der Einhängepunkt des EFI-Dateisystems angegeben werden, in der Regel @file{/boot/efi}." #. type: item -#: doc/guix.texi:24089 +#: doc/guix.texi:24086 #, no-wrap msgid "@code{menu-entries} (default: @code{()})" msgstr "@code{menu-entries} (Vorgabe: @code{()})" #. type: table -#: doc/guix.texi:24093 +#: doc/guix.texi:24090 msgid "A possibly empty list of @code{menu-entry} objects (see below), denoting entries to appear in the bootloader menu, in addition to the current system entry and the entry pointing to previous system generations." msgstr "Eine möglicherweise leere Liste von @code{menu-entry}-Objekten (siehe unten), die für Menüeinträge stehen, die im Bootloader-Menü auftauchen sollen, zusätzlich zum aktuellen Systemeintrag und dem auf vorherige Systemgenerationen verweisenden Eintrag." #. type: item -#: doc/guix.texi:24094 +#: doc/guix.texi:24091 #, no-wrap msgid "@code{default-entry} (default: @code{0})" msgstr "@code{default-entry} (Vorgabe: @code{0})" #. type: table -#: doc/guix.texi:24097 +#: doc/guix.texi:24094 msgid "The index of the default boot menu entry. Index 0 is for the entry of the current system." msgstr "Die Position des standardmäßig ausgewählten Bootmenü-Eintrags. An Position 0 steht der Eintrag der aktuellen Systemgeneration." #. type: item -#: doc/guix.texi:24098 +#: doc/guix.texi:24095 #, no-wrap msgid "@code{timeout} (default: @code{5})" msgstr "@code{timeout} (Vorgabe: @code{5})" #. type: table -#: doc/guix.texi:24101 +#: doc/guix.texi:24098 msgid "The number of seconds to wait for keyboard input before booting. Set to 0 to boot immediately, and to -1 to wait indefinitely." msgstr "Wieviele Sekunden lang im Menü auf eine Tastatureingabe gewartet wird, bevor gebootet wird. 0 steht für sofortiges Booten, für -1 wird ohne Zeitbeschränkung gewartet." #. type: cindex -#: doc/guix.texi:24102 +#: doc/guix.texi:24099 #, no-wrap msgid "keyboard layout, for the bootloader" msgstr "Tastaturbelegung, beim Bootloader" #. type: table -#: doc/guix.texi:24106 +#: doc/guix.texi:24103 msgid "If this is @code{#f}, the bootloader's menu (if any) uses the default keyboard layout, usually US@tie{}English (``qwerty'')." msgstr "Wenn dies auf @code{#f} gesetzt ist, verwendet das Menü des Bootloaders (falls vorhanden) die Vorgabe-Tastaturbelegung, normalerweise US@tie{}English („qwerty“)." #. type: table -#: doc/guix.texi:24109 +#: doc/guix.texi:24106 msgid "Otherwise, this must be a @code{keyboard-layout} object (@pxref{Keyboard Layout})." msgstr "Andernfalls muss es ein @code{keyboard-layout}-Objekt sein (siehe @ref{Keyboard Layout})." #. type: quotation -#: doc/guix.texi:24113 +#: doc/guix.texi:24110 msgid "This option is currently ignored by bootloaders other than @code{grub} and @code{grub-efi}." msgstr "Dieses Feld wird derzeit von Bootloadern außer @code{grub} und @code{grub-efi} ignoriert." #. type: item -#: doc/guix.texi:24115 +#: doc/guix.texi:24112 #, no-wrap msgid "@code{theme} (default: @var{#f})" msgstr "@code{theme} (Vorgabe: @var{#f})" #. type: table -#: doc/guix.texi:24119 +#: doc/guix.texi:24116 msgid "The bootloader theme object describing the theme to use. If no theme is provided, some bootloaders might use a default theme, that's true for GRUB." msgstr "Ein Objekt für das im Bootloader anzuzeigende Thema. Wird kein Thema angegeben, benutzen manche Bootloader vielleicht ein voreingestelltes Thema; GRUB zumindest macht es so." #. type: item -#: doc/guix.texi:24120 +#: doc/guix.texi:24117 #, no-wrap msgid "@code{terminal-outputs} (default: @code{'gfxterm})" msgstr "@code{terminal-outputs} (Vorgabe: @code{'gfxterm})" #. type: table -#: doc/guix.texi:24127 +#: doc/guix.texi:24124 msgid "The output terminals used for the bootloader boot menu, as a list of symbols. GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, @code{morse}, and @code{pkmodem}. This field corresponds to the GRUB variable @code{GRUB_TERMINAL_OUTPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})." msgstr "Die Ausgabeterminals, die für das Boot-Menü des Bootloaders benutzt werden, als eine Liste von Symbolen. GRUB akzeptiert hier diese Werte: @code{console}, @code{serial}, @code{serial_@{0–3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, @code{morse} und @code{pkmodem}. Dieses Feld entspricht der GRUB-Variablen @code{GRUB_TERMINAL_OUTPUT} (siehe @ref{Simple configuration,,, grub,GNU GRUB manual})." #. type: item -#: doc/guix.texi:24128 +#: doc/guix.texi:24125 #, no-wrap msgid "@code{terminal-inputs} (default: @code{'()})" msgstr "@code{terminal-inputs} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:24136 +#: doc/guix.texi:24133 msgid "The input terminals used for the bootloader boot menu, as a list of symbols. For GRUB, the default is the native platform terminal as determined at run-time. GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard}, and @code{usb_keyboard}. This field corresponds to the GRUB variable @code{GRUB_TERMINAL_INPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})." msgstr "Die Eingabeterminals, die für das Boot-Menü des Bootloaders benutzt werden, als eine Liste von Symbolen. GRUB verwendet hier das zur Laufzeit bestimmte Standardterminal. GRUB akzeptiert sonst diese Werte: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard} und @code{usb_keyboard}. Dieses Feld entspricht der GRUB-Variablen @code{GRUB_TERMINAL_INPUT} (siehe @ref{Simple configuration,,, grub,GNU GRUB manual})." #. type: item -#: doc/guix.texi:24137 +#: doc/guix.texi:24134 #, no-wrap msgid "@code{serial-unit} (default: @code{#f})" msgstr "@code{serial-unit} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:24141 +#: doc/guix.texi:24138 msgid "The serial unit used by the bootloader, as an integer from 0 to 3. For GRUB, it is chosen at run-time; currently GRUB chooses 0, which corresponds to COM1 (@pxref{Serial terminal,,, grub,GNU GRUB manual})." msgstr "Die serielle Einheit, die der Bootloader benutzt, als eine ganze Zahl zwischen 0 und 3, einschließlich. Für GRUB wird sie automatisch zur Laufzeit ausgewählt; derzeit wählt GRUB die 0 aus, die COM1 entspricht (siehe @ref{Serial terminal,,, grub,GNU GRUB manual})." #. type: item -#: doc/guix.texi:24142 +#: doc/guix.texi:24139 #, no-wrap msgid "@code{serial-speed} (default: @code{#f})" msgstr "@code{serial-speed} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:24146 +#: doc/guix.texi:24143 msgid "The speed of the serial interface, as an integer. For GRUB, the default value is chosen at run-time; currently GRUB chooses 9600@tie{}bps (@pxref{Serial terminal,,, grub,GNU GRUB manual})." msgstr "Die Geschwindigkeit der seriellen Schnittstelle als eine ganze Zahl. GRUB bestimmt den Wert standardmäßig zur Laufzeit; derzeit wählt GRUB 9600@tie{}bps (siehe @ref{Serial terminal,,, grub,GNU GRUB manual})." #. type: cindex -#: doc/guix.texi:24150 +#: doc/guix.texi:24147 #, no-wrap msgid "dual boot" msgstr "Dual-Boot" #. type: cindex -#: doc/guix.texi:24151 +#: doc/guix.texi:24148 #, no-wrap msgid "boot menu" msgstr "Bootmenü" #. type: Plain text -#: doc/guix.texi:24157 +#: doc/guix.texi:24154 msgid "Should you want to list additional boot menu entries @i{via} the @code{menu-entries} field above, you will need to create them with the @code{menu-entry} form. For example, imagine you want to be able to boot another distro (hard to imagine!), you can define a menu entry along these lines:" msgstr "Sollten Sie zusätzliche Bootmenü-Einträge über das oben beschriebene @code{menu-entries}-Feld hinzufügen möchten, müssen Sie diese mit der @code{menu-entry}-Form erzeugen. Stellen Sie sich zum Beispiel vor, Sie wollten noch eine andere Distribution booten können (schwer vorstellbar!), dann könnten Sie einen Menüeintrag wie den Folgenden definieren:" #. type: example -#: doc/guix.texi:24164 +#: doc/guix.texi:24161 #, no-wrap msgid "" "(menu-entry\n" @@ -44390,141 +44629,141 @@ msgstr "" " (initrd \"/boot/old/initrd\"))\n" #. type: Plain text -#: doc/guix.texi:24167 +#: doc/guix.texi:24164 msgid "Details below." msgstr "Details finden Sie unten." #. type: deftp -#: doc/guix.texi:24168 +#: doc/guix.texi:24165 #, no-wrap msgid "{Data Type} menu-entry" msgstr "{Datentyp} menu-entry" #. type: deftp -#: doc/guix.texi:24170 +#: doc/guix.texi:24167 msgid "The type of an entry in the bootloader menu." msgstr "Der Typ eines Eintrags im Bootloadermenü." #. type: table -#: doc/guix.texi:24175 +#: doc/guix.texi:24172 msgid "The label to show in the menu---e.g., @code{\"GNU\"}." msgstr "Die Beschriftung, die im Menü gezeigt werden soll — z.B.@: @code{\"GNU\"}." #. type: code{#1} -#: doc/guix.texi:24176 +#: doc/guix.texi:24173 #, no-wrap msgid "linux" msgstr "linux" #. type: table -#: doc/guix.texi:24178 +#: doc/guix.texi:24175 msgid "The Linux kernel image to boot, for example:" msgstr "Das Linux-Kernel-Abbild, was gebootet werden soll, zum Beispiel:" #. type: example -#: doc/guix.texi:24181 +#: doc/guix.texi:24178 #, no-wrap msgid "(file-append linux-libre \"/bzImage\")\n" msgstr "(file-append linux-libre \"/bzImage\")\n" #. type: table -#: doc/guix.texi:24186 +#: doc/guix.texi:24183 msgid "For GRUB, it is also possible to specify a device explicitly in the file path using GRUB's device naming convention (@pxref{Naming convention,,, grub, GNU GRUB manual}), for example:" msgstr "Für GRUB kann hier auch ein Gerät ausdrücklich zum Dateipfad angegeben werden, unter Verwendung von GRUBs Konventionen zur Gerätebenennung (siehe @ref{Naming convention,,, grub, GNU GRUB manual}), zum Beispiel:" #. type: example -#: doc/guix.texi:24189 +#: doc/guix.texi:24186 #, no-wrap msgid "\"(hd0,msdos1)/boot/vmlinuz\"\n" msgstr "\"(hd0,msdos1)/boot/vmlinuz\"\n" #. type: table -#: doc/guix.texi:24193 +#: doc/guix.texi:24190 msgid "If the device is specified explicitly as above, then the @code{device} field is ignored entirely." msgstr "Wenn das Gerät auf diese Weise ausdrücklich angegeben wird, wird das @code{device}-Feld gänzlich ignoriert." #. type: item -#: doc/guix.texi:24194 +#: doc/guix.texi:24191 #, no-wrap msgid "@code{linux-arguments} (default: @code{()})" msgstr "@code{linux-arguments} (Vorgabe: @code{()})" #. type: table -#: doc/guix.texi:24197 +#: doc/guix.texi:24194 msgid "The list of extra Linux kernel command-line arguments---e.g., @code{(\"console=ttyS0\")}." msgstr "Die Liste zusätzlicher Linux-Kernel-Befehlszeilenargumente — z.B.@: @code{(\"console=ttyS0\")}." #. type: table -#: doc/guix.texi:24201 +#: doc/guix.texi:24198 msgid "A G-Expression or string denoting the file name of the initial RAM disk to use (@pxref{G-Expressions})." msgstr "Ein G-Ausdruck oder eine Zeichenkette, die den Dateinamen der initialen RAM-Disk angibt, die benutzt werden soll (siehe @ref{G-Expressions})." #. type: item -#: doc/guix.texi:24201 +#: doc/guix.texi:24198 #, no-wrap msgid "@code{device} (default: @code{#f})" msgstr "@code{device} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:24204 +#: doc/guix.texi:24201 msgid "The device where the kernel and initrd are to be found---i.e., for GRUB, @dfn{root} for this menu entry (@pxref{root,,, grub, GNU GRUB manual})." msgstr "Das Gerät, auf dem Kernel und initrd zu finden sind — d.h.@: bei GRUB die Wurzel (@dfn{root}) dieses Menüeintrags (siehe @ref{root,,, grub, GNU GRUB manual})." #. type: table -#: doc/guix.texi:24210 +#: doc/guix.texi:24207 msgid "This may be a file system label (a string), a file system UUID (a bytevector, @pxref{File Systems}), or @code{#f}, in which case the bootloader will search the device containing the file specified by the @code{linux} field (@pxref{search,,, grub, GNU GRUB manual}). It must @emph{not} be an OS device name such as @file{/dev/sda1}." msgstr "Dies kann eine Dateisystembezeichnung (als Zeichenkette), eine Dateisystem-UUID (als Bytevektor, siehe @ref{File Systems}) oder @code{#f} sein, im letzten Fall wird der Bootloader auf dem Gerät suchen, das die vom @code{linux}-Feld benannte Datei enthält (siehe @ref{search,,, grub, GNU GRUB manual}). Ein vom Betriebssystem vergebener Gerätename wie @file{/dev/sda1} ist aber @emph{nicht} erlaubt." #. type: Plain text -#: doc/guix.texi:24217 +#: doc/guix.texi:24214 msgid "For now only GRUB has theme support. GRUB themes are created using the @code{grub-theme} form, which is not documented yet." msgstr "Zur Zeit lässt nur GRUB sein Aussehen durch Themen anpassen. GRUB-Themen werden mit der @code{grub-theme}-Form erzeugt, die hier noch nicht dokumentiert ist." #. type: defvr -#: doc/guix.texi:24222 +#: doc/guix.texi:24219 msgid "This is the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} record." msgstr "Das vorgegebene GRUB-Thema, das vom Betriebssystem benutzt wird, wenn kein @code{theme}-Feld im @code{bootloader-configuration}-Verbundsobjekt angegeben wurde." #. type: defvr -#: doc/guix.texi:24225 +#: doc/guix.texi:24222 msgid "It comes with a fancy background image displaying the GNU and Guix logos." msgstr "Es wird von einem feschen Hintergrundbild begleitet, das die Logos von GNU und Guix zeigt." #. type: section -#: doc/guix.texi:24229 +#: doc/guix.texi:24226 #, no-wrap msgid "Invoking @code{guix system}" msgstr "@code{guix system} aufrufen" #. type: Plain text -#: doc/guix.texi:24234 +#: doc/guix.texi:24231 msgid "Once you have written an operating system declaration as seen in the previous section, it can be @dfn{instantiated} using the @command{guix system} command. The synopsis is:" msgstr "Sobald Sie eine Betriebssystemdeklaration geschrieben haben, wie wir sie in den vorangehenden Abschnitten gesehen haben, kann diese @dfn{instanziiert} werden, indem Sie den Befehl @command{guix system} aufrufen. Zusammengefasst:" #. type: example -#: doc/guix.texi:24237 +#: doc/guix.texi:24234 #, no-wrap msgid "guix system @var{options}@dots{} @var{action} @var{file}\n" msgstr "guix system @var{Optionen}…@: @var{Aktion} @var{Datei}\n" #. type: Plain text -#: doc/guix.texi:24243 +#: doc/guix.texi:24240 msgid "@var{file} must be the name of a file containing an @code{operating-system} declaration. @var{action} specifies how the operating system is instantiated. Currently the following values are supported:" msgstr "@var{Datei} muss der Name einer Datei sein, in der eine Betriebssystemdeklaration als @code{operating-system}-Objekt steht. @var{Aktion} gibt an, wie das Betriebssystem instanziiert wird. Derzeit werden folgende Werte dafür unterstützt:" #. type: item -#: doc/guix.texi:24245 +#: doc/guix.texi:24242 #, no-wrap msgid "search" msgstr "search" #. type: table -#: doc/guix.texi:24248 +#: doc/guix.texi:24245 msgid "Display available service type definitions that match the given regular expressions, sorted by relevance:" msgstr "Verfügbare Diensttypendefinitionen anzeigen, die zum angegebenen regulären Ausdruck passen, sortiert nach Relevanz:" #. type: example -#: doc/guix.texi:24260 +#: doc/guix.texi:24257 #, no-wrap msgid "" "$ guix system search console font\n" @@ -44552,7 +44791,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24266 +#: doc/guix.texi:24263 #, no-wrap msgid "" "name: mingetty\n" @@ -44570,7 +44809,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24273 +#: doc/guix.texi:24270 #, no-wrap msgid "" "name: login\n" @@ -44590,254 +44829,254 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24275 +#: doc/guix.texi:24272 #, no-wrap msgid "@dots{}\n" msgstr "…\n" #. type: table -#: doc/guix.texi:24280 +#: doc/guix.texi:24277 msgid "As for @command{guix package --search}, the result is written in @code{recutils} format, which makes it easy to filter the output (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." msgstr "Wie auch bei @command{guix package --search} wird das Ergebnis im @code{recutils}-Format geliefert, so dass es leicht ist, die Ausgabe zu filtern (siehe @ref{Top, GNU recutils databases,, recutils, GNU recutils manual})." #. type: item -#: doc/guix.texi:24281 +#: doc/guix.texi:24278 #, no-wrap msgid "reconfigure" msgstr "reconfigure" #. type: table -#: doc/guix.texi:24286 +#: doc/guix.texi:24283 msgid "Build the operating system described in @var{file}, activate it, and switch to it@footnote{This action (and the related actions @code{switch-generation} and @code{roll-back}) are usable only on systems already running Guix System.}." msgstr "Das in der @var{Datei} beschriebene Betriebssystem erstellen, aktivieren und zu ihm wechseln@footnote{Diese Aktion (und die dazu ähnlichen Aktionen @code{switch-generation} und @code{roll-back}) sind nur auf Systemen nutzbar, auf denen „Guix System“ bereits läuft.}." #. type: table -#: doc/guix.texi:24293 +#: doc/guix.texi:24290 msgid "This effects all the configuration specified in @var{file}: user accounts, system services, global package list, setuid programs, etc. The command starts system services specified in @var{file} that are not currently running; if a service is currently running this command will arrange for it to be upgraded the next time it is stopped (e.g.@: by @code{herd stop X} or @code{herd restart X})." msgstr "Dieser Befehl setzt die in der @var{Datei} festgelegte Konfiguration vollständig um: Benutzerkonten, Systemdienste, die Liste globaler Pakete, setuid-Programme und so weiter. Der Befehl startet die in der @var{Datei} angegebenen Systemdienste, die aktuell nicht laufen; bei aktuell laufenden Diensten wird sichergestellt, dass sie aktualisiert werden, sobald sie das nächste Mal angehalten wurden (z.B.@: durch @code{herd stop X} oder @code{herd restart X})." #. type: table -#: doc/guix.texi:24299 +#: doc/guix.texi:24296 msgid "This command creates a new generation whose number is one greater than the current generation (as reported by @command{guix system list-generations}). If that generation already exists, it will be overwritten. This behavior mirrors that of @command{guix package} (@pxref{Invoking guix package})." msgstr "Dieser Befehl erzeugt eine neue Generation, deren Nummer (wie @command{guix system list-generations} sie anzeigt) um eins größer als die der aktuellen Generation ist. Wenn die so nummerierte Generation bereits existiert, wird sie überschrieben. Dieses Verhalten entspricht dem von @command{guix package} (siehe @ref{Invoking guix package})." #. type: table -#: doc/guix.texi:24304 +#: doc/guix.texi:24301 msgid "It also adds a bootloader menu entry for the new OS configuration, ---unless @option{--no-bootloader} is passed. For GRUB, it moves entries for older configurations to a submenu, allowing you to choose an older system generation at boot time should you need it." msgstr "Des Weiteren wird für den Bootloader ein Menüeintrag für die neue Betriebssystemkonfiguration hinzugefügt, außer die Befehlszeilenoption @option{--no-bootloader} wurde übergeben. Bei GRUB werden Einträge für ältere Konfigurationen in ein Untermenü verschoben, so dass Sie auch eine ältere Systemgeneration beim Booten noch hochfahren können, falls es notwendig wird." #. type: quotation -#: doc/guix.texi:24312 +#: doc/guix.texi:24309 msgid "It is highly recommended to run @command{guix pull} once before you run @command{guix system reconfigure} for the first time (@pxref{Invoking guix pull}). Failing to do that you would see an older version of Guix once @command{reconfigure} has completed." msgstr "Es ist sehr zu empfehlen, @command{guix pull} einmal auszuführen, bevor Sie @command{guix system reconfigure} zum ersten Mal aufrufen (siehe @ref{Invoking guix pull}). Wenn Sie das nicht tun, könnten Sie nach dem Abschluss von @command{reconfigure} eine ältere Version von Guix vorfinden, als Sie vorher hatten." #. type: item -#: doc/guix.texi:24314 +#: doc/guix.texi:24311 #, no-wrap msgid "switch-generation" msgstr "switch-generation" #. type: table -#: doc/guix.texi:24323 +#: doc/guix.texi:24320 msgid "Switch to an existing system generation. This action atomically switches the system profile to the specified system generation. It also rearranges the system's existing bootloader menu entries. It makes the menu entry for the specified system generation the default, and it moves the entries for the other generatiors to a submenu, if supported by the bootloader being used. The next time the system boots, it will use the specified system generation." msgstr "Zu einer bestehenden Systemgeneration wechseln. Diese Aktion wechselt das Systemprofil atomar auf die angegebene Systemgeneration. Hiermit werden auch die bestehenden Menüeinträge des Bootloaders umgeordnet. Der Menüeintrag für die angegebene Systemgeneration wird voreingestellt und die Einträge der anderen Generationen werden in ein Untermenü verschoben, sofern der verwendete Bootloader dies unterstützt. Das nächste Mal, wenn das System gestartet wird, wird die hier angegebene Systemgeneration hochgefahren." #. type: table -#: doc/guix.texi:24327 +#: doc/guix.texi:24324 msgid "The bootloader itself is not being reinstalled when using this command. Thus, the installed bootloader is used with an updated configuration file." msgstr "Der Bootloader selbst wird durch diesen Befehl @emph{nicht} neu installiert. Es wird also lediglich der bereits installierte Bootloader mit einer neuen Konfigurationsdatei benutzt werden." #. type: table -#: doc/guix.texi:24331 +#: doc/guix.texi:24328 msgid "The target generation can be specified explicitly by its generation number. For example, the following invocation would switch to system generation 7:" msgstr "Die Zielgeneration kann ausdrücklich über ihre Generationsnummer angegeben werden. Zum Beispiel würde folgender Aufruf einen Wechsel zur Systemgeneration 7 bewirken:" #. type: example -#: doc/guix.texi:24334 +#: doc/guix.texi:24331 #, no-wrap msgid "guix system switch-generation 7\n" msgstr "guix system switch-generation 7\n" #. type: table -#: doc/guix.texi:24342 +#: doc/guix.texi:24339 msgid "The target generation can also be specified relative to the current generation with the form @code{+N} or @code{-N}, where @code{+3} means ``3 generations ahead of the current generation,'' and @code{-1} means ``1 generation prior to the current generation.'' When specifying a negative value such as @code{-1}, you must precede it with @code{--} to prevent it from being parsed as an option. For example:" msgstr "Die Zielgeneration kann auch relativ zur aktuellen Generation angegeben werden, in der Form @code{+N} oder @code{-N}, wobei @code{+3} zum Beispiel „3 Generationen weiter als die aktuelle Generation“ bedeuten würde und @code{-1} „1 Generation vor der aktuellen Generation“ hieße. Wenn Sie einen negativen Wert wie @code{-1} angeben, müssen Sie @code{--} der Befehlszeilenoption voranstellen, damit die negative Zahl nicht selbst als Befehlszeilenoption aufgefasst wird. Zum Beispiel:" #. type: example -#: doc/guix.texi:24345 +#: doc/guix.texi:24342 #, no-wrap msgid "guix system switch-generation -- -1\n" msgstr "guix system switch-generation -- -1\n" #. type: table -#: doc/guix.texi:24353 +#: doc/guix.texi:24350 msgid "Currently, the effect of invoking this action is @emph{only} to switch the system profile to an existing generation and rearrange the bootloader menu entries. To actually start using the target system generation, you must reboot after running this action. In the future, it will be updated to do the same things as @command{reconfigure}, like activating and deactivating services." msgstr "Zur Zeit bewirkt ein Aufruf dieser Aktion @emph{nur} einen Wechsel des Systemprofils auf eine bereits existierende Generation und ein Umordnen der Bootloader-Menüeinträge. Um die Ziel-Systemgeneration aber tatsächlich zu benutzen, müssen Sie Ihr System neu hochfahren, nachdem Sie diese Aktion ausgeführt haben. In einer zukünftigen Version von Guix wird diese Aktion einmal dieselben Dinge tun, wie @command{reconfigure}, also etwa Dienste aktivieren und deaktivieren." #. type: table -#: doc/guix.texi:24355 +#: doc/guix.texi:24352 msgid "This action will fail if the specified generation does not exist." msgstr "Diese Aktion schlägt fehl, wenn die angegebene Generation nicht existiert." #. type: item -#: doc/guix.texi:24356 +#: doc/guix.texi:24353 #, no-wrap msgid "roll-back" msgstr "roll-back" #. type: table -#: doc/guix.texi:24362 +#: doc/guix.texi:24359 msgid "Switch to the preceding system generation. The next time the system boots, it will use the preceding system generation. This is the inverse of @command{reconfigure}, and it is exactly the same as invoking @command{switch-generation} with an argument of @code{-1}." msgstr "Zur vorhergehenden Systemgeneration wechseln. Wenn das System das nächste Mal hochgefahren wird, wird es die vorhergehende Systemgeneration benutzen. Dies ist die Umkehrung von @command{reconfigure} und tut genau dasselbe, wie @command{switch-generation} mit dem Argument @code{-1} aufzurufen." #. type: table -#: doc/guix.texi:24366 +#: doc/guix.texi:24363 msgid "Currently, as with @command{switch-generation}, you must reboot after running this action to actually start using the preceding system generation." msgstr "Wie auch bei @command{switch-generation} müssen Sie derzeit, nachdem Sie diese Aktion aufgerufen haben, Ihr System neu starten, um die vorhergehende Systemgeneration auch tatsächlich zu benutzen." #. type: item -#: doc/guix.texi:24367 +#: doc/guix.texi:24364 #, no-wrap msgid "delete-generations" msgstr "delete-generations" #. type: cindex -#: doc/guix.texi:24368 +#: doc/guix.texi:24365 #, no-wrap msgid "deleting system generations" msgstr "Löschen von Systemgenerationen" #. type: cindex -#: doc/guix.texi:24369 +#: doc/guix.texi:24366 #, no-wrap msgid "saving space" msgstr "Platz sparen" #. type: table -#: doc/guix.texi:24373 +#: doc/guix.texi:24370 msgid "Delete system generations, making them candidates for garbage collection (@pxref{Invoking guix gc}, for information on how to run the ``garbage collector'')." msgstr "Systemgenerationen löschen, wodurch diese zu Kandidaten für den Müllsammler werden (siehe @ref{Invoking guix gc} für Informationen, wie Sie den „Müllsammler“ laufen lassen)." #. type: table -#: doc/guix.texi:24377 +#: doc/guix.texi:24374 msgid "This works in the same way as @command{guix package --delete-generations} (@pxref{Invoking guix package, @code{--delete-generations}}). With no arguments, all system generations but the current one are deleted:" msgstr "Es funktioniert auf die gleiche Weise wie @command{guix package --delete-generations} (siehe @ref{Invoking guix package, @code{--delete-generations}}). Wenn keine Argumente angegeben werden, werden alle Systemgenerationen außer der aktuellen gelöscht:" #. type: example -#: doc/guix.texi:24380 +#: doc/guix.texi:24377 #, no-wrap msgid "guix system delete-generations\n" msgstr "guix system delete-generations\n" #. type: table -#: doc/guix.texi:24384 +#: doc/guix.texi:24381 msgid "You can also select the generations you want to delete. The example below deletes all the system generations that are more than two month old:" msgstr "Sie können auch eine Auswahl treffen, welche Generationen Sie löschen möchten. Das folgende Beispiel hat die Löschung aller Systemgenerationen zur Folge, die älter als zwei Monate sind:" #. type: example -#: doc/guix.texi:24387 +#: doc/guix.texi:24384 #, no-wrap msgid "guix system delete-generations 2m\n" msgstr "guix system delete-generations 2m\n" #. type: table -#: doc/guix.texi:24392 +#: doc/guix.texi:24389 msgid "Running this command automatically reinstalls the bootloader with an updated list of menu entries---e.g., the ``old generations'' sub-menu in GRUB no longer lists the generations that have been deleted." msgstr "Wenn Sie diesen Befehl ausführen, wird automatisch der Bootloader mit einer aktualisierten Liste von Menüeinträgen neu erstellt — z.B.@: werden im Untermenü für die „alten Generationen“ in GRUB die gelöschten Generationen nicht mehr aufgeführt." #. type: table -#: doc/guix.texi:24397 +#: doc/guix.texi:24394 msgid "Build the derivation of the operating system, which includes all the configuration files and programs needed to boot and run the system. This action does not actually install anything." msgstr "Die Ableitung des Betriebssystems erstellen, einschließlich aller Konfigurationsdateien und Programme, die zum Booten und Starten benötigt werden. Diese Aktion installiert jedoch nichts davon." #. type: item -#: doc/guix.texi:24398 +#: doc/guix.texi:24395 #, no-wrap msgid "init" msgstr "init" #. type: table -#: doc/guix.texi:24402 +#: doc/guix.texi:24399 msgid "Populate the given directory with all the files necessary to run the operating system specified in @var{file}. This is useful for first-time installations of Guix System. For instance:" msgstr "In das angegebene Verzeichnis alle Dateien einfügen, um das in der @var{Datei} angegebene Betriebssystem starten zu können. Dies ist nützlich bei erstmaligen Installationen von „Guix System“. Zum Beispiel:" #. type: example -#: doc/guix.texi:24405 +#: doc/guix.texi:24402 #, no-wrap msgid "guix system init my-os-config.scm /mnt\n" msgstr "guix system init my-os-config.scm /mnt\n" #. type: table -#: doc/guix.texi:24412 +#: doc/guix.texi:24409 msgid "copies to @file{/mnt} all the store items required by the configuration specified in @file{my-os-config.scm}. This includes configuration files, packages, and so on. It also creates other essential files needed for the system to operate correctly---e.g., the @file{/etc}, @file{/var}, and @file{/run} directories, and the @file{/bin/sh} file." msgstr "Hiermit werden alle Store-Objekte nach @file{/mnt} kopiert, die von der in @file{my-os-config.scm} angegebenen Konfiguration vorausgesetzt werden. Dazu gehören Konfigurationsdateien, Pakete und so weiter. Auch andere essenzielle Dateien, die auf dem System vorhanden sein müssen, damit es richtig funktioniert, werden erzeugt — z.B.@: die Verzeichnisse @file{/etc}, @file{/var} und @file{/run} und die Datei @file{/bin/sh}." #. type: table -#: doc/guix.texi:24416 +#: doc/guix.texi:24413 msgid "This command also installs bootloader on the target specified in @file{my-os-config}, unless the @option{--no-bootloader} option was passed." msgstr "Dieser Befehl installiert auch den Bootloader auf dem in @file{my-os-config} angegebenen Ziel, außer die Befehlszeilenoption @option{--no-bootloader} wurde übergeben." #. type: item -#: doc/guix.texi:24417 +#: doc/guix.texi:24414 #, no-wrap msgid "vm" msgstr "vm" #. type: cindex -#: doc/guix.texi:24418 doc/guix.texi:24697 +#: doc/guix.texi:24415 doc/guix.texi:24683 #, no-wrap msgid "virtual machine" msgstr "virtuelle Maschine" #. type: cindex -#: doc/guix.texi:24419 +#: doc/guix.texi:24416 #, no-wrap msgid "VM" msgstr "VM" #. type: anchor{#1} -#: doc/guix.texi:24423 +#: doc/guix.texi:24420 msgid "guix system vm" msgstr "guix system vm" #. type: table -#: doc/guix.texi:24423 +#: doc/guix.texi:24420 msgid "Build a virtual machine that contains the operating system declared in @var{file}, and return a script to run that virtual machine (VM)." msgstr "Eine virtuelle Maschine (VM) erstellen, die das in der @var{Datei} deklarierte Betriebssystem enthält, und ein Skript liefern, das diese virtuelle Maschine startet." #. type: quotation -#: doc/guix.texi:24431 +#: doc/guix.texi:24428 msgid "The @code{vm} action and others below can use KVM support in the Linux-libre kernel. Specifically, if the machine has hardware virtualization support, the corresponding KVM kernel module should be loaded, and the @file{/dev/kvm} device node must exist and be readable and writable by the user and by the build users of the daemon (@pxref{Build Environment Setup})." msgstr "Die Aktion @code{vm} sowie solche, die weiter unten genannt werden, können KVM-Unterstützung im Kernel Linux-libre ausnutzen. Insbesondere sollte, wenn die Maschine Hardware-Virtualisierung unterstützt, das entsprechende KVM-Kernelmodul geladen sein und das Gerät @file{/dev/kvm} muss dann existieren und dem Benutzer und den Erstellungsbenutzern des Daemons müssen Berechtigungen zum Lesen und Schreiben darauf gegeben werden (siehe @ref{Build Environment Setup})." #. type: table -#: doc/guix.texi:24436 +#: doc/guix.texi:24433 msgid "Arguments given to the script are passed to QEMU as in the example below, which enables networking and requests 1@tie{}GiB of RAM for the emulated machine:" msgstr "An das Skript übergebene Argumente werden an QEMU weitergereicht, wie Sie am folgenden Beispiel sehen können. Damit würde eine Netzwerkverbindung aktiviert und 1@tie{}GiB an RAM für die emulierte Maschine angefragt:" #. type: example -#: doc/guix.texi:24439 +#: doc/guix.texi:24436 #, no-wrap msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user\n" msgstr "$ /gnu/store/…-run-vm.sh -m 1024 -net user\n" #. type: table -#: doc/guix.texi:24442 +#: doc/guix.texi:24439 msgid "The VM shares its store with the host system." msgstr "Die virtuelle Maschine verwendet denselben Store wie das Wirtssystem." #. type: table -#: doc/guix.texi:24447 +#: doc/guix.texi:24444 msgid "Additional file systems can be shared between the host and the VM using the @code{--share} and @code{--expose} command-line options: the former specifies a directory to be shared with write access, while the latter provides read-only access to the shared directory." msgstr "Mit den Befehlszeilenoptionen @code{--share} und @code{--expose} können weitere Dateisysteme zwischen dem Wirtssystem und der VM geteilt werden: Der erste Befehl gibt ein mit Schreibzugriff zu teilendes Verzeichnis an, während der letzte Befehl nur Lesezugriff auf das gemeinsame Verzeichnis gestattet." #. type: table -#: doc/guix.texi:24451 +#: doc/guix.texi:24448 msgid "The example below creates a VM in which the user's home directory is accessible read-only, and where the @file{/exchange} directory is a read-write mapping of @file{$HOME/tmp} on the host:" msgstr "Im folgenden Beispiel wird eine virtuelle Maschine erzeugt, die auf das Persönliche Verzeichnis des Benutzers nur Lesezugriff hat, wo das Verzeichnis @file{/austausch} aber mit Lese- und Schreibzugriff dem Verzeichnis @file{$HOME/tmp} auf dem Wirtssystem zugeordnet wurde:" #. type: example -#: doc/guix.texi:24455 +#: doc/guix.texi:24452 #, no-wrap msgid "" "guix system vm my-config.scm \\\n" @@ -44847,121 +45086,114 @@ msgstr "" " --expose=$HOME --share=$HOME/tmp=/austausch\n" #. type: table -#: doc/guix.texi:24460 +#: doc/guix.texi:24457 msgid "On GNU/Linux, the default is to boot directly to the kernel; this has the advantage of requiring only a very tiny root disk image since the store of the host can then be mounted." msgstr "Für GNU/Linux ist das vorgegebene Verhalten, direkt in den Kernel zu booten, wodurch nur ein sehr winziges „Disk-Image“ (eine Datei mit einem Abbild des Plattenspeichers der virtuellen Maschine) für das Wurzeldateisystem nötig wird, weil der Store des Wirtssystems davon eingebunden werden kann." #. type: table -#: doc/guix.texi:24466 +#: doc/guix.texi:24463 msgid "The @code{--full-boot} option forces a complete boot sequence, starting with the bootloader. This requires more disk space since a root image containing at least the kernel, initrd, and bootloader data files must be created. The @code{--image-size} option can be used to specify the size of the image." msgstr "Mit der Befehlszeilenoption @code{--full-boot} wird erzwungen, einen vollständigen Bootvorgang durchzuführen, angefangen mit dem Bootloader. Dadurch wird mehr Plattenplatz verbraucht, weil dazu ein Disk-Image mindestens mit dem Kernel, initrd und Bootloader-Datendateien erzeugt werden muss. Mit der Befehlszeilenoption @code{--image-size} kann die Größe des Disk-Images angegeben werden." #. type: cindex -#: doc/guix.texi:24467 +#: doc/guix.texi:24464 #, no-wrap msgid "System images, creation in various formats" msgstr "System-Disk-Images, Erstellung in verschiedenen Formaten" #. type: cindex -#: doc/guix.texi:24468 +#: doc/guix.texi:24465 #, no-wrap msgid "Creating system images in various formats" msgstr "Erzeugen von System-Disk-Images in verschiedenen Formaten" #. type: item -#: doc/guix.texi:24469 +#: doc/guix.texi:24466 #, no-wrap msgid "vm-image" msgstr "vm-image" #. type: itemx -#: doc/guix.texi:24470 +#: doc/guix.texi:24467 #, no-wrap msgid "disk-image" msgstr "disk-image" #. type: itemx -#: doc/guix.texi:24471 +#: doc/guix.texi:24468 #, no-wrap msgid "docker-image" msgstr "docker-image" #. type: table -#: doc/guix.texi:24479 +#: doc/guix.texi:24476 msgid "Return a virtual machine, disk image, or Docker image of the operating system declared in @var{file} that stands alone. By default, @command{guix system} estimates the size of the image needed to store the system, but you can use the @option{--image-size} option to specify a value. Docker images are built to contain exactly what they need, so the @option{--image-size} option is ignored in the case of @code{docker-image}." msgstr "Ein eigenständiges Disk-Image für eine virtuelle Maschine, ein allgemeines Disk-Image oder ein Docker-Abbild für das in der @var{Datei} deklarierte Betriebssystem liefern. Das vorgegebene Verhalten von @command{guix system} ist, die Größe des Images zu schätzen, die zum Speichern des Systems benötigt wird, aber Sie können mit der Befehlszeilenoption @option{--image-size} selbst Ihre gewünschte Größe bestimmen. Docker-Abbilder werden aber so erstellt, dass sie gerade nur das enthalten, was für sie nötig ist, daher wird die Befehlszeilenoption @option{--image-size} im Fall von @code{docker-image} ignoriert." #. type: table -#: doc/guix.texi:24482 +#: doc/guix.texi:24479 msgid "You can specify the root file system type by using the @option{--file-system-type} option. It defaults to @code{ext4}." msgstr "Sie können den Dateisystemtyp für das Wurzeldateisystem mit der Befehlszeilenoption @option{--file-system-type} festlegen. Vorgegeben ist, @code{ext4} zu verwenden." #. type: table -#: doc/guix.texi:24486 +#: doc/guix.texi:24483 msgid "When using @code{vm-image}, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running Guix in a VM}, for more information on how to run the image in a virtual machine." msgstr "Wenn Sie ein @code{vm-image} anfordern, ist das gelieferte Disk-Image im qcow2-Format, was vom QEMU-Emulator effizient benutzt werden kann. Im Abschnitt @ref{Running Guix in a VM} finden Sie mehr Informationen, wie Sie das Disk-Image in einer virtuellen Maschine laufen lassen." #. type: table -#: doc/guix.texi:24491 +#: doc/guix.texi:24488 msgid "When using @code{disk-image}, a raw disk image is produced; it can be copied as is to a USB stick, for instance. Assuming @code{/dev/sdc} is the device corresponding to a USB stick, one can copy the image to it using the following command:" msgstr "Wenn Sie ein @code{disk-image} anfordern, wird ein rohes Disk-Image hergestellt; es kann zum Beispiel auf einen USB-Stick kopiert werden. Angenommen @code{/dev/sdc} ist das dem USB-Stick entsprechende Gerät, dann kann das Disk-Image mit dem folgenden Befehls darauf kopiert werden:" #. type: example -#: doc/guix.texi:24494 +#: doc/guix.texi:24491 #, no-wrap msgid "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n" msgstr "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n" #. type: table -#: doc/guix.texi:24501 +#: doc/guix.texi:24498 msgid "When using @code{docker-image}, a Docker image is produced. Guix builds the image from scratch, not from a pre-existing Docker base image. As a result, it contains @emph{exactly} what you define in the operating system configuration file. You can then load the image and launch a Docker container using commands like the following:" msgstr "Wenn Sie ein @code{docker-image} anfordern, wird ein Abbild für Docker hergestellt. Guix erstellt das Abbild von Grund auf und @emph{nicht} aus einem vorerstellten Docker-Basisabbild heraus, daher enthält es @emph{exakt} das, was Sie in der Konfigurationsdatei für das Betriebssystem angegeben haben. Sie können das Abbild dann wie folgt laden und einen Docker-Container damit erzeugen:" #. type: example -#: doc/guix.texi:24506 +#: doc/guix.texi:24504 #, no-wrap msgid "" -"image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" -"container_id=\"`docker create $image_id`\"\n" -"docker start $container_id\n" +"image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" +"docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" +" --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" +" $image_id /var/guix/profiles/system/boot\n" msgstr "" -"image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" -"container_id=\"`docker create $image_id`\"\n" -"docker start $container_id\n" - -#. type: table -#: doc/guix.texi:24513 -msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. You can get an interactive shell running in the container using @command{docker exec}:" -msgstr "Dieser Befehl startet einen neuen Docker-Container aus dem angegebenen Abbild. Damit wird das Guix-System auf die normale Weise hochgefahren, d.h.@: zunächst werden alle Dienste gestartet, die Sie in der Konfiguration des Betriebssystems angegeben haben. Sie können eine interaktive Shell in dieser isolierten Umgebung bekommen, indem Sie @command{docker exec} benutzen:" - -#. type: example -#: doc/guix.texi:24516 -#, no-wrap -msgid "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" -msgstr "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" +"image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" +"docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" +" --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" +" $image_id /var/guix/profiles/system/boot\n" #. type: table -#: doc/guix.texi:24523 -msgid "Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker create}." +#: doc/guix.texi:24514 +#, fuzzy +#| msgid "Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker create}." +msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. Depending on what you run in the Docker container, it may be necessary to give the container additional permissions. For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker run}." msgstr "Je nachdem, was Sie im Docker-Container ausführen, kann es nötig sein, dass Sie ihn mit weitergehenden Berechtigungen ausstatten. Wenn Sie zum Beispiel Software mit Guix innerhalb des Docker-Containers erstellen wollen, müssen Sie an @code{docker create} die Befehlszeilenoption @option{--privileged} übergeben." #. type: table -#: doc/guix.texi:24531 +#: doc/guix.texi:24522 msgid "Return a script to run the operating system declared in @var{file} within a container. Containers are a set of lightweight isolation mechanisms provided by the kernel Linux-libre. Containers are substantially less resource-demanding than full virtual machines since the kernel, shared objects, and other resources can be shared with the host system; this also means they provide thinner isolation." msgstr "Liefert ein Skript, um das in der @var{Datei} deklarierte Betriebssystem in einem Container auszuführen. Mit Container wird hier eine Reihe ressourcenschonender Isolierungsmechanismen im Kernel Linux-libre bezeichnet. Container beanspruchen wesentlich weniger Ressourcen als vollumfängliche virtuelle Maschinen, weil der Kernel, Bibliotheken in gemeinsam nutzbaren Objektdateien („Shared Objects“) sowie andere Ressourcen mit dem Wirtssystem geteilt werden können. Damit ist also eine „dünnere“ Isolierung möglich." #. type: table -#: doc/guix.texi:24535 +#: doc/guix.texi:24526 msgid "Currently, the script must be run as root in order to support more than a single user and group. The container shares its store with the host system." msgstr "Zur Zeit muss das Skript als Administratornutzer „root“ ausgeführt werden, damit darin mehr als nur ein einzelner Benutzer und eine Benutzergruppe unterstützt wird. Der Container teilt seinen Store mit dem Wirtssystem." #. type: table -#: doc/guix.texi:24539 +#: doc/guix.texi:24530 msgid "As with the @code{vm} action (@pxref{guix system vm}), additional file systems to be shared between the host and container can be specified using the @option{--share} and @option{--expose} options:" msgstr "Wie bei der Aktion @code{vm} (siehe @ref{guix system vm}) können zusätzlich weitere Dateisysteme zwischen Wirt und Container geteilt werden, indem man die Befehlszeilenoptionen @option{--share} und @option{--expose} verwendet:" #. type: example -#: doc/guix.texi:24543 +#: doc/guix.texi:24534 #, no-wrap msgid "" "guix system container my-config.scm \\\n" @@ -44971,288 +45203,283 @@ msgstr "" " --expose=$HOME --share=$HOME/tmp=/austausch\n" #. type: quotation -#: doc/guix.texi:24547 +#: doc/guix.texi:24538 msgid "This option requires Linux-libre 3.19 or newer." msgstr "Diese Befehlszeilenoption funktioniert nur mit Linux-libre 3.19 oder neuer." #. type: Plain text -#: doc/guix.texi:24554 +#: doc/guix.texi:24545 msgid "@var{options} can contain any of the common build options (@pxref{Common Build Options}). In addition, @var{options} can contain one of the following:" msgstr "Unter den @var{Optionen} können beliebige gemeinsame Erstellungsoptionen aufgeführt werden (siehe @ref{Common Build Options}). Des Weiteren kann als @var{Optionen} Folgendes angegeben werden:" #. type: table -#: doc/guix.texi:24563 +#: doc/guix.texi:24554 msgid "Consider the operating-system @var{expr} evaluates to. This is an alternative to specifying a file which evaluates to an operating system. This is used to generate the Guix system installer @pxref{Building the Installation Image})." msgstr "Als Konfiguration des Betriebssystems das „operating-system“ betrachten, zu dem der @var{Ausdruck} ausgewertet wird. Dies ist eine Alternative dazu, die Konfiguration in einer Datei festzulegen. Hiermit wird auch das Installationsabbild des Guix-Systems erstellt, siehe @ref{Building the Installation Image})." #. type: table -#: doc/guix.texi:24568 +#: doc/guix.texi:24559 msgid "Attempt to build for @var{system} instead of the host system type. This works as per @command{guix build} (@pxref{Invoking guix build})." msgstr "Versuchen, für das angegebene @var{System} statt für denselben Systemtyp wie auf dem Wirtssystem zu erstellen. Dies funktioniert wie bei @command{guix build} (siehe @ref{Invoking guix build})." #. type: item -#: doc/guix.texi:24569 +#: doc/guix.texi:24560 #, no-wrap msgid "--derivation" msgstr "--derivation" #. type: table -#: doc/guix.texi:24573 +#: doc/guix.texi:24564 msgid "Return the derivation file name of the given operating system without building anything." msgstr "Liefert den Namen der Ableitungsdatei für das angegebene Betriebssystem, ohne dazu etwas zu erstellen." #. type: item -#: doc/guix.texi:24574 +#: doc/guix.texi:24565 #, no-wrap msgid "--file-system-type=@var{type}" msgstr "--file-system-type=@var{Typ}" #. type: table -#: doc/guix.texi:24578 +#: doc/guix.texi:24569 msgid "For the @code{disk-image} action, create a file system of the given @var{type} on the image." msgstr "Für die Aktion @code{disk-image} wird hiermit ein Dateisystem des angegebenen @var{Typ}s im Abbild bzw. Disk-Image erzeugt." #. type: table -#: doc/guix.texi:24580 +#: doc/guix.texi:24571 msgid "When this option is omitted, @command{guix system} uses @code{ext4}." msgstr "Wird diese Befehlszeilenoption nicht angegeben, so benutzt @command{guix system} als Dateisystemtyp @code{ext4}." #. type: cindex -#: doc/guix.texi:24581 +#: doc/guix.texi:24572 #, no-wrap msgid "ISO-9660 format" msgstr "ISO-9660-Format" #. type: cindex -#: doc/guix.texi:24582 +#: doc/guix.texi:24573 #, no-wrap msgid "CD image format" msgstr "CD-Abbild-Format" #. type: cindex -#: doc/guix.texi:24583 +#: doc/guix.texi:24574 #, no-wrap msgid "DVD image format" msgstr "DVD-Abbild-Format" #. type: table -#: doc/guix.texi:24586 +#: doc/guix.texi:24577 msgid "@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for burning on CDs and DVDs." msgstr "@code{--file-system-type=iso9660} erzeugt ein Abbild im Format ISO-9660, was für das Brennen auf CDs und DVDs geeignet ist." #. type: item -#: doc/guix.texi:24587 +#: doc/guix.texi:24578 #, no-wrap msgid "--image-size=@var{size}" msgstr "--image-size=@var{Größe}" #. type: table -#: doc/guix.texi:24592 +#: doc/guix.texi:24583 msgid "For the @code{vm-image} and @code{disk-image} actions, create an image of the given @var{size}. @var{size} may be a number of bytes, or it may include a unit as a suffix (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." msgstr "Für die Aktionen @code{vm-image} und @code{disk-image} wird hiermit festgelegt, dass ein Abbild der angegebenen @var{Größe} erstellt werden soll. Die @var{Größe} kann als Zahl die Anzahl Bytes angeben oder mit einer Einheit als Suffix versehen werden (siehe @ref{Block size, size specifications,, coreutils, GNU Coreutils})." #. type: table -#: doc/guix.texi:24596 +#: doc/guix.texi:24587 msgid "When this option is omitted, @command{guix system} computes an estimate of the image size as a function of the size of the system declared in @var{file}." msgstr "Wird keine solche Befehlszeilenoption angegeben, berechnet @command{guix system} eine Schätzung der Abbildgröße anhand der Größe des in der @var{Datei} deklarierten Systems." -#. type: table -#: doc/guix.texi:24601 -msgid "For the @code{container} action, allow containers to access the host network, that is, do not create a network namespace." -msgstr "Für die Aktion @code{container} dürfen isolierte Umgebungen (auch bekannt als „Container“) auf das Wirtsnetzwerk zugreifen, d.h.@: es wird kein Netzwerknamensraum für sie erzeugt." - #. type: item -#: doc/guix.texi:24607 +#: doc/guix.texi:24593 #, no-wrap msgid "--skip-checks" msgstr "--skip-checks" #. type: table -#: doc/guix.texi:24609 +#: doc/guix.texi:24595 msgid "Skip pre-installation safety checks." msgstr "Die Konfiguration @emph{nicht} vor der Installation zur Sicherheit auf Fehler prüfen." #. type: table -#: doc/guix.texi:24616 +#: doc/guix.texi:24602 msgid "By default, @command{guix system init} and @command{guix system reconfigure} perform safety checks: they make sure the file systems that appear in the @code{operating-system} declaration actually exist (@pxref{File Systems}), and that any Linux kernel modules that may be needed at boot time are listed in @code{initrd-modules} (@pxref{Initial RAM Disk}). Passing this option skips these tests altogether." msgstr "Das vorgegebene Verhalten von @command{guix system init} und @command{guix system reconfigure} sieht vor, die Konfiguration zur Sicherheit auf Fehler hin zu überprüfen, die ihr Autor übersehen haben könnte: Es wird sichergestellt, dass die in der @code{operating-system}-Deklaration erwähnten Dateisysteme tatsächlich existieren (siehe @ref{File Systems}) und dass alle Linux-Kernelmodule, die beim Booten benötigt werden könnten, auch im @code{initrd-modules}-Feld aufgeführt sind (siehe @ref{Initial RAM Disk}). Mit dieser Befehlszeilenoption werden diese Tests allesamt übersprungen." #. type: cindex -#: doc/guix.texi:24617 +#: doc/guix.texi:24603 #, no-wrap msgid "on-error" msgstr "on-error" #. type: cindex -#: doc/guix.texi:24618 +#: doc/guix.texi:24604 #, no-wrap msgid "on-error strategy" msgstr "on-error-Strategie" #. type: cindex -#: doc/guix.texi:24619 +#: doc/guix.texi:24605 #, no-wrap msgid "error strategy" msgstr "Fehlerstrategie" #. type: item -#: doc/guix.texi:24620 +#: doc/guix.texi:24606 #, no-wrap msgid "--on-error=@var{strategy}" msgstr "--on-error=@var{Strategie}" #. type: table -#: doc/guix.texi:24623 +#: doc/guix.texi:24609 msgid "Apply @var{strategy} when an error occurs when reading @var{file}. @var{strategy} may be one of the following:" msgstr "Beim Auftreten eines Fehlers beim Einlesen der @var{Datei} die angegebene @var{Strategie} verfolgen. Als @var{Strategie} dient eine der Folgenden:" #. type: item -#: doc/guix.texi:24625 +#: doc/guix.texi:24611 #, no-wrap msgid "nothing-special" msgstr "nothing-special" #. type: table -#: doc/guix.texi:24627 +#: doc/guix.texi:24613 msgid "Report the error concisely and exit. This is the default strategy." msgstr "Nichts besonderes; der Fehler wird kurz gemeldet und der Vorgang abgebrochen. Dies ist die vorgegebene Strategie." #. type: item -#: doc/guix.texi:24628 +#: doc/guix.texi:24614 #, no-wrap msgid "backtrace" msgstr "backtrace" #. type: table -#: doc/guix.texi:24630 +#: doc/guix.texi:24616 msgid "Likewise, but also display a backtrace." msgstr "Ebenso, aber zusätzlich wird eine Rückverfolgung des Fehlers (ein „Backtrace“) angezeigt." #. type: item -#: doc/guix.texi:24631 +#: doc/guix.texi:24617 #, no-wrap msgid "debug" msgstr "debug" #. type: table -#: doc/guix.texi:24637 +#: doc/guix.texi:24623 msgid "Report the error and enter Guile's debugger. From there, you can run commands such as @code{,bt} to get a backtrace, @code{,locals} to display local variable values, and more generally inspect the state of the program. @xref{Debug Commands,,, guile, GNU Guile Reference Manual}, for a list of available debugging commands." msgstr "Nach dem Melden des Fehlers wird der Debugger von Guile zur Fehlersuche gestartet. Von dort können Sie Befehle ausführen, zum Beispiel können Sie sich mit @code{,bt} eine Rückverfolgung („Backtrace“) anzeigen lassen und mit @code{,locals} die Werte lokaler Variabler anzeigen lassen. Im Allgemeinen können Sie mit Befehlen den Zustand des Programms inspizieren. Siehe @ref{Debug Commands,,, guile, GNU Guile Reference Manual} für eine Liste verfügbarer Befehle zur Fehlersuche." #. type: Plain text -#: doc/guix.texi:24644 +#: doc/guix.texi:24630 msgid "Once you have built, configured, re-configured, and re-re-configured your Guix installation, you may find it useful to list the operating system generations available on disk---and that you can choose from the bootloader boot menu:" msgstr "Sobald Sie Ihre Guix-Installation erstellt, konfiguriert, neu konfiguriert und nochmals neu konfiguriert haben, finden Sie es vielleicht hilfreich, sich die auf der Platte verfügbaren — und im Bootmenü des Bootloaders auswählbaren — Systemgenerationen auflisten zu lassen:" #. type: item -#: doc/guix.texi:24647 +#: doc/guix.texi:24633 #, no-wrap msgid "list-generations" msgstr "list-generations" #. type: table -#: doc/guix.texi:24652 +#: doc/guix.texi:24638 msgid "List a summary of each generation of the operating system available on disk, in a human-readable way. This is similar to the @option{--list-generations} option of @command{guix package} (@pxref{Invoking guix package})." msgstr "Eine für Menschen verständliche Zusammenfassung jeder auf der Platte verfügbaren Generation des Betriebssystems ausgeben. Dies ähnelt der Befehlszeilenoption @option{--list-generations} von @command{guix package} (siehe @ref{Invoking guix package})." #. type: table -#: doc/guix.texi:24657 +#: doc/guix.texi:24643 msgid "Optionally, one can specify a pattern, with the same syntax that is used in @command{guix package --list-generations}, to restrict the list of generations displayed. For instance, the following command displays generations that are up to 10 days old:" msgstr "Optional kann ein Muster angegeben werden, was dieselbe Syntax wie @command{guix package --list-generations} benutzt, um damit die Liste anzuzeigender Generationen einzuschränken. Zum Beispiel zeigt der folgende Befehl Generationen an, die bis zu 10 Tage alt sind:" #. type: example -#: doc/guix.texi:24660 +#: doc/guix.texi:24646 #, no-wrap msgid "$ guix system list-generations 10d\n" msgstr "$ guix system list-generations 10d\n" #. type: Plain text -#: doc/guix.texi:24667 +#: doc/guix.texi:24653 msgid "The @command{guix system} command has even more to offer! The following sub-commands allow you to visualize how your system services relate to each other:" msgstr "Der Befehl @command{guix system} hat sogar noch mehr zu bieten! Mit folgenden Unterbefehlen wird Ihnen visualisiert, wie Ihre Systemdienste voneinander abhängen:" #. type: anchor{#1} -#: doc/guix.texi:24669 +#: doc/guix.texi:24655 msgid "system-extension-graph" msgstr "system-extension-graph" #. type: item -#: doc/guix.texi:24671 +#: doc/guix.texi:24657 #, no-wrap msgid "extension-graph" msgstr "extension-graph" #. type: table -#: doc/guix.texi:24676 +#: doc/guix.texi:24662 msgid "Emit in Dot/Graphviz format to standard output the @dfn{service extension graph} of the operating system defined in @var{file} (@pxref{Service Composition}, for more information on service extensions.)" msgstr "Im Dot-/Graphviz-Format auf die Standardausgabe den @dfn{Diensterweiterungsgraphen} des in der @var{Datei} definierten Betriebssystems ausgeben (siehe @ref{Service Composition} für mehr Informationen zu Diensterweiterungen)." #. type: table -#: doc/guix.texi:24678 +#: doc/guix.texi:24664 msgid "The command:" msgstr "Der Befehl:" #. type: example -#: doc/guix.texi:24681 +#: doc/guix.texi:24667 #, no-wrap msgid "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n" msgstr "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n" #. type: table -#: doc/guix.texi:24684 +#: doc/guix.texi:24670 msgid "produces a PDF file showing the extension relations among services." msgstr "erzeugt eine PDF-Datei, in der die Erweiterungsrelation unter Diensten angezeigt wird." #. type: anchor{#1} -#: doc/guix.texi:24686 +#: doc/guix.texi:24672 msgid "system-shepherd-graph" msgstr "system-shepherd-graph" #. type: item -#: doc/guix.texi:24686 +#: doc/guix.texi:24672 #, no-wrap msgid "shepherd-graph" msgstr "shepherd-graph" #. type: table -#: doc/guix.texi:24691 +#: doc/guix.texi:24677 msgid "Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of shepherd services of the operating system defined in @var{file}. @xref{Shepherd Services}, for more information and for an example graph." msgstr "Im Dot-/Graphviz-Format auf die Standardausgabe den @dfn{Abhängigkeitsgraphen} der Shepherd-Dienste des in der @var{Datei} definierten Betriebssystems ausgeben. Siehe @ref{Shepherd Services} für mehr Informationen sowie einen Beispielgraphen." #. type: section -#: doc/guix.texi:24695 +#: doc/guix.texi:24681 #, no-wrap msgid "Running Guix in a Virtual Machine" msgstr "Guix in einer virtuellen Maschine betreiben" #. type: Plain text -#: doc/guix.texi:24704 +#: doc/guix.texi:24690 msgid "To run Guix in a virtual machine (VM), one can use the pre-built Guix VM image distributed at @url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.x86_64-linux.xz}. This image is a compressed image in QCOW format. You will first need to decompress with @command{xz -d}, and then you can pass it to an emulator such as QEMU (see below for details)." msgstr "Um Guix in einer virtuellen Maschine (VM) auszuführen, können Sie das vorerstellte Guix-VM-Abbild benutzen, das auf @url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.@var{System}.xz} angeboten wird. Das Abbild ist ein komprimiertes Abbild im QCOW-Format. Sie müssen es mit @command{xz -d} dekomprimieren, bevor Sie es an einen Emulator wie QEMU übergeben (siehe unten für Details)." #. type: Plain text -#: doc/guix.texi:24710 +#: doc/guix.texi:24696 msgid "This image boots the Xfce graphical environment and it contains some commonly-used tools. You can install more software in the image by running @command{guix package} in a terminal (@pxref{Invoking guix package}). You can also reconfigure the system based on its initial configuration file available as @file{/etc/config.scm} (@pxref{Using the Configuration System})." msgstr "Dieses Abbild startet eine grafische Xfce-Umgebung und enthält einige oft genutzte Werkzeuge. Sie können im Abbild mehr Software installieren, indem Sie @command{guix package} in einem Terminal ausführen (siehe @ref{Invoking guix package}). Sie können das System im Abbild auch rekonfigurieren, basierend auf seiner anfänglichen Konfigurationsdatei, die als @file{/etc/config.scm} verfügbar ist (siehe @ref{Using the Configuration System})." #. type: Plain text -#: doc/guix.texi:24715 +#: doc/guix.texi:24701 msgid "Instead of using this pre-built image, one can also build their own virtual machine image using @command{guix system vm-image} (@pxref{Invoking guix system}). The returned image is in qcow2 format, which the @uref{https://qemu.org/, QEMU emulator} can efficiently use." msgstr "Statt dieses vorerstellte Abbild zu benutzen, können Sie auch Ihr eigenes Abbild für virtuelle Maschinen erstellen, indem Sie @command{guix system vm-image} benutzen (siehe @ref{Invoking guix system}). Das Abbild wird im qcow2-Format zurückgeliefert, das der @uref{https://qemu.org/, QEMU-Emulator} effizient benutzen kann." #. type: cindex -#: doc/guix.texi:24716 +#: doc/guix.texi:24702 #, no-wrap msgid "QEMU" msgstr "QEMU" #. type: Plain text -#: doc/guix.texi:24723 +#: doc/guix.texi:24709 msgid "If you built your own image, you must copy it out of the store (@pxref{The Store}) and give yourself permission to write to the copy before you can use it. When invoking QEMU, you must choose a system emulator that is suitable for your hardware platform. Here is a minimal QEMU invocation that will boot the result of @command{guix system vm-image} on x86_64 hardware:" msgstr "Wenn Sie Ihr eigenes Abbild erstellen haben lassen, müssen Sie es aus dem Store herauskopieren (siehe @ref{The Store}) und sich darauf Schreibberechtigung geben, um die Kopie benutzen zu können. Wenn Sie QEMU aufrufen, müssen Sie einen Systememulator angeben, der für Ihre Hardware-Plattform passend ist. Hier ist ein minimaler QEMU-Aufruf, der das Ergebnis von @command{guix system vm-image} auf x86_64-Hardware bootet:" #. type: example -#: doc/guix.texi:24730 +#: doc/guix.texi:24716 #, no-wrap msgid "" "$ qemu-system-x86_64 \\\n" @@ -45268,143 +45495,143 @@ msgstr "" " -drive if=none,file=/tmp/qemu-image,id=myhd\n" #. type: Plain text -#: doc/guix.texi:24733 +#: doc/guix.texi:24719 msgid "Here is what each of these options means:" msgstr "Die Bedeutung jeder dieser Befehlszeilenoptionen ist folgende:" #. type: item -#: doc/guix.texi:24735 +#: doc/guix.texi:24721 #, no-wrap msgid "qemu-system-x86_64" msgstr "qemu-system-x86_64" #. type: table -#: doc/guix.texi:24738 +#: doc/guix.texi:24724 msgid "This specifies the hardware platform to emulate. This should match the host." msgstr "Hiermit wird die zu emulierende Hardware-Plattform angegeben. Sie sollte zum Wirtsrechner passen." #. type: item -#: doc/guix.texi:24739 +#: doc/guix.texi:24725 #, no-wrap msgid "-net user" msgstr "-net user" #. type: table -#: doc/guix.texi:24743 +#: doc/guix.texi:24729 msgid "Enable the unprivileged user-mode network stack. The guest OS can access the host but not vice versa. This is the simplest way to get the guest OS online." msgstr "Den als Nutzer ausgeführten Netzwerkstapel („User-Mode Network Stack“) ohne besondere Berechtigungen benutzen. Mit dieser Art von Netzwerkanbindung kann das Gast-Betriebssystem eine Verbindung zum Wirt aufbauen, aber nicht andersherum. Es ist die einfachste Art, das Gast-Betriebssystem mit dem Internet zu verbinden." #. type: item -#: doc/guix.texi:24744 +#: doc/guix.texi:24730 #, no-wrap msgid "-net nic,model=virtio" msgstr "-net nic,model=virtio" #. type: table -#: doc/guix.texi:24749 +#: doc/guix.texi:24735 msgid "You must create a network interface of a given model. If you do not create a NIC, the boot will fail. Assuming your hardware platform is x86_64, you can get a list of available NIC models by running @command{qemu-system-x86_64 -net nic,model=help}." msgstr "Sie müssen ein Modell einer zu emulierenden Netzwerkschnittstelle angeben. Wenn Sie keine Netzwerkkarte (englisch „Network Interface Card“, kurz NIC) erzeugen lassen, wird das Booten fehlschlagen. Falls Ihre Hardware-Plattform x86_64 ist, können Sie eine Liste verfügbarer NIC-Modelle einsehen, indem Sie @command{qemu-system-x86_64 -net nic,model=help} ausführen." #. type: item -#: doc/guix.texi:24750 +#: doc/guix.texi:24736 #, no-wrap msgid "-enable-kvm" msgstr "-enable-kvm" #. type: table -#: doc/guix.texi:24754 +#: doc/guix.texi:24740 msgid "If your system has hardware virtualization extensions, enabling the virtual machine support (KVM) of the Linux kernel will make things run faster." msgstr "Wenn Ihr System über Erweiterungen zur Hardware-Virtualisierung verfügt, beschleunigt es die Dinge, wenn Sie die Virtualisierungsunterstützung „KVM“ des Linux-Kernels benutzen lassen." #. type: item -#: doc/guix.texi:24756 +#: doc/guix.texi:24742 #, no-wrap msgid "-m 1024" msgstr "-m 1024" #. type: table -#: doc/guix.texi:24759 +#: doc/guix.texi:24745 msgid "RAM available to the guest OS, in mebibytes. Defaults to 128@tie{}MiB, which may be insufficient for some operations." msgstr "Die Menge an Arbeitsspeicher (RAM), die dem Gastbetriebssystem zur Verfügung stehen soll, in Mebibytes. Vorgegeben wären 128@tie{}MiB, was für einige Operationen zu wenig sein könnte." #. type: item -#: doc/guix.texi:24760 +#: doc/guix.texi:24746 #, no-wrap msgid "-device virtio-blk,drive=myhd" msgstr "-device virtio-blk,drive=myhd" #. type: table -#: doc/guix.texi:24765 +#: doc/guix.texi:24751 msgid "Create a @code{virtio-blk} drive called ``myhd''. @code{virtio-blk} is a ``paravirtualization'' mechanism for block devices that allows QEMU to achieve better performance than if it were emulating a complete disk drive. See the QEMU and KVM documentation for more info." msgstr "Ein @code{virtio-blk}-Laufwerk namens „myhd“ erzeugen. @code{virtio-blk} ist ein Mechanismus zur „Paravirtualisierung“ von Blockgeräten, wodurch QEMU diese effizienter benutzen kann, als wenn es ein Laufwerk vollständig emulieren würde. Siehe die Dokumentation von QEMU und KVM für mehr Informationen." #. type: item -#: doc/guix.texi:24766 +#: doc/guix.texi:24752 #, no-wrap msgid "-drive if=none,file=/tmp/qemu-image,id=myhd" msgstr "-drive if=none,file=/tmp/qemu-image,id=myhd" #. type: table -#: doc/guix.texi:24769 +#: doc/guix.texi:24755 msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store the the ``myhd'' drive." msgstr "Unser QCOW-Abbild in der Datei @file{/tmp/qemu-image} soll als Inhalt des „myhd“-Laufwerks herhalten." #. type: Plain text -#: doc/guix.texi:24779 +#: doc/guix.texi:24765 msgid "The default @command{run-vm.sh} script that is returned by an invocation of @command{guix system vm} does not add a @command{-net user} flag by default. To get network access from within the vm add the @code{(dhcp-client-service)} to your system definition and start the VM using @command{`guix system vm config.scm` -net user}. An important caveat of using @command{-net user} for networking is that @command{ping} will not work, because it uses the ICMP protocol. You'll have to use a different command to check for network connectivity, for example @command{guix download}." msgstr "Das voreingestellte @command{run-vm.sh}-Skript, das durch einen Aufruf von @command{guix system vm} erzeugt wird, fügt keine Befehlszeilenoption @command{-net user} an. Um innerhalb der virtuellen Maschine Netzwerkzugang zu haben, fügen Sie den @code{(dhcp-client-service)} zu Ihrer Systemdefinition hinzu und starten Sie die VM mit @command{`guix system vm config.scm` -net user}. Erwähnt werden sollte der Nachteil, dass bei Verwendung von @command{-net user} zur Netzanbindung der @command{ping}-Befehl @emph{nicht} funktionieren wird, weil dieser das ICMP-Protokoll braucht. Sie werden also einen anderen Befehl benutzen müssen, um auszuprobieren, ob Sie mit dem Netzwerk verbunden sind, zum Beispiel @command{guix download}." #. type: subsection -#: doc/guix.texi:24780 +#: doc/guix.texi:24766 #, no-wrap msgid "Connecting Through SSH" msgstr "Verbinden über SSH" #. type: Plain text -#: doc/guix.texi:24788 +#: doc/guix.texi:24774 msgid "To enable SSH inside a VM you need to add an SSH server like @code{openssh-service-type} to your VM (@pxref{Networking Services, @code{openssh-service-type}}). In addition you need to forward the SSH port, 22 by default, to the host. You can do this with" msgstr "Um SSH in der virtuellen Maschine zu aktivieren, müssen Sie einen SSH-Server wie @code{openssh-service-type} zu ihr hinzufügen (siehe @ref{Networking Services, @code{openssh-service-type}}). Des Weiteren müssen Sie den SSH-Port für das Wirtssystem freigeben (standardmäßig hat er die Portnummer 22). Das geht zum Beispiel so:" #. type: example -#: doc/guix.texi:24791 +#: doc/guix.texi:24777 #, no-wrap msgid "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n" msgstr "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n" #. type: Plain text -#: doc/guix.texi:24794 +#: doc/guix.texi:24780 msgid "To connect to the VM you can run" msgstr "Um sich mit der virtuellen Maschine zu verbinden, benutzen Sie diesen Befehl:" #. type: example -#: doc/guix.texi:24797 +#: doc/guix.texi:24783 #, no-wrap msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n" msgstr "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n" #. type: Plain text -#: doc/guix.texi:24804 +#: doc/guix.texi:24790 msgid "The @command{-p} tells @command{ssh} the port you want to connect to. @command{-o UserKnownHostsFile=/dev/null} prevents @command{ssh} from complaining every time you modify your @command{config.scm} file and the @command{-o StrictHostKeyChecking=no} prevents you from having to allow a connection to an unknown host every time you connect." msgstr "Mit @command{-p} wird @command{ssh} der Port mitgeteilt, über den eine Verbindung hergestellt werden soll. @command{-o UserKnownHostsFile=/dev/null} verhindert, dass @command{ssh} sich bei jeder Modifikation Ihrer @command{config.scm}-Datei beschwert, ein anderer bekannter Rechner sei erwartet worden, und @command{-o StrictHostKeyChecking=no} verhindert, dass Sie die Verbindung zu unbekannten Rechnern jedes Mal bestätigen müssen, wenn Sie sich verbinden." #. type: subsection -#: doc/guix.texi:24805 +#: doc/guix.texi:24791 #, no-wrap msgid "Using @command{virt-viewer} with Spice" msgstr "@command{virt-viewer} mit Spice benutzen" #. type: Plain text -#: doc/guix.texi:24811 +#: doc/guix.texi:24797 msgid "As an alternative to the default @command{qemu} graphical client you can use the @command{remote-viewer} from the @command{virt-viewer} package. To connect pass the @command{-spice port=5930,disable-ticketing} flag to @command{qemu}. See previous section for further information on how to do this." msgstr "Eine Alternative zur grafischen Schnittstelle des standardmäßigen @command{qemu} ist, sich mit Hilfe des @command{remote-viewer} aus dem Paket @command{virt-viewer} zu verbinden. Um eine Verbindung herzustellen, übergeben Sie die Befehlszeilenoption @command{-spice port=5930,disable-ticketing} an @command{qemu}. Siehe den vorherigen Abschnitt für weitere Informationen, wie Sie das übergeben." #. type: Plain text -#: doc/guix.texi:24814 +#: doc/guix.texi:24800 msgid "Spice also allows you to do some nice stuff like share your clipboard with your VM. To enable that you'll also have to pass the following flags to @command{qemu}:" msgstr "Spice macht es auch möglich, ein paar nette Hilfestellungen zu benutzen, zum Beispiel können Sie Ihren Zwischenspeicher zum Kopieren und Einfügen (Ihr „Clipboard“) mit Ihrer virtuellen Maschine teilen. Um das zu aktivieren, werden Sie die folgenden Befehlszeilennoptionen zusätzlich an @command{qemu} übergeben müssen:" #. type: example -#: doc/guix.texi:24820 +#: doc/guix.texi:24806 #, no-wrap msgid "" "-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n" @@ -45418,81 +45645,81 @@ msgstr "" "name=com.redhat.spice.0\n" #. type: Plain text -#: doc/guix.texi:24823 +#: doc/guix.texi:24809 msgid "You'll also need to add the @pxref{Miscellaneous Services, Spice service}." msgstr "Sie werden auch den @ref{Miscellaneous Services, Spice-Dienst} hinzufügen müssen." #. type: Plain text -#: doc/guix.texi:24830 +#: doc/guix.texi:24816 msgid "The previous sections show the available services and how one can combine them in an @code{operating-system} declaration. But how do we define them in the first place? And what is a service anyway?" msgstr "Der vorhergehende Abschnitt präsentiert die verfügbaren Dienste und wie man sie in einer @code{operating-system}-Deklaration kombiniert. Aber wie definieren wir solche Dienste eigentlich? Und was ist überhaupt ein Dienst?" #. type: cindex -#: doc/guix.texi:24842 +#: doc/guix.texi:24828 #, no-wrap msgid "daemons" msgstr "Daemons" #. type: Plain text -#: doc/guix.texi:24855 +#: doc/guix.texi:24841 msgid "Here we define a @dfn{service} as, broadly, something that extends the functionality of the operating system. Often a service is a process---a @dfn{daemon}---started when the system boots: a secure shell server, a Web server, the Guix build daemon, etc. Sometimes a service is a daemon whose execution can be triggered by another daemon---e.g., an FTP server started by @command{inetd} or a D-Bus service activated by @command{dbus-daemon}. Occasionally, a service does not map to a daemon. For instance, the ``account'' service collects user accounts and makes sure they exist when the system runs; the ``udev'' service collects device management rules and makes them available to the eudev daemon; the @file{/etc} service populates the @file{/etc} directory of the system." msgstr "Wir definieren hier einen @dfn{Dienst} (englisch „Service“) als, grob gesagt, etwas, das die Funktionalität des Betriebssystems erweitert. Oft ist ein Dienst ein Prozess — ein sogenannter @dfn{Daemon} —, der beim Hochfahren des Systems gestartet wird: ein Secure-Shell-Server, ein Web-Server, der Guix-Erstellungsdaemon usw. Manchmal ist ein Dienst ein Daemon, dessen Ausführung von einem anderen Daemon ausgelöst wird — zum Beispiel wird ein FTP-Server von @command{inetd} gestartet oder ein D-Bus-Dienst durch @command{dbus-daemon} aktiviert. Manchmal entspricht ein Dienst aber auch keinem Daemon. Zum Beispiel nimmt sich der Benutzerkonten-Dienst („account service“) die Benutzerkonten und sorgt dafür, dass sie existieren, wenn das System läuft. Der „udev“-Dienst sammelt die Regeln zur Geräteverwaltung an und macht diese für den eudev-Daemon verfügbar. Der @file{/etc}-Dienst fügt Dateien in das Verzeichnis @file{/etc} des Systems ein." #. type: cindex -#: doc/guix.texi:24856 +#: doc/guix.texi:24842 #, no-wrap msgid "service extensions" msgstr "Diensterweiterungen" #. type: Plain text -#: doc/guix.texi:24868 +#: doc/guix.texi:24854 msgid "Guix system services are connected by @dfn{extensions}. For instance, the secure shell service @emph{extends} the Shepherd---the initialization system, running as PID@tie{}1---by giving it the command lines to start and stop the secure shell daemon (@pxref{Networking Services, @code{openssh-service-type}}); the UPower service extends the D-Bus service by passing it its @file{.service} specification, and extends the udev service by passing it device management rules (@pxref{Desktop Services, @code{upower-service}}); the Guix daemon service extends the Shepherd by passing it the command lines to start and stop the daemon, and extends the account service by passing it a list of required build user accounts (@pxref{Base Services})." msgstr "Dienste des Guix-Systems werden durch @dfn{Erweiterungen} („Extensions“) miteinander verbunden. Zum Beispiel @emph{erweitert} der Secure-Shell-Dienst den Shepherd — Shepherd ist das Initialisierungssystem (auch „init“-System genannt), was als PID@tie{}1 läuft —, indem es ihm die Befehlszeilen zum Starten und Stoppen des Secure-Shell-Daemons übergibt (siehe @ref{Networking Services, @code{openssh-service-type}}). Der UPower-Dienst erweitert den D-Bus-Dienst, indem es ihm seine @file{.service}-Spezifikation übergibt, und erweitert den udev-Dienst, indem es ihm Geräteverwaltungsregeln übergibt (siehe @ref{Desktop Services, @code{upower-service}}). Der Guix-Daemon-Dienst erweitert den Shepherd, indem er ihm die Befehlszeilen zum Starten und Stoppen des Daemons übergibt, und er erweitert den Benutzerkontendienst („account service“), indem er ihm eine Liste der benötigten Erstellungsbenutzerkonten übergibt (siehe @ref{Base Services})." #. type: Plain text -#: doc/guix.texi:24872 +#: doc/guix.texi:24858 msgid "All in all, services and their ``extends'' relations form a directed acyclic graph (DAG). If we represent services as boxes and extensions as arrows, a typical system might provide something like this:" msgstr "Alles in allem bilden Dienste und ihre „Erweitert“-Relationen einen gerichteten azyklischen Graphen (englisch „Directed Acyclic Graph“, kurz DAG). Wenn wir Dienste als Kästen und Erweiterungen als Pfeile darstellen, könnte ein typisches System so etwas hier anbieten:" #. type: Plain text -#: doc/guix.texi:24874 +#: doc/guix.texi:24860 msgid "@image{images/service-graph,,5in,Typical service extension graph.}" msgstr "@image{images/service-graph,,5in,Typischer Diensterweiterungsgraph}" #. type: cindex -#: doc/guix.texi:24875 +#: doc/guix.texi:24861 #, no-wrap msgid "system service" msgstr "Systemdienst" #. type: Plain text -#: doc/guix.texi:24883 +#: doc/guix.texi:24869 msgid "At the bottom, we see the @dfn{system service}, which produces the directory containing everything to run and boot the system, as returned by the @command{guix system build} command. @xref{Service Reference}, to learn about the other service types shown here. @xref{system-extension-graph, the @command{guix system extension-graph} command}, for information on how to generate this representation for a particular operating system definition." msgstr "Ganz unten sehen wir den @dfn{Systemdienst}, der das Verzeichnis erzeugt, in dem alles zum Ausführen und Hochfahren enthalten ist, so wie es der Befehl @command{guix system build} liefert. Siehe @ref{Service Reference}, um mehr über die anderen hier gezeigten Diensttypen zu erfahren. Beim @ref{system-extension-graph, Befehl @command{guix system extension-graph}} finden Sie Informationen darüber, wie Sie diese Darstellung für eine Betriebssystemdefinition Ihrer Wahl generieren lassen." #. type: cindex -#: doc/guix.texi:24884 +#: doc/guix.texi:24870 #, no-wrap msgid "service types" msgstr "Diensttypen" #. type: Plain text -#: doc/guix.texi:24890 +#: doc/guix.texi:24876 msgid "Technically, developers can define @dfn{service types} to express these relations. There can be any number of services of a given type on the system---for instance, a system running two instances of the GNU secure shell server (lsh) has two instances of @code{lsh-service-type}, with different parameters." msgstr "Technisch funktioniert es so, dass Entwickler @dfn{Diensttypen} definieren können, um diese Beziehungen auszudrücken. Im System kann es beliebig viele Dienste zu jedem Typ geben — zum Beispiel können auf einem System zwei Instanzen des GNU-Secure-Shell-Servers (lsh) laufen, mit zwei Instanzen des Diensttyps @code{lsh-service-type} mit je unterschiedlichen Parametern." #. type: Plain text -#: doc/guix.texi:24893 +#: doc/guix.texi:24879 msgid "The following section describes the programming interface for service types and services." msgstr "Der folgende Abschnitt beschreibt die Programmierschnittstelle für Diensttypen und Dienste." #. type: Plain text -#: doc/guix.texi:24900 +#: doc/guix.texi:24886 msgid "A @dfn{service type} is a node in the DAG described above. Let us start with a simple example, the service type for the Guix build daemon (@pxref{Invoking guix-daemon}):" msgstr "Ein @dfn{Diensttyp} („service type“) ist ein Knoten im oben beschriebenen ungerichteten azyklischen Graphen (DAG). Fangen wir an mit einem einfachen Beispiel: dem Diensttyp für den Guix-Erstellungsdaemon (siehe @ref{Invoking guix-daemon}):" #. type: example -#: doc/guix.texi:24910 +#: doc/guix.texi:24896 #, no-wrap msgid "" "(define guix-service-type\n" @@ -45514,75 +45741,75 @@ msgstr "" " (default-value (guix-configuration))))\n" #. type: Plain text -#: doc/guix.texi:24914 +#: doc/guix.texi:24900 msgid "It defines three things:" msgstr "Damit sind drei Dinge definiert:" #. type: enumerate -#: doc/guix.texi:24918 +#: doc/guix.texi:24904 msgid "A name, whose sole purpose is to make inspection and debugging easier." msgstr "Ein Name, der nur dazu da ist, dass man leichter die Abläufe verstehen und Fehler suchen kann." #. type: enumerate -#: doc/guix.texi:24923 +#: doc/guix.texi:24909 msgid "A list of @dfn{service extensions}, where each extension designates the target service type and a procedure that, given the parameters of the service, returns a list of objects to extend the service of that type." msgstr "Eine Liste von @dfn{Diensterweiterungen} („service extensions“). Jede Erweiterung gibt den Ziel-Diensttyp an sowie eine Prozedur, die für gegebene Parameter für den Dienst eine Liste von Objekten zurückliefert, um den Dienst dieses Typs zu erweitern." #. type: enumerate -#: doc/guix.texi:24926 +#: doc/guix.texi:24912 msgid "Every service type has at least one service extension. The only exception is the @dfn{boot service type}, which is the ultimate service." msgstr "Jeder Diensttyp benutzt mindestens eine Diensterweiterung. Die einzige Ausnahme ist der @dfn{boot service type}, der die Grundlage aller Dienste ist." #. type: enumerate -#: doc/guix.texi:24929 +#: doc/guix.texi:24915 msgid "Optionally, a default value for instances of this type." msgstr "Optional kann ein Vorgabewert für Instanzen dieses Typs angegeben werden." #. type: Plain text -#: doc/guix.texi:24932 +#: doc/guix.texi:24918 msgid "In this example, @code{guix-service-type} extends three services:" msgstr "In diesem Beispiel werden durch @code{guix-service-type} drei Dienste erweitert:" #. type: item -#: doc/guix.texi:24934 +#: doc/guix.texi:24920 #, no-wrap msgid "shepherd-root-service-type" msgstr "shepherd-root-service-type" #. type: table -#: doc/guix.texi:24939 +#: doc/guix.texi:24925 msgid "The @code{guix-shepherd-service} procedure defines how the Shepherd service is extended. Namely, it returns a @code{} object that defines how @command{guix-daemon} is started and stopped (@pxref{Shepherd Services})." msgstr "Die Prozedur @code{guix-shepherd-service} definiert, wie der Shepherd-Dienst erweitert wird, und zwar liefert sie ein @code{}-Objekt, womit definiert wird, wie der @command{guix-daemon} gestartet und gestoppt werden kann (siehe @ref{Shepherd Services})." #. type: item -#: doc/guix.texi:24940 +#: doc/guix.texi:24926 #, no-wrap msgid "account-service-type" msgstr "account-service-type" #. type: table -#: doc/guix.texi:24945 +#: doc/guix.texi:24931 msgid "This extension for this service is computed by @code{guix-accounts}, which returns a list of @code{user-group} and @code{user-account} objects representing the build user accounts (@pxref{Invoking guix-daemon})." msgstr "Diese Erweiterung des Dienstes wird durch @code{guix-accounts} berechnet, eine Prozedur, die eine Liste von @code{user-group}- und @code{user-account}-Objekten liefert, die die Erstellungsbenutzerkonten repräsentieren (siehe @ref{Invoking guix-daemon})." #. type: item -#: doc/guix.texi:24946 +#: doc/guix.texi:24932 #, no-wrap msgid "activation-service-type" msgstr "activation-service-type" #. type: table -#: doc/guix.texi:24950 +#: doc/guix.texi:24936 msgid "Here @code{guix-activation} is a procedure that returns a gexp, which is a code snippet to run at ``activation time''---e.g., when the service is booted." msgstr "Hier ist @code{guix-activation} eine Prozedur, die einen G-Ausdruck liefert. Dieser ist ein Code-Schnipsel, das zur „Aktivierungszeit“ ausgeführt werden soll — z.B.@: wenn der Dienst hochgefahren wird." #. type: Plain text -#: doc/guix.texi:24953 +#: doc/guix.texi:24939 msgid "A service of this type is instantiated like this:" msgstr "Ein Dienst dieses Typs wird dann so instanziiert:" #. type: example -#: doc/guix.texi:24959 +#: doc/guix.texi:24945 #, no-wrap msgid "" "(service guix-service-type\n" @@ -45596,28 +45823,28 @@ msgstr "" " (use-substitutes? #f)))\n" #. type: Plain text -#: doc/guix.texi:24967 +#: doc/guix.texi:24953 msgid "The second argument to the @code{service} form is a value representing the parameters of this specific service instance. @xref{guix-configuration-type, @code{guix-configuration}}, for information about the @code{guix-configuration} data type. When the value is omitted, the default value specified by @code{guix-service-type} is used:" msgstr "Das zweite Argument an die @code{service}-Form ist ein Wert, der die Parameter dieser bestimmten Dienstinstanz repräsentiert. Siehe @ref{guix-configuration-type, @code{guix-configuration}} für Informationen über den @code{guix-configuration}-Datentyp. Wird kein Wert angegeben, wird die Vorgabe verwendet, die im @code{guix-service-type} angegeben wurde:" #. type: example -#: doc/guix.texi:24970 +#: doc/guix.texi:24956 #, no-wrap msgid "(service guix-service-type)\n" msgstr "(service guix-service-type)\n" #. type: Plain text -#: doc/guix.texi:24974 +#: doc/guix.texi:24960 msgid "@code{guix-service-type} is quite simple because it extends other services but is not extensible itself." msgstr "@code{guix-service-type} ist ziemlich einfach, weil es andere Dienste erweitert, aber selbst nicht erweitert werden kann." #. type: Plain text -#: doc/guix.texi:24978 +#: doc/guix.texi:24964 msgid "The service type for an @emph{extensible} service looks like this:" msgstr "Der Diensttyp eines @emph{erweiterbaren} Dienstes sieht ungefähr so aus:" #. type: example -#: doc/guix.texi:24985 +#: doc/guix.texi:24971 #, no-wrap msgid "" "(define udev-service-type\n" @@ -45635,7 +45862,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:24993 +#: doc/guix.texi:24979 #, no-wrap msgid "" " (compose concatenate) ;concatenate the list of rules\n" @@ -45655,96 +45882,96 @@ msgstr "" " (rules (append initial-rules rules)))))))))\n" #. type: Plain text -#: doc/guix.texi:24999 +#: doc/guix.texi:24985 msgid "This is the service type for the @uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device management daemon}. Compared to the previous example, in addition to an extension of @code{shepherd-root-service-type}, we see two new fields:" msgstr "Dies ist der Diensttyp für den @uref{https://wiki.gentoo.org/wiki/Project:Eudev, Geräteverwaltungsdaemon eudev}. Verglichen mit dem vorherigen Beispiel sehen wir neben einer Erweiterung des @code{shepherd-root-service-type} auch zwei neue Felder." #. type: item -#: doc/guix.texi:25001 +#: doc/guix.texi:24987 #, no-wrap msgid "compose" msgstr "compose" #. type: table -#: doc/guix.texi:25004 +#: doc/guix.texi:24990 msgid "This is the procedure to @dfn{compose} the list of extensions to services of this type." msgstr "Die Prozedur, um die Liste der jeweiligen Erweiterungen für den Dienst dieses Typs zu einem Objekt zusammenzustellen (zu „komponieren“, englisch @dfn{compose})." #. type: table -#: doc/guix.texi:25007 +#: doc/guix.texi:24993 msgid "Services can extend the udev service by passing it lists of rules; we compose those extensions simply by concatenating them." msgstr "Dienste können den udev-Dienst erweitern, indem sie eine Liste von Regeln („Rules“) an ihn übergeben; wir komponieren mehrere solche Erweiterungen, indem wir die Listen einfach zusammenfügen." #. type: item -#: doc/guix.texi:25008 +#: doc/guix.texi:24994 #, no-wrap msgid "extend" msgstr "extend" #. type: table -#: doc/guix.texi:25011 +#: doc/guix.texi:24997 msgid "This procedure defines how the value of the service is @dfn{extended} with the composition of the extensions." msgstr "Diese Prozedur definiert, wie der Wert des Dienstes um die Komposition mit Erweiterungen erweitert („extended“) werden kann." #. type: table -#: doc/guix.texi:25016 +#: doc/guix.texi:25002 msgid "Udev extensions are composed into a list of rules, but the udev service value is itself a @code{} record. So here, we extend that record by appending the list of rules it contains to the list of contributed rules." msgstr "Udev-Erweiterungen werden zu einer einzigen Liste von Regeln komponiert, aber der Wert des udev-Dienstes ist ein @code{}-Verbundsobjekt. Deshalb erweitern wir diesen Verbund, indem wir die Liste der von Erweiterungen beigetragenen Regeln an die im Verbund gespeicherte Liste der Regeln anhängen." #. type: table -#: doc/guix.texi:25022 +#: doc/guix.texi:25008 msgid "This is a string giving an overview of the service type. The string can contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}). The @command{guix system search} command searches these strings and displays them (@pxref{Invoking guix system})." msgstr "Diese Zeichenkette gibt einen Überblick über den Systemtyp. Die Zeichenkette darf mit Texinfo ausgezeichnet werden (siehe @ref{Overview,,, texinfo, GNU Texinfo}). Der Befehl @command{guix system search} durchsucht diese Zeichenketten und zeigt sie an (siehe @ref{Invoking guix system})." #. type: Plain text -#: doc/guix.texi:25027 +#: doc/guix.texi:25013 msgid "There can be only one instance of an extensible service type such as @code{udev-service-type}. If there were more, the @code{service-extension} specifications would be ambiguous." msgstr "Es kann nur eine Instanz eines erweiterbaren Diensttyps wie @code{udev-service-type} geben. Wenn es mehrere gäbe, wäre es mehrdeutig, welcher Dienst durch die @code{service-extension} erweitert werden soll." #. type: Plain text -#: doc/guix.texi:25030 +#: doc/guix.texi:25016 msgid "Still here? The next section provides a reference of the programming interface for services." msgstr "Sind Sie noch da? Der nächste Abschnitt gibt Ihnen eine Referenz der Programmierschnittstelle für Dienste." #. type: Plain text -#: doc/guix.texi:25038 +#: doc/guix.texi:25024 msgid "We have seen an overview of service types (@pxref{Service Types and Services}). This section provides a reference on how to manipulate services and service types. This interface is provided by the @code{(gnu services)} module." msgstr "Wir haben bereits einen Überblick über Diensttypen gesehen (siehe @ref{Service Types and Services}). Dieser Abschnitt hier stellt eine Referenz dar, wie Dienste und Diensttypen manipuliert werden können. Diese Schnittstelle wird vom Modul @code{(gnu services)} angeboten." #. type: deffn -#: doc/guix.texi:25039 +#: doc/guix.texi:25025 #, no-wrap msgid "{Scheme Procedure} service @var{type} [@var{value}]" msgstr "{Scheme-Prozedur} service @var{Typ} [@var{Wert}]" #. type: deffn -#: doc/guix.texi:25043 +#: doc/guix.texi:25029 msgid "Return a new service of @var{type}, a @code{} object (see below.) @var{value} can be any object; it represents the parameters of this particular service instance." msgstr "Liefert einen neuen Dienst des angegebenen @var{Typ}s. Der @var{Typ} muss als @code{}-Objekt angegeben werden (siehe unten). Als @var{Wert} kann ein beliebiges Objekt angegeben werden, das die Parameter dieser bestimmten Instanz dieses Dienstes repräsentiert." #. type: deffn -#: doc/guix.texi:25047 +#: doc/guix.texi:25033 msgid "When @var{value} is omitted, the default value specified by @var{type} is used; if @var{type} does not specify a default value, an error is raised." msgstr "Wenn kein @var{Wert} angegeben wird, wird der vom @var{Typ} festgelegte Vorgabewert verwendet; verfügt der @var{Typ} über keinen Vorgabewert, dann wird ein Fehler gemeldet." #. type: deffn -#: doc/guix.texi:25049 +#: doc/guix.texi:25035 msgid "For instance, this:" msgstr "Zum Beispiel bewirken Sie hiermit:" #. type: example -#: doc/guix.texi:25052 +#: doc/guix.texi:25038 #, no-wrap msgid "(service openssh-service-type)\n" msgstr "(service openssh-service-type)\n" #. type: deffn -#: doc/guix.texi:25056 +#: doc/guix.texi:25042 msgid "is equivalent to this:" msgstr "dasselbe wie mit:" #. type: example -#: doc/guix.texi:25060 +#: doc/guix.texi:25046 #, no-wrap msgid "" "(service openssh-service-type\n" @@ -45754,50 +45981,50 @@ msgstr "" " (openssh-configuration))\n" #. type: deffn -#: doc/guix.texi:25064 +#: doc/guix.texi:25050 msgid "In both cases the result is an instance of @code{openssh-service-type} with the default configuration." msgstr "In beiden Fällen ist das Ergebnis eine Instanz von @code{openssh-service-type} mit der vorgegebenen Konfiguration." #. type: deffn -#: doc/guix.texi:25066 +#: doc/guix.texi:25052 #, no-wrap msgid "{Scheme Procedure} service? @var{obj}" msgstr "{Scheme-Prozedur} service? @var{Objekt}" #. type: deffn -#: doc/guix.texi:25068 +#: doc/guix.texi:25054 msgid "Return true if @var{obj} is a service." msgstr "Liefert wahr zurück, wenn das @var{Objekt} ein Dienst ist." #. type: deffn -#: doc/guix.texi:25070 +#: doc/guix.texi:25056 #, no-wrap msgid "{Scheme Procedure} service-kind @var{service}" msgstr "{Scheme-Prozedur} service-kind @var{Dienst}" #. type: deffn -#: doc/guix.texi:25072 +#: doc/guix.texi:25058 msgid "Return the type of @var{service}---i.e., a @code{} object." msgstr "Liefert den Typ des @var{Dienst}es — d.h.@: ein @code{}-Objekt." #. type: deffn -#: doc/guix.texi:25074 +#: doc/guix.texi:25060 #, no-wrap msgid "{Scheme Procedure} service-value @var{service}" msgstr "{Scheme-Prozedur} service-value @var{Dienst}" #. type: deffn -#: doc/guix.texi:25077 +#: doc/guix.texi:25063 msgid "Return the value associated with @var{service}. It represents its parameters." msgstr "Liefert den Wert, der mit dem @var{Dienst} assoziiert wurde. Er repräsentiert die Parameter des @var{Dienst}es." #. type: Plain text -#: doc/guix.texi:25080 +#: doc/guix.texi:25066 msgid "Here is an example of how a service is created and manipulated:" msgstr "Hier ist ein Beispiel, wie ein Dienst erzeugt und manipuliert werden kann:" #. type: example -#: doc/guix.texi:25089 +#: doc/guix.texi:25075 #, no-wrap msgid "" "(define s\n" @@ -45819,7 +46046,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:25092 +#: doc/guix.texi:25078 #, no-wrap msgid "" "(service? s)\n" @@ -45831,7 +46058,7 @@ msgstr "" "\n" #. type: example -#: doc/guix.texi:25095 +#: doc/guix.texi:25081 #, no-wrap msgid "" "(eq? (service-kind s) nginx-service-type)\n" @@ -45841,167 +46068,167 @@ msgstr "" "@result{} #t\n" #. type: Plain text -#: doc/guix.texi:25105 +#: doc/guix.texi:25091 msgid "The @code{modify-services} form provides a handy way to change the parameters of some of the services of a list such as @code{%base-services} (@pxref{Base Services, @code{%base-services}}). It evaluates to a list of services. Of course, you could always use standard list combinators such as @code{map} and @code{fold} to do that (@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual}); @code{modify-services} simply provides a more concise form for this common pattern." msgstr "Die Form @code{modify-services} ist eine nützliche Methode, die Parameter von einigen der Dienste aus einer Liste wie @code{%base-services} abzuändern (siehe @ref{Base Services, @code{%base-services}}). Sie wird zu einer Liste von Diensten ausgewertet. Natürlich können Sie dazu auch die üblichen Listenkombinatoren wie @code{map} und @code{fold} benutzen (siehe @ref{SRFI-1, List Library,, guile, GNU Guile Reference Manual}), @code{modify-services} soll dieses häufig benutzte Muster lediglich durch eine knappere Syntax unterstützen." #. type: deffn -#: doc/guix.texi:25106 +#: doc/guix.texi:25092 #, no-wrap msgid "{Scheme Syntax} modify-services @var{services} @" msgstr "{Scheme-Syntax} modify-services @var{Dienste} @" #. type: deffn -#: doc/guix.texi:25108 +#: doc/guix.texi:25094 msgid "(@var{type} @var{variable} => @var{body}) @dots{}" msgstr "(@var{Typ} @var{Variable} => @var{Rumpf}) …" #. type: deffn -#: doc/guix.texi:25111 +#: doc/guix.texi:25097 msgid "Modify the services listed in @var{services} according to the given clauses. Each clause has the form:" msgstr "Passt die von @var{Dienste} bezeichnete Dienst-Liste entsprechend den angegebenen Klauseln an. Jede Klausel hat die Form:" #. type: example -#: doc/guix.texi:25114 +#: doc/guix.texi:25100 #, no-wrap msgid "(@var{type} @var{variable} => @var{body})\n" msgstr "(@var{Typ} @var{Variable} => @var{Rumpf})\n" #. type: deffn -#: doc/guix.texi:25121 +#: doc/guix.texi:25107 msgid "where @var{type} is a service type---e.g., @code{guix-service-type}---and @var{variable} is an identifier that is bound within the @var{body} to the service parameters---e.g., a @code{guix-configuration} instance---of the original service of that @var{type}." msgstr "wobei @var{Typ} einen Diensttyp („service type“) bezeichnet — wie zum Beispiel @code{guix-service-type} — und @var{Variable} ein Bezeichner ist, der im @var{Rumpf} an die Dienst-Parameter — z.B.@: eine @code{guix-configuration}-Instanz — des ursprünglichen Dienstes mit diesem @var{Typ} gebunden wird." #. type: deffn -#: doc/guix.texi:25128 +#: doc/guix.texi:25114 msgid "The @var{body} should evaluate to the new service parameters, which will be used to configure the new service. This new service will replace the original in the resulting list. Because a service's service parameters are created using @code{define-record-type*}, you can write a succinct @var{body} that evaluates to the new service parameters by using the @code{inherit} feature that @code{define-record-type*} provides." msgstr "Der @var{Rumpf} muss zu den neuen Dienst-Parametern ausgewertet werden, welche benutzt werden, um den neuen Dienst zu konfigurieren. Dieser neue Dienst wird das Original in der resultierenden Liste ersetzen. Weil die Dienstparameter eines Dienstes mit @code{define-record-type*} erzeugt werden, können Sie einen kurzen @var{Rumpf} schreiben, der zu den neuen Dienstparametern ausgewertet wird, indem Sie die Funktionalität namens @code{inherit} benutzen, die von @code{define-record-type*} bereitgestellt wird." #. type: deffn -#: doc/guix.texi:25130 +#: doc/guix.texi:25116 msgid "@xref{Using the Configuration System}, for example usage." msgstr "Siehe @ref{Using the Configuration System} für ein Anwendungsbeispiel." #. type: Plain text -#: doc/guix.texi:25137 +#: doc/guix.texi:25123 msgid "Next comes the programming interface for service types. This is something you want to know when writing new service definitions, but not necessarily when simply looking for ways to customize your @code{operating-system} declaration." msgstr "Als Nächstes ist die Programmierschnittstelle für Diensttypen an der Reihe. Sie ist etwas, was Sie kennen werden wollen, wenn Sie neue Dienstdefinitionen schreiben, aber wenn Sie nur Ihre @code{operating-system}-Deklaration anpassen möchten, brauchen Sie diese Schnittstelle wahrscheinlich nicht." #. type: deftp -#: doc/guix.texi:25138 +#: doc/guix.texi:25124 #, no-wrap msgid "{Data Type} service-type" msgstr "{Datentyp} service-type" #. type: cindex -#: doc/guix.texi:25139 +#: doc/guix.texi:25125 #, no-wrap msgid "service type" msgstr "Diensttyp" #. type: deftp -#: doc/guix.texi:25142 +#: doc/guix.texi:25128 msgid "This is the representation of a @dfn{service type} (@pxref{Service Types and Services})." msgstr "Die Repräsentation eines @dfn{Diensttypen} (siehe @ref{Service Types and Services})." #. type: table -#: doc/guix.texi:25146 +#: doc/guix.texi:25132 msgid "This is a symbol, used only to simplify inspection and debugging." msgstr "Dieses Symbol wird nur verwendet, um die Abläufe im System anzuzeigen und die Fehlersuche zu erleichtern." #. type: code{#1} -#: doc/guix.texi:25147 +#: doc/guix.texi:25133 #, no-wrap msgid "extensions" msgstr "extensions" #. type: table -#: doc/guix.texi:25149 +#: doc/guix.texi:25135 msgid "A non-empty list of @code{} objects (see below)." msgstr "Eine nicht-leere Liste von @code{}-Objekten (siehe unten)." #. type: item -#: doc/guix.texi:25150 +#: doc/guix.texi:25136 #, no-wrap msgid "@code{compose} (default: @code{#f})" msgstr "@code{compose} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:25154 +#: doc/guix.texi:25140 msgid "If this is @code{#f}, then the service type denotes services that cannot be extended---i.e., services that do not receive ``values'' from other services." msgstr "Wenn es auf @code{#f} gesetzt ist, dann definiert der Diensttyp Dienste, die nicht erweitert werden können — d.h.@: diese Dienste erhalten ihren Wert nicht von anderen Diensten." #. type: table -#: doc/guix.texi:25158 +#: doc/guix.texi:25144 msgid "Otherwise, it must be a one-argument procedure. The procedure is called by @code{fold-services} and is passed a list of values collected from extensions. It may return any single value." msgstr "Andernfalls muss es eine Prozedur sein, die ein einziges Argument entgegennimmt. Die Prozedur wird durch @code{fold-services} aufgerufen und ihr wird die Liste von aus den Erweiterungen angesammelten Werten übergeben. Sie gibt daraufhin einen einzelnen Wert zurück." #. type: item -#: doc/guix.texi:25159 +#: doc/guix.texi:25145 #, no-wrap msgid "@code{extend} (default: @code{#f})" msgstr "@code{extend} (Vorgabe: @code{#f})" #. type: table -#: doc/guix.texi:25161 +#: doc/guix.texi:25147 msgid "If this is @code{#f}, services of this type cannot be extended." msgstr "Ist dies auf @code{#f} gesetzt, dann können Dienste dieses Typs nicht erweitert werden." #. type: table -#: doc/guix.texi:25167 +#: doc/guix.texi:25153 msgid "Otherwise, it must be a two-argument procedure: @code{fold-services} calls it, passing it the initial value of the service as the first argument and the result of applying @code{compose} to the extension values as the second argument. It must return a value that is a valid parameter value for the service instance." msgstr "Andernfalls muss es eine zwei Argumente nehmende Prozedur sein, die von @code{fold-services} mit dem anfänglichen Wert für den Dienst als erstes Argument und dem durch Anwendung von @code{compose} gelieferten Wert als zweites Argument aufgerufen wird. Als Ergebnis muss ein Wert geliefert werden, der einen zulässigen neuen Parameterwert für die Dienstinstanz darstellt." #. type: deftp -#: doc/guix.texi:25170 +#: doc/guix.texi:25156 msgid "@xref{Service Types and Services}, for examples." msgstr "Siehe den Abschnitt @ref{Service Types and Services} für Beispiele." #. type: deffn -#: doc/guix.texi:25172 +#: doc/guix.texi:25158 #, no-wrap msgid "{Scheme Procedure} service-extension @var{target-type} @" msgstr "{Scheme-Prozedur} service-extension @var{Zieltyp} @" #. type: deffn -#: doc/guix.texi:25178 +#: doc/guix.texi:25164 msgid "@var{compute} Return a new extension for services of type @var{target-type}. @var{compute} must be a one-argument procedure: @code{fold-services} calls it, passing it the value associated with the service that provides the extension; it must return a valid value for the target service." msgstr "@var{Berechner} Liefert eine neue Erweiterung für den Dienst mit dem @var{Zieltyp}. Als @var{Berechner} muss eine Prozedur angegeben werden, die ein einzelnes Argument nimmt: @code{fold-services} ruft sie auf und übergibt an sie den Wert des erweiternden Dienstes, sie muss dafür einen zulässigen Wert für den @var{Zieltyp} liefern." #. type: deffn -#: doc/guix.texi:25180 +#: doc/guix.texi:25166 #, no-wrap msgid "{Scheme Procedure} service-extension? @var{obj}" msgstr "{Scheme-Prozedur} service-extension? @var{Objekt}" #. type: deffn -#: doc/guix.texi:25182 +#: doc/guix.texi:25168 msgid "Return true if @var{obj} is a service extension." msgstr "Liefert wahr zurück, wenn das @var{Objekt} eine Diensterweiterung ist." #. type: Plain text -#: doc/guix.texi:25188 +#: doc/guix.texi:25174 msgid "Occasionally, you might want to simply extend an existing service. This involves creating a new service type and specifying the extension of interest, which can be verbose; the @code{simple-service} procedure provides a shorthand for this." msgstr "Manchmal wollen Sie vielleicht einfach nur einen bestehenden Dienst erweitern. Dazu müssten Sie einen neuen Diensttyp definieren und die Erweiterung definieren, für die Sie sich interessieren, was ganz schön wortreich werden kann. Mit der Prozedur @code{simple-service} können Sie es kürzer fassen." #. type: deffn -#: doc/guix.texi:25189 +#: doc/guix.texi:25175 #, no-wrap msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}" msgstr "{Scheme-Prozedur} simple-service @var{Name} @var{Zieltyp} @var{Wert}" #. type: deffn -#: doc/guix.texi:25193 +#: doc/guix.texi:25179 msgid "Return a service that extends @var{target} with @var{value}. This works by creating a singleton service type @var{name}, of which the returned service is an instance." msgstr "Liefert einen Dienst, der den Dienst mit dem @var{Zieltyp} um den @var{Wert} erweitert. Dazu wird ein Diensttyp mit dem @var{Name}n für den einmaligen Gebrauch erzeugt, den der zurückgelieferte Dienst instanziiert." #. type: deffn -#: doc/guix.texi:25196 +#: doc/guix.texi:25182 msgid "For example, this extends mcron (@pxref{Scheduled Job Execution}) with an additional job:" msgstr "Zum Beispiel kann mcron (siehe @ref{Scheduled Job Execution}) so um einen zusätzlichen Auftrag erweitert werden:" #. type: example -#: doc/guix.texi:25200 +#: doc/guix.texi:25186 #, no-wrap msgid "" "(simple-service 'my-mcron-job mcron-service-type\n" @@ -46011,318 +46238,308 @@ msgstr "" " #~(job '(next-hour (3)) \"guix gc -F 2G\"))\n" #. type: Plain text -#: doc/guix.texi:25210 +#: doc/guix.texi:25196 msgid "At the core of the service abstraction lies the @code{fold-services} procedure, which is responsible for ``compiling'' a list of services down to a single directory that contains everything needed to boot and run the system---the directory shown by the @command{guix system build} command (@pxref{Invoking guix system}). In essence, it propagates service extensions down the service graph, updating each node parameters on the way, until it reaches the root node." msgstr "Den Kern dieses abstrakten Modells für Dienste bildet die Prozedur @code{fold-services}, die für das „Kompilieren“ einer Liste von Diensten hin zu einem einzelnen Verzeichnis verantwortlich ist, in welchem alles enthalten ist, was Sie zum Booten und Hochfahren des Systems brauchen — d.h.@: das Verzeichnis, das der Befehl @command{guix system build} anzeigt (siehe @ref{Invoking guix system}). Einfach ausgedrückt propagiert @code{fold-services} Diensterweiterungen durch den Dienstgraphen nach unten und aktualisiert dabei in jedem Knoten des Graphen dessen Parameter, bis nur noch der Wurzelknoten übrig bleibt." #. type: deffn -#: doc/guix.texi:25211 +#: doc/guix.texi:25197 #, no-wrap msgid "{Scheme Procedure} fold-services @var{services} @" msgstr "{Scheme-Prozedur} fold-services @var{Dienste} @" #. type: deffn -#: doc/guix.texi:25215 +#: doc/guix.texi:25201 msgid "[#:target-type @var{system-service-type}] Fold @var{services} by propagating their extensions down to the root of type @var{target-type}; return the root service adjusted accordingly." msgstr "[#:target-type @var{system-service-type}] Faltet die @var{Dienste} wie die funktionale Prozedur @code{fold} zu einem einzigen zusammen, indem ihre Erweiterungen nach unten propagiert werden, bis eine Wurzel vom @var{target-type} als Diensttyp erreicht wird; dieser so angepasste Wurzeldienst wird zurückgeliefert." #. type: Plain text -#: doc/guix.texi:25219 +#: doc/guix.texi:25205 msgid "Lastly, the @code{(gnu services)} module also defines several essential service types, some of which are listed below." msgstr "Als Letztes definiert das Modul @code{(gnu services)} noch mehrere essenzielle Diensttypen, von denen manche im Folgenden aufgelistet sind:" #. type: defvr -#: doc/guix.texi:25220 +#: doc/guix.texi:25206 #, no-wrap msgid "{Scheme Variable} system-service-type" msgstr "{Scheme-Variable} system-service-type" #. type: defvr -#: doc/guix.texi:25223 +#: doc/guix.texi:25209 msgid "This is the root of the service graph. It produces the system directory as returned by the @command{guix system build} command." msgstr "Die Wurzel des Dienstgraphen. Davon wird das Systemverzeichnis erzeugt, wie es vom Befehl @command{guix system build} zurückgeliefert wird." #. type: defvr -#: doc/guix.texi:25225 +#: doc/guix.texi:25211 #, no-wrap msgid "{Scheme Variable} boot-service-type" msgstr "{Scheme-Variable} boot-service-type" #. type: defvr -#: doc/guix.texi:25228 +#: doc/guix.texi:25214 msgid "The type of the ``boot service'', which produces the @dfn{boot script}. The boot script is what the initial RAM disk runs when booting." msgstr "Der Typ des „Boot-Dienstes“, der das @dfn{Boot-Skript} erzeugt. Das Boot-Skript ist das, was beim Booten durch die initiale RAM-Disk ausgeführt wird." #. type: defvr -#: doc/guix.texi:25230 +#: doc/guix.texi:25216 #, no-wrap msgid "{Scheme Variable} etc-service-type" msgstr "{Scheme-Variable} etc-service-type" #. type: defvr -#: doc/guix.texi:25234 +#: doc/guix.texi:25220 msgid "The type of the @file{/etc} service. This service is used to create files under @file{/etc} and can be extended by passing it name/file tuples such as:" msgstr "Der Typ des @file{/etc}-Dienstes. Dieser Dienst wird benutzt, um im @file{/etc}-Verzeichnis Dateien zu platzieren. Er kann erweitert werden, indem man Name-/Datei-Tupel an ihn übergibt wie in diesem Beispiel:" #. type: example -#: doc/guix.texi:25237 +#: doc/guix.texi:25223 #, no-wrap msgid "(list `(\"issue\" ,(plain-file \"issue\" \"Welcome!\\n\")))\n" msgstr "(list `(\"issue\" ,(plain-file \"issue\" \"Willkommen!\\n\")))\n" #. type: defvr -#: doc/guix.texi:25241 +#: doc/guix.texi:25227 msgid "In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file." msgstr "Dieses Beispiel würde bewirken, dass eine Datei @file{/etc/issue} auf die angegebene Datei verweist." #. type: defvr -#: doc/guix.texi:25243 +#: doc/guix.texi:25229 #, no-wrap msgid "{Scheme Variable} setuid-program-service-type" msgstr "{Scheme-Variable} setuid-program-service-type" #. type: defvr -#: doc/guix.texi:25247 +#: doc/guix.texi:25233 msgid "Type for the ``setuid-program service''. This service collects lists of executable file names, passed as gexps, and adds them to the set of setuid-root programs on the system (@pxref{Setuid Programs})." msgstr "Der Typ des Dienstes für setuid-Programme, der eine Liste von ausführbaren Dateien ansammelt, die jeweils als G-Ausdrücke übergeben werden und dann zur Menge der setuid-gesetzten Programme auf dem System hinzugefügt werden (siehe @ref{Setuid Programs})." #. type: defvr -#: doc/guix.texi:25249 +#: doc/guix.texi:25235 #, no-wrap msgid "{Scheme Variable} profile-service-type" msgstr "{Scheme-Variable} profile-service-type" #. type: defvr -#: doc/guix.texi:25253 +#: doc/guix.texi:25239 msgid "Type of the service that populates the @dfn{system profile}---i.e., the programs under @file{/run/current-system/profile}. Other services can extend it by passing it lists of packages to add to the system profile." msgstr "Der Typ des Dienstes zum Einfügen von Dateien ins @dfn{Systemprofil} — d.h.@: die Programme unter @file{/run/current-system/profile}. Andere Dienste können ihn erweitern, indem sie ihm Listen von ins Systemprofil zu installierenden Paketen übergeben." #. type: cindex -#: doc/guix.texi:25259 +#: doc/guix.texi:25245 #, no-wrap msgid "shepherd services" msgstr "Shepherd-Dienste" #. type: cindex -#: doc/guix.texi:25260 +#: doc/guix.texi:25246 #, no-wrap msgid "PID 1" msgstr "PID 1" #. type: cindex -#: doc/guix.texi:25261 +#: doc/guix.texi:25247 #, no-wrap msgid "init system" msgstr "init-System" #. type: Plain text -#: doc/guix.texi:25267 +#: doc/guix.texi:25253 msgid "The @code{(gnu services shepherd)} module provides a way to define services managed by the GNU@tie{}Shepherd, which is the initialization system---the first process that is started when the system boots, also known as PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual})." msgstr "Das Modul @code{(gnu services shepherd)} gibt eine Methode an, mit der Dienste definiert werden können, die von GNU@tie{}Shepherd verwaltet werden, was das Initialisierungssystem (das „init“-System) ist — es ist der erste Prozess, der gestartet wird, wenn das System gebootet wird, auch bekannt als PID@tie{}1 (siehe @ref{Introduction,,, shepherd, The GNU Shepherd Manual})." #. type: Plain text -#: doc/guix.texi:25273 +#: doc/guix.texi:25259 msgid "Services in the Shepherd can depend on each other. For instance, the SSH daemon may need to be started after the syslog daemon has been started, which in turn can only happen once all the file systems have been mounted. The simple operating system defined earlier (@pxref{Using the Configuration System}) results in a service graph like this:" msgstr "Dienste unter dem Shepherd können voneinander abhängen. Zum Beispiel kann es sein, dass der SSH-Daemon erst gestartet werden darf, nachdem der Syslog-Daemon gestartet wurde, welcher wiederum erst gestartet werden kann, sobald alle Dateisysteme eingebunden wurden. Das einfache Betriebssystem, dessen Definition wir zuvor gesehen haben (siehe @ref{Using the Configuration System}), ergibt folgenden Dienstgraphen:" #. type: Plain text -#: doc/guix.texi:25275 +#: doc/guix.texi:25261 msgid "@image{images/shepherd-graph,,5in,Typical shepherd service graph.}" msgstr "@image{images/shepherd-graph,,5in,Typischer Shepherd-Dienstgraph}" #. type: Plain text -#: doc/guix.texi:25279 +#: doc/guix.texi:25265 msgid "You can actually generate such a graph for any operating system definition using the @command{guix system shepherd-graph} command (@pxref{system-shepherd-graph, @command{guix system shepherd-graph}})." msgstr "Sie können so einen Graphen tatsächlich für jedes Betriebssystem erzeugen lassen, indem Sie den Befehl @command{guix system shepherd-graph} benutzen (siehe @ref{system-shepherd-graph, @command{guix system shepherd-graph}})." #. type: Plain text -#: doc/guix.texi:25283 +#: doc/guix.texi:25269 msgid "The @code{%shepherd-root-service} is a service object representing PID@tie{}1, of type @code{shepherd-root-service-type}; it can be extended by passing it lists of @code{} objects." msgstr "Der @code{%shepherd-root-service} ist ein Dienstobjekt, das diesen Prozess mit PID@tie{}1 repräsentiert. Der Dienst hat den Typ @code{shepherd-root-service-type}. Man kann ihn erweitern, indem man eine Liste von @code{}-Objekten an ihn übergibt." #. type: deftp -#: doc/guix.texi:25284 +#: doc/guix.texi:25270 #, no-wrap msgid "{Data Type} shepherd-service" msgstr "{Datentyp} shepherd-service" #. type: deftp -#: doc/guix.texi:25286 +#: doc/guix.texi:25272 msgid "The data type representing a service managed by the Shepherd." msgstr "Der Datentyp, der einen von Shepherd verwalteten Dienst repräsentiert." #. type: code{#1} -#: doc/guix.texi:25288 +#: doc/guix.texi:25274 #, no-wrap msgid "provision" msgstr "provision" #. type: table -#: doc/guix.texi:25290 +#: doc/guix.texi:25276 msgid "This is a list of symbols denoting what the service provides." msgstr "Diese Liste von Symbolen gibt an, was vom Dienst angeboten wird." #. type: table -#: doc/guix.texi:25295 +#: doc/guix.texi:25281 msgid "These are the names that may be passed to @command{herd start}, @command{herd status}, and similar commands (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual}). @xref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual}, for details." msgstr "Das bedeutet, es sind die Namen, die an @command{herd start}, @command{herd status} und ähnliche Befehle übergeben werden können (siehe @ref{Invoking herd,,, shepherd, The GNU Shepherd Manual}). Siehe @ref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual} für Details." #. type: item -#: doc/guix.texi:25296 -#, no-wrap -msgid "@code{requirement} (default: @code{'()})" +#: doc/guix.texi:25282 +#, fuzzy, no-wrap +#| msgid "@code{requirement} (default: @code{'()})" +msgid "@code{requirements} (default: @code{'()})" msgstr "@code{requirement} (Vorgabe: @code{'()})" #. type: table -#: doc/guix.texi:25298 +#: doc/guix.texi:25284 msgid "List of symbols denoting the Shepherd services this one depends on." msgstr "Eine Liste von Symbolen, die angegeben, von welchen anderen Shepherd-Diensten dieser hier abhängt." #. type: cindex -#: doc/guix.texi:25299 +#: doc/guix.texi:25285 #, no-wrap msgid "one-shot services, for the Shepherd" msgstr "einmalig ausgeführte Dienste, für Shepherd" #. type: table -#: doc/guix.texi:25304 +#: doc/guix.texi:25290 msgid "Whether this service is @dfn{one-shot}. One-shot services stop immediately after their @code{start} action has completed. @xref{Slots of services,,, shepherd, The GNU Shepherd Manual}, for more info." msgstr "Gibt an, ob dieser Dienst nur einmal ausgeführt wird („one-shot“). Einmalig ausgeführte Dienste werden gestoppt, sobald ihre @code{start}-Aktion abgeschlossen wurde. Siehe @ref{Slots of services,,, shepherd, The GNU Shepherd Manual} für weitere Informationen." #. type: item -#: doc/guix.texi:25305 +#: doc/guix.texi:25291 #, no-wrap msgid "@code{respawn?} (default: @code{#t})" msgstr "@code{respawn?} (Vorgabe: @code{#t})" #. type: table -#: doc/guix.texi:25308 +#: doc/guix.texi:25294 msgid "Whether to restart the service when it stops, for instance when the underlying process dies." msgstr "Ob der Dienst neu gestartet werden soll, nachdem er gestoppt wurde, zum Beispiel wenn der ihm zu Grunde liegende Prozess terminiert wird." #. type: code{#1} -#: doc/guix.texi:25309 +#: doc/guix.texi:25295 #, no-wrap msgid "start" msgstr "start" #. type: itemx -#: doc/guix.texi:25310 +#: doc/guix.texi:25296 #, no-wrap msgid "@code{stop} (default: @code{#~(const #f)})" msgstr "@code{stop} (Vorgabe: @code{#~(const #f)})" #. type: table -#: doc/guix.texi:25316 +#: doc/guix.texi:25302 msgid "The @code{start} and @code{stop} fields refer to the Shepherd's facilities to start and stop processes (@pxref{Service De- and Constructors,,, shepherd, The GNU Shepherd Manual}). They are given as G-expressions that get expanded in the Shepherd configuration file (@pxref{G-Expressions})." msgstr "Die Felder @code{start} und @code{stop} beziehen sich auf Shepherds Funktionen zum Starten und Stoppen von Prozessen (siehe @ref{Service De- and Constructors,,, shepherd, The GNU Shepherd Manual}). Sie enthalten G-Ausdrücke, die in eine Shepherd-Konfigurationdatei umgeschrieben werden (siehe @ref{G-Expressions})." #. type: item -#: doc/guix.texi:25317 +#: doc/guix.texi:25303 #, no-wrap msgid "@code{actions} (default: @code{'()})" msgstr "@code{actions} (Vorgabe: @code{'()})" #. type: cindex -#: doc/guix.texi:25318 +#: doc/guix.texi:25304 #, no-wrap msgid "actions, of Shepherd services" msgstr "Aktionen, bei Shepherd-Diensten" #. type: table -#: doc/guix.texi:25323 +#: doc/guix.texi:25309 msgid "This is a list of @code{shepherd-action} objects (see below) defining @dfn{actions} supported by the service, in addition to the standard @code{start} and @code{stop} actions. Actions listed here become available as @command{herd} sub-commands:" msgstr "Dies ist eine Liste von @code{shepherd-action}-Objekten (siehe unten), die vom Dienst zusätzlich unterstützte @dfn{Aktionen} neben den Standardaktionen @code{start} und @code{stop} angeben. Hier aufgeführte Aktionen werden als @command{herd}-Unterbefehle verfügbar gemacht:" #. type: example -#: doc/guix.texi:25326 +#: doc/guix.texi:25312 #, no-wrap msgid "herd @var{action} @var{service} [@var{arguments}@dots{}]\n" msgstr "herd @var{Aktion} @var{Dienst} [@var{Argumente}…]\n" -#. type: item -#: doc/guix.texi:25328 -#, no-wrap -msgid "@code{auto-start?} (default: @code{#t})" -msgstr "@code{auto-start?} (Vorgabe: @code{#t})" - #. type: table -#: doc/guix.texi:25331 -msgid "Whether this service should be started automatically by the Shepherd. If it is @code{#f} the service has to be started manually with @code{herd start}." -msgstr "Ob dieser Dienst automatisch durch Shepherd gestartet werden sollte. Wenn es auf @code{#f} steht, muss der Dienst manuell über @code{herd start} gestartet werden." - -#. type: table -#: doc/guix.texi:25334 +#: doc/guix.texi:25316 msgid "A documentation string, as shown when running:" msgstr "Eine Zeichenkette zur Dokumentation, die angezeigt wird, wenn man dies ausführt:" #. type: example -#: doc/guix.texi:25337 +#: doc/guix.texi:25319 #, no-wrap msgid "herd doc @var{service-name}\n" msgstr "herd doc @var{Dienstname}\n" #. type: table -#: doc/guix.texi:25341 +#: doc/guix.texi:25323 msgid "where @var{service-name} is one of the symbols in @code{provision} (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})." msgstr "wobei der @var{Dienstname} eines der Symbole aus der @code{provision}-Liste sein muss (siehe @ref{Invoking herd,,, shepherd, The GNU Shepherd Manual})." #. type: item -#: doc/guix.texi:25342 +#: doc/guix.texi:25324 #, no-wrap msgid "@code{modules} (default: @code{%default-modules})" msgstr "@code{modules} (Vorgabe: @code{%default-modules})" #. type: table -#: doc/guix.texi:25345 +#: doc/guix.texi:25327 msgid "This is the list of modules that must be in scope when @code{start} and @code{stop} are evaluated." msgstr "Dies ist die Liste der Module, die in den Sichtbarkeitsbereich geladen sein müssen, wenn @code{start} und @code{stop} ausgewertet werden." #. type: deftp -#: doc/guix.texi:25349 +#: doc/guix.texi:25331 #, no-wrap msgid "{Data Type} shepherd-action" msgstr "{Datentyp} shepherd-action" #. type: deftp -#: doc/guix.texi:25352 +#: doc/guix.texi:25334 msgid "This is the data type that defines additional actions implemented by a Shepherd service (see above)." msgstr "Dieser Datentyp definiert zusätzliche Aktionen, die ein Shepherd-Dienst implementiert (siehe oben)." #. type: table -#: doc/guix.texi:25356 +#: doc/guix.texi:25338 msgid "Symbol naming the action." msgstr "Die Aktion bezeichnendes Symbol." #. type: table -#: doc/guix.texi:25359 +#: doc/guix.texi:25341 msgid "This is a documentation string for the action. It can be viewed by running:" msgstr "Diese Zeichenkette ist die Dokumentation für die Aktion. Sie können sie sehen, wenn Sie dies ausführen:" #. type: example -#: doc/guix.texi:25362 +#: doc/guix.texi:25344 #, no-wrap msgid "herd doc @var{service} action @var{action}\n" msgstr "herd doc @var{Dienst} action @var{Aktion}\n" #. type: item -#: doc/guix.texi:25364 +#: doc/guix.texi:25346 #, no-wrap msgid "procedure" msgstr "procedure" #. type: table -#: doc/guix.texi:25368 +#: doc/guix.texi:25350 msgid "This should be a gexp that evaluates to a procedure of at least one argument, which is the ``running value'' of the service (@pxref{Slots of services,,, shepherd, The GNU Shepherd Manual})." msgstr "Dies sollte ein G-Ausdruck sein, der zu einer mindestens ein Argument nehmenden Prozedur ausgewertet wird. Das Argument ist der „running“-Wert des Dienstes (siehe @ref{Slots of services,,, shepherd, The GNU Shepherd Manual})." #. type: deftp -#: doc/guix.texi:25372 +#: doc/guix.texi:25354 msgid "The following example defines an action called @code{say-hello} that kindly greets the user:" msgstr "Das folgende Beispiel definiert eine Aktion namens @code{sag-hallo}, die den Benutzer freundlich begrüßt:" #. type: example -#: doc/guix.texi:25381 +#: doc/guix.texi:25363 #, no-wrap msgid "" "(shepherd-action\n" @@ -46342,12 +46559,12 @@ msgstr "" " #t)))\n" #. type: deftp -#: doc/guix.texi:25384 +#: doc/guix.texi:25366 msgid "Assuming this action is added to the @code{example} service, then you can do:" msgstr "Wenn wir annehmen, dass wir die Aktion zum Dienst @code{beispiel} hinzufügen, können Sie Folgendes ausführen:" #. type: example -#: doc/guix.texi:25390 +#: doc/guix.texi:25372 #, no-wrap msgid "" "# herd say-hello example\n" @@ -46361,79 +46578,79 @@ msgstr "" "Hallo, Freund! Argumente: (\"a\" \"b\" \"c\")\n" #. type: deftp -#: doc/guix.texi:25395 +#: doc/guix.texi:25377 msgid "This, as you can see, is a fairly sophisticated way to say hello. @xref{Service Convenience,,, shepherd, The GNU Shepherd Manual}, for more info on actions." msgstr "Wie Sie sehen können, ist das eine sehr ausgeklügelte Art, Hallo zu sagen. Siehe @ref{Service Convenience,,, shepherd, The GNU Shepherd Manual} für mehr Informationen zu Aktionen." #. type: defvr -#: doc/guix.texi:25397 +#: doc/guix.texi:25379 #, no-wrap msgid "{Scheme Variable} shepherd-root-service-type" msgstr "{Scheme-Variable} shepherd-root-service-type" #. type: defvr -#: doc/guix.texi:25399 +#: doc/guix.texi:25381 msgid "The service type for the Shepherd ``root service''---i.e., PID@tie{}1." msgstr "Der Diensttyp für den Shepherd-„Wurzeldienst“ — also für PID@tie{}1." #. type: defvr -#: doc/guix.texi:25403 +#: doc/guix.texi:25385 msgid "This is the service type that extensions target when they want to create shepherd services (@pxref{Service Types and Services}, for an example). Each extension must pass a list of @code{}." msgstr "Dieser Diensttyp stellt das Ziel für Diensterweiterungen dar, die Shepherd-Dienste erzeugen sollen (siehe @ref{Service Types and Services} für ein Beispiel). Jede Erweiterung muss eine Liste von @code{}-Objekten übergeben." #. type: defvr -#: doc/guix.texi:25405 +#: doc/guix.texi:25387 #, no-wrap msgid "{Scheme Variable} %shepherd-root-service" msgstr "{Scheme-Variable} %shepherd-root-service" #. type: defvr -#: doc/guix.texi:25407 +#: doc/guix.texi:25389 msgid "This service represents PID@tie{}1." msgstr "Dieser Dienst repräsentiert PID@tie{}1." #. type: cindex -#: doc/guix.texi:25413 +#: doc/guix.texi:25395 #, no-wrap msgid "documentation, searching for" msgstr "Dokumentation, Suche danach" #. type: cindex -#: doc/guix.texi:25414 +#: doc/guix.texi:25396 #, no-wrap msgid "searching for documentation" msgstr "Suchen nach Dokumentation" #. type: cindex -#: doc/guix.texi:25415 +#: doc/guix.texi:25397 #, no-wrap msgid "Info, documentation format" msgstr "Info, Dokumentationsformat" #. type: cindex -#: doc/guix.texi:25416 +#: doc/guix.texi:25398 #, no-wrap msgid "man pages" msgstr "man-Pages (Handbuchseiten)" #. type: cindex -#: doc/guix.texi:25417 +#: doc/guix.texi:25399 #, no-wrap msgid "manual pages" msgstr "Handbuchseiten („Man-Pages“)" #. type: Plain text -#: doc/guix.texi:25424 +#: doc/guix.texi:25406 msgid "In most cases packages installed with Guix come with documentation. There are two main documentation formats: ``Info'', a browseable hypertext format used for GNU software, and ``manual pages'' (or ``man pages''), the linear documentation format traditionally found on Unix. Info manuals are accessed with the @command{info} command or with Emacs, and man pages are accessed using @command{man}." msgstr "In den meisten Fällen liegt den mit Guix installierten Paketen auch Dokumentation bei, die diese beschreibt. Die zwei üblichsten Formate für Dokumentation sind „Info“, ein durchsuchbares Hypertextformat, das für GNU-Software benutzt wird, und sogenannte „Handbuchseiten“ (englisch „Manual Pages“, kurz Man-Pages), das linear aufgebaute Dokumentationsformat, das auf Unix traditionell mitgeliefert wird. Info-Handbücher können mit dem Befehl @command{info} oder mit Emacs abgerufen werden, auf Handbuchseiten kann mit dem Befehl @command{man} zugegriffen werden." #. type: Plain text -#: doc/guix.texi:25428 +#: doc/guix.texi:25410 msgid "You can look for documentation of software installed on your system by keyword. For example, the following command searches for information about ``TLS'' in Info manuals:" msgstr "Sie können die Dokumentation von auf Ihrem System installierter Software nach einem Schlüsselwort durchsuchen. Zum Beispiel suchen Sie mit folgendem Befehl in den Info-Handbüchern nach „TLS“." #. type: example -#: doc/guix.texi:25436 +#: doc/guix.texi:25418 #, no-wrap msgid "" "$ info -k TLS\n" @@ -46451,12 +46668,12 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:25440 +#: doc/guix.texi:25422 msgid "The command below searches for the same keyword in man pages:" msgstr "Mit folgendem Befehl suchen Sie dasselbe Schlüsselwort in Handbuchseiten:" #. type: example -#: doc/guix.texi:25446 +#: doc/guix.texi:25428 #, no-wrap msgid "" "$ man -k TLS\n" @@ -46470,108 +46687,108 @@ msgstr "" "@dots {}\n" #. type: Plain text -#: doc/guix.texi:25452 +#: doc/guix.texi:25434 msgid "These searches are purely local to your computer so you have the guarantee that documentation you find corresponds to what you have actually installed, you can access it off-line, and your privacy is respected." msgstr "Diese Suchvorgänge finden ausschließlich lokal auf Ihrem Rechner statt, wodurch gewährleistet ist, dass die Fundstellen zur von Ihnen auch tatsächlich installierten Software passen, Sie für den Zugriff keine Internetverbindung brauchen und Datenschutz gewährleistet bleibt." #. type: Plain text -#: doc/guix.texi:25455 +#: doc/guix.texi:25437 msgid "Once you have these results, you can view the relevant documentation by running, say:" msgstr "Sobald Sie die Fundstellen kennen, können Sie zum Beispiel so die entsprechende Dokumentation anzeigen lassen:" #. type: example -#: doc/guix.texi:25458 +#: doc/guix.texi:25440 #, no-wrap msgid "$ info \"(gnutls)Core TLS API\"\n" msgstr "$ info \"(gnutls)Core TLS API\"\n" #. type: Plain text -#: doc/guix.texi:25462 +#: doc/guix.texi:25444 msgid "or:" msgstr "oder" #. type: example -#: doc/guix.texi:25465 +#: doc/guix.texi:25447 #, no-wrap msgid "$ man certtool\n" msgstr "$ man certtool\n" #. type: Plain text -#: doc/guix.texi:25473 +#: doc/guix.texi:25455 msgid "Info manuals contain sections and indices as well as hyperlinks like those found in Web pages. The @command{info} reader (@pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}) and its Emacs counterpart (@pxref{Misc Help,,, emacs, The GNU Emacs Manual}) provide intuitive key bindings to navigate manuals. @xref{Getting Started,,, info, Info: An Introduction}, for an introduction to Info navigation." msgstr "Info-Handbücher sind in Abschnitte unterteilt und verfügen über Register sowie Hyperlinks, wie jene, die Sie auch von Webseiten kennen. Der @command{info}-Betrachter (siehe @ref{Top, Info reader,, info-stnd, Stand-alone GNU Info}) und sein Gegenstück für Emacs (siehe @ref{Misc Help,,, emacs, The GNU Emacs Manual}) verfügen über leicht erlernbare Tastenkürzel, mit denen Sie in Handbüchern navigieren können. Siehe @ref{Getting Started,,, info, Info: An Introduction} für eine Einführung in die Info-Navigation." #. type: cindex -#: doc/guix.texi:25477 +#: doc/guix.texi:25459 #, no-wrap msgid "debugging files" msgstr "Dateien zur Fehlersuche" #. type: Plain text -#: doc/guix.texi:25483 +#: doc/guix.texi:25465 msgid "Program binaries, as produced by the GCC compilers for instance, are typically written in the ELF format, with a section containing @dfn{debugging information}. Debugging information is what allows the debugger, GDB, to map binary code to source code; it is required to debug a compiled program in good conditions." msgstr "Die Binärdateien von Programmen, wie sie zum Beispiel von den GCC-Compilern erzeugt werden, sind in der Regel im ELF-Format gespeichert und enthalten eine Sektion mit @dfn{Informationen zur Fehlersuche} (englisch „Debugging Information“). Informationen zur Fehlersuche machen es möglich, dass der Debugger, GDB, Binärcode dem Quellcode zuordnen kann, was nötig ist, damit es mit etwas Glück leicht ist, Fehler in einem kompilierten Programm zu suchen." #. type: Plain text -#: doc/guix.texi:25491 +#: doc/guix.texi:25473 msgid "The problem with debugging information is that is takes up a fair amount of disk space. For example, debugging information for the GNU C Library weighs in at more than 60 MiB. Thus, as a user, keeping all the debugging info of all the installed programs is usually not an option. Yet, space savings should not come at the cost of an impediment to debugging---especially in the GNU system, which should make it easier for users to exert their computing freedom (@pxref{GNU Distribution})." msgstr "Das Problem bei Informationen zur Fehlersuche ist, dass dadurch einiges an Plattenplatz verbraucht wird. Zum Beispiel steuern die Informationen zur Fehlersuche in der GNU-C-Bibliothek mehr als 60 MiB bei. Als ein Nutzer ist es deswegen in der Regel nicht möglich, sämtliche Fehlersuchinformationen für alle installierten Programme zu speichern. Andererseits sollten Platzeinsparnisse nicht auf Kosten der Fehlersuche gehen — besonders im GNU-System, wo es Nutzern leicht fallen sollte, ihre Freiheit, wie sie ihre Rechner benutzen, auszuüben (siehe @ref{GNU Distribution})." #. type: Plain text -#: doc/guix.texi:25498 +#: doc/guix.texi:25480 msgid "Thankfully, the GNU Binary Utilities (Binutils) and GDB provide a mechanism that allows users to get the best of both worlds: debugging information can be stripped from the binaries and stored in separate files. GDB is then able to load debugging information from those files, when they are available (@pxref{Separate Debug Files,,, gdb, Debugging with GDB})." msgstr "Glücklicherweise gibt es in den GNU Binary Utilities (Binutils) und GDB einen Mechanismus, mit dem Nutzer das Beste aus beiden Welten bekommen: Informationen zur Fehlersuche können von den davon beschriebenen Binärdateien losgelöst und in separaten Dateien gespeichert werden. GDB kann dann Fehlersuchinformationen laden, wenn diese Dateien verfügbar sind (siehe @ref{Separate Debug Files,,, gdb, Debugging with GDB})." #. type: Plain text -#: doc/guix.texi:25506 +#: doc/guix.texi:25488 msgid "The GNU distribution takes advantage of this by storing debugging information in the @code{lib/debug} sub-directory of a separate package output unimaginatively called @code{debug} (@pxref{Packages with Multiple Outputs}). Users can choose to install the @code{debug} output of a package when they need it. For instance, the following command installs the debugging information for the GNU C Library and for GNU Guile:" msgstr "Die GNU-Distribution nutzt diesen Mechanismus aus, indem sie Informationen zur Fehlersuche im Unterverzeichnis @code{lib/debug} einer separaten Paketausgabe speichert, die den fantasielosen Namen @code{debug} trägt. Mit dem folgenden Befehl können Sie zum Beispiel Informationen zur Fehlersuche für die GNU-C-Bibliothek und für GNU Guile installieren:" #. type: example -#: doc/guix.texi:25509 +#: doc/guix.texi:25491 #, no-wrap msgid "guix install glibc:debug guile:debug\n" msgstr "guix install glibc:debug guile:debug\n" #. type: Plain text -#: doc/guix.texi:25515 +#: doc/guix.texi:25497 msgid "GDB must then be told to look for debug files in the user's profile, by setting the @code{debug-file-directory} variable (consider setting it from the @file{~/.gdbinit} file, @pxref{Startup,,, gdb, Debugging with GDB}):" msgstr "GDB muss dann angewiesen werden, im Profil des Nutzers nach Informationen zur Fehlersuche zu schauen, indem Sie die Variable @code{debug-file-directory} entsprechend setzen (vielleicht möchsten Sie die Variable in der Datei @file{~/.gdbinit} festlegen, siehe @ref{Startup,,, gdb, Debugging with GDB}):" #. type: example -#: doc/guix.texi:25518 +#: doc/guix.texi:25500 #, no-wrap msgid "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n" msgstr "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n" #. type: Plain text -#: doc/guix.texi:25522 +#: doc/guix.texi:25504 msgid "From there on, GDB will pick up debugging information from the @code{.debug} files under @file{~/.guix-profile/lib/debug}." msgstr "Von da an wird GDB auch aus den @code{.debug}-Dateien unter @file{~/.guix-profile/lib/debug} auslesbare Informationen zur Fehlersuche verwenden." #. type: Plain text -#: doc/guix.texi:25529 +#: doc/guix.texi:25511 msgid "In addition, you will most likely want GDB to be able to show the source code being debugged. To do that, you will have to unpack the source code of the package of interest (obtained with @code{guix build --source}, @pxref{Invoking guix build}), and to point GDB to that source directory using the @code{directory} command (@pxref{Source Path, @code{directory},, gdb, Debugging with GDB})." msgstr "Des Weiteren werden Sie höchstwahrscheinlich wollen, dass GDB den Quellcode, der auf Fehler untersucht wird, anzeigen kann. Dazu müssen sie den Quellcodes des Pakets, für das Sie sich interessieren (laden Sie ihn mit @code{guix build --source} herunter; siehe @ref{Invoking guix build}), und dann weisen Sie GDB an, in dem Verzeichnis zu suchen, indem Sie den @code{directory}-Befehl benutzen (siehe @ref{Source Path, @code{directory},, gdb, Debugging with GDB})." #. type: Plain text -#: doc/guix.texi:25538 +#: doc/guix.texi:25520 msgid "The @code{debug} output mechanism in Guix is implemented by the @code{gnu-build-system} (@pxref{Build Systems}). Currently, it is opt-in---debugging information is available only for the packages with definitions explicitly declaring a @code{debug} output. This may be changed to opt-out in the future if our build farm servers can handle the load. To check whether a package has a @code{debug} output, use @command{guix package --list-available} (@pxref{Invoking guix package})." msgstr "Der Mechanismus mit der @code{debug}-Ausgabe wird in Guix als Teil des @code{gnu-build-system} implementiert (siehe @ref{Build Systems}). Zur Zeit ist sie optional — nur für Pakete, für die ausdrücklich eine @code{debug}-Ausgabe deklariert wurde, sind Informationen zur Fehlersuche verfügbar. Um zu überprüfen, ob Pakete eine @code{debug}-Ausgabe mit Informationen zur Fehlersuche haben, benutzen Sie @command{guix package --list-available} (siehe @ref{Invoking guix package})." #. type: cindex -#: doc/guix.texi:25543 +#: doc/guix.texi:25525 #, no-wrap msgid "security updates" msgstr "Sicherheitsaktualisierungen" #. type: Plain text -#: doc/guix.texi:25552 +#: doc/guix.texi:25534 msgid "Occasionally, important security vulnerabilities are discovered in software packages and must be patched. Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch containing only security updates.) The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution:" msgstr "Ab und zu werden wichtige Sicherheitsschwachstellen in Software-Paketen entdeckt, die mit Patches behoben werden müssen. Guix-Entwickler geben ihr Bestes, bezüglich bekannter Schwachstellen auf dem Laufenden zu bleiben und so bald wie möglich Patches dafür auf den @code{master}-Branch von Guix aufzuspielen (einen stabilen „stable“-Branch ohne riskante Änderungen haben wir noch nicht). Das Werkzeug @command{guix lint} hilft Entwicklern dabei, verwundbare Versionen von Softwarepaketen in der Distribution zu finden:" #. type: smallexample -#: doc/guix.texi:25559 +#: doc/guix.texi:25541 #, no-wrap msgid "" "$ guix lint -c cve\n" @@ -46587,44 +46804,44 @@ msgstr "" "…\n" #. type: Plain text -#: doc/guix.texi:25562 +#: doc/guix.texi:25544 msgid "@xref{Invoking guix lint}, for more information." msgstr "Siehe @ref{Invoking guix lint} für weitere Informationen." #. type: quotation -#: doc/guix.texi:25566 +#: doc/guix.texi:25548 msgid "As of version @value{VERSION}, the feature described below is considered ``beta''." msgstr "Die im Folgenden beschriebene Funktion wird noch als Beta-Version angesehen, Stand Version @value{VERSION}." #. type: Plain text -#: doc/guix.texi:25576 +#: doc/guix.texi:25558 msgid "Guix follows a functional package management discipline (@pxref{Introduction}), which implies that, when a package is changed, @emph{every package that depends on it} must be rebuilt. This can significantly slow down the deployment of fixes in core packages such as libc or Bash, since basically the whole distribution would need to be rebuilt. Using pre-built binaries helps (@pxref{Substitutes}), but deployment may still take more time than desired." msgstr "Guix verfolgt eine funktionale Disziplin bei der Paketverwaltung (siehe @ref{Introduction}), was impliziert, dass bei jeder Änderung an einem Paket @emph{jedes davon abhängige Paket} neu erstellt werden muss. Ohne einen Mechanismus würde das Ausliefern von Sicherheitsaktualisierungen in Kernpaketen wie libc oder Bash dadurch deutlich verlangsamt — schließlich müsste quasi die gesamte Distribution neu erstellt werden. Vorerstellte Binärdateien zu benutzen, wäre schon einmal eine Hilfe (siehe @ref{Substitutes}), aber die Auslieferung wäre immer noch laangsamer, als wir es uns wünschen." #. type: cindex -#: doc/guix.texi:25577 +#: doc/guix.texi:25559 #, no-wrap msgid "grafts" msgstr "Veredelungen" #. type: Plain text -#: doc/guix.texi:25585 +#: doc/guix.texi:25567 msgid "To address this, Guix implements @dfn{grafts}, a mechanism that allows for fast deployment of critical updates without the costs associated with a whole-distribution rebuild. The idea is to rebuild only the package that needs to be patched, and then to ``graft'' it onto packages explicitly installed by the user and that were previously referring to the original package. The cost of grafting is typically very low, and order of magnitudes lower than a full rebuild of the dependency chain." msgstr "Als Gegenmittel sind in Guix @dfn{Veredelungen} implementiert. Diese stellen einen Mechanismus dar, mit dem kritische Aktualisierungen schnell an Guix’ Benutzer ausgeliefert werden können, ohne die Nachteile, zu denen es käme, wenn wir die gesamte Distribution neu erstellen müssten. Die Idee dahinter ist, nur das Paket, das einen Patch braucht, neu zu erstellen, und damit dann Pakete, die der Nutzer ausdrücklich installiert hat und die vorher Referenzen auf das alte Paket enthielten, zu „veredeln“. So eine Veredelung kostet typischerweise nur sehr wenig, d.h.@: um Größenordnungen weniger, als die ganze Abhängigkeitskette neu zu erstellen." #. type: cindex -#: doc/guix.texi:25586 +#: doc/guix.texi:25568 #, no-wrap msgid "replacements of packages, for grafts" msgstr "Ersetzungen von Paketen, bei Veredelungen" #. type: Plain text -#: doc/guix.texi:25592 +#: doc/guix.texi:25574 msgid "For instance, suppose a security update needs to be applied to Bash. Guix developers will provide a package definition for the ``fixed'' Bash, say @code{bash-fixed}, in the usual way (@pxref{Defining Packages}). Then, the original package definition is augmented with a @code{replacement} field pointing to the package containing the bug fix:" msgstr "Nehmen wir also an, eine Sicherheitsaktualisierung müsste auf Bash angewandt werden. Guix-Entwickler schreiben dann eine Paketdefinition für die „reparierte“ Bash, sagen wir @code{bash-fixed}, auf die gleiche Art wie immer (siehe @ref{Defining Packages}). Dann wird die ursprüngliche Paketdefinition um ein @code{replacement}-Feld (zu Deutsch „Ersetzung“) erweitert, das auf das Paket verweist, in dem der Fehler behoben wurde:" #. type: example -#: doc/guix.texi:25599 +#: doc/guix.texi:25581 #, no-wrap msgid "" "(define bash\n" @@ -46640,120 +46857,120 @@ msgstr "" " (replacement bash-fixed)))\n" #. type: Plain text -#: doc/guix.texi:25609 +#: doc/guix.texi:25591 msgid "From there on, any package depending directly or indirectly on Bash---as reported by @command{guix gc --requisites} (@pxref{Invoking guix gc})---that is installed is automatically ``rewritten'' to refer to @code{bash-fixed} instead of @code{bash}. This grafting process takes time proportional to the size of the package, usually less than a minute for an ``average'' package on a recent machine. Grafting is recursive: when an indirect dependency requires grafting, then grafting ``propagates'' up to the package that the user is installing." msgstr "Ab diesem Zeitpunkt wird jedes Paket, das Sie installieren und das direkt oder indirekt von Bash abhängt — also die von @command{guix gc --requisites} ausgegebenen Pakete (siehe @ref{Invoking guix gc}) —, automatisch „umgeschrieben“, so dass es @code{bash-fixed} referenziert, wo es vorher @code{bash} referenziert hatte. Die Dauer dieses Veredelungsprozesses ist proportional zur Größe des Pakets und liegt auf einer neuen Maschine für ein „durchschnittliches“ Paket bei unter einer Minute. Veredeln ist rekursiv: Wenn eine indirekte Abhängigkeit veredelt werden muss, „propagiert“ der Veredelungsprozess durch die abhängigen Pakete und endet mit dem Paket, das der Nutzer installiert." #. type: Plain text -#: doc/guix.texi:25617 +#: doc/guix.texi:25599 msgid "Currently, the length of the name and version of the graft and that of the package it replaces (@code{bash-fixed} and @code{bash} in the example above) must be equal. This restriction mostly comes from the fact that grafting works by patching files, including binary files, directly. Other restrictions may apply: for instance, when adding a graft to a package providing a shared library, the original shared library and its replacement must have the same @code{SONAME} and be binary-compatible." msgstr "Zur Zeit muss der Name und die Version einer Veredelung gleichlang wie die beim ersetzten Paket sein (also bei @code{bash-fixed} und @code{bash} im Beispiel oben). Diese Einschränkung kommt daher, dass beim Veredeln der Inhalt von Dateien, einschließlich Binärdateien, durch einfache Ersetzungen „geflickt“ wird. Es gibt noch mehr Einschränkungen: Wenn zum Beispiel ein Paket veredelt wird, das eine gemeinsame Bibliothek („Shared Library“) verwendet, muss der @code{SONAME} von Original und Ersatz derselbe sein und die beiden müssen binär kompatibel sein." #. type: Plain text -#: doc/guix.texi:25621 +#: doc/guix.texi:25603 msgid "The @option{--no-grafts} command-line option allows you to forcefully avoid grafting (@pxref{Common Build Options, @option{--no-grafts}}). Thus, the command:" msgstr "Mit der Befehlszeilenoption @option{--no-grafts} können Sie den Veredelungsmechanismus zwingend abschalten (siehe @ref{Common Build Options, @option{--no-grafts}}). Der Befehl" #. type: example -#: doc/guix.texi:25624 +#: doc/guix.texi:25606 #, no-wrap msgid "guix build bash --no-grafts\n" msgstr "guix build bash --no-grafts\n" #. type: Plain text -#: doc/guix.texi:25628 +#: doc/guix.texi:25610 msgid "returns the store file name of the original Bash, whereas:" msgstr "liefert also den Namen der Store-Datei mit der ursprünglichen Bash, während" #. type: example -#: doc/guix.texi:25631 +#: doc/guix.texi:25613 #, no-wrap msgid "guix build bash\n" msgstr "guix build bash\n" #. type: Plain text -#: doc/guix.texi:25636 +#: doc/guix.texi:25618 msgid "returns the store file name of the ``fixed'', replacement Bash. This allows you to distinguish between the two variants of Bash." msgstr "den Namen der Store-Datei für die „reparierte“ Ersatz-Bash liefert. Dadurch können Sie zwischen den beiden Varianten von Bash unterscheiden." #. type: Plain text -#: doc/guix.texi:25639 +#: doc/guix.texi:25621 msgid "To verify which Bash your whole profile refers to, you can run (@pxref{Invoking guix gc}):" msgstr "Um zu prüfen, welche Bash Ihr gesamtes Profil referenziert, können Sie diesen Befehl hier laufen lassen (siehe @ref{Invoking guix gc}):" #. type: example -#: doc/guix.texi:25642 +#: doc/guix.texi:25624 #, no-wrap msgid "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n" msgstr "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n" #. type: Plain text -#: doc/guix.texi:25647 +#: doc/guix.texi:25629 msgid "@dots{} and compare the store file names that you get with those above. Likewise for a complete Guix system generation:" msgstr "Dann vergleichen Sie die Namen der Store-Objekte, die Sie ausgegeben bekommen, mit den beiden Bash-Paketnamen oben. Ebenso können Sie eine ganze Guix-Systemgeneration überprüfen:" #. type: example -#: doc/guix.texi:25650 +#: doc/guix.texi:25632 #, no-wrap msgid "guix gc -R `guix system build my-config.scm` | grep bash\n" msgstr "guix gc -R `guix system build my-config.scm` | grep bash\n" #. type: Plain text -#: doc/guix.texi:25654 +#: doc/guix.texi:25636 msgid "Lastly, to check which Bash running processes are using, you can use the @command{lsof} command:" msgstr "Zum Schluss können Sie mit dem Befehl @command{lsof} überprüfen, welches von den Bash-Paketen die laufenden Prozesse benutzen:" #. type: example -#: doc/guix.texi:25657 +#: doc/guix.texi:25639 #, no-wrap msgid "lsof | grep /gnu/store/.*bash\n" msgstr "lsof | grep /gnu/store/.*bash\n" #. type: cindex -#: doc/guix.texi:25665 +#: doc/guix.texi:25647 #, no-wrap msgid "bootstrapping" msgstr "Bootstrapping" #. type: Plain text -#: doc/guix.texi:25675 +#: doc/guix.texi:25657 msgid "Bootstrapping in our context refers to how the distribution gets built ``from nothing''. Remember that the build environment of a derivation contains nothing but its declared inputs (@pxref{Introduction}). So there's an obvious chicken-and-egg problem: how does the first package get built? How does the first compiler get compiled? Note that this is a question of interest only to the curious hacker, not to the regular user, so you can shamelessly skip this section if you consider yourself a ``regular user''." msgstr "Wenn wir von Bootstrapping sprechen, meinen wir damit, wie die Distribution „aus dem Nichts“ erstellt werden kann. Erinnern Sie sich, wie die Erstellungsumgebung für eine Ableitung nichts außer ihren deklarierten Eingaben enthält (siehe @ref{Introduction})? Daraus ergibt sich ein Henne-Ei-Problem: Wie kann so das allererste Paket entstehen? Womit wird der Compiler kompiliert? Beachten Sie, diese Frage ist nur für neugierige Hacker und keine normalen Nutzer interessant. Wenn Sie sich selbst als „normaler Nutzer“ sehen, dürfen Sie getrost diesen Abschnitt hier überspringen." #. type: cindex -#: doc/guix.texi:25676 doc/guix.texi:25798 +#: doc/guix.texi:25658 doc/guix.texi:25780 #, no-wrap msgid "bootstrap binaries" msgstr "Bootstrap-Binärdateien" #. type: Plain text -#: doc/guix.texi:25686 +#: doc/guix.texi:25668 msgid "The GNU system is primarily made of C code, with libc at its core. The GNU build system itself assumes the availability of a Bourne shell and command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep'. Furthermore, build programs---programs that run @code{./configure}, @code{make}, etc.---are written in Guile Scheme (@pxref{Derivations}). Consequently, to be able to build anything at all, from scratch, Guix relies on pre-built binaries of Guile, GCC, Binutils, libc, and the other packages mentioned above---the @dfn{bootstrap binaries}." msgstr "Das GNU-System besteht in erster Linie aus C-Code, dessen Kern die libc ist. Das GNU-Erstellungssystem selbst setzt voraus, dass eine Bourne-Shell und die Kommandozeilenwerkzeuge der GNU-Coreutils, Awk, Findutils, „sed“ und „grep“ verfügbar sind. Des Weiteren sind Programme für die Erstellung — also Programme, die @code{./configure}, @code{make}, etc.@: ausführen — in Guile Scheme geschrieben (siehe @ref{Derivations}). Folglich ist es erforderlich, dass, damit überhaupt irgendetwas erstellt werden kann, Guix vorerstellte Binärdateien von Guile, GCC, Binutils, libc und den anderen oben genannten Paketen verwendet. Diese bezeichnen wir als die @dfn{Bootstrap-Binärdateien}." #. type: Plain text -#: doc/guix.texi:25689 +#: doc/guix.texi:25671 msgid "These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later)." msgstr "Diese Bootstrap-Binärdateien werden als „gegeben“ angenommen, obwohl wir sie auch neu erzeugen können, falls nötig (mehr dazu später)." #. type: unnumberedsec -#: doc/guix.texi:25690 +#: doc/guix.texi:25672 #, no-wrap msgid "Preparing to Use the Bootstrap Binaries" -msgstr "Vorbereitung, um die Bootstrap-Binärdateien zu verwenden" +msgstr "Vorbereitung@comma{} um die Bootstrap-Binärdateien zu verwenden" #. type: Plain text -#: doc/guix.texi:25695 +#: doc/guix.texi:25677 msgid "@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap derivations}" msgstr "@image{images/bootstrap-graph,6in,,Abhängigkeitsgraph der frühen Bootstrap-Ableitungen}" #. type: Plain text -#: doc/guix.texi:25700 +#: doc/guix.texi:25682 msgid "The figure above shows the very beginning of the dependency graph of the distribution, corresponding to the package definitions of the @code{(gnu packages bootstrap)} module. A similar figure can be generated with @command{guix graph} (@pxref{Invoking guix graph}), along the lines of:" msgstr "Die Abbildung oben zeigt den Anfang des Abhängigkeitsgraphen der Distribution und entspricht den Paketdefinitionen im @code{(gnu package bootstrap)}-Modul. Eine ähnliche Grafik kann mit @command{guix graph} (siehe @ref{Invoking guix graph}) erzeugt werden:" #. type: example -#: doc/guix.texi:25705 +#: doc/guix.texi:25687 #, no-wrap msgid "" "guix graph -t derivation \\\n" @@ -46765,43 +46982,43 @@ msgstr "" " | dot -Tps > t.ps\n" #. type: Plain text -#: doc/guix.texi:25714 +#: doc/guix.texi:25696 msgid "At this level of detail, things are slightly complex. First, Guile itself consists of an ELF executable, along with many source and compiled Scheme files that are dynamically loaded when it runs. This gets stored in the @file{guile-2.0.7.tar.xz} tarball shown in this graph. This tarball is part of Guix's ``source'' distribution, and gets inserted into the store with @code{add-to-store} (@pxref{The Store})." -msgstr "Bei diesem Detaillierungsgrad sind die Dinge recht komplex. Guile selbst besteht aus einer ausführbaren ELF-Datei neben vielen Quelldateien und kompilierten Scheme Dateien, die dynamisch bei der Ausführung geladen werden. Das wird in dem im Graph gezeigten @file{guile-2.0.7.tar.xz}-Archiv gespeichert. Das Archiv ist Teil von Guix’ „Quelldistribution“ und wird in den Store mit @code{add-to-store} (siehe @ref{The Store}) eingefügt." +msgstr "Bei diesem Detaillierungsgrad sind die Dinge recht komplex. Guile selbst besteht aus einer ausführbaren ELF-Datei neben vielen Quelldateien und kompilierten Scheme-Dateien, die dynamisch bei der Ausführung geladen werden. Das wird in dem im Graph gezeigten @file{guile-2.0.7.tar.xz}-Archiv gespeichert. Das Archiv ist Teil von Guix’ „Quelldistribution“ und wird in den Store mit @code{add-to-store} (siehe @ref{The Store}) eingefügt." #. type: Plain text -#: doc/guix.texi:25723 +#: doc/guix.texi:25705 msgid "But how do we write a derivation that unpacks this tarball and adds it to the store? To solve this problem, the @code{guile-bootstrap-2.0.drv} derivation---the first one that gets built---uses @code{bash} as its builder, which runs @code{build-bootstrap-guile.sh}, which in turn calls @code{tar} to unpack the tarball. Thus, @file{bash}, @file{tar}, @file{xz}, and @file{mkdir} are statically-linked binaries, also part of the Guix source distribution, whose sole purpose is to allow the Guile tarball to be unpacked." msgstr "" #. type: Plain text -#: doc/guix.texi:25735 +#: doc/guix.texi:25717 msgid "Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile that can be used to run subsequent build programs. Its first task is to download tarballs containing the other pre-built binaries---this is what the @code{.tar.xz.drv} derivations do. Guix modules such as @code{ftp-client.scm} are used for this purpose. The @code{module-import.drv} derivations import those modules in a directory in the store, using the original layout. The @code{module-import-compiled.drv} derivations compile those modules, and write them in an output directory with the right layout. This corresponds to the @code{#:modules} argument of @code{build-expression->derivation} (@pxref{Derivations})." msgstr "" #. type: Plain text -#: doc/guix.texi:25739 +#: doc/guix.texi:25721 msgid "Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at which point we have a working C tool chain." msgstr "" #. type: unnumberedsec -#: doc/guix.texi:25741 +#: doc/guix.texi:25723 #, no-wrap msgid "Building the Build Tools" msgstr "" #. type: Plain text -#: doc/guix.texi:25750 +#: doc/guix.texi:25732 msgid "Bootstrapping is complete when we have a full tool chain that does not depend on the pre-built bootstrap tools discussed above. This no-dependency requirement is verified by checking whether the files of the final tool chain contain references to the @file{/gnu/store} directories of the bootstrap inputs. The process that leads to this ``final'' tool chain is described by the package definitions found in the @code{(gnu packages commencement)} module." msgstr "" #. type: Plain text -#: doc/guix.texi:25757 +#: doc/guix.texi:25739 msgid "The @command{guix graph} command allows us to ``zoom out'' compared to the graph above, by looking at the level of package objects instead of individual derivations---remember that a package may translate to several derivations, typically one derivation to download its source, one to build the Guile modules it needs, and one to actually build the package from source. The command:" msgstr "" #. type: example -#: doc/guix.texi:25762 +#: doc/guix.texi:25744 #, no-wrap msgid "" "guix graph -t bag \\\n" @@ -46810,171 +47027,184 @@ msgid "" msgstr "" #. type: Plain text -#: doc/guix.texi:25769 +#: doc/guix.texi:25751 msgid "produces the dependency graph leading to the ``final'' C library@footnote{You may notice the @code{glibc-intermediate} label, suggesting that it is not @emph{quite} final, but as a good approximation, we will consider it final.}, depicted below." msgstr "" #. type: Plain text -#: doc/guix.texi:25771 +#: doc/guix.texi:25753 msgid "@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}" msgstr "" #. type: Plain text -#: doc/guix.texi:25777 +#: doc/guix.texi:25759 msgid "The first tool that gets built with the bootstrap binaries is GNU@tie{}Make---noted @code{make-boot0} above---which is a prerequisite for all the following packages. From there Findutils and Diffutils get built." msgstr "" #. type: Plain text -#: doc/guix.texi:25782 +#: doc/guix.texi:25764 msgid "Then come the first-stage Binutils and GCC, built as pseudo cross tools---i.e., with @code{--target} equal to @code{--host}. They are used to build libc. Thanks to this cross-build trick, this libc is guaranteed not to hold any reference to the initial tool chain." msgstr "" #. type: Plain text -#: doc/guix.texi:25788 +#: doc/guix.texi:25770 msgid "From there the final Binutils and GCC (not shown above) are built. GCC uses @code{ld} from the final Binutils, and links programs against the just-built libc. This tool chain is used to build the other packages used by Guix and by the GNU Build System: Guile, Bash, Coreutils, etc." msgstr "" #. type: Plain text -#: doc/guix.texi:25794 +#: doc/guix.texi:25776 msgid "And voilà! At this point we have the complete set of build tools that the GNU Build System expects. These are in the @code{%final-inputs} variable of the @code{(gnu packages commencement)} module, and are implicitly used by any package that uses @code{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})." msgstr "" #. type: unnumberedsec -#: doc/guix.texi:25796 +#: doc/guix.texi:25778 #, no-wrap msgid "Building the Bootstrap Binaries" msgstr "" #. type: Plain text -#: doc/guix.texi:25803 +#: doc/guix.texi:25785 msgid "Because the final tool chain does not depend on the bootstrap binaries, those rarely need to be updated. Nevertheless, it is useful to have an automated way to produce them, should an update occur, and this is what the @code{(gnu packages make-bootstrap)} module provides." msgstr "" #. type: Plain text -#: doc/guix.texi:25807 +#: doc/guix.texi:25789 msgid "The following command builds the tarballs containing the bootstrap binaries (Guile, Binutils, GCC, libc, and a tarball containing a mixture of Coreutils and other basic command-line tools):" msgstr "" #. type: example -#: doc/guix.texi:25810 +#: doc/guix.texi:25792 #, no-wrap msgid "guix build bootstrap-tarballs\n" msgstr "" #. type: Plain text -#: doc/guix.texi:25815 +#: doc/guix.texi:25797 msgid "The generated tarballs are those that should be referred to in the @code{(gnu packages bootstrap)} module mentioned at the beginning of this section." msgstr "" #. type: Plain text -#: doc/guix.texi:25821 +#: doc/guix.texi:25803 msgid "Still here? Then perhaps by now you've started to wonder: when do we reach a fixed point? That is an interesting question! The answer is unknown, but if you would like to investigate further (and have significant computational and storage resources to do so), then let us know." msgstr "" #. type: unnumberedsec -#: doc/guix.texi:25822 +#: doc/guix.texi:25804 #, no-wrap msgid "Reducing the Set of Bootstrap Binaries" msgstr "" #. type: Plain text -#: doc/guix.texi:25830 +#: doc/guix.texi:25812 msgid "Our bootstrap binaries currently include GCC, Guile, etc. That's a lot of binary code! Why is that a problem? It's a problem because these big chunks of binary code are practically non-auditable, which makes it hard to establish what source code produced them. Every unauditable binary also leaves us vulnerable to compiler backdoors as described by Ken Thompson in the 1984 paper @emph{Reflections on Trusting Trust}." msgstr "" #. type: Plain text -#: doc/guix.texi:25836 +#: doc/guix.texi:25818 msgid "This is mitigated by the fact that our bootstrap binaries were generated from an earlier Guix revision. Nevertheless it lacks the level of transparency that we get in the rest of the package dependency graph, where Guix always gives us a source-to-binary mapping. Thus, our goal is to reduce the set of bootstrap binaries to the bare minimum." msgstr "" #. type: Plain text -#: doc/guix.texi:25842 +#: doc/guix.texi:25824 msgid "The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that. One of these is about replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler. Your help is welcome!" msgstr "" #. type: chapter -#: doc/guix.texi:25845 +#: doc/guix.texi:25827 #, no-wrap msgid "Porting to a New Platform" msgstr "Auf eine neue Plattform portieren" #. type: Plain text -#: doc/guix.texi:25854 +#: doc/guix.texi:25836 msgid "As discussed above, the GNU distribution is self-contained, and self-containment is achieved by relying on pre-built ``bootstrap binaries'' (@pxref{Bootstrapping}). These binaries are specific to an operating system kernel, CPU architecture, and application binary interface (ABI). Thus, to port the distribution to a platform that is not yet supported, one must build those bootstrap binaries, and update the @code{(gnu packages bootstrap)} module to use them on that platform." msgstr "Wie oben beschrieben ist die GNU-Distribution eigenständig und diese Eigenständigkeit wird erreicht, indem sie aus vorerstellten „Bootstrap-Binärdateien“ heraus erstellt werden kann (siehe @ref{Bootstrapping}). Diese Binärdateien unterscheiden sich je nach verwendetem Betriebssystem-Kernel, nach der Prozessorarchitektur und der Anwendungsbinärschnittstelle („Application Binary Interface“, kurz ABI). Um die Distribution also auf eine noch nicht unterstützte Plattform zu portieren, muss man diese Bootstrap-Binärdateien für diese Plattform erstellen und das Modul @code{(gnu packages bootstrap)} aktualisieren, damit es sie benutzt." #. type: Plain text -#: doc/guix.texi:25859 +#: doc/guix.texi:25841 msgid "Fortunately, Guix can @emph{cross compile} those bootstrap binaries. When everything goes well, and assuming the GNU tool chain supports the target platform, this can be as simple as running a command like this one:" msgstr "Zum Glück kann Guix diese Bootstrap-Binärdateien @emph{cross-kompilieren}. Wenn alles gut geht, und vorausgesetzt, die GNU-Werkzeuge (zusammen werden sie als GNU-„Toolchain“ bezeichnet) unterstützen diese Zielplattform auch, dann kann es völlig ausreichen, dass Sie einen Befehl wie hier ausführen:" #. type: example -#: doc/guix.texi:25862 +#: doc/guix.texi:25844 #, no-wrap msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n" msgstr "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n" #. type: Plain text -#: doc/guix.texi:25869 +#: doc/guix.texi:25851 msgid "For this to work, the @code{glibc-dynamic-linker} procedure in @code{(gnu packages bootstrap)} must be augmented to return the right file name for libc's dynamic linker on that platform; likewise, @code{system->linux-architecture} in @code{(gnu packages linux)} must be taught about the new platform." msgstr "Damit das funktioniert, muss erst die @code{glibc-dynamic-linker}-Prozedur in @code{(gnu packages bootstrap)} angepasst werden, damit sie den richtigen Dateinamen für den dynamischen Binder von libc auf dieser Plattform liefert; ebenso muss @code{system->linux-architecture} in @code{(gnu packages linux)} mit den Informationen über die neue Plattform versorgt werden." #. type: Plain text -#: doc/guix.texi:25878 +#: doc/guix.texi:25860 msgid "Once these are built, the @code{(gnu packages bootstrap)} module needs to be updated to refer to these binaries on the target platform. That is, the hashes and URLs of the bootstrap tarballs for the new platform must be added alongside those of the currently supported platforms. The bootstrap Guile tarball is treated specially: it is expected to be available locally, and @file{gnu/local.mk} has rules to download it for the supported architectures; a rule for the new platform must be added as well." msgstr "Sobald diese erstellt wurden, muss das Modul @code{(gnu packages bootstrap)} aktualisiert werden, damit es diese Binärdateien für die Zielplattform benutzt. Das heißt, die Hashes und URLs der Bootstrap-Tarballs für die neue Plattform müssen neben denen für die bisher unterstützten Plattformen aufgeführt werden. Der Bootstrap-Guile-Tarball wird besonders behandelt: Von ihm wird erwartet, dass er lokal verfügbar ist, und @file{gnu/local.mk} enthält Regeln, um ihn für die unterstützten Architekturen herunterzuladen; eine Regel muss auch für die neue Plattform hinzugefügt werden." #. type: Plain text -#: doc/guix.texi:25887 +#: doc/guix.texi:25869 msgid "In practice, there may be some complications. First, it may be that the extended GNU triplet that specifies an ABI (like the @code{eabi} suffix above) is not recognized by all the GNU tools. Typically, glibc recognizes some of these, whereas GCC uses an extra @code{--with-abi} configure flag (see @code{gcc.scm} for examples of how to handle this). Second, some of the required packages could fail to build for that platform. Lastly, the generated binaries could be broken for some reason." msgstr "In der Praxis kann es einige Schwierigkeiten geben. Erstens kann es sein, dass das erweiterte GNU-Tripel, das eine Anwendungsbinärschnittstelle (ABI) festlegt (wie es das @code{eabi}-Suffix oben tut) nicht von allen GNU-Werkzeugen erkannt wird. Typischerweise erkennt glibc manche davon, während für GCC eine zusätzliche Befehlszeilenoption @code{--with-abi} an configure übergeben werden muss (siehe @code{gcc.scm} für Beispiele, wie man das macht). Zweitens könnte es sein, dass manche der notwendige Pakete für diese Plattform nicht erfolgreich erstellt werden können. Zuletzt könnten die generierten Binärdateien aus dem einen oder anderen Grund fehlerhaft sein." #. type: include -#: doc/guix.texi:25889 +#: doc/guix.texi:25871 #, no-wrap msgid "contributing.texi" msgstr "contributing.de.texi" #. type: Plain text -#: doc/guix.texi:25902 +#: doc/guix.texi:25884 msgid "Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see the @file{nix/AUTHORS} file in Guix.) Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes. Without this work, Guix would not exist." msgstr "Guix baut auf dem @uref{https://nixos.org/nix/, Nix-Paketverwaltungsprogramm} auf, das von Eelco Dolstra entworfen und entwickelt wurde, mit Beiträgen von anderen Leuten (siehe die Datei @file{nix/AUTHORS} in Guix). Nix hat für die funktionale Paketverwaltung die Pionierarbeit geleistet und noch nie dagewesene Funktionalitäten vorangetrieben wie transaktionsbasierte Paketaktualisierungen und die Rücksetzbarkeit selbiger, eigene Paketprofile für jeden Nutzer und referenziell transparente Erstellungsprozesse. Ohne diese Arbeit gäbe es Guix nicht." #. type: Plain text -#: doc/guix.texi:25905 +#: doc/guix.texi:25887 msgid "The Nix-based software distributions, Nixpkgs and NixOS, have also been an inspiration for Guix." msgstr "Die Nix-basierten Software-Distributionen Nixpkgs und NixOS waren auch eine Inspiration für Guix." #. type: Plain text -#: doc/guix.texi:25911 +#: doc/guix.texi:25893 msgid "GNU@tie{}Guix itself is a collective work with contributions from a number of people. See the @file{AUTHORS} file in Guix for more information on these fine people. The @file{THANKS} file lists people who have helped by reporting bugs, taking care of the infrastructure, providing artwork and themes, making suggestions, and more---thank you!" msgstr "GNU@tie{}Guix ist selbst das Produkt kollektiver Arbeit mit Beiträgen durch eine Vielzahl von Leuten. Siehe die Datei @file{AUTHORS} in Guix für mehr Informationen, wer diese wunderbaren Menschen sind. In der Datei @file{THANKS} finden Sie eine Liste der Leute, die uns geholfen haben, indem Sie Fehler gemeldet, sich um unsere Infrastruktur gekümmert, künstlerische Arbeit und schön gestaltete Themen beigesteuert, Vorschläge gemacht und noch vieles mehr getan haben — vielen Dank!" #. type: cindex -#: doc/guix.texi:25916 +#: doc/guix.texi:25898 #, no-wrap msgid "license, GNU Free Documentation License" msgstr "Lizenz, GNU-Lizenz für freie Dokumentation" #. type: include -#: doc/guix.texi:25917 +#: doc/guix.texi:25899 #, no-wrap msgid "fdl-1.3.texi" msgstr "fdl-1.3.texi" -#~ msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. This is currently in an experimental stage, with limited support. @xref{Contributing}, for how to help!" -#~ msgstr "64-Bit-ARMv8-A-Prozessoren, little-endian, Linux-Libre als Kernel. Derzeit ist dies noch in der Erprobungsphase mit begrenzter Unterstützung. Unter @ref{Contributing} steht, wie Sie dabei helfen können!" +#~ msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully supported; in particular, the project's build farms no longer provide substitutes for this architecture." +#~ msgstr "64-Bit-MIPS-Prozessoren, little-endian, speziell die Loongson-Reihe, n32-ABI, mit Linux-Libre als Kernel. Diese Konfiguration wird nicht länger in vollem Umfang unterstützt; insbesondere werden von der Build-Farm des Guix-Projekts keine Substitute mehr für diese Architektur angeboten." #~ msgid "" -#~ "image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" -#~ "docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" -#~ " --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" -#~ " $image_id /var/guix/profiles/system/boot\n" +#~ "image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" +#~ "container_id=\"`docker create $image_id`\"\n" +#~ "docker start $container_id\n" #~ msgstr "" -#~ "image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n" -#~ "docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" -#~ " --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" -#~ " $image_id /var/guix/profiles/system/boot\n" +#~ "image_id=\"`docker load < guix-system-docker-image.tar.gz`\"\n" +#~ "container_id=\"`docker create $image_id`\"\n" +#~ "docker start $container_id\n" + +#~ msgid "This command starts a new Docker container from the specified image. It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration. You can get an interactive shell running in the container using @command{docker exec}:" +#~ msgstr "Dieser Befehl startet einen neuen Docker-Container aus dem angegebenen Abbild. Damit wird das Guix-System auf die normale Weise hochgefahren, d.h.@: zunächst werden alle Dienste gestartet, die Sie in der Konfiguration des Betriebssystems angegeben haben. Sie können eine interaktive Shell in dieser isolierten Umgebung bekommen, indem Sie @command{docker exec} benutzen:" + +#~ msgid "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" +#~ msgstr "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n" + +#~ msgid "For the @code{container} action, allow containers to access the host network, that is, do not create a network namespace." +#~ msgstr "Für die Aktion @code{container} dürfen isolierte Umgebungen (auch bekannt als „Container“) auf das Wirtsnetzwerk zugreifen, d.h.@: es wird kein Netzwerknamensraum für sie erzeugt." + +#~ msgid "@code{auto-start?} (default: @code{#t})" +#~ msgstr "@code{auto-start?} (Vorgabe: @code{#t})" + +#~ msgid "Whether this service should be started automatically by the Shepherd. If it is @code{#f} the service has to be started manually with @code{herd start}." +#~ msgstr "Ob dieser Dienst automatisch durch Shepherd gestartet werden sollte. Wenn es auf @code{#f} steht, muss der Dienst manuell über @code{herd start} gestartet werden." #~ msgid "The @code{guix} package must remain available in @code{root}'s profile, or it would become subject to garbage collection---in which case you would find yourself badly handicapped by the lack of the @command{guix} command. In other words, do not remove @code{guix} by running @code{guix package -r guix}." #~ msgstr "Das @code{guix}-Paket muss im Profil von @code{root} installiert bleiben, damit es nicht vom Müllsammler geholt wird, denn ohne den @command{guix}-Befehl wären Sie lahmgelegt. Anders gesagt, entfernen Sie @code{guix} @emph{nicht} mit @code{guix package -r guix}." -- cgit v1.2.3 From a4915e14631e68202c96af41578de63b1b1581e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Aug 2019 22:28:23 +0200 Subject: nls: Update 'sv' translation. --- po/guix/sv.po | 2745 +++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 1969 insertions(+), 776 deletions(-) diff --git a/po/guix/sv.po b/po/guix/sv.po index b75269b82d..aa3968aaea 100644 --- a/po/guix/sv.po +++ b/po/guix/sv.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the guix package. # Sebastian Rasmussen , 2019. # +#: guix/ui.scm:206 msgid "" msgstr "" -"Project-Id-Version: guix 0.16.0\n" +"Project-Id-Version: guix 1.0.1-pre1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2018-11-28 15:05+0100\n" -"PO-Revision-Date: 2019-03-05 15:36+0800\n" +"POT-Creation-Date: 2019-05-10 20:54+0200\n" +"PO-Revision-Date: 2019-07-30 02:20+0200\n" "Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -19,12 +20,12 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 2.2.1\n" -#: gnu.scm:82 +#: gnu.scm:83 #, scheme-format msgid "module ~a not found" msgstr "modul ~a hittades inte" -#: gnu.scm:100 +#: gnu.scm:101 msgid "" "You may use @command{guix package --show=foo | grep location} to search\n" "for the location of package @code{foo}.\n" @@ -36,12 +37,12 @@ msgstr "" "Om du får raden @code{location: gnu/packages/bar.scm:174:2},\n" "lägg till @code{bar} till @code{use-package-modules}-formen." -#: gnu.scm:108 +#: gnu.scm:109 #, scheme-format msgid "Try adding @code{(use-package-modules ~a)}." msgstr "Prova att lägga till @code{(use-package-modules ~a)}." -#: gnu.scm:123 +#: gnu.scm:124 #, scheme-format msgid "" "You may use @command{guix system search ~a} to search for a service\n" @@ -54,47 +55,47 @@ msgstr "" "Om du får raden @code{location: gnu/services/foo.scm:188:2},\n" "lägg till @code{foo} till @code{use-service-modules}-formen." -#: gnu.scm:132 +#: gnu.scm:133 #, scheme-format msgid "Try adding @code{(use-service-modules ~a)}." msgstr "Prova att lägga till @code{(use-service-modules ~a)}." -#: gnu/packages.scm:94 +#: gnu/packages.scm:103 #, scheme-format msgid "~a: patch not found" msgstr "~a: programfix hittades inte" -#: gnu/packages.scm:110 +#: gnu/packages.scm:119 #, scheme-format msgid "could not find bootstrap binary '~a' for system '~a'" msgstr "kunde inte hitta uppstartsbinär ”~a” för system ”~a”" -#: gnu/packages.scm:270 +#: gnu/packages.scm:480 gnu/packages.scm:521 #, scheme-format msgid "ambiguous package specification `~a'~%" msgstr "tvetydig paketspecifikation ”~a”~%" -#: gnu/packages.scm:271 +#: gnu/packages.scm:481 gnu/packages.scm:522 #, scheme-format msgid "choosing ~a@~a from ~a~%" msgstr "väljer ~a@~a från ~a~%" -#: gnu/packages.scm:276 guix/scripts/package.scm:206 +#: gnu/packages.scm:486 guix/scripts/package.scm:212 #, scheme-format msgid "package '~a' has been superseded by '~a'~%" msgstr "paket ”~a” har ersatts av ”~a”~%" -#: gnu/packages.scm:283 +#: gnu/packages.scm:493 gnu/packages.scm:510 #, scheme-format msgid "~A: package not found for version ~a~%" msgstr "~A: paket hittades inte för version ~a~%" -#: gnu/packages.scm:284 +#: gnu/packages.scm:494 gnu/packages.scm:511 #, scheme-format msgid "~A: unknown package~%" msgstr "~A: okänt paket~%" -#: gnu/packages.scm:312 +#: gnu/packages.scm:546 #, scheme-format msgid "package `~a' lacks output `~a'~%" msgstr "paket ”~a” saknar utdata ”~a”~%" @@ -201,42 +202,42 @@ msgstr "mer än ett en måltjänst av typ ”~a”" msgid "service of type '~a' not found" msgstr "tjänst av typ ”~a” hittades inte" -#: gnu/system.scm:317 +#: gnu/system.scm:335 #, scheme-format msgid "unrecognized boot parameters at '~a'~%" msgstr "okänd startparameter vid ”~a”~%" -#: gnu/system.scm:725 +#: gnu/system.scm:736 #, scheme-format msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%" msgstr "användning av sträng för fil ”~a” är föråldrat; använd ”plain-file” istället~%" -#: gnu/system.scm:741 +#: gnu/system.scm:752 #, scheme-format msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%" msgstr "användning av ett monadiskt värdet för ”~a” är föråldrat; använd ”plain-file” istället~%" -#: gnu/system.scm:885 +#: gnu/system.scm:897 #, scheme-format msgid "~a: invalid locale name" msgstr "~a: ogiltigt lokalnamn" -#: gnu/services/shepherd.scm:192 +#: gnu/services/shepherd.scm:194 #, scheme-format msgid "service '~a' provided more than once" msgstr "tjänst ”~a” erbjud mer än en gång" -#: gnu/services/shepherd.scm:207 +#: gnu/services/shepherd.scm:209 #, scheme-format msgid "service '~a' requires '~a', which is not provided by any service" msgstr "tjänst ”~a” kräver ”~a”, vilken inte erbjuds av någon tjänst" -#: gnu/system/mapped-devices.scm:147 +#: gnu/system/mapped-devices.scm:136 #, scheme-format msgid "you may need these modules in the initrd for ~a:~{ ~a~}" msgstr "du kan behöver dessa moduler i initrd för ~a:~{ ~a~}" -#: gnu/system/mapped-devices.scm:151 +#: gnu/system/mapped-devices.scm:140 #, scheme-format msgid "" "Try adding them to the\n" @@ -267,42 +268,771 @@ msgstr "" "Om du tror att denna diagnostik är felaktig, använd flaggan\n" "@option{--skip-checks} med @command{guix system}.\n" -#: gnu/system/mapped-devices.scm:230 +#: gnu/system/mapped-devices.scm:219 #, scheme-format msgid "no LUKS partition with UUID '~a'" msgstr "ingen LUKS-partition med UUID ”~a”" -#: gnu/system/shadow.scm:258 +#: gnu/system/shadow.scm:236 #, scheme-format msgid "supplementary group '~a' of user '~a' is undeclared" msgstr "tilläggsgrupp ”~a” för användare ”~a” är odeklarerad" -#: gnu/system/shadow.scm:268 +#: gnu/system/shadow.scm:246 #, scheme-format msgid "primary group '~a' of user '~a' is undeclared" msgstr "primärgrupp ”~a” för användare ”~a” är odeklarerad" -#: guix/scripts.scm:60 +#: guix/import/opam.scm:133 +#, scheme-format +msgid "Package not found in opam repository: ~a~%" +msgstr "Paket hittades inte i opam-arkiv: ~a~%" + +#: guix/import/opam.scm:344 +msgid "Updater for OPAM packages" +msgstr "Uppdaterare för OPAM-paket" + +#: gnu/installer.scm:191 +msgid "Locale" +msgstr "Lokal" + +#: gnu/installer.scm:207 gnu/installer/newt/timezone.scm:58 +msgid "Timezone" +msgstr "Tidszon" + +#: gnu/installer.scm:223 +msgid "Keyboard mapping selection" +msgstr "Val av tangentbordsmappning" + +#: gnu/installer.scm:232 +msgid "Partitioning" +msgstr "Partitionering" + +#: gnu/installer.scm:240 gnu/installer/newt/hostname.scm:26 +msgid "Hostname" +msgstr "Värdnamn" + +#: gnu/installer.scm:249 +msgid "Network selection" +msgstr "Närverksval" + +#: gnu/installer.scm:256 gnu/installer/newt/user.scm:65 +#: gnu/installer/newt/user.scm:201 +msgid "User creation" +msgstr "Skapande av användare" + +#: gnu/installer.scm:264 +msgid "Services" +msgstr "Tjänster" + +#: gnu/installer.scm:271 gnu/installer/newt/final.scm:51 +msgid "Configuration file" +msgstr "Konfigurationsfil" + +#: gnu/installer/connman.scm:196 +msgid "Could not determine the state of connman." +msgstr "Kunde inte bestämma connman-tillstånd." + +#: gnu/installer/connman.scm:322 +msgid "Unable to find expected regexp." +msgstr "Kunde inte hitta förväntat reguljärt uttryck." + +#: gnu/installer/newt.scm:60 +#, scheme-format +msgid "The installer has encountered an unexpected problem. The backtrace is displayed below. Please report it by email to <~a>." +msgstr "Installeraren har anträffat ett oväntat problem. En bakåtspårning visas nedan. Rapportera den via e-post till <~a>." + +#: gnu/installer/newt.scm:63 +msgid "Unexpected problem" +msgstr "Oväntat problem" + +#: gnu/installer/newt/ethernet.scm:66 +msgid "No ethernet service available, please try again." +msgstr "Ingen ethernet-tjänst tillgänglig, försök igen." + +#: gnu/installer/newt/ethernet.scm:67 +msgid "No service" +msgstr "Ingen tjänst" + +#: gnu/installer/newt/ethernet.scm:76 +msgid "Please select an ethernet network." +msgstr "Välj ett ethernet-nätverk." + +#: gnu/installer/newt/ethernet.scm:77 +msgid "Ethernet connection" +msgstr "Ethernet-anslutning" + +#: gnu/installer/newt/ethernet.scm:81 gnu/installer/newt/keymap.scm:44 +#: gnu/installer/newt/locale.scm:43 gnu/installer/newt/network.scm:63 +#: gnu/installer/newt/network.scm:84 gnu/installer/newt/page.scm:175 +#: gnu/installer/newt/page.scm:508 gnu/installer/newt/page.scm:565 +#: gnu/installer/newt/partition.scm:54 gnu/installer/newt/partition.scm:83 +#: gnu/installer/newt/partition.scm:115 gnu/installer/newt/partition.scm:126 +#: gnu/installer/newt/partition.scm:624 gnu/installer/newt/partition.scm:645 +#: gnu/installer/newt/partition.scm:685 gnu/installer/newt/partition.scm:738 +#: gnu/installer/newt/partition.scm:749 gnu/installer/newt/services.scm:85 +#: gnu/installer/newt/timezone.scm:63 gnu/installer/newt/user.scm:200 +#: gnu/installer/newt/wifi.scm:202 +msgid "Exit" +msgstr "Avsluta" + +#: gnu/installer/newt/final.scm:44 +#, scheme-format +msgid "We're now ready to proceed with the installation! A system configuration file has been generated, it is displayed below. This file will be available as '~a' on the installed system. The new system will be created from this file once you've pressed OK. This will take a few minutes." +msgstr "Vi är nu redo att fortsätta med installationen! En systemkonfigurationsfil har genererats och visas nedan. Denna fil kommer att vara tillgänglig som ”~a” på det installerade systemet. Det nya systemet kommer att skapas från denna fil när du tryckt OK. Det kommer att ta ett par minuter." + +#: gnu/installer/newt/final.scm:64 +msgid "Installation complete" +msgstr "Installation fullständig" + +#: gnu/installer/newt/final.scm:65 gnu/installer/newt/welcome.scm:115 +msgid "Reboot" +msgstr "Omstart" + +#: gnu/installer/newt/final.scm:66 +msgid "Congratulations! Installation is now complete. You may remove the device containing the installation image and press the button to reboot." +msgstr "Grattis! Installationen är nu fullständig. Du kan ta bort enheten som innehåller installationavbilden och trycka på knappen för att starta om." + +#: gnu/installer/newt/final.scm:75 +msgid "Installation failed" +msgstr "Installationen misslyckades" + +#: gnu/installer/newt/final.scm:76 +msgid "Restart installer" +msgstr "Starta om installeraren" + +#: gnu/installer/newt/final.scm:77 +msgid "Retry system install" +msgstr "Försök att installera systemet igen" + +#: gnu/installer/newt/final.scm:78 +msgid "The final system installation step failed. You can retry the last step, or restart the installer." +msgstr "Det slutgiltiga steget i systeminstallationen misslyckades. Du kan prova detta sista steg igen, eller starta om installeraren." + +#: gnu/installer/newt/hostname.scm:25 +msgid "Please enter the system hostname." +msgstr "Mata in systemets värdnamn." + +#: gnu/installer/newt/keymap.scm:37 +msgid "Layout" +msgstr "Layout" + +#: gnu/installer/newt/keymap.scm:40 +msgid "Please choose your keyboard layout." +msgstr "Välj din tangentbordslayout." + +#: gnu/installer/newt/keymap.scm:52 +msgid "Variant" +msgstr "Variant" + +#: gnu/installer/newt/keymap.scm:55 +msgid "Please choose a variant for your keyboard layout." +msgstr "Välj en variant av din tangentbordslayout." + +#: gnu/installer/newt/keymap.scm:59 gnu/installer/newt/locale.scm:63 +#: gnu/installer/newt/locale.scm:78 gnu/installer/newt/locale.scm:94 +#: gnu/installer/newt/partition.scm:580 gnu/installer/newt/timezone.scm:64 +msgid "Back" +msgstr "Tillbaka" + +#: gnu/installer/newt/locale.scm:36 +msgid "Locale language" +msgstr "Lokalspråk" + +#: gnu/installer/newt/locale.scm:37 +msgid "Choose the language to use for the installation process and for the installed system." +msgstr "Välj språket som ska användas för installationsprocessen och för det installerade systemet." + +#: gnu/installer/newt/locale.scm:57 +msgid "Locale location" +msgstr "Lokalplats" + +#: gnu/installer/newt/locale.scm:60 +msgid "Choose a territory for this language." +msgstr "Välj ett territorium för detta språk." + +#: gnu/installer/newt/locale.scm:71 +msgid "Locale codeset" +msgstr "Lokalkoduppsättning" + +#: gnu/installer/newt/locale.scm:74 +msgid "Choose the locale encoding." +msgstr "Välj lokalkodning." + +#: gnu/installer/newt/locale.scm:86 +msgid "Locale modifier" +msgstr "Lokalmodifierare" + +#: gnu/installer/newt/locale.scm:89 +msgid "Choose your locale's modifier. The most frequent modifier is euro. It indicates that you want to use Euro as the currency symbol." +msgstr "Välj din lokals modifierare. Den mest frekventa modifieraren är euro. Den indikerar att du vill använda Euro som valutasymbol." + +#: gnu/installer/newt/locale.scm:190 +msgid "No location" +msgstr "Ingen plats" + +#: gnu/installer/newt/locale.scm:217 +msgid "No modifier" +msgstr "Ingen modifierare" + +#: gnu/installer/newt/menu.scm:35 +msgid "Choose where you want to resume the install. You can also abort the installation by pressing the Abort button." +msgstr "Välj var du vill återuppta installationen. Du kan också avbryta installationen genom att trycka på knappen Avbryt." + +#: gnu/installer/newt/menu.scm:37 +msgid "Installation menu" +msgstr "Installationsmeny" + +#: gnu/installer/newt/menu.scm:41 +msgid "Abort" +msgstr "Avbryt" + +#: gnu/installer/newt/network.scm:61 gnu/installer/newt/network.scm:80 +msgid "Internet access" +msgstr "Internetåtkomst" + +#: gnu/installer/newt/network.scm:62 gnu/installer/newt/page.scm:174 +msgid "Continue" +msgstr "Fortsätt" + +#: gnu/installer/newt/network.scm:64 +msgid "The install process requires Internet access but no network device were found. Do you want to continue anyway?" +msgstr "Installationsprocessen kräver internetåtkomst, men ingen nätverksenhet hittades. Vill du fortsätta ändå?" + +#: gnu/installer/newt/network.scm:78 +msgid "The install process requires Internet access. Please select a network device." +msgstr "Installationsprocessen kräver internetåtkomst. Välj en nätverksenhet." + +#: gnu/installer/newt/network.scm:103 +msgid "Powering technology" +msgstr "Strömsätter teknology" + +#: gnu/installer/newt/network.scm:104 +#, scheme-format +msgid "Waiting for technology ~a to be powered." +msgstr "Väntar på att teknologi ~a ska strömsättas." + +#: gnu/installer/newt/network.scm:124 +msgid "Checking connectivity" +msgstr "Kontrollerar anslutning" + +#: gnu/installer/newt/network.scm:125 +msgid "Waiting for Internet access establishment..." +msgstr "Väntar på att internetåtkomst ska etableras…" + +#: gnu/installer/newt/network.scm:135 +msgid "The selected network does not provide access to the Internet, please try again." +msgstr "Valt nätverk ger inte tillgång till internet, försök igen." + +#: gnu/installer/newt/network.scm:137 gnu/installer/newt/wifi.scm:106 +msgid "Connection error" +msgstr "Anslutningsfel" + +#: gnu/installer/newt/page.scm:71 +#, scheme-format +msgid "Connecting to ~a, please wait." +msgstr "Ansluter till ~a, vänta." + +#: gnu/installer/newt/page.scm:72 +msgid "Connection in progress" +msgstr "Anslutning pågår" + +#: gnu/installer/newt/page.scm:91 gnu/installer/newt/user.scm:58 +msgid "Hide" +msgstr "Göm" + +#: gnu/installer/newt/page.scm:97 gnu/installer/newt/page.scm:507 +#: gnu/installer/newt/page.scm:564 gnu/installer/newt/partition.scm:443 +#: gnu/installer/newt/partition.scm:623 gnu/installer/newt/partition.scm:644 +#: gnu/installer/newt/partition.scm:683 gnu/installer/newt/user.scm:63 +#: gnu/installer/newt/user.scm:199 +msgid "OK" +msgstr "OK" + +#: gnu/installer/newt/page.scm:123 +msgid "Please enter a non empty input." +msgstr "Mata in något i inmatningsfältet." + +#: gnu/installer/newt/page.scm:124 gnu/installer/newt/user.scm:119 +msgid "Empty input" +msgstr "Tom inmatning" + +#: gnu/installer/newt/partition.scm:45 +msgid "Everything is one partition" +msgstr "Allting är en partition" + +#: gnu/installer/newt/partition.scm:46 +msgid "Separate /home partition" +msgstr "Separat /home-partition" + +#: gnu/installer/newt/partition.scm:48 +msgid "Please select a partitioning scheme." +msgstr "Välj ett partitioneringsarrangemang." + +#: gnu/installer/newt/partition.scm:49 +msgid "Partition scheme" +msgstr "Partitioneringsarrangemang" + +#: gnu/installer/newt/partition.scm:61 +msgid "We are about to format your hard disk. All its data will be lost. Do you wish to continue?" +msgstr "Vi kommer strax att formatera din hårddisk. All dess data kommer att gå förlorad. Vill du fortsätta?" + +#: gnu/installer/newt/partition.scm:63 +msgid "Format disk?" +msgstr "Formatera disk?" + +#: gnu/installer/newt/partition.scm:66 +msgid "Partition formatting is in progress, please wait." +msgstr "Partitionsformattering pågår, vänta." + +#: gnu/installer/newt/partition.scm:67 +msgid "Preparing partitions" +msgstr "Förbereder partitioner" + +#: gnu/installer/newt/partition.scm:78 +msgid "Please select a disk." +msgstr "Välj en disk." + +#: gnu/installer/newt/partition.scm:79 +msgid "Disk" +msgstr "Disk" + +#: gnu/installer/newt/partition.scm:91 +msgid "Select a new partition table type. Be careful, all data on the disk will be lost." +msgstr "Välj ny paritionstabellstyp. Var försiktig, all data på disken kommer att gå förlorad." + +#: gnu/installer/newt/partition.scm:93 +msgid "Partition table" +msgstr "Partitionstabell" + +#: gnu/installer/newt/partition.scm:110 +msgid "Please select a partition type." +msgstr "Välj en partitionstyp." + +#: gnu/installer/newt/partition.scm:111 +msgid "Partition type" +msgstr "Partitionstyp" + +#: gnu/installer/newt/partition.scm:121 +msgid "Please select the file-system type for this partition." +msgstr "Välj filsystemstypen för denna partition." + +#: gnu/installer/newt/partition.scm:122 +msgid "File-system type" +msgstr "Filsystemstyp" + +#: gnu/installer/newt/partition.scm:135 +msgid "Primary partitions count exceeded." +msgstr "Antalet primära partitioner överskreds." + +#: gnu/installer/newt/partition.scm:136 gnu/installer/newt/partition.scm:141 +#: gnu/installer/newt/partition.scm:146 +msgid "Creation error" +msgstr "Fel vid skapande" + +#: gnu/installer/newt/partition.scm:140 +msgid "Extended partition creation error." +msgstr "Fel vid skapande av utökad partition." + +#: gnu/installer/newt/partition.scm:145 +msgid "Logical partition creation error." +msgstr "Fel vid skapande av logisk partition." + +#: gnu/installer/newt/partition.scm:159 +#, scheme-format +msgid "Please enter the password for the encryption of partition ~a (label: ~a)." +msgstr "Mata in lösenordet för krypteringen av partition ~a (etikett: ~a)." + +#: gnu/installer/newt/partition.scm:161 gnu/installer/newt/wifi.scm:91 +msgid "Password required" +msgstr "Lösenord krävs" + +#: gnu/installer/newt/partition.scm:166 +#, scheme-format +msgid "Please confirm the password for the encryption of partition ~a (label: ~a)." +msgstr "Bekräfta lösenordet för krypteringen av partition ~a (etikett: ~a)." + +#: gnu/installer/newt/partition.scm:168 gnu/installer/newt/user.scm:156 +msgid "Password confirmation required" +msgstr "Lösenordsbekräftelse krävs" + +#: gnu/installer/newt/partition.scm:180 gnu/installer/newt/user.scm:164 +msgid "Password mismatch, please try again." +msgstr "Lösenord stämmer inte, försök igen." + +#: gnu/installer/newt/partition.scm:181 gnu/installer/newt/user.scm:165 +msgid "Password error" +msgstr "Lösenordsfel" + +#: gnu/installer/newt/partition.scm:267 +msgid "Please enter the partition gpt name." +msgstr "Mata in GPT-partitionens namn." + +#: gnu/installer/newt/partition.scm:268 +msgid "Partition name" +msgstr "Partitionsnamn" + +#: gnu/installer/newt/partition.scm:298 +msgid "Please enter the encrypted label" +msgstr "Mata in den krypterade etiketten" + +#: gnu/installer/newt/partition.scm:299 +msgid "Encryption label" +msgstr "Krypteringsetikett" + +#: gnu/installer/newt/partition.scm:316 +#, scheme-format +msgid "Please enter the size of the partition. The maximum size is ~a." +msgstr "Mata in storleken på partitionen. Största storlek är ~a." + +#: gnu/installer/newt/partition.scm:318 +msgid "Partition size" +msgstr "Partitionsstorlek" + +#: gnu/installer/newt/partition.scm:336 +msgid "The percentage can not be superior to 100." +msgstr "Procentandelen kan inte vara större än 100." + +#: gnu/installer/newt/partition.scm:337 gnu/installer/newt/partition.scm:342 +#: gnu/installer/newt/partition.scm:347 +msgid "Size error" +msgstr "Storleksfel" + +#: gnu/installer/newt/partition.scm:341 +msgid "The requested size is incorrectly formatted, or too large." +msgstr "Den begärda storleken är felaktigt formatterad, eller för stor." + +#: gnu/installer/newt/partition.scm:346 +msgid "The request size is superior to the maximum size." +msgstr "Den begärda storleken är större än den största storleken." + +#: gnu/installer/newt/partition.scm:366 +msgid "Please enter the desired mounting point for this partition. Leave this field empty if you don't want to set a mounting point." +msgstr "Mata in den önskade monteringspunkten för denna partitionen. Lämna detta fält tomt om du inte vill sätta någon monteringspunkt." + +#: gnu/installer/newt/partition.scm:368 +msgid "Mounting point" +msgstr "Monteringspunkt" + +#: gnu/installer/newt/partition.scm:432 +#, scheme-format +msgid "Creating ~a partition starting at ~a of ~a." +msgstr "Skapar ~a-partition med början på ~a av ~a." + +#: gnu/installer/newt/partition.scm:434 +#, scheme-format +msgid "You are currently editing partition ~a." +msgstr "Du redigerar just nu partition ~a." + +#: gnu/installer/newt/partition.scm:437 +msgid "Partition creation" +msgstr "Partitionsskapande" + +#: gnu/installer/newt/partition.scm:438 +msgid "Partition edit" +msgstr "Partitionsredigering" + +#: gnu/installer/newt/partition.scm:620 +#, scheme-format +msgid "Are you sure you want to delete everything on disk ~a?" +msgstr "Är du säker på att du vill ta bort allting på disk ~a?" + +#: gnu/installer/newt/partition.scm:622 +msgid "Delete disk" +msgstr "Ta bort disk" + +#: gnu/installer/newt/partition.scm:636 +msgid "You cannot delete a free space area." +msgstr "Du kan inte ta bort fritt utrymme." + +#: gnu/installer/newt/partition.scm:637 gnu/installer/newt/partition.scm:643 +msgid "Delete partition" +msgstr "Ta bort partition" + +#: gnu/installer/newt/partition.scm:641 +#, scheme-format +msgid "Are you sure you want to delete partition ~a?" +msgstr "Är du säker på att du vill ta bort partition ~a?" + +#: gnu/installer/newt/partition.scm:658 +msgid "" +"You can change a disk's partition table by selecting it and pressing ENTER. You can also edit a partition by selecting it and pressing ENTER, or remove it by pressing DELETE. To create a new partition, select a free space area and press ENTER.\n" +"\n" +"At least one partition must have its mounting point set to '/'." +msgstr "" +"Du kan ändra en disks partitionstabell genom att välja den och trycka RETUR. Du kan också redigera en partition genom att välja den och trycka RETUR, eller ta bort den genom att trycka DELETE. För att skapa en ny partition, välj ett fritt utrymme och tryck RETUR.\n" +"\n" +"Åtminstone en partition måste ha dess monteringspunkt satt till ”/”." + +#: gnu/installer/newt/partition.scm:664 +#, scheme-format +msgid "This is the proposed partitioning. It is still possible to edit it or to go back to install menu by pressing the Exit button.~%~%" +msgstr "Detta är den föreslagna partitioneringen. Det är fortfarande möjligt att redigera den eller att gå tillbaka till installationsmenyn genom att trycka på knappen Avsluta.~%~%" + +#: gnu/installer/newt/partition.scm:674 +msgid "Guided partitioning" +msgstr "Guidad partitionering" + +#: gnu/installer/newt/partition.scm:675 +msgid "Manual partitioning" +msgstr "Manuell partitionering" + +#: gnu/installer/newt/partition.scm:694 +msgid "No root mount point found." +msgstr "Ingen rotmonteringspunkt hittad." + +#: gnu/installer/newt/partition.scm:695 +msgid "Missing mount point" +msgstr "Saknar monteringspunkt" + +#: gnu/installer/newt/partition.scm:728 +msgid "Guided - using the entire disk" +msgstr "Guidad - använd hela disken" + +#: gnu/installer/newt/partition.scm:729 +msgid "Guided - using the entire disk with encryption" +msgstr "Guidad - använd hela disken med kryptering" + +#: gnu/installer/newt/partition.scm:730 +msgid "Manual" +msgstr "Manuell" + +#: gnu/installer/newt/partition.scm:732 +msgid "Please select a partitioning method." +msgstr "Välj en partitioneringsmetod." + +#: gnu/installer/newt/partition.scm:733 +msgid "Partitioning method" +msgstr "Partitioneringsmetod" + +#: gnu/installer/newt/services.scm:36 +msgid "Please select the desktop(s) environment(s) you wish to install. If you select multiple desktops environments, you will be able to choose the one to use on the log-in screen." +msgstr "Välj de skrivbordsmiljöer du önskar installera. Om du väljer flera skrivbordsmiljöer kommer du att kunna välja vilken som ska användas på inloggningsskärmen." + +#: gnu/installer/newt/services.scm:39 +msgid "Desktop environment" +msgstr "Skrivbordsmiljö" + +#: gnu/installer/newt/services.scm:56 +msgid "You can now select networking services to run on your system." +msgstr "Du kan nu välja nätverkstjänster som ska köra på ditt system." + +#: gnu/installer/newt/services.scm:58 +msgid "Network service" +msgstr "Nätverkstjänst" + +#: gnu/installer/newt/services.scm:71 +msgid "Network management" +msgstr "Nätverkshantering" + +#: gnu/installer/newt/services.scm:74 +msgid "" +"Choose the method to manage network connections.\n" +"\n" +"We recommend NetworkManager or Connman for a WiFi-capable laptop; the DHCP client may be enough for a server." +msgstr "" +"Välj metod för att hantera nätverksanslutningar.\n" +"\n" +"Vi rekommenderar NetworkManager eller Connman för en bärbar dator med Wifi; DHCP-klienten kan vara tillräcklig för en server." + +#: gnu/installer/newt/timezone.scm:59 +msgid "Please select a timezone." +msgstr "Välj en tidszon." + +#: gnu/installer/newt/user.scm:43 +msgid "Name" +msgstr "Namn" + +#: gnu/installer/newt/user.scm:45 +msgid "Real name" +msgstr "Verkligt namn" + +#: gnu/installer/newt/user.scm:47 +msgid "Home directory" +msgstr "Hemkatalog" + +#: gnu/installer/newt/user.scm:49 +msgid "Password" +msgstr "Lösenord" + +#: gnu/installer/newt/user.scm:118 +msgid "Empty inputs are not allowed." +msgstr "Tomma inmatningsfält är inte tillåtna." + +#: gnu/installer/newt/user.scm:155 +msgid "Please confirm the password." +msgstr "Bekräfta lösenordet." + +#: gnu/installer/newt/user.scm:172 +msgid "Please choose a password for the system administrator (\"root\")." +msgstr "Välj ett lösenord för systemadministratören (”root”)." + +#: gnu/installer/newt/user.scm:174 +msgid "System administrator password" +msgstr "Systemadministratörslösenord" + +#: gnu/installer/newt/user.scm:187 +msgid "Please add at least one user to system using the 'Add' button." +msgstr "Lägg till åtminstone en användare till systemet via knappen ”Lägg till”." + +#: gnu/installer/newt/user.scm:190 +msgid "Add" +msgstr "Lägg till" + +#: gnu/installer/newt/user.scm:191 +msgid "Delete" +msgstr "Ta bort" + +#: gnu/installer/newt/user.scm:250 +msgid "Please create at least one user." +msgstr "Skapa åtminstone en användaren." + +#: gnu/installer/newt/user.scm:251 +msgid "No user" +msgstr "Ingen användare" + +#: gnu/installer/newt/welcome.scm:95 +msgid "GNU Guix install" +msgstr "GNU Guix-installerare" + +#: gnu/installer/newt/welcome.scm:96 +msgid "" +"Welcome to GNU Guix system installer!\n" +"\n" +"You will be guided through a graphical installation program.\n" +"\n" +"If you are familiar with GNU/Linux and you want tight control over the installation process, you can instead choose manual installation. Documentation is accessible at any time by pressing Ctrl-Alt-F2." +msgstr "" +"Välkommen till GNU Guix-systeminstallerare!\n" +"\n" +"Du kommer att guidas genom ett grafiskt installationsprogram.\n" +"\n" +"Om du är bekant med GNU/Linux och du vill ha noggrann kontroll över installationsprocessen kan du istället välja manuell installation. Dokumentation är tillgänglig när som helst genom att trycka på Ctrl-Alt-F2." + +#: gnu/installer/newt/welcome.scm:105 +msgid "Graphical install using a terminal based interface" +msgstr "Grafisk installation genom ett terminalbaserat gränssnitt" + +#: gnu/installer/newt/welcome.scm:108 +msgid "Install using the shell based process" +msgstr "Installation via skalbaseradprocess" + +#: gnu/installer/newt/wifi.scm:81 +msgid "Unable to find a wifi technology" +msgstr "Kan inte hitta wifi-teknologi" + +#: gnu/installer/newt/wifi.scm:85 +msgid "Scanning wifi for available networks, please wait." +msgstr "Söker via wifi efter tillgängliga nätverk, vänta." + +#: gnu/installer/newt/wifi.scm:86 +msgid "Scan in progress" +msgstr "Sökning pågår" + +#: gnu/installer/newt/wifi.scm:90 +msgid "Please enter the wifi password." +msgstr "Mata in wifi-lösenordet." + +#: gnu/installer/newt/wifi.scm:96 +#, scheme-format +msgid "The password you entered for ~a is incorrect." +msgstr "Lösenordet du angav för ~a är felaktigt." + +#: gnu/installer/newt/wifi.scm:98 +msgid "Wrong password" +msgstr "Felaktig lösenord" + +#: gnu/installer/newt/wifi.scm:104 +#, scheme-format +msgid "An error occurred while trying to connect to ~a, please retry." +msgstr "Ett fel uppstod vid försök att ansluta till ~a, försök igen." + +#: gnu/installer/newt/wifi.scm:197 +msgid "Please select a wifi network." +msgstr "Välj ett wifi-lösenord." + +#: gnu/installer/newt/wifi.scm:203 +msgid "Scan" +msgstr "Sök" + +#: gnu/installer/newt/wifi.scm:208 +msgid "No wifi detected" +msgstr "Inget wifi hittades" + +#: gnu/installer/newt/wifi.scm:223 +msgid "Wifi" +msgstr "Wifi" + +#: gnu/installer/parted.scm:428 gnu/installer/parted.scm:465 +msgid "Free space" +msgstr "Fritt utrymme" + +#: gnu/installer/parted.scm:1345 +#, scheme-format +msgid "Device ~a is still in use." +msgstr "Enhet ~a används fortfarande." + +#: gnu/installer/services.scm:85 +msgid "OpenSSH secure shell daemon (sshd)" +msgstr "OpenSSH-demon för säkert skal (sshd)" + +#: gnu/installer/services.scm:89 +msgid "Tor anonymous network router" +msgstr "Router för det anonyma nätverket Tor" + +#: gnu/installer/services.scm:93 +msgid "Mozilla NSS certificates, for HTTPS access" +msgstr "Mozilla NSS-certifikat för HTTPS-åtkomst" + +#: gnu/installer/services.scm:100 +msgid "NetworkManager network connection manager" +msgstr "Nätverksanslutningshanteraren NetworkManager" + +#: gnu/installer/services.scm:105 +msgid "Connman network connection manager" +msgstr "Nätverksanslutningshanteraren Connman" + +#: gnu/installer/services.scm:110 +msgid "DHCP client (dynamic IP address assignment)" +msgstr "DHCP-klient (dynamisk IP-adresstilldelning)" + +#: gnu/installer/timezone.scm:110 +#, scheme-format +msgid "Unable to locate path: ~a." +msgstr "Kan inte hitta sökväg: ~a." + +#: gnu/installer/utils.scm:64 +#, scheme-format +msgid "Press Enter to continue.~%" +msgstr "Tryck på RETUR för att fortsätta.~%" + +#: gnu/installer/utils.scm:86 +#, scheme-format +msgid "Command failed with exit code ~a.~%" +msgstr "Kommando misslyckades med avslutningskod ~a.~%" + +#: guix/scripts.scm:61 #, scheme-format msgid "invalid argument: ~a~%" msgstr "ogiltigt argument: ~a~%" -#: guix/scripts.scm:88 guix/scripts/download.scm:135 -#: guix/scripts/import/cran.scm:84 guix/scripts/import/elpa.scm:85 -#: guix/scripts/publish.scm:881 guix/scripts/edit.scm:81 -#: guix/scripts/describe.scm:197 guix/scripts/processes.scm:216 +#: guix/scripts.scm:89 guix/scripts/download.scm:135 +#: guix/scripts/search.scm:60 guix/scripts/import/cran.scm:84 +#: guix/scripts/import/elpa.scm:85 guix/scripts/publish.scm:888 +#: guix/scripts/edit.scm:79 guix/scripts/describe.scm:205 +#: guix/scripts/processes.scm:230 #, scheme-format msgid "~A: unrecognized option~%" msgstr "~A: okänd flagga~%" -#: guix/scripts.scm:182 +#: guix/scripts.scm:172 #, scheme-format msgid "Your Guix installation is ~a day old.\n" msgid_plural "Your Guix installation is ~a days old.\n" msgstr[0] "Din Guix-installation är ~a dag gammal.\n" msgstr[1] "Din Guix-installation är ~a dagar gammal.\n" -#: guix/scripts.scm:187 +#: guix/scripts.scm:178 #, scheme-format msgid "" "Consider running 'guix pull' followed by\n" @@ -311,54 +1041,48 @@ msgstr "" "Överväg att köra ”guix pull” följt av\n" "”~a” för att få uppdaterade paket och säkerhetsfixar.\n" -#: guix/scripts.scm:211 +#: guix/scripts.scm:202 #, scheme-format msgid "only ~,1f% of free space available on ~a~%" msgstr "endast ~,1f% fritt utrymme tillgängligt på ~a~%" -#: guix/scripts.scm:214 -#, scheme-format +#: guix/scripts.scm:204 msgid "" "Consider deleting old profile\n" "generations and collecting garbage, along these lines:\n" "\n" "@example\n" -"guix package -p ~s --delete-generations=1m\n" -"guix gc\n" +"guix gc --delete-generations=1m\n" "@end example\n" msgstr "" "Överväg att ta bort gamla profilgenerationer\n" -"och att skräpsamla med dessa rader:\n" +"och att skräpsamla på detta sätt:\n" "\n" "@example\n" -"guix package -p ~s --delete-generations=1m\n" -"guix gc\n" +"guix gc --delete-generations=1m\n" "@end example\n" -#: guix/scripts.scm:222 -msgid "" -"Consider running @command{guix gc} to free\n" -"space." -msgstr "" -"Överväg att köra @command{guix gc} för att\n" -"frigöra utrymme." - -#: guix/scripts/build.scm:84 +#: guix/scripts/build.scm:86 #, scheme-format msgid "cannot access build log at '~a':~%" msgstr "kan inte komma åt bygglogg vid ”~a”:~%" -#: guix/scripts/build.scm:138 +#: guix/scripts/build.scm:140 #, scheme-format msgid "failed to create GC root `~a': ~a~%" msgstr "misslyckades med att skapa GC-rot ”~a”: ~a~%" -#: guix/scripts/build.scm:240 +#: guix/scripts/build.scm:245 guix/scripts/build.scm:310 #, scheme-format msgid "invalid replacement specification: ~s~%" msgstr "ogiltig ersättningsspecifikation: ~s~%" -#: guix/scripts/build.scm:297 +#: guix/scripts/build.scm:292 +#, scheme-format +msgid "the source of ~a is not a Git reference~%" +msgstr "källan för ~a är inte en Git-referens~%" + +#: guix/scripts/build.scm:417 msgid "" "\n" " --with-source=SOURCE\n" @@ -368,7 +1092,7 @@ msgstr "" " --with-source=KÄLLA\n" " använd KÄLLA när motsvarande paket byggs" -#: guix/scripts/build.scm:300 +#: guix/scripts/build.scm:420 msgid "" "\n" " --with-input=PACKAGE=REPLACEMENT\n" @@ -378,7 +1102,7 @@ msgstr "" " --with-input=PAKET=ERSÄTTNING\n" " ersätt PAKET-beroende med ERSÄTTNING" -#: guix/scripts/build.scm:303 +#: guix/scripts/build.scm:423 msgid "" "\n" " --with-graft=PACKAGE=REPLACEMENT\n" @@ -388,12 +1112,42 @@ msgstr "" " --with-graft=PAKET=ERSÄTTNING\n" " ympa in ERSÄTTNING för paket som refererar till PAKET" -#: guix/scripts/build.scm:328 +#: guix/scripts/build.scm:426 +msgid "" +"\n" +" --with-branch=PACKAGE=BRANCH\n" +" build PACKAGE from the latest commit of BRANCH" +msgstr "" +"\n" +" --with-gren=PAKET=GREN\n" +" bygg PAKET från senaste incheckningen på GREN" + +#: guix/scripts/build.scm:429 +msgid "" +"\n" +" --with-commit=PACKAGE=COMMIT\n" +" build PACKAGE from COMMIT" +msgstr "" +"\n" +" --with-commit=PAKET=INCHECKNING\n" +" bygg PAKET från INCHECKNING" + +#: guix/scripts/build.scm:432 +msgid "" +"\n" +" --with-git-url=PACKAGE=URL\n" +" build PACKAGE from the repository at URL" +msgstr "" +"\n" +" --with-git-url=PAKET=URL\n" +" bygg PAKET från arkivet vid URL" + +#: guix/scripts/build.scm:463 #, scheme-format msgid "transformation '~a' had no effect on ~a~%" msgstr "transformation ”~a” hade ingen effekt på ~a~%" -#: guix/scripts/build.scm:346 +#: guix/scripts/build.scm:481 msgid "" "\n" " -L, --load-path=DIR prepend DIR to the package module search path" @@ -401,7 +1155,7 @@ msgstr "" "\n" " -L, --load-path=KAT skjut in KAT i början på sökväg för paketmoduler" -#: guix/scripts/build.scm:348 +#: guix/scripts/build.scm:483 msgid "" "\n" " -K, --keep-failed keep build tree of failed builds" @@ -409,7 +1163,7 @@ msgstr "" "\n" " -K, --keep-failed behåll byggträd för misslyckade byggen" -#: guix/scripts/build.scm:350 +#: guix/scripts/build.scm:485 msgid "" "\n" " -k, --keep-going keep going when some of the derivations fail" @@ -417,7 +1171,7 @@ msgstr "" "\n" " -k, --keep-going fortsätt även om några av härledningarna misslyckades" -#: guix/scripts/build.scm:352 +#: guix/scripts/build.scm:487 msgid "" "\n" " -n, --dry-run do not build the derivations" @@ -425,220 +1179,294 @@ msgstr "" "\n" " -n, --dry-run bygg inte härledningarna" -#: guix/scripts/build.scm:354 +#: guix/scripts/build.scm:489 msgid "" "\n" " --fallback fall back to building when the substituter fails" msgstr "" +"\n" +" --fallback fall tillbaka på att bygga när ersättaren misslyckas" -#: guix/scripts/build.scm:356 +#: guix/scripts/build.scm:491 msgid "" "\n" " --no-substitutes build instead of resorting to pre-built substitutes" msgstr "" +"\n" +" --no-substitutes bygg istället för att tillgripa fröbyggda ersättningar" -#: guix/scripts/build.scm:358 guix/scripts/size.scm:223 +#: guix/scripts/build.scm:493 guix/scripts/size.scm:233 msgid "" "\n" " --substitute-urls=URLS\n" " fetch substitute from URLS if they are authorized" msgstr "" +"\n" +" --substitute-urls=URLER\n" +" hämta ersättning från URLER om de auktoriserade" -#: guix/scripts/build.scm:361 +#: guix/scripts/build.scm:496 msgid "" "\n" " --no-grafts do not graft packages" msgstr "" +"\n" +" --no-grafts ympa inte paket" -#: guix/scripts/build.scm:363 +#: guix/scripts/build.scm:498 msgid "" "\n" " --no-build-hook do not attempt to offload builds via the build hook" msgstr "" +"\n" +" --no-build-hook försök inte att avlasta byggen via byggkroken" -#: guix/scripts/build.scm:365 +#: guix/scripts/build.scm:500 msgid "" "\n" " --max-silent-time=SECONDS\n" " mark the build as failed after SECONDS of silence" msgstr "" +"\n" +" --max-silent-time=SEKUNDER\n" +" markera bygget som misslyckat efter tystnad under givet antal SEKUNDER" -#: guix/scripts/build.scm:368 +#: guix/scripts/build.scm:503 msgid "" "\n" " --timeout=SECONDS mark the build as failed after SECONDS of activity" msgstr "" - -#: guix/scripts/build.scm:370 -msgid "" "\n" -" --verbosity=LEVEL use the given verbosity LEVEL" -msgstr "" +" --timeout=SEKUNDER markera bygget som misslyckat efter aktivetet under givet antal SEKUNDER" -#: guix/scripts/build.scm:372 +#: guix/scripts/build.scm:505 msgid "" "\n" " --rounds=N build N times in a row to detect non-determinism" msgstr "" +"\n" +" --rounds=N bygg N gånger i rad för att detektera ickedeterminism" -#: guix/scripts/build.scm:374 +#: guix/scripts/build.scm:507 msgid "" "\n" " -c, --cores=N allow the use of up to N CPU cores for the build" msgstr "" +"\n" +" -c, --cores=N tillåt använding av upp till N CPU-kärnor för bygget" -#: guix/scripts/build.scm:376 +#: guix/scripts/build.scm:509 msgid "" "\n" " -M, --max-jobs=N allow at most N build jobs" msgstr "" +"\n" +" -M, --max-jobs=N tillåt som mest N byggjobb" -#: guix/scripts/build.scm:486 guix/scripts/build.scm:493 +#: guix/scripts/build.scm:511 +msgid "" +"\n" +" --debug=LEVEL produce debugging output at LEVEL" +msgstr "" +"\n" +" --debug=NIVÅ producera felsökningsutmatning på NIVÅ" + +#: guix/scripts/build.scm:621 guix/scripts/build.scm:628 #, scheme-format msgid "not a number: '~a' option argument: ~a~%" -msgstr "" +msgstr "inte ett tal: ”~a”-flaggargument: ~a~%" -#: guix/scripts/build.scm:514 +#: guix/scripts/build.scm:649 msgid "" "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n" "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n" msgstr "" +"Användning: guix build [FLAGGA]… PAKET-ELLER-HÄRLEDNING…\n" +"Bygg givet PAKET-ELLER-HÄRLEDNING och returnera deras utmatningssökvägar.\n" -#: guix/scripts/build.scm:516 +#: guix/scripts/build.scm:651 msgid "" "\n" " -e, --expression=EXPR build the package or derivation EXPR evaluates to" msgstr "" +"\n" +" -e, --expression=UTR bygg paketet eller härledningen som UTR utvärderas till" -#: guix/scripts/build.scm:518 +#: guix/scripts/build.scm:653 msgid "" "\n" " -f, --file=FILE build the package or derivation that the code within\n" " FILE evaluates to" msgstr "" +"\n" +" -f, --file=FIL bygg paketet eller härdledningen som koden inuti\n" +" FIL utvärderas till" -#: guix/scripts/build.scm:521 +#: guix/scripts/build.scm:656 msgid "" "\n" " -S, --source build the packages' source derivations" msgstr "" +"\n" +" -S, --source bygg paketens källhärledningar" -#: guix/scripts/build.scm:523 +#: guix/scripts/build.scm:658 msgid "" "\n" " --sources[=TYPE] build source derivations; TYPE may optionally be one\n" " of \"package\", \"all\" (default), or \"transitive\"" msgstr "" +"\n" +" --sources[=TYP] bygg källhärledningar; TYP kan valfritt vara enderas av\n" +" ”package”, ”all” (standardvärde) eller ”transitive”" -#: guix/scripts/build.scm:526 guix/scripts/pack.scm:712 +#: guix/scripts/build.scm:661 guix/scripts/pull.scm:97 +#: guix/scripts/pack.scm:754 msgid "" "\n" " -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"" msgstr "" +"\n" +" -s, --system=SYSTEM försök att bygga för SYSTEM — t.ex. ”i686-linux”" -#: guix/scripts/build.scm:528 guix/scripts/pack.scm:714 +#: guix/scripts/build.scm:663 guix/scripts/pack.scm:756 msgid "" "\n" " --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"" msgstr "" +"\n" +" --target=TRIPPLETT korsbygge för TRIPPLETT — t.ex. ”armel-linux-gnu”" -#: guix/scripts/build.scm:530 +#: guix/scripts/build.scm:665 msgid "" "\n" " -d, --derivations return the derivation paths of the given packages" msgstr "" +"\n" +" -d, --derivations returnera härledningssökvägar för de givna paketen" -#: guix/scripts/build.scm:532 +#: guix/scripts/build.scm:667 msgid "" "\n" " --check rebuild items to check for non-determinism issues" msgstr "" +"\n" +" --check bygg om objekt för att leta efter ickedeterministiska problem" -#: guix/scripts/build.scm:534 +#: guix/scripts/build.scm:669 msgid "" "\n" " --repair repair the specified items" msgstr "" +"\n" +" --repair reparera angivna objekt" -#: guix/scripts/build.scm:536 +#: guix/scripts/build.scm:671 msgid "" "\n" " -r, --root=FILE make FILE a symlink to the result, and register it\n" " as a garbage collector root" msgstr "" +"\n" +" -r, --root=FIL gör FIL till en symbolisk länk till resultatet, och registrera den\n" +" som en skräpsamlarrot" -#: guix/scripts/build.scm:539 +#: guix/scripts/build.scm:674 guix/scripts/package.scm:364 +#: guix/scripts/install.scm:36 guix/scripts/remove.scm:36 +#: guix/scripts/upgrade.scm:36 guix/scripts/pull.scm:95 +#: guix/scripts/system.scm:1032 guix/scripts/copy.scm:120 +#: guix/scripts/pack.scm:771 +msgid "" +"\n" +" -v, --verbosity=LEVEL use the given verbosity LEVEL" +msgstr "" +"\n" +" -v, --verbosity=NIVÅ använd angiven NIVÅ av utförlighet" + +#: guix/scripts/build.scm:676 msgid "" "\n" " -q, --quiet do not show the build log" msgstr "" +"\n" +" -q, --quiet visa inte byggloggen" -#: guix/scripts/build.scm:541 +#: guix/scripts/build.scm:678 msgid "" "\n" " --log-file return the log file names for the given derivations" msgstr "" +"\n" +" --log-file returnera loggfilnamnen för angivna härledningar" -#: guix/scripts/build.scm:548 guix/scripts/download.scm:83 -#: guix/scripts/package.scm:366 guix/scripts/gc.scm:76 -#: guix/scripts/hash.scm:60 guix/scripts/import.scm:93 -#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:95 -#: guix/scripts/substitute.scm:889 guix/scripts/system.scm:1017 -#: guix/scripts/lint.scm:1115 guix/scripts/publish.scm:94 -#: guix/scripts/edit.scm:44 guix/scripts/size.scm:234 -#: guix/scripts/graph.scm:472 guix/scripts/challenge.scm:241 -#: guix/scripts/copy.scm:122 guix/scripts/pack.scm:730 -#: guix/scripts/weather.scm:259 guix/scripts/describe.scm:71 -#: guix/scripts/processes.scm:200 guix/scripts/container.scm:34 -#: guix/scripts/container/exec.scm:43 +#: guix/scripts/build.scm:685 guix/scripts/download.scm:83 +#: guix/scripts/package.scm:382 guix/scripts/install.scm:43 +#: guix/scripts/remove.scm:41 guix/scripts/upgrade.scm:43 +#: guix/scripts/search.scm:34 guix/scripts/gc.scm:84 guix/scripts/hash.scm:60 +#: guix/scripts/import.scm:93 guix/scripts/import/cran.scm:47 +#: guix/scripts/pull.scm:103 guix/scripts/substitute.scm:898 +#: guix/scripts/system.scm:1035 guix/scripts/lint.scm:1180 +#: guix/scripts/publish.scm:94 guix/scripts/edit.scm:43 +#: guix/scripts/size.scm:244 guix/scripts/graph.scm:499 +#: guix/scripts/challenge.scm:241 guix/scripts/copy.scm:125 +#: guix/scripts/pack.scm:776 guix/scripts/weather.scm:270 +#: guix/scripts/describe.scm:72 guix/scripts/processes.scm:214 +#: guix/scripts/container.scm:34 guix/scripts/container/exec.scm:43 msgid "" "\n" " -h, --help display this help and exit" msgstr "" +"\n" +" -h, --help visa denna hjälp och avsluta" -#: guix/scripts/build.scm:550 guix/scripts/download.scm:85 -#: guix/scripts/package.scm:368 guix/scripts/gc.scm:78 -#: guix/scripts/hash.scm:62 guix/scripts/import.scm:95 -#: guix/scripts/import/cran.scm:51 guix/scripts/pull.scm:97 -#: guix/scripts/substitute.scm:891 guix/scripts/system.scm:1019 -#: guix/scripts/lint.scm:1119 guix/scripts/publish.scm:96 -#: guix/scripts/edit.scm:46 guix/scripts/size.scm:236 -#: guix/scripts/graph.scm:474 guix/scripts/challenge.scm:243 -#: guix/scripts/copy.scm:124 guix/scripts/pack.scm:732 -#: guix/scripts/weather.scm:261 guix/scripts/describe.scm:73 -#: guix/scripts/processes.scm:202 guix/scripts/container.scm:36 -#: guix/scripts/container/exec.scm:45 +#: guix/scripts/build.scm:687 guix/scripts/download.scm:85 +#: guix/scripts/package.scm:384 guix/scripts/install.scm:45 +#: guix/scripts/remove.scm:43 guix/scripts/upgrade.scm:45 +#: guix/scripts/search.scm:36 guix/scripts/gc.scm:86 guix/scripts/hash.scm:62 +#: guix/scripts/import.scm:95 guix/scripts/import/cran.scm:51 +#: guix/scripts/pull.scm:105 guix/scripts/substitute.scm:900 +#: guix/scripts/system.scm:1037 guix/scripts/lint.scm:1184 +#: guix/scripts/publish.scm:96 guix/scripts/edit.scm:45 +#: guix/scripts/size.scm:246 guix/scripts/graph.scm:501 +#: guix/scripts/challenge.scm:243 guix/scripts/copy.scm:127 +#: guix/scripts/pack.scm:778 guix/scripts/weather.scm:272 +#: guix/scripts/describe.scm:74 guix/scripts/processes.scm:216 +#: guix/scripts/container.scm:36 guix/scripts/container/exec.scm:45 msgid "" "\n" " -V, --version display version information and exit" msgstr "" +"\n" +" -V, --version visa versionsinformation och avsluta" -#: guix/scripts/build.scm:577 +#: guix/scripts/build.scm:714 #, scheme-format msgid "" "invalid argument: '~a' option argument: ~a, ~\n" "must be one of 'package', 'all', or 'transitive'~%" msgstr "" +"ogiltigt argument: ”~a”-flaggargument: ~a, ~\n" +"måste vara endera av ”package”, ”all” eller ”trasitive”~%" -#: guix/scripts/build.scm:630 +#: guix/scripts/build.scm:772 #, scheme-format msgid "~s: not something we can build~%" -msgstr "" +msgstr "~s: inte något vi kan bygga~%" -#: guix/scripts/build.scm:688 +#: guix/scripts/build.scm:837 #, scheme-format msgid "~a: warning: package '~a' has no source~%" -msgstr "" +msgstr "~a: varning: paket ”~a” har ingen källa~%" -#: guix/scripts/build.scm:726 +#: guix/scripts/build.scm:885 #, scheme-format msgid "no build log for '~a'~%" -msgstr "" +msgstr "ingen bygglogg för ”~a”~%" -#: guix/discovery.scm:91 +#: guix/discovery.scm:92 #, scheme-format msgid "cannot access `~a': ~a~%" -msgstr "" +msgstr "kan inte komma åt ”~a”: ~a~%" #: guix/scripts/download.scm:69 msgid "" @@ -649,12 +1477,20 @@ msgid "" "Supported formats: 'nix-base32' (default), 'base32', and 'base16'\n" "('hex' and 'hexadecimal' can be used as well).\n" msgstr "" +"Användning: guix download [FLAGGA] URL\n" +"Hämta filen vid URL till arkivet eller till den givna filen, och skriv ut dess\n" +"filnamn och hashen av dess innehåll.\n" +"\n" +"Format som stöds: ”nix-base32” (standardvärde), ”base32” och ”base16”\n" +"(”hex” och ”hexadecimal” kan också användas.)\n" #: guix/scripts/download.scm:75 guix/scripts/hash.scm:55 msgid "" "\n" " -f, --format=FMT write the hash in the given format" msgstr "" +"\n" +" -f, --format=FMT skriv hash i angivet format" #: guix/scripts/download.scm:77 msgid "" @@ -662,318 +1498,424 @@ msgid "" " --no-check-certificate\n" " do not validate the certificate of HTTPS servers " msgstr "" +"\n" +" --no-check-certificate\n" +" validera inte certifiakt från HTTPS-servrar" #: guix/scripts/download.scm:80 msgid "" "\n" " -o, --output=FILE download to FILE" msgstr "" +"\n" +" -o, --output=FIL hämta till FIL" #: guix/scripts/download.scm:103 guix/scripts/hash.scm:83 #, scheme-format msgid "unsupported hash format: ~a~%" -msgstr "" +msgstr "hashformat stöds inte: ~a~%" -#: guix/scripts/download.scm:138 guix/scripts/package.scm:905 -#: guix/scripts/publish.scm:883 +#: guix/scripts/download.scm:138 guix/scripts/package.scm:900 +#: guix/scripts/upgrade.scm:79 guix/scripts/publish.scm:890 #, scheme-format msgid "~A: extraneous argument~%" -msgstr "" +msgstr "~A: främmande argument~%" #: guix/scripts/download.scm:146 #, scheme-format msgid "no download URI was specified~%" -msgstr "" +msgstr "ingen hämtnings-URI angavs~%" #: guix/scripts/download.scm:151 #, scheme-format msgid "~a: failed to parse URI~%" -msgstr "" +msgstr "~a: misslyckades med att tolka URI~%" #: guix/scripts/download.scm:161 #, scheme-format msgid "~a: download failed~%" -msgstr "" +msgstr "~a: hämtning misslyckades~%" -#: guix/scripts/package.scm:109 +#: guix/scripts/package.scm:115 #, scheme-format msgid "not removing generation ~a, which is current~%" -msgstr "" +msgstr "tar inte bort generation ~a, då den är aktuell~%" -#: guix/scripts/package.scm:116 +#: guix/scripts/package.scm:122 #, scheme-format msgid "no matching generation~%" -msgstr "" +msgstr "ingen matchande generation~%" -#: guix/scripts/package.scm:119 guix/scripts/package.scm:707 -#: guix/scripts/system.scm:622 +#: guix/scripts/package.scm:125 guix/scripts/package.scm:697 +#: guix/scripts/system.scm:626 #, scheme-format msgid "invalid syntax: ~a~%" -msgstr "" +msgstr "ogiltig syntax: ~a~%" -#: guix/scripts/package.scm:148 +#: guix/scripts/package.scm:154 #, scheme-format msgid "nothing to be done~%" -msgstr "" +msgstr "ingenting att göra~%" -#: guix/scripts/package.scm:162 +#: guix/scripts/package.scm:168 #, scheme-format msgid "~a package in profile~%" msgid_plural "~a packages in profile~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "~a paket i profil~%" +msgstr[1] "~a paket i profil~%" -#: guix/scripts/package.scm:248 +#: guix/scripts/package.scm:255 #, scheme-format msgid "package '~a' no longer exists~%" -msgstr "" +msgstr "paket ”~a” finns inte längre~%" -#: guix/scripts/package.scm:286 +#: guix/scripts/package.scm:301 #, scheme-format msgid "The following environment variable definitions may be needed:~%" -msgstr "" +msgstr "Följande definitioner av miljövariabler kan behövas: ~%" -#: guix/scripts/package.scm:305 +#: guix/scripts/package.scm:321 msgid "" "Usage: guix package [OPTION]...\n" "Install, remove, or upgrade packages in a single transaction.\n" msgstr "" +"Användning: guis package [FLAGGA]…\n" +"Installera, ta bort eller uppgradera paket i en enstaka transaktion.\n" -#: guix/scripts/package.scm:307 +#: guix/scripts/package.scm:323 msgid "" "\n" " -i, --install PACKAGE ...\n" " install PACKAGEs" msgstr "" +"\n" +" -i, --install PACKET …\n" +" installera PAKET" -#: guix/scripts/package.scm:310 +#: guix/scripts/package.scm:326 msgid "" "\n" " -e, --install-from-expression=EXP\n" " install the package EXP evaluates to" msgstr "" +"\n" +" -e, --install-from-expression=UTR\n" +" installera paketet som UTR utvärderas till" -#: guix/scripts/package.scm:313 +#: guix/scripts/package.scm:329 msgid "" "\n" " -f, --install-from-file=FILE\n" " install the package that the code within FILE\n" " evaluates to" msgstr "" +"\n" +" -f, --install-from-file=FIL\n" +" installera paketet som koden inuti FIL\n" +" utvärderas till" -#: guix/scripts/package.scm:317 +#: guix/scripts/package.scm:333 msgid "" "\n" " -r, --remove PACKAGE ...\n" " remove PACKAGEs" msgstr "" +"\n" +" -r, --remove PAKET …\n" +" ta bort PAKET" -#: guix/scripts/package.scm:320 +#: guix/scripts/package.scm:336 msgid "" "\n" " -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP" msgstr "" +"\n" +" -u, --upgrade[=REGUTR] uppgradera alla interallerade paket som matchar REGUTR" -#: guix/scripts/package.scm:322 +#: guix/scripts/package.scm:338 msgid "" "\n" " -m, --manifest=FILE create a new profile generation with the manifest\n" " from FILE" msgstr "" +"\n" +" -m, --manifest=FIL skapa en ny profilgeneration med manifestet\n" +" från FIL" -#: guix/scripts/package.scm:325 +#: guix/scripts/package.scm:341 msgid "" "\n" " --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP" msgstr "" +"\n" +" --do-not-upgrade[=REGUTR] uppgradera inte något av de paket som matchar REGUTR" -#: guix/scripts/package.scm:327 +#: guix/scripts/package.scm:343 msgid "" "\n" " --roll-back roll back to the previous generation" msgstr "" +"\n" +" --roll-back rulla tillbaka till föregående generation" -#: guix/scripts/package.scm:329 +#: guix/scripts/package.scm:345 msgid "" "\n" " --search-paths[=KIND]\n" " display needed environment variable definitions" msgstr "" +"\n" +" --search-paths[=TYP]\n" +" visa miljövariabeldefinitioner som behövs" -#: guix/scripts/package.scm:332 guix/scripts/pull.scm:84 +#: guix/scripts/package.scm:348 guix/scripts/pull.scm:90 msgid "" "\n" " -l, --list-generations[=PATTERN]\n" " list generations matching PATTERN" msgstr "" +"\n" +" -l, --list-generations[=MÖNSTER]\n" +" lista generationer som matchar MÖNSTER" -#: guix/scripts/package.scm:335 +#: guix/scripts/package.scm:351 msgid "" "\n" " -d, --delete-generations[=PATTERN]\n" " delete generations matching PATTERN" msgstr "" +"\n" +" -d, --delete-generations[=MÖNSTER]\n" +" ta bort generationer som matchar MÖNSTER" -#: guix/scripts/package.scm:338 +#: guix/scripts/package.scm:354 msgid "" "\n" " -S, --switch-generation=PATTERN\n" " switch to a generation matching PATTERN" msgstr "" +"\n" +" -S, --switch-generation=MÖNSTER\n" +" växla till en generation som matchar MÖNSTER" -#: guix/scripts/package.scm:341 +#: guix/scripts/package.scm:357 guix/scripts/install.scm:33 +#: guix/scripts/remove.scm:33 guix/scripts/upgrade.scm:34 msgid "" "\n" " -p, --profile=PROFILE use PROFILE instead of the user's default profile" msgstr "" +"\n" +" -p, --profile=PROFIL använd PROFIL istället för användarens standardprofil" -#: guix/scripts/package.scm:344 +#: guix/scripts/package.scm:360 msgid "" "\n" " --allow-collisions do not treat collisions in the profile as an error" msgstr "" +"\n" +" --allow-collisions behandla inte kollisioner i profilen som fel" -#: guix/scripts/package.scm:346 +#: guix/scripts/package.scm:362 msgid "" "\n" " --bootstrap use the bootstrap Guile to build the profile" msgstr "" - -#: guix/scripts/package.scm:348 guix/scripts/pull.scm:74 -msgid "" "\n" -" --verbose produce verbose output" -msgstr "" +" --bootstrap använd laddar-Guile för att bygga profilen" -#: guix/scripts/package.scm:351 +#: guix/scripts/package.scm:367 msgid "" "\n" " -s, --search=REGEXP search in synopsis and description using REGEXP" msgstr "" +"\n" +" -s, --search=REGUTR sök i synopsis och beskrivning efter REGUTR" -#: guix/scripts/package.scm:353 +#: guix/scripts/package.scm:369 msgid "" "\n" " -I, --list-installed[=REGEXP]\n" " list installed packages matching REGEXP" msgstr "" +"\n" +" -I, --list-installed[=REGUTR]\n" +" lista installerade paket som matchar REGEXP" -#: guix/scripts/package.scm:356 +#: guix/scripts/package.scm:372 msgid "" "\n" " -A, --list-available[=REGEXP]\n" " list available packages matching REGEXP" msgstr "" +"\n" +" -A, --list-available[=REGUTR]\n" +" lista tillgängliga paket som matchar REGUTR" -#: guix/scripts/package.scm:359 +#: guix/scripts/package.scm:375 msgid "" "\n" " --show=PACKAGE show details about PACKAGE" msgstr "" +"\n" +" --show=PAKET visa detaljer om PAKET" -#: guix/scripts/package.scm:411 +#: guix/scripts/package.scm:427 #, scheme-format msgid "upgrade regexp '~a' looks like a command-line option~%" -msgstr "" +msgstr "reguljärt uttryck för uppgradering ”~a” ser ut som en kommandoradsflagga~%" -#: guix/scripts/package.scm:414 +#: guix/scripts/package.scm:430 #, scheme-format msgid "is this intended?~%" -msgstr "" +msgstr "är det avsiktligt?~%" -#: guix/scripts/package.scm:459 +#: guix/scripts/package.scm:475 #, scheme-format msgid "~a: unsupported kind of search path~%" -msgstr "" +msgstr "~a: sökvägstyp stöds inte~%" -#: guix/scripts/package.scm:776 +#: guix/scripts/package.scm:771 #, scheme-format msgid "~a~@[@~a~]: package not found~%" -msgstr "" +msgstr "~a~@[@~a~]: paket hittades inte~%" -#: guix/scripts/package.scm:810 +#: guix/scripts/package.scm:805 #, scheme-format msgid "cannot switch to generation '~a'~%" -msgstr "" +msgstr "kan inte växla till generation ”~a”~%" -#: guix/scripts/package.scm:827 +#: guix/scripts/package.scm:822 #, scheme-format msgid "would install new manifest from '~a' with ~d entries~%" -msgstr "" +msgstr "skulle installera nytt manifest från ”~a” med ~d poster~%" -#: guix/scripts/package.scm:829 +#: guix/scripts/package.scm:824 #, scheme-format msgid "installing new manifest from '~a' with ~d entries~%" +msgstr "installerar nytt manifest från ”~a” med ~d poster~%" + +#: guix/scripts/install.scm:30 +msgid "" +"Usage: guix install [OPTION] PACKAGES...\n" +"Install the given PACKAGES.\n" +"This is an alias for 'guix package -i'.\n" +msgstr "" +"Användning: gui install [FLAGGA] PAKET…\n" +"Installera givna PAKET.\n" +"Detta är ett alias för ”guis package -i”.\n" + +#: guix/scripts/remove.scm:30 +msgid "" +"Usage: guix remove [OPTION] PACKAGES...\n" +"Remove the given PACKAGES.\n" +"This is an alias for 'guix package -r'.\n" +msgstr "" + +#: guix/scripts/upgrade.scm:31 +msgid "" +"Usage: guix upgrade [OPTION] [REGEXP]\n" +"Upgrade packages that match REGEXP.\n" +"This is an alias for 'guix package -u'.\n" +msgstr "" + +#: guix/scripts/search.scm:29 +msgid "" +"Usage: guix search [OPTION] REGEXPS...\n" +"Search for packages matching REGEXPS." msgstr "" -#: guix/scripts/gc.scm:42 +#: guix/scripts/search.scm:31 +msgid "" +"\n" +"This is an alias for 'guix package -s'.\n" +msgstr "" + +#: guix/scripts/search.scm:65 +#, scheme-format +msgid "missing arguments: no regular expressions to search for~%" +msgstr "" + +#: guix/scripts/gc.scm:45 msgid "" "Usage: guix gc [OPTION]... PATHS...\n" "Invoke the garbage collector.\n" msgstr "" -#: guix/scripts/gc.scm:44 +#: guix/scripts/gc.scm:47 msgid "" "\n" " -C, --collect-garbage[=MIN]\n" " collect at least MIN bytes of garbage" msgstr "" -#: guix/scripts/gc.scm:47 +#: guix/scripts/gc.scm:50 msgid "" "\n" " -F, --free-space=FREE attempt to reach FREE available space in the store" msgstr "" -#: guix/scripts/gc.scm:49 +#: guix/scripts/gc.scm:52 +msgid "" +"\n" +" -d, --delete-generations[=PATTERN]\n" +" delete profile generations matching PATTERN" +msgstr "" + +#: guix/scripts/gc.scm:55 +msgid "" +"\n" +" -D, --delete attempt to delete PATHS" +msgstr "" + +#: guix/scripts/gc.scm:57 msgid "" "\n" -" -d, --delete attempt to delete PATHS" +" --list-roots list the user's garbage collector roots" msgstr "" -#: guix/scripts/gc.scm:51 +#: guix/scripts/gc.scm:59 msgid "" "\n" " --optimize optimize the store by deduplicating identical files" msgstr "" -#: guix/scripts/gc.scm:53 +#: guix/scripts/gc.scm:61 msgid "" "\n" " --list-dead list dead paths" msgstr "" -#: guix/scripts/gc.scm:55 +#: guix/scripts/gc.scm:63 msgid "" "\n" " --list-live list live paths" msgstr "" -#: guix/scripts/gc.scm:58 +#: guix/scripts/gc.scm:66 msgid "" "\n" " --references list the references of PATHS" msgstr "" -#: guix/scripts/gc.scm:60 +#: guix/scripts/gc.scm:68 msgid "" "\n" " -R, --requisites list the requisites of PATHS" msgstr "" -#: guix/scripts/gc.scm:62 +#: guix/scripts/gc.scm:70 msgid "" "\n" " --referrers list the referrers of PATHS" msgstr "" -#: guix/scripts/gc.scm:64 +#: guix/scripts/gc.scm:72 msgid "" "\n" " --derivers list the derivers of PATHS" msgstr "" -#: guix/scripts/gc.scm:67 +#: guix/scripts/gc.scm:75 msgid "" "\n" " --verify[=OPTS] verify the integrity of the store; OPTS is a\n" @@ -981,42 +1923,52 @@ msgid "" " 'contents'" msgstr "" -#: guix/scripts/gc.scm:71 +#: guix/scripts/gc.scm:79 msgid "" "\n" " --list-failures list cached build failures" msgstr "" -#: guix/scripts/gc.scm:73 +#: guix/scripts/gc.scm:81 msgid "" "\n" " --clear-failures remove PATHS from the set of cached failures" msgstr "" -#: guix/scripts/gc.scm:87 +#: guix/scripts/gc.scm:95 #, scheme-format msgid "~a: invalid '--verify' option~%" msgstr "" -#: guix/scripts/gc.scm:117 +#: guix/scripts/gc.scm:135 #, scheme-format msgid "invalid amount of storage: ~a~%" msgstr "" -#: guix/scripts/gc.scm:202 +#: guix/scripts/gc.scm:149 +#, scheme-format +msgid "'-d' as an alias for '--delete' is deprecated; use '-D'~%" +msgstr "”-d” som ett alias för ”--delete” är föråldrat; använd ”-D”~%" + +#: guix/scripts/gc.scm:156 +#, scheme-format +msgid "~s does not denote a duration~%" +msgstr "" + +#: guix/scripts/gc.scm:239 msgid "already ~h MiBs available on ~a, nothing to do~%" msgstr "" -#: guix/scripts/gc.scm:205 +#: guix/scripts/gc.scm:242 msgid "freeing ~h MiBs~%" msgstr "" -#: guix/scripts/gc.scm:217 +#: guix/scripts/gc.scm:275 #, scheme-format msgid "extraneous arguments: ~{~a ~}~%" msgstr "" -#: guix/scripts/gc.scm:237 guix/scripts/gc.scm:240 +#: guix/scripts/gc.scm:299 guix/scripts/gc.scm:302 msgid "freed ~h MiBs~%" msgstr "" @@ -1041,13 +1993,16 @@ msgid "" " -r, --recursive compute the hash on FILE recursively" msgstr "" -#: guix/scripts/hash.scm:151 guix/ui.scm:371 guix/ui.scm:728 guix/ui.scm:781 +#: guix/scripts/hash.scm:151 guix/ui.scm:445 guix/ui.scm:452 guix/ui.scm:477 +#: guix/ui.scm:787 guix/ui.scm:809 guix/ui.scm:815 guix/ui.scm:821 +#: guix/ui.scm:874 #, scheme-format msgid "~a~%" msgstr "" -#: guix/scripts/hash.scm:154 guix/scripts/system.scm:1189 -#: guix/scripts/system.scm:1198 guix/scripts/system.scm:1205 +#: guix/scripts/hash.scm:154 guix/scripts/system.scm:1213 +#: guix/scripts/system.scm:1223 guix/scripts/system.scm:1230 +#: guix/scripts/system.scm:1237 #, scheme-format msgid "wrong number of arguments~%" msgstr "" @@ -1145,124 +2100,138 @@ msgstr "" msgid "failed to download package '~a'~%" msgstr "" -#: guix/scripts/pull.scm:72 +#: guix/scripts/pull.scm:76 msgid "" "Usage: guix pull [OPTION]...\n" "Download and deploy the latest version of Guix.\n" msgstr "" -#: guix/scripts/pull.scm:76 +#: guix/scripts/pull.scm:78 +msgid "" +"\n" +" --verbose produce verbose output" +msgstr "" + +#: guix/scripts/pull.scm:80 msgid "" "\n" " -C, --channels=FILE deploy the channels defined in FILE" msgstr "" -#: guix/scripts/pull.scm:78 +#: guix/scripts/pull.scm:82 msgid "" "\n" " --url=URL download from the Git repository at URL" msgstr "" -#: guix/scripts/pull.scm:80 +#: guix/scripts/pull.scm:84 msgid "" "\n" " --commit=COMMIT download the specified COMMIT" msgstr "" -#: guix/scripts/pull.scm:82 +#: guix/scripts/pull.scm:86 msgid "" "\n" " --branch=BRANCH download the tip of the specified BRANCH" msgstr "" -#: guix/scripts/pull.scm:87 -#, scheme-format +#: guix/scripts/pull.scm:88 msgid "" "\n" -" -p, --profile=PROFILE use PROFILE instead of ~/.config/guix/current" +" -N, --news display news compared to the previous generation" msgstr "" -#: guix/scripts/pull.scm:89 +#: guix/scripts/pull.scm:93 +#, scheme-format msgid "" "\n" -" -n, --dry-run show what would be pulled and built" +" -p, --profile=PROFILE use PROFILE instead of ~/.config/guix/current" msgstr "" -#: guix/scripts/pull.scm:91 +#: guix/scripts/pull.scm:99 msgid "" "\n" " --bootstrap use the bootstrap Guile to build the new Guix" msgstr "" -#: guix/scripts/pull.scm:165 +#: guix/scripts/pull.scm:196 msgid "New in this revision:\n" msgstr "" -#: guix/scripts/pull.scm:223 +#: guix/scripts/pull.scm:225 +#, scheme-format +msgid "" +"After setting @code{PATH}, run\n" +"@command{hash guix} to make sure your shell refers to @file{~a}." +msgstr "" + +#: guix/scripts/pull.scm:250 #, scheme-format msgid "Git error ~a~%" msgstr "" -#: guix/scripts/pull.scm:225 +#: guix/scripts/pull.scm:252 guix/git.scm:306 #, scheme-format msgid "Git error: ~a~%" msgstr "" -#: guix/scripts/pull.scm:250 +#: guix/scripts/pull.scm:277 #, scheme-format msgid "Migrating profile generations to '~a'...~%" msgstr "" -#: guix/scripts/pull.scm:285 +#: guix/scripts/pull.scm:312 #, scheme-format msgid "while creating symlink '~a': ~a~%" msgstr "" -#: guix/scripts/pull.scm:307 +#: guix/scripts/pull.scm:334 #, scheme-format msgid " repository URL: ~a~%" msgstr "" -#: guix/scripts/pull.scm:309 +#: guix/scripts/pull.scm:336 #, scheme-format msgid " branch: ~a~%" msgstr "" -#: guix/scripts/pull.scm:310 +#: guix/scripts/pull.scm:337 #, scheme-format msgid " commit: ~a~%" msgstr "" -#: guix/scripts/pull.scm:376 +#: guix/scripts/pull.scm:439 msgid " ~h new package: ~a~%" msgid_plural " ~h new packages: ~a~%" msgstr[0] "" msgstr[1] "" -#: guix/scripts/pull.scm:387 +#: guix/scripts/pull.scm:447 msgid " ~h package upgraded: ~a~%" msgid_plural " ~h packages upgraded: ~a~%" msgstr[0] "" msgstr[1] "" -#: guix/scripts/pull.scm:451 +#: guix/scripts/pull.scm:456 +msgid "" +"Run @command{guix pull --news} to view the complete\n" +"list of package changes." +msgstr "" + +#: guix/scripts/pull.scm:520 #, scheme-format msgid "'~a' did not return a list of channels~%" msgstr "" -#: guix/scripts/pull.scm:465 +#: guix/scripts/pull.scm:534 #, scheme-format msgid "" "The 'GUIX_PULL_URL' environment variable is deprecated.\n" "Use '~/.config/guix/channels.scm' instead." msgstr "" -#: guix/scripts/pull.scm:490 -#, scheme-format -msgid "'--url', '--commit', and '--branch' are not applicable~%" -msgstr "" - -#: guix/scripts/pull.scm:515 +#: guix/scripts/pull.scm:583 #, scheme-format msgid "Building from this channel:~%" msgid_plural "Building from these channels:~%" @@ -1344,50 +2313,50 @@ msgstr "" msgid "signature on '~a' is corrupt~%" msgstr "" -#: guix/scripts/substitute.scm:458 +#: guix/scripts/substitute.scm:467 #, scheme-format msgid "'~a' does not name a store item~%" msgstr "" -#: guix/scripts/substitute.scm:620 +#: guix/scripts/substitute.scm:629 #, scheme-format msgid "updating substitutes from '~a'... ~5,1f%" msgstr "" -#: guix/scripts/substitute.scm:684 +#: guix/scripts/substitute.scm:693 #, scheme-format msgid "~s: unsupported server URI scheme~%" msgstr "" -#: guix/scripts/substitute.scm:694 +#: guix/scripts/substitute.scm:703 #, scheme-format msgid "'~a' uses different store '~a'; ignoring it~%" msgstr "" -#: guix/scripts/substitute.scm:863 +#: guix/scripts/substitute.scm:872 #, scheme-format msgid "host name lookup error: ~a~%" msgstr "" -#: guix/scripts/substitute.scm:868 +#: guix/scripts/substitute.scm:877 #, scheme-format msgid "TLS error in procedure '~a': ~a~%" msgstr "" -#: guix/scripts/substitute.scm:879 +#: guix/scripts/substitute.scm:888 msgid "" "Usage: guix substitute [OPTION]...\n" "Internal tool to substitute a pre-built binary to a local build.\n" msgstr "" -#: guix/scripts/substitute.scm:881 +#: guix/scripts/substitute.scm:890 msgid "" "\n" " --query report on the availability of substitutes for the\n" " store file names passed on the standard input" msgstr "" -#: guix/scripts/substitute.scm:884 +#: guix/scripts/substitute.scm:893 msgid "" "\n" " --substitute STORE-FILE DESTINATION\n" @@ -1395,26 +2364,26 @@ msgid "" " DESTINATION" msgstr "" -#: guix/scripts/substitute.scm:949 +#: guix/scripts/substitute.scm:958 #, scheme-format msgid "no valid substitute for '~a'~%" msgstr "" -#: guix/scripts/substitute.scm:957 +#: guix/scripts/substitute.scm:966 #, scheme-format msgid "Downloading ~a...~%" msgstr "" -#: guix/scripts/substitute.scm:1019 +#: guix/scripts/substitute.scm:1028 msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n" msgstr "" -#: guix/scripts/substitute.scm:1073 +#: guix/scripts/substitute.scm:1082 #, scheme-format msgid "~a: invalid URI~%" msgstr "" -#: guix/scripts/substitute.scm:1144 +#: guix/scripts/substitute.scm:1153 #, scheme-format msgid "~a: unrecognized options~%" msgstr "" @@ -1450,117 +2419,117 @@ msgstr "" msgid "wrong arguments" msgstr "" -#: guix/scripts/system.scm:148 +#: guix/scripts/system.scm:150 #, scheme-format msgid "failed to register '~a' under '~a'~%" msgstr "" -#: guix/scripts/system.scm:163 +#: guix/scripts/system.scm:165 #, scheme-format msgid "copying to '~a'..." msgstr "" -#: guix/scripts/system.scm:204 +#: guix/scripts/system.scm:206 #, scheme-format msgid "failed to install bootloader ~a~%" msgstr "" -#: guix/scripts/system.scm:224 +#: guix/scripts/system.scm:226 #, scheme-format msgid "initializing the current root file system~%" msgstr "" -#: guix/scripts/system.scm:238 +#: guix/scripts/system.scm:240 #, scheme-format msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%" msgstr "" -#: guix/scripts/system.scm:290 +#: guix/scripts/system.scm:292 #, scheme-format msgid "while talking to shepherd: ~a~%" msgstr "" -#: guix/scripts/system.scm:297 +#: guix/scripts/system.scm:299 #, scheme-format msgid "service '~a' could not be found~%" msgstr "" -#: guix/scripts/system.scm:300 +#: guix/scripts/system.scm:302 #, scheme-format msgid "service '~a' does not have an action '~a'~%" msgstr "" -#: guix/scripts/system.scm:304 +#: guix/scripts/system.scm:306 #, scheme-format msgid "exception caught while executing '~a' on service '~a':~%" msgstr "" -#: guix/scripts/system.scm:312 +#: guix/scripts/system.scm:314 #, scheme-format msgid "something went wrong: ~s~%" msgstr "" -#: guix/scripts/system.scm:315 +#: guix/scripts/system.scm:317 #, scheme-format msgid "shepherd error~%" msgstr "" -#: guix/scripts/system.scm:332 +#: guix/scripts/system.scm:334 #, scheme-format msgid "failed to obtain list of shepherd services~%" msgstr "" -#: guix/scripts/system.scm:352 +#: guix/scripts/system.scm:354 #, scheme-format msgid "unloading service '~a'...~%" msgstr "" -#: guix/scripts/system.scm:361 +#: guix/scripts/system.scm:363 #, scheme-format msgid "loading new services:~{ ~a~}...~%" msgstr "" -#: guix/scripts/system.scm:366 +#: guix/scripts/system.scm:368 msgid "" "To complete the upgrade, run 'herd restart SERVICE' to stop,\n" "upgrade, and restart each service that was not automatically restarted.\n" msgstr "" -#: guix/scripts/system.scm:393 +#: guix/scripts/system.scm:395 #, scheme-format msgid "activating system...~%" msgstr "" -#: guix/scripts/system.scm:471 +#: guix/scripts/system.scm:473 #, scheme-format msgid "cannot switch to system generation '~a'~%" msgstr "" -#: guix/scripts/system.scm:542 +#: guix/scripts/system.scm:546 msgid "the DAG of services" msgstr "" -#: guix/scripts/system.scm:555 +#: guix/scripts/system.scm:559 msgid "the dependency graph of shepherd services" msgstr "" -#: guix/scripts/system.scm:579 +#: guix/scripts/system.scm:583 #, scheme-format msgid " file name: ~a~%" msgstr "" -#: guix/scripts/system.scm:580 +#: guix/scripts/system.scm:584 #, scheme-format msgid " canonical file name: ~a~%" msgstr "" #. TRANSLATORS: Please preserve the two-space indentation. -#: guix/scripts/system.scm:582 +#: guix/scripts/system.scm:586 #, scheme-format msgid " label: ~a~%" msgstr "" -#: guix/scripts/system.scm:583 +#: guix/scripts/system.scm:587 #, scheme-format msgid " bootloader: ~a~%" msgstr "" @@ -1573,146 +2542,151 @@ msgstr "" #. root device: label: "my-root" #. or just: #. root device: /dev/sda3 -#: guix/scripts/system.scm:593 +#: guix/scripts/system.scm:597 #, scheme-format msgid " root device: ~[UUID: ~a~;label: ~s~;~a~]~%" msgstr "" -#: guix/scripts/system.scm:604 +#: guix/scripts/system.scm:608 #, scheme-format msgid " kernel: ~a~%" msgstr "" -#: guix/scripts/system.scm:675 +#: guix/scripts/system.scm:679 #, scheme-format msgid "~a: error: device '~a' not found: ~a~%" msgstr "" -#: guix/scripts/system.scm:679 +#: guix/scripts/system.scm:683 #, scheme-format msgid "" "If '~a' is a file system\n" "label, write @code{(file-system-label ~s)} in your @code{device} field." msgstr "" -#: guix/scripts/system.scm:687 +#: guix/scripts/system.scm:691 #, scheme-format msgid "~a: error: file system with label '~a' not found~%" msgstr "" -#: guix/scripts/system.scm:692 +#: guix/scripts/system.scm:696 #, scheme-format msgid "~a: error: file system with UUID '~a' not found~%" msgstr "" -#: guix/scripts/system.scm:793 +#: guix/scripts/system.scm:797 #, scheme-format msgid "~a not found: 'guix pull' was never run~%" msgstr "" -#: guix/scripts/system.scm:794 +#: guix/scripts/system.scm:798 #, scheme-format msgid "Consider running 'guix pull' before 'reconfigure'.~%" msgstr "" -#: guix/scripts/system.scm:795 +#: guix/scripts/system.scm:799 #, scheme-format msgid "Failing to do that may downgrade your system!~%" msgstr "" -#: guix/scripts/system.scm:907 +#: guix/scripts/system.scm:920 #, scheme-format msgid "initializing operating system under '~a'...~%" msgstr "" -#: guix/scripts/system.scm:952 +#: guix/scripts/system.scm:965 msgid "" "Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]\n" "Build the operating system declared in FILE according to ACTION.\n" "Some ACTIONS support additional ARGS.\n" msgstr "" -#: guix/scripts/system.scm:956 guix/scripts/container.scm:29 +#: guix/scripts/system.scm:969 guix/scripts/container.scm:29 msgid "The valid values for ACTION are:\n" msgstr "" -#: guix/scripts/system.scm:958 +#: guix/scripts/system.scm:971 msgid " search search for existing service types\n" msgstr "" -#: guix/scripts/system.scm:960 +#: guix/scripts/system.scm:973 msgid " reconfigure switch to a new operating system configuration\n" msgstr "" -#: guix/scripts/system.scm:962 +#: guix/scripts/system.scm:975 msgid " roll-back switch to the previous operating system configuration\n" msgstr "" -#: guix/scripts/system.scm:964 +#: guix/scripts/system.scm:977 +msgid " list-generations list the system generations\n" +msgstr "" + +#: guix/scripts/system.scm:979 msgid " switch-generation switch to an existing operating system configuration\n" msgstr "" -#: guix/scripts/system.scm:966 -msgid " list-generations list the system generations\n" +#: guix/scripts/system.scm:981 +msgid " delete-generations delete old system generations\n" msgstr "" -#: guix/scripts/system.scm:968 +#: guix/scripts/system.scm:983 msgid " build build the operating system without installing anything\n" msgstr "" -#: guix/scripts/system.scm:970 +#: guix/scripts/system.scm:985 msgid " container build a container that shares the host's store\n" msgstr "" -#: guix/scripts/system.scm:972 +#: guix/scripts/system.scm:987 msgid " vm build a virtual machine image that shares the host's store\n" msgstr "" -#: guix/scripts/system.scm:974 +#: guix/scripts/system.scm:989 msgid " vm-image build a freestanding virtual machine image\n" msgstr "" -#: guix/scripts/system.scm:976 +#: guix/scripts/system.scm:991 msgid " disk-image build a disk image, suitable for a USB stick\n" msgstr "" -#: guix/scripts/system.scm:978 +#: guix/scripts/system.scm:993 msgid " docker-image build a Docker image\n" msgstr "" -#: guix/scripts/system.scm:980 +#: guix/scripts/system.scm:995 msgid " init initialize a root file system to run GNU\n" msgstr "" -#: guix/scripts/system.scm:982 +#: guix/scripts/system.scm:997 msgid " extension-graph emit the service extension graph in Dot format\n" msgstr "" -#: guix/scripts/system.scm:984 +#: guix/scripts/system.scm:999 msgid " shepherd-graph emit the graph of shepherd services in Dot format\n" msgstr "" -#: guix/scripts/system.scm:988 +#: guix/scripts/system.scm:1003 msgid "" "\n" " -d, --derivation return the derivation of the given system" msgstr "" -#: guix/scripts/system.scm:990 +#: guix/scripts/system.scm:1005 msgid "" "\n" " -e, --expression=EXPR consider the operating-system EXPR evaluates to\n" " instead of reading FILE, when applicable" msgstr "" -#: guix/scripts/system.scm:993 +#: guix/scripts/system.scm:1008 msgid "" "\n" " --on-error=STRATEGY\n" -" apply STRATEGY when an error occurs while reading FILE" +" apply STRATEGY (one of nothing-special, backtrace,\n" +" or debug) when an error occurs while reading FILE" msgstr "" -#: guix/scripts/system.scm:996 +#: guix/scripts/system.scm:1012 msgid "" "\n" " --file-system-type=TYPE\n" @@ -1720,25 +2694,25 @@ msgid "" " (one of 'ext4', 'iso9660')" msgstr "" -#: guix/scripts/system.scm:1000 +#: guix/scripts/system.scm:1016 msgid "" "\n" " --image-size=SIZE for 'vm-image', produce an image of SIZE" msgstr "" -#: guix/scripts/system.scm:1002 +#: guix/scripts/system.scm:1018 msgid "" "\n" " --no-bootloader for 'init', do not install a bootloader" msgstr "" -#: guix/scripts/system.scm:1004 +#: guix/scripts/system.scm:1020 msgid "" "\n" " --share=SPEC for 'vm', share host file system according to SPEC" msgstr "" -#: guix/scripts/system.scm:1006 +#: guix/scripts/system.scm:1022 msgid "" "\n" " -r, --root=FILE for 'vm', 'vm-image', 'disk-image', 'container',\n" @@ -1746,72 +2720,72 @@ msgid "" " register it as a garbage collector root" msgstr "" -#: guix/scripts/system.scm:1010 +#: guix/scripts/system.scm:1026 msgid "" "\n" " --expose=SPEC for 'vm', expose host file system according to SPEC" msgstr "" -#: guix/scripts/system.scm:1012 +#: guix/scripts/system.scm:1028 msgid "" "\n" " --full-boot for 'vm', make a full boot sequence" msgstr "" -#: guix/scripts/system.scm:1014 +#: guix/scripts/system.scm:1030 msgid "" "\n" " --skip-checks skip file system and initrd module safety checks" msgstr "" -#: guix/scripts/system.scm:1116 +#: guix/scripts/system.scm:1140 #, scheme-format msgid "both file and expression cannot be specified~%" msgstr "" -#: guix/scripts/system.scm:1123 +#: guix/scripts/system.scm:1147 #, scheme-format msgid "no configuration specified~%" msgstr "" -#: guix/scripts/system.scm:1224 +#: guix/scripts/system.scm:1257 #, scheme-format msgid "~a: unknown action~%" msgstr "" -#: guix/scripts/system.scm:1240 +#: guix/scripts/system.scm:1273 #, scheme-format msgid "wrong number of arguments for action '~a'~%" msgstr "" -#: guix/scripts/system.scm:1245 +#: guix/scripts/system.scm:1278 #, scheme-format msgid "guix system: missing command name~%" msgstr "" -#: guix/scripts/system.scm:1247 +#: guix/scripts/system.scm:1280 #, scheme-format msgid "Try 'guix system --help' for more information.~%" msgstr "" -#: guix/scripts/system/search.scm:88 guix/ui.scm:1205 guix/ui.scm:1219 +#: guix/scripts/system/search.scm:88 guix/ui.scm:1332 guix/ui.scm:1346 msgid "unknown" msgstr "" -#: guix/scripts/lint.scm:140 +#: guix/scripts/lint.scm:144 #, scheme-format msgid "Available checkers:~%" msgstr "" -#: guix/scripts/lint.scm:164 +#: guix/scripts/lint.scm:168 msgid "description should not be empty" msgstr "" -#: guix/scripts/lint.scm:174 +#: guix/scripts/lint.scm:178 msgid "Texinfo markup in description is invalid" msgstr "" -#: guix/scripts/lint.scm:184 +#: guix/scripts/lint.scm:188 #, scheme-format msgid "" "description should not contain ~\n" @@ -1820,296 +2794,313 @@ msgstr "" #. TRANSLATORS: '@code' is Texinfo markup and must be kept #. as is. -#: guix/scripts/lint.scm:197 +#: guix/scripts/lint.scm:201 msgid "use @code or similar ornament instead of quotes" msgstr "" -#: guix/scripts/lint.scm:204 +#: guix/scripts/lint.scm:208 msgid "description should start with an upper-case letter or digit" msgstr "" -#: guix/scripts/lint.scm:220 +#: guix/scripts/lint.scm:224 #, scheme-format msgid "" "sentences in description should be followed ~\n" "by two spaces; possible infraction~p at ~{~a~^, ~}" msgstr "" -#: guix/scripts/lint.scm:238 +#: guix/scripts/lint.scm:242 #, scheme-format msgid "invalid description: ~s" msgstr "" -#: guix/scripts/lint.scm:283 +#: guix/scripts/lint.scm:287 #, scheme-format msgid "'~a' should probably be a native input" msgstr "" -#: guix/scripts/lint.scm:299 +#: guix/scripts/lint.scm:303 #, scheme-format msgid "'~a' should probably not be an input at all" msgstr "" -#: guix/scripts/lint.scm:316 +#: guix/scripts/lint.scm:320 msgid "synopsis should not be empty" msgstr "" -#: guix/scripts/lint.scm:324 +#: guix/scripts/lint.scm:328 msgid "no period allowed at the end of the synopsis" msgstr "" -#: guix/scripts/lint.scm:336 +#: guix/scripts/lint.scm:340 msgid "no article allowed at the beginning of the synopsis" msgstr "" -#: guix/scripts/lint.scm:343 +#: guix/scripts/lint.scm:347 msgid "synopsis should be less than 80 characters long" msgstr "" -#: guix/scripts/lint.scm:349 +#: guix/scripts/lint.scm:353 msgid "synopsis should start with an upper-case letter or digit" msgstr "" -#: guix/scripts/lint.scm:356 +#: guix/scripts/lint.scm:360 msgid "synopsis should not start with the package name" msgstr "" -#: guix/scripts/lint.scm:366 +#: guix/scripts/lint.scm:370 msgid "Texinfo markup in synopsis is invalid" msgstr "" -#: guix/scripts/lint.scm:385 +#: guix/scripts/lint.scm:389 #, scheme-format msgid "invalid synopsis: ~s" msgstr "" -#: guix/scripts/lint.scm:504 +#: guix/scripts/lint.scm:508 #, scheme-format msgid "URI ~a returned suspiciously small file (~a bytes)" msgstr "" -#: guix/scripts/lint.scm:514 +#: guix/scripts/lint.scm:518 #, scheme-format msgid "permanent redirect from ~a to ~a" msgstr "" -#: guix/scripts/lint.scm:521 +#: guix/scripts/lint.scm:525 #, scheme-format msgid "invalid permanent redirect from ~a" msgstr "" -#: guix/scripts/lint.scm:528 guix/scripts/lint.scm:540 +#: guix/scripts/lint.scm:532 guix/scripts/lint.scm:544 #, scheme-format msgid "URI ~a not reachable: ~a (~s)" msgstr "" -#: guix/scripts/lint.scm:547 +#: guix/scripts/lint.scm:551 #, scheme-format msgid "URI ~a domain not found: ~a" msgstr "" -#: guix/scripts/lint.scm:555 +#: guix/scripts/lint.scm:559 #, scheme-format msgid "URI ~a unreachable: ~a" msgstr "" -#: guix/scripts/lint.scm:564 +#: guix/scripts/lint.scm:568 #, scheme-format msgid "TLS certificate error: ~a" msgstr "" -#: guix/scripts/lint.scm:585 +#: guix/scripts/lint.scm:589 msgid "invalid value for home page" msgstr "" -#: guix/scripts/lint.scm:588 +#: guix/scripts/lint.scm:592 #, scheme-format msgid "invalid home page URL: ~s" msgstr "" -#: guix/scripts/lint.scm:614 +#: guix/scripts/lint.scm:619 msgid "file names of patches should start with the package name" msgstr "" -#: guix/scripts/lint.scm:630 +#: guix/scripts/lint.scm:635 #, scheme-format msgid "~a: file name is too long" msgstr "" -#: guix/scripts/lint.scm:671 +#: guix/scripts/lint.scm:676 #, scheme-format msgid "~a: ~a: proposed synopsis: ~s~%" msgstr "" -#: guix/scripts/lint.scm:684 +#: guix/scripts/lint.scm:689 #, scheme-format msgid "~a: ~a: proposed description:~% \"~a\"~%" msgstr "" -#: guix/scripts/lint.scm:726 +#: guix/scripts/lint.scm:731 msgid "all the source URIs are unreachable:" msgstr "" -#: guix/scripts/lint.scm:748 +#: guix/scripts/lint.scm:753 msgid "the source file name should contain the package name" msgstr "" -#: guix/scripts/lint.scm:764 +#: guix/scripts/lint.scm:765 +msgid "the source URI should not be an autogenerated tarball" +msgstr "" + +#: guix/scripts/lint.scm:786 #, scheme-format msgid "URL should be 'mirror://~a/~a'" msgstr "" -#: guix/scripts/lint.scm:783 guix/scripts/lint.scm:788 +#: guix/scripts/lint.scm:829 +#, scheme-format +msgid "URL should be '~a'" +msgstr "" + +#: guix/scripts/lint.scm:840 guix/scripts/lint.scm:845 #, scheme-format msgid "failed to create ~a derivation: ~a" msgstr "" -#: guix/scripts/lint.scm:805 +#: guix/scripts/lint.scm:862 #, scheme-format msgid "failed to create ~a derivation: ~s" msgstr "" -#: guix/scripts/lint.scm:817 +#: guix/scripts/lint.scm:874 msgid "invalid license field" msgstr "" -#: guix/scripts/lint.scm:824 +#: guix/scripts/lint.scm:881 #, scheme-format msgid "~a: HTTP GET error for ~a: ~a (~s)~%" msgstr "" -#: guix/scripts/lint.scm:834 +#: guix/scripts/lint.scm:891 #, scheme-format msgid "~a: host lookup failure: ~a~%" msgstr "" -#: guix/scripts/lint.scm:839 +#: guix/scripts/lint.scm:896 #, scheme-format msgid "~a: TLS certificate error: ~a" msgstr "" -#: guix/scripts/lint.scm:854 +#: guix/scripts/lint.scm:911 msgid "while retrieving CVE vulnerabilities" msgstr "" -#: guix/scripts/lint.scm:891 +#: guix/scripts/lint.scm:948 #, scheme-format msgid "probably vulnerable to ~a" msgstr "" -#: guix/scripts/lint.scm:898 +#: guix/scripts/lint.scm:955 #, scheme-format msgid "while retrieving upstream info for '~a'" msgstr "" -#: guix/scripts/lint.scm:906 +#: guix/scripts/lint.scm:963 #, scheme-format msgid "can be upgraded to ~a" msgstr "" -#: guix/scripts/lint.scm:921 +#: guix/scripts/lint.scm:978 #, scheme-format msgid "tabulation on line ~a, column ~a" msgstr "" -#: guix/scripts/lint.scm:930 +#: guix/scripts/lint.scm:987 #, scheme-format msgid "trailing white space on line ~a" msgstr "" -#: guix/scripts/lint.scm:940 +#: guix/scripts/lint.scm:997 #, scheme-format msgid "line ~a is way too long (~a characters)" msgstr "" -#: guix/scripts/lint.scm:951 +#: guix/scripts/lint.scm:1008 #, scheme-format msgid "line ~a: parentheses feel lonely, move to the previous or next line" msgstr "" -#: guix/scripts/lint.scm:1021 +#: guix/scripts/lint.scm:1078 msgid "Validate package descriptions" msgstr "" -#: guix/scripts/lint.scm:1025 +#: guix/scripts/lint.scm:1082 msgid "Validate synopsis & description of GNU packages" msgstr "" -#: guix/scripts/lint.scm:1029 +#: guix/scripts/lint.scm:1086 msgid "Identify inputs that should be native inputs" msgstr "" -#: guix/scripts/lint.scm:1033 +#: guix/scripts/lint.scm:1090 msgid "Identify inputs that shouldn't be inputs at all" msgstr "" -#: guix/scripts/lint.scm:1037 +#: guix/scripts/lint.scm:1094 msgid "Validate file names and availability of patches" msgstr "" -#: guix/scripts/lint.scm:1041 +#: guix/scripts/lint.scm:1098 msgid "Validate home-page URLs" msgstr "" #. TRANSLATORS: is the name of a data type and must not be #. translated. -#: guix/scripts/lint.scm:1047 +#: guix/scripts/lint.scm:1104 msgid "Make sure the 'license' field is a or a list thereof" msgstr "" -#: guix/scripts/lint.scm:1052 +#: guix/scripts/lint.scm:1109 msgid "Validate source URLs" msgstr "" -#: guix/scripts/lint.scm:1056 +#: guix/scripts/lint.scm:1113 msgid "Suggest 'mirror://' URLs" msgstr "" -#: guix/scripts/lint.scm:1060 +#: guix/scripts/lint.scm:1117 +msgid "Suggest GitHub URLs" +msgstr "" + +#: guix/scripts/lint.scm:1121 msgid "Validate file names of sources" msgstr "" -#: guix/scripts/lint.scm:1064 +#: guix/scripts/lint.scm:1125 +msgid "Check for autogenerated tarballs" +msgstr "" + +#: guix/scripts/lint.scm:1129 msgid "Report failure to compile a package to a derivation" msgstr "" -#: guix/scripts/lint.scm:1068 +#: guix/scripts/lint.scm:1133 msgid "Validate package synopses" msgstr "" -#: guix/scripts/lint.scm:1072 +#: guix/scripts/lint.scm:1137 msgid "Check the Common Vulnerabilities and Exposures (CVE) database" msgstr "" -#: guix/scripts/lint.scm:1077 +#: guix/scripts/lint.scm:1142 msgid "Check the package for new upstream releases" msgstr "" -#: guix/scripts/lint.scm:1081 +#: guix/scripts/lint.scm:1146 msgid "Look for formatting issues in the source" msgstr "" -#: guix/scripts/lint.scm:1109 +#: guix/scripts/lint.scm:1174 msgid "" "Usage: guix lint [OPTION]... [PACKAGE]...\n" "Run a set of checkers on the specified package; if none is specified,\n" "run the checkers on all packages.\n" msgstr "" -#: guix/scripts/lint.scm:1112 +#: guix/scripts/lint.scm:1177 msgid "" "\n" " -c, --checkers=CHECKER1,CHECKER2...\n" " only run the specified checkers" msgstr "" -#: guix/scripts/lint.scm:1117 +#: guix/scripts/lint.scm:1182 msgid "" "\n" " -l, --list-checkers display the list of available lint checkers" msgstr "" -#: guix/scripts/lint.scm:1137 +#: guix/scripts/lint.scm:1202 #, scheme-format msgid "~a: invalid checker~%" msgstr "" @@ -2208,60 +3199,55 @@ msgstr "" msgid "~a: invalid duration~%" msgstr "" -#: guix/scripts/publish.scm:869 +#: guix/scripts/publish.scm:876 #, scheme-format msgid "user '~a' not found: ~a~%" msgstr "" -#: guix/scripts/publish.scm:910 +#: guix/scripts/publish.scm:917 #, scheme-format msgid "server running as root; consider using the '--user' option!~%" msgstr "" -#: guix/scripts/publish.scm:915 +#: guix/scripts/publish.scm:922 #, scheme-format msgid "publishing ~a on ~a, port ~d~%" msgstr "" -#: guix/scripts/edit.scm:41 +#: guix/scripts/edit.scm:40 msgid "" "Usage: guix edit PACKAGE...\n" "Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n" msgstr "" -#: guix/scripts/edit.scm:62 +#: guix/scripts/edit.scm:61 #, scheme-format msgid "file '~a' not found in search path ~s~%" msgstr "" -#: guix/scripts/edit.scm:90 -#, scheme-format -msgid "source location of package '~a' is unknown~%" -msgstr "" - -#: guix/scripts/edit.scm:103 +#: guix/scripts/edit.scm:96 #, scheme-format msgid "failed to launch '~a': ~a~%" msgstr "" -#: guix/scripts/size.scm:68 +#: guix/scripts/size.scm:69 #, scheme-format msgid "no available substitute information for '~a'~%" msgstr "" -#: guix/scripts/size.scm:90 +#: guix/scripts/size.scm:91 msgid "store item" msgstr "" -#: guix/scripts/size.scm:90 +#: guix/scripts/size.scm:91 msgid "total" msgstr "" -#: guix/scripts/size.scm:90 +#: guix/scripts/size.scm:91 msgid "self" msgstr "" -#: guix/scripts/size.scm:98 +#: guix/scripts/size.scm:99 #, scheme-format msgid "total: ~,1f MiB~%" msgstr "" @@ -2269,155 +3255,159 @@ msgstr "" #. TRANSLATORS: This is the title of a graph, meaning that the graph #. represents a profile of the store (the "store" being the place where #. packages are stored.) -#: guix/scripts/size.scm:212 +#: guix/scripts/size.scm:222 msgid "store profile" msgstr "" -#: guix/scripts/size.scm:221 +#: guix/scripts/size.scm:231 msgid "" "Usage: guix size [OPTION]... PACKAGE\n" "Report the size of PACKAGE and its dependencies.\n" msgstr "" -#: guix/scripts/size.scm:226 +#: guix/scripts/size.scm:236 msgid "" "\n" " -s, --system=SYSTEM consider packages for SYSTEM--e.g., \"i686-linux\"" msgstr "" #. TRANSLATORS: "closure" and "self" must not be translated. -#: guix/scripts/size.scm:229 +#: guix/scripts/size.scm:239 msgid "" "\n" " --sort=KEY sort according to KEY--\"closure\" or \"self\"" msgstr "" -#: guix/scripts/size.scm:231 +#: guix/scripts/size.scm:241 msgid "" "\n" " -m, --map-file=FILE write to FILE a graphical map of disk usage" msgstr "" -#: guix/scripts/size.scm:262 +#: guix/scripts/size.scm:272 #, scheme-format msgid "~a: invalid sorting key~%" msgstr "" -#: guix/scripts/size.scm:297 +#: guix/scripts/size.scm:307 msgid "missing store item argument\n" msgstr "" -#: guix/scripts/graph.scm:87 +#: guix/scripts/graph.scm:88 #, scheme-format msgid "~a: invalid argument (package name expected)" msgstr "" -#: guix/scripts/graph.scm:98 +#: guix/scripts/graph.scm:99 msgid "the DAG of packages, excluding implicit inputs" msgstr "" -#: guix/scripts/graph.scm:124 +#: guix/scripts/graph.scm:135 msgid "the reverse DAG of packages" msgstr "" -#: guix/scripts/graph.scm:174 +#: guix/scripts/graph.scm:185 msgid "the DAG of packages, including implicit inputs" msgstr "" -#: guix/scripts/graph.scm:184 +#: guix/scripts/graph.scm:195 msgid "the DAG of packages and origins, including implicit inputs" msgstr "" -#: guix/scripts/graph.scm:214 +#: guix/scripts/graph.scm:225 msgid "same as 'bag', but without the bootstrap nodes" msgstr "" -#: guix/scripts/graph.scm:256 +#: guix/scripts/graph.scm:242 +msgid "the reverse DAG of packages, including implicit inputs" +msgstr "" + +#: guix/scripts/graph.scm:282 msgid "the DAG of derivations" msgstr "" -#: guix/scripts/graph.scm:268 +#: guix/scripts/graph.scm:294 msgid "unsupported argument for derivation graph" msgstr "" -#: guix/scripts/graph.scm:294 +#: guix/scripts/graph.scm:320 msgid "unsupported argument for this type of graph" msgstr "" -#: guix/scripts/graph.scm:307 +#: guix/scripts/graph.scm:333 #, scheme-format msgid "references for '~a' are not known~%" msgstr "" -#: guix/scripts/graph.scm:314 +#: guix/scripts/graph.scm:340 msgid "the DAG of run-time dependencies (store references)" msgstr "" -#: guix/scripts/graph.scm:330 +#: guix/scripts/graph.scm:356 msgid "the DAG of referrers in the store" msgstr "" -#: guix/scripts/graph.scm:360 +#: guix/scripts/graph.scm:386 msgid "the graph of package modules" msgstr "" -#: guix/scripts/graph.scm:388 +#: guix/scripts/graph.scm:415 #, scheme-format msgid "~a: unknown node type~%" msgstr "" -#: guix/scripts/graph.scm:395 +#: guix/scripts/graph.scm:422 #, scheme-format msgid "~a: unknown backend~%" msgstr "" -#: guix/scripts/graph.scm:399 +#: guix/scripts/graph.scm:426 msgid "The available node types are:\n" msgstr "" -#: guix/scripts/graph.scm:409 +#: guix/scripts/graph.scm:436 msgid "The available backend types are:\n" msgstr "" #. TRANSLATORS: Here 'dot' is the name of a program; it must not be #. translated. -#: guix/scripts/graph.scm:457 +#: guix/scripts/graph.scm:484 msgid "" "Usage: guix graph PACKAGE...\n" "Emit a representation of the dependency graph of PACKAGE...\n" msgstr "" -#: guix/scripts/graph.scm:459 +#: guix/scripts/graph.scm:486 msgid "" "\n" " -b, --backend=TYPE produce a graph with the given backend TYPE" msgstr "" -#: guix/scripts/graph.scm:461 +#: guix/scripts/graph.scm:488 msgid "" "\n" " --list-backends list the available graph backends" msgstr "" -#: guix/scripts/graph.scm:463 +#: guix/scripts/graph.scm:490 msgid "" "\n" " -t, --type=TYPE represent nodes of the given TYPE" msgstr "" -#: guix/scripts/graph.scm:465 +#: guix/scripts/graph.scm:492 msgid "" "\n" " --list-types list the available graph types" msgstr "" -#: guix/scripts/graph.scm:467 guix/scripts/pack.scm:710 +#: guix/scripts/graph.scm:494 guix/scripts/pack.scm:752 msgid "" "\n" " -e, --expression=EXPR consider the package EXPR evaluates to" msgstr "" -#: guix/scripts/graph.scm:469 +#: guix/scripts/graph.scm:496 msgid "" "\n" " -s, --system=SYSTEM consider the graph for SYSTEM--e.g., \"i686-linux\"" @@ -2493,473 +3483,524 @@ msgid "" " -v, --verbose show details about successful comparisons" msgstr "" -#: guix/scripts/copy.scm:59 +#: guix/scripts/copy.scm:60 #, scheme-format msgid "~a: invalid TCP port number~%" msgstr "" -#: guix/scripts/copy.scm:61 +#: guix/scripts/copy.scm:62 #, scheme-format msgid "~a: invalid SSH specification~%" msgstr "" -#: guix/scripts/copy.scm:113 +#: guix/scripts/copy.scm:114 msgid "" "Usage: guix copy [OPTION]... ITEMS...\n" "Copy ITEMS to or from the specified host over SSH.\n" msgstr "" -#: guix/scripts/copy.scm:115 +#: guix/scripts/copy.scm:116 msgid "" "\n" " --to=HOST send ITEMS to HOST" msgstr "" -#: guix/scripts/copy.scm:117 +#: guix/scripts/copy.scm:118 msgid "" "\n" " --from=HOST receive ITEMS from HOST" msgstr "" -#: guix/scripts/copy.scm:169 +#: guix/scripts/copy.scm:182 #, scheme-format msgid "use '--to' or '--from'~%" msgstr "" -#: guix/scripts/pack.scm:93 +#: guix/scripts/pack.scm:95 #, scheme-format msgid "~a: compressor not found~%" msgstr "" -#: guix/scripts/pack.scm:504 +#: guix/scripts/pack.scm:513 #, scheme-format msgid "" "cross-compilation not implemented here;\n" "please email '~a'~%" msgstr "" -#: guix/scripts/pack.scm:615 +#: guix/scripts/pack.scm:644 msgid "The supported formats for 'guix pack' are:" msgstr "" -#: guix/scripts/pack.scm:617 +#: guix/scripts/pack.scm:646 msgid "" "\n" " tarball Self-contained tarball, ready to run on another machine" msgstr "" -#: guix/scripts/pack.scm:619 +#: guix/scripts/pack.scm:648 msgid "" "\n" " squashfs Squashfs image suitable for Singularity" msgstr "" -#: guix/scripts/pack.scm:621 +#: guix/scripts/pack.scm:650 msgid "" "\n" " docker Tarball ready for 'docker load'" msgstr "" -#: guix/scripts/pack.scm:678 +#: guix/scripts/pack.scm:712 #, scheme-format msgid "~a: invalid symlink specification~%" msgstr "" -#: guix/scripts/pack.scm:689 +#: guix/scripts/pack.scm:726 #, scheme-format msgid "~a: unsupported profile name~%" msgstr "" -#: guix/scripts/pack.scm:698 +#: guix/scripts/pack.scm:740 msgid "" "Usage: guix pack [OPTION]... PACKAGE...\n" "Create a bundle of PACKAGE.\n" msgstr "" -#: guix/scripts/pack.scm:704 +#: guix/scripts/pack.scm:746 msgid "" "\n" " -f, --format=FORMAT build a pack in the given FORMAT" msgstr "" -#: guix/scripts/pack.scm:706 +#: guix/scripts/pack.scm:748 msgid "" "\n" " --list-formats list the formats available" msgstr "" -#: guix/scripts/pack.scm:708 +#: guix/scripts/pack.scm:750 msgid "" "\n" " -R, --relocatable produce relocatable executables" msgstr "" -#: guix/scripts/pack.scm:716 +#: guix/scripts/pack.scm:758 msgid "" "\n" " -C, --compression=TOOL compress using TOOL--e.g., \"lzip\"" msgstr "" -#: guix/scripts/pack.scm:718 +#: guix/scripts/pack.scm:760 msgid "" "\n" " -S, --symlink=SPEC create symlinks to the profile according to SPEC" msgstr "" -#: guix/scripts/pack.scm:720 +#: guix/scripts/pack.scm:762 msgid "" "\n" " -m, --manifest=FILE create a pack with the manifest from FILE" msgstr "" -#: guix/scripts/pack.scm:722 +#: guix/scripts/pack.scm:764 +msgid "" +"\n" +" --save-provenance save provenance information" +msgstr "" + +#: guix/scripts/pack.scm:766 msgid "" "\n" " --localstatedir include /var/guix in the resulting pack" msgstr "" -#: guix/scripts/pack.scm:724 +#: guix/scripts/pack.scm:768 msgid "" "\n" " --profile-name=NAME\n" " populate /var/guix/profiles/.../NAME" msgstr "" -#: guix/scripts/pack.scm:727 +#: guix/scripts/pack.scm:773 msgid "" "\n" " --bootstrap use the bootstrap binaries to build the pack" msgstr "" -#: guix/scripts/pack.scm:769 +#: guix/scripts/pack.scm:818 +#, scheme-format +msgid "could not determine provenance of package ~a~%" +msgstr "" + +#: guix/scripts/pack.scm:827 #, scheme-format msgid "both a manifest and a package list were given~%" msgstr "" -#: guix/scripts/pack.scm:814 +#: guix/scripts/pack.scm:882 #, scheme-format msgid "~a: unknown pack format~%" msgstr "" -#: guix/scripts/weather.scm:73 +#: guix/scripts/weather.scm:80 msgid "computing ~h package derivations for ~a...~%" msgstr "" -#: guix/scripts/weather.scm:162 +#: guix/scripts/weather.scm:169 msgid "looking for ~h store items on ~a...~%" msgstr "" -#: guix/scripts/weather.scm:174 +#: guix/scripts/weather.scm:181 msgid " ~2,1f% substitutes available (~h out of ~h)~%" msgstr "" -#: guix/scripts/weather.scm:180 +#: guix/scripts/weather.scm:187 #, scheme-format msgid " unknown substitute sizes~%" msgstr "" -#: guix/scripts/weather.scm:183 +#: guix/scripts/weather.scm:190 msgid " ~,1h MiB of nars (compressed)~%" msgstr "" -#: guix/scripts/weather.scm:184 +#: guix/scripts/weather.scm:191 msgid " at least ~,1h MiB of nars (compressed)~%" msgstr "" -#: guix/scripts/weather.scm:186 +#: guix/scripts/weather.scm:193 msgid " ~,1h MiB on disk (uncompressed)~%" msgstr "" -#: guix/scripts/weather.scm:188 +#: guix/scripts/weather.scm:195 msgid " ~,3h seconds per request (~,1h seconds in total)~%" msgstr "" -#: guix/scripts/weather.scm:190 +#: guix/scripts/weather.scm:197 msgid " ~,1h requests per second~%" msgstr "" -#: guix/scripts/weather.scm:196 +#: guix/scripts/weather.scm:203 #, scheme-format msgid " (continuous integration information unavailable)~%" msgstr "" -#: guix/scripts/weather.scm:199 +#: guix/scripts/weather.scm:206 #, scheme-format msgid " '~a' returned ~a (~s)~%" msgstr "" -#: guix/scripts/weather.scm:216 +#: guix/scripts/weather.scm:223 msgid " ~,1f% (~h out of ~h) of the missing items are queued~%" msgstr "" -#: guix/scripts/weather.scm:222 +#: guix/scripts/weather.scm:229 msgid " at least ~h queued builds~%" msgstr "" -#: guix/scripts/weather.scm:223 +#: guix/scripts/weather.scm:230 msgid " ~h queued builds~%" msgstr "" -#: guix/scripts/weather.scm:226 +#: guix/scripts/weather.scm:233 #, scheme-format msgid " ~a: ~a (~0,1f%)~%" msgstr "" -#: guix/scripts/weather.scm:232 +#: guix/scripts/weather.scm:239 #, scheme-format msgid " build rate: ~1,2f builds per hour~%" msgstr "" -#: guix/scripts/weather.scm:236 +#: guix/scripts/weather.scm:243 #, scheme-format msgid " ~a: ~,2f builds per hour~%" msgstr "" -#: guix/scripts/weather.scm:248 +#: guix/scripts/weather.scm:255 msgid "" "Usage: guix weather [OPTIONS]\n" "Report the availability of substitutes.\n" msgstr "" -#: guix/scripts/weather.scm:250 +#: guix/scripts/weather.scm:257 msgid "" "\n" " --substitute-urls=URLS\n" " check for available substitutes at URLS" msgstr "" -#: guix/scripts/weather.scm:253 +#: guix/scripts/weather.scm:260 msgid "" "\n" " -m, --manifest=MANIFEST\n" " look up substitutes for packages specified in MANIFEST" msgstr "" -#: guix/scripts/weather.scm:256 +#: guix/scripts/weather.scm:263 +msgid "" +"\n" +" -c, --coverage[=COUNT]\n" +" show substitute coverage for packages with at least\n" +" COUNT dependents" +msgstr "" + +#: guix/scripts/weather.scm:267 msgid "" "\n" " -s, --system=SYSTEM consider substitutes for SYSTEM--e.g., \"i686-linux\"" msgstr "" -#: guix/scripts/weather.scm:280 +#: guix/scripts/weather.scm:291 #, scheme-format msgid "~a: invalid URL~%" msgstr "" -#: guix/scripts/describe.scm:45 +#: guix/scripts/weather.scm:420 +#, scheme-format +msgid "The following ~a package is missing from '~a' for '~a':~%" +msgid_plural "The following ~a packages are missing from '~a' for '~a':~%" +msgstr[0] "" +msgstr[1] "" + +#: guix/scripts/weather.scm:426 +#, scheme-format +msgid "~a package is missing from '~a' for '~a':~%" +msgid_plural "~a packages are missing from '~a' for '~a', among which:~%" +msgstr[0] "" +msgstr[1] "" + +#: guix/scripts/describe.scm:46 #, scheme-format msgid "~a: unsupported output format~%" msgstr "" -#: guix/scripts/describe.scm:64 +#: guix/scripts/describe.scm:65 msgid "" "Usage: guix describe [OPTION]...\n" "Display information about the channels currently in use.\n" msgstr "" -#: guix/scripts/describe.scm:66 +#: guix/scripts/describe.scm:67 msgid "" "\n" " -f, --format=FORMAT display information in the given FORMAT" msgstr "" -#: guix/scripts/describe.scm:68 +#: guix/scripts/describe.scm:69 msgid "" "\n" " -p, --profile=PROFILE display information about PROFILE" msgstr "" -#: guix/scripts/describe.scm:87 +#: guix/scripts/describe.scm:88 #, scheme-format msgid "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%" msgstr "" -#: guix/scripts/describe.scm:115 +#: guix/scripts/describe.scm:91 +#, scheme-format +msgid "'GUIX_PACKAGE_PATH' is set but it is not captured~%" +msgstr "" + +#: guix/scripts/describe.scm:118 #, scheme-format msgid "failed to determine origin~%" msgstr "" -#: guix/scripts/describe.scm:121 +#: guix/scripts/describe.scm:119 +#, scheme-format +msgid "" +"Perhaps this\n" +"@command{guix} command was not obtained with @command{guix pull}? Its version\n" +"string is ~a.~%" +msgstr "" + +#: guix/scripts/describe.scm:129 #, scheme-format msgid "Git checkout:~%" msgstr "" -#: guix/scripts/describe.scm:122 +#: guix/scripts/describe.scm:130 #, scheme-format msgid " repository: ~a~%" msgstr "" -#: guix/scripts/describe.scm:123 +#: guix/scripts/describe.scm:131 #, scheme-format msgid " branch: ~a~%" msgstr "" -#: guix/scripts/describe.scm:124 +#: guix/scripts/describe.scm:132 #, scheme-format msgid " commit: ~a~%" msgstr "" -#: guix/scripts/processes.scm:197 +#: guix/scripts/processes.scm:211 msgid "" "Usage: guix processes\n" "List the current Guix sessions and their processes." msgstr "" +"Användning: guix processes\n" +"Lista aktuella Guix-sessioner och deras processer." -#: guix/gnu-maintenance.scm:661 +#: guix/gnu-maintenance.scm:660 msgid "Updater for GNU packages" -msgstr "" +msgstr "Uppdaterar för GNU-paket" -#: guix/gnu-maintenance.scm:670 +#: guix/gnu-maintenance.scm:669 msgid "Updater for GNU packages only available via FTP" -msgstr "" +msgstr "Uppdaterare för GNU-paket som bara är tillgängliga via FTP" -#: guix/gnu-maintenance.scm:679 +#: guix/gnu-maintenance.scm:678 msgid "Updater for KDE packages" -msgstr "" +msgstr "Uppdaterare för KDE-paket" -#: guix/gnu-maintenance.scm:686 +#: guix/gnu-maintenance.scm:685 msgid "Updater for X.org packages" -msgstr "" +msgstr "Uppdaterare för X.org-paket" -#: guix/gnu-maintenance.scm:693 +#: guix/gnu-maintenance.scm:692 msgid "Updater for packages hosted on kernel.org" -msgstr "" +msgstr "Uppdaterare för paket som finns på kernel.org" #: guix/scripts/container.scm:26 msgid "" "Usage: guix container ACTION ARGS...\n" "Build and manipulate Linux containers.\n" msgstr "" +"Användning: guix container ÅTGÄRD ARGUMENT…\n" +"Bygg och manipulera Linux-behållare.\n" #: guix/scripts/container.scm:31 msgid " exec execute a command inside of an existing container\n" -msgstr "" +msgstr " exec kör ett kommando inut en existerande behållare\n" #: guix/scripts/container.scm:54 #, scheme-format msgid "guix container: missing action~%" -msgstr "" +msgstr "guix container: saknar åtgärd~%" #: guix/scripts/container.scm:64 #, scheme-format msgid "guix container: invalid action~%" -msgstr "" +msgstr "guix container: ogiltig åtgärd~%" #: guix/scripts/container/exec.scm:40 msgid "" "Usage: guix container exec PID COMMAND [ARGS...]\n" "Execute COMMMAND within the container process PID.\n" msgstr "" +"Användning: guix container exec PID KOMMANDO [ARGUMENT…]\n" +"Kör KOMMANDO inuti behållarprocess PID.\n" #: guix/scripts/container/exec.scm:69 #, scheme-format msgid "~a: extraneous argument~%" -msgstr "" +msgstr "~a: främmande argument~%" #: guix/scripts/container/exec.scm:87 #, scheme-format msgid "no pid specified~%" -msgstr "" +msgstr "ingen pid angiven~%" #: guix/scripts/container/exec.scm:90 #, scheme-format msgid "no command specified~%" -msgstr "" +msgstr "inget kommando angivet~%" #: guix/scripts/container/exec.scm:93 #, scheme-format msgid "no such process ~d~%" -msgstr "" +msgstr "ingen sådan process ~d~%" #: guix/scripts/container/exec.scm:105 #, scheme-format msgid "exec failed with status ~d~%" -msgstr "" +msgstr "exec misslyckades med status ~d~%" -#: guix/upstream.scm:250 +#: guix/upstream.scm:327 #, scheme-format msgid "signature verification failed for `~a'~%" -msgstr "" +msgstr "signaturverifiering misslyckades för ”~a”~%" -#: guix/upstream.scm:252 +#: guix/upstream.scm:329 #, scheme-format msgid "(could be because the public key is not in your keyring)~%" -msgstr "" +msgstr "(kan vara för att den publika nyckeln inte finns i din nyckelring)~%" -#: guix/upstream.scm:337 +#: guix/upstream.scm:397 +#, scheme-format +msgid "cannot download for this method: ~s" +msgstr "kan inte hämta med denna metod: ~s" + +#: guix/upstream.scm:460 #, scheme-format msgid "~a: could not locate source file" -msgstr "" +msgstr "~a: kunde inte hitta källfil" -#: guix/upstream.scm:342 +#: guix/upstream.scm:465 #, scheme-format msgid "~a: ~a: no `version' field in source; skipping~%" -msgstr "" +msgstr "~a: ~a: inget ”version”-fält i källa; hoppar över~%" -#: guix/ui.scm:175 +#. TRANSLATORS: The goal is to emit "warning:" followed by a short phrase; +#. "~a" is a placeholder for that phrase. +#: guix/ui.scm:205 +msgid "warning: " +msgstr "varning: " + +#: guix/ui.scm:207 +msgid "error: " +msgstr "fel: " + +#: guix/ui.scm:254 #, scheme-format msgid "error: ~a: unbound variable" -msgstr "" +msgstr "fel: ~a: obunden variabel" -#: guix/ui.scm:271 +#: guix/ui.scm:350 msgid "entering debugger; type ',bt' for a backtrace\n" -msgstr "" +msgstr "går in i felsökare; skriv ”,bt” för en bakåtspårning\n" -#: guix/ui.scm:320 -#, scheme-format -msgid "hint: ~a~%" -msgstr "" +#: guix/ui.scm:405 +msgid "hint: " +msgstr "tips: " -#: guix/ui.scm:336 +#: guix/ui.scm:422 msgid "Did you forget a @code{use-modules} form?" -msgstr "" +msgstr "Glömde du en @code{use-modules}-form?" -#: guix/ui.scm:338 +#: guix/ui.scm:424 #, scheme-format msgid "Did you forget @code{(use-modules ~a)}?" -msgstr "" +msgstr "Glömde du @code{(use-modules ~s)}?" -#: guix/ui.scm:347 guix/ui.scm:387 guix/ui.scm:394 +#: guix/ui.scm:433 guix/ui.scm:474 guix/ui.scm:480 #, scheme-format msgid "failed to load '~a': ~a~%" -msgstr "" +msgstr "misslyckades med att läsa in ”~a”: ~a~%" -#: guix/ui.scm:354 +#: guix/ui.scm:440 #, scheme-format msgid "~amissing closing parenthesis~%" -msgstr "" - -#: guix/ui.scm:359 guix/ui.scm:367 guix/ui.scm:714 -#, scheme-format -msgid "~a: error: ~a~%" -msgstr "" +msgstr "~asaknar avslutande parentes~%" -#: guix/ui.scm:374 guix/ui.scm:784 +#: guix/ui.scm:454 guix/ui.scm:877 #, scheme-format msgid "exception thrown: ~s~%" -msgstr "" +msgstr "kastat undantag: ~s~%" -#: guix/ui.scm:378 guix/ui.scm:400 +#: guix/ui.scm:458 guix/ui.scm:486 #, scheme-format msgid "failed to load '~a':~%" -msgstr "" - -#: guix/ui.scm:390 -#, scheme-format -msgid "~a: warning: ~a~%" -msgstr "" +msgstr "misslyckades med att läsa in ”~a”:~%" -#: guix/ui.scm:397 +#: guix/ui.scm:483 #, scheme-format msgid "failed to load '~a': exception thrown: ~s~%" -msgstr "" - -#: guix/ui.scm:433 -#, scheme-format -msgid "failed to install locale: ~a~%" -msgstr "" +msgstr "misslyckades med att läsa in ”~a”: kastat undantag: ~s~%" -#: guix/ui.scm:435 +#: guix/ui.scm:516 msgid "" "Consider installing the @code{glibc-utf8-locales} or\n" "@code{glibc-locales} package and defining @code{GUIX_LOCPATH}, along these\n" @@ -2972,648 +4013,800 @@ msgid "" "\n" "See the \"Application Setup\" section in the manual, for more info.\n" msgstr "" +"Överväg att installera ~code{glibc-utf8-locales} eller\n" +"@code{glibc-locales} paketen och definiera @code{GUIX_LOCPATH},\n" +"på följande sätt:\n" +"\n" +"@example\n" +"guix package -i glibc-utf8-locales\n" +"export GUIX_LOCPATH=\"$HOME/.guix-profile/lib/locale\"\n" +"@end example\n" +"\n" +"Se avsnittet ”Applikationsinställning” i manualen för vidare infromation.\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. */ -#: guix/ui.scm:473 +#: guix/ui.scm:554 msgid "(C)" -msgstr "" +msgstr "(C)" -#: guix/ui.scm:474 +#: guix/ui.scm:555 msgid "the Guix authors\n" -msgstr "" +msgstr "Guix-upphovsmännen\n" -#: guix/ui.scm:475 +#: guix/ui.scm:556 msgid "" "License GPLv3+: GNU GPL version 3 or later \n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" +"Licens GPLv3+: GNU GPL version 3 eller senare \n" +"Detta är fri mjukvara: du kan fritt ändra och återdistribuera den.\n" +"Det finns INGEN GARANTI, utom sådan som måste ges enligt lag.\n" #. TRANSLATORS: The placeholder indicates the bug-reporting address for this #. package. Please add another line saying "Report translation bugs to #. ...\n" with the address for translation bugs (typically your translation #. team's web or email address). -#: guix/ui.scm:487 +#: guix/ui.scm:568 #, scheme-format msgid "" "\n" "Report bugs to: ~a." msgstr "" +"\n" +"Rapportera buggar till: ~a." -#: guix/ui.scm:489 +#: guix/ui.scm:570 #, scheme-format msgid "" "\n" "~a home page: <~a>" msgstr "" +"\n" +"~a hemsida: <~a>" -#: guix/ui.scm:491 +#: guix/ui.scm:572 msgid "" "\n" "General help using GNU software: " msgstr "" +"\n" +"Allmän hjälp med att använda GNU-programvara: " -#: guix/ui.scm:539 +#: guix/ui.scm:627 #, scheme-format msgid "'~a' is not a valid regular expression: ~a~%" -msgstr "" +msgstr "”~a” är inte ett giltigt reguljärt uttryck: ~a~%" -#: guix/ui.scm:545 +#: guix/ui.scm:633 #, scheme-format msgid "~a: invalid number~%" -msgstr "" +msgstr "~a: ogiltigt nummer~%" -#: guix/ui.scm:562 +#: guix/ui.scm:650 #, scheme-format msgid "invalid number: ~a~%" -msgstr "" +msgstr "ogiltigt nummer: ~a~%" -#: guix/ui.scm:585 +#: guix/ui.scm:673 #, scheme-format msgid "unknown unit: ~a~%" -msgstr "" +msgstr "okänd enhet: ~a~%" -#: guix/ui.scm:600 +#: guix/ui.scm:688 #, scheme-format msgid "" "You cannot have two different versions\n" "or variants of @code{~a} in the same profile." msgstr "" +"Du kan inte ha två olika versioner\n" +"eller varianter av @code{~a} i samma profil." -#: guix/ui.scm:603 +#: guix/ui.scm:691 #, scheme-format msgid "" "Try upgrading both @code{~a} and @code{~a},\n" "or remove one of them from the profile." msgstr "" +"Prova att uppgradera både @code{~a} och @code{~a},\n" +"eller ta bort en av dem från profilen." -#: guix/ui.scm:622 +#: guix/ui.scm:710 #, scheme-format msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%" -msgstr "" +msgstr "~a:~a~a: paket ”~a” har en ogiltig inmatning: ~s~%" -#: guix/ui.scm:629 +#: guix/ui.scm:717 #, scheme-format msgid "~a: ~a: build system `~a' does not support cross builds~%" -msgstr "" +msgstr "~a: ~a: byggsystem ”~a” har inte stöd för korsbyggen~%" -#: guix/ui.scm:635 +#: guix/ui.scm:723 #, scheme-format msgid "~s: invalid G-expression input~%" -msgstr "" +msgstr "~s: ogiltig inmatning för G-uttryck~%" -#: guix/ui.scm:638 +#: guix/ui.scm:726 #, scheme-format msgid "profile '~a' does not exist~%" -msgstr "" +msgstr "profil ”~a” existerar inte~%" -#: guix/ui.scm:641 +#: guix/ui.scm:729 #, scheme-format msgid "generation ~a of profile '~a' does not exist~%" -msgstr "" +msgstr "generation ~a av profil ”~a” existerar inte~%" -#: guix/ui.scm:650 +#: guix/ui.scm:734 +#, scheme-format +msgid "package '~a~@[@~a~]~@[:~a~]' not found in profile~%" +msgstr "paket ”~a~@[@~a~]~@[:~a~]” hittades inte i profil~%" + +#: guix/ui.scm:746 #, scheme-format msgid " ... propagated from ~a@~a~%" -msgstr "" +msgstr " … propagerad från ~a@~a~%" -#: guix/ui.scm:660 +#: guix/ui.scm:756 #, scheme-format msgid "profile contains conflicting entries for ~a~a~%" -msgstr "" +msgstr "profil innehåller poster som står i konflikt för ~a~a~%" -#: guix/ui.scm:663 +#: guix/ui.scm:759 #, scheme-format msgid " first entry: ~a@~a~a ~a~%" -msgstr "" +msgstr " första post: ~a@~a~a ~a~%" -#: guix/ui.scm:669 +#: guix/ui.scm:765 #, scheme-format msgid " second entry: ~a@~a~a ~a~%" -msgstr "" +msgstr " andra post: ~a@~a~a ~a~%" -#: guix/ui.scm:681 +#: guix/ui.scm:777 #, scheme-format msgid "corrupt input while restoring '~a' from ~s~%" -msgstr "" +msgstr "korrupt inmatning under återställning av ”~a” från ~s~%" -#: guix/ui.scm:683 +#: guix/ui.scm:779 #, scheme-format msgid "corrupt input while restoring archive from ~s~%" -msgstr "" +msgstr "korrupt inmatning under återställning av arkiv från ~s~%" -#: guix/ui.scm:686 +#: guix/ui.scm:782 #, scheme-format msgid "failed to connect to `~a': ~a~%" -msgstr "" - -#: guix/ui.scm:691 -#, scheme-format -msgid "build failed: ~a~%" -msgstr "" +msgstr "misslyckades med att ansluta till ”~a”: ~a~%" -#: guix/ui.scm:694 +#: guix/ui.scm:790 #, scheme-format msgid "reference to invalid output '~a' of derivation '~a'~%" -msgstr "" +msgstr "referens till ogiltig utmatning ”~a” från härledning ”~a”~%" -#: guix/ui.scm:698 +#: guix/ui.scm:794 #, scheme-format msgid "file '~a' could not be found in these directories:~{ ~a~}~%" -msgstr "" +msgstr "fil ”~a” kunde inte hittas bland dessa kataloger:~{ ~a~}~%" -#: guix/ui.scm:703 +#: guix/ui.scm:799 #, scheme-format msgid "program exited~@[ with non-zero exit status ~a~]~@[ terminated by signal ~a~]~@[ stopped by signal ~a~]: ~s~%" -msgstr "" +msgstr "program avslutades~@[ med icke-noll avslutningsstatus ~a~]~@[ avslutades av signal ~a~]~@[ stoppades av signal ~a~]: ~s~%" -#: guix/ui.scm:734 +#: guix/ui.scm:827 #, scheme-format msgid "~a: ~a~%" -msgstr "" +msgstr "~a: ~a~%" -#: guix/ui.scm:769 +#: guix/ui.scm:862 #, scheme-format msgid "failed to read expression ~s: ~s~%" -msgstr "" +msgstr "misslyckades med att läsa uttryck ~s: ~s~%" -#: guix/ui.scm:775 +#: guix/ui.scm:868 #, scheme-format msgid "failed to evaluate expression '~a':~%" -msgstr "" +msgstr "misslyckades med att utvärdera uttryck ”~a”:~%" -#: guix/ui.scm:778 +#: guix/ui.scm:871 #, scheme-format msgid "syntax error: ~a~%" -msgstr "" +msgstr "syntaxfel: ~a~%" -#: guix/ui.scm:796 +#: guix/ui.scm:889 #, scheme-format msgid "expression ~s does not evaluate to a package~%" -msgstr "" +msgstr "uttryck ~s utvärderas inte till ett paket~%" -#: guix/ui.scm:816 +#: guix/ui.scm:909 msgid "at least ~,1h MB needed but only ~,1h MB available in ~a~%" -msgstr "" +msgstr "åtminstone ~,1h MB behövs men endast ~,1h MB tillgängligt i ~a~%" -#: guix/ui.scm:894 +#: guix/ui.scm:1011 #, scheme-format msgid "~:[The following derivation would be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations would be built:~%~{ ~a~%~}~;~]" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "~:[Följande härledning skulle byggas:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande härledningar skulle byggas:~%~{ ~a~%~}~;~]" #. TRANSLATORS: "MB" is for "megabyte"; it should be #. translated to the corresponding abbreviation. -#: guix/ui.scm:902 +#: guix/ui.scm:1019 msgid "~:[~,1h MB would be downloaded:~%~{ ~a~%~}~;~]" -msgstr "" +msgstr "~:[~,1h MB skulle hämtas:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:907 +#: guix/ui.scm:1024 #, scheme-format msgid "~:[The following file would be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files would be downloaded:~%~{ ~a~%~}~;~]" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "~:[Följande fil skulle hämtas:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande filer skulle hämtas:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:913 +#: guix/ui.scm:1030 #, scheme-format msgid "~:[The following graft would be made:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following grafts would be made:~%~{ ~a~%~}~;~]" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "~:[Följande ympning skulle göras:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande ympningar skulle göras:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:919 +#: guix/ui.scm:1035 +#, scheme-format +msgid "~:[The following profile hook would be built:~%~{ ~a~%~}~;~]" +msgid_plural "~:[The following profile hooks would be built:~%~{ ~a~%~}~;~]" +msgstr[0] "~:[Följande profilkrok skulle byggas:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande profilkrokar skulle byggas:~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:1041 #, scheme-format msgid "~:[The following derivation will be built:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following derivations will be built:~%~{ ~a~%~}~;~]" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "~:[Följande härledning kommer att byggas:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande härledningar kommer att byggas:~%~{ ~a~%~}~;~]" #. TRANSLATORS: "MB" is for "megabyte"; it should be #. translated to the corresponding abbreviation. -#: guix/ui.scm:927 +#: guix/ui.scm:1049 msgid "~:[~,1h MB will be downloaded:~%~{ ~a~%~}~;~]" -msgstr "" +msgstr "~:[~,1h MB kommer att hämtas:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:932 +#: guix/ui.scm:1054 #, scheme-format msgid "~:[The following file will be downloaded:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following files will be downloaded:~%~{ ~a~%~}~;~]" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "~:[Följande fil kommer att hämtas:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande filer kommer att hämtas:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:938 +#: guix/ui.scm:1060 #, scheme-format msgid "~:[The following graft will be made:~%~{ ~a~%~}~;~]" msgid_plural "~:[The following grafts will be made:~%~{ ~a~%~}~;~]" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "~:[Följande ympning kommer att göras:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande ympningar kommer att göras:~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:1065 +#, scheme-format +msgid "~:[The following profile hook will be built:~%~{ ~a~%~}~;~]" +msgid_plural "~:[The following profile hooks will be built:~%~{ ~a~%~}~;~]" +msgstr[0] "~:[Följande profilkrok kommer att byggas:~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Följande profilkrokar kommer att byggas:~%~{ ~a~%~}~;~]" -#: guix/ui.scm:997 +#: guix/ui.scm:1124 #, scheme-format msgid "The following package would be removed:~%~{~a~%~}~%" msgid_plural "The following packages would be removed:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket skulle tas bort:~%~{~a~%~}~%" +msgstr[1] "Följande paket skulle tas bort:~%~{~a~%~}~%" -#: guix/ui.scm:1002 +#: guix/ui.scm:1129 #, scheme-format msgid "The following package will be removed:~%~{~a~%~}~%" msgid_plural "The following packages will be removed:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket kommer att tas bort:~%~{~a~%~}~%" +msgstr[1] "Följande paket kommer att tas bort:~%~{~a~%~}~%" -#: guix/ui.scm:1015 +#: guix/ui.scm:1142 #, scheme-format msgid "The following package would be downgraded:~%~{~a~%~}~%" msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket skulle nedgraderas:~%~{~a~%~}~%" +msgstr[1] "Följande paket skulle nedgraderas:~%~{~a~%~}~%" -#: guix/ui.scm:1020 +#: guix/ui.scm:1147 #, scheme-format msgid "The following package will be downgraded:~%~{~a~%~}~%" msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket kommer att nedgraderas:~%~{~a~%~}~%" +msgstr[1] "Följande paket kommer att nedgraderas:~%~{~a~%~}~%" -#: guix/ui.scm:1033 +#: guix/ui.scm:1160 #, scheme-format msgid "The following package would be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket skulle uppgraderas:~%~{~a~%~}~%" +msgstr[1] "Följande paket skulle uppgraderas:~%~{~a~%~}~%" -#: guix/ui.scm:1038 +#: guix/ui.scm:1165 #, scheme-format msgid "The following package will be upgraded:~%~{~a~%~}~%" msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket kommer att uppgraderas:~%~{~a~%~}~%" +msgstr[1] "Följande paket kommer att uppgraderas:~%~{~a~%~}~%" -#: guix/ui.scm:1049 +#: guix/ui.scm:1176 #, scheme-format msgid "The following package would be installed:~%~{~a~%~}~%" msgid_plural "The following packages would be installed:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket skulle installeras:~%~{~a~%~}~%" +msgstr[1] "Följande paket skulle installeras:~%~{~a~%~}~%" -#: guix/ui.scm:1054 +#: guix/ui.scm:1181 #, scheme-format msgid "The following package will be installed:~%~{~a~%~}~%" msgid_plural "The following packages will be installed:~%~{~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande paket kommer att installeras:~%~{~a~%~}~%" +msgstr[1] "Följande paket kommer att installeras:~%~{~a~%~}~%" -#: guix/ui.scm:1071 +#: guix/ui.scm:1198 guix/deprecation.scm:46 msgid "" -msgstr "" +msgstr "" -#: guix/ui.scm:1436 +#: guix/ui.scm:1580 #, scheme-format msgid "Generation ~a\t~a" -msgstr "" +msgstr "Generation ~a\t~a" #. TRANSLATORS: This is a format-string for date->string. #. Please choose a format that corresponds to the #. usual way of presenting dates in your locale. #. See https://www.gnu.org/software/guile/manual/html_node/SRFI_002d19-Date-to-string.html #. for details. -#: guix/ui.scm:1445 +#: guix/ui.scm:1589 #, scheme-format msgid "~b ~d ~Y ~T" -msgstr "" +msgstr "~d ~b ~Y ~T" #. TRANSLATORS: The word "current" here is an adjective for #. "Generation", as in "current generation". Use the appropriate #. gender where applicable. -#: guix/ui.scm:1451 +#: guix/ui.scm:1595 #, scheme-format msgid "~a\t(current)~%" -msgstr "" +msgstr "~a\t(aktuell)~%" -#: guix/ui.scm:1494 +#: guix/ui.scm:1638 #, scheme-format msgid "switched from generation ~a to ~a~%" -msgstr "" +msgstr "växlade från generation ~a till ~a~%" -#: guix/ui.scm:1510 +#: guix/ui.scm:1654 #, scheme-format msgid "deleting ~a~%" -msgstr "" +msgstr "tar bort ~a~%" -#: guix/ui.scm:1541 +#: guix/ui.scm:1685 #, scheme-format msgid "Try `guix --help' for more information.~%" -msgstr "" +msgstr "Prova ”guix --help” för mer information.~%" -#: guix/ui.scm:1569 +#: guix/ui.scm:1713 msgid "" "Usage: guix COMMAND ARGS...\n" "Run COMMAND with ARGS.\n" msgstr "" +"Användning: guix KOMMANDO ARGUMENT…\n" +"Kör KOMMANDO med ARGUMENT.\n" -#: guix/ui.scm:1572 +#: guix/ui.scm:1716 msgid "COMMAND must be one of the sub-commands listed below:\n" -msgstr "" +msgstr "KOMMANDO måste vara ett av underkommandona som listas nedan:\n" -#: guix/ui.scm:1592 +#: guix/ui.scm:1736 #, scheme-format msgid "guix: ~a: command not found~%" -msgstr "" +msgstr "guix: ~a: kommando hittades inte~%" -#: guix/ui.scm:1622 +#: guix/ui.scm:1766 #, scheme-format msgid "guix: missing command name~%" -msgstr "" +msgstr "guix: saknar kommandonamn~%" -#: guix/ui.scm:1630 +#: guix/ui.scm:1774 #, scheme-format msgid "guix: unrecognized option '~a'~%" -msgstr "" +msgstr "guix: okänd flagga ”~a”~%" + +#. TRANSLATORS: The word "phase" here denotes a "build phase"; +#. "~a" is a placeholder for the untranslated name of the current +#. build phase--e.g., 'configure' or 'build'. +#: guix/status.scm:358 +#, scheme-format +msgid "'~a' phase" +msgstr "”~a”-fas" -#: guix/status.scm:335 +#: guix/status.scm:378 +msgid "building directory of Info manuals..." +msgstr "bygger katalog av Info-manualer…" + +#: guix/status.scm:380 +msgid "building GHC package cache..." +msgstr "bygger GHC-paketcache…" + +#: guix/status.scm:382 +msgid "building CA certificate bundle..." +msgstr "bygger CA-certifikatsknippe…" + +#: guix/status.scm:384 +msgid "generating GLib schema cache..." +msgstr "genererar GLib-schemacache…" + +#: guix/status.scm:386 +msgid "creating GTK+ icon theme cache..." +msgstr "skapar GTK+-ikontemacache…" + +#: guix/status.scm:388 +msgid "building cache files for GTK+ input methods..." +msgstr "bygger cachefiler för GTK+-inmatningsmetoder…" + +#: guix/status.scm:390 +msgid "building XDG desktop file cache..." +msgstr "bygger XDG-skrivbordsfilscache…" + +#: guix/status.scm:392 +msgid "building XDG MIME database..." +msgstr "bygger XDG-MIME-databas…" + +#: guix/status.scm:394 +msgid "building fonts directory..." +msgstr "bygger fontkatalog…" + +#: guix/status.scm:396 +msgid "building TeX Live configuration..." +msgstr "bygger TeX Live-konfiguration…" + +#: guix/status.scm:398 +msgid "building database for manual pages..." +msgstr "bygger databas för manualsidor…" + +#: guix/status.scm:400 +msgid "building package cache..." +msgstr "bygger paket cache…" + +#: guix/status.scm:475 #, scheme-format msgid "applying ~a graft for ~a..." msgid_plural "applying ~a grafts for ~a..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tillämpar ~a ympning för ~a…" +msgstr[1] "tillämpar ~a ympningar för ~a…" + +#: guix/status.scm:484 +#, scheme-format +msgid "running profile hook of type '~a'..." +msgstr "kör profilkrok av typ ”~a”…" -#: guix/status.scm:340 +#: guix/status.scm:487 #, scheme-format msgid "building ~a..." -msgstr "" +msgstr "bygger ~a…" -#: guix/status.scm:344 +#: guix/status.scm:492 #, scheme-format msgid "successfully built ~a" -msgstr "" +msgstr "byggde ~a framgångsrikt" -#: guix/status.scm:350 +#: guix/status.scm:498 #, scheme-format msgid "The following build is still in progress:~%~{ ~a~%~}~%" msgid_plural "The following builds are still in progress:~%~{ ~a~%~}~%" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Följande bygge pågår fortfarande:~%~{ ~a~%~}~%" +msgstr[1] "Följande byggen pågår fortfarande:~%~{ ~a~%~}~%" -#: guix/status.scm:355 +#: guix/status.scm:504 #, scheme-format msgid "build of ~a failed" -msgstr "" +msgstr "bygge av ~a misslyckades" -#: guix/status.scm:359 +#: guix/status.scm:508 #, scheme-format msgid "Could not find build log for '~a'." -msgstr "" +msgstr "Kunde inte hitta bygglogg för ”~a”." -#: guix/status.scm:362 +#: guix/status.scm:511 #, scheme-format msgid "View build log at '~a'." -msgstr "" +msgstr "Granska bygglogg vid ”~a”." -#: guix/status.scm:366 +#: guix/status.scm:516 #, scheme-format msgid "substituting ~a..." -msgstr "" +msgstr "ersätter ~a…" -#: guix/status.scm:369 +#: guix/status.scm:520 #, scheme-format msgid "downloading from ~a..." -msgstr "" +msgstr "hämtar från ~a…" -#: guix/status.scm:394 +#: guix/status.scm:545 #, scheme-format msgid "substitution of ~a complete" -msgstr "" +msgstr "ersättning av ~a färdigställd" -#: guix/status.scm:397 +#: guix/status.scm:548 #, scheme-format msgid "substitution of ~a failed" -msgstr "" +msgstr "ersättning av ~a misslyckades" #. TRANSLATORS: The final string looks like "sha256 hash mismatch for #. /gnu/store/…-sth:", where "sha256" is the hash algorithm. -#: guix/status.scm:402 +#: guix/status.scm:553 #, scheme-format msgid "~a hash mismatch for ~a:" -msgstr "" +msgstr "~a hash stämmer inte för ~a:" -#: guix/status.scm:404 +#: guix/status.scm:555 #, scheme-format msgid "" " expected hash: ~a\n" " actual hash: ~a~%" msgstr "" +" förväntade hash: ~a\n" +" faktisk hash: ~a~%" -#: guix/status.scm:409 +#: guix/status.scm:560 #, scheme-format msgid "offloading build of ~a to '~a'" -msgstr "" +msgstr "avlastning av bygge av ~a till ”~a”" #: guix/http-client.scm:117 #, scheme-format msgid "following redirection to `~a'...~%" -msgstr "" +msgstr "följer omdirigering till ”~a”…~%" #: guix/http-client.scm:129 #, scheme-format msgid "~a: HTTP download failed: ~a (~s)" -msgstr "" +msgstr "~a: HTTP-hämtning misslyckades: ~a (~s)" #: guix/nar.scm:157 msgid "signature is not a valid s-expression" -msgstr "" +msgstr "signatur är inte ett giltig s-uttryck" #: guix/nar.scm:166 msgid "invalid signature" -msgstr "" +msgstr "ogiltig signatur" #: guix/nar.scm:170 msgid "invalid hash" -msgstr "" +msgstr "ogiltig hash" #: guix/nar.scm:178 msgid "unauthorized public key" -msgstr "" +msgstr "icke auktoriserad publik nyckel" #: guix/nar.scm:183 msgid "corrupt signature data" -msgstr "" +msgstr "korrupt signaturdata" #: guix/nar.scm:203 msgid "corrupt file set archive" -msgstr "" +msgstr "korrupt filuppsättningsarkiv" #: guix/nar.scm:213 #, scheme-format msgid "importing file or directory '~a'...~%" -msgstr "" +msgstr "importerar fil eller katalog ”~a”…~%" #: guix/nar.scm:224 #, scheme-format msgid "found valid signature for '~a'~%" -msgstr "" +msgstr "hittade giltig signatur för ”~a”~%" #: guix/nar.scm:231 msgid "imported file lacks a signature" -msgstr "" +msgstr "importerad fil saknar en signatur" #: guix/nar.scm:270 msgid "invalid inter-file archive mark" -msgstr "" +msgstr "ogiltig arkivmarkör mellan filer" -#: guix/channels.scm:108 +#: guix/channels.scm:177 #, scheme-format msgid "Updating channel '~a' from Git repository at '~a'...~%" -msgstr "" +msgstr "Uppdaterar kanal ”~a” från ett Git-arkiv vid ”~a”…~%" -#: guix/profiles.scm:501 +#: guix/channels.scm:366 +msgid "'guix' channel is lacking" +msgstr "”guix”-kanal saknas" + +#: guix/profiles.scm:511 msgid "unsupported manifest format" -msgstr "" +msgstr "manifestformat stöds inte" -#: guix/profiles.scm:1630 +#: guix/profiles.scm:1748 #, scheme-format msgid "while creating directory `~a': ~a" -msgstr "" +msgstr "vid skapande av katalog ”~a”: ~a" -#: guix/profiles.scm:1635 +#: guix/profiles.scm:1753 #, scheme-format msgid "Please create the @file{~a} directory, with you as the owner." -msgstr "" +msgstr "Skapa katalogen @file{~a}, med dig själv som ägare." -#: guix/profiles.scm:1644 +#: guix/profiles.scm:1762 #, scheme-format msgid "directory `~a' is not owned by you" -msgstr "" +msgstr "katalog ”~a” ägs inte av dig" -#: guix/profiles.scm:1648 +#: guix/profiles.scm:1766 #, scheme-format msgid "Please change the owner of @file{~a} to user ~s." -msgstr "" +msgstr "Ändra ägare av @file{~a} till användare ~s." + +#: guix/git.scm:159 +msgid "long Git object ID is required" +msgstr "långt Git-objekts-ID krävs" + +#: guix/git.scm:192 +#, scheme-format +msgid "updating submodule '~a'...~%" +msgstr "uppdaterar undermodul ”~a”…~%" + +#: guix/git.scm:205 +#, scheme-format +msgid "Support for submodules is missing; please upgrade Guile-Git.~%" +msgstr "Stöd för undermoduler saknas; uppgradera Guile-Git.~%" + +#: guix/git.scm:344 +#, scheme-format +msgid "cannot fetch commit ~a from ~a: ~a" +msgstr "kan inte hämta incheckning ~a från ~a: ~a" + +#: guix/git.scm:347 +#, scheme-format +msgid "cannot fetch branch '~a' from ~a: ~a" +msgstr "kan inte hämta gren ”~a” från ~a: ~a" + +#: guix/git.scm:350 +#, scheme-format +msgid "Git failure while fetching ~a: ~a" +msgstr "Git-fel vid hämtning av ~a: ~a" + +#: guix/deprecation.scm:51 +#, scheme-format +msgid "~a: warning: '~a' is deprecated~@[, use '~a' instead~]~%" +msgstr "~a: varning: ”~a” är föråldrat~@[, använd ”~a” istället~]~%" + +#: gnu/build/bootloader.scm:91 +#, scheme-format +msgid "'~a~{ ~a~}' exited with status ~a; output follows:~%~%~{ ~a~%~}" +msgstr "”~a~{ ~a~}” avslutades med status ~a; utmatning följer:~%~%~{ ~a~%~}" #: nix/nix-daemon/guix-daemon.cc:66 msgid "guix-daemon -- perform derivation builds and store accesses" -msgstr "" +msgstr "guix-daemon — utför härledningsbyggen och lagra åtkomster" #: nix/nix-daemon/guix-daemon.cc:68 msgid "This program is a daemon meant to run in the background. It serves requests sent over a Unix-domain socket. It accesses the store, and builds derivations on behalf of its clients." -msgstr "" +msgstr "Detta program är en demon som är tänkt att köra i bakgrunden. Den betjänar begäran skickade över ett Unix-domänuttag. Å sina klienters vägnar ansluter det till arkivet och bygger härledningar." #: nix/nix-daemon/guix-daemon.cc:95 msgid "SYSTEM" -msgstr "" +msgstr "SYSTEM" #: nix/nix-daemon/guix-daemon.cc:96 msgid "assume SYSTEM as the current system type" -msgstr "" +msgstr "anta att SYSTEM är samma som aktuell systemtyp" #: nix/nix-daemon/guix-daemon.cc:97 nix/nix-daemon/guix-daemon.cc:100 msgid "N" -msgstr "" +msgstr "N" #: nix/nix-daemon/guix-daemon.cc:98 msgid "use N CPU cores to build each derivation; 0 means as many as available" -msgstr "" +msgstr "använd N CPU-kärnor för att bygga varje härledning; 0 innebär så många som tillgänliga" #: nix/nix-daemon/guix-daemon.cc:101 msgid "allow at most N build jobs" -msgstr "" +msgstr "tillåt som mest N byggjobb" #: nix/nix-daemon/guix-daemon.cc:102 nix/nix-daemon/guix-daemon.cc:104 msgid "SECONDS" -msgstr "" +msgstr "SEKUNDER" #: nix/nix-daemon/guix-daemon.cc:103 msgid "mark builds as failed after SECONDS of activity" -msgstr "" +msgstr "markera byggen som misslyckades aktivitet under antal SEKUNDER" #: nix/nix-daemon/guix-daemon.cc:105 msgid "mark builds as failed after SECONDS of silence" -msgstr "" +msgstr "markera byggen som misslyckades efter tystnad under antal SEKUNDER" #: nix/nix-daemon/guix-daemon.cc:107 msgid "disable chroot builds" -msgstr "" +msgstr "inaktivera chroot-byggen" #: nix/nix-daemon/guix-daemon.cc:108 msgid "DIR" -msgstr "" +msgstr "KAT" #: nix/nix-daemon/guix-daemon.cc:109 msgid "add DIR to the build chroot" -msgstr "" +msgstr "lägg till KAT till bygg-chroot" #: nix/nix-daemon/guix-daemon.cc:110 msgid "GROUP" -msgstr "" +msgstr "GRUPP" #: nix/nix-daemon/guix-daemon.cc:111 msgid "perform builds as a user of GROUP" -msgstr "" +msgstr "utför byggen som en användare i GRUPP" #: nix/nix-daemon/guix-daemon.cc:113 msgid "do not use substitutes" -msgstr "" +msgstr "använd inte ersättningar" #: nix/nix-daemon/guix-daemon.cc:114 msgid "URLS" -msgstr "" +msgstr "URLER" #: nix/nix-daemon/guix-daemon.cc:115 msgid "use URLS as the default list of substitute providers" -msgstr "" +msgstr "använd URLER som standardlistan av ersättningsleverantörer" #: nix/nix-daemon/guix-daemon.cc:117 msgid "do not use the 'build hook'" -msgstr "" +msgstr "använd inte ”byggkroken”" #: nix/nix-daemon/guix-daemon.cc:119 msgid "cache build failures" -msgstr "" +msgstr "cacha byggfel" #: nix/nix-daemon/guix-daemon.cc:121 msgid "build each derivation N times in a row" -msgstr "" +msgstr "bygg varje härledning N gånger i rad" #: nix/nix-daemon/guix-daemon.cc:123 msgid "do not keep build logs" -msgstr "" +msgstr "behåll inte byggloggar" #: nix/nix-daemon/guix-daemon.cc:126 msgid "disable compression of the build logs" -msgstr "" +msgstr "inaktivera komprimering av byggloggarna" #: nix/nix-daemon/guix-daemon.cc:128 msgid "use the specified compression type for build logs" -msgstr "" +msgstr "använd den angivna komprimeringstypen för byggloggar" #: nix/nix-daemon/guix-daemon.cc:133 msgid "disable automatic file \"deduplication\" in the store" -msgstr "" +msgstr "inaktiva automatisk ”fildeduplicering” för arkivet" #: nix/nix-daemon/guix-daemon.cc:143 msgid "impersonate Linux 2.6" -msgstr "" +msgstr "imitera Linux 2.6" #: nix/nix-daemon/guix-daemon.cc:147 msgid "tell whether the GC must keep outputs of live derivations" -msgstr "" +msgstr "berätta huruvida GC måste behålla utmatningar för live-härledningar" #: nix/nix-daemon/guix-daemon.cc:150 msgid "tell whether the GC must keep derivations corresponding to live outputs" -msgstr "" +msgstr "berätta huruvida GC måste behålla härledningar som motsvarar live-utmatningar" #: nix/nix-daemon/guix-daemon.cc:153 msgid "SOCKET" -msgstr "" +msgstr "UTTAG" #: nix/nix-daemon/guix-daemon.cc:154 msgid "listen for connections on SOCKET" -msgstr "" +msgstr "lyssna efter anslutningar på UTTAG" #: nix/nix-daemon/guix-daemon.cc:156 msgid "produce debugging output" -msgstr "" +msgstr "producera felsökningsutmatning" + +#~ msgid "" +#~ "Consider running @command{guix gc} to free\n" +#~ "space." +#~ msgstr "" +#~ "Överväg att köra @command{guix gc} för att\n" +#~ "frigöra utrymme." -- cgit v1.2.3 From f9948ab6cb913d73779b3cc18189e5736b947303 Mon Sep 17 00:00:00 2001 From: ison Date: Sun, 18 Aug 2019 14:48:04 -0600 Subject: gnu: Add wterm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/terminals.scm (wterm): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/terminals.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 9077d295db..bca8b14dad 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1106,3 +1106,59 @@ and IP roaming. ET provides the same core functionality as @command{mosh}, while also supporting native scrolling and @command{tmux} control mode (@code{tmux -CC}).") (license license:asl2.0))) + +(define-public wterm + (package + (name "wterm") + (version "0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/majestrate/wterm.git") + (commit "0ae42717c08a85a6509214e881422c7fbe7ecc45"))) + (sha256 + (base32 + "0g4lzmc1w6na81i6hny32xds4xfig4xzswzfijyi6p93a1226dv0")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libdrm" ,libdrm) + ("libxkbcommon" ,libxkbcommon) + ("ncurses" ,ncurses) + ("pixman" ,pixman) + ("wayland" ,wayland))) + (arguments + '(#:tests? #f + + ;; Without -j1 it fails to find file libwld.a. + #:parallel-build? #f + + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" %output) + (string-append "TERMINFO=" + (assoc-ref %outputs "out") + "/share/terminfo")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'terminfo-fix + (lambda _ + (substitute* "Makefile" + (("\ttic .*") "\tmkdir -p $(SHARE_PREFIX)/share/terminfo +\ttic -o $(SHARE_PREFIX)/share/terminfo -s wterm.info\n")) + #t))))) + (native-search-paths + (list (search-path-specification + (variable "TERMINFO_DIRS") + (files '("share/terminfo"))))) + (home-page "https://github.com/majestrate/wterm") + (synopsis "Terminal emulator for Wayland") + (description "wterm is a native Wayland terminal emulator based on +an st fork using wld. st is a simple terminal emulator for X originally +made by suckless.") + (license license:x11))) -- cgit v1.2.3 From 7dff32250b181a7b0521fcadc22646f871ead3a1 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Sun, 11 Aug 2019 03:44:16 +0530 Subject: gnu: shroud: Update to 0.1.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/password-utils.scm (shroud): Update to 0.1.2. Shroud now builds with Guile-2.2. Remove hardcoded '2.0' string. Signed-off-by: Ludovic Courtès --- gnu/packages/password-utils.scm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 49024b26c4..6ca16025ef 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -236,28 +236,40 @@ platforms.") (define-public shroud (package (name "shroud") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/shroud/shroud-" version ".tar.gz")) (sha256 (base32 - "1y43yhgy2zbrk5bqj3qyx9rkcz2bma9sinlrg7dip3jqms9gq4lr")))) + "1l2shrhvcwfzkar9qiwb75nhcqmx25iz55lzmz0c187nbjhqzi9p")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (arguments - '(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim)) + #:phases (modify-phases %standard-phases (add-after 'install 'wrap-shroud - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (ccachedir (string-append out "/lib/guile/2.0/ccache")) + (guile (assoc-ref inputs "guile")) + (effective (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (ccachedir (string-append out + "/lib/guile/" effective "/site-ccache")) (prog (string-append out "/bin/shroud"))) (wrap-program prog `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir))) #t)))))) (inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("gnupg" ,gnupg) ("xclip" ,xclip))) (synopsis "GnuPG-based secret manager") -- cgit v1.2.3 From fd501b2be69c3748835ac594d580dccd8ee2e8bd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 25 Aug 2019 18:24:01 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.190. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.190. (linux-libre-4.4-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 01bb4d01a0..e57cd4c33f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,10 +382,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.189") +(define-public linux-libre-4.4-version "4.4.190") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0nc8v62gw89m3ykqg6nqf749fzm8y1n481ns8vny4gbinyikjhlp"))) + (hash (base32 "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 70c47232fe060a75ec439f3e9fb8aa7179567b24 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 25 Aug 2019 18:25:05 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.190. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.190. (linux-libre-4.9-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e57cd4c33f..4d7f4ee725 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -374,10 +374,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.189") +(define-public linux-libre-4.9-version "4.9.190") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1cyhwnxkjd0qa5d48657yppjnzbi830q0p25jjv2dxs629k4bnck"))) + (hash (base32 "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 1fda7f42d2a615598d14d501d9523b0899955612 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 25 Aug 2019 18:25:39 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.140. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.140. (linux-libre-4.14-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4d7f4ee725..060c5c0864 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.139") +(define-public linux-libre-4.14-version "4.14.140") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0hkhwcbxg6bry13w9kspx48b10274w6pgv200wh91fjd8jax8qlc"))) + (hash (base32 "1wmx7xgm21dk1hvrq14sxh3c4304284sgxr4vngg4pki2ljyspkr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 0b847656af5d8e576ce9757e5a2f8dcb692f56eb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 25 Aug 2019 18:26:12 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.68. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.68. (linux-libre-4.19-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 060c5c0864..6c8091c95d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.67") +(define-public linux-libre-4.19-version "4.19.68") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "00m5k0nfcvgff70686rbhn3w8c9wc3jxqvyddw40lylaqdh3s72s"))) + (hash (base32 "0ax04sivi1lsx01m3abi16w6d0jd3qvwzzq2zbn8q2lca505k1wi"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From e79b78f1ca481ac23f2e214523bae0dca907d848 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 25 Aug 2019 18:26:52 -0400 Subject: gnu: linux-libre: Update to 5.2.10. * gnu/packages/linux.scm (linux-libre-5.2-version): Update to 5.2.10. (linux-libre-5.2-pristine-source)[hash]: Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6c8091c95d..d49293c968 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.2-version "5.2.9") +(define-public linux-libre-5.2-version "5.2.10") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "1rnlnphw9rih4qhdld9ic5lnj5jh4vy5nqbj9lqwv9bc615jmw5n"))) + (hash (base32 "0jgw7gj71i9kf4prbdi9h791ngxf24nr90302glnsa9aghwc95k0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -- cgit v1.2.3 From 5daa20197eeedcb1e6ed0c98d5a0b2d178990c10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:27:41 +0200 Subject: gnu: mupen64plus-video-arachnoid: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-video-arachnoid)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 804edddcef..85f9d01088 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -715,7 +715,7 @@ Z64 RSP processor plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From d1e63866759c3395268ac43b2135b21423eeec3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:27:56 +0200 Subject: gnu: mupen64plus-video-glide64: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-video-glide64)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 85f9d01088..63b87409b2 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -769,7 +769,7 @@ Arachnoid video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From 84532c2ba4fdf2a496d9ecac61f30c98c019b7c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:28:11 +0200 Subject: gnu: mupen64plus-video-glide64mk2: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-video-glide64mk2)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 63b87409b2..04546693a5 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -819,7 +819,7 @@ Glide64 video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From b21acd21d50acbb5c3d2c60cdab7bfb4b8b444e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:28:28 +0200 Subject: gnu: mupen64plus-video-rice: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-video-rice)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 04546693a5..522274d006 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -867,7 +867,7 @@ Glide64MK2 video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Rice Video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From 26daadb9c67818d1e94a8875ee97474448463b8a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:28:56 +0200 Subject: gnu: mupen64plus-video-z64: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-video-z64)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 522274d006..0fcd88beff 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -922,7 +922,7 @@ Rice Video plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus Z64 video plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From 9b9086ea82f8890f0cb228e1dca2fc16f8a56421 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 03:25:34 +0200 Subject: gnu: rmlint: Update to 2.9.0. * gnu/packages/disk.scm (rmlint): Update to 2.9.0. --- gnu/packages/disk.scm | 4 ++-- gnu/packages/gsasl.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 187ef74b4e..cf53142533 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -760,7 +760,7 @@ LVM D-Bus API).") (define-public rmlint (package (name "rmlint") - (version "2.8.0") + (version "2.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -769,7 +769,7 @@ LVM D-Bus API).") (file-name (git-file-name name version)) (sha256 (base32 - "1gc7gbnh0qg1kl151cv1ld87vhpm1v3pnkn7prhscdcc21jrg8nz")))) + "1b5cziam14h80xrfb285fmfrzz2rligxcpsq1xsig14xf4l2875i")))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 127b476ef3..6cdc395ec5 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012 Andreas Enge ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From cb6add546c5e8d1bad958f027df0c417696814d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 04:51:45 +0200 Subject: gnu: snd: Update to 19.6. * gnu/packages/audio.scm (snd): Update to 19.6. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 44a49295d3..79d6f5def4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3382,14 +3382,14 @@ on the ALSA software PCM plugin.") (define-public snd (package (name "snd") - (version "19.5") + (version "19.6") (source (origin (method url-fetch) (uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/" "snd-" version ".tar.gz")) (sha256 (base32 - "0sk6iyykwi2mm3f1g4r0iqbsrwk3zmyagp6jjqkh8njbq42cjr1y")))) + "0s2qv8sznvw6559bi39qj9p072azh9qcb2b86w6w8clz2azjaa76")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 947748764539c0e8421b12c458db13fb3a38033b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 04:52:56 +0200 Subject: gnu: snd: Set correct --with-doc-dir. * gnu/packages/audio.scm (snd)[arguments]: Match #:configure-flags to phases. --- gnu/packages/audio.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 79d6f5def4..292c9afc1f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3396,7 +3396,8 @@ on the ALSA software PCM plugin.") #:out-of-source? #f ; for the 'install-doc' phase #:configure-flags (let* ((out (assoc-ref %outputs "out")) - (docdir (string-append out "/share/doc/snd"))) + (docdir (string-append out "/share/doc/" + ,name "-" ,version))) (list "--with-alsa" "--with-jack" "--with-gmp" (string-append "--with-doc-dir=" docdir))) #:phases -- cgit v1.2.3 From 3ef664d08234814176059d619f27ab188cbde267 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 04:54:31 +0200 Subject: gnu: snd: Don't install the licence twice. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (snd)[arguments]: Let the build system install ‘COPYING’ once. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 292c9afc1f..af2951fcd5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3410,7 +3410,7 @@ on the ALSA software PCM plugin.") (for-each (lambda (f) (install-file f doc)) - (find-files "." "\\.html$|COPYING")) + (find-files "." "\\.html$")) (copy-recursively "pix" (string-append doc "/pix")) #t)))))) (native-inputs -- cgit v1.2.3 From a7c7015adb7321764d133e5be514165cd902dd24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 04:58:11 +0200 Subject: gnu: python-cvxopt: Update to 1.2.3. * gnu/packages/maths.scm (python-cvxopt): Update to 1.2.3. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 57deb15d7d..4a07b8e687 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -246,7 +246,7 @@ triangulations.") (define-public python-cvxopt (package (name "python-cvxopt") - (version "1.2.1") + (version "1.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -255,7 +255,7 @@ triangulations.") (file-name (git-file-name name version)) (sha256 (base32 - "05mnjil9palaa48xafdfh4f5pr4z7aqjr995rwl08qfyxs8y0crf")))) + "1kiy2m62xgs2d5id6dnnwy4vap85cd70p7pgkb9nh23qf9xnak7b")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From a707484d64e7e46f8cb8401c660fbb6eb77ab9c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 25 Aug 2019 16:51:19 +0200 Subject: gnu: perl-namespace-autoclean: Update to 0.29. * gnu/packages/perl.scm (perl-namespace-autoclean): Update to 0.29. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 55d88d07e8..56a857c0f8 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6495,19 +6495,18 @@ Perl (back to 5.6.0).") (define-public perl-namespace-autoclean (package (name "perl-namespace-autoclean") - (version "0.28") + (version "0.29") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "namespace-autoclean-" version ".tar.gz")) (sha256 - (base32 - "0fbcq99yaix1aa99jl3v811dbw24il9jxnh5i2i23mddh4b0lhfd")))) + (base32 "012qqs561xyyhm082znmzsl8lz4n299fa6p0v246za2l9bkdiss5")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) - ("perl-test-requires" ,perl-test-requires))) + ("perl-test-needs" ,perl-test-needs))) (propagated-inputs `(("perl-b-hooks-endofscope" ,perl-b-hooks-endofscope) ("perl-namespace-clean" ,perl-namespace-clean) -- cgit v1.2.3 From 6643642482c6fabf6bebae3a5bdf576723b2099c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Aug 2019 10:00:26 +0200 Subject: gnu: Add python-pyroutelib3. * gnu/packages/python-xyz.scm (python-pyroutelib3): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 40e6a01dd7..ee17bf78e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16114,3 +16114,22 @@ to deduct the desired information. This data can be parsed by automatic pre- and post-processing scripts that draw information and store it more densely for manual interpretation.") (license license:gpl3+))) + +(define-public python-pyroutelib3 + (package + (name "python-pyroutelib3") + (version "1.3.post1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyroutelib3" version)) + (sha256 + (base32 + "1hpbydpn2alyswiajfbvhzq4c7f36vdmvxy91hgv8l1lb2g2vfrj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-dateutil" ,python-dateutil))) + (home-page "https://github.com/MKuranowski/pyroutelib3") + (synopsis "Library for simple routing on OSM data") + (description "Library for simple routing on OSM data") + (license license:gpl3+))) -- cgit v1.2.3 From 6263b5b3be1e673fc6142c5299c79a90f6611159 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Aug 2019 10:44:01 +0200 Subject: gnu: python-pillow: Update to 6.1.0. * gnu/packages/python-xyz.scm (python-pillow): Update to 6.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee17bf78e2..64c1b7f443 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4356,14 +4356,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "5.4.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17waygkhhzjd75kajlfw9v57mbb41lcpg6cvkdijqd7smm76ccsj")))) + "1pnrsz0f0n0c819v1pdr8j6rm8xvhc9f3kh1fv9xpdp9n5ygf108")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From a5f0ebf669946a6f24db8048a708136b036f8d93 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Sun, 25 Aug 2019 18:35:29 -0600 Subject: gnu: Add cvassistant. * gnu/package/cvassistant.scm: New file. * gnu/local.mk: Add it. * gnu/packages/cvassistant.scm (cvassistant): New variable. --- gnu/local.mk | 1 + gnu/packages/cvassistant.scm | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 gnu/packages/cvassistant.scm diff --git a/gnu/local.mk b/gnu/local.mk index 8b1b5ce6b4..484cb7d45c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -128,6 +128,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/cryptsetup.scm \ %D%/packages/cups.scm \ %D%/packages/curl.scm \ + %D%/packages/cvassistant.scm \ %D%/packages/cyrus-sasl.scm \ %D%/packages/databases.scm \ %D%/packages/datamash.scm \ diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm new file mode 100644 index 0000000000..f57806d734 --- /dev/null +++ b/gnu/packages/cvassistant.scm @@ -0,0 +1,90 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Jesse Gibbons +;;; +;;; 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 . + +(define-module (gnu packages cvassistant) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages qt) + #:use-module (gnu packages compression)) + +(define-public cvassistant + (package + (name "cvassistant") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/cvassistant/" + "cvassistant-" version "-src.tar.bz2")) + (sha256 + (base32 + "1y2680bazyiwm50gdhdd4982ckbjscrkbw2mngyk7yw708iadvr7")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-donation-banner + ;; Remove dialog box with a donation link, as suggested by + ;; the INSTALL file. + (lambda _ + (substitute* "controllers/mainwindow.cpp" + (("//(#define NO_DONATION_PROMPT)" _ line) line)) + #t)) + (add-after 'unpack 'fix-quazip-directory + (lambda _ + (substitute* "models/resumedocument.h" + (("quazip(/quazipfile\\.h)" _ suffix) + (string-append "quazip5" suffix))) + #t)) + (add-after 'fix-quazip-directory 'fix-quazip-link + (lambda _ + (substitute* "CVAssistant.pro" + (("lquazip-qt5") + "lquazip5")) + #t)) + (add-after 'fix-quazip-directory 'fix-install-root + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "CVAssistant.pro" + (("/usr/(bin|share/)" _ suffix) + (string-append out "/" suffix))) + #t))) + (replace 'configure + (lambda _ (invoke "qmake")))))) + (inputs + `(("qtbase" ,qtbase) + ("quazip" ,quazip) + ("zlib" ,zlib))) + (home-page "https://cvassistant.sourceforge.io/") + (synopsis "Job application organizer") + (description "Whether you're looking for a job or trying to help + a friend to find one, CVAssistant is a tool for you. It helps you by + preparing resumes and cover letters and organizing your job + application process. It: + @itemize + @item Stores all your skills and experiences. + @item Creates resumes tailored for each job you apply. + @item Creates cover letters summarized to match each job + advertisement. + @item Keeps a history of job applications so you are ready when you + receive a phone call. + @item Writes resumes in your language. All languages are supported! + @end itemize") + (license license:gpl3+))) -- cgit v1.2.3 From 7e7fce6b74dfb7eb1d9cd5fca8ae2b273a4ee923 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 26 Aug 2019 13:49:15 +0300 Subject: gnu: efl: Update to 1.22.3. * gnu/packages/enlightenment.scm (efl): Update to 1.22.3. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 90aa48c23c..a5f183f3c0 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -65,7 +65,7 @@ (define-public efl (package (name "efl") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) (uri (string-append @@ -73,7 +73,7 @@ version ".tar.xz")) (sha256 (base32 - "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n")))) + "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky")))) (outputs '("out" ; 53 MB "include")) ; 21 MB (build-system gnu-build-system) -- cgit v1.2.3 From 6cec4c4b51e72b7554b3a04d88aaf69461a944fe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 26 Aug 2019 13:51:04 +0300 Subject: gnu: rage: Update to 0.3.1. * gnu/packages/enlightenment.scm (rage): Update to 0.3.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index a5f183f3c0..c28968e649 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -242,7 +242,7 @@ contents and more.") (define-public rage (package (name "rage") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri @@ -251,7 +251,7 @@ contents and more.") version ".tar.xz")) (sha256 (base32 - "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy")))) + "04fdk23bbgvni212zrfy4ndg7vmshbsjgicrhckdvhay87pk9i75")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From 36ac9520849043cb63076c934cd33692f98601b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 10:01:35 +0200 Subject: gnu: sysstat: Update source URL. This is a followup to 3d76112769d2149e81b7cc774d859469d1f1909e. * gnu/packages/linux.scm (sysstat): Update URL. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d49293c968..a7bdba2e7f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4845,7 +4845,7 @@ running boot option, and more.") (version "12.1.6") (source (origin (method url-fetch) - (uri (string-append "http://perso.orange.fr/sebastien.godard/" + (uri (string-append "http://pagesperso-orange.fr/sebastien.godard/" "sysstat-" version ".tar.xz")) (sha256 (base32 -- cgit v1.2.3 From 94b98ef7a089d7a5720a9af2369dc994eb7ffe9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 10:02:50 +0200 Subject: services: tlp, thermald: Add descriptions. * gnu/services/pm.scm (tlp-service-type)[description]: New field. (thermald-service-type)[description]: New field. --- gnu/services/pm.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/services/pm.scm b/gnu/services/pm.scm index 3817bd09de..1e01b5059d 100644 --- a/gnu/services/pm.scm +++ b/gnu/services/pm.scm @@ -401,7 +401,8 @@ shutdown on system startup.")) (compose list tlp-configuration-tlp)) (service-extension activation-service-type tlp-activation))) - (default-value (tlp-configuration)))) + (default-value (tlp-configuration)) + (description "Run TLP, a power management tool."))) (define (generate-tlp-documentation) (generate-documentation @@ -441,4 +442,6 @@ shutdown on system startup.")) (name 'thermald) (extensions (list (service-extension shepherd-root-service-type thermald-shepherd-service))) - (default-value (thermald-configuration)))) + (default-value (thermald-configuration)) + (description "Run thermald, a CPU frequency scaling service that helps +prevent overheating."))) -- cgit v1.2.3 From 2ae1c7528d19c61a10f6e3ddfee831ad3fd34e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 11:17:32 +0200 Subject: gnu: guile-next: Update to 2.9.4. * gnu/packages/guile.scm (guile-next): Update to 2.9.4. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b8a53824b4..5683ebd2fc 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -303,14 +303,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") - (version "2.9.3") + (version "2.9.4") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "14990wcpysgw58kij03wbgiggmi5z94jmy7wdcqnn6ny7cimkkgr")))) + "1milviqhipyfx400pqhngxpxyajalzwmp597dxn5514pkk0g7v0p")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") -- cgit v1.2.3 From f00ff8db9253b077ea625072d41f573cd1f73f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 11:42:37 +0200 Subject: ci: Try hard to build package replacements. The "ghostscript" replacements introduced in 0b859092a7346f3b4d0a3a4dac878fd64fd70b79 would not be built because they have the same name as the original packages. * gnu/ci.scm (all-packages): Return the replacement of PACKAGE before PACKAGE. --- gnu/ci.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index aeebd4f14b..5d5a826647 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -331,8 +331,12 @@ valid." "Return the list of packages to build." (define (adjust package result) (cond ((package-replacement package) - (cons* package ;build both - (package-replacement package) + ;; XXX: If PACKAGE and its replacement have the same name/version, + ;; then both Cuirass jobs will have the same name, which + ;; effectively means that the second one will be ignored. Thus, + ;; return the replacement first. + (cons* (package-replacement package) ;build both + package result)) ((package-superseded package) result) ;don't build it -- cgit v1.2.3 From e85bb00c553f96257f9733d814b9bcac992d43dc Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 26 Aug 2019 15:07:58 +0200 Subject: gnu: retroarch: Update to 1.7.8. * gnu/packages/emulators.scm (retroarch): Update to 1.7.8. --- gnu/packages/emulators.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 0fcd88beff..8aff6d7059 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1049,7 +1049,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.7") + (version "1.7.8") (source (origin (method git-fetch) @@ -1058,7 +1058,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "026720z0vpiwr4da7l2x2yinns09fmg6yxsib203xwnixj399azi")))) + (base32 "0xxd9nhqiclpkdd9crymvba37fl0xs5mikwhya68nfzcgar7w480")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1080,8 +1080,7 @@ emulation community. It provides highly accurate emulation.") (("/bin/true") (which "true"))) ;; Use shared zlib. (substitute* '("libretro-common/file/archive_file_zlib.c" - "libretro-common/streams/trans_stream_zlib.c" - "network/httpserver/httpserver.c") + "libretro-common/streams/trans_stream_zlib.c") (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. -- cgit v1.2.3 From 6cef554be8926b026226b4bfd0bb2f37bd24aeae Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 1 Aug 2019 08:46:13 -0400 Subject: packages: Apply target triplet in bag-transitive-host-inputs. Fixes a bug where propagated inputs that should be cross-compiled are instead compiled for the host system. * guix/packages.scm (bag-transitive-host-inputs): Call transitive-inputs in the context of the bag's target system triplet. --- guix/packages.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index c94a651f27..143417b861 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -796,7 +796,8 @@ dependencies are known to build on SYSTEM." (define (bag-transitive-host-inputs bag) "Same as 'package-transitive-target-inputs', but applied to a bag." - (transitive-inputs (bag-host-inputs bag))) + (parameterize ((%current-target-system (bag-target bag))) + (transitive-inputs (bag-host-inputs bag)))) (define (bag-transitive-target-inputs bag) "Return the \"target inputs\" of BAG, recursively." -- cgit v1.2.3 From eaa2b35c879f99cbfca866030d65a8f3ad1a6164 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:26:41 +0200 Subject: gnu: mupen64plus-core: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-core)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 8aff6d7059..d8319ed118 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -485,16 +485,17 @@ and Game Boy Color games.") (delete 'configure) ;; Makefile is in a subdirectory. (add-before - 'build 'cd-to-project-dir + 'build 'chdir-to-project-directory (lambda _ - (chdir "projects/unix")))) + (chdir "projects/unix") + #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "all" (string-append "PREFIX=" out))) ;; There are no tests. #:tests? #f)) ;; As per the Makefile (in projects/unix/Makefile): (supported-systems '("i686-linux" "x86_64-linux")) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Nintendo 64 emulator core library") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From cf5e94652337305a7e0fa30d669561def1000edb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:26:51 +0200 Subject: gnu: mupen64plus-audio-sdl: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-audio-sdl)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index d8319ed118..419356dfae 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -541,7 +541,7 @@ core library.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From d738ce16dd65762d0ed05974a0b3da1340243a66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:27:01 +0200 Subject: gnu: mupen64plus-input-sdl: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-input-sdl)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 419356dfae..73483aa882 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -586,7 +586,7 @@ SDL audio plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From cf396ea59d66cf4651dfc12340023055abeb3fb5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:27:11 +0200 Subject: gnu: mupen64plus-rsp-hle: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-rsp-hle)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 73483aa882..9b1e88bb3e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -628,7 +628,7 @@ SDL input plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From 24b03073e5351bfb0fc466550d48dedd60022aeb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jul 2019 10:27:24 +0200 Subject: gnu: mupen64plus-rsp-z64: Use HTTPS home page. * gnu/packages/emulators.scm (mupen64plus-rsp-z64)[home-page]: Use HTTPS. --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9b1e88bb3e..930878dc58 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -670,7 +670,7 @@ high-level emulation (HLE) RSP processor plugin.") (string-append "APIDIR=" m64p "/include/mupen64plus"))) ;; There are no tests. #:tests? #f)) - (home-page "http://www.mupen64plus.org/") + (home-page "https://www.mupen64plus.org/") (synopsis "Mupen64Plus SDL input plugin") (description "Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator -- cgit v1.2.3 From f27cb0f1dd5ba445e9fef982b0e8554c0af84aee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 15:28:44 +0200 Subject: gnu: iverilog: Update to 10.3. * gnu/packages/fpga.scm (iverilog): Update to 10.3. --- gnu/packages/fpga.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 7b661d39ac..b4f259bf3a 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -85,20 +85,20 @@ formal verification.") (define-public iverilog (package (name "iverilog") - (version "10.2") + (version "10.3") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.icarus.com/pub/eda/verilog/v10/" "verilog-" version ".tar.gz")) (sha256 - (base32 - "0075x5nsxwkrgn7b3635il9kw7mslckaji518pdmwdrdn7fxppln")))) + (base32 + "1vv88ckvfwq7mrysyjnilsrcrzm9d173kp9w5ivwh6rdw7klbgc6")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison) - ("ghostscript" ,ghostscript))) ; ps2pdf + ("ghostscript" ,ghostscript))) ; ps2pdf (home-page "http://iverilog.icarus.com/") (synopsis "FPGA Verilog simulation and synthesis tool") (description "Icarus Verilog is a Verilog simulation and synthesis tool. -- cgit v1.2.3 From 55c43108ac763c68f95cce3d32c60b8944b771f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Jun 2019 05:04:36 +0200 Subject: installer: Show, don't Hide. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/installer/newt/user.scm (run-user-add-page): Change the input visibility checkbox's text to ‘Show’, and default to unchecked. * gnu/installer/newt/page.scm (run-input-page): Likewise. Rename INPUT-HIDE-CHECKBOX? argument to INPUT-VISIBILITY-CHECKBOX?. --- gnu/installer/newt/page.scm | 9 +++++---- gnu/installer/newt/user.scm | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/installer/newt/page.scm b/gnu/installer/newt/page.scm index 728721c08f..630efde9cc 100644 --- a/gnu/installer/newt/page.scm +++ b/gnu/installer/newt/page.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,7 @@ this page to TITLE." #:key (allow-empty-input? #f) (default-text #f) - (input-hide-checkbox? #f) + (input-visibility-checkbox? #f) (input-field-width 40) (input-flags 0)) "Run a page to prompt user for an input. The given TEXT will be displayed @@ -88,8 +89,8 @@ input box, such as FLAG-PASSWORD." input-field-width #:flags FLAG-BORDER)) (input-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) - (input-flags* (if input-hide-checkbox? + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) + (input-flags* (if input-visibility-checkbox? (logior FLAG-PASSWORD FLAG-SCROLL input-flags) input-flags)) @@ -102,7 +103,7 @@ input box, such as FLAG-PASSWORD." (apply horizontal-stacked-grid GRID-ELEMENT-COMPONENT input-entry - `(,@(if input-hide-checkbox? + `(,@(if input-visibility-checkbox? (list GRID-ELEMENT-COMPONENT input-visible-cb) '()))) GRID-ELEMENT-COMPONENT ok-button)) diff --git a/gnu/installer/newt/user.scm b/gnu/installer/newt/user.scm index dab805198f..b747886c55 100644 --- a/gnu/installer/newt/user.scm +++ b/gnu/installer/newt/user.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +56,7 @@ REAL-NAME, and HOME-DIRECTORY as the initial values in the form." (entry-home-directory (make-entry -1 -1 entry-width #:initial-value home-directory)) (password-visible-cb - (make-checkbox -1 -1 (G_ "Hide") #\x "x ")) + (make-checkbox -1 -1 (G_ "Show") #\space "x ")) (entry-password (make-entry -1 -1 entry-width #:flags (logior FLAG-PASSWORD FLAG-SCROLL))) @@ -156,7 +157,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please confirm the password.") (G_ "Password confirmation required") #:allow-empty-input? #t - #:input-hide-checkbox? #t)) + #:input-visibility-checkbox? #t)) (if (string=? password confirmation) password @@ -173,7 +174,7 @@ a thunk, if the confirmation doesn't match PASSWORD, and return its result." (run-input-page (G_ "Please choose a password for the system \ administrator (\"root\").") (G_ "System administrator password") - #:input-hide-checkbox? #t)) + #:input-visibility-checkbox? #t)) (confirm-password password run-root-password-page)) -- cgit v1.2.3 From d4d27ddb99280d6d77282ddc2f010c59bff0b665 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Jun 2019 04:14:02 +0200 Subject: installer: Partition as the last step. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Multiple users have been understandably displeased to find out that their network card was unsupported, and Internet access mandatory, after having already formatted their partitions. * gnu/installer.scm (installer-steps): Run the ‘partition’ step just before the ‘final’ one. --- gnu/installer.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 15d971dfc4..167653263f 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -226,15 +227,6 @@ selected keymap." (#$keymap-step current-installer))) (configuration-formatter keyboard-layout->configuration)) - ;; Run a partitioning tool allowing the user to modify - ;; partition tables, partitions and their mount points. - (installer-step - (id 'partition) - (description (G_ "Partitioning")) - (compute (lambda _ - ((installer-partition-page current-installer)))) - (configuration-formatter user-partitions->configuration)) - ;; Ask the user to input a hostname for the system. (installer-step (id 'hostname) @@ -267,6 +259,17 @@ selected keymap." ((installer-services-page current-installer)))) (configuration-formatter system-services->configuration)) + ;; Run a partitioning tool allowing the user to modify + ;; partition tables, partitions and their mount points. + ;; Do this last so the user has something to boot if any + ;; of the previous steps didn't go as expected. + (installer-step + (id 'partition) + (description (G_ "Partitioning")) + (compute (lambda _ + ((installer-partition-page current-installer)))) + (configuration-formatter user-partitions->configuration)) + (installer-step (id 'final) (description (G_ "Configuration file")) -- cgit v1.2.3 From 3c56d030335da3a43fa0ba2ff2f355d7696efbc8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Jun 2019 15:46:30 +0200 Subject: installer: Hide the Wi-Fi passphrase by default. * gnu/installer/newt/wifi.scm (run-wifi-password-page): Add an #:INPUT-VISIBILITY-CHECKBOX? to the input page. --- gnu/installer/newt/wifi.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/installer/newt/wifi.scm b/gnu/installer/newt/wifi.scm index 1cb2ef2df3..3fd5756b99 100644 --- a/gnu/installer/newt/wifi.scm +++ b/gnu/installer/newt/wifi.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Meiyo Peng +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,7 +89,8 @@ nmc_wifi_strength_bars." (define (run-wifi-password-page) "Run a page prompting user for a password and return it." (run-input-page (G_ "Please enter the wifi password.") - (G_ "Password required"))) + (G_ "Password required") + #:input-visibility-checkbox? #t)) (define (run-wrong-password-page service-name) "Run a page to inform user of a wrong password input." -- cgit v1.2.3 From 15527988d8e70980ea75f957953560e7a414f58a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 26 Aug 2019 14:13:40 +0300 Subject: gnu: Rust-num-integer: Move rust-autocfg to cargo-inputs. * gnu/packages/crates-io.scm (rust-num-integer)[arguments]: Move rust-autocfg from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 17ca952830..45966389dd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -420,9 +420,8 @@ whether an expression matches a pattern.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-num-traits" ,rust-num-traits)) - #:cargo-development-inputs - (("rust-autocfg" ,rust-autocfg)))) + (("rust-autocfg" ,rust-autocfg) + ("rust-num-traits" ,rust-num-traits)))) (home-page "https://github.com/rust-num/num-integer") (synopsis "Integer traits and functions") (description "Integer traits and functions.") -- cgit v1.2.3 From 908d8bedd86b21260717c15c28f11f7daf07e28b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 16:07:36 +0200 Subject: gnu: mkvtoolnix: Don't use NAME in source URI. * gnu/packages/video.scm (mkvtoolnix)[source]: Hard-code NAME. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dfb28a9309..c3c0473f54 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -362,7 +362,7 @@ H.264 (MPEG-4 AVC) video streams.") (origin (method url-fetch) (uri (string-append "https://mkvtoolnix.download/sources/" - name "-" version ".tar.xz")) + "mkvtoolnix-" version ".tar.xz")) (sha256 (base32 "0d8va2iamzc7y3wi71z8mk2vnqvnkgwb2p7casdfp37400x8r2pr")) -- cgit v1.2.3 From 296b3de614562558e9061b51a28a06e306b02ef8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 17:33:51 +0200 Subject: gnu: mkvtoolnix: Update to 37.0.0. * gnu/packages/video.scm (mkvtoolnix): Update to 37.0.0. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c3c0473f54..06b32c065e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -357,15 +357,14 @@ H.264 (MPEG-4 AVC) video streams.") (define-public mkvtoolnix (package (name "mkvtoolnix") - (version "31.0.0") + (version "37.0.0") (source (origin (method url-fetch) (uri (string-append "https://mkvtoolnix.download/sources/" "mkvtoolnix-" version ".tar.xz")) (sha256 - (base32 - "0d8va2iamzc7y3wi71z8mk2vnqvnkgwb2p7casdfp37400x8r2pr")) + (base32 "0r4d9318ymb9a0mkc0shi9p4kjy3m70s49v4f8dmjhvj63silhix")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled libraries. -- cgit v1.2.3 From ff33283c301d414c7c2c281162b851a1a108715d Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 26 Aug 2019 21:18:28 +0200 Subject: gnu: emacs-zerodark-theme: Fix modeline. * gnu/packages/emacs-xyz.scm (emacs-zerodark-theme)[propagated-inputs]: Add emacs-flycheck to prevent errors when themed modeline is active. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5183486eac..c5d667a7aa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17418,7 +17418,8 @@ connections using TLS encryption.") "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-all-the-icons" ,emacs-all-the-icons))) + `(("emacs-flycheck" ,emacs-flycheck) + ("emacs-all-the-icons" ,emacs-all-the-icons))) (home-page "https://gitlab.petton.fr/nico/zerodark-theme") (synopsis -- cgit v1.2.3 From 159b5e1f8a758e5754ea36929990f09436f4de47 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 26 Aug 2019 16:30:21 +0200 Subject: services: cuirass: Split into two separate services. * gnu/services/cuirass.scm (cuirass-shepherd-service): Return two shepherd services, one for the web interface, another for building packages. --- gnu/services/cuirass.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index f92d33bf94..138a5cf67c 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -106,8 +106,6 @@ #$(scheme-file "cuirass-specs.scm" specs) "--database" #$database "--ttl" #$(string-append (number->string ttl) "s") - "--port" #$(number->string port) - "--listen" #$host "--interval" #$(number->string interval) #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if one-shot? '("--one-shot") '()) @@ -118,6 +116,28 @@ (string-append "GIT_EXEC_PATH=" #$git "/libexec/git-core")) + #:user #$user + #:group #$group + #:log-file #$log-file)) + (stop #~(make-kill-destructor))) + (shepherd-service + (documentation "Run Cuirass web interface.") + (provision '(cuirass-web)) + (requirement '(guix-daemon networking)) + (start #~(make-forkexec-constructor + (list (string-append #$cuirass "/bin/cuirass") + "--cache-directory" #$cache-directory + "--specifications" + #$(scheme-file "cuirass-specs.scm" specs) + "--database" #$database + "--ttl" #$(string-append (number->string ttl) "s") + "--web" + "--port" #$(number->string port) + "--listen" #$host + "--interval" #$(number->string interval) + #$@(if use-substitutes? '("--use-substitutes") '()) + #$@(if fallback? '("--fallback") '())) + #:user #$user #:group #$group #:log-file #$log-file)) -- cgit v1.2.3 From 5aa4278319a914c69a6a0f61c1b09b7db8573e57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Aug 2019 22:50:16 +0200 Subject: doc: Fix typo. * doc/guix.texi (Build Systems): Add missing question mark to --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8f2608d5af..c1e451fbec 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6112,7 +6112,7 @@ interpreter version. By default guix calls @code{setup.py} under control of @code{setuptools}, much like @command{pip} does. Some packages are not compatible with setuptools (and pip), thus you can disable this by -setting the @code{#:use-setuptools} parameter to @code{#f}. +setting the @code{#:use-setuptools?} parameter to @code{#f}. @end defvr @defvr {Scheme Variable} perl-build-system -- cgit v1.2.3 From 523ba4b16e9c250783e482cc6c5c42dd4484e172 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Aug 2019 23:25:55 +0200 Subject: gnu: python-pip: Update to 19.2.1. * gnu/packages/python-xyz.scm (python-pip): Update to 19.2.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 64c1b7f443..79bcd7090f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7312,14 +7312,14 @@ responses, rather than doing any computation.") (define-public python-pip (package (name "python-pip") - (version "18.1") + (version "19.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pip" version)) (sha256 (base32 - "188fclay154s520n43s7cxxlhdaiysvxf19zk8vr1xbyjyyr58n0")))) + "100sd12ss4mbdj5lf3wawad29cm573b27765mq098x6xhcj71395")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests in the pypi archive. -- cgit v1.2.3 From d8f08344a7d6060fca73c12fe27a0d1a3528acda Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 27 Aug 2019 00:46:12 +0200 Subject: gnu: cuirass: Update to 0.0.1-23.1cd2f93. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-23.1cd2f93. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index d706e8d04b..608cd0af23 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "858b6b8c8f2ae7b1ddaf4ae363147121be1f1fe8") - (revision "22")) + (let ((commit "1cd2f9334dde13542732c22753c4ebde61bc95e0") + (revision "23")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -60,7 +60,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "049hg0yaakmfp27950cn0yn43r0v7bqva75xi082n8cxzi6vadgc")))) + "0r3x8gv0v89brjqi8r31p6c0mblbaf2kdk2fz99jiab4pir16w87")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 4183105de08a2403915536a97d06ca0c119487bc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 27 Aug 2019 19:36:05 +0900 Subject: doc: Follow-up commit to 407ebeaa1. Following some discussion with Ludovic (see: https://lists.gnu.org/archive/html/guix-patches/2019-08/msg00506.html), it is better advice to generally recommend the use of `program-file' for any usage of modules, not just for those which define syntax. * doc/guix.texi (Scheduled Job Execution): Drop the following text: "that defines syntax (macros)". --- doc/guix.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c1e451fbec..6499b39ebf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12443,10 +12443,10 @@ gexps to introduce job definitions that are passed to mcron @end lisp For more complex jobs defined in Scheme where you need control over the top -level, for instance to introduce a @code{use-modules} form that defines syntax -(macros), you can move your code to a separate program using the -@code{program-file} procedure of the @code{(guix gexp)} module -(@pxref{G-Expressions}). The example below illustrates that. +level, for instance to introduce a @code{use-modules} form, you can move your +code to a separate program using the @code{program-file} procedure of the +@code{(guix gexp)} module (@pxref{G-Expressions}). The example below +illustrates that. @lisp (define %battery-alert-job -- cgit v1.2.3 From 7a9f575660d1adabff0e3c95d97522edaf9c5f31 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 26 Aug 2019 22:57:37 -0400 Subject: gnu: linux-libre: Update deblobbing scripts. * gnu/packages/linux.scm (deblob-scripts-4.9): Update to version 4.9.190 and update the 'deblob-check' hash. (deblob-scripts-5.2, deblob-scripts-4.19) (deblob-scripts-4.14, deblob-scripts-4.4): Update to versions 5.2.10, 4.19.68, 4.14.140, and 4.4.190 respectively, although the scripts themselves are unchanged. --- gnu/packages/linux.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a7bdba2e7f..3a7efcab67 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -182,31 +182,31 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define deblob-scripts-5.2 (linux-libre-deblob-scripts - "5.2.3" + "5.2.10" (base32 "076fwxlm6jq6z4vg1xq3kr474zz7qk71r90sf9dnfia3rw2pb4fa") (base32 "0d3pp1bqchqc7vnxr1a56km5r0hzjiiipzz2xc3wgjwfi51k9kxc"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.61" + "4.19.68" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.134" + "4.14.140" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.186" + "4.9.190" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") - (base32 "1gmjn5cwxydg6qb47wcmahwkv37npsjx4papynzkkdxyidmrccya"))) + (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w"))) (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.186" + "4.4.190" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "1x40lbiaizksy8z38ax7wpqr9ldgq7qvkxbb0ca98vd1axpklb10"))) -- cgit v1.2.3 From f9c1ebdb7daea30ceaf73f43bf15c222dc4a58ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 27 Aug 2019 08:48:27 +0200 Subject: services: cups: Complete SSL-OPTIONS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …except for ‘AllowDH’, which makes no sense on GNU TLS systems. * gnu/services/cups.scm (ssl-options?): Validate ‘DenyCBC’ and ‘DenyTLS1.0’. * doc/guix.texi (Printing Services): Document them both. --- doc/guix.texi | 15 +++++++++------ gnu/services/cups.scm | 6 +++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6499b39ebf..90b2deb251 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -49,7 +49,7 @@ Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* -Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* +Copyright @copyright{} 2017, 2018, 2019 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* @@ -14757,11 +14757,14 @@ Defaults to @samp{()}. @deftypevr {@code{cups-configuration} parameter} ssl-options ssl-options Sets encryption options. By default, CUPS only supports encryption -using TLS v1.0 or higher using known secure cipher suites. The -@code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are -required for some older clients that do not implement newer ones. The -@code{AllowSSL3} option enables SSL v3.0, which is required for some -older clients that do not support TLS v1.0. +using TLS v1.0 or higher using known secure cipher suites. Security is +reduced when @code{Allow} options are used, and enhanced when @code{Deny} +options are used. The @code{AllowRC4} option enables the 128-bit RC4 cipher +suites, which are required for some older clients. The @code{AllowSSL3} option +enables SSL v3.0, which is required for some older clients that do not support +TLS v1.0. The @code{DenyCBC} option disables all CBC cipher suites. The +@code{DenyTLS1.0} option disables TLS v1.0 support - this sets the minimum +protocol version to TLS v1.1. Defaults to @samp{()}. @end deftypevr diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 9d21b6e70c..c20244cb32 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -170,7 +171,10 @@ (define (ssl-options? x) (and (list? x) - (and-map (lambda (elt) (memq elt '(AllowRC4 AllowSSL3))) x))) + (and-map (lambda (elt) (memq elt '(AllowRC4 + AllowSSL3 + DenyCBC + DenyTLS1.0))) x))) (define (serialize-ssl-options field-name val) (serialize-field field-name (match val -- cgit v1.2.3 From df14dc48fb34a0fb93cb62b7c9ca48722bd7a918 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 17:34:42 +0200 Subject: gnu: mkvtoolnix: Use @command{}. * gnu/packages/video.scm (mkvtoolnix)[description]: Substitute @command{} for @code{}. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 06b32c065e..055b9a0106 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -465,8 +465,9 @@ H.264 (MPEG-4 AVC) video streams.") (synopsis "Tools to create, alter and inspect Matroska files") (description "MKVToolNix provides tools for getting information about Matroska files -(@code{mkvinfo}), extracting tracks/data from Matroska files (@code{mkvextract}) -and creating Matroska files from other media files (@code{mkvmerge}).") +(@command{mkvinfo}), extracting tracks/data from Matroska files +(@command{mkvextract}), and creating Matroska files from other media files +(@command{mkvmerge}).") (license license:gpl2))) (define-public x265 -- cgit v1.2.3 From 07272bd8e0809de2dcfc068244c5218506418a10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 26 Aug 2019 19:22:00 +0200 Subject: gnu: mkvtoolnix:gui: Don't require :out to be installed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mkvtoolnix)[arguments]: Add a ‘patch-relative-file-names’ phase to call ‘mkvmerge’ from :out. --- gnu/packages/video.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 055b9a0106..43581e7f62 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -418,6 +418,13 @@ H.264 (MPEG-4 AVC) video streams.") "--enable-precompiled-headers=no") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-relative-file-names + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "src/mkvtoolnix-gui/util/settings.cpp" + (("mkvmerge" match) + (string-append out "/bin/" match))) + #t))) (add-before 'configure 'add-googletest (lambda* (#:key inputs #:allow-other-keys) (symlink -- cgit v1.2.3 From 9e3ef6f3e37aa65f25cbe025106324144ed42b3d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 27 Aug 2019 08:58:17 +0200 Subject: services: cups: Update SSL-OPTIONS docstring. This follows up on commit f9c1ebdb7daea30ceaf73f43bf15c222dc4a58ad. * gnu/services/cups.scm (cups-configuration): Update docstring. --- gnu/services/cups.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index c20244cb32..e77c43bfbf 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -809,12 +809,15 @@ an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses.") (ssl-options (ssl-options '()) - "Sets encryption options. -By default, CUPS only supports encryption using TLS v1.0 or higher using known -secure cipher suites. The @code{AllowRC4} option enables the 128-bit RC4 -cipher suites, which are required for some older clients that do not implement -newer ones. The @code{AllowSSL3} option enables SSL v3.0, which is required -for some older clients that do not support TLS v1.0.") + "Sets encryption options. By default, CUPS only supports encryption +using TLS v1.0 or higher using known secure cipher suites. Security is +reduced when @code{Allow} options are used, and enhanced when @code{Deny} +options are used. The @code{AllowRC4} option enables the 128-bit RC4 cipher +suites, which are required for some older clients. The @code{AllowSSL3} option +enables SSL v3.0, which is required for some older clients that do not support +TLS v1.0. The @code{DenyCBC} option disables all CBC cipher suites. The +@code{DenyTLS1.0} option disables TLS v1.0 support - this sets the minimum +protocol version to TLS v1.1.") #; (ssl-port (non-negative-integer 631) -- cgit v1.2.3 From 7577ab55569defc018dfe342239aa9a8e17d67b1 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 27 Jul 2019 23:21:29 +0200 Subject: gnu: Add ascii2binary. * gnu/packages/textutils.scm (ascii2binary): New variable. --- gnu/packages/textutils.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 2c520dfbdf..6e07553e95 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2017 Rene Saavedra -;;; Copyright © 2017 Hartmut Goebel +;;; Copyright © 2017,2019 Hartmut Goebel ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -321,6 +321,50 @@ input bits thoroughly but are not suitable for cryptography.") ;; entails." (license license:public-domain))) +(define-public ascii2binary + (package + (name "ascii2binary") + (version "2.14") + (source + (origin + (method url-fetch) + (uri (string-append "http://billposer.org/Software/Downloads/" + "ascii2binary-" version ".tar.bz2")) + (sha256 + (base32 "0dc9fxcdmppbs9s06jvq61zbk552laxps0xyk098gj41697ihd96")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal))) + (home-page "https://billposer.org/Software/a2b.html") + (synopsis "Convert between ASCII, hexadecimal and binary representations") + (description "The two programs are useful for generating test data, for +inspecting binary files, and for interfacing programs that generate textual +output to programs that require binary input and conversely. They can also be +useful when it is desired to reformat numbers. + +@itemize + +@item @command{ascii2binary} reads input consisting of ascii or hexadecimal + representation numbers separated by whitespace and produces as output + the binary equivalents. The type and precision of the binary output + is selected using command line flags. + +@item @command{binary2ascii} reads input consisting of binary numbers + and converts them to their ascii or hexadecimal representation. + Command line flags specify the type and size of the binary numbers + and provide control over the format of the output. + Unsigned integers may be written out in binary, octal, decimal, + or hexadecimal. + + Signed integers may be written out only in binary or decimal. Floating + point numbers may be written out only decimal, either in standard or + scientific notation. (If you want to examine the binary representation + of floating point numbers, just treat the input as a sequence of unsigned + characters.) + +@end itemize") + (license license:gpl3))) + (define-public libconfig (package (name "libconfig") -- cgit v1.2.3 From a6baae7486eb1491ba0220b2e490c6a2b8338769 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 27 Jul 2019 23:22:02 +0200 Subject: gnu: Add uniutils. * gnu/packages/textutils.scm (uniutils): New variable. --- gnu/packages/textutils.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 6e07553e95..330e10610d 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -45,6 +45,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages java) @@ -362,6 +363,68 @@ useful when it is desired to reformat numbers. of floating point numbers, just treat the input as a sequence of unsigned characters.) +@end itemize") + (license license:gpl3))) + +(define-public uniutils + (package + (name "uniutils") + (version "2.27") + (source + (origin + (method url-fetch) + (uri (string-append "http://billposer.org/Software/Downloads/" + "uniutils-" version ".tar.bz2")) + (sha256 + (base32 "19w1510w87gx7n4qy3zsb0m467a4rn5scvh4ajajg7jh6x5xri08")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-dependency-tracking") + #:phases + (modify-phases %standard-phases + (add-after 'build 'fix-paths + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (a2b (assoc-ref inputs "ascii2binary")) + (iconv (assoc-ref inputs "libiconv"))) + (substitute* "utf8lookup" + (("^ascii2binary ") (string-append a2b "/bin/ascii2binary ")) + (("^uniname ") (string-append out "/bin/uniname ")) + (("^iconv ") (string-append iconv "/bin/iconv "))) + #t)))))) + (inputs + `(("ascii2binary" ,ascii2binary) + ("libiconv" ,libiconv))) + (home-page "https://billposer.org/Software/unidesc.html") + (synopsis "Find out what is in a Unicode file") + (description "Useful tools when working with Unicode files when one +doesn't know the writing system, doesn't have the necessary font, needs to +inspect invisible characters, needs to find out whether characters have been +combined or in what order they occur, or needs statistics on which characters +occur. + +@itemize + +@item @command{uniname} defaults to printing the character offset of each +character, its byte offset, its hex code value, its encoding, the glyph +itself, and its name. It may also be used to validate UTF-8 input. + +@item @command{unidesc} reports the character ranges to which different +portions of the text belong. It can also be used to identify Unicode encodings +(e.g. UTF-16be) flagged by magic numbers. + +@item @command{unihist} generates a histogram of the characters in its input. + +@item @command{ExplicateUTF8} is intended for debugging or for learning about +Unicode. It determines and explains the validity of a sequence of bytes as a +UTF8 encoding. + +@item @command{utf8lookup} provides a handy way to look up Unicode characters +from the command line. + +@item @command{unireverse} reverse each line of UTF-8 input +character-by-character. + @end itemize") (license license:gpl3))) -- cgit v1.2.3 From dd6976dd75ca97572e0e88a6be2e550fb0824c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 21:34:40 +0200 Subject: import: github: 'github-package?' uses 'package-upstream-name'. * guix/import/github.scm (updated-github-url): Use 'package-upstream-name' instead of 'package-name'. This allows 'github-package?' to match more packages, given an appropriate upstream name. --- guix/import/github.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/github.scm b/guix/import/github.scm index fa23fa4c06..55e1f72a42 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -49,7 +49,7 @@ false if none is recognized" (define (updated-url url) (if (string-prefix? "https://github.com/" url) (let ((ext (or (find-extension url) "")) - (name (package-name old-package)) + (name (package-upstream-name old-package)) (version (package-version old-package)) (prefix (string-append "https://github.com/" (github-user-slash-repository url))) -- cgit v1.2.3 From abba40731aae82465135e117a09d149d312c01c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 21:36:45 +0200 Subject: gnu: guile-bytestructures: Add upstream name. * gnu/packages/guile.scm (guile-bytestructures)[properties]: New field. --- gnu/packages/guile.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5683ebd2fc..933d3fe701 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -602,7 +602,8 @@ of the C programming language, to be used on bytevectors. C's type system works on raw memory, and Guile works on bytevectors which are an abstraction over raw memory. It's also more powerful than the C type system, elevating types to first-class status.") - (license license:gpl3+))) + (license license:gpl3+) + (properties '((upstream-name . "bytestructures"))))) (define-public guile2.0-bytestructures (package-for-guile-2.0 guile-bytestructures)) -- cgit v1.2.3 From b29d6abc8f0aa7cb358954d7f7a8d7ca49c29eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Aug 2019 21:37:08 +0200 Subject: gnu: guile-bytestructures: Update to 1.0.6. * gnu/packages/guile.scm (guile-bytestructures): Update to 1.0.6. --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 933d3fe701..71169966da 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -580,7 +580,7 @@ Guile's foreign function interface.") (define-public guile-bytestructures (package (name "guile-bytestructures") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/TaylanUB/scheme-bytestructures" @@ -588,7 +588,7 @@ Guile's foreign function interface.") "/bytestructures-" version ".tar.gz")) (sha256 (base32 - "0ibk7fjwpb450lnrva4bx45sgln3pbyb645az4ansvh1spgani43")))) + "07dffrmc6cnw9mmw0pdrqlkbhzzpz0hm8p26z738l2j5i84dypnk")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 2b7c89f4fcc5e1607e153939d54d32aeaf494ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Aug 2019 11:02:14 +0200 Subject: docker: Take a list of directives instead of a list of symlinks. * guix/docker.scm (symlink-source, topmost-component): Remove. (directive-file): New procedure. (build-docker-image): Remove #:symlinks and add #:extra-files. Make a sub-directory "extra" and call 'evaluate-populate-directive' for EXTRA-FILES in that directory. * guix/scripts/pack.scm (docker-image)[build](symlink->directives, directives): New procedures. Pass #:extra-files instead of #:symlinks to 'build-docker-image'. --- guix/docker.scm | 68 ++++++++++++++++++++++++--------------------------- guix/scripts/pack.scm | 20 +++++++++++++-- 2 files changed, 50 insertions(+), 38 deletions(-) diff --git a/guix/docker.scm b/guix/docker.scm index c598a073f6..757bdeb458 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -28,11 +28,13 @@ invoke)) #:use-module (gnu build install) #:use-module (json) ;guile-json + #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module ((texinfo string-utils) #:select (escape-special-chars)) #:use-module (rnrs bytevectors) + #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:export (build-docker-image)) @@ -99,21 +101,18 @@ '("--sort=name" "--mtime=@1" "--owner=root:0" "--group=root:0")) -(define symlink-source +(define directive-file + ;; Return the file or directory created by a 'evaluate-populate-directive' + ;; directive. (match-lambda ((source '-> target) - (string-trim source #\/)))) - -(define (topmost-component file) - "Return the topmost component of FILE. For instance, if FILE is \"/a/b/c\", -return \"a\"." - (match (string-tokenize file (char-set-complement (char-set #\/))) - ((first rest ...) - first))) + (string-trim source #\/)) + (('directory name _ ...) + (string-trim name #\/)))) (define* (build-docker-image image paths prefix #:key - (symlinks '()) + (extra-files '()) (transformations '()) (system (utsname:machine (uname))) database @@ -133,8 +132,9 @@ entry point in the Docker image JSON structure. ENVIRONMENT must be a list of name/value pairs. It specifies the environment variables that must be defined in the resulting image. -SYMLINKS must be a list of (SOURCE -> TARGET) tuples describing symlinks to be -created in the image, where each TARGET is relative to PREFIX. +EXTRA-FILES must be a list of directives for 'evaluate-populate-directive' +describing non-store files that must be created in the image. + TRANSFORMATIONS must be a list of (OLD -> NEW) tuples describing how to transform the PATHS. Any path in PATHS that begins with OLD will be rewritten in the Docker image so that it begins with NEW instead. If a path is a @@ -199,25 +199,27 @@ SRFI-19 time-utc object, as the creation time in metadata." (with-output-to-file "json" (lambda () (scm->json (image-description id time)))) - ;; Create SYMLINKS. - (for-each (match-lambda - ((source '-> target) - (let ((source (string-trim source #\/))) - (mkdir-p (dirname source)) - (symlink (string-append prefix "/" target) - source)))) - symlinks) + ;; Create a directory for the non-store files that need to go into the + ;; archive. + (mkdir "extra") + + (with-directory-excursion "extra" + ;; Create non-store files. + (for-each (cut evaluate-populate-directive <> "./") + extra-files) - (when database - ;; Initialize /var/guix, assuming PREFIX points to a profile. - (install-database-and-gc-roots "." database prefix)) + (when database + ;; Initialize /var/guix, assuming PREFIX points to a profile. + (install-database-and-gc-roots "." database prefix)) + + (apply invoke "tar" "-cf" "../layer.tar" + `(,@transformation-options + ,@%tar-determinism-options + ,@paths + ,@(scandir "." + (lambda (file) + (not (member file '("." "..")))))))) - (apply invoke "tar" "-cf" "layer.tar" - `(,@transformation-options - ,@%tar-determinism-options - ,@paths - ,@(if database '("var") '()) - ,@(map symlink-source symlinks))) ;; It is possible for "/" to show up in the archive, especially when ;; applying transformations. For example, the transformation ;; "s,^/a,," will (perhaps surprisingly) cause GNU tar to transform @@ -231,13 +233,7 @@ SRFI-19 time-utc object, as the creation time in metadata." (lambda () (system* "tar" "--delete" "/" "-f" "layer.tar"))) - (for-each delete-file-recursively - (map (compose topmost-component symlink-source) - symlinks)) - - ;; Delete /var/guix. - (when database - (delete-file-recursively "var"))) + (delete-file-recursively "extra")) (with-output-to-file "config.json" (lambda () diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 794d2ee390..a15530ad70 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -490,7 +490,8 @@ the image." #~(begin (use-modules (guix docker) (guix build store-copy) (guix profiles) (guix search-paths) - (srfi srfi-19) (ice-9 match)) + (srfi srfi-1) (srfi srfi-19) + (ice-9 match)) (define environment (map (match-lambda @@ -499,6 +500,21 @@ the image." value))) (profile-search-paths #$profile))) + (define symlink->directives + ;; Return "populate directives" to make the given symlink and its + ;; parent directories. + (match-lambda + ((source '-> target) + (let ((target (string-append #$profile "/" target)) + (parent (dirname source))) + `((directory ,parent) + (,source -> ,target)))))) + + (define directives + ;; Fully-qualified symlinks. + (append-map symlink->directives '#$symlinks)) + + (setenv "PATH" (string-append #$archiver "/bin")) (build-docker-image #$output @@ -513,7 +529,7 @@ the image." #$(and entry-point #~(list (string-append #$profile "/" #$entry-point))) - #:symlinks '#$symlinks + #:extra-files directives #:compressor '#$(compressor-command compressor) #:creation-time (make-time time-utc 0 1)))))) -- cgit v1.2.3 From 7979a287f8eb84cbbfa44629951572408939a756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Aug 2019 11:27:02 +0200 Subject: pack: Create /tmp in Docker images. Fixes . * guix/scripts/pack.scm (docker-image)[build]: Add a 'directory' entry for "/tmp" to DIRECTIVES. * tests/pack.scm ("docker-image + localstatedir"): Test the presence of /tmp. * gnu/tests/docker.scm (run-docker-test)["Load docker image and run it"]: Test the presence and permission bits of "/tmp". --- gnu/tests/docker.scm | 13 ++++++++++--- guix/scripts/pack.scm | 6 ++++-- tests/pack.scm | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 3ec5c3d6ee..3f98a1e316 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -100,7 +100,7 @@ inside %DOCKER-OS." marionette)) (test-equal "Load docker image and run it" - '("hello world" "hi!" "JSON!") + '("hello world" "hi!" "JSON!" #o1777) (marionette-eval `(begin (define slurp @@ -131,8 +131,15 @@ inside %DOCKER-OS." ,(string-append #$docker-cli "/bin/docker") "run" repository&tag "-c" "(use-modules (json)) - (display (json-string->scm (scm->json-string \"JSON!\")))"))) - (list response1 response2 response3))) + (display (json-string->scm (scm->json-string \"JSON!\")))")) + + ;; Check whether /tmp exists. + (response4 (slurp + ,(string-append #$docker-cli "/bin/docker") + "run" repository&tag "-c" + "(display (stat:perms (lstat \"/tmp\")))"))) + (list response1 response2 response3 + (string->number response4)))) marionette)) (test-end) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index a15530ad70..dd91a24284 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -511,8 +511,10 @@ the image." (,source -> ,target)))))) (define directives - ;; Fully-qualified symlinks. - (append-map symlink->directives '#$symlinks)) + ;; Create a /tmp directory, as some programs expect it, and + ;; create SYMLINKS. + `((directory "/tmp" ,(getuid) ,(getgid) #o1777) + ,@(append-map symlink->directives '#$symlinks))) (setenv "PATH" (string-append #$archiver "/bin")) diff --git a/tests/pack.scm b/tests/pack.scm index ea88cd89f2..71ff5aec18 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -169,6 +169,7 @@ (when (and (file-exists? (string-append bin "/guile")) (file-exists? "var/guix/db/db.sqlite") + (file-is-directory? "tmp") (string=? (string-append #$%bootstrap-guile "/bin") (pk 'binlink (readlink bin))) (string=? (string-append #$profile "/bin/guile") -- cgit v1.2.3 From 24e3dd08ec1526a43ee991447c7000dcf9e572b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Aug 2019 12:29:06 +0200 Subject: gnu: libmicrohttpd: Update to 0.9.66. * gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.66. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 2d82f47d99..e07702f994 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -147,14 +147,14 @@ tool to extract metadata from a file and print the results.") (define-public libmicrohttpd (package (name "libmicrohttpd") - (version "0.9.65") + (version "0.9.66") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-" version ".tar.gz")) (sha256 (base32 - "1jdk6wigvnkh5bi9if4rik8i9sbvdql61lm8ipgpypyxqmcpjipj")))) + "06xblz77bnn29y7sl43avxbcrjbw486x3416plpr3x3l2pdx8rjf")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 30e7c03aaedd248c57a7d92ced9963fed058cc53 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 20 Aug 2019 00:15:20 +0200 Subject: gnu: Add python-elementpath. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-elementpath): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 79bcd7090f..04957b4407 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald +;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -16133,3 +16134,28 @@ for manual interpretation.") (synopsis "Library for simple routing on OSM data") (description "Library for simple routing on OSM data") (license license:gpl3+))) + +(define-public python-elementpath + (package + (name "python-elementpath") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "elementpath" version)) + (sha256 + (base32 + "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) + (build-system python-build-system) + (home-page + "https://github.com/sissaschool/elementpath") + (synopsis + "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml") + (description + "The proposal of this package is to provide XPath 1.0 and 2.0 selectors +for Python's ElementTree XML data structures, both for the standard +ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. + +For lxml.etree this package can be useful for providing XPath 2.0 selectors, +because lxml.etree already has it's own implementation of XPath 1.0.") + (license license:expat))) -- cgit v1.2.3 From 19d0554fd41039e0baba04623bb5d049ac47de21 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 20 Aug 2019 01:12:11 +0200 Subject: gnu: Add template-glib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/glib.scm (template-glib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/glib.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ab9ed0b1bf..77b5715eb0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -891,3 +892,40 @@ main loop, simply get a connection to the bus via the methods in @code{Net::DBus::GLib} rather than the usual @code{Net::DBus} module. Every other API remains the same.") (license license:gpl2+))) + +(define-public template-glib + (package + (name "template-glib") + (version "3.32.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1g0zx0sxpw8kqp7p3sgl9kngaqrg9xl6cir24nrahks0vgsk98rr")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-D" "enable_gtk_doc=true"))) + (inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib) + ("gobject-introspection" ,gobject-introspection))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("glib:bin" ,glib "bin") ;; For glib-mkenums + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://gitlab.gnome.org/GNOME/template-glib") + (synopsis "Library for template expansion") + (description + "Template-GLib is a library to help you generate text based on a template and +user defined state. Template-GLib does not use a language runtime, so it is +safe to use from any GObject-Introspectable language. + +Template-GLib allows you to access properties on GObjects as well as call +simple methods via GObject-Introspection.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 498448ebf20138df3f76654f5c1354f6aa989fb7 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 27 Aug 2019 14:47:30 +0200 Subject: gnu: sway: Update to 1.2. * gnu/packages/wm.scm (sway): Update to 1.2. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index ffe2590bf2..c6f333cad9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1188,7 +1188,7 @@ modules for building a Wayland compositor.") (define-public sway (package (name "sway") - (version "1.1.1") + (version "1.2") (source (origin (method git-fetch) @@ -1197,7 +1197,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776")))) + (base32 "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6f0d8197df3d306be5857e7b8acdeedb02b42e9c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Tue, 27 Aug 2019 14:49:38 +0200 Subject: gnu: youtube-dl: Update to 2019.08.13. * gnu/packages/video.scm (youtube-dl): Update to 2019.08.13. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 43581e7f62..d5dfb1383e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1492,7 +1492,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2019.08.02") + (version "2019.08.13") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1500,7 +1500,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "101b6jrf6ckbxrn76ppvgdyrb25p7d247kn8qgq7n476sfnkfg2p")))) + "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From c99f32b94e744be3c38c1940b1bf82855a13af50 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Mon, 8 Jul 2019 12:04:56 +0530 Subject: gnu: Add emacsy-minimal. * (guile-emacsy): New variable. Emacsy is a library for Guile. Emacsy package is too heavy for use as a dependency for other packages: $ guix size emacsy ... total: 1136.3 MiB versus: $ guix size guile-emacsy ... total: 132.3 MiB --- gnu/packages/guile-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 16e30b9de7..3b2d880f34 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 swedebugia +;;; Copyright © 2019 Amar Singh ;;; ;;; This file is part of GNU Guix. ;;; @@ -2377,6 +2378,36 @@ comes with a simple counter example using FreeGLUT and browser examples in C using Gtk+-3 and WebKitGtk.") (license license:gpl3+))) +(define-public emacsy-minimal + (let ((commit "f3bf0dbd803d7805b6ae8303253507ad13922293")) + (package + (inherit emacsy) + (name "emacsy-minimal") + (version (git-version "v0.4.1" "19" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/emacsy.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ivy28km1p7nlrf63xx3hvrpxf5ld5amk1wcan3k7sqv1kq9mqdb")))) + (build-system gnu-build-system) + (inputs + `(("guile" ,guile-2.2) + ("guile-lib" ,guile-lib) + ("guile-readline" ,guile-readline))) + (propagated-inputs '()) + (arguments + `(#:configure-flags '("--without-examples") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (setenv "GUILE_AUTO_COMPILE" "0") + #t)))))))) + (define-public guile-jpeg (let ((commit "6a1673578b297c2c1b28e44a76bd5c49e76a5046") (revision "0")) -- cgit v1.2.3 From e8c2da41044a500af702dfb68a3d530270f7fd12 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Wed, 10 Jul 2019 16:46:35 +0530 Subject: gnu: Add nomad. * gnu/packages/guile-xyz.scm (nomad): New variable. --- gnu/packages/guile-xyz.scm | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 3b2d880f34..afeafa76ce 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -71,6 +72,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages noweb) + #:use-module (gnu packages password-utils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -2441,3 +2443,95 @@ in C using Gtk+-3 and WebKitGtk.") "Guile-JPEG is a Scheme library to parse JPEG image files and to perform geometrical transforms on JPEG images.") (license license:gpl3+)))) + +(define-public nomad + (package + (name "nomad") + (version "0.1.1-alpha") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/nomad.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0abz07hl5dh802ciy71xzkvkhyryypq1i94wna40a2wndbd73f7z")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("bash" ,bash) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("guile" ,guile-2.2) + ("glib:bin" ,glib "bin"))) + (inputs + `(("guile" ,guile-2.2) + ("guile-lib" ,guile-lib) + ("guile-gcrypt" ,guile-gcrypt) + ("guile-readline" ,guile-readline) + ("gnutls" ,gnutls) + ("shroud" ,shroud) + ("emacsy" ,emacsy-minimal) + ("glib" ,glib) + ("dbus-glib" ,dbus-glib) + ("gtk+" ,gtk+) + ("gtksourceview" ,gtksourceview) + ("webkitgtk" ,webkitgtk) + ("xorg-server" ,xorg-server))) + (propagated-inputs + `(("glib" ,glib) + ("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (format #f "~a/bin/Xvfb :1 &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #t)) + (add-after 'install 'wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gio-deps (map (cut assoc-ref inputs <>) '("glib-networking" + "glib"))) + (gio-mod-path (map (cut string-append <> "/lib/gio/modules") + gio-deps)) + (effective (read-line (open-pipe* + OPEN_READ + "guile" "-c" + "(display (effective-version))"))) + (deps (map (cut assoc-ref inputs <>) + '("emacsy" "guile-lib" "guile-readline" + "shroud"))) + (scm-path (map (cut string-append <> + "/share/guile/site/" effective) + `(,out ,@deps))) + (go-path (map (cut string-append <> + "/lib/guile/" effective "/site-ccache") + `(,out ,@deps))) + (progs (map (cut string-append out "/bin/" <>) + '("nomad")))) + (map (cut wrap-program <> + `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path) + `("GUILE_LOAD_PATH" ":" prefix ,scm-path) + `("GUILE_LOAD_COMPILED_PATH" ":" + prefix ,go-path)) + progs) + #t)))))) + (home-page "https://savannah.nongnu.org/projects/nomad/") + (synopsis "Extensible Web Browser in Guile Scheme") + (description "Nomad is an Emacs-like Web Browser built using Webkitgtk and +Emacsy. It has a small C layer and most browser features are fully +programmable in Guile. It has hooks, keymaps, and self documentation +features.") + (license license:gpl3+))) -- cgit v1.2.3 From 114f02bac47d86c04bf211e33864beffcde74aab Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Wed, 10 Jul 2019 16:45:50 +0530 Subject: gnu: emacsy: Cleanup build. * gnu/packages/guile-xyz.scm (emacsy): Wrap binaries; fixes guile version conflicts. Move some propagated inputs to inputs. --- gnu/packages/guile-xyz.scm | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index afeafa76ce..7dff0c6269 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2353,22 +2353,52 @@ more expressive and flexible than the traditional @code{format} procedure.") ("pkg-config" ,pkg-config) ("texinfo" ,texinfo) ("texlive" ,(texlive-union (list texlive-generic-epsf))))) - (propagated-inputs + (inputs `(("dbus-glib" ,dbus-glib) ("guile" ,guile-2.2) ("guile-lib" ,guile-lib) ("guile-readline" ,guile-readline) - ("glib-networking" ,glib-networking) ("freeglut" ,freeglut) - ("gssettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk))) + (propagated-inputs + `(("glib-networking" ,glib-networking) + ("gssettings-desktop-schemas" ,gsettings-desktop-schemas))) (arguments - `(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim) + (ice-9 regex) + (ice-9 ftw) + (srfi srfi-26)) + #:phases (modify-phases %standard-phases (add-before 'configure 'setenv (lambda _ (setenv "GUILE_AUTO_COMPILE" "0") - #t))))) + #t)) + (add-after 'install 'wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (effective (read-line + (open-pipe* OPEN_READ + "guile" "-c" + "(display (effective-version))"))) + (deps (map (cut assoc-ref inputs <>) + '("guile-lib" "guile-readline"))) + (scm-path (map (cut string-append <> "/share/guile/site/" + effective) `(,out ,@deps))) + (go-path (map (cut string-append <> "/lib/guile/" effective + "/site-ccache/") `(,out ,@deps))) + (examples (filter (cut string-match "emacsy" <>) + (scandir (string-append out "/bin/")))) + (progs (map (cut string-append out "/bin/" <>) + examples))) + (map (cut wrap-program <> + `("GUILE_LOAD_PATH" ":" prefix ,scm-path) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix ,go-path)) + progs) + #t)))))) (home-page "https://savannah.nongnu.org/projects/emacsy") (synopsis "Embeddable GNU Emacs-like library using Guile") (description -- cgit v1.2.3 From f32c3d4d068c22b57d8759fb427be7a18a77f78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 22 Aug 2019 11:47:54 +0200 Subject: gnu: bootstrap: Add ftp.gnu.org to '%bootstrap-base-urls'. * gnu/packages/bootstrap.scm (%bootstrap-base-urls): Add ftp.gnu.org/gnu/guix/bootstrap. --- gnu/packages/bootstrap.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 6cd3e13567..3b47847e33 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -290,7 +290,9 @@ or false to signal an error." (define %bootstrap-base-urls ;; This is where the initial binaries come from. - '("https://alpha.gnu.org/gnu/guix/bootstrap" + '("https://ftp.gnu.org/gnu/guix/bootstrap" + "https://alpha.gnu.org/gnu/guix/bootstrap" + "http://ftp.gnu.org/gnu/guix/bootstrap" "http://alpha.gnu.org/gnu/guix/bootstrap" "ftp://alpha.gnu.org/gnu/guix/bootstrap" "http://www.fdn.fr/~lcourtes/software/guix/packages" -- cgit v1.2.3 From 7f1d2dd35a317724058e89734cd2ec73828c82c7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 15 Aug 2019 15:39:57 -0400 Subject: gnu: bootstrap: Update to the 20190815 bootstrap binaries. These new bootstrap binaries were built using Guix at commit 9e6256ba0f32ab12d61c914a3fed879dac881762, tagged as "bootstrap-20190815". * gnu/packages/bootstrap.scm (%bootstrap-linux-libre-headers): Update the download URL. (%bootstrap-mescc-tools, %bootstrap-mes): Update the download URL and hash. --- gnu/packages/bootstrap.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3b47847e33..ee713db0cf 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès -;;; Copyright © 2014, 2015, 2018 Mark H Weaver +;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong @@ -494,7 +494,7 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cute string-append <> - "/i686-linux/20181020/" + "/i686-linux/20190815/" "linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 @@ -739,12 +739,12 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (method url-fetch) (uri (map (cute string-append <> - "/i686-linux/20181020/" - "mescc-tools-static-0.5.2-0.bb062b0-i686-linux.tar.xz") + "/i686-linux/20190815/" + "mescc-tools-static-stripped-0.5.2-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 (base32 - "11lniw0vg61kmyhvnwkmcnkci9ym6hbmiksiqggd0hkipbq7hvlz"))))))) + "0c3kklgghzh4q2dbpl6asb74cimp7hp6jscdwqwmzxbapgcl6582"))))))) (synopsis "Bootstrap binaries of MesCC Tools") (description synopsis) (home-page #f) @@ -788,12 +788,12 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (method url-fetch) (uri (map (cute string-append <> - "/i686-linux/20181020/" + "/i686-linux/20190815/" "mes-minimal-stripped-0.19-i686-linux.tar.xz") %bootstrap-base-urls)) (sha256 (base32 - "0k7kkl68a6xaadv47ij0nr9jm5ca1ffj38n7f2lg80y72wdkwr9h"))))))) + "1q4xjpx6nbn44kxnilpgl12bhpmwy2bblzwszc2ci7xkf400jcpv"))))))) (supported-systems '("i686-linux" "x86_64-linux")) (synopsis "Bootstrap binaries of Mes") (description synopsis) -- cgit v1.2.3 From dd4e46edda6c255ca170a6650c6f92b16ff50a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Aug 2019 22:38:04 +0200 Subject: accounts: Delete duplicate entries. When adding multiple instances of a service requiring some user account/group, we could end up with multiple entries for that account or group in /etc/passwd or /etc/group. * gnu/build/accounts.scm (database-writer)[write-entries]: Add call to 'delete-duplicates'. * tests/accounts.scm ("write-passwd with duplicate entry"): New test. --- gnu/build/accounts.scm | 2 +- tests/accounts.scm | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm index 5094456ab1..f60d68d9b3 100644 --- a/gnu/build/accounts.scm +++ b/gnu/build/accounts.scm @@ -238,7 +238,7 @@ to it atomically and set the appropriate permissions." (for-each (lambda (entry) (display (entry->string entry) port) (newline port)) - entries)) + (delete-duplicates entries))) (if (port? file-or-port) (write-entries file-or-port) diff --git a/tests/accounts.scm b/tests/accounts.scm index 673dd42432..78136390bb 100644 --- a/tests/accounts.scm +++ b/tests/accounts.scm @@ -62,6 +62,25 @@ nobody:!:0::::::\n")) (shell "/bin/sh"))) port)))) +(test-equal "write-passwd with duplicate entry" + %passwd-sample + (call-with-output-string + (lambda (port) + (let ((charlie (password-entry + (name "charlie") + (uid 1000) (gid 998) + (real-name "Charlie") + (directory "/home/charlie") + (shell "/bin/sh")))) + (write-passwd (list (password-entry + (name "root") + (uid 0) (gid 0) + (real-name "Admin") + (directory "/root") + (shell "/bin/sh")) + charlie charlie) + port))))) + (test-equal "read-passwd + write-passwd" %passwd-sample (call-with-output-string -- cgit v1.2.3 From 58d5f280a36e1cfddfa999d320c285726d8a8bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Aug 2019 23:59:48 +0200 Subject: lint: Correct use of 'with-networking-fail-safe'. Fixes . Reported by Jonathan Brielmaier . * guix/lint.scm (check-for-updates): Make sure the first argument to 'with-networking-fail-safe' is the whole error message. --- guix/lint.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 7a2bf5a347..212ff70d54 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1008,8 +1008,8 @@ the NIST server non-fatal." (define (check-for-updates package) "Check if there is an update available for PACKAGE." (match (with-networking-fail-safe - (G_ "while retrieving upstream info for '~a'") - (list (package-name package)) + (format #f (G_ "while retrieving upstream info for '~a'") + (package-name package)) #f (package-latest-release* package (force %updaters))) ((? upstream-source? source) -- cgit v1.2.3 From 276f598abc12eaae01fbea0c0bbba577a93bcbdb Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 12 Aug 2019 08:33:36 -0700 Subject: gnu: Add agda-ial. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/agda.scm (agda-ial): new variable. Signed-off-by: Ludovic Courtès --- gnu/packages/agda.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 0f9b4299c3..8840790058 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) #:use-module (guix build-system emacs) + #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -154,3 +156,49 @@ such as Coq, Epigram and NuPRL.") (synopsis "Emacs mode for Agda") (description "This Emacs mode enables interactive development with Agda. It also aids the input of Unicode characters."))) + +(define-public agda-ial + (package + (name "agda-ial") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/cedille/ial/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0ilgalmx3kljy6j9i8d7w6r7ky4bq0xzxanwfr6kyx56mf2sf0zh")))) + (build-system gnu-build-system) + (inputs + `(("agda" ,agda))) + (arguments + `(#:parallel-build? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-dependencies + (lambda _ (patch-shebang "find-deps.sh") #t)) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (file) + (install-file + file + (string-append + (assoc-ref outputs "out") "/include/agda/ial"))) + (find-files "." ".*agda.*")) + #t))))) + (home-page "https://github.com/cedille/ial") + (synopsis + "The Iowa Agda Library") + (description + "The goal is to provide a concrete library focused on verification +examples, as opposed to mathematics. The library has a good number +of theorems for booleans, natural numbers, and lists. It also has +trees, tries, vectors, and rudimentary IO. A number of good ideas +come from Agda's standard library.") + (license license:expat))) -- cgit v1.2.3 From 48752f277c589435aab4d80947fa80f01577d55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 00:19:48 +0200 Subject: gnu: agda-ial: Fetch source from Git. This addresses a 'guix lint' warning. * gnu/packages/agda.scm (agda-ial)[source]: Change to use 'git-fetch'. [arguments]: Change 'install phase accordingly; adjust its 'find-files' regexp. --- gnu/packages/agda.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 8840790058..56d4b15940 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 John Soo +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (guix build-system haskell) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) @@ -161,16 +163,15 @@ Agda. It also aids the input of Unicode characters."))) (package (name "agda-ial") (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/cedille/ial/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version)) - (sha256 - (base32 - "0ilgalmx3kljy6j9i8d7w6r7ky4bq0xzxanwfr6kyx56mf2sf0zh")))) + (home-page "https://github.com/cedille/ial") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g")))) (build-system gnu-build-system) (inputs `(("agda" ,agda))) @@ -184,17 +185,14 @@ Agda. It also aids the input of Unicode characters."))) (delete 'check) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (file) - (install-file - file - (string-append - (assoc-ref outputs "out") "/include/agda/ial"))) - (find-files "." ".*agda.*")) - #t))))) - (home-page "https://github.com/cedille/ial") - (synopsis - "The Iowa Agda Library") + (let* ((out (assoc-ref outputs "out")) + (include (string-append out "/include/agda/ial"))) + (for-each (lambda (file) + (make-file-writable file) + (install-file file include)) + (find-files "." "\\.agda$")) + #t)))))) + (synopsis "The Iowa Agda Library") (description "The goal is to provide a concrete library focused on verification examples, as opposed to mathematics. The library has a good number -- cgit v1.2.3 From a96d179b8b340c1bbda9ce16fe095729f571c240 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 28 Aug 2019 00:17:49 -0400 Subject: gnu: webkitgtk: Update to 2.24.4. * gnu/packages/webkit.scm (webkitgtk-2.24): Update to 2.24.4. --- gnu/packages/webkit.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 6b38998772..2eca5147fe 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Mark H Weaver ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; @@ -168,14 +168,14 @@ HTML/CSS applications to full-fledged web browsers.") (define-public webkitgtk-2.24 (package/inherit webkitgtk (name "webkitgtk") - (version "2.24.3") + (version "2.24.4") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "0lbcrw5axwrbrajxq7fqywfyh0djqi23ynzb5wi5ghw2grnp83cl")))) + "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46")))) (native-inputs `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) -- cgit v1.2.3 From 4ad7e7e604ef9b1f936b6fa02bb13061ad73c2a5 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sun, 18 Aug 2019 17:42:19 +0200 Subject: gnu: gtkspell3: Install Vala bindings. * gnu/packages/gtk.scm (gtkspell3)[native-inputs]: Add vala. Signed-off-by: Efraim Flashner --- gnu/packages/gtk.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 61d3e45a05..12972b75df 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Meiyo Peng +;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -1602,7 +1603,8 @@ glass artworks done by Venicians glass blowers.") (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (inputs `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) -- cgit v1.2.3 From 3762e31b6c8089928aad3186f70f157502950e3b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Aug 2019 16:21:26 +0300 Subject: build/cargo-build-system: Remove 'update-cargo-lock phase. * guix/build/cargo-build-system.scm (update-cargo-lock): Remove procedure. (configure): Delete Cargo.lock file if it exists. (%standard-phases): Remove 'update-cargo-lock. * doc/guix.texi (Build System)[cargo-build-system]: Remove references to the 'update-cargo-lock phase. --- doc/guix.texi | 9 ++++----- guix/build/cargo-build-system.scm | 19 ++++--------------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 90b2deb251..707c2ba700 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5854,11 +5854,10 @@ should be added to the package definition via the In its @code{configure} phase, this build system will make any source inputs specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs} -parameters available to cargo. The @code{update-cargo-lock} phase will, -when there is a @code{Cargo.lock} file, update the @code{Cargo.lock} file -with the inputs and their versions available at build time. The -@code{install} phase installs any crate the binaries if they are defined by -the crate. +parameters available to cargo. It will also remove an included +@code{Cargo.lock} file to be recreated by @code{cargo} during the +@code{build} phase. The @code{install} phase installs any crate the binaries +if they are defined by the crate. @end defvr @cindex Clojure (programming language) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 7d363a18a5..06ed14b89f 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -134,22 +134,12 @@ directory = '" port) ;; upgrading the compiler for example. (setenv "RUSTFLAGS" "--cap-lints allow") (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - #t) -;; The Cargo.lock file tells the build system which crates are required for -;; building and hardcodes their version and checksum. In order to build with -;; the inputs we provide, we need to recreate the file with our inputs. -(define* (update-cargo-lock #:key - (vendor-dir "guix-vendor") - #:allow-other-keys) - "Regenerate the Cargo.lock file with the current build inputs." + ;; We don't use the Cargo.lock file to determine the package versions we use + ;; during building, and in any case if one is not present it is created + ;; during the 'build phase by cargo. (when (file-exists? "Cargo.lock") - (begin - ;; Unfortunately we can't generate a Cargo.lock file until the checksums - ;; are generated, so we have an extra round of generate-all-checksums here. - (generate-all-checksums vendor-dir) - (delete-file "Cargo.lock") - (invoke "cargo" "generate-lockfile"))) + (delete-file "Cargo.lock")) #t) ;; After the 'patch-generated-file-shebangs phase any vendored crates who have @@ -203,7 +193,6 @@ directory = '" port) (replace 'build build) (replace 'check check) (replace 'install install) - (add-after 'configure 'update-cargo-lock update-cargo-lock) (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums patch-cargo-checksums))) (define* (cargo-build #:key inputs (phases %standard-phases) -- cgit v1.2.3 From 2f57fa10f4ee09c74e57fd968d24dc657fa45be2 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 26 Aug 2019 20:28:29 +0200 Subject: gnu: emacs-elisp-demos: Update to 2019.08.16. * gnu/packages/emacs-xyz.scm (emacs-elisp-demos): Update to 2019.08.16. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c5d667a7aa..f684562e58 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3077,30 +3077,27 @@ for Flow files.") (license license:gpl3+)))) (define-public emacs-elisp-demos - (let ((commit "4c1fbc392668662890b685ab297e950259227e06") - (version "0.1") - (revision "1")) - (package - (name "emacs-elisp-demos") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xuchunyang/elisp-demos") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01cbkmjgmzxdf02w9xgbf4bhnx1mh53vvpkri13yxfksym5zizp4")))) - (build-system emacs-build-system) - (arguments '(#:include '("\\.el$" "\\.org$"))) - (home-page "https://github.com/xuchunyang/elisp-demos/") - (synopsis "Enhance @code{*Help*} buffers with additional examples") - (description - "This package injects example uses of Elisp functions into their + (package + (name "emacs-elisp-demos") + (version "2019.08.16") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xuchunyang/elisp-demos") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66")))) + (build-system emacs-build-system) + (arguments '(#:include '("\\.el$" "\\.org$"))) + (home-page "https://github.com/xuchunyang/elisp-demos/") + (synopsis "Enhance @code{*Help*} buffers with additional examples") + (description + "This package injects example uses of Elisp functions into their respective @code{*Help*} buffers.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-docker-compose-mode (package -- cgit v1.2.3 From 3ecbda71aab0bba7e6b6d7e5cd7897d10a51183c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 11:11:21 +0300 Subject: gnu: enlightenment: Don't use NAME in source URI. * gnu/packages/enlightenment.scm (enlightenment)[source]: Hard-code NAME. --- gnu/packages/enlightenment.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index c28968e649..6352801059 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -278,7 +278,7 @@ Libraries with some extra bells and whistles.") (method url-fetch) (uri (string-append "https://download.enlightenment.org/rel/apps/" - name "/" name "-" version ".tar.xz")) + "enlightenment/enlightenment-" version ".tar.xz")) (sha256 (base32 "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r")) -- cgit v1.2.3 From dd2031169a334050c740c6772bdc32d984a9fede Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 11:14:30 +0300 Subject: gnu: enlightenment: Update to 0.23.0. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.23.0. [build-system]: Switch to meson-build-system. [arguments]: Add configure-flag to build without systemd. Remove 'bootstrap phase. Update substitutions in custom 'set-system-actions phase. [inputs]: Add bluez, pulseaudio. * gnu/packages/patches/enlightenment-fix-setuid-path.patch: Update. * gnu/services/desktop.scm (enlightenment-setuid-programs): Update location of 'freqset binary. Add 'cpuclock_sys to setuid binaries. --- gnu/packages/enlightenment.scm | 21 ++++-- .../patches/enlightenment-fix-setuid-path.patch | 74 ++++++++++++++++++---- gnu/services/desktop.scm | 40 +++++++----- 3 files changed, 100 insertions(+), 35 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 6352801059..5e62f5e3da 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -273,7 +273,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.22.4") + (version "0.23.0") (source (origin (method url-fetch) (uri @@ -281,12 +281,14 @@ Libraries with some extra bells and whistles.") "enlightenment/enlightenment-" version ".tar.xz")) (sha256 (base32 - "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r")) + "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments - `(#:phases + `(#:configure-flags '("-Dsystemd=false") + #:phases (modify-phases %standard-phases + (delete 'bootstrap) ; We don't want to run the autogen script. (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" "/tmp") @@ -294,6 +296,7 @@ Libraries with some extra bells and whistles.") (setxkbmap (assoc-ref inputs "setxkbmap")) (utils (assoc-ref inputs "util-linux")) (libc (assoc-ref inputs "libc")) + (bluez (assoc-ref inputs "bluez")) (efl (assoc-ref inputs "efl"))) ;; We need to patch the path to 'base.lst' to be able ;; to switch the keyboard layout in E. @@ -314,12 +317,14 @@ Libraries with some extra bells and whistles.") (string-append efl "/bin/edje_cc -v %s %s %s\""))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) - (substitute* "configure" + (substitute* "data/etc/meson.build" (("/bin/mount") (string-append utils "/bin/mount")) (("/bin/umount") (string-append utils "/bin/umount")) (("/usr/bin/eject") (string-append utils "/bin/eject")) - (("/etc/acpi/sleep.sh force") "/run/current-system/profile/bin/loginctl suspend") - (("/etc/acpi/hibernate.sh force") "/run/current-system/profile/bin/loginctl hibernate") + (("/usr/bin/l2ping") (string-append bluez "/bin/l2ling")) + (("/bin/rfkill") (string-append utils "/sbin/rfkill")) + (("SUSPEND = ''") "SUSPEND = '/run/current-system/profile/bin/loginctl suspend'") + (("HIBERNATE = ''") "HIBERNATE = '/run/current-system/profile/bin/loginctl hibernate'") (("/sbin/shutdown -h now") "/run/current-system/profile/bin/loginctl poweroff now") (("/sbin/shutdown -r now") "/run/current-system/profile/bin/loginctl reboot now")) #t)))))) @@ -329,12 +334,14 @@ Libraries with some extra bells and whistles.") ("util-linux" ,util-linux))) (inputs `(("alsa-lib" ,alsa-lib) + ("bluez" ,bluez) ("dbus" ,dbus) ("efl" ,efl) ("freetype" ,freetype) ("libxcb" ,libxcb) ("libxext" ,libxext) ("linux-pam" ,linux-pam) + ("puleseaudio" ,pulseaudio) ("setxkbmap" ,setxkbmap) ("xcb-util-keysyms" ,xcb-util-keysyms) ("xkeyboard-config" ,xkeyboard-config))) diff --git a/gnu/packages/patches/enlightenment-fix-setuid-path.patch b/gnu/packages/patches/enlightenment-fix-setuid-path.patch index 90e16d3e67..c48f18c8ec 100644 --- a/gnu/packages/patches/enlightenment-fix-setuid-path.patch +++ b/gnu/packages/patches/enlightenment-fix-setuid-path.patch @@ -28,7 +28,7 @@ index 2bced6766..208e583ba 100644 } #endif // HAVE_EEZE || __FreeBSD_kernel__ diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c -index b7d9e3eba..d8a9eb82c 100644 +index 0fcffa249..c1921121d 100644 --- a/src/bin/e_fm/e_fm_main_eeze.c +++ b/src/bin/e_fm/e_fm_main_eeze.c @@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v) @@ -59,10 +59,10 @@ index b7d9e3eba..d8a9eb82c 100644 } v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v); diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c -index 6781a9b5a..8cd140f1b 100644 +index 671fbcd9a..90ee04cf1 100644 --- a/src/bin/e_sys.c +++ b/src/bin/e_sys.c -@@ -653,20 +653,16 @@ _e_sys_cb_timer(void *data EINA_UNUSED) +@@ -702,20 +702,16 @@ _e_sys_cb_timer(void *data EINA_UNUSED) e_init_status_set(_("Checking System Permissions")); snprintf(buf, sizeof(buf), @@ -87,9 +87,9 @@ index 6781a9b5a..8cd140f1b 100644 _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL); return ECORE_CALLBACK_CANCEL; } -@@ -1079,8 +1075,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) - /* shutdown -h now */ +@@ -1134,8 +1130,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) if (e_util_immortal_check()) return 0; + e_fm2_die(); snprintf(buf, sizeof(buf), - "%s/enlightenment/utils/enlightenment_sys halt", - e_prefix_lib_get()); @@ -97,9 +97,9 @@ index 6781a9b5a..8cd140f1b 100644 if (_e_sys_exe) { if ((ecore_time_get() - _e_sys_begin_time) > 2.0) -@@ -1114,8 +1109,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) - /* shutdown -r now */ +@@ -1170,8 +1165,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) if (e_util_immortal_check()) return 0; + e_fm2_die(); snprintf(buf, sizeof(buf), - "%s/enlightenment/utils/enlightenment_sys reboot", - e_prefix_lib_get()); @@ -107,7 +107,7 @@ index 6781a9b5a..8cd140f1b 100644 if (_e_sys_exe) { if ((ecore_time_get() - _e_sys_begin_time) > 2.0) -@@ -1148,8 +1142,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) +@@ -1204,8 +1198,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) case E_SYS_SUSPEND: /* /etc/acpi/sleep.sh force */ snprintf(buf, sizeof(buf), @@ -117,7 +117,7 @@ index 6781a9b5a..8cd140f1b 100644 if (_e_sys_exe) { if ((ecore_time_get() - _e_sys_begin_time) > 2.0) -@@ -1208,8 +1201,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) +@@ -1265,8 +1258,7 @@ _e_sys_action_do(E_Sys_Action a, char *param EINA_UNUSED, Eina_Bool raw) case E_SYS_HIBERNATE: /* /etc/acpi/hibernate.sh force */ snprintf(buf, sizeof(buf), @@ -152,11 +152,26 @@ index 4b5148634..47d34b07f 100644 autolock_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); eina_strbuf_free(buf); +diff --git a/src/modules/bluez5/e_mod_main.c b/src/modules/bluez5/e_mod_main.c +index a581c466c..095d8f360 100644 +--- a/src/modules/bluez5/e_mod_main.c ++++ b/src/modules/bluez5/e_mod_main.c +@@ -321,8 +321,8 @@ ebluez5_rfkill_unblock(const char *name) + if (buf) + { + eina_strbuf_append_printf +- (buf, "%s/enlightenment/utils/enlightenment_sys rfkill-unblock %s", +- e_prefix_lib_get(), name); ++ (buf, "/run/setuid-programs/enlightenment_sys rfkill-unblock %s", ++ name); + _rfkill_exe = ecore_exe_run(eina_strbuf_string_get(buf), NULL); + eina_strbuf_free(buf); + } diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c -index f4ba259b6..ae228bae3 100644 +index b66b365d8..bab0802cc 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c -@@ -1450,8 +1450,7 @@ e_modapi_init(E_Module *m) +@@ -1452,8 +1452,7 @@ e_modapi_init(E_Module *m) } E_CONFIG_LIMIT(cpufreq_config->poll_interval, 1, 1024); @@ -166,3 +181,40 @@ index f4ba259b6..ae228bae3 100644 cpufreq_config->set_exe_path = strdup(buf); if (stat(buf, &st) < 0) +diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c +index 938916e53..00d5067d0 100644 +--- a/src/modules/sysinfo/cpuclock/cpuclock.c ++++ b/src/modules/sysinfo/cpuclock/cpuclock.c +@@ -80,8 +80,7 @@ _cpuclock_set_governor(const char *governor) + char buf[4096 + 100], exe[4096]; + struct stat st; + +- snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", +- e_module_dir_get(sysinfo_config->module), MODULE_ARCH); ++ snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); + if (stat(exe, &st) < 0) return; + + snprintf(buf, sizeof(buf), +@@ -108,8 +107,7 @@ _cpuclock_set_frequency(int frequency) + if (system(buf) != 0) + ERR("Error code from trying to run \"%s\"", buf); + #else +- snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", +- e_module_dir_get(sysinfo_config->module), MODULE_ARCH); ++ snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); + if (stat(exe, &st) < 0) return; + snprintf(buf, sizeof(buf), + "%s %s %i", exe, "frequency", frequency); +@@ -127,8 +125,7 @@ _cpuclock_set_pstate(int min, int max, int turbo) + char buf[4096 + 100], exe[4096]; + struct stat st; + +- snprintf(exe, 4096, "%s/%s/cpuclock_sysfs", +- e_module_dir_get(sysinfo_config->module), MODULE_ARCH); ++ snprintf(exe, 4096, "/run/setuid-programs/cpuclock_sysfs"); + if (stat(exe, &st) < 0) return; + snprintf(buf, sizeof(buf), + "%s %s %i %i %i", exe, "pstate", min, max, turbo); +-- +2.23.0 + diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 343d507c14..a32756e040 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -963,23 +963,29 @@ with the administrator's password." (match-record enlightenment-desktop-configuration (enlightenment) - (list (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_sys") - (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_backlight") - ;; TODO: Move this binary to a screen-locker service. - (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_ckpasswd") - (file-append enlightenment - (string-append - "/lib/enlightenment/modules/cpufreq/" - (match (string-tokenize (%current-system) - (char-set-complement (char-set #\-))) - ((arch "linux") (string-append "linux-gnu-" arch)) - ((arch "gnu") (string-append "gnu-" arch))) - "-" - (version-major+minor (package-version enlightenment)) - "/freqset"))))) + (let ((module-arch (match (string-tokenize (%current-system) + (char-set-complement (char-set #\-))) + ((arch "linux") (string-append "linux-gnu-" arch)) + ((arch "gnu") (string-append "gnu-" arch))))) + (list (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_sys") + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_backlight") + ;; TODO: Move this binary to a screen-locker service. + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_ckpasswd") + (file-append enlightenment + (string-append + "/lib/enlightenment/modules/cpufreq/" + module-arch "-" + (package-version enlightenment) + "/freqset")) + (file-append enlightenment + (string-append + "/lib/enlightenment/modules/sysinfo/" + module-arch "-" + (package-version enlightenment) + "/cpuclock_sysfs")))))) (define enlightenment-desktop-service-type (service-type -- cgit v1.2.3 From 07d7175406210434d1fb9c100dc33a7d095f1627 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Tue, 30 Jul 2019 11:05:21 -0400 Subject: gnu: mingw-w64: Update to 6.0.0. * gnu/packages/mingw.scm (mingw-w64): Update to 6.0.0. * gnu/packages/patches/mingw-w64-6.0.0-gcc.patch: New file. * gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch: Delete it. * gnu/local.mk (dist_patch_DATA): Add new patch. Delete old patch. * gnu/build/cross-toolchain.scm (set-cross-path/mingw): Add additional autoconf-like substitutions. --- gnu/build/cross-toolchain.scm | 6 +- gnu/local.mk | 2 +- gnu/packages/mingw.scm | 6 +- .../patches/mingw-w64-5.0rc2-gcc-4.9.3.patch | 218 --------------------- gnu/packages/patches/mingw-w64-6.0.0-gcc.patch | 65 ++++++ 5 files changed, 74 insertions(+), 223 deletions(-) delete mode 100644 gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch create mode 100644 gnu/packages/patches/mingw-w64-6.0.0-gcc.patch diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 201b36ff7c..7ab0a355b0 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -130,7 +130,11 @@ C_*INCLUDE_PATH." (substitute* (string-append mingw-headers "/crt/_mingw.h") (("@MINGW_HAS_SECURE_API@") - "#define MINGW_HAS_SECURE_API 1")) + "#define MINGW_HAS_SECURE_API 1") + (("@DEFAULT_WIN32_WINNT@") + "0x502") + (("@DEFAULT_MSVCRT_VERSION@") + "0x700")) (let ((cpath (string-append mingw-headers "/include" ":" mingw-headers "/crt" diff --git a/gnu/local.mk b/gnu/local.mk index a756316f77..d539c3c85b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1098,7 +1098,7 @@ dist_patch_DATA = \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ - %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ + %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \ diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 017f9453ab..fe51780fa3 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -36,15 +36,15 @@ (let ((triplet (string-append machine "-" "w64-mingw32"))) (package (name (string-append "mingw-w64" "-" machine)) - (version "5.0.4") + (version "6.0.0") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm")) - (patches (search-patches "mingw-w64-5.0rc2-gcc-4.9.3.patch")))) + (base32 "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0")) + (patches (search-patches "mingw-w64-6.0.0-gcc.patch")))) (native-inputs `(("xgcc-core" ,(cross-gcc triplet)) ("xbinutils" ,(cross-binutils triplet)))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch b/gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch deleted file mode 100644 index e8f841c4fd..0000000000 --- a/gnu/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch +++ /dev/null @@ -1,218 +0,0 @@ -This patch includes - - * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 - * mingw-w64-headers/crt/math.h: Likewise - * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add - symbols. - * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): - Add symbols. - (lstat): Add function. - * mingw-w64-headers/crt/_mingw_stat64.h: Likewise - * mingw-w64-headers/crt/stdlib.h (realpath): Add function. - -Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. - -Upstream status: not yet presented upstream. - -index 9c5cf87..74a8541 100644 ---- a/mingw-w64-crt/misc/dirname.c -+++ b/mingw-w64-crt/misc/dirname.c -@@ -29,6 +29,12 @@ - #define __cdecl /* this may not be defined. */ - #endif - -+char *__cdecl -+realpath(const char *name, char *resolved) -+{ -+ return resolved ? strcpy (resolved, name) : strdup (name); -+} -+ - char * __cdecl - dirname(char *path) - { -diff --git a/mingw-w64-headers/crt/_mingw_stat64.h b/mingw-w64-headers/crt/_mingw_stat64.h -index 17e754c..7d2339b 100644 ---- a/mingw-w64-headers/crt/_mingw_stat64.h -+++ b/mingw-w64-headers/crt/_mingw_stat64.h -@@ -2,13 +2,17 @@ - - #ifdef _USE_32BIT_TIME_T - #define _fstat32 _fstat -+#define _lstat32 _lstat - #define _stat32 _stat - #define _wstat32 _wstat - #define _fstat32i64 _fstati64 -+#define _lstat32i64 _lstati64 - #define _stat32i64 _stati64 - #define _wstat32i64 _wstati64 - #else - #define _fstat _fstat64i32 -+#define _lstat _lstat64i32 -+#define _lstati64 _lstat64 - #define _fstati64 _fstat64 - #define _stat _stat64i32 - #define _stati64 _stat64 -diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h -index 5874f4e..bdf4ead 100644 ---- a/mingw-w64-headers/crt/float.h -+++ b/mingw-w64-headers/crt/float.h -@@ -22,6 +22,15 @@ - #if (__GNUC__ < 4) - #error Corrupt install of gcc-s internal headers, or search order was changed. - #else -+ -+ /* From gcc-4.9.3 float.h. */ -+ #undef FLT_EPSILON -+ #undef DBL_EPSILON -+ #undef LDBL_EPSILON -+ #define FLT_EPSILON __FLT_EPSILON__ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define LDBL_EPSILON __LDBL_EPSILON__ -+ - /* #include_next */ - - /* Number of decimal digits, q, such that any floating-point number with q -diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h -index 1e970f4..99a332f 100644 ---- a/mingw-w64-headers/crt/math.h -+++ b/mingw-w64-headers/crt/math.h -@@ -216,6 +216,7 @@ extern "C" { - #endif - } - -+#if 0 - __CRT_INLINE long double __cdecl fabsl (long double x) - { - #ifdef __arm__ -@@ -226,6 +227,7 @@ extern "C" { - return res; - #endif - } -+#endif - - __CRT_INLINE double __cdecl fabs (double x) - { -@@ -905,7 +907,7 @@ __mingw_choose_expr ( \ - /* 7.12.7.3 */ - extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ - extern float __cdecl hypotf (float x, float y); --#ifndef __CRT__NO_INLINE -+#if 0 //ndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} - #endif - extern long double __cdecl hypotl (long double, long double); -diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h -index dfc5ae4..6f0fee3 100644 ---- a/mingw-w64-headers/crt/stdlib.h -+++ b/mingw-w64-headers/crt/stdlib.h -@@ -8,6 +8,7 @@ - - #include - #include -+#include - - #if defined (__USE_MINGW_ANSI_STDIO) && ((__USE_MINGW_ANSI_STDIO + 0) != 0) && !defined (__USE_MINGW_STRTOX) - #define __USE_MINGW_STRTOX 1 -@@ -676,6 +677,8 @@ unsigned long __cdecl _lrotr(unsigned long,int); - - #endif /* !__NO_ISOCEXT */ - -+char *__cdecl realpath (const char *name, char *resolved); -+ - #ifdef __cplusplus - } - #endif -diff --git a/mingw-w64-headers/crt/sys/stat.h b/mingw-w64-headers/crt/sys/stat.h -index ed60219..d88b4f1 100644 ---- a/mingw-w64-headers/crt/sys/stat.h -+++ b/mingw-w64-headers/crt/sys/stat.h -@@ -58,16 +58,21 @@ extern "C" { - #include <_mingw_stat64.h> - - #define _S_IFMT 0xF000 -+#define _S_IFLNK 0xA000 -+#define _S_IFSOCK 0xC000 - #define _S_IFDIR 0x4000 - #define _S_IFCHR 0x2000 - #define _S_IFIFO 0x1000 - #define _S_IFREG 0x8000 -+#define _S_ISUID 0x0400 -+#define _S_ISGID 0x0200 - #define _S_IREAD 0x0100 - #define _S_IWRITE 0x0080 - #define _S_IEXEC 0x0040 - - _CRTIMP int __cdecl _fstat32(int _FileDes,struct _stat32 *_Stat); - _CRTIMP int __cdecl _stat32(const char *_Name,struct _stat32 *_Stat); -+ static inline int __cdecl _lstat32(const char *_Name,struct _stat32 *_Stat) {return _stat32(_Name, _Stat);} - _CRTIMP int __cdecl _fstat64(int _FileDes,struct _stat64 *_Stat); - _CRTIMP int __cdecl _fstat32i64(int _FileDes,struct _stat32i64 *_Stat); - int __cdecl _fstat64i32(int _FileDes,struct _stat64i32 *_Stat); -@@ -97,6 +102,9 @@ extern "C" { - _CRTIMP int __cdecl _stat64(const char *_Name,struct _stat64 *_Stat); - _CRTIMP int __cdecl _stat32i64(const char *_Name,struct _stat32i64 *_Stat); - int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat); -+ static inline int __cdecl _lstat64(const char *_Name,struct _stat64 *_Stat) {return _stat64(_Name, _Stat);} -+ static inline int __cdecl _lstat32i64(const char *_Name,struct _stat32i64 *_Stat) {return _stat32i64(_Name, _Stat);} -+ static inline int __cdecl _lstat64i32(const char *_Name,struct _stat64i32 *_Stat) {return _stat64i32(_Name, _Stat);} - #ifndef __CRT__NO_INLINE - __CRT_INLINE int __cdecl _stat64i32(const char *_Name,struct _stat64i32 *_Stat) - { -@@ -132,6 +140,8 @@ extern "C" { - #ifndef NO_OLDNAMES - #define _S_IFBLK 0x3000 /* Block: Is this ever set under w32? */ - -+#define S_IFLNK _S_IFLNK -+#define S_IFSOCK _S_IFSOCK - #define S_IFMT _S_IFMT - #define S_IFDIR _S_IFDIR - #define S_IFCHR _S_IFCHR -@@ -162,6 +172,11 @@ extern "C" { - #define S_IXOTH (S_IXGRP >> 3) - #define S_IRWXO (S_IRWXG >> 3) - -+#define S_ISUID _S_ISUID -+#define S_ISGID _S_ISGID -+ -+#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) -+#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) - #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) - #define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) - #define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) -@@ -174,6 +189,7 @@ extern "C" { - int __cdecl stat(const char *_Filename,struct stat *_Stat); - int __cdecl fstat(int _Desc,struct stat *_Stat); - int __cdecl wstat(const wchar_t *_Filename,struct stat *_Stat); -+static inline int __cdecl lstat(const char *_Filename,struct stat *_Stat){return stat(_Filename, _Stat);} - - #ifndef __CRT__NO_INLINE - #ifdef _USE_32BIT_TIME_T -@@ -262,9 +278,11 @@ __CRT_INLINE int __cdecl - - #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) - #ifdef _USE_32BIT_TIME_T -+#define lstat _lstat32i64 - #define stat _stat32i64 - #define fstat _fstat32i64 - #else -+#define lstat _lstat64 - #define stat _stat64 - #define fstat _fstat64 - #endif -diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h -index 52af29b..8626396 100644 ---- a/mingw-w64-headers/include/winnt.h -+++ b/mingw-w64-headers/include/winnt.h -@@ -6895,7 +6895,12 @@ __buildmemorybarrier() - DWORD Reg : 3; - DWORD R : 1; - DWORD L : 1; -+/* C is used as a const specifier */ -+#define save_C C -+#undef C - DWORD C : 1; -+#define C save_C -+#undef save_C - DWORD StackAdjust : 10; - } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME; diff --git a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch new file mode 100644 index 0000000000..036cf79f91 --- /dev/null +++ b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch @@ -0,0 +1,65 @@ +This patch includes + + * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 + * mingw-w64-headers/crt/math.h: Likewise + * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add + symbols. + * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): + Add symbols. + (lstat): Add function. + * mingw-w64-headers/crt/_mingw_stat64.h: Likewise + * mingw-w64-headers/crt/stdlib.h (realpath): Add function. + +Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. + +Upstream status: not yet presented upstream. + +diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h +index 5874f4e..bdf4ead 100644 +--- a/mingw-w64-headers/crt/float.h ++++ b/mingw-w64-headers/crt/float.h +@@ -22,6 +22,15 @@ + #if (__GNUC__ < 4) + #error Corrupt install of gcc-s internal headers, or search order was changed. + #else ++ ++ /* From gcc-4.9.3 float.h. */ ++ #undef FLT_EPSILON ++ #undef DBL_EPSILON ++ #undef LDBL_EPSILON ++ #define FLT_EPSILON __FLT_EPSILON__ ++ #define DBL_EPSILON __DBL_EPSILON__ ++ #define LDBL_EPSILON __LDBL_EPSILON__ ++ + /* #include_next */ + + /* Number of decimal digits, q, such that any floating-point number with q +diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h +index 1e970f4..99a332f 100644 +--- a/mingw-w64-headers/crt/math.h ++++ b/mingw-w64-headers/crt/math.h +@@ -216,6 +216,7 @@ extern "C" { + #endif + } + ++#if 0 + __CRT_INLINE long double __cdecl fabsl (long double x) + { + #ifdef __arm__ +@@ -226,6 +227,7 @@ extern "C" { + return res; + #endif + } ++#endif + + __CRT_INLINE double __cdecl fabs (double x) + { +@@ -905,7 +907,7 @@ __mingw_choose_expr ( \ + /* 7.12.7.3 */ + extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ + extern float __cdecl hypotf (float x, float y); +-#ifndef __CRT__NO_INLINE ++#if 0 //ndef __CRT__NO_INLINE + __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} + #endif + extern long double __cdecl hypotl (long double, long double); -- cgit v1.2.3 From b44863d1be518ff8ef8a5ef6253a88899696bc09 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 14:43:03 +0300 Subject: gnu: Add rust-antidote. * gnu/packages/crates-io.scm (rust-antidote): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 45966389dd..d017ee6216 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28,6 +28,27 @@ ;;; Please: Try to add new module packages in alphabetic order. ;;; +(define-public rust-antidote + (package + (name "rust-antidote") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "antidote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19g2sw2qa2ibnh4x7j1snk46593jgx6y7rnvva496ynq61af5z9l")))) + (build-system cargo-build-system) + (home-page "https://github.com/sfackler/rust-antidote") + (synopsis "Poison-free Mutex and RwLock types") + (description + "These types expose identical APIs to the standard library @code{Mutex} and +@code{RwLock} except that they do not return @code{PoisonError}s.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-autocfg (package (name "rust-autocfg") -- cgit v1.2.3 From a353643035997e5392f43715b2878caecf849e6d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 14:51:42 +0300 Subject: gnu: Add rust-lazy-static. * gnu/packages/crates-io.scm (rust-lazy-static): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d017ee6216..2034c2198e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -335,6 +335,32 @@ friction with idiomatic Rust structs to ease interopability.") (license (list license:asl2.0 license:expat)))) +(define-public rust-lazy-static + (package + (name "rust-lazy-static") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazy_static" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "052ac27w189hrf1j3hz7sga46rp84zl2hqnzyihxv78mgzr2jmxw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-spin" ,rust-spin)))) + (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") + (synopsis "Macro for declaring lazily evaluated statics in Rust") + (description + "This package provides a macro for declaring lazily evaluated statics in +Rust. Using this macro, it is possible to have @code{static}s that require code +to be executed at runtime in order to be initialized. This includes anything +requiring heap allocations, like vectors or hash maps, as well as anything that +requires non-const function calls to be computed.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-libc (package (name "rust-libc") -- cgit v1.2.3 From 9bdfe5c1ea5d8f0cdb923f77c0b1021239be1daf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 14:56:06 +0300 Subject: gnu: Add rust-termios. * gnu/packages/crates-io.scm (rust-termios): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2034c2198e..2ead1c578f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -888,6 +888,30 @@ and Jaro-Winkler.") "This package provides helper test traits for synstructure doctests.") (license license:expat))) +(define-public rust-termios + (package + (name "rust-termios") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "termios" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc)))) + (home-page "https://github.com/dcuddeback/termios-rs") + (synopsis "Safe bindings for the termios library") + (description + "The termios crate provides safe bindings for the Rust programming language +to the terminal I/O interface implemented by Unix operating systems. The safe +bindings are a small wrapper around the raw C functions, which converts integer +return values to @code{std::io::Result} to indicate success or failure.") + (license license:expat))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From dac3fc6974193597a3343b1d5c6283a8ebdf8d3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 14:59:58 +0300 Subject: gnu: Add rust-xdg. * gnu/packages/crates-io.scm (rust-xdg): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2ead1c578f..b255cfe624 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1124,3 +1124,23 @@ x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on (license (list license:asl2.0 license:expat)))) +(define-public rust-xdg + (package + (name "rust-xdg") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "xdg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mws8a0fr3cqk5nh7aq9lmkmhzghvasqy4mhw6nnza06l4d6i2fh")))) + (build-system cargo-build-system) + (home-page "https://github.com/whitequark/rust-xdg") + (synopsis "Store and retrieve files according to XDG specification") + (description + "This package provides a library for storing and retrieving files according +to XDG Base Directory specification") + (license (list license:asl2.0 + license:expat)))) -- cgit v1.2.3 From bc0862cd94ead85ae340ad6f0b5d2dcd655182ea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:02:36 +0300 Subject: gnu: Add rust-winapi-0.2. * gnu/packages/crates-io.scm (rust-winapi-0.2): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b255cfe624..558089f719 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1082,6 +1082,27 @@ in Rust.") (license (list license:asl2.0 license:expat)))) +(define-public rust-winapi-0.2 + (package + (inherit rust-winapi) + (name "rust-winapi") + (version "0.2.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "winapi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))) + ;; We do not want to package 48 -sys crates for a package we do not want. + ;; They are all dev dependencies, so we skip building and testing. + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build)))))) + (define-public rust-winapi-i686-pc-windows-gnu (package (name "rust-winapi-i686-pc-windows-gnu") -- cgit v1.2.3 From 6ea6a985e5ae37430fe544888bb36c4c3b8ecfa4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:04:39 +0300 Subject: gnu: rust-winapi-build: New variable. * gnu/packages/crates-io.scm (rust-winapi-build): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 558089f719..777e462294 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1103,6 +1103,25 @@ in Rust.") (modify-phases %standard-phases (delete 'build)))))) +(define-public rust-winapi-build + (package + (name "rust-winapi-build") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "winapi-build" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d")))) + (build-system cargo-build-system) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Common code for build.rs in WinAPI -sys crates") + (description + "Common code for build.rs in WinAPI -sys crates.") + (license license:expat))) + (define-public rust-winapi-i686-pc-windows-gnu (package (name "rust-winapi-i686-pc-windows-gnu") -- cgit v1.2.3 From 86cd265fb7fb7d73155bd812b095a4ad88f173d5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:05:50 +0300 Subject: gnu: rust-winapi-util: New variable. * gnu/packages/crates-io.scm (rust-winapi-util): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 777e462294..ef97cd36ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1143,6 +1143,29 @@ i686-pc-windows-gnu target. Please don't use this crate directly, depend on (license (list license:asl2.0 license:expat)))) +(define-public rust-winapi-util + (package + (name "rust-winapi-util") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "winapi-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j839dc6y8vszvrsb7yk0qvs0w6asnahxzbyans37vnsw6vbls3i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-winapi" ,rust-winapi)))) + (home-page "https://github.com/BurntSushi/winapi-util") + (synopsis "Dumping ground for high level safe wrappers over winapi") + (description + "This package provides a dumping ground for high level safe wrappers over +winapi.") + (license (list license:unlicense + license:expat)))) + (define-public rust-winapi-x86-64-pc-windows-gnu (package (name "rust-winapi-x86-64-pc-windows-gnu") -- cgit v1.2.3 From 0c944af88394b98cad64a3bfef225282fbde7105 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:06:42 +0300 Subject: gnu: rust-wincolor: New variable. * gnu/packages/crates-io.scm (rust-wincolor): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ef97cd36ee..6ca7cf23bf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1187,6 +1187,31 @@ x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on (license (list license:asl2.0 license:expat)))) +(define-public rust-wincolor + (package + (name "rust-wincolor") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "wincolor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1agaf3hcav113i86912ajnw6jxcy4rvkrgyf8gdj8kc031mh3xcn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi) + ("rust-winapi-util" ,rust-winapi-util)))) + (home-page "https://github.com/BurntSushi/termcolor/tree/master/wincolor") + (synopsis "Windows API for controlling text color in a Windows console") + (description + "This package provides a simple Windows specific API for controlling text +color in a Windows console.") + (license (list license:unlicense + license:expat)))) + (define-public rust-xdg (package (name "rust-xdg") -- cgit v1.2.3 From 7b20853a1e01876ce8f7e2a35fb269a1701e0095 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:17:30 +0300 Subject: gnu: Add rust-wasm-bindgen-test-macro. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-macro): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ca7cf23bf..dcf7a501ac 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1056,6 +1056,30 @@ in Rust.") (license (list license:asl2.0 license:expat)))) +(define-public rust-wasm-bindgen-test-macro + (package + (name "rust-wasm-bindgen-test-macro") + (version "0.2.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0n28mr6vncf1k1qr2b5bvfxq4jvqkjdzq0z0ab6w2f5d6v8q3q3l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2) + ("rust-quote" ,rust-quote)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal testing macro for wasm-bindgen") + (description + "This library contains the internal testing macro for wasm-bindgen.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-winapi (package (name "rust-winapi") -- cgit v1.2.3 From 0aa98c69845bf3967f2bbce768e25fbe79c50bcb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:20:01 +0300 Subject: gnu: Add rust-widestring. * gnu/packages/crates-io.scm (rust-widestring): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dcf7a501ac..6b080ae21a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1080,6 +1080,31 @@ in Rust.") (license (list license:asl2.0 license:expat)))) +(define-public rust-widestring + (package + (name "rust-widestring") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "widestring" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dhx6dndjsz1y7c9w06922412kdxyrrkqblvggm76mh8z17hxz7g")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-winapi" ,rust-winapi)))) + (home-page "https://github.com/starkat99/widestring-rs") + (synopsis "Wide string Rust FFI library") + (description + "A wide string Rust FFI library for converting to and from wide strings, +such as those often used in Windows API or other FFI libaries. Both UTF-16 and +UTF-32 types are provided, including support for malformed encoding.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-winapi (package (name "rust-winapi") -- cgit v1.2.3 From c4455f7d201d7207d7a55bfd2e49b800e800cd2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:34:10 +0300 Subject: gnu: Add rust-blas-sys. * gnu/packages/crates-io.scm (rust-blas-sys): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b080ae21a..4db89c77c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -113,6 +113,28 @@ behave like a set of bitflags.") (license (list license:asl2.0 license:expat)))) +(define-public rust-blas-sys + (package + (name "rust-blas-sys") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "blas-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0h14zjycwc76v15h8qll9z1xiryvmpvsb5gam97pqpdjrrwv5c8k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc)))) + (home-page "https://github.com/blas-lapack-rs/blas-sys") + (synopsis "Bindings to BLAS (Fortran)") + (description + "Ths package provides bindings to BLAS (Fortran).") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-cfg-if (package (name "rust-cfg-if") -- cgit v1.2.3 From 84a232bf710a2d008e020a2c1c0f67c7d2db8e37 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:36:23 +0300 Subject: gnu: Add rust-cblas-sys. * gnu/packages/crates-io.scm (rust-cblas-sys): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4db89c77c0..597b151c2e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -135,6 +135,28 @@ behave like a set of bitflags.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cblas-sys + (package + (name "rust-cblas-sys") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "cblas-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rgsn3klhhh09d8qf3b87zl4rwk93l2g0qzh9hhb0lff5kcfrzmn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc)))) + (home-page "https://github.com/blas-lapack-rs/cblas-sys") + (synopsis "Bindings to CBLAS (C)") + (description + "The package provides bindings to CBLAS (C).") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-cfg-if (package (name "rust-cfg-if") -- cgit v1.2.3 From e9e4980db97564e20e25936e5a2df6a1e59c6223 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:38:20 +0300 Subject: gnu: Add rust-cloudabi. * gnu/packages/crates-io.scm (rust-cloudabi): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 597b151c2e..496604de77 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -178,6 +178,28 @@ depending on a large number of #[cfg] parameters. Structured like an (license (list license:asl2.0 license:expat)))) +(define-public rust-cloudabi + (package + (name "rust-cloudabi") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "cloudabi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kxcg83jlihy0phnd2g8c2c303px3l2p3pkjz357ll6llnd5pz6x")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags)))) + (home-page "https://nuxi.nl/cloudabi/") + (synopsis "Low level interface to CloudABI") + (description + "Low level interface to CloudABI. Contains all syscalls and related types.") + (license license:bsd-2))) + (define-public rust-discard (package (name "rust-discard") -- cgit v1.2.3 From 73645bcb47d25a133d30fb1bcc28b487c2087546 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:41:16 +0300 Subject: gnu: Add rust-core-foundation-sys. * gnu/packages/crates-io.scm (rust-core-foundation-sys): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 496604de77..58f4d1831b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -200,6 +200,26 @@ depending on a large number of #[cfg] parameters. Structured like an "Low level interface to CloudABI. Contains all syscalls and related types.") (license license:bsd-2))) +(define-public rust-core-foundation-sys + (package + (name "rust-core-foundation-sys") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-foundation-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fzsw1j9g1x598yhwklg59l15hwzc0pyvs01w9fg2kin4598mjp7")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to Core Foundation for OS X") + (description + "Bindings to Core Foundation for OS X.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-discard (package (name "rust-discard") -- cgit v1.2.3 From 0c15f1432cd67299b2e3fd59421fcef120eadb8c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:44:58 +0300 Subject: gnu: Add rust-data-encoding. * gnu/packages/crates-io.scm (rust-data-encoding): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58f4d1831b..5a682d466c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -220,6 +220,26 @@ depending on a large number of #[cfg] parameters. Structured like an (license (list license:asl2.0 license:expat)))) +(define-public rust-data-encoding + (package + (name "rust-data-encoding") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-encoding" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15xd6afhsjl08285piwczrafmckpp8i29padj8v12xhahshprx7l")))) + (build-system cargo-build-system) + (home-page "https://github.com/ia0/data-encoding") + (synopsis "Efficient and customizable data-encoding functions") + (description + "This library provides encodings for many different common cases, including +hexadecimal, bas32, and base64.") + (license license:expat))) + (define-public rust-discard (package (name "rust-discard") -- cgit v1.2.3 From d68d00298dbe2856a442687540ad518132329135 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:46:03 +0300 Subject: gnu: Add rust-defmac. * gnu/packages/crates-io.scm (rust-defmac): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5a682d466c..0ced169f1b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -240,6 +240,25 @@ depending on a large number of #[cfg] parameters. Structured like an hexadecimal, bas32, and base64.") (license license:expat))) +(define-public rust-defmac + (package + (name "rust-defmac") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "defmac" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01ff3jdmcc5waffkwllndnx5hsn414r7x1rq4ib73n7awsyzxkxv")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/defmac") + (synopsis "Macro to define lambda-like macros inline") + (description "A macro to define lambda-like macros inline.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-discard (package (name "rust-discard") -- cgit v1.2.3 From b59a64606f6ddb88b06558d2dd52d99d11d0844b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:46:43 +0300 Subject: gnu: Add rust-defmac-0.1. * gnu/packages/crates-io.scm (rust-defmac-0.1): New variable. --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0ced169f1b..340d907f33 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -259,6 +259,20 @@ hexadecimal, bas32, and base64.") (license (list license:asl2.0 license:expat)))) +(define-public rust-defmac-0.1 + (package + (inherit rust-defmac) + (name "rust-defmac") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "defmac" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa")))))) + (define-public rust-discard (package (name "rust-discard") -- cgit v1.2.3 From 9d7d8e8a39e274e094503bff77c3e198318408d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:49:11 +0300 Subject: gnu: Add rust-findshlibs. * gnu/packages/crates-io.scm (rust-findshlibs): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 340d907f33..c63ccbdef3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -354,6 +354,31 @@ provides implementations for @code{HashMap} and @code{HashSet}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-findshlibs + (package + (name "rust-findshlibs") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "findshlibs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n2vagn0q5yim32hxkwi1cjgp3yn1dm45p7z8nw6lapywihhs9mi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static) + ("rust-libc" ,rust-libc)))) + (home-page "https://github.com/gimli-rs/findshlibs") + (synopsis "Find the set of shared libraries loaded in the current process") + (description + "Find the set of shared libraries loaded in the current process with a +cross platform API.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-fnv (package (name "rust-fnv") -- cgit v1.2.3 From f8f4025ae53e671f283ec32a840197702a797e6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:50:20 +0300 Subject: gnu: Add rust-fixedbitset. * gnu/packages/crates-io.scm (rust-fixedbitset): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c63ccbdef3..bba0f8fc49 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -379,6 +379,25 @@ cross platform API.") (license (list license:asl2.0 license:expat)))) +(define-public rust-fixedbitset + (package + (name "rust-fixedbitset") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "fixedbitset" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/fixedbitset") + (synopsis "FixedBitSet is a simple bitset collection") + (description "FixedBitSet is a simple bitset collection.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-fnv (package (name "rust-fnv") -- cgit v1.2.3 From 36bd543afc4d248093f1f07c150a5031fcec70f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:51:34 +0300 Subject: gnu: Add rust-foreign-types-shared. * gnu/packages/crates-io.scm (rust-foreign-types-shared): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bba0f8fc49..c2af57eb90 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -418,6 +418,26 @@ implementation that is more efficient for smaller hash keys.") (license (list license:asl2.0 license:expat)))) +(define-public rust-foreign-types-shared + (package + (name "rust-foreign-types-shared") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign-types-shared" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kanxlif1vp0ffh2r9l610jqbkmb3183yqykxq1z5w1vay2rn7y6")))) + (build-system cargo-build-system) + (home-page "https://github.com/sfackler/foreign-types") + (synopsis "An internal crate used by foreign-types") + (description + "An internal crate used by foreign-types.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-fs-extra (package (name "rust-fs-extra") -- cgit v1.2.3 From c4b7a9abb654c84d815dbd927f0a6c259bd336a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:53:55 +0300 Subject: gnu: Add rust-futures-io-preview. * gnu/packages/crates-io.scm (rust-futures-io-preview): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c2af57eb90..03f2a11445 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -478,6 +478,26 @@ featuring zero allocations, composability, and iterator-like interfaces.") (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-io-preview + (package + (name "rust-futures-io-preview") + (version "0.3.0-alpha.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-io-preview" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fhvwhdb8ywjjbfng0ra1r8yyc9yzpyxg9sv3spb3f7w0lk40bh8")))) + (build-system cargo-build-system) + (home-page "https://rust-lang-nursery.github.io/futures-rs/") + (synopsis "Async read and write traits for the futures library") + (description "This crate provides the @code{AsyncRead} and +@code{AsyncWrite} traits for the @code{futures-rs} library.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-hex (package (name "rust-hex") -- cgit v1.2.3 From 33d93a0aec86a60c9e2c2033b2c1cebb9617bb06 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 15:59:03 +0300 Subject: gnu: Add rust-iovec. * gnu/packages/crates-io.scm (rust-iovec): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 03f2a11445..21724d1778 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -518,6 +518,30 @@ hexadecimal representation.") (license (list license:asl2.0 license:expat)))) +(define-public rust-iovec + (package + (name "rust-iovec") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "iovec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "025vi072m22299z3fg73qid188z2iip7k41ba6v5v5yhwwby9rnv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi-0.2)))) + (home-page "https://github.com/carllerche/iovec") + (synopsis "Portable buffer type for scatter/gather I/O operations") + (description + "Portable buffer type for scatter/gather I/O operations.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-itoa (package (name "rust-itoa") -- cgit v1.2.3 From a567cde9b19bb0b1f82c4a0cb51e92c65fb4c837 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:02:13 +0300 Subject: gnu: Add rust-modifier. * gnu/packages/crates-io.scm (rust-modifier): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 21724d1778..becdd811a3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -698,6 +698,26 @@ whether an expression matches a pattern.") (license (list license:asl2.0 license:expat)))) +(define-public rust-modifier + (package + (name "rust-modifier") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "modifier" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0n3fmgli1nsskl0whrfzm1gk0rmwwl6pw1q4nb9sqqmn5h8wkxa1")))) + (build-system cargo-build-system) + (home-page "https://github.com/reem/rust-modifier") + (synopsis + "Chaining APIs for both self -> Self and &mut self methods.") + (description + "Chaining APIs for both self -> Self and &mut self methods.") + (license license:expat))) + (define-public rust-num-integer (package (name "rust-num-integer") -- cgit v1.2.3 From 018c29894850acba58451f2bec035db79f5fc78e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:03:59 +0300 Subject: gnu: Add rust-net2. * gnu/packages/crates-io.scm (rust-net2): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index becdd811a3..beec57a253 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -718,6 +718,32 @@ whether an expression matches a pattern.") "Chaining APIs for both self -> Self and &mut self methods.") (license license:expat))) +(define-public rust-net2 + (package + (name "rust-net2") + (version "0.2.33") + (source + (origin + (method url-fetch) + (uri (crate-uri "net2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "126g3fgfxp06zimc1l9iyxnn9cif1hjsg7sd81nlls5nnyghsma2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if) + ("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi)))) + (home-page "https://github.com/rust-lang-nursery/net2-rs") + (synopsis "Extensions to the standard library's networking types") + (description + "This library contains extensions to the standard library's networking +types as proposed in RFC 1158.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-num-integer (package (name "rust-num-integer") -- cgit v1.2.3 From 5d2ae881ce9abe248c047a50d71d4264b0bd1130 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:05:39 +0300 Subject: gnu: Add rust-num-cpus. * gnu/packages/crates-io.scm (rust-num-cpus): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index beec57a253..44dde04b62 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -744,6 +744,31 @@ types as proposed in RFC 1158.") (license (list license:asl2.0 license:expat)))) +(define-public rust-num-cpus + (package + (name "rust-num-cpus") + (version "1.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "num_cpus" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wrj3zvj6h3q26sqj9zxpd59frjb54n7jhjwf307clq31ic47vxw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment)))) + (home-page "https://github.com/seanmonstar/num_cpus") + (synopsis "Get the number of CPUs on a machine") + (description + "Get the number of CPUs on a machine.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-num-integer (package (name "rust-num-integer") -- cgit v1.2.3 From 913096271fc81f622327730f7ae55ebfff26a836 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:08:19 +0300 Subject: gnu: Add rust-rawpointer. * gnu/packages/crates-io.scm (rust-rawpointer): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 44dde04b62..3bdf1ce0c1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1005,6 +1005,27 @@ to write.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-rawpointer + (package + (name "rust-rawpointer") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rawpointer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/rawpointer/") + (synopsis "Extra methods for raw pointers") + (description "Extra methods for raw pointers. For example +@code{.post_inc()} and @code{.pre_dec()} (c.f. @code{ptr++} and @code{--ptr}) +and @code{ptrdistance}.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rustc-std-workspace-core (package (name "rust-rustc-std-workspace-core") -- cgit v1.2.3 From 0e4448d138de6099952e0ecb632beb680b48be0c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:10:06 +0300 Subject: gnu: Add rust-permutohedron. * gnu/packages/crates-io.scm (rust-permutohedron): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3bdf1ce0c1..e793bd77eb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -860,6 +860,28 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}. (license (list license:asl2.0 license:expat)))) +(define-public rust-permutohedron + (package + (name "rust-permutohedron") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "permutohedron" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0b1pzh48j86v46wxngch6k1kx9cdw3jr3lwa86gd6jd4bmxzz1xn")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/permutohedron") + (synopsis "Generate permutations of sequences") + (description + "Generate permutations of sequences. Either lexicographical order +permutations, or a minimal swaps permutation sequence implemented using Heap's +algorithm.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-pin-utils (package (name "rust-pin-utils") -- cgit v1.2.3 From b9d061a925f48afc9a53aae0388f77ebd7f9fc7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:12:15 +0300 Subject: gnu: Add rust-pkg-config. * gnu/packages/crates-io.scm (rust-pkg-config): New variable. --- gnu/packages/crates-io.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e793bd77eb..52b2e94037 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22,7 +22,8 @@ #:use-module (guix build-system cargo) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (gnu packages pkg-config)) ;;; ;;; Please: Try to add new module packages in alphabetic order. @@ -901,6 +902,32 @@ algorithm.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pkg-config + (package + (name "rust-pkg-config") + (version "0.3.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "pkg-config" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "135ia995lqzr0gxpk85h0bjxf82kj6hbxdx924sh9jdln6r8wvk7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static)))) + (inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/alexcrichton/pkg-config-rs") + (synopsis "Library to run the pkg-config system tool") + (description + "A library to run the pkg-config system tool at build time in order to be +used in Cargo build scripts.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-plain (package (name "rust-plain") -- cgit v1.2.3 From d791d309c643986388fbd9e127a577995701fb7c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:17:10 +0300 Subject: gnu: Add rust-regex-syntax. * gnu/packages/crates-io.scm (rust-regex-syntax): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 52b2e94037..81001024ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1075,6 +1075,29 @@ and @code{ptrdistance}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-regex-syntax + (package + (name "rust-regex-syntax") + (version "0.6.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex-syntax" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p47lf38yj2g2fnmvnraccqlxwk35zr76hlnqi8yva932nzqam6d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ucd-util" ,rust-ucd-util)))) + (home-page "https://github.com/rust-lang/regex") + (synopsis "Regular expression parser") + (description + "This package provides a regular expression parser.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rustc-std-workspace-core (package (name "rust-rustc-std-workspace-core") -- cgit v1.2.3 From b3038b3826e4b4a6fc1e479ec4cc20a2263866f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:20:13 +0300 Subject: gnu: Add rust-safemem. * gnu/packages/crates-io.scm (rust-safemem): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 81001024ee..3589e8291a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1118,6 +1118,26 @@ rust-lang/rust integration.") (license (list license:asl2.0 license:expat)))) +(define-public rust-safemem + (package + (name "rust-safemem") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "safemem" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1l1ljkm4lpyryrv2ndaxi1f7z1f3v9bwy1rzl9f9mbhx04iq9c6j")))) + (build-system cargo-build-system) + (home-page "https://github.com/abonander/safemem") + (synopsis "Safe wrappers for memory-accessing functions") + (description + "Safe wrappers for memory-accessing functions, like @code{std::ptr::copy()}.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-scoped-tls (package (name "rust-scoped-tls") -- cgit v1.2.3 From 24848450190effbf08204df6b926dea59e6873ce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:21:33 +0300 Subject: gnu: Add rust-same-file. * gnu/packages/crates-io.scm (rust-same-file): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3589e8291a..5b5b12e392 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1138,6 +1138,30 @@ rust-lang/rust integration.") (license (list license:asl2.0 license:expat)))) +(define-public rust-same-file + (package + (name "rust-same-file") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "same-file" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08a4zy10pjindf2rah320s6shgswk13mqw7s61m8i1y1xpf8spjq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi-util" ,rust-winapi-util)))) + (home-page "https://github.com/BurntSushi/same-file") + (synopsis "Determine whether two file paths point to the same file") + (description + "This package provides a simple crate for determining whether two file +paths point to the same file.") + (license (list license:unlicense + license:expat)))) + (define-public rust-scoped-tls (package (name "rust-scoped-tls") -- cgit v1.2.3 From 663c69855a8b33a6f06051de08337c16a1788c1a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:22:49 +0300 Subject: gnu: Add rust-schannel. * gnu/packages/crates-io.scm (rust-schannel): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b5b12e392..e83322449a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1162,6 +1162,30 @@ paths point to the same file.") (license (list license:unlicense license:expat)))) +(define-public rust-schannel + (package + (name "rust-schannel") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "schannel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0f9k4pm8yc3z0n1n8hazvnrvg52f0sfxjc91bhf3r76rb3rapxpj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static) + ("rust-winapi" ,rust-winapi)))) + (home-page "https://github.com/steffengy/schannel-rs") + (synopsis "Rust bindings to the Windows SChannel APIs") + (description + "Rust bindings to the Windows SChannel APIs providing TLS client and +server functionality.") + (license license:expat))) + (define-public rust-scoped-tls (package (name "rust-scoped-tls") -- cgit v1.2.3 From 997a0ab548b37012b33f8c329aa386cb3fb77a87 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:23:29 +0300 Subject: gnu: Add rust-scoped-tls-0.1. * gnu/packages/crates-io.scm (rust-scoped-tls-0.1): New variable. --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e83322449a..506e2748cc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1207,6 +1207,20 @@ library's old @code{scoped_thread_local!} macro for providing scoped access to (license (list license:asl2.0 license:expat)))) +(define-public rust-scoped-tls-0.1 + (package + (inherit rust-scoped-tls) + (name "rust-scoped-tls") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "scoped-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a2bn9d2mb07c6l16sadijy4p540g498zddfxyiq4rsqpwrglbrk")))))) + (define-public rust-scopeguard (package (name "rust-scopeguard") -- cgit v1.2.3 From bb90286d1e3946732b0ce986cb7ff8e80fae6a0b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:24:07 +0300 Subject: gnu: Add rust-scopeguard-0.3. * gnu/packages/crates-io.scm (rust-scopeguard-0.3): New variable. --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 506e2748cc..6e77cad2de 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1244,6 +1244,21 @@ with one of the implemented strategies.") (license (list license:asl2.0 license:expat)))) +(define-public rust-scopeguard-0.3 + (package + (inherit rust-scopeguard) + (name "rust-scopeguard") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "scopeguard" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) + (define-public rust-semver-parser (package (name "rust-semver-parser") -- cgit v1.2.3 From d2a6bff06b34505cf788f67afeb321381f0c8031 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:25:54 +0300 Subject: gnu: Add rust-security-framework-sys. * gnu/packages/crates-io.scm (rust-security-framework-sys): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6e77cad2de..acb4873939 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1259,6 +1259,30 @@ with one of the implemented strategies.") (base32 "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) +(define-public rust-security-framework-sys + (package + (name "rust-security-framework-sys") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mlsakq9kmqyc0fg2hcbgm6rjk55mb0rhjw2wid3hqdzkjcghdln")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-core-foundation-sys" + ,rust-core-foundation-sys)))) + (home-page "https://lib.rs/crates/security-framework-sys") + (synopsis "Apple `Security.framework` low-level FFI bindings") + (description + "Apple `Security.framework` low-level FFI bindings.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-semver-parser (package (name "rust-semver-parser") -- cgit v1.2.3 From 9951b78e4472a9539d9ed6980ff61f007e544cb1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:28:54 +0300 Subject: gnu: Add rust-stable-deref-trait. * gnu/packages/crates-io.scm (rust-stable-deref-trait): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index acb4873939..b26967b3df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1361,6 +1361,30 @@ spinning. They may contain data, are usable without @code{std},and static initializers are available.") (license license:expat))) +(define-public rust-stable-deref-trait + (package + (name "rust-stable-deref-trait") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "stable_deref_trait" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j2lkgakksmz4vc5hfawcch2ipiskrhjs1sih0f3br7s7rys58fv")))) + (build-system cargo-build-system) + (home-page "https://github.com/storyyeller/stable_deref_trait0") + (synopsis "Defines an unsafe marker trait, StableDeref") + (description + "This crate defines an unsafe marker trait, StableDeref, for container +types which deref to a fixed address which is valid even when the containing +type is moved. For example, Box, Vec, Rc, Arc and String implement this trait. +Additionally, it defines CloneStableDeref for types like Rc where clones deref +to the same address.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-stdweb-internal-runtime (package (name "rust-stdweb-internal-runtime") -- cgit v1.2.3 From b601085d1cf6d3cb305fcb4531a26f92767dbaf4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:30:21 +0300 Subject: gnu: Add rust-stdweb-internal-test-macro. * gnu/packages/crates-io.scm (rust-stdweb-internal-test-macro): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b26967b3df..1609e9544e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1405,6 +1405,30 @@ crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-stdweb-internal-test-macro + (package + (name "rust-stdweb-internal-test-macro") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "stdweb-internal-test-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12rrm7p77xnm3xacgn3rgniiyyjb4gq7902wpbljsvbx045z69l2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2) + ("rust-quote" ,rust-quote)))) + (home-page "https://github.com/koute/stdweb") + (synopsis "Internal crate of the `stdweb` crate") + (description + "Internal crate of the @code{stdweb} crate.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-strsim (package (name "rust-strsim") -- cgit v1.2.3 From 588596247dd6bb9b81cd9b17af9467f4810c08a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:31:54 +0300 Subject: gnu: rust-num-traits: Change inputs. * gnu/packages/crates-io.scm (rust-num-traits)[arguments]: Move rust-autocfg from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1609e9544e..cb3ad99bf6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -810,7 +810,7 @@ types as proposed in RFC 1158.") "0clvrm34rrqc8p6gq5ps5fcgws3kgq5knh7nlqxf2ayarwks9abb")))) (build-system cargo-build-system) (arguments - `(#:cargo-development-inputs + `(#:cargo-inputs (("rust-autocfg" ,rust-autocfg)))) (home-page "https://github.com/rust-num/num-traits") (synopsis "Numeric traits for generic mathematics") -- cgit v1.2.3 From bfd6150ea841646a5636f164f179a29dbbf63b88 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:32:20 +0300 Subject: gnu: Add rust-streaming-stats. * gnu/packages/crates-io.scm (rust-streaming-stats): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb3ad99bf6..b54d87ea12 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1429,6 +1429,29 @@ crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-streaming-stats + (package + (name "rust-streaming-stats") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "streaming-stats" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0l7xz4g6709s80zqpvlhrg0qhgz64r94cwhmfsg8xhabgznbp2px")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits)))) + (home-page "https://github.com/BurntSushi/rust-stats") + (synopsis "Compute basic statistics on streams") + (description + "Experimental crate for computing basic statistics on streams.") + (license (list license:unlicense + license:expat)))) + (define-public rust-strsim (package (name "rust-strsim") -- cgit v1.2.3 From 0583bd635398bfed6d8066ebaff926f792359bb5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:35:14 +0300 Subject: gnu: Add rust-termcolor. * gnu/packages/crates-io.scm (rust-termcolor): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b54d87ea12..c389fc80c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1491,6 +1491,29 @@ and Jaro-Winkler.") "This package provides helper test traits for synstructure doctests.") (license license:expat))) +(define-public rust-termcolor + (package + (name "rust-termcolor") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "termcolor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vjfsn1a8zvqhnrbygrz1id6yckwv1dncw3w4zj65qdx0f00kmln")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-wincolor" ,rust-wincolor)))) + (home-page "https://github.com/BurntSushi/termcolor") + (synopsis "Library for writing colored text to a terminal") + (description "This package provides a simple cross platform library for +writing colored text to a terminal.") + (license (list license:unlicense + license:expat)))) + (define-public rust-termios (package (name "rust-termios") -- cgit v1.2.3 From d154192fa99ebb10ee25ef9f53df8960a49d5c8c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:36:16 +0300 Subject: gnu: Add rust-thread-local. * gnu/packages/crates-io.scm (rust-thread-local): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c389fc80c9..1c53d80c0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1538,6 +1538,28 @@ bindings are a small wrapper around the raw C functions, which converts integer return values to @code{std::io::Result} to indicate success or failure.") (license license:expat))) +(define-public rust-thread-local + (package + (name "rust-thread-local") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "thread_local" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06rzik99p8c5js8238yhc8rk6np543ylb1dy9nrw5v80j0r3xdf6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static)))) + (home-page "https://github.com/Amanieu/thread_local-rs") + (synopsis "Per-object thread-local storage") + (description "Per-object thread-local storage") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From de72b804f1786e75f0da00c32f43708a8ca96ee0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:37:50 +0300 Subject: gnu: Add rust-threadpool. * gnu/packages/crates-io.scm (rust-threadpool): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1c53d80c0b..0045414077 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1560,6 +1560,30 @@ return values to @code{std::io::Result} to indicate success or failure.") (license (list license:asl2.0 license:expat)))) +(define-public rust-threadpool + (package + (name "rust-threadpool") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "threadpool" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rd89n1q7vy47w4c32cnynibffv9kj3jy3dwr0536n9lbw5ckw72")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-cpus" ,rust-num-cpus)))) + (home-page "https://github.com/rust-threadpool/rust-threadpool") + (synopsis "Thread pool for running jobs on a fixed set of worker threads") + (description + "This package provides a thread pool for running a number of jobs on a +fixed set of worker threads.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From 9248ad6db26fdfd600894820463d6264c5584f67 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:39:11 +0300 Subject: gnu: Add rust-tokio-mock-task. * gnu/packages/crates-io.scm (rust-tokio-mock-task): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0045414077..3a906af89a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1584,6 +1584,26 @@ fixed set of worker threads.") (license (list license:asl2.0 license:expat)))) +(define-public rust-tokio-mock-task + (package + (name "rust-tokio-mock-task") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-mock-task" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1y7q83qfk9ljjfvs82b453pmz9x1v3d6kr4x55j8mal01s6790dw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-futures" ,rust-futures)))) + (home-page "https://github.com/carllerche/tokio-mock-task") + (synopsis "Mock a Tokio task") + (description "Mock a Tokio task") + (license license:expat))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From 07a7cd18849b2bc3602a0699f06f445ffb371315 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:40:36 +0300 Subject: gnu: Add rust-tracing-core. * gnu/packages/crates-io.scm (rust-tracing-core): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3a906af89a..2f9608750c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1604,6 +1604,29 @@ fixed set of worker threads.") (description "Mock a Tokio task") (license license:expat))) +(define-public rust-tracing-core + (package + (name "rust-tracing-core") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tracing-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01fa73wzw2m5ybi3kkd52dgrw97mgc3i6inmhwys46ab28giwnxi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static)))) + (home-page "https://tokio.rs") + (synopsis "Core primitives for application-level tracing") + (description + "Core primitives for application-level tracing.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From ea1c425569618c8a47601c9436c08c042c13f57f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:41:38 +0300 Subject: gnu: Add rust-traitobject. * gnu/packages/crates-io.scm (rust-traitobject): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2f9608750c..58e6319588 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1627,6 +1627,25 @@ fixed set of worker threads.") (license (list license:asl2.0 license:expat)))) +(define-public rust-traitobject + (package + (name "rust-traitobject") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "traitobject" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yb0n8822mr59j200fyr2fxgzzgqljyxflx9y8bdy3rlaqngilgg")))) + (build-system cargo-build-system) + (home-page "https://github.com/reem/rust-traitobject.git") + (synopsis "Unsafe helpers for dealing with raw trait objects") + (description "Unsafe helpers for dealing with raw trait objects.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From efc244c53b29cec558562a3b6f26dc356771018c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:42:41 +0300 Subject: gnu: Add rust-try-from. * gnu/packages/crates-io.scm (rust-try-from): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58e6319588..5b17399322 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1646,6 +1646,28 @@ fixed set of worker threads.") (license (list license:asl2.0 license:expat)))) +(define-public rust-try-from + (package + (name "rust-try-from") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "try_from" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12wdd4ja7047sd3rx70hv2056hyc8gcdllcx3a41g1rnw64kng98")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if)))) + (home-page "https://github.com/derekjw/try_from") + (synopsis "TryFrom and TryInto traits for failable conversions") + (description + "TryFrom and TryInto traits for failable conversions that return a Result.") + (license license:expat))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From 5a77fcca3fc9c1aab1315797b8e056195308d07a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:43:33 +0300 Subject: gnu: Add rust-try-lock. * gnu/packages/crates-io.scm (rust-try-lock): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b17399322..952c8543b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1668,6 +1668,25 @@ fixed set of worker threads.") "TryFrom and TryInto traits for failable conversions that return a Result.") (license license:expat))) +(define-public rust-try-lock + (package + (name "rust-try-lock") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "try-lock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10p36rx6pqi9d0zr876xa8vksx2m66ha45myakl50rn08dxyn176")))) + (build-system cargo-build-system) + (home-page "https://github.com/seanmonstar/try-lock") + (synopsis "Lightweight atomic lock") + (description + "This package provides a lightweight atomic lock.") + (license license:expat))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From ce71b229ec683c263d91300a89893ff0fb9b6a9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:44:39 +0300 Subject: gnu: Add rust-typeable. * gnu/packages/crates-io.scm (rust-typeable): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 952c8543b1..9ae372fb70 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1687,6 +1687,24 @@ fixed set of worker threads.") "This package provides a lightweight atomic lock.") (license license:expat))) +(define-public rust-typeable + (package + (name "rust-typeable") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "typeable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11w8dywgnm32hb291izjvh4zjd037ccnkk77ahk63l913zwzc40l")))) + (build-system cargo-build-system) + (home-page "https://github.com/reem/rust-typeable") + (synopsis "Exposes Typeable, for getting TypeIds at runtime") + (description "Exposes Typeable, for getting TypeIds at runtime.") + (license license:expat))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From 2f19d329794816bfab63f24695d3bd3d37d6cac0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:46:28 +0300 Subject: gnu: Add rust-ucd-trie. * gnu/packages/crates-io.scm (rust-ucd-trie): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9ae372fb70..436a84712f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1727,6 +1727,29 @@ implementation is incomplete.") (license (list license:asl2.0 license:expat)))) +(define-public rust-ucd-trie + (package + (name "rust-ucd-trie") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "ucd-trie" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static)))) + (home-page "https://github.com/BurntSushi/ucd-generate") + (synopsis "Trie for storing Unicode codepoint sets and maps") + (description + "This package provides a trie for storing Unicode codepoint sets and maps.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-ucd-util (package (name "rust-ucd-util") -- cgit v1.2.3 From 6da1f9c6deb3741ca7d6e9b758aeee1677b957a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:47:54 +0300 Subject: gnu: Add rust-untrusted. * gnu/packages/crates-io.scm (rust-untrusted): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 436a84712f..1b9127b147 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1832,6 +1832,26 @@ whitespace from a string.") (license (list license:asl2.0 license:expat)))) +(define-public rust-untrusted + (package + (name "rust-untrusted") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "untrusted" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kmfykcwif6ashkwg54gcnhxj03kpba2i9vc7z5rpr0xlgvrwdk0")))) + (build-system cargo-build-system) + (home-page "https://github.com/briansmith/untrusted") + (synopsis "Zero-allocation parsing of untrusted inputs in Rust") + (description + "Safe, fast, zero-panic, zero-crashing, zero-allocation parsing of +untrusted inputs in Rust.") + (license license:isc))) + (define-public rust-wasi (package (name "rust-wasi") -- cgit v1.2.3 From 8aa60ffe8d67c64b68180ce345492318260ca58b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:49:58 +0300 Subject: gnu: Add rust-version-check. * gnu/packages/crates-io.scm (rust-verison-check): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1b9127b147..bd57282364 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1852,6 +1852,30 @@ whitespace from a string.") untrusted inputs in Rust.") (license license:isc))) +(define-public rust-version-check + (package + (name "rust-version-check") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "version_check" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7")))) + (build-system cargo-build-system) + (home-page "https://github.com/SergioBenitez/version_check") + (synopsis "Check that the installed rustc meets some version requirements") + (description + "This tiny crate checks that the running or installed rustc meets some +version requirements. The version is queried by calling the Rust compiler with +@code{--version}. The path to the compiler is determined first via the +@code{RUSTC} environment variable. If it is not set, then @code{rustc} is used. +If that fails, no determination is made, and calls return None.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-wasi (package (name "rust-wasi") -- cgit v1.2.3 From af72ed1696f1c09ec5ecbf8c138a5fc52e2cdd42 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:50:48 +0300 Subject: gnu: Add rust-void. * gnu/packages/crates-io.scm (rust-void): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bd57282364..c3a7d9cfcc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1876,6 +1876,25 @@ If that fails, no determination is made, and calls return None.") (license (list license:asl2.0 license:expat)))) +(define-public rust-void + (package + (name "rust-void") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "void" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka")))) + (build-system cargo-build-system) + (home-page "https://github.com/reem/rust-void.git") + (synopsis "Void type for use in statically impossible cases") + (description + "The uninhabited void type for use in statically impossible cases.") + (license license:expat))) + (define-public rust-wasi (package (name "rust-wasi") -- cgit v1.2.3 From c6deb680e263b637a27fc6cc7782fdbf5485623e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Aug 2019 16:51:58 +0300 Subject: gnu: Add rust-walkdir. * gnu/packages/crates-io.scm (rust-walkdir): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c3a7d9cfcc..80f3fae513 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1895,6 +1895,32 @@ If that fails, no determination is made, and calls return None.") "The uninhabited void type for use in statically impossible cases.") (license license:expat))) +(define-public rust-walkdir + (package + (name "rust-walkdir") + (version "2.2.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "walkdir" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07ppalpvxkf8cnqr64np422792y4z5bs9m8b4nrflh5rm17wjn4n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-same-file" ,rust-same-file) + ("rust-winapi" ,rust-winapi) + ("rust-winapi-util" ,rust-winapi-util)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment)))) + (home-page "https://github.com/BurntSushi/walkdir") + (synopsis "Recursively walk a directory") + (description "Recursively walk a directory.") + (license (list license:unlicense + license:expat)))) + (define-public rust-wasi (package (name "rust-wasi") -- cgit v1.2.3 From b8815c5ec4ee70c535693031072447671c1b781f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 11:10:55 +0200 Subject: swh: 'swh-download' prints debugging info. * guix/git-download.scm (git-fetch): Print a message before calling 'swh-download'. * guix/swh.scm (swh-download): Add #:log-port. Write debugging messages to LOG-PORT. --- guix/git-download.scm | 7 +++++-- guix/swh.scm | 12 ++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/guix/git-download.scm b/guix/git-download.scm index 8f84681d46..c62bb8ad0f 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -139,8 +139,11 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." ;; As a last resort, attempt to download from Software Heritage. ;; XXX: Currently recursive checkouts are not supported. (and (not recursive?) - (swh-download (getenv "git url") (getenv "git commit") - #$output))))))) + (begin + (format (current-error-port) + "Trying to download from Software Heritage...~%") + (swh-download (getenv "git url") (getenv "git commit") + #$output)))))))) (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "git-checkout") build diff --git a/guix/swh.scm b/guix/swh.scm index 1c416c8dd5..b72d1c311e 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -533,7 +533,8 @@ delete it when leaving the dynamic extent of this call." (lambda () (false-if-exception (delete-file-recursively tmp-dir)))))) -(define (swh-download url reference output) +(define* (swh-download url reference output + #:key (log-port (current-error-port))) "Download from Software Heritage a checkout of the Git tag or commit REFERENCE originating from URL, and unpack it in OUTPUT. Return #t on success and #f on failure. @@ -545,10 +546,17 @@ wait until it becomes available, which could take several minutes." (lookup-revision reference) (lookup-origin-revision url reference)) ((? revision? revision) + (format log-port "SWH: found revision ~a with directory at '~a'~%" + (revision-id revision) + (swh-url (revision-directory-url revision))) (call-with-temporary-directory (lambda (directory) - (match (vault-fetch (revision-directory revision) 'directory) + (match (vault-fetch (revision-directory revision) 'directory + #:log-port log-port) (#f + (format log-port + "SWH: directory ~a could not be fetched from the vault~%" + (revision-directory revision)) #f) ((? port? input) (let ((tar (open-pipe* OPEN_WRITE "tar" "-C" directory "-xzvf" "-"))) -- cgit v1.2.3 From 8146c48632d39670afa7a8ec08a8891cc78d2b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 11:31:18 +0200 Subject: swh: Correctly handle visits without a snapshot. As discussed at . * guix/swh.scm (string*): New procedure. ()[snapshot-url]: Pass 'string*' as the conversion procedure. [status]: Pass 'string->symbol' as the conversion procedure. (visit-snapshot): Return #f when 'visit-snapshot-url' returns #f. (lookup-origin-revision): Filter to visits for which 'visit-snapshot-url' is true. --- guix/swh.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index b72d1c311e..c253e217da 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -190,6 +190,12 @@ Software Heritage." (ref 10)))))) str)) ;oops! +(define string* + ;; Converts "string or #nil" coming from JSON to "string or #f". + (match-lambda + ((? string? str) str) + ((? null?) #f))) + (define* (call url decode #:optional (method http-get) #:key (false-if-404? #t)) "Invoke the endpoint at URL using METHOD. Decode the resulting JSON body @@ -239,8 +245,8 @@ FALSE-IF-404? is true, return #f upon 404 responses." (date visit-date "date" string->date*) (origin visit-origin) (url visit-url "origin_visit_url") - (snapshot-url visit-snapshot-url "snapshot_url") - (status visit-status) + (snapshot-url visit-snapshot-url "snapshot_url" string*) ;string | #f + (status visit-status "status" string->symbol) ;'full | 'partial | 'ongoing (number visit-number "visit")) ;; @@ -378,9 +384,11 @@ FALSE-IF-404? is true, return #f upon 404 responses." (map json->visit (vector->list (json->scm port)))))) (define (visit-snapshot visit) - "Return the snapshot corresponding to VISIT." - (call (swh-url (visit-snapshot-url visit)) - json->snapshot)) + "Return the snapshot corresponding to VISIT or #f if no snapshot is +available." + (and (visit-snapshot-url visit) + (call (swh-url (visit-snapshot-url visit)) + json->snapshot))) (define (branch-target branch) "Return the target of BRANCH, either a or a ." @@ -396,7 +404,7 @@ FALSE-IF-404? is true, return #f upon 404 responses." "Return a corresponding to the given TAG for the repository coming from URL. Example: - (lookup-origin-release \"https://github.com/guix-mirror/guix/\" \"v0.8\") + (lookup-origin-revision \"https://github.com/guix-mirror/guix/\" \"v0.8\") => #< id: \"44941…\" …> The information is based on the latest visit of URL available. Return #f if @@ -404,7 +412,7 @@ URL could not be found." (match (lookup-origin url) (#f #f) (origin - (match (origin-visits origin) + (match (filter visit-snapshot-url (origin-visits origin)) ((visit . _) (let ((snapshot (visit-snapshot visit))) (match (and=> (find (lambda (branch) -- cgit v1.2.3 From 83ac4c099a4c31840d2ddce9febadfa75c692648 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 27 Aug 2019 21:46:26 -0700 Subject: gnu: agda-ial: Fix install step. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/agda.scm (agda-ial): copy library and agdai files when installing. Signed-off-by: Ludovic Courtès --- gnu/packages/agda.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 56d4b15940..c085bfac2e 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -190,7 +190,7 @@ Agda. It also aids the input of Unicode characters."))) (for-each (lambda (file) (make-file-writable file) (install-file file include)) - (find-files "." "\\.agda$")) + (find-files "." "\\.agdai?(-lib)?$")) #t)))))) (synopsis "The Iowa Agda Library") (description -- cgit v1.2.3 From 5416d9a942468d70441515a9a6492be7625fd75c Mon Sep 17 00:00:00 2001 From: John Soo Date: Mon, 12 Aug 2019 08:43:07 -0700 Subject: gnu: Add cedille. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cedille.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 + gnu/packages/cedille.scm | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 gnu/packages/cedille.scm diff --git a/gnu/local.mk b/gnu/local.mk index d539c3c85b..797936d2fd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -21,6 +21,7 @@ # Copyright © 2018 Stefan Stefanović # Copyright © 2018 Maxim Cournoyer # Copyright © 2019 Guillaume Le Vaillant +# Copyright © 2019 John Soo # # This file is part of GNU Guix. # @@ -99,6 +100,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/calcurse.scm \ %D%/packages/ccache.scm \ %D%/packages/cdrom.scm \ + %D%/packages/cedille.scm \ %D%/packages/certs.scm \ %D%/packages/check.scm \ %D%/packages/chemistry.scm \ diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm new file mode 100644 index 0000000000..36fa3ae17e --- /dev/null +++ b/gnu/packages/cedille.scm @@ -0,0 +1,124 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 John Soo +;;; +;;; 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 . + +(define-module (gnu packages cedille) + #:use-module (gnu packages) + #:use-module (gnu packages agda) + #:use-module (gnu packages emacs-xyz) + #:use-module (gnu packages haskell) + #:use-module (guix build-system emacs) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public cedille + (package + (name "cedille") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cedille/cedille") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07kv9wncyipfjf5w4ax8h2p35g70zb1qw6zc4afd7c225xia55wp")))) + (inputs + `(("agda" ,agda) + ("agda-ial" ,agda-ial) + ("ghc" ,ghc-8.4) + ("ghc-alex" ,ghc-alex) + ("ghc-happy" ,ghc-happy))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cedille-path-el + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "cedille-mode.el" + (("/usr/share/emacs/site-lisp/cedille-mode") + (string-append + out "/share/emacs/site-lisp/guix.d/cedille-" + ,version))) + #t))) + (add-after 'unpack 'copy-cedille-mode + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lisp + (string-append + out "/share/emacs/site-lisp/guix.d/cedille-" + ,version "/"))) + (mkdir-p (string-append lisp "cedille-mode")) + (copy-recursively + "cedille-mode" + (string-append lisp "cedille-mode")) + (mkdir-p (string-append lisp "se-mode")) + (copy-recursively + "se-mode" + (string-append lisp "se-mode")) + #t))) + ;; FIXME: Byte compilation fails + (delete 'build) + (replace 'check + (lambda _ + (with-directory-excursion "cedille-tests" + (invoke "sh" "run-tests.sh")))) + (add-after 'unpack 'patch-libraries + (lambda _ (patch-shebang "create-libraries.sh") #t)) + (add-after 'unpack 'copy-ial + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively + (string-append (assoc-ref inputs "agda-ial") + "/include/agda/ial") + "ial") + ;; Ambiguous module if main is included from ial + (delete-file "ial/main.agda") + #t)) + (add-after 'check 'build-cedille + ;; Agda has a hard time with parallel compilation + (lambda _ + (invoke "touch" "src/Templates.hs") + (make-file-writable "src/Templates.hs") + (invoke "touch" "src/templates.agda") + (make-file-writable "src/templates.agda") + (invoke "make" "--jobs=1"))) + (add-after 'install 'install-cedille + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively + "lib" (string-append out "/lib/cedille")) + (install-file "cedille" (string-append out "/bin")) + (install-file "core/cedille-core" + (string-append out "/bin")) + #t)))))) + (home-page "https://cedille.github.io/") + (synopsis + "Language based on Calculus of Dependent Lambda Eliminations") + (description + "Cedille is an interactive theorem-prover and dependently typed +programming language, based on extrinsic (aka Curry-style) type theory. This +makes it rather different from type theories like Coq and Agda, which are +intrinsic (aka Church-style). In Cedille, terms are nothing more than +annotated versions of terms of pure untyped lambda calculus. In contrast, in +Coq or Agda, the typing annotations are intrinsic parts of terms. The typing +annotations can only be erased as an optimization under certain conditions, +not by virtue of the definition of the type theory.") + (license license:expat))) -- cgit v1.2.3 From 8f67a76a544a9ff7b60de64d5619a63296c9553e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 17:38:45 +0200 Subject: lint: Log diagnostics with 'info', not 'warning'. * guix/scripts/lint.scm (emit-warnings): Use 'info', not 'warning'. This removes the unhelpful "warning:" prefix that commit 3d33c93cef67d88bdc9409959f3c1f3857af09cf introduced. --- guix/scripts/lint.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index ee1c826d2e..1668d02992 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -46,9 +46,9 @@ (lambda (lint-warning) (let ((package (lint-warning-package lint-warning)) (loc (lint-warning-location lint-warning))) - (warning loc (G_ "~a@~a: ~a~%") - (package-name package) (package-version package) - (lint-warning-message lint-warning)))) + (info loc (G_ "~a@~a: ~a~%") + (package-name package) (package-version package) + (lint-warning-message lint-warning)))) warnings)) (define (run-checkers package checkers) -- cgit v1.2.3 From d229215051b87bfc4657e8416f0e7b87c3ed620e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 18:00:42 +0200 Subject: diagnostics: Avoid highlighting complete messages. * guix/diagnostics.scm (%highlight-argument): Don't highlight ARG if it contains white space. --- guix/diagnostics.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm index 380cfbb613..6c0753aef4 100644 --- a/guix/diagnostics.scm +++ b/guix/diagnostics.scm @@ -71,7 +71,12 @@ is a trivial format string." (define* (%highlight-argument arg #:optional (port (guix-warning-port))) "Highlight ARG, a format string argument, if PORT supports colors." (cond ((string? arg) - (highlight arg port)) + ;; If ARG contains white space, don't highlight it, on the grounds + ;; that it may be a complete message in its own, like those produced + ;; by 'guix lint. + (if (string-any char-set:whitespace arg) + arg + (highlight arg port))) ((symbol? arg) (highlight (symbol->string arg) port)) (else arg))) -- cgit v1.2.3 From 2a5f781e76e2dbacf5b828e7e73a8d9f60e79b60 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 22 Aug 2019 22:53:11 +0200 Subject: gnu: emacs-evil-owl: Update to 0.0.1-2.e8fe5b2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-evil-owl): Update to 0.0.1-2.e8fe5b2. [inputs]: Remove emacs-posframe, which is now an optional dependency. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f684562e58..8fa5f71b9c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6581,8 +6581,8 @@ end of a line and increment or decrement it.") (license license:gpl3+)))) (define-public emacs-evil-owl - (let ((commit "36a5fe057f44d48e377e3ef4f04b4eb30e1af309") - (revision "1")) + (let ((commit "e8fe5b2f745e36db04cb71eb689bf91c5409614f") + (revision "2")) (package (name "emacs-evil-owl") (version (git-version "0.0.1" revision commit)) @@ -6595,11 +6595,10 @@ end of a line and increment or decrement it.") (file-name (git-file-name name version)) (sha256 (base32 - "07a6n0gqss1qx9a50dqzqqq0gj6n7a4ykbcv1a0c9qd4fnfnm90m")))) + "1g7kplna62f271135mnjdbvxk2ayx7m4gvd6l86d2394alx16nhq")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-evil" ,emacs-evil) - ("emacs-posframe" ,emacs-posframe))) + `(("emacs-evil" ,emacs-evil))) (home-page "https://github.com/mamapanda/evil-owl") (synopsis "Preview candidates when using Evil registers and marks") (description -- cgit v1.2.3 From e09c7f4ae4e1c634975874cc18fd65ae4c4af091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 18:51:12 +0200 Subject: remote, ssh: Show the command exit status upon failure. * guix/remote.scm (remote-pipe-for-gexp): Show the exit status in error message. * guix/ssh.scm (remote-inferior): Likewise. --- guix/remote.scm | 12 ++++++++---- guix/ssh.scm | 14 +++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/guix/remote.scm b/guix/remote.scm index d0c3d04a25..c00585de74 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -27,6 +27,7 @@ #:use-module (guix derivations) #:use-module (guix utils) #:use-module (ssh popen) + #:use-module (ssh channel) #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -68,10 +69,13 @@ BECOME-COMMAND is given, use that to invoke the remote Guile REPL." (let ((pipe (apply open-remote-pipe* session OPEN_READ repl-command))) (when (eof-object? (peek-char pipe)) - (raise (condition - (&message - (message (format #f (G_ "failed to run '~{~a~^ ~}'") - repl-command)))))) + (let ((status (channel-get-exit-status pipe))) + (close-port pipe) + (raise (condition + (&message + (message (format #f (G_ "remote command '~{~a~^ ~}' failed \ +with status ~a") + repl-command status))))))) pipe)) (define* (%remote-eval lowered session #:optional become-command) diff --git a/guix/ssh.scm b/guix/ssh.scm index 7bc499a2fe..b6b55bdfcb 100644 --- a/guix/ssh.scm +++ b/guix/ssh.scm @@ -106,14 +106,14 @@ given, use that to invoke the remote Guile REPL." (let* ((repl-command (append (or become-command '()) '("guix" "repl" "-t" "machine"))) (pipe (apply open-remote-pipe* session OPEN_BOTH repl-command))) - ;; XXX: 'channel-get-exit-status' would be better here, but hangs if the - ;; process does succeed. This doesn't reflect the documentation, so it's - ;; possible that it's a bug in guile-ssh. (when (eof-object? (peek-char pipe)) - (raise (condition - (&message - (message (format #f (G_ "failed to run '~{~a~^ ~}'") - repl-command)))))) + (let ((status (channel-get-exit-status pipe))) + (close-port pipe) + (raise (condition + (&message + (message (format #f (G_ "remote command '~{~a~^ ~}' failed \ +with status ~a") + repl-command status))))))) (port->inferior pipe))) (define* (inferior-remote-eval exp session #:optional become-command) -- cgit v1.2.3 From dae950ca50bca57c6d8c5fd8946de5eece614f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 18:51:49 +0200 Subject: deploy: Do not quote error messages. * guix/scripts/deploy.scm (guix-deploy): Do not quote the message. --- guix/scripts/deploy.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 6a67985c8b..329de41143 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -94,7 +94,7 @@ Perform the deployment specified by FILE.\n")) (machine-display-name machine)) (parameterize ((%graft? (assq-ref opts 'graft?))) (guard (c ((message-condition? c) - (report-error (G_ "failed to deploy ~a: '~a'~%") + (report-error (G_ "failed to deploy ~a: ~a~%") (machine-display-name machine) (condition-message c))) ((deploy-error? c) -- cgit v1.2.3 From 3b4eb3ba15db248959f66777a036784ae0afa5f9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 28 Aug 2019 14:03:47 -0400 Subject: gnu: Dovecot: Update to 2.3.7.2 [fixes CVE-2019-11500]. * gnu/packages/mail.scm (dovecot): Update to 2.3.7.2. --- gnu/packages/mail.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index bb3bf2bfb5..30ce5cd70c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1285,7 +1285,7 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.3.6") + (version "2.3.7.2") (source (origin (method url-fetch) @@ -1293,7 +1293,8 @@ facilities for checking incoming mail.") (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "1irnalplb47nlc26dn7zzdi95zhrxxi3miza7p3wdsgapv0qs7gd")))) + (base32 + "0q0jgcv3ni2znkgyhc966ffphj1wk73y76wssh0yciqafs2f0v36")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c55fae452032aa4b1b63406983e9abdf70adc957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 23:56:10 +0200 Subject: gnu: bison-boot0: Build sequentially. This is a followup to 2c35ae82192fd6f1732b15fa41aec87aa61a1879 and b1593c1c4fd8f4fc6df4c43cab51334426e3aa76. * gnu/packages/commencement.scm (bison-boot0)[arguments]: Add #:parallel-build? and #:parallel-tests? on x86. --- gnu/packages/commencement.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 69d1f87605..79f2e49008 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1719,6 +1719,17 @@ exec " gcc "/bin/" program (arguments `(#:tests? #f ;... and thus disable tests + ;; XXX: These flags should be unconditional, but for now + ;; we just add them on x86 to avoid a full rebuild. + ;; TODO: On the next core-updates, use + ;; 'substitute-keyword-arguments' to inherit them from + ;; BISON. + ,@(if (member (%current-system) + '("x86_64-linux" "i686-linux")) + '(#:parallel-build? #f + #:parallel-tests? #f) + '()) + ;; Zero timestamps in liby.a; this must be done ;; explicitly here because the bootstrap Binutils don't ;; do that (default is "cru".) -- cgit v1.2.3 From 54ddd852209a0bd8500dc7dd5775d5dd87a9a017 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 28 Aug 2019 16:48:55 +0200 Subject: import: cran: guix-import-cran: Use (guix import utils). * guix/scripts/import/cran.scm (guix-import-cran): Use PACKAGE->DEFINITION from (guix import utils) instead of custom procedure. --- guix/scripts/import/cran.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm index 794fb710cd..b6592f78a9 100644 --- a/guix/scripts/import/cran.scm +++ b/guix/scripts/import/cran.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier -;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,7 @@ #:use-module (guix utils) #:use-module (guix scripts) #:use-module (guix import cran) + #:use-module (guix import utils) #:use-module (guix scripts import) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) @@ -96,11 +97,7 @@ Import and convert the CRAN package for PACKAGE-NAME.\n")) ((package-name) (if (assoc-ref opts 'recursive) ;; Recursive import - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) + (map package->definition (reverse (stream->list (cran-recursive-import package-name -- cgit v1.2.3 From 3e7a62e2e40fc575d161e4c06ea2e333ab7df3b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Aug 2019 08:04:21 +0200 Subject: services: cuirass: Log web interface to separate file. * gnu/services/cuirass.scm (): Add web-log-file field. (cuirass-shepherd-service): Read it and use it. * doc/guix.texi (Continuous Integration): Document it. --- doc/guix.texi | 3 +++ gnu/services/cuirass.scm | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 707c2ba700..5a64b89086 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21387,6 +21387,9 @@ Data type representing the configuration of Cuirass. @item @code{log-file} (default: @code{"/var/log/cuirass.log"}) Location of the log file. +@item @code{web-log-file} (default: @code{"/var/log/cuirass-web.log"}) +Location of the log file used by the web interface. + @item @code{cache-directory} (default: @code{"/var/cache/cuirass"}) Location of the repository cache. diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 138a5cf67c..7bd43cd427 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Jan Nieuwenhuizen -;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. @@ -52,6 +52,8 @@ (default cuirass)) (log-file cuirass-configuration-log-file ;string (default "/var/log/cuirass.log")) + (web-log-file cuirass-configuration-web-log-file ;string + (default "/var/log/cuirass-web.log")) (cache-directory cuirass-configuration-cache-directory ;string (dir-name) (default "/var/cache/cuirass")) (ttl cuirass-configuration-ttl ;integer @@ -83,6 +85,7 @@ (cuirass-configuration? config) (let ((cuirass (cuirass-configuration-cuirass config)) (cache-directory (cuirass-configuration-cache-directory config)) + (web-log-file (cuirass-configuration-web-log-file config)) (log-file (cuirass-configuration-log-file config)) (user (cuirass-configuration-user config)) (group (cuirass-configuration-group config)) @@ -140,7 +143,7 @@ #:user #$user #:group #$group - #:log-file #$log-file)) + #:log-file #$web-log-file)) (stop #~(make-kill-destructor))))))) (define (cuirass-account config) -- cgit v1.2.3 From df2f8bee101e12ccad785feea86017d0441ff695 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 10:23:58 +0300 Subject: gnu: gnuastro: Update to 0.10. * gnu/packages/astronomy.scm (gnuastro): Update to 0.10. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1160feb553..3aa608ae29 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -120,7 +120,7 @@ header.") (define-public gnuastro (package (name "gnuastro") - (version "0.9") + (version "0.10") (source (origin (method url-fetch) @@ -128,7 +128,7 @@ header.") version ".tar.lz")) (sha256 (base32 - "1c1894ixz3l8p1nmzkysgl9lz8vpqbfw1dd404kh6lvrpml7jzig")))) + "0gmhmh0yddb2aql4hd5ffrr0d4hrmh4pa3yln0n186hslqinp81b")))) (inputs `(("cfitsio" ,cfitsio) ("gsl" ,gsl) -- cgit v1.2.3 From 7cc98992070fc1c1b5c917d855233c2407245ead Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 11:09:19 +0300 Subject: gnu: stow: Update to 2.3.1. * gnu/packages/package-management.scm (stow): Update to 2.3.1. [inputs]: Remove perl-clone, perl-clone-choose, perl-hash-merge. [arguments]: Remove custom 'wrap-stow phase. --- gnu/packages/package-management.scm | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 98be212382..c4254f2aea 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -466,32 +466,17 @@ sub-directory.") (define-public stow (package (name "stow") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/stow/stow-" version ".tar.gz")) (sha256 (base32 - "0h8qr2rxsrkg6d8jxjk68r23jgn1dxdxyp4bnzzinpa8sjhfl905")))) + "0jrxy12ywn7smdzdnvwzjw77l6knx6jkj2rckgykg1dpf6bdkm89")))) (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-stow - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/stow") - `("PERL5LIB" ":" prefix - ,(map (lambda (i) (string-append (assoc-ref inputs i) - "/lib/perl5/site_perl")) - '("perl-clone-choose" "perl-clone" "perl-hash-merge")))) - #t)))))) (inputs - `(("perl" ,perl) - ("perl-clone" ,perl-clone) - ("perl-clone-choose" ,perl-clone-choose) - ("perl-hash-merge" ,perl-hash-merge))) + `(("perl" ,perl))) (native-inputs `(("perl-test-simple" ,perl-test-simple) ("perl-test-output" ,perl-test-output) -- cgit v1.2.3 From ce82e8bf5ba561759f95f610b41a6c0f65766397 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 11:14:56 +0300 Subject: gnu: nano: Update to 4.4. * gnu/packages/nano.scm (nano): Update to 4.4. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 6f79dd49fc..8a3cef3377 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "4.3") + (version "4.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0")))) + (base32 "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From ad553ec4b12f24a0bbd25b547bac885ddb84776a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 28 Aug 2019 00:38:31 +0200 Subject: import: cran: Add support for git repositories. * guix/import/cran.scm (vcs-file?): New procedure. (download): Support downloading from git. (fetch-description): Add a clause for the 'git repository type. (files-match-pattern?): New procedure. (tarball-files-match-pattern?): Implement in terms of FILES-MATCH-PATTERN?. (directory-needs-fortran?, directory-needs-zlib?, directory-needs-pkg-config?): New procedures. (needs-fortran?, needs-zlib?, needs-pkg-config?): Rename these procedures... (tarball-needs-fortran?, tarball-needs-zlib?, tarball-needs-pkg-config?): ...to this, and use them. (file-hash): New procedure. (description->package): Handle the 'git repository type. * guix/import/utils.scm (package->definition): Handle package expression inside of a let. * guix/scripts/import.scm (guix-import): Handle let expressions. * doc/guix.texi (Invoking guix import): Document it. --- doc/guix.texi | 8 ++ guix/import/cran.scm | 254 ++++++++++++++++++++++++++++++++++-------------- guix/import/utils.scm | 5 +- guix/scripts/import.scm | 4 +- 4 files changed, 198 insertions(+), 73 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5a64b89086..a87a8a3d9a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8638,6 +8638,14 @@ R package: guix import cran --archive=bioconductor GenomicRanges @end example +Finally, you can also import R packages that have not yet been published on +CRAN or Bioconductor as long as they are in a git repository. Use +@code{--archive=git} followed by the URL of the git repository: + +@example +guix import cran --archive=git https://github.com/immunogenomics/harmony +@end example + @item texlive @cindex TeX Live @cindex CTAN diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 9c964701b1..51c7ea7b2f 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -24,6 +24,7 @@ #:use-module ((ice-9 rdelim) #:select (read-string read-line)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) + #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (ice-9 receive) @@ -32,11 +33,13 @@ #:use-module (guix http-client) #:use-module (gcrypt hash) #:use-module (guix store) + #:use-module ((guix serialization) #:select (write-file)) #:use-module (guix base32) #:use-module ((guix download) #:select (download-to-store)) #:use-module (guix import utils) #:use-module ((guix build utils) #:select (find-files)) #:use-module (guix utils) + #:use-module (guix git) #:use-module ((guix build-system r) #:select (cran-uri bioconductor-uri)) #:use-module (guix upstream) #:use-module (guix packages) @@ -166,11 +169,25 @@ bioconductor package NAME, or #F if the package is unknown." (bioconductor-packages-list type)) (cut assoc-ref <> "Version"))) +;; XXX taken from (guix scripts hash) +(define (vcs-file? file stat) + (case (stat:type stat) + ((directory) + (member (basename file) '(".bzr" ".git" ".hg" ".svn" "CVS"))) + ((regular) + ;; Git sub-modules have a '.git' file that is a regular text file. + (string=? (basename file) ".git")) + (else + #f))) + ;; Little helper to download URLs only once. (define download (memoize - (lambda (url) - (with-store store (download-to-store store url))))) + (lambda* (url #:optional git) + (with-store store + (if git + (latest-repository-commit store url) + (download-to-store store url)))))) (define (fetch-description repository name) "Return an alist of the contents of the DESCRIPTION file for the R package @@ -211,7 +228,18 @@ from ~s: ~a (~s)~%" (string-append dir "/DESCRIPTION") read-string)) (lambda (meta) (if (boolean? type) meta - (cons `(bioconductor-type . ,type) meta)))))))))))) + (cons `(bioconductor-type . ,type) meta)))))))))) + ((git) + ;; Download the git repository at "NAME" + (call-with-values + (lambda () (download name #t)) + (lambda (dir commit) + (and=> (description->alist (with-input-from-file + (string-append dir "/DESCRIPTION") read-string)) + (lambda (meta) + (cons* `(git . ,name) + `(git-commit . ,commit) + meta)))))))) (define (listify meta field) "Look up FIELD in the alist META. If FIELD contains a comma-separated @@ -256,7 +284,7 @@ empty list when the FIELD cannot be found." (define cran-guix-name (cut guix-name "r-" <>)) -(define (needs-fortran? tarball) +(define (tarball-needs-fortran? tarball) "Check if the TARBALL contains Fortran source files." (define (check pattern) (parameterize ((current-error-port (%make-void-port "rw+")) @@ -266,69 +294,127 @@ empty list when the FIELD cannot be found." (check "*.f95") (check "*.f"))) +(define (directory-needs-fortran? dir) + "Check if the directory DIR contains Fortran source files." + (match (find-files dir "\\.f(90|95)?") + (() #f) + (_ #t))) + +(define (needs-fortran? thing tarball?) + "Check if the THING contains Fortran source files." + (if tarball? + (tarball-needs-fortran? thing) + (directory-needs-fortran? thing))) + +(define (files-match-pattern? directory regexp . file-patterns) + "Return #T if any of the files matching FILE-PATTERNS in the DIRECTORY match +the given REGEXP." + (let ((pattern (make-regexp regexp))) + (any (lambda (file) + (call-with-input-file file + (lambda (port) + (let loop () + (let ((line (read-line port))) + (cond + ((eof-object? line) #f) + ((regexp-exec pattern line) #t) + (else (loop)))))))) + (apply find-files directory file-patterns)))) + (define (tarball-files-match-pattern? tarball regexp . file-patterns) "Return #T if any of the files represented by FILE-PATTERNS in the TARBALL match the given REGEXP." (call-with-temporary-directory (lambda (dir) - (let ((pattern (make-regexp regexp))) - (parameterize ((current-error-port (%make-void-port "rw+"))) - (apply system* "tar" - "xf" tarball "-C" dir - `("--wildcards" ,@file-patterns))) - (any (lambda (file) - (call-with-input-file file - (lambda (port) - (let loop () - (let ((line (read-line port))) - (cond - ((eof-object? line) #f) - ((regexp-exec pattern line) #t) - (else (loop)))))))) - (find-files dir)))))) - -(define (needs-zlib? tarball) + (parameterize ((current-error-port (%make-void-port "rw+"))) + (apply system* "tar" + "xf" tarball "-C" dir + `("--wildcards" ,@file-patterns))) + (files-match-pattern? dir regexp)))) + +(define (directory-needs-zlib? dir) + "Return #T if any of the Makevars files in the src directory DIR contain a +zlib linker flag." + (files-match-pattern? dir "-lz" "(Makevars.*|configure.*)")) + +(define (tarball-needs-zlib? tarball) "Return #T if any of the Makevars files in the src directory of the TARBALL contain a zlib linker flag." (tarball-files-match-pattern? tarball "-lz" "*/src/Makevars*" "*/src/configure*" "*/configure*")) -(define (needs-pkg-config? tarball) +(define (needs-zlib? thing tarball?) + "Check if the THING contains files indicating a dependency on zlib." + (if tarball? + (tarball-needs-zlib? thing) + (directory-needs-zlib? thing))) + +(define (directory-needs-pkg-config? dir) + "Return #T if any of the Makevars files in the src directory DIR reference +the pkg-config tool." + (files-match-pattern? dir "pkg-config" + "(Makevars.*|configure.*)")) + +(define (tarball-needs-pkg-config? tarball) "Return #T if any of the Makevars files in the src directory of the TARBALL reference the pkg-config tool." (tarball-files-match-pattern? tarball "pkg-config" "*/src/Makevars*" "*/src/configure*" "*/configure*")) +(define (needs-pkg-config? thing tarball?) + "Check if the THING contains files indicating a dependency on pkg-config." + (if tarball? + (tarball-needs-pkg-config? thing) + (directory-needs-pkg-config? thing))) + +;; XXX adapted from (guix scripts hash) +(define (file-hash file select? recursive?) + ;; Compute the hash of FILE. + (if recursive? + (let-values (((port get-hash) (open-sha256-port))) + (write-file file port #:select? select?) + (force-output port) + (get-hash)) + (call-with-input-file file port-sha256))) + (define (description->package repository meta) "Return the `package' s-expression for an R package published on REPOSITORY from the alist META, which was derived from the R package's DESCRIPTION file." (let* ((base-url (case repository ((cran) %cran-url) - ((bioconductor) %bioconductor-url))) + ((bioconductor) %bioconductor-url) + ((git) #f))) (uri-helper (case repository ((cran) cran-uri) - ((bioconductor) bioconductor-uri))) + ((bioconductor) bioconductor-uri) + ((git) #f))) (name (assoc-ref meta "Package")) (synopsis (assoc-ref meta "Title")) (version (assoc-ref meta "Version")) (license (string->license (assoc-ref meta "License"))) ;; Some packages have multiple home pages. Some have none. - (home-page (match (listify meta "URL") - ((url rest ...) url) - (_ (string-append base-url name)))) - (source-url (match (apply uri-helper name version - (case repository - ((bioconductor) - (list (assoc-ref meta 'bioconductor-type))) - (else '()))) - ((url rest ...) url) - ((? string? url) url) - (_ #f))) - (tarball (download source-url)) + (home-page (case repository + ((git) (assoc-ref meta 'git)) + (else (match (listify meta "URL") + ((url rest ...) url) + (_ (string-append base-url name)))))) + (source-url (case repository + ((git) (assoc-ref meta 'git)) + (else + (match (apply uri-helper name version + (case repository + ((bioconductor) + (list (assoc-ref meta 'bioconductor-type))) + (else '()))) + ((url rest ...) url) + ((? string? url) url) + (_ #f))))) + (git? (assoc-ref meta 'git)) + (source (download source-url git?)) (sysdepends (append - (if (needs-zlib? tarball) '("zlib") '()) + (if (needs-zlib? source (not git?)) '("zlib") '()) (filter (lambda (name) (not (member name invalid-packages))) (map string-downcase (listify meta "SystemRequirements"))))) @@ -339,41 +425,67 @@ from the alist META, which was derived from the R package's DESCRIPTION file." (listify meta "Imports") (listify meta "LinkingTo") (delete "R" - (listify meta "Depends")))))) + (listify meta "Depends"))))) + (package + `(package + (name ,(cran-guix-name name)) + (version ,(case repository + ((git) + `(git-version ,version revision commit)) + (else version))) + (source (origin + (method ,(if git? + 'git-fetch + 'url-fetch)) + (uri ,(case repository + ((git) + `(git-reference + (url ,(assoc-ref meta 'git)) + (commit commit))) + (else + `(,(procedure-name uri-helper) ,name version + ,@(or (and=> (assoc-ref meta 'bioconductor-type) + (lambda (type) + (list (list 'quote type)))) + '()))))) + ,@(if git? + '((file-name (git-file-name name version))) + '()) + (sha256 + (base32 + ,(bytevector->nix-base32-string + (case repository + ((git) + (file-hash source (negate vcs-file?) #t)) + (else (file-sha256 source)))))))) + ,@(if (not (and git? + (equal? (string-append "r-" name) + (cran-guix-name name)))) + `((properties ,`(,'quasiquote ((,'upstream-name . ,name))))) + '()) + (build-system r-build-system) + ,@(maybe-inputs sysdepends) + ,@(maybe-inputs (map cran-guix-name propagate) 'propagated-inputs) + ,@(maybe-inputs + `(,@(if (needs-fortran? source (not git?)) + '("gfortran") '()) + ,@(if (needs-pkg-config? source (not git?)) + '("pkg-config") '())) + 'native-inputs) + (home-page ,(if (string-null? home-page) + (string-append base-url name) + home-page)) + (synopsis ,synopsis) + (description ,(beautify-description (or (assoc-ref meta "Description") + ""))) + (license ,license)))) (values - `(package - (name ,(cran-guix-name name)) - (version ,version) - (source (origin - (method url-fetch) - (uri (,(procedure-name uri-helper) ,name version - ,@(or (and=> (assoc-ref meta 'bioconductor-type) - (lambda (type) - (list (list 'quote type)))) - '()))) - (sha256 - (base32 - ,(bytevector->nix-base32-string (file-sha256 tarball)))))) - ,@(if (not (equal? (string-append "r-" name) - (cran-guix-name name))) - `((properties ,`(,'quasiquote ((,'upstream-name . ,name))))) - '()) - (build-system r-build-system) - ,@(maybe-inputs sysdepends) - ,@(maybe-inputs (map cran-guix-name propagate) 'propagated-inputs) - ,@(maybe-inputs - `(,@(if (needs-fortran? tarball) - '("gfortran") '()) - ,@(if (needs-pkg-config? tarball) - '("pkg-config") '())) - 'native-inputs) - (home-page ,(if (string-null? home-page) - (string-append base-url name) - home-page)) - (synopsis ,synopsis) - (description ,(beautify-description (or (assoc-ref meta "Description") - ""))) - (license ,license)) + (case repository + ((git) + `(let ((commit ,(assoc-ref meta 'git-commit)) + (revision "1")) + ,package)) + (else package)) propagate))) (define cran->guix-package diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 2a3b7341fb..252875eeab 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2016 David Craven -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2019 Robert Vollmert ;;; @@ -251,6 +251,9 @@ package definition." (define (package->definition guix-package) (match guix-package (('package ('name (? string? name)) _ ...) + `(define-public ,(string->symbol name) + ,guix-package)) + (('let anything ('package ('name (? string? name)) _ ...)) `(define-public ,(string->symbol name) ,guix-package)))) diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index 0b326e1049..c6cc93fad8 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès ;;; Copyright © 2014 David Thompson ;;; Copyright © 2018 Kyle Meyer +;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,7 +114,8 @@ Run IMPORTER with ARGS.\n")) (pretty-print expr (newline-rewriting-port (current-output-port)))))) (match (apply (resolve-importer importer) args) - ((and expr ('package _ ...)) + ((and expr (or ('package _ ...) + ('let _ ...))) (print expr)) ((? list? expressions) (for-each (lambda (expr) -- cgit v1.2.3 From 711cec9d154786e995ba104bceb39a2564d5c72f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 28 Aug 2019 00:38:46 +0200 Subject: gnu: Add r-harmony. * gnu/packages/cran.scm (r-harmony): New variable. --- gnu/packages/cran.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae8e9c5a47..458b141f91 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15097,3 +15097,42 @@ datasets, developed and maintained by the Macosko lab. It relies on integrative non-negative matrix factorization to identify shared and dataset-specific factors.") (license license:gpl3))) + +(define-public r-harmony + ;; There are no tagged commits + (let ((commit "4d1653870d4dd70fff1807c182882db1fbf9af5a") + (revision "1")) + (package + (name "r-harmony") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/immunogenomics/harmony") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gasdldr4aalr9h2q9kmm3y4i7azkgnhdn4bmvsszs7lg9xacw85")))) + (build-system r-build-system) + (propagated-inputs + `(("r-cowplot" ,r-cowplot) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-irlba" ,r-irlba) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rcppprogress" ,r-rcppprogress) + ("r-rlang" ,r-rlang) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/immunogenomics/harmony") + (synopsis "Integration of single cell sequencing data") + (description + "This package provides an implementation of the Harmony algorithm for +single cell integration, described in Korsunsky et al +@url{doi.org/10.1101/461954}. The package includes a standalone Harmony +function and interfaces to external frameworks.") + (license license:gpl3)))) -- cgit v1.2.3 From f9a1f15efc8ebcae0502f51fbd40f074290711d9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 29 Aug 2019 11:29:44 +0200 Subject: doc: Do not refer to Bioconductor SVN. * doc/guix.texi (Invoking guix import): Do not mention the now defunct Bioconductor SVN repository. --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a87a8a3d9a..1998ad049b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8628,8 +8628,8 @@ When @code{--archive=bioconductor} is added, metadata is imported from packages for for the analysis and comprehension of high-throughput genomic data in bioinformatics. -Information is extracted from the @code{DESCRIPTION} file of a package -published on the web interface of the Bioconductor SVN repository. +Information is extracted from the @code{DESCRIPTION} file contained in the +package archive. The command below imports metadata for the @code{GenomicRanges} R package: -- cgit v1.2.3 From 79fa5a7a1236cae00915ccaeb39e6a43fccb473b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 11:57:48 +0300 Subject: gnu: Add rust-remove-dir-all. * gnu/packages/crates-io.scm (rust-remove-dir-all): New variable. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 80f3fae513..9b43825498 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1098,6 +1098,38 @@ and @code{ptrdistance}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-remove-dir-all + (package + (name "rust-remove-dir-all") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "remove_dir_all" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bkrlyg26mgizpiy1yb2hhpgscxcag8r5fnckqsvk25608vzm0sa")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-source + ;; The test phase expects there to be a README.md in the root directory. + (lambda _ + (invoke "touch" "README.md")))))) + (home-page "https://github.com/XAMPPRocky/remove_dir_all.git") + (synopsis "Implementation of remove_dir_all for Windows") + (description + "This package provides a safe, reliable implementation of +@code{remove_dir_all} for Windows") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rustc-std-workspace-core (package (name "rust-rustc-std-workspace-core") -- cgit v1.2.3 From caf6a690ea768d90cd7c2f7518295ee5e1458a00 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:09:13 +0300 Subject: gnu: Add rust-version-check-0.1. * gnu/packages/crates-io.scm (rust-version-check-0.1): New variable. --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9b43825498..0f7f338ac6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1908,6 +1908,20 @@ If that fails, no determination is made, and calls return None.") (license (list license:asl2.0 license:expat)))) +(define-public rust-version-check-0.1 + (package + (inherit rust-version-check) + (name "rust-version-check") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "version_check" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))))) + (define-public rust-void (package (name "rust-void") -- cgit v1.2.3 From ff901328101a75d25bc4533a37f279bac2741068 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:10:18 +0300 Subject: gnu: Add rust-unicase. * gnu/packages/crates-io.scm (rust-unicase): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f7f338ac6..3c8930d9bb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1802,6 +1802,28 @@ with the Unicode character database.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unicase + (package + (name "rust-unicase") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicase" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xmpmkakhhblq7dzab1kwyv925kv7fqjkjsxjspg6ix9n88makm8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.1)))) + (home-page "https://github.com/seanmonstar/unicase") + (synopsis "Case-insensitive wrapper around strings") + (description + "A case-insensitive wrapper around strings.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-unicode-width (package (name "rust-unicode-width") -- cgit v1.2.3 From b494f1718716f09c5623cd031d9280da6985b12b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:12:38 +0300 Subject: gnu: Add rust-mime. * gnu/packages/crates-io.scm (rust-mime): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3c8930d9bb..9e17b89c55 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -699,6 +699,29 @@ whether an expression matches a pattern.") (license (list license:asl2.0 license:expat)))) +(define-public rust-mime + (package + (name "rust-mime") + (version "0.3.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "mime" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09clbyvdkwflp8anwjhqdib0sw8191gphcchdp80nc8ayhhwl9ry")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unicase" ,rust-unicase)))) + (home-page "https://github.com/hyperium/mime") + (synopsis "Strongly Typed Mimes") + (description + "Support MIME (HTTP Media Types) as strong types in Rust.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-modifier (package (name "rust-modifier") -- cgit v1.2.3 From e8b3d8b0ea97d4587d5334ba3fce14516b14f7e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:26:57 +0300 Subject: gnu: Add rust-unsafe-any. * gnu/packages/crates-io.scm (rust-unsafe-any): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9e17b89c55..57f1ddf74e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1909,6 +1909,28 @@ whitespace from a string.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unsafe-any + (package + (name "rust-unsafe-any") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "unsafe-any" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zwwphsqkw5qaiqmjwngnfpv9ym85qcsyj7adip9qplzjzbn00zk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-traitobject" ,rust-traitobject)))) + (home-page "https://tokio.rs") + (synopsis "Traits and implementations for unchecked downcasting") + (description + "Traits and implementations for unchecked downcasting.") + (license license:expat))) + (define-public rust-untrusted (package (name "rust-untrusted") -- cgit v1.2.3 From ea6415b7878219bc111aef859a559fa6ab99686e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:28:05 +0300 Subject: gnu: Add rust-typemap. * gnu/packages/crates-io.scm (rust-typemap): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57f1ddf74e..f7335e85f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1760,6 +1760,28 @@ fixed set of worker threads.") (description "Exposes Typeable, for getting TypeIds at runtime.") (license license:expat))) +(define-public rust-typemap + (package + (name "rust-typemap") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "typemap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xm1gbvz9qisj1l6d36hrl9pw8imr8ngs6qyanjnsad3h0yfcfv5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-unsafe-any" ,rust-unsafe-any)))) + (home-page "https://github.com/reem/rust-typemap") + (synopsis "Typesafe store for many value types") + (description + "A typesafe store for many value types.") + (license license:expat))) + (define-public rust-typenum (package (name "rust-typenum") -- cgit v1.2.3 From 1d56009648c350fcb48482a142a8f1fed39f8d6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:29:43 +0300 Subject: gnu: Add rust-plugin. * gnu/packages/crates-io.scm (rust-plugin): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f7335e85f3..775fbe7680 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -971,6 +971,30 @@ used in Cargo build scripts.") (license (list license:asl2.0 license:expat)))) +(define-public rust-plugin + (package + (name "rust-plugin") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "plugin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q7nghkpvxxr168y2jnzh3w7qc9vfrby9n7ygy3xpj0bj71hsshs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-typemap" ,rust-typemap)) + #:cargo-development-inputs + (("rust-void" ,rust-void)))) + (home-page "https://github.com/reem/rust-plugin") + (synopsis "Lazily evaluated, order-independent plugins for extensible types") + (description + "Lazily evaluated, order-independent plugins for extensible types.") + (license license:expat))) + (define-public rust-pocket-resources (package (name "rust-pocket-resources") -- cgit v1.2.3 From c7814480807fd4984ad8d9ebc09deac7fecfbf7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:42:53 +0300 Subject: gnu: rust-winapi: Update to 0.3.8. * gnu/packages/crates-io.scm (rust-winapi): Update to 0.3.8. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 775fbe7680..28e7f4cb07 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2172,7 +2172,7 @@ UTF-32 types are provided, including support for malformed encoding.") (define-public rust-winapi (package (name "rust-winapi") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) @@ -2180,7 +2180,7 @@ UTF-32 types are provided, including support for malformed encoding.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0w7pbhcl087lkggxdflfp2i92rq89ahsfdkjkv44fgmiy9m3h3pi")))) + "1ii9j9lzrhwri0902652awifzx9fpayimbp6hfhhc296xcg0k4w0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From d48ce6f098f39faa4bc0390bf2d231acf3abe80c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:45:43 +0300 Subject: gnu: Add rust-winutil. * gnu/packages/crates-io.scm (rust-winutil): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 28e7f4cb07..60cc63009c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2325,6 +2325,33 @@ color in a Windows console.") (license (list license:unlicense license:expat)))) +(define-public rust-winutil + (package + (name "rust-winutil") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "winutil" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vkyl3fbbf05n5ph5yz8sfaccrk9x3qsr25560w6w68ldf5i7bvx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi)) + ;; This unmaintained crate cannot find winapi when built directly. + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build)))) + (home-page "https://bitbucket.org/DaveLancaster/winutil") + (synopsis "Library wrapping a handful of useful winapi functions") + (description + "A simple library wrapping a handful of useful winapi functions.") + (license license:expat))) + (define-public rust-xdg (package (name "rust-xdg") -- cgit v1.2.3 From f1e81de926254eea0778d0b8ff12b67d0b4be6e2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 12:48:14 +0300 Subject: gnu: Add rust-hostname. * gnu/packages/crates-io.scm (rust-hostname): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 60cc63009c..ea2b5ec0f0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -519,6 +519,29 @@ hexadecimal representation.") (license (list license:asl2.0 license:expat)))) +(define-public rust-hostname + (package + (name "rust-hostname") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "hostname" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kprf862qaa7lwdms6aw7f3275h0j2rwhs9nz5784pm8hdmb9ki1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-winutil" ,rust-winutil)))) + (home-page "https://github.com/fengcen/hostname") + (synopsis "Get hostname for Rust") + (description + "Get hostname for Rust.") + (license license:expat))) + (define-public rust-iovec (package (name "rust-iovec") -- cgit v1.2.3 From 5913e06a75b06f0cb07b4309f0dd0cd19c84f320 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 13:04:34 +0300 Subject: gnu: Add rust-resolv-conf. * gnu/packages/crates-io.scm (rust-resolv-conf): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea2b5ec0f0..cd8a1b062a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1200,6 +1200,31 @@ and @code{ptrdistance}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-resolv-conf + (package + (name "rust-resolv-conf") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "resolv-conf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jvdsmksdf6yiipm3aqahyv8n1cjd7wqc8sa0p0gzsax3fmb8qxj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-quick-error" ,rust-quick-error) + ("rust-hostname" ,rust-hostname)) + #:cargo-test-flags '("--release" "--lib" "--examples"))) ; doc tests fail + (home-page "https://github.com/tailhook/resolv-conf") + (synopsis "/etc/resolv.conf parser") + (description + "An /etc/resolv.conf parser crate for Rust.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rustc-std-workspace-core (package (name "rust-rustc-std-workspace-core") -- cgit v1.2.3 From c08f789d4df408bc299e0847e0c83bcfab7f6879 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 13:13:04 +0300 Subject: gnu: Add rust-heapsize. * gnu/packages/crates-io.scm (rust-heapsize): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cd8a1b062a..f5b03b1df6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -499,6 +499,32 @@ featuring zero allocations, composability, and iterator-like interfaces.") (license (list license:asl2.0 license:expat)))) +(define-public rust-heapsize + (package + (name "rust-heapsize") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "heapsize" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0q94q9ppqjgrw71swiyia4hgby2cz6dldp7ij57nkvhd6zmfcy8n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-winapi" ,rust-winapi)) + ;; Tests assume rust is built with jemalloc. + ;; https://github.com/servo/heapsize/issues/74 + #:cargo-test-flags '("--features" "flexible-tests"))) + (home-page "https://github.com/servo/heapsize") + (synopsis "Measure the total runtime size of an object on the heap") + (description + "Infrastructure for measuring the total runtime size of an object on the +heap.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-hex (package (name "rust-hex") -- cgit v1.2.3 From 3c9b315aaa266bb21ee10968a99470de19b704af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 13:36:05 +0300 Subject: gnu: Add rust-kernel32-sys. * gnu/packages/crates-io.scm (rust-kernel32-sys): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f5b03b1df6..a5aad52e21 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -632,6 +632,36 @@ friction with idiomatic Rust structs to ease interopability.") (license (list license:asl2.0 license:expat)))) +(define-public rust-kernel32-sys + (package + (name "rust-kernel32-sys") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "kernel32-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.2) + ("rust-winapi-build" ,rust-winapi-build)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-Cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.* }") "}\n")) + #t))))) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Function definitions for the Windows API library kernel32") + (description "Contains function definitions for the Windows API library +kernel32.") + (license license:expat))) + (define-public rust-lazy-static (package (name "rust-lazy-static") -- cgit v1.2.3 From c5af2ecfb85a13ae6c39f911f456ff320c2818e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 13:53:48 +0300 Subject: gnu: Add rust-ws2-32-sys. * gnu/packages/cargo-io.scm (rust-ws2-32-sys): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5aad52e21..39b976bc53 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2456,6 +2456,36 @@ color in a Windows console.") "A simple library wrapping a handful of useful winapi functions.") (license license:expat))) +(define-public rust-ws2-32-sys + (package + (name "rust-ws2-32-sys") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ws2_32-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.2) + ("rust-winapi-build" ,rust-winapi-build)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-Cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.* }") "}\n")) + #t))))) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Function definitions for the Windows API library ws2_32") + (description + "Contains function definitions for the Windows API library ws2_32.") + (license license:expat))) + (define-public rust-xdg (package (name "rust-xdg") -- cgit v1.2.3 From ec3bbde43e79a884f58f5bf59de58c0de8cf0442 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:10:37 +0300 Subject: gnu: Add rust-atty. * gnu/packages/crates-io.scm (rust-atty): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 39b976bc53..ce4893acab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -50,6 +50,30 @@ (license (list license:asl2.0 license:expat)))) +(define-public rust-atty + (package + (name "rust-atty") + (version "0.2.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "atty" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "140sswp1bwqwc4zk80bxkbnfb3g936hgrb77g9g0k1zcld3wc0qq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi)) + #:tests? #f)) ; tests fail in our sandbox + (home-page "https://github.com/softprops/atty") + (synopsis "A simple interface for querying atty") + (description + "This package provides a simple interface for querying atty.") + (license license:expat))) + (define-public rust-autocfg (package (name "rust-autocfg") -- cgit v1.2.3 From eb34db03ee217a66be7f4c090b0f91e9b292ea64 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:13:19 +0300 Subject: gnu: Add rust-clicolors-control. * gnu/packages/crates-io.scm (rust-clicolors-control): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ce4893acab..764cf7a906 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -203,6 +203,32 @@ depending on a large number of #[cfg] parameters. Structured like an (license (list license:asl2.0 license:expat)))) +(define-public rust-clicolors-control + (package + (name "rust-clicolors-control") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "clicolors-control" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1y80cgarxhrd1bz5yjm81r444v6flvy36aaxrrsac0yhfd6gvavk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-atty" ,rust-atty) + ("rust-lazy-static" ,rust-lazy-static) + ("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi)))) + (home-page "https://github.com/mitsuhiko/clicolors-control") + (synopsis "Common utility library to control CLI colorization") + (description + "This package provides a common utility library to control CLI +colorization.") + (license license:expat))) + (define-public rust-cloudabi (package (name "rust-cloudabi") -- cgit v1.2.3 From cde49404ce9e7d03ea14409d2d9c02a3d18049c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:24:33 +0300 Subject: gnu: Add rust-fuchsia-zircon-sys. * gnu/packages/crates-io.scm (rust-fuchsia-zircon-sys): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 764cf7a906..6e0fcb456e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -509,6 +509,26 @@ implementation that is more efficient for smaller hash keys.") process and much more.") (license license:expat))) +(define-public rust-fuchsia-zircon-sys + (package + (name "rust-fuchsia-zircon-sys") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "fuchsia-zircon-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19zp2085qsyq2bh1gvcxq1lb8w6v6jj9kbdkhpdjrl95fypakjix")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f)) ; tests require zircon + (home-page "https://fuchsia.googlesource.com/garnet/") + (synopsis "Low-level Rust bindings for the Zircon kernel") + (description "Low-level Rust bindings for the Zircon kernel.") + (license license:bsd-3))) + (define-public rust-futures (package (name "rust-futures") -- cgit v1.2.3 From 21931d0f7d886d981ec71b14f9979055157b621e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:26:33 +0300 Subject: gnu: Add rust-fucshia-zircon. * gnu/packages/crates-io.scm (rust-fuchsia-zircon): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6e0fcb456e..0bb1feb8f7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -509,6 +509,29 @@ implementation that is more efficient for smaller hash keys.") process and much more.") (license license:expat))) +(define-public rust-fuchsia-zircon + (package + (name "rust-fuchsia-zircon") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "fuchsia-zircon" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10jxc5ks1x06gpd0xg51kcjrxr35nj6qhx2zlc5n7bmskv3675rf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags) + ("rust-fuchsia-zircon-sys" ,rust-fuchsia-zircon-sys)) + #:tests? #f)) ; tests require zircon + (home-page "https://fuchsia.googlesource.com/garnet/") + (synopsis "Rust bindings for the Zircon kernel") + (description "Rust bindings for the Zircon kernel.") + (license license:bsd-3))) + (define-public rust-fuchsia-zircon-sys (package (name "rust-fuchsia-zircon-sys") -- cgit v1.2.3 From 4247954bbc28d83ece158c4732030d65fdf6b8a5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:28:00 +0300 Subject: gnu: Add rust-fuchsia-cprng. * gnu/packages/crates-io.scm (rust-fuchsia-cprng): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0bb1feb8f7..219bbe280a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -509,6 +509,27 @@ implementation that is more efficient for smaller hash keys.") process and much more.") (license license:expat))) +(define-public rust-fuchsia-cprng + (package + (name "rust-fuchsia-cprng") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "fuchsia-cprng" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fnkqrbz7ixxzsb04bsz9p0zzazanma8znfdqjvh39n14vapfvx0")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f)) ; tests require zircon + (home-page "https://fuchsia.googlesource.com/fuchsia/+/master/garnet/public/rust/fuchsia-cprng") + (synopsis "Fuchsia cryptographically secure pseudorandom number generator") + (description "Rust crate for the Fuchsia cryptographically secure +pseudorandom number generator") + (license license:bsd-3))) + (define-public rust-fuchsia-zircon (package (name "rust-fuchsia-zircon") -- cgit v1.2.3 From cb298154b30aebf711f6d43156df683c38de4ad9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:30:49 +0300 Subject: gnu: Add rust-futures-cpupool. * gnu/packages/crates-io.scm (rust-futures-cpupool): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 219bbe280a..ac925e3c10 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -593,6 +593,31 @@ featuring zero allocations, composability, and iterator-like interfaces.") (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-cpupool + (package + (name "rust-futures-cpupool") + (version "0.1.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-cpupool" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1r32456gpblzfvnkf60545v8acqk7gh5zhyhi1jn669k9gicv45b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures" ,rust-futures) + ("rust-num-cpus" ,rust-num-cpus)))) + (home-page "https://github.com/alexcrichton/futures-rs") + (synopsis "Implementation of thread pools which hand out futures") + (description + "An implementation of thread pools which hand out futures to the results of +the computation on the threads themselves.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-futures-io-preview (package (name "rust-futures-io-preview") -- cgit v1.2.3 From 9dbb27670daa9876e49f90a58db1f03bdfe51ebc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:44:18 +0300 Subject: gnu: Add rust-num-iter. * gnu/packages/crates-io.scm (rust-num-iter): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac925e3c10..dccdd5467f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1036,6 +1036,32 @@ types as proposed in RFC 1158.") (license (list license:asl2.0 license:expat)))) +(define-public rust-num-iter + (package + (name "rust-num-iter") + (version "0.1.39") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-iter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bhk2qbr3261r6zvfc58lz4spfqjhvdripxgz5mks5rd85r55gbn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-integer" ,rust-num-integer) + ("rust-num-traits" ,rust-num-traits)) + #:cargo-development-inputs + (("rust-autocfg" ,rust-autocfg)))) + (home-page "https://github.com/rust-num/num-iter") + (synopsis "External iterators for generic mathematics") + (description + "This crate provides external iterators for generic mathematics.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-num-traits (package (name "rust-num-traits") -- cgit v1.2.3 From b8e380f458fa34d2668f38621cac6f53c2db48b6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 29 Aug 2019 14:54:48 +0300 Subject: gnu: Add rust-nodrop, rust-nodrop-union. * gnu/packages/crates-io.scm (rust-nodrop, rust-nodrop-union): New variables. --- gnu/packages/crates-io.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dccdd5467f..c3d2419f88 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -986,6 +986,53 @@ types as proposed in RFC 1158.") (license (list license:asl2.0 license:expat)))) +(define-public rust-nodrop + (package + (name "rust-nodrop") + (version "0.1.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "nodrop" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0if9ifn6rvar5jirx4b3qh4sl5kjkmcifycvzhxa9j3crkfng5ig")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nodrop-union" ,rust-nodrop-union)))) + (home-page "https://github.com/bluss/arrayvec") + (synopsis "Wrapper type to inhibit drop (destructor)") + (description "This package provides a wrapper type to inhibit drop +(destructor). Use @code{std::mem::ManuallyDrop} instead!") + (license (list license:asl2.0 + license:expat)))) + +;; This package requires features which are unavailable +;; on the stable releases of Rust. +(define-public rust-nodrop-union + (package + (name "rust-nodrop-union") + (version "0.1.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "nodrop-union" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0jsnkdn9l8jlmb9h4wssi76sxnyxwnyi00p6y1p2gdq7c1gdw2b7")))) + (build-system cargo-build-system) + (home-page "https://github.com/bluss/arrayvec") + (synopsis "Wrapper type to inhibit drop (destructor)") + (description "This package provides a wrapper type to inhibit drop +(destructor). Implementation crate for nodrop, the untagged unions +implementation (which is unstable / requires nightly).") + (properties '((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + (define-public rust-num-cpus (package (name "rust-num-cpus") -- cgit v1.2.3 From 6743080ccc3850525b9635d472705e324feef48f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 15 Aug 2019 20:46:59 +0200 Subject: gnu: python-alembic: Update to 1.0.11. * gnu/packages/databases.scm (python-alembic): Update to 1.0.11. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 333a88b8c7..066bcb6962 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2430,14 +2430,14 @@ You might also want to install the following optional dependencies: (define-public python-alembic (package (name "python-alembic") - (version "1.0.10") + (version "1.0.11") (source (origin (method url-fetch) (uri (pypi-uri "alembic" version)) (sha256 (base32 - "1dwl0264r6ri2jyrjr68am04x538ab26xwy4crqjnnhm4alwm3c2")))) + "1k5hag0vahd5vrf9abx8fdj2whrwaw2iq2yp736mmxnbsn5xkdyd")))) (build-system python-build-system) (native-inputs `(("python-mock" ,python-mock) @@ -2448,8 +2448,7 @@ You might also want to install the following optional dependencies: ("python-mako" ,python-mako) ("python-editor" ,python-editor))) (home-page "https://bitbucket.org/zzzeek/alembic") - (synopsis - "Database migration tool for SQLAlchemy") + (synopsis "Database migration tool for SQLAlchemy") (description "Alembic is a lightweight database migration tool for usage with the SQLAlchemy Database Toolkit for Python.") -- cgit v1.2.3 From aa6d7de646d710abb93de7ea6d1c0e19bc1115a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 16 Aug 2019 16:22:45 +0200 Subject: gnu: python-flask-sqlalchemy: Update to 2.4.0. * gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.4.0. --- gnu/packages/python-web.scm | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e622f27d6b..9b88d66118 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2218,24 +2218,21 @@ applications.") (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") - (version "2.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Flask-SQLAlchemy" version)) - (sha256 - (base32 - "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965")))) + (version "2.4.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "Flask-SQLAlchemy" version)) + (sha256 + (base32 + "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) ("python-sqlalchemy" ,python-sqlalchemy))) - (home-page - "https://github.com/mitsuhiko/flask-sqlalchemy") - (synopsis - "Module adding SQLAlchemy support to your Flask application") + (home-page "https://github.com/mitsuhiko/flask-sqlalchemy") + (synopsis "Module adding SQLAlchemy support to your Flask application") (description - "This package adds SQLAlchemy support to your Flask application.") + "This package adds SQLAlchemy support to your Flask application.") (license license:bsd-3))) (define-public python-flask-restplus -- cgit v1.2.3 From 2271a1dcdbaa5b54967aa2f31e96db2f90528376 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 16 Aug 2019 23:31:50 +0200 Subject: gnu: python-wrapt: Update to 1.11.2. * gnu/packages/python-xyz.scm (python-wrapt): Update to 1.11.2. --- gnu/packages/python-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 04957b4407..e7fffd0879 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6990,14 +6990,14 @@ Supported netlink families and protocols include: (define-public python-wrapt (package (name "python-wrapt") - (version "1.11.1") + (version "1.11.2") (source - (origin - (method url-fetch) - (uri (pypi-uri "wrapt" version)) - (sha256 - (base32 - "0cqmysny1pz01jw26q48q5zasvns6507rwhgm6wcw743f0r01sja")))) + (origin + (method url-fetch) + (uri (pypi-uri "wrapt" version)) + (sha256 + (base32 + "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn")))) (build-system python-build-system) (arguments ;; Tests are not included in the tarball, they are only available in the @@ -7006,7 +7006,7 @@ Supported netlink families and protocols include: (home-page "https://github.com/GrahamDumpleton/wrapt") (synopsis "Module for decorators, wrappers and monkey patching") (description - "The aim of the wrapt module is to provide a transparent object proxy for + "The aim of the wrapt module is to provide a transparent object proxy for Python, which can be used as the basis for the construction of function wrappers and decorator functions.") (license license:bsd-2))) -- cgit v1.2.3 From af9afb0bc40ac74b75e820fbd6a6222c82febc9f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Aug 2019 15:48:46 +0200 Subject: gnu: QtWebKit: Increase build timeout. * gnu/packages/qt.scm (qtwebkit)[properties]: New field. --- gnu/packages/qt.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index daef46faf6..52eb46cce0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2209,6 +2209,9 @@ content") (description "QtWebKit provides a Web browser engine that makes it easy to embed content from the World Wide Web into your Qt application. At the same time Web content can be enhanced with native controls.") + ;; Building QtWebKit takes around 13 hours on an AArch64 machine. Give some + ;; room for slower or busy hardware. + (properties '((timeout . 64800))) ;18 hours (license license:lgpl2.1+))) (define-public dotherside -- cgit v1.2.3 From 9e171634f60fe7e39b5e32a55010d975dbead48e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Aug 2019 16:04:25 +0200 Subject: gnu: libtorrent: Update to 0.13.8. * gnu/packages/bittorrent.scm (libtorrent): Update to 0.13.8. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 0ab165cde4..77c94e0209 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -131,7 +131,7 @@ DHT, µTP, PEX and Magnet Links.") (define-public libtorrent (package (name "libtorrent") - (version "0.13.6") + (version "0.13.8") (source (origin (method url-fetch) (uri (string-append @@ -139,7 +139,7 @@ DHT, µTP, PEX and Magnet Links.") version ".tar.gz")) (sha256 (base32 - "012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18")))) + "10z9i1rc41cmmi7nx8k7k1agsx6afv09g9cl7g9zr35fyhl5l4gd")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("zlib" ,zlib))) -- cgit v1.2.3 From 0cbec2aaa8fa46194652c9eaed31ffd863dabc0a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 18 Aug 2019 16:04:44 +0200 Subject: gnu: rtorrent: Update to 0.9.8. * gnu/packages/bittorrent.scm (rtorrent): Update to 0.9.8. --- gnu/packages/bittorrent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 77c94e0209..50b63048e4 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -156,7 +156,7 @@ speed and efficiency.") (define-public rtorrent (package (name "rtorrent") - (version "0.9.6") + (version "0.9.8") (source (origin (method url-fetch) (uri (string-append @@ -164,7 +164,7 @@ speed and efficiency.") version ".tar.gz")) (sha256 (base32 - "03jvzw9pi2mhcm913h8qg0qw9gwjqc6lhwynb1yz1y163x7w4s8y")))) + "1bs2fnf4q7mlhkhzp3i1v052v9xn8qa7g845pk9ia8hlpw207pwy")))) (build-system gnu-build-system) (inputs `(("libtorrent" ,libtorrent) ("ncurses" ,ncurses) -- cgit v1.2.3 From 7735c4bfef6c4d6d9cc9be55e9baa7b83b9eb40e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Aug 2019 14:48:02 +0200 Subject: gnu: ungoogled-chromium: Update to 76.0.3809.132-0.8eba5c0. * gnu/packages/chromium.scm (%chromium-version): Set to 76.0.3809.132. (%chromium-origin): Update hash. --- gnu/packages/chromium.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 4797004b33..ebad0538d3 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -238,7 +238,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "76.0.3809.100") +(define %chromium-version "76.0.3809.132") (define %ungoogled-revision "8eba5c0df1a318012e3deab39a9add252a0d56a3") (define %debian-revision "debian/76.0.3809.87-2") (define package-revision "0") @@ -254,7 +254,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "0vfjfxsqf8jrmd7y08ln1lpbilwi150875zn2bawwdq87vd3mncc")))) + "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm")))) (define %ungoogled-origin (origin -- cgit v1.2.3 From 2207d522d41af2e79485ad74e29c3dedceafd060 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 18 Aug 2019 11:08:29 +0200 Subject: gnu: Add fe. * gnu/packages/text-editors.scm (fe): New variable. --- gnu/packages/text-editors.scm | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 4412d54579..432e79e350 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -567,3 +568,55 @@ The basic features of Geany are: @item extensibility through plugins @end itemize") (license license:gpl2+))) + +(define-public fe + (package + (name "fe") + ;; Stable release is 1.8. However, this development version + ;; introduces support for UTF-8. + (version "2.0") + (source (origin + (method url-fetch) + (uri (string-append "http://www.moria.de/~michael/fe/" + "fe-" version ".tar.gz")) + (sha256 + (base32 + "1hwws7si1752z6hp61zxznvgsb6846lp8zl1hn5ddhsbafwalwb9")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + ;; Sendmail is only used to send a crash log. Disable the + ;; feature since it is (1) undocumented (2) not very useful. + #:configure-flags (list "--disable-sendmail") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (for-each (lambda (f) (install-file f doc)) + '("fe.doc" "fe.html" "fe.ps" "feref.ps" "README")) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("ncurses" ,ncurses))) + (home-page "http://www.moria.de/~michael/fe/") + (synopsis "Small folding editor") + (description "Fe is a small folding editor. It allows to fold +arbitrary text regions; it is not bound to syntactic units. + +Fe has no configuration or extension language and requires no setup. +Its user interface is emacs-like and it has menues for the very most +important functions to help beginners. Further there is a reference +card. It offers: + +@itemize +@item Regions and Emacs-like kill ring +@item Incremental search +@item Keyboard macros +@item Editing binary files +@item Multiple windows and views +@item Compose function for Latin 1 characters +@end itemize") + (license license:gpl2+))) -- cgit v1.2.3 From b36165b740bbe2041ea238fd9b7fea60cbfc8ff4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 29 Aug 2019 18:51:16 +0200 Subject: gnu: Add sbcl-cl-xmlspam. * gnu/packages/lisp.scm (sbcl-cl-xmlspam): New variable. --- gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index d32f4b19bd..844baf15ae 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -6668,3 +6668,35 @@ discoverable library instead of many; consistency and composability, where @code{s} is always the last argument, which makes it easier to feed pipes and arrows.") (license license:expat)))) + +(define-public sbcl-cl-xmlspam + (let ((commit "ea06abcca2a73a9779bcfb09081e56665f94e22a")) + (package + (name "sbcl-cl-xmlspam") + (build-system asdf-build-system/sbcl) + (version (git-version "0.0.0" "1" commit)) + (home-page "https://github.com/rogpeppe/cl-xmlspam") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0w4rqvrgdgk3fwfq3kx4r7wwdr2bv3b6n3bdqwsiriw9psqzpz2s")))) + (inputs + `(("cxml" ,sbcl-cxml) + ("cl-ppcre" ,sbcl-cl-ppcre))) + (synopsis "Concise, regexp-like pattern matching on streaming XML for Common Lisp") + (description "CXML does an excellent job at parsing XML elements, but what +do you do when you have a XML file that's larger than you want to fit in +memory, and you want to extract some information from it? Writing code to deal +with SAX events, or even using Klacks, quickly becomes tedious. +@code{cl-xmlspam} (for XML Stream PAttern Matcher) is designed to make it easy +to write code that mirrors the structure of the XML that it's parsing. It +also makes it easy to shift paradigms when necessary - the usual Lisp control +constructs can be used interchangeably with pattern matching, and the full +power of CXML is available when necessary.") + (license license:bsd-3)))) -- cgit v1.2.3 From c3e5e1355b320bb3f2a6b0164af6f158b32263dd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 29 Aug 2019 18:55:29 +0200 Subject: gnu: Add cl-dbus. * gnu/packages/lisp.scm (cl-dbus): New variable. --- gnu/packages/lisp.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 844baf15ae..34edea41de 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -6700,3 +6700,43 @@ also makes it easy to shift paradigms when necessary - the usual Lisp control constructs can be used interchangeably with pattern matching, and the full power of CXML is available when necessary.") (license license:bsd-3)))) + +;; TODO: dbus uses ASDF's package-inferred-system which is not supported by +;; asdf-build-system/sbcl as of 2019-08-02. We should fix +;; asdf-build-system/sbcl. +(define-public cl-dbus + (let ((commit "24b452df3a45ca5dc95015500f34baad175c981a") + (revision "1")) + (package + (name "cl-dbus") + (build-system asdf-build-system/source) + (version (git-version "20190408" revision commit)) + (home-page "https://github.com/death/dbus") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fw2q866yddbf23nk9pxphm9gsasx35vjyss82xzvndnjmzlqfl5")))) + ;; Inputs must be propagated or else packages depending on this won't have the necessary packages. + (propagated-inputs + `(("alexandria" ,sbcl-alexandria) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("babel" ,sbcl-babel) + ("iolib" ,sbcl-iolib) + ("iolib+multiplex" ,(@@ (gnu packages lisp) sbcl-iolib+multiplex)) + ("iolib+syscalls" ,(@@ (gnu packages lisp) sbcl-iolib+syscalls)) + ("iolib+streams" ,(@@ (gnu packages lisp) sbcl-iolib+streams)) + ("iolib+sockets" ,(@@ (gnu packages lisp) sbcl-iolib+sockets)) + ("ieee-floats" ,sbcl-ieee-floats) + ("flexi-streams" ,sbcl-flexi-streams) + ("cl-xmlspam" ,sbcl-cl-xmlspam) + ("ironclad" ,sbcl-ironclad))) + (synopsis "D-Bus client library for Common Lisp") + (description "This is a Common Lisp library that allows to publish D-Bus +objects as well as send and notify other objects connected to a bus.") + (license license:bsd-2)))) -- cgit v1.2.3 From aae704ddff32d938cc706b8eac1140af43a1fb55 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 29 Aug 2019 18:59:10 +0200 Subject: gnu: next-gtk-webkit: Update to 1.3.0 and hide package. * gnu/packages/web-browsers.scm (next-gtk-webkit): Update to 1.3.0. We hide the package because it is not usable on its own, it's a necessary backend for the `next' package. --- gnu/packages/web-browsers.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 366dc9da32..eb144ba3a2 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -365,10 +365,10 @@ vim editor and also easily configurable during runtime. Vimb is mostly keyboard driven and does not detract you from your daily work.") (license license:gpl3+))) -(define-public next-gtk-webkit +(define next-gtk-webkit (package (name "next-gtk-webkit") - (version "1.2.2") + (version "1.3.0") (source (origin (method git-fetch) @@ -377,7 +377,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "1bif1k738knhifxhkn0d2x1m521zkx40pri44vyjqncp9r95hkbk")) + "0ibq30xrf871pkpasi8p9krn0pmd86rsdzb3jqvz3wnp4wa3hl9d")) (file-name (git-file-name "next" version)))) (build-system glib-or-gtk-build-system) (arguments @@ -399,7 +399,7 @@ driven and does not detract you from your daily work.") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk-2.24))) (native-inputs - `(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.22 and above are compiled with gcc-7 + `(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.24 and above are compiled with gcc-7 ("pkg-config" ,pkg-config))) (home-page "https://next.atlas.engineer") (synopsis "Infinitely extensible web-browser (user interface only)") -- cgit v1.2.3 From b245557349ff536d2c5ab079b10e055d92988b17 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 29 Aug 2019 19:00:55 +0200 Subject: gnu: Add sbcl-next-download-manager. * gnu/packages/web-browsers.scm (sbcl-next-download-manager): New variable. It's a Common Lisp system dependency for `next', which is why we don't export the package. --- gnu/packages/web-browsers.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index eb144ba3a2..6eab4edb7f 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -409,6 +409,29 @@ key-bindings, is fully configurable and extensible in Lisp, and has powerful features for productive professionals.") (license license:bsd-3))) +(define sbcl-next-download-manager + (package + (inherit next-gtk-webkit) + (name "sbcl-next-download-manager") + (build-system asdf-build-system/sbcl) + (arguments + `(#:tests? #f ; Need online access. + #:asd-file "next.asd" + #:asd-system-name "download-manager")) + (inputs + `(;; ASD libraries: + ("trivial-features" ,sbcl-trivial-features) + ;; Lisp libraries: + ("cl-ppcre" ,sbcl-cl-ppcre) + ("dexador" ,sbcl-dexador) + ("log4cl" ,sbcl-log4cl) + ("lparallel" ,sbcl-lparallel) + ("quri" ,sbcl-quri) + ("str" ,sbcl-cl-str))) + (native-inputs + `(("prove-asdf" ,sbcl-prove-asdf))) + (synopsis "Infinitely extensible web-browser (download manager)"))) + (define-public sbcl-next (package (inherit next-gtk-webkit) -- cgit v1.2.3 From 01bb2e30eaad5051ba7e4542848e72df5e66147b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 29 Aug 2019 19:03:14 +0200 Subject: gnu: next: Update to 1.3.0 and rename sbcl-next to next. * gnu/packages/web-browsers.scm (sbcl-next): Deprecate for next. * gnu/packages/web-browsers.scm (next): Update to 1.3.0. [arguments]: Add phase to fix version number. [inputs]: Update dependencies for 1.3.0. --- gnu/packages/web-browsers.scm | 164 +++++++++++++++++++++++++----------------- 1 file changed, 97 insertions(+), 67 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 6eab4edb7f..14b6aef6cb 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -432,71 +432,101 @@ features for productive professionals.") `(("prove-asdf" ,sbcl-prove-asdf))) (synopsis "Infinitely extensible web-browser (download manager)"))) -(define-public sbcl-next - (package - (inherit next-gtk-webkit) - (name "sbcl-next") - (build-system asdf-build-system/sbcl) - (outputs '("out" "lib")) - (arguments - `(#:tests? #f ; no tests - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-platform-port-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "source/ports/gtk-webkit.lisp" - (("\"next-gtk-webkit\"") - (string-append "\"" (assoc-ref inputs "next-gtk-webkit") - "/bin/next-gtk-webkit\""))))) - (add-before 'cleanup 'move-bundle - (lambda* (#:key outputs #:allow-other-keys) - (define lib (assoc-ref outputs "lib")) - (define actual-fasl (string-append - lib - "/lib/sbcl/next.fasl")) - (define expected-fasl (string-append +(define-public next + (let ((version (package-version next-gtk-webkit))) + (package + (inherit next-gtk-webkit) + (name "next") + (build-system asdf-build-system/sbcl) + (outputs '("out" "lib")) + (arguments + `(#:tests? #f ; no tests + #:asd-system-name "next" + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-platform-port-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "source/ports/gtk-webkit.lisp" + (("\"next-gtk-webkit\"") + (string-append "\"" (assoc-ref inputs "next-gtk-webkit") + "/bin/next-gtk-webkit\""))) + #t)) + (add-after 'patch-platform-port-path 'patch-version + ;; When the version is not just dot-separated numerals + ;; (e.g. a git-commit version), Guix modifies the .asd with + ;; an illegal version number, and then Next fails to query + ;; it. So we hard-code it here. + (lambda* (#:key inputs #:allow-other-keys) + (let ((version (format #f "~a" ,version))) + (substitute* "source/global.lisp" + (("version\\)\\)\\)") + (string-append "version))) +(setf +version+ \"" version "\")")))) + #t)) + (add-before 'cleanup 'move-bundle + (lambda* (#:key outputs #:allow-other-keys) + (define lib (assoc-ref outputs "lib")) + (define actual-fasl (string-append lib - "/lib/sbcl/next--system.fasl")) - (copy-file actual-fasl expected-fasl) - #t)) - (add-after 'create-symlinks 'build-program - (lambda* (#:key outputs #:allow-other-keys) - (build-program - (string-append (assoc-ref outputs "out") "/bin/next") - outputs - #:entry-program '((next:start-with-port) 0)))) - (add-before 'build 'install-assets - ;; Since the ASDF build system generates a new .asd with a - ;; possibly suffixed and thus illegal version number, assets - ;; should not be installed after the 'build phase or else - ;; the illegal version will result in NIL in the .desktop - ;; file. - (lambda* (#:key outputs #:allow-other-keys) - (with-output-to-file "version" - (lambda _ - (format #t "~a" ,(package-version next-gtk-webkit)))) - (invoke "make" "install-assets" - (string-append "PREFIX=" - (assoc-ref outputs "out")))))))) - (inputs - `(("next-gtk-webkit" ,next-gtk-webkit) - ;; Lisp libraries: - ("trivial-features" ,sbcl-trivial-features) - ("alexandria" ,sbcl-alexandria) - ("anaphora" ,sbcl-anaphora) - ("closer-mop" ,sbcl-closer-mop) - ("log4cl" ,sbcl-log4cl) - ("find-port" ,sbcl-find-port) - ("cl-strings" ,sbcl-cl-strings) - ("cl-string-match" ,sbcl-cl-string-match) - ("puri" ,sbcl-puri) - ("sqlite" ,sbcl-cl-sqlite) - ("parenscript" ,sbcl-parenscript) - ("cl-json" ,sbcl-cl-json) - ("swank" ,sbcl-slime-swank) - ("cl-markup" ,sbcl-cl-markup) - ("cl-css" ,sbcl-cl-css) - ("bordeaux-threads" ,sbcl-bordeaux-threads) - ("s-xml-rpc" ,sbcl-s-xml-rpc) - ("unix-opts" ,sbcl-unix-opts) - ("trivial-clipboard" ,sbcl-trivial-clipboard))) - (synopsis "Infinitely extensible web-browser (with Lisp development files)"))) + "/lib/sbcl/next.fasl")) + (define expected-fasl (string-append + lib + "/lib/sbcl/next--system.fasl")) + (copy-file actual-fasl expected-fasl) + #t)) + (add-after 'create-symlinks 'build-program + (lambda* (#:key outputs #:allow-other-keys) + (build-program + (string-append (assoc-ref outputs "out") "/bin/next") + outputs + #:entry-program '((next:entry-point) 0)))) + (add-before 'build 'install-assets + ;; Since the ASDF build system generates a new .asd with a + ;; possibly suffixed and thus illegal version number, assets + ;; should not be installed after the 'build phase or else + ;; the illegal version will result in NIL in the .desktop + ;; file. + (lambda* (#:key outputs #:allow-other-keys) + (with-output-to-file "version" + (lambda _ + (format #t "~a" ,(package-version next-gtk-webkit)))) + (invoke "make" "install-assets" + (string-append "PREFIX=" + (assoc-ref outputs "out")))))))) + (inputs + `(("next-gtk-webkit" ,next-gtk-webkit) + ;; ASD libraries: + ("trivial-features" ,sbcl-trivial-features) + ("trivial-garbage" ,sbcl-trivial-garbage) + ;; Lisp libraries: + ("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-css" ,sbcl-cl-css) + ("cl-json" ,sbcl-cl-json) + ("cl-markup" ,sbcl-cl-markup) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) + ("cl-string-match" ,sbcl-cl-string-match) + ("cl-strings" ,sbcl-cl-strings) + ("closer-mop" ,sbcl-closer-mop) + ("dbus" ,cl-dbus) + ("dexador" ,sbcl-dexador) + ("ironclad" ,sbcl-ironclad) + ("log4cl" ,sbcl-log4cl) + ("lparallel" ,sbcl-lparallel) + ("mk-string-metrics" ,sbcl-mk-string-metrics) + ("parenscript" ,sbcl-parenscript) + ("quri" ,sbcl-quri) + ("sqlite" ,sbcl-cl-sqlite) + ("str" ,sbcl-cl-str) + ("swank" ,sbcl-slime-swank) + ("trivia" ,sbcl-trivia) + ("trivial-clipboard" ,sbcl-trivial-clipboard) + ("unix-opts" ,sbcl-unix-opts) + ;; Local deps + ("next-download-manager" ,sbcl-next-download-manager))) + (native-inputs + `(("prove-asdf" ,sbcl-prove-asdf))) + (synopsis "Infinitely extensible web-browser (with Lisp development files)")))) + +(define-public sbcl-next + (deprecated-package "sbcl-next" next)) -- cgit v1.2.3 From b0985c60a0a9163ff715ef05c547e3e4e7a873da Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Thu, 29 Aug 2019 19:13:41 +0200 Subject: gnu: Add rednotebook. * gnu/package/rednotebook.scm: New file. * gnu/local.mk: Add it. * gnu/packages/rednotebook.scm (rednotebook): New variable. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/rednotebook.scm | 91 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 gnu/packages/rednotebook.scm diff --git a/gnu/local.mk b/gnu/local.mk index 797936d2fd..2c02b8510a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -413,6 +413,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/rdf.scm \ %D%/packages/re2c.scm \ %D%/packages/readline.scm \ + %D%/packages/rednotebook.scm \ %D%/packages/regex.scm \ %D%/packages/robotics.scm \ %D%/packages/rrdtool.scm \ diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm new file mode 100644 index 0000000000..e5b1b2c7bf --- /dev/null +++ b/gnu/packages/rednotebook.scm @@ -0,0 +1,91 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Jesse Gibbons +;;; +;;; 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 . + +(define-module (gnu packages rednotebook) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system python) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages python) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages webkit) + #:use-module (gnu packages python-xyz)) + +(define-public rednotebook + (package + (name "rednotebook") + (version "2.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jendrikseipp/rednotebook.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04c7a0wgmdl88v9386y1052c38ajbkryiwhqps5lx34d4g7r6hm1")))) + (build-system python-build-system) + (arguments + ;; Tests fail to find the "_" function. + ;; It should be defined in rednotebook/info.py if '_' is not a member of + ;; 'builtins'. It is either not defined or not exported during the check + ;; phase. The program does not have this problem after it is installed. + ;; TODO: Fix tests. + `(#:tests? #f + #:imported-modules ((guix build glib-or-gtk-build-system) + ,@%python-build-system-modules) + #:modules ((ice-9 match) + (guix build python-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + ;; Make sure rednotebook can find the typelibs and webkitgtk shared + ;; libraries. + (add-before 'wrap 'wrap-with-library-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (webkitgtk-path (string-append + (assoc-ref inputs "webkitgtk") + "/lib"))) + (wrap-program (string-append out "/bin/rednotebook") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) + #t)))))) + (inputs + `(("gtk+" ,gtk+) + ("gtksourceview" ,gtksourceview-3) + ("python-pyyaml" ,python-pyyaml) + ("python-pygobject" ,python-pygobject) + ("webkitgtk" ,webkitgtk))) + ;; TODO: package the following for python3 (if possible), add them as + ;; dependencies, and remove them from rednotebook source: + ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags + ;; TODO: package and add pyenchant for python3 and add it as a dependency. + (home-page "https://www.rednotebook.app") + (synopsis "Daily journal with calendar, templates and keyword searching") + (description + "RedNotebook is a modern desktop journal. It lets you format, tag and +search your entries. You can also add pictures, links and customizable +templates, spell check your notes, and export to plain text, HTML, Latex or +PDF.") + (license (list license:gpl2+ ; rednotebook, txt2tags + license:lgpl3+ ; elib.intl + license:gpl3+)))) ; pygtkspellcheck -- cgit v1.2.3 From e30bdd49a5909749baab9fcf566e14e4aac22ccb Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 19 Aug 2019 17:27:17 +0530 Subject: gnu: Add go-github-com-robfig-cron. * gnu/packages/golang.scm (go-github-com-robfig-cron): New variable. --- gnu/packages/golang.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 01de446ce0..950ba9fb37 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -15,6 +15,7 @@ ;;; Copyright @ 2018, 2019 Katherine Cox-Buday ;;; Copyright @ 2019 Giovanni Biscuolo ;;; Copyright @ 2019 Alex Griffin +;;; Copyright © 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -3640,3 +3641,26 @@ stack traces. It simplifies the traces to make salient information more visible and aid debugging.") (home-page "https://github.com/maruel/panicparse") (license license:asl2.0))) + +(define-public go-github-com-robfig-cron + (package + (name "go-github-com-robfig-cron") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robfig/cron") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bvq5gxkhyj21lq32nma23i4dpwp7bswnp2yks6372ilkcyisx2z")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/robfig/cron")) + (home-page "https://godoc.org/github.com/robfig/cron") + (synopsis "Cron library for Go") + (description "This package provides a cron library for Go. It implements +a cron spec parser and job runner.") + (license license:expat))) -- cgit v1.2.3 From 0f3624f8bc102cd729bcd887a171c5588b397c5b Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 19 Aug 2019 17:28:22 +0530 Subject: gnu: Add poussetaches. * gnu/packages/web.scm (poussetaches): New variable. --- gnu/packages/web.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9b2be15e20..52ff9a804e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -68,6 +68,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system ant) #:use-module (guix build-system scons) + #:use-module (guix build-system go) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages adns) @@ -92,6 +93,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnu-doc) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -6597,3 +6599,35 @@ It's also possible to rewrite existing log files. Anonip can also be uses as a Python module in your own Python application.") (license license:bsd-3))) + +(define-public poussetaches + (package + (name "poussetaches") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tsileo/poussetaches") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07106kfcz3a39jvrv3mlqqxlihsmdhgkrjnqznyjsij9absgvdv6")))) + (build-system go-build-system) + (propagated-inputs + `(("go-github-com-robfig-cron" ,go-github-com-robfig-cron) + ("go-golang-org-x-time-rate" ,go-golang-org-x-time-rate))) + (arguments + `(#:import-path "github.com/tsileo/poussetaches")) + (home-page "https://github.com/tsileo/poussetaches") + (synopsis "Lightweight asynchronous task execution service") + (description "Poussetaches (which literally means \"push tasks\" in +French) is a lightweight asynchronous task execution service that aims to +replace Celery and RabbitMQ for small Python applications. + +The app posts base64-encoded payload to poussetaches and specifies the +endpoint that will be used to trigger the task. Poussetaches makes HTTP +requests with the registered payload until the right status code is +returned.") + (license license:isc))) -- cgit v1.2.3 From 7c0a69644fcb4443da1a81dc59328492414aac62 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 29 Aug 2019 16:35:46 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.141. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.141. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3a7efcab67..69546305c7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.140") +(define-public linux-libre-4.14-version "4.14.141") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1wmx7xgm21dk1hvrq14sxh3c4304284sgxr4vngg4pki2ljyspkr"))) + (hash (base32 "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From cb07ec0932b2cfa9d74cfeacfd2e0b1506fb71f0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 29 Aug 2019 16:37:07 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.69. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.69. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 69546305c7..b4863ded3c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.2))) -(define-public linux-libre-4.19-version "4.19.68") +(define-public linux-libre-4.19-version "4.19.69") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0ax04sivi1lsx01m3abi16w6d0jd3qvwzzq2zbn8q2lca505k1wi"))) + (hash (base32 "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 9fbf4d2a52d4d3e01059f3432bb3f78182b5a822 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 29 Aug 2019 16:37:49 -0400 Subject: gnu: linux-libre: Update to 5.2.11. * gnu/packages/linux.scm (linux-libre-5.2-version): Update to 5.2.11. (linux-libre-5.2-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b4863ded3c..0b6a84a90d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.2-version "5.2.10") +(define-public linux-libre-5.2-version "5.2.11") (define-public linux-libre-5.2-pristine-source (let ((version linux-libre-5.2-version) - (hash (base32 "0jgw7gj71i9kf4prbdi9h791ngxf24nr90302glnsa9aghwc95k0"))) + (hash (base32 "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.2))) -- cgit v1.2.3 From ac9cd78ea9e6a3cf850b33fb2111b85e2bbf533d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Aug 2019 10:03:42 +0200 Subject: bootloader: Fix comment about 'menu-entries'. * gnu/bootloader.scm ()[menu-entries]: Fix margin comment. --- gnu/bootloader.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index a381f67145..909036042f 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -108,7 +108,7 @@ (bootloader bootloader-configuration-bootloader) ; (target bootloader-configuration-target ;string (default #f)) - (menu-entries bootloader-configuration-menu-entries ;list of + (menu-entries bootloader-configuration-menu-entries ;list of (default '())) (default-entry bootloader-configuration-default-entry ;integer (default 0)) -- cgit v1.2.3 From 7d09f2e85faa03fd017fef2774c2aa9807c70f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Aug 2019 12:15:09 +0200 Subject: lint: formatting: Reporters return #f or a warning. * guix/lint.scm (report-tabulations, report-trailing-white-space) (report-long-line, report-lone-parentheses): Return #f instead of *unspecified* when there are no warnings. (report-formatting-issues): Use 'filter-map' instead of 'map' + 'filter'. --- guix/lint.scm | 60 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 212ff70d54..2bf5097403 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1031,7 +1031,7 @@ the NIST server non-fatal." (define (report-tabulations package line line-number) "Warn about tabulations found in LINE." (match (string-index line #\tab) - (#f #t) + (#f #f) (index (make-warning package (G_ "tabulation on line ~a, column ~a") @@ -1043,44 +1043,44 @@ the NIST server non-fatal." (define (report-trailing-white-space package line line-number) "Warn about trailing white space in LINE." - (unless (or (string=? line (string-trim-right line)) - (string=? line (string #\page))) - (make-warning package - (G_ "trailing white space on line ~a") - (list line-number) - #:location - (location (package-file package) - line-number - 0)))) + (and (not (or (string=? line (string-trim-right line)) + (string=? line (string #\page)))) + (make-warning package + (G_ "trailing white space on line ~a") + (list line-number) + #:location + (location (package-file package) + line-number + 0)))) (define (report-long-line package line line-number) "Emit a warning if LINE is too long." ;; Note: We don't warn at 80 characters because sometimes hashes and URLs ;; make it hard to fit within that limit and we want to avoid making too ;; much noise. - (when (> (string-length line) 90) - (make-warning package - (G_ "line ~a is way too long (~a characters)") - (list line-number (string-length line)) - #:location - (location (package-file package) - line-number - 0)))) + (and (> (string-length line) 90) + (make-warning package + (G_ "line ~a is way too long (~a characters)") + (list line-number (string-length line)) + #:location + (location (package-file package) + line-number + 0)))) (define %hanging-paren-rx (make-regexp "^[[:blank:]]*[()]+[[:blank:]]*$")) (define (report-lone-parentheses package line line-number) "Emit a warning if LINE contains hanging parentheses." - (when (regexp-exec %hanging-paren-rx line) - (make-warning package - (G_ "parentheses feel lonely, \ + (and (regexp-exec %hanging-paren-rx line) + (make-warning package + (G_ "parentheses feel lonely, \ move to the previous or next line") - (list line-number) - #:location - (location (package-file package) - line-number - 0)))) + (list line-number) + #:location + (location (package-file package) + line-number + 0)))) (define %formatting-reporters ;; List of procedures that report formatting issues. These are not separate @@ -1130,11 +1130,9 @@ them for PACKAGE." warnings (if (< line-number starting-line) '() - (filter - lint-warning? - (map (lambda (report) - (report package line line-number)) - reporters)))))))))))) + (filter-map (lambda (report) + (report package line line-number)) + reporters))))))))))) (define (check-formatting package) "Check the formatting of the source code of PACKAGE." -- cgit v1.2.3 From 546a709f202024c8a5173ad372a87ddc1c284c63 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 29 Aug 2019 15:04:49 +0200 Subject: daemon: Don't reply on 'st_blocks'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ported by Ludovic Courtès from . * nix/libstore/gc.cc (LocalStore::removeUnusedLinks): Use 'st.st_size' instead of 'st.st_blocks * 512'. * nix/libutil/util.cc (_deletePath): Likewise. --- nix/libstore/gc.cc | 9 ++++----- nix/libutil/util.cc | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index 310b8792fe..46171e116c 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -569,9 +569,8 @@ void LocalStore::removeUnusedLinks(const GCState & state) throw SysError(format("statting `%1%'") % path); if (st.st_nlink != 1) { - unsigned long long size = st.st_blocks * 512ULL; - actualSize += size; - unsharedSize += (st.st_nlink - 1) * size; + actualSize += st.st_size; + unsharedSize += (st.st_nlink - 1) * st.st_size; continue; } @@ -580,13 +579,13 @@ void LocalStore::removeUnusedLinks(const GCState & state) if (unlink(path.c_str()) == -1) throw SysError(format("deleting `%1%'") % path); - state.results.bytesFreed += st.st_blocks * 512; + state.results.bytesFreed += st.st_size; } struct stat st; if (stat(linksDir.c_str(), &st) == -1) throw SysError(format("statting `%1%'") % linksDir); - long long overhead = st.st_blocks * 512ULL; + long long overhead = st.st_size; printMsg(lvlInfo, format("note: currently hard linking saves %.2f MiB") % ((unsharedSize - actualSize - overhead) / (1024.0 * 1024.0))); diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 768e12b5e4..9a83876013 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -309,7 +309,7 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed) struct stat st = lstat(path); if (!S_ISDIR(st.st_mode) && st.st_nlink == 1) - bytesFreed += st.st_blocks * 512; + bytesFreed += st.st_size; if (S_ISDIR(st.st_mode)) { /* Make the directory writable. */ -- cgit v1.2.3 From a28cfee841e9c5ab179291d3065f1486fd065e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 23:27:20 +0200 Subject: system: Add 'bootloader-menu-entries' field to . This allows us to keep track of the extra menu entries specified in the OS configuration. * gnu/system.scm ()[bootloader-menu-entries]: New field. (read-boot-parameters): Initialize it. (operating-system-boot-parameters): Likewise. (operating-system-boot-parameters-file): Serialize it. * gnu/bootloader.scm (menu-entry->sexp, sexp->menu-entry): New procedures. --- gnu/bootloader.scm | 34 ++++++++++++++++++++++++++++++++++ gnu/system.scm | 15 +++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 909036042f..01bdd4acaa 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 David Craven ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (guix records) #:use-module (guix ui) #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:export (menu-entry menu-entry? menu-entry-label @@ -32,6 +34,9 @@ menu-entry-initrd menu-entry-device-mount-point + menu-entry->sexp + sexp->menu-entry + bootloader bootloader? bootloader-name @@ -76,6 +81,35 @@ (default '())) ; list of string-valued gexps (initrd menu-entry-initrd)) ; file name of the initrd as a gexp +(define (menu-entry->sexp entry) + "Return ENTRY serialized as an sexp." + (match entry + (($ label device mount-point linux linux-arguments initrd) + `(menu-entry (version 0) + (label ,label) + (device ,device) + (device-mount-point ,mount-point) + (linux ,linux) + (linux-arguments ,linux-arguments) + (initrd ,initrd))))) + +(define (sexp->menu-entry sexp) + "Turn SEXP, an sexp as returned by 'menu-entry->sexp', into a +record." + (match sexp + (('menu-entry ('version 0) + ('label label) ('device device) + ('device-mount-point mount-point) + ('linux linux) ('linux-arguments linux-arguments) + ('initrd initrd) _ ...) + (menu-entry + (label label) + (device device) + (device-mount-point mount-point) + (linux linux) + (linux-arguments linux-arguments) + (initrd initrd))))) + ;;; ;;; Bootloader record. diff --git a/gnu/system.scm b/gnu/system.scm index 01be1243fe..c860c22433 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -116,6 +116,7 @@ boot-parameters-label boot-parameters-root-device boot-parameters-bootloader-name + boot-parameters-bootloader-menu-entries boot-parameters-store-device boot-parameters-store-mount-point boot-parameters-kernel @@ -251,6 +252,8 @@ directly by the user." ;; OS's root file system, so it might be a device path like "/dev/sda3". (root-device boot-parameters-root-device) (bootloader-name boot-parameters-bootloader-name) + (bootloader-menu-entries ;list of + boot-parameters-bootloader-menu-entries) (store-device boot-parameters-store-device) (store-mount-point boot-parameters-store-mount-point) (kernel boot-parameters-kernel) @@ -297,6 +300,11 @@ file system labels." ((_ args) args) (#f 'grub))) ; for compatibility reasons. + (bootloader-menu-entries + (match (assq 'bootloader-menu-entries rest) + ((_ entries) (map sexp->menu-entry entries)) + (#f '()))) + ;; In the past, we would store the directory name of the kernel instead ;; of the absolute file name of its image. Detect that and correct it. (kernel (if (string=? linux (direct-store-path linux)) @@ -1005,6 +1013,8 @@ such as '--root' and '--load' to ." (operating-system-user-kernel-arguments os))) (initrd initrd) (bootloader-name bootloader-name) + (bootloader-menu-entries + (bootloader-configuration-menu-entries (operating-system-bootloader os))) (store-device (ensure-not-/dev (file-system-device store))) (store-mount-point (file-system-mount-point store))))) @@ -1046,6 +1056,11 @@ being stored into the \"parameters\" file)." #$(boot-parameters-kernel-arguments params)) (initrd #$(boot-parameters-initrd params)) (bootloader-name #$(boot-parameters-bootloader-name params)) + (bootloader-menu-entries + #$(map menu-entry->sexp + (or (and=> (operating-system-bootloader os) + bootloader-configuration-menu-entries) + '()))) (store (device #$(device->sexp (boot-parameters-store-device params))) -- cgit v1.2.3 From c3e59de9b1340f1a0ef7e30dd2e4e7bf7b484ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Aug 2019 23:31:28 +0200 Subject: guix system: Reinstalling the bootloader preserves extra menu entries. Fixes . Reported by Jesse Gibbons . Previously 'guix system delete-generations' or 'switch-generation' would lose the extra bootloader menu entries specified in the current system's configuration. This fixes that. * guix/scripts/system.scm (reinstall-bootloader): Turn PARAMS into a single . Adjust ENTRIES to include extra menu entries specified in PARAMS. --- guix/scripts/system.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 9fc3a10e98..27b014db68 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -384,12 +384,14 @@ STORE is an open connection to the store." (bootloader bootloader))) ;; Make the specified system generation the default entry. - (params (profile-boot-parameters %system-profile (list number))) + (params (first (profile-boot-parameters %system-profile + (list number)))) (old-generations (delv number (reverse (generation-numbers %system-profile)))) (old-params (profile-boot-parameters %system-profile old-generations)) - (entries (map boot-parameters->menu-entry params)) + (entries (cons (boot-parameters->menu-entry params) + (boot-parameters-bootloader-menu-entries params))) (old-entries (map boot-parameters->menu-entry old-params))) (run-with-store store (mlet* %store-monad -- cgit v1.2.3 From 02c61278f1327d403f072f42e6b92a1dc62fc93a Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 11 Aug 2019 15:07:05 -0700 Subject: gnu: rust: Update to 1.37.0. * gnu/packages/rust.scm (rust): Rename to... (rust-1.36): ...this. (rust): New variable. --- gnu/packages/rust.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b4c50437f7..6d1b9f1fe4 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1073,7 +1073,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("bins::check") "//bins::check")) #t))))))))) -(define-public rust +(define-public rust-1.36 (let ((base-rust (rust-bootstrapped-package rust-1.35 "1.36.0" "06xv2p6zq03lidr0yaf029ii8wnjjqa894nkmrm6s0rx47by9i04"))) @@ -1084,3 +1084,20 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ((#:phases phases) `(modify-phases ,phases (delete 'patch-process-docs-rev-cmd)))))))) + +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.36 "1.37.0" + "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'configure-cargo-home + (lambda _ + (let ((cargo-home (string-append (getcwd) "/.cargo"))) + (mkdir-p cargo-home) + (setenv "CARGO_HOME" cargo-home) + #t)))))))))) -- cgit v1.2.3 From fa8ef3ed70a81771e888d6e7cdcc6612fadbdbda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 02:44:25 +0200 Subject: gnu: eolie: Update to 0.9.63. * gnu/packages/gnome.scm (eolie): Update to 0.9.63. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6ef6fdfc42..ab2c819db4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4312,15 +4312,15 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.62") + (version "0.9.63") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/bb4aad19272cc636bd17f2f6602127fe/" + "uploads/d42b466752729a0d3fa828a721e25043/" "eolie-" version ".tar.xz")) (sha256 (base32 - "06v76hg87fnhw45dil5vvl20myvaa38n1jqsl0lmkkq6af4mk8wx")))) + "11pp8g0w22h1q0bbj9517l5838gcymvvp8fp9kh6h2dmgir2ssih")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From d7c2c4bda5088435df50663a14749470f9714044 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:23:09 +0200 Subject: gnu: conky: Update to 1.11.5. * gnu/packages/conky.scm (conky): Update to 1.11.5. --- gnu/packages/conky.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index 2b32bf8791..681feb6e43 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -37,7 +37,7 @@ (package (name "conky") (home-page "https://github.com/brndnmtthws/conky") - (version "1.11.3") + (version "1.11.5") (source (origin (method git-fetch) @@ -46,10 +46,10 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv")))) + (base32 "1a75ss48mn9pknrxy33dh5rdgm67a5kpddsyqfhlcn1761kfzzyp")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; there are no tests + `(#:tests? #f ; there are no tests #:configure-flags (list "-DRELEASE=true") #:phases -- cgit v1.2.3 From d41ee146ce8ef77b36b37354f47c7e9aa470e3c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:24:42 +0200 Subject: gnu: libhandy: Update to 0.0.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libhandy): Update to 0.0.11. [arguments]: Remove ‘disable-broken-test’ phase. [native-inputs]: Add hicolor-icon-theme. --- gnu/packages/gnome.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab2c819db4..a30fc8460c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8242,7 +8242,7 @@ advanced image management tool") (define-public libhandy (package (name "libhandy") - (version "0.0.10") + (version "0.0.11") (source (origin (method git-fetch) @@ -8251,7 +8251,7 @@ advanced image management tool") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1702hbdqhfpgw0c4vj2ag08vgl83byiryrbngbq11b9azmj3jhzs")))) + (base32 "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -8259,12 +8259,6 @@ advanced image management tool") "-Dgtk_doc=true") #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-broken-test - (lambda _ - ;; This test fails for unknown reasons - (substitute* "tests/meson.build" - (("'test-dialog',") "")) - #t)) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. @@ -8280,7 +8274,10 @@ advanced image management tool") ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server) + + ;; Test suite dependencies. + ("hicolor-icon-theme" ,hicolor-icon-theme))) (home-page "https://source.puri.sm/Librem5/libhandy") (synopsis "Library full of GTK+ widgets for mobile phones") (description "The aim of the handy library is to help with developing user -- cgit v1.2.3 From 9441a9c1635edf4678d35f425a4aab0a2abb1bda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:24:58 +0200 Subject: gnu: python-pybtex: Update to 0.22.2. * gnu/packages/python-xyz.scm (python-pybtex): Update to 0.22.2. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e7fffd0879..d5fcc5668c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14677,14 +14677,13 @@ working with iterables.") (define-public python-pybtex (package (name "python-pybtex") - (version "0.21") + (version "0.22.2") (source (origin (method url-fetch) (uri (pypi-uri "pybtex" version)) (sha256 - (base32 - "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg")))) + (base32 "070wfcmxrd7xg1si421mi9150gmx2qwx431nwf69sq3hhmgnx080")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From 7ab5c4e0e861cfe979591e1ffab9c6e9f26caa6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:37:52 +0200 Subject: gnu: emacs: Update to 26.3. * gnu/packages/emacs.scm (emacs): Update to 26.3. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e18db26821..5a3577350d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Mathieu Othacehe -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,14 +68,14 @@ (define-public emacs (package (name "emacs") - (version "26.2") + (version "26.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m")) + "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d")) (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-source-date-epoch.patch")) @@ -114,7 +114,7 @@ #t)))) (build-system glib-or-gtk-build-system) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:configure-flags (list "--with-modules" "--disable-build-details") #:phases -- cgit v1.2.3 From ee0de9945438cce41ef20e37144f41a8d40cd1ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 29 Aug 2019 23:02:10 +0200 Subject: services: cups: Add BrowseDNSSDSubTypes directive. * gnu/services/cups.scm (comma-separated-string-list?) (serialize-comma-separated-string-list): New variables. (cups-configuration)[browse-dns-sd-sub-types]: New field. * doc/guix.texi (Printing Services): Document it. --- doc/guix.texi | 8 ++++++++ gnu/services/cups.scm | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 1998ad049b..ed74034dc6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14248,6 +14248,14 @@ longer required for quotas. Defaults to @samp{#f}. @end deftypevr +@deftypevr {@code{cups-configuration} parameter} comma-separated-string-list browse-dns-sd-sub-types +Specifies a list of DNS-SD sub-types to advertise for each shared printer. +For example, @samp{"_cups" "_print"} will tell network clients that both +CUPS sharing and IPP Everywhere are supported. + +Defaults to @samp{"_cups"}. +@end deftypevr + @deftypevr {@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols Specifies which protocols to use for local printer sharing. diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index e77c43bfbf..ace7889fb6 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -83,6 +83,14 @@ (define (serialize-multiline-string-list field-name val) (for-each (lambda (str) (serialize-field field-name str)) val)) +(define (comma-separated-string-list? val) + (and (list? val) + (and-map (lambda (x) + (and (string? x) (not (string-index x #\,)))) + val))) +(define (serialize-comma-separated-string-list field-name val) + (serialize-field field-name (string-join val ","))) + (define (space-separated-string-list? val) (and (list? val) (and-map (lambda (x) @@ -489,6 +497,11 @@ requests.") (boolean #f) "Specifies whether to purge job history data automatically when it is no longer required for quotas.") + (browse-dns-sd-sub-types + (comma-separated-string-list (list "_cups")) + "Specifies a list of DNS-SD sub-types to advertise for each shared printer. +For example, @samp{\"_cups\" \"_print\"} will tell network clients that both +CUPS sharing and IPP Everywhere are supported.") (browse-local-protocols (browse-local-protocols 'dnssd) "Specifies which protocols to use for local printer sharing.") -- cgit v1.2.3 From 70186c24eee7603e1763143ba97ab6abea63f10c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 27 Aug 2019 19:22:04 +0200 Subject: services: cups: Move SET-ENV to FILES-CONFIGURATION. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/cups.scm (cups-configuration): Move SET-ENV from here… (files-configuration): …to here. * doc/guix.texi (Printing Services): Adjust accordingly. --- doc/guix.texi | 12 ++++++------ gnu/services/cups.scm | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ed74034dc6..32c98e23c6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14228,6 +14228,12 @@ programs. Defaults to @samp{"lp"}. @end deftypevr + +@deftypevr {@code{files-configuration} parameter} string set-env +Set the specified environment variable to be passed to child processes. + +Defaults to @samp{"variable value"}. +@end deftypevr @end deftypevr @deftypevr {@code{cups-configuration} parameter} access-log-level access-log-level @@ -14755,12 +14761,6 @@ the output of the @code{uname} command. @code{Full} reports @code{CUPS Defaults to @samp{Minimal}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string set-env -Set the specified environment variable to be passed to child processes. - -Defaults to @samp{"variable value"}. -@end deftypevr - @deftypevr {@code{cups-configuration} parameter} multiline-string-list ssl-listen Listens on the specified interfaces for encrypted connections. Valid values are of the form @var{address}:@var{port}, where @var{address} is diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index ace7889fb6..2105df6ded 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -458,7 +458,10 @@ or state files.") (user (string "lp") "Specifies the user name or ID that is used when running external -programs.")) +programs.") + (set-env + (string "variable value") + "Set the specified environment variable to be passed to child processes.")) (define (serialize-files-configuration field-name val) #f) @@ -811,9 +814,6 @@ reports @code{CUPS 2.0}. @code{Minimal} reports @code{CUPS 2.0.0}. @code{OS} reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the @code{uname} command. @code{Full} reports @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}.") - (set-env - (string "variable value") - "Set the specified environment variable to be passed to child processes.") (ssl-listen (multiline-string-list '()) "Listens on the specified interfaces for encrypted connections. Valid -- cgit v1.2.3 From 521bb336782b8fe04b57ebaadd55be005a85d788 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:16:14 +0200 Subject: gnu: gwenhywfar: Update to 4.20.2. * gnu/packages/gnucash.scm (gwenhywfar): Update to 4.20.2. [source]: Remove FILE-NAME. --- gnu/packages/gnucash.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 2196a8c50a..5d40bc3beb 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -231,17 +231,14 @@ to be read using the GNOME Yelp program.") (define-public gwenhywfar (package (name "gwenhywfar") - (version "4.20.0") + (version "4.20.2") (source (origin (method url-fetch) - (uri (string-append "https://www.aquamaniac.de/sites/download/" - "download.php?package=01&release=208&file=02&" - "dummy=gwenhywfar-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "https://www.aquamaniac.de/rdm/attachments/" + "download/108/gwenhywfar-" version ".tar.gz")) (sha256 - (base32 - "1c0g3f8jk6j693774ifslx2ds4ksabgbbalhhm9gk20kpamxm22s")))) + (base32 "0w1j7ppr1247kr3bpn4dqwyxp6cl8mfgr0m4782iz8f8a4ixjkqg")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 43412ab967ee00789fe933f916d804aed9961c57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:17:07 +0200 Subject: gnu: aqbanking: Update to 5.8.1. * gnu/packages/gnucash.scm (aqbanking): Update to 5.8.1. [source]: Remove FILE-NAME. --- gnu/packages/gnucash.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 5d40bc3beb..2ed1a890f7 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Chris Marusich -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -268,17 +268,14 @@ applications and libraries. It is used by AqBanking.") (define-public aqbanking (package (name "aqbanking") - (version "5.7.8") + (version "5.8.1") (source (origin (method url-fetch) - (uri (string-append "https://www.aquamaniac.de/sites/download/" - "download.php?package=03&release=217&file=02&" - "dummy=aqbanking-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append "https://www.aquamaniac.de/rdm/attachments/" + "download/105/aqbanking-" version ".tar.gz")) (sha256 - (base32 - "0s67mysskbiw1h1p0np4ph4351r7wq3nc873vylam7lsqi66xy0n")))) + (base32 "0m44n2hyxprxzq7ijkrd7rmhhl0r033s1k21ix9y67a0p9skl1mg")))) (build-system gnu-build-system) (arguments `(;; Parallel building fails because aqhbci is required before it's -- cgit v1.2.3 From 45a973b3471f9e0435e573f0de4458da4a4a18e3 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 28 Aug 2019 08:31:35 +0200 Subject: gnu: Add emacs-helm-ag. * gnu/packages/emacs-xyz.scm (emacs-helm-ag): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8fa5f71b9c..c01eba1264 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6292,6 +6292,31 @@ not tied in the trap of backward compatibility.") for search-based navigation of buffers.") (license license:gpl2+))) +(define-public emacs-helm-ag + (let ((commit "2fc02c4ead29bf0db06fd70740cc7c364cb650ac") + (revision "1")) + (package + (name "emacs-helm-ag") + (version "0.58") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/syohex/emacs-helm-ag.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (home-page "https://github.com/syohex/emacs-helm-ag") + (synopsis "Helm interface to the Silver Searcher") + (description + "This package provides a frontend for grepping tools like ag and ack, +as well as features for editing search results.") + (license license:gpl3+)))) + (define-public emacs-helm-projectile (package (name "emacs-helm-projectile") -- cgit v1.2.3 From ab46af12660d76a616e11c72768fa0a8142b8d72 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 28 Aug 2019 08:54:41 +0200 Subject: gnu: emacs-mbsync: Update to 0.1.2-2.f549ecc. * gnu/packages/emacs-xyz.scm (emacs-mbsync): Update to 0.1.2-2.f549ecc. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c01eba1264..151ef18135 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11931,12 +11931,11 @@ key again.") (license license:gpl3+))) (define-public emacs-mbsync - (let ((commit "42077e83ae2db778ce0f8e22f8357b40355526b3") - (revision "1")) + (let ((commit "f549eccde6033449d24cd5b6148599484850c403") + (revision "2")) (package (name "emacs-mbsync") - (version (string-append "0.0.1" "-" revision "." - (string-take commit 7))) + (version (git-version "0.1.2" revision commit)) (source (origin (method git-fetch) @@ -11946,7 +11945,7 @@ key again.") (file-name (git-file-name name version)) (sha256 (base32 - "0yj93y2mpxlir8x73znlg1slxlv4blm1vjv5h2w3j8lxg8bxvmn6")))) + "1pdj41rq3pq4jdb5pma5j495xj7w7jgn8pnz1z1zwg75pn7ydfp0")))) (build-system emacs-build-system) (home-page "https://github.com/dimitri/mbsync-el") (synopsis "Interface to mbsync for Emacs") -- cgit v1.2.3 From 611049b397e6eab0d1b3d104031420e38b712115 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 29 Aug 2019 18:12:48 +0200 Subject: gnu: Add emacs-taskrunner. * gnu/packages/emacs-xyz.scm (emacs-taskrunner): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 151ef18135..1275753306 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6341,6 +6341,32 @@ as well as features for editing search results.") "This Emacs library provides a Helm interface for Projectile.") (license license:gpl3+))) +(define-public emacs-taskrunner + (let ((commit "3afd4a546d42339543d3d4e51b175fc3e82b3358") + (revision "1")) + (package + (name "emacs-taskrunner") + (version (git-version "0.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-taskrunner/emacs-taskrunner.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lkdvmjn3alhqxq2i64sdr977sbw3g0b2670d9bwyzi67qh0jxrv")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-async" ,emacs-async) + ("emacs-projectile" ,emacs-projectile))) + (home-page "https://github.com/emacs-taskrunner/emacs-taskrunner") + (synopsis "Retrieve tasks from various build systems and task-runners") + (description "This package parses Makefiles and build-system files for +multiple project types.") + (license license:gpl3+)))) + (define-public emacs-helm-make (let ((commit "feae8df22bc4b20705ea08ac9adfc2b43bb348d0") (revision "1")) -- cgit v1.2.3 From ed51d4206375b13e63a7518907fb4e1bda888976 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 29 Aug 2019 18:13:06 +0200 Subject: gnu: Add emacs-ivy-taskrunner. * gnu/packages/emacs-xyz.scm (emacs-ivy-taskrunner): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1275753306..3024f78716 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6367,6 +6367,33 @@ as well as features for editing search results.") multiple project types.") (license license:gpl3+)))) +(define-public emacs-ivy-taskrunner + (let ((commit "75d8d67cfe3c29663fe0f5508a887adf40ed5162") + (revision "1")) + (package + (name "emacs-ivy-taskrunner") + (version (git-version "0.9" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-taskrunner/ivy-taskrunner.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wf4s4k0ap21f7g5w6128an8nsvbja7f5n889vcml5b6gjz058db")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ivy" ,emacs-ivy) + ("emacs-taskrunner" ,emacs-taskrunner) + ("emacs-projectile" ,emacs-projectile))) + (home-page "https://github.com/emacs-taskrunner/ivy-taskrunner") + (synopsis "Retrieve build-system tasks using Ivy") + (description "This package provides an Ivy interface for selecting +Makefile targets.") + (license license:gpl3+)))) + (define-public emacs-helm-make (let ((commit "feae8df22bc4b20705ea08ac9adfc2b43bb348d0") (revision "1")) -- cgit v1.2.3 From 5796215a73c3d104ebe497cf3d1a33c9f2c85e72 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 29 Aug 2019 18:13:12 +0200 Subject: gnu: Add emacs-helm-taskrunner. * gnu/packages/emacs-xyz.scm (emacs-helm-taskrunner): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3024f78716..9e94d3fc8e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6394,6 +6394,33 @@ multiple project types.") Makefile targets.") (license license:gpl3+)))) +(define-public emacs-helm-taskrunner + (let ((commit "1910dac19cbc7bd4fd08b0faf9affd455339fbea") + (revision "1")) + (package + (name "emacs-helm-taskrunner") + (version (git-version "0.9" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-taskrunner/helm-taskrunner.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "182lmr858fx6rdhp1fy7kv8dvrhzcnxzwfck1q22s6xs8x85d5q7")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-taskrunner" ,emacs-taskrunner) + ("emacs-projectile" ,emacs-projectile))) + (home-page "https://github.com/emacs-taskrunner/helm-taskrunner") + (synopsis "Retrieve build-system tasks using Helm") + (description "This package provides a Helm interface for selecting +Makefile targets.") + (license license:gpl3+)))) + (define-public emacs-helm-make (let ((commit "feae8df22bc4b20705ea08ac9adfc2b43bb348d0") (revision "1")) -- cgit v1.2.3 From 06947252d3de55aff765334b88cde5990efa6abf Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 30 Aug 2019 11:41:48 +0200 Subject: gnu: wlroots: Update to 0.7.0. * gnu/packages/wm.scm (wlroots): Update to 0.7.0. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c6f333cad9..a69c460e87 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1143,7 +1143,7 @@ functionality to display information about the most commonly used services.") (define-public wlroots (package (name "wlroots") - (version "0.6.0") + (version "0.7.0") (source (origin (method git-fetch) @@ -1152,7 +1152,7 @@ functionality to display information about the most commonly used services.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4")))) + (base32 "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dlogind-provider=elogind") -- cgit v1.2.3 From d85c0f98424444eee10c721a03b400498cc89a6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 30 Aug 2019 22:42:29 +0200 Subject: gnu: Add r-genie3. * gnu/packages/bioconductor.scm (r-genie3): New variable. --- gnu/packages/bioconductor.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ea43bf2fdf..b7bc58d507 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5230,3 +5230,24 @@ cis-regulatory topics (cisTopics) from single cell epigenomics data, and includes functionalities to identify cell states based on the contribution of cisTopics and explore the nature and regulatory proteins driving them.") (license license:gpl3)))) + +(define-public r-genie3 + (package + (name "r-genie3") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "GENIE3" version)) + (sha256 + (base32 + "0lvrpw4xn7xyinmn13f65i0vkzfzwdj5y8gsa8vyy8kcn83d28fx")))) + (properties `((upstream-name . "GENIE3"))) + (build-system r-build-system) + (propagated-inputs `(("r-reshape2" ,r-reshape2))) + (home-page "https://bioconductor.org/packages/GENIE3") + (synopsis "Gene network inference with ensemble of trees") + (description + "This package implements the GENIE3 algorithm for inferring gene +regulatory networks from expression data.") + (license license:gpl2+))) -- cgit v1.2.3 From b126f41b301a5ac13835bf20026ae6d1d5ae2bee Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 30 Aug 2019 13:47:44 -0700 Subject: gnu: diffoscope: Update to 122. * gnu/packages/package-management (diffoscope): Update to 122. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c4254f2aea..ff3e0d3209 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -546,7 +546,7 @@ transactions from C or Python.") (license license:gpl2+))) (define-public diffoscope - (let ((version "121")) + (let ((version "122")) (package (name "diffoscope") (version version) @@ -558,7 +558,7 @@ transactions from C or Python.") (file-name (git-file-name name version)) (sha256 (base32 - "1bw7s8qs1vnr93vhifl6pj6h6w6r6nrpc5anzhh9wx2gcaipkb3m")))) + "1pwddknk8qyv88ba63why8vbnlc14b47434lv4ijx49m7ya3zfvg")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 8f685df247ad859fefaeeef14332b2c455ffc5b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 23 Aug 2019 22:33:31 +0200 Subject: gnu: Add jbigkit. * gnu/packages/image.scm (jbigkit): New public variable. --- gnu/packages/image.scm | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5f3cf0ac2c..670aeff85a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -643,6 +643,81 @@ work.") (home-page "https://jbig2dec.com") (license license:gpl2+))) +(define-public jbigkit + (package + (name "jbigkit") + (version "2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.cl.cam.ac.uk/~mgk25/jbigkit/" + "download/jbigkit-" version ".tar.gz")) + (sha256 + (base32 "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove files without clear licence information. + (for-each delete-file-recursively + (list "contrib" "examples")) + #t)))) + (build-system gnu-build-system) + (outputs (list "out" "pbmtools")) + (arguments + `(#:modules ((srfi srfi-26) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install ; no ‘make install’ target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (include (string-append out "/include"))) + (with-directory-excursion "libjbig" + (for-each (cut install-file <> include) + (find-files "." "\\.h$")) + (for-each (cut install-file <> lib) + (find-files "." "\\.a$"))) + #t))) + (add-after 'install 'install-pbmtools + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "pbmtools")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1")) + (man5 (string-append out "/share/man/man5"))) + (with-directory-excursion "pbmtools" + (for-each (cut install-file <> bin) + (list "jbgtopbm" "jbgtopbm85" + "pbmtojbg" "pbmtojbg85")) + + (for-each (cut install-file <> man1) + (find-files "." "\\.1$")) + (for-each (cut install-file <> man5) + (find-files "." "\\.5$")) + #t))))) + #:test-target "test" + #:tests? #f)) ; tests depend on examples/ + (home-page "https://www.cl.cam.ac.uk/~mgk25/jbigkit/") + (synopsis "Lossless compression for bi-level high-resolution images") + (description + "JBIG-KIT implements the JBIG1 data compression standard (ITU-T T.82 and +ISO/IEC 11544:1993), designed for bi-level (one bit per pixel) images such as +black-and-white scanned documents. It is widely used in fax products, printer +firmware and drivers, document management systems, and imaging software. + +This package provides a static C library of (de)compression functions and some +simple command-line converters similar to those provided by netpbm. + +Two JBIG1 variants are available. One (@file{jbig.c}) implements nearly all +options of the standard but has to keep the full uncompressed image in memory. +The other (@file{jbig85.c}) implements just the ITU-T T.85 profile, with +memory management optimized for embedded and fax applications. It buffers +only a few lines of the uncompressed image in memory and is able to stream +images of initially unknown height.") + (license (list license:isc ; pbmtools/p?m.5 + license:gpl2+)))) ; the rest + (define-public openjpeg (package (name "openjpeg") -- cgit v1.2.3 From 390f3e9e0292e9f46f869e1749b1807794dc4c82 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 23 Aug 2019 22:34:00 +0200 Subject: gnu: Add splix. * gnu/packages/cups.scm (splix): New public variable. --- gnu/packages/cups.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 22b87460ab..4ce13ae8f8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -48,6 +48,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix svn-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -740,6 +741,66 @@ language.") (home-page "http://download.ebz.epson.net/dsc/search/01/search") (license license:gpl2+))) +(define-public splix + ;; The last release was in 2009. The SVN repository contains 5 years of + ;; unreleased bug fixes and support for newer printer models. + (let ((revision 315)) + (package + (name "splix") + (version (string-append "2.0.0-" (number->string revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://svn.code.sf.net/p/splix/code/splix/") + (revision revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl")))) + (build-system gnu-build-system) + ;; 90% (3.8 MiB) of output are .ppd files. Don't install them by default: + ;; CUPS has been able to read the .drv sources directly since version 1.2. + (outputs (list "out" "ppd")) + (arguments + '(#:make-flags + (list (string-append "CUPSDRV=" + (assoc-ref %outputs "out") "/share/cups/drv") + (string-append "CUPSFILTER=" + (assoc-ref %outputs "out") "/lib/cups/filter") + (string-append "CUPSPPD=" + (assoc-ref %outputs "ppd") "/share/cups/model") + "CACHESIZE=100" ; pages in RAM, ±300 KiB each + "THREADS=4") ; compress and print faster + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'build 'build-.drv-files + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "drv" make-flags))) + (add-after 'install 'install-.drv-files + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" "DRV_ONLY=1" make-flags)))) + #:tests? #f)) ; no test suite + (inputs + `(("cups" ,cups-minimal) + ("zlib" ,zlib) + + ;; This dependency can be dropped by setting DISABLE_JBIG=1, but the + ;; result will not support some printers like the Samsung CLP-600. + ("jbigkit" ,jbigkit))) + (synopsis "QPDL (SPL2) printer driver") + (description + "SpliX is a set of CUPS drivers for printers that speak @acronym{QPDL, +Quick Page Description Language}, also called @acronym{SPL2, Samsung Printer +Language version 2}. These include many laser printers sold by Samsung, +Xerox, Lexmark, Toshiba, and Dell. + +Colour printers need colour profile files to get better results. These +@file{cms} files are provided by the printer's manufacturer and must be +obtained and installed separately.") + (home-page "http://splix.ap2c.org/") + (license license:gpl2)))) + (define-public python-pycups (package (name "python-pycups") -- cgit v1.2.3 From 3774efe36ff0cd20359506064484079001984f1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 17:28:24 +0200 Subject: doc: Prefer https:// over git://. * doc/guix.texi (Continuous Integration): Use https:// in fictitious URLs. --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 32c98e23c6..663228f00e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -21377,12 +21377,12 @@ the @code{"custom-packages"} input, which is the equivalent of (#:branch . "master") (#:no-compile? . #t)) ((#:name . "config") - (#:url . "git://git.example.org/config.git") + (#:url . "https://git.example.org/config.git") (#:load-path . ".") (#:branch . "master") (#:no-compile? . #t)) ((#:name . "custom-packages") - (#:url . "git://git.example.org/custom-packages.git") + (#:url . "https://git.example.org/custom-packages.git") (#:load-path . ".") (#:branch . "master") (#:no-compile? . #t))))))) -- cgit v1.2.3 From 7e5e39a72fbe5b8bc832d6b15a94b75c7e28e6b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 17:42:51 +0200 Subject: doc: Update GIT-DOWNLOAD @example. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (origin Reference): Use (HTTPS, GNU-hosted) ‘hello’ package repository instead of off-line ‘shadow’ one. --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 663228f00e..8469aad2b4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5565,8 +5565,8 @@ specified in the @code{uri} field as a @code{git-reference} object; a @example (git-reference - (url "git://git.debian.org/git/pkg-shadow/shadow") - (commit "v4.1.5.1")) + (url "https://git.savannah.gnu.org/git/hello.git") + (commit "v2.10")) @end example @end table -- cgit v1.2.3 From 8280e0864abbcdeb14b4ab65cc50a77e3521ab18 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 20:55:58 +0200 Subject: gnu: libusb: Update to 1.0.23. * gnu/packages/libusb.scm (libusb): Update to 1.0.23. --- gnu/packages/libusb.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 5ef62e47fb..ba90d51130 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -51,15 +51,15 @@ (define-public libusb (package (name "libusb") - (version "1.0.22") + (version "1.0.23") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libusb/libusb-1.0/" - "libusb-" version "/libusb-" version ".tar.bz2")) + (uri (string-append "https://github.com/libusb/libusb/" + "releases/download/v" version + "/libusb-" version ".tar.bz2")) (sha256 - (base32 - "0mw1a5ss4alg37m6bd4k44v35xwrcwp5qm4s686q1nsgkbavkbkm")))) + (base32 "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv")))) (build-system gnu-build-system) ;; XXX: Enabling udev is now recommended, but eudev indirectly depends on -- cgit v1.2.3 From c9e37fe35391741d0db00c46a0629aff8bf70701 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 20:56:07 +0200 Subject: gnu: libusb-compat: Don't use NAME in source URI. * gnu/packages/libusb.scm (libusb-compat)[source]: Hard-code NAME. --- gnu/packages/libusb.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index ba90d51130..2018f1b3f4 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -82,9 +82,9 @@ devices on various operating systems.") (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libusb/" - name "-" (version-major+minor version) "/" - name "-" version "/" - name "-" version ".tar.bz2")) + "libusb-compat-" (version-major+minor version) "/" + "libusb-compat-" version "/" + "libusb-compat-" version ".tar.bz2")) (sha256 (base32 "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0")))) -- cgit v1.2.3 From 7ef15fa378d0cc5d14a244f6f53ffe44c682f7c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 20:56:23 +0200 Subject: gnu: mpg123: Update to 1.25.12. * gnu/packages/mp3.scm (mpg123): Update to 1.25.12. --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 967e299803..a218071edb 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -305,7 +305,7 @@ This package contains the binary.") (define-public mpg123 (package (name "mpg123") - (version "1.25.10") + (version "1.25.12") (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" @@ -315,7 +315,7 @@ This package contains the binary.") version ".tar.bz2"))) (sha256 (base32 - "08vhp8lz7d9ybhxcmkq3adwfryhivfvp0745k4r9kgz4wap3f4vc")))) + "1l9iwwgqzw6yg5zk9pqmlbfyq6d8dqysbmj0j3m8dyrxd34wgzhz")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 93a16e4d0dacba27d7bdedfb2181b4c150522a66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 21:12:53 +0200 Subject: gnu: numactl: Update to 2.0.13. * gnu/packages/linux.scm (numactl): Update to 2.0.13. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b6a84a90d..0ec5adaf64 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2313,7 +2313,7 @@ compressed, transparent to other programs, without decompressing them.") (define-public numactl (package (name "numactl") - (version "2.0.12") + (version "2.0.13") (source (origin (method url-fetch) (uri (string-append @@ -2321,7 +2321,7 @@ compressed, transparent to other programs, without decompressing them.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0ad7mpi3vacbfnx3aqxnvgsj64yp3mav9yxnaz8ancjv7wvdmfsm")))) + "16lcypvcmx1ydkpi2s82kqhg13kak7qhpbnj8hd9bdbyhr5ja7lr")))) (build-system gnu-build-system) (arguments '(;; There's a 'test' target, but it requires NUMA support in the kernel -- cgit v1.2.3 From 1ec29dff3ab2bcf1cdc637590889c46592e10fe1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 21:13:00 +0200 Subject: gnu: numactl: Don't use NAME in source URI. * gnu/packages/linux.scm (numactl)[source]: Hard-code NAME. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0ec5adaf64..0fd532b101 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2318,7 +2318,7 @@ compressed, transparent to other programs, without decompressing them.") (method url-fetch) (uri (string-append "https://github.com/numactl/numactl/releases/download/v" - version "/" name "-" version ".tar.gz")) + version "/numactl-" version ".tar.gz")) (sha256 (base32 "16lcypvcmx1ydkpi2s82kqhg13kak7qhpbnj8hd9bdbyhr5ja7lr")))) -- cgit v1.2.3 From 5a097cdd5446587511dbee049ad706366c74e5ad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 31 Aug 2019 03:23:16 +0200 Subject: =?UTF-8?q?services:=20cups:=20Rename=20=E2=80=98retry-this-job?= =?UTF-8?q?=E2=80=99=20to=20=E2=80=98retry-current-job=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/cups.scm (error-policy, cups-configuration): Substitute RETRY-CURRENT-JOB for the obsolete RETRY-THIS-JOB name of this policy. * doc/guix.texi (Printing Services): Likewise. --- doc/guix.texi | 2 +- gnu/services/cups.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8469aad2b4..54c7ea739e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14347,7 +14347,7 @@ Defaults to @samp{30}. Specifies what to do when an error occurs. Possible values are @code{abort-job}, which will discard the failed print job; @code{retry-job}, which will retry the job at a later time; -@code{retry-this-job}, which retries the failed job immediately; and +@code{retry-current-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer. Defaults to @samp{stop-printer}. diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 2105df6ded..c3c6d2f1be 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -139,7 +139,7 @@ (define-enumerated-field-type default-encryption (Never IfRequested Required)) (define-enumerated-field-type error-policy - (abort-job retry-job retry-this-job stop-printer)) + (abort-job retry-job retry-current-job stop-printer)) (define-enumerated-field-type log-level (none emerg alert crit error warn notice info debug debug2)) (define-enumerated-field-type log-time-format @@ -554,7 +554,7 @@ typically within a few milliseconds.") (error-policy 'stop-printer) "Specifies what to do when an error occurs. Possible values are @code{abort-job}, which will discard the failed print job; @code{retry-job}, -which will retry the job at a later time; @code{retry-this-job}, which retries +which will retry the job at a later time; @code{retry-current-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer.") (filter-limit -- cgit v1.2.3 From 79d5ac595436c1dd9b288a1789d139bddc503915 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 21:14:04 +0200 Subject: gnu: numactl: Fix typo in & mark up description. * gnu/packages/linux.scm (numactl)[description]: Fix typo & use @command{}. --- gnu/packages/linux.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0fd532b101..e445b743f2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2335,14 +2335,14 @@ compressed, transparent to other programs, without decompressing them.") (synopsis "Tools for non-uniform memory access (NUMA) machines") (description "NUMA stands for Non-Uniform Memory Access, in other words a system whose -memory is not all in one place. The numactl program allows you to run your -application program on specific CPU's and memory nodes. It does this by -supplying a NUMA memory policy to the operating system before running your +memory is not all in one place. The @command{numactl} program allows you to +run your application program on specific CPUs and memory nodes. It does this +by supplying a NUMA memory policy to the operating system before running your program. -The package contains other commands, such as numademo, numastat and memhog. -The numademo command provides a quick overview of NUMA performance on your -system.") +The package contains other commands, such as @command{numastat}, +@command{memhog}, and @command{numademo} which provides a quick overview of +NUMA performance on your system.") (license (list license:gpl2 ;programs license:lgpl2.1)))) ;library -- cgit v1.2.3 From f6e82e0b3de5d2b10b206356e111fad76a825ade Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 31 Aug 2019 11:02:21 +0200 Subject: gnu: wine-staging: Update to 4.15. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.15. * gnu/packages/wine.scm (wine-staging): Update to 4.15. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 4cf1a3ac4b..3a5def50b1 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -318,7 +318,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.14") + (version "4.15") (source (origin (method git-fetch) @@ -328,7 +328,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1s17hcrp1aa0v99y5iav2s0lxdx2rzgm7z0c4zhxyydqxj399f5j")))) + "13g40h2ybcl6vab4zbl1ksqfqyly5hzxssza9dv8r5pmp8x54hgr")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -374,7 +374,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1rl1a3k5sr0hyxc61d68kwandhxcnxwv6b77vh7x2rkl1h4nxmfs")))) + "0bfh4vd99zwj7f4108zvs80dfvmmnnsap7i6gmf21jgcly3paygq")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("faudio" ,faudio) ("ffmpeg" ,ffmpeg) -- cgit v1.2.3 From 62e42dfa236a14dcf30994602f2841ac16f26c08 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 29 Aug 2019 21:15:59 -0400 Subject: gnu: Move application packages out of haskell.scm. * gnu/packages/haskell.scm (cabal-install, corrode, cpphs, hlint, hscolour, shellcheck): Move variables from here... * gnu/packages/haskell-apps.scm: ...to here. Co-authored-by: Timothy Sample --- gnu/packages/haskell-apps.scm | 196 ++++++++++++++++++++++++++++++++++++++++++ gnu/packages/haskell.scm | 193 +---------------------------------------- 2 files changed, 197 insertions(+), 192 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index e77f6d113b..ecc097ceb6 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -1,6 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015 Siniša Biđin ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 ng0 +;;; Copyright © 2017 Danny Milosavljevic +;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Timothy Sample ;;; Copyright © 2018 Arun Isaac @@ -25,6 +28,7 @@ (define-module (gnu packages haskell-apps) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system haskell) @@ -42,6 +46,103 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages version-control)) +(define-public cabal-install + (package + (name "cabal-install") + (version "2.2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/cabal-install/cabal-install-" + version + ".tar.gz")) + (sha256 + (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8")))) + (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) + ("ghc-echo" ,ghc-echo) + ("ghc-edit-distance" ,ghc-edit-distance) + ("ghc-hackage-security" ,ghc-hackage-security) + ("ghc-hashable" ,ghc-hashable) + ("ghc-http" ,ghc-http) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-network" ,ghc-network) + ("ghc-random" ,ghc-random) + ("ghc-resolv" ,ghc-resolv) + ("ghc-tar" ,ghc-tar) + ("ghc-zlib" ,ghc-zlib))) + (home-page "https://www.haskell.org/cabal/") + (synopsis "Command-line interface for Cabal and Hackage") + (description + "The cabal command-line program simplifies the process of managing +Haskell software by automating the fetching, configuration, compilation and +installation of Haskell libraries and programs.") + (license license:bsd-3))) + +(define-public corrode + (let ((commit "b6699fb2fa552a07c6091276285a44133e5c9789")) + (package + (name "corrode") + (version (string-append "0.0.1-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jameysharp/corrode.git") + (commit "b6699fb2fa552a07c6091276285a44133e5c9789"))) + (file-name + (string-append name "-" version "-checkout")) + (sha256 + (base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r")))) + (build-system haskell-build-system) + (inputs + `(("ghc-language-c" ,ghc-language-c) + ("ghc-markdown-unlit" ,ghc-markdown-unlit))) + (home-page "https://github.com/jameysharp/corrode") + (synopsis "Automatic semantics-preserving translation from C to Rust") + (description + "This program reads a C source file and prints an equivalent module in +Rust syntax. It is intended to be useful for two different purposes: + +@enumerate +@item Partial automation for migrating legacy code that was implemented in C. +@item A new, complementary approach to static analysis for C programs. +@end enumerate\n") + (license license:gpl2+)))) + +(define-public cpphs + (package + (name "cpphs") + (version "1.20.8") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" name "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-polyparse" ,ghc-polyparse) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-old-time" ,ghc-old-time))) + (home-page "http://projects.haskell.org/cpphs/") + (synopsis "Liberalised re-implementation of cpp, the C pre-processor") + (description "Cpphs is a re-implementation of the C pre-processor that is +both more compatible with Haskell, and itself written in Haskell so that it +can be distributed with compilers. This version of the C pre-processor is +pretty-much feature-complete and compatible with traditional (K&R) +pre-processors. Additional features include: a plain-text mode; an option to +unlit literate code files; and an option to turn off macro-expansion.") + (license (list license:lgpl2.1+ license:gpl3+)))) + ;; Darcs has no https support: http://irclog.perlgeek.de/darcs/2016-09-17 ;; http://darcs.net/manual/Configuring_darcs.html#SECTION00440070000000000000 ;; and results of search engines will show that if the protocol is http, https @@ -364,6 +465,66 @@ programming.") @code{SDL2_image}.") (license license:expat))) +(define-public hlint + (package + (name "hlint") + (version "2.1.10") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" name + "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w")))) + (build-system haskell-build-system) + (inputs + `(("cpphs" ,cpphs) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-yaml" ,ghc-yaml) + ("ghc-vector" ,ghc-vector) + ("ghc-data-default" ,ghc-data-default) + ("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-haskell-src-exts-util" ,ghc-haskell-src-exts-util) + ("ghc-uniplate" ,ghc-uniplate) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-extra" ,ghc-extra) + ("ghc-refact" ,ghc-refact) + ("ghc-aeson" ,ghc-aeson) + ("hscolour" ,hscolour))) + (home-page "http://community.haskell.org/~ndm/hlint/") + (synopsis "Suggest improvements for Haskell source code") + (description "HLint reads Haskell programs and suggests changes that +hopefully make them easier to read. HLint also makes it easy to disable +unwanted suggestions, and to add your own custom suggestions.") + (license license:bsd-3))) + +(define-public hscolour + (package + (name "hscolour") + (version "1.24.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hscolour/hscolour-" + version + ".tar.gz")) + (sha256 + (base32 + "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/hscolour") + (synopsis "Script to colourise Haskell code") + (description "HSColour is a small Haskell script to colourise Haskell +code. It currently has six output formats: ANSI terminal codes (optionally +XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01 +with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX, +and mIRC chat codes.") + (license license:bsd-3))) + (define-public raincat (package (name "raincat") @@ -405,3 +566,38 @@ play inspired from classics Lemmings and The Incredible Machine. The project proved to be an excellent learning experience for the programmers. Everything is programmed in Haskell.") (license license:bsd-3))) + +(define-public shellcheck + (package + (name "shellcheck") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" + version ".tar.gz")) + (sha256 + (base32 "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-diff" ,ghc-diff) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-regex-tdfa" ,ghc-regex-tdfa))) + (home-page "https://github.com/koalaman/shellcheck") + (synopsis "Static analysis for shell scripts") + (description "@code{shellcheck} provides static analysis for +@command{bash} and @command{sh} shell scripts. +It gives warnings and suggestions in order to: + +@enumerate +@item Point out and clarify typical beginner's syntax issues that cause +a shell to give cryptic error messages. +@item Point out and clarify typical intermediate level semantic problems +that cause a shell to behave strangely and counter-intuitively. +@item Point out subtle caveats, corner cases and pitfalls that may cause an +advanced user's otherwise working script to fail under future circumstances. +@end enumerate") + (license license:gpl3+))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b544190895..06d3d8afd7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell-apps) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages haskell-web) @@ -1493,42 +1494,6 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") specify refactorings without depending on GHC.") (license license:bsd-3))) -(define-public hlint - (package - (name "hlint") - (version "2.1.10") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" name - "/" name "-" version ".tar.gz")) - (sha256 - (base32 - "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w")))) - (build-system haskell-build-system) - (inputs - `(("cpphs" ,cpphs) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-yaml" ,ghc-yaml) - ("ghc-vector" ,ghc-vector) - ("ghc-data-default" ,ghc-data-default) - ("ghc-cmdargs" ,ghc-cmdargs) - ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-haskell-src-exts-util" ,ghc-haskell-src-exts-util) - ("ghc-uniplate" ,ghc-uniplate) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-extra" ,ghc-extra) - ("ghc-refact" ,ghc-refact) - ("ghc-aeson" ,ghc-aeson) - ("hscolour" ,hscolour))) - (home-page "http://community.haskell.org/~ndm/hlint/") - (synopsis "Suggest improvements for Haskell source code") - (description "HLint reads Haskell programs and suggests changes that -hopefully make them easier to read. HLint also makes it easy to disable -unwanted suggestions, and to add your own custom suggestions.") - (license license:bsd-3))) - (define-public ghc-resourcet (package (name "ghc-resourcet") @@ -1852,34 +1817,6 @@ needed by various Haskell streaming data libraries, such as @code{conduit} and @code{pipe}s.") (license license:expat))) -(define-public cpphs - (package - (name "cpphs") - (version "1.20.8") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" name "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5")))) - (build-system haskell-build-system) - (inputs - `(("ghc-polyparse" ,ghc-polyparse) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-old-time" ,ghc-old-time))) - (home-page "http://projects.haskell.org/cpphs/") - (synopsis "Liberalised re-implementation of cpp, the C pre-processor") - (description "Cpphs is a re-implementation of the C pre-processor that is -both more compatible with Haskell, and itself written in Haskell so that it -can be distributed with compilers. This version of the C pre-processor is -pretty-much feature-complete and compatible with traditional (K&R) -pre-processors. Additional features include: a plain-text mode; an option to -unlit literate code files; and an option to turn off macro-expansion.") - (license (list license:lgpl2.1+ license:gpl3+)))) - (define-public ghc-reflection (package (name "ghc-reflection") @@ -2124,44 +2061,6 @@ API is often available directly via the standard @code{libc} C library) on Unix systems.") (license license:gpl3))) -(define-public cabal-install - (package - (name "cabal-install") - (version "2.2.0.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cabal-install/cabal-install-" - version - ".tar.gz")) - (sha256 - (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8")))) - (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. - (build-system haskell-build-system) - (inputs - `(("ghc-async" ,ghc-async) - ("ghc-base16-bytestring" ,ghc-base16-bytestring) - ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) - ("ghc-echo" ,ghc-echo) - ("ghc-edit-distance" ,ghc-edit-distance) - ("ghc-hackage-security" ,ghc-hackage-security) - ("ghc-hashable" ,ghc-hashable) - ("ghc-http" ,ghc-http) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-network" ,ghc-network) - ("ghc-random" ,ghc-random) - ("ghc-resolv" ,ghc-resolv) - ("ghc-tar" ,ghc-tar) - ("ghc-zlib" ,ghc-zlib))) - (home-page "https://www.haskell.org/cabal/") - (synopsis "Command-line interface for Cabal and Hackage") - (description - "The cabal command-line program simplifies the process of managing -Haskell software by automating the fetching, configuration, compilation and -installation of Haskell libraries and programs.") - (license license:bsd-3))) - (define-public cabal-doctest (package (name "cabal-doctest") @@ -3264,30 +3163,6 @@ parser isolation, and labeled blocks for better error messages.") (description "This library provides @code{Comonad}s for Haskell.") (license license:bsd-3))) -(define-public hscolour - (package - (name "hscolour") - (version "1.24.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hscolour/hscolour-" - version - ".tar.gz")) - (sha256 - (base32 - "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/hscolour") - (synopsis "Script to colourise Haskell code") - (description "HSColour is a small Haskell script to colourise Haskell -code. It currently has six output formats: ANSI terminal codes (optionally -XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01 -with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX, -and mIRC chat codes.") - (license license:bsd-3))) - (define-public ghc-polyparse (package (name "ghc-polyparse") @@ -8159,37 +8034,6 @@ and a large set of GNU extensions.") same time is a literate Haskell program.") (license license:expat))) -(define-public corrode - (let ((commit "b6699fb2fa552a07c6091276285a44133e5c9789")) - (package - (name "corrode") - (version (string-append "0.0.1-" (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jameysharp/corrode.git") - (commit "b6699fb2fa552a07c6091276285a44133e5c9789"))) - (file-name - (string-append name "-" version "-checkout")) - (sha256 - (base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r")))) - (build-system haskell-build-system) - (inputs - `(("ghc-language-c" ,ghc-language-c) - ("ghc-markdown-unlit" ,ghc-markdown-unlit))) - (home-page "https://github.com/jameysharp/corrode") - (synopsis "Automatic semantics-preserving translation from C to Rust") - (description - "This program reads a C source file and prints an equivalent module in -Rust syntax. It is intended to be useful for two different purposes: - -@enumerate -@item Partial automation for migrating legacy code that was implemented in C. -@item A new, complementary approach to static analysis for C programs. -@end enumerate\n") - (license license:gpl2+)))) - (define-public ghc-wave (package (name "ghc-wave") @@ -8358,41 +8202,6 @@ to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend.") (license license:bsd-3)))) -(define-public shellcheck - (package - (name "shellcheck") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ShellCheck/ShellCheck-" - version ".tar.gz")) - (sha256 - (base32 "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s")) - (file-name (string-append name "-" version ".tar.gz")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-diff" ,ghc-diff) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-regex-tdfa" ,ghc-regex-tdfa))) - (home-page "https://github.com/koalaman/shellcheck") - (synopsis "Static analysis for shell scripts") - (description "@code{shellcheck} provides static analysis for -@command{bash} and @command{sh} shell scripts. -It gives warnings and suggestions in order to: - -@enumerate -@item Point out and clarify typical beginner's syntax issues that cause -a shell to give cryptic error messages. -@item Point out and clarify typical intermediate level semantic problems -that cause a shell to behave strangely and counter-intuitively. -@item Point out subtle caveats, corner cases and pitfalls that may cause an -advanced user's otherwise working script to fail under future circumstances. -@end enumerate") - (license license:gpl3+))) - (define-public ghc-simple-sendfile (package (name "ghc-simple-sendfile") -- cgit v1.2.3 From 1ba35ab7237851c740400ece0f62d455d967a2c0 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 29 Aug 2019 21:29:12 -0400 Subject: gnu: cabal-doctest: Move to haskell-check.scm. * gnu/packages/haskell.scm (cabal-doctest): Move variable from here... * gnu/packages/haskell-check.scm: ...to here. Co-authored-by: Timothy Sample --- gnu/packages/haskell-check.scm | 25 +++++++++++++++++++++++++ gnu/packages/haskell.scm | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 589eee74d9..1a32382281 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -837,3 +837,28 @@ of generated values by construction. To get started quickly, see the examples: @uref{https://github.com/hedgehogqa/haskell-hedgehog/tree/master/hedgehog-example}") (license license:bsd-3))) + +(define-public cabal-doctest + (package + (name "cabal-doctest") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cabal-doctest/cabal-doctest-" + version ".tar.gz")) + (sha256 + (base32 + "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld"))) + (home-page "https://github.com/phadej/cabal-doctest") + (synopsis "Setup.hs helper for running doctests") + (description + "To properly work, the @code{doctest} package needs plenty of +configuration. This library provides the common bits for writing custom +@file{Setup.hs} files.") + (license license:bsd-3))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 06d3d8afd7..cffa7e8ed7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2061,31 +2061,6 @@ API is often available directly via the standard @code{libc} C library) on Unix systems.") (license license:gpl3))) -(define-public cabal-doctest - (package - (name "cabal-doctest") - (version "1.0.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cabal-doctest/cabal-doctest-" - version ".tar.gz")) - (sha256 - (base32 - "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld"))) - (home-page "https://github.com/phadej/cabal-doctest") - (synopsis "Setup.hs helper for running doctests") - (description - "To properly work, the @code{doctest} package needs plenty of -configuration. This library provides the common bits for writing custom -@file{Setup.hs} files.") - (license license:bsd-3))) - (define-public ghc-parsec-numbers (package (name "ghc-parsec-numbers") -- cgit v1.2.3 From dddbc90c648a569ed3f6dcf8678cb94e63a8302f Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 29 Aug 2019 21:56:35 -0400 Subject: gnu: Move non-compilers out of haskell.scm. * gnu/packages/haskell.scm (ghc-abstract-deque, ghc-abstract-par, ghc-adjunctions, ghc-aeson-compat, ghc-alex, ghc-alsa-core, ghc-annotated-wl-pprint, ghc-ansi-terminal, ghc-ansi-wl-pprint, ghc-appar, ghc-async, ghc-atomic-write, ghc-attoparsec, ghc-attoparsec-bootstrap, ghc-attoparsec-iso8601, ghc-auto-update, ghc-aws, ghc-base16-bytestring, ghc-base64-bytestring, ghc-base-compat, ghc-basement, ghc-base-orphans, ghc-base-prelude, ghc-base-unicode-symbols, ghc-bifunctors, ghc-bindings-dsl, ghc-blaze-builder, ghc-blaze-markup, ghc-bloomfilter, ghc-boxes, ghc-byteable, ghc-byteorder, ghc-bytes, ghc-bytestring-builder, ghc-bytestring-handle, ghc-bytestring-lexing, ghc-bzlib-conduit, ghc-c2hs, ghc-cairo, ghc-call-stack, ghc-call-stack-boot, ghc-case-insensitive, ghc-cereal, ghc-cereal-conduit, ghc-cgi, ghc-charset, ghc-chart, ghc-chart-cairo, ghc-chasingbottoms, ghc-cheapskate, ghc-chell, ghc-chell-quickcheck, ghc-chunked-data, ghc-clock, ghc-clock-bootstrap, ghc-cmark, ghc-cmark-gfm, ghc-cmdargs, ghc-code-page, ghc-colour, ghc-comonad, ghc-concatenative, ghc-concurrent-output, ghc-conduit, ghc-conduit-algorithms, ghc-conduit-combinators, ghc-conduit-extra, ghc-configurator, ghc-connection, ghc-constraints, ghc-contravariant, ghc-contravariant-extras, ghc-convertible, ghc-data-accessor, ghc-data-accessor-transformers, ghc-data-default, ghc-data-default-class, ghc-data-default-instances-base, ghc-data-default-instances-containers, ghc-data-default-instances-dlist, ghc-data-default-instances-old-locale, ghc-data-hash, ghc-data-ordlist, ghc-deepseq-generics, ghc-descriptive, ghc-diff, ghc-disk-free-space, ghc-distributive, ghc-dlist, ghc-doctemplates, ghc-doctest, ghc-double-conversion, ghc-easy-file, ghc-easyplot, ghc-echo, ghc-edisonapi, ghc-edisoncore, ghc-edit-distance, ghc-either, ghc-email-validate, ghc-enclosed-exceptions, ghc-equivalence, ghc-erf, ghc-errorcall-eq-instance, ghc-errors, ghc-esqueleto, ghc-exactprint, ghc-exceptions, ghc-executable-path, ghc-extensible-exceptions, ghc-extra, ghc-fail, ghc-fast-logger, ghc-feed, ghc-fgl, ghc-fgl-arbitrary, ghc-file-embed, ghc-filemanip, ghc-findbin, ghc-fingertree, ghc-fixed, ghc-foldl, ghc-foundation, ghc-free, ghc-fsnotify, ghc-generic-deriving, ghc-generics-sop, ghc-geniplate-mirror, ghc-genvalidity, ghc-genvalidity-property, ghc-gitrev, ghc-glob, ghc-gluraw, ghc-glut, ghc-gnuplot, ghc-graphviz, ghc-gtk2hs-buildtools, ghc-hackage-security, ghc-haddock, ghc-haddock-api, ghc-haddock-library, ghc-half, ghc-happy, ghc-hashable, ghc-hashable-bootstrap, ghc-hashable-time, ghc-hashtables, ghc-haskell-lexer, ghc-haskell-src, ghc-haskell-src-exts, ghc-haskell-src-exts-util, ghc-haskell-src-meta, ghc-hasktags, ghc-hex, ghc-highlighting-kate, ghc-hindent, ghc-hinotify, ghc-hmatrix, ghc-hmatrix-gsl, ghc-hmatrix-gsl-stats, ghc-hmatrix-special, ghc-hostname, ghc-hourglass, ghc-hpack, ghc-hs-bibutils, ghc-hslogger, ghc-hslua, ghc-hslua-module-text, ghc-http-api-data, ghc-ieee754, ghc-ifelse, ghc-indents, ghc-inline-c, ghc-inline-c-cpp, ghc-integer-logarithms, ghc-integer-logarithms-bootstrap, ghc-interpolate, ghc-intervalmap, ghc-invariant, ghc-iproute, ghc-iwlib, ghc-json, ghc-juicypixels, ghc-kan-extensions, ghc-language-c, ghc-language-haskell-extract, ghc-lens, ghc-libffi, ghc-libmpd, ghc-libxml, ghc-lifted-async, ghc-lifted-base, ghc-linear, ghc-logging-facade, ghc-logict, ghc-lzma, ghc-lzma-conduit, ghc-markdown-unlit, ghc-math-functions, ghc-megaparsec, ghc-memory, ghc-memotrie, ghc-microlens, ghc-microlens-ghc, ghc-microlens-mtl, ghc-microlens-platform, ghc-microlens-th, ghc-missingh, ghc-mmap, ghc-mmorph, ghc-mockery, ghc-monad-control, ghc-monad-logger, ghc-monad-loops, ghc-monad-par, ghc-monad-par-extras, ghc-monadplus, ghc-monadrandom, ghc-monads-tf, ghc-mono-traversable, ghc-murmur-hash, ghc-mwc-random, ghc-nats, ghc-nats-bootstrap, ghc-network, ghc-network-info, ghc-network-uri, ghc-newtype-generics, ghc-objectname, ghc-old-locale, ghc-old-time, ghc-opengl, ghc-openglraw, ghc-operational, ghc-options, ghc-optparse-applicative, ghc-pandoc, ghc-pandoc-citeproc, ghc-pandoc-types, ghc-parallel, ghc-parsec-numbers, ghc-parser-combinators, ghc-parsers, ghc-path, ghc-path-io, ghc-paths, ghc-patience, ghc-pcre-light, ghc-persistent, ghc-persistent-sqlite, ghc-persistent-template, ghc-polyparse, ghc-pqueue, ghc-prelude-extras, ghc-pretty-hex, ghc-pretty-show, ghc-primitive, ghc-profunctors, ghc-psqueues, ghc-random, ghc-raw-strings-qq, ghc-rebase, ghc-reducers, ghc-refact, ghc-reflection, ghc-regex, ghc-regex-applicative, ghc-regex-base, ghc-regex-compat, ghc-regex-compat-tdfa, ghc-regex-pcre-builtin, ghc-regex-posix, ghc-regex-tdfa, ghc-regex-tdfa-text, ghc-rerebase, ghc-resolv, ghc-resource-pool, ghc-resourcet, ghc-rfc5051, ghc-rio, ghc-safe, ghc-safe-exceptions, ghc-safeio, ghc-safesemaphore, ghc-sandi, ghc-scientific, ghc-scientific-bootstrap, ghc-sdl, ghc-sdl-image, ghc-sdl-mixer, ghc-securemem, ghc-semigroupoids, ghc-semigroups, ghc-semigroups-bootstrap, ghc-setenv, ghc-setlocale, ghc-shakespeare, ghc-shelly, ghc-silently, ghc-simple-reflect, ghc-simple-sendfile, ghc-skylighting-core, ghc-skylighting, ghc-smallcheck, ghc-socks, ghc-split, ghc-statevar, ghc-statistics, ghc-stm-chans, ghc-stm-conduit, ghc-stmonadtrans, ghc-storable-complex, ghc-streaming-commons, ghc-strict, ghc-stringbuilder, ghc-string-qq, ghc-stringsearch, ghc-stylish-haskell, ghc-syb, ghc-system-fileio, ghc-system-filepath, ghc-tagged, ghc-tar, ghc-temporary, ghc-temporary-rc, ghc-terminal-size, ghc-texmath, ghc-text-binary, ghc-tf-random, ghc-th-abstraction, ghc-th-expand-syns, ghc-th-lift, ghc-th-lift-instances, ghc-th-orphans, ghc-th-reify-many, ghc-time-locale-compat, ghc-tldr, ghc-transformers-base, ghc-transformers-compat, ghc-tree-diff, ghc-trifecta, ghc-tuple-th, ghc-typed-process, ghc-unbounded-delays, ghc-unexceptionalio, ghc-union-find, ghc-uniplate, ghc-unix-compat, ghc-unix-time, ghc-unliftio, ghc-unliftio-core, ghc-unordered-containers, ghc-unordered-containers-bootstrap, ghc-uri-bytestring, ghc-utf8-string, ghc-utility-ht, ghc-uuid, ghc-uuid-types, ghc-validation, ghc-validity, ghc-vault, ghc-vector, ghc-vector-algorithms, ghc-vector-binary-instances, ghc-vector-builder, ghc-vector-th-unbox, ghc-void, ghc-wave, ghc-wcwidth, ghc-wcwidth-bootstrap, ghc-weigh, ghc-wl-pprint, ghc-wl-pprint-annotated, ghc-wl-pprint-text, ghc-word8, ghc-x11, ghc-x11-xft, ghc-xdg-basedir, ghc-xml, ghc-xml-conduit, ghc-xml-types, ghc-yaml, ghc-zip-archive, ghc-zlib): Move variables from here... * gnu/packages/haskell-xyz.scm: ...to here. * gnu/packages/agda.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/cran.scm, gnu/packages/emacs-xyz.scm, gnu/packages/games.scm, gnu/packages/graphics.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm, gnu/packages/idris.scm, gnu/packages/statistics.scm, gnu/packages/wm.scm: Update module references. Co-authored-by: Timothy Sample --- gnu/packages/agda.scm | 2 +- gnu/packages/bioconductor.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/cran.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/games.scm | 1 + gnu/packages/graphics.scm | 2 +- gnu/packages/haskell-apps.scm | 1 + gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell-xyz.scm | 11371 +++++++++++++++++++++++++++++++++++++- gnu/packages/haskell.scm | 11076 +------------------------------------ gnu/packages/idris.scm | 2 +- gnu/packages/statistics.scm | 2 +- gnu/packages/wm.scm | 2 +- 14 files changed, 11246 insertions(+), 11223 deletions(-) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index c085bfac2e..931f1e8ef7 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -22,9 +22,9 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages agda) - #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) + #:use-module (gnu packages haskell-xyz) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b7bc58d507..89aea8d9c0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages graph) - #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages image) #:use-module (gnu packages maths) #:use-module (gnu packages netpbm) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 62f368c139..779a972520 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -77,9 +77,9 @@ #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) - #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 458b141f91..6ba7c295cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -53,7 +53,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages graph) #:use-module (gnu packages gtk) - #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9e94d3fc8e..6af5d43c27 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -137,7 +137,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages gnupg) #:use-module (gnu packages video) - #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages wordnet) #:use-module (guix utils) #:use-module (srfi srfi-1) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 870becc50b..f9d7331f5b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -112,6 +112,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ee56dae54e..b06a369325 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -49,7 +49,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) - #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index ecc097ceb6..df8417ce3f 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages haskell-web) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 1a32382281..e0951d489c 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -28,8 +28,8 @@ (define-module (gnu packages haskell-check) #:use-module (gnu packages) - #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-xyz) #:use-module (guix build-system haskell) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 53c4dcc5ff..46e5153906 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1,5 +1,24 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015, 2016 Federico Beffa +;;; Copyright © 2015 Siniša Biđin +;;; Copyright © 2015 Paul van der Walt +;;; Copyright © 2015, 2019 Eric Bavier +;;; Copyright © 2016, 2018, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017 ng0 +;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2016, 2017 David Craven +;;; Copyright © 2017 Danny Milosavljevic +;;; Copyright © 2017 Peter Mikkelsen +;;; Copyright © 2017, 2018 Alex Vong +;;; Copyright © 2017 rsiddharth +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018 Tonton +;;; Copyright © 2018, 2019 Timothy Sample +;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2019 Robert Vollmert +;;; Copyright © 2019 Jacob MacDonald ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,234 +37,11310 @@ (define-module (gnu packages haskell-xyz) #:use-module (gnu packages) - #:use-module (gnu packages haskell) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages emacs) + #:use-module (gnu packages gcc) + #:use-module (gnu packages gl) + #:use-module (gnu packages graphviz) + #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell-apps) #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-web) + #:use-module (gnu packages libffi) + #:use-module (gnu packages linux) + #:use-module (gnu packages lua) + #:use-module (gnu packages maths) + #:use-module (gnu packages pcre) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sdl) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) #:use-module (guix build-system haskell) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) -(define-public ghc-concurrent-extra +(define-public ghc-abstract-deque (package - (name "ghc-concurrent-extra") - (version "0.7.0.12") + (name "ghc-abstract-deque") + (version "0.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" - "concurrent-extra/concurrent-extra-" - version ".tar.gz")) + "abstract-deque-" version "/" + "abstract-deque-" version ".tar.gz")) (sha256 (base32 - "1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4")))) + "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9")))) (build-system haskell-build-system) - (arguments - ;; XXX: The ReadWriteLock 'stressTest' fails. - `(#:tests? #f)) - (inputs - `(("ghc-unbounded-delays" ,ghc-unbounded-delays))) - (native-inputs - `(("ghc-async" ,ghc-async) - ("ghc-hunit" ,ghc-hunit) - ("ghc-random" ,ghc-random) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/basvandijk/concurrent-extra") - (synopsis "Extra concurrency primitives") - (description "This Haskell library offers (among other things) the -following selection of synchronisation primitives: + (inputs `(("ghc-random" ,ghc-random))) + (home-page "https://github.com/rrnewton/haskell-lockfree/wiki") + (synopsis "Abstract, parameterized interface to mutable Deques for Haskell") + (description "This Haskell package provides an abstract interface to +highly-parameterizable queues/deques. + +Background: There exists a feature space for queues that extends between: @itemize -@item @code{Broadcast}: Wake multiple threads by broadcasting a value. -@item @code{Event}: Wake multiple threads by signalling an event. -@item @code{Lock}: Enforce exclusive access to a resource. Also known -as a binary semaphore or mutex. The package additionally provides an -alternative that works in the STM monad. -@item @code{RLock}: A lock which can be acquired multiple times by the -same thread. Also known as a reentrant mutex. -@item @code{ReadWriteLock}: Multiple-reader, single-writer locks. Used -to protect shared resources which may be concurrently read, but only -sequentially written. -@item @code{ReadWriteVar}: Concurrent read, sequential write variables. +@item Simple, single-ended, non-concurrent, bounded queues + +@item Double-ended, thread-safe, growable queues with important points +in between (such as the queues used for work stealing). @end itemize -Please consult the API documentation of the individual modules for more -detailed information. +This package includes an interface for Deques that allows the programmer +to use a single API for all of the above, while using the type system to +select an efficient implementation given the requirements (using type families). -This package was inspired by the concurrency libraries of Java and -Python.") +This package also includes a simple reference implementation based on +@code{IORef} and @code{Data.Sequence}.") (license license:bsd-3))) -(define-public ghc-io-streams +(define-public ghc-abstract-par (package - (name "ghc-io-streams") - (version "1.5.0.1") + (name "ghc-abstract-par") + (version "0.3.3") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" - "io-streams/io-streams-" version ".tar.gz")) + "abstract-par-" version "/" + "abstract-par-" version ".tar.gz")) (sha256 (base32 - "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx")))) + "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4")))) + (build-system haskell-build-system) + (home-page "https://github.com/simonmar/monad-par") + (synopsis "Abstract parallelization interface for Haskell") + (description "This Haskell package is an abstract interface +only. It provides a number of type clasess, but not an +implementation. The type classes separate different levels +of @code{Par} functionality. See the @code{Control.Monad.Par.Class} +module for more details.") + (license license:bsd-3))) + +(define-public ghc-adjunctions + (package + (name "ghc-adjunctions") + (version "4.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/adjunctions/adjunctions-" + version + ".tar.gz")) + (sha256 + (base32 + "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) (build-system haskell-build-system) (inputs - `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-bytestring-builder" ,ghc-bytestring-builder) - ("ghc-network" ,ghc-network) - ("ghc-primitive" ,ghc-primitive) - ("ghc-vector" ,ghc-vector) - ("ghc-zlib-bindings" ,ghc-zlib-bindings))) + `(("ghc-profunctors" ,ghc-profunctors) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-distributive" ,ghc-distributive) + ("ghc-free" ,ghc-free) + ("ghc-tagged" ,ghc-tagged) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-void" ,ghc-void))) (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) - ("ghc-zlib" ,ghc-zlib))) + `(("ghc-generic-deriving" ,ghc-generic-deriving) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/ekmett/adjunctions/") + (synopsis "Adjunctions and representable functors") + (description "This library provides adjunctions and representable functors +for Haskell.") + (license license:bsd-3))) + +(define-public ghc-aeson-compat + (package + (name "ghc-aeson-compat") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "aeson-compat-" version "/" + "aeson-compat-" version ".tar.gz")) + (sha256 + (base32 + "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.10 + (inputs `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-aeson" ,ghc-aeson) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-attoparsec" ,ghc-attoparsec-iso8601) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-scientific" ,ghc-scientific) + ("ghc-time-locale-compat" ,ghc-time-locale-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-tagged" ,ghc-tagged) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-nats" ,ghc-nats))) + (home-page "https://github.com/phadej/aeson-compat") + (synopsis "Compatibility layer for ghc-aeson") + (description "This Haskell package provides compatibility layer for +ghc-aeson.") + (license license:bsd-3))) + +(define-public ghc-alex + (package + (name "ghc-alex") + (version "3.2.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/alex/alex-" + version + ".tar.gz")) + (sha256 + (base32 + "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm")))) + (build-system haskell-build-system) (arguments - `(#:cabal-revision - ("2" "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14"))) - (home-page "http://hackage.haskell.org/package/io-streams") - (synopsis "Simple and composable stream I/O") - (description "This library contains simple and easy-to-use -primitives for I/O using streams.") + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-check-variables + (lambda _ + (setenv "PATH" (string-append (getcwd) "/dist/build/alex:" + (getenv "PATH"))) + (setenv "alex_datadir" (string-append (getcwd) "/data")) + #t))))) + (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (native-inputs + `(("which" ,which))) + (home-page "https://www.haskell.org/alex/") + (synopsis + "Tool for generating lexical analysers in Haskell") + (description + "Alex is a tool for generating lexical analysers in Haskell. It takes a +description of tokens based on regular expressions and generates a Haskell +module containing code for scanning text efficiently. It is similar to the +tool lex or flex for C/C++.") (license license:bsd-3))) -(define-public ghc-io-streams-haproxy +(define-public ghc-alsa-core (package - (name "ghc-io-streams-haproxy") - (version "1.0.0.2") + (name "ghc-alsa-core") + (version "0.5.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/alsa-core/alsa-core-" + version + ".tar.gz")) + (sha256 + (base32 + "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) + ("alsa-lib" ,alsa-lib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://www.haskell.org/haskellwiki/ALSA") + (synopsis "Binding to the ALSA Library API (Exceptions)") + (description "This package provides access to ALSA infrastructure, that is +needed by both alsa-seq and alsa-pcm.") + (license license:bsd-3))) + +(define-public ghc-annotated-wl-pprint + (package + (name "ghc-annotated-wl-pprint") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/annotated-wl-pprint" + "/annotated-wl-pprint-" version + ".tar.gz")) + (sha256 + (base32 + "061xfz6qany3wf95csl8dcik2pz22cn8iv1qchhm16isw5zjs9hc")))) + (build-system haskell-build-system) + (home-page + "https://github.com/david-christiansen/annotated-wl-pprint") + (synopsis + "The Wadler/Leijen Pretty Printer, with annotation support") + (description "This is a modified version of wl-pprint, which was based on +Wadler's paper \"A Prettier Printer\". This version allows the library user +to annotate the text with semantic information, which can later be rendered in +a variety of ways.") + (license license:bsd-3))) + +(define-public ghc-ansi-terminal + (package + (name "ghc-ansi-terminal") + (version "0.8.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ansi-terminal/ansi-terminal-" + version + ".tar.gz")) + (sha256 + (base32 + "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-colour" ,ghc-colour))) + (home-page "https://github.com/feuerbach/ansi-terminal") + (synopsis "ANSI terminal support for Haskell") + (description "This package provides ANSI terminal support for Haskell. It +allows cursor movement, screen clearing, color output showing or hiding the +cursor, and changing the title.") + (license license:bsd-3))) + +(define-public ghc-ansi-wl-pprint + (package + (name "ghc-ansi-wl-pprint") + (version "0.6.8.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" - "io-streams-haproxy/io-streams-haproxy-" + "ansi-wl-pprint/ansi-wl-pprint-" version ".tar.gz")) (sha256 (base32 - "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp")))) + "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56")))) (build-system haskell-build-system) (inputs - `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-io-streams" ,ghc-io-streams) - ("ghc-network" ,ghc-network))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) + `(("ghc-ansi-terminal" ,ghc-ansi-terminal))) + (home-page "https://github.com/ekmett/ansi-wl-pprint") + (synopsis "Wadler/Leijen Pretty Printer for colored ANSI terminal output") + (description "This is a pretty printing library based on Wadler's paper +\"A Prettier Printer\". It has been enhanced with support for ANSI terminal +colored output using the ansi-terminal package.") + (license license:bsd-3))) + +(define-public ghc-appar + (package + (name "ghc-appar") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/appar/appar-" + version + ".tar.gz")) + (sha256 + (base32 + "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq")))) + (build-system haskell-build-system) + (home-page + "https://hackage.haskell.org/package/appar") + (synopsis "Simple applicative parser") + (description "This package provides a simple applicative parser in Parsec +style.") + (license license:bsd-3))) + +(define-public ghc-async + (package + (name "ghc-async") + (version "2.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/async/async-" + version + ".tar.gz")) + (sha256 + (base32 + "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hashable" ,ghc-hashable) + ("ghc-hunit" ,ghc-hunit) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (arguments - `(#:cabal-revision - ("4" "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"))) - (home-page "http://snapframework.com/") - (synopsis "HAProxy protocol 1.5 support for io-streams") - (description "HAProxy protocol version 1.5 support -(see @uref{http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt}) -for applications using io-streams. The proxy protocol allows information -about a networked peer (like remote address and port) to be propagated -through a forwarding proxy that is configured to speak this protocol.") + (home-page "https://github.com/simonmar/async") + (synopsis "Library to run IO operations asynchronously") + (description "Async provides a library to run IO operations +asynchronously, and wait for their results. It is a higher-level interface +over threads in Haskell, in which @code{Async a} is a concurrent thread that +will eventually deliver a value of type @code{a}.") (license license:bsd-3))) -(define-public ghc-language-glsl +(define-public ghc-atomic-write (package - (name "ghc-language-glsl") - (version "0.3.0") + (name "ghc-atomic-write") + (version "0.2.0.5") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "language-glsl/language-glsl-" version ".tar.gz")) + (uri (string-append + "https://hackage.haskell.org/package/atomic-write/atomic-write-" + version + ".tar.gz")) (sha256 (base32 - "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1")))) + "1iaq0hprxcv0sl1sgwcgmm87zraf738va1bciwnx2jkk3k1v9iyv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-temporary" ,ghc-temporary) + ("ghc-unix-compat" ,ghc-unix-compat))) + (native-inputs + `(("ghc-temporary" ,ghc-temporary) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/stackbuilders/atomic-write") + (synopsis "Atomically write to a file") + (description + "Atomically write to a file on POSIX-compliant systems while preserving +permissions. @code{mv} is an atomic operation. This makes it simple to write +to a file atomically just by using the @code{mv} operation. However, this +will destroy the permissions on the original file. This library preserves +permissions while atomically writing to a file.") + (license license:expat))) + +(define-public ghc-attoparsec + (package + (name "ghc-attoparsec") + (version "0.13.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/attoparsec/attoparsec-" + version + ".tar.gz")) + (sha256 + (base32 + "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx")))) (build-system haskell-build-system) - (inputs `(("ghc-prettyclass" ,ghc-prettyclass))) (arguments - `(#:tests? #f - #:cabal-revision - ("1" "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5"))) - (home-page "http://hackage.haskell.org/package/language-glsl") - (synopsis "GLSL abstract syntax tree, parser, and pretty-printer") - (description "This package is a Haskell library for the -representation, parsing, and pretty-printing of GLSL 1.50 code.") + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-for-newer-quickcheck + (lambda _ + (substitute* "attoparsec.cabal" + (("QuickCheck >= 2\\.7 && < 2\\.10") + "QuickCheck >= 2.7 && < 2.12")) + ;; This test fails because of the newer QuickCheck: + ;; . + (substitute* "tests/QC/ByteString.hs" + ((", testProperty \"satisfyWith\" satisfyWith") + ""))))))) + (inputs + `(("ghc-scientific" ,ghc-scientific))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-unicode" ,ghc-quickcheck-unicode) + ("ghc-vector" ,ghc-vector))) + (home-page "https://github.com/bos/attoparsec") + (synopsis "Fast combinator parsing for bytestrings and text") + (description "This library provides a fast parser combinator library, +aimed particularly at dealing efficiently with network protocols and +complicated text/binary file formats.") (license license:bsd-3))) -(define-public ghc-prettyclass +(define-public ghc-attoparsec-bootstrap (package - (name "ghc-prettyclass") + (inherit ghc-attoparsec) + (name "ghc-attoparsec-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-scientific" ,ghc-scientific-bootstrap))) + (native-inputs '()) + (properties '(hidden? #t)))) + +(define-public ghc-attoparsec-iso8601 + (package + (name "ghc-attoparsec-iso8601") (version "1.0.0.0") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" - "prettyclass/prettyclass-" version ".tar.gz")) + "attoparsec-iso8601-" version "/" + "attoparsec-iso8601-" version ".tar.gz")) (sha256 (base32 - "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5")))) + "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a")))) (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/prettyclass") - (synopsis "Pretty printing class similar to Show") - (description "This package provides a pretty printing class similar -to @code{Show}, based on the HughesPJ pretty printing library. It -provides the pretty printing class and instances for the Prelude -types.") + (arguments + `(#:cabal-revision + ("1" "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"))) + (inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base-compat" ,ghc-base-compat))) + (home-page "https://github.com/bos/aeson") + (synopsis "Parse ISO 8601 dates") + (description "Haskell library for parsing of ISO 8601 dates, originally +from aeson.") (license license:bsd-3))) -(define-public ghc-readable +(define-public ghc-auto-update (package - (name "ghc-readable") - (version "0.3.1") + (name "ghc-auto-update") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/auto-update/auto-update-" + version + ".tar.gz")) + (sha256 + (base32 + "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy")))) + (build-system haskell-build-system) + (home-page "https://github.com/yesodweb/wai") + (synopsis "Efficiently run periodic, on-demand actions") + (description "This library provides mechanisms to efficiently run +periodic, on-demand actions in Haskell.") + (license license:expat))) + +(define-public ghc-aws + (package + (name "ghc-aws") + (version "0.20") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" - "readable/readable-" version ".tar.gz")) + "aws-" version "/aws-" version ".tar.gz")) + (sha256 (base32 + "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; Tests require AWS credentials. + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-byteable" ,ghc-byteable) + ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-cereal" ,ghc-cereal) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-cryptonite" ,ghc-cryptonite) + ("ghc-data-default" ,ghc-data-default) + ("ghc-http-conduit" ,ghc-http-conduit) + ("ghc-http-types" ,ghc-http-types) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-network" ,ghc-network) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-safe" ,ghc-safe) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-vector" ,ghc-vector) + ("ghc-xml-conduit" ,ghc-xml-conduit))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-errors" ,ghc-errors) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-conduit-combinators" ,ghc-conduit-combinators))) + (home-page "https://github.com/aristidb/aws") + (synopsis "Amazon Web Services for Haskell") + (description "This package attempts to provide support for using +Amazon Web Services like S3 (storage), SQS (queuing) and others to +Haskell programmers. The ultimate goal is to support all Amazon +Web Services.") + (license license:bsd-3))) + +(define-public ghc-base16-bytestring + (package + (name "ghc-base16-bytestring") + (version "0.1.1.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/base16-bytestring/" + "base16-bytestring-" version ".tar.gz")) (sha256 (base32 - "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h")))) + "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs")))) (build-system haskell-build-system) - (home-page "https://github.com/mightybyte/readable") - (synopsis "Type class for reading from Text and ByteString") - (description "This package provides a @code{Readable} type class for -reading data types from @code{ByteString} and @code{Text}. It also -includes efficient implementations for common data types.") + (home-page "https://github.com/bos/base16-bytestring") + (synopsis "Fast base16 (hex) encoding and decoding for ByteStrings") + (description + "This package provides a Haskell library for working with base16-encoded +data quickly and efficiently, using the ByteString type.") (license license:bsd-3))) -(define-public ghc-threads +(define-public ghc-base64-bytestring (package - (name "ghc-threads") - (version "0.5.1.6") + (name "ghc-base64-bytestring") + (version "1.0.0.2") (source (origin (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "threads/threads-" version ".tar.gz")) + (uri (string-append + "https://hackage.haskell.org/package/base64-bytestring/base64-bytestring-" + version + ".tar.gz")) + (sha256 + (base32 "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. + (home-page "https://github.com/bos/base64-bytestring") + (synopsis "Base64 encoding and decoding for ByteStrings") + (description "This library provides fast base64 encoding and decoding for +Haskell @code{ByteString}s.") + (license license:bsd-3))) + +(define-public ghc-base-compat + (package + (name "ghc-base-compat") + (version "0.10.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/base-compat/base-compat-" + version + ".tar.gz")) (sha256 (base32 - "0bjnjhnq3km6xqk0fn1fgyz5xdw4h6lylbwwbcmkkfzwcz0c76hk")))) + "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) (build-system haskell-build-system) (native-inputs - `(("ghc-concurrent-extra" ,ghc-concurrent-extra) - ("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/basvandijk/threads") - (synopsis "Fork threads and wait for their result") - (description "This package provides functions to fork threads and -wait for their result, whether it's an exception or a normal value. -Besides waiting for the termination of a single thread this package also -provides functions to wait for a group of threads to terminate. This + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/base-compat") + (synopsis "Haskell compiler compatibility library") + (description "This library provides functions available in later versions +of base to a wider range of compilers, without requiring the use of CPP +pragmas in your code.") + (license license:bsd-3))) + +(define-public ghc-basement + (package + (name "ghc-basement") + (version "0.0.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "basement/basement-" version ".tar.gz")) + (sha256 + (base32 + "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67")))) + (build-system haskell-build-system) + (home-page "https://github.com/haskell-foundation/foundation") + (synopsis "Basic primitives for Foundation starter pack") + (description + "This package contains basic primitives for the Foundation set of +packages.") + (license license:bsd-3))) + +(define-public ghc-base-orphans + (package + (name "ghc-base-orphans") + (version "0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/base-orphans/base-orphans-" + version + ".tar.gz")) + (sha256 + (base32 + "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/base-orphans") + (synopsis "Orphan instances for backwards compatibility") + (description "This package defines orphan instances that mimic instances +available in later versions of base to a wider (older) range of compilers.") + (license license:bsd-3))) + +(define-public ghc-base-prelude + (package + (name "ghc-base-prelude") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "base-prelude-" version "/" + "base-prelude-" version ".tar.gz")) + (sha256 + (base32 + "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73")))) + (build-system haskell-build-system) + (home-page "https://github.com/nikita-volkov/base-prelude") + (synopsis "The most complete prelude formed solely from the Haskell's base +package") + (description "This Haskell package aims to reexport all the non-conflicting +and most general definitions from the \"base\" package. + +This includes APIs for applicatives, arrows, monoids, foldables, traversables, +exceptions, generics, ST, MVars and STM. + +This package will never have any dependencies other than \"base\". + +Versioning policy: + +The versioning policy of this package deviates from PVP in the sense +that its exports in part are transitively determined by the version of \"base\". +Therefore it's recommended for the users of @code{ghc-base-prelude} to specify +the bounds of \"base\" as well.") + (license license:expat))) + +(define-public ghc-base-unicode-symbols + (package + (name "ghc-base-unicode-symbols") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/base-unicode-symbols/base-unicode-symbols-" + version + ".tar.gz")) + (sha256 + (base32 + "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf")))) + (build-system haskell-build-system) + (home-page "http://www.haskell.org/haskellwiki/Unicode-symbols") + (synopsis "Unicode alternatives for common functions and operators") + (description "This package defines new symbols for a number of functions, +operators and types in the base package. All symbols are documented with +their actual definition and information regarding their Unicode code point. +They should be completely interchangeable with their definitions. For +further Unicode goodness you can enable the @code{UnicodeSyntax} +@url{https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/glasgow_exs.html#unicode-syntax, +language extension}. This extension enables Unicode characters to be used to +stand for certain ASCII character sequences, i.e. → instead of @code{->}, +∀ instead of @code{forall} and many others.") + (license license:bsd-3))) + +(define-public ghc-bifunctors + (package + (name "ghc-bifunctors") + (version "5.5.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/bifunctors/bifunctors-" + version + ".tar.gz")) + (sha256 + (base32 + "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-comonad" ,ghc-comonad) + ("ghc-th-abstraction" ,ghc-th-abstraction) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-tagged" ,ghc-tagged) + ("ghc-semigroups" ,ghc-semigroups))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/ekmett/bifunctors/") + (synopsis "Bifunctors for Haskell") + (description "This package provides bifunctors for Haskell.") + (license license:bsd-3))) + +(define-public ghc-bindings-dsl + (package + (name "ghc-bindings-dsl") + (version "1.0.25") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/bindings-DSL/" + "bindings-DSL-" version ".tar.gz")) + (sha256 + (base32 + "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3")))) + (build-system haskell-build-system) + (home-page "https://github.com/jwiegley/bindings-dsl/wiki") + (synopsis "FFI domain specific language, on top of hsc2hs") + (description + "This is a set of macros to be used when writing Haskell FFI. They were +designed to be able to fully describe C interfaces, so that @code{hsc2hs} can +extract from them all Haskell code needed to mimic such interfaces. All +Haskell names used are automatically derived from C names, structures are +mapped to Haskell instances of @code{Storable}, and there are also macros you +can use with C code to help write bindings to inline functions or macro +functions.") + (license license:bsd-3))) + +(define-public ghc-blaze-builder + (package + (name "ghc-blaze-builder") + (version "0.4.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/blaze-builder/blaze-builder-" + version + ".tar.gz")) + (sha256 + (base32 + "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. + (inputs + `(("ghc-utf8-string" ,ghc-utf8-string))) + (home-page "https://github.com/lpsmith/blaze-builder") + (synopsis "Efficient buffered output") + (description "This library provides an implementation of the older +@code{blaze-builder} interface in terms of the new builder that shipped with +@code{bytestring-0.10.4.0}. This implementation is mostly intended as a +bridge to the new builder, so that code that uses the old interface can +interoperate with code that uses the new implementation.") + (license license:bsd-3))) + +(define-public ghc-blaze-markup + (package + (name "ghc-blaze-markup") + (version "0.8.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "blaze-markup/blaze-markup-" + version ".tar.gz")) + (sha256 + (base32 + "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "blaze-markup.cabal" + (("tasty >= 1\\.0 && < 1\\.1") + "tasty >= 1.0 && < 1.2"))))))) + (inputs + `(("ghc-blaze-builder" ,ghc-blaze-builder))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://jaspervdj.be/blaze") + (synopsis "Fast markup combinator library for Haskell") + (description "This library provides core modules of a markup combinator +library for Haskell.") + (license license:bsd-3))) + +(define-public ghc-bloomfilter + (package + (name "ghc-bloomfilter") + (version "2.0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "bloomfilter/bloomfilter-" version ".tar.gz")) + (sha256 + (base32 + "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-random" ,ghc-random) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/bos/bloomfilter") + (synopsis "Pure and impure Bloom filter implementations") + (description "This package provides both mutable and immutable Bloom +filter data types, along with a family of hash functions and an easy-to-use +interface.") + (license license:bsd-3))) + +(define-public ghc-boxes + (package + (name "ghc-boxes") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/boxes/boxes-" + version ".tar.gz")) + (sha256 + (base32 "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q")))) + (build-system haskell-build-system) + (inputs + `(("ghc-split" ,ghc-split) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://hackage.haskell.org/package/boxes") + (synopsis "2D text pretty-printing library") + (description + "Boxes is a pretty-printing library for laying out text in two dimensions, +using a simple box model.") + (license license:bsd-3))) + +(define-public ghc-byteable + (package + (name "ghc-byteable") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "byteable/byteable-" version ".tar.gz")) + (sha256 + (base32 + "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4")))) + (build-system haskell-build-system) + (home-page "https://github.com/vincenthz/hs-byteable") + (synopsis "Type class for sequence of bytes") + (description + "This package provides an abstract class to manipulate sequence of bytes. +The use case of this class is abstracting manipulation of types that are just +wrapping a bytestring with stronger and more meaniful name.") + (license license:bsd-3))) + +(define-public ghc-byteorder + (package + (name "ghc-byteorder") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/byteorder/byteorder-" + version + ".tar.gz")) + (sha256 + (base32 + "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x")))) + (build-system haskell-build-system) + (home-page + "http://community.haskell.org/~aslatter/code/byteorder") + (synopsis + "Exposes the native endianness of the system") + (description + "This package is for working with the native byte-ordering of the +system.") + (license license:bsd-3))) + +(define-public ghc-bytes + (package + (name "ghc-bytes") + (version "0.15.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://hackage.haskell.org/package/bytes-" + version "/bytes-" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683")))) + (build-system haskell-build-system) + (inputs `(("ghc-cereal" ,ghc-cereal) + ("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-scientific" ,ghc-scientific) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-void" ,ghc-void) + ("ghc-vector" ,ghc-vector))) + (synopsis "Serialization between @code{binary} and @code{cereal}") + (description "This package provides a simple compatibility shim that lets +you work with both @code{binary} and @code{cereal} with one chunk of +serialization code.") + (home-page "https://hackage.haskell.org/package/bytes") + (license license:bsd-3))) + +(define-public ghc-bytestring-builder + (package + (name "ghc-bytestring-builder") + (version "0.10.8.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/bytestring-builder" + "/bytestring-builder-" version ".tar.gz")) + (sha256 + (base32 + "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d")))) + (build-system haskell-build-system) + (arguments `(#:haddock? #f)) ; Package contains no documentation. + (home-page "https://hackage.haskell.org/package/bytestring-builder") + (synopsis "The new bytestring builder, packaged outside of GHC") + (description "This package provides the bytestring builder that is +debuting in bytestring-0.10.4.0, which should be shipping with GHC 7.8. +Compatibility package for older packages.") + (license license:bsd-3))) + +(define-public ghc-bytestring-handle + (package + (name "ghc-bytestring-handle") + (version "0.1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/bytestring-handle/bytestring-handle-" + version ".tar.gz")) + (sha256 + (base32 + "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "bytestring-handle.cabal" + (("QuickCheck >= 2\\.1\\.2 && < 2\\.11") + "QuickCheck >= 2.1.2 && < 2.12") + (("base >= 4\\.2 && < 4\\.11") + "base >= 4.2 && < 4.12"))))))) + (inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://hub.darcs.net/ganesh/bytestring-handle") + (synopsis "ByteString-backed Handles") + (description "ByteString-backed Handles") ; There is no description + (license license:bsd-3))) + +(define-public ghc-bytestring-lexing + (package + (name "ghc-bytestring-lexing") + (version "0.5.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "bytestring-lexing/bytestring-lexing-" + version ".tar.gz")) + (sha256 + (base32 + "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81")))) + (build-system haskell-build-system) + (home-page "http://code.haskell.org/~wren/") + (synopsis "Parse and produce literals from strict or lazy bytestrings") + (description + "This package provides tools to parse and produce literals efficiently +from strict or lazy bytestrings.") + (license license:bsd-2))) + +(define-public ghc-bzlib-conduit + (package + (name "ghc-bzlib-conduit") + (version "0.3.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/bzlib-conduit/" + "bzlib-conduit-" version ".tar.gz")) + (sha256 + (base32 + "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bindings-dsl" ,ghc-bindings-dsl) + ("ghc-conduit" ,ghc-conduit) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-random" ,ghc-random))) + (home-page "https://github.com/snoyberg/bzlib-conduit") + (synopsis "Streaming compression/decompression via conduits") + (description + "This package provides Haskell bindings to bzlib and Conduit support for +streaming compression and decompression.") + (license license:bsd-3))) + +(define-public ghc-c2hs + (package + (name "ghc-c2hs") + (version "0.28.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/c2hs/c2hs-" + version + ".tar.gz")) + (sha256 + (base32 + "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci")))) + (build-system haskell-build-system) + (inputs + `(("ghc-language-c" ,ghc-language-c) + ("ghc-dlist" ,ghc-dlist))) + (native-inputs + `(("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-hunit" ,ghc-hunit) + ("ghc-shelly" ,ghc-shelly) + ("gcc" ,gcc))) + (arguments + `(;; XXX: Test failures are induced by a parse error in + ;; of glibc 2.28. + #:tests? #f + + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-cc + ;; add a cc executable in the path, needed for some tests to pass + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc")) + (tmpbin (tmpnam)) + (curpath (getenv "PATH"))) + (mkdir-p tmpbin) + (symlink (which "gcc") (string-append tmpbin "/cc")) + (setenv "PATH" (string-append tmpbin ":" curpath))) + #t)) + (add-after 'check 'remove-cc + ;; clean the tmp dir made in 'set-cc + (lambda _ + (let* ((cc-path (which "cc")) + (cc-dir (dirname cc-path))) + (delete-file-recursively cc-dir) + #t)))))) + (home-page "https://github.com/haskell/c2hs") + (synopsis "Create Haskell bindings to C libraries") + (description "C->Haskell assists in the development of Haskell bindings to +C libraries. It extracts interface information from C header files and +generates Haskell code with foreign imports and marshaling. Unlike writing +foreign imports by hand (or using hsc2hs), this ensures that C functions are +imported with the correct Haskell types.") + (license license:gpl2))) + +(define-public ghc-cairo + (package + (name "ghc-cairo") + (version "0.13.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/cairo/" + "cairo-" version ".tar.gz")) + (sha256 + (base32 + "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2")))) + (build-system haskell-build-system) + (arguments + `(#:modules ((guix build haskell-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + ;; FIXME: This is a copy of the standard configure phase with a tiny + ;; difference: this package needs the -package-db flag to be passed + ;; to "runhaskell" in addition to the "configure" action, because it + ;; depends on gtk2hs-buildtools, which provide setup hooks. Without + ;; this option the Setup.hs file cannot be evaluated. The + ;; haskell-build-system should be changed to pass "-package-db" to + ;; "runhaskell" in any case. + (replace 'configure + (lambda* (#:key outputs inputs tests? (configure-flags '()) + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (name-version (strip-store-file-name out)) + (input-dirs (match inputs + (((_ . dir) ...) + dir) + (_ '()))) + (ghc-path (getenv "GHC_PACKAGE_PATH")) + (params (append `(,(string-append "--prefix=" out)) + `(,(string-append "--libdir=" out "/lib")) + `(,(string-append "--bindir=" out "/bin")) + `(,(string-append + "--docdir=" out + "/share/doc/" name-version)) + '("--libsubdir=$compiler/$pkg-$version") + '("--package-db=../package.conf.d") + '("--global") + `(,@(map + (cut string-append "--extra-include-dirs=" <>) + (search-path-as-list '("include") input-dirs))) + `(,@(map + (cut string-append "--extra-lib-dirs=" <>) + (search-path-as-list '("lib") input-dirs))) + (if tests? + '("--enable-tests") + '()) + configure-flags))) + (unsetenv "GHC_PACKAGE_PATH") + (apply invoke "runhaskell" "-package-db=../package.conf.d" + "Setup.hs" "configure" params) + (setenv "GHC_PACKAGE_PATH" ghc-path) + #t)))))) + (inputs + `(("ghc-utf8-string" ,ghc-utf8-string) + ("cairo" ,cairo))) + (native-inputs + `(("ghc-gtk2hs-buildtools" ,ghc-gtk2hs-buildtools) + ("pkg-config" ,pkg-config))) + (home-page "http://projects.haskell.org/gtk2hs/") + (synopsis "Haskell bindings to the Cairo vector graphics library") + (description + "Cairo is a library to render high quality vector graphics. There exist +various backends that allows rendering to Gtk windows, PDF, PS, PNG and SVG +documents, amongst others.") + (license license:bsd-3))) + +(define-public ghc-call-stack + (package + (name "ghc-call-stack") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "call-stack/call-stack-" + version ".tar.gz")) + (sha256 + (base32 + "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj")))) + (build-system haskell-build-system) + (inputs `(("ghc-nanospec" ,ghc-nanospec))) + (home-page "https://github.com/sol/call-stack#readme") + (synopsis "Use GHC call-stacks in a backward compatible way") + (description "This package provides a compatibility layer for using GHC +call stacks with different versions of the compiler.") + (license license:expat))) + +;; This is used as an input to ghc-hunit. We cannot use ghc-call-stack there, +;; because it depends on ghc-nanospec, which depends on ghc-hunit. +(define-public ghc-call-stack-boot + (hidden-package + (package + (inherit ghc-call-stack) + (arguments '(#:tests? #f)) + (inputs '())))) + +(define-public ghc-case-insensitive + (package + (name "ghc-case-insensitive") + (version "1.2.0.11") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/case-insensitive/case-insensitive-" + version + ".tar.gz")) + (sha256 + (base32 + "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7")))) + (build-system haskell-build-system) + ;; these inputs are necessary to use this library + (inputs + `(("ghc-hashable" ,ghc-hashable))) + (arguments + `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + (home-page + "https://github.com/basvandijk/case-insensitive") + (synopsis "Case insensitive string comparison") + (description + "The module @code{Data.CaseInsensitive} provides the @code{CI} type +constructor which can be parameterised by a string-like type like: +@code{String}, @code{ByteString}, @code{Text}, etc. Comparisons of values of +the resulting type will be insensitive to cases.") + (license license:bsd-3))) + +(define-public ghc-cereal + (package + (name "ghc-cereal") + (version "0.5.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/cereal/cereal-" + version + ".tar.gz")) + (sha256 + (base32 + "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-fail" ,ghc-fail) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://hackage.haskell.org/package/cereal") + (synopsis "Binary serialization library") + (description "This package provides a binary serialization library, +similar to @code{binary}, that introduces an @code{isolate} primitive for +parser isolation, and labeled blocks for better error messages.") + (license license:bsd-3))) + +(define-public ghc-cereal-conduit + (package + (name "ghc-cereal-conduit") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cereal-conduit/cereal-conduit-" + version ".tar.gz")) + (sha256 + (base32 + "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-cereal" ,ghc-cereal))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/snoyberg/conduit") + (synopsis "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits") + (description + "This package turn @code{Data.Serialize} @code{Gets} and @code{Puts} into +@code{Sources}, @code{Sinks}, and @code{Conduits}.") + (license license:bsd-3))) + +(define-public ghc-cgi + (package + (name "ghc-cgi") + (version "3001.3.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/cgi/cgi-" + version + ".tar.gz")) + (sha256 + (base32 + "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "cgi.cabal" + (("exceptions < 0\\.9") + "exceptions < 0.11") + (("time >= 1\\.5 && < 1\\.7") + "time >= 1.5 && < 1.9") + (("doctest >= 0\\.8 && < 0\\.12") + "doctest >= 0.8 && < 0.17") + (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") + "QuickCheck >= 2.8.1 && < 2.12"))))))) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-multipart" ,ghc-multipart) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-network" ,ghc-network))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page + "https://github.com/cheecheeo/haskell-cgi") + (synopsis "Library for writing CGI programs") + (description + "This is a Haskell library for writing CGI programs.") + (license license:bsd-3))) + +(define-public ghc-charset + (package + (name "ghc-charset") + (version "0.3.7.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/charset/charset-" + version + ".tar.gz")) + (sha256 + (base32 + "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-semigroups" ,ghc-semigroups) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (home-page "https://github.com/ekmett/charset") + (synopsis "Fast unicode character sets for Haskell") + (description "This package provides fast unicode character sets for +Haskell, based on complemented PATRICIA tries.") + (license license:bsd-3))) + +(define-public ghc-chart + (package + (name "ghc-chart") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/Chart/" + "Chart-" version ".tar.gz")) + (sha256 + (base32 + "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z")))) + (build-system haskell-build-system) + (inputs + `(("ghc-old-locale" ,ghc-old-locale) + ("ghc-lens" ,ghc-lens) + ("ghc-colour" ,ghc-colour) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-operational" ,ghc-operational) + ("ghc-vector" ,ghc-vector))) + (home-page "https://github.com/timbod7/haskell-chart/wiki") + (synopsis "Library for generating 2D charts and plots") + (description + "This package provides a library for generating 2D charts and plots, with +backends provided by the @code{Cairo} and @code{Diagrams} libraries.") + (license license:bsd-3))) + +(define-public ghc-chart-cairo + (package + (name "ghc-chart-cairo") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/Chart-cairo/" + "Chart-cairo-" version ".tar.gz")) + (sha256 + (base32 + "0iany6lfyfb1cw0pxfs5aw5k0a6x41m6ql9ad9w59biwdckbsyqr")))) + (build-system haskell-build-system) + (inputs + `(("ghc-old-locale" ,ghc-old-locale) + ("ghc-cairo" ,ghc-cairo) + ("ghc-colour" ,ghc-colour) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-operational" ,ghc-operational) + ("ghc-lens" ,ghc-lens) + ("ghc-chart" ,ghc-chart))) + (home-page "https://github.com/timbod7/haskell-chart/wiki") + (synopsis "Cairo backend for Charts") + (description "This package provides a Cairo vector graphics rendering +backend for the Charts library.") + (license license:bsd-3))) + +(define-public ghc-chasingbottoms + (package + (name "ghc-chasingbottoms") + (version "1.3.1.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/ChasingBottoms/" + "ChasingBottoms-" version ".tar.gz")) + (sha256 + (base32 + "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633")))) + (build-system haskell-build-system) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-random" ,ghc-random) + ("ghc-syb" ,ghc-syb))) + (home-page "https://hackage.haskell.org/package/ChasingBottoms") + (synopsis "Testing of partial and infinite values in Haskell") + (description + ;; FIXME: There should be a @comma{} in the uref text, but it is not + ;; rendered properly. + "This is a library for testing code involving bottoms or infinite values. +For the underlying theory and a larger example involving use of QuickCheck, +see the article +@uref{http://www.cse.chalmers.se/~nad/publications/danielsson-jansson-mpc2004.html, +\"Chasing Bottoms A Case Study in Program Verification in the Presence of +Partial and Infinite Values\"}.") + (license license:expat))) + +(define-public ghc-cheapskate + (package + (name "ghc-cheapskate") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/cheapskate/cheapskate-" + version + ".tar.gz")) + (sha256 + (base32 + "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) + (build-system haskell-build-system) + (inputs + `(("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-xss-sanitize" ,ghc-xss-sanitize) + ("ghc-data-default" ,ghc-data-default) + ("ghc-syb" ,ghc-syb) + ("ghc-uniplate" ,ghc-uniplate))) + (home-page "https://github.com/jgm/cheapskate") + (synopsis "Experimental markdown processor") + (description "Cheapskate is an experimental Markdown processor in pure +Haskell. It aims to process Markdown efficiently and in the most forgiving +possible way. It is designed to deal with any input, including garbage, with +linear performance. Output is sanitized by default for protection against +cross-site scripting (@dfn{XSS}) attacks.") + (license license:bsd-3))) + +(define-public ghc-chell + (package + (name "ghc-chell") + (version "0.4.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/chell/chell-" + version ".tar.gz")) + (sha256 + (base32 + "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9")))) + (build-system haskell-build-system) + (inputs + `(("ghc-options-bootstrap" ,ghc-options-bootstrap) + ("ghc-patience" ,ghc-patience) + ("ghc-random" ,ghc-random) + ("ghc-ansi-terminal" ,ghc-ansi-terminal))) + (home-page "https://john-millikin.com/software/chell/") + (synopsis "Simple and intuitive library for automated testing") + (description + "Chell is a simple and intuitive library for automated testing. +It natively supports assertion-based testing, and can use companion +libraries such as @code{chell-quickcheck} to support more complex +testing strategies.") + (license license:expat))) + +(define-public ghc-chell-quickcheck + (package + (name "ghc-chell-quickcheck") + (version "0.2.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/chell-quickcheck/" + "chell-quickcheck-" version ".tar.gz")) + (sha256 + (base32 + "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "chell-quickcheck.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.11") + "QuickCheck >= 2.3 && < 2.12"))))))) + (inputs + `(("ghc-chell" ,ghc-chell) + ("ghc-chell-quickcheck-bootstrap" ,ghc-chell-quickcheck-bootstrap) + ("ghc-random" ,ghc-random) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://john-millikin.com/software/chell/") + (synopsis "QuickCheck support for the Chell testing library") + (description "More complex tests for @code{chell}.") + (license license:expat))) + +(define ghc-chell-quickcheck-bootstrap + (package + (name "ghc-chell-quickcheck-bootstrap") + (version "0.2.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/chell-quickcheck/" + "chell-quickcheck-" version ".tar.gz")) + (sha256 + (base32 + "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) + (build-system haskell-build-system) + (inputs + `(("ghc-chell" ,ghc-chell) + ("ghc-random" ,ghc-random) + ("ghc-quickcheck" ,ghc-quickcheck))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "chell-quickcheck.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.11") + "QuickCheck >= 2.3 && < 2.12"))))))) + (home-page "https://john-millikin.com/software/chell/") + (synopsis "QuickCheck support for the Chell testing library") + (description "More complex tests for @code{chell}.") + (license license:expat))) + +(define-public ghc-chunked-data + (package + (name "ghc-chunked-data") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "chunked-data-" version "/" + "chunked-data-" version ".tar.gz")) + (sha256 + (base32 + "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) + (build-system haskell-build-system) + (inputs `(("ghc-vector" ,ghc-vector) + ("ghc-semigroups" ,ghc-semigroups))) + (home-page "https://github.com/snoyberg/mono-traversable") + (synopsis "Typeclasses for dealing with various chunked data +representations for Haskell") + (description "This Haskell package was originally present in +classy-prelude.") + (license license:expat))) + +(define-public ghc-clock + (package + (name "ghc-clock") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "clock/" + "clock-" version ".tar.gz")) + (sha256 + (base32 "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://hackage.haskell.org/package/clock") + (synopsis "High-resolution clock for Haskell") + (description "A package for convenient access to high-resolution clock and +timer functions of different operating systems via a unified API.") + (license license:bsd-3))) + +;; This package builds `clock` without tests, since the tests rely on tasty +;; and tasty-quickcheck, which in turn require clock to build. +(define-public ghc-clock-bootstrap + (package + (inherit ghc-clock) + (name "ghc-clock-bootstrap") + (arguments '(#:tests? #f)) + (inputs '()) + (properties '((hidden? #t))))) + +(define-public ghc-cmark + (package + (name "ghc-cmark") + (version "0.5.6") + (source (origin + (method url-fetch) + ;; XXX As of version 0.5.6, this package bundles libcmark 0.28.0. + ;; See cbits/cmark_version.h. + (uri (string-append "https://hackage.haskell.org/package/" + "cmark/cmark-" version ".tar.gz")) + (sha256 + (base32 + "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/jgm/commonmark-hs") + (synopsis "Fast, accurate CommonMark (Markdown) parser and renderer") + (description + "This package provides Haskell bindings for +@uref{https://github.com/jgm/cmark, libcmark}, the reference parser for +CommonMark, a fully specified variant of Markdown. It includes bundled libcmark +sources, and does not require prior installation of the C library.") + (license license:bsd-3))) + +(define-public ghc-cmark-gfm + (package + (name "ghc-cmark-gfm") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "cmark-gfm/cmark-gfm-" + version ".tar.gz")) + (sha256 + (base32 + "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/kivikakk/cmark-gfm-hs") + (synopsis + "Fast, accurate GitHub Flavored Markdown parser and renderer") + (description + "This package provides Haskell bindings for libcmark-gfm, the reference +parser for GitHub Flavored Markdown, a fully specified variant of Markdown. +It includes sources for libcmark-gfm and does not require prior installation +of the C library.") + (license license:bsd-3))) + +(define-public ghc-cmdargs + (package + (name "ghc-cmdargs") + (version "0.10.20") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/cmdargs/cmdargs-" + version ".tar.gz")) + (sha256 + (base32 + "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf")))) + (build-system haskell-build-system) + (home-page + "http://community.haskell.org/~ndm/cmdargs/") + (synopsis "Command line argument processing") + (description + "This library provides an easy way to define command line parsers.") + (license license:bsd-3))) + +(define-public ghc-code-page + (package + (name "ghc-code-page") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/code-page/code-page-" + version ".tar.gz")) + (sha256 + (base32 + "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76")))) + (build-system haskell-build-system) + (home-page "https://github.com/RyanGlScott/code-page") + (synopsis "Windows code page library for Haskell") + (description "A cross-platform library with functions for adjusting +code pages on Windows. On all other operating systems, the library does +nothing.") + (license license:bsd-3))) + +(define-public ghc-colour +(package + (name "ghc-colour") + (version "2.3.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/colour/colour-" + version ".tar.gz")) + (sha256 + (base32 + "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg")))) + (arguments + ;; The tests for this package have the following dependency cycle: + ;; ghc-test-framework -> ghc-ansi-terminal -> ghc-colour. + `(#:tests? #f)) + (build-system haskell-build-system) + (home-page "https://www.haskell.org/haskellwiki/Colour") + (synopsis "Model for human colour perception") + (description + "This package provides a data type for colours and transparency. +Colours can be blended and composed. Various colour spaces are +supported. A module of colour names (\"Data.Colour.Names\") is provided.") + (license license:expat))) + +(define-public ghc-comonad + (package + (name "ghc-comonad") + (version "5.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/comonad/comonad-" + version + ".tar.gz")) + (sha256 + (base32 + "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q")))) + (build-system haskell-build-system) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest))) + (inputs + `(("ghc-contravariant" ,ghc-contravariant) + ("ghc-distributive" ,ghc-distributive) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://github.com/ekmett/comonad/") + (synopsis "Comonads for Haskell") + (description "This library provides @code{Comonad}s for Haskell.") + (license license:bsd-3))) + +(define-public ghc-concatenative + (package + (name "ghc-concatenative") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/concatenative/concatenative-" + version ".tar.gz")) + (sha256 + (base32 + "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd")))) + (build-system haskell-build-system) + (home-page + "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty") + (synopsis "Library for postfix control flow") + (description + "Concatenative gives Haskell Factor-style combinators and arrows for +postfix notation. For more information on stack based languages, see +@uref{https://concatenative.org}.") + (license license:bsd-3))) + +(define-public ghc-concurrent-extra + (package + (name "ghc-concurrent-extra") + (version "0.7.0.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "concurrent-extra/concurrent-extra-" + version ".tar.gz")) + (sha256 + (base32 + "1y8xk460fvnw0idzdiylmm874sjny4q9jxb1js9fjz8lw2wns3h4")))) + (build-system haskell-build-system) + (arguments + ;; XXX: The ReadWriteLock 'stressTest' fails. + `(#:tests? #f)) + (inputs + `(("ghc-unbounded-delays" ,ghc-unbounded-delays))) + (native-inputs + `(("ghc-async" ,ghc-async) + ("ghc-hunit" ,ghc-hunit) + ("ghc-random" ,ghc-random) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/basvandijk/concurrent-extra") + (synopsis "Extra concurrency primitives") + (description "This Haskell library offers (among other things) the +following selection of synchronisation primitives: + +@itemize +@item @code{Broadcast}: Wake multiple threads by broadcasting a value. +@item @code{Event}: Wake multiple threads by signalling an event. +@item @code{Lock}: Enforce exclusive access to a resource. Also known +as a binary semaphore or mutex. The package additionally provides an +alternative that works in the STM monad. +@item @code{RLock}: A lock which can be acquired multiple times by the +same thread. Also known as a reentrant mutex. +@item @code{ReadWriteLock}: Multiple-reader, single-writer locks. Used +to protect shared resources which may be concurrently read, but only +sequentially written. +@item @code{ReadWriteVar}: Concurrent read, sequential write variables. +@end itemize + +Please consult the API documentation of the individual modules for more +detailed information. + +This package was inspired by the concurrency libraries of Java and +Python.") + (license license:bsd-3))) + +(define-public ghc-concurrent-output + (package + (name "ghc-concurrent-output") + (version "1.10.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/concurrent-output/concurrent-output-" + version + ".tar.gz")) + (sha256 + (base32 + "0mwf155w89nbbkjln7hhbn8k3f8p0ylcvgrg31cm7ijpx4499i4c")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-terminal-size" ,ghc-terminal-size))) + (home-page + "https://hackage.haskell.org/package/concurrent-output") + (synopsis + "Ungarble output from several threads or commands") + (description + "Lets multiple threads and external processes concurrently output to the +console, without it getting all garbled up. + +Built on top of that is a way of defining multiple output regions, which are +automatically laid out on the screen and can be individually updated by +concurrent threads. Can be used for progress displays etc.") + (license license:bsd-2))) + +(define-public ghc-conduit + (package + (name "ghc-conduit") + (version "1.3.0.3") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "conduit/conduit-" version ".tar.gz")) + (sha256 + (base32 + "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v")))) + (build-system haskell-build-system) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-mono-traversable" ,ghc-mono-traversable) + ("ghc-mmorph" ,ghc-mmorph) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-silently" ,ghc-silently) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-vector" ,ghc-vector) + ("ghc-void" ,ghc-void))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("ghc-safe" ,ghc-safe) + ("ghc-split" ,ghc-split))) + (home-page "https://github.com/snoyberg/conduit") + (synopsis "Streaming data library ") + (description + "The conduit package is a solution to the streaming data problem, +allowing for production, transformation, and consumption of streams of data +in constant memory. It is an alternative to lazy I/O which guarantees +deterministic resource handling, and fits in the same general solution +space as enumerator/iteratee and pipes.") + (license license:expat))) + +(define-public ghc-conduit-algorithms + (package + (name "ghc-conduit-algorithms") + (version "0.0.8.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "conduit-algorithms/conduit-algorithms-" + version ".tar.gz")) + (sha256 + (base32 + "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-bzlib-conduit" ,ghc-bzlib-conduit) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-combinators" ,ghc-conduit-combinators) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-lzma-conduit" ,ghc-lzma-conduit) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-pqueue" ,ghc-pqueue) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-stm-conduit" ,ghc-stm-conduit) + ("ghc-streaming-commons" ,ghc-streaming-commons) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-th" ,ghc-test-framework-th))) + (home-page "https://github.com/luispedro/conduit-algorithms#readme") + (synopsis "Conduit-based algorithms") + (description + "This package provides algorithms on @code{Conduits}, including higher +level asynchronous processing and some other utilities.") + (license license:expat))) + +(define-public ghc-conduit-combinators + (package + (name "ghc-conduit-combinators") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "conduit-combinators-" version "/" + "conduit-combinators-" version ".tar.gz")) + (sha256 + (base32 + "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp")))) + (build-system haskell-build-system) + (inputs `(("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-primitive" ,ghc-primitive) + ("ghc-vector" ,ghc-vector) + ("ghc-void" ,ghc-void) + ("ghc-mwc-random" ,ghc-mwc-random) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-chunked-data" ,ghc-chunked-data) + ("ghc-mono-traversable" ,ghc-mono-traversable))) + (native-inputs `(("ghc-hspec" ,ghc-hspec) + ("ghc-silently" ,ghc-silently) + ("ghc-safe" ,ghc-safe) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/snoyberg/mono-traversable") + (synopsis "Commonly used conduit functions, for both chunked and +unchunked data") + (description "This Haskell package provides a replacement for Data.Conduit.List, +as well as a convenient Conduit module.") + (license license:expat))) + +(define-public ghc-conduit-extra + (package + (name "ghc-conduit-extra") + (version "1.3.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "conduit-extra/conduit-extra-" + version ".tar.gz")) + (sha256 + (base32 + "0jaj350vv6mbb26gdwcqz4gwzfzrjydv5pis2da49wz1npbakcfw")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-typed-process" ,ghc-typed-process) + ("ghc-async" ,ghc-async) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-network" ,ghc-network) + ("ghc-primitive" ,ghc-primitive) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-streaming-commons" ,ghc-streaming-commons) + ("ghc-hspec" ,ghc-hspec) + ("ghc-bytestring-builder" ,ghc-bytestring-builder) + ("ghc-quickcheck" ,ghc-quickcheck))) + (native-inputs + `(("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/snoyberg/conduit") + (synopsis "Conduit adapters for common libraries") + (description + "The @code{conduit} package itself maintains relative small dependencies. +The purpose of this package is to collect commonly used utility functions +wrapping other library dependencies, without depending on heavier-weight +dependencies. The basic idea is that this package should only depend on +@code{haskell-platform} packages and @code{conduit}.") + (license license:expat))) + +(define-public ghc-configurator + (package + (name "ghc-configurator") + (version "0.3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "configurator/configurator-" + version ".tar.gz")) + (sha256 + (base32 + "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-hashable" ,ghc-hashable) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "http://github.com/bos/configurator") + (synopsis "Configuration management") + (description + "This package provides a configuration management library for programs +and daemons. The features include: + +@enumerate +@item Automatic, dynamic reloading in response to modifications to + configuration files. +@item A simple, but flexible, configuration language, supporting several of + the most commonly needed types of data, along with interpolation of strings + from the configuration or the system environment (e.g. @code{$(HOME)}). +@item Subscription-based notification of changes to configuration properties. +@item An @code{import} directive allows the configuration of a complex + application to be split across several smaller files, or common configuration + data to be shared across several applications. +@end enumerate\n") + (license license:bsd-3))) + +(define-public ghc-connection + (package + (name "ghc-connection") + (version "0.2.8") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "connection/connection-" + version ".tar.gz")) + (sha256 + (base32 + "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh")))) + (build-system haskell-build-system) + (inputs + `(("ghc-byteable" ,ghc-byteable) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-network" ,ghc-network) + ("ghc-tls" ,ghc-tls) + ("ghc-socks" ,ghc-socks) + ("ghc-x509" ,ghc-x509) + ("ghc-x509-store" ,ghc-x509-store) + ("ghc-x509-system" ,ghc-x509-system) + ("ghc-x509-validation" ,ghc-x509-validation))) + (home-page "https://github.com/vincenthz/hs-connection") + (synopsis "Simple and easy network connections API") + (description + "This package provides a simple network library for all your connection +needs. It provides a very simple API to create sockets to a destination with +the choice of SSL/TLS, and SOCKS.") + (license license:bsd-3))) + +(define-public ghc-constraints + (package + (name "ghc-constraints") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/constraints/constraints-" + version ".tar.gz")) + (sha256 + (base32 + "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hashable" ,ghc-hashable) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/ekmett/constraints/") + (synopsis "Constraint manipulation") + (description + "GHC 7.4 gave us the ability to talk about @code{ConstraintKinds}. +They stopped crashing the compiler in GHC 7.6. This package provides +a vocabulary for working with them.") + (license license:bsd-3))) + +(define-public ghc-contravariant + (package + (name "ghc-contravariant") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/contravariant/contravariant-" + version + ".tar.gz")) + (sha256 + (base32 + "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9")))) + (build-system haskell-build-system) + (inputs + `(("ghc-void" ,ghc-void) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-statevar" ,ghc-statevar) + ("ghc-semigroups" ,ghc-semigroups))) + (home-page + "https://github.com/ekmett/contravariant/") + (synopsis "Contravariant functors") + (description "Contravariant functors for Haskell.") + (license license:bsd-3))) + +(define-public ghc-contravariant-extras + (package + (name "ghc-contravariant-extras") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "contravariant-extras-" version "/" + "contravariant-extras-" version ".tar.gz")) + (sha256 + (base32 + "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n")))) + (build-system haskell-build-system) + (inputs + `(("ghc-tuple-th" ,ghc-tuple-th) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-base-prelude" ,ghc-base-prelude) + ("ghc-semigroups" ,ghc-semigroups))) + (home-page "https://github.com/nikita-volkov/contravariant-extras") + (synopsis "Extras for the @code{ghc-contravariant} Haskell package") + (description "This Haskell package provides extras for the +@code{ghc-contravariant} package.") + (license license:expat))) + +(define-public ghc-convertible + (package + (name "ghc-convertible") + (version "1.1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/convertible/" + "convertible-" version ".tar.gz")) + (sha256 + (base32 + "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9")))) + (build-system haskell-build-system) + (inputs + `(("ghc-old-time" ,ghc-old-time) + ("ghc-old-locale" ,ghc-old-locale))) + (home-page "https://hackage.haskell.org/package/convertible") + (synopsis "Typeclasses and instances for converting between types") + (description + "This package provides a typeclass with a single function that is +designed to help convert between different types: numeric values, dates and +times, and the like. The conversions perform bounds checking and return a +pure @code{Either} value. This means that you need not remember which specific +function performs the conversion you desire.") + (license license:bsd-3))) + +(define-public ghc-data-accessor + (package + (name "ghc-data-accessor") + (version "0.2.2.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/data-accessor/data-accessor-" + version ".tar.gz")) + (sha256 + (base32 "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l")))) + (build-system haskell-build-system) + (home-page "https://www.haskell.org/haskellwiki/Record_access") + (synopsis + "Haskell utilities for accessing and manipulating fields of records") + (description "This package provides Haskell modules for accessing and +manipulating fields of records.") + (license license:bsd-3))) + +(define-public ghc-data-accessor-transformers + (package + (name "ghc-data-accessor-transformers") + (version "0.2.1.7") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/data-accessor-transformers/" + "data-accessor-transformers-" version ".tar.gz")) + (sha256 + (base32 "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10")))) + (build-system haskell-build-system) + (inputs `(("ghc-data-accessor" ,ghc-data-accessor))) + (home-page "https://www.haskell.org/haskellwiki/Record_access") + (synopsis "Use Accessor to access state in transformers State monad") + (description "This package provides Haskell modules to allow use of +Accessor to access state in transformers State monad.") + (license license:bsd-3))) + +(define-public ghc-data-default + (package + (name "ghc-data-default") + (version "0.7.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/data-default/data-default-" + version + ".tar.gz")) + (sha256 + (base32 "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" + ,ghc-data-default-class) + ("ghc-data-default-instances-base" + ,ghc-data-default-instances-base) + ("ghc-data-default-instances-containers" + ,ghc-data-default-instances-containers) + ("ghc-data-default-instances-dlist" + ,ghc-data-default-instances-dlist) + ("ghc-data-default-instances-old-locale" + ,ghc-data-default-instances-old-locale))) + (home-page "https://hackage.haskell.org/package/data-default") + (synopsis "Types with default values") + (description + "This package defines a class for types with a default value, and +provides instances for types from the base, containers, dlist and old-locale +packages.") + (license license:bsd-3))) + +(define-public ghc-data-default-class + (package + (name "ghc-data-default-class") + (version "0.1.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/data-default-class/" + "data-default-class-" version ".tar.gz")) + (sha256 + (base32 "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/data-default-class") + (synopsis "Types with default values") + (description + "This package defines a class for types with default values.") + (license license:bsd-3))) + +(define-public ghc-data-default-instances-base + (package + (name "ghc-data-default-instances-base") + (version "0.1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "data-default-instances-base/" + "data-default-instances-base-" version ".tar.gz")) + (sha256 + (base32 "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" ,ghc-data-default-class))) + (home-page "https://hackage.haskell.org/package/data-default-instances-base") + (synopsis "Default instances for types in base") + (description + "This package provides default instances for types from the base +package.") + (license license:bsd-3))) + +(define-public ghc-data-default-instances-containers + (package + (name "ghc-data-default-instances-containers") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "data-default-instances-containers/" + "data-default-instances-containers-" version ".tar.gz")) + (sha256 + (base32 "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" ,ghc-data-default-class))) + (home-page "https://hackage.haskell.org/package/data-default-instances-containers") + (synopsis "Default instances for types in containers") + (description "Provides default instances for types from the containers +package.") + (license license:bsd-3))) + +(define-public ghc-data-default-instances-dlist + (package + (name "ghc-data-default-instances-dlist") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "data-default-instances-dlist/" + "data-default-instances-dlist-" version ".tar.gz")) + (sha256 + (base32 "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-dlist" ,ghc-dlist))) + (home-page "https://hackage.haskell.org/package/data-default-instances-dlist") + (synopsis "Default instances for types in dlist") + (description "Provides default instances for types from the dlist +package.") + (license license:bsd-3))) + +(define-public ghc-data-default-instances-old-locale + (package + (name "ghc-data-default-instances-old-locale") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "data-default-instances-old-locale/" + "data-default-instances-old-locale-" version ".tar.gz")) + (sha256 + (base32 "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-old-locale" ,ghc-old-locale))) + (home-page + "https://hackage.haskell.org/package/data-default-instances-old-locale") + (synopsis "Default instances for types in old-locale") + (description "Provides Default instances for types from the old-locale + package.") + (license license:bsd-3))) + +(define-public ghc-data-hash + (package + (name "ghc-data-hash") + (version "0.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/data-hash" + "/data-hash-" version ".tar.gz")) + (sha256 + (base32 "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi")))) + (build-system haskell-build-system) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://hackage.haskell.org/package/data-hash") + (synopsis "Combinators for building fast hashing functions") + (description + "This package provides combinators for building fast hashing functions. +It includes hashing functions for all basic Haskell98 types.") + (license license:bsd-3))) + +(define-public ghc-data-ordlist + (package + (name "ghc-data-ordlist") + (version "0.4.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/data-ordlist/data-ordlist-" + version ".tar.gz")) + (sha256 + (base32 + "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/data-ordlist") + (synopsis "Set and bag operations on ordered lists") + (description + "This module provides set and multiset operations on ordered lists.") + (license license:bsd-3))) + +(define-public ghc-deepseq-generics + (package + (name "ghc-deepseq-generics") + (version "0.2.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "deepseq-generics/deepseq-generics-" + version ".tar.gz")) + (sha256 + (base32 + "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb"))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/hvr/deepseq-generics") + (synopsis "Generic RNF implementation") + (description + "This package provides a @code{GHC.Generics}-based +@code{Control.DeepSeq.Generics.genericRnf} function which can be used for +providing an @code{rnf} implementation.") + (license license:bsd-3))) + +(define-public ghc-descriptive + (package + (name "ghc-descriptive") + (version "0.9.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/descriptive/descriptive-" + version + ".tar.gz")) + (sha256 + (base32 + "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-scientific" ,ghc-scientific) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-hspec" ,ghc-hspec))) + (home-page + "https://github.com/chrisdone/descriptive") + (synopsis + "Self-describing consumers/parsers: forms, cmd-line args, JSON, etc.") + (description + "This package provides datatypes and functions for creating consumers +and parsers with useful semantics.") + (license license:bsd-3))) + +(define-public ghc-diff + (package + (name "ghc-diff") + (version "0.3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "Diff/Diff-" version ".tar.gz")) + (sha256 + (base32 + "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://hub.darcs.net/sterlingclover/Diff") + (synopsis "O(ND) diff algorithm in Haskell") + (description + "This package provides an implementation of the standard diff algorithm, +and utilities for pretty printing.") + (license license:bsd-3))) + +(define-public ghc-disk-free-space + (package + (name "ghc-disk-free-space") + (version "0.1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "disk-free-space/disk-free-space-" + version ".tar.gz")) + (sha256 + (base32 + "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi")))) + (build-system haskell-build-system) + (home-page "https://github.com/redneb/disk-free-space") + (synopsis "Retrieve information about disk space usage") + (description "A cross-platform library for retrieving information about +disk space usage.") + (license license:bsd-3))) + +(define-public ghc-distributive + (package + (name "ghc-distributive") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/distributive/distributive-" + version + ".tar.gz")) + (sha256 + (base32 + "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("6" "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"))) + (inputs + `(("ghc-tagged" ,ghc-tagged) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-generic-deriving" ,ghc-generic-deriving))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/ekmett/distributive/") + (synopsis "Distributive functors for Haskell") + (description "This package provides distributive functors for Haskell. +Dual to @code{Traversable}.") + (license license:bsd-3))) + +(define-public ghc-dlist + (package + (name "ghc-dlist") + (version "0.8.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/dlist/dlist-" + version + ".tar.gz")) + (sha256 + (base32 "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc")))) + (build-system haskell-build-system) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/spl/dlist") + (synopsis "Difference lists") + (description + "Difference lists are a list-like type supporting O(1) append. This is +particularly useful for efficient logging and pretty printing (e.g. with the +Writer monad), where list append quickly becomes too expensive.") + (license license:bsd-3))) + +(define-public ghc-doctemplates + (package + (name "ghc-doctemplates") + (version "0.2.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "doctemplates/doctemplates-" + version ".tar.gz")) + (sha256 + (base32 + "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-vector" ,ghc-vector) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-scientific" ,ghc-scientific))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec))) + (home-page "https://github.com/jgm/doctemplates#readme") + (synopsis "Pandoc-style document templates") + (description + "This package provides a simple text templating system used by pandoc.") + (license license:bsd-3))) + +(define-public ghc-doctest + (package + (name "ghc-doctest") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/doctest/doctest-" + version + ".tar.gz")) + (sha256 + (base32 + "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: missing test framework + (inputs + `(("ghc-syb" ,ghc-syb) + ("ghc-paths" ,ghc-paths) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-code-page" ,ghc-code-page) + ("ghc-hunit" ,ghc-hunit) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-stringbuilder" ,ghc-stringbuilder) + ("ghc-silently" ,ghc-silently) + ("ghc-setenv" ,ghc-setenv))) + (home-page + "https://github.com/sol/doctest#readme") + (synopsis "Test interactive Haskell examples") + (description "The doctest program checks examples in source code comments. +It is modeled after doctest for Python, see +@uref{https://docs.python.org/library/doctest.html, the Doctest website}.") + (license license:expat))) + +(define-public ghc-double-conversion + (package + (name "ghc-double-conversion") + (version "2.0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "double-conversion/double-conversion-" + version ".tar.gz")) + (sha256 + (base32 + "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/bos/double-conversion") + (synopsis "Fast conversion between double precision floating point and text") + (description + "This package provides a library that performs fast, accurate conversion +between double precision floating point and text.") + (license license:bsd-3))) + +(define-public ghc-easy-file + (package + (name "ghc-easy-file") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/easy-file/easy-file-" + version + ".tar.gz")) + (sha256 + (base32 + "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) + (build-system haskell-build-system) + (home-page + "https://github.com/kazu-yamamoto/easy-file") + (synopsis "File handling library for Haskell") + (description "This library provides file handling utilities for Haskell.") + (license license:bsd-3))) + +(define-public ghc-easyplot + (package + (name "ghc-easyplot") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/easyplot/easyplot-" + version ".tar.gz")) + (sha256 + (base32 "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk")))) + (build-system haskell-build-system) + (propagated-inputs `(("gnuplot" ,gnuplot))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-setup-suffix + (lambda _ (rename-file "Setup.lhs" "Setup.hs") #t))))) + (home-page "https://hub.darcs.net/scravy/easyplot") + (synopsis "Haskell plotting library based on gnuplot") + (description "This package provides a plotting library for +Haskell, using gnuplot for rendering.") + (license license:expat))) + +(define-public ghc-echo + (package + (name "ghc-echo") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/echo/echo-" + version ".tar.gz")) + (sha256 + (base32 + "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"))) + (home-page "https://github.com/RyanGlScott/echo") + (synopsis "Echo terminal input portably") + (description "The @code{base} library exposes the @code{hGetEcho} and +@code{hSetEcho} functions for querying and setting echo status, but +unfortunately, neither function works with MinTTY consoles on Windows. +This library provides an alternative interface which works with both +MinTTY and other consoles.") + (license license:bsd-3))) + +(define-public ghc-edisonapi + (package + (name "ghc-edisonapi") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/EdisonAPI" + "/EdisonAPI-" version ".tar.gz")) + (sha256 + (base32 "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm")))) + (build-system haskell-build-system) + (home-page "http://rwd.rdockins.name/edison/home/") + (synopsis "Library of efficient, purely-functional data structures (API)") + (description + "Edison is a library of purely functional data structures written by +Chris Okasaki. It is named after Thomas Alva Edison and for the mnemonic +value EDiSon (Efficient Data Structures). Edison provides several families of +abstractions, each with multiple implementations. The main abstractions +provided by Edison are: Sequences such as stacks, queues, and dequeues; +Collections such as sets, bags and heaps; and Associative Collections such as +finite maps and priority queues where the priority and element are distinct.") + (license license:expat))) + +(define-public ghc-edisoncore + (package + (name "ghc-edisoncore") + (version "1.3.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/EdisonCore" + "/EdisonCore-" version ".tar.gz")) + (sha256 + (base32 "0fgj5iwiv3v2gdgx7kjcr15dcs4x1kvmjspp3p99wyhh0x6h3ikk")))) + (build-system haskell-build-system) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-edisonapi" ,ghc-edisonapi))) + (home-page "http://rwd.rdockins.name/edison/home/") + (synopsis "Library of efficient, purely-functional data structures") + (description + "This package provides the core Edison data structure implementations, +including multiple sequence, set, bag, and finite map concrete implementations +with various performance characteristics.") + (license license:expat))) + +(define-public ghc-edit-distance + (package + (name "ghc-edit-distance") + (version "0.2.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/edit-distance" + "/edit-distance-" version ".tar.gz")) + (sha256 + (base32 "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "edit-distance.cabal" + (("QuickCheck >= 2\\.4 && <2\\.9") + "QuickCheck >= 2.4 && < 2.12"))))))) + (inputs + `(("ghc-random" ,ghc-random) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/phadej/edit-distance") + (synopsis "Levenshtein and restricted Damerau-Levenshtein edit distances") + (description + "This package provides optimized functions to determine the edit +distances for fuzzy matching, including Levenshtein and restricted +Damerau-Levenshtein algorithms.") + (license license:bsd-3))) + +(define-public ghc-either + (package + (name "ghc-either") + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "either-" version "/" + "either-" version ".tar.gz")) + (sha256 + (base32 + "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc")))) + (build-system haskell-build-system) + (inputs `(("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-free" ,ghc-free) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-manodrandom" ,ghc-monadrandom) + ("ghc-mmorph" ,ghc-mmorph) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-transformers-base" ,ghc-transformers-base))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/ekmett/either") + (synopsis "Provides an either monad transformer for Haskell") + (description "This Haskell package provides an either monad transformer.") + (license license:bsd-3))) + +(define-public ghc-email-validate + (package + (name "ghc-email-validate") + (version "2.3.2.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "email-validate/email-validate-" + version + ".tar.gz")) + (sha256 + (base32 + "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-doctest" ,ghc-doctest))) + (home-page + "https://github.com/Porges/email-validate-hs") + (synopsis "Email address validator for Haskell") + (description + "This Haskell package provides a validator that can validate an email +address string against RFC 5322.") + (license license:bsd-3))) + +(define-public ghc-enclosed-exceptions + (package + (name "ghc-enclosed-exceptions") + (version "1.0.3") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "enclosed-exceptions/enclosed-exceptions-" + version ".tar.gz")) + (sha256 + (base32 + "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg")))) + (build-system haskell-build-system) + ;; FIXME: one of the tests blocks forever: + ;; "thread blocked indefinitely in an MVar operation" + (arguments '(#:tests? #f)) + (inputs + `(("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-async" ,ghc-async) + ("ghc-transformers-base" ,ghc-transformers-base))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/jcristovao/enclosed-exceptions") + (synopsis "Catch all exceptions from within an enclosed computation") + (description + "This library implements a technique to catch all exceptions raised +within an enclosed computation, while remaining responsive to (external) +asynchronous exceptions.") + (license license:expat))) + +(define-public ghc-equivalence + (package + (name "ghc-equivalence") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/equivalence" + "/equivalence-" version ".tar.gz")) + (sha256 + (base32 "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx")))) + (build-system haskell-build-system) + (inputs + `(("ghc-stmonadtrans" ,ghc-stmonadtrans) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/pa-ba/equivalence") + (synopsis "Maintaining an equivalence relation implemented as union-find") + (description + "This is an implementation of Tarjan's Union-Find algorithm (Robert E.@: +Tarjan. \"Efficiency of a Good But Not Linear Set Union Algorithm\",JACM +22(2), 1975) in order to maintain an equivalence relation. This +implementation is a port of the @code{union-find} package using the @code{ST} +monad transformer (instead of the IO monad).") + (license license:bsd-3))) + +(define-public ghc-erf + (package + (name "ghc-erf") + (version "2.0.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "erf-" version "/" + "erf-" version ".tar.gz")) + (sha256 + (base32 + "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/erf") + (synopsis "The error function, erf, and related functions for Haskell") + (description "This Haskell library provides a type class for the +error function, erf, and related functions. Instances for Float and +Double.") + (license license:bsd-3))) + +(define-public ghc-errorcall-eq-instance + (package + (name "ghc-errorcall-eq-instance") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "errorcall-eq-instance/errorcall-eq-instance-" + version ".tar.gz")) + (sha256 + (base32 + "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "http://hackage.haskell.org/package/errorcall-eq-instance") + (synopsis "Orphan Eq instance for ErrorCall") + (description + "Prior to @code{base-4.7.0.0} there was no @code{Eq} instance for @code{ErrorCall}. +This package provides an orphan instance.") + (license license:expat))) + +(define-public ghc-errors + (package + (name "ghc-errors") + (version "2.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "errors-" version "/" + "errors-" version ".tar.gz")) + (sha256 + (base32 + "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7")))) + (build-system haskell-build-system) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unexceptionalio" ,ghc-unexceptionalio) + ("ghc-safe" ,ghc-safe))) + (home-page "https://github.com/gabriel439/haskell-errors-library") + (synopsis "Error handling library for Haskell") + (description "This library encourages an error-handling style that +directly uses the type system, rather than out-of-band exceptions.") + (license license:bsd-3))) + +(define-public ghc-esqueleto + (let ((version "2.5.3") + (revision "1") + (commit "b81e0d951e510ebffca03c5a58658ad884cc6fbd")) + (package + (name "ghc-esqueleto") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bitemyapp/esqueleto") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa")))) + (build-system haskell-build-system) + (arguments + `(#:haddock? #f ; Haddock reports an internal error. + #:phases + (modify-phases %standard-phases + ;; This package normally runs tests for the MySQL, PostgreSQL, and + ;; SQLite backends. Since we only have Haskell packages for + ;; SQLite, we remove the other two test suites. FIXME: Add the + ;; other backends and run all three test suites. + (add-before 'configure 'remove-non-sqlite-test-suites + (lambda _ + (use-modules (ice-9 rdelim)) + (with-atomic-file-replacement "esqueleto.cabal" + (lambda (in out) + (let loop ((line (read-line in 'concat)) (deleting? #f)) + (cond + ((eof-object? line) #t) + ((string-every char-set:whitespace line) + (unless deleting? (display line out)) + (loop (read-line in 'concat) #f)) + ((member line '("test-suite mysql\n" + "test-suite postgresql\n")) + (loop (read-line in 'concat) #t)) + (else + (unless deleting? (display line out)) + (loop (read-line in 'concat) deleting?))))))))))) + (inputs + `(("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-conduit" ,ghc-conduit) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-persistent" ,ghc-persistent) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) + ("ghc-persistent-template" ,ghc-persistent-template))) + (home-page "https://github.com/bitemyapp/esqueleto") + (synopsis "Type-safe embedded domain specific language for SQL queries") + (description "This library provides a type-safe embedded domain specific +language (EDSL) for SQL queries that works with SQL backends as provided by +@code{ghc-persistent}. Its language closely resembles SQL, so you don't have +to learn new concepts, just new syntax, and it's fairly easy to predict the +generated SQL and optimize it for your backend.") + (license license:bsd-3)))) + +(define-public ghc-exactprint + (package + (name "ghc-exactprint") + (version "0.5.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "ghc-exactprint/ghc-exactprint-" version ".tar.gz")) + (sha256 + (base32 + "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87")))) + (build-system haskell-build-system) + (inputs + `(("ghc-paths" ,ghc-paths) + ("ghc-syb" ,ghc-syb) + ("ghc-free" ,ghc-free))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-diff" ,ghc-diff) + ("ghc-silently" ,ghc-silently) + ("ghc-filemanip" ,ghc-filemanip))) + (home-page + "http://hackage.haskell.org/package/ghc-exactprint") + (synopsis "ExactPrint for GHC") + (description + "Using the API Annotations available from GHC 7.10.2, this library +provides a means to round-trip any code that can be compiled by GHC, currently +excluding @file{.lhs} files.") + (license license:bsd-3))) + +(define-public ghc-exceptions + (package + (name "ghc-exceptions") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/exceptions/exceptions-" + version + ".tar.gz")) + (sha256 + (base32 + "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (inputs + `(("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://github.com/ekmett/exceptions/") + (synopsis "Extensible optionally-pure exceptions") + (description "This library provides extensible optionally-pure exceptions +for Haskell.") + (license license:bsd-3))) + +(define-public ghc-executable-path + (package + (name "ghc-executable-path") + (version "0.0.3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "executable-path/executable-path-" + version ".tar.gz")) + (sha256 + (base32 + "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/executable-path") + (synopsis "Find out the full path of the executable") + (description + "The documentation of @code{System.Environment.getProgName} says that +\"However, this is hard-to-impossible to implement on some non-Unix OSes, so +instead, for maximum portability, we just return the leafname of the program +as invoked.\" This library tries to provide the missing path.") + (license license:public-domain))) + +(define-public ghc-extensible-exceptions + (package + (name "ghc-extensible-exceptions") + (version "0.1.1.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "extensible-exceptions/extensible-exceptions-" + version ".tar.gz")) + (sha256 + (base32 "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/extensible-exceptions") + (synopsis "Extensible exceptions for Haskell") + (description + "This package provides extensible exceptions for both new and old +versions of GHC (i.e., < 6.10).") + (license license:bsd-3))) + +(define-public ghc-extra + (package + (name "ghc-extra") + (version "1.6.9") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/extra/extra-" + version + ".tar.gz")) + (sha256 + (base32 + "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-clock" ,ghc-clock) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/ndmitchell/extra") + (synopsis "Extra Haskell functions") + (description "This library provides extra functions for the standard +Haskell libraries. Most functions are simple additions, filling out missing +functionality. A few functions are available in later versions of GHC, but +this package makes them available back to GHC 7.2.") + (license license:bsd-3))) + +(define-public ghc-fail + (package + (name "ghc-fail") + (version "4.9.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/fail/fail-" + version ".tar.gz")) + (sha256 + (base32 "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d")))) + (build-system haskell-build-system) + (arguments `(#:haddock? #f)) ; Package contains no documentation. + (home-page "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail") + (synopsis "Forward-compatible MonadFail class") + (description + "This package contains the @code{Control.Monad.Fail} module providing the +@uref{https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail, MonadFail} +class that became available in +@uref{https://hackage.haskell.org/package/base-4.9.0.0, base-4.9.0.0} for +older @code{base} package versions. This package turns into an empty package +when used with GHC versions which already provide the +@code{Control.Monad.Fail} module.") + (license license:bsd-3))) + +(define-public ghc-fast-logger + (package + (name "ghc-fast-logger") + (version "2.4.11") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/fast-logger/fast-logger-" + version + ".tar.gz")) + (sha256 + (base32 + "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-auto-update" ,ghc-auto-update) + ("ghc-easy-file" ,ghc-easy-file) + ("ghc-unix-time" ,ghc-unix-time))) + (native-inputs + `(("hspec-discover" ,hspec-discover) + ("ghc-hspec" ,ghc-hspec))) + (home-page "https://hackage.haskell.org/package/fast-logger") + (synopsis "Fast logging system") + (description "This library provides a fast logging system for Haskell.") + (license license:bsd-3))) + +(define-public ghc-feed + (package + (name "ghc-feed") + (version "1.0.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "feed/feed-" version ".tar.gz")) + (sha256 + (base32 + "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d"))) + (inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-old-time" ,ghc-old-time) + ("ghc-safe" ,ghc-safe) + ("ghc-time-locale-compat" ,ghc-time-locale-compat) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-xml-conduit" ,ghc-xml-conduit) + ("ghc-xml-types" ,ghc-xml-types))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/bergmark/feed") + (synopsis "Haskell package for handling various syndication formats") + (description "This Haskell package includes tools for generating and +consuming feeds in both RSS (Really Simple Syndication) and Atom format.") + (license license:bsd-3))) + +(define-public ghc-fgl + (package + (name "ghc-fgl") + (version "5.6.0.0") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/fgl/fgl-" + version + ".tar.gz")) + (sha256 + (base32 + "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "fgl.cabal" + (("QuickCheck >= 2\\.8 && < 2\\.10") + "QuickCheck >= 2.8 && < 2.12") + (("hspec >= 2\\.1 && < 2\\.5") + "hspec >= 2.1 && < 2.6"))))))) + (inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://web.engr.oregonstate.edu/~erwig/fgl/haskell") + (synopsis + "Martin Erwig's Functional Graph Library") + (description "The functional graph library, FGL, is a collection of type +and function definitions to address graph problems. The basis of the library +is an inductive definition of graphs in the style of algebraic data types that +encourages inductive, recursive definitions of graph algorithms.") + (license license:bsd-3))) + +(define-public ghc-fgl-arbitrary + (package + (name "ghc-fgl-arbitrary") + (version "0.2.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/fgl-arbitrary/fgl-arbitrary-" + version ".tar.gz")) + (sha256 + (base32 + "0ln1szgfy8fa78l3issq4fx3aqnnd54w3cb4wssrfi48vd5rkfjm")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "fgl-arbitrary.cabal" + (("QuickCheck >= 2\\.3 && < 2\\.10") + "QuickCheck >= 2.3 && < 2.12") + (("hspec >= 2\\.1 && < 2\\.5") + "hspec >= 2.1 && < 2.6"))))))) + (inputs + `(("ghc-fgl" ,ghc-fgl) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec))) + (home-page "https://hackage.haskell.org/package/fgl-arbitrary") + (synopsis "QuickCheck support for fgl") + (description + "Provides Arbitrary instances for fgl graphs to avoid adding a +QuickCheck dependency for fgl whilst still making the instances +available to others. Also available are non-fgl-specific functions +for generating graph-like data structures.") + (license license:bsd-3))) + +(define-public ghc-file-embed + (package + (name "ghc-file-embed") + (version "0.0.10.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/file-embed/" + "file-embed-" version ".tar.gz")) + (sha256 + (base32 + "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k")))) + (build-system haskell-build-system) + (home-page "https://github.com/snoyberg/file-embed") + (synopsis "Use Template Haskell to embed file contents directly") + (description + "This package allows you to use Template Haskell to read a file or all +the files in a directory, and turn them into @code{(path, bytestring)} pairs +embedded in your Haskell code.") + (license license:bsd-3))) + +(define-public ghc-filemanip + (package + (name "ghc-filemanip") + (version "0.3.6.3") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "filemanip/filemanip-" version ".tar.gz")) + (sha256 + (base32 + "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-unix-compat" ,ghc-unix-compat))) + (home-page "https://github.com/bos/filemanip") + (synopsis "File and directory manipulation for Haskell") + (description + "This package provides a Haskell library for working with files and +directories. It includes code for pattern matching, finding files, modifying +file contents, and more.") + (license license:bsd-3))) + +(define-public ghc-findbin + (package + (name "ghc-findbin") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/FindBin/FindBin-" + version ".tar.gz")) + (sha256 + (base32 + "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717")))) + (build-system haskell-build-system) + (home-page "https://github.com/audreyt/findbin") + (synopsis "Get the absolute path of the running program") + (description + "This module locates the full directory of the running program, to allow +the use of paths relative to it. FindBin supports invocation of Haskell +programs via \"ghci\", via \"runhaskell/runghc\", as well as compiled as +an executable.") + (license license:bsd-3))) + +(define-public ghc-fingertree + (package + (name "ghc-fingertree") + (version "0.1.4.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/fingertree/fingertree-" + version ".tar.gz")) + (sha256 + (base32 + "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://hackage.haskell.org/package/fingertree") + (synopsis "Generic finger-tree structure") + (description "This library provides finger trees, a general sequence +representation with arbitrary annotations, for use as a base for +implementations of various collection types. It includes examples, as +described in section 4 of Ralf Hinze and Ross Paterson, \"Finger trees: a +simple general-purpose data structure\".") + (license license:bsd-3))) + +(define-public ghc-fixed + (package + (name "ghc-fixed") + (version "0.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/fixed/fixed-" + version ".tar.gz")) + (sha256 + (base32 + "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94")))) + (build-system haskell-build-system) + (home-page "https://github.com/ekmett/fixed") + (synopsis "Signed 15.16 precision fixed point arithmetic") + (description + "This package provides functions for signed 15.16 precision fixed point +arithmetic.") + (license license:bsd-3))) + +(define-public ghc-foldl + (package + (name "ghc-foldl") + (version "1.4.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "foldl-" version "/" + "foldl-" version ".tar.gz")) + (sha256 + (base32 + "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk")))) + (build-system haskell-build-system) + (inputs `(("ghc-mwc-randam" ,ghc-mwc-random) + ("ghc-primitive" ,ghc-primitive) + ("ghc-vector" ,ghc-vector) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-hashable" ,ghc-hashable) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-comonad" ,ghc-comonad) + ("ghc-vector-builder" ,ghc-vector-builder))) + (home-page "https://github.com/Gabriel439/Haskell-Foldl-Library") + (synopsis "Composable, streaming, and efficient left folds for Haskell") + (description "This Haskell library provides strict left folds that stream +in constant memory, and you can combine folds using @code{Applicative} style +to derive new folds. Derived folds still traverse the container just once +and are often as efficient as hand-written folds.") + (license license:bsd-3))) + +(define-public ghc-foundation + (package + (name "ghc-foundation") + (version "0.0.21") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "foundation/foundation-" version ".tar.gz")) + (sha256 + (base32 + "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf")))) + (build-system haskell-build-system) + (inputs `(("ghc-basement" ,ghc-basement))) + (home-page "https://github.com/haskell-foundation/foundation") + (synopsis "Alternative prelude with batteries and no dependencies") + (description + "This package provides a custom prelude with no dependencies apart from +the base package. + +Foundation has the following goals: + +@enumerate +@item provide a base like sets of modules that provide a consistent set of + features and bugfixes across multiple versions of GHC (unlike base). +@item provide a better and more efficient prelude than base's prelude. +@item be self-sufficient: no external dependencies apart from base; +@item provide better data-types: packed unicode string by default, arrays; +@item Numerical classes that better represent mathematical things (no more + all-in-one @code{Num}); +@item I/O system with less lazy IO. +@end enumerate\n") + (license license:bsd-3))) + +(define-public ghc-free + (package + (name "ghc-free") + (version "5.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/free/free-" + version + ".tar.gz")) + (sha256 + (base32 + "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-prelude-extras" ,ghc-prelude-extras) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-comonad" ,ghc-comonad) + ("ghc-distributive" ,ghc-distributive) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://github.com/ekmett/free/") + (synopsis "Unrestricted monads for Haskell") + (description "This library provides free monads, which are useful for many +tree-like structures and domain specific languages. If @code{f} is a +@code{Functor} then the free @code{Monad} on @code{f} is the type of trees +whose nodes are labeled with the constructors of @code{f}. The word \"free\" +is used in the sense of \"unrestricted\" rather than \"zero-cost\": @code{Free +f} makes no constraining assumptions beyond those given by @code{f} and the +definition of @code{Monad}.") + (license license:bsd-3))) + +(define-public ghc-fsnotify + (package + (name "ghc-fsnotify") + (version "0.3.0.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/fsnotify/" + "fsnotify-" version ".tar.gz")) + (sha256 + (base32 + "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-hinotify" ,ghc-hinotify) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-random" ,ghc-random) + ("ghc-shelly" ,ghc-shelly) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/haskell-fswatch/hfsnotify") + (synopsis "Cross platform library for file change notification.") + (description "Cross platform library for file creation, modification, and +deletion notification. This library builds upon existing libraries for platform +specific Windows, Mac, and Linux file system event notification.") + (license license:bsd-3))) + +(define-public ghc-generic-deriving + (package + (name "ghc-generic-deriving") + (version "1.12.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/generic-deriving/generic-deriving-" + version + ".tar.gz")) + (sha256 + (base32 + "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n")))) + (build-system haskell-build-system) + (inputs + `(("ghc-th-abstraction" ,ghc-th-abstraction))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/generic-deriving") + (synopsis "Generalise the deriving mechanism to arbitrary classes") + (description "This package provides functionality for generalising the +deriving mechanism in Haskell to arbitrary classes.") + (license license:bsd-3))) + +(define-public ghc-generics-sop + (package + (name "ghc-generics-sop") + (version "0.3.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "generics-sop-" version "/" + "generics-sop-" version ".tar.gz")) + (sha256 + (base32 + "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h")))) + (build-system haskell-build-system) + (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://github.com/well-typed/generics-sop") + (synopsis "Generic Programming using True Sums of Products for Haskell") + (description "This Haskell package supports the definition of generic +functions. Datatypes are viewed in a uniform, structured way: the choice +between constructors is represented using an n-ary sum, and the arguments of +each constructor are represented using an n-ary product.") + (license license:bsd-3))) + +(define-public ghc-geniplate-mirror + (package + (name "ghc-geniplate-mirror") + (version "0.7.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package" + "/geniplate-mirror" + "/geniplate-mirror-" version ".tar.gz")) + (sha256 + (base32 "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb")))) + (build-system haskell-build-system) + (home-page "https://github.com/danr/geniplate") + (synopsis "Use Template Haskell to generate Uniplate-like functions") + (description + "Use Template Haskell to generate Uniplate-like functions. This is a +maintained mirror of the @uref{https://hackage.haskell.org/package/geniplate, +geniplate} package, written by Lennart Augustsson.") + (license license:bsd-3))) + +(define-public ghc-genvalidity + (package + (name "ghc-genvalidity") + (version "0.5.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/genvalidity/genvalidity-" + version + ".tar.gz")) + (sha256 + (base32 + "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0")))) + (build-system haskell-build-system) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-validity" ,ghc-validity))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover) + ("ghc-hspec-core" ,ghc-hspec-core))) + (home-page + "https://github.com/NorfairKing/validity") + (synopsis + "Testing utilities for the @code{validity} library") + (description + "This package provides testing utilities that are useful in conjunction +with the @code{Validity} typeclass.") + (license license:expat))) + +(define-public ghc-genvalidity-property + (package + (name "ghc-genvalidity-property") + (version "0.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "genvalidity-property/genvalidity-property-" + version + ".tar.gz")) + (sha256 + (base32 + "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-genvalidity" ,ghc-genvalidity) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover) + ("ghc-validity" ,ghc-validity))) + (native-inputs `(("ghc-doctest" ,ghc-doctest))) + (home-page + "https://github.com/NorfairKing/validity") + (synopsis + "Standard properties for functions on @code{Validity} types") + (description + "This package supplements the @code{Validity} typeclass with standard +properties for functions operating on them.") + (license license:expat))) + +(define-public ghc-gitrev + (package + (name "ghc-gitrev") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/gitrev/gitrev-" + version ".tar.gz")) + (sha256 + (base32 "0cl3lfm6k1h8fxp2vxa6ihfp4v8igkz9h35iwyq2frzm4kdn96d8")))) + (build-system haskell-build-system) + (inputs `(("ghc-base-compat" ,ghc-base-compat))) + (home-page "https://github.com/acfoltzer/gitrev") + (synopsis "Compile git revision info into Haskell projects") + (description + "This package provides some handy Template Haskell splices for including +the current git hash and branch in the code of your project. This is useful +for including in panic messages, @command{--version} output, or diagnostic +info for more informative bug reports.") + (license license:bsd-3))) + +(define-public ghc-glob + (package + (name "ghc-glob") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "Glob-" version "/" + "Glob-" version ".tar.gz")) + (sha256 + (base32 + "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-dlist" ,ghc-dlist) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "http://iki.fi/matti.niemenmaa/glob/") + (synopsis "Haskell library matching glob patterns against file paths") + (description "This package provides a Haskell library for @dfn{globbing}: +matching patterns against file paths.") + (license license:bsd-3))) + +(define-public ghc-gluraw + (package + (name "ghc-gluraw") + (version "2.0.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/GLURaw/GLURaw-" + version + ".tar.gz")) + (sha256 + (base32 + "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-openglraw" ,ghc-openglraw))) + (home-page "https://www.haskell.org/haskellwiki/Opengl") + (synopsis "Raw Haskell bindings GLU") + (description "GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL +utility library. It is basically a 1:1 mapping of GLU's C API, intended as a +basis for a nicer interface.") + (license license:bsd-3))) + +(define-public ghc-glut + (package + (name "ghc-glut") + (version "2.7.0.14") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/GLUT/GLUT-" + version + ".tar.gz")) + (sha256 + (base32 + "01i162fly4q1751fp60lgkzlb8kr0qqbvmxj74zc6skb19qggy2w")))) + (build-system haskell-build-system) + (inputs + `(("ghc-statevar" ,ghc-statevar) + ("ghc-opengl" ,ghc-opengl) + ("ghc-openglraw" ,ghc-openglraw) + ("freeglut" ,freeglut))) + (home-page "https://www.haskell.org/haskellwiki/Opengl") + (synopsis "Haskell bindings for the OpenGL Utility Toolkit") + (description "This library provides Haskell bindings for the OpenGL +Utility Toolkit, a window system-independent toolkit for writing OpenGL +programs.") + (license license:bsd-3))) + +(define-public ghc-gnuplot + (package + (name "ghc-gnuplot") + (version "0.5.5.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/gnuplot/gnuplot-" + version ".tar.gz")) + (sha256 + (base32 "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn")))) + (build-system haskell-build-system) + (inputs + `(("ghc-temporary" ,ghc-temporary) + ("ghc-utility-ht" ,ghc-utility-ht) + ("ghc-data-accessor-transformers" ,ghc-data-accessor-transformers) + ("ghc-data-accessor" ,ghc-data-accessor) + ("ghc-semigroups" ,ghc-semigroups) + ("gnuplot" ,gnuplot))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-path-to-gnuplot + (lambda* (#:key inputs #:allow-other-keys) + (let ((gnuplot (assoc-ref inputs "gnuplot"))) + (substitute* "os/generic/Graphics/Gnuplot/Private/OS.hs" + (("(gnuplotName = ).*$" all cmd) + (string-append cmd "\"" gnuplot "/bin/gnuplot\""))))))))) + (home-page "https://www.haskell.org/haskellwiki/Gnuplot") + (synopsis "2D and 3D plots using gnuplot") + (description "This package provides a Haskell module for creating 2D and +3D plots using gnuplot.") + (license license:bsd-3))) + +(define-public ghc-graphviz + (package + (name "ghc-graphviz") + (version "2999.20.0.2") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "graphviz/graphviz-" version ".tar.gz")) + (sha256 + (base32 + "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7")))) + (build-system haskell-build-system) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-colour" ,ghc-colour) + ("ghc-dlist" ,ghc-dlist) + ("ghc-fgl" ,ghc-fgl) + ("ghc-fgl-arbitrary" ,ghc-fgl-arbitrary) + ("ghc-polyparse" ,ghc-polyparse) + ("ghc-temporary" ,ghc-temporary) + ("ghc-wl-pprint-text" ,ghc-wl-pprint-text))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("graphviz" ,graphviz) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/graphviz") + (synopsis "Bindings to Graphviz for graph visualisation") + (description + "This library provides bindings for the Dot language used by +the @uref{https://graphviz.org/, Graphviz} suite of programs for +visualising graphs, as well as functions to call those programs. +Main features of the graphviz library include: + +@enumerate +@item Almost complete coverage of all Graphviz attributes and syntax +@item Support for specifying clusters +@item The ability to use a custom node type +@item Functions for running a Graphviz layout tool with all specified output types +@item Generate and parse Dot code with two options: strict and liberal +@item Functions to convert FGL graphs and other graph-like data structures +@item Round-trip support for passing an FGL graph through Graphviz to augment node +and edge labels with positional information, etc. +@end enumerate\n") + (license license:bsd-3))) + +(define-public ghc-gtk2hs-buildtools + (package + (name "ghc-gtk2hs-buildtools") + (version "0.13.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "gtk2hs-buildtools/gtk2hs-buildtools-" + version ".tar.gz")) + (sha256 + (base32 + "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-random" ,ghc-random) + ("ghc-hashtables" ,ghc-hashtables))) + (native-inputs + `(("ghc-alex" ,ghc-alex) + ("ghc-happy" ,ghc-happy))) + (home-page "http://projects.haskell.org/gtk2hs/") + (synopsis "Tools to build the Gtk2Hs suite of user interface libraries") + (description + "This package provides a set of helper programs necessary to build the +Gtk2Hs suite of libraries. These tools include a modified c2hs binding tool +that is used to generate FFI declarations, a tool to build a type hierarchy +that mirrors the C type hierarchy of GObjects found in glib, and a generator +for signal declarations that are used to call back from C to Haskell. These +tools are not needed to actually run Gtk2Hs programs.") + (license license:gpl2))) + +(define-public ghc-hackage-security + (package + (name "ghc-hackage-security") + (version "0.5.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hackage-security/hackage-security-" + version ".tar.gz")) + (sha256 + (base32 + "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v")))) + (build-system haskell-build-system) + (arguments + `(#:tests? #f)) ; Tests fail because of framework updates. + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) + ("ghc-ed25519" ,ghc-ed25519) + ("ghc-network" ,ghc-network) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-tar" ,ghc-tar) + ("ghc-zlib" ,ghc-zlib))) + (native-inputs + `(("ghc-network-uri" ,ghc-network-uri) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tar" ,ghc-tar) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-temporary" ,ghc-temporary) + ("ghc-zlib" ,ghc-zlib))) + (home-page "https://github.com/haskell/hackage-security") + (synopsis "Hackage security library") + (description "This Hackage security library provides both server and +client utilities for securing @uref{http://hackage.haskell.org/, the +Hackage package server}. It is based on +@uref{http://theupdateframework.com/, The Update Framework}, a set of +recommendations developed by security researchers at various universities +in the US as well as developers on the @uref{https://www.torproject.org/, +Tor project}.") + (license license:bsd-3))) + +(define-public ghc-haddock + (package + (name "ghc-haddock") + (version "2.19.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haddock/haddock-" + version + ".tar.gz")) + (sha256 + (base32 + "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; There are four test suites that require the ghc-haddock-test + ;; package, which no longer builds with GHC 8.4.3. This phase + ;; removes these four test suites from the Cabal file, so that we + ;; do not need ghc-haddock-test as an input. + (add-before 'configure 'remove-haddock-test-test-suites + (lambda _ + (use-modules (ice-9 rdelim)) + (with-atomic-file-replacement "haddock.cabal" + (lambda (in out) + (let loop ((line (read-line in 'concat)) (deleting? #f)) + (cond + ((eof-object? line) #t) + ((string-every char-set:whitespace line) + (unless deleting? (display line out)) + (loop (read-line in 'concat) #f)) + ((member line '("test-suite html-test\n" + "test-suite hypsrc-test\n" + "test-suite latex-test\n" + "test-suite hoogle-test\n")) + (loop (read-line in 'concat) #t)) + (else + (unless deleting? (display line out)) + (loop (read-line in 'concat) deleting?))))))))))) + (inputs `(("ghc-haddock-api" ,ghc-haddock-api))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec))) + (home-page "https://www.haskell.org/haddock/") + (synopsis + "Documentation-generation tool for Haskell libraries") + (description + "Haddock is a documentation-generation tool for Haskell libraries.") + (license license:bsd-3))) + +(define-public ghc-haddock-api + (package + (name "ghc-haddock-api") + (version "2.19.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haddock-api/haddock-api-" + version + ".tar.gz")) + (sha256 + (base32 + "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "haddock-api.cabal" + (("Cabal \\^>= 2\\.0\\.0") + "Cabal ^>= 2.2.0") + (("hspec \\^>= 2\\.4\\.4") + "hspec >= 2.4.4 && < 2.6"))))))) + (inputs + `(("ghc-paths" ,ghc-paths) + ("ghc-haddock-library" ,ghc-haddock-library))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://www.haskell.org/haddock/") + (synopsis "API for documentation-generation tool Haddock") + (description "This package provides an API to Haddock, the +documentation-generation tool for Haskell libraries.") + (license license:bsd-3))) + +(define-public ghc-haddock-library + (package + (name "ghc-haddock-library") + (version "1.5.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haddock-library/haddock-library-" + version + ".tar.gz")) + (sha256 + (base32 + "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z")) + (patches (search-patches + "ghc-haddock-library-unbundle.patch")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'relax-test-suite-dependencies + (lambda _ + (substitute* "haddock-library.cabal" + (("base-compat\\s*\\^>= 0\\.9\\.3") "base-compat") + (("hspec\\s*\\^>= 2\\.4\\.4") "hspec")))) + ;; The release tarball does not contain the "fixtures/examples" + ;; directory, which is required for testing. In the upstream + ;; repository, the directory exists and is populated. Here, we + ;; create an empty directory to placate the tests. + (add-before 'check 'add-examples-directory + (lambda _ + (mkdir "fixtures/examples") + #t))))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-hspec" ,ghc-hspec) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tree-diff" ,ghc-tree-diff) + ("hspec-discover" ,hspec-discover))) + (home-page "https://www.haskell.org/haddock/") + (synopsis "Library exposing some functionality of Haddock") + (description + "Haddock is a documentation-generation tool for Haskell libraries. These +modules expose some functionality of it without pulling in the GHC dependency. +Please note that the API is likely to change so specify upper bounds in your +project if you can't release often. For interacting with Haddock itself, see +the ‘haddock’ package.") + (license license:bsd-3))) + +(define-public ghc-half + (package + (name "ghc-half") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/half/half-" + version ".tar.gz")) + (sha256 + (base32 + "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/ekmett/half") + (synopsis "Half-precision floating-point computations") + (description "This library provides a half-precision floating-point +computation library for Haskell.") + (license license:bsd-3))) + +(define-public ghc-happy + (package + (name "ghc-happy") + (version "1.19.9") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/happy/happy-" + version + ".tar.gz")) + (sha256 + (base32 + "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-test-issue93 + (lambda _ + ;; Tests run out of memory on a system with 2GB of available RAM, + ;; in 'issue93.a.hs' and 'issue93.n.hs'. + (substitute* "tests/Makefile" + ((" issue93.y ") " ")) + #t))))) + (home-page "https://hackage.haskell.org/package/happy") + (synopsis "Parser generator for Haskell") + (description "Happy is a parser generator for Haskell. Given a grammar +specification in BNF, Happy generates Haskell code to parse the grammar. +Happy works in a similar way to the yacc tool for C.") + (license license:bsd-3))) + +(define-public ghc-hashable + (package + (name "ghc-hashable") + (version "1.2.7.0") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hashable/hashable-" + version + ".tar.gz")) + (sha256 + (base32 + "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) + (build-system haskell-build-system) + (inputs + `(("ghc-random" ,ghc-random))) + (native-inputs + `(("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/tibbe/hashable") + (synopsis "Class for types that can be converted to a hash value") + (description + "This package defines a class, @code{Hashable}, for types that can be +converted to a hash value. This class exists for the benefit of hashing-based +data structures. The package provides instances for basic types and a way to +combine hash values.") + (license license:bsd-3))) + +(define-public ghc-hashable-bootstrap + (package + (inherit ghc-hashable) + (name "ghc-hashable-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '((hidden? #t))))) + +(define-public ghc-hashable-time + (package + (name "ghc-hashable-time") + (version "0.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hashable-time/hashable-time-" + version + ".tar.gz")) + (sha256 + (base32 + "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6"))) + (inputs `(("ghc-hashable" ,ghc-hashable))) + (home-page "http://hackage.haskell.org/package/hashable-time") + (synopsis "Hashable instances for Data.Time") + (description + "This package provides @code{Hashable} instances for types in +@code{Data.Time}.") + (license license:bsd-3))) + +(define-public ghc-hashtables + (package + (name "ghc-hashtables") + (version "1.2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hashtables/hashtables-" + version ".tar.gz")) + (sha256 + (base32 "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive) + ("ghc-vector" ,ghc-vector))) + (home-page "https://github.com/gregorycollins/hashtables") + (synopsis "Haskell Mutable hash tables in the ST monad") + (description "This package provides a Haskell library including a +couple of different implementations of mutable hash tables in the ST +monad, as well as a typeclass abstracting their common operations, and +a set of wrappers to use the hash tables in the IO monad.") + (license license:bsd-3))) + +(define-public ghc-haskell-lexer + (package + (name "ghc-haskell-lexer") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haskell-lexer/haskell-lexer-" + version ".tar.gz")) + (sha256 + (base32 "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/haskell-lexer") + (synopsis "Fully compliant Haskell 98 lexer") + (description + "This package provides a fully compliant Haskell 98 lexer.") + (license license:bsd-3))) + +(define-public ghc-haskell-src + (package + (name "ghc-haskell-src") + (version "1.0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haskell-src/haskell-src-" + version + ".tar.gz")) + (sha256 + (base32 + "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l")))) + (build-system haskell-build-system) + (inputs + `(("ghc-happy" ,ghc-happy) + ("ghc-syb" ,ghc-syb))) + (home-page + "https://hackage.haskell.org/package/haskell-src") + (synopsis + "Support for manipulating Haskell source code") + (description + "The @code{haskell-src} package provides support for manipulating Haskell +source code. The package provides a lexer, parser and pretty-printer, and a +definition of a Haskell abstract syntax tree (AST). Common uses of this +package are to parse or generate Haskell 98 code.") + (license license:bsd-3))) + +(define-public ghc-haskell-src-exts + (package + (name "ghc-haskell-src-exts") + (version "1.20.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haskell-src-exts/haskell-src-exts-" + version + ".tar.gz")) + (sha256 + (base32 + "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz")))) + (build-system haskell-build-system) + (inputs + `(("cpphs" ,cpphs) + ("ghc-happy" ,ghc-happy) + ("ghc-pretty-show" ,ghc-pretty-show))) + (native-inputs + `(("ghc-smallcheck" ,ghc-smallcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) + ("ghc-tasty-golden" ,ghc-tasty-golden))) + (home-page "https://github.com/haskell-suite/haskell-src-exts") + (synopsis "Library for manipulating Haskell source") + (description "Haskell-Source with Extensions (HSE, haskell-src-exts) is an +extension of the standard @code{haskell-src} package, and handles most +registered syntactic extensions to Haskell. All extensions implemented in GHC +are supported. Apart from these standard extensions, it also handles regular +patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") + (license license:bsd-3))) + +(define-public ghc-haskell-src-exts-util + (package + (name "ghc-haskell-src-exts-util") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "haskell-src-exts-util/haskell-src-exts-util-" + version ".tar.gz")) + (sha256 + (base32 + "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default" ,ghc-data-default) + ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-uniplate" ,ghc-uniplate))) + (home-page "https://github.com/pepeiborra/haskell-src-exts-util") + (synopsis "Helper functions for working with haskell-src-exts trees") + (description + "This package provides helper functions for working with +@code{haskell-src-exts} trees.") + (license license:bsd-3))) + +(define-public ghc-haskell-src-meta + (package + (name "ghc-haskell-src-meta") + (version "0.8.0.3") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "haskell-src-meta/haskell-src-meta-" + version ".tar.gz")) + (sha256 + (base32 + "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4")))) + (build-system haskell-build-system) + (inputs + `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-syb" ,ghc-syb) + ("ghc-th-orphans" ,ghc-th-orphans))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://hackage.haskell.org/package/haskell-src-meta") + (synopsis "Parse source to template-haskell abstract syntax") + (description + "This package provides tools to parse Haskell sources to the +template-haskell abstract syntax.") + (license license:bsd-3))) + +(define-public ghc-hasktags + (package + (name "ghc-hasktags") + (version "0.71.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hasktags/hasktags-" + version + ".tar.gz")) + (sha256 + (base32 + "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c")))) + (build-system haskell-build-system) + (inputs + `(("ghc-system-filepath" ,ghc-system-filepath) + ("ghc-optparse-applicative" ,ghc-optparse-applicative))) + (native-inputs + `(("ghc-json" ,ghc-json) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-microlens-platform" ,ghc-microlens-platform) + ("ghc-hunit" ,ghc-hunit))) + (home-page "http://github.com/MarcWeber/hasktags") + (synopsis "Make @code{Ctags} and @code{Etags} files for Haskell programs") + (description + "This package provides a means of generating tag files for Emacs and +Vim.") + (license license:bsd-3))) + +(define-public ghc-hex + (package + (name "ghc-hex") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hex-" version "/" + "hex-" version ".tar.gz")) + (sha256 + (base32 + "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/hex") + (synopsis "Convert strings into hexadecimal and back") + (description "This package provides conversion functions between +bytestrings and their hexademical representation.") + (license license:bsd-3))) + +(define-public ghc-highlighting-kate + (package + (name "ghc-highlighting-kate") + (version "0.6.4") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "highlighting-kate/highlighting-kate-" + version ".tar.gz")) + (sha256 + (base32 + "1bqv00gfmrsf0jjr4qf3lhshvfkyzmhbi3pjb6mafbnsyn2k7f6q")))) + (build-system haskell-build-system) + (inputs + `(("ghc-diff" ,ghc-diff) + ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin))) + (native-inputs + `(("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-utf8-string" ,ghc-utf8-string))) + (home-page "https://github.com/jgm/highlighting-kate") + (synopsis "Syntax highlighting library") + (description + "Highlighting-kate is a syntax highlighting library with support for +nearly one hundred languages. The syntax parsers are automatically generated +from @uref{https://kate-editor.org/, Kate syntax descriptions}, so any syntax +supported by Kate can be added. An (optional) command-line program is +provided, along with a utility for generating new parsers from Kate XML syntax +descriptions.") + (license license:gpl2+))) + +(define-public ghc-hindent + (package + (name "ghc-hindent") + (version "5.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hindent/hindent-" + version + ".tar.gz")) + (sha256 + (base32 + "0wkfik7mvqskk23kyh7ybgnlh3j9j1ym7d3ncahsbli9w654b7xg")))) + (build-system haskell-build-system) + (arguments + `(#:modules ((guix build haskell-build-system) + (guix build utils) + (guix build emacs-utils)) + #:imported-modules (,@%haskell-build-system-modules + (guix build emacs-utils)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'emacs-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (elisp-file "elisp/hindent.el") + (dest (string-append out "/share/emacs/site-lisp" + "/guix.d/hindent-" ,version)) + (emacs (string-append (assoc-ref inputs "emacs") + "/bin/emacs"))) + (make-file-writable elisp-file) + (emacs-substitute-variables elisp-file + ("hindent-process-path" + (string-append out "/bin/hindent"))) + (install-file elisp-file dest) + (emacs-generate-autoloads "hindent" dest))))))) + (inputs + `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-monad-loops" ,ghc-monad-loops) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-yaml" ,ghc-yaml) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-path" ,ghc-path) + ("ghc-path-io" ,ghc-path-io) + ("ghc-optparse-applicative" ,ghc-optparse-applicative))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-diff" ,ghc-diff) + ("emacs" ,emacs-minimal))) + (home-page + "https://github.com/commercialhaskell/hindent") + (synopsis "Extensible Haskell pretty printer") + (description + "This package provides automatic formatting for Haskell files. Both a +library and an executable.") + (license license:bsd-3))) + +(define-public ghc-hinotify + (package + (name "ghc-hinotify") + (version "0.3.10") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hinotify/" + "hinotify-" version ".tar.gz")) + (sha256 + (base32 + "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async))) + (home-page "https://github.com/kolmodin/hinotify.git") + (synopsis "Haskell binding to inotify") + (description "This library provides a wrapper to the Linux kernel's inotify +feature, allowing applications to subscribe to notifications when a file is +accessed or modified.") + (license license:bsd-3))) + +(define-public ghc-hmatrix + (package + (name "ghc-hmatrix") + (version "0.19.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hmatrix/hmatrix-" + version ".tar.gz")) + (sha256 + (base32 "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj")))) + (build-system haskell-build-system) + (inputs + `(("ghc-random" ,ghc-random) + ("ghc-split" ,ghc-split) + ("ghc-storable-complex" ,ghc-storable-complex) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-vector" ,ghc-vector) + ;;("openblas" ,openblas) + ("lapack" ,lapack))) + ;; Guix's OpenBLAS is built with the flag "NO_LAPACK=1" which + ;; disables inclusion of the LAPACK functions. + ;; (arguments `(#:configure-flags '("--flags=openblas"))) + (home-page "https://github.com/albertoruiz/hmatrix") + (synopsis "Haskell numeric linear algebra library") + (description "The HMatrix package provices a Haskell library for +dealing with linear systems, matrix decompositions, and other +numerical computations based on BLAS and LAPACK.") + (license license:bsd-3))) + +(define-public ghc-hmatrix-gsl + (package + (name "ghc-hmatrix-gsl") + (version "0.19.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hmatrix-gsl/hmatrix-gsl-" + version ".tar.gz")) + (sha256 + (base32 "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hmatrix" ,ghc-hmatrix) + ("ghc-vector" ,ghc-vector) + ("ghc-random" ,ghc-random) + ("gsl" ,gsl))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/albertoruiz/hmatrix") + (synopsis "Haskell GSL binding") + (description "This Haskell library provides a purely functional +interface to selected numerical computations, internally implemented +using GSL.") + (license license:gpl3+))) + +(define-public ghc-hmatrix-gsl-stats + (package + (name "ghc-hmatrix-gsl-stats") + (version "0.4.1.7") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/hmatrix-gsl-stats/hmatrix-gsl-stats-" + version ".tar.gz")) + (sha256 + (base32 "1gslgk58lzin43cvbpivhw7nrn9qyaa6qwhy1z9ypvyal5p8n3sa")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector) + ("ghc-storable-complex" ,ghc-storable-complex) + ("ghc-hmatrix" ,ghc-hmatrix) + ("gsl" ,gsl))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "http://code.haskell.org/hmatrix-gsl-stats") + (synopsis "GSL Statistics interface for Haskell") + (description "This Haskell library provides a purely functional +interface for statistics based on hmatrix and GSL.") + (license license:bsd-3))) + +(define-public ghc-hmatrix-special + (package + (name "ghc-hmatrix-special") + (version "0.19.0.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/hmatrix-special/hmatrix-special-" + version ".tar.gz")) + (sha256 + (base32 "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hmatrix" ,ghc-hmatrix) + ("ghc-hmatrix-gsl" ,ghc-hmatrix-gsl))) + (home-page "https://github.com/albertoruiz/hmatrix") + (synopsis "Haskell interface to GSL special functions") + (description "This library provides an interface to GSL special +functions for Haskell.") + (license license:gpl3+))) + +(define-public ghc-hostname + (package + (name "ghc-hostname") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/hostname/" + "hostname-" version ".tar.gz")) + (sha256 + (base32 + "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/hostname") + (synopsis "Hostname in Haskell") + (description "Network.HostName is a simple package providing a means to +determine the hostname.") + (license license:bsd-3))) + +(define-public ghc-hourglass + (package + (name "ghc-hourglass") + (version "0.2.12") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hourglass/hourglass-" version ".tar.gz")) + (sha256 + (base32 + "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4")))) + (build-system haskell-build-system) + (inputs + `(("ghc-old-locale" ,ghc-old-locale))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/vincenthz/hs-hourglass") + (synopsis "Simple time-related library for Haskell") + (description + "This is a simple time library providing a simple but powerful and +performant API. The backbone of the library are the @code{Timeable} and +@code{Time} type classes. Each @code{Timeable} instances can be converted to +a type that has a @code{Time} instances, and thus are different +representations of current time.") + (license license:bsd-3))) + +(define-public ghc-hpack + (package + (name "ghc-hpack") + (version "0.28.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/hpack/" + "hpack-" version ".tar.gz")) + (sha256 + (base32 + "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-cryptonite" ,ghc-cryptonite) + ("ghc-glob" ,ghc-glob) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls) + ("ghc-http-types" ,ghc-http-types) + ("ghc-scientific" ,ghc-scientific) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-yaml" ,ghc-yaml))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit) + ("ghc-interpolate" ,ghc-interpolate) + ("ghc-mockery" ,ghc-mockery) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-temporary" ,ghc-temporary) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/sol/hpack") + (synopsis "Tools for an alternative Haskell package format") + (description + "Hpack is a format for Haskell packages. It is an alternative to the +Cabal package format and follows different design principles. Hpack packages +are described in a file named @code{package.yaml}. Both @code{cabal2nix} and +@code{stack} support @code{package.yaml} natively. For other build tools the +@code{hpack} executable can be used to generate a @code{.cabal} file from +@code{package.yaml}.") + (license license:expat))) + +(define-public ghc-hs-bibutils + (package + (name "ghc-hs-bibutils") + (version "6.6.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hs-bibutils/hs-bibutils-" + version ".tar.gz")) + (sha256 + (base32 + "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l")))) + (build-system haskell-build-system) + (inputs `(("ghc-syb" ,ghc-syb))) + (home-page "https://hackage.haskell.org/package/hs-bibutils") + (synopsis "Haskell bindings to bibutils") + (description + "This package provides Haskell bindings to @code{bibutils}, a library +that interconverts between various bibliography formats using a common +MODS-format XML intermediate.") + (license license:gpl2+))) + +(define-public ghc-hslogger + (package + (name "ghc-hslogger") + (version "1.2.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hslogger-" version "/" "hslogger-" + version ".tar.gz")) + (sha256 (base32 + "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-network" ,ghc-network) + ("ghc-old-locale" ,ghc-old-locale))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://software.complete.org/hslogger") + (synopsis "Logging framework for Haskell, similar to Python's logging module") + (description "Hslogger lets each log message have a priority and source be +associated with it. The programmer can then define global handlers that route +or filter messages based on the priority and source. It also has a syslog +handler built in.") + (license license:bsd-3))) + +(define-public ghc-hslua + (package + (name "ghc-hslua") + (version "0.9.5.2") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hslua/hslua-" version ".tar.gz")) + (sha256 + (base32 + "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f")))) + (build-system haskell-build-system) + (arguments + `(#:configure-flags '("-fsystem-lua"))) + (inputs + `(("lua" ,lua) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-fail" ,ghc-fail))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) + (home-page "https://hackage.haskell.org/package/hslua") + (synopsis "Lua language interpreter embedding in Haskell") + (description + "The Scripting.Lua module is a wrapper of the Lua language interpreter as +described in @url{https://www.lua.org/}.") + (license license:expat))) + +(define-public ghc-hslua-module-text + (package + (name "ghc-hslua-module-text") + (version "0.1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "hslua-module-text/hslua-module-text-" + version ".tar.gz")) + (sha256 + (base32 + "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) + (inputs + `(("ghc-hslua" ,ghc-hslua))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/hslua/hslua-module-text") + (synopsis "Lua module for text") + (description + "This package provides a UTF-8 aware subset of Lua's @code{string} module +for Haskell. The functions provided by this module are @code{upper}, +@code{lower}, @code{len}, @code{reverse}, and @code{sub}.") + (license license:expat))) + +(define-public ghc-http-api-data + (package + (name "ghc-http-api-data") + (version "0.3.8.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "http-api-data-" version "/" + "http-api-data-" version ".tar.gz")) + (sha256 + (base32 + "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.9 + (inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-attoparsec-iso8601" ,ghc-attoparsec-iso8601) + ("ghc-hashable" ,ghc-hashable) + ("ghc-http-types" ,ghc-http-types) + ("ghc-time-locale-compat" ,ghc-time-locale-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uri-bytestring" ,ghc-uri-bytestring) + ("ghc-uuid-types" ,ghc-uuid-types))) + (home-page "https://github.com/fizruk/http-api-data") + (synopsis "Convert to/from HTTP API data like URL pieces, headers and +query parameters") + (description "This Haskell package defines typeclasses used for converting +Haskell data types to and from HTTP API data.") + (license license:bsd-3))) + +(define-public ghc-ieee754 + (package + (name "ghc-ieee754") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ieee754/" + "ieee754-" version ".tar.gz")) + (sha256 + (base32 + "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f")))) + (build-system haskell-build-system) + (home-page "https://github.com/patperry/hs-ieee754") + (synopsis "Utilities for dealing with IEEE floating point numbers") + (description "Utilities for dealing with IEEE floating point numbers, +ported from the Tango math library; approximate and exact equality comparisons +for general types.") + (license license:bsd-3))) + +(define-public ghc-ifelse + (package + (name "ghc-ifelse") + (version "0.85") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "IfElse/IfElse-" version ".tar.gz")) + (sha256 + (base32 + "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/IfElse") + (synopsis "Monadic control flow with anaphoric variants") + (description "This library provides functions for control flow inside of +monads with anaphoric variants on @code{if} and @code{when} and a C-like +@code{switch} function.") + (license license:bsd-3))) + +(define-public ghc-indents + (package + (name "ghc-indents") + (version "0.5.0.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/indents/indents-" + version ".tar.gz")) + (sha256 + (base32 + "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n")))) + (build-system haskell-build-system) + ;; This package needs an older version of tasty. + (arguments '(#:tests? #f)) + (inputs + `(("ghc-concatenative" ,ghc-concatenative))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "http://patch-tag.com/r/salazar/indents") + (synopsis "Indentation sensitive parser-combinators for parsec") + (description + "This library provides functions for use in parsing indentation sensitive +contexts. It parses blocks of lines all indented to the same level as well as +lines continued at an indented level below.") + (license license:bsd-3))) + +(define-public ghc-inline-c + (package + (name "ghc-inline-c") + (version "0.6.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/inline-c/" + "inline-c-" version ".tar.gz")) + (sha256 + (base32 + "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-cryptohash" ,ghc-cryptohash) + ("ghc-hashable" ,ghc-hashable) + ("ghc-parsers" ,ghc-parsers) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("ghc-raw-strings-qq" ,ghc-raw-strings-qq) + ("ghc-regex-posix" ,ghc-regex-posix))) + (home-page "http://hackage.haskell.org/package/inline-c") + (synopsis "Write Haskell source files including C code inline") + (description + "inline-c lets you seamlessly call C libraries and embed high-performance +inline C code in Haskell modules. Haskell and C can be freely intermixed in +the same source file, and data passed to and from code in either language with +minimal overhead. No FFI required.") + (license license:expat))) + +(define-public ghc-inline-c-cpp + (package + (name "ghc-inline-c-cpp") + (version "0.2.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/inline-c-cpp/" + "inline-c-cpp-" version ".tar.gz")) + (sha256 + (base32 + "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci")))) + (build-system haskell-build-system) + (inputs + `(("ghc-inline-c" ,ghc-inline-c) + ("ghc-safe-exceptions" ,ghc-safe-exceptions))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec))) + (home-page "https://hackage.haskell.org/package/inline-c-cpp") + (synopsis "Lets you embed C++ code into Haskell") + (description + "This package provides utilities to inline C++ code into Haskell using +@code{inline-c}.") + (license license:expat))) + +(define-public ghc-integer-logarithms + (package + (name "ghc-integer-logarithms") + (version "1.0.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "integer-logarithms/integer-logarithms-" + version ".tar.gz")) + (sha256 + (base32 + "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "integer-logarithms.cabal" + (("tasty >= 0\\.10 && < 1\\.1") + "tasty >= 0.10 && < 1.2"))))))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-smallcheck" ,ghc-smallcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck))) + (home-page "https://github.com/Bodigrim/integer-logarithms") + (synopsis "Integer logarithms") + (description + "This package provides the following modules: +@code{Math.NumberTheory.Logarithms} and +@code{Math.NumberTheory.Powers.Integer} from the @code{arithmoi} package, +@code{GHC.Integer.Logarithms.Compat} and +@code{Math.NumberTheory.Power.Natural}, as well as some additional functions +in migrated modules.") + (license license:expat))) + +(define-public ghc-integer-logarithms-bootstrap + (package + (inherit ghc-integer-logarithms) + (name "ghc-integer-logarithms-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()) + (properties '(hidden? #t)))) + +(define-public ghc-interpolate + (package + (name "ghc-interpolate") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/interpolate/" + "interpolate-" version ".tar.gz")) + (sha256 + (base32 + "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-haskell-src-meta" ,ghc-haskell-src-meta))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/sol/interpolate") + (synopsis "String interpolation library") + (description "This package provides a string interpolation library for +Haskell.") + (license license:expat))) + +(define-public ghc-intervalmap + (package + (name "ghc-intervalmap") + (version "0.6.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/IntervalMap/" + "IntervalMap-" version ".tar.gz")) + (sha256 + (base32 + "06hin9wf1by8aqa7820fsi2339bh82184frkwz3jsb9sqa0hszcg")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "http://www.chr-breitkopf.de/comp/IntervalMap") + (synopsis "Containers for intervals, with efficient search") + (description + "This package provides ordered containers of intervals, with efficient +search for all keys containing a point or overlapping an interval. See the +example code on the home page for a quick introduction.") + (license license:bsd-3))) + +(define-public ghc-invariant + (package + (name "ghc-invariant") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/invariant/invariant-" + version ".tar.gz")) + (sha256 + (base32 + "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-statevar" ,ghc-statevar) + ("ghc-tagged" ,ghc-tagged) + ("ghc-th-abstraction" ,ghc-th-abstraction) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/nfrisby/invariant-functors") + (synopsis "Haskell98 invariant functors") + (description "Haskell98 invariant functors (also known as exponential +functors). For more information, see Edward Kmett's article +@uref{http://comonad.com/reader/2008/rotten-bananas/, Rotten Bananas}.") + (license license:bsd-2))) + +(define-public ghc-io-streams + (package + (name "ghc-io-streams") + (version "1.5.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "io-streams/io-streams-" version ".tar.gz")) + (sha256 + (base32 + "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-bytestring-builder" ,ghc-bytestring-builder) + ("ghc-network" ,ghc-network) + ("ghc-primitive" ,ghc-primitive) + ("ghc-vector" ,ghc-vector) + ("ghc-zlib-bindings" ,ghc-zlib-bindings))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-zlib" ,ghc-zlib))) + (arguments + `(#:cabal-revision + ("2" "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14"))) + (home-page "http://hackage.haskell.org/package/io-streams") + (synopsis "Simple and composable stream I/O") + (description "This library contains simple and easy-to-use +primitives for I/O using streams.") + (license license:bsd-3))) + +(define-public ghc-io-streams-haproxy + (package + (name "ghc-io-streams-haproxy") + (version "1.0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "io-streams-haproxy/io-streams-haproxy-" + version ".tar.gz")) + (sha256 + (base32 + "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-io-streams" ,ghc-io-streams) + ("ghc-network" ,ghc-network))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (arguments + `(#:cabal-revision + ("4" "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l"))) + (home-page "http://snapframework.com/") + (synopsis "HAProxy protocol 1.5 support for io-streams") + (description "HAProxy protocol version 1.5 support +(see @uref{http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt}) +for applications using io-streams. The proxy protocol allows information +about a networked peer (like remote address and port) to be propagated +through a forwarding proxy that is configured to speak this protocol.") + (license license:bsd-3))) + +(define-public ghc-iproute + (package + (name "ghc-iproute") + (version "1.7.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/iproute/iproute-" + version + ".tar.gz")) + (sha256 + (base32 + "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: Tests cannot find System.ByteOrder, + ; exported by ghc-byteorder. Doctest issue. + (inputs + `(("ghc-appar" ,ghc-appar) + ("ghc-byteorder" ,ghc-byteorder) + ("ghc-network" ,ghc-network) + ("ghc-safe" ,ghc-safe))) + (home-page "https://www.mew.org/~kazu/proj/iproute/") + (synopsis "IP routing table") + (description "IP Routing Table is a tree of IP ranges to search one of +them on the longest match base. It is a kind of TRIE with one way branching +removed. Both IPv4 and IPv6 are supported.") + (license license:bsd-3))) + +(define-public ghc-iwlib + (package + (name "ghc-iwlib") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/iwlib/iwlib-" + version ".tar.gz")) + (sha256 + (base32 "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz")))) + (build-system haskell-build-system) + (inputs + `(("wireless-tools" ,wireless-tools))) + (home-page "https://github.com/jaor/iwlib") + (synopsis "Haskell binding to the iw wireless networking library") + (description + "IWlib is a thin Haskell binding to the iw C library. It provides +information about the current wireless network connections, and adapters on +supported systems.") + (license license:bsd-3))) + +(define-public ghc-json + (package + (name "ghc-json") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/json/" + "json-" version ".tar.gz")) + (sha256 + (base32 + "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6")))) + (build-system haskell-build-system) + (inputs + `(("ghc-syb" ,ghc-syb))) + (home-page "https://hackage.haskell.org/package/json") + (synopsis "Serializes Haskell data to and from JSON") + (description "This package provides a parser and pretty printer for +converting between Haskell values and JSON. +JSON (JavaScript Object Notation) is a lightweight data-interchange format.") + (license license:bsd-3))) + +(define-public ghc-juicypixels + (package + (name "ghc-juicypixels") + (version "3.2.9.5") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "JuicyPixels/JuicyPixels-" + version ".tar.gz")) + (sha256 + (base32 + "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744")))) + (build-system haskell-build-system) + (inputs + `(("ghc-zlib" ,ghc-zlib) + ("ghc-vector" ,ghc-vector) + ("ghc-primitive" ,ghc-primitive) + ("ghc-mmap" ,ghc-mmap))) + (home-page "https://github.com/Twinside/Juicy.Pixels") + (synopsis "Picture loading and serialization library") + (description + "This library can load and store images in PNG, Bitmap, JPEG, Radiance, +TIFF and GIF formats.") + (license license:bsd-3))) + +(define-public ghc-kan-extensions + (package + (name "ghc-kan-extensions") + (version "5.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/kan-extensions/kan-extensions-" + version + ".tar.gz")) + (sha256 + (base32 + "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb")))) + (build-system haskell-build-system) + (inputs + `(("ghc-adjunctions" ,ghc-adjunctions) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-distributive" ,ghc-distributive) + ("ghc-free" ,ghc-free) + ("ghc-invariant" ,ghc-invariant) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://github.com/ekmett/kan-extensions/") + (synopsis "Kan extensions library") + (description "This library provides Kan extensions, Kan lifts, various +forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") + (license license:bsd-3))) + +(define-public ghc-language-c + (package + (name "ghc-language-c") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "language-c/language-c-" version ".tar.gz")) + (sha256 + (base32 + "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d")))) + (build-system haskell-build-system) + (inputs `(("ghc-syb" ,ghc-syb))) + (native-inputs + `(("ghc-happy" ,ghc-happy) + ("ghc-alex" ,ghc-alex))) + (home-page "https://visq.github.io/language-c/") + (synopsis "Analysis and generation of C code") + (description + "Language C is a Haskell library for the analysis and generation of C code. +It features a complete, well-tested parser and pretty printer for all of C99 +and a large set of GNU extensions.") + (license license:bsd-3))) + +(define-public ghc-language-glsl + (package + (name "ghc-language-glsl") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "language-glsl/language-glsl-" version ".tar.gz")) + (sha256 + (base32 + "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1")))) + (build-system haskell-build-system) + (inputs `(("ghc-prettyclass" ,ghc-prettyclass))) + (arguments + `(#:tests? #f + #:cabal-revision + ("1" "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5"))) + (home-page "http://hackage.haskell.org/package/language-glsl") + (synopsis "GLSL abstract syntax tree, parser, and pretty-printer") + (description "This package is a Haskell library for the +representation, parsing, and pretty-printing of GLSL 1.50 code.") + (license license:bsd-3))) + +(define-public ghc-language-haskell-extract + (package + (name "ghc-language-haskell-extract") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "language-haskell-extract-" version "/" + "language-haskell-extract-" version ".tar.gz")) + (sha256 + (base32 + "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-posix" ,ghc-regex-posix))) + (home-page "https://github.com/finnsson/template-helper") + (synopsis "Haskell module to automatically extract functions from +the local code") + (description "This package contains helper functions on top of +Template Haskell. + +For example, @code{functionExtractor} extracts all functions after a +regexp-pattern, which can be useful if you wish to extract all functions +beginning with @code{test} (for a test framework) or all functions beginning +with @code{wc} (for a web service).") + (license license:bsd-3))) + +(define-public ghc-lens + (package + (name "ghc-lens") + (version "4.16.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/lens/lens-" + version ".tar.gz")) + (sha256 + (base32 + "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"))) + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-distributive" ,ghc-distributive) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-free" ,ghc-free) + ("ghc-kan-extensions" ,ghc-kan-extensions) + ("ghc-parallel" ,ghc-parallel) + ("ghc-reflection" ,ghc-reflection) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-vector" ,ghc-vector) + ("ghc-call-stack" ,ghc-call-stack) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-hashable" ,ghc-hashable) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-void" ,ghc-void) + ("ghc-generic-deriving" ,ghc-generic-deriving) + ("ghc-nats" ,ghc-nats) + ("ghc-simple-reflect" ,ghc-simple-reflect) + ("hlint" ,hlint))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-th" ,ghc-test-framework-th) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/ekmett/lens/") + (synopsis "Lenses, Folds and Traversals") + (description "This library provides @code{Control.Lens}. The combinators +in @code{Control.Lens} provide a highly generic toolbox for composing families +of getters, folds, isomorphisms, traversals, setters and lenses and their +indexed variants.") + (license license:bsd-3))) + +(define-public ghc-libffi + (package + (name "ghc-libffi") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "libffi/libffi-" version ".tar.gz")) + (sha256 + (base32 + "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28")))) + (build-system haskell-build-system) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libffi" ,libffi))) + (home-page "http://hackage.haskell.org/package/libffi") + (synopsis "Haskell binding to libffi") + (description + "A binding to libffi, allowing C functions of types only known at runtime +to be called from Haskell.") + (license license:bsd-3))) + +(define-public ghc-libmpd + (package + (name "ghc-libmpd") + (version "0.9.0.9") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/libmpd/libmpd-" + version + ".tar.gz")) + (sha256 + (base32 + "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv")))) + (build-system haskell-build-system) + ;; Tests fail on i686. + ;; See https://github.com/vimus/libmpd-haskell/issues/112 + (arguments `(#:tests? #f)) + (inputs + `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-network" ,ghc-network) + ("ghc-utf8-string" ,ghc-utf8-string))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/vimus/libmpd-haskell") + (synopsis "Haskell client library for the Music Player Daemon") + (description "This package provides a pure Haskell client library for the +Music Player Daemon.") + (license license:expat))) + +(define-public ghc-libxml + (package + (name "ghc-libxml") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/libxml/" + "libxml-" version ".tar.gz")) + (sha256 + (base32 + "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi")))) + (build-system haskell-build-system) + (inputs + `(("libxml2" ,libxml2))) + (arguments + `(#:configure-flags + `(,(string-append "--extra-include-dirs=" + (assoc-ref %build-inputs "libxml2") + "/include/libxml2")))) + (home-page "https://hackage.haskell.org/package/libxml") + (synopsis "Haskell bindings to libxml2") + (description + "This library provides minimal Haskell binding to libxml2.") + (license license:bsd-3))) + +(define-public ghc-lifted-async + (package + (name "ghc-lifted-async") + (version "0.10.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/lifted-async/lifted-async-" + version ".tar.gz")) + (sha256 + (base32 + "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-constraints" ,ghc-constraints) + ("ghc-hunit" ,ghc-hunit) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-th" ,ghc-tasty-th))) + (home-page "https://github.com/maoe/lifted-async") + (synopsis "Run lifted IO operations asynchronously and wait for their results") + (description + "This package provides IO operations from @code{async} package lifted to any +instance of @code{MonadBase} or @code{MonadBaseControl}.") + (license license:bsd-3))) + +(define-public ghc-lifted-base + (package + (name "ghc-lifted-base") + (version "0.2.3.12") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/lifted-base/lifted-base-" + version + ".tar.gz")) + (sha256 + (base32 + "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: Missing testing libraries. + (inputs + `(("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/basvandijk/lifted-base") + (synopsis "Lifted IO operations from the base library") + (description "Lifted-base exports IO operations from the @code{base} +library lifted to any instance of @code{MonadBase} or @code{MonadBaseControl}. +Note that not all modules from @code{base} are converted yet. The package +includes a copy of the @code{monad-peel} test suite written by Anders +Kaseorg.") + (license license:bsd-3))) + +(define-public ghc-linear + (package + (name "ghc-linear") + (version "1.20.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/linear/" + "linear-" version ".tar.gz")) + (sha256 + (base32 + "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay")))) + (build-system haskell-build-system) + (inputs + `(("ghc-adjunctions" ,ghc-adjunctions) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-bytes" ,ghc-bytes) + ("ghc-cereal" ,ghc-cereal) + ("ghc-distributive" ,ghc-distributive) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lens" ,ghc-lens) + ("ghc-reflection" ,ghc-reflection) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-tagged" ,ghc-tagged) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-void" ,ghc-void))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-simple-reflect" ,ghc-simple-reflect) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-hunit" ,ghc-hunit))) + (home-page "http://github.com/ekmett/linear/") + (synopsis "Linear algebra library for Haskell") + (description + "This package provides types and combinators for linear algebra on free +vector spaces.") + (license license:bsd-3))) + +(define-public ghc-logging-facade + (package + (name "ghc-logging-facade") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "logging-facade/logging-facade-" + version ".tar.gz")) + (sha256 + (base32 + "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/logging-facade") + (synopsis "Simple logging abstraction that allows multiple back-ends") + (description + "This package provides a simple logging abstraction that allows multiple +back-ends.") + (license license:expat))) + +(define-public ghc-logict + (package + (name "ghc-logict") + (version "0.6.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/logict/logict-" + version + ".tar.gz")) + (sha256 + (base32 + "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi")))) + (build-system haskell-build-system) + (home-page "http://code.haskell.org/~dolio/") + (synopsis "Backtracking logic-programming monad") + (description "This library provides a continuation-based, backtracking, +logic programming monad. An adaptation of the two-continuation implementation +found in the paper \"Backtracking, Interleaving, and Terminating Monad +Transformers\" available @uref{http://okmij.org/ftp/papers/LogicT.pdf, +online}.") + (license license:bsd-3))) + +(define-public ghc-lzma + (package + (name "ghc-lzma") + (version "0.0.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/lzma/" + "lzma-" version ".tar.gz")) + (sha256 + (base32 + "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg")))) + (build-system haskell-build-system) + (arguments + '(#:tests? #f ; requires older versions of QuickCheck and tasty. + #:cabal-revision + ("3" "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m"))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/hvr/lzma") + (synopsis "LZMA/XZ compression and decompression") + (description + "This package provides a pure interface for compressing and +decompressing LZMA streams of data represented as lazy @code{ByteString}s. A +monadic incremental interface is provided as well.") + (license license:bsd-3))) + +(define-public ghc-lzma-conduit + (package + (name "ghc-lzma-conduit") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/lzma-conduit/" + "lzma-conduit-" version ".tar.gz")) + (sha256 + (base32 + "0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-lzma" ,ghc-lzma) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/alphaHeavy/lzma-conduit") + (synopsis "Conduit interface for lzma/xz compression") + (description + "This package provides a @code{Conduit} interface for the LZMA +compression algorithm used in the @code{.xz} file format.") + (license license:bsd-3))) + +(define-public ghc-markdown-unlit + (package + (name "ghc-markdown-unlit") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/markdown-unlit/" + "markdown-unlit-" version ".tar.gz")) + (sha256 + (base32 + "1gy79vr85vcp13rdjh0hz7zv6daqqffww4j0cqn2lpjjh9xhsbg7")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-silently" ,ghc-silently) + ("ghc-stringbuilder" ,ghc-stringbuilder) + ("ghc-temporary" ,ghc-temporary) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/sol/markdown-unlit#readme") + (synopsis "Literate Haskell support for Markdown") + (description "This package allows you to have a README.md that at the +same time is a literate Haskell program.") + (license license:expat))) + +(define-public ghc-math-functions + (package + (name "ghc-math-functions") + (version "0.2.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "math-functions-" version "/" + "math-functions-" version ".tar.gz")) + (sha256 + (base32 + "1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: 1 test fails. + (inputs + `(("ghc-vector" ,ghc-vector) + ("ghc-vector-th-unbox" ,ghc-vector-th-unbox))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-erf" ,ghc-erf) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/bos/math-functions") + (synopsis "Special functions and Chebyshev polynomials for Haskell") + (description "This Haskell library provides implementations of +special mathematical functions and Chebyshev polynomials. These +functions are often useful in statistical and numerical computing.") + (license license:bsd-3))) + +(define-public ghc-megaparsec + (package + (name "ghc-megaparsec") + (version "6.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "megaparsec/megaparsec-" + version ".tar.gz")) + (sha256 + (base32 + "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"))) + (inputs + `(("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-parser-combinators" ,ghc-parser-combinators) + ("ghc-scientific" ,ghc-scientific))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("ghc-hspec-expectations" ,ghc-hspec-expectations) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/mrkkrp/megaparsec") + (synopsis "Monadic parser combinators") + (description + "This is an industrial-strength monadic parser combinator library. +Megaparsec is a feature-rich package that strikes a nice balance between +speed, flexibility, and quality of parse errors.") + (license license:bsd-2))) + +(define-public ghc-memory + (package + (name "ghc-memory") + (version "0.14.16") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "memory/memory-" version ".tar.gz")) + (sha256 + (base32 + "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v")))) + (build-system haskell-build-system) + (inputs + `(("ghc-basement" ,ghc-basement) + ("ghc-foundation" ,ghc-foundation))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/vincenthz/hs-memory") + (synopsis "Memory abstractions for Haskell") + (description + "This package provides memory abstractions, such as chunk of memory, +polymorphic byte array management and manipulation functions. It contains a +polymorphic byte array abstraction and functions similar to strict ByteString, +different type of byte array abstraction, raw memory IO operations (memory +set, memory copy, ..) and more") + (license license:bsd-3))) + +(define-public ghc-memotrie + (package + (name "ghc-memotrie") + (version "0.6.9") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/MemoTrie/MemoTrie-" + version + ".tar.gz")) + (sha256 + (base32 + "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-newtype-generics" ,ghc-newtype-generics))) + (home-page "https://github.com/conal/MemoTrie") + (synopsis "Trie-based memo functions") + (description "This package provides a functional library for creating +efficient memo functions using tries.") + (license license:bsd-3))) + +(define-public ghc-microlens + (package + (name "ghc-microlens") + (version "0.4.9.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "microlens-" version "/" + "microlens-" version ".tar.gz")) + (sha256 + (base32 + "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51")))) + (build-system haskell-build-system) + (home-page + "https://github.com/aelve/microlens") + (synopsis "Provides a tiny lens Haskell library with no dependencies") + (description "This Haskell package provides a lens library, just like +@code{ghc-lens}, but smaller. It provides essential lenses and +traversals (like @code{_1} and @code{_Just}), as well as ones which are simply +nice to have (like @code{each}, @code{at}, and @code{ix}), and some +combinators (like @code{failing} and @code{singular}), but everything else is +stripped. As the result, this package has no dependencies.") + (license license:bsd-3))) + +(define-public ghc-microlens-ghc + (package + (name "ghc-microlens-ghc") + (version "0.4.9.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/microlens-ghc/microlens-ghc-" + version + ".tar.gz")) + (sha256 + (base32 + "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj")))) + (build-system haskell-build-system) + (inputs `(("ghc-microlens" ,ghc-microlens))) + (home-page "https://github.com/monadfix/microlens") + (synopsis "Use @code{microlens} with GHC libraries like @code{array}") + (description "This library provides everything that @code{microlens} +provides plus instances to make @code{each}, @code{at}, and @code{ix} +usable with arrays, @code{ByteString}, and containers. This package is +a part of the @uref{http://hackage.haskell.org/package/microlens, +microlens} family; see the readme +@uref{https://github.com/aelve/microlens#readme, on Github}.") + (license license:bsd-3))) + +(define-public ghc-microlens-mtl + (package + (name "ghc-microlens-mtl") + (version "0.1.11.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/microlens-mtl/microlens-mtl-" + version + ".tar.gz")) + (sha256 + (base32 + "0l6z1gkzwcpv89bxf5vgfrjb6gq2pj7sjjc53nvi5b9alx34zryk")))) + (build-system haskell-build-system) + (inputs + `(("ghc-microlens" ,ghc-microlens) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://github.com/monadfix/microlens") + (synopsis + "@code{microlens} support for Reader/Writer/State from mtl") + (description + "This package contains functions (like @code{view} or @code{+=}) which +work on @code{MonadReader}, @code{MonadWriter}, and @code{MonadState} from the +mtl package. This package is a part of the +@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the +readme @uref{https://github.com/aelve/microlens#readme, on Github}.") + (license license:bsd-3))) + +(define-public ghc-microlens-platform + (package + (name "ghc-microlens-platform") + (version "0.3.10") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "microlens-platform/microlens-platform-" version ".tar.gz")) + (sha256 + (base32 + "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hashable" ,ghc-hashable) + ("ghc-microlens" ,ghc-microlens) + ("ghc-microlens-ghc" ,ghc-microlens-ghc) + ("ghc-microlens-mtl" ,ghc-microlens-mtl) + ("ghc-microlens-th" ,ghc-microlens-th) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (home-page "https://github.com/monadfix/microlens") + (synopsis "Feature-complete microlens") + (description + "This package exports a module which is the recommended starting point +for using @uref{http://hackage.haskell.org/package/microlens, microlens} if +you aren't trying to keep your dependencies minimal. By importing +@code{Lens.Micro.Platform} you get all functions and instances from +@uref{http://hackage.haskell.org/package/microlens, microlens}, +@uref{http://hackage.haskell.org/package/microlens-th, microlens-th}, +@uref{http://hackage.haskell.org/package/microlens-mtl, microlens-mtl}, +@uref{http://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as +well as instances for @code{Vector}, @code{Text}, and @code{HashMap}. The +minor and major versions of @code{microlens-platform} are incremented whenever +the minor and major versions of any other @code{microlens} package are +incremented, so you can depend on the exact version of +@code{microlens-platform} without specifying the version of @code{microlens} +you need. This package is a part of the +@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the +readme @uref{https://github.com/aelve/microlens#readme, on Github}.") + (license license:bsd-3))) + +(define-public ghc-microlens-th + (package + (name "ghc-microlens-th") + (version "0.4.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "microlens-th-" version "/" + "microlens-th-" version ".tar.gz")) + (sha256 + (base32 + "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05")))) + (build-system haskell-build-system) + (inputs `(("ghc-microlens" ,ghc-microlens) + ("ghc-th-abstraction" ,ghc-th-abstraction))) + (home-page + "https://github.com/aelve/microlens") + (synopsis "Automatic generation of record lenses for +@code{ghc-microlens}") + (description "This Haskell package lets you automatically generate lenses +for data types; code was extracted from the lens package, and therefore +generated lenses are fully compatible with ones generated by lens (and can be +used both from lens and microlens).") + (license license:bsd-3))) + +(define-public ghc-missingh + (package + (name "ghc-missingh") + (version "1.4.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/MissingH/" + "MissingH-" version ".tar.gz")) + (sha256 + (base32 + "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8")))) + (build-system haskell-build-system) + ;; Tests require the unmaintained testpack package, which depends on the + ;; outdated QuickCheck version 2.7, which can no longer be built with + ;; recent versions of GHC and Haskell libraries. + (arguments '(#:tests? #f)) + (inputs + `(("ghc-network" ,ghc-network) + ("ghc-hunit" ,ghc-hunit) + ("ghc-regex-compat" ,ghc-regex-compat) + ("ghc-hslogger" ,ghc-hslogger) + ("ghc-random" ,ghc-random) + ("ghc-old-time" ,ghc-old-time) + ("ghc-old-locale" ,ghc-old-locale))) + (native-inputs + `(("ghc-errorcall-eq-instance" ,ghc-errorcall-eq-instance) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hunit" ,ghc-hunit))) + (home-page "http://software.complete.org/missingh") + (synopsis "Large utility library") + (description + "MissingH is a library of all sorts of utility functions for Haskell +programmers. It is written in pure Haskell and thus should be extremely +portable and easy to use.") + (license license:bsd-3))) + +(define-public ghc-mmap + (package + (name "ghc-mmap") + (version "0.5.9") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "mmap/mmap-" version ".tar.gz")) + (sha256 + (base32 + "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/mmap") + (synopsis "Memory mapped files for Haskell") + (description + "This library provides a wrapper to @code{mmap}, allowing files or +devices to be lazily loaded into memory as strict or lazy @code{ByteStrings}, +@code{ForeignPtrs} or plain @code{Ptrs}, using the virtual memory subsystem to +do on-demand loading.") + (license license:bsd-3))) + +(define-public ghc-mmorph + (package + (name "ghc-mmorph") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/mmorph/mmorph-" + version + ".tar.gz")) + (sha256 + (base32 + "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9")))) + (build-system haskell-build-system) + (inputs + `(("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://hackage.haskell.org/package/mmorph") + (synopsis "Monad morphisms") + (description + "This library provides monad morphism utilities, most commonly used for +manipulating monad transformer stacks.") + (license license:bsd-3))) + +(define-public ghc-mockery + (package + (name "ghc-mockery") + (version "0.3.5") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "mockery/mockery-" version ".tar.gz")) + (sha256 + (base32 + "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp")))) + (build-system haskell-build-system) + (inputs + `(("ghc-temporary" ,ghc-temporary) + ("ghc-logging-facade" ,ghc-logging-facade) + ("ghc-base-compat" ,ghc-base-compat))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/mockery") + (synopsis "Support functions for automated testing") + (description + "The mockery package provides support functions for automated testing.") + (license license:expat))) + +(define-public ghc-monad-control + (package + (name "ghc-monad-control") + (version "1.0.2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/monad-control" + "/monad-control-" version ".tar.gz")) + (sha256 + (base32 + "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) + (build-system haskell-build-system) + (inputs + `(("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-transformers-compat" ,ghc-transformers-compat))) + (home-page "https://github.com/basvandijk/monad-control") + (synopsis "Monad transformers to lift control operations like exception +catching") + (description "This package defines the type class @code{MonadBaseControl}, +a subset of @code{MonadBase} into which generic control operations such as +@code{catch} can be lifted from @code{IO} or any other base monad.") + (license license:bsd-3))) + +(define-public ghc-monad-logger + (package + (name "ghc-monad-logger") + (version "0.3.29") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "monad-logger-" version "/" + "monad-logger-" version ".tar.gz")) + (sha256 + (base32 + "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv")))) + (build-system haskell-build-system) + (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-stm-chans" ,ghc-stm-chans) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-fast-logger" ,ghc-fast-logger) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-monad-loops" ,ghc-monad-loops) + ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-exceptions" ,ghc-exceptions))) + (home-page "https://github.com/kazu-yamamoto/logger") + (synopsis "Provides a class of monads which can log messages for Haskell") + (description "This Haskell package uses a monad transformer approach +for logging. + +This package provides Template Haskell functions for determining source +code locations of messages.") + (license license:expat))) + +(define-public ghc-monad-loops + (package + (name "ghc-monad-loops") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "monad-loops-" version "/" + "monad-loops-" version ".tar.gz")) + (sha256 + (base32 + "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky")))) + (build-system haskell-build-system) + (native-inputs `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/mokus0/monad-loops") + (synopsis "Monadic loops for Haskell") + (description "This Haskell package provides some useful control +operators for looping.") + (license license:public-domain))) + +(define-public ghc-monad-par + (package + (name "ghc-monad-par") + (version "0.3.4.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "monad-par-" version "/" + "monad-par-" version ".tar.gz")) + (sha256 + (base32 + "0ldrzqy24fsszvn2a2nr77m2ih7xm0h9bgkjyv1l274aj18xyk7q")))) + (build-system haskell-build-system) + (inputs `(("ghc-abstract-par" ,ghc-abstract-par) + ("ghc-abstract-deque" ,ghc-abstract-deque) + ("ghc-monad-par-extras" ,ghc-monad-par-extras) + ("ghc-mwc-random" ,ghc-mwc-random) + ("ghc-parallel" ,ghc-parallel))) + (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" + ,ghc-test-framework-quickcheck2) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-th" ,ghc-test-framework-th))) + (home-page "https://github.com/simonmar/monad-par") + (synopsis "Haskell library for parallel programming based on a monad") + (description "The @code{Par} monad offers an API for parallel +programming. The library works for parallelising both pure and @code{IO} +computations, although only the pure version is deterministic. The default +implementation provides a work-stealing scheduler and supports forking tasks +that are much lighter weight than IO-threads.") + (license license:bsd-3))) + +(define-public ghc-monad-par-extras + (package + (name "ghc-monad-par-extras") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "monad-par-extras-" version "/" + "monad-par-extras-" version ".tar.gz")) + (sha256 + (base32 + "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2")))) + (build-system haskell-build-system) + (inputs `(("ghc-abstract-par" ,ghc-abstract-par) + ("ghc-cereal" ,ghc-cereal) + ("ghc-random" ,ghc-random))) + (home-page "https://github.com/simonmar/monad-par") + (synopsis "Combinators and extra features for Par monads for Haskell") + (description "This Haskell package provides additional data structures, +and other added capabilities layered on top of the @code{Par} monad.") + (license license:bsd-3))) + +(define-public ghc-monadplus + (package + (name "ghc-monadplus") + (version "1.4.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/monadplus" + "/monadplus-" version ".tar.gz")) + (sha256 + (base32 "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/monadplus") + (synopsis "Filtering and folding over arbitrary MonadPlus instances") + (description + "This package generalizes many common stream operations such as +@code{filter}, @code{catMaybes} etc, enabling filtering and folding over +arbitrary @code{MonadPlus} instances.") + (license license:bsd-3))) + +(define-public ghc-monadrandom + (package + (name "ghc-monadrandom") + (version "0.5.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "MonadRandom-" version "/" + "MonadRandom-" version ".tar.gz")) + (sha256 + (base32 + "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb")))) + (build-system haskell-build-system) + (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-primitive" ,ghc-primitive) + ("ghc-fail" ,ghc-fail) + ("ghc-random" ,ghc-random))) + (home-page "https://github.com/byorgey/MonadRandom") + (synopsis "Random-number generation monad for Haskell") + (description "This Haskell package provides support for computations +which consume random values.") + (license license:bsd-3))) + +(define-public ghc-monads-tf + (package + (name "ghc-monads-tf") + (version "0.1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/monads-tf/monads-tf-" + version ".tar.gz")) + (sha256 + (base32 + "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/monads-tf") + (synopsis "Monad classes, using type families") + (description + "Monad classes using type families, with instances for various monad transformers, +inspired by the paper 'Functional Programming with Overloading and Higher-Order +Polymorphism', by Mark P Jones. This package is almost a compatible replacement for +the @code{mtl-tf} package.") + (license license:bsd-3))) + +(define-public ghc-mono-traversable + (package + (name "ghc-mono-traversable") + (version "1.0.9.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "mono-traversable-" version "/" + "mono-traversable-" version ".tar.gz")) + (sha256 + (base32 + "0180ks0dyvpk1r20w5jw2w2n79mjnk69n9vhspaxzlyxqgim5psa")))) + (build-system haskell-build-system) + (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-hashable" ,ghc-hashable) + ("ghc-vector" ,ghc-vector) + ("ghc-vector-algorithms" ,ghc-vector-algorithms) + ("ghc-split" ,ghc-split))) + (native-inputs `(("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-foldl" ,ghc-foldl))) + (home-page "https://github.com/snoyberg/mono-traversable") + (synopsis "Haskell classes for mapping, folding, and traversing monomorphic +containers") + (description "This Haskell package provides Monomorphic variants of the +Functor, Foldable, and Traversable typeclasses. If you understand Haskell's +basic typeclasses, you understand mono-traversable. In addition to what +you are used to, it adds on an IsSequence typeclass and has code for marking +data structures as non-empty.") + (license license:expat))) + +(define-public ghc-murmur-hash + (package + (name "ghc-murmur-hash") + (version "0.1.0.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/murmur-hash" + "/murmur-hash-" version ".tar.gz")) + (sha256 + (base32 "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9")))) + (build-system haskell-build-system) + (home-page "https://github.com/nominolo/murmur-hash") + (synopsis "MurmurHash2 implementation for Haskell") + (description + "This package provides an implementation of MurmurHash2, a good, fast, +general-purpose, non-cryptographic hashing function. See +@url{https://sites.google.com/site/murmurhash/} for details. This +implementation is pure Haskell, so it might be a bit slower than a C FFI +binding.") + (license license:bsd-3))) + +(define-public ghc-mwc-random + (package + (name "ghc-mwc-random") + (version "0.13.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "mwc-random-" version "/" + "mwc-random-" version ".tar.gz")) + (sha256 + (base32 + "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6")))) + (build-system haskell-build-system) + (inputs + `(("ghc-primitive" ,ghc-primitive) + ("ghc-vector" ,ghc-vector) + ("ghc-math-functions" ,ghc-math-functions))) + (arguments + `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails. + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/bos/mwc-random") + (synopsis "Random number generation library for Haskell") + (description "This Haskell package contains code for generating +high quality random numbers that follow either a uniform or normal +distribution. The generated numbers are suitable for use in +statistical applications. + +The uniform PRNG uses Marsaglia's MWC256 (also known as MWC8222) +multiply-with-carry generator, which has a period of 2^{8222} and +fares well in tests of randomness. It is also extremely fast, +between 2 and 3 times faster than the Mersenne Twister.") + (license license:bsd-3))) + +(define-public ghc-nats + (package + (name "ghc-nats") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/nats/nats-" + version + ".tar.gz")) + (sha256 + (base32 + "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr")))) + (build-system haskell-build-system) + (arguments `(#:haddock? #f)) + (inputs + `(("ghc-hashable" ,ghc-hashable))) + (home-page "https://hackage.haskell.org/package/nats") + (synopsis "Natural numbers") + (description "This library provides the natural numbers for Haskell.") + (license license:bsd-3))) + +(define-public ghc-nats-bootstrap + (package + (inherit ghc-nats) + (name "ghc-nats-bootstrap") + (inputs + `(("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '((hidden? #t))))) + +(define-public ghc-network + (package + (name "ghc-network") + (version "2.6.3.6") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/network/network-" + version + ".tar.gz")) + (sha256 + (base32 + "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv")))) + (build-system haskell-build-system) + ;; The regression tests depend on an unpublished module. + (arguments `(#:tests? #f)) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-doctest" ,ghc-doctest) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/haskell/network") + (synopsis "Low-level networking interface") + (description + "This package provides a low-level networking interface.") + (license license:bsd-3))) + +(define-public ghc-network-info + (package + (name "ghc-network-info") + (version "0.2.0.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "network-info-" version "/" + "network-info-" version ".tar.gz")) + (sha256 + (base32 + "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n")))) + (build-system haskell-build-system) + (home-page "https://github.com/jystic/network-info") + (synopsis "Access the local computer's basic network configuration") + (description "This Haskell library provides simple read-only access to the +local computer's networking configuration. It is currently capable of +getting a list of all the network interfaces and their respective +IPv4, IPv6 and MAC addresses.") + (license license:bsd-3))) + +(define-public ghc-network-uri + (package + (name "ghc-network-uri") + (version "2.6.1.0") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/network-uri/network-uri-" + version + ".tar.gz")) + (sha256 + (base32 + "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2")))) + (build-system haskell-build-system) + (arguments + `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + (inputs + `(("ghc-network" ,ghc-network))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page + "https://github.com/haskell/network-uri") + (synopsis "Library for URI manipulation") + (description "This package provides an URI manipulation interface. In +@code{network-2.6} the @code{Network.URI} module was split off from the +@code{network} package into this package.") + (license license:bsd-3))) + +(define-public ghc-newtype-generics + (package + (name "ghc-newtype-generics") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "newtype-generics/newtype-generics-" + version ".tar.gz")) + (sha256 + (base32 + "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "http://github.com/sjakobi/newtype-generics") + (synopsis "Typeclass and set of functions for working with newtypes") + (description "The @code{Newtype} typeclass represents the packing and +unpacking of a newtype, and allows you to operate under that newtype with +functions such as @code{ala}. Generics support was added in version 0.4, +making this package a full replacement for the original newtype package, +and an alternative to newtype-th.") + (license license:bsd-3))) + +(define-public ghc-objectname + (package + (name "ghc-objectname") + (version "1.1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ObjectName/ObjectName-" + version + ".tar.gz")) + (sha256 + (base32 + "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/ObjectName") + (synopsis "Helper library for Haskell OpenGL") + (description "This tiny package contains the class ObjectName, which +corresponds to the general notion of explicitly handled identifiers for API +objects, e.g. a texture object name in OpenGL or a buffer object name in +OpenAL.") + (license license:bsd-3))) + +(define-public ghc-old-locale + (package + (name "ghc-old-locale") + (version "1.0.0.7") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/old-locale/old-locale-" + version + ".tar.gz")) + (sha256 + (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs"))) + (home-page "https://hackage.haskell.org/package/old-locale") + (synopsis "Adapt to locale conventions") + (description + "This package provides the ability to adapt to locale conventions such as +date and time formats.") + (license license:bsd-3))) + +(define-public ghc-old-time + (package + (name "ghc-old-time") + (version "1.1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/old-time/old-time-" + version + ".tar.gz")) + (sha256 + (base32 + "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"))) + (inputs + `(("ghc-old-locale" ,ghc-old-locale))) + (home-page "https://hackage.haskell.org/package/old-time") + (synopsis "Time compatibility library for Haskell") + (description "Old-time is a package for backwards compatibility with the +old @code{time} library. For new projects, the newer +@uref{https://hackage.haskell.org/package/time, time library} is recommended.") + (license license:bsd-3))) + +(define-public ghc-opengl + (package + (name "ghc-opengl") + (version "3.0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/OpenGL/OpenGL-" + version + ".tar.gz")) + (sha256 + (base32 + "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) + (build-system haskell-build-system) + (inputs + `(("ghc-objectname" ,ghc-objectname) + ("ghc-gluraw" ,ghc-gluraw) + ("ghc-statevar" ,ghc-statevar) + ("ghc-openglraw" ,ghc-openglraw))) + (home-page "https://www.haskell.org/haskellwiki/Opengl") + (synopsis "Haskell bindings for the OpenGL graphics system") + (description "This package provides Haskell bindings for the OpenGL +graphics system (GL, version 4.5) and its accompanying utility library (GLU, +version 1.3).") + (license license:bsd-3))) + +(define-public ghc-openglraw + (package + (name "ghc-openglraw") + (version "3.3.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/OpenGLRaw/OpenGLRaw-" + version + ".tar.gz")) + (sha256 + (base32 + "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb")))) + (build-system haskell-build-system) + (inputs + `(("ghc-half" ,ghc-half) + ("ghc-fixed" ,ghc-fixed) + ("glu" ,glu))) + (home-page "https://www.haskell.org/haskellwiki/Opengl") + (synopsis "Raw Haskell bindings for the OpenGL graphics system") + (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 +graphics system and lots of OpenGL extensions. It is basically a 1:1 mapping +of OpenGL's C API, intended as a basis for a nicer interface. OpenGLRaw +offers access to all necessary functions, tokens and types plus a general +facility for loading extension entries. The module hierarchy closely mirrors +the naming structure of the OpenGL extensions, making it easy to find the +right module to import. All API entries are loaded dynamically, so no special +C header files are needed for building this package. If an API entry is not +found at runtime, a userError is thrown.") + (license license:bsd-3))) + +(define-public ghc-operational + (package + (name "ghc-operational") + (version "0.2.3.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/operational/" + "operational-" version ".tar.gz")) + (sha256 + (base32 + "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i")))) + (build-system haskell-build-system) + (inputs + `(("ghc-random" ,ghc-random))) + (home-page "http://wiki.haskell.org/Operational") + (synopsis "Implementation of difficult monads made easy with operational semantics") + (description + "This library makes it easy to implement monads with tricky control +flow. This is useful for: writing web applications in a sequential style, +programming games with a uniform interface for human and AI players and easy +replay capababilities, implementing fast parser monads, designing monadic +DSLs, etc.") + (license license:bsd-3))) + +(define-public ghc-options + (package + (name "ghc-options") + (version "1.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/options/options-" + version ".tar.gz")) + (sha256 + (base32 + "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8")))) + (build-system haskell-build-system) + (inputs + `(("ghc-monads-tf" ,ghc-monads-tf) + ("ghc-chell" ,ghc-chell) + ("ghc-chell-quickcheck" ,ghc-chell-quickcheck))) + (home-page "https://john-millikin.com/software/haskell-options/") + (synopsis "Powerful and easy-to-use command-line option parser") + (description + "The @code{options} package lets library and application developers +easily work with command-line options.") + (license license:expat))) + +;; See ghc-system-filepath-bootstrap, chell and chell-quickcheck are required for tests. +(define ghc-options-bootstrap + (package + (name "ghc-options-bootstrap") + (version "1.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/options/options-" + version ".tar.gz")) + (sha256 + (base32 + "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8")))) + (build-system haskell-build-system) + (arguments + `(#:tests? #f)) + (inputs + `(("ghc-monads-tf" ,ghc-monads-tf))) + (home-page "https://john-millikin.com/software/haskell-options/") + (synopsis "Powerful and easy-to-use command-line option parser") + (description + "The @code{options} package lets library and application developers +easily work with command-line options.") + (license license:expat))) + + +(define-public ghc-optparse-applicative + (package + (name "ghc-optparse-applicative") + (version "0.14.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/optparse-applicative" + "/optparse-applicative-" version ".tar.gz")) + (sha256 + (base32 + "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71")))) + (build-system haskell-build-system) + (inputs + `(("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/pcapriotti/optparse-applicative") + (synopsis "Utilities and combinators for parsing command line options") + (description "This package provides utilities and combinators for parsing +command line options in Haskell.") + (license license:bsd-3))) + +(define-public ghc-pandoc + (package + (name "ghc-pandoc") + (version "2.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" + version ".tar.gz")) + (sha256 + (base32 + "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "pandoc.cabal" + (("tasty >= 0\\.11 && < 1\\.1") + "tasty >= 0.11 && < 1.1.1")))) + (add-before 'configure 'patch-tests + (lambda _ + ;; These tests fail benignly and have been adjusted upstream: + ;; . + (substitute* "test/Tests/Old.hs" + (("lhsWriterTests \"html\"") "[]"))))))) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-aeson-pretty" ,ghc-aeson-pretty) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-cmark-gfm" ,ghc-cmark-gfm) + ("ghc-data-default" ,ghc-data-default) + ("ghc-deepseq-generics" ,ghc-deepseq-generics) + ("ghc-diff" ,ghc-diff) + ("ghc-doctemplates" ,ghc-doctemplates) + ("ghc-executable-path" ,ghc-executable-path) + ("ghc-glob" ,ghc-glob) + ("ghc-haddock-library" ,ghc-haddock-library) + ("ghc-hslua" ,ghc-hslua) + ("ghc-hslua-module-text" ,ghc-hslua-module-text) + ("ghc-http" ,ghc-http) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls) + ("ghc-http-types" ,ghc-http-types) + ("ghc-juicypixels" ,ghc-juicypixels) + ("ghc-network" ,ghc-network) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-pandoc-types" ,ghc-pandoc-types) + ("ghc-random" ,ghc-random) + ("ghc-scientific" ,ghc-scientific) + ("ghc-sha" ,ghc-sha) + ("ghc-skylighting" ,ghc-skylighting) + ("ghc-split" ,ghc-split) + ("ghc-syb" ,ghc-syb) + ("ghc-tagsoup" ,ghc-tagsoup) + ("ghc-temporary" ,ghc-temporary) + ("ghc-texmath" ,ghc-texmath) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-xml" ,ghc-xml) + ("ghc-yaml" ,ghc-yaml) + ("ghc-zip-archive" ,ghc-zip-archive) + ("ghc-zlib" ,ghc-zlib))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://pandoc.org") + (synopsis "Conversion between markup formats") + (description + "Pandoc is a Haskell library for converting from one markup format to +another, and a command-line tool that uses this library. It can read and +write Markdown and (subsets of) other formats, such as HTML, reStructuredText, +LaTeX, DocBook, and many more. + +Pandoc extends standard Markdown syntax with footnotes, embedded LaTeX, +definition lists, tables, and other features. A compatibility mode is +provided for those who need a drop-in replacement for Markdown.pl.") + (license license:gpl2+))) + +(define-public ghc-pandoc-citeproc + (package + (name "ghc-pandoc-citeproc") + (version "0.14.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "pandoc-citeproc/pandoc-citeproc-" + version ".tar.gz")) + (sha256 + (base32 + "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Many YAML tests (44) are failing do to changes in ghc-yaml: + ;; . + (add-before 'configure 'patch-tests + (lambda _ + (substitute* "tests/test-pandoc-citeproc.hs" + (("let allTests = citeprocTests \\+\\+ biblio2yamlTests") + "let allTests = citeprocTests")))) + ;; Tests need to be run after installation. + (delete 'check) + (add-after 'install 'post-install-check + (assoc-ref %standard-phases 'check))))) + (inputs + `(("ghc-pandoc-types" ,ghc-pandoc-types) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-tagsoup" ,ghc-tagsoup) + ("ghc-aeson" ,ghc-aeson) + ("ghc-vector" ,ghc-vector) + ("ghc-xml-conduit" ,ghc-xml-conduit) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-data-default" ,ghc-data-default) + ("ghc-setenv" ,ghc-setenv) + ("ghc-split" ,ghc-split) + ("ghc-yaml" ,ghc-yaml) + ("ghc-hs-bibutils" ,ghc-hs-bibutils) + ("ghc-rfc5051" ,ghc-rfc5051) + ("ghc-syb" ,ghc-syb) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-aeson-pretty" ,ghc-aeson-pretty) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/jgm/pandoc-citeproc") + (synopsis "Library for using pandoc with citeproc") + (description + "The @code{pandoc-citeproc} library exports functions for using the +citeproc system with pandoc. It relies on @code{citeproc-hs}, a library for +rendering bibliographic reference citations into a variety of styles using a +macro language called @dfn{Citation Style Language} (CSL). This package also +contains an executable @code{pandoc-citeproc}, which works as a pandoc filter, +and also has a mode for converting bibliographic databases a YAML format +suitable for inclusion in pandoc YAML metadata.") + (license license:bsd-3))) + +(define-public ghc-pandoc-types + (package + (name "ghc-pandoc-types") + (version "1.17.5.1") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "pandoc-types/pandoc-types-" + version ".tar.gz")) + (sha256 + (base32 + "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717")))) + (build-system haskell-build-system) + (inputs + `(("ghc-syb" ,ghc-syb) + ("ghc-aeson" ,ghc-aeson) + ("ghc-string-qq" ,ghc-string-qq))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-hunit" ,ghc-hunit))) + (home-page "http://johnmacfarlane.net/pandoc") + (synopsis "Types for representing a structured document") + (description + "This module defines the @code{Pandoc} data structure, which is used by +pandoc to represent structured documents. It also provides functions for +building up, manipulating and serialising @code{Pandoc} structures.") + (license license:bsd-3))) + +(define-public ghc-parallel + (package + (name "ghc-parallel") + (version "3.2.2.0") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/parallel/parallel-" + version + ".tar.gz")) + (sha256 + (base32 + "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/parallel") + (synopsis "Parallel programming library") + (description + "This package provides a library for parallel programming.") + (license license:bsd-3))) + +(define-public ghc-parsec-numbers + (package + (name "ghc-parsec-numbers") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "parsec-numbers/parsec-numbers-" version ".tar.gz")) + (sha256 + (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/parsec-numbers") + (synopsis "Utilities for parsing numbers from strings") + (description + "This package provides the number parsers without the need to use a large +(and unportable) token parser.") + (license license:bsd-3))) + +(define-public ghc-parser-combinators + (package + (name "ghc-parser-combinators") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "parser-combinators/parser-combinators-" + version ".tar.gz")) + (sha256 + (base32 + "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75")))) + (build-system haskell-build-system) + (home-page "https://github.com/mrkkrp/parser-combinators") + (synopsis "Commonly useful parser combinators") + (description + "This is a lightweight package providing commonly useful parser +combinators.") + (license license:bsd-3))) + +(define-public ghc-parsers + (package + (name "ghc-parsers") + (version "0.12.9") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/parsers/parsers-" + version + ".tar.gz")) + (sha256 + (base32 + "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy + ; -package attoparsec-0.13.0.1" + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-scientific" ,ghc-scientific) + ("ghc-charset" ,ghc-charset) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (home-page "https://github.com/ekmett/parsers/") + (synopsis "Parsing combinators") + (description "This library provides convenient combinators for working +with and building parsing combinator libraries. Given a few simple instances, +you get access to a large number of canned definitions. Instances exist for +the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s +@code{Text.Read}.") + (license license:bsd-3))) + +(define-public ghc-path + (package + (name "ghc-path") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/path/path-" + version + ".tar.gz")) + (sha256 + (base32 + "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb")))) + (build-system haskell-build-system) + (arguments + ;; TODO: There are some Windows-related tests and modules that need to be + ;; danced around. + `(#:tests? #f + #:cabal-revision + ("1" "05b1zwx2a893h4h5wvgpc5g5pyx71hfmx409rqisd8s1bq1hn463"))) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-genvalidity" ,ghc-genvalidity) + ("ghc-genvalidity-property" ,ghc-genvalidity-property) + ("ghc-hspec" ,ghc-hspec) + ("ghc-validity" ,ghc-validity))) + (home-page + "http://hackage.haskell.org/package/path") + (synopsis "Support for well-typed paths") + (description "This package introduces a type for paths upholding useful +invariants.") + (license license:bsd-3))) + +(define-public ghc-path-io + (package + (name "ghc-path-io") + (version "1.3.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/path-io/path-io-" + version + ".tar.gz")) + (sha256 + (base32 + "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a")))) + (build-system haskell-build-system) + (inputs + `(("ghc-dlist" ,ghc-dlist) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-path" ,ghc-path) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-temporary" ,ghc-temporary))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec))) + (arguments + `(#:cabal-revision + ("3" "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc"))) + (home-page + "https://github.com/mrkkrp/path-io") + (synopsis "Functions for manipulating well-typed paths") + (description "This package provides an interface to the @code{directory} +package for users of @code{path}. It also implements some missing stuff like +recursive scanning and copying of directories, working with temporary +files/directories, and more.") + (license license:bsd-3))) + +(define-public ghc-paths + (package + (name "ghc-paths") + (version "0.1.0.9") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/ghc-paths/ghc-paths-" + version + ".tar.gz")) + (sha256 + (base32 + "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg")))) + (build-system haskell-build-system) + (home-page "https://github.com/simonmar/ghc-paths") + (synopsis + "Knowledge of GHC's installation directories") + (description + "Knowledge of GHC's installation directories.") + (license license:bsd-3))) + +(define-public ghc-patience + (package + (name "ghc-patience") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/patience/patience-" + version ".tar.gz")) + (sha256 + (base32 + "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/patience") + (synopsis "Patience diff and longest increasing subsequence") + (description + "This library implements the 'patience diff' algorithm, as well as the +patience algorithm for the longest increasing subsequence problem. +Patience diff computes the difference between two lists, for example the lines +of two versions of a source file. It provides a good balance between +performance, nice output for humans, and simplicity of implementation.") + (license license:bsd-3))) + +(define-public ghc-pcre-light + (package + (name "ghc-pcre-light") + (version "0.4.0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/pcre-light/pcre-light-" + version + ".tar.gz")) + (sha256 + (base32 + "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82")))) + (build-system haskell-build-system) + (inputs + `(("pcre" ,pcre))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/Daniel-Diaz/pcre-light") + (synopsis "Haskell library for Perl 5 compatible regular expressions") + (description "This package provides a small, efficient, and portable regex +library for Perl 5 compatible regular expressions. The PCRE library is a set +of functions that implement regular expression pattern matching using the same +syntax and semantics as Perl 5.") + (license license:bsd-3))) + +(define-public ghc-persistent + (package + (name "ghc-persistent") + (version "2.8.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "persistent-" version "/" + "persistent-" version ".tar.gz")) + (sha256 + (base32 + "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9")))) + (build-system haskell-build-system) + (inputs `(("ghc-old-locale" ,ghc-old-locale) + ("ghc-conduit" ,ghc-conduit) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-resource-pool" ,ghc-resource-pool) + ("ghc-path-pieces" ,ghc-path-pieces) + ("ghc-http-api-data" ,ghc-http-api-data) + ("ghc-aeson" ,ghc-aeson) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-haskell-src-meta" ,ghc-haskell-src-meta) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-silently" ,ghc-silently) + ("ghc-fast-logger" ,ghc-fast-logger) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tagged" ,ghc-tagged) + ("ghc-void" ,ghc-void))) + (native-inputs `(("ghc-hspec" ,ghc-hspec))) + (home-page "https://www.yesodweb.com/book/persistent") + (synopsis "Type-safe, multi-backend data serialization for Haskell") + (description "This Haskell package allows Haskell programs to access data +storage systems like PostgreSQL, SQLite, MySQL and MongoDB in a type-safe +way.") + (license license:expat))) + +(define-public ghc-persistent-sqlite + (package + (name "ghc-persistent-sqlite") + (version "2.8.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "persistent-sqlite-" version "/" + "persistent-sqlite-" version ".tar.gz")) + (sha256 + (base32 + "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6")))) + (build-system haskell-build-system) + (inputs `(("ghc-persistent" ,ghc-persistent) + ("ghc-unliftio-core" ,ghc-unliftio-core) + ("ghc-aeson" ,ghc-aeson) + ("ghc-conduit" ,ghc-conduit) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-microlens-th" ,ghc-microlens-th) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-resource-pool" ,ghc-resource-pool) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs `(("ghc-hspec" ,ghc-hspec) + ("ghc-persistent-template" ,ghc-persistent-template) + ("ghc-temporary" ,ghc-temporary))) + (home-page + "https://www.yesodweb.com/book/persistent") + (synopsis "Backend for the persistent library using sqlite3") + (description "This Haskell package includes a thin sqlite3 wrapper based +on the direct-sqlite package, as well as the entire C library, so there are no +system dependencies.") + (license license:expat))) + +(define-public ghc-persistent-template + (package + (name "ghc-persistent-template") + (version "2.5.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "persistent-template-" version "/" + "persistent-template-" version ".tar.gz")) + (sha256 + (base32 + "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"))) + (inputs `(("ghc-persistent" ,ghc-persistent) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-aeson" ,ghc-aeson) + ("ghc-aeson-compat" ,ghc-aeson-compat) + ("ghc-monad-logger" ,ghc-monad-logger) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-tagged" ,ghc-tagged) + ("ghc-path-pieces" ,ghc-path-pieces) + ("ghc-http-api-data" ,ghc-http-api-data))) + (native-inputs `(("ghc-hspec" ,ghc-hspec) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://www.yesodweb.com/book/persistent") + (synopsis "Type-safe, non-relational, multi-backend persistence") + (description "This Haskell package provides interfaces and helper +functions for the ghc-persistent package.") + (license license:expat))) + +(define-public ghc-polyparse + (package + (name "ghc-polyparse") + (version "1.12") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/polyparse/polyparse-" + version + ".tar.gz")) + (sha256 + (base32 + "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) + (build-system haskell-build-system) + (home-page + "http://code.haskell.org/~malcolm/polyparse/") + (synopsis + "Alternative parser combinator libraries") + (description + "This package provides a variety of alternative parser combinator +libraries, including the original HuttonMeijer set. The Poly sets have +features like good error reporting, arbitrary token type, running state, lazy +parsing, and so on. Finally, Text.Parse is a proposed replacement for the +standard Read class, for better deserialisation of Haskell values from +Strings.") + (license license:lgpl2.1))) + +(define-public ghc-pqueue + (package + (name "ghc-pqueue") + (version "1.4.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "pqueue/pqueue-" version ".tar.gz")) + (sha256 + (base32 + "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://hackage.haskell.org/package/pqueue") + (synopsis "Reliable, persistent, fast priority queues") + (description + "This package provides a fast, reliable priority queue implementation +based on a binomial heap.") + (license license:bsd-3))) + +(define-public ghc-prelude-extras + (package + (name "ghc-prelude-extras") + (version "0.4.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/prelude-extras/prelude-extras-" + version + ".tar.gz")) + (sha256 + (base32 + "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9")))) + (build-system haskell-build-system) + (home-page "https://github.com/ekmett/prelude-extras") + (synopsis "Higher order versions of Prelude classes") + (description "This library provides higher order versions of +@code{Prelude} classes to ease programming with polymorphic recursion and +reduce @code{UndecidableInstances}.") + (license license:bsd-3))) + +(define-public ghc-prettyclass + (package + (name "ghc-prettyclass") + (version "1.0.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "prettyclass/prettyclass-" version ".tar.gz")) + (sha256 + (base32 + "11l9ajci7nh1r547hx8hgxrhq8mh5gdq30pdf845wvilg9p48dz5")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/prettyclass") + (synopsis "Pretty printing class similar to Show") + (description "This package provides a pretty printing class similar +to @code{Show}, based on the HughesPJ pretty printing library. It +provides the pretty printing class and instances for the Prelude +types.") + (license license:bsd-3))) + +(define-public ghc-pretty-hex + (package + (name "ghc-pretty-hex") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "pretty-hex-" version "/" + "pretty-hex-" version ".tar.gz")) + (sha256 + (base32 + "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz")))) + (build-system haskell-build-system) + (home-page "https://github.com/GaloisInc/hexdump") + (synopsis "Haskell library for hex dumps of ByteStrings") + (description "This Haskell library generates pretty hex dumps of +ByteStrings in the style of other common *nix hex dump tools.") + (license license:bsd-3))) + +(define-public ghc-pretty-show + (package + (name "ghc-pretty-show") + (version "1.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/pretty-show/" + "pretty-show-" version ".tar.gz")) + (sha256 + (base32 + "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-haskell-lexer" ,ghc-haskell-lexer) + ("ghc-happy" ,ghc-happy))) + (home-page "http://wiki.github.com/yav/pretty-show") + (synopsis "Tools for working with derived `Show` instances") + (description + "This package provides a library and an executable for working with +derived @code{Show} instances. By using the library, derived @code{Show} +instances can be parsed into a generic data structure. The @code{ppsh} tool +uses the library to produce human-readable versions of @code{Show} instances, +which can be quite handy for debugging Haskell programs. We can also render +complex generic values into an interactive Html page, for easier +examination.") + (license license:expat))) + +(define-public ghc-primitive + (package + (name "ghc-primitive") + (version "0.6.4.0") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/primitive/primitive-" + version + ".tar.gz")) + (sha256 + (base32 + "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc")))) + (build-system haskell-build-system) + (home-page + "https://github.com/haskell/primitive") + (synopsis "Primitive memory-related operations") + (description + "This package provides various primitive memory-related operations.") + (license license:bsd-3))) + +(define-public ghc-profunctors + (package + (name "ghc-profunctors") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/profunctors/profunctors-" + version + ".tar.gz")) + (sha256 + (base32 + "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"))) + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-distributive" ,ghc-distributive) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-tagged" ,ghc-tagged))) + (home-page "https://github.com/ekmett/profunctors/") + (synopsis "Profunctors for Haskell") + (description "This library provides profunctors for Haskell.") + (license license:bsd-3))) + +(define-public ghc-psqueues + (package + (name "ghc-psqueues") + (version "0.2.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "psqueues-" version "/" + "psqueues-" version ".tar.gz")) + (sha256 + (base32 + "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hashable" ,ghc-hashable))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tagged" ,ghc-tagged) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/jaspervdj/psqueues") + (synopsis "Pure priority search queues") + (description "The psqueues package provides +@uref{https://en.wikipedia.org/wiki/Priority_queue, Priority Search Queues} in +three different flavors: + +@itemize +@item @code{OrdPSQ k p v}, which uses the @code{Ord k} instance to provide +fast insertion, deletion and lookup. This implementation is based on Ralf +Hinze's @uref{http://citeseer.ist.psu.edu/hinze01simple.html, A Simple +Implementation Technique for Priority Search Queues}. + +Hence, it is similar to the @uref{https://hackage.haskell.org/package/PSQueue, +PSQueue} library, although it is considerably faster and provides a slightly +different API. + +@item @code{IntPSQ p v} is a far more efficient implementation. It fixes the +key type to @code{Int} and uses a +@code{https://en.wikipedia.org/wiki/Radix_tree, radix tree} (like @code{IntMap}) +with an additional min-heap property. + +@item @code{HashPSQ k p v} is a fairly straightforward extension +of @code{IntPSQ}: it simply uses the keys' hashes as indices in the +@code{IntPSQ}. If there are any hash collisions, it uses an +@code{OrdPSQ} to resolve those. The performance of this implementation +is comparable to that of @code{IntPSQ}, but it is more widely +applicable since the keys are not restricted to @code{Int}, +but rather to any @code{Hashable} datatype. +@end itemize + +Each of the three implementations provides the same API, so they can +be used interchangeably. + +Typical applications of Priority Search Queues include: + +@itemize +@item Caches, and more specifically LRU Caches; +@item Schedulers; +@item Pathfinding algorithms, such as Dijkstra's and A*. +@end itemize") + (license license:bsd-3))) + +(define-public ghc-random + (package + (name "ghc-random") + (version "1.1") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/random/random-" + version + ".tar.gz")) + (sha256 + (base32 "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/random") + (synopsis "Random number library") + (description "This package provides a basic random number generation +library, including the ability to split random number generators.") + (license license:bsd-3))) + +(define-public ghc-raw-strings-qq + (package + (name "ghc-raw-strings-qq") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "raw-strings-qq/raw-strings-qq-" + version ".tar.gz")) + (sha256 + (base32 + "1lxy1wy3awf52968iy5y9r5z4qgnn2sxkdrh7js3m9gadb11w09f")))) + (build-system haskell-build-system) + (native-inputs `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/23Skidoo/raw-strings-qq") + (synopsis "Raw string literals for Haskell") + (description + "This package provides a quasiquoter for raw string literals, i.e. string +literals that don't recognise the standard escape sequences. Basically, they +make your code more readable by freeing you from the responsibility to escape +backslashes. They are useful when working with regular expressions, +DOS/Windows paths and markup languages (such as XML).") + (license license:bsd-3))) + +(define-public ghc-readable + (package + (name "ghc-readable") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "readable/readable-" version ".tar.gz")) + (sha256 + (base32 + "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h")))) + (build-system haskell-build-system) + (home-page "https://github.com/mightybyte/readable") + (synopsis "Type class for reading from Text and ByteString") + (description "This package provides a @code{Readable} type class for +reading data types from @code{ByteString} and @code{Text}. It also +includes efficient implementations for common data types.") + (license license:bsd-3))) + +(define-public ghc-rebase + (package + (name "ghc-rebase") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "rebase-" version "/" + "rebase-" version ".tar.gz")) + (sha256 + (base32 + "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya")))) + (build-system haskell-build-system) + (inputs `(("ghc-hashable" ,ghc-hashable) + ("ghc-vector" ,ghc-vector) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-scientific" ,ghc-scientific) + ("ghc-uuid" ,ghc-uuid) + ("ghc-dlist" ,ghc-dlist) + ("ghc-void" ,ghc-void) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-contravariant-extras" ,ghc-contravariant-extras) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-either" ,ghc-either) + ("ghc-fail" ,ghc-fail) + ("ghc-base-prelude" ,ghc-base-prelude))) + (home-page "https://github.com/nikita-volkov/rebase") + (synopsis "Progressive alternative to the base package +for Haskell") + (description "This Haskell package is intended for those who are +tired of keeping long lists of dependencies to the same essential libraries +in each package as well as the endless imports of the same APIs all over again. + +It also supports the modern tendencies in the language. + +To solve those problems this package does the following: + +@itemize +@item Reexport the original APIs under the @code{Rebase} namespace. + +@item Export all the possible non-conflicting symbols from the +@code{Rebase.Prelude} module. + +@item Give priority to the modern practices in the conflicting cases. +@end itemize + +The policy behind the package is only to reexport the non-ambiguous and +non-controversial APIs, which the community has obviously settled on. +The package is intended to rapidly evolve with the contribution from +the community, with the missing features being added with pull-requests.") + (license license:expat))) + +(define-public ghc-reducers + (package + (name "ghc-reducers") + (version "3.12.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/reducers/reducers-" + version + ".tar.gz")) + (sha256 + (base32 + "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki")))) + (build-system haskell-build-system) + (inputs + `(("ghc-fingertree" ,ghc-fingertree) + ("ghc-hashable" ,ghc-hashable) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-semigroups" ,ghc-semigroups))) + (home-page "https://github.com/ekmett/reducers/") + (synopsis "Semigroups, specialized containers and a general map/reduce framework") + (description "This library provides various semigroups, specialized +containers and a general map/reduce framework for Haskell.") + (license license:bsd-3))) + +(define-public ghc-refact + (package + (name "ghc-refact") + (version "0.3.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "refact/refact-" + version ".tar.gz")) + (sha256 + (base32 + "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/refact") + (synopsis "Specify refactorings to perform with apply-refact") + (description + "This library provides a datatype which can be interpreted by +@code{apply-refact}. It exists as a separate library so that applications can +specify refactorings without depending on GHC.") + (license license:bsd-3))) + +(define-public ghc-reflection + (package + (name "ghc-reflection") + (version "2.1.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/reflection/reflection-" + version + ".tar.gz")) + (sha256 + (base32 + "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj")))) + (build-system haskell-build-system) + (inputs `(("ghc-tagged" ,ghc-tagged))) + (home-page "https://github.com/ekmett/reflection") + (synopsis "Reify arbitrary terms into types that can be reflected back +into terms") + (description "This package addresses the 'configuration problem' which is +propagating configurations that are available at run-time, allowing multiple +configurations to coexist without resorting to mutable global variables or +@code{System.IO.Unsafe.unsafePerformIO}.") + (license license:bsd-3))) + +(define-public ghc-regex + (package + (name "ghc-regex") + (version "1.0.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/regex/" + "regex-" version ".tar.gz")) + (sha256 + (base32 + "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-dependencies + (lambda _ + (substitute* "regex.cabal" + (("base-compat.*>=.*0.6.*") + "base-compat >= 0.6\n") + (("template-haskell.*>=.*2.7.*") + "template-haskell >= 2.7\n")) + #t))))) + (inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-hashable" ,ghc-hashable) + ("ghc-regex-base" ,ghc-regex-base) + ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) + ("ghc-regex-tdfa" ,ghc-regex-tdfa) + ("ghc-regex-tdfa-text" ,ghc-regex-tdfa-text) + ("ghc-time-locale-compat" ,ghc-time-locale-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-utf8-string" ,ghc-utf8-string))) + (home-page "http://regex.uk") + (synopsis "Toolkit for regex-base") + (description + "This package provides a regular expression toolkit for @code{regex-base} +with compile-time checking of regular expression syntax, data types for +matches and captures, a text replacement toolkit, portable options, high-level +AWK-like tools for building text processing apps, regular expression macros +with parsers and test bench, comprehensive documentation, tutorials and +copious examples.") + (license license:bsd-3))) + +(define-public ghc-regex-applicative + (package + (name "ghc-regex-applicative") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-applicative/" + "regex-applicative-" version ".tar.gz")) + (sha256 + (base32 + "1riv7jqf26lbv4rm54sd6mrx8xdh4dvh4xbzymzdfdw13k6a4nb6")))) + (build-system haskell-build-system) + (inputs + `(("ghc-smallcheck" ,ghc-smallcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page "https://github.com/feuerbach/regex-applicative") + (synopsis "Regex-based parsing with applicative interface") + (description + "@code{regex-applicative} is a Haskell library for parsing using +regular expressions. Parsers can be built using Applicative interface.") + (license license:expat))) + +(define-public ghc-regex-base + (package + (name "ghc-regex-base") + (version "0.93.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-base/regex-base-" + version + ".tar.gz")) + (sha256 + (base32 + "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10")))) + (build-system haskell-build-system) + (home-page + "https://sourceforge.net/projects/lazy-regex") + (synopsis "Replaces/Enhances Text.Regex") + (description "@code{Text.Regex.Base} provides the interface API for +regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") + (license license:bsd-3))) + +(define-public ghc-regex-compat + (package + (name "ghc-regex-compat") + (version "0.95.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-compat/regex-compat-" + version + ".tar.gz")) + (sha256 + (base32 + "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-base" ,ghc-regex-base) + ("ghc-regex-posix" ,ghc-regex-posix))) + (home-page "https://sourceforge.net/projects/lazy-regex") + (synopsis "Replaces/Enhances Text.Regex") + (description "This library provides one module layer over +@code{regex-posix} to replace @code{Text.Regex}.") + (license license:bsd-3))) + +(define-public ghc-regex-compat-tdfa + (package + (name "ghc-regex-compat-tdfa") + (version "0.95.1.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-compat-tdfa/regex-compat-tdfa-" + version ".tar.gz")) + (sha256 + (base32 + "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-base" ,ghc-regex-base) + ("ghc-regex-tdfa" ,ghc-regex-tdfa))) + (home-page "https://hub.darcs.net/shelarcy/regex-compat-tdfa") + (synopsis "Unicode Support version of Text.Regex, using regex-tdfa") + (description + "One module layer over @code{regex-tdfa} to replace @code{Text.Regex}. +@code{regex-compat} can't use Unicode characters correctly because of using regex-posix. +This is not good for Unicode users. This modified regex-compat uses regex-tdfa to solve +this problem.") + (license license:bsd-3))) + +(define-public ghc-regex-pcre-builtin + (package + (name "ghc-regex-pcre-builtin") + (version "0.94.4.8.8.35") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "regex-pcre-builtin/regex-pcre-builtin-" + version ".tar.gz")) + (sha256 + (base32 + "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-base" ,ghc-regex-base))) + (home-page "https://hackage.haskell.org/package/regex-pcre") + (synopsis "Enhancement of the builtin Text.Regex library") + (description + "This package is an enhancement of the @code{Text.Regex} library, +providing the PCRE backend to accompany regex-base, with bundled code from +@url{https://www.pcre.org}.") + (license license:bsd-3))) + +(define-public ghc-regex-posix + (package + (name "ghc-regex-posix") + (version "0.95.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-posix/regex-posix-" + version + ".tar.gz")) + (sha256 + (base32 + "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-base" ,ghc-regex-base))) + (home-page "https://sourceforge.net/projects/lazy-regex") + (synopsis "POSIX regular expressions for Haskell") + (description "This library provides the POSIX regex backend used by the +Haskell library @code{regex-base}.") + (license license:bsd-3))) + +(define-public ghc-regex-tdfa + (package + (name "ghc-regex-tdfa") + (version "1.2.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-tdfa/regex-tdfa-" + version ".tar.gz")) + (sha256 + (base32 + "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-base" ,ghc-regex-base))) + (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") + (synopsis "POSIX extended regular expressions in Haskell.") + (description + "Regex-tdfa is a pure Haskell regular expression library implementing POSIX +extended regular expressions. It is a \"tagged\" DFA regex engine. It is +inspired by libtre.") + (license license:bsd-3))) + +(define-public ghc-regex-tdfa-text + (package + (name "ghc-regex-tdfa-text") + (version "1.0.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-tdfa-text/" + "regex-tdfa-text-" version ".tar.gz")) + (sha256 + (base32 + "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-base" ,ghc-regex-base) + ("ghc-regex-tdfa" ,ghc-regex-tdfa))) + (home-page + "http://hackage.haskell.org/package/regex-tdfa-text") + (synopsis "Text interface for regex-tdfa") + (description + "This provides an extra text interface for regex-tdfa.") + (license license:bsd-3))) + +(define-public ghc-rerebase + (package + (name "ghc-rerebase") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/rerebase/rerebase-" + version ".tar.gz")) + (sha256 + (base32 + "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks")))) + (build-system haskell-build-system) + (inputs + `(("ghc-rebase" ,ghc-rebase))) + (home-page "https://github.com/nikita-volkov/rerebase") + (synopsis "Reexports from ``base'' with many other standard libraries") + (description "A rich drop-in replacement for @code{base}. For details and +documentation please visit @uref{https://github.com/nikita-volkov/rerebase, +the project's home page}.") + (license license:expat))) + +(define-public ghc-resolv + (package + (name "ghc-resolv") + (version "0.1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/resolv/resolv-" + version ".tar.gz")) + (sha256 + (base32 + "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma") + #:tests? #f)) ; The required test frameworks are too old. + (inputs + `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) + (home-page "https://github.com/haskell/hackage-security") + (synopsis "Domain Name Service (DNS) lookup via @code{libresolv}") + (description "This package implements an API for accessing the +@uref{https://tools.ietf.org/html/rfc1035, Domain Name Service (DNS)} +resolver service via the standard @code{libresolv} system library (whose +API is often available directly via the standard @code{libc} C library) on +Unix systems.") + (license license:gpl3))) + +(define-public ghc-resource-pool + (package + (name "ghc-resource-pool") + (version "0.2.3.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "resource-pool-" version "/" + "resource-pool-" version ".tar.gz")) + (sha256 + (base32 + "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6")))) + (build-system haskell-build-system) + (inputs `(("ghc-hashable" ,ghc-hashable) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-vector" ,ghc-vector))) + (home-page "https://github.com/bos/pool") + (synopsis "Striped resource pooling implementation in Haskell") + (description "This Haskell package provides striped pooling abstraction +for managing flexibly-sized collections of resources such as database +connections.") + (license license:bsd-3))) + +(define-public ghc-resourcet + (package + (name "ghc-resourcet") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/resourcet/" + "resourcet-" version ".tar.gz")) + (sha256 + (base32 + "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7")))) + (build-system haskell-build-system) + (inputs + `(("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-mmorph" ,ghc-mmorph) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-unliftio-core" ,ghc-unliftio-core))) + (native-inputs + `(("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-hspec" ,ghc-hspec))) + (home-page "https://github.com/snoyberg/conduit") + (synopsis "Deterministic allocation and freeing of scarce resources") + (description "ResourceT is a monad transformer which creates a region of +code where you can safely allocate resources.") + (license license:bsd-3))) + +(define-public ghc-rfc5051 + (package + (name "ghc-rfc5051") + (version "0.1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/rfc5051/" + "rfc5051-" version ".tar.gz")) + (sha256 + (base32 + "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/rfc5051") + (synopsis "Simple unicode collation as per RFC5051") + (description + "This library implements @code{unicode-casemap}, the simple, non +locale-sensitive unicode collation algorithm described in RFC 5051. Proper +unicode collation can be done using @code{text-icu}, but that is a big +dependency that depends on a large C library, and @code{rfc5051} might be +better for some purposes.") + (license license:bsd-3))) + +(define-public ghc-rio + (package + (name "ghc-rio") + (version "0.1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/rio/rio-" + version ".tar.gz")) + (sha256 + (base32 + "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g")))) + (build-system haskell-build-system) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-microlens" ,ghc-microlens) + ("ghc-primitive" ,ghc-primitive) + ("ghc-typed-process" ,ghc-typed-process) + ("ghc-unliftio" ,ghc-unliftio) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/commercialhaskell/rio#readme") + (synopsis "A standard library for Haskell") + (description "This package works as a prelude replacement for Haskell, +providing more functionality and types out of the box than the standard +prelude (such as common data types like @code{ByteString} and +@code{Text}), as well as removing common ``gotchas'', like partial +functions and lazy I/O. The guiding principle here is: +@itemize +@item If something is safe to use in general and has no expected naming +conflicts, expose it. +@item If something should not always be used, or has naming conflicts, +expose it from another module in the hierarchy. +@end itemize") + (license license:expat))) + +(define-public ghc-safe + (package + (name "ghc-safe") + (version "0.3.17") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/safe/safe-" + version + ".tar.gz")) + (sha256 + (base32 + "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/ndmitchell/safe#readme") + (synopsis "Library of safe (exception free) functions") + (description "This library provides wrappers around @code{Prelude} and +@code{Data.List} functions, such as @code{head} and @code{!!}, that can throw +exceptions.") + (license license:bsd-3))) + +(define-public ghc-safe-exceptions + (package + (name "ghc-safe-exceptions") + (version "0.1.7.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "safe-exceptions/safe-exceptions-" + version ".tar.gz")) + (sha256 + (base32 + "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q")))) + (build-system haskell-build-system) + (arguments + '(#:cabal-revision + ("4" "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32"))) + (inputs `(("ghc-exceptions" ,ghc-exceptions))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-void" ,ghc-void) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/fpco/safe-exceptions") + (synopsis "Safe, consistent, and easy exception handling") + (description "Runtime exceptions - as exposed in @code{base} by the +@code{Control.Exception} module - have long been an intimidating part of the +Haskell ecosystem. This package is intended to overcome this. It provides a +safe and simple API on top of the existing exception handling machinery. The +API is equivalent to the underlying implementation in terms of power but +encourages best practices to minimize the chances of getting the exception +handling wrong.") + (license license:expat))) + +(define-public ghc-safeio + (package + (name "ghc-safeio") + (version "0.0.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/safeio/" + "safeio-" version ".tar.gz")) + (sha256 + (base32 + "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-combinators" ,ghc-conduit-combinators) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-th" ,ghc-test-framework-th))) + (home-page "https://github.com/luispedro/safeio") + (synopsis "Write output to disk atomically") + (description + "This package implements utilities to perform atomic output so as to +avoid the problem of partial intermediate files.") + (license license:expat))) + +(define-public ghc-safesemaphore + (package + (name "ghc-safesemaphore") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "SafeSemaphore/SafeSemaphore-" version ".tar.gz")) + (sha256 + (base32 + "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/ChrisKuklewicz/SafeSemaphore") + (synopsis "Exception safe semaphores") + (description "This library provides exception safe semaphores that can be +used in place of @code{QSem}, @code{QSemN}, and @code{SampleVar}, all of which +are not exception safe and can be broken by @code{killThread}.") + (license license:bsd-3))) + +(define-public ghc-sandi + (package + (name "ghc-sandi") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/sandi/sandi-" + version ".tar.gz")) + (sha256 + (base32 + "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-stringsearch" ,ghc-stringsearch) + ("ghc-conduit" ,ghc-conduit) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-hunit" ,ghc-hunit) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-th" ,ghc-tasty-th))) + (home-page "https://hackage.haskell.org/package/sandi") + (synopsis "Data encoding library") + (description "Reasonably fast data encoding library.") + (license license:bsd-3))) + +(define-public ghc-scientific + (package + (name "ghc-scientific") + (version "0.3.6.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/scientific/scientific-" + version + ".tar.gz")) + (sha256 + (base32 + "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) + (build-system haskell-build-system) + (inputs + `(("ghc-integer-logarithms" ,ghc-integer-logarithms) + ("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-ant-xml" ,ghc-tasty-ant-xml) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-smallcheck" ,ghc-smallcheck) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/basvandijk/scientific") + (synopsis "Numbers represented using scientific notation") + (description "This package provides @code{Data.Scientific}, which provides +the number type @code{Scientific}. Scientific numbers are arbitrary precision +and space efficient. They are represented using +@uref{https://en.wikipedia.org/wiki/Scientific_notation, scientific +notation}.") + (license license:bsd-3))) + +(define-public ghc-scientific-bootstrap + (package + (inherit ghc-scientific) + (name "ghc-scientific-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) + ("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs '()) + (properties '(hidden? #t)))) + +(define-public ghc-sdl + (package + (name "ghc-sdl") + (version "0.6.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/SDL/SDL-" + version + ".tar.gz")) + (sha256 + (base32 + "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq")))) + (build-system haskell-build-system) + (inputs + `(("sdl" ,sdl))) + (home-page "https://hackage.haskell.org/package/SDL") + (synopsis "LibSDL for Haskell") + (description "Simple DirectMedia Layer (libSDL) is a cross-platform +multimedia library designed to provide low level access to audio, keyboard, +mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. It is used +by MPEG playback software, emulators, and many popular games, including the +award winning Linux port of \"Civilization: Call To Power.\"") + (license license:bsd-3))) + +(define-public ghc-sdl-image + (package + (name "ghc-sdl-image") + (version "0.6.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/SDL-image/SDL-image-" + version + ".tar.gz")) + (sha256 + (base32 + "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1")))) + (build-system haskell-build-system) + (arguments + `(#:configure-flags + (let* ((sdl-image (assoc-ref %build-inputs "sdl-image")) + (sdl-image-include (string-append sdl-image "/include/SDL"))) + (list (string-append "--extra-include-dirs=" sdl-image-include))))) + (inputs + `(("ghc-sdl" ,ghc-sdl) + ("sdl-image" ,sdl-image))) + (home-page "https://hackage.haskell.org/package/SDL-image") + (synopsis "Haskell bindings to libSDL_image") + (description "SDL_image is an image file loading library. It loads images +as SDL surfaces, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, +PNG, PNM, TGA, TIFF, XCF, XPM, XV.") + (license license:bsd-3))) + +(define-public ghc-sdl-mixer + (package + (name "ghc-sdl-mixer") + (version "0.6.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/SDL-mixer/SDL-mixer-" + version + ".tar.gz")) + (sha256 + (base32 + "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r")))) + (build-system haskell-build-system) + (arguments + `(#:configure-flags + (let* ((sdl-mixer (assoc-ref %build-inputs "sdl-mixer")) + (sdl-mixer-include (string-append sdl-mixer "/include/SDL"))) + (list (string-append "--extra-include-dirs=" sdl-mixer-include))))) + (inputs + `(("ghc-sdl" ,ghc-sdl) + ("sdl-mixer" ,sdl-mixer))) + (home-page "https://hackage.haskell.org/package/SDL-mixer") + (synopsis "Haskell bindings to libSDL_mixer") + (description "SDL_mixer is a sample multi-channel audio mixer library. It +supports any number of simultaneously playing channels of 16 bit stereo audio, +plus a single channel of music, mixed by the popular MikMod MOD, Timidity +MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") + (license license:bsd-3))) + +(define-public ghc-securemem + (package + (name "ghc-securemem") + (version "0.1.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "securemem-" version "/" + "securemem-" version ".tar.gz")) + (sha256 + (base32 + "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j")))) + (build-system haskell-build-system) + (inputs `(("ghc-byteable" ,ghc-byteable) + ("ghc-memory" ,ghc-memory))) + (home-page "https://github.com/vincenthz/hs-securemem") + (synopsis "Auto-scrubbing and const-time-eq memory chunk abstraction for +Haskell") + (description "SecureMem is similar to ByteString, except that it provides +a memory chunk that will be auto-scrubbed after it run out of scope.") + (license license:bsd-3))) + +(define-public ghc-semigroupoids + (package + (name "ghc-semigroupoids") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/semigroupoids/semigroupoids-" + version + ".tar.gz")) + (sha256 + (base32 + "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("4" "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"))) + (inputs + `(("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-comonad" ,ghc-comonad) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-distributive" ,ghc-distributive) + ("ghc-hashable" ,ghc-hashable) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest))) + (home-page "https://github.com/ekmett/semigroupoids") + (synopsis "Semigroupoids operations for Haskell") + (description "This library provides a wide array of (semi)groupoids and +operations for working with them. A @code{Semigroupoid} is a @code{Category} +without the requirement of identity arrows for every object in the category. +A @code{Category} is any @code{Semigroupoid} for which the Yoneda lemma holds. +Finally, to work with these weaker structures it is beneficial to have +containers that can provide stronger guarantees about their contents, so +versions of @code{Traversable} and @code{Foldable} that can be folded with +just a @code{Semigroup} are added.") + (license license:bsd-3))) + +(define-public ghc-semigroups + (package + (name "ghc-semigroups") + (version "0.18.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/semigroups/semigroups-" + version + ".tar.gz")) + (sha256 + (base32 + "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb")))) + (build-system haskell-build-system) + (inputs + `(("ghc-nats" ,ghc-nats) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-hashable" ,ghc-hashable))) + (home-page "https://github.com/ekmett/semigroups/") + (synopsis "Semigroup operations for Haskell") + (description "This package provides semigroups for Haskell. In +mathematics, a semigroup is an algebraic structure consisting of a set +together with an associative binary operation. A semigroup generalizes a +monoid in that there might not exist an identity element. It +also (originally) generalized a group (a monoid with all inverses) to a type +where every element did not have to have an inverse, thus the name +semigroup.") + (license license:bsd-3))) + +(define-public ghc-semigroups-bootstrap + (package + (inherit ghc-semigroups) + (name "ghc-semigroups-bootstrap") + (inputs + `(("ghc-nats" ,ghc-nats-bootstrap) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) + ("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '(hidden? #t)))) + +(define-public ghc-setenv + (package + (name "ghc-setenv") + (version "0.1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/setenv/setenv-" + version + ".tar.gz")) + (sha256 + (base32 + "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/setenv") + (synopsis "Library for setting environment variables") + (description "This package provides a Haskell library for setting +environment variables.") + (license license:expat))) + +(define-public ghc-setlocale + (package + (name "ghc-setlocale") + (version "1.0.0.8") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/setlocale-" + version "/setlocale-" version ".tar.gz")) + (sha256 + (base32 + "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/setlocale") + (synopsis "Haskell bindings to setlocale") + (description "This package provides Haskell bindings to the +@code{setlocale} C function.") + (license license:bsd-3))) + +(define-public ghc-shakespeare + (package + (name "ghc-shakespeare") + (version "2.0.15") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "shakespeare-" version "/" + "shakespeare-" version ".tar.gz")) + (sha256 + (base32 + "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23")))) + (build-system haskell-build-system) + (inputs `(("ghc-aeson" ,ghc-aeson) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-vector" ,ghc-vector) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-scientific" ,ghc-scientific))) + (native-inputs `(("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit) + ("hspec-discover" ,hspec-discover))) + (home-page "https://www.yesodweb.com/book/shakespearean-templates") + (synopsis "Family of type-safe template languages for Haskell") + (description "This Haskell package provides a family of type-safe +templates with simple variable interpolation. Shakespeare templates can +be used inline with a quasi-quoter or in an external file and it +interpolates variables according to the type being inserted.") + (license license:expat))) + +(define-public ghc-shelly + (package + (name "ghc-shelly") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/shelly/shelly-" + version ".tar.gz")) + (sha256 + (base32 + "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y")))) + (build-system haskell-build-system) + (inputs + `(("ghc-unix-compat" ,ghc-unix-compat) + ("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) + ("ghc-system-fileio-bootstrap" ,ghc-system-fileio-bootstrap) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-lifted-async" ,ghc-lifted-async) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) + ("ghc-async" ,ghc-async) + ("ghc-transformers-base" ,ghc-transformers-base) + ("ghc-hunit" ,ghc-hunit) + ("ghc-hspec" ,ghc-hspec) + ("ghc-hspec-contrib" ,ghc-hspec-contrib))) + (home-page "https://github.com/yesodweb/Shelly.hs") + (synopsis "Shell-like (systems) programming in Haskell") + (description + "Shelly provides convenient systems programming in Haskell, similar in +spirit to POSIX shells. Shelly is originally forked from the Shellish package.") + (license license:bsd-3))) + +(define-public ghc-silently + (package + (name "ghc-silently") + (version "1.2.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/silently/silently-" + version + ".tar.gz")) + (sha256 + (base32 + "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ;; circular dependency with nanospec + ;; (inputs + ;; `(("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/hspec/silently") + (synopsis "Prevent writing to stdout") + (description "This package provides functions to prevent or capture +writing to stdout and other handles.") + (license license:bsd-3))) + +(define-public ghc-simple-reflect + (package + (name "ghc-simple-reflect") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/simple-reflect/simple-reflect-" + version + ".tar.gz")) + (sha256 + (base32 + "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7")))) + (build-system haskell-build-system) + (home-page + "https://twanvl.nl/blog/haskell/simple-reflection-of-expressions") + (synopsis + "Simple reflection of expressions containing variables") + (description + "This package allows simple reflection of expressions containing +variables. Reflection here means that a Haskell expression is turned into a +string. The primary aim of this package is teaching and understanding; there +are no options for manipulating the reflected expressions beyond showing +them.") + (license license:bsd-3))) + +(define-public ghc-simple-sendfile + (package + (name "ghc-simple-sendfile") + (version "0.2.27") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "simple-sendfile-" version "/" + "simple-sendfile-" version ".tar.gz")) + (sha256 + (base32 + "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-network" ,ghc-network) + ("ghc-resourcet" ,ghc-resourcet))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://github.com/kazu-yamamoto/simple-sendfile") + (synopsis "Cross platform library for the sendfile system call") + (description "This library tries to call minimum system calls which +are the bottleneck of web servers.") + (license license:bsd-3))) + +(define-public ghc-skylighting-core + (package + (name "ghc-skylighting-core") + (version "0.7.2") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "skylighting-core/skylighting-core-" + version ".tar.gz")) + (sha256 + (base32 + "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-colour" ,ghc-colour) + ("ghc-hxt" ,ghc-hxt) + ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) + ("ghc-safe" ,ghc-safe) + ("ghc-utf8-string" ,ghc-utf8-string))) + (native-inputs + `(("ghc-diff" ,ghc-diff) + ("ghc-hunit" ,ghc-hunit) + ("ghc-pretty-show" ,ghc-pretty-show) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/jgm/skylighting") + (synopsis "Syntax highlighting library") + (description "Skylighting is a syntax highlighting library with support +for over one hundred languages. It derives its tokenizers from XML syntax +definitions used by KDE's @code{KSyntaxHighlighting} framework, so any syntax +supported by that framework can be added. An optional command-line program is +provided. Skylighting is intended to be the successor to highlighting-kate.") + (license license:gpl2))) + +(define-public ghc-skylighting + (package + (inherit ghc-skylighting-core) + (name "ghc-skylighting") + (version "0.7.2") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/skylighting-" + version "/skylighting-" version ".tar.gz")) + (sha256 + (base32 + "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch")))) + (inputs + `(("ghc-skylighting-core" ,ghc-skylighting-core) + ,@(package-inputs ghc-skylighting-core))))) + +(define-public ghc-smallcheck + (package + (name "ghc-smallcheck") + (version "1.1.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/smallcheck/smallcheck-" + version + ".tar.gz")) + (sha256 + (base32 + "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h")))) + (build-system haskell-build-system) + (inputs + `(("ghc-logict" ,ghc-logict))) + (home-page + "https://github.com/feuerbach/smallcheck") + (synopsis "Property-based testing library") + (description "SmallCheck is a testing library that allows to verify +properties for all test cases up to some depth. The test cases are generated +automatically by SmallCheck.") + (license license:bsd-3))) + +(define-public ghc-socks + (package + (name "ghc-socks") + (version "0.5.6") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "socks/socks-" version ".tar.gz")) + (sha256 + (base32 + "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs")))) + (build-system haskell-build-system) + (inputs + `(("ghc-cereal" ,ghc-cereal) + ("ghc-network" ,ghc-network))) + (home-page "https://github.com/vincenthz/hs-socks") + (synopsis "SOCKS proxy (version 5) implementation") + (description + "This library provides a SOCKS proxy (version 5) implementation.") + (license license:bsd-3))) + +(define-public ghc-split + (package + (name "ghc-split") + (version "0.2.3.3") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/split/split-" + version + ".tar.gz")) + (sha256 + (base32 + "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://hackage.haskell.org/package/split") + (synopsis "Combinator library for splitting lists") + (description "This package provides a collection of Haskell functions for +splitting lists into parts, akin to the @code{split} function found in several +mainstream languages.") + (license license:bsd-3))) + +(define-public ghc-statevar + (package + (name "ghc-statevar") + (version "1.1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/StateVar/StateVar-" + version + ".tar.gz")) + (sha256 + (base32 + "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/StateVar") + (synopsis "State variables for Haskell") + (description "This package provides state variables, which are references +in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") + (license license:bsd-3))) + +(define-public ghc-statistics + (package + (name "ghc-statistics") + (version "0.14.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "statistics-" version "/" + "statistics-" version ".tar.gz")) + (sha256 + (base32 + "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l")))) + (build-system haskell-build-system) + (arguments + '(#:cabal-revision + ("2" "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3") + ;; Two tests fail: "Discrete CDF is OK" and "Quantile is CDF inverse". + #:tests? #f)) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-base-orphans" ,ghc-base-orphans) + ("ghc-erf" ,ghc-erf) + ("ghc-math-functions" ,ghc-math-functions) + ("ghc-monad-par" ,ghc-monad-par) + ("ghc-mwc-random" ,ghc-mwc-random) + ("ghc-primitive" ,ghc-primitive) + ("ghc-vector" ,ghc-vector) + ("ghc-vector-algorithms" ,ghc-vector-algorithms) + ("ghc-vector-th-unbox" ,ghc-vector-th-unbox) + ("ghc-vector-binary-instances" ,ghc-vector-binary-instances))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-ieee754" ,ghc-ieee754) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/bos/mwc-random") + (synopsis "Haskell library of statistical types, data, and functions") + (description "This library provides a number of common functions +and types useful in statistics. We focus on high performance, numerical +robustness, and use of good algorithms. Where possible, we provide references +to the statistical literature. + +The library's facilities can be divided into four broad categories: + +@itemize +@item Working with widely used discrete and continuous probability +distributions. (There are dozens of exotic distributions in use; we focus +on the most common.) + +@item Computing with sample data: quantile estimation, kernel density +estimation, histograms, bootstrap methods, significance testing, +and regression and autocorrelation analysis. + +@item Random variate generation under several different distributions. + +@item Common statistical tests for significant differences between samples. +@end itemize") + (license license:bsd-2))) + +(define-public ghc-stm-chans + (package + (name "ghc-stm-chans") + (version "3.0.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "stm-chans-" version "/" + "stm-chans-" version ".tar.gz")) + (sha256 + (base32 + "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/stm-chans") + (synopsis "Additional types of channels for ghc-stm") + (description "This Haskell package offers a collection of channel types, +similar to @code{Control.Concurrent.STM.@{TChan,TQueue@}} but with additional +features.") + (license license:bsd-3))) + +(define-public ghc-stm-conduit + (package + (name "ghc-stm-conduit") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/stm-conduit/" + "stm-conduit-" version ".tar.gz")) + (sha256 + (base32 + "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z")))) + (build-system haskell-build-system) + (inputs + `(("ghc-stm-chans" ,ghc-stm-chans) + ("ghc-cereal" ,ghc-cereal) + ("ghc-cereal-conduit" ,ghc-cereal-conduit) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-async" ,ghc-async) + ("ghc-monad-loops" ,ghc-monad-loops) + ("ghc-unliftio" ,ghc-unliftio))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) + (home-page "https://github.com/cgaebel/stm-conduit") + (synopsis "Introduces conduits to channels and promotes using conduits concurrently") + (description + "This package provides two simple conduit wrappers around STM channels: a +source and a sink.") + (license license:bsd-3))) + +(define-public ghc-stmonadtrans + (package + (name "ghc-stmonadtrans") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/STMonadTrans" + "/STMonadTrans-" version ".tar.gz")) + (sha256 + (base32 "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/STMonadTrans") + (synopsis "Monad transformer version of the ST monad") + (description + "This package provides a monad transformer version of the @code{ST} monad +for strict state threads.") + (license license:bsd-3))) + +(define-public ghc-storable-complex + (package + (name "ghc-storable-complex") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/storable-complex/storable-complex-" + version ".tar.gz")) + (sha256 + (base32 "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb")))) + (build-system haskell-build-system) + (home-page "https://github.com/cartazio/storable-complex") + (synopsis "Haskell Storable instance for Complex") + (description "This package provides a Haskell library including a +Storable instance for Complex which is binary compatible with C99, C++ +and Fortran complex data types.") + (license license:bsd-3))) + +(define-public ghc-streaming-commons + (package + (name "ghc-streaming-commons") + (version "0.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "streaming-commons/streaming-commons-" + version ".tar.gz")) + (sha256 + (base32 + "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-network" ,ghc-network) + ("ghc-random" ,ghc-random) + ("ghc-zlib" ,ghc-zlib))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/streaming-commons") + (synopsis "Conduit and pipes needed by some streaming data libraries") + (description "This package provides low-dependency functionality commonly +needed by various Haskell streaming data libraries, such as @code{conduit} and +@code{pipe}s.") + (license license:expat))) + +(define-public ghc-strict + (package + (name "ghc-strict") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/strict/strict-" + version ".tar.gz")) + (sha256 + (base32 "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/strict") + (synopsis "Strict data types and String IO") + (description + "This package provides strict versions of some standard Haskell data +types, such as pairs, @code{Maybe} and @code{Either}. It also contains strict +IO operations.") + (license license:bsd-3))) + +(define-public ghc-stringbuilder + (package + (name "ghc-stringbuilder") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/stringbuilder/stringbuilder-" + version + ".tar.gz")) + (sha256 + (base32 + "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: circular dependencies with tests + ; enabled + (home-page "https://hackage.haskell.org/package/stringbuilder") + (synopsis "Writer monad for multi-line string literals") + (description "This package provides a writer monad for multi-line string +literals.") + (license license:expat))) + +(define-public ghc-string-qq + (package + (name "ghc-string-qq") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/string-qq/string-qq-" + version + ".tar.gz")) + (sha256 + (base32 + "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/string-qq") + (synopsis + "QuasiQuoter for non-interpolated strings, texts and bytestrings.") + (description + "This package provides a quasiquoter for non-interpolated strings, texts +and bytestrings.") + (license license:public-domain))) + +(define-public ghc-stringsearch + (package + (name "ghc-stringsearch") + (version "0.3.6.6") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/stringsearch/stringsearch-" + version + ".tar.gz")) + (sha256 + (base32 + "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9")))) + (build-system haskell-build-system) + (home-page "https://bitbucket.org/dafis/stringsearch") + (synopsis "Fast searching, splitting and replacing of ByteStrings") + (description "This package provides several functions to quickly search +for substrings in strict or lazy @code{ByteStrings}. It also provides +functions for breaking or splitting on substrings and replacing all +occurrences of a substring (the first in case of overlaps) with another.") + (license license:bsd-3))) + +(define-public ghc-stylish-haskell + (package + (name "ghc-stylish-haskell") + (version "0.9.2.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/stylish-haskell/stylish-haskell-" + version + ".tar.gz")) + (sha256 + (base32 + "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-file-embed" ,ghc-file-embed) + ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-syb" ,ghc-syb) + ("ghc-yaml" ,ghc-yaml) + ("ghc-strict" ,ghc-strict) + ("ghc-optparse-applicative" + ,ghc-optparse-applicative))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/jaspervdj/stylish-haskell") + (synopsis "Haskell code prettifier") + (description "Stylish-haskell is a Haskell code prettifier. The goal is +not to format all of the code in a file, to avoid \"getting in the way\". +However, this tool can e.g. clean up import statements and help doing various +tasks that get tedious very quickly. It can +@itemize +@item +Align and sort @code{import} statements +@item +Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant +pragmas +@item +Remove trailing whitespaces +@item +Align branches in @code{case} and fields in records +@item +Convert line endings (customisable) +@item +Replace tabs by four spaces (turned off by default) +@item +Replace some ASCII sequences by their Unicode equivalent (turned off by +default) +@end itemize") + (license license:bsd-3))) + +(define-public ghc-syb + (package + (name "ghc-syb") + (version "0.7") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/syb/syb-" + version + ".tar.gz")) + (sha256 + (base32 + "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-hunit" ,ghc-hunit))) + (home-page + "http://www.cs.uu.nl/wiki/GenericProgramming/SYB") + (synopsis "Scrap Your Boilerplate") + (description "This package contains the generics system described in the +/Scrap Your Boilerplate/ papers (see +@uref{http://www.cs.uu.nl/wiki/GenericProgramming/SYB, the website}). It +defines the @code{Data} class of types permitting folding and unfolding of +constructor applications, instances of this class for primitive types, and a +variety of traversals.") + (license license:bsd-3))) + +(define-public ghc-system-fileio + (package + (name "ghc-system-fileio") + (version "0.3.16.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/system-fileio/system-fileio-" + version ".tar.gz")) + (sha256 + (base32 + "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i")))) + (build-system haskell-build-system) + (inputs + `(("ghc-system-filepath" ,ghc-system-filepath) + ("ghc-chell" ,ghc-chell) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/fpco/haskell-filesystem") + (synopsis "Consistent file system interaction across GHC versions") + (description + "This is a small wrapper around the directory, unix, and Win32 packages, +for use with system-filepath. It provides a consistent API to the various +versions of these packages distributed with different versions of GHC. +In particular, this library supports working with POSIX files that have paths +which can't be decoded in the current locale encoding.") + (license license:expat))) + +;; See ghc-system-filepath-bootstrap. In addition this package depends on +;; ghc-system-filepath. +(define ghc-system-fileio-bootstrap + (package + (name "ghc-system-fileio-bootstrap") + (version "0.3.16.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/system-fileio/system-fileio-" + version ".tar.gz")) + (sha256 + (base32 + "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i")))) + (build-system haskell-build-system) + (arguments + `(#:tests? #f)) + (inputs + `(("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/fpco/haskell-filesystem") + (synopsis "Consistent file system interaction across GHC versions") + (description + "This is a small wrapper around the directory, unix, and Win32 packages, +for use with system-filepath. It provides a consistent API to the various +versions of these packages distributed with different versions of GHC. +In particular, this library supports working with POSIX files that have paths +which can't be decoded in the current locale encoding.") + (license license:expat))) + + +(define-public ghc-system-filepath + (package + (name "ghc-system-filepath") + (version "0.4.14") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/system-filepath/system-filepath-" + version ".tar.gz")) + (sha256 + (base32 + "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) + (build-system haskell-build-system) + ;; FIXME: One of the tests fails: + ;; [ FAIL ] tests.validity.posix + ;; note: seed=7310214548328823169 + ;; *** Failed! Falsifiable (after 24 tests): + ;; FilePath "/r2\ENQ52\t ;$/o\US=/okG\146\&6\n=1\\.7\\.1\\.1 && <1\\.8") + "trifecta >=1.7.1.1 && <=2"))))))) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-generics-sop" ,ghc-generics-sop) + ("ghc-hashable" ,ghc-hashable) + ("ghc-memotrie" ,ghc-memotrie) + ("ghc-parsers" ,ghc-parsers) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tagged" ,ghc-tagged) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uuid-types" ,ghc-uuid-types) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-base-compat" ,ghc-base-compat) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-trifecta" ,ghc-trifecta) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/phadej/tree-diff") + (synopsis "Compute difference between (expression) trees") + (description "This Haskell library provides a function for computing +the difference between (expression) trees. It also provides a way to +compute the difference between arbitrary abstract datatypes (ADTs) using +@code{Generics}-derivable helpers.") + (license license:bsd-3))) + +(define-public ghc-trifecta + (package + (name "ghc-trifecta") + (version "2") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/trifecta/" + "trifecta-" version ".tar.gz")) + (sha256 + (base32 + "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; doctest suite fails to build on i686 + (inputs + `(("ghc-reducers" ,ghc-reducers) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-charset" ,ghc-charset) + ("ghc-comonad" ,ghc-comonad) + ("ghc-fingertree" ,ghc-fingertree) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lens" ,ghc-lens) + ("ghc-parsers" ,ghc-parsers) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-utf8-string" ,ghc-utf8-string))) + (native-inputs + `(("cabal-doctest" ,cabal-doctest) + ("ghc-doctest" ,ghc-doctest) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/ekmett/trifecta/") + (synopsis "Parser combinator library with convenient diagnostics") + (description "Trifecta is a modern parser combinator library for Haskell, +with slicing and Clang-style colored diagnostics.") + (license license:bsd-3))) + +(define-public ghc-tuple-th + (package + (name "ghc-tuple-th") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "tuple-th-" version "/" + "tuple-th-" version ".tar.gz")) + (sha256 + (base32 + "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn")))) + (build-system haskell-build-system) + (home-page "https://github.com/DanielSchuessler/tuple-th") + (synopsis "Generate utility functions for tuples of statically known size +for Haskell") + (description "This Haskell package contains Template Haskell functions for +generating functions similar to those in @code{Data.List} for tuples of +statically known size.") + (license license:bsd-3))) + +(define-public ghc-typed-process + (package + (name "ghc-typed-process") + (version "0.2.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "typed-process/typed-process-" + version ".tar.gz")) + (sha256 + (base32 + "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) + (build-system haskell-build-system) + (inputs + `(("ghc-async" ,ghc-async))) + (native-inputs + `(("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://haskell-lang.org/library/typed-process") + (synopsis "Run external processes with strong typing of streams") + (description + "This library provides the ability to launch and interact with external +processes. It wraps around the @code{process} library, and intends to improve +upon it.") + (license license:expat))) + +(define-public ghc-unbounded-delays + (package + (name "ghc-unbounded-delays") + (version "0.1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/unbounded-delays/unbounded-delays-" + version + ".tar.gz")) + (sha256 + (base32 + "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa")))) + (build-system haskell-build-system) + (home-page "https://github.com/basvandijk/unbounded-delays") + (synopsis "Unbounded thread delays and timeouts") + (description "The @code{threadDelay} and @code{timeout} functions from the +Haskell base library use the bounded @code{Int} type for specifying the delay +or timeout period. This package provides alternative functions which use the +unbounded @code{Integer} type.") + (license license:bsd-3))) + +(define-public ghc-unexceptionalio + (package + (name "ghc-unexceptionalio") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "unexceptionalio-" version "/" "unexceptionalio-" + version ".tar.gz")) + (sha256 (base32 "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p")))) + (build-system haskell-build-system) + (home-page "https://github.com/singpolyma/unexceptionalio") + (synopsis "IO without any non-error, synchronous exceptions") + (description "When you've caught all the exceptions that can be +handled safely, this is what you're left with.") + (license license:isc))) + +(define-public ghc-union-find + (package + (name "ghc-union-find") + (version "0.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/union-find/union-find-" + version ".tar.gz")) + (sha256 + (base32 + "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6")))) + (build-system haskell-build-system) + (home-page "https://github.com/nominolo/union-find") + (synopsis "Efficient union and equivalence testing of sets") + (description + "The Union/Find algorithm implements these operations in (effectively) +constant-time: +@enumerate +@item Check whether two elements are in the same equivalence class. +@item Create a union of two equivalence classes. +@item Look up the descriptor of the equivalence class. +@end enumerate\n") + (license license:bsd-3))) + +(define-public ghc-uniplate + (package + (name "ghc-uniplate") + (version "1.6.12") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/uniplate/uniplate-" + version + ".tar.gz")) + (sha256 + (base32 + "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw")))) + (build-system haskell-build-system) + (inputs + `(("ghc-syb" ,ghc-syb) + ("ghc-hashable" ,ghc-hashable) + ("ghc-unordered-containers" ,ghc-unordered-containers))) + (home-page "http://community.haskell.org/~ndm/uniplate/") + (synopsis "Simple, concise and fast generic operations") + (description "Uniplate is a library for writing simple and concise generic +operations. Uniplate has similar goals to the original Scrap Your Boilerplate +work, but is substantially simpler and faster.") + (license license:bsd-3))) + +(define-public ghc-unix-compat + (package + (name "ghc-unix-compat") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/unix-compat/unix-compat-" + version + ".tar.gz")) + (sha256 + (base32 + "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3")))) + (build-system haskell-build-system) + (home-page + "https://github.com/jystic/unix-compat") + (synopsis "Portable POSIX-compatibility layer") + (description + "This package provides portable implementations of parts of the unix +package. This package re-exports the unix package when available. When it +isn't available, portable implementations are used.") + (license license:bsd-3))) + +(define-public ghc-unix-time + (package + (name "ghc-unix-time") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/unix-time/unix-time-" + version + ".tar.gz")) + (sha256 + (base32 + "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw")))) + (build-system haskell-build-system) + (arguments + `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This + ; is weird, that should be provided by GHC 7.10.2. + (inputs + `(("ghc-old-time" ,ghc-old-time) + ("ghc-old-locale" ,ghc-old-locale))) + (home-page "https://hackage.haskell.org/package/unix-time") + (synopsis "Unix time parser/formatter and utilities") + (description "This library provides fast parsing and formatting utilities +for Unix time in Haskell.") + (license license:bsd-3))) + +(define-public ghc-unliftio + (package + (name "ghc-unliftio") + (version "0.2.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/unliftio/unliftio-" + version + ".tar.gz")) + (sha256 + (base32 + "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH + (inputs + `(("ghc-async" ,ghc-async) + ("ghc-unliftio-core" ,ghc-unliftio-core))) + (native-inputs `(("ghc-hspec" ,ghc-hspec))) + (home-page "https://github.com/fpco/unliftio") + (synopsis "Provides MonadUnliftIO typecplass for unlifting monads to +IO (batteries included)") + (description "This Haskell package provides the core @code{MonadUnliftIO} +typeclass, a number of common instances, and a collection of common functions +working with it.") + (license license:expat))) + +(define-public ghc-unliftio-core + (package + (name "ghc-unliftio-core") + (version "0.1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "unliftio-core-" version "/" + "unliftio-core-" version ".tar.gz")) + (sha256 + (base32 + "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"))) + (home-page + "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme") + (synopsis "The MonadUnliftIO typeclass for unlifting monads to IO") + (description "This Haskell package provides the core @code{MonadUnliftIO} +typeclass, instances for base and transformers, and basic utility +functions.") + (license license:expat))) + +(define-public ghc-unordered-containers + (package + (name "ghc-unordered-containers") + (version "0.2.9.0") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/unordered-containers" + "/unordered-containers-" version ".tar.gz")) + (sha256 + (base32 + "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37")))) + (build-system haskell-build-system) + (inputs + `(("ghc-chasingbottoms" ,ghc-chasingbottoms) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + ("ghc-hashable" ,ghc-hashable))) + (home-page + "https://github.com/tibbe/unordered-containers") + (synopsis + "Efficient hashing-based container types") + (description + "Efficient hashing-based container types. The containers have been +optimized for performance critical use, both in terms of large data quantities +and high speed.") + (license license:bsd-3))) + +(define-public ghc-unordered-containers-bootstrap + (package + (inherit ghc-unordered-containers) + (name "ghc-unordered-containers-bootstrap") + (arguments `(#:tests? #f)) + (inputs + `(("ghc-hashable" ,ghc-hashable-bootstrap))) + (properties '(hidden? #t)))) + +(define-public ghc-uri-bytestring + (package + (name "ghc-uri-bytestring") + (version "0.3.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "uri-bytestring-" version "/" + "uri-bytestring-" version ".tar.gz")) + (sha256 + (base32 + "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c")))) + (build-system haskell-build-system) + (inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-fail" ,ghc-fail) + ("ghc-blaze-builder" ,ghc-blaze-builder) + ("ghc-th-lift-instances" ,ghc-th-lift-instances))) + (native-inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-base-compat" ,ghc-base-compat) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-generics-sop" ,ghc-generics-sop))) + (home-page "https://github.com/Soostone/uri-bytestring") + (synopsis "Haskell URI parsing as ByteStrings") + (description "This Haskell package aims to be an RFC3986 compliant URI +parser that uses ByteStrings for parsing and representing the URI data.") + (license license:bsd-3))) + +(define-public ghc-utf8-string + (package + (name "ghc-utf8-string") + (version "1.0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/utf8-string/utf8-string-" + version + ".tar.gz")) + (sha256 + (base32 "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("3" "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38"))) + (home-page "https://github.com/glguy/utf8-string/") + (synopsis "Support for reading and writing UTF8 Strings") + (description + "A UTF8 layer for Strings. The utf8-string package provides operations +for encoding UTF8 strings to Word8 lists and back, and for reading and writing +UTF8 without truncation.") + (license license:bsd-3))) + +(define-public ghc-utility-ht + (package + (name "ghc-utility-ht") + (version "0.0.14") + (home-page "https://hackage.haskell.org/package/utility-ht") + (source + (origin + (method url-fetch) + (uri (string-append home-page "/utility-ht-" version ".tar.gz")) + (sha256 + (base32 "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9")))) + (build-system haskell-build-system) + (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (synopsis "Haskell helper functions for Lists, Maybes, Tuples, Functions") + (description "This package includes Hakell modules providing various +helper functions for Lists, Maybes, Tuples, Functions.") + (license license:bsd-3))) + +(define-public ghc-uuid + (package + (name "ghc-uuid") + (version "1.3.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "uuid-" version "/" + "uuid-" version ".tar.gz")) + (sha256 + (base32 + "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("2" "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "uuid.cabal" + (("HUnit >= 1\\.2 && < 1\\.4") "HUnit") + (("QuickCheck >= 2\\.4 && < 2\\.10") "QuickCheck") + (("tasty >= 0\\.10 && < 0\\.12") "tasty") + (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) + (inputs `(("ghc-cryptohash-sha1" ,ghc-cryptohash-sha1) + ("ghc-cryptohash-md5" ,ghc-cryptohash-md5) + ("ghc-entropy" ,ghc-entropy) + ("ghc-network-info" ,ghc-network-info) + ("ghc-random" ,ghc-random) + ("ghc-uuid-types" ,ghc-uuid-types))) + (native-inputs `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/hvr/uuid") + (synopsis "Haskell library to create, compare, parse, and print UUIDs") + (description "This Haskell library provides utilities creating, comparing, +parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") + (license license:bsd-3))) + +(define-public ghc-uuid-types + (package + (name "ghc-uuid-types") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "uuid-types-" version "/" + "uuid-types-" version ".tar.gz")) + (sha256 + (base32 + "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "uuid-types.cabal" + (("HUnit >=1\\.2 && < 1\\.4") "HUnit") + (("QuickCheck >=2\\.4 && < 2\\.9") "QuickCheck") + (("tasty >= 0\\.10 && < 0\\.12") "tasty") + (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) + (inputs `(("ghc-hashable" ,ghc-hashable) + ("ghc-random" ,ghc-random))) + (native-inputs `(("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/hvr/uuid") + (synopsis "Haskell type definitions for UUIDs") + (description "This Haskell library contains type definitions for +@dfn{Universally Unique Identifiers} or +@uref{https://en.wikipedia.org/wiki/UUID, UUIDs}, and basic conversion +functions.") + (license license:bsd-3))) + +(define-public ghc-validation + (package + (name "ghc-validation") + (version "1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/validation/validation-" + version + ".tar.gz")) + (sha256 + (base32 + "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3"))) + (inputs + `(("ghc-semigroups" ,ghc-semigroups) + ("ghc-semigroupoids" ,ghc-semigroupoids) + ("ghc-bifunctors" ,ghc-bifunctors) + ("ghc-lens" ,ghc-lens))) + (native-inputs + `(("ghc-hedgehog" ,ghc-hedgehog) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/qfpl/validation") + (synopsis + "Data-type like Either but with an accumulating Applicative") + (description + "A data-type like Either but with differing properties and type-class +instances. + +Library support is provided for this different representation, including +@code{lens}-related functions for converting between each and abstracting over +their similarities. + +The @code{Validation} data type is isomorphic to @code{Either}, but has an +instance of @code{Applicative} that accumulates on the error side. That is to +say, if two (or more) errors are encountered, they are appended using a +@{Semigroup} operation. + +As a consequence of this @code{Applicative} instance, there is no +corresponding @code{Bind} or @code{Monad} instance. @code{Validation} is an +example of, \"An applicative functor that is not a monad.\"") + (license license:bsd-3))) + +(define-public ghc-validity + (package + (name "ghc-validity") + (version "0.7.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/validity/validity-" + version + ".tar.gz")) + (sha256 + (base32 + "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f")))) + (build-system haskell-build-system) + (native-inputs `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page + "https://github.com/NorfairKing/validity") + (synopsis "Validity typeclass") + (description + "Values of custom types usually have invariants imposed upon them. This +package provides the @code{Validity} type class, which makes these invariants +explicit by providing a function to check whether the invariants hold.") + (license license:expat))) + +(define-public ghc-vault + (package + (name "ghc-vault") + (version "0.3.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/vault/vault-" + version + ".tar.gz")) + (sha256 + (base32 + "072mbrihsdsb8c6xvg6lvk0rqjgvxvi8qkg4n6wwym5hq0pfa04y")))) + (build-system haskell-build-system) + (inputs + `(("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-hashable" ,ghc-hashable) + ("ghc-semigroupoids" ,ghc-semigroupoids))) + (home-page + "https://github.com/HeinrichApfelmus/vault") + (synopsis "Persistent store for arbitrary values") + (description "This package provides vaults for Haskell. A vault is a +persistent store for values of arbitrary types. It's like having first-class +access to the storage space behind @code{IORefs}. The data structure is +analogous to a bank vault, where you can access different bank boxes with +different keys; hence the name. Also provided is a @code{locker} type, +representing a store for a single element.") + (license license:bsd-3))) + +(define-public ghc-vector + (package + (name "ghc-vector") + (version "0.12.0.1") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/vector/vector-" + version + ".tar.gz")) + (sha256 + (base32 + "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i")))) + (build-system haskell-build-system) + ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests + ;; disabled for now. + (arguments + `(#:cabal-revision + ("3" "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x") + #:tests? #f)) + (inputs + `(("ghc-primitive" ,ghc-primitive) + ("ghc-random" ,ghc-random) + ("ghc-quickcheck" ,ghc-quickcheck) + ;; ("ghc-hunit" ,ghc-hunit) + ;; ("ghc-test-framework" ,ghc-test-framework) + ;; ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) + ;; ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) + )) + (home-page "https://github.com/haskell/vector") + (synopsis "Efficient Arrays") + (description "This library provides an efficient implementation of +Int-indexed arrays (both mutable and immutable), with a powerful loop +optimisation framework.") + (license license:bsd-3))) + +(define-public ghc-vector-algorithms + (package + (name "ghc-vector-algorithms") + (version "0.7.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "vector-algorithms-" version "/" + "vector-algorithms-" version ".tar.gz")) + (sha256 + (base32 + "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://github.com/bos/math-functions") + (synopsis "Algorithms for vector arrays in Haskell") + (description "This Haskell library algorithms for vector arrays.") + (license license:bsd-3))) + +(define-public ghc-vector-binary-instances + (package + (name "ghc-vector-binary-instances") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/" + "vector-binary-instances/vector-binary-instances-" + version ".tar.gz")) + (sha256 + (base32 + "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"))) + (inputs + `(("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/bos/vector-binary-instances") + (synopsis "Instances of Data.Binary and Data.Serialize for vector") + (description "This library provides instances of @code{Binary} for the +types defined in the @code{vector} package, making it easy to serialize +vectors to and from disk. We use the generic interface to vectors, so all +vector types are supported. Specific instances are provided for unboxed, +boxed and storable vectors.") + (license license:bsd-3))) + +(define-public ghc-vector-builder + (package + (name "ghc-vector-builder") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "vector-builder-" version "/" + "vector-builder-" version ".tar.gz")) + (sha256 + (base32 + "06d2pa1fb3ydrl7l6rjazqyxv5i73v65x2f5fp0ypjxfbm6jsmn8")))) + (build-system haskell-build-system) + (inputs `(("ghc-vector" ,ghc-vector) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-base-prelude" ,ghc-base-prelude))) + (native-inputs `(("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-rerebase" ,ghc-rerebase))) + (home-page "https://github.com/nikita-volkov/vector-builder") + (synopsis "Vector builder for Haskell") + (description "This Haskell package provides an API for constructing vectors. +It provides the composable @code{Builder} abstraction, which has instances of the +@code{Monoid} and @code{Semigroup} classes. + +You would first use the @code{Builder} abstraction to specify the structure of +the vector; then you can execute the builder to actually produce the +vector. ") + (license license:expat))) + +(define-public ghc-vector-th-unbox + (package + (name "ghc-vector-th-unbox") + (version "0.2.1.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "vector-th-unbox-" version "/" + "vector-th-unbox-" version ".tar.gz")) + (sha256 + (base32 + "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector) + ("ghc-data-default" ,ghc-data-default))) + (home-page "https://github.com/liyang/vector-th-unbox") + (synopsis "Deriver for Data.Vector.Unboxed using Template Haskell") + (description "This Haskell library provides a Template Haskell +deriver for unboxed vectors, given a pair of coercion functions to +and from some existing type with an Unbox instance.") + (license license:bsd-3))) + +(define-public ghc-void + (package + (name "ghc-void") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/void/void-" + version + ".tar.gz")) + (sha256 + (base32 + "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk")))) + (build-system haskell-build-system) + (inputs + `(("ghc-semigroups" ,ghc-semigroups) + ("ghc-hashable" ,ghc-hashable))) + (home-page "https://github.com/ekmett/void") + (synopsis + "Logically uninhabited data type") + (description + "A Haskell 98 logically uninhabited data type, used to indicate that a +given term should not exist.") + (license license:bsd-3))) + +(define-public ghc-wave + (package + (name "ghc-wave") + (version "0.1.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/wave/wave-" + version + ".tar.gz")) + (sha256 + (base32 + "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5")))) + (build-system haskell-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'update-constraints + (lambda _ + (substitute* "wave.cabal" + (("temporary.* < 1\\.3") + "temporary >= 1.1 && < 1.4"))))))) + (inputs + `(("ghc-cereal" ,ghc-cereal) + ("ghc-data-default-class" + ,ghc-data-default-class) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-temporary" ,ghc-temporary))) + (native-inputs + `(("hspec-discover" ,hspec-discover) + ("ghc-hspec" ,ghc-hspec))) + (home-page "https://github.com/mrkkrp/wave") + (synopsis "Work with WAVE and RF64 files in Haskell") + (description "This package allows you to work with WAVE and RF64 +files in Haskell.") + (license license:bsd-3))) + +(define-public ghc-wcwidth + (package + (name "ghc-wcwidth") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/wcwidth/wcwidth-" + version ".tar.gz")) + (sha256 + (base32 + "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz")))) + (build-system haskell-build-system) + (inputs + `(("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-attoparsec" ,ghc-attoparsec))) + (home-page "https://github.com/solidsnack/wcwidth/") + (synopsis "Haskell bindings to wcwidth") + (description "This package provides Haskell bindings to your system's +native wcwidth and a command line tool to examine the widths assigned by it. +The command line tool can compile a width table to Haskell code that assigns +widths to the Char type.") + (license license:bsd-3))) + +(define-public ghc-wcwidth-bootstrap + (package + (inherit ghc-wcwidth) + (name "ghc-wcwidth-bootstrap") + (inputs + `(("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-attoparsec" ,ghc-attoparsec-bootstrap))) + (properties '(hidden? #t)))) + +(define-public ghc-weigh + (package + (name "ghc-weigh") + (version "0.0.12") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/weigh/" + "weigh-" version ".tar.gz")) + (sha256 + (base32 + "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x")))) + (build-system haskell-build-system) + (inputs + `(("ghc-split" ,ghc-split) + ("ghc-temporary" ,ghc-temporary))) + (home-page "https://github.com/fpco/weigh#readme") + (synopsis "Measure allocations of a Haskell functions/values") + (description "This package provides tools to measure the memory usage of a +Haskell value or function.") + (license license:bsd-3))) + +(define-public ghc-wl-pprint + (package + (name "ghc-wl-pprint") + (version "1.2.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/wl-pprint/wl-pprint-" + version ".tar.gz")) + (sha256 + (base32 + "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/wl-pprint") + (synopsis "Wadler/Leijen pretty printer") + (description + "This is a pretty printing library based on Wadler's paper @i{A Prettier +Printer}. This version allows the library user to declare overlapping +instances of the @code{Pretty} class.") + (license license:bsd-3))) + +(define-public ghc-wl-pprint-annotated + (package + (name "ghc-wl-pprint-annotated") + (version "0.1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/wl-pprint-annotated/wl-pprint-annotated-" + version + ".tar.gz")) + (sha256 + (base32 + "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page + "https://github.com/minad/wl-pprint-annotated#readme") + (synopsis + "Wadler/Leijen pretty printer with annotation support") + (description + "Annotations are useful for coloring. This is a limited version of +@code{wl-pprint-extras} without support for point effects and without the free +monad. Like in @code{annotated-wl-pprint}, only annotations are supported. +Compared to @code{annotated-wl-pprint} this library provides a slightly +modernized interface.") + (license license:bsd-3))) + +(define-public ghc-wl-pprint-text + (package + (name "ghc-wl-pprint-text") + (version "1.2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/wl-pprint-text/wl-pprint-text-" + version ".tar.gz")) + (sha256 + (base32 + "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0")))) + (build-system haskell-build-system) + (inputs + `(("ghc-base-compat" ,ghc-base-compat))) + (home-page "https://hackage.haskell.org/package/wl-pprint-text") + (synopsis "Wadler/Leijen Pretty Printer for Text values") + (description + "A clone of wl-pprint for use with the text library.") + (license license:bsd-3))) + +(define-public ghc-word8 + (package + (name "ghc-word8") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/word8/word8-" + version + ".tar.gz")) + (sha256 + (base32 + "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("hspec-discover" ,hspec-discover))) + (home-page "https://hackage.haskell.org/package/word8") + (synopsis "Word8 library for Haskell") + (description "Word8 library to be used with @code{Data.ByteString}.") + (license license:bsd-3))) + +(define-public ghc-x11 + (package + (name "ghc-x11") + (version "1.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/X11/" + "X11-" version ".tar.gz")) + (sha256 + (base32 "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh")))) + (build-system haskell-build-system) + (inputs + `(("libx11" ,libx11) + ("libxrandr" ,libxrandr) + ("libxinerama" ,libxinerama) + ("libxscrnsaver" ,libxscrnsaver) + ("ghc-data-default" ,ghc-data-default))) + (home-page "https://github.com/haskell-pkg-janitors/X11") + (synopsis "Bindings to the X11 graphics library") + (description + "This package provides Haskell bindings to the X11 graphics library. The +bindings are a direct translation of the C bindings.") + (license license:bsd-3))) + +(define-public ghc-x11-xft + (package + (name "ghc-x11-xft") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/X11-xft/" + "X11-xft-" version ".tar.gz")) + (sha256 + (base32 "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf")))) + (inputs + `(("ghc-x11" ,ghc-x11) + ("ghc-utf8-string" ,ghc-utf8-string) + ("libx11" ,libx11) + ("libxft" ,libxft) + ("xorgproto" ,xorgproto))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/X11-xft") + (synopsis "Bindings to Xft") + (description + "Bindings to the Xft, X Free Type interface library, and some Xrender +parts.") + (license license:lgpl2.1))) + +(define-public ghc-xdg-basedir + (package + (name "ghc-xdg-basedir") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/xdg-basedir/" + "xdg-basedir-" version ".tar.gz")) + (sha256 + (base32 + "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4")))) + (build-system haskell-build-system) + (home-page "http://github.com/willdonnelly/xdg-basedir") + (synopsis "XDG Base Directory library for Haskell") + (description "This package provides a library implementing the XDG Base Directory spec.") + (license license:bsd-3))) + +(define-public ghc-xml + (package + (name "ghc-xml") + (version "1.3.14") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/xml/xml-" + version + ".tar.gz")) + (sha256 + (base32 + "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) + (build-system haskell-build-system) + (home-page "http://code.galois.com") + (synopsis "Simple XML library for Haskell") + (description "This package provides a simple XML library for Haskell.") + (license license:bsd-3))) + +(define-public ghc-xml-conduit + (package + (name "ghc-xml-conduit") + (version "1.8.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/xml-conduit/" + "xml-conduit-" version ".tar.gz")) + (sha256 + (base32 + "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-doctest" ,ghc-doctest) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-xml-types" ,ghc-xml-types) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit))) + (home-page "https://github.com/snoyberg/xml") + (synopsis "Utilities for dealing with XML with the conduit package") + (description + "This package provides pure-Haskell utilities for dealing with XML with +the @code{conduit} package.") + (license license:expat))) + +(define-public ghc-xml-types + (package + (name "ghc-xml-types") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/xml-types/" + "xml-types-" version ".tar.gz")) + (sha256 + (base32 + "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr")))) + (build-system haskell-build-system) + (home-page "https://john-millikin.com/software/haskell-xml/") + (synopsis "Basic types for representing XML") + (description "This package provides basic types for representing XML +documents.") + (license license:expat))) + +(define-public ghc-yaml + (package + (name "ghc-yaml") + (version "0.8.32") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "yaml/yaml-" version ".tar.gz")) + (sha256 + (base32 + "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w")))) + (build-system haskell-build-system) + ;; The tests are broken on i686. They are fixed in 0.10.3.0. + ;; See https://github.com/snoyberg/yaml/issues/158 + (arguments `(#:tests? #f)) + (inputs + `(("ghc-conduit" ,ghc-conduit) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-aeson" ,ghc-aeson) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-attoparsec" ,ghc-attoparsec) + ("ghc-scientific" ,ghc-scientific) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-temporary" ,ghc-temporary) + ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) + ("ghc-base-compat" ,ghc-base-compat))) + (native-inputs + `(("ghc-hspec" ,ghc-hspec) + ("ghc-hunit" ,ghc-hunit) + ("hspec-discover" ,hspec-discover) + ("ghc-mockery" ,ghc-mockery))) + (home-page "https://github.com/snoyberg/yaml/") + (synopsis "Parsing and rendering YAML documents") + (description + "This package provides a library to parse and render YAML documents.") + (license license:bsd-3))) + +(define-public ghc-zip-archive + (package + (name "ghc-zip-archive") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/zip-archive/zip-archive-" + version + ".tar.gz")) + (sha256 + (base32 + "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-digest" ,ghc-digest) + ("ghc-temporary" ,ghc-temporary) + ("ghc-zlib" ,ghc-zlib))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("unzip" ,unzip))) + (home-page "https://hackage.haskell.org/package/zip-archive") + (synopsis "Zip archive library for Haskell") + (description "The zip-archive library provides functions for creating, +modifying, and extracting files from zip archives in Haskell.") + (license license:bsd-3))) + +(define-public ghc-zlib + (package + (name "ghc-zlib") + (version "0.6.2") + (outputs '("out" "doc")) + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/zlib/zlib-" + version + ".tar.gz")) + (sha256 + (base32 + "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) + (build-system haskell-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'strip-test-framework-constraints + (lambda _ + (substitute* "zlib.cabal" + (("tasty >= 0\\.8 && < 0\\.12") "tasty") + (("tasty-hunit >= 0\\.8 && < 0\\.10") "tasty-hunit") + (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) + (inputs `(("zlib" ,zlib))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://hackage.haskell.org/package/zlib") + (synopsis + "Compression and decompression in the gzip and zlib formats") + (description + "This package provides a pure interface for compressing and decompressing +streams of data represented as lazy @code{ByteString}s. It uses the zlib C +library so it has high performance. It supports the @code{zlib}, @code{gzip} +and @code{raw} compression formats. It provides a convenient high level API +suitable for most tasks and for the few cases where more control is needed it +provides access to the full zlib feature set.") (license license:bsd-3))) (define-public ghc-zlib-bindings diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cffa7e8ed7..4d16cd656f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -39,44 +39,23 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) #:use-module (gnu packages elf) - #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) - #:use-module (gnu packages gl) - #:use-module (gnu packages graphviz) - #:use-module (gnu packages gtk) - #:use-module (gnu packages haskell-apps) - #:use-module (gnu packages haskell-check) - #:use-module (gnu packages haskell-crypto) - #:use-module (gnu packages haskell-web) #:use-module (gnu packages libffi) - #:use-module (gnu packages linux) #:use-module (gnu packages lisp) - #:use-module (gnu packages lua) - #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) - #:use-module (gnu packages pcre) #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages sdl) - #:use-module (gnu packages tls) - #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) #:use-module (guix build-system gnu) - #:use-module (guix build-system haskell) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module (ice-9 regex) - #:use-module ((srfi srfi-1) #:select (alist-delete))) + #:use-module (ice-9 regex)) (define-public cl-yale-haskell (let ((commit "85f94c72a16c5f70301dd8db04cde9de2d7dd270") @@ -623,11057 +602,4 @@ interactive environment for the functional language Haskell.") (define-public ghc ghc-8) -(define-public ghc-hostname - (package - (name "ghc-hostname") - (version "1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/hostname/" - "hostname-" version ".tar.gz")) - (sha256 - (base32 - "0p6gm4328946qxc295zb6vhwhf07l1fma82vd0siylnsnsqxlhwv")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/hostname") - (synopsis "Hostname in Haskell") - (description "Network.HostName is a simple package providing a means to -determine the hostname.") - (license license:bsd-3))) - -(define-public ghc-convertible - (package - (name "ghc-convertible") - (version "1.1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/convertible/" - "convertible-" version ".tar.gz")) - (sha256 - (base32 - "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9")))) - (build-system haskell-build-system) - (inputs - `(("ghc-old-time" ,ghc-old-time) - ("ghc-old-locale" ,ghc-old-locale))) - (home-page "https://hackage.haskell.org/package/convertible") - (synopsis "Typeclasses and instances for converting between types") - (description - "This package provides a typeclass with a single function that is -designed to help convert between different types: numeric values, dates and -times, and the like. The conversions perform bounds checking and return a -pure @code{Either} value. This means that you need not remember which specific -function performs the conversion you desire.") - (license license:bsd-3))) - -(define-public ghc-double-conversion - (package - (name "ghc-double-conversion") - (version "2.0.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "double-conversion/double-conversion-" - version ".tar.gz")) - (sha256 - (base32 - "0sx2kc1gw72mjvd8vph8bbjw5whfxfv92rsdhjg1c0al75rf3ka4")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/bos/double-conversion") - (synopsis "Fast conversion between double precision floating point and text") - (description - "This package provides a library that performs fast, accurate conversion -between double precision floating point and text.") - (license license:bsd-3))) - -(define-public ghc-libxml - (package - (name "ghc-libxml") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/libxml/" - "libxml-" version ".tar.gz")) - (sha256 - (base32 - "01zvk86kg726lf2vnlr7dxiz7g3xwi5a4ak9gcfbwyhynkzjmsfi")))) - (build-system haskell-build-system) - (inputs - `(("libxml2" ,libxml2))) - (arguments - `(#:configure-flags - `(,(string-append "--extra-include-dirs=" - (assoc-ref %build-inputs "libxml2") - "/include/libxml2")))) - (home-page "https://hackage.haskell.org/package/libxml") - (synopsis "Haskell bindings to libxml2") - (description - "This library provides minimal Haskell binding to libxml2.") - (license license:bsd-3))) - -(define-public ghc-prelude-extras - (package - (name "ghc-prelude-extras") - (version "0.4.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/prelude-extras/prelude-extras-" - version - ".tar.gz")) - (sha256 - (base32 - "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9")))) - (build-system haskell-build-system) - (home-page "https://github.com/ekmett/prelude-extras") - (synopsis "Higher order versions of Prelude classes") - (description "This library provides higher order versions of -@code{Prelude} classes to ease programming with polymorphic recursion and -reduce @code{UndecidableInstances}.") - (license license:bsd-3))) - -(define-public ghc-data-default - (package - (name "ghc-data-default") - (version "0.7.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-default/data-default-" - version - ".tar.gz")) - (sha256 - (base32 "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh")))) - (build-system haskell-build-system) - (inputs - `(("ghc-data-default-class" - ,ghc-data-default-class) - ("ghc-data-default-instances-base" - ,ghc-data-default-instances-base) - ("ghc-data-default-instances-containers" - ,ghc-data-default-instances-containers) - ("ghc-data-default-instances-dlist" - ,ghc-data-default-instances-dlist) - ("ghc-data-default-instances-old-locale" - ,ghc-data-default-instances-old-locale))) - (home-page "https://hackage.haskell.org/package/data-default") - (synopsis "Types with default values") - (description - "This package defines a class for types with a default value, and -provides instances for types from the base, containers, dlist and old-locale -packages.") - (license license:bsd-3))) - -(define-public ghc-data-default-class - (package - (name "ghc-data-default-class") - (version "0.1.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-default-class/" - "data-default-class-" version ".tar.gz")) - (sha256 - (base32 "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/data-default-class") - (synopsis "Types with default values") - (description - "This package defines a class for types with default values.") - (license license:bsd-3))) - -(define-public ghc-data-default-instances-base - (package - (name "ghc-data-default-instances-base") - (version "0.1.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-base/" - "data-default-instances-base-" version ".tar.gz")) - (sha256 - (base32 "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4")))) - (build-system haskell-build-system) - (inputs - `(("ghc-data-default-class" ,ghc-data-default-class))) - (home-page "https://hackage.haskell.org/package/data-default-instances-base") - (synopsis "Default instances for types in base") - (description - "This package provides default instances for types from the base -package.") - (license license:bsd-3))) - -(define-public ghc-data-default-instances-containers - (package - (name "ghc-data-default-instances-containers") - (version "0.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-containers/" - "data-default-instances-containers-" version ".tar.gz")) - (sha256 - (base32 "06h8xka031w752a7cjlzghvr8adqbl95xj9z5zc1b62w02phfpm5")))) - (build-system haskell-build-system) - (inputs - `(("ghc-data-default-class" ,ghc-data-default-class))) - (home-page "https://hackage.haskell.org/package/data-default-instances-containers") - (synopsis "Default instances for types in containers") - (description "Provides default instances for types from the containers -package.") - (license license:bsd-3))) - -(define-public ghc-data-default-instances-dlist - (package - (name "ghc-data-default-instances-dlist") - (version "0.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-dlist/" - "data-default-instances-dlist-" version ".tar.gz")) - (sha256 - (base32 "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x")))) - (build-system haskell-build-system) - (inputs - `(("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-dlist" ,ghc-dlist))) - (home-page "https://hackage.haskell.org/package/data-default-instances-dlist") - (synopsis "Default instances for types in dlist") - (description "Provides default instances for types from the dlist -package.") - (license license:bsd-3))) - -(define-public ghc-code-page - (package - (name "ghc-code-page") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/code-page/code-page-" - version ".tar.gz")) - (sha256 - (base32 - "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76")))) - (build-system haskell-build-system) - (home-page "https://github.com/RyanGlScott/code-page") - (synopsis "Windows code page library for Haskell") - (description "A cross-platform library with functions for adjusting -code pages on Windows. On all other operating systems, the library does -nothing.") - (license license:bsd-3))) - -(define-public ghc-libffi - (package - (name "ghc-libffi") - (version "0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "libffi/libffi-" version ".tar.gz")) - (sha256 - (base32 - "0g7jnhng3j7z5517aaqga0144aamibsbpgm3yynwyfzkq1kp0f28")))) - (build-system haskell-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libffi" ,libffi))) - (home-page "http://hackage.haskell.org/package/libffi") - (synopsis "Haskell binding to libffi") - (description - "A binding to libffi, allowing C functions of types only known at runtime -to be called from Haskell.") - (license license:bsd-3))) - -(define-public ghc-newtype-generics - (package - (name "ghc-newtype-generics") - (version "0.5.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "newtype-generics/newtype-generics-" - version ".tar.gz")) - (sha256 - (base32 - "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "http://github.com/sjakobi/newtype-generics") - (synopsis "Typeclass and set of functions for working with newtypes") - (description "The @code{Newtype} typeclass represents the packing and -unpacking of a newtype, and allows you to operate under that newtype with -functions such as @code{ala}. Generics support was added in version 0.4, -making this package a full replacement for the original newtype package, -and an alternative to newtype-th.") - (license license:bsd-3))) - -(define-public ghc-memotrie - (package - (name "ghc-memotrie") - (version "0.6.9") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/MemoTrie/MemoTrie-" - version - ".tar.gz")) - (sha256 - (base32 - "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x")))) - (build-system haskell-build-system) - (inputs - `(("ghc-newtype-generics" ,ghc-newtype-generics))) - (home-page "https://github.com/conal/MemoTrie") - (synopsis "Trie-based memo functions") - (description "This package provides a functional library for creating -efficient memo functions using tries.") - (license license:bsd-3))) - -(define-public ghc-tree-diff - (package - (name "ghc-tree-diff") - (version "0.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tree-diff/tree-diff-" - version - ".tar.gz")) - (sha256 - (base32 - "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("4" "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "tree-diff.cabal" - (("trifecta >=1\\.7\\.1\\.1 && <1\\.8") - "trifecta >=1.7.1.1 && <=2"))))))) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-base-compat" ,ghc-base-compat) - ("ghc-generics-sop" ,ghc-generics-sop) - ("ghc-hashable" ,ghc-hashable) - ("ghc-memotrie" ,ghc-memotrie) - ("ghc-parsers" ,ghc-parsers) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-scientific" ,ghc-scientific) - ("ghc-tagged" ,ghc-tagged) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-uuid-types" ,ghc-uuid-types) - ("ghc-vector" ,ghc-vector))) - (native-inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) - ("ghc-trifecta" ,ghc-trifecta) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-golden" ,ghc-tasty-golden) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://github.com/phadej/tree-diff") - (synopsis "Compute difference between (expression) trees") - (description "This Haskell library provides a function for computing -the difference between (expression) trees. It also provides a way to -compute the difference between arbitrary abstract datatypes (ADTs) using -@code{Generics}-derivable helpers.") - (license license:bsd-3))) - -(define-public ghc-haddock-library - (package - (name "ghc-haddock-library") - (version "1.5.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haddock-library/haddock-library-" - version - ".tar.gz")) - (sha256 - (base32 - "1cmbg8l5xrwpliclwy3l057raypjqy0hsg1h1743ahaj8gq10b7z")) - (patches (search-patches - "ghc-haddock-library-unbundle.patch")) - (modules '((guix build utils))) - (snippet '(begin - (delete-file-recursively "vendor") - #t)))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'relax-test-suite-dependencies - (lambda _ - (substitute* "haddock-library.cabal" - (("base-compat\\s*\\^>= 0\\.9\\.3") "base-compat") - (("hspec\\s*\\^>= 2\\.4\\.4") "hspec")))) - ;; The release tarball does not contain the "fixtures/examples" - ;; directory, which is required for testing. In the upstream - ;; repository, the directory exists and is populated. Here, we - ;; create an empty directory to placate the tests. - (add-before 'check 'add-examples-directory - (lambda _ - (mkdir "fixtures/examples") - #t))))) - (native-inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-hspec" ,ghc-hspec) - ("ghc-optparse-applicative" ,ghc-optparse-applicative) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tree-diff" ,ghc-tree-diff) - ("hspec-discover" ,hspec-discover))) - (home-page "https://www.haskell.org/haddock/") - (synopsis "Library exposing some functionality of Haddock") - (description - "Haddock is a documentation-generation tool for Haskell libraries. These -modules expose some functionality of it without pulling in the GHC dependency. -Please note that the API is likely to change so specify upper bounds in your -project if you can't release often. For interacting with Haddock itself, see -the ‘haddock’ package.") - (license license:bsd-3))) - -(define-public ghc-haddock-api - (package - (name "ghc-haddock-api") - (version "2.19.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haddock-api/haddock-api-" - version - ".tar.gz")) - (sha256 - (base32 - "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "haddock-api.cabal" - (("Cabal \\^>= 2\\.0\\.0") - "Cabal ^>= 2.2.0") - (("hspec \\^>= 2\\.4\\.4") - "hspec >= 2.4.4 && < 2.6"))))))) - (inputs - `(("ghc-paths" ,ghc-paths) - ("ghc-haddock-library" ,ghc-haddock-library))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://www.haskell.org/haddock/") - (synopsis "API for documentation-generation tool Haddock") - (description "This package provides an API to Haddock, the -documentation-generation tool for Haskell libraries.") - (license license:bsd-3))) - -(define-public ghc-haddock - (package - (name "ghc-haddock") - (version "2.19.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haddock/haddock-" - version - ".tar.gz")) - (sha256 - (base32 - "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; There are four test suites that require the ghc-haddock-test - ;; package, which no longer builds with GHC 8.4.3. This phase - ;; removes these four test suites from the Cabal file, so that we - ;; do not need ghc-haddock-test as an input. - (add-before 'configure 'remove-haddock-test-test-suites - (lambda _ - (use-modules (ice-9 rdelim)) - (with-atomic-file-replacement "haddock.cabal" - (lambda (in out) - (let loop ((line (read-line in 'concat)) (deleting? #f)) - (cond - ((eof-object? line) #t) - ((string-every char-set:whitespace line) - (unless deleting? (display line out)) - (loop (read-line in 'concat) #f)) - ((member line '("test-suite html-test\n" - "test-suite hypsrc-test\n" - "test-suite latex-test\n" - "test-suite hoogle-test\n")) - (loop (read-line in 'concat) #t)) - (else - (unless deleting? (display line out)) - (loop (read-line in 'concat) deleting?))))))))))) - (inputs `(("ghc-haddock-api" ,ghc-haddock-api))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec))) - (home-page "https://www.haskell.org/haddock/") - (synopsis - "Documentation-generation tool for Haskell libraries") - (description - "Haddock is a documentation-generation tool for Haskell libraries.") - (license license:bsd-3))) - -(define-public ghc-simple-reflect - (package - (name "ghc-simple-reflect") - (version "0.3.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/simple-reflect/simple-reflect-" - version - ".tar.gz")) - (sha256 - (base32 - "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7")))) - (build-system haskell-build-system) - (home-page - "https://twanvl.nl/blog/haskell/simple-reflection-of-expressions") - (synopsis - "Simple reflection of expressions containing variables") - (description - "This package allows simple reflection of expressions containing -variables. Reflection here means that a Haskell expression is turned into a -string. The primary aim of this package is teaching and understanding; there -are no options for manipulating the reflected expressions beyond showing -them.") - (license license:bsd-3))) - -(define-public ghc-haskell-src - (package - (name "ghc-haskell-src") - (version "1.0.3.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haskell-src/haskell-src-" - version - ".tar.gz")) - (sha256 - (base32 - "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l")))) - (build-system haskell-build-system) - (inputs - `(("ghc-happy" ,ghc-happy) - ("ghc-syb" ,ghc-syb))) - (home-page - "https://hackage.haskell.org/package/haskell-src") - (synopsis - "Support for manipulating Haskell source code") - (description - "The @code{haskell-src} package provides support for manipulating Haskell -source code. The package provides a lexer, parser and pretty-printer, and a -definition of a Haskell abstract syntax tree (AST). Common uses of this -package are to parse or generate Haskell 98 code.") - (license license:bsd-3))) - -(define-public ghc-alex - (package - (name "ghc-alex") - (version "3.2.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/alex/alex-" - version - ".tar.gz")) - (sha256 - (base32 - "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-check-variables - (lambda _ - (setenv "PATH" (string-append (getcwd) "/dist/build/alex:" - (getenv "PATH"))) - (setenv "alex_datadir" (string-append (getcwd) "/data")) - #t))))) - (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) - (native-inputs - `(("which" ,which))) - (home-page "https://www.haskell.org/alex/") - (synopsis - "Tool for generating lexical analysers in Haskell") - (description - "Alex is a tool for generating lexical analysers in Haskell. It takes a -description of tokens based on regular expressions and generates a Haskell -module containing code for scanning text efficiently. It is similar to the -tool lex or flex for C/C++.") - (license license:bsd-3))) - -(define-public ghc-cgi - (package - (name "ghc-cgi") - (version "3001.3.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cgi/cgi-" - version - ".tar.gz")) - (sha256 - (base32 - "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "cgi.cabal" - (("exceptions < 0\\.9") - "exceptions < 0.11") - (("time >= 1\\.5 && < 1\\.7") - "time >= 1.5 && < 1.9") - (("doctest >= 0\\.8 && < 0\\.12") - "doctest >= 0.8 && < 0.17") - (("QuickCheck >= 2\\.8\\.1 && < 2\\.10") - "QuickCheck >= 2.8.1 && < 2.12"))))))) - (inputs - `(("ghc-exceptions" ,ghc-exceptions) - ("ghc-multipart" ,ghc-multipart) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-network" ,ghc-network))) - (native-inputs - `(("ghc-doctest" ,ghc-doctest) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page - "https://github.com/cheecheeo/haskell-cgi") - (synopsis "Library for writing CGI programs") - (description - "This is a Haskell library for writing CGI programs.") - (license license:bsd-3))) - -(define-public ghc-cmdargs - (package - (name "ghc-cmdargs") - (version "0.10.20") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cmdargs/cmdargs-" - version ".tar.gz")) - (sha256 - (base32 - "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf")))) - (build-system haskell-build-system) - (home-page - "http://community.haskell.org/~ndm/cmdargs/") - (synopsis "Command line argument processing") - (description - "This library provides an easy way to define command line parsers.") - (license license:bsd-3))) - -(define-public ghc-concatenative - (package - (name "ghc-concatenative") - (version "1.0.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/concatenative/concatenative-" - version ".tar.gz")) - (sha256 - (base32 - "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd")))) - (build-system haskell-build-system) - (home-page - "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty") - (synopsis "Library for postfix control flow") - (description - "Concatenative gives Haskell Factor-style combinators and arrows for -postfix notation. For more information on stack based languages, see -@uref{https://concatenative.org}.") - (license license:bsd-3))) - -(define-public ghc-happy - (package - (name "ghc-happy") - (version "1.19.9") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/happy/happy-" - version - ".tar.gz")) - (sha256 - (base32 - "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-test-issue93 - (lambda _ - ;; Tests run out of memory on a system with 2GB of available RAM, - ;; in 'issue93.a.hs' and 'issue93.n.hs'. - (substitute* "tests/Makefile" - ((" issue93.y ") " ")) - #t))))) - (home-page "https://hackage.haskell.org/package/happy") - (synopsis "Parser generator for Haskell") - (description "Happy is a parser generator for Haskell. Given a grammar -specification in BNF, Happy generates Haskell code to parse the grammar. -Happy works in a similar way to the yacc tool for C.") - (license license:bsd-3))) - -(define-public ghc-haskell-lexer - (package - (name "ghc-haskell-lexer") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haskell-lexer/haskell-lexer-" - version ".tar.gz")) - (sha256 - (base32 "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq")))) - (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/haskell-lexer") - (synopsis "Fully compliant Haskell 98 lexer") - (description - "This package provides a fully compliant Haskell 98 lexer.") - (license license:bsd-3))) - -(define-public ghc-pretty-show - (package - (name "ghc-pretty-show") - (version "1.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pretty-show/" - "pretty-show-" version ".tar.gz")) - (sha256 - (base32 - "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq")))) - (build-system haskell-build-system) - (inputs - `(("ghc-haskell-lexer" ,ghc-haskell-lexer) - ("ghc-happy" ,ghc-happy))) - (home-page "http://wiki.github.com/yav/pretty-show") - (synopsis "Tools for working with derived `Show` instances") - (description - "This package provides a library and an executable for working with -derived @code{Show} instances. By using the library, derived @code{Show} -instances can be parsed into a generic data structure. The @code{ppsh} tool -uses the library to produce human-readable versions of @code{Show} instances, -which can be quite handy for debugging Haskell programs. We can also render -complex generic values into an interactive Html page, for easier -examination.") - (license license:expat))) - -(define-public ghc-haskell-src-exts - (package - (name "ghc-haskell-src-exts") - (version "1.20.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/haskell-src-exts/haskell-src-exts-" - version - ".tar.gz")) - (sha256 - (base32 - "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz")))) - (build-system haskell-build-system) - (inputs - `(("cpphs" ,cpphs) - ("ghc-happy" ,ghc-happy) - ("ghc-pretty-show" ,ghc-pretty-show))) - (native-inputs - `(("ghc-smallcheck" ,ghc-smallcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) - ("ghc-tasty-golden" ,ghc-tasty-golden))) - (home-page "https://github.com/haskell-suite/haskell-src-exts") - (synopsis "Library for manipulating Haskell source") - (description "Haskell-Source with Extensions (HSE, haskell-src-exts) is an -extension of the standard @code{haskell-src} package, and handles most -registered syntactic extensions to Haskell. All extensions implemented in GHC -are supported. Apart from these standard extensions, it also handles regular -patterns as per the HaRP extension as well as HSX-style embedded XML syntax.") - (license license:bsd-3))) - -(define-public ghc-haskell-src-exts-util - (package - (name "ghc-haskell-src-exts-util") - (version "0.2.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "haskell-src-exts-util/haskell-src-exts-util-" - version ".tar.gz")) - (sha256 - (base32 - "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8")))) - (build-system haskell-build-system) - (inputs - `(("ghc-data-default" ,ghc-data-default) - ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-uniplate" ,ghc-uniplate))) - (home-page "https://github.com/pepeiborra/haskell-src-exts-util") - (synopsis "Helper functions for working with haskell-src-exts trees") - (description - "This package provides helper functions for working with -@code{haskell-src-exts} trees.") - (license license:bsd-3))) - -(define-public ghc-refact - (package - (name "ghc-refact") - (version "0.3.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "refact/refact-" - version ".tar.gz")) - (sha256 - (base32 - "0v0zxcx29b8jxs2kgy9csykqcp8kzhdvyylw2xfwmj4pfxr2kl0a")))) - (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/refact") - (synopsis "Specify refactorings to perform with apply-refact") - (description - "This library provides a datatype which can be interpreted by -@code{apply-refact}. It exists as a separate library so that applications can -specify refactorings without depending on GHC.") - (license license:bsd-3))) - -(define-public ghc-resourcet - (package - (name "ghc-resourcet") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/resourcet/" - "resourcet-" version ".tar.gz")) - (sha256 - (base32 - "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7")))) - (build-system haskell-build-system) - (inputs - `(("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-mmorph" ,ghc-mmorph) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-unliftio-core" ,ghc-unliftio-core))) - (native-inputs - `(("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-hspec" ,ghc-hspec))) - (home-page "https://github.com/snoyberg/conduit") - (synopsis "Deterministic allocation and freeing of scarce resources") - (description "ResourceT is a monad transformer which creates a region of -code where you can safely allocate resources.") - (license license:bsd-3))) - -(define-public ghc-objectname - (package - (name "ghc-objectname") - (version "1.1.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ObjectName/ObjectName-" - version - ".tar.gz")) - (sha256 - (base32 - "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/ObjectName") - (synopsis "Helper library for Haskell OpenGL") - (description "This tiny package contains the class ObjectName, which -corresponds to the general notion of explicitly handled identifiers for API -objects, e.g. a texture object name in OpenGL or a buffer object name in -OpenAL.") - (license license:bsd-3))) - -(define-public ghc-sdl - (package - (name "ghc-sdl") - (version "0.6.7.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/SDL/SDL-" - version - ".tar.gz")) - (sha256 - (base32 - "00y67v80a8l09i3k76z09lg25kw72ivl09nag8ckdlk4a0cfnzfq")))) - (build-system haskell-build-system) - (inputs - `(("sdl" ,sdl))) - (home-page "https://hackage.haskell.org/package/SDL") - (synopsis "LibSDL for Haskell") - (description "Simple DirectMedia Layer (libSDL) is a cross-platform -multimedia library designed to provide low level access to audio, keyboard, -mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer. It is used -by MPEG playback software, emulators, and many popular games, including the -award winning Linux port of \"Civilization: Call To Power.\"") - (license license:bsd-3))) - -(define-public ghc-sdl-mixer - (package - (name "ghc-sdl-mixer") - (version "0.6.3.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/SDL-mixer/SDL-mixer-" - version - ".tar.gz")) - (sha256 - (base32 - "0k26hqgdh789ka3mv4dsk6rin6x6vwcs6hjmnsqq7j3mnrh1342r")))) - (build-system haskell-build-system) - (arguments - `(#:configure-flags - (let* ((sdl-mixer (assoc-ref %build-inputs "sdl-mixer")) - (sdl-mixer-include (string-append sdl-mixer "/include/SDL"))) - (list (string-append "--extra-include-dirs=" sdl-mixer-include))))) - (inputs - `(("ghc-sdl" ,ghc-sdl) - ("sdl-mixer" ,sdl-mixer))) - (home-page "https://hackage.haskell.org/package/SDL-mixer") - (synopsis "Haskell bindings to libSDL_mixer") - (description "SDL_mixer is a sample multi-channel audio mixer library. It -supports any number of simultaneously playing channels of 16 bit stereo audio, -plus a single channel of music, mixed by the popular MikMod MOD, Timidity -MIDI, Ogg Vorbis, and SMPEG MP3 libraries.") - (license license:bsd-3))) - -(define-public ghc-sdl-image - (package - (name "ghc-sdl-image") - (version "0.6.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/SDL-image/SDL-image-" - version - ".tar.gz")) - (sha256 - (base32 - "1gxwrvswgwjw6g7ym52gik22l9l3ljy592phv97jdmcf3gi6qcg1")))) - (build-system haskell-build-system) - (arguments - `(#:configure-flags - (let* ((sdl-image (assoc-ref %build-inputs "sdl-image")) - (sdl-image-include (string-append sdl-image "/include/SDL"))) - (list (string-append "--extra-include-dirs=" sdl-image-include))))) - (inputs - `(("ghc-sdl" ,ghc-sdl) - ("sdl-image" ,sdl-image))) - (home-page "https://hackage.haskell.org/package/SDL-image") - (synopsis "Haskell bindings to libSDL_image") - (description "SDL_image is an image file loading library. It loads images -as SDL surfaces, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, -PNG, PNM, TGA, TIFF, XCF, XPM, XV.") - (license license:bsd-3))) - -(define-public ghc-half - (package - (name "ghc-half") - (version "0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/half/half-" - version ".tar.gz")) - (sha256 - (base32 - "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/ekmett/half") - (synopsis "Half-precision floating-point computations") - (description "This library provides a half-precision floating-point -computation library for Haskell.") - (license license:bsd-3))) - -(define-public ghc-fixed - (package - (name "ghc-fixed") - (version "0.2.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/fixed/fixed-" - version ".tar.gz")) - (sha256 - (base32 - "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94")))) - (build-system haskell-build-system) - (home-page "https://github.com/ekmett/fixed") - (synopsis "Signed 15.16 precision fixed point arithmetic") - (description - "This package provides functions for signed 15.16 precision fixed point -arithmetic.") - (license license:bsd-3))) - -(define-public ghc-openglraw - (package - (name "ghc-openglraw") - (version "3.3.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/OpenGLRaw/OpenGLRaw-" - version - ".tar.gz")) - (sha256 - (base32 - "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb")))) - (build-system haskell-build-system) - (inputs - `(("ghc-half" ,ghc-half) - ("ghc-fixed" ,ghc-fixed) - ("glu" ,glu))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") - (synopsis "Raw Haskell bindings for the OpenGL graphics system") - (description "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 -graphics system and lots of OpenGL extensions. It is basically a 1:1 mapping -of OpenGL's C API, intended as a basis for a nicer interface. OpenGLRaw -offers access to all necessary functions, tokens and types plus a general -facility for loading extension entries. The module hierarchy closely mirrors -the naming structure of the OpenGL extensions, making it easy to find the -right module to import. All API entries are loaded dynamically, so no special -C header files are needed for building this package. If an API entry is not -found at runtime, a userError is thrown.") - (license license:bsd-3))) - -(define-public ghc-glut - (package - (name "ghc-glut") - (version "2.7.0.14") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/GLUT/GLUT-" - version - ".tar.gz")) - (sha256 - (base32 - "01i162fly4q1751fp60lgkzlb8kr0qqbvmxj74zc6skb19qggy2w")))) - (build-system haskell-build-system) - (inputs - `(("ghc-statevar" ,ghc-statevar) - ("ghc-opengl" ,ghc-opengl) - ("ghc-openglraw" ,ghc-openglraw) - ("freeglut" ,freeglut))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") - (synopsis "Haskell bindings for the OpenGL Utility Toolkit") - (description "This library provides Haskell bindings for the OpenGL -Utility Toolkit, a window system-independent toolkit for writing OpenGL -programs.") - (license license:bsd-3))) - -(define-public ghc-gluraw - (package - (name "ghc-gluraw") - (version "2.0.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/GLURaw/GLURaw-" - version - ".tar.gz")) - (sha256 - (base32 - "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq")))) - (build-system haskell-build-system) - (inputs - `(("ghc-openglraw" ,ghc-openglraw))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") - (synopsis "Raw Haskell bindings GLU") - (description "GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL -utility library. It is basically a 1:1 mapping of GLU's C API, intended as a -basis for a nicer interface.") - (license license:bsd-3))) - -(define-public ghc-opengl - (package - (name "ghc-opengl") - (version "3.0.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/OpenGL/OpenGL-" - version - ".tar.gz")) - (sha256 - (base32 - "19vxwvx2n8zq2klj176l25n2b64ybp0b8mhm4p46gvpcivz41fjc")))) - (build-system haskell-build-system) - (inputs - `(("ghc-objectname" ,ghc-objectname) - ("ghc-gluraw" ,ghc-gluraw) - ("ghc-statevar" ,ghc-statevar) - ("ghc-openglraw" ,ghc-openglraw))) - (home-page "https://www.haskell.org/haskellwiki/Opengl") - (synopsis "Haskell bindings for the OpenGL graphics system") - (description "This package provides Haskell bindings for the OpenGL -graphics system (GL, version 4.5) and its accompanying utility library (GLU, -version 1.3).") - (license license:bsd-3))) - -(define-public ghc-streaming-commons - (package - (name "ghc-streaming-commons") - (version "0.2.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "streaming-commons/streaming-commons-" - version ".tar.gz")) - (sha256 - (base32 - "1lmyx3wkjsayhy5yilzvy0kf8qwmycwlk26r1d8f3cxbfhkr7s52")))) - (build-system haskell-build-system) - (inputs - `(("ghc-async" ,ghc-async) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-network" ,ghc-network) - ("ghc-random" ,ghc-random) - ("ghc-zlib" ,ghc-zlib))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/streaming-commons") - (synopsis "Conduit and pipes needed by some streaming data libraries") - (description "This package provides low-dependency functionality commonly -needed by various Haskell streaming data libraries, such as @code{conduit} and -@code{pipe}s.") - (license license:expat))) - -(define-public ghc-reflection - (package - (name "ghc-reflection") - (version "2.1.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/reflection/reflection-" - version - ".tar.gz")) - (sha256 - (base32 - "0kf4a5ijw6jfnfibjcrpdy9vzh1n6v2pxia8dhyyqdissiwc8bzj")))) - (build-system haskell-build-system) - (inputs `(("ghc-tagged" ,ghc-tagged))) - (home-page "https://github.com/ekmett/reflection") - (synopsis "Reify arbitrary terms into types that can be reflected back -into terms") - (description "This package addresses the 'configuration problem' which is -propagating configurations that are available at run-time, allowing multiple -configurations to coexist without resorting to mutable global variables or -@code{System.IO.Unsafe.unsafePerformIO}.") - (license license:bsd-3))) - -(define-public ghc-old-locale - (package - (name "ghc-old-locale") - (version "1.0.0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/old-locale/old-locale-" - version - ".tar.gz")) - (sha256 - (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "04b9vn007hlvsrx4ksd3r8r3kbyaj2kvwxchdrmd4370qzi8p6gs"))) - (home-page "https://hackage.haskell.org/package/old-locale") - (synopsis "Adapt to locale conventions") - (description - "This package provides the ability to adapt to locale conventions such as -date and time formats.") - (license license:bsd-3))) - -(define-public ghc-old-time - (package - (name "ghc-old-time") - (version "1.1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/old-time/old-time-" - version - ".tar.gz")) - (sha256 - (base32 - "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "1j6ln1dkvhdvnwl33bp0xf9lhc4sybqk0aw42p8cq81xwwzbn7y9"))) - (inputs - `(("ghc-old-locale" ,ghc-old-locale))) - (home-page "https://hackage.haskell.org/package/old-time") - (synopsis "Time compatibility library for Haskell") - (description "Old-time is a package for backwards compatibility with the -old @code{time} library. For new projects, the newer -@uref{https://hackage.haskell.org/package/time, time library} is recommended.") - (license license:bsd-3))) - -(define-public ghc-data-default-instances-old-locale - (package - (name "ghc-data-default-instances-old-locale") - (version "0.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "data-default-instances-old-locale/" - "data-default-instances-old-locale-" version ".tar.gz")) - (sha256 - (base32 "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0")))) - (build-system haskell-build-system) - (inputs - `(("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-old-locale" ,ghc-old-locale))) - (home-page - "https://hackage.haskell.org/package/data-default-instances-old-locale") - (synopsis "Default instances for types in old-locale") - (description "Provides Default instances for types from the old-locale - package.") - (license license:bsd-3))) - -(define-public ghc-dlist - (package - (name "ghc-dlist") - (version "0.8.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/dlist/dlist-" - version - ".tar.gz")) - (sha256 - (base32 "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc")))) - (build-system haskell-build-system) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/spl/dlist") - (synopsis "Difference lists") - (description - "Difference lists are a list-like type supporting O(1) append. This is -particularly useful for efficient logging and pretty printing (e.g. with the -Writer monad), where list append quickly becomes too expensive.") - (license license:bsd-3))) - -(define-public ghc-extensible-exceptions - (package - (name "ghc-extensible-exceptions") - (version "0.1.1.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "extensible-exceptions/extensible-exceptions-" - version ".tar.gz")) - (sha256 - (base32 "1273nqws9ij1rp1bsq5jc7k2jxpqa0svawdbim05lf302y0firbc")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/extensible-exceptions") - (synopsis "Extensible exceptions for Haskell") - (description - "This package provides extensible exceptions for both new and old -versions of GHC (i.e., < 6.10).") - (license license:bsd-3))) - -(define-public ghc-echo - (package - (name "ghc-echo") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/echo/echo-" - version ".tar.gz")) - (sha256 - (base32 - "1vw5ykpwhr39wc0hhcgq3r8dh59zq6ib4zxbz1qd2wl21wqhfkvh")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "0br8wfiybcw5hand4imiw0i5hacdmrax1dv8g95f35gazffbx42l"))) - (home-page "https://github.com/RyanGlScott/echo") - (synopsis "Echo terminal input portably") - (description "The @code{base} library exposes the @code{hGetEcho} and -@code{hSetEcho} functions for querying and setting echo status, but -unfortunately, neither function works with MinTTY consoles on Windows. -This library provides an alternative interface which works with both -MinTTY and other consoles.") - (license license:bsd-3))) - -(define-public ghc-hackage-security - (package - (name "ghc-hackage-security") - (version "0.5.3.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hackage-security/hackage-security-" - version ".tar.gz")) - (sha256 - (base32 - "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v")))) - (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; Tests fail because of framework updates. - (inputs - `(("ghc-base16-bytestring" ,ghc-base16-bytestring) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256) - ("ghc-ed25519" ,ghc-ed25519) - ("ghc-network" ,ghc-network) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-tar" ,ghc-tar) - ("ghc-zlib" ,ghc-zlib))) - (native-inputs - `(("ghc-network-uri" ,ghc-network-uri) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tar" ,ghc-tar) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-temporary" ,ghc-temporary) - ("ghc-zlib" ,ghc-zlib))) - (home-page "https://github.com/haskell/hackage-security") - (synopsis "Hackage security library") - (description "This Hackage security library provides both server and -client utilities for securing @uref{http://hackage.haskell.org/, the -Hackage package server}. It is based on -@uref{http://theupdateframework.com/, The Update Framework}, a set of -recommendations developed by security researchers at various universities -in the US as well as developers on the @uref{https://www.torproject.org/, -Tor project}.") - (license license:bsd-3))) - -(define-public ghc-resolv - (package - (name "ghc-resolv") - (version "0.1.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/resolv/resolv-" - version ".tar.gz")) - (sha256 - (base32 - "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma") - #:tests? #f)) ; The required test frameworks are too old. - (inputs - `(("ghc-base16-bytestring" ,ghc-base16-bytestring))) - (home-page "https://github.com/haskell/hackage-security") - (synopsis "Domain Name Service (DNS) lookup via @code{libresolv}") - (description "This package implements an API for accessing the -@uref{https://tools.ietf.org/html/rfc1035, Domain Name Service (DNS)} -resolver service via the standard @code{libresolv} system library (whose -API is often available directly via the standard @code{libc} C library) on -Unix systems.") - (license license:gpl3))) - -(define-public ghc-parsec-numbers - (package - (name "ghc-parsec-numbers") - (version "0.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "parsec-numbers/parsec-numbers-" version ".tar.gz")) - (sha256 - (base32 "1gzy4v3r02kvdxvgg1nj83mmb6aph2v4ilf9c7y6nbvi2x49l0bp")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/parsec-numbers") - (synopsis "Utilities for parsing numbers from strings") - (description - "This package provides the number parsers without the need to use a large -(and unportable) token parser.") - (license license:bsd-3))) - -(define-public ghc-paths - (package - (name "ghc-paths") - (version "0.1.0.9") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ghc-paths/ghc-paths-" - version - ".tar.gz")) - (sha256 - (base32 - "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg")))) - (build-system haskell-build-system) - (home-page "https://github.com/simonmar/ghc-paths") - (synopsis - "Knowledge of GHC's installation directories") - (description - "Knowledge of GHC's installation directories.") - (license license:bsd-3))) - -(define-public ghc-utf8-string - (package - (name "ghc-utf8-string") - (version "1.0.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/utf8-string/utf8-string-" - version - ".tar.gz")) - (sha256 - (base32 "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("3" "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38"))) - (home-page "https://github.com/glguy/utf8-string/") - (synopsis "Support for reading and writing UTF8 Strings") - (description - "A UTF8 layer for Strings. The utf8-string package provides operations -for encoding UTF8 strings to Word8 lists and back, and for reading and writing -UTF8 without truncation.") - (license license:bsd-3))) - -(define-public ghc-setenv - (package - (name "ghc-setenv") - (version "0.1.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/setenv/setenv-" - version - ".tar.gz")) - (sha256 - (base32 - "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/setenv") - (synopsis "Library for setting environment variables") - (description "This package provides a Haskell library for setting -environment variables.") - (license license:expat))) - -(define-public ghc-setlocale - (package - (name "ghc-setlocale") - (version "1.0.0.8") - (source (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/setlocale-" - version "/setlocale-" version ".tar.gz")) - (sha256 - (base32 - "0sdrsmkhw08483d73ysgm2926fdbhii61br03lqpqw0lfzj4ilbd")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/setlocale") - (synopsis "Haskell bindings to setlocale") - (description "This package provides Haskell bindings to the -@code{setlocale} C function.") - (license license:bsd-3))) - -(define-public ghc-x11 - (package - (name "ghc-x11") - (version "1.9") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/X11/" - "X11-" version ".tar.gz")) - (sha256 - (base32 "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh")))) - (build-system haskell-build-system) - (inputs - `(("libx11" ,libx11) - ("libxrandr" ,libxrandr) - ("libxinerama" ,libxinerama) - ("libxscrnsaver" ,libxscrnsaver) - ("ghc-data-default" ,ghc-data-default))) - (home-page "https://github.com/haskell-pkg-janitors/X11") - (synopsis "Bindings to the X11 graphics library") - (description - "This package provides Haskell bindings to the X11 graphics library. The -bindings are a direct translation of the C bindings.") - (license license:bsd-3))) - -(define-public ghc-x11-xft - (package - (name "ghc-x11-xft") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/X11-xft/" - "X11-xft-" version ".tar.gz")) - (sha256 - (base32 "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf")))) - (inputs - `(("ghc-x11" ,ghc-x11) - ("ghc-utf8-string" ,ghc-utf8-string) - ("libx11" ,libx11) - ("libxft" ,libxft) - ("xorgproto" ,xorgproto))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/X11-xft") - (synopsis "Bindings to Xft") - (description - "Bindings to the Xft, X Free Type interface library, and some Xrender -parts.") - (license license:lgpl2.1))) - -(define-public ghc-stringbuilder - (package - (name "ghc-stringbuilder") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/stringbuilder/stringbuilder-" - version - ".tar.gz")) - (sha256 - (base32 - "1fh3csx1wcssn8xyvl4ip4aprh9l4qyz2kk8mgjvqvc0vb2bsy6q")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: circular dependencies with tests - ; enabled - (home-page "https://hackage.haskell.org/package/stringbuilder") - (synopsis "Writer monad for multi-line string literals") - (description "This package provides a writer monad for multi-line string -literals.") - (license license:expat))) - -(define-public ghc-zlib - (package - (name "ghc-zlib") - (version "0.6.2") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/zlib/zlib-" - version - ".tar.gz")) - (sha256 - (base32 - "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'strip-test-framework-constraints - (lambda _ - (substitute* "zlib.cabal" - (("tasty >= 0\\.8 && < 0\\.12") "tasty") - (("tasty-hunit >= 0\\.8 && < 0\\.10") "tasty-hunit") - (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) - (inputs `(("zlib" ,zlib))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://hackage.haskell.org/package/zlib") - (synopsis - "Compression and decompression in the gzip and zlib formats") - (description - "This package provides a pure interface for compressing and decompressing -streams of data represented as lazy @code{ByteString}s. It uses the zlib C -library so it has high performance. It supports the @code{zlib}, @code{gzip} -and @code{raw} compression formats. It provides a convenient high level API -suitable for most tasks and for the few cases where more control is needed it -provides access to the full zlib feature set.") - (license license:bsd-3))) - -(define-public ghc-parallel - (package - (name "ghc-parallel") - (version "3.2.2.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/parallel/parallel-" - version - ".tar.gz")) - (sha256 - (base32 - "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/parallel") - (synopsis "Parallel programming library") - (description - "This package provides a library for parallel programming.") - (license license:bsd-3))) - -(define-public ghc-safesemaphore - (package - (name "ghc-safesemaphore") - (version "0.10.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "SafeSemaphore/SafeSemaphore-" version ".tar.gz")) - (sha256 - (base32 - "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/ChrisKuklewicz/SafeSemaphore") - (synopsis "Exception safe semaphores") - (description "This library provides exception safe semaphores that can be -used in place of @code{QSem}, @code{QSemN}, and @code{SampleVar}, all of which -are not exception safe and can be broken by @code{killThread}.") - (license license:bsd-3))) - -(define-public ghc-text-binary - (package - (name "ghc-text-binary") - (version "0.2.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "text-binary/text-binary-" - version ".tar.gz")) - (sha256 - (base32 - "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn")))) - (build-system haskell-build-system) - (home-page "https://github.com/kawu/text-binary") - (synopsis "Binary instances for text types") - (description - "This package provides a compatibility layer providing @code{Binary} -instances for strict and lazy text types for versions older than 1.2.1 of the -text package.") - (license license:bsd-2))) - -(define-public ghc-strict - (package - (name "ghc-strict") - (version "0.3.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/strict/strict-" - version ".tar.gz")) - (sha256 - (base32 "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/strict") - (synopsis "Strict data types and String IO") - (description - "This package provides strict versions of some standard Haskell data -types, such as pairs, @code{Maybe} and @code{Either}. It also contains strict -IO operations.") - (license license:bsd-3))) - -(define-public ghc-hashable - (package - (name "ghc-hashable") - (version "1.2.7.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hashable/hashable-" - version - ".tar.gz")) - (sha256 - (base32 - "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc")))) - (build-system haskell-build-system) - (inputs - `(("ghc-random" ,ghc-random))) - (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) - ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/tibbe/hashable") - (synopsis "Class for types that can be converted to a hash value") - (description - "This package defines a class, @code{Hashable}, for types that can be -converted to a hash value. This class exists for the benefit of hashing-based -data structures. The package provides instances for basic types and a way to -combine hash values.") - (license license:bsd-3))) - -(define-public ghc-hashable-bootstrap - (package - (inherit ghc-hashable) - (name "ghc-hashable-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()) - (properties '((hidden? #t))))) - -(define-public ghc-hashable-time - (package - (name "ghc-hashable-time") - (version "0.2.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hashable-time/hashable-time-" - version - ".tar.gz")) - (sha256 - (base32 - "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6"))) - (inputs `(("ghc-hashable" ,ghc-hashable))) - (home-page "http://hackage.haskell.org/package/hashable-time") - (synopsis "Hashable instances for Data.Time") - (description - "This package provides @code{Hashable} instances for types in -@code{Data.Time}.") - (license license:bsd-3))) - -(define-public ghc-data-hash - (package - (name "ghc-data-hash") - (version "0.2.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/data-hash" - "/data-hash-" version ".tar.gz")) - (sha256 - (base32 "1ghbqvc48gf9p8wiy71hdpaj7by3b9cw6wgwi3qqz8iw054xs5wi")))) - (build-system haskell-build-system) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://hackage.haskell.org/package/data-hash") - (synopsis "Combinators for building fast hashing functions") - (description - "This package provides combinators for building fast hashing functions. -It includes hashing functions for all basic Haskell98 types.") - (license license:bsd-3))) - -(define-public ghc-murmur-hash - (package - (name "ghc-murmur-hash") - (version "0.1.0.9") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/murmur-hash" - "/murmur-hash-" version ".tar.gz")) - (sha256 - (base32 "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9")))) - (build-system haskell-build-system) - (home-page "https://github.com/nominolo/murmur-hash") - (synopsis "MurmurHash2 implementation for Haskell") - (description - "This package provides an implementation of MurmurHash2, a good, fast, -general-purpose, non-cryptographic hashing function. See -@url{https://sites.google.com/site/murmurhash/} for details. This -implementation is pure Haskell, so it might be a bit slower than a C FFI -binding.") - (license license:bsd-3))) - -(define-public ghc-random - (package - (name "ghc-random") - (version "1.1") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/random/random-" - version - ".tar.gz")) - (sha256 - (base32 "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/random") - (synopsis "Random number library") - (description "This package provides a basic random number generation -library, including the ability to split random number generators.") - (license license:bsd-3))) - -(define-public ghc-primitive - (package - (name "ghc-primitive") - (version "0.6.4.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/primitive/primitive-" - version - ".tar.gz")) - (sha256 - (base32 - "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc")))) - (build-system haskell-build-system) - (home-page - "https://github.com/haskell/primitive") - (synopsis "Primitive memory-related operations") - (description - "This package provides various primitive memory-related operations.") - (license license:bsd-3))) - -(define-public ghc-tf-random - (package - (name "ghc-tf-random") - (version "0.5") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tf-random/tf-random-" - version - ".tar.gz")) - (sha256 - (base32 "0445r2nns6009fmq0xbfpyv7jpzwv0snccjdg7hwj4xk4z0cwc1f")))) - (build-system haskell-build-system) - (inputs - `(("ghc-primitive" ,ghc-primitive) - ("ghc-random" ,ghc-random))) - (home-page "https://hackage.haskell.org/package/tf-random") - (synopsis "High-quality splittable pseudorandom number generator") - (description "This package contains an implementation of a high-quality -splittable pseudorandom number generator. The generator is based on a -cryptographic hash function built on top of the ThreeFish block cipher. See -the paper \"Splittable Pseudorandom Number Generators Using Cryptographic -Hashing\" by Claessen, Pałka for details and the rationale of the design.") - (license license:bsd-3))) - -(define-public ghc-transformers-base - (package - (name "ghc-transformers-base") - (version "0.4.5.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/transformers-base/transformers-base-" - version - ".tar.gz")) - (sha256 - (base32 - "1s256bi0yh0x2hp2gwd30f3mg1cv53zz397dv1yhfsnfzmihrj6h")))) - (build-system haskell-build-system) - (inputs - `(("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page - "https://hackage.haskell.org/package/transformers-compat") - (synopsis - "Backported transformer library") - (description - "Backported versions of types that were added to transformers in -transformers 0.3 and 0.4 for users who need strict transformers 0.2 or 0.3 -compatibility to run on old versions of the platform.") - (license license:bsd-3))) - -(define-public ghc-transformers-compat - (package - (name "ghc-transformers-compat") - (version "0.6.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/transformers-compat" - "/transformers-compat-" version ".tar.gz")) - (sha256 - (base32 - "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw")))) - (build-system haskell-build-system) - (home-page "https://github.com/ekmett/transformers-compat/") - (synopsis "Small compatibility shim between transformers 0.3 and 0.4") - (description "This package includes backported versions of types that were -added to transformers in transformers 0.3 and 0.4 for users who need strict -transformers 0.2 or 0.3 compatibility to run on old versions of the platform, -but also need those types.") - (license license:bsd-3))) - -(define-public ghc-unix-time - (package - (name "ghc-unix-time") - (version "0.3.8") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unix-time/unix-time-" - version - ".tar.gz")) - (sha256 - (base32 - "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw")))) - (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; FIXME: Test fails with "System.Time not found". This - ; is weird, that should be provided by GHC 7.10.2. - (inputs - `(("ghc-old-time" ,ghc-old-time) - ("ghc-old-locale" ,ghc-old-locale))) - (home-page "https://hackage.haskell.org/package/unix-time") - (synopsis "Unix time parser/formatter and utilities") - (description "This library provides fast parsing and formatting utilities -for Unix time in Haskell.") - (license license:bsd-3))) - -(define-public ghc-unix-compat - (package - (name "ghc-unix-compat") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unix-compat/unix-compat-" - version - ".tar.gz")) - (sha256 - (base32 - "0llwl7rp63fy2ychwdclz1afj45pbin5pfl01dvn6rwhvmwhr7d3")))) - (build-system haskell-build-system) - (home-page - "https://github.com/jystic/unix-compat") - (synopsis "Portable POSIX-compatibility layer") - (description - "This package provides portable implementations of parts of the unix -package. This package re-exports the unix package when available. When it -isn't available, portable implementations are used.") - (license license:bsd-3))) - -(define-public ghc-indents - (package - (name "ghc-indents") - (version "0.5.0.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/indents/indents-" - version ".tar.gz")) - (sha256 - (base32 - "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n")))) - (build-system haskell-build-system) - ;; This package needs an older version of tasty. - (arguments '(#:tests? #f)) - (inputs - `(("ghc-concatenative" ,ghc-concatenative))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "http://patch-tag.com/r/salazar/indents") - (synopsis "Indentation sensitive parser-combinators for parsec") - (description - "This library provides functions for use in parsing indentation sensitive -contexts. It parses blocks of lines all indented to the same level as well as -lines continued at an indented level below.") - (license license:bsd-3))) - -(define-public ghc-iproute - (package - (name "ghc-iproute") - (version "1.7.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/iproute/iproute-" - version - ".tar.gz")) - (sha256 - (base32 - "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Tests cannot find System.ByteOrder, - ; exported by ghc-byteorder. Doctest issue. - (inputs - `(("ghc-appar" ,ghc-appar) - ("ghc-byteorder" ,ghc-byteorder) - ("ghc-network" ,ghc-network) - ("ghc-safe" ,ghc-safe))) - (home-page "https://www.mew.org/~kazu/proj/iproute/") - (synopsis "IP routing table") - (description "IP Routing Table is a tree of IP ranges to search one of -them on the longest match base. It is a kind of TRIE with one way branching -removed. Both IPv4 and IPv6 are supported.") - (license license:bsd-3))) - -(define-public ghc-iwlib - (package - (name "ghc-iwlib") - (version "0.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/iwlib/iwlib-" - version ".tar.gz")) - (sha256 - (base32 "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz")))) - (build-system haskell-build-system) - (inputs - `(("wireless-tools" ,wireless-tools))) - (home-page "https://github.com/jaor/iwlib") - (synopsis "Haskell binding to the iw wireless networking library") - (description - "IWlib is a thin Haskell binding to the iw C library. It provides -information about the current wireless network connections, and adapters on -supported systems.") - (license license:bsd-3))) - -(define-public ghc-regex-base - (package - (name "ghc-regex-base") - (version "0.93.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-base/regex-base-" - version - ".tar.gz")) - (sha256 - (base32 - "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10")))) - (build-system haskell-build-system) - (home-page - "https://sourceforge.net/projects/lazy-regex") - (synopsis "Replaces/Enhances Text.Regex") - (description "@code{Text.Regex.Base} provides the interface API for -regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") - (license license:bsd-3))) - -(define-public ghc-regex-posix - (package - (name "ghc-regex-posix") - (version "0.95.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-posix/regex-posix-" - version - ".tar.gz")) - (sha256 - (base32 - "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an")))) - (build-system haskell-build-system) - (inputs - `(("ghc-regex-base" ,ghc-regex-base))) - (home-page "https://sourceforge.net/projects/lazy-regex") - (synopsis "POSIX regular expressions for Haskell") - (description "This library provides the POSIX regex backend used by the -Haskell library @code{regex-base}.") - (license license:bsd-3))) - -(define-public ghc-regex-compat - (package - (name "ghc-regex-compat") - (version "0.95.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-compat/regex-compat-" - version - ".tar.gz")) - (sha256 - (base32 - "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m")))) - (build-system haskell-build-system) - (inputs - `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-regex-posix" ,ghc-regex-posix))) - (home-page "https://sourceforge.net/projects/lazy-regex") - (synopsis "Replaces/Enhances Text.Regex") - (description "This library provides one module layer over -@code{regex-posix} to replace @code{Text.Regex}.") - (license license:bsd-3))) - -(define-public ghc-regex-tdfa-text - (package - (name "ghc-regex-tdfa-text") - (version "1.0.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-tdfa-text/" - "regex-tdfa-text-" version ".tar.gz")) - (sha256 - (base32 - "0090g6lgbdm9lywpqm2d3724nnnh24nx3vnlqr96qc2w486pmmrq")))) - (build-system haskell-build-system) - (inputs - `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-regex-tdfa" ,ghc-regex-tdfa))) - (home-page - "http://hackage.haskell.org/package/regex-tdfa-text") - (synopsis "Text interface for regex-tdfa") - (description - "This provides an extra text interface for regex-tdfa.") - (license license:bsd-3))) - -(define-public ghc-regex - (package - (name "ghc-regex") - (version "1.0.1.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/regex/" - "regex-" version ".tar.gz")) - (sha256 - (base32 - "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'relax-dependencies - (lambda _ - (substitute* "regex.cabal" - (("base-compat.*>=.*0.6.*") - "base-compat >= 0.6\n") - (("template-haskell.*>=.*2.7.*") - "template-haskell >= 2.7\n")) - #t))))) - (inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-hashable" ,ghc-hashable) - ("ghc-regex-base" ,ghc-regex-base) - ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) - ("ghc-regex-tdfa" ,ghc-regex-tdfa) - ("ghc-regex-tdfa-text" ,ghc-regex-tdfa-text) - ("ghc-time-locale-compat" ,ghc-time-locale-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-utf8-string" ,ghc-utf8-string))) - (home-page "http://regex.uk") - (synopsis "Toolkit for regex-base") - (description - "This package provides a regular expression toolkit for @code{regex-base} -with compile-time checking of regular expression syntax, data types for -matches and captures, a text replacement toolkit, portable options, high-level -AWK-like tools for building text processing apps, regular expression macros -with parsers and test bench, comprehensive documentation, tutorials and -copious examples.") - (license license:bsd-3))) - -(define-public ghc-parsers - (package - (name "ghc-parsers") - (version "0.12.9") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/parsers/parsers-" - version - ".tar.gz")) - (sha256 - (base32 - "1r05sc1mcglk8w596kq9a1brfn9c2vll8lq16j07ln0vsz4jzrc1")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Test fails with "cannot satisfy - ; -package attoparsec-0.13.0.1" - (inputs - `(("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-scientific" ,ghc-scientific) - ("ghc-charset" ,ghc-charset) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (home-page "https://github.com/ekmett/parsers/") - (synopsis "Parsing combinators") - (description "This library provides convenient combinators for working -with and building parsing combinator libraries. Given a few simple instances, -you get access to a large number of canned definitions. Instances exist for -the parsers provided by @code{parsec}, @code{attoparsec} and @code{base}'s -@code{Text.Read}.") - (license license:bsd-3))) - -(define-public ghc-trifecta - (package - (name "ghc-trifecta") - (version "2") - (source (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/trifecta/" - "trifecta-" version ".tar.gz")) - (sha256 - (base32 - "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; doctest suite fails to build on i686 - (inputs - `(("ghc-reducers" ,ghc-reducers) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-charset" ,ghc-charset) - ("ghc-comonad" ,ghc-comonad) - ("ghc-fingertree" ,ghc-fingertree) - ("ghc-hashable" ,ghc-hashable) - ("ghc-lens" ,ghc-lens) - ("ghc-parsers" ,ghc-parsers) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-utf8-string" ,ghc-utf8-string))) - (native-inputs - `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/ekmett/trifecta/") - (synopsis "Parser combinator library with convenient diagnostics") - (description "Trifecta is a modern parser combinator library for Haskell, -with slicing and Clang-style colored diagnostics.") - (license license:bsd-3))) - -(define-public ghc-time-locale-compat - (package - (name "ghc-time-locale-compat") - (version "0.1.1.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "time-locale-compat/time-locale-compat-" - version ".tar.gz")) - (sha256 - (base32 - "0b2hmj8wwrfkndwzgm11qr496ca2ahwdxcj3m0ii91bxvrk1bzq7")))) - (build-system haskell-build-system) - (inputs `(("ghc-old-locale" ,ghc-old-locale))) - (home-page "https://github.com/khibino/haskell-time-locale-compat") - (synopsis "Compatibility of TimeLocale between old-locale and time-1.5") - (description "This package contains a wrapped name module for -@code{TimeLocale}.") - (license license:bsd-3))) - -(define-public ghc-attoparsec - (package - (name "ghc-attoparsec") - (version "0.13.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/attoparsec/attoparsec-" - version - ".tar.gz")) - (sha256 - (base32 - "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-for-newer-quickcheck - (lambda _ - (substitute* "attoparsec.cabal" - (("QuickCheck >= 2\\.7 && < 2\\.10") - "QuickCheck >= 2.7 && < 2.12")) - ;; This test fails because of the newer QuickCheck: - ;; . - (substitute* "tests/QC/ByteString.hs" - ((", testProperty \"satisfyWith\" satisfyWith") - ""))))))) - (inputs - `(("ghc-scientific" ,ghc-scientific))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-quickcheck-unicode" ,ghc-quickcheck-unicode) - ("ghc-vector" ,ghc-vector))) - (home-page "https://github.com/bos/attoparsec") - (synopsis "Fast combinator parsing for bytestrings and text") - (description "This library provides a fast parser combinator library, -aimed particularly at dealing efficiently with network protocols and -complicated text/binary file formats.") - (license license:bsd-3))) - -(define-public ghc-attoparsec-bootstrap - (package - (inherit ghc-attoparsec) - (name "ghc-attoparsec-bootstrap") - (arguments `(#:tests? #f)) - (inputs - `(("ghc-scientific" ,ghc-scientific-bootstrap))) - (native-inputs '()) - (properties '(hidden? #t)))) - -(define-public ghc-zip-archive - (package - (name "ghc-zip-archive") - (version "0.3.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/zip-archive/zip-archive-" - version - ".tar.gz")) - (sha256 - (base32 - "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq")))) - (build-system haskell-build-system) - (inputs - `(("ghc-digest" ,ghc-digest) - ("ghc-temporary" ,ghc-temporary) - ("ghc-zlib" ,ghc-zlib))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("unzip" ,unzip))) - (home-page "https://hackage.haskell.org/package/zip-archive") - (synopsis "Zip archive library for Haskell") - (description "The zip-archive library provides functions for creating, -modifying, and extracting files from zip archives in Haskell.") - (license license:bsd-3))) - -(define-public ghc-distributive - (package - (name "ghc-distributive") - (version "0.5.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/distributive/distributive-" - version - ".tar.gz")) - (sha256 - (base32 - "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("6" "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"))) - (inputs - `(("ghc-tagged" ,ghc-tagged) - ("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-generic-deriving" ,ghc-generic-deriving))) - (native-inputs - `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/ekmett/distributive/") - (synopsis "Distributive functors for Haskell") - (description "This package provides distributive functors for Haskell. -Dual to @code{Traversable}.") - (license license:bsd-3))) - -(define-public ghc-cereal - (package - (name "ghc-cereal") - (version "0.5.7.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cereal/cereal-" - version - ".tar.gz")) - (sha256 - (base32 - "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-fail" ,ghc-fail) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://hackage.haskell.org/package/cereal") - (synopsis "Binary serialization library") - (description "This package provides a binary serialization library, -similar to @code{binary}, that introduces an @code{isolate} primitive for -parser isolation, and labeled blocks for better error messages.") - (license license:bsd-3))) - -(define-public ghc-comonad - (package - (name "ghc-comonad") - (version "5.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/comonad/comonad-" - version - ".tar.gz")) - (sha256 - (base32 - "09g870c4flp4k3fgbibsd0mmfjani1qcpbcl685v8x89kxzrva3q")))) - (build-system haskell-build-system) - (native-inputs - `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest))) - (inputs - `(("ghc-contravariant" ,ghc-contravariant) - ("ghc-distributive" ,ghc-distributive) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-tagged" ,ghc-tagged) - ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://github.com/ekmett/comonad/") - (synopsis "Comonads for Haskell") - (description "This library provides @code{Comonad}s for Haskell.") - (license license:bsd-3))) - -(define-public ghc-polyparse - (package - (name "ghc-polyparse") - (version "1.12") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/polyparse/polyparse-" - version - ".tar.gz")) - (sha256 - (base32 - "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m")))) - (build-system haskell-build-system) - (home-page - "http://code.haskell.org/~malcolm/polyparse/") - (synopsis - "Alternative parser combinator libraries") - (description - "This package provides a variety of alternative parser combinator -libraries, including the original HuttonMeijer set. The Poly sets have -features like good error reporting, arbitrary token type, running state, lazy -parsing, and so on. Finally, Text.Parse is a proposed replacement for the -standard Read class, for better deserialisation of Haskell values from -Strings.") - (license license:lgpl2.1))) - -(define-public ghc-extra - (package - (name "ghc-extra") - (version "1.6.9") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/extra/extra-" - version - ".tar.gz")) - (sha256 - (base32 - "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-clock" ,ghc-clock) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/ndmitchell/extra") - (synopsis "Extra Haskell functions") - (description "This library provides extra functions for the standard -Haskell libraries. Most functions are simple additions, filling out missing -functionality. A few functions are available in later versions of GHC, but -this package makes them available back to GHC 7.2.") - (license license:bsd-3))) - -(define-public ghc-profunctors - (package - (name "ghc-profunctors") - (version "5.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/profunctors/profunctors-" - version - ".tar.gz")) - (sha256 - (base32 - "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"))) - (inputs - `(("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-comonad" ,ghc-comonad) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-distributive" ,ghc-distributive) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-tagged" ,ghc-tagged))) - (home-page "https://github.com/ekmett/profunctors/") - (synopsis "Profunctors for Haskell") - (description "This library provides profunctors for Haskell.") - (license license:bsd-3))) - -(define-public ghc-reducers - (package - (name "ghc-reducers") - (version "3.12.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/reducers/reducers-" - version - ".tar.gz")) - (sha256 - (base32 - "09wf8pl9ycglcv6qj5ba26gkg2s5iy81hsx9xp0q8na0cwvp71ki")))) - (build-system haskell-build-system) - (inputs - `(("ghc-fingertree" ,ghc-fingertree) - ("ghc-hashable" ,ghc-hashable) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-semigroups" ,ghc-semigroups))) - (home-page "https://github.com/ekmett/reducers/") - (synopsis "Semigroups, specialized containers and a general map/reduce framework") - (description "This library provides various semigroups, specialized -containers and a general map/reduce framework for Haskell.") - (license license:bsd-3))) - -(define-public ghc-appar - (package - (name "ghc-appar") - (version "0.1.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/appar/appar-" - version - ".tar.gz")) - (sha256 - (base32 - "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq")))) - (build-system haskell-build-system) - (home-page - "https://hackage.haskell.org/package/appar") - (synopsis "Simple applicative parser") - (description "This package provides a simple applicative parser in Parsec -style.") - (license license:bsd-3))) - -(define-public ghc-safe - (package - (name "ghc-safe") - (version "0.3.17") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/safe/safe-" - version - ".tar.gz")) - (sha256 - (base32 - "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/ndmitchell/safe#readme") - (synopsis "Library of safe (exception free) functions") - (description "This library provides wrappers around @code{Prelude} and -@code{Data.List} functions, such as @code{head} and @code{!!}, that can throw -exceptions.") - (license license:bsd-3))) - -(define-public ghc-generic-deriving - (package - (name "ghc-generic-deriving") - (version "1.12.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/generic-deriving/generic-deriving-" - version - ".tar.gz")) - (sha256 - (base32 - "1i7d6cpj9yhaqb79zays3nqchhaacacjz9bkc0zlwj73y5gvi22n")))) - (build-system haskell-build-system) - (inputs - `(("ghc-th-abstraction" ,ghc-th-abstraction))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/generic-deriving") - (synopsis "Generalise the deriving mechanism to arbitrary classes") - (description "This package provides functionality for generalising the -deriving mechanism in Haskell to arbitrary classes.") - (license license:bsd-3))) - -(define-public ghc-pcre-light - (package - (name "ghc-pcre-light") - (version "0.4.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/pcre-light/pcre-light-" - version - ".tar.gz")) - (sha256 - (base32 - "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82")))) - (build-system haskell-build-system) - (inputs - `(("pcre" ,pcre))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://github.com/Daniel-Diaz/pcre-light") - (synopsis "Haskell library for Perl 5 compatible regular expressions") - (description "This package provides a small, efficient, and portable regex -library for Perl 5 compatible regular expressions. The PCRE library is a set -of functions that implement regular expression pattern matching using the same -syntax and semantics as Perl 5.") - (license license:bsd-3))) - -(define-public ghc-logict - (package - (name "ghc-logict") - (version "0.6.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/logict/logict-" - version - ".tar.gz")) - (sha256 - (base32 - "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi")))) - (build-system haskell-build-system) - (home-page "http://code.haskell.org/~dolio/") - (synopsis "Backtracking logic-programming monad") - (description "This library provides a continuation-based, backtracking, -logic programming monad. An adaptation of the two-continuation implementation -found in the paper \"Backtracking, Interleaving, and Terminating Monad -Transformers\" available @uref{http://okmij.org/ftp/papers/LogicT.pdf, -online}.") - (license license:bsd-3))) - -(define-public ghc-xml - (package - (name "ghc-xml") - (version "1.3.14") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xml/xml-" - version - ".tar.gz")) - (sha256 - (base32 - "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) - (build-system haskell-build-system) - (home-page "http://code.galois.com") - (synopsis "Simple XML library for Haskell") - (description "This package provides a simple XML library for Haskell.") - (license license:bsd-3))) - -(define-public ghc-feed - (package - (name "ghc-feed") - (version "1.0.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "feed/feed-" version ".tar.gz")) - (sha256 - (base32 - "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("4" "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d"))) - (inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-old-time" ,ghc-old-time) - ("ghc-safe" ,ghc-safe) - ("ghc-time-locale-compat" ,ghc-time-locale-compat) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-xml-conduit" ,ghc-xml-conduit) - ("ghc-xml-types" ,ghc-xml-types))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/bergmark/feed") - (synopsis "Haskell package for handling various syndication formats") - (description "This Haskell package includes tools for generating and -consuming feeds in both RSS (Really Simple Syndication) and Atom format.") - (license license:bsd-3))) - -(define-public ghc-exceptions - (package - (name "ghc-exceptions") - (version "0.10.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/exceptions/exceptions-" - version - ".tar.gz")) - (sha256 - (base32 - "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (inputs - `(("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://github.com/ekmett/exceptions/") - (synopsis "Extensible optionally-pure exceptions") - (description "This library provides extensible optionally-pure exceptions -for Haskell.") - (license license:bsd-3))) - -(define-public ghc-temporary - (package - (name "ghc-temporary") - (version "1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/temporary/temporary-" - version - ".tar.gz")) - (sha256 - (base32 - "144qhwfwg37l3k313raf4ssiz16jbgwlm1nf4flgqpsbd69jji4c")))) - (build-system haskell-build-system) - (inputs - `(("ghc-exceptions" ,ghc-exceptions) - ("ghc-random" ,ghc-random))) - (native-inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "https://www.github.com/batterseapower/temporary") - (synopsis "Temporary file and directory support") - (description "The functions for creating temporary files and directories -in the Haskelll base library are quite limited. This library just repackages -the Cabal implementations of its own temporary file and folder functions so -that you can use them without linking against Cabal or depending on it being -installed.") - (license license:bsd-3))) - -(define-public ghc-temporary-rc - (package - (name "ghc-temporary-rc") - (version "1.2.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/temporary-rc/temporary-rc-" - version - ".tar.gz")) - (sha256 - (base32 - "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs")))) - (build-system haskell-build-system) - (inputs `(("ghc-exceptions" ,ghc-exceptions))) - (home-page - "https://www.github.com/feuerbach/temporary") - (synopsis - "Portable temporary file and directory support") - (description - "The functions for creating temporary files and directories in the base -library are quite limited. The unixutils package contains some good ones, but -they aren't portable to Windows. This library just repackages the Cabal -implementations of its own temporary file and folder functions so that you can -use them without linking against Cabal or depending on it being installed. -This is a better maintained fork of the \"temporary\" package.") - (license license:bsd-3))) - -(define-public ghc-smallcheck - (package - (name "ghc-smallcheck") - (version "1.1.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/smallcheck/smallcheck-" - version - ".tar.gz")) - (sha256 - (base32 - "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h")))) - (build-system haskell-build-system) - (inputs - `(("ghc-logict" ,ghc-logict))) - (home-page - "https://github.com/feuerbach/smallcheck") - (synopsis "Property-based testing library") - (description "SmallCheck is a testing library that allows to verify -properties for all test cases up to some depth. The test cases are generated -automatically by SmallCheck.") - (license license:bsd-3))) - -(define-public ghc-silently - (package - (name "ghc-silently") - (version "1.2.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/silently/silently-" - version - ".tar.gz")) - (sha256 - (base32 - "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ;; circular dependency with nanospec - ;; (inputs - ;; `(("ghc-temporary" ,ghc-temporary))) - (home-page "https://github.com/hspec/silently") - (synopsis "Prevent writing to stdout") - (description "This package provides functions to prevent or capture -writing to stdout and other handles.") - (license license:bsd-3))) - -(define-public ghc-case-insensitive - (package - (name "ghc-case-insensitive") - (version "1.2.0.11") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/case-insensitive/case-insensitive-" - version - ".tar.gz")) - (sha256 - (base32 - "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7")))) - (build-system haskell-build-system) - ;; these inputs are necessary to use this library - (inputs - `(("ghc-hashable" ,ghc-hashable))) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. - (home-page - "https://github.com/basvandijk/case-insensitive") - (synopsis "Case insensitive string comparison") - (description - "The module @code{Data.CaseInsensitive} provides the @code{CI} type -constructor which can be parameterised by a string-like type like: -@code{String}, @code{ByteString}, @code{Text}, etc. Comparisons of values of -the resulting type will be insensitive to cases.") - (license license:bsd-3))) - -(define-public ghc-syb - (package - (name "ghc-syb") - (version "0.7") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/syb/syb-" - version - ".tar.gz")) - (sha256 - (base32 - "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq")))) - (build-system haskell-build-system) - (inputs - `(("ghc-hunit" ,ghc-hunit))) - (home-page - "http://www.cs.uu.nl/wiki/GenericProgramming/SYB") - (synopsis "Scrap Your Boilerplate") - (description "This package contains the generics system described in the -/Scrap Your Boilerplate/ papers (see -@uref{http://www.cs.uu.nl/wiki/GenericProgramming/SYB, the website}). It -defines the @code{Data} class of types permitting folding and unfolding of -constructor applications, instances of this class for primitive types, and a -variety of traversals.") - (license license:bsd-3))) - -(define-public ghc-fgl - (package - (name "ghc-fgl") - (version "5.6.0.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fgl/fgl-" - version - ".tar.gz")) - (sha256 - (base32 - "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "fgl.cabal" - (("QuickCheck >= 2\\.8 && < 2\\.10") - "QuickCheck >= 2.8 && < 2.12") - (("hspec >= 2\\.1 && < 2\\.5") - "hspec >= 2.1 && < 2.6"))))))) - (inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://web.engr.oregonstate.edu/~erwig/fgl/haskell") - (synopsis - "Martin Erwig's Functional Graph Library") - (description "The functional graph library, FGL, is a collection of type -and function definitions to address graph problems. The basis of the library -is an inductive definition of graphs in the style of algebraic data types that -encourages inductive, recursive definitions of graph algorithms.") - (license license:bsd-3))) - -(define-public ghc-chasingbottoms - (package - (name "ghc-chasingbottoms") - (version "1.3.1.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/ChasingBottoms/" - "ChasingBottoms-" version ".tar.gz")) - (sha256 - (base32 - "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633")))) - (build-system haskell-build-system) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-random" ,ghc-random) - ("ghc-syb" ,ghc-syb))) - (home-page "https://hackage.haskell.org/package/ChasingBottoms") - (synopsis "Testing of partial and infinite values in Haskell") - (description - ;; FIXME: There should be a @comma{} in the uref text, but it is not - ;; rendered properly. - "This is a library for testing code involving bottoms or infinite values. -For the underlying theory and a larger example involving use of QuickCheck, -see the article -@uref{http://www.cse.chalmers.se/~nad/publications/danielsson-jansson-mpc2004.html, -\"Chasing Bottoms A Case Study in Program Verification in the Presence of -Partial and Infinite Values\"}.") - (license license:expat))) - -(define-public ghc-unordered-containers - (package - (name "ghc-unordered-containers") - (version "0.2.9.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unordered-containers" - "/unordered-containers-" version ".tar.gz")) - (sha256 - (base32 - "0l4264p0av12cc6i8gls13q8y27x12z2ar4x34n3x59y99fcnc37")))) - (build-system haskell-build-system) - (inputs - `(("ghc-chasingbottoms" ,ghc-chasingbottoms) - ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) - ("ghc-hashable" ,ghc-hashable))) - (home-page - "https://github.com/tibbe/unordered-containers") - (synopsis - "Efficient hashing-based container types") - (description - "Efficient hashing-based container types. The containers have been -optimized for performance critical use, both in terms of large data quantities -and high speed.") - (license license:bsd-3))) - -(define-public ghc-unordered-containers-bootstrap - (package - (inherit ghc-unordered-containers) - (name "ghc-unordered-containers-bootstrap") - (arguments `(#:tests? #f)) - (inputs - `(("ghc-hashable" ,ghc-hashable-bootstrap))) - (properties '(hidden? #t)))) - -(define-public ghc-uniplate - (package - (name "ghc-uniplate") - (version "1.6.12") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/uniplate/uniplate-" - version - ".tar.gz")) - (sha256 - (base32 - "1dx8f9aw27fz8kw0ad1nm6355w5rdl7bjvb427v2bsgnng30pipw")))) - (build-system haskell-build-system) - (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-hashable" ,ghc-hashable) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (home-page "http://community.haskell.org/~ndm/uniplate/") - (synopsis "Simple, concise and fast generic operations") - (description "Uniplate is a library for writing simple and concise generic -operations. Uniplate has similar goals to the original Scrap Your Boilerplate -work, but is substantially simpler and faster.") - (license license:bsd-3))) - -(define-public ghc-base64-bytestring - (package - (name "ghc-base64-bytestring") - (version "1.0.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base64-bytestring/base64-bytestring-" - version - ".tar.gz")) - (sha256 - (base32 "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. - (home-page "https://github.com/bos/base64-bytestring") - (synopsis "Base64 encoding and decoding for ByteStrings") - (description "This library provides fast base64 encoding and decoding for -Haskell @code{ByteString}s.") - (license license:bsd-3))) - -(define-public ghc-annotated-wl-pprint - (package - (name "ghc-annotated-wl-pprint") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/annotated-wl-pprint" - "/annotated-wl-pprint-" version - ".tar.gz")) - (sha256 - (base32 - "061xfz6qany3wf95csl8dcik2pz22cn8iv1qchhm16isw5zjs9hc")))) - (build-system haskell-build-system) - (home-page - "https://github.com/david-christiansen/annotated-wl-pprint") - (synopsis - "The Wadler/Leijen Pretty Printer, with annotation support") - (description "This is a modified version of wl-pprint, which was based on -Wadler's paper \"A Prettier Printer\". This version allows the library user -to annotate the text with semantic information, which can later be rendered in -a variety of ways.") - (license license:bsd-3))) - -(define-public ghc-wl-pprint - (package - (name "ghc-wl-pprint") - (version "1.2.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wl-pprint/wl-pprint-" - version ".tar.gz")) - (sha256 - (base32 - "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/wl-pprint") - (synopsis "Wadler/Leijen pretty printer") - (description - "This is a pretty printing library based on Wadler's paper @i{A Prettier -Printer}. This version allows the library user to declare overlapping -instances of the @code{Pretty} class.") - (license license:bsd-3))) - -(define-public ghc-ansi-wl-pprint - (package - (name "ghc-ansi-wl-pprint") - (version "0.6.8.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "ansi-wl-pprint/ansi-wl-pprint-" - version ".tar.gz")) - (sha256 - (base32 - "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56")))) - (build-system haskell-build-system) - (inputs - `(("ghc-ansi-terminal" ,ghc-ansi-terminal))) - (home-page "https://github.com/ekmett/ansi-wl-pprint") - (synopsis "Wadler/Leijen Pretty Printer for colored ANSI terminal output") - (description "This is a pretty printing library based on Wadler's paper -\"A Prettier Printer\". It has been enhanced with support for ANSI terminal -colored output using the ansi-terminal package.") - (license license:bsd-3))) - -(define-public ghc-split - (package - (name "ghc-split") - (version "0.2.3.3") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/split/split-" - version - ".tar.gz")) - (sha256 - (base32 - "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://hackage.haskell.org/package/split") - (synopsis "Combinator library for splitting lists") - (description "This package provides a collection of Haskell functions for -splitting lists into parts, akin to the @code{split} function found in several -mainstream languages.") - (license license:bsd-3))) - -(define-public ghc-parser-combinators - (package - (name "ghc-parser-combinators") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "parser-combinators/parser-combinators-" - version ".tar.gz")) - (sha256 - (base32 - "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75")))) - (build-system haskell-build-system) - (home-page "https://github.com/mrkkrp/parser-combinators") - (synopsis "Commonly useful parser combinators") - (description - "This is a lightweight package providing commonly useful parser -combinators.") - (license license:bsd-3))) - -(define-public ghc-megaparsec - (package - (name "ghc-megaparsec") - (version "6.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "megaparsec/megaparsec-" - version ".tar.gz")) - (sha256 - (base32 - "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("4" "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1"))) - (inputs - `(("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-parser-combinators" ,ghc-parser-combinators) - ("ghc-scientific" ,ghc-scientific))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("ghc-hspec-expectations" ,ghc-hspec-expectations) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/mrkkrp/megaparsec") - (synopsis "Monadic parser combinators") - (description - "This is an industrial-strength monadic parser combinator library. -Megaparsec is a feature-rich package that strikes a nice balance between -speed, flexibility, and quality of parse errors.") - (license license:bsd-2))) - -(define-public ghc-vector - (package - (name "ghc-vector") - (version "0.12.0.1") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/vector/vector-" - version - ".tar.gz")) - (sha256 - (base32 - "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i")))) - (build-system haskell-build-system) - ;; FIXME: To simplify upgrading all Haskell packages, we leave the tests - ;; disabled for now. - (arguments - `(#:cabal-revision - ("3" "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x") - #:tests? #f)) - (inputs - `(("ghc-primitive" ,ghc-primitive) - ("ghc-random" ,ghc-random) - ("ghc-quickcheck" ,ghc-quickcheck) - ;; ("ghc-hunit" ,ghc-hunit) - ;; ("ghc-test-framework" ,ghc-test-framework) - ;; ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ;; ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) - )) - (home-page "https://github.com/haskell/vector") - (synopsis "Efficient Arrays") - (description "This library provides an efficient implementation of -Int-indexed arrays (both mutable and immutable), with a powerful loop -optimisation framework.") - (license license:bsd-3))) - -(define-public ghc-vector-binary-instances - (package - (name "ghc-vector-binary-instances") - (version "0.2.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "vector-binary-instances/vector-binary-instances-" - version ".tar.gz")) - (sha256 - (base32 - "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i"))) - (inputs - `(("ghc-vector" ,ghc-vector))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://github.com/bos/vector-binary-instances") - (synopsis "Instances of Data.Binary and Data.Serialize for vector") - (description "This library provides instances of @code{Binary} for the -types defined in the @code{vector} package, making it easy to serialize -vectors to and from disk. We use the generic interface to vectors, so all -vector types are supported. Specific instances are provided for unboxed, -boxed and storable vectors.") - (license license:bsd-3))) - -(define-public ghc-bloomfilter - (package - (name "ghc-bloomfilter") - (version "2.0.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "bloomfilter/bloomfilter-" version ".tar.gz")) - (sha256 - (base32 - "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-random" ,ghc-random) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/bos/bloomfilter") - (synopsis "Pure and impure Bloom filter implementations") - (description "This package provides both mutable and immutable Bloom -filter data types, along with a family of hash functions and an easy-to-use -interface.") - (license license:bsd-3))) - -(define-public ghc-network - (package - (name "ghc-network") - (version "2.6.3.6") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/network/network-" - version - ".tar.gz")) - (sha256 - (base32 - "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv")))) - (build-system haskell-build-system) - ;; The regression tests depend on an unpublished module. - (arguments `(#:tests? #f)) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-doctest" ,ghc-doctest) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/haskell/network") - (synopsis "Low-level networking interface") - (description - "This package provides a low-level networking interface.") - (license license:bsd-3))) - -(define-public ghc-network-uri - (package - (name "ghc-network-uri") - (version "2.6.1.0") - (outputs '("out" "doc")) - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/network-uri/network-uri-" - version - ".tar.gz")) - (sha256 - (base32 - "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2")))) - (build-system haskell-build-system) - (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. - (inputs - `(("ghc-network" ,ghc-network))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (home-page - "https://github.com/haskell/network-uri") - (synopsis "Library for URI manipulation") - (description "This package provides an URI manipulation interface. In -@code{network-2.6} the @code{Network.URI} module was split off from the -@code{network} package into this package.") - (license license:bsd-3))) - -(define-public ghc-ansi-terminal - (package - (name "ghc-ansi-terminal") - (version "0.8.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/ansi-terminal/ansi-terminal-" - version - ".tar.gz")) - (sha256 - (base32 - "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-colour" ,ghc-colour))) - (home-page "https://github.com/feuerbach/ansi-terminal") - (synopsis "ANSI terminal support for Haskell") - (description "This package provides ANSI terminal support for Haskell. It -allows cursor movement, screen clearing, color output showing or hiding the -cursor, and changing the title.") - (license license:bsd-3))) - -(define-public ghc-vault - (package - (name "ghc-vault") - (version "0.3.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/vault/vault-" - version - ".tar.gz")) - (sha256 - (base32 - "072mbrihsdsb8c6xvg6lvk0rqjgvxvi8qkg4n6wwym5hq0pfa04y")))) - (build-system haskell-build-system) - (inputs - `(("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-hashable" ,ghc-hashable) - ("ghc-semigroupoids" ,ghc-semigroupoids))) - (home-page - "https://github.com/HeinrichApfelmus/vault") - (synopsis "Persistent store for arbitrary values") - (description "This package provides vaults for Haskell. A vault is a -persistent store for values of arbitrary types. It's like having first-class -access to the storage space behind @code{IORefs}. The data structure is -analogous to a bank vault, where you can access different bank boxes with -different keys; hence the name. Also provided is a @code{locker} type, -representing a store for a single element.") - (license license:bsd-3))) - -(define-public ghc-edisonapi - (package - (name "ghc-edisonapi") - (version "1.3.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/EdisonAPI" - "/EdisonAPI-" version ".tar.gz")) - (sha256 - (base32 "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm")))) - (build-system haskell-build-system) - (home-page "http://rwd.rdockins.name/edison/home/") - (synopsis "Library of efficient, purely-functional data structures (API)") - (description - "Edison is a library of purely functional data structures written by -Chris Okasaki. It is named after Thomas Alva Edison and for the mnemonic -value EDiSon (Efficient Data Structures). Edison provides several families of -abstractions, each with multiple implementations. The main abstractions -provided by Edison are: Sequences such as stacks, queues, and dequeues; -Collections such as sets, bags and heaps; and Associative Collections such as -finite maps and priority queues where the priority and element are distinct.") - (license license:expat))) - -(define-public ghc-edisoncore - (package - (name "ghc-edisoncore") - (version "1.3.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/EdisonCore" - "/EdisonCore-" version ".tar.gz")) - (sha256 - (base32 "0fgj5iwiv3v2gdgx7kjcr15dcs4x1kvmjspp3p99wyhh0x6h3ikk")))) - (build-system haskell-build-system) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-edisonapi" ,ghc-edisonapi))) - (home-page "http://rwd.rdockins.name/edison/home/") - (synopsis "Library of efficient, purely-functional data structures") - (description - "This package provides the core Edison data structure implementations, -including multiple sequence, set, bag, and finite map concrete implementations -with various performance characteristics.") - (license license:expat))) - -(define-public ghc-mmorph - (package - (name "ghc-mmorph") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/mmorph/mmorph-" - version - ".tar.gz")) - (sha256 - (base32 - "1gjz1ib968lqybma7my1n19qq6cdj6a7nskrlnwy4jy9jrwzs2n9")))) - (build-system haskell-build-system) - (inputs - `(("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://hackage.haskell.org/package/mmorph") - (synopsis "Monad morphisms") - (description - "This library provides monad morphism utilities, most commonly used for -manipulating monad transformer stacks.") - (license license:bsd-3))) - -(define-public ghc-ifelse - (package - (name "ghc-ifelse") - (version "0.85") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "IfElse/IfElse-" version ".tar.gz")) - (sha256 - (base32 - "1kfx1bwfjczj93a8yqz1n8snqiq5655qgzwv1lrycry8wb1vzlwa")))) - (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/IfElse") - (synopsis "Monadic control flow with anaphoric variants") - (description "This library provides functions for control flow inside of -monads with anaphoric variants on @code{if} and @code{when} and a C-like -@code{switch} function.") - (license license:bsd-3))) - -(define-public ghc-monad-control - (package - (name "ghc-monad-control") - (version "1.0.2.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/monad-control" - "/monad-control-" version ".tar.gz")) - (sha256 - (base32 - "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c")))) - (build-system haskell-build-system) - (inputs - `(("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://github.com/basvandijk/monad-control") - (synopsis "Monad transformers to lift control operations like exception -catching") - (description "This package defines the type class @code{MonadBaseControl}, -a subset of @code{MonadBase} into which generic control operations such as -@code{catch} can be lifted from @code{IO} or any other base monad.") - (license license:bsd-3))) - -(define-public ghc-fail - (package - (name "ghc-fail") - (version "4.9.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/fail/fail-" - version ".tar.gz")) - (sha256 - (base32 "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d")))) - (build-system haskell-build-system) - (arguments `(#:haddock? #f)) ; Package contains no documentation. - (home-page "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail") - (synopsis "Forward-compatible MonadFail class") - (description - "This package contains the @code{Control.Monad.Fail} module providing the -@uref{https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail, MonadFail} -class that became available in -@uref{https://hackage.haskell.org/package/base-4.9.0.0, base-4.9.0.0} for -older @code{base} package versions. This package turns into an empty package -when used with GHC versions which already provide the -@code{Control.Monad.Fail} module.") - (license license:bsd-3))) - -(define-public ghc-monadplus - (package - (name "ghc-monadplus") - (version "1.4.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/monadplus" - "/monadplus-" version ".tar.gz")) - (sha256 - (base32 "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/monadplus") - (synopsis "Filtering and folding over arbitrary MonadPlus instances") - (description - "This package generalizes many common stream operations such as -@code{filter}, @code{catMaybes} etc, enabling filtering and folding over -arbitrary @code{MonadPlus} instances.") - (license license:bsd-3))) - -(define-public ghc-byteorder - (package - (name "ghc-byteorder") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/byteorder/byteorder-" - version - ".tar.gz")) - (sha256 - (base32 - "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x")))) - (build-system haskell-build-system) - (home-page - "http://community.haskell.org/~aslatter/code/byteorder") - (synopsis - "Exposes the native endianness of the system") - (description - "This package is for working with the native byte-ordering of the -system.") - (license license:bsd-3))) - -(define-public ghc-base-compat - (package - (name "ghc-base-compat") - (version "0.10.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base-compat/base-compat-" - version - ".tar.gz")) - (sha256 - (base32 - "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/base-compat") - (synopsis "Haskell compiler compatibility library") - (description "This library provides functions available in later versions -of base to a wider range of compilers, without requiring the use of CPP -pragmas in your code.") - (license license:bsd-3))) - -(define-public ghc-blaze-builder - (package - (name "ghc-blaze-builder") - (version "0.4.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/blaze-builder/blaze-builder-" - version - ".tar.gz")) - (sha256 - (base32 - "05681dih2d8s96an945wkbwl05w8ddbcfx8n3r3ck79ydyb8pz4i")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Missing test libraries. - (inputs - `(("ghc-utf8-string" ,ghc-utf8-string))) - (home-page "https://github.com/lpsmith/blaze-builder") - (synopsis "Efficient buffered output") - (description "This library provides an implementation of the older -@code{blaze-builder} interface in terms of the new builder that shipped with -@code{bytestring-0.10.4.0}. This implementation is mostly intended as a -bridge to the new builder, so that code that uses the old interface can -interoperate with code that uses the new implementation.") - (license license:bsd-3))) - -(define-public ghc-blaze-markup - (package - (name "ghc-blaze-markup") - (version "0.8.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "blaze-markup/blaze-markup-" - version ".tar.gz")) - (sha256 - (base32 - "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "blaze-markup.cabal" - (("tasty >= 1\\.0 && < 1\\.1") - "tasty >= 1.0 && < 1.2"))))))) - (inputs - `(("ghc-blaze-builder" ,ghc-blaze-builder))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://jaspervdj.be/blaze") - (synopsis "Fast markup combinator library for Haskell") - (description "This library provides core modules of a markup combinator -library for Haskell.") - (license license:bsd-3))) - -(define-public ghc-easy-file - (package - (name "ghc-easy-file") - (version "0.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/easy-file/easy-file-" - version - ".tar.gz")) - (sha256 - (base32 - "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj")))) - (build-system haskell-build-system) - (home-page - "https://github.com/kazu-yamamoto/easy-file") - (synopsis "File handling library for Haskell") - (description "This library provides file handling utilities for Haskell.") - (license license:bsd-3))) - -(define-public ghc-async - (package - (name "ghc-async") - (version "2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/async/async-" - version - ".tar.gz")) - (sha256 - (base32 - "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg")))) - (build-system haskell-build-system) - (inputs - `(("ghc-hashable" ,ghc-hashable) - ("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/simonmar/async") - (synopsis "Library to run IO operations asynchronously") - (description "Async provides a library to run IO operations -asynchronously, and wait for their results. It is a higher-level interface -over threads in Haskell, in which @code{Async a} is a concurrent thread that -will eventually deliver a value of type @code{a}.") - (license license:bsd-3))) - -(define-public ghc-fingertree - (package - (name "ghc-fingertree") - (version "0.1.4.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fingertree/fingertree-" - version ".tar.gz")) - (sha256 - (base32 - "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://hackage.haskell.org/package/fingertree") - (synopsis "Generic finger-tree structure") - (description "This library provides finger trees, a general sequence -representation with arbitrary annotations, for use as a base for -implementations of various collection types. It includes examples, as -described in section 4 of Ralf Hinze and Ross Paterson, \"Finger trees: a -simple general-purpose data structure\".") - (license license:bsd-3))) - -(define-public ghc-optparse-applicative - (package - (name "ghc-optparse-applicative") - (version "0.14.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/optparse-applicative" - "/optparse-applicative-" version ".tar.gz")) - (sha256 - (base32 - "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71")))) - (build-system haskell-build-system) - (inputs - `(("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/pcapriotti/optparse-applicative") - (synopsis "Utilities and combinators for parsing command line options") - (description "This package provides utilities and combinators for parsing -command line options in Haskell.") - (license license:bsd-3))) - -(define-public ghc-base-orphans - (package - (name "ghc-base-orphans") - (version "0.7") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base-orphans/base-orphans-" - version - ".tar.gz")) - (sha256 - (base32 - "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/base-orphans") - (synopsis "Orphan instances for backwards compatibility") - (description "This package defines orphan instances that mimic instances -available in later versions of base to a wider (older) range of compilers.") - (license license:bsd-3))) - -(define-public ghc-auto-update - (package - (name "ghc-auto-update") - (version "0.1.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/auto-update/auto-update-" - version - ".tar.gz")) - (sha256 - (base32 - "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy")))) - (build-system haskell-build-system) - (home-page "https://github.com/yesodweb/wai") - (synopsis "Efficiently run periodic, on-demand actions") - (description "This library provides mechanisms to efficiently run -periodic, on-demand actions in Haskell.") - (license license:expat))) - -(define-public ghc-tagged - (package - (name "ghc-tagged") - (version "0.8.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tagged/tagged-" - version - ".tar.gz")) - (sha256 - (base32 - "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"))) - (inputs - `(("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://hackage.haskell.org/package/tagged") - (synopsis "Haskell phantom types to avoid passing dummy arguments") - (description "This library provides phantom types for Haskell 98, to avoid -having to unsafely pass dummy arguments.") - (license license:bsd-3))) - -(define-public ghc-unbounded-delays - (package - (name "ghc-unbounded-delays") - (version "0.1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unbounded-delays/unbounded-delays-" - version - ".tar.gz")) - (sha256 - (base32 - "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa")))) - (build-system haskell-build-system) - (home-page "https://github.com/basvandijk/unbounded-delays") - (synopsis "Unbounded thread delays and timeouts") - (description "The @code{threadDelay} and @code{timeout} functions from the -Haskell base library use the bounded @code{Int} type for specifying the delay -or timeout period. This package provides alternative functions which use the -unbounded @code{Integer} type.") - (license license:bsd-3))) - -(define-public ghc-clock - (package - (name "ghc-clock") - (version "0.7.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "clock/" - "clock-" version ".tar.gz")) - (sha256 - (base32 "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8")))) - (build-system haskell-build-system) - (inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://hackage.haskell.org/package/clock") - (synopsis "High-resolution clock for Haskell") - (description "A package for convenient access to high-resolution clock and -timer functions of different operating systems via a unified API.") - (license license:bsd-3))) - -;; This package builds `clock` without tests, since the tests rely on tasty -;; and tasty-quickcheck, which in turn require clock to build. -(define-public ghc-clock-bootstrap - (package - (inherit ghc-clock) - (name "ghc-clock-bootstrap") - (arguments '(#:tests? #f)) - (inputs '()) - (properties '((hidden? #t))))) - -(define-public ghc-charset - (package - (name "ghc-charset") - (version "0.3.7.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/charset/charset-" - version - ".tar.gz")) - (sha256 - (base32 - "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x")))) - (build-system haskell-build-system) - (inputs - `(("ghc-semigroups" ,ghc-semigroups) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (home-page "https://github.com/ekmett/charset") - (synopsis "Fast unicode character sets for Haskell") - (description "This package provides fast unicode character sets for -Haskell, based on complemented PATRICIA tries.") - (license license:bsd-3))) - -(define-public ghc-bytestring-builder - (package - (name "ghc-bytestring-builder") - (version "0.10.8.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/bytestring-builder" - "/bytestring-builder-" version ".tar.gz")) - (sha256 - (base32 - "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d")))) - (build-system haskell-build-system) - (arguments `(#:haddock? #f)) ; Package contains no documentation. - (home-page "https://hackage.haskell.org/package/bytestring-builder") - (synopsis "The new bytestring builder, packaged outside of GHC") - (description "This package provides the bytestring builder that is -debuting in bytestring-0.10.4.0, which should be shipping with GHC 7.8. -Compatibility package for older packages.") - (license license:bsd-3))) - -(define-public ghc-nats - (package - (name "ghc-nats") - (version "1.1.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/nats/nats-" - version - ".tar.gz")) - (sha256 - (base32 - "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr")))) - (build-system haskell-build-system) - (arguments `(#:haddock? #f)) - (inputs - `(("ghc-hashable" ,ghc-hashable))) - (home-page "https://hackage.haskell.org/package/nats") - (synopsis "Natural numbers") - (description "This library provides the natural numbers for Haskell.") - (license license:bsd-3))) - -(define-public ghc-nats-bootstrap - (package - (inherit ghc-nats) - (name "ghc-nats-bootstrap") - (inputs - `(("ghc-hashable" ,ghc-hashable-bootstrap))) - (properties '((hidden? #t))))) - -(define-public ghc-void - (package - (name "ghc-void") - (version "0.7.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/void/void-" - version - ".tar.gz")) - (sha256 - (base32 - "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk")))) - (build-system haskell-build-system) - (inputs - `(("ghc-semigroups" ,ghc-semigroups) - ("ghc-hashable" ,ghc-hashable))) - (home-page "https://github.com/ekmett/void") - (synopsis - "Logically uninhabited data type") - (description - "A Haskell 98 logically uninhabited data type, used to indicate that a -given term should not exist.") - (license license:bsd-3))) - -(define-public ghc-invariant - (package - (name "ghc-invariant") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/invariant/invariant-" - version ".tar.gz")) - (sha256 - (base32 - "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-comonad" ,ghc-comonad) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-statevar" ,ghc-statevar) - ("ghc-tagged" ,ghc-tagged) - ("ghc-th-abstraction" ,ghc-th-abstraction) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/nfrisby/invariant-functors") - (synopsis "Haskell98 invariant functors") - (description "Haskell98 invariant functors (also known as exponential -functors). For more information, see Edward Kmett's article -@uref{http://comonad.com/reader/2008/rotten-bananas/, Rotten Bananas}.") - (license license:bsd-2))) - -(define-public ghc-kan-extensions - (package - (name "ghc-kan-extensions") - (version "5.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/kan-extensions/kan-extensions-" - version - ".tar.gz")) - (sha256 - (base32 - "1lyvyiwwh962j2nnnsqzlvp5zq6z8p3spvhmji99cjvldxc7wwkb")))) - (build-system haskell-build-system) - (inputs - `(("ghc-adjunctions" ,ghc-adjunctions) - ("ghc-comonad" ,ghc-comonad) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-distributive" ,ghc-distributive) - ("ghc-free" ,ghc-free) - ("ghc-invariant" ,ghc-invariant) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-tagged" ,ghc-tagged) - ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://github.com/ekmett/kan-extensions/") - (synopsis "Kan extensions library") - (description "This library provides Kan extensions, Kan lifts, various -forms of the Yoneda lemma, and (co)density (co)monads for Haskell.") - (license license:bsd-3))) - -(define-public ghc-call-stack - (package - (name "ghc-call-stack") - (version "0.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "call-stack/call-stack-" - version ".tar.gz")) - (sha256 - (base32 - "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj")))) - (build-system haskell-build-system) - (inputs `(("ghc-nanospec" ,ghc-nanospec))) - (home-page "https://github.com/sol/call-stack#readme") - (synopsis "Use GHC call-stacks in a backward compatible way") - (description "This package provides a compatibility layer for using GHC -call stacks with different versions of the compiler.") - (license license:expat))) - -;; This is used as an input to ghc-hunit. We cannot use ghc-call-stack there, -;; because it depends on ghc-nanospec, which depends on ghc-hunit. -(define-public ghc-call-stack-boot - (hidden-package - (package - (inherit ghc-call-stack) - (arguments '(#:tests? #f)) - (inputs '())))) - -(define-public ghc-statevar - (package - (name "ghc-statevar") - (version "1.1.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/StateVar/StateVar-" - version - ".tar.gz")) - (sha256 - (base32 - "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/StateVar") - (synopsis "State variables for Haskell") - (description "This package provides state variables, which are references -in the @code{IO} monad, like @code{IORef}s or parts of the OpenGL state.") - (license license:bsd-3))) - -(define-public ghc-lens - (package - (name "ghc-lens") - (version "4.16.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/lens/lens-" - version ".tar.gz")) - (sha256 - (base32 - "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"))) - (inputs - `(("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-distributive" ,ghc-distributive) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-free" ,ghc-free) - ("ghc-kan-extensions" ,ghc-kan-extensions) - ("ghc-parallel" ,ghc-parallel) - ("ghc-reflection" ,ghc-reflection) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-vector" ,ghc-vector) - ("ghc-call-stack" ,ghc-call-stack) - ("ghc-comonad" ,ghc-comonad) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-hashable" ,ghc-hashable) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-tagged" ,ghc-tagged) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-void" ,ghc-void) - ("ghc-generic-deriving" ,ghc-generic-deriving) - ("ghc-nats" ,ghc-nats) - ("ghc-simple-reflect" ,ghc-simple-reflect) - ("hlint" ,hlint))) - (native-inputs - `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest) - ("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-th" ,ghc-test-framework-th) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/ekmett/lens/") - (synopsis "Lenses, Folds and Traversals") - (description "This library provides @code{Control.Lens}. The combinators -in @code{Control.Lens} provide a highly generic toolbox for composing families -of getters, folds, isomorphisms, traversals, setters and lenses and their -indexed variants.") - (license license:bsd-3))) - -(define-public ghc-cheapskate - (package - (name "ghc-cheapskate") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/cheapskate/cheapskate-" - version - ".tar.gz")) - (sha256 - (base32 - "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432")))) - (build-system haskell-build-system) - (inputs - `(("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-xss-sanitize" ,ghc-xss-sanitize) - ("ghc-data-default" ,ghc-data-default) - ("ghc-syb" ,ghc-syb) - ("ghc-uniplate" ,ghc-uniplate))) - (home-page "https://github.com/jgm/cheapskate") - (synopsis "Experimental markdown processor") - (description "Cheapskate is an experimental Markdown processor in pure -Haskell. It aims to process Markdown efficiently and in the most forgiving -possible way. It is designed to deal with any input, including garbage, with -linear performance. Output is sanitized by default for protection against -cross-site scripting (@dfn{XSS}) attacks.") - (license license:bsd-3))) - -(define-public ghc-bifunctors - (package - (name "ghc-bifunctors") - (version "5.5.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/bifunctors/bifunctors-" - version - ".tar.gz")) - (sha256 - (base32 - "1jn9rxg643xnlhrknmjz88nblcpsr45xwjkwwnn5nxpasa7m4d6l")))) - (build-system haskell-build-system) - (inputs - `(("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-comonad" ,ghc-comonad) - ("ghc-th-abstraction" ,ghc-th-abstraction) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-tagged" ,ghc-tagged) - ("ghc-semigroups" ,ghc-semigroups))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/ekmett/bifunctors/") - (synopsis "Bifunctors for Haskell") - (description "This package provides bifunctors for Haskell.") - (license license:bsd-3))) - -(define-public ghc-semigroupoids - (package - (name "ghc-semigroupoids") - (version "5.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/semigroupoids/semigroupoids-" - version - ".tar.gz")) - (sha256 - (base32 - "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("4" "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"))) - (inputs - `(("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-comonad" ,ghc-comonad) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-distributive" ,ghc-distributive) - ("ghc-hashable" ,ghc-hashable) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-tagged" ,ghc-tagged) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs - `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest))) - (home-page "https://github.com/ekmett/semigroupoids") - (synopsis "Semigroupoids operations for Haskell") - (description "This library provides a wide array of (semi)groupoids and -operations for working with them. A @code{Semigroupoid} is a @code{Category} -without the requirement of identity arrows for every object in the category. -A @code{Category} is any @code{Semigroupoid} for which the Yoneda lemma holds. -Finally, to work with these weaker structures it is beneficial to have -containers that can provide stronger guarantees about their contents, so -versions of @code{Traversable} and @code{Foldable} that can be folded with -just a @code{Semigroup} are added.") - (license license:bsd-3))) - -(define-public ghc-contravariant - (package - (name "ghc-contravariant") - (version "1.4.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/contravariant/contravariant-" - version - ".tar.gz")) - (sha256 - (base32 - "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9")))) - (build-system haskell-build-system) - (inputs - `(("ghc-void" ,ghc-void) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-statevar" ,ghc-statevar) - ("ghc-semigroups" ,ghc-semigroups))) - (home-page - "https://github.com/ekmett/contravariant/") - (synopsis "Contravariant functors") - (description "Contravariant functors for Haskell.") - (license license:bsd-3))) - -(define-public ghc-semigroups - (package - (name "ghc-semigroups") - (version "0.18.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/semigroups/semigroups-" - version - ".tar.gz")) - (sha256 - (base32 - "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb")))) - (build-system haskell-build-system) - (inputs - `(("ghc-nats" ,ghc-nats) - ("ghc-tagged" ,ghc-tagged) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-hashable" ,ghc-hashable))) - (home-page "https://github.com/ekmett/semigroups/") - (synopsis "Semigroup operations for Haskell") - (description "This package provides semigroups for Haskell. In -mathematics, a semigroup is an algebraic structure consisting of a set -together with an associative binary operation. A semigroup generalizes a -monoid in that there might not exist an identity element. It -also (originally) generalized a group (a monoid with all inverses) to a type -where every element did not have to have an inverse, thus the name -semigroup.") - (license license:bsd-3))) - -(define-public ghc-semigroups-bootstrap - (package - (inherit ghc-semigroups) - (name "ghc-semigroups-bootstrap") - (inputs - `(("ghc-nats" ,ghc-nats-bootstrap) - ("ghc-tagged" ,ghc-tagged) - ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap) - ("ghc-hashable" ,ghc-hashable-bootstrap))) - (properties '(hidden? #t)))) - -(define-public ghc-free - (package - (name "ghc-free") - (version "5.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/free/free-" - version - ".tar.gz")) - (sha256 - (base32 - "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg")))) - (build-system haskell-build-system) - (inputs - `(("ghc-prelude-extras" ,ghc-prelude-extras) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-comonad" ,ghc-comonad) - ("ghc-distributive" ,ghc-distributive) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://github.com/ekmett/free/") - (synopsis "Unrestricted monads for Haskell") - (description "This library provides free monads, which are useful for many -tree-like structures and domain specific languages. If @code{f} is a -@code{Functor} then the free @code{Monad} on @code{f} is the type of trees -whose nodes are labeled with the constructors of @code{f}. The word \"free\" -is used in the sense of \"unrestricted\" rather than \"zero-cost\": @code{Free -f} makes no constraining assumptions beyond those given by @code{f} and the -definition of @code{Monad}.") - (license license:bsd-3))) - -(define-public ghc-adjunctions - (package - (name "ghc-adjunctions") - (version "4.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/adjunctions/adjunctions-" - version - ".tar.gz")) - (sha256 - (base32 - "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h")))) - (build-system haskell-build-system) - (inputs - `(("ghc-profunctors" ,ghc-profunctors) - ("ghc-comonad" ,ghc-comonad) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-distributive" ,ghc-distributive) - ("ghc-free" ,ghc-free) - ("ghc-tagged" ,ghc-tagged) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-void" ,ghc-void))) - (native-inputs - `(("ghc-generic-deriving" ,ghc-generic-deriving) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/ekmett/adjunctions/") - (synopsis "Adjunctions and representable functors") - (description "This library provides adjunctions and representable functors -for Haskell.") - (license license:bsd-3))) - -(define-public ghc-equivalence - (package - (name "ghc-equivalence") - (version "0.3.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/equivalence" - "/equivalence-" version ".tar.gz")) - (sha256 - (base32 "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx")))) - (build-system haskell-build-system) - (inputs - `(("ghc-stmonadtrans" ,ghc-stmonadtrans) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/pa-ba/equivalence") - (synopsis "Maintaining an equivalence relation implemented as union-find") - (description - "This is an implementation of Tarjan's Union-Find algorithm (Robert E.@: -Tarjan. \"Efficiency of a Good But Not Linear Set Union Algorithm\",JACM -22(2), 1975) in order to maintain an equivalence relation. This -implementation is a port of the @code{union-find} package using the @code{ST} -monad transformer (instead of the IO monad).") - (license license:bsd-3))) - -(define-public ghc-fast-logger - (package - (name "ghc-fast-logger") - (version "2.4.11") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fast-logger/fast-logger-" - version - ".tar.gz")) - (sha256 - (base32 - "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv")))) - (build-system haskell-build-system) - (inputs - `(("ghc-auto-update" ,ghc-auto-update) - ("ghc-easy-file" ,ghc-easy-file) - ("ghc-unix-time" ,ghc-unix-time))) - (native-inputs - `(("hspec-discover" ,hspec-discover) - ("ghc-hspec" ,ghc-hspec))) - (home-page "https://hackage.haskell.org/package/fast-logger") - (synopsis "Fast logging system") - (description "This library provides a fast logging system for Haskell.") - (license license:bsd-3))) - -(define-public ghc-doctest - (package - (name "ghc-doctest") - (version "0.16.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/doctest/doctest-" - version - ".tar.gz")) - (sha256 - (base32 - "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: missing test framework - (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-paths" ,ghc-paths) - ("ghc-base-compat" ,ghc-base-compat) - ("ghc-code-page" ,ghc-code-page) - ("ghc-hunit" ,ghc-hunit) - ("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-stringbuilder" ,ghc-stringbuilder) - ("ghc-silently" ,ghc-silently) - ("ghc-setenv" ,ghc-setenv))) - (home-page - "https://github.com/sol/doctest#readme") - (synopsis "Test interactive Haskell examples") - (description "The doctest program checks examples in source code comments. -It is modeled after doctest for Python, see -@uref{https://docs.python.org/library/doctest.html, the Doctest website}.") - (license license:expat))) - -(define-public ghc-lifted-base - (package - (name "ghc-lifted-base") - (version "0.2.3.12") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lifted-base/lifted-base-" - version - ".tar.gz")) - (sha256 - (base32 - "1i8p8d3rkdh21bhgjjh32vd7qqjr7jq7p59qds0aw2kmargsjd61")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Missing testing libraries. - (inputs - `(("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/basvandijk/lifted-base") - (synopsis "Lifted IO operations from the base library") - (description "Lifted-base exports IO operations from the @code{base} -library lifted to any instance of @code{MonadBase} or @code{MonadBaseControl}. -Note that not all modules from @code{base} are converted yet. The package -includes a copy of the @code{monad-peel} test suite written by Anders -Kaseorg.") - (license license:bsd-3))) - -(define-public ghc-word8 - (package - (name "ghc-word8") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/word8/word8-" - version - ".tar.gz")) - (sha256 - (base32 - "12jx7f13d2h1djq4fh4dyrab61sm49mj1w61j3rzp2vjfm696c16")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/word8") - (synopsis "Word8 library for Haskell") - (description "Word8 library to be used with @code{Data.ByteString}.") - (license license:bsd-3))) - -(define-public ghc-stringsearch - (package - (name "ghc-stringsearch") - (version "0.3.6.6") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/stringsearch/stringsearch-" - version - ".tar.gz")) - (sha256 - (base32 - "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9")))) - (build-system haskell-build-system) - (home-page "https://bitbucket.org/dafis/stringsearch") - (synopsis "Fast searching, splitting and replacing of ByteStrings") - (description "This package provides several functions to quickly search -for substrings in strict or lazy @code{ByteStrings}. It also provides -functions for breaking or splitting on substrings and replacing all -occurrences of a substring (the first in case of overlaps) with another.") - (license license:bsd-3))) - -(define-public ghc-integer-logarithms - (package - (name "ghc-integer-logarithms") - (version "1.0.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "integer-logarithms/integer-logarithms-" - version ".tar.gz")) - (sha256 - (base32 - "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "integer-logarithms.cabal" - (("tasty >= 0\\.10 && < 1\\.1") - "tasty >= 0.10 && < 1.2"))))))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-smallcheck" ,ghc-smallcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck))) - (home-page "https://github.com/Bodigrim/integer-logarithms") - (synopsis "Integer logarithms") - (description - "This package provides the following modules: -@code{Math.NumberTheory.Logarithms} and -@code{Math.NumberTheory.Powers.Integer} from the @code{arithmoi} package, -@code{GHC.Integer.Logarithms.Compat} and -@code{Math.NumberTheory.Power.Natural}, as well as some additional functions -in migrated modules.") - (license license:expat))) - -(define-public ghc-integer-logarithms-bootstrap - (package - (inherit ghc-integer-logarithms) - (name "ghc-integer-logarithms-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()) - (properties '(hidden? #t)))) - -(define-public ghc-scientific - (package - (name "ghc-scientific") - (version "0.3.6.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/scientific/scientific-" - version - ".tar.gz")) - (sha256 - (base32 - "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) - (build-system haskell-build-system) - (inputs - `(("ghc-integer-logarithms" ,ghc-integer-logarithms) - ("ghc-hashable" ,ghc-hashable) - ("ghc-primitive" ,ghc-primitive))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-ant-xml" ,ghc-tasty-ant-xml) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-smallcheck" ,ghc-smallcheck) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/basvandijk/scientific") - (synopsis "Numbers represented using scientific notation") - (description "This package provides @code{Data.Scientific}, which provides -the number type @code{Scientific}. Scientific numbers are arbitrary precision -and space efficient. They are represented using -@uref{https://en.wikipedia.org/wiki/Scientific_notation, scientific -notation}.") - (license license:bsd-3))) - -(define-public ghc-scientific-bootstrap - (package - (inherit ghc-scientific) - (name "ghc-scientific-bootstrap") - (arguments `(#:tests? #f)) - (inputs - `(("ghc-integer-logarithms" ,ghc-integer-logarithms-bootstrap) - ("ghc-hashable" ,ghc-hashable) - ("ghc-primitive" ,ghc-primitive))) - (native-inputs '()) - (properties '(hidden? #t)))) - -(define-public ghc-boxes - (package - (name "ghc-boxes") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/boxes/boxes-" - version ".tar.gz")) - (sha256 - (base32 "1hsnmw95i58d4bkpxby3ddsj1cawypw4mdyb18m393s5i8p7iq9q")))) - (build-system haskell-build-system) - (inputs - `(("ghc-split" ,ghc-split) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://hackage.haskell.org/package/boxes") - (synopsis "2D text pretty-printing library") - (description - "Boxes is a pretty-printing library for laying out text in two dimensions, -using a simple box model.") - (license license:bsd-3))) - -(define-public ghc-deepseq-generics - (package - (name "ghc-deepseq-generics") - (version "0.2.0.0") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "deepseq-generics/deepseq-generics-" - version ".tar.gz")) - (sha256 - (base32 - "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb"))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/hvr/deepseq-generics") - (synopsis "Generic RNF implementation") - (description - "This package provides a @code{GHC.Generics}-based -@code{Control.DeepSeq.Generics.genericRnf} function which can be used for -providing an @code{rnf} implementation.") - (license license:bsd-3))) - -(define-public ghc-string-qq - (package - (name "ghc-string-qq") - (version "0.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/string-qq/string-qq-" - version - ".tar.gz")) - (sha256 - (base32 - "0662m3i5xrdrr95w829bszkhp88mj9iy1zya54vk2sl5hz9wlmwp")))) - (build-system haskell-build-system) - (home-page "http://hackage.haskell.org/package/string-qq") - (synopsis - "QuasiQuoter for non-interpolated strings, texts and bytestrings.") - (description - "This package provides a quasiquoter for non-interpolated strings, texts -and bytestrings.") - (license license:public-domain))) - -(define-public ghc-pandoc-types - (package - (name "ghc-pandoc-types") - (version "1.17.5.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pandoc-types/pandoc-types-" - version ".tar.gz")) - (sha256 - (base32 - "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717")))) - (build-system haskell-build-system) - (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-aeson" ,ghc-aeson) - ("ghc-string-qq" ,ghc-string-qq))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) - ("ghc-hunit" ,ghc-hunit))) - (home-page "http://johnmacfarlane.net/pandoc") - (synopsis "Types for representing a structured document") - (description - "This module defines the @code{Pandoc} data structure, which is used by -pandoc to represent structured documents. It also provides functions for -building up, manipulating and serialising @code{Pandoc} structures.") - (license license:bsd-3))) - -(define-public ghc-texmath - (package - (name "ghc-texmath") - (version "0.11.0.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "texmath/texmath-" version ".tar.gz")) - (sha256 - (base32 - "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf")))) - (build-system haskell-build-system) - (inputs - `(("ghc-syb" ,ghc-syb) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-split" ,ghc-split) - ("ghc-temporary" ,ghc-temporary) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-xml" ,ghc-xml) - ("ghc-pandoc-types" ,ghc-pandoc-types))) - (home-page "https://github.com/jgm/texmath") - (synopsis "Conversion between formats used to represent mathematics") - (description - "The texmath library provides functions to read and write TeX math, -presentation MathML, and OMML (Office Math Markup Language, used in Microsoft -Office). Support is also included for converting math formats to pandoc's -native format (allowing conversion, via pandoc, to a variety of different -markup formats). The TeX reader supports basic LaTeX and AMS extensions, and -it can parse and apply LaTeX macros.") - (license license:gpl2+))) - -(define-public ghc-regex-pcre-builtin - (package - (name "ghc-regex-pcre-builtin") - (version "0.94.4.8.8.35") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "regex-pcre-builtin/regex-pcre-builtin-" - version ".tar.gz")) - (sha256 - (base32 - "0y7as9wqlkykpipka2cfdhmcnin345q01pp0wsva8fwmvsavdl8b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-regex-base" ,ghc-regex-base))) - (home-page "https://hackage.haskell.org/package/regex-pcre") - (synopsis "Enhancement of the builtin Text.Regex library") - (description - "This package is an enhancement of the @code{Text.Regex} library, -providing the PCRE backend to accompany regex-base, with bundled code from -@url{https://www.pcre.org}.") - (license license:bsd-3))) - -(define-public ghc-diff - (package - (name "ghc-diff") - (version "0.3.4") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "Diff/Diff-" version ".tar.gz")) - (sha256 - (base32 - "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://hub.darcs.net/sterlingclover/Diff") - (synopsis "O(ND) diff algorithm in Haskell") - (description - "This package provides an implementation of the standard diff algorithm, -and utilities for pretty printing.") - (license license:bsd-3))) - -(define-public ghc-highlighting-kate - (package - (name "ghc-highlighting-kate") - (version "0.6.4") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "highlighting-kate/highlighting-kate-" - version ".tar.gz")) - (sha256 - (base32 - "1bqv00gfmrsf0jjr4qf3lhshvfkyzmhbi3pjb6mafbnsyn2k7f6q")))) - (build-system haskell-build-system) - (inputs - `(("ghc-diff" ,ghc-diff) - ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin))) - (native-inputs - `(("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-utf8-string" ,ghc-utf8-string))) - (home-page "https://github.com/jgm/highlighting-kate") - (synopsis "Syntax highlighting library") - (description - "Highlighting-kate is a syntax highlighting library with support for -nearly one hundred languages. The syntax parsers are automatically generated -from @uref{https://kate-editor.org/, Kate syntax descriptions}, so any syntax -supported by Kate can be added. An (optional) command-line program is -provided, along with a utility for generating new parsers from Kate XML syntax -descriptions.") - (license license:gpl2+))) - -(define-public ghc-cmark - (package - (name "ghc-cmark") - (version "0.5.6") - (source (origin - (method url-fetch) - ;; XXX As of version 0.5.6, this package bundles libcmark 0.28.0. - ;; See cbits/cmark_version.h. - (uri (string-append "https://hackage.haskell.org/package/" - "cmark/cmark-" version ".tar.gz")) - (sha256 - (base32 - "1c1j3a8b9qx5zk9myqm3gap8ymz7fipwrdmyfsq9wkkdr9x4np45")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/jgm/commonmark-hs") - (synopsis "Fast, accurate CommonMark (Markdown) parser and renderer") - (description - "This package provides Haskell bindings for -@uref{https://github.com/jgm/cmark, libcmark}, the reference parser for -CommonMark, a fully specified variant of Markdown. It includes bundled libcmark -sources, and does not require prior installation of the C library.") - (license license:bsd-3))) - -(define-public ghc-cmark-gfm - (package - (name "ghc-cmark-gfm") - (version "0.1.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cmark-gfm/cmark-gfm-" - version ".tar.gz")) - (sha256 - (base32 - "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/kivikakk/cmark-gfm-hs") - (synopsis - "Fast, accurate GitHub Flavored Markdown parser and renderer") - (description - "This package provides Haskell bindings for libcmark-gfm, the reference -parser for GitHub Flavored Markdown, a fully specified variant of Markdown. -It includes sources for libcmark-gfm and does not require prior installation -of the C library.") - (license license:bsd-3))) - -(define-public ghc-executable-path - (package - (name "ghc-executable-path") - (version "0.0.3.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "executable-path/executable-path-" - version ".tar.gz")) - (sha256 - (base32 - "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/executable-path") - (synopsis "Find out the full path of the executable") - (description - "The documentation of @code{System.Environment.getProgName} says that -\"However, this is hard-to-impossible to implement on some non-Unix OSes, so -instead, for maximum portability, we just return the leafname of the program -as invoked.\" This library tries to provide the missing path.") - (license license:public-domain))) - -(define-public ghc-enclosed-exceptions - (package - (name "ghc-enclosed-exceptions") - (version "1.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "enclosed-exceptions/enclosed-exceptions-" - version ".tar.gz")) - (sha256 - (base32 - "1fghjj7nkiddrf03ks8brjpr5x25yi9fs7xg6adbi4mc2gqr6vdg")))) - (build-system haskell-build-system) - ;; FIXME: one of the tests blocks forever: - ;; "thread blocked indefinitely in an MVar operation" - (arguments '(#:tests? #f)) - (inputs - `(("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-async" ,ghc-async) - ("ghc-transformers-base" ,ghc-transformers-base))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/jcristovao/enclosed-exceptions") - (synopsis "Catch all exceptions from within an enclosed computation") - (description - "This library implements a technique to catch all exceptions raised -within an enclosed computation, while remaining responsive to (external) -asynchronous exceptions.") - (license license:expat))) - -(define-public ghc-th-abstraction - (package - (name "ghc-th-abstraction") - (version "0.2.8.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-abstraction/th-abstraction-" - version ".tar.gz")) - (sha256 - (base32 - "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya")))) - (build-system haskell-build-system) - (home-page "https://github.com/glguy/th-abstraction") - (synopsis "Nicer interface for reified information about data types") - (description - "This package normalizes variations in the interface for inspecting -datatype information via Template Haskell so that packages and support a -single, easier to use informational datatype while supporting many versions of -Template Haskell.") - (license license:isc))) - -(define-public ghc-th-lift - (package - (name "ghc-th-lift") - (version "0.7.11") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-lift/th-lift-" version ".tar.gz")) - (sha256 - (base32 - "131360zxb0hazbqwbkk6ab2p77jkxr79bwwm618mrwrwkm3x2g6m")))) - (build-system haskell-build-system) - (inputs - `(("ghc-th-abstraction" ,ghc-th-abstraction))) - (home-page "https://github.com/mboes/th-lift") - (synopsis "Derive Template Haskell's Lift class for datatypes") - (description - "This is a Haskell library to derive Template Haskell's Lift class for -datatypes.") - (license license:bsd-3))) - -(define-public ghc-th-lift-instances - (package - (name "ghc-th-lift-instances") - (version "0.1.11") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-lift-instances/th-lift-instances-" - version ".tar.gz")) - (sha256 - (base32 - "1f56cp6ckcalld5jchv0kxpjkwcsixd7smd0g7r8cg67ppx6m90x")))) - (build-system haskell-build-system) - (inputs - `(("ghc-th-lift" ,ghc-th-lift) - ("ghc-vector" ,ghc-vector) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/bennofs/th-lift-instances/") - (synopsis "Lift instances for template-haskell for common data types.") - (description "Most data types in the Haskell platform do not have Lift -instances. This package provides orphan instances for @code{containers}, -@code{text}, @code{bytestring} and @code{vector}.") - (license license:bsd-3))) - -(define-public ghc-th-expand-syns - (package - (name "ghc-th-expand-syns") - (version "0.4.4.0") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-expand-syns/th-expand-syns-" - version ".tar.gz")) - (sha256 - (base32 - "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc")))) - (build-system haskell-build-system) - (inputs - `(("ghc-syb" ,ghc-syb))) - (home-page "https://hackage.haskell.org/package/th-expand-syns") - (synopsis "Expands type synonyms in Template Haskell ASTs") - (description - "This package enables users to expand type synonyms in Template Haskell -@dfn{abstract syntax trees} (ASTs).") - (license license:bsd-3))) - -(define-public ghc-th-reify-many - (package - (name "ghc-th-reify-many") - (version "0.1.8") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-reify-many/th-reify-many-" - version ".tar.gz")) - (sha256 - (base32 - "0hzy6hvhvcd6i60vx5cp2b7ggmnnjh9rx4h8bm8xw4grglcaxjnf")))) - (build-system haskell-build-system) - (inputs - `(("ghc-safe" ,ghc-safe) - ("ghc-th-expand-syns" ,ghc-th-expand-syns))) - (home-page "https://github.com/mgsloan/th-reify-many") - (synopsis "Recurseively reify template haskell datatype info") - (description - "th-reify-many provides functions for recursively reifying top level -declarations. The main intended use case is for enumerating the names of -datatypes reachable from an initial datatype, and passing these names to some -function which generates instances.") - (license license:bsd-3))) - -(define-public ghc-th-orphans - (package - (name "ghc-th-orphans") - (version "0.13.6") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "th-orphans/th-orphans-" version ".tar.gz")) - (sha256 - (base32 - "0sfl3pn9kq9da3ji3lsgzgzy82vz6yvsg80dmakc1jvk7awycibp")))) - (build-system haskell-build-system) - (inputs - `(("ghc-th-lift" ,ghc-th-lift) - ("ghc-th-lift-instances" ,ghc-th-lift-instances) - ("ghc-th-reify-many" ,ghc-th-reify-many) - ("ghc-generic-deriving" ,ghc-generic-deriving))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec))) - (home-page "https://hackage.haskell.org/package/th-orphans") - (synopsis "Orphan instances for TH datatypes") - (description - "This package provides orphan instances for Template Haskell datatypes. In particular, -instances for @code{Ord} and @code{Lift}, as well as a few missing @code{Show} -and @code{Eq} instances. These instances used to live in the haskell-src-meta -package, and that's where the version number started.") - (license license:bsd-3))) - -(define-public ghc-geniplate-mirror - (package - (name "ghc-geniplate-mirror") - (version "0.7.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package" - "/geniplate-mirror" - "/geniplate-mirror-" version ".tar.gz")) - (sha256 - (base32 "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb")))) - (build-system haskell-build-system) - (home-page "https://github.com/danr/geniplate") - (synopsis "Use Template Haskell to generate Uniplate-like functions") - (description - "Use Template Haskell to generate Uniplate-like functions. This is a -maintained mirror of the @uref{https://hackage.haskell.org/package/geniplate, -geniplate} package, written by Lennart Augustsson.") - (license license:bsd-3))) - -(define-public ghc-gitrev - (package - (name "ghc-gitrev") - (version "1.3.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/gitrev/gitrev-" - version ".tar.gz")) - (sha256 - (base32 "0cl3lfm6k1h8fxp2vxa6ihfp4v8igkz9h35iwyq2frzm4kdn96d8")))) - (build-system haskell-build-system) - (inputs `(("ghc-base-compat" ,ghc-base-compat))) - (home-page "https://github.com/acfoltzer/gitrev") - (synopsis "Compile git revision info into Haskell projects") - (description - "This package provides some handy Template Haskell splices for including -the current git hash and branch in the code of your project. This is useful -for including in panic messages, @command{--version} output, or diagnostic -info for more informative bug reports.") - (license license:bsd-3))) - -(define-public ghc-haskell-src-meta - (package - (name "ghc-haskell-src-meta") - (version "0.8.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "haskell-src-meta/haskell-src-meta-" - version ".tar.gz")) - (sha256 - (base32 - "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4")))) - (build-system haskell-build-system) - (inputs - `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-syb" ,ghc-syb) - ("ghc-th-orphans" ,ghc-th-orphans))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://hackage.haskell.org/package/haskell-src-meta") - (synopsis "Parse source to template-haskell abstract syntax") - (description - "This package provides tools to parse Haskell sources to the -template-haskell abstract syntax.") - (license license:bsd-3))) - -(define-public ghc-conduit - (package - (name "ghc-conduit") - (version "1.3.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit/conduit-" version ".tar.gz")) - (sha256 - (base32 - "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v")))) - (build-system haskell-build-system) - (inputs - `(("ghc-exceptions" ,ghc-exceptions) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-mono-traversable" ,ghc-mono-traversable) - ("ghc-mmorph" ,ghc-mmorph) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-silently" ,ghc-silently) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-unliftio" ,ghc-unliftio) - ("ghc-unliftio-core" ,ghc-unliftio-core) - ("ghc-vector" ,ghc-vector) - ("ghc-void" ,ghc-void))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("ghc-safe" ,ghc-safe) - ("ghc-split" ,ghc-split))) - (home-page "https://github.com/snoyberg/conduit") - (synopsis "Streaming data library ") - (description - "The conduit package is a solution to the streaming data problem, -allowing for production, transformation, and consumption of streams of data -in constant memory. It is an alternative to lazy I/O which guarantees -deterministic resource handling, and fits in the same general solution -space as enumerator/iteratee and pipes.") - (license license:expat))) - -(define-public ghc-logging-facade - (package - (name "ghc-logging-facade") - (version "0.3.0") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "logging-facade/logging-facade-" - version ".tar.gz")) - (sha256 - (base32 - "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/logging-facade") - (synopsis "Simple logging abstraction that allows multiple back-ends") - (description - "This package provides a simple logging abstraction that allows multiple -back-ends.") - (license license:expat))) - -(define-public ghc-mockery - (package - (name "ghc-mockery") - (version "0.3.5") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mockery/mockery-" version ".tar.gz")) - (sha256 - (base32 - "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp")))) - (build-system haskell-build-system) - (inputs - `(("ghc-temporary" ,ghc-temporary) - ("ghc-logging-facade" ,ghc-logging-facade) - ("ghc-base-compat" ,ghc-base-compat))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/mockery") - (synopsis "Support functions for automated testing") - (description - "The mockery package provides support functions for automated testing.") - (license license:expat))) - -(define-public ghc-yaml - (package - (name "ghc-yaml") - (version "0.8.32") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "yaml/yaml-" version ".tar.gz")) - (sha256 - (base32 - "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w")))) - (build-system haskell-build-system) - ;; The tests are broken on i686. They are fixed in 0.10.3.0. - ;; See https://github.com/snoyberg/yaml/issues/158 - (arguments `(#:tests? #f)) - (inputs - `(("ghc-conduit" ,ghc-conduit) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-aeson" ,ghc-aeson) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-scientific" ,ghc-scientific) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-temporary" ,ghc-temporary) - ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) - ("ghc-base-compat" ,ghc-base-compat))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit" ,ghc-hunit) - ("hspec-discover" ,hspec-discover) - ("ghc-mockery" ,ghc-mockery))) - (home-page "https://github.com/snoyberg/yaml/") - (synopsis "Parsing and rendering YAML documents") - (description - "This package provides a library to parse and render YAML documents.") - (license license:bsd-3))) - -(define-public ghc-filemanip - (package - (name "ghc-filemanip") - (version "0.3.6.3") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "filemanip/filemanip-" version ".tar.gz")) - (sha256 - (base32 - "0ilqr8jv41zxcj5qyicg29m8s30b9v70x6f9h2h2rw5ap8bxldl8")))) - (build-system haskell-build-system) - (inputs - `(("ghc-unix-compat" ,ghc-unix-compat))) - (home-page "https://github.com/bos/filemanip") - (synopsis "File and directory manipulation for Haskell") - (description - "This package provides a Haskell library for working with files and -directories. It includes code for pattern matching, finding files, modifying -file contents, and more.") - (license license:bsd-3))) - -(define-public ghc-mmap - (package - (name "ghc-mmap") - (version "0.5.9") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mmap/mmap-" version ".tar.gz")) - (sha256 - (base32 - "1y5mk3yf4b8r6rzmlx1xqn4skaigrqnv08sqq0v7r3nbw42bpz2q")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/mmap") - (synopsis "Memory mapped files for Haskell") - (description - "This library provides a wrapper to @code{mmap}, allowing files or -devices to be lazily loaded into memory as strict or lazy @code{ByteStrings}, -@code{ForeignPtrs} or plain @code{Ptrs}, using the virtual memory subsystem to -do on-demand loading.") - (license license:bsd-3))) - -(define-public ghc-juicypixels - (package - (name "ghc-juicypixels") - (version "3.2.9.5") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "JuicyPixels/JuicyPixels-" - version ".tar.gz")) - (sha256 - (base32 - "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744")))) - (build-system haskell-build-system) - (inputs - `(("ghc-zlib" ,ghc-zlib) - ("ghc-vector" ,ghc-vector) - ("ghc-primitive" ,ghc-primitive) - ("ghc-mmap" ,ghc-mmap))) - (home-page "https://github.com/Twinside/Juicy.Pixels") - (synopsis "Picture loading and serialization library") - (description - "This library can load and store images in PNG, Bitmap, JPEG, Radiance, -TIFF and GIF formats.") - (license license:bsd-3))) - -(define-public ghc-hslua - (package - (name "ghc-hslua") - (version "0.9.5.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua/hslua-" version ".tar.gz")) - (sha256 - (base32 - "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f")))) - (build-system haskell-build-system) - (arguments - `(#:configure-flags '("-fsystem-lua"))) - (inputs - `(("lua" ,lua) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-fail" ,ghc-fail))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) - (home-page "https://hackage.haskell.org/package/hslua") - (synopsis "Lua language interpreter embedding in Haskell") - (description - "The Scripting.Lua module is a wrapper of the Lua language interpreter as -described in @url{https://www.lua.org/}.") - (license license:expat))) - -(define-public ghc-hslua-module-text - (package - (name "ghc-hslua-module-text") - (version "0.1.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslua-module-text/hslua-module-text-" - version ".tar.gz")) - (sha256 - (base32 - "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"))) - (inputs - `(("ghc-hslua" ,ghc-hslua))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "https://github.com/hslua/hslua-module-text") - (synopsis "Lua module for text") - (description - "This package provides a UTF-8 aware subset of Lua's @code{string} module -for Haskell. The functions provided by this module are @code{upper}, -@code{lower}, @code{len}, @code{reverse}, and @code{sub}.") - (license license:expat))) - -(define-public ghc-byteable - (package - (name "ghc-byteable") - (version "0.1.1") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "byteable/byteable-" version ".tar.gz")) - (sha256 - (base32 - "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4")))) - (build-system haskell-build-system) - (home-page "https://github.com/vincenthz/hs-byteable") - (synopsis "Type class for sequence of bytes") - (description - "This package provides an abstract class to manipulate sequence of bytes. -The use case of this class is abstracting manipulation of types that are just -wrapping a bytestring with stronger and more meaniful name.") - (license license:bsd-3))) - -(define-public ghc-hourglass - (package - (name "ghc-hourglass") - (version "0.2.12") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hourglass/hourglass-" version ".tar.gz")) - (sha256 - (base32 - "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4")))) - (build-system haskell-build-system) - (inputs - `(("ghc-old-locale" ,ghc-old-locale))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "https://github.com/vincenthz/hs-hourglass") - (synopsis "Simple time-related library for Haskell") - (description - "This is a simple time library providing a simple but powerful and -performant API. The backbone of the library are the @code{Timeable} and -@code{Time} type classes. Each @code{Timeable} instances can be converted to -a type that has a @code{Time} instances, and thus are different -representations of current time.") - (license license:bsd-3))) - -(define-public ghc-edit-distance - (package - (name "ghc-edit-distance") - (version "0.2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/edit-distance" - "/edit-distance-" version ".tar.gz")) - (sha256 - (base32 "0jkca97zyv23yyilp3jydcrzxqhyk27swhzh82llvban5zp8b21y")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "edit-distance.cabal" - (("QuickCheck >= 2\\.4 && <2\\.9") - "QuickCheck >= 2.4 && < 2.12"))))))) - (inputs - `(("ghc-random" ,ghc-random) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/phadej/edit-distance") - (synopsis "Levenshtein and restricted Damerau-Levenshtein edit distances") - (description - "This package provides optimized functions to determine the edit -distances for fuzzy matching, including Levenshtein and restricted -Damerau-Levenshtein algorithms.") - (license license:bsd-3))) - -(define-public ghc-memory - (package - (name "ghc-memory") - (version "0.14.16") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "memory/memory-" version ".tar.gz")) - (sha256 - (base32 - "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v")))) - (build-system haskell-build-system) - (inputs - `(("ghc-basement" ,ghc-basement) - ("ghc-foundation" ,ghc-foundation))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "https://github.com/vincenthz/hs-memory") - (synopsis "Memory abstractions for Haskell") - (description - "This package provides memory abstractions, such as chunk of memory, -polymorphic byte array management and manipulation functions. It contains a -polymorphic byte array abstraction and functions similar to strict ByteString, -different type of byte array abstraction, raw memory IO operations (memory -set, memory copy, ..) and more") - (license license:bsd-3))) - -(define-public ghc-socks - (package - (name "ghc-socks") - (version "0.5.6") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "socks/socks-" version ".tar.gz")) - (sha256 - (base32 - "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs")))) - (build-system haskell-build-system) - (inputs - `(("ghc-cereal" ,ghc-cereal) - ("ghc-network" ,ghc-network))) - (home-page "https://github.com/vincenthz/hs-socks") - (synopsis "SOCKS proxy (version 5) implementation") - (description - "This library provides a SOCKS proxy (version 5) implementation.") - (license license:bsd-3))) - -(define-public ghc-connection - (package - (name "ghc-connection") - (version "0.2.8") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "connection/connection-" - version ".tar.gz")) - (sha256 - (base32 - "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh")))) - (build-system haskell-build-system) - (inputs - `(("ghc-byteable" ,ghc-byteable) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-network" ,ghc-network) - ("ghc-tls" ,ghc-tls) - ("ghc-socks" ,ghc-socks) - ("ghc-x509" ,ghc-x509) - ("ghc-x509-store" ,ghc-x509-store) - ("ghc-x509-system" ,ghc-x509-system) - ("ghc-x509-validation" ,ghc-x509-validation))) - (home-page "https://github.com/vincenthz/hs-connection") - (synopsis "Simple and easy network connections API") - (description - "This package provides a simple network library for all your connection -needs. It provides a very simple API to create sockets to a destination with -the choice of SSL/TLS, and SOCKS.") - (license license:bsd-3))) - -(define-public ghc-skylighting-core - (package - (name "ghc-skylighting-core") - (version "0.7.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "skylighting-core/skylighting-core-" - version ".tar.gz")) - (sha256 - (base32 - "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-colour" ,ghc-colour) - ("ghc-hxt" ,ghc-hxt) - ("ghc-regex-pcre-builtin" ,ghc-regex-pcre-builtin) - ("ghc-safe" ,ghc-safe) - ("ghc-utf8-string" ,ghc-utf8-string))) - (native-inputs - `(("ghc-diff" ,ghc-diff) - ("ghc-hunit" ,ghc-hunit) - ("ghc-pretty-show" ,ghc-pretty-show) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-golden" ,ghc-tasty-golden) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://github.com/jgm/skylighting") - (synopsis "Syntax highlighting library") - (description "Skylighting is a syntax highlighting library with support -for over one hundred languages. It derives its tokenizers from XML syntax -definitions used by KDE's @code{KSyntaxHighlighting} framework, so any syntax -supported by that framework can be added. An optional command-line program is -provided. Skylighting is intended to be the successor to highlighting-kate.") - (license license:gpl2))) - -(define-public ghc-skylighting - (package - (inherit ghc-skylighting-core) - (name "ghc-skylighting") - (version "0.7.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/skylighting-" - version "/skylighting-" version ".tar.gz")) - (sha256 - (base32 - "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch")))) - (inputs - `(("ghc-skylighting-core" ,ghc-skylighting-core) - ,@(package-inputs ghc-skylighting-core))))) - -(define-public ghc-doctemplates - (package - (name "ghc-doctemplates") - (version "0.2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "doctemplates/doctemplates-" - version ".tar.gz")) - (sha256 - (base32 - "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-vector" ,ghc-vector) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-scientific" ,ghc-scientific))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec))) - (home-page "https://github.com/jgm/doctemplates#readme") - (synopsis "Pandoc-style document templates") - (description - "This package provides a simple text templating system used by pandoc.") - (license license:bsd-3))) - -(define-public ghc-pandoc - (package - (name "ghc-pandoc") - (version "2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" - version ".tar.gz")) - (sha256 - (base32 - "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "pandoc.cabal" - (("tasty >= 0\\.11 && < 1\\.1") - "tasty >= 0.11 && < 1.1.1")))) - (add-before 'configure 'patch-tests - (lambda _ - ;; These tests fail benignly and have been adjusted upstream: - ;; . - (substitute* "test/Tests/Old.hs" - (("lhsWriterTests \"html\"") "[]"))))))) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-aeson-pretty" ,ghc-aeson-pretty) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-cmark-gfm" ,ghc-cmark-gfm) - ("ghc-data-default" ,ghc-data-default) - ("ghc-deepseq-generics" ,ghc-deepseq-generics) - ("ghc-diff" ,ghc-diff) - ("ghc-doctemplates" ,ghc-doctemplates) - ("ghc-executable-path" ,ghc-executable-path) - ("ghc-glob" ,ghc-glob) - ("ghc-haddock-library" ,ghc-haddock-library) - ("ghc-hslua" ,ghc-hslua) - ("ghc-hslua-module-text" ,ghc-hslua-module-text) - ("ghc-http" ,ghc-http) - ("ghc-http-client" ,ghc-http-client) - ("ghc-http-client-tls" ,ghc-http-client-tls) - ("ghc-http-types" ,ghc-http-types) - ("ghc-juicypixels" ,ghc-juicypixels) - ("ghc-network" ,ghc-network) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-pandoc-types" ,ghc-pandoc-types) - ("ghc-random" ,ghc-random) - ("ghc-scientific" ,ghc-scientific) - ("ghc-sha" ,ghc-sha) - ("ghc-skylighting" ,ghc-skylighting) - ("ghc-split" ,ghc-split) - ("ghc-syb" ,ghc-syb) - ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-temporary" ,ghc-temporary) - ("ghc-texmath" ,ghc-texmath) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-xml" ,ghc-xml) - ("ghc-yaml" ,ghc-yaml) - ("ghc-zip-archive" ,ghc-zip-archive) - ("ghc-zlib" ,ghc-zlib))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-golden" ,ghc-tasty-golden) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hunit" ,ghc-hunit))) - (home-page "https://pandoc.org") - (synopsis "Conversion between markup formats") - (description - "Pandoc is a Haskell library for converting from one markup format to -another, and a command-line tool that uses this library. It can read and -write Markdown and (subsets of) other formats, such as HTML, reStructuredText, -LaTeX, DocBook, and many more. - -Pandoc extends standard Markdown syntax with footnotes, embedded LaTeX, -definition lists, tables, and other features. A compatibility mode is -provided for those who need a drop-in replacement for Markdown.pl.") - (license license:gpl2+))) - -(define-public ghc-hs-bibutils - (package - (name "ghc-hs-bibutils") - (version "6.6.0.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hs-bibutils/hs-bibutils-" - version ".tar.gz")) - (sha256 - (base32 - "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l")))) - (build-system haskell-build-system) - (inputs `(("ghc-syb" ,ghc-syb))) - (home-page "https://hackage.haskell.org/package/hs-bibutils") - (synopsis "Haskell bindings to bibutils") - (description - "This package provides Haskell bindings to @code{bibutils}, a library -that interconverts between various bibliography formats using a common -MODS-format XML intermediate.") - (license license:gpl2+))) - -(define-public ghc-rfc5051 - (package - (name "ghc-rfc5051") - (version "0.1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/rfc5051/" - "rfc5051-" version ".tar.gz")) - (sha256 - (base32 - "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/rfc5051") - (synopsis "Simple unicode collation as per RFC5051") - (description - "This library implements @code{unicode-casemap}, the simple, non -locale-sensitive unicode collation algorithm described in RFC 5051. Proper -unicode collation can be done using @code{text-icu}, but that is a big -dependency that depends on a large C library, and @code{rfc5051} might be -better for some purposes.") - (license license:bsd-3))) - -(define-public ghc-typed-process - (package - (name "ghc-typed-process") - (version "0.2.3.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "typed-process/typed-process-" - version ".tar.gz")) - (sha256 - (base32 - "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0")))) - (build-system haskell-build-system) - (inputs - `(("ghc-async" ,ghc-async))) - (native-inputs - `(("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover) - ("ghc-temporary" ,ghc-temporary))) - (home-page "https://haskell-lang.org/library/typed-process") - (synopsis "Run external processes with strong typing of streams") - (description - "This library provides the ability to launch and interact with external -processes. It wraps around the @code{process} library, and intends to improve -upon it.") - (license license:expat))) - -(define-public ghc-conduit-extra - (package - (name "ghc-conduit-extra") - (version "1.3.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit-extra/conduit-extra-" - version ".tar.gz")) - (sha256 - (base32 - "0jaj350vv6mbb26gdwcqz4gwzfzrjydv5pis2da49wz1npbakcfw")))) - (build-system haskell-build-system) - (inputs - `(("ghc-conduit" ,ghc-conduit) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-typed-process" ,ghc-typed-process) - ("ghc-async" ,ghc-async) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-network" ,ghc-network) - ("ghc-primitive" ,ghc-primitive) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-hspec" ,ghc-hspec) - ("ghc-bytestring-builder" ,ghc-bytestring-builder) - ("ghc-quickcheck" ,ghc-quickcheck))) - (native-inputs - `(("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/snoyberg/conduit") - (synopsis "Conduit adapters for common libraries") - (description - "The @code{conduit} package itself maintains relative small dependencies. -The purpose of this package is to collect commonly used utility functions -wrapping other library dependencies, without depending on heavier-weight -dependencies. The basic idea is that this package should only depend on -@code{haskell-platform} packages and @code{conduit}.") - (license license:expat))) - -(define-public ghc-xml-types - (package - (name "ghc-xml-types") - (version "0.3.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/xml-types/" - "xml-types-" version ".tar.gz")) - (sha256 - (base32 - "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr")))) - (build-system haskell-build-system) - (home-page "https://john-millikin.com/software/haskell-xml/") - (synopsis "Basic types for representing XML") - (description "This package provides basic types for representing XML -documents.") - (license license:expat))) - -(define-public ghc-xml-conduit - (package - (name "ghc-xml-conduit") - (version "1.8.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/xml-conduit/" - "xml-conduit-" version ".tar.gz")) - (sha256 - (base32 - "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq")))) - (build-system haskell-build-system) - (inputs - `(("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-doctest" ,ghc-doctest) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-xml-types" ,ghc-xml-types) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-hspec" ,ghc-hspec) - ("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/snoyberg/xml") - (synopsis "Utilities for dealing with XML with the conduit package") - (description - "This package provides pure-Haskell utilities for dealing with XML with -the @code{conduit} package.") - (license license:expat))) - -(define-public ghc-pandoc-citeproc - (package - (name "ghc-pandoc-citeproc") - (version "0.14.3.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pandoc-citeproc/pandoc-citeproc-" - version ".tar.gz")) - (sha256 - (base32 - "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Many YAML tests (44) are failing do to changes in ghc-yaml: - ;; . - (add-before 'configure 'patch-tests - (lambda _ - (substitute* "tests/test-pandoc-citeproc.hs" - (("let allTests = citeprocTests \\+\\+ biblio2yamlTests") - "let allTests = citeprocTests")))) - ;; Tests need to be run after installation. - (delete 'check) - (add-after 'install 'post-install-check - (assoc-ref %standard-phases 'check))))) - (inputs - `(("ghc-pandoc-types" ,ghc-pandoc-types) - ("ghc-pandoc" ,ghc-pandoc) - ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-aeson" ,ghc-aeson) - ("ghc-vector" ,ghc-vector) - ("ghc-xml-conduit" ,ghc-xml-conduit) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-data-default" ,ghc-data-default) - ("ghc-setenv" ,ghc-setenv) - ("ghc-split" ,ghc-split) - ("ghc-yaml" ,ghc-yaml) - ("ghc-hs-bibutils" ,ghc-hs-bibutils) - ("ghc-rfc5051" ,ghc-rfc5051) - ("ghc-syb" ,ghc-syb) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-aeson-pretty" ,ghc-aeson-pretty) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-temporary" ,ghc-temporary))) - (home-page "https://github.com/jgm/pandoc-citeproc") - (synopsis "Library for using pandoc with citeproc") - (description - "The @code{pandoc-citeproc} library exports functions for using the -citeproc system with pandoc. It relies on @code{citeproc-hs}, a library for -rendering bibliographic reference citations into a variety of styles using a -macro language called @dfn{Citation Style Language} (CSL). This package also -contains an executable @code{pandoc-citeproc}, which works as a pandoc filter, -and also has a mode for converting bibliographic databases a YAML format -suitable for inclusion in pandoc YAML metadata.") - (license license:bsd-3))) - -(define-public ghc-union-find - (package - (name "ghc-union-find") - (version "0.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/union-find/union-find-" - version ".tar.gz")) - (sha256 - (base32 - "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6")))) - (build-system haskell-build-system) - (home-page "https://github.com/nominolo/union-find") - (synopsis "Efficient union and equivalence testing of sets") - (description - "The Union/Find algorithm implements these operations in (effectively) -constant-time: -@enumerate -@item Check whether two elements are in the same equivalence class. -@item Create a union of two equivalence classes. -@item Look up the descriptor of the equivalence class. -@end enumerate\n") - (license license:bsd-3))) - -(define-public ghc-base16-bytestring - (package - (name "ghc-base16-bytestring") - (version "0.1.1.6") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/base16-bytestring/" - "base16-bytestring-" version ".tar.gz")) - (sha256 - (base32 - "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs")))) - (build-system haskell-build-system) - (home-page "https://github.com/bos/base16-bytestring") - (synopsis "Fast base16 (hex) encoding and decoding for ByteStrings") - (description - "This package provides a Haskell library for working with base16-encoded -data quickly and efficiently, using the ByteString type.") - (license license:bsd-3))) - -(define-public ghc-data-ordlist - (package - (name "ghc-data-ordlist") - (version "0.4.7.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/data-ordlist/data-ordlist-" - version ".tar.gz")) - (sha256 - (base32 - "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/data-ordlist") - (synopsis "Set and bag operations on ordered lists") - (description - "This module provides set and multiset operations on ordered lists.") - (license license:bsd-3))) - -(define-public ghc-regex-applicative - (package - (name "ghc-regex-applicative") - (version "0.3.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-applicative/" - "regex-applicative-" version ".tar.gz")) - (sha256 - (base32 - "1riv7jqf26lbv4rm54sd6mrx8xdh4dvh4xbzymzdfdw13k6a4nb6")))) - (build-system haskell-build-system) - (inputs - `(("ghc-smallcheck" ,ghc-smallcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "https://github.com/feuerbach/regex-applicative") - (synopsis "Regex-based parsing with applicative interface") - (description - "@code{regex-applicative} is a Haskell library for parsing using -regular expressions. Parsers can be built using Applicative interface.") - (license license:expat))) - -(define-public ghc-regex-tdfa - (package - (name "ghc-regex-tdfa") - (version "1.2.3.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-tdfa/regex-tdfa-" - version ".tar.gz")) - (sha256 - (base32 - "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala")))) - (build-system haskell-build-system) - (inputs - `(("ghc-regex-base" ,ghc-regex-base))) - (home-page "https://github.com/ChrisKuklewicz/regex-tdfa") - (synopsis "POSIX extended regular expressions in Haskell.") - (description - "Regex-tdfa is a pure Haskell regular expression library implementing POSIX -extended regular expressions. It is a \"tagged\" DFA regex engine. It is -inspired by libtre.") - (license license:bsd-3))) - -(define-public ghc-regex-compat-tdfa - (package - (name "ghc-regex-compat-tdfa") - (version "0.95.1.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/regex-compat-tdfa/regex-compat-tdfa-" - version ".tar.gz")) - (sha256 - (base32 - "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg")))) - (build-system haskell-build-system) - (inputs - `(("ghc-regex-base" ,ghc-regex-base) - ("ghc-regex-tdfa" ,ghc-regex-tdfa))) - (home-page "https://hub.darcs.net/shelarcy/regex-compat-tdfa") - (synopsis "Unicode Support version of Text.Regex, using regex-tdfa") - (description - "One module layer over @code{regex-tdfa} to replace @code{Text.Regex}. -@code{regex-compat} can't use Unicode characters correctly because of using regex-posix. -This is not good for Unicode users. This modified regex-compat uses regex-tdfa to solve -this problem.") - (license license:bsd-3))) - -(define-public ghc-sandi - (package - (name "ghc-sandi") - (version "0.4.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/sandi/sandi-" - version ".tar.gz")) - (sha256 - (base32 - "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-stringsearch" ,ghc-stringsearch) - ("ghc-conduit" ,ghc-conduit) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-hunit" ,ghc-hunit) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-tasty-th" ,ghc-tasty-th))) - (home-page "https://hackage.haskell.org/package/sandi") - (synopsis "Data encoding library") - (description "Reasonably fast data encoding library.") - (license license:bsd-3))) - -(define-public ghc-bytestring-handle - (package - (name "ghc-bytestring-handle") - (version "0.1.0.6") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/bytestring-handle/bytestring-handle-" - version ".tar.gz")) - (sha256 - (base32 - "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "bytestring-handle.cabal" - (("QuickCheck >= 2\\.1\\.2 && < 2\\.11") - "QuickCheck >= 2.1.2 && < 2.12") - (("base >= 4\\.2 && < 4\\.11") - "base >= 4.2 && < 4.12"))))))) - (inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://hub.darcs.net/ganesh/bytestring-handle") - (synopsis "ByteString-backed Handles") - (description "ByteString-backed Handles") ; There is no description - (license license:bsd-3))) - -(define-public ghc-tar - (package - (name "ghc-tar") - (version "0.5.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tar/tar-" - version ".tar.gz")) - (sha256 - (base32 - "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8")))) - (build-system haskell-build-system) - ;; FIXME: 2/24 tests fail. - (arguments `(#:tests? #f)) - (inputs - `(("ghc-bytestring-handle" ,ghc-bytestring-handle) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://hackage.haskell.org/package/tar") - (synopsis "Reading, writing and manipulating \".tar\" archive files") - (description - "This library is for working with \\\"@.tar@\\\" archive files. -It can read and write a range of common variations of the tar archive format -including V7, POSIX USTAR and GNU formats. It provides support for packing and -unpacking portable archives. This makes it suitable for distribution but not -backup because details like file ownership and exact permissions are not -preserved. It also provides features for random access to archive content using -an index.") - (license license:bsd-3))) - -(define-public ghc-stmonadtrans - (package - (name "ghc-stmonadtrans") - (version "0.4.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/STMonadTrans" - "/STMonadTrans-" version ".tar.gz")) - (sha256 - (base32 "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/STMonadTrans") - (synopsis "Monad transformer version of the ST monad") - (description - "This package provides a monad transformer version of the @code{ST} monad -for strict state threads.") - (license license:bsd-3))) - -(define-public ghc-findbin - (package - (name "ghc-findbin") - (version "0.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/FindBin/FindBin-" - version ".tar.gz")) - (sha256 - (base32 - "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717")))) - (build-system haskell-build-system) - (home-page "https://github.com/audreyt/findbin") - (synopsis "Get the absolute path of the running program") - (description - "This module locates the full directory of the running program, to allow -the use of paths relative to it. FindBin supports invocation of Haskell -programs via \"ghci\", via \"runhaskell/runghc\", as well as compiled as -an executable.") - (license license:bsd-3))) - -(define-public ghc-patience - (package - (name "ghc-patience") - (version "0.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/patience/patience-" - version ".tar.gz")) - (sha256 - (base32 - "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/patience") - (synopsis "Patience diff and longest increasing subsequence") - (description - "This library implements the 'patience diff' algorithm, as well as the -patience algorithm for the longest increasing subsequence problem. -Patience diff computes the difference between two lists, for example the lines -of two versions of a source file. It provides a good balance between -performance, nice output for humans, and simplicity of implementation.") - (license license:bsd-3))) - -(define-public ghc-monads-tf - (package - (name "ghc-monads-tf") - (version "0.1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/monads-tf/monads-tf-" - version ".tar.gz")) - (sha256 - (base32 - "1wdhskwa6dw8qljbvwpyxj8ca6y95q2np7z4y4q6bpf4anmd5794")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/monads-tf") - (synopsis "Monad classes, using type families") - (description - "Monad classes using type families, with instances for various monad transformers, -inspired by the paper 'Functional Programming with Overloading and Higher-Order -Polymorphism', by Mark P Jones. This package is almost a compatible replacement for -the @code{mtl-tf} package.") - (license license:bsd-3))) - -(define-public ghc-colour -(package - (name "ghc-colour") - (version "2.3.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/colour/colour-" - version ".tar.gz")) - (sha256 - (base32 - "1sy51nz096sv91nxqk6yk7b92b5a40axv9183xakvki2nc09yhqg")))) - (arguments - ;; The tests for this package have the following dependency cycle: - ;; ghc-test-framework -> ghc-ansi-terminal -> ghc-colour. - `(#:tests? #f)) - (build-system haskell-build-system) - (home-page "https://www.haskell.org/haskellwiki/Colour") - (synopsis "Model for human colour perception") - (description - "This package provides a data type for colours and transparency. -Colours can be blended and composed. Various colour spaces are -supported. A module of colour names (\"Data.Colour.Names\") is provided.") - (license license:expat))) - -(define-public ghc-wl-pprint-text - (package - (name "ghc-wl-pprint-text") - (version "1.2.0.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/wl-pprint-text/wl-pprint-text-" - version ".tar.gz")) - (sha256 - (base32 - "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0")))) - (build-system haskell-build-system) - (inputs - `(("ghc-base-compat" ,ghc-base-compat))) - (home-page "https://hackage.haskell.org/package/wl-pprint-text") - (synopsis "Wadler/Leijen Pretty Printer for Text values") - (description - "A clone of wl-pprint for use with the text library.") - (license license:bsd-3))) - -(define-public ghc-fgl-arbitrary - (package - (name "ghc-fgl-arbitrary") - (version "0.2.0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/fgl-arbitrary/fgl-arbitrary-" - version ".tar.gz")) - (sha256 - (base32 - "0ln1szgfy8fa78l3issq4fx3aqnnd54w3cb4wssrfi48vd5rkfjm")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "fgl-arbitrary.cabal" - (("QuickCheck >= 2\\.3 && < 2\\.10") - "QuickCheck >= 2.3 && < 2.12") - (("hspec >= 2\\.1 && < 2\\.5") - "hspec >= 2.1 && < 2.6"))))))) - (inputs - `(("ghc-fgl" ,ghc-fgl) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec))) - (home-page "https://hackage.haskell.org/package/fgl-arbitrary") - (synopsis "QuickCheck support for fgl") - (description - "Provides Arbitrary instances for fgl graphs to avoid adding a -QuickCheck dependency for fgl whilst still making the instances -available to others. Also available are non-fgl-specific functions -for generating graph-like data structures.") - (license license:bsd-3))) - -(define-public ghc-graphviz - (package - (name "ghc-graphviz") - (version "2999.20.0.2") - (source (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "graphviz/graphviz-" version ".tar.gz")) - (sha256 - (base32 - "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7")))) - (build-system haskell-build-system) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-colour" ,ghc-colour) - ("ghc-dlist" ,ghc-dlist) - ("ghc-fgl" ,ghc-fgl) - ("ghc-fgl-arbitrary" ,ghc-fgl-arbitrary) - ("ghc-polyparse" ,ghc-polyparse) - ("ghc-temporary" ,ghc-temporary) - ("ghc-wl-pprint-text" ,ghc-wl-pprint-text))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("graphviz" ,graphviz) - ("hspec-discover" ,hspec-discover))) - (home-page "https://hackage.haskell.org/package/graphviz") - (synopsis "Bindings to Graphviz for graph visualisation") - (description - "This library provides bindings for the Dot language used by -the @uref{https://graphviz.org/, Graphviz} suite of programs for -visualising graphs, as well as functions to call those programs. -Main features of the graphviz library include: - -@enumerate -@item Almost complete coverage of all Graphviz attributes and syntax -@item Support for specifying clusters -@item The ability to use a custom node type -@item Functions for running a Graphviz layout tool with all specified output types -@item Generate and parse Dot code with two options: strict and liberal -@item Functions to convert FGL graphs and other graph-like data structures -@item Round-trip support for passing an FGL graph through Graphviz to augment node -and edge labels with positional information, etc. -@end enumerate\n") - (license license:bsd-3))) - -(define-public ghc-constraints - (package - (name "ghc-constraints") - (version "0.10.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/constraints/constraints-" - version ".tar.gz")) - (sha256 - (base32 - "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q")))) - (build-system haskell-build-system) - (inputs - `(("ghc-hashable" ,ghc-hashable) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-transformers-compat" ,ghc-transformers-compat))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/ekmett/constraints/") - (synopsis "Constraint manipulation") - (description - "GHC 7.4 gave us the ability to talk about @code{ConstraintKinds}. -They stopped crashing the compiler in GHC 7.6. This package provides -a vocabulary for working with them.") - (license license:bsd-3))) - -(define-public ghc-lifted-async - (package - (name "ghc-lifted-async") - (version "0.10.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lifted-async/lifted-async-" - version ".tar.gz")) - (sha256 - (base32 - "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf")))) - (build-system haskell-build-system) - (inputs - `(("ghc-async" ,ghc-async) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-constraints" ,ghc-constraints) - ("ghc-hunit" ,ghc-hunit) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-th" ,ghc-tasty-th))) - (home-page "https://github.com/maoe/lifted-async") - (synopsis "Run lifted IO operations asynchronously and wait for their results") - (description - "This package provides IO operations from @code{async} package lifted to any -instance of @code{MonadBase} or @code{MonadBaseControl}.") - (license license:bsd-3))) - -;; Ghc-shelly depends on ghc-system-filepath and ghc-system-fileio, who in turn depend on -;; ghc-chell and ghc-chell-quickcheck for the test phase. Ghc-chell depends on ghc-options -;; which depends on ghc-chell and ghc-chell-quickcheck. -;; Therefore we bootstrap it with tests disabled. -(define ghc-system-filepath-bootstrap - (package - (name "ghc-system-filepath-bootstrap") - (version "0.4.14") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/system-filepath/system-filepath-" - version ".tar.gz")) - (sha256 - (base32 - "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) - (build-system haskell-build-system) - (arguments - `(#:tests? #f)) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/fpco/haskell-filesystem") - (synopsis "High-level, byte-based file and directory path manipulations") - (description - "Provides a FilePath datatype and utility functions for operating on it. -Unlike the filepath package, this package does not simply reuse String, -increasing type safety.") - (license license:expat))) - -;; See ghc-system-filepath-bootstrap. In addition this package depends on -;; ghc-system-filepath. -(define ghc-system-fileio-bootstrap - (package - (name "ghc-system-fileio-bootstrap") - (version "0.3.16.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/system-fileio/system-fileio-" - version ".tar.gz")) - (sha256 - (base32 - "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i")))) - (build-system haskell-build-system) - (arguments - `(#:tests? #f)) - (inputs - `(("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) - ("ghc-temporary" ,ghc-temporary))) - (home-page "https://github.com/fpco/haskell-filesystem") - (synopsis "Consistent file system interaction across GHC versions") - (description - "This is a small wrapper around the directory, unix, and Win32 packages, -for use with system-filepath. It provides a consistent API to the various -versions of these packages distributed with different versions of GHC. -In particular, this library supports working with POSIX files that have paths -which can't be decoded in the current locale encoding.") - (license license:expat))) - -(define-public ghc-shelly - (package - (name "ghc-shelly") - (version "1.8.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/shelly/shelly-" - version ".tar.gz")) - (sha256 - (base32 - "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y")))) - (build-system haskell-build-system) - (inputs - `(("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-system-filepath-bootstrap" ,ghc-system-filepath-bootstrap) - ("ghc-system-fileio-bootstrap" ,ghc-system-fileio-bootstrap) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-lifted-async" ,ghc-lifted-async) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-enclosed-exceptions" ,ghc-enclosed-exceptions) - ("ghc-async" ,ghc-async) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-hunit" ,ghc-hunit) - ("ghc-hspec" ,ghc-hspec) - ("ghc-hspec-contrib" ,ghc-hspec-contrib))) - (home-page "https://github.com/yesodweb/Shelly.hs") - (synopsis "Shell-like (systems) programming in Haskell") - (description - "Shelly provides convenient systems programming in Haskell, similar in -spirit to POSIX shells. Shelly is originally forked from the Shellish package.") - (license license:bsd-3))) - -;; See ghc-system-filepath-bootstrap, chell and chell-quickcheck are required for tests. -(define ghc-options-bootstrap - (package - (name "ghc-options-bootstrap") - (version "1.2.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/options/options-" - version ".tar.gz")) - (sha256 - (base32 - "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8")))) - (build-system haskell-build-system) - (arguments - `(#:tests? #f)) - (inputs - `(("ghc-monads-tf" ,ghc-monads-tf))) - (home-page "https://john-millikin.com/software/haskell-options/") - (synopsis "Powerful and easy-to-use command-line option parser") - (description - "The @code{options} package lets library and application developers -easily work with command-line options.") - (license license:expat))) - -(define-public ghc-chell - (package - (name "ghc-chell") - (version "0.4.0.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/chell/chell-" - version ".tar.gz")) - (sha256 - (base32 - "10ingy9qnbmc8cqh4i9pskcw43l0mzk8f3d76b3qz3fig5ary3j9")))) - (build-system haskell-build-system) - (inputs - `(("ghc-options-bootstrap" ,ghc-options-bootstrap) - ("ghc-patience" ,ghc-patience) - ("ghc-random" ,ghc-random) - ("ghc-ansi-terminal" ,ghc-ansi-terminal))) - (home-page "https://john-millikin.com/software/chell/") - (synopsis "Simple and intuitive library for automated testing") - (description - "Chell is a simple and intuitive library for automated testing. -It natively supports assertion-based testing, and can use companion -libraries such as @code{chell-quickcheck} to support more complex -testing strategies.") - (license license:expat))) - -(define ghc-chell-quickcheck-bootstrap - (package - (name "ghc-chell-quickcheck-bootstrap") - (version "0.2.5.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/chell-quickcheck/" - "chell-quickcheck-" version ".tar.gz")) - (sha256 - (base32 - "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) - (build-system haskell-build-system) - (inputs - `(("ghc-chell" ,ghc-chell) - ("ghc-random" ,ghc-random) - ("ghc-quickcheck" ,ghc-quickcheck))) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "chell-quickcheck.cabal" - (("QuickCheck >= 2\\.3 && < 2\\.11") - "QuickCheck >= 2.3 && < 2.12"))))))) - (home-page "https://john-millikin.com/software/chell/") - (synopsis "QuickCheck support for the Chell testing library") - (description "More complex tests for @code{chell}.") - (license license:expat))) - -(define-public ghc-chell-quickcheck - (package - (name "ghc-chell-quickcheck") - (version "0.2.5.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/chell-quickcheck/" - "chell-quickcheck-" version ".tar.gz")) - (sha256 - (base32 - "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "chell-quickcheck.cabal" - (("QuickCheck >= 2\\.3 && < 2\\.11") - "QuickCheck >= 2.3 && < 2.12"))))))) - (inputs - `(("ghc-chell" ,ghc-chell) - ("ghc-chell-quickcheck-bootstrap" ,ghc-chell-quickcheck-bootstrap) - ("ghc-random" ,ghc-random) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://john-millikin.com/software/chell/") - (synopsis "QuickCheck support for the Chell testing library") - (description "More complex tests for @code{chell}.") - (license license:expat))) - -(define-public ghc-options - (package - (name "ghc-options") - (version "1.2.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/options/options-" - version ".tar.gz")) - (sha256 - (base32 - "0qjs0v1ny52w51n5582d4z8wy9h6n0zw1xb5dh686ff5wadflgi8")))) - (build-system haskell-build-system) - (inputs - `(("ghc-monads-tf" ,ghc-monads-tf) - ("ghc-chell" ,ghc-chell) - ("ghc-chell-quickcheck" ,ghc-chell-quickcheck))) - (home-page "https://john-millikin.com/software/haskell-options/") - (synopsis "Powerful and easy-to-use command-line option parser") - (description - "The @code{options} package lets library and application developers -easily work with command-line options.") - (license license:expat))) - -(define-public ghc-system-filepath - (package - (name "ghc-system-filepath") - (version "0.4.14") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/system-filepath/system-filepath-" - version ".tar.gz")) - (sha256 - (base32 - "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn")))) - (build-system haskell-build-system) - ;; FIXME: One of the tests fails: - ;; [ FAIL ] tests.validity.posix - ;; note: seed=7310214548328823169 - ;; *** Failed! Falsifiable (after 24 tests): - ;; FilePath "/r2\ENQ52\t ;$/o\US=/okG\146\&6\n= 1.1 && < 1.4"))))))) - (inputs - `(("ghc-cereal" ,ghc-cereal) - ("ghc-data-default-class" - ,ghc-data-default-class) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-temporary" ,ghc-temporary))) - (native-inputs - `(("hspec-discover" ,hspec-discover) - ("ghc-hspec" ,ghc-hspec))) - (home-page "https://github.com/mrkkrp/wave") - (synopsis "Work with WAVE and RF64 files in Haskell") - (description "This package allows you to work with WAVE and RF64 -files in Haskell.") - (license license:bsd-3))) - -(define-public ghc-hslogger - (package - (name "ghc-hslogger") - (version "1.2.10") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hslogger-" version "/" "hslogger-" - version ".tar.gz")) - (sha256 (base32 - "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp")))) - (build-system haskell-build-system) - (inputs - `(("ghc-network" ,ghc-network) - ("ghc-old-locale" ,ghc-old-locale))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (home-page "https://software.complete.org/hslogger") - (synopsis "Logging framework for Haskell, similar to Python's logging module") - (description "Hslogger lets each log message have a priority and source be -associated with it. The programmer can then define global handlers that route -or filter messages based on the priority and source. It also has a syslog -handler built in.") - (license license:bsd-3))) - -(define-public ghc-unexceptionalio - (package - (name "ghc-unexceptionalio") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "unexceptionalio-" version "/" "unexceptionalio-" - version ".tar.gz")) - (sha256 (base32 "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p")))) - (build-system haskell-build-system) - (home-page "https://github.com/singpolyma/unexceptionalio") - (synopsis "IO without any non-error, synchronous exceptions") - (description "When you've caught all the exceptions that can be -handled safely, this is what you're left with.") - (license license:isc))) - -(define-public ghc-json - (package - (name "ghc-json") - (version "0.9.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/json/" - "json-" version ".tar.gz")) - (sha256 - (base32 - "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6")))) - (build-system haskell-build-system) - (inputs - `(("ghc-syb" ,ghc-syb))) - (home-page "https://hackage.haskell.org/package/json") - (synopsis "Serializes Haskell data to and from JSON") - (description "This package provides a parser and pretty printer for -converting between Haskell values and JSON. -JSON (JavaScript Object Notation) is a lightweight data-interchange format.") - (license license:bsd-3))) - -(define-public ghc-esqueleto - (let ((version "2.5.3") - (revision "1") - (commit "b81e0d951e510ebffca03c5a58658ad884cc6fbd")) - (package - (name "ghc-esqueleto") - (version (git-version version revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bitemyapp/esqueleto") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa")))) - (build-system haskell-build-system) - (arguments - `(#:haddock? #f ; Haddock reports an internal error. - #:phases - (modify-phases %standard-phases - ;; This package normally runs tests for the MySQL, PostgreSQL, and - ;; SQLite backends. Since we only have Haskell packages for - ;; SQLite, we remove the other two test suites. FIXME: Add the - ;; other backends and run all three test suites. - (add-before 'configure 'remove-non-sqlite-test-suites - (lambda _ - (use-modules (ice-9 rdelim)) - (with-atomic-file-replacement "esqueleto.cabal" - (lambda (in out) - (let loop ((line (read-line in 'concat)) (deleting? #f)) - (cond - ((eof-object? line) #t) - ((string-every char-set:whitespace line) - (unless deleting? (display line out)) - (loop (read-line in 'concat) #f)) - ((member line '("test-suite mysql\n" - "test-suite postgresql\n")) - (loop (read-line in 'concat) #t)) - (else - (unless deleting? (display line out)) - (loop (read-line in 'concat) deleting?))))))))))) - (inputs - `(("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-conduit" ,ghc-conduit) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-persistent" ,ghc-persistent) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-tagged" ,ghc-tagged) - ("ghc-unliftio" ,ghc-unliftio) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-persistent-sqlite" ,ghc-persistent-sqlite) - ("ghc-persistent-template" ,ghc-persistent-template))) - (home-page "https://github.com/bitemyapp/esqueleto") - (synopsis "Type-safe embedded domain specific language for SQL queries") - (description "This library provides a type-safe embedded domain specific -language (EDSL) for SQL queries that works with SQL backends as provided by -@code{ghc-persistent}. Its language closely resembles SQL, so you don't have -to learn new concepts, just new syntax, and it's fairly easy to predict the -generated SQL and optimize it for your backend.") - (license license:bsd-3)))) - -(define-public ghc-simple-sendfile - (package - (name "ghc-simple-sendfile") - (version "0.2.27") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "simple-sendfile-" version "/" - "simple-sendfile-" version ".tar.gz")) - (sha256 - (base32 - "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn")))) - (build-system haskell-build-system) - (inputs - `(("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-network" ,ghc-network) - ("ghc-resourcet" ,ghc-resourcet))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/kazu-yamamoto/simple-sendfile") - (synopsis "Cross platform library for the sendfile system call") - (description "This library tries to call minimum system calls which -are the bottleneck of web servers.") - (license license:bsd-3))) - -(define-public ghc-hex - (package - (name "ghc-hex") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "hex-" version "/" - "hex-" version ".tar.gz")) - (sha256 - (base32 - "1v31xiaivrrn0q2jz8919wvkjplv1kxna5ajhsj701fqxm1i5vhj")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/hex") - (synopsis "Convert strings into hexadecimal and back") - (description "This package provides conversion functions between -bytestrings and their hexademical representation.") - (license license:bsd-3))) - -(define-public ghc-psqueues - (package - (name "ghc-psqueues") - (version "0.2.7.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "psqueues-" version "/" - "psqueues-" version ".tar.gz")) - (sha256 - (base32 - "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc")))) - (build-system haskell-build-system) - (inputs - `(("ghc-hashable" ,ghc-hashable))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tagged" ,ghc-tagged) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/jaspervdj/psqueues") - (synopsis "Pure priority search queues") - (description "The psqueues package provides -@uref{https://en.wikipedia.org/wiki/Priority_queue, Priority Search Queues} in -three different flavors: - -@itemize -@item @code{OrdPSQ k p v}, which uses the @code{Ord k} instance to provide -fast insertion, deletion and lookup. This implementation is based on Ralf -Hinze's @uref{http://citeseer.ist.psu.edu/hinze01simple.html, A Simple -Implementation Technique for Priority Search Queues}. - -Hence, it is similar to the @uref{https://hackage.haskell.org/package/PSQueue, -PSQueue} library, although it is considerably faster and provides a slightly -different API. - -@item @code{IntPSQ p v} is a far more efficient implementation. It fixes the -key type to @code{Int} and uses a -@code{https://en.wikipedia.org/wiki/Radix_tree, radix tree} (like @code{IntMap}) -with an additional min-heap property. - -@item @code{HashPSQ k p v} is a fairly straightforward extension -of @code{IntPSQ}: it simply uses the keys' hashes as indices in the -@code{IntPSQ}. If there are any hash collisions, it uses an -@code{OrdPSQ} to resolve those. The performance of this implementation -is comparable to that of @code{IntPSQ}, but it is more widely -applicable since the keys are not restricted to @code{Int}, -but rather to any @code{Hashable} datatype. -@end itemize - -Each of the three implementations provides the same API, so they can -be used interchangeably. - -Typical applications of Priority Search Queues include: - -@itemize -@item Caches, and more specifically LRU Caches; -@item Schedulers; -@item Pathfinding algorithms, such as Dijkstra's and A*. -@end itemize") - (license license:bsd-3))) - -(define-public ghc-glob - (package - (name "ghc-glob") - (version "0.9.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "Glob-" version "/" - "Glob-" version ".tar.gz")) - (sha256 - (base32 - "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg")))) - (build-system haskell-build-system) - (inputs - `(("ghc-dlist" ,ghc-dlist) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-transformers-compat" ,ghc-transformers-compat))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "http://iki.fi/matti.niemenmaa/glob/") - (synopsis "Haskell library matching glob patterns against file paths") - (description "This package provides a Haskell library for @dfn{globbing}: -matching patterns against file paths.") - (license license:bsd-3))) - -(define-public ghc-errors - (package - (name "ghc-errors") - (version "2.3.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "errors-" version "/" - "errors-" version ".tar.gz")) - (sha256 - (base32 - "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7")))) - (build-system haskell-build-system) - (inputs - `(("ghc-exceptions" ,ghc-exceptions) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-unexceptionalio" ,ghc-unexceptionalio) - ("ghc-safe" ,ghc-safe))) - (home-page "https://github.com/gabriel439/haskell-errors-library") - (synopsis "Error handling library for Haskell") - (description "This library encourages an error-handling style that -directly uses the type system, rather than out-of-band exceptions.") - (license license:bsd-3))) - -(define-public ghc-vector-th-unbox - (package - (name "ghc-vector-th-unbox") - (version "0.2.1.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "vector-th-unbox-" version "/" - "vector-th-unbox-" version ".tar.gz")) - (sha256 - (base32 - "0d82x55f5vvr1jvaia382m23rs690lg55pvavv8f4ph0y6kd91xy")))) - (build-system haskell-build-system) - (inputs - `(("ghc-vector" ,ghc-vector) - ("ghc-data-default" ,ghc-data-default))) - (home-page "https://github.com/liyang/vector-th-unbox") - (synopsis "Deriver for Data.Vector.Unboxed using Template Haskell") - (description "This Haskell library provides a Template Haskell -deriver for unboxed vectors, given a pair of coercion functions to -and from some existing type with an Unbox instance.") - (license license:bsd-3))) - -(define-public ghc-erf - (package - (name "ghc-erf") - (version "2.0.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "erf-" version "/" - "erf-" version ".tar.gz")) - (sha256 - (base32 - "0dxk2r32ajmmc05vaxcp0yw6vgv4lkbmh8jcshncn98xgsfbgw14")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/erf") - (synopsis "The error function, erf, and related functions for Haskell") - (description "This Haskell library provides a type class for the -error function, erf, and related functions. Instances for Float and -Double.") - (license license:bsd-3))) - -(define-public ghc-math-functions - (package - (name "ghc-math-functions") - (version "0.2.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "math-functions-" version "/" - "math-functions-" version ".tar.gz")) - (sha256 - (base32 - "1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: 1 test fails. - (inputs - `(("ghc-vector" ,ghc-vector) - ("ghc-vector-th-unbox" ,ghc-vector-th-unbox))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-erf" ,ghc-erf) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/bos/math-functions") - (synopsis "Special functions and Chebyshev polynomials for Haskell") - (description "This Haskell library provides implementations of -special mathematical functions and Chebyshev polynomials. These -functions are often useful in statistical and numerical computing.") - (license license:bsd-3))) - -(define-public ghc-mwc-random - (package - (name "ghc-mwc-random") - (version "0.13.6.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mwc-random-" version "/" - "mwc-random-" version ".tar.gz")) - (sha256 - (base32 - "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6")))) - (build-system haskell-build-system) - (inputs - `(("ghc-primitive" ,ghc-primitive) - ("ghc-vector" ,ghc-vector) - ("ghc-math-functions" ,ghc-math-functions))) - (arguments - `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails. - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/bos/mwc-random") - (synopsis "Random number generation library for Haskell") - (description "This Haskell package contains code for generating -high quality random numbers that follow either a uniform or normal -distribution. The generated numbers are suitable for use in -statistical applications. - -The uniform PRNG uses Marsaglia's MWC256 (also known as MWC8222) -multiply-with-carry generator, which has a period of 2^{8222} and -fares well in tests of randomness. It is also extremely fast, -between 2 and 3 times faster than the Mersenne Twister.") - (license license:bsd-3))) - -(define-public ghc-vector-algorithms - (package - (name "ghc-vector-algorithms") - (version "0.7.0.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "vector-algorithms-" version "/" - "vector-algorithms-" version ".tar.gz")) - (sha256 - (base32 - "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg")))) - (build-system haskell-build-system) - (inputs - `(("ghc-vector" ,ghc-vector))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/bos/math-functions") - (synopsis "Algorithms for vector arrays in Haskell") - (description "This Haskell library algorithms for vector arrays.") - (license license:bsd-3))) - -(define-public ghc-language-haskell-extract - (package - (name "ghc-language-haskell-extract") - (version "0.2.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "language-haskell-extract-" version "/" - "language-haskell-extract-" version ".tar.gz")) - (sha256 - (base32 - "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl")))) - (build-system haskell-build-system) - (inputs - `(("ghc-regex-posix" ,ghc-regex-posix))) - (home-page "https://github.com/finnsson/template-helper") - (synopsis "Haskell module to automatically extract functions from -the local code") - (description "This package contains helper functions on top of -Template Haskell. - -For example, @code{functionExtractor} extracts all functions after a -regexp-pattern, which can be useful if you wish to extract all functions -beginning with @code{test} (for a test framework) or all functions beginning -with @code{wc} (for a web service).") - (license license:bsd-3))) - -(define-public ghc-abstract-par - (package - (name "ghc-abstract-par") - (version "0.3.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "abstract-par-" version "/" - "abstract-par-" version ".tar.gz")) - (sha256 - (base32 - "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4")))) - (build-system haskell-build-system) - (home-page "https://github.com/simonmar/monad-par") - (synopsis "Abstract parallelization interface for Haskell") - (description "This Haskell package is an abstract interface -only. It provides a number of type clasess, but not an -implementation. The type classes separate different levels -of @code{Par} functionality. See the @code{Control.Monad.Par.Class} -module for more details.") - (license license:bsd-3))) - -(define-public ghc-monad-par-extras - (package - (name "ghc-monad-par-extras") - (version "0.3.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-par-extras-" version "/" - "monad-par-extras-" version ".tar.gz")) - (sha256 - (base32 - "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2")))) - (build-system haskell-build-system) - (inputs `(("ghc-abstract-par" ,ghc-abstract-par) - ("ghc-cereal" ,ghc-cereal) - ("ghc-random" ,ghc-random))) - (home-page "https://github.com/simonmar/monad-par") - (synopsis "Combinators and extra features for Par monads for Haskell") - (description "This Haskell package provides additional data structures, -and other added capabilities layered on top of the @code{Par} monad.") - (license license:bsd-3))) - -(define-public ghc-abstract-deque - (package - (name "ghc-abstract-deque") - (version "0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "abstract-deque-" version "/" - "abstract-deque-" version ".tar.gz")) - (sha256 - (base32 - "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9")))) - (build-system haskell-build-system) - (inputs `(("ghc-random" ,ghc-random))) - (home-page "https://github.com/rrnewton/haskell-lockfree/wiki") - (synopsis "Abstract, parameterized interface to mutable Deques for Haskell") - (description "This Haskell package provides an abstract interface to -highly-parameterizable queues/deques. - -Background: There exists a feature space for queues that extends between: - -@itemize -@item Simple, single-ended, non-concurrent, bounded queues - -@item Double-ended, thread-safe, growable queues with important points -in between (such as the queues used for work stealing). -@end itemize - -This package includes an interface for Deques that allows the programmer -to use a single API for all of the above, while using the type system to -select an efficient implementation given the requirements (using type families). - -This package also includes a simple reference implementation based on -@code{IORef} and @code{Data.Sequence}.") - (license license:bsd-3))) - -(define-public ghc-monad-par - (package - (name "ghc-monad-par") - (version "0.3.4.8") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-par-" version "/" - "monad-par-" version ".tar.gz")) - (sha256 - (base32 - "0ldrzqy24fsszvn2a2nr77m2ih7xm0h9bgkjyv1l274aj18xyk7q")))) - (build-system haskell-build-system) - (inputs `(("ghc-abstract-par" ,ghc-abstract-par) - ("ghc-abstract-deque" ,ghc-abstract-deque) - ("ghc-monad-par-extras" ,ghc-monad-par-extras) - ("ghc-mwc-random" ,ghc-mwc-random) - ("ghc-parallel" ,ghc-parallel))) - (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" - ,ghc-test-framework-quickcheck2) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-th" ,ghc-test-framework-th))) - (home-page "https://github.com/simonmar/monad-par") - (synopsis "Haskell library for parallel programming based on a monad") - (description "The @code{Par} monad offers an API for parallel -programming. The library works for parallelising both pure and @code{IO} -computations, although only the pure version is deterministic. The default -implementation provides a work-stealing scheduler and supports forking tasks -that are much lighter weight than IO-threads.") - (license license:bsd-3))) - -(define-public ghc-statistics - (package - (name "ghc-statistics") - (version "0.14.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "statistics-" version "/" - "statistics-" version ".tar.gz")) - (sha256 - (base32 - "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l")))) - (build-system haskell-build-system) - (arguments - '(#:cabal-revision - ("2" "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3") - ;; Two tests fail: "Discrete CDF is OK" and "Quantile is CDF inverse". - #:tests? #f)) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-erf" ,ghc-erf) - ("ghc-math-functions" ,ghc-math-functions) - ("ghc-monad-par" ,ghc-monad-par) - ("ghc-mwc-random" ,ghc-mwc-random) - ("ghc-primitive" ,ghc-primitive) - ("ghc-vector" ,ghc-vector) - ("ghc-vector-algorithms" ,ghc-vector-algorithms) - ("ghc-vector-th-unbox" ,ghc-vector-th-unbox) - ("ghc-vector-binary-instances" ,ghc-vector-binary-instances))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-ieee754" ,ghc-ieee754) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/bos/mwc-random") - (synopsis "Haskell library of statistical types, data, and functions") - (description "This library provides a number of common functions -and types useful in statistics. We focus on high performance, numerical -robustness, and use of good algorithms. Where possible, we provide references -to the statistical literature. - -The library's facilities can be divided into four broad categories: - -@itemize -@item Working with widely used discrete and continuous probability -distributions. (There are dozens of exotic distributions in use; we focus -on the most common.) - -@item Computing with sample data: quantile estimation, kernel density -estimation, histograms, bootstrap methods, significance testing, -and regression and autocorrelation analysis. - -@item Random variate generation under several different distributions. - -@item Common statistical tests for significant differences between samples. -@end itemize") - (license license:bsd-2))) - -(define-public ghc-chunked-data - (package - (name "ghc-chunked-data") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "chunked-data-" version "/" - "chunked-data-" version ".tar.gz")) - (sha256 - (base32 - "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p")))) - (build-system haskell-build-system) - (inputs `(("ghc-vector" ,ghc-vector) - ("ghc-semigroups" ,ghc-semigroups))) - (home-page "https://github.com/snoyberg/mono-traversable") - (synopsis "Typeclasses for dealing with various chunked data -representations for Haskell") - (description "This Haskell package was originally present in -classy-prelude.") - (license license:expat))) - -(define-public ghc-base-prelude - (package - (name "ghc-base-prelude") - (version "1.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "base-prelude-" version "/" - "base-prelude-" version ".tar.gz")) - (sha256 - (base32 - "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73")))) - (build-system haskell-build-system) - (home-page "https://github.com/nikita-volkov/base-prelude") - (synopsis "The most complete prelude formed solely from the Haskell's base -package") - (description "This Haskell package aims to reexport all the non-conflicting -and most general definitions from the \"base\" package. - -This includes APIs for applicatives, arrows, monoids, foldables, traversables, -exceptions, generics, ST, MVars and STM. - -This package will never have any dependencies other than \"base\". - -Versioning policy: - -The versioning policy of this package deviates from PVP in the sense -that its exports in part are transitively determined by the version of \"base\". -Therefore it's recommended for the users of @code{ghc-base-prelude} to specify -the bounds of \"base\" as well.") - (license license:expat))) - -(define-public ghc-tuple-th - (package - (name "ghc-tuple-th") - (version "0.2.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "tuple-th-" version "/" - "tuple-th-" version ".tar.gz")) - (sha256 - (base32 - "1mrl4vvxmby7sf1paf7hklzidnr6wq55822i73smqyz0xpf3gsjn")))) - (build-system haskell-build-system) - (home-page "https://github.com/DanielSchuessler/tuple-th") - (synopsis "Generate utility functions for tuples of statically known size -for Haskell") - (description "This Haskell package contains Template Haskell functions for -generating functions similar to those in @code{Data.List} for tuples of -statically known size.") - (license license:bsd-3))) - -(define-public ghc-contravariant-extras - (package - (name "ghc-contravariant-extras") - (version "0.3.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "contravariant-extras-" version "/" - "contravariant-extras-" version ".tar.gz")) - (sha256 - (base32 - "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n")))) - (build-system haskell-build-system) - (inputs - `(("ghc-tuple-th" ,ghc-tuple-th) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-base-prelude" ,ghc-base-prelude) - ("ghc-semigroups" ,ghc-semigroups))) - (home-page "https://github.com/nikita-volkov/contravariant-extras") - (synopsis "Extras for the @code{ghc-contravariant} Haskell package") - (description "This Haskell package provides extras for the -@code{ghc-contravariant} package.") - (license license:expat))) - -(define-public ghc-monadrandom - (package - (name "ghc-monadrandom") - (version "0.5.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "MonadRandom-" version "/" - "MonadRandom-" version ".tar.gz")) - (sha256 - (base32 - "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb")))) - (build-system haskell-build-system) - (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-primitive" ,ghc-primitive) - ("ghc-fail" ,ghc-fail) - ("ghc-random" ,ghc-random))) - (home-page "https://github.com/byorgey/MonadRandom") - (synopsis "Random-number generation monad for Haskell") - (description "This Haskell package provides support for computations -which consume random values.") - (license license:bsd-3))) - -(define-public ghc-either - (package - (name "ghc-either") - (version "5.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "either-" version "/" - "either-" version ".tar.gz")) - (sha256 - (base32 - "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc")))) - (build-system haskell-build-system) - (inputs `(("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-free" ,ghc-free) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-manodrandom" ,ghc-monadrandom) - ("ghc-mmorph" ,ghc-mmorph) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-transformers-base" ,ghc-transformers-base))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/ekmett/either") - (synopsis "Provides an either monad transformer for Haskell") - (description "This Haskell package provides an either monad transformer.") - (license license:bsd-3))) - -(define-public ghc-pretty-hex - (package - (name "ghc-pretty-hex") - (version "1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pretty-hex-" version "/" - "pretty-hex-" version ".tar.gz")) - (sha256 - (base32 - "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz")))) - (build-system haskell-build-system) - (home-page "https://github.com/GaloisInc/hexdump") - (synopsis "Haskell library for hex dumps of ByteStrings") - (description "This Haskell library generates pretty hex dumps of -ByteStrings in the style of other common *nix hex dump tools.") - (license license:bsd-3))) - -(define-public ghc-network-info - (package - (name "ghc-network-info") - (version "0.2.0.10") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "network-info-" version "/" - "network-info-" version ".tar.gz")) - (sha256 - (base32 - "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n")))) - (build-system haskell-build-system) - (home-page "https://github.com/jystic/network-info") - (synopsis "Access the local computer's basic network configuration") - (description "This Haskell library provides simple read-only access to the -local computer's networking configuration. It is currently capable of -getting a list of all the network interfaces and their respective -IPv4, IPv6 and MAC addresses.") - (license license:bsd-3))) - -(define-public ghc-uuid-types - (package - (name "ghc-uuid-types") - (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "uuid-types-" version "/" - "uuid-types-" version ".tar.gz")) - (sha256 - (base32 - "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'strip-test-framework-constraints - (lambda _ - (substitute* "uuid-types.cabal" - (("HUnit >=1\\.2 && < 1\\.4") "HUnit") - (("QuickCheck >=2\\.4 && < 2\\.9") "QuickCheck") - (("tasty >= 0\\.10 && < 0\\.12") "tasty") - (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") - (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) - (inputs `(("ghc-hashable" ,ghc-hashable) - ("ghc-random" ,ghc-random))) - (native-inputs `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://github.com/hvr/uuid") - (synopsis "Haskell type definitions for UUIDs") - (description "This Haskell library contains type definitions for -@dfn{Universally Unique Identifiers} or -@uref{https://en.wikipedia.org/wiki/UUID, UUIDs}, and basic conversion -functions.") - (license license:bsd-3))) - -(define-public ghc-uuid - (package - (name "ghc-uuid") - (version "1.3.13") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "uuid-" version "/" - "uuid-" version ".tar.gz")) - (sha256 - (base32 - "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'strip-test-framework-constraints - (lambda _ - (substitute* "uuid.cabal" - (("HUnit >= 1\\.2 && < 1\\.4") "HUnit") - (("QuickCheck >= 2\\.4 && < 2\\.10") "QuickCheck") - (("tasty >= 0\\.10 && < 0\\.12") "tasty") - (("tasty-hunit == 0\\.9\\.\\*") "tasty-hunit") - (("tasty-quickcheck == 0\\.8\\.\\*") "tasty-quickcheck"))))))) - (inputs `(("ghc-cryptohash-sha1" ,ghc-cryptohash-sha1) - ("ghc-cryptohash-md5" ,ghc-cryptohash-md5) - ("ghc-entropy" ,ghc-entropy) - ("ghc-network-info" ,ghc-network-info) - ("ghc-random" ,ghc-random) - ("ghc-uuid-types" ,ghc-uuid-types))) - (native-inputs `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://github.com/hvr/uuid") - (synopsis "Haskell library to create, compare, parse, and print UUIDs") - (description "This Haskell library provides utilities creating, comparing, -parsing and printing @dfn{Universally Unique Identifiers} or UUIDs.") - (license license:bsd-3))) - -(define-public ghc-rebase - (package - (name "ghc-rebase") - (version "1.2.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "rebase-" version "/" - "rebase-" version ".tar.gz")) - (sha256 - (base32 - "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya")))) - (build-system haskell-build-system) - (inputs `(("ghc-hashable" ,ghc-hashable) - ("ghc-vector" ,ghc-vector) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-scientific" ,ghc-scientific) - ("ghc-uuid" ,ghc-uuid) - ("ghc-dlist" ,ghc-dlist) - ("ghc-void" ,ghc-void) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-contravariant-extras" ,ghc-contravariant-extras) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-either" ,ghc-either) - ("ghc-fail" ,ghc-fail) - ("ghc-base-prelude" ,ghc-base-prelude))) - (home-page "https://github.com/nikita-volkov/rebase") - (synopsis "Progressive alternative to the base package -for Haskell") - (description "This Haskell package is intended for those who are -tired of keeping long lists of dependencies to the same essential libraries -in each package as well as the endless imports of the same APIs all over again. - -It also supports the modern tendencies in the language. - -To solve those problems this package does the following: - -@itemize -@item Reexport the original APIs under the @code{Rebase} namespace. - -@item Export all the possible non-conflicting symbols from the -@code{Rebase.Prelude} module. - -@item Give priority to the modern practices in the conflicting cases. -@end itemize - -The policy behind the package is only to reexport the non-ambiguous and -non-controversial APIs, which the community has obviously settled on. -The package is intended to rapidly evolve with the contribution from -the community, with the missing features being added with pull-requests.") - (license license:expat))) - -(define-public ghc-rerebase - (package - (name "ghc-rerebase") - (version "1.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/rerebase/rerebase-" - version ".tar.gz")) - (sha256 - (base32 - "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks")))) - (build-system haskell-build-system) - (inputs - `(("ghc-rebase" ,ghc-rebase))) - (home-page "https://github.com/nikita-volkov/rerebase") - (synopsis "Reexports from ``base'' with many other standard libraries") - (description "A rich drop-in replacement for @code{base}. For details and -documentation please visit @uref{https://github.com/nikita-volkov/rerebase, -the project's home page}.") - (license license:expat))) - -(define-public ghc-vector-builder - (package - (name "ghc-vector-builder") - (version "0.3.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "vector-builder-" version "/" - "vector-builder-" version ".tar.gz")) - (sha256 - (base32 - "06d2pa1fb3ydrl7l6rjazqyxv5i73v65x2f5fp0ypjxfbm6jsmn8")))) - (build-system haskell-build-system) - (inputs `(("ghc-vector" ,ghc-vector) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-base-prelude" ,ghc-base-prelude))) - (native-inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-rerebase" ,ghc-rerebase))) - (home-page "https://github.com/nikita-volkov/vector-builder") - (synopsis "Vector builder for Haskell") - (description "This Haskell package provides an API for constructing vectors. -It provides the composable @code{Builder} abstraction, which has instances of the -@code{Monoid} and @code{Semigroup} classes. - -You would first use the @code{Builder} abstraction to specify the structure of -the vector; then you can execute the builder to actually produce the -vector. ") - (license license:expat))) - -(define-public ghc-foldl - (package - (name "ghc-foldl") - (version "1.4.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "foldl-" version "/" - "foldl-" version ".tar.gz")) - (sha256 - (base32 - "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk")))) - (build-system haskell-build-system) - (inputs `(("ghc-mwc-randam" ,ghc-mwc-random) - ("ghc-primitive" ,ghc-primitive) - ("ghc-vector" ,ghc-vector) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-hashable" ,ghc-hashable) - ("ghc-contravariant" ,ghc-contravariant) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-profunctors" ,ghc-profunctors) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-comonad" ,ghc-comonad) - ("ghc-vector-builder" ,ghc-vector-builder))) - (home-page "https://github.com/Gabriel439/Haskell-Foldl-Library") - (synopsis "Composable, streaming, and efficient left folds for Haskell") - (description "This Haskell library provides strict left folds that stream -in constant memory, and you can combine folds using @code{Applicative} style -to derive new folds. Derived folds still traverse the container just once -and are often as efficient as hand-written folds.") - (license license:bsd-3))) - -(define-public ghc-mono-traversable - (package - (name "ghc-mono-traversable") - (version "1.0.9.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "mono-traversable-" version "/" - "mono-traversable-" version ".tar.gz")) - (sha256 - (base32 - "0180ks0dyvpk1r20w5jw2w2n79mjnk69n9vhspaxzlyxqgim5psa")))) - (build-system haskell-build-system) - (inputs `(("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-hashable" ,ghc-hashable) - ("ghc-vector" ,ghc-vector) - ("ghc-vector-algorithms" ,ghc-vector-algorithms) - ("ghc-split" ,ghc-split))) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-foldl" ,ghc-foldl))) - (home-page "https://github.com/snoyberg/mono-traversable") - (synopsis "Haskell classes for mapping, folding, and traversing monomorphic -containers") - (description "This Haskell package provides Monomorphic variants of the -Functor, Foldable, and Traversable typeclasses. If you understand Haskell's -basic typeclasses, you understand mono-traversable. In addition to what -you are used to, it adds on an IsSequence typeclass and has code for marking -data structures as non-empty.") - (license license:expat))) - -(define-public ghc-conduit-combinators - (package - (name "ghc-conduit-combinators") - (version "1.3.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit-combinators-" version "/" - "conduit-combinators-" version ".tar.gz")) - (sha256 - (base32 - "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp")))) - (build-system haskell-build-system) - (inputs `(("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-primitive" ,ghc-primitive) - ("ghc-vector" ,ghc-vector) - ("ghc-void" ,ghc-void) - ("ghc-mwc-random" ,ghc-mwc-random) - ("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-base16-bytestring" ,ghc-base16-bytestring) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-chunked-data" ,ghc-chunked-data) - ("ghc-mono-traversable" ,ghc-mono-traversable))) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-silently" ,ghc-silently) - ("ghc-safe" ,ghc-safe) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/snoyberg/mono-traversable") - (synopsis "Commonly used conduit functions, for both chunked and -unchunked data") - (description "This Haskell package provides a replacement for Data.Conduit.List, -as well as a convenient Conduit module.") - (license license:expat))) - -(define-public ghc-aws - (package - (name "ghc-aws") - (version "0.20") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "aws-" version "/aws-" version ".tar.gz")) - (sha256 (base32 - "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; Tests require AWS credentials. - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-base16-bytestring" ,ghc-base16-bytestring) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-byteable" ,ghc-byteable) - ("ghc-case-insensitive" ,ghc-case-insensitive) - ("ghc-cereal" ,ghc-cereal) - ("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-cryptonite" ,ghc-cryptonite) - ("ghc-data-default" ,ghc-data-default) - ("ghc-http-conduit" ,ghc-http-conduit) - ("ghc-http-types" ,ghc-http-types) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-network" ,ghc-network) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-safe" ,ghc-safe) - ("ghc-scientific" ,ghc-scientific) - ("ghc-tagged" ,ghc-tagged) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-vector" ,ghc-vector) - ("ghc-xml-conduit" ,ghc-xml-conduit))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-errors" ,ghc-errors) - ("ghc-http-client" ,ghc-http-client) - ("ghc-http-client-tls" ,ghc-http-client-tls) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-conduit-combinators" ,ghc-conduit-combinators))) - (home-page "https://github.com/aristidb/aws") - (synopsis "Amazon Web Services for Haskell") - (description "This package attempts to provide support for using -Amazon Web Services like S3 (storage), SQS (queuing) and others to -Haskell programmers. The ultimate goal is to support all Amazon -Web Services.") - (license license:bsd-3))) - -(define-public ghc-basement - (package - (name "ghc-basement") - (version "0.0.8") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "basement/basement-" version ".tar.gz")) - (sha256 - (base32 - "194jw567di4q2758943q9rrwkbf9gl261my7qc21i9xhyabipx67")))) - (build-system haskell-build-system) - (home-page "https://github.com/haskell-foundation/foundation") - (synopsis "Basic primitives for Foundation starter pack") - (description - "This package contains basic primitives for the Foundation set of -packages.") - (license license:bsd-3))) - -(define-public ghc-foundation - (package - (name "ghc-foundation") - (version "0.0.21") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "foundation/foundation-" version ".tar.gz")) - (sha256 - (base32 - "1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf")))) - (build-system haskell-build-system) - (inputs `(("ghc-basement" ,ghc-basement))) - (home-page "https://github.com/haskell-foundation/foundation") - (synopsis "Alternative prelude with batteries and no dependencies") - (description - "This package provides a custom prelude with no dependencies apart from -the base package. - -Foundation has the following goals: - -@enumerate -@item provide a base like sets of modules that provide a consistent set of - features and bugfixes across multiple versions of GHC (unlike base). -@item provide a better and more efficient prelude than base's prelude. -@item be self-sufficient: no external dependencies apart from base; -@item provide better data-types: packed unicode string by default, arrays; -@item Numerical classes that better represent mathematical things (no more - all-in-one @code{Num}); -@item I/O system with less lazy IO. -@end enumerate\n") - (license license:bsd-3))) - -(define-public ghc-stm-chans - (package - (name "ghc-stm-chans") - (version "3.0.0.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "stm-chans-" version "/" - "stm-chans-" version ".tar.gz")) - (sha256 - (base32 - "0f27sp09yha43xk9q55sc185jyjs5h7gq2dhsyx6bm9kz9dzqi13")))) - (build-system haskell-build-system) - (home-page "https://hackage.haskell.org/package/stm-chans") - (synopsis "Additional types of channels for ghc-stm") - (description "This Haskell package offers a collection of channel types, -similar to @code{Control.Concurrent.STM.@{TChan,TQueue@}} but with additional -features.") - (license license:bsd-3))) - -(define-public ghc-monad-loops - (package - (name "ghc-monad-loops") - (version "0.4.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-loops-" version "/" - "monad-loops-" version ".tar.gz")) - (sha256 - (base32 - "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky")))) - (build-system haskell-build-system) - (native-inputs `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "https://github.com/mokus0/monad-loops") - (synopsis "Monadic loops for Haskell") - (description "This Haskell package provides some useful control -operators for looping.") - (license license:public-domain))) - -(define-public ghc-monad-logger - (package - (name "ghc-monad-logger") - (version "0.3.29") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "monad-logger-" version "/" - "monad-logger-" version ".tar.gz")) - (sha256 - (base32 - "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv")))) - (build-system haskell-build-system) - (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-stm-chans" ,ghc-stm-chans) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-fast-logger" ,ghc-fast-logger) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-monad-loops" ,ghc-monad-loops) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-exceptions" ,ghc-exceptions))) - (home-page "https://github.com/kazu-yamamoto/logger") - (synopsis "Provides a class of monads which can log messages for Haskell") - (description "This Haskell package uses a monad transformer approach -for logging. - -This package provides Template Haskell functions for determining source -code locations of messages.") - (license license:expat))) - -(define-public ghc-shakespeare - (package - (name "ghc-shakespeare") - (version "2.0.15") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "shakespeare-" version "/" - "shakespeare-" version ".tar.gz")) - (sha256 - (base32 - "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23")))) - (build-system haskell-build-system) - (inputs `(("ghc-aeson" ,ghc-aeson) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-vector" ,ghc-vector) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-scientific" ,ghc-scientific))) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit" ,ghc-hunit) - ("hspec-discover" ,hspec-discover))) - (home-page "https://www.yesodweb.com/book/shakespearean-templates") - (synopsis "Family of type-safe template languages for Haskell") - (description "This Haskell package provides a family of type-safe -templates with simple variable interpolation. Shakespeare templates can -be used inline with a quasi-quoter or in an external file and it -interpolates variables according to the type being inserted.") - (license license:expat))) - -(define-public ghc-securemem - (package - (name "ghc-securemem") - (version "0.1.10") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "securemem-" version "/" - "securemem-" version ".tar.gz")) - (sha256 - (base32 - "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j")))) - (build-system haskell-build-system) - (inputs `(("ghc-byteable" ,ghc-byteable) - ("ghc-memory" ,ghc-memory))) - (home-page "https://github.com/vincenthz/hs-securemem") - (synopsis "Auto-scrubbing and const-time-eq memory chunk abstraction for -Haskell") - (description "SecureMem is similar to ByteString, except that it provides -a memory chunk that will be auto-scrubbed after it run out of scope.") - (license license:bsd-3))) - -(define-public ghc-resource-pool - (package - (name "ghc-resource-pool") - (version "0.2.3.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "resource-pool-" version "/" - "resource-pool-" version ".tar.gz")) - (sha256 - (base32 - "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6")))) - (build-system haskell-build-system) - (inputs `(("ghc-hashable" ,ghc-hashable) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-vector" ,ghc-vector))) - (home-page "https://github.com/bos/pool") - (synopsis "Striped resource pooling implementation in Haskell") - (description "This Haskell package provides striped pooling abstraction -for managing flexibly-sized collections of resources such as database -connections.") - (license license:bsd-3))) - -(define-public ghc-attoparsec-iso8601 - (package - (name "ghc-attoparsec-iso8601") - (version "1.0.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "attoparsec-iso8601-" version "/" - "attoparsec-iso8601-" version ".tar.gz")) - (sha256 - (base32 - "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"))) - (inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-base-compat" ,ghc-base-compat))) - (home-page "https://github.com/bos/aeson") - (synopsis "Parse ISO 8601 dates") - (description "Haskell library for parsing of ISO 8601 dates, originally -from aeson.") - (license license:bsd-3))) - -(define-public ghc-generics-sop - (package - (name "ghc-generics-sop") - (version "0.3.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "generics-sop-" version "/" - "generics-sop-" version ".tar.gz")) - (sha256 - (base32 - "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h")))) - (build-system haskell-build-system) - (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://github.com/well-typed/generics-sop") - (synopsis "Generic Programming using True Sums of Products for Haskell") - (description "This Haskell package supports the definition of generic -functions. Datatypes are viewed in a uniform, structured way: the choice -between constructors is represented using an n-ary sum, and the arguments of -each constructor are represented using an n-ary product.") - (license license:bsd-3))) - -(define-public ghc-uri-bytestring - (package - (name "ghc-uri-bytestring") - (version "0.3.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "uri-bytestring-" version "/" - "uri-bytestring-" version ".tar.gz")) - (sha256 - (base32 - "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c")))) - (build-system haskell-build-system) - (inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-fail" ,ghc-fail) - ("ghc-blaze-builder" ,ghc-blaze-builder) - ("ghc-th-lift-instances" ,ghc-th-lift-instances))) - (native-inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ("ghc-base-compat" ,ghc-base-compat) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-generics-sop" ,ghc-generics-sop))) - (home-page "https://github.com/Soostone/uri-bytestring") - (synopsis "Haskell URI parsing as ByteStrings") - (description "This Haskell package aims to be an RFC3986 compliant URI -parser that uses ByteStrings for parsing and representing the URI data.") - (license license:bsd-3))) - -(define-public ghc-http-api-data - (package - (name "ghc-http-api-data") - (version "0.3.8.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "http-api-data-" version "/" - "http-api-data-" version ".tar.gz")) - (sha256 - (base32 - "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.9 - (inputs `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-attoparsec-iso8601" ,ghc-attoparsec-iso8601) - ("ghc-hashable" ,ghc-hashable) - ("ghc-http-types" ,ghc-http-types) - ("ghc-time-locale-compat" ,ghc-time-locale-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-uri-bytestring" ,ghc-uri-bytestring) - ("ghc-uuid-types" ,ghc-uuid-types))) - (home-page "https://github.com/fizruk/http-api-data") - (synopsis "Convert to/from HTTP API data like URL pieces, headers and -query parameters") - (description "This Haskell package defines typeclasses used for converting -Haskell data types to and from HTTP API data.") - (license license:bsd-3))) - -(define-public ghc-persistent - (package - (name "ghc-persistent") - (version "2.8.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "persistent-" version "/" - "persistent-" version ".tar.gz")) - (sha256 - (base32 - "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9")))) - (build-system haskell-build-system) - (inputs `(("ghc-old-locale" ,ghc-old-locale) - ("ghc-conduit" ,ghc-conduit) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-resource-pool" ,ghc-resource-pool) - ("ghc-path-pieces" ,ghc-path-pieces) - ("ghc-http-api-data" ,ghc-http-api-data) - ("ghc-aeson" ,ghc-aeson) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-base64-bytestring" ,ghc-base64-bytestring) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-haskell-src-meta" ,ghc-haskell-src-meta) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-silently" ,ghc-silently) - ("ghc-fast-logger" ,ghc-fast-logger) - ("ghc-scientific" ,ghc-scientific) - ("ghc-tagged" ,ghc-tagged) - ("ghc-void" ,ghc-void))) - (native-inputs `(("ghc-hspec" ,ghc-hspec))) - (home-page "https://www.yesodweb.com/book/persistent") - (synopsis "Type-safe, multi-backend data serialization for Haskell") - (description "This Haskell package allows Haskell programs to access data -storage systems like PostgreSQL, SQLite, MySQL and MongoDB in a type-safe -way.") - (license license:expat))) - -(define-public ghc-aeson-compat - (package - (name "ghc-aeson-compat") - (version "0.3.8") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "aeson-compat-" version "/" - "aeson-compat-" version ".tar.gz")) - (sha256 - (base32 - "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: Tests require QuickCheck >= 2.10 - (inputs `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-aeson" ,ghc-aeson) - ("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-attoparsec" ,ghc-attoparsec-iso8601) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-hashable" ,ghc-hashable) - ("ghc-scientific" ,ghc-scientific) - ("ghc-time-locale-compat" ,ghc-time-locale-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-tagged" ,ghc-tagged) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-nats" ,ghc-nats))) - (home-page "https://github.com/phadej/aeson-compat") - (synopsis "Compatibility layer for ghc-aeson") - (description "This Haskell package provides compatibility layer for -ghc-aeson.") - (license license:bsd-3))) - -(define-public ghc-persistent-template - (package - (name "ghc-persistent-template") - (version "2.5.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "persistent-template-" version "/" - "persistent-template-" version ".tar.gz")) - (sha256 - (base32 - "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("2" "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6"))) - (inputs `(("ghc-persistent" ,ghc-persistent) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-aeson" ,ghc-aeson) - ("ghc-aeson-compat" ,ghc-aeson-compat) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-tagged" ,ghc-tagged) - ("ghc-path-pieces" ,ghc-path-pieces) - ("ghc-http-api-data" ,ghc-http-api-data))) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://www.yesodweb.com/book/persistent") - (synopsis "Type-safe, non-relational, multi-backend persistence") - (description "This Haskell package provides interfaces and helper -functions for the ghc-persistent package.") - (license license:expat))) - -(define-public ghc-unliftio-core - (package - (name "ghc-unliftio-core") - (version "0.1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "unliftio-core-" version "/" - "unliftio-core-" version ".tar.gz")) - (sha256 - (base32 - "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"))) - (home-page - "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme") - (synopsis "The MonadUnliftIO typeclass for unlifting monads to IO") - (description "This Haskell package provides the core @code{MonadUnliftIO} -typeclass, instances for base and transformers, and basic utility -functions.") - (license license:expat))) - -(define-public ghc-microlens - (package - (name "ghc-microlens") - (version "0.4.9.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "microlens-" version "/" - "microlens-" version ".tar.gz")) - (sha256 - (base32 - "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51")))) - (build-system haskell-build-system) - (home-page - "https://github.com/aelve/microlens") - (synopsis "Provides a tiny lens Haskell library with no dependencies") - (description "This Haskell package provides a lens library, just like -@code{ghc-lens}, but smaller. It provides essential lenses and -traversals (like @code{_1} and @code{_Just}), as well as ones which are simply -nice to have (like @code{each}, @code{at}, and @code{ix}), and some -combinators (like @code{failing} and @code{singular}), but everything else is -stripped. As the result, this package has no dependencies.") - (license license:bsd-3))) - -(define-public ghc-microlens-th - (package - (name "ghc-microlens-th") - (version "0.4.2.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "microlens-th-" version "/" - "microlens-th-" version ".tar.gz")) - (sha256 - (base32 - "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05")))) - (build-system haskell-build-system) - (inputs `(("ghc-microlens" ,ghc-microlens) - ("ghc-th-abstraction" ,ghc-th-abstraction))) - (home-page - "https://github.com/aelve/microlens") - (synopsis "Automatic generation of record lenses for -@code{ghc-microlens}") - (description "This Haskell package lets you automatically generate lenses -for data types; code was extracted from the lens package, and therefore -generated lenses are fully compatible with ones generated by lens (and can be -used both from lens and microlens).") - (license license:bsd-3))) - -(define-public ghc-unliftio - (package - (name "ghc-unliftio") - (version "0.2.7.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/unliftio/unliftio-" - version - ".tar.gz")) - (sha256 - (base32 - "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs")))) - (build-system haskell-build-system) - (arguments `(#:tests? #f)) ; FIXME: hspec-discover not in PATH - (inputs - `(("ghc-async" ,ghc-async) - ("ghc-unliftio-core" ,ghc-unliftio-core))) - (native-inputs `(("ghc-hspec" ,ghc-hspec))) - (home-page "https://github.com/fpco/unliftio") - (synopsis "Provides MonadUnliftIO typecplass for unlifting monads to -IO (batteries included)") - (description "This Haskell package provides the core @code{MonadUnliftIO} -typeclass, a number of common instances, and a collection of common functions -working with it.") - (license license:expat))) - -(define-public ghc-persistent-sqlite - (package - (name "ghc-persistent-sqlite") - (version "2.8.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "persistent-sqlite-" version "/" - "persistent-sqlite-" version ".tar.gz")) - (sha256 - (base32 - "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6")))) - (build-system haskell-build-system) - (inputs `(("ghc-persistent" ,ghc-persistent) - ("ghc-unliftio-core" ,ghc-unliftio-core) - ("ghc-aeson" ,ghc-aeson) - ("ghc-conduit" ,ghc-conduit) - ("ghc-monad-logger" ,ghc-monad-logger) - ("ghc-microlens-th" ,ghc-microlens-th) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-resource-pool" ,ghc-resource-pool) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-persistent-template" ,ghc-persistent-template) - ("ghc-temporary" ,ghc-temporary))) - (home-page - "https://www.yesodweb.com/book/persistent") - (synopsis "Backend for the persistent library using sqlite3") - (description "This Haskell package includes a thin sqlite3 wrapper based -on the direct-sqlite package, as well as the entire C library, so there are no -system dependencies.") - (license license:expat))) - -(define-public ghc-email-validate - (package - (name "ghc-email-validate") - (version "2.3.2.6") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "email-validate/email-validate-" - version - ".tar.gz")) - (sha256 - (base32 - "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5")))) - (build-system haskell-build-system) - (inputs - `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-doctest" ,ghc-doctest))) - (home-page - "https://github.com/Porges/email-validate-hs") - (synopsis "Email address validator for Haskell") - (description - "This Haskell package provides a validator that can validate an email -address string against RFC 5322.") - (license license:bsd-3))) - -(define-public ghc-bytes - (package - (name "ghc-bytes") - (version "0.15.5") - (source - (origin - (method url-fetch) - (uri - (string-append "https://hackage.haskell.org/package/bytes-" - version "/bytes-" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683")))) - (build-system haskell-build-system) - (inputs `(("ghc-cereal" ,ghc-cereal) - ("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest) - ("ghc-scientific" ,ghc-scientific) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-void" ,ghc-void) - ("ghc-vector" ,ghc-vector))) - (synopsis "Serialization between @code{binary} and @code{cereal}") - (description "This package provides a simple compatibility shim that lets -you work with both @code{binary} and @code{cereal} with one chunk of -serialization code.") - (home-page "https://hackage.haskell.org/package/bytes") - (license license:bsd-3))) - -(define-public ghc-disk-free-space - (package - (name "ghc-disk-free-space") - (version "0.1.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "disk-free-space/disk-free-space-" - version ".tar.gz")) - (sha256 - (base32 - "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi")))) - (build-system haskell-build-system) - (home-page "https://github.com/redneb/disk-free-space") - (synopsis "Retrieve information about disk space usage") - (description "A cross-platform library for retrieving information about -disk space usage.") - (license license:bsd-3))) - -(define-public ghc-xdg-basedir - (package - (name "ghc-xdg-basedir") - (version "0.2.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/xdg-basedir/" - "xdg-basedir-" version ".tar.gz")) - (sha256 - (base32 - "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4")))) - (build-system haskell-build-system) - (home-page "http://github.com/willdonnelly/xdg-basedir") - (synopsis "XDG Base Directory library for Haskell") - (description "This package provides a library implementing the XDG Base Directory spec.") - (license license:bsd-3))) - -(define-public ghc-errorcall-eq-instance - (package - (name "ghc-errorcall-eq-instance") - (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "errorcall-eq-instance/errorcall-eq-instance-" - version ".tar.gz")) - (sha256 - (base32 - "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm")))) - (build-system haskell-build-system) - (inputs - `(("ghc-base-orphans" ,ghc-base-orphans))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "http://hackage.haskell.org/package/errorcall-eq-instance") - (synopsis "Orphan Eq instance for ErrorCall") - (description - "Prior to @code{base-4.7.0.0} there was no @code{Eq} instance for @code{ErrorCall}. -This package provides an orphan instance.") - (license license:expat))) - -(define-public ghc-missingh - (package - (name "ghc-missingh") - (version "1.4.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/MissingH/" - "MissingH-" version ".tar.gz")) - (sha256 - (base32 - "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8")))) - (build-system haskell-build-system) - ;; Tests require the unmaintained testpack package, which depends on the - ;; outdated QuickCheck version 2.7, which can no longer be built with - ;; recent versions of GHC and Haskell libraries. - (arguments '(#:tests? #f)) - (inputs - `(("ghc-network" ,ghc-network) - ("ghc-hunit" ,ghc-hunit) - ("ghc-regex-compat" ,ghc-regex-compat) - ("ghc-hslogger" ,ghc-hslogger) - ("ghc-random" ,ghc-random) - ("ghc-old-time" ,ghc-old-time) - ("ghc-old-locale" ,ghc-old-locale))) - (native-inputs - `(("ghc-errorcall-eq-instance" ,ghc-errorcall-eq-instance) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hunit" ,ghc-hunit))) - (home-page "http://software.complete.org/missingh") - (synopsis "Large utility library") - (description - "MissingH is a library of all sorts of utility functions for Haskell -programmers. It is written in pure Haskell and thus should be extremely -portable and easy to use.") - (license license:bsd-3))) - -(define-public ghc-intervalmap - (package - (name "ghc-intervalmap") - (version "0.6.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/IntervalMap/" - "IntervalMap-" version ".tar.gz")) - (sha256 - (base32 - "06hin9wf1by8aqa7820fsi2339bh82184frkwz3jsb9sqa0hszcg")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "http://www.chr-breitkopf.de/comp/IntervalMap") - (synopsis "Containers for intervals, with efficient search") - (description - "This package provides ordered containers of intervals, with efficient -search for all keys containing a point or overlapping an interval. See the -example code on the home page for a quick introduction.") - (license license:bsd-3))) - -(define-public ghc-operational - (package - (name "ghc-operational") - (version "0.2.3.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/operational/" - "operational-" version ".tar.gz")) - (sha256 - (base32 - "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i")))) - (build-system haskell-build-system) - (inputs - `(("ghc-random" ,ghc-random))) - (home-page "http://wiki.haskell.org/Operational") - (synopsis "Implementation of difficult monads made easy with operational semantics") - (description - "This library makes it easy to implement monads with tricky control -flow. This is useful for: writing web applications in a sequential style, -programming games with a uniform interface for human and AI players and easy -replay capababilities, implementing fast parser monads, designing monadic -DSLs, etc.") - (license license:bsd-3))) - -(define-public ghc-gtk2hs-buildtools - (package - (name "ghc-gtk2hs-buildtools") - (version "0.13.4.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "gtk2hs-buildtools/gtk2hs-buildtools-" - version ".tar.gz")) - (sha256 - (base32 - "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg")))) - (build-system haskell-build-system) - (inputs - `(("ghc-random" ,ghc-random) - ("ghc-hashtables" ,ghc-hashtables))) - (native-inputs - `(("ghc-alex" ,ghc-alex) - ("ghc-happy" ,ghc-happy))) - (home-page "http://projects.haskell.org/gtk2hs/") - (synopsis "Tools to build the Gtk2Hs suite of user interface libraries") - (description - "This package provides a set of helper programs necessary to build the -Gtk2Hs suite of libraries. These tools include a modified c2hs binding tool -that is used to generate FFI declarations, a tool to build a type hierarchy -that mirrors the C type hierarchy of GObjects found in glib, and a generator -for signal declarations that are used to call back from C to Haskell. These -tools are not needed to actually run Gtk2Hs programs.") - (license license:gpl2))) - -(define-public ghc-chart - (package - (name "ghc-chart") - (version "1.9") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/Chart/" - "Chart-" version ".tar.gz")) - (sha256 - (base32 - "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z")))) - (build-system haskell-build-system) - (inputs - `(("ghc-old-locale" ,ghc-old-locale) - ("ghc-lens" ,ghc-lens) - ("ghc-colour" ,ghc-colour) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-operational" ,ghc-operational) - ("ghc-vector" ,ghc-vector))) - (home-page "https://github.com/timbod7/haskell-chart/wiki") - (synopsis "Library for generating 2D charts and plots") - (description - "This package provides a library for generating 2D charts and plots, with -backends provided by the @code{Cairo} and @code{Diagrams} libraries.") - (license license:bsd-3))) - -(define-public ghc-wcwidth - (package - (name "ghc-wcwidth") - (version "0.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/wcwidth/wcwidth-" - version ".tar.gz")) - (sha256 - (base32 - "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz")))) - (build-system haskell-build-system) - (inputs - `(("ghc-setlocale" ,ghc-setlocale) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec" ,ghc-attoparsec))) - (home-page "https://github.com/solidsnack/wcwidth/") - (synopsis "Haskell bindings to wcwidth") - (description "This package provides Haskell bindings to your system's -native wcwidth and a command line tool to examine the widths assigned by it. -The command line tool can compile a width table to Haskell code that assigns -widths to the Char type.") - (license license:bsd-3))) - -(define-public ghc-wcwidth-bootstrap - (package - (inherit ghc-wcwidth) - (name "ghc-wcwidth-bootstrap") - (inputs - `(("ghc-setlocale" ,ghc-setlocale) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec" ,ghc-attoparsec-bootstrap))) - (properties '(hidden? #t)))) - -(define-public ghc-rio - (package - (name "ghc-rio") - (version "0.1.5.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/rio/rio-" - version ".tar.gz")) - (sha256 - (base32 - "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g")))) - (build-system haskell-build-system) - (inputs - `(("ghc-exceptions" ,ghc-exceptions) - ("ghc-hashable" ,ghc-hashable) - ("ghc-microlens" ,ghc-microlens) - ("ghc-primitive" ,ghc-primitive) - ("ghc-typed-process" ,ghc-typed-process) - ("ghc-unliftio" ,ghc-unliftio) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/commercialhaskell/rio#readme") - (synopsis "A standard library for Haskell") - (description "This package works as a prelude replacement for Haskell, -providing more functionality and types out of the box than the standard -prelude (such as common data types like @code{ByteString} and -@code{Text}), as well as removing common ``gotchas'', like partial -functions and lazy I/O. The guiding principle here is: -@itemize -@item If something is safe to use in general and has no expected naming -conflicts, expose it. -@item If something should not always be used, or has naming conflicts, -expose it from another module in the hierarchy. -@end itemize") - (license license:expat))) - -(define-public ghc-cairo - (package - (name "ghc-cairo") - (version "0.13.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/cairo/" - "cairo-" version ".tar.gz")) - (sha256 - (base32 - "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2")))) - (build-system haskell-build-system) - (arguments - `(#:modules ((guix build haskell-build-system) - (guix build utils) - (ice-9 match) - (srfi srfi-26)) - #:phases - (modify-phases %standard-phases - ;; FIXME: This is a copy of the standard configure phase with a tiny - ;; difference: this package needs the -package-db flag to be passed - ;; to "runhaskell" in addition to the "configure" action, because it - ;; depends on gtk2hs-buildtools, which provide setup hooks. Without - ;; this option the Setup.hs file cannot be evaluated. The - ;; haskell-build-system should be changed to pass "-package-db" to - ;; "runhaskell" in any case. - (replace 'configure - (lambda* (#:key outputs inputs tests? (configure-flags '()) - #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (name-version (strip-store-file-name out)) - (input-dirs (match inputs - (((_ . dir) ...) - dir) - (_ '()))) - (ghc-path (getenv "GHC_PACKAGE_PATH")) - (params (append `(,(string-append "--prefix=" out)) - `(,(string-append "--libdir=" out "/lib")) - `(,(string-append "--bindir=" out "/bin")) - `(,(string-append - "--docdir=" out - "/share/doc/" name-version)) - '("--libsubdir=$compiler/$pkg-$version") - '("--package-db=../package.conf.d") - '("--global") - `(,@(map - (cut string-append "--extra-include-dirs=" <>) - (search-path-as-list '("include") input-dirs))) - `(,@(map - (cut string-append "--extra-lib-dirs=" <>) - (search-path-as-list '("lib") input-dirs))) - (if tests? - '("--enable-tests") - '()) - configure-flags))) - (unsetenv "GHC_PACKAGE_PATH") - (apply invoke "runhaskell" "-package-db=../package.conf.d" - "Setup.hs" "configure" params) - (setenv "GHC_PACKAGE_PATH" ghc-path) - #t)))))) - (inputs - `(("ghc-utf8-string" ,ghc-utf8-string) - ("cairo" ,cairo))) - (native-inputs - `(("ghc-gtk2hs-buildtools" ,ghc-gtk2hs-buildtools) - ("pkg-config" ,pkg-config))) - (home-page "http://projects.haskell.org/gtk2hs/") - (synopsis "Haskell bindings to the Cairo vector graphics library") - (description - "Cairo is a library to render high quality vector graphics. There exist -various backends that allows rendering to Gtk windows, PDF, PS, PNG and SVG -documents, amongst others.") - (license license:bsd-3))) - -(define-public ghc-chart-cairo - (package - (name "ghc-chart-cairo") - (version "1.9") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/Chart-cairo/" - "Chart-cairo-" version ".tar.gz")) - (sha256 - (base32 - "0iany6lfyfb1cw0pxfs5aw5k0a6x41m6ql9ad9w59biwdckbsyqr")))) - (build-system haskell-build-system) - (inputs - `(("ghc-old-locale" ,ghc-old-locale) - ("ghc-cairo" ,ghc-cairo) - ("ghc-colour" ,ghc-colour) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-operational" ,ghc-operational) - ("ghc-lens" ,ghc-lens) - ("ghc-chart" ,ghc-chart))) - (home-page "https://github.com/timbod7/haskell-chart/wiki") - (synopsis "Cairo backend for Charts") - (description "This package provides a Cairo vector graphics rendering -backend for the Charts library.") - (license license:bsd-3))) - -(define-public ghc-atomic-write - (package - (name "ghc-atomic-write") - (version "0.2.0.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/atomic-write/atomic-write-" - version - ".tar.gz")) - (sha256 - (base32 - "1iaq0hprxcv0sl1sgwcgmm87zraf738va1bciwnx2jkk3k1v9iyv")))) - (build-system haskell-build-system) - (inputs - `(("ghc-temporary" ,ghc-temporary) - ("ghc-unix-compat" ,ghc-unix-compat))) - (native-inputs - `(("ghc-temporary" ,ghc-temporary) - ("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/stackbuilders/atomic-write") - (synopsis "Atomically write to a file") - (description - "Atomically write to a file on POSIX-compliant systems while preserving -permissions. @code{mv} is an atomic operation. This makes it simple to write -to a file atomically just by using the @code{mv} operation. However, this -will destroy the permissions on the original file. This library preserves -permissions while atomically writing to a file.") - (license license:expat))) - -(define-public ghc-cereal-conduit - (package - (name "ghc-cereal-conduit") - (version "0.8.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "cereal-conduit/cereal-conduit-" - version ".tar.gz")) - (sha256 - (base32 - "1srr7agvgfw78q5s1npjq5sgynvhjgllpihiv37ylkwqm4c4ap6r")))) - (build-system haskell-build-system) - (inputs - `(("ghc-conduit" ,ghc-conduit) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-cereal" ,ghc-cereal))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/snoyberg/conduit") - (synopsis "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits") - (description - "This package turn @code{Data.Serialize} @code{Gets} and @code{Puts} into -@code{Sources}, @code{Sinks}, and @code{Conduits}.") - (license license:bsd-3))) - -(define-public ghc-lzma - (package - (name "ghc-lzma") - (version "0.0.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/lzma/" - "lzma-" version ".tar.gz")) - (sha256 - (base32 - "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg")))) - (build-system haskell-build-system) - (arguments - '(#:tests? #f ; requires older versions of QuickCheck and tasty. - #:cabal-revision - ("3" "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m"))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) - (home-page "https://github.com/hvr/lzma") - (synopsis "LZMA/XZ compression and decompression") - (description - "This package provides a pure interface for compressing and -decompressing LZMA streams of data represented as lazy @code{ByteString}s. A -monadic incremental interface is provided as well.") - (license license:bsd-3))) - -(define-public ghc-stm-conduit - (package - (name "ghc-stm-conduit") - (version "4.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/stm-conduit/" - "stm-conduit-" version ".tar.gz")) - (sha256 - (base32 - "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z")))) - (build-system haskell-build-system) - (inputs - `(("ghc-stm-chans" ,ghc-stm-chans) - ("ghc-cereal" ,ghc-cereal) - ("ghc-cereal-conduit" ,ghc-cereal-conduit) - ("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-async" ,ghc-async) - ("ghc-monad-loops" ,ghc-monad-loops) - ("ghc-unliftio" ,ghc-unliftio))) - (native-inputs - `(("ghc-doctest" ,ghc-doctest) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) - (home-page "https://github.com/cgaebel/stm-conduit") - (synopsis "Introduces conduits to channels and promotes using conduits concurrently") - (description - "This package provides two simple conduit wrappers around STM channels: a -source and a sink.") - (license license:bsd-3))) - -(define-public ghc-bindings-dsl - (package - (name "ghc-bindings-dsl") - (version "1.0.25") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/bindings-DSL/" - "bindings-DSL-" version ".tar.gz")) - (sha256 - (base32 - "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3")))) - (build-system haskell-build-system) - (home-page "https://github.com/jwiegley/bindings-dsl/wiki") - (synopsis "FFI domain specific language, on top of hsc2hs") - (description - "This is a set of macros to be used when writing Haskell FFI. They were -designed to be able to fully describe C interfaces, so that @code{hsc2hs} can -extract from them all Haskell code needed to mimic such interfaces. All -Haskell names used are automatically derived from C names, structures are -mapped to Haskell instances of @code{Storable}, and there are also macros you -can use with C code to help write bindings to inline functions or macro -functions.") - (license license:bsd-3))) - -(define-public ghc-lzma-conduit - (package - (name "ghc-lzma-conduit") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/lzma-conduit/" - "lzma-conduit-" version ".tar.gz")) - (sha256 - (base32 - "0hm72da7xk9l3zxjh274yg444vf405djxqbkf3q3p2qhicmxlmg9")))) - (build-system haskell-build-system) - (inputs - `(("ghc-conduit" ,ghc-conduit) - ("ghc-lzma" ,ghc-lzma) - ("ghc-resourcet" ,ghc-resourcet))) - (native-inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2) - ("ghc-hunit" ,ghc-hunit) - ("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://github.com/alphaHeavy/lzma-conduit") - (synopsis "Conduit interface for lzma/xz compression") - (description - "This package provides a @code{Conduit} interface for the LZMA -compression algorithm used in the @code{.xz} file format.") - (license license:bsd-3))) - -(define-public ghc-bzlib-conduit - (package - (name "ghc-bzlib-conduit") - (version "0.3.0.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/bzlib-conduit/" - "bzlib-conduit-" version ".tar.gz")) - (sha256 - (base32 - "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23")))) - (build-system haskell-build-system) - (inputs - `(("ghc-bindings-dsl" ,ghc-bindings-dsl) - ("ghc-conduit" ,ghc-conduit) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-resourcet" ,ghc-resourcet))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-random" ,ghc-random))) - (home-page "https://github.com/snoyberg/bzlib-conduit") - (synopsis "Streaming compression/decompression via conduits") - (description - "This package provides Haskell bindings to bzlib and Conduit support for -streaming compression and decompression.") - (license license:bsd-3))) - -(define-public ghc-pqueue - (package - (name "ghc-pqueue") - (version "1.4.1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "pqueue/pqueue-" version ".tar.gz")) - (sha256 - (base32 - "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck))) - (home-page "https://hackage.haskell.org/package/pqueue") - (synopsis "Reliable, persistent, fast priority queues") - (description - "This package provides a fast, reliable priority queue implementation -based on a binomial heap.") - (license license:bsd-3))) - -(define-public ghc-conduit-algorithms - (package - (name "ghc-conduit-algorithms") - (version "0.0.8.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "conduit-algorithms/conduit-algorithms-" - version ".tar.gz")) - (sha256 - (base32 - "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd")))) - (build-system haskell-build-system) - (inputs - `(("ghc-async" ,ghc-async) - ("ghc-bzlib-conduit" ,ghc-bzlib-conduit) - ("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-combinators" ,ghc-conduit-combinators) - ("ghc-conduit-extra" ,ghc-conduit-extra) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-lzma-conduit" ,ghc-lzma-conduit) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-pqueue" ,ghc-pqueue) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-stm-conduit" ,ghc-stm-conduit) - ("ghc-streaming-commons" ,ghc-streaming-commons) - ("ghc-unliftio-core" ,ghc-unliftio-core) - ("ghc-vector" ,ghc-vector))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-th" ,ghc-test-framework-th))) - (home-page "https://github.com/luispedro/conduit-algorithms#readme") - (synopsis "Conduit-based algorithms") - (description - "This package provides algorithms on @code{Conduits}, including higher -level asynchronous processing and some other utilities.") - (license license:expat))) - -(define-public ghc-interpolate - (package - (name "ghc-interpolate") - (version "0.2.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/interpolate/" - "interpolate-" version ".tar.gz")) - (sha256 - (base32 - "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf")))) - (build-system haskell-build-system) - (inputs - `(("ghc-haskell-src-meta" ,ghc-haskell-src-meta))) - (native-inputs - `(("ghc-base-compat" ,ghc-base-compat) - ("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/sol/interpolate") - (synopsis "String interpolation library") - (description "This package provides a string interpolation library for -Haskell.") - (license license:expat))) - -(define-public ghc-hpack - (package - (name "ghc-hpack") - (version "0.28.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/hpack/" - "hpack-" version ".tar.gz")) - (sha256 - (base32 - "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-cryptonite" ,ghc-cryptonite) - ("ghc-glob" ,ghc-glob) - ("ghc-http-client" ,ghc-http-client) - ("ghc-http-client-tls" ,ghc-http-client-tls) - ("ghc-http-types" ,ghc-http-types) - ("ghc-scientific" ,ghc-scientific) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-yaml" ,ghc-yaml))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit" ,ghc-hunit) - ("ghc-interpolate" ,ghc-interpolate) - ("ghc-mockery" ,ghc-mockery) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-temporary" ,ghc-temporary) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/sol/hpack") - (synopsis "Tools for an alternative Haskell package format") - (description - "Hpack is a format for Haskell packages. It is an alternative to the -Cabal package format and follows different design principles. Hpack packages -are described in a file named @code{package.yaml}. Both @code{cabal2nix} and -@code{stack} support @code{package.yaml} natively. For other build tools the -@code{hpack} executable can be used to generate a @code{.cabal} file from -@code{package.yaml}.") - (license license:expat))) - -(define-public ghc-raw-strings-qq - (package - (name "ghc-raw-strings-qq") - (version "1.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "raw-strings-qq/raw-strings-qq-" - version ".tar.gz")) - (sha256 - (base32 - "1lxy1wy3awf52968iy5y9r5z4qgnn2sxkdrh7js3m9gadb11w09f")))) - (build-system haskell-build-system) - (native-inputs `(("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/23Skidoo/raw-strings-qq") - (synopsis "Raw string literals for Haskell") - (description - "This package provides a quasiquoter for raw string literals, i.e. string -literals that don't recognise the standard escape sequences. Basically, they -make your code more readable by freeing you from the responsibility to escape -backslashes. They are useful when working with regular expressions, -DOS/Windows paths and markup languages (such as XML).") - (license license:bsd-3))) - -(define-public ghc-inline-c - (package - (name "ghc-inline-c") - (version "0.6.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/inline-c/" - "inline-c-" version ".tar.gz")) - (sha256 - (base32 - "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h")))) - (build-system haskell-build-system) - (inputs - `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) - ("ghc-cryptohash" ,ghc-cryptohash) - ("ghc-hashable" ,ghc-hashable) - ("ghc-parsers" ,ghc-parsers) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("ghc-raw-strings-qq" ,ghc-raw-strings-qq) - ("ghc-regex-posix" ,ghc-regex-posix))) - (home-page "http://hackage.haskell.org/package/inline-c") - (synopsis "Write Haskell source files including C code inline") - (description - "inline-c lets you seamlessly call C libraries and embed high-performance -inline C code in Haskell modules. Haskell and C can be freely intermixed in -the same source file, and data passed to and from code in either language with -minimal overhead. No FFI required.") - (license license:expat))) - -(define-public ghc-weigh - (package - (name "ghc-weigh") - (version "0.0.12") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/weigh/" - "weigh-" version ".tar.gz")) - (sha256 - (base32 - "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x")))) - (build-system haskell-build-system) - (inputs - `(("ghc-split" ,ghc-split) - ("ghc-temporary" ,ghc-temporary))) - (home-page "https://github.com/fpco/weigh#readme") - (synopsis "Measure allocations of a Haskell functions/values") - (description "This package provides tools to measure the memory usage of a -Haskell value or function.") - (license license:bsd-3))) - -(define-public ghc-linear - (package - (name "ghc-linear") - (version "1.20.8") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/linear/" - "linear-" version ".tar.gz")) - (sha256 - (base32 - "046vkvxlb0s286qr55s0c6db0rlwbm1cmlmwhrrkqbkzhfcipgay")))) - (build-system haskell-build-system) - (inputs - `(("ghc-adjunctions" ,ghc-adjunctions) - ("ghc-base-orphans" ,ghc-base-orphans) - ("ghc-bytes" ,ghc-bytes) - ("ghc-cereal" ,ghc-cereal) - ("ghc-distributive" ,ghc-distributive) - ("ghc-hashable" ,ghc-hashable) - ("ghc-lens" ,ghc-lens) - ("ghc-reflection" ,ghc-reflection) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-tagged" ,ghc-tagged) - ("ghc-transformers-compat" ,ghc-transformers-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-void" ,ghc-void))) - (native-inputs - `(("cabal-doctest" ,cabal-doctest) - ("ghc-doctest" ,ghc-doctest) - ("ghc-simple-reflect" ,ghc-simple-reflect) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-hunit" ,ghc-hunit))) - (home-page "http://github.com/ekmett/linear/") - (synopsis "Linear algebra library for Haskell") - (description - "This package provides types and combinators for linear algebra on free -vector spaces.") - (license license:bsd-3))) - -(define-public ghc-safe-exceptions - (package - (name "ghc-safe-exceptions") - (version "0.1.7.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "safe-exceptions/safe-exceptions-" - version ".tar.gz")) - (sha256 - (base32 - "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q")))) - (build-system haskell-build-system) - (arguments - '(#:cabal-revision - ("4" "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32"))) - (inputs `(("ghc-exceptions" ,ghc-exceptions))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-void" ,ghc-void) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/fpco/safe-exceptions") - (synopsis "Safe, consistent, and easy exception handling") - (description "Runtime exceptions - as exposed in @code{base} by the -@code{Control.Exception} module - have long been an intimidating part of the -Haskell ecosystem. This package is intended to overcome this. It provides a -safe and simple API on top of the existing exception handling machinery. The -API is equivalent to the underlying implementation in terms of power but -encourages best practices to minimize the chances of getting the exception -handling wrong.") - (license license:expat))) - -(define-public ghc-inline-c-cpp - (package - (name "ghc-inline-c-cpp") - (version "0.2.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/inline-c-cpp/" - "inline-c-cpp-" version ".tar.gz")) - (sha256 - (base32 - "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci")))) - (build-system haskell-build-system) - (inputs - `(("ghc-inline-c" ,ghc-inline-c) - ("ghc-safe-exceptions" ,ghc-safe-exceptions))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec))) - (home-page "https://hackage.haskell.org/package/inline-c-cpp") - (synopsis "Lets you embed C++ code into Haskell") - (description - "This package provides utilities to inline C++ code into Haskell using -@code{inline-c}.") - (license license:expat))) - -(define-public ghc-bytestring-lexing - (package - (name "ghc-bytestring-lexing") - (version "0.5.0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "bytestring-lexing/bytestring-lexing-" - version ".tar.gz")) - (sha256 - (base32 - "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81")))) - (build-system haskell-build-system) - (home-page "http://code.haskell.org/~wren/") - (synopsis "Parse and produce literals from strict or lazy bytestrings") - (description - "This package provides tools to parse and produce literals efficiently -from strict or lazy bytestrings.") - (license license:bsd-2))) - -(define-public ghc-configurator - (package - (name "ghc-configurator") - (version "0.3.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "configurator/configurator-" - version ".tar.gz")) - (sha256 - (base32 - "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf")))) - (build-system haskell-build-system) - (inputs - `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-hashable" ,ghc-hashable) - ("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "http://github.com/bos/configurator") - (synopsis "Configuration management") - (description - "This package provides a configuration management library for programs -and daemons. The features include: - -@enumerate -@item Automatic, dynamic reloading in response to modifications to - configuration files. -@item A simple, but flexible, configuration language, supporting several of - the most commonly needed types of data, along with interpolation of strings - from the configuration or the system environment (e.g. @code{$(HOME)}). -@item Subscription-based notification of changes to configuration properties. -@item An @code{import} directive allows the configuration of a complex - application to be split across several smaller files, or common configuration - data to be shared across several applications. -@end enumerate\n") - (license license:bsd-3))) - -(define-public ghc-file-embed - (package - (name "ghc-file-embed") - (version "0.0.10.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/file-embed/" - "file-embed-" version ".tar.gz")) - (sha256 - (base32 - "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k")))) - (build-system haskell-build-system) - (home-page "https://github.com/snoyberg/file-embed") - (synopsis "Use Template Haskell to embed file contents directly") - (description - "This package allows you to use Template Haskell to read a file or all -the files in a directory, and turn them into @code{(path, bytestring)} pairs -embedded in your Haskell code.") - (license license:bsd-3))) - -(define-public ghc-safeio - (package - (name "ghc-safeio") - (version "0.0.5.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/safeio/" - "safeio-" version ".tar.gz")) - (sha256 - (base32 - "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm")))) - (build-system haskell-build-system) - (inputs - `(("ghc-conduit" ,ghc-conduit) - ("ghc-conduit-combinators" ,ghc-conduit-combinators) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-resourcet" ,ghc-resourcet))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-test-framework-th" ,ghc-test-framework-th))) - (home-page "https://github.com/luispedro/safeio") - (synopsis "Write output to disk atomically") - (description - "This package implements utilities to perform atomic output so as to -avoid the problem of partial intermediate files.") - (license license:expat))) - -(define-public ghc-tldr - (package - (name "ghc-tldr") - (version "0.4.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/tldr/tldr-" - version - ".tar.gz")) - (sha256 - (base32 - "0nc581y9jjzwd8l88g48c72mla7k6q1w102akl7gl5jsk9ljamd3")))) - (build-system haskell-build-system) - (inputs - `(("ghc-cmark" ,ghc-cmark) - ("ghc-optparse-applicative" ,ghc-optparse-applicative) - ("ghc-typed-process" ,ghc-typed-process) - ("ghc-semigroups" ,ghc-semigroups))) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-golden" ,ghc-tasty-golden))) - (home-page "https://github.com/psibi/tldr-hs#readme") - (synopsis "Haskell tldr client") - (description "This package provides the @command{tldr} command and a -Haskell client library allowing users to update and view @code{tldr} pages -from a shell. The @code{tldr} pages are a community effort to simplify the -man pages with practical examples.") - (license license:bsd-3))) - -(define-public ghc-c2hs - (package - (name "ghc-c2hs") - (version "0.28.6") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/c2hs/c2hs-" - version - ".tar.gz")) - (sha256 - (base32 - "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci")))) - (build-system haskell-build-system) - (inputs - `(("ghc-language-c" ,ghc-language-c) - ("ghc-dlist" ,ghc-dlist))) - (native-inputs - `(("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) - ("ghc-hunit" ,ghc-hunit) - ("ghc-shelly" ,ghc-shelly) - ("gcc" ,gcc))) - (arguments - `(;; XXX: Test failures are induced by a parse error in - ;; of glibc 2.28. - #:tests? #f - - #:phases - (modify-phases %standard-phases - (add-before 'check 'set-cc - ;; add a cc executable in the path, needed for some tests to pass - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc")) - (tmpbin (tmpnam)) - (curpath (getenv "PATH"))) - (mkdir-p tmpbin) - (symlink (which "gcc") (string-append tmpbin "/cc")) - (setenv "PATH" (string-append tmpbin ":" curpath))) - #t)) - (add-after 'check 'remove-cc - ;; clean the tmp dir made in 'set-cc - (lambda _ - (let* ((cc-path (which "cc")) - (cc-dir (dirname cc-path))) - (delete-file-recursively cc-dir) - #t)))))) - (home-page "https://github.com/haskell/c2hs") - (synopsis "Create Haskell bindings to C libraries") - (description "C->Haskell assists in the development of Haskell bindings to -C libraries. It extracts interface information from C header files and -generates Haskell code with foreign imports and marshaling. Unlike writing -foreign imports by hand (or using hsc2hs), this ensures that C functions are -imported with the correct Haskell types.") - (license license:gpl2))) - -(define-public ghc-libmpd - (package - (name "ghc-libmpd") - (version "0.9.0.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/libmpd/libmpd-" - version - ".tar.gz")) - (sha256 - (base32 - "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv")))) - (build-system haskell-build-system) - ;; Tests fail on i686. - ;; See https://github.com/vimus/libmpd-haskell/issues/112 - (arguments `(#:tests? #f)) - (inputs - `(("ghc-attoparsec" ,ghc-attoparsec) - ("ghc-old-locale" ,ghc-old-locale) - ("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-network" ,ghc-network) - ("ghc-utf8-string" ,ghc-utf8-string))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page "https://github.com/vimus/libmpd-haskell") - (synopsis "Haskell client library for the Music Player Daemon") - (description "This package provides a pure Haskell client library for the -Music Player Daemon.") - (license license:expat))) - -(define-public ghc-alsa-core - (package - (name "ghc-alsa-core") - (version "0.5.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/alsa-core/alsa-core-" - version - ".tar.gz")) - (sha256 - (base32 - "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("alsa-lib" ,alsa-lib))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://www.haskell.org/haskellwiki/ALSA") - (synopsis "Binding to the ALSA Library API (Exceptions)") - (description "This package provides access to ALSA infrastructure, that is -needed by both alsa-seq and alsa-pcm.") - (license license:bsd-3))) - -(define-public ghc-base-unicode-symbols - (package - (name "ghc-base-unicode-symbols") - (version "0.2.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/base-unicode-symbols/base-unicode-symbols-" - version - ".tar.gz")) - (sha256 - (base32 - "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf")))) - (build-system haskell-build-system) - (home-page "http://www.haskell.org/haskellwiki/Unicode-symbols") - (synopsis "Unicode alternatives for common functions and operators") - (description "This package defines new symbols for a number of functions, -operators and types in the base package. All symbols are documented with -their actual definition and information regarding their Unicode code point. -They should be completely interchangeable with their definitions. For -further Unicode goodness you can enable the @code{UnicodeSyntax} -@url{https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/glasgow_exs.html#unicode-syntax, -language extension}. This extension enables Unicode characters to be used to -stand for certain ASCII character sequences, i.e. → instead of @code{->}, -∀ instead of @code{forall} and many others.") - (license license:bsd-3))) - -(define-public ghc-genvalidity - (package - (name "ghc-genvalidity") - (version "0.5.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/genvalidity/genvalidity-" - version - ".tar.gz")) - (sha256 - (base32 - "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0")))) - (build-system haskell-build-system) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-validity" ,ghc-validity))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover) - ("ghc-hspec-core" ,ghc-hspec-core))) - (home-page - "https://github.com/NorfairKing/validity") - (synopsis - "Testing utilities for the @code{validity} library") - (description - "This package provides testing utilities that are useful in conjunction -with the @code{Validity} typeclass.") - (license license:expat))) - -(define-public ghc-genvalidity-property - (package - (name "ghc-genvalidity-property") - (version "0.2.1.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "genvalidity-property/genvalidity-property-" - version - ".tar.gz")) - (sha256 - (base32 - "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b")))) - (build-system haskell-build-system) - (inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-genvalidity" ,ghc-genvalidity) - ("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover) - ("ghc-validity" ,ghc-validity))) - (native-inputs `(("ghc-doctest" ,ghc-doctest))) - (home-page - "https://github.com/NorfairKing/validity") - (synopsis - "Standard properties for functions on @code{Validity} types") - (description - "This package supplements the @code{Validity} typeclass with standard -properties for functions operating on them.") - (license license:expat))) - -(define-public ghc-validity - (package - (name "ghc-validity") - (version "0.7.0.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/validity/validity-" - version - ".tar.gz")) - (sha256 - (base32 - "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f")))) - (build-system haskell-build-system) - (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("hspec-discover" ,hspec-discover))) - (home-page - "https://github.com/NorfairKing/validity") - (synopsis "Validity typeclass") - (description - "Values of custom types usually have invariants imposed upon them. This -package provides the @code{Validity} type class, which makes these invariants -explicit by providing a function to check whether the invariants hold.") - (license license:expat))) - -(define-public ghc-path - (package - (name "ghc-path") - (version "0.6.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/path/path-" - version - ".tar.gz")) - (sha256 - (base32 - "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb")))) - (build-system haskell-build-system) - (arguments - ;; TODO: There are some Windows-related tests and modules that need to be - ;; danced around. - `(#:tests? #f - #:cabal-revision - ("1" "05b1zwx2a893h4h5wvgpc5g5pyx71hfmx409rqisd8s1bq1hn463"))) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-hashable" ,ghc-hashable))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-genvalidity" ,ghc-genvalidity) - ("ghc-genvalidity-property" ,ghc-genvalidity-property) - ("ghc-hspec" ,ghc-hspec) - ("ghc-validity" ,ghc-validity))) - (home-page - "http://hackage.haskell.org/package/path") - (synopsis "Support for well-typed paths") - (description "This package introduces a type for paths upholding useful -invariants.") - (license license:bsd-3))) - -(define-public ghc-path-io - (package - (name "ghc-path-io") - (version "1.3.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/path-io/path-io-" - version - ".tar.gz")) - (sha256 - (base32 - "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a")))) - (build-system haskell-build-system) - (inputs - `(("ghc-dlist" ,ghc-dlist) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-path" ,ghc-path) - ("ghc-transformers-base" ,ghc-transformers-base) - ("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-temporary" ,ghc-temporary))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec))) - (arguments - `(#:cabal-revision - ("3" "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc"))) - (home-page - "https://github.com/mrkkrp/path-io") - (synopsis "Functions for manipulating well-typed paths") - (description "This package provides an interface to the @code{directory} -package for users of @code{path}. It also implements some missing stuff like -recursive scanning and copying of directories, working with temporary -files/directories, and more.") - (license license:bsd-3))) - -(define-public ghc-hindent - (package - (name "ghc-hindent") - (version "5.3.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hindent/hindent-" - version - ".tar.gz")) - (sha256 - (base32 - "0wkfik7mvqskk23kyh7ybgnlh3j9j1ym7d3ncahsbli9w654b7xg")))) - (build-system haskell-build-system) - (arguments - `(#:modules ((guix build haskell-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%haskell-build-system-modules - (guix build emacs-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'emacs-install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (elisp-file "elisp/hindent.el") - (dest (string-append out "/share/emacs/site-lisp" - "/guix.d/hindent-" ,version)) - (emacs (string-append (assoc-ref inputs "emacs") - "/bin/emacs"))) - (make-file-writable elisp-file) - (emacs-substitute-variables elisp-file - ("hindent-process-path" - (string-append out "/bin/hindent"))) - (install-file elisp-file dest) - (emacs-generate-autoloads "hindent" dest))))))) - (inputs - `(("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-monad-loops" ,ghc-monad-loops) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-yaml" ,ghc-yaml) - ("ghc-unix-compat" ,ghc-unix-compat) - ("ghc-path" ,ghc-path) - ("ghc-path-io" ,ghc-path-io) - ("ghc-optparse-applicative" ,ghc-optparse-applicative))) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) - ("ghc-diff" ,ghc-diff) - ("emacs" ,emacs-minimal))) - (home-page - "https://github.com/commercialhaskell/hindent") - (synopsis "Extensible Haskell pretty printer") - (description - "This package provides automatic formatting for Haskell files. Both a -library and an executable.") - (license license:bsd-3))) - -(define-public ghc-descriptive - (package - (name "ghc-descriptive") - (version "0.9.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/descriptive/descriptive-" - version - ".tar.gz")) - (sha256 - (base32 - "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-scientific" ,ghc-scientific) - ("ghc-vector" ,ghc-vector))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-hspec" ,ghc-hspec))) - (home-page - "https://github.com/chrisdone/descriptive") - (synopsis - "Self-describing consumers/parsers: forms, cmd-line args, JSON, etc.") - (description - "This package provides datatypes and functions for creating consumers -and parsers with useful semantics.") - (license license:bsd-3))) - -(define-public ghc-exactprint - (package - (name "ghc-exactprint") - (version "0.5.6.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "ghc-exactprint/ghc-exactprint-" version ".tar.gz")) - (sha256 - (base32 - "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87")))) - (build-system haskell-build-system) - (inputs - `(("ghc-paths" ,ghc-paths) - ("ghc-syb" ,ghc-syb) - ("ghc-free" ,ghc-free))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-diff" ,ghc-diff) - ("ghc-silently" ,ghc-silently) - ("ghc-filemanip" ,ghc-filemanip))) - (home-page - "http://hackage.haskell.org/package/ghc-exactprint") - (synopsis "ExactPrint for GHC") - (description - "Using the API Annotations available from GHC 7.10.2, this library -provides a means to round-trip any code that can be compiled by GHC, currently -excluding @file{.lhs} files.") - (license license:bsd-3))) - -(define-public ghc-microlens-mtl - (package - (name "ghc-microlens-mtl") - (version "0.1.11.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/microlens-mtl/microlens-mtl-" - version - ".tar.gz")) - (sha256 - (base32 - "0l6z1gkzwcpv89bxf5vgfrjb6gq2pj7sjjc53nvi5b9alx34zryk")))) - (build-system haskell-build-system) - (inputs - `(("ghc-microlens" ,ghc-microlens) - ("ghc-transformers-compat" ,ghc-transformers-compat))) - (home-page "https://github.com/monadfix/microlens") - (synopsis - "@code{microlens} support for Reader/Writer/State from mtl") - (description - "This package contains functions (like @code{view} or @code{+=}) which -work on @code{MonadReader}, @code{MonadWriter}, and @code{MonadState} from the -mtl package. This package is a part of the -@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the -readme @uref{https://github.com/aelve/microlens#readme, on Github}.") - (license license:bsd-3))) - -(define-public ghc-microlens-ghc - (package - (name "ghc-microlens-ghc") - (version "0.4.9.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/microlens-ghc/microlens-ghc-" - version - ".tar.gz")) - (sha256 - (base32 - "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj")))) - (build-system haskell-build-system) - (inputs `(("ghc-microlens" ,ghc-microlens))) - (home-page "https://github.com/monadfix/microlens") - (synopsis "Use @code{microlens} with GHC libraries like @code{array}") - (description "This library provides everything that @code{microlens} -provides plus instances to make @code{each}, @code{at}, and @code{ix} -usable with arrays, @code{ByteString}, and containers. This package is -a part of the @uref{http://hackage.haskell.org/package/microlens, -microlens} family; see the readme -@uref{https://github.com/aelve/microlens#readme, on Github}.") - (license license:bsd-3))) - -(define-public ghc-microlens-platform - (package - (name "ghc-microlens-platform") - (version "0.3.10") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/" - "microlens-platform/microlens-platform-" version ".tar.gz")) - (sha256 - (base32 - "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv")))) - (build-system haskell-build-system) - (inputs - `(("ghc-hashable" ,ghc-hashable) - ("ghc-microlens" ,ghc-microlens) - ("ghc-microlens-ghc" ,ghc-microlens-ghc) - ("ghc-microlens-mtl" ,ghc-microlens-mtl) - ("ghc-microlens-th" ,ghc-microlens-th) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector))) - (home-page "https://github.com/monadfix/microlens") - (synopsis "Feature-complete microlens") - (description - "This package exports a module which is the recommended starting point -for using @uref{http://hackage.haskell.org/package/microlens, microlens} if -you aren't trying to keep your dependencies minimal. By importing -@code{Lens.Micro.Platform} you get all functions and instances from -@uref{http://hackage.haskell.org/package/microlens, microlens}, -@uref{http://hackage.haskell.org/package/microlens-th, microlens-th}, -@uref{http://hackage.haskell.org/package/microlens-mtl, microlens-mtl}, -@uref{http://hackage.haskell.org/package/microlens-ghc, microlens-ghc}, as -well as instances for @code{Vector}, @code{Text}, and @code{HashMap}. The -minor and major versions of @code{microlens-platform} are incremented whenever -the minor and major versions of any other @code{microlens} package are -incremented, so you can depend on the exact version of -@code{microlens-platform} without specifying the version of @code{microlens} -you need. This package is a part of the -@uref{http://hackage.haskell.org/package/microlens, microlens} family; see the -readme @uref{https://github.com/aelve/microlens#readme, on Github}.") - (license license:bsd-3))) - -(define-public ghc-hasktags - (package - (name "ghc-hasktags") - (version "0.71.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hasktags/hasktags-" - version - ".tar.gz")) - (sha256 - (base32 - "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c")))) - (build-system haskell-build-system) - (inputs - `(("ghc-system-filepath" ,ghc-system-filepath) - ("ghc-optparse-applicative" ,ghc-optparse-applicative))) - (native-inputs - `(("ghc-json" ,ghc-json) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-microlens-platform" ,ghc-microlens-platform) - ("ghc-hunit" ,ghc-hunit))) - (home-page "http://github.com/MarcWeber/hasktags") - (synopsis "Make @code{Ctags} and @code{Etags} files for Haskell programs") - (description - "This package provides a means of generating tag files for Emacs and -Vim.") - (license license:bsd-3))) - -(define-public ghc-stylish-haskell - (package - (name "ghc-stylish-haskell") - (version "0.9.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/stylish-haskell/stylish-haskell-" - version - ".tar.gz")) - (sha256 - (base32 - "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w")))) - (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-file-embed" ,ghc-file-embed) - ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-syb" ,ghc-syb) - ("ghc-yaml" ,ghc-yaml) - ("ghc-strict" ,ghc-strict) - ("ghc-optparse-applicative" - ,ghc-optparse-applicative))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/jaspervdj/stylish-haskell") - (synopsis "Haskell code prettifier") - (description "Stylish-haskell is a Haskell code prettifier. The goal is -not to format all of the code in a file, to avoid \"getting in the way\". -However, this tool can e.g. clean up import statements and help doing various -tasks that get tedious very quickly. It can -@itemize -@item -Align and sort @code{import} statements -@item -Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant -pragmas -@item -Remove trailing whitespaces -@item -Align branches in @code{case} and fields in records -@item -Convert line endings (customisable) -@item -Replace tabs by four spaces (turned off by default) -@item -Replace some ASCII sequences by their Unicode equivalent (turned off by -default) -@end itemize") - (license license:bsd-3))) - -(define-public ghc-validation - (package - (name "ghc-validation") - (version "1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/validation/validation-" - version - ".tar.gz")) - (sha256 - (base32 - "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh")))) - (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3"))) - (inputs - `(("ghc-semigroups" ,ghc-semigroups) - ("ghc-semigroupoids" ,ghc-semigroupoids) - ("ghc-bifunctors" ,ghc-bifunctors) - ("ghc-lens" ,ghc-lens))) - (native-inputs - `(("ghc-hedgehog" ,ghc-hedgehog) - ("ghc-hunit" ,ghc-hunit))) - (home-page "https://github.com/qfpl/validation") - (synopsis - "Data-type like Either but with an accumulating Applicative") - (description - "A data-type like Either but with differing properties and type-class -instances. - -Library support is provided for this different representation, including -@code{lens}-related functions for converting between each and abstracting over -their similarities. - -The @code{Validation} data type is isomorphic to @code{Either}, but has an -instance of @code{Applicative} that accumulates on the error side. That is to -say, if two (or more) errors are encountered, they are appended using a -@{Semigroup} operation. - -As a consequence of this @code{Applicative} instance, there is no -corresponding @code{Bind} or @code{Monad} instance. @code{Validation} is an -example of, \"An applicative functor that is not a monad.\"") - (license license:bsd-3))) - -(define-public ghc-concurrent-output - (package - (name "ghc-concurrent-output") - (version "1.10.9") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/concurrent-output/concurrent-output-" - version - ".tar.gz")) - (sha256 - (base32 - "0mwf155w89nbbkjln7hhbn8k3f8p0ylcvgrg31cm7ijpx4499i4c")))) - (build-system haskell-build-system) - (inputs - `(("ghc-async" ,ghc-async) - ("ghc-exceptions" ,ghc-exceptions) - ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-terminal-size" ,ghc-terminal-size))) - (home-page - "https://hackage.haskell.org/package/concurrent-output") - (synopsis - "Ungarble output from several threads or commands") - (description - "Lets multiple threads and external processes concurrently output to the -console, without it getting all garbled up. - -Built on top of that is a way of defining multiple output regions, which are -automatically laid out on the screen and can be individually updated by -concurrent threads. Can be used for progress displays etc.") - (license license:bsd-2))) - -(define-public ghc-wl-pprint-annotated - (package - (name "ghc-wl-pprint-annotated") - (version "0.1.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/wl-pprint-annotated/wl-pprint-annotated-" - version - ".tar.gz")) - (sha256 - (base32 - "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb")))) - (build-system haskell-build-system) - (native-inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page - "https://github.com/minad/wl-pprint-annotated#readme") - (synopsis - "Wadler/Leijen pretty printer with annotation support") - (description - "Annotations are useful for coloring. This is a limited version of -@code{wl-pprint-extras} without support for point effects and without the free -monad. Like in @code{annotated-wl-pprint}, only annotations are supported. -Compared to @code{annotated-wl-pprint} this library provides a slightly -modernized interface.") - (license license:bsd-3))) ;;; haskell.scm ends here diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm index 4290d8c21f..894a19f0aa 100644 --- a/gnu/packages/idris.scm +++ b/gnu/packages/idris.scm @@ -21,9 +21,9 @@ (define-module (gnu packages idris) #:use-module (gnu packages) - #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages libffi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cdd0caec4a..4e2f6b7937 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -53,7 +53,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) - #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages java) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a69c460e87..c7d633455e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -48,9 +48,9 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) - #:use-module (gnu packages haskell) #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-web) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) #:use-module (gnu packages gawk) -- cgit v1.2.3 From 1874cdc1e1a9ae982612051d2004fca644ba6b13 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Thu, 29 Aug 2019 23:17:40 -0400 Subject: gnu: Move Haskell SDL 2 packages to haskell-xyz.scm. * gnu/packages/haskell-apps.scm (ghc-sdl2, ghc-sdl2-image, ghc-sdl2-mixer): Move variables from here... * gnu/packages/haskell-xyz.scm: ...to here. Co-authored-by: Timothy Sample --- gnu/packages/haskell-apps.scm | 89 ------------------------------------------- gnu/packages/haskell-xyz.scm | 88 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 89 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index df8417ce3f..28502eb87f 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages rsync) - #:use-module (gnu packages sdl) #:use-module (gnu packages version-control)) (define-public cabal-install @@ -378,94 +377,6 @@ used to keep a folder in sync between computers.") (license (list license:gpl3+ license:agpl3+)))) -(define-public ghc-sdl2 - (package - (name "ghc-sdl2") - (version "2.4.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/" - "sdl2/sdl2-" version ".tar.gz")) - (sha256 - (base32 - "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991")))) - (build-system haskell-build-system) - (arguments '(#:tests? #f)) ; tests require graphical environment - (inputs - `(("ghc-exceptions" ,ghc-exceptions) - ("ghc-linear" ,ghc-linear) - ("ghc-statevar" ,ghc-statevar) - ("ghc-vector" ,ghc-vector) - ("sdl2" ,sdl2))) - (native-inputs - `(("ghc-weigh" ,ghc-weigh) - ("pkg-config" ,pkg-config))) - (home-page "http://hackage.haskell.org/package/sdl2") - (synopsis "High- and low-level bindings to the SDL library") - (description - "This package contains bindings to the SDL 2 library, in both high- and -low-level forms. The @code{SDL} namespace contains high-level bindings, where -enumerations are split into sum types, and we perform automatic -error-checking. The @code{SDL.Raw} namespace contains an almost 1-1 -translation of the C API into Haskell FFI calls. As such, this does not -contain sum types nor error checking. Thus this namespace is suitable for -building your own abstraction over SDL, but is not recommended for day-to-day -programming.") - (license license:bsd-3))) - -(define-public ghc-sdl2-mixer - (package - (name "ghc-sdl2-mixer") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/sdl2-mixer/" - "sdl2-mixer-" version ".tar.gz")) - (sha256 - (base32 - "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g")))) - (build-system haskell-build-system) - (inputs - `(("ghc-data-default-class" ,ghc-data-default-class) - ("ghc-lifted-base" ,ghc-lifted-base) - ("ghc-monad-control" ,ghc-monad-control) - ("ghc-sdl2" ,ghc-sdl2) - ("ghc-vector" ,ghc-vector) - ("sdl2-mixer" ,sdl2-mixer))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://hackage.haskell.org/package/sdl2-mixer") - (synopsis "Bindings to SDL2 mixer") - (description "This package provides Haskell bindings to -@code{SDL2_mixer}.") - (license license:bsd-3))) - -(define-public ghc-sdl2-image - (package - (name "ghc-sdl2-image") - (version "2.0.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://hackage.haskell.org/package/sdl2-image/" - "sdl2-image-" version ".tar.gz")) - (sha256 - (base32 - "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr")))) - (build-system haskell-build-system) - (inputs - `(("ghc-sdl2" ,ghc-sdl2) - ("sdl2-image" ,sdl2-image))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://hackage.haskell.org/package/sdl2-image") - (synopsis "Bindings to SDL2_image") - (description "This package provides Haskell bindings to -@code{SDL2_image}.") - (license license:expat))) - (define-public hlint (package (name "hlint") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 46e5153906..91d009dc22 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8578,6 +8578,94 @@ by MPEG playback software, emulators, and many popular games, including the award winning Linux port of \"Civilization: Call To Power.\"") (license license:bsd-3))) +(define-public ghc-sdl2 + (package + (name "ghc-sdl2") + (version "2.4.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "sdl2/sdl2-" version ".tar.gz")) + (sha256 + (base32 + "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991")))) + (build-system haskell-build-system) + (arguments '(#:tests? #f)) ; tests require graphical environment + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-linear" ,ghc-linear) + ("ghc-statevar" ,ghc-statevar) + ("ghc-vector" ,ghc-vector) + ("sdl2" ,sdl2))) + (native-inputs + `(("ghc-weigh" ,ghc-weigh) + ("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2") + (synopsis "High- and low-level bindings to the SDL library") + (description + "This package contains bindings to the SDL 2 library, in both high- and +low-level forms. The @code{SDL} namespace contains high-level bindings, where +enumerations are split into sum types, and we perform automatic +error-checking. The @code{SDL.Raw} namespace contains an almost 1-1 +translation of the C API into Haskell FFI calls. As such, this does not +contain sum types nor error checking. Thus this namespace is suitable for +building your own abstraction over SDL, but is not recommended for day-to-day +programming.") + (license license:bsd-3))) + +(define-public ghc-sdl2-image + (package + (name "ghc-sdl2-image") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/sdl2-image/" + "sdl2-image-" version ".tar.gz")) + (sha256 + (base32 + "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr")))) + (build-system haskell-build-system) + (inputs + `(("ghc-sdl2" ,ghc-sdl2) + ("sdl2-image" ,sdl2-image))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2-image") + (synopsis "Bindings to SDL2_image") + (description "This package provides Haskell bindings to +@code{SDL2_image}.") + (license license:expat))) + +(define-public ghc-sdl2-mixer + (package + (name "ghc-sdl2-mixer") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/sdl2-mixer/" + "sdl2-mixer-" version ".tar.gz")) + (sha256 + (base32 + "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default-class" ,ghc-data-default-class) + ("ghc-lifted-base" ,ghc-lifted-base) + ("ghc-monad-control" ,ghc-monad-control) + ("ghc-sdl2" ,ghc-sdl2) + ("ghc-vector" ,ghc-vector) + ("sdl2-mixer" ,sdl2-mixer))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://hackage.haskell.org/package/sdl2-mixer") + (synopsis "Bindings to SDL2 mixer") + (description "This package provides Haskell bindings to +@code{SDL2_mixer}.") + (license license:bsd-3))) + (define-public ghc-sdl-image (package (name "ghc-sdl-image") -- cgit v1.2.3 From 4cb5d2515ca0061f1e2b0b422d54df705ddc4956 Mon Sep 17 00:00:00 2001 From: Steve Sprang Date: Wed, 21 Aug 2019 17:17:02 -0700 Subject: gnu: Add speedcrunch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (speedcrunch): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4a07b8e687..c9db51b561 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Amin Bandali ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Steve Sprang ;;; ;;; This file is part of GNU Guix. ;;; @@ -5136,3 +5137,36 @@ algorithm, a parametric integer programming solver, and primitives for termination analysis via the automatic synthesis of linear ranking functions.") (license license:gpl3+))) + +(define-public speedcrunch + (package + (name "speedcrunch") + (version "0.12.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://bitbucket.org/heldercorreia/speedcrunch.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk")))) + (build-system cmake-build-system) + (inputs `(("qtbase" ,qtbase))) + (native-inputs `(("qttools" ,qttools))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir-to-src + (lambda _ (chdir "src") #t))))) + (synopsis "High-precision scientific calculator") + (description + "SpeedCrunch is a high-precision scientific calculator. It features a +syntax-highlighted scrollable display and is designed to be fully used via +keyboard. Some distinctive features are auto-completion of functions and +variables, a formula book, and quick insertion of constants from various +fields of knowledge.") + (home-page "http://speedcrunch.org/") + (license license:gpl2+))) + -- cgit v1.2.3 From 2c0040ae302fa8549161754283b404b9dd22a619 Mon Sep 17 00:00:00 2001 From: Steve Sprang Date: Fri, 23 Aug 2019 15:23:00 -0700 Subject: gnu: Add lib3mf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (lib3mf): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a1f222bed4..54bf5a7b69 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2019 Tim Stahel ;;; Copyright © 2019 Jovany Leandro G.C +;;; Copyright © 2019 Steve Sprang ;;; ;;; This file is part of GNU Guix. ;;; @@ -2109,3 +2110,38 @@ while keeping the user experience at mind. Cutter is created by reverse engineers for reverse engineers.") (license (list license:cc-by-sa3.0 ;the "Iconic" icon set license:gpl3+)))) ;everything else + +(define-public lib3mf + (package + (name "lib3mf") + (version "1.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/3MFConsortium/lib3mf.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd")))) + (build-system cmake-build-system) + (native-inputs + `(("googletest-source" ,(package-source googletest)))) + (inputs + `(("libuuid" ,util-linux))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-googletest + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "googletest-source") + "UnitTests/googletest") + #t))))) + (synopsis "Implementation of the 3D Manufacturing Format (3MF) file standard") + (description + "Lib3MF is a C++ implementation of the 3D Manufacturing Format (3MF) file +standard. It offers a way to integrate 3MF reading and writing capabilities, as +well as conversion and validation tools for input and output data. The +specification can be downloaded at @url{http://3mf.io/specification/}.") + (home-page "https://3mf.io/") + (license license:bsd-2))) -- cgit v1.2.3 From 900e0fbcc4626bdf57e455836f86367e3ec36d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 31 Aug 2019 21:03:16 +0200 Subject: lint: Gracefully handle errors from 'connect' & co. * guix/lint.scm (call-with-networking-fail-safe): Add case for 'system-error' as typically raised by 'connect' & co. --- guix/lint.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/guix/lint.scm b/guix/lint.scm index 2bf5097403..254f4e2830 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -950,6 +950,16 @@ display a message including MESSAGE and return ERROR-VALUE." message (tls-certificate-error-string args)) error-value) + ((and ('system-error _ ...) args) + (let ((errno (system-error-errno args))) + (if (member errno (list ECONNRESET ECONNABORTED ECONNREFUSED)) + (let ((details (call-with-output-string + (lambda (port) + (print-exception port #f (car args) + (cdr args)))))) + (warning (G_ "~a: ~a~%") message details) + error-value) + (apply throw args)))) (args (apply throw args)))))) -- cgit v1.2.3 From b212fef4b076faccdd36335c728fd71321778716 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 31 Aug 2019 21:23:29 +0200 Subject: nls: Update 'es' translation of the manual. --- po/doc/guix-manual.es.po | 1505 +++++++++++++++++++++++++--------------------- 1 file changed, 820 insertions(+), 685 deletions(-) diff --git a/po/doc/guix-manual.es.po b/po/doc/guix-manual.es.po index 4b6439ba5f..fd7efc4d0d 100644 --- a/po/doc/guix-manual.es.po +++ b/po/doc/guix-manual.es.po @@ -50,7 +50,7 @@ msgstr "" "Project-Id-Version: guix-manual 1.0.1-pre1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" "POT-Creation-Date: 2019-05-10 20:53+0200\n" -"PO-Revision-Date: 2019-05-11 16:59+0200\n" +"PO-Revision-Date: 2019-08-03 20:59+0200\n" "Last-Translator: Miguel Ángel Arruga Vivas \n" "Language-Team: Spanish \n" "Language: es\n" @@ -1630,9 +1630,9 @@ msgstr "Este documento describe GNU Guix versión @value{VERSION}, una herramien #: doc/guix.texi:123 msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), and Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}). If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}." msgstr "" -"Este manual también está disponible en chino simplificado (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), francés (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), alemán (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}) e inglés (@pxref{Top,,, guix, GNU Guix Reference Manual}). Si desea traducirlo en su lengua nativa, considere unirse al @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}.\n" +"Este manual también está disponible en chino simplificado (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), francés (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), alemán (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), ruso (@pxref{Top,,, guix.ru, Руководство GNU Guix}) y la versión original en inglés (@pxref{Top,,, guix, GNU Guix Reference Manual}). Si desea traducirlo en su lengua nativa, considere unirse al @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}.\n" "\n" -"Actualmente este manual no está completamente traducido y varias secciones de servicios prácticamente se encuentran al completo en inglés. En versiones posteriores se irá completando la traducción, a la vez que adaptando la evolución de su fuente original en inglés. Si encuentra fallos en esta traducción le rogamos que nos lo comunique mediante @uref{https://translationproject.org/team/es.html, la información de contacto del equipo de traducción}." +"Este manual se está traducido prácticamente al completo al castellano, pero es posible que se ocasionalmente algún fragmento sin traducir aquí y allá, debido a modificaciones al texto original en inglés del manual. Si encuentra fallos en esta traducción, o simplemente quiere colaborar en su evolución y mejora, le rogamos que nos contacte a través de @uref{https://translationproject.org/team/es.html, la información de contacto del equipo de traducción}." #. type: chapter #: doc/guix.texi:139 doc/guix.texi:149 doc/guix.texi:312 doc/guix.texi:313 @@ -2261,7 +2261,7 @@ msgstr "Sobre la confianza en binarios" #. type: menuentry #: doc/guix.texi:206 doc/guix.texi:3123 msgid "How can you trust that binary blob?" -msgstr "¿Cómo puede usted confiar en esa masa informe de datos binarios?" +msgstr "¿Cómo puede confiar en esa masa amorfa de datos binarios?" #. type: node #: doc/guix.texi:211 doc/guix.texi:4348 doc/guix.texi:4350 @@ -13783,7 +13783,7 @@ msgstr "(ungexp-native @var{obj} @var{salida})" #. type: table #: doc/guix.texi:7170 msgid "Same as @code{ungexp}, but produces a reference to the @emph{native} build of @var{obj} when used in a cross compilation context." -msgstr "Lo mismo que @code{ungexp}, pero produce una referencia a la construcción @emph{nativa} de @var{obj} cuando se usa en un contexto de compilación cruzada." +msgstr "Igual que @code{ungexp}, pero produce una referencia a la construcción @emph{nativa} de @var{obj} cuando se usa en un contexto de compilación cruzada." #. type: item #: doc/guix.texi:7171 @@ -20721,7 +20721,7 @@ msgstr "El nombre de la localización. @xref{Locale Names,,, libc, The GNU C Li #. type: table #: doc/guix.texi:11320 msgid "The name of the source for that locale. This is typically the @code{@var{language}_@var{territory}} part of the locale name." -msgstr "El nombre de la fuente para dicha localización. Esto típicamente es la parte @code{@var{idioma}_@var{territorio}} del nombre de localización." +msgstr "El nombre de la fuente para dicha localización. Habitualmente es la parte @code{@var{idioma}_@var{territorio}} del nombre de localización." #. type: item #: doc/guix.texi:11321 @@ -31521,10 +31521,9 @@ msgstr "{parámetro de @code{dovecot-configuration}} string ssl-key-password" #. type: deftypevr #: doc/guix.texi:16391 -#, fuzzy msgid "If key file is password protected, give the password here. Alternatively give it when starting dovecot with -p parameter. Since this file is often world-readable, you may want to place this setting instead to a different. Defaults to @samp{\"\"}." msgstr "" -"\n" +"Si el fichero de la clave está protegido por contraseña, proporcionela aquí. De manera alternativa, puede proporcionarla al iniciar dovecot con el parámetro -p. Como este fichero es habitualmente legible por todo el mundo, puede que desee desplazar esta opción a un fichero diferente.\n" "Su valor predeterminado es @samp{\"\"}." #. type: deftypevr @@ -31535,10 +31534,9 @@ msgstr "{parámetro de @code{dovecot-configuration}} string ssl-ca" #. type: deftypevr #: doc/guix.texi:16399 -#, fuzzy msgid "PEM encoded trusted certificate authority. Set this only if you intend to use @samp{ssl-verify-client-cert? #t}. The file should contain the CA certificate(s) followed by the matching CRL(s). (e.g.@: @samp{ssl-ca @@dominio.\n" "Su valor predeterminado es @samp{\"\"}." #. type: deftypevr @@ -31655,12 +31650,12 @@ msgstr "" msgid "{@code{dovecot-configuration} parameter} boolean quota-full-tempfail?" msgstr "{parámetro de @code{dovecot-configuration}} boolean quota-full-tempfail?" +# FUZZY #. type: deftypevr #: doc/guix.texi:16450 -#, fuzzy msgid "If user is over quota, return with temporary failure instead of bouncing the mail. Defaults to @samp{#f}." msgstr "" -"\n" +"Si la usuaria supera la cuota, devuelve un fallo temporal en vez de rechazar el correo.\n" "Su valor predeterminado es @samp{#f}." #. type: deftypevr @@ -31671,10 +31666,9 @@ msgstr "{parámetro de @code{dovecot-configuration}} nombre-fichero sendmail-pat #. type: deftypevr #: doc/guix.texi:16455 -#, fuzzy msgid "Binary to use for sending mails. Defaults to @samp{\"/usr/sbin/sendmail\"}." msgstr "" -"\n" +"Binario usado para el envío de correos.\n" "Su valor predeterminado es @samp{\"/usr/sbin/sendmail\"}." #. type: deftypevr @@ -31683,12 +31677,12 @@ msgstr "" msgid "{@code{dovecot-configuration} parameter} string submission-host" msgstr "{parámetro de @code{dovecot-configuration}} string submission-host" +# FUZZY #. type: deftypevr #: doc/guix.texi:16461 -#, fuzzy msgid "If non-empty, send mails via this SMTP host[:port] instead of sendmail. Defaults to @samp{\"\"}." msgstr "" -"\n" +"Si no está vacío, envía el correo a través de esta máquina[:puerto] SMTP en vez de usar sendmail\n" "Su valor predeterminado es @samp{\"\"}." #. type: deftypevr @@ -31699,10 +31693,9 @@ msgstr "{parámetro de @code{dovecot-configuration}} string rejection-subject" #. type: deftypevr #: doc/guix.texi:16467 -#, fuzzy msgid "Subject: header to use for rejection mails. You can use the same variables as for @samp{rejection-reason} below. Defaults to @samp{\"Rejected: %s\"}." msgstr "" -"\n" +"Asunto: cabecera usada en el rechazo de correos. Puede usar las mismas variables que las indicadas en @samp{rejection-reason} a continuación.\n" "Su valor predeterminado es @samp{\"Rejected: %s\"}." #. type: deftypevr @@ -31759,12 +31752,12 @@ msgstr "El valor predeterminado es @samp{\"Your message to <%t> was automaticall msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter" msgstr "{parámetro de @code{dovecot-configuration}} string recipient-delimiter" +# FUZZY #. type: deftypevr #: doc/guix.texi:16490 -#, fuzzy msgid "Delimiter character between local-part and detail in email address. Defaults to @samp{\"+\"}." msgstr "" -"\n" +"Caracter delimitador entre la parte local y el detalle en las direcciones de correo.\n" "Su valor predeterminado es @samp{\"+\"}." #. type: deftypevr @@ -31773,12 +31766,12 @@ msgstr "" msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header" msgstr "{parámetro de @code{dovecot-configuration}} string lda-original-recipient-header" +# FUZZY #. type: deftypevr #: doc/guix.texi:16498 -#, fuzzy msgid "Header where the original recipient address (SMTP's RCPT TO: address) is taken from if not available elsewhere. With dovecot-lda -a parameter overrides this. A commonly used header for this is X-Original-To. Defaults to @samp{\"\"}." msgstr "" -"\n" +"Cabecera de donde se obtiene la dirección receptora original (la dirección de SMTP RCPT TO:) en caso de no estar disponible en otro lugar. El parámetro -a de dovecot-lda reemplaza este valor. Una cabecera usada para esto de manera común es X-Original-To.\n" "Su valor predeterminado es @samp{\"\"}." #. type: deftypevr @@ -31789,10 +31782,9 @@ msgstr "{parámetro de @code{dovecot-configuration}} boolean lda-mailbox-autocre #. type: deftypevr #: doc/guix.texi:16504 -#, fuzzy msgid "Should saving a mail to a nonexistent mailbox automatically create it?. Defaults to @samp{#f}." msgstr "" -"\n" +"¿Se debe crear una bandeja de correo no existente de manera automática al almacenar un correo?\n" "Su valor predeterminado es @samp{#f}." #. type: deftypevr @@ -31814,12 +31806,12 @@ msgstr "" msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length" msgstr "{parámetro de @code{dovecot-configuration}} entero-no-negativo imap-max-line-length" +# FUZZY #. type: deftypevr #: doc/guix.texi:16518 -#, fuzzy msgid "Maximum IMAP command line length. Some clients generate very long command lines with huge mailboxes, so you may need to raise this if you get \"Too long argument\" or \"IMAP command line too large\" errors often. Defaults to @samp{64000}." msgstr "" -"\n" +"Longitud máxima de la línea de órdenes de IMAP. Algunos clientes generan líneas de órdenes muy largas con bandejas de correo enormes, por lo que debe incrementarlo si recibe los errores «Too long argument» (parámetro demasiado largo) o \"IMAP command line too large\" (línea de órdenes de IMAP demasiado grande).\n" "Su valor predeterminado es @samp{64000}." #. type: deftypevr @@ -31869,12 +31861,12 @@ msgstr "" msgid "{@code{dovecot-configuration} parameter} string imap-capability" msgstr "{parámetro de @code{dovecot-configuration}} string imap-capability" +# FUZZY #. type: deftypevr #: doc/guix.texi:16536 -#, fuzzy msgid "Override the IMAP CAPABILITY response. If the value begins with '+', add the given capabilities on top of the defaults (e.g.@: +XFOO XBAR). Defaults to @samp{\"\"}." msgstr "" -"\n" +"Fuerza el valor de la respuesta de IMAP CAPABILITY. Si el valor comienza con '+', añade las capacidades especificadas sobre las predeterminadas (por ejemplo, +XFOO XBAR).\n" "Su valor predeterminado es @samp{\"\"}." #. type: deftypevr @@ -31883,12 +31875,12 @@ msgstr "" msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval" msgstr "{parámetro de @code{dovecot-configuration}} string imap-idle-notify-interval" +# FUZZY #. type: deftypevr #: doc/guix.texi:16542 -#, fuzzy msgid "How long to wait between \"OK Still here\" notifications when client is IDLEing. Defaults to @samp{\"2 mins\"}." msgstr "" -"\n" +"Durante cuanto tiempo se espera entre notificaciones \"OK Still here\" cuando el cliente se encuentre en estado IDLE.\n" "Su valor predeterminado es @samp{\"2 mins\"}." #. type: deftypevr @@ -32439,12 +32431,12 @@ msgstr "" msgid "{@code{prosody-configuration} parameter} file-name certificates" msgstr "{parámetro de @code{prosody-configuration}} nombre-fichero certificates" +# FUZZY #. type: deftypevr #: doc/guix.texi:16841 -#, fuzzy msgid "Every virtual host and component needs a certificate so that clients and servers can securely verify its identity. Prosody will automatically load certificates/keys from the directory specified here. Defaults to @samp{\"/etc/prosody/certs\"}." msgstr "" -"\n" +"Cada máquina virtual y componente necesitan un certificado de manera que los clientes y servidores puedan verificar su identidad de manera segura. Prosody cargará de manera automática certificados/claves del directorio especificado aquí.\n" "Su valor predeterminado es @samp{\"/etc/prosody/certs\"}." #. type: deftypevr @@ -32467,12 +32459,12 @@ msgstr "" msgid "{@code{prosody-configuration} parameter} boolean use-libevent?" msgstr "{parámetro de @code{prosody-configuration}} boolean use-libevent?" +# FUZZY #. type: deftypevr #: doc/guix.texi:16855 -#, fuzzy msgid "Enable use of libevent for better performance under high load. See @url{https://prosody.im/doc/libevent}. Defaults to @samp{#f}." msgstr "" -"\n" +"Activa el uso de libevent para mejorar el rendimiento bajo altas cargas de trabajo. Véase @url{https://prosody.im/doc/libevent}.\n" "Su valor predeterminado es @samp{#f}." #. type: deftypevr @@ -32495,12 +32487,12 @@ msgstr "" msgid "{@code{prosody-configuration} parameter} string-list modules-disabled" msgstr "{parámetro de @code{prosody-configuration}} lista-string modules-disabled" +# FUZZY #. type: deftypevr #: doc/guix.texi:16869 -#, fuzzy msgid "@samp{\"offline\"}, @samp{\"c2s\"} and @samp{\"s2s\"} are auto-loaded, but should you want to disable them then add them to this list. Defaults to @samp{()}." msgstr "" -"\n" +"@samp{\"offline\"}, @samp{\"c2s\"} y @samp{\"s2s\"} se cargan de manera automática, pero puede desactivarlos si los añade a esta lista.\n" "Su valor predeterminado es @samp{()}." #. type: deftypevr @@ -32511,10 +32503,9 @@ msgstr "{parámetro de @code{prosody-configuration}} file-object groups-file" #. type: deftypevr #: doc/guix.texi:16876 -#, fuzzy msgid "Path to a text file where the shared groups are defined. If this path is empty then @samp{mod_groups} does nothing. See @url{https://prosody.im/doc/modules/mod_groups}. Defaults to @samp{\"/var/lib/prosody/sharedgroups.txt\"}." msgstr "" -"\n" +"Ruta a un fichero de texto donde se definan los grupos compartidos. Si esta ruta está vacía, @samp{mod_groups} no hace nada. Véase @url{https://prosody.im/doc/modules/mod_groups}.\n" "Su valor predeterminado es @samp{\"/var/lib/prosody/sharedgroups.txt\"}." #. type: deftypevr @@ -32525,10 +32516,9 @@ msgstr "{parámetro de @code{prosody-configuration}} boolean allow-registration? #. type: deftypevr #: doc/guix.texi:16882 -#, fuzzy msgid "Disable account creation by default, for security. See @url{https://prosody.im/doc/creating_accounts}. Defaults to @samp{#f}." msgstr "" -"\n" +"Desactiva la creación de cuentas de manera predeterminada, por seguridad. Véase @url{https://prosody.im/doc/creating_accounts}.\n" "Su valor predeterminado es @samp{#f}." #. type: deftypevr @@ -32589,12 +32579,12 @@ msgstr "Ruta al fichero de su certificado." msgid "{@code{ssl-configuration} parameter} file-object capath" msgstr "{parámetro de @code{ssl-configuration}} file-object capath" +# FUZZY #. type: deftypevr #: doc/guix.texi:16908 -#, fuzzy msgid "Path to directory containing root certificates that you wish Prosody to trust when verifying the certificates of remote servers. Defaults to @samp{\"/etc/ssl/certs\"}." msgstr "" -"\n" +"Ruta al directorio que contiene los certificados raíz en los que desea que Prosody confíe al verificar los certificados de servidores remotos.\n" "Su valor predeterminado es @samp{\"/etc/ssl/certs\"}." #. type: deftypevr @@ -32708,10 +32698,9 @@ msgstr "{parámetro de @code{prosody-configuration}} boolean c2s-require-encrypt #. type: deftypevr #: doc/guix.texi:16961 -#, fuzzy msgid "Whether to force all client-to-server connections to be encrypted or not. See @url{https://prosody.im/doc/modules/mod_tls}. Defaults to @samp{#f}." msgstr "" -"\n" +"Determina si se fuerza que todas las conexiones cliente-servidor vayan cifradas o no. Véase @url{https://prosody.im/doc/modules/mod_tls}.\n" "Su valor predeterminado es @samp{#f}." #. type: deftypevr @@ -32720,12 +32709,12 @@ msgstr "" msgid "{@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms" msgstr "{parámetro de @code{prosody-configuration}} lista-string disable-sasl-mechanisms" +# FUZZY #. type: deftypevr #: doc/guix.texi:16967 -#, fuzzy msgid "Set of mechanisms that will never be offered. See @url{https://prosody.im/doc/modules/mod_saslauth}. Defaults to @samp{(\"DIGEST-MD5\")}." msgstr "" -"\n" +"Conjunto de mecanismos que no se ofrecerán nunca. Véase @url{https://prosody.im/doc/modules/mod_saslauth}.\n" "Su valor predeterminado es @samp{(\"DIGEST-MD5\")}." #. type: deftypevr @@ -32736,10 +32725,9 @@ msgstr "{parámetro de @code{prosody-configuration}} boolean s2s-require-encrypt #. type: deftypevr #: doc/guix.texi:16973 -#, fuzzy msgid "Whether to force all server-to-server connections to be encrypted or not. See @url{https://prosody.im/doc/modules/mod_tls}. Defaults to @samp{#f}." msgstr "" -"\n" +"Determina si se fuerza que todas las conexiones servidor-servidor vayan cifradas o no. Véase @url{https://prosody.im/doc/modules/mod_tls}.\n" "Su valor predeterminado es @samp{#f}." #. type: deftypevr @@ -32750,10 +32738,9 @@ msgstr "{parámetro de @code{prosody-configuration}} boolean s2s-secure-auth?" #. type: deftypevr #: doc/guix.texi:16981 -#, fuzzy msgid "Whether to require encryption and certificate authentication. This provides ideal security, but requires servers you communicate with to support encryption AND present valid, trusted certificates. See @url{https://prosody.im/doc/s2s#security}. Defaults to @samp{#f}." msgstr "" -"\n" +"Determina si el cifrado y la identificación mediante certificado son necesarias. Esto proporciona una seguridad ideal, pero necesita que los servidores con los que se comunique permitan cifrado y tengan presentes certificados válidos en los que se tenga confianza. Véase @url{https://prosody.im/doc/s2s#security}.\n" "Su valor predeterminado es @samp{#f}." #. type: deftypevr @@ -32764,10 +32751,9 @@ msgstr "{parámetro de @code{prosody-configuration}} lista-string s2s-insecure-d #. type: deftypevr #: doc/guix.texi:16989 -#, fuzzy msgid "Many servers don't support encryption or have invalid or self-signed certificates. You can list domains here that will not be required to authenticate using certificates. They will be authenticated using DNS. See @url{https://prosody.im/doc/s2s#security}. Defaults to @samp{()}." msgstr "" -"\n" +"Muchos servidores no permiten el cifrado o tienen certificados auto-firmados. Puede proporcionar aquí una lista de dominios que no necesitarán la identificación mediante certificado. Se identificarán mediante DNS. Véase @url{https://prosody.im/doc/s2s#security}.\n" "Su valor predeterminado es @samp{()}." #. type: deftypevr @@ -32778,10 +32764,9 @@ msgstr "{parámetro de @code{prosody-configuration}} lista-string s2s-secure-dom #. type: deftypevr #: doc/guix.texi:16996 -#, fuzzy msgid "Even if you leave @code{s2s-secure-auth?} disabled, you can still require valid certificates for some domains by specifying a list here. See @url{https://prosody.im/doc/s2s#security}. Defaults to @samp{()}." msgstr "" -"\n" +"Aún en el caso de mantener @code{s2s-secure-auth?}, puede exigir certificados válidos para algunos dominios especificando una lista aquí. Véase @url{https://prosody.im/doc/s2s#security}.\n" "Su valor predeterminado es @samp{()}." #. type: deftypevr @@ -32790,12 +32775,12 @@ msgstr "" msgid "{@code{prosody-configuration} parameter} string authentication" msgstr "{parámetro de @code{prosody-configuration}} string authentication" +# TODO: Parche por punto tras el último enlace. #. type: deftypevr #: doc/guix.texi:17006 -#, fuzzy msgid "Select the authentication backend to use. The default provider stores passwords in plaintext and uses Prosody's configured data storage to store the authentication data. If you do not trust your server please see @url{https://prosody.im/doc/modules/mod_auth_internal_hashed} for information about using the hashed backend. See also @url{https://prosody.im/doc/authentication} Defaults to @samp{\"internal_plain\"}." msgstr "" -"\n" +"Selecciona el motor de identificación usado. La implementación predeterminada almacena las contraseñas en texto claro y usa el almacenamiento de datos configurado en Prosody para los datos de identificación. Si no confía en su servidor le recomendamos que visite @url{https://prosody.im/doc/modules/mod_auth_internal_hashed} para obtener información sobre el motor de almacenamiento tras hash. Véase también @url{https://prosody.im/doc/authentication}.\n" "Su valor predeterminado es @samp{\"internal_plain\"}." #. type: deftypevr @@ -32806,10 +32791,9 @@ msgstr "{parámetro de @code{prosody-configuration}} maybe-string log" #. type: deftypevr #: doc/guix.texi:17012 -#, fuzzy msgid "Set logging options. Advanced logging configuration is not yet supported by the Prosody service. See @url{https://prosody.im/doc/logging}. Defaults to @samp{\"*syslog\"}." msgstr "" -"\n" +"Determina las opciones del registro. La configuración avanzada del registro no está implementada todavía para el servicio Prosody. Véase @url{https://prosody.im/doc/logging}.\n" "Su valor predeterminado es @samp{\"*syslog\"}." #. type: deftypevr @@ -33014,12 +32998,12 @@ msgstr "" msgid "{@code{prosody-configuration} parameter} ext-component-configuration-list ext-components" msgstr "{parámetro de @code{prosody-configuration}} lista-ext-component-configuration ext-components" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:17118 -#, fuzzy msgid "External components use XEP-0114, which most standalone components support. To add an external component, you simply fill the hostname field. See @url{https://prosody.im/doc/components}. Defaults to @samp{()}." msgstr "" -"\n" +"Los componentes externos usan XEP-0114, el cual se implementa en la mayor parte de componentes independientes. Para añadir un componente externo, simplemente rellene el campo de nombre de máquina (hostname). Véase @url{httos://prosody.im/doc/components}.\n" "Su valor predeterminado es @samp{()}." #. type: deftypevr @@ -34819,12 +34803,12 @@ msgstr "Servicio Krb5" #. type: Plain text #: doc/guix.texi:17972 msgid "Programs using a Kerberos client library normally expect a configuration file in @file{/etc/krb5.conf}. This service generates such a file from a definition provided in the operating system declaration. It does not cause any daemon to be started." -msgstr "" +msgstr "Los programas que usan una biblioteca cliente de Kerberos habitualmente esperan un fichero de configuración en la ruta @file{/etc/krb5.conf}. Este servicio genera dicho fichero desde una definición proporcionada en la declaración de sistema operativo. Esto no causa el inicio de ningún daemon." #. type: Plain text #: doc/guix.texi:17976 msgid "No ``keytab'' files are provided by this service---you must explicitly create them. This service is known to work with the MIT client library, @code{mit-krb5}. Other implementations have not been tested." -msgstr "" +msgstr "Este servicio no crea ningún fichero «keytab»---debe crearlos explícitamente usted. Se ha comprobado que este servicio funciona con la biblioteca de cliente @code{mit-krb5} del MIT. No se han probado otras implementaciones." #. type: defvr #: doc/guix.texi:17977 @@ -34912,10 +34896,11 @@ msgstr "explícitamente por parte del cliente." msgid "Accepts services which only support encryption types known to be weak." msgstr "Acepta servicios cuyos únicos tipos de cifrado implementados se sabe que son débiles." +# TODO: Revisar #. type: Plain text #: doc/guix.texi:18014 msgid "The @code{krb5-realm} and @code{krb5-configuration} types have many fields. Only the most commonly used ones are described here. For a full list, and more detailed explanation of each, see the MIT @uref{https://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} documentation." -msgstr "" +msgstr "Los tipos @code{krb5-realm} y @code{krb5-configuration} contienen muchos campos. Aquí se describen únicamente los más habitualmente usados. Para obtener una lista complete y una explicación detallada de cada campo, véase la documentación de @uref{https://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf}." #. type: deftp #: doc/guix.texi:18016 @@ -34929,10 +34914,12 @@ msgstr "{Tipo de datos} krb5-realm" msgid "realm, kerberos" msgstr "dominio (realm), kerberos" +# FUZZY +# TODO (MAAV): fully qualified name #. type: table #: doc/guix.texi:18023 msgid "This field is a string identifying the name of the realm. A common convention is to use the fully qualified DNS name of your organization, converted to upper case." -msgstr "" +msgstr "Este campo es una cadena que identifica el nombre del dominio. Una convención habitual es el uso del nombre completo de DNS de su organización, convertido a mayúsculas." #. type: code{#1} #: doc/guix.texi:18024 @@ -34980,10 +34967,12 @@ msgstr "Si esta opción es @code{#t} se aceptarán los servicios que únicamente msgid "@code{default-realm} (default: @code{#f})" msgstr "@code{default-realm} (predeterminado: @code{#f})" +# FUZZY FUZZY FUZZY +# TODO (MAAV): Kerberos Principal = primary/instance@REALM #. type: table #: doc/guix.texi:18048 msgid "This field should be a string identifying the default Kerberos realm for the client. You should set this field to the name of your Kerberos realm. If this value is @code{#f} then a realm must be specified with every Kerberos principal when invoking programs such as @command{kinit}." -msgstr "" +msgstr "Este campo debe ser una cadena que identifique el dominio predeterminado de Kerberos para los clientes. Debería proporcionar el nombre de su dominio Kerberos. Si este valor es @code{#f}, el dominio debe especificarse en cada principal de Kerberos cuando se invoquen programas como @command{kinit}." #. type: code{#1} #: doc/guix.texi:18049 @@ -34994,7 +34983,7 @@ msgstr "realms" #. type: table #: doc/guix.texi:18054 msgid "This should be a non-empty list of @code{krb5-realm} objects, which clients may access. Normally, one of them will have a @code{name} field matching the @code{default-realm} field." -msgstr "" +msgstr "Debe ser una lista no vacía de objetos @code{krb5-realm}, accesibles por los clientes. Normalmente, uno de ellos tendrá un campo @code{name} que corresponda con el campo @code{default-realm}." #. type: subsubheading #: doc/guix.texi:18058 @@ -35008,10 +34997,11 @@ msgstr "Servicio PAM krb5" msgid "pam-krb5" msgstr "pam-krb5" +# FUZZY #. type: Plain text #: doc/guix.texi:18065 msgid "The @code{pam-krb5} service allows for login authentication and password management via Kerberos. You will need this service if you want PAM enabled applications to authenticate users using Kerberos." -msgstr "" +msgstr "El servicio @code{pam-krb5} le permite la identificación para el ingreso al sistema y la gestión de contraseñas mediante Kerberos. Este servicio es necesario si desea que aplicaciones que permiten PAM lleven a cabo la identificación de usuarias mediante el uso de Kerberos." #. type: defvr #: doc/guix.texi:18066 @@ -35052,10 +35042,11 @@ msgstr "El paquete pam-krb5 usado." msgid "@code{minimum-uid} (default: @code{1000})" msgstr "@code{minimum-uid} (predeterminado: @code{1000})" +# FUZZY #. type: table #: doc/guix.texi:18080 msgid "The smallest user ID for which Kerberos authentications should be attempted. Local accounts with lower values will silently fail to authenticate." -msgstr "" +msgstr "El ID de usuaria mínimo con el que se permitirán los intentos de identificación con Kerberos. El proceso de identificación de las cuentas locales con valores menores fallará de manera silenciosa." #. type: cindex #: doc/guix.texi:18086 @@ -35217,10 +35208,11 @@ msgstr "Especifica el id de grupo con el que debe ejecutarse el daemon." msgid "{@code{nslcd-configuration} parameter} log-option log" msgstr "{parámetro de @code{nslcd-configuration}} opcion-registro log" +# FUZZY #. type: deftypevr #: doc/guix.texi:18162 msgid "This option controls the way logging is done via a list containing SCHEME and LEVEL. The SCHEME argument may either be the symbols \"none\" or \"syslog\", or an absolute file name. The LEVEL argument is optional and specifies the log level. The log level may be one of the following symbols: \"crit\", \"error\", \"warning\", \"notice\", \"info\" or \"debug\". All messages with the specified log level or higher are logged." -msgstr "" +msgstr "Esta opción controla la forma en la que se realiza el registro a través de una lista que contiene ESQUEMA y NIVEL. El parámetro ESQUEMA puede ser o bien los símbolos \"none\" o \"syslog\", o la ruta absoluta de un fichero. El parámetro NIVEL es opcional y especifica el nivel de registro. El nivel de registro puede ser uno de los siguientes símbolos: \"crit\", \"error\", \"warning\", \"notice\", \"info\" o \"debug\". Se registran todos los mensajes con el nivel especificado o uno superior." #. type: deftypevr #: doc/guix.texi:18164 @@ -35233,10 +35225,11 @@ msgstr "El valor predeterminado es @samp{(\"/var/log/nslcd\" info)}." msgid "{@code{nslcd-configuration} parameter} list uri" msgstr "{parámetro de @code{nslcd-configuration}} lista uri" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18170 msgid "The list of LDAP server URIs. Normally, only the first server will be used with the following servers as fall-back." -msgstr "" +msgstr "La lista de URI de servidores LDAP. Normalmente, únicamente se usará el primer servidor y los siguientes se usan en caso de fallo." #. type: deftypevr #: doc/guix.texi:18172 @@ -35252,7 +35245,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string ldap-version" #. type: deftypevr #: doc/guix.texi:18178 msgid "The version of the LDAP protocol to use. The default is to use the maximum version supported by the LDAP library." -msgstr "" +msgstr "La versión del protocolo LDAP usada. El valor predeterminado usa la versión máxima implementada por la biblioteca LDAP." #. type: deftypevr #: doc/guix.texi:18183 @@ -35263,7 +35256,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string binddn" #. type: deftypevr #: doc/guix.texi:18186 msgid "Specifies the distinguished name with which to bind to the directory server for lookups. The default is to bind anonymously." -msgstr "" +msgstr "Especifica el nombre distinguido con el que enlazarse en el servidor de directorio para las búsquedas. El valor predeterminado se enlaza de forma anónima." #. type: deftypevr #: doc/guix.texi:18191 @@ -35271,10 +35264,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string bindpw" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string bindpw" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18194 msgid "Specifies the credentials with which to bind. This option is only applicable when used with binddn." -msgstr "" +msgstr "Especifica las credenciales usadas para el enlace. Esta opción tiene utilidad únicamente cuando se usa con binddn." #. type: deftypevr #: doc/guix.texi:18199 @@ -35282,10 +35276,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmoddn" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string rootpwmoddn" +# FUZZY #. type: deftypevr #: doc/guix.texi:18202 msgid "Specifies the distinguished name to use when the root user tries to modify a user's password using the PAM module." -msgstr "" +msgstr "Especifica el nombre distinguido usado cuando la usuaria root intenta modificar la contraseña de una usuaria mediante el módulo de PAM." #. type: deftypevr #: doc/guix.texi:18207 @@ -35293,10 +35288,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmodpw" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string rootpwmodpw" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18211 msgid "Specifies the credentials with which to bind if the root user tries to change a user's password. This option is only applicable when used with rootpwmoddn" -msgstr "" +msgstr "Especifica las credenciales con las que enlazarse si la usuaria root intenta cambiar la contraseña de una usuaria. Esta opción tiene utilidad únicamente cuando se usa con rootpwmoddn." #. type: deftypevr #: doc/guix.texi:18216 @@ -35304,11 +35300,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-mech" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string sasl-mech" +# FUZZY #. type: deftypevr #: doc/guix.texi:18219 -#, fuzzy msgid "Specifies the SASL mechanism to be used when performing SASL authentication." -msgstr "Especifica el o los grupos a usar para la identificación del grupo @code{@@SYSTEM}." +msgstr "Especifica el mecanismo de SASL usado cuando se realice la identificación con SASL." #. type: deftypevr #: doc/guix.texi:18224 @@ -35316,11 +35312,11 @@ msgstr "Especifica el o los grupos a usar para la identificación del grupo @cod msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-realm" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string sasl-realm" +# FUZZY #. type: deftypevr #: doc/guix.texi:18226 -#, fuzzy msgid "Specifies the SASL realm to be used when performing SASL authentication." -msgstr "Especifica el o los grupos a usar para la identificación del grupo @code{@@SYSTEM}." +msgstr "Especifica el dominio de SASL usado cuando se realice la identificación con SASL." #. type: deftypevr #: doc/guix.texi:18231 @@ -35331,9 +35327,8 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string sasl-authcid" # FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18234 -#, fuzzy msgid "Specifies the authentication identity to be used when performing SASL authentication." -msgstr "Especifica si se usará cifrado para peticiones con identificación." +msgstr "Especifica la identidad de verificación usada cuando se realice la identificación con SASL." #. type: deftypevr #: doc/guix.texi:18239 @@ -35344,9 +35339,8 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string sasl-authzid" # FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18242 -#, fuzzy msgid "Specifies the authorization identity to be used when performing SASL authentication." -msgstr "Especifica si se usará cifrado para peticiones con identificación." +msgstr "Especifica la identidad de autorización usada cuando se realice la identificación con SASL." #. type: deftypevr #: doc/guix.texi:18247 @@ -35354,10 +35348,11 @@ msgstr "Especifica si se usará cifrado para peticiones con identificación." msgid "{@code{nslcd-configuration} parameter} maybe-boolean sasl-canonicalize?" msgstr "{parámetro de @code{nslcd-configuration}} maybe-boolean sasl-canonicalize?" +# FUZZY #. type: deftypevr #: doc/guix.texi:18252 msgid "Determines whether the LDAP server host name should be canonicalised. If this is enabled the LDAP library will do a reverse host name lookup. By default, it is left up to the LDAP library whether this check is performed or not." -msgstr "" +msgstr "Determina si el nombre de máquina del servidor LDAP debe transformarse a su forma canónica. Si se activa, la librería LDAP realizará una búsqueda inversa de nombre de máquina. De manera predeterminada, se delega en la biblioteca la decisión de realizar esta comprobación o no." #. type: deftypevr #: doc/guix.texi:18257 @@ -35365,10 +35360,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string krb5-ccname" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string krb5-ccname" +# FUZZY #. type: deftypevr #: doc/guix.texi:18259 msgid "Set the name for the GSS-API Kerberos credentials cache." -msgstr "" +msgstr "Establece el nombre para la caché de credenciales GSS-API de Kerberos." #. type: deftypevr #: doc/guix.texi:18264 @@ -35411,7 +35407,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-deref-option deref" #. type: deftypevr #: doc/guix.texi:18283 msgid "Specifies the policy for dereferencing aliases. The default policy is to never dereference aliases." -msgstr "" +msgstr "Especifica la política para seguir las referencias de los alias. La política predeterminada es nunca seguir las referencias de los alias." #. type: deftypevr #: doc/guix.texi:18288 @@ -35422,7 +35418,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-boolean referrals" #. type: deftypevr #: doc/guix.texi:18291 msgid "Specifies whether automatic referral chasing should be enabled. The default behaviour is to chase referrals." -msgstr "" +msgstr "Especifica si el seguimiento automático de referencias debe activarse. El seguimiento de referencias es comportamiento predeterminado." #. type: deftypevr #: doc/guix.texi:18296 @@ -35442,10 +35438,11 @@ msgstr "Esta opción permite que se busquen atributos personalizados en vez de l msgid "{@code{nslcd-configuration} parameter} list-of-filter-entries filters" msgstr "{parámetro de @code{nslcd-configuration}} lista-asociación-entrada filters" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18309 msgid "A list of filters consisting of the name of a map to which the filter applies and an LDAP search filter expression." -msgstr "" +msgstr "Una lista de filtros que consiste en el nombre de una asociación a la que se aplica el filtro y una expresión de filtrado de búsqueda de LDAP." #. type: deftypevr #: doc/guix.texi:18314 @@ -35456,7 +35453,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-number bind-timelimit" #. type: deftypevr #: doc/guix.texi:18317 msgid "Specifies the time limit in seconds to use when connecting to the directory server. The default value is 10 seconds." -msgstr "" +msgstr "Especifica el tiempo límite usado en segundos durante la conexión al servidor de directorio. El valor predeterminado son 10 segundos." #. type: deftypevr #: doc/guix.texi:18322 @@ -35464,10 +35461,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-number timelimit" msgstr "{parámetro de @code{nslcd-configuration}} maybe-number timelimit" +# FUZZY #. type: deftypevr #: doc/guix.texi:18326 msgid "Specifies the time limit (in seconds) to wait for a response from the LDAP server. A value of zero, which is the default, is to wait indefinitely for searches to be completed." -msgstr "" +msgstr "Especifica el tiempo límite (en segundos) durante el que se esperará una respuesta del servidor LDAP. Un valor de cero, por omisión, hace que se espere de manera indefinida hasta que las búsquedas se completen." #. type: deftypevr #: doc/guix.texi:18331 @@ -35475,10 +35473,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-number idle-timelimit" msgstr "{parámetro de @code{nslcd-configuration}} maybe-number idle-timelimit" +# FUZZY #. type: deftypevr #: doc/guix.texi:18335 msgid "Specifies the period if inactivity (in seconds) after which the con‐ nection to the LDAP server will be closed. The default is not to time out connections." -msgstr "" +msgstr "Especifica el periodo de inactividad (en segundos) tras el cual se cerrará la conexión con el servidor LDAP. El valor predeterminado no cierra las conexiones por inactividad." #. type: deftypevr #: doc/guix.texi:18340 @@ -35486,10 +35485,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-sleeptime" msgstr "{parámetro de @code{nslcd-configuration}} maybe-number reconnect-sleeptime" +# FUZZY #. type: deftypevr #: doc/guix.texi:18344 msgid "Specifies the number of seconds to sleep when connecting to all LDAP servers fails. By default one second is waited between the first failure and the first retry." -msgstr "" +msgstr "Especifica en número de segundos que se dormirá cuando falle la conexión a todos los servidores LDAP. De manera predeterminada se espera un segundo entre el primer fallo y el primer reintento." #. type: deftypevr #: doc/guix.texi:18349 @@ -35497,10 +35497,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-retrytime" msgstr "{parámetro de @code{nslcd-configuration}} maybe-number reconnect-retrytime" +# FUZZY #. type: deftypevr #: doc/guix.texi:18353 msgid "Specifies the time after which the LDAP server is considered to be permanently unavailable. Once this time is reached retries will be done only once per this time period. The default value is 10 seconds." -msgstr "" +msgstr "Especifica el tiempo tras el cual el servidor LDAP se considera no disponible de manera permanente. Una vez se alcance este tiempo, los reintentos se realizarán una vez en cada periodo de tiempo igual al especificado. El valor predeterminado es 10 segundos." #. type: deftypevr #: doc/guix.texi:18358 @@ -35508,10 +35509,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-ssl-option ssl" msgstr "{parámetro de @code{nslcd-configuration}} maybe-ssl-option ssl" +# FUZZY #. type: deftypevr #: doc/guix.texi:18362 msgid "Specifies whether to use SSL/TLS or not (the default is not to). If 'start-tls is specified then StartTLS is used rather than raw LDAP over SSL." -msgstr "" +msgstr "Determina si se usa SSL/TLS o no (el comportamiento predeterminado es no hacerlo). Si se especifica 'start-tls, se usa StartTLS en vez de la transmisión del protocolo LDAP en crudo sobre SSL." #. type: deftypevr #: doc/guix.texi:18367 @@ -35522,7 +35524,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-tls-reqcert-option tls- #. type: deftypevr #: doc/guix.texi:18370 msgid "Specifies what checks to perform on a server-supplied certificate. The meaning of the values is described in the ldap.conf(5) manual page." -msgstr "" +msgstr "Especifica las comprobaciones que se deben realizar con un certificado proporcionado por el servidor. El significado de los valores se describe en la página de manual de ldap.conf(5). " #. type: deftypevr #: doc/guix.texi:18375 @@ -35533,7 +35535,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string tls-cacertdir" #. type: deftypevr #: doc/guix.texi:18378 msgid "Specifies the directory containing X.509 certificates for peer authen‐ tication. This parameter is ignored when using GnuTLS." -msgstr "" +msgstr "Especifica el directorio que contiene los certificados X.509 para la identificación de pares. Este parámetro se ignora si se usa GnuTLS." #. type: deftypevr #: doc/guix.texi:18383 @@ -35541,11 +35543,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertfile" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string tls-cacertfile" +# FUZZY #. type: deftypevr #: doc/guix.texi:18385 -#, fuzzy msgid "Specifies the path to the X.509 certificate for peer authentication." -msgstr "Especifica el o los grupos a usar para la identificación del grupo @code{@@SYSTEM}." +msgstr "Especifica la ruta al certificado X.509 para la identificación de pares." #. type: deftypevr #: doc/guix.texi:18390 @@ -35556,7 +35558,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string tls-randfile" #. type: deftypevr #: doc/guix.texi:18393 msgid "Specifies the path to an entropy source. This parameter is ignored when using GnuTLS." -msgstr "" +msgstr "Especifica la ruta de la fuente de entropía. Este parámetro se ignora si se usa GnuTLS." #. type: deftypevr #: doc/guix.texi:18398 @@ -35566,9 +35568,8 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string tls-ciphers" #. type: deftypevr #: doc/guix.texi:18400 -#, fuzzy msgid "Specifies the ciphers to use for TLS as a string." -msgstr "Especifica qué protocolos deben usarse para compartir las impresoras locales." +msgstr "Especifica como una cadena los algoritmos de cifrado usados para TLS." #. type: deftypevr #: doc/guix.texi:18405 @@ -35579,7 +35580,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string tls-cert" #. type: deftypevr #: doc/guix.texi:18408 msgid "Specifies the path to the file containing the local certificate for client TLS authentication." -msgstr "" +msgstr "Especifica la ruta al fichero que contiene el certificado local para la identificación de clientes con TLS." #. type: deftypevr #: doc/guix.texi:18413 @@ -35590,7 +35591,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string tls-key" #. type: deftypevr #: doc/guix.texi:18416 msgid "Specifies the path to the file containing the private key for client TLS authentication." -msgstr "" +msgstr "Especifica la ruta al fichero que contiene la clave privada para la identificación de clientes con TLS." #. type: deftypevr #: doc/guix.texi:18421 @@ -35598,10 +35599,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-number pagesize" msgstr "{parámetro de @code{nslcd-configuration}} maybe-number pagesize" +# FUZZY FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18425 msgid "Set this to a number greater than 0 to request paged results from the LDAP server in accordance with RFC2696. The default (0) is to not request paged results." -msgstr "" +msgstr "Proporcione un valor superior a 0 para solicitar al servidor LDAP que proporcione los resultados divididos en páginas de acuerdo con el RFC2696. El valor predeterminado (0) no solicita resultados divididos en páginas." #. type: deftypevr #: doc/guix.texi:18430 @@ -35609,10 +35611,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-ignore-users-option nss-initgroups-ignoreusers" msgstr "{parámetro de @code{nslcd-configuration}} maybe-ignore-users-option nss-initgroups-ignoreusers" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18434 msgid "This option prevents group membership lookups through LDAP for the specified users. Alternatively, the value 'all-local may be used. With that value nslcd builds a full list of non-LDAP users on startup." -msgstr "" +msgstr "Esta opción previene las búsquedas de pertenencia a grupos a través de LDAP sobre las usuarias especificadas. De manera alternativa, se puede usar el valor 'all-local. Con dicho valor nslcd construye al inicio una lista completa de usuarias que no se encuentren en LDAP." #. type: deftypevr #: doc/guix.texi:18439 @@ -35620,10 +35623,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-number nss-min-uid" msgstr "{parámetro de @code{nslcd-configuration}} maybe-number nss-min-uid" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18442 msgid "This option ensures that LDAP users with a numeric user id lower than the specified value are ignored." -msgstr "" +msgstr "Esta opción hace que se ignoren las usuarias de LDAP con un identificador numérico inferior al valor especificado." #. type: deftypevr #: doc/guix.texi:18447 @@ -35631,10 +35635,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-number nss-uid-offset" msgstr "{parámetro de @code{nslcd-configuration}} maybe-number nss-uid-offset" +# FUZZY #. type: deftypevr #: doc/guix.texi:18450 msgid "This option specifies an offset that is added to all LDAP numeric user ids. This can be used to avoid user id collisions with local users." -msgstr "" +msgstr "Esta opción especifica un desplazamiento que se añade a todos los identificadores numéricos de usuaria de LDAP. Puede usarse para evitar colisiones de identificadores con usuarias locales." #. type: deftypevr #: doc/guix.texi:18455 @@ -35645,7 +35650,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-number nss-gid-offset" #. type: deftypevr #: doc/guix.texi:18458 msgid "This option specifies an offset that is added to all LDAP numeric group ids. This can be used to avoid user id collisions with local groups." -msgstr "" +msgstr "Esta opción especifica un desplazamiento que se añade a todos los identificadores numéricos de grupos de LDAP. Puede usarse para evitar cololisiones de identificadores con grupos locales." #. type: deftypevr #: doc/guix.texi:18463 @@ -35656,7 +35661,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-boolean nss-nested-grou #. type: deftypevr #: doc/guix.texi:18469 msgid "If this option is set, the member attribute of a group may point to another group. Members of nested groups are also returned in the higher level group and parent groups are returned when finding groups for a specific user. The default is not to perform extra searches for nested groups." -msgstr "" +msgstr "Cuando se activa esta opción, un grupo puede contener como atributo la pertenencia a otro grupo. Los miembros de grupos anidados se devuelven en el grupo superior y los grupos superiores se devuelven cuando se busquen los grupos de una usuaria específica. El valor predeterminado determina que no se realicen búsquedas adicionales para grupos anidados." #. type: deftypevr #: doc/guix.texi:18474 @@ -35664,10 +35669,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-getgrent-skipmembers" msgstr "{parámetro de @code{nslcd-configuration}} maybe-boolean nss-getgrent-skipmembers" +# FUZZY #. type: deftypevr #: doc/guix.texi:18479 msgid "If this option is set, the group member list is not retrieved when looking up groups. Lookups for finding which groups a user belongs to will remain functional so the user will likely still get the correct groups assigned on login." -msgstr "" +msgstr "Cuando se activa esta opción, la lista de miembros de un grupo no se obtiene en las búsquedas de grupos. Las búsquedas que busquen los grupos de los que una usuaria es miembro continuarán funcionando de manera que probablemente a la usuaria se le asignen los grupos correctos durante el ingreso al sistema." #. type: deftypevr #: doc/guix.texi:18484 @@ -35675,10 +35681,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-disable-enumeration" msgstr "{parámetro de @code{nslcd-configuration}} maybe-boolean nss-disable-enumeration" +# FUZZY #. type: deftypevr #: doc/guix.texi:18490 msgid "If this option is set, functions which cause all user/group entries to be loaded from the directory will not succeed in doing so. This can dramatically reduce LDAP server load in situations where there are a great number of users and/or groups. This option is not recommended for most configurations." -msgstr "" +msgstr "Cuando se activa esta opción, las funciones que provocan la carga de todas las entradas usuaria/grupo del directorio no tendrán éxito al realizarlo. Esto puede reducir de forma dramática la carga del servidor LDAP cuando existe un gran número de usuarias y/o grupos. Esta opción no se recomienda para la mayoría de las configuraciones." #. type: deftypevr #: doc/guix.texi:18495 @@ -35686,10 +35693,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string validnames" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string validnames" +# FUZZY #. type: deftypevr #: doc/guix.texi:18499 msgid "This option can be used to specify how user and group names are verified within the system. This pattern is used to check all user and group names that are requested and returned from LDAP." -msgstr "" +msgstr "Esta opción puede usarse para especificar cómo se verifican en el sistema los nombres de usuaria y grupo. Este patrón se usa para comprobar todos los nombres de usuarias y grupos que se soliciten y proporcionen a través de LDAP." #. type: deftypevr #: doc/guix.texi:18504 @@ -35697,10 +35705,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-boolean ignorecase" msgstr "{parámetro de @code{nslcd-configuration}} maybe-boolean ignorecase" +# FUZZY FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:18509 msgid "This specifies whether or not to perform searches using case-insensitive matching. Enabling this could open up the system to authorization bypass vulnerabilities and introduce nscd cache poisoning vulnerabilities which allow denial of service." -msgstr "" +msgstr "Especifica si se realizarán las búsquedas sin diferenciar mayúsculas y minúsculas o no. Su activación puede abrir puntos vulnerables que permitan la omisión de las comprobaciones de autorización e introducir vulnerabilidades que permitan el envenenamiento de la caché de nscd, lo que puede provocar la denegación del servicio." #. type: deftypevr #: doc/guix.texi:18514 @@ -35711,7 +35720,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-boolean pam-authc-ppoli #. type: deftypevr #: doc/guix.texi:18517 msgid "This option specifies whether password policy controls are requested and handled from the LDAP server when performing user authentication." -msgstr "" +msgstr "Esta opción determina si los controles de la política de contraseñas se solicitan y manejan desde el servidor LDAP cuando se realice la identificación de usuarias." #. type: deftypevr #: doc/guix.texi:18522 @@ -35719,10 +35728,11 @@ msgstr "" msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authc-search" msgstr "{parámetro de @code{nslcd-configuration}} maybe-string pam-authc-search" +# FUZZY #. type: deftypevr #: doc/guix.texi:18528 msgid "By default nslcd performs an LDAP search with the user's credentials after BIND (authentication) to ensure that the BIND operation was successful. The default search is a simple check to see if the user's DN exists. A search filter can be specified that will be used instead. It should return at least one entry." -msgstr "" +msgstr "De manera predeterminada nslcd realiza una búsqueda LDAP con las credenciales de la usuaria tras la orden BIND (identificación) para asegurarse de que la opción BIND fue satisfactoria. La busqueda predeterminada es una simple comprobación de la existencia del DN de la usuaria. Se puede especificar un filtro de búsqueda que se usará en vez de dicha búsqueda. Debe devolver al menos una entrada." #. type: deftypevr #: doc/guix.texi:18533 @@ -35733,7 +35743,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string pam-authz-search #. type: deftypevr #: doc/guix.texi:18537 msgid "This option allows flexible fine tuning of the authorisation check that should be performed. The search filter specified is executed and if any entries match, access is granted, otherwise access is denied." -msgstr "" +msgstr "Esta opción permite la configuración detallada de las comprobaciones de autorización que deben realizarse. El filtro de búsqueda especificado es ejecutado, y si cualquier entrada corresponde se permite el acceso, el cual se deniega en caso contrario." #. type: deftypevr #: doc/guix.texi:18542 @@ -35744,7 +35754,7 @@ msgstr "{parámetro de @code{nslcd-configuration}} maybe-string pam-password-pro #. type: deftypevr #: doc/guix.texi:18547 msgid "If this option is set password modification using pam_ldap will be denied and the specified message will be presented to the user instead. The message can be used to direct the user to an alternative means of changing their password." -msgstr "" +msgstr "Si se proporciona esta opción, se denegará la modificación de contraseñas a través de pam_ldap y en vez de ello el mensaje especificado se presentará a la usuaria. El mensaje puede usarse para redirigir a la usuaria a un medio alternativo para el cambio de su contraseña." #. type: deftypevr #: doc/guix.texi:18552 @@ -35795,9 +35805,8 @@ msgstr "{Variable Scheme} httpd-service-type" # FUZZY #. type: deffn #: doc/guix.texi:18577 -#, fuzzy msgid "Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}). The value for this service type is a @code{httpd-configuration} record." -msgstr "Este es el tipo de servicio para el servicio @uref{https://memcached.org/, Memcached}, que proporciona caché distribuida en memoria. El valor para este tipo de servicio es un objeto @code{memcached-configuration}." +msgstr "Tipo de servicio para el servidor @uref{https://httpd.apache.org/, Apache HTTP} (@dfn{httpd}). El valor para este tipo de servicio es un registro @code{httpd-configuration}." #. type: deffn #: doc/guix.texi:18579 doc/guix.texi:18760 @@ -35822,11 +35831,11 @@ msgstr "" " (server-name \"www.example.com\")\n" " (document-root \"/srv/http/www.example.com\")))))\n" +# FUZZY #. type: deffn #: doc/guix.texi:18591 -#, fuzzy msgid "Other services can also extend the @code{httpd-service-type} to add to the configuration." -msgstr "En ambos casos el resultado es una instancia de @code{openssh-service-type} con la configuración predeterminada." +msgstr "Otros servicios también pueden exteneder el tipo @code{httpd-service-type} para añadir su contribución a la configuración." #. type: example #: doc/guix.texi:18600 doc/guix.texi:18740 @@ -35917,7 +35926,7 @@ msgstr "El nombre del módulo." #. type: table #: doc/guix.texi:18638 msgid "The file for the module. This can be relative to the httpd package being used, the absolute location of a file, or a G-expression for a file within the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}." -msgstr "" +msgstr "El fichero para el módulo. La ruta puede ser relativa al paquete httpd usado, la ruta absoluta de un fichero, o una expresión-G para un fichero dentro del almacén, por ejemplo @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}." #. type: defvr #: doc/guix.texi:18642 @@ -35947,15 +35956,16 @@ msgstr "Este tipo de datos representa un fichero de configuración para el servi msgid "@code{modules} (default: @code{%default-httpd-modules})" msgstr "@code{modules} (predeterminados: @code{%default-httpd-modules})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:18653 msgid "The modules to load. Additional modules can be added here, or loaded by additional configuration." -msgstr "" +msgstr "Módulos que deben cargarse. Aquí pueden añadir módulos adicionales, o que se carguen en la configuración adicional." #. type: table #: doc/guix.texi:18656 msgid "For example, in order to handle requests for PHP files, you can use Apache’s @code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:" -msgstr "" +msgstr "Por ejemplo, para manejar las peticiones de ficheros PHP, puede usar el módulo @code{mod_proxy_fcgi} de Apache junto con @code{php-fpm-service-type}:" #. type: example #: doc/guix.texi:18678 @@ -35988,10 +35998,10 @@ msgstr "" " (httpd-config-file\n" " (modules (cons*\n" " (httpd-module\n" -" (name \"proxy_module\")\n" +" (name \"modulo_proxy\")\n" " (file \"modules/mod_proxy.so\"))\n" " (httpd-module\n" -" (name \"proxy_fcgi_module\")\n" +" (name \"module_proxy_fcgi\")\n" " (file \"modules/mod_proxy_fcgi.so\"))\n" " %default-httpd-modules))\n" " (extra-config (list \"\\\n" @@ -36009,10 +36019,11 @@ msgstr "" msgid "@code{server-root} (default: @code{httpd})" msgstr "@code{server-root} (predeterminado: @code{httpd})" +# FUZZY #. type: table #: doc/guix.texi:18684 msgid "The @code{ServerRoot} in the configuration file, defaults to the httpd package. Directives including @code{Include} and @code{LoadModule} are taken as relative to the server root." -msgstr "" +msgstr "El campo @code{ServerRoot} (raíz del servidor) en el fichero de configuración, cuyo valor predeterminado apunta al paquete httpd. Directivas como @code{Include} and @code{LoadModule} se interpretan como relativas a la raíz del servidor." #. type: item #: doc/guix.texi:18685 @@ -36020,15 +36031,16 @@ msgstr "" msgid "@code{server-name} (default: @code{#f})" msgstr "@code{server-name} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:18689 msgid "The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to identify itself." -msgstr "" +msgstr "El campo @code{ServerName} (nombre del servidor) en el fichero de configuración, el cual se usa para especificar el esquema de peticiones, nombre de máquina y puerto que el servidor usa para su propia identificación." #. type: table #: doc/guix.texi:18693 msgid "This doesn't need to be set in the server config, and can be specifyed in virtual hosts. The default is @code{#f} to not specify a @code{ServerName}." -msgstr "" +msgstr "No es necesario proporcionar un valor en la configuración del servidor, y puede especificarse en las máquinas virtuales. El valor predeterminado es @code{#f} que no especifica un campo @code{ServerName}." #. type: item #: doc/guix.texi:18694 @@ -36051,12 +36063,12 @@ msgstr "@code{listen} (predeterminado: @code{'(\"80\")})" #. type: table #: doc/guix.texi:18702 msgid "The list of values for the @code{Listen} directives in the config file. The value should be a list of strings, when each string can specify the port number to listen on, and optionally the IP address and protocol to use." -msgstr "" +msgstr "La lista de valores para las directivas @code{Listen} en el fichero de configuración. El valor debe ser una lista de cadenas, donde cada cadena puede especificar el número de puerto en el que se escucha, y de manera opcional la dirección IP y el protocolo usados." #. type: table #: doc/guix.texi:18707 msgid "The @code{PidFile} to use. This should match the @code{pid-file} set in the @code{httpd-configuration} so that the Shepherd service is configured correctly." -msgstr "" +msgstr "El fichero de PID usado (@code{PidFile}). Debe corresponder con el valor de @code{pid-file} proporcionado en @code{httpd-configuration} de manera que el servicio de Shepherd se configure de manera correcta." #. type: item #: doc/guix.texi:18708 @@ -36064,11 +36076,11 @@ msgstr "" msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})" msgstr "@code{error-log} (predeterminado: @code{\"/var/log/httpd/error_log\"})" +# FUZZY #. type: table #: doc/guix.texi:18710 -#, fuzzy msgid "The @code{ErrorLog} to which the server will log errors." -msgstr "El grupo como el que el servidor responderá a las peticiones." +msgstr "El fichero @code{ErrorLog} en el que el servidor registrará los errores." #. type: item #: doc/guix.texi:18711 @@ -36100,14 +36112,13 @@ msgstr "@code{extra-config} (predeterminadas: @code{(list \"TypesConfig etc/http #. type: table #: doc/guix.texi:18720 -#, fuzzy msgid "A flat list of strings and G-expressions which will be added to the end of the configuration file." -msgstr "Una lista de cadenas u objetos «tipo-fichero» que denota otros ficheros que deben incluirse al inicio del fichero de configuración." +msgstr "Una lista de cadenas y expresiones-G que se añadirán al final del fichero de configuración." #. type: table #: doc/guix.texi:18723 msgid "Any values which the service is extended with will be appended to this list." -msgstr "" +msgstr "Los valores con los que se extiende el servicio se añaden al final de esta lista." #. type: deffn #: doc/guix.texi:18727 @@ -36117,15 +36128,14 @@ msgstr "{Tipo de datos} httpd-virtualhost" #. type: deffn #: doc/guix.texi:18729 -#, fuzzy msgid "This data type represents a virtualhost configuration block for the httpd service." -msgstr "Este tipo de datos representa la configuración del servicio httpd." +msgstr "Este tipo de datos representa un bloque de configuración de máquina virtual del servicio httpd." +# FUZZY #. type: deffn #: doc/guix.texi:18731 -#, fuzzy msgid "These should be added to the extra-config for the httpd-service." -msgstr "Este tipo de datos representa la configuración del servicio httpd." +msgstr "Se deben añadir a la configuración adicional extra-config del servicio httpd-service." #. type: code{#1} #: doc/guix.texi:18743 @@ -36136,7 +36146,7 @@ msgstr "addresses-and-ports" #. type: table #: doc/guix.texi:18745 msgid "The addresses and ports for the @code{VirtualHost} directive." -msgstr "" +msgstr "Las direcciones y puertos de la directiva @code{VirtualHost}." #. type: code{#1} #: doc/guix.texi:18746 @@ -36147,7 +36157,7 @@ msgstr "contents" #. type: table #: doc/guix.texi:18749 msgid "The contents of the @code{VirtualHost} directive, this should be a list of strings and G-expressions." -msgstr "" +msgstr "El contenido de la directiva @code{VirtualHost}; debe ser una lista de cadenas y expresiones-G." #. type: subsubheading #: doc/guix.texi:18753 @@ -36187,7 +36197,7 @@ msgstr "" #. type: deffn #: doc/guix.texi:18773 msgid "In addition to adding server blocks to the service configuration directly, this service can be extended by other services to add server blocks, as in this example:" -msgstr "" +msgstr "Además de añadiendo bloques de servidor a la configuración del servicio de manera directa, este servicio puede extenderse con otros servicios para añadir bloques de servidor, como en este ejemplo:" #. type: example #: doc/guix.texi:18779 @@ -36198,9 +36208,9 @@ msgid "" " (root \"/srv/http/extra-website\")\n" " (try-files (list \"$uri\" \"$uri/index.html\")))))\n" msgstr "" -"(simple-service 'mi-servidor-extra nginx-service-type\n" +"(simple-service 'mi-servidor-adicional nginx-service-type\n" " (list (nginx-server-configuration\n" -" (root \"/srv/http/sitio-extra\")\n" +" (root \"/srv/http/sitio-adicional\")\n" " (try-files (list \"$uri\" \"$uri/index.html\")))))\n" # FUZZY @@ -36218,7 +36228,7 @@ msgstr "{Tipo de datos} nginx-configuration" #. type: deffn #: doc/guix.texi:18795 msgid "This data type represents the configuration for NGinx. Some configuration can be done through this and the other provided record types, or alternatively, a config file can be provided." -msgstr "" +msgstr "Este tipo de datos representa la configuración para NGinx. Alguna configuración puede llevarse a cabo a través de este y otros tipos de registro proporcionados, o de manera alternativa se puede proporcionar un fichero de configuración." #. type: item #: doc/guix.texi:18797 @@ -36240,9 +36250,8 @@ msgstr "@code{log-directory} (predeterminado: @code{\"/var/log/nginx\"})" # FUZZY #. type: table #: doc/guix.texi:18802 -#, fuzzy msgid "The directory to which NGinx will write log files." -msgstr "El directorio al que se debe asociar el sistema de ficheros." +msgstr "Directorio en el que NGinx escribirá los ficheros de registro." #. type: item #: doc/guix.texi:18803 @@ -36253,9 +36262,8 @@ msgstr "@code{run-directory} (predeterminado: @code{\"/var/run/nginx\"})" # FUZZY #. type: table #: doc/guix.texi:18806 -#, fuzzy msgid "The directory in which NGinx will create a pid file, and write temporary files." -msgstr "Directorio en el que se almacena los ficheros de base de datos y relacionados." +msgstr "Directorio en el que NGinx crea el fichero de PID, y escribe ficheros temporales." #. type: item #: doc/guix.texi:18807 @@ -36263,15 +36271,16 @@ msgstr "Directorio en el que se almacena los ficheros de base de datos y relacio msgid "@code{server-blocks} (default: @code{'()})" msgstr "@code{server-blocks} (predeterminados: @code{'()})" +# FUZZY #. type: table #: doc/guix.texi:18811 msgid "A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{}." -msgstr "" +msgstr "Una lista de @dfn{bloques de servidor} que se crearán en el fichero de configuración generado; los elementos deben ser del tipo @code{}." #. type: table #: doc/guix.texi:18815 msgid "The following example would setup NGinx to serve @code{www.example.com} from the @code{/srv/http/www.example.com} directory, without using HTTPS." -msgstr "" +msgstr "El ejemplo siguiente configura NGinx para proporcionar @code{www.example.com} a partir del directorio @code{/srv/http/www.example.com}, sin usar HTTPS." #. type: item #: doc/guix.texi:18824 @@ -36282,12 +36291,13 @@ msgstr "@code{upstream-blocks} (predeterminados: @code{'()})" #. type: table #: doc/guix.texi:18828 msgid "A list of @dfn{upstream blocks} to create in the generated configuration file, the elements should be of type @code{}." -msgstr "" +msgstr "Una lista de @dfn{bloques upstream} creada en el fichero de configuración generado, los elementos deben ser del tipo @code{}." +# FUZZY #. type: table #: doc/guix.texi:18835 msgid "Configuring upstreams through the @code{upstream-blocks} can be useful when combined with @code{locations} in the @code{} records. The following example creates a server configuration with one location configuration, that will proxy requests to a upstream configuration, which will handle requests with two servers." -msgstr "" +msgstr "La configuración de proveedores a través de @code{upstream-blocks} puede ser útil al combinarse con @code{location} en los registros @code{}. El siguiente ejemplo crea la configuración de un servidor con una configuración de ruta, que hará de intermediaria en las peticiones a la configuración de proveedores, que delegarán las peticiones en dos servidores." #. type: example #: doc/guix.texi:18854 @@ -36311,16 +36321,35 @@ msgid "" " (servers (list \"server1.example.com\"\n" " \"server2.example.com\")))))))\n" msgstr "" +"(service\n" +" nginx-service-type\n" +" (nginx-configuration\n" +" (server-blocks\n" +" (list (nginx-server-configuration\n" +" (server-name '(\"www.example.com\"))\n" +" (root \"/srv/http/www.example.com\")\n" +" (locations\n" +" (list\n" +" (nginx-location-configuration\n" +" (uri \"/ruta1\")\n" +" (body '(\"proxy_pass http://servidor-proxy;\"))))))))\n" +" (upstream-blocks\n" +" (list (nginx-upstream-configuration\n" +" (name \"servidor-proxy\")\n" +" (servers (list \"servidor1.example.com\"\n" +" \"servidor2.example.com\")))))))\n" +# FUZZY #. type: table #: doc/guix.texi:18862 msgid "If a configuration @var{file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}. For proper operation, these arguments should match what is in @var{file} to ensure that the directories are created when the service is activated." -msgstr "" +msgstr "Si se proporciona un fichero de configuración con @var{file}, se usará este, en vez de generar un fichero de configuración a partir de los parámetros @code{log-directory}, @code{run-directory}, @code{server-blocks} y @code{upstream-blocks} proporcionados. Para conseguir un funcionamiento adecuado, estos parámetros deben corresponder con el contenido de @var{file}, lo que asegura que los directorios se hayan creado durante la activación del servicio." +# FUZZY #. type: table #: doc/guix.texi:18866 msgid "This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts of the nginx-configuration record." -msgstr "" +msgstr "Esto puede ser útil si ya dispone de un fichero de configuración, o no es posible hacer lo que necesita con el resto de opciones del registro nginx-configuration." #. type: item #: doc/guix.texi:18867 @@ -36328,10 +36357,11 @@ msgstr "" msgid "@code{server-names-hash-bucket-size} (default: @code{#f})" msgstr "@code{server-names-hash-bucket-size} (predeterminado: @code{#f})" +# FUZZY FUZZY FUZZY #. type: table #: doc/guix.texi:18870 msgid "Bucket size for the server names hash tables, defaults to @code{#f} to use the size of the processors cache line." -msgstr "" +msgstr "Tamaño del cubo para las tablas hash de los nombres de servidor, cuyo valor predeterminado es @code{#f} para que se use el tamaño de la línea de caché de los procesadores." #. type: item #: doc/guix.texi:18871 @@ -36339,15 +36369,16 @@ msgstr "" msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})" msgstr "@code{server-names-hash-bucket-max-size} (predeterminado: @code{#f})" +# FUZZY FUZZY FUZZY #. type: table #: doc/guix.texi:18873 msgid "Maximum bucket size for the server names hash tables." -msgstr "" +msgstr "Tamaño máximo del cubo para las tablas hash de nombres de servidor." #. type: table #: doc/guix.texi:18877 msgid "Extra content for the @code{http} block. Should be string or a string valued G-expression." -msgstr "" +msgstr "Contenido adicional para el bloque @code{http}. Debe ser una cadena o una expresión-G que evalúe a una cadena." #. type: deftp #: doc/guix.texi:18881 @@ -36369,7 +36400,7 @@ msgstr "@code{listen} (predeterminadas: @code{'(\"80\" \"443 ssl\")})" #. type: table #: doc/guix.texi:18891 msgid "Each @code{listen} directive sets the address and port for IP, or the path for a UNIX-domain socket on which the server will accept requests. Both address and port, or only address or only port can be specified. An address may also be a hostname, for example:" -msgstr "" +msgstr "Cada directiva @code{listen} establece la dirección y el puerto para IP, o la ruta para un socket de dominio de UNIX sobre el que el servidor acepta peticiones. Se puede especificar tanto dirección y puerto como únicamente la dirección o únicamente el puerto. Una dirección puede ser también un nombre de máquina, por ejemplo:" #. type: example #: doc/guix.texi:18894 @@ -36383,10 +36414,11 @@ msgstr "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\ msgid "@code{server-name} (default: @code{(list 'default)})" msgstr "@code{server-name} (predeterminados: @code{(list 'default)})" +# FUZZY #. type: table #: doc/guix.texi:18899 msgid "A list of server names this server represents. @code{'default} represents the default server for connections matching no other server." -msgstr "" +msgstr "Una lista de nombres de servidor que este servidor representa. @code{'default} representa el servidor predeterminado para conexiones que no correspondan a otro servidor." #. type: item #: doc/guix.texi:18900 @@ -36408,7 +36440,7 @@ msgstr "@code{locations} (predeterminado: @code{'()})" #. type: table #: doc/guix.texi:18907 msgid "A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-configuration} records to use within this server block." -msgstr "" +msgstr "Una lista de registros @dfn{nginx-location-configuration} o @dfn{nginx-named-location-configuration} usados dentro de este bloque de servidor." #. type: item #: doc/guix.texi:18908 @@ -36416,10 +36448,11 @@ msgstr "" msgid "@code{index} (default: @code{(list \"index.html\")})" msgstr "@code{index} (predeterminado: @code{(list \"index.html\")})" +# FUZZY #. type: table #: doc/guix.texi:18911 msgid "Index files to look for when clients ask for a directory. If it cannot be found, Nginx will send the list of files in the directory." -msgstr "" +msgstr "Ficheros de índice buscados cuando los clientes solicitan un directorio. Si no se encuentra ninguno, Nginx enviará la lista de ficheros del directorio." #. type: item #: doc/guix.texi:18912 @@ -36430,7 +36463,7 @@ msgstr "@code{try-files} (predeterminado: @code{'()})" #. type: table #: doc/guix.texi:18915 msgid "A list of files whose existence is checked in the specified order. @code{nginx} will use the first file it finds to process the request." -msgstr "" +msgstr "Una lista de ficheros cuya existencia se comprueba en el orden especificado. @code{nginx} usará el primer fichero que encuentre para procesar la petición." #. type: item #: doc/guix.texi:18916 @@ -36441,7 +36474,7 @@ msgstr "@code{ssl-certificate} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:18919 msgid "Where to find the certificate for secure connections. Set it to @code{#f} if you don't have a certificate or you don't want to use HTTPS." -msgstr "" +msgstr "Lugar donde se encuentra el certificado para conexiones seguras. Proporcione @code{#f} si no dispone de un certificado o no desea usar HTTPS." #. type: item #: doc/guix.texi:18920 @@ -36452,7 +36485,7 @@ msgstr "@code{ssl-certificate-key} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:18923 msgid "Where to find the private key for secure connections. Set it to @code{#f} if you don't have a key or you don't want to use HTTPS." -msgstr "" +msgstr "Lugar donde se encuentra la clave privada para conexiones seguras. Proporcione @code{#f} si no dispone de una clave o no desea usar HTTPS." #. type: item #: doc/guix.texi:18924 @@ -36460,10 +36493,11 @@ msgstr "" msgid "@code{server-tokens?} (default: @code{#f})" msgstr "@code{server-tokens?} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:18926 msgid "Whether the server should add its configuration to response." -msgstr "" +msgstr "Determina si el servidor debe añadir su configuración a las respuestas." #. type: item #: doc/guix.texi:18927 @@ -36471,11 +36505,11 @@ msgstr "" msgid "@code{raw-content} (default: @code{'()})" msgstr "@code{raw-content} (predeterminado: @code{'()})" +# FUZZY #. type: table #: doc/guix.texi:18929 -#, fuzzy msgid "A list of raw lines added to the server block." -msgstr "Una lista de servidores remotos a los que conectarse." +msgstr "Una lista de líneas que se añadirán literalmente al bloque del servidor." #. type: deftp #: doc/guix.texi:18933 @@ -36499,10 +36533,11 @@ msgstr "Nombre para este grupo de servidores." msgid "servers" msgstr "servers" +# FUZZY #. type: table #: doc/guix.texi:18948 msgid "Specify the addresses of the servers in the group. The address can be specified as a IP address (e.g.@: @samp{127.0.0.1}), domain name (e.g.@: @samp{backend1.example.com}) or a path to a UNIX socket using the prefix @samp{unix:}. For addresses using an IP address or domain name, the default port is 80, and a different port can be specified explicitly." -msgstr "" +msgstr "Especifica las direcciones de los servidores en el grupo. Las direcciones se pueden proporcionar mediante direcciones IP (por ejemplo @samp{127.0.0.1}), nombres de dominio (por ejemplo @samp{maquina1.example.com}) o rutas de socket de UNIX mediante el prefijo @samp{unix:}. El puerto predeterminado para las direcciones IP o nombres de dominio es el 80, y se puede proporcionar un puerto de manera explícita." #. type: deftp #: doc/guix.texi:18952 @@ -36518,12 +36553,12 @@ msgstr "Tipo de datos que representa la configuración de un bloque @code{locati #. type: table #: doc/guix.texi:18959 msgid "URI which this location block matches." -msgstr "" +msgstr "URI a la que corresponde este bloque de location." #. type: anchor{#1} #: doc/guix.texi:18961 msgid "nginx-location-configuration body" -msgstr "nginx-location-configuration body" +msgstr "cuerpo de nginx-location-configuration" #. type: code{#1} #: doc/guix.texi:18961 doc/guix.texi:18982 @@ -36534,7 +36569,7 @@ msgstr "body" #. type: table #: doc/guix.texi:18968 msgid "Body of the location block, specified as a list of strings. This can contain many configuration directives. For example, to pass requests to a upstream server group defined using an @code{nginx-upstream-configuration} block, the following directive would be specified in the body @samp{(list \"proxy_pass http://upstream-name;\")}." -msgstr "" +msgstr "Cuerpo del bloque de localización «location», especificado como una lista de cadenas. Puede contener muchas directivas de configuración. Por ejemplo, para pasar las peticiones a un grupo de servidores proveedores definido mediante el uso de un bloque @code{nginx-upstream-configuration}, se especificaría la siguiente directiva en el cuerpo @samp{(list \"proxy_pass http://upstream-name;\")}." #. type: deftp #: doc/guix.texi:18972 @@ -36544,20 +36579,20 @@ msgstr "{Tipo de datos} nginx-named-location-configuration" #. type: deftp #: doc/guix.texi:18977 -#, fuzzy msgid "Data type representing the configuration of an nginx named location block. Named location blocks are used for request redirection, and not used for regular request processing. This type has the following parameters:" -msgstr "Tipo de datos que representa la configuración de un bloque @code{location} de nginx. Este tipo tiene los siguientes parámetros:" +msgstr "Tipo de datos que representa la configuración de un bloque de localización con nombre de nginx. Los bloques de localizaciones con nombre se usan para la redirección de peticiones, y no se usan para el procesamiento regular de peticiones. Este tipo tiene los siguientes parámetros:" +# FUZZY #. type: table #: doc/guix.texi:18981 -#, fuzzy msgid "Name to identify this location block." -msgstr "Nombre que identifica este bloque @code{location}." +msgstr "Nombre que identifica este bloque de dirección @code{location}." +# FUZZY #. type: table #: doc/guix.texi:18987 msgid "@xref{nginx-location-configuration body}, as the body for named location blocks can be used in a similar way to the @code{nginx-location-configuration body}. One restriction is that the body of a named location block cannot contain location blocks." -msgstr "" +msgstr "@xref{cuerpo de nginx-location-configuration}, como el cuerpo de los bloques de localizaciones con nombre puede usarse de manera similar al @code{cuerpo de nginx-location-configuration}. Una restricción es que el cuerpo de una localización con nombre no puede contener bloques de localizaciones." #. type: subsubheading #: doc/guix.texi:18991 @@ -36571,10 +36606,11 @@ msgstr "Caché Varnish" msgid "Varnish" msgstr "Varnish" +# FUZZY #. type: Plain text #: doc/guix.texi:18997 msgid "Varnish is a fast cache server that sits in between web applications and end users. It proxies requests from clients and caches the accessed URLs such that multiple requests for the same resource only creates one request to the back-end." -msgstr "" +msgstr "Varnish es un servidor de caché rápida que se coloca entre aplicaciones web y usuarios finales. Hace de intermediario (proxy) en las peticiones de los clientes y almacena en caché las URL a las que se accede de manera que múltiples peticiones al mismo recurso únicamente creen una petición al motor." #. type: defvr #: doc/guix.texi:18998 @@ -36618,12 +36654,12 @@ msgstr "@code{name} (predeterminado: @code{\"default\"})" #. type: table #: doc/guix.texi:19015 msgid "A name for this Varnish instance. Varnish will create a directory in @file{/var/varnish/} with this name and keep temporary files there. If the name starts with a forward slash, it is interpreted as an absolute directory name." -msgstr "" +msgstr "Un nombre para esta instancia de Varnish. Varnish creará un directorio en @file{/var/varnish} con este nombre y mantendrá allí los ficheros temporales. Si el nombre comienza con una barra, se interpreta como un nombre absoluto de directorio." #. type: table #: doc/guix.texi:19018 msgid "Pass the @code{-n} argument to other Varnish programs to connect to the named instance, e.g.@: @command{varnishncsa -n default}." -msgstr "" +msgstr "Proporcione el parámetro @code{-n} a otros programas de Varnish para que se conecten a la instancia de dicho nombre, por ejemplo @command{varnishncsa -n default}." #. type: item #: doc/guix.texi:19019 @@ -36643,10 +36679,11 @@ msgstr "Motor usado. Esta opción no tiene efecto si se usa @code{vcl}." msgid "@code{vcl} (default: #f)" msgstr "@code{vcl} (predeterminado: #f)" +# FUZZY #. type: table #: doc/guix.texi:19027 msgid "The @dfn{VCL} (Varnish Configuration Language) program to run. If this is @code{#f}, Varnish will proxy @code{backend} using the default configuration. Otherwise this must be a file-like object with valid VCL syntax." -msgstr "" +msgstr "El programa @dfn{VCL} (lenguaje de configuración de Varnish) ejecutado. Si se proporciona @code{#f}, Varnish actuará de intermediario (proxy) de @code{backend} usando la configuración predeterminada. En otro caso debe ser un objeto «tipo-fichero» con sintaxis válida para VCL." #. type: table #: doc/guix.texi:19031 @@ -36694,12 +36731,13 @@ msgstr "" #. type: table #: doc/guix.texi:19050 msgid "The configuration of an already running Varnish instance can be inspected and changed using the @command{varnishadm} program." -msgstr "" +msgstr "La configuración de una instancia de Varnish ya en ejecución puede inspeccionarse y cambiarse mediante el uso de la orden @command{varnishadm}." +# FUZZY #. type: table #: doc/guix.texi:19054 msgid "Consult the @url{https://varnish-cache.org/docs/,Varnish User Guide} and @url{https://book.varnish-software.com/4.0/,Varnish Book} for comprehensive documentation on Varnish and its configuration language." -msgstr "" +msgstr "Consulte la @url{https://varnish-cache.org/docs/,guía de usuaria de Varnish} y @url{https://book.varnish-software.com/4.0/,el libro de Varnish} para obtener la documentación completa de Varnish y su lenguaje de configuración." #. type: item #: doc/guix.texi:19055 @@ -36718,10 +36756,11 @@ msgstr "Lista de direcciones en las que Varnish escucha." msgid "@code{storage} (default: @code{'(\"malloc,128m\")})" msgstr "@code{storage} (predeterminado: @code{'(\"malloc,128m\")})" +# FUZZY #. type: table #: doc/guix.texi:19060 msgid "List of storage backends that will be available in VCL." -msgstr "" +msgstr "Lista de motores de almacenamiento que estarán disponibles en VCL." #. type: item #: doc/guix.texi:19061 @@ -36732,7 +36771,7 @@ msgstr "@code{parameters} (predeterminados: @code{'()})" #. type: table #: doc/guix.texi:19063 msgid "List of run-time parameters in the form @code{'((\"parameter\" . \"value\"))}." -msgstr "" +msgstr "Lista de parámetros de tiempo de ejecución con la forma @code{'((\"parámetro\" . \"valor\"))}." #. type: table #: doc/guix.texi:19066 @@ -36760,12 +36799,12 @@ msgstr "fcgiwrap" #. type: Plain text #: doc/guix.texi:19079 msgid "FastCGI is an interface between the front-end and the back-end of a web service. It is a somewhat legacy facility; new web services should generally just talk HTTP between the front-end and the back-end. However there are a number of back-end services such as PHP or the optimized HTTP Git repository access that use FastCGI, so we have support for it in Guix." -msgstr "" +msgstr "FastCGI es una interfaz entre la presentación (front-end) y el motor (back-end) de un servicio web. Es en cierto modo una característica antigua; los nuevos servicios web generalmente únicamente se comunican con HTTP entre ambas partes. No obstante, existe cierto número de servicios de motor como PHP o el acceso HTTP optimizado para repositorios Git que usan FastCGI, por lo que debemos incluirlo en Guix." #. type: Plain text #: doc/guix.texi:19086 msgid "To use FastCGI, you configure the front-end web server (e.g., nginx) to dispatch some subset of its requests to the fastcgi backend, which listens on a local TCP or UNIX socket. There is an intermediary @code{fcgiwrap} program that sits between the actual backend process and the web server. The front-end indicates which backend program to run, passing that information to the @code{fcgiwrap} process." -msgstr "" +msgstr "Para usar FastCGI debe configurar el servidor web de entrada@footnote{NdT: Front-end en inglés.} (por ejemplo, ngnix) para delegar un subconjunto de sus peticiones al motor fastcgi, que escucha en un puerto TCP local o en un socket de UNIX. Existe un programa de intermediación llamado @code{fcgiwrap} que se posiciona entre el proceso del motor y el servidor web. El servidor indica el programa del motor usado, proporcionando dicha información al proceso @code{fcgiwrap}." #. type: defvr #: doc/guix.texi:19087 @@ -36809,7 +36848,7 @@ msgstr "@code{socket} (predeterminado: @code{tcp:127.0.0.1:9000})" #. type: table #: doc/guix.texi:19104 msgid "The socket on which the @code{fcgiwrap} process should listen, as a string. Valid @var{socket} values include @code{unix:@var{/path/to/unix/socket}}, @code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:port}." -msgstr "" +msgstr "El socket donde el proceso @code{fcgiwrap} deba escuchar, como una cadena. Los valores adecuados para @var{socket} socket incluyen @code{unix:@var{/ruta/al/socket/unix}}, @code{tcp:@var{dirección.ip.con.puntos}:@var{puerto}} and @code{tcp6:[@var{dirección_ipv6}]:puerto}." #. type: item #: doc/guix.texi:19105 @@ -36823,15 +36862,18 @@ msgstr "@code{user} (predeterminado: @code{fcgiwrap})" msgid "@code{group} (default: @code{fcgiwrap})" msgstr "@code{group} (predeterminado: @code{fcgiwrap})" +# FUZZY #. type: table #: doc/guix.texi:19111 msgid "The user and group names, as strings, under which to run the @code{fcgiwrap} process. The @code{fastcgi} service will ensure that if the user asks for the specific user or group names @code{fcgiwrap} that the corresponding user and/or group is present on the system." -msgstr "" +msgstr "Los nombres de usuaria y grupo, como cadenas, con los que se ejecutará el proceso @code{fcgiwrap}. El servicio @code{fastcgi} se asegura, en caso de solicitar específicamente el uso de nombres de usuaria o grupo @code{fcgiwrap}, que la usuaria y/o grupo correspondientes se encuentren presentes en el sistema." +# FUZZY FUZZY FUZZY +# TODO (MAAV): Repensar #. type: table #: doc/guix.texi:19118 msgid "It is possible to configure a FastCGI-backed web service to pass HTTP authentication information from the front-end to the back-end, and to allow @code{fcgiwrap} to run the back-end process as a corresponding local user. To enable this capability on the back-end., run @code{fcgiwrap} as the @code{root} user and group. Note that this capability also has to be configured on the front-end as well." -msgstr "" +msgstr "Es posible configurar un servicio web proporcionado por FastCGI para que el servidor de fachada proporcione la información de identificación HTTP al motor, y para ejecutar el proceso del motor como el usuario local correspondiente. Para activar esta funcionalidad en el motor, ejecute @code{fcgiwrap} con la usuaria y grupo @code{root}. Tenga en cuenta de que esta funcionalidad debe configurarse del mismo modo en el servidor de fachada." #. type: cindex #: doc/guix.texi:19121 @@ -36839,10 +36881,12 @@ msgstr "" msgid "php-fpm" msgstr "php-fpm" +# FUZZY +# TODO (MAAV): Site... Repensar. #. type: Plain text #: doc/guix.texi:19124 msgid "PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI implementation with some additional features useful for sites of any size." -msgstr "" +msgstr "PHP-FPM (FastCGI Process Manager) es una implementación alternativa de FastCGI en PHP con algunas caracterísiticas adicionales útiles para sitios de cualquier tamaño." #. type: Plain text #: doc/guix.texi:19126 @@ -37002,12 +37046,10 @@ msgstr "Escucha en un socket Unix." msgid "@code{user} (default: @code{php-fpm})" msgstr "@code{user} (predeterminada: @code{php-fpm})" -# FUZZY #. type: table #: doc/guix.texi:19164 -#, fuzzy msgid "User who will own the php worker processes." -msgstr "Grupo de los procesos de trabajo." +msgstr "Usuaria que poseerá los procesos de trabajo de php." #. type: item #: doc/guix.texi:19164 @@ -37027,10 +37069,11 @@ msgstr "Grupo de los procesos de trabajo." msgid "@code{socket-user} (default: @code{php-fpm})" msgstr "@code{socket-user} (predeterminado: @code{php-fpm})" +# FUZZY #. type: table #: doc/guix.texi:19168 msgid "User who can speak to the php-fpm socket." -msgstr "" +msgstr "Usuaria que puede comunicarse con el socket de php-fpm." #. type: item #: doc/guix.texi:19168 @@ -37041,7 +37084,7 @@ msgstr "@code{socket-group} (predeterminado: @code{php-fpm})" #. type: table #: doc/guix.texi:19170 msgid "Group that can speak to the php-fpm socket." -msgstr "" +msgstr "Grupo que puede comunicarse con el socket de php-fpm." #. type: item #: doc/guix.texi:19170 @@ -37049,10 +37092,11 @@ msgstr "" msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" msgstr "@code{pid-file} (predeterminado: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" +# FUZZY #. type: table #: doc/guix.texi:19173 msgid "The process id of the php-fpm process is written to this file once the service has started." -msgstr "" +msgstr "El identificador de proceso del proceso de php-fpm se escribe en este fichero cuando se ha iniciado el servicio." #. type: item #: doc/guix.texi:19173 @@ -37063,7 +37107,7 @@ msgstr "@code{log-file} (predeterminado: @code{(string-append \"/var/log/php\" ( #. type: table #: doc/guix.texi:19175 msgid "Log for the php-fpm master process." -msgstr "" +msgstr "Registro del proceso maestro de php-fpm." #. type: item #: doc/guix.texi:19175 @@ -37071,10 +37115,13 @@ msgstr "" msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})" msgstr "@code{process-manager} (predeterminado: @code{(php-fpm-dynamic-process-manager-configuration)})" +# MAAV: Cuidado, esta traducción no tiene sentido si lo siguiente no son +# tipos. Y no encuentro una forma de traducirlo de forma genérica y que +# me suene bien... #. type: table #: doc/guix.texi:19178 msgid "Detailed settings for the php-fpm process manager. Must be either:" -msgstr "" +msgstr "Configuración detallada para el gestor de procesos php-fpm. Debe ser uno de los siguientes tipos:" #. type: code{#1} #: doc/guix.texi:19179 @@ -37100,10 +37147,11 @@ msgstr "" msgid "@code{display-errors} (default @code{#f})" msgstr "@code{display-errors} (predeterminado @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:19188 msgid "Determines whether php errors and warning should be sent to clients and displayed in their browsers. This is useful for local php development, but a security risk for public sites, as error messages can reveal passwords and personal data." -msgstr "" +msgstr "Determina si los errores y avisos de php deben enviarse a los clientes para que se muestren en sus navegadores. Esto es útil para la programación local con php, pero un riesgo para la seguridad de sitios públicos, ya que los mensajes de error pueden revelar contraseñas y datos personales." #. type: item #: doc/guix.texi:19188 @@ -37114,7 +37162,7 @@ msgstr "@code{timezone} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19190 msgid "Specifies @code{php_admin_value[date.timezone]} parameter." -msgstr "" +msgstr "Especifica el parámetro @code{php_admin_value[date.timezone]}." #. type: item #: doc/guix.texi:19190 @@ -37125,7 +37173,7 @@ msgstr "@code{workers-logfile} (predeterminado @code{(string-append \"/var/log/p #. type: table #: doc/guix.texi:19193 msgid "This file will log the @code{stderr} outputs of php worker processes. Can be set to @code{#f} to disable logging." -msgstr "" +msgstr "Este fichero registrará las salidas por @code{stderr} de los procesos de trabajo de php. Puede proporcionarse @code{#f} para desactivar el registro." #. type: item #: doc/guix.texi:19193 @@ -37136,7 +37184,7 @@ msgstr "@code{file} (predeterminado @code{#f})" #. type: table #: doc/guix.texi:19196 msgid "An optional override of the whole configuration. You can use the @code{mixed-text-file} function or an absolute filepath for it." -msgstr "" +msgstr "Sustituye opcionalmente la configuración al completo. Puede usar la función @code{mixed-text-file} o una ruta absoluta de un fichero para hacerlo." #. type: deftp #: doc/guix.texi:19199 @@ -37144,10 +37192,11 @@ msgstr "" msgid "{Data type} php-fpm-dynamic-process-manager-configuration" msgstr "{Tipo de datos} php-fpm-dynamic-process-manager-configuration" +# FUZZY #. type: deftp #: doc/guix.texi:19203 msgid "Data Type for the @code{dynamic} php-fpm process manager. With the @code{dynamic} process manager, spare worker processes are kept around based on it's configured limits." -msgstr "" +msgstr "Tipo de datos para el gestor de procesos @code{dynamic} de php-fpm. Con el gestor de procesos @code{dynamic}, se mantienen procesos de trabajo disponibles en base a los límites configurados." #. type: item #: doc/guix.texi:19204 doc/guix.texi:19220 doc/guix.texi:19230 @@ -37155,12 +37204,10 @@ msgstr "" msgid "@code{max-children} (default: @code{5})" msgstr "@code{max-children} (predeterminados: @code{5})" -# FUZZY #. type: table #: doc/guix.texi:19206 doc/guix.texi:19222 doc/guix.texi:19232 -#, fuzzy msgid "Maximum of worker processes." -msgstr "Grupo de los procesos de trabajo." +msgstr "Número máximo de procesos de trabajo." #. type: item #: doc/guix.texi:19206 @@ -37171,7 +37218,7 @@ msgstr "@code{start-servers} (predeterminados: @code{2})" #. type: table #: doc/guix.texi:19208 msgid "How many worker processes should be started on start-up." -msgstr "" +msgstr "Cuantos procesos de trabajo deben ejecutarse al inicio." #. type: item #: doc/guix.texi:19208 @@ -37182,7 +37229,7 @@ msgstr "@code{min-spare-servers} (predeterminado: @code{1})" #. type: table #: doc/guix.texi:19210 msgid "How many spare worker processes should be kept around at minimum." -msgstr "" +msgstr "Cuantos procesos de trabajo deben mantenerse disponibles como mínimo." #. type: item #: doc/guix.texi:19210 @@ -37193,7 +37240,7 @@ msgstr "@code{max-spare-servers} (predeterminados: @code{3})" #. type: table #: doc/guix.texi:19212 msgid "How many spare worker processes should be kept around at maximum." -msgstr "" +msgstr "Cuantos procesos de trabajo deben mantenerse disponibles como máximo." #. type: deftp #: doc/guix.texi:19215 @@ -37204,7 +37251,7 @@ msgstr "{Tipo de datos} php-fpm-static-process-manager-configuration" #. type: deftp #: doc/guix.texi:19219 msgid "Data Type for the @code{static} php-fpm process manager. With the @code{static} process manager, an unchanging number of worker processes are created." -msgstr "" +msgstr "Tipo de datos para el gestor de procesos @code{static} de php-fpm. Con el gestor de procesos @code{static}, se crea un número fijo de procesos de trabajo." #. type: deftp #: doc/guix.texi:19225 @@ -37215,7 +37262,7 @@ msgstr "{Tipo de datos} php-fpm-on-demand-process-manager-configuration" #. type: deftp #: doc/guix.texi:19229 msgid "Data Type for the @code{on-demand} php-fpm process manager. With the @code{on-demand} process manager, worker processes are only created as requests arrive." -msgstr "" +msgstr "Tipo de datos para el gestor de procesos @code{on-demand} de php-fpm. Con el gestor de procesos @code{on-demand}, se crean procesos de trabajo únicamente cuando se reciben peticiones." #. type: item #: doc/guix.texi:19232 @@ -37223,10 +37270,11 @@ msgstr "" msgid "@code{process-idle-timeout} (default: @code{10})" msgstr "@code{process-idle-timeout} (predeterminado: @code{10})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19234 msgid "The time in seconds after which a process with no requests is killed." -msgstr "" +msgstr "El tiempo en segundos tras el cual un proceso sin peticiones será eliminado." #. type: deffn #: doc/guix.texi:19238 @@ -37238,6 +37286,8 @@ msgstr "{Procedimiento Scheme} nginx-php-fpm-location @" #: doc/guix.texi:19244 msgid "[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")] A helper function to quickly add php to an @code{nginx-server-configuration}." msgstr "" +"[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")]\n" +"Función auxiliar para añadir php a una configuración @code{nginx-server-configuration} rápidamente." #. type: Plain text #: doc/guix.texi:19247 @@ -37283,7 +37333,7 @@ msgstr "cat-avatar-generator" #. type: Plain text #: doc/guix.texi:19266 msgid "The cat avatar generator is a simple service to demonstrate the use of php-fpm in @code{Nginx}. It is used to generate cat avatar from a seed, for instance the hash of a user's email address." -msgstr "" +msgstr "El generadores de avatares de gato es un servicio simple para demostrar el uso de php-fpm en @code{Nginx}. Se usa para generar un avatar de gato desde una semilla, por ejemplo el hash de la dirección de correo de la usuaria." #. type: deffn #: doc/guix.texi:19267 @@ -37291,16 +37341,18 @@ msgstr "" msgid "{Scheme Procedure} cat-avatar-generator-service @" msgstr "{Procedimiento Scheme} cat-avatar-generator-service @" +# FUZZY #. type: deffn #: doc/guix.texi:19275 msgid "[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-server-configuration that inherits @code{configuration}. It extends the nginx configuration to add a server block that serves @code{package}, a version of cat-avatar-generator. During execution, cat-avatar-generator will be able to use @code{cache-dir} as its cache directory." msgstr "" +"[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)]\n" +"Devuelve una configuración de nginx-server-configuration que hereda de @code{configuration}. Extiende la configuración de nginx para añadir un bloque de servidor que proporciona @code{package}, una versión de cat-avatar-generator. Durante su ejecución, cat-avatar-generator podrá usar @code{cache-dir} como su directorio de caché." #. type: Plain text #: doc/guix.texi:19278 -#, fuzzy msgid "A simple setup for cat-avatar-generator can look like this:" -msgstr "Una configuración simple de servicios para nginx con php puede ser más o menos así:" +msgstr "Una configuración simple para cat-avatar-generator puede ser más o menos así:" #. type: example #: doc/guix.texi:19285 @@ -37332,10 +37384,11 @@ msgstr "Hpcguix-web" msgid "hpcguix-web" msgstr "hpcguix-web" +# FUZZY #. type: Plain text #: doc/guix.texi:19294 msgid "The @uref{hpcguix-web, https://github.com/UMCUGenetics/hpcguix-web/} program is a customizable web interface to browse Guix packages, initially designed for users of high-performance computing (HPC) clusters." -msgstr "" +msgstr "El programa @uref{hpcguix-web, https://github.com/UMCUGenetics/hpcguix-web/} es una interfaz web personalizable para buscar paquetes de Guix, diseñado inicialmente para usuarias de clusters de computación de alto rendimiento (HPC)." #. type: defvr #: doc/guix.texi:19295 @@ -37368,7 +37421,7 @@ msgstr "specs" #. type: table #: doc/guix.texi:19306 msgid "A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service configuration. The main items available in this spec are:" -msgstr "" +msgstr "Una expresión-G (@pxref{G-Expressions}) que especifica la configuración del servicio hpcguix-web. Los elementos principales en esta especificación son:" #. type: item #: doc/guix.texi:19308 @@ -37398,11 +37451,11 @@ msgstr "La orden @command{guix}." msgid "@code{package-filter-proc} (default: @code{(const #t)})" msgstr "@code{package-filter-proc} (predeterminado: @code{(const #t)})" +# FUZZY #. type: table #: doc/guix.texi:19316 -#, fuzzy msgid "A procedure specifying how to filter packages that are displayed." -msgstr "Especificar como se construyen los paquetes." +msgstr "Un procedimiento que especifica cómo filtrar los paquetes mostrados." #. type: item #: doc/guix.texi:19317 @@ -37435,7 +37488,7 @@ msgstr "@code{channels} (predeterminados: @code{%default-channels})" #. type: table #: doc/guix.texi:19325 msgid "List of channels from which the package list is built (@pxref{Channels})." -msgstr "" +msgstr "Lista de canales desde los que se construye la lista de paquetes (@pxref{Channels})." #. type: item #: doc/guix.texi:19326 @@ -37446,12 +37499,12 @@ msgstr "@code{package-list-expiration} (predeterminado: @code{(* 12 3600)})" #. type: table #: doc/guix.texi:19329 msgid "The expiration time, in seconds, after which the package list is rebuilt from the latest instances of the given channels." -msgstr "" +msgstr "El tiempo de expiración, en segundos, tras el cual la lista de paquetes se reconstruye desde las últimas instancias de los canales proporcionados." #. type: table #: doc/guix.texi:19334 msgid "See the hpcguix-web repository for a @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, complete example}." -msgstr "" +msgstr "Véase el repositorio de hpcguix-web para un @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, ejemplo completo}." #. type: item #: doc/guix.texi:19335 @@ -37464,10 +37517,11 @@ msgstr "@code{package} (predeterminado: @code{hpcguix-web})" msgid "The hpcguix-web package to use." msgstr "El paquete hpcguix-web usado." +# FUZZY #. type: Plain text #: doc/guix.texi:19341 msgid "A typical hpcguix-web service declaration looks like this:" -msgstr "" +msgstr "Una declaración típica del servicio hpcguix-web es más o menos así:" #. type: example #: doc/guix.texi:19350 @@ -37489,15 +37543,16 @@ msgstr "" " (title-prefix \"Guix-HPC - \")\n" " (menu '((\"/about\" \"ABOUT\"))))))))\n" +# FUZZY #. type: quotation #: doc/guix.texi:19357 msgid "The hpcguix-web service periodically updates the package list it publishes by pulling channels from Git. To that end, it needs to access X.509 certificates so that it can authenticate Git servers when communicating over HTTPS, and it assumes that @file{/etc/ssl/certs} contains those certificates." -msgstr "" +msgstr "El servicio hpcguix-web actualiza periódicamente la lista de paquetes que publica obteniendo canales con Git. Para ello, necesita acceder a certificados X.509 de manera que pueda validar los servidores Git durante la comunicación con HTTPS, y asume que @file{/etc/ssl/certs} contiene dichos certificados." #. type: quotation #: doc/guix.texi:19361 msgid "Thus, make sure to add @code{nss-certs} or another certificate package to the @code{packages} field of your configuration. @ref{X.509 Certificates}, for more information on X.509 certificates." -msgstr "" +msgstr "Por lo tanto, asegúrese de añadir @code{nss-certs} u otro paquete de certificados al campo @code{packages} de su configuración. @ref{X.509 Certificates}, para más información sobre certificados X.509." #. type: cindex #: doc/guix.texi:19366 @@ -37533,22 +37588,24 @@ msgstr "El módulo @code{(gnu services certbot)} proporciona un servicio para la #. type: Plain text #: doc/guix.texi:19388 msgid "@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} tool to automate the certification process. This tool first securely generates a key on the server. It then makes a request to the Let's Encrypt certificate authority (CA) to sign the key. The CA checks that the request originates from the host in question by using a challenge-response protocol, requiring the server to provide its response over HTTP. If that protocol completes successfully, the CA signs the key, resulting in a certificate. That certificate is valid for a limited period of time, and therefore to continue to provide TLS services, the server needs to periodically ask the CA to renew its signature." -msgstr "" +msgstr "@url{https://letsencrypt.org/, Let's Encrypt} proporciona la herramienta @code{certbot} para automatizar el proceso de certificación. Esta herramienta genera primero de manera segura una clave en el servidor. Una vez hecho realiza una petición a la autoridad de certificación (AC, CA en inglés) Let's Encrypt para que firme la clave. La AC comprueba que la petición se origina en la máquina en cuestión mediante un protocolo de desafío-respuesta, esperando que el servidor proporcione su respuesta a través de HTTP. Si dicho protocolo se completa de manera satisfactoria, la AC firma la clave, resultando en un certificado. Dicho certificado es válido por un periodo de tiempo limitado y, por tanto, para continuar proporcionando servicios TLS, el servidor necesita solicitar a la AC periódicamente la renovación de su firma." #. type: Plain text #: doc/guix.texi:19395 msgid "The certbot service automates this process: the initial key generation, the initial certification request to the Let's Encrypt service, the web server challenge/response integration, writing the certificate to disk, the automated periodic renewals, and the deployment tasks associated with the renewal (e.g.@: reloading services, copying keys with different permissions)." -msgstr "" +msgstr "El servicio certbot automatiza este proceso: la generación inicial de la clave, la petición inicial de certificación al servicio Let's Encrypt, la integración del desafío/respuesta en el servidor web, la escritura del certificado en disco, las renovaciones periódicas automáticas y el despliegue de tareas asociadas con la renovación (por ejemplo la recarga de servicios y la copia de claves con diferentes permisos)." +# FUZZY #. type: Plain text #: doc/guix.texi:19401 msgid "Certbot is run twice a day, at a random minute within the hour. It won't do anything until your certificates are due for renewal or revoked, but running it regularly would give your service a chance of staying online in case a Let's Encrypt-initiated revocation happened for some reason." -msgstr "" +msgstr "Certbot se ejecuta dos veces al día, en un minuto aleatorio dentro de la hora. No hará nada hasta que sus certificados estén pendientes de renovación o sean revocados, pero su ejecución regular propociona a su servicio la oportunidad de permanecer en línea en caso de que se produzca una revocación iniciada por Let's Encrypt por alguna razón." +# FUZZY #. type: Plain text #: doc/guix.texi:19405 msgid "By using this service, you agree to the ACME Subscriber Agreement, which can be found there: @url{https://acme-v01.api.letsencrypt.org/directory}." -msgstr "" +msgstr "Mediante el uso de este servicio, usted acepta el acuerdo de suscripción ACME, que se puede encontrar aquí: @url{https://acme-v01.api.letsencrypt.org/directory}." #. type: defvr #: doc/guix.texi:19406 @@ -37558,9 +37615,8 @@ msgstr "{Variable Scheme} certbot-service-type" #. type: defvr #: doc/guix.texi:19409 -#, fuzzy msgid "A service type for the @code{certbot} Let's Encrypt client. Its value must be a @code{certbot-configuration} record as in this example:" -msgstr "Este es el tipo de servicio del servicio @uref{https://unix4lyfe.org/darkstat/, darkstat}, su valor debe ser un registro @code{darkstat-configuration} como en este ejemplo:" +msgstr "Un tipo de servicio para el cliente de Let's Encrypt @code{certbot}. Su valor debe ser un registro @code{certbot-configuration} como en este ejemplo:" #. type: example #: doc/guix.texi:19416 @@ -37573,9 +37629,9 @@ msgid "" " (kill pid SIGHUP))))\n" "\n" msgstr "" -"(define %nginx-deploy-hook\n" +"(define %procedimiento-de-despliegue-nginx\n" " (program-file\n" -" \"nginx-deploy-hook\"\n" +" \"procedimiento-de-despliegue-nginx\"\n" " #~(let ((pid (call-with-input-file \"/var/run/nginx/pid\" read)))\n" " (kill pid SIGHUP))))\n" "\n" @@ -37602,7 +37658,7 @@ msgstr "" " (list\n" " (certificate-configuration\n" " (domains '(\"example.net\" \"www.example.net\"))\n" -" (deploy-hook %nginx-deploy-hook))\n" +" (deploy-hook %procedimiento-de-despliegue-nginx))\n" " (certificate-configuration\n" " (domains '(\"bar.example.net\")))))))\n" @@ -37642,9 +37698,8 @@ msgstr "@code{webroot} (predeterminado: @code{/var/www})" # FUZZY #. type: table #: doc/guix.texi:19443 -#, fuzzy msgid "The directory from which to serve the Let's Encrypt challenge/response files." -msgstr "Directorio en el que se almacena los ficheros de base de datos y relacionados." +msgstr "Directorio desde el que se proporcionan los ficheros de desafío/respuesta de Let's Encrypt." #. type: item #: doc/guix.texi:19444 @@ -37655,12 +37710,13 @@ msgstr "@code{certificates} (predeterminados: @code{()})" #. type: table #: doc/guix.texi:19448 msgid "A list of @code{certificates-configuration}s for which to generate certificates and request signatures. Each certificate has a @code{name} and several @code{domains}." -msgstr "" +msgstr "Una lista de configuraciones @code{certificates-configuration} para los cuales se generan certificados y se solicitan firmas. Cada certificado tiene un nombre (@code{name}) y varios dominios (@code{domains})." +# FUZZY #. type: table #: doc/guix.texi:19452 msgid "Mandatory email used for registration, recovery contact, and important account notifications." -msgstr "" +msgstr "Correo electrónico obligatorio usado para el registro, contacto de recuperación y notificaciones importantes de la cuenta." #. type: item #: doc/guix.texi:19453 @@ -37677,27 +37733,29 @@ msgstr "Tamaño de la clave RSA." #: doc/guix.texi:19456 #, no-wrap msgid "@code{default-location} (default: @i{see below})" -msgstr "@code{default-location} (predeterminada: @i{vea a continuación})" +msgstr "@code{default-location} (predeterminada: @i{véase a continuación})" #. type: table #: doc/guix.texi:19465 msgid "The default @code{nginx-location-configuration}. Because @code{certbot} needs to be able to serve challenges and responses, it needs to be able to run a web server. It does so by extending the @code{nginx} web service with an @code{nginx-server-configuration} listening on the @var{domains} on port 80, and which has a @code{nginx-location-configuration} for the @code{/.well-known/} URI path subspace used by Let's Encrypt. @xref{Web Services}, for more on these nginx configuration data types." -msgstr "" +msgstr "La configuración @code{nginx-location-configuration} predeterminada. Debido a que @code{certbot} necesita proporcionar desafíos y respuestas, necesita ser capaz de ejecutar un servidor web. Se lleva a cabo extendiendo el servicio web @code{nginx} con una configuración @code{nginx-server-configuration} que escucha en los dominios @var{domains} en el puerto 80, y que contiene una configuración @code{nginx-location-configuration} para el subespacio de rutas URI @code{/.well-known/} usado por Let's Encrypt. @xref{Web Services}, para más información sobre estos tipos de datos de configuración de nginx." +# FUZZY #. type: table #: doc/guix.texi:19469 msgid "Requests to other URL paths will be matched by the @code{default-location}, which if present is added to all @code{nginx-server-configuration}s." -msgstr "" +msgstr "Las peticiones a otras rutas URL se compararán contra la dirección predeterminada @code{default-location}, la cual, en caso de estar presente, se añade a todas las configuraciones @code{nginx-server-configuration}." +# FUZZY #. type: table #: doc/guix.texi:19473 msgid "By default, the @code{default-location} will issue a redirect from @code{http://@var{domain}/...} to @code{https://@var{domain}/...}, leaving you to define what to serve on your site via @code{https}." -msgstr "" +msgstr "De manera predeterminada, la dirección predeterminada @code{default-location} emitirá una redirección @code{http://@var{dominio}/...} a @code{https://@var{dominio}/...}, permitiendole definir qué proporcionar en su sitio a través de @code{https}." #. type: table #: doc/guix.texi:19475 msgid "Pass @code{#f} to not issue a default location." -msgstr "" +msgstr "Proporcione @code{#f} para no emitir una dirección predeterminada." #. type: deftp #: doc/guix.texi:19478 @@ -37719,12 +37777,12 @@ msgstr "@code{name} (predeterminado: @i{vea a continuación})" #. type: table #: doc/guix.texi:19487 msgid "This name is used by Certbot for housekeeping and in file paths; it doesn't affect the content of the certificate itself. To see certificate names, run @code{certbot certificates}." -msgstr "" +msgstr "Este nombre se usa por Certbot para su mantenimiento interno y en las rutas de ficheros; no afecta al contenido del certificado en sí mismo. Para ver los nombres de certificados, ejecute @code{certbot certificates}." #. type: table #: doc/guix.texi:19489 msgid "Its default is the first provided domain." -msgstr "" +msgstr "Su valor predeterminado es el primer dominio proporcionado." #. type: item #: doc/guix.texi:19490 @@ -37732,10 +37790,11 @@ msgstr "" msgid "@code{domains} (default: @code{()})" msgstr "@code{domains} (predeterminado: @code{()})" +# FUZZY #. type: table #: doc/guix.texi:19493 msgid "The first domain provided will be the subject CN of the certificate, and all domains will be Subject Alternative Names on the certificate." -msgstr "" +msgstr "El primer dominio proporcionado será el sujecto del nombre común (CN) del certificado, y todos los dominios seran nombres alternativos (Subject Alternative Names) en el certificado." #. type: item #: doc/guix.texi:19494 @@ -37746,7 +37805,7 @@ msgstr "@code{challenge} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19499 msgid "The challenge type that has to be run by certbot. If @code{#f} is specified, default to the HTTP challenge. If a value is specified, defaults to the manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and the documentation at @url{https://certbot.eff.org/docs/using.html#hooks})." -msgstr "" +msgstr "El tipo de desafío que debe ejecutar certbot. Si se especifica @code{#f}, el valor por omisión es desafío HTTP. Si se especifica un valor, el valor por omisión es el módulo manual (véase @code{authentication-hook}, @code{cleanup-hook} y la documentación en @url{https://certbot.eff.org/docs/using.html#hooks})." #. type: item #: doc/guix.texi:19500 @@ -37754,10 +37813,11 @@ msgstr "" msgid "@code{authentication-hook} (default: @code{#f})" msgstr "@code{authentication-hook} (predeterminado: @code{#t})" +# FUZZY #. type: table #: doc/guix.texi:19506 msgid "Command to be run in a shell once for each certificate challenge to be answered. For this command, the shell variable @code{$CERTBOT_DOMAIN} will contain the domain being authenticated, @code{$CERTBOT_VALIDATION} contains the validation string and @code{$CERTBOT_TOKEN} contains the file name of the resource requested when performing an HTTP-01 challenge." -msgstr "" +msgstr "Orden ejecutada en un shell una vez por cada desafío de certificado que debe contestarse. Durante su ejecución, la variable del shell @code{$CERTBOT_DOMAIN} contiene el dominio que se está validando, @code{$CERTBOT_VALIDATION} contiene la cadena de validación y @code{$CERTBOT_TOKEN} contiene el nombre de fichero del recurso solicitado cuando se realiza el desafío HTTP-01." #. type: item #: doc/guix.texi:19507 @@ -37765,10 +37825,11 @@ msgstr "" msgid "@code{cleanup-hook} (default: @code{#f})" msgstr "@code{cleanup-hook} (predeterminado: @code{#f})" +# FUZZY FUZZY FUZZY #. type: table #: doc/guix.texi:19513 msgid "Command to be run in a shell once for each certificate challenge that have been answered by the @code{auth-hook}. For this command, the shell variables available in the @code{auth-hook} script are still available, and additionally @code{$CERTBOT_AUTH_OUTPUT} will contain the standard output of the @code{auth-hook} script." -msgstr "" +msgstr "Orden ejecutada en un shell una vez por cada desafío de certificado que haya sido contestado por @code{auth-hook}. Durante su ejecución, las variables del shell disponibles en el script @code{auth-hook} todavía están disponibles, y adicionalmente @code{$CERTBOT_AUTH_OUTPUT} contendrá la salida estándar que produjo @code{auth-hook}." #. type: item #: doc/guix.texi:19514 @@ -37779,12 +37840,12 @@ msgstr "@code{deploy-hook} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19522 msgid "Command to be run in a shell once for each successfully issued certificate. For this command, the shell variable @code{$RENEWED_LINEAGE} will point to the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/example.com\"}) containing the new certificates and keys; the shell variable @code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed certificate domains (for example, @samp{\"example.com www.example.com\"}." -msgstr "" +msgstr "Orden ejecutada en un shell una vez por cada certificado emitido satisfactoriamente. Durante su ejecución, la variable del shell @code{$RENEWED_LINEAGE} apuntará al subdirectorio live de configuración (por ejemplo, @samp{\"/etc/letsencrypt/live/example.com\"}) que contiene las nuevas claves y certificados; la variable del shell @code{$RENEWED_DOMAINS} contendrá una lista delimitada por espacios de certificados de dominio renovados (por ejemplo, @samp{\"example.com www.example.com\"})." #. type: Plain text #: doc/guix.texi:19529 msgid "For each @code{certificate-configuration}, the certificate is saved to @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the key is saved to @code{/etc/letsencrypt/live/@var{name}/privkey.pem}." -msgstr "" +msgstr "Para cada configuración @code{certificate-configuration}, el certificado se almacena @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} y la clave se almacena en @code{/etc/letsencrypt/live/@var{name}/privkey.pem}." #. type: cindex #: doc/guix.texi:19531 @@ -37811,10 +37872,11 @@ msgstr "El módulo @code{(gnu services dns)} proporciona servicios relacionados msgid "Knot Service" msgstr "Servicio Knot" +# FUZZY FUZZY #. type: Plain text #: doc/guix.texi:19545 msgid "An example configuration of an authoritative server for two zones, one master and one slave, is:" -msgstr "" +msgstr "Esta es una configuración de ejemplo de un servidor de autoridad para dos zonas, una maestra y otra esclava:" # FUZZY #. type: lisp @@ -37926,16 +37988,16 @@ msgstr "{Variable Scheme} knot-service-type" msgid "This is the type for the Knot DNS server." msgstr "Este es el tipo de datos para el servidor DNS Knot." +# FUZZY #. type: deffn #: doc/guix.texi:19591 msgid "Knot DNS is an authoritative DNS server, meaning that it can serve multiple zones, that is to say domain names you would buy from a registrar. This server is not a resolver, meaning that it can only resolve names for which it is authoritative. This server can be configured to serve zones as a master server or a slave server as a per-zone basis. Slave zones will get their data from masters, and will serve it as an authoritative server. From the point of view of a resolver, there is no difference between master and slave." -msgstr "" +msgstr "Knot DNS es un servidor de autoridad de DNS, lo que significa que puede servir múltiples zonas, es decir, nombres de dominio que compraría a una autoridad de registro de nombres. Este servidor no es un resolvedor, lo que significa que sólo puede resolver nombres para los que tiene autoridad. Este servidor puede configurarse para servir zonas como servidor maestro o como servidor esclavo con una granularidad al nivel de zona. Las zonas esclavas obtendrán sus datos de los servidores maestros, y las proporcionarán como un servidor de autoridad. Desde el punto de vista de un resolvedor, no hay diferencia entre servidor maestro y esclavo." #. type: deffn #: doc/guix.texi:19593 -#, fuzzy msgid "The following data types are used to configure the Knot DNS server:" -msgstr "Este es el tipo de datos para el servidor DNS Knot." +msgstr "Los siguientes tipos de datos se usan para configurar el servidor DNS Knot:" #. type: deftp #: doc/guix.texi:19595 @@ -37958,7 +38020,7 @@ msgstr "@code{id} (predeterminado: @code{\"\"})" #. type: table #: doc/guix.texi:19603 msgid "An identifier for other configuration fields to refer to this key. IDs must be unique and must not be empty." -msgstr "" +msgstr "Un identificador para que otros campos de configuración hagan referencia a esta clave. Los identificadores deben ser únicos y no deben estar vacíos." #. type: item #: doc/guix.texi:19604 @@ -37966,10 +38028,11 @@ msgstr "" msgid "@code{algorithm} (default: @code{#f})" msgstr "@code{algorithm} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:19608 msgid "The algorithm to use. Choose between @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-sha384} and @code{'hmac-sha512}." -msgstr "" +msgstr "El algoritmo usado. Debe seleccionarse entre @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-sha384} y @code{'hmac-sha512}." #. type: item #: doc/guix.texi:19609 @@ -37993,10 +38056,11 @@ msgstr "{Tipo de datos} knot-acl-configuration" msgid "Data type representing an Access Control List (ACL) configuration. This type has the following parameters:" msgstr "Tipo de datos que representa una configuración de lista de control de acceso (ACL). Este tipo tiene los siguientes parámetros:" +# TODO: Enviar parche! #. type: table #: doc/guix.texi:19623 msgid "An identifier for ether configuration fields to refer to this key. IDs must be unique and must not be empty." -msgstr "" +msgstr "Un identificador para que otros campos de configuración hagan referencia a esta clave. Los identificadores deben ser únicos y no deben estar vacíos." #. type: item #: doc/guix.texi:19624 doc/guix.texi:19739 @@ -38004,10 +38068,11 @@ msgstr "" msgid "@code{address} (default: @code{'()})" msgstr "@code{address} (predeterminada: @code{'()})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19628 msgid "An ordered list of IP addresses, network subnets, or network ranges represented with strings. The query must match one of them. Empty value means that address match is not required." -msgstr "" +msgstr "Lista ordenada de direcciones IP, subredes o rangos de red representadas como cadenas. La búsqueda debe corresponder con alguna. El valor vacío significa que la comprobación de correspondencia de la dirección no es necesaria." #. type: item #: doc/guix.texi:19629 @@ -38015,10 +38080,11 @@ msgstr "" msgid "@code{key} (default: @code{'()})" msgstr "@code{key} (predeterminada: @code{'()})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19633 msgid "An ordered list of references to keys represented with strings. The string must match a key ID defined in a @code{knot-key-configuration}. No key means that a key is not require to match that ACL." -msgstr "" +msgstr "Lista ordenada de referencias a claves representadas como cadenas. La cadena debe corresponder con un ID de clave definido en @code{knot-key-configuration}. Ninguna clave significa que la comprobación de claves no es necesaria para este control de acceso (ACL)." #. type: item #: doc/guix.texi:19634 @@ -38029,7 +38095,7 @@ msgstr "@code{action} (predeterminada: @code{'()})" #. type: table #: doc/guix.texi:19638 msgid "An ordered list of actions that are permitted or forbidden by this ACL. Possible values are lists of zero or more elements from @code{'transfer}, @code{'notify} and @code{'update}." -msgstr "" +msgstr "Lista ordenada de acciones que se permiten o prohiben por este control de acceso (ACL). Los valores posibles son listas de cero o más elementos entre @code{'transfer}, @code{'notify} y @code{'update}." #. type: item #: doc/guix.texi:19639 @@ -38037,10 +38103,11 @@ msgstr "" msgid "@code{deny?} (default: @code{#f})" msgstr "@code{deny?} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:19642 msgid "When true, the ACL defines restrictions. Listed actions are forbidden. When false, listed actions are allowed." -msgstr "" +msgstr "Cuando es verdadero, este ACL define restricciones. Las acciones enumeradas no se permiten. Cuando es falso, las acciones enumeradas se permiten." #. type: deftp #: doc/guix.texi:19646 @@ -38062,7 +38129,7 @@ msgstr "@code{name} (predeterminado: @code{\"@@\"})" #. type: table #: doc/guix.texi:19657 msgid "The name of the record. @code{\"@@\"} refers to the origin of the zone. Names are relative to the origin of the zone. For example, in the @code{example.org} zone, @code{\"ns.example.org\"} actually refers to @code{ns.example.org.example.org}. Names ending with a dot are absolute, which means that @code{\"ns.example.org.\"} refers to @code{ns.example.org}." -msgstr "" +msgstr "El nombre del registro. @code{\"@@\"} hace referencia al origen de la zona. Los nombres son relativos al origen de la zona. Por ejemplo, en la zona @code{example.org}, @code{\"ns.example.org\"} en realidad hace referencia a @code{ns.example.org.example.org}. Los nombres que terminan en un punto se consideran absolutos, lo que significa que @code{\"ns.example.org.\"} hace referencia a @code{ns.example.org}." #. type: item #: doc/guix.texi:19658 @@ -38073,7 +38140,7 @@ msgstr "@code{ttl} (predeterminado: @code{\"\"})" #. type: table #: doc/guix.texi:19660 msgid "The Time-To-Live (TTL) of this record. If not set, the default TTL is used." -msgstr "" +msgstr "El tiempo de vida (TTL) de este registro. Si no se proporciona, se usa el TTL predeterminado." #. type: item #: doc/guix.texi:19661 @@ -38084,7 +38151,7 @@ msgstr "@code{class} (predeterminada: @code{\"IN\"})" #. type: table #: doc/guix.texi:19664 msgid "The class of the record. Knot currently supports only @code{\"IN\"} and partially @code{\"CH\"}." -msgstr "" +msgstr "La clase del registro. Actualmente Knot implementa únicamente @code{\"IN\"} y parcialmente @code{\"CH\"}." #. type: item #: doc/guix.texi:19665 @@ -38092,10 +38159,11 @@ msgstr "" msgid "@code{type} (default: @code{\"A\"})" msgstr "@code{type} (predeterminado: @code{\"A\"})" +# FUZZY #. type: table #: doc/guix.texi:19669 msgid "The type of the record. Common types include A (IPv4 address), AAAA (IPv6 address), NS (Name Server) and MX (Mail eXchange). Many other types are defined." -msgstr "" +msgstr "El tipo del registro. Los tipos comunes incluyen A (dirección IPv4), AAAA (dirección IPv6), NS (servidor de nombres@footnote{Name Server en inglés.}) y MX (pasarela de correo@footnote{Mail eXchange en inglés}). Otros muchos tipos distintos se encuentran definidos." #. type: item #: doc/guix.texi:19670 @@ -38106,7 +38174,7 @@ msgstr "@code{data} (predeterminados: @code{\"\"})" #. type: table #: doc/guix.texi:19674 msgid "The data contained in the record. For instance an IP address associated with an A record, or a domain name associated with an NS record. Remember that domain names are relative to the origin unless they end with a dot." -msgstr "" +msgstr "Los datos que contiene el registro. Por ejemplo, una dirección IP asociada con un registro A, o un nombre de dominio asociado con un registro NS. Recuerde que los nombres de dominio son relativos al origen a menos que terminen con punto." #. type: deftp #: doc/guix.texi:19678 @@ -38119,10 +38187,12 @@ msgstr "{Tipo de datos} zone-file" msgid "Data type representing the content of a zone file. This type has the following parameters:" msgstr "Tipo de datos que representa el contenido de un fichero de zona. Este tipo tiene los siguientes parámetros:" +# FUZZY +# TODO (MAAV): Revisar traducción. #. type: table #: doc/guix.texi:19690 msgid "The list of entries. The SOA record is taken care of, so you don't need to put it in the list of entries. This list should probably contain an entry for your primary authoritative DNS server. Other than using a list of entries directly, you can use @code{define-zone-entries} to define a object containing the list of entries more easily, that you can later pass to the @code{entries} field of the @code{zone-file}." -msgstr "" +msgstr "La lista de entradas. El registro SOA se genera automáticamente, por lo que no necesita ponerlo en la lista de entradas. Esta lista probablemente debería contener una entrada apuntando a su servidor DNS de autoridad. En vez de usar una lista de entradas directamente, puede usar @code{define-zone-entries} para definir un objeto que contenga la lista de entradas más fácilmente, que posteriormente puede proporcionar en el campo @code{entries} del fichero @code{zone-file}." #. type: item #: doc/guix.texi:19691 @@ -38133,7 +38203,7 @@ msgstr "@code{origin} (predeterminado: @code{\"\"})" #. type: table #: doc/guix.texi:19693 msgid "The name of your zone. This parameter cannot be empty." -msgstr "" +msgstr "El nombre de su zona. Este parámetro no puede estar vacío." #. type: item #: doc/guix.texi:19694 @@ -38141,10 +38211,11 @@ msgstr "" msgid "@code{ns} (default: @code{\"ns\"})" msgstr "@code{ns} (predeterminado: @code{\"ns\"})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19699 msgid "The domain of your primary authoritative DNS server. The name is relative to the origin, unless it ends with a dot. It is mandatory that this primary DNS server corresponds to an NS record in the zone and that it is associated to an IP address in the list of entries." -msgstr "" +msgstr "El dominio de su servidor DNS primario de autoridad. El nombre es relativo al origen, a menos que termine en punto. Es obligatorio que este servidor DNS primario corresponda con un registro NS en la zona y que esté asociado a una dirección IP en la lista de entradas." #. type: item #: doc/guix.texi:19700 @@ -38155,7 +38226,7 @@ msgstr "@code{mail} (predeterminado: @code{\"hostmaster\"})" #. type: table #: doc/guix.texi:19703 msgid "An email address people can contact you at, as the owner of the zone. This is translated as @code{@@}." -msgstr "" +msgstr "Dirección de correo a través de la cual la gente puede contactar con usted, como propietaria de la zona. Se traduce a @code{@@}." #. type: item #: doc/guix.texi:19704 @@ -38163,10 +38234,11 @@ msgstr "" msgid "@code{serial} (default: @code{1})" msgstr "@code{serial} (predeterminado: @code{1})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19708 msgid "The serial number of the zone. As this is used to keep track of changes by both slaves and resolvers, it is mandatory that it @emph{never} decreases. Always increment it when you make a change in your zone." -msgstr "" +msgstr "Número serie de la zona. Como se usa para tener constancia de los cambios tanto en servidores esclavos como en resolvedores, es obligatorio que @emph{nunca} decremente. Incrementelo siempre que haga cambios en su zona." #. type: item #: doc/guix.texi:19709 @@ -38177,7 +38249,7 @@ msgstr "@code{refresh} (predeterminado: @code{(* 2 24 3600)})" #. type: table #: doc/guix.texi:19713 msgid "The frequency at which slaves will do a zone transfer. This value is a number of seconds. It can be computed by multiplications or with @code{(string->duration)}." -msgstr "" +msgstr "La frecuencia con la que los servidores esclavos realizarán una transferencia de zona. Este valor es un número de segundos. Puede calcularse con multiplicaciones o con @code{(string->duration)}." #. type: item #: doc/guix.texi:19714 @@ -38188,7 +38260,7 @@ msgstr "@code{retry} (predeterminado: @code{(* 15 60)})" #. type: table #: doc/guix.texi:19717 msgid "The period after which a slave will retry to contact its master when it fails to do so a first time." -msgstr "" +msgstr "El periodo tras el cual un servidor esclavo reintentará el contacto con su maestro cuando falle al intentarlo la primera vez." #. type: item #: doc/guix.texi:19718 @@ -38196,10 +38268,12 @@ msgstr "" msgid "@code{expiry} (default: @code{(* 14 24 3600)})" msgstr "@code{expiry} (predeterminado: @code{(* 14 24 3600)})" +# FUZZY FUZZY +# TODO (MAAV): Resolvedor? #. type: table #: doc/guix.texi:19722 msgid "Default TTL of records. Existing records are considered correct for at most this amount of time. After this period, resolvers will invalidate their cache and check again that it still exists." -msgstr "" +msgstr "Tiempo de vida (TTL) predeterminado de los registros. Los registros existentes se consideran correctos durante al menos este periodo de tiempo. Tras este periodo, los resolvedores invalidarán su caché y comprobarán de nuevo que todavía exista." #. type: item #: doc/guix.texi:19723 @@ -38210,7 +38284,7 @@ msgstr "@code{nx} (predeterminado: @code{3600})" #. type: table #: doc/guix.texi:19726 msgid "Default TTL of inexistant records. This delay is usually short because you want your new domains to reach everyone quickly." -msgstr "" +msgstr "Tiempo de vida (TTL) de los registros inexistentes. Este retraso es habitualmente corto ya que deseará que sus nuevos dominios estén disponibles para cualquiera rápidamente." #. type: deftp #: doc/guix.texi:19730 @@ -38226,12 +38300,12 @@ msgstr "Tipo de datos que representa una configuración remota. Este tipo tiene #. type: table #: doc/guix.texi:19738 msgid "An identifier for other configuration fields to refer to this remote. IDs must be unique and must not be empty." -msgstr "" +msgstr "Un identificador para que otros campos de configuración hagan referencia a esta configuración remota. Los identificadores deben ser únicos y no deben estar vacíos." #. type: table #: doc/guix.texi:19743 msgid "An ordered list of destination IP addresses. Addresses are tried in sequence. An optional port can be given with the @@ separator. For instance: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}. Default port is 53." -msgstr "" +msgstr "Una lista ordenada de direcciones IP de destino. Las direcciones se prueban en secuencia. Opcionalmente se puede proporcionar el puerto con el separador @@. Por ejemplo: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}. El puerto predeterminado es el 53." #. type: item #: doc/guix.texi:19744 @@ -38242,7 +38316,7 @@ msgstr "@code{via} (predeterminada: @code{'()})" #. type: table #: doc/guix.texi:19748 msgid "An ordered list of source IP addresses. An empty list will have Knot choose an appropriate source IP. An optional port can be given with the @@ separator. The default is to choose at random." -msgstr "" +msgstr "Una lista ordenada de direcciones IP de fuente. Una lista vacía hará que Knot seleccione una fuente IP apropiada. Opcionalmente se puede proporcionar el puerto con el separador @@. De manera predeterminada se selecciona al azar." #. type: item #: doc/guix.texi:19749 @@ -38253,7 +38327,7 @@ msgstr "@code{key} (predeterminada: @code{#f})" #. type: table #: doc/guix.texi:19752 msgid "A reference to a key, that is a string containing the identifier of a key defined in a @code{knot-key-configuration} field." -msgstr "" +msgstr "Referencia a una clave, esto es una cadena que contiene el identificador de una clave definida en el campo @code{knot-key-configuration}." #. type: deftp #: doc/guix.texi:19756 @@ -38261,16 +38335,16 @@ msgstr "" msgid "{Data Type} knot-keystore-configuration" msgstr "{Tipo de datos} knot-keystore-configuration" +# FUZZY #. type: deftp #: doc/guix.texi:19759 -#, fuzzy msgid "Data type representing a keystore to hold dnssec keys. This type has the following parameters:" -msgstr "Tipo de datos que representa una clave. Este tipo tiene los siguientes parámetros:" +msgstr "Tipo de datos que representa un almacén de claves para alojar claves de dnssec. Este tipo tiene los siguientes parámetros:" #. type: table #: doc/guix.texi:19763 msgid "The id of the keystore. It must not be empty." -msgstr "" +msgstr "El identificador del almacén de claves. No debe estar vacío." #. type: item #: doc/guix.texi:19764 @@ -38289,10 +38363,11 @@ msgstr "El motor en el que se almacenan las claves. Puede ser @code{'pem} o @cod msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})" msgstr "@code{config} (predeterminada: @code{\"/var/lib/knot/keys/keys\"})" +# FUZZY #. type: table #: doc/guix.texi:19771 msgid "The configuration string of the backend. An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}. For the pem backend, the string reprensents a path in the file system." -msgstr "" +msgstr "La cadena de configuración del motor. Un ejemplo para PKCS#11 es: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}. La cadena representa una ruta en el sistema de ficheros para el motor pem." #. type: deftp #: doc/guix.texi:19775 @@ -38300,30 +38375,32 @@ msgstr "" msgid "{Data Type} knot-policy-configuration" msgstr "{Tipo de datos} knot-policy-configuration" +# FUZZY #. type: deftp #: doc/guix.texi:19779 msgid "Data type representing a dnssec policy. Knot DNS is able to automatically sign your zones. It can either generate and manage your keys automatically or use keys that you generate." -msgstr "" +msgstr "Tipo de datos que representa una política de dnssec. El DNS Knot es capaz de firmar automáticamente sus zonas. Puede generar y gestionar sus claves de manerá automática o usar las claves que usted genere." #. type: deftp #: doc/guix.texi:19786 msgid "Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that is used to sign the second, and a Zone Signing Key (ZSK) that is used to sign the zone. In order to be trusted, the KSK needs to be present in the parent zone (usually a top-level domain). If your registrar supports dnssec, you will have to send them your KSK's hash so they can add a DS record in their zone. This is not automated and need to be done each time you change your KSK." -msgstr "" +msgstr "Dnssec se implementa habitualmente usando dos claves: una clave para firma de claves (KSK) que se usa para firmar la segunda, y una clave para firma de zona (ZSK) que se usa para firmar la zona. Para establecer la confianza, la KSK necesita estar presente en la zona padre (habitualmente un dominio de nivel superior). Si su entidad de registro permite dnssec, debe mandarle el hash de su KSK de manera que puedan añadir un registro DS en su zona. No es automático y debe realizarse cada vez que cambie su KSK." #. type: deftp #: doc/guix.texi:19792 msgid "The policy also defines the lifetime of keys. Usually, ZSK can be changed easily and use weaker cryptographic functions (they use lower parameters) in order to sign records quickly, so they are changed often. The KSK however requires manual interaction with the registrar, so they are changed less often and use stronger parameters because they sign only one record." -msgstr "" +msgstr "La política también define el tiempo de vida de las claves. Habitualmente, la ZSK puede cambiarse fácilmente y usa funciones criptográficas más débiles (usa parámetros de menor magnitud) para firmar los registros rápidamente, ya que cambian habitualmente. No obstante, la KSK requiere interacción manual con la entidad de registro, por lo que se cambia menos habitualmente y usa parámetros más fuertes debido a que únicamente firma un registro." #. type: deftp #: doc/guix.texi:19794 msgid "This type has the following parameters:" msgstr "Este tipo tiene los siguientes parámetros:" +# FUZZY #. type: table #: doc/guix.texi:19798 msgid "The id of the policy. It must not be empty." -msgstr "" +msgstr "El identificador de la política. No debe estar vacío." #. type: item #: doc/guix.texi:19799 @@ -38334,7 +38411,7 @@ msgstr "@code{keystore} (predeterminado: @code{\"default\"})" #. type: table #: doc/guix.texi:19804 msgid "A reference to a keystore, that is a string containing the identifier of a keystore defined in a @code{knot-keystore-configuration} field. The @code{\"default\"} identifier means the default keystore (a kasp database that was setup by this service)." -msgstr "" +msgstr "Referencia a un almacén de claves, es decir una cadena que contiene el identificador de un almacén de claves definido en un campo de @code{knot-keystore-configuration}. El identificador predeterminado @code{\"default\"} implica el uso del almacén de claves predeterminado (una base de datos kasp que se configura para este servicio)." #. type: item #: doc/guix.texi:19805 @@ -38345,7 +38422,7 @@ msgstr "@code{manual?} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19807 msgid "Whether the key management is manual or automatic." -msgstr "" +msgstr "Si la gestión de claves es manual o automática." #. type: item #: doc/guix.texi:19808 @@ -38356,7 +38433,7 @@ msgstr "@code{single-type-signing?} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19810 msgid "When @code{#t}, use the Single-Type Signing Scheme." -msgstr "" +msgstr "Cuando sea @code{#t}, usa el esquema de firma de tipo único (Single-Type Signing Scheme)." #. type: item #: doc/guix.texi:19811 @@ -38364,10 +38441,11 @@ msgstr "" msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})" msgstr "@code{algorithm} (predeterminado: @code{\"ecdsap256sha256\"})" +# FUZZY #. type: table #: doc/guix.texi:19813 msgid "An algorithm of signing keys and issued signatures." -msgstr "" +msgstr "Algoritmo para las claves de firma y las firmas emitidas." #. type: item #: doc/guix.texi:19814 @@ -38378,7 +38456,7 @@ msgstr "@code{ksk-size} (predeterminado: @code{256})" #. type: table #: doc/guix.texi:19817 msgid "The length of the KSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms." -msgstr "" +msgstr "La longitud de la KSK. Fíjese que este valor es correcto para el algoritmo predeterminado, pero sería inseguro para otros algoritmos." #. type: item #: doc/guix.texi:19818 @@ -38389,7 +38467,7 @@ msgstr "@code{zsk-size} (predeterminado: @code{256})" #. type: table #: doc/guix.texi:19821 msgid "The length of the ZSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms." -msgstr "" +msgstr "La longitud de la ZSK. Fíjese que este valor es correcto para el algoritmo predeterminado, pero sería inseguro para otros algoritmos." #. type: item #: doc/guix.texi:19822 @@ -38400,7 +38478,7 @@ msgstr "@code{dnskey-ttl} (predeterminado: @code{'default})" #. type: table #: doc/guix.texi:19825 msgid "The TTL value for DNSKEY records added into zone apex. The special @code{'default} value means same as the zone SOA TTL." -msgstr "" +msgstr "El valor del tiempo de vida (TTL) de los registros DNSKEY añadidos al «apex» de la zona. El valor especial @code{'default} significa el mismo valor que el TTL del SOA de la zona." #. type: item #: doc/guix.texi:19826 @@ -38408,10 +38486,11 @@ msgstr "" msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})" msgstr "@code{zsk-lifetime} (predeterminado: @code{(* 30 24 3600)})" +# FUZZY #. type: table #: doc/guix.texi:19828 msgid "The period between ZSK publication and the next rollover initiation." -msgstr "" +msgstr "El periodo entre la publicación de la ZSK y el inicio del siguiente ciclo de renovación." #. type: item #: doc/guix.texi:19829 @@ -38419,10 +38498,11 @@ msgstr "" msgid "@code{propagation-delay} (default: @code{(* 24 3600)})" msgstr "@code{propagation-delay} (predeterminado: @code{(* 24 3600)})" +# FUZZY #. type: table #: doc/guix.texi:19832 msgid "An extra delay added for each key rollover step. This value should be high enough to cover propagation of data from the master server to all slaves." -msgstr "" +msgstr "Retraso adicional añadido por cada paso del ciclo de renovación de clave. Este valor debe ser suficientemente alto para cubrir la propagación de datos del servidor maestro a todos los esclavos." #. type: item #: doc/guix.texi:19833 @@ -38430,10 +38510,11 @@ msgstr "" msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})" msgstr "@code{rrsig-lifetime} (predeterminado: @code{(* 14 24 3600)})" +# FUZZY #. type: table #: doc/guix.texi:19835 msgid "A validity period of newly issued signatures." -msgstr "" +msgstr "Periodo de validez para las nuevas firmas emitidas." #. type: item #: doc/guix.texi:19836 @@ -38444,7 +38525,7 @@ msgstr "@code{rrsig-refresh} (predeterminado: @code{(* 7 24 3600)})" #. type: table #: doc/guix.texi:19838 msgid "A period how long before a signature expiration the signature will be refreshed." -msgstr "" +msgstr "Periodo de antelación con el que se realiza el refresco de la firma antes de una expiración de la misma." #. type: item #: doc/guix.texi:19839 @@ -38452,10 +38533,11 @@ msgstr "" msgid "@code{nsec3?} (default: @code{#f})" msgstr "@code{nsec3?} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:19841 msgid "When @code{#t}, NSEC3 will be used instead of NSEC." -msgstr "" +msgstr "Si es @code{#t}, se usa NSEC3 en vez de NSEC." #. type: item #: doc/guix.texi:19842 @@ -38463,10 +38545,11 @@ msgstr "" msgid "@code{nsec3-iterations} (default: @code{5})" msgstr "@code{nsec3-iterations} (predeterminado: @code{5})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19844 msgid "The number of additional times the hashing is performed." -msgstr "" +msgstr "Número de ejecuciones adicionales de la operación de hash." #. type: item #: doc/guix.texi:19845 @@ -38474,10 +38557,11 @@ msgstr "" msgid "@code{nsec3-salt-length} (default: @code{8})" msgstr "@code{nsec3-salt-length} (predeterminado: @code{8})" +# FUZZY #. type: table #: doc/guix.texi:19848 msgid "The length of a salt field in octets, which is appended to the original owner name before hashing." -msgstr "" +msgstr "La longitud del campo «salt» en octetos, que se añade al nombre de la propietaria original antes de ejecutar la operación de hash." #. type: item #: doc/guix.texi:19849 @@ -38485,10 +38569,11 @@ msgstr "" msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})" msgstr "@code{nsec3-salt-lifetime} (predeterminado: @code{(* 30 24 3600)})" +# FUZZY FUZZY FUZZY #. type: table #: doc/guix.texi:19851 msgid "The validity period of newly issued salt field." -msgstr "" +msgstr "El periodo de validez de los campos «salt» que se generen." #. type: deftp #: doc/guix.texi:19855 @@ -38507,10 +38592,11 @@ msgstr "Tipo de datos que representa una zona ofrecida por Knot. Este tipo tiene msgid "@code{domain} (default: @code{\"\"})" msgstr "@code{domain} (predeterminado: @code{\"\"})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19862 msgid "The domain served by this configuration. It must not be empty." -msgstr "" +msgstr "El dominio ofrecido con esta configuración. No debe estar vacío." #. type: item #: doc/guix.texi:19863 @@ -38521,7 +38607,7 @@ msgstr "@code{file} (predeterminado: @code{\"\"})" #. type: table #: doc/guix.texi:19866 msgid "The file where this zone is saved. This parameter is ignored by master zones. Empty means default location that depends on the domain name." -msgstr "" +msgstr "El fichero donde se almacena esta zona. Este parámetro se ignora para zonas maestras. Vacío significa la ruta predeterminada que depende del nombre del dominio." #. type: item #: doc/guix.texi:19867 @@ -38529,10 +38615,11 @@ msgstr "" msgid "@code{zone} (default: @code{(zone-file)})" msgstr "@code{zone} (predeterminado: @code{(zone-file)})" +# FUZZY #. type: table #: doc/guix.texi:19870 msgid "The content of the zone file. This parameter is ignored by slave zones. It must contain a zone-file record." -msgstr "" +msgstr "El contenido del fichero de zona. Este parámetro se ignora para zonas esclavas. Debe contener un registro de fichero de zona." #. type: item #: doc/guix.texi:19871 @@ -38543,7 +38630,7 @@ msgstr "@code{master} (predeterminado: @code{'()})" #. type: table #: doc/guix.texi:19874 msgid "A list of master remotes. When empty, this zone is a master. When set, this zone is a slave. This is a list of remotes identifiers." -msgstr "" +msgstr "Lista de maestros remotos. Cuando está vacía, esta zona es maestra. Cuando tiene contenido, esta zona es esclava. Es una lista de identificadores remotos." #. type: item #: doc/guix.texi:19875 @@ -38554,7 +38641,7 @@ msgstr "@code{ddns-master} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19878 msgid "The main master. When empty, it defaults to the first master in the list of masters." -msgstr "" +msgstr "Maestro principal. Cuando está vacío, apunta de manera predeterminada al primer maestro en la lista de maestros." #. type: item #: doc/guix.texi:19879 @@ -38565,7 +38652,7 @@ msgstr "@code{notify} (predeterminado: @code{'()})" #. type: table #: doc/guix.texi:19881 msgid "A list of slave remote identifiers." -msgstr "" +msgstr "Una lista de identificadores remotos de esclavos." #. type: item #: doc/guix.texi:19882 @@ -38573,10 +38660,11 @@ msgstr "" msgid "@code{acl} (default: @code{'()})" msgstr "@code{acl} (predeterminado: @code{'()})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:19884 msgid "A list of acl identifiers." -msgstr "" +msgstr "Lista de identicadores acl." #. type: item #: doc/guix.texi:19885 @@ -38587,7 +38675,7 @@ msgstr "@code{semantic-checks?} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19887 msgid "When set, this adds more semantic checks to the zone." -msgstr "" +msgstr "Cuando es verdadero, añade más comprobaciones semánticas a la zona." #. type: item #: doc/guix.texi:19888 @@ -38598,7 +38686,7 @@ msgstr "@code{disable-any?} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19890 msgid "When set, this forbids queries of the ANY type." -msgstr "" +msgstr "Cuando es verdadero, no permite consultas de tipo ANY." #. type: item #: doc/guix.texi:19891 @@ -38609,7 +38697,7 @@ msgstr "@code{zonefile-sync} (predeterminado: @code{0})" #. type: table #: doc/guix.texi:19894 msgid "The delay between a modification in memory and on disk. 0 means immediate synchronization." -msgstr "" +msgstr "El retraso entre una modificación en memoria y en disco. 0 significa sincronización inmediata." #. type: item #: doc/guix.texi:19895 @@ -38620,47 +38708,47 @@ msgstr "@code{zonefile-load} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19898 msgid "The way the zone file contents are applied during zone load. Possible values are:" -msgstr "" +msgstr "La forma en la que los contenidos del fichero de zona se aplican durante la carga de la zona. Los valores posibles son:" #. type: item #: doc/guix.texi:19900 #, no-wrap msgid "@code{#f} for using the default value from Knot," -msgstr "" +msgstr "@code{#f} para obtener el valor predeterminado de Knot," #. type: item #: doc/guix.texi:19901 #, no-wrap msgid "@code{'none} for not using the zone file at all," -msgstr "" +msgstr "@code{'none} para no usar el fichero de zona en absoluto," #. type: item #: doc/guix.texi:19902 #, no-wrap msgid "@code{'difference} for computing the difference between already available" -msgstr "" +msgstr "@code{'difference} para calcular la diferencia entre los contenidos disponibles" #. type: itemize #: doc/guix.texi:19904 msgid "contents and zone contents and applying it to the current zone contents," -msgstr "" +msgstr "actualmente y los contenidos de la zona y los aplica a los contenidos actuales de la zona actual," #. type: item #: doc/guix.texi:19904 #, no-wrap msgid "@code{'difference-no-serial} for the same as @code{'difference}, but" -msgstr "" +msgstr "@code{'difference-no-serial} es igual que @code{'difference}, pero" #. type: itemize #: doc/guix.texi:19907 msgid "ignoring the SOA serial in the zone file, while the server takes care of it automatically." -msgstr "" +msgstr "ignora el código serie SOA en el fichero de zona, mientras que el servidor se hace cargo de él de manera automática." #. type: item #: doc/guix.texi:19907 #, no-wrap msgid "@code{'whole} for loading zone contents from the zone file." -msgstr "" +msgstr "@code{'whole} para cargar los contenidos de la zona del fichero de zona." #. type: item #: doc/guix.texi:19910 @@ -38671,7 +38759,7 @@ msgstr "@code{journal-content} (predeterminado: @code{'()})" #. type: table #: doc/guix.texi:19915 msgid "The way the journal is used to store zone and its changes. Possible values are @code{'none} to not use it at all, @code{'changes} to store changes and @code{'all} to store contents. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "La forma en la que se usa el diario para almacenar la zona y sus cambios. Los posibles valores son @code{'none} para no usarlo en absoluto, @code{'changes} para almacenar los cambios y @code{'all} para almacenar los contenidos. @code{#f} proporciona un valor a esta opción, por lo que se usa el valor predeterminado de Knot." #. type: item #: doc/guix.texi:19916 @@ -38682,7 +38770,7 @@ msgstr "@code{max-journal-usage} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19919 msgid "The maximum size for the journal on disk. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "Tamaño máximo del diario en disco. @code{#f} no proporciona un valor a esta opción, por lo que se usa el valor predeterminado de Knot." #. type: item #: doc/guix.texi:19920 @@ -38693,7 +38781,7 @@ msgstr "@code{max-journal-depth} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19923 msgid "The maximum size of the history. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "Tamaño máximo de la historia. @code{#f} proporciona un valor a esta opción, por lo que se usa el valor predeterminado de Knot." #. type: item #: doc/guix.texi:19924 @@ -38704,7 +38792,7 @@ msgstr "@code{max-zone-size} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19928 msgid "The maximum size of the zone file. This limit is enforced for incoming transfer and updates. @code{#f} does not set this option, so the default value from Knot is used." -msgstr "" +msgstr "Tamaño máximo del fichero de zona. Este límite se usa para transferencias entrantes y actualizaciones. @code{#f} no proporciona un valor a esta opción, por lo que se usa el valor predeterminado de Knot." #. type: item #: doc/guix.texi:19929 @@ -38715,7 +38803,7 @@ msgstr "@code{dnssec-policy} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:19933 msgid "A reference to a @code{knot-policy-configuration} record, or the special name @code{\"default\"}. If the value is @code{#f}, there is no dnssec signing on this zone." -msgstr "" +msgstr "Una referencia a un registro de @code{knot-policy-configuration}, o el nombre especial @code{\"default\"}. Si el valor es @code{#f}, no se realiza firma dnssec en esta zona." #. type: item #: doc/guix.texi:19934 @@ -38723,10 +38811,11 @@ msgstr "" msgid "@code{serial-policy} (default: @code{'increment})" msgstr "@code{serial-policy} (predeterminado: @code{'increment})" +# FUZZY #. type: table #: doc/guix.texi:19936 msgid "A policy between @code{'increment} and @code{'unixtime}." -msgstr "" +msgstr "Una política entre @code{'increment} y @code{'unixtime}." #. type: deftp #: doc/guix.texi:19940 @@ -38759,9 +38848,8 @@ msgstr "@code{run-directory} (predeterminado: @code{\"/var/run/knot\"})" # FUZZY #. type: table #: doc/guix.texi:19950 -#, fuzzy msgid "The run directory. This directory will be used for pid file and sockets." -msgstr "El directorio de ejecución usado. Durante la activación del servicio se creará en caso de no existir." +msgstr "El directorio de ejecución. Este directorio se usará para los ficheros de PID y de sockets." #. type: item #: doc/guix.texi:19951 @@ -38783,12 +38871,12 @@ msgstr "secretos, servicio Knot" #. type: table #: doc/guix.texi:19961 msgid "This can be used to manage secrets out-of-band. For example, secret keys may be stored in an out-of-band file not managed by Guix, and thus not visible in @file{/gnu/store}---e.g., you could store secret key configuration in @file{/etc/knot/secrets.conf} and add this file to the @code{includes} list." -msgstr "" +msgstr "Puede usarse para gestionar secretos fuera de banda. Por ejemplo, las claves secretas pueden almacenarse en un fichero fuera de banda no gestionado por Guix, y por tanto no visible en @file{/gnu/store}---por ejemplo, puede almacenar su configuración de clave secreta en @file{/etc/knot/secrets.conf} e incluir este fichero en la lista @code{includes}." #. type: table #: doc/guix.texi:19963 msgid "It can also be used to add configuration not supported by this interface." -msgstr "" +msgstr "También puede usarse para añadir configuración no implementada por esta interfaz." #. type: item #: doc/guix.texi:19964 @@ -38827,7 +38915,7 @@ msgstr "@code{keys} (predeterminada: @code{'()})" #. type: table #: doc/guix.texi:19975 msgid "The list of knot-key-configuration used by this configuration." -msgstr "" +msgstr "La lista de configuraciones knot-key-configuration usadas por esta configuración." #. type: item #: doc/guix.texi:19976 @@ -38838,7 +38926,7 @@ msgstr "@code{acls} (predeterminado: @code{'()})" #. type: table #: doc/guix.texi:19978 msgid "The list of knot-acl-configuration used by this configuration." -msgstr "" +msgstr "La lista de configuraciones knot-acl-configuration usadas por esta configuración." #. type: item #: doc/guix.texi:19979 @@ -38849,7 +38937,7 @@ msgstr "@code{remotes} (predeterminada: @code{'()})" #. type: table #: doc/guix.texi:19981 msgid "The list of knot-remote-configuration used by this configuration." -msgstr "" +msgstr "La lista de configuraciones knot-remote-configuration usadas por esta configuración." #. type: item #: doc/guix.texi:19982 @@ -38860,7 +38948,7 @@ msgstr "@code{zones} (predeterminada: @code{'()})" #. type: table #: doc/guix.texi:19984 msgid "The list of knot-zone-configuration used by this configuration." -msgstr "" +msgstr "La lista de configuraciones knot-zone-configuration usadas por esta configuración." #. type: subsubheading #: doc/guix.texi:19988 @@ -38924,7 +39012,7 @@ msgstr "@code{no-hosts?} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:20011 msgid "When true, don't read the hostnames in /etc/hosts." -msgstr "" +msgstr "Cuando es verdadero, no lee los nombres de máquina en /etc/hosts." #. type: item #: doc/guix.texi:20012 @@ -38935,7 +39023,7 @@ msgstr "@code{port} (predeterminado: @code{53})" #. type: table #: doc/guix.texi:20015 msgid "The port to listen on. Setting this to zero completely disables DNS responses, leaving only DHCP and/or TFTP functions." -msgstr "" +msgstr "El puerto sobre el que se escucha. Proporcionar el valor cero deshabilita las respuestas DNS completamente, dejando las funciones DHCP y/o TFTP únicamente." #. type: item #: doc/guix.texi:20016 @@ -38946,7 +39034,7 @@ msgstr "@code{local-service?} (predeterminado: @code{#t})" #. type: table #: doc/guix.texi:20019 msgid "Accept DNS queries only from hosts whose address is on a local subnet, ie a subnet for which an interface exists on the server." -msgstr "" +msgstr "Acepta peticiones DNS únicamente de máquinas cuya dirección esté en una subred local, es decir, subred para la que existe una interfaz en el servidor." #. type: item #: doc/guix.texi:20020 @@ -38965,10 +39053,12 @@ msgstr "Escucha en las direcciones IP proporcionadas." msgid "@code{resolv-file} (default: @code{\"/etc/resolv.conf\"})" msgstr "@code{resolv-file} (predeterminado: @code{\"/etc/resolv.conf\"})" +# FUZZY +# TODO!!! #. type: table #: doc/guix.texi:20025 msgid "The file to read the IP address of the upstream nameservers from." -msgstr "" +msgstr "Fichero en el que se obtienen las direcciones IP de los servidores de nombres desde los que se obtienen datos." #. type: item #: doc/guix.texi:20026 @@ -38979,13 +39069,12 @@ msgstr "@code{no-resolv?} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:20028 msgid "When true, don't read @var{resolv-file}." -msgstr "" +msgstr "Cuando tiene valor verdadero, no se lee @var{resolv-file}." #. type: table #: doc/guix.texi:20031 -#, fuzzy msgid "Specify IP address of upstream servers directly." -msgstr "Especifica la dirección de correo electrónico de la administradora del servidor." +msgstr "Especifica directamente la dirección IP de los servidores proveedores." #. type: item #: doc/guix.texi:20032 @@ -38996,7 +39085,7 @@ msgstr "@code{cache-size} (predeterminado: @code{150})" #. type: table #: doc/guix.texi:20035 msgid "Set the size of dnsmasq's cache. Setting the cache size to zero disables caching." -msgstr "" +msgstr "Establece el tamaño de la caché de dnsmasq. Proporcionar el valor cero desactiva el almacenamiento en caché." #. type: item #: doc/guix.texi:20036 @@ -39004,10 +39093,11 @@ msgstr "" msgid "@code{negative-cache?} (default: @code{#t})" msgstr "@code{negative-cache?} (predeterminado: @code{#t})" +# FUZZY #. type: table #: doc/guix.texi:20038 msgid "When false, disable negative caching." -msgstr "" +msgstr "Cuando es falso, desactiva la caché negativa." #. type: subsubheading #: doc/guix.texi:20042 @@ -39024,7 +39114,7 @@ msgstr "ddclient" #. type: Plain text #: doc/guix.texi:20048 msgid "The ddclient service described below runs the ddclient daemon, which takes care of automatically updating DNS entries for service providers such as @uref{https://dyn.com/dns/, Dyn}." -msgstr "" +msgstr "El servicio de ddclient descrito a continuación ejecuta el daemon ddclient, que se encarga de actualizar automáticamente entradas DNS para proveedores de servicio como @uref{https://dyn.com/dns/, Dyn}." #. type: Plain text #: doc/guix.texi:20051 @@ -39040,7 +39130,7 @@ msgstr "(service ddclient-service-type)\n" #. type: Plain text #: doc/guix.texi:20063 msgid "Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see @code{secret-file} below.) You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be world-readable @i{via} @file{/gnu/store}.) See the examples in the @file{share/ddclient} directory of the @code{ddclient} package." -msgstr "" +msgstr "Fíjese que ddclient necesita acceder a las credenciales que se almacenan en un @dfn{fichero de secretos}, de manera predeterminada @file{/etc/ddclient/secrets} (véase @code{secret-file} a continuación). Se espera que genere este fichero manualmente, «fuera de banda» (@emph{puede} incluir este fichero en la configuración del servicio, por ejemplo mediante el uso de @code{plain-file}, pero sera legible por todo el mundo a través de @file{/gnu/store}). Véase los ejemplos en el directorio @file{share/ddclient} del paquete @code{ddclient}." #. type: Plain text #: doc/guix.texi:20067 @@ -39067,7 +39157,7 @@ msgstr "{parámetro de @code{ddclient-configuration}} integer daemon" #. type: deftypevr #: doc/guix.texi:20075 msgid "The period after which ddclient will retry to check IP and domain name." -msgstr "" +msgstr "Periodo tras el cual ddclient reintentará la comprobación de IP y de nombre de dominio." #. type: deftypevr #: doc/guix.texi:20080 @@ -39078,7 +39168,7 @@ msgstr "{parámetro de @code{ddclient-configuration}} boolean syslog" #. type: deftypevr #: doc/guix.texi:20082 msgid "Use syslog for the output." -msgstr "" +msgstr "Usa syslog para la salida." #. type: deftypevr #: doc/guix.texi:20087 @@ -39088,9 +39178,8 @@ msgstr "{parámetro de @code{ddclient-configuration}} string mail" #. type: deftypevr #: doc/guix.texi:20089 -#, fuzzy msgid "Mail to user." -msgstr "VT mínimo usado." +msgstr "Envía por correo a la usuaria." #. type: deftypevr #: doc/guix.texi:20091 doc/guix.texi:20098 doc/guix.texi:21435 @@ -39105,9 +39194,8 @@ msgstr "{parámetro de @code{ddclient-configuration}} string mail-failure" #. type: deftypevr #: doc/guix.texi:20096 -#, fuzzy msgid "Mail failed update to user." -msgstr "Paquete Gitolite usado." +msgstr "Envía por correo las actualizaciones fallidas a la usuaria." #. type: deftypevr #: doc/guix.texi:20101 @@ -39131,10 +39219,11 @@ msgstr "El valor predeterminado es @samp{\"/var/run/ddclient/ddclient.pid\"}." msgid "{@code{ddclient-configuration} parameter} boolean ssl" msgstr "{parámetro de @code{ddclient-configuration}} boolean ssl" +# FUZZY #. type: deftypevr #: doc/guix.texi:20110 msgid "Enable SSL support." -msgstr "" +msgstr "Permite el uso de SSL." #. type: deftypevr #: doc/guix.texi:20115 @@ -39318,7 +39407,7 @@ msgstr "{parámetro de @code{openvpn-client-configuration}} string ca" #. type: deftypevr #: doc/guix.texi:20207 doc/guix.texi:20343 msgid "The certificate authority to check connections against." -msgstr "" +msgstr "La autoridad de certificación contra la que se comprueban las conexiones." #. type: deftypevr #: doc/guix.texi:20209 doc/guix.texi:20345 @@ -39334,7 +39423,7 @@ msgstr "{parámetro de @code{openvpn-client-configuration}} string cert" #. type: deftypevr #: doc/guix.texi:20215 doc/guix.texi:20351 msgid "The certificate of the machine the daemon is running on. It should be signed by the authority given in @code{ca}." -msgstr "" +msgstr "El certificado de la máquina en la que se ejecuta el daemon. Debe estar firmado por la autoridad proporcionada en @code{ca}." #. type: deftypevr #: doc/guix.texi:20217 doc/guix.texi:20353 @@ -39350,7 +39439,7 @@ msgstr "{parámetro de @code{openvpn-client-configuration}} string key" #. type: deftypevr #: doc/guix.texi:20223 doc/guix.texi:20359 msgid "The key of the machine the daemon is running on. It must be the key whose certificate is @code{cert}." -msgstr "" +msgstr "La clave de la máquina en la que se ejecuta el daemon. Debe ser la clave cuyo certificado es @code{cert}." #. type: deftypevr #: doc/guix.texi:20225 doc/guix.texi:20361 @@ -39366,7 +39455,7 @@ msgstr "{parámetro de @code{openvpn-client-configuration}} boolean comp-lzo?" #. type: deftypevr #: doc/guix.texi:20230 doc/guix.texi:20366 msgid "Whether to use the lzo compression algorithm." -msgstr "" +msgstr "Determina si se usa el algoritmo de compresión lzo." #. type: deftypevr #: doc/guix.texi:20235 @@ -39374,10 +39463,11 @@ msgstr "" msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?" msgstr "{parámetro de @code{openvpn-client-configuration}} boolean persist-key?" +# FUZZY #. type: deftypevr #: doc/guix.texi:20237 doc/guix.texi:20373 msgid "Don't re-read key files across SIGUSR1 or --ping-restart." -msgstr "" +msgstr "No vuelve a leer los ficheros de claves tras la señal SIGUSR1 o --ping-restart." #. type: deftypevr #: doc/guix.texi:20242 @@ -39388,7 +39478,7 @@ msgstr "{parámetro de @code{openvpn-client-configuration}} boolean persist-tun? #. type: deftypevr #: doc/guix.texi:20245 doc/guix.texi:20381 msgid "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts." -msgstr "" +msgstr "No cierra y reabre el dispositivo TUN/TAP o ejecuta los guiones de parada e inicio tras los reinicios por SIGUSR1 o --ping-restart." #. type: deftypevr #: doc/guix.texi:20250 @@ -39416,7 +39506,7 @@ msgstr "{parámetro de @code{openvpn-client-configuration}} cliente-tls-auth tls #. type: deftypevr #: doc/guix.texi:20260 doc/guix.texi:20396 msgid "Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks." -msgstr "" +msgstr "Añade una capa adicional de verificación HMAC sobre el canal de control TLS para protección contra ataques de denegación de servicio (DoS)." #. type: deftypevr #: doc/guix.texi:20265 @@ -39424,10 +39514,11 @@ msgstr "" msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?" msgstr "{parámetro de @code{openvpn-client-configuration}} key-usage verify-key-usage?" +# FUZZY #. type: deftypevr #: doc/guix.texi:20267 msgid "Whether to check the server certificate has server usage extension." -msgstr "" +msgstr "Si se comprueba que el certificado del servidor tenga la extensión de uso de servidor." #. type: deftypevr #: doc/guix.texi:20272 @@ -39435,21 +39526,22 @@ msgstr "" msgid "{@code{openvpn-client-configuration} parameter} bind bind?" msgstr "{parámetro de @code{openvpn-client-configuration}} bind bind?" +# FUZZY #. type: deftypevr #: doc/guix.texi:20274 msgid "Bind to a specific local port number." -msgstr "" +msgstr "Asocación a un puerto local específico." #. type: deftypevr #: doc/guix.texi:20279 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?" -msgstr "{parámetro de @code{openvpn-client-configuration}} reintenta-resolv resolv-retry?" +msgstr "{parámetro de @code{openvpn-client-configuration}} resolv-retry resolv-retry?" #. type: deftypevr #: doc/guix.texi:20281 msgid "Retry resolving server address." -msgstr "" +msgstr "Reintentos de resolución de la dirección del servidor." #. type: deftypevr #: doc/guix.texi:20286 @@ -39584,9 +39676,8 @@ msgstr "{parámetro de @code{openvpn-server-configuration}} number port" #. type: deftypevr #: doc/guix.texi:20403 -#, fuzzy msgid "Specifies the port number on which the server listens." -msgstr "Puerto en el que escucha el servidor." +msgstr "Especifica el número de puerto en el que escucha el servidor." #. type: deftypevr #: doc/guix.texi:20408 @@ -39667,7 +39758,7 @@ msgstr "{parámetro de @code{openvpn-server-configuration}} boolean client-to-cl #. type: deftypevr #: doc/guix.texi:20445 msgid "When true, clients are allowed to talk to each other inside the VPN." -msgstr "" +msgstr "Cuando es verdadero, se permite la comunicación entre clientes dentro de la VPN." #. type: deftypevr #: doc/guix.texi:20450 @@ -39678,7 +39769,7 @@ msgstr "{parámetro de @code{openvpn-server-configuration}} keepalive keepalive" #. type: deftypevr #: doc/guix.texi:20456 msgid "Causes ping-like messages to be sent back and forth over the link so that each side knows when the other side has gone down. @code{keepalive} requires a pair. The first element is the period of the ping sending, and the second element is the timeout before considering the other side down." -msgstr "" +msgstr "Hace que se envíen mensajes tipo-ping en ambas direcciones a través del enlace de modo que cada extremo conozca si el otro extremo no está disponible. @code{keepalive} necesita un par. El primer elemento es el periodo de envío de ping, y el segundo elemento es el plazo máximo antes de considerar que el otro extremo no está disponible." #. type: deftypevr #: doc/guix.texi:20459 @@ -39689,7 +39780,7 @@ msgstr "{parámetro de @code{openvpn-server-configuration}} number max-clients" #. type: deftypevr #: doc/guix.texi:20461 msgid "The maximum number of clients." -msgstr "" +msgstr "Número máximo de clientes." #. type: deftypevr #: doc/guix.texi:20466 @@ -39700,7 +39791,7 @@ msgstr "{parámetro de @code{openvpn-server-configuration}} string status" #. type: deftypevr #: doc/guix.texi:20469 msgid "The status file. This file shows a small report on current connection. It is truncated and rewritten every minute." -msgstr "" +msgstr "El fichero de estado. Este fichero muestra un pequeño informe sobre la conexión actual. Su contenido se borra y se reescribe cada minuto." #. type: deftypevr #: doc/guix.texi:20471 @@ -39772,7 +39863,7 @@ msgstr "NFS" #. type: Plain text #: doc/guix.texi:20515 msgid "The @code{(gnu services nfs)} module provides the following services, which are most commonly used in relation to mounting or exporting directory trees as @dfn{network file systems} (NFS)." -msgstr "" +msgstr "El módulo @code{(gnu services nfs)} proporciona los siguientes servicios, que se usan habitualmente en relación con el montado o la exportación de árboles de directorios como @dfn{sistemas de ficheros en red} (NFS)." #. type: subsubheading #: doc/guix.texi:20516 @@ -39789,7 +39880,7 @@ msgstr "rpcbind" #. type: Plain text #: doc/guix.texi:20523 msgid "The RPC Bind service provides a facility to map program numbers into universal addresses. Many NFS related services use this facility. Hence it is automatically started when a dependent service starts." -msgstr "" +msgstr "El servicio RPC Bind proporciona una forma de asociar números de programa con direcciones universales. Muchos servicios relacionados con NFS usan esta característica. De ahí que se inicie automáticamente cuando un servicio dependiente se inicia." #. type: defvr #: doc/guix.texi:20524 @@ -39833,7 +39924,7 @@ msgstr "@code{warm-start?} (predeterminado: @code{#t})" #. type: table #: doc/guix.texi:20540 msgid "If this parameter is @code{#t}, then the daemon will read a state file on startup thus reloading state information saved by a previous instance." -msgstr "" +msgstr "Si este parámetro es @code{#t}, el daemon leerá el fichero de estado durante el arranche, por tanto recargando la información del estado almacenada por la instancia previa." #. type: subsubheading #: doc/guix.texi:20544 @@ -39856,7 +39947,7 @@ msgstr "rpc_pipefs" #. type: Plain text #: doc/guix.texi:20550 msgid "The pipefs file system is used to transfer NFS related data between the kernel and user space programs." -msgstr "" +msgstr "El sistema de ficheros pipefs se usa para transferir datos relacionados con NFS entre el núcleo y los programas de espacio de usuaria." #. type: defvr #: doc/guix.texi:20551 @@ -39914,12 +40005,13 @@ msgstr "GSS" #: doc/guix.texi:20568 #, no-wrap msgid "global security system" -msgstr "" +msgstr "sistema de seguridad global (GSS)" +# FUZZY #. type: Plain text #: doc/guix.texi:20575 msgid "The @dfn{global security system} (GSS) daemon provides strong security for RPC based protocols. Before exchanging RPC requests an RPC client must establish a security context. Typically this is done using the Kerberos command @command{kinit} or automatically at login time using PAM services (@pxref{Kerberos Services})." -msgstr "" +msgstr "El daemon @dfn{sistema de seguridad global} (GSS) proporciona fuertes garantías de seguridad para protocolos basados en RPC. Antes de intercambiar peticiones RPC el cliente debe establecer un contexto de seguridad. Habitualmente esto se lleva a cabo con el uso de la orden @command{kinit}o automáticamente durante el ingreso al sistema mediante el uso de servicios PAM (@pxref{Kerberos Services})." #. type: defvr #: doc/guix.texi:20576 @@ -39952,7 +40044,7 @@ msgstr "@code{nfs-utils} (predeterminado: @code{nfs-utils})" #. type: table #: doc/guix.texi:20586 msgid "The package in which the @command{rpc.gssd} command is to be found." -msgstr "" +msgstr "Paquete en el que se encuentra la orden @command{rpc.gssd}." #. type: item #: doc/guix.texi:20587 doc/guix.texi:20612 @@ -39982,12 +40074,12 @@ msgstr "idmapd" #: doc/guix.texi:20596 #, no-wrap msgid "name mapper" -msgstr "" +msgstr "servicio de asociación de nombres" #. type: Plain text #: doc/guix.texi:20600 msgid "The idmap daemon service provides mapping between user IDs and user names. Typically it is required in order to access file systems mounted via NFSv4." -msgstr "" +msgstr "El servicio del daemon idmap proporciona una asociación entre identificadores de usuaria y nombres de usuaria. Habitualmente es necesario para acceder sistemas de ficheros montados con NFSv4." #. type: defvr #: doc/guix.texi:20601 @@ -40016,7 +40108,7 @@ msgstr "Tipo de datos que representa la configuración del servicio del daemon I #. type: table #: doc/guix.texi:20611 msgid "The package in which the @command{rpc.idmapd} command is to be found." -msgstr "" +msgstr "Paquete en el que se encuentra la orden @command{rpc.idmapd}." #. type: item #: doc/guix.texi:20615 @@ -40024,15 +40116,16 @@ msgstr "" msgid "@code{domain} (default: @code{#f})" msgstr "@code{domain} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:20619 msgid "The local NFSv4 domain name. This must be a string or @code{#f}. If it is @code{#f} then the daemon will use the host's fully qualified domain name." -msgstr "" +msgstr "El nombre de dominio local de NFSv4. Debe ser una cadena o @code{#f}. Si es @code{#f} el daemon usará el nombre de dominio totalmente cualificado de la máquina." #. type: Plain text #: doc/guix.texi:20630 msgid "@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} is a continuous integration tool for Guix. It can be used both for development and for providing substitutes to others (@pxref{Substitutes})." -msgstr "" +msgstr "@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} es una herramienta de integración continua para Guix. Puede usarse tanto para el desarrollo como para proporcionar sustituciones a otras personas (@pxref{Substitutes})." #. type: Plain text #: doc/guix.texi:20632 @@ -40053,7 +40146,7 @@ msgstr "El tipo del servicio Cuirass. Su valor debe ser un objeto @code{cuirass- #. type: Plain text #: doc/guix.texi:20643 msgid "To add build jobs, you have to set the @code{specifications} field of the configuration. Here is an example of a service that polls the Guix repository and builds the packages from a manifest. Some of the packages are defined in the @code{\"custom-packages\"} input, which is the equivalent of @code{GUIX_PACKAGE_PATH}." -msgstr "" +msgstr "Para añadir trabajos de construcción, debe proporcionarlos en el campo @code{specifications} de la configuración. A continuación se encuentra un ejemplo de un servicio que consulta el repositorio de Guix y construye los paquetes de un manifiesto. Algunos de los paquetes se definen en la entrada @code{\"custom-packages\"}, que es el equivalente de @code{GUIX_PACKAGE_PATH}." #. type: example #: doc/guix.texi:20671 @@ -40130,7 +40223,7 @@ msgstr "" #. type: Plain text #: doc/guix.texi:20680 msgid "While information related to build jobs is located directly in the specifications, global settings for the @command{cuirass} process are accessible in other @code{cuirass-configuration} fields." -msgstr "" +msgstr "Mientras que la información de los trabajos de construcción se encuentra directamente en las especificaciones, la configuración global del proceso @command{cuirass} está accesible en otros campos de @code{cuirass-configuration}." #. type: deftp #: doc/guix.texi:20681 @@ -40196,7 +40289,7 @@ msgstr "@code{interval} (predeterminado: @code{60})" #. type: table #: doc/guix.texi:20700 msgid "Number of seconds between the poll of the repositories followed by the Cuirass jobs." -msgstr "" +msgstr "Número de segundos entre las consulta de repositorios seguida de los trabajos de Cuirass." #. type: item #: doc/guix.texi:20701 @@ -40207,7 +40300,7 @@ msgstr "@code{database} (predeterminada: @code{\"/var/lib/cuirass/cuirass.db\"}) #. type: table #: doc/guix.texi:20704 msgid "Location of sqlite database which contains the build results and previously added specifications." -msgstr "" +msgstr "Ruta de la base de datos sqlite que contiene los resultados de construcción y las especificaciones añadidas previamente." #. type: item #: doc/guix.texi:20705 @@ -40218,7 +40311,7 @@ msgstr "@code{ttl} (predeterminado: @code{(* 30 24 3600)})" #. type: table #: doc/guix.texi:20709 msgid "Specifies the time-to-live (TTL) in seconds of garbage collector roots that are registered for build results. This means that build results are protected from garbage collection for at least @var{ttl} seconds." -msgstr "" +msgstr "Especifica el tiempo de vida (TTL) en segundos de las raíces del recolector de basura que se registran con resultados de construcciones. Esto significa que los resultados de las construcciones se protegen de la recolección de basura al menos @var{ttl} segundos." #. type: item #: doc/guix.texi:20710 @@ -40245,7 +40338,7 @@ msgstr "@code{specifications} (predeterminada: @code{#~'()})" #. type: table #: doc/guix.texi:20723 msgid "A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, where a specification is an association list (@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-example}) as shown in the example above." -msgstr "" +msgstr "Una expresión-G (@pxref{G-Expressions}) que evalua a una lista de especificaciones, donde una especificación es una lista asociativa (@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) cuyas claves son palabras claves (@code{#:ejemplo-de-palabra-clave}) como se muestra en el ejemplo anterior." #. type: item #: doc/guix.texi:20724 @@ -40253,10 +40346,11 @@ msgstr "" msgid "@code{use-substitutes?} (default: @code{#f})" msgstr "@code{use-substitutes?} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:20727 msgid "This allows using substitutes to avoid building every dependencies of a job from source." -msgstr "" +msgstr "Permite el uso de sustituciones para evitar la construcción desde las fuentes de todas las dependencias de un trabajo." #. type: item #: doc/guix.texi:20728 doc/guix.texi:25286 @@ -40267,7 +40361,7 @@ msgstr "@code{one-shot?} (predeterminado: @code{#f})" #. type: table #: doc/guix.texi:20730 msgid "Only evaluate specifications and build derivations once." -msgstr "" +msgstr "Evalua las especificaciones y construye las derivaciones solo una vez." #. type: item #: doc/guix.texi:20731 @@ -40317,7 +40411,7 @@ msgstr "El módulo @code{(gnu services pm)} proporciona una definición de servi #. type: Plain text #: doc/guix.texi:20755 msgid "TLP enables various powersaving modes in userspace and kernel. Contrary to @code{upower-service}, it is not a passive, monitoring tool, as it will apply custom settings each time a new power source is detected. More information can be found at @uref{https://linrunner.de/en/tlp/tlp.html, TLP home page}." -msgstr "" +msgstr "TLP activa varios modos de ahorro de energía en el núcleo y en espacio de usuaria. Al contrario que @code{upower-service}, no es una herramienta de monitorización pasiva, puesto que aplicará una nueva configuración personalizada cada vez que se detecte una nueva fuente de energía/alimentación. Puede encontrar más información en @uref{https://linrunner.de/en/tlp/tlp.html, la página de TLP}." #. type: deffn #: doc/guix.texi:20756 @@ -40339,7 +40433,7 @@ msgstr "(service tlp-service-type)\n" #. type: Plain text #: doc/guix.texi:20767 msgid "By default TLP does not need much configuration but most TLP parameters can be tweaked using @code{tlp-configuration}." -msgstr "" +msgstr "De manera predeterminada TLP no necesita mucha configuración, pero los parámetros de TLP se pueden ajustar mediante el uso de @code{tlp-configuration}." #. type: Plain text #: doc/guix.texi:20773 @@ -40371,7 +40465,7 @@ msgstr "{parámetro de @code{tlp-configuration}} boolean tlp-enable?" #. type: deftypevr #: doc/guix.texi:20791 msgid "Set to true if you wish to enable TLP." -msgstr "" +msgstr "Proporcione un valor verdadero si desea activar TLP." #. type: deftypevr #: doc/guix.texi:20796 @@ -40382,12 +40476,12 @@ msgstr "{parámetro de @code{tlp-configuration}} string tlp-default-mode" #. type: deftypevr #: doc/guix.texi:20799 msgid "Default mode when no power supply can be detected. Alternatives are AC and BAT." -msgstr "" +msgstr "Modo predeterminado cuando no se puede detectar una fuente de alimentación. Las alternativas son AC (corriente alterna) y BAT (batería)." #. type: deftypevr #: doc/guix.texi:20801 msgid "Defaults to @samp{\"AC\"}." -msgstr "El valor predeterminado es @samp{\"AC\"}." +msgstr "El valor predeterminado es @samp{\"AC\"} (corriente alterna)." #. type: deftypevr #: doc/guix.texi:20804 @@ -40398,7 +40492,7 @@ msgstr "{parámetro de @code{tlp-configuration}} entero-no-negativo disk-idle-se #. type: deftypevr #: doc/guix.texi:20807 msgid "Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC." -msgstr "" +msgstr "Número de segundos que el núcleo Linux debe esperar desde que el disco se queda en espera, antes de sincronizar en corriente alterna (AC)." #. type: deftypevr #: doc/guix.texi:20812 @@ -40409,7 +40503,7 @@ msgstr "{parámetro de @code{tlp-configuration}} entero-no-negativo disk-idle-se #. type: deftypevr #: doc/guix.texi:20814 msgid "Same as @code{disk-idle-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{disk-idle-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20816 @@ -40422,10 +40516,11 @@ msgstr "El valor predeterminado es @samp{2}." msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac" msgstr "{parámetro de @code{tlp-configuration}} entero-no-negativo max-lost-work-secs-on-ac" +# FUZZY #. type: deftypevr #: doc/guix.texi:20821 msgid "Dirty pages flushing periodicity, expressed in seconds." -msgstr "" +msgstr "Periodicidad de la evacuación de las páginas sucias, expresada en segundos." #. type: deftypevr #: doc/guix.texi:20823 doc/guix.texi:21046 doc/guix.texi:22375 @@ -40442,7 +40537,7 @@ msgstr "{parámetro de @code{tlp-configuration}} entero-no-negativo max-lost-wor #. type: deftypevr #: doc/guix.texi:20828 msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{max-lost-work-secs-on-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20830 @@ -40458,7 +40553,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-lista-cadena-separada-esp #. type: deftypevr #: doc/guix.texi:20837 msgid "CPU frequency scaling governor on AC mode. With intel_pstate driver, alternatives are powersave and performance. With acpi-cpufreq driver, alternatives are ondemand, powersave, performance and conservative." -msgstr "" +msgstr "Governador de escalado de frecuencia del procesador en modo de corriente alterna (AC). Con el controlador intel_pstate, las alternativas son «powersave» (ahorro de energía) y «performance» (rendimiento). Con el controlador acpi-cpufreq, las alternativas son «ondemand» (bajo demanda), «powersave», «performance» y «conservative» (conservativo)." #. type: deftypevr #: doc/guix.texi:20842 @@ -40469,7 +40564,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-lista-cadena-separada-esp #. type: deftypevr #: doc/guix.texi:20844 msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{max-lost-work-secs-on-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20849 @@ -40477,10 +40572,11 @@ msgstr "" msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac" msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-scaling-min-freq-on-ac" +# FUZZY #. type: deftypevr #: doc/guix.texi:20851 msgid "Set the min available frequency for the scaling governor on AC." -msgstr "" +msgstr "Establece la frecuencia mínima disponible para el controlador de escalado en AC." #. type: deftypevr #: doc/guix.texi:20856 @@ -40488,10 +40584,11 @@ msgstr "" msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac" msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-scaling-max-freq-on-ac" +# FUZZY #. type: deftypevr #: doc/guix.texi:20858 msgid "Set the max available frequency for the scaling governor on AC." -msgstr "" +msgstr "Establece la frecuencia máxima disponible para el controlador de escalado en AC." #. type: deftypevr #: doc/guix.texi:20863 @@ -40502,7 +40599,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-sc #. type: deftypevr #: doc/guix.texi:20865 msgid "Set the min available frequency for the scaling governor on BAT." -msgstr "" +msgstr "Establece la frecuencia mínima disponible para el controlador de escalado en BAT." #. type: deftypevr #: doc/guix.texi:20870 @@ -40513,7 +40610,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-sc #. type: deftypevr #: doc/guix.texi:20872 msgid "Set the max available frequency for the scaling governor on BAT." -msgstr "" +msgstr "Establece la frecuencia máxima disponible para el controlador de escalado en BAT." #. type: deftypevr #: doc/guix.texi:20877 @@ -40521,10 +40618,11 @@ msgstr "" msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac" msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-min-perf-on-ac" +# FUZZY #. type: deftypevr #: doc/guix.texi:20880 msgid "Limit the min P-state to control the power dissipation of the CPU, in AC mode. Values are stated as a percentage of the available performance." -msgstr "" +msgstr "Limita el estado-P mínimo para controlar la disipación de potencia del procesador en modo AC. Los valores se indican como un porcentaje de rendimiento disponible." #. type: deftypevr #: doc/guix.texi:20885 @@ -40535,7 +40633,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-ma #. type: deftypevr #: doc/guix.texi:20888 msgid "Limit the max P-state to control the power dissipation of the CPU, in AC mode. Values are stated as a percentage of the available performance." -msgstr "" +msgstr "Limita el estado-P máximo para controlar la disipación de potencia del procesador en modo AC. Los valores se indican como un porcentaje de rendimiento disponible." #. type: deftypevr #: doc/guix.texi:20893 @@ -40546,7 +40644,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-mi #. type: deftypevr #: doc/guix.texi:20895 msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode." -msgstr "" +msgstr "Igual que @code{cpu-min-perf-on-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20900 @@ -40557,7 +40655,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-entero-no-negativo cpu-ma #. type: deftypevr #: doc/guix.texi:20902 msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode." -msgstr "" +msgstr "Igual que @code{cpu-max-perf-on-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20907 @@ -40568,7 +40666,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-boolean cpu-boost-on-ac?" #. type: deftypevr #: doc/guix.texi:20909 msgid "Enable CPU turbo boost feature on AC mode." -msgstr "" +msgstr "Activa la característica «turbo boost» del procesador en modo AC (corriente alterna)." #. type: deftypevr #: doc/guix.texi:20914 @@ -40579,7 +40677,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-boolean cpu-boost-on-bat? #. type: deftypevr #: doc/guix.texi:20916 msgid "Same as @code{cpu-boost-on-ac?} on BAT mode." -msgstr "" +msgstr "Igual que @code{cpu-boost-on-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20921 @@ -40590,7 +40688,7 @@ msgstr "{parámetro de @code{tlp-configuration}} boolean sched-powersave-on-ac?" #. type: deftypevr #: doc/guix.texi:20924 msgid "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions." -msgstr "" +msgstr "Permite al núcleo Linux minimizar el número de núcleos/hyper-thread del procesador usados bajo condiciones de baja carga." #. type: deftypevr #: doc/guix.texi:20929 @@ -40601,7 +40699,7 @@ msgstr "{parámetro de @code{tlp-configuration}} boolean sched-powersave-on-bat? #. type: deftypevr #: doc/guix.texi:20931 msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode." -msgstr "" +msgstr "Igual que @code{sched-powersave-on-ac?} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20936 @@ -40609,10 +40707,11 @@ msgstr "" msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?" msgstr "{parámetro de @code{tlp-configuration}} boolean nmi-watchdog?" +# FUZZY #. type: deftypevr #: doc/guix.texi:20938 msgid "Enable Linux kernel NMI watchdog." -msgstr "" +msgstr "Activa el proceso guardián (watchdog) NMI del núcleo Linux." #. type: deftypevr #: doc/guix.texi:20943 @@ -40620,10 +40719,11 @@ msgstr "" msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls" msgstr "{parámetro de @code{tlp-configuration}} maybe-string phc-controls" +# FUZZY #. type: deftypevr #: doc/guix.texi:20946 msgid "For Linux kernels with PHC patch applied, change CPU voltages. An example value would be @samp{\"F:V F:V F:V F:V\"}." -msgstr "" +msgstr "Para núcleos Linux con el parche PHC aplicado, cambia los voltajes del procesador. Un valor de ejemplo sería @samp{\"F:V F:V F:V F:V\"}." #. type: deftypevr #: doc/guix.texi:20951 @@ -40634,7 +40734,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string energy-perf-policy-on-ac #. type: deftypevr #: doc/guix.texi:20954 msgid "Set CPU performance versus energy saving policy on AC. Alternatives are performance, normal, powersave." -msgstr "" +msgstr "Establece la política de alto rendimiento del procesador en vez del ahorro de energíal estar en corriente alterna (AC). Las alternativas son «performance» (alto rendimiento), «normal» y «powersave» (ahorro de energía)." #. type: deftypevr #: doc/guix.texi:20956 doc/guix.texi:21054 doc/guix.texi:21084 @@ -40650,7 +40750,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string energy-perf-policy-on-ba #. type: deftypevr #: doc/guix.texi:20961 msgid "Same as @code{energy-perf-policy-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{energy-perf-policy-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20963 doc/guix.texi:21061 @@ -40677,7 +40777,7 @@ msgstr "{parámetro de @code{tlp-configuration}} lista-cadena-separada-espacios #. type: deftypevr #: doc/guix.texi:20973 msgid "Hard disk advanced power management level." -msgstr "" +msgstr "Nivel de APM (gestión avanzada de energía) del disco duro." #. type: deftypevr #: doc/guix.texi:20976 @@ -40688,7 +40788,7 @@ msgstr "{parámetro de @code{tlp-configuration}} lista-cadena-separada-espacios #. type: deftypevr #: doc/guix.texi:20978 msgid "Same as @code{disk-apm-bat} but on BAT mode." -msgstr "" +msgstr "Igual que @code{disk-apm-bat} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20981 @@ -40699,7 +40799,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-lista-cadena-separada-esp #. type: deftypevr #: doc/guix.texi:20984 msgid "Hard disk spin down timeout. One value has to be specified for each declared hard disk." -msgstr "" +msgstr "Plazo para la parada rotacional del disco duro. Se debe especificar un valor por cada disco duro declarado." #. type: deftypevr #: doc/guix.texi:20989 @@ -40710,7 +40810,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-lista-cadena-separada-esp #. type: deftypevr #: doc/guix.texi:20991 msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{disk-spindown-timeout-on-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:20996 @@ -40721,7 +40821,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-lista-cadena-separada-esp #. type: deftypevr #: doc/guix.texi:21000 msgid "Select IO scheduler for disk devices. One value has to be specified for each declared hard disk. Example alternatives are cfq, deadline and noop." -msgstr "" +msgstr "Selecciona el planificador de E/S para dispositivos de disco. Se debe especificar un valor por cada disco duro declarado. Ejemplos de alternativas son «cfq», «deadline» y «noop»." #. type: deftypevr #: doc/guix.texi:21005 @@ -40732,7 +40832,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string sata-linkpwr-on-ac" #. type: deftypevr #: doc/guix.texi:21008 msgid "SATA aggressive link power management (ALPM) level. Alternatives are min_power, medium_power, max_performance." -msgstr "" +msgstr "Nivel de gestión agresiva de energía del enlace (ALPM) de SATA. Las alternativas son «min_power» (energía mínima), «medium_power» (energía media) y «max_performance» (máximo rendimiento)." #. type: deftypevr #: doc/guix.texi:21010 @@ -40748,7 +40848,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string sata-linkpwr-on-bat" #. type: deftypevr #: doc/guix.texi:21015 msgid "Same as @code{sata-linkpwr-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{sata-linkpwr-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21017 @@ -40764,7 +40864,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-string sata-linkpwr-black #. type: deftypevr #: doc/guix.texi:21022 msgid "Exclude specified SATA host devices for link power management." -msgstr "" +msgstr "Excluye los dispositivos SATA especificados de la gestión de energía del enlace." #. type: deftypevr #: doc/guix.texi:21027 @@ -40775,7 +40875,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-on-off-boolean ahci-runti #. type: deftypevr #: doc/guix.texi:21030 msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode." -msgstr "" +msgstr "Activa la gestión de energía de tiempo de ejecución para controladores AHCI y discos en modo AC." #. type: deftypevr #: doc/guix.texi:21035 @@ -40786,7 +40886,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-on-off-boolean ahci-runti #. type: deftypevr #: doc/guix.texi:21037 msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode." -msgstr "" +msgstr "Igual que @code{ahci-runtime-pm-on-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21042 @@ -40797,7 +40897,7 @@ msgstr "{parámetro de @code{tlp-configuration}} entero-no-negativo ahci-runtime #. type: deftypevr #: doc/guix.texi:21044 msgid "Seconds of inactivity before disk is suspended." -msgstr "" +msgstr "Segundos de inactividad antes de suspender el disco." #. type: deftypevr #: doc/guix.texi:21049 @@ -40808,7 +40908,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string pcie-aspm-on-ac" #. type: deftypevr #: doc/guix.texi:21052 msgid "PCI Express Active State Power Management level. Alternatives are default, performance, powersave." -msgstr "" +msgstr "Nivel de gestión de energía de estado activo de PCI Express. Las alternativas son «default» (predeterminado), «performance» (rendimiento) y «powersave» (ahorro de energía)." #. type: deftypevr #: doc/guix.texi:21057 @@ -40819,7 +40919,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string pcie-aspm-on-bat" #. type: deftypevr #: doc/guix.texi:21059 msgid "Same as @code{pcie-aspm-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{pcie-aspm-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21064 @@ -40830,7 +40930,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string radeon-power-profile-on- #. type: deftypevr #: doc/guix.texi:21067 msgid "Radeon graphics clock speed level. Alternatives are low, mid, high, auto, default." -msgstr "" +msgstr "Nivel de velocidad de reloj de gráficos Radeon. Las alternativas son «low» (bajo), «mid» (medio), «high» (alto), «auto» (automático) y «default» (predeterminado)." #. type: deftypevr #: doc/guix.texi:21069 @@ -40846,7 +40946,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string radeon-power-profile-on- #. type: deftypevr #: doc/guix.texi:21074 msgid "Same as @code{radeon-power-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{radeon-power-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21076 @@ -40862,7 +40962,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string radeon-dpm-state-on-ac" #. type: deftypevr #: doc/guix.texi:21082 msgid "Radeon dynamic power management method (DPM). Alternatives are battery, performance." -msgstr "" +msgstr "Método de gestión de energía dinámica (DPM) de Radeon. Las alternativas son «battery» (batería) y «performance» (rendimiento)." #. type: deftypevr #: doc/guix.texi:21087 @@ -40873,7 +40973,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string radeon-dpm-state-on-bat" #. type: deftypevr #: doc/guix.texi:21089 msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{radeon-dpm-state-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21091 @@ -40889,7 +40989,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string radeon-dpm-perf-level-on #. type: deftypevr #: doc/guix.texi:21096 msgid "Radeon DPM performance level. Alternatives are auto, low, high." -msgstr "" +msgstr "Nivel de rendimiento del DPM de Radeon. Las alternativas son «auto» (automático), «low» (bajo) y «high» (alto)." #. type: deftypevr #: doc/guix.texi:21098 doc/guix.texi:21105 doc/guix.texi:21179 @@ -40905,7 +41005,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string radeon-dpm-perf-level-on #. type: deftypevr #: doc/guix.texi:21103 msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{radeon-dpm-perf-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21108 @@ -40913,10 +41013,11 @@ msgstr "" msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?" msgstr "{parámetro de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-ac?" +# FUZZY #. type: deftypevr #: doc/guix.texi:21110 msgid "Wifi power saving mode." -msgstr "" +msgstr "Modo de ahorro de energía de Wifi." #. type: deftypevr #: doc/guix.texi:21115 @@ -40927,7 +41028,7 @@ msgstr "{parámetro de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-bat? #. type: deftypevr #: doc/guix.texi:21117 msgid "Same as @code{wifi-power-ac?} but on BAT mode." -msgstr "" +msgstr "Igual que @code{wifi-power-ac?} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21122 @@ -40935,10 +41036,11 @@ msgstr "" msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?" msgstr "{parámetro de @code{tlp-configuration}} y-n-boolean wol-disable?" +# FUZZY #. type: deftypevr #: doc/guix.texi:21124 msgid "Disable wake on LAN." -msgstr "" +msgstr "Desactiva el encendido desde la red local (wake on LAN)." #. type: deftypevr #: doc/guix.texi:21129 @@ -40949,7 +41051,7 @@ msgstr "{parámetro de @code{tlp-configuration}} entero-no-negativo sound-power- #. type: deftypevr #: doc/guix.texi:21132 msgid "Timeout duration in seconds before activating audio power saving on Intel HDA and AC97 devices. A value of 0 disables power saving." -msgstr "" +msgstr "Duración en segundos del plazo antes de activar el ahorro de energía de audio en dispositivos Intel HDA y AC97. El valor 0 desactiva el ahorro de energia." #. type: deftypevr #: doc/guix.texi:21137 @@ -40960,7 +41062,7 @@ msgstr "{parámetro de @code{tlp-configuration}} entero-no-negativo sound-power- #. type: deftypevr #: doc/guix.texi:21139 msgid "Same as @code{sound-powersave-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{sound-powersave-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21141 doc/guix.texi:21668 doc/guix.texi:21812 @@ -40976,7 +41078,7 @@ msgstr "{parámetro de @code{tlp-configuration}} y-n-boolean sound-power-save-co #. type: deftypevr #: doc/guix.texi:21146 msgid "Disable controller in powersaving mode on Intel HDA devices." -msgstr "" +msgstr "Desactiva el controlador en modo de ahorro de energía en dispositivos Intel HDA." #. type: deftypevr #: doc/guix.texi:21151 @@ -40987,7 +41089,7 @@ msgstr "{parámetro de @code{tlp-configuration}} boolean bay-poweroff-on-bat?" #. type: deftypevr #: doc/guix.texi:21155 msgid "Enable optical drive in UltraBay/MediaBay on BAT mode. Drive can be powered on again by releasing (and reinserting) the eject lever or by pressing the disc eject button on newer models." -msgstr "" +msgstr "Activa las unidades ópticas en UltraBay/MediaBay en modo BAT. La unidad puede volver a alimentarse liberando (y reinsertando) la palanca de eyección o presionando el botón de eyección de disco en modelos más modernos." #. type: deftypevr #: doc/guix.texi:21160 @@ -40998,7 +41100,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string bay-device" #. type: deftypevr #: doc/guix.texi:21162 msgid "Name of the optical drive device to power off." -msgstr "" +msgstr "Nombre de la unidad de dispositivos ópticos a apagar." #. type: deftypevr #: doc/guix.texi:21164 @@ -41014,7 +41116,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string runtime-pm-on-ac" #. type: deftypevr #: doc/guix.texi:21170 msgid "Runtime Power Management for PCI(e) bus devices. Alternatives are on and auto." -msgstr "" +msgstr "Gestión de energía en tiempo de ejecución para dispositivos de bus PCI(e). Las alternativas son «on» y «auto»." #. type: deftypevr #: doc/guix.texi:21172 @@ -41030,7 +41132,7 @@ msgstr "{parámetro de @code{tlp-configuration}} string runtime-pm-on-bat" #. type: deftypevr #: doc/guix.texi:21177 msgid "Same as @code{runtime-pm-ac} but on BAT mode." -msgstr "" +msgstr "Igual que @code{runtime-pm-ac} pero en modo BAT (batería)." #. type: deftypevr #: doc/guix.texi:21182 @@ -41041,7 +41143,7 @@ msgstr "{parámetro de @code{tlp-configuration}} boolean runtime-pm-all?" #. type: deftypevr #: doc/guix.texi:21185 msgid "Runtime Power Management for all PCI(e) bus devices, except blacklisted ones." -msgstr "" +msgstr "Gestión de energia de tiempo de ejecución (Runtime Power Management) para todos los dispositivos del bus PCI(e), excepto los excluidos." #. type: deftypevr #: doc/guix.texi:21190 @@ -41052,7 +41154,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-lista-cadena-separada-esp #. type: deftypevr #: doc/guix.texi:21192 msgid "Exclude specified PCI(e) device addresses from Runtime Power Management." -msgstr "" +msgstr "Excluye las direcciones de dispositivo PCI(e) especificadas de la gestión de energia de tiempo de ejecución (Runtime Power Management)." #. type: deftypevr #: doc/guix.texi:21197 @@ -41063,7 +41165,7 @@ msgstr "{parámetro de @code{tlp-configuration}} lista-cadena-separada-espacios #. type: deftypevr #: doc/guix.texi:21200 msgid "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management." -msgstr "" +msgstr "Excluye los dispositivos PCI(e) asignados a los controladores especificados de la gestión de energia de tiempo de ejecución (Runtime Power Management)." #. type: deftypevr #: doc/guix.texi:21203 @@ -41085,7 +41187,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-string usb-blacklist" #. type: deftypevr #: doc/guix.texi:21212 msgid "Exclude specified devices from USB autosuspend." -msgstr "" +msgstr "Excluye los dispositivos especificados de la suspensión automática de USB." #. type: deftypevr #: doc/guix.texi:21217 @@ -41096,7 +41198,7 @@ msgstr "{parámetro de @code{tlp-configuration}} boolean usb-blacklist-wwan?" #. type: deftypevr #: doc/guix.texi:21219 msgid "Exclude WWAN devices from USB autosuspend." -msgstr "" +msgstr "Excluye los dispositivos WWAN de la suspensión automática de USB." #. type: deftypevr #: doc/guix.texi:21224 @@ -41107,7 +41209,7 @@ msgstr "{parámetro de @code{tlp-configuration}} maybe-string usb-whitelist" #. type: deftypevr #: doc/guix.texi:21227 msgid "Include specified devices into USB autosuspend, even if they are already excluded by the driver or via @code{usb-blacklist-wwan?}." -msgstr "" +msgstr "Incluye los dispositivos especificados en la suspensión automática de USB, incluso cuando están excluidos por el controlador o a través de @code{usb-blacklist-wwan?}." #. type: deftypevr #: doc/guix.texi:21232 @@ -41129,7 +41231,7 @@ msgstr "{parámetro de @code{tlp-configuration}} boolean restore-device-state-on #. type: deftypevr #: doc/guix.texi:21242 msgid "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup." -msgstr "" +msgstr "Restablece el estado de los dispositivos de radio (bluetooth, wifi, wwan) previo al apagado durante el arranque del sistema." #. type: cindex #: doc/guix.texi:21247 @@ -41163,7 +41265,7 @@ msgstr "{Variable Scheme} thermald-service-type" #. type: defvr #: doc/guix.texi:21259 msgid "This is the service type for @uref{https://01.org/linux-thermal-daemon/, thermald}, the Linux Thermal Daemon, which is responsible for controlling the thermal state of processors and preventing overheating." -msgstr "" +msgstr "Este es el tipo de servicio para @uref{https://01.org/linux-thermal-daemon/, thermald}, el daemon Thermal de Linux, que es responsable del control del estado térmico de los procesadores y la prevención del sobrecalentamiento." #. type: deftp #: doc/guix.texi:21261 @@ -41182,10 +41284,11 @@ msgstr "Tipo de datos que representa la configuración de @code{thermald-service msgid "@code{ignore-cpuid-check?} (default: @code{#f})" msgstr "@code{ignore-cpuid-check?} (predeterminado: @code{#f})" +# FUZZY #. type: table #: doc/guix.texi:21267 msgid "Ignore cpuid check for supported CPU models." -msgstr "" +msgstr "Ignora la comprobación de cpuid durante la comprobación de procesadores permitidos." #. type: item #: doc/guix.texi:21268 @@ -41280,9 +41383,8 @@ msgstr "@code{music-dir} (predeterminado: @code{\"~/Music\"})" #. type: table #: doc/guix.texi:21310 -#, fuzzy msgid "The directory to scan for music files." -msgstr "El directorio para almacenar listas de reproducción." +msgstr "El directorio para buscar ficheros de música." #. type: item #: doc/guix.texi:21311 @@ -41315,7 +41417,7 @@ msgstr "@code{state-file} (predeterminado: @code{\"~/.mpd/state\"})" #. type: table #: doc/guix.texi:21319 msgid "The location of the file that stores current MPD's state." -msgstr "" +msgstr "La localización del fichero que almacena el estado actual de MPD." #. type: item #: doc/guix.texi:21320 @@ -41349,7 +41451,7 @@ msgstr "@code{address} (predeterminada: @code{\"any\"})" #. type: table #: doc/guix.texi:21329 msgid "The address that mpd will bind to. To use a Unix domain socket, an absolute path can be specified here." -msgstr "" +msgstr "Dirección a la que mpd se asociará. Para usar un socket de dominio de Unix puede especificarse una ruta absoluta." #. type: subsection #: doc/guix.texi:21334 @@ -41368,10 +41470,11 @@ msgstr "El módulo @code{(gnu services virtualization)} proporciona servicios pa msgid "Libvirt daemon" msgstr "Daemon de Libvirt" +# FUZZY #. type: Plain text #: doc/guix.texi:21344 msgid "@code{libvirtd} is the server side daemon component of the libvirt virtualization management system. This daemon runs on host servers and performs required management tasks for virtualized guests." -msgstr "" +msgstr "@code{libvirtd} es un daemon del que se compone el lado del servidor del sistema de gestión de virtualización libvirt. Este daemon se ejecuta en las máquinas servidoras y realiza las tareas de gestión necesarias para los sistemas virtualizados." #. type: deffn #: doc/guix.texi:21345 @@ -41420,15 +41523,17 @@ msgstr "Paquete libvirt." msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?" msgstr "{parámetro de @code{libvirt-configuration}} boolean listen-tls?" +# FUZZY +# TODO: Enviar parche. #. type: deftypevr #: doc/guix.texi:21368 msgid "Flag listening for secure TLS connections on the public TCP/IP port. must set @code{listen} for this to have any effect." -msgstr "" +msgstr "Opción para la escucha de conexiones seguras TLS en el puerto TCP/IP público. Debe haberse proporcionado valor a @code{listen} para que tenga algún efecto." #. type: deftypevr #: doc/guix.texi:21371 msgid "It is necessary to setup a CA and issue server certificates before using this capability." -msgstr "" +msgstr "Es necesario configurar una autoridad de certificación (CA) y emitir certificados de servidor antes de usar esta característica." #. type: deftypevr #: doc/guix.texi:21376 @@ -41436,15 +41541,18 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?" msgstr "{parámetro de @code{libvirt-configuration}} boolean listen-tcp?" +# FUZZY +# TODO: Enviar parche. #. type: deftypevr #: doc/guix.texi:21379 msgid "Listen for unencrypted TCP connections on the public TCP/IP port. must set @code{listen} for this to have any effect." -msgstr "" +msgstr "Escucha de conexiones TCP sin cifrar en el puerto TCP/IP público. Debe haberse proporcionado valor a @code{listen} para que tenga algún efecto." +# TODO: Enviar parche. #. type: deftypevr #: doc/guix.texi:21383 msgid "Using the TCP socket requires SASL authentication by default. Only SASL mechanisms which support data encryption are allowed. This is DIGEST_MD5 and GSSAPI (Kerberos5)" -msgstr "" +msgstr "El uso del socket TCP necesita de manera predeterminada identificación SASL. Únicamente se permiten mecanismos SASL que implementen cifrado de datos. Estos son DIGEST_MD5 y GSSAPI (Kerberos5)." #. type: deftypevr #: doc/guix.texi:21388 @@ -41452,10 +41560,11 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} string tls-port" msgstr "{parámetro de @code{libvirt-configuration}} string tls-port" +# TODO: Enviar parche. #. type: deftypevr #: doc/guix.texi:21391 msgid "Port for accepting secure TLS connections This can be a port number, or service name" -msgstr "" +msgstr "Puerto en el que se aceptan conexiones seguras. Puede ser un número de puerto o un nombre de servicio." #. type: deftypevr #: doc/guix.texi:21393 @@ -41468,10 +41577,11 @@ msgstr "El valor predeterminado es @samp{\"16514\"}." msgid "{@code{libvirt-configuration} parameter} string tcp-port" msgstr "{parámetro de @code{libvirt-configuration}} string tcp-port" +# TODO: Enviar parche #. type: deftypevr #: doc/guix.texi:21399 msgid "Port for accepting insecure TCP connections This can be a port number, or service name" -msgstr "" +msgstr "Puerto en el que se aceptan conexiones inseguras. Puede ser un número de puerto o un nombre de servicio." #. type: deftypevr #: doc/guix.texi:21401 @@ -41486,9 +41596,8 @@ msgstr "{parámetro de @code{libvirt-configuration}} string listen-addr" #. type: deftypevr #: doc/guix.texi:21406 -#, fuzzy msgid "IP address or hostname used for client connections." -msgstr "Nombre del fichero del certificado SSL/TLS usado para conexiones cifradas." +msgstr "Dirección IP o nombre de máquina usado para las conexiones de clientes." #. type: deftypevr #: doc/guix.texi:21408 @@ -41504,12 +41613,12 @@ msgstr "{parámetro de @code{libvirt-configuration}} boolean mdns-adv?" #. type: deftypevr #: doc/guix.texi:21413 msgid "Flag toggling mDNS advertisement of the libvirt service." -msgstr "" +msgstr "Opción que determina el anuncio mDNS del servicio libvirt." #. type: deftypevr #: doc/guix.texi:21416 msgid "Alternatively can disable for all services on a host by stopping the Avahi daemon." -msgstr "" +msgstr "De manera alternativa puede desactivarse para todos los servicios en una máquina parando el daemon Avahi." #. type: deftypevr #: doc/guix.texi:21421 @@ -41517,10 +41626,11 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} string mdns-name" msgstr "{parámetro de @code{libvirt-configuration}} string mdns-name" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:21424 msgid "Default mDNS advertisement name. This must be unique on the immediate broadcast network." -msgstr "" +msgstr "Nombre predeterminado del anuncio mDNS. Debe ser único en la red de distribución inmediata." #. type: deftypevr #: doc/guix.texi:21426 @@ -41536,7 +41646,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string unix-sock-group" #. type: deftypevr #: doc/guix.texi:21433 msgid "UNIX domain socket group ownership. This can be used to allow a 'trusted' set of users access to management capabilities without becoming root." -msgstr "" +msgstr "Grupo propietario del socket de dominio de UNIX. Puede usarse para permitir a un conjunto de usuarias «de confianza» acceso a las funcionalidades de gestión sin convertirse en root." #. type: deftypevr #: doc/guix.texi:21438 @@ -41547,7 +41657,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string unix-sock-ro-perms" #. type: deftypevr #: doc/guix.texi:21441 msgid "UNIX socket permissions for the R/O socket. This is used for monitoring VM status only." -msgstr "" +msgstr "Permisos del socket UNIX de sólo lectura@footnote{R/O: Read-Only en inglés.}. Se usa únicamente para monitorizar el estado de las máquinas virtuales." #. type: deftypevr #: doc/guix.texi:21443 doc/guix.texi:21461 @@ -41563,7 +41673,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string unix-sock-rw-perms" #. type: deftypevr #: doc/guix.texi:21450 msgid "UNIX socket permissions for the R/W socket. Default allows only root. If PolicyKit is enabled on the socket, the default will change to allow everyone (eg, 0777)" -msgstr "" +msgstr "Permisos del socket UNIX de lectura/escritura@footnote{R/W: Read-Write en inglés.}. El valor predeterminado únicamente permite acceso a root. Si PolicyKit se encuentra activo en el socket, el valor predeterminado cambiará para permitir acceso universal (es decir, 0777)." #. type: deftypevr #: doc/guix.texi:21452 @@ -41576,10 +41686,11 @@ msgstr "El valor predeterminado es @samp{\"0770\"}." msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms" msgstr "{parámetro de @code{libvirt-configuration}} string unix-sock-admin-perms" +# FUZZY #. type: deftypevr #: doc/guix.texi:21459 msgid "UNIX socket permissions for the admin socket. Default allows only owner (root), do not change it unless you are sure to whom you are exposing the access to." -msgstr "" +msgstr "Permisos del socket UNIX de administración. El valor predeterminado únicamente permite acceso a la propietaria (root), no lo cambie a menos que esté completamente segura de a quién expone el acceso." #. type: deftypevr #: doc/guix.texi:21464 @@ -41590,9 +41701,8 @@ msgstr "{parámetro de @code{libvirt-configuration}} string unix-sock-dir" # FUZZY #. type: deftypevr #: doc/guix.texi:21466 -#, fuzzy msgid "The directory in which sockets will be found/created." -msgstr "El directorio al que se debe asociar el sistema de ficheros." +msgstr "Directorio en el que los sockets se encuentran/crean." #. type: deftypevr #: doc/guix.texi:21468 @@ -41605,10 +41715,11 @@ msgstr "El valor predeterminado es @samp{\"/var/run/libvirt\"}." msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro" msgstr "{parámetro de @code{libvirt-configuration}} string auth-unix-ro" +# FUZZY #. type: deftypevr #: doc/guix.texi:21474 msgid "Authentication scheme for UNIX read-only sockets. By default socket permissions allow anyone to connect" -msgstr "" +msgstr "Esquema de indentificación para los sockets de solo-lectura de UNIX. Los permisos predeterminados del socket permiten la conexión de cualquier usuaria." #. type: deftypevr #: doc/guix.texi:21476 doc/guix.texi:21485 @@ -41624,7 +41735,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string auth-unix-rw" #. type: deftypevr #: doc/guix.texi:21483 msgid "Authentication scheme for UNIX read-write sockets. By default socket permissions only allow root. If PolicyKit support was compiled into libvirt, the default will be to use 'polkit' auth." -msgstr "" +msgstr "Esquema de indentificación para los sockets de lectura/escritura de UNIX. Los permisos predeterminados del socket permiten la conexión únicamente a root. Si se activó en la compilación de libvirt la interoperabilidad con PolicyKit, el valor predeterminado es usar la identificación «policykit»." #. type: deftypevr #: doc/guix.texi:21488 @@ -41635,7 +41746,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string auth-tcp" #. type: deftypevr #: doc/guix.texi:21492 msgid "Authentication scheme for TCP sockets. If you don't enable SASL, then all TCP traffic is cleartext. Don't do this outside of a dev/test scenario." -msgstr "" +msgstr "Esquema de indentificación para los sockets TCP. Si no activa SASL, todo el tráfico TCP estará en texto plano. No lo haga más allá de un escenario de desarrollo/pruebas." #. type: deftypevr #: doc/guix.texi:21494 @@ -41651,12 +41762,12 @@ msgstr "{parámetro de @code{libvirt-configuration}} string auth-tls" #. type: deftypevr #: doc/guix.texi:21501 msgid "Authentication scheme for TLS sockets. TLS sockets already have encryption provided by the TLS layer, and limited authentication is done by certificates." -msgstr "" +msgstr "Esquema de indentificación para los sockets TLS. Los sockets TLS ya se encuentran cifrados gracias a la capa TLS, y una identificación limitada se realiza con los certificados." #. type: deftypevr #: doc/guix.texi:21504 msgid "It is possible to make use of any SASL authentication mechanism as well, by using 'sasl' for this option" -msgstr "" +msgstr "También es posible hacer uso de cualquier mecanismo de identificación SASL proporcionando «sasl» en esta opción." #. type: deftypevr #: doc/guix.texi:21506 @@ -41673,12 +41784,13 @@ msgstr "{parámetro de @code{libvirt-configuration}} lista-opcional access-drive #. type: deftypevr #: doc/guix.texi:21511 msgid "API access control scheme." -msgstr "" +msgstr "Esquema de la API de control de acceso." +# FUZZY #. type: deftypevr #: doc/guix.texi:21514 msgid "By default an authenticated user is allowed access to all APIs. Access drivers can place restrictions on this." -msgstr "" +msgstr "De manera predeterminada una usuaria identificada puede acceder a todas las API. Los controladores de acceso pueden incluir restricciones de acceso sobre ello." #. type: deftypevr #: doc/guix.texi:21519 @@ -41689,7 +41801,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string key-file" #. type: deftypevr #: doc/guix.texi:21522 msgid "Server key file path. If set to an empty string, then no private key is loaded." -msgstr "" +msgstr "Ruta del fichero con la clave del servidor. Si se proporciona una cadena vacía, no se carga ninguna clave privada." #. type: deftypevr #: doc/guix.texi:21527 @@ -41700,7 +41812,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string cert-file" #. type: deftypevr #: doc/guix.texi:21530 msgid "Server key file path. If set to an empty string, then no certificate is loaded." -msgstr "" +msgstr "Ruta del fichero con la clave del servidor. Si se proporciona una cadena vacía, no se carga ningún certificado." #. type: deftypevr #: doc/guix.texi:21535 @@ -41711,7 +41823,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string ca-file" #. type: deftypevr #: doc/guix.texi:21538 msgid "Server key file path. If set to an empty string, then no CA certificate is loaded." -msgstr "" +msgstr "Ruta del fichero con la clave del servidor. Si se proporciona una cadena vacía, no se carga ningún certificado de CA." #. type: deftypevr #: doc/guix.texi:21543 @@ -41719,10 +41831,11 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} string crl-file" msgstr "{parámetro de @code{libvirt-configuration}} string crl-file" +# FUZZY #. type: deftypevr #: doc/guix.texi:21546 msgid "Certificate revocation list path. If set to an empty string, then no CRL is loaded." -msgstr "" +msgstr "Ruta de la lista de revocaciones de certificado. Si se proporciona una cadena vacía, no se carga ninguna lista." #. type: deftypevr #: doc/guix.texi:21551 @@ -41733,12 +41846,12 @@ msgstr "{parámetro de @code{libvirt-configuration}} boolean tls-no-sanity-cert" #. type: deftypevr #: doc/guix.texi:21553 msgid "Disable verification of our own server certificates." -msgstr "" +msgstr "Desactiva la verificación de los propios certificados del servidor." #. type: deftypevr #: doc/guix.texi:21556 msgid "When libvirtd starts it performs some sanity checks against its own certificates." -msgstr "" +msgstr "Cuando libvirtd arranca, realiza algunas comprobaciones básicas sobre sus propios certificados." #. type: deftypevr #: doc/guix.texi:21561 @@ -41748,14 +41861,13 @@ msgstr "{parámetro de @code{libvirt-configuration}} boolean tls-no-verify-cert" #. type: deftypevr #: doc/guix.texi:21563 -#, fuzzy msgid "Disable verification of client certificates." -msgstr "Localización de los certificados SSL de los clientes." +msgstr "Desactiva la verificación de certificados de clientes." #. type: deftypevr #: doc/guix.texi:21567 msgid "Client certificate verification is the primary authentication mechanism. Any client which does not present a certificate signed by the CA will be rejected." -msgstr "" +msgstr "La verificación de certificados de cliente es el mecanismo primario de identificación. Se rechazará cualquier cliente que no presente un certificado firmado por la autoridad de certificación (CA)." #. type: deftypevr #: doc/guix.texi:21572 @@ -41763,10 +41875,11 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list" msgstr "{parámetro de @code{libvirt-configuration}} lista-opcional tls-allowed-dn-list" +# FUZZY FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:21574 msgid "Whitelist of allowed x509 Distinguished Name." -msgstr "" +msgstr "Lista de nombres distinguidos (DN) x509 permitidos." #. type: deftypevr #: doc/guix.texi:21579 @@ -41774,10 +41887,11 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames" msgstr "{parámetro de @code{libvirt-configuration}} lista-opcional sasl-allowed-usernames" +# FUZZY FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:21582 msgid "Whitelist of allowed SASL usernames. The format for username depends on the SASL authentication mechanism." -msgstr "" +msgstr "Lista de nombres de usuaria SASL permitidos. El formato para el nombre de la usuaria depende del mecanismo de identificación SASL." #. type: deftypevr #: doc/guix.texi:21587 @@ -41785,10 +41899,11 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} string tls-priority" msgstr "{parámetro de @code{libvirt-configuration}} string tls-priority" +# FUZZY #. type: deftypevr #: doc/guix.texi:21591 msgid "Override the compile time default TLS priority string. The default is usually \"NORMAL\" unless overridden at build time. Only set this is it is desired for libvirt to deviate from the global default settings." -msgstr "" +msgstr "Cambia el valor de la cadena de prioridad de TLS predeterminada en tiempo de compilación. El valor predeterminado habitualmente es \"NORMAL\" a menos que se cambiase en tiempo de compilación. Proporcione este valor únicamente si desea que libvirt se desvíe de la configuración global predeterminada." #. type: deftypevr #: doc/guix.texi:21593 @@ -41804,7 +41919,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer max-clients" #. type: deftypevr #: doc/guix.texi:21599 doc/guix.texi:22022 msgid "Maximum number of concurrent client connections to allow over all sockets combined." -msgstr "" +msgstr "Número máximo de conexiones concurrentes de clientes permitidas en todos los sockets combinados." #. type: deftypevr #: doc/guix.texi:21601 @@ -41817,10 +41932,11 @@ msgstr "El valor predeterminado es @samp{5000}." msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients" msgstr "{parámetro de @code{libvirt-configuration}} integer max-queued-clients" +# FUZZY #. type: deftypevr #: doc/guix.texi:21608 msgid "Maximum length of queue of connections waiting to be accepted by the daemon. Note, that some protocols supporting retransmission may obey this so that a later reattempt at connection succeeds." -msgstr "" +msgstr "Longitud máxima de la cola de conexiones a la espera de ser aceptadas por el daemon. Fíjese que algunos protocolos que implementan la retransmisión pueden obedecer esto de manera que un intento posterior de conexión tenga éxito." #. type: deftypevr #: doc/guix.texi:21613 @@ -41831,7 +41947,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer max-anonymous-clien #. type: deftypevr #: doc/guix.texi:21616 msgid "Maximum length of queue of accepted but not yet authenticated clients. Set this to zero to turn this feature off" -msgstr "" +msgstr "Longitud máxima de la cola de clientes aceptados pero no identificados todavía. Proporcione el valor cero para desactivar esta característica." #. type: deftypevr #: doc/guix.texi:21618 doc/guix.texi:21636 doc/guix.texi:21652 @@ -41846,9 +41962,8 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer min-workers" #. type: deftypevr #: doc/guix.texi:21623 -#, fuzzy msgid "Number of workers to start up initially." -msgstr "Número de líneas a leer inicialmente de cada fichero." +msgstr "Número de procesos de trabajo que se lanzarán inicialmente." #. type: deftypevr #: doc/guix.texi:21628 @@ -41859,12 +41974,13 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer max-workers" #. type: deftypevr #: doc/guix.texi:21630 msgid "Maximum number of worker threads." -msgstr "" +msgstr "Número máximo de hilos de trabajo." +# FUZZY #. type: deftypevr #: doc/guix.texi:21634 msgid "If the number of active clients exceeds @code{min-workers}, then more threads are spawned, up to max_workers limit. Typically you'd want max_workers to equal maximum number of clients allowed." -msgstr "" +msgstr "Si el número de clientes excede @code{min-workers}, se lanzan más hilos, hasta el límite @code{max-workers}. Habitualmente se desea que @code{max-workers} sea igual al número máximo de clientes permitido." #. type: deftypevr #: doc/guix.texi:21639 @@ -41872,10 +41988,11 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} integer prio-workers" msgstr "{parámetro de @code{libvirt-configuration}} integer prio-workers" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:21643 msgid "Number of priority workers. If all workers from above pool are stuck, some calls marked as high priority (notably domainDestroy) can be executed in this pool." -msgstr "" +msgstr "Número de procesos de trabajo prioritarios. Si todos los hilos de trabajo del conjunto previo se encuentran bloqueados, algunas llamadas marcadas como de alta prioridad (notablemente domainDestroy) pueden ejecutarse en este conjunto de hilos." #. type: deftypevr #: doc/guix.texi:21648 @@ -41886,7 +42003,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer max-requests" #. type: deftypevr #: doc/guix.texi:21650 msgid "Total global limit on concurrent RPC calls." -msgstr "" +msgstr "Límite global total de llamadas RPC concurrentes." #. type: deftypevr #: doc/guix.texi:21655 @@ -41897,7 +42014,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer max-client-requests #. type: deftypevr #: doc/guix.texi:21659 msgid "Limit on concurrent requests from a single client connection. To avoid one client monopolizing the server this should be a small fraction of the global max_requests and max_workers parameter." -msgstr "" +msgstr "Límite de peticiones concurrentes desde una única conexión de cliente. Para evitar que un cliente monopolice el servidor esto debe ser una pequeña fracción de los parámetros globales «max_requests» y «max_workers»." #. type: deftypevr #: doc/guix.texi:21664 @@ -41908,7 +42025,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer admin-min-workers" #. type: deftypevr #: doc/guix.texi:21666 msgid "Same as @code{min-workers} but for the admin interface." -msgstr "" +msgstr "Igual que @code{min-workers} pero para la interfaz de administración." #. type: deftypevr #: doc/guix.texi:21671 @@ -41919,7 +42036,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer admin-max-workers" #. type: deftypevr #: doc/guix.texi:21673 msgid "Same as @code{max-workers} but for the admin interface." -msgstr "" +msgstr "Igual que @code{max-workers} pero para la interfaz de administración." #. type: deftypevr #: doc/guix.texi:21678 @@ -41930,7 +42047,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer admin-max-clients" #. type: deftypevr #: doc/guix.texi:21680 msgid "Same as @code{max-clients} but for the admin interface." -msgstr "" +msgstr "Igual que @code{max-clients} pero para la interfaz de administración." #. type: deftypevr #: doc/guix.texi:21685 @@ -41941,7 +42058,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer admin-max-queued-cl #. type: deftypevr #: doc/guix.texi:21687 msgid "Same as @code{max-queued-clients} but for the admin interface." -msgstr "" +msgstr "Igual que @code{max-queued-clients} pero para la interfaz de administración." #. type: deftypevr #: doc/guix.texi:21692 @@ -41952,7 +42069,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer admin-max-client-re #. type: deftypevr #: doc/guix.texi:21694 msgid "Same as @code{max-client-requests} but for the admin interface." -msgstr "" +msgstr "Igual que @code{max-client-requests} pero para la interfaz de administración." #. type: deftypevr #: doc/guix.texi:21699 @@ -41963,7 +42080,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer log-level" #. type: deftypevr #: doc/guix.texi:21701 doc/guix.texi:21924 msgid "Logging level. 4 errors, 3 warnings, 2 information, 1 debug." -msgstr "" +msgstr "Nivel de registro. 4 errores, 3 avisos, 2 información, 1 depuración." #. type: deftypevr #: doc/guix.texi:21706 @@ -41971,17 +42088,16 @@ msgstr "" msgid "{@code{libvirt-configuration} parameter} string log-filters" msgstr "{parámetro de @code{libvirt-configuration}} string log-filters" -# FUZZY -# MAAV (TODO): Log #. type: deftypevr #: doc/guix.texi:21708 doc/guix.texi:21931 msgid "Logging filters." -msgstr "Filtros de log." +msgstr "Filtros del registro." +# TODO: Enviar parche. #. type: deftypevr #: doc/guix.texi:21711 doc/guix.texi:21934 msgid "A filter allows to select a different logging level for a given category of logs The format for a filter is one of:" -msgstr "" +msgstr "Un filtro permite la selección de un nivel de registro diferente para una categoria dada de registros. El formato del filtro es uno de los siguientes:" #. type: itemize #: doc/guix.texi:21715 doc/guix.texi:21938 @@ -41996,37 +42112,36 @@ msgstr "x:+nombre" #. type: deftypevr #: doc/guix.texi:21728 doc/guix.texi:21951 msgid "where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., \"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a substring of the full category name, in order to match multiple similar categories), the optional \"+\" prefix tells libvirt to log stack trace for each message matching name, and @code{x} is the minimal level where matching messages should be logged:" -msgstr "" +msgstr "donde @code{nombre} es una cadena contra la que se compara la categoría proporcionada en la llamada @code{VIR_LOG_INIT()} al principio de cada fichero de fuentes de libvirt, por ejemplo \"remote\", \"qemu\" o \"util.json\" (el nombre en el filtro puede ser una subcadena del nombre completo de la categoría, para aceptar múltiples categorías con nombres similares), el prefijo opcional \"+\" indica a libvirt que registre la pila de llamadas en cada mensaje con el nombre correspondiente, y @code{x} es el nivel mínimo de los mensajes que deben registrarse:" #. type: itemize #: doc/guix.texi:21732 doc/guix.texi:21777 doc/guix.texi:21955 #: doc/guix.texi:22000 msgid "1: DEBUG" -msgstr "" +msgstr "1: DEBUG (depuración)" #. type: itemize #: doc/guix.texi:21735 doc/guix.texi:21780 doc/guix.texi:21958 #: doc/guix.texi:22003 msgid "2: INFO" -msgstr "" +msgstr "2: INFO (información)" #. type: itemize #: doc/guix.texi:21738 doc/guix.texi:21783 doc/guix.texi:21961 #: doc/guix.texi:22006 msgid "3: WARNING" -msgstr "" +msgstr "3: WARNING (aviso)" #. type: itemize #: doc/guix.texi:21741 doc/guix.texi:21786 doc/guix.texi:21964 #: doc/guix.texi:22009 msgid "4: ERROR" -msgstr "" +msgstr "4: ERROR" #. type: deftypevr #: doc/guix.texi:21746 doc/guix.texi:21969 -#, fuzzy msgid "Multiple filters can be defined in a single filters statement, they just need to be separated by spaces." -msgstr "Se pueden definir salidas múltiples, únicamente deben separarse por espacios." +msgstr "Se pueden definir en una única sentencia múltiples filtros, únicamente hace falta separarlos por espacios." #. type: deftypevr #: doc/guix.texi:21748 doc/guix.texi:21971 @@ -42122,22 +42237,22 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer audit-level" #. type: deftypevr #: doc/guix.texi:21798 msgid "Allows usage of the auditing subsystem to be altered" -msgstr "" +msgstr "Permite la alteración del uso del sistema de auditoría." #. type: itemize #: doc/guix.texi:21802 msgid "0: disable all auditing" -msgstr "" +msgstr "0: desactiva la auditoría" #. type: itemize #: doc/guix.texi:21805 msgid "1: enable auditing, only if enabled on host" -msgstr "" +msgstr "1: activa la auditoría, únicamente si está activado en la máquina" #. type: itemize #: doc/guix.texi:21808 msgid "2: enable auditing, and exit if disabled on host." -msgstr "" +msgstr "2: activa la auditoría, y sale si está desactivada en la máquina." #. type: deftypevr #: doc/guix.texi:21815 @@ -42148,7 +42263,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} boolean audit-logging" #. type: deftypevr #: doc/guix.texi:21817 msgid "Send audit messages via libvirt logging infrastructure." -msgstr "" +msgstr "Envía los mensajes de auditoría a través de la infraestructura de registro de libvirt." # FUZZY #. type: deftypevr @@ -42160,7 +42275,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} string-opcional host-uuid" #. type: deftypevr #: doc/guix.texi:21824 msgid "Host UUID. UUID must not have all digits be the same." -msgstr "" +msgstr "UUID de la máquina anfitriona. No pueden ser iguales todos los dígitos del UUID." #. type: deftypevr #: doc/guix.texi:21829 @@ -42171,22 +42286,22 @@ msgstr "{parámetro de @code{libvirt-configuration}} string host-uuid-source" #. type: deftypevr #: doc/guix.texi:21831 msgid "Source to read host UUID." -msgstr "" +msgstr "Fuente de lectura del UUID de la máquina anfitriona." #. type: itemize #: doc/guix.texi:21835 msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}" -msgstr "" +msgstr "@code{smbios}: obtiene el UUID de @code{dmidecode -s system-uuid}" #. type: itemize #: doc/guix.texi:21838 msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}" -msgstr "" +msgstr "@code{machine-id}: obtiene el UUID de @code{/etc/machine-id}" #. type: deftypevr #: doc/guix.texi:21843 msgid "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated." -msgstr "" +msgstr "Si @code{dmidecode} no proporciona un UUID válido, se generará un UUID temporal." #. type: deftypevr #: doc/guix.texi:21845 @@ -42202,7 +42317,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer keepalive-interval" #. type: deftypevr #: doc/guix.texi:21853 msgid "A keepalive message is sent to a client after @code{keepalive_interval} seconds of inactivity to check if the client is still responding. If set to -1, libvirtd will never send keepalive requests; however clients can still send them and the daemon will send responses." -msgstr "" +msgstr "Un mensaje «keepalive» se envia al cliente tras @code{keepalive_interval} segundos de inactividad para comprobar si el cliente todavía responde. Si se proporciona el valor -1, libvirtd nunca enviará peticiones «keepalive»; no obstante los clientes todavía pueden mandarlas y el daemon enviará las respuestas." #. type: deftypevr #: doc/guix.texi:21858 @@ -42213,12 +42328,12 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer keepalive-count" #. type: deftypevr #: doc/guix.texi:21862 msgid "Maximum number of keepalive messages that are allowed to be sent to the client without getting any response before the connection is considered broken." -msgstr "" +msgstr "Número máximo de mensajes «keepalive» que se permite enviar a un cliente sin obtener respuesta antes de considerar que se ha roto la conexión." #. type: deftypevr #: doc/guix.texi:21869 msgid "In other words, the connection is automatically closed approximately after @code{keepalive_interval * (keepalive_count + 1)} seconds since the last message received from the client. When @code{keepalive-count} is set to 0, connections will be automatically closed after @code{keepalive-interval} seconds of inactivity without sending any keepalive messages." -msgstr "" +msgstr "En otras palabras, la conexión se cierra automáticamente tras @code{keepalive_interval * (keepalive_count + 1)} segundos tras la última recepción de un mensaje desde el cliente. Cuando @code{keepalive_count} tiene valor 0, las conexiones se cerrarán automáticamente tras @code{keepalive-interval} segundos de inactividad sin mandar ningún mensaje «keepalive»." #. type: deftypevr #: doc/guix.texi:21874 @@ -42229,7 +42344,7 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer admin-keepalive-int #. type: deftypevr #: doc/guix.texi:21876 doc/guix.texi:21883 msgid "Same as above but for admin interface." -msgstr "" +msgstr "Igual que la opción anterior pero para la interfaz de administración." #. type: deftypevr #: doc/guix.texi:21881 @@ -42243,15 +42358,17 @@ msgstr "{parámetro de @code{libvirt-configuration}} integer admin-keepalive-cou msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout" msgstr "{parámetro de @code{libvirt-configuration}} integer ovs-timeout" +# FUZZY #. type: deftypevr #: doc/guix.texi:21890 msgid "Timeout for Open vSwitch calls." -msgstr "" +msgstr "Plazo máximo para las llamadas a Open vSwitch." +# FUZZY #. type: deftypevr #: doc/guix.texi:21894 msgid "The @code{ovs-vsctl} utility is used for the configuration and its timeout option is set by default to 5 seconds to avoid potential infinite waits blocking libvirt." -msgstr "" +msgstr "La utilidad @code{ovs-vsctl} se usa para la configuración y su opción de plazo máximo (timeout) tiene un valor de 5 segundos de manera predeterminada para evitar que esperas potencialmente infinitas bloqueen libvirt." #. type: subsubheading #: doc/guix.texi:21901 @@ -42262,12 +42379,12 @@ msgstr "Daemon Virtlog" #. type: Plain text #: doc/guix.texi:21904 msgid "The virtlogd service is a server side daemon component of libvirt that is used to manage logs from virtual machine consoles." -msgstr "" +msgstr "El servicio virtlogd es un daemon del que se compone el lado servidor de libvirt cuya finalidad es la gestión del registro de las consolas de las máquinas virtuales." #. type: Plain text #: doc/guix.texi:21910 msgid "This daemon is not used directly by libvirt client applications, rather it is called on their behalf by @code{libvirtd}. By maintaining the logs in a standalone daemon, the main @code{libvirtd} daemon can be restarted without risk of losing logs. The @code{virtlogd} daemon has the ability to re-exec() itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime." -msgstr "" +msgstr "Este daemon no se usa directamente en aplicaciones cliente de libvirt, sino que @code{libvirtd} lo invoca en su nombre. Al mantener los registros en un daemon independiente, el daemon @code{libvirtd} puede reiniciarse sin correr el riesgo de perder registros. El daemon @code{virtlogd} tiene la capacidad de ejecutar exec() sobre sí mismo al recibir @code{SIGUSR1}, para permitir actualizaciones en vivo sin tiempo de parada." #. type: deffn #: doc/guix.texi:21911 @@ -42337,7 +42454,7 @@ msgstr "{parámetro de @code{virtlog-configuration}} integer max-size" #. type: deftypevr #: doc/guix.texi:22029 msgid "Maximum file size before rolling over." -msgstr "" +msgstr "Tamaño máximo del fichero antes de pasar al siguiente." #. type: deftypevr #: doc/guix.texi:22031 @@ -42350,10 +42467,11 @@ msgstr "El valor predeterminado es @samp{2MB}." msgid "{@code{virtlog-configuration} parameter} integer max-backups" msgstr "{parámetro de @code{virtlog-configuration}} integer max-backups" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:22036 msgid "Maximum number of backup files to keep." -msgstr "" +msgstr "Número máximo de ficheros de backup que se deben mantener." #. type: deftypevr #: doc/guix.texi:22038 @@ -42376,12 +42494,12 @@ msgstr "emulación" #: doc/guix.texi:22044 #, no-wrap msgid "binfmt_misc" -msgstr "" +msgstr "binfmt_misc" #. type: Plain text #: doc/guix.texi:22050 msgid "@code{qemu-binfmt-service-type} provides support for transparent emulation of program binaries built for different architectures---e.g., it allows you to transparently execute an ARMv7 program on an x86_64 machine. It achieves this by combining the @uref{https://www.qemu.org, QEMU} emulator and the @code{binfmt_misc} feature of the kernel Linux." -msgstr "" +msgstr "@code{qemu-binfmt-service-type} proporciona la capacidad de emular transparentemente programas binarios construidos para arquitecturas diferentes---por ejemplo, le permite ejecutar de manera transparente un programa de ARMv7 en una máquina x86_64. Esto se consigue mediante la combinación del emulador @uref{https://www.qemu.org, QEMU} y la característica @code{binfmt_misc} del núcleo Linux." #. type: defvr #: doc/guix.texi:22051 @@ -42392,7 +42510,7 @@ msgstr "{Variable Scheme} qemu-binfmt-service-type" #. type: defvr #: doc/guix.texi:22056 msgid "This is the type of the QEMU/binfmt service for transparent emulation. Its value must be a @code{qemu-binfmt-configuration} object, which specifies the QEMU package to use as well as the architecture we want to emulated:" -msgstr "" +msgstr "Este es el tipo del servicio de emulación transparente QEMU/binfmt. Su valor debe ser un objeto @code{qemu-binfmt-configuration}, que especifica el paquete QEMU usado así como las arquitecturas que se desean emular:" #. type: example #: doc/guix.texi:22061 @@ -42409,7 +42527,7 @@ msgstr "" #. type: defvr #: doc/guix.texi:22067 msgid "In this example, we enable transparent emulation for the ARM and aarch64 platforms. Running @code{herd stop qemu-binfmt} turns it off, and running @code{herd start qemu-binfmt} turns it back on (@pxref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})." -msgstr "" +msgstr "En este ejemplo se activa la emulación transparente para las plataformas ARM y aarch64. La ejecución de @code{herd stop qemu-binfmt} la desactiva, y la ejecución de @code{herd start qemu-binfmt} la vuelve a activar (@pxref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})." #. type: deftp #: doc/guix.texi:22069 @@ -42431,7 +42549,7 @@ msgstr "@code{platforms} (predeterminadas: @code{'()})" #. type: table #: doc/guix.texi:22076 msgid "The list of emulated QEMU platforms. Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see below)." -msgstr "" +msgstr "Lista de plataformas de QEMU emuladas. Cada elemento debe ser un @dfn{objeto de platforma} como los devueltos por @code{lookup-qemu-platforms} (véase a continuación)." #. type: item #: doc/guix.texi:22077 @@ -42439,15 +42557,16 @@ msgstr "" msgid "@code{guix-support?} (default: @code{#f})" msgstr "@code{guix-support?} (predeterminado: @code{#f})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:22083 msgid "When it is true, QEMU and all its dependencies are added to the build environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, @code{--chroot-directory} option}). This allows the @code{binfmt_misc} handlers to be used within the build environment, which in turn means that you can transparently build programs for another architecture." -msgstr "" +msgstr "Cuando su valor es verdadero, QEMU y todas sus dependencias se añaden al entorno de construcción de @command{guix-daemon} (@pxref{Invoking guix-daemon, opción @code{--chroot-directory}}). Esto permite que se usen los controladores @code{binfmt_misc} dentro del entorno de construcción, lo que permite construir transparentemente programas para otra arquitectura." #. type: table #: doc/guix.texi:22086 msgid "For example, let's suppose you're on an x86_64 machine and you have this service:" -msgstr "" +msgstr "Por ejemplo, supongamos que está en una máquina x86_64 y tiene este servicio:" #. type: example #: doc/guix.texi:22092 @@ -42466,18 +42585,18 @@ msgstr "" #. type: table #: doc/guix.texi:22095 msgid "You can run:" -msgstr "" +msgstr "Puede ejecutar:" #. type: example #: doc/guix.texi:22098 #, no-wrap msgid "guix build -s armhf-linux inkscape\n" -msgstr "" +msgstr "guix build -s armhf-linux inkscape\n" #. type: table #: doc/guix.texi:22105 msgid "and it will build Inkscape for ARMv7 @emph{as if it were a native build}, transparently using QEMU to emulate the ARMv7 CPU. Pretty handy if you'd like to test a package build for an architecture you don't have access to!" -msgstr "" +msgstr "Y construirá Inkscape para ARMv7 @emph{como si fuese una construcción nativa}, de manera transparente mediante el uso de QEMU para emular la CPU ARMv7. ¡Muy útil si quisiera probar la construcción de un paquete en una arquitectura a la que no tenga acceso!" #. type: item #: doc/guix.texi:22106 @@ -42499,7 +42618,7 @@ msgstr "{Procedimiento Scheme} lookup-qemu-platforms @var{plataformas}@dots{}" #. type: deffn #: doc/guix.texi:22116 msgid "Return the list of QEMU platform objects corresponding to @var{platforms}@dots{}. @var{platforms} must be a list of strings corresponding to platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"}, and so on." -msgstr "" +msgstr "Devuelve la lista de objetos de plataforma de QEMU que corresponden a @var{plataformas}@dots{}. @var{plataformas} debe ser una lista de cadenas que correspondan con nombres de plataforma, como @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"}, etcétera." #. type: deffn #: doc/guix.texi:22118 @@ -42510,7 +42629,7 @@ msgstr "{Procedimiento Scheme} qemu-platform? @var{obj}" #. type: deffn #: doc/guix.texi:22120 msgid "Return true if @var{obj} is a platform object." -msgstr "Devuelve verdadero si @var{obj} es un objeto plataforma." +msgstr "Devuelve verdadero si @var{obj} es un objeto de plataforma." #. type: deffn #: doc/guix.texi:22122 @@ -42523,10 +42642,11 @@ msgstr "{Procedimiento Scheme} qemu-platform-name @var{plataforma}" msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}." msgstr "Devuelve el nombre de @var{plataforma}---una cadena como @code{\"arm\"}." +# FUZZY FUZZY #. type: Plain text #: doc/guix.texi:22136 msgid "The @code{(gnu services version-control)} module provides a service to allow remote access to local Git repositories. There are three options: the @code{git-daemon-service}, which provides access to repositories via the @code{git://} unsecured TCP-based protocol, extending the @code{nginx} web server to proxy some requests to @code{git-http-backend}, or providing a web interface with @code{cgit-service-type}." -msgstr "" +msgstr "El módulo @code{(gnu services version-control)} proporciona un servicio para permitir el acceso remoto a repositorios Git locales. Existen tres opciones: el servicio @code{git-daemon-service}, que proporciona acceso a repositorios a través del protocolo inseguro basado en TCP @code{git://}, la extensión del servidor web @code{nginx} para redirigir algunas peticiones al motor @code{git-http-backend}, o una interfaz web proporcionada por el servicio @code{cgit-service-type}." #. type: deffn #: doc/guix.texi:22137 @@ -42539,10 +42659,11 @@ msgstr "{Procedimiento Scheme} git-daemon-service [#:config (git-daemon-configur msgid "Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous access." msgstr "Devuelve un servicio que ejecuta @command{git daemon}, un servidor TCP simple para exponer repositorios con el protocolo Git para acceso anónimo." +# FUZZY #. type: deffn #: doc/guix.texi:22147 msgid "The optional @var{config} argument should be a @code{} object, by default it allows read-only access to exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the repository directory.} repositories under @file{/srv/git}." -msgstr "" +msgstr "El parámetro opcional @var{config} debe ser un objeto @code{}, de manera predeterminada permite acceso de solo lectura a los repositorios exportados@footnote{Mediante la creación del fichero mágico \"git-daemon-export-ok\" en el directorio del repositorio.} bajo @file{/srv/git}." #. type: deftp #: doc/guix.texi:22150 @@ -42575,7 +42696,7 @@ msgstr "@code{export-all?} (predeterminado: @var{#f})" #. type: table #: doc/guix.texi:22160 msgid "Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file." -msgstr "" +msgstr "Determina si se permite el acceso a todos los repositorios Git, incluso si no tienen el fichero @file{git-daemon-export-ok}." #. type: item #: doc/guix.texi:22161 @@ -42586,7 +42707,7 @@ msgstr "@code{base-path} (predeterminado: @file{/srv/git})" #. type: table #: doc/guix.texi:22166 msgid "Whether to remap all the path requests as relative to the given path. If you run git daemon with @var{(base-path \"/srv/git\")} on example.com, then if you later try to pull @code{git://example.com/hello.git}, git daemon will interpret the path as @code{/srv/git/hello.git}." -msgstr "" +msgstr "Determina si se traducirán todas las rutas de las peticiones como relativas a la ruta proporcionada. Si se encuentra en ejecución el daemon de git con @var{(base-path \"/srv/git\"} en example.com, al realizar la solicitud de @code{git://example.com/hello.git}, el daemon de git interpretará la ruta como @code{/srv/git/hello.git}." #. type: item #: doc/guix.texi:22167 @@ -42597,7 +42718,7 @@ msgstr "@code{user-path} (predeterminado: @var{#f})" #. type: table #: doc/guix.texi:22174 msgid "Whether to allow @code{~user} notation to be used in requests. When specified with empty string, requests to @code{git://host/~alice/foo} is taken as a request to access @code{foo} repository in the home directory of user @code{alice}. If @var{(user-path \"path\")} is specified, the same request is taken as a request to access @code{path/foo} repository in the home directory of user @code{alice}." -msgstr "" +msgstr "Determina si se permite el uso de la notación @code{~user} en las peticiones. Si se especifica una cadena vacía, una peticione de @code{git://máquina/~alicia/algo} se tomará como una petición de acceso al repositorio @code{algo} en el directorio de la usuaria @code{alicia}. Si se especifica @var{(user-path \"ruta\")}, la misma petición se traducirá en una petición de acceso al repositorio @code{ruta/algo} en el directorio de la usuaria @code{alicia}." #. type: item #: doc/guix.texi:22175 @@ -42605,11 +42726,11 @@ msgstr "" msgid "@code{listen} (default: @var{'()})" msgstr "@code{listen} (predeterminado: @var{'()})" +# FUZZY FUZZY #. type: table #: doc/guix.texi:22178 -#, fuzzy msgid "Whether to listen on specific IP addresses or hostnames, defaults to all." -msgstr "Una lista de direcciones IP o nombres de máquina con los que el daemon ntpd se debe sincronizar." +msgstr "Determina si se debe escuchar en direcciones IP o nombres de máquina específicos, de manera predeterminada escucha en cualquiera." #. type: item #: doc/guix.texi:22179 @@ -42620,7 +42741,7 @@ msgstr "@code{port} (predeterminado: @var{#f})" #. type: table #: doc/guix.texi:22181 msgid "Whether to listen on an alternative port, which defaults to 9418." -msgstr "" +msgstr "Determina si se escucha en un puerto alternativo, cuyo valor predeterminado es 9418." #. type: item #: doc/guix.texi:22182 @@ -42631,7 +42752,7 @@ msgstr "@code{whitelist} (predeterminado: @var{'()})" #. type: table #: doc/guix.texi:22184 msgid "If not empty, only allow access to this list of directories." -msgstr "" +msgstr "Si no está vacío, únicamente permite el acceso a esta lista de directorios." #. type: item #: doc/guix.texi:22185 @@ -42642,17 +42763,18 @@ msgstr "@code{extra-options} (predeterminadas: @var{'()})" #. type: table #: doc/guix.texi:22188 msgid "Extra options will be passed to @code{git daemon}, please run @command{man git-daemon} for more information." -msgstr "" +msgstr "Opciones adicionales que se proporcionan a @code{git daemon}, para obtener más información le rogamos que ejecute @command{man git-daemon}." +# FUZZY #. type: Plain text #: doc/guix.texi:22202 msgid "The @code{git://} protocol lacks authentication. When you pull from a repository fetched via @code{git://}, you don't know that the data you receive was modified is really coming from the specified host, and you have your connection is subject to eavesdropping. It's better to use an authenticated and encrypted transport, such as @code{https}. Although Git allows you to serve repositories using unsophisticated file-based web servers, there is a faster protocol implemented by the @code{git-http-backend} program. This program is the back-end of a proper Git web service. It is designed to sit behind a FastCGI proxy. @xref{Web Services}, for more on running the necessary @code{fcgiwrap} daemon." -msgstr "" +msgstr "El protocolo @code{git://} carece de verificación. Cuando se obtienen datos de un repositorio a través del protocolo @code{git://}, no puede asegurarse que los datos que reciba proceden realmente de la máquina que especificó, y su conexión puede ser interceptada. Es mejor usar un transporte verificado y cifrado, como @code{https}. Aunque Git le permite servir repositorios usando servidores web poco sofisticados basados en ficheros, existe un protocolo más rápido implementado en el programa @code{git-http-backend}. Este programa es el motor de un servicio web de Git adecuado. Está diseñado para ejecutarse tras FastCGI. @xref{Web Services}, para más información sobre la ejecución del daemon @code{fcgiwrap} necesario." #. type: Plain text #: doc/guix.texi:22205 msgid "Guix has a separate configuration data type for serving Git repositories over HTTP." -msgstr "" +msgstr "Guix tiene un tipo de datos de configuración distinto para proporcionar repositorios Git sobre HTTP." #. type: deftp #: doc/guix.texi:22206 @@ -42674,12 +42796,12 @@ msgstr "@code{git-root} (predeterminada: @file{/srv/git})" #. type: table #: doc/guix.texi:22215 msgid "Directory containing the Git repositories to expose to the world." -msgstr "" +msgstr "Directorio que contiene los repositorios Git que se expondrán al mundo." #. type: table #: doc/guix.texi:22219 msgid "Whether to expose access for all Git repositories in @var{git-root}, even if they do not have the @file{git-daemon-export-ok} file." -msgstr "" +msgstr "Determina si se expondrá el acceso a todos los repositorios en @var{git-root}, incluso si no contienen el fichero @file{git-daemon-export-ok}." #. type: item #: doc/guix.texi:22220 @@ -42690,7 +42812,7 @@ msgstr "@code{uri-path} (predeterminada: @file{/git/})" #. type: table #: doc/guix.texi:22225 msgid "Path prefix for Git access. With the default @code{/git/} prefix, this will map @code{http://@var{server}/git/@var{repo}.git} to @code{/srv/git/@var{repo}.git}. Requests whose URI paths do not begin with this prefix are not passed on to this Git instance." -msgstr "" +msgstr "Prefijo de la ruta del acceso de Git. Con el prefijo predeterminado @code{/git/}, @code{http://@var{servidor}/git/@var{repositorio}.git} se traducirá en @code{/srv/git/@var{repositorio}.git}. Las peticiones cuyas rutas URI no comiencen con dicho prefijo no se pasan a esta instancia de Git." #. type: item #: doc/guix.texi:22226 @@ -42701,12 +42823,12 @@ msgstr "@code{fcgiwrap-socket} (predeterminado: @code{127.0.0.1:9000})" #. type: table #: doc/guix.texi:22229 msgid "The socket on which the @code{fcgiwrap} daemon is listening. @xref{Web Services}." -msgstr "" +msgstr "Socket en el que el daemon @code{fcgiwrap} escucha. @xref{Web Services}." #. type: Plain text #: doc/guix.texi:22236 msgid "There is no @code{git-http-service-type}, currently; instead you can create an @code{nginx-location-configuration} from a @code{git-http-configuration} and then add that location to a web server." -msgstr "" +msgstr "No existe actualmente @code{git-http-service-type}; en vez de eso puede crear una configuración @code{nginx-location-configuration} desde @code{git-http-configuration} y añadir dicha configuración al servidor web." #. type: deffn #: doc/guix.texi:22237 @@ -42718,6 +42840,8 @@ msgstr "{Procedimiento Scheme} git-http-nginx-location-configuration @" #: doc/guix.texi:22242 msgid "[config=(git-http-configuration)] Compute an @code{nginx-location-configuration} that corresponds to the given Git http configuration. An example nginx service definition to serve the default @file{/srv/git} over HTTPS might be:" msgstr "" +"[config=(git-http-configuration)]\n" +"Calcula una configuración @code{nginx-location-configuration} que corresponde con la configuración http de Git proporcionada. Un ejemplo de definición de servicio nginx que ofrece el directorio predeterminado @file{/srv/git} sobre HTTPS podría ser:" #. type: example #: doc/guix.texi:22259 @@ -42758,7 +42882,7 @@ msgstr "" #. type: deffn #: doc/guix.texi:22266 msgid "This example assumes that you are using Let's Encrypt to get your TLS certificate. @xref{Certificate Services}. The default @code{certbot} service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS. You will also need to add an @code{fcgiwrap} proxy to your system services. @xref{Web Services}." -msgstr "" +msgstr "Este ejemplo asume que usa Let's Encrypt para obtener su certificado TLS. @xref{Certificate Services}. El servicio predeterminado @code{certbot} redirigirá todo el tráfico HTTP en @code{git.mi-maquina.org} hacia HTTPS. También necesitará añadir @code{fcgiwrap} a sus servicios del sistema. @xref{Web Services}." #. type: subsubheading #: doc/guix.texi:22268 @@ -42778,16 +42902,16 @@ msgstr "servicio Cgit" msgid "Git, web interface" msgstr "Git, interfaz web" +# FUZZY #. type: Plain text #: doc/guix.texi:22274 msgid "@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git repositories written in C." -msgstr "" +msgstr "@uref{https://git.zx2c4.com/cgit/, Cgit} es un servidor de fachada para repositiorios Git escrito en C." #. type: Plain text #: doc/guix.texi:22277 -#, fuzzy msgid "The following example will configure the service with default values. By default, Cgit can be accessed on port 80 (@code{http://localhost:80})." -msgstr "El ejemplo siguiente configura el servicio con los valores predeterminados. Por omisión, se puede acceder a Tailon en el puerto 8080 (@code{http://localhost:8080})." +msgstr "El ejemplo siguiente configura el servicio con los valores predeterminados. Por omisión, se puede acceder a Cgit en el puerto 80 (@code{http://localhost:80})." #. type: example #: doc/guix.texi:22280 @@ -42832,7 +42956,7 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object about-filter" #. type: deftypevr #: doc/guix.texi:22302 msgid "Specifies a command which will be invoked to format the content of about pages (both top-level and for each repository)." -msgstr "" +msgstr "Especifica una orden que se llamará para dar formato al contenido de las páginas «about» (tanto al nivel superior como cada repositorio)." #. type: deftypevr #: doc/guix.texi:22307 @@ -42843,7 +42967,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string agefile" #. type: deftypevr #: doc/guix.texi:22310 msgid "Specifies a path, relative to each repository path, which can be used to specify the date and time of the youngest commit in the repository." -msgstr "" +msgstr "Especifica una ruta, relativa a cada ruta de repositorio, que puede usarse para espeficar una fecha y hora de la revisión más reciente del repositorio." #. type: deftypevr #: doc/guix.texi:22315 @@ -42854,9 +42978,8 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object auth-filter" # FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:22318 -#, fuzzy msgid "Specifies a command that will be invoked for authenticating repository access." -msgstr "Especifica si se usará cifrado para peticiones con identificación." +msgstr "Especifica una orden que se invocará para la validación de acceso al repositorio." #. type: deftypevr #: doc/guix.texi:22323 @@ -42867,7 +42990,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string branch-sort" #. type: deftypevr #: doc/guix.texi:22326 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set @samp{name} enables ordering by branch name." -msgstr "" +msgstr "Opción que, cuando tiene valor @samp{age}, activa la ordenación por fecha en la lista de referencias de ramas, y cuando tiene valor @samp{name} activa la ordenación por nombre de rama." #. type: deftypevr #: doc/guix.texi:22328 @@ -42939,7 +43062,7 @@ msgstr "{parámetro de @code{cgit-configuration}} integer cache-root-ttl" #. type: deftypevr #: doc/guix.texi:22365 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository index page." -msgstr "Número que especifica el tiempo de vida, en minutos, de la versión en caché de la página del índice del repositorio." +msgstr "Número que especifica el tiempo de vida, en minutos, de la versión en caché de la página del índice de repositorios." #. type: deftypevr #: doc/guix.texi:22370 @@ -43008,7 +43131,7 @@ msgstr "{parámetro de @code{cgit-configuration}} lista clone-prefix" #. type: deftypevr #: doc/guix.texi:22412 msgid "List of common prefixes which, when combined with a repository URL, generates valid clone URLs for the repository." -msgstr "" +msgstr "Lista de prefijos comunes que, cuando se combinen con la URL de un repositorio, generan una URL que permite el clonado del repositorio." #. type: deftypevr #: doc/guix.texi:22417 @@ -43040,10 +43163,11 @@ msgstr "Orden ejecutada para el formato de mensajes de revisión." msgid "{@code{cgit-configuration} parameter} string commit-sort" msgstr "{parámetro de @code{cgit-configuration}} string commit-sort" +# FUZZY #. type: deftypevr #: doc/guix.texi:22435 doc/guix.texi:22993 msgid "Flag which, when set to @samp{date}, enables strict date ordering in the commit log, and when set to @samp{topo} enables strict topological ordering." -msgstr "" +msgstr "Opción que, cuando tiene valor @samp{date}, activa la ordenación estricta por fecha en el registro histórico de revisiones, y cuando tiene valor @samp{topo} activa la ordenación estricta topológica." #. type: deftypevr #: doc/guix.texi:22437 @@ -43059,7 +43183,7 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object css" #. type: deftypevr #: doc/guix.texi:22442 msgid "URL which specifies the css document to include in all cgit pages." -msgstr "" +msgstr "URL que especifica el documento css incluído en todas las páginas de cgit." #. type: deftypevr #: doc/guix.texi:22444 @@ -43075,7 +43199,7 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object email-filter" #. type: deftypevr #: doc/guix.texi:22451 msgid "Specifies a command which will be invoked to format names and email address of committers, authors, and taggers, as represented in various places throughout the cgit interface." -msgstr "" +msgstr "Especifica una orden que se llamará para dar formato a los nombres y las direcciones de correo electrónico de las revisoras, autoras y etiquetadoras con el que se representarán en varios lugares de la interfaz cgit." #. type: deftypevr #: doc/guix.texi:22456 @@ -43083,10 +43207,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean embedded?" msgstr "{parámetro de @code{cgit-configuration}} boolean embedded?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22459 msgid "Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment suitable for embedding in other HTML pages." -msgstr "" +msgstr "Opción que, cuando tiene valor @samp{#t}, hace que cgit genere un fragmento HTML adecuado para embeberse en otras páginas HTML." #. type: deftypevr #: doc/guix.texi:22464 @@ -43097,7 +43222,7 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean enable-commit-graph?" #. type: deftypevr #: doc/guix.texi:22468 msgid "Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit history graph to the left of the commit messages in the repository log page." -msgstr "" +msgstr "Opción que, cuando tiene el valor @samp{#t}, hace que cgit imprima un grafo histórico de la revisión de arte ASCII a la izquierda de los mensajes de revisión en la página del histórico del repositorio." #. type: deftypevr #: doc/guix.texi:22473 @@ -43107,9 +43232,8 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean enable-filter-override #. type: deftypevr #: doc/guix.texi:22476 -#, fuzzy msgid "Flag which, when set to @samp{#t}, allows all filter settings to be overridden in repository-specific cgitrc files." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando tiene valor @samp{#t}, permite que todas las configuraciones de filtros se sustituyan en los ficheros cgitrc específicos del repositorio." #. type: deftypevr #: doc/guix.texi:22481 @@ -43119,9 +43243,8 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean enable-follow-links?" #. type: deftypevr #: doc/guix.texi:22484 -#, fuzzy msgid "Flag which, when set to @samp{#t}, allows users to follow a file in the log view." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando tiene valor @samp{#t}, permite a las usuarias seguir un fichero en la vista de registro (log)." #. type: deftypevr #: doc/guix.texi:22489 @@ -43129,10 +43252,11 @@ msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?" msgstr "{parámetro de @code{cgit-configuration}} boolean enable-http-clone?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22492 msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones." -msgstr "" +msgstr "Si se proporciona @samp{#t}, cgit actuará como un simple servidor HTTP para los clones de Git." #. type: deftypevr #: doc/guix.texi:22497 @@ -43140,10 +43264,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?" msgstr "{parámetro de @code{cgit-configuration}} boolean enable-index-links?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22500 msgid "Flag which, when set to @samp{#t}, will make cgit generate extra links \"summary\", \"commit\", \"tree\" for each repo in the repository index." -msgstr "" +msgstr "Opción que, cuando tiene valor @samp{#t}, hace que cgit genere enlaces adicionales \"summary\" (resumen), \"commit\" (revisión) y \"tree\" (árbol) para cada repositorio en el índice de repositorios." #. type: deftypevr #: doc/guix.texi:22505 @@ -43151,11 +43276,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?" msgstr "{parámetro de @code{cgit-configuration}} boolean enable-index-owner?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22508 -#, fuzzy msgid "Flag which, when set to @samp{#t}, will make cgit display the owner of each repo in the repository index." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando tiene valor @samp{#t}, hace que cgit muestre la propietaria de cada repositorio en el índice del repositorios." #. type: deftypevr #: doc/guix.texi:22513 @@ -43165,9 +43290,8 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean enable-log-filecount?" #. type: deftypevr #: doc/guix.texi:22516 -#, fuzzy msgid "Flag which, when set to @samp{#t}, will make cgit print the number of modified files for each commit on the repository log page." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando se proporciona el valor @samp{#t}, hace que cgit imprima el número de ficheros modificados por cada revisión en la página de registro histórico del repositorio (\"log\")." #. type: deftypevr #: doc/guix.texi:22521 @@ -43178,7 +43302,7 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean enable-log-linecount?" #. type: deftypevr #: doc/guix.texi:22524 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of added and removed lines for each commit on the repository log page." -msgstr "" +msgstr "Opción que, cuando se proporciona el valor @samp{#t}, hace que cgit imprima el número de líneas añadidas y eliminadas en cada revisión en la página de registro histórico (\"log\")." #. type: deftypevr #: doc/guix.texi:22529 @@ -43189,7 +43313,7 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean enable-remote-branches #. type: deftypevr #: doc/guix.texi:22532 doc/guix.texi:23056 msgid "Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views." -msgstr "" +msgstr "Opción que, cuando se proporciona el valor @samp{#t}, hace que cgit muestre ramas remotas en las vistas de resumen (\"summary\") y de referencias (\"refs\")." #. type: deftypevr #: doc/guix.texi:22537 @@ -43197,10 +43321,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?" msgstr "{parámetro de @code{cgit-configuration}} boolean enable-subject-links?" +# TODO (MAAV): Enviar parche. #. type: deftypevr #: doc/guix.texi:22541 msgid "Flag which, when set to @code{1}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view." -msgstr "" +msgstr "Opción que, cuando se proporciona el valor @samp{1}, hace que cgit use el asunto de la revisión previa como texto del enlace cuando se generen enlaces a revisiones previas en la vista de la revisión." #. type: deftypevr #: doc/guix.texi:22546 @@ -43208,10 +43333,12 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?" msgstr "{parámetro de @code{cgit-configuration}} boolean enable-html-serving?" +# FUZZY +# TODO (MAAV): Enviar parche. #. type: deftypevr #: doc/guix.texi:22550 msgid "Flag which, when set to @samp{#t}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view." -msgstr "" +msgstr "Opción que, cuando se proporciona el valor @samp{#t}, hace que cgit use el asunto de la revisión previa como texto del enlace cuando se generen enlaces a revisiones previas en la vista de la revisión." #. type: deftypevr #: doc/guix.texi:22555 @@ -43219,10 +43346,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?" msgstr "{parámetro de @code{cgit-configuration}} boolean enable-tree-linenumbers?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22558 msgid "Flag which, when set to @samp{#t}, will make cgit generate linenumber links for plaintext blobs printed in the tree view." -msgstr "" +msgstr "Opción que, cuando se proporciona el valor @samp{#t}, hace que cgit genere enlaces de números de línea para los ficheros (blob) de texto plano impresos en la vista de árbol." #. type: deftypevr #: doc/guix.texi:22563 @@ -43230,11 +43358,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?" msgstr "{parámetro de @code{cgit-configuration}} boolean enable-git-config?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22566 -#, fuzzy msgid "Flag which, when set to @samp{#f}, will allow cgit to use Git config to set any repo specific settings." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando tiene valor @samp{#f}, permite que cgit use la configuración de Git para fijar el valor de cualquier opción específica del repositorio." #. type: deftypevr #: doc/guix.texi:22571 @@ -43242,10 +43370,11 @@ msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." msgid "{@code{cgit-configuration} parameter} file-object favicon" msgstr "{parámetro de @code{cgit-configuration}} file-object favicon" +# FUZZY FUZZY #. type: deftypevr #: doc/guix.texi:22573 msgid "URL used as link to a shortcut icon for cgit." -msgstr "" +msgstr "URL usada para icono de los enlaces a cgit." #. type: deftypevr #: doc/guix.texi:22575 @@ -43258,10 +43387,11 @@ msgstr "El valor predeterminado es @samp{\"/favicon.ico\"}." msgid "{@code{cgit-configuration} parameter} string footer" msgstr "{parámetro de @code{cgit-configuration}} string footer" +# FUZZY #. type: deftypevr #: doc/guix.texi:22582 msgid "The content of the file specified with this option will be included verbatim at the bottom of all pages (i.e.@: it replaces the standard \"generated by...\"@: message)." -msgstr "" +msgstr "El contenido del fichero especificado con esta opción se incluirá literalmente en la parte inferior de todas las páginas (es decir, sustituye al mensaje estándar \"generated by...\")." #. type: deftypevr #: doc/guix.texi:22587 @@ -43272,7 +43402,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string head-include" #. type: deftypevr #: doc/guix.texi:22590 msgid "The content of the file specified with this option will be included verbatim in the HTML HEAD section on all pages." -msgstr "" +msgstr "El contenido del fichero especificado con esta opción se incluirá literalmente en la sección HEAD de HTML en todas las páginas." #. type: deftypevr #: doc/guix.texi:22595 @@ -43283,7 +43413,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string header" #. type: deftypevr #: doc/guix.texi:22598 msgid "The content of the file specified with this option will be included verbatim at the top of all pages." -msgstr "" +msgstr "El contenido del fichero especificado con esta opción se incluirá literalmente en la parte superior de todas las páginas." #. type: deftypevr #: doc/guix.texi:22603 @@ -43294,7 +43424,7 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object include" #. type: deftypevr #: doc/guix.texi:22606 msgid "Name of a configfile to include before the rest of the current config- file is parsed." -msgstr "" +msgstr "Nombre de un fichero de configuración que debe incluirse antes de procesar el resto del fichero de configuración actual." #. type: deftypevr #: doc/guix.texi:22611 @@ -43305,7 +43435,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string index-header" #. type: deftypevr #: doc/guix.texi:22614 msgid "The content of the file specified with this option will be included verbatim above the repository index." -msgstr "" +msgstr "El contenido del fichero especificado en esta opción se incluirá literalmente sobre el índice de repositorios." #. type: deftypevr #: doc/guix.texi:22619 @@ -43313,11 +43443,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} string index-info" msgstr "{parámetro de @code{cgit-configuration}} string index-info" +# FUZZY #. type: deftypevr #: doc/guix.texi:22622 -#, fuzzy msgid "The content of the file specified with this option will be included verbatim below the heading on the repository index page." -msgstr "Número que especifica el tiempo de vida, en minutos, de la versión en caché de la página del índice del repositorio." +msgstr "El contenido del fichero especificado con esta opción se incluirá de manera literal bajo la cabecera en la página de índice del repositorio." #. type: deftypevr #: doc/guix.texi:22627 @@ -43325,11 +43455,11 @@ msgstr "Número que especifica el tiempo de vida, en minutos, de la versión en msgid "{@code{cgit-configuration} parameter} boolean local-time?" msgstr "{parámetro de @code{cgit-configuration}} boolean local-time?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22630 -#, fuzzy msgid "Flag which, if set to @samp{#t}, makes cgit print commit and tag times in the servers timezone." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando tiene valor @samp{#t}, hace que cgit imprima las fechas de revisión y etiqueta en la zona horaria del servidor." #. type: deftypevr #: doc/guix.texi:22635 @@ -43340,7 +43470,7 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object logo" #. type: deftypevr #: doc/guix.texi:22638 msgid "URL which specifies the source of an image which will be used as a logo on all cgit pages." -msgstr "" +msgstr "URL que especifica la fuente de una imagen usada como logo en todas las páginas de cgit." #. type: deftypevr #: doc/guix.texi:22640 @@ -43356,7 +43486,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string logo-link" #. type: deftypevr #: doc/guix.texi:22645 doc/guix.texi:23102 msgid "URL loaded when clicking on the cgit logo image." -msgstr "" +msgstr "URL que se carga al pulsar la imagen del logo de cgit." #. type: deftypevr #: doc/guix.texi:22650 @@ -43367,9 +43497,8 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object owner-filter" # FUZZY #. type: deftypevr #: doc/guix.texi:22653 -#, fuzzy msgid "Command which will be invoked to format the Owner column of the main page." -msgstr "Orden ejecutada para el formato de mensajes de revisión." +msgstr "Orden que se ejecuta para dar formato a la columna de propietaria (Owner) de la página principal." #. type: deftypevr #: doc/guix.texi:22658 @@ -43377,11 +43506,11 @@ msgstr "Orden ejecutada para el formato de mensajes de revisión." msgid "{@code{cgit-configuration} parameter} integer max-atom-items" msgstr "{parámetro de @code{cgit-configuration}} integer max-atom-items" +# FUZZY #. type: deftypevr #: doc/guix.texi:22660 -#, fuzzy msgid "Number of items to display in atom feeds view." -msgstr "Número de líneas a leer inicialmente de cada fichero." +msgstr "Número de elementos a mostrar en la vista de «atom feeds»." #. type: deftypevr #: doc/guix.texi:22662 doc/guix.texi:22897 doc/guix.texi:22905 @@ -43398,7 +43527,7 @@ msgstr "{parámetro de @code{cgit-configuration}} integer max-commit-count" #. type: deftypevr #: doc/guix.texi:22667 msgid "Number of entries to list per page in \"log\" view." -msgstr "" +msgstr "Número de entradas a mostrar por página en la vista del registro histórico (\"log\")." #. type: deftypevr #: doc/guix.texi:22669 doc/guix.texi:22684 @@ -43414,7 +43543,7 @@ msgstr "{parámetro de @code{cgit-configuration}} integer max-message-length" #. type: deftypevr #: doc/guix.texi:22674 msgid "Number of commit message characters to display in \"log\" view." -msgstr "" +msgstr "Número de caracteres del mensaje de la revisión a mostrar en la vista del registro histórico (\"log\")." #. type: deftypevr #: doc/guix.texi:22676 doc/guix.texi:22692 @@ -43429,9 +43558,8 @@ msgstr "{parámetro de @code{cgit-configuration}} integer max-repo-count" #. type: deftypevr #: doc/guix.texi:22682 -#, fuzzy msgid "Specifies the number of entries to list per page on the repository index page." -msgstr "Número que especifica el tiempo de vida, en minutos, de la versión en caché de la página del índice del repositorio." +msgstr "Especifica el número de entradas a mostrar por página en la página de índice de repositorios." #. type: deftypevr #: doc/guix.texi:22687 @@ -43441,9 +43569,8 @@ msgstr "{parámetro de @code{cgit-configuration}} integer max-repodesc-length" #. type: deftypevr #: doc/guix.texi:22690 -#, fuzzy msgid "Specifies the maximum number of repo description characters to display on the repository index page." -msgstr "Especifica el número de copias máximo que una usuaria puede imprimir con cada trabajo." +msgstr "Especifica el número máximo de caracteres mostrados en la descripción del repositorio en la página del índice de repositorios." #. type: deftypevr #: doc/guix.texi:22695 @@ -43451,10 +43578,11 @@ msgstr "Especifica el número de copias máximo que una usuaria puede imprimir c msgid "{@code{cgit-configuration} parameter} integer max-blob-size" msgstr "{parámetro de @code{cgit-configuration}} integer max-blob-size" +# FUZZY #. type: deftypevr #: doc/guix.texi:22697 msgid "Specifies the maximum size of a blob to display HTML for in KBytes." -msgstr "" +msgstr "Especifica el tamaño máximo para mostar HTML de un fichero (blob) en kilobytes." #. type: deftypevr #: doc/guix.texi:22702 @@ -43465,7 +43593,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string max-stats" #. type: deftypevr #: doc/guix.texi:22705 msgid "Maximum statistics period. Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}." -msgstr "" +msgstr "Periodo estadístico máximo. Son valores aceptados @samp{week}, @samp{month}, @samp{quarter} and @samp{year}." #. type: deftypevr #: doc/guix.texi:22710 @@ -43475,9 +43603,8 @@ msgstr "{parámetro de @code{cgit-configuration}} mimetype-alist mimetype" #. type: deftypevr #: doc/guix.texi:22712 -#, fuzzy msgid "Mimetype for the specified filename extension." -msgstr "Un tipo de servicio para el pseudo-sistema de ficheros pipefs." +msgstr "Tipo MIME para la extensión de fichero especificada." #. type: deftypevr #: doc/guix.texi:22716 @@ -43490,11 +43617,11 @@ msgstr "El valor predeterminado es @samp{((gif \"image/gif\") (html \"text/html\ msgid "{@code{cgit-configuration} parameter} file-object mimetype-file" msgstr "{parámetro de @code{cgit-configuration}} file-object mimetype-file" +# FUZZY #. type: deftypevr #: doc/guix.texi:22721 -#, fuzzy msgid "Specifies the file to use for automatic mimetype lookup." -msgstr "Especifica el tipo de identificación usado por omisión." +msgstr "Especifica el fichero usado para la búsqueda automática de tipos MIME." #. type: deftypevr #: doc/guix.texi:22726 @@ -43502,10 +43629,11 @@ msgstr "Especifica el tipo de identificación usado por omisión." msgid "{@code{cgit-configuration} parameter} string module-link" msgstr "{parámetro de @code{cgit-configuration}} string module-link" +# FUZZY #. type: deftypevr #: doc/guix.texi:22729 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing." -msgstr "" +msgstr "Texto que se usará como la cadena de formato para un enlace cuando un submódulo se imprime en el listado del directorio." #. type: deftypevr #: doc/guix.texi:22734 @@ -43516,7 +43644,7 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean nocache?" #. type: deftypevr #: doc/guix.texi:22736 msgid "If set to the value @samp{#t} caching will be disabled." -msgstr "" +msgstr "Si se proporciona el valor @samp{#t}, se desactiva la caché." #. type: deftypevr #: doc/guix.texi:22741 @@ -43524,10 +43652,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean noplainemail?" msgstr "{parámetro de @code{cgit-configuration}} boolean noplainemail?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22744 msgid "If set to @samp{#t} showing full author email addresses will be disabled." -msgstr "" +msgstr "Si se proporciona @samp{#t}, se desactiva la impresión de direcciones de correo completas de las autoras." #. type: deftypevr #: doc/guix.texi:22749 @@ -43537,9 +43666,8 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean noheader?" #. type: deftypevr #: doc/guix.texi:22752 -#, fuzzy msgid "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando tiene valor @samp{#t}, hace que cgit omita la cabecera estándar en todas las páginas." #. type: deftypevr #: doc/guix.texi:22757 @@ -43550,7 +43678,7 @@ msgstr "{parámetro de @code{cgit-configuration}} lista-proyectos project-list" #. type: deftypevr #: doc/guix.texi:22761 msgid "A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories. An empty list means that all subdirectories will be loaded." -msgstr "" +msgstr "Una lista de subdirectorios dentro de @code{repository-directory}, relativa a él, que debe cargarse como repositorios Git. La lista vacía significa que se cargarán todos los subdirectorios." #. type: deftypevr #: doc/guix.texi:22766 @@ -43561,7 +43689,7 @@ msgstr "{parámetro de @code{cgit-configuration}} file-object readme" #. type: deftypevr #: doc/guix.texi:22768 msgid "Text which will be used as default value for @code{cgit-repo-readme}." -msgstr "" +msgstr "Texto usado como valor predeterminado para @code{cgit-repo-readme}." #. type: deftypevr #: doc/guix.texi:22773 @@ -43572,7 +43700,7 @@ msgstr "{parámetro de @code{cgit-configuration}} boolean remove-suffix?" #. type: deftypevr #: doc/guix.texi:22777 msgid "If set to @code{#t} and @code{repository-directory} is enabled, if any repositories are found with a suffix of @code{.git}, this suffix will be removed for the URL and name." -msgstr "" +msgstr "Si se proporciona @code{#t} y @code{repository-directory} está activo, si se encuentra algún repositorio con el sufijo @code{.git}, se elimina dicho sufijo de la URL y del nombre." #. type: deftypevr #: doc/guix.texi:22782 @@ -43580,10 +43708,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} integer renamelimit" msgstr "{parámetro de @code{cgit-configuration}} integer renamelimit" +# FUZZY #. type: deftypevr #: doc/guix.texi:22784 msgid "Maximum number of files to consider when detecting renames." -msgstr "" +msgstr "Número máximo de ficheros considerados durante la detección de renombrados." #. type: deftypevr #: doc/guix.texi:22789 @@ -43594,7 +43723,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string repository-sort" #. type: deftypevr #: doc/guix.texi:22791 msgid "The way in which repositories in each section are sorted." -msgstr "" +msgstr "La forma de ordenar los repositorios de cada sección." #. type: deftypevr #: doc/guix.texi:22796 @@ -43604,9 +43733,8 @@ msgstr "{parámetro de @code{cgit-configuration}} lista-robots robots" #. type: deftypevr #: doc/guix.texi:22798 -#, fuzzy msgid "Text used as content for the @code{robots} meta-tag." -msgstr "El contenido de @code{dovecot.conf}, como una cadena." +msgstr "Texto usado como contenido de la meta-etiqueta @code{robots}." #. type: deftypevr #: doc/guix.texi:22800 @@ -43622,7 +43750,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string root-desc" #. type: deftypevr #: doc/guix.texi:22805 msgid "Text printed below the heading on the repository index page." -msgstr "" +msgstr "Texto impreso bajo la cabecera en la página de índice del repositorio." #. type: deftypevr #: doc/guix.texi:22807 @@ -43638,7 +43766,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string root-readme" #. type: deftypevr #: doc/guix.texi:22813 msgid "The content of the file specified with this option will be included verbatim below thef \"about\" link on the repository index page." -msgstr "" +msgstr "El contenido del fichero especificado con esta opción se incluirá de manera literal tras el enlace \"about\" (acerca de) en la página de índice del repositorio." #. type: deftypevr #: doc/guix.texi:22818 @@ -43649,7 +43777,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string root-title" #. type: deftypevr #: doc/guix.texi:22820 msgid "Text printed as heading on the repository index page." -msgstr "" +msgstr "Texto impreso como cabecera en la página de índice del repositorio." #. type: deftypevr #: doc/guix.texi:22825 @@ -43657,10 +43785,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path" msgstr "{parámetro de @code{cgit-configuration}} boolean scan-hidden-path" +# FUZZY #. type: deftypevr #: doc/guix.texi:22831 msgid "If set to @samp{#t} and repository-directory is enabled, repository-directory will recurse into directories whose name starts with a period. Otherwise, repository-directory will stay away from such directories, considered as \"hidden\". Note that this does not apply to the \".git\" directory in non-bare repos." -msgstr "" +msgstr "Si se proporciona @samp{#t} y repository-directory está activo, repository-directory recorrerá recursivamente los directorios cuyos nombres comiencen por punto. En otro caso, repository-directory no tendrá en cuenta dichos directorios, considerados «ocultos». Tenga en cuenta que esto no incluye al directorio «.git» en repositorios con una copia de trabajo." #. type: deftypevr #: doc/guix.texi:22836 @@ -43668,10 +43797,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} list snapshots" msgstr "{parámetro de @code{cgit-configuration}} lista snapshots" +# FUZZY #. type: deftypevr #: doc/guix.texi:22839 msgid "Text which specifies the default set of snapshot formats that cgit generates links for." -msgstr "" +msgstr "Texto que especifica el conjunto predeterminado de formatos de instantánea para los que cgit genera enlaces." #. type: deftypevr #: doc/guix.texi:22844 @@ -43682,7 +43812,7 @@ msgstr "{parámetro de @code{cgit-configuration}} directorio-repositorio reposit #. type: deftypevr #: doc/guix.texi:22847 msgid "Name of the directory to scan for repositories (represents @code{scan-path})." -msgstr "" +msgstr "Nombre del directorio en el que se buscarán repositorios (representa @code{scan-path})." #. type: deftypevr #: doc/guix.texi:22849 @@ -43698,7 +43828,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string section" #. type: deftypevr #: doc/guix.texi:22855 doc/guix.texi:23171 msgid "The name of the current repository section - all repositories defined after this option will inherit the current section name." -msgstr "" +msgstr "Nombre actual de la sección de repositorios - todos los repositorios definidos tras esta opción heredarán el nombre actual de sección." #. type: deftypevr #: doc/guix.texi:22860 @@ -43708,9 +43838,8 @@ msgstr "{parámetro de @code{cgit-configuration}} string section-sort" #. type: deftypevr #: doc/guix.texi:22863 -#, fuzzy msgid "Flag which, when set to @samp{1}, will sort the sections on the repository listing by name." -msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." +msgstr "Opción que, cuando tiene valor @samp{1}, ordenará las secciones en el listado de repositorios por nombre." #. type: deftypevr #: doc/guix.texi:22868 @@ -43718,10 +43847,11 @@ msgstr "Opción que, cuando tiene valor @samp{#t}, ignora el repositorio." msgid "{@code{cgit-configuration} parameter} integer section-from-path" msgstr "{parámetro de @code{cgit-configuration}} integer section-from-path" +# FUZZY #. type: deftypevr #: doc/guix.texi:22871 msgid "A number which, if defined prior to repository-directory, specifies how many path elements from each repo path to use as a default section name." -msgstr "" +msgstr "Número que, si se define antes de repository-directory, especifica cuandos elementos de ruta de cada ruta de repositorio se usarán como nombre de sección predeterminado." #. type: deftypevr #: doc/guix.texi:22876 @@ -43729,10 +43859,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?" msgstr "{parámetro de @code{cgit-configuration}} boolean side-by-side-diffs?" +# FUZZY #. type: deftypevr #: doc/guix.texi:22879 msgid "If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default." -msgstr "" +msgstr "Si se proporciona el valor @samp{#t} se muestran las diferencias lado a lado en vez de usar el formato universal de manera predeterminada." #. type: deftypevr #: doc/guix.texi:22884 @@ -43755,7 +43886,7 @@ msgstr "{parámetro de @code{cgit-configuration}} integer summary-branches" #. type: deftypevr #: doc/guix.texi:22895 msgid "Specifies the number of branches to display in the repository \"summary\" view." -msgstr "" +msgstr "Especifica el número de ramas mostradas en la vista resumen (\"summary\") del repositorio." #. type: deftypevr #: doc/guix.texi:22900 @@ -43766,7 +43897,7 @@ msgstr "{parámetro de @code{cgit-configuration}} integer summary-log" #. type: deftypevr #: doc/guix.texi:22903 msgid "Specifies the number of log entries to display in the repository \"summary\" view." -msgstr "" +msgstr "Especifica el número de entradas del registro mostradas en la vista resumen (\"summary\") del repositorio." #. type: deftypevr #: doc/guix.texi:22908 @@ -43774,10 +43905,11 @@ msgstr "" msgid "{@code{cgit-configuration} parameter} integer summary-tags" msgstr "{parámetro de @code{cgit-configuration}} integer summary-tags" +# FUZZY #. type: deftypevr #: doc/guix.texi:22911 msgid "Specifies the number of tags to display in the repository \"summary\" view." -msgstr "" +msgstr "Especifica el número que etiquetas que se mostrarán en la vista resumen (\"summary\") del repositorio." #. type: deftypevr #: doc/guix.texi:22916 @@ -43788,7 +43920,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string strict-export" #. type: deftypevr #: doc/guix.texi:22919 msgid "Filename which, if specified, needs to be present within the repository for cgit to allow access to that repository." -msgstr "" +msgstr "Nombre de fichero que, en caso de especificarse, debe estar presente en el repositiorio para que se permita el acceso de cgit a dicho repositorio." #. type: deftypevr #: doc/guix.texi:22924 @@ -43799,7 +43931,7 @@ msgstr "{parámetro de @code{cgit-configuration}} string virtual-root" #. type: deftypevr #: doc/guix.texi:22926 msgid "URL which, if specified, will be used as root for all cgit links." -msgstr "" +msgstr "URL que, en caso de especificarse, se usará como raíz de todos los enlaces de cgit." #. type: deftypevr #: doc/guix.texi:22928 @@ -43815,7 +43947,7 @@ msgstr "{parámetro de @code{cgit-configuration}} lista-repository-cgit-configur #. type: deftypevr #: doc/guix.texi:22933 msgid "A list of @dfn{cgit-repo} records to use with config." -msgstr "" +msgstr "Lista de registros @dfn{cgit-repo} usados con la configuración." #. type: deftypevr #: doc/guix.texi:22937 @@ -43828,10 +43960,11 @@ msgstr "Los campos disponibles de @code{repository-cgit-configuration} son:" msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots" msgstr "{parámetro de @code{repository-cgit-configuration}} repo-list snapshots" +# FUZZY #. type: deftypevr #: doc/guix.texi:22941 msgid "A mask of snapshot formats for this repo that cgit generates links for, restricted by the global @code{snapshots} setting." -msgstr "" +msgstr "Una máscara de los formatos de instantánea para este repositorio para los que cgit genera enlaces, restringida por la opción de configuración global @code{snapshots}." #. type: deftypevr #: doc/guix.texi:22946 @@ -43853,7 +43986,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} repo-string url" #. type: deftypevr #: doc/guix.texi:22955 msgid "The relative URL used to access the repository." -msgstr "" +msgstr "La URL relativa usada para el acceso al repositorio." #. type: deftypevr #: doc/guix.texi:22960 @@ -43876,7 +44009,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} repo-string branch- #. type: deftypevr #: doc/guix.texi:22970 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set to @samp{name} enables ordering by branch name." -msgstr "" +msgstr "Cuando se proporciona el valor @samp{age}, activa la ordenación por fecha en la lista de referencias de ramas, y cuando se proporciona @samp{name} se activa la ordenación por nombre de rama." #. type: deftypevr #: doc/guix.texi:22975 @@ -43887,7 +44020,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} repo-list clone-url #. type: deftypevr #: doc/guix.texi:22977 msgid "A list of URLs which can be used to clone repo." -msgstr "" +msgstr "Una lista de URL que se pueden usar para clonar el repositorio." #. type: deftypevr #: doc/guix.texi:22982 @@ -43913,10 +44046,11 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} repo-string commit- msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch" msgstr "{parámetro de @code{repository-cgit-configuration}} repo-string defbranch" +# FUZZY #. type: deftypevr #: doc/guix.texi:23003 msgid "The name of the default branch for this repository. If no such branch exists in the repository, the first branch name (when sorted) is used as default instead. By default branch pointed to by HEAD, or \"master\" if there is no suitable HEAD." -msgstr "" +msgstr "Nombre de la rama predeterminada de este repositorio. Si no existe dicha rama en el repositorio, se usará como predeterminado el primer nombre de rama encontrado (tras su ordenación). De manera predeterminada, la rama a la que apunta HEAD, o \"master\" si no existe un valor adecuado para HEAD." #. type: deftypevr #: doc/guix.texi:23008 @@ -43962,7 +44096,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} maybe-repo-boolean #. type: deftypevr #: doc/guix.texi:23032 msgid "A flag which can be used to disable the global setting @code{enable-commit-graph?}." -msgstr "" +msgstr "Esta opción se puede usar para forzar el valor de la opción de configuración global @code{enable-commit-graph?}." #. type: deftypevr #: doc/guix.texi:23037 @@ -43973,7 +44107,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} maybe-repo-boolean #. type: deftypevr #: doc/guix.texi:23040 msgid "A flag which can be used to disable the global setting @code{enable-log-filecount?}." -msgstr "" +msgstr "Esta opción se puede usar para forzar el valor de la opción de configuración global @code{enable-log-filecount?}." #. type: deftypevr #: doc/guix.texi:23045 @@ -43984,7 +44118,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} maybe-repo-boolean #. type: deftypevr #: doc/guix.texi:23048 msgid "A flag which can be used to disable the global setting @code{enable-log-linecount?}." -msgstr "" +msgstr "Esta opción se puede usar para forzar el valor de la opción de configuración global @code{enable-log-linecount?}." #. type: deftypevr #: doc/guix.texi:23053 @@ -44001,7 +44135,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} maybe-repo-boolean #. type: deftypevr #: doc/guix.texi:23064 msgid "A flag which can be used to override the global setting @code{enable-subject-links?}." -msgstr "" +msgstr "Esta opción se puede usar para forzar el valor de la opción de configuración global @code{enable-subject-links?}." #. type: deftypevr #: doc/guix.texi:23069 @@ -44012,7 +44146,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} maybe-repo-boolean #. type: deftypevr #: doc/guix.texi:23072 msgid "A flag which can be used to override the global setting @code{enable-html-serving?}." -msgstr "" +msgstr "Esta opción se puede usar para forzar el valor de la opción de configuración global @code{enable-html-serving?}." #. type: deftypevr #: doc/guix.texi:23077 @@ -44045,7 +44179,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} repo-file-object lo #. type: deftypevr #: doc/guix.texi:23095 msgid "URL which specifies the source of an image which will be used as a logo on this repo’s pages." -msgstr "" +msgstr "URL que especifica la fuente de una imágen que se usará como logo en las páginas de este repositorio." #. type: deftypevr #: doc/guix.texi:23100 @@ -44074,7 +44208,7 @@ msgstr "{parámetro de @code{repository-cgit-configuration}} repo-string module- #. type: deftypevr #: doc/guix.texi:23118 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing. The arguments for the formatstring are the path and SHA1 of the submodule commit." -msgstr "" +msgstr "Texto que se usará como la cadena de formato de un enlace cuando un submódulo se imprima en el listado de un directorio. Los parámetros para la cadena de formato son la ruta y el SHA1 de la revisión del submódulo." #. type: deftypevr #: doc/guix.texi:23123 @@ -44082,10 +44216,11 @@ msgstr "" msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path" msgstr "{parámetro de @code{repository-cgit-configuration}} ruta-enlace-módulo module-link" +# FUZZY #. type: deftypevr #: doc/guix.texi:23127 msgid "Text which will be used as the formatstring for a hyperlink when a submodule with the specified subdirectory path is printed in a directory listing." -msgstr "" +msgstr "Texto que se usará como la cadena de formato de un enlace cuando un submódulo con la ruta de subdirectorio especificada se imprima en el listado de un directorio." #. type: deftypevr #: doc/guix.texi:23132 -- cgit v1.2.3 From e60a3e74400efc9149083708e3369f1eeb6cb6d6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 31 Aug 2019 21:24:22 +0200 Subject: nls: Update 'fr' translation of the manual. --- po/doc/guix-manual.fr.po | 206 +++++++++++++++++++++++++---------------------- 1 file changed, 109 insertions(+), 97 deletions(-) diff --git a/po/doc/guix-manual.fr.po b/po/doc/guix-manual.fr.po index 06708874c9..668c32f0e4 100644 --- a/po/doc/guix-manual.fr.po +++ b/po/doc/guix-manual.fr.po @@ -3,13 +3,23 @@ # This file is distributed under the same license as the guix package. # Julien Lepiller , 2018. # Simon Tournier , 2018. +# Ludovic Courtès , 2019 +# +# Afin de n'exclure personne, de même que dans la version originale, on +# essaye de ne pas écrire ce document au masculin (ou au féminin). Par +# exemple, on ne veut pas laisser entendre qu'un « utilisateur » ou un +# « développeur » est forcément un homme. +# +# Pour cela on a recours en français aux techniques telles que décrites, +# par exemple, dans le « Manuel d'écriture inclusive » à : +# http://www.univ-tlse3.fr/medias/fichier/manuel-decriture_1482308453426-pdf # msgid "" msgstr "" "Project-Id-Version: guix-manual 1.0.1-pre1\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" "POT-Creation-Date: 2019-05-10 20:53+0200\n" -"PO-Revision-Date: 2019-07-20 11:50+0200\n" +"PO-Revision-Date: 2019-08-31 21:01+0200\n" "Last-Translator: Julien Lepiller \n" "Language-Team: French \n" "Language: fr\n" @@ -18,7 +28,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Offlate 0.1\n" #. #-#-#-#-# contributing.pot (guix 1.0.1-pre1) #-#-#-#-# #. type: chapter @@ -38,7 +48,7 @@ msgstr "Ce projet est un effort coopératif et nous avons besoin de votre aide p #: doc/contributing.texi:10 #, no-wrap msgid "code of conduct, of contributors" -msgstr "code de conduite, des contributeurs" +msgstr "code de conduite, des contributeur·rices" #. type: cindex #: doc/contributing.texi:11 @@ -54,7 +64,9 @@ msgstr "Nous souhaitons fournir un environnement chaleureux, amical et sans harc #. type: Plain text #: doc/contributing.texi:21 msgid "Contributors are not required to use their legal name in patches and on-line communication; they can use any name or pseudonym of their choice." -msgstr "Les contributeurs n'ont pas besoin d'utiliser leur nom légal dans leurs correctifs et leurs communications en ligne ; ils peuvent utiliser n'importe quel nom ou pseudonyme de leur choix." +msgstr "" +"Les contributeur·rice·s n'ont pas besoin d'utiliser leur nom légal dans\n" +"leurs correctifs et leurs communications en ligne ; elles et ils peuvent utiliser n'importe quel nom ou pseudonyme de leur choix." #. type: section #: doc/contributing.texi:29 doc/contributing.texi:31 doc/contributing.texi:32 @@ -113,7 +125,7 @@ msgstr "Style de code" #. type: menuentry #: doc/contributing.texi:29 msgid "Hygiene of the contributor." -msgstr "Hygiène du contributeur." +msgstr "Hygiène des contributeur·rice·s." #. type: section #: doc/contributing.texi:29 doc/contributing.texi:778 @@ -241,7 +253,7 @@ msgstr "Finalement, vous devez invoquer @code{make check} pour lancer les tests #. type: Plain text #: doc/contributing.texi:110 msgid "In order to keep a sane working environment, you will find it useful to test the changes made in your local source tree checkout without actually installing them. So that you can distinguish between your ``end-user'' hat and your ``motley'' costume." -msgstr "Pour garder un environnement de travail sain, il est utile de tester les changement localement sans les installer pour de vrai. Pour pouvoir distinguer votre rôle « d'utilisateur final » de celui parfois haut en couleur de « développeur »." +msgstr "Pour garder un environnement de travail sain, il est utile de tester les changement localement sans les installer pour de vrai. Pour pouvoir distinguer votre rôle « d'utilisateur·rice final·e » de celui parfois haut en couleur de « développeur·euse »." #. type: Plain text #: doc/contributing.texi:121 @@ -526,7 +538,7 @@ msgstr "Synopsis et descriptions" #. type: menuentry #: doc/contributing.texi:305 msgid "Helping users find the right package." -msgstr "Aider les utilisateurs à trouver le bon paquet." +msgstr "Aider les utilisateur·rice·s à trouver le bon paquet." #. type: subsection #: doc/contributing.texi:305 doc/contributing.texi:531 @@ -585,7 +597,7 @@ msgstr "logiciel libre" #. type: Plain text #: doc/contributing.texi:319 msgid "The GNU operating system has been developed so that users can have freedom in their computing. GNU is @dfn{free software}, meaning that users have the @url{http://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to run the program, to study and change the program in source code form, to redistribute exact copies, and to distribute modified versions. Packages found in the GNU distribution provide only software that conveys these four freedoms." -msgstr "Le système d'exploitation GNU a été développé pour que les utilisateurs puissent utiliser leur ordinateur en toute liberté. GNU est un @dfn{logiciel libre}, ce qui signifie que les utilisateur ont les @url{http://www.gnu.org/philosophy/free-sw.fr.html,quatre libertés essentielles} : exécuter le programmer, étudier et modifier le programme sous sa forme source, redistribuer des copies exactes et distribuer les versions modifiées. Les paquets qui se trouvent dans la distribution GNU ne fournissent que des logiciels qui respectent ces quatre libertés." +msgstr "Le système d'exploitation GNU a été développé pour que les utilisatrices et utilisateurs puissent utiliser leur ordinateur en toute liberté. GNU est un @dfn{logiciel libre}, ce qui signifie que chaque personne l'utilisant bénéficie des @url{http://www.gnu.org/philosophy/free-sw.fr.html,quatre libertés essentielles} : exécuter le programmer, étudier et modifier le programme sous sa forme source, redistribuer des copies exactes et distribuer les versions modifiées. Les paquets qui se trouvent dans la distribution GNU ne fournissent que des logiciels qui respectent ces quatre libertés." #. type: Plain text #: doc/contributing.texi:325 @@ -781,7 +793,7 @@ msgstr "résumé du paquet" #. type: Plain text #: doc/contributing.texi:462 msgid "As we have seen before, each package in GNU@tie{}Guix includes a synopsis and a description (@pxref{Defining Packages}). Synopses and descriptions are important: They are what @command{guix package --search} searches, and a crucial piece of information to help users determine whether a given package suits their needs. Consequently, packagers should pay attention to what goes into them." -msgstr "Comme nous l'avons vu avant, chaque paquet dans GNU@tie{}Guix contient un résumé et une description (@pxref{Defining Packages}). Les résumés et les descriptions sont importants : ce sont eux que recherche @command{guix package --search}, et c'est une source d'informations cruciale pour aider les utilisateurs à déterminer si un paquet donner correspond à leurs besoins. En conséquence, les mainteneurs doivent prêter attention à leur contenu." +msgstr "Comme nous l'avons vu avant, chaque paquet dans GNU@tie{}Guix contient un résumé et une description (@pxref{Defining Packages}). Les résumés et les descriptions sont importants : ce sont eux que recherche @command{guix package --search}, et c'est une source d'informations cruciale pour aider les utilisateur·rice·s à déterminer si un paquet donné correspond à leurs besoins. En conséquence, il convient de prêter attention à leur contenu lorsqu'on travaille sur un paquet." #. type: Plain text #: doc/contributing.texi:470 @@ -791,12 +803,12 @@ msgstr "Les résumés doivent commencer par une lettre capitale et ne doit pas f #. type: Plain text #: doc/contributing.texi:480 msgid "Keep in mind that the synopsis must be meaningful for a very wide audience. For example, ``Manipulate alignments in the SAM format'' might make sense for a seasoned bioinformatics researcher, but might be fairly unhelpful or even misleading to a non-specialized audience. It is a good idea to come up with a synopsis that gives an idea of the application domain of the package. In this example, this might give something like ``Manipulate nucleotide sequence alignments'', which hopefully gives the user a better idea of whether this is what they are looking for." -msgstr "Gardez à l'esprit que le résumé doit avoir un sens pour une large audience. Par exemple « Manipulation d'alignements au format SAM » peut avoir du sens pour un bioinformaticien chevronné, mais n'aidera pas ou pourra perdre une audience de non-spécialistes. C'est une bonne idée de créer un résumé qui donne une idée du domaine d'application du paquet. Dans cet exemple, cela donnerait « Manipulation d'alignements de séquences de nucléotides », ce qui devrait donner une meilleure idée à l'utilisateur pour savoir si c'est ce qu'il recherche." +msgstr "Gardez à l'esprit que le résumé doit avoir un sens pour une large audience. Par exemple « Manipulation d'alignements au format SAM » peut avoir du sens pour un bioinformaticien chevronné, mais n'aidera pas ou pourra perdre une audience de non-spécialistes. C'est une bonne idée de créer un résumé qui donne une idée du domaine d'application du paquet. Dans cet exemple, cela donnerait « Manipulation d'alignements de séquences de nucléotides », ce qui devrait donner une meilleure idée à la personne qui le lit pour savoir si c'est ce qu'elle recherche." #. type: Plain text #: doc/contributing.texi:488 msgid "Descriptions should take between five and ten lines. Use full sentences, and avoid using acronyms without first introducing them. Please avoid marketing phrases such as ``world-leading'', ``industrial-strength'', and ``next-generation'', and avoid superlatives like ``the most advanced''---they are not helpful to users looking for a package and may even sound suspicious. Instead, try to be factual, mentioning use cases and features." -msgstr "Les descriptions devraient faire entre cinq et dix lignes. Utilisez des phrases complètes, et évitez d'utiliser des acronymes sans les introduire d'abord. Évitez les phrases marketings comme « world-leading », « industrial-strength » et « next-generation » et évitez les superlatifs comme « the most advanced » — ils ne sont pas utiles pour les utilisateurs qui cherchent un paquet et semblent même un peu suspects. À la place, essayez d'être factuels, en mentionnant les cas d'utilisation et les fonctionnalités." +msgstr "Les descriptions devraient faire entre cinq et dix lignes. Utilisez des phrases complètes, et évitez d'utiliser des acronymes sans les introduire d'abord. Évitez les phrases marketings comme « world-leading », « industrial-strength » et « next-generation » et évitez les superlatifs comme « the most advanced » — ils ne sont pas utiles aux personnes qui cherchent un paquet et semblent même un peu suspects. À la place, essayez d'être factuels, en mentionnant les cas d'utilisation et les fonctionnalités." #. type: cindex #: doc/contributing.texi:489 @@ -807,12 +819,12 @@ msgstr "balisage texinfo, dans les descriptions de paquets" #. type: Plain text #: doc/contributing.texi:498 msgid "Descriptions can include Texinfo markup, which is useful to introduce ornaments such as @code{@@code} or @code{@@dfn}, bullet lists, or hyperlinks (@pxref{Overview,,, texinfo, GNU Texinfo}). However you should be careful when using some characters for example @samp{@@} and curly braces which are the basic special characters in Texinfo (@pxref{Special Characters,,, texinfo, GNU Texinfo}). User interfaces such as @command{guix package --show} take care of rendering it appropriately." -msgstr "Les descriptions peuvent inclure du balisage Texinfo, ce qui est utile pour introduire des ornements comme @code{@@code} ou @code{@@dfn}, des listes à points ou des hyperliens (@pxref{Overview,,, texinfo, GNU Texinfo}). Cependant soyez prudents lorsque vous utilisez certains symboles, par exemple @samp{@@} et les accolades qui sont les caractères spéciaux de base en Texinfo (@pxref{Special Characters,,, texinfo, GNU Texinfo}). Les interfaces utilisateurs comme @command{guix package --show} prennent en charge le rendu." +msgstr "Les descriptions peuvent inclure du balisage Texinfo, ce qui est utile pour introduire des ornements comme @code{@@code} ou @code{@@dfn}, des listes à points ou des hyperliens (@pxref{Overview,,, texinfo, GNU Texinfo}). Cependant soyez prudents lorsque vous utilisez certains symboles, par exemple @samp{@@} et les accolades qui sont les caractères spéciaux de base en Texinfo (@pxref{Special Characters,,, texinfo, GNU Texinfo}). Les commandes et outils comme @command{guix package --show} prennent en charge le rendu." #. type: Plain text #: doc/contributing.texi:504 msgid "Synopses and descriptions are translated by volunteers @uref{http://translationproject.org/domain/guix-packages.html, at the Translation Project} so that as many users as possible can read them in their native language. User interfaces search them and display them in the language specified by the current locale." -msgstr "Les résumés et les descriptions sont traduits par des volontaires @uref{http://translationproject.org/domain/guix-packages.html, sur le projet de traduction} pour que le plus d'utilisateurs possible puissent les lire dans leur langue natale. Les interfaces utilisateurs les recherchent et les affichent dans la langue spécifiée par le paramètre de régionalisation actuel." +msgstr "Les résumés et les descriptions sont traduits par des volontaires @uref{http://translationproject.org/domain/guix-packages.html, sur le projet de traduction} pour que le plus de personnes possible puissent les lire dans leur langue natale. Les interfaces les recherchent et les affichent dans la langue spécifiée par le paramètre de régionalisation actuel." #. type: Plain text #: doc/contributing.texi:509 @@ -836,7 +848,7 @@ msgstr "" #. type: Plain text #: doc/contributing.texi:523 msgid "Translation is a lot of work so, as a packager, please pay even more attention to your synopses and descriptions as every change may entail additional work for translators. In order to help them, it is possible to make recommendations or instructions visible to them by inserting special comments like this (@pxref{xgettext Invocation,,, gettext, GNU Gettext}):" -msgstr "La traduction demande beaucoup de travail, donc en tant que packageur, faîtes encore plus attention à vos résumés et descriptions car chaque changement peut demander d'autant plus de travail de la part des traducteurs. Pour les aider, il est possible de donner des recommandations ou des instructions qu'ils pourront voir en insérant des commentaires spéciaux comme ceci (@pxref{xgettext Invocation,,, gettext, GNU Gettext}) :" +msgstr "La traduction demande beaucoup de travail, faites donc d'autant plus attention à vos résumés et descriptions lorsque vous développez un paquet car chaque changement peut demander du de travail de la part des traducteur·rice·s. Pour les aider, il est possible de donner des recommandations ou des instructions qu'ils et elles pourront voir en insérant des commentaires spéciaux comme ceci (@pxref{xgettext Invocation,,, gettext, GNU Gettext}) :" #. type: example #: doc/contributing.texi:528 @@ -964,12 +976,12 @@ msgstr "polices" #. type: Plain text #: doc/contributing.texi:651 msgid "For fonts that are in general not installed by a user for typesetting purposes, or that are distributed as part of a larger software package, we rely on the general packaging rules for software; for instance, this applies to the fonts delivered as part of the X.Org system or fonts that are part of TeX Live." -msgstr "Pour les polices qui n esont en général par installées par un utilisateurs pour du traitement de texte, ou qui sont distribuées en tant que partie d'un paquet logiciel plus gros, nous nous appuyons sur les règles générales pour les logiciels ; par exemple, cela s'applique aux polices livrées avec le système X.Org ou les polices qui font partie de TeX Live." +msgstr "Pour les polices qui ne sont en général pas installées pour être utilisées pour du traitement de texte, ou qui sont distribuées en tant que partie d'un paquet logiciel plus gros, nous nous appuyons sur les règles générales pour les logiciels ; par exemple, cela s'applique aux polices livrées avec le système X.Org ou les polices qui font partie de TeX Live." #. type: Plain text #: doc/contributing.texi:655 msgid "To make it easier for a user to search for fonts, names for other packages containing only fonts are constructed as follows, independently of the upstream package name." -msgstr "Pour rendre plus facile la recherche par l'utilisateur, les noms des autres paquets contenant seulement des polices sont construits ainsi, indépendamment du nom du paquet en amont." +msgstr "Pour rendre plus facile la recherche par l'utilisatrice ou l'utilisateur, les noms des autres paquets contenant seulement des polices sont construits ainsi, indépendamment du nom du paquet en amont." #. type: Plain text #: doc/contributing.texi:663 @@ -1164,7 +1176,7 @@ msgstr "Avant de soumettre un correctif qui ajoute ou modifie la définition d'u #. type: enumerate #: doc/contributing.texi:806 msgid "If the authors of the packaged software provide a cryptographic signature for the release tarball, make an effort to verify the authenticity of the archive. For a detached GPG signature file this would be done with the @code{gpg --verify} command." -msgstr "Si les auteurs du paquet logiciel fournissent une signature cryptographique pour l'archive, faîtes un effort pour vérifier l'authenticité de l'archive. Pour un fichier de signature GPG détaché, cela se fait avec la commande @code{gpg --verify}." +msgstr "Si les auteurs ou autrices du paquet logiciel fournissent une signature cryptographique pour l'archive, faites un effort pour vérifier l'authenticité de l'archive. Pour un fichier de signature GPG détaché, cela se fait avec la commande @code{gpg --verify}." #. type: enumerate #: doc/contributing.texi:810 @@ -1236,7 +1248,7 @@ msgstr "Assurez-vous que le paquet n'utilise pas de copie groupée d'un logiciel #. type: enumerate #: doc/contributing.texi:859 msgid "Sometimes, packages include copies of the source code of their dependencies as a convenience for users. However, as a distribution, we want to make sure that such packages end up using the copy we already have in the distribution, if there is one. This improves resource usage (the dependency is built and stored only once), and allows the distribution to make transverse changes such as applying security updates for a given software package in a single place and have them affect the whole system---something that bundled copies prevent." -msgstr "Parfois, les paquets incluent des copie du code source de leurs dépendances pour le confort de leurs utilisateurs. Cependant, en tant que distribution, nous voulons nous assurer que ces paquets utilisent bien les copient que nous avons déjà dans la distribution si elles existent. Cela améliore l'utilisation des ressources (la dépendance n'est construite et stockée qu'une seule fois) et permet à la distribution de faire des changements transversaux comme appliquer des correctifs de sécurité pour un paquet donné depuis un unique emplacement et qu'ils affectent tout le système, ce qu'empêchent les copies groupées." +msgstr "Parfois, les paquets incluent des copie du code source de leurs dépendances pour le confort des utilisateur·rice·s. Cependant, en tant que distribution, nous voulons nous assurer que ces paquets utilisent bien les copient que nous avons déjà dans la distribution si elles existent. Cela améliore l'utilisation des ressources (la dépendance n'est construite et stockée qu'une seule fois) et permet à la distribution de faire des changements transversaux comme appliquer des correctifs de sécurité pour un paquet donné depuis un unique emplacement et qu'ils affectent tout le système, ce qu'empêchent les copies groupées." #. type: enumerate #: doc/contributing.texi:868 @@ -1301,7 +1313,7 @@ msgstr "branche @code{core-updates} (peut inclure des changements majeurs et pot #. type: enumerate #: doc/contributing.texi:901 msgid "All these branches are @uref{https://hydra.gnu.org/project/gnu, 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." -msgstr "Toutes ces branches sont @uref{https://hydra.gnu.org/project/gnu, gérées par notre ferme de construction} et fusionnées dans @code{master} une fois que tout a été construit correctement. Cela nous permet de corriger des problèmes avant qu'ils n'atteignent les utilisateurs et réduit la fenêtre pendant laquelle les binaires pré-construits ne sont pas disponibles." +msgstr "Toutes ces branches sont @uref{https://hydra.gnu.org/project/gnu, gérées par notre ferme de construction} et fusionnées dans @code{master} une fois que tout a été construit correctement. Cela nous permet de corriger des problèmes avant qu'ils n'atteignent les utilisateur·rice·s et réduit la fenêtre pendant laquelle les binaires pré-construits ne sont pas disponibles." #. type: enumerate #: doc/contributing.texi:908 @@ -1715,7 +1727,7 @@ msgstr "Documentation" #. type: menuentry #: doc/guix.texi:139 msgid "Browsing software user manuals." -msgstr "Visualiser les manuels d'utilisateur des logiciels." +msgstr "Visualiser les manuels des logiciels." #. type: chapter #: doc/guix.texi:139 doc/guix.texi:25456 doc/guix.texi:25457 @@ -2583,7 +2595,7 @@ msgstr "Débogage des échecs de construction" #. type: menuentry #: doc/guix.texi:252 doc/guix.texi:7661 msgid "Real life packaging experience." -msgstr "La vie d'un empaqueteur." +msgstr "L'empaquetage dans la vraie vie." #. type: section #: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10238 @@ -3142,7 +3154,7 @@ msgstr "but" #. type: Plain text #: doc/guix.texi:323 msgid "GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using the international phonetic alphabet (IPA).} is a package management tool for and distribution of the GNU system. Guix makes it easy for unprivileged users to install, upgrade, or remove software packages, to roll back to a previous package set, to build packages from source, and generally assists with the creation and maintenance of software environments." -msgstr "GNU Guix@footnote{« Guix » se prononce comme « geeks » (en prononçant le « s »), ou « ɡiːks » dans l'alphabet phonétique international (API).} est un outil de gestion de paquets et une distribution pour le système GNU@. Guix facilite pour les utilisateurs non privilégiés l'installation, la mise à jour et la suppression de paquets, la restauration à un ensemble de paquets précédent, la construction de paquets depuis les sources et plus généralement aide à la création et à la maintenance d'environnements logiciels." +msgstr "GNU Guix@footnote{« Guix » se prononce comme « geeks » (en prononçant le « s »), ou « ɡiːks » dans l'alphabet phonétique international (API).} est un outil de gestion de paquets et une distribution pour le système GNU@. Guix facilite pour les utilisateur·rice·s non privilégié·e·s l'installation, la mise à jour et la suppression de paquets, la restauration à un ensemble de paquets précédent, la construction de paquets depuis les sources et plus généralement aide à la création et à la maintenance d'environnements logiciels." #. type: cindex #: doc/guix.texi:324 doc/guix.texi:399 @@ -3171,7 +3183,7 @@ msgstr "Vous pouvez installer GNU@tie{}Guix sur un système GNU/Linux existant p #: doc/guix.texi:344 #, no-wrap msgid "user interfaces" -msgstr "interfaces utilisateurs" +msgstr "interfaces utilisateur·rice" #. type: Plain text #: doc/guix.texi:350 @@ -3187,7 +3199,7 @@ msgstr "démon de construction" #. type: Plain text #: doc/guix.texi:354 msgid "Its @dfn{build daemon} is responsible for building packages on behalf of users (@pxref{Setting Up the Daemon}) and for downloading pre-built binaries from authorized sources (@pxref{Substitutes})." -msgstr "Son @dfn{démon de construction} est responsable de la construction des paquets pour les utilisateurs (@pxref{Paramétrer le démon}) et du téléchargement des binaires pré-construits depuis les sources autorisées (@pxref{Substituts})." +msgstr "Son @dfn{démon de construction} est responsable de la construction des paquets pour les utilisateur·rice·s (@pxref{Paramétrer le démon}) et du téléchargement des binaires pré-construits depuis les sources autorisées (@pxref{Substituts})." #. type: cindex #: doc/guix.texi:355 @@ -3204,7 +3216,7 @@ msgstr "personnalisation, des paquets" #. type: Plain text #: doc/guix.texi:365 msgid "Guix includes package definitions for many GNU and non-GNU packages, all of which @uref{https://www.gnu.org/philosophy/free-sw.html, respect the user's computing freedom}. It is @emph{extensible}: users can write their own package definitions (@pxref{Defining Packages}) and make them available as independent package modules (@pxref{Package Modules}). It is also @emph{customizable}: users can @emph{derive} specialized package definitions from existing ones, including from the command line (@pxref{Package Transformation Options})." -msgstr "Guix contient de nombreuses définitions de paquet GNU et non-GNU qui respectent tous les @uref{https://www.gnu.org/philosophy/free-sw.fr.html, libertés de l'utilisateur}. Il est @emph{extensible} : les utilisateurs peuvent écrire leurs propres définitions de paquets (@pxref{Defining Packages}) et les rendre disponibles dans des modules de paquets indépendants (@pxref{Package Modules}). Il est aussi @emph{personnalisable} : les utilisateurs peuvent @emph{dériver} des définitions de paquets spécialisées à partir de définitions existantes, même depuis la ligne de commande (@pxref{Package Transformation Options})." +msgstr "Guix contient de nombreuses définitions de paquet GNU et non-GNU qui respectent tous les @uref{https://www.gnu.org/philosophy/free-sw.fr.html, libertés de l'utilisateur ou utilisatrice}. Il est @emph{extensible}  : chacun·e peut écrire ses propres définitions de paquets (@pxref{Defining Packages}) et les rendre disponibles dans des modules de paquets indépendants (@pxref{Package Modules}). Il est aussi @emph{personnalisable} : on peut @emph{dériver} des définitions de paquets spécialisées à partir de définitions existantes, même depuis la ligne de commande (@pxref{Package Transformation Options})." #. type: cindex #: doc/guix.texi:366 @@ -3237,12 +3249,12 @@ msgstr "Le résultat des fonctions de construction de paquets est mis en @dfn{ca #. type: Plain text #: doc/guix.texi:394 msgid "This approach is the foundation for the salient features of Guix: support for transactional package upgrade and rollback, per-user installation, and garbage collection of packages (@pxref{Features})." -msgstr "Cette approche est le fondement des fonctionnalités les plus importante de Guix : le support des mises à jour des paquets et des retours en arrière transactionnels, l'installation différenciée par utilisateur et le ramassage de miettes pour les paquets (@pxref{Fonctionnalités})." +msgstr "Cette approche est le fondement des fonctionnalités les plus importante de Guix : le support des mises à jour des paquets et des retours en arrière transactionnels, l'installation différenciée par utilisateur·rice et le ramassage de miettes pour les paquets (@pxref{Fonctionnalités})." #. type: Plain text #: doc/guix.texi:409 msgid "Guix comes with a distribution of the GNU system consisting entirely of free software@footnote{The term ``free'' here refers to the @url{https://www.gnu.org/philosophy/free-sw.html,freedom provided to users of that software}.}. The distribution can be installed on its own (@pxref{System Installation}), but it is also possible to install Guix as a package manager on top of an installed GNU/Linux system (@pxref{Installation}). When we need to distinguish between the two, we refer to the standalone distribution as Guix@tie{}System." -msgstr "Guix fournit aussi une distribution du système GNU contenant uniquement des logiciels libres@footnote{Le terme « libre » se réfère ici bien sûr à @url{http://www.gnu.org/philosophy/free-sw.fr.html,la liberté offerte à l'utilisateur de ces logiciels}.}. On peut installer la distribution elle-même (@pxref{System Installation}), mais on peut aussi installer Guix comme gestionnaire de paquets par dessus un système GNU/Linux déjà installé (@pxref{Installation}). Pour distinguer ces deux cas, on appelle la distribution autonome le « système Guix » ou Guix@tie{}System." +msgstr "Guix fournit aussi une distribution du système GNU contenant uniquement des logiciels libres@footnote{Le terme « libre » se réfère ici bien sûr à @url{http://www.gnu.org/philosophy/free-sw.fr.html,la liberté offerte à la personne qui utilise ces logiciels}.}. On peut installer la distribution elle-même (@pxref{System Installation}), mais on peut aussi installer Guix comme gestionnaire de paquets par dessus un système GNU/Linux déjà installé (@pxref{Installation}). Pour distinguer ces deux cas, on appelle la distribution autonome le « système Guix » ou Guix@tie{}System." #. type: Plain text #: doc/guix.texi:415 @@ -3258,7 +3270,7 @@ msgstr "guix package --list-available\n" #. type: Plain text #: doc/guix.texi:424 msgid "Our goal is to provide a practical 100% free software distribution of Linux-based and other variants of GNU, with a focus on the promotion and tight integration of GNU components, and an emphasis on programs and tools that help users exert that freedom." -msgstr "Notre but est de fournir une distribution logicielle entièrement libre de GNU/Linux et d'autres variantes de GNU, en se concentrant sur la promotion et l'intégration étroite des composants GNU en insistant sur les programmes et les outils qui aident l'utilisateur à exercer ses libertés." +msgstr "Notre but est de fournir une distribution logicielle entièrement libre de GNU/Linux et d'autres variantes de GNU, en se concentrant sur la promotion et l'intégration étroite des composants GNU en insistant sur les programmes et les outils qui aident l'utilisateur·rice à exercer ses libertés." #. type: Plain text #: doc/guix.texi:426 @@ -3364,7 +3376,7 @@ msgstr "Remarque" #. type: quotation #: doc/guix.texi:486 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script} to install Guix on top of a running GNU/Linux system, thereafter called a @dfn{foreign distro}.@footnote{This section is concerned with the installation of the package manager, which can be done on top of a running GNU/Linux system. If, instead, you want to install the complete GNU operating system, @pxref{System Installation}.} The script automates the download, installation, and initial configuration of Guix. It should be run as the root user." -msgstr "Nous vous recommandons d'utiliser ce @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, script shell d'installation} pour installer Guix sur un système GNU/Linux fonctionnel, que nous appelons une @dfn{distro externe}@footnote{Cette section s'occupe de l'installation du gestionnaire de paquet, ce qui peut se faire sur un système GNU/Linux existant. Si vous voulez plutôt installer le système d'exploitation GNU complet, @pxref{System Installation}.}. Le script automatise le téléchargement, l'installation et la configuration initiale de Guix. Vous devez l'exécuter en tant qu'utilisateur root." +msgstr "Nous vous recommandons d'utiliser ce @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, script shell d'installation} pour installer Guix sur un système GNU/Linux fonctionnel, que nous appelons une @dfn{distro externe}@footnote{Cette section s'occupe de l'installation du gestionnaire de paquet, ce qui peut se faire sur un système GNU/Linux existant. Si vous voulez plutôt installer le système d'exploitation GNU complet, @pxref{System Installation}.}. Le script automatise le téléchargement, l'installation et la configuration initiale de Guix. Vous devez l'exécuter en tant que root." #. type: cindex #: doc/guix.texi:488 doc/guix.texi:1565 @@ -3413,7 +3425,7 @@ msgstr "Cette section décrit comment installer Guix sur un système quelconque #. type: quotation #: doc/guix.texi:530 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}. The script automates the download, installation, and initial configuration steps described below. It should be run as the root user." -msgstr "Nous vous recommandons d'utiliser ce @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, script d'installation shell}. Ce script automatise le téléchargement, l'installation et les étapes de configuration initiales décrites plus bas. Vous devriez le lancer en tant qu'utilisateur root." +msgstr "Nous vous recommandons d'utiliser ce @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, script d'installation shell}. Ce script automatise le téléchargement, l'installation et les étapes de configuration initiales décrites plus bas. Vous devriez le lancer en tant que root." #. type: Plain text #: doc/guix.texi:533 @@ -3469,7 +3481,7 @@ msgstr "et relancez la commande @code{gpg --verify}." #. type: enumerate #: doc/guix.texi:566 msgid "Now, you need to become the @code{root} user. Depending on your distribution, you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run:" -msgstr "Maintenant, vous devez devenir l'utilisateur @code{root}. En fonction de votre distribution, vous devrez lancer @code{su -} ou @code{sudo -i}. En tant que @code{root}, lancez :" +msgstr "Maintenant, vous devez devenir @code{root}. En fonction de votre distribution, vous devrez lancer @code{su -} ou @code{sudo -i}. En tant que @code{root}, lancez :" #. type: example #: doc/guix.texi:572 @@ -3535,7 +3547,7 @@ msgstr "" #. type: enumerate #: doc/guix.texi:612 msgid "Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup})." -msgstr "Créez le groupe et les comptes utilisateurs pour les utilisateurs de construction comme expliqué plus loin (@pxref{Build Environment Setup})." +msgstr "Créez le groupe et les comptes utilisés pour la construction comme expliqué plus loin (@pxref{Build Environment Setup})." #. type: enumerate #: doc/guix.texi:615 @@ -3596,7 +3608,7 @@ msgstr "" #. type: enumerate #: doc/guix.texi:651 msgid "Make the @command{guix} command available to other users on the machine, for instance with:" -msgstr "Rendez la commande @command{guix} disponible pour les autres utilisateurs sur la machine, par exemple avec :" +msgstr "Rendez la commande @command{guix} disponible pour les autres personnes sur la machine, par exemple avec :" #. type: example #: doc/guix.texi:656 @@ -3658,7 +3670,7 @@ msgstr "" #. type: enumerate #: doc/guix.texi:686 msgid "Each user may need to perform a few additional steps to make their Guix environment ready for use, @pxref{Application Setup}." -msgstr "Chaque utilisateur peut avoir besoin d'effectuer des étapes supplémentaires pour que leur environnement Guix soit prêt à être utilisé, @pxref{Application Setup}." +msgstr "On peut avoir besoin d'effectuer des étapes supplémentaires pour que son environnement Guix soit prêt à être utilisé, @pxref{Application Setup}." #. type: Plain text #: doc/guix.texi:689 @@ -3954,23 +3966,23 @@ msgstr "environnement de construction" #. type: Plain text #: doc/guix.texi:896 msgid "In a standard multi-user setup, Guix and its daemon---the @command{guix-daemon} program---are installed by the system administrator; @file{/gnu/store} is owned by @code{root} and @command{guix-daemon} runs as @code{root}. Unprivileged users may use Guix tools to build packages or otherwise access the store, and the daemon will do it on their behalf, ensuring that the store is kept in a consistent state, and allowing built packages to be shared among users." -msgstr "Dans une installation standard multi-utilisateurs, Guix et son démon — le programme @command{guix-daemon} — sont installé par l'administrateur système ; @file{/gnu/store} appartient à @code{root} et @command{guix-daemon} est lancé en @code{root}. Les utilisateurs non-privilégiés peuvent utiliser les outils Guix pour construire des paquets ou accéder au dépôt et le démon le fera pour leur compte en s'assurant que le dépôt garde un état cohérent et permet le partage des paquets déjà construits entre les utilisateurs." +msgstr "Dans une installation standard multi-utilisateur·rice·s, Guix et son démon — le programme @command{guix-daemon} — sont installés par la personne qui administre le système ; @file{/gnu/store} appartient à @code{root} et @command{guix-daemon} est lancé en @code{root}. Les utilisateur·rice·s non-privilégié·e·s peuvent utiliser les outils Guix pour construire des paquets ou accéder au dépôt et le démon le fera pour leur compte en s'assurant que le dépôt garde un état cohérent et permet le partage des paquets déjà construits entre les utilisateur·rice·s." #. type: cindex #: doc/guix.texi:897 #, no-wrap msgid "build users" -msgstr "utilisateurs de construction" +msgstr "comptes de construction" #. type: Plain text #: doc/guix.texi:908 msgid "When @command{guix-daemon} runs as @code{root}, you may not want package build processes themselves to run as @code{root} too, for obvious security reasons. To avoid that, a special pool of @dfn{build users} should be created for use by build processes started by the daemon. These build users need not have a shell and a home directory: they will just be used when the daemon drops @code{root} privileges in build processes. Having several such users allows the daemon to launch distinct build processes under separate UIDs, which guarantees that they do not interfere with each other---an essential feature since builds are regarded as pure functions (@pxref{Introduction})." -msgstr "Alors que @command{guix-daemon} tourne en @code{root}, vous n'avez pas forcément envie que les processus de construction de paquets tournent aussi en @code{root}, pour des raisons de sécurité évidentes. Pour éviter cela, vous devriez créer une réserve spéciale d'@dfn{utilisateurs de construction} que les processus de construction démarrés par le démon utiliseront. Ces utilisateurs de construction n'ont pas besoin d'un shell ou d'un répertoire personnel ; ils seront seulement utilisés quand le démon délaissera ses privilèges @code{root} dans les processus de construction. En ayant plusieurs de ces utilisateurs, vous permettez au démon de lancer des processus de construction distincts sous des UID différent, ce qui garanti qu'aucune interférence n'ait lieu entre les uns et les autres — une fonctionnalité essentielle puisque les constructions sont supposées être des fonctions pures (@pxref{Introduction})." +msgstr "Alors que @command{guix-daemon} tourne en @code{root}, vous n'avez pas forcément envie que les processus de construction de paquets tournent aussi en @code{root}, pour des raisons de sécurité évidentes. Pour éviter cela, vous devriez créer une réserve spéciale de @dfn{comptes de construction} que les processus de construction démarrés par le démon utiliseront. Ces comptes de construction n'ont pas besoin d'un shell ou d'un répertoire personnel ; ils seront seulement utilisés quand le démon délaissera ses privilèges @code{root} dans les processus de construction. En ayant plusieurs de ces comptes, vous permettez au démon de lancer des processus de construction distincts sous des UID différent, ce qui garanti qu'aucune interférence n'ait lieu entre les uns et les autres — une fonctionnalité essentielle puisque les constructions sont supposées être des fonctions pures (@pxref{Introduction})." #. type: Plain text #: doc/guix.texi:911 msgid "On a GNU/Linux system, a build user pool may be created like this (using Bash syntax and the @code{shadow} commands):" -msgstr "Sur un système GNU/Linux, on peut créer une réserve d'utilisateurs de construction comme ceci (avec la syntaxe Bash et les commandes @code{shadow}) :" +msgstr "Sur un système GNU/Linux, on peut créer une réserve de comptes de construction comme ceci (avec la syntaxe Bash et les commandes @code{shadow}) :" #. type: example #: doc/guix.texi:923 @@ -3990,14 +4002,14 @@ msgstr "" " do\n" " useradd -g guixbuild -G guixbuild \\\n" " -d /var/empty -s `which nologin` \\\n" -" -c \"Utilisateur de construction Guix $i\" --system \\\n" +" -c \"Compte de construction Guix $i\" --system \\\n" " guixbuilder$i;\n" " done\n" #. type: Plain text #: doc/guix.texi:933 msgid "The number of build users determines how many build jobs may run in parallel, as specified by the @option{--max-jobs} option (@pxref{Invoking guix-daemon, @option{--max-jobs}}). To use @command{guix system vm} and related commands, you may need to add the build users to the @code{kvm} group so they can access @file{/dev/kvm}, using @code{-G guixbuild,kvm} instead of @code{-G guixbuild} (@pxref{Invoking guix system})." -msgstr "Le nombre d'utilisateurs de construction détermine le nombre de tâches de constructions qui peuvent tourner en parallèle, tel que spécifié par l'option @option{--max-jobs} (@pxref{Invoking guix-daemon, @option{--max-jobs}}). Pour utiliser @command{guix system vm} et les commandes liées, vous devrez ajouter les utilisateurs de construction au groupe @code{kvm} pour qu'ils puissent accéder à @file{/dev/kvm} avec @code{-G guixbuild,kvm} plutôt que @code{-G guixbuild} (@pxref{Invoking guix system})." +msgstr "Le nombre de comptes de construction détermine le nombre de tâches de constructions qui peuvent tourner en parallèle, tel que spécifié par l'option @option{--max-jobs} (@pxref{Invoking guix-daemon, @option{--max-jobs}}). Pour utiliser @command{guix system vm} et les commandes liées, vous devrez ajouter les comptes de construction au groupe @code{kvm} pour qu'ils puissent accéder à @file{/dev/kvm} avec @code{-G guixbuild,kvm} plutôt que @code{-G guixbuild} (@pxref{Invoking guix system})." #. type: Plain text #: doc/guix.texi:942 @@ -4019,7 +4031,7 @@ msgstr "chroot" #. type: Plain text #: doc/guix.texi:952 msgid "This way, the daemon starts build processes in a chroot, under one of the @code{guixbuilder} users. On GNU/Linux, by default, the chroot environment contains nothing but:" -msgstr "De cette façon, le démon démarre les processus de construction dans un chroot, sous un des utilisateurs @code{guixbuilder}. Sur GNU/Linux par défaut, l'environnement chroot ne contient rien d'autre que :" +msgstr "De cette façon, le démon démarre les processus de construction dans un chroot, sous un des comptes @code{guixbuilder}. Sur GNU/Linux par défaut, l'environnement chroot ne contient rien d'autre que :" #. type: itemize #: doc/guix.texi:960 @@ -4034,12 +4046,12 @@ msgstr "le répertoire @code{/proc} ; il ne montre que les processus du conteneu #. type: itemize #: doc/guix.texi:968 msgid "@file{/etc/passwd} with an entry for the current user and an entry for user @file{nobody};" -msgstr "@file{/etc/passwd} avec une entrée pour l'utilisateur actuel et une entrée pour l'utilisateur @file{nobody} ;" +msgstr "@file{/etc/passwd} avec une entrée pour le compte actuel et une entrée pour le compte @file{nobody} ;" #. type: itemize #: doc/guix.texi:971 msgid "@file{/etc/group} with an entry for the user's group;" -msgstr "@file{/etc/group} avec une entrée pour le groupe de l'utilisateur ;" +msgstr "@file{/etc/group} avec une entrée pour le groupe de ce compte ;" #. type: itemize #: doc/guix.texi:975 @@ -4070,7 +4082,7 @@ msgstr "Le démon tient aussi compte de la variable d'environnement @code{http_p #. type: Plain text #: doc/guix.texi:1000 msgid "If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @code{--disable-chroot}. However, build processes will not be isolated from one another, and not from the rest of the system. Thus, build processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it much harder to view them as @emph{pure} functions." -msgstr "Si vous installez Guix en tant qu'utilisateur non-privilégié, il est toujours possible de lancer @command{guix-daemon} si vous passez @code{--disable-chroot}. Cependant, les processus de construction ne seront pas isolés les uns des autres ni du reste du système. Ainsi les processus de construction peuvent interférer les uns avec les autres, et peuvent accéder à des programmes, des bibliothèques et d'autres fichiers présents sur le système — ce qui rend plus difficile de les voir comme des fonctions @emph{pures}." +msgstr "Si vous installez Guix en tant qu'utilisateur·rice non-privilégié·e, il est toujours possible de lancer @command{guix-daemon} si vous passez @code{--disable-chroot}. Cependant, les processus de construction ne seront pas isolés les uns des autres ni du reste du système. Ainsi les processus de construction peuvent interférer les uns avec les autres, et peuvent accéder à des programmes, des bibliothèques et d'autres fichiers présents sur le système — ce qui rend plus difficile de les voir comme des fonctions @emph{pures}." #. type: subsection #: doc/guix.texi:1003 @@ -4093,7 +4105,7 @@ msgstr "crochet de construction" #. type: Plain text #: doc/guix.texi:1020 msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}. When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}. Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine." -msgstr "Si vous le souhaitez, le démon de construction peut @dfn{décharger} des constructions de dérivations sur d'autres machines Guix avec le @dfn{crochet de construction} @code{offload}@footnote{Cette fonctionnalité n'est disponible que si @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} est présent.}. Lorsque cette fonctionnalité est activée, Guix lit une liste de machines de constructions spécifiée par l'utilisateur dans @file{/etc/guix/machines.scm} ; à chaque fois qu'une construction est demandée, par exemple par @code{guix build}, le démon essaie de la décharger sur une des machines qui satisfont les contraintes de la dérivation, en particulier le type de système, p.@: ex.@: @file{x86_64-linux}. Les prérequis manquants pour la construction sont copiés par SSH sur la machine de construction qui procède ensuite à la construction ; si elle réussit, les sorties de la construction sont copiés vers la machine de départ." +msgstr "Si vous le souhaitez, le démon de construction peut @dfn{décharger} des constructions de dérivations sur d'autres machines Guix avec le @dfn{crochet de construction} @code{offload}@footnote{Cette fonctionnalité n'est disponible que si @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} est présent.}. Lorsque cette fonctionnalité est activée, Guix lit une liste de machines de constructions spécifiée par l'utilisateur·rice dans @file{/etc/guix/machines.scm} ; à chaque fois qu'une construction est demandée, par exemple par @code{guix build}, le démon essaie de la décharger sur une des machines qui satisfont les contraintes de la dérivation, en particulier le type de système, p.@: ex.@: @file{x86_64-linux}. Les prérequis manquants pour la construction sont copiés par SSH sur la machine de construction qui procède ensuite à la construction ; si elle réussit, les sorties de la construction sont copiés vers la machine de départ." #. type: Plain text #: doc/guix.texi:1022 @@ -4199,7 +4211,7 @@ msgstr "user" #. type: table #: doc/guix.texi:1071 msgid "The user account to use when connecting to the remote machine over SSH. Note that the SSH key pair must @emph{not} be passphrase-protected, to allow non-interactive logins." -msgstr "Le compte utilisateur à utiliser lors de la connexion à la machine distante par SSH@. Remarquez que la paire de clef SSH ne doit @emph{pas} être protégée par mot de passe pour permettre des connexions non-interactives." +msgstr "Le compte à utiliser lors de la connexion à la machine distante par SSH@. Remarquez que la paire de clef SSH ne doit @emph{pas} être protégée par mot de passe pour permettre des connexions non-interactives." #. type: item #: doc/guix.texi:1072 @@ -4526,7 +4538,7 @@ msgstr "@code{guix_daemon_socket_t} n'est pas vraiment utilisé. Aucune des op #. type: enumerate #: doc/guix.texi:1268 msgid "@code{guix gc} cannot access arbitrary links to profiles. By design, the file label of the destination of a symlink is independent of the file label of the link itself. Although all profiles under $localstatedir are labelled, the links to these profiles inherit the label of the directory they are in. For links in the user’s home directory this will be @code{user_home_t}. But for links from the root user’s home directory, or @file{/tmp}, or the HTTP server’s working directory, etc, this won’t work. @code{guix gc} would be prevented from reading and following these links." -msgstr "@code{guix gc} ne peut pas accéder à n'importe quel lien vers les profils. Par conception, l'étiquette de fichier de la destination d'un lien symbolique est indépendant de l'étiquette du lien lui-même. Bien que tous les profils sous $localstatedir aient une étiquette, les liens vers ces profils héritent de l'étiquette du répertoire dans lequel ils se trouvent. Pour les liens dans le répertoire personnel cela sera @code{user_home_t}. Mais pour les liens du répertoire personnel de l'utilisateur root, ou @file{/tmp}, ou du répertoire de travail du serveur HTTP, etc, cela ne fonctionnera pas. SELinux empêcherait @code{guix gc} de lire et de suivre ces liens." +msgstr "@code{guix gc} ne peut pas accéder à n'importe quel lien vers les profils. Par conception, l'étiquette de fichier de la destination d'un lien symbolique est indépendant de l'étiquette du lien lui-même. Bien que tous les profils sous $localstatedir aient une étiquette, les liens vers ces profils héritent de l'étiquette du répertoire dans lequel ils se trouvent. Pour les liens dans le répertoire personnel cela sera @code{user_home_t}. Mais pour les liens du répertoire personnel de root, ou @file{/tmp}, ou du répertoire de travail du serveur HTTP, etc, cela ne fonctionnera pas. SELinux empêcherait @code{guix gc} de lire et de suivre ces liens." #. type: enumerate #: doc/guix.texi:1273 @@ -4536,7 +4548,7 @@ msgstr "La fonctionnalité du démon d'écouter des connexions TCP pourrait ne p #. type: enumerate #: doc/guix.texi:1284 msgid "Currently all files with a name matching the regular expression @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the label @code{guix_daemon_exec_t}; this means that @emph{any} file with that name in any profile would be permitted to run in the @code{guix_daemon_t} domain. This is not ideal. An attacker could build a package that provides this executable and convince a user to install and run it, which lifts it into the @code{guix_daemon_t} domain. At that point SELinux could not prevent it from accessing files that are allowed for processes in that domain." -msgstr "Actuellement tous les fichiers qui correspondent à l'expression rationnelle @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} reçoivent l'étiquette @code{guix_daemon_exec_t} ; cela signifie que @emph{tout} fichier avec ce nom dans n'importe quel profil serait autorisé à se lancer dans le domaine @code{guix_daemon_t}. Ce n'est pas idéal. Un attaquant pourrait construire un paquet qui fournit cet exécutable et convaincre un utilisateur de l'installer et de le lancer, ce qui l'élève dans le domaine @code{guix_daemon_t}. À ce moment SELinux ne pourrait pas l'empêcher d'accéder à des fichiers autorisés pour les processus de ce domaine." +msgstr "Actuellement tous les fichiers qui correspondent à l'expression rationnelle @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} reçoivent l'étiquette @code{guix_daemon_exec_t} ; cela signifie que @emph{tout} fichier avec ce nom dans n'importe quel profil serait autorisé à se lancer dans le domaine @code{guix_daemon_t}. Ce n'est pas idéal. Un attaquant pourrait construire un paquet qui fournit cet exécutable et convaincre un·e utilisateur·rice de l'installer et de le lancer, ce qui l'élève dans le domaine @code{guix_daemon_t}. À ce moment SELinux ne pourrait pas l'empêcher d'accéder à des fichiers autorisés pour les processus de ce domaine." #. type: enumerate #: doc/guix.texi:1292 @@ -4579,7 +4591,7 @@ msgstr "Par défaut, @command{guix-daemon} lance les processus de construction s #. type: Plain text #: doc/guix.texi:1330 msgid "When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory specified by its @code{TMPDIR} environment variable. This directory is shared with the container for the duration of the build, though within the container, the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}." -msgstr "Lorsque le démon effectue une construction pour le compte de l'utilisateur, il crée un répertoire sous @file{/tmp} ou sous le répertoire spécifié par sa variable d'environnement @code{TMPDIR}. Ce répertoire est partagé avec le conteneur pendant la durée de la construction, bien que dans le conteneur, l'arborescence de construction est toujours appelée @file{/tmp/guix-build-@var{name}.drv-0}." +msgstr "Lorsque le démon effectue une construction pour le compte de l'utilisateur·rice, il crée un répertoire sous @file{/tmp} ou sous le répertoire spécifié par sa variable d'environnement @code{TMPDIR}. Ce répertoire est partagé avec le conteneur pendant la durée de la construction, bien que dans le conteneur, l'arborescence de construction est toujours appelée @file{/tmp/guix-build-@var{name}.drv-0}." #. type: Plain text #: doc/guix.texi:1334 @@ -4605,7 +4617,7 @@ msgstr "--build-users-group=@var{groupe}" #. type: table #: doc/guix.texi:1347 msgid "Take users from @var{group} to run build processes (@pxref{Setting Up the Daemon, build users})." -msgstr "Prendre les utilisateurs de @var{group} pour lancer les processus de construction (@pxref{Paramétrer le démon, utilisateurs de construction})." +msgstr "Utiliser les comptes du @var{groupe} pour lancer les processus de construction (@pxref{Paramétrer le démon, comptes de construction})." #. type: item #: doc/guix.texi:1348 doc/guix.texi:7723 @@ -4826,7 +4838,7 @@ msgstr "Désactive les constructions dans un chroot." #. type: table #: doc/guix.texi:1454 msgid "Using this option is not recommended since, again, it would allow build processes to gain access to undeclared dependencies. It is necessary, though, when @command{guix-daemon} is running under an unprivileged user account." -msgstr "Utiliser cette option n'est pas recommandé car, de nouveau, elle permet aux processus de construction d'accéder à des dépendances non déclarées. Elle est nécessaire cependant lorsque @command{guix-daemon} tourne en tant qu'utilisateur non privilégié." +msgstr "Utiliser cette option n'est pas recommandé car, de nouveau, elle permet aux processus de construction d'accéder à des dépendances non déclarées. Elle est nécessaire cependant lorsque @command{guix-daemon} tourne sans privilèges." #. type: item #: doc/guix.texi:1455 @@ -4908,7 +4920,7 @@ msgstr "Dire si le ramasse-miettes (GC) doit garder les dérivations corresponda #. type: table #: doc/guix.texi:1493 msgid "When set to ``yes'', as is the case by default, the GC keeps derivations---i.e., @code{.drv} files---as long as at least one of their outputs is live. This allows users to keep track of the origins of items in their store. Setting it to ``no'' saves a bit of disk space." -msgstr "Lorsqu'elle est à « yes », comme c'est le cas par défaut, le GC garde les dérivations — c.-à-d.@: les fichiers @file{.drv} — tant qu'au moins une de leurs sorties est utilisée. Cela permet aux utilisateurs de garder une trace de l'origine des éléments du dépôt. Le mettre à « no » préserve un peu d'espace disque." +msgstr "Lorsqu'elle est à « yes », comme c'est le cas par défaut, le GC garde les dérivations — c.-à-d.@: les fichiers @file{.drv} — tant qu'au moins une de leurs sorties est utilisée. Cela permet de garder une trace de l'origine des éléments du dépôt. Le mettre à « no » préserve un peu d'espace disque." #. type: table #: doc/guix.texi:1501 @@ -5026,7 +5038,7 @@ msgstr "Écouter les connexions TCP sur l'interface réseau correspondant à @co #. type: table #: doc/guix.texi:1547 msgid "This option can be repeated multiple times, in which case @command{guix-daemon} accepts connections on all the specified endpoints. Users can tell client commands what endpoint to connect to by setting the @code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})." -msgstr "Cette option peut être répétée plusieurs fois, auquel cas @command{guix-daemon} accepte des connexions sur toutes les extrémités spécifiées. Les utilisateurs peuvent dire aux commandes clientes à quelle extrémité se connecter en paramétrant la variable d'environnement @code{GUIX_DAEMON_SOCKET} (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})." +msgstr "Cette option peut être répétée plusieurs fois, auquel cas @command{guix-daemon} accepte des connexions sur toutes les extrémités spécifiées. On peut indiquer aux commandes clientes à quoi se connecter en paramétrant la variable d'environnement @code{GUIX_DAEMON_SOCKET} (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})." #. type: quotation #: doc/guix.texi:1554 @@ -5133,7 +5145,7 @@ msgstr "name service caching daemon (nscd)" #. type: Plain text #: doc/guix.texi:1625 msgid "When using Guix on a foreign distro, we @emph{strongly recommend} that the system run the GNU C library's @dfn{name service cache daemon}, @command{nscd}, which should be listening on the @file{/var/run/nscd/socket} socket. Failing to do that, applications installed with Guix may fail to look up host names or user accounts, or may even crash. The next paragraphs explain why." -msgstr "Lorsque vous utilisez Guix sur une distro externe, nous @emph{recommandons fortement} que ce système fasse tourner le @dfn{démon de cache de service de noms} de la bibliothèque C de GNU, @command{nscd}, qui devrait écouter sur le socket @file{/var/run/nscd/socket}. Sans cela, les applications installées avec Guix peuvent échouer à résoudre des noms d'hôtes ou d'utilisateurs, ou même planter. Les paragraphes suivants expliquent pourquoi." +msgstr "Lorsque vous utilisez Guix sur une distro externe, nous @emph{recommandons fortement} que ce système fasse tourner le @dfn{démon de cache de service de noms} de la bibliothèque C de GNU, @command{nscd}, qui devrait écouter sur le socket @file{/var/run/nscd/socket}. Sans cela, les applications installées avec Guix peuvent échouer à résoudre des noms d'hôtes ou de comptes, ou même planter. Les paragraphes suivants expliquent pourquoi." #. type: file{#1} #: doc/guix.texi:1626 @@ -5144,7 +5156,7 @@ msgstr "nsswitch.conf" #. type: Plain text #: doc/guix.texi:1631 msgid "The GNU C library implements a @dfn{name service switch} (NSS), which is an extensible mechanism for ``name lookups'' in general: host name resolution, user accounts, and more (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." -msgstr "La bibliothèque C de GNU implémente un @dfn{name service switch} (NSS), qui est un mécanisme d'extension pour les « résolutions de noms » en général : résolution de nom d'hôte, de compte utilisateur et plus (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." +msgstr "La bibliothèque C de GNU implémente un @dfn{name service switch} (NSS), qui est un mécanisme d'extension pour les « résolutions de noms » en général : résolution de nom d'hôte, de compte utilisateur·rice et plus (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." #. type: cindex #: doc/guix.texi:1632 @@ -5161,7 +5173,7 @@ msgstr "NIS (Network information service)" #. type: Plain text #: doc/guix.texi:1642 msgid "Being extensible, the NSS supports @dfn{plugins}, which provide new name lookup implementations: for example, the @code{nss-mdns} plugin allow resolution of @code{.local} host names, the @code{nis} plugin allows user account lookup using the Network information service (NIS), and so on. These extra ``lookup services'' are configured system-wide in @file{/etc/nsswitch.conf}, and all the programs running on the system honor those settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})." -msgstr "Comme il est extensible, NSS supporte des @dfn{greffons} qui fournissent une nouvelle implémentation de résolution de nom : par exemple le greffon @code{nss-mdns} permet la résolution de noms d'hôtes en @code{.local}, le greffon @code{nis} permet la résolution de comptes utilisateurs avec le Network Information Service (NIS), etc. Ces « services de recherches » supplémentaires sont configurés au niveau du système dans @file{/etc/nsswitch.conf}, et tous les programmes qui tournent sur ce système honorent ces paramètres (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})" +msgstr "Comme il est extensible, NSS supporte des @dfn{greffons} qui fournissent une nouvelle implémentation de résolution de nom : par exemple le greffon @code{nss-mdns} permet la résolution de noms d'hôtes en @code{.local}, le greffon @code{nis} permet la résolution de comptes avec le Network Information Service (NIS), etc. Ces « services de recherches » supplémentaires sont configurés au niveau du système dans @file{/etc/nsswitch.conf}, et tous les programmes qui tournent sur ce système honorent ces paramètres (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})" #. type: Plain text #: doc/guix.texi:1652 @@ -5388,7 +5400,7 @@ msgstr "prise en charge du matériel sur Guix System" #. type: Plain text #: doc/guix.texi:1845 msgid "GNU@tie{}Guix focuses on respecting the user's computing freedom. It builds around the kernel Linux-libre, which means that only hardware for which free software drivers and firmware exist is supported. Nowadays, a wide range of off-the-shelf hardware is supported on GNU/Linux-libre---from keyboards to graphics cards to scanners and Ethernet controllers. Unfortunately, there are still areas where hardware vendors deny users control over their own computing, and such hardware is not supported on Guix System." -msgstr "GNU@tie{}Guix se concentre sur le respect des libertés de ses utilisateurs. Il est construit autour du noyau Linux-libre, ce qui signifie que seuls les matériels pour lesquels des pilotes logiciels et des microgiciels libres sont disponibles sont pris en charge. De nos jours, une grande gamme de matériel qu'on peut acheter est prise en charge par GNU/Linux-libre — des claviers aux cartes graphiques en passant par les scanners et les contrôleurs Ethernet. Malheureusement, il reste des produit dont les fabricants refusent de laisser le contrôle aux utilisateurs sur leur propre utilisation de l'ordinateur, et ces matériels ne sont pas pris en charge par Guix System." +msgstr "GNU@tie{}Guix se concentre sur le respect des libertés de ses utilisateurs et utilisatrices. Il est construit autour du noyau Linux-libre, ce qui signifie que seuls les matériels pour lesquels des pilotes logiciels et des microgiciels libres sont disponibles sont pris en charge. De nos jours, une grande gamme de matériel qu'on peut acheter est prise en charge par GNU/Linux-libre — des claviers aux cartes graphiques en passant par les scanners et les contrôleurs Ethernet. Malheureusement, il reste des produits dont les fabricants refusent de laisser le contrôle aux utilisateur·rice·s sur leur propre utilisation de l'ordinateur, et ces matériels ne sont pas pris en charge par Guix System." #. type: cindex #: doc/guix.texi:1846 @@ -5492,7 +5504,7 @@ msgstr "" #. type: enumerate #: doc/guix.texi:1931 msgid "Access to @file{/dev/sdX} usually requires root privileges." -msgstr "Accéder à @file{/dev/sdX} requiert généralement les privilèges super-utilisateur." +msgstr "Accéder à @file{/dev/sdX} requiert généralement les privilèges d'administration." #. type: unnumberedsubsec #: doc/guix.texi:1933 @@ -5519,7 +5531,7 @@ msgstr "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@v #. type: enumerate #: doc/guix.texi:1955 msgid "Access to @file{/dev/srX} usually requires root privileges." -msgstr "Accéder à @file{/dev/srX} requiert généralement les privilèges super-utilisateur." +msgstr "Accéder à @file{/dev/srX} requiert généralement les privilèges root." #. type: unnumberedsubsec #: doc/guix.texi:1957 @@ -6060,7 +6072,7 @@ msgstr "Cela copie tous les fichiers nécessaires et installe GRUB sur @file{/de #. type: Plain text #: doc/guix.texi:2362 msgid "Once that command has completed---and hopefully succeeded!---you can run @command{reboot} and boot into the new system. The @code{root} password in the new system is initially empty; other users' passwords need to be initialized by running the @command{passwd} command as @code{root}, unless your configuration specifies otherwise (@pxref{user-account-password, user account passwords}). @xref{After System Installation}, for what's next!" -msgstr "Une fois que cette commande a terminé — et on l'espère réussi ! — vous pouvez lancer @command{reboot} et démarrer sur votre nouveau système. Le mot de passe @code{root} est d'abord vide ; les mots de passe des autres utilisateurs doivent être initialisés avec la commande @command{passwd} en tant que @code{root}, à mois que votre configuration ne spécifie autre chose (@pxref{user-account-password, mot de passe des comptes utilisateurs}). @xref{After System Installation}, pour la suite !" +msgstr "Une fois que cette commande a terminé — et on l'espère réussi ! — vous pouvez lancer @command{reboot} et démarrer sur votre nouveau système. Le mot de passe @code{root} est d'abord vide ; les mots de passe des autres comptes doivent être initialisés avec la commande @command{passwd} en tant que @code{root}, à mois que votre configuration ne spécifie autre chose (@pxref{user-account-password, mot de passe des comptes}). @xref{After System Installation}, pour la suite !" #. type: Plain text #: doc/guix.texi:2369 @@ -6091,7 +6103,7 @@ msgstr "sudo vs.@: @command{guix pull}" #. type: quotation #: doc/guix.texi:2386 msgid "Note that @command{sudo guix} runs your user's @command{guix} command and @emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged. To explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}." -msgstr "Remarquez que @command{sudo guix} exécute la commande @command{guix} de votre utilisateur et @emph{non} celle de root, parce que @command{sudo} ne change pas @code{PATH}. Pour utiliser explicitement le @command{guix} de root, tapez @command{sudo -i guix @dots{}}." +msgstr "Remarquez que @command{sudo guix} exécute la commande @command{guix} de votre compte et @emph{non} celle de root, parce que @command{sudo} ne change pas @code{PATH}. Pour utiliser explicitement le @command{guix} de root, tapez @command{sudo -i guix @dots{}}." #. type: Plain text #: doc/guix.texi:2390 @@ -6254,7 +6266,7 @@ msgstr "paquets" #. type: Plain text #: doc/guix.texi:2487 msgid "The purpose of GNU Guix is to allow users to easily install, upgrade, and remove software packages, without having to know about their build procedures or dependencies. Guix also goes beyond this obvious set of features." -msgstr "Le but de GNU Guix est de permettre à ses utilisateurs d'installer, mettre à jour et supprimer facilement des paquets logiciels sans devoir connaître leur procédure de construction ou leurs dépendances. Guix va aussi plus loin que ces fonctionnalités évidentes." +msgstr "Le but de GNU Guix est de permettre à ses utilisatrices et utilisateurs d'installer, mettre à jour et supprimer facilement des paquets logiciels sans devoir connaître leur procédure de construction ou leurs dépendances. Guix va aussi plus loin que ces fonctionnalités évidentes." #. type: Plain text #: doc/guix.texi:2495 @@ -6275,7 +6287,7 @@ msgstr "Lorsque vous utilisez Guix, chaque paquet arrive dans @dfn{dépôt des p #. type: Plain text #: doc/guix.texi:2524 msgid "Instead of referring to these directories, users have their own @dfn{profile}, which points to the packages that they actually want to use. These profiles are stored within each user's home directory, at @code{$HOME/.guix-profile}." -msgstr "Plutôt que de se rapporter à ces répertoires, les utilisateurs ont leur propre @dfn{profil} qui pointe vers les paquets qu'ils veulent vraiment utiliser. Ces profils sont stockés dans le répertoire personnel de chaque utilisateur dans @code{$HOME/.guix-profile}." +msgstr "Plutôt que de se rapporter à ces répertoires, les utilisateur·rice·s ont leur propre @dfn{profil} qui pointe vers les paquets qu'ils ou elles veulent vraiment utiliser. Ces profils sont stockés dans le répertoire personnel de chacun·e dans @code{$HOME/.guix-profile}." #. type: Plain text #: doc/guix.texi:2532 @@ -6285,7 +6297,7 @@ msgstr "Par exemple, @code{alice} installe GCC 4.7.2. Il en résulte que @file{ #. type: Plain text #: doc/guix.texi:2536 msgid "The @command{guix package} command is the central tool to manage packages (@pxref{Invoking guix package}). It operates on the per-user profiles, and can be used @emph{with normal user privileges}." -msgstr "La commande @command{guix package} est l'outil central pour gérer les paquets (@pxref{Invoking guix package}). Il opère sur les profils utilisateurs et peut être utilisé avec les @emph{privilèges utilisateurs normaux}." +msgstr "La commande @command{guix package} est l'outil central pour gérer les paquets (@pxref{Invoking guix package}). Il opère sur les profils de chaque utilisateur·rice et peut être utilisé avec les @emph{privilèges normaux}." #. type: cindex #: doc/guix.texi:2537 doc/guix.texi:2616 @@ -6296,7 +6308,7 @@ msgstr "transactions" #. type: Plain text #: doc/guix.texi:2544 msgid "The command provides the obvious install, remove, and upgrade operations. Each invocation is actually a @emph{transaction}: either the specified operation succeeds, or nothing happens. Thus, if the @command{guix package} process is terminated during the transaction, or if a power outage occurs during the transaction, then the user's profile remains in its previous state, and remains usable." -msgstr "La commande fournit les opérations évidentes d'installation, de suppression et de mise à jour. Chaque invocation est en fait une @emph{transaction} : soit l'opération demandée réussit, soit rien ne se passe. Ainsi, si le processus @command{guix package} est terminé pendant la transaction ou si une panne de courant arrive pendant la transaction, le profil de l'utilisateur reste dans son état précédent et reste utilisable." +msgstr "La commande fournit les opérations évidentes d'installation, de suppression et de mise à jour. Chaque invocation est en fait une @emph{transaction} : soit l'opération demandée réussit, soit rien ne se passe. Ainsi, si le processus @command{guix package} est terminé pendant la transaction ou si une panne de courant arrive pendant la transaction, le profil reste dans son état précédent et reste utilisable." #. type: Plain text #: doc/guix.texi:2552 @@ -6306,7 +6318,7 @@ msgstr "En plus, il est possible @emph{d'annuler} toute transaction sur les paqu #. type: Plain text #: doc/guix.texi:2559 msgid "All packages in the package store may be @emph{garbage-collected}. Guix can determine which packages are still referenced by user profiles, and remove those that are provably no longer referenced (@pxref{Invoking guix gc}). Users may also explicitly remove old generations of their profile so that the packages they refer to can be collected." -msgstr "Tout paquet du dépôt des paquets peut être @emph{glané}. Guix peut déterminer quels paquets sont toujours référencés par les profils des utilisateurs et supprimer ceux qui ne sont plus référencés de manière prouvable (@pxref{Invoking guix gc}). Les utilisateurs peuvent toujours explicitement supprimer les anciennes générations de leur profil pour que les paquets auxquels elles faisaient référence puissent être glanés." +msgstr "Tout paquet du dépôt des paquets peut être @emph{glané}. Guix peut déterminer quels paquets sont toujours référencés par les profils des utilisateur·rice·s et supprimer ceux qui ne sont de tout évidence plus référencés (@pxref{Invoking guix gc}). Les utilisateur·rice·s peuvent toujours explicitement supprimer les anciennes générations de leur profil pour que les paquets auxquels elles faisaient référence puissent être glanés." #. type: cindex #: doc/guix.texi:2560 doc/guix.texi:4087 @@ -6317,7 +6329,7 @@ msgstr "reproductibilité" #. type: Plain text #: doc/guix.texi:2572 msgid "Guix takes a @dfn{purely functional} approach to package management, as described in the introduction (@pxref{Introduction}). Each @file{/gnu/store} package directory name contains a hash of all the inputs that were used to build that package---compiler, libraries, build scripts, etc. This direct correspondence allows users to make sure a given package installation matches the current state of their distribution. It also helps maximize @dfn{build reproducibility}: thanks to the isolated build environments that are used, a given build is likely to yield bit-identical files when performed on different machines (@pxref{Invoking guix-daemon, container})." -msgstr "Guix prend une approche @dfn{purement fonctionnelle} de la gestion de paquets, telle que décrite dans l'introduction (@pxref{Introduction}). Chaque nom de répertoire de paquet dans @file{/gnu/store} contient un hash de toutes les entrées qui ont été utilisées pendant la construction de ce paquet — le compilateur, les bibliothèques, les scripts de construction, etc. Cette correspondance directe permet aux utilisateurs de s'assurer que l'installation d'un paquet donné correspond à l'état actuel de leur distribution. Elle aide aussi à maximiser la @dfn{reproductibilité} : grâce aux environnements de construction utilisés, une construction donnée a de forte chances de donner des fichiers identiques bit-à-bit lorsqu'elle est effectuée sur des machines différentes (@pxref{Invoking guix-daemon, container})." +msgstr "Guix prend une approche @dfn{purement fonctionnelle} de la gestion de paquets, telle que décrite dans l'introduction (@pxref{Introduction}). Chaque nom de répertoire de paquet dans @file{/gnu/store} contient un hash de toutes les entrées qui ont été utilisées pendant la construction de ce paquet — le compilateur, les bibliothèques, les scripts de construction, etc. Cette correspondance directe permet aux utilisateur·rice·s de s'assurer que l'installation d'un paquet donné correspond à l'état actuel de leur distribution. Elle aide aussi à maximiser la @dfn{reproductibilité} : grâce aux environnements de construction utilisés, une construction donnée a de forte chances de donner des fichiers identiques bit-à-bit lorsqu'elle est effectuée sur des machines différentes (@pxref{Invoking guix-daemon, container})." #. type: Plain text #: doc/guix.texi:2583 @@ -6379,7 +6391,7 @@ msgstr "suppression de paquets" #. type: Plain text #: doc/guix.texi:2611 msgid "The @command{guix package} command is the tool that allows users to install, upgrade, and remove packages, as well as rolling back to previous configurations. It operates only on the user's own profile, and works with normal user privileges (@pxref{Features}). Its syntax is:" -msgstr "La commande @command{guix package} est l'outil qui permet d'installer, mettre à jour et supprimer les paquets ainsi que de revenir à une configuration précédente. Elle n'opère que dans le profil de l'utilisateur et fonctionne avec les privilèges utilisateurs normaux (@pxref{Fonctionnalités}). Sa syntaxe est :" +msgstr "La commande @command{guix package} est l'outil qui permet d'installer, mettre à jour et supprimer les paquets ainsi que de revenir à une configuration précédente. Elle n'opère que dans le profil de l'utilisateur·rice et fonctionne avec les privilèges normaux (@pxref{Fonctionnalités}). Sa syntaxe est :" #. type: example #: doc/guix.texi:2614 @@ -6390,7 +6402,7 @@ msgstr "guix package @var{options}\n" #. type: Plain text #: doc/guix.texi:2621 msgid "Primarily, @var{options} specifies the operations to be performed during the transaction. Upon completion, a new profile is created, but previous @dfn{generations} of the profile remain available, should the user want to roll back." -msgstr "@var{options} spécifie d'abord les opérations à effectuer pendant la transaction. À la fin, une nouvelle génération du profil est créée mais les @dfn{générations} précédentes du profil restent disponibles si l'utilisateur souhaite y revenir." +msgstr "@var{options} spécifie d'abord les opérations à effectuer pendant la transaction. À la fin, une nouvelle génération du profil est créée mais les @dfn{générations} précédentes du profil restent disponibles si l'utilisateur·rice souhaite y revenir." #. type: Plain text #: doc/guix.texi:2624 @@ -6442,7 +6454,7 @@ msgstr "Ces alias sont moins expressifs que @command{guix package} et fournissen #. type: Plain text #: doc/guix.texi:2651 msgid "@command{guix package} also supports a @dfn{declarative approach} whereby the user specifies the exact set of packages to be available and passes it @i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--manifest}})." -msgstr "@command{guix package} supporte aussi une @dfn{approche déclarative} où l'utilisateur spécifie l'ensemble exact des paquets qui doivent être disponibles le passe @i{via} l'option @option{--manifest} (@pxref{profile-manifest, @option{--manifest}})." +msgstr "@command{guix package} supporte aussi une @dfn{approche déclarative} où on spécifie l'ensemble exact des paquets qui doivent être disponibles que l'on passe @i{via} l'option @option{--manifest} (@pxref{profile-manifest, @option{--manifest}})." #. type: cindex #: doc/guix.texi:2652 @@ -6453,7 +6465,7 @@ msgstr "profil" #. type: Plain text #: doc/guix.texi:2658 msgid "For each user, a symlink to the user's default profile is automatically created in @file{$HOME/.guix-profile}. This symlink always points to the current generation of the user's default profile. Thus, users can add @file{$HOME/.guix-profile/bin} to their @code{PATH} environment variable, and so on." -msgstr "Pour chaque utilisateur, un lien symbolique vers le profil par défaut de cet utilisateur est automatiquement créé dans @file{$HOME/.guix-profile}. Ce lien symbolique pointe toujours vers la génération actuelle du profil par défaut de l'utilisateur. Ainsi, les utilisateurs peuvent ajouter @file{$HOME/.guix-profile/bin} à leur variable d'environnement @code{PATH} etc." +msgstr "Pour chaque compte, un lien symbolique vers son profil par défaut est automatiquement créé dans @file{$HOME/.guix-profile}. Ce lien symbolique pointe toujours vers la génération actuelle du profil par défaut du compte. Ainsi, on peut ajouter @file{$HOME/.guix-profile/bin} à sa variable d'environnement @code{PATH} etc." #. type: cindex #: doc/guix.texi:2658 doc/guix.texi:2855 @@ -6479,7 +6491,7 @@ msgstr "" #. type: Plain text #: doc/guix.texi:2678 msgid "In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to (@pxref{Invoking guix gc}). That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @code{--localstatedir}, and @var{user} is the user name. The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created by @command{guix package}." -msgstr "Dans un environnement multi-utilisateur, les profils utilisateurs sont stockés comme une @dfn{racine du ramasse-miettes}, vers laquelle pointe @file{$HOME/.guix-profile} (@pxref{Invoking guix gc}). Ce répertoire est normalement @code{@var{localstatedir}/guix/profiles/per-user/@var{utilisateur}}, où @var{localstatedir} est la valeur passée à @code{configure} avec @code{--localstatedir} et @var{utilisateur} le nom d'utilisateur. Le répertoire @file{per-user} est créé lorsque @command{guix-daemon} est démarré et le sous-répertoire @var{user} est créé par @command{guix package}." +msgstr "Dans un environnement multi-utilisateur·rice, les profils sont stockés comme une @dfn{racine du ramasse-miettes}, vers laquelle pointe @file{$HOME/.guix-profile} (@pxref{Invoking guix gc}). Ce répertoire est normalement @code{@var{localstatedir}/guix/profiles/per-user/@var{compte}}, où @var{localstatedir} est la valeur passée à @code{configure} avec @code{--localstatedir} et @var{compte} le nom du compte. Le répertoire @file{per-user} est créé lorsque @command{guix-daemon} est démarré et le sous-répertoire @var{user} est créé par @command{guix package}." #. type: Plain text #: doc/guix.texi:2680 @@ -6532,7 +6544,7 @@ msgstr "package-cmd-propagated-inputs" #. type: table #: doc/guix.texi:2713 msgid "An example is the GNU MPC library: its C header files refer to those of the GNU MPFR library, which in turn refer to those of the GMP library. Thus, when installing MPC, the MPFR and GMP libraries also get installed in the profile; removing MPC also removes MPFR and GMP---unless they had also been explicitly installed by the user." -msgstr "Un exemple est la bibliothèque MPC de GNU : ses fichiers d'en-tête C se réfèrent à ceux de la bibliothèque MPFR de GNU, qui se réfèrent en retour à ceux de la bibliothèque GMP. Ainsi, lorsqu'on installe MPC, les bibliothèques MPFR et GMP sont aussi installées dans le profil ; supprimer MPC supprimera aussi MPFR et GMP — à moins qu'ils n'aient été aussi installés explicitement par l'utilisateur." +msgstr "Un exemple est la bibliothèque MPC de GNU : ses fichiers d'en-tête C se réfèrent à ceux de la bibliothèque MPFR de GNU, qui se réfèrent en retour à ceux de la bibliothèque GMP. Ainsi, lorsqu'on installe MPC, les bibliothèques MPFR et GMP sont aussi installées dans le profil ; supprimer MPC supprimera aussi MPFR et GMP — à moins qu'ils n'aient été aussi installés explicitement par l'utilisateur·rice." #. type: table #: doc/guix.texi:2718 @@ -6597,7 +6609,7 @@ msgstr "@verbatiminclude package-hello.scm\n" #. type: table #: doc/guix.texi:2747 msgid "Developers may find it useful to include such a @file{guix.scm} file in the root of their project source tree that can be used to test development snapshots and create reproducible development environments (@pxref{Invoking guix environment})." -msgstr "Les développeurs peuvent trouver utile d'inclure un tel fichier @file{guix.scm} à la racine de l'arborescence des sources de leur projet qui pourrait être utilisé pour tester des versions de développement et créer des environnements de développement reproductibles (@pxref{Invoking guix environment})." +msgstr "Lorsqu'on développe, on peut trouver utile d'inclure un tel fichier @file{guix.scm} à la racine de l'arborescence des sources de son projet qui pourrait être utilisé pour tester des versions de développement et créer des environnements de développement reproductibles (@pxref{Invoking guix environment})." #. type: item #: doc/guix.texi:2748 @@ -6856,7 +6868,7 @@ msgstr "Rapporter les définitions des variables d'environnement dans la syntaxe #. type: table #: doc/guix.texi:2868 msgid "For example, GCC needs the @code{CPATH} and @code{LIBRARY_PATH} environment variables to be defined so it can look for headers and libraries in the user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). If GCC and, say, the C library are installed in the profile, then @code{--search-paths} will suggest setting these variables to @code{@var{profile}/include} and @code{@var{profile}/lib}, respectively." -msgstr "Par exemple, GCC a besoin des variables d'environnement @code{CPATH} et @code{LIBRARY_PATH} pour trouver les en-têtes et les bibliothèques dans le profil de l'utilisateur (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). Si GCC et, disons, la bibliothèque C sont installés dans le profil, alors @code{--search-paths} suggérera d'initialiser ces variables à @code{@var{profil}/include} et @code{@var{profil}/lib}, respectivement." +msgstr "Par exemple, GCC a besoin des variables d'environnement @code{CPATH} et @code{LIBRARY_PATH} pour trouver les en-têtes et les bibliothèques dans le profil de l'utilisateur·rice (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). Si GCC et, disons, la bibliothèque C sont installés dans le profil, alors @code{--search-paths} suggérera d'initialiser ces variables à @code{@var{profil}/include} et @code{@var{profil}/lib}, respectivement." #. type: table #: doc/guix.texi:2871 @@ -6911,7 +6923,7 @@ msgstr "-p @var{profil}" #. type: table #: doc/guix.texi:2898 msgid "Use @var{profile} instead of the user's default profile." -msgstr "Utiliser le @var{profil} à la place du profil par défaut de l'utilisateur." +msgstr "Utiliser le @var{profil} à la place du profil par défaut du compte." #. type: cindex #: doc/guix.texi:2899 @@ -6956,7 +6968,7 @@ msgstr "--bootstrap" #. type: table #: doc/guix.texi:2912 msgid "Use the bootstrap Guile to build the profile. This option is only useful to distribution developers." -msgstr "Utiliser le programme d'amorçage Guile pour compiler le profil. Cette option n'est utile que pour les développeurs de la distribution." +msgstr "Utiliser le programme d'amorçage Guile pour compiler le profil. Cette option n'est utile qu'aux personnes qui développent la distribution." #. type: Plain text #: doc/guix.texi:2918 @@ -7514,17 +7526,17 @@ msgstr "confiance, en des binaires pré-construits" #. type: Plain text #: doc/guix.texi:3311 msgid "Today, each individual's control over their own computing is at the mercy of institutions, corporations, and groups with enough power and determination to subvert the computing infrastructure and exploit its weaknesses. While using @code{@value{SUBSTITUTE-SERVER}} substitutes can be convenient, we encourage users to also build on their own, or even run their own build farm, such that @code{@value{SUBSTITUTE-SERVER}} is less of an interesting target. One way to help is by publishing the software you build using @command{guix publish} so that others have one more choice of server to download substitutes from (@pxref{Invoking guix publish})." -msgstr "De nos jours, le contrôle individuel sur son utilisation propre de l'informatique est à la merci d'institutions, de sociétés et de groupes avec assez de pouvoir et de détermination pour contourner les infrastructures informatiques et exploiter leurs faiblesses. Bien qu'utiliser les substituts de @code{@value{SUBSTITUTE-SERVER}} soit pratique, nous encourageons les utilisateurs à construire aussi par eux-mêmes, voir à faire tourner leur propre ferme de construction, pour que @code{@value{SUBSTITUTE-SERVER}} devienne une cible moins intéressante. Une façon d'aider est de publier les logiciels que vous construisez avec @command{guix publish} pour que les autres aient plus de choix de serveurs où télécharger les substituts (@pxref{Invoking guix publish})." +msgstr "De nos jours, le contrôle individuel sur son utilisation propre de l'informatique est à la merci d'institutions, de sociétés et de groupes avec assez de pouvoir et de détermination pour contourner les infrastructures informatiques et exploiter leurs faiblesses. Bien qu'utiliser les substituts de @code{@value{SUBSTITUTE-SERVER}} soit pratique, nous encourageons chacun·e à construire aussi par soi-même, voire à faire tourner sa propre ferme de construction, pour que @code{@value{SUBSTITUTE-SERVER}} devienne une cible moins intéressante. Une façon d'aider est de publier les logiciels que vous construisez avec @command{guix publish} pour que les autres aient plus de choix de serveurs où télécharger les substituts (@pxref{Invoking guix publish})." #. type: Plain text #: doc/guix.texi:3323 msgid "Guix has the foundations to maximize build reproducibility (@pxref{Features}). In most cases, independent builds of a given package or derivation should yield bit-identical results. Thus, through a diverse set of independent package builds, we can strengthen the integrity of our systems. The @command{guix challenge} command aims to help users assess substitute servers, and to assist developers in finding out about non-deterministic package builds (@pxref{Invoking guix challenge}). Similarly, the @option{--check} option of @command{guix build} allows users to check whether previously-installed substitutes are genuine by rebuilding them locally (@pxref{build-check, @command{guix build --check}})." -msgstr "Guix possède les fondations pour maximiser la reproductibilité logicielle (@pxref{Features}). Dans la plupart des cas, des constructions indépendantes d'un paquet donnée ou d'une dérivation devrait donner des résultats identiques au bit près. Ainsi, à travers un ensemble de constructions de paquets indépendantes il est possible de renforcer l'intégrité du système. La commande @command{guix challenge} a pour but d'aider les utilisateurs à tester les serveurs de substituts et à aider les développeurs à trouver les constructions de paquets non-déterministes (@pxref{Invoking guix challenge}). De même, l'option @option{--check} de @command{guix build} permet aux utilisateurs de vérifier si les substituts précédemment installés sont authentiques en les reconstruisant localement (@pxref{build-check, @command{guix build --check}})." +msgstr "Guix possède les fondations pour maximiser la reproductibilité logicielle (@pxref{Features}). Dans la plupart des cas, des constructions indépendantes d'un paquet donnée ou d'une dérivation devrait donner des résultats identiques au bit près. Ainsi, à travers un ensemble de constructions de paquets indépendantes il est possible de renforcer l'intégrité du système. La commande @command{guix challenge} a pour but d'aider les utilisateur·rice·s à tester les serveurs de substituts et à aider les développeur·euse·s à trouver les constructions de paquets non-déterministes (@pxref{Invoking guix challenge}). De même, l'option @option{--check} de @command{guix build} permet à chaque personne de vérifier si les substituts précédemment installés sont authentiques en les reconstruisant localement (@pxref{build-check, @command{guix build --check}})." #. type: Plain text #: doc/guix.texi:3327 msgid "In the future, we want Guix to have support to publish and retrieve binaries to/from other users, in a peer-to-peer fashion. If you would like to discuss this project, join us on @email{guix-devel@@gnu.org}." -msgstr "Dans le futur, nous aimerions que Guix puisse publier et recevoir des binaires d'autres utilisateurs, d'une manière pair-à-pair. Si vous voulez discuter de ce projet, rejoignez-nous sur @email{guix-devel@@gnu.org}." +msgstr "À l'avenir, nous aimerions que Guix puisse publier et recevoir des binaires d'autres personnes, de manière pair-à-pair. Si vous voulez discuter de ce projet, rejoignez-nous sur @email{guix-devel@@gnu.org}." #. type: cindex #: doc/guix.texi:3331 @@ -8268,7 +8280,7 @@ msgstr "Produire une sortie verbeuse, en écrivant les journaux de construction #. type: table #: doc/guix.texi:3733 msgid "Use the bootstrap Guile to build the latest Guix. This option is only useful to Guix developers." -msgstr "Utiliser le programme d'amorçage Guile pour construire la dernière version de Guix. Cette option n'est utile que pour les développeurs de Guix." +msgstr "Utiliser le programme d'amorçage Guile pour construire la dernière version de Guix. Cette option n'est utile qu'aux personnes qui développent Guix." #. type: Plain text #: doc/guix.texi:3739 @@ -8383,7 +8395,7 @@ msgstr "Avant de publier un canal, envisagez de contribuer vos définitions de p #. type: itemize #: doc/guix.texi:3817 msgid "When you maintain package definitions outside Guix, we, Guix developers, consider that @emph{the compatibility burden is on you}. Remember that package modules and package definitions are just Scheme code that uses various programming interfaces (APIs). We want to remain free to change these APIs to keep improving Guix, possibly in ways that break your channel. We never change APIs gratuitously, but we will @emph{not} commit to freezing APIs either." -msgstr "Lorsque vous maintenez des définitions de paquets en dehors de Guix, nous, les développeurs de Guix, considérons que @emph{la charge de la compatibilité vous incombe}. Rappelez-vous que les modules de paquets et les définitions de paquets ne sont que du code Scheme qui utilise diverses interfaces de programmation (API). Nous souhaitons rester libres de changer ces API pour continuer à améliorer Guix, éventuellement d'une manière qui casse votre canal. Nous ne changeons jamais l'API gratuitement, mais nous ne nous engageons @emph{pas} à geler les API non plus." +msgstr "Lorsque vous maintenez des définitions de paquets en dehors de Guix, nous, les développeur·euse·s de Guix, considérons que @emph{la charge de la compatibilité vous incombe}. Rappelez-vous que les modules de paquets et les définitions de paquets ne sont que du code Scheme qui utilise diverses interfaces de programmation (API). Nous souhaitons rester libres de changer ces API pour continuer à améliorer Guix, éventuellement d'une manière qui casse votre canal. Nous ne changeons jamais l'API gratuitement, mais nous ne nous engageons @emph{pas} à geler les API non plus." #. type: itemize #: doc/guix.texi:3821 @@ -10232,7 +10244,7 @@ msgstr "Un cas d'utilisation est l'archive binaire indépendante de Guix (@pxref #. type: table #: doc/guix.texi:4947 msgid "Use the bootstrap binaries to build the pack. This option is only useful to Guix developers." -msgstr "Utiliser les programmes d'amorçage pour construire le pack. Cette option n'est utile que pour les développeurs de Guix." +msgstr "Utiliser les programmes d'amorçage pour construire le pack. Cette option n'est utile que pour les personnes qui développent Guix." #. type: Plain text #: doc/guix.texi:4952 @@ -11959,7 +11971,7 @@ msgstr "Cette variable est exportée par @code{(guix build-system ruby)}. Elle #. type: defvr #: doc/guix.texi:6120 msgid "The @code{source} field of a package that uses this build system typically references a gem archive, since this is the format that Ruby developers use when releasing their software. The build system unpacks the gem archive, potentially patches the source, runs the test suite, repackages the gem, and installs it. Additionally, directories and tarballs may be referenced to allow building unreleased gems from Git or a traditional source release tarball." -msgstr "Le champ @code{source} d'un paquet qui utilise ce système de construction référence le plus souvent une archive gem, puisque c'est le format utilisé par les développeurs Ruby quand ils publient leur logiciel. Le système de construction décompresse l'archive gem, éventuellement en corrigeant les sources, lance la suite de tests, recompresse la gemme et l'installe. En plus, des répertoires et des archives peuvent être référencés pour permettre de construire des gemmes qui n'ont pas été publiées depuis Git ou une archive de sources traditionnelle." +msgstr "Le champ @code{source} d'un paquet qui utilise ce système de construction référence le plus souvent une archive gem, puisque c'est le format utilisé par les personnes qui développent en Ruby quand elles publient leur logiciel. Le système de construction décompresse l'archive gem, éventuellement en corrigeant les sources, lance la suite de tests, recompresse la gemme et l'installe. En plus, des répertoires et des archives peuvent être référencés pour permettre de construire des gemmes qui n'ont pas été publiées depuis Git ou une archive de sources traditionnelle." #. type: defvr #: doc/guix.texi:6124 @@ -14316,7 +14328,7 @@ msgstr "Accepte les connexions sur le socket Unix-domain @file{/tmp/socket}." #. type: Plain text #: doc/guix.texi:7590 msgid "This section describes Guix command-line utilities. Some of them are primarily targeted at developers and users who write new package definitions, while others are more generally useful. They complement the Scheme programming interface of Guix in a convenient way." -msgstr "Cette section décrit les utilitaires en ligne de commande de Guix. certains sont surtout faits pour les développeurs qui écrivent de nouvelles définitions de paquets tandis que d'autres sont plus utiles pour une utilisation générale. Ils complètent l'interface de programmation Scheme de Guix d'une manière pratique." +msgstr "Cette section décrit les utilitaires en ligne de commande de Guix. certains sont surtout faits pour les personnes qui écrivent de nouvelles définitions de paquets tandis que d'autres sont plus utiles pour une utilisation générale. Ils complètent l'interface de programmation Scheme de Guix d'une manière pratique." #. type: cindex #: doc/guix.texi:7612 @@ -14333,7 +14345,7 @@ msgstr "guix build" #. type: Plain text #: doc/guix.texi:7619 msgid "The @command{guix build} command builds packages or derivations and their dependencies, and prints the resulting store paths. Note that it does not modify the user's profile---this is the job of the @command{guix package} command (@pxref{Invoking guix package}). Thus, it is mainly useful for distribution developers." -msgstr "La commande @command{guix build} construit des paquets ou des dérivations et leurs dépendances et affiche les chemins du dépôt qui en résulte. Remarquez qu'elle ne modifie pas le profil de l'utilisateur — c'est le travail de la commande @command{guix package} (@pxref{Invoking guix package}). Ainsi, elle est surtout utile pour les développeurs de la distribution." +msgstr "La commande @command{guix build} construit des paquets ou des dérivations et leurs dépendances et affiche les chemins du dépôt qui en résulte. Remarquez qu'elle ne modifie pas le profil de l'utilisateur — c'est le travail de la commande @command{guix package} (@pxref{Invoking guix package}). Ainsi, elle est surtout utile pour les personnes qui développent la distribution." #. type: example #: doc/guix.texi:7624 @@ -15379,12 +15391,12 @@ msgstr "télécharger les sources des paquets" #. type: Plain text #: doc/guix.texi:8297 msgid "When writing a package definition, developers typically need to download a source tarball, compute its SHA256 hash, and write that hash in the package definition (@pxref{Defining Packages}). The @command{guix download} tool helps with this task: it downloads a file from the given URI, adds it to the store, and prints both its file name in the store and its SHA256 hash." -msgstr "En écrivant des définitions de paquets, les développeurs ont généralement besoin de télécharger une archive des sources, calculer son hash SHA256 et écrire ce hash dans la définition du paquet (@pxref{Defining Packages}). L'outil @command{guix download} aide à cette tâche : il télécharge un fichier à l'URL donné, l'ajoute au dépôt et affiche à la fois son nom dans le dépôt et son hash SHA56." +msgstr "Lorsqu'on écrit une définition de paquet, on a généralement besoin de télécharger une archive des sources, calculer son hash SHA256 et écrire ce hash dans la définition du paquet (@pxref{Defining Packages}). L'outil @command{guix download} aide à cette tâche : il télécharge un fichier à l'URL donné, l'ajoute au dépôt et affiche à la fois son nom dans le dépôt et son hash SHA56." #. type: Plain text #: doc/guix.texi:8304 msgid "The fact that the downloaded file is added to the store saves bandwidth: when the developer eventually tries to build the newly defined package with @command{guix build}, the source tarball will not have to be downloaded again because it is already in the store. It is also a convenient way to temporarily stash files, which may be deleted eventually (@pxref{Invoking guix gc})." -msgstr "Le fait que le fichier téléchargé soit ajouté au dépôt préserve la bande passante : lorsque les développeurs finissent par construire le paquet nouvellement défini avec @command{guix build}, l'archive des sources n'aura pas besoin d'être téléchargée de nouveau puisqu'elle se trouvera déjà dans le dépôt. C'est aussi une manière pratique de garder des fichiers temporairement, qui pourront ensuite être supprimés (@pxref{Invoking guix gc})." +msgstr "Le fait que le fichier téléchargé soit ajouté au dépôt économise la bande passante : quand on construit ensuite le paquet nouvellement défini avec @command{guix build}, l'archive des sources n'a pas besoin d'être à nouveau téléchargée puisqu'elle se trouve déjà dans le dépôt. C'est aussi une manière pratique de garder des fichiers temporairement, qui pourront ensuite être supprimés (@pxref{Invoking guix gc})." #. type: Plain text #: doc/guix.texi:8312 @@ -16175,7 +16187,7 @@ msgstr "guix refresh" #. type: Plain text #: doc/guix.texi:8807 msgid "The primary audience of the @command{guix refresh} command is developers of the GNU software distribution. By default, it reports any packages provided by the distribution that are outdated compared to the latest upstream version, like this:" -msgstr "L'audience première de la commande @command{guix refresh} est l'ensemble des développeurs de la distribution logicielle GNU. Par défaut, elle rapporte les paquets fournis par la distribution qui sont en retard par rapport aux dernières versions disponibles en amont, comme ceci :" +msgstr "La commande @command{guix refresh} s'adresse avant tout aux personnes qui développent la distribution logicielle GNU. Par défaut, elle rapporte les paquets fournis par la distribution qui sont en retard par rapport aux dernières versions disponibles en amont, comme ceci :" #. type: example #: doc/guix.texi:8812 @@ -16750,7 +16762,7 @@ msgstr "paquets, chercher des erreurs" #. type: Plain text #: doc/guix.texi:9120 msgid "The @command{guix lint} command is meant to help package developers avoid common errors and use a consistent style. It runs a number of checks on a given set of packages in order to find common mistakes in their definitions. Available @dfn{checkers} include (see @code{--list-checkers} for a complete list):" -msgstr "La commande @command{guix lint} est conçue pour aider les développeurs à éviter des erreurs commune et à utiliser un style cohérent lors de l'écriture de recettes de paquets. Elle lance des vérifications sur un ensemble de paquets donnés pour trouver des erreurs communes dans leur définition. Les @dfn{vérifieurs} disponibles comprennent (voir @code{--list-checkers} pour une liste complète) :" +msgstr "La commande @command{guix lint} est conçue pour aider les développeur·euse·s à éviter des erreurs communes et à utiliser un style cohérent lors de l'écriture de recettes de paquets. Elle lance des vérifications sur un ensemble de paquets donnés pour trouver des erreurs communes dans leur définition. Les @dfn{vérifieurs} disponibles comprennent (voir @code{--list-checkers} pour une liste complète) :" #. type: table #: doc/guix.texi:9126 @@ -16848,7 +16860,7 @@ msgstr "où @code{CVE-ANNÉE-ABCD} est l'identifiant CVE — p.@: ex.@: @code{CV #. type: table #: doc/guix.texi:9172 msgid "Package developers can specify in package recipes the @uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} name and version of the package when they differ from the name or version that Guix uses, as in this example:" -msgstr "Les développeurs de paquets peuvent spécifier dans les recettes des paquets le nom @uref{https://nvd.nist.gov/cpe.cfm,CPE (Common Platform Enumeration)} et la version du paquet s'ils diffèrent du nom et de la version que Guix utilise, comme dans cet exemple :" +msgstr "On peut spécifier dans les recettes des paquets le nom @uref{https://nvd.nist.gov/cpe.cfm,CPE (Common Platform Enumeration)} et la version du paquet s'ils diffèrent du nom et de la version que Guix utilise, comme dans cet exemple :" #. type: example #: doc/guix.texi:9180 @@ -16871,7 +16883,7 @@ msgstr "" #. type: table #: doc/guix.texi:9187 msgid "Some entries in the CVE database do not specify which version of a package they apply to, and would thus ``stick around'' forever. Package developers who found CVE alerts and verified they can be ignored can declare them as in this example:" -msgstr "Certaines entrées dans la base de données CVE ne spécifient pas la version du paquet auquel elles s'appliquent et lui restera donc attachée pour toujours. Les développeurs qui trouvent des alertes CVE et ont vérifiés qu'elles peuvent être ignorées peuvent les déclarer comme dans cet exemple :" +msgstr "Certaines entrées dans la base de données CVE ne spécifient pas la version du paquet auquel elles s'appliquent et lui restera donc attachée pour toujours. Les développeur·euse·s qui trouvent des alertes CVE et ont vérifié qu'elles peuvent être ignorées peuvent les déclarer comme dans cet exemple :" #. type: example #: doc/guix.texi:9197 @@ -16904,7 +16916,7 @@ msgstr "formatting" #. type: table #: doc/guix.texi:9202 msgid "Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc." -msgstr "Avertit le développeurs lorsqu'il y a des problèmes de formatage du code source évident : des espaces en fin de ligne, des tabulations, etc." +msgstr "Avertit de problèmes de formatage du code source évidents : des espaces en fin de ligne, des tabulations, etc." #. type: example #: doc/guix.texi:9208 @@ -16972,7 +16984,7 @@ msgstr "guix size" #. type: Plain text #: doc/guix.texi:9239 msgid "The @command{guix size} command helps package developers profile the disk usage of packages. It is easy to overlook the impact of an additional dependency added to a package, or the impact of using a single output for a package that could easily be split (@pxref{Packages with Multiple Outputs}). Such are the typical issues that @command{guix size} can highlight." -msgstr "La commande @command{guix size} aide les développeurs à dresser un profil de l'utilisation du disque que font les paquets. C'est facile de négliger l'impact d'une dépendance supplémentaire ajoutée à un paquet, ou l'impact de l'utilisation d'une sortie unique pour un paquet qui pourrait être facilement séparé (@pxref{Packages with Multiple Outputs}). Ce sont les problèmes que @command{guix size} peut typiquement mettre en valeur." +msgstr "La commande @command{guix size} aide à dresser un profil de l'utilisation de l'espace disque par les paquets. Il est facile de négliger l'impact d'une dépendance supplémentaire ajoutée à un paquet, ou l'impact de l'utilisation d'une sortie unique pour un paquet qui pourrait être facilement séparé (@pxref{Packages with Multiple Outputs}). Ce sont ces problèmes que @command{guix size} peut typiquement mettre en valeur." #. type: Plain text #: doc/guix.texi:9244 @@ -18371,7 +18383,7 @@ msgstr "Invoquer @command{guix processes}" #. type: Plain text #: doc/guix.texi:10146 msgid "The @command{guix processes} command can be useful to developers and system administrators, especially on multi-user machines and on build farms: it lists the current sessions (connections to the daemon), as well as information about the processes involved@footnote{Remote sessions, when @command{guix-daemon} is started with @option{--listen} specifying a TCP endpoint, are @emph{not} listed.}. Here's an example of the information it returns:" -msgstr "La commande @command{guix processes} peut être utile pour les développeurs et les administrateurs systèmes, surtout sur des machines multi-utilisateurs et sur les fermes de construction : elle liste les sessions actuelles (les connexions au démon), ainsi que des informations sur les processus en question@footnote{Les sessions distantes, lorsque @command{guix-daemon} est démarré avec @option{--listen} en spécifiant un point d'entrée TCP, ne sont @emph{pas} listées.}. Voici un exemple des informations qu'elle renvoie :" +msgstr "La commande @command{guix processes} peut être utile pour les développeur·euse·s ou les personnes qui administrent des systèmes, surtout sur des machines multi-utilisateur·rice et sur les fermes de construction : elle liste les sessions actuelles (les connexions au démon), ainsi que des informations sur les processus en question@footnote{Les sessions distantes, lorsque @command{guix-daemon} est démarré avec @option{--listen} en spécifiant un point d'entrée TCP, ne sont @emph{pas} listées.}. Voici un exemple des informations qu'elle renvoie :" #. type: example #: doc/guix.texi:10152 @@ -45882,7 +45894,7 @@ msgstr "types de services" #. type: Plain text #: doc/guix.texi:24876 msgid "Technically, developers can define @dfn{service types} to express these relations. There can be any number of services of a given type on the system---for instance, a system running two instances of the GNU secure shell server (lsh) has two instances of @code{lsh-service-type}, with different parameters." -msgstr "Techniquement, les développeurs peuvent définir des @dfn{types de services} pour exprimer ces relations. Il peut y avoir n'importe quel quantité de services d'un type donné sur le système — par exemple, un système sur lequel tournent deux instances du serveur ssh de GNU (lsh) a deux instance de @var{lsh-service-type}, avec des paramètres différents." +msgstr "Techniquement, on peut définir des @dfn{types de services} pour exprimer ces relations. Il peut y avoir n'importe quel quantité de services d'un type donné sur le système — par exemple, un système sur lequel tournent deux instances du serveur ssh de GNU (lsh) a deux instance de @var{lsh-service-type}, avec des paramètres différents." #. type: Plain text #: doc/guix.texi:24879 @@ -46965,7 +46977,7 @@ msgstr "mises à jour de sécurité" #. type: Plain text #: doc/guix.texi:25534 msgid "Occasionally, important security vulnerabilities are discovered in software packages and must be patched. Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch containing only security updates.) The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution:" -msgstr "Parfois, des vulnérabilités importantes sont découvertes dans les paquets logiciels et doivent être corrigées. Les développeurs de Guix essayent de suivre les vulnérabilités connues et d'appliquer des correctifs aussi vite que possible dans la branche @code{master} de Guix (nous n'avons pas encore de branche « stable » contenant seulement des mises à jour de sécurité). L'outil @command{guix lint} aide les développeurs à trouver les versions vulnérables des paquets logiciels dans la distribution :" +msgstr "Parfois, des vulnérabilités importantes sont découvertes dans les paquets logiciels et doivent être corrigées. Les développeur·euse·s de Guix essayent de suivre les vulnérabilités connues et d'appliquer des correctifs aussi vite que possible dans la branche @code{master} de Guix (nous n'avons pas encore de branche « stable » contenant seulement des mises à jour de sécurité). L'outil @command{guix lint} aide à trouver les versions vulnérables des paquets logiciels dans la distribution :" #. type: smallexample #: doc/guix.texi:25541 -- cgit v1.2.3 From aa0f683462fd66630c0731f09275e14c9dfe0118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Sep 2019 00:11:17 +0200 Subject: gnu: cedille: Adjust import list. This is a followup to dddbc90c648a569ed3f6dcf8678cb94e63a8302f. * gnu/packages/cedille.scm: Use (gnu packages haskell-xyz). --- gnu/packages/cedille.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm index 36fa3ae17e..caa3d864f8 100644 --- a/gnu/packages/cedille.scm +++ b/gnu/packages/cedille.scm @@ -21,6 +21,7 @@ #:use-module (gnu packages agda) #:use-module (gnu packages emacs-xyz) #:use-module (gnu packages haskell) + #:use-module (gnu packages haskell-xyz) #:use-module (guix build-system emacs) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) -- cgit v1.2.3 From f91c843449b9b91290dae43632aa78c6f5ec02ce Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Sep 2019 00:31:20 +0900 Subject: doc: Update the default list of files rotated by rottlog. * doc/guix.texi (Log Rotation): Add "/var/log/debug" and "/var/log/maillog" to the default value of %rotated-files. --- doc/guix.texi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 54c7ea739e..d46dbc8394 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12626,7 +12626,8 @@ a couple of other files. @defvr {Scheme Variable} %rotated-files The list of syslog-controlled files to be rotated. By default it is: -@code{'("/var/log/messages" "/var/log/secure")}. +@code{'("/var/log/messages" "/var/log/secure" "/var/log/debug" \ +"/var/log/maillog")}. @end defvr @node Networking Services -- cgit v1.2.3 From 1719f4f1e3aba3af60b5f7e63b8db529ef777af5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Sep 2019 06:05:43 +0900 Subject: doc: Specify the files rotated by default by the rottlog service. * doc/guix.texi (Log Rotation): Replace "a couple of other files" by "/var/log/guix-daemon.log". --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d46dbc8394..031ee53295 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12620,8 +12620,8 @@ Either @code{#f} or a gexp to execute once the rotation has completed. @end deftp @defvr {Scheme Variable} %default-rotations -Specifies weekly rotation of @var{%rotated-files} and -a couple of other files. +Specifies weekly rotation of @var{%rotated-files} and of +@file{/var/log/guix-daemon.log}. @end defvr @defvr {Scheme Variable} %rotated-files -- cgit v1.2.3 From 5db9d10dfd27a76475287126fe8a1b741489df4e Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 1 Sep 2019 12:15:54 +0300 Subject: gnu: emacs-gif-screencast: Fix gifsicle substitution. * gnu/packages/emacs-xyz.scm (emacs-gif-screencast)[arguments]: In the 'configure' phase, fix the gifsicle substitution. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6af5d43c27..4bfc09d0aa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13965,7 +13965,7 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.") ("gif-screencast-cropping-program" (string-append imagemagick "/bin/mogrify")) ("gif-screencast-optimize-program" - (string-append imagemagick "/bin/gifsicle"))))))))) + (string-append gifsicle "/bin/gifsicle"))))))))) (home-page "https://gitlab.com/Ambrevar/emacs-gif-screencast") (synopsis "One-frame-per-action GIF recording") -- cgit v1.2.3 From 8cb2f0ff2bce0cef922871d21b25779626c2eabf Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 1 Sep 2019 15:04:03 +0200 Subject: gnu: retroarch: Update hash. * gnu/packages/emulators.scm (retroarch): Update hash (due to bugfix release). --- gnu/packages/emulators.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 930878dc58..3b2b5430fd 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1059,7 +1059,7 @@ emulation community. It provides highly accurate emulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xxd9nhqiclpkdd9crymvba37fl0xs5mikwhya68nfzcgar7w480")))) + (base32 "0jwy5winrm87s6xa645fwa47x242r25m6i3rwf10x59448bd19r6")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 08e46d8d05d2d54c18f3879b1be75c5a122b98b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2019 02:58:24 +0200 Subject: gnu: hplip: Update to 3.19.8. * gnu/packages/cups.scm (hplip): Update to 3.19.8. [arguments]: Remove type mismatch fix. --- gnu/packages/cups.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 4ce13ae8f8..4be1eee156 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mark H Weaver -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -419,14 +419,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.18.9") + (version "3.19.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0g3q5mm2crjyc1z4z6gv4lam6sc5d3diz704djrnpqadk4q3h290")) + "0cmshi5dkmc1n5yiahhp0cv5p94zg61018piiqa2sna10ahgx1d3")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet @@ -439,10 +439,6 @@ should only be used as part of the Guix cups-pk-helper service.") (elf-file? file)))) (delete-file "prnt/hpcups/ImageProcessor.h") - ;; Fix type mismatch. - (substitute* "prnt/hpcups/genPCLm.cpp" - (("boolean") "bool")) - ;; Install binaries under libexec/hplip instead of ;; share/hplip; that'll at least ensure they get stripped. ;; It's not even clear that they're of any use though... -- cgit v1.2.3 From 5706fd79338d63d26333b2bd195a16eb2714cd70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2019 15:37:28 +0200 Subject: gnu: i3-wm: Update to 4.17.1. * gnu/packages/wm.scm (i3-wm): Update to 4.17.1. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c7d633455e..c62ccf4990 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -173,14 +173,14 @@ commands would.") (define-public i3-wm (package (name "i3-wm") - (version "4.17") + (version "4.17.1") (source (origin (method url-fetch) (uri (string-append "https://i3wm.org/downloads/i3-" version ".tar.bz2")) (sha256 (base32 - "1z8qmkkq9dhqmqy8sjw3rnpnmnb8v7lr456bs0qzp23bgpj17gjf")))) + "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 853232e60aedc62c6b62fd140781a361ce122a53 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2019 17:10:53 +0200 Subject: gnu: vhba-module: Update to 20190831. * gnu/packages/linux.scm (vhba-module): Update to 20190831. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e445b743f2..7794debaab 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -892,7 +892,7 @@ and should be used with caution, especially on untested models.") (define-public vhba-module (package (name "vhba-module") - (version "20190410") + (version "20190831") (source (origin (method url-fetch) (uri (string-append @@ -900,7 +900,7 @@ and should be used with caution, especially on untested models.") version ".tar.bz2")) (sha256 (base32 - "1513hq130raxp9z5grj54cwfjfxj05apipxg425j0zicii59a60c")))) + "1ybbk6l06n0y11n5wnfmvdz0baizmq55l458ywimghdyz0n7g0ws")))) (build-system linux-module-build-system) (arguments ;; TODO: No tests? -- cgit v1.2.3 From 0000b6dc742560b2fc192315bdf38132d7252644 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2019 18:23:23 +0200 Subject: gnu: libmirage: Update to 3.2.3. * gnu/packages/cdrom.scm (libmirage): Update to 3.2.3. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 8d9778176f..5b2260f281 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -884,7 +884,7 @@ CD data, and more. It's mostly compatible with @code{cdrtools}.") (define-public libmirage (package (name "libmirage") - (version "3.2.2") + (version "3.2.3") (source (origin (method url-fetch) (uri (string-append @@ -892,7 +892,7 @@ CD data, and more. It's mostly compatible with @code{cdrtools}.") version ".tar.bz2")) (sha256 (base32 - "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi")))) + "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 8232f053573180ef82aa4f0ce8a585a959864481 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2019 18:23:31 +0200 Subject: gnu: cdemu-daemon: Update to 3.2.3. * gnu/packages/cdrom.scm (cdemu-daemon): Update to 3.2.3. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 5b2260f281..cbebf25ea3 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -913,7 +913,7 @@ the data stored in various image formats.") (define-public cdemu-daemon (package (name "cdemu-daemon") - (version "3.2.2") + (version "3.2.3") (source (origin (method url-fetch) (uri (string-append @@ -921,7 +921,7 @@ the data stored in various image formats.") version ".tar.bz2")) (sha256 (base32 - "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b")))) + "022xzgwmncswb9md71w3ly3mjkdfc93lbij2llp2jamq8grxjjxr")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 5042f33e3bf226fd06159953f8fdfb27b95c5ee0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2019 18:23:36 +0200 Subject: gnu: cdemu-client: Update to 3.2.3. * gnu/packages/cdrom.scm (cdemu-client): Update to 3.2.3. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index cbebf25ea3..1f2c694246 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -942,7 +942,7 @@ drive and disc (including CD-ROMs and DVD-ROMs).") (define-public cdemu-client (package (name "cdemu-client") - (version "3.2.1") + (version "3.2.3") (source (origin (method url-fetch) (uri (string-append @@ -950,7 +950,7 @@ drive and disc (including CD-ROMs and DVD-ROMs).") version ".tar.bz2")) (sha256 (base32 - "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5")))) + "1bvc2m63fx03rbp3ihgl2n7k24lwg5ydwkmr84gsjfcxp46q10zq")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 5f39050b1eb74d371bd1ddabeb40d4339cc35158 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 2 Sep 2019 15:15:31 +0200 Subject: gnu: libxklavier: Update to 5.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libxklavier): Update to 5.4. [source] Switch to git source. [arguments] Add no-configure phase. Disable xmodmap in #:configure-flags. [inputs] Add which, intltool, gtk-doc, which, automake, autoconf and libtool. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a30fc8460c..efe5206e53 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2537,24 +2537,40 @@ and objects.") (define-public libxklavier (package (name "libxklavier") - (version "5.3") + (version "5.4") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - version "/" name "-" version ".tar.xz")) + ;; Note: There's no tarball at ftp.gnome.org for this version. + (method git-fetch) + (uri (git-reference + (url "https://anongit.freedesktop.org/git/libxklavier") + (commit (string-append "libxklavier-" version)))) (sha256 (base32 - "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b")))) + "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:configure-flags + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'no-configure + (lambda* _ + (setenv "NOCONFIGURE" "1") + #t))) + #:configure-flags (list (string-append "--with-xkb-base=" (assoc-ref %build-inputs "xkeyboard-config") - "/share/X11/xkb")))) + "/share/X11/xkb") + "--disable-xmodmap-support"))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("which" ,which) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (propagated-inputs ;; Required by libxklavier.pc. `(("glib" ,glib) -- cgit v1.2.3 From 37c08f42f7551203e98384c13ecfd33b57df40e6 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 1 Sep 2019 10:48:19 +0200 Subject: gnu: txr: Update to 224. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (txr): Update to 224. [source]: Use git-fetch instead of fetching a cgit snapshot. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 34edea41de..ab1c84262e 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -5337,17 +5337,18 @@ port within a range.") (define-public txr (package (name "txr") - (version "223") + (version "224") (source (origin - (method url-fetch) - (uri (string-append "http://www.kylheku.com/cgit/txr/snapshot/txr-" - version - ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "http://www.kylheku.com/git/txr/") + (commit (string-append "txr-" version)))) + (file-name (git-file-name name version)) (patches (search-patches "txr-shell.patch")) (sha256 (base32 - "0109q8idqggba3kx58dpm5ccfpdrki68npkcxm18p5ga24611fcv")))) + "1036k71f6mffy9rjwzmhr5nnp1n0wzb0rqvilpzvb8jc5yxv0810")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("cc=gcc") -- cgit v1.2.3 From 97ce5964fb5d52cf2151fea685e28fa23a98b264 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 1 Sep 2019 11:22:52 +0200 Subject: gnu: ironclad: Update to 0.46. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (sbcl-ironclad): Update to 0.46. [source]: Fix file-name. [inputs]: Add bordeaux-threads dependency. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index ab1c84262e..72587f2925 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -2175,7 +2175,7 @@ also be supported.") (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.42") + (version "0.46") (source (origin (method git-fetch) @@ -2184,14 +2184,15 @@ also be supported.") (commit (string-append "v" version)))) (sha256 (base32 - "1wjcb9vpybxjrmch7f7s78a5abxmnknbd4fl49dl5lz8a3fc8vf0")) - (file-name (string-append "ironblad" version "-checkout")))) + "1s391awi2lsl7m1dbjirgpkm4p9p8wd076pakgvsvpn1rrznisnd")) + (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs ;; Tests only. `(("rt" ,sbcl-rt))) (inputs - `(("flexi-streams" ,sbcl-flexi-streams) + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("flexi-streams" ,sbcl-flexi-streams) ("nibbles" ,sbcl-nibbles))) (synopsis "Cryptographic toolkit written in Common Lisp") (description -- cgit v1.2.3 From 8549e0ca6fd68a57253471436de49b88b2d47e64 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Sun, 18 Aug 2019 21:24:37 +0200 Subject: gnu: Update Xfce base to 4.14.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (libxfce4util): Update to 4.14.0. * gnu/packages/xfce.scm (xfconf): Update to 4.14.1. [native-inputs] Add glib:bin. [propagated-inputs] Remove dbus and dbus-glib. * gnu/packages/xfce.scm (libxfce4ui): Update to 4.14.1. * gnu/packages/xfce.scm (exo): Update to 0.12.8. [propagated-inputs] Add gtk+-3. Remove gtk+-2. [inputs] Add gtk+-2. * gnu/packages/xfce.scm (garcon): Update to 0.6.4. [inputs] Rename gtk+ to gtk+-2. [propagated-inputs] Add gtk+-3. * gnu/packages/xfce.scm (tumbler): Update to 0.2.7. * gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.14.0. [inputs] Updte gtk+ from gtk+-2 to gtk+. * gnu/packages/xfce.scm (xcfe4-panel): Update to 4.14.0 [arguments] Remove #:configure-flags [native-inputs] Add glib:bin. [inputs] Add gtk+-2, libwnck and xfconf. Remove libwnck-2. [propagated-inputs] Add gtk+-3. * gnu/packages/xfce.scm (xfce4-session): Update to 4.14.0. [inputs] Add libwnck. Remove libwnck-2. [source] Remove patch. * gnu/packages/patches/xfce4-session-fix-xfclock4.patch: Delete file. * gnu/packages/xfce.scm (xfce4-settings): Update to 4.14.0. [arguments] Add #:configure flags. * gnu/packages/xfce.scm (xfwm4): Update to 4.14.0. [inputs] Add libwnck. Remove libwnck-2. * gnu/packages/xfce.scm (xfdesktop): Update to 4.14.1. [inputs] Add libwnck. Remove libwnck-2. * gnu/packages/xfce.scm (xfce4-power-manager): Update to 4.6.5. [inputs] Add gtk+. Remove gtk+-2. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - .../patches/xfce4-session-fix-xflock4.patch | 31 ------ gnu/packages/xfce.scm | 107 +++++++++++---------- 3 files changed, 56 insertions(+), 83 deletions(-) delete mode 100644 gnu/packages/patches/xfce4-session-fix-xflock4.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2c02b8510a..dbae857c38 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1420,7 +1420,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ - %D%/packages/patches/xfce4-session-fix-xflock4.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ diff --git a/gnu/packages/patches/xfce4-session-fix-xflock4.patch b/gnu/packages/patches/xfce4-session-fix-xflock4.patch deleted file mode 100644 index 74769e4257..0000000000 --- a/gnu/packages/patches/xfce4-session-fix-xflock4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cbb9c769316b4d32956a2c78aa01a38b473f0cfc Mon Sep 17 00:00:00 2001 -From: David Thompson -Date: Fri, 30 Oct 2015 08:30:43 -0400 -Subject: [PATCH] xflock4: Do not override PATH with hardcoded value. - -The PATH "/bin:/usr/bin" may not be a valid search path on the user's -machine. The screen locking program may be in /usr/local/bin or -elsewhere. Distros that do not conform to the FHS, such as GuixSD and -NixOS, will not have their executables in either location. Thus, we -simply leave PATH alone. ---- - scripts/xflock4 | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/scripts/xflock4 b/scripts/xflock4 -index ec4d05d..e7981ac 100644 ---- a/scripts/xflock4 -+++ b/scripts/xflock4 -@@ -21,9 +21,6 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - # - --PATH=/bin:/usr/bin --export PATH -- - # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running - for lock_cmd in \ - "xscreensaver-command -lock" \ --- -2.5.0 - diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 93c36dac1e..60f1586f06 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages polkit) #:use-module (gnu packages gstreamer) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages photo) #:use-module (gnu packages pcre) @@ -86,7 +87,7 @@ (define-public libxfce4util (package (name "libxfce4util") - (version "4.12.1") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/xfce/" @@ -94,7 +95,7 @@ "/src/" name "-" version ".tar.bz2")) (sha256 (base32 - "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7")))) + "093338faqqsrlc8dkmzr7qv411ysxczg1wlg7s3gvhrfk6vpkb9j")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -110,7 +111,7 @@ Xfce Desktop Environment.") (define-public xfconf (package (name "xfconf") - (version "4.12.1") + (version "4.14.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -118,7 +119,7 @@ Xfce Desktop Environment.") name "-" version ".tar.bz2")) (sha256 (base32 - "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m")))) + "0n8d55c98ff7wgwv3qa4g369sv4iasgm1w62zq10kq5f56iy14xq")))) (build-system gnu-build-system) (arguments '(#:phases @@ -136,12 +137,12 @@ Xfce Desktop Environment.") (delete 'check)))) (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin") ;; for gdbus-codegen + )) (propagated-inputs ;; libxfconf-0.pc refers to all these. - `(("glib" ,glib) - ("dbus" ,dbus) - ("dbus-glib" ,dbus-glib))) + `(("glib" ,glib))) (inputs `(("libxfce4util" ,libxfce4util))) (home-page "https://www.xfce.org/") @@ -154,7 +155,7 @@ storage system.") (define-public libxfce4ui (package (name "libxfce4ui") - (version "4.12.1") + (version "4.14.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -162,7 +163,7 @@ storage system.") name "-" version ".tar.bz2")) (sha256 (base32 - "0hzzhiiwmqsrbv17nninhs2x1b8ck0ym85jck2xphx5ypw8rhq9x")))) + "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -188,7 +189,7 @@ to share commonly used Xfce widgets among the Xfce applications.") (define-public exo (package (name "exo") - (version "0.12.6") + (version "0.12.8") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -196,17 +197,19 @@ to share commonly used Xfce widgets among the Xfce applications.") "exo-" version ".tar.bz2")) (sha256 (base32 - "00qh8ihrf09jvd26kilybihkgvv6rvi0l1bvlldxc99jb7ygy5ql")))) + "1ppwi6n40aphh0dqsnfrk234zsp7pl4lkjnspqjxw7m49bka401l")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (propagated-inputs - ;; exo-1.pc refers to all these. - `(("gtk+" ,gtk+-2) + ;; exo-2.pc refers to all these. + `(("gtk+-3" ,gtk+) ("libxfce4util" ,libxfce4util))) (inputs - `(("libxfce4ui" ,libxfce4ui) + `(;; FIXME Refered to in exo-1.pc but conflict with gtk+-3 + ("gtk+-2" ,gtk+-2) + ("libxfce4ui" ,libxfce4ui) ("perl-uri" ,perl-uri))) (home-page "https://www.xfce.org/") (synopsis "Extension library for Xfce") @@ -220,7 +223,7 @@ development.") (define-public garcon (package (name "garcon") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -228,16 +231,17 @@ development.") "garcon-" version ".tar.bz2")) (sha256 (base32 - "00c4g4gmbr8710k0yv1zybnm9s2gkc1rj63zfrg9qgin66jzxcbn")))) + "0bbngb4bn1m325j7y40gky36kn2nlsvqs6xp0wy76x3s0d9lfpnp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) ("glib:bin" ,glib "bin"))) (inputs - `(("gtk+" ,gtk+-2))) + `(("gtk+-2" ,gtk+-2))); required by garcon-gtk2-1.pc (propagated-inputs - `(("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk2-1.pc + `(("gtk+-3" ,gtk+) ; required by garcon-gtk3-1.pc + ("libxfce4ui" ,libxfce4ui))) ; required by garcon-gtk3-1.pc (home-page "https://www.xfce.org/") (synopsis "Implementation of the freedesktop.org menu specification") (description @@ -250,7 +254,7 @@ merging features essential for loading menus modified with menu editors.") (define-public tumbler (package (name "tumbler") - (version "0.2.5") + (version "0.2.7") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -258,7 +262,7 @@ merging features essential for loading menus modified with menu editors.") "tumbler-" version ".tar.bz2")) (sha256 (base32 - "0nfld1lvrdpsjfvm08y5487km45pm1mdr928hgqm8j0shrx6jiv4")))) + "1r0l0ghcrj71ax7yil1m4p7yjrfqm3icx0s8r7ivwv3i2rgw617p")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -286,7 +290,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.12.2") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -294,20 +298,22 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2")) + "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--enable-gtk3"))) (native-inputs `(("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin"))) (propagated-inputs - `(("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-1.0.pc + `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.pc + ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc (inputs `(("exo" ,exo) + ("gtk+-2" ,gtk+-2) + ("xfconf" ,xfconf) ("garcon" ,garcon) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxfce4ui" ,libxfce4ui))) (native-search-paths (list (search-path-specification @@ -486,7 +492,7 @@ per window.") (define-public xfce4-appfinder (package (name "xfce4-appfinder") - (version "4.12.0") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/xfce/" @@ -494,14 +500,14 @@ per window.") "/src/" name "-" version ".tar.bz2")) (sha256 (base32 - "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a")))) + "162dibl6ipp72x0s35yhk7kkzxd4qimagg5zdkkv5kjgjpa7bhby")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("garcon" ,garcon) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("libxfce4ui" ,libxfce4ui))) (home-page "https://www.xfce.org/") (synopsis "Xfce application finder") @@ -513,7 +519,7 @@ your system in categories, so you can quickly find and launch them.") (define-public xfce4-session (package (name "xfce4-session") - (version "4.12.1") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -521,10 +527,7 @@ your system in categories, so you can quickly find and launch them.") name "-" version ".tar.bz2")) (sha256 (base32 - "1z88klls3j161n5snpamz4l3p4823q4h87wdnqikczxgs2ig5mwp")) - (patches - ;; See: https://bugzilla.xfce.org/show_bug.cgi?id=12282 - (search-patches "xfce4-session-fix-xflock4.patch")) + "0gq4a8yiw58hb4d5dhvprxvzamqfg8qblmiqcw0b97mn9svnvyql")) (modules '((guix build utils))) (snippet '(begin @@ -549,7 +552,7 @@ your system in categories, so you can quickly find and launch them.") ("upower" ,upower) ("polkit" ,polkit) ("libsm" ,libsm) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxfce4ui" ,libxfce4ui))) (home-page "https://www.xfce.org/") (synopsis "Xfce session manager") @@ -561,7 +564,7 @@ allows you to shutdown the computer from Xfce.") (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.12.4") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/xfce/" @@ -569,9 +572,13 @@ allows you to shutdown the computer from Xfce.") name "-" version ".tar.bz2")) (sha256 (base32 - "16vgidhhc19dz0p0i6fp5iiwxd53ky143j6h14a9b7mz92nlr872")) + "0g0ipkg2fyg8r1z95ynx0xjr78bp49c2dwh4mli05nmb4gb40c70")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-pluggable-dialogs" + "--enable-sound-settings" + "--enable-xrandr"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -659,7 +666,7 @@ and import the new pictures from your camera.") (define-public xfwm4 (package (name "xfwm4") - (version "4.12.5") + (version "4.14.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -667,14 +674,14 @@ and import the new pictures from your camera.") name "-" version ".tar.bz2")) (sha256 (base32 - "1jnav0wcqlswl2v7nh61big9czg5hmnyvrvm6812sv362qic0xbp")))) + "05dn4a1i0nm6wm3nyj7qli5bvfalxghcl7x543qr5l33vkw2n65l")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("libdrm" ,libdrm) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxcomposite" ,libxcomposite) ("libxdamage" ,libxdamage) ("libxfce4ui" ,libxfce4ui) @@ -689,7 +696,7 @@ on the screen.") (define-public xfdesktop (package (name "xfdesktop") - (version "4.12.4") + (version "4.14.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -697,7 +704,7 @@ on the screen.") name "-" version ".tar.bz2")) (sha256 (base32 - "1jzi851arljq5lza9inyq4ss513l62lbzbfm64a7x4320m8kb2h9")) + "10pqxgpj7b57wpcsh2k98sj4aavcgxbs1lc8qsq4mibf4hba01gp")) (modules '((guix build utils))) (snippet #~(begin @@ -735,7 +742,7 @@ on the screen.") `(("exo" ,exo) ("garcon" ,garcon) ("libnotify" ,libnotify) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libxfce4ui" ,libxfce4ui) ("thunar" ,thunar))) (home-page "https://www.xfce.org/") @@ -831,7 +838,7 @@ system resources, while still being visually appealing and user friendly.") (define-public xfce4-power-manager (package (name "xfce4-power-manager") - (version "1.6.1") + (version "1.6.5") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -839,16 +846,14 @@ system resources, while still being visually appealing and user friendly.") name "-" version ".tar.bz2")) (sha256 (base32 - "0sv5927q8jxvdfx7b06f8s7qyq3qa1nqn0b8c1b9bf234d2jba0y")))) + "0x3s2bdwfhp65dz5yn3k43j99ywqlsvrpz3pqmgwm0dik5wbdb8h")))) (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--enable-gtk3"))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs - `(("lbxrandr" ,libxrandr) - ("gtk+" ,gtk+-2) + `(("libxrandr" ,libxrandr) + ("gtk+" ,gtk+) ("upower" ,upower) ("libnotify" ,libnotify) ("libxfce4ui" ,libxfce4ui))) -- cgit v1.2.3 From 998754ef49c483f82edf64b09b268d008fef044e Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 14:41:22 +0200 Subject: gnu: xfce4-terminal: Update to 0.8.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-terminal): Update to 0.8.8. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 60f1586f06..fcbdbe26c9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -756,7 +756,7 @@ devices and folders.") (define-public xfce4-terminal (package (name "xfce4-terminal") - (version "0.8.7.4") + (version "0.8.8") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" name "/" @@ -764,7 +764,7 @@ devices and folders.") name "-" version ".tar.bz2")) (sha256 (base32 - "1as2dh5ccmv3hdvsbxm4b0xhmv2ky2q18zxxrzr988x79npri3x8")))) + "1zc7hkq77ajia099wxgh4wdvwifcg2zkcz5d2xsf1zm0sdh6mflg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 279608653b3c383b57e45ce39ccf2ddb6736b9d0 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 14:45:47 +0200 Subject: gnu: xfce4-whiskermenu-plugin: Update to 2.3.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-whiskermenu-plugin): Update to 2.3.3. [inputs] Add gtk+. Remove gtk+-2. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index fcbdbe26c9..91fec5f2f1 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -421,7 +421,7 @@ keys for controlling the audio volume.") (define-public xfce4-whiskermenu-plugin (package (name "xfce4-whiskermenu-plugin") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/panel-plugins/" @@ -429,7 +429,7 @@ keys for controlling the audio volume.") name "-" version ".tar.bz2")) (sha256 (base32 - "1cnas2x7xi53v6ylq44040narhzd828dc0ysz8yk3qn2mmvp5yr2")))) + "0j0qmk372130avq8n07lfqrcm2al7n07l8gc06bbr1g6q57wrip0")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -438,7 +438,8 @@ keys for controlling the audio volume.") `(("xfce4-panel" ,xfce4-panel) ("garcon" ,garcon) ("exo" ,exo) - ("gtk+" ,gtk+-2))) + ("gtk+" ,gtk+) + ("libxfce4ui" ,libxfce4ui))) (arguments `(#:tests? #f)) ; no tests (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-whiskermenu-plugin") -- cgit v1.2.3 From d4902f9a84e9495d1c603a5556787f0ec381b87f Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 14:50:46 +0200 Subject: gnu: xfce4-battery-plugin: Update to 1.1.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.3. Switch from gtk+-2 to gtk+-3. [inputs] Add gtk+. Remove gtk+2. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 91fec5f2f1..cad3f7583b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -330,7 +330,7 @@ applications menu, workspace switcher and more.") (define-public xfce4-battery-plugin (package (name "xfce4-battery-plugin") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -338,12 +338,12 @@ applications menu, workspace switcher and more.") name "-" version ".tar.bz2")) (sha256 (base32 - "1nypi0zazrcrbbm5vb221yw64zxrk56v4fffkblxlyd9m6gk80fn")))) + "18s0s004nidii8cc3ldp5n3jajc18vwn9vhkhmhy3lbbs520mghj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs `(("glib" ,glib) - ("gtk+" ,gtk+-2) + ("gtk+" ,gtk+) ("libxfce4util" ,libxfce4util) ("libxfce4ui" ,libxfce4ui) ("xfce4-panel" ,xfce4-panel))) -- cgit v1.2.3 From 8c6cfdd766beb2b4cdbb2bb2ff209e33b5d76c19 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 15:51:42 +0200 Subject: gnu: xfce4-pulseaudio-plugin: Update to 0.4.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-pulseaudio-plugin): Update to 0.4.2. [arguments] Add augment-cflags phase. [native-inputs] Add dbus and dbus-glib. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index cad3f7583b..1256578b1b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -390,7 +390,7 @@ matching them against regular expressions.") (define-public xfce4-pulseaudio-plugin (package (name "xfce4-pulseaudio-plugin") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -398,11 +398,26 @@ matching them against regular expressions.") name "-" version ".tar.bz2")) (sha256 (base32 - "1w29y0a066y8as12xrkbfqcn7dpdsvx97idzw7028gmcvca87a3c")))) + "0851b0vs5xmy3cq899khcghmkqwvh9rnzwavi17msrsq4jyaxs2a")))) (build-system gnu-build-system) + (arguments + `(#:phases + ;; For dbus/dbus-glib.h in pulseaudio-config.h + (modify-phases %standard-phases + (add-after 'set-paths 'augment-cflags + (lambda* (#:key inputs #:allow-other-keys) + (setenv "C_INCLUDE_PATH" + (string-append (assoc-ref inputs "dbus-glib") + "/include/dbus-1.0" ":" + (assoc-ref inputs "dbus") + "/include/dbus-1.0" ":" + (getenv "C_INCLUDE_PATH"))) + #t))))) (native-inputs `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("dbus-glib" ,dbus-glib) + ("dbus" ,dbus))) (inputs `(("exo" ,exo) ("libnotify" ,libnotify) -- cgit v1.2.3 From 3802d759dac5afd00bb378a128051f55a8363c53 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 16:37:58 +0200 Subject: gnu: xfce4-xkb-plugin: Update to 0.8.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-xkb-plugin): Update to 0.8.1. [inputs] Add libwnck. Remove libwnck-2. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 1256578b1b..dcdcc3089f 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -470,7 +470,7 @@ applications, and includes a search bar to search for applications.") (define-public xfce4-xkb-plugin (package (name "xfce4-xkb-plugin") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "http://archive.xfce.org/src/panel-plugins/" @@ -478,7 +478,7 @@ applications, and includes a search bar to search for applications.") name "-" version ".tar.bz2")) (sha256 (base32 - "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1")))) + "18b7cnaf3zxm598p2i47vim3kbbi8w923ia1hwabdph1c89cz7n1")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -486,7 +486,7 @@ applications, and includes a search bar to search for applications.") (inputs `(("garcon" ,garcon) ("librsvg" ,librsvg) - ("libwnck" ,libwnck-2) + ("libwnck" ,libwnck) ("libx11" ,libx11) ("libxfce4ui" ,libxfce4ui) ("libxklavier" ,libxklavier) -- cgit v1.2.3 From f47f9720cc4de9a4178a19949d321f45265cd862 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 16:59:57 +0200 Subject: gnu: xfce4-notifyd: Update to 0.4.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-notifyd): Update to 0.4.4. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index dcdcc3089f..3243ef2377 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -982,7 +982,7 @@ several different time zones.") (define-public xfce4-notifyd (package (name "xfce4-notifyd") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -990,7 +990,7 @@ several different time zones.") name "-" version ".tar.bz2")) (sha256 (base32 - "1h7avj149cafj9dabiza22y14i66vxgp5qj0wxx8i97w9h4dlg99")))) + "0m8vlbwdxiw9nmimaj5np9l5qm784gxpkdvc881k0hjcz6n72189")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 867df63f90a21a7585b35f44b95d49c0a6f07e7d Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 19 Aug 2019 16:42:12 +0200 Subject: gnu: xfce4-taskmanager: Switch from libwnck-2 to libwnck. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-taskmanager)[inputs]: Switch from libwnck-2 to libwnck. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3243ef2377..6d2155fc53 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -934,7 +934,7 @@ the desktop wallpaper.") `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("libwnck" ,libwnck-2) + `(("libwnck" ,libwnck) ("libxmu" ,libxmu) ("gtk+" ,gtk+) ;; FIXME: Remove libxext and libxt when libxmu propagates them. -- cgit v1.2.3 From 83f9448eb1207e66d31ff42b4995115995a94eff Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 16 Aug 2019 07:20:28 -0700 Subject: gnu: Add stylish-haskell. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps (stylish-haskell): new variable. Signed-off-by: Ludovic Courtès --- gnu/packages/haskell-apps.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 28502eb87f..77199af2cb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -513,3 +513,38 @@ that cause a shell to behave strangely and counter-intuitively. advanced user's otherwise working script to fail under future circumstances. @end enumerate") (license license:gpl3+))) + +(define-public stylish-haskell + (package + (name "stylish-haskell") + (version "0.9.2.2") + (source + (origin + (method url-fetch) + (uri + (string-append + "mirror://hackage/package/stylish-haskell/" + "stylish-haskell-" version ".tar.gz")) + (sha256 + (base32 + "1zs624xqp6j8vrl6pfv18dm8vz8hvz25grri65ximxhcizgwhnax")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-file-embed" ,ghc-file-embed) + ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-syb" ,ghc-syb) + ("ghc-yaml" ,ghc-yaml) + ("ghc-strict" ,ghc-strict) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-hunit" ,ghc-hunit) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/jaspervdj/stylish-haskell") + (synopsis "Haskell code prettifier") + (description + "A simple Haskell code prettifier. The goal is not to format all of the +code in a file, just clean up import statements and a few other tedious +items. This tool tries to help where necessary without getting in the way.") + (license license:bsd-3))) -- cgit v1.2.3 From 8a71a01c216c936108dd9f5694ffda991d48c9ea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Sep 2019 22:05:49 +0200 Subject: gnu: yoshimi: Update to 1.6.0. * gnu/packages/music.scm (yoshimi): Update to 1.6.0. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d4aaecc1e2..07ec7c9d80 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2099,7 +2099,7 @@ capabilities, custom envelopes, effects, etc.") (define-public yoshimi (package (name "yoshimi") - (version "1.5.10.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -2107,7 +2107,7 @@ capabilities, custom envelopes, effects, etc.") "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "1rr99qkq80s8l2iv3x4ccxan07m15dvmd5s9b10386bfjbwbya01")))) + "0bcc5spnq73yp1fmm367d1mxcswqkmzs3cnpb4cxr513ir98sa50")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From 6fd7e0cc6f4601f3add30e78cae007b909bd6b0c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Sep 2019 22:10:46 +0200 Subject: gnu: drumstick: Update to 1.1.3. * gnu/packages/music.scm (drumstick): Update to 1.1.3. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 07ec7c9d80..53c37bea87 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2007,14 +2007,14 @@ browser.") (define-public drumstick (package (name "drumstick") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/drumstick/" version "/drumstick-" version ".tar.bz2")) (sha256 (base32 - "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp")))) + "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From 14b9203d01f7ca35e13908e8cc45175205391795 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 1 Sep 2019 22:30:07 +0200 Subject: gnu: Add vmpk. * gnu/packages/music.scm (vmpk): New variable. --- gnu/packages/music.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 53c37bea87..a43bccf4f8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2050,6 +2050,52 @@ multiplatform realtime MIDI I/O library is also provided with various output backends, including ALSA, OSS, Network and FluidSynth.") (license license:gpl2+))) +(define-public vmpk + (package + (name "vmpk") + (version "0.7.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/vmpk/vmpk/" + version "/vmpk-" version ".tar.bz2")) + (sha256 + (base32 + "1i3hnvdgz46n4k5v0q4jhgh7nkh0s390ix4nqr69z0q3026yp0p6")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no test target + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cmake_admin/CreateManpages.cmake" + (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + #t))))) + (inputs + `(("drumstick" ,drumstick) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qttools" ,qttools) + ("qtx11extras" ,qtx11extras))) + (native-inputs + `(("libxslt" ,libxslt) ;for xsltproc + ("docbook-xsl" ,docbook-xsl) + ("pkg-config" ,pkg-config))) + (home-page "http://vmpk.sourceforge.net") + (synopsis "Virtual MIDI piano keyboard") + (description + "Virtual MIDI Piano Keyboard is a MIDI events generator and receiver. It +doesn't produce any sound by itself, but can be used to drive a MIDI +synthesizer (either hardware or software, internal or external). You can use +the computer's keyboard to play MIDI notes, and also the mouse. You can use +the Virtual MIDI Piano Keyboard to display the played MIDI notes from another +instrument or MIDI file player.") + (license license:gpl3+))) + (define-public zynaddsubfx (package (name "zynaddsubfx") -- cgit v1.2.3 From 5f97cc2316a4fbd4ec89314f8f640c26a20199ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2019 20:26:38 +0200 Subject: gnu: libostree: Update to 2019.3. * gnu/packages/package-management.scm (libostree): Update to 2019.3. --- gnu/packages/package-management.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ff3e0d3209..100c148fda 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -966,7 +966,7 @@ for packaging and deployment of cross-compiled Windows applications.") (define-public libostree (package (name "libostree") - (version "2018.9.1") + (version "2019.3") (source (origin (method url-fetch) (uri (string-append @@ -974,7 +974,7 @@ for packaging and deployment of cross-compiled Windows applications.") (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 (base32 - "01mygpkbl9sk2vr3hjbpih6qlg8lwx0q5lklm09f7jfwfpnwyqzj")))) + "1r07yqbc9iiq0lzv1pryppd35fv695ym8r040msbfc93pmiy77y0")))) (build-system gnu-build-system) (arguments '(#:phases @@ -986,13 +986,14 @@ for packaging and deployment of cross-compiled Windows applications.") (setenv "TEST_TMPDIR" (getenv "TMPDIR")) #t))) ;; XXX: fails with: + ;; tap-driver.sh: missing test plan ;; tap-driver.sh: internal error getting exit status ;; tap-driver.sh: fatal: I/O or internal error #:tests? #f)) (native-inputs `(("attr" ,attr) ; for tests ("bison" ,bison) - ("glib:bin" ,glib "bin") ; for 'glib-mkenums' + ("glib:bin" ,glib "bin") ; for 'glib-mkenums' ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) -- cgit v1.2.3 From b439d9b290d38d4ce89be9931e1c17d5fce93815 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Sep 2019 02:55:32 +0200 Subject: gnu: acpica: Update to 20190816. * gnu/packages/admin.scm (acpica): Update to 20190816. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index eb298dca3b..3e75b73dcb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1500,7 +1500,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20190703") + (version "20190816") (source (origin (method url-fetch) (uri (string-append @@ -1508,7 +1508,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "0kp3ian3lffx9709ajrr3bp6b9cb6c6v1crjziyr8j8pp639jlwz")))) + "0lipy3jwl498lvgwzj6xcvmg61myl7hhilpallh1cf3ppgrq13l8")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 48d11a5f8b4b256a676490479b8cbbd76248c198 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 2 Sep 2019 08:16:53 +0200 Subject: gnu: faudio: Update to 19.09. * gnu/packages/audio.scm (faudio): Update to 19.09. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index af2951fcd5..d3fd8c8245 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3701,7 +3701,7 @@ library.") (define-public faudio (package (name "faudio") - (version "19.08") + (version "19.09") (source (origin (method git-fetch) @@ -3710,7 +3710,7 @@ library.") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "1v13kfhyr46241vb6a4dcb4gw5f149525sprwa9cj4rv6wlcqgm5")))) + (base32 "0fagik55jmy3qmb27nhg0zxash1ahfkxphx8m8gs0pimqqrdrd9d")))) (arguments '(#:tests? #f ; No tests. #:configure-flags '("-DFFMPEG=ON"))) -- cgit v1.2.3 From 9460884422466fc63e98d8dea6eccd8176187999 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 2 Sep 2019 00:11:44 +0200 Subject: gnu: emacs-lsp-mode: Update to 6.1. * gnu/packages/emacs-xyz.scm (emacs-lsp-mode): Update to 6.1. [inputs]: Add emacs-markdown-mode. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4bfc09d0aa..0c6077770b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16102,7 +16102,7 @@ the standard @code{Dockerfile} file format.") (define-public emacs-lsp-mode (package (name "emacs-lsp-mode") - (version "6.0") + (version "6.1") (source (origin (method git-fetch) (uri (git-reference @@ -16111,12 +16111,13 @@ the standard @code{Dockerfile} file format.") (file-name (git-file-name name version)) (sha256 (base32 - "1v1mq6ixzlgiazj8fmg4xaqhsqn3l89iqy74yndhvzh2rdf0pbkl")))) + "0jn5slhv9zfs446a5966bfg9dq144g22v79wnkx9hxq7if78p652")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-ht" ,emacs-ht) + ("emacs-markdown-mode" ,emacs-markdown-mode) ("emacs-spinner" ,emacs-spinner))) (home-page "https://github.com/emacs-lsp/lsp-mode") (synopsis "Emacs client and library for the Language Server Protocol") -- cgit v1.2.3 From f7a8571b378c1fbb509681afd5dc5dc8315e11b4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Sep 2019 09:56:11 +0300 Subject: gnu: vim-fugitive: Update to 3.0. * gnu/packages/vim.scm (vim-fugitive): Update to 3.0. [arguments]: Install syntax directory. --- gnu/packages/vim.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 1eede0b22a..8ebdbb9a35 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -483,7 +483,7 @@ trouble using them, because you do not have to remember each snippet name.") (define-public vim-fugitive (package (name "vim-fugitive") - (version "2.5") + (version "3.0") (source (origin (method git-fetch) @@ -493,7 +493,7 @@ trouble using them, because you do not have to remember each snippet name.") (file-name (git-file-name name version)) (sha256 (base32 - "17yz7gxn7a49jzndr4z5vnk1y4a6c22qss3mwxzmq4m46fni0k8q")))) + "0ghh8a9xysc3njqql1khhl2dkhymz93snpwqp2apm7pka6l893bc")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -506,13 +506,15 @@ trouble using them, because you do not have to remember each snippet name.") (let* ((out (assoc-ref outputs "out")) (vimfiles (string-append out "/share/vim/vimfiles")) (autoload (string-append vimfiles "/autoload")) - (doc (string-append vimfiles "/doc")) + (doc (string-append vimfiles "/doc")) (ftdetect (string-append vimfiles "/ftdetect")) - (plugin (string-append vimfiles "/plugin"))) + (plugin (string-append vimfiles "/plugin")) + (syntax (string-append vimfiles "/syntax"))) (copy-recursively "autoload" autoload) (copy-recursively "doc" doc) (copy-recursively "ftdetect" ftdetect) (copy-recursively "plugin" plugin) + (copy-recursively "syntax" syntax) #t)))))) (home-page "https://github.com/tpope/vim-fugitive") (synopsis "Vim plugin to work with Git") -- cgit v1.2.3 From 2f43e5db1c36ec93a80ed1e3cbe763a8d64adcb5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Sep 2019 11:07:53 +0300 Subject: build/cargo-build-system: Use invoke. * guix/build/cargo-build-system.scm (crate-src?, build, check, install): Use 'invoke'. --- guix/build/cargo-build-system.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 06ed14b89f..f173b64c83 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -81,10 +81,10 @@ Cargo.toml file present at its root." ;; archive, but not nested anywhere else). We do this by cutting up ;; each output line and only looking at the second component. We then ;; check if it matches Cargo.toml exactly and short circuit if it does. - (zero? (apply system* (list "sh" "-c" - (string-append "tar -tf " path - " | cut -d/ -f2" - " | grep -q '^Cargo.toml$'")))))) + (apply invoke (list "sh" "-c" + (string-append "tar -tf " path + " | cut -d/ -f2" + " | grep -q '^Cargo.toml$'"))))) (define* (configure #:key inputs (vendor-dir "guix-vendor") @@ -157,7 +157,7 @@ directory = '" port) #:allow-other-keys) "Build a given Cargo package." (or skip-build? - (zero? (apply system* `("cargo" "build" ,@cargo-build-flags))))) + (apply invoke `("cargo" "build" ,@cargo-build-flags)))) (define* (check #:key tests? @@ -165,7 +165,7 @@ directory = '" port) #:allow-other-keys) "Run tests for a given Cargo package." (if tests? - (zero? (apply system* `("cargo" "test" ,@cargo-test-flags))) + (apply invoke `("cargo" "test" ,@cargo-test-flags)) #t)) (define (touch file-name) @@ -184,7 +184,7 @@ directory = '" port) ;; otherwise cargo will raise an error. (or skip-build? (not (has-executable-target?)) - (zero? (system* "cargo" "install" "--path" "." "--root" out))))) + (invoke "cargo" "install" "--path" "." "--root" out)))) (define %standard-phases (modify-phases gnu:%standard-phases -- cgit v1.2.3 From 8324e64cd585ab9a0841c944e1f865859ae33f72 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:31:41 +0200 Subject: gnu: Add r-ensdb-hsapiens-v75. * gnu/packages/bioconductor.scm (r-ensdb-hsapiens-v75): New variable. --- gnu/packages/bioconductor.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 89aea8d9c0..a416dbc764 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -532,6 +532,28 @@ annotations for the genome of the model mouse Mus musculus.") by UCSC (hg19, February 2009) and stored in Biostrings objects.") (license license:artistic2.0))) +(define-public r-ensdb-hsapiens-v75 + (package + (name "r-ensdb-hsapiens-v75") + (version "2.99.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "EnsDb.Hsapiens.v75" version 'annotation)) + (sha256 + (base32 + "0jx6rf6v0j8yr07q3c1h7s121901dc400nm6xaiv4i7kb5czjn9c")))) + (properties + `((upstream-name . "EnsDb.Hsapiens.v75"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ensembldb" ,r-ensembldb))) + (home-page "https://bioconductor.org/packages/EnsDb.Hsapiens.v75") + (synopsis "Ensembl based annotation package") + (description + "This package exposes an annotation database generated from Ensembl.") + (license license:artistic2.0))) + (define-public r-genelendatabase (package (name "r-genelendatabase") -- cgit v1.2.3 From d9a382ece3b0c9f9dc9b6f9714b2cf89a60b54b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:31:50 +0200 Subject: gnu: r-sys: Update to 3.3. * gnu/packages/cran.scm (r-sys): Update to 3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6ba7c295cf..6df3adc2f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -166,14 +166,14 @@ objects.") (define-public r-sys (package (name "r-sys") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (cran-uri "sys" version)) (sha256 (base32 - "1k5vk5q9wa5sin0n226i05nymg469s24f6lx64yyhb7yc624j698")))) + "14wvy46i2iz9jn7lj3cvifmps932s3395wq681hniva0f8m7q8d6")))) (build-system r-build-system) (home-page "https://github.com/jeroen/sys") (synopsis "Powerful and reliable tools for running system commands in R") -- cgit v1.2.3 From 0ce4b23d68ad7f0d7da8fcf87b40a2614682e493 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:31:55 +0200 Subject: gnu: r-vegan: Update to 2.5-6. * gnu/packages/cran.scm (r-vegan): Update to 2.5-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6df3adc2f2..df6c6790dc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -212,14 +212,14 @@ read a protected key.") (define-public r-vegan (package (name "r-vegan") - (version "2.5-5") + (version "2.5-6") (source (origin (method url-fetch) (uri (cran-uri "vegan" version)) (sha256 (base32 - "0wb90ng02gi13854bjq0b8a2vrknyhb0s0l1v3z38c4zy9k54sw7")))) + "0g60rgn1i7wqf9pf5m1yki1m45gcp7i5hmjic0ci0f6vng70mh5k")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 52aacfbda2374dc232063263cb58615365317fd5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:00 +0200 Subject: gnu: r-d3r: Update to 0.8.7. * gnu/packages/cran.scm (r-d3r): Update to 0.8.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index df6c6790dc..febac04858 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -872,14 +872,14 @@ well as file saving is available.") (define-public r-d3r (package (name "r-d3r") - (version "0.8.6") + (version "0.8.7") (source (origin (method url-fetch) (uri (cran-uri "d3r" version)) (sha256 (base32 - "0vcmiyhd000xyl28k6rm7ba50x5sz5b2cpllxnq36q13qhdnqw6k")))) + "0xl3im76lp7pd5lhp8jfyqdm4j4zvjrx5a5fl81xv2cf7x3n4f2a")))) (build-system r-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 6d879bb62bb271fb90012c4498ceec7c61ee4c6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:04 +0200 Subject: gnu: r-rgooglemaps: Update to 1.4.4. * gnu/packages/cran.scm (r-rgooglemaps): Update to 1.4.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index febac04858..b488fcba0f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1122,14 +1122,14 @@ coordinates.") (define-public r-rgooglemaps (package (name "r-rgooglemaps") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) (uri (cran-uri "RgoogleMaps" version)) (sha256 (base32 - "06ab3lg1rwm93hkshf1vxfm8mlxq5qsjan0wx43lhnrysay65js4")))) + "0sbklacc4jl5524ixhc11mh6smrzdz4l9pji6cn402i6zdn9z05x")))) (properties `((upstream-name . "RgoogleMaps"))) (build-system r-build-system) (propagated-inputs `(("r-png" ,r-png))) -- cgit v1.2.3 From ef93de84ea185f873fe74a62e3547334f7cc98ac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:09 +0200 Subject: gnu: r-pkgbuild: Update to 1.0.5. * gnu/packages/cran.scm (r-pkgbuild): Update to 1.0.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b488fcba0f..e3f737e356 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1441,14 +1441,14 @@ processes. Most of its code is based on the @code{psutil} Python package.") (define-public r-pkgbuild (package (name "r-pkgbuild") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "pkgbuild" version)) (sha256 (base32 - "0prvx91dha5pvd0k4jca2arkngvi6vnfs2indmiy3kwwzyjyyd19")))) + "0y4i85axwajrk67h3w6fiqfm6wxmhn3dr240w5l2nvqg3ahpxc8q")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) -- cgit v1.2.3 From 403e01e21e486e7a0bad5ae4966275685ad07118 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:13 +0200 Subject: gnu: r-circlize: Update to 0.4.7. * gnu/packages/cran.scm (r-circlize): Update to 0.4.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e3f737e356..a9e104704b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1649,14 +1649,14 @@ validation and filtering on the values, making options invisible or private.") (define-public r-circlize (package (name "r-circlize") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "circlize" version)) (sha256 (base32 - "1yjnb88pnzk5c1p0vjxykc7cr3394ln5axviqcf12ajibvy8rj6f")))) + "07y1bchkslpz2wl43yg5j5h1nl9z0i425a07jdmfd5avrynd8p3m")))) (build-system r-build-system) (propagated-inputs `(("r-colorspace" ,r-colorspace) -- cgit v1.2.3 From b4cf01ecc846e9e183eb58839875108b230de585 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:17 +0200 Subject: gnu: r-geometry: Update to 0.4.3. * gnu/packages/cran.scm (r-geometry): Update to 0.4.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a9e104704b..58578ec45f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2663,14 +2663,14 @@ Optimization problems by using the simplex algorithm.") (define-public r-geometry (package (name "r-geometry") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) (uri (cran-uri "geometry" version)) (sha256 (base32 - "0vq334115qi039vy198ggv1dsp6n1s6jwcm9ivipf5r8lbm287zz")))) + "0z4491mhfmrlbb8lazjvq55alrprx7k0abg2d39fj0lsj84cls1r")))) (build-system r-build-system) (propagated-inputs `(("r-magic" ,r-magic) -- cgit v1.2.3 From fa859675cc1a0ac64d4b07a657fc5462564edd66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:22 +0200 Subject: gnu: r-dtw: Update to 1.21-3. * gnu/packages/cran.scm (r-dtw): Update to 1.21-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 58578ec45f..751ecd40c5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3476,14 +3476,14 @@ of Eigenmatrices} (JADE).") (define-public r-dtw (package (name "r-dtw") - (version "1.20-1") + (version "1.21-3") (source (origin (method url-fetch) (uri (cran-uri "dtw" version)) (sha256 (base32 - "1w301xwizncy5r8v9rwwdxfshydgp3l1pnjla1fjn6n8lx3imjj3")))) + "02hyhx1sy5h3vzh9zixy18a7d47df4k5d0wyflcvlcbsbcl6p90s")))) (build-system r-build-system) (propagated-inputs `(("r-proxy" ,r-proxy))) (home-page "http://dtw.r-forge.r-project.org/") -- cgit v1.2.3 From bd8710b4131f45dead162a91f43c35744586fb23 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:27 +0200 Subject: gnu: r-seriation: Update to 1.2-8. * gnu/packages/cran.scm (r-seriation): Update to 1.2-8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 751ecd40c5..227da25cb0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3765,14 +3765,14 @@ Markdown documents.") (define-public r-seriation (package (name "r-seriation") - (version "1.2-7") + (version "1.2-8") (source (origin (method url-fetch) (uri (cran-uri "seriation" version)) (sha256 (base32 - "0dbz5b5msy4fr2whhphyriqk1xc6305zpjq59rrwxyz3d7rzwpa6")))) + "1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk")))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster) -- cgit v1.2.3 From 9ba8494c26fe9fee1334f28e4829c841d01917ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:32 +0200 Subject: gnu: r-xfun: Update to 0.9. * gnu/packages/cran.scm (r-xfun): Update to 0.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 227da25cb0..249596cadf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3799,14 +3799,14 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 (base32 - "05jlbi5byqpw0fkhmmxqglnaxh9gwbcigx77kcpw1pkxnpwfry62")))) + "1c3wmy6s4ck821mwl7i2g8cxd31g30llbpivbgq21g1rxs4zwlyl")))) (build-system r-build-system) (home-page "https://github.com/yihui/xfun") (synopsis "Miscellaneous functions") -- cgit v1.2.3 From a71460135c0ea91ff46f8e2f70d80b4942207141 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:36 +0200 Subject: gnu: r-radiant-data: Update to 1.0.6. * gnu/packages/cran.scm (r-radiant-data): Update to 1.0.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 249596cadf..d75bb1cf34 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4699,14 +4699,14 @@ systems.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "1.0.0") + (version "1.0.6") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "0b35jn4mcj10hqra18l8pi6s4pvj6fxipslbn6hkr4zza1z27gzw")) + "08x7zasxf429m021482p86lx3zc6dqz2mih0id8s34isg4gafapg")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2586cfd3d709747c8ccd700d1dc67e6c6069410e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:40 +0200 Subject: gnu: r-arules: Update to 1.6-4. * gnu/packages/cran.scm (r-arules): Update to 1.6-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d75bb1cf34..35444111bc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5064,14 +5064,14 @@ evaluated by the @dfn{Akaike Information Criterion} (AIC).") (define-public r-arules (package (name "r-arules") - (version "1.6-3") + (version "1.6-4") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "0dimrq1pz449z0mz9m87nhm5bpc0v789bcc3lghhh97wwi5zah9y")))) + "003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 59fd6915c8cfba660a88167fb627754b0a0f1728 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:44 +0200 Subject: gnu: r-zip: Update to 2.0.4. * gnu/packages/cran.scm (r-zip): Update to 2.0.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 35444111bc..d837716e39 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5161,14 +5161,14 @@ misclassification probabilities of different models.") (define-public r-zip (package (name "r-zip") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "zip" version)) (sha256 (base32 - "0zii05jg9v9ljd0wd67g9x4bhlmpmsy5dzd093sbnc5n3vjbi32a")))) + "1c02amk3pl6xir5jnbfiwiv2wvpkpbkkb1w71y6lf2yk7g3d0pdb")))) (build-system r-build-system) (home-page "https://github.com/gaborcsardi/zip") (synopsis "Cross-platform Zip compression") -- cgit v1.2.3 From 761f4764f9934434e1da67eb62743aca4f8bb6b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:48 +0200 Subject: gnu: r-raster: Update to 3.0-2. * gnu/packages/cran.scm (r-raster): Update to 3.0-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d837716e39..01232c9bbc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6921,14 +6921,14 @@ used to teach mathematics, statistics, computation and modeling.") (define-public r-raster (package (name "r-raster") - (version "2.9-23") + (version "3.0-2") (source (origin (method url-fetch) (uri (cran-uri "raster" version)) (sha256 (base32 - "1brqigic8ygr223bp2hgk5qjz3q03r4sfglrv4an0ghy7fgfralh")))) + "0z4qh3ag1iyly4zjvzi3x2namkndkqn3cjb3ac22xd11sq5gdgiz")))) (build-system r-build-system) (propagated-inputs `(("r-rcpp" ,r-rcpp) -- cgit v1.2.3 From 9c2d9780411325e74ad2ea82996780b5e3da13af Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:54 +0200 Subject: gnu: r-magick: Update to 2.2. * gnu/packages/cran.scm (r-magick): Update to 2.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 01232c9bbc..b528599f5e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7489,14 +7489,14 @@ multiple-imputation datasets.") (define-public r-magick (package (name "r-magick") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "1pz71maz05gx4ds1wfw0alggc8nn2w75lj12dg1zr72s3kybhkzg")))) + "1xh5mhaks3wk1iwqs9d3lnbfv121lc1yz5fqdzk5il9ppr831l85")))) (build-system r-build-system) (inputs `(("imagemagick" ,imagemagick) -- cgit v1.2.3 From a13f81dde7a33666ecb4d1d27e7be7e5ada3e0ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:32:58 +0200 Subject: gnu: r-libcoin: Update to 1.0-5. * gnu/packages/cran.scm (r-libcoin): Update to 1.0-5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b528599f5e..a87454def1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7927,14 +7927,14 @@ Cohen (1988).") (define-public r-libcoin (package (name "r-libcoin") - (version "1.0-4") + (version "1.0-5") (source (origin (method url-fetch) (uri (cran-uri "libcoin" version)) (sha256 (base32 - "1i893ij9vkmc4y721npw1s3prmmcs2da5vf3ajm0j8ccmfhbmp4i")))) + "1cm9x1dlg9f7fh7n5nw3x4a7rl88c7ylrlc8x3rx4mq5w1j42x0a")))) (build-system r-build-system) (propagated-inputs `(("r-mvtnorm" ,r-mvtnorm))) (home-page "https://cran.r-project.org/web/packages/libcoin") -- cgit v1.2.3 From 1656a4259be423fb55df4646dd90ab617aec9f95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:02 +0200 Subject: gnu: r-coin: Update to 1.3-1. * gnu/packages/cran.scm (r-coin): Update to 1.3-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a87454def1..37775fb6d2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7947,14 +7947,14 @@ and permutation inference in the framework of Strasser and Weber (1999).") (define-public r-coin (package (name "r-coin") - (version "1.3-0") + (version "1.3-1") (source (origin (method url-fetch) (uri (cran-uri "coin" version)) (sha256 (base32 - "1y0yl4mjaxca0jqz53sv1gcpdg89m099rq61iszxvpx7w0vvpkmd")))) + "0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx")))) (build-system r-build-system) (propagated-inputs `(("r-libcoin" ,r-libcoin) -- cgit v1.2.3 From 084ea3481b5a4522d20a88587759e918ac9eea40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:07 +0200 Subject: gnu: r-summarytools: Update to 0.9.4. * gnu/packages/cran.scm (r-summarytools): Update to 0.9.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 37775fb6d2..547607abee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8518,14 +8518,14 @@ ways.") (define-public r-summarytools (package (name "r-summarytools") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (cran-uri "summarytools" version)) (sha256 (base32 - "1wfbkgvicaic37zgpr6zcm4a58yx43p59h0sqggdj44ncqs7147f")))) + "1n695baz56mg4f13xjjadfq0xalw5xsn6xicil0yap5hgi8fsr3a")))) (build-system r-build-system) (propagated-inputs `(("r-checkmate" ,r-checkmate) -- cgit v1.2.3 From 0eb284350e23581e0bea10fc60a6b0f5fed1426a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:11 +0200 Subject: gnu: r-afex: Update to 0.25-1. * gnu/packages/cran.scm (r-afex): Update to 0.25-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 547607abee..05106fbb47 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8696,14 +8696,14 @@ analysing multivariate abundance data in community ecology.") (define-public r-afex (package (name "r-afex") - (version "0.24-1") + (version "0.25-1") (source (origin (method url-fetch) (uri (cran-uri "afex" version)) (sha256 (base32 - "14w7kcwr5hxmjcjmdm5ia9ka3bw1nl18pxlm1vpw62nmvicn3455")))) + "12n020y7rjm7402940gkqxa5j901p093f381i23p66fa3fyrshkf")))) (build-system r-build-system) (propagated-inputs `(("r-car" ,r-car) -- cgit v1.2.3 From 4f1c668d318db448381834c726a8795f24b8b04b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:15 +0200 Subject: gnu: r-rgl: Update to 0.100.30. * gnu/packages/cran.scm (r-rgl): Update to 0.100.30. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 05106fbb47..2ef87bc61c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8930,14 +8930,14 @@ Bioconductor packages.") (define-public r-rgl (package (name "r-rgl") - (version "0.100.26") + (version "0.100.30") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "0h77akviwjd86j2qyx326xynbmwhypd6ydprzlwqnidd4ckrr271")))) + "0rzqzskcwf2ah4yr62x5rjwf7yh90d43h39gk7jmfc5lc08zaxc5")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 6c81cc885df2fdcf51a6814c1a2cf4a4d4a16605 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:19 +0200 Subject: gnu: r-fields: Update to 9.8-6. * gnu/packages/cran.scm (r-fields): Update to 9.8-6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2ef87bc61c..ef8a796824 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10749,14 +10749,14 @@ Differences with other sparse matrix packages are: (define-public r-fields (package (name "r-fields") - (version "9.8-3") + (version "9.8-6") (source (origin (method url-fetch) (uri (cran-uri "fields" version)) (sha256 (base32 - "1q9x68dczjym56v7x90x4x5br59vj3dww6w8v42zd3yl17h7c1h1")))) + "07x95vk1idjfzi5ikn0ijal754mssdmgr1p4nswmx9w3i5ndcqaz")))) (build-system r-build-system) (propagated-inputs `(("r-maps" ,r-maps) -- cgit v1.2.3 From e31eb738f707daf07ab424ca29cfc6ca770a6e44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:27 +0200 Subject: gnu: r-ggextra: Update to 0.9. * gnu/packages/cran.scm (r-ggextra): Update to 0.9. [propagated-inputs]: Add r-r6. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ef8a796824..ee86c9a9cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11786,14 +11786,14 @@ select colors to use in your R code.") (define-public r-ggextra (package (name "r-ggextra") - (version "0.8") + (version "0.9") (source (origin (method url-fetch) (uri (cran-uri "ggExtra" version)) (sha256 (base32 - "1m5zpn3l3p1y3d2692gyz50m63d58m2a3b7zb595kvcffdx2qr5b")))) + "18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj")))) (properties `((upstream-name . "ggExtra"))) (build-system r-build-system) (propagated-inputs @@ -11801,6 +11801,7 @@ select colors to use in your R code.") ("r-ggplot2" ,r-ggplot2) ("r-gtable" ,r-gtable) ("r-miniui" ,r-miniui) + ("r-r6" ,r-r6) ("r-scales" ,r-scales) ("r-shiny" ,r-shiny) ("r-shinyjs" ,r-shinyjs))) -- cgit v1.2.3 From 553742fa9812e1c683153f7b98077e8d24a2d83b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:44 +0200 Subject: gnu: r-lavaan: Update to 0.6-5. * gnu/packages/cran.scm (r-lavaan): Update to 0.6-5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ee86c9a9cc..fb188a4005 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11901,14 +11901,14 @@ probabilities from a standard bivariate normal CDF.") (define-public r-lavaan (package (name "r-lavaan") - (version "0.6-4") + (version "0.6-5") (source (origin (method url-fetch) (uri (cran-uri "lavaan" version)) (sha256 (base32 - "1zf0sxpms35rhq2syb7r3sshhc8kjvc3pv97dk9x0gf4xl7pck4g")))) + "04kvsh2m6mnzlhv83phr3hjzy4sx1ck6f7dgsm7xb8cs84dnxszy")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit v1.2.3 From 530404083a2d98103cc7278df96a1eeecbe21779 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:50 +0200 Subject: gnu: r-apcluster: Update to 1.4.8. * gnu/packages/cran.scm (r-apcluster): Update to 1.4.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb188a4005..a615df06dd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12190,14 +12190,14 @@ network.") (define-public r-apcluster (package (name "r-apcluster") - (version "1.4.7") + (version "1.4.8") (source (origin (method url-fetch) (uri (cran-uri "apcluster" version)) (sha256 (base32 - "188hdfmwjjx3aic599nwmkzjqm9j9jighi5bly6qd43c1vj6ih2s")))) + "0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) -- cgit v1.2.3 From 5feaa77591fa9099276518e87d6f34a3e057b533 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:33:57 +0200 Subject: gnu: r-wgaim: Update to 2.0-0. * gnu/packages/cran.scm (r-wgaim): Update to 2.0-0. [propagated-inputs]: Remove r-lattice; add r-ggplot2. --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a615df06dd..d01a9414f9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12348,17 +12348,17 @@ extensions.") (define-public r-wgaim (package (name "r-wgaim") - (version "1.4-11") + (version "2.0-0") (source (origin (method url-fetch) (uri (cran-uri "wgaim" version)) (sha256 (base32 - "1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg")))) + "0wnb10vibgq8h1ly6lq8kzymf30vx0j0g8fc2zidblbvwag9ka1g")))) (build-system r-build-system) (propagated-inputs - `(("r-lattice" ,r-lattice) + `(("r-ggplot2" ,r-ggplot2) ("r-qtl" ,r-qtl))) (home-page "https://cran.r-project.org/web/packages/wgaim") (synopsis "Whole genome average interval mapping for QTL detection") -- cgit v1.2.3 From dfe4c8c405fef80f371c0cfabfc0cb634c141245 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:34:13 +0200 Subject: gnu: r-units: Update to 0.6-4. * gnu/packages/cran.scm (r-units): Update to 0.6-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d01a9414f9..a567c45964 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12567,14 +12567,14 @@ utilities for sequence data management under the ACNUC system.") (define-public r-units (package (name "r-units") - (version "0.6-3") + (version "0.6-4") (source (origin (method url-fetch) (uri (cran-uri "units" version)) (sha256 (base32 - "0kx640h60s3zzkdr302asap7diap6vri6d41scnx507yvkcqiph3")))) + "1jz0mzd78sdfxkhqw041ji50hmhjk2ha55i31yjvz35nsw30lwi5")))) (build-system r-build-system) (inputs `(("udunits" ,udunits))) -- cgit v1.2.3 From 87b4381584f6dbfe1382b6ee71da16b3c1e70d7d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:34:17 +0200 Subject: gnu: r-tdthap: Update to 1.1-11. * gnu/packages/cran.scm (r-tdthap): Update to 1.1-11. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a567c45964..111979e8a6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13122,14 +13122,14 @@ exact test for Hardy-Weinberg equilibrium.") (define-public r-tdthap (package (name "r-tdthap") - (version "1.1-9") + (version "1.1-11") (source (origin (method url-fetch) (uri (cran-uri "tdthap" version)) (sha256 (base32 - "0y01x0hcf0rw06cpn4pk17b0shf4v2c9was7vfs0zhsbq8qcwx7r")))) + "15qlj2bivvz3pizd8dq34wczbkbxhzqh3cqp1ixkdkprlyvcxj5k")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/tdthap/") (synopsis "TDT tests for extended haplotypes") -- cgit v1.2.3 From e768b33936afb651321bb15b8faa335b81e83acc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:34:21 +0200 Subject: gnu: r-bookdown: Update to 0.13. * gnu/packages/cran.scm (r-bookdown): Update to 0.13. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 111979e8a6..021133b64f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13165,13 +13165,13 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "1c2v0rpa1rrpbx8yb66sfvrf4gf57f6a8x7ydjqqbkbwhxdlrsrq")))) + "15r9scgnq68hmfcfxvjk286hpbr825bib1d2kgh0lv3dgz2i2bg1")))) (build-system r-build-system) (propagated-inputs `(("r-htmltools" ,r-htmltools) -- cgit v1.2.3 From 466e68b4b2c306d4ae1941eef4a7313343dd1e7b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:34:24 +0200 Subject: gnu: r-ggforce: Update to 0.3.1. * gnu/packages/cran.scm (r-ggforce): Update to 0.3.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 021133b64f..68abdf8ab5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13765,14 +13765,14 @@ sets of URLs.") (define-public r-ggforce (package (name "r-ggforce") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "ggforce" version)) (sha256 (base32 - "118qyzy8h9kkkdpjd09667gxgw7xy1kbc8r87pswh54ixn8hymwk")))) + "04926cqrda6psvy2nzkkw4czwyxdp7fnxg76byp14v12kgd72lm0")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From d64ac92f6c6871351e130eeb23cf3663922d4bd3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:34:28 +0200 Subject: gnu: r-dalex: Update to 0.4.7. * gnu/packages/cran.scm (r-dalex): Update to 0.4.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 68abdf8ab5..21030c5088 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14617,14 +14617,14 @@ engine (Salmon et al., 2011) as provided by the package @code{sitmo}.") (define-public r-dalex (package (name "r-dalex") - (version "0.4.4") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "04i17ni8g595jj8dxdfwr9vsxmdn2kkam90ab68vlwws3ywqjl6r")))) + "0iiwkf0pfdb90lf1xhv43qd32z3cjmkmf0ly9841n5lldkjazy3h")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2))) -- cgit v1.2.3 From 7a90573fd0db555fcdf0d687cee60cddc46c6fba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:34:32 +0200 Subject: gnu: r-enrichr: Update to 2.1. * gnu/packages/cran.scm (r-enrichr): Update to 2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 21030c5088..77eb0c3230 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14643,14 +14643,14 @@ and model output.") (define-public r-enrichr (package (name "r-enrichr") - (version "2.0") + (version "2.1") (source (origin (method url-fetch) (uri (cran-uri "enrichR" version)) (sha256 (base32 - "056m6hksfss29fj7zvlk7pbh8g3gq84kjh3240isrsnhp9m1h9iz")))) + "0ymhzs9d2wl0s9rvbqc1hqb78mlzwhlc7mmijpfqkm5r720pf6m1")))) (properties `((upstream-name . "enrichR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8bcd6c953a7b3a1cb59189810a314794f7cc3bdf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:34:38 +0200 Subject: gnu: r-umap: Update to 0.2.3.1. * gnu/packages/cran.scm (r-umap): Update to 0.2.3.1. [propagated-inputs]: Add r-openssl. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 77eb0c3230..3470ad5c7d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14813,17 +14813,18 @@ easily.") (define-public r-umap (package (name "r-umap") - (version "0.2.2.0") + (version "0.2.3.1") (source (origin (method url-fetch) (uri (cran-uri "umap" version)) (sha256 (base32 - "1s82w9gy1387h7cprjfbhp49l89zbmn3gc9s0wzqb1s73nza9n31")))) + "0rzz1s029cn1w1bf5va2pav2lg9j1mq97ibwcln39drvm67kj76d")))) (build-system r-build-system) (propagated-inputs - `(("r-rcpp" ,r-rcpp) + `(("r-openssl" ,r-openssl) + ("r-rcpp" ,r-rcpp) ("r-reticulate" ,r-reticulate) ("r-rspectra" ,r-rspectra))) (home-page "https://github.com/tkonopka/umap") -- cgit v1.2.3 From 8e28535d0b0f92c04d50309c5d4a1189dc017a22 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:01 +0200 Subject: gnu: Add r-leiden. * gnu/packages/cran.scm (r-leiden): New variable. --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3470ad5c7d..f3566f28d2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14995,6 +14995,32 @@ radius searches and @code{bd} as well as @code{kd} trees. The distance is computed using the L1 (Manhattan, taxicab) metric.") (license license:gpl3+))) +(define-public r-leiden + (package + (name "r-leiden") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "leiden" version)) + (sha256 + (base32 + "19gq27zin4gf4sh7h24gyq3f8jjir20n2l36a7pk1pbzcr4ixyhp")))) + (properties `((upstream-name . "leiden"))) + (build-system r-build-system) + (propagated-inputs + `(("r-igraph" ,r-igraph) + ("r-matrix" ,r-matrix) + ("r-reticulate" ,r-reticulate))) + (home-page "https://github.com/TomKellyGenetics/leiden") + (synopsis "R implementation of Leiden clustering algorithm") + (description + "This package implements the Python @code{leidenalg} module to be called +in R. It enables clustering using the Leiden algorithm for partitioning a +graph into communities. See also Traag et al (2018) \"From Louvain to Leiden: +guaranteeing well-connected communities.\" .") + (license license:gpl3))) + (define-public r-patchwork ;; There has been no public release yet. (let ((commit "fd7958bae3e7a1e30237c751952e412a0a1d1242") -- cgit v1.2.3 From 560f7c949a850dfb2bdac4f2f3187e8c5f59d9fe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:06 +0200 Subject: gnu: r-chron: Update to 2.3-54. * gnu/packages/statistics.scm (r-chron): Update to 2.3-54. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4e2f6b7937..db103792bc 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1828,13 +1828,13 @@ and density estimation.") (define-public r-chron (package (name "r-chron") - (version "2.3-53") + (version "2.3-54") (source (origin (method url-fetch) (uri (cran-uri "chron" version)) (sha256 (base32 - "02bkywwsxwrxc035hv51dxgdm1fjxdm7dn19ivifln59dfs1862j")))) + "0vc7dxqwx0jqzwszax6di3091npsxnhnbvr7sy7rlip0jqzarwqd")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/chron") (synopsis "Chronological R objects which can handle dates and times") -- cgit v1.2.3 From b21620bb47bae46a325fe9261ea37964beecf3f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:12 +0200 Subject: gnu: r-whisker: Update to 0.4. * gnu/packages/statistics.scm (r-whisker): Update to 0.4. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index db103792bc..8ea4fc0e9b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2097,13 +2097,13 @@ previous R versions and their release dates.") (define-public r-whisker (package (name "r-whisker") - (version "0.3-2") + (version "0.4") (source (origin (method url-fetch) (uri (cran-uri "whisker" version)) (sha256 (base32 - "0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28")))) + "1a7vz0dk95xfjvi38wbpw8vmf5qn3g8p490msz2rw0piwidmk1ks")))) (build-system r-build-system) (home-page "https://github.com/edwindj/whisker") (synopsis "Logicless mustache templating for R") -- cgit v1.2.3 From a1a7afc06ce62257f15ca6515ac3663094253fcd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:21 +0200 Subject: gnu: r-hms: Update to 0.5.1. * gnu/packages/statistics.scm (r-hms): Update to 0.5.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8ea4fc0e9b..8f6534ffcd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2490,14 +2490,14 @@ were originally a part of the r-devtools package.") (define-public r-hms (package (name "r-hms") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "hms" version)) (sha256 (base32 - "06snfqdczr0x0nbp7qnvwhlp2pw0wx9c2y3xb4gr1wrvbik74y58")))) + "1v4cxfpvp85la4gqla6b4q2bwx4jv1fxqwndcnjsibbnybz6wcvd")))) (build-system r-build-system) (propagated-inputs `(("r-rlang" ,r-rlang) -- cgit v1.2.3 From 21890aad50acc65bc29c3310036d1b1d273c0250 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:31 +0200 Subject: gnu: r-rmarkdown: Update to 1.15. * gnu/packages/statistics.scm (r-rmarkdown): Update to 1.15. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8f6534ffcd..bc770e8afd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2696,14 +2696,14 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 (base32 - "0qfw5rkvwqpgix32g6qy9xrr50awmm146aqbm836xravih2b2dpn")))) + "0fkfzxkvakc6bb1s2lx7sxmnfff8q1m9isihynhiyqh4x8yikcmw")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From df0f876ee418dc6544e27b66d232353e476841a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:36 +0200 Subject: gnu: r-pbapply: Update to 1.4-2. * gnu/packages/statistics.scm (r-pbapply): Update to 1.4-2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index bc770e8afd..143df3e63e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5028,14 +5028,14 @@ VGLMs can be loosely thought of as multivariate generalised linear models.") (define-public r-pbapply (package (name "r-pbapply") - (version "1.4-1") + (version "1.4-2") (source (origin (method url-fetch) (uri (cran-uri "pbapply" version)) (sha256 (base32 - "1bbws9n90cqnnp5k58hp852jwmm6513jnhn4vzhl9f8x314k6qxk")))) + "1xmk4p006v8gij26rs6kp5prjyf2n32nqjxiyp8a6kvgyc4z46dc")))) (build-system r-build-system) (home-page "https://github.com/psolymos/pbapply") (synopsis "Adding progress bar to apply functions") -- cgit v1.2.3 From aea33b475b043a24ba1c2d9adbd64119cc142745 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:44 +0200 Subject: gnu: r-iranges: Update to 2.18.2. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.18.2. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 779a972520..02b2cd17e5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7378,13 +7378,13 @@ S4Vectors package itself.") (define-public r-iranges (package (name "r-iranges") - (version "2.18.1") + (version "2.18.2") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "1d64sh43pfc9vj2l7y7x6sb44l67wlnn3dzygp7ws0smn06mardq")))) + "0dc35844c1mfj07hvy6yn4wag6qdggbgl9gjcg3wpkh9hkm60a5n")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From e5bc6fce19f848ff8a983a008c35f6d6dc1cd01e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:48 +0200 Subject: gnu: r-annotationdbi: Update to 1.46.1. * gnu/packages/bioinformatics.scm (r-annotationdbi): Update to 1.46.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 02b2cd17e5..e6a6d082a1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7631,13 +7631,13 @@ on Bioconductor or which replace R functions.") (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.46.0") + (version "1.46.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "0lfq5668a6sq4kqhxx78hl3jcaqdsaaliiybl9xyya2scdk8c29c")))) + "13nanz4nzy0mcda8ljz2g8d81hpqfz6jky7ydz5hpk0g2264b9ga")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) -- cgit v1.2.3 From 2c7a32c2acfee352784ba56f8c70f6f38665330d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:54 +0200 Subject: gnu: r-biomart: Update to 2.40.4. * gnu/packages/bioinformatics.scm (r-biomart): Update to 2.40.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e6a6d082a1..02234519d6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7658,13 +7658,13 @@ annotation data packages using SQLite data storage.") (define-public r-biomart (package (name "r-biomart") - (version "2.40.3") + (version "2.40.4") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "022m1r44s00c5k9bmv0lr22lcn662nhc91aazvv0yyysxjamyf60")))) + "0dj51qkxm7bh24b3bs1di7lic6zgi7g5gf9iqkqhrwkbm7sqvn0v")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) -- cgit v1.2.3 From 91addfe05c14b6ee10890dfba43847a8a607819a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:38:57 +0200 Subject: gnu: r-rtracklayer: Update to 1.44.3. * gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.44.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 02234519d6..7d6d5e8c48 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7883,13 +7883,13 @@ alignments.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.44.2") + (version "1.44.3") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "03b4rfsbzjjf5kxcsjv7kq8hrsgcvz9rfzcn2v7fx3nr818pbb8s")))) + "091zydz1zpz519ha0jkbvzrhxjvw5r2963qz9grmvl2jd8girvcg")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From 32fcd898f0e73b34dd8f11af952b87707e461f7a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:39:11 +0200 Subject: gnu: r-seurat: Update to 3.1.0. * gnu/packages/bioinformatics.scm (r-seurat): Update to 3.1.0. [propagated-inputs]: Add r-leiden, r-rcppannoy, and r-uwot. --- gnu/packages/bioinformatics.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7d6d5e8c48..2c6648b294 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9457,13 +9457,13 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") (define-public r-seurat (package (name "r-seurat") - (version "3.0.2") + (version "3.1.0") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "016fgcmjz3sjfxdvam5hd7mdxpmpnc7f6p5zqlh97m21dgn5vpqn")))) + "0icxndnnkkmmr9hhd01dv3w8pih7x9r0rlp3fq9pk3qajp9gmlyq")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs @@ -9480,6 +9480,7 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") ("r-igraph" ,r-igraph) ("r-irlba" ,r-irlba) ("r-kernsmooth" ,r-kernsmooth) + ("r-leiden" ,r-leiden) ("r-lmtest" ,r-lmtest) ("r-mass" ,r-mass) ("r-matrix" ,r-matrix) @@ -9490,6 +9491,7 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") ("r-rann" ,r-rann) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) + ("r-rcppannoy" ,r-rcppannoy) ("r-rcppeigen" ,r-rcppeigen) ("r-rcppprogress" ,r-rcppprogress) ("r-reticulate" ,r-reticulate) @@ -9500,7 +9502,8 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") ("r-scales" ,r-scales) ("r-sctransform" ,r-sctransform) ("r-sdmtools" ,r-sdmtools) - ("r-tsne" ,r-tsne))) + ("r-tsne" ,r-tsne) + ("r-uwot" ,r-uwot))) (home-page "http://www.satijalab.org/seurat") (synopsis "Seurat is an R toolkit for single cell genomics") (description -- cgit v1.2.3 From 9b275285e9d391abcbc6757172eb7d3704e75cd3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:39:45 +0200 Subject: gnu: r-fgsea: Update to 1.10.1. * gnu/packages/bioconductor.scm (r-fgsea): Update to 1.10.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a416dbc764..03c2d8e7c7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2999,14 +2999,14 @@ phenotype of interest.") (define-public r-fgsea (package (name "r-fgsea") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "fgsea" version)) (sha256 (base32 - "07mvv1i690q80fm8sxgdqxchamn76409vn91ppgcck2xpi6b8q6c")))) + "1k2f9hkp1mvc9fpqzhbf08jd0yg4xaa312v9vy37fxd9pyrwp5a6")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From b58b4410e2f3a4d70c9a942203399c74ac9fd4c5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:39:49 +0200 Subject: gnu: r-mixomics: Update to 6.8.2. * gnu/packages/bioconductor.scm (r-mixomics): Update to 6.8.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 03c2d8e7c7..3faf79fa0e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5022,14 +5022,14 @@ self-organizing map clustering and minimal spanning trees.") (define-public r-mixomics (package (name "r-mixomics") - (version "6.8.0") + (version "6.8.2") (source (origin (method url-fetch) (uri (bioconductor-uri "mixOmics" version)) (sha256 (base32 - "1f08jx35amn3sfcmqb96mjxxsm6dnpzhff625z758x1992wj4zsk")))) + "0issfrhsgc102sr33q9v6w6jrrd32plig7szd1nm0n4r3yn4y2fc")))) (properties `((upstream-name . "mixOmics"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e107ccea8421cd9b74589b73c15127fc812c3a33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:39:56 +0200 Subject: gnu: r-ldblock: Update to 1.14.2. * gnu/packages/bioinformatics.scm (r-ldblock): Update to 1.14.2. [propagated-inputs]: Remove r-erma; add r-ensdb-hsapiens-v75, r-ensembldb, and r-httr. --- gnu/packages/bioinformatics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2c6648b294..f5901703ce 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10190,22 +10190,24 @@ by Ernst and Kellis.") (define-public r-ldblock (package (name "r-ldblock") - (version "1.14.0") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ldblock" version)) (sha256 (base32 - "0lraxhq9ny3468534klrl64nx0dpaf9cbd5bir6m5qma8j7kfnyd")))) + "0xx04cghx6ads1ackwnw3z0gf72qv461nznzmcnkgmp7w5n9m2af")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) - ("r-erma" ,r-erma) + ("r-ensdb-hsapiens-v75" ,r-ensdb-hsapiens-v75) + ("r-ensembldb" ,r-ensembldb) ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicfiles" ,r-genomicfiles) ("r-go-db" ,r-go-db) ("r-homo-sapiens" ,r-homo-sapiens) + ("r-httr" ,r-httr) ("r-matrix" ,r-matrix) ("r-rsamtools" ,r-rsamtools) ("r-snpstats" ,r-snpstats) -- cgit v1.2.3 From c7358ac4fc6369cdf87f95ec8600a21e809a22eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:45:17 +0200 Subject: import: cran: Retry failed git imports on Bioconductor. * guix/import/cran.scm (cran->guix-package): Retry failed git imports on Bioconductor. --- guix/import/cran.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 51c7ea7b2f..b5321b44ef 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -494,12 +494,16 @@ from the alist META, which was derived from the R package's DESCRIPTION file." "Fetch the metadata for PACKAGE-NAME from REPO and return the `package' s-expression corresponding to that package, or #f on failure." (let ((description (fetch-description repo package-name))) - (if (and (not description) - (eq? repo 'bioconductor)) - ;; Retry import from CRAN - (cran->guix-package package-name 'cran) - (and description - (description->package repo description))))))) + (if description + (description->package repo description) + (case repo + ((git) + ;; Retry import from Bioconductor + (cran->guix-package package-name 'bioconductor)) + ((bioconductor) + ;; Retry import from CRAN + (cran->guix-package package-name 'cran)) + (else #f))))))) (define* (cran-recursive-import package-name #:optional (repo 'cran)) (recursive-import package-name repo -- cgit v1.2.3 From 8786fec4859f36aeb2e6b5d136b4507088d2b5a1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Sep 2019 14:46:04 +0200 Subject: import: cran: Only use the git import with what looks like a URL. * guix/import/cran.scm (fetch-description): Abort if the argument does not look like a URL. --- guix/import/cran.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index b5321b44ef..35caa3e463 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -230,16 +230,17 @@ from ~s: ~a (~s)~%" (if (boolean? type) meta (cons `(bioconductor-type . ,type) meta)))))))))) ((git) - ;; Download the git repository at "NAME" - (call-with-values - (lambda () (download name #t)) - (lambda (dir commit) - (and=> (description->alist (with-input-from-file - (string-append dir "/DESCRIPTION") read-string)) - (lambda (meta) - (cons* `(git . ,name) - `(git-commit . ,commit) - meta)))))))) + (and (string-prefix? "http" name) + ;; Download the git repository at "NAME" + (call-with-values + (lambda () (download name #t)) + (lambda (dir commit) + (and=> (description->alist (with-input-from-file + (string-append dir "/DESCRIPTION") read-string)) + (lambda (meta) + (cons* `(git . ,name) + `(git-commit . ,commit) + meta))))))))) (define (listify meta field) "Look up FIELD in the alist META. If FIELD contains a comma-separated -- cgit v1.2.3 From 76ee4446fdb214a35972848544b09ea555931a30 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Sep 2019 15:12:13 +0300 Subject: gnu: Add rust-redox-syscall, rust-thread-id. * gnu/packages/crates-io.scm (rust-redox-syscall, rust-thread-id): New variables. --- gnu/packages/crates-io.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c3d2419f88..a4d2e17524 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1413,6 +1413,28 @@ and @code{ptrdistance}.") (license (list license:asl2.0 license:expat)))) +;; This package requires features which are unavailable +;; on the stable releases of Rust. +(define-public rust-redox-syscall ; guix upstreamable + (package + (name "rust-redox-syscall") + (version "0.1.56") + (source + (origin + (method url-fetch) + (uri (crate-uri "redox_syscall" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "110y7dyfm2vci4x5vk7gr0q551dvp31npl99fnsx2fb17wzwcf94")))) + (build-system cargo-build-system) + (home-page "https://gitlab.redox-os.org/redox-os/syscall") + (synopsis "Rust library to access raw Redox system calls") + (description "This package provides a Rust library to access raw Redox +system calls.") + (properties '((hidden? . #t))) + (license license:expat))) + (define-public rust-regex-syntax (package (name "rust-regex-syntax") @@ -1933,6 +1955,32 @@ bindings are a small wrapper around the raw C functions, which converts integer return values to @code{std::io::Result} to indicate success or failure.") (license license:expat))) +(define-public rust-thread-id + (package + (name "rust-thread-id") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "thread-id" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-redox-syscall" ,rust-redox-syscall) + ("rust-winapi" ,rust-winapi)))) + (home-page "https://github.com/ruuda/thread-id") + (synopsis "Get a unique ID for the current thread in Rust") + (description + "For diagnostics and debugging it can often be useful to get an ID that is +different for every thread.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-thread-local (package (name "rust-thread-local") -- cgit v1.2.3 From 44b6397a58c6c5bc2cc45646667f0fc389c54f37 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Sep 2019 15:15:11 +0300 Subject: gnu: Add rust-scoped-threadpool. * gnu/packages/crates-io.scm (rust-scoped-threadpool): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4d2e17524..410279255b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1603,6 +1603,34 @@ paths point to the same file.") server functionality.") (license license:expat))) +(define-public rust-scoped-threadpool + (package + (name "rust-scoped-threadpool") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "scoped_threadpool" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a26d3lk40s9mrf4imhbik7caahmw2jryhhb6vqv6fplbbgzal8x")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static)))) + (home-page "https://github.com/Kimundi/scoped-threadpool-rs") + (synopsis "library for scoped and cached threadpools") + (description + "This crate provides a stable, safe and scoped threadpool. It can be used +to execute a number of short-lived jobs in parallel without the need to respawn +the underlying threads. Jobs are runnable by borrowing the pool for a given +scope, during which an arbitrary number of them can be executed. These jobs can +access data of any lifetime outside of the pools scope, which allows working on +non-'static references in parallel.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-scoped-tls (package (name "rust-scoped-tls") -- cgit v1.2.3 From bb41995dc76a3f305178d7c92161f8d72d13f061 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Sep 2019 15:30:00 +0300 Subject: gnu: Add rust-owning-ref. * gnu/packages/crates-io.scm (rust-owning-ref): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 410279255b..b9fd0b2ae5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1133,6 +1133,30 @@ implementation (which is unstable / requires nightly).") (license (list license:asl2.0 license:expat)))) +(define-public rust-owning-ref + (package + (name "rust-owning-ref") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "owning_ref" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04zgwy77lin8qz398s6g44467pd6kjhbrlqifkia5rkr47mbi929")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-stable-deref-trait" ,rust-stable-deref-trait)))) + (home-page "https://github.com/Kimundi/owning-ref-rs") + (synopsis "Create references that carry their owner with them") + (description + "This package provides a library for creating references that carry their +owner with them. This can sometimes be useful because Rust borrowing rules +normally prevent moving a type that has been borrowed from.") + (license license:expat))) + (define-public rust-peeking-take-while (package (name "rust-peeking-take-while") -- cgit v1.2.3 From 74394983665a13573285f79060bcbb699fc2cecd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Sep 2019 15:42:08 +0300 Subject: gnu: Add rust-heapsize-0.3. * gnu/packages/crates-io.scm (rust-heapsize-0.3): New variable. --- gnu/packages/crates-io.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b9fd0b2ae5..9aa995ef94 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -664,6 +664,23 @@ heap.") (license (list license:asl2.0 license:expat)))) +(define-public rust-heapsize-0.3 + (package + (inherit rust-heapsize) + (name "rust-heapsize") + (version "0.3.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "heapsize" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0dmwc37vgsdjzk10443dj4f23439i9gch28jcwzmry3chrwx8v2m")))) + (arguments + `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys)) + #:tests? #f)))) ;; No flexible-tests feature flags on this release. + (define-public rust-hex (package (name "rust-hex") -- cgit v1.2.3 From eb98d5a83ce98ece279fec51085521aafd976ec4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 2 Sep 2019 15:51:26 +0300 Subject: gnu: Add rust-heapsize-plugin, rust-language-tags. * gnu/packages/crates-io.scm (rust-heapsize-plugin, rust-language-tags): New variables. --- gnu/packages/crates-io.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9aa995ef94..6f2a002a2f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -681,6 +681,37 @@ heap.") `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys)) #:tests? #f)))) ;; No flexible-tests feature flags on this release. +;; This package makes use of removed features +(define-public rust-heapsize-plugin + (package + (name "rust-heapsize-plugin") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "heapsize_plugin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1i72isf699q9jl167g2kg4xd6h3cd05rc79zaph58aqjy0g0m9y9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-heapsize" ,rust-heapsize-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-Cargo-toml + (lambda _ + (substitute* "Cargo.toml" + (("path = \"..\", ") "")) + #t))))) + (home-page "https://github.com/servo/heapsize") + (synopsis "Measure runtime size of an object on the heap") + (description + "This package automatically generates infrastructure for measuring the +total runtime size of an object on the heap") + (properties `((hidden? . #t))) + (license license:mpl2.0))) + (define-public rust-hex (package (name "rust-hex") @@ -818,6 +849,34 @@ friction with idiomatic Rust structs to ease interopability.") kernel32.") (license license:expat))) +(define-public rust-language-tags + (package + (name "rust-language-tags") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "language-tags" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-heapsize" ,rust-heapsize-0.3)) + #:cargo-development-inputs + (("rust-heapsize-plugin" ,rust-heapsize-plugin)))) + (home-page "https://github.com/pyfisch/rust-language-tags") + (synopsis "Language tags for Rust") + (description + "Language tags can be used identify human languages, scripts e.g. Latin +script, countries and other regions. They are commonly used in HTML and HTTP +@code{Content-Language} and @code{Accept-Language} header fields. This package +currently supports parsing (fully conformant parser), formatting and comparing +language tags.") + (license license:expat))) + (define-public rust-lazy-static (package (name "rust-lazy-static") -- cgit v1.2.3 From d34e9114e679666dfbf7caf577117010eca20520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 2 Sep 2019 11:28:18 +0200 Subject: doc: Explain that "guix import" and "guix refresh" may need GnuPG. Fixes . Reported by Jesse Gibbons . * doc/guix.texi (Invoking guix import, Invoking guix refresh): Mention that GnuPG must be installed. --- doc/guix.texi | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 031ee53295..0510f57c23 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8509,8 +8509,13 @@ guix import @var{importer} @var{options}@dots{} @var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and other -options specific to @var{importer}. Currently, the available -``importers'' are: +options specific to @var{importer}. + +Some of the importers rely on the ability to run the @command{gpgv} command. +For these, GnuPG must be installed and in @code{$PATH}; run @code{guix install +gnupg} if needed. + +Currently, the available ``importers'' are: @table @code @item gnu @@ -8959,7 +8964,10 @@ update the version numbers and source tarball hashes of those package recipes (@pxref{Defining Packages}). This is achieved by downloading each package's latest source tarball and its associated OpenPGP signature, authenticating the downloaded tarball against its signature -using @command{gpg}, and finally computing its hash. When the public +using @command{gpgv}, and finally computing its hash---note that GnuPG must be +installed and in @code{$PATH}; run @code{guix install gnupg} if needed. + +When the public key used to sign the tarball is missing from the user's keyring, an attempt is made to automatically retrieve it from a public key server; when this is successful, the key is added to the user's keyring; otherwise, -- cgit v1.2.3 From 9323ab550f3bcb75fcaefbb20847595974702d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Aug 2019 16:01:32 +0200 Subject: tests: 'with-http-server' accepts multiple responses. * guix/tests/http.scm (call-with-http-server): Replace 'code' and 'data' parameters with 'responses+data'. Compute RESPONSES as a function of that. Remove #:headers parameter. [http-write]: Quit only when RESPONSES is empty. [server-body]: Get the response and data from RESPONSES, and set it to point to the rest. (with-http-server): Adjust accordingly. * tests/derivations.scm ("'download' built-in builder") ("'download' built-in builder, invalid hash") ("'download' built-in builder, not found") ("'download' built-in builder, check mode"): Adjust to new 'with-http-server' interface. * tests/lint.scm ("home-page: 200") ("home-page: 200 but short length") ("home-page: 404", "home-page: 301, invalid"): ("home-page: 301 -> 200", "home-page: 301 -> 404") ("source: 200", "source: 200 but short length") ("source: 404", "source: 404 and 200") ("source: 301 -> 200", "source: 301 -> 404"): ("github-url", github-url): Likewise. * tests/swh.scm (with-json-result) ("lookup-origin, not found"): Likewise. --- guix/tests/http.scm | 39 ++++++++++++-------- tests/derivations.scm | 12 +++---- tests/lint.scm | 98 ++++++++++++++++++++++++++++++--------------------- tests/swh.scm | 5 +-- 4 files changed, 91 insertions(+), 63 deletions(-) diff --git a/guix/tests/http.scm b/guix/tests/http.scm index a56d6f213d..05ce39bca2 100644 --- a/guix/tests/http.scm +++ b/guix/tests/http.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,7 @@ #:use-module (web server http) #:use-module (web response) #:use-module (srfi srfi-39) + #:use-module (ice-9 match) #:export (with-http-server call-with-http-server %http-server-port @@ -69,10 +70,20 @@ needed." (string-append "http://localhost:" (number->string (%http-server-port)) "/foo/bar")) -(define* (call-with-http-server code data thunk - #:key (headers '())) - "Call THUNK with an HTTP server running and returning CODE and DATA (a -string) on HTTP requests." +(define* (call-with-http-server responses+data thunk) + "Call THUNK with an HTTP server running and returning RESPONSES+DATA on HTTP +requests. Each elements of RESPONSES+DATA must be a tuple containing a +response and a string, or an HTTP response code and a string." + (define responses + (map (match-lambda + (((? response? response) data) + (list response data)) + (((? integer? code) data) + (list (build-response #:code code + #:reason-phrase "Such is life") + data))) + responses+data)) + (define (http-write server client response body) "Write RESPONSE." (let* ((response (write-response response client)) @@ -82,7 +93,8 @@ string) on HTTP requests." (else (write-response-body response body))) (close-port port) - (quit #t) ;exit the server thread + (when (null? responses) + (quit #t)) ;exit the server thread (values))) ;; Mutex and condition variable to synchronize with the HTTP server. @@ -105,10 +117,10 @@ string) on HTTP requests." (define (server-body) (define (handle request body) - (values (build-response #:code code - #:reason-phrase "Such is life" - #:headers headers) - data)) + (match responses + (((response data) rest ...) + (set! responses rest) + (values response data)))) (let ((socket (open-http-server-socket))) (catch 'quit @@ -126,10 +138,7 @@ string) on HTTP requests." (define-syntax with-http-server (syntax-rules () - ((_ (code headers) data body ...) - (call-with-http-server code data (lambda () body ...) - #:headers headers)) - ((_ code data body ...) - (call-with-http-server code data (lambda () body ...))))) + ((_ responses+data body ...) + (call-with-http-server responses+data (lambda () body ...))))) ;;; http.scm ends here diff --git a/tests/derivations.scm b/tests/derivations.scm index db73d19b3a..00cedef32c 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -210,7 +210,7 @@ (test-skip 1)) (test-assert "'download' built-in builder" (let ((text (random-text))) - (with-http-server 200 text + (with-http-server `((200 ,text)) (let* ((drv (derivation %store "world" "builtin:download" '() #:env-vars `(("url" @@ -225,7 +225,7 @@ (unless (http-server-can-listen?) (test-skip 1)) (test-assert "'download' built-in builder, invalid hash" - (with-http-server 200 "hello, world!" + (with-http-server `((200 "hello, world!")) (let* ((drv (derivation %store "world" "builtin:download" '() #:env-vars `(("url" @@ -240,7 +240,7 @@ (unless (http-server-can-listen?) (test-skip 1)) (test-assert "'download' built-in builder, not found" - (with-http-server 404 "not found" + (with-http-server '((404 "not found")) (let* ((drv (derivation %store "will-never-be-found" "builtin:download" '() #:env-vars `(("url" @@ -275,9 +275,9 @@ . ,(object->string (%local-url)))) #:hash-algo 'sha256 #:hash (sha256 (string->utf8 text))))) - (and (with-http-server 200 text + (and (with-http-server `((200 ,text)) (build-derivations %store (list drv))) - (with-http-server 200 text + (with-http-server `((200 ,text)) (build-derivations %store (list drv) (build-mode check))) (string=? (call-with-input-file (derivation->output-path drv) @@ -1264,5 +1264,5 @@ (test-end) ;; Local Variables: -;; eval: (put 'with-http-server 'scheme-indent-function 2) +;; eval: (put 'with-http-server 'scheme-indent-function 1) ;; End: diff --git a/tests/lint.scm b/tests/lint.scm index db6dd6dbe1..c8b88136f4 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -390,7 +390,7 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "home-page: 200" '() - (with-http-server 200 %long-string + (with-http-server `((200 ,%long-string)) (let ((pkg (package (inherit (dummy-package "x")) (home-page (%local-url))))) @@ -399,7 +399,7 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "home-page: 200 but short length" "URI http://localhost:9999/foo/bar returned suspiciously small file (18 bytes)" - (with-http-server 200 "This is too small." + (with-http-server `((200 "This is too small.")) (let ((pkg (package (inherit (dummy-package "x")) (home-page (%local-url))))) @@ -410,7 +410,7 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "home-page: 404" "URI http://localhost:9999/foo/bar not reachable: 404 (\"Such is life\")" - (with-http-server 404 %long-string + (with-http-server `((404 ,%long-string)) (let ((pkg (package (inherit (dummy-package "x")) (home-page (%local-url))))) @@ -420,7 +420,7 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "home-page: 301, invalid" "invalid permanent redirect from http://localhost:9999/foo/bar" - (with-http-server 301 %long-string + (with-http-server `((301 ,%long-string)) (let ((pkg (package (inherit (dummy-package "x")) (home-page (%local-url))))) @@ -430,12 +430,14 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "home-page: 301 -> 200" "permanent redirect from http://localhost:10000/foo/bar to http://localhost:9999/foo/bar" - (with-http-server 200 %long-string - (let ((initial-url (%local-url))) + (with-http-server `((200 ,%long-string)) + (let* ((initial-url (%local-url)) + (redirect (build-response #:code 301 + #:headers + `((location + . ,(string->uri initial-url)))))) (parameterize ((%http-server-port (+ 1 (%http-server-port)))) - (with-http-server (301 `((location - . ,(string->uri initial-url)))) - "" + (with-http-server `((,redirect "")) (let ((pkg (package (inherit (dummy-package "x")) (home-page (%local-url))))) @@ -445,12 +447,14 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "home-page: 301 -> 404" "URI http://localhost:10000/foo/bar not reachable: 404 (\"Such is life\")" - (with-http-server 404 "booh!" - (let ((initial-url (%local-url))) + (with-http-server '((404 "booh!")) + (let* ((initial-url (%local-url)) + (redirect (build-response #:code 301 + #:headers + `((location + . ,(string->uri initial-url)))))) (parameterize ((%http-server-port (+ 1 (%http-server-port)))) - (with-http-server (301 `((location - . ,(string->uri initial-url)))) - "" + (with-http-server `((,redirect "")) (let ((pkg (package (inherit (dummy-package "x")) (home-page (%local-url))))) @@ -583,7 +587,7 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "source: 200" '() - (with-http-server 200 %long-string + (with-http-server `((200 ,%long-string)) (let ((pkg (package (inherit (dummy-package "x")) (source (origin @@ -595,7 +599,7 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "source: 200 but short length" "URI http://localhost:9999/foo/bar returned suspiciously small file (18 bytes)" - (with-http-server 200 "This is too small." + (with-http-server '((200 "This is too small.")) (let ((pkg (package (inherit (dummy-package "x")) (source (origin @@ -610,7 +614,7 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "source: 404" "URI http://localhost:9999/foo/bar not reachable: 404 (\"Such is life\")" - (with-http-server 404 %long-string + (with-http-server `((404 ,%long-string)) (let ((pkg (package (inherit (dummy-package "x")) (source (origin @@ -625,10 +629,10 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "source: 404 and 200" '() - (with-http-server 404 %long-string + (with-http-server `((404 ,%long-string)) (let ((bad-url (%local-url))) (parameterize ((%http-server-port (+ 1 (%http-server-port)))) - (with-http-server 200 %long-string + (with-http-server `((200 ,%long-string)) (let ((pkg (package (inherit (dummy-package "x")) (source (origin @@ -642,11 +646,14 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "source: 301 -> 200" "permanent redirect from http://localhost:10000/foo/bar to http://localhost:9999/foo/bar" - (with-http-server 200 %long-string - (let ((initial-url (%local-url))) + (with-http-server `((200 ,%long-string)) + (let* ((initial-url (%local-url)) + (redirect (build-response #:code 301 + #:headers + `((location + . ,(string->uri initial-url)))))) (parameterize ((%http-server-port (+ 1 (%http-server-port)))) - (with-http-server (301 `((location . ,(string->uri initial-url)))) - "" + (with-http-server `((,redirect "")) (let ((pkg (package (inherit (dummy-package "x")) (source (origin @@ -661,11 +668,14 @@ (test-skip (if (http-server-can-listen?) 0 1)) (test-equal "source: 301 -> 404" "URI http://localhost:10000/foo/bar not reachable: 404 (\"Such is life\")" - (with-http-server 404 "booh!" - (let ((initial-url (%local-url))) + (with-http-server '((404 "booh!")) + (let* ((initial-url (%local-url)) + (redirect (build-response #:code 301 + #:headers + `((location + . ,(string->uri initial-url)))))) (parameterize ((%http-server-port (+ 1 (%http-server-port)))) - (with-http-server (301 `((location . ,(string->uri initial-url)))) - "" + (with-http-server `((,redirect "")) (let ((pkg (package (inherit (dummy-package "x")) (source (origin @@ -697,7 +707,7 @@ (test-equal "github-url" '() - (with-http-server 200 %long-string + (with-http-server `((200 ,%long-string)) (check-github-url (dummy-package "x" (source (origin @@ -709,17 +719,25 @@ (test-equal "github-url: one suggestion" (string-append "URL should be '" github-url "'") - (with-http-server (301 `((location . ,(string->uri github-url)))) "" - (let ((initial-uri (%local-url))) - (parameterize ((%http-server-port (+ 1 (%http-server-port)))) - (with-http-server (302 `((location . ,(string->uri initial-uri)))) "" - (single-lint-warning-message - (check-github-url - (dummy-package "x" (source - (origin - (method url-fetch) - (uri (%local-url)) - (sha256 %null-sha256))))))))))) + (let ((redirect (build-response #:code 301 + #:headers + `((location + . ,(string->uri github-url)))))) + (with-http-server `((,redirect "")) + (let* ((initial-url (%local-url)) + (redirect (build-response #:code 302 + #:headers + `((location + . ,(string->uri initial-url)))))) + (parameterize ((%http-server-port (+ 1 (%http-server-port)))) + (with-http-server `((,redirect "")) + (single-lint-warning-message + (check-github-url + (dummy-package "x" (source + (origin + (method url-fetch) + (uri (%local-url)) + (sha256 %null-sha256)))))))))))) (test-equal "github-url: already the correct github url" '() (check-github-url @@ -844,6 +862,6 @@ (test-end "lint") ;; Local Variables: -;; eval: (put 'with-http-server 'scheme-indent-function 2) +;; eval: (put 'with-http-server 'scheme-indent-function 1) ;; eval: (put 'with-warnings 'scheme-indent-function 0) ;; End: diff --git a/tests/swh.scm b/tests/swh.scm index 07f0fda37b..9a0da07ae1 100644 --- a/tests/swh.scm +++ b/tests/swh.scm @@ -40,7 +40,7 @@ \"dir_id\": 2 } ]") (define-syntax-rule (with-json-result str exp ...) - (with-http-server 200 str + (with-http-server `((200 ,str)) (parameterize ((%swh-base-url (%local-url))) exp ...))) @@ -56,7 +56,7 @@ (test-equal "lookup-origin, not found" #f - (with-http-server 404 "Nope." + (with-http-server `((404 "Nope.")) (parameterize ((%swh-base-url (%local-url))) (lookup-origin "http://example.org/whatever")))) @@ -72,5 +72,6 @@ ;; Local Variables: ;; eval: (put 'with-json-result 'scheme-indent-function 1) +;; eval: (put 'with-http-server 'scheme-indent-function 1) ;; End: -- cgit v1.2.3 From ba1c1853a79a5930ca7db7a6b368859f805df98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Aug 2019 15:59:16 +0200 Subject: swh: Add hooks for rate limiting handling. * guix/swh.scm (%allow-request?, %save-rate-limit-reset-time) (%general-rate-limit-reset-time): New variables. (request-rate-limit-reached?, update-rate-limit-reset-time!): New procedures. (call): Call '%allow-request?'. Change 'swh-error' protocol to pass METHOD in addition to URL. * tests/swh.scm ("rate limit reached") ("%allow-request? and request-rate-limit-reached?"): New tests. --- guix/swh.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++-------------- tests/swh.scm | 36 +++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 20 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index c253e217da..42f38ee048 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -20,6 +20,7 @@ #:use-module (guix base16) #:use-module (guix build utils) #:use-module ((guix build syscalls) #:select (mkdtemp!)) + #:use-module (web uri) #:use-module (web client) #:use-module (web response) #:use-module (json) @@ -32,6 +33,9 @@ #:use-module (ice-9 popen) #:use-module ((ice-9 ftw) #:select (scandir)) #:export (%swh-base-url + %allow-request? + + request-rate-limit-reached? origin? origin-id @@ -196,31 +200,71 @@ Software Heritage." ((? string? str) str) ((? null?) #f))) +(define %allow-request? + ;; Takes a URL and method (e.g., the 'http-get' procedure) and returns true + ;; to keep going. This can be used to disallow a requests when + ;; 'request-rate-limit-reached?' returns true, for instance. + (make-parameter (const #t))) + +;; The time when the rate limit for "/origin/save" POST requests and that of +;; other requests will be reset. +;; See . +(define %save-rate-limit-reset-time 0) +(define %general-rate-limit-reset-time 0) + +(define (request-rate-limit-reached? url method) + "Return true if the rate limit has been reached for URI." + (define uri + (string->uri url)) + + (define reset-time + (if (and (eq? method http-post) + (string-prefix? "/api/1/origin/save/" (uri-path uri))) + %save-rate-limit-reset-time + %general-rate-limit-reset-time)) + + (< (car (gettimeofday)) reset-time)) + +(define (update-rate-limit-reset-time! url method response) + "Update the rate limit reset time for URL and METHOD based on the headers in +RESPONSE." + (let ((uri (string->uri url))) + (match (assq-ref (response-headers response) 'x-ratelimit-reset) + ((= string->number (? number? reset)) + (if (and (eq? method http-post) + (string-prefix? "/api/1/origin/save/" (uri-path uri))) + (set! %save-rate-limit-reset-time reset) + (set! %general-rate-limit-reset-time reset))) + (_ + #f)))) + (define* (call url decode #:optional (method http-get) #:key (false-if-404? #t)) "Invoke the endpoint at URL using METHOD. Decode the resulting JSON body using DECODE, a one-argument procedure that takes an input port. When FALSE-IF-404? is true, return #f upon 404 responses." - (let*-values (((response port) - (method url #:streaming? #t))) - ;; See . - (match (assq-ref (response-headers response) 'x-ratelimit-remaining) - (#f #t) - ((? (compose zero? string->number)) - (throw 'swh-error url response)) - (_ #t)) - - (cond ((= 200 (response-code response)) - (let ((result (decode port))) - (close-port port) - result)) - ((and false-if-404? - (= 404 (response-code response))) - (close-port port) - #f) - (else - (close-port port) - (throw 'swh-error url response))))) + (and ((%allow-request?) url method) + (let*-values (((response port) + (method url #:streaming? #t))) + ;; See . + (match (assq-ref (response-headers response) 'x-ratelimit-remaining) + (#f #t) + ((? (compose zero? string->number)) + (update-rate-limit-reset-time! url method response) + (throw 'swh-error url method response)) + (_ #t)) + + (cond ((= 200 (response-code response)) + (let ((result (decode port))) + (close-port port) + result)) + ((and false-if-404? + (= 404 (response-code response))) + (close-port port) + #f) + (else + (close-port port) + (throw 'swh-error url method response)))))) (define-syntax define-query (syntax-rules (path) diff --git a/tests/swh.scm b/tests/swh.scm index 9a0da07ae1..e36c54e5fb 100644 --- a/tests/swh.scm +++ b/tests/swh.scm @@ -19,6 +19,7 @@ (define-module (test-swh) #:use-module (guix swh) #:use-module (guix tests http) + #:use-module (web response) #:use-module (srfi srfi-64)) ;; Test the JSON mapping machinery used in (guix swh). @@ -68,6 +69,41 @@ (directory-entry-length entry))) (lookup-directory "123")))) +(test-equal "rate limit reached" + 3000000000 + (let ((too-many (build-response + #:code 429 + #:reason-phrase "Too many requests" + + ;; Pretend we've reached the limit and it'll be reset in + ;; June 2065. + #:headers '((x-ratelimit-remaining . "0") + (x-ratelimit-reset . "3000000000"))))) + (with-http-server `((,too-many "Too bad.")) + (parameterize ((%swh-base-url (%local-url))) + (catch 'swh-error + (lambda () + (lookup-origin "http://example.org/guix.git")) + (lambda (key url method response) + ;; Ensure the reset time was recorded. + (@@ (guix swh) %general-rate-limit-reset-time))))))) + +(test-assert "%allow-request? and request-rate-limit-reached?" + ;; Here we test two things: that the rate limit set above is in effect and + ;; that %ALLOW-REQUEST? is called, and that 'request-rate-limit-reached?' + ;; returns true. + (let* ((key (gensym "skip-request")) + (skip-if-limit-reached + (lambda (url method) + (or (not (request-rate-limit-reached? url method)) + (throw key #t))))) + (parameterize ((%allow-request? skip-if-limit-reached)) + (catch key + (lambda () + (lookup-origin "http://example.org/guix.git") + #f) + (const #t))))) + (test-end "swh") ;; Local Variables: -- cgit v1.2.3 From d370cc73193f42fb86f08237b4ebb612ef822ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 29 Aug 2019 16:02:29 +0200 Subject: swh: Make 'commit-id?' public. * guix/swh.scm (commit-id?): Make public. --- guix/swh.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/swh.scm b/guix/swh.scm index 42f38ee048..01648a1ebe 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -105,6 +105,8 @@ request-cooking vault-fetch + commit-id? + swh-download)) ;;; Commentary: @@ -568,7 +570,7 @@ requested bundle cooking, waiting for completion...~%")) (define (commit-id? reference) "Return true if REFERENCE is likely a commit ID, false otherwise---e.g., if -it is a tag name." +it is a tag name. This is based on a simple heuristic so use with care!" (and (= (string-length reference) 40) (string-every char-set:hex-digit reference))) -- cgit v1.2.3 From 55549c7b9b778a79d3e1f3d085861ef36aabdca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 30 Aug 2019 00:54:15 +0200 Subject: lint: Add 'archival' checker. * guix/lint.scm (check-archival): New procedure. (%network-dependent-checkers): Add 'archival' checker. * tests/lint.scm ("archival: missing content") ("archival: content available") ("archival: missing revision") ("archival: revision available") ("archival: rate limit reached"): New tests. * doc/guix.texi (Invoking guix lint): Document it. --- doc/guix.texi | 25 +++++++++++++++ guix/lint.scm | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- tests/lint.scm | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 0510f57c23..de02ad8687 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9249,6 +9249,31 @@ Parse the @code{source} URL to determine if a tarball from GitHub is autogenerated or if it is a release tarball. Unfortunately GitHub's autogenerated tarballs are sometimes regenerated. +@item archival +@cindex Software Heritage, source code archive +@cindex archival of source code, Software Heritage +Checks whether the package's source code is archived at +@uref{https://www.softwareheritage.org, Software Heritage}. + +When the source code that is not archived comes from a version-control system +(VCS)---e.g., it's obtained with @code{git-fetch}, send Software Heritage a +``save'' request so that it eventually archives it. This ensures that the +source will remain available in the long term, and that Guix can fall back to +Software Heritage should the source code disappear from its original host. +The status of recent ``save'' requests can be +@uref{https://archive.softwareheritage.org/save/#requests, viewed on-line}. + +When source code is a tarball obtained with @code{url-fetch}, simply print a +message when it is not archived. As of this writing, Software Heritage does +not allow requests to save arbitrary tarballs; we are working on ways to +ensure that non-VCS source code is also archived. + +Software Heritage +@uref{https://archive.softwareheritage.org/api/#rate-limiting, limits the +request rate per IP address}. When the limit is reached, @command{guix lint} +prints a message and the @code{archival} checker stops doing anything until +that limit has been reset. + @item cve @cindex security vulnerabilities @cindex CVE, Common Vulnerabilities and Exposures diff --git a/guix/lint.scm b/guix/lint.scm index 254f4e2830..ba38bef806 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -44,6 +44,8 @@ #:use-module ((guix ui) #:select (texi->plain-text fill-paragraph)) #:use-module (guix gnu-maintenance) #:use-module (guix cve) + #:use-module ((guix swh) #:hide (origin?)) + #:autoload (guix git-download) (git-reference?) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 format) @@ -80,6 +82,7 @@ check-vulnerabilities check-for-updates check-formatting + check-archival lint-warning lint-warning? @@ -1033,6 +1036,93 @@ the NIST server non-fatal." '())) (#f '()))) ; cannot find newer upstream release + +(define (check-archival package) + "Check whether PACKAGE's source code is archived on Software Heritage. If +it's not, and if its source code is a VCS snapshot, then send a \"save\" +request to Software Heritage. + +Software Heritage imposes limits on the request rate per client IP address. +This checker prints a notice and stops doing anything once that limit has been +reached." + (define (response->warning url method response) + (if (request-rate-limit-reached? url method) + (list (make-warning package + (G_ "Software Heritage rate limit reached; \ +try again later") + #:field 'source)) + (list (make-warning package + (G_ "'~a' returned ~a") + (list url (response-code response)) + #:field 'source)))) + + (define skip-key (gensym "skip-archival-check")) + + (define (skip-when-limit-reached url method) + (or (not (request-rate-limit-reached? url method)) + (throw skip-key #t))) + + (parameterize ((%allow-request? skip-when-limit-reached)) + (catch #t + (lambda () + (match (and (origin? (package-source package)) + (package-source package)) + (#f ;no source + '()) + ((= origin-uri (? git-reference? reference)) + (define url + (git-reference-url reference)) + (define commit + (git-reference-commit reference)) + + (match (if (commit-id? commit) + (or (lookup-revision commit) + (lookup-origin-revision url commit)) + (lookup-origin-revision url commit)) + ((? revision? revision) + '()) + (#f + ;; Revision is missing from the archive, attempt to save it. + (catch 'swh-error + (lambda () + (save-origin (git-reference-url reference) "git") + (list (make-warning + package + ;; TRANSLATORS: "Software Heritage" is a proper noun + ;; that must remain untranslated. See + ;; . + (G_ "scheduled Software Heritage archival") + #:field 'source))) + (lambda (key url method response . _) + (cond ((= 429 (response-code response)) + (list (make-warning + package + (G_ "archival rate limit exceeded; \ +try again later") + #:field 'source))) + (else + (response->warning url method response)))))))) + ((? origin? origin) + ;; Since "save" origins are not supported for non-VCS source, all + ;; we can do is tell whether a given tarball is available or not. + (if (origin-sha256 origin) ;XXX: for ungoogled-chromium + (match (lookup-content (origin-sha256 origin) "sha256") + (#f + (list (make-warning package + (G_ "source not archived on Software \ +Heritage") + #:field 'source))) + ((? content?) + '())) + '())))) + (match-lambda* + ((key url method response) + (response->warning url method response)) + ((key . args) + (if (eq? key skip-key) + '() + (apply throw key args))))))) + ;;; ;;; Source code formatting. @@ -1237,7 +1327,11 @@ or a list thereof") (lint-checker (name 'refresh) (description "Check the package for new upstream releases") - (check check-for-updates)))) + (check check-for-updates)) + (lint-checker + (name 'archival) + (description "Ensure source code archival on Software Heritage") + (check check-archival)))) (define %all-checkers (append %local-checkers diff --git a/tests/lint.scm b/tests/lint.scm index c8b88136f4..1b92f02b85 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -35,6 +35,7 @@ #:use-module (guix packages) #:use-module (guix lint) #:use-module (guix ui) + #:use-module (guix swh) #:use-module (gnu packages) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) @@ -47,6 +48,7 @@ #:use-module (ice-9 regex) #:use-module (ice-9 getopt-long) #:use-module (ice-9 pretty-print) + #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-26) @@ -859,6 +861,85 @@ '() (check-formatting (dummy-package "x"))) +(test-assert "archival: missing content" + (let* ((origin (origin + (method url-fetch) + (uri "http://example.org/foo.tgz") + (sha256 (make-bytevector 32)))) + (warnings (with-http-server '((404 "Not archived.")) + (parameterize ((%swh-base-url (%local-url))) + (check-archival (dummy-package "x" + (source origin))))))) + (warning-contains? "not archived" warnings))) + +(test-equal "archival: content available" + '() + (let* ((origin (origin + (method url-fetch) + (uri "http://example.org/foo.tgz") + (sha256 (make-bytevector 32)))) + ;; https://archive.softwareheritage.org/api/1/content/ + (content "{ \"checksums\": {}, \"data_url\": \"xyz\", + \"length\": 42 }")) + (with-http-server `((200 ,content)) + (parameterize ((%swh-base-url (%local-url))) + (check-archival (dummy-package "x" (source origin))))))) + +(test-assert "archival: missing revision" + (let* ((origin (origin + (method git-fetch) + (uri (git-reference + (url "http://example.org/foo.git") + (commit "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"))) + (sha256 (make-bytevector 32)))) + ;; https://archive.softwareheritage.org/api/1/origin/save/ + (save "{ \"origin_url\": \"http://example.org/foo.git\", + \"save_request_date\": \"2014-11-17T22:09:38+01:00\", + \"save_request_status\": \"accepted\", + \"save_task_status\": \"scheduled\" }") + (warnings (with-http-server `((404 "No revision.") ;lookup-revision + (404 "No origin.") ;lookup-origin + (200 ,save)) ;save-origin + (parameterize ((%swh-base-url (%local-url))) + (check-archival (dummy-package "x" (source origin))))))) + (warning-contains? "scheduled" warnings))) + +(test-equal "archival: revision available" + '() + (let* ((origin (origin + (method git-fetch) + (uri (git-reference + (url "http://example.org/foo.git") + (commit "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"))) + (sha256 (make-bytevector 32)))) + ;; https://archive.softwareheritage.org/api/1/revision/ + (revision "{ \"author\": {}, \"parents\": [], + \"date\": \"2014-11-17T22:09:38+01:00\" }")) + (with-http-server `((200 ,revision)) + (parameterize ((%swh-base-url (%local-url))) + (check-archival (dummy-package "x" (source origin))))))) + +(test-assert "archival: rate limit reached" + ;; We should get a single warning stating that the rate limit was reached, + ;; and nothing more, in particular no other HTTP requests. + (let* ((origin (origin + (method url-fetch) + (uri "http://example.org/foo.tgz") + (sha256 (make-bytevector 32)))) + (too-many (build-response + #:code 429 + #:reason-phrase "Too many requests" + #:headers '((x-ratelimit-remaining . "0") + (x-ratelimit-reset . "3000000000")))) + (warnings (with-http-server `((,too-many "Rate limit reached.")) + (parameterize ((%swh-base-url (%local-url))) + (append-map (lambda (name) + (check-archival + (dummy-package name (source origin)))) + '("x" "y" "z")))))) + (string-contains (single-lint-warning-message warnings) + "rate limit reached"))) + (test-end "lint") ;; Local Variables: -- cgit v1.2.3 From 0403d01f01c22ddd552dd5a0cfb97b0e8e58da9e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 2 Sep 2019 17:04:42 +0200 Subject: gnu: Add net.didierverna.asdf-flv. * gnu/packages/lisp.scm (cl-net.didierverna.asdf-flv, ecl-net.didierverna.asdf-flv, sbcl-net.didierverna.asdf-flv): New variables. --- gnu/packages/lisp.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 72587f2925..c6deb95eb3 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -710,6 +710,40 @@ portable between implementations.") (define-public ecl-alexandria (sbcl-package->ecl-package sbcl-alexandria)) +(define-public sbcl-net.didierverna.asdf-flv + (package + (name "sbcl-net.didierverna.asdf-flv") + (version "2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/didierverna/asdf-flv") + (commit (string-append "version-" version)))) + (file-name (git-file-name "asdf-flv" version)) + (sha256 + (base32 "1fi2y4baxan103jbg4idjddzihy03kwnj2mzbwrknw4d4x7xlgwj")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp ASDF extension to provide support for file-local variables") + (description "ASDF-FLV provides support for file-local variables through +ASDF. A file-local variable behaves like @code{*PACKAGE*} and +@code{*READTABLE*} with respect to @code{LOAD} and @code{COMPILE-FILE}: a new +dynamic binding is created before processing the file, so that any +modification to the variable becomes essentially file-local. + +In order to make one or several variables file-local, use the macros +@code{SET-FILE-LOCAL-VARIABLE(S)}.") + (home-page "https://www.lrde.epita.fr/~didier/software/lisp/misc.php#asdf-flv") + (license (license:non-copyleft + "https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html" + "GNU All-Permissive License")))) + +(define-public cl-net.didierverna.asdf-flv + (sbcl-package->cl-source-package sbcl-net.didierverna.asdf-flv)) + +(define-public ecl-alexandria + (sbcl-package->ecl-package sbcl-net.didierverna.asdf-flv)) + (define-public sbcl-fiveam (package (name "sbcl-fiveam") -- cgit v1.2.3 From 0b2396b6c6d1ca4642c809fc8627d7d57a84d524 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 2 Sep 2019 17:06:24 +0200 Subject: gnu: sbcl-fiveam: Update to 1.4.1. * gnu/packages/lisp.scm (sbcl-fiveam): Update to 1.4.1. --- gnu/packages/lisp.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c6deb95eb3..fffbbbe392 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -747,7 +747,7 @@ In order to make one or several variables file-local, use the macros (define-public sbcl-fiveam (package (name "sbcl-fiveam") - (version "1.2") + (version "1.4.1") (source (origin (method git-fetch) @@ -756,8 +756,11 @@ In order to make one or several variables file-local, use the macros (commit (string-append "v" version)))) (file-name (git-file-name "fiveam" version)) (sha256 - (base32 "1yx9716mk8pq9076q6cjx4c9lyax3amiccy37sh0913k2x8gsm4l")))) - (inputs `(("alexandria" ,sbcl-alexandria))) + (base32 "1q3d38pwafnwnw42clq0f8g5xw7pbzr287jl9jsqmb1vb0n1vrli")))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("net.didierverna.asdf-flv" ,sbcl-net.didierverna.asdf-flv) + ("trivial-backtrace" ,sbcl-trivial-backtrace))) (build-system asdf-build-system/sbcl) (synopsis "Common Lisp testing framework") (description "FiveAM is a simple (as far as writing and running tests -- cgit v1.2.3 From cc16f90a074260fa32325217ea1779084d2a615b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 2 Sep 2019 17:09:05 +0200 Subject: gnu: Add cl-hooks. * gnu/packages/lisp.scm (cl-hooks, ecl-cl-hooks, sbcl-cl-hooks): New variables. --- gnu/packages/lisp.scm | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index fffbbbe392..a042674df2 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -6779,3 +6779,66 @@ power of CXML is available when necessary.") (description "This is a Common Lisp library that allows to publish D-Bus objects as well as send and notify other objects connected to a bus.") (license license:bsd-2)))) + +(define-public sbcl-cl-hooks + (let ((commit "5b638083f3b4f1221a52631d9c8a0a265565cac7") + (revision "1")) + (package + (name "sbcl-cl-hooks") + (build-system asdf-build-system/sbcl) + (version (git-version "0.2.1" revision commit)) + (home-page "https://github.com/scymtym/architecture.hooks") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bg3l0a28lw5gqqjp6p6b5nhwqk46sgkb7184w5qbfngw1hk8x9y")))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("let-plus" ,sbcl-let-plus) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("closer-mop" ,sbcl-closer-mop))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (synopsis "Hooks extension point mechanism (as in Emacs) for Common Lisp") + (description "A hook, in the present context, is a certain kind of +extension point in a program that allows interleaving the execution of +arbitrary code with the execution of a the program without introducing any +coupling between the two. Hooks are used extensively in the extensible editor +Emacs. + +In the Common LISP Object System (CLOS), a similar kind of extensibility is +possible using the flexible multi-method dispatch mechanism. It may even seem +that the concept of hooks does not provide any benefits over the possibilites +of CLOS. However, there are some differences: + +@itemize + +@item There can be only one method for each combination of specializers and +qualifiers. As a result this kind of extension point cannot be used by +multiple extensions independently. +@item Removing code previously attached via a @code{:before}, @code{:after} or +@code{:around} method can be cumbersome. +@item There could be other or even multiple extension points besides @code{:before} +and @code{:after} in a single method. +@item Attaching codes to individual objects using eql specializers can be +cumbersome. +@item Introspection of code attached a particular extension point is +cumbersome since this requires enumerating and inspecting the methods of a +generic function. +@end itemize + +This library tries to complement some of these weaknesses of method-based +extension-points via the concept of hooks.") + (license license:llgpl)))) + +(define-public cl-hooks + (sbcl-package->cl-source-package sbcl-cl-hooks)) + +(define-public ecl-cl-hooks + (sbcl-package->ecl-package sbcl-cl-hooks)) -- cgit v1.2.3 From b888396d702165ad72cc7331233cce883337a96f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 25 Aug 2019 11:15:58 -0400 Subject: gnu: gcl: Enable tests. * gnu/packages/lisp.scm (gcl)[arguments]: Remove #:tests? flag and set the #:test-target to "ansi-tests/test_results". --- gnu/packages/lisp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index a042674df2..203b6719d0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -113,7 +113,7 @@ (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; The build system seems not to be thread safe. - #:tests? #f ; There does not seem to be make check or anything similar. + #:test-target "ansi-tests/test_results" #:configure-flags '("--enable-ansi") ; required for use by the maxima package #:make-flags (list (string-append "GCL_CC=" (assoc-ref %build-inputs "gcc") -- cgit v1.2.3 From d3a8dd2dc0e14c398e5e0ca8ac5d62d2b034c5b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 2 Sep 2019 22:44:07 +0200 Subject: gnu: rclone: Update to 1.49.1. * gnu/packages/sync.scm (rclone): Update to 1.49.1. [source]: Update uri. [arguments]: Update #:import-path. --- gnu/packages/sync.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index ccebe40e9d..e281f43554 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -264,19 +264,19 @@ over the Internet in an HTTP and CDN friendly way; (define-public rclone (package (name "rclone") - (version "1.48.0") + (version "1.49.1") (source (origin (method url-fetch) - (uri (string-append "https://github.com/ncw/rclone/releases/download/v" - version "/rclone-v" version ".tar.gz")) + (uri (string-append "https://github.com/rclone/rclone/releases/download/" + "v" version "/rclone-v" version ".tar.gz")) (sha256 - (base32 "1r03rlsk0qpya1fl8xfhj5inccjywf2cqgkd8r6wfhf3w2qd1zlc")))) + (base32 "1d0qvj7fn5bx3zqlf6hzn1922nrmy4x341n760m1b6h9az32mc5x")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) (arguments - '(#:import-path "github.com/ncw/rclone" + '(#:import-path "github.com/rclone/rclone" #:install-source? #f)) (synopsis "@code{rsync} for cloud storage") (description "@code{Rclone} is a command line program to sync files and -- cgit v1.2.3 From cc650175a5b9b817b93c0ec3000ab5957316f31f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 2 Sep 2019 22:50:09 +0200 Subject: gnu: snap: Update to 5.1.0. * gnu/packages/education.scm (snap): Update to 5.1.0. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 440746a28c..240fc4acd8 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -250,7 +250,7 @@ easy.") (define-public snap (package (name "snap") - (version "5.0.8") + (version "5.1.0") (source (origin (method git-fetch) @@ -260,7 +260,7 @@ easy.") (file-name (git-file-name name version)) (sha256 (base32 - "0fwfssdgv3mfzyv8hw1a1z5ky1yn0p59kyl6l9fxsm4w2ckgyizd")))) + "11fqbbvrv4zqbdz176ahczb2d797inq5n7zg74335d96m377si3f")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 4a8253d6223749b937611bc425e19b7b5553a655 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 2 Sep 2019 22:56:13 +0200 Subject: gnu: grammalecte: Update to 1.3.0. * gnu/packages/dictionaries.scm (grammalecte): Update to 1.3.0. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 228a8b6472..ba22fecf20 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -218,7 +218,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.") (define-public grammalecte (package (name "grammalecte") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch/zipbomb) @@ -226,7 +226,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.") "Grammalecte-fr-v" version ".zip")) (sha256 (base32 - "1j2avdk8hcgcv0lahp029qzpdb2rnys38hc64jy30awzx64fa6i4")))) + "1knysfdd1rx4vc5cmmnry4jsza0cdjy26fv505m854yfmq6zrckd")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 68668e97dca8a0b987952d474beeed08ecfb8fda Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 2 Sep 2019 15:32:06 -0400 Subject: gnu: icecat: Update to 60.9.0-guix1. * gnu/packages/gnuzilla.scm (%icecat-version): Update to 60.9.0-guix1. (icecat-source)[upstream-firefox-source]: Update hash. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ff382b2388..0ffeb44d7a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -426,7 +426,7 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "60.8.0-guix1") +(define %icecat-version "60.9.0-guix1") ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -448,7 +448,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1gkz90clarbhgfxhq91s0is6lw6bfymyjb0xbyyswdg68kcqfcy1")))) + "0gy5x2rnnbkqmjd9sq93s3q5na9nkba68xwpizild7k6qn63qicz")))) (upstream-icecat-base-version "60.7.0") ; maybe older than base-version (upstream-icecat-gnu-version "1") -- cgit v1.2.3 From a52f4c5740ea7ad7776cb399eef0eccabe85127c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:27:42 -0700 Subject: gnu: Add ghc-unsafe. * gnu/packages/haskell-xyz.scm (ghc-unsafe): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 91d009dc22..8d7614240e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2019 Jacob MacDonald +;;; Copyright © 2019 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -10547,6 +10548,33 @@ and high speed.") `(("ghc-hashable" ,ghc-hashable-bootstrap))) (properties '(hidden? #t)))) +(define-public ghc-unsafe + (package + (name "ghc-unsafe") + (version "0.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/unsafe/unsafe-" + version ".tar.gz")) + (sha256 + (base32 + "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/unsafe") + (synopsis "Unified interface to unsafe functions") + (description "Safe Haskell introduced the notion of safe and unsafe +modules. In order to make as many as possible modules ``safe'', the +well-known unsafe functions were moved to distinguished modules. This +makes it hard to write packages that work with both old and new versions +of GHC. This package provides a single module System.Unsafe that +exports the unsafe functions from the base package. It provides them in +a style ready for qualification, that is, you should import them by +@code{import qualified System.Unsafe as Unsafe}.") + (license license:bsd-3))) + (define-public ghc-uri-bytestring (package (name "ghc-uri-bytestring") -- cgit v1.2.3 From 6b652f5af3ddf9d8d894d1270441ab29354cca97 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:30:41 -0700 Subject: gnu: Add ghc-non-negative. * gnu/packages/haskell-xyz.scm (ghc-non-negative): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 8d7614240e..2dbafe6770 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6736,6 +6736,33 @@ making this package a full replacement for the original newtype package, and an alternative to newtype-th.") (license license:bsd-3))) +(define-public ghc-non-negative + (package + (name "ghc-non-negative") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/non-negative/non-negative-" + version ".tar.gz")) + (sha256 + (base32 + "0f01q916dzkl1i0v15qrw9cviycki5g3fgi6x8gs45iwbzssq52n")))) + (build-system haskell-build-system) + (inputs + `(("ghc-semigroups" ,ghc-semigroups) + ("ghc-utility-ht" ,ghc-utility-ht) + ("ghc-quickcheck" ,ghc-quickcheck))) + (home-page "https://hackage.haskell.org/package/non-negative") + (synopsis "Non-negative numbers class") + (description "This library provides a class for non-negative numbers, +a wrapper which can turn any ordered numeric type into a member of that +class, and a lazy number type for non-negative numbers (a generalization +of Peano numbers).") + (license license:gpl3+))) + (define-public ghc-objectname (package (name "ghc-objectname") -- cgit v1.2.3 From 7bbfa3926e48e366126f6500e3d7ef1097c4ffcb Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:32:28 -0700 Subject: gnu: Add ghc-timeit. * gnu/packages/haskell-xyz.scm (ghc-timeit): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2dbafe6770..b2cee24471 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10108,6 +10108,27 @@ function which generates instances.") @code{TimeLocale}.") (license license:bsd-3))) +(define-public ghc-timeit + (package + (name "ghc-timeit") + (version "2.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/timeit/timeit-" + version ".tar.gz")) + (sha256 + (base32 + "1sliqpvl501rlcj6s0lhmsf5ym24j4h881wzc1f1wdyvg3jz8kd1")))) + (build-system haskell-build-system) + (home-page "https://github.com/merijn/timeit") + (synopsis "Time monadic computations with an IO base") + (description "This package provides a simple wrapper to show the +used CPU time of monadic computation with an IO base.") + (license license:bsd-3))) + (define-public ghc-tldr (package (name "ghc-tldr") -- cgit v1.2.3 From bc06ca458865cdf7a3b971ac34ae2f92f75c6964 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:35:45 -0700 Subject: gnu: Add ghc-storablevector. * gnu/packages/haskell-xyz.scm (ghc-storablevector): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b2cee24471..b67754b1b9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9361,6 +9361,44 @@ Storable instance for Complex which is binary compatible with C99, C++ and Fortran complex data types.") (license license:bsd-3))) +(define-public ghc-storablevector + (package + (name "ghc-storablevector") + (version "0.2.13") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/storablevector/storablevector-" + version ".tar.gz")) + (sha256 + (base32 + "1zmr738vwnhnyxbikayqnaz31ilv2qlmscp6iqgl7adcfbal4dzq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-non-negative" ,ghc-non-negative) + ("ghc-utility-ht" ,ghc-utility-ht) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-unsafe" ,ghc-unsafe) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-syb" ,ghc-syb))) + (home-page "https://www.haskell.org/haskellwiki/Storable_Vector") + (synopsis "Fast, packed, strict storable arrays with a list interface") + (description "This library provides fast, packed, strict storable +arrays with a list interface, a chunky lazy list interface with variable +chunk size and an interface for write access via the ST monad. This is +much like bytestring and binary but can be used for every +@code{Foreign.Storable.Storable} type. See also +@url{http://hackage.haskell.org/package/vector}, a library with a +similar intention. + +This library does not do advanced fusion optimization, since especially +for lazy vectors this would either be incorrect or not applicable. See +@url{http://hackage.haskell.org/package/storablevector-streamfusion} for +a library that provides fusion with lazy lists.") + (license license:bsd-3))) + (define-public ghc-streaming-commons (package (name "ghc-streaming-commons") -- cgit v1.2.3 From f169f713e467fa1d8bb878f8a377c205b40ed8cb Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:36:43 -0700 Subject: gnu: Add ghc-fmlist. * gnu/packages/haskell-xyz.scm (ghc-fmlist): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b67754b1b9..1130e160c2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3555,6 +3555,30 @@ simple general-purpose data structure\".") arithmetic.") (license license:bsd-3))) +(define-public ghc-fmlist + (package + (name "ghc-fmlist") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/fmlist/fmlist-" + version ".tar.gz")) + (sha256 + (base32 + "02868865hqm189h5wjd916abvqwkhbrx5b0119s1dwp70ifvbi4g")))) + (build-system haskell-build-system) + (home-page "https://github.com/sjoerdvisscher/fmlist") + (synopsis "FoldMap lists") + (description "FoldMap lists are lists represented by their +@code{foldMap} function. FoldMap lists have @math{O(1)} cons, snoc and +append, just like DLists, but other operations might have favorable +performance characteristics as well. These wild claims are still +completely unverified though.") + (license license:bsd-3))) + (define-public ghc-foldl (package (name "ghc-foldl") -- cgit v1.2.3 From ad80074ab0e04c4f955b195ee017f25eec0efc1c Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:40:12 -0700 Subject: gnu: Add ghc-storable-record. * gnu/packages/haskell-xyz.scm (ghc-storable-record): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 1130e160c2..72b9c2518c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9385,6 +9385,38 @@ Storable instance for Complex which is binary compatible with C99, C++ and Fortran complex data types.") (license license:bsd-3))) +(define-public ghc-storable-record + (package + (name "ghc-storable-record") + (version "0.0.4") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/storable-record/" + "storable-record-" version ".tar.gz")) + (sha256 + (base32 + "0hjs1km0fc9ch0i1rbycxia5w3939hk4p4md73ikgg4aipqb5zyf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-semigroups" ,ghc-semigroups) + ("ghc-utility-ht" ,ghc-utility-ht) + ("ghc-storablevector" ,ghc-storablevector) + ("ghc-timeit" ,ghc-timeit))) + (home-page "https://hackage.haskell.org/package/storable-record") + (synopsis "Elegant definition of Storable instances for records") + (description "With this package you can build a Storable instance of +a record type from Storable instances of its elements in an elegant way. +It does not do any magic, just a bit arithmetic to compute the right +offsets, that would be otherwise done manually or by a preprocessor like +C2HS. There is no guarantee that the generated memory layout is +compatible with that of a corresponding C struct. However, the module +generates the smallest layout that is possible with respect to the +alignment of the record elements.") + (license license:bsd-3))) + (define-public ghc-storablevector (package (name "ghc-storablevector") -- cgit v1.2.3 From 1307e4c73d25cd89996b0841c2f84a84acbdb573 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:52:53 -0700 Subject: gnu: Add ghc-listlike. * gnu/packages/haskell-xyz.scm (ghc-listlike): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 72b9c2518c..fd4d464cfc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5810,6 +5810,41 @@ Kaseorg.") vector spaces.") (license license:bsd-3))) +(define-public ghc-listlike + (package + (name "ghc-listlike") + (version "4.6.2") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/ListLike/ListLike-" + version ".tar.gz")) + (sha256 + (base32 + "0m65x8yaq7q50gznln8mga2wrc8cvjx6gw9rim8s7xqcrx6y5zjh")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector) + ("ghc-dlist" ,ghc-dlist) + ("ghc-fmlist" ,ghc-fmlist) + ("ghc-hunit" ,ghc-hunit) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-random" ,ghc-random) + ("ghc-utf8-string" ,ghc-utf8-string))) + (home-page "https://github.com/JohnLato/listlike") + (synopsis "Generic support for list-like structures") + (description "The ListLike module provides a common interface to the +various Haskell types that are list-like. Predefined interfaces include +standard Haskell lists, Arrays, ByteStrings, and lazy ByteStrings. +Custom types can easily be made ListLike instances as well. + +ListLike also provides for String-like types, such as String and +ByteString, for types that support input and output, and for types that +can handle infinite lists.") + (license license:bsd-3))) + (define-public ghc-logging-facade (package (name "ghc-logging-facade") -- cgit v1.2.3 From 55f4c6533656873a21dcea5a7e4e4b1faef22d42 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:56:20 -0700 Subject: gnu: Add ghc-storable-tuple. * gnu/packages/haskell-xyz.scm (ghc-storable-tuple): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fd4d464cfc..c98e65dcef 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9452,6 +9452,34 @@ generates the smallest layout that is possible with respect to the alignment of the record elements.") (license license:bsd-3))) +(define-public ghc-storable-tuple + (package + (name "ghc-storable-tuple") + (version "0.0.3.3") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/storable-tuple/" + "storable-tuple-" version ".tar.gz")) + (sha256 + (base32 + "0dfzhxgkn1l6ls7zh6iifhyvhm8l47n40z0ar23c6ibsa94w1ynw")))) + (build-system haskell-build-system) + (inputs + `(("ghc-storable-record" ,ghc-storable-record) + ("ghc-utility-ht" ,ghc-utility-ht) + ("ghc-base-orphans" ,ghc-base-orphans))) + (home-page "https://hackage.haskell.org/package/storable-tuple") + (synopsis "Storable instance for pairs and triples") + (description "This package provides a Storable instance for pairs +and triples which should be binary compatible with C99 and C++. The +only purpose of this package is to provide a standard location for this +instance so that other packages needing this instance can play nicely +together.") + (license license:bsd-3))) + (define-public ghc-storablevector (package (name "ghc-storablevector") -- cgit v1.2.3 From 21f5b9a9b9a8d30aeeb686febbf59a88a97f4c1b Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 17:59:28 -0700 Subject: gnu: Add ghc-process-extras. * gnu/packages/haskell-xyz.scm (ghc-process-extras): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c98e65dcef..940fbe8a6c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7756,6 +7756,36 @@ examination.") "This package provides various primitive memory-related operations.") (license license:bsd-3))) +(define-public ghc-process-extras + (package + (name "ghc-process-extras") + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/process-extras/" + "process-extras-" version ".tar.gz")) + (sha256 + (base32 + "0klqgr37f1z2z6i0a9b0giapmq0p35l5k9kz1p7f0k1597w7agi9")))) + (build-system haskell-build-system) + (inputs + `(("ghc-data-default" ,ghc-data-default) + ("ghc-generic-deriving" ,ghc-generic-deriving) + ("ghc-hunit" ,ghc-hunit) + ("ghc-listlike" ,ghc-listlike))) + (home-page "https://github.com/seereason/process-extras") + (synopsis "Extra tools for managing processes") + (description "This packages extends +@url{http://hackage.haskell.org/package/process}. It allows you to read +process input and output as ByteStrings or Text, or write your own +ProcessOutput instance. It also provides lazy process input and output, +and a ProcessMaker class for more flexibility in the process creation +API.") + (license license:expat))) + (define-public ghc-profunctors (package (name "ghc-profunctors") -- cgit v1.2.3 From 621c077384c9dba6955bf712c7c93e7c0f3304f1 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 18:00:52 -0700 Subject: gnu: Add ghc-js-jquery. * gnu/packages/haskell-web.scm (ghc-js-jquery): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-web.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 7cbf8932e6..169d858a0b 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 rsiddharth ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2019 Robert Vollmert +;;; Copyright © 2019 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -1463,3 +1464,29 @@ Together with the snap-core library upon which it depends, it provides a clean and efficient Haskell programming interface to the HTTP protocol.") (license license:bsd-3))) + +(define-public ghc-js-jquery + (package + (name "ghc-js-jquery") + (version "3.3.1") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/js-jquery/js-jquery-" + version ".tar.gz")) + (sha256 + (base32 + "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70")))) + (build-system haskell-build-system) + (arguments `(#:tests? #f)) ; tests do network IO + (home-page "https://github.com/ndmitchell/js-jquery") + (synopsis "Obtain minified jQuery code") + (description "This package bundles the minified +@url{http://jquery.com/, jQuery} code into a Haskell package, so it can +be depended upon by Cabal packages. The first three components of the +version number match the upstream jQuery version. The package is +designed to meet the redistribution requirements of downstream +users (e.g. Debian).") + (license license:expat))) -- cgit v1.2.3 From 5b0fdbba8ad5b539f017187e065e22245a442cf9 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 18:01:54 -0700 Subject: gnu: Add ghc-js-flot. * gnu/packages/haskell-web.scm (ghc-js-flot): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-web.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 169d858a0b..6f1c460eaa 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1490,3 +1490,30 @@ version number match the upstream jQuery version. The package is designed to meet the redistribution requirements of downstream users (e.g. Debian).") (license license:expat))) + +(define-public ghc-js-flot + (package + (name "ghc-js-flot") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/js-flot/js-flot-" + version ".tar.gz")) + (sha256 + (base32 + "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv")))) + (build-system haskell-build-system) + (inputs + `(("ghc-http" ,ghc-http))) + (home-page "https://github.com/ndmitchell/js-flot") + (synopsis "Obtain minified flot code") + (description "This package bundles the minified +@url{http://www.flotcharts.org/, Flot} code (a jQuery plotting library) +into a Haskell package, so it can be depended upon by Cabal packages. +The first three components of the version number match the upstream flot +version. The package is designed to meet the redistribution +requirements of downstream users (e.g. Debian).") + (license license:expat))) -- cgit v1.2.3 From 6ec2450f1e1311d13d7f5d84346998b44014d4b3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sun, 7 Jul 2019 18:03:26 -0700 Subject: gnu: Add hoogle. * gnu/packages/haskell-apps.scm (hoogle): New variable. Signed-off-by: Timothy Sample --- gnu/packages/haskell-apps.scm | 52 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 77199af2cb..5cd6549c27 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2019 Kyle Meyer +;;; Copyright © 2015 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -413,6 +414,57 @@ hopefully make them easier to read. HLint also makes it easy to disable unwanted suggestions, and to add your own custom suggestions.") (license license:bsd-3))) +(define-public hoogle + (package + (name "hoogle") + (version "5.0.17.3") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://hackage.haskell.org/package/hoogle/hoogle-" + version ".tar.gz")) + (sha256 + (base32 + "174gp41v0krzj37m75pnr3aawyhkbk2wq4q6zk2z3zh0avvvmgk6")))) + (build-system haskell-build-system) + (inputs + `(("ghc-network-uri" ,ghc-network-uri) + ("ghc-network" ,ghc-network) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-aeson" ,ghc-aeson) + ("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-conduit" ,ghc-conduit) + ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-connection" ,ghc-connection) + ("ghc-extra" ,ghc-extra) + ("ghc-old-locale" ,ghc-old-locale) + ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) + ("ghc-http-conduit" ,ghc-http-conduit) + ("ghc-http-types" ,ghc-http-types) + ("ghc-js-flot" ,ghc-js-flot) + ("ghc-js-jquery" ,ghc-js-jquery) + ("ghc-mmap" ,ghc-mmap) + ("ghc-process-extras" ,ghc-process-extras) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-storable-tuple" ,ghc-storable-tuple) + ("ghc-tar" ,ghc-tar) + ("ghc-uniplate" ,ghc-uniplate) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-vector" ,ghc-vector) + ("ghc-wai" ,ghc-wai) + ("ghc-wai-logger" ,ghc-wai-logger) + ("ghc-warp" ,ghc-warp) + ("ghc-warp-tls" ,ghc-warp-tls) + ("ghc-zlib" ,ghc-zlib))) + (home-page "https://hoogle.haskell.org/") + (synopsis "Haskell API Search") + (description "Hoogle is a Haskell API search engine, which allows +you to search many standard Haskell libraries by either function name, +or by approximate type signature.") + (license license:bsd-3))) + (define-public hscolour (package (name "hscolour") -- cgit v1.2.3 From 663bc5ded8eaf397040684440ba51e8b61535a1f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 1 Sep 2019 19:46:27 +0200 Subject: gnu: Add emacs-ts. * gnu/packages/emacs-xyz.scm (emacs-ts): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0c6077770b..f810d2ad8e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11113,6 +11113,69 @@ into sections while preserving the structure imposed by any timestamps.") tables of contents.") (license license:gpl3+))) +(define-public emacs-ts + (let ((commit "93c074f2895a204e003e8c7f3033c37d6486fac8") + (revision "1")) + (package + (name "emacs-ts") + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/ts.el") + (commit commit))) + (sha256 + (base32 + "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash))) + (arguments + ;; XXX: Three tests are failing because of a timezone-related issue + ;; with how they're written. On my machine, all the failing test + ;; results are 18000 seconds (5 hours) off. + + ;; The ts-parse-org function accepts a string without any timezone + ;; info, not assumed to be in Unix time, and converts it to a so-called + ;; ts struct. The ts-unix function (accessor) accepts a ts struct, + ;; then seems to assume the struct's corresponding time is in terms of + ;; the user's current time zone, before returning a Unix time in + ;; seconds. + + ;; The failing tests all have similar problems, but nothing else about + ;; the library seems particularly off. + + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "test/test.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + (modify-phases %standard-phases + (add-before 'check 'make-tests-writable + (lambda _ + (make-file-writable "test/test.el") + #t)) + (add-before 'check 'delete-failing-tests + (lambda _ + (emacs-batch-edit-file "test/test.el" + `(progn (progn + (goto-char (point-min)) + (dolist (test-regexp '("ert-deftest ts-format" + "ert-deftest ts-parse-org\\_>" + "ert-deftest ts-parse-org-element")) + (re-search-forward test-regexp) + (beginning-of-line) + (kill-sexp))) + (basic-save-buffer))) + #t))))) + (home-page "https://github.com/alphapapa/ts.el") + (synopsis "Timestamp and date/time library") + (description "This package facilitates manipulating dates, times, and +timestamps by providing a @code{ts} struct.") + (license license:gpl3+)))) + (define-public emacs-org-ql (package (name "emacs-org-ql") -- cgit v1.2.3 From 0b95986aaf85c6b81da5b5ddb697fab4d13d308f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 1 Sep 2019 19:50:18 +0200 Subject: gnu: emacs-org-sidebar: Update to 0.1-1.ed951d1. * gnu/packages/emacs-xyz.scm (emacs-org-sidebar): Update to 0.1-1.ed951d1. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f810d2ad8e..1f419809e8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4257,7 +4257,7 @@ started with 20 minutes. All values are customizable.") (license license:gpl3+))) (define-public emacs-org-sidebar - (let ((commit "74ca98b9920f3de3f13d49866581435e1ec63ec5") + (let ((commit "ed951d1e0d8b7e65ed35797403fd3e8c88f507f5") (revision "1")) (package (name "emacs-org-sidebar") @@ -4270,7 +4270,7 @@ started with 20 minutes. All values are customizable.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "03p1ndyw2qp2skib5hszc4xyh84w7p2mhkd4a9dy6qv8q47xpsqn")))) + (base32 "01sf8v53pjsy80fzwmj2n8rp2z5gsnpyld0fm6j3bdv213clp69y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 7b90155443fd2bf6368d0cc8a4f8055696e4a294 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sun, 1 Sep 2019 19:51:05 +0200 Subject: gnu: emacs-org-ql: Update to 0.2. * gnu/packages/emacs-xyz.scm (emacs-org-ql): Update to 0.2. [inputs]: Add emacs-ts and emacs-org. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1f419809e8..3f335737a2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11179,7 +11179,7 @@ timestamps by providing a @code{ts} struct.") (define-public emacs-org-ql (package (name "emacs-org-ql") - (version "0.1") + (version "0.2") (source (origin (method git-fetch) (uri (git-reference @@ -11187,11 +11187,13 @@ timestamps by providing a @code{ts} struct.") (commit version))) (sha256 (base32 - "1nvzirn1lmgmgl7irbsc1n391a2cw8gmvwm3pa228l2c1gcx8kd8")) + "0mq0aj0a3a5gi9nz0ncpzsh731d92n86b0iinvx1m45dcal06h9y")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs `(("emacs-s" ,emacs-s) + ("emacs-ts" ,emacs-ts) + ("emacs-org" ,emacs-org) ("emacs-dash" ,emacs-dash))) (home-page "https://github.com/alphapapa/org-ql/") (synopsis "Query language for Org buffers") -- cgit v1.2.3 From 655ac50d3cf7e3276b28f989e25e40323663faf6 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 3 Sep 2019 01:06:40 +0200 Subject: gnu: Add rust-constant-time-eq. * gnu/packages/crates-io.scm (rust-constant-time-eq): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6f2a002a2f..27596cee02 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -251,6 +252,27 @@ colorization.") "Low level interface to CloudABI. Contains all syscalls and related types.") (license license:bsd-2))) +(define-public rust-constant-time-eq + (package + (name "rust-constant-time-eq") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "constant_time_eq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "083icpr9xb72rrdxw3p4068dcspn6ai22jy7rhl2a8grfz448nlr")))) + (build-system cargo-build-system) + (home-page "https://crates.io/crates/constant_time_eq") + (synopsis + "Compares two equal-sized byte strings in constant time") + (description + "This package compares two equal-sized byte strings in constant time. +It is inspired by the Linux kernel's @code{crypto_memneq}.") + (license license:cc0))) + (define-public rust-core-foundation-sys (package (name "rust-core-foundation-sys") -- cgit v1.2.3 From be2309ec7b901b4f639d05a8f2b53c438a64fd75 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 3 Sep 2019 01:16:29 +0200 Subject: gnu: rust-unicode-xid: Update to 0.2.0. * gnu/packages/crates-io.scm (rust-unicode-xid): Update to 0.2.0. (rust-unicode-xid-0.1): New variable. (rust-proc-macro2)[arguments]: Specify rust-unicode-xid-0.1 in cargo-inputs. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 27596cee02..ebd3d4ded1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1462,7 +1462,7 @@ for x86.") "0nd71fl24sys066jrha6j7i34nfkjv44yzw8yww9742wmc8j0gfg")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid)) + `(#:cargo-inputs (("rust-unicode-xid" ,rust-unicode-xid-0.1)) #:cargo-development-inputs (("rust-quote" ,rust-quote)))) (home-page "https://github.com/alexcrichton/proc-macro2") (synopsis "Stable implementation of the upcoming new `proc_macro` API") @@ -2430,7 +2430,7 @@ with the Unicode character database.") (define-public rust-unicode-xid (package (name "rust-unicode-xid") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) @@ -2438,8 +2438,8 @@ with the Unicode character database.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw")))) + (base32 + "0z09fn515xm7zyr0mmdyxa9mx2f7azcpv74pqmg611iralwpcvl2")))) (build-system cargo-build-system) (home-page "https://github.com/unicode-rs/unicode-xid") @@ -2449,6 +2449,20 @@ or XID_Continue properties according to Unicode Standard Annex #31.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-unicode-xid-0.1 + (package + (inherit rust-unicode-xid) + (name "rust-unicode-xid") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-xid" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1z57lqh4s18rr4x0j4fw4fmp9hf9346h0kmdgqsqx0fhjr3k0wpw")))))) + (define-public rust-unindent (package (name "rust-unindent") -- cgit v1.2.3 From 53bd3ab3890e45de6e03ffd48053f0b99e3a2b42 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Sep 2019 12:45:06 +0200 Subject: gnu: Add r-nlp. * gnu/packages/cran.scm (r-nlp): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f3566f28d2..8366b48bff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9325,6 +9325,26 @@ in-memory raw vectors.") ;; Either of these two license versions. (license (list license:gpl2 license:gpl3)))) +(define-public r-nlp + (package + (name "r-nlp") + (version "0.2-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "NLP" version)) + (sha256 + (base32 + "0xbhkrnxcbf322jfw31xcn4y2gnk5y7ccq1bz4h3prf44h0whr7w")))) + (properties `((upstream-name . "NLP"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/NLP/") + (synopsis "Natural language processing infrastructure") + (description + "This package provides basic classes and methods for Natural Language +Processing.") + (license license:gpl3))) + (define-public r-waveslim (package (name "r-waveslim") -- cgit v1.2.3 From f785d546819734d224f4c7a9421eca8e902b27bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Sep 2019 12:45:18 +0200 Subject: gnu: Add r-tm. * gnu/packages/cran.scm (r-tm): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8366b48bff..dd378d2b9c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9345,6 +9345,31 @@ in-memory raw vectors.") Processing.") (license license:gpl3))) +(define-public r-tm + (package + (name "r-tm") + (version "0.7-6") + (source + (origin + (method url-fetch) + (uri (cran-uri "tm" version)) + (sha256 + (base32 + "0spv43kjbpxq3rdxx8ysgrncjyc35ydiwk7gp8n4sig45iqyz59r")))) + (properties `((upstream-name . "tm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-nlp" ,r-nlp) + ("r-rcpp" ,r-rcpp) + ("r-slam" ,r-slam) + ("r-xml2" ,r-xml2))) + (home-page "http://tm.r-forge.r-project.org/") + (synopsis "Text mining package") + (description + "This package provides a framework for text mining applications within R.") + (license license:gpl3))) + (define-public r-waveslim (package (name "r-waveslim") -- cgit v1.2.3 From f847b6594371cf1ad56e603ddf57e1f8691c325d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Sep 2019 12:45:21 +0200 Subject: gnu: r-wordcloud: Add r-tm to inputs. * gnu/packages/cran.scm (r-wordcloud)[propagated-inputs]: Add r-tm. --- gnu/packages/cran.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dd378d2b9c..5bf37e3900 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9409,7 +9409,10 @@ pairs (Selesnick 2001, 2002).") (build-system r-build-system) (propagated-inputs `(("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-rcpp" ,r-rcpp))) + ("r-rcpp" ,r-rcpp) + ;; The "tm" package is only "suggested" according to CRAN, but the + ;; wordcloud package cannot be loaded without it. + ("r-tm" ,r-tm))) (home-page "https://cran.r-project.org/web/packages/wordcloud") (synopsis "Word clouds") (description -- cgit v1.2.3 From 6153fa0a996ca41ca858b4c21ef1e648a99d1f1f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Sep 2019 13:06:46 +0200 Subject: gnu: guile-gi: Update to 0.2.0. * gnu/packages/guile-xyz.scm (guile-gi): Update to 0.2.0. [arguments]: Remove make flags. [native-inputs]: Add glib:bin. --- gnu/packages/guile-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 7dff0c6269..b765ef36e1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2266,21 +2266,20 @@ list of components. This module takes care of that for you.") (define-public guile-gi (package (name "guile-gi") - (version "0.0.2") + (version "0.2.0") (source (origin (method url-fetch) (uri (string-append "http://lonelycactus.com/tarball/guile_gi-" version ".tar.gz")) (sha256 (base32 - "0hs0viqzff7nzgcmyw721ima1jyymrlzrcycpgwrs6iprscxvqwn")))) + "1n4pbrmbrjkrx826a4m31ag5c35rgkj1sirqh4qalk7gg67cfb41")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-gnu-filesystem-hierarchy") - ;; The atomic_int_set test does not actually fail. - #:make-flags '("XFAIL_TESTS=strjoinv.scm"))) + `(#:configure-flags '("--with-gnu-filesystem-hierarchy"))) (native-inputs `(("gettext" ,gnu-gettext) + ("glib:bin" ,glib "bin") ; for glib-compile-resources ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From bd3d71cb16de546b534be7a3d03880922f6a1c07 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 13:15:30 +0200 Subject: gnu: hdf4: Build with libtirpc. * gnu/packages/patches/hdf4-tirpc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/maths.scm (hdf4)[source](patches): Use it. [inputs]: Add LIBTIRPC. [arguments]: Adjust #:configure-flags accordingly. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 12 +++++++++--- gnu/packages/patches/hdf4-tirpc.patch | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/hdf4-tirpc.patch diff --git a/gnu/local.mk b/gnu/local.mk index fe476534c2..b40472709f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -944,6 +944,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ + %D%/packages/patches/hdf4-tirpc.patch \ %D%/packages/patches/hdf5-config-date.patch \ %D%/packages/patches/hdf5-mpi-deprecations.patch \ %D%/packages/patches/hdf5-1.8-mpi-deprecations.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38bb81242f..9e515fd3d1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -100,6 +100,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages netpbm) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pcre) #:use-module (gnu packages popt) #:use-module (gnu packages perl) @@ -684,7 +685,8 @@ computations.") (base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm")) (patches (search-patches "hdf4-architectures.patch" "hdf4-reproducibility.patch" - "hdf4-shared-fortran.patch")))) + "hdf4-shared-fortran.patch" + "hdf4-tirpc.patch")))) (build-system gnu-build-system) (native-inputs `(("gfortran" ,gfortran) @@ -692,10 +694,14 @@ computations.") ("flex" ,flex))) (inputs `(("zlib" ,zlib) - ("libjpeg" ,libjpeg))) + ("libjpeg" ,libjpeg) + ("libtirpc" ,libtirpc))) (arguments `(#:parallel-tests? #f - #:configure-flags '("--enable-shared") + #:configure-flags (list "--enable-shared" + (string-append "CPPFLAGS=-I" + (assoc-ref %build-inputs "libtirpc") + "/include/tirpc")) #:phases (modify-phases %standard-phases ;; This is inspired by two of Debian's patches. diff --git a/gnu/packages/patches/hdf4-tirpc.patch b/gnu/packages/patches/hdf4-tirpc.patch new file mode 100644 index 0000000000..3f436e3887 --- /dev/null +++ b/gnu/packages/patches/hdf4-tirpc.patch @@ -0,0 +1,33 @@ +Build with libtirpc on all architectures because glibc no longer provides +SunRPC support. + +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -23635,10 +23635,13 @@ + *-pc-cygwin*) + LIBS="$LIBS -ltirpc" + CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;; ++ *-linux-gnu) ++ LIBS="$LIBS -ltirpc" ++ CPPFLAGS="$CPPFLAGS" ;; + *) ;; + esac + +-if test "X$BUILD_XDR" != "Xyes"; then ++if test "X$BUILD_XDR" = "Xyes"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -23693,9 +23696,9 @@ + ## but we need to make sure that it is present on the system. Do that here, + ## The SunRPC of the glibc has been replaced by a TI-RPC (Transport Independent RPC) library for IPv6 support + case "$host" in +- *-pc-cygwin*) ++ *) + HAVE_RPC="yes" +- ac_fn_c_check_header_mongrel "$LINENO" "rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_h" "$ac_includes_default" + if test "x$ac_cv_header_rpc_h" = xyes; then : + : + else -- cgit v1.2.3 From 1be4989d7c3489e3636f44b4dea7ae1bd38d7484 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 3 Sep 2019 15:51:29 +0200 Subject: gnu: next: Update to 1.3.1. * gnu/packages/web-browsers.scm (next-gtk-webkit): Update to 1.3.1. [source]: Use GitHub. (sbcl-next-download-manager)[arguments]: Fix asd-system-name. (next)[inputs]: Remove unneeded dependencies. --- gnu/packages/web-browsers.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 14b6aef6cb..3368772ec6 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -368,16 +368,18 @@ driven and does not detract you from your daily work.") (define next-gtk-webkit (package (name "next-gtk-webkit") - (version "1.3.0") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://source.atlas.engineer/public/next") + ;; TODO: Mirror seems to hang, let's fallback to GitHub for now. + ;; (url "https://source.atlas.engineer/public/next") + (url "https://github.com/atlas-engineer/next") (commit version))) (sha256 (base32 - "0ibq30xrf871pkpasi8p9krn0pmd86rsdzb3jqvz3wnp4wa3hl9d")) + "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj")) (file-name (git-file-name "next" version)))) (build-system glib-or-gtk-build-system) (arguments @@ -417,7 +419,7 @@ features for productive professionals.") (arguments `(#:tests? #f ; Need online access. #:asd-file "next.asd" - #:asd-system-name "download-manager")) + #:asd-system-name "next/download-manager")) (inputs `(;; ASD libraries: ("trivial-features" ,sbcl-trivial-features) @@ -505,8 +507,6 @@ features for productive professionals.") ("cl-markup" ,sbcl-cl-markup) ("cl-ppcre" ,sbcl-cl-ppcre) ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode) - ("cl-string-match" ,sbcl-cl-string-match) - ("cl-strings" ,sbcl-cl-strings) ("closer-mop" ,sbcl-closer-mop) ("dbus" ,cl-dbus) ("dexador" ,sbcl-dexador) -- cgit v1.2.3 From 7c6ebf28db77f1a78bddf3758472b4e99afcc99e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 3 Sep 2019 18:02:18 +0200 Subject: doc: guix deploy: Add missing record field to example. Reported by GNUtoo on #guix. * doc/guix.texi (Invoking guix deploy): Add missing "system" field to example. --- doc/guix.texi | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/guix.texi b/doc/guix.texi index de02ad8687..a078822871 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -25603,6 +25603,7 @@ evaluates to. As an example, @var{file} might contain a definition like this: (environment managed-host-environment-type) (configuration (machine-ssh-configuration (host-name "localhost") + (system "x86_64-linux") (user "alice") (identity "./id_rsa") (port 2222))))) -- cgit v1.2.3 From 25bdbb618a4947e8d5dcf14c440bf58fad58165f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 18:49:32 +0200 Subject: gnu: hdf-eos2: Add libtirpc input. * gnu/packages/maths.scm (hdf-eos2)[inputs]: Add LIBTIRPC. --- gnu/packages/maths.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9e515fd3d1..5735c17bc6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1050,8 +1050,11 @@ implemented in C.") `(("gfortran" ,gfortran))) (inputs `(("hdf4" ,hdf4-alt) ; assume most HDF-EOS2 users won't use the HDF4 netCDF API + ;; XXX: These inputs are really dependencies of hdf4. ("zlib" ,zlib) ("libjpeg" ,libjpeg) + ("libtirpc" ,libtirpc) + ("gctp" ,gctp))) (arguments `( #:configure-flags '("--enable-install-include" "--enable-shared" -- cgit v1.2.3 From 8ac56556fe813e41f642bc4efc9b9696c2f3dc9e Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 00:10:04 +0200 Subject: gnu: emacs-org-pomodoro: Update to 2.1.0-1.aa07c11. * gnu/packages/emacs-xyz.scm (emacs-org-pomodoro): Update to 2.1.0-1.aa07c11. [arguments]: Include "resources" directory and run tests. [source]: Update url. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 64 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3f335737a2..29d9fe419f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4229,24 +4229,50 @@ number.") (license license:gpl3+))) (define-public emacs-org-pomodoro - (package - (name "emacs-org-pomodoro") - (version "2.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lolownia/org-pomodoro.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-alert" ,emacs-alert))) - (home-page "https://github.com/lolownia/org-pomodoro") - (synopsis "Pomodoro technique for org-mode") - (description "@code{emacs-org-pomodoro} adds very basic support for + ;; Last release version was from 2016. + (let ((commit "aa07c11318f91219336197e62c47bc7a3d090479") + (revision "1")) + (package + (name "emacs-org-pomodoro") + (version (git-version "2.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/marcinkoziej/org-pomodoro.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nbprh2nhnmb7ngp9ndr6zr37ashcsvpi5slv7a37x1dl7j6w1k4")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-alert" ,emacs-alert))) + (arguments + `(#:include (cons "^resources\\/" %default-include) + #:tests? #t + #:test-command '("emacs" "--batch" + "-l" "org-pomodoro-tests.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + (modify-phases %standard-phases + (add-before 'check 'make-tests-writable + (lambda _ + (make-file-writable "org-pomodoro-tests.el") + #t)) + (add-before 'check 'add-require + (lambda _ + (emacs-batch-edit-file "org-pomodoro-tests.el" + `(progn (progn (goto-char (point-min)) + (re-search-forward + "ert-deftest") + (beginning-of-line) + (forward-line -1) + (insert "(require 'org-pomodoro)")) + (basic-save-buffer))) + #t))))) + (home-page "https://github.com/marcinkoziej/org-pomodoro") + (synopsis "Pomodoro technique for org-mode") + (description "@code{emacs-org-pomodoro} adds very basic support for Pomodoro technique in Emacs org-mode. Run @code{M-x org-pomodoro} for the task at point or select one of the @@ -4254,7 +4280,7 @@ last tasks that you clocked time for. Each clocked-in pomodoro starts a timer of 25 minutes and after each pomodoro a break timer of 5 minutes is started automatically. Every 4 breaks a long break is started with 20 minutes. All values are customizable.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-org-sidebar (let ((commit "ed951d1e0d8b7e65ed35797403fd3e8c88f507f5") -- cgit v1.2.3 From c9f8d6a953f07e593157bda2b04cbc3c7409bfe4 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 02:45:49 +0200 Subject: gnu: Add emacs-org-tanglesync. * gnu/packages/emacs-xyz.scm (emacs-org-tanglesync): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 29d9fe419f..997d519e35 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4342,6 +4342,30 @@ overview of tasks in a subtree.") organizer.") (license license:gpl3+))) +(define-public emacs-org-tanglesync + (let ((commit "ab76a3eaaed263677d2e029d43f6c4de8fc21418") + (revision "1")) + (package + (name "emacs-org-tanglesync") + (version (git-version "0.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mtekman/org-tanglesync.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14ify3yirq2qmi9isk8kcbwx8pbclv1fyg49kraz4srhgf2fssgf")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-org" ,emacs-org))) + (home-page "https://github.com/mtekman/org-tanglesync.el") + (synopsis "Sync Org source blocks with tangled external files") + (description "This package automatically pulls changes from source code +to their corresponding tangled blocks.") + (license license:gpl3+)))) + (define-public emacs-company-flow (let ((commit "76ef585c70d2a3206c2eadf24ba61e59124c3a16") (revision "1")) -- cgit v1.2.3 From d070a0884cd49068dc1acf6e225aa3ce487f015c Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 26 Aug 2019 19:16:45 +0200 Subject: gnu: Add emacs-unidecode. * gnu/packages/emacs-xyz.scm (emacs-unidecode): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 997d519e35..ab13e8d306 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9658,6 +9658,49 @@ subsequent invocations can be readily customized. Several recipes are included by default, and more can be readily added.") (license license:gpl3+)))) +(define-public emacs-unidecode + (let ((commit "5502ada9287b4012eabb879f12f5b0a9df52c5b7") + (revision "1")) + (package + (name "emacs-unidecode") + (version (git-version "0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sindikat/unidecode") + (commit commit))) + (sha256 + (base32 + "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn")))) + (build-system emacs-build-system) + (arguments + `(#:include (cons* "^tools/" "^data/" %default-include) + #:tests? #t + #:test-command '("emacs" "--batch" + "-l" "unidecode-test.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + (modify-phases %standard-phases + (add-before 'check 'make-tests-writable + (lambda _ + (make-file-writable "unidecode-test.el") + #t)) + (add-before 'check 'add-require + (lambda _ + (emacs-batch-edit-file "unidecode-test.el" + `(progn (progn (goto-char (point-min)) + (re-search-forward + "ert-deftest") + (forward-line -1) + (insert "(require 'unidecode)")) + (basic-save-buffer))) + #t))))) + (home-page "https://github.com/sindikat/unidecode") + (synopsis "Transliterate Unicode text to ASCII") + (description "This package provides functions for converting Unicode to ASCII.") + (license license:gpl2+)))) + (define-public emacs-websocket (package (name "emacs-websocket") -- cgit v1.2.3 From 948c700b90814918080b041690ebbf5cd687ae07 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 05:13:36 +0200 Subject: gnu: Add emacs-pubmed. * gnu/packages/emacs-xyz.scm (emacs-pubmed): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab13e8d306..be88802071 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9701,6 +9701,32 @@ included by default, and more can be readily added.") (description "This package provides functions for converting Unicode to ASCII.") (license license:gpl2+)))) +(define-public emacs-pubmed + (package + (name "emacs-pubmed") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/fvdbeek/emacs-pubmed.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15bwjxc7g43m5pi8z17anaqqkvi209r7kk1chmf175477gvrv7c0")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-deferred" ,emacs-deferred) + ("emacs-esxml" ,emacs-esxml) + ("emacs-s" ,emacs-s) + ("emacs-unidecode" ,emacs-unidecode))) + (home-page "https://gitlab.com/fvdbeek/emacs-pubmed") + (synopsis "Interface to PubMed") + (description "This package provides an Emacs interface to the PubMed +database of references on life sciences.") + (license license:gpl3+))) + (define-public emacs-websocket (package (name "emacs-websocket") -- cgit v1.2.3 From 242e9f0d2cb6c11a2e4f2001ba71beb7e6a68810 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 19:35:06 +0200 Subject: gnu: ocaml-batteries: Update to 2.10.0. * gnu/packages/ocaml.scm (ocaml-batteries): Update to 2.10.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bd66ab04aa..3bc28164fc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2276,7 +2276,7 @@ many additional enhancements, including: (define-public ocaml-batteries (package (name "ocaml-batteries") - (version "2.9.0") + (version "2.10.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/ocaml-batteries-team/" @@ -2284,7 +2284,7 @@ many additional enhancements, including: version "/batteries-" version ".tar.gz")) (sha256 (base32 - "0lkdmv2my5hirkswmci2cch341n6wkkj2q8apjhs83sg6528caxi")))) + "08ghw87d56h1a6y1nnh3x2wy9xj25jqfk5sp6ma9nsyd37babb0h")))) (build-system ocaml-build-system) (native-inputs `(("ocamlbuild" ,ocamlbuild) -- cgit v1.2.3 From f082c78c98d8fee4acd89dd40081c7fd7a081b74 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 19:42:21 +0200 Subject: gnu: ocaml-cppo: Update to 1.6.6. * gnu/packages/ocaml.scm (ocaml-cppo): Update to 1.6.6. [source]: Use git-fetch. --- gnu/packages/ocaml.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3bc28164fc..af10411f88 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2466,15 +2466,16 @@ from the oasis build log (define-public ocaml-cppo (package (name "ocaml-cppo") - (version "1.6.5") + (version "1.6.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mjambon/cppo/archive/v" version - ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/mjambon/cppo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dkm3d5h6h56y937gcdk2wixlpzl59vv5pmiafglr89p20kf7gqf")) - (file-name (string-append name "-" version ".tar.gz")))) + "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs")))) (build-system dune-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From 8cc6a876bd8c0b18bc7849d9398c87e34e9e10c3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 19:51:43 +0200 Subject: gnu: ocaml-migrate-parsetree: Update to 1.4.0. * gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.4.0. (ocaml-ppx-tools-versioned): Update to 5.2.3. [source]: Use git-fetch. (ocaml-bisect-ppx): Fix compilation error. --- gnu/packages/ocaml.scm | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index af10411f88..5921d4ea9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1347,7 +1347,7 @@ following a very simple s-expression syntax.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") - (version "1.2.0") + (version "1.4.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin @@ -1358,7 +1358,7 @@ following a very simple s-expression syntax.") (file-name (git-file-name name version)) (sha256 (base32 - "16kas19iwm4afijv3yxd250s08absabmdcb4yj57wc8r4fmzv5dm")))) + "0sv1p4615l8gpbah4ya2c40yr6fbvahvv3ks7zhrsgcwcq2ljyr2")))) (build-system dune-build-system) (arguments `(#:tests? #f)) @@ -1376,16 +1376,16 @@ functions to the next and/or previous version.") (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned") - (version "5.2.1") + (version "5.2.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ocaml-ppx/" - "ppx_tools_versioned/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml-ppx/ppx_tools_versioned") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1x2xfjpkzbcz4rza1d7gh3ipliw6jqfcklbsln82v3561qgkqgmh")))) + "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y")))) (build-system dune-build-system) (arguments `(#:test-target ".")) @@ -5077,6 +5077,18 @@ combinators.") `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-ounit" ,ocaml-ounit))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-deprecated + (lambda _ + ;; Fixed upstream in 22dd1ad9a0c9629f60599c22d82c6488394d6d32, but + ;; not in a release yet. + (substitute* "src/ppx/instrument.ml" + (("module Ast = Ast_405") + "module Ast = Migrate_parsetree.Ast_405 +module Ast_405 = Ast")) + #t))))) (home-page "https://github.com/aantron/bisect_ppx") (synopsis "Code coverage for OCaml") (description "Bisect_ppx helps you test thoroughly. It is a small -- cgit v1.2.3 From ab68604e5fdbf6e8731cba3049109bd53ba2c440 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 21:12:28 +0200 Subject: gnu: ocaml-qcheck: Update to 0.10. * gnu/packages/ocaml.scm (ocaml-qcheck): Update to 0.10. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5921d4ea9c..6176a3bfed 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1186,7 +1186,7 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.") (define-public ocaml-qcheck (package (name "ocaml-qcheck") - (version "0.9") + (version "0.10") (source (origin (method git-fetch) @@ -1195,7 +1195,7 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0w83v9ylycsssyn47q8wnkfbvhn5vn10z6i35n5965i2m1r0mmcf")))) + (base32 "1i7axg7vmivrkzsahyg79my584myvzxv0922k4000bdwnhzd0kzh")))) (build-system dune-build-system) (arguments `(#:test-target ".")) -- cgit v1.2.3 From 283ed30e1a060df65c386a2ae928a1fe5dffd66f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 21:24:05 +0200 Subject: gnu: dune: Update to 1.11.3. * gnu/packages/ocaml.scm (dune): Update to 1.11.3. [source]: Use git-fetch. --- gnu/packages/ocaml.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6176a3bfed..f6391ada1b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1317,14 +1317,16 @@ coverage information.") (define-public dune (package (name "dune") - (version "1.9.3") + (version "1.11.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ocaml/dune/releases/" - "download/" version "/dune-" version ".tbz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/dune") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jlhnx580v6i1d451z5cl8ibfd0m9qln963y2pp5v6s2winyqyri")))) + "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc -- cgit v1.2.3 From 5ab63bd5833bd0a6fe8397f9523cd0998b4bec71 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 21:28:04 +0200 Subject: gnu: ocaml-odoc: Update to 1.4.1. * gnu/packages/ocaml.scm (ocaml-odoc): Update to 1.4.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f6391ada1b..e360a30961 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5105,7 +5105,7 @@ then run the Bisect_ppx report tool on the generated visitation files.") (define-public ocaml-odoc (package (name "ocaml-odoc") - (version "1.4.0") + (version "1.4.1") (source (origin (method git-fetch) @@ -5115,7 +5115,7 @@ then run the Bisect_ppx report tool on the generated visitation files.") (file-name (git-file-name name version)) (sha256 (base32 - "0br11cw6wa0mwafja4xdb45d2f8908l6nzdq5mw5lbfq2jnp68km")))) + "1i2j0krbzvb1n3dcic9h1pyyqxmf051ky82nrcyzx1nwqjb8zfh6")))) (build-system dune-build-system) (inputs `(("ocaml-alcotest" ,ocaml-alcotest) -- cgit v1.2.3 From d47c8fffd0ad987c6337e6ce37d3b78d1d962bd8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 21:30:59 +0200 Subject: gnu: ocaml-result: Update to 1.4. * gnu/packages/ocaml.scm (ocaml-result): Update to 1.4. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e360a30961..4fce0a7439 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1437,7 +1437,7 @@ powerful.") (define-public ocaml-result (package (name "ocaml-result") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) (uri (git-reference @@ -1446,7 +1446,7 @@ powerful.") (file-name (git-file-name name version)) (sha256 (base32 - "081ayblszn9pj2rqcif40x6cz2zda48vi45gy49rc2qfc4gszry3")))) + "0hir97k9i72nfkm6kncxnqpyk400wlsxysbldgcvk0fd9pjnsc3p")))) (build-system dune-build-system) (arguments `(#:test-target ".")) -- cgit v1.2.3 From 3882f607e8b1b69c03aa0e8f4859b52ec6d154f3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 21:43:41 +0200 Subject: gnu: ocaml-zarith: Update to 1.9.1. * gnu/packages/ocaml.scm (ocaml-zarith): Update to 1.9.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4fce0a7439..0124373afa 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1109,7 +1109,7 @@ files in these formats.") (define-public ocaml-zarith (package (name "ocaml-zarith") - (version "1.7") + (version "1.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1117,7 +1117,7 @@ files in these formats.") (commit (string-append "release-" version)))) (sha256 (base32 - "08x5xnamibhvxl50f1bb3jl9ym0hm6004hmc54xnrnrv7jxz9rvz")))) + "0hv5ywz1q2cgn8apfz490clwk5hcynr937g2v8i13x2ax4bnv0lz")))) (build-system ocaml-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From a468fc5e8ce42b8e2d99b843c9646c084f7a734f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 22:19:20 +0200 Subject: gnu: ocaml-camomile: Update to 1.0.2. * gnu/packages/ocaml.scm (ocaml-camomile): Update to 1.0.2. [arguments]: Fix profile and disable failing tests. --- gnu/packages/ocaml.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0124373afa..1c938beac2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2953,7 +2953,7 @@ the plugins facilitate extensibility, and the frontends serve as entry points.") (define-public ocaml-camomile (package (name "ocaml-camomile") - (version "1.0.1") + (version "1.0.2") (home-page "https://github.com/yoriyuki/Camomile") (source (origin (method url-fetch) @@ -2961,18 +2961,19 @@ the plugins facilitate extensibility, and the frontends serve as entry points.") "/camomile-" version ".tbz")) (sha256 (base32 - "01ssjrqz41jvrqh27jxnh9cx7ywi9b5sgsykd00i7z9nrcwhlfy2")))) + "0chn7ldqb3wyf95yhmsxxq65cif56smgz1mhhc7m0dpwmyq1k97h")))) (build-system dune-build-system) (native-inputs `(("camlp4" ,camlp4))) (arguments - `(#:build-flags (list "--profile" "realease") + `(#:build-flags (list "--profile" "release") #:test-target "camomile-test" + #:tests? #f; Tests fail, see https://github.com/yoriyuki/Camomile/issues/82 #:phases (modify-phases %standard-phases (add-before 'build 'fix-usr-share (lambda* (#:key outputs #:allow-other-keys) - (substitute* '("Camomile/jbuild" "configure.ml") + (substitute* '("Camomile/dune" "configure.ml") (("/usr/share") (string-append (assoc-ref outputs "out") "/share"))) #t))))) (synopsis "Comprehensive Unicode library") -- cgit v1.2.3 From e60330510a0c0b6c080a0878be6aa40644456314 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 22:43:07 +0200 Subject: gnu: Add ocaml-charinfo-width. * gnu/packages/ocaml.scm (ocaml-charinfo-width): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1c938beac2..3f661b74e1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2984,6 +2984,30 @@ library is currently designed for Unicode Standard 3.2.") ;; with an exception for linked libraries to use a different license (license license:lgpl2.0+))) +(define-public ocaml-charinfo-width + (package + (name "ocaml-charinfo-width") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri "https://bitbucket.org/zandoye/charinfo_width/get/1.1.0.tar.gz") + (sha256 + (base32 + "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086")))) + (build-system dune-build-system) + (propagated-inputs + `(("ocaml-result" ,ocaml-result) + ("ocaml-camomile" ,ocaml-camomile))) + (native-inputs + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) + (properties + `((upstream-name . "charInfo_width"))) + (home-page "https://bitbucket.org/zandoye/charinfo_width/") + (synopsis "Determine column width for a character") + (description "This module is implements purely in OCaml a character width +function that follows the prototype of POSIX's wcwidth.") + (license license:expat))) + (define-public ocaml-zed (package (name "ocaml-zed") -- cgit v1.2.3 From a21ea76fbf8cc82653f038ded323fe88d1d785e7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 23:12:43 +0200 Subject: =?UTF-8?q?gnu:=C2=A0Add=20ocaml-stdlib-shims.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-stdlib-shims): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3f661b74e1..d66910cb4a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2383,6 +2383,28 @@ language.") can match the question using a regular expression or a timeout.") (license license:lgpl2.1+))) ; with the OCaml static compilation exception +(define-public ocaml-stdlib-shims + (package + (name "ocaml-stdlib-shims") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/stdlib-shims") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "007dwywsr5285z0np6a9nr0h8iqmyzfrlx6s5xaqcwj69zabsrjm")))) + (build-system dune-build-system) + (home-page "https://github.com/ocaml/stdlib-shims") + (synopsis "OCaml stdlib features backport to older OCaml compilers") + (description "This package backports some of the new stdlib features to +older compilers, such as the Stdlib module. This allows projects that require +compatibility with older compiler to use these new features in their code.") + ;; with ocaml-linking exception + (license license:lgpl2.1+))) + (define-public ocaml-fileutils (package (name "ocaml-fileutils") -- cgit v1.2.3 From 1a0d41b34dd18828d5f38f3d8e31517df6aa0f57 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 23:14:45 +0200 Subject: gnu: ocaml-utop: Update to 2.4.1. * gnu/packages/ocaml.scm (ocaml-utop): Update to 2.4.1. (ocaml-lamdba-term): Update to 2.0.2. (ocaml-zed): Update to 2.0.3. --- gnu/packages/ocaml.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d66910cb4a..32e2a6e69a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3033,7 +3033,7 @@ function that follows the prototype of POSIX's wcwidth.") (define-public ocaml-zed (package (name "ocaml-zed") - (version "1.6") + (version "2.0.3") (source (origin (method git-fetch) @@ -3042,14 +3042,15 @@ function that follows the prototype of POSIX's wcwidth.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v")))) + (base32 "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) (build-system dune-build-system) (arguments `(#:jbuild? #t #:test-target ".")) (propagated-inputs - `(("camomile" ,ocaml-camomile) - ("react" ,ocaml-react))) + `(("ocaml-camomile" ,ocaml-camomile) + ("ocaml-charinfo-width" ,ocaml-charinfo-width) + ("ocaml-react" ,ocaml-react))) (home-page "https://github.com/diml/zed") (synopsis "Abstract engine for text editing in OCaml") (description "Zed is an abstract engine for text edition. It can be used @@ -3060,7 +3061,7 @@ connect an engine to your inputs and rendering functions to get an editor.") (define-public ocaml-lambda-term (package (name "ocaml-lambda-term") - (version "1.13") + (version "2.0.2") (source (origin (method git-fetch) @@ -3069,7 +3070,7 @@ connect an engine to your inputs and rendering functions to get an editor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0wwib20b2ir3h2g9zwhzn04cv160psb805skp8v23wqgyn5cnbh8")))) + (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy")))) (build-system dune-build-system) (arguments `(#:build-flags (list "--profile" "release") @@ -3091,7 +3092,7 @@ instead of bindings to a C library.") (define-public ocaml-utop (package (name "ocaml-utop") - (version "2.3.0") + (version "2.4.1") (source (origin (method git-fetch) @@ -3100,7 +3101,7 @@ instead of bindings to a C library.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0xvibb97vzzh7yabr5ajhilriwz8cg4c506lxq0bd7ss3aci9han")))) + (base32 "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3")))) (build-system dune-build-system) (arguments `(#:jbuild? #t -- cgit v1.2.3 From 1fe01b70112986374ae184610127719154cc67ec Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 3 Sep 2019 23:10:30 +0200 Subject: gnu: ocaml-fileutils: Update to 0.6.0. * gnu/packages/ocaml.scm (ocaml-fileutils): Update to 0.6.0. --- gnu/packages/ocaml.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 32e2a6e69a..52f7a42e93 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2408,17 +2408,38 @@ compatibility with older compiler to use these new features in their code.") (define-public ocaml-fileutils (package (name "ocaml-fileutils") - (version "0.5.3") + (version "0.6.0") (source (origin - (method url-fetch) - (uri (ocaml-forge-uri name version 1728)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gildor478/ocaml-fileutils") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd")))) + "06gxbqfssl16xc8y4d34wpm0mwfr0jgph4lmlwfmgazyggnmvc7m")))) (build-system ocaml-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'set-topfind + (lambda* (#:key inputs #:allow-other-keys) + ;; add the line #directory ".." at the top of each file + ;; using #use "topfind";; to be able to find topfind + (let* ((findlib-path (assoc-ref inputs "findlib")) + (findlib-libdir + (string-append findlib-path "/lib/ocaml/site-lib"))) + (substitute* "setup.ml" + (("#use \"topfind\";;" all) + (string-append "#directory \"" findlib-libdir "\"\n" + all)))) + #t))))) + (propagated-inputs + `(("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) (native-inputs `(("ocamlbuild" ,ocamlbuild) - ("ounit" ,ocaml-ounit))) + ("ocaml-oasis" ,ocaml-oasis) + ("ocaml-ounit" ,ocaml-ounit))) (home-page "http://ocaml-fileutils.forge.ocamlcore.org") (synopsis "Pure OCaml functions to manipulate real file and filename") (description "Library to provide pure OCaml functions to manipulate real -- cgit v1.2.3 From 3c82f1254116be2a9216b7c7e5e8c001ff486270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 4 Sep 2019 12:24:59 +0200 Subject: tests: Adjust '--with-commit' test. This is a followup to 4d04bc50d2df32be326e0f48f378dc581f873989. * tests/guix-build-branch.sh: Expect "v0.1.0" to lead to "guile-gcrypt-0.1.0". --- tests/guix-build-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/guix-build-branch.sh b/tests/guix-build-branch.sh index 3d2a7dddf5..2556a0cdb9 100644 --- a/tests/guix-build-branch.sh +++ b/tests/guix-build-branch.sh @@ -53,7 +53,7 @@ test "$v0_1_0_drv" != "$latest_drv" test "$v0_1_0_drv" != "$orig_drv" v0_1_0_drv="`guix build guix --with-commit=guile-gcrypt=v0.1.0 -d`" -guix gc -R "$v0_1_0_drv" | grep guile-gcrypt-git.v0.1.0 +guix gc -R "$v0_1_0_drv" | grep guile-gcrypt-0.1.0 guix gc -R "$v0_1_0_drv" | grep guile-gcrypt-9e3eacd test "$v0_1_0_drv" != "$latest_drv" test "$v0_1_0_drv" != "$orig_drv" -- cgit v1.2.3 From 91300526b7d9d775bd98a700ed3758420ef9eac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 4 Sep 2019 12:36:34 +0200 Subject: deploy: Add missing store options. * guix/scripts/deploy.scm (%default-options): Add missing options such as 'print-build-trace?', etc. --- guix/scripts/deploy.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 329de41143..cf571756fd 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -66,11 +66,15 @@ Perform the deployment specified by FILE.\n")) %standard-build-options)) (define %default-options - `((substitutes? . #t) - (build-hook? . #t) - (graft? . #t) + ;; Alist of default option values. + `((verbosity . 1) (debug . 0) - (verbosity . 1))) + (graft? . #t) + (substitutes? . #t) + (build-hook? . #t) + (print-build-trace? . #t) + (print-extended-build-trace? . #t) + (multiplexed-build-output? . #t))) (define (load-source-file file) "Load FILE as a user module." -- cgit v1.2.3 From 76073d29e11c71d3678efd44db646852b5502e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Sep 2019 13:24:03 +0200 Subject: Add (guix json). * guix/swh.scm (define-json-reader, define-json-mapping): Move to... * guix/json.scm: ... here. New file. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + guix/json.scm | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ guix/swh.scm | 35 +-------------------------------- 3 files changed, 64 insertions(+), 34 deletions(-) create mode 100644 guix/json.scm diff --git a/Makefile.am b/Makefile.am index fa6bf8fe80..7b96c9473c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ MODULES = \ guix/cpio.scm \ guix/deprecation.scm \ guix/docker.scm \ + guix/json.scm \ guix/records.scm \ guix/pki.scm \ guix/progress.scm \ diff --git a/guix/json.scm b/guix/json.scm new file mode 100644 index 0000000000..20f0bd8f13 --- /dev/null +++ b/guix/json.scm @@ -0,0 +1,62 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018, 2019 Ludovic Courtès +;;; +;;; 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 . + +(define-module (guix json) + #:use-module (json) + #:use-module (srfi srfi-9) + #:export (define-json-mapping)) + +;;; Commentary: +;;; +;;; Helpers to map JSON objects to SRFI-9 records. Taken from (guix swh). +;;; +;;; Code: + +(define-syntax-rule (define-json-reader json->record ctor spec ...) + "Define JSON->RECORD as a procedure that converts a JSON representation, +read from a port, string, or hash table, into a record created by CTOR and +following SPEC, a series of field specifications." + (define (json->record input) + (let ((table (cond ((port? input) + (json->scm input)) + ((string? input) + (json-string->scm input)) + ((or (null? input) (pair? input)) + input)))) + (let-syntax ((extract-field (syntax-rules () + ((_ table (field key json->value)) + (json->value (assoc-ref table key))) + ((_ table (field key)) + (assoc-ref table key)) + ((_ table (field)) + (assoc-ref table + (symbol->string 'field)))))) + (ctor (extract-field table spec) ...))))) + +(define-syntax-rule (define-json-mapping rtd ctor pred json->record + (field getter spec ...) ...) + "Define RTD as a record type with the given FIELDs and GETTERs, à la SRFI-9, +and define JSON->RECORD as a conversion from JSON to a record of this type." + (begin + (define-record-type rtd + (ctor field ...) + pred + (field getter) ...) + + (define-json-reader json->record ctor + (field spec ...) ...))) diff --git a/guix/swh.scm b/guix/swh.scm index 01648a1ebe..7acad05928 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -21,6 +21,7 @@ #:use-module (guix build utils) #:use-module ((guix build syscalls) #:select (mkdtemp!)) #:use-module (web uri) + #:use-module (guix json) #:use-module (web client) #:use-module (web response) #:use-module (json) @@ -135,40 +136,6 @@ url (string-append url "/"))) -(define-syntax-rule (define-json-reader json->record ctor spec ...) - "Define JSON->RECORD as a procedure that converts a JSON representation, -read from a port, string, or hash table, into a record created by CTOR and -following SPEC, a series of field specifications." - (define (json->record input) - (let ((table (cond ((port? input) - (json->scm input)) - ((string? input) - (json-string->scm input)) - ((or (null? input) (pair? input)) - input)))) - (let-syntax ((extract-field (syntax-rules () - ((_ table (field key json->value)) - (json->value (assoc-ref table key))) - ((_ table (field key)) - (assoc-ref table key)) - ((_ table (field)) - (assoc-ref table - (symbol->string 'field)))))) - (ctor (extract-field table spec) ...))))) - -(define-syntax-rule (define-json-mapping rtd ctor pred json->record - (field getter spec ...) ...) - "Define RTD as a record type with the given FIELDs and GETTERs, à la SRFI-9, -and define JSON->RECORD as a conversion from JSON to a record of this type." - (begin - (define-record-type rtd - (ctor field ...) - pred - (field getter) ...) - - (define-json-reader json->record ctor - (field spec ...) ...))) - (define %date-regexp ;; Match strings like "2014-11-17T22:09:38+01:00" or ;; "2018-09-30T23:20:07.815449+00:00"". -- cgit v1.2.3 From a85a74ce6c9ff36ccd6ef50216ba8515723f3a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Sep 2019 14:58:40 +0200 Subject: ci: Use (guix json) and adjust for Guile-JSON 3.x. This is in part a followup to 81c3dc32244a17241d74eea9fa265edfcb326f6d. * guix/ci.scm (, , ): Define using 'define-json-mapping'. (json->build, json->checkout, json->evaluation): Remove. (queued-builds, latest-builds, latest-evaluations): Pass JSON arrays through 'vector->list' to adjust for Guile-JSON 3.x. (evaluations-for-commit): Fix typo to really export. --- guix/ci.scm | 68 ++++++++++++++++++++++++------------------------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/guix/ci.scm b/guix/ci.scm index 1727297dd7..9e21996023 100644 --- a/guix/ci.scm +++ b/guix/ci.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,9 +18,10 @@ (define-module (guix ci) #:use-module (guix http-client) - #:autoload (json parser) (json->scm) + #:use-module (guix json) + #:use-module (json) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-9) + #:use-module (ice-9 match) #:export (build? build-id build-derivation @@ -42,7 +43,7 @@ queued-builds latest-builds latest-evaluations - evaluation-for-commit)) + evaluations-for-commit)) ;;; Commentary: ;;; @@ -51,28 +52,31 @@ ;;; ;;; Code: -(define-record-type - (make-build id derivation system status timestamp) - build? - (id build-id) ;integer +(define-json-mapping make-build build? + json->build + (id build-id "id") ;integer (derivation build-derivation) ;string | #f (system build-system) ;string - (status build-status) ;integer + (status build-status "buildstatus" ) ;integer (timestamp build-timestamp)) ;integer -(define-record-type - (make-checkout commit input) - checkout? +(define-json-mapping make-checkout checkout? + json->checkout (commit checkout-commit) ;string (SHA1) (input checkout-input)) ;string (name) -(define-record-type - (make-evaluation id spec complete? checkouts) - evaluation? +(define-json-mapping make-evaluation evaluation? + json->evaluation (id evaluation-id) ;integer (spec evaluation-spec) ;string - (complete? evaluation-complete?) ;Boolean - (checkouts evaluation-checkouts)) ;* + (complete? evaluation-complete? "in-progress" + (match-lambda + (0 #t) + (_ #f))) ;Boolean + (checkouts evaluation-checkouts "checkouts" ;* + (lambda (checkouts) + (map json->checkout + (vector->list checkouts))))) (define %query-limit ;; Max number of builds requested in queries. @@ -84,18 +88,11 @@ (close-port port) json)) -(define (json->build json) - (make-build (hash-ref json "id") - (hash-ref json "derivation") - (hash-ref json "system") - (hash-ref json "buildstatus") - (hash-ref json "timestamp"))) - (define* (queued-builds url #:optional (limit %query-limit)) "Return the list of queued derivations on URL." (let ((queue (json-fetch (string-append url "/api/queue?nr=" (number->string limit))))) - (map json->build queue))) + (map json->build (vector->list queue)))) (define* (latest-builds url #:optional (limit %query-limit) #:key evaluation system) @@ -114,26 +111,15 @@ string such as \"x86_64-linux\"), restrict to builds for SYSTEM." (option "system" system))))) ;; Note: Hydra does not provide a "derivation" field for entries in ;; 'latestbuilds', but Cuirass does. - (map json->build latest))) - -(define (json->checkout json) - (make-checkout (hash-ref json "commit") - (hash-ref json "input"))) - -(define (json->evaluation json) - (make-evaluation (hash-ref json "id") - (hash-ref json "specification") - (case (hash-ref json "in-progress") - ((0) #t) - (else #f)) - (map json->checkout (hash-ref json "checkouts")))) + (map json->build (vector->list latest)))) (define* (latest-evaluations url #:optional (limit %query-limit)) "Return the latest evaluations performed by the CI server at URL." (map json->evaluation - (json->scm - (http-fetch (string-append url "/api/evaluations?nr=" - (number->string limit)))))) + (vector->list + (json->scm + (http-fetch (string-append url "/api/evaluations?nr=" + (number->string limit))))))) (define* (evaluations-for-commit url commit #:optional (limit %query-limit)) -- cgit v1.2.3 From 2791870d09afd247a011bc8cb6cf88661729bd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Sep 2019 16:20:36 +0200 Subject: import: crate: Separate crates.io API from actual conversion. This provides a clean separation between bindings to the https://crates.io/api/v1 API and actual conversion to Guix package sexps. As a side-effect, it fixes things like "guix import blake2-rfc", "guix refresh -t crates", etc. * guix/import/crate.scm (, , ): New record types. (lookup-crate, crate-version-dependencies): New procedures. (crate-fetch): Remove. (crate->guix-package): Rewrite to use the new API. (latest-release): Likewise. * guix/build-system/cargo.scm (%crate-base-url): New variable. * tests/crate.scm (test-crate): Update accordingly. fixlet --- guix/build-system/cargo.scm | 11 +++- guix/import/crate.scm | 153 ++++++++++++++++++++++++++++++++------------ tests/crate.scm | 13 +++- 3 files changed, 131 insertions(+), 46 deletions(-) diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 10a1bac844..1e8b3a578e 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2019 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 David Craven @@ -35,12 +35,17 @@ #:export (%cargo-build-system-modules %cargo-utils-modules cargo-build-system + %crate-base-url crate-url crate-url? crate-uri)) -(define crate-url "https://crates.io/api/v1/crates/") -(define crate-url? (cut string-prefix? crate-url <>)) +(define %crate-base-url + (make-parameter "https://crates.io")) +(define crate-url + (string-append (%crate-base-url) "/api/v1/crates/")) +(define crate-url? + (cut string-prefix? crate-url <>)) (define (crate-uri name version) "Return a URI string for the crate package hosted at crates.io corresponding diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 52c5cb1c30..b674323177 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module ((guix download) #:prefix download:) #:use-module (gcrypt hash) #:use-module (guix http-client) + #:use-module (guix json) #:use-module (guix import json) #:use-module (guix import utils) #:use-module ((guix licenses) #:prefix license:) @@ -30,7 +32,6 @@ #:use-module (guix upstream) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module (ice-9 pretty-print) ; recursive #:use-module (json) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) @@ -39,46 +40,82 @@ guix-package->crate-name %crate-updater)) -(define (crate-fetch crate-name callback) - "Fetch the metadata for CRATE-NAME from crates.io and call the callback." + +;;; +;;; Interface to https://crates.io/api/v1. +;;; - (define (crates->inputs crates) - (sort (map (cut assoc-ref <> "crate_id") crates) string-ci below. +(define-json-mapping make-crate crate? + json->crate + (name crate-name) ;string + (latest-version crate-latest-version "max_version") ;string + (home-page crate-home-page "homepage") ;string | #nil + (repository crate-repository) ;string + (description crate-description) ;string + (keywords crate-keywords ;list of strings + "keywords" vector->list) + (categories crate-categories ;list of strings + "categories" vector->list) + (versions crate-versions "actual_versions" ;list of + (lambda (vector) + (map json->crate-version + (vector->list vector)))) + (links crate-links)) ;alist - (define (string->license string) - (map spdx-string->license (string-split string #\/))) +;; Crate version. +(define-json-mapping make-crate-version crate-version? + json->crate-version + (id crate-version-id) ;integer + (number crate-version-number "num") ;string + (download-path crate-version-download-path "dl_path") ;string + (readme-path crate-version-readme-path "readme_path") ;string + (license crate-version-license "license") ;string + (links crate-version-links)) ;alist + +;; Crate dependency. Each dependency (each edge in the graph) is annotated as +;; being a "normal" dependency or a development dependency. There also +;; information about the minimum required version, such as "^0.0.41". +(define-json-mapping make-crate-dependency + crate-dependency? + json->crate-dependency + (id crate-dependency-id "crate_id") ;string + (kind crate-dependency-kind "kind" ;'normal | 'dev + string->symbol) + (requirement crate-dependency-requirement "req")) ;string + +(define (lookup-crate name) + "Look up NAME on https://crates.io and return the corresopnding +record or #f if it was not found." + (let ((json (json-fetch (string-append (%crate-base-url) "/api/v1/crates/" + name)))) + (and=> (and json (assoc-ref json "crate")) + (lambda (alist) + ;; The "versions" field of ALIST is simply a list of version IDs + ;; (integers). Here, we squeeze in the actual version + ;; dictionaries that are not part of ALIST but are just more + ;; convenient handled this way. + (let ((versions (or (assoc-ref json "versions") '#()))) + (json->crate `(,@alist + ("actual_versions" . ,versions)))))))) + +(define (crate-version-dependencies version) + "Return the list of records of VERSION, a +." + (let* ((path (assoc-ref (crate-version-links version) "dependencies")) + (url (string-append (%crate-base-url) path))) + (match (assoc-ref (or (json-fetch url) '()) "dependencies") + ((? vector? vector) + (map json->crate-dependency (vector->list vector))) + (_ + '())))) - (define (crate-kind-predicate kind) - (lambda (dep) (string=? (assoc-ref dep "kind") kind))) - - (and-let* ((crate-json (json-fetch (string-append crate-url crate-name))) - (crate (assoc-ref crate-json "crate")) - (name (assoc-ref crate "name")) - (version (assoc-ref crate "max_version")) - (homepage (assoc-ref crate "homepage")) - (repository (assoc-ref crate "repository")) - (synopsis (assoc-ref crate "description")) - (description (assoc-ref crate "description")) - (license (or (and=> (assoc-ref crate "license") - string->license) - '())) ;missing license info - (path (string-append "/" version "/dependencies")) - (deps-json (json-fetch (string-append crate-url name path))) - (deps (vector->list (assoc-ref deps-json "dependencies"))) - (dep-crates (filter (crate-kind-predicate "normal") deps)) - (dev-dep-crates - (filter (lambda (dep) - (not ((crate-kind-predicate "normal") dep))) deps)) - (cargo-inputs (crates->inputs dep-crates)) - (cargo-development-inputs (crates->inputs dev-dep-crates)) - (home-page (match homepage - (() repository) - (_ homepage)))) - (callback #:name name #:version version - #:cargo-inputs cargo-inputs - #:cargo-development-inputs cargo-development-inputs - #:home-page home-page #:synopsis synopsis - #:description description #:license license))) + +;;; +;;; Converting crates to Guix packages. +;;; (define (maybe-cargo-inputs package-names) (match (package-names->package-inputs package-names) @@ -141,7 +178,38 @@ and LICENSE." (define (crate->guix-package crate-name) "Fetch the metadata for CRATE-NAME from crates.io, and return the `package' s-expression corresponding to that package, or #f on failure." - (crate-fetch crate-name make-crate-sexp)) + (define (string->license string) + (map spdx-string->license (string-split string #\/))) + + (define (normal-dependency? dependency) + (eq? (crate-dependency-kind dependency) 'normal)) + + (define crate + (lookup-crate crate-name)) + + (and crate + (let* ((version (find (lambda (version) + (string=? (crate-version-number version) + (crate-latest-version crate))) + (crate-versions crate))) + (dependencies (crate-version-dependencies version)) + (dep-crates (filter normal-dependency? dependencies)) + (dev-dep-crates (remove normal-dependency? dependencies)) + (cargo-inputs (sort (map crate-dependency-id dep-crates) + string-ci (crate-version-license version) + string->license))))) (define (guix-package->crate-name package) "Return the crate name of PACKAGE." @@ -157,6 +225,7 @@ and LICENSE." (define (crate-name->package-name name) (string-append "rust-" (string-join (string-split name #\_) "-"))) + ;;; ;;; Updater ;;; @@ -175,9 +244,9 @@ and LICENSE." (define (latest-release package) "Return an for the latest release of PACKAGE." (let* ((crate-name (guix-package->crate-name package)) - (callback (lambda* (#:key version #:allow-other-keys) version)) - (version (crate-fetch crate-name callback)) - (url (crate-uri crate-name version))) + (crate (lookup-crate crate-name)) + (version (crate-latest-version crate)) + (url (crate-uri crate-name version))) (upstream-source (package (package-name package)) (version version) diff --git a/tests/crate.scm b/tests/crate.scm index 72c3a13350..8a232ba06c 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson ;;; Copyright © 2016 David Craven +;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,10 +33,20 @@ \"crate\": { \"max_version\": \"1.0.0\", \"name\": \"foo\", - \"license\": \"MIT/Apache-2.0\", \"description\": \"summary\", \"homepage\": \"http://example.com\", \"repository\": \"http://example.com\", + \"keywords\": [\"dummy\" \"test\"], + \"categories\": [\"test\"] + \"actual_versions\": [ + { \"id\": \"foo\", + \"num\": \"1.0.0\", + \"license\": \"MIT/Apache-2.0\", + \"links\": { + \"dependencies\": \"/api/v1/crates/foo/1.0.0/dependencies\" + } + } + ] } }") -- cgit v1.2.3 From 191668bc9759dc87a27b5f4d55d214cc655f197f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Sep 2019 16:32:11 +0200 Subject: import: crate: Correct interpretation of dual-licensing strings. * guix/import/crate.scm (%dual-license-rx): New variable. (crate->guix-package)[string->license]: Rewrite to match it. * tests/crate.scm (test-crate): Adjust "license" field to current practice. --- guix/import/crate.scm | 11 ++++++++++- tests/crate.scm | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index b674323177..f6057dbf8b 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -32,6 +32,7 @@ #:use-module (guix upstream) #:use-module (guix utils) #:use-module (ice-9 match) + #:use-module (ice-9 regex) #:use-module (json) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) @@ -175,11 +176,19 @@ and LICENSE." (close-port port) pkg)) +(define %dual-license-rx + ;; Dual licensing is represented by a string such as "MIT OR Apache-2.0". + ;; This regexp matches that. + (make-regexp "^(.*) OR (.*)$")) + (define (crate->guix-package crate-name) "Fetch the metadata for CRATE-NAME from crates.io, and return the `package' s-expression corresponding to that package, or #f on failure." (define (string->license string) - (map spdx-string->license (string-split string #\/))) + (match (regexp-exec %dual-license-rx string) + (#f (list (spdx-string->license string))) + (m (list (spdx-string->license (match:substring m 1)) + (spdx-string->license (match:substring m 2)))))) (define (normal-dependency? dependency) (eq? (crate-dependency-kind dependency) 'normal)) diff --git a/tests/crate.scm b/tests/crate.scm index 8a232ba06c..c14862ad9f 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -41,7 +41,7 @@ \"actual_versions\": [ { \"id\": \"foo\", \"num\": \"1.0.0\", - \"license\": \"MIT/Apache-2.0\", + \"license\": \"MIT OR Apache-2.0\", \"links\": { \"dependencies\": \"/api/v1/crates/foo/1.0.0/dependencies\" } -- cgit v1.2.3 From f1371daa97a521d0e995599cf94fa2516c6784c9 Mon Sep 17 00:00:00 2001 From: "Jovany Leandro G.C" Date: Sun, 1 Sep 2019 05:52:09 -0500 Subject: gnu: twinkle: update to 1.10.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/telephony.scm (twinkle): update to 1.10.2 * gnu/packages/patches/twinkle-include-qregexpvalidator.patch: Delete it. * gnu/local.mk (dist_patch_DATA): Remove patch. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 1 - .../patches/twinkle-include-qregexpvalidator.patch | 123 --------------------- gnu/packages/telephony.scm | 80 +++++++------- 3 files changed, 38 insertions(+), 166 deletions(-) delete mode 100755 gnu/packages/patches/twinkle-include-qregexpvalidator.patch diff --git a/gnu/local.mk b/gnu/local.mk index dbae857c38..b7a5ef825b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1362,7 +1362,6 @@ dist_patch_DATA = \ %D%/packages/patches/totem-meson-compat.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ - %D%/packages/patches/twinkle-include-qregexpvalidator.patch \ %D%/packages/patches/txr-shell.patch \ %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ diff --git a/gnu/packages/patches/twinkle-include-qregexpvalidator.patch b/gnu/packages/patches/twinkle-include-qregexpvalidator.patch deleted file mode 100755 index 4096cc8712..0000000000 --- a/gnu/packages/patches/twinkle-include-qregexpvalidator.patch +++ /dev/null @@ -1,123 +0,0 @@ -Copied from upstream: - -https://github.com/LubosD/twinkle/commit/4b42755619011c117a76bdf98e417ebedc47e319 - -From 4b42755619011c117a76bdf98e417ebedc47e319 Mon Sep 17 00:00:00 2001 -From: Michal Kubecek -Date: Wed, 6 Jun 2018 10:07:21 +0200 -Subject: [PATCH] Include explicitly - -Since Qt 5.11, generated ui_getprofilename.h no longer includes QHeaderView -which breaks the chain that included qvalidator.h in getprofilename.cpp. -As it feels rather fragile to rely on such indirect includes, let's include - explicitly in each file using QRegExpValidator class. ---- - src/gui/diamondcardprofileform.cpp | 1 + - src/gui/getprofilenameform.cpp | 2 +- - src/gui/inviteform.cpp | 1 + - src/gui/mphoneform.cpp | 1 + - src/gui/numberconversionform.cpp | 1 + - src/gui/syssettingsform.cpp | 1 + - src/gui/userprofileform.cpp | 1 + - src/gui/wizardform.cpp | 1 + - 8 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/gui/diamondcardprofileform.cpp b/src/gui/diamondcardprofileform.cpp -index 6656909..517180b 100644 ---- a/src/gui/diamondcardprofileform.cpp -+++ b/src/gui/diamondcardprofileform.cpp -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include "gui.h" - #include "diamondcard.h" - #include "getprofilenameform.h" -diff --git a/src/gui/getprofilenameform.cpp b/src/gui/getprofilenameform.cpp -index 1319e1d..89c715e 100644 ---- a/src/gui/getprofilenameform.cpp -+++ b/src/gui/getprofilenameform.cpp -@@ -1,7 +1,7 @@ - #include "getprofilenameform.h" -- - #include - #include -+#include - #include "user.h" - #include "protocol.h" - -diff --git a/src/gui/inviteform.cpp b/src/gui/inviteform.cpp -index 433fb22..2a5b68d 100644 ---- a/src/gui/inviteform.cpp -+++ b/src/gui/inviteform.cpp -@@ -7,6 +7,7 @@ - #include "sys_settings.h" - #include - #include -+#include - - /* - Copyright (C) 2005-2009 Michel de Boer -diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp -index 260fda7..c4e3c1d 100644 ---- a/src/gui/mphoneform.cpp -+++ b/src/gui/mphoneform.cpp -@@ -54,6 +54,7 @@ - #include - #include - #include -+#include - #include "buddyform.h" - #include "diamondcardprofileform.h" - #include "osd.h" -diff --git a/src/gui/numberconversionform.cpp b/src/gui/numberconversionform.cpp -index f8ae64c..8481a9b 100644 ---- a/src/gui/numberconversionform.cpp -+++ b/src/gui/numberconversionform.cpp -@@ -1,5 +1,6 @@ - #include "numberconversionform.h" - -+#include - #include "gui.h" - - /* -diff --git a/src/gui/syssettingsform.cpp b/src/gui/syssettingsform.cpp -index 216af54..355df59 100644 ---- a/src/gui/syssettingsform.cpp -+++ b/src/gui/syssettingsform.cpp -@@ -28,6 +28,7 @@ - #include "twinkle_config.h" - #include - #include -+#include - #include "syssettingsform.h" - /* - * Constructs a SysSettingsForm as a child of 'parent', with the -diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp -index 28700a6..9ed9209 100644 ---- a/src/gui/userprofileform.cpp -+++ b/src/gui/userprofileform.cpp -@@ -31,6 +31,7 @@ - #include - #include "twinkle_config.h" - #include -+#include - #include "numberconversionform.h" - #include "util.h" - #include "userprofileform.h" -diff --git a/src/gui/wizardform.cpp b/src/gui/wizardform.cpp -index 777aa12..f925875 100644 ---- a/src/gui/wizardform.cpp -+++ b/src/gui/wizardform.cpp -@@ -23,6 +23,7 @@ - #include - #include "gui.h" - #include -+#include - #include "wizardform.h" - - #define PROV_NONE QT_TRANSLATE_NOOP("WizardForm", "None (direct IP to IP calls)") --- -2.17.0 - diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index cf37756503..41896f2eb6 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -491,28 +491,24 @@ Mumble consists of two applications for separate usage: license:bsd-2)))) (define-public twinkle - (let ((commit "02e1d1538af3337134bd7381dcd95f8d7775b30f") - (revision "1")) (package - (name "twinkle") - (version (git-version "1.10.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/LubosD/twinkle") - (commit commit))) - (patches - (search-patches "twinkle-include-qregexpvalidator.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ds4rp4vr1wagn4m4m7ldqbsx5vgmgbfcqqgyhn1wf6s1dm0020z")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no test target - #:configure-flags '("-DWITH_SPEEX=On") - #:phases - (modify-phases %standard-phases + (name "twinkle") + (version "1.10.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LubosD/twinkle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s0gi03xwvzp02ah4q6j33r9jx9nbayr6dxlg2ck9pwbay1nq1hx")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no test target + #:configure-flags '("-DWITH_SPEEX=On") + #:phases + (modify-phases %standard-phases (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -528,30 +524,30 @@ Mumble consists of two applications for separate usage: "/lib/qt5/qml")) '("qtdeclarative" "qtquickcontrols")))) #t)))))) - (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ("readline" ,readline) - ("file" ,file) - ("ucommon" ,ucommon) - ("ccrtp" ,ccrtp) - ("libxml2" ,libxml2) - ("speex" ,speex) - ("speexdsp" ,speexdsp) - ("libsndfile" ,libsndfile) - ("alsa-lib" ,alsa-lib) - ("qttools" ,qttools))) - (inputs - `(("qtbase" ,qtbase) - ("qtdeclarative" ,qtdeclarative) - ("qtquickcontrols" ,qtquickcontrols))) - (home-page "http://twinkle.dolezel.info/") - (synopsis "Softphone for voice over IP and instant messaging") - (description "Twinkle is a softphone for your voice over IP and instant + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("readline" ,readline) + ("file" ,file) + ("ucommon" ,ucommon) + ("ccrtp" ,ccrtp) + ("libxml2" ,libxml2) + ("speex" ,speex) + ("speexdsp" ,speexdsp) + ("libsndfile" ,libsndfile) + ("alsa-lib" ,alsa-lib) + ("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtquickcontrols" ,qtquickcontrols))) + (home-page "http://twinkle.dolezel.info/") + (synopsis "Softphone for voice over IP and instant messaging") + (description "Twinkle is a softphone for your voice over IP and instant messaging communcations using the SIP protocol. You can use it for direct IP phone to IP phone communication or in a network using a SIP proxy to route your calls and messages") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public pjproject (package -- cgit v1.2.3 From beb0b947c1eb7a4ccef0f229e3b613d5e3b67c00 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 4 Sep 2019 13:15:34 +0200 Subject: gnu: kitty: Update to 0.14.4. * gnu/packages/terminals.scm (kitty): Update to 0.14.4. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index bca8b14dad..f0117eead3 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -955,7 +955,7 @@ tmux.") (define-public kitty (package (name "kitty") - (version "0.14.3") + (version "0.14.4") (home-page "https://sw.kovidgoyal.net/kitty/") (source (origin @@ -966,7 +966,7 @@ tmux.") (file-name (git-file-name name version)) (sha256 (base32 - "0wi6b6b1nyp16rcpcghk6by62wy6qsamv1xdymyn0zbqgd8h9n6b")) + "0z0y80wcbra3zfyaiim98afbqlfpkjkql430zfb8shx61rzzmn9i")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From c959d99fd09d588e8311926d39bce6cbb284cd8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 13:25:08 +0200 Subject: gnu: hdf4: Update to 4.2.14. * gnu/packages/maths.scm (hdf4): Update to 4.2.14. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c9db51b561..c81e999daa 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -675,14 +675,14 @@ computations.") (define-public hdf4 (package (name "hdf4") - (version "4.2.13") + (version "4.2.14") (source (origin (method url-fetch) (uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF" version "/src/hdf-" version ".tar.bz2")) (sha256 - (base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm")) + (base32 "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l")) (patches (search-patches "hdf4-architectures.patch" "hdf4-reproducibility.patch" "hdf4-shared-fortran.patch")))) -- cgit v1.2.3 From 5ee1c0459eebdd3b7771abaeab0f0b52ff86fdd5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Sep 2019 17:12:54 +0200 Subject: gnu: ungoogled-chromium: Allow microphone access. Fixes . * gnu/packages/aux-files/chromium/master-preferences.json: Remove "audio_capture_enabled" flag. --- gnu/packages/aux-files/chromium/master-preferences.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/aux-files/chromium/master-preferences.json b/gnu/packages/aux-files/chromium/master-preferences.json index 5a2049fa72..df68804d5a 100644 --- a/gnu/packages/aux-files/chromium/master-preferences.json +++ b/gnu/packages/aux-files/chromium/master-preferences.json @@ -17,9 +17,6 @@ "alternate_error_pages": { "enabled": false }, - "hardware": { - "audio_capture_enabled": false - }, "default_apps": "noinstall", "hide_web_store_icon": true, "homepage": "https://www.gnu.org/software/guix/" -- cgit v1.2.3 From 328a4c5bf1bc6f99515b18900811f724631bf91c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 18 Aug 2019 14:14:18 +0200 Subject: linux-initrd: Use native gzip. * gnu/system/linux-initrd.scm (expression->initrd): Pass native gzip to build-initrd procedure. --- gnu/system/linux-initrd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 7e9563b923..0efb8fb222 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -99,7 +99,7 @@ the derivations referenced by EXP are automatically copied to the initrd." #:init #$init ;; Copy everything INIT refers to into the initrd. #:references-graphs '("closure") - #:gzip (string-append #$gzip "/bin/gzip"))))) + #:gzip (string-append #+gzip "/bin/gzip"))))) (file-append (computed-file name builder #:options -- cgit v1.2.3 From e94b95473ea5dadea76be9763b7f8b34d400e863 Mon Sep 17 00:00:00 2001 From: Pierre-Moana Levesque Date: Thu, 8 Aug 2019 17:20:55 +0200 Subject: gnu: guile-wm: Fix cross-compilation. * gnu/packages/guile-wm.scm (guile-wm): Add guile and guile-xcb to native-inputs. --- gnu/packages/guile-wm.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 2955c06a0d..622fc560d9 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -172,7 +172,9 @@ dependencies.") Type=Application~%" ,name ,synopsis %output)))) #t))))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("guile" ,guile-2.2) + ("guile-xcb" ,guile-xcb) + ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2) ("guile-xcb" ,guile-xcb))) -- cgit v1.2.3 From 58a75996ecdd09431f943c4d55b199b8aceea72d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 4 Jul 2019 17:39:54 +0200 Subject: gnu: glibc-utf8-locales: Fix cross-compilation. * gnu/packages/base.scm (glibc-utf8-locales)[inputs]: Move to ... [native-inputs]: ... here, in order to fix cross-compilation. * gnu/packages/commencement.scm (glibc-utf8-locales-final)[inputs]: Move to ... [native-inputs]: ... here, in order to fix cross-compilation. --- gnu/packages/base.scm | 4 ++-- gnu/packages/commencement.scm | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d984ebe1eb..035551e454 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1143,8 +1143,8 @@ to the @code{share/locale} sub-directory of this package.") ;; tests---e.g., in Guile's i18n tests. '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) #t)))) - (inputs `(("glibc" ,glibc) - ("gzip" ,gzip))) + (native-inputs `(("glibc" ,glibc) + ("gzip" ,gzip))) (synopsis "Small sample of UTF-8 locales") (description "This package provides a small sample of UTF-8 locales mostly useful in diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 4a41e2abf3..f00cfa7bd8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -882,11 +882,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; function.) (package (inherit glibc-utf8-locales) - (inputs `(("glibc" ,glibc-final) - ("gzip" - ,(package-with-explicit-inputs gzip %boot4-inputs - (current-source-location) - #:guile %bootstrap-guile)))))) + (native-inputs + `(("glibc" ,glibc-final) + ("gzip" + ,(package-with-explicit-inputs gzip %boot4-inputs + (current-source-location) + #:guile %bootstrap-guile)))))) (define-public ld-wrapper ;; The final 'ld' wrapper, which uses the final Guile and Binutils. -- cgit v1.2.3 From 7c35342472338ae00141f2bcb64ec7073eb2be21 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 18 Aug 2019 13:02:21 +0200 Subject: gnu: grub: Fix cross-compilation. * gnu/packages/bootloaders.scm (grub)[arguments]: Search for unifont in both native-inputs and inputs. --- gnu/packages/bootloaders.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 41a2de9706..b235e1bc78 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -99,7 +99,7 @@ (list "PYTHON=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* "grub-core/Makefile.in" (("/bin/sh") (which "sh"))) @@ -114,7 +114,9 @@ "/sbin/mdadm\""))) ;; Make the font visible. - (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") + (copy-file (assoc-ref (or native-inputs inputs) + "unifont") + "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz") ;; Give the absolute file name of 'ckbcomp'. -- cgit v1.2.3 From 6202bb33eb9751778c7342f7673c64bfea7a1103 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 20 Aug 2019 16:55:34 +0200 Subject: gnu: linux-libre: Enable built-in ext4 support. When running qemu-img from (gnu system vm) with an aarch64 kernel, mounting ext4 partitions fails because no modprobe of ext4 module is made. Like for other kernel configs, provide built-in support for ext4 partitions. * gnu/packages/aux-files/linux-libre/5.2-arm64.conf: Enable built-in ext4, like in intel and armhf configs. --- gnu/packages/aux-files/linux-libre/5.2-arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf index bfd8c18ddb..4ad652a78f 100644 --- a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf @@ -8023,7 +8023,7 @@ CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=m +CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y -- cgit v1.2.3 From 6ef379f879a1d098ec55a9ca294e808e24291daf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 4 Sep 2019 18:21:19 +0200 Subject: gnu: make-linux-libre: Fix cross-compilation. * gnu/packages/linux.scm (make-linux-libre)[arguments]: Unset CROSS_CPATH to make sure that cross-libc is not found. Otherwise, some of its header would conflict with the one from linux (stdint.h and linux/types.h). --- gnu/packages/linux.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7794debaab..890548e51b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -669,6 +669,12 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) + ;; Unset CROSS_CPATH to make sure that cross-libc is not + ;; found. Otherwise, some of its header would conflict with the + ;; one from linux (stdint.h and linux/types.h) + ,@(if (%current-target-system) + '((unsetenv "CROSS_CPATH")) + '()) ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH")) -- cgit v1.2.3 From 210b6412eeb915bba0848c1a947a24bfc51b9efc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 4 Sep 2019 18:25:17 +0200 Subject: gnu: texinfo: Fix cross-compilation. * gnu/packages/texinfo.scm (texinfo)[arguments]: Do not reset environment before running configure with the native compiler, in a cross-compilation context, [inputs]: move perl from here ... [native-inputs]: ... to here. Also add ncurses that is needed in a cross-compilation context to build texinfo native tools. --- gnu/packages/texinfo.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index fa98bd56b8..c661dc23ae 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -42,8 +42,28 @@ (base32 "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses) - ("perl" ,perl))) + (arguments + ;; When cross-compiling, the package is configured twice: once with the + ;; native compiler and once with the cross-compiler. During the configure + ;; with the native compiler, the environment is reset. This leads to + ;; multiple environment variables missing. Do not reset the environment + ;; to prevent that. + (if (%current-target-system) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-cross-configure + (lambda _ + (substitute* "configure" + (("env -i") + "env ")) + #t)))) + '())) + (inputs `(("ncurses" ,ncurses))) + ;; When cross-compiling, texinfo will build some of its own binaries with + ;; the native compiler. This means ncurses is needed both in both inputs + ;; and native-inputs. + (native-inputs `(("perl" ,perl) + ("ncurses" ,ncurses))) (native-search-paths ;; This is the variable used by the standalone Info reader. -- cgit v1.2.3 From 7c93edb93eb5700e1fd3a949195b4edebf6fdf2c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 4 Sep 2019 21:52:26 +0530 Subject: gnu: librepcb: Update to 0.1.2. * gnu/packages/engineering.scm (librepcb): Update to 0.1.2. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 54bf5a7b69..7f5409c835 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1941,7 +1941,7 @@ simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") (define-public librepcb (package (name "librepcb") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) @@ -1949,7 +1949,7 @@ simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") version "/librepcb-" version "-source.zip")) (sha256 (base32 - "08lm95kr5gqyqyy4hcii0micqa6ryhbv0harvdndmpvi4ix1ggi8")))) + "1xgk0r3nxdd2cy7d1k165d005gsngnz1v2wbwivacw7gis0i8ip7")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 4ab97ef18fa9923f00865c2d3f79bead247aa5e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 19:18:10 +0200 Subject: Revert "gnu: texinfo: Fix cross-compilation." This causes too many rebuilds for the master branch. This reverts commit 210b6412eeb915bba0848c1a947a24bfc51b9efc. --- gnu/packages/texinfo.scm | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index c661dc23ae..fa98bd56b8 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -42,28 +42,8 @@ (base32 "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp")))) (build-system gnu-build-system) - (arguments - ;; When cross-compiling, the package is configured twice: once with the - ;; native compiler and once with the cross-compiler. During the configure - ;; with the native compiler, the environment is reset. This leads to - ;; multiple environment variables missing. Do not reset the environment - ;; to prevent that. - (if (%current-target-system) - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-cross-configure - (lambda _ - (substitute* "configure" - (("env -i") - "env ")) - #t)))) - '())) - (inputs `(("ncurses" ,ncurses))) - ;; When cross-compiling, texinfo will build some of its own binaries with - ;; the native compiler. This means ncurses is needed both in both inputs - ;; and native-inputs. - (native-inputs `(("perl" ,perl) - ("ncurses" ,ncurses))) + (inputs `(("ncurses" ,ncurses) + ("perl" ,perl))) (native-search-paths ;; This is the variable used by the standalone Info reader. -- cgit v1.2.3 From a44a535ebecd40c52514623a44d31d927ecca9da Mon Sep 17 00:00:00 2001 From: nixo Date: Mon, 29 Jul 2019 18:45:26 +0200 Subject: build: Add julia-build-system. * guix/build/julia-build-system.scm: New file. * guix/build-system/julia.scm: New file. * Makefile.am (MODULES): Add them. * doc/guix.texi (Build Systems): Document julia-build-system. Signed-off-by: Julien Lepiller --- Makefile.am | 2 + doc/guix.texi | 23 +++++++ guix/build-system/julia.scm | 132 +++++++++++++++++++++++++++++++++++++ guix/build/julia-build-system.scm | 135 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 292 insertions(+) create mode 100644 guix/build-system/julia.scm create mode 100644 guix/build/julia-build-system.scm diff --git a/Makefile.am b/Makefile.am index 7b96c9473c..796e96f099 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,6 +126,7 @@ MODULES = \ guix/build-system/gnu.scm \ guix/build-system/guile.scm \ guix/build-system/haskell.scm \ + guix/build-system/julia.scm \ guix/build-system/linux-module.scm \ guix/build-system/node.scm \ guix/build-system/perl.scm \ @@ -184,6 +185,7 @@ MODULES = \ guix/build/texlive-build-system.scm \ guix/build/waf-build-system.scm \ guix/build/haskell-build-system.scm \ + guix/build/julia-build-system.scm \ guix/build/linux-module-build-system.scm \ guix/build/store-copy.scm \ guix/build/json.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index a078822871..6d6a09b36b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6034,6 +6034,29 @@ Packages built with @code{guile-build-system} must provide a Guile package in their @code{native-inputs} field. @end defvr +@defvr {Scheme Variable} julia-build-system +This variable is exported by @code{(guix build-system julia)}. It implements +the build procedure used by @uref{https://julialang.org/, julia} packages, +which essentially is similar to running @command{julia -e 'using Pkg; +Pkg.add(package)'} in an environment where @code{JULIA_LOAD_PATH} contains the +paths to all Julia package inputs. Tests are run not run. + +Julia packages require the source @code{file-name} to be the real name of the +package, correctly capitalized. + +For packages requiring shared library dependencies, you may need to write the +@file{/deps/deps.jl} file manually. It's usually a line of @code{const +variable = /gnu/store/libary.so} for each dependency, plus a void function +@code{check_deps() = nothing}. + +Some older packages that aren't using @file{Package.toml} yet, will require +this file to be created, too. The function @code{julia-create-package-toml} +helps creating the file. You need to pass the outputs and the source of the +package, it's name (the same as the @code{file-name} parameter), the package +uuid, the package version, and a list of dependencies specified by their name +and their uuid. +@end defvr + @defvr {Scheme Variable} minify-build-system This variable is exported by @code{(guix build-system minify)}. It implements a minification procedure for simple JavaScript packages. diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm new file mode 100644 index 0000000000..50237905ec --- /dev/null +++ b/guix/build-system/julia.scm @@ -0,0 +1,132 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Nicolò Balzarotti +;;; +;;; 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 . + +(define-module (guix build-system julia) + #:use-module ((guix build julia-build-system)) + #:use-module (gnu packages julia) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix packages) + #:use-module (guix derivations) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (ice-9 match) + #:use-module (srfi srfi-26) + #:export (%julia-build-system-modules + julia-build + julia-build-system)) + +;; Commentary: +;; +;; Standard build procedure for Julia packages. +;; +;; Code: + +(define %julia-build-system-modules + ;; Build-side modules imported by default. + `((guix build julia-build-system) + ,@%gnu-build-system-modules)) + +(define (default-julia) + "Return the default Julia package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((julia-mod (resolve-interface '(gnu packages julia)))) + (module-ref julia-mod 'julia))) + +(define* (lower name + #:key source inputs native-inputs outputs system target + (julia julia) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + (define private-keywords + '(#:target #:julia #:inputs #:native-inputs)) + + (and (not target) ;XXX: no cross-compilation + (bag + (name name) + (system system) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (build-inputs `(("julia" ,julia) + ,@native-inputs)) + (outputs outputs) + (build julia-build) + (arguments (strip-keyword-arguments private-keywords arguments))))) + +(define* (julia-build store name inputs + #:key source + (tests? #f) + (phases '(@ (guix build julia-build-system) + %standard-phases)) + (outputs '("out")) + (search-paths '()) + (system (%current-system)) + (guile #f) + (imported-modules %julia-build-system-modules) + (modules '((guix build julia-build-system) + (guix build utils)))) + "Build SOURCE using Julia, and with INPUTS." + (define builder + `(begin + (use-modules ,@modules) + (julia-build #:name ,name + #:source ,(match (assoc-ref inputs "source") + (((? derivation? source)) + (derivation->output-path source)) + ((source) + source) + (source + source)) + #:system ,system + #:tests? ,tests? + #:phases ,phases + #:outputs %outputs + #:search-paths ',(map search-path-specification->sexp + search-paths) + #:inputs %build-inputs))) + + (define guile-for-build + (match guile + ((? package?) + (package-derivation store guile system #:graft? #f)) + (#f ; the default + (let* ((distro (resolve-interface '(gnu packages commencement))) + (guile (module-ref distro 'guile-final))) + (package-derivation store guile system #:graft? #f))))) + + (build-expression->derivation store name builder + #:inputs inputs + #:system system + #:modules imported-modules + #:outputs outputs + #:guile-for-build guile-for-build)) + +(define julia-build-system + (build-system + (name 'julia) + (description "The build system for Julia packages") + (lower lower))) + +;;; julia.scm ends here diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm new file mode 100644 index 0000000000..ff6fcf5fe3 --- /dev/null +++ b/guix/build/julia-build-system.scm @@ -0,0 +1,135 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Nicolò Balzarotti +;;; +;;; 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 . + + +(define-module (guix build julia-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:export (%standard-phases + julia-create-package-toml + julia-build)) + +;; Commentary: +;; +;; Builder-side code of the standard build procedure for Julia packages. +;; +;; Code: + +(define (invoke-julia code) + (invoke "julia" "-e" code)) + +;; subpath where we store the package content +(define %package-path "/share/julia/packages/") + +(define (generate-load-path inputs outputs) + (string-append + (string-join (map (match-lambda + ((_ . path) + (string-append path %package-path))) + ;; Restrict to inputs beginning with "julia-". + (filter (match-lambda + ((name . _) + (string-prefix? "julia-" name))) + inputs)) + ":") + (string-append ":" (assoc-ref outputs "out") %package-path) + ;; stdlib is always required to find Julia's standard libraries. + ;; usually there are other two paths in this variable: + ;; "@" and "@v#.#" + ":@stdlib")) + +(define* (install #:key source inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (package-dir (string-append out %package-path + (string-append + (strip-store-file-name source))))) + (setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs)) + (mkdir-p package-dir) + (copy-recursively source package-dir)) + #t) + +;; TODO: Precompilation is working, but I don't know how to tell +;; julia to use use it. If (on rantime) we set HOME to +;; store path, julia tries to write files there (failing) +(define* (precompile #:key source inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (builddir (string-append out "/share/julia/")) + (package (strip-store-file-name source))) + (mkdir-p builddir) + (setenv "JULIA_DEPOT_PATH" builddir) + (setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs)) + ;; Actual precompilation + (invoke-julia (string-append "using " package))) + #t) + +(define* (check #:key source inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (package (strip-store-file-name source)) + (builddir (string-append out "/share/julia/"))) + (setenv "JULIA_DEPOT_PATH" builddir) + (setenv "JULIA_LOAD_PATH" (generate-load-path inputs outputs)) + (invoke-julia (string-append "using Pkg;Pkg.test(\"" package "\")"))) + #t) + +(define (julia-create-package-toml outputs source + name uuid version + deps) + "Some packages are not using the new Package.toml dependency specifications. +Write this file manually, so that Julia can find its dependencies." + (let ((f (open-file + (string-append + (assoc-ref outputs "out") + %package-path + (string-append + name "/Project.toml")) + "w"))) + (display (string-append + " +name = \"" name "\" +uuid = \"" uuid "\" +version = \"" version "\" +") f) + (when (not (null? deps)) + (display "[deps]\n" f) + (for-each (lambda dep + (display (string-append (car (car dep)) " = \"" (cdr (car dep)) "\"\n") + f)) + deps)) + (close-port f)) + #t) + +(define %standard-phases + (modify-phases gnu:%standard-phases + (delete 'check) ; tests must be run after installation + (replace 'install install) + (add-after 'install 'precompile precompile) + ;; (add-after 'install 'check check) + ;; TODO: In the future we could add a "system-image-generation" phase + ;; where we use PackageCompiler.jl to speed up package loading times + (delete 'configure) + (delete 'bootstrap) + (delete 'patch-usr-bin-file) + (delete 'build))) + +(define* (julia-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given Julia package, applying all of PHASES in order." + (apply gnu:gnu-build + #:inputs inputs #:phases phases + args)) -- cgit v1.2.3 From 11d73fb412d8728cf916eff9d9750be0bb593076 Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 3 Aug 2019 11:19:11 +0200 Subject: gnu: julia: Set search path. * gnu/packages/julia.scm (julia)[native-search-paths]: Add specification for JULIA_LOAD_PATH. Signed-off-by: Julien Lepiller --- gnu/packages/julia.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 43254f25fd..65a5e42beb 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -482,6 +482,10 @@ ("patchelf" ,patchelf) ("pkg-config" ,pkg-config) ("python" ,python-2))) + (native-search-paths + (list (search-path-specification + (variable "JULIA_LOAD_PATH") + (files (list "share/julia/packages/"))))) ;; Julia is not officially released for ARM and MIPS. ;; See https://github.com/JuliaLang/julia/issues/10639 (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux")) -- cgit v1.2.3 From d3366a8ee8cec53cfb982855aaeb30244d3f1aa2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 21:01:04 +0200 Subject: import: opam: Remove initial "v" in some version numbers. * guix/import/opam.scm (opam-fetch): Remove initial "v" in some version numbers. --- guix/import/opam.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 5dcc0e97a3..7c533a4b4e 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -238,7 +238,9 @@ path to the repository." (version (find-latest-version name repository)) (file (string-append repository "/packages/" name "/" name "." version "/opam"))) `(("metadata" ,@(get-metadata file)) - ("version" . ,version)))) + ("version" . ,(if (string-prefix? "v" version) + (substring version 1) + version))))) (define (opam->guix-package name) (and-let* ((opam-file (opam-fetch name)) -- cgit v1.2.3 From b2f810fe939ca98ee578a55d42f8d939539ae845 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:36:33 +0200 Subject: =?UTF-8?q?import:=C2=A0opam:=20Use=20propagated-inputs=20instead?= =?UTF-8?q?=20of=20inputs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/opam.scm (opam->guix-package): Use propagated-inputs instead of inputs. --- guix/import/opam.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 7c533a4b4e..7f089a5cf3 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -285,7 +285,7 @@ path to the repository." 'ocaml-build-system)) ,@(if (null? inputs) '() - `((inputs ,(list 'quasiquote inputs)))) + `((propagated-inputs ,(list 'quasiquote inputs)))) ,@(if (null? native-inputs) '() `((native-inputs ,(list 'quasiquote native-inputs)))) -- cgit v1.2.3 From 8dfe8fee5408c6a4b31866d5e7c073100e3ea285 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:28:22 +0200 Subject: gnu: ocaml-biniou: Update to 1.2.1. * gnu/packages/ocaml.scm (ocaml-biniou): Update to 1.2.1. --- gnu/packages/ocaml.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 52f7a42e93..0fef79574c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3540,19 +3540,29 @@ than the first one.") (define-public ocaml-biniou (package (name "ocaml-biniou") - (version "1.2.0") + (version "1.2.1") (home-page "https://github.com/mjambon/biniou") (source (origin (method git-fetch) (uri (git-reference (url (string-append home-page ".git")) - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb")))) + "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790")))) (build-system dune-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each + (lambda (file) + (chmod file #o644)) + (find-files "." ".")) + #t))))) (inputs `(("ocaml-easy-format" ,ocaml-easy-format))) (native-inputs -- cgit v1.2.3 From 72b2e2ea7a546b09a66d36260fcc60cae70a0151 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:31:29 +0200 Subject: gnu: ocaml-lwt-log: Update to 1.1.1. * gnu/packages/ocaml.scm (ocaml-lwt-log): Update to 1.1.1. [source]: Use git-fetch. --- gnu/packages/ocaml.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0fef79574c..493542d48a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1870,15 +1870,16 @@ locks or other synchronization primitives.") (define-public ocaml-lwt-log (package (name "ocaml-lwt-log") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/aantron/lwt_log/archive/" version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 (base32 - "1lr62j2266pbsi54xmzsfvl2z7fi7smhak7fp1ybl8hssxwi6in2")))) + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aantron/lwt_log") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1n12i1rmn9cjn6p8yr6qn5dwbrwvym7ckr7bla04a1xnq8qlcyj7")))) (build-system dune-build-system) (arguments `(#:tests? #f; require lwt_ppx -- cgit v1.2.3 From b3419c40276cfd87c3b11460be27878872813c0c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:35:22 +0200 Subject: gnu: ocaml-markup: Update to 0.8.1. * gnu/packages/ocaml.scm (ocaml-markup): Update to 0.8.1. (ocaml-bisect-ppx): Use propagated-inputs instead of inputs. --- gnu/packages/ocaml.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 493542d48a..36e69b38f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5066,7 +5066,7 @@ the full Core is not available, such as in Javascript.") (define-public ocaml-markup (package (name "ocaml-markup") - (version "0.8.0") + (version "0.8.1") (home-page "https://github.com/aantron/markup.ml") (source (origin @@ -5077,10 +5077,11 @@ the full Core is not available, such as in Javascript.") (file-name (git-file-name name version)) (sha256 (base32 - "0aif4abvfmi9xc1pvw5n5rbm6rzkkpsxyvdn0lanr33rjpvkwdlm")))) + "0gzdjfnkv56vhmpvi9xpv1p05z50y55izhn156bkmb35s6izxds3")))) (build-system dune-build-system) - (inputs - `(("ocaml-uchar" ,ocaml-uchar) + (propagated-inputs + `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) + ("ocaml-uchar" ,ocaml-uchar) ("ocaml-uutf" ,ocaml-uutf) ("ocaml-lwt" ,ocaml-lwt))) (native-inputs `(("ocaml-ounit" ,ocaml-ounit))) @@ -5155,7 +5156,7 @@ combinators.") (base32 "1vp3qvrkz7q25nbmvd40vhsnz2k9aqh17bnd21i3q8q0xlr5hdag")))) (build-system dune-build-system) - (inputs + (propagated-inputs `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-ounit" ,ocaml-ounit))) -- cgit v1.2.3 From 69c83817f8fffddf177f6fb25908d2b496409476 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:48:19 +0200 Subject: gnu: ocaml-stringext: Update to 1.6.0. * gnu/packages/ocaml.scm (ocaml-stringext): Update to 1.6.0. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 36e69b38f9..643c245266 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1242,7 +1242,7 @@ to use -- to sophisticated random generation of test cases.") (define-public ocaml-stringext (package (name "ocaml-stringext") - (version "1.5.0") + (version "1.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -1251,7 +1251,7 @@ to use -- to sophisticated random generation of test cases.") (file-name (git-file-name name version)) (sha256 (base32 - "0035pyakk0r7pfhkrayvqncpv9mk6lssr455j3prmdcirh6s50d7")))) + "1m09cmn3vrk3gdm60fb730qsygcfyxsyv7gl9xfzck08q1x2x9qx")))) (build-system dune-build-system) (arguments `(#:test-target ".")) -- cgit v1.2.3 From 5a3082eca81d8e7d99ed1dbafd5f7c0293d0739e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:50:07 +0200 Subject: gnu: opam: Update to 2.0.5. * gnu/packages/ocaml.scm (opam): Update to 2.0.5. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 643c245266..5da5027bc8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -428,7 +428,7 @@ the opam file fomat.") (define-public opam (package (name "opam") - (version "2.0.4") + (version "2.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -437,7 +437,7 @@ the opam file fomat.") (file-name (git-file-name name version)) (sha256 (base32 - "1yx5k8v5vnnc20fmz5zx8kqd242j48qcknlk6vmkr7rkq886ipq2")))) + "0pf2smq2sdcxryq5i87hz3dv05pb3zasb1is3kxq1pi1s4cn55mx")))) (build-system ocaml-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 4a8a0d8520db0b604cc9cadb52c707e9d3a1bb01 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 22:57:59 +0200 Subject: gnu: ocaml-ssl: Update to 0.5.9. * gnu/packages/ocaml.scm (ocaml-ssl): Update to 0.5.9. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5da5027bc8..3961a97ab1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1800,7 +1800,7 @@ lets the client choose the concrete timeline.") (define-public ocaml-ssl (package (name "ocaml-ssl") - (version "0.5.7") + (version "0.5.9") (source (origin (method git-fetch) @@ -1809,7 +1809,7 @@ lets the client choose the concrete timeline.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "06zxqnwqkvf7pmj5s44jflkknv01czgbi4nbaac0ys1p7rv99y3x")))) + "04h02rvzrwp886n5hsx84rnc9b150iggy38g5v1x1rwz3pkdnmf0")))) (build-system dune-build-system) (arguments `(#:test-target ".")) -- cgit v1.2.3 From e57dd20118d3210de0ce9e407f41bf3a0be1dee3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 23:03:45 +0200 Subject: gnu: ocaml-frontc: Update to 3.4.2. * gnu/packages/ocaml.scm (ocaml-frontc): Update to 3.4.2. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3961a97ab1..67a5f01c7a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1140,7 +1140,7 @@ for speed and space economy.") (define-public ocaml-frontc (package (name "ocaml-frontc") - (version "3.4.1") + (version "3.4.2") (source (origin (method git-fetch) (uri (git-reference @@ -1150,7 +1150,7 @@ for speed and space economy.") (file-name (git-file-name name version)) (sha256 (base32 - "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak")))) + "0k7jk9hkglnkk27s62xl493jyqc017gyvwqb1lyc0ywbb001s102")))) (build-system ocaml-build-system) (arguments `(#:phases -- cgit v1.2.3 From ce502774b4eba7aaa4c1d5eb07c913d6f06ff0dc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 4 Sep 2019 23:06:51 +0200 Subject: gnu: ocaml-easy-format: Update to 1.3.2. * gnu/packages/ocaml.scm (ocaml-easy-format): Update to 1.3.2. --- gnu/packages/ocaml.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 67a5f01c7a..146fb63d5e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2753,19 +2753,28 @@ JSON.") (define-public ocaml-easy-format (package (name "ocaml-easy-format") - (version "1.3.1") + (version "1.3.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/mjambon/easy-format") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0jfncci15b8sf1y72yrxfjlsmhs9aavcd14vwz4d7kj8k9w9c4qk")))) + "1fc95q2ypck6m6rv3kiawwilh5ac93v2hcp823mj608d5kj79xkb")))) (build-system dune-build-system) (arguments - `(#:jbuild? #t)) + `(#:jbuild? #t + #:phases + (modify-phases %standard-phases + (add-before 'build 'make-writable + (lambda _ + (for-each + (lambda (file) + (chmod file #o644)) + (find-files "." ".")) + #t))))) (home-page "https://github.com/mjambon/easy-format") (synopsis "Interface to the Format module") (description "Easy-format is a high-level and functional interface to the -- cgit v1.2.3 From 8161c2d6ce71f200b2d467fda46495fd2ff58c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 4 Sep 2019 14:58:30 +0200 Subject: gnu: ghostscript: Keep the replacement private. This avoids having two matches for the "ghostscript" spec. * gnu/packages/ghostscript.scm (ghostscript/fixed): Keep private. --- gnu/packages/ghostscript.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 139682b5d0..f9c3ee94bf 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -275,7 +275,7 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) -(define-public ghostscript/fixed +(define ghostscript/fixed ;; This adds the Freetype dependency (among other things), which fixes the ;; rendering issues described in . (package/inherit -- cgit v1.2.3 From c26f562e5e22b07e61475cab7324e84f6fe70e57 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sun, 30 Jun 2019 22:56:25 +0200 Subject: services: nginx: Pass run-directory on config test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . This fixes error logging errors in the activation script. * gnu/services/web.scm (nginx-activation): Add "-p" flag. Signed-off-by: Ludovic Courtès --- gnu/services/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 35efddb0ae..56971238ab 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -682,7 +682,8 @@ of index files." (system* (string-append #$nginx "/sbin/nginx") "-c" #$(or file (default-nginx-config config)) - "-t")))) + "-p" #$run-directory + "-t")))) (define (nginx-shepherd-service config) (match-record config -- cgit v1.2.3 From f475c6e53e5b6912cc45663d50f1d03dadfb60b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 4 Sep 2019 21:18:11 +0200 Subject: doc: Update 'README'. * README: Update intro a bit. (Installing Guix as non-root): Remove as it's largely outdated. (Contact): Update. --- README | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/README b/README index 296df41516..02d6f7190a 100644 --- a/README +++ b/README @@ -10,8 +10,8 @@ It provides [[https://www.gnu.org/software/guile/][Guile]] Scheme APIs, includin domain-specific languages (EDSLs) to describe how packages are to be built and composed. -A user-land free software distribution for GNU/Linux comes as part of -Guix. +GNU Guix can be used on top of an already-installed GNU/Linux distribution, or +it can be used standalone (we call that “Guix System”). Guix is based on the [[https://nixos.org/nix/][Nix]] package manager. @@ -75,37 +75,17 @@ the promise of a build; it is stored as a text file under `derivation' primitive, as well as higher-level wrappers such as `build-expression->derivation'. -Guix does remote procedure calls (RPCs) to the Guix or Nix daemon (the -=guix-daemon= or =nix-daemon= command), which in turn performs builds -and accesses to the Nix store on its behalf. The RPCs are implemented -in the (guix store) module. - -* Installing Guix as non-root - -The Guix daemon allows software builds to be performed under alternate -user accounts, which are normally created specifically for this -purpose. For instance, you may have a pool of accounts in the -=guixbuild= group, and then you can instruct =guix-daemon= to use them -like this: - - $ guix-daemon --build-users-group=guixbuild - -However, unless it is run as root, =guix-daemon= cannot switch users. -In that case, it falls back to using a setuid-root helper program call -=nix-setuid-helper=. That program is not setuid-root by default when -you install it; instead you should run a command along these lines -(assuming Guix is installed under /usr/local): - - # chown root.root /usr/local/libexec/nix-setuid-helper - # chmod 4755 /usr/local/libexec/nix-setuid-helper +Guix does remote procedure calls (RPCs) to the build daemon (the =guix-daemon= +command), which in turn performs builds and accesses to the store on its +behalf. The RPCs are implemented in the (guix store) module. * Contact GNU Guix is hosted at https://savannah.gnu.org/projects/guix/. -Please email for bug reports or questions regarding -Guix and its distribution; email for -general issues regarding the GNU system. +Please email for questions and for bug +reports; email for general issues regarding the +GNU system. Join #guix on irc.freenode.net. -- cgit v1.2.3 From d28b6dda86c2901e6ed852b8aee785a9ca0d10ac Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Tue, 3 Sep 2019 15:47:07 +0200 Subject: gnu: Add xfce4-screenshooter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-screenshooter): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 6d2155fc53..e7848bfc28 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1087,3 +1087,36 @@ of data to either CD/DVD/BD.") (description "Mousepad is a graphical text editor for Xfce based on Leafpad.") (license gpl2+))) + +(define-public xfce4-screenshooter + (package + (name "xfce4-screenshooter") + (version "1.9.5") + (source (origin + (method url-fetch) + (uri (string-append "http://archive.xfce.org/src/apps/" + "xfce4-screenshooter/" + (version-major+minor version) + "/xfce4-screenshooter-" + version ".tar.bz2")) + (sha256 + (base32 + "135kad07922jxjs05amn48sdgm2x1rh97wbzdmy9h85r5i1vaddz")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib:bin" ,glib "bin"))) ; glib-genmarshal + (inputs + `(("exo" ,exo) + ("libsoup" ,libsoup) + ("libxfce4ui" ,libxfce4ui) + ("xfce4-panel" ,xfce4-panel))) + (home-page "https://goodies.xfce.org/projects/applications/xfce4-screenshooter") + (synopsis "Xfce's application to take screenshots") + (description + "This application allows you to capture the entire screen, the active +window or a selected region. You can set the delay that elapses before the screenshot +is taken and the action that will be done with the screenshot. +A plugin for the Xfce panel is also available.") + (license gpl2+))) -- cgit v1.2.3 From b45e11dad845523678fdd7efffa67718beb718e2 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 2 Sep 2019 15:52:54 +0200 Subject: gnu: Add xfce4-screensaver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-screensaver): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e7848bfc28..3123e4fdf6 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1120,3 +1120,50 @@ window or a selected region. You can set the delay that elapses before the scre is taken and the action that will be done with the screenshot. A plugin for the Xfce panel is also available.") (license gpl2+))) + +(define-public xfce4-screensaver + (package + (name "xfce4-screensaver") + (version "0.1.8") + (source (origin + (method url-fetch) + (uri (string-append "http://archive.xfce.org/src/apps/" + "xfce4-screensaver/" + (version-major+minor version) + "/xfce4-screensaver-" + version ".tar.bz2")) + (sha256 + (base32 + "1mv0r150yb29kji2rr2462g9p574bqjax1lb6bzcqgpxlmg08mj0")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dbus-1-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dbus-dir (string-append out "/share/dbus-1/services"))) + (substitute* "configure" + (("DBUS_SESSION_SERVICE_DIR=.*") + (string-append "DBUS_SESSION_SERVICE_DIR=" + dbus-dir))))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool) + ("glib" ,glib) ; glib-compile-schemas + ("glib:bin" ,glib "bin"))) ; glib-compile-schemas + (inputs + `(("dbus-glib" ,dbus-glib) + ("libux-pam" ,linux-pam) + ("elogind" ,elogind) + ("garcon" ,garcon) + ("libxklavier" ,libxklavier) + ("libwnxk" ,libwnck) + ("libxscrnsaver" ,libxscrnsaver) + ("xfconf" ,xfconf))) + (home-page "https://docs.xfce.org/apps/screensaver/start") + (synopsis "Screensaver for the Xfce desktop") + (description + "Xfce Screensaver is a screen saver and locker that aims to have simple, + sane, secure defaults and be well integrated with the Xfce desktop. ") + (license gpl2+))) -- cgit v1.2.3 From cb8a5e075adac85a8f71fe95ed589355a7f5c173 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Sun, 18 Aug 2019 21:34:09 +0200 Subject: gnu: libxfce4util: Add gobject-introspection support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (libxfce4util): Add gobject-introspection to native-inputs. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3123e4fdf6..293ff98edd 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -99,6 +99,7 @@ (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool))) (propagated-inputs `(("glib" ,glib))) ; required by libxfce4util-1.0.pc (home-page "https://www.xfce.org/") -- cgit v1.2.3 From 35d48622608d415104096455c840d44773014043 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Tue, 20 Aug 2019 12:17:00 +0200 Subject: gnu: libxfce4util: Build Vala bindings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (libxfce4util)[native-inputs]: Add vala. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 293ff98edd..6bd47233cb 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -100,7 +100,8 @@ (native-inputs `(("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool))) + ("intltool" ,intltool) + ("vala" ,vala))) (propagated-inputs `(("glib" ,glib))) ; required by libxfce4util-1.0.pc (home-page "https://www.xfce.org/") (synopsis "Basic utility library for Xfce") -- cgit v1.2.3 From 458b07ebe0243d13e8485ca1d7eb185cec35b7bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Sep 2019 23:56:24 +0200 Subject: build-system/julia: Fix syntax error. * guix/build-system/julia.scm: Fix invalid module reference. --- guix/build-system/julia.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index 50237905ec..9c8b8ad398 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system julia) - #:use-module ((guix build julia-build-system)) + #:use-module (guix build julia-build-system) #:use-module (gnu packages julia) #:use-module (guix store) #:use-module (guix utils) -- cgit v1.2.3 From 56b1977a5d1080fc9d331b3589ca80e0676d0e67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 5 Sep 2019 00:20:41 +0200 Subject: build-system/julia: Avoid module cycles. * guix/build-system/julia.scm: Remove unused imports. (lower)[julia]: Default to (DEFAULT-JULIA). --- guix/build-system/julia.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index 9c8b8ad398..488fe9bb1d 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -17,8 +17,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system julia) - #:use-module (guix build julia-build-system) - #:use-module (gnu packages julia) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) @@ -51,7 +49,7 @@ (define* (lower name #:key source inputs native-inputs outputs system target - (julia julia) + (julia (default-julia)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." -- cgit v1.2.3 From 5ceac3f42b41067c8de994b0bd16560129279a18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:21:53 +0200 Subject: gnu: oniguruma: Update to 6.9.3 [fixes CVE-2019-13224, CVE-2019-13225]. * gnu/packages/textutils.scm (oniguruma): Update to 6.9.3. --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 330e10610d..60215523b6 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -475,7 +475,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") (define-public oniguruma (package (name "oniguruma") - (version "6.9.2") + (version "6.9.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/kkos/" @@ -483,7 +483,7 @@ as existing hashing techniques, with provably negligible risk of collisions.") "/onig-" version ".tar.gz")) (sha256 (base32 - "0slp4hpw9qxk4xhn7abyw7065sd355xwkyfq72glxczcjsqxsynv")))) + "0pvj37r1rd5h5vw99mdk8z4k44gq1ldwrapkamdiicksdfkr4ndb")))) (build-system gnu-build-system) (home-page "https://github.com/kkos/oniguruma") (synopsis "Regular expression library") -- cgit v1.2.3 From 5ec7c4a153f2d620d1d58923afefe80ca48d8ede Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:23:02 +0200 Subject: gnu: php: Build against Oniguruma 6. * gnu/packages/php.scm (php)[inputs]: Change ONIGURUMA-5 to ONIGURUMA. * gnu/packages/textutils.scm (oniguruma-5): Remove variable. --- gnu/packages/php.scm | 2 +- gnu/packages/textutils.scm | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 497989b781..ca7f0ee892 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -364,7 +364,7 @@ ("libxpm" ,libxpm) ("libxslt" ,libxslt) ("libx11" ,libx11) - ("oniguruma" ,oniguruma-5) + ("oniguruma" ,oniguruma) ("openldap" ,openldap) ("openssl" ,openssl) ("pcre" ,pcre2) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 60215523b6..388f164428 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -492,20 +492,6 @@ characteristic of this library is that different character encoding for every regular expression object can be specified.") (license license:bsd-2))) -;; PHP < 7.3.0 requires this old version. Remove once no longer needed. -(define-public oniguruma-5 - (package - (inherit oniguruma) - (version "5.9.6") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/kkos/" - "oniguruma/releases/download/v" version - "/onig-" version ".tar.gz")) - (sha256 - (base32 - "19s79vsclqn170mw0ajwv7j37qsbn4f1yjz3yavnhvva6c820r6m")))))) - (define-public antiword (package (name "antiword") -- cgit v1.2.3 From 1a22a234df9c35163c9a845e12074b30834b2854 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:25:38 +0200 Subject: gnu: LibRaw: Update to 1.19.5. * gnu/packages/photo.scm (libraw): Update to 0.19.5. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index b445374718..f6d86f0857 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -70,14 +70,14 @@ (define-public libraw (package (name "libraw") - (version "0.19.4") + (version "0.19.5") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "07wnzw9k3mwdq9dmpmg94al3ksc065kskfbxkknnmhvrsv2iri8k")))) + "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 558f4a30e252765e88a3e71f2618eb28f9d5b86f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:28:21 +0200 Subject: gnu: libabw: Update to 0.1.3. * gnu/packages/libreoffice.scm (libabw): Update to 0.1.3. [arguments]: Remove. --- gnu/packages/libreoffice.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 239cabdd2e..e66eeabf5b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -331,14 +331,14 @@ as Alfresco or Nuxeo.") (define-public libabw (package (name "libabw") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (string-append "https://dev-www.libreoffice.org/src/libabw/" "libabw-" version ".tar.xz")) (sha256 (base32 - "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb")))) + "1vbfrmnvib3cym0yyyabnd8xpx4f7wp20vnn09s6dln347fajqz7")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -350,9 +350,6 @@ as Alfresco or Nuxeo.") ("libxml2" ,libxml2))) (inputs `(("boost" ,boost))) - (arguments - ;; avoid triggering configure errors by simple inclusion of boost headers - `(#:configure-flags '("--disable-werror"))) (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libabw") (synopsis "Library for parsing the AbiWord format") (description "Libabw is a library that parses the file format of -- cgit v1.2.3 From e25973e18fe1cf1f1d5ba82f31c03b7c900f42db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:28:42 +0200 Subject: gnu: libvisio: Update to 0.1.7. * gnu/packages/libreoffice.scm (libvisio): Update to 0.1.7. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e66eeabf5b..ce9ae40524 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -576,14 +576,14 @@ created by PageMaker version 6.x and 7.") (define-public libvisio (package (name "libvisio") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/libvisio/" "libvisio-" version ".tar.xz")) (sha256 (base32 - "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y")))) + "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From c0de48c9a58370809bcced244f0ac220a9c8e176 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:45:25 +0200 Subject: gnu: tdb: Update to 1.4.2. * gnu/packages/databases.scm (tdb): Update to 1.4.2. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 066bcb6962..f7f5c6ffdc 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1264,14 +1264,14 @@ changes.") (define-public tdb (package (name "tdb") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tdb/tdb-" version ".tar.gz")) (sha256 (base32 - "0d9d2f1c83gmmq30bkfs50yb8399mr9xjjzscma4kyq0ajf75861")))) + "0jh0iqbb6pkvqrqn033w5g6gwa4bdgkvp49z0qpkk3h2wk6b4h4h")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 1068bdcfe8186b37e618c2b25d74deae41718168 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:45:46 +0200 Subject: gnu: talloc: Update to 2.3.0. * gnu/packages/samba.scm (talloc): Update to 2.3.0. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index da4f251ab6..9c7b52a468 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -243,14 +243,14 @@ Desktops into Active Directory environments using the winbind daemon.") (define-public talloc (package (name "talloc") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/talloc/talloc-" version ".tar.gz")) (sha256 (base32 - "1g1fqa37xkjp9lp6lrwxrbfgashcink769ll505zvcwnxx2nlvsw")))) + "1iigk4a7n9k9qqq0h3a5vah67ycpqzvahvdhzy15lm428jrvrmbm")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 173cced75153ff9395f6509fbe1efd06ad92ac81 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:46:06 +0200 Subject: gnu: tevent: Update to 0.10.1. * gnu/packages/samba.scm (tevent): Update to 0.10.1. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 9c7b52a468..ae79275dd7 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -310,14 +310,14 @@ destructors. It is the core memory allocator used in Samba.") (define-public tevent (package (name "tevent") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/tevent/tevent-" version ".tar.gz")) (sha256 (base32 - "1rm4d9245ya15wyrh9vqn1dnz14l2ic88mr46ykyc6kdrl99dwrk")))) + "1dhhd7fz6wyvlwrk1a6gj5m2mcjsc3ilx0mcv1qsr1lbndldm93r")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 309721b324448b84d4e3bf44a4d40d5bbb5d5a9c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:46:22 +0200 Subject: gnu: samba: Update to 4.10.8 [fixes CVE-2019-10197]. * gnu/packages/samba.scm (samba): Update to 4.10.8. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index ae79275dd7..aa344c96da 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -153,14 +153,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.10.6") + (version "4.10.8") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "0hpgdqlyczj98pkh2ldglvvnkrb1q541r3qikdvxq0qjvd9fpywy")))) + "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 276e7739b90fcf4f13309529254c6dcaa60285b1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:49:43 +0200 Subject: gnu: libnl: Update to 3.5.0. * gnu/packages/linux.scm (libnl): Update to 3.5.0. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 890548e51b..6c4ab22135 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1926,7 +1926,7 @@ transparently through a bridge.") (define-public libnl (package (name "libnl") - (version "3.4.0") + (version "3.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1935,7 +1935,7 @@ transparently through a bridge.") "/libnl-" version ".tar.gz")) (sha256 (base32 - "1gzm444rnsib64dddv0cwlpzy1q4bycjqhp1i5pxpikimqvpca5p")))) + "1yh5bqmkivd78x378x34gzb28lvykn6b9k3hgvvpdnj5jpn3689m")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -1950,7 +1950,7 @@ transparently through a bridge.") (string-join (string-split version #\.) "_") "/libnl-doc-" version ".tar.gz")) (sha256 - (base32 "1m5cnzviv31gjnz6fz5rgyl6ah4dbp2akm49j9973sgwl36gs8jx")))))) + (base32 "19p5y8q3cm5wqvamqc4s5syxnnkvzxy3gw8ivxk6fv9ybn8jm35h")))))) (inputs `(("python-2" ,python-2) ("python-3" ,python-3))) -- cgit v1.2.3 From 56ac8ca3c83d3b86cc27de395b07a7a2e726c6ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:53:36 +0200 Subject: gnu: varnish: Update to 6.2.1. * gnu/packages/web.scm (varnish): Update to 6.2.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 52ff9a804e..41e0035ce5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4928,13 +4928,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.2.0") + (version "6.2.1") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3")))) + "15qfvw3fp05bgyspcm6gbsnxhs430p4z3fwz5kkd1z68jb90b3pj")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") -- cgit v1.2.3 From fbcbafdcaa212695cd8548662260fd8b882cf0b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 20:58:25 +0200 Subject: gnu: miniupnpc: Update to 2.1.20190824. * gnu/packages/upnp.scm (miniupnpc): Update to 2.1.20190824. --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 36e14634f7..1c2479064a 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -42,14 +42,14 @@ (define-public miniupnpc (package (name "miniupnpc") - (version "2.1.20190625") + (version "2.1.20190824") (source (origin (method url-fetch) (uri (string-append "https://miniupnp.tuxfamily.org/files/" name "-" version ".tar.gz")) (sha256 - (base32 "1yqp0d8x5ldjfma5x2vhpg1aaafdg0470ismccixww3rzpbza8w7")))) + (base32 "0rg1i51lnyq8zgflhcg981kq4348vgq03ndmbgiv7knd1vmfzb8z")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit v1.2.3 From 9bf589867b57954e1245b2d1c937f1ae386a78ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Sep 2019 21:00:10 +0200 Subject: gnu: nginx: Update to 1.17.3 [security fixes]. This release fixes CVE-2019-9511, CVE-2019-9513, and CVE-2019-9516. * gnu/packages/web.scm (nginx): Update to 1.17.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 41e0035ce5..bea9f3dcc7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -208,14 +208,14 @@ Interface} specification.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.17.2") + (version "1.17.3") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1v39gslwbvpfhqqv74q0lkfrhrwsp59xc8pwhvxns7af8s3kccsy")))) + "0g0g9prwjy0rnv6n5smny5yl5dhnmflqdr3hwgyj5jpr5hfgx11v")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From 92086eeda39cf14ff1241b2e610154fad98965cd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Aug 2019 10:01:11 +0900 Subject: gnu: Add tini. * gnu/packages/docker.scm (tini): New variable. --- gnu/packages/docker.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 94cfa2bdb7..8f80cd54d8 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -25,6 +25,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) @@ -655,3 +656,36 @@ provisioning etc.") way to run commands in the current directory, but within a Docker container defined in a per-project configuration file.") (license license:gpl3+))) + +(define-public tini + (package + (name "tini") + (version "0.18.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/krallin/tini.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;tests require a Docker daemon + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-static-build + ;; Disable the static build as it fails to install, with + ;; the error: "No valid ELF RPATH or RUNPATH entry exists + ;; in the file". + (lambda _ + (substitute* "CMakeLists.txt" + ((".*tini-static.*") "")) + #t))))) + (home-page "https://github.com/krallin/tini") + (synopsis "Tiny but valid init for containers") + (description "Tini is an init program specifically designed for use with +containers. It manages a single child process and ensures that any zombie +processes produced from it are reaped and that signals are properly forwarded. +Tini is integrated with Docker.") + (license license:expat))) -- cgit v1.2.3 From b8e7e20841285c862c684a864a23545489cb9227 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Aug 2019 10:01:43 +0900 Subject: gnu: docker: Add support for tini. * gnu/packages/docker.scm (docker)[inputs]: Add tini. [phases]{patch-paths}: Patch the path of the default init binary. --- gnu/packages/docker.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 8f80cd54d8..28eff0a56c 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -369,7 +369,16 @@ built-in registry server of Docker.") (("StockRuntimeName = .*") (string-append "StockRuntimeName = \"" (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) + "/sbin/runc\"\n")) + (("DefaultInitBinary = .*") + (string-append "DefaultInitBinary = \"" + (assoc-ref inputs "tini") + "/bin/tini\"\n"))) + (substitute* "daemon/config/config_common_unix_test.go" + (("expectedInitPath: \"docker-init\"") + (string-append "expectedInitPath: \"" + (assoc-ref inputs "tini") + "/bin/tini\""))) (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" (("var defaultCommandCandidates = .*") (string-append "var defaultCommandCandidates = []string{\"" @@ -542,6 +551,7 @@ built-in registry server of Docker.") ("runc" ,runc) ("util-linux" ,util-linux) ("lvm2" ,lvm2) + ("tini" ,tini) ("xfsprogs" ,xfsprogs) ("xz" ,xz))) (native-inputs -- cgit v1.2.3 From 2b332c51dbee8a63eb3eb3dde993321800340fd0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 4 Sep 2019 20:23:18 +0200 Subject: gnu: dolphin-emu: Update to commit a974540. * gnu/packages/emulators.scm (dolphin-emu): Update to commit a974540. [source]: Delete unneeded MoltenVK map. [arguments]: Properly hardcode libvulkan path. --- gnu/packages/emulators.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 3b2b5430fd..9ff1cd4897 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -119,8 +119,8 @@ ;; Building from recent Git because the official 5.0 release no longer builds. (define-public dolphin-emu - (let ((commit "24718c1a389e4f51db974575cd15c372485b92e2") - (revision "6")) + (let ((commit "a9745400ec5cea7e55d94955afbdc44d1a4982d1") + (revision "7")) (package (name "dolphin-emu") (version (git-version "5.0" revision commit)) @@ -140,13 +140,13 @@ (string-append "Externals/" dir))) '("LZO" "OpenAL" "Qt" "SFML" "curl" "ffmpeg" "gettext" "hidapi" "libpng" "libusb" "mbedtls" - "miniupnpc" "zlib")) + "miniupnpc" "MoltenVK" "zlib")) ;; Clean up source. (for-each delete-file (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")) #t)) (sha256 (base32 - "1d92rhnw307j3m6swk6bycb8fyc7vw2hfgakd5hpsc4qw65vxfq8")))) + "0ic08ii4vlqlmk2wkfc99jiy6nji2wfq56r7slj23wgvhznnaabk")))) (build-system cmake-build-system) (arguments '(#:tests? #f @@ -174,7 +174,11 @@ (copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin") (chdir "..") (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" - (("libvulkan.so") libvulkan)) + (("\"vulkan\", 1") (string-append "\"vulkan\""))) + (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" + (("\"vulkan\"") (string-append "\"" libvulkan "\""))) + (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" + (("Common::DynamicLibrary::GetVersionedFilename") "")) #t)))) ;; The FindGTK2 cmake script only checks hardcoded directories for -- cgit v1.2.3 From 01e38cc4264d9d0076ce9d894796ceff1f08b35a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 2 Sep 2019 15:47:42 +0200 Subject: build-system/asdf: Add option to compress programs. * guix/build/lisp-utils.scm (build-program): Add `compress?' key argument. (generate-executable-for-system): Same. (generate-executable): Same. --- guix/build/lisp-utils.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 97bc6197a3..c7a589c902 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -220,12 +220,19 @@ Also load TEST-ASD-FILE if necessary." "Return a lisp keyword for the concatenation of STRINGS." (string->symbol (apply string-append ":" strings))) -(define (generate-executable-for-system type system) +(define* (generate-executable-for-system type system #:key compress?) "Use LISP to generate an executable, whose TYPE can be 'asdf:image-op or 'asdf:program-op. The latter will always be standalone. Depends on having created a \"SYSTEM-exec\" system which contains the entry program." (lisp-eval-program `((require :asdf) + ;; Only SBCL supports compression as of 2019-09-02. + ,(if (and compress? (string=? (%lisp-type) "sbcl")) + '(defmethod asdf:perform ((o asdf:image-op) (c asdf:system)) + (uiop:dump-image (asdf:output-file o c) + :executable t + :compression t)) + '()) (asdf:operate ',type ,(string-append system "-exec"))))) (define (generate-executable-wrapper-system system dependencies) @@ -339,6 +346,7 @@ which are not nested." (dependency-prefixes (list (library-output outputs))) (dependencies (list (basename program))) entry-program + compress? #:allow-other-keys) "Generate an executable program containing all DEPENDENCIES, and which will execute ENTRY-PROGRAM. The result is placed in PROGRAM. When executed, it @@ -350,6 +358,7 @@ retained." #:dependencies dependencies #:dependency-prefixes dependency-prefixes #:entry-program entry-program + #:compress? compress? #:type 'asdf:program-op) (let* ((name (basename program)) (bin-directory (dirname program))) @@ -382,6 +391,7 @@ DEPENDENCY-PREFIXES to ensure references to those libraries are retained." dependency-prefixes entry-program type + compress? #:allow-other-keys) "Generate an executable by using asdf operation TYPE, containing whithin the image all DEPENDENCIES, and running ENTRY-PROGRAM in the case of an @@ -405,7 +415,7 @@ references to those libraries are retained." `(((,bin-directory :**/ :*.*.*) (,bin-directory :**/ :*.*.*))))))) - (generate-executable-for-system type name) + (generate-executable-for-system type name #:compress? compress?) (let* ((after-store-prefix-index (string-index out-file #\/ -- cgit v1.2.3 From 9e737b31cb58fdfea108c1686731d92b3387fa0f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 5 Sep 2019 10:25:02 +0200 Subject: gnu: sbcl: Update to 1.5.6. * gnu/packages/lisp.scm (sbcl): Update to 1.5.6. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 203b6719d0..4a5b009eee 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -327,14 +327,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "1.5.5") + (version "1.5.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1qmapk2hyxxqd3ajiqacz4isij0ibx7gn10n8dbmq33gm3kgliyb")) + (base32 "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a")) (modules '((guix build utils))) (snippet ;; Add sbcl-bundle-systems to 'default-system-source-registry'. -- cgit v1.2.3 From a3439b0c70d5db75d400853ebd747e1d46f1ad3d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 5 Sep 2019 11:41:35 +0200 Subject: gnu: sbcl: Use CLISP instead of unboostrappable CCL to build. * gnu/packages/lisp.scm (sbcl)[arguments]: Build with CLISP. --- gnu/packages/lisp.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4a5b009eee..caf52018d1 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -353,11 +353,21 @@ an interpreter, a compiler, a debugger, and much more.") ;; ABCL (recent versions only) ;; CLISP (only some versions: 2.44.1 is OK, 2.47 is not) ;; XCL - ;; CCL seems ideal then, but it unfortunately only builds reliably - ;; on some architectures. + ;; + ;; From NEWS: + ;; * build enhancement: new host quirks mechanism, support for building under + ;; ABCL and ECL (as well as CCL, CMUCL, CLISP and SBCL itself) + ;; + ;; CCL is not bootstrappable so it won't do. CLISP 2.49 seems to work. + ;; ECL too. ECL builds SBCL about 20% slower than CLISP. As of + ;; 2019-09-05, ECL was last updated in 2016 while CLISP was last update + ;; in 2010. + ;; + ;; For now we stick to CLISP for all systems. We keep the `match' in to + ;; make it easier to change the host compiler for various architectures. `(,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `(("ccl" ,ccl))) + `(("clisp" ,clisp))) (_ `(("clisp" ,clisp)))) ("which" ,which) @@ -428,7 +438,7 @@ an interpreter, a compiler, a debugger, and much more.") (setenv "CC" "gcc") (invoke "sh" "make.sh" ,@(match (%current-system) ((or "x86_64-linux" "i686-linux") - `("ccl")) + `("clisp")) (_ `("clisp"))) (string-append "--prefix=" @@ -488,6 +498,15 @@ statistical profiler, a code coverage tool, and many other extensions.") (license:x11-style "file://src/code/loop.lisp"))))) (define-public ccl + ;; Warning: according to upstream, CCL is not bootstrappable. + ;; See https://github.com/Clozure/ccl/issues/222 from 2019-09-02: + ;; + ;; "As far as I know, there is no way to build CCL without an existing + ;; running CCL image. It was bootstrapped back in 1986 or so as + ;; Macintosh Common Lisp, by Gary Byers, I believe, who is no longer on + ;; the planet to tell us the story. It SHOULD be possible to port the + ;; CCL compiler to portable Common Lisp, so that ANY lisp could build + ;; it, as is the case for SBCL, but I know of no attempt to do so." (package (name "ccl") (version "1.11.5") -- cgit v1.2.3 From 7d57bc4d0d8b34409d795fbbff079eff3486a50d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 12:37:25 +0300 Subject: gnu: efl: Update to 1.22.4. * gnu/packages/enlightenment.scm (efl): Update to 1.22.4. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 5e62f5e3da..cc9f43e935 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -65,7 +65,7 @@ (define-public efl (package (name "efl") - (version "1.22.3") + (version "1.22.4") (source (origin (method url-fetch) (uri (string-append @@ -73,7 +73,7 @@ version ".tar.xz")) (sha256 (base32 - "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky")))) + "084ihxy6g86yczhln5vn1amxi4qzqhvk4lpz9005kx92i6wh4h25")))) (outputs '("out" ; 53 MB "include")) ; 21 MB (build-system gnu-build-system) -- cgit v1.2.3 From db316d7376386acc9ba7657c827cd1ad0c31c8fb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 11:45:33 +0200 Subject: gnu: Add r-roc. * gnu/packages/bioconductor.scm (r-roc): New variable. --- gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3faf79fa0e..e7773f0e76 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5273,3 +5273,23 @@ cisTopics and explore the nature and regulatory proteins driving them.") "This package implements the GENIE3 algorithm for inferring gene regulatory networks from expression data.") (license license:gpl2+))) + +(define-public r-roc + (package + (name "r-roc") + (version "1.60.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ROC" version)) + (sha256 + (base32 + "1sapnl8kyaldgvdc657wqcmyjb24nvrnaw7v94bbs8yf5pmfm71c")))) + (properties `((upstream-name . "ROC"))) + (build-system r-build-system) + (home-page "https://www.bioconductor.org/packages/ROC/") + (synopsis "Utilities for ROC curves") + (description + "This package provides utilities for @dfn{Receiver Operating +Characteristic} (ROC) curves, with a focus on micro arrays.") + (license license:artistic2.0))) -- cgit v1.2.3 From 46721deaf80ec8150ad22e853766e69fff31c670 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 11:45:43 +0200 Subject: gnu: Add r-illuminahumanmethylation450kanno-ilmn12-hg19. * gnu/packages/bioconductor.scm (r-illuminahumanmethylation450kanno-ilmn12-hg19): New variable. --- gnu/packages/bioconductor.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e7773f0e76..f80f975be7 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5293,3 +5293,29 @@ regulatory networks from expression data.") "This package provides utilities for @dfn{Receiver Operating Characteristic} (ROC) curves, with a focus on micro arrays.") (license license:artistic2.0))) + +(define-public r-illuminahumanmethylation450kanno-ilmn12-hg19 + (package + (name "r-illuminahumanmethylation450kanno-ilmn12-hg19") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri + "IlluminaHumanMethylation450kanno.ilmn12.hg19" + version 'annotation)) + (sha256 + (base32 + "059vlxsx3p3fcnywwirahsc6mlk813zpqnbv0jsrag6x5bb8z6r4")))) + (properties + `((upstream-name + . "IlluminaHumanMethylation450kanno.ilmn12.hg19"))) + (build-system r-build-system) + (propagated-inputs `(("r-minfi" ,r-minfi))) + (home-page + "https://bioconductor.org/packages/IlluminaHumanMethylation450kanno.ilmn12.hg19/") + (synopsis "Annotation for Illumina's 450k methylation arrays") + (description + "This package provides manifests and annotation for Illumina's 450k array +data.") + (license license:artistic2.0))) -- cgit v1.2.3 From 38babeaaa46c2293f0d59f6fc6e2de52d9f7b6aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 11:45:57 +0200 Subject: gnu: Add r-watermelon. * gnu/packages/bioconductor.scm (r-watermelon): New variable. --- gnu/packages/bioconductor.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f80f975be7..8f1a4ef39f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5319,3 +5319,40 @@ Characteristic} (ROC) curves, with a focus on micro arrays.") "This package provides manifests and annotation for Illumina's 450k array data.") (license license:artistic2.0))) + +(define-public r-watermelon + (package + (name "r-watermelon") + (version "1.28.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "wateRmelon" version)) + (sha256 + (base32 + "0354ahmfvhqw3yfp17rmz35vlgjp262n4q3hr8qyccyrnk2dz17z")))) + (properties `((upstream-name . "wateRmelon"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-illuminahumanmethylation450kanno-ilmn12-hg19" + ,r-illuminahumanmethylation450kanno-ilmn12-hg19) + ("r-illuminaio" ,r-illuminaio) + ("r-limma" ,r-limma) + ("r-lumi" ,r-lumi) + ("r-matrixstats" ,r-matrixstats) + ("r-methylumi" ,r-methylumi) + ("r-roc" ,r-roc))) + (home-page "https://bioconductor.org/packages/wateRmelon/") + (synopsis "Illumina 450 methylation array normalization and metrics") + (description + "The standard index of DNA methylation (beta) is computed from methylated +and unmethylated signal intensities. Betas calculated from raw signal +intensities perform well, but using 11 methylomic datasets we demonstrate that +quantile normalization methods produce marked improvement. The commonly used +procedure of normalizing betas is inferior to the separate normalization of M +and U, and it is also advantageous to normalize Type I and Type II assays +separately. This package provides 15 flavours of betas and three performance +metrics, with methods for objects produced by the @code{methylumi} and +@code{minfi} packages.") + (license license:gpl3))) -- cgit v1.2.3 From 7d2cb646f7d0619ab924dd168d92fc176df629f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 11:46:06 +0200 Subject: gnu: Add r-gdsfmt. * gnu/packages/bioconductor.scm (r-gdsfmt): New variable. --- gnu/packages/bioconductor.scm | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8f1a4ef39f..8c57bd5788 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5356,3 +5356,60 @@ separately. This package provides 15 flavours of betas and three performance metrics, with methods for objects produced by the @code{methylumi} and @code{minfi} packages.") (license license:gpl3))) + +(define-public r-gdsfmt + (package + (name "r-gdsfmt") + (version "1.20.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "gdsfmt" version)) + (sha256 + (base32 + "0h3hgwxq26dg09fyxqg545v9dg1dizsj58cf05rncr3jj4f8g0xy")) + (modules '((guix build utils))) + ;; Remove bundled sources of zlib, lz4, and xz. Don't attempt to build + ;; them and link with system libraries instead. + (snippet + '(begin + (for-each delete-file-recursively + '("src/LZ4" + "src/XZ" + "src/ZLIB")) + (substitute* "src/Makevars" + (("all: \\$\\(SHLIB\\)") "all:") + (("\\$\\(SHLIB\\): liblzma.a") "") + (("(ZLIB|LZ4)/.*") "") + (("CoreArray/dVLIntGDS.cpp.*") + "CoreArray/dVLIntGDS.cpp") + (("CoreArray/dVLIntGDS.o.*") + "CoreArray/dVLIntGDS.o") + (("PKG_LIBS = ./liblzma.a") + "PKG_LIBS = -llz4")) + (substitute* "src/CoreArray/dStream.h" + (("include \"../(ZLIB|LZ4|XZ/api)/(.*)\"" _ _ header) + (string-append "include <" header ">"))) + #t)))) + (properties `((upstream-name . "gdsfmt"))) + (build-system r-build-system) + (inputs + `(("lz4" ,lz4) + ("xz" ,xz) + ("zlib" ,zlib))) + (home-page "http://corearray.sourceforge.net/") + (synopsis + "R Interface to CoreArray Genomic Data Structure (GDS) Files") + (description + "This package provides a high-level R interface to CoreArray @dfn{Genomic +Data Structure} (GDS) data files, which are portable across platforms with +hierarchical structure to store multiple scalable array-oriented data sets +with metadata information. It is suited for large-scale datasets, especially +for data which are much larger than the available random-access memory. The +@code{gdsfmt} package offers efficient operations specifically designed for +integers of less than 8 bits, since a diploid genotype, like +@dfn{single-nucleotide polymorphism} (SNP), usually occupies fewer bits than a +byte. Data compression and decompression are available with relatively +efficient random access. It is also allowed to read a GDS file in parallel +with multiple R processes supported by the package @code{parallel}.") + (license license:lgpl3))) -- cgit v1.2.3 From 6b5f59c7a6a6dfc8298b83a5bd9ac65fec7a09d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 11:46:13 +0200 Subject: gnu: Add r-bigmelon. * gnu/packages/bioconductor.scm (r-bigmelon): New variable. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8c57bd5788..3ba5415597 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5413,3 +5413,31 @@ byte. Data compression and decompression are available with relatively efficient random access. It is also allowed to read a GDS file in parallel with multiple R processes supported by the package @code{parallel}.") (license license:lgpl3))) + +(define-public r-bigmelon + (package + (name "r-bigmelon") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "bigmelon" version)) + (sha256 + (base32 + "0269kf3d34dbng3swk7pclpk02vy4k3askygmzi5my3fqyfzdkj9")))) + (properties `((upstream-name . "bigmelon"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-gdsfmt" ,r-gdsfmt) + ("r-geoquery" ,r-geoquery) + ("r-methylumi" ,r-methylumi) + ("r-minfi" ,r-minfi) + ("r-watermelon" ,r-watermelon))) + (home-page "https://bioconductor.org/packages/bigmelon/") + (synopsis "Illumina methylation array analysis for large experiments") + (description + "This package provides methods for working with Illumina arrays using the +@code{gdsfmt} package.") + (license license:gpl3))) -- cgit v1.2.3 From 33a42f67ced3f8ff6e6a31a23ec6a8ebd4c59ec6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 5 Sep 2019 11:49:09 +0200 Subject: gnu: emacs-evil-collection: Update to 0.0.2. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 0.0.2. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be88802071..1cf66942e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6656,11 +6656,11 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "0748c695dfa89b79eb316da5060360de8c0f04da") - (revision "9")) + (let ((commit "986ca7eb0b75eccd843bdad2f7fdb48f4ca6ac22") + (revision "10")) (package (name "emacs-evil-collection") - (version (git-version "0.0.1" revision commit)) + (version (git-version "0.0.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6669,7 +6669,7 @@ extensions.") (file-name (git-file-name name version)) (sha256 (base32 - "17w8nh3q7ffc7776f3qzixk0c0g6vys3xybgw16ky1f416585kvb")))) + "172sx5w50x5wrs5w0sb6rkbj3q22s7mmsnk4c6pwknhbz3vwlvwz")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From 0e8b91dbc45306984d682307d8b40b0e323bb4be Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 5 Sep 2019 11:53:52 +0200 Subject: gnu: next: Compress the executable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web-browsers.scm (next)[arguments]: Compressing the executable brings it from about 95 MiB to 22 MiB. --- gnu/packages/web-browsers.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 3368772ec6..dec286bba7 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -480,6 +480,7 @@ features for productive professionals.") (build-program (string-append (assoc-ref outputs "out") "/bin/next") outputs + #:compress? #t #:entry-program '((next:entry-point) 0)))) (add-before 'build 'install-assets ;; Since the ASDF build system generates a new .asd with a -- cgit v1.2.3 From 79c6d8781b1e3d09e1e1555675c144d821487535 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 12:03:38 +0200 Subject: gnu: bwa-meth: Capture one more reference to "bwa". Reported by: Alexander.Blume * gnu/packages/bioinformatics.scm (bwa-meth)[arguments]: Capture invocation of "bwa index" to retain reference to "bwa" package. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f5901703ce..f976cad22f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1767,8 +1767,8 @@ well as many of the command line options.") (add-after 'unpack 'keep-references-to-bwa (lambda* (#:key inputs #:allow-other-keys) (substitute* "bwameth.py" - (("bwa mem") - (string-append (which "bwa") " mem")) + (("bwa (mem|index)" _ command) + (string-append (which "bwa") " " command)) ;; There's an ill-advised check for "samtools" on PATH. (("^checkX.*") "")) #t))))) -- cgit v1.2.3 From 6b4ed9ad970ff097c66dff34fe80d75232c86d46 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 14:42:34 +0300 Subject: gnu: gama: Update to 2.07. * gnu/packages/gps.scm (gama): Update to 2.07. --- gnu/packages/gps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 852d095300..9ede82d09e 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -147,7 +147,7 @@ between two other data points.") (define-public gama (package (name "gama") - (version "2.06") + (version "2.07") (source (origin (method url-fetch) @@ -155,7 +155,7 @@ between two other data points.") version ".tar.gz")) (sha256 (base32 - "06xp3kj099b6m2fsmgcbzgj7xk4j0drsps52m4fr8vc6fglsh44p")))) + "0nmc6mkd55nryfffq5k9c09dhkbq6bfs06af8ammhbh5jzdn3s36")))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) ; race condition (native-inputs -- cgit v1.2.3 From 0575fe681cdc2308dbe36c14bd3e905e79fe7213 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 5 Sep 2019 14:52:36 +0200 Subject: Revert "gnu: next: Compress the executable." Some essential references (e.g. libfixposix) are lost in the process. This reverts commit 0e8b91dbc45306984d682307d8b40b0e323bb4be. --- gnu/packages/web-browsers.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index dec286bba7..3368772ec6 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -480,7 +480,6 @@ features for productive professionals.") (build-program (string-append (assoc-ref outputs "out") "/bin/next") outputs - #:compress? #t #:entry-program '((next:entry-point) 0)))) (add-before 'build 'install-assets ;; Since the ASDF build system generates a new .asd with a -- cgit v1.2.3 From 51072ed8ac5f42143e7e5fa289fb6bf951d97a48 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 5 Sep 2019 15:55:50 +0200 Subject: gnu: emacs-org-caldav: Update to 0.0.0-1. * gnu/packages/emacs-xyz.scm (emacs-org-caldav): Update to latest commit, since there is no release yet. [description]: Remove alpha status, no longer specified in README. --- gnu/packages/emacs-xyz.scm | 47 ++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1cf66942e5..204cb1caf9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13818,28 +13818,31 @@ be changed by customizing the appropriate variables.") (license license:gpl3+))) (define-public emacs-org-caldav - (package - (name "emacs-org-caldav") - (version "20180403") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/dengste/org-caldav/raw/" - "8d3492c27a09f437d2d94f2736c56d7652e87aa0" - "/org-caldav.el")) - (sha256 - (base32 - "1fh4gh68ddj0is99z2ccyh97v6psnyda61n2dsadzqhcxn51amlc")))) - (build-system emacs-build-system) - (propagated-inputs `(("emacs-org" ,emacs-org))) - (home-page "https://github.com/dengste/org-caldav") - (synopsis - "Sync Org files with external calendars via the CalDAV protocol") - (description - "Synchronize between events in Org-mode files and a CalDAV calendar. -This code is still alpha.") - (license license:gpl3+))) + (let ((commit "a563500c9884f38ce08793e2964f8274adde163d")) + (package + (name "emacs-org-caldav") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dengste/org-caldav.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18qi1iv5dc0gsvkv9ifal3cjpm568nlb907v8a53cnm4439x1l0l")))) + (build-system emacs-build-system) + (arguments + ;; Tests require to have two specific calendars on a test server. + `(#:exclude '("^org-caldav-testsuite\\.el"))) + (propagated-inputs + `(("emacs-org" ,emacs-org))) + (home-page "https://github.com/dengste/org-caldav") + (synopsis "Sync Org files with external calendars via the CalDAV protocol") + (description "Synchronize between events in Org files and a CalDAV +calendar.") + (license license:gpl3+)))) (define-public emacs-zotxt (package -- cgit v1.2.3 From be285c3dc0555990f9b6754651ec1833f98efdef Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 5 Sep 2019 15:57:02 +0200 Subject: gnu: emacs-org: Update to 9.2.6. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.2.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 204cb1caf9..ca17f04e91 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7079,14 +7079,14 @@ passive voice.") (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "9.2.5") + (version "9.2.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) (sha256 (base32 - "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1")))) + "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") -- cgit v1.2.3 From 31885f444f2326f2de304bc5761bdf6cee53b95f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 5 Sep 2019 16:02:27 +0200 Subject: gnu: emacs-org-contrib: Update to 20190904. * gnu/packages/emacs-xyz.scm (emacs-org-contrib): Update to 20190904. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ca17f04e91..8f866fbc28 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7100,14 +7100,14 @@ programming and reproducible research.") (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20190805") + (version "20190904") (source (origin (method url-fetch) - (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-" - version ".tar")) + (uri (string-append "https://orgmode.org/elpa/" + "org-plus-contrib-" version ".tar")) (sha256 (base32 - "1mw91hwbqyjq5pyz9hzdhvjlc2bphqpi23yqd3sdk1crpc87s40c")))) + "08s3fk3jim0y2v00l6ah8y08ba8wbcf29z6fxqzyaxj58a5sq81a")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) -- cgit v1.2.3 From a8ad05d40c35e871a23a13a02eea5c0a8c5b70b9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Sep 2019 20:57:19 -0400 Subject: gnu: go-github-com-urfave-cli: Update to 1.21.0. * gnu/packages/golang.scm (go-github-com-urfave-cli): Update to 1.21.0. --- gnu/packages/golang.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 950ba9fb37..6637c9c7f8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3123,30 +3123,28 @@ as conversion to and from @command{net.Addr}.") (license license:expat)))) (define-public go-github-com-urfave-cli - (let ((commit "693af58b4d51b8fcc7f9d89576da170765980581") - (revision "0")) - (package - (name "go-github-com-urfave-cli") - (version (git-version "1.20.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/urfave/cli.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1krq752xgy658an1696vf4dc2zmp541clwjinhn11394sx2qksh6")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/urfave/cli")) - (home-page "https://github.com/urfave/cli") - (synopsis "Simple, fast, and fun package for building command line apps in Go") - (description "@command{cli} is a simple, fast, and fun package for + (package + (name "go-github-com-urfave-cli") + (version "1.21.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/urfave/cli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "104jldhxn6d97l5vsbsl0q8hgy1bxrahbr6dbfqrlppva51jmydd")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/urfave/cli")) + (home-page "https://github.com/urfave/cli") + (synopsis "Simple, fast, and fun package for building command line apps in Go") + (description "@command{cli} is a simple, fast, and fun package for building command line apps in Go. The goal is to enable developers to write fast and distributable command line applications in an expressive way.") - (license license:expat)))) + (license license:expat))) (define-public go-github-com-whyrusleeping-json-filter (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") -- cgit v1.2.3 From 9a2f23341d8f916217b759c58f5a487e656723fd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Sep 2019 21:03:26 -0400 Subject: gnu: Add go-github-com-shirou-gopsutil. * gnu/packages/syncthing.scm (go-github-com-shirou-gopsutil): New variable. --- gnu/packages/golang.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6637c9c7f8..819cc6229e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3662,3 +3662,27 @@ and aid debugging.") (description "This package provides a cron library for Go. It implements a cron spec parser and job runner.") (license license:expat))) + +(define-public go-github-com-shirou-gopsutil + (let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399") + (revision "0")) + (package + (name "go-github-com-shirou-gopsutil") + (version (git-version "v2.19.7" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shirou/gopsutil") + (commit commit))) ; XXX + (sha256 + (base32 + "0x1g4r32q4201nr2b754xnrrndmwsrhfr7zg37spya86qrmijnws")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/shirou/gopsutil")) + (synopsis "Process and system monitoring in Go") + (description "This package provides a library for retrieving information +on running processes and system utilization (CPU, memory, disks, network, +sensors).") + (home-page "https://github.com/shirou/gopsutil") + (license license:bsd-3)))) -- cgit v1.2.3 From d5508458406fcd8c95289afb3097ab951173827f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Sep 2019 21:03:52 -0400 Subject: gnu: Syncthing: Update to 1.2.2. * gnu/packages/syncthing.scm (syncthing): Update to 1.2.2. [inputs]: Remove go-github-com-calmh-du and add go-github-com-shirou-gopsutil. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 0f81b8804a..74457f6ec4 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "1b6fidpkwfa2bm6hlv4p0bzxa1ha6s88vajczhryhqi5vjfxafri")) + "1wdjh8xw09s1nfkpc95v04619gqa4dpbygp2y5l35ww4g916lv3s")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -55,7 +55,6 @@ `(("go-github-com-audriusbutkevicius-go-nat-pmp" ,go-github-com-audriusbutkevicius-go-nat-pmp) ("go-github-com-bkaradzic-go-lz4" ,go-github-com-bkaradzic-go-lz4) - ("go-github-com-calmh-du" ,go-github-com-calmh-du) ("go-github-com-calmh-xdr" ,go-github-com-calmh-xdr) ("go-github-com-chmduquesne-rollinghash" ,go-github-com-chmduquesne-rollinghash) @@ -84,6 +83,7 @@ ,go-github-com-gogo-protobuf-protoc-gen-gogo) ("go-github-com-prometheus-client-golang-prometheus" ,go-github-com-prometheus-client-golang-prometheus) + ("go-github-com-shirou-gopsutil" ,go-github-com-shirou-gopsutil) ("go-golang-org-x-net-bpf" ,go-golang-org-x-net-bpf) ("go-golang-org-x-net-internal-iana" ,go-golang-org-x-net-internal-iana) ("go-golang-org-x-net-internal-socket" -- cgit v1.2.3 From 67c2db17bc29e483dbaffbee246c910a617744c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 5 Sep 2019 17:05:08 +0200 Subject: download: Pass 'http_proxy' et al. to git, hg, etc. This allows 'git-fetch' etc. origins to honor the proxy and locale of the daemon. * guix/bzr-download.scm (bzr-fetch): Pass #:leaked-env-vars to 'gexp->derivation'. * guix/cvs-download.scm (cvs-fetch): Likewise. * guix/git-download.scm (git-fetch): Likewise. * guix/hg-download.scm (hg-fetch): Likewise. * guix/svn-download.scm (svn-multi-fetch): Likewise. --- guix/bzr-download.scm | 3 +++ guix/cvs-download.scm | 5 ++++- guix/git-download.scm | 3 +++ guix/hg-download.scm | 5 ++++- guix/svn-download.scm | 5 ++++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/guix/bzr-download.scm b/guix/bzr-download.scm index d30833c5d7..010e0decff 100644 --- a/guix/bzr-download.scm +++ b/guix/bzr-download.scm @@ -75,6 +75,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." #:env-vars `(("bzr url" . ,(bzr-reference-url ref)) ("bzr reference" . ,(bzr-reference-revision ref))) + #:leaked-env-vars '("http_proxy" "https_proxy" + "LC_ALL" "LC_MESSAGES" "LANG" + "COLUMNS") #:system system #:local-build? #t ;don't offload repo branching #:hash-algo hash-algo diff --git a/guix/cvs-download.scm b/guix/cvs-download.scm index 8b46f8ef8c..cb42103aae 100644 --- a/guix/cvs-download.scm +++ b/guix/cvs-download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2015 Mark H Weaver ;;; @@ -92,6 +92,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "cvs-checkout") build + #:leaked-env-vars '("http_proxy" "https_proxy" + "LC_ALL" "LC_MESSAGES" "LANG" + "COLUMNS") #:system system #:hash-algo hash-algo #:hash hash diff --git a/guix/git-download.scm b/guix/git-download.scm index c62bb8ad0f..1eae035fc4 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -157,6 +157,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." ("git commit" . ,(git-reference-commit ref)) ("git recursive?" . ,(object->string (git-reference-recursive? ref)))) + #:leaked-env-vars '("http_proxy" "https_proxy" + "LC_ALL" "LC_MESSAGES" "LANG" + "COLUMNS") #:system system #:local-build? #t ;don't offload repo cloning diff --git a/guix/hg-download.scm b/guix/hg-download.scm index 6b25b87b6b..4cdc1a780a 100644 --- a/guix/hg-download.scm +++ b/guix/hg-download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2016 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -92,6 +92,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "hg-checkout") build + #:leaked-env-vars '("http_proxy" "https_proxy" + "LC_ALL" "LC_MESSAGES" "LANG" + "COLUMNS") #:system system #:local-build? #t ;don't offload repo cloning #:hash-algo hash-algo diff --git a/guix/svn-download.scm b/guix/svn-download.scm index 5c25437059..4139cbc2e2 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2019 Ludovic Courtès ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; @@ -131,6 +131,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (mlet %store-monad ((guile (package->derivation guile system))) (gexp->derivation (or name "svn-checkout") build + #:leaked-env-vars '("http_proxy" "https_proxy" + "LC_ALL" "LC_MESSAGES" "LANG" + "COLUMNS") #:system system #:hash-algo hash-algo #:hash hash -- cgit v1.2.3 From e1e3fe08480868f960eea3ec1584c0c12b022e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 5 Sep 2019 18:31:03 +0200 Subject: guix-install.sh: Work around locale issues in 'guix-daemon.service'. * etc/guix-install.sh (sys_enable_guix_daemon): Modify 'guix-daemon.service' to work around locale issues not fixed in 1.0.1. --- etc/guix-install.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 960313d462..bd3ab901ad 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -345,6 +345,17 @@ sys_enable_guix_daemon() { cp "${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \ /etc/systemd/system/; chmod 664 /etc/systemd/system/guix-daemon.service; + + # Work around , present in 1.0.1. + sed -i /etc/systemd/system/guix-daemon.service \ + -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/"; + + # Work around , present in 1.0.1. + if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null; + then sed -i /etc/systemd/system/guix-daemon.service \ + -e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8'; + fi; + systemctl daemon-reload && systemctl start guix-daemon && systemctl enable guix-daemon; } && -- cgit v1.2.3 From 5f9fe21d49fb976e63c93e981abe9304a7bbfcdc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 5 Sep 2019 18:26:30 +0200 Subject: gnu: umi-tools: Remove python-setuptools as an input. As this is provided by the build system. * gnu/packages/bioinformatics.scm (umi-tools)[inputs,native-inputs]: Remove python-setuptools. --- gnu/packages/bioinformatics.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f976cad22f..2ff5f2c948 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14673,16 +14673,14 @@ proximity within a reference genome.") "08y3vz1vcx09whmbsn722lcs6jl9wyrh9i4p3k8j4cb1i32bij4a")))) (build-system python-build-system) (inputs - `(("python-setuptools" ,python-setuptools) - ("python-pandas" ,python-pandas) + `(("python-pandas" ,python-pandas) ("python-future" ,python-future) ("python-scipy" ,python-scipy) ("python-matplotlib" ,python-matplotlib) ("python-regex" ,python-regex) ("python-pysam" ,python-pysam))) (native-inputs - `(("python-setuptools" ,python-setuptools) - ("python-cython" ,python-cython))) + `(("python-cython" ,python-cython))) (home-page "https://github.com/CGATOxford/UMI-tools") (synopsis "Tools for analyzing unique modular identifiers") (description "This package provides tools for dealing with @dfn{Unique -- cgit v1.2.3 From 067ea2989fce98f3f3f115534e2e685cfc681039 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 5 Sep 2019 18:31:25 +0200 Subject: gnu: python-pyfaidx: Remove python-setuptools as an input. As this is provided by the build system, and I'm assuming that it's not necessary to have it as a propagated input. * gnu/packages/bioinformatics.scm (python-pyfaidx)[propagated-inputs]: Remove python-setuptools. --- gnu/packages/bioinformatics.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2ff5f2c948..9e8d036623 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13433,8 +13433,7 @@ bgzipped text file that contains a pair of genomic coordinates per line.") "0y5zyjksj1rdglj601xd2bbni5abhdh622y3ck76chyzxz9z4rx8")))) (build-system python-build-system) (propagated-inputs - `(("python-setuptools" ,python-setuptools) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (home-page "http://mattshirley.com") (synopsis "Random access to fasta subsequences") (description -- cgit v1.2.3 From f480133c4eff49c8f25c951db7d3871aee99d80f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 13:16:06 +0200 Subject: gnu: libbigwig: Update to 0.4.4. * gnu/packages/bioinformatics.scm (libbigwig): Update to 0.4.4. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9e8d036623..f98f10a2c3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2353,16 +2353,16 @@ other types of unwanted sequence from high-throughput sequencing reads.") (define-public libbigwig (package (name "libbigwig") - (version "0.4.2") + (version "0.4.4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/dpryan79/libBigWig.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "0h2smg24v5srdcqzrmz2g23cmlp4va465mgx8r2z571sfz8pv454")))) + "09693dmf1scdac5pyq6qyn8b4mcipvnmc370k9a5z41z81m3dcsj")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 4526bd07f72d6687fe53c7e9692d7618242d9337 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 21:12:40 +0200 Subject: gnu: vigra-c: Update to 0.0.0-1.66ff4fa. * gnu/packages/image.scm (vigra-c): Update to 0.0.0-1.66ff4fa. [inputs]: Add hdf5. --- gnu/packages/image.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 670aeff85a..4e3fee53e2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1075,12 +1075,11 @@ multi-dimensional image processing.") (home-page "https://ukoethe.github.io/vigra/"))) (define-public vigra-c - (let* ((commit "a2ff675f42079e2623318d8ff8b4288dbe7a7f06") - (revision "0") - (version (git-version "0.0.0" revision commit))) + (let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7") + (revision "1")) (package (name "vigra-c") - (version version) + (version (git-version "0.0.0" revision commit)) (home-page "https://github.com/BSeppke/vigra_c") (source (origin (method git-fetch) @@ -1089,7 +1088,7 @@ multi-dimensional image processing.") (commit commit))) (sha256 (base32 - "1f1phmfbbz3dsq9330rd6bjmdg29hxskxi9l17cyx1f4mdqpgdgl")) + "1pnd92s284dvsg8zp6md7p8ck55bmcsryz58gzic7jh6m72hg689")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1099,6 +1098,7 @@ multi-dimensional image processing.") (inputs `(("fftw" ,fftw) ("fftwf" ,fftwf) + ("hdf5" ,hdf5) ("vigra" ,vigra))) (synopsis "C interface to the VIGRA computer vision library") (description -- cgit v1.2.3 From f1a46c9025f920ee19a5c60cb537b593f09a7428 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 15:38:13 +0200 Subject: gnu: texlive-fonts-iwona: Use double spacing in description. * gnu/packages/tex.scm (texlive-fonts-iwona)[description]: Use double spacing. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5be86e7d9e..c8cb008aaf 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5444,7 +5444,7 @@ TeX metrics (VF and TFM files) and macros for use with LaTeX.") as an alternative version of the Kurier typeface, which was designed in 1975 for a diploma in typeface design at the Warsaw Academy of Fine Arts under the supervision of Roman Tomaszewski. Kurier was designed for linotype -typesetting of newspapers and similar periodicals. The Iwona fonts are an +typesetting of newspapers and similar periodicals. The Iwona fonts are an alternative version of the Kurier fonts. The difference lies in the absence of ink traps which typify the Kurier font.") (license license:gfl1.0))) -- cgit v1.2.3 From 266e07421e6290f43c8269f9380327c2584db578 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 15:36:02 +0200 Subject: gnu: Add texlive-xcolor. * gnu/packages/tex.scm (texlive-latex-xcolor): Bind to deprecated package pointing... (texlive-color): ...to this variable; implement in terms of simple-texlive-package. [arguments]: Add phase "move-files" to install xcolor.pro to the expected location. --- gnu/packages/tex.scm | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c8cb008aaf..7838b16b1d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2875,30 +2875,45 @@ documents. It comprises the packages color, graphics, graphicx, trig, epsfig, keyval, and lscape.") (license license:lppl1.3c+))) -(define-public texlive-latex-xcolor - (package - (name "texlive-latex-xcolor") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "xcolor")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "01n613s7bcrd2n4jfawm0k4nn2ny3aaifp2jjfif3lz4sbv31494")))) - (build-system texlive-build-system) - (arguments '(#:tex-directory "latex/xcolor")) - (home-page "https://www.ctan.org/pkg/xcolor") - (synopsis "Driver-independent color extensions for LaTeX and pdfLaTeX") - (description - "The package starts from the basic facilities of the colorcolor package, +(define-public texlive-xcolor + (let ((template (simple-texlive-package + "texlive-xcolor" + (list "/doc/latex/xcolor/" + "/source/latex/xcolor/") + (base32 + "12q6spmpxg30alhvarjmxzigmz7lazapbrb0mc4vhbn6n1sdz7pp")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) + "latex/xcolor") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'chdir + (lambda _ (chdir "source/latex/xcolor") #t)) + (add-after 'install 'move-files + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/texmf-dist"))) + (mkdir-p (string-append share "/dvips/xcolor")) + (rename-file (string-append share "/tex/latex/xcolor/xcolor.pro") + (string-append share "/dvips/xcolor/xcolor.pro")) + #t))))))) + (home-page "https://www.ctan.org/pkg/xcolor") + (synopsis "Driver-independent color extensions for LaTeX and pdfLaTeX") + (description + "The package starts from the basic facilities of the colorcolor package, and provides easy driver-independent access to several kinds of color tints, shades, tones, and mixes of arbitrary colors. It allows a user to select a document-wide target color model and offers complete tools for conversion between eight color models. Additionally, there is a command for alternating row colors plus repeated non-aligned material (like horizontal lines) in tables.") - (license license:lppl1.2+))) + (license license:lppl1.2+)))) + +(define-public texlive-latex-xcolor + (deprecated-package "texlive-latex-xcolor" texlive-xcolor)) (define-public texlive-latex-hyperref (package -- cgit v1.2.3 From 73ce44218b8beb8e7f94777efb7bf500462cabf2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:12:40 +0200 Subject: gnu: Add texlive-ydoc. * gnu/packages/tex.scm (texlive-ydoc): New variable. --- gnu/packages/tex.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7838b16b1d..7b040ab7c7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7068,3 +7068,51 @@ the file to which it applies.") "This package helps LaTeX users to create PDF/X, PFD/A and other standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX.") (license license:lppl1.2+))) + +(define-public texlive-ydoc + (let ((template (simple-texlive-package + "texlive-ydoc" + (list "/doc/latex/ydoc/" + "/source/latex/ydoc/") + (base32 + "0ckcpy1b8v1fk3qc8qkxgiag2wc0qzxm6bgksv000m4m1hsi2g8b") + #:trivial? #f))) + (package + (inherit template) + (outputs '("out" "doc")) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) + "latex/ydoc") + ((#:build-targets _ #t) + ''("ydoc.dtx")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'chdir + (lambda _ (chdir "source/latex/ydoc") #t)) + (add-after 'copy-files 'move-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") + "/share/texmf-dist")) + (target (string-append share "/tex/generic/ydoc")) + (doc (string-append (assoc-ref outputs "doc") + "/share/texmf-dist/doc") )) + (mkdir-p target) + (for-each + (lambda (file) + (rename-file (string-append share "/tex/latex/ydoc/" file) + (string-append target "/" file))) + '("ydocincl.tex" "ydocstrip.tex")) + (mkdir-p doc) + (rename-file (string-append share "/doc") doc) + #t))))))) + (home-page "http://www.ctan.org/pkg/ydoc") + (synopsis "Macros for documentation of LaTeX classes and packages") + (description "The package provides macros and environments to document +LaTeX packages and classes. It is an (as yet unfinished) alternative to the +@code{ltxdoc} class and the @code{doc} or @code{xdoc} packages. The aim is to +provide a different layout and more modern styles (using the @code{xcolor}, +@code{hyperref} packages, etc.) This is an alpha release, and should probably +not (yet) be used with other packages, since the implementation might +change.") + (license license:lppl1.3+)))) -- cgit v1.2.3 From e5c081291eeb16afea28891e5b2199daa93a0ba3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:15:19 +0200 Subject: gnu: Add texlive-pstricks. * gnu/packages/tex.scm (texlive-pstricks): New variable. --- gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 7b040ab7c7..915f514944 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7116,3 +7116,31 @@ provide a different layout and more modern styles (using the @code{xcolor}, not (yet) be used with other packages, since the implementation might change.") (license license:lppl1.3+)))) + +(define-public texlive-pstricks + (let ((template (simple-texlive-package + "texlive-pstricks" + (list "/doc/generic/pstricks/" + "/dvips/pstricks/" + "/tex/generic/pstricks/" + "/tex/latex/pstricks/") + (base32 + "04566354c77claxl1sznc490cda0m5gaa5ck6ms4q7mm44rj3rzk") + #:trivial? #t))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:phases phases) + `(modify-phases ,phases + (delete 'reset-gzip-timestamps))))) + (home-page "http://www.ctan.org/pkg/pstricks") + (synopsis "PostScript macros for TeX") + (description "PSTricks offers an extensive collection of macros for +generating PostScript that is usable with most TeX macro formats, including +Plain TeX, LaTeX, AMS-TeX, and AMS-LaTeX. Included are macros for colour, +graphics, pie charts, rotation, trees and overlays. It has many special +features, including a wide variety of graphics (picture drawing) macros, with +a flexible interface and with colour support. There are macros for colouring +or shading the cells of tables.") + (license license:lppl1.3+)))) -- cgit v1.2.3 From a72d343aea5827f4c8491751ea2767f067005395 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:16:17 +0200 Subject: gnu: Add texlive-pst-text. * gnu/packages/tex.scm (texlive-pst-text): New variable. --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 915f514944..0fdd970dde 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7144,3 +7144,25 @@ features, including a wide variety of graphics (picture drawing) macros, with a flexible interface and with colour support. There are macros for colouring or shading the cells of tables.") (license license:lppl1.3+)))) + +(define-public texlive-pst-text + (let ((template (simple-texlive-package + "texlive-pst-text" + (list "/doc/generic/pst-text/" + "/source/generic/pst-text/Makefile" + "/dvips/pst-text/pst-text.pro" + "/tex/generic/pst-text/" + "/tex/latex/pst-text/") + (base32 + "0s2bbkdfy0shqrrkjflrn0x0pnvxzbdc38pjbdfw46wnmnxrnasm") + #:trivial? #t))) + (package + (inherit template) + (propagated-inputs + `(("texlive-pstricks" ,texlive-pstricks))) + (home-page "http://www.ctan.org/pkg/pst-text") + (synopsis "Text and character manipulation in PSTricks") + (description "Pst-text is a PSTricks based package for plotting text along +a different path and manipulating characters. It includes the functionality +of the old package @code{pst-char}.") + (license license:lppl)))) -- cgit v1.2.3 From 51bf1c518853badaebc48ac1144e5afd9b5862c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:16:25 +0200 Subject: gnu: Add texlive-iftex. * gnu/packages/tex.scm (texlive-iftex): New variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0fdd970dde..b792e72693 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7166,3 +7166,23 @@ or shading the cells of tables.") a different path and manipulating characters. It includes the functionality of the old package @code{pst-char}.") (license license:lppl)))) + +(define-public texlive-iftex + (let ((template (simple-texlive-package + "texlive-iftex" + (list "/doc/generic/iftex/" + "/tex/generic/iftex/iftex.sty") + (base32 + "089zvw31gby150n1k0zdk2c0q97pgbqs46phxydaqil64b55nnl7") + #:trivial? #t))) + (package + (inherit template) + (home-page "http://www.ctan.org/pkg/iftex") + (synopsis "Determine the currently used TeX engine") + (description "This package, which works both for Plain TeX and for +LaTeX, defines the @code{\\ifPDFTeX}, @code{\\ifXeTeX}, and @code{\\ifLuaTeX} +conditionals for testing which engine is being used for typesetting. The +package also provides the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and +@code{\\RequireLuaTeX} commands which throw an error if pdfTeX, XeTeX or +LuaTeX (respectively) is not the engine in use.") + (license license:lppl1.3+)))) -- cgit v1.2.3 From 99b143655bfdb037d6954447dfee866d473d9594 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:22:26 +0200 Subject: gnu: Add texlive-tools. * gnu/packages/tex.scm (texlive-tools): New variable. --- gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b792e72693..bc3d52104f 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7186,3 +7186,34 @@ package also provides the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and @code{\\RequireLuaTeX} commands which throw an error if pdfTeX, XeTeX or LuaTeX (respectively) is not the engine in use.") (license license:lppl1.3+)))) + +(define-public texlive-tools + (let ((template (simple-texlive-package + "texlive-tools" + (list "/doc/latex/tools/" + "/source/latex/tools/") + (base32 + "0v3zqcpy0w5bzy1xdcv1wnxbmxrn1j6x03h3y2af7qmjggph2a09")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ '()) + "latex/tools") + ((#:build-targets _ '()) + ''("tools.ins")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'chdir + (lambda _ (chdir "source/latex/tools") #t)))))) + (home-page "https://www.ctan.org/tex-archive/macros/latex/required/tools/") + (synopsis "LaTeX standard tools bundle") + (description "This package provides a collection of simple tools that +are part of the LaTeX required tools distribution, comprising the packages: +@code{afterpage}, @code{array}, @code{bm}, @code{calc}, @code{dcolumn}, +@code{delarray}, @code{enumerate}, @code{fileerr}, @code{fontsmpl}, +@code{ftnright}, @code{hhline}, @code{indentfirst}, @code{layout}, +@code{longtable}, @code{multicol}, @code{rawfonts}, @code{showkeys}, +@code{somedefs}, @code{tabularx}, @code{theorem}, @code{trace}, +@code{varioref}, @code{verbatim}, @code{xr}, and @code{xspace}.") + (license license:lppl1.3+)))) -- cgit v1.2.3 From f16e09487b94a14717f271a0067525bedba9dddc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:22:55 +0200 Subject: gnu: texlive-latex-xkeyval: Fix build. * gnu/packages/tex.scm (texlive-latex-xkeyval)[arguments]: Add various custom build phases to fix the build. [native-inputs]: Add texlive-latex-base, texlive-cm, texlive-lm, texlive-url, texlive-graphics-def, texlive-xcolor, texlive-latex-footmisc, texlive-latex-listings, texlive-iftex, texlive-pstricks, texlive-pst-text, texlive-tools, and texlive-latex-pgf. --- gnu/packages/tex.scm | 103 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 25 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bc3d52104f..a6d6539e71 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3974,31 +3974,6 @@ with a user specified LaTeX construction, properly aligned, scaled, and/or rotated.") (license (license:fsf-free "file://psfrag.dtx")))) -(define-public texlive-latex-xkeyval - (package - (name "texlive-latex-xkeyval") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "xkeyval")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0wancavix39j240pd8m9cgmwsijwx6jd6n54v8wg0x2rk5m44myp")))) - (build-system texlive-build-system) - (arguments '(#:tex-directory "latex/xkeyval")) - (home-page "https://www.ctan.org/pkg/xkeyval") - (synopsis "Macros for defining and setting keys") - (description - "This package is an extension of the @code{keyval} package and offers -more flexible macros for defining and setting keys. The package provides a -pointer and a preset system. Furthermore, it supplies macros to allow class -and package options to contain options of the @code{key=value} form. A LaTeX -kernel patch is provided to avoid premature expansions of macros in class or -package options. A specialized system for setting @code{PSTricks} keys is -provided by the @code{pst-xkey} package.") - (license license:lppl1.3+))) - (define-public texlive-pstool (package (inherit (simple-texlive-package @@ -7217,3 +7192,81 @@ are part of the LaTeX required tools distribution, comprising the packages: @code{somedefs}, @code{tabularx}, @code{theorem}, @code{trace}, @code{varioref}, @code{verbatim}, @code{xr}, and @code{xspace}.") (license license:lppl1.3+)))) + +(define-public texlive-latex-xkeyval + (package + (name "texlive-latex-xkeyval") + (version (number->string %texlive-revision)) + (source (origin + (method svn-fetch) + (uri (texlive-ref "latex" "xkeyval")) + (sha256 + (base32 + "0wancavix39j240pd8m9cgmwsijwx6jd6n54v8wg0x2rk5m44myp")))) + (build-system texlive-build-system) + (arguments + '(#:tex-directory "latex/xkeyval" + #:build-targets '("xkeyval.dtx") + #:tex-format "latex" ; won't build with luatex + #:phases + (modify-phases %standard-phases + ;; This package cannot be built out of tree as it expects to find + ;; built files in the working directory. + (add-before 'build 'fix-build + (lambda _ + (setenv "TEXINPUTS" + (string-append (getcwd) "/build:")) + (substitute* "xkeyval.dtx" + (("usepackage\\{xcolor\\}") + "usepackage[dvips]{xcolor}")) + #t)) + ;; FIXME: We don't have a package for this font yet. + (add-after 'unpack 'remove-dependency-on-fourier + (lambda _ + (substitute* "xkeyval.dtx" + (("\\\\usepackage\\{fourier\\}") "")) + #t)) + (add-after 'install 'move-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/texmf-dist")) + (source (string-append share "/tex/latex/xkeyval/")) + (target (string-append share "/tex/generic/xkeyval/"))) + (mkdir-p target) + (for-each (lambda (file) + (rename-file (string-append source file) + (string-append target file))) + '("keyval.tex" + "pst-xkey.tex" + "xkeyval.tex" + "xkvex1.tex" + "xkvex2.tex" + "xkvex3.tex" + "xkvex4.tex" + "xkvtxhdr.tex" + "xkvutils.tex")) + #t)))))) + (native-inputs + `(("texlive-latex-base" ,texlive-latex-base) + ("texlive-cm" ,texlive-cm) + ("texlive-lm" ,texlive-lm) + ("texlive-url" ,texlive-url) + ("texlive-graphics-def" ,texlive-graphics-def) + ("texlive-xcolor" ,texlive-xcolor) + ("texlive-latex-footmisc" ,texlive-latex-footmisc) + ("texlive-latex-listings" ,texlive-latex-listings) + ("texlive-iftex" ,texlive-iftex) + ("texlive-pstricks" ,texlive-pstricks) + ("texlive-pst-text" ,texlive-pst-text) + ("texlive-tools" ,texlive-tools) + ("texlive-latex-pgf" ,texlive-latex-pgf))) + (home-page "http://www.ctan.org/pkg/xkeyval") + (synopsis "Extension of the keyval package") + (description + "This package is an extension of the keyval package and offers additional +macros for setting keys and declaring and setting class or package options. +The package allows the programmer to specify a prefix to the name of the +macros it defines for keys, and to define families of key definitions; these +all help use in documents where several packages define their own sets of +keys.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 11ecf9f48f53b3263240e714cf1de859a9db6149 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:24:33 +0200 Subject: gnu: Add texlive-standalone. * gnu/packages/tex.scm (texlive-standalone): New variable. --- gnu/packages/tex.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a6d6539e71..c5e36af064 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7270,3 +7270,32 @@ macros it defines for keys, and to define families of key definitions; these all help use in documents where several packages define their own sets of keys.") (license license:lppl1.3+))) + +(define-public texlive-standalone + (package + (name "texlive-standalone") + (version (number->string %texlive-revision)) + (source + (origin + (method svn-fetch) + (uri (texlive-ref "latex" "standalone")) + (sha256 + (base32 + "192ydxcn8ir96q8qwvnppksmqf5i0p50i0wz6iqazbwmh3dqxpx4")))) + (build-system texlive-build-system) + (arguments '(#:tex-directory "latex/standalone")) + (propagated-inputs + `(("texlive-latex-xkeyval" ,texlive-latex-xkeyval))) + (native-inputs + `(("texlive-ydoc" ,texlive-ydoc))) + (home-page "http://www.ctan.org/pkg/standalone") + (synopsis "Compile TeX pictures stand-alone or as part of a document") + (description "A class and package is provided which allows TeX pictures or +other TeX code to be compiled standalone or as part of a main document. +Special support for pictures with beamer overlays is also provided. The +package is used in the main document and skips extra preambles in sub-files. +The class may be used to simplify the preamble in sub-files. By default the +@code{preview} package is used to display the typeset code without margins. +The behaviour in standalone mode may adjusted using a configuration file +@code{standalone.cfg} to redefine the standalone environment.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 69f0c8cf5566848f0065f84d73c7d76e01475842 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:24:45 +0200 Subject: gnu: Add texlive-siunitx. * gnu/packages/tex.scm (texlive-siunitx): New variable. --- gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c5e36af064..2b15ffb0cd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7299,3 +7299,41 @@ The class may be used to simplify the preamble in sub-files. By default the The behaviour in standalone mode may adjusted using a configuration file @code{standalone.cfg} to redefine the standalone environment.") (license license:lppl1.3+))) + +(define-public texlive-siunitx + (package + (name "texlive-siunitx") + (version (number->string %texlive-revision)) + (source (texlive-origin + name version + (list "/source/latex/siunitx/siunitx.dtx" + "/doc/latex/siunitx/README.md") + (base32 + "0dmljnxgv2bwl3mi74iil41q03swvrm1b0ziwxlhc4m9lx31b1q1"))) + (build-system texlive-build-system) + (arguments + '(#:tex-directory "latex/siunitx" + #:build-targets '("siunitx.dtx") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "source/latex/siunitx") #t))))) + (propagated-inputs + `(("texlive-latex-l3kernel" ,texlive-latex-l3kernel) + ("texlive-latex-l3packages" ,texlive-latex-l3packages))) + (home-page "http://www.ctan.org/pkg/siunitx") + (synopsis "Comprehensive SI units package") + (description + "Typesetting values with units requires care to ensure that the combined +mathematical meaning of the value plus unit combination is clear. In +particular, the SI units system lays down a consistent set of units with rules +on how they are to be used. However, different countries and publishers have +differing conventions on the exact appearance of numbers (and units). A +number of LaTeX packages have been developed to provide consistent application +of the various rules. The @code{siunitx} package takes the best from the +existing packages, and adds new features and a consistent interface. A number +of new ideas have been incorporated, to fill gaps in the existing provision. +The package also provides backward-compatibility with @code{SIunits}, +@code{sistyle}, @code{unitsdef} and @code{units}. The aim is to have one +package to handle all of the possible unit-related needs of LaTeX users.") + (license license:lppl1.3c))) -- cgit v1.2.3 From 66d213350019f94c95e8a3f7efb7dfb2de8894ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:24:57 +0200 Subject: gnu: Add texlive-booktabs. * gnu/packages/tex.scm (texlive-booktabs): New variable. --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2b15ffb0cd..43e1c44c72 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7337,3 +7337,25 @@ The package also provides backward-compatibility with @code{SIunits}, @code{sistyle}, @code{unitsdef} and @code{units}. The aim is to have one package to handle all of the possible unit-related needs of LaTeX users.") (license license:lppl1.3c))) + +(define-public texlive-booktabs + (package + (name "texlive-booktabs") + (version (number->string %texlive-revision)) + (source + (origin + (method svn-fetch) + (uri (texlive-ref "latex" "booktabs")) + (sha256 + (base32 + "1dqid48vgh25wmw8xzmx6x3pfgz1y9f0r8aza1yxq2mjny5yf68x")))) + (build-system texlive-build-system) + (arguments '(#:tex-directory "latex/booktabs")) + (home-page "http://www.ctan.org/pkg/booktabs") + (synopsis "Publication quality tables in LaTeX") + (description + "This package enhances the quality of tables in LaTeX, providing extra +commands as well as behind-the-scenes optimisation. Guidelines are given as +to what constitutes a good table in this context. The package offers +@code{longtable} compatibility.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 09e2f258428281e20955b85fc859f7a48d948a34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 14:57:16 +0200 Subject: gnu: texlive-latex-base: Ensure that extra sources are installed. * gnu/packages/tex.scm (texlive-latex-base): Use simple-texlive-package to install additional files. --- gnu/packages/tex.scm | 409 +++++++++++++++++++++++++-------------------------- 1 file changed, 204 insertions(+), 205 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 43e1c44c72..01567ca153 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2508,214 +2508,213 @@ formats.") (license license:lppl))) (define-public texlive-latex-base - (package - (name "texlive-latex-base") - (version (number->string %texlive-revision)) - (source (texlive-origin - name version - (list "/doc/latex/base/" - "/source/latex/base/" - ;; Almost all files in /tex/latex/base are generated, but - ;; these are not: - "/tex/latex/base/idx.tex" - "/tex/latex/base/lablst.tex" - "/tex/latex/base/lppl.tex" - "/tex/latex/base/ltnews.cls" - "/tex/latex/base/ltxcheck.tex" - "/tex/latex/base/ltxguide.cls" - "/tex/latex/base/minimal.cls" - "/tex/latex/base/sample2e.tex" - "/tex/latex/base/small2e.tex" - "/tex/latex/base/source2e.tex" - "/tex/latex/base/testpage.tex" - "/tex/latex/base/texsys.cfg") - (base32 - "0f8d41wk1gb7i6xq1a10drwhhayc50pg9nwzjkrqnxrv0pcc08w5"))) - (build-system gnu-build-system) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 match) - (srfi srfi-26)) - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - ;; Find required fonts - (setenv "TFMFONTS" - (string-join - (map (match-lambda - ((pkg-name . dir) - (string-append - (assoc-ref inputs pkg-name) - "/share/texmf-dist/fonts/tfm/public" - dir))) - '(("texlive-etex" . "/etex") - ("texlive-cm" . "/cm") - ("texlive-fonts-latex" . "/latex-fonts") - ("texlive-fonts-knuth-lib" . "/knuth-lib"))) - ":")) - (let ((cwd (getcwd))) - (setenv "TEXINPUTS" - (string-append - cwd "//:" - cwd "/source/latex/base//:" - cwd "/build:" - (string-join - (map (match-lambda ((_ . dir) dir)) inputs) - "//:")))) - - ;; This is the actual build step. - (mkdir "build") - (invoke "tex" "-ini" "-interaction=scrollmode" - "-output-directory=build" "unpack.ins") - - ;; XXX: We can't build all formats at this point, nor are they - ;; part of the LaTeX base, so we disable them. Actually, we - ;; should be running this all in a profile hook, so that only - ;; selected formats and hyphenation patterns are included, but it - ;; takes long and TeX Live isn't designed to be modular like - ;; that. Everything operates on a shared directory, which we - ;; would only have at profile generation time. - (let ((disabled-formats - '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex" - "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex" - "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex" - "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex" - "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex" - "mptopdf pdftex" "uplatex euptex" "jadetex pdftex" - "amstex pdftex" "pdfcslatex pdftex" "lollipop tex" - "xmltex pdftex" "pdfjadetex pdftex" "eplain pdftex" - "texsis pdftex" "mltex pdftex" "utf8mex pdftex"))) - (mkdir "web2c") - (install-file (string-append - (assoc-ref inputs "texlive-kpathsea") - "/share/texmf-dist/web2c/fmtutil.cnf") - "web2c") - (make-file-writable "web2c/fmtutil.cnf") - (substitute* "web2c/fmtutil.cnf" - (((string-append "^(" (string-join disabled-formats "|") ")") m) - (string-append "#! " m)))) - (invoke "fmtutil-sys" "--all" - "--fmtdir=web2c" - (string-append "--cnffile=web2c/fmtutil.cnf")) - ;; We don't actually want to install it. - (delete-file "web2c/fmtutil.cnf") - #t)) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (root (string-append out "/share/texmf-dist")) - (target (string-append root "/tex/latex/base")) - (web2c (string-append root "/web2c")) - (makeindex (string-append root "/makeindex/latex"))) - (for-each delete-file (find-files "." "\\.(log|aux)$")) - - ;; The usedir directive in docstrip.ins is ignored, so these - ;; two files end up in the wrong place. Move them. - (mkdir-p makeindex) - (for-each (lambda (file) - (install-file file makeindex) - (delete-file file)) - '("build/gglo.ist" - "build/gind.ist")) - (for-each (cut install-file <> target) - (find-files "build" ".*")) - (for-each (cut install-file <> web2c) - (find-files "web2c" ".*")) - #t)))))) - (native-inputs - `(("texlive-bin" ,texlive-bin) - ("texlive-tex-ini-files" ,texlive-tex-ini-files) - ("texlive-tex-plain" ,texlive-tex-plain) - ("texlive-kpathsea" ,texlive-kpathsea) - ("texlive-cm" ,texlive-cm) - ("texlive-fonts-latex" ,texlive-fonts-latex) - ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) - ("texlive-luatexconfig" - ,(texlive-origin - "texlive-luatexconfig" (number->string %texlive-revision) - (list "/tex/generic/config/luatex-unicode-letters.tex" - "/tex/generic/config/luatexiniconfig.tex" - "/web2c/texmfcnf.lua") - (base32 - "0cs67a8wwh4s5p5gn8l49jyccgy7glw8mfq5klgn3dfsl2fdlhk7"))))) - (propagated-inputs - `(("texlive-dehyph-exptl" ,texlive-dehyph-exptl) - ("texlive-etex" ,texlive-etex) - ("texlive-hyph-utf8" ,texlive-hyph-utf8) - ("texlive-hyphen-base" ,texlive-hyphen-base) - ("texlive-hyphen-afrikaans" ,texlive-hyphen-afrikaans) - ("texlive-hyphen-ancientgreek" ,texlive-hyphen-ancientgreek) - ("texlive-hyphen-armenian" ,texlive-hyphen-armenian) - ("texlive-hyphen-basque" ,texlive-hyphen-basque) - ("texlive-hyphen-belarusian" ,texlive-hyphen-belarusian) - ("texlive-hyphen-bulgarian" ,texlive-hyphen-bulgarian) - ("texlive-hyphen-catalan" ,texlive-hyphen-catalan) - ("texlive-hyphen-chinese" ,texlive-hyphen-chinese) - ("texlive-hyphen-churchslavonic" ,texlive-hyphen-churchslavonic) - ("texlive-hyphen-coptic" ,texlive-hyphen-coptic) - ("texlive-hyphen-croatian" ,texlive-hyphen-croatian) - ("texlive-hyphen-czech" ,texlive-hyphen-czech) - ("texlive-hyphen-danish" ,texlive-hyphen-danish) - ("texlive-hyphen-dutch" ,texlive-hyphen-dutch) - ("texlive-hyphen-english" ,texlive-hyphen-english) - ("texlive-hyphen-esperanto" ,texlive-hyphen-esperanto) - ("texlive-hyphen-estonian" ,texlive-hyphen-estonian) - ("texlive-hyphen-ethiopic" ,texlive-hyphen-ethiopic) - ("texlive-hyphen-finnish" ,texlive-hyphen-finnish) - ("texlive-hyphen-french" ,texlive-hyphen-french) - ("texlive-hyphen-friulan" ,texlive-hyphen-friulan) - ("texlive-hyphen-galician" ,texlive-hyphen-galician) - ("texlive-hyphen-georgian" ,texlive-hyphen-georgian) - ("texlive-hyphen-german" ,texlive-hyphen-german) - ("texlive-hyphen-greek" ,texlive-hyphen-greek) - ("texlive-hyphen-hungarian" ,texlive-hyphen-hungarian) - ("texlive-hyphen-icelandic" ,texlive-hyphen-icelandic) - ("texlive-hyphen-indic" ,texlive-hyphen-indic) - ("texlive-hyphen-indonesian" ,texlive-hyphen-indonesian) - ("texlive-hyphen-interlingua" ,texlive-hyphen-interlingua) - ("texlive-hyphen-irish" ,texlive-hyphen-irish) - ("texlive-hyphen-italian" ,texlive-hyphen-italian) - ("texlive-hyphen-kurmanji" ,texlive-hyphen-kurmanji) - ("texlive-hyphen-latin" ,texlive-hyphen-latin) - ("texlive-hyphen-latvian" ,texlive-hyphen-latvian) - ("texlive-hyphen-lithuanian" ,texlive-hyphen-lithuanian) - ("texlive-hyphen-mongolian" ,texlive-hyphen-mongolian) - ("texlive-hyphen-norwegian" ,texlive-hyphen-norwegian) - ("texlive-hyphen-occitan" ,texlive-hyphen-occitan) - ("texlive-hyphen-piedmontese" ,texlive-hyphen-piedmontese) - ("texlive-hyphen-polish" ,texlive-hyphen-polish) - ("texlive-hyphen-portuguese" ,texlive-hyphen-portuguese) - ("texlive-hyphen-romanian" ,texlive-hyphen-romanian) - ("texlive-hyphen-romansh" ,texlive-hyphen-romansh) - ("texlive-hyphen-russian" ,texlive-hyphen-russian) - ("texlive-hyphen-sanskrit" ,texlive-hyphen-sanskrit) - ("texlive-hyphen-serbian" ,texlive-hyphen-serbian) - ("texlive-hyphen-slovak" ,texlive-hyphen-slovak) - ("texlive-hyphen-slovenian" ,texlive-hyphen-slovenian) - ("texlive-hyphen-spanish" ,texlive-hyphen-spanish) - ("texlive-hyphen-swedish" ,texlive-hyphen-swedish) - ("texlive-hyphen-thai" ,texlive-hyphen-thai) - ("texlive-hyphen-turkish" ,texlive-hyphen-turkish) - ("texlive-hyphen-turkmen" ,texlive-hyphen-turkmen) - ("texlive-hyphen-ukrainian" ,texlive-hyphen-ukrainian) - ("texlive-hyphen-uppersorbian" ,texlive-hyphen-uppersorbian) - ("texlive-hyphen-welsh" ,texlive-hyphen-welsh) - ("texlive-unicode-data" ,texlive-unicode-data) - ("texlive-ukrhyph" ,texlive-ukrhyph) - ("texlive-ruhyphen" ,texlive-ruhyphen) - ("texlive-latexconfig" ,texlive-latexconfig))) - (home-page "https://www.ctan.org/pkg/latex-base") - (synopsis "Base sources of LaTeX") - (description - "This bundle comprises the source of LaTeX itself, together with several + (let ((template (simple-texlive-package + "texlive-latex-base" + (list "/doc/latex/base/" + "/source/latex/base/" + ;; Almost all files in /tex/latex/base are generated, but + ;; these are not: + "/tex/latex/base/idx.tex" + "/tex/latex/base/lablst.tex" + "/tex/latex/base/lppl.tex" + "/tex/latex/base/ltnews.cls" + "/tex/latex/base/ltxcheck.tex" + "/tex/latex/base/ltxguide.cls" + "/tex/latex/base/minimal.cls" + "/tex/latex/base/sample2e.tex" + "/tex/latex/base/small2e.tex" + "/tex/latex/base/source2e.tex" + "/tex/latex/base/testpage.tex" + "/tex/latex/base/texsys.cfg") + (base32 + "0f8d41wk1gb7i6xq1a10drwhhayc50pg9nwzjkrqnxrv0pcc08w5") + #:trivial? #t))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:modules modules '()) + '((guix build gnu-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-26))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + ;; Find required fonts + (setenv "TFMFONTS" + (string-join + (map (match-lambda + ((pkg-name . dir) + (string-append + (assoc-ref inputs pkg-name) + "/share/texmf-dist/fonts/tfm/public" + dir))) + '(("texlive-etex" . "/etex") + ("texlive-cm" . "/cm") + ("texlive-fonts-latex" . "/latex-fonts") + ("texlive-fonts-knuth-lib" . "/knuth-lib"))) + ":")) + (let ((cwd (getcwd))) + (setenv "TEXINPUTS" + (string-append + cwd "//:" + cwd "/source/latex/base//:" + cwd "/build:" + (string-join + (map (match-lambda ((_ . dir) dir)) inputs) + "//:")))) + + ;; This is the actual build step. + (mkdir "build") + (invoke "tex" "-ini" "-interaction=scrollmode" + "-output-directory=build" "unpack.ins") + + ;; XXX: We can't build all formats at this point, nor are they + ;; part of the LaTeX base, so we disable them. Actually, we + ;; should be running this all in a profile hook, so that only + ;; selected formats and hyphenation patterns are included, but it + ;; takes long and TeX Live isn't designed to be modular like + ;; that. Everything operates on a shared directory, which we + ;; would only have at profile generation time. + (let ((disabled-formats + '("aleph aleph" "lamed aleph" "uptex uptex" "euptex euptex" + "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex" + "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex" + "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex" + "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex" + "mptopdf pdftex" "uplatex euptex" "jadetex pdftex" + "amstex pdftex" "pdfcslatex pdftex" "lollipop tex" + "xmltex pdftex" "pdfjadetex pdftex" "eplain pdftex" + "texsis pdftex" "mltex pdftex" "utf8mex pdftex"))) + (mkdir "web2c") + (install-file (string-append + (assoc-ref inputs "texlive-kpathsea") + "/share/texmf-dist/web2c/fmtutil.cnf") + "web2c") + (make-file-writable "web2c/fmtutil.cnf") + (substitute* "web2c/fmtutil.cnf" + (((string-append "^(" (string-join disabled-formats "|") ")") m) + (string-append "#! " m)))) + (invoke "fmtutil-sys" "--all" + "--fmtdir=web2c" + (string-append "--cnffile=web2c/fmtutil.cnf")) + ;; We don't actually want to install it. + (delete-file "web2c/fmtutil.cnf") + #t)) + (add-after 'install 'install-more + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (root (string-append out "/share/texmf-dist")) + (target (string-append root "/tex/latex/base")) + (web2c (string-append root "/web2c")) + (makeindex (string-append root "/makeindex/latex"))) + (for-each delete-file (find-files "." "\\.(log|aux)$")) + + ;; The usedir directive in docstrip.ins is ignored, so these + ;; two files end up in the wrong place. Move them. + (mkdir-p makeindex) + (for-each (lambda (file) + (install-file file makeindex) + (delete-file file)) + '("build/gglo.ist" + "build/gind.ist")) + (for-each (cut install-file <> target) + (find-files "build" ".*")) + (for-each (cut install-file <> web2c) + (find-files "web2c" ".*")) + #t))))))) + (native-inputs + `(("texlive-bin" ,texlive-bin) + ("texlive-tex-ini-files" ,texlive-tex-ini-files) + ("texlive-tex-plain" ,texlive-tex-plain) + ("texlive-kpathsea" ,texlive-kpathsea) + ("texlive-cm" ,texlive-cm) + ("texlive-fonts-latex" ,texlive-fonts-latex) + ("texlive-fonts-knuth-lib" ,texlive-fonts-knuth-lib) + ("texlive-luatexconfig" + ,(texlive-origin + "texlive-luatexconfig" (number->string %texlive-revision) + (list "/tex/generic/config/luatex-unicode-letters.tex" + "/tex/generic/config/luatexiniconfig.tex" + "/web2c/texmfcnf.lua") + (base32 + "0cs67a8wwh4s5p5gn8l49jyccgy7glw8mfq5klgn3dfsl2fdlhk7"))))) + (propagated-inputs + `(("texlive-dehyph-exptl" ,texlive-dehyph-exptl) + ("texlive-etex" ,texlive-etex) + ("texlive-hyph-utf8" ,texlive-hyph-utf8) + ("texlive-hyphen-base" ,texlive-hyphen-base) + ("texlive-hyphen-afrikaans" ,texlive-hyphen-afrikaans) + ("texlive-hyphen-ancientgreek" ,texlive-hyphen-ancientgreek) + ("texlive-hyphen-armenian" ,texlive-hyphen-armenian) + ("texlive-hyphen-basque" ,texlive-hyphen-basque) + ("texlive-hyphen-belarusian" ,texlive-hyphen-belarusian) + ("texlive-hyphen-bulgarian" ,texlive-hyphen-bulgarian) + ("texlive-hyphen-catalan" ,texlive-hyphen-catalan) + ("texlive-hyphen-chinese" ,texlive-hyphen-chinese) + ("texlive-hyphen-churchslavonic" ,texlive-hyphen-churchslavonic) + ("texlive-hyphen-coptic" ,texlive-hyphen-coptic) + ("texlive-hyphen-croatian" ,texlive-hyphen-croatian) + ("texlive-hyphen-czech" ,texlive-hyphen-czech) + ("texlive-hyphen-danish" ,texlive-hyphen-danish) + ("texlive-hyphen-dutch" ,texlive-hyphen-dutch) + ("texlive-hyphen-english" ,texlive-hyphen-english) + ("texlive-hyphen-esperanto" ,texlive-hyphen-esperanto) + ("texlive-hyphen-estonian" ,texlive-hyphen-estonian) + ("texlive-hyphen-ethiopic" ,texlive-hyphen-ethiopic) + ("texlive-hyphen-finnish" ,texlive-hyphen-finnish) + ("texlive-hyphen-french" ,texlive-hyphen-french) + ("texlive-hyphen-friulan" ,texlive-hyphen-friulan) + ("texlive-hyphen-galician" ,texlive-hyphen-galician) + ("texlive-hyphen-georgian" ,texlive-hyphen-georgian) + ("texlive-hyphen-german" ,texlive-hyphen-german) + ("texlive-hyphen-greek" ,texlive-hyphen-greek) + ("texlive-hyphen-hungarian" ,texlive-hyphen-hungarian) + ("texlive-hyphen-icelandic" ,texlive-hyphen-icelandic) + ("texlive-hyphen-indic" ,texlive-hyphen-indic) + ("texlive-hyphen-indonesian" ,texlive-hyphen-indonesian) + ("texlive-hyphen-interlingua" ,texlive-hyphen-interlingua) + ("texlive-hyphen-irish" ,texlive-hyphen-irish) + ("texlive-hyphen-italian" ,texlive-hyphen-italian) + ("texlive-hyphen-kurmanji" ,texlive-hyphen-kurmanji) + ("texlive-hyphen-latin" ,texlive-hyphen-latin) + ("texlive-hyphen-latvian" ,texlive-hyphen-latvian) + ("texlive-hyphen-lithuanian" ,texlive-hyphen-lithuanian) + ("texlive-hyphen-mongolian" ,texlive-hyphen-mongolian) + ("texlive-hyphen-norwegian" ,texlive-hyphen-norwegian) + ("texlive-hyphen-occitan" ,texlive-hyphen-occitan) + ("texlive-hyphen-piedmontese" ,texlive-hyphen-piedmontese) + ("texlive-hyphen-polish" ,texlive-hyphen-polish) + ("texlive-hyphen-portuguese" ,texlive-hyphen-portuguese) + ("texlive-hyphen-romanian" ,texlive-hyphen-romanian) + ("texlive-hyphen-romansh" ,texlive-hyphen-romansh) + ("texlive-hyphen-russian" ,texlive-hyphen-russian) + ("texlive-hyphen-sanskrit" ,texlive-hyphen-sanskrit) + ("texlive-hyphen-serbian" ,texlive-hyphen-serbian) + ("texlive-hyphen-slovak" ,texlive-hyphen-slovak) + ("texlive-hyphen-slovenian" ,texlive-hyphen-slovenian) + ("texlive-hyphen-spanish" ,texlive-hyphen-spanish) + ("texlive-hyphen-swedish" ,texlive-hyphen-swedish) + ("texlive-hyphen-thai" ,texlive-hyphen-thai) + ("texlive-hyphen-turkish" ,texlive-hyphen-turkish) + ("texlive-hyphen-turkmen" ,texlive-hyphen-turkmen) + ("texlive-hyphen-ukrainian" ,texlive-hyphen-ukrainian) + ("texlive-hyphen-uppersorbian" ,texlive-hyphen-uppersorbian) + ("texlive-hyphen-welsh" ,texlive-hyphen-welsh) + ("texlive-unicode-data" ,texlive-unicode-data) + ("texlive-ukrhyph" ,texlive-ukrhyph) + ("texlive-ruhyphen" ,texlive-ruhyphen) + ("texlive-latexconfig" ,texlive-latexconfig))) + (home-page "https://www.ctan.org/pkg/latex-base") + (synopsis "Base sources of LaTeX") + (description + "This bundle comprises the source of LaTeX itself, together with several packages which are considered \"part of the kernel\". This bundle, together with the required packages, constitutes what every LaTeX distribution should contain.") - (license license:lppl1.3c+))) + (license license:lppl1.3c+)))) (define-public texlive-latex-filecontents (package -- cgit v1.2.3 From 813ed0bd3d55796d32a705d953a89453de54c8e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 21:14:09 +0200 Subject: gnu: texlive-union: Fix font map generation. * gnu/packages/tex.scm (texlive-union)[arguments]: Exclude sed and coreutils from union; add sed to the PATH; run updmap-sys twice; delete ls-R to avoid lookup failures. --- gnu/packages/tex.scm | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 01567ca153..e6b2fd0b6a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3567,7 +3567,10 @@ standard LaTeX packages." ;; the updmap.cfg file) (match (filter (match-lambda ((name . _) - (not (member name '("bash" "updmap.cfg"))))) + (not (member name '("bash" + "coreutils" + "sed" + "updmap.cfg"))))) %build-inputs) (((names . directories) ...) (union-build (assoc-ref %outputs "out") @@ -3587,6 +3590,7 @@ standard LaTeX packages." (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin:" (assoc-ref %build-inputs "coreutils") "/bin:" + (assoc-ref %build-inputs "sed") "/bin:" (string-append out "/bin"))) (for-each (cut wrap-program <> @@ -3595,16 +3599,32 @@ standard LaTeX packages." (find-files (string-append out "/bin") ".*")) ;; Remove invalid maps from config file. - (let ((port (open-pipe* OPEN_WRITE "updmap-sys" - "--syncwithtrees" - "--nohash" - (assoc-ref %build-inputs "updmap.cfg")))) - (display "Y\n" port) - (when (not (zero? (status:exit-val (close-pipe port)))) - (error "failed to filter updmap.cfg"))) - ;; Generate maps. - (invoke "updmap-sys" "--force" - (string-append out "/share/texmf-config/web2c/updmap.cfg")) + (let ((web2c (string-append out "/share/texmf-config/web2c/")) + (maproot (string-append out "/share/texmf-dist/fonts/map/"))) + (mkdir-p web2c) + (copy-file + (assoc-ref %build-inputs "updmap.cfg") + (string-append web2c "updmap.cfg")) + (make-file-writable (string-append web2c "updmap.cfg")) + + (let* ((port (open-pipe* OPEN_WRITE "updmap-sys" + "--syncwithtrees" + "--nohash" + (string-append "--cnffile=" web2c "updmap.cfg")))) + (display "Y\n" port) + (when (not (zero? (status:exit-val (close-pipe port)))) + (error "failed to filter updmap.cfg"))) + ;; Generate maps. + (invoke "updmap-sys" + (string-append "--cnffile=" web2c "updmap.cfg") + (string-append "--dvipdfmxoutputdir=" + maproot "dvipdfmx/updmap/") + (string-append "--dvipsoutputdir=" + maproot "dvips/updmap/") + (string-append "--pdftexoutputdir=" + maproot "pdftex/updmap/")) + ;; Having this file breaks all file lookups later. + (delete-file (string-append out "/share/texmf-dist/ls-R"))) #t)))) (inputs `(("bash" ,bash) -- cgit v1.2.3 From 248965c91caf7d10433f090b4712a9b201968416 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 22:25:13 +0200 Subject: gnu: Add guile-cv. * gnu/packages/guile-xyz.scm (guile-cv): New variable. --- gnu/packages/guile-xyz.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b765ef36e1..29e83288f1 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2564,3 +2564,67 @@ Emacsy. It has a small C layer and most browser features are fully programmable in Guile. It has hooks, keymaps, and self documentation features.") (license license:gpl3+))) + +(define-public guile-cv + (package + (name "guile-cv") + (version "0.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/guile-cv/guile-cv-" + version ".tar.gz")) + (sha256 + (base32 + "0qdf0s2h1xj5lbhnc1pfw69i3zg08pqy2y6869b92ydfis8r82j9")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'prepare-build + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "configure" + (("SITEDIR=\"\\$datadir/guile-cv\"") + "SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\"") + (("SITECCACHEDIR=\"\\$libdir/guile-cv/") + "SITECCACHEDIR=\"$libdir/")) + (substitute* "cv/init.scm" + (("\\(dynamic-link \"libvigra_c\"\\)") + (string-append "(dynamic-link \"" + (assoc-ref inputs "vigra-c") + "/lib/libvigra_c\")")) + (("\\(dynamic-link \"libguile-cv\"\\)") + (format #f "~s" + `(dynamic-link + (format #f "~alibguile-cv" + (if (getenv "GUILE_CV_UNINSTALLED") + "" + ,(format #f "~a/lib/" + (assoc-ref outputs "out")))))))) + (setenv "GUILE_CV_UNINSTALLED" "1") + ;; Only needed to satisfy the configure script. + (setenv "LD_LIBRARY_PATH" + (string-append (assoc-ref inputs "vigra-c") "/lib")) + #t))))) + (inputs + `(("vigra" ,vigra) + ("vigra-c" ,vigra-c) + ("guile" ,guile-2.2))) + (native-inputs + `(("texlive" ,(texlive-union (list texlive-booktabs + texlive-lm + texlive-siunitx + texlive-standalone + texlive-xcolor + texlive-fonts-iwona))) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("guile-lib" ,guile-lib))) + (home-page "https://www.gnu.org/software/guile-cv/") + (synopsis "Computer vision library for Guile") + (description "Guile-CV is a Computer Vision functional programming library +for the Guile Scheme language. It is based on Vigra (Vision with Generic +Algorithms), a C++ image processing and analysis library. Guile-CV contains +bindings to Vigra C (a C wrapper to most of the Vigra functionality) and is +enriched with pure Guile Scheme algorithms, all accessible through a nice, +clean and easy to use high level API.") + (license license:gpl3+))) -- cgit v1.2.3 From 473d63607291ab71ee7fa917bb0bbc2b6f4d530a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 03:50:11 +0200 Subject: gnu: emacs-evil-multiedit: Enable tests. * gnu/packages/emacs-xyz.scm (emacs-evil-multiedit): Enable tests. [inputs]: Add emacs-ert-runner. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8f866fbc28..3cb4366925 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13923,6 +13923,18 @@ describing the key binding changes.") (propagated-inputs `(("emacs-evil" ,emacs-evil) ("emacs-iedit" ,emacs-iedit))) + (native-inputs + `(("emacs-ert-runner" ,emacs-ert-runner))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("@cask exec ") "")) + #t))) + #:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/hlissner/evil-multiedit") (synopsis "Multiple cursors for Evil mode") -- cgit v1.2.3 From 9b4ea95bbeb44db7a823f54f56da99aa3ca3422f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 04:44:28 +0200 Subject: gnu: emacs-evil-owl: Update to 0.0.1-3.24e5f43. * gnu/packages/emacs-xyz.scm (emacs-evil-owl): Update to 0.0.1-3.24e5f43. [source]: Enable tests. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3cb4366925..8d65955a7b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6736,8 +6736,8 @@ end of a line and increment or decrement it.") (license license:gpl3+)))) (define-public emacs-evil-owl - (let ((commit "e8fe5b2f745e36db04cb71eb689bf91c5409614f") - (revision "2")) + (let ((commit "24c5f43df375194386344e69bc720ea3986c9510") + (revision "3")) (package (name "emacs-evil-owl") (version (git-version "0.0.1" revision commit)) @@ -6750,10 +6750,13 @@ end of a line and increment or decrement it.") (file-name (git-file-name name version)) (sha256 (base32 - "1g7kplna62f271135mnjdbvxk2ayx7m4gvd6l86d2394alx16nhq")))) + "0bqzch14whlmrcasakah3psrzswvkzd7mmi8hx5s64kfp29wbdhi")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) + (arguments + `(#:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/mamapanda/evil-owl") (synopsis "Preview candidates when using Evil registers and marks") (description -- cgit v1.2.3 From 8deabdba58e0236ef03d2cefe69e342e6c4d4d29 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 08:31:01 +0200 Subject: gnu: emacs-elisp-demos: Enable tests. * gnu/packages/emacs-xyz.scm (emacs-elisp-demos): Enable tests. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8d65955a7b..4673967bd1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3091,7 +3091,10 @@ for Flow files.") (base32 "0lybadq66bl4snkwph9i1y0qxln29wyfjn222ii3nfwany28cj66")))) (build-system emacs-build-system) - (arguments '(#:include '("\\.el$" "\\.org$"))) + (arguments + `(#:include '("\\.el$" "\\.org$") + #:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/xuchunyang/elisp-demos/") (synopsis "Enhance @code{*Help*} buffers with additional examples") (description -- cgit v1.2.3 From a8afeb058e79214a9360862dab8861768b838e28 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 08:47:14 +0200 Subject: gnu: emacs-evil-expat: Enable tests. * gnu/packages/emacs-xyz.scm (emacs-evil-expat): Enable tests. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4673967bd1..8bbaf48c21 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6915,6 +6915,9 @@ aligning text objects based on separators.") "0872ix682hkdz0k8pn6sb54rqkx00rz5fxpd5j2snx406yagpaxz")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) + (arguments + `(#:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/edkolev/evil-expat") (synopsis "Extra @code{ex} commands for @code{evil-mode}") (description -- cgit v1.2.3 From 1acf8e7ea8b742f468cff641ec33ce1ced2cafe0 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 08:43:42 +0200 Subject: gnu: emacs-evil-exchange: Enable tests. * gnu/packages/emacs-xyz.scm (emacs-evil-exchange): Enable tests. [native-inputs]: Add emacs-ert-runner. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8bbaf48c21..b547f89459 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6786,6 +6786,17 @@ a popup window for previewing candidates.") "0bjpn4yqig17ddym6wqq5fm1b294q74hzcbj9a6gs97fqiwf88xa")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) + (native-inputs `(("emacs-ert-runner" ,emacs-ert-runner))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("cask exec ") "")) + #t))) + #:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/Dewdrops/evil-exchange") (synopsis "Exchange text easily within Evil") (description -- cgit v1.2.3 From d6ac801591c595f209ee0a893f60406177fd1355 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 08:55:32 +0200 Subject: gnu: emacs-sudo-edit: Enable tests. * gnu/packages/emacs-xyz.scm (emacs-sudo-edit): Enable tests. [native-inputs]: Add emacs-undercover. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b547f89459..bf6818425c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3129,11 +3129,10 @@ completion of relevant keywords.") (define-public emacs-sudo-edit (let ((commit "cc3d478937b1accd38742bfceba92af02ee9357d") - (version "0.1.0") (revision "6")) (package (name "emacs-sudo-edit") - (version (git-version version revision commit)) + (version (git-version "0.1.0" revision commit)) (source (origin (method git-fetch) @@ -3145,6 +3144,18 @@ completion of relevant keywords.") (base32 "1qv58x5j5a3v1s2ylhck1ykbfclq0mbi0gsvaql3nyv8cxazqlwl")))) (build-system emacs-build-system) + (native-inputs + `(("emacs-undercover" ,emacs-undercover))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("\\$\\(CASK\\) exec ") "")) + #t))) + #:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/nflath/sudo-edit/") (synopsis "Open files as another user") (description -- cgit v1.2.3 From 4278537e85b11807765136f19b43534413fca173 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 17:55:09 +0200 Subject: gnu: emacs-org-ql: Enable tests. * gnu/packages/emacs-xyz.scm (emacs-org-ql): Enable tests. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bf6818425c..04e92b7cbf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11345,6 +11345,11 @@ timestamps by providing a @code{ts} struct.") ("emacs-ts" ,emacs-ts) ("emacs-org" ,emacs-org) ("emacs-dash" ,emacs-dash))) + (native-inputs + `(("emacs-buttercup" ,emacs-buttercup))) + (arguments + `(#:tests? #t + #:test-command '("buttercup" "-L" "."))) (home-page "https://github.com/alphapapa/org-ql/") (synopsis "Query language for Org buffers") (description "This package provides a Lispy query language for Org -- cgit v1.2.3 From a9ca0325b55419d625ee461962528aa0522d473b Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 3 Sep 2019 22:55:54 +0200 Subject: gnu: emacs-evil-traces: Enable tests. * gnu/packages/emacs-xyz.scm (emacs-evil-traces): Enable tests. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 04e92b7cbf..5b4b2be904 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17597,6 +17597,17 @@ corresponding Evil keys.") (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-shell + ;; Setting the SHELL environment variable is required for the tests + ;; to find sh. + (lambda _ + (setenv "SHELL" (which "sh")) + #t))) + #:tests? #t + #:test-command '("make" "test"))) (home-page "https://github.com/mamapanda/evil-traces") (synopsis "Visual hints for @code{evil-ex}") (description "This package adds visual hints to certain @code{ex} -- cgit v1.2.3 From 141d8a896fd4806be9a127f3b314407c535dd27e Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 5 Sep 2019 23:43:24 +0200 Subject: gnu: emacs-flycheck-haskell: Include .hs file. * gnu/packages/emacs-xyz.scm (emacs-flycheck-haskell): Include package file. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5b4b2be904..abc9a5ba36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16594,11 +16594,10 @@ unescaping of quotes.") (define-public emacs-flycheck-haskell (let ((commit "32ddff87165a7d3a35e7318bee997b5b4bd41278") - (version "0.8") - (revision "79")) + (revision "2")) (package (name "emacs-flycheck-haskell") - (version (git-version version revision commit)) + (version (git-version "0.8" revision commit)) (source (origin (method git-fetch) @@ -16616,6 +16615,8 @@ unescaping of quotes.") ("emacs-flycheck" ,emacs-flycheck) ("emacs-haskell-mode" ,emacs-haskell-mode) ("emacs-let-alist" ,emacs-let-alist))) + (arguments + `(#:include '("\\.el$" "\\.hs$"))) (home-page "https://github.com/flycheck/flycheck-haskell") (synopsis "Flycheck for Haskell") (description "This package configures syntax-checking for Haskell -- cgit v1.2.3 From 14c9c456c740f125a843b11303e311e4ab311f07 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 13 Aug 2019 21:16:14 +0200 Subject: gnu: emacs-robe: Update to 0.8.2. * gnu/packages/emacs-xyz.scm (emacs-robe): Update to 0.8.2. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index abc9a5ba36..ab3365591f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2855,7 +2855,7 @@ mode-line.") (define-public emacs-robe (package (name "emacs-robe") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -2864,7 +2864,7 @@ mode-line.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq")))) + (base32 "0qw18wi54yg971n4wnjqkd8lqj5lbs9ra8bvmngif2bzhqlfdsbn")))) (build-system emacs-build-system) (arguments '(#:include (cons "^lib\\/" %default-include))) -- cgit v1.2.3 From 43931643a68363e1494a00227d3292806a9a7b4a Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 4 Sep 2019 12:01:37 +0200 Subject: gnu: Add emacs-leetcode. * gnu/packages/emacs-xyz.scm (emacs-leetcode): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ab3365591f..0ca1af9d05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15853,6 +15853,31 @@ buffers, etc. It also has plug-ins to help your Emacs life.") programs can use this table component for the application UI.") (license license:gpl3+)))) +(define-public emacs-leetcode + (let ((commit "8624496af9e105c3e07d88844b37ede87540d604") + (revision "1")) + (package + (name "emacs-leetcode") + (version (git-version "0" "1" commit)) + (home-page "https://github.com/ginqi7/leetcode-emacs.git") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ginqi7/leetcode-emacs") + (commit commit))) + (sha256 + (base32 + "11pp7ydlmwrv7djf9mwk4xzn295xbmdnj5x13bfj5yjpjr89p531")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-names" ,emacs-names) + ("emacs-ctable" ,emacs-ctable))) + (synopsis "Solve and submit LeetCode problems from within Emacs") + (description "This package provides an Emacs interface to LeetCode +allowing users to log in and solve problems of their choice using Emacs.") + (license license:unlicense)))) + (define-public emacs-epc (let ((commit "e1bfa5ca163273859336e3cc89b4b6460f7f8cda")) (package -- cgit v1.2.3 From 3b38bf141a464e1bb370af7d2b2651d1efb29781 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Sep 2019 12:23:57 +0200 Subject: =?UTF-8?q?services:=20Add=20=E2=80=98/usr/bin/env=E2=80=99=20spec?= =?UTF-8?q?ial=20file.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/base.scm (%base-services): Add ‘/usr/bin/env‘ to special-files-service-type. --- gnu/services/base.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index dcb7278f0f..a6439568f7 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 John Soo ;;; ;;; This file is part of GNU Guix. @@ -41,9 +42,9 @@ #:use-module (gnu packages admin) #:use-module ((gnu packages linux) #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools)) - #:use-module ((gnu packages base) - #:select (canonical-package glibc glibc-utf8-locales)) #:use-module (gnu packages bash) + #:use-module ((gnu packages base) + #:select (canonical-package coreutils glibc glibc-utf8-locales)) #:use-module (gnu packages package-management) #:use-module ((gnu packages gnupg) #:select (guile-gcrypt)) #:use-module (gnu packages linux) @@ -2425,6 +2426,9 @@ to handle." (service special-files-service-type `(("/bin/sh" ,(file-append (canonical-package bash) - "/bin/sh")))))) + "/bin/sh")) + "/bin/sh")) + ("/usr/bin/env" ,(file-append (canonical-package coreutils) + "/usr/bin/env")))))) ;;; base.scm ends here -- cgit v1.2.3 From e15f55208f8d0f93e075f681e36e86c65baa4405 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 6 Sep 2019 13:52:33 +0300 Subject: services: Fix typo. This is a follow-up to 3b38bf141a464e1bb370af7d2b2651d1efb29781. * gnu/services/base.scm (%base-services): Remove duplicated line. --- gnu/services/base.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index a6439568f7..97c53eeaf3 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2427,7 +2427,6 @@ to handle." (service special-files-service-type `(("/bin/sh" ,(file-append (canonical-package bash) "/bin/sh")) - "/bin/sh")) ("/usr/bin/env" ,(file-append (canonical-package coreutils) "/usr/bin/env")))))) -- cgit v1.2.3 From d2d63e20d5b981009b61bf416b4d7b516e8f1f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 6 Sep 2019 14:39:54 +0200 Subject: packages: 'generate-package-cache' uses 'supported-package?'. * gnu/packages.scm (generate-package-cache): Use 'supported-package?' instead of 'package-supported-systems'. --- gnu/packages.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages.scm b/gnu/packages.scm index 47e4f473b5..6633631c1f 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -393,9 +393,7 @@ reducing the memory footprint." ,(module-name module) ,symbol ,(package-outputs package) - ,(->bool - (member (%current-system) - (package-supported-systems package))) + ,(->bool (supported-package? package)) ,(->bool (package-superseded package)) ,@(let ((loc (package-location package))) (if loc -- cgit v1.2.3 From bc60349b5bc58a0b803df5adce1de6db82453744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 6 Sep 2019 14:41:58 +0200 Subject: packages: 'supported-package?' binds '%current-system' for graph traversal. Previously, (supported-package? coreutils "armhf-linux") with (%current-system) = "x86_64-linux" would return false. That's because 'supported-package?' would traverse the x86_64 dependency graph, which contains 'tcc-boot0', which supports x86 only. Consequently, 'supported-package?' would match only 53 packages for "armhf-linux" when running on x86, as is the case during continuous integration. * guix/packages.scm (package-transitive-supported-systems): Add an optional 'system' parameter. Use 'mlambda' instead of 'mlambdaq' for memoization. (supported-package?): Pass 'system' to 'package-transitive-supported-systems'. * tests/packages.scm ("package-transitive-supported-systems, implicit inputs") ("package-transitive-supported-systems: reduced binary seed, implicit inputs"): Remove calls to 'invalidate-memoization!', which no longer work and were presumably introduced to work around the bug we're fixing (see commit 0db65c168fd6dec57a357735fe130c80feba5460). * tests/packages.scm ("supported-package?"): Rewrite test to use only existing system name since otherwise 'bootstrap-executable' raises an exception. ("supported-package? vs. system-dependent graph"): New test. --- guix/packages.scm | 30 ++++++++++++++++++------------ tests/packages.scm | 36 +++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index d9eeee15a2..39ab28d807 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -767,23 +767,29 @@ in INPUTS and their transitive propagated inputs." (transitive-inputs inputs))) (define package-transitive-supported-systems - (mlambdaq (package) - "Return the intersection of the systems supported by PACKAGE and those + (let () + (define supported-systems + (mlambda (package system) + (parameterize ((%current-system system)) + (fold (lambda (input systems) + (match input + ((label (? package? package) . _) + (lset-intersection string=? systems + (supported-systems package system))) + (_ + systems))) + (package-supported-systems package) + (bag-direct-inputs (package->bag package)))))) + + (lambda* (package #:optional (system (%current-system))) + "Return the intersection of the systems supported by PACKAGE and those supported by its dependencies." - (fold (lambda (input systems) - (match input - ((label (? package? p) . _) - (lset-intersection - string=? systems (package-transitive-supported-systems p))) - (_ - systems))) - (package-supported-systems package) - (bag-direct-inputs (package->bag package))))) + (supported-systems package system)))) (define* (supported-package? package #:optional (system (%current-system))) "Return true if PACKAGE is supported on SYSTEM--i.e., if PACKAGE and all its dependencies are known to build on SYSTEM." - (member system (package-transitive-supported-systems package))) + (member system (package-transitive-supported-systems package system))) (define (bag-direct-inputs bag) "Same as 'package-direct-inputs', but applied to a bag." diff --git a/tests/packages.scm b/tests/packages.scm index 0478fff237..423c5061aa 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -341,7 +341,6 @@ (build-system gnu-build-system) (supported-systems `("does-not-exist" "foobar" ,@%supported-systems))))) - (invalidate-memoization! package-transitive-supported-systems) (parameterize ((%current-system "armhf-linux")) ; a traditionally-bootstrapped architecture (package-transitive-supported-systems p)))) @@ -354,17 +353,40 @@ (build-system gnu-build-system) (supported-systems `("does-not-exist" "foobar" ,@%supported-systems))))) - (invalidate-memoization! package-transitive-supported-systems) (parameterize ((%current-system "x86_64-linux")) (package-transitive-supported-systems p)))) (test-assert "supported-package?" - (let ((p (dummy-package "foo" - (build-system gnu-build-system) - (supported-systems '("x86_64-linux" "does-not-exist"))))) + (let* ((d (dummy-package "dep" + (build-system trivial-build-system) + (supported-systems '("x86_64-linux")))) + (p (dummy-package "foo" + (build-system gnu-build-system) + (inputs `(("d" ,d))) + (supported-systems '("x86_64-linux" "armhf-linux"))))) + (and (supported-package? p "x86_64-linux") + (not (supported-package? p "i686-linux")) + (not (supported-package? p "armhf-linux"))))) + +(test-assert "supported-package? vs. system-dependent graph" + ;; The inputs of a package can depend on (%current-system). Thus, + ;; 'supported-package?' must make sure that it binds (%current-system) + ;; appropriately before traversing the dependency graph. In the example + ;; below, 'supported-package?' must thus return true for both systems. + (let* ((p0a (dummy-package "foo-arm" + (build-system trivial-build-system) + (supported-systems '("armhf-linux")))) + (p0b (dummy-package "foo-x86_64" + (build-system trivial-build-system) + (supported-systems '("x86_64-linux")))) + (p (dummy-package "bar" + (build-system trivial-build-system) + (inputs + (if (string=? (%current-system) "armhf-linux") + `(("foo" ,p0a)) + `(("foo" ,p0b))))))) (and (supported-package? p "x86_64-linux") - (not (supported-package? p "does-not-exist")) - (not (supported-package? p "i686-linux"))))) + (supported-package? p "armhf-linux")))) (test-skip (if (not %store) 8 0)) -- cgit v1.2.3 From 5ef82ec8baff1e4f172b0cfbe46298547c47cef3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:02:33 +0300 Subject: gnu: Add rust-rand. * gnu/packages/crates-io.scm (rust-rand): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ebd3d4ded1..0ad3de9921 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1514,6 +1514,32 @@ to write.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-rand + (package + (name "rust-rand") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gfgnqfj2pyh27dcb720jpawskllwnbvxh816ddyykv269xz8ml3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-fuchsia-zircon" ,rust-fuchsia-zircon) + ("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi)))) + (home-page "https://crates.io/crates/rand") + (synopsis "Random number generators and other randomness functionality") + (description + "Rand provides utilities to generate random numbers, to convert them to +useful types and distributions, and some randomness-related algorithms.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rawpointer (package (name "rust-rawpointer") -- cgit v1.2.3 From 2f8e436a29d9a64828d23c79e80d2c563fc3ca19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:32:38 +0300 Subject: gnu: Add rust-rand-0.3. * gnu/packages/crates-io.scm (rust-rand-0.3): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0ad3de9921..8fb2f87da8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1540,6 +1540,24 @@ useful types and distributions, and some randomness-related algorithms.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-0.3 + (package + (inherit rust-rand) + (name "rust-rand") + (version "0.3.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-rand" ,rust-rand)))))) + (define-public rust-rawpointer (package (name "rust-rawpointer") -- cgit v1.2.3 From f81d58b8b3735282114e2a5c29b123e08afa7520 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:35:58 +0300 Subject: gnu: Add rust-tempdir. * gnu/packages/crates-io.scm (rust-tempdir): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8fb2f87da8..262c1e4116 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2102,6 +2102,32 @@ and Jaro-Winkler.") "This package provides helper test traits for synstructure doctests.") (license license:expat))) +(define-public rust-tempdir + (package + (name "rust-tempdir") + (version "0.3.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "tempdir" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand" ,rust-rand) + ("rust-remove-dir-all" ,rust-remove-dir-all)))) + (home-page + "https://github.com/rust-lang/tempdir") + (synopsis "Temporary directory management for Rust") + (description + "This package provides a library for managing a temporary directory and +deleting all contents when it's dropped.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-termcolor (package (name "rust-termcolor") -- cgit v1.2.3 From 90c48ddd76a8c2926d271d68199bb96537a483de Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:39:10 +0300 Subject: gnu: Add rust-adler32. * gnu/packages/crates-io.scm (rust-adler32): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 262c1e4116..753b144c46 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30,6 +30,30 @@ ;;; Please: Try to add new module packages in alphabetic order. ;;; +(define-public rust-adler32 + (package + (name "rust-adler32") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "adler32" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p7fxlnks9l7p7rwfqi7aqgnk2bps5zc0rjiw00mdw19nnbjjlky")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-rand" ,rust-rand)))) + (home-page "https://github.com/remram44/adler32-rs") + (synopsis "Implementation of the Adler32 rolling hash algorithm") + (description + "This library is an implementation of the Adler32 rolling hash algorithm in +the Rust programming language.") + (license (list license:bsd-3 + license:zlib)))) + (define-public rust-antidote (package (name "rust-antidote") -- cgit v1.2.3 From c988c9bb8588fecba465f4d689b44082e493e662 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:41:58 +0300 Subject: gnu: Add rust-base-x. * gnu/packages/crates-io.scm (rust-base-x): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 753b144c46..1c607161c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -121,6 +121,29 @@ support.") (license (list license:asl2.0 license:expat)))) +(define-public rust-base-x + (package + (name "rust-base-x") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "base-x" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hv4y5cdhv6bk0ghk2434clw8v4mmk5cc9lsh6qrpri92zlfmx3n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-bencher" ,rust-bencher) + ("rust-json" ,rust-json) + ("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/OrKoN/base-x-rs") + (synopsis "Encode/decode any base") + (description "This library provides for encoding and decoding any base.") + (license license:expat))) + (define-public rust-bencher (package (name "rust-bencher") -- cgit v1.2.3 From c2c0ac145183742ed04d58c0dc893886a5b07575 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:45:15 +0300 Subject: gnu: Add rust-rustc-serialize. * gnu/packages/crates-io.scm (rust-rustc-serialize): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1c607161c9..29d8da51d4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1728,6 +1728,32 @@ system calls.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-serialize + (package + (name "rust-rustc-serialize") + (version "0.3.24") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-serialize" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nkg3vasg7nk80ffkazizgiyv3hb1l9g3d8h17cajbkx538jiwfw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/rust-lang-deprecated/rustc-serialize") + (synopsis "Generic serialization/deserialization support") + (description + "This package provides generic serialization/deserialization support +corresponding to the @code{derive(RustcEncodable, RustcDecodable)} mode in the +compiler. Also includes support for hex, base64, and json encoding and +decoding.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rustc-std-workspace-core (package (name "rust-rustc-std-workspace-core") -- cgit v1.2.3 From 313778655e4a3bd69febb1af486513dc8d25e2f6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:49:00 +0300 Subject: gnu: Add rust-log. * gnu/packages/crates-io.scm (rust-log): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 29d8da51d4..ab022abc29 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1004,6 +1004,26 @@ the platform that libc is compiled for.") (license (list license:expat license:asl2.0)))) +(define-public rust-log + (package + (name "rust-log") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "log" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nsn28syc49vvjhxcfc8261rd1frhjc0r4bn9v3mqvps3ra7f3w8")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-lang-nursery/log") + (synopsis "Lightweight logging") + (description + "This package provides a lightweight logging facade for Rust") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-maplit (package (name "rust-maplit") -- cgit v1.2.3 From 5bd7965e115b473ad74ab22cb07364394a990ffc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:52:02 +0300 Subject: gnu: Add rust-cc. * gnu/packages/crates-io.scm (rust-cc): New variable. --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ab022abc29..9b715c7cf9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -230,6 +230,45 @@ behave like a set of bitflags.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cc + (package + (name "rust-cc") + (version "1.0.41") + (source + (origin + (method url-fetch) + (uri (crate-uri "cc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zxzd559dbbf1iwdzmkj7czapzccs17kqqmsj9ayijpdix5rrbld")))) + (build-system cargo-build-system) + (arguments + `(;#:cargo-inputs + ;(("rust-rayon" ,rust-rayon)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-optional-deps + (lambda _ + (substitute* "Cargo.toml.orig" + ((".*optional.*") "\n") + ((".*features.*") "") + ((".*parallel.*") "")) + (delete-file "Cargo.toml") + (copy-file "Cargo.toml.orig" "Cargo.toml") + #t))) + #:tests? #f)) ; Tests require cc-test from git repo. + (home-page "https://github.com/alexcrichton/cc-rs") + (synopsis "Invoke the native C compiler") + (description + "This package provides a build-time dependency for Cargo build scripts to +assist in invoking the native C compiler to compile native C code into a static +archive to be linked into Rustcode.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-cfg-if (package (name "rust-cfg-if") -- cgit v1.2.3 From 2446b451e2d92bc2ad5da0f1d877d306f32b84e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 16:55:17 +0300 Subject: gnu: Add rust-cmake. * gnu/packages/crates-io.scm (rust-cmake): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9b715c7cf9..b4a5c8f171 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -338,6 +338,30 @@ colorization.") "Low level interface to CloudABI. Contains all syscalls and related types.") (license license:bsd-2))) +(define-public rust-cmake + (package + (name "rust-cmake") + (version "0.1.42") + (source + (origin + (method url-fetch) + (uri (crate-uri "cmake" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qkwibkvx5xjazvv9v8gvdlpky2jhjxvcz014nrixgzqfyv2byw1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cc" ,rust-cc)))) + (home-page "https://github.com/alexcrichton/cmake-rs") + (synopsis "Rust build dependency for running cmake") + (description + "This package provides a build dependency for running @code{cmake} to build +a native library. The CMake executable is assumed to be @code{cmake} unless the +CMAKE environmental variable is set.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-constant-time-eq (package (name "rust-constant-time-eq") -- cgit v1.2.3 From e78973f45b0ebb259703b827a9b16abfee5e8112 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:08:00 +0300 Subject: gnu: Add rust-stacker. * gnu/packages/crates-io.scm (rust-stacker): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b4a5c8f171..b945091fdc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2152,6 +2152,33 @@ to the same address.") (license (list license:asl2.0 license:expat)))) +(define-public rust-stacker + (package + (name "rust-stacker") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "stacker" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0js0axz5nla1mkr2dm2vrv9rj964ng1lrv4l43sqlnfgawplhygv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if) + ("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi) + ("rust-cc" ,rust-cc)))) + (home-page "https://github.com/rust-lang/stacker") + (synopsis "Manual segmented stacks for Rust") + (description + "This package provides a stack growth library useful when implementing +deeply recursive algorithms that may accidentally blow the stack.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-stdweb-internal-runtime (package (name "rust-stdweb-internal-runtime") -- cgit v1.2.3 From 412c43b42350da4b91dacc11721d1b876e9cb62e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:16:05 +0300 Subject: gnu: Add rust-compiler-builtins. * gnu/packages/crates-io.scm (rust-compiler-builtins): New hidden variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b945091fdc..204257e8fc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -362,6 +362,36 @@ CMAKE environmental variable is set.") (license (list license:asl2.0 license:expat)))) +;; This package requires features which are unavailable +;; on the stable releases of Rust. +(define-public rust-compiler-builtins + (package + (name "rust-compiler-builtins") + (version "0.1.19") + (source + (origin + (method url-fetch) + (uri (crate-uri "compiler_builtins" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1fpabpmg8paj4r5a37vmidh1jx1b7a6ilxm4s3xsxczx27ybjcjf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc) + ("rust-rustc-std-workspace-core" + ,rust-rustc-std-workspace-core)))) + (home-page "https://github.com/rust-lang-nursery/compiler-builtins") + (synopsis "Compiler intrinsics used by the Rust compiler") + (description + "This package provides compiler intrinsics used by the Rust compiler. This +package is primarily useful when building the @code{core} crate yourself and you +need compiler-rt intrinsics.") + (properties `((hidden? . #t))) + (license (list license:asl2.0 + license:expat)))) + (define-public rust-constant-time-eq (package (name "rust-constant-time-eq") -- cgit v1.2.3 From 6f5cd37a60b0082c703c3a675abd0d1ef46118e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:18:33 +0300 Subject: gnu: Add rust-libloading. * gnu/packages/crates-io.scm (rust-libloading): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 204257e8fc..e4da943c80 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1097,6 +1097,33 @@ the platform that libc is compiled for.") (license (list license:expat license:asl2.0)))) +(define-public rust-libloading + (package + (name "rust-libloading") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "libloading" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lyply8rcqc8agajzxs7bq6ivba9dnn1i68kgb9z2flnfjh13cgj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc) + ("rust-winapi" ,rust-winapi)))) + (home-page "https://github.com/nagisa/rust_libloading/") + (synopsis "Rust library for loading dynamic libraries") + (description + "A memory-safer wrapper around system dynamic library loading primitives. +The most important safety guarantee by this library is prevention of +dangling-Symbols that may occur after a Library is unloaded. Using this library +allows loading dynamic libraries (also known as shared libraries) as well as use +functions and static variables these libraries contain.") + (license license:isc))) + (define-public rust-log (package (name "rust-log") -- cgit v1.2.3 From aeaa6012609741f4957a033df0b7d3dbfd14980b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:23:56 +0300 Subject: gnu: Add rust-vcpkg. * gnu/packages/crates-io.scm (rust-vcpkg): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e4da943c80..ae89552b2c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2835,6 +2835,32 @@ whitespace from a string.") untrusted inputs in Rust.") (license license:isc))) +(define-public rust-vcpkg + (package + (name "rust-vcpkg") + (version "0.2.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "vcpkg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15dzk1b96q946v9aisbd1bbhi33n93wvgziwh1shmscn1xflbp9k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static) + ("rust-tempdir" ,rust-tempdir)) + #:tests? #f)) ; tests try to link libmysql, graphite2, harfbuzz + (home-page "https://github.com/mcgoo/vcpkg-rs") + (synopsis "Find native dependencies in a vcpkg tree at build time") + (description + "This package provides a library to find native dependencies in a +@code{vcpkg} tree at build time in order to be used in Cargo build scripts.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-version-check (package (name "rust-version-check") -- cgit v1.2.3 From 701eaebc6666ae40f0d284b2b8e377fee2553d9b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:34:33 +0300 Subject: gnu: Add rust-memmap. * gnu/packages/crates-io.scm (rust-memmap): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ae89552b2c..5683c177df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1202,6 +1202,33 @@ whether an expression matches a pattern.") (license (list license:asl2.0 license:expat)))) +(define-public rust-memmap + (package + (name "rust-memmap") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "memmap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ns7kkd1h4pijdkwfvw4qlbbmqmlmzwlq3g2676dcl5vwyazv1b5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)))) + (home-page "https://github.com/danburkert/memmap-rs") + (synopsis "Rust library for cross-platform memory mapped IO") + (description + "This package provides a cross-platform Rust API for memory-mapped +file IO.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-mime (package (name "rust-mime") -- cgit v1.2.3 From 94c715e613c7c9a7ede9f960c63002664f2a0db9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:36:09 +0300 Subject: gnu: Add rust-memmap-0.6. * gnu/packages/crates-io.scm (rust-memmap@0.6): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5683c177df..d01f6a03df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1229,6 +1229,26 @@ file IO.") (license (list license:asl2.0 license:expat)))) +(define-public rust-memmap-0.6 + (package + (inherit rust-memmap) + (name "rust-memmap") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "memmap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zy6s0ni0lx9rjzq3gq2zz9r8zgjmbp02332g3gsj4fyhv4s5zz2")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-winapi" ,rust-winapi)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)))))) + (define-public rust-mime (package (name "rust-mime") -- cgit v1.2.3 From 3a3c72e6b1a5a9a8b5251be6d0edb14bf060b453 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:46:36 +0300 Subject: gnu: Add rust-miniz-oxide. * gnu/packages/crates-io.scm (rust-miniz-oxide): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d01f6a03df..4a2f545018 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1272,6 +1272,37 @@ file IO.") (license (list license:asl2.0 license:expat)))) +(define-public rust-miniz-oxide + (package + (name "rust-miniz-oxide") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "miniz_oxide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "041s41l5w7z8pkp93pdzn8rngxr93q4wxp034pr0cvc7bgway23i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-adler32" ,rust-adler32)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "tests/test.rs" + (("../miniz/miniz.c") "Cargo.toml")) + #t))))) + (home-page "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide") + (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder") + (description + "A pure rust replacement for the miniz DEFLATE/zlib encoder/decoder. Using +@code{flate2} with the @code{rust_backend} feature provides an easy to use +streaming API for miniz_oxide.") + (license license:expat))) + (define-public rust-modifier (package (name "rust-modifier") -- cgit v1.2.3 From e81e48ef29df257c8b3347a36165bbe284c13568 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:48:06 +0300 Subject: gnu: Add rust-miniz-sys. * gnu/packages/crates-io.scm (rust-miniz-sys): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4a2f545018..ea6fd1dbc7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1303,6 +1303,30 @@ file IO.") streaming API for miniz_oxide.") (license license:expat))) +(define-public rust-miniz-sys + (package + (name "rust-miniz-sys") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "miniz-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00l2r4anm8g35x0js2zfdnwfbrih9m43vphdpb77c5ga3kjkm7hy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc) + ("rust-libc" ,rust-libc)))) + (home-page "https://github.com/alexcrichton/flate2-rs") + (synopsis "Bindings to the miniz.c library") + (description + "This package provides bindings to the @code{miniz.c} library.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-modifier (package (name "rust-modifier") -- cgit v1.2.3 From 5b15d635eddda7708d68a224f4df50e1c866f92d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:52:14 +0300 Subject: gnu: Add rust-netlib-src. * gnu/packages/crates-io.scm (rust-netlib-src): New variable. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea6fd1dbc7..d6a26fc119 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24,6 +24,8 @@ #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (gnu packages gcc) + #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config)) ;;; @@ -1373,6 +1375,42 @@ types as proposed in RFC 1158.") (license (list license:asl2.0 license:expat)))) +(define-public rust-netlib-src + (package + (name "rust-netlib-src") + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "netlib-src" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "112hwfw1zzdj10h3j213xxqjrq38iygb3nb3ijay65ycmrg819s4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-cmake" ,rust-cmake) + ("rust-libc" ,rust-libc)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-lapack + (lambda _ + (delete-file-recursively "source") + (substitute* "Cargo.toml" + (("default .*") + "default = [\"system\"]\n")) + #t))))) + (inputs + `(("gfortran:lib" ,gfortran "lib") + ("lapack" ,lapack))) + (home-page "https://github.com/blas-lapack-rs/netlib-src") + (synopsis "Source of BLAS and LAPACK via Netlib") + (description + "The package provides a source of BLAS and LAPACK via Netlib.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-nodrop (package (name "rust-nodrop") -- cgit v1.2.3 From f51c47b528a7acf79dd189e18cebf841afaf4c30 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:54:47 +0300 Subject: gnu: Add rust-openssl-probe. * gnu/packages/crates-io.scm (rust-openssl-probe): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d6a26fc119..f0a29486ad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1558,6 +1558,27 @@ implementation (which is unstable / requires nightly).") (license (list license:asl2.0 license:expat)))) +(define-public rust-openssl-probe + (package + (name "rust-openssl-probe") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl-probe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pijrdifgsdwd45b08c2g0dsmnhz7c3kmagb70839ngrd7d29bvp")))) + (build-system cargo-build-system) + (home-page "https://github.com/alexcrichton/openssl-probe") + (synopsis "Find SSL certificate locations") + (description + "This package provides a tool to find SSL certificate locations on the +system for OpenSSL.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-owning-ref (package (name "rust-owning-ref") -- cgit v1.2.3 From 02f66e9022d92d2041869231ee5adcf6009f07a9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 17:59:43 +0300 Subject: gnu: Add rust-gcc. * gnu/packages/crates-io.scm (rust-gcc): New variable. --- gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f0a29486ad..ea43d8e5e1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -802,6 +802,46 @@ the computation on the threads themselves.") (license (list license:asl2.0 license:expat)))) +(define-public rust-gcc + (package + (inherit rust-cc) + (name "rust-gcc") + (version "0.3.55") + (source + (origin + (method url-fetch) + (uri (crate-uri "gcc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hng1sajn4r67hndvhjysswz8niayjwvcj42zphpxzhbz89kjpwg")))) + (build-system cargo-build-system) + (arguments + `(;#:cargo-inputs + ;(("rust-rayon" ,rust-rayon)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-optional-deps + (lambda _ + (substitute* "Cargo.toml.orig" + ((".*optional.*") "\n") + ((".*features.*") "") + ((".*parallel.*") "")) + (delete-file "Cargo.toml") + (copy-file "Cargo.toml.orig" "Cargo.toml") + #t))) + #:tests? #f)) + (home-page "https://github.com/alexcrichton/cc-rs") + (synopsis "Library to compile C/C++ code into a Rust library/application") + (description + "This package provides a build-time dependency for Cargo build scripts to +assist in invoking the native C compiler to compile native C code into a static +archive to be linked into Rustcode.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-heapsize (package (name "rust-heapsize") -- cgit v1.2.3 From eda57f4834b29ef17758f7f1f62d3af899e2d669 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:00:03 +0300 Subject: gnu: Add rust-pico-sys. * gnu/packages/crates-io.scm (rust-pico-sys): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea43d8e5e1..909dd5d2f8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1707,6 +1707,29 @@ algorithm.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pico-sys + (package + (name "rust-pico-sys") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pico-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q5pg0ms6szz6b5h26h4k40zb76zbwwjgyigac4wly9qngdj4yl5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gcc" ,rust-gcc) + ("rust-libc" ,rust-libc)))) + (home-page "https://github.com/reem/rust-pico-sys.git") + (synopsis "Bindings to the PicoHTTPParser") + (description + "This package provides bindings to the PicoHTTPParser.") + (license license:expat))) + (define-public rust-pin-utils (package (name "rust-pin-utils") -- cgit v1.2.3 From f0074113086c32ebb31f49cf01a2fd4740d01999 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:04:20 +0300 Subject: gnu: Add rust-rustc-demangle. * gnu/packages/crates-io.scm (rust-rustc-demangle): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 909dd5d2f8..183291e737 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2092,6 +2092,32 @@ system calls.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rustc-demangle + (package + (name "rust-rustc-demangle") + (version "0.1.16") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc-demangle" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "10qp42sl1wrdbgbbh8rnay2grm976z7hqgz32c4y09l1c071qsac")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-compiler-builtins" + ,rust-compiler-builtins) + ("rust-rustc-std-workspace-core" + ,rust-rustc-std-workspace-core)))) + (home-page "https://github.com/alexcrichton/rustc-demangle") + (synopsis "Rust compiler symbol demangling") + (description + "This package demanges the symbols from the Rust compiler.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rustc-serialize (package (name "rust-rustc-serialize") -- cgit v1.2.3 From c891c7f174eb1942e75324f494aade8da1c04f36 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:08:30 +0300 Subject: gnu: Add rust-cargon. * gnu/packages/crates-io.scm (rust-cargon): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 183291e737..35453124ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -210,6 +210,29 @@ behave like a set of bitflags.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cargon + (package + (name "rust-cargon") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargon" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cszlab7jk736p0lb50ag4l9nv72m7j41bwrmygl0lr4iz0350w2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gcc" ,rust-gcc)))) + (home-page "https://github.com/bryant/argon2rs") + (synopsis "Thin wrapper around the Argon2 C library") + (description + "This package provides a thin wrapper around the Argon2 C library. It is +used in argon2rs' bench suite.") + (license license:wtfpl2))) + (define-public rust-cblas-sys (package (name "rust-cblas-sys") -- cgit v1.2.3 From f32a4ba74660b6f1adfc7e61343a1684ffedeb8a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:14:38 +0300 Subject: gnu: Add rust-jemalloc-sys. * gnu/packages/crates-io.scm (rust-jemalloc-sys): New variable. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 35453124ef..7a7b2be4f4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (gnu packages gcc) + #:use-module (gnu packages jemalloc) #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config)) @@ -1026,6 +1027,41 @@ primitives to an @code{io::Write}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-jemalloc-sys + (package + (name "rust-jemalloc-sys") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "jemalloc-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ify9vlql01qhfxlj7d4p9jvcp90mj2h69nkbq7slccvbhzryfqd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-cc" ,rust-cc) + ("rust-fs-extra" ,rust-fs-extra)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-jemalloc + (lambda* (#:key inputs #:allow-other-keys) + (let ((jemalloc (assoc-ref inputs "jemalloc"))) + (delete-file-recursively "jemalloc") + (setenv "JEMALLOC_OVERRIDE" + (string-append jemalloc "/lib/libjemalloc_pic.a"))) + #t))))) + (inputs + `(("jemalloc" ,jemalloc))) + (home-page "https://github.com/gnzlbg/jemallocator") + (synopsis "Rust FFI bindings to jemalloc") + (description "This package provides Rust FFI bindings to jemalloc.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-json (package (name "rust-json") -- cgit v1.2.3 From 1515ecae214891dbf96045e0a1ff9be7b0527830 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:20:49 +0300 Subject: gnu: Add rust-lzma-sys. * gnu/packages/crates-io.scm (rust-lzma-sys): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7a7b2be4f4..705cccbce9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24,6 +24,7 @@ #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages jemalloc) #:use-module (gnu packages maths) @@ -1245,6 +1246,42 @@ functions and static variables these libraries contain.") (license (list license:asl2.0 license:expat)))) +(define-public rust-lzma-sys + (package + (name "rust-lzma-sys") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "lzma-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "14gyj256yh0wm77jbvmlc39v7lfn0navpfrja4alczarzlc8ir2k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc) + ("rust-libc" ,rust-libc) + ("rust-pkg-config" ,rust-pkg-config)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unbundle-xz + (lambda* (#:key inputs #:allow-other-keys) + (let ((xz (assoc-ref inputs "xz"))) + (delete-file-recursively "xz-5.2")) + #t))))) + (inputs + `(("pkg-config" ,pkg-config) + ("xz" ,xz))) + (home-page "https://github.com/alexcrichton/xz2-rs") + (synopsis "Bindings to liblzma for lzma and xz stream encoding/decoding") + (description + "This package contains the raw bindings to liblzma which contains an +implementation of LZMA and xz stream encoding/decoding.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-maplit (package (name "rust-maplit") -- cgit v1.2.3 From 5ef6549e12985fb4ed97672e5068d994c541b3a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:26:05 +0300 Subject: gnu: Add rust-tempfile. * gnu/packages/crates-io.scm (rust-tempfile): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 705cccbce9..ec65076a36 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2714,6 +2714,34 @@ deleting all contents when it's dropped.") (license (list license:asl2.0 license:expat)))) +(define-public rust-tempfile + (package + (name "rust-tempfile") + (version "3.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tempfile" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ny1cdbcsrmwjpy4k9366xm6p0jqkrmrvr0cln2djxspp1inyxs7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-rand" ,rust-rand) + ("rust-redox-syscall" ,rust-redox-syscall) + ("rust-remove-dir-all" ,rust-remove-dir-all) + ("rust-winapi" ,rust-winapi)))) + (home-page "http://stebalien.com/projects/tempfile-rs") + (synopsis "Library for managing temporary files and directories") + (description + "This package provides a library for managing temporary files and +directories.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-termcolor (package (name "rust-termcolor") -- cgit v1.2.3 From 1a9ce2a252cc75d9b7686ed4fcee9964d2b61eef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:30:13 +0300 Subject: gnu: Add rust-xattr. * gnu/packages/crates-io.scm (rust-xattr): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ec65076a36..a56faa011b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3620,6 +3620,33 @@ color in a Windows console.") "Contains function definitions for the Windows API library ws2_32.") (license license:expat))) +(define-public rust-xattr + (package + (name "rust-xattr") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "xattr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k556fb6f5jc907975j9c8iynl2fqz3rf0w6fiig83i4yi0kfk14")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile)) + #:tests? #f)) ; Tests assume read access to /var. + (home-page "https://github.com/Stebalien/xattr") + (synopsis "Unix extended filesystem attributes") + (description + "This package provide a small library for setting, getting, and listing +extended attributes.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-xdg (package (name "rust-xdg") -- cgit v1.2.3 From 27438eb81725fe031d8d3bea7de45ef412e5b184 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:32:38 +0300 Subject: gnu: Add rust-filetime. * gnu/packages/crates-io.scm (rust-filetime): New variable. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a56faa011b..971aec2e5d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -594,6 +594,38 @@ provides implementations for @code{HashMap} and @code{HashSet}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-filetime + (package + (name "rust-filetime") + (version "0.2.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "filetime" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0sflihq2l77xjrza7yjalnxsc7dxzg25rhzcfbd9vmyfah5kimvb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if) + ("rust-libc" ,rust-libc) + ("rust-redox-syscall" ,rust-redox-syscall) + ("rust-winapi" ,rust-winapi)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)))) + (home-page "https://github.com/alexcrichton/filetime") + (synopsis "Platform-agnostic accessors of timestamps in File metadata") + (description + "This library contains a helper library for inspecting and setting the +various timestamps of files in Rust. This library takes into account +cross-platform differences in terms of where the timestamps are located, what +they are called, and how to convert them into a platform-independent +representation.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-findshlibs (package (name "rust-findshlibs") -- cgit v1.2.3 From 3494be351567e1f32a02bbb3d2f7cedec7d6446c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:37:18 +0300 Subject: gnu: Add rust-tar. * gnu/packages/crates-io.scm (rust-tar): New variable. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 971aec2e5d..4de42d9de4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2720,6 +2720,39 @@ and Jaro-Winkler.") "This package provides helper test traits for synstructure doctests.") (license license:expat))) +(define-public rust-tar + (package + (name "rust-tar") + (version "0.4.26") + (source + (origin + (method url-fetch) + (uri (crate-uri "tar" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-filetime" ,rust-filetime) + ("rust-libc" ,rust-libc) + ("rust-redox-syscall" ,rust-redox-syscall) + ("rust-xattr" ,rust-xattr)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)) + #:tests? #f)) ; Test archives are not distributed in the crate tarball. + (home-page "https://github.com/alexcrichton/tar-rs") + (synopsis "Tar file reading/writing for Rust") + (description + "This package provides a Rust implementation of a TAR file reader and +writer. This library does not currently handle compression, but it is abstract +over all I/O readers and writers. Additionally, great lengths are taken to +ensure that the entire contents are never required to be entirely resident in +memory all at once.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-tempdir (package (name "rust-tempdir") -- cgit v1.2.3 From fbf37a7bff9a946fa93acf9131b423c2a3a8fbb1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:41:02 +0300 Subject: gnu: Add rust-socket2. * gnu/packages/crates-io.scm (rust-socket2): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4de42d9de4..2b31ec3c66 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2543,6 +2543,36 @@ words, like Python's shlex.") data type.") (license license:expat))) +(define-public rust-socket2 + (package + (name "rust-socket2") + (version "0.3.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "socket2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11bdcz04i106g4q7swkll0qxrb4287srqd2k3aq2q6i22zjlvdz8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if) + ("rust-libc" ,rust-libc) + ("rust-redox-syscall" ,rust-redox-syscall) + ("rust-winapi" ,rust-winapi)) + #:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)) + #:tests? #f)) ; Tests expect network connectivity. + (home-page "https://github.com/alexcrichton/socket2-rs") + (synopsis "Networking sockets in Rust") + (description + "This package provides utilities for handling networking sockets with a +maximal amount of configuration possible intended.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-spin (package (name "rust-spin") -- cgit v1.2.3 From 1241007f16648be578f96db5bc30e623f88cb2f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 18:54:40 +0300 Subject: gnu: Add rust-ansi-term. * gnu/packages/crates-io.scm (rust-ansi-term): New variable. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2b31ec3c66..3246b0f83d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58,6 +58,38 @@ the Rust programming language.") (license (list license:bsd-3 license:zlib)))) +(define-public rust-ansi-term + (package + (name "rust-ansi-term") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ansi_term" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16wpvrghvd0353584i1idnsgm0r3vchg8fyrm0x8ayv1rgvbljgf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + ;; https://github.com/ogham/rust-ansi-term/commit/5ff6af6f38790abcb3aafee1239286c10ef69576.patch + (lambda _ + (substitute* "src/debug.rs" + (("^ *Blue") " Blue,") + (("underline: false") "underline: false,")) + #t))))) + (home-page "https://github.com/ogham/rust-ansi-term") + (synopsis "Library for ANSI terminal colours and styles") + (description + "This is a library for controlling colours and formatting, such as red bold +text or blue underlined text, on ANSI terminals.") + (license license:expat))) + (define-public rust-antidote (package (name "rust-antidote") -- cgit v1.2.3 From 5ae8c1fba34d3e770751663ebdab087da91732d9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 19:00:51 +0300 Subject: gnu: Add rust-miow. * gnu/packages/crates-io.scm (rust-miow): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3246b0f83d..7b0cfd49a8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1529,6 +1529,33 @@ streaming API for miniz_oxide.") (license (list license:asl2.0 license:expat)))) +(define-public rust-miow + (package + (name "rust-miow") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "miow" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09ljvx6wg30f2xlv7b7hhpkw7k312n3hjgmrbhwzhz9x03ra0sir")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-socket2" ,rust-socket2) + ("rust-winapi" ,rust-winapi)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand)))) + (home-page "https://github.com/alexcrichton/miow") + (synopsis "Rust I/O library for Windows") + (description + "This package provides a zero overhead I/O library for Windows, focusing on +IOCP and Async I/O abstractions.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-modifier (package (name "rust-modifier") -- cgit v1.2.3 From 61322df0191878a49ae2f048793e5e3a57d504cb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 19:02:28 +0300 Subject: gnu: Add rust-miow-0.2. * gnu/packages/crates-io.scm (rust-miow-0.2): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7b0cfd49a8..710b0d6cef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1556,6 +1556,28 @@ IOCP and Async I/O abstractions.") (license (list license:asl2.0 license:expat)))) +(define-public rust-miow-0.2 + (package + (inherit rust-miow) + (name "rust-miow") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "miow" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06g9b8sqlh5gxakwqq4rrib07afwanfnxgxajrldwcgk3hxjy7wc")))) + (arguments + `(#:cargo-inputs + (("rust-kernel32-sys" ,rust-kernel32-sys) + ("rust-net2" ,rust-net2) + ("rust-winapi" ,rust-winapi-0.2) + ("rust-ws2-32-sys" ,rust-ws2-32-sys)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-modifier (package (name "rust-modifier") -- cgit v1.2.3 From 01519b3d9f87790ecf743426d2a8bfed2ae87cb8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 19:11:22 +0300 Subject: gnu: Add rust-sourcefile. * gnu/packages/crates-io.scm (rust-sourcefile): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 710b0d6cef..f2aafa43c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2654,6 +2654,30 @@ maximal amount of configuration possible intended.") (license (list license:asl2.0 license:expat)))) +(define-public rust-sourcefile + (package + (name "rust-sourcefile") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "sourcefile" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lwa6973zs4bgj29my7agfjgk4nw9hp6j7dfnr13nid85fw7rxsb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile)))) + (home-page "https://github.com/derekdreery/sourcefile-rs") + (synopsis "Concatenate source from multiple files") + (description + "A library for concatenating source from multiple files, whilst keeping +track of where each new file and line starts.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-spin (package (name "rust-spin") -- cgit v1.2.3 From b79eab74a14992ff382e7f40a9fd13de11728bb9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 19:26:01 +0300 Subject: gnu: Add rust-glob. * gnu/packages/crates-io.scm (rust-glob): New variable. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2aafa43c9..e6a081d9c3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -931,6 +931,38 @@ archive to be linked into Rustcode.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glob + (package + (name "rust-glob") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glob" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0x25wfr7vg3mzxc9x05dcphvd3nwlcmbnxrvwcvrrdwplcrrk4cv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + ;; This test assumes /root exists but is unreadable by the user. + (lambda _ + (substitute* "src/lib.rs" + (("cfg\\(all\\(unix,.*") "cfg(windows)]\n")) + #t))))) + (home-page "https://github.com/rust-lang-nursery/glob") + (synopsis "Match file paths against Unix shell style patterns") + (description + "This package provides support for matching file paths against Unix +shell style patterns.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-heapsize (package (name "rust-heapsize") -- cgit v1.2.3 From cef7de6fa61761f905876414debca94cadb01e07 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 20:18:31 +0300 Subject: gnu: Add rust-glob-0.2. * gnu/packages/crates-io.scm (rust-glob-0.2): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e6a081d9c3..c6aee38fd4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -963,6 +963,31 @@ shell style patterns.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glob-0.2 + (package + (inherit rust-glob) + (name "rust-glob") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "glob" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))) + (arguments + `(#:cargo-development-inputs + (("rust-tempdir" ,rust-tempdir)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + ;; This test assumes /root exists but is unreadable by the user. + (lambda _ + (substitute* "src/lib.rs" + (("cfg\\(unix") "cfg(windows")) + #t))))))) + (define-public rust-heapsize (package (name "rust-heapsize") -- cgit v1.2.3 From 9a5ee9928a9de0183ed1702160035319fe1d2407 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 20:25:38 +0300 Subject: gnu: Add rust-clang-sys. * gnu/packages/crates-io.scm (rust-clang-sys): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c6aee38fd4..4722773d50 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages llvm) #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config)) @@ -349,6 +350,42 @@ depending on a large number of #[cfg] parameters. Structured like an (license (list license:asl2.0 license:expat)))) +(define-public rust-clang-sys + (package + (name "rust-clang-sys") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "clang-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ls8zcqi5bmmrvrk3b6r1ym4wlivinbv590d2dvg2xn9f44mbpl1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glob" ,rust-glob) + ("rust-libc" ,rust-libc) + ("rust-libloading" ,rust-libloading)) + #:cargo-development-inputs + (("rust-glob" ,rust-glob)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-environmental-variable + (lambda* (#:key inputs #:allow-other-keys) + (let ((clang (assoc-ref inputs "libclang"))) + (setenv "LIBCLANG_PATH" + (string-append clang "/lib"))) + #t))))) + (inputs + `(("libclang" ,clang))) + (home-page "https://github.com/KyleMayes/clang-sys") + (synopsis "Rust bindings for libclang") + (description + "This package provides Rust bindings for @code{libclang}.") + (license license:asl2.0))) + (define-public rust-clicolors-control (package (name "rust-clicolors-control") -- cgit v1.2.3 From 516b2f1a3b87147daee345a7708b394e87fd29bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 20:31:32 +0300 Subject: gnu: Add rust-getopts. * gnu/packages/crates-io.scm (rust-getopts): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4722773d50..235767a207 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -968,6 +968,28 @@ archive to be linked into Rustcode.") (license (list license:asl2.0 license:expat)))) +(define-public rust-getopts + (package + (name "rust-getopts") + (version "0.2.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "getopts" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "018yhq97zgcrcxwhj3pxh31h83704sgaiijdnpl0r1ir366c005r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-log" ,rust-log)))) + (home-page "https://github.com/rust-lang-nursery/getopts") + (synopsis "Rust library for option parsing for CLI utilities") + (description "This library provides getopts-like option parsing.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-glob (package (name "rust-glob") -- cgit v1.2.3 From 4282cbe9b0a0c142477c71369d1aa3cc7a5ea8ff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 20:37:38 +0300 Subject: gnu: Add rust-semver-parser-0.7. * gnu/packages/crates-io.scm (rust-semver-parser-0.7): New variable. --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 235767a207..2756a193fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2701,6 +2701,20 @@ with one of the implemented strategies.") (license (list license:asl2.0 license:expat)))) +(define-public rust-semver-parser-0.7 + (package + (inherit rust-semver-parser) + (name "rust-semver-parser") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "semver-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq")))))) + (define-public rust-shlex (package (name "rust-shlex") -- cgit v1.2.3 From 540d830edc910dd85c0d84f922a4d26848c1b35e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 20:53:02 +0300 Subject: gnu: Add rust-time. * gnu/packages/crates-io.scm (rust-time): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2756a193fa..ab3513af67 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3191,6 +3191,37 @@ fixed set of worker threads.") (license (list license:asl2.0 license:expat)))) +(define-public rust-time + (package + (name "rust-time") + (version "0.1.39") + (source + (origin + (method url-fetch) + (uri (crate-uri "time" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "161hqx0gw722ikydanpahky447vaxqncwmkj66rny282vzqpalx1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc) + ("rust-redox-syscall" ,rust-redox-syscall) + ("rust-rustc-serialize" ,rust-rustc-serialize) + ("rust-winapi" ,rust-winapi)) + #:cargo-development-inputs + (("rust-log" ,rust-log) + ("rust-winapi" ,rust-winapi)) + #:tests? #f)) ; Tests have difficulty with the timezones. + (home-page "https://github.com/rust-lang-deprecated/time") + (synopsis "Simple time handling in Rust") + (description + "This package provides utilities for working with time-related functions +in Rust.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-tokio-mock-task (package (name "rust-tokio-mock-task") -- cgit v1.2.3 From 41ba4cf1503cc7448aa99813438cc5bdf2c00c1c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 5 Sep 2019 21:07:24 +0300 Subject: gnu: Add rust-parity-wasm. * gnu/packages/crates-io.scm (rust-parity-wasm): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ab3513af67..980ddc5d9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1968,6 +1968,31 @@ owner with them. This can sometimes be useful because Rust borrowing rules normally prevent moving a type that has been borrowed from.") (license license:expat))) +(define-public rust-parity-wasm + (package + (name "rust-parity-wasm") + (version "0.40.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "parity-wasm" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p84f0k36q05j18jy66n122lyali794cj78hbxgy9wj6si84plqd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-time" ,rust-time)) + #:tests? #f)) ; Test files are not included in release. + (home-page "https://github.com/paritytech/parity-wasm") + (synopsis "Low-level WebAssembly format library") + (description + "This package provides a WebAssembly binary format serialization, +deserialization, and interpreter in Rust.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-peeking-take-while (package (name "rust-peeking-take-while") -- cgit v1.2.3 From 7cd446fd3f1d3b5dce4800d1daba2fa31a07f1b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 Sep 2019 23:33:52 +0200 Subject: gnu: Add r-txdb-celegans-ucsc-ce6-ensgene. * gnu/packages/bioconductor.scm (r-txdb-celegans-ucsc-ce6-ensgene): New variable. --- gnu/packages/bioconductor.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3ba5415597..37cd51d16c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -708,6 +708,31 @@ the TxDb object of Mouse data as provided by UCSC (mm10, December 2011) based on the knownGene track.") (license license:artistic2.0))) +(define-public r-txdb-celegans-ucsc-ce6-ensgene + (package + (name "r-txdb-celegans-ucsc-ce6-ensgene") + (version "3.2.2") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "TxDb.Celegans.UCSC.ce6.ensGene" + version 'annotation)) + (sha256 + (base32 + "1sgppva33cdy4isj2is8mfalj5gmmkpbkq9w1d83a4agcq31mi90")))) + (properties + `((upstream-name . "TxDb.Celegans.UCSC.ce6.ensGene"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-genomicfeatures" ,r-genomicfeatures))) + (home-page "https://bioconductor.org/packages/TxDb.Celegans.UCSC.ce6.ensGene/") + (synopsis "Annotation package for C elegans TxDb objects") + (description + "This package exposes a C elegans annotation database generated from UCSC +by exposing these as TxDb objects.") + (license license:artistic2.0))) + (define-public r-fdb-infiniummethylation-hg19 (package (name "r-fdb-infiniummethylation-hg19") -- cgit v1.2.3 From 8205534569cb2a09d53b7c925a349cd7f4e3599d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 6 Sep 2019 15:00:16 +0200 Subject: gnu: Add samblaster. * gnu/packages/bioinformatics.scm (samblaster): New variable. --- gnu/packages/bioinformatics.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f98f10a2c3..cf2dc57fa7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15232,3 +15232,37 @@ indels (insertions and deletions), MNPs (multi-nucleotide polymorphisms), and complex events (composite insertion and substitution events) smaller than the length of a short-read sequencing alignment.") (license license:expat)))) + +(define-public samblaster + (package + (name "samblaster") + (version "0.1.24") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/GregoryFaust/samblaster.git") + (commit (string-append "v." version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0iv2ddfw8363vb2x8gr3p8g88whb6mb9m0pf71i2cqsbv6jghap7")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are none + #:phases + (modify-phases %standard-phases + (delete 'configure) ; There is no configure phase. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "samblaster" + (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (home-page "https://github.com/GregoryFaust/samblaster") + (synopsis "Mark duplicates in paired-end SAM files") + (description "Samblaster is a fast and flexible program for marking +duplicates in read-id grouped paired-end SAM files. It can also optionally +output discordant read pairs and/or split read mappings to separate SAM files, +and/or unmapped/clipped reads to a separate FASTQ file. When marking +duplicates, samblaster will require approximately 20MB of memory per 1M read +pairs.") + (license license:expat))) -- cgit v1.2.3 From cae531275819178d7103562ec86dedfd053136a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 6 Sep 2019 17:25:03 +0300 Subject: gnu: crates-io.scm: Fix several home-pages. * gnu/packages/crates-io.scm (rust-constant-time-eq, rust-fixedbitset, rust-futures, rust-pico-sys, rust-pkg-config, rust-quick-error, rust-remove-dir-all, rust-spin, rust-tempdir, rust-traitobject, rust-void)[home-page]: Update to correct home-page. --- gnu/packages/crates-io.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 980ddc5d9e..e138b93e9b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -501,7 +501,7 @@ need compiler-rt intrinsics.") (base32 "083icpr9xb72rrdxw3p4068dcspn6ai22jy7rhl2a8grfz448nlr")))) (build-system cargo-build-system) - (home-page "https://crates.io/crates/constant_time_eq") + (home-page "https://github.com/cesarb/constant_time_eq") (synopsis "Compares two equal-sized byte strings in constant time") (description @@ -733,7 +733,7 @@ cross platform API.") (base32 "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46")))) (build-system cargo-build-system) - (home-page "https://github.com/bluss/fixedbitset") + (home-page "https://github.com/petgraph/fixedbitset") (synopsis "FixedBitSet is a simple bitset collection") (description "FixedBitSet is a simple bitset collection.") (license (list license:asl2.0 @@ -900,7 +900,7 @@ featuring zero allocations, composability, and iterator-like interfaces.") `(#:cargo-inputs (("rust-futures" ,rust-futures) ("rust-num-cpus" ,rust-num-cpus)))) - (home-page "https://github.com/alexcrichton/futures-rs") + (home-page "https://github.com/rust-lang-nursery/futures-rs") (synopsis "Implementation of thread pools which hand out futures") (description "An implementation of thread pools which hand out futures to the results of @@ -2074,7 +2074,7 @@ algorithm.") `(#:cargo-inputs (("rust-gcc" ,rust-gcc) ("rust-libc" ,rust-libc)))) - (home-page "https://github.com/reem/rust-pico-sys.git") + (home-page "https://github.com/reem/rust-pico-sys") (synopsis "Bindings to the PicoHTTPParser") (description "This package provides bindings to the PicoHTTPParser.") @@ -2117,7 +2117,7 @@ algorithm.") (("rust-lazy-static" ,rust-lazy-static)))) (inputs `(("pkg-config" ,pkg-config))) - (home-page "https://github.com/alexcrichton/pkg-config-rs") + (home-page "https://github.com/rust-lang/pkg-config-rs") (synopsis "Library to run the pkg-config system tool") (description "A library to run the pkg-config system tool at build time in order to be @@ -2246,7 +2246,7 @@ in terms of the upstream unstable API.") (base32 "1w6kgwwv7p7zr0yyg5rb315lkk24bimywklwx7fsvsbwi10bjx4j")))) (build-system cargo-build-system) - (home-page "http://github.com/tailhook/quick-error") + (home-page "https://github.com/tailhook/quick-error") (synopsis "Macro which makes error types pleasant to write") (description "This crate provides a macro which makes error types pleasant to write.") @@ -2409,7 +2409,7 @@ system calls.") ;; The test phase expects there to be a README.md in the root directory. (lambda _ (invoke "touch" "README.md")))))) - (home-page "https://github.com/XAMPPRocky/remove_dir_all.git") + (home-page "https://github.com/XAMPPRocky/remove_dir_all") (synopsis "Implementation of remove_dir_all for Windows") (description "This package provides a safe, reliable implementation of @@ -2846,7 +2846,7 @@ track of where each new file and line starts.") (base32 "0m9clchsj0rf13bggsgvbv9haiy0f6rhvnvkpvkk8720a5pkydj4")))) (build-system cargo-build-system) - (home-page "https://github.com/mvdnes/spin-rs.git") + (home-page "https://github.com/mvdnes/spin-rs") (synopsis "Synchronization primitives based on spinning") (description "This crate provides synchronization primitives based on spinning. They may contain data, are usable without @code{std},and static @@ -3060,8 +3060,7 @@ memory all at once.") `(#:cargo-inputs (("rust-rand" ,rust-rand) ("rust-remove-dir-all" ,rust-remove-dir-all)))) - (home-page - "https://github.com/rust-lang/tempdir") + (home-page "https://github.com/rust-lang-deprecated/tempdir") (synopsis "Temporary directory management for Rust") (description "This package provides a library for managing a temporary directory and @@ -3303,7 +3302,7 @@ in Rust.") (base32 "0yb0n8822mr59j200fyr2fxgzzgqljyxflx9y8bdy3rlaqngilgg")))) (build-system cargo-build-system) - (home-page "https://github.com/reem/rust-traitobject.git") + (home-page "https://github.com/reem/rust-traitobject") (synopsis "Unsafe helpers for dealing with raw trait objects") (description "Unsafe helpers for dealing with raw trait objects.") (license (list license:asl2.0 @@ -3672,7 +3671,7 @@ If that fails, no determination is made, and calls return None.") (base32 "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka")))) (build-system cargo-build-system) - (home-page "https://github.com/reem/rust-void.git") + (home-page "https://github.com/reem/rust-void") (synopsis "Void type for use in statically impossible cases") (description "The uninhabited void type for use in statically impossible cases.") -- cgit v1.2.3 From ccbd1648f461c15e79f73384ebeaccd6cdbd877b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Sep 2019 17:33:34 +0200 Subject: gnu: exim: Update to 4.92.2 [fixes CVE-2019-15846]. * gnu/packages/mail.scm (exim): Update to 4.92.2. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 30ce5cd70c..fdbb082fdc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1197,7 +1197,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.92.1") + (version "4.92.2") (source (origin (method url-fetch) @@ -1206,7 +1206,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-" version ".tar.bz2"))) (sha256 - (base32 "132zmxgzz35xwi89g3crw6hd3y74rxj5zcpamakvrnlcn256amdp")))) + (base32 "1xnc5rdcg5mcrvjqp506a9frmcr89jwsh4c5vbks46awyz1rfzsm")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ -- cgit v1.2.3 From 7fc41e6e6607bcf78db707d0c698d371985a6efe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 6 Sep 2019 23:29:07 +0200 Subject: gnu: Add emacs-poet-theme. * gnu/packages/emacs-xyz.scm (emacs-poet-theme): New variable. --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ca1af9d05..afb55cb902 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4493,6 +4493,32 @@ variants.") package provides a light and a dark variant.") (license license:gpl3+))) +(define-public emacs-poet-theme + (let ((commit "d84f7b259cc9b6ff8d442cf4c38bd6c7065ff8f4") + (revision "0")) + (package + (name "emacs-poet-theme") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kunalb/poet.git") + (commit commit))) + (sha256 + (base32 + "0a84jdaj619mb59a46dmkk2sfs42rylqk9ryl1drgs8d3lia79mz")))) + (build-system emacs-build-system) + (home-page "https://github.com/kunalb/poet/") + (synopsis "Emacs theme for prose") + (description + "Emacs has very good support for multiple fonts in a single file. Poet +uses this support to make it much more convenient to write prose within Emacs, +with particular attention paid to @code{org-mode} and @code{markdown-mode}. +Code blocks, tables, etc are formatted in monospace text with the appropriate +backgrounds.") + (license license:expat)))) + (define-public emacs-ahungry-theme (package (name "emacs-ahungry-theme") -- cgit v1.2.3 From 61acb764eddb303ef5836c3b5a4bb9b6c718d4ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 5 Sep 2019 23:04:37 +0200 Subject: gnu: ecl-net.didierverna.asdf-flv: Fix variable name. Fixes a typo in 0403d01f01c22ddd552dd5a0cfb97b0e8e58da9e. * gnu/packages/lisp.scm (ecl-net.didierverna.asdf-flv): New name of the second occurrence of 'ecl-alexandria'. --- gnu/packages/lisp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index caf52018d1..65fc1a58cd 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -760,7 +760,7 @@ In order to make one or several variables file-local, use the macros (define-public cl-net.didierverna.asdf-flv (sbcl-package->cl-source-package sbcl-net.didierverna.asdf-flv)) -(define-public ecl-alexandria +(define-public ecl-net.didierverna.asdf-flv (sbcl-package->ecl-package sbcl-net.didierverna.asdf-flv)) (define-public sbcl-fiveam -- cgit v1.2.3 From 4961364f1681ea5c3fc7a988b4f48db448338cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 6 Sep 2019 22:58:26 +0200 Subject: gnu: qtwebkit: Disable non-x86 builds. * gnu/packages/qt.scm (qtwebkit)[supported-systems]: New field. --- gnu/packages/qt.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 52eb46cce0..165b8fd7b4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2212,6 +2212,12 @@ time Web content can be enhanced with native controls.") ;; Building QtWebKit takes around 13 hours on an AArch64 machine. Give some ;; room for slower or busy hardware. (properties '((timeout . 64800))) ;18 hours + + ;; XXX: This consumes too much RAM to successfully build on AArch64 (e.g., + ;; SoftIron OverDrive with 8 GiB of RAM), so instead of wasting resources, + ;; disable it on non-Intel platforms. + (supported-systems '("x86_64-linux" "i686-linux")) + (license license:lgpl2.1+))) (define-public dotherside -- cgit v1.2.3 From f8c143a7131d6f40f387f4cd2ad1fa78b5e2f429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 6 Sep 2019 22:59:32 +0200 Subject: doc: Highlight Scheme syntax in the HTML output. * doc/build.scm (syntax-highlighted-html): New procedure. (html-manual): Use it. --- doc/build.scm | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/doc/build.scm b/doc/build.scm index 7ba9f57bc9..c99bd505fd 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -34,6 +34,7 @@ (gnu packages gawk) (gnu packages gettext) (gnu packages guile) + (gnu packages guile-xyz) (gnu packages iso-codes) (gnu packages texinfo) (gnu packages tex) @@ -164,6 +165,115 @@ as well as images, OS examples, and translations." ;; Options passed to 'makeinfo --html'. '("--css-ref=https://www.gnu.org/software/gnulib/manual.css")) +(define* (syntax-highlighted-html input + #:key + (name "highlighted-syntax") + (syntax-css-url + "/static/base/css/code.css")) + "Return a derivation called NAME that processes all the HTML files in INPUT +to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all +its 
 blocks (as produced by 'makeinfo --html')."
+  (define build
+    (with-extensions (list guile-lib guile-syntax-highlight)
+      (with-imported-modules '((guix build utils))
+        #~(begin
+            (use-modules (htmlprag)
+                         (syntax-highlight)
+                         (syntax-highlight scheme)
+                         (syntax-highlight lexers)
+                         (guix build utils)
+                         (ice-9 match)
+                         (ice-9 threads))
+
+            (define entity->string
+              (match-lambda
+                ("rArr"   "⇒")
+                ("hellip" "…")
+                ("rsquo"  "’")
+                (e (pk 'unknown-entity e) (primitive-exit 2))))
+
+            (define (concatenate-snippets pieces)
+              ;; Concatenate PIECES, which contains strings and entities,
+              ;; replacing entities with their corresponding string.
+              (let loop ((pieces pieces)
+                         (strings '()))
+                (match pieces
+                  (()
+                   (string-concatenate-reverse strings))
+                  (((? string? str) . rest)
+                   (loop rest (cons str strings)))
+                  ((('*ENTITY* "additional" entity) . rest)
+                   (loop rest (cons (entity->string entity) strings)))
+                  ((('span _ lst ...) . rest)     ;for 
+                   (loop (append lst rest) strings))
+                  (something
+                   (pk 'unsupported-code-snippet something)
+                   (primitive-exit 1)))))
+
+            (define (syntax-highlight sxml)
+              ;; Recurse over SXML and syntax-highlight code snippets.
+              (match sxml
+                (('*TOP* decl body ...)
+                 `(*TOP* ,decl ,@(map syntax-highlight body)))
+                (('head things ...)
+                 `(head ,@things
+                        (link (@ (rel "stylesheet")
+                                 (type "text/css")
+                                 (href #$syntax-css-url)))))
+                (('pre ('@ ('class "lisp")) code-snippet ...)
+                 `(pre (@ (class "lisp"))
+                       ,(highlights->sxml
+                         (highlight lex-scheme
+                                    (concatenate-snippets code-snippet)))))
+                ((tag ('@ attributes ...) body ...)
+                 `(,tag (@ ,@attributes) ,@(map syntax-highlight body)))
+                ((tag body ...)
+                 `(,tag ,@(map syntax-highlight body)))
+                ((? string? str)
+                 str)))
+
+            (define (process-html file)
+              ;; Parse FILE and perform syntax highlighting for its Scheme
+              ;; snippets.  Install the result to #$output.
+              (format (current-error-port) "processing ~a...~%" file)
+              (let* ((shtml        (call-with-input-file file html->shtml))
+                     (highlighted  (syntax-highlight shtml))
+                     (base         (string-drop file (string-length #$input)))
+                     (target       (string-append #$output base)))
+                (mkdir-p (dirname target))
+                (call-with-output-file target
+                  (lambda (port)
+                    (write-shtml-as-html highlighted port)))))
+
+            (define (copy-as-is file)
+              ;; Copy FILE as is to #$output.
+              (let* ((base   (string-drop file (string-length #$input)))
+                     (target (string-append #$output base)))
+                (mkdir-p (dirname target))
+                (catch 'system-error
+                  (lambda ()
+                    (if (eq? 'symlink (stat:type (lstat file)))
+                        (symlink (readlink file) target)
+                        (link file target)))
+                  (lambda args
+                    (let ((errno (system-error-errno args)))
+                      (pk 'error-link file target (strerror errno))
+                      (primitive-exit 3))))))
+
+            ;; Install a UTF-8 locale so we can process UTF-8 files.
+            (setenv "GUIX_LOCPATH"
+                    #+(file-append glibc-utf8-locales "/lib/locale"))
+            (setlocale LC_ALL "en_US.utf8")
+
+            (n-par-for-each (parallel-job-count)
+                            (lambda (file)
+                              (if (string-suffix? ".html" file)
+                                  (process-html file)
+                                  (copy-as-is file)))
+                            (find-files #$input))))))
+
+  (computed-file name build))
+
 (define* (html-manual source #:key (languages %languages)
                       (version "0.0")
                       (manual "guix")
@@ -242,7 +352,10 @@ makeinfo OPTIONS."
                                                 "/html_node/images"))))
                     '#$languages))))
 
-  (computed-file (string-append manual "-html-manual") build))
+  (let* ((name   (string-append manual "-html-manual"))
+         (manual (computed-file name build)))
+    (syntax-highlighted-html manual
+                             #:name (string-append name "-highlighted"))))
 
 (define* (pdf-manual source #:key (languages %languages)
                      (version "0.0")
-- 
cgit v1.2.3


From 2c10c4182c6acabd4ba49ad113e48f2c050aa341 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Sun, 18 Aug 2019 22:00:20 +0200
Subject: gnu: xfconf: Add support for gobject-introspection.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (xfconf): Add gobject-introspection to native-inputs.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6bd47233cb..19bf642b6a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -140,8 +140,8 @@ Xfce Desktop Environment.")
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-       ("glib:bin" ,glib "bin")         ;; for gdbus-codegen
-       ))
+       ("glib:bin" ,glib "bin") ;; for gdbus-codegen
+       ("gobject-introspection" ,gobject-introspection)))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      `(("glib" ,glib)))
-- 
cgit v1.2.3


From dbfd5a1380cb8b2e2596a6669d2ae36703ea75fe Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Sun, 18 Aug 2019 22:10:46 +0200
Subject: gnu: xfconf: Add vala support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (xfconf): Add vala to native-inputs.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 19bf642b6a..d4b32b335c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -141,7 +141,8 @@ Xfce Desktop Environment.")
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin") ;; for gdbus-codegen
-       ("gobject-introspection" ,gobject-introspection)))
+       ("gobject-introspection" ,gobject-introspection)
+       ("vala" ,vala)))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      `(("glib" ,glib)))
-- 
cgit v1.2.3


From 279b5730d41720868e4e9b93e1bf2338936bfaa7 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 2 Sep 2019 16:04:52 +0200
Subject: gnu: xfconf: Fix tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (xfconf)[arguments]: Rename check phase to
  custom-check.
  [native-inputs]: Add dbus.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d4b32b335c..045f14f768 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -127,7 +127,7 @@ Xfce Desktop Environment.")
      '(#:phases
        ;; Run check after install phase to test dbus activation.
        (modify-phases %standard-phases
-         (add-after 'install 'check
+         (add-after 'install 'custom-check
            (lambda _
              (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
              ;; Run test-suite under a dbus session.
@@ -142,7 +142,8 @@ Xfce Desktop Environment.")
        ("intltool" ,intltool)
        ("glib:bin" ,glib "bin") ;; for gdbus-codegen
        ("gobject-introspection" ,gobject-introspection)
-       ("vala" ,vala)))
+       ("vala" ,vala)
+       ("dbus" ,dbus)))
     (propagated-inputs
      ;; libxfconf-0.pc refers to all these.
      `(("glib" ,glib)))
-- 
cgit v1.2.3


From 48af9356722007707f001889cc217042a1933b55 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Sun, 18 Aug 2019 22:35:07 +0200
Subject: gnu: libxfce4ui: Add gobject-introspection support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (libxfce4ui): Add gobject-introspection to native-inputs.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 045f14f768..05606f5ba9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -171,7 +171,8 @@ storage system.")
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("intltool" ,intltool)))
+       ("intltool" ,intltool)
+       ("gobject-introspection" ,gobject-introspection)))
     (propagated-inputs
      `(("gtk+-3" ,gtk+)    ; required by libxfce4ui-2.pc
        ;; libxfce4kbd-private-2.pc refers to all these.
-- 
cgit v1.2.3


From 64200f01973e3eb0b9b5a49c7ac24bf5f75aa1b1 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Sun, 18 Aug 2019 22:36:55 +0200
Subject: gnu: libxfce4ui: Add vendor.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (libxfce4ui)[arguments]: Add #:configure-flags.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 05606f5ba9..512ca35fe9 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -169,6 +169,9 @@ storage system.")
                (base32
                 "1npjhznmnckhnylsv3l7p1zvhckhmp9d7vifs8w12kdfmrg0fjf4"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "--with-vendor-info=GNU Guix")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
-- 
cgit v1.2.3


From 8cc5d3dc4d3c66d19d14b65f75afbfe4a695b6af Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 2 Sep 2019 16:06:59 +0200
Subject: gnu: xfce4-panel: Fix tzdata path.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata.
[arguments] Add Fix-tzdata-path phase.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 512ca35fe9..0487c24b68 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -37,6 +37,7 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages pkg-config)
@@ -309,6 +310,15 @@ management D-Bus specification.")
                 "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m"))
               (patches (search-patches "xfce4-panel-plugins.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-tzdata-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (string-append "plugins/clock/clock.c")
+               (("/usr/share/zoneinfo")
+                (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")))
+             #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
@@ -317,7 +327,8 @@ management D-Bus specification.")
      `(("gtk+-3" ,gtk+)                 ; required by libxfce4panel-2.0.pc
        ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc
     (inputs
-     `(("exo" ,exo)
+     `(("tzdata" ,tzdata) ;; For fix-tzdata-path phase only.
+       ("exo" ,exo)
        ("gtk+-2" ,gtk+-2)
        ("xfconf" ,xfconf)
        ("garcon" ,garcon)
-- 
cgit v1.2.3


From a35f153d54a2e571c88386424c7846b2d4b59689 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 7 Sep 2019 00:42:16 +0200
Subject: gnu: python-scipy: Update to 1.3.1.

* gnu/packages/python-xyz.scm (python-scipy): Update to 1.3.1.
(python2-scipy): Keep at version 1.2.2.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d5fcc5668c..2827ddf770 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4033,14 +4033,14 @@ operators such as union, intersection, and difference.")
 (define-public python-scipy
   (package
     (name "python-scipy")
-    (version "1.2.2")
+    (version "1.3.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "scipy" version))
        (sha256
         (base32
-         "1cgvgin8fvckv96hjh3ikmwkra5rif51bdb75ifzf7xbil5iwcx4"))))
+         "1df113c9i6vazsn6y3n9wc22jh737z1g7dmx3mypkdwpdnscyhr6"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-numpy" ,python-numpy)
@@ -4136,9 +4136,19 @@ routines such as routines for numerical integration and optimization.")
     (properties `((python2-variant . ,(delay python2-scipy))))
     (license license:bsd-3)))
 
+;; Version 1.2.2 is the last version to support Python 2
 (define-public python2-scipy
-  (package-with-python2
-   (strip-python2-variant python-scipy)))
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-scipy)))
+    (version "1.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "scipy" version))
+       (sha256
+        (base32
+         "1cgvgin8fvckv96hjh3ikmwkra5rif51bdb75ifzf7xbil5iwcx4"))))))
 
 (define-public python-socksipy-branch
   (package
-- 
cgit v1.2.3


From 3fe53f49a718468bc086fa7d41740505d407e3ba Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Fri, 6 Sep 2019 19:35:08 -0400
Subject: =?UTF-8?q?Revert=20"services:=20Add=20=E2=80=98/usr/bin/env?=
 =?UTF-8?q?=E2=80=99=20special=20file."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3b38bf141a464e1bb370af7d2b2651d1efb29781.

The Guix project discussed this years ago and decided against including
/usr/bin/env.  That decision should not be reversed without a wider
discussion.
---
 gnu/services/base.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 97c53eeaf3..dcb7278f0f 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -8,7 +8,6 @@
 ;;; Copyright © 2016 Ricardo Wurmus 
 ;;; Copyright © 2018 Mathieu Othacehe 
 ;;; Copyright © 2019 Efraim Flashner 
-;;; Copyright © 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 John Soo 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -42,9 +41,9 @@
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
                 #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
-  #:use-module (gnu packages bash)
   #:use-module ((gnu packages base)
-                #:select (canonical-package coreutils glibc glibc-utf8-locales))
+                #:select (canonical-package glibc glibc-utf8-locales))
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages package-management)
   #:use-module ((gnu packages gnupg) #:select (guile-gcrypt))
   #:use-module (gnu packages linux)
@@ -2426,8 +2425,6 @@ to handle."
 
         (service special-files-service-type
                  `(("/bin/sh" ,(file-append (canonical-package bash)
-                                            "/bin/sh"))
-                   ("/usr/bin/env" ,(file-append (canonical-package coreutils)
-                                                 "/usr/bin/env"))))))
+                                            "/bin/sh"))))))
 
 ;;; base.scm ends here
-- 
cgit v1.2.3


From be0fb599e7f09af5dfe39aba2718cddb3b98b05d Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Fri, 6 Sep 2019 20:38:06 -0400
Subject: gnu: linux-libre@4.4: Update to 4.4.191.

* gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.191.
(linux-libre-4.4-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6c4ab22135..08089a9d5c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -382,10 +382,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
 
-(define-public linux-libre-4.4-version "4.4.190")
+(define-public linux-libre-4.4-version "4.4.191")
 (define-public linux-libre-4.4-pristine-source
   (let ((version linux-libre-4.4-version)
-        (hash (base32 "1rf28cjrrmj7mm8xqlfld6k20ddk15j4mmyarqibjx9pk9acij7y")))
+        (hash (base32 "0x3lnq4xyj5v6r1cz4jizm4vdspws1nb806f5qczwi3yil5nm6bh")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.4)))
-- 
cgit v1.2.3


From 67ad69b7682d63e892344d9a6d23e7eed0d96358 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Fri, 6 Sep 2019 20:39:13 -0400
Subject: gnu: linux-libre@4.9: Update to 4.9.191.

* gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.191.
(linux-libre-4.9-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 08089a9d5c..b44502b5e6 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -374,10 +374,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
 
-(define-public linux-libre-4.9-version "4.9.190")
+(define-public linux-libre-4.9-version "4.9.191")
 (define-public linux-libre-4.9-pristine-source
   (let ((version linux-libre-4.9-version)
-        (hash (base32 "05ha3snfk0vdqk9i27icwpq2if0h2jvshavn69ldwqm4h2h1r2py")))
+        (hash (base32 "1g5p736p8zx5rmxaj56yw93jp768npl868jsn8973dny0rsbim6y")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
-- 
cgit v1.2.3


From d45f5c40a2434da93280b4a0a6c530bd200149be Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Fri, 6 Sep 2019 20:40:18 -0400
Subject: gnu: linux-libre@4.14: Update to 4.14.142.

* gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.142.
(linux-libre-4.14-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b44502b5e6..053c778871 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
 
-(define-public linux-libre-4.14-version "4.14.141")
+(define-public linux-libre-4.14-version "4.14.142")
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-        (hash (base32 "05rs411rw10hhnfzvaxmcik3pq20i1i05shvvra4bv164f0z1f8b")))
+        (hash (base32 "1wwhnm1n1b6yzsd2zzzf9i3n4hlvgnph70p67cwahw0ik4ssayz6")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
-- 
cgit v1.2.3


From a6ec7eba26dc75204b5f6f52b92df46520bf8c30 Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Fri, 6 Sep 2019 20:41:23 -0400
Subject: gnu: linux-libre@4.14: Update to 4.19.71.

* gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.71.
(linux-libre-4.19-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 053c778871..42d1bc7c20 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
 
-(define-public linux-libre-4.19-version "4.19.69")
+(define-public linux-libre-4.19-version "4.19.71")
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-        (hash (base32 "11yrw8ixd5ni9rlpndqsz2ihx6k8qaf35a1lf164lkhaa85pd4f0")))
+        (hash (base32 "1bjwkb7k82l646ryyy0jbwsnygm2qsxgcwli8bdrj844skzynlqz")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
-- 
cgit v1.2.3


From f66aee3d0d2f573187ed5d44ae7c13d73cd4097a Mon Sep 17 00:00:00 2001
From: Mark H Weaver 
Date: Fri, 6 Sep 2019 20:42:05 -0400
Subject: gnu: linux-libre: Update to 5.2.13.

* gnu/packages/linux.scm (linux-libre-5.2-version): Update to 5.2.13.
(linux-libre-5.2-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 42d1bc7c20..270e2e5dcc 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                         "linux-" version ".tar.xz"))
     (sha256 hash)))
 
-(define-public linux-libre-5.2-version "5.2.11")
+(define-public linux-libre-5.2-version "5.2.13")
 (define-public linux-libre-5.2-pristine-source
   (let ((version linux-libre-5.2-version)
-        (hash (base32 "1y9kn1zny3xpmbi5an3g7hbzywnycys8chfaw6laij1xk4gq6ahc")))
+        (hash (base32 "12hpph3iynr22mfwz7745lp01waf2kg579hr56d4pvhx4iahzdhp")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
-- 
cgit v1.2.3


From 08b35210006c260703973b98d7cd1c6895c1cd7f Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Sat, 7 Sep 2019 11:15:06 +0200
Subject: gnu: wireguard: Update to 0.0.20190905.

* gnu/packages/vpn.scm (wireguard): Update to 0.0.20190905.
---
 gnu/packages/vpn.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 3c6db64ad7..3df9873781 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -452,14 +452,14 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
 (define-public wireguard
   (package
     (name "wireguard")
-    (version "0.0.20190702")
+    (version "0.0.20190905")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/"
                                   "WireGuard-" version ".tar.xz"))
               (sha256
                (base32
-                "1b5s1ncwqxdgb0c6cd07x4ynnj6cpbiqp4bxqir7mm5bf6y124qs"))))
+                "1xm8w773impgp11jj6kp3fghld0aj8nhfpqla6lflsr8npp7qxkq"))))
     (build-system gnu-build-system)
     (outputs '("out" ; The WireGuard userspace tools
                "kernel-patch")) ; A patch to build Linux with WireGuard support
-- 
cgit v1.2.3


From c3a7dae831bffa2afd0c928ebeb3b3623fb75289 Mon Sep 17 00:00:00 2001
From: Kei Kebreau 
Date: Sat, 7 Sep 2019 00:55:29 -0400
Subject: gnu: qtermwidget: Enable UTF-8 support.

* gnu/packages/lxqt.scm (qtermwidget)[inputs]: Add utf8proc.
---
 gnu/packages/lxqt.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index e72f5b82d9..e5487d3ae4 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -1177,7 +1177,8 @@ processes currently in existence, much like code{top} or code{ps}.")
         (base32 "0v1vvi8vf9y8nv8y0gzffaqji53s75ab5jypksih0ndcws8ryww4"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase)
+       ("utf8proc" ,utf8proc)))
     (native-inputs
      `(("lxqt-build-tools" ,lxqt-build-tools)
        ("qttools" ,qttools)))
-- 
cgit v1.2.3


From 4fb59c9e4dbb6455ef273c83113472be9c8bb51e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 7 Sep 2019 16:17:39 +0200
Subject: gnu: classpath-bootstrap: Remove call to free.

Fixes .

* gnu/packages/java.scm (classpath-bootstrap)[arguments]: Add build phase
"remove-call-to-free" to let us build ant-bootstrap later.
---
 gnu/packages/java.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 403c446a82..cde32e451a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -152,6 +152,17 @@ and binary format defined in The Java Virtual Machine Specification.")
              "--disable-gjdoc")
        #:phases
        (modify-phases %standard-phases
+         ;; XXX: This introduces a memory leak as we remove a call to free up
+         ;; memory for the file name string.  This was necessary because of a
+         ;; runtime error that would have prevented us from building
+         ;; ant-bootstrap later.  See https://issues.guix.gnu.org/issue/36685
+         ;; for the gnarly details.
+         (add-after 'unpack 'remove-call-to-free
+           (lambda _
+             (substitute* "native/jni/java-io/java_io_VMFile.c"
+               (("result = cpio_isFileExists.*" m)
+                (string-append m "\n//")))
+             #t))
          (add-after 'install 'install-data
            (lambda _ (invoke "make" "install-data"))))))
     (native-inputs
-- 
cgit v1.2.3


From 22bd735a3f060206ba42bd2542a4b82ff5e2bf6f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 7 Sep 2019 16:22:53 +0200
Subject: gnu: jamvm-1-bootstrap: Use older GCC and glibc.

* gnu/packages/java.scm (jamvm-1-bootstrap)[native-inputs]: Add GCC version 5
and glibc 2.28.
---
 gnu/packages/java.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index cde32e451a..fee0970e74 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -202,6 +202,11 @@ language.")
      `(("classpath" ,classpath-bootstrap)
        ("jikes" ,jikes)
        ("zlib" ,zlib)))
+    ;; When built with a recent GCC and glibc the configure step of icedtea-6
+    ;; fails with an invalid instruction error.
+    (native-inputs
+     `(("gcc" ,gcc-5)
+       ("libc" ,glibc-2.28)))
     (home-page "http://jamvm.sourceforge.net/")
     (synopsis "Small Java Virtual Machine")
     (description "JamVM is a Java Virtual Machine conforming to the JVM
-- 
cgit v1.2.3


From 306c1e614d617f02e9943c95a829395a2bc713fb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 7 Sep 2019 16:23:54 +0200
Subject: gnu: icedtea-6: Patch required freetype version.

* gnu/packages/java.scm (icedtea-6)[arguments]: Patch hardcoded version string
for freetype version check.
---
 gnu/packages/java.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index fee0970e74..e2c47e417f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -756,6 +756,9 @@ machine.")))
              (with-directory-excursion "openjdk"
                (invoke "tar" "xvf" (assoc-ref inputs "hotspot-src"))
                (rename-file "hg-checkout" "hotspot"))
+             (substitute* "patches/freetypeversion.patch"
+               (("REQUIRED_FREETYPE_VERSION = 2.2.1")
+                "REQUIRED_FREETYPE_VERSION = 2.10.1"))
              (substitute* "Makefile.in"
                (("echo \"ERROR: No up-to-date OpenJDK zip available\"; exit -1;")
                 "echo \"trust me\";")
-- 
cgit v1.2.3


From 64ad3989d7ebe85c73d2f49ac65eebdbfbee3bf3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 7 Sep 2019 16:25:08 +0200
Subject: gnu: icedtea-6: Remove old GCC.

* gnu/packages/java.scm (icedtea-6)[native-inputs]: Remove gcc-4.9.
---
 gnu/packages/java.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e2c47e417f..51e738d864 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -926,7 +926,6 @@ machine.")))
        ("fastjar" ,fastjar)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
-       ("gcc" ,gcc-4.9) ; there's a segmentation fault when compiling with gcc-5 or gcc-7
        ("gtk" ,gtk+-2)
        ("gawk" ,gawk)
        ("giflib" ,giflib)
-- 
cgit v1.2.3


From 6b7e09ae6bb78c9e2d07a259d93d9b4911234f4b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 7 Sep 2019 16:25:47 +0200
Subject: gnu: icedtea-7: Patch code to enable build with newer glibc.

* gnu/packages/java.scm (icedtea-7)[arguments]: Add build phase
"patch-bitrot".
(icedtea-8)[arguments]: Remove phase "patch-bitrot".
---
 gnu/packages/java.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 51e738d864..def2c8d92d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1125,6 +1125,18 @@ bootstrapping purposes.")
                                             ((name . _) name))
                                           inputs))))
                  #t)))
+           (add-after 'unpack 'patch-bitrot
+             (lambda _
+               (substitute* '("patches/boot/revert-6973616.patch"
+                              "openjdk.src/jdk/make/common/shared/Defs-versions.gmk")
+                 (("REQUIRED_FREETYPE_VERSION = 2.2.1")
+                  "REQUIRED_FREETYPE_VERSION = 2.10.1"))
+               ;; As of attr 2.4.48 this header is no longer
+               ;; included.  It is provided by the libc instead.
+               (substitute* '("configure"
+                              "openjdk.src/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c")
+                 (("attr/xattr.h") "sys/xattr.h"))
+               #t))
            (add-after 'unpack 'fix-x11-extension-include-path
              (lambda* (#:key inputs #:allow-other-keys)
                (substitute* "openjdk.src/jdk/make/sun/awt/mawt.gmk"
@@ -1604,6 +1616,7 @@ IcedTea build harness.")
                  (delete 'patch-paths)
                  (delete 'set-additional-paths)
                  (delete 'patch-patches)
+                 (delete 'patch-bitrot)
                  ;; Prevent the keytool from recording the current time when
                  ;; adding certificates at build time.
                  (add-after 'unpack 'patch-keystore
-- 
cgit v1.2.3


From 7854bbeb3f88ad4747b0a4ca01021ef2741f7b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 7 Sep 2019 15:37:22 +0200
Subject: doc: Work around (htmlprag) parser issue.

* doc/build.scm (guile-lib/htmlprag-fixed): New variable.
(syntax-highlighted-html): Use it instead of GUILE-LIB.
---
 doc/build.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/doc/build.scm b/doc/build.scm
index c99bd505fd..5bc95d2517 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -29,6 +29,7 @@
              (guix gexp)
              (guix git)
              (guix git-download)
+             (guix utils)
              (git)
              (gnu packages base)
              (gnu packages gawk)
@@ -165,6 +166,35 @@ as well as images, OS examples, and translations."
   ;; Options passed to 'makeinfo --html'.
   '("--css-ref=https://www.gnu.org/software/gnulib/manual.css"))
 
+(define guile-lib/htmlprag-fixed
+  ;; Guile-Lib with a hotfix for (htmlprag).
+  (package
+    (inherit guile-lib)
+    (source (origin
+              (inherit (package-source guile-lib))
+              (modules '(( guix build utils)))
+              (snippet
+               '(begin
+                  ;; When parsing
+                  ;; "
foo
\n
",
+                  ;; 'html->shtml' would mistakenly close 'blockquote' right
+                  ;; before 
.  This patch removes 'p' from the
+                  ;; 'parent-constraints' alist to fix that.
+                  (substitute* "src/htmlprag.scm"
+                    (("^[[:blank:]]*\\(p[[:blank:]]+\\. \\(body td th\\)\\).*")
+                     ""))
+                  #t))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments guile-lib)
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+          (add-before 'check 'skip-known-failure
+            (lambda _
+              ;; XXX: The above change causes one test failure among
+              ;; the htmlprag tests.
+              (setenv "XFAIL_TESTS" "htmlprag.scm")
+              #t))))))))
+
 (define* (syntax-highlighted-html input
                                   #:key
                                   (name "highlighted-syntax")
@@ -174,7 +204,7 @@ as well as images, OS examples, and translations."
 to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all
 its 
 blocks (as produced by 'makeinfo --html')."
   (define build
-    (with-extensions (list guile-lib guile-syntax-highlight)
+    (with-extensions (list guile-lib/htmlprag-fixed guile-syntax-highlight)
       (with-imported-modules '((guix build utils))
         #~(begin
             (use-modules (htmlprag)
-- 
cgit v1.2.3


From 8ba31e8bd1f780301a429bbd826aa26daad9e71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 7 Sep 2019 18:21:01 +0200
Subject: doc: Use @lisp instead of @example for Scheme snippets.

This is a followup to f8c143a7131d6f40f387f4cd2ad1fa78b5e2f429, which
allows syntax highlighting of @lisp snippets in the HTML output.

* doc/guix.texi, doc/contributing.texi: Use @lisp instead of @example
for all the Scheme snippets.
---
 doc/contributing.texi |  16 +-
 doc/guix.texi         | 642 +++++++++++++++++++++++++-------------------------
 2 files changed, 329 insertions(+), 329 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 59917193f1..655c8283e5 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -376,7 +376,7 @@ package and does not contain any version number.
 
 For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows:
 
-@example
+@lisp
 (define-public gtk+
   (package
     (name "gtk+")
@@ -387,15 +387,15 @@ For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows
     (name "gtk+")
     (version "2.24.20")
     ...))
-@end example
+@end lisp
 If we also wanted GTK+ 3.8.2, this would be packaged as
-@example
+@lisp
 (define-public gtk+-3.8
   (package
     (name "gtk+")
     (version "3.8.2")
     ...))
-@end example
+@end lisp
 
 @c See ,
 @c for a discussion of what follows.
@@ -432,7 +432,7 @@ kernel.)  It is best to use the full commit identifiers in
 @code{origin}s, though, to avoid ambiguities.  A typical package
 definition may look like this:
 
-@example
+@lisp
 (define my-package
   (let ((commit "c3f29bc928d5900971f65965feaae59e1272a3f7")
         (revision "1"))          ;Guix package revision
@@ -447,7 +447,7 @@ definition may look like this:
                 (file-name (git-file-name name version))))
       ;; @dots{}
       )))
-@end example
+@end lisp
 
 @node Synopses and Descriptions
 @subsection Synopses and Descriptions
@@ -825,12 +825,12 @@ recommend using the @code{qemu-binfmt-service-type} to emulate them.  In
 order to enable it, add the following service to the list of services in
 your @code{operating-system} configuration:
 
-@example
+@lisp
 (service qemu-binfmt-service-type
  (qemu-binfmt-configuration
    (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el"))
    (guix-support? #t)))
-@end example
+@end lisp
 
 Then reconfigure your system.
 
diff --git a/doc/guix.texi b/doc/guix.texi
index 6d6a09b36b..83f791d71d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1035,7 +1035,7 @@ build are copied back to the initial machine.
 
 The @file{/etc/guix/machines.scm} file typically looks like this:
 
-@example
+@lisp
 (list (build-machine
         (name "eightysix.example.org")
         (system "x86_64-linux")
@@ -1051,7 +1051,7 @@ The @file{/etc/guix/machines.scm} file typically looks like this:
         (private-key
          (string-append (getenv "HOME")
                         "/.ssh/identity-for-guix"))))
-@end example
+@end lisp
 
 @noindent
 In the example above we specify a list of two build machines, one for
@@ -2756,9 +2756,9 @@ Install the package that the code within @var{file} evaluates to.
 As an example, @var{file} might contain a definition like this
 (@pxref{Defining Packages}):
 
-@example
+@lisp
 @verbatiminclude package-hello.scm
-@end example
+@end lisp
 
 Developers may find it useful to include such a @file{guix.scm} file
 in the root of their project source tree that can be used to test
@@ -2814,7 +2814,7 @@ so on.
 of packages:
 
 @findex packages->manifest
-@example
+@lisp
 (use-package-modules guile emacs)
 
 (packages->manifest
@@ -2822,7 +2822,7 @@ of packages:
        guile-2.0
        ;; Use a specific package output.
        (list guile-2.0 "debug")))
-@end example
+@end lisp
 
 @findex specifications->manifest
 In this example we have to know which modules define the @code{emacs}
@@ -2832,10 +2832,10 @@ instead provide regular package specifications and let
 @code{specifications->manifest} look up the corresponding package
 objects, like this:
 
-@example
+@lisp
 (specifications->manifest
  '("emacs" "guile@@2.2" "guile@@2.2:debug"))
-@end example
+@end lisp
 
 @item --roll-back
 @cindex rolling back
@@ -4548,9 +4548,9 @@ within @var{file} evaluates to.
 As an example, @var{file} might contain a definition like this
 (@pxref{Defining Packages}):
 
-@example
+@lisp
 @verbatiminclude environment-gdb.scm
-@end example
+@end lisp
 
 @item --manifest=@var{file}
 @itemx -m @var{file}
@@ -5124,7 +5124,7 @@ The high-level interface to package definitions is implemented in the
 example, the package definition, or @dfn{recipe}, for the GNU Hello
 package looks like this:
 
-@example
+@lisp
 (define-module (gnu packages hello)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -5150,7 +5150,7 @@ package looks like this:
     (description "Guess what GNU Hello prints!")
     (home-page "https://www.gnu.org/software/hello/")
     (license gpl3+)))
-@end example
+@end lisp
 
 @noindent
 Without being a Scheme expert, the reader may have guessed the meaning
@@ -5331,7 +5331,7 @@ the name of a package and returns its new name after rewrite.
 @noindent
 Consider this example:
 
-@example
+@lisp
 (define libressl-instead-of-openssl
   ;; This is a procedure to replace OPENSSL by LIBRESSL,
   ;; recursively.
@@ -5339,7 +5339,7 @@ Consider this example:
 
 (define git-with-libressl
   (libressl-instead-of-openssl git))
-@end example
+@end lisp
 
 @noindent
 Here we first define a rewriting procedure that replaces @var{openssl}
@@ -5361,11 +5361,11 @@ replacement for that package.
 
 The example above could be rewritten this way:
 
-@example
+@lisp
 (define libressl-instead-of-openssl
   ;; Replace all the packages called "openssl" with LibreSSL.
   (package-input-rewriting/spec `(("openssl" . ,(const libressl)))))
-@end example
+@end lisp
 
 The key difference here is that, this time, packages are matched by spec and
 not by identity.  In other words, any package in the graph that is called
@@ -5431,11 +5431,11 @@ defaults to @code{"out"} (@pxref{Packages with Multiple Outputs}, for
 more on package outputs).  For example, the list below specifies three
 inputs:
 
-@example
+@lisp
 `(("libffi" ,libffi)
   ("libunistring" ,libunistring)
   ("glib:bin" ,glib "bin"))  ;the "bin" output of Glib
-@end example
+@end lisp
 
 @cindex cross compilation, package dependencies
 The distinction between @code{native-inputs} and @code{inputs} is
@@ -5516,7 +5516,7 @@ identifier resolves to the package being defined.
 The example below shows how to add a package as a native input of itself when
 cross-compiling:
 
-@example
+@lisp
 (package
   (name "guile")
   ;; ...
@@ -5526,7 +5526,7 @@ cross-compiling:
   (native-inputs (if (%current-target-system)
                      `(("self" ,this-package))
                      '())))
-@end example
+@end lisp
 
 It is an error to refer to @code{this-package} outside a package definition.
 @end deffn
@@ -5563,11 +5563,11 @@ clone the Git version control repository, and check out the revision
 specified in the @code{uri} field as a @code{git-reference} object; a
 @code{git-reference} looks like this:
 
-@example
+@lisp
 (git-reference
   (url "https://git.savannah.gnu.org/git/hello.git")
   (commit "v2.10"))
-@end example
+@end lisp
 @end table
 
 @item @code{sha256}
@@ -6779,7 +6779,7 @@ in a monad---values that carry this additional context---are called
 
 Consider this ``normal'' procedure:
 
-@example
+@lisp
 (define (sh-symlink store)
   ;; Return a derivation that symlinks the 'bash' executable.
   (let* ((drv (package-derivation store bash))
@@ -6787,19 +6787,19 @@ Consider this ``normal'' procedure:
          (sh  (string-append out "/bin/bash")))
     (build-expression->derivation store "sh"
                                   `(symlink ,sh %output))))
-@end example
+@end lisp
 
 Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten
 as a monadic function:
 
-@example
+@lisp
 (define (sh-symlink)
   ;; Same, but return a monadic value.
   (mlet %store-monad ((drv (package->derivation bash)))
     (gexp->derivation "sh"
                       #~(symlink (string-append #$drv "/bin/bash")
                                  #$output))))
-@end example
+@end lisp
 
 There are several things to note in the second version: the @code{store}
 parameter is now implicit and is ``threaded'' in the calls to the
@@ -6811,12 +6811,12 @@ As it turns out, the call to @code{package->derivation} can even be
 omitted since it will take place implicitly, as we will see later
 (@pxref{G-Expressions}):
 
-@example
+@lisp
 (define (sh-symlink)
   (gexp->derivation "sh"
                     #~(symlink (string-append #$bash "/bin/bash")
                                #$output)))
-@end example
+@end lisp
 
 @c See
 @c 
@@ -6826,10 +6826,10 @@ said, ``you exit a monad like you exit a building on fire: by running''.
 So, to exit the monad and get the desired effect, one must use
 @code{run-with-store}:
 
-@example
+@lisp
 (run-with-store (open-connection) (sh-symlink))
 @result{} /gnu/store/...-sh-symlink
-@end example
+@end lisp
 
 Note that the @code{(guix monad-repl)} module extends the Guile REPL with
 new ``meta-commands'' to make it easier to deal with monadic procedures:
@@ -6878,7 +6878,7 @@ Guile.  Thus we use this somewhat cryptic symbol inherited from the
 Haskell language.}.  There can be one @var{mproc} or several of them, as
 in this example:
 
-@example
+@lisp
 (run-with-state
     (with-monad %state-monad
       (>>= (return 1)
@@ -6888,7 +6888,7 @@ in this example:
 
 @result{} 4
 @result{} some-state
-@end example
+@end lisp
 @end deffn
 
 @deffn {Scheme Syntax} mlet @var{monad} ((@var{var} @var{mval}) ...) @
@@ -6947,7 +6947,7 @@ Consider the example below.  The @code{square} procedure returns a value
 in the state monad.  It returns the square of its argument, but also
 increments the current state value:
 
-@example
+@lisp
 (define (square x)
   (mlet %state-monad ((count (current-state)))
     (mbegin %state-monad
@@ -6957,7 +6957,7 @@ increments the current state value:
 (run-with-state (sequence %state-monad (map square (iota 3))) 0)
 @result{} (0 1 4)
 @result{} 3
-@end example
+@end lisp
 
 When ``run'' through @var{%state-monad}, we obtain that additional state
 value, which is the number of @code{square} calls.
@@ -7032,14 +7032,14 @@ entries for which @var{select?} does not return true.
 
 The example below adds a file to the store, under two different names:
 
-@example
+@lisp
 (run-with-store (open-connection)
   (mlet %store-monad ((a (interned-file "README"))
                       (b (interned-file "README" "LEGU-MIN")))
     (return (list a b))))
 
 @result{} ("/gnu/store/rwm@dots{}-README" "/gnu/store/44i@dots{}-LEGU-MIN")
-@end example
+@end lisp
 
 @end deffn
 
@@ -7133,22 +7133,22 @@ below.)
 
 To illustrate the idea, here is an example of a gexp:
 
-@example
+@lisp
 (define build-exp
   #~(begin
       (mkdir #$output)
       (chdir #$output)
       (symlink (string-append #$coreutils "/bin/ls")
                "list-files")))
-@end example
+@end lisp
 
 This gexp can be passed to @code{gexp->derivation}; we obtain a
 derivation that builds a directory containing exactly one symlink to
 @file{/gnu/store/@dots{}-coreutils-8.22/bin/ls}:
 
-@example
+@lisp
 (gexp->derivation "the-thing" build-exp)
-@end example
+@end lisp
 
 As one would expect, the @code{"/gnu/store/@dots{}-coreutils-8.22"} string is
 substituted to the reference to the @var{coreutils} package in the
@@ -7164,7 +7164,7 @@ host---versus references to cross builds of a package.  To that end, the
 @code{#+} plays the same role as @code{#$}, but is a reference to a
 native package build:
 
-@example
+@lisp
 (gexp->derivation "vi"
    #~(begin
        (mkdir #$output)
@@ -7173,7 +7173,7 @@ native package build:
                 (string-append #$emacs "/bin/emacs")
                 (string-append #$output "/bin/vi")))
    #:target "mips64el-linux-gnu")
-@end example
+@end lisp
 
 @noindent
 In the example above, the native build of @var{coreutils} is used, so
@@ -7187,7 +7187,7 @@ able to use certain Guile modules from the ``host environment'' in the
 gexp, so those modules should be imported in the ``build environment''.
 The @code{with-imported-modules} form allows you to express that:
 
-@example
+@lisp
 (let ((build (with-imported-modules '((guix build utils))
                #~(begin
                    (use-modules (guix build utils))
@@ -7197,7 +7197,7 @@ The @code{with-imported-modules} form allows you to express that:
                         #$build
                         (display "success!\n")
                         #t)))
-@end example
+@end lisp
 
 @noindent
 In this example, the @code{(guix build utils)} module is automatically
@@ -7213,7 +7213,7 @@ because of missing dependent modules.  The @code{source-module-closure}
 procedure computes the closure of a module by looking at its source file
 headers, which comes in handy in this case:
 
-@example
+@lisp
 (use-modules (guix modules))   ;for 'source-module-closure'
 
 (with-imported-modules (source-module-closure
@@ -7224,7 +7224,7 @@ headers, which comes in handy in this case:
                         (use-modules (guix build utils)
                                      (gnu build vm))
                         @dots{})))
-@end example
+@end lisp
 
 @cindex extensions, for gexps
 @findex with-extensions
@@ -7233,7 +7233,7 @@ modules, but also ``extensions'' such as Guile bindings to C libraries
 or other ``full-blown'' packages.  Say you need the @code{guile-json}
 package available on the build side, here's how you would do it:
 
-@example
+@lisp
 (use-modules (gnu packages guile))  ;for 'guile-json'
 
 (with-extensions (list guile-json)
@@ -7241,7 +7241,7 @@ package available on the build side, here's how you would do it:
                     #~(begin
                         (use-modules (json))
                         @dots{})))
-@end example
+@end lisp
 
 The syntactic form to construct gexps is summarized below.
 
@@ -7310,12 +7310,12 @@ Each item in @var{modules} can be the name of a module, such as
 @code{(guix build utils)}, or it can be a module name, followed by an
 arrow, followed by a file-like object:
 
-@example
+@lisp
 `((guix build utils)
   (guix gcrypt)
   ((guix config) => ,(scheme-file "config.scm"
                                   #~(define-module @dots{}))))
-@end example
+@end lisp
 
 @noindent
 In the example above, the first two modules are taken from the search
@@ -7414,10 +7414,10 @@ The @code{local-file}, @code{plain-file}, @code{computed-file},
 @dfn{file-like objects}.  That is, when unquoted in a G-expression,
 these objects lead to a file in the store.  Consider this G-expression:
 
-@example
+@lisp
 #~(system* #$(file-append glibc "/sbin/nscd") "-f"
            #$(local-file "/tmp/my-nscd.conf"))
-@end example
+@end lisp
 
 The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it
 to the store.  Once expanded, for instance @i{via}
@@ -7473,13 +7473,13 @@ Look up @var{exp}'s modules in @var{module-path}.
 The example below builds a script that simply invokes the @command{ls}
 command:
 
-@example
+@lisp
 (use-modules (guix gexp) (gnu packages base))
 
 (gexp->script "list-files"
               #~(execl #$(file-append coreutils "/bin/ls")
                        "ls"))
-@end example
+@end lisp
 
 When ``running'' it through the store (@pxref{The Store Monad,
 @code{run-with-store}}), we obtain a derivation that produces an
@@ -7537,14 +7537,14 @@ to create will reference items from the store.  This is typically the
 case when building a configuration file that embeds store file names,
 like this:
 
-@example
+@lisp
 (define (profile.sh)
   ;; Return the name of a shell script in the store that
   ;; initializes the 'PATH' environment variable.
   (text-file* "profile.sh"
               "export PATH=" coreutils "/bin:"
               grep "/bin:" sed "/bin\n"))
-@end example
+@end lisp
 
 In this example, the resulting @file{/gnu/store/@dots{}-profile.sh} file
 will reference @var{coreutils}, @var{grep}, and @var{sed}, thereby
@@ -7556,10 +7556,10 @@ Return an object representing store file @var{name} containing
 @var{text}.  @var{text} is a sequence of strings and file-like objects,
 as in:
 
-@example
+@lisp
 (mixed-text-file "profile"
                  "export PATH=" coreutils "/bin:" grep "/bin")
-@end example
+@end lisp
 
 This is the declarative counterpart of @code{text-file*}.
 @end deffn
@@ -7570,13 +7570,13 @@ Each item in @var{files} must be a two-element list where the first element is t
 file name to use in the new directory, and the second element is a gexp
 denoting the target file.  Here's an example:
 
-@example
+@lisp
 (file-union "etc"
             `(("hosts" ,(plain-file "hosts"
                                     "127.0.0.1 localhost"))
               ("bashrc" ,(plain-file "bashrc"
                                      "alias ls='ls --color=auto'"))))
-@end example
+@end lisp
 
 This yields an @code{etc} directory containing these two files.
 @end deffn
@@ -7585,9 +7585,9 @@ This yields an @code{etc} directory containing these two files.
 Return a directory that is the union of @var{things}, where @var{things} is a list of
 file-like objects denoting directories.  For example:
 
-@example
+@lisp
 (directory-union "guile+emacs" (list guile emacs))
-@end example
+@end lisp
 
 yields a directory that is the union of the @code{guile} and @code{emacs} packages.
 @end deffn
@@ -7599,19 +7599,19 @@ and @var{suffix}, where @var{obj} is a lowerable object and each
 
 As an example, consider this gexp:
 
-@example
+@lisp
 (gexp->script "run-uname"
               #~(system* #$(file-append coreutils
                                         "/bin/uname")))
-@end example
+@end lisp
 
 The same effect could be achieved with:
 
-@example
+@lisp
 (gexp->script "run-uname"
               #~(system* (string-append #$coreutils
                                         "/bin/uname")))
-@end example
+@end lisp
 
 There is one difference though: in the @code{file-append} case, the
 resulting script contains the absolute file name as a string, whereas in
@@ -8099,9 +8099,9 @@ Build the package, derivation, or other file-like object that the code within
 As an example, @var{file} might contain a package definition like this
 (@pxref{Defining Packages}):
 
-@example
+@lisp
 @verbatiminclude package-hello.scm
-@end example
+@end lisp
 
 @item --expression=@var{expr}
 @itemx -e @var{expr}
@@ -8974,13 +8974,13 @@ and @command{guix refresh} needs a little help.  Most updaters honor the
 @code{upstream-name} property in package definitions, which can be used
 to that effect:
 
-@example
+@lisp
 (define-public network-manager
   (package
     (name "network-manager")
     ;; @dots{}
     (properties '((upstream-name . "NetworkManager")))))
-@end example
+@end lisp
 
 When passed @code{--update}, it modifies distribution source files to
 update the version numbers and source tarball hashes of those package
@@ -9323,14 +9323,14 @@ Package developers can specify in package recipes the
 name and version of the package when they differ from the name or version
 that Guix uses, as in this example:
 
-@example
+@lisp
 (package
   (name "grub")
   ;; @dots{}
   ;; CPE calls this package "grub2".
   (properties '((cpe-name . "grub2")
                 (cpe-version . "2.3")))
-@end example
+@end lisp
 
 @c See .
 Some entries in the CVE database do not specify which version of a
@@ -9338,7 +9338,7 @@ package they apply to, and would thus ``stick around'' forever.  Package
 developers who found CVE alerts and verified they can be ignored can
 declare them as in this example:
 
-@example
+@lisp
 (package
   (name "t1lib")
   ;; @dots{}
@@ -9347,7 +9347,7 @@ declare them as in this example:
                                     "CVE-2011-1553"
                                     "CVE-2011-1554"
                                     "CVE-2011-5244")))))
-@end example
+@end lisp
 
 @item formatting
 Warn about obvious source code formatting issues: trailing white space,
@@ -10447,11 +10447,11 @@ mode, as in the example above.  However, more recent machines rely instead on
 the @dfn{Unified Extensible Firmware Interface} (UEFI) to boot.  In that case,
 the @code{bootloader} field should contain something along these lines:
 
-@example
+@lisp
 (bootloader-configuration
   (bootloader grub-efi-bootloader)
   (target "/boot/efi"))
-@end example
+@end lisp
 
 @xref{Bootloader Configuration}, for more information on the available
 configuration options.
@@ -10588,11 +10588,11 @@ Partitioning,,, guile, GNU Guile Reference Manual}).  For instance, the
 following expression returns a list that contains all the services in
 @code{%desktop-services} minus the Avahi service:
 
-@example
+@lisp
 (remove (lambda (service)
           (eq? (service-kind service) avahi-service-type))
         %desktop-services)
-@end example
+@end lisp
 
 @unnumberedsubsec Instantiating the System
 
@@ -10753,12 +10753,12 @@ the home directory of newly-created user accounts.
 
 For instance, a valid value may look like this:
 
-@example
+@lisp
 `((".bashrc" ,(plain-file "bashrc" "echo Hello\n"))
   (".guile" ,(plain-file "guile"
                          "(use-modules (ice-9 readline))
                           (activate-readline)")))
-@end example
+@end lisp
 
 @item @code{issue} (default: @code{%default-issue})
 A string denoting the contents of the @file{/etc/issue} file, which is
@@ -10836,14 +10836,14 @@ this identifier resolves to the operating system being defined.
 The example below shows how to refer to the operating system being defined in
 the definition of the @code{label} field:
 
-@example
+@lisp
 (use-modules (gnu) (guix))
 
 (operating-system
   ;; ...
   (label (package-full-name
           (operating-system-kernel this-operating-system))))
-@end example
+@end lisp
 
 It is an error to refer to @code{this-operating-system} outside an operating
 system definition.
@@ -10859,12 +10859,12 @@ The list of file systems to be mounted is specified in the
 (@pxref{Using the Configuration System}).  Each file system is declared
 using the @code{file-system} form, like this:
 
-@example
+@lisp
 (file-system
   (mount-point "/home")
   (device "/dev/sda3")
   (type "ext4"))
-@end example
+@end lisp
 
 As usual, some of the fields are mandatory---those shown in the example
 above---while others can be omitted.  These are described below.
@@ -10898,12 +10898,12 @@ procedure, UUIDs are created using @code{uuid}, and @file{/dev} node are
 plain strings.  Here's an example of a file system referred to by its
 label, as shown by the @command{e2label} command:
 
-@example
+@lisp
 (file-system
   (mount-point "/home")
   (type "ext4")
   (device (file-system-label "my-home")))
-@end example
+@end lisp
 
 @findex uuid
 UUIDs are converted from their string representation (as shown by the
@@ -10914,12 +10914,12 @@ form of UUID used by the ext2 family of file systems and others, but it
 is different from ``UUIDs'' found in FAT file systems, for instance.},
 like this:
 
-@example
+@lisp
 (file-system
   (mount-point "/home")
   (type "ext4")
   (device (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb")))
-@end example
+@end lisp
 
 When the source of a file system is a mapped device (@pxref{Mapped
 Devices}), its @code{device} field @emph{must} refer to the mapped
@@ -11094,12 +11094,12 @@ The @file{/dev/mapper/home}
 device can then be used as the @code{device} of a @code{file-system}
 declaration (@pxref{File Systems}).
 
-@example
+@lisp
 (mapped-device
   (source "/dev/sda3")
   (target "home")
   (type luks-device-mapping))
-@end example
+@end lisp
 
 Alternatively, to become independent of device numbering, one may obtain
 the LUKS UUID (@dfn{unique identifier}) of the source device by a
@@ -11111,12 +11111,12 @@ cryptsetup luksUUID /dev/sda3
 
 and use it as follows:
 
-@example
+@lisp
 (mapped-device
   (source (uuid "cb67fc72-0d54-4c88-9d4b-b225f30b0f44"))
   (target "home")
   (type luks-device-mapping))
-@end example
+@end lisp
 
 @cindex swap encryption
 It is also desirable to encrypt swap space, since swap space may contain
@@ -11128,12 +11128,12 @@ swap file is encrypted because the entire device is encrypted.
 A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1}
 may be declared as follows:
 
-@example
+@lisp
 (mapped-device
   (source (list "/dev/sda1" "/dev/sdb1"))
   (target "/dev/md0")
   (type raid-device-mapping))
-@end example
+@end lisp
 
 The @file{/dev/md0} device can then be used as the @code{device} of a
 @code{file-system} declaration (@pxref{File Systems}).
@@ -11152,7 +11152,7 @@ User accounts and groups are entirely managed through the
 @code{operating-system} declaration.  They are specified with the
 @code{user-account} and @code{user-group} forms:
 
-@example
+@lisp
 (user-account
   (name "alice")
   (group "users")
@@ -11162,7 +11162,7 @@ User accounts and groups are entirely managed through the
                           "cdrom")) ;the good ol' CD-ROM
   (comment "Bob's sister")
   (home-directory "/home/alice"))
-@end example
+@end lisp
 
 When booting or upon completion of @command{guix system reconfigure},
 the system ensures that only the user accounts and groups specified in
@@ -11226,14 +11226,14 @@ If you @emph{do} want to set an initial password for an account, then
 this field must contain the encrypted password, as a string.  You can use the
 @code{crypt} procedure for this purpose:
 
-@example
+@lisp
 (user-account
   (name "charlie")
   (group "users")
 
   ;; Specify a SHA-512-hashed initial password.
   (password (crypt "InitialPassword!" "$6$abc")))
-@end example
+@end lisp
 
 @quotation Note
 The hash of this initial password will be available in a file in
@@ -11251,9 +11251,9 @@ Guile Reference Manual}, for information on Guile's @code{crypt} procedure.
 @cindex groups
 User group declarations are even simpler:
 
-@example
+@lisp
 (user-group (name "students"))
-@end example
+@end lisp
 
 @deftp {Data Type} user-group
 This type is for, well, user groups.  There are just a few fields:
@@ -11340,7 +11340,7 @@ optional variant name, an optional keyboard model name, and a possibly empty
 list of additional options.  In most cases the layout name is all you care
 about.  Here are a few example:
 
-@example
+@lisp
 ;; The German QWERTZ layout.  Here we assume a standard
 ;; "pc105" keyboard model.
 (keyboard-layout "de")
@@ -11365,7 +11365,7 @@ about.  Here are a few example:
 ;; dead keys to enter accented characters.  This is for an
 ;; Apple MacBook keyboard.
 (keyboard-layout "us" "intl" #:model "macbook78")
-@end example
+@end lisp
 
 See the @file{share/X11/xkb} directory of the @code{xkeyboard-config} package
 for a complete list of supported layouts, variants, and models.
@@ -11455,20 +11455,20 @@ used locales, but not all the available locales, in order to save space.
 For instance, to add the North Frisian locale for Germany, the value of
 that field may be:
 
-@example
+@lisp
 (cons (locale-definition
         (name "fy_DE.utf8") (source "fy_DE"))
       %default-locale-definitions)
-@end example
+@end lisp
 
 Likewise, to save space, one might want @code{locale-definitions} to
 list only the locales that are actually used, as in:
 
-@example
+@lisp
 (list (locale-definition
         (name "ja_JP.eucjp") (source "ja_JP")
         (charset "EUC-JP")))
-@end example
+@end lisp
 
 @vindex LOCPATH
 The compiled locale definitions are available at
@@ -11554,13 +11554,13 @@ it---this is especially crucial on a multi-user system.  To do that, the
 administrator can specify several libc packages in the
 @code{locale-libcs} field of @code{operating-system}:
 
-@example
+@lisp
 (use-package-modules base)
 
 (operating-system
   ;; @dots{}
   (locale-libcs (list glibc-2.21 (canonical-package glibc))))
-@end example
+@end lisp
 
 This example would lead to a system containing locale definitions for
 both libc 2.21 and the current version of libc in
@@ -11665,11 +11665,11 @@ This is the default value of the @code{services} field of
 system, you will want to append services to @code{%base-services}, like
 this:
 
-@example
+@lisp
 (append (list (service avahi-service-type)
               (service openssh-service-type))
         %base-services)
-@end example
+@end lisp
 @end defvr
 
 @defvr {Scheme Variable} special-files-service-type
@@ -11682,19 +11682,19 @@ and the second element is its target.  By default it is:
 
 @cindex @file{/bin/sh}
 @cindex @file{sh}, in @file{/bin}
-@example
-`(("/bin/sh" ,(file-append @var{bash} "/bin/sh")))
-@end example
+@lisp
+`(("/bin/sh" ,(file-append bash "/bin/sh")))
+@end lisp
 
 @cindex @file{/usr/bin/env}
 @cindex @file{env}, in @file{/usr/bin}
 If you want to add, say, @code{/usr/bin/env} to your system, you can
 change it to:
 
-@example
-`(("/bin/sh" ,(file-append @var{bash} "/bin/sh"))
-  ("/usr/bin/env" ,(file-append @var{coreutils} "/bin/env")))
-@end example
+@lisp
+`(("/bin/sh" ,(file-append bash "/bin/sh"))
+  ("/usr/bin/env" ,(file-append coreutils "/bin/env")))
+@end lisp
 
 Since this is part of @code{%base-services}, you can use
 @code{modify-services} to customize the set of special files
@@ -11710,10 +11710,10 @@ For example, adding the following lines to the @code{services} field of
 your operating system declaration leads to a @file{/usr/bin/env}
 symlink:
 
-@example
+@lisp
 (extra-special-file "/usr/bin/env"
                     (file-append coreutils "/bin/env"))
-@end example
+@end lisp
 @end deffn
 
 @deffn {Scheme Procedure} host-name-service @var{name}
@@ -12212,14 +12212,14 @@ In the following example, a rule for a USB device is defined to be
 stored in the file @file{90-usb-thing.rules}.  The rule runs a script
 upon detecting a USB device with a given product identifier.
 
-@example
+@lisp
 (define %example-udev-rule
   (udev-rule
     "90-usb-thing.rules"
     (string-append "ACTION==\"add\", SUBSYSTEM==\"usb\", "
                    "ATTR@{product@}==\"Example\", "
                    "RUN+=\"/path/to/script\"")))
-@end example
+@end lisp
 
 The @command{herd rules udev} command, as root, returns the name of the
 directory containing all the active udev rules.
@@ -12227,7 +12227,7 @@ directory containing all the active udev rules.
 
 Here we show how the default @var{udev-service} can be extended with it.
 
-@example
+@lisp
 (operating-system
  ;; @dots{}
  (services
@@ -12236,7 +12236,7 @@ Here we show how the default @var{udev-service} can be extended with it.
      (udev-configuration (inherit config)
       (rules (append (udev-configuration-rules config)
                      (list %example-udev-rule))))))))
-@end example
+@end lisp
 
 @deffn {Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]
 Return a udev file named @var{file-name} containing the rules defined
@@ -12244,7 +12244,7 @@ within @var{file}, a file-like object.
 
 The following example showcases how we can use an existing rule file.
 
-@example
+@lisp
 (use-modules (guix download)     ;for url-fetch
              (guix packages)     ;for origin
              ;; @dots{})
@@ -12259,7 +12259,7 @@ The following example showcases how we can use an existing rule file.
                            "android-udev-rules/" version "/51-android.rules"))
        (sha256
         (base32 "0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003"))))))
-@end example
+@end lisp
 @end deffn
 
 Additionally, Guix package definitions can be included in @var{rules} in
@@ -12278,7 +12278,7 @@ create such a group, we must define it both as part of the
 @var{supplementary-groups} of our @var{user-account} declaration, as
 well as in the @var{groups} field of the @var{operating-system} record.
 
-@example
+@lisp
 (use-modules (gnu packages android)  ;for android-udev-rules
              (gnu system shadow)     ;for user-group
              ;; @dots{})
@@ -12304,7 +12304,7 @@ well as in the @var{groups} field of the @var{operating-system} record.
       (udev-configuration (inherit config)
                           (rules (cons android-udev-rules
                                        (udev-configuration-rules config))))))))
-@end example
+@end lisp
 
 @defvr {Scheme Variable} urandom-seed-service-type
 Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom}
@@ -12378,9 +12378,9 @@ This is a list of compression method/level tuple used when compressing
 substitutes.  For example, to compress all substitutes with @emph{both} lzip
 at level 7 and gzip at level 9, write:
 
-@example
+@lisp
 '(("lzip" 7) ("gzip" 9))
-@end example
+@end lisp
 
 Level 9 achieves the best compression ratio at the expense of increased CPU
 usage, whereas level 1 achieves fast compression.
@@ -12435,12 +12435,12 @@ Return a service that installs a configuration file for the
 The following limits definition sets two hard and soft limits for all
 login sessions of users in the @code{realtime} group:
 
-@example
+@lisp
 (pam-limits-service
  (list
   (pam-limits-entry "@@realtime" 'both 'rtprio 99)
   (pam-limits-entry "@@realtime" 'both 'memlock 'unlimited)))
-@end example
+@end lisp
 
 The first entry increases the maximum realtime priority for
 non-privileged processes; the second entry lifts any restriction of the
@@ -12647,7 +12647,7 @@ Taking an example from the Rottlog manual (@pxref{Period Related File
 Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be
 defined like this:
 
-@example
+@lisp
 (log-rotation
   (frequency 'daily)
   (files '("/var/log/apache/*"))
@@ -12655,7 +12655,7 @@ defined like this:
              "rotate 6"
              "notifempty"
              "nocompress")))
-@end example
+@end lisp
 
 The list of fields is as follows:
 
@@ -12704,12 +12704,12 @@ This type defines a service that runs a DHCP daemon.  To create a
 service of this type, you must supply a @code{}.
 For example:
 
-@example
+@lisp
 (service dhcpd-service-type
          (dhcpd-configuration
           (config-file (local-file "my-dhcpd.conf"))
           (interfaces '("enp0s25"))))
-@end example
+@end lisp
 @end deffn
 
 @deftp {Data Type} dhcpd-configuration
@@ -12765,11 +12765,11 @@ to handle.
 
 For example:
 
-@example
+@lisp
 (static-networking-service "eno1" "192.168.1.82"
                            #:gateway "192.168.1.2"
                            #:name-servers '("192.168.1.2"))
-@end example
+@end lisp
 @end deffn
 
 @cindex wicd
@@ -12924,11 +12924,11 @@ a network connection manager.
 Its value must be an
 @code{connman-configuration} record as in this example:
 
-@example
+@lisp
 (service connman-service-type
          (connman-configuration
            (disable-vpn? #t)))
-@end example
+@end lisp
 
 See below for details about @code{connman-configuration}.
 @end deffn
@@ -13066,7 +13066,7 @@ Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as implemented
 by @uref{http://www.openntpd.org, OpenNTPD}.  The daemon will keep the system
 clock synchronized with that of the given servers.
 
-@example
+@lisp
 (service
  openntpd-service-type
  (openntpd-configuration
@@ -13076,7 +13076,7 @@ clock synchronized with that of the given servers.
   (constraints-from '("https://www.google.com/"))
   (allow-large-adjustment? #t)))
 
-@end example
+@end lisp
 @end deffn
 
 @deftp {Data Type} openntpd-configuration
@@ -13126,7 +13126,7 @@ built-in @command{echo} service, as well as an smtp service which
 forwards smtp traffic over ssh to a server @code{smtp-server} behind a
 gateway @code{hostname}:
 
-@example
+@lisp
 (service
  inetd-service-type
  (inetd-configuration
@@ -13148,7 +13148,7 @@ gateway @code{hostname}:
              (arguments
               '("ssh" "-qT" "-i" "/path/to/ssh_key"
                 "-W" "smtp-server:25" "user@@hostname")))))
-@end example
+@end lisp
 
 See below for more details about @code{inetd-configuration}.
 @end deffn
@@ -13284,9 +13284,9 @@ This is the service type for the @uref{https://rsync.samba.org, rsync} daemon,
 The value for this service type is a
 @command{rsync-configuration} record as in this example:
 
-@example
+@lisp
 (service rsync-service-type)
-@end example
+@end lisp
 
 See below for details about @code{rsync-configuration}.
 @end deffn
@@ -13390,7 +13390,7 @@ This is the type for the @uref{http://www.openssh.org, OpenSSH} secure
 shell daemon, @command{sshd}.  Its value must be an
 @code{openssh-configuration} record as in this example:
 
-@example
+@lisp
 (service openssh-service-type
          (openssh-configuration
            (x11-forwarding? #t)
@@ -13398,18 +13398,18 @@ shell daemon, @command{sshd}.  Its value must be an
            (authorized-keys
              `(("alice" ,(local-file "alice.pub"))
                ("bob" ,(local-file "bob.pub"))))))
-@end example
+@end lisp
 
 See below for details about @code{openssh-configuration}.
 
 This service can be extended with extra authorized keys, as in this
 example:
 
-@example
+@lisp
 (service-extension openssh-service-type
                    (const `(("charlie"
                              ,(local-file "charlie.pub")))))
-@end example
+@end lisp
 @end deffn
 
 @deftp {Data Type} openssh-configuration
@@ -13486,12 +13486,12 @@ subsystem request.
 
 The command @command{internal-sftp} implements an in-process SFTP
 server.  Alternately, one can specify the @command{sftp-server} command:
-@example
+@lisp
 (service openssh-service-type
          (openssh-configuration
           (subsystems
            `(("sftp" ,(file-append openssh "/libexec/sftp-server"))))))
-@end example
+@end lisp
 
 @item @code{accepted-environment} (default: @code{'()})
 List of strings describing which environment variables may be exported.
@@ -13504,11 +13504,11 @@ It is set by terminal emulators, which support colors.  You can use it in
 your shell's ressource file to enable colors for the prompt and commands
 if this variable is set.
 
-@example
+@lisp
 (service openssh-service-type
          (openssh-configuration
            (accepted-environment '("COLORTERM"))))
-@end example
+@end lisp
 
 @item @code{authorized-keys} (default: @code{'()})
 @cindex authorized keys, SSH
@@ -13517,13 +13517,13 @@ This is the list of authorized keys.  Each element of the list is a user
 name followed by one or more file-like objects that represent SSH public
 keys.  For example:
 
-@example
+@lisp
 (openssh-configuration
   (authorized-keys
     `(("rekado" ,(local-file "rekado.pub"))
       ("chris" ,(local-file "chris.pub"))
       ("root" ,(local-file "rekado.pub") ,(local-file "chris.pub")))))
-@end example
+@end lisp
 
 @noindent
 registers the specified public keys for user accounts @code{rekado},
@@ -13546,12 +13546,12 @@ is especially useful for elaborate configurations that cannot be expressed
 otherwise.  This configuration, for example, would generally disable root
 logins, but permit them from one specific IP address:
 
-@example
+@lisp
 (openssh-configuration
   (extra-content "\
 Match Address 192.168.0.1
   PermitRootLogin yes"))
-@end example
+@end lisp
 
 @end table
 @end deftp
@@ -13564,10 +13564,10 @@ object.
 For example, to specify a Dropbear service listening on port 1234, add
 this call to the operating system's @code{services} field:
 
-@example
+@lisp
 (dropbear-service (dropbear-configuration
                     (port-number 1234)))
-@end example
+@end lisp
 @end deffn
 
 @deftp {Data Type} dropbear-configuration
@@ -13608,7 +13608,7 @@ This variable is typically used in the @code{hosts-file} field of an
 @code{operating-system} declaration (@pxref{operating-system Reference,
 @file{/etc/hosts}}):
 
-@example
+@lisp
 (use-modules (gnu) (guix))
 
 (operating-system
@@ -13620,7 +13620,7 @@ This variable is typically used in the @code{hosts-file} field of an
     (plain-file "hosts"
                 (string-append (local-host-aliases host-name)
                                %facebook-host-aliases))))
-@end example
+@end lisp
 
 This mechanism can prevent programs running locally, such as Web
 browsers, from accessing Facebook.
@@ -14054,9 +14054,9 @@ system, add a @code{cups-service} to the operating system definition:
 The service type for the CUPS print server.  Its value should be a valid
 CUPS configuration (see below).  To use the default settings, simply
 write:
-@example
+@lisp
 (service cups-service-type)
-@end example
+@end lisp
 @end deffn
 
 The CUPS configuration controls the basic things about your CUPS
@@ -14072,13 +14072,13 @@ support for Epson printers @i{via} the @code{escpr} package and for HP
 printers @i{via} the @code{hplip-minimal} package.  You can do that directly,
 like this (you need to use the @code{(gnu packages cups)} module):
 
-@example
+@lisp
 (service cups-service-type
          (cups-configuration
            (web-interface? #t)
            (extensions
              (list cups-filters escpr hplip-minimal))))
-@end example
+@end lisp
 
 Note: If you wish to use the Qt5 based GUI which comes with the hplip
 package then it is suggested that you install the @code{hplip} package,
@@ -14886,12 +14886,12 @@ For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in
 strings of the same name, you could instantiate a CUPS service like
 this:
 
-@example
+@lisp
 (service cups-service-type
          (opaque-cups-configuration
            (cupsd.conf cupsd.conf)
            (cups-files.conf cups-files.conf)))
-@end example
+@end lisp
 
 
 @node Desktop Services
@@ -15034,7 +15034,7 @@ them by default.  To add GNOME, Xfce or MATE, just @code{cons} them onto
 @code{%desktop-services} in the @code{services} field of your
 @code{operating-system}:
 
-@example
+@lisp
 (use-modules (gnu))
 (use-service-modules desktop)
 (operating-system
@@ -15044,7 +15044,7 @@ them by default.  To add GNOME, Xfce or MATE, just @code{cons} them onto
                    (service xfce-desktop-service)
                    %desktop-services))
   ...)
-@end example
+@end lisp
 
 These desktop environments will then be available as options in the
 graphical login window.
@@ -15313,9 +15313,9 @@ Architecture} (ALSA) system, which generates the @file{/etc/asound.conf}
 configuration file.  The value for this type is a @command{alsa-configuration}
 record as in this example:
 
-@example
+@lisp
 (service alsa-service-type)
-@end example
+@end lisp
 
 See below for details about @code{alsa-configuration}.
 @end deffn
@@ -15401,7 +15401,7 @@ to create a geographic database using the @code{postgis} extension, a user can
 configure the postgresql-service as in this example:
 
 @cindex postgis
-@example
+@lisp
 (use-package-modules databases geo)
 
 (operating-system
@@ -15413,7 +15413,7 @@ configure the postgresql-service as in this example:
     (cons*
       (postgresql-service #:extension-packages (list postgis))
       %base-services)))
-@end example
+@end lisp
 
 Then the extension becomes visible and you can initialise an empty geographic
 database in this way:
@@ -15461,9 +15461,9 @@ Memcached} service, which provides a distributed in memory cache.  The
 value for the service type is a @code{memcached-configuration} object.
 @end defvr
 
-@example
+@lisp
 (service memcached-service-type)
-@end example
+@end lisp
 
 @deftp {Data Type} memcached-configuration
 Data type representing the configuration of memcached.
@@ -15492,9 +15492,9 @@ This is the service type for @uref{https://www.mongodb.com/, MongoDB}.
 The value for the service type is a @code{mongodb-configuration} object.
 @end defvr
 
-@example
+@lisp
 (service mongodb-service-type)
-@end example
+@end lisp
 
 @deftp {Data Type} mongodb-configuration
 Data type representing the configuration of mongodb.
@@ -15565,11 +15565,11 @@ administrator to specify these parameters via a uniform Scheme interface.
 For example, to specify that mail is located at @code{maildir~/.mail},
 one would instantiate the Dovecot service like this:
 
-@example
+@lisp
 (dovecot-service #:config
                  (dovecot-configuration
                   (mail-location "maildir:~/.mail")))
-@end example
+@end lisp
 
 The available configuration parameters follow.  Each parameter
 definition is preceded by its type; for example, @samp{string-list foo}
@@ -16905,11 +16905,11 @@ The contents of the @code{dovecot.conf}, as a string.
 For example, if your @code{dovecot.conf} is just the empty string, you
 could instantiate a dovecot service like this:
 
-@example
+@lisp
 (dovecot-service #:config
                  (opaque-dovecot-configuration
                   (string "")))
-@end example
+@end lisp
 
 @subsubheading OpenSMTPD Service
 
@@ -16918,11 +16918,11 @@ This is the type of the @uref{https://www.opensmtpd.org, OpenSMTPD}
 service, whose value should be an @code{opensmtpd-configuration} object
 as in this example:
 
-@example
+@lisp
 (service opensmtpd-service-type
          (opensmtpd-configuration
            (config-file (local-file "./my-smtpd.conf"))))
-@end example
+@end lisp
 @end deffn
 
 @deftp {Data Type} opensmtpd-configuration
@@ -16952,11 +16952,11 @@ This is the type of the @uref{https://exim.org, Exim} mail transfer
 agent (MTA), whose value should be an @code{exim-configuration} object
 as in this example:
 
-@example
+@lisp
 (service exim-service-type
          (exim-configuration
            (config-file (local-file "./my-exim.conf"))))
-@end example
+@end lisp
 @end deffn
 
 In order to use an @code{exim-service-type} service you must also have a
@@ -17280,11 +17280,11 @@ Defaults to @samp{()}.
 This is the type of the service which provides @code{/etc/aliases},
 specifying how to deliver mail to users on this system.
 
-@example
+@lisp
 (service mail-aliases-service-type
          '(("postmaster" "bob")
            ("bob" "bob@@example.com" "bob@@example2.com")))
-@end example
+@end lisp
 @end deffn
 
 The configuration for a @code{mail-aliases-service-type} service is an
@@ -17307,11 +17307,11 @@ This is the type of the GNU Mailutils IMAP4 Daemon (@pxref{imap4d,,,
 mailutils, GNU Mailutils Manual}), whose value should be an
 @code{imap4d-configuration} object as in this example:
 
-@example
+@lisp
 (service imap4d-service-type
          (imap4d-configuration
            (config-file (local-file "imap4d.conf"))))
-@end example
+@end lisp
 @end deffn
 
 @deftp {Data Type} imap4d-configuration
@@ -17345,7 +17345,7 @@ This is the type for the @uref{https://prosody.im, Prosody XMPP
 communication server}.  Its value must be a @code{prosody-configuration}
 record as in this example:
 
-@example
+@lisp
 (service prosody-service-type
          (prosody-configuration
           (modules-enabled (cons "groups" "mam" %default-modules-enabled))
@@ -17359,7 +17359,7 @@ record as in this example:
            (list
             (virtualhost-configuration
              (domain "example.net"))))))
-@end example
+@end lisp
 
 See below for details about @code{prosody-configuration}.
 
@@ -17747,11 +17747,11 @@ The contents of the @code{prosody.cfg.lua} to use.
 For example, if your @code{prosody.cfg.lua} is just the empty
 string, you could instantiate a prosody service like this:
 
-@example
+@lisp
 (service prosody-service-type
          (opaque-prosody-configuration
           (prosody.cfg.lua "")))
-@end example
+@end lisp
 
 @c end of Prosody auto-generated documentation
 
@@ -17770,9 +17770,9 @@ below).
 To have BitlBee listen on port 6667 on localhost, add this line to your
 services:
 
-@example
+@lisp
 (service bitlbee-service-type)
-@end example
+@end lisp
 @end defvr
 
 @deftp {Data Type} bitlbee-configuration
@@ -17844,7 +17844,7 @@ the server of the @uref{https://mumble.info, Mumble} voice-over-IP
 The service type for the Murmur server.  An example configuration can
 look like this:
 
-@example
+@lisp
 (service murmur-service-type
          (murmur-configuration
           (welcome-text
@@ -17852,7 +17852,7 @@ look like this:
           (cert-required? #t) ;disallow text password logins
           (ssl-cert "/etc/letsencrypt/live/mumble.example.com/fullchain.pem")
           (ssl-key "/etc/letsencrypt/live/mumble.example.com/privkey.pem")))
-@end example
+@end lisp
 
 After reconfiguring your system, you can manually set the murmur @code{SuperUser}
 password with the command that is printed during the activation phase.
@@ -17966,14 +17966,14 @@ Should logged ips be obfuscated to protect the privacy of users.
 @item @code{ssl-cert} (default: @code{#f})
 File name of the SSL/TLS certificate used for encrypted connections.
 
-@example
+@lisp
 (ssl-cert "/etc/letsencrypt/live/example.com/fullchain.pem")
-@end example
+@end lisp
 @item @code{ssl-key} (default: @code{#f})
 Filepath to the ssl private key used for encrypted connections.
-@example
+@lisp
 (ssl-key "/etc/letsencrypt/live/example.com/privkey.pem")
-@end example
+@end lisp
 
 @item @code{ssl-dh-params} (default: @code{#f})
 File name of a PEM-encoded file with Diffie-Hellman parameters
@@ -18047,20 +18047,20 @@ viewing and searching log files.
 The following example will configure the service with default values.
 By default, Tailon can be accessed on port 8080 (@code{http://localhost:8080}).
 
-@example
+@lisp
 (service tailon-service-type)
-@end example
+@end lisp
 
 The following example customises more of the Tailon configuration,
 adding @command{sed} to the list of allowed commands.
 
-@example
+@lisp
 (service tailon-service-type
          (tailon-configuration
            (config-file
              (tailon-configuration-file
                (allowed-commands '("tail" "grep" "awk" "sed"))))))
-@end example
+@end lisp
 
 
 @deftp {Data Type} tailon-configuration
@@ -18076,11 +18076,11 @@ The configuration file to use for Tailon. This can be set to a
 For example, to instead use a local file, the @code{local-file} function
 can be used:
 
-@example
+@lisp
 (service tailon-service-type
          (tailon-configuration
            (config-file (local-file "./my-tailon.conf"))))
-@end example
+@end lisp
 
 @item @code{package} (default: @code{tailon})
 The tailon package to use.
@@ -18136,12 +18136,12 @@ restricted to the credentials provided here. To configure users, use a
 list of pairs, where the first element of the pair is the username, and
 the 2nd element of the pair is the password.
 
-@example
+@lisp
 (tailon-configuration-file
   (http-auth "basic")
   (users     '(("user1" . "password1")
                ("user2" . "password2"))))
-@end example
+@end lisp
 
 @end table
 @end deftp
@@ -18158,11 +18158,11 @@ This is the service type for the
 service,  its value must be a @code{darkstat-configuration} record as in
 this example:
 
-@example
+@lisp
 (service darkstat-service-type
          (darkstat-configuration
            (interface "eno1")))
-@end example
+@end lisp
 @end defvar
 
 @deftp {Data Type} darkstat-configuration
@@ -18202,11 +18202,11 @@ This is the service type for the
 service, its value must be a @code{prometheus-node-exporter-configuration}
 record as in this example:
 
-@example
+@lisp
 (service prometheus-node-exporter-service-type
          (prometheus-node-exporter-configuration
            (web-listen-address ":9100")))
-@end example
+@end lisp
 @end defvar
 
 @deftp {Data Type} prometheus-node-exporter-configuration
@@ -18682,7 +18682,7 @@ Here is a simple operating system declaration with a default configuration of
 the @code{nslcd-service-type} and a Name Service Switch configuration that
 consults the @code{ldap} name service last:
 
-@example
+@lisp
 (use-service-modules authentication)
 (use-modules (gnu system nss))
 ...
@@ -18704,7 +18704,7 @@ consults the @code{ldap} name service last:
       (group    services)
       (netgroup services)
       (gshadow  services)))))
-@end example
+@end lisp
 
 @c %start of generated documentation for nslcd-configuration
 
@@ -19163,19 +19163,19 @@ Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server
 
 A simple example configuration is given below.
 
-@example
+@lisp
 (service httpd-service-type
          (httpd-configuration
            (config
              (httpd-config-file
                (server-name "www.example.com")
                (document-root "/srv/http/www.example.com")))))
-@end example
+@end lisp
 
 Other services can also extend the @code{httpd-service-type} to add to
 the configuration.
 
-@example
+@lisp
 (simple-service 'my-extra-server httpd-service-type
                 (list
                   (httpd-virtualhost
@@ -19183,7 +19183,7 @@ the configuration.
                     (list (string-append
                            "ServerName "www.example.com
                             DocumentRoot \"/srv/http/www.example.com\"")))))
-@end example
+@end lisp
 @end deffn
 
 The details for the @code{httpd-configuration}, @code{httpd-module},
@@ -19240,7 +19240,7 @@ additional configuration.
 For example, in order to handle requests for PHP files, you can use Apache’s
 @code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:
 
-@example
+@lisp
 (service httpd-service-type
          (httpd-configuration
           (config
@@ -19261,7 +19261,7 @@ For example, in order to handle requests for PHP files, you can use Apache’s
          (php-fpm-configuration
           (socket "/var/run/php-fpm.sock")
           (socket-group "httpd")))
-@end example
+@end lisp
 
 @item @code{server-root} (default: @code{httpd})
 The @code{ServerRoot} in the configuration file, defaults to the httpd
@@ -19315,7 +19315,7 @@ This data type represents a virtualhost configuration block for the httpd servic
 
 These should be added to the extra-config for the httpd-service.
 
-@example
+@lisp
 (simple-service 'my-extra-server httpd-service-type
                 (list
                   (httpd-virtualhost
@@ -19323,7 +19323,7 @@ These should be added to the extra-config for the httpd-service.
                     (list (string-append
                            "ServerName "www.example.com
                             DocumentRoot \"/srv/http/www.example.com\"")))))
-@end example
+@end lisp
 
 @table @asis
 @item @code{addresses-and-ports}
@@ -19344,25 +19344,25 @@ value for this service type is a @code{} record.
 
 A simple example configuration is given below.
 
-@example
+@lisp
 (service nginx-service-type
          (nginx-configuration
            (server-blocks
              (list (nginx-server-configuration
                      (server-name '("www.example.com"))
                      (root "/srv/http/www.example.com"))))))
-@end example
+@end lisp
 
 In addition to adding server blocks to the service configuration
 directly, this service can be extended by other services to add server
 blocks, as in this example:
 
-@example
+@lisp
 (simple-service 'my-extra-server nginx-service-type
                 (list (nginx-server-configuration
                         (root "/srv/http/extra-website")
                         (try-files (list "$uri" "$uri/index.html")))))
-@end example
+@end lisp
 @end deffn
 
 At startup, @command{nginx} has not yet read its configuration file, so
@@ -19398,14 +19398,14 @@ file, the elements should be of type
 The following example would setup NGinx to serve @code{www.example.com}
 from the @code{/srv/http/www.example.com} directory, without using
 HTTPS.
-@example
+@lisp
 (service nginx-service-type
          (nginx-configuration
            (server-blocks
              (list (nginx-server-configuration
                      (server-name '("www.example.com"))
                      (root "/srv/http/www.example.com"))))))
-@end example
+@end lisp
 
 @item @code{upstream-blocks} (default: @code{'()})
 A list of @dfn{upstream blocks} to create in the generated configuration
@@ -19419,7 +19419,7 @@ creates a server configuration with one location configuration, that
 will proxy requests to a upstream configuration, which will handle
 requests with two servers.
 
-@example
+@lisp
 (service
   nginx-service-type
   (nginx-configuration
@@ -19437,7 +19437,7 @@ requests with two servers.
               (name "server-proxy")
               (servers (list "server1.example.com"
                              "server2.example.com")))))))
-@end example
+@end lisp
 
 @item @code{file} (default: @code{#f})
 If a configuration @var{file} is provided, this will be used, rather than
@@ -19475,9 +19475,9 @@ path for a UNIX-domain socket on which the server will accept requests.
 Both address and port, or only address or only port can be specified.
 An address may also be a hostname, for example:
 
-@example
+@lisp
 '("127.0.0.1:8000" "127.0.0.1" "8000" "*:8000" "localhost:8000")
-@end example
+@end lisp
 
 @item @code{server-name} (default: @code{(list 'default)})
 A list of server names this server represents. @code{'default} represents the
@@ -19615,7 +19615,7 @@ VCL syntax.
 For example, to mirror @url{http://www.gnu.org,www.gnu.org} with VCL you
 can do something along these lines:
 
-@example
+@lisp
 (define %gnu-mirror
   (plain-file
    "gnu.vcl"
@@ -19629,7 +19629,7 @@ backend gnu @{ .host = "www.gnu.org"; @}"))
                             (listen '(":80"))
                             (vcl %gnu-mirror)))
                   %base-services)))
-@end example
+@end lisp
 
 The configuration of an already running Varnish instance can be inspected
 and changed using the @command{varnishadm} program.
@@ -19665,7 +19665,7 @@ Service type for Patchwork.
 The following example is an example of a minimal service for Patchwork, for
 the @code{patchwork.example.com} domain.
 
-@example
+@lisp
 (service patchwork-service-type
          (patchwork-configuration
           (domain "patchwork.example.com")
@@ -19685,7 +19685,7 @@ the @code{patchwork.example.com} domain.
             (extra-parameters
             '((mailboxes . ("Patches"))))))))
 
-@end example
+@end lisp
 
 There are three records for configuring the Patchwork service.  The
 @code{} relates to the configuration for Patchwork
@@ -20004,7 +20004,7 @@ A helper function to quickly add php to an @code{nginx-server-configuration}.
 @end deffn
 
 A simple services setup for nginx with php can look like this:
-@example
+@lisp
 (services (cons* (service dhcp-client-service-type)
                  (service php-fpm-service-type)
                  (service nginx-service-type
@@ -20017,7 +20017,7 @@ A simple services setup for nginx with php can look like this:
                            (ssl-certificate #f)
                            (ssl-certificate-key #f)))
                  %base-services))
-@end example
+@end lisp
 
 @cindex cat-avatar-generator
 The cat avatar generator is a simple service to demonstrate the use of php-fpm
@@ -20035,14 +20035,14 @@ be able to use @code{cache-dir} as its cache directory.
 @end deffn
 
 A simple setup for cat-avatar-generator can look like this:
-@example
+@lisp
 (services (cons* (cat-avatar-generator-service
                   #:configuration
                   (nginx-server-configuration
                     (server-name '("example.com"))))
                  ...
                  %base-services))
-@end example
+@end lisp
 
 @subsubheading Hpcguix-web
 
@@ -20099,7 +20099,7 @@ The hpcguix-web package to use.
 
 A typical hpcguix-web service declaration looks like this:
 
-@example
+@lisp
 (service hpcguix-web-service-type
          (hpcguix-web-configuration
           (specs
@@ -20107,7 +20107,7 @@ A typical hpcguix-web service declaration looks like this:
                (hpcweb-configuration
                 (title-prefix "Guix-HPC - ")
                 (menu '(("/about" "ABOUT"))))))))
-@end example
+@end lisp
 
 @quotation Note
 The hpcguix-web service periodically updates the package list it publishes by
@@ -20167,7 +20167,7 @@ can be found there:
 A service type for the @code{certbot} Let's Encrypt client.  Its value
 must be a @code{certbot-configuration} record as in this example:
 
-@example
+@lisp
 (define %nginx-deploy-hook
   (program-file
    "nginx-deploy-hook"
@@ -20184,7 +20184,7 @@ must be a @code{certbot-configuration} record as in this example:
              (deploy-hook %nginx-deploy-hook))
             (certificate-configuration
              (domains '("bar.example.net")))))))
-@end example
+@end lisp
 
 See below for details about @code{certbot-configuration}.
 @end defvr
@@ -20766,12 +20766,12 @@ The list of knot-zone-configuration used by this configuration.
 This is the type of the dnsmasq service, whose value should be an
 @code{dnsmasq-configuration} object as in this example:
 
-@example
+@lisp
 (service dnsmasq-service-type
          (dnsmasq-configuration
            (no-resolv? #t)
            (servers '("192.168.1.1"))))
-@end example
+@end lisp
 @end deffn
 
 @deftp {Data Type} dnsmasq-configuration
@@ -20824,9 +20824,9 @@ care of automatically updating DNS entries for service providers such as
 The following example show instantiates the service with its default
 configuration:
 
-@example
+@lisp
 (service ddclient-service-type)
-@end example
+@end lisp
 
 Note that ddclient needs to access credentials that are stored in a
 @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see
@@ -21416,7 +21416,7 @@ and builds the packages from a manifest.  Some of the packages are defined in
 the @code{"custom-packages"} input, which is the equivalent of
 @code{GUIX_PACKAGE_PATH}.
 
-@example
+@lisp
 (define %cuirass-specs
   #~(list
      '((#:name . "my-manifest")
@@ -21447,7 +21447,7 @@ the @code{"custom-packages"} input, which is the equivalent of
 (service cuirass-service-type
          (cuirass-configuration
           (specifications %cuirass-specs)))
-@end example
+@end lisp
 
 While information related to build jobs is located directly in the
 specifications, global settings for the @command{cuirass} process are
@@ -21535,9 +21535,9 @@ source is detected.  More information can be found at
 The service type for the TLP tool.  Its value should be a valid
 TLP configuration (see below).  To use the default settings, simply
 write:
-@example
+@lisp
 (service tlp-service-type)
-@end example
+@end lisp
 @end deffn
 
 By default TLP does not need much configuration but most TLP parameters
@@ -22065,12 +22065,12 @@ of clients.
 The following example shows how one might run @code{mpd} as user
 @code{"bob"} on port @code{6666}.  It uses pulseaudio for output.
 
-@example
+@lisp
 (service mpd-service-type
          (mpd-configuration
           (user "bob")
           (port "6666")))
-@end example
+@end lisp
 
 @defvr {Scheme Variable} mpd-service-type
 The service type for @command{mpd}
@@ -22124,12 +22124,12 @@ and performs required management tasks for virtualized guests.
 This is the type of the @uref{https://libvirt.org, libvirt daemon}.
 Its value must be a @code{libvirt-configuration}.
 
-@example
+@lisp
 (service libvirt-service-type
          (libvirt-configuration
           (unix-sock-group "libvirt")
           (tls-port "16555")))
-@end example
+@end lisp
 @end deffn
 
 @c Auto-generated with (generate-libvirt-documentation)
@@ -22690,11 +22690,11 @@ itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime.
 This is the type of the virtlog daemon.
 Its value must be a @code{virtlog-configuration}.
 
-@example
+@lisp
 (service virtlog-service-type
          (virtlog-configuration
           (max-clients 1000)))
-@end example
+@end lisp
 @end deffn
 
 @deftypevr {@code{virtlog-configuration} parameter} integer log-level
@@ -22832,11 +22832,11 @@ Its value must be a @code{qemu-binfmt-configuration} object, which
 specifies the QEMU package to use as well as the architecture we want to
 emulated:
 
-@example
+@lisp
 (service qemu-binfmt-service-type
          (qemu-binfmt-configuration
            (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el"))))
-@end example
+@end lisp
 
 In this example, we enable transparent emulation for the ARM and aarch64
 platforms.  Running @code{herd stop qemu-binfmt} turns it off, and
@@ -22862,12 +22862,12 @@ that you can transparently build programs for another architecture.
 For example, let's suppose you're on an x86_64 machine and you have this
 service:
 
-@example
+@lisp
 (service qemu-binfmt-service-type
          (qemu-binfmt-configuration
            (platforms (lookup-qemu-platforms "arm"))
            (guix-support? #t)))
-@end example
+@end lisp
 
 You can run:
 
@@ -23018,7 +23018,7 @@ Compute an @code{nginx-location-configuration} that corresponds to the
 given Git http configuration.  An example nginx service definition to
 serve the default @file{/srv/git} over HTTPS might be:
 
-@example
+@lisp
 (service nginx-service-type
          (nginx-configuration
           (server-blocks
@@ -23034,7 +23034,7 @@ serve the default @file{/srv/git} over HTTPS might be:
               (list
                (git-http-nginx-location-configuration
                 (git-http-configuration (uri-path "/"))))))))))
-@end example
+@end lisp
 
 This example assumes that you are using Let's Encrypt to get your TLS
 certificate.  @xref{Certificate Services}.  The default @code{certbot}
@@ -23053,9 +23053,9 @@ repositories written in C.
 The following example will configure the service with default values.
 By default, Cgit can be accessed on port 80 (@code{http://localhost:80}).
 
-@example
+@lisp
 (service cgit-service-type)
-@end example
+@end lisp
 
 The @code{file-object} type designates either a file-like object
 (@pxref{G-Expressions, file-like objects}) or a string.
@@ -23988,11 +23988,11 @@ The contents of the @code{cgitrc}, as a string.
 For example, if your @code{cgitrc} is just the empty string, you
 could instantiate a cgit service like this:
 
-@example
+@lisp
 (service cgit-service-type
          (opaque-cgit-configuration
           (cgitrc "")))
-@end example
+@end lisp
 
 @subsubheading Gitolite Service
 
@@ -24007,13 +24007,13 @@ configuration of the permissions for the users on the repositories.
 The following example will configure Gitolite using the default @code{git}
 user, and the provided SSH public key.
 
-@example
+@lisp
 (service gitolite-service-type
          (gitolite-configuration
            (admin-pubkey (plain-file
                            "yourname.pub"
                            "ssh-rsa AAAA... guix@@example.com"))))
-@end example
+@end lisp
 
 Gitolite is configured through a special admin repository which you can clone,
 for example, if you setup Gitolite on @code{example.com}, you would run the
@@ -24056,9 +24056,9 @@ within the gitolite-admin repository.
 
 To specify the SSH key as a string, use the @code{plain-file} function.
 
-@example
+@lisp
 (plain-file "yourname.pub" "ssh-rsa AAAA... guix@@example.com")
-@end example
+@end lisp
 
 @end table
 @end deftp
@@ -24103,9 +24103,9 @@ Service type for the wesnothd service.  Its value must be a
 @code{wesnothd-configuration} object.  To run wesnothd in the default
 configuration, instantiate it as:
 
-@example
+@lisp
 (service wesnothd-service-type)
-@end example
+@end lisp
 @end defvar
 
 @deftp {Data Type} wesnothd-configuration
@@ -24133,9 +24133,9 @@ read and identify fingerprints via a fingerprint sensor.
 The service type for @command{fprintd}, which provides the fingerprint
 reading capability.
 
-@example
+@lisp
 (service fprintd-service-type)
-@end example
+@end lisp
 @end defvr
 
 @cindex sysctl
@@ -24149,11 +24149,11 @@ The service type for @command{sysctl}, which modifies kernel parameters
 under @file{/proc/sys/}.  To enable IPv4 forwarding, it can be
 instantiated as:
 
-@example
+@lisp
 (service sysctl-service-type
          (sysctl-configuration
            (settings '(("net.ipv4.ip_forward" . "1")))))
-@end example
+@end lisp
 @end defvr
 
 @deftp {Data Type} sysctl-configuration
@@ -24182,9 +24182,9 @@ Service type for the @command{pcscd} service.  Its value must be a
 @code{pcscd-configuration} object.  To run pcscd in the default
 configuration, instantiate it as:
 
-@example
+@lisp
 (service pcscd-service-type)
-@end example
+@end lisp
 @end defvr
 
 @deftp {Data Type} pcscd-configuration
@@ -24339,7 +24339,7 @@ Dictionary of English using the @code{gcide} package.
 
 The following is an example @code{dicod-service} configuration.
 
-@example
+@lisp
 (dicod-service #:config
   (dicod-configuration
    (handlers (list (dicod-handler
@@ -24353,7 +24353,7 @@ The following is an example @code{dicod-service} configuration.
                      (handler "wordnet")
                      (options '("database=wn")))
                     %dicod-database:gcide))))
-@end example
+@end lisp
 
 @cindex Docker
 @subsubheading Docker Service
@@ -24453,7 +24453,7 @@ This is the type of the service that runs build daemon of the
 @url{https://nixos.org/nix/, Nix} package manager.  Here is an example showing
 how to use it:
 
-@example
+@lisp
 (use-modules (gnu))
 (use-service-modules nix)
 (use-package-modules package-management)
@@ -24465,7 +24465,7 @@ how to use it:
 
   (services (append (list (service nix-service-type))
                     %base-services)))
-@end example
+@end lisp
 
 After @command{guix system reconfigure} configure Nix for your user:
 
@@ -24620,7 +24620,7 @@ As an example, the declaration below configures the NSS to use the
 back-end}, which supports host name lookups over multicast DNS (mDNS)
 for host names ending in @code{.local}:
 
-@example
+@lisp
 (name-service-switch
    (hosts (list %files    ;first, check /etc/hosts
 
@@ -24642,7 +24642,7 @@ for host names ending in @code{.local}:
                 ;; Finally, try with the "full" 'mdns'.
                 (name-service
                   (name "mdns")))))
-@end example
+@end lisp
 
 Do not worry: the @code{%mdns-host-lookup-nss} variable (see below)
 contains this configuration, so you will not have to type it if all you
@@ -24723,10 +24723,10 @@ An action specified using the @code{lookup-specification} macro
 (@pxref{Actions in the NSS configuration,,, libc, The GNU C Library
 Reference Manual}).  For example:
 
-@example
+@lisp
 (lookup-specification (unavailable => continue)
                       (success => return))
-@end example
+@end lisp
 @end table
 @end deftp
 
@@ -24750,11 +24750,11 @@ most use cases.  For example, assuming you need the @code{megaraid_sas}
 module in addition to the default modules to be able to access your root
 file system, you would write:
 
-@example
+@lisp
 (operating-system
   ;; @dots{}
   (initrd-modules (cons "megaraid_sas" %base-initrd-modules)))
-@end example
+@end lisp
 
 @defvr {Scheme Variable} %base-initrd-modules
 This is the list of kernel modules included in the initrd by default.
@@ -24772,14 +24772,14 @@ For example, if you want to add a bunch of kernel modules to be loaded
 at boot time, you can define the @code{initrd} field of the operating
 system declaration like this:
 
-@example
+@lisp
 (initrd (lambda (file-systems . rest)
           ;; Create a standard initrd but set up networking
           ;; with the parameters QEMU expects by default.
           (apply base-initrd file-systems
                  #:qemu-networking? #t
                  rest)))
-@end example
+@end lisp
 
 The @code{base-initrd} procedure also handles common use cases that
 involves using the system as a QEMU guest, or as a ``live'' system with
@@ -25031,13 +25031,13 @@ Should you want to list additional boot menu entries @i{via} the
 boot another distro (hard to imagine!), you can define a menu entry
 along these lines:
 
-@example
+@lisp
 (menu-entry
   (label "The Other Distro")
   (linux "/boot/old/vmlinux-2.6.32")
   (linux-arguments '("root=/dev/sda2"))
   (initrd "/boot/old/initrd"))
-@end example
+@end lisp
 
 Details below.
 
@@ -25052,9 +25052,9 @@ The label to show in the menu---e.g., @code{"GNU"}.
 @item @code{linux}
 The Linux kernel image to boot, for example:
 
-@example
+@lisp
 (file-append linux-libre "/bzImage")
-@end example
+@end lisp
 
 For GRUB, it is also possible to specify a device explicitly in the
 file path using GRUB's device naming convention (@pxref{Naming
@@ -25590,7 +25590,7 @@ guix deploy @var{file}
 Such an invocation will deploy the machines that the code within @var{file}
 evaluates to.  As an example, @var{file} might contain a definition like this:
 
-@example
+@lisp
 ;; This is a Guix deployment of a "bare bones" setup, with
 ;; no X11 display server, to a machine with an SSH daemon
 ;; listening on localhost:2222. A configuration such as this
@@ -25630,7 +25630,7 @@ evaluates to.  As an example, @var{file} might contain a definition like this:
                        (user "alice")
                        (identity "./id_rsa")
                        (port 2222)))))
-@end example
+@end lisp
 
 The file should evaluate to a list of @var{machine} objects.  This example,
 upon being deployed, will create a new generation on the remote system
@@ -25919,7 +25919,7 @@ A @dfn{service type} is a node in the DAG described above.  Let us start
 with a simple example, the service type for the Guix build daemon
 (@pxref{Invoking guix-daemon}):
 
-@example
+@lisp
 (define guix-service-type
   (service-type
    (name 'guix)
@@ -25928,7 +25928,7 @@ with a simple example, the service type for the Guix build daemon
           (service-extension account-service-type guix-accounts)
           (service-extension activation-service-type guix-activation)))
    (default-value (guix-configuration))))
-@end example
+@end lisp
 
 @noindent
 It defines three things:
@@ -25972,12 +25972,12 @@ booted.
 
 A service of this type is instantiated like this:
 
-@example
+@lisp
 (service guix-service-type
          (guix-configuration
            (build-accounts 5)
            (use-substitutes? #f)))
-@end example
+@end lisp
 
 The second argument to the @code{service} form is a value representing
 the parameters of this specific service instance.
@@ -25986,9 +25986,9 @@ information about the @code{guix-configuration} data type.  When the
 value is omitted, the default value specified by
 @code{guix-service-type} is used:
 
-@example
+@lisp
 (service guix-service-type)
-@end example
+@end lisp
 
 @code{guix-service-type} is quite simple because it extends other
 services but is not extensible itself.
@@ -25997,7 +25997,7 @@ services but is not extensible itself.
 
 The service type for an @emph{extensible} service looks like this:
 
-@example
+@lisp
 (define udev-service-type
   (service-type (name 'udev)
                 (extensions
@@ -26011,7 +26011,7 @@ The service type for an @emph{extensible} service looks like this:
                              (udev-configuration
                               (udev udev)   ;the udev package to use
                               (rules (append initial-rules rules)))))))))
-@end example
+@end lisp
 
 This is the service type for the
 @uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device
@@ -26068,17 +26068,17 @@ raised.
 
 For instance, this:
 
-@example
+@lisp
 (service openssh-service-type)
-@end example
+@end lisp
 
 @noindent
 is equivalent to this:
 
-@example
+@lisp
 (service openssh-service-type
          (openssh-configuration))
-@end example
+@end lisp
 
 In both cases the result is an instance of @code{openssh-service-type}
 with the default configuration.
@@ -26099,7 +26099,7 @@ parameters.
 
 Here is an example of how a service is created and manipulated:
 
-@example
+@lisp
 (define s
   (service nginx-service-type
            (nginx-configuration
@@ -26113,7 +26113,7 @@ Here is an example of how a service is created and manipulated:
 
 (eq? (service-kind s) nginx-service-type)
 @result{} #t
-@end example
+@end lisp
 
 The @code{modify-services} form provides a handy way to change the
 parameters of some of the services of a list such as
@@ -26215,10 +26215,10 @@ service is an instance.
 For example, this extends mcron (@pxref{Scheduled Job Execution}) with
 an additional job:
 
-@example
+@lisp
 (simple-service 'my-mcron-job mcron-service-type
                 #~(job '(next-hour (3)) "guix gc -F 2G"))
-@end example
+@end lisp
 @end deffn
 
 At the core of the service abstraction lies the @code{fold-services}
@@ -26253,9 +26253,9 @@ The type of the @file{/etc} service.  This service is used to create
 files under @file{/etc} and can be extended by
 passing it name/file tuples such as:
 
-@example
+@lisp
 (list `("issue" ,(plain-file "issue" "Welcome!\n")))
-@end example
+@end lisp
 
 In this example, the effect would be to add an @file{/etc/issue} file
 pointing to the given file.
@@ -26391,7 +26391,7 @@ shepherd, The GNU Shepherd Manual}).
 The following example defines an action called @code{say-hello} that kindly
 greets the user:
 
-@example
+@lisp
 (shepherd-action
   (name 'say-hello)
   (documentation "Say hi!")
@@ -26399,7 +26399,7 @@ greets the user:
                  (format #t "Hello, friend! arguments: ~s\n"
                          args)
                  #t)))
-@end example
+@end lisp
 
 Assuming this action is added to the @code{example} service, then you can do:
 
@@ -26606,13 +26606,13 @@ Bash, say @code{bash-fixed}, in the usual way (@pxref{Defining
 Packages}).  Then, the original package definition is augmented with a
 @code{replacement} field pointing to the package containing the bug fix:
 
-@example
+@lisp
 (define bash
   (package
     (name "bash")
     ;; @dots{}
     (replacement bash-fixed)))
-@end example
+@end lisp
 
 From there on, any package depending directly or indirectly on Bash---as
 reported by @command{guix gc --requisites} (@pxref{Invoking guix
-- 
cgit v1.2.3


From e877f4d012342cc5fa916652b3846e40fdcd0491 Mon Sep 17 00:00:00 2001
From: Julien Lepiller 
Date: Sat, 7 Sep 2019 20:09:25 +0200
Subject: gnu: nml: Fix for newer pillow version.

* gnu/packages/game-development.scm (nml)[arguments]: Add a phase to fix
for newer pillow.
---
 gnu/packages/game-development.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 7eac935a69..bb4c1d26bb 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -314,6 +314,16 @@ provide connectivity for client applications written in any language.")
         (base32
          "1pmvvm3sgnpngfa7884mqhq3fwdjh9sr0ca07ypnidcg0y341w53"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'fix-pillow
+           (lambda _
+             ;; pillow's version is not in PIL.Image.VERSION anymore
+             (substitute* "nml/version_info.py"
+               (("from PIL import Image") "import PIL")
+               (("Image.VERSION") "PIL.__version__"))
+             #t)))))
     (propagated-inputs
      `(("python-pillow" ,python-pillow)
        ("python-ply" ,python-ply)))
-- 
cgit v1.2.3


From 9d280ef2a8865c09f0708745a264520a3beb8496 Mon Sep 17 00:00:00 2001
From: Arun Isaac 
Date: Sat, 7 Sep 2019 23:58:44 +0530
Subject: gnu: poussetaches: Update to 0.0.2.

* gnu/packages/web.scm (poussetaches): Update to 0.0.2.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index bea9f3dcc7..ad6f0635dd 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6603,7 +6603,7 @@ Anonip can also be uses as a Python module in your own Python application.")
 (define-public poussetaches
   (package
     (name "poussetaches")
-    (version "0.0.1")
+    (version "0.0.2")
     (source
      (origin
        (method git-fetch)
@@ -6613,7 +6613,7 @@ Anonip can also be uses as a Python module in your own Python application.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "07106kfcz3a39jvrv3mlqqxlihsmdhgkrjnqznyjsij9absgvdv6"))))
+         "0kckcwvqklavd855np9aq5js6mg84isrlwchr504yigwma0sm7hm"))))
     (build-system go-build-system)
     (propagated-inputs
      `(("go-github-com-robfig-cron" ,go-github-com-robfig-cron)
-- 
cgit v1.2.3


From 1d03a9198db6f3656a34d62eb89e5f7d5a99e76a Mon Sep 17 00:00:00 2001
From: Julien Lepiller 
Date: Sat, 7 Sep 2019 22:23:32 +0200
Subject: tests: opam: Fix input type in import test.

* tests/opam.scm: Expect propagated-inputs instead of inputs.
---
 tests/opam.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/opam.scm b/tests/opam.scm
index e8c0d15198..d3626fd010 100644
--- a/tests/opam.scm
+++ b/tests/opam.scm
@@ -99,7 +99,7 @@ url {
                          ('base32
                           (? string? hash)))))
              ('build-system 'ocaml-build-system)
-             ('inputs
+             ('propagated-inputs
               ('quasiquote
                (("ocaml-zarith" ('unquote 'ocaml-zarith)))))
              ('native-inputs
-- 
cgit v1.2.3


From 7a5ed348c0073cb28dae01c10b25155e29188fdb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 7 Sep 2019 23:50:15 +0200
Subject: gnu: Add r-covr.

* gnu/packages/cran.scm (r-covr): New variable.
---
 gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5bf37e3900..44913e53f7 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15212,3 +15212,35 @@ single cell integration, described in Korsunsky et al
 @url{doi.org/10.1101/461954}.  The package includes a standalone Harmony
 function and interfaces to external frameworks.")
       (license license:gpl3))))
+
+(define-public r-covr
+  (package
+    (name "r-covr")
+    (version "3.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "covr" version))
+       (sha256
+        (base32
+         "0fvd7v53w11x6kaw61hbml8n1j2ck9l2fv2wvqdsg689xic9rqcs"))))
+    (properties `((upstream-name . "covr")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-crayon" ,r-crayon)
+       ("r-digest" ,r-digest)
+       ("r-httr" ,r-httr)
+       ("r-jsonlite" ,r-jsonlite)
+       ("r-rex" ,r-rex)
+       ("r-withr" ,r-withr)
+       ("r-yaml" ,r-yaml)))
+    (home-page "https://github.com/r-lib/covr")
+    (synopsis "Test coverage for R packages")
+    (description
+     "Thisp package enables you to track and report code coverage for your
+package and (optionally) upload the results to a coverage service.  Code
+coverage is a measure of the amount of code being exercised by a set of tests.
+It is an indirect measure of test quality and completeness.  This package is
+compatible with any testing methodology or framework and tracks coverage of
+both R code and compiled C/C++/FORTRAN code.")
+    (license license:gpl3)))
-- 
cgit v1.2.3


From 6983178b06f1efe61dc513d5b3fe1673c63ff47d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:01:25 +0200
Subject: gnu: Add r-systemfonts.

* gnu/packages/cran.scm (r-systemfonts): New variable.
---
 gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 44913e53f7..bdfc3fb2c9 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15244,3 +15244,32 @@ It is an indirect measure of test quality and completeness.  This package is
 compatible with any testing methodology or framework and tracks coverage of
 both R code and compiled C/C++/FORTRAN code.")
     (license license:gpl3)))
+
+(define-public r-systemfonts
+  (package
+    (name "r-systemfonts")
+    (version "0.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "systemfonts" version))
+       (sha256
+        (base32
+         "0m0ljid683xcam2f14x7k2zv1yx4npac38a3gfv11vhxfbnpgp0z"))))
+    (properties `((upstream-name . "systemfonts")))
+    (build-system r-build-system)
+    (inputs
+     `(("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/r-lib/systemfonts")
+    (synopsis "System native font finding")
+    (description
+     "This package provides system native access to the font catalogue.  As
+font handling varies between systems it is difficult to correctly locate
+installed fonts across different operating systems.  The 'systemfonts' package
+provides bindings to the native libraries for finding font files that can then
+be used further by e.g. graphic devices.")
+    (license license:expat)))
-- 
cgit v1.2.3


From 9390300915a642c08a494aa67bf970c9a6ad5ff3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:17:22 +0200
Subject: gnu: Add r-graphlayouts.

* gnu/packages/cran.scm (r-graphlayouts): New variable.
---
 gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bdfc3fb2c9..ac528468cb 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15273,3 +15273,30 @@ installed fonts across different operating systems.  The 'systemfonts' package
 provides bindings to the native libraries for finding font files that can then
 be used further by e.g. graphic devices.")
     (license license:expat)))
+
+(define-public r-graphlayouts
+  (package
+    (name "r-graphlayouts")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "graphlayouts" version))
+       (sha256
+        (base32
+         "03dizbhhdhnzbj2i5zvqgs617kwcv4h2pha4f16adic0fph1rxl3"))))
+    (properties `((upstream-name . "graphlayouts")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-igraph" ,r-igraph)
+       ("r-rcpp" ,r-rcpp)
+       ("r-rcpparmadillo" ,r-rcpparmadillo)))
+    (home-page "https://github.com/schochastics/graphlayouts")
+    (synopsis "Additional layout algorithms for network visualizations")
+    (description
+     "This package provides several layout algorithms to visualize networks
+which are not part of the igraph library.  Most are based on the concept of
+stress majorization by Gansner et al. (2004)
+.  Some more specific algorithms allow to
+emphasize hidden group structures in networks or focus on specific nodes.")
+    (license license:expat)))
-- 
cgit v1.2.3


From 9567bd8dd9d092ac4bfdf9abfc35263e39146e26 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:18:03 +0200
Subject: gnu: Add r-tidygraph.

* gnu/packages/cran.scm (r-tidygraph): New variable.
---
 gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index ac528468cb..19aa0522b1 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15300,3 +15300,36 @@ stress majorization by Gansner et al. (2004)
 .  Some more specific algorithms allow to
 emphasize hidden group structures in networks or focus on specific nodes.")
     (license license:expat)))
+
+(define-public r-tidygraph
+  (package
+    (name "r-tidygraph")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "tidygraph" version))
+       (sha256
+        (base32
+         "1zpsarm74afbc7p5dlyb0whc09670qdcddw1ckb25cfc9hfh0hjn"))))
+    (properties `((upstream-name . "tidygraph")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-dplyr" ,r-dplyr)
+       ("r-igraph" ,r-igraph)
+       ("r-magrittr" ,r-magrittr)
+       ("r-pillar" ,r-pillar)
+       ("r-r6" ,r-r6)
+       ("r-rcpp" ,r-rcpp)
+       ("r-rlang" ,r-rlang)
+       ("r-tibble" ,r-tibble)
+       ("r-tidyr" ,r-tidyr)))
+    (home-page "https://github.com/thomasp85/tidygraph")
+    (synopsis "Tidy API for graph manipulation")
+    (description
+     "This package provides a graph implementation that can be thought of as
+two tidy data frames describing node and edge data respectively.  It provides
+an approach to manipulate these two virtual data frames using the API defined
+in the @code{dplyr} package, and it also provides tidy interfaces to a lot of
+common graph algorithms.")
+    (license license:expat)))
-- 
cgit v1.2.3


From e5cf3722c68561f19cb91d605692d7a8a0e69b76 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:18:18 +0200
Subject: gnu: r-gdtools: Update to 0.2.0.

* gnu/packages/statistics.scm (r-gdtools): Update to 0.2.0.
[inputs]: Add freetype.
[propagated-inputs]: Add r-systemfonts; remove r-withr.
---
 gnu/packages/statistics.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 143df3e63e..a532c376c6 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -49,6 +49,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages emacs-xyz)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages gettext)
@@ -1199,23 +1200,24 @@ agnes cluster diagrams.")
 (define-public r-gdtools
   (package
     (name "r-gdtools")
-    (version "0.1.9")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gdtools" version))
        (sha256
         (base32
-         "0w4fihf52q5qxxk0lg36x6yvjjl8vw66y60ncdjs5fvnxqn5z2vb"))))
+         "1mvpkp8cj30fwd4bwlz96x3cff7yzfbfz7iswmf77zl0a6122inh"))))
     (build-system r-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
      `(("cairo" ,cairo)
+       ("freetype2" ,freetype)
        ("zlib" ,zlib)))
     (propagated-inputs
      `(("r-rcpp" ,r-rcpp)
-       ("r-withr" ,r-withr)))
+       ("r-systemfonts" ,r-systemfonts)))
     (home-page "https://cran.r-project.org/web/packages/gdtools")
     (synopsis "Utilities for graphical rendering")
     (description
-- 
cgit v1.2.3


From 2b705168e99a21c777353d028150cc4e03abceb1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:19:15 +0200
Subject: gnu: r-devtools: Update to 2.2.0.

* gnu/packages/statistics.scm (r-devtools): Update to 2.2.0.
[propagated-inputs]: Add r-covr, r-crayon, r-desc, r-dt, r-ellipsis, r-glue,
and r-rversions.
---
 gnu/packages/statistics.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a532c376c6..03640a2cfd 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2438,18 +2438,24 @@ informative error messages when it's not available.")
 (define-public r-devtools
   (package
     (name "r-devtools")
-    (version "2.1.0")
+    (version "2.2.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "devtools" version))
               (sha256
                (base32
-                "0393v7nr22gr5g9afgrhq4ab3lwbqy6fd3shnmlhdpqam5357xy1"))))
+                "05fag25mkqy13yja8x32aqr9c0ah9rbm8cfjcsmy1dv5h4j8cxa1"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-callr" ,r-callr)
        ("r-cli" ,r-cli)
+       ("r-covr" ,r-covr)
+       ("r-crayon" ,r-crayon)
+       ("r-desc" ,r-desc)
        ("r-digest" ,r-digest)
+       ("r-dt" ,r-dt)
+       ("r-ellipsis" ,r-ellipsis)
+       ("r-glue" ,r-glue)
        ("r-git2r" ,r-git2r)
        ("r-httr" ,r-httr)
        ("r-jsonlite" ,r-jsonlite)
@@ -2460,6 +2466,7 @@ informative error messages when it's not available.")
        ("r-roxygen2" ,r-roxygen2)
        ("r-remotes" ,r-remotes)
        ("r-rstudioapi" ,r-rstudioapi)
+       ("r-rversions" ,r-rversions)
        ("r-sessioninfo" ,r-sessioninfo)
        ("r-testthat" ,r-testthat)
        ("r-usethis" ,r-usethis)
-- 
cgit v1.2.3


From de162a1509af8d79af136e646f1ae65c1df8bfaa Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:19:46 +0200
Subject: gnu: r-rcpparmadillo: Update to 0.9.700.2.0.

* gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.700.2.0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 03640a2cfd..43f8778e70 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2607,13 +2607,13 @@ well as additional utilities such as panel and axis annotation functions.")
 (define-public r-rcpparmadillo
   (package
     (name "r-rcpparmadillo")
-    (version "0.9.600.4.0")
+    (version "0.9.700.2.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "RcppArmadillo" version))
               (sha256
                (base32
-                "07jg2667xyhmp1fbcdi5nnhmkk81da76s9rlswfq4k2sjsmbfmr0"))))
+                "0g25w32dnqrvhnri8x4yxqawxd8qhn7w3m8d29nxxy0gybx3y8x9"))))
     (properties `((upstream-name . "RcppArmadillo")))
     (build-system r-build-system)
     ;; All needed for vignettes
-- 
cgit v1.2.3


From 5e7c6e54c812f7913737785f747c06ebf24b1c08 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:19:55 +0200
Subject: gnu: r-matrixstats: Update to 0.55.0.

* gnu/packages/statistics.scm (r-matrixstats): Update to 0.55.0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 43f8778e70..61d1babd91 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -3654,13 +3654,13 @@ t-probabilities, quantiles, random deviates and densities.")
 (define-public r-matrixstats
   (package
     (name "r-matrixstats")
-    (version "0.54.0")
+    (version "0.55.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "matrixStats" version))
               (sha256
                (base32
-                "0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg"))))
+                "06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn"))))
     (properties `((upstream-name . "matrixStats")))
     (build-system r-build-system)
     (native-inputs
-- 
cgit v1.2.3


From 02efab6917ebb0f3e08b18a101526f2a0f1fd0b8 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:05 +0200
Subject: gnu: r-feather: Update to 0.3.4.

* gnu/packages/cran.scm (r-feather): Update to 0.3.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 19aa0522b1..57765b7d85 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1059,14 +1059,14 @@ work well on small screens.")
 (define-public r-feather
   (package
     (name "r-feather")
-    (version "0.3.3")
+    (version "0.3.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "feather" version))
        (sha256
         (base32
-         "0ls8lmygyjq60467s88h66d7fczjp1d3a2106rfq4dx9lyfvdfsa"))))
+         "1zwr2lxbzks2k1jjbnnv965j8sbwxnszl1vyrnl60ar24nykd2f3"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-hms" ,r-hms)
-- 
cgit v1.2.3


From 9960ad55be0b874dc5d9fea2f8527aad47f5aab9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:09 +0200
Subject: gnu: r-geometry: Update to 0.4.4.

* gnu/packages/cran.scm (r-geometry): Update to 0.4.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 57765b7d85..0b70df1434 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2663,14 +2663,14 @@ Optimization problems by using the simplex algorithm.")
 (define-public r-geometry
   (package
     (name "r-geometry")
-    (version "0.4.3")
+    (version "0.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "geometry" version))
        (sha256
         (base32
-         "0z4491mhfmrlbb8lazjvq55alrprx7k0abg2d39fj0lsj84cls1r"))))
+         "1mx5n5mw63nij4n6crs9165mlls4fnh1ipw5ch467rjsidgl0mg8"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-magic" ,r-magic)
-- 
cgit v1.2.3


From f11920c759447679221ef483f7a06ebb9bdd6292 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:15 +0200
Subject: gnu: r-ggpubr: Update to 0.2.3.

* gnu/packages/cran.scm (r-ggpubr): Update to 0.2.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0b70df1434..bcc277e76c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5569,14 +5569,14 @@ and adds the annotation to the plot.")
 (define-public r-ggpubr
   (package
     (name "r-ggpubr")
-    (version "0.2.2")
+    (version "0.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggpubr" version))
        (sha256
         (base32
-         "0r5knv3707pmpngmj60zn761y3bh8lj89dhh1b80ss083xnxr4qw"))))
+         "0i81mmz4qn9yzcgfa6dhkcrx4ddlflkm2c3b40isc8all43rm8rn"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-cowplot" ,r-cowplot)
-- 
cgit v1.2.3


From c90eebf791b063760a922f1f4de64867681b2a3a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:20 +0200
Subject: gnu: r-insight: Update to 0.5.0.

* gnu/packages/cran.scm (r-insight): Update to 0.5.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bcc277e76c..a7be239761 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6091,14 +6091,14 @@ other add-on packages.")
 (define-public r-insight
   (package
     (name "r-insight")
-    (version "0.4.1")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "insight" version))
        (sha256
         (base32
-         "1lw1r3mb97z5p9z25jfzlhs0sbnwp6v8kzysf0am01x4m7l3iz82"))))
+         "0lrh2l9n2zd9n3zzknsxz6nlasnrayx3bplxlz7m616g56gr5nfp"))))
     (build-system r-build-system)
     (home-page "https://easystats.github.io/insight/")
     (synopsis "Easy access to model information for various model objects")
-- 
cgit v1.2.3


From 9a4706828cfd01dce148c146dc710db84e538266 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:25 +0200
Subject: gnu: r-ggformula: Update to 0.9.2.

* gnu/packages/cran.scm (r-ggformula): Update to 0.9.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a7be239761..dbc2ea6e60 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6873,13 +6873,13 @@ and coverage methods to tune the choice of threshold.")
 (define-public r-ggformula
   (package
     (name "r-ggformula")
-    (version "0.9.1")
+    (version "0.9.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggformula" version))
        (sha256
-        (base32 "01ngx8qh9lhmagng6abx2ky54zi3iyj5bpxlnw59slagwv7l6icx"))))
+        (base32 "16ycabhnp78fsiv1dc63ccgh9gmpsy2683vbmq0fdzl6w3pd87sr"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-ggplot2" ,r-ggplot2)
-- 
cgit v1.2.3


From f396d343b7779a20f2e7dc3696167c54d9869274 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:30 +0200
Subject: gnu: r-ggeffects: Update to 0.12.0.

* gnu/packages/cran.scm (r-ggeffects): Update to 0.12.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index dbc2ea6e60..be32bdefb9 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8162,14 +8162,14 @@ effects models and Bayesian models.")
 (define-public r-ggeffects
   (package
     (name "r-ggeffects")
-    (version "0.11.0")
+    (version "0.12.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggeffects" version))
        (sha256
         (base32
-         "1b0lxa8bljdh6h4lk7pql1lrhjlvh7p5c8qlgb8ac6ay8hb79vmi"))))
+         "0idfycjk05gyykfp9ibmhxfcjvd01ikh1dl0fb4nqw6znw3ar0xp"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-dplyr" ,r-dplyr)
-- 
cgit v1.2.3


From 995a20e89214049daab5026c430fe34ae4cccedb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:35 +0200
Subject: gnu: r-msigdbr: Update to 7.0.1.

* gnu/packages/cran.scm (r-msigdbr): Update to 7.0.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index be32bdefb9..224dbe8b10 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13607,14 +13607,14 @@ the XKCD web comic.")
 (define-public r-msigdbr
   (package
     (name "r-msigdbr")
-    (version "6.2.1")
+    (version "7.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "msigdbr" version))
        (sha256
         (base32
-         "1264j1hs74kq7hyh68vfynadfi6mdpq46qm1hnwzkzzhmbzpb9cg"))))
+         "19p8z617m3my8la7n1qgb1s2msf940r372im3q30qkbcx3qxg3sd"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-dplyr" ,r-dplyr)
-- 
cgit v1.2.3


From 801dc98f1f6a99d576525c22ee40305d0cbea30c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:20:46 +0200
Subject: gnu: r-ggraph: Update to 2.0.0.

* gnu/packages/cran.scm (r-ggraph): Update to 2.0.0.
[propagated-inputs]: Add r-graphlayouts, r-rlang, and r-tidygraph; remove
r-plyr.
---
 gnu/packages/cran.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 224dbe8b10..b09d46678a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13881,14 +13881,14 @@ databases, including ENA, PDB or ChEMBL are also accessible.")
 (define-public r-ggraph
   (package
     (name "r-ggraph")
-    (version "1.0.2")
+    (version "2.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggraph" version))
        (sha256
         (base32
-         "0fpmp326mryd1k1qvacjadksrnhbla8h960i18lmrimzrag7692c"))))
+         "0qj7w3af0pgmd9mil6y571jikfkln7b8csvzg6b08spwbglfy1s3"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-digest" ,r-digest)
@@ -13896,12 +13896,14 @@ databases, including ENA, PDB or ChEMBL are also accessible.")
        ("r-ggforce" ,r-ggforce)
        ("r-ggplot2" ,r-ggplot2)
        ("r-ggrepel" ,r-ggrepel)
+       ("r-graphlayouts" ,r-graphlayouts)
        ("r-gtable" ,r-gtable)
        ("r-igraph" ,r-igraph)
        ("r-mass" ,r-mass)
-       ("r-plyr" ,r-plyr)
        ("r-rcpp" ,r-rcpp)
+       ("r-rlang" ,r-rlang)
        ("r-scales" ,r-scales)
+       ("r-tidygraph" ,r-tidygraph)
        ("r-viridis" ,r-viridis)))
     (home-page "https://cran.r-project.org/web/packages/ggraph/")
     (synopsis "Implementation of grammar of graphics for graphs and networks")
-- 
cgit v1.2.3


From f70599cb785f1b0faf01380363987d4478b74f41 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:21:13 +0200
Subject: gnu: r-edger: Update to 3.26.8.

* gnu/packages/bioinformatics.scm (r-edger): Update to 3.26.8.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index cf2dc57fa7..68c26a2ff5 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7458,13 +7458,13 @@ names in their natural, rather than lexicographic, order.")
 (define-public r-edger
   (package
     (name "r-edger")
-    (version "3.26.7")
+    (version "3.26.8")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "edgeR" version))
               (sha256
                (base32
-                "1xbhb8aa1ygm5crkp1bmqs2x1601ppa2kgc2xlf2zh8jj8zqapg8"))))
+                "1wwimzviy2vklp80faz7sbbp74qcw2csbmlfgvzj7b785vwarpwg"))))
     (properties `((upstream-name . "edgeR")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 8e70b33c56075ae338d7fe5587d4841171fc3c8d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:21:21 +0200
Subject: gnu: r-annotationhub: Update to 2.16.1.

* gnu/packages/bioinformatics.scm (r-annotationhub): Update to 2.16.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 68c26a2ff5..bb0206f24f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9639,14 +9639,14 @@ Shiny-based display methods for Bioconductor objects.")
 (define-public r-annotationhub
   (package
     (name "r-annotationhub")
-    (version "2.16.0")
+    (version "2.16.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "AnnotationHub" version))
        (sha256
         (base32
-         "1rpzl4x5mrwxrrf1jzm4zni6li6x34fjfyybsdvplb0ixa48zhn4"))))
+         "0c773cmhng907839f0bq161jky7362lxxny36ac55qxiz1giqi8j"))))
     (properties `((upstream-name . "AnnotationHub")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From d40ebbf228326485dca926013223e7509c2a9435 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:21:26 +0200
Subject: gnu: r-gprofiler: Update to 0.6.8.

* gnu/packages/bioinformatics.scm (r-gprofiler): Update to 0.6.8.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index bb0206f24f..61d992aacc 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10034,14 +10034,14 @@ interval to data view, mismatch pileup, and several splicing summaries.")
 (define-public r-gprofiler
   (package
     (name "r-gprofiler")
-    (version "0.6.7")
+    (version "0.6.8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gProfileR" version))
        (sha256
         (base32
-         "12nwidbnqmnfy5dnqga26byslvdnkrpz2fi19qfcby6xx0wbndk7"))))
+         "05d6y6b7vkkzp2qhs1cwlvp02djij1b28dbwxnrms08f8qi35iaj"))))
     (properties `((upstream-name . "gProfileR")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From a39222d7e2dc64841c79d42d8c0da782e6b5b29a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:21:32 +0200
Subject: gnu: r-regioner: Update to 1.16.3.

* gnu/packages/bioconductor.scm (r-regioner): Update to 1.16.3.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 37cd51d16c..4f8ebbcfd6 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1013,14 +1013,14 @@ the Human Protein Atlas project.")
 (define-public r-regioner
   (package
     (name "r-regioner")
-    (version "1.16.2")
+    (version "1.16.3")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "regioneR" version))
        (sha256
         (base32
-         "1b8ybx4wcxlqw9nvajawsf0lqaqn9v89rxcawg4g3dbzlfssfc5q"))))
+         "0p0jkq5w6v9zlg0csp4ag55228ikbbc86w28yzd9s0gxgx1wvdv4"))))
     (properties `((upstream-name . "regioneR")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From f791b1eecc31bbeb77489a8d5b336daa8abe1927 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 00:21:40 +0200
Subject: gnu: r-rsubread: Update to 1.34.7.

* gnu/packages/bioconductor.scm (r-rsubread): Update to 1.34.7.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 4f8ebbcfd6..087ec9bf10 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -4888,14 +4888,14 @@ annotations.")
 (define-public r-rsubread
   (package
     (name "r-rsubread")
-    (version "1.34.6")
+    (version "1.34.7")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "Rsubread" version))
        (sha256
         (base32
-         "0nnfh4hnrs5kd72m8c50cidbsxjz12szw2vynpmg8q0wpd99q550"))))
+         "0z4ydk9296bp76ah5y6a7za5jyn4h238xngb789zragly902x83y"))))
     (properties `((upstream-name . "Rsubread")))
     (build-system r-build-system)
     (inputs `(("zlib" ,zlib)))
-- 
cgit v1.2.3


From 9f74bd317f00c55ab1fa30683c1668a19bf17eab Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sat, 7 Sep 2019 20:08:16 -0700
Subject: gnu: python-debian: Update to 0.1.36.

* gnu/packages/python-xyz (python-debian): Update to 0.1.36.
  [source]: Switch to using git-fetch.
  [arguments]: Add phase to delete tests depending on tools not yet present in
  guix.
  [propagated-inputs]: Add python-chardet.
---
 gnu/packages/python-xyz.scm | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2827ddf770..16f1331a84 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7490,17 +7490,31 @@ serve the same purpose: provide Python bindings for libmagic.")))
   (package
     (name "python-debian")
     (home-page "https://salsa.debian.org/python-debian-team/python-debian")
-    (version "0.1.28")
+    (version "0.1.36")
     (source
      (origin
-       (method url-fetch)
-       (uri (pypi-uri name version))
+       ;; Use git-fetch, as pypi doesn't include test suite.
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "0i15f0xzx679sd0ldq2sls9pnnps9fv6vhqvnv9dzf4qhma42i0y"))))
+         "0qy6x28bj6yfikhjww932v5xq4mf5bm1iczl7acy4c7zm6mwhqfa"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'remove-debian-specific-tests
+                    ;; python-apt, apt and dpkg are not yet available in guix,
+                    ;; and these tests heavily depend on them.
+                    (lambda _
+                      (delete-file "lib/debian/tests/test_deb822.py")
+                      (delete-file "lib/debian/tests/test_debfile.py")
+                      #t)))))
     (propagated-inputs
-     `(("python-six" ,python-six)))
+     `(("python-six" ,python-six)
+       ("python-chardet" ,python-chardet)))
     (synopsis "Debian package related modules")
     (description
      ;; XXX: Use @enumerate instead of @itemize to work around
-- 
cgit v1.2.3


From 3ec8c0ca942409da6ce06c38f6d8b6ccfc2a943a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sat, 7 Sep 2019 15:35:14 -0700
Subject: gnu: diffoscope: Update to 123.

* gnu/packages/package-management (diffoscope): Update to 123.
  [arguments]: Update phase writable-test-data to include tests directory.
    Add phase remove-ocaml-test.
---
 gnu/packages/package-management.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 100c148fda..1cc2d3f6a0 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -546,7 +546,7 @@ transactions from C or Python.")
     (license license:gpl2+)))
 
 (define-public diffoscope
-  (let ((version "122"))
+  (let ((version "123"))
     (package
       (name "diffoscope")
       (version version)
@@ -558,7 +558,7 @@ transactions from C or Python.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1pwddknk8qyv88ba63why8vbnlc14b47434lv4ijx49m7ya3zfvg"))))
+                  "11bxms5rkhi0v4pxx29v4qgvhp3fmf0fkzci6gn5xcv4fl1zy4wj"))))
       (build-system python-build-system)
       (arguments
        `(#:phases (modify-phases %standard-phases
@@ -575,6 +575,13 @@ transactions from C or Python.")
                       (lambda _
                         (delete-file "tests/comparators/test_berkeley_db.py")
                         #t))
+                    ;; Test is dynamically generated and may have false
+                    ;; negatives with different ocaml versions.  Further
+                    ;; background in: https://bugs.debian.org/939386
+                    (add-after 'unpack 'remove-ocaml-test
+                      (lambda _
+                        (delete-file "tests/comparators/test_ocaml.py")
+                        #t))
                     (add-after 'unpack 'embed-tool-references
                       (lambda* (#:key inputs #:allow-other-keys)
                         (substitute* "diffoscope/comparators/utils/compare.py"
@@ -594,10 +601,9 @@ transactions from C or Python.")
                         #t))
                     (add-before 'check 'writable-test-data
                       (lambda _
-                        ;; tests/comparators/test_elf.py needs write access to
-                        ;; test data
-                        (make-file-writable
-                         "tests/data/ignore_readelf_errors_expected_diff")
+                        ;; tests may need needs write access to tests
+                        ;; directory
+                        (for-each make-file-writable (find-files "tests"))
                         #t))
                     (add-before 'check 'delete-failing-test
                       (lambda _
-- 
cgit v1.2.3


From 3dd20da0cbdd8b273b5b76b6b8f95aed28c8d0e9 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Fri, 6 Sep 2019 10:52:50 -0700
Subject: gnu: diffoscope: Enable additional tests.

* gnu/packages/package-management (diffoscope) [native-inputs]: Add additional
  packages used for tests.
---
 gnu/packages/package-management.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 1cc2d3f6a0..560684e458 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -620,7 +620,25 @@ transactions from C or Python.")
                 ("xxd" ,xxd)))
       ;; Below are modules used for tests.
       (native-inputs `(("python-pytest" ,python-pytest)
-                       ("python-chardet" ,python-chardet)))
+                       ("python-chardet" ,python-chardet)
+                       ;; test suite skips tests when tool is missing
+                       ("bdb" ,bdb)
+                       ("binutils" ,binutils)
+                       ("bzip2" ,bzip2)
+                       ("colord" ,colord)
+                       ("cpio" ,cpio)
+                       ("e2fsprogs" ,e2fsprogs)
+                       ("gettext" ,gettext-minimal)
+                       ("gnumeric" ,gnumeric)
+                       ("gnupg" ,gnupg)
+                       ("libarchive" ,libarchive)
+                       ("lz4" ,lz4)
+                       ("openssh" ,openssh)
+                       ("rpm" ,rpm)
+                       ("sqlite" ,sqlite)
+                       ("squashfs-tools" ,squashfs-tools)
+                       ("xxd" ,xxd)
+                       ("xz" ,xz)))
       (home-page "https://diffoscope.org/")
       (synopsis "Compare files, archives, and directories in depth")
       (description
-- 
cgit v1.2.3


From 37ecf2d905e6afc555150ffe51095415a0d27b89 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sat, 7 Sep 2019 17:04:39 -0700
Subject: gnu: diffoscope: Enable even more tests.

* gnu/packages/package-management (diffoscope)[native-inputs]: Add additional
  dependencies for tests.
  [use-module]: Add corresponding package modules.
---
 gnu/packages/package-management.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 560684e458..579a2001d8 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -31,6 +31,7 @@
 (define-module (gnu packages package-management)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages attr)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages autotools)
@@ -39,6 +40,7 @@
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages bootstrap)          ;for 'bootstrap-guile-origin'
+  #:use-module (gnu packages cdrom)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpio)
@@ -48,6 +50,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages file)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
@@ -55,12 +58,20 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
+  #:use-module (gnu packages haskell)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages java)
+  #:use-module (gnu packages libreoffice)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp)
+  #:use-module (gnu packages llvm)
   #:use-module (gnu packages man)
+  #:use-module (gnu packages mono)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages patchutils)
+  #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
@@ -72,8 +83,10 @@
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages textutils)
   #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages video)
   #:use-module (gnu packages vim)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages web)
@@ -625,18 +638,31 @@ transactions from C or Python.")
                        ("bdb" ,bdb)
                        ("binutils" ,binutils)
                        ("bzip2" ,bzip2)
+                       ("cdrtools" ,cdrtools)
                        ("colord" ,colord)
                        ("cpio" ,cpio)
+                       ("docx2txt" ,docx2txt)
                        ("e2fsprogs" ,e2fsprogs)
+                       ("ffmpeg" ,ffmpeg)
                        ("gettext" ,gettext-minimal)
+                       ("ghc" ,ghc)
+                       ("ghostscript" ,ghostscript)
+                       ("giflib:bin" ,giflib "bin")
                        ("gnumeric" ,gnumeric)
                        ("gnupg" ,gnupg)
+                       ("imagemagick" ,imagemagick)
                        ("libarchive" ,libarchive)
+                       ("llvm" ,llvm)
                        ("lz4" ,lz4)
+                       ("mono" ,mono)
+                       ;; no unversioned openjdk available
+                       ("openjdk:jdk" ,openjdk12 "jdk")
                        ("openssh" ,openssh)
+                       ("poppler" ,poppler)
                        ("rpm" ,rpm)
                        ("sqlite" ,sqlite)
                        ("squashfs-tools" ,squashfs-tools)
+                       ("tcpdump" ,tcpdump)
                        ("xxd" ,xxd)
                        ("xz" ,xz)))
       (home-page "https://diffoscope.org/")
-- 
cgit v1.2.3


From 68fea604b06a6d1d461fa856a6379bb49500fb3b Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sat, 7 Sep 2019 16:15:08 -0700
Subject: gnu: Add pngsuite.

* gnu/packages/image (pngsuite): New variable.
---
 gnu/packages/image.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4e3fee53e2..433e59c207 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1462,6 +1462,40 @@ PNG, and performs PNG integrity checks and corrections.")
     (home-page "http://optipng.sourceforge.net/")
     (license license:zlib)))
 
+(define-public pngsuite
+  (package
+    (name "pngsuite")
+    (version "2017jul19")
+    (source
+     (origin
+       (method url-fetch/tarbomb)
+       (uri (string-append "http://www.schaik.com/pngsuite2011/PngSuite-"
+                           version ".tgz"))
+       (sha256
+        (base32
+         "1j7xgd9iffcnpphhzz9ld9ybrjmx9brhq0803g0450ssr52b5502"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f                      ; there is no test target
+       #:license-file-regexp "PngSuite.LICENSE"
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (copy-recursively "." (string-append out "/"))
+             #t)))
+         (delete 'build)
+         (delete 'configure))))
+    (home-page "http://www.schaik.com/pngsuite2011/pngsuite.html")
+    (synopsis "Example PNGs for use in test suites")
+    (description "Collection of graphics images created to test PNG
+applications like viewers, converters and editors.  As far as that is
+possible, all formats supported by the PNG standard are represented.")
+    (license (license:fsdg-compatible "file://PngSuite.LICENSE" "Permission to
+use, copy, modify and distribute these images for any purpose and without fee
+is hereby granted."))))
+
 (define-public libjpeg-turbo
   (package
     (name "libjpeg-turbo")
-- 
cgit v1.2.3


From d54ca1cd4d77a945ad07dba34a69c23a3e57b3f1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Fri, 6 Sep 2019 16:48:40 -0700
Subject: gnu: Add sng.

* gnu/packages/images (sng): New variable.
* gnu/packages/package-management (diffoscope)[native-inputs]: Add sng.
---
 gnu/packages/image.scm              | 39 +++++++++++++++++++++++++++++++++++++
 gnu/packages/package-management.scm |  1 +
 2 files changed, 40 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 433e59c207..2a9ee990be 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1836,3 +1836,42 @@ identical visual appearance.")
 to the standard output.  It works well together with grim.")
    ;; MIT license.
    (license license:expat)))
+
+(define-public sng
+  (package
+    (name "sng")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/sng/sng-"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "06a6ydvx9xb3vxvrzdrg3hq0rjwwj9ibr7fyyxjxq6qx1j3mb70i"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'link-pngsuite
+           ;; tests expect pngsuite in source dir
+           (lambda* (#:key inputs #:allow-other-keys)
+             (symlink (assoc-ref inputs "pngsuite") "pngsuite")
+             #t)))
+       #:configure-flags
+       (list (string-append "--with-rgbtxt="
+                            (assoc-ref %build-inputs "xorg-rgb")
+                            "/share/X11/rgb.txt"))))
+    (inputs `(("xorg-rgb" ,xorg-rgb)
+              ("libpng" ,libpng)))
+    (native-inputs `(("pngsuite" ,pngsuite)))
+    (home-page "http://sng.sourceforge.net")
+    (synopsis "Markup language for representing PNG contents")
+    (description "SNG (Scriptable Network Graphics) is a minilanguage designed
+specifically to represent the entire contents of a PNG (Portable Network
+Graphics) file in an editable form.  Thus, SNGs representing elaborate
+graphics images and ancillary chunk data can be readily generated or modified
+using only text tools.
+
+SNG is implemented by a compiler/decompiler called sng that
+losslessly translates between SNG and PNG.")
+    (license license:zlib)))
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 579a2001d8..b9eabfb55c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -660,6 +660,7 @@ transactions from C or Python.")
                        ("openssh" ,openssh)
                        ("poppler" ,poppler)
                        ("rpm" ,rpm)
+                       ("sng" ,sng)
                        ("sqlite" ,sqlite)
                        ("squashfs-tools" ,squashfs-tools)
                        ("tcpdump" ,tcpdump)
-- 
cgit v1.2.3


From bc5aa386675cb39aaf034d73af406c3ddffb4cb0 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Thu, 5 Sep 2019 16:12:08 -0700
Subject: gnu: Add odt2txt.

* gnu/packages/textutils (odt2txt): New variable.
* gnu/packages/package-management (diffoscope)[native-inputs]: Add odt2txt.
  [use-modules]: Remove accidentally added libreoffice package module.
---
 gnu/packages/package-management.scm |  2 +-
 gnu/packages/textutils.scm          | 38 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index b9eabfb55c..b712bd7ec9 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -62,7 +62,6 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages java)
-  #:use-module (gnu packages libreoffice)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages llvm)
@@ -655,6 +654,7 @@ transactions from C or Python.")
                        ("llvm" ,llvm)
                        ("lz4" ,lz4)
                        ("mono" ,mono)
+                       ("odt2txt" ,odt2txt)
                        ;; no unversioned openjdk available
                        ("openjdk:jdk" ,openjdk12 "jdk")
                        ("openssh" ,openssh)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 388f164428..2da31973f4 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -879,6 +879,44 @@ indentation.
     (home-page "http://docx2txt.sourceforge.net")
     (license license:gpl3+)))
 
+(define-public odt2txt
+  (package
+    (name "odt2txt")
+    (version "0.5")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/dstosberg/odt2txt/")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32
+          "0im3kzvhxkjlx57w6h13mc9584c74ma1dyymgvpq2y61av3gc35v"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no make check
+       #:make-flags (list "CC=gcc"
+                          (string-append "DESTDIR=" (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         ;; no configure script
+         (delete 'configure))))
+    (inputs
+     `(("zlib" ,zlib)))
+    (home-page "https://github.com/dstosberg/odt2txt/")
+    (synopsis "Converter from OpenDocument Text to plain text")
+    (description "odt2txt is a command-line tool which extracts the text out
+of OpenDocument Texts, as produced by OpenOffice.org, KOffice, StarOffice and
+others.
+
+odt2txt can also extract text from some file formats similar to OpenDocument
+Text, such as OpenOffice.org XML (*.sxw), which was used by OpenOffice.org
+version 1.x and older StarOffice versions.  To a lesser extent, odt2txt may be
+useful to extract content from OpenDocument spreadsheets (*.ods) and
+OpenDocument presentations (*.odp).")
+    (license license:gpl2)))
+
 (define-public opencc
   (package
     (name "opencc")
-- 
cgit v1.2.3


From e0819e5ca2d59d87ba6c16a6149e7b18faf60543 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 09:27:11 +0200
Subject: gnu: Add emacs-tao-theme.

* gnu/packages/emacs-xyz.scm (emacs-tao-theme): New variable.
---
 gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index afb55cb902..f3de24d825 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18171,3 +18171,32 @@ JIRA issue servers.")
        "This packages fontifies the ssh config keywords and creates
 keybindings for skipping from host section to host section.")
       (license license:gpl3+))))
+
+(define-public emacs-tao-theme
+  (let ((commit "c5107fbe7e752f4e58c2d2147ff18a1ebb12937c")
+        (revision "0"))
+    (package
+      (name "emacs-tao-theme")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/11111000000/tao-theme-emacs.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "07vvlglmkj87hpxz79s3bl2cjn71vain57fdxs7j9vlr5jkchxwn"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/11111000000/tao-theme-emacs")
+      (synopsis "Parameterized uncolored color themes for Emacs")
+      (description
+       "This package provides two parameterized uncolored color themes for
+Emacs: @code{tao-yin} and @code{tao-yang}.  The default
+@code{tao-theme-scale-fn} is @code{tao-theme-golden-scale}.
+
+You can customize: @code{tao-theme-scale-fn}, that returns 16 2-digit numbers;
+@code{tao-theme-scale-filter-fn}, for edge filter; and
+@code{tao-theme-use-height}.")
+      (license license:gpl3+))))
-- 
cgit v1.2.3


From 799d8d3ca616c0a85d8f0b6e7f5e12898db94714 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 11:17:53 +0300
Subject: gnu: haskell-xyz.scm: Correctly hide packages.

* gnu/packages/haskell-xyz.scm (ghc-attoparsec-bootstrap,
ghc-integer-logarithms-bootstrap, ghc-scientific-bootstrap,
ghc-semigroups-bootstrap, ghc-unordered-containers-bootstrap,
ghc-wcwidth-bootstrap)[properties]: Fix typo, make 'hidden?' a tuple.
---
 gnu/packages/haskell-xyz.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 940fbe8a6c..ee26c1a25a 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015, 2019 Eric Bavier 
 ;;; Copyright © 2016, 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2016, 2017 ng0 
-;;; Copyright © 2016 Efraim Flashner 
+;;; Copyright © 2016, 2019 Efraim Flashner 
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2016, 2017 David Craven 
 ;;; Copyright © 2017 Danny Milosavljevic 
@@ -463,7 +463,7 @@ complicated text/binary file formats.")
     (inputs
      `(("ghc-scientific" ,ghc-scientific-bootstrap)))
     (native-inputs '())
-    (properties '(hidden? #t))))
+    (properties '((hidden? #t)))))
 
 (define-public ghc-attoparsec-iso8601
   (package
@@ -5201,7 +5201,7 @@ in migrated modules.")
     (name "ghc-integer-logarithms-bootstrap")
     (arguments `(#:tests? #f))
     (native-inputs '())
-    (properties '(hidden? #t))))
+    (properties '((hidden? #t)))))
 
 (define-public ghc-interpolate
   (package
@@ -8667,7 +8667,7 @@ notation}.")
        ("ghc-hashable" ,ghc-hashable)
        ("ghc-primitive" ,ghc-primitive)))
     (native-inputs '())
-    (properties '(hidden? #t))))
+    (properties '((hidden? #t)))))
 
 (define-public ghc-sdl
   (package
@@ -8951,7 +8951,7 @@ semigroup.")
        ("ghc-tagged" ,ghc-tagged)
        ("ghc-unordered-containers" ,ghc-unordered-containers-bootstrap)
        ("ghc-hashable" ,ghc-hashable-bootstrap)))
-    (properties '(hidden? #t))))
+    (properties '((hidden? #t)))))
 
 (define-public ghc-setenv
   (package
@@ -10781,7 +10781,7 @@ and high speed.")
     (arguments `(#:tests? #f))
     (inputs
      `(("ghc-hashable" ,ghc-hashable-bootstrap)))
-    (properties '(hidden? #t))))
+    (properties '((hidden? #t)))))
 
 (define-public ghc-unsafe
   (package
@@ -11322,7 +11322,7 @@ widths to the Char type.")
      `(("ghc-setlocale" ,ghc-setlocale)
        ("ghc-utf8-string" ,ghc-utf8-string)
        ("ghc-attoparsec" ,ghc-attoparsec-bootstrap)))
-    (properties '(hidden? #t))))
+    (properties '((hidden? #t)))))
 
 (define-public ghc-weigh
   (package
-- 
cgit v1.2.3


From d7303a048da4d400c203be113235a9fbb9673103 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sun, 8 Sep 2019 10:46:14 +0200
Subject: bootstrap: mes-boot: Fix at 0.19.

This allows updating Mes without triggering a rebuild.

* gnu/packages/commencement.scm (mes-boot): Fix 0.19.
---
 gnu/packages/commencement.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 63f1dcf015..7f67fa6441 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -89,6 +89,14 @@
    (package
      (inherit mes)
      (name "mes-boot")
+     (version "0.19")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "mirror://gnu/mes/"
+                                   "mes-" version ".tar.gz"))
+               (sha256
+                (base32
+                 "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
      (inputs '())
      (propagated-inputs '())
      (native-inputs
-- 
cgit v1.2.3


From 7fcc2f93552bfb6ebb96cb9e1b47876a92fb0173 Mon Sep 17 00:00:00 2001
From: raingloom 
Date: Mon, 2 Sep 2019 15:44:15 +0200
Subject: gnu: Add fmit.

* gnu/packages/music.scm (fmit): New variable.

Signed-off-by: Nicolas Goaziou 
---
 gnu/packages/music.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index a43bccf4f8..bcae8e7733 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2019 Gabriel Hondet 
 ;;; Copyright © 2019 Timotej Lazar 
 ;;; Copyright © 2019 Jakob L. Kreuze 
+;;; Copyright © 2019 raingloom 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4529,3 +4530,65 @@ discard bad quality ones.
 controller.")
     (home-page "https://github.com/charlesfleche/lpd8editor")
     (license license:expat)))
+
+(define-public fmit
+  (package
+    (name "fmit")
+    (version "1.2.6")
+    (source (origin
+	      (method git-fetch)
+	      (uri (git-reference
+		    (url "https://github.com/gillesdegottex/fmit/")
+		    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+	      (sha256
+               (base32
+                "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+	 (delete 'configure)
+	 (add-before 'build 'qmake
+	   (lambda _
+	     (let ((out (assoc-ref %outputs "out")))
+               (invoke "qmake"
+                       "fmit.pro"
+                       (string-append "PREFIX=" out)
+                       (string-append "PREFIXSHORTCUT=" out)
+                       "CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))))
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/fmit")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtmultimedia" "qtsvg")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtmultimedia"))))
+               #t))))))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("fftw" ,fftw)
+       ("jack" ,jack-1)
+       ("portaudio" ,portaudio)
+       ("qtbase" ,qtbase)
+       ("qtmultimedia" ,qtmultimedia)
+       ("qtsvg" ,qtsvg)))
+    (native-inputs
+     `(("gettext" ,gnu-gettext)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("itstool" ,itstool)
+       ("qttools" ,qttools)))
+    (synopsis "Musical instrument tuner")
+    (description "FMIT is a graphical utility for tuning musical instruments,
+with error and volume history, and advanced features.")
+    (home-page "https://gillesdegottex.github.io/fmit/")
+    ;; Most of the code is under GPL2+, but some abstract or helper classes
+    ;; are under LGPL2.1.
+    (license (list license:gpl2+ license:lgpl2.1))))
-- 
cgit v1.2.3


From 2e3e5d21988fc2cafb2a9eaf4b00976ea425629d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 3 Sep 2019 21:36:29 +0200
Subject: daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'.

* nix/scripts/list-runtime-roots.in: Remove.
* guix/store/roots.scm (%proc-directory): New variable.
(proc-file-roots, proc-exe-roots, proc-cwd-roots)
(proc-fd-roots, proc-maps-roots, proc-environ-roots)
(referenced-files, canonicalize-store-item, busy-store-items): New
procedures, taken from 'list-runtime-roots.in'.
* nix/libstore/globals.hh (Settings)[guixProgram]: New field.
* nix/libstore/globals.cc (Settings::processEnvironment): Initialize
'guixProgram'.
* nix/libstore/gc.cc (addAdditionalRoots): Drop code related to
'NIX_ROOT_FINDER'.  Run "guix gc --list-busy".
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove
'scripts/list-runtime-roots'.
* config-daemon.ac: Don't output nix/scripts/list-runtime-roots.
* build-aux/pre-inst-env.in: Don't set 'NIX_ROOT_FINDER'.
Set 'GUIX'.
* doc/guix.texi (Invoking guix gc): Document '--list-busy'.
* guix/scripts/gc.scm (show-help, %options): Add "--list-busy".
(guix-gc)[list-busy]: New procedure.
Handle the 'list-busy' action.
---
 build-aux/pre-inst-env.in         |   6 +-
 config-daemon.ac                  |   3 -
 doc/guix.texi                     |   4 ++
 guix/scripts/gc.scm               |  15 ++++
 guix/store/roots.scm              | 129 ++++++++++++++++++++++++++++++++-
 nix/libstore/gc.cc                |  11 ++-
 nix/libstore/globals.cc           |   1 +
 nix/libstore/globals.hh           |   3 +
 nix/local.mk                      |   1 -
 nix/scripts/list-runtime-roots.in | 147 --------------------------------------
 10 files changed, 158 insertions(+), 162 deletions(-)
 delete mode 100644 nix/scripts/list-runtime-roots.in

diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
index 3efab69e7d..ab1c519d70 100644
--- a/build-aux/pre-inst-env.in
+++ b/build-aux/pre-inst-env.in
@@ -44,15 +44,17 @@ export PATH
 
 # Daemon helpers.
 
-NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots"
 NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'authenticate', etc.
 
-export NIX_ROOT_FINDER NIX_LIBEXEC_DIR
+export NIX_LIBEXEC_DIR
 
 NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload"
 @BUILD_DAEMON_OFFLOAD_TRUE@export NIX_BUILD_HOOK
 @BUILD_DAEMON_OFFLOAD_FALSE@# No offloading support.
 @BUILD_DAEMON_OFFLOAD_FALSE@unset NIX_BUILD_HOOK
+# The daemon invokes 'guix'; tell it which one to use.
+GUIX="$abs_top_builddir/scripts/guix"
+export GUIX
 
 # The following variables need only be defined when compiling Guix
 # modules, but we define them to be on the safe side in case of
diff --git a/config-daemon.ac b/config-daemon.ac
index f1ad10acff..f1d26af3a7 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -148,9 +148,6 @@ if test "x$guix_build_daemon" = "xyes"; then
   AC_SUBST([GUIX_TEST_ROOT])
 
   GUIX_CHECK_LOCALSTATEDIR
-
-  AC_CONFIG_FILES([nix/scripts/list-runtime-roots],
-    [chmod +x nix/scripts/list-runtime-roots])
   AC_CONFIG_FILES([nix/scripts/download],
     [chmod +x nix/scripts/download])
   AC_CONFIG_FILES([nix/scripts/substitute],
diff --git a/doc/guix.texi b/doc/guix.texi
index 83f791d71d..31f7890fe9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3496,6 +3496,10 @@ This prints nothing unless the daemon was started with
 List the GC roots owned by the user; when run as root, list @emph{all} the GC
 roots.
 
+@item --list-busy
+List store items in use by currently running processes.  These store
+items are effectively considered GC roots: they cannot be deleted.
+
 @item --clear-failures
 Remove the specified store items from the failed-build cache.
 
diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm
index 31657326b6..3f20a2e192 100644
--- a/guix/scripts/gc.scm
+++ b/guix/scripts/gc.scm
@@ -56,6 +56,8 @@ Invoke the garbage collector.\n"))
   -D, --delete           attempt to delete PATHS"))
   (display (G_ "
       --list-roots       list the user's garbage collector roots"))
+  (display (G_ "
+      --list-busy        list store items used by running processes"))
   (display (G_ "
       --optimize         optimize the store by deduplicating identical files"))
   (display (G_ "
@@ -174,6 +176,10 @@ is deprecated; use '-D'~%"))
                 (lambda (opt name arg result)
                   (alist-cons 'action 'list-roots
                               (alist-delete 'action result))))
+        (option '("list-busy") #f #f
+                (lambda (opt name arg result)
+                  (alist-cons 'action 'list-busy
+                              (alist-delete 'action result))))
         (option '("list-dead") #f #f
                 (lambda (opt name arg result)
                   (alist-cons 'action 'list-dead
@@ -265,6 +271,12 @@ is deprecated; use '-D'~%"))
                   (newline))
                 roots)))
 
+  (define (list-busy)
+    ;; List store items used by running processes.
+    (for-each (lambda (item)
+                (display item) (newline))
+              (busy-store-items)))
+
   (with-error-handling
     (let* ((opts  (parse-options))
            (store (open-connection))
@@ -305,6 +317,9 @@ is deprecated; use '-D'~%"))
         ((list-roots)
          (assert-no-extra-arguments)
          (list-roots))
+        ((list-busy)
+         (assert-no-extra-arguments)
+         (list-busy))
         ((delete)
          (delete-paths store (map direct-store-path paths)))
         ((list-references)
diff --git a/guix/store/roots.scm b/guix/store/roots.scm
index 4f23ae34e8..58653507f8 100644
--- a/guix/store/roots.scm
+++ b/guix/store/roots.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Ludovic Courtès 
+;;; Copyright © 2012, 2013, 2014, 2017, 2019 Ludovic Courtès 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,9 +26,13 @@
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
+  #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 ftw)
+  #:use-module (rnrs io ports)
   #:re-export (%gc-roots-directory)
   #:export (gc-roots
-            user-owned?))
+            user-owned?
+            busy-store-items))
 
 ;;; Commentary:
 ;;;
@@ -118,3 +122,124 @@ are user-controlled symlinks stored anywhere on the file system."
 
       (= (stat:uid stat) uid))
     (const #f)))
+
+
+;;;
+;;; Listing "busy" store items: those referenced by currently running
+;;; processes.
+;;;
+
+(define %proc-directory
+  ;; Mount point of Linuxish /proc file system.
+  "/proc")
+
+(define (proc-file-roots dir file)
+  "Return a one-element list containing the file pointed to by DIR/FILE,
+or the empty list."
+  (or (and=> (false-if-exception (readlink (string-append dir "/" file)))
+             list)
+      '()))
+
+(define proc-exe-roots (cut proc-file-roots <> "exe"))
+(define proc-cwd-roots (cut proc-file-roots <> "cwd"))
+
+(define (proc-fd-roots dir)
+  "Return the list of store files referenced by DIR, which is a
+/proc/XYZ directory."
+  (let ((dir (string-append dir "/fd")))
+    (filter-map (lambda (file)
+                  (let ((target (false-if-exception
+                                 (readlink (string-append dir "/" file)))))
+                    (and target
+                         (string-prefix? "/" target)
+                         target)))
+                (or (scandir dir string->number) '()))))
+
+(define (proc-maps-roots dir)
+  "Return the list of store files referenced by DIR, which is a
+/proc/XYZ directory."
+  (define %file-mapping-line
+    (make-regexp "^.*[[:blank:]]+/([^ ]+)$"))
+
+  (call-with-input-file (string-append dir "/maps")
+    (lambda (maps)
+      (let loop ((line  (read-line maps))
+                 (roots '()))
+        (cond ((eof-object? line)
+               roots)
+              ((regexp-exec %file-mapping-line line)
+               =>
+               (lambda (match)
+                 (let ((file (string-append "/"
+                                            (match:substring match 1))))
+                   (loop (read-line maps)
+                         (cons file roots)))))
+              (else
+               (loop (read-line maps) roots)))))))
+
+(define (proc-environ-roots dir)
+  "Return the list of store files referenced by DIR/environ, where DIR is a
+/proc/XYZ directory."
+  (define split-on-nul
+    (cute string-tokenize <>
+          (char-set-complement (char-set #\nul))))
+
+  (define (rhs-file-names str)
+    (let ((equal (string-index str #\=)))
+      (if equal
+          (let* ((str (substring str (+ 1 equal)))
+                 (rx  (string-append (regexp-quote %store-directory)
+                                     "/[0-9a-z]{32}-[a-zA-Z0-9\\._+-]+")))
+            (map match:substring (list-matches rx str)))
+          '())))
+
+  (define environ
+    (string-append dir "/environ"))
+
+  (append-map rhs-file-names
+              (split-on-nul
+               (call-with-input-file environ
+                 get-string-all))))
+
+(define (referenced-files)
+  "Return the list of referenced store items."
+  (append-map (lambda (pid)
+                (let ((proc (string-append %proc-directory "/" pid)))
+                  (catch 'system-error
+                    (lambda ()
+                      (append (proc-exe-roots proc)
+                              (proc-cwd-roots proc)
+                              (proc-fd-roots proc)
+                              (proc-maps-roots proc)
+                              (proc-environ-roots proc)))
+                    (lambda args
+                      (let ((err (system-error-errno args)))
+                        (if (or (= ENOENT err)    ;TOCTTOU race
+                                (= ESRCH err)     ;ditto
+                                (= EACCES err))   ;not running as root
+                            '()
+                            (apply throw args)))))))
+              (scandir %proc-directory string->number
+                       (lambda (a b)
+                         (< (string->number a) (string->number b))))))
+
+(define canonicalize-store-item
+  (let* ((store  (string-append %store-directory "/"))
+         (prefix (string-length store)))
+    (lambda (file)
+      "Return #f if FILE is not a store item; otherwise, return the store file
+name without any sub-directory components."
+      (and (string-prefix? store file)
+           (string-append store
+                          (let ((base (string-drop file prefix)))
+                            (match (string-index base #\/)
+                              (#f    base)
+                              (slash (string-take base slash)))))))))
+
+(define (busy-store-items)
+  "Return the list of store items used by the currently running processes.
+
+This code should typically run as root; it allows the garbage collector to
+determine which store items must not be deleted."
+  (delete-duplicates
+   (filter-map canonicalize-store-item (referenced-files))))
diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc
index 46171e116c..c466996668 100644
--- a/nix/libstore/gc.cc
+++ b/nix/libstore/gc.cc
@@ -339,14 +339,11 @@ Roots LocalStore::findRoots()
 
 static void addAdditionalRoots(StoreAPI & store, PathSet & roots)
 {
-    Path rootFinder = getEnv("NIX_ROOT_FINDER",
-        settings.nixLibexecDir + "/list-runtime-roots");
+    debug(format("executing `%1% gc --list-busy' to find additional roots")
+	  % settings.guixProgram);
 
-    if (rootFinder.empty()) return;
-
-    debug(format("executing `%1%' to find additional roots") % rootFinder);
-
-    string result = runProgram(rootFinder);
+    const Strings args = { "gc", "--list-busy" };
+    string result = runProgram(settings.guixProgram, false, args);
 
     StringSet paths = tokenizeString(result, "\n");
 
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 6df20e7a52..8f7c976fcb 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -73,6 +73,7 @@ void Settings::processEnvironment()
     nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
     nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR));
     nixDaemonSocketFile = canonPath(nixStateDir + DEFAULT_SOCKET_PATH);
+    guixProgram = canonPath(getEnv("GUIX", nixBinDir + "/guix"));
 }
 
 
diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh
index b073f724b6..0d9315a41a 100644
--- a/nix/libstore/globals.hh
+++ b/nix/libstore/globals.hh
@@ -66,6 +66,9 @@ struct Settings {
     /* File name of the socket the daemon listens to.  */
     Path nixDaemonSocketFile;
 
+    /* Absolute file name of the 'guix' program.  */
+    Path guixProgram;
+
     /* Whether to keep temporary directories of failed builds. */
     bool keepFailed;
 
diff --git a/nix/local.mk b/nix/local.mk
index 6d7e60e9fb..fd7379b5ff 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -155,7 +155,6 @@ noinst_HEADERS =						\
 	           (write (get-string-all in) out)))))"
 
 nodist_pkglibexec_SCRIPTS =			\
-  %D%/scripts/list-runtime-roots		\
   %D%/scripts/substitute			\
   %D%/scripts/download
 
diff --git a/nix/scripts/list-runtime-roots.in b/nix/scripts/list-runtime-roots.in
deleted file mode 100644
index 5f2660fb5e..0000000000
--- a/nix/scripts/list-runtime-roots.in
+++ /dev/null
@@ -1,147 +0,0 @@
-#!@GUILE@ -ds
-!#
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2017 Ludovic Courtès 
-;;;
-;;; 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 .
-
-;;;
-;;; List files being used at run time; these files are garbage collector
-;;; roots.  This is equivalent to `find-runtime-roots.pl' in Nix.
-;;;
-
-(use-modules (ice-9 ftw)
-             (ice-9 regex)
-             (ice-9 rdelim)
-             (ice-9 match)
-             (srfi srfi-1)
-             (srfi srfi-26)
-             (rnrs io ports))
-
-(define %proc-directory
-  ;; Mount point of Linuxish /proc file system.
-  "/proc")
-
-(define %store-directory
-  (or (getenv "NIX_STORE_DIR")
-      "@storedir@"))
-
-(define (proc-file-roots dir file)
-  "Return a one-element list containing the file pointed to by DIR/FILE,
-or the empty list."
-  (or (and=> (false-if-exception (readlink (string-append dir "/" file)))
-             list)
-      '()))
-
-(define proc-exe-roots (cut proc-file-roots <> "exe"))
-(define proc-cwd-roots (cut proc-file-roots <> "cwd"))
-
-(define (proc-fd-roots dir)
-  "Return the list of store files referenced by DIR, which is a
-/proc/XYZ directory."
-  (let ((dir (string-append dir "/fd")))
-    (filter-map (lambda (file)
-                  (let ((target (false-if-exception
-                                 (readlink (string-append dir "/" file)))))
-                    (and target
-                         (string-prefix? "/" target)
-                         target)))
-                (or (scandir dir string->number) '()))))
-
-(define (proc-maps-roots dir)
-  "Return the list of store files referenced by DIR, which is a
-/proc/XYZ directory."
-  (define %file-mapping-line
-    (make-regexp "^.*[[:blank:]]+/([^ ]+)$"))
-
-  (call-with-input-file (string-append dir "/maps")
-    (lambda (maps)
-      (let loop ((line  (read-line maps))
-                 (roots '()))
-        (cond ((eof-object? line)
-               roots)
-              ((regexp-exec %file-mapping-line line)
-               =>
-               (lambda (match)
-                 (let ((file (string-append "/"
-                                            (match:substring match 1))))
-                   (loop (read-line maps)
-                         (cons file roots)))))
-              (else
-               (loop (read-line maps) roots)))))))
-
-(define (proc-environ-roots dir)
-  "Return the list of store files referenced by DIR/environ, where DIR is a
-/proc/XYZ directory."
-  (define split-on-nul
-    (cute string-tokenize <>
-          (char-set-complement (char-set #\nul))))
-
-  (define (rhs-file-names str)
-    (let ((equal (string-index str #\=)))
-      (if equal
-          (let* ((str (substring str (+ 1 equal)))
-                 (rx  (string-append (regexp-quote %store-directory)
-                                     "/[0-9a-z]{32}-[a-zA-Z0-9\\._+-]+")))
-            (map match:substring (list-matches rx str)))
-          '())))
-
-  (define environ
-    (string-append dir "/environ"))
-
-  (append-map rhs-file-names
-              (split-on-nul
-               (call-with-input-file environ
-                 get-string-all))))
-
-(define (referenced-files)
-  "Return the list of referenced store items."
-  (append-map (lambda (pid)
-                (let ((proc (string-append %proc-directory "/" pid)))
-                  (catch 'system-error
-                    (lambda ()
-                      (append (proc-exe-roots proc)
-                              (proc-cwd-roots proc)
-                              (proc-fd-roots proc)
-                              (proc-maps-roots proc)
-                              (proc-environ-roots proc)))
-                    (lambda args
-                      (let ((err (system-error-errno args)))
-                        (if (or (= ENOENT err)    ;TOCTTOU race
-                                (= ESRCH err)     ;ditto
-                                (= EACCES err))   ;not running as root
-                            '()
-                            (apply throw args)))))))
-              (scandir %proc-directory string->number
-                       (lambda (a b)
-                         (< (string->number a) (string->number b))))))
-
-(define canonicalize-store-item
-  (let* ((store  (string-append %store-directory "/"))
-         (prefix (string-length store)))
-    (lambda (file)
-      "Return #f if FILE is not a store item; otherwise, return the store file
-name without any sub-directory components."
-      (and (string-prefix? store file)
-           (string-append store
-                          (let ((base (string-drop file prefix)))
-                            (match (string-index base #\/)
-                              (#f    base)
-                              (slash (string-take base slash)))))))))
-
-(for-each (cut simple-format #t "~a~%" <>)
-          (delete-duplicates
-           (filter-map canonicalize-store-item (referenced-files))))
-- 
cgit v1.2.3


From 0c684b7edfacada4f576855dbb09291f04a84fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 3 Sep 2019 21:51:25 +0200
Subject: daemon: Run 'guix authenticate' directly.

* nix/scripts/authenticate.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove
scripts/authenticate.
* config-daemon.ac: Don't output 'nix/scripts/authenticate'.
* nix/libstore/local-store.cc (runAuthenticationProgram): Run 'guix
authenticate'.
---
 config-daemon.ac            |  2 --
 nix/libstore/local-store.cc |  5 +++--
 nix/local.mk                |  3 ---
 nix/scripts/authenticate.in | 11 -----------
 4 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 nix/scripts/authenticate.in

diff --git a/config-daemon.ac b/config-daemon.ac
index f1d26af3a7..907457f478 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -152,8 +152,6 @@ if test "x$guix_build_daemon" = "xyes"; then
     [chmod +x nix/scripts/download])
   AC_CONFIG_FILES([nix/scripts/substitute],
     [chmod +x nix/scripts/substitute])
-  AC_CONFIG_FILES([nix/scripts/authenticate],
-    [chmod +x nix/scripts/authenticate])
   AC_CONFIG_FILES([nix/scripts/offload],
     [chmod +x nix/scripts/offload])
 fi
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index 892d9300b1..951c35faf3 100644
--- a/nix/libstore/local-store.cc
+++ b/nix/libstore/local-store.cc
@@ -1224,8 +1224,9 @@ static void checkSecrecy(const Path & path)
 
 static std::string runAuthenticationProgram(const Strings & args)
 {
-    return runProgram(settings.nixLibexecDir + "/authenticate",
-		      false, args);
+    Strings fullArgs = { "authenticate" };
+    fullArgs.insert(fullArgs.end(), args.begin(), args.end()); // append
+    return runProgram(settings.guixProgram, false, fullArgs);
 }
 
 void LocalStore::exportPath(const Path & path, bool sign,
diff --git a/nix/local.mk b/nix/local.mk
index fd7379b5ff..cdcd9eb1c2 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -165,9 +165,6 @@ nodist_pkglibexec_SCRIPTS +=			\
 
 endif BUILD_DAEMON_OFFLOAD
 
-nodist_pkglibexec_SCRIPTS +=			\
-  %D%/scripts/authenticate
-
 # The '.service' files for systemd.
 systemdservicedir = $(libdir)/systemd/system
 nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service
diff --git a/nix/scripts/authenticate.in b/nix/scripts/authenticate.in
deleted file mode 100644
index 5ce57915f0..0000000000
--- a/nix/scripts/authenticate.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@SHELL@
-# A shorthand for "guix authenticate", for use by the daemon.
-
-if test "x$GUIX_UNINSTALLED" = "x"
-then
-    prefix="@prefix@"
-    exec_prefix="@exec_prefix@"
-    exec "@bindir@/guix" authenticate "$@"
-else
-    exec guix authenticate "$@"
-fi
-- 
cgit v1.2.3


From 9fcc35c51fd579b3bb7b4f61cba6973675c3922c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 3 Sep 2019 21:59:45 +0200
Subject: daemon: Run 'guix perform-download' directly.

* nix/scripts/download.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove 'scripts/download'.
* config-daemon.ac: Don't output 'nix/scripts/download'.
* nix/libstore/builtins.cc (builtinDownload): Invoke 'guix
perform-download' directly.
---
 config-daemon.ac         |  2 --
 nix/libstore/builtins.cc |  4 ++--
 nix/local.mk             |  3 +--
 nix/scripts/download.in  | 11 -----------
 4 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 nix/scripts/download.in

diff --git a/config-daemon.ac b/config-daemon.ac
index 907457f478..50227e310c 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -148,8 +148,6 @@ if test "x$guix_build_daemon" = "xyes"; then
   AC_SUBST([GUIX_TEST_ROOT])
 
   GUIX_CHECK_LOCALSTATEDIR
-  AC_CONFIG_FILES([nix/scripts/download],
-    [chmod +x nix/scripts/download])
   AC_CONFIG_FILES([nix/scripts/substitute],
     [chmod +x nix/scripts/substitute])
   AC_CONFIG_FILES([nix/scripts/offload],
diff --git a/nix/libstore/builtins.cc b/nix/libstore/builtins.cc
index f7c7d42484..4111ac4760 100644
--- a/nix/libstore/builtins.cc
+++ b/nix/libstore/builtins.cc
@@ -39,7 +39,7 @@ static void builtinDownload(const Derivation &drv,
 
     const char *const argv[] =
       {
-	"download", drvPath.c_str(), output.c_str(), NULL
+	  "guix", "perform-download", drvPath.c_str(), output.c_str(), NULL
       };
 
     /* Tell the script what the store file name is, so that
@@ -50,7 +50,7 @@ static void builtinDownload(const Derivation &drv,
     /* Tell it about options such as "print-extended-build-trace".  */
     setenv("_NIX_OPTIONS", settings.pack().c_str(), 1);
 
-    const string program = settings.nixLibexecDir + "/download";
+    const string program = settings.guixProgram;
     execv(program.c_str(), (char *const *) argv);
 
     throw SysError(format("failed to run download program '%1%'") % program);
diff --git a/nix/local.mk b/nix/local.mk
index cdcd9eb1c2..c4c3920fa3 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -155,8 +155,7 @@ noinst_HEADERS =						\
 	           (write (get-string-all in) out)))))"
 
 nodist_pkglibexec_SCRIPTS =			\
-  %D%/scripts/substitute			\
-  %D%/scripts/download
+  %D%/scripts/substitute
 
 if BUILD_DAEMON_OFFLOAD
 
diff --git a/nix/scripts/download.in b/nix/scripts/download.in
deleted file mode 100644
index 4d7088a993..0000000000
--- a/nix/scripts/download.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@SHELL@
-# A shorthand for "guix perform-download", for use by the daemon.
-
-if test "x$GUIX_UNINSTALLED" = "x"
-then
-    prefix="@prefix@"
-    exec_prefix="@exec_prefix@"
-    exec "@bindir@/guix" perform-download "$@"
-else
-    exec guix perform-download "$@"
-fi
-- 
cgit v1.2.3


From bc69ea2d605810cc32e13ed03d5848b8dc358b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 3 Sep 2019 22:11:47 +0200
Subject: daemon: Run 'guix offload' directly.

* nix/scripts/offload.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS) [BUILD_DAEMON_OFFLOAD]:
Remove 'scripts/offload'.
* config-daemon.ac: Don't output 'nix/scripts/offload'.
* build-aux/pre-inst-env.in: Don't set 'NIX_BUILD_HOOK'.
* nix/libstore/build.cc (HookInstance::HookInstance): Run 'guix
offload'.
(DerivationGoal::tryBuildHook): Remove reference to 'NIX_BUILD_HOOK'.
* nix/nix-daemon/guix-daemon.cc (main) [HAVE_DAEMON_OFFLOAD_HOOK]: Don't
set 'NIX_BUILD_HOOK'.
* nix/nix-daemon/nix-daemon.cc (performOp) [!HAVE_DAEMON_OFFLOAD_HOOK]:
Leave 'settings.useBuildHook' unchanged.
---
 build-aux/pre-inst-env.in     |  4 ----
 config-daemon.ac              |  2 --
 nix/libstore/build.cc         | 11 +++++------
 nix/local.mk                  |  7 -------
 nix/nix-daemon/guix-daemon.cc |  9 +--------
 nix/nix-daemon/nix-daemon.cc  |  8 +++++++-
 nix/scripts/offload.in        | 11 -----------
 7 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 nix/scripts/offload.in

diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
index ab1c519d70..f96288132d 100644
--- a/build-aux/pre-inst-env.in
+++ b/build-aux/pre-inst-env.in
@@ -48,10 +48,6 @@ NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'authenticate', etc.
 
 export NIX_LIBEXEC_DIR
 
-NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload"
-@BUILD_DAEMON_OFFLOAD_TRUE@export NIX_BUILD_HOOK
-@BUILD_DAEMON_OFFLOAD_FALSE@# No offloading support.
-@BUILD_DAEMON_OFFLOAD_FALSE@unset NIX_BUILD_HOOK
 # The daemon invokes 'guix'; tell it which one to use.
 GUIX="$abs_top_builddir/scripts/guix"
 export GUIX
diff --git a/config-daemon.ac b/config-daemon.ac
index 50227e310c..3d92e8f778 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -150,8 +150,6 @@ if test "x$guix_build_daemon" = "xyes"; then
   GUIX_CHECK_LOCALSTATEDIR
   AC_CONFIG_FILES([nix/scripts/substitute],
     [chmod +x nix/scripts/substitute])
-  AC_CONFIG_FILES([nix/scripts/offload],
-    [chmod +x nix/scripts/offload])
 fi
 
 AM_CONDITIONAL([HAVE_LIBBZ2], [test "x$HAVE_LIBBZ2" = "xyes"])
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index fe7bf79069..9f1f88933a 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -614,9 +614,7 @@ HookInstance::HookInstance()
 {
     debug("starting build hook");
 
-    Path buildHook = getEnv("NIX_BUILD_HOOK");
-    if (string(buildHook, 0, 1) != "/") buildHook = settings.nixLibexecDir + "/nix/" + buildHook;
-    buildHook = canonPath(buildHook);
+    const Path &buildHook = settings.guixProgram;
 
     /* Create a pipe to get the output of the child. */
     fromHook.create();
@@ -642,13 +640,14 @@ HookInstance::HookInstance()
         if (dup2(builderOut.writeSide, 4) == -1)
             throw SysError("dupping builder's stdout/stderr");
 
-        execl(buildHook.c_str(), buildHook.c_str(), settings.thisSystem.c_str(),
+        execl(buildHook.c_str(), buildHook.c_str(), "offload",
+	    settings.thisSystem.c_str(),
             (format("%1%") % settings.maxSilentTime).str().c_str(),
             (format("%1%") % settings.printBuildTrace).str().c_str(),
             (format("%1%") % settings.buildTimeout).str().c_str(),
             NULL);
 
-        throw SysError(format("executing `%1%'") % buildHook);
+        throw SysError(format("executing `%1% offload'") % buildHook);
     });
 
     pid.setSeparatePG(true);
@@ -1581,7 +1580,7 @@ void DerivationGoal::buildDone()
 
 HookReply DerivationGoal::tryBuildHook()
 {
-    if (!settings.useBuildHook || getEnv("NIX_BUILD_HOOK") == "") return rpDecline;
+    if (!settings.useBuildHook) return rpDecline;
 
     if (!worker.hook)
         worker.hook = std::shared_ptr(new HookInstance);
diff --git a/nix/local.mk b/nix/local.mk
index c4c3920fa3..8e52c77bd9 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -157,13 +157,6 @@ noinst_HEADERS =						\
 nodist_pkglibexec_SCRIPTS =			\
   %D%/scripts/substitute
 
-if BUILD_DAEMON_OFFLOAD
-
-nodist_pkglibexec_SCRIPTS +=			\
-  %D%/scripts/offload
-
-endif BUILD_DAEMON_OFFLOAD
-
 # The '.service' files for systemd.
 systemdservicedir = $(libdir)/systemd/system
 nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index f47d142612..73962af584 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -474,15 +474,8 @@ main (int argc, char *argv[])
       settings.set ("substitute-urls", GUIX_SUBSTITUTE_URLS);
 
 #ifdef HAVE_DAEMON_OFFLOAD_HOOK
-      /* Use our build hook for distributed builds by default.  */
+      /* Use 'guix offload' for distributed builds by default.  */
       settings.useBuildHook = true;
-      if (getenv ("NIX_BUILD_HOOK") == NULL)
-	{
-	  std::string build_hook;
-
-	  build_hook = settings.nixLibexecDir + "/offload";
-	  setenv ("NIX_BUILD_HOOK", build_hook.c_str (), 1);
-	}
 #else
       /* We are not installing any build hook, so disable it.  */
       settings.useBuildHook = false;
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index 56137701a1..f29bcd2eab 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -580,8 +580,14 @@ static void performOp(bool trusted, unsigned int clientVersion,
             settings.set("build-max-silent-time", std::to_string(readInt(from)));
         }
 
-        if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
+        if (GET_PROTOCOL_MINOR(clientVersion) >= 2) {
+#ifdef HAVE_DAEMON_OFFLOAD_HOOK
             settings.useBuildHook = readInt(from) != 0;
+#else
+	    readInt(from);			  // ignore the user's setting
+#endif
+	}
+
         if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
             settings.buildVerbosity = (Verbosity) readInt(from);
             logType = (LogType) readInt(from);
diff --git a/nix/scripts/offload.in b/nix/scripts/offload.in
deleted file mode 100644
index 50faed31c0..0000000000
--- a/nix/scripts/offload.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@SHELL@
-# A shorthand for "guix offload", for use by the daemon.
-
-if test "x$GUIX_UNINSTALLED" = "x"
-then
-    prefix="@prefix@"
-    exec_prefix="@exec_prefix@"
-    exec "@bindir@/guix" offload "$@"
-else
-    exec guix offload "$@"
-fi
-- 
cgit v1.2.3


From f6919ebdc6b0ce0286814cc6ab0564b1a4c67f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 4 Sep 2019 11:04:44 +0200
Subject: daemon: Run 'guix substitute' directly and assume a single
 substituter.

The daemon had a mechanism that allows it to handle a list of
substituters and try them sequentially; this removes it.

* nix/scripts/substitute.in: Remove.
* nix/local.mk (nodist_pkglibexec_SCRIPTS): Remove.
* config-daemon.ac: Don't output 'nix/scripts/substitute'.
* nix/libstore/build.cc (SubstitutionGoal)[subs, sub, hasSubstitute]:
Remove.
[tryNext]: Make private.
(SubstitutionGoal::SubstitutionGoal, SubstitutionGoal::init): Remove now
unneeded initializers.
(SubstitutionGoal::tryNext): Adjust to assume a single substituter: call
'amDone' upfront when we couldn't find substitutes.
(SubstitutionGoal::tryToRun): Adjust to run 'guix substitute' via
'settings.guixProgram'.
(SubstitutionGoal::finished): Call 'amDone(ecFailed)' upon failure
instead of setting 'state' to 'tryNext'.
* nix/libstore/globals.hh (Settings)[substituters]: Remove.
* nix/libstore/local-store.cc (LocalStore::~LocalStore): Adjust to
handle a single substituter.
(LocalStore::startSubstituter): Remove 'path' parameter.  Adjust to
invoke 'settings.guixProgram'.  Don't refer to 'run.program', which no
longer exists.
(LocalStore::querySubstitutablePaths): Adjust for 'runningSubstituters'
being a singleton instead of a list.
(LocalStore::querySubstitutablePathInfos): Likewise, and remove
'substituter' parameter.
* nix/libstore/local-store.hh (RunningSubstituter)[program]: Remove.
(LocalStore)[runningSubstituters]: Remove.
[runningSubstituter]: New field.
[querySubstitutablePathInfos]: Remove 'substituter' parameter.
[startSubstituter]: Remove 'substituter' parameter.
* nix/nix-daemon/guix-daemon.cc (main): Remove references to
'settings.substituters'.
* nix/nix-daemon/nix-daemon.cc (performOp): Ignore the user's
"build-use-substitutes" value when 'settings.useSubstitutes' is false.
---
 config-daemon.ac              |  2 -
 nix/libstore/build.cc         | 52 +++++++++--------------
 nix/libstore/globals.hh       |  5 ---
 nix/libstore/local-store.cc   | 97 ++++++++++++++++++++++++-------------------
 nix/libstore/local-store.hh   | 12 +++---
 nix/local.mk                  |  3 --
 nix/nix-daemon/guix-daemon.cc | 11 +----
 nix/nix-daemon/nix-daemon.cc  |  8 +++-
 nix/scripts/substitute.in     | 11 -----
 9 files changed, 85 insertions(+), 116 deletions(-)
 delete mode 100644 nix/scripts/substitute.in

diff --git a/config-daemon.ac b/config-daemon.ac
index 3d92e8f778..bf94815966 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -148,8 +148,6 @@ if test "x$guix_build_daemon" = "xyes"; then
   AC_SUBST([GUIX_TEST_ROOT])
 
   GUIX_CHECK_LOCALSTATEDIR
-  AC_CONFIG_FILES([nix/scripts/substitute],
-    [chmod +x nix/scripts/substitute])
 fi
 
 AM_CONDITIONAL([HAVE_LIBBZ2], [test "x$HAVE_LIBBZ2" = "xyes"])
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 9f1f88933a..ad53b81413 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -2863,15 +2863,6 @@ private:
     /* The store path that should be realised through a substitute. */
     Path storePath;
 
-    /* The remaining substituters. */
-    Paths subs;
-
-    /* The current substituter. */
-    Path sub;
-
-    /* Whether any substituter can realise this path */
-    bool hasSubstitute;
-
     /* Path info returned by the substituter's query info operation. */
     SubstitutablePathInfo info;
 
@@ -2897,6 +2888,8 @@ private:
     typedef void (SubstitutionGoal::*GoalState)();
     GoalState state;
 
+    void tryNext();
+
 public:
     SubstitutionGoal(const Path & storePath, Worker & worker, bool repair = false);
     ~SubstitutionGoal();
@@ -2914,7 +2907,6 @@ public:
 
     /* The states. */
     void init();
-    void tryNext();
     void gotInfo();
     void referencesValid();
     void tryToRun();
@@ -2930,7 +2922,6 @@ public:
 
 SubstitutionGoal::SubstitutionGoal(const Path & storePath, Worker & worker, bool repair)
     : Goal(worker)
-    , hasSubstitute(false)
     , repair(repair)
 {
     this->storePath = storePath;
@@ -2980,37 +2971,31 @@ void SubstitutionGoal::init()
     if (settings.readOnlyMode)
         throw Error(format("cannot substitute path `%1%' - no write access to the store") % storePath);
 
-    subs = settings.substituters;
-
     tryNext();
 }
 
 
 void SubstitutionGoal::tryNext()
 {
-    trace("trying next substituter");
+    trace("trying substituter");
 
-    if (subs.size() == 0) {
+    SubstitutablePathInfos infos;
+    PathSet dummy(singleton(storePath));
+    worker.store.querySubstitutablePathInfos(dummy, infos);
+    SubstitutablePathInfos::iterator k = infos.find(storePath);
+    if (k == infos.end()) {
         /* None left.  Terminate this goal and let someone else deal
            with it. */
         debug(format("path `%1%' is required, but there is no substituter that can build it") % storePath);
         /* Hack: don't indicate failure if there were no substituters.
            In that case the calling derivation should just do a
            build. */
-        amDone(hasSubstitute ? ecFailed : ecNoSubstituters);
-        return;
+        amDone(ecNoSubstituters);
+	return;
     }
 
-    sub = subs.front();
-    subs.pop_front();
-
-    SubstitutablePathInfos infos;
-    PathSet dummy(singleton(storePath));
-    worker.store.querySubstitutablePathInfos(sub, dummy, infos);
-    SubstitutablePathInfos::iterator k = infos.find(storePath);
-    if (k == infos.end()) { tryNext(); return; }
+    /* Found a substitute.  */
     info = k->second;
-    hasSubstitute = true;
 
     /* To maintain the closure invariant, we first have to realise the
        paths referenced by this one. */
@@ -3098,7 +3083,8 @@ void SubstitutionGoal::tryToRun()
 
     /* Fill in the arguments. */
     Strings args;
-    args.push_back(baseNameOf(sub));
+    args.push_back("guix");
+    args.push_back("substitute");
     args.push_back("--substitute");
     args.push_back(storePath);
     args.push_back(destPath);
@@ -3111,9 +3097,9 @@ void SubstitutionGoal::tryToRun()
         if (dup2(outPipe.writeSide, STDOUT_FILENO) == -1)
             throw SysError("cannot dup output pipe into stdout");
 
-        execv(sub.c_str(), stringsToCharPtrs(args).data());
+        execv(settings.guixProgram.c_str(), stringsToCharPtrs(args).data());
 
-        throw SysError(format("executing `%1%'") % sub);
+        throw SysError(format("executing `%1% substitute'") % settings.guixProgram);
     });
 
     pid.setSeparatePG(true);
@@ -3126,7 +3112,9 @@ void SubstitutionGoal::tryToRun()
     state = &SubstitutionGoal::finished;
 
     if (settings.printBuildTrace)
-        printMsg(lvlError, format("@ substituter-started %1% %2%") % storePath % sub);
+	/* The second element in the message used to be the name of the
+	   substituter but we're left with only one.  */
+        printMsg(lvlError, format("@ substituter-started %1% substitute") % storePath);
 }
 
 
@@ -3192,9 +3180,7 @@ void SubstitutionGoal::finished()
                 % storePath % status % e.msg());
         }
 
-        /* Try the next substitute. */
-        state = &SubstitutionGoal::tryNext;
-        worker.wakeUp(shared_from_this());
+	amDone(ecFailed);
         return;
     }
 
diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh
index 0d9315a41a..0069c85956 100644
--- a/nix/libstore/globals.hh
+++ b/nix/libstore/globals.hh
@@ -115,11 +115,6 @@ struct Settings {
        means infinity.  */
     time_t buildTimeout;
 
-    /* The substituters.  There are programs that can somehow realise
-       a store path without building, e.g., by downloading it or
-       copying it from a CD. */
-    Paths substituters;
-
     /* Whether to use build hooks (for distributed builds).  Sometimes
        users want to disable this from the command-line. */
     bool useBuildHook;
diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc
index 951c35faf3..3b08492c64 100644
--- a/nix/libstore/local-store.cc
+++ b/nix/libstore/local-store.cc
@@ -184,13 +184,15 @@ LocalStore::LocalStore(bool reserveSpace)
 LocalStore::~LocalStore()
 {
     try {
-        foreach (RunningSubstituters::iterator, i, runningSubstituters) {
-            if (i->second.disabled) continue;
-            i->second.to.close();
-            i->second.from.close();
-            i->second.error.close();
-            if (i->second.pid != -1)
-                i->second.pid.wait(true);
+	if (runningSubstituter) {
+	    RunningSubstituter &i = *runningSubstituter;
+            if (!i.disabled) {
+		i.to.close();
+		i.from.close();
+		i.error.close();
+		if (i.pid != -1)
+		    i.pid.wait(true);
+	    }
         }
     } catch (...) {
         ignoreException();
@@ -808,11 +810,12 @@ void LocalStore::setSubstituterEnv()
 }
 
 
-void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter & run)
+void LocalStore::startSubstituter(RunningSubstituter & run)
 {
     if (run.disabled || run.pid != -1) return;
 
-    debug(format("starting substituter program `%1%'") % substituter);
+    debug(format("starting substituter program `%1% substitute'")
+	  % settings.guixProgram);
 
     Pipe toPipe, fromPipe, errorPipe;
 
@@ -829,11 +832,10 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter &
             throw SysError("dupping stdout");
         if (dup2(errorPipe.writeSide, STDERR_FILENO) == -1)
             throw SysError("dupping stderr");
-        execl(substituter.c_str(), substituter.c_str(), "--query", NULL);
-        throw SysError(format("executing `%1%'") % substituter);
+        execl(settings.guixProgram.c_str(), "guix", "substitute", "--query", NULL);
+        throw SysError(format("executing `%1%'") % settings.guixProgram);
     });
 
-    run.program = baseNameOf(substituter);
     run.to = toPipe.writeSide.borrow();
     run.from = run.fromBuf.fd = fromPipe.readSide.borrow();
     run.error = errorPipe.readSide.borrow();
@@ -889,13 +891,14 @@ string LocalStore::getLineFromSubstituter(RunningSubstituter & run)
                 if (errno == EINTR) continue;
                 throw SysError("reading from substituter's stderr");
             }
-            if (n == 0) throw EndOfFile(format("substituter `%1%' died unexpectedly") % run.program);
+            if (n == 0) throw EndOfFile(format("`%1% substitute' died unexpectedly")
+					% settings.guixProgram);
             err.append(buf, n);
             string::size_type p;
             while (((p = err.find('\n')) != string::npos)
 		   || ((p = err.find('\r')) != string::npos)) {
 	        string thing(err, 0, p + 1);
-	        writeToStderr(run.program + ": " + thing);
+	        writeToStderr("substitute: " + thing);
                 err = string(err, p + 1);
             }
         }
@@ -907,7 +910,7 @@ string LocalStore::getLineFromSubstituter(RunningSubstituter & run)
                 unsigned char c;
                 run.fromBuf(&c, 1);
                 if (c == '\n') {
-                    if (!err.empty()) printMsg(lvlError, run.program + ": " + err);
+                    if (!err.empty()) printMsg(lvlError, "substitute: " + err);
                     return res;
                 }
                 res += c;
@@ -930,38 +933,47 @@ PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
 {
     PathSet res;
 
-    if (!settings.useSubstitutes) return res;
-
-    foreach (Paths::iterator, i, settings.substituters) {
-        if (res.size() == paths.size()) break;
-        RunningSubstituter & run(runningSubstituters[*i]);
-        startSubstituter(*i, run);
-        if (run.disabled) continue;
-        string s = "have ";
-        foreach (PathSet::const_iterator, j, paths)
-            if (res.find(*j) == res.end()) { s += *j; s += " "; }
-        writeLine(run.to, s);
-        while (true) {
-            /* FIXME: we only read stderr when an error occurs, so
-               substituters should only write (short) messages to
-               stderr when they fail.  I.e. they shouldn't write debug
-               output. */
-            Path path = getLineFromSubstituter(run);
-            if (path == "") break;
-            res.insert(path);
-        }
+    if (!settings.useSubstitutes || paths.empty()) return res;
+
+    if (!runningSubstituter) {
+	std::unique_ptrfresh(new RunningSubstituter);
+	runningSubstituter.swap(fresh);
+    }
+
+    RunningSubstituter & run = *runningSubstituter;
+    startSubstituter(run);
+
+    if (!run.disabled) {
+	string s = "have ";
+	foreach (PathSet::const_iterator, j, paths)
+	    if (res.find(*j) == res.end()) { s += *j; s += " "; }
+	writeLine(run.to, s);
+	while (true) {
+	    /* FIXME: we only read stderr when an error occurs, so
+	       substituters should only write (short) messages to
+	       stderr when they fail.  I.e. they shouldn't write debug
+	       output. */
+	    Path path = getLineFromSubstituter(run);
+	    if (path == "") break;
+	    res.insert(path);
+	}
     }
+
     return res;
 }
 
 
-void LocalStore::querySubstitutablePathInfos(const Path & substituter,
-    PathSet & paths, SubstitutablePathInfos & infos)
+void LocalStore::querySubstitutablePathInfos(PathSet & paths, SubstitutablePathInfos & infos)
 {
     if (!settings.useSubstitutes) return;
 
-    RunningSubstituter & run(runningSubstituters[substituter]);
-    startSubstituter(substituter, run);
+    if (!runningSubstituter) {
+	std::unique_ptrfresh(new RunningSubstituter);
+	runningSubstituter.swap(fresh);
+    }
+
+    RunningSubstituter & run = *runningSubstituter;
+    startSubstituter(run);
     if (run.disabled) return;
 
     string s = "info ";
@@ -993,10 +1005,9 @@ void LocalStore::querySubstitutablePathInfos(const Path & substituter,
 void LocalStore::querySubstitutablePathInfos(const PathSet & paths,
     SubstitutablePathInfos & infos)
 {
-    PathSet todo = paths;
-    foreach (Paths::iterator, i, settings.substituters) {
-        if (todo.empty()) break;
-        querySubstitutablePathInfos(*i, todo, infos);
+    if (!paths.empty()) {
+	PathSet todo = paths;
+	querySubstitutablePathInfos(todo, infos);
     }
 }
 
diff --git a/nix/libstore/local-store.hh b/nix/libstore/local-store.hh
index 4e6b4cfc1d..4113fafcb5 100644
--- a/nix/libstore/local-store.hh
+++ b/nix/libstore/local-store.hh
@@ -40,7 +40,6 @@ struct OptimiseStats
 
 struct RunningSubstituter
 {
-    Path program;
     Pid pid;
     AutoCloseFD to, from, error;
     FdSource fromBuf;
@@ -52,8 +51,8 @@ struct RunningSubstituter
 class LocalStore : public StoreAPI
 {
 private:
-    typedef std::map RunningSubstituters;
-    RunningSubstituters runningSubstituters;
+    /* The currently running substituter or empty.  */
+    std::unique_ptr runningSubstituter;
 
     Path linksDir;
 
@@ -93,8 +92,8 @@ public:
 
     PathSet querySubstitutablePaths(const PathSet & paths);
 
-    void querySubstitutablePathInfos(const Path & substituter,
-        PathSet & paths, SubstitutablePathInfos & infos);
+    void querySubstitutablePathInfos(PathSet & paths,
+        SubstitutablePathInfos & infos);
 
     void querySubstitutablePathInfos(const PathSet & paths,
         SubstitutablePathInfos & infos);
@@ -261,8 +260,7 @@ private:
 
     void removeUnusedLinks(const GCState & state);
 
-    void startSubstituter(const Path & substituter,
-        RunningSubstituter & runningSubstituter);
+    void startSubstituter(RunningSubstituter & runningSubstituter);
 
     string getLineFromSubstituter(RunningSubstituter & run);
 
diff --git a/nix/local.mk b/nix/local.mk
index 8e52c77bd9..18e9ba7604 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -154,9 +154,6 @@ noinst_HEADERS =						\
 	         (lambda (in)					\
 	           (write (get-string-all in) out)))))"
 
-nodist_pkglibexec_SCRIPTS =			\
-  %D%/scripts/substitute
-
 # The '.service' files for systemd.
 systemdservicedir = $(libdir)/systemd/system
 nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index 73962af584..6f9c404c8d 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -466,8 +466,7 @@ main (int argc, char *argv[])
     {
       settings.processEnvironment ();
 
-      /* Use our substituter by default.  */
-      settings.substituters.clear ();
+      /* Enable substitutes by default.  */
       settings.set ("build-use-substitutes", "true");
 
       /* Use our substitute server by default.  */
@@ -490,14 +489,6 @@ main (int argc, char *argv[])
       printMsg(lvlDebug,
 	       format ("build log compression: %1%") % settings.logCompression);
 
-      if (settings.useSubstitutes)
-	settings.substituters.push_back (settings.nixLibexecDir
-					 + "/substitute");
-      else
-	/* Clear the substituter list to make sure nothing ever gets
-	   substituted, regardless of the client's settings.  */
-	settings.substituters.clear ();
-
       if (geteuid () == 0 && settings.buildUsersGroup.empty ())
 	fprintf (stderr, _("warning: daemon is running as root, so \
 using `--build-users-group' is highly recommended\n"));
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index f29bcd2eab..ffac6cde34 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -596,8 +596,12 @@ static void performOp(bool trusted, unsigned int clientVersion,
         if (GET_PROTOCOL_MINOR(clientVersion) >= 6
             && GET_PROTOCOL_MINOR(clientVersion) < 0x61)
             settings.set("build-cores", std::to_string(readInt(from)));
-        if (GET_PROTOCOL_MINOR(clientVersion) >= 10)
-            settings.set("build-use-substitutes", readInt(from) ? "true" : "false");
+        if (GET_PROTOCOL_MINOR(clientVersion) >= 10) {
+	    if (settings.useSubstitutes)
+		settings.set("build-use-substitutes", readInt(from) ? "true" : "false");
+	    else
+		readInt(from);			// substitutes remain disabled
+	}
         if (GET_PROTOCOL_MINOR(clientVersion) >= 12) {
             unsigned int n = readInt(from);
             for (unsigned int i = 0; i < n; i++) {
diff --git a/nix/scripts/substitute.in b/nix/scripts/substitute.in
deleted file mode 100644
index 5a2eeb7259..0000000000
--- a/nix/scripts/substitute.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@SHELL@
-# A shorthand for "guix substitute", for use by the daemon.
-
-if test "x$GUIX_UNINSTALLED" = "x"
-then
-    prefix="@prefix@"
-    exec_prefix="@exec_prefix@"
-    exec "@bindir@/guix" substitute "$@"
-else
-    exec guix substitute "$@"
-fi
-- 
cgit v1.2.3


From 82f903e70f580c34503052245625354d2f097d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 4 Sep 2019 12:00:31 +0200
Subject: daemon: Remove 'NIX_LIBEXEC_DIR'.

* nix/libstore/globals.hh (Settings)[nixLibexecDir]: Remove.
* nix/libstore/globals.cc (Settings::processEnvironment): Remove
reference to 'nixLibexecDir'.
* nix/local.mk (libstore_a_CPPFLAGS): Remove -DNIX_LIBEXEC_DIR flag.
* build-aux/pre-inst-env.in: Remove references to 'NIX_LIBEXEC_DIR'.
---
 build-aux/pre-inst-env.in | 6 ------
 nix/libstore/globals.cc   | 1 -
 nix/libstore/globals.hh   | 3 ---
 nix/local.mk              | 1 -
 4 files changed, 11 deletions(-)

diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
index f96288132d..e0aa7fe868 100644
--- a/build-aux/pre-inst-env.in
+++ b/build-aux/pre-inst-env.in
@@ -42,12 +42,6 @@ export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
 PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH"
 export PATH
 
-# Daemon helpers.
-
-NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'authenticate', etc.
-
-export NIX_LIBEXEC_DIR
-
 # The daemon invokes 'guix'; tell it which one to use.
 GUIX="$abs_top_builddir/scripts/guix"
 export GUIX
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 8f7c976fcb..0cc001fbe4 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -70,7 +70,6 @@ void Settings::processEnvironment()
     nixStateDir = canonPath(getEnv("GUIX_STATE_DIRECTORY", NIX_STATE_DIR));
     nixDBPath = getEnv("GUIX_DATABASE_DIRECTORY", nixStateDir + "/db");
     nixConfDir = canonPath(getEnv("GUIX_CONFIGURATION_DIRECTORY", GUIX_CONFIGURATION_DIRECTORY));
-    nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
     nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR));
     nixDaemonSocketFile = canonPath(nixStateDir + DEFAULT_SOCKET_PATH);
     guixProgram = canonPath(getEnv("GUIX", nixBinDir + "/guix"));
diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh
index 0069c85956..27616a2283 100644
--- a/nix/libstore/globals.hh
+++ b/nix/libstore/globals.hh
@@ -57,9 +57,6 @@ struct Settings {
     /* The directory where configuration files are stored. */
     Path nixConfDir;
 
-    /* The directory where internal helper programs are stored. */
-    Path nixLibexecDir;
-
     /* The directory where the main programs are stored. */
     Path nixBinDir;
 
diff --git a/nix/local.mk b/nix/local.mk
index 18e9ba7604..dc5a8398b2 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -110,7 +110,6 @@ libstore_a_CPPFLAGS =				\
   -DNIX_STATE_DIR=\"$(localstatedir)/guix\"	\
   -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\"	\
   -DGUIX_CONFIGURATION_DIRECTORY=\"$(sysconfdir)/guix\"		\
-  -DNIX_LIBEXEC_DIR=\"$(libexecdir)/guix\"	\
   -DNIX_BIN_DIR=\"$(bindir)\"			\
   -DDEFAULT_CHROOT_DIRS="\"\""
 
-- 
cgit v1.2.3


From cc98b00857e29074de96a6ed60e325cdfffaea1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 4 Sep 2019 12:07:21 +0200
Subject: etc: Remove references to libexec/guix* from SELinux policy.

* etc/guix-daemon.cil.in: Remove references to libexec/guix*.
---
 etc/guix-daemon.cil.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/etc/guix-daemon.cil.in b/etc/guix-daemon.cil.in
index c0c82d8fbb..e0c9113498 100644
--- a/etc/guix-daemon.cil.in
+++ b/etc/guix-daemon.cil.in
@@ -277,9 +277,5 @@
            file (system_u object_r guix_daemon_exec_t (low low)))
   (filecon "@storedir@/.+-(guix-.+|profile)/bin/guix-daemon"
            file (system_u object_r guix_daemon_exec_t (low low)))
-  (filecon "@storedir@/.+-(guix-.+|profile)/libexec/guix-authenticate"
-           file (system_u object_r guix_daemon_exec_t (low low)))
-  (filecon "@storedir@/.+-(guix-.+|profile)/libexec/guix/(.*)?"
-           any (system_u object_r guix_daemon_exec_t (low low)))
   (filecon "@guix_localstatedir@/guix/daemon-socket/socket"
            any (system_u object_r guix_daemon_socket_t (low low))))
-- 
cgit v1.2.3


From 7fb742215cf616f8f457be65b7acf0c358d8b2ef Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 13:51:08 +0300
Subject: gnu: wget.scm: Use license: prefix.

* gnu/packages/wget.scm (wget, wgetpaste, wget2)[license]: Use
'license:' prefix.
---
 gnu/packages/wget.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index 76ceed5ff7..ba775961a8 100644
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -21,7 +21,7 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu packages wget)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -74,7 +74,7 @@
 HTTPS and FTP protocols.  It can resume interrupted downloads, use file name
 wild cards, supports proxies and cookies, and it can convert absolute links
 in downloaded documents to relative links.")
-    (license gpl3+))) ; some files are under GPLv2+
+    (license license:gpl3+))) ; some files are under GPLv2+
 
 (define-public wgetpaste
   (package
@@ -136,7 +136,7 @@ in downloaded documents to relative links.")
     (description
      "@code{wgetpaste} is an extremely simple command-line interface to various
 online pastebin services.")
-    (license public-domain)))
+    (license license:public-domain)))
 
 (define-public wget2
   (package
@@ -200,4 +200,4 @@ online pastebin services.")
    (description "GNU Wget2 is the successor of GNU Wget, a file and recursive
 website downloader.  Designed and written from scratch it wraps around libwget,
 that provides the basic functions needed by a web client.")
-   (license (list gpl3+ lgpl3+))))
+   (license (list license:gpl3+ license:lgpl3+))))
-- 
cgit v1.2.3


From 78249ebf5badd00d2bb130d85ca1fd2f3ac50963 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 13:49:57 +0300
Subject: gnu: wget2: Update to 1.99.2.

* gnu/packages/wget.scm (wget2): Update to 1.99.2.
[source]: Download from gnu mirrors.
[arguments]: Remove custom 'bootstrap phase, update custom
'skip-network-tests phase. Don't build static library.
[inputs]: Add bzip2, gpgme, zlib.
[native-inputs]: Remove autoconf, automake, flex, gettext-minimal,
libtool, python-2.
---
 gnu/packages/wget.scm | 60 ++++++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 42 deletions(-)

diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm
index ba775961a8..1501ea2746 100644
--- a/gnu/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -23,13 +23,11 @@
 (define-module (gnu packages wget)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
-  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
-  #:use-module (gnu packages flex)
-  #:use-module (gnu packages gettext)
   #:use-module (gnu packages gnunet)
+  #:use-module (gnu packages gnupg)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
@@ -40,7 +38,6 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module (guix git-download)
   #:use-module (guix build-system gnu))
 
 (define-public wget
@@ -141,60 +138,39 @@ online pastebin services.")
 (define-public wget2
   (package
    (name "wget2")
-   (version "1.99.1")
+   (version "1.99.2")
    (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/gnuwget/wget2.git")
-              (commit (string-append name "-" version))
-              (recursive? #t))) ;; Needed for 'gnulib' git submodule.
-       (file-name (string-append name "-" version "-checkout"))
+       (method url-fetch)
+       (uri (string-append "mirror://gnu/wget/wget2-" version ".tar.gz"))
        (sha256
         (base32
-         "15wxsnjhc6bzk7f60i1djmsarh1w31gwi5h2gh9k19ncwypfj5dm"))))
+         "0qv55f4bablrlhc8bnic8g3mkk1kq44c4cphrk5jmv92z9aqzi6b"))))
    (build-system gnu-build-system)
    (arguments
     `(#:phases
       (modify-phases %standard-phases
-        (add-after 'unpack 'skip-network-test
+        (add-after 'unpack 'skip-network-tests
           (lambda _
-            (substitute* "tests/Makefile.am"
-              (("test-auth-digest\\$\\(EXEEXT)") ""))
-            #t))
-        (replace 'bootstrap
-          (lambda _
-            ;; Make sure all the files are writable so that ./bootstrap
-            ;; can proceed.
-            (for-each (lambda (file)
-                        (chmod file #o755))
-                        (find-files "."))
-            (patch-shebang "./gnulib/gnulib-tool.py")
-            ;; Remove unnecessary inputs from bootstrap.conf
-            (substitute* "bootstrap.conf"
-              (("flex.*") "")
-              (("makeinfo.*") "")
-              (("lzip.*") "")
-              (("rsync.*") ""))
-            (invoke "sh" "./bootstrap"
-                    "--gnulib-srcdir=gnulib"
-                    "--no-git"))))))
+            (substitute* "tests/Makefile.in"
+              (("test-gpg-verify-no-file\\$\\(EXEEXT)") "")
+              (("test-gpg-valid\\$\\(EXEEXT)") "")
+              (("test-gpg-styles\\$\\(EXEEXT)") ""))
+            #t)))
+      #:configure-flags '("--enable-static=no")))
    (inputs
-    `(("gnutls" ,gnutls/dane)
+    `(("bzip2" ,bzip2)
+      ("gnutls" ,gnutls/dane)
+      ("gpgme" ,gpgme)
       ("libiconv" ,libiconv)
       ("libidn2" ,libidn2)
       ("libmicrohttpd" ,libmicrohttpd)
       ("libpsl" ,libpsl)
-      ("pcre2" ,pcre2)))
+      ("pcre2" ,pcre2)
+      ("zlib" ,zlib)))
    ;; TODO: Add libbrotlidec, libnghttp2.
    (native-inputs
-    `(("autoconf" ,autoconf)
-      ("automake" ,automake)
-      ("flex" ,flex)
-      ("gettext" ,gettext-minimal)
-      ("libtool" ,libtool)
-      ("pkg-config" ,pkg-config)
-      ("python" ,python-2)))
+    `(("pkg-config" ,pkg-config)))
    (home-page "https://gitlab.com/gnuwget/wget2")
    (synopsis "Successor of GNU Wget")
    (description "GNU Wget2 is the successor of GNU Wget, a file and recursive
-- 
cgit v1.2.3


From 28ac73358f4a5db9eabb05ae85a09a726b2b5a24 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 14:17:43 +0300
Subject: gnu: micropython: Update to 1.11.

* gnu/packages/python.scm (micropython): Update to 1.11.
---
 gnu/packages/python.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index aa92e82ac2..e8c0f63fe7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -464,7 +464,7 @@ instead of @command{python3}.")))
 (define-public micropython
   (package
     (name "micropython")
-    (version "1.10")
+    (version "1.11")
     (source
       (origin
         (method url-fetch)
@@ -473,7 +473,7 @@ instead of @command{python3}.")))
                             "/micropython-" version ".tar.gz"))
         (sha256
          (base32
-          "1g1zjip3rkx6bp16qi1bag72wivnbh56fcsl3nffanrx4j5f4z90"))
+          "0px3xhw16rl0l7qifq7jw1gq92wzlnhd17dmszv9m2c3wbzs9p9f"))
       (modules '((guix build utils)))
       (snippet
        '(begin
@@ -487,7 +487,7 @@ instead of @command{python3}.")))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-before 'build 'preprare-build
+         (add-before 'build 'prepare-build
            (lambda _
              (chdir "ports/unix")
              ;; see: https://github.com/micropython/micropython/pull/4246
-- 
cgit v1.2.3


From 74781c65f3d5294ea7da12366bf0fd22b08b381b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 8 Sep 2019 14:04:50 +0200
Subject: gnu: guix: Update to cc98b00.

* gnu/packages/package-management.scm (guix): Update to cc98b00.
(guix-daemon)[arguments]: Remove 'install' phase; add
'change-default-guix' phase.
---
 gnu/packages/package-management.scm | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index b712bd7ec9..32836331f6 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -123,8 +123,8 @@
   ;; Note: the 'update-guix-package.scm' script expects this definition to
   ;; start precisely like this.
   (let ((version "1.0.1")
-        (commit "c902458863d1d341ffd74970b75e69c2bb848183")
-        (revision 4))
+        (commit "cc98b00857e29074de96a6ed60e325cdfffaea1a")
+        (revision 5))
     (package
       (name "guix")
 
@@ -140,7 +140,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "0w93qjgy9n0qqyij12s7hm7fl4wb6h99bmfril4cqf4ynckpdvbb"))
+                  "0r5v4a0lyvn97gvp1q6algpw91k77r36vlnxx8w4s0c6r767b6z3"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
@@ -355,6 +355,19 @@ the Nix package manager.")
         #f)
        ((#:phases phases '%standard-phases)
         `(modify-phases ,phases
+           (add-after 'unpack 'change-default-guix
+             (lambda _
+               ;; We need to tell 'guix-daemon' which 'guix' command to use.
+               ;; Here we use a questionable hack where we hard-code root's
+               ;; current guix, which could be wrong (XXX).  Note that scripts
+               ;; like 'guix perform-download' do not run as root so we assume
+               ;; that they have access to /var/guix/profiles/per-user/root.
+               (substitute* "nix/libstore/globals.cc"
+                 (("guixProgram = (.*)nixBinDir + \"/guix\"" _ before)
+                  (string-append "guixProgram = " before
+                                 "/var/guix/profiles/per-user/root\
+/current-guix/bin/guix")))
+               #t))
            (replace 'build
              (lambda _
                (invoke "make" "nix/libstore/schema.sql.hh")
@@ -364,19 +377,7 @@ the Nix package manager.")
            (delete 'copy-bootstrap-guile)
            (replace 'install
              (lambda* (#:key outputs #:allow-other-keys)
-               (invoke "make" "install-binPROGRAMS"
-                       "install-nodist_pkglibexecSCRIPTS")
-
-               ;; We need to tell 'guix-daemon' which 'guix' command to use.
-               ;; Here we use a questionable hack where we hard-code root's
-               ;; current guix, which could be wrong (XXX).  Note that scripts
-               ;; like 'guix perform-download' do not run as root so we assume
-               ;; that they have access to /var/guix/profiles/per-user/root.
-               (let ((out (assoc-ref outputs "out")))
-                 (substitute* (find-files (string-append out "/libexec"))
-                   (("exec \".*/bin/guix\"")
-                    "exec \"${GUIX:-/var/guix/profiles/per-user/root/current-guix/bin/guix}\""))
-                 #t)))
+               (invoke "make" "install-binPROGRAMS")))
            (delete 'wrap-program)))))))
 
 (define-public guile2.0-guix
-- 
cgit v1.2.3


From 45151bcb94b4ae943551ab444d8006c21f6cd69b Mon Sep 17 00:00:00 2001
From: Andrew Miloradovsky 
Date: Thu, 5 Sep 2019 12:30:44 +0300
Subject: gnu: Add libraft
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/cluster.scm (libraft): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/cluster.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index 3608d67bed..3a81194cc5 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Sou Bunnbu 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2019 Andrew Miloradovsky 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +23,8 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages sphinx)
@@ -79,3 +82,34 @@ Server (@dfn{IPVS}) kernel module.  High availability is achieved by the Virtual
 Redundancy Routing Protocol (@dfn{VRRP}).  Each Keepalived framework can be used
 independently or together to provide resilient infrastructures.")
     (license license:gpl2+)))
+
+(define-public libraft
+  (package
+    (name "libraft")
+    (version "0.9.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/canonical/raft/archive/v"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0zd8nnmsszvsrwvybcg783y705z4xik9pi0mb6gb6ii58qq2b3hz"))))
+    (arguments '(#:configure-flags '("--disable-uv")))
+    ;; The uv plugin tests fail, if libuv (or the example) is enabled,
+    ;; because setting up the environment requires too much privileges.
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gettext-minimal)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
+    (build-system gnu-build-system)
+    (home-page "https://github.com/canonical/raft")
+    (synopsis "C implementation of the Raft consensus protocol")
+    (description "The library has modular design: its core part implements only
+the core Raft algorithm logic, in a fully platform independent way.  On top of
+that, a pluggable interface defines the I/O implementation for networking
+(send/receive RPC messages) and disk persistence (store log entries and
+snapshots).")
+    (license license:asl2.0)))
-- 
cgit v1.2.3


From befac35876712fce847fd763caf3240c54f495f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 8 Sep 2019 14:19:25 +0200
Subject: gnu: libraft: Fetch source from Git.

* gnu/packages/cluster.scm (libraft)[source]: Switch to GIT-FETCH.
---
 gnu/packages/cluster.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index 3a81194cc5..8b99a21356 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -22,6 +22,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages gettext)
@@ -87,14 +88,15 @@ independently or together to provide resilient infrastructures.")
   (package
     (name "libraft")
     (version "0.9.5")
+    (home-page "https://github.com/canonical/raft")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/canonical/raft/archive/v"
-                    version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference (url home-page)
+                                  (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0zd8nnmsszvsrwvybcg783y705z4xik9pi0mb6gb6ii58qq2b3hz"))))
+                "1q49f5mmv6nr6dxhnp044xwc6jlczgh0nj0bl6718wiqh28411x0"))))
     (arguments '(#:configure-flags '("--disable-uv")))
     ;; The uv plugin tests fail, if libuv (or the example) is enabled,
     ;; because setting up the environment requires too much privileges.
@@ -105,7 +107,6 @@ independently or together to provide resilient infrastructures.")
        ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
     (build-system gnu-build-system)
-    (home-page "https://github.com/canonical/raft")
     (synopsis "C implementation of the Raft consensus protocol")
     (description "The library has modular design: its core part implements only
 the core Raft algorithm logic, in a fully platform independent way.  On top of
-- 
cgit v1.2.3


From 2a6f5190cfe958455f7f98a8cf984c673a985d27 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Sun, 18 Aug 2019 23:27:34 +0200
Subject: gnu: tumbler: Fix pdf thumbnailer.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (tumbler)[inputs]: Add cairo.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 0487c24b68..82dc12322f 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -283,6 +283,7 @@ merging features essential for loading menus modified with menu editors.")
     (inputs
      `(("dbus" ,dbus)
        ("gdk-pixbuf" ,gdk-pixbuf)
+       ("cairo" ,cairo) ;; Needed for pdf thumbnails (poppler-glibc.pc)
        ("freetype" ,freetype)
        ("libjpeg" ,libjpeg)
        ("libgsf" ,libgsf)
-- 
cgit v1.2.3


From 2bb29718836f29d4dddc8494d6c3fa6ad6c2840e Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 19 Aug 2019 01:02:49 +0200
Subject: gnu: tumbler: Remove unused gstreamer.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (tumbler)[inputs]: Remove gstreamer.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 82dc12322f..5ec2cb8193 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -288,7 +288,9 @@ merging features essential for loading menus modified with menu editors.")
        ("libjpeg" ,libjpeg)
        ("libgsf" ,libgsf)
        ("poppler" ,poppler)
-       ("gstreamer" ,gstreamer)))
+       ;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
+       ;; ("gstreamer" ,gstreamer)
+       ))
     (home-page "https://www.xfce.org/")
     (synopsis "D-Bus service for applications to request thumbnails")
     (description
-- 
cgit v1.2.3


From 982a94e97eff85b053558fac7c0442726a091f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 8 Sep 2019 14:29:27 +0200
Subject: import: github: Fix incorrect no-release case.

This is a followup to 81c3dc32244a17241d74eea9fa265edfcb326f6d.

Since that commit, when /releases returned an empty JSON array, we would
not fall back to /tags because of the incorrect match.

* guix/import/github.scm (fetch-releases-or-tags): Match the empty
vector instead of the empty list.
---
 guix/import/github.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/import/github.scm b/guix/import/github.scm
index 55e1f72a42..55ea00a111 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -161,7 +161,7 @@ empty list."
         url))
 
   (match (json-fetch (decorate release-url) #:headers headers)
-    (()
+    (#()
      ;; We got the empty list, presumably because the user didn't use GitHub's
      ;; "release" mechanism, but hopefully they did use Git tags.
      (json-fetch (decorate tag-url) #:headers headers))
-- 
cgit v1.2.3


From 3426c0e531823f14825f0777923146ef2869d210 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 2 Sep 2019 16:10:39 +0200
Subject: gnu: thunar-volman: Update to 0.9.5.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (thunar-volman): Update to 0.9.5.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5ec2cb8193..bf732c82be 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -673,7 +673,7 @@ fast.")
 (define-public thunar-volman
   (package
     (name "thunar-volman")
-    (version "0.9.3")
+    (version "0.9.5")
     (source
      (origin
        (method url-fetch)
@@ -681,7 +681,7 @@ fast.")
                            (version-major+minor version) "/"
                            "thunar-volman-" version ".tar.bz2"))
        (sha256
-        (base32 "1sfmz40164rg77hclrkrgnbk8cb7f325qqi7lz2hh3wbvf8r0c19"))))
+        (base32 "0dqqkbhn43hhmhqyx1fnmawpvysdjzw6ln4ryf629wil6dlwd9vy"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From 861b9a365b2a56d70012c9b573b1a3d953601257 Mon Sep 17 00:00:00 2001
From: Matthew Kraai 
Date: Sat, 7 Sep 2019 17:59:32 -0700
Subject: doc: Fix verb conjugation.

* doc/guix.texi (Invoking guix pull): Change "run" to "ran".

Signed-off-by: Tobias Geerinckx-Rice 
---
 doc/guix.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 31f7890fe9..51429d8964 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3624,7 +3624,7 @@ version.  New @command{guix} sub-commands added by the update also
 become available.
 
 Any user can update their Guix copy using @command{guix pull}, and the
-effect is limited to the user who run @command{guix pull}.  For
+effect is limited to the user who ran @command{guix pull}.  For
 instance, when user @code{root} runs @command{guix pull}, this has no
 effect on the version of Guix that user @code{alice} sees, and vice
 versa.
-- 
cgit v1.2.3


From 08b4a10fa6bc535cd99d65f0233dd027153878eb Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 3 Sep 2019 00:42:24 +0900
Subject: services: ntp: Allow large adjustment by default.

This is documented as best practice in `man ntpd', and is required to allow
the date to be set correctly when traveling (without having to manually update
the hardware clock in the BIOS/UEFI).

* gnu/services/networking.scm ()[allow-large-adjustment?]: Set the
default value to #t.
* doc/guix.texi (Networking Services): Update documentation.
---
 doc/guix.texi               | 2 +-
 gnu/services/networking.scm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 51429d8964..fdfcdde258 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13050,7 +13050,7 @@ This is the data type for the NTP service configuration.
 This is the list of servers (host names) with which @command{ntpd} will be
 synchronized.
 
-@item @code{allow-large-adjustment?} (default: @code{#f})
+@item @code{allow-large-adjustment?} (default: @code{#t})
 This determines whether @command{ntpd} is allowed to make an initial
 adjustment of more than 1,000 seconds.
 
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 376b4ccc4e..e149fe0b69 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -315,7 +315,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
   (servers  ntp-configuration-servers
             (default %ntp-servers))
   (allow-large-adjustment? ntp-allow-large-adjustment?
-                           (default #f)))
+                           (default #t))) ;as recommended in the ntpd manual
 
 (define ntp-shepherd-service
   (match-lambda
-- 
cgit v1.2.3


From d4de2f9ea43d670645f5b8fabf2d1e2a65639191 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 3 Sep 2019 10:05:06 +0900
Subject: services: ntp: Fix KOD warning.

Otherwise the following messages would be printed by ntpd:

Sep  2 05:18:21 localhost ntpd[15849]: restrict default: KOD does nothing without LIMITE.
Sep  2 05:18:21 localhost ntpd[15849]: restrict ::: KOD does nothing without LIMITED.

Debian uses the same set of "restrict" keywords (see:
https://sources.debian.org/src/ntp/1:4.2.8p13+dfsg-2/debian/ntp.conf).

* gnu/services/networking.scm (ntp-shepherd-service): Add the 'limited'
keyword to both the IPv4 and IPv6 'restrict' directives.
---
 gnu/services/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index e149fe0b69..13a5c6c98d 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -330,8 +330,8 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
                         "
 # Disable status queries as a workaround for CVE-2013-5211:
 # .
-restrict default kod nomodify notrap nopeer noquery
-restrict -6 default kod nomodify notrap nopeer noquery
+restrict default kod nomodify notrap nopeer noquery limited
+restrict -6 default kod nomodify notrap nopeer noquery limited
 
 # Yet, allow use of the local 'ntpq'.
 restrict 127.0.0.1
-- 
cgit v1.2.3


From ac73f504cf997559869f67a6c308cf3b19d253ea Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 3 Sep 2019 10:13:26 +0900
Subject: doc: Add index to find 'ntpd'.

* doc/guix.texi (Networking Services): Add @cindex to find 'ntpd'
---
 doc/guix.texi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index fdfcdde258..84f2c1558a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13032,6 +13032,7 @@ objects}).
 @end deftp
 
 @cindex NTP (Network Time Protocol), service
+@cindex ntpd, service for the Network Time Protocol daemon
 @cindex real time clock
 @defvr {Scheme Variable} ntp-service-type
 This is the type of the service running the @uref{http://www.ntp.org,
-- 
cgit v1.2.3


From 5658ae8a0ad5d988765944b7e783b2bdc23a7f48 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 3 Sep 2019 10:14:59 +0900
Subject: services: ntp: Support different NTP server types and options.

* gnu/services/networking.scm (ntp-server-types): New enum.
(): New record type.
(ntp-server->string): New procedure.
(%ntp-servers): Define in terms of  records.  Use the first
entrypoint server as a pool instead of a list of static servers.  This is more
resilient since a new server of the pool can be interrogated on every
request.  Add the 'iburst' options.
(ntp-configuration-servers): Define a custom accessor that warns but honors
the now deprecated server format.
(): Use it.
(%openntpd-servers): New variable,
(): Use it, as a pool ('servers' field) instead of a
regular server.
* tests/networking.scm: New file.
* Makefile.am (SCM_TESTS): Register it.
* doc/guix.texi: Update documentation.
---
 Makefile.am                 |   1 +
 doc/guix.texi               |  42 +++++++++++++++--
 gnu/services/networking.scm | 108 ++++++++++++++++++++++++++++++++++++--------
 tests/networking.scm        |  50 ++++++++++++++++++++
 4 files changed, 178 insertions(+), 23 deletions(-)
 create mode 100644 tests/networking.scm

diff --git a/Makefile.am b/Makefile.am
index 796e96f099..683b2242f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -402,6 +402,7 @@ SCM_TESTS =					\
   tests/modules.scm				\
   tests/monads.scm				\
   tests/nar.scm				\
+  tests/networking.scm				\
   tests/opam.scm				\
   tests/packages.scm				\
   tests/pack.scm				\
diff --git a/doc/guix.texi b/doc/guix.texi
index 84f2c1558a..9101aafda1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -48,7 +48,7 @@ Copyright @copyright{} 2017 humanitiesNerd@*
 Copyright @copyright{} 2017 Christopher Allan Webber@*
 Copyright @copyright{} 2017, 2018 Marius Bakke@*
 Copyright @copyright{} 2017 Hartmut Goebel@*
-Copyright @copyright{} 2017 Maxim Cournoyer@*
+Copyright @copyright{} 2017, 2019 Maxim Cournoyer@*
 Copyright @copyright{} 2017, 2018, 2019 Tobias Geerinckx-Rice@*
 Copyright @copyright{} 2017 George Clemmer@*
 Copyright @copyright{} 2017 Andy Wingo@*
@@ -13048,8 +13048,9 @@ This is the data type for the NTP service configuration.
 
 @table @asis
 @item @code{servers} (default: @code{%ntp-servers})
-This is the list of servers (host names) with which @command{ntpd} will be
-synchronized.
+This is the list of servers (@code{} records) with which
+@command{ntpd} will be synchronized.  See the @code{ntp-server} data type
+definition below.
 
 @item @code{allow-large-adjustment?} (default: @code{#t})
 This determines whether @command{ntpd} is allowed to make an initial
@@ -13065,6 +13066,32 @@ List of host names used as the default NTP servers.  These are servers of the
 @uref{https://www.ntppool.org/en/, NTP Pool Project}.
 @end defvr
 
+@deftp {Data Type} ntp-server
+The data type representing the configuration of a NTP server.
+
+@table @asis
+@item @code{type} (default: @code{'server})
+The type of the NTP server, given as a symbol. One of @code{'pool},
+@code{'server}, @code{'peer}, @code{'broadcast} or @code{'manycastclient}.
+
+@item @code{address}
+The address of the server, as a string.
+
+@item @code{options}
+NTPD options to use with that specific server, given as a list of option names
+and/or of option names and values tuples. The following example define a server
+to use with the options @option{iburst} and @option{prefer}, as well as
+@option{version} 3 and a @option{maxpoll} time of 16 seconds.
+
+@example
+(ntp-server
+ (type 'server)
+ (address "some.ntp.server.org")
+ (options `(iburst (version 3) (maxpoll 16) prefer))))
+@end example
+@end table
+@end deftp
+
 @cindex OpenNTPD
 @deffn {Scheme Procedure} openntpd-service-type
 Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as implemented
@@ -13084,6 +13111,11 @@ clock synchronized with that of the given servers.
 @end lisp
 @end deffn
 
+@defvr {Scheme Variable} %openntpd-servers
+This variable is a list of the server addresses defined in
+@var{%ntp-servers}.
+@end defvr
+
 @deftp {Data Type} openntpd-configuration
 @table @asis
 @item @code{openntpd} (default: @code{(file-append openntpd "/sbin/ntpd")})
@@ -13097,9 +13129,9 @@ Specify a list of timedelta sensor devices ntpd should use.  @code{ntpd}
 will listen to each sensor that actually exists and ignore non-existent ones.
 See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more
 information.
-@item @code{server} (default: @var{%ntp-servers})
+@item @code{server} (default: @code{'()})
 Specify a list of IP addresses or hostnames of NTP servers to synchronize to.
-@item @code{servers} (default: @code{'()})
+@item @code{servers} (default: @var{%openntp-servers})
 Specify a list of IP addresses or hostnames of NTP pools to synchronize to.
 @item @code{constraint-from} (default: @code{'()})
 @code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers via TLS.
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 13a5c6c98d..c45bfcdad9 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -51,6 +51,7 @@
   #:use-module (guix records)
   #:use-module (guix modules)
   #:use-module (guix deprecation)
+  #:use-module (rnrs enums)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-26)
@@ -72,13 +73,22 @@
             dhcpd-configuration-pid-file
             dhcpd-configuration-interfaces
 
-            %ntp-servers
-
             ntp-configuration
             ntp-configuration?
+            ntp-configuration-ntp
+            ntp-configuration-servers
+            ntp-allow-large-adjustment?
+
+            %ntp-servers
+            ntp-server
+            ntp-server-type
+            ntp-server-address
+            ntp-server-options
+
             ntp-service
             ntp-service-type
 
+            %openntpd-servers
             openntpd-configuration
             openntpd-configuration?
             openntpd-service-type
@@ -292,31 +302,87 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
     (list (service-extension shepherd-root-service-type dhcpd-shepherd-service)
           (service-extension activation-service-type dhcpd-activation)))))
 
-(define %ntp-servers
-  ;; Default set of NTP servers. These URLs are managed by the NTP Pool project.
-  ;; Within Guix, Leo Famulari  is the administrative contact
-  ;; for this NTP pool "zone".
-  '("0.guix.pool.ntp.org"
-    "1.guix.pool.ntp.org"
-    "2.guix.pool.ntp.org"
-    "3.guix.pool.ntp.org"))
-
 
 ;;;
 ;;; NTP.
 ;;;
 
-;; TODO: Export.
+(define ntp-server-types (make-enumeration
+                          '(pool
+                            server
+                            peer
+                            broadcast
+                            manycastclient)))
+
+(define-record-type* 
+  ntp-server make-ntp-server
+  ntp-server?
+  ;; The type can be one of the symbols of the NTP-SERVER-TYPE? enumeration.
+  (type ntp-server-type
+        (default 'server))
+  (address ntp-server-address)    ; a string
+  ;; The list of options can contain single option names or tuples in the form
+  ;; '(name value).
+  (options ntp-server-options
+           (default '())))
+
+(define (ntp-server->string ntp-server)
+  ;; Serialize the NTP server object as a string, ready to use in the NTP
+  ;; configuration file.
+  (define (flatten lst)
+    (reverse
+     (let loop ((x lst)
+                (res '()))
+       (if (list? x)
+           (fold loop res x)
+           (cons (format #f "~s" x) res)))))
+
+  (match ntp-server
+    (($  type address options)
+     ;; XXX: It'd be neater if fields were validated at the syntax level (for
+     ;; static ones at least).  Perhaps the Guix record type could support a
+     ;; predicate property on a field?
+     (unless (enum-set-member? type ntp-server-types)
+       (error "Invalid NTP server type" type))
+     (string-join (cons* (symbol->string type)
+                         address
+                         (flatten options))))))
+
+(define %ntp-servers
+  ;; Default set of NTP servers. These URLs are managed by the NTP Pool project.
+  ;; Within Guix, Leo Famulari  is the administrative contact
+  ;; for this NTP pool "zone".
+  (list
+   (ntp-server
+    (type 'pool)
+    (address "0.guix.pool.ntp.org")
+    (options '("iburst")))))               ;as recommended in the ntpd manual
+
 (define-record-type* 
   ntp-configuration make-ntp-configuration
   ntp-configuration?
   (ntp      ntp-configuration-ntp
             (default ntp))
-  (servers  ntp-configuration-servers
+  (servers  %ntp-configuration-servers   ;list of  objects
             (default %ntp-servers))
   (allow-large-adjustment? ntp-allow-large-adjustment?
                            (default #t))) ;as recommended in the ntpd manual
 
+(define (ntp-configuration-servers ntp-configuration)
+  ;; A wrapper to support the deprecated form of this field.
+  (let ((ntp-servers (%ntp-configuration-servers ntp-configuration)))
+    (match ntp-servers
+      (((? string?) (? string?) ...)
+       (format (current-error-port) "warning: Defining NTP servers as strings is \
+deprecated.  Please use  records instead.\n")
+       (map (lambda (addr)
+              (ntp-server
+               (type 'server)
+               (address addr)
+               (options '()))) ntp-servers))
+      ((($ ) ($ ) ...)
+       ntp-servers))))
+
 (define ntp-shepherd-service
   (match-lambda
     (($  ntp servers allow-large-adjustment?)
@@ -324,8 +390,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
        ;; TODO: Add authentication support.
        (define config
          (string-append "driftfile /var/run/ntpd/ntp.drift\n"
-                        (string-join (map (cut string-append "server " <>)
-                                          servers)
+                        (string-join (map ntp-server->string servers)
                                      "\n")
                         "
 # Disable status queries as a workaround for CVE-2013-5211:
@@ -335,7 +400,11 @@ restrict -6 default kod nomodify notrap nopeer noquery limited
 
 # Yet, allow use of the local 'ntpq'.
 restrict 127.0.0.1
-restrict -6 ::1\n"))
+restrict -6 ::1
+
+# This is required to use servers from a pool directive when using the 'nopeer'
+# option by default, as documented in the 'ntp.conf' manual.
+restrict source notrap nomodify noquery\n"))
 
        (define ntpd.conf
          (plain-file "ntpd.conf" config))
@@ -409,6 +478,9 @@ make an initial adjustment of more than 1,000 seconds."
 ;;; OpenNTPD.
 ;;;
 
+(define %openntpd-servers
+  (map ntp-server-address %ntp-servers))
+
 (define-record-type* 
   openntpd-configuration make-openntpd-configuration
   openntpd-configuration?
@@ -422,9 +494,9 @@ make an initial adjustment of more than 1,000 seconds."
   (sensor                  openntpd-sensor
                            (default '()))
   (server                  openntpd-server
-                           (default %ntp-servers))
-  (servers                 openntpd-servers
                            (default '()))
+  (servers                 openntpd-servers
+                           (default %openntpd-servers))
   (constraint-from         openntpd-constraint-from
                            (default '()))
   (constraints-from        openntpd-constraints-from
diff --git a/tests/networking.scm b/tests/networking.scm
new file mode 100644
index 0000000000..001d7df74d
--- /dev/null
+++ b/tests/networking.scm
@@ -0,0 +1,50 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Maxim Cournoyer 
+;;;
+;;; 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 .
+
+(define-module (tests networking)
+  #:use-module (gnu services networking)
+  #:use-module (srfi srfi-64))
+
+;;; Tests for the (gnu services networking) module.
+
+(define ntp-server->string (@@ (gnu services networking) ntp-server->string))
+
+(define %ntp-server-sample
+  (ntp-server
+   (type 'server)
+   (address "some.ntp.server.org")
+   (options `(iburst (version 3) (maxpoll 16) prefer))))
+
+(test-begin "networking")
+
+(test-equal "ntp-server->string"
+  (ntp-server->string %ntp-server-sample)
+  "server some.ntp.server.org iburst version 3 maxpoll 16 prefer")
+
+(test-equal "ntp configuration servers deprecated form"
+  (ntp-configuration-servers
+   (ntp-configuration
+    (servers (list (ntp-server
+                    (type 'server)
+                    (address "example.pool.ntp.org")
+                    (options '()))))))
+  (ntp-configuration-servers
+   (ntp-configuration
+    (servers (list "example.pool.ntp.org")))))
+
+(test-end "networking")
-- 
cgit v1.2.3


From f92cf9d356e5584b073a626bcb27ffb5ed7f99a7 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Fri, 6 Sep 2019 18:52:51 +0900
Subject: gnu: openntpd: Fix error CA errors when using constraints.

The error printed by nttpd was "constraint: failed to load constraint ca" when
libressl tried loading the file /etc/ssl/cert.pem.  The problem was
investigated as part of fixing issue 37318 (see:
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37318).

* gnu/packages/ntp.scm (openntpd)[configure-flags]: Use the '--with-cacert'
flag to specify the location of the certificate authority file of libressl.
---
 gnu/packages/ntp.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 419b6d7321..6942ecec2f 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015, 2018 Ludovic Courtès 
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2019 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -108,8 +109,11 @@ computers over a network.")
                 "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--with-privsep-user=ntpd"
-                           "--localstatedir=/var")
+     '(#:configure-flags `( "--with-privsep-user=ntpd"
+                            "--localstatedir=/var"
+                            ,(string-append "--with-cacert="
+                                            (assoc-ref %build-inputs "libressl")
+                                            "/etc/ssl/cert.pem"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'modify-install-locations
-- 
cgit v1.2.3


From afd39a76e26a8ad6d77e65b7316b912fd8dbb623 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Fri, 6 Sep 2019 21:12:26 +0900
Subject: services: openntpd: Remove useless let.

* gnu/services/networking.scm (openntpd-shepherd-service): Remove useless let.
---
 gnu/services/networking.scm | 68 ++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index c45bfcdad9..dd2f9e29e2 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -508,41 +508,41 @@ make an initial adjustment of more than 1,000 seconds."
   (match-record config 
     (openntpd listen-on query-from sensor server servers constraint-from
               constraints-from allow-large-adjustment?)
-    (let ()
-      (define config
-        (string-join
-          (filter-map
-            (lambda (field value)
-              (string-join
-                (map (cut string-append field <> "\n")
-                     value)))
-            '("listen on " "query from " "sensor " "server " "servers "
-              "constraint from ")
-            (list listen-on query-from sensor server servers constraint-from))
-          ;; The 'constraints from' field needs to be enclosed in double quotes.
-          (string-join
-            (map (cut string-append "constraints from \"" <> "\"\n")
-                 constraints-from))))
-
-      (define ntpd.conf
-        (plain-file "ntpd.conf" config))
 
-      (list (shepherd-service
-              (provision '(ntpd))
-              (documentation "Run the Network Time Protocol (NTP) daemon.")
-              (requirement '(user-processes networking))
-              (start #~(make-forkexec-constructor
-                         (list (string-append #$openntpd "/sbin/ntpd")
-                               "-f" #$ntpd.conf
-                               "-d" ;; don't daemonize
-                               #$@(if allow-large-adjustment?
-                                    '("-s")
-                                    '()))
-                         ;; When ntpd is daemonized it repeatedly tries to respawn
-                         ;; while running, leading shepherd to disable it.  To
-                         ;; prevent spamming stderr, redirect output to logfile.
-                         #:log-file "/var/log/ntpd"))
-              (stop #~(make-kill-destructor)))))))
+    (define config
+      (string-join
+       (filter-map
+        (lambda (field value)
+          (string-join
+           (map (cut string-append field <> "\n")
+                value)))
+        '("listen on " "query from " "sensor " "server " "servers "
+          "constraint from ")
+        (list listen-on query-from sensor server servers constraint-from))
+       ;; The 'constraints from' field needs to be enclosed in double quotes.
+       (string-join
+        (map (cut string-append "constraints from \"" <> "\"\n")
+             constraints-from))))
+
+    (define ntpd.conf
+      (plain-file "ntpd.conf" config))
+
+    (list (shepherd-service
+           (provision '(ntpd))
+           (documentation "Run the Network Time Protocol (NTP) daemon.")
+           (requirement '(user-processes networking))
+           (start #~(make-forkexec-constructor
+                     (list (string-append #$openntpd "/sbin/ntpd")
+                           "-f" #$ntpd.conf
+                           "-d" ;; don't daemonize
+                           #$@(if allow-large-adjustment?
+                                  '("-s")
+                                  '()))
+                     ;; When ntpd is daemonized it repeatedly tries to respawn
+                     ;; while running, leading shepherd to disable it.  To
+                     ;; prevent spamming stderr, redirect output to logfile.
+                     #:log-file "/var/log/ntpd"))
+           (stop #~(make-kill-destructor))))))
 
 (define (openntpd-service-activation config)
   "Return the activation gexp for CONFIG."
-- 
cgit v1.2.3


From 2625abc6aa5df66a6503e906b7592691452954f5 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Sat, 7 Sep 2019 09:24:43 +0900
Subject: services: openntpd: Add test for issue #3731.

See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37318.

* gnu/services/networking.scm (openntpd-configuration->string): New procedure,
extracted from top of the `openntpd-shepherd-service' to make it testable.
(openntpd-shepherd-service): Adapt following the move of the code to the above
procedure.
* tests/networking.scm: Add a test for the `openntpd-configuration->string'
procedure.
---
 gnu/services/networking.scm | 40 ++++++++++++++-------------
 tests/networking.scm        | 67 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index dd2f9e29e2..432f3a80ee 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -504,28 +504,30 @@ make an initial adjustment of more than 1,000 seconds."
   (allow-large-adjustment? openntpd-allow-large-adjustment?
                            (default #f))) ; upstream default
 
-(define (openntpd-shepherd-service config)
+(define (openntpd-configuration->string config)
   (match-record config 
-    (openntpd listen-on query-from sensor server servers constraint-from
-              constraints-from allow-large-adjustment?)
-
-    (define config
-      (string-join
-       (filter-map
-        (lambda (field value)
-          (string-join
-           (map (cut string-append field <> "\n")
-                value)))
-        '("listen on " "query from " "sensor " "server " "servers "
-          "constraint from ")
-        (list listen-on query-from sensor server servers constraint-from))
-       ;; The 'constraints from' field needs to be enclosed in double quotes.
-       (string-join
-        (map (cut string-append "constraints from \"" <> "\"\n")
-             constraints-from))))
+    (listen-on query-from sensor server servers constraint-from
+               constraints-from)
+    (string-join
+     (filter-map
+      (lambda (field value)
+        (string-join
+         (map (cut string-append field <> "\n")
+              value)))
+      '("listen on " "query from " "sensor " "server " "servers "
+        "constraint from ")
+      (list listen-on query-from sensor server servers constraint-from))
+     ;; The 'constraints from' field needs to be enclosed in double quotes.
+     (string-join
+      (map (cut string-append "constraints from \"" <> "\"\n")
+           constraints-from)))))
+
+(define (openntpd-shepherd-service config)
+  (let ((openntpd (openntpd-configuration-openntpd config))
+        (allow-large-adjustment? (openntpd-allow-large-adjustment? config)))
 
     (define ntpd.conf
-      (plain-file "ntpd.conf" config))
+      (plain-file "ntpd.conf" (openntpd-configuration->string config)))
 
     (list (shepherd-service
            (provision '(ntpd))
diff --git a/tests/networking.scm b/tests/networking.scm
index 001d7df74d..439cca5ffc 100644
--- a/tests/networking.scm
+++ b/tests/networking.scm
@@ -17,11 +17,19 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (tests networking)
+  #:use-module (ice-9 regex)
   #:use-module (gnu services networking)
   #:use-module (srfi srfi-64))
 
 ;;; Tests for the (gnu services networking) module.
 
+(test-begin "networking")
+
+
+;;;
+;;; NTP.
+;;;
+
 (define ntp-server->string (@@ (gnu services networking) ntp-server->string))
 
 (define %ntp-server-sample
@@ -30,8 +38,6 @@
    (address "some.ntp.server.org")
    (options `(iburst (version 3) (maxpoll 16) prefer))))
 
-(test-begin "networking")
-
 (test-equal "ntp-server->string"
   (ntp-server->string %ntp-server-sample)
   "server some.ntp.server.org iburst version 3 maxpoll 16 prefer")
@@ -47,4 +53,61 @@
    (ntp-configuration
     (servers (list "example.pool.ntp.org")))))
 
+
+;;;
+;;; OpenNTPD
+;;;
+
+(define openntpd-configuration->string (@@ (gnu services networking)
+                                           openntpd-configuration->string))
+
+(define %openntpd-conf-sample
+  (openntpd-configuration
+   (server '("0.guix.pool.ntp.org" "1.guix.pool.ntp.org"))
+   (listen-on '("127.0.0.1" "::1"))
+   (sensor '("udcf0 correction 70000"))
+   (constraint-from '("www.gnu.org"))
+   (constraints-from '("https://www.google.com/"))
+   (allow-large-adjustment? #t)))
+
+(test-assert "openntpd configuration generation sanity check"
+
+  (begin
+    (define (string-match/newline pattern text)
+      (regexp-exec (make-regexp pattern regexp/newline) text))
+
+    (define (match-count pattern text)
+      (fold-matches (make-regexp pattern regexp/newline) text 0
+                    (lambda (match count)
+                      (1+ count))))
+
+    (let ((config (openntpd-configuration->string %openntpd-conf-sample)))
+      (if (not
+           (and (string-match/newline "^listen on 127.0.0.1$" config)
+                (string-match/newline "^listen on ::1$" config)
+                (string-match/newline "^sensor udcf0 correction 70000$" config)
+                (string-match/newline "^constraint from www.gnu.org$" config)
+                (string-match/newline "^server 0.guix.pool.ntp.org$" config)
+                (string-match/newline
+                 "^constraints from \"https://www.google.com/\"$"
+                 config)
+
+                ;; Check for issue #3731 (see:
+                ;; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37318).
+                (= (match-count "^listen on " config) 2)
+                (= (match-count "^sensor " config) 1)
+                (= (match-count "^constraint from " config) 1)
+                (= (match-count "^server " config) 2)
+                (= (match-count "^constraints from " config) 1)))
+          (begin
+            (format #t "The configuration below failed \
+the sanity check:\n~a~%" config)
+            #f)
+          #t))))
+
+(test-equal "openntpd generated config string ends with a newline"
+  (let ((config (openntpd-configuration->string %openntpd-conf-sample)))
+    (string-take-right config 1))
+  "\n")
+
 (test-end "networking")
-- 
cgit v1.2.3


From ccdfae388d61f2263a085a4ddac8cb2919d01531 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Sat, 7 Sep 2019 12:37:37 +0900
Subject: services: openntpd: Fix the config generation code.

This fixes issue #37318 (see: http://bugs.gnu.org/37318).

* gnu/services/networking.scm (openntpd-configuration->string): Rewrite in
order to make the "openntpd configuration generation sanity check" test pass.
---
 gnu/services/networking.scm | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 432f3a80ee..c775242f99 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -505,22 +505,33 @@ make an initial adjustment of more than 1,000 seconds."
                            (default #f))) ; upstream default
 
 (define (openntpd-configuration->string config)
+
+  (define (quote-field? name)
+    (member name '("constraints from")))
+
   (match-record config 
     (listen-on query-from sensor server servers constraint-from
                constraints-from)
-    (string-join
-     (filter-map
-      (lambda (field value)
-        (string-join
-         (map (cut string-append field <> "\n")
-              value)))
-      '("listen on " "query from " "sensor " "server " "servers "
-        "constraint from ")
-      (list listen-on query-from sensor server servers constraint-from))
-     ;; The 'constraints from' field needs to be enclosed in double quotes.
+    (string-append
      (string-join
-      (map (cut string-append "constraints from \"" <> "\"\n")
-           constraints-from)))))
+      (concatenate
+       (filter-map (lambda (field values)
+                     (match values
+                       (() #f)          ;discard entry with filter-map
+                       ((val ...)       ;validate value type
+                        (map (lambda (value)
+                               (if (quote-field? field)
+                                   (format #f "~a \"~a\"" field value)
+                                   (format #f "~a ~a" field value)))
+                             values))))
+                   ;; The entry names.
+                   '("listen on" "query from" "sensor" "server" "servers"
+                     "constraint from" "constraints from")
+                   ;; The corresponding entry values.
+                   (list listen-on query-from sensor server servers
+                         constraint-from constraints-from)))
+      "\n")
+     "\n")))                              ;add a trailing newline
 
 (define (openntpd-shepherd-service config)
   (let ((openntpd (openntpd-configuration-openntpd config))
-- 
cgit v1.2.3


From 8a35e58a27a4d06f2bed7d6a6b106ed6d242555c Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 15:44:05 +0300
Subject: gnu: js-html5shiv: Don't use unstable tarball.

* gnu/packages/javascript.scm (js-html5shiv)[source]: Use 'git-fetch'.
---
 gnu/packages/javascript.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 9e1818dfaf..472fd5e98f 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -194,13 +194,14 @@ Media Queries.")
     (name "js-html5shiv")
     (version "3.7.3")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/aFarkas/html5shiv/"
-                                  "archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/aFarkas/html5shiv")
+                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0inlbpxpqzdyi24lqagzf7l24zxg0y02xcpqs2h4npjscazzw7hg"))))
+                "0y1c5nyq0brl9fjdihhax33vks4s1ij9iv113879sg3zflmgqpd0"))))
     (build-system minify-build-system)
     (home-page "https://github.com/aFarkas/html5shiv")
     (synopsis "Enable HTML5 sectioning elements in legacy browsers")
-- 
cgit v1.2.3


From 16df2914144b56fcc481e1b7837aaf724fdd8d21 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 15:57:50 +0300
Subject: gnu: js-strftime: Don't use unstable tarball.

* gnu/packages/javascript.scm (js-strftime)[source]: Use 'git-fetch'.
---
 gnu/packages/javascript.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 472fd5e98f..ff6878fdf0 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -265,13 +265,14 @@ provided by ES5.  @code{JSONPath} is used to represent the links.")
     (name "js-strftime")
     (version "0.10.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/samsonjs/strftime/"
-                                  "archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url"https://github.com/samsonjs/strftime")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1iya43w7y26y2dp9l4d40bhjc4scb5a9mng5ng5c8hsqr82f1375"))))
+                "131nmlivazwxyba25kh9lda99749fq4xsyin6lzfalaaydviby4p"))))
     (build-system minify-build-system)
     (arguments
      `(#:javascript-files '("strftime.js")))
-- 
cgit v1.2.3


From 778f4430e0d3de0ec8e29926f636aca3ed2709e0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:00:24 +0300
Subject: gnu: js-highlight: Don't use unstable tarball.

* gnu/packages/javascript.scm (js-highlight)[source]: Use 'git-fetch'.
---
 gnu/packages/javascript.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index ff6878fdf0..aa2c17fb68 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -289,13 +289,14 @@ well as some other extensions from Ruby.")
     (name "js-highlight")
     (version "9.12.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/isagalaev/highlight.js/"
-                                  "archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/isagalaev/highlight.js")
+                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1jjn9mj7fwq4zpr6is438bscf03b3q8jkj0k5c3fc6pkmjnhw939"))))
+                "12qz22qjpd6svj58pwgcwg2x2rzhihfdrxg6lgj39nfpaln6dris"))))
     (build-system minify-build-system)
     (arguments
      `(#:javascript-files '("src/highlight.js")))
-- 
cgit v1.2.3


From 4151447897dbc0ea78d192278371afb6b1218b5f Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:02:40 +0300
Subject: gnu: js-selectize: Don't use unstable tarball.

* gnu/packages/javascript.scm (js-selectize)[source]: Use 'git-fetch'.
---
 gnu/packages/javascript.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index aa2c17fb68..ed338c72dd 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -337,13 +337,14 @@ HTML tables with minimal effort.")
     (name "js-selectize")
     (version "0.12.4")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/selectize/selectize.js/"
-                                  "archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/selectize/selectize.js")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0756p49aaz34mw2dx8k1gxf210mngfrri25vkba0j7wihd2af8gn"))))
+                "1l6gdl9v9z0xb1yl81ssaqm067imjbxwbpa76nd0cyrx0jskih22"))))
     (build-system minify-build-system)
     (arguments `(#:javascript-files '("src/selectize.js")))
     (home-page "http://selectize.github.io/selectize.js/")
-- 
cgit v1.2.3


From 3500cb58f86b3966b9bca446f6d51498d112390d Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:03:41 +0300
Subject: gnu: js-selectize: Update to 0.12.6.

* gnu/packages/javascript.scm (js-selectize): Update to 0.12.6.
---
 gnu/packages/javascript.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index ed338c72dd..3b10442e35 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -335,7 +335,7 @@ HTML tables with minimal effort.")
 (define-public js-selectize
   (package
     (name "js-selectize")
-    (version "0.12.4")
+    (version "0.12.6")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -344,7 +344,7 @@ HTML tables with minimal effort.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1l6gdl9v9z0xb1yl81ssaqm067imjbxwbpa76nd0cyrx0jskih22"))))
+                "15gichl8wi6yxag2ps723nxrgyan15976dzsnvw9h9py8sbyyzjn"))))
     (build-system minify-build-system)
     (arguments `(#:javascript-files '("src/selectize.js")))
     (home-page "http://selectize.github.io/selectize.js/")
-- 
cgit v1.2.3


From 2209a4476e58b9fb4e0fe154179fe8d22a1430cb Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:05:28 +0300
Subject: gnu: js-es5-shim: Don't use unstable tarball.

* gnu/packages/javascript.scm (js-es5-shim)[source]: Use 'git-fetch'.
---
 gnu/packages/javascript.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 3b10442e35..da7226e50e 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -359,13 +359,14 @@ navigation; it is useful for tagging, contact lists, etc.")
     (name "js-es5-shim")
     (version "4.5.9")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/es-shims/es5-shim/"
-                                  "archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/es-shims/es5-shim")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0yfndyijz0ykddzprpvfjb2453gzpn528klmwycwbqc1bqd3m1hl"))))
+                "03kp6iinnr8ky298k3cfa5rm2ykqfry1nd65dqaywc3i3fs3h43d"))))
     (build-system minify-build-system)
     (arguments `(#:javascript-files
                  '("es5-sham.js"
-- 
cgit v1.2.3


From 9cf60dec1d4862e52e942e2674e12d1dc3e1f535 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:06:31 +0300
Subject: gnu: js-es5-shim: Update to 4.5.13.

* gnu/packages/javascript.scm (js-es5-shim): Update to 4.5.13.
---
 gnu/packages/javascript.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index da7226e50e..cc0542636c 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -357,7 +357,7 @@ navigation; it is useful for tagging, contact lists, etc.")
 (define-public js-es5-shim
   (package
     (name "js-es5-shim")
-    (version "4.5.9")
+    (version "4.5.13")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -366,7 +366,7 @@ navigation; it is useful for tagging, contact lists, etc.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "03kp6iinnr8ky298k3cfa5rm2ykqfry1nd65dqaywc3i3fs3h43d"))))
+                "142w384fbyllq4yggv173g82lw3wix4jqcg6hkhx1ymq89vvnpmh"))))
     (build-system minify-build-system)
     (arguments `(#:javascript-files
                  '("es5-sham.js"
-- 
cgit v1.2.3


From e452c69aa89b2646c93235e4c4322e9f60040a1b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:08:18 +0300
Subject: gnu: js-filesaver: Don't use unstable tarball.

* gnu/packages/javascript.scm (js-filesaver)[source]: Use 'git-fetch'.
---
 gnu/packages/javascript.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index cc0542636c..da285db0b9 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -386,13 +386,14 @@ means that these shams cause many ES5 methods to silently fail.")
     (name "js-filesaver")
     (version "1.3.8")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/eligrey/FileSaver.js/"
-                                  "archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/eligrey/FileSaver.js")
+                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1rkhfqs5plaj628kzj7qgm5qahy4v7ihygifidqr6g6265mil97h"))))
+                "0gvqk0hnr8fig0n4da7vj7q6z31bcyv52916xz3rbmdj3pgpiv1d"))))
     (build-system minify-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 367d0833c3c4d6828fe47bee5513a8ac78016c3e Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:14:41 +0300
Subject: gnu: js-respond: Use minify-build-system.

* gnu/packages/javascript.scm (js-respond)[build-system]: Use
minify-build-system.
[arguments]: Remove custom builder code.
[native-inputs]: Remove uglify-js, source, gzip, tar.
---
 gnu/packages/javascript.scm | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index da285db0b9..ba0ccddff4 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -151,38 +151,12 @@ be able to view it naturally and easily.")))
               (sha256
                (base32
                 "0ds1ya2a185jp93mdn07159c2x8zczwi960ykrawpp62bwk2n93d"))))
-    (build-system trivial-build-system)
+    (build-system minify-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils)
-                      (ice-9 match)
-                      (ice-9 popen)
-                      (srfi srfi-26))
-         (set-path-environment-variable
-          "PATH" '("bin") (map (match-lambda
-                                 ((_ . input)
-                                  input))
-                               %build-inputs))
-         (let ((install-directory (string-append %output
-                                                 "/share/javascript/respond/")))
-           (invoke "tar" "xvf"
-                   (assoc-ref %build-inputs "source")
-                   "--strip" "1")
-           (mkdir-p install-directory)
-           (let* ((file "src/respond.js")
-                  (installed (string-append install-directory "respond.min.js")))
-             (let ((minified (open-pipe* OPEN_READ "uglify-js" file)))
-               (call-with-output-file installed
-                 (cut dump-port minified <>)))))
-         #t)))
+     `(#:javascript-files '("src/matchmedia.addListener.js"
+                            "src/matchmedia.polyfill.js"
+                            "src/respond.js")))
     (home-page "https://github.com/scottjehl/Respond")
-    (native-inputs
-     `(("uglify-js" ,uglify-js)
-       ("source" ,source)
-       ("gzip" ,gzip)
-       ("tar" ,tar)))
     (synopsis "Polyfill for min/max-width CSS3 Media Queries")
     (description "The goal of this script is to provide a fast and lightweight
 script to enable responsive web designs in browsers that don't support CSS3
-- 
cgit v1.2.3


From 97f6004ca194a764bc7829f1ebdc292ef01f9b2b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 8 Sep 2019 16:12:50 +0300
Subject: gnu: js-respond: Don't use unstable-tarball.

* gnu/packages/javascript.scm (js-respond)[source]: Use 'git-fetch'.
---
 gnu/packages/javascript.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index ba0ccddff4..2390c23c4b 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -144,13 +144,14 @@ be able to view it naturally and easily.")))
     (name "js-respond")
     (version "1.4.2")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/scottjehl/Respond/"
-                                  "archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/scottjehl/Respond")
+                     (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0ds1ya2a185jp93mdn07159c2x8zczwi960ykrawpp62bwk2n93d"))))
+                "00xid731rirc7sdy1gc8qal3v9g0agr2qx15hm4x97l1lcbylyn2"))))
     (build-system minify-build-system)
     (arguments
      `(#:javascript-files '("src/matchmedia.addListener.js"
-- 
cgit v1.2.3


From ba7bd6c62ddaab4d5623fb149b47579e13a9e5f5 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sun, 8 Sep 2019 01:56:53 -0700
Subject: gnu: Add pgpdump.

* gnu/packages/gnupg (pgpdump): New variable.
* gnu/packages/package-management (diffoscope)[native-inputs]: Add pgpdump.
---
 gnu/packages/gnupg.scm              | 28 ++++++++++++++++++++++++++++
 gnu/packages/package-management.scm |  1 +
 2 files changed, 29 insertions(+)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 0d619c6a1d..bc1e3c8720 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -907,6 +907,34 @@ bytes (whether by hand, OCR, QR code, or the like) and paperkey can use
 them to transform your existing public key into a secret key.")
     (license license:gpl2+)))
 
+(define-public pgpdump
+  (package
+    (name "pgpdump")
+    (version "0.33")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.mew.org/~kazu/proj/pgpdump/pgpdump-"
+                           version ".tar.gz"))
+       (sha256
+        (base32 "1j001jra2m89n6cys3n0hs574bipjdzfxhzpnd4jfyv95mqwl7n4"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no make check
+       #:configure-flags (list "--prefix=/")
+       #:make-flags (list "CC=gcc"
+                          (string-append "DESTDIR=" (assoc-ref %outputs "out")))))
+    (inputs
+     `(("zlib" ,zlib)))
+    (home-page "https://www.mew.org/~kazu/proj/pgpdump/en/")
+    (synopsis "PGP packet visualizer")
+    (description "pgpdump displays the sequence of OpenPGP or PGP version 2
+packets from a file.
+
+The output of this command is similar to GnuPG's list packets command,
+however, pgpdump produces more detailed and easier to understand output.")
+    (license license:bsd-3)))
+
 (define-public gpa
   (package
     (name "gpa")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 32836331f6..0d1830c164 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -659,6 +659,7 @@ transactions from C or Python.")
                        ;; no unversioned openjdk available
                        ("openjdk:jdk" ,openjdk12 "jdk")
                        ("openssh" ,openssh)
+                       ("pgpdump" ,pgpdump)
                        ("poppler" ,poppler)
                        ("rpm" ,rpm)
                        ("sng" ,sng)
-- 
cgit v1.2.3


From 0b2ea78173f05c417a9002e52e2b36b139074124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 8 Sep 2019 23:02:00 +0200
Subject: maint: Placate 'assert-no-store-file-names'.

Reported by Vagrant Cascadian .

* Makefile.am (assert-no-store-file-names): Exclude
"binutils-boot-2.20.1a.patch" since it contains a store file name as a
comment.
* gnu/packages/commencement.scm (glibc-mesboot0): Use an ellipsis
instead of an actual store file name in comment.
---
 Makefile.am                   | 1 +
 gnu/packages/commencement.scm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 955e2e8c47..eefce7a3ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -815,6 +815,7 @@ assert-no-store-file-names:
 		 --exclude=guix-manual.pot --exclude=guix-manual.*.po		\
 	     --exclude=guix-prettify.el						\
 	     --exclude=ChangeLog*						\
+	     --exclude=binutils-boot-2.20*.patch				\
 	     -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ;			\
 	then									\
 	  echo "error: store file names embedded in the distribution" >&2 ;	\
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7f67fa6441..fd98c80dc3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -753,7 +753,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                 (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
                 #t)))
           ;; glibc-2.2.5 needs a more classic invocation of configure
-          ;; configure: warning: CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash: invalid host type
+          ;; configure: warning: CONFIG_SHELL=/gnu/store/…-bash-minimal-4.4.12/bin/bash: invalid host type
           (replace 'configure
             (lambda* (#:key configure-flags #:allow-other-keys)
               (format (current-error-port)
-- 
cgit v1.2.3


From 30696ea2b27747e047589527572ef39e60555047 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sun, 8 Sep 2019 13:40:01 -0700
Subject: gnu: diffoscope: Add zip and unzip for test suite.

* gnu/packages/package-management (diffoscope)[native-inputs]: Add zip, unzip.
---
 gnu/packages/package-management.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 0d1830c164..18e8a3853f 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -666,8 +666,10 @@ transactions from C or Python.")
                        ("sqlite" ,sqlite)
                        ("squashfs-tools" ,squashfs-tools)
                        ("tcpdump" ,tcpdump)
+                       ("unzip" ,unzip)
                        ("xxd" ,xxd)
-                       ("xz" ,xz)))
+                       ("xz" ,xz)
+                       ("zip" ,(@ (gnu packages compression) zip))))
       (home-page "https://diffoscope.org/")
       (synopsis "Compare files, archives, and directories in depth")
       (description
-- 
cgit v1.2.3


From a2931b14d3aadad0f1c5f4e881f6c9ed900dbf11 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 8 Sep 2019 02:35:40 +0200
Subject: gnu: bs1770gain: Update to 0.6.0.

* gnu/packages/audio.scm (bs1770gain): Update to 0.6.0.
[source]: Adjust snippet.
---
 gnu/packages/audio.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index d3fd8c8245..df0e5a2868 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3203,24 +3203,27 @@ with support for HD extensions.")
 (define-public bs1770gain
   (package
     (name "bs1770gain")
-    (version "0.5.2")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/"
                            version "/bs1770gain-" version ".tar.gz"))
        (sha256
-        (base32
-         "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"))
+        (base32 "0nnqixvw3x7i22nsr54n4bgm35z9nh3d9qj5s75cfd3ajjsjndyh"))
        (modules '((guix build utils)))
        (snippet
         '(begin
            ;; XXX
-           (substitute* "bs1770gain/bs1770gain.c"
-             (("\"N.*\"") "\"\""))
-           (substitute* "configure"
-             (("URL=.*$")
-              "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html\n"))))))
+           (substitute* "libbg/bgx.c"
+             (("#define BS.* ") "#define BS ")
+             (("BS.*NO?.*N.*S.*E.*N.*SE?") "NO")
+             (("\"( #|N).*\"") "\"\""))
+           (substitute* (list "config.h"
+                              "configure.ac"
+                              "configure")
+             (("https?://bs1770gain[^/]*/")
+              "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html"))))))
     (build-system gnu-build-system)
     (inputs `(("ffmpeg" ,ffmpeg)
               ("sox" ,sox)))
-- 
cgit v1.2.3


From 2777dc7589a8ecdb05574c574ff86e178594b92a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 8 Sep 2019 19:43:40 +0200
Subject: gnu: bs1770gain: Return #t from source snippet.

* gnu/packages/audio.scm (bs1770gain)[source]: Return #t from snippet.
---
 gnu/packages/audio.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index df0e5a2868..4dbbace3e3 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3223,7 +3223,8 @@ with support for HD extensions.")
                               "configure.ac"
                               "configure")
              (("https?://bs1770gain[^/]*/")
-              "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html"))))))
+              "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html"))
+           #t))))
     (build-system gnu-build-system)
     (inputs `(("ffmpeg" ,ffmpeg)
               ("sox" ,sox)))
-- 
cgit v1.2.3


From a9162155975a131afa1e6a44262afbb7af91f7fd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 6 Sep 2019 12:23:57 +0200
Subject: =?UTF-8?q?services:=20Add=20=E2=80=98/usr/bin/env=E2=80=99=20spec?=
 =?UTF-8?q?ial=20file.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/services/base.scm (%base-services): Add ‘/usr/bin/env‘ to
special-files-service-type.
---
 gnu/services/base.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index dcb7278f0f..97c53eeaf3 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus 
 ;;; Copyright © 2018 Mathieu Othacehe 
 ;;; Copyright © 2019 Efraim Flashner 
+;;; Copyright © 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 John Soo 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -41,9 +42,9 @@
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
                 #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools))
-  #:use-module ((gnu packages base)
-                #:select (canonical-package glibc glibc-utf8-locales))
   #:use-module (gnu packages bash)
+  #:use-module ((gnu packages base)
+                #:select (canonical-package coreutils glibc glibc-utf8-locales))
   #:use-module (gnu packages package-management)
   #:use-module ((gnu packages gnupg) #:select (guile-gcrypt))
   #:use-module (gnu packages linux)
@@ -2425,6 +2426,8 @@ to handle."
 
         (service special-files-service-type
                  `(("/bin/sh" ,(file-append (canonical-package bash)
-                                            "/bin/sh"))))))
+                                            "/bin/sh"))
+                   ("/usr/bin/env" ,(file-append (canonical-package coreutils)
+                                                 "/usr/bin/env"))))))
 
 ;;; base.scm ends here
-- 
cgit v1.2.3


From fb8fe1e8d98f94812b54537649ee3b08fd2d6dae Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 8 Sep 2019 02:05:48 +0200
Subject: gnu: glib-networking: Don't use NAME in source URI.

* gnu/packages/gnome.scm (glib-networking)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index efe5206e53..9ee652c304 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2629,7 +2629,7 @@ library.")
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/glib-networking/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "glib-networking-" version ".tar.xz"))
               (sha256
                (base32
                 "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx"))
-- 
cgit v1.2.3


From 6b4bc27a47e032a86dace3e1efb3b038d9d43f35 Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 9 Sep 2019 08:28:52 +0200
Subject: gnu: btrfs-progs: Update to 5.2.2.

* gnu/packages/linux.scm (btrfs-progs): Update to 5.2.2.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 270e2e5dcc..b98c6b984d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3838,7 +3838,7 @@ and copy/paste text in the console and in xterm.")
 (define-public btrfs-progs
   (package
     (name "btrfs-progs")
-    (version "5.2.1")
+    (version "5.2.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kernel.org/linux/kernel/"
@@ -3846,7 +3846,7 @@ and copy/paste text in the console and in xterm.")
                                   "btrfs-progs-v" version ".tar.xz"))
               (sha256
                (base32
-                "0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n"))))
+                "1imivxjppi8zl27gn472pwpk8bg5dijkbyi340by31vhy7dj24w2"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "static"))      ; static versions of the binaries in "out"
-- 
cgit v1.2.3


From c10a27a2683afee30c4f0ea22c04ea3212dd3853 Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 9 Sep 2019 08:33:36 +0200
Subject: gnu: retroarch: Update to 1.7.8.3.

* gnu/packages/emulators.scm (retroarch): Update to 1.7.8.3.
---
 gnu/packages/emulators.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 9ff1cd4897..d3feda3f17 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1054,7 +1054,7 @@ emulation community.  It provides highly accurate emulation.")
 (define-public retroarch
   (package
     (name "retroarch")
-    (version "1.7.8")
+    (version "1.7.8.3")
     (source
      (origin
        (method git-fetch)
@@ -1063,7 +1063,7 @@ emulation community.  It provides highly accurate emulation.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0jwy5winrm87s6xa645fwa47x242r25m6i3rwf10x59448bd19r6"))))
+        (base32 "0lsfiljy6cin3xsxyh80d6y9a77h7h82fcm6k148cd8mndvyxcdn"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
cgit v1.2.3


From 3a341e822c8c73af9d8620858c66340119c5b800 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 9 Sep 2019 11:25:02 +0200
Subject: gnu: Add r-soupx.

* gnu/packages/cran.scm (r-soupx): New variable.
---
 gnu/packages/cran.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b09d46678a..6ef2066429 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15335,3 +15335,33 @@ an approach to manipulate these two virtual data frames using the API defined
 in the @code{dplyr} package, and it also provides tidy interfaces to a lot of
 common graph algorithms.")
     (license license:expat)))
+
+(define-public r-soupx
+  (let ((commit "a3354be76fb52fd795be6ddf163cf056c05c6cb8")
+        (revision "1"))
+    (package
+      (name "r-soupx")
+      (version (git-version "0.3.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/constantAmateur/SoupX")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1zmlyzrl0fz6l79gn2wswid670p88mm3y292is89sa5p3h7frr99"))))
+      (properties `((upstream-name . "SoupX")))
+      (build-system r-build-system)
+      (propagated-inputs
+       `(("r-ggplot2" ,r-ggplot2)
+         ("r-matrix" ,r-matrix)
+         ("r-seurat" ,r-seurat)))
+      (home-page "https://github.com/constantAmateur/SoupX")
+      (synopsis "Single cell mRNA Soup eXterminator")
+      (description
+       "This package provides a package for quantifying, profiling and
+removing cell free mRNA contamination (the \"soup\") from droplet based single
+cell RNA-seq experiments.")
+      (license license:gpl2))))
-- 
cgit v1.2.3


From 0d7dfbced24908d3f29cec50fafc9ca133417659 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 9 Sep 2019 16:18:39 +0300
Subject: gnu: kdeconnect: Set upstream-name.

* gnu/packages/kde.scm (kdeconnect)[properties]: New field.
---
 gnu/packages/kde.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 68d2804dcc..bf5694557e 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -600,4 +600,5 @@ communicate with each other.  Here's a few things KDE Connect can do:
 @item Browse your phone from the desktop
 @item Control the desktop's volume from the phone
 @end enumerate")
+    (properties `((upstream-name . "kdeconnect-kde")))
     (license (list license:gpl2 license:gpl3)))) ; dual licensed
-- 
cgit v1.2.3


From 53223dc34017585b1616c57bcd59526e234353c0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 9 Sep 2019 16:31:16 +0300
Subject: gnu: kdeconnect: Update to 1.3.5.

* gnu/packages/kde.scm (kdeconnect): Update to 1.3.5.
[source]: Update source uri.
---
 gnu/packages/kde.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index bf5694557e..f2261f7f98 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -529,16 +529,16 @@ different notification systems.")
 (define-public kdeconnect
   (package
     (name "kdeconnect")
-    (version "1.3.3")
+    (version "1.3.5")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "mirror://kde/stable/kdeconnect/"
-                            version "/src/kdeconnect-kde-"
+                            version "/kdeconnect-kde-"
                             version ".tar.xz"))
         (sha256
          (base32
-          "1vac0mw1myrswr61adv7lgif0c4wzw5wnsj0sqxj6msp4l4pfgsg"))))
+          "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBUILD_TESTING=ON")
-- 
cgit v1.2.3


From d9e3a21318f166b54d0fd770e67bc7a49ad2c411 Mon Sep 17 00:00:00 2001
From: Robert Vollmert 
Date: Tue, 30 Jul 2019 11:36:33 +0200
Subject: gnu: Add scron.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/suckless.scm (scron): New package.

Signed-off-by: 宋文武 
---
 gnu/packages/suckless.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 427bc44598..f0055cc0cc 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -724,3 +724,31 @@ as -1, to be used instead of U+FFFD.
 It is a front end for ii-like chat programs.  It uses @code{tail -f} to get the
 chat output in the background.")
       (license license:isc))))
+
+(define-public scron
+  (package
+    (name "scron")
+    (version "0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://dl.2f30.org/releases/"
+                           name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; No tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)))) ; No configure script
+    (home-page "https://git.2f30.org/scron/")
+    (synopsis "Simple cron daemon")
+    (description
+     "Schedule commands to be run at specified dates and times.
+Single daemon and configuration file.  Log to stdout or syslog.  No mail
+support.")
+    (license license:expat)))
-- 
cgit v1.2.3


From 695ee52eb552f8143e476e1de0440d09c0edaf1d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Mon, 9 Sep 2019 22:19:01 +0200
Subject: gnu: grammalecte: Update to 1.4.0.

* gnu/packages/dictionaries.scm (grammalecte): Update to 1.4.0.
[synopsis]: Remove spurious space.
---
 gnu/packages/dictionaries.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index ba22fecf20..37bd4aaf6b 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -218,7 +218,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
 (define-public grammalecte
   (package
     (name "grammalecte")
-    (version "1.3.0")
+    (version "1.4.0")
     (source
      (origin
        (method url-fetch/zipbomb)
@@ -226,10 +226,10 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
                            "Grammalecte-fr-v" version ".zip"))
        (sha256
         (base32
-         "1knysfdd1rx4vc5cmmnry4jsza0cdjy26fv505m854yfmq6zrckd"))))
+         "0k30b9kcczsadjjgwja03rkm11cpcc1xi6w8l6k0qfbjfpkhsh66"))))
     (build-system python-build-system)
     (home-page "https://grammalecte.net")
-    (synopsis  "French spelling and grammar checker")
+    (synopsis "French spelling and grammar checker")
     (description "Grammalecte is a grammar checker dedicated to the French
 language, derived from Lightproof.
 
-- 
cgit v1.2.3


From 86c3a506462f941a3590594bcf1e406e57012faa Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sat, 7 Sep 2019 19:08:29 +0200
Subject: gnu: nyacc: Update to 0.99.0.

* gnu/packages/mes.scm (nyacc): Update to 0.99.0.
---
 gnu/packages/mes.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index ae887fa24d..ef0717cc29 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2017,2018 Jan Nieuwenhuizen 
+;;; Copyright © 2017, 2018, 2019 Jan Nieuwenhuizen 
 ;;; Copyright © 2017, 2018 Efraim Flashner 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;;
@@ -63,14 +63,14 @@ extensive examples, including parsers for the Javascript and C99 languages.")
 (define-public nyacc
   (package
     (inherit nyacc-0.86)
-    (version "0.94.0")
+    (version "0.99.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://savannah/nyacc/nyacc-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "12qnzwm1n3j8z7hbr9hy2wka9a1aasm2rvnpnvdxkjcsbdzj8fn4"))
+                "0hl5qxx19i4x1r0839sxm19ziqq65g4hy97yik81cc2yb9yvgyv3"))
               (modules '((guix build utils)))
               (snippet
                '(begin
-- 
cgit v1.2.3


From 9aed1de3e90cd17f926b4c46df007c1869b10c3f Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sat, 7 Sep 2019 19:23:43 +0200
Subject: gnu: mescc-tools: Update to 0.6.1.

* gnu/packages/mes.scm (mescc-tools): Update to 0.6.1.
---
 gnu/packages/mes.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index ef0717cc29..4e683b77b0 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -141,7 +141,7 @@ Guile.")
 (define-public mescc-tools
   (package
     (name "mescc-tools")
-    (version "0.5.2")
+    (version "0.6.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -151,11 +151,12 @@ Guile.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "01x7bhmgwyf6mc2g1hcvibhps98nllacqm4f0j5l51b1mbi18pc2"))))
+                "06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n"))))
     (build-system gnu-build-system)
     (supported-systems '("i686-linux" "x86_64-linux"))
     (arguments
-     `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+     `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+                          "CC=gcc")
        #:test-target "test"
        #:phases (modify-phases %standard-phases
                   (delete 'configure))))
-- 
cgit v1.2.3


From 0b95b19b1d3b525993e79c0c33bdac6b2469c8d4 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sat, 7 Sep 2019 19:09:48 +0200
Subject: gnu: mes: Update to 0.20.

* gnu/packages/mes.scm (mes): Update to 0.20.  Use nyacc-0.99.0.
---
 gnu/packages/mes.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 4e683b77b0..49224a7ba5 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -94,22 +94,19 @@ extensive examples, including parsers for the Javascript and C99 languages.")
 (define-public mes
   (package
     (name "mes")
-    (version "0.19")
+    (version "0.20")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/mes/"
                                   "mes-" version ".tar.gz"))
               (sha256
                (base32
-                "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
+                "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n"))))
     (build-system gnu-build-system)
     (supported-systems '("i686-linux" "x86_64-linux"))
     (propagated-inputs
      `(("mescc-tools" ,mescc-tools)
-
-       ;; XXX: MesCC appears to enter an infinite loop (?) while building
-       ;; crt1.o when we switch to nyacc 0.94.
-       ("nyacc" ,nyacc-0.86)))
+       ("nyacc" ,nyacc)))
     (native-inputs
      `(("guile" ,guile-2.2)
        ,@(let ((target-system (or (%current-target-system)
-- 
cgit v1.2.3


From 0ada4e298762526b9de7fa96429e70c2ba792db6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 8 Sep 2019 01:51:11 +0200
Subject: gnu: libsecret: Don't use NAME in source URI.

* gnu/packages/gnome.scm (libsecret)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9ee652c304..dbc3ed6793 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2813,7 +2813,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
               (uri (string-append
                     "mirror://gnome/sources/libsecret/"
                     (version-major+minor version) "/"
-                    name "-" version ".tar.xz"))
+                    "libsecret-" version ".tar.xz"))
               (sha256
                (base32
                 "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv"))))
-- 
cgit v1.2.3


From b243d2f7d3f76073dd3631c85b91e7e589a02774 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 8 Sep 2019 01:50:58 +0200
Subject: gnu: libsecret: Update to 0.19.1.

* gnu/packages/gnome.scm (libsecret): Update to 0.19.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index dbc3ed6793..a572075ea0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2807,7 +2807,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
 (define-public libsecret
   (package
     (name "libsecret")
-    (version "0.18.8")
+    (version "0.19.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2816,7 +2816,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
                     "libsecret-" version ".tar.xz"))
               (sha256
                (base32
-                "058x64689k55wxfkdp4svhnwvv8jmqm7z5mrynybl38f4sfqiyiv"))))
+                "0fhflcsr70b1pps2pcvqcbdhip2ny5am9nbm634f4sj5g40y30w5"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     (arguments
-- 
cgit v1.2.3


From 351c804217d2b00b78e0be72069221a08d1a0768 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 8 Sep 2019 01:32:50 +0200
Subject: gnu: libmbim: Don't use NAME in source URI.

* gnu/packages/freedesktop.scm (libmbim)[source]: Hard-code NAME.
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9cfdbca3fb..63c99b2345 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -924,8 +924,8 @@ interfaces, based on the useradd, usermod and userdel commands.")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "https://www.freedesktop.org/software/" name "/"
-                    name "-" version ".tar.xz"))
+                    "https://www.freedesktop.org/software/libmbim/"
+                    "libmbim-" version ".tar.xz"))
               (sha256
                (base32
                 "0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp"))))
-- 
cgit v1.2.3


From ddaefa2202a438df44e5ed32ca1137db02698e01 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 8 Sep 2019 01:32:39 +0200
Subject: gnu: libmbim: Update to 1.20.0.

* gnu/packages/freedesktop.scm (libmbim): Update to 1.20.0.
---
 gnu/packages/freedesktop.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 63c99b2345..401f54bb14 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -920,7 +920,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
 (define-public libmbim
   (package
     (name "libmbim")
-    (version "1.18.2")
+    (version "1.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -928,7 +928,7 @@ interfaces, based on the useradd, usermod and userdel commands.")
                     "libmbim-" version ".tar.xz"))
               (sha256
                (base32
-                "0s4jsfsydp2vykv7lnimalp9i680aas1qcx7zdpjiic64b5g48vp"))))
+                "0rm8j4zh9gnb3yi324cnxy91gdimc1vg5gv1kxc2m5lymb3wdxrc"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-mkenums
-- 
cgit v1.2.3


From 3053feab0a9e76a045dcffed58101cb4313ee39b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 9 Sep 2019 17:20:21 +0200
Subject: gnu: zeromq: Update to 4.3.2.

* gnu/packages/networking.scm (zeromq): Update to 4.3.2.
[source]: Download GitHub release tarball.
---
 gnu/packages/networking.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 9383e1a1d8..2f7f67583a 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -275,14 +275,14 @@ transparently check connection attempts against an access control list.")
 (define-public zeromq
   (package
     (name "zeromq")
-    (version "4.0.7")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://download.zeromq.org/zeromq-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "00vvwhgcdr1lva2pavicvy92iad0hj8cf71n702hv6blw1kjj2z0"))))
+    (version "4.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/zeromq/libzmq/releases/"
+                           "download/v" version "/zeromq-" version ".tar.gz"))
+       (sha256
+        (base32 "0qzp80ky4y2k7k1ya09v9gkivvfbz2km813snrb8jhnn634bbmzb"))))
     (build-system gnu-build-system)
     (home-page "http://zeromq.org")
     (synopsis "Library for message-based applications")
-- 
cgit v1.2.3


From 5fbba846964f72e69cc26aacce9f35301ca13c35 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 9 Sep 2019 17:21:10 +0200
Subject: gnu: zeromq: Use HTTPS home page.

* gnu/packages/networking.scm (zeromq)[home-page]: Use HTTPS.
---
 gnu/packages/networking.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 2f7f67583a..a80b24a6cf 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -284,7 +284,7 @@ transparently check connection attempts against an access control list.")
        (sha256
         (base32 "0qzp80ky4y2k7k1ya09v9gkivvfbz2km813snrb8jhnn634bbmzb"))))
     (build-system gnu-build-system)
-    (home-page "http://zeromq.org")
+    (home-page "https://zeromq.org")
     (synopsis "Library for message-based applications")
     (description
      "The 0MQ lightweight messaging kernel is a library which extends the
-- 
cgit v1.2.3


From 36eef80d45ae754ba42a761ffc97e38cc7253bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 9 Sep 2019 10:19:59 +0200
Subject: packages: 'package-field-location' really catches 'system-error.

This had been wrong since forever (i.e., 2013).

* guix/packages.scm (package-field-location): Catch 'system-error, not
'system.
---
 guix/packages.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 143417b861..b92ed0ab0c 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -351,7 +351,7 @@ object."
 
   (match (package-location package)
     (($  file line column)
-     (catch 'system
+     (catch 'system-error
        (lambda ()
          ;; In general we want to keep relative file names for modules.
          (with-fluids ((%file-port-name-canonicalization 'relative))
-- 
cgit v1.2.3


From 7c101c4c175b7abcb43279d1c66b41a91b9c64bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 9 Sep 2019 10:33:42 +0200
Subject: refresh: Distinguish between "no updater" and "failing updater".

Previously, something like "guix refresh texmacs" would report "no
updater".  Now, it reports that the 'gnu-ftp' updater failed to list
releases.

* guix/upstream.scm (lookup-updater): Use 'find' instead of 'any' to
return the .
(package-latest-release): Adjust accordingly.
* guix/scripts/refresh.scm (check-for-package-update): When
'package-latest-release' returns #f, distinguish between "no updater"
and "failing updater".
---
 guix/scripts/refresh.scm | 12 ++++++++++--
 guix/upstream.scm        | 12 ++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 4591d0f308..daf6fcf947 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -368,8 +368,16 @@ the latest known version of ~a (~a)~%")
                      (upstream-source-version source)))))))
     (#f
      (when warn?
-       (warn-no-updater package)))))
-
+       ;; Distinguish between "no updater" and "failing updater."
+       (match (lookup-updater package updaters)
+         ((? upstream-updater? updater)
+          (warning (package-location package)
+                   (G_ "'~a' updater failed to determine available \
+releases for ~a~%")
+                   (upstream-updater-name updater)
+                   (package-name package)))
+         (#f
+          (warn-no-updater package)))))))
 
 
 ;;;
diff --git a/guix/upstream.scm b/guix/upstream.scm
index d4f9c5bb45..aa47dab4b4 100644
--- a/guix/upstream.scm
+++ b/guix/upstream.scm
@@ -245,18 +245,18 @@ correspond to the same version."
 (define (lookup-updater package updaters)
   "Return an updater among UPDATERS that matches PACKAGE, or #f if none of
 them matches."
-  (any (match-lambda
-         (($  name description pred latest)
-          (and (pred package) latest)))
-       updaters))
+  (find (match-lambda
+          (($  name description pred latest)
+           (pred package)))
+        updaters))
 
 (define (package-latest-release package updaters)
   "Return an upstream source to update PACKAGE, a  object, or #f if
 none of UPDATERS matches PACKAGE.  It is the caller's responsibility to ensure
 that the returned source is newer than the current one."
   (match (lookup-updater package updaters)
-    ((? procedure? latest-release)
-     (latest-release package))
+    ((? upstream-updater? updater)
+     ((upstream-updater-latest updater) package))
     (_ #f)))
 
 (define (package-latest-release* package updaters)
-- 
cgit v1.2.3


From fd63ecbe050bf8fa7c8ff0a003d56cce97b6ded1 Mon Sep 17 00:00:00 2001
From: Martin Becze 
Date: Mon, 9 Sep 2019 11:36:04 -0400
Subject: import: crate: Allow imports of a specific version.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/import/crate.scm (crate->guix-package): Add optional 'version'
argument and honor it.
* guix/scripts/import/crate.scm (guix-import-crate): Assume the first
argument is a spec and destructure it with
'package-name->name+version'.  Pass both to 'crate->guix-package'.
* doc/guix.texi (Invoking guix import): Document it.

Co-authored-by: Ludovic Courtès 
---
 doc/guix.texi                 | 12 +++++++++++-
 guix/import/crate.scm         | 29 +++++++++++++++++++----------
 guix/scripts/import/crate.scm | 13 ++++++++++---
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 9101aafda1..989b3d03bb 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8912,7 +8912,17 @@ in Guix.
 @item crate
 @cindex crate
 Import metadata from the crates.io Rust package repository
-@uref{https://crates.io, crates.io}.
+@uref{https://crates.io, crates.io}, as in this example:
+
+@example
+guix import crate blake2-rfc
+@end example
+
+The crate importer also allows you to specify a version string:
+
+@example
+guix import crate constant-time-eq@@0.1.0
+@end example
 
 @item opam
 @cindex OPAM
diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index f6057dbf8b..fd1974eae8 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Craven 
 ;;; Copyright © 2019 Ludovic Courtès 
+;;; Copyright © 2019 Martin Becze 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -181,9 +182,11 @@ and LICENSE."
   ;; This regexp matches that.
   (make-regexp "^(.*) OR (.*)$"))
 
-(define (crate->guix-package crate-name)
+(define* (crate->guix-package crate-name #:optional version)
   "Fetch the metadata for CRATE-NAME from crates.io, and return the
-`package' s-expression corresponding to that package, or #f on failure."
+`package' s-expression corresponding to that package, or #f on failure.
+When VERSION is specified, attempt to fetch that version; otherwise fetch the
+latest version of CRATE-NAME."
   (define (string->license string)
     (match (regexp-exec %dual-license-rx string)
       (#f (list (spdx-string->license string)))
@@ -196,12 +199,18 @@ and LICENSE."
   (define crate
     (lookup-crate crate-name))
 
-  (and crate
-       (let* ((version        (find (lambda (version)
-                                      (string=? (crate-version-number version)
-                                                (crate-latest-version crate)))
-                                    (crate-versions crate)))
-              (dependencies   (crate-version-dependencies version))
+  (define version-number
+    (or version
+        (crate-latest-version crate)))
+
+  (define version*
+    (find (lambda (version)
+            (string=? (crate-version-number version)
+                      version-number))
+          (crate-versions crate)))
+
+  (and crate version*
+       (let* ((dependencies   (crate-version-dependencies version*))
               (dep-crates     (filter normal-dependency? dependencies))
               (dev-dep-crates (remove normal-dependency? dependencies))
               (cargo-inputs   (sort (map crate-dependency-id dep-crates)
@@ -210,14 +219,14 @@ and LICENSE."
                (sort (map crate-dependency-id dev-dep-crates)
                      string-ci (crate-version-license version)
+                          #:license (and=> (crate-version-license version*)
                                            string->license)))))
 
 (define (guix-package->crate-name package)
diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm
index cab9a4397b..7ae8638911 100644
--- a/guix/scripts/import/crate.scm
+++ b/guix/scripts/import/crate.scm
@@ -2,6 +2,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 David Thompson 
 ;;; Copyright © 2016 David Craven 
+;;; Copyright © 2019 Martin Becze 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -75,6 +76,7 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
                   (alist-cons 'argument arg result))
                 %default-options))
 
+
   (let* ((opts (parse-options))
          (args (filter-map (match-lambda
                             (('argument . value)
@@ -82,11 +84,16 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
                             (_ #f))
                            (reverse opts))))
     (match args
-      ((package-name)
-       (let ((sexp (crate->guix-package package-name)))
+      ((spec)
+       (define-values (name version)
+         (package-name->name+version spec))
+
+       (let ((sexp (crate->guix-package name version)))
          (unless sexp
            (leave (G_ "failed to download meta-data for package '~a'~%")
-                  package-name))
+                  (if version
+                      (string-append name "@" version)
+                      name)))
          sexp))
       (()
        (leave (G_ "too few arguments~%")))
-- 
cgit v1.2.3


From 3551f305c4eb54860016e04dbed48c521d40b376 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 2 Sep 2019 16:10:49 +0200
Subject: gnu: mousepad: Update to 0.4.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (mousepad): Update to 0.4.2.
[arguments] Remove unnecessary --enable-gtk3 flag from #:configure-flags.
[inputs] Add xfconf.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bf732c82be..bec1f67912 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1071,7 +1071,7 @@ of data to either CD/DVD/BD.")
 (define-public mousepad
   (package
     (name "mousepad")
-    (version "0.4.1")
+    (version "0.4.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/apps/mousepad/"
@@ -1079,11 +1079,10 @@ of data to either CD/DVD/BD.")
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "12si6fvhp68wz4scr339c23jxqq5ywn5nf4w55jld5lxjadkg9rr"))))
+                "1myy7954r1a30dk7inwy7kwki7zvfbnnsc3a8swk72vzrbgjmh44"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--enable-gtk3"
-                           ;; Use the GSettings keyfile backend rather than
+     '(#:configure-flags '(;; Use the GSettings keyfile backend rather than
                            ;; DConf.
                            "--enable-keyfile-settings")
        #:phases
@@ -1103,7 +1102,8 @@ of data to either CD/DVD/BD.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("gtk+" ,gtk+)
-       ("gtksourceview" ,gtksourceview-3)))
+       ("gtksourceview" ,gtksourceview-3)
+       ("xfconf" ,xfconf)))
     (home-page "https://git.xfce.org/apps/mousepad/")
     (synopsis "Simple text editor for Xfce")
     (description
-- 
cgit v1.2.3


From b82cf9644a40a3c5aa2e40fbb36f9aeca4be278a Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 2 Sep 2019 16:11:01 +0200
Subject: gnu: ristretto: Update to 0.10.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (ristretto): Update to 0.10.0.
[inputs] Add gtk+. Remove gtk+-2.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bec1f67912..fddfa74d66 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -910,7 +910,7 @@ inhibit interface which allows applications to prevent automatic sleep.")
 (define-public ristretto
   (package
     (name "ristretto")
-    (version "0.8.4")
+    (version "0.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/apps/ristretto/"
@@ -918,14 +918,14 @@ inhibit interface which allows applications to prevent automatic sleep.")
                                   "ristretto-" version ".tar.bz2"))
               (sha256
                (base32
-                "18nf01djwnbjc91bdlv3p0h6pwcq1kfnjgp6yaxhxv4kdi9f82rs"))))
+                "0sa75m1w6yvv4xvzrwqiif6vnqgi29hjrixrh87nxss58bbms8hn"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("desktop-file-utils" ,desktop-file-utils)
-       ("gtk+" ,gtk+-2)
+       ("gtk+" ,gtk+)
        ("libexif" ,libexif)
        ("libxfce4ui" ,libxfce4ui)
        ("librsvg" ,librsvg)
-- 
cgit v1.2.3


From c629b99e3b3a1db3adccaadd3d9771d7507868b1 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 2 Sep 2019 17:04:50 +0200
Subject: gnu: orage: Fix build.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (orage)[arguments]: Add phase fixing build with libical3.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index fddfa74d66..5d59285c64 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -981,6 +981,14 @@ memory usage graphically, and it can display processes as a tree.")
               (sha256
                (base32
                 "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-build-with-libical3
+           (lambda* _
+             (substitute* "src/ical-code.c" ;; .is_utc not available in libical3
+               ((".*\\.is_utc.*$") ""))
+             #t)))))
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
-- 
cgit v1.2.3


From c0c0e9b8369e9c9295058f58624979d11495f274 Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 2 Sep 2019 17:05:44 +0200
Subject: gnu: Add copyright header.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm: Add copyright header.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5d59285c64..3a8b223b9c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Pkill -9 
+;;; Copyright © 2019 L  p R n  d n 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
-- 
cgit v1.2.3


From 44554d86dae9e595a9432b5a064f9aac63abf1fd Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Wed, 4 Sep 2019 16:58:55 +0200
Subject: gnu: monero: Fix detection of readline library.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/finance.scm (monero)[arguments]: Define 'Readline_ROOT_DIR'
  in 'configure-flags'.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/finance.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 377cb3a405..5824a14c33 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -490,9 +490,12 @@ other machines/servers.  Electroncash does not download the Bitcoin Cash blockch
        ("zeromq" ,zeromq)))
     (arguments
      `(#:out-of-source? #t
-       #:configure-flags '("-DARCH=default"
-                           "-DBUILD_TESTS=ON"
-                           "-DBUILD_GUI_DEPS=ON")
+       #:configure-flags
+       (list "-DARCH=default"
+             "-DBUILD_TESTS=ON"
+             "-DBUILD_GUI_DEPS=ON"
+             (string-append "-DReadline_ROOT_DIR="
+                            (assoc-ref %build-inputs "readline")))
        #:phases
        (modify-phases %standard-phases
          ;; tests/core_tests need a valid HOME
-- 
cgit v1.2.3


From b7a07bbd5ec3b97eab86c1ad574176715ae49652 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Wed, 4 Sep 2019 16:58:56 +0200
Subject: gnu: monero: Activate Trezor support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/finance.scm (monero):
  [native-inputs]: Add python and protobuf.
  [inputs]: Add libusb and protobuf.
  [arguments]: Add delete-dead-links phase.
  (monero-gui)[inputs]: Add libusb and protobuf.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/finance.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 5824a14c33..30ea797daf 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -473,16 +473,20 @@ other machines/servers.  Electroncash does not download the Bitcoin Cash blockch
        ("git" ,git)
        ("graphviz" ,graphviz)
        ("pkg-config" ,pkg-config)
+       ("protobuf" ,protobuf)
+       ("python" ,python)
        ("qttools" ,qttools)))
     (inputs
      `(("boost" ,boost)
        ("cppzmq" ,cppzmq)
        ("expat" ,expat)
        ("hidapi" ,hidapi)
-       ("libunwind" ,libunwind)
        ("libsodium" ,libsodium)
+       ("libunwind" ,libunwind)
+       ("libusb" ,libusb)
        ("miniupnpc" ,miniupnpc)
        ("openssl" ,openssl)
+       ("protobuf" ,protobuf)
        ("rapidjson" ,rapidjson)
        ("readline" ,readline)
        ("unbound" ,unbound)
@@ -534,7 +538,13 @@ other machines/servers.  Electroncash does not download the Bitcoin Cash blockch
                      ":")))
                (invoke "tests/unit_tests/unit_tests"
                        (string-append "--gtest_filter=-"
-                                      excluded-unit-tests))))))))
+                                      excluded-unit-tests)))))
+         (add-after 'install 'delete-dead-links
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (delete-file (string-append out "/lib/libprotobuf.so"))
+               (delete-file (string-append out "/lib/libusb-1.0.so"))
+               #t))))))
     (home-page "https://getmonero.org/")
     (synopsis "Command-line interface to the Monero currency")
     (description
@@ -563,9 +573,11 @@ the Monero command line client and daemon.")
     (inputs
      `(("boost" ,boost)
        ("hidapi" ,hidapi)
-       ("libunwind" ,libunwind)
        ("libsodium" ,libsodium)
+       ("libunwind" ,libunwind)
+       ("libusb" ,libusb)
        ("openssl" ,openssl)
+       ("protobuf" ,protobuf)
        ("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
-- 
cgit v1.2.3


From deb083628f46d56272e8df46364926c50c6df48b Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Wed, 4 Sep 2019 16:58:57 +0200
Subject: gnu: monero-gui: Update to 0.14.1.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/finance.scm (monero-gui): Update to 0.14.1.2.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/finance.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 30ea797daf..3fa0a4d331 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -555,7 +555,7 @@ the Monero command line client and daemon.")
 (define-public monero-gui
   (package
     (name "monero-gui")
-    (version "0.14.1.0")
+    (version "0.14.1.2")
     (source
      (origin
        (method git-fetch)
@@ -565,7 +565,7 @@ the Monero command line client and daemon.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31"))))
+         "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From 36ed9b4678ee9366b4ec40501928ccbb149c6db7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 00:39:35 +0200
Subject: gnu: aisleriot: Update to 3.22.9.

* gnu/packages/gnome.scm (aisleriot): Update to 3.22.9.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a572075ea0..d40919693a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3360,7 +3360,7 @@ playlists in a variety of formats.")
 (define-public aisleriot
   (package
     (name "aisleriot")
-    (version "3.22.8")
+    (version "3.22.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/aisleriot/"
@@ -3368,7 +3368,7 @@ playlists in a variety of formats.")
                                   "aisleriot-" version ".tar.xz"))
               (sha256
                (base32
-                "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815"))))
+                "0yzdh9cw5cjjgvfh75bihl968czlgfmpmn1z0fdk88sgvpjgzwji"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      '(#:configure-flags
-- 
cgit v1.2.3


From 9a5f35fe0597f35c4be39f7f5b0f479239051dcf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 01:28:28 +0200
Subject: gnu: eclib: Update to 20190909.

* gnu/packages/algebra.scm (eclib): Update to 20190909.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index fb9e78bf92..02b4d4ca21 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1435,7 +1435,7 @@ of M4RI from F_2 to F_{2^e}.")
 (define-public eclib
   (package
     (name "eclib")
-    (version "20190226")
+    (version "20190909")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1444,7 +1444,7 @@ of M4RI from F_2 to F_{2^e}.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb"))))
+                "1gw27lqc3f525n8qdcmr2nyn16y9g10z9f6dnmckyyxcdzvhq35n"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
-- 
cgit v1.2.3


From ae1bab3e95506663de62b8868ba96682716d13d1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 01:34:39 +0200
Subject: gnu: fakeroot: Update to 1.24.

* gnu/packages/linux.scm (fakeroot): Update to 1.24.
[source]: Adjust and use HTTPS.
---
 gnu/packages/linux.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b98c6b984d..92b9d2ece1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5862,15 +5862,15 @@ the superuser to make device nodes.")
 (define-public fakeroot
   (package
     (name "fakeroot")
-    (version "1.23")
+    (version "1.24")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://ftp.debian.org/debian/pool/main/f/"
-                                  "fakeroot/fakeroot_" version ".orig.tar.xz"))
+              (uri (string-append "https://deb.debian.org/debian/pool/main/f/"
+                                  "fakeroot/fakeroot_" version ".orig.tar.gz"))
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"))))
+                "1vb6f93hjyqnwx8dc8mm3dgma7axgqk8s7sdsjs8l2rpc0qmn11f"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From e9c784fba145b9e8d8942740bd750e50af7389bd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 01:40:17 +0200
Subject: gnu: rclone: Update to 1.49.2.

* gnu/packages/sync.scm (rclone): Update to 1.49.2.
---
 gnu/packages/sync.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index e281f43554..0c840a1a1d 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -264,14 +264,14 @@ over the Internet in an HTTP and CDN friendly way;
 (define-public rclone
   (package
     (name "rclone")
-    (version "1.49.1")
+    (version "1.49.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/rclone/rclone/releases/download/"
                            "v" version "/rclone-v" version ".tar.gz"))
        (sha256
-        (base32 "1d0qvj7fn5bx3zqlf6hzn1922nrmy4x341n760m1b6h9az32mc5x"))))
+        (base32 "1q8lf85hg2havb1xsal75r19ck166rh19lffpd3i43zgblc6gs8j"))))
     ;; FIXME: Rclone bundles some libraries Guix already provides.  Need to
     ;; un-bundle them.
     (build-system go-build-system)
-- 
cgit v1.2.3


From 83aa6562173e06e8fafd4857a2e708feabfe56f8 Mon Sep 17 00:00:00 2001
From: Timothy Sample 
Date: Mon, 9 Sep 2019 21:12:41 -0400
Subject: gnu: ghc@8.6: Add missing 'native-search-paths'.

Fixes .

* gnu/packages/haskell.scm (ghc-8.6)[native-search-paths]: Set search
paths explicitly instead of inheriting them.
---
 gnu/packages/haskell.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 4d16cd656f..d86daa52c5 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -596,7 +596,13 @@ interactive environment for the functional language Haskell.")
                  (("^test\\('T8108'") "# guix skipped: test('T8108'"))
                (substitute* "libraries/unix/tests/libposix/all.T"
                  (("^test\\('posix010'") "# guix skipped: test('posix010'"))
-               #t))))))))
+               #t))))))
+    (native-search-paths (list (search-path-specification
+                                (variable "GHC_PACKAGE_PATH")
+                                (files (list
+                                        (string-append "lib/ghc-" version)))
+                                (file-pattern ".*\\.conf\\.d$")
+                                (file-type 'directory))))))
 
 (define-public ghc-8 ghc-8.4)
 
-- 
cgit v1.2.3


From da1027a70508ea96134f5ef89d9dd390679255f0 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 27 Aug 2019 18:20:16 +0200
Subject: guix: Rename and move sans-extension to tarball-sans-extension.

* guix/gnu-maintenance.scm (sans-extension): Move and rename to ...
* guix/utils.scm (tarball-sans-extension): ... here.
---
 guix/gnu-maintenance.scm | 26 ++++++++++++--------------
 guix/utils.scm           |  7 +++++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index d63d44f629..8fce956c60 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -230,12 +230,6 @@ network to check in GNU's database."
             (or (assoc-ref (package-properties package) 'ftp-directory)
                 (string-append "/gnu/" name)))))
 
-(define (sans-extension tarball)
-  "Return TARBALL without its .tar.* or .zip extension."
-  (let ((end (or (string-contains tarball ".tar")
-                 (string-contains tarball ".zip"))))
-    (substring tarball 0 end)))
-
 (define %tarball-rx
   ;; The .zip extensions is notably used for freefont-ttf.
   ;; The "-src" pattern is for "TeXmacs-1.0.7.9-src.tar.gz".
@@ -261,14 +255,15 @@ true."
                                           (string-append project
                                                          "-src")))))))
        (not (regexp-exec %alpha-tarball-rx file))
-       (let ((s (sans-extension file)))
+       (let ((s (tarball-sans-extension file)))
          (regexp-exec %package-name-rx s))))
 
 (define (tarball->version tarball)
   "Return the version TARBALL corresponds to.  TARBALL is a file name like
 \"coreutils-8.23.tar.xz\"."
   (let-values (((name version)
-                (gnu-package-name->name+version (sans-extension tarball))))
+                (gnu-package-name->name+version
+                 (tarball-sans-extension tarball))))
     version))
 
 (define* (releases project
@@ -492,8 +487,9 @@ return the corresponding signature URL, or #f it signatures are unavailable."
       (and (string=? url (basename url))          ;relative reference?
            (release-file? package url)
            (let-values (((name version)
-                         (package-name->name+version (sans-extension url)
-                                                     #\-)))
+                         (package-name->name+version
+                          (tarball-sans-extension url)
+                          #\-)))
              (upstream-source
               (package name)
               (version version)
@@ -565,14 +561,16 @@ list available from %GNU-FILE-LIST-URI over HTTP(S)."
                                     (release-file? name (basename file))))
                              files)))
       (match (sort relevant (lambda (file1 file2)
-                              (version>? (sans-extension (basename file1))
-                                         (sans-extension (basename file2)))))
+                              (version>? (tarball-sans-extension
+                                          (basename file1))
+                                         (tarball-sans-extension
+                                          (basename file2)))))
         ((and tarballs (reference _ ...))
          (let* ((version  (tarball->version reference))
                 (tarballs (filter (lambda (file)
-                                    (string=? (sans-extension
+                                    (string=? (tarball-sans-extension
                                                (basename file))
-                                              (sans-extension
+                                              (tarball-sans-extension
                                                (basename reference))))
                                   tarballs)))
            (upstream-source
diff --git a/guix/utils.scm b/guix/utils.scm
index f480c3291f..1f99c5b3f5 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -91,6 +91,7 @@
             arguments-from-environment-variable
             file-extension
             file-sans-extension
+            tarball-sans-extension
             compressed-file?
             switch-symlinks
             call-with-temporary-output-file
@@ -578,6 +579,12 @@ minor version numbers from version-string."
         (substring file 0 dot)
         file)))
 
+(define (tarball-sans-extension tarball)
+  "Return TARBALL without its .tar.* or .zip extension."
+  (let ((end (or (string-contains tarball ".tar")
+                 (string-contains tarball ".zip"))))
+    (substring tarball 0 end)))
+
 (define (compressed-file? file)
   "Return true if FILE denotes a compressed file."
   (->bool (member (file-extension file)
-- 
cgit v1.2.3


From 33f53947aa6d50ef7fe08c0ef9e32cdb9e77db89 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 4 Aug 2019 11:30:32 +0200
Subject: gnu-maintenance: KDE updater no longer relies on FTP access.

Fetch the ls-lR.bz2 file list for download.kde.org, convert it into a list of
file paths and cache the list.

* guix/gnu-maintenance.scm (%kde-file-list-uri): New variable.
  (download.kde.org-files): New procedure.
  (latest-kde-release): Change to use DOWNLOAD.KDE.ORG-FILES and search
  for files in this list.
---
 guix/gnu-maintenance.scm | 100 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 92 insertions(+), 8 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 8fce956c60..9ce06508a3 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2012, 2013 Nikita Karetnikov 
+;;; Copyright © 2019 Hartmut Goebel 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
   #:use-module (sxml simple)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 rdelim)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
@@ -613,15 +615,97 @@ releases are on gnu.org."
 (define gnu-hosted?
   (url-prefix-predicate "mirror://gnu/"))
 
+(define %kde-file-list-uri
+  ;; URI of the file list (ls -lR format) for download.kde.org.
+  (string->uri "https://download.kde.org/ls-lR.bz2"))
+
+(define (download.kde.org-files)
+  ;;"Return the list of files available at download.kde.org."
+
+  (define (ls-lR-line->filename path line)
+    ;; remove mode, blocks, user, group, size, date, time and one space
+    (regexp-substitute
+     #f (string-match "^(\\S+\\s+){6}\\S+\\s" line) path 'post))
+
+  (define (canonicalize path)
+    (let* ((path (if (string-prefix? "/srv/archives/ftp/" path)
+                     (string-drop path (string-length "/srv/archives/ftp"))
+                     path))
+           (path (if (string-suffix? ":" path)
+                     (string-drop-right path 1)
+                     path))
+           (path (if (not (string-suffix? "/" path))
+                     (string-append path "/")
+                     path)))
+      path))
+
+  (define (write-cache input cache)
+    "Read bzipped ls-lR from INPUT, and write it as a list of file paths to
+CACHE."
+
+    (call-with-decompressed-port 'bzip2 input
+      (lambda (input)
+        (let loop_dirs ((files '()))
+          (let ((path (read-line input)))
+            (if
+             (or (eof-object? path) (string= path ""))
+             (write (reverse files) cache))
+            (let loop_entries ((path (canonicalize path))
+                               (files files))
+              (let ((line (read-line input)))
+                (cond
+                 ((eof-object? line)
+                  (write (reverse files) cache))
+                 ((string-prefix? "-" line)
+                  (loop_entries path
+                                (cons (ls-lR-line->filename path line) files)))
+                 ((not (string= line ""))
+                  (loop_entries path files))
+                 (#t (loop_dirs files))))))))))
+
+  (define (cache-miss uri)
+    (format (current-error-port) "fetching ~a...~%" (uri->string uri)))
+
+  (let* ((port (http-fetch/cached %kde-file-list-uri
+                                  #:ttl 3600
+                                  #:write-cache write-cache
+                                  #:cache-miss cache-miss))
+         (files (read port)))
+    (close-port port)
+    files))
+
 (define (latest-kde-release package)
-  "Return the latest release of PACKAGE, the name of an KDE.org package."
-  (let ((uri (string->uri (origin-uri (package-source package)))))
-    (false-if-ftp-error
-     (latest-ftp-release
-      (package-upstream-name package)
-      #:server "ftp.mirrorservice.org"
-      #:directory (string-append "/sites/ftp.kde.org/pub/kde/"
-                                 (dirname (dirname (uri-path uri))))))))
+  "Return the latest release of PACKAGE, a KDE package, or #f if it could not
+be determined."
+  (let* ((uri      (string->uri (origin-uri (package-source package))))
+         (directory  (dirname (dirname (uri-path uri))))
+         (name     (package-upstream-name package))
+         (files    (download.kde.org-files))
+         (relevant (filter (lambda (file)
+                             (and (string-prefix? directory file)
+                                  (release-file? name (basename file))))
+                           files)))
+    (match (sort relevant (lambda (file1 file2)
+                            (version>? (tarball-sans-extension
+                                        (basename file1))
+                                       (tarball-sans-extension
+                                        (basename file2)))))
+           ((and tarballs (reference _ ...))
+            (let* ((version  (tarball->version reference))
+                   (tarballs (filter (lambda (file)
+                                       (string=? (tarball-sans-extension
+                                                  (basename file))
+                                                 (tarball-sans-extension
+                                                  (basename reference))))
+                                     tarballs)))
+              (upstream-source
+               (package name)
+               (version version)
+               (urls (map (lambda (file)
+                            (string-append "mirror://kde/" file))
+                          tarballs)))))
+           (()
+            #f))))
 
 (define (latest-xorg-release package)
   "Return the latest release of PACKAGE, the name of an X.org package."
-- 
cgit v1.2.3


From d1dce0c3638a577a2ab713d2551f4aabe67d031c Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 3 Sep 2019 14:16:03 +0200
Subject: upstream: Move KDE updater into a separate module.

As it was done for (guix import gnome).

* guix/import/kde.scm: New file.
* Makefile.am (MODULES): Add it.
* guix/gnu-maintenance.scm (%kde-updater) (%kde-file-list-uri)
  (download.kde.org-files) (latest-kde-release): Remove.
---
 Makefile.am              |   1 +
 guix/gnu-maintenance.scm | 102 ------------------------------
 guix/import/kde.scm      | 158 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 159 insertions(+), 102 deletions(-)
 create mode 100644 guix/import/kde.scm

diff --git a/Makefile.am b/Makefile.am
index 683b2242f0..7e3b5c1070 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,6 +221,7 @@ MODULES =					\
   guix/import/gnu.scm				\
   guix/import/hackage.scm			\
   guix/import/json.scm				\
+  guix/import/kde.scm				\
   guix/import/launchpad.scm   			\
   guix/import/opam.scm				\
   guix/import/print.scm				\
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 9ce06508a3..ef067704ad 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -1,7 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2012, 2013 Nikita Karetnikov 
-;;; Copyright © 2019 Hartmut Goebel 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,7 +24,6 @@
   #:use-module (sxml simple)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
-  #:use-module (ice-9 rdelim)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
@@ -64,7 +62,6 @@
 
             %gnu-updater
             %gnu-ftp-updater
-            %kde-updater
             %xorg-updater
             %kernel.org-updater))
 
@@ -615,98 +612,6 @@ releases are on gnu.org."
 (define gnu-hosted?
   (url-prefix-predicate "mirror://gnu/"))
 
-(define %kde-file-list-uri
-  ;; URI of the file list (ls -lR format) for download.kde.org.
-  (string->uri "https://download.kde.org/ls-lR.bz2"))
-
-(define (download.kde.org-files)
-  ;;"Return the list of files available at download.kde.org."
-
-  (define (ls-lR-line->filename path line)
-    ;; remove mode, blocks, user, group, size, date, time and one space
-    (regexp-substitute
-     #f (string-match "^(\\S+\\s+){6}\\S+\\s" line) path 'post))
-
-  (define (canonicalize path)
-    (let* ((path (if (string-prefix? "/srv/archives/ftp/" path)
-                     (string-drop path (string-length "/srv/archives/ftp"))
-                     path))
-           (path (if (string-suffix? ":" path)
-                     (string-drop-right path 1)
-                     path))
-           (path (if (not (string-suffix? "/" path))
-                     (string-append path "/")
-                     path)))
-      path))
-
-  (define (write-cache input cache)
-    "Read bzipped ls-lR from INPUT, and write it as a list of file paths to
-CACHE."
-
-    (call-with-decompressed-port 'bzip2 input
-      (lambda (input)
-        (let loop_dirs ((files '()))
-          (let ((path (read-line input)))
-            (if
-             (or (eof-object? path) (string= path ""))
-             (write (reverse files) cache))
-            (let loop_entries ((path (canonicalize path))
-                               (files files))
-              (let ((line (read-line input)))
-                (cond
-                 ((eof-object? line)
-                  (write (reverse files) cache))
-                 ((string-prefix? "-" line)
-                  (loop_entries path
-                                (cons (ls-lR-line->filename path line) files)))
-                 ((not (string= line ""))
-                  (loop_entries path files))
-                 (#t (loop_dirs files))))))))))
-
-  (define (cache-miss uri)
-    (format (current-error-port) "fetching ~a...~%" (uri->string uri)))
-
-  (let* ((port (http-fetch/cached %kde-file-list-uri
-                                  #:ttl 3600
-                                  #:write-cache write-cache
-                                  #:cache-miss cache-miss))
-         (files (read port)))
-    (close-port port)
-    files))
-
-(define (latest-kde-release package)
-  "Return the latest release of PACKAGE, a KDE package, or #f if it could not
-be determined."
-  (let* ((uri      (string->uri (origin-uri (package-source package))))
-         (directory  (dirname (dirname (uri-path uri))))
-         (name     (package-upstream-name package))
-         (files    (download.kde.org-files))
-         (relevant (filter (lambda (file)
-                             (and (string-prefix? directory file)
-                                  (release-file? name (basename file))))
-                           files)))
-    (match (sort relevant (lambda (file1 file2)
-                            (version>? (tarball-sans-extension
-                                        (basename file1))
-                                       (tarball-sans-extension
-                                        (basename file2)))))
-           ((and tarballs (reference _ ...))
-            (let* ((version  (tarball->version reference))
-                   (tarballs (filter (lambda (file)
-                                       (string=? (tarball-sans-extension
-                                                  (basename file))
-                                                 (tarball-sans-extension
-                                                  (basename reference))))
-                                     tarballs)))
-              (upstream-source
-               (package name)
-               (version version)
-               (urls (map (lambda (file)
-                            (string-append "mirror://kde/" file))
-                          tarballs)))))
-           (()
-            #f))))
-
 (define (latest-xorg-release package)
   "Return the latest release of PACKAGE, the name of an X.org package."
   (let ((uri (string->uri (origin-uri (package-source package)))))
@@ -754,13 +659,6 @@ be determined."
                 (pure-gnu-package? package))))
    (latest latest-release*)))
 
-(define %kde-updater
-  (upstream-updater
-    (name 'kde)
-    (description "Updater for KDE packages")
-    (pred (url-prefix-predicate "mirror://kde/"))
-    (latest latest-kde-release)))
-
 (define %xorg-updater
   (upstream-updater
    (name 'xorg)
diff --git a/guix/import/kde.scm b/guix/import/kde.scm
new file mode 100644
index 0000000000..927ecc8263
--- /dev/null
+++ b/guix/import/kde.scm
@@ -0,0 +1,158 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 David Craven 
+;;; Copyright © 2016, 2017 Ludovic Courtès 
+;;; Copyright © 2019 Hartmut Goebel 
+;;;
+;;; 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 .
+
+(define-module (guix import kde)
+  #:use-module (guix http-client)
+  #:use-module (guix memoization)
+  #:use-module (guix gnu-maintenance)
+  #:use-module (guix packages)
+  #:use-module (guix upstream)
+  #:use-module (guix utils)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 regex)
+  #:use-module (srfi srfi-11)
+  #:use-module (web uri)
+
+  #:export (%kde-updater))
+
+;;; Commentary:
+;;;
+;;; This package provides not an actual importer but simply an updater for
+;;; KDE packages.  It grabs available files from the 'ls-lR.bz2' file
+;;; available on download.kde.org.
+;;;
+;;; Code:
+
+(define (tarball->version tarball)
+  "Return the version TARBALL corresponds to.  TARBALL is a file name like
+\"coreutils-8.23.tar.xz\"."
+  (let-values (((name version)
+                (gnu-package-name->name+version
+                 (tarball-sans-extension tarball))))
+    version))
+
+(define %kde-file-list-uri
+  ;; URI of the file list (ls -lR format) for download.kde.org.
+  (string->uri "https://download.kde.org/ls-lR.bz2"))
+
+(define (download.kde.org-files)
+  ;;"Return the list of files available at download.kde.org."
+
+    (define (ls-lR-line->filename path line)
+      ;; Remove mode, blocks, user, group, size, date, time and one space,
+      ;; then prepend PATH
+      (regexp-substitute
+       #f (string-match "^(\\S+\\s+){6}\\S+\\s" line) path 'post))
+
+    (define (canonicalize path)
+      (let* ((path (if (string-prefix? "/srv/archives/ftp/" path)
+                       (string-drop path (string-length "/srv/archives/ftp"))
+                       path))
+             (path (if (string-suffix? ":" path)
+                       (string-drop-right path 1)
+                       path))
+             (path (if (not (string-suffix? "/" path))
+                       (string-append path "/")
+                       path)))
+        path))
+
+    (define (write-cache input cache)
+      "Read bzipped ls-lR from INPUT, and write it as a list of file paths to
+CACHE."
+      (call-with-decompressed-port 'bzip2 input
+        (lambda (input)
+          (let loop_dirs ((files '()))
+            ;; process a new directory block
+            (let ((path (read-line input)))
+              (if
+               (or (eof-object? path) (string= path ""))
+               (write (reverse files) cache)
+               (let loop_entries ((path (canonicalize path))
+                                  (files files))
+                 ;; process entries within the directory block
+                 (let ((line (read-line input)))
+                   (cond
+                    ((eof-object? line)
+                     (write (reverse files) cache))
+                    ((string-prefix? "-" line)
+                     ;; this is a file entry: prepend to FILES, then re-enter
+                     ;; the loop for remaining entries
+                     (loop_entries path
+                                   (cons (ls-lR-line->filename path line) files)
+                                   ))
+                    ((not (string= line ""))
+                     ;; this is a non-file entry: ignore it, just re-enter the
+                     ;; loop for remaining entries
+                     (loop_entries path files))
+                    ;; empty line: directory block end, re-enter the outer
+                    ;; loop for the next block
+                    (#t (loop_dirs files)))))))))))
+
+  (define (cache-miss uri)
+    (format (current-error-port) "fetching ~a...~%" (uri->string uri)))
+
+  (let* ((port (http-fetch/cached %kde-file-list-uri
+                                  #:ttl 3600
+                                  #:write-cache write-cache
+                                  #:cache-miss cache-miss))
+         (files (read port)))
+    (close-port port)
+    files))
+
+(define (latest-kde-release package)
+  "Return the latest release of PACKAGE, a KDE package, or #f if it could
+not be determined."
+  (let* ((uri      (string->uri (origin-uri (package-source package))))
+         (directory  (dirname (dirname (uri-path uri))))
+         (name     (package-upstream-name package))
+         (files    (download.kde.org-files))
+         (relevant (filter (lambda (file)
+                             (and (string-prefix? directory file)
+                                  (release-file? name (basename file))))
+                           files)))
+    (match (sort relevant (lambda (file1 file2)
+                            (version>? (tarball-sans-extension
+                                        (basename file1))
+                                       (tarball-sans-extension
+                                        (basename file2)))))
+           ((and tarballs (reference _ ...))
+            (let* ((version  (tarball->version reference))
+                   (tarballs (filter (lambda (file)
+                                       (string=? (tarball-sans-extension
+                                                  (basename file))
+                                                 (tarball-sans-extension
+                                                  (basename reference))))
+                                     tarballs)))
+              (upstream-source
+               (package name)
+               (version version)
+               (urls (map (lambda (file)
+                            (string-append "mirror://kde/" file))
+                          tarballs)))))
+           (()
+            #f))))
+
+(define %kde-updater
+  (upstream-updater
+    (name 'kde)
+    (description "Updater for KDE packages")
+    (pred (url-prefix-predicate "mirror://kde/"))
+    (latest latest-kde-release)))
-- 
cgit v1.2.3


From 4eb69bf0d33810886ee118f38989cef696e4c868 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 4 Aug 2019 11:32:39 +0200
Subject: import: KDE updater finds packages even in sub-directory.

Fixes  and
finally fixes .

Formerly packages living in a path like
/stable/frameworks/5.60/portingAids/kross-5.60.0.tar.xz
have not been found.

* guix/import/kde.scm (uri->kde-path-pattern): New procedure.
  (latest-kde-release): Use pattern to search for file.
---
 guix/import/kde.scm | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/guix/import/kde.scm b/guix/import/kde.scm
index 927ecc8263..6873418d62 100644
--- a/guix/import/kde.scm
+++ b/guix/import/kde.scm
@@ -117,15 +117,47 @@ CACHE."
     (close-port port)
     files))
 
+(define (uri->kde-path-pattern uri)
+  "Build a regexp from the package's URI suitable for matching the package
+path version-agnostic.
+
+Example:
+Input:
+   mirror://kde//stable/frameworks/5.55/portingAids/kross-5.55.0.zip
+Output:
+   //stable/frameworks/[^/]+/portingAids/
+"
+
+  (define version-regexp
+    ;; regexp for matching versions as used in the ld-lR file
+    (make-regexp
+     (string-join '("^([0-9]+\\.)+[0-9]+-?"   ;; 5.12.90, 4.2.0-preview
+                    "^[0-9]+$"                ;; 20031002
+                    ".*-([0-9]+\\.)+[0-9]+$") ;; kdepim-4.6.1
+                    "|")))
+
+  (define (version->pattern part)
+    ;; If a path element might be a version, replace it by a catch-all part
+    (if (regexp-exec version-regexp part)
+        "[^/]+"
+        part))
+
+  (let* ((path (uri-path uri))
+         (directory-parts (string-split (dirname path) #\/)))
+    (make-regexp
+     (string-append
+      (string-join (map version->pattern directory-parts) "/")
+      "/"))))
+
 (define (latest-kde-release package)
   "Return the latest release of PACKAGE, a KDE package, or #f if it could
 not be determined."
   (let* ((uri      (string->uri (origin-uri (package-source package))))
-         (directory  (dirname (dirname (uri-path uri))))
+         (path-rx  (uri->kde-path-pattern uri))
          (name     (package-upstream-name package))
          (files    (download.kde.org-files))
          (relevant (filter (lambda (file)
-                             (and (string-prefix? directory file)
+                             (and (regexp-exec path-rx file)
                                   (release-file? name (basename file))))
                            files)))
     (match (sort relevant (lambda (file1 file2)
-- 
cgit v1.2.3


From 07c0110eac24f2e1dc292e143d93f681244838a3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 15:26:38 +0200
Subject: gnu: weechat: Update to 2.6.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/irc.scm (weechat): Update to 2.6.
[source]: Remove obsolete patch.
[inputs]: Replace python-2 with python(@3).
[arguments]: Remove ‘wrap’ phase.
* gnu/packages/patches/weechat-python.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                              |  1 -
 gnu/packages/irc.scm                      | 20 ++++++----------
 gnu/packages/patches/weechat-python.patch | 40 -------------------------------
 3 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 gnu/packages/patches/weechat-python.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b7a5ef825b..d76438ca63 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1398,7 +1398,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/wavpack-CVE-2018-6767.patch		\
   %D%/packages/patches/wavpack-CVE-2018-7253.patch		\
   %D%/packages/patches/wavpack-CVE-2018-7254.patch		\
-  %D%/packages/patches/weechat-python.patch			\
   %D%/packages/patches/wicd-bitrate-none-fix.patch		\
   %D%/packages/patches/wicd-get-selected-profile-fix.patch	\
   %D%/packages/patches/wicd-urwid-1.3.patch			\
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 622f1253d8..e3418c1fec 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2016 ng0 
 ;;; Copyright © 2017 Marius Bakke 
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -166,15 +166,14 @@ SILC and ICB protocols via plugins.")
 (define-public weechat
   (package
     (name "weechat")
-    (version "2.5")
+    (version "2.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://weechat.org/files/src/weechat-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "09sc5lf7z70x3iw87q4zh8rbyngsw89pwnzs5jk195zzqdspgj2j"))
-              (patches (search-patches "weechat-python.patch"))))
+                "0j2iflnfvv31q2l9r67r8aj3ipggqfm2r2dpy7pvdpxgwwq337ps"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("gettext" ,gettext-minimal)
@@ -187,9 +186,11 @@ SILC and ICB protocols via plugins.")
               ("aspell" ,aspell)
               ("curl" ,curl)
               ("gnutls" ,gnutls)
+
+              ;; Scripting language plug-ins.
               ("guile" ,guile-2.0)
               ("lua" ,lua-5.1)
-              ("python" ,python-2)
+              ("python" ,python)
               ("perl" ,perl)
               ("tcl" ,tcl)))
     (arguments
@@ -214,14 +215,7 @@ SILC and ICB protocols via plugins.")
              (substitute* "tests/scripts/test-scripts.cpp"
                ((".*\\{ \"(javascript|php|ruby)\", " all)
                 (string-append "// SKIP" all)))
-             #t))
-         (add-after 'install 'wrap
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (py2 (assoc-ref inputs "python")))
-               (wrap-program (string-append out "/bin/weechat")
-                 `("PATH" ":" prefix (,(string-append py2 "/bin"))))
-               #t))))))
+             #t)))))
     (synopsis "Extensible chat client")
     (description "WeeChat (Wee Enhanced Environment for Chat) is an
 @dfn{Internet Relay Chat} (IRC) client, which is designed to be light and fast.
diff --git a/gnu/packages/patches/weechat-python.patch b/gnu/packages/patches/weechat-python.patch
deleted file mode 100644
index 8182636ecb..0000000000
--- a/gnu/packages/patches/weechat-python.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Get Python LDFLAGS from 'pkg-config'.
-
-The other approach is more complex and gets it wrong: it returns
-"-L/path/to/python/lib/python-2.7.10/lib/python2.7/config -lpython -lwhatever";
-since that config/ sub-directory contains libpython2.7.a, we end up
-statically linking Python in Weechat's python.so, which we do not want.
-
---- weechat-1.3/configure.ac	2015-08-16 08:27:07.000000000 +0200
-+++ weechat-1.3/configure.ac	2015-11-29 18:18:52.975197048 +0100
-@@ -535,29 +535,7 @@ if test "x$enable_python" = "xyes" ; the
-             if test -r "$PYTHON_INCLUDE/Python.h"; then
-                 PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
-                 AC_MSG_RESULT(found)
--                PYTHON_LIB=`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBPL'))"`
--                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED'))"`
--                AC_MSG_CHECKING(for Python library)
--                if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
--                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
--                   AC_MSG_RESULT(found)
--                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
--                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
--                   AC_MSG_RESULT(found)
--                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.dll.a"; then
--                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
--                   AC_MSG_RESULT(found)
--                elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
--                   PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
--                   AC_MSG_RESULT(found)
--                else
--                    AC_MSG_WARN([
--*** Python library couldn't be found on your system.
--*** Try to install it with your software package manager.
--*** WeeChat will be built without Python support.])
--                    enable_python="no"
--                    not_found="$not_found python"
--                fi
-+                PYTHON_LFLAGS=`pkg-config python2 --libs`
-             else
-                 AC_MSG_WARN([
- *** Python header files couldn't be found on your system.
-- 
cgit v1.2.3


From 97e036cac1e2210924b67f4a647625171552e4b3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 19:38:40 +0200
Subject: gnu: i3blocks: Update to 1.5.

* gnu/packages/wm.scm (i3blocks): Update to 1.5.
[source]: Use git tag.
[arguments]: Remove entirely.
---
 gnu/packages/wm.scm | 54 +++++++++++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index c62ccf4990..c4b15cc755 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -271,42 +271,30 @@ Despite the name it should work with any X11 window manager.")
     (license license:bsd-3)))
 
 (define-public i3blocks
-  (let ((commit "ec050e79ad8489a6f8deb37d4c20ab10729c25c3")
-        (revision "2"))
-    (package
-      (name "i3blocks")
-      (version (string-append "1.4-" revision "."
-                              (string-take commit 7)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/vivien/i3blocks.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b"))
-                (file-name (git-file-name name version))))
-      (build-system gnu-build-system)
-      (arguments
-       `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
-         #:phases (modify-phases %standard-phases
-                    (add-after 'install 'install-doc
-                      (lambda* (#:key outputs #:allow-other-keys)
-                        (let* ((out (assoc-ref outputs "out"))
-                               (man1 (string-append out "/share/man/man1")))
-                          (install-file "docs/i3blocks.1" man1)
-                          #t))))))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("pkg-config" ,pkg-config)))
-      (home-page "https://github.com/vivien/i3blocks")
-      (synopsis "Minimalist scheduler for status bar scripts")
-      (description "i3blocks executes your command lines and generates a
+  (package
+    (name "i3blocks")
+    (version "1.5")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/vivien/i3blocks.git")
+                    (commit version)))
+              (sha256
+               (base32
+                "0v8mwnm8qzpv6xnqvrk43s4b9iyld4naqzbaxk4ldq1qkhai0wsv"))
+              (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/vivien/i3blocks")
+    (synopsis "Minimalist scheduler for status bar scripts")
+    (description "i3blocks executes your command lines and generates a
 status line from their output.  The generated line is meant to be displayed by
 the i3 window manager through its i3bar component, as an alternative to
 i3status.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public perl-anyevent-i3
   (package
-- 
cgit v1.2.3


From db05b572056128191c457143bdafa7aaf22ece9d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 21:38:55 +0200
Subject: gnu: youtube-dl: Update to 2019.09.01.

* gnu/packages/video.scm (youtube-dl): Update to 2019.09.01.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d5dfb1383e..66bc55e33e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1492,7 +1492,7 @@ access to mpv's powerful playback capabilities.")
 (define-public youtube-dl
   (package
     (name "youtube-dl")
-    (version "2019.08.13")
+    (version "2019.09.01")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/rg3/youtube-dl/releases/"
@@ -1500,7 +1500,7 @@ access to mpv's powerful playback capabilities.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0b94hrhbqa7jhn91pxsbphg2ylwkpkknb2y4v4sczp7rjvgmjgdj"))))
+                "0jbby0x5krww1acc8qxhmmwg0dsqmj6yjnynfm7r6k3rxbvlydqr"))))
     (build-system python-build-system)
     (arguments
      ;; The problem here is that the directory for the man page and completion
-- 
cgit v1.2.3


From 08dd5f673d02ef0474124a546dcbd99809ecc492 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 21:47:08 +0200
Subject: gnu: strongswan: Update to 5.8.1.

* gnu/packages/networking.scm (strongswan): Update to 5.8.1.
---
 gnu/packages/networking.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a80b24a6cf..6bdf7f9e2f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1970,14 +1970,14 @@ displays the results in real time.")
 (define-public strongswan
   (package
     (name "strongswan")
-    (version "5.8.0")
+    (version "5.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.strongswan.org/strongswan-"
                            version ".tar.bz2"))
        (sha256
-        (base32 "0cq9m86ydd2i0awxkv4a256f4926p2f9pzlisyskl9fngl6f3c8m"))))
+        (base32 "034rd6kr1bmnvj8rg2kcxdjb0cgj3dn9310mmm94j1awxan71byr"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -2000,7 +2000,7 @@ displays the results in real time.")
              #t)))
        #:configure-flags
        (list
-        ;; Disable bsd-4 licensed plugins
+        ;; Disable bsd-4 licensed plugins.
         "--disable-des"
         "--disable-blowfish")))
     (inputs
-- 
cgit v1.2.3


From 7e143375d3649f3c0bd4c13958b26c086f364647 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:00:42 +0200
Subject: gnu: links: Update to 2.20.1 [security fix for tor users].

* gnu/packages/web-browsers.scm (links): Update to 2.20.1.
---
 gnu/packages/web-browsers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 3368772ec6..22ecf3cfec 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -93,14 +93,14 @@ older or slower computers and embedded systems.")
 (define-public links
   (package
     (name "links")
-    (version "2.19")
+    (version "2.20.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://links.twibright.com/download/"
                                   "links-" version ".tar.bz2"))
                 (sha256
                (base32
-                "02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh"))))
+                "0184g59cxxhg9dqg5gv66f30f1wg8sx957pp5rs7b8icnwnafa5v"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 489d16577e4a6ccc30f3719d9263900089edd842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 10 Sep 2019 19:04:51 +0200
Subject: gnu: cmake: Add package variant that knows about X.509 certificates.

Fixes .

* gnu/packages/patches/cmake-curl-certificates.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/cmake.scm (cmake/fixed): New variable.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/cmake.scm                             | 12 +++++++
 gnu/packages/patches/cmake-curl-certificates.patch | 40 ++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 gnu/packages/patches/cmake-curl-certificates.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d76438ca63..3f32b9cbf2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -744,6 +744,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/clementine-use-openssl.patch		\
   %D%/packages/patches/clisp-remove-failing-test.patch		\
   %D%/packages/patches/clucene-pkgconfig.patch			\
+  %D%/packages/patches/cmake-curl-certificates.patch		\
   %D%/packages/patches/coda-use-system-libs.patch		\
   %D%/packages/patches/combinatorial-blas-awpm.patch		\
   %D%/packages/patches/combinatorial-blas-io-fix.patch		\
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 7186cf98df..95f884b36d 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -164,6 +164,18 @@ and workspaces that can be used in the compiler environment of your choice.")
                    license:expat             ; cmjsoncpp is dual MIT/public domain
                    license:public-domain)))) ; cmlibarchive/archive_getdate.c
 
+(define-public cmake/fixed
+  ;; This is a variant of CMake that fixes X.509 certificate lookup:
+  ;; .
+  (package
+    (inherit cmake)
+    (version (string-append (package-version cmake) "-1"))
+    (source (origin
+              (inherit (package-source cmake))
+              (patches
+               (append (search-patches "cmake-curl-certificates.patch")
+                       (origin-patches (package-source cmake))))))))
+
 (define-public emacs-cmake-mode
   (package
     (inherit cmake)
diff --git a/gnu/packages/patches/cmake-curl-certificates.patch b/gnu/packages/patches/cmake-curl-certificates.patch
new file mode 100644
index 0000000000..36252083f8
--- /dev/null
+++ b/gnu/packages/patches/cmake-curl-certificates.patch
@@ -0,0 +1,40 @@
+By default commands such as "ctest" would not look for certificates
+at all: .
+
+This changes CMake such that commands honor SSL_CERT_FILE and SSL_CERT_DIR
+as well as /etc/ssl/certs.
+
+--- cmake-3.13.1/Source/cmCurl.cxx	2019-09-10 17:27:36.926907260 +0200
++++ cmake-3.13.1/Source/cmCurl.cxx	2019-09-10 17:52:35.475903919 +0200
+@@ -4,11 +4,8 @@
+ 
+ #include "cmThirdParty.h"
+ 
+-#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) &&                    \
+-  !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH)
+ #  define CMAKE_FIND_CAFILE
+ #  include "cmSystemTools.h"
+-#endif
+ 
+ // curl versions before 7.21.5 did not provide this error code
+ #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505
+@@ -29,6 +26,19 @@ std::string cmCurlSetCAInfo(::CURL* curl
+     ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile);
+     check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
+   }
++
++  /* Honor the usual environment variables.  */
++  else if (cmSystemTools::GetEnv("SSL_CERT_FILE", e)) {
++    ::CURLcode res =
++      ::curl_easy_setopt(curl, CURLOPT_CAINFO, e.c_str());
++    check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
++  }
++  else if (cmSystemTools::GetEnv("SSL_CERT_DIR", e)) {
++    ::CURLcode res =
++      ::curl_easy_setopt(curl, CURLOPT_CAPATH, e.c_str());
++    check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: ");
++  }
++
+ #ifdef CMAKE_FIND_CAFILE
+ #  define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt"
+   else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) {
-- 
cgit v1.2.3


From 984cabc4a66cd6b58354887530d136e92bd8a172 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 24 Aug 2019 04:47:38 +0200
Subject: gnu: python-language-server: Update to 0.28.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-xyz.scm (python-language-server): Update to 0.28.1.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 16f1331a84..a928677858 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2987,14 +2987,14 @@ Server (PLS).")
 (define-public python-language-server
   (package
     (name "python-language-server")
-    (version "0.26.1")
+    (version "0.28.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-language-server" version))
        (sha256
         (base32
-         "1vs9ckfmm534n1hq3m871916wsjvi5h4gyj6wlzg13ck6506lx0s"))))
+         "1qbiij208l6g1l5hzihx8badhmqkxdk0spn7gm7564yg54zdp2g2"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pluggy" ,python-pluggy)
-- 
cgit v1.2.3


From c3c0eda646f749d8603fbdacb281fd14112b1139 Mon Sep 17 00:00:00 2001
From: Steve Sprang 
Date: Fri, 23 Aug 2019 15:38:42 -0700
Subject: gnu: Add opencsg.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/graphics.scm (opencsg): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/graphics.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index b06a369325..988b519ffa 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2018 Kei Kebreau 
 ;;; Copyright © 2019 Mark H Weaver 
 ;;; Copyright © 2019 Carlo Zancanaro 
+;;; Copyright © 2019 Steve Sprang 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1018,3 +1019,43 @@ requirements.")
 performance subdivision surface (subdiv) evaluation on massively parallel CPU
 and GPU architectures.")
     (license license:asl2.0)))
+
+(define-public opencsg
+  (let ((dot-to-dash (lambda (c) (if (char=? c #\.) #\- c))))
+    (package
+      (name "opencsg")
+      (version "1.4.2")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/floriankirsch/OpenCSG.git")
+               (commit (string-append "opencsg-"
+                                      (string-map dot-to-dash version)
+                                      "-release"))))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "00m4vs6jn3scqczscc4591l1d6zg6anqp9v1ldf9ymf70rdyvm7m"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (replace 'configure
+             (lambda* (#:key outputs #:allow-other-keys)
+               (substitute* "src/Makefile"
+                 (("/usr/local") (assoc-ref outputs "out")))
+               #t))
+           (add-before 'build 'skip-example
+             (lambda _ (chdir "src") #t)))))
+      (inputs
+       `(("glew" ,glew)
+         ("freeglut" ,freeglut)))
+      (synopsis "Library for rendering Constructive Solid Geometry (CSG)")
+      (description
+       "OpenCSG is a library for rendering Constructive Solid Geometry (CSG) using
+OpenGL.  CSG is an approach for modeling complex 3D-shapes using simpler ones.
+For example, two shapes can be combined by uniting them, by intersecting them,
+or by subtracting one shape from the other.")
+      (home-page "http://www.opencsg.org/")
+      (license license:gpl2))))
-- 
cgit v1.2.3


From eb7ce870e0991669d795f5e14dc85b632be1c158 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 9 Sep 2019 06:37:16 +0200
Subject: gnu: emacs-helm-company: Update to 0.2.5.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-helm-company): Update to 0.2.5.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs-xyz.scm | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f3de24d825..704fbfbc6b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14260,30 +14260,29 @@ on-line service.")
     (license license:gpl3+)))
 
 (define-public emacs-helm-company
-  (let ((commit "d3fc093a0e833b4dee6561c00d6df3d62aa50f3f"))
-    (package
-      (name "emacs-helm-company")
-      (version (git-version "0.2.3" "1" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/Sodel-the-Vociferous/helm-company")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "1ciirsanhajdqm5iwl8k9ywf4jha1wdv4sc4d9kslyrfr9zn4q6k"))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       `(("emacs-helm" ,emacs-helm)
-         ("emacs-company" ,emacs-company)))
-      (home-page "https://github.com/Sodel-the-Vociferous/helm-company")
-      (synopsis "Helm interface for company-mode")
-      (description
-       "This is a Helm interface to company-mode, a text completion
+  (package
+    (name "emacs-helm-company")
+    (version "0.2.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Sodel-the-Vociferous/helm-company")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-helm" ,emacs-helm)
+       ("emacs-company" ,emacs-company)))
+    (home-page "https://github.com/Sodel-the-Vociferous/helm-company")
+    (synopsis "Helm interface for company-mode")
+    (description
+     "This is a Helm interface to company-mode, a text completion
 framework.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-helm-descbinds
   (let ((commit "033be73f21778633813264ce1634a6e1ad873d8e"))
-- 
cgit v1.2.3


From 389cae8b0727bff958e4a2dd98526cf7edbe9ade Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:18:39 +0200
Subject: gnu: haveged: Update to 1.9.6.

* gnu/packages/linux.scm (haveged): Update to 1.9.6.
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 92b9d2ece1..8b18587c76 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4455,16 +4455,16 @@ cpufreq sub-system is enabled or not.")
 (define-public haveged
   (package
     (name "haveged")
-    (version "1.9.4")
+    (version "1.9.6")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/jirka-h/haveged.git")
-             (commit version)))
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1hrwzjd4byq4fdrg8svww3d8x449k80jxxrjy9v6jvzhfv19rvxr"))))
+        (base32 "11kr19n2f87izsj341lv5amhd1wc2ckfmqr9pq5fxix8pkbs94rh"))))
     (build-system gnu-build-system)
     (home-page "http://www.issihosts.com/haveged")
     (synopsis "Entropy source for the Linux random number generator")
-- 
cgit v1.2.3


From 6664ec0c8a978accebc3a7eadd6a83dc4a4b28e8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:19:08 +0200
Subject: gnu: haveged: Use HTTPS home page.

* gnu/packages/linux.scm (haveged)[home-page]: Use HTTPS.
---
 gnu/packages/linux.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8b18587c76..38bfa09b2b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4466,7 +4466,7 @@ cpufreq sub-system is enabled or not.")
        (sha256
         (base32 "11kr19n2f87izsj341lv5amhd1wc2ckfmqr9pq5fxix8pkbs94rh"))))
     (build-system gnu-build-system)
-    (home-page "http://www.issihosts.com/haveged")
+    (home-page "https://www.issihosts.com/haveged")
     (synopsis "Entropy source for the Linux random number generator")
     (description
      "haveged generates an unpredictable stream of random numbers for use by
-- 
cgit v1.2.3


From 8e42b087f09aade76076b8bda0d2a1cfaceba35b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:23:01 +0200
Subject: gnu: haveged: Use @acronym in description.

* gnu/packages/linux.scm (havege)[description]: Substitute @acronym
for @dfn mark-up.
---
 gnu/packages/linux.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 38bfa09b2b..1fc4d7d98e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4475,10 +4475,10 @@ standard mechanisms for filling the entropy pool may not be sufficient for
 systems with high needs or limited user interaction, such as headless servers.
 
 @command{haveged} runs as a privileged daemon, harvesting randomness from the
-indirect effects of hardware events on hidden processor state using the HArdware
-Volatile Entropy Gathering and Expansion (@dfn{HAVEGE}) algorithm.  It tunes
-itself to its environment and provides the same built-in test suite for the
-output stream as used on certified hardware security devices.
+indirect effects of hardware events on hidden processor state using the
+@acronym{HAVEGE, HArdware Volatile Entropy Gathering and Expansion} algorithm.
+It tunes itself to its environment and provides the same built-in test suite
+for the output stream as used on certified hardware security devices.
 
 The quality of the randomness produced by this algorithm has not been proven.
 It is recommended to run it together with another entropy source like rngd, and
-- 
cgit v1.2.3


From 0edfe5533249df00b2fc0a43c27447fa7ddc7ed6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:19:28 +0200
Subject: gnu: perl-archive-zip: Update to 1.65.

* gnu/packages/perl-compression.scm (perl-archive-zip): Update to 1.65.
---
 gnu/packages/perl-compression.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm
index ea71492262..d09e68e294 100644
--- a/gnu/packages/perl-compression.scm
+++ b/gnu/packages/perl-compression.scm
@@ -133,7 +133,7 @@ type by using either Perl modules, or command-line tools on your system.")
 (define-public perl-archive-zip
   (package
     (name "perl-archive-zip")
-    (version "1.64")
+    (version "1.65")
     (source
      (origin
        (method url-fetch)
@@ -141,8 +141,7 @@ type by using either Perl modules, or command-line tools on your system.")
              "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-"
              version ".tar.gz"))
        (sha256
-        (base32
-         "0zfinh8nx3rxzscp57vq3w8hihpdb0zs67vvalykcf402kr88pyy"))))
+        (base32 "116vcg8x7n92i7cn3bx0xck69mz9vjy0il9i8p7p7lk40kz7jcbl"))))
     (build-system perl-build-system)
     (native-inputs
      ;; For tests.
-- 
cgit v1.2.3


From 886534b4e0ff471e951c33dd3aea4dfbd11e9420 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:32:34 +0200
Subject: gnu: yoshimi: Update to 1.6.0.1.

* gnu/packages/music.scm (yoshimi): Update to 1.6.0.1.
---
 gnu/packages/music.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index bcae8e7733..4d1e11f260 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2146,7 +2146,7 @@ capabilities, custom envelopes, effects, etc.")
 (define-public yoshimi
   (package
     (name "yoshimi")
-    (version "1.6.0")
+    (version "1.6.0.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/yoshimi/"
@@ -2154,10 +2154,10 @@ capabilities, custom envelopes, effects, etc.")
                                   "/yoshimi-" version ".tar.bz2"))
               (sha256
                (base32
-                "0bcc5spnq73yp1fmm367d1mxcswqkmzs3cnpb4cxr513ir98sa50"))))
+                "140f2k4akj39pny8c7i794q125415gyvmy4rday0il5ncp3glik4"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f ; there are no tests
+     `(#:tests? #f                      ; there are no tests
        #:configure-flags
        (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR="
                             (assoc-ref %outputs "out") "/share"))
-- 
cgit v1.2.3


From abab956bfc52fc057667cd55fd776e75916e9eea Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:34:13 +0200
Subject: gnu: umockdev: Update to 0.13.2.

* gnu/packages/check.scm (umockdev): Update to 0.13.2.
---
 gnu/packages/check.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 085538b2de..374a4d35fa 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2243,7 +2243,7 @@ provides a simple way to achieve this.")
 (define-public umockdev
   (package
     (name "umockdev")
-    (version "0.12.1")
+    (version "0.13.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/martinpitt/umockdev/"
@@ -2251,7 +2251,7 @@ provides a simple way to achieve this.")
                                   "umockdev-" version ".tar.xz"))
               (sha256
                (base32
-                "1hx5jm9afng6hw9wyp524z8nwdp6w053pca0w2c0gqpgrmvjxvd2"))))
+                "095v3abc321s584sga04y16lcmdzsdi88h24wcrm78v7vq484g74"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -2264,10 +2264,12 @@ provides a simple way to achieve this.")
              #t)))))
     (native-inputs
      `(("vala" ,vala)
-       ("python" ,python)               ; for tests
-       ("which" ,which)                 ; for tests
        ("gtk-doc" ,gtk-doc)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+
+       ;; For tests.
+       ("python" ,python)
+       ("which" ,which)))
     (inputs
      `(("glib" ,glib)
        ("eudev" ,eudev)
-- 
cgit v1.2.3


From 1d68eb321ffee0ca6c450f785cc17a735493df0d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 10 Sep 2019 23:50:27 +0200
Subject: gnu: gvfs: Don't use NAME in source URI.

* gnu/packages/gnome.scm (gvfs)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d40919693a..4d7ed45f77 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4182,9 +4182,9 @@ part of udev-extras, then udev, then systemd.  It's now a project on its own.")
     (version "1.36.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/gvfs/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "gvfs-" version ".tar.xz"))
               (sha256
                (base32
                 "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4"))))
-- 
cgit v1.2.3


From b5b0fd23548ac06e5c5ce3f890218579605ef024 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 00:08:37 +0200
Subject: gnu: tracker: Don't use NAME in source URI.

* gnu/packages/gnome.scm (tracker)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4d7ed45f77..f002ff17b7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6299,9 +6299,9 @@ easy, safe, and automatic.")
     (version "2.0.4")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/tracker/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "tracker-" version ".tar.xz"))
               (sha256
                (base32
                 "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf"))))
-- 
cgit v1.2.3


From c1b79b36524d38b80f7ed7e139a231dbb928833f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 00:11:24 +0200
Subject: gnu: libsoup: Don't use NAME in source URI.

* gnu/packages/gnome.scm (libsoup)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f002ff17b7..562f2981e9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2701,7 +2701,7 @@ libxml to ease remote use of the RESTful API.")
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libsoup/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "libsoup-" version ".tar.xz"))
               (sha256
                (base32
                 "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx"))))
-- 
cgit v1.2.3


From c5e3f4f0438cfde1cb9133caf8178a1ed4bd6695 Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Wed, 11 Sep 2019 10:19:59 +0200
Subject: gnu: libnftnl: Update to 1.1.4.

* gnu/packages/linux.scm (libnftnl): Update to 1.1.4.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1fc4d7d98e..92831b63a8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5128,14 +5128,14 @@ re-use code and to avoid re-inventing the wheel.")
 (define-public libnftnl
   (package
     (name "libnftnl")
-    (version "1.1.3")
+    (version "1.1.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://netfilter.org/libnftnl/"
                            "libnftnl-" version ".tar.bz2"))
        (sha256
-        (base32 "03xszkcpqk3s1rqc6vh7g5j13kh3d3yjnvjhk5scds3an39rgp92"))))
+        (base32 "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From f8b7c35ad0f06cd2cdd508ad6869d29530beb3c8 Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Wed, 11 Sep 2019 10:20:26 +0200
Subject: gnu: nftables: Update to 0.9.2.

* gnu/packages/linux.scm (nftables): Update to 0.9.2.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 92831b63a8..148254e63f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5152,7 +5152,7 @@ used by nftables.")
 (define-public nftables
   (package
     (name "nftables")
-    (version "0.9.0")
+    (version "0.9.2")
     (source
      (origin
        (method url-fetch)
@@ -5160,7 +5160,7 @@ used by nftables.")
                            "/files/nftables-" version ".tar.bz2"))
        (sha256
         (base32
-         "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"))))
+         "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw"))))
     (build-system gnu-build-system)
     (arguments `(#:configure-flags
                  '("--disable-man-doc"))) ; FIXME: Needs docbook2x.
-- 
cgit v1.2.3


From 2316ce51870744b80562a45415343d78fda1afd7 Mon Sep 17 00:00:00 2001
From: Steve Sprang 
Date: Tue, 10 Sep 2019 16:22:57 -0700
Subject: gnu: Add openscad.

* gnu/packages/engineering.scm (openscad): New variable.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/engineering.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 7f5409c835..c1c1b18ed3 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -65,6 +65,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gperf)
+  #:use-module (gnu packages graphics)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
@@ -89,6 +90,7 @@
   #:use-module (gnu packages tex)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg))
 
 (define-public librecad
@@ -2145,3 +2147,70 @@ well as conversion and validation tools for input and output data.  The
 specification can be downloaded at @url{http://3mf.io/specification/}.")
     (home-page "https://3mf.io/")
     (license license:bsd-2)))
+
+(define-public openscad
+  (package
+    (name "openscad")
+    (version "2019.05")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://files.openscad.org/openscad-" version
+                           ".src.tar.gz"))
+       (sha256
+        (base32
+         "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("boost" ,boost)
+       ("cgal" ,cgal)
+       ("double-conversion" ,double-conversion)
+       ("eigen" ,eigen)
+       ("fontconfig" ,fontconfig)
+       ("glew" ,glew)
+       ("gmp" ,gmp)
+       ("harfbuzz" ,harfbuzz)
+       ("lib3mf" ,lib3mf)
+       ("libxml2" ,libxml2)
+       ("libzip" ,libzip)
+       ("mpfr" ,mpfr)
+       ("opencsg" ,opencsg)
+       ("qscintilla" ,qscintilla)
+       ("qtbase" ,qtbase)
+       ("qtmultimedia" ,qtmultimedia)))
+    (native-inputs
+     `(("bison" ,bison)
+       ("flex" ,flex)
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)
+       ("which" ,which)
+       ;; the following are only needed for tests
+       ("imagemagick" ,imagemagick)
+       ("ps" ,procps)
+       ("python" ,python)
+       ("xvfb" ,xorg-server)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (invoke "qmake"
+                     (string-append "PREFIX=" (assoc-ref outputs "out")))
+             #t))
+         (replace 'check
+           (lambda _
+             (with-directory-excursion "tests"
+               (invoke "cmake" ".")
+               (invoke "make")
+               (invoke "ctest"))
+             ;; strip python test files since lib dir ends up in out/share
+             (for-each delete-file
+                       (find-files "libraries/MCAD" ".*\\.py"))
+             #t)))))
+    (synopsis "Script-based 3D modeling application")
+    (description
+     "OpenSCAD is a 3D Computer-aided Design (CAD) application.  Unlike an
+interactive modeler, OpenSCAD generates 3D models from a script, giving you
+full programmatic control over your models.")
+    (home-page "https://www.openscad.org/")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From 1475094a457cd927e149d54ec9b8f59a8b05f0f2 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 10 Sep 2019 22:28:00 +0900
Subject: gnu: python-parso: Update to 0.5.1.

* gnu/packages/python-xyz.scm (python-parso): Update to 0.5.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a928677858..ea183c0301 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14744,14 +14744,14 @@ time-based (TOTP) passwords.")
 (define-public python-parso
   (package
     (name "python-parso")
-    (version "0.3.1")
+    (version "0.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "parso" version))
        (sha256
         (base32
-         "18p89iwcm8mnf380f92g9w0bhx5km8wxp392vvjcq4y1ld1llw1m"))))
+         "171a9ivhxwsd52h1cgsz40zgzpgzscn7yqb7sdjhy8m1lzj0wsv6"))))
     (native-inputs
      `(("python-pytest" ,python-pytest)))
     (build-system python-build-system)
-- 
cgit v1.2.3


From 4eb97c254effc95115d5e9da1b7083ecbc427a2f Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 10 Sep 2019 22:34:22 +0900
Subject: gnu: python-parso: Run the test suite.

* gnu/packages/python-xyz.scm (python-parso)[phases]: Replace the check phase.
---
 gnu/packages/python-xyz.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ea183c0301..991082eed0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14755,6 +14755,10 @@ time-based (TOTP) passwords.")
     (native-inputs
      `(("python-pytest" ,python-pytest)))
     (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda _ (invoke "pytest" "-vv"))))))
     (home-page "https://github.com/davidhalter/parso")
     (synopsis "Python Parser")
     (description "Parso is a Python parser that supports error recovery and
-- 
cgit v1.2.3


From 296e1aea65eda887d9c9ce14038fec5ff090b977 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Wed, 11 Sep 2019 09:34:29 +0900
Subject: gnu: python-jedi: Update to 0.15.1 and re-enable tests.

* gnu/packages/python-xyz.scm (python-jedi): Update to 0.15.1; re-enable
tests.
---
 gnu/packages/python-xyz.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 991082eed0..819b3045a3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10556,25 +10556,29 @@ characters, mouse support, and auto suggestions.")
 (define-public python-jedi
   (package
     (name "python-jedi")
-    (version "0.13.3")
+    (version "0.15.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "jedi" version))
        (sha256
         (base32
-         "0nsrjlb57njqppxmi8wjsb1dkad7qa7svx67jbkhixq66lz61c1b"))))
+         "0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds"))))
     (build-system python-build-system)
     (arguments
-     `( ;; Many tests are failing with Python 3.7.x as of version 0.13.3 (see:
-        ;; https://github.com/davidhalter/jedi/issues/1263)
-       #:tests? #f
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'disable-file-completion-test
+           ;; A single parameterized test currently fail (see:
+           ;; https://github.com/davidhalter/jedi/issues/1395).  Remove it.
+           (lambda _
+             (substitute* "test/test_api/test_completion.py"
+               ((".*'example.py', 'rb\"' \\+ join\\('\\.\\.'.*") ""))
+             #t))
          (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "py.test" "-vv")))))))
+           (lambda _
+             (setenv "HOME" "/tmp")
+             (invoke "python" "-m" "pytest"))))))
     (native-inputs
      `(("python-pytest" ,python-pytest)
        ("python-docopt" ,python-docopt)))
@@ -10592,11 +10596,7 @@ well.")
     (license license:expat)))
 
 (define-public python2-jedi
-  (let ((base (package-with-python2 (strip-python2-variant python-jedi))))
-    (package
-      (inherit base)
-      (arguments (substitute-keyword-arguments (package-arguments base)
-                   ((#:tests? _) #t))))))
+  (package-with-python2 python-jedi))
 
 (define-public ptpython
   (package
-- 
cgit v1.2.3


From e135ef96868f8a50d2a5da536d4f693f577f4f80 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Wed, 11 Sep 2019 17:10:29 +0900
Subject: gnu: emacs-elpy: Update to 1.31.0.

* gnu/packages/emacs-xyz.scm (emacs-elpy): Update to 1.31.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 704fbfbc6b..2dd0d38867 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6008,7 +6008,7 @@ indentation guides in Emacs:
 (define-public emacs-elpy
   (package
     (name "emacs-elpy")
-    (version "1.28.0")
+    (version "1.31.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -6017,7 +6017,7 @@ indentation guides in Emacs:
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "073bwxwjzcbmvpcz9q2xjwzx9x7hkvjni6fwvikh6yawzjp56jis"))))
+                "0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk"))))
     (build-system emacs-build-system)
     (arguments
      `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include)
-- 
cgit v1.2.3


From ef640db2f509f51ebfe3a6a66ba837ef3103bbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Wed, 28 Aug 2019 20:49:40 +0800
Subject: gnu: libvirt: Don't wrap with PATH.

This reverts commit 903e051a71467bc96a054c9b4ed89348fdae8977 to fix
.  The full path of the 'ip' command is already
embedded, and we want to search 'qemu' in PATH.

* gnu/packages/virtualization.scm (libvirt): Remove 'wrap-libvirtd phase.  Add
configure flags to run qemu as 'nobody:kvm'.
* gnu/services/virtualization.scm (libvirt-service-type): Add 'qemu' to the
system profile.
---
 gnu/packages/virtualization.scm | 17 +++++------------
 gnu/services/virtualization.scm |  6 ++++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 26477714e4..f46c31df1f 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -401,7 +401,10 @@ manage system or application containers.")
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-       (list "--with-polkit"
+       (list "--with-qemu"
+             "--with-qemu-user=nobody"
+             "--with-qemu-group=kvm"
+             "--with-polkit"
              (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/"
                             ,name "-" ,version)
              "--sysconfdir=/etc"
@@ -431,23 +434,13 @@ manage system or application containers.")
              (apply invoke "make" "install"
                     "sysconfdir=/tmp/etc"
                     "localstatedir=/tmp/var"
-                    make-flags)))
-         (add-after 'install 'wrap-libvirtd
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (wrap-program (string-append out "/sbin/libvirtd")
-                 `("PATH" = (,(string-append (assoc-ref inputs "iproute")
-                                             "/sbin")
-                             ,(string-append (assoc-ref inputs "qemu")
-                                             "/bin"))))
-               #t))))))
+                    make-flags))))))
     (inputs
      `(("libxml2" ,libxml2)
        ("eudev" ,eudev)
        ("libpciaccess" ,libpciaccess)
        ("gnutls" ,gnutls)
        ("dbus" ,dbus)
-       ("qemu" ,qemu)
        ("libpcap" ,libpcap)
        ("libnl" ,libnl)
        ("libuuid" ,util-linux)
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index 705ed84d06..03aedd326c 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -442,8 +442,10 @@ potential infinite waits blocking libvirt."))
                   (service-extension polkit-service-type
                                      (compose list libvirt-configuration-libvirt))
                   (service-extension profile-service-type
-                                     (compose list
-                                              libvirt-configuration-libvirt))
+                                     (lambda (config)
+                                       (list
+                                        (libvirt-configuration-libvirt config)
+                                        qemu)))
                   (service-extension activation-service-type
                                      %libvirt-activation)
                   (service-extension shepherd-root-service-type
-- 
cgit v1.2.3


From 9abc58d3efe47fe2d1cf8c1a48ef939efad36f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 11 Sep 2019 13:56:39 +0200
Subject: gnu: guile-gcrypt: Update to 0.2.0.

* gnu/packages/gnupg.scm (guile-gcrypt): Update to 0.2.0.
---
 gnu/packages/gnupg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index bc1e3c8720..69d7f34a49 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -434,7 +434,7 @@ gpgpme starting with version 1.7.")
 (define-public guile-gcrypt
   (package
     (name "guile-gcrypt")
-    (version "0.1.0")
+    (version "0.2.0")
     (home-page "https://notabug.org/cwebber/guile-gcrypt")
     (source (origin
               (method git-fetch)
@@ -443,7 +443,7 @@ gpgpme starting with version 1.7.")
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "1lhgh3105yi0ggrjsjibv4wp1ipz8s17pa820hk2wln3rc04wpvf"))
+                "1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z"))
               (file-name (string-append name "-" version "-checkout"))))
     (build-system gnu-build-system)
     (native-inputs
-- 
cgit v1.2.3


From 4e0299194d2f32387fa420a414496ddd5265bc98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 11 Sep 2019 14:02:19 +0200
Subject: gnu: guile-json: Update to 3.2.0.

* gnu/packages/guile.scm (guile-json-3): Update to 3.2.0.
---
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 71169966da..db847765d8 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -483,14 +483,14 @@ specification.  These are the main features:
   (package
     (inherit guile-json)
     (name "guile-json")
-    (version "3.1.0")
+    (version "3.2.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.savannah.nongnu.org/releases/"
                                   name "/" name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1yfqscz74i4vxylabd3s9l0wbdp8bg9qxnv1ixdm3b1l7zdx00z3"))))))
+                "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz"))))))
 
 ;; There are two guile-gdbm packages, one using the FFI and one with
 ;; direct C bindings, hence the verbose name.
-- 
cgit v1.2.3


From 28123c01d188e8d4afb81e2772654698642d109d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 11 Sep 2019 14:04:12 +0200
Subject: gnu: guile-json: Use "mirror://savannah" URL.

* gnu/packages/guile.scm (guile-json, guile-json-3): Change URL to
mirror://savannah.
---
 gnu/packages/guile.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index db847765d8..0731caedc2 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -444,8 +444,8 @@ GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its
     (home-page "https://github.com/aconchillo/guile-json")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://download.savannah.nongnu.org/releases/"
-                                  name "/" name "-" version ".tar.gz"))
+              (uri (string-append "mirror://savannah/guile-json/guile-json-"
+                                  version ".tar.gz"))
               (sha256
                (base32
                 "15gnb84d7hpazqhskkf3g9z4r6knw54wfj4ch5270kakz1lp70c9"))))
@@ -486,8 +486,8 @@ specification.  These are the main features:
     (version "3.2.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://download.savannah.nongnu.org/releases/"
-                                  name "/" name "-" version ".tar.gz"))
+              (uri (string-append "mirror://savannah/guile-json/guile-json-"
+                                  version ".tar.gz"))
               (sha256
                (base32
                 "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz"))))))
-- 
cgit v1.2.3


From 373546123e0aea273f41163e0f18ff777ffdb90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 11 Sep 2019 14:43:57 +0200
Subject: gnu: emacs-smart-mode-line: Update to 2.13.

* gnu/packages/emacs-xyz.scm (emacs-smart-mode-line): Update to 2.13.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2dd0d38867..9ee458187c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2932,7 +2932,7 @@ snippets for yasnippet.")
 (define-public emacs-smart-mode-line
   (package
     (name "emacs-smart-mode-line")
-    (version "2.12.0")
+    (version "2.13")
     (source
      (origin
        (method git-fetch)
@@ -2941,7 +2941,7 @@ snippets for yasnippet.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1gs4ay9hdg8gmia4ir74qawk80pqwv99hp4yhy108kpfry5mrq6z"))))
+        (base32 "164b697xm1rwcggv37dymhf3npbyh2bs59z8b6m5x35lb4c3lf8b"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-rich-minority" ,emacs-rich-minority)))
-- 
cgit v1.2.3


From 7dc4b2a728afd8e25397db891088ce20b0ce3927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 11 Sep 2019 14:44:15 +0200
Subject: gnu: emacs-debbugs: Update to 0.19.

* gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.19.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9ee458187c..b5a20680ab 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3211,14 +3211,14 @@ source code using IPython.")
 (define-public emacs-debbugs
   (package
     (name "emacs-debbugs")
-    (version "0.18")
+    (version "0.19")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://elpa.gnu.org/packages/debbugs-"
                                   version ".tar"))
               (sha256
                (base32
-                "00kich80zdg7v3v613f9prqddkpwpm1nf9sj10f0n6wh15rzwv07"))))
+                "0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4"))))
     (build-system emacs-build-system)
     (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$")))
     (propagated-inputs
-- 
cgit v1.2.3


From aa51d92cdb68a825e6d18d0c340f9b9d160866cd Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Mon, 9 Sep 2019 11:05:57 +0900
Subject: gnu: workrave: Update to version 1.10.34.

* gnu/packages/gnome.scm (workrave): Update version and hash strings.
[inputs]: Remove python-cheetah.
[native-inputs]: Add boost, python-3 and python-jinja2; remove the "bin"
output of glib.
---
 gnu/packages/gnome.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 562f2981e9..60e39bee32 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -39,6 +39,7 @@
 ;;; Copyright © 2019 Giacomo Leidi 
 ;;; Copyright © 2019 Jelle Licht 
 ;;; Copyright © 2019 Jonathan Frederickson 
+;;; Copyright © 2019 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages boost)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
@@ -7992,7 +7994,7 @@ configurable file renaming. ")
 (define-public workrave
   (package
     (name "workrave")
-    (version "1.10.23")
+    (version "1.10.34")
     (source
      (origin
        (method git-fetch)
@@ -8003,7 +8005,7 @@ configurable file renaming. ")
                                          version)))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1qhlwfhwk5agv4904d6bsf83k9k89q7bms6agg967vsca4905vcw"))))
+        (base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf"))))
     (build-system glib-or-gtk-build-system)
     (propagated-inputs `(("glib" ,glib)
                          ("gtk+" ,gtk+)
@@ -8014,9 +8016,8 @@ configurable file renaming. ")
                          ("libxtst" ,libxtst)
                          ("dconf" ,dconf)
                          ("libice" ,libice)))
-    (inputs `(("libsm" ,libsm)
-              ("python-cheetah" ,python2-cheetah)))
-    (native-inputs `(("glib" ,glib "bin")
+    (inputs `(("libsm" ,libsm)))
+    (native-inputs `(("boost" ,boost)
                      ("pkg-config" ,pkg-config)
                      ("gettext" ,gnu-gettext)
                      ("autoconf" ,autoconf)
@@ -8026,7 +8027,8 @@ configurable file renaming. ")
                      ("intltool" ,intltool)
                      ("libxscrnsaver" ,libxscrnsaver)
                      ("gobject-introspection" ,gobject-introspection)
-                     ("python2" ,python-2)))
+                     ("python3" ,python-3)
+                     ("python-jinja2" ,python-jinja2)))
     (synopsis "Tool to help prevent repetitive strain injury (RSI)")
     (description
      "Workrave is a program that assists in the recovery and prevention of
-- 
cgit v1.2.3


From d1c9684753ff3a6adf1bb9ab397a73a5c23010c1 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 10 Sep 2019 21:10:03 +0900
Subject: gnu: workrave: Correct the types of inputs used.

* gnu/packages/gnome.scm (workrave)[propagated-inputs]: Move them all to...
[inputs]: ...here.
[native-inputs]: Move libxscrnsaver to the 'inputs' field.
---
 gnu/packages/gnome.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 60e39bee32..8341bd6802 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8007,16 +8007,17 @@ configurable file renaming. ")
        (sha256
         (base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf"))))
     (build-system glib-or-gtk-build-system)
-    (propagated-inputs `(("glib" ,glib)
-                         ("gtk+" ,gtk+)
-                         ("gdk-pixbuf" ,gdk-pixbuf)
-                         ("gtkmm" ,gtkmm)
-                         ("glibmm" ,glibmm)
-                         ("libx11" ,libx11)
-                         ("libxtst" ,libxtst)
-                         ("dconf" ,dconf)
-                         ("libice" ,libice)))
-    (inputs `(("libsm" ,libsm)))
+    (inputs `(("glib" ,glib)
+              ("gtk+" ,gtk+)
+              ("gdk-pixbuf" ,gdk-pixbuf)
+              ("gtkmm" ,gtkmm)
+              ("glibmm" ,glibmm)
+              ("libx11" ,libx11)
+              ("libxtst" ,libxtst)
+              ("dconf" ,dconf)
+              ("libice" ,libice)
+              ("libsm" ,libsm)
+              ("libxscrnsaver" ,libxscrnsaver)))
     (native-inputs `(("boost" ,boost)
                      ("pkg-config" ,pkg-config)
                      ("gettext" ,gnu-gettext)
@@ -8025,7 +8026,6 @@ configurable file renaming. ")
                      ("automake" ,automake)
                      ("libtool" ,libtool)
                      ("intltool" ,intltool)
-                     ("libxscrnsaver" ,libxscrnsaver)
                      ("gobject-introspection" ,gobject-introspection)
                      ("python3" ,python-3)
                      ("python-jinja2" ,python-jinja2)))
-- 
cgit v1.2.3


From ae9b6dba1943c244acf5a52996e3c82921242c2d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 16:30:06 +0200
Subject: gnu: foo2zjs: Update to 20190909.

* gnu/packages/cups.scm (foo2zjs): Update to 20190909.
---
 gnu/packages/cups.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 4be1eee156..152258a522 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -636,14 +636,14 @@ printer/driver specific, but spooler-independent PPD file.")
 (define-public foo2zjs
   (package
     (name "foo2zjs")
-    (version "20190517")
+    (version "20190909")
     (source (origin
               (method url-fetch)
               ;; XXX: This is an unversioned URL!
               (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz")
               (sha256
                (base32
-                "13gzsd26nq4brx1xzpwmg1qnr4nk7ykgi94qr1hbjqfi561prki4"))))
+                "1nn84c045mbv6yzpjfggc6152bvgrmcxiyvgz9v2w3sws7ihshrm"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
cgit v1.2.3


From 5df412bfe68ba4937c2f9bfdd995a5b646a7aae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Wed, 11 Sep 2019 23:07:52 +0800
Subject: services: libvirtd: Use '/run/current-system/profile/bin' as PATH.

This is a followup to ef640db2f509f51ebfe3a6a66ba837ef3103bbb7.

* gnu/services/virtualization.scm (libvirt-shepherd-service): Set
'#:environment-variables' for 'make-forkexec-constructor'.
---
 gnu/services/virtualization.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index 03aedd326c..3eecd2c085 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -432,7 +432,10 @@ potential infinite waits blocking libvirt."))
            (provision '(libvirtd))
            (start #~(make-forkexec-constructor
                      (list (string-append #$libvirt "/sbin/libvirtd")
-                           "-f" #$config-file)))
+                           "-f" #$config-file)
+                     #:environment-variables
+                     ;; For finding qemu binaries.
+                     '("PATH=/run/current-system/profile/bin")))
            (stop #~(make-kill-destructor))))))
 
 (define libvirt-service-type
-- 
cgit v1.2.3


From 0cd3e99d64081e958919845ddd01ae8d2fb2d692 Mon Sep 17 00:00:00 2001
From: Joshua Branson 
Date: Wed, 11 Sep 2019 10:39:08 -0400
Subject: doc: Run fc-cache verbosely and delete existing caches.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc/guix.texi (Application Setup): Suggest ‘fc-cache -rv’ instead
of ‘fc-cache -f’.

Signed-off-by: Tobias Geerinckx-Rice 
---
 doc/guix.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 989b3d03bb..a3c5a564c3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1724,8 +1724,8 @@ to make sure your TrueType fonts are listed there.
 After installing fonts you may have to refresh the font cache to use
 them in applications.  The same applies when applications installed via
 Guix do not seem to find fonts.  To force rebuilding of the font cache
-run @code{fc-cache -f}.  The @code{fc-cache} command is provided by the
-@code{fontconfig} package.
+run @code{fc-cache -frv}.  The @code{fc-cache} command is provided by
+the @code{fontconfig} package.
 
 @subsection X.509 Certificates
 
-- 
cgit v1.2.3


From b3f724b0a156adafa2cb155b603428eaa576ed11 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 18:05:35 +0200
Subject: =?UTF-8?q?doc:=20Actually=20suggest=20=E2=80=98fc-cache=20-r?=
 =?UTF-8?q?=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A follow-up commit to 0cd3e99d64081e958919845ddd01ae8d2fb2d692.

* doc/guix.texi (Application Setup): Fix my own typo.
---
 doc/guix.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index a3c5a564c3..39d4b865f6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1724,7 +1724,7 @@ to make sure your TrueType fonts are listed there.
 After installing fonts you may have to refresh the font cache to use
 them in applications.  The same applies when applications installed via
 Guix do not seem to find fonts.  To force rebuilding of the font cache
-run @code{fc-cache -frv}.  The @code{fc-cache} command is provided by
+run @code{fc-cache -rv}.  The @code{fc-cache} command is provided by
 the @code{fontconfig} package.
 
 @subsection X.509 Certificates
-- 
cgit v1.2.3


From cf065aba1ec14bdacab7a5a6bddbdfd7661cd409 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 18:27:33 +0200
Subject: gnu: openssl: Update to 1.1.1d [fix CVE-2019-{1547,1549,1552,1563}].

* gnu/packages/tls.scm (openssl-next): Update to 1.1.1d.
---
 gnu/packages/tls.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 833a3715af..45ec4f796b 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -412,7 +412,7 @@ required structures.")
   (package
     (inherit openssl)
     (name "openssl")
-    (version "1.1.1c")
+    (version "1.1.1d")
     (source (origin
              (method url-fetch)
              (uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -425,7 +425,7 @@ required structures.")
               (patches (search-patches "openssl-1.1-c-rehash-in.patch"))
               (sha256
                (base32
-                "142c7zdlz06hjrrvinb9f276czc78bnkyhd9xma621qmmmwk1yzn"))))
+                "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"))))
     (outputs '("out"
                "doc"        ; 6.8 MiB of man3 pages and full HTML documentation
                "static"))   ; 6.4 MiB of .a files
-- 
cgit v1.2.3


From e8cfac22c7152a0a7d00c85d7528e664226c860f Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Wed, 11 Sep 2019 21:02:16 +0200
Subject: gnu: youtube-dl: Update to 2019.09.12.

* gnu/packages/video.scm (youtube-dl): Update to 2019.09.12.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 66bc55e33e..8e0362752e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1492,7 +1492,7 @@ access to mpv's powerful playback capabilities.")
 (define-public youtube-dl
   (package
     (name "youtube-dl")
-    (version "2019.09.01")
+    (version "2019.09.12")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/rg3/youtube-dl/releases/"
@@ -1500,7 +1500,7 @@ access to mpv's powerful playback capabilities.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0jbby0x5krww1acc8qxhmmwg0dsqmj6yjnynfm7r6k3rxbvlydqr"))))
+                "0wmc0rl4l08hnz3agh69ld1pcmjs7czg0d2k7mnnlxhwlwi38w56"))))
     (build-system python-build-system)
     (arguments
      ;; The problem here is that the directory for the man page and completion
-- 
cgit v1.2.3


From bfebc73a748dd4edb3581f5b1cf6308559915bf1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 22:27:59 +0200
Subject: gnu: neofetch: Update to 6.1.0.

* gnu/packages/admin.scm (neofetch): Update to 6.1.0.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 3e75b73dcb..2e072deed7 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2725,7 +2725,7 @@ tool for remote execution and deployment.")
 (define-public neofetch
   (package
     (name "neofetch")
-    (version "6.0.0")
+    (version "6.1.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2733,7 +2733,7 @@ tool for remote execution and deployment.")
                     (commit version)))
               (sha256
                (base32
-                "0j0r40llyry1sgc6p9wd7jrpydps2lnj4rwajjp37697g2bik89i"))))
+                "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; there are no tests
-- 
cgit v1.2.3


From 97e53dccc08541123b5f42a72036fc62f3dc1922 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 20:03:49 +0200
Subject: gnu: nghttp2: Don't use NAME in source URI.

* gnu/packages/web.scm (nghttp2)[source]: Hard-code NAME.
---
 gnu/packages/web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index ad6f0635dd..39475bd6a8 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6386,7 +6386,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.")
        (method url-fetch)
        (uri (string-append "https://github.com/nghttp2/nghttp2/"
                            "releases/download/v" version "/"
-                           name "-" version ".tar.xz"))
+                           "nghttp2-" version ".tar.xz"))
        (sha256
         (base32
          "0fi6qg2w82636wixwkqy7bclpgxslmvg82r431hs8h6aqc4mnzwv"))))
-- 
cgit v1.2.3


From 3b14974706913d283bdeb6d62e660cb5702125e0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 20:54:34 +0200
Subject: gnu: glslang: Use GIT-FILE-NAME.

* gnu/packages/vulkan.scm (glslang)[source]: Use GIT-FILE-NAME.
---
 gnu/packages/vulkan.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 0b3d476fa2..511831b9bd 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling 
-;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -53,7 +53,7 @@
        (sha256
         (base32
          "0m56smanfcczjfif4yfcqhjj4d4sc088kwg6dgia8fwdsjavdm4d"))
-      (file-name (string-append name "-" version "-checkout"))))
+      (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ;; No tests
-- 
cgit v1.2.3


From 5ca1900ba5401ee1ae207491a305da54f525229c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 22:24:08 +0200
Subject: gnu: recode: Update to 3.7.5.

* gnu/packages/textutils.scm (recode): Update to 3.7.5.
[native-inputs]: Use python@3 and python-cython@3.
---
 gnu/packages/textutils.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 2da31973f4..c331940592 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2017,2019 Hartmut Goebel 
 ;;; Copyright © 2017 Kei Kebreau 
 ;;; Copyright © 2017 Alex Vong 
-;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Pierre Neidhardt 
 ;;; Copyright © 2018 Meiyo Peng 
 ;;; Copyright © 2019 Yoshinori Arai 
@@ -89,23 +89,22 @@ to DOS format and vice versa.")
 (define-public recode
   (package
     (name "recode")
-    (version "3.7.1")
+    (version "3.7.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/rrthomas/recode/releases/"
                            "download/v" version "/" name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0215hfj0rhlh0grg91qfx75pp6z09bpv8211qdxqihniw7y9a4fs"))
+        (base32 "1sl99dfx2b76paq86wv3a0lcy66f1hylf6iy04rzwxj7ccwpsk30"))
        (modules '((guix build utils)))
        (snippet '(begin
                    (delete-file "tests/Recode.c")
                    #t))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("python" ,python-2)
-       ("python2-cython" ,python2-cython)))
+     `(("python" ,python)
+       ("python-cython" ,python-cython)))
     (home-page "https://github.com/rrthomas/recode")
     (synopsis "Text encoding converter")
     (description "The Recode library converts files between character sets and
-- 
cgit v1.2.3


From 6f2f7bc88aa093f87874fcfaa27366074978d9ee Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 11 Sep 2019 22:24:36 +0200
Subject: gnu: recode: Don't use NAME in source URI.

* gnu/packages/textutils.scm (recode)[source]: Hard-code NAME.
---
 gnu/packages/textutils.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index c331940592..9ce01e66ea 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -94,7 +94,7 @@ to DOS format and vice versa.")
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/rrthomas/recode/releases/"
-                           "download/v" version "/" name "-" version ".tar.gz"))
+                           "download/v" version "/recode-" version ".tar.gz"))
        (sha256
         (base32 "1sl99dfx2b76paq86wv3a0lcy66f1hylf6iy04rzwxj7ccwpsk30"))
        (modules '((guix build utils)))
-- 
cgit v1.2.3


From 0f272518eca06f849cef86d26c294f17edc82c3e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 11 Sep 2019 23:29:07 +0200
Subject: gnu: python-ipython-documentation: Make reproducible.

Fixes .

* gnu/packages/python-xyz.scm (python-ipython)[arguments]: Add phase
"make-docs-reproducible" to remove timestamps from documentation generated in
dependent python-ipython-documentation package.
---
 gnu/packages/python-xyz.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 819b3045a3..00bffca74a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5399,6 +5399,13 @@ computing.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'make-docs-reproducible
+           (lambda _
+             (substitute* "IPython/sphinxext/ipython_directive.py"
+               ((".*import datetime") "")
+               ((".*datetime.datetime.now\\(\\)") "")
+               (("%timeit") "# %timeit"))
+             #t))
          ;; Tests can only be run after the library has been installed and not
          ;; within the source directory.
          (delete 'check)
-- 
cgit v1.2.3


From 86ced7b27197d5f0dc4c09382cb8b3b93dc8cfae Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 11 Sep 2019 23:58:52 +0200
Subject: gnu: r-bsgenome-celegans-ucsc-ce6: Use bioconductor-uri.

* gnu/packages/bioconductor.scm (r-bsgenome-celegans-ucsc-ce6)[source]: Use
BIOCONDUCTOR-URI.
---
 gnu/packages/bioconductor.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 087ec9bf10..ff691c6e4a 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -50,12 +50,8 @@
     (version "1.4.0")
     (source (origin
               (method url-fetch)
-              ;; We cannot use bioconductor-uri here because this tarball is
-              ;; located under "data/annotation/" instead of "bioc/".
-              (uri (string-append "https://www.bioconductor.org/packages/"
-                                  "release/data/annotation/src/contrib/"
-                                  "BSgenome.Celegans.UCSC.ce6_"
-                                  version ".tar.gz"))
+              (uri (bioconductor-uri "BSgenome.Celegans.UCSC.ce6"
+                                     version 'annotation))
               (sha256
                (base32
                 "0mqzb353xv2c3m3vkb315dkmnxkgczp7ndnknyhpgjlybyf715v9"))))
-- 
cgit v1.2.3


From 412153bbaf99da8c6a3538a932bd150e28ba4111 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 11 Sep 2019 23:59:28 +0200
Subject: gnu: r-bsgenome-celegans-ucsc-ce6: Permit substitution.

* gnu/packages/bioconductor.scm (r-bsgenome-celegans-ucsc-ce6)[arguments]:
Remove field.
---
 gnu/packages/bioconductor.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index ff691c6e4a..8279d2a546 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -58,9 +58,6 @@
     (properties
      `((upstream-name . "BSgenome.Celegans.UCSC.ce6")))
     (build-system r-build-system)
-    ;; As this package provides little more than a very large data file it
-    ;; doesn't make sense to build substitutes.
-    (arguments `(#:substitutable? #f))
     (propagated-inputs
      `(("r-bsgenome" ,r-bsgenome)))
     (home-page
-- 
cgit v1.2.3


From 4913828bb1f1c9f672a49c19090ba4ae8d14e88b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 11 Sep 2019 19:15:22 +0200
Subject: gnu: python-language-server: Update to 0.28.3-1.c3cab77.

* gnu/packages/python-xyz.scm (python-language-server): Update to 0.28.3-1.c3cab77.

Signed-off-by: Maxim Cournoyer 
---
 gnu/packages/python-xyz.scm | 62 +++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 00bffca74a..8b2023ceba 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2984,38 +2984,44 @@ Language (TOML) configuration files.")
 Server (PLS).")
     (license license:expat)))
 
+;; XXX: We must use a non-release version since the latest release version
+;; requires python-jedi version < 0.15.
 (define-public python-language-server
-  (package
-    (name "python-language-server")
-    (version "0.28.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-language-server" version))
-       (sha256
-        (base32
-         "1qbiij208l6g1l5hzihx8badhmqkxdk0spn7gm7564yg54zdp2g2"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     `(("python-pluggy" ,python-pluggy)
-       ("python-jsonrpc-server" ,python-jsonrpc-server)
-       ("python-jedi" ,python-jedi)
-       ("python-yapf" ,python-yapf)
-       ("python-pyflakes" ,python-pyflakes)
-       ("python-pydocstyle" ,python-pydocstyle)
-       ("python-pycodestyle" ,python-pycodestyle)
-       ("python-mccabe" ,python-mccabe)
-       ("python-rope" ,python-rope)
-       ("python-autopep8" ,python-autopep8)
-       ("python-pylint" ,python-pylint)))
-    (home-page "https://github.com/palantir/python-language-server")
-    (synopsis "Python implementation of the Language Server Protocol")
-    (description
-     "The Python Language Server (pyls) is an implementation of the Python 3
+  (let ((commit "c3cab77a85b1de4af1aec1bafea6a7320d6baec5")
+        (revision "1"))
+    (package
+      (name "python-language-server")
+      (version (git-version "0.28.3" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/palantir/python-language-server.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "1q0xdwgln09sh58j0ryygj92hfgdhwcs57zjvqihya23jr5v0bz4"))))
+      (build-system python-build-system)
+      (propagated-inputs
+       `(("python-pluggy" ,python-pluggy)
+         ("python-jsonrpc-server" ,python-jsonrpc-server)
+         ("python-jedi" ,python-jedi)
+         ("python-yapf" ,python-yapf)
+         ("python-pyflakes" ,python-pyflakes)
+         ("python-pydocstyle" ,python-pydocstyle)
+         ("python-pycodestyle" ,python-pycodestyle)
+         ("python-mccabe" ,python-mccabe)
+         ("python-rope" ,python-rope)
+         ("python-autopep8" ,python-autopep8)
+         ("python-pylint" ,python-pylint)))
+      (home-page "https://github.com/palantir/python-language-server")
+      (synopsis "Python implementation of the Language Server Protocol")
+      (description
+       "The Python Language Server (pyls) is an implementation of the Python 3
 language specification for the Language Server Protocol (LSP).  This tool is
 used in text editing environments to provide a complete and integrated
 feature-set for programming Python effectively.")
-    (license license:expat)))
+      (license license:expat))))
 
 (define-public python-black
   (package
-- 
cgit v1.2.3


From 63d57404b3d29fc9a4542cf183a957c714fd0ecd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 12 Sep 2019 12:06:01 +0200
Subject: gnu: texlive-xypic: Install all files.

Reported by numerobis on the #guix IRC channel.

* gnu/packages/tex.scm (texlive-xypic)[source]: Install "tex/generic/xypic"
files.
[arguments]: Remove #:tex-directory.
---
 gnu/packages/tex.scm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 43e1c44c72..c293d2f661 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6817,17 +6817,14 @@ titles.")
                          "/fonts/afm/public/xypic/"
                          "/fonts/tfm/public/xypic/"
                          "/fonts/type1/public/xypic/"
-
-                         ;;"/tex/generic/xypic/" ; I guess these are generated
-                         )
+                         "/tex/generic/xypic/")
                    (base32
-                    "0sqkkvjzzsiazvh8803qqyrcv4is3m1qs9x9v2m35jjikbqc08y8"))))
+                    "09b51bbm189xh7039h5n8nmab5nn2bybhh26qjn08763m80zdhjg")
+                   #:trivial? #t)))
     (package
       (inherit template)
       (arguments
        (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "tex/generic/xypic")
          ((#:phases phases)
           `(modify-phases ,phases
              (delete 'reset-gzip-timestamps)))))
-- 
cgit v1.2.3


From 8b35c8cd612032ebabfd04a8247d588c69acf463 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 12 Sep 2019 12:07:20 +0200
Subject: gnu: hypre: Update texlive-union.

* gnu/packages/maths.scm (hypre)[native-inputs]: Replace texlive-generic-xypic
and texlive-fonts-xypic with texlive-xypic; add texlive-cm to the
texlive-union.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c81e999daa..aa94d057cf 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3828,8 +3828,8 @@ set.")
      `(("doc++" ,doc++)
        ("netpbm" ,netpbm)
        ("perl" ,perl)                   ; needed to run 'ppmquant' during tests
-       ("texlive" ,(texlive-union (list texlive-generic-xypic
-                                        texlive-fonts-xypic
+       ("texlive" ,(texlive-union (list texlive-xypic
+                                        texlive-cm
                                         texlive-latex-hyperref
                                         texlive-bibtex)))
        ("ghostscript" ,ghostscript)))
-- 
cgit v1.2.3


From 7faed56c443f89dc3a802fb2a130c73cbb1b33b5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 12 Sep 2019 16:16:07 +0200
Subject: gnu: openconnect: Update to 8.05 [fixes CVE-2019-16239].

* gnu/packages/vpn.scm (openconnect): Update to 8.05.
---
 gnu/packages/vpn.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 3df9873781..5f78c4365a 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -239,13 +239,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
 (define-public openconnect
   (package
    (name "openconnect")
-   (version "8.04")
+   (version "8.05")
    (source (origin
             (method url-fetch)
             (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
                                 "openconnect-" version ".tar.gz"))
             (sha256
-             (base32 "07zqcl2ykdc4mgix9sbv4jgpg7cybifxfgrycvf99ckq7xp9r5wq"))))
+             (base32 "14i9q727c2zc9xhzp1a9hz3gzb5lwgsslbhircm84dnbs192jp1k"))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("libxml2" ,libxml2)
-- 
cgit v1.2.3


From 237d4cf73c0a4b7b25653c01a6003e1db3da1716 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 12 Sep 2019 01:30:13 +0200
Subject: gnu: gfbgraph: Don't use NAME in source URI.

* gnu/packages/gnome.scm (gfbgraph)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8341bd6802..5dc18b3bb5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7231,9 +7231,9 @@ compiled.")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "mirror://gnome/sources/" name "/"
+                    "mirror://gnome/sources/gfbgraph/"
                     (version-major+minor version) "/"
-                    name "-" version ".tar.xz"))
+                    "gfbgraph-" version ".tar.xz"))
               (sha256
                (base32
                 "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"))))
-- 
cgit v1.2.3


From 01a53e0b378aca02c429ebfb5018237867a6d024 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Fri, 13 Sep 2019 00:05:09 +0900
Subject: gnu: python-pathpy: Add a missing propagated input.

This fixes the build of 'python-pytest-shutil', amongst others.

* gnu/packages/python-xyz.scm (python-pathpy)[propagated-inputs]: Add
python-importlib-metadata.
---
 gnu/packages/python-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8b2023ceba..74abf336c8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4972,7 +4972,8 @@ releases.")
     (outputs '("out" "doc"))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-appdirs" ,python-appdirs)))
+     `(("python-appdirs" ,python-appdirs)
+       ("python-importlib-metadata" ,python-importlib-metadata)))
     (native-inputs
      `(("python-setuptools-scm" ,python-setuptools-scm)
        ("python-sphinx" ,python-sphinx)
-- 
cgit v1.2.3


From e2fb29b792cb9cf2416c6292ece56c09a89bdcc9 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Wed, 11 Sep 2019 23:22:10 +0900
Subject: gnu: python-pytest-virtualenv: Enable tests.

* gnu/packages/python-check.scm (python-pytest-virtualenv)
[phases]{patch-virtualenv-executable}: New phase.
[propagated-inputs]: Move python-virtualenv from here...
[inputs]: ...to here.
---
 gnu/packages/python-check.scm | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 676dae5430..b8aaef9b77 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2019 Ricardo Wurmus 
 ;;; Copyright © 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Efraim Flashner 
+;;; Copyright © 2019 Maxim Cournoyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -226,11 +227,27 @@ testing framework.")
         (base32
          "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"))))
     (build-system python-build-system)
-    (arguments '(#:tests? #f)) ; one test fails; can't find virtualenv
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Reference the virtualenv executable directly, to avoid the need
+         ;; for PYTHONPATH, which gets cleared when instantiating a new
+         ;; virtualenv with pytest-virtualenv.
+         (add-after 'unpack 'patch-virtualenv-executable
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((virtualenv (assoc-ref inputs "python-virtualenv"))
+                    (virtualenv-bin (string-append virtualenv
+                                                   "/bin/virtualenv")))
+               (substitute* "pytest_virtualenv.py"
+                 (("^DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE.*$")
+                  (format #f "DEFAULT_VIRTUALENV_FIXTURE_EXECUTABLE = '~a'"
+                          virtualenv-bin)))
+               #t))))))
     (propagated-inputs
-     `(("python-virtualenv" ,python-virtualenv)
-       ("python-pytest-shutil" ,python-pytest-shutil)
+     `(("python-pytest-shutil" ,python-pytest-shutil)
        ("python-pytest-fixture-config" ,python-pytest-fixture-config)))
+    (inputs
+     `(("python-virtualenv" ,python-virtualenv)))
     (native-inputs
      `(("python-mock" ,python-mock)
        ("python-pytest" ,python-pytest)
-- 
cgit v1.2.3


From abed5df7774a637a0104ca05254e8f97226d38d5 Mon Sep 17 00:00:00 2001
From: Paul Garlick 
Date: Thu, 12 Sep 2019 16:12:31 +0100
Subject: gnu: gmsh: Fetch source from Git.

* gnu/packages/maths.scm (gmsh)[source]: Switch to GIT-FETCH.
---
 gnu/packages/maths.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index aa94d057cf..487f53ead1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1717,11 +1717,16 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
     (version "2.16.0")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "http://gmsh.info/src/gmsh-"
-                          version "-source.tgz"))
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://gitlab.onelab.info/gmsh/gmsh.git")
+            (commit
+             (string-append "gmsh_"
+                            (string-map (lambda (x) (if (eq? x #\.) #\_ x))
+                                        version)))))
+      (file-name (git-file-name name version))
       (sha256
-       (base32 "1slf0bfkwrcgn6296wb4qhbk4ahz6i4wfb10hnim08x05vrylag8"))
+       (base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162"))
       (modules '((guix build utils)))
       (snippet
        ;; Remove non-free METIS code
-- 
cgit v1.2.3


From f58b2f38e4dfdbb8473fb2816d44fae6ad9cbc79 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 12 Sep 2019 20:20:26 +0300
Subject: build: cargo-build-system: Strip store hash from vendor-dir.

* guix/build/cargo-build-system.scm (configure): When copying the
sources into the vendor-dir strip off the hash before the package name.
---
 guix/build/cargo-build-system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index f173b64c83..0134997c27 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -99,7 +99,7 @@ Cargo.toml file present at its root."
   (for-each
     (match-lambda
       ((name . path)
-       (let* ((basepath (basename path))
+       (let* ((basepath (string-drop (basename path) 33))
               (crate-dir (string-append vendor-dir "/" basepath)))
          (and (crate-src? path)
               ;; Gracefully handle duplicate inputs
-- 
cgit v1.2.3


From 5ccec77176b7e0c67ed58c8849e5e76f3dd79a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 12 Sep 2019 22:17:43 +0200
Subject: file-systems: Add /var/run/nscd to '%network-file-mappings'.

This allows containers created by "guix environment -CN" or by
"guix system container -N" to talk to the host nscd.

* gnu/system/file-systems.scm (%network-file-mappings): Add
"/var/run/nscd".
* gnu/build/shepherd.scm (default-mounts)[nscd-socket]: Remove.
* gnu/system/linux-container.scm (container-script)[nscd-run-directory]
[nscd-mapping, nscd-os, nscd-specs]: Remove.
[script]: Filter out from SPECS bind-mounts where the device does not
exist.
* guix/scripts/environment.scm (launch-environment/container)
[optional-mapping->fs]: New procedure.
[mappings]: Remove %NETWORK-FILE-MAPPINGS.
[file-systems]: Add %NETWORK-FILE-MAPPINGS here, filtered through
'optional-mapping->fs'.
---
 gnu/build/shepherd.scm         |  8 +-------
 gnu/system/file-systems.scm    |  2 +-
 gnu/system/linux-container.scm | 35 ++++++++++++++---------------------
 guix/scripts/environment.scm   | 13 ++++++++-----
 4 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm
index cf68f2108b..b32765ed5e 100644
--- a/gnu/build/shepherd.scm
+++ b/gnu/build/shepherd.scm
@@ -67,16 +67,10 @@
           (file-system-mapping
            (source "/etc/group") (target source))))
 
-  (define nscd-socket
-    (file-system-mapping
-     (source "/var/run/nscd") (target source)
-     (writable? #t)))
-
   (append (cons (tmpfs "/tmp") %container-file-systems)
           (let ((mappings `(,@(if (memq 'net namespaces)
                                   '()
-                                  (cons nscd-socket
-                                        %network-file-mappings))
+                                  %network-file-mappings)
                             ,@(if (and (memq 'mnt namespaces)
                                        (not (memq 'user namespaces)))
                                   accounts
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index d11b36f25d..6cf6ccc53e 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -508,7 +508,7 @@ a bind mount."
                  ;; symlink to a file in a tmpfs which, for an unknown reason,
                  ;; cannot be bind mounted read-only within the container.
                  (writable? (string=? file "/etc/resolv.conf"))))
-              %network-configuration-files))
+              (cons "/var/run/nscd" %network-configuration-files)))
 
 (define (file-system-type-predicate type)
   "Return a predicate that, when passed a file system, returns #t if that file
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index 6273cee3d3..451a72762c 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -147,13 +147,6 @@ containerized OS.  EXTRA-FILE-SYSTEMS is a list of file systems to add to OS."
   "Return a derivation of a script that runs OS as a Linux container.
 MAPPINGS is a list of  objects that specify the files/directories
 that will be shared with the host system."
-  (define nscd-run-directory "/var/run/nscd")
-
-  (define nscd-mapping
-    (file-system-mapping
-     (source nscd-run-directory)
-     (target nscd-run-directory)))
-
   (define (mountable-file-system? file-system)
     ;; Return #t if FILE-SYSTEM should be mounted in the container.
     (and (not (string=? "/" (file-system-mount-point file-system)))
@@ -168,12 +161,7 @@ that will be shared with the host system."
               os (cons %store-mapping mappings)
               #:shared-network? shared-network?
               #:extra-file-systems %container-file-systems))
-         (nscd-os (containerized-operating-system
-                   os (cons* nscd-mapping %store-mapping mappings)
-                   #:shared-network? shared-network?
-                   #:extra-file-systems %container-file-systems))
-         (specs (os-file-system-specs os))
-         (nscd-specs (os-file-system-specs nscd-os)))
+         (specs (os-file-system-specs os)))
 
     (define script
       (with-imported-modules (source-module-closure
@@ -182,14 +170,19 @@ that will be shared with the host system."
         #~(begin
             (use-modules (gnu build linux-container)
                          (gnu system file-systems) ;spec->file-system
-                         (guix build utils))
-
-            (call-with-container
-                (map spec->file-system
-                     (if (and #$shared-network?
-                              (file-exists? #$nscd-run-directory))
-                         '#$nscd-specs
-                         '#$specs))
+                         (guix build utils)
+                         (srfi srfi-1))
+
+            (define file-systems
+              (filter-map (lambda (spec)
+                            (let* ((fs    (spec->file-system spec))
+                                   (flags (file-system-flags fs)))
+                              (and (or (not (memq 'bind-mount flags))
+                                       (file-exists? (file-system-device fs)))
+                                   fs)))
+                          '#$specs))
+
+            (call-with-container file-systems
               (lambda ()
                 (setenv "HOME" "/root")
                 (setenv "TMPDIR" "/tmp")
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index cf58768300..535f181bfd 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -462,6 +462,10 @@ host file systems to mount inside the container.  If USER is not #f, each
 target of USER-MAPPINGS will be re-written relative to '/home/USER', and USER
 will be used for the passwd entry.  LINK-PROFILE? creates a symbolic link from
 ~/.guix-profile to the environment profile."
+  (define (optional-mapping->fs mapping)
+    (and (file-exists? (file-system-mapping-source mapping))
+         (file-system-mapping->bind-mount mapping)))
+
   (mlet %store-monad ((reqs (inputs->requisites
                              (list (direct-store-path bash) profile))))
     (return
@@ -498,11 +502,6 @@ will be used for the passwd entry.  LINK-PROFILE? creates a symbolic link from
                                   (target cwd)
                                   (writable? #t)))
                            '())))
-              ;; When in Rome, do as Nix build.cc does: Automagically
-              ;; map common network configuration files.
-              (if network?
-                  %network-file-mappings
-                  '())
               ;; Mappings for the union closure of all inputs.
               (map (lambda (dir)
                      (file-system-mapping
@@ -511,6 +510,10 @@ will be used for the passwd entry.  LINK-PROFILE? creates a symbolic link from
                       (writable? #f)))
                    reqs)))
             (file-systems (append %container-file-systems
+                                  (if network?
+                                      (filter-map optional-mapping->fs
+                                                  %network-file-mappings)
+                                      '())
                                   (map file-system-mapping->bind-mount
                                        mappings))))
        (exit/status
-- 
cgit v1.2.3


From da966a7a3d8a5c3fbc2f4105b95c4af17b2bbfdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 12 Sep 2019 22:23:35 +0200
Subject: linux-container: Exclude more services when sharing networking with
 the host.

* gnu/system/linux-container.scm (containerized-operating-system)[useless-services]:
Add more services to the list when SHARED-NETWORK? is true.
---
 gnu/system/linux-container.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index 451a72762c..cca626be06 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -30,6 +30,7 @@
   #:use-module (gnu build linux-container)
   #:use-module (gnu services)
   #:use-module (gnu services base)
+  #:use-module (gnu services networking)
   #:use-module (gnu services shepherd)
   #:use-module (gnu system)
   #:use-module (gnu system file-systems)
@@ -109,7 +110,11 @@ containerized OS.  EXTRA-FILE-SYSTEMS is a list of file systems to add to OS."
             ;; Remove nscd service if network is shared with the host.
             (if shared-network?
                 (list nscd-service-type
-                      static-networking-service-type)
+                      static-networking-service-type
+                      dhcp-client-service-type
+                      network-manager-service-type
+                      connman-service-type
+                      wicd-service-type)
                 (list))))
 
   (operating-system
-- 
cgit v1.2.3


From 3d8424a5ad96452ae2bfd98d970f6047cc17b5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 12 Sep 2019 22:39:01 +0200
Subject: services: Fix /usr/bin/env special file target.

This is a followup to a9162155975a131afa1e6a44262afbb7af91f7fd.

* gnu/services/base.scm (%base-services): Fix "/usr/bin/env" target.
---
 gnu/services/base.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 97c53eeaf3..25716ef152 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -2428,6 +2428,6 @@ to handle."
                  `(("/bin/sh" ,(file-append (canonical-package bash)
                                             "/bin/sh"))
                    ("/usr/bin/env" ,(file-append (canonical-package coreutils)
-                                                 "/usr/bin/env"))))))
+                                                 "/bin/env"))))))
 
 ;;; base.scm ends here
-- 
cgit v1.2.3


From d236cd16a7173278ca69578d3e7ce4d1ce55e04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 12 Sep 2019 23:06:12 +0200
Subject: linux-container: "run-container" scripts shows the container's PID.

* gnu/build/linux-container.scm (call-with-container): Add
 #:process-spawned-hook and honor it.
* gnu/system/linux-container.scm (container-script)[script]:
Define 'explain' and pass it as #:process-spawned-hook'.
---
 gnu/build/linux-container.scm  |  7 +++++--
 gnu/system/linux-container.scm | 19 +++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/gnu/build/linux-container.scm b/gnu/build/linux-container.scm
index 6ccb924861..87695c98fd 100644
--- a/gnu/build/linux-container.scm
+++ b/gnu/build/linux-container.scm
@@ -299,8 +299,10 @@ delete it when leaving the dynamic extent of this call."
         (false-if-exception (delete-file-recursively tmp-dir))))))
 
 (define* (call-with-container mounts thunk #:key (namespaces %namespaces)
-                              (host-uids 1) (guest-uid 0) (guest-gid 0))
-  "Run THUNK in a new container process and return its exit status.
+                              (host-uids 1) (guest-uid 0) (guest-gid 0)
+                              (process-spawned-hook (const #t)))
+  "Run THUNK in a new container process and return its exit status; call
+PROCESS-SPAWNED-HOOK with the PID of the new process that has been spawned.
 MOUNTS is a list of  objects that specify file systems to mount
 inside the container.  NAMESPACES is a list of symbols corresponding to
 the identifiers for Linux namespaces: mnt, ipc, uts, pid, user, and net.  By
@@ -329,6 +331,7 @@ load path must be adjusted as needed."
            (false-if-exception
             (kill pid SIGKILL))))
 
+       (process-spawned-hook pid)
        (match (waitpid pid)
          ((_ . status) status))))))
 
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index cca626be06..c6124cd223 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -171,11 +171,15 @@ that will be shared with the host system."
     (define script
       (with-imported-modules (source-module-closure
                               '((guix build utils)
-                                (gnu build linux-container)))
+                                (gnu build linux-container)
+                                (guix i18n)
+                                (guix diagnostics)))
         #~(begin
             (use-modules (gnu build linux-container)
                          (gnu system file-systems) ;spec->file-system
                          (guix build utils)
+                         (guix i18n)
+                         (guix diagnostics)
                          (srfi srfi-1))
 
             (define file-systems
@@ -187,6 +191,16 @@ that will be shared with the host system."
                                    fs)))
                           '#$specs))
 
+            (define (explain pid)
+              ;; XXX: We can't quite call 'bindtextdomain' so there's actually
+              ;; no i18n.
+              (info (G_ "system container is running as PID ~a~%") pid)
+              ;; XXX: Should we recommend 'guix container exec'?  It's more
+              ;; verbose and doesn't bring much.
+              (info (G_ "Run 'sudo nsenter -a -t ~a' to get a shell into it.~%")
+                    pid)
+              (newline (guix-warning-port)))
+
             (call-with-container file-systems
               (lambda ()
                 (setenv "HOME" "/root")
@@ -201,7 +215,8 @@ that will be shared with the host system."
               #:host-uids 65536
               #:namespaces (if #$shared-network?
                                (delq 'net %namespaces)
-                               %namespaces)))))
+                               %namespaces)
+              #:process-spawned-hook explain))))
 
     (gexp->script "run-container" script)))
 
-- 
cgit v1.2.3


From 2151e04c1acf48c3fb4ec5a2703a9a88f2323d2e Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen 
Date: Mon, 9 Sep 2019 18:48:31 +0200
Subject: gnu: Add emacs-doom-themes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-doom-themes): New variable.

Co-authored-by: Brett Gilio 
Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs-xyz.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b5a20680ab..3c63663263 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18199,3 +18199,37 @@ You can customize: @code{tao-theme-scale-fn}, that returns 16 2-digit numbers;
 @code{tao-theme-scale-filter-fn}, for edge filter; and
 @code{tao-theme-use-height}.")
       (license license:gpl3+))))
+
+(define-public emacs-doom-themes
+  (package
+    (name "emacs-doom-themes")
+    (version "2.1.6")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/hlissner/emacs-doom-themes.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "042pzcdhxi2z07jcscgjbaki9nrrm0cbgbbrnymd1r4q8ckkn8l9"))))
+    (build-system emacs-build-system)
+    (native-inputs
+     `(("emacs-ert-runner" ,emacs-ert-runner)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("ert-runner")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'move-themes
+           (lambda _
+             ;; Move the source files to the top level, which is in the
+             ;; EMACSLOADPATH.
+             (for-each (lambda (f)
+                         (rename-file f (basename f)))
+                       (find-files "./themes" ".*\\.el$"))
+             #t)))))
+    (synopsis "Wide collection of color themes for Emacs")
+    (description "Emacs-doom-themes contains numerous popular color themes for
+Emacs that integrate with major modes like Org-mode.")
+    (home-page "https://github.com/hlissner/emacs-doom-themes")
+    (license license:expat)))
-- 
cgit v1.2.3


From 86ce3691e1439ca446c2089bf4f24b36b23212d5 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 11 Sep 2019 20:52:28 +0200
Subject: gnu: emacs-interactive-align: Update to 0.4.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-interactive-align): Update to 0.4.2.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs-xyz.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3c63663263..cbda68c350 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13189,16 +13189,17 @@ compilation/grep buffers.  Works with @code{wgrep}, @code{ack}, @code{ag},
 (define-public emacs-interactive-align
   (package
     (name "emacs-interactive-align")
-    (version "0.1.0")
+    (version "0.4.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/mkcms/interactive-align/"
-                           "archive/" "v" version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mkcms/interactive-align.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "0sibpgb4lp6yy3pziak8f3hz4b28yj0dqy2nzh51z3d0b63h528m"))))
+         "0bh03w91i622hbar5dcq631ndxx1y8kd3h655pgw1g0lqkv1mlnc"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/mkcms/interactive-align/")
     (synopsis "Interactive align-regexp command in Emacs")
-- 
cgit v1.2.3


From 16fddf17f5ba90cd1b3c203a5fd8ec5b652fddb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= 
Date: Thu, 12 Sep 2019 18:44:57 +0200
Subject: gnu: Add r-assertr.

* gnu/packages/cran.scm (r-assertr): New variable.

Signed-off-by: Ricardo Wurmus 
---
 gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 6ef2066429..aa1135d0e4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2018 Marius Bakke 
 ;;; Copyright © 2018, 2019 Brett Gilio 
 ;;; Copyright © 2019 Nicolò Balzarotti 
+;;; Copyright © 2019 Wiktor Żelazny 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -15365,3 +15366,30 @@ common graph algorithms.")
 removing cell free mRNA contamination (the \"soup\") from droplet based single
 cell RNA-seq experiments.")
       (license license:gpl2))))
+
+(define-public r-assertr
+  (package
+    (name "r-assertr")
+    (version "2.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "assertr" version))
+       (sha256
+        (base32
+         "0g4ii6vhp0155a29ljhs64a09x0nzy5ybvwwchhk4mkcgsvnvfkj"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-dplyr" ,r-dplyr)
+       ("r-mass" ,r-mass)
+       ("r-rlang" ,r-rlang)))
+    (native-inputs
+     `(("r-knitr" ,r-knitr)))           ; needed for vignette
+    (home-page "https://github.com/ropensci/assertr")
+    (synopsis "Assertive programming for R analysis pipelines")
+    (description
+     "This package provides functionality to assert conditions that have to be
+met so that errors in data used in analysis pipelines can fail quickly.  It is
+similar to @code{stopifnot()} but more powerful, friendly, and easier for use
+in pipelines.")
+    (license license:expat)))
-- 
cgit v1.2.3


From 5ea654cfe030165efadf1f1dcfb2adef66a1f44f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 12 Sep 2019 21:59:10 +0200
Subject: gnu: python-matplotlib: Update to 3.1.1.

* gnu/packages/python-xyz.scm (python-matplotlib): Update to 3.1.1.
[native-inputs]: Remove python-nose; add python-pytest and unzip; add
jquery-ui.
[arguments]: Add build phases "fix-and-disable-failing-tests" and
"install-jquery-ui", and move the "check" phase after the "install" phase;
use the default backend in setup.cfg.
(python2-matplotlib): Keep at version 2.2.3.
(python-matplotlib-documentation)[arguments]: Remove "check" phase.
---
 gnu/packages/python-xyz.scm | 73 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 74abf336c8..1a4c804f37 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3806,14 +3806,14 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.
 (define-public python-matplotlib
   (package
     (name "python-matplotlib")
-    (version "2.2.3")
+    (version "3.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "matplotlib" version))
        (sha256
         (base32
-         "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk"))))
+         "14qc109dibp32xfd9lah54djc0rc76fhbsj9cwyb328lzqmd5sqz"))))
     (build-system python-build-system)
     (propagated-inputs ; the following packages are all needed at run time
      `(("python-cycler" ,python-cycler)
@@ -3830,7 +3830,7 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.
        ;; From version 1.4.0 'matplotlib' makes use of 'cairocffi' instead of
        ;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo' 'context'
        ;; object. For this reason we need to import both libraries.
-       ;; https://pythonhosted.org/cairocffi/cffi_api.html#converting-pycairo
+       ;; https://cairocffi.readthedocs.io/en/stable/cffi_api.html#converting-pycairo-wrappers-to-cairocffi
        ("python-pycairo" ,python-pycairo)
        ("python-cairocffi" ,python-cairocffi)))
     (inputs
@@ -3845,11 +3845,59 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.
        ("tk" ,tk)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("python-nose" ,python-nose)
-       ("python-mock" ,python-mock)))
+       ("python-pytest" ,python-pytest)
+       ("python-mock" ,python-mock)
+       ("unzip" ,unzip)
+       ("jquery-ui"
+        ,(origin
+           (method url-fetch)
+           (uri "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip")
+           (sha256
+            (base32
+             "0kb21xf38diqgxcdi1z3s9ssq36pldvyqxy56hn6pcva6rs3c8zq"))))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         ;; XXX We disable all image comparison tests because we're using a
+         ;; newer version of FreeType than matplotlib expects.  This leads to
+         ;; minor differences throughout the tests.
+         (add-after 'unpack 'fix-and-disable-failing-tests
+           (lambda _
+             (substitute* (append (find-files "lib/matplotlib/tests/"
+                                              "test_.*\\.py$")
+                                  (find-files "lib/mpl_toolkits/tests"
+                                              "test_.*\\.py$"))
+               (("^from matplotlib" match)
+                (string-append "import pytest\n" match))
+               (("( *)@image_comparison" match indent)
+                (string-append indent
+                               "@pytest.mark.skip(reason=\"unknown minor image differences\")\n"
+                               match)))
+             (substitute* "lib/matplotlib/tests/test_animation.py"
+               (("/bin/sh") (which "sh")))
+             (for-each delete-file
+                       ;; test_normal_axes, test_get_tightbbox_polar
+                       '("lib/matplotlib/tests/test_axes.py"
+                         ;; test_outward_ticks
+                         "lib/matplotlib/tests/test_tightlayout.py"
+                         ;; Fontconfig returns no fonts.
+                         "lib/matplotlib/tests/test_font_manager.py"))
+             #t))
+         (add-before 'install 'install-jquery-ui
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (let ((dir (string-append (assoc-ref outputs "out")
+                                       "/lib/python3.7/site-packages/matplotlib/backends/web_backend/")))
+               (mkdir-p dir)
+               (invoke "unzip"
+                       (assoc-ref inputs "jquery-ui")
+                       "-d" dir))
+             #t))
+         (delete 'check)
+         (add-after 'install 'check
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (add-installed-pythonpath inputs outputs)
+             (invoke "python" "tests.py" "-v"
+                     "-m" "not network")))
          (add-before 'build 'configure-environment
            (lambda* (#:key outputs inputs #:allow-other-keys)
              (let ((cairo (assoc-ref inputs "cairo")))
@@ -3861,8 +3909,8 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.
                  (lambda (port)
                    (format port "[directories]~%
 basedirlist = ~a,~a~%
- [rc_options]~%
-backend = TkAgg~%"
+[packages]~%
+tests = True~%"
                         (assoc-ref inputs "tcl")
                         (assoc-ref inputs "tk")))))
              #t)))))
@@ -3881,6 +3929,14 @@ toolkits.")
   (let ((matplotlib (package-with-python2
                      (strip-python2-variant python-matplotlib))))
     (package (inherit matplotlib)
+      (version "2.2.3")
+      (source
+       (origin
+         (method url-fetch)
+         (uri (pypi-uri "matplotlib" version))
+         (sha256
+          (base32
+           "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk"))))
       ;; Make sure to use special packages for Python 2 instead
       ;; of those automatically rewritten by package-with-python2.
       (propagated-inputs
@@ -3930,6 +3986,9 @@ toolkits.")
      `(#:tests? #f ; we're only generating documentation
        #:phases
        (modify-phases %standard-phases
+         ;; The tests in python-matplotlib are run after the install phase, so
+         ;; we need to delete the extra phase here.
+         (delete 'check)
          (replace 'build
            (lambda _
              (chdir "doc")
-- 
cgit v1.2.3


From bcb22b3624e677231b50029fea63e3b6e4978b2d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 12 Sep 2019 23:00:22 +0200
Subject: gnu: Add python-sphinx-copybutton.

* gnu/packages/sphinx.scm (python-sphinx-copybutton): New variable.
---
 gnu/packages/sphinx.scm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 5ec769388a..9bd1e8d421 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 David Thompson 
-;;; Copyright © 2015, 2017 Ricardo Wurmus 
+;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus 
 ;;; Copyright © 2015, 2016, 2017 Leo Famulari 
 ;;; Copyright © 2016 Hartmut Goebel 
 ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke 
@@ -163,6 +163,25 @@ sources.")
 Apple help books.")
     (license license:bsd-2)))
 
+(define-public python-sphinx-copybutton
+  (package
+    (name "python-sphinx-copybutton")
+    (version "0.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "sphinx-copybutton" version))
+       (sha256
+        (base32
+         "1bk006nv5s9ym6v67cxd4d2wvd8wm6czqi21mqcs33risygksncl"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/choldgraf/sphinx-copybutton")
+    (synopsis "Sphinx extension to add \"copy\" buttons to code blocks")
+    (description
+     "This package provides a small sphinx extension to add \"copy\" buttons
+to code blocks.")
+    (license license:expat)))
+
 (define-public python-sphinxcontrib-devhelp
   (package
     (name "python-sphinxcontrib-devhelp")
-- 
cgit v1.2.3


From 5ad0a4522116007420aeb288f76da241f43cb6bf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 12 Sep 2019 23:00:39 +0200
Subject: gnu: python-matplotlib-documentation: Add missing input.

* gnu/packages/python-xyz.scm (python-matplotlib-documentation)[native-inputs]:
Add python-sphinx-copybutton.
(python2-matplotlib-documentation)[native-inputs]: Remove
python-sphinx-copybutton.
---
 gnu/packages/python-xyz.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1a4c804f37..4541604873 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3960,6 +3960,7 @@ toolkits.")
      `(("python-matplotlib" ,python-matplotlib)
        ("python-colorspacious" ,python-colorspacious)
        ("python-sphinx" ,python-sphinx)
+       ("python-sphinx-copybutton" ,python-sphinx-copybutton)
        ("python-sphinx-gallery" ,python-sphinx-gallery)
        ("python-numpydoc" ,python-numpydoc)
        ("python-ipython" ,python-ipython)
@@ -4037,7 +4038,12 @@ toolkits.")
     (license (package-license python-matplotlib))))
 
 (define-public python2-matplotlib-documentation
-  (package-with-python2 python-matplotlib-documentation))
+  (let ((parent (package-with-python2 python-matplotlib-documentation)))
+    (package
+      (inherit parent)
+      (native-inputs
+       (alist-delete "python-sphinx-copybutton"
+                     (package-native-inputs parent))))))
 
 (define-public python-matplotlib-venn
   (package
-- 
cgit v1.2.3


From ba05be22495478c6ea3307d0dde6dd635a84e7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 13 Sep 2019 10:10:37 +0200
Subject: gnu: openblas: Set 'NUM_THREADS'.

Until now, OpenBLAS would use at most the N threads, where N is the
number of cores that happened to be available on the build
machine (typically N=8).

* gnu/packages/maths.scm (openblas/fixed-num-threads): New variable.
(openblas)[replacement]: New field.
(openblas-ilp64): Use 'package/inherit'.
---
 gnu/packages/maths.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 487f53ead1..761cb70abd 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3096,6 +3096,10 @@ parts of it.")
 
 (define-public openblas
   (package
+    ;; TODO: Incorporate 'openblas/fixed-num-threads' changes on the next
+    ;; rebuild cycle.
+    (replacement openblas/fixed-num-threads)
+
     (name "openblas")
     (version "0.3.5")
     (source
@@ -3166,7 +3170,7 @@ parts of it.")
     (license license:bsd-3)))
 
 (define-public openblas-ilp64
-  (package (inherit openblas)
+  (package/inherit openblas
     (name "openblas-ilp64")
     (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux"))
     (arguments
@@ -3177,6 +3181,24 @@ parts of it.")
     (synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)")
     (license license:bsd-3)))
 
+(define openblas/fixed-num-threads
+  ;; TODO: Move that to 'openblas' proper on the next rebuild cycle.
+  (package
+    (inherit openblas)
+    (version (match (string-split (package-version openblas) #\.)
+               ((numbers ... (= string-length len))
+                (string-join (append numbers
+                                     (list (make-string len #\a)))
+                             "."))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments openblas)
+       ((#:make-flags flags ''())
+        ;; This is the maximum number of threads OpenBLAS will ever use (that
+        ;; is, if $OPENBLAS_NUM_THREADS is greater than that, then NUM_THREADS
+        ;; is used.)  If we don't set it, the makefile sets it to the number
+        ;; of cores of the build machine, which is obviously wrong.
+        `(cons "NUM_THREADS=128" ,flags))))))
+
 (define* (make-blis implementation #:optional substitutable?)
   "Return a BLIS package with the given IMPLEMENTATION (see config/ in the
 source tree for a list of implementations.)
-- 
cgit v1.2.3


From a00a3132c7c5585e75862b479be1c63fde36b29d Mon Sep 17 00:00:00 2001
From: L p R n d n 
Date: Mon, 19 Aug 2019 14:01:52 +0200
Subject: gnu: Thunar: Update to 1.8.9.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xfce.scm (thunar): Update to 1.8.9.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xfce.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3a8b223b9c..c71285c7bd 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -642,7 +642,7 @@ like appearance, display, keyboard and mouse settings.")
 (define-public thunar
   (package
     (name "thunar")
-    (version "1.8.7")
+    (version "1.8.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://archive.xfce.org/src/xfce/"
@@ -650,7 +650,7 @@ like appearance, display, keyboard and mouse settings.")
                                   "Thunar-" version ".tar.bz2"))
               (sha256
                (base32
-                "0afkp528mwwa2m18m39mvw53qgaijyynrw9wwwiyxgjiczq3l0ry"))))
+                "1fah2d7v3a7fp28xa5wv896rap1iad9q9y04qchca09mq1x8wxbs"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From f69f37d54a677c1816b225ead7503a4e3cfee24d Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" 
Date: Wed, 11 Sep 2019 23:08:37 -0400
Subject: gnu: Add sh-z shell tool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/shellutils.scm (sh-z): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/shellutils.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index f7542ea759..f901eaaa8f 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017 Stefan Reichör 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Benjamin Slade 
+;;; Copyright © 2019 Collin J. Doering 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,43 @@
   #:use-module (guix build-system go)
   #:use-module (guix build-system python))
 
+(define-public sh-z
+  (package
+    (name "sh-z")
+    (version "1.11")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/rupa/z.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "13zbgkj6y0qhvn5jpkrqbd4jjxjr789k228iwma5hjfh1nx7ghyb"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; No tests provided
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (man (string-append out "/share/man/man1"))
+                    (bin (string-append out "/bin")))
+               (install-file "z.sh" bin)
+               (chmod (string-append bin "/z.sh") #o755)
+               (install-file "z.1" man)
+               #t))))))
+    (synopsis "Jump about directories")
+    (description
+     "Tracks your most used directories, based on ``frecency''.  After a short
+learning phase, z will take you to the most ``frecent'' directory that matches
+all of the regexes given on the command line in order.")
+    (home-page "https://github.com/rupa/z")
+    (license license:expat)))
+
 (define-public envstore
   (package
     (name "envstore")
-- 
cgit v1.2.3


From 43ffa11fdc4de4197a1096f6ebc4067115f9eb26 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 13 Sep 2019 15:05:10 +0300
Subject: build-system/cargo: Use 'strip-store-file-name'.

This is a follow-up to f58b2f38e4dfdbb8473fb2816d44fae6ad9cbc79.

* guix/build/cargo-build-system.scm (configure): Use bespoke
'strip-store-file-name' function.
---
 guix/build/cargo-build-system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index 0134997c27..c69cae5afd 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -99,7 +99,7 @@ Cargo.toml file present at its root."
   (for-each
     (match-lambda
       ((name . path)
-       (let* ((basepath (string-drop (basename path) 33))
+       (let* ((basepath (strip-store-file-name path))
               (crate-dir (string-append vendor-dir "/" basepath)))
          (and (crate-src? path)
               ;; Gracefully handle duplicate inputs
-- 
cgit v1.2.3


From 3af85f832dd007296ec64ddc34beadd397481311 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 13 Sep 2019 15:09:34 +0300
Subject: build-system/cargo: Remove unused function.

* guix/build/cargo-build-system.scm (touch): Remove it.
---
 guix/build/cargo-build-system.scm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm
index c69cae5afd..4be5443083 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -168,9 +168,6 @@ directory = '" port)
       (apply invoke `("cargo" "test" ,@cargo-test-flags))
       #t))
 
-(define (touch file-name)
-  (call-with-output-file file-name (const #t)))
-
 (define* (install #:key inputs outputs skip-build? #:allow-other-keys)
   "Install a given Cargo package."
   (let* ((out (assoc-ref outputs "out")))
-- 
cgit v1.2.3


From 9c4cb1ef4cbd4ea95eb2c73b0fcdf893062b53d1 Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" 
Date: Thu, 12 Sep 2019 17:09:00 -0400
Subject: gnu: Add ruby-rspec-wait.

* gnu/packages/ruby.scm (ruby-rspec-wait): New variable.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index ef9792bc0f..a886a1cdd2 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2019 Mikhail Kirillov 
 ;;; Copyright © 2019 Jelle Licht 
 ;;; Copyright © 2019 Brian Leung 
+;;; Copyright © 2019 Collin J. Doering 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -670,6 +671,35 @@ RSpec tests.")
     (home-page "https://github.com/dblock/rspec-rerun")
     (license license:expat)))
 
+(define-public ruby-rspec-wait
+  (package
+    (name "ruby-rspec-wait")
+    (version "0.0.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (rubygems-uri "rspec-wait" version))
+        (sha256
+         (base32
+          "0gvj1bp5ccx001dyvcgk2j49s5sl6vs9fdaqqb08z3bd1554hsww"))))
+    (build-system ruby-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "rake" "spec"))))))
+    (native-inputs
+     `(("bundler" ,bundler)))
+    (propagated-inputs
+     `(("ruby-rspec" ,ruby-rspec)))
+    (home-page "https://github.com/laserlemon/rspec-wait")
+    (synopsis "Wait for conditions in RSpec")
+    (description
+     "RSpec::Wait strives to make it easier to test asynchronous or slow
+interactions.")
+    (license license:expat)))
+
 (define-public ruby-rspec
   (package
     (name "ruby-rspec")
-- 
cgit v1.2.3


From 8ebd56ea75768cf7acda877bd294ff0dd3a1809d Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" 
Date: Thu, 12 Sep 2019 17:09:07 -0400
Subject: gnu: Add zsh-autosuggestions.

* gnu/packages/shellutils.scm (zsh-autosuggestions): New variable.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/shellutils.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index f901eaaa8f..a5fadd9343 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -34,11 +34,60 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages ruby)
+  #:use-module (gnu packages tmux)
+  #:use-module (gnu packages shells)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python))
 
+(define-public zsh-autosuggestions
+  (package
+    (name "zsh-autosuggestions")
+    (version "0.6.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/zsh-users/zsh-autosuggestions.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1h8h2mz9wpjpymgl2p7pc146c1jgb3dggpvzwm9ln3in336wl95c"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("ruby" ,ruby)
+       ("ruby-byebug" ,ruby-byebug)
+       ("ruby-pry" ,ruby-pry)
+       ("ruby-rspec" ,ruby-rspec)
+       ("ruby-rspec-wait" ,ruby-rspec-wait)
+       ("tmux" ,tmux)
+       ("zsh" ,zsh)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'check ; Tests use ruby's bundler; instead execute rspec directly.
+           (lambda _
+             (setenv "TMUX_TMPDIR" (getenv "TMPDIR"))
+             (setenv "SHELL" (which "zsh"))
+             (invoke "rspec")))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (zsh-plugins
+                      (string-append out "/share/zsh/plugins/zsh-autosuggestions")))
+               (invoke "make" "all")
+               (install-file "zsh-autosuggestions.zsh" zsh-plugins)
+               #t))))))
+    (home-page "https://github.com/zsh-users/zsh-autosuggestions")
+    (synopsis "Fish-like autosuggestions for zsh")
+    (description
+     "Fish-like fast/unobtrusive autosuggestions for zsh.  It suggests commands
+as you type.")
+    (license license:expat)))
+
 (define-public sh-z
   (package
     (name "sh-z")
-- 
cgit v1.2.3


From f0e149752a76b453b197b39c88e4ffc9ac5f52fa Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 13 Sep 2019 15:37:56 +0300
Subject: gnu: shellutils.scm: Sort module inputs.

* gnu/packages/shellutils.scm: Sort module inputs alphabetically.
---
 gnu/packages/shellutils.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index a5fadd9343..6630332692 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -23,24 +23,24 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu packages shellutils)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages golang)
-  #:use-module (gnu packages python)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system go)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages golang)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages readline)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages ruby)
-  #:use-module (gnu packages tmux)
   #:use-module (gnu packages shells)
-  #:use-module (guix utils)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system go)
-  #:use-module (guix build-system python))
+  #:use-module (gnu packages tmux))
 
 (define-public zsh-autosuggestions
   (package
-- 
cgit v1.2.3


From f61f424d5b3da735380dc99bb2bad3883d218ccb Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 13 Sep 2019 15:59:02 +0300
Subject: gnu: mcron: Update to 1.1.2.

* gnu/packages/guile-xyz.scm (mcron): Update to 1.1.2.
[arguments]: Remove custom 'set-timezone phase.
[native-inputs]: Add autoconf, automake, help2man, texinfo.
[inputs]: Remove ed, which.
---
 gnu/packages/guile-xyz.scm | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b765ef36e1..2f974ee63b 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Alex Sassmannshausen 
 ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2016 Erik Edrosa 
-;;; Copyright © 2016 Eraim Flashner 
+;;; Copyright © 2016, 2019 Eraim Flashner 
 ;;; Copyright © 2016, 2017 Alex Kost 
 ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira  
 ;;; Copyright © 2016 Amirouche 
@@ -48,7 +48,6 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages disk)
-  #:use-module (gnu packages ed)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages emacs-xyz)
   #:use-module (gnu packages gawk)
@@ -1926,30 +1925,17 @@ is no support for parsing block and inline level HTML.")
 (define-public mcron
   (package
     (name "mcron")
-    (version "1.1.1")
+    (version "1.1.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/mcron/mcron-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1i9mcp6r6my61zfiydsm3n6my41mwvl7dfala4q29qx0zn1ynlm4"))))
+                "069m3ri7nc8lgy3h9ka7gj3v3anqj69x9jw4l3cfq65nqkxsch4g"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'set-timezone
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      ;; 'tests/job-specifier.scm' expects to be running in
-                      ;; UTC-2 or something.
-                      ;; FIXME: This issue is being investigated upstream, for
-                      ;; now we'll just skip the tests (see below):
-                      ;; .
-                      (let ((tzdata (assoc-ref inputs "tzdata")))
-                        (setenv "TZDIR"
-                                (string-append tzdata
-                                               "/share/zoneinfo"))
-                        (setenv "TZ" "UTC-2")
-                        #t)))
                   (add-before 'check 'adjust-tests
                     (lambda _
                       (substitute* "tests/job-specifier.scm"
@@ -1966,9 +1952,13 @@ is no support for parsing block and inline level HTML.")
                         (("\\(test-equal \"next-year\"" all)
                          (string-append "(test-skip 4)\n" all)))
                       #t)))))
-    (native-inputs `(("pkg-config" ,pkg-config)
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("automake" ,automake)
+                     ("help2man" ,help2man)
+                     ("pkg-config" ,pkg-config)
+                     ("texinfo" ,texinfo)
                      ("tzdata" ,tzdata-for-tests)))
-    (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.2)))
+    (inputs `(("guile" ,guile-2.2)))
     (home-page "https://www.gnu.org/software/mcron/")
     (synopsis "Run jobs at scheduled times")
     (description
-- 
cgit v1.2.3


From 0746c33effdbd2419a584b3731d752698cbbd2f5 Mon Sep 17 00:00:00 2001
From: Paul Garlick 
Date: Fri, 13 Sep 2019 14:45:44 +0100
Subject: gnu: gmsh: Update home page. This addresses a 'guix lint' warning.

* gnu/packages/maths.scm (gmsh)[home-page]: Update to avoid URL
redirection.
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 761cb70abd..5380b4a99e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1752,7 +1752,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
      `(#:configure-flags `("-DENABLE_METIS:BOOL=OFF"
                            "-DENABLE_BUILD_SHARED:BOOL=ON"
                            "-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
-    (home-page "http://www.geuz.org/gmsh/")
+    (home-page "http://gmsh.info/")
     (synopsis "3D finite element grid generator")
     (description "Gmsh is a 3D finite element grid generator with a built-in
 CAD engine and post-processor.  Its design goal is to provide a fast, light
-- 
cgit v1.2.3


From dbb0b06eb4cf8489a2eb413a8c63df0cac78d22a Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 13 Sep 2019 16:32:56 +0300
Subject: gnu: tipp10: Fix path in desktop entry.

* gnu/packages/patches/tipp10-fix-compiling.patch: Remove changes to
hardcode executable path.
---
 gnu/packages/patches/tipp10-fix-compiling.patch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/patches/tipp10-fix-compiling.patch b/gnu/packages/patches/tipp10-fix-compiling.patch
index 4c206d4d83..3a34a98b22 100644
--- a/gnu/packages/patches/tipp10-fix-compiling.patch
+++ b/gnu/packages/patches/tipp10-fix-compiling.patch
@@ -204,8 +204,7 @@ https://sources.debian.net/data/main/t/tipp10/2.1.0-2/debian/patches/0001-FixCom
  Name=TIPP10
  Comment=Touch Typing Tutor
  Comment[de]=10-Finger-Schreibtrainer
--Exec=tipp10
-+Exec=/usr/bin/tipp10
+ Exec=tipp10
  Icon=tipp10.png
  Terminal=false
  Type=Application
-- 
cgit v1.2.3


From 18a613fb29bf053b344bca585e78a2cf26b44469 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 13 Sep 2019 16:49:18 +0300
Subject: gnu: gnujump: Add desktop file.

This fixes bug#37069.

* gnu/packages/games.scm (gnujump)[arguments]: Add custom
'create-desktop-entry phase to install a desktop file.
---
 gnu/packages/games.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f9d7331f5b..c5ab05ed60 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2210,7 +2210,24 @@ also available.")
        (modify-phases %standard-phases
          (add-before
           'configure 'link-libm
-          (lambda _ (setenv "LIBS" "-lm"))))))
+          (lambda _ (setenv "LIBS" "-lm")))
+         (add-after 'install 'create-desktop-entry
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (apps (string-append out "/share/applications")))
+               (mkdir-p apps)
+               (with-output-to-file
+                 (string-append apps "/gnujump.desktop")
+                 (lambda _
+                   (format #t
+                           "[Desktop Entry]~@
+                           Name=GNUjump~@
+                           Comment=Jump up the tower to survive~@
+                           Exec=~a/bin/gnujump~@
+                           Terminal=false~@
+                           Type=Application~@
+                           Categories=Game;ArcadeGame~%"
+                           out)))))))))
     (inputs
      `(("glu" ,glu)
        ("mesa" ,mesa)
-- 
cgit v1.2.3


From a5a79dd0b88c0d9da09be7823c6158fa80ac5acd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:23:14 +0200
Subject: gnu: Add r-parameters.

* gnu/packages/cran.scm (r-parameters): New variable.
---
 gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index aa1135d0e4..732028601f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15393,3 +15393,30 @@ met so that errors in data used in analysis pipelines can fail quickly.  It is
 similar to @code{stopifnot()} but more powerful, friendly, and easier for use
 in pipelines.")
     (license license:expat)))
+
+(define-public r-parameters
+  (package
+    (name "r-parameters")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "parameters" version))
+       (sha256
+        (base32
+         "12v301va1l3xydicbf0k04anxlmyjclbbjfg0riprryhkxwwk8g5"))))
+    (properties `((upstream-name . "parameters")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-bayestestr" ,r-bayestestr)
+       ("r-insight" ,r-insight)))
+    (home-page "https://cran.r-project.org/web/packages/parameters")
+    (synopsis "Processing of model parameters")
+    (description
+     "This package provides utilities for processing the parameters of various
+statistical models.  Beyond computing p values, CIs, and other indices for a
+wide variety of models, this package implements features like standardization
+or bootstrapping of parameters and models, feature reduction (feature
+extraction and variable selection) as well as conversion between indices of
+effect size.")
+    (license license:gpl3)))
-- 
cgit v1.2.3


From a0244ef0008dd3c45ede84d5692c4be4327b60d0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:31:21 +0200
Subject: gnu: Add r-rgdal.

* gnu/packages/cran.scm (r-rgdal): New variable.
---
 gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 732028601f..3c300a39a6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15420,3 +15420,32 @@ or bootstrapping of parameters and models, feature reduction (feature
 extraction and variable selection) as well as conversion between indices of
 effect size.")
     (license license:gpl3)))
+
+(define-public r-rgdal
+  (package
+    (name "r-rgdal")
+    (version "1.4-4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "rgdal" version))
+       (sha256
+        (base32
+         "1my56hdc9x40ynxx1qwqwqxjvjxybmm00w4xg5gi8zgj19pffci5"))))
+    (properties `((upstream-name . "rgdal")))
+    (build-system r-build-system)
+    (inputs
+     `(("gdal" ,gdal)
+       ("proj.4" ,proj.4)
+       ("zlib" ,zlib)))
+    (propagated-inputs
+     `(("r-sp" ,r-sp)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://rgdal.r-forge.r-project.org")
+    (synopsis "Bindings for the Geospatial Data Abstraction Library")
+    (description
+     "This package provides bindings to the Geospatial Data Abstraction
+Library (GDAL) and access to projection/transformation operations from the
+PROJ.4 library.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From 5ad9da9ab32761181ace8e41d7af9798e7ce9ea9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:31:57 +0200
Subject: gnu: Add r-insol.

* gnu/packages/cran.scm (r-insol): New variable.
---
 gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3c300a39a6..8228f2d988 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15449,3 +15449,31 @@ effect size.")
 Library (GDAL) and access to projection/transformation operations from the
 PROJ.4 library.")
     (license license:gpl2+)))
+
+(define-public r-insol
+  (package
+    (name "r-insol")
+    (version "1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "insol" version))
+       (sha256
+        (base32
+         "14ikz05375pjn9hby7kwkhcnykjilbnkdy5i8lsl7c5qdbhmqcm5"))))
+    (properties `((upstream-name . "insol")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-raster" ,r-raster)
+       ("r-rgdal" ,r-rgdal)))
+    (native-inputs
+     `(("gfortran" ,gfortran)))
+    (home-page "https://meteoexploration.com/R/insol/index.html")
+    (synopsis "Tools for calculating solar radiation")
+    (description
+     "This package provides functions to compute insolation on tilted
+surfaces, computes atmospheric transmittance and related parameters such as:
+Earth radius vector, declination, sunset and sunrise, daylength, equation of
+time, vector in the direction of the sun, vector normal to surface, and some
+atmospheric physics.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From a1f439943802eb45ec9c1c8da9e439079722ced5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:34:29 +0200
Subject: gnu: r-httpuv: Update to 1.5.2.

* gnu/packages/cran.scm (r-httpuv): Update to 1.5.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8228f2d988..0fc017d007 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -448,13 +448,13 @@ into a pipeline of data manipulation and visualisation.")
 (define-public r-httpuv
   (package
     (name "r-httpuv")
-    (version "1.5.1")
+    (version "1.5.2")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "httpuv" version))
               (sha256
                (base32
-                "042piypg4c8sqrlcdl3dwajkafkbglsky3x7d0jpjv8s5wxnpfxm"))))
+                "13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-bh" ,r-bh)
-- 
cgit v1.2.3


From 4557f44755530be1675ea92437665f00b34c40fe Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:34:34 +0200
Subject: gnu: r-circlize: Update to 0.4.8.

* gnu/packages/cran.scm (r-circlize): Update to 0.4.8.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0fc017d007..635d295701 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1650,14 +1650,14 @@ validation and filtering on the values, making options invisible or private.")
 (define-public r-circlize
   (package
     (name "r-circlize")
-    (version "0.4.7")
+    (version "0.4.8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "circlize" version))
        (sha256
         (base32
-         "07y1bchkslpz2wl43yg5j5h1nl9z0i425a07jdmfd5avrynd8p3m"))))
+         "0jvr9hmxyhg0zx101iiqkrg8wfaj86kp62xpv42n2j9fkn5r1mi2"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-colorspace" ,r-colorspace)
-- 
cgit v1.2.3


From 3ab3f7f3bb80951cf1456589c2918163884f257b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:34:39 +0200
Subject: gnu: r-sjlabelled: Update to 1.1.1.

* gnu/packages/cran.scm (r-sjlabelled): Update to 1.1.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 635d295701..fbf0f8c4ec 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6118,14 +6118,14 @@ information are missing.")
 (define-public r-sjlabelled
   (package
     (name "r-sjlabelled")
-    (version "1.1.0")
+    (version "1.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sjlabelled" version))
        (sha256
         (base32
-         "0rnmlwpp41h04dzfjd5ncvzjzs43slaimb4v2in1axznv3haafyc"))))
+         "0c9wy0gsr2sbkrv2638xbi7qm0gl6jyr6sfricavhkm7l4hljjkz"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-haven" ,r-haven)
-- 
cgit v1.2.3


From 28110e684275282e3a980b09e0cf04ef840a7485 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:34:48 +0200
Subject: gnu: r-emmeans: Update to 1.4.1.

* gnu/packages/cran.scm (r-emmeans): Update to 1.4.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index fbf0f8c4ec..1f4f5e2f9d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -7879,14 +7879,14 @@ Hothorn, Westfall, 2010, CRC Press).")
 (define-public r-emmeans
   (package
     (name "r-emmeans")
-    (version "1.4")
+    (version "1.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "emmeans" version))
        (sha256
         (base32
-         "1ynf9hhbch83k63lwps69ijfch30fk5v0sc418ck264c5vih26dh"))))
+         "1fpawaxnmj67md169a9mzrnnh2d0c973xydfg6hw865933jil9lq"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-estimability" ,r-estimability)
-- 
cgit v1.2.3


From 664e15ed8fcb255c60ba2e7fbe807cafe36e3961 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:34:55 +0200
Subject: gnu: r-sjstats: Update to 0.17.6.

* gnu/packages/cran.scm (r-sjstats): Update to 0.17.6.
[propagated-inputs]: Add r-parameters.
---
 gnu/packages/cran.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1f4f5e2f9d..fac81d5e86 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8037,14 +8037,14 @@ detection, parallelism through BLAS and parallel user templates.")
 (define-public r-sjstats
   (package
     (name "r-sjstats")
-    (version "0.17.5")
+    (version "0.17.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sjstats" version))
        (sha256
         (base32
-         "1x9ybvz84vgaabmqp4z6crbv5q6kqjg6msk1spbr11zx9dbj06ca"))))
+         "11z1wfi0d74d1rld0320l3vmv6rl41wa0v9bjc44rk06yc90wld2"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-bayestestr" ,r-bayestestr)
@@ -8056,6 +8056,7 @@ detection, parallelism through BLAS and parallel user templates.")
        ("r-magrittr" ,r-magrittr)
        ("r-mass" ,r-mass)
        ("r-modelr" ,r-modelr)
+       ("r-parameters" ,r-parameters)
        ("r-performance" ,r-performance)
        ("r-purrr" ,r-purrr)
        ("r-rlang" ,r-rlang)
-- 
cgit v1.2.3


From d72da21d54a6836668b7405743f25d34bc871877 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:07 +0200
Subject: gnu: r-sjplot: Update to 2.7.1.

* gnu/packages/cran.scm (r-sjplot): Update to 2.7.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index fac81d5e86..946ee5b7aa 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8198,14 +8198,14 @@ results using @code{ggplot2}.")
 (define-public r-sjplot
   (package
     (name "r-sjplot")
-    (version "2.7.0")
+    (version "2.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sjPlot" version))
        (sha256
         (base32
-         "1m0gy991fmxvqry91kkzdkdapyalhrwql25d0hg2a2naxgfw4zpk"))))
+         "14shypabpahf68hd66rb1dpqhiyl3i0yx1yc85wamdvljh9fdymb"))))
     (properties `((upstream-name . "sjPlot")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From aef5e2aaddfddd6c574853928236f4e37efe9827 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:12 +0200
Subject: gnu: r-activity: Update to 1.3.

* gnu/packages/cran.scm (r-activity): Update to 1.3.
[propagated-inputs]: Add r-insol.
---
 gnu/packages/cran.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 946ee5b7aa..436e545e00 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9124,17 +9124,18 @@ Scientific.")
 (define-public r-activity
   (package
     (name "r-activity")
-    (version "1.2")
+    (version "1.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "activity" version))
        (sha256
         (base32
-         "11w2bz6p9xbzdh6773dmbbh6rws0h5dj18p8m0ivzizgq932vdzs"))))
+         "12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-circular" ,r-circular)
+       ("r-insol" ,r-insol)
        ("r-pbapply" ,r-pbapply)))
     (home-page "https://cran.r-project.org/web/packages/activity/")
     (synopsis "Animal activity statistics")
-- 
cgit v1.2.3


From ac50956f319106315df8263dabcf3dd3705d0ef1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:22 +0200
Subject: gnu: r-tidytree: Update to 0.2.7.

* gnu/packages/cran.scm (r-tidytree): Update to 0.2.7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 436e545e00..fa03c3a0c8 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9447,14 +9447,14 @@ maps.")
 (define-public r-tidytree
   (package
     (name "r-tidytree")
-    (version "0.2.6")
+    (version "0.2.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tidytree" version))
        (sha256
         (base32
-         "13mhizbsawmfqjpnzb73yw6kn1f1wlz0vhyzj3g0rj6ry880rw89"))))
+         "15ky7hj7w08jx94wm0yikckca0apwv3jy5svd77dpzgb2lr9ff9a"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-ape" ,r-ape)
-- 
cgit v1.2.3


From cd3ba9c8c7952567d4524f67d57046f08b7ad48a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:27 +0200
Subject: gnu: r-huge: Update to 1.3.3.

* gnu/packages/cran.scm (r-huge): Update to 1.3.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index fa03c3a0c8..d85712df2c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -11155,14 +11155,14 @@ regression coefficients can be conducted via jackknifing.")
 (define-public r-huge
   (package
     (name "r-huge")
-    (version "1.3.2")
+    (version "1.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "huge" version))
        (sha256
         (base32
-         "1j93gvi1jyq3ld9jhdqhrpm2is54rk3ilmf3yw7fx6gva0y6hjqd"))))
+         "18f8w4hdp9fdi2k5ip6fnrn5z47w4ybgxs2m6a7jdvd2v4wfdr69"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-igraph" ,r-igraph)
-- 
cgit v1.2.3


From f5b1354fdb963586bb3cf0411c8bb2a3e8e7fd84 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:37 +0200
Subject: gnu: Add r-lifecycle.

* gnu/packages/cran.scm (r-lifecycle): New variable.
---
 gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d85712df2c..f40d00fc94 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15479,3 +15479,31 @@ Earth radius vector, declination, sunset and sunrise, daylength, equation of
 time, vector in the direction of the sun, vector normal to surface, and some
 atmospheric physics.")
     (license license:gpl2+)))
+
+(define-public r-lifecycle
+  (package
+    (name "r-lifecycle")
+    (version "0.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "lifecycle" version))
+       (sha256
+        (base32
+         "11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"))))
+    (properties `((upstream-name . "lifecycle")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-glue" ,r-glue)
+       ("r-rlang" ,r-rlang)))
+    (home-page "https://github.com/r-lib/lifecycle")
+    (synopsis "Manage the life cycle of your package functions")
+    (description
+     "Manage the life cycle of your exported functions with shared
+conventions, documentation badges, and non-invasive deprecation warnings.  The
+lifecycle package defines four development stages (experimental, maturing,
+stable, and questioning) and three deprecation stages (soft-deprecated,
+deprecated, and defunct).  It makes it easy to insert badges corresponding to
+these stages in your documentation.  Usage of deprecated functions are
+signalled with increasing levels of non-invasive verbosity.")
+    (license license:gpl3)))
-- 
cgit v1.2.3


From fd399b7a83c2e804a68eb83b67055ad752713f0e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:42 +0200
Subject: gnu: r-seqinr: Update to 3.6-1.

* gnu/packages/cran.scm (r-seqinr): Update to 3.6-1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f40d00fc94..84b3b1dab6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12593,14 +12593,14 @@ barplots or heatmaps.")
 (define-public r-seqinr
   (package
     (name "r-seqinr")
-    (version "3.4-5")
+    (version "3.6-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "seqinr" version))
        (sha256
         (base32
-         "17zv0n5cji17izwmwg0jcbxbjl3w5rls91w15svcnlpxjms38ahn"))))
+         "0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-ade4" ,r-ade4)
-- 
cgit v1.2.3


From 17f3960f28ef95866b97b281bfaf5b4569702b0a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:48 +0200
Subject: gnu: r-diffusionmap: Update to 1.2.0.

* gnu/packages/graph.scm (r-diffusionmap): Update to 1.2.0.
---
 gnu/packages/graph.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 8b06aaa0e9..bde8b44a30 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -139,14 +139,14 @@ more.")
 (define-public r-diffusionmap
   (package
     (name "r-diffusionmap")
-    (version "1.1-0.1")
+    (version "1.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "diffusionMap" version))
        (sha256
         (base32
-         "11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j"))))
+         "1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"))))
     (properties `((upstream-name . "diffusionMap")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 981dcc3b0cb6b043b673dc0f31912a8443ad49e3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:35:57 +0200
Subject: gnu: r-tidyr: Update to 1.0.0.

* gnu/packages/statistics.scm (r-tidyr): Update to 1.0.0.
[propagated-inputs]: Add r-ellipsis, r-lifecycle, and r-vctrs.
---
 gnu/packages/statistics.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 61d1babd91..2ffe0a10d6 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -3757,25 +3757,28 @@ selection.")
 (define-public r-tidyr
   (package
     (name "r-tidyr")
-    (version "0.8.3")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tidyr" version))
        (sha256
         (base32
-         "0dyc4b03wi65bk7j0ma0y188syh37h57wgxji82i0h8j6pn593x1"))))
+         "1403j0xd93l0r7qj738ryd5zc79hbcghrzybib3c3hrnaq5s78cj"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-dplyr" ,r-dplyr)
+       ("r-ellipsis" ,r-ellipsis)
        ("r-magrittr" ,r-magrittr)
        ("r-glue" ,r-glue)
+       ("r-lifecycle" ,r-lifecycle)
        ("r-purrr" ,r-purrr)
        ("r-rlang" ,r-rlang)
        ("r-tidyselect" ,r-tidyselect)
        ("r-rcpp" ,r-rcpp)
        ("r-stringi" ,r-stringi)
-       ("r-tibble" ,r-tibble)))
+       ("r-tibble" ,r-tibble)
+       ("r-vctrs" ,r-vctrs)))
     (home-page "https://github.com/hadley/tidyr")
     (synopsis "Tidy data with `spread()` and `gather()` functions")
     (description
-- 
cgit v1.2.3


From 6e377b88930226f3f74ba9fac74d80c36494d9be Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 00:36:51 +0200
Subject: import/utils: beautify-description: Recognize more fragments.

* guix/import/utils.scm (beautify-description): Handle additional common
initial sentence fragments in descriptions.
---
 guix/import/utils.scm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 252875eeab..4694b6e7ef 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -212,10 +212,19 @@ with dashes."
 (define (beautify-description description)
   "Improve the package DESCRIPTION by turning a beginning sentence fragment
 into a proper sentence and by using two spaces between sentences."
-  (let ((cleaned (if (string-prefix? "A " description)
-                     (string-append "This package provides a"
-                                    (substring description 1))
-                     description)))
+  (let ((cleaned (cond
+                  ((string-prefix? "A " description)
+                   (string-append "This package provides a"
+                                  (substring description 1)))
+                  ((string-prefix? "Provides " description)
+                   (string-append "This package provides"
+                                  (substring description
+                                             (string-length "Provides"))))
+                  ((string-prefix? "Functions " description)
+                   (string-append "This package provides functions"
+                                  (substring description
+                                             (string-length "Functions"))))
+                  (else description))))
     ;; Use double spacing between sentences
     (regexp-substitute/global #f "\\. \\b"
                               cleaned 'pre ".  " 'post)))
-- 
cgit v1.2.3


From fda8ed0eb1c0650ad4bb09503342f1e7e6208d44 Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Sat, 14 Sep 2019 13:00:26 +0200
Subject: gnu: wine-staging: Update to 4.16.

* gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.16.
* gnu/packages/wine.scm (wine-staging): Update to 4.16.
---
 gnu/packages/wine.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 3a5def50b1..d1c27a65a7 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -318,7 +318,7 @@ integrate Windows applications into your desktop.")
 (define-public wine-staging-patchset-data
   (package
     (name "wine-staging-patchset-data")
-    (version "4.15")
+    (version "4.16")
     (source
      (origin
        (method git-fetch)
@@ -328,7 +328,7 @@ integrate Windows applications into your desktop.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "13g40h2ybcl6vab4zbl1ksqfqyly5hzxssza9dv8r5pmp8x54hgr"))))
+         "0zkvwl6rxr6xcqk4a3h43cak67w6bcyqqnajz6azif07ir3z1c61"))))
     (build-system trivial-build-system)
     (native-inputs
      `(("bash" ,bash)
@@ -374,7 +374,7 @@ integrate Windows applications into your desktop.")
               (file-name (string-append name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0bfh4vd99zwj7f4108zvs80dfvmmnnsap7i6gmf21jgcly3paygq"))))
+                "17qxbddv23ibbayw1ai984m0dlq63cgplms2jhsc09incjhafywd"))))
     (inputs `(("autoconf" ,autoconf) ; for autoreconf
               ("faudio" ,faudio)
               ("ffmpeg" ,ffmpeg)
-- 
cgit v1.2.3


From cd75c487c8b1fb7447903d34a7fee2b335d4260d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
 
Date: Sat, 14 Sep 2019 19:40:19 +0200
Subject: gnu: Add emacs-elixir-mode.

* gnu/packages/emacs-xyz.scm (emacs-elixir-mode): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cbda68c350..9d4b4df458 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18234,3 +18234,28 @@ You can customize: @code{tao-theme-scale-fn}, that returns 16 2-digit numbers;
 Emacs that integrate with major modes like Org-mode.")
     (home-page "https://github.com/hlissner/emacs-doom-themes")
     (license license:expat)))
+
+(define-public emacs-elixir-mode
+  (package
+    (name "emacs-elixir-mode")
+    (version "2.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://stable.melpa.org/packages/elixir-mode-"
+             version
+             ".tar"))
+       (sha256
+        (base32
+         "091cizxg1aw8bkj58y048mj020ssapjflav633z9bl6gmi10dy4v"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-pkg-info" ,emacs-pkg-info)))
+    (home-page
+     "https://github.com/elixir-editors/emacs-elixir")
+    (synopsis "Major mode for editing Elixir files")
+    (description
+     "Elixir-Mode Provides font-locking, indentation and navigation support
+ for the Elixir programming language.")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From ec0270b1e958abd6edd5b4445b0c2e980d32443a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:38:51 +0200
Subject: gnu: r-regioner: Update to 1.16.4.

* gnu/packages/bioconductor.scm (r-regioner): Update to 1.16.4.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 8279d2a546..e35301a0fd 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1006,14 +1006,14 @@ the Human Protein Atlas project.")
 (define-public r-regioner
   (package
     (name "r-regioner")
-    (version "1.16.3")
+    (version "1.16.4")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "regioneR" version))
        (sha256
         (base32
-         "0p0jkq5w6v9zlg0csp4ag55228ikbbc86w28yzd9s0gxgx1wvdv4"))))
+         "0xzk057h6nkr3rvd412prxgnkpq625b90laj1kwb0i5q8j5ch760"))))
     (properties `((upstream-name . "regioneR")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From f8fb5b75c9d4a64f6af99a00243149cf7bea547e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:38:58 +0200
Subject: gnu: r-gtrellis: Update to 1.16.1.

* gnu/packages/bioconductor.scm (r-gtrellis): Update to 1.16.1.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index e35301a0fd..48d523b982 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -3888,14 +3888,14 @@ analysis.")
 (define-public r-gtrellis
   (package
     (name "r-gtrellis")
-    (version "1.16.0")
+    (version "1.16.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "gtrellis" version))
        (sha256
         (base32
-         "00d5swg3brnx8ryzpg7hp3mg9hx3vz4yd1lv2chlp2pj2rhsir1y"))))
+         "069hln9vflyxic24bxrlmdmz9h3jdd2qaqy898rgk5bn0gqwcjix"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-circlize" ,r-circlize)
-- 
cgit v1.2.3


From 11f973e09367d9b1b0551f2ef7efc0314460611b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:39:03 +0200
Subject: gnu: r-mixomics: Update to 6.8.4.

* gnu/packages/bioconductor.scm (r-mixomics): Update to 6.8.4.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 48d523b982..407d3ee93b 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5040,14 +5040,14 @@ self-organizing map clustering and minimal spanning trees.")
 (define-public r-mixomics
   (package
     (name "r-mixomics")
-    (version "6.8.2")
+    (version "6.8.4")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "mixOmics" version))
        (sha256
         (base32
-         "0issfrhsgc102sr33q9v6w6jrrd32plig7szd1nm0n4r3yn4y2fc"))))
+         "0lw4c9lxcm83xrvl4y120i1z710qjbdqginhrw738azpr1f82hcg"))))
     (properties `((upstream-name . "mixOmics")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 7f518ef70b4538d75953d7f7b9c246595023ae87 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:39:08 +0200
Subject: gnu: r-s4vectors: Update to 0.22.1.

* gnu/packages/bioinformatics.scm (r-s4vectors): Update to 0.22.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 61d992aacc..e8071323e1 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7351,13 +7351,13 @@ checks on R packages that are to be submitted to the Bioconductor repository.")
 (define-public r-s4vectors
   (package
     (name "r-s4vectors")
-    (version "0.22.0")
+    (version "0.22.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "S4Vectors" version))
               (sha256
                (base32
-                "1wkqmpy0d0fab9bjfc7i5wh2zng75pg9rn9c1z1lkki7fpwaw2jb"))))
+                "0cpxqb18wd3pjd7bi8lry13sm5ffqahcvvxpk5pwm5xcj30cdlm9"))))
     (properties
      `((upstream-name . "S4Vectors")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From 146f0ba5d15b8735bb4f8da537a20e2f0a7d3c8a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:39:12 +0200
Subject: gnu: r-genomicranges: Update to 1.36.1.

* gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.36.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index e8071323e1..4e4a450cfd 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7580,13 +7580,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.")
 (define-public r-genomicranges
   (package
     (name "r-genomicranges")
-    (version "1.36.0")
+    (version "1.36.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GenomicRanges" version))
               (sha256
                (base32
-                "1285fr8qjd7d0ixpv7d5imi0n6wzc4k6yia1rkmig71qd2gg556k"))))
+                "1yid84gn0052v52h84685lvk854grl1wl65psmlmxx9yyykgc0jn"))))
     (properties
      `((upstream-name . "GenomicRanges")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From cd25e296166adcc2e6a9d0e5065c0c81ecd3ae31 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:39:20 +0200
Subject: gnu: r-rtracklayer: Update to 1.44.4.

* gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.44.4.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 4e4a450cfd..44f919d19f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7883,13 +7883,13 @@ alignments.")
 (define-public r-rtracklayer
   (package
     (name "r-rtracklayer")
-    (version "1.44.3")
+    (version "1.44.4")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "rtracklayer" version))
               (sha256
                (base32
-                "091zydz1zpz519ha0jkbvzrhxjvw5r2963qz9grmvl2jd8girvcg"))))
+                "0dnifr58j2si2qbnvap2wslz3xgjv3h4l7a6v7nmmc57hq6kdbym"))))
     (build-system r-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 82e343d14a2723e115b6ef24d5ad54935009cf0f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:39:25 +0200
Subject: gnu: r-rhdf5lib: Update to 1.6.1.

* gnu/packages/bioinformatics.scm (r-rhdf5lib): Update to 1.6.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 44f919d19f..9b740c02f8 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10459,14 +10459,14 @@ block processing.")
 (define-public r-rhdf5lib
   (package
     (name "r-rhdf5lib")
-    (version "1.6.0")
+    (version "1.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "Rhdf5lib" version))
        (sha256
         (base32
-         "1lpmyxlwwcy92hyxqag321ssc5z6yw3a0ws9r058jwgzyjg7i2gm"))
+         "0niz9dh66fcwbvqpkpsdlz9d06kwi3kfh45dhk3qz9g9qqyiakr1"))
        (modules '((guix build utils)))
        (snippet
         '(begin
-- 
cgit v1.2.3


From 9eac3150690bfd9389d433f6053fc07d6d57e45b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 14 Sep 2019 23:39:39 +0200
Subject: gnu: r-delayedmatrixstats: Update to 1.6.1.

* gnu/packages/bioinformatics.scm (r-delayedmatrixstats): Update to 1.6.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 9b740c02f8..3fffb9f2ed 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10655,14 +10655,14 @@ variable and significantly correlated genes.")
 (define-public r-delayedmatrixstats
   (package
     (name "r-delayedmatrixstats")
-    (version "1.6.0")
+    (version "1.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "DelayedMatrixStats" version))
        (sha256
         (base32
-         "0632ypndblrgzfk8k98rr8c6m2r0zwzf02pzvlrhcp9bj1pvqbrz"))))
+         "1riyzfsq4bd513hidkw3cfkx3jywk3x87j89q70v459xsdfdc95b"))))
     (properties
      `((upstream-name . "DelayedMatrixStats")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From 991c44109f92aef099b3ec50501c7cd08978c793 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 09:28:24 +0200
Subject: gnu: Add yubico-pam.

* gnu/packages/authentication.scm (yubico-pam): New variable.
---
 gnu/packages/authentication.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index 68a6459828..fba157344d 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2019 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,10 +19,14 @@
 
 (define-module (gnu packages authentication)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages documentation)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages security-token)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
 
@@ -77,3 +82,39 @@ Supported technologies include the event-based @dfn{HOTP} algorithm (RFC4226)
 and the time-based @dfn{TOTP} algorithm (RFC6238).")
     (license (list license:lgpl2.1+     ; the libraries (liboath/ & libpskc/)
                    license:gpl3+))))    ; the tools (everything else)
+
+(define-public yubico-pam
+  (let ((commit "b5bd00db81e0e0e0ecced65c684080bb56ddc35b")
+        (revision "0"))
+    (package
+      (name "yubico-pam")
+      (version (git-version "2.26" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/Yubico/yubico-pam.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m"))))
+      (build-system gnu-build-system)
+      (arguments
+       ;; The pam_test fails because ykclient fails to build a Curl handle.
+       '(#:make-flags '("TESTS=util_test")))
+      (inputs
+       `(("linux-pam" ,linux-pam)
+         ("libyubikey" ,libyubikey)
+         ("ykclient" ,ykclient)
+         ("yubikey-personalization" ,yubikey-personalization)))
+      (native-inputs
+       `(("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("libtool" ,libtool)
+         ("asciidoc" ,asciidoc)
+         ("pkg-config" ,pkg-config)))
+      (home-page "https://developers.yubico.com/yubico-pam")
+      (synopsis "Yubico pluggable authentication module")
+      (description "The Yubico PAM module provides an easy way to integrate the
+YubiKey into your existing user authentication infrastructure.")
+      (license license:bsd-2))))
-- 
cgit v1.2.3


From 21fc601295ac4be8b645f1051edcaa94e4a793a5 Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Sun, 15 Sep 2019 13:08:40 +0200
Subject: gnu: emacs-zerodark-theme: Update to 4.6.

* gnu/packages/emacs-xyz.scm (emacs-zerodark-theme): Update to 4.6.
[source]: Update to new source uri.
---
 gnu/packages/emacs-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9d4b4df458..2452949d0f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -49,7 +49,7 @@
 ;;; Copyright © 2019 LaFreniere, Joseph 
 ;;; Copyright © 2019 Amar Singh 
 ;;; Copyright © 2019 Baptiste Strazzulla 
-;;; Copyright © 2019 Giacomo Leidi 
+;;; Copyright © 2019 Giacomo Leidi 
 ;;; Copyright © 2019 Jens Mølgaard 
 ;;; Copyright © 2019 Amin Bandali 
 ;;; Copyright © 2019 Jelle Licht 
@@ -17804,17 +17804,17 @@ connections using TLS encryption.")
 (define-public emacs-zerodark-theme
   (package
     (name "emacs-zerodark-theme")
-    (version "4.5")
+    (version "4.6")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://gitlab.petton.fr/nico/zerodark-theme.git")
+             (url "https://github.com/NicolasPetton/zerodark-theme")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m"))))
+         "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-flycheck" ,emacs-flycheck)
-- 
cgit v1.2.3


From e48e476f41319736297a67699b9eb26d40f6d0af Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 16:13:15 +0200
Subject: gnu: r-feather: Update to 0.3.5.

* gnu/packages/cran.scm (r-feather): Update to 0.3.5.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 84b3b1dab6..4f1e9bcdbd 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1060,14 +1060,14 @@ work well on small screens.")
 (define-public r-feather
   (package
     (name "r-feather")
-    (version "0.3.4")
+    (version "0.3.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "feather" version))
        (sha256
         (base32
-         "1zwr2lxbzks2k1jjbnnv965j8sbwxnszl1vyrnl60ar24nykd2f3"))))
+         "1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-hms" ,r-hms)
-- 
cgit v1.2.3


From d77e69e9e1fd1f9e3810e20749f9888d26090906 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 16:13:22 +0200
Subject: gnu: r-spam: Update to 2.3-0.

* gnu/packages/cran.scm (r-spam): Update to 2.3-0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 4f1e9bcdbd..5398b4dca3 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -10770,14 +10770,14 @@ This makes it a convenient and fast interface to C/C++ and Fortran code.")
 (define-public r-spam
   (package
     (name "r-spam")
-    (version "2.2-2")
+    (version "2.3-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "spam" version))
        (sha256
         (base32
-         "024dgfnjfxvsiymbzrhadinamj6qy509f4sbd1zxql8ymkyxn7vi"))))
+         "194n5mgvyms9ckjqixl3h33apii8h9kqspqg2si9k741k578qb3w"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-dotcall64" ,r-dotcall64)))
-- 
cgit v1.2.3


From 739b2d10f0701f0df9a6cae411e02376d3e23813 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:41:01 +0200
Subject: gnu: Add r-wavcluster.

* gnu/packages/bioconductor.scm (r-wavcluster): New variable.
---
 gnu/packages/bioconductor.scm | 46 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 407d3ee93b..baa1f71524 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5459,3 +5459,49 @@ with multiple R processes supported by the package @code{parallel}.")
      "This package provides methods for working with Illumina arrays using the
 @code{gdsfmt} package.")
     (license license:gpl3)))
+
+(define-public r-wavcluster
+  (package
+    (name "r-wavcluster")
+    (version "2.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "wavClusteR" version))
+       (sha256
+        (base32
+         "02i53dskirzr9nls3dsmv7dqhvy3vikkpx7247zpy2qd9r5yvhy2"))))
+    (properties `((upstream-name . "wavClusteR")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biocgenerics" ,r-biocgenerics)
+       ("r-biostrings" ,r-biostrings)
+       ("r-foreach" ,r-foreach)
+       ("r-genomicfeatures" ,r-genomicfeatures)
+       ("r-genomicranges" ,r-genomicranges)
+       ("r-ggplot2" ,r-ggplot2)
+       ("r-hmisc" ,r-hmisc)
+       ("r-iranges" ,r-iranges)
+       ("r-mclust" ,r-mclust)
+       ("r-rsamtools" ,r-rsamtools)
+       ("r-rtracklayer" ,r-rtracklayer)
+       ("r-s4vectors" ,r-s4vectors)
+       ("r-seqinr" ,r-seqinr)
+       ("r-stringr" ,r-stringr)
+       ("r-wmtsa" ,r-wmtsa)))
+    (home-page "https://bioconductor.org/packages/wavClusteR/")
+    (synopsis "Identification of RNA-protein interaction sites in PAR-CLIP data")
+    (description
+     "This package provides an integrated pipeline for the analysis of
+PAR-CLIP data.  PAR-CLIP-induced transitions are first discriminated from
+sequencing errors, SNPs and additional non-experimental sources by a non-
+parametric mixture model.  The protein binding sites (clusters) are then
+resolved at high resolution and cluster statistics are estimated using a
+rigorous Bayesian framework.  Post-processing of the results, data export for
+UCSC genome browser visualization and motif search analysis are provided.  In
+addition, the package allows to integrate RNA-Seq data to estimate the False
+Discovery Rate of cluster detection.  Key functions support parallel multicore
+computing.  While wavClusteR was designed for PAR-CLIP data analysis, it can
+be applied to the analysis of other NGS data obtained from experimental
+procedures that induce nucleotide substitutions (e.g. BisSeq).")
+    (license license:gpl2)))
-- 
cgit v1.2.3


From 853211a51b63315b096c98371618eec243feae38 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:42:41 +0200
Subject: gnu: Add r-timeseriesexperiment.

* gnu/packages/bioconductor.scm (r-timeseriesexperiment): New variable.
---
 gnu/packages/bioconductor.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index baa1f71524..b458c62dbc 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5505,3 +5505,42 @@ computing.  While wavClusteR was designed for PAR-CLIP data analysis, it can
 be applied to the analysis of other NGS data obtained from experimental
 procedures that induce nucleotide substitutions (e.g. BisSeq).")
     (license license:gpl2)))
+
+(define-public r-timeseriesexperiment
+  (package
+    (name "r-timeseriesexperiment")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "TimeSeriesExperiment" version))
+       (sha256
+        (base32
+         "1j11g7a2p0yk38fx6wd6152l1xynghj01pfxihalw601jwf1bl0y"))))
+    (properties
+     `((upstream-name . "TimeSeriesExperiment")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-deseq2" ,r-deseq2)
+       ("r-dplyr" ,r-dplyr)
+       ("r-dynamictreecut" ,r-dynamictreecut)
+       ("r-edger" ,r-edger)
+       ("r-ggplot2" ,r-ggplot2)
+       ("r-hmisc" ,r-hmisc)
+       ("r-limma" ,r-limma)
+       ("r-magrittr" ,r-magrittr)
+       ("r-proxy" ,r-proxy)
+       ("r-s4vectors" ,r-s4vectors)
+       ("r-summarizedexperiment" ,r-summarizedexperiment)
+       ("r-tibble" ,r-tibble)
+       ("r-tidyr" ,r-tidyr)
+       ("r-vegan" ,r-vegan)
+       ("r-viridis" ,r-viridis)))
+    (home-page "https://github.com/nlhuong/TimeSeriesExperiment/")
+    (synopsis "Analysis for short time-series data")
+    (description
+     "This package is a visualization and analysis toolbox for short time
+course data which includes dimensionality reduction, clustering, two-sample
+differential expression testing and gene ranking techniques.  The package also
+provides methods for retrieving enriched pathways.")
+    (license license:lgpl3+)))
-- 
cgit v1.2.3


From 53b1e10f239bbb257ac7dea9cdb03c744f03ef4c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:53:01 +0200
Subject: gnu: Add r-affydata.

* gnu/packages/bioconductor.scm (r-affydata): New variable.
---
 gnu/packages/bioconductor.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index b458c62dbc..6296902671 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -935,6 +935,29 @@ jointly normalized data that are available here.  The data are presented in
 the form of an @code{exprSet} object.")
     (license license:artistic2.0)))
 
+(define-public r-affydata
+  (package
+    (name "r-affydata")
+    (version "1.32.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "affydata" version 'experiment))
+       (sha256
+        (base32
+         "1l9qhmjqgbrdl9cmd74rlnvmvr6mslbmckb83n0211whp2i0b7h5"))))
+    (properties `((upstream-name . "affydata")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-affy" ,r-affy)))
+    (home-page "https://bioconductor.org/packages/affydata/")
+    (synopsis "Affymetrix data for demonstration purposes")
+    (description
+     "This package provides example datasets that represent 'real world
+examples' of Affymetrix data, unlike the artificial examples included in the
+package @code{affy}.")
+    (license license:gpl2+)))
+
 
 ;;; Packages
 
-- 
cgit v1.2.3


From 5cf940de21a454c0556c019760835f2bb9dcbe0c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:53:14 +0200
Subject: gnu: Add r-affycomp.

* gnu/packages/bioconductor.scm (r-affycomp): New variable.
---
 gnu/packages/bioconductor.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 6296902671..a87bcebdef 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -981,6 +981,27 @@ package @code{affy}.")
 packages.")
     (license license:artistic2.0)))
 
+(define-public r-affycomp
+  (package
+    (name "r-affycomp")
+    (version "1.60.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "affycomp" version))
+       (sha256
+        (base32
+         "1nijqljg5r3qj1y6an0i58sby76hqacj3a3nvainxic4n5wlzh0n"))))
+    (properties `((upstream-name . "affycomp")))
+    (build-system r-build-system)
+    (propagated-inputs `(("r-biobase" ,r-biobase)))
+    (home-page "https://bioconductor.org/packages/affycomp/")
+    (synopsis "Graphics toolbox for assessment of Affymetrix expression measures")
+    (description
+     "The package contains functions that can be used to compare expression
+measures for Affymetrix Oligonucleotide Arrays.")
+    (license license:gpl2+)))
+
 (define-public r-annotate
   (package
     (name "r-annotate")
-- 
cgit v1.2.3


From 5094aa94724fd2111dbd7520ab2f21a4218523ae Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:53:21 +0200
Subject: gnu: Add r-affycompatible.

* gnu/packages/bioconductor.scm (r-affycompatible): New variable.
---
 gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index a87bcebdef..83f8343524 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1002,6 +1002,34 @@ packages.")
 measures for Affymetrix Oligonucleotide Arrays.")
     (license license:gpl2+)))
 
+(define-public r-affycompatible
+  (package
+    (name "r-affycompatible")
+    (version "1.44.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "AffyCompatible" version))
+       (sha256
+        (base32
+         "1zi96qa6vkgwvvy5cn6c3p1kbfsaz74zsw2kjxarz5qs744f0xvs"))))
+    (properties
+     `((upstream-name . "AffyCompatible")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biostrings" ,r-biostrings)
+       ("r-rcurl" ,r-rcurl)
+       ("r-xml" ,r-xml)))
+    (home-page "https://bioconductor.org/packages/AffyCompatible/")
+    (synopsis "Work with Affymetrix GeneChip files")
+    (description
+     "This package provides an interface to Affymetrix chip annotation and
+sample attribute files.  The package allows an easy way for users to download
+and manage local data bases of Affynmetrix NetAffx annotation files.  It also
+provides access to @dfn{GeneChip Operating System} (GCOS) and @dfn{GeneChip
+Command Console} (AGCC)-compatible sample annotation files.")
+    (license license:artistic2.0)))
+
 (define-public r-annotate
   (package
     (name "r-annotate")
-- 
cgit v1.2.3


From 4ca2d6c1a6e64d7f64410d752140cec3063b9eca Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:53:27 +0200
Subject: gnu: Add r-affycontam.

* gnu/packages/bioconductor.scm (r-affycontam): New variable.
---
 gnu/packages/bioconductor.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 83f8343524..37a3b776e9 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1030,6 +1030,31 @@ provides access to @dfn{GeneChip Operating System} (GCOS) and @dfn{GeneChip
 Command Console} (AGCC)-compatible sample annotation files.")
     (license license:artistic2.0)))
 
+(define-public r-affycontam
+  (package
+    (name "r-affycontam")
+    (version "1.42.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "affyContam" version))
+       (sha256
+        (base32
+         "0nzk1cm26rhmym753wyhn35hqnz5lvavi3i5qfgdvhxgjy3m1jgp"))))
+    (properties `((upstream-name . "affyContam")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-affy" ,r-affy)
+       ("r-affydata" ,r-affydata)
+       ("r-biobase" ,r-biobase)))
+    (home-page "https://bioconductor.org/packages/affyContam/")
+    (synopsis "Structured corruption of Affymetrix CEL file data")
+    (description
+     "Microarray quality assessment is a major concern of microarray analysts.
+This package provides some simple approaches to in silico creation of quality
+problems in CEL-level data to help evaluate performance of quality metrics.")
+    (license license:artistic2.0)))
+
 (define-public r-annotate
   (package
     (name "r-annotate")
-- 
cgit v1.2.3


From 83b420912289b0f2b2caba9fc8d0eb22256722ad Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:57:26 +0200
Subject: gnu: Add r-pfam-db.

* gnu/packages/bioconductor.scm (r-pfam-db): New variable.
---
 gnu/packages/bioconductor.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 37a3b776e9..3c01e2d0d4 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -810,6 +810,28 @@ annotations.")
 Disease Ontology.")
     (license license:artistic2.0)))
 
+(define-public r-pfam-db
+  (package
+    (name "r-pfam-db")
+    (version "3.8.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "PFAM.db" version 'annotation))
+       (sha256
+        (base32
+         "0rn1arzzcniy3yyc4yc44vn40g0cqss37dhwnvsgxpfayqq1k59s"))))
+    (properties `((upstream-name . "PFAM.db")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-annotationdbi" ,r-annotationdbi)))
+    (home-page "https://bioconductor.org/packages/PFAM.db")
+    (synopsis "Set of protein ID mappings for PFAM")
+    (description
+     "This package provides a set of protein ID mappings for PFAM, assembled
+using data from public repositories.")
+    (license license:artistic2.0)))
+
 
 ;;; Experiment data
 
-- 
cgit v1.2.3


From 15184fb386d9b71b122e40f665d2f42bf4a13ddc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:57:38 +0200
Subject: gnu: Add r-reportingtools.

* gnu/packages/bioconductor.scm (r-reportingtools): New variable.
---
 gnu/packages/bioconductor.scm | 48 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 3c01e2d0d4..d382ce1dfc 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1151,6 +1151,54 @@ customizable permutation tests to assess the association between genomic
 region sets and other genomic features.")
     (license license:artistic2.0)))
 
+(define-public r-reportingtools
+  (package
+    (name "r-reportingtools")
+    (version "2.24.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "ReportingTools" version))
+       (sha256
+        (base32
+         "16ska7mlacka0xi8x2icy8v42vaxccb3a1x73szmfvcrwr592qsc"))))
+    (properties
+     `((upstream-name . "ReportingTools")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-annotate" ,r-annotate)
+       ("r-annotationdbi" ,r-annotationdbi)
+       ("r-biobase" ,r-biobase)
+       ("r-biocgenerics" ,r-biocgenerics)
+       ("r-category" ,r-category)
+       ("r-deseq2" ,r-deseq2)
+       ("r-edger" ,r-edger)
+       ("r-ggbio" ,r-ggbio)
+       ("r-ggplot2" ,r-ggplot2)
+       ("r-gostats" ,r-gostats)
+       ("r-gseabase" ,r-gseabase)
+       ("r-hwriter" ,r-hwriter)
+       ("r-iranges" ,r-iranges)
+       ("r-knitr" ,r-knitr)
+       ("r-lattice" ,r-lattice)
+       ("r-limma" ,r-limma)
+       ("r-pfam-db" ,r-pfam-db)
+       ("r-r-utils" ,r-r-utils)
+       ("r-xml" ,r-xml)))
+    (home-page "https://bioconductor.org/packages/ReportingTools/")
+    (synopsis "Tools for making reports in various formats")
+    (description
+     "The ReportingTools package enables users to easily display reports of
+analysis results generated from sources such as microarray and sequencing
+data.  The package allows users to create HTML pages that may be viewed on a
+web browser, or in other formats.  Users can generate tables with sortable and
+filterable columns, make and display plots, and link table entries to other
+data sources such as NCBI or larger plots within the HTML page.  Using the
+package, users can also produce a table of contents page to link various
+reports together for a particular project that can be viewed in a web
+browser.")
+    (license license:artistic2.0)))
+
 (define-public r-geneplotter
   (package
     (name "r-geneplotter")
-- 
cgit v1.2.3


From 01c7ba9982dc83d584dade304ccd921e655d0a46 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:58:06 +0200
Subject: gnu: Add r-oligoclasses.

* gnu/packages/bioconductor.scm (r-oligoclasses): New variable.
---
 gnu/packages/bioconductor.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index d382ce1dfc..be9f7579b6 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1224,6 +1224,41 @@ browser.")
      "This package provides functions for plotting genomic data.")
     (license license:artistic2.0)))
 
+(define-public r-oligoclasses
+  (package
+    (name "r-oligoclasses")
+    (version "1.46.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "oligoClasses" version))
+       (sha256
+        (base32
+         "0z86zrmn80kcy6fgb9i9zs82vhim73n8hlkqy7y8sbb2jwksdr72"))))
+    (properties `((upstream-name . "oligoClasses")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-affyio" ,r-affyio)
+       ("r-biobase" ,r-biobase)
+       ("r-biocgenerics" ,r-biocgenerics)
+       ("r-biocmanager" ,r-biocmanager)
+       ("r-biostrings" ,r-biostrings)
+       ("r-dbi" ,r-dbi)
+       ("r-ff" ,r-ff)
+       ("r-foreach" ,r-foreach)
+       ("r-genomicranges" ,r-genomicranges)
+       ("r-iranges" ,r-iranges)
+       ("r-rsqlite" ,r-rsqlite)
+       ("r-s4vectors" ,r-s4vectors)
+       ("r-summarizedexperiment" ,r-summarizedexperiment)))
+    (home-page "https://bioconductor.org/packages/oligoClasses/")
+    (synopsis "Classes for high-throughput arrays")
+    (description
+     "This package contains class definitions, validity checks, and
+initialization methods for classes used by the @code{oligo} and @code{crlmm}
+packages.")
+    (license license:gpl2+)))
+
 (define-public r-qvalue
   (package
     (name "r-qvalue")
-- 
cgit v1.2.3


From 12105c6c3a900ba35533c15c71d59acf151b5627 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 20:57:32 +0200
Subject: gnu: Add r-affycoretools.

* gnu/packages/bioconductor.scm (r-affycoretools): New variable.
---
 gnu/packages/bioconductor.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index be9f7579b6..df50fbc547 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1077,6 +1077,45 @@ This package provides some simple approaches to in silico creation of quality
 problems in CEL-level data to help evaluate performance of quality metrics.")
     (license license:artistic2.0)))
 
+(define-public r-affycoretools
+  (package
+    (name "r-affycoretools")
+    (version "1.56.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "affycoretools" version))
+       (sha256
+        (base32
+         "17dxpzhwwdwnxkdpmyjwdnacg41hw60mlc71w4nzlvs28sfsy09s"))))
+    (properties `((upstream-name . "affycoretools")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-affy" ,r-affy)
+       ("r-annotationdbi" ,r-annotationdbi)
+       ("r-biobase" ,r-biobase)
+       ("r-biocgenerics" ,r-biocgenerics)
+       ("r-dbi" ,r-dbi)
+       ("r-edger" ,r-edger)
+       ("r-gcrma" ,r-gcrma)
+       ("r-ggplot2" ,r-ggplot2)
+       ("r-gostats" ,r-gostats)
+       ("r-gplots" ,r-gplots)
+       ("r-hwriter" ,r-hwriter)
+       ("r-lattice" ,r-lattice)
+       ("r-limma" ,r-limma)
+       ("r-oligoclasses" ,r-oligoclasses)
+       ("r-reportingtools" ,r-reportingtools)
+       ("r-rsqlite" ,r-rsqlite)
+       ("r-s4vectors" ,r-s4vectors)
+       ("r-xtable" ,r-xtable)))
+    (home-page "https://bioconductor.org/packages/affycoretools/")
+    (synopsis "Functions for analyses with Affymetrix GeneChips")
+    (description
+     "This package provides various wrapper functions that have been written
+to streamline the more common analyses that a Biostatistician might see.")
+    (license license:artistic2.0)))
+
 (define-public r-annotate
   (package
     (name "r-annotate")
-- 
cgit v1.2.3


From e5dfcd8e262473a12ae00f5fa1ebf2bd8a90ea89 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 21:03:54 +0200
Subject: gnu: Add r-seqbias.

* gnu/packages/bioconductor.scm (r-seqbias): New variable.
---
 gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index df50fbc547..ce43bfe8b9 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5701,6 +5701,34 @@ with multiple R processes supported by the package @code{parallel}.")
 @code{gdsfmt} package.")
     (license license:gpl3)))
 
+(define-public r-seqbias
+  (package
+    (name "r-seqbias")
+    (version "1.32.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "seqbias" version))
+       (sha256
+        (base32
+         "1pk97jsq0rxijsdm5wnmlw79mhy19skdq1h3mmfbdjh560md47lw"))))
+    (properties `((upstream-name . "seqbias")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biostrings" ,r-biostrings)
+       ("r-genomicranges" ,r-genomicranges)
+       ("r-rhtslib" ,r-rhtslib)))
+    (inputs
+     `(("zlib" ,zlib))) ; This comes from rhtslib.
+    (home-page "https://bioconductor.org/packages/seqbias/")
+    (synopsis "Estimation of per-position bias in high-throughput sequencing data")
+    (description
+     "This package implements a model of per-position sequencing bias in
+high-throughput sequencing data using a simple Bayesian network, the structure
+and parameters of which are trained on a set of aligned reads and a reference
+genome sequence.")
+    (license license:lgpl3)))
+
 (define-public r-wavcluster
   (package
     (name "r-wavcluster")
-- 
cgit v1.2.3


From bb0024dc697c2a4c6f91b59b893e913b02d38e94 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 21:04:00 +0200
Subject: gnu: Add r-reqon.

* gnu/packages/bioconductor.scm (r-reqon): New variable.
---
 gnu/packages/bioconductor.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index ce43bfe8b9..9fce21dc00 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5729,6 +5729,31 @@ and parameters of which are trained on a set of aligned reads and a reference
 genome sequence.")
     (license license:lgpl3)))
 
+(define-public r-reqon
+  (package
+    (name "r-reqon")
+    (version "1.30.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "ReQON" version))
+       (sha256
+        (base32
+         "04bljr8vgb9z9800d9v8w7a4rvjkwq48zd8n5divq30zj9k2na7a"))))
+    (properties `((upstream-name . "ReQON")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-rjava" ,r-rjava)
+       ("r-rsamtools" ,r-rsamtools)
+       ("r-seqbias" ,r-seqbias)))
+    (home-page "https://bioconductor.org/packages/ReQON/")
+    (synopsis "Recalibrating quality of nucleotides")
+    (description
+     "This package provides an implementation of an algorithm for
+recalibrating the base quality scores for aligned sequencing data in BAM
+format.")
+    (license license:gpl2)))
+
 (define-public r-wavcluster
   (package
     (name "r-wavcluster")
-- 
cgit v1.2.3


From 4112ff7e74ee1d1f13c3a7f4aaa6dc9d0ca8c3eb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 21:19:53 +0200
Subject: gnu: Add js-requirejs.

* gnu/packages/javascript.scm (js-requirejs): New variable.
---
 gnu/packages/javascript.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 2390c23c4b..2993eb66f6 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Arun Isaac 
-;;; Copyright © 2017 Ricardo Wurmus 
+;;; Copyright © 2017, 2019 Ricardo Wurmus 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2018 Nicolas Goaziou 
@@ -307,6 +307,28 @@ Javascript library, adding sorting, paging and filtering abilities to plain
 HTML tables with minimal effort.")
     (license license:expat)))
 
+(define-public js-requirejs
+  (package
+    (name "js-requirejs")
+    (version "2.3.6")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/requirejs/requirejs.git")
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0cvd5y2mb3h6yil3niqn3gjqrzixdsxcz4rvc2f0hg4kzp5y0w86"))))
+    (build-system minify-build-system)
+    (arguments `(#:javascript-files '("require.js")))
+    (home-page "https://github.com/requirejs/requirejs/")
+    (synopsis "File and module loader for JavaScript")
+    (description "RequireJS loads plain JavaScript files as well as more
+defined modules.  It is optimized for in-browser use, including in a Web
+Worker, but it can be used in other JavaScript environments.")
+    (license license:expat)))
+
 (define-public js-selectize
   (package
     (name "js-selectize")
-- 
cgit v1.2.3


From 41b8b05c9e515e43753ddbed24b70e27b5c3be31 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:33:50 +0200
Subject: gnu: Add r-shinytree.

* gnu/packages/cran.scm (r-shinytree): New variable.
---
 gnu/packages/cran.scm | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5398b4dca3..d33eb20a37 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -797,6 +797,84 @@ extensive prebuilt widgets make it possible to build beautiful,
 responsive, and powerful applications with minimal effort.")
     (license license:artistic2.0)))
 
+;; This package includes minified JavaScript files.  When upgrading please
+;; check that there are no new minified JavaScript files.
+(define-public r-shinytree
+  (package
+    (name "r-shinytree")
+    (version "0.2.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "shinyTree" version))
+       (sha256
+        (base32
+         "0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Delete minified JavaScript
+           (for-each delete-file
+                     '("inst/www/jsTree-3.3.7/libs/require.js"
+                       "inst/www/jsTree-3.3.7/libs/jquery.js"
+                       "inst/www/jsTree-3.3.7/jstree.min.js"))
+           #t))))
+    (properties `((upstream-name . "shinyTree")))
+    (build-system r-build-system)
+    (arguments
+     `(#:modules ((guix build utils)
+                  (guix build r-build-system)
+                  (srfi srfi-1)
+                  (ice-9 popen))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'replace-minified-javascript
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "inst/www/jsTree-3.3.7/"
+               (symlink (string-append (assoc-ref inputs "js-requirejs")
+                                       "/share/javascript/require.min.js")
+                        "libs/require.js")
+               (call-with-values
+                   (lambda ()
+                     (unzip2
+                      `((,(assoc-ref inputs "js-jquery")
+                         "libs/jquery.js")
+                        ("jstree.js"
+                         "jstree.min.js"))))
+                 (lambda (sources targets)
+                   (for-each (lambda (source target)
+                               (format #t "Processing ~a --> ~a~%"
+                                       source target)
+                               (let ((minified (open-pipe* OPEN_READ "uglify-js" source)))
+                                 (call-with-output-file target
+                                   (lambda (port)
+                                     (dump-port minified port)))))
+                             sources targets))))
+             #t)))))
+    (propagated-inputs
+     `(("r-htmlwidgets" ,r-htmlwidgets)
+       ("r-jsonlite" ,r-jsonlite)
+       ("r-promises" ,r-promises)
+       ("r-shiny" ,r-shiny)
+       ("r-stringr" ,r-stringr)))
+    (inputs
+     `(("js-requirejs" ,js-requirejs)))
+    (native-inputs
+     `(("uglify-js" ,uglify-js)
+       ("js-jquery"
+        ,(origin
+           (method url-fetch)
+           (uri "https://code.jquery.com/jquery-3.3.1.js")
+           (sha256
+            (base32
+             "1b8zxrp6xwzpw25apn8j4qws0f6sr7qr7h2va5h1mjyfqvn29anq"))))))
+    (home-page "https://cran.r-project.org/web/packages/shinyTree/")
+    (synopsis "jsTree bindings for Shiny")
+    (description
+     "This package exposes R bindings to jsTree, a JavaScript library that
+supports interactive trees, to enable rich, editable trees in Shiny.")
+    (license license:expat)))
+
 (define-public r-shinydashboard
   (package
     (name "r-shinydashboard")
-- 
cgit v1.2.3


From fc3719cc0f91644b56e7572a81669398b5fd1c8d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:40:25 +0200
Subject: gnu: Add r-shinythemes.

* gnu/packages/cran.scm (r-shinythemes): New variable.
---
 gnu/packages/cran.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d33eb20a37..cb0be4aedd 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -946,6 +946,31 @@ this gives the user direct access to the file system without the need to
 well as file saving is available.")
     (license license:gpl2+)))
 
+(define-public r-shinythemes
+  (package
+    (name "r-shinythemes")
+    (version "1.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "shinythemes" version))
+       (sha256
+        (base32
+         "12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"))))
+    (properties `((upstream-name . "shinythemes")))
+    (build-system r-build-system)
+    (propagated-inputs `(("r-shiny" ,r-shiny)))
+    (home-page "http://rstudio.github.io/shinythemes/")
+    (synopsis "Themes for Shiny")
+    (description
+     "This package provides themes for use with Shiny.  It includes several
+Bootstrap themes, which are packaged for use with Shiny applications.")
+    ;; The package is released under version 3 of the GPL, but it includes
+    ;; source files that are covered by the Expat license.  It also includes
+    ;; fonts under SIL or the ASL.
+    (license (list license:gpl3 license:expat
+                   license:silofl1.1 license:asl2.0))))
+
 ;; The package sources include minified variants of d3.js and non-minified
 ;; source code of d3-jetpack.
 (define-public r-d3r
-- 
cgit v1.2.3


From df8576e5c93e765fc4f75c47698342b1f7aa9642 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:41:03 +0200
Subject: gnu: Add r-variantfiltering.

* gnu/packages/bioconductor.scm (r-variantfiltering): New variable.
---
 gnu/packages/bioconductor.scm | 47 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9fce21dc00..4f2d97025a 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5838,3 +5838,50 @@ course data which includes dimensionality reduction, clustering, two-sample
 differential expression testing and gene ranking techniques.  The package also
 provides methods for retrieving enriched pathways.")
     (license license:lgpl3+)))
+
+(define-public r-variantfiltering
+  (package
+    (name "r-variantfiltering")
+    (version "1.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "VariantFiltering" version))
+       (sha256
+        (base32
+         "0vpghxacqcbaxx2scb5gfhcmfpw1lkls7h6qnbwbnmjwy01q2p17"))))
+    (properties
+     `((upstream-name . "VariantFiltering")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-annotationdbi" ,r-annotationdbi)
+       ("r-biobase" ,r-biobase)
+       ("r-biocgenerics" ,r-biocgenerics)
+       ("r-biocparallel" ,r-biocparallel)
+       ("r-biostrings" ,r-biostrings)
+       ("r-bsgenome" ,r-bsgenome)
+       ("r-dt" ,r-dt)
+       ("r-genomeinfodb" ,r-genomeinfodb)
+       ("r-genomicfeatures" ,r-genomicfeatures)
+       ("r-genomicranges" ,r-genomicranges)
+       ("r-genomicscores" ,r-genomicscores)
+       ("r-graph" ,r-graph)
+       ("r-gviz" ,r-gviz)
+       ("r-iranges" ,r-iranges)
+       ("r-rbgl" ,r-rbgl)
+       ("r-rsamtools" ,r-rsamtools)
+       ("r-s4vectors" ,r-s4vectors)
+       ("r-shiny" ,r-shiny)
+       ("r-shinyjs" ,r-shinyjs)
+       ("r-shinythemes" ,r-shinythemes)
+       ("r-shinytree" ,r-shinytree)
+       ("r-summarizedexperiment" ,r-summarizedexperiment)
+       ("r-variantannotation" ,r-variantannotation)
+       ("r-xvector" ,r-xvector)))
+    (home-page "https://github.com/rcastelo/VariantFiltering")
+    (synopsis "Filtering of coding and non-coding genetic variants")
+    (description
+     "Filter genetic variants using different criteria such as inheritance
+model, amino acid change consequence, minor allele frequencies across human
+populations, splice site strength, conservation, etc.")
+    (license license:artistic2.0)))
-- 
cgit v1.2.3


From d6a5d9b24f30d35b41f76053be2b826b8d63815d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:50:25 +0200
Subject: gnu: Add r-affxparser.

* gnu/packages/bioconductor.scm (r-affxparser): New variable.
---
 gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 4f2d97025a..b60c5d8ef2 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1116,6 +1116,34 @@ problems in CEL-level data to help evaluate performance of quality metrics.")
 to streamline the more common analyses that a Biostatistician might see.")
     (license license:artistic2.0)))
 
+(define-public r-affxparser
+  (package
+    (name "r-affxparser")
+    (version "1.56.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "affxparser" version))
+       (sha256
+        (base32
+         "1jv7k9pn4c7szi3ma2f2xsd58pkrkvjpk5wra73r6kc607qgrv33"))))
+    (properties `((upstream-name . "affxparser")))
+    (build-system r-build-system)
+    (home-page "https://github.com/HenrikBengtsson/affxparser")
+    (synopsis "Affymetrix File Parsing SDK")
+    (description
+     "This is a package for parsing Affymetrix files (CDF, CEL, CHP, BPMAP,
+BAR).  It provides methods for fast and memory efficient parsing of Affymetrix
+files using the Affymetrix' Fusion SDK.  Both ASCII- and binary-based files
+are supported.  Currently, there are methods for reading @dfn{chip definition
+file} (CDF) and a @dfn{cell intensity file} (CEL).  These files can be read
+either in full or in part.  For example, probe signals from a few probesets
+can be extracted very quickly from a set of CEL files into a convenient list
+structure.")
+    ;; The Fusion SDK contains files under GPLv2 and LGPLv2.1.  The R code is
+    ;; under LGPLv2+.
+    (license (list license:lgpl2.0+ license:lgpl2.1 license:gpl2))))
+
 (define-public r-annotate
   (package
     (name "r-annotate")
-- 
cgit v1.2.3


From 4c63eeb8a45762b9135d8ed192ce61a4469d1348 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:50:31 +0200
Subject: gnu: Add r-oligo.

* gnu/packages/bioconductor.scm (r-oligo): New variable.
---
 gnu/packages/bioconductor.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index b60c5d8ef2..9cb4ca36e8 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1326,6 +1326,40 @@ initialization methods for classes used by the @code{oligo} and @code{crlmm}
 packages.")
     (license license:gpl2+)))
 
+(define-public r-oligo
+  (package
+    (name "r-oligo")
+    (version "1.48.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "oligo" version))
+       (sha256
+        (base32
+         "0qkyz65zvry0syibjkvkshwijccna18jy0hlib0n5x4c8x9zs5df"))))
+    (properties `((upstream-name . "oligo")))
+    (build-system r-build-system)
+    (inputs `(("zlib" ,zlib)))
+    (propagated-inputs
+     `(("r-affxparser" ,r-affxparser)
+       ("r-affyio" ,r-affyio)
+       ("r-biobase" ,r-biobase)
+       ("r-biocgenerics" ,r-biocgenerics)
+       ("r-biostrings" ,r-biostrings)
+       ("r-dbi" ,r-dbi)
+       ("r-ff" ,r-ff)
+       ("r-oligoclasses" ,r-oligoclasses)
+       ("r-preprocesscore" ,r-preprocesscore)
+       ("r-rsqlite" ,r-rsqlite)
+       ("r-zlibbioc" ,r-zlibbioc)))
+    (home-page "https://bioconductor.org/packages/oligo/")
+    (synopsis "Preprocessing tools for oligonucleotide arrays")
+    (description
+     "This package provides a package to analyze oligonucleotide
+arrays (expression/SNP/tiling/exon) at probe-level.  It currently supports
+Affymetrix (CEL files) and NimbleGen arrays (XYS files).")
+    (license license:lgpl2.0+)))
+
 (define-public r-qvalue
   (package
     (name "r-qvalue")
-- 
cgit v1.2.3


From f5349b4d5a4a9c93da9eed79e32461df6606cbde Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:51:52 +0200
Subject: gnu: Add r-genomegraphs.

* gnu/packages/bioconductor.scm (r-genomegraphs): New variable.
---
 gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9cb4ca36e8..807ddedc75 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5947,3 +5947,31 @@ provides methods for retrieving enriched pathways.")
 model, amino acid change consequence, minor allele frequencies across human
 populations, splice site strength, conservation, etc.")
     (license license:artistic2.0)))
+
+(define-public r-genomegraphs
+  (package
+    (name "r-genomegraphs")
+    (version "1.44.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "GenomeGraphs" version))
+       (sha256
+        (base32
+         "026skcn2cqchlzaqsnk11gb8d8aq1rz7lrnx4mmsba234mh4j7kd"))))
+    (properties `((upstream-name . "GenomeGraphs")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biomart" ,r-biomart)))
+    (home-page "https://bioconductor.org/packages/GenomeGraphs/")
+    (synopsis "Plotting genomic information from Ensembl")
+    (description
+     "Genomic data analyses requires integrated visualization of known genomic
+information and new experimental data.  GenomeGraphs uses the biomaRt package
+to perform live annotation queries to Ensembl and translates this to e.g.
+gene/transcript structures in viewports of the grid graphics package.  This
+results in genomic information plotted together with your data.  Another
+strength of GenomeGraphs is to plot different data types such as array CGH,
+gene expression, sequencing and other data, together in one plot using the
+same genome coordinate system.")
+    (license license:artistic2.0)))
-- 
cgit v1.2.3


From 2a360cf6acde00f96dcca8bf6dcc2f4fa1563da1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:54:21 +0200
Subject: gnu: Add r-wavetiling.

* gnu/packages/bioconductor.scm (r-wavetiling): New variable.
---
 gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 807ddedc75..ec3451b704 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5975,3 +5975,34 @@ strength of GenomeGraphs is to plot different data types such as array CGH,
 gene expression, sequencing and other data, together in one plot using the
 same genome coordinate system.")
     (license license:artistic2.0)))
+
+(define-public r-wavetiling
+  (package
+    (name "r-wavetiling")
+    (version "1.26.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "waveTiling" version))
+       (sha256
+        (base32
+         "0l0saa0myabpq2rl9dq70zff8jpxr3mkanxlj65hc41f0m5xllir"))))
+    (properties `((upstream-name . "waveTiling")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-affy" ,r-affy)
+       ("r-biobase" ,r-biobase)
+       ("r-biostrings" ,r-biostrings)
+       ("r-genomegraphs" ,r-genomegraphs)
+       ("r-genomicranges" ,r-genomicranges)
+       ("r-iranges" ,r-iranges)
+       ("r-oligo" ,r-oligo)
+       ("r-oligoclasses" ,r-oligoclasses)
+       ("r-preprocesscore" ,r-preprocesscore)
+       ("r-waveslim" ,r-waveslim)))
+    (home-page "https://r-forge.r-project.org/projects/wavetiling/")
+    (synopsis "Wavelet-based models for tiling array transcriptome analysis")
+    (description
+     "This package is designed to conduct transcriptome analysis for tiling
+arrays based on fast wavelet-based functional models.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From d80a15696bf07a35b523c062a592a4b210bd3fdf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 15 Sep 2019 22:57:47 +0200
Subject: gnu: Add r-variancepartition.

* gnu/packages/bioconductor.scm (r-variancepartition): New variable.
---
 gnu/packages/bioconductor.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index ec3451b704..7ca6788dd8 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -6006,3 +6006,44 @@ same genome coordinate system.")
      "This package is designed to conduct transcriptome analysis for tiling
 arrays based on fast wavelet-based functional models.")
     (license license:gpl2+)))
+
+(define-public r-variancepartition
+  (package
+    (name "r-variancepartition")
+    (version "1.14.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (bioconductor-uri "variancePartition" version))
+       (sha256
+        (base32
+         "1ycapwb2mq57xibrzzjz9zwxqz4nwz9f3n5gskhlr5vcs7irkjd6"))))
+    (properties
+     `((upstream-name . "variancePartition")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-biobase" ,r-biobase)
+       ("r-colorramps" ,r-colorramps)
+       ("r-doparallel" ,r-doparallel)
+       ("r-foreach" ,r-foreach)
+       ("r-ggplot2" ,r-ggplot2)
+       ("r-gplots" ,r-gplots)
+       ("r-iterators" ,r-iterators)
+       ("r-limma" ,r-limma)
+       ("r-lme4" ,r-lme4)
+       ("r-lmertest" ,r-lmertest)
+       ("r-mass" ,r-mass)
+       ("r-pbkrtest" ,r-pbkrtest)
+       ("r-progress" ,r-progress)
+       ("r-reshape2" ,r-reshape2)
+       ("r-scales" ,r-scales)))
+    (home-page "https://bioconductor.org/packages/variancePartition/")
+    (synopsis "Analyze variation in gene expression experiments")
+    (description
+     "This is a package providing tools to quantify and interpret multiple
+sources of biological and technical variation in gene expression experiments.
+It uses a linear mixed model to quantify variation in gene expression
+attributable to individual, tissue, time point, or technical variables.  The
+package includes dream differential expression analysis for repeated
+measures.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From eca0f3d0708def490ae779e2e47151c9d0b5c82e Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 16 Sep 2019 08:20:35 +0200
Subject: gnu: mgba: Update to 0.7.3.

* gnu/packages/emulators.scm (mgba): Update to 0.7.3.
---
 gnu/packages/emulators.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index d3feda3f17..f59c0fe92b 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -405,7 +405,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
 (define-public mgba
   (package
     (name "mgba")
-    (version "0.7.2")
+    (version "0.7.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -414,7 +414,7 @@ Super Game Boy, BS-X Satellaview, and Sufami Turbo.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0g0xa1mzvan0sl1p5c784j2g5mcw9kd2b7wiahy06gy0c1nmbcnp"))
+                "1wrmwh50rv8bd328r8cisrihq6h90kx2bfb0vmjfbsd3l1jvgrgm"))
               (modules '((guix build utils)))
               (snippet
                ;; Make sure we don't use the bundled software.
-- 
cgit v1.2.3


From fb6e550d6b054371bff5d27f4c368a8cd977bb40 Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 16 Sep 2019 08:21:58 +0200
Subject: gnu: retroarch: Update to 1.7.8.4.

* gnu/packages/emulators.scm (retroarch): Update to 1.7.8.4.
---
 gnu/packages/emulators.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index f59c0fe92b..c6eda97473 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1054,7 +1054,7 @@ emulation community.  It provides highly accurate emulation.")
 (define-public retroarch
   (package
     (name "retroarch")
-    (version "1.7.8.3")
+    (version "1.7.8.4")
     (source
      (origin
        (method git-fetch)
@@ -1063,7 +1063,7 @@ emulation community.  It provides highly accurate emulation.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0lsfiljy6cin3xsxyh80d6y9a77h7h82fcm6k148cd8mndvyxcdn"))))
+        (base32 "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
cgit v1.2.3


From ec36339dfd2241cd518bb86b6714fc3b340afa95 Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro 
Date: Sat, 10 Aug 2019 22:52:50 +1000
Subject: services: certbot: Add --manual-public-ip-logging-ok for manual
 challenges
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/services/certbot.scm (certbot-command): Add
  --manual-public-ip-logging-ok flag to the certbot command when doing a
  manual challenge.

Signed-off-by: Ludovic Courtès 
---
 doc/guix.texi            | 4 +++-
 gnu/services/certbot.scm | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 39d4b865f6..55935b3794 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -20302,7 +20302,9 @@ all domains will be Subject Alternative Names on the certificate.
 The challenge type that has to be run by certbot.  If @code{#f} is specified,
 default to the HTTP challenge.  If a value is specified, defaults to the
 manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and
-the documentation at @url{https://certbot.eff.org/docs/using.html#hooks}).
+the documentation at @url{https://certbot.eff.org/docs/using.html#hooks}),
+and gives Let's Encrypt permission to log the public IP address of the
+requesting machine.
 
 @item @code{authentication-hook} (default: @code{#f})
 Command to be run in a shell once for each certificate challenge to be
diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm
index ae34ad17bb..0d3be03383 100644
--- a/gnu/services/certbot.scm
+++ b/gnu/services/certbot.scm
@@ -99,6 +99,7 @@
                             "--manual"
                             (string-append "--preferred-challenges=" challenge)
                             "--cert-name" name
+                            "--manual-public-ip-logging-ok"
                             "-d" (string-join domains ","))
                       (if rsa-key-size `("--rsa-key-size" ,rsa-key-size) '())
                       (if authentication-hook
-- 
cgit v1.2.3


From 9bbaf2ae72ce8457702f50277fee908d2c43d13c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 13 Sep 2019 17:35:08 +0200
Subject: pack: Add packages in the order in which they appear on the command
 line.

* guix/scripts/pack.scm (guix-pack)[manifest-from-args](packages):
Reverse order of packages taken from OPTS.
---
 guix/scripts/pack.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index dd91a24284..055d6c95f5 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -944,7 +944,8 @@ Create a bundle of PACKAGE.\n"))
                                   (list (transform store package) output))
                                  ((? package? package)
                                   (list (transform store package) "out")))
-                               (filter-map maybe-package-argument opts)))
+                               (reverse
+                                (filter-map maybe-package-argument opts))))
            (manifest-file (assoc-ref opts 'manifest)))
       (define properties
         (if (assoc-ref opts 'save-provenance?)
-- 
cgit v1.2.3


From 0074844366381e3056d09492b8b437836c7adb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 13 Sep 2019 17:32:16 +0200
Subject: pack: Provide a meaningful "repository name" for Docker.

Previously, images produced by 'guix pack -f docker' would always show
up as "profile" in the output of 'docker images'.  With this change,
'docker images' shows a name constructed from the packages found in the
image--e.g., "bash-coreutils-grep-sed".

* guix/docker.scm (canonicalize-repository-name): New procedure.
(generate-tag): Remove.
(manifest): Add optional 'tag' parameter and honor it.
(repositories): Likewise.
(build-docker-image): Add #:repository parameter and pass it to
'manifest' and 'repositories'.
* guix/scripts/pack.scm (docker-image)[build]: Compute 'tag' and pass it
as #:repository to 'build-docker-image'.
---
 guix/docker.scm       | 43 ++++++++++++++++++++++++++++++-------------
 guix/scripts/pack.scm | 13 +++++++++++++
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/guix/docker.scm b/guix/docker.scm
index 757bdeb458..97ac6d982b 100644
--- a/guix/docker.scm
+++ b/guix/docker.scm
@@ -57,22 +57,36 @@
     (created . ,time)
     (container_config . #nil)))
 
-(define (generate-tag path)
-  "Generate an image tag for the given PATH."
-  (match (string-split (basename path) #\-)
-    ((hash name . rest) (string-append name ":" hash))))
+(define (canonicalize-repository-name name)
+  "\"Repository\" names are restricted to roughtl [a-z0-9_.-].
+Return a version of TAG that follows these rules."
+  (define ascii-letters
+    (string->char-set "abcdefghijklmnopqrstuvwxyz"))
 
-(define (manifest path id)
+  (define separators
+    (string->char-set "_-."))
+
+  (define repo-char-set
+    (char-set-union char-set:digit ascii-letters separators))
+
+  (string-map (lambda (chr)
+                (if (char-set-contains? repo-char-set chr)
+                    chr
+                    #\.))
+              (string-trim (string-downcase name) separators)))
+
+(define* (manifest path id #:optional (tag "guix"))
   "Generate a simple image manifest."
-  `#(((Config . "config.json")
-      (RepoTags . #(,(generate-tag path)))
-      (Layers . #(,(string-append id "/layer.tar"))))))
+  (let ((tag (canonicalize-repository-name tag)))
+    `#(((Config . "config.json")
+        (RepoTags . #(,(string-append tag ":latest")))
+        (Layers . #(,(string-append id "/layer.tar")))))))
 
 ;; According to the specifications this is required for backwards
 ;; compatibility.  It duplicates information provided by the manifest.
-(define (repositories path id)
+(define* (repositories path id #:optional (tag "guix"))
   "Generate a repositories file referencing PATH and the image ID."
-  `((,(generate-tag path) . ((latest . ,id)))))
+  `((,(canonicalize-repository-name tag) . ((latest . ,id)))))
 
 ;; See https://github.com/opencontainers/image-spec/blob/master/config.md
 (define* (config layer time arch #:key entry-point (environment '()))
@@ -112,6 +126,7 @@
 
 (define* (build-docker-image image paths prefix
                              #:key
+                             (repository "guix")
                              (extra-files '())
                              (transformations '())
                              (system (utsname:machine (uname)))
@@ -121,7 +136,9 @@
                              compressor
                              (creation-time (current-time time-utc)))
   "Write to IMAGE a Docker image archive containing the given PATHS.  PREFIX
-must be a store path that is a prefix of any store paths in PATHS.
+must be a store path that is a prefix of any store paths in PATHS.  REPOSITORY
+is a descriptive name that will show up in \"REPOSITORY\" column of the output
+of \"docker images\".
 
 When DATABASE is true, copy it to /var/guix/db in the image and create
 /var/guix/gcroots and friends.
@@ -243,10 +260,10 @@ SRFI-19 time-utc object, as the creation time in metadata."
                              #:entry-point entry-point))))
       (with-output-to-file "manifest.json"
         (lambda ()
-          (scm->json (manifest prefix id))))
+          (scm->json (manifest prefix id repository))))
       (with-output-to-file "repositories"
         (lambda ()
-          (scm->json (repositories prefix id)))))
+          (scm->json (repositories prefix id repository)))))
 
     (apply invoke "tar" "-cf" image "-C" directory
            `(,@%tar-determinism-options
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 055d6c95f5..2543f0c0b5 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -516,6 +516,18 @@ the image."
               `((directory "/tmp" ,(getuid) ,(getgid) #o1777)
                 ,@(append-map symlink->directives '#$symlinks)))
 
+            (define tag
+              ;; Compute a meaningful "repository" name, which will show up in
+              ;; the output of "docker images".
+              (let ((manifest (profile-manifest #$profile)))
+                (let loop ((names (map manifest-entry-name
+                                       (manifest-entries manifest))))
+                  (define str (string-join names "-"))
+                  (if (< (string-length str) 40)
+                      str
+                      (match names
+                        ((_) str)
+                        ((names ... _) (loop names))))))) ;drop one entry
 
             (setenv "PATH" (string-append #$archiver "/bin"))
 
@@ -524,6 +536,7 @@ the image."
                                      (call-with-input-file "profile"
                                        read-reference-graph))
                                 #$profile
+                                #:repository tag
                                 #:database #+database
                                 #:system (or #$target (utsname:machine (uname)))
                                 #:environment environment
-- 
cgit v1.2.3


From 7e772cb66d050b86b6dde97bc97d09e708e01714 Mon Sep 17 00:00:00 2001
From: Kyle Meyer 
Date: Sat, 14 Sep 2019 02:15:31 -0400
Subject: gnu: git-annex: Update license.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/haskell-apps.scm (git-annex)[license]: Update main license to
AGPLv3+ and include other licenses mentioned in the package's COPYRIGHT file.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/haskell-apps.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 5cd6549c27..8c4048aa66 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -374,9 +374,16 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
 checking the file contents into Git.  It can store files in many places,
 such as local hard drives and cloud storage services.  It can also be
 used to keep a folder in sync between computers.")
-    ;; The web app is released under the AGPLv3+.
-    (license (list license:gpl3+
-                   license:agpl3+))))
+    ;; The main author has released all his changes under AGPLv3+ as of March
+    ;; 2019 (7.20190219-187-g40ecf58d4).  These are also licensed under the
+    ;; original GPLv3+ license, but going forward new changes will be under
+    ;; only AGPLv3+.  The other licenses below cover code written by others.
+    ;; See git-annex's COPYRIGHT file for details on each file.
+    (license (list license:agpl3+
+                   license:gpl3+
+                   license:bsd-2
+                   license:expat
+                   license:gpl2))))
 
 (define-public hlint
   (package
-- 
cgit v1.2.3


From e405912c20cdd188274e850e72d145a39c917f77 Mon Sep 17 00:00:00 2001
From: Kyle Meyer 
Date: Sat, 14 Sep 2019 02:15:32 -0400
Subject: gnu: Add ghc-magic.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/haskell-xyz.scm (ghc-magic): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index ee26c1a25a..4313b6059e 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2019 Robert Vollmert 
 ;;; Copyright © 2019 Jacob MacDonald 
 ;;; Copyright © 2019 John Soo 
+;;; Copyright © 2019 Kyle Meyer 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5954,6 +5955,28 @@ monadic incremental interface is provided as well.")
 compression algorithm used in the @code{.xz} file format.")
     (license license:bsd-3)))
 
+(define-public ghc-magic
+  (package
+    (name "ghc-magic")
+    (version "1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://hackage.haskell.org/package/magic/magic-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "10p0gjjjwr1dda7hahwrwn5njbfhl67arq3v3nf1jr3vymlkn75j"))))
+    (build-system haskell-build-system)
+    (home-page "http://hackage.haskell.org/package/magic")
+    (synopsis "Interface to C file/magic library")
+    (description
+     "This package provides a full-featured binding to the C libmagic library.
+With it, you can determine the type of a file by examining its contents rather
+than its name.")
+    (license license:bsd-3)))
+
 (define-public ghc-markdown-unlit
   (package
     (name "ghc-markdown-unlit")
-- 
cgit v1.2.3


From f2a3ff859119a81c6d302c552d404bf0462b09e3 Mon Sep 17 00:00:00 2001
From: Kyle Meyer 
Date: Sat, 14 Sep 2019 02:15:33 -0400
Subject: gnu: git-annex: Build with MagicMime support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-annex has a mechanism for configuring whether a file is added to the annex
or stored in git.  Building with MagicMime support makes it possible to
condition the behavior on a file's MIME type.

* gnu/packages/haskell-apps.scm (git-annex)[inputs]: Add ghc-magic.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/haskell-apps.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 8c4048aa66..1341994e60 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -337,6 +337,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
        ("ghc-http-conduit" ,ghc-http-conduit)
        ("ghc-http-types" ,ghc-http-types)
        ("ghc-ifelse" ,ghc-ifelse)
+       ("ghc-magic" ,ghc-magic)
        ("ghc-memory" ,ghc-memory)
        ("ghc-monad-control" ,ghc-monad-control)
        ("ghc-monad-logger" ,ghc-monad-logger)
-- 
cgit v1.2.3


From 1ece099d5cfdf344e239b28b58515545931a8a60 Mon Sep 17 00:00:00 2001
From: Kyle Meyer 
Date: Sat, 14 Sep 2019 02:15:34 -0400
Subject: gnu: git-annex: Update to 7.20190912.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/haskell-apps.scm (git-annex): Update 7.20190912.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/haskell-apps.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 1341994e60..e09285d63a 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -245,7 +245,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
 (define-public git-annex
   (package
     (name "git-annex")
-    (version "7.20190708")
+    (version "7.20190912")
     (source
      (origin
        (method url-fetch)
@@ -253,7 +253,7 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
                            "git-annex/git-annex-" version ".tar.gz"))
        (sha256
         (base32
-         "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij"))))
+         "1a3jvl5cx32v78s3015i10cx00jprm1391rpww4mzkk1vskzn9cv"))))
     (build-system haskell-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From a1a4a4071528104fe192cccbe59d64bf2ca485c3 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 12 Sep 2019 09:27:38 +0200
Subject: gnu: emacs-dumb-jump: Update to 0.5.3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-dumb-jump): Update to 0.5.3.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2452949d0f..b2f057a439 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13669,7 +13669,7 @@ through the symbol: @command{this-fn}.")
 (define-public emacs-dumb-jump
   (package
     (name "emacs-dumb-jump")
-    (version "0.5.2")
+    (version "0.5.3")
     (source
      (origin
        (method git-fetch)
@@ -13678,7 +13678,7 @@ through the symbol: @command{this-fn}.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin"))))
+        (base32 "1njf60264snhxrd36m4z687lqfkis0p9mmrr7cf1c8l0lfdvawxi"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #f ; FIXME: Tests freeze when run.
-- 
cgit v1.2.3


From 1d25447e8b1003a4c53d656fab13a62604a755b3 Mon Sep 17 00:00:00 2001
From: Kyle Andrews 
Date: Sat, 14 Sep 2019 15:43:53 -0400
Subject: gnu: Add herbstluftwm.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/wm.scm (herbstluftwm): New variable.

Co-authored-by: Ludovic Courtès 
---
 gnu/packages/wm.scm | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index c4b15cc755..e19c6c1438 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2019 Rutger Helling 
 ;;; Copyright © 2019 Timothy Sample 
 ;;; Copyright © 2019 Gábor Boskovits 
+;;; Copyright © 2019 Kyle Andrews 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -128,6 +129,86 @@
 the leaves of a full binary tree.")
     (license license:bsd-2)))
 
+(define-public herbstluftwm
+  (package
+    (name "herbstluftwm")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://herbstluftwm.org/tarballs/herbstluftwm-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz"))
+       (file-name (string-append "herbstluftwm-" version ".tar.gz"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("dzen"        ,dzen)
+       ("dmenu"       ,dmenu)
+       ("glib"        ,glib)
+       ("glibmm"      ,glibmm)
+       ("xterm"       ,xterm)
+       ("xsetroot"    ,xsetroot)
+       ("libx11"      ,libx11)
+       ("libxext"     ,libxext)
+       ("libxinerama" ,libxinerama)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'check)
+         (add-after 'install 'install-xsession
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (xsessions (string-append out "/share/xsessions")))
+               (mkdir-p xsessions)
+               (call-with-output-file
+                   (string-append xsessions "/herbstluftwm.desktop")
+                 (lambda (port)
+                   (format port "~
+                     [Desktop Entry]~@
+                     Name=herbstluftwm~@
+                     Comment=Manual tiling window manager~@
+                     Exec=~a/bin/herbstluftwm~@
+                     Type=XSession~%" out)))
+               #t))))
+       #:tests? #f
+       #:make-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list "CC=gcc"
+               (string-append "PREFIX=''")
+               (string-append "DESTDIR=" out)
+               (string-append "BASHCOMPLETIONDIR=" out
+                              "/etc/bash_completion.d")))))
+    (synopsis "Tiling window manager for X11")
+    (description "herbstluftwm is a manual tiling window manager for X11 using
+Xlib and GLib.  Its main features are:
+
+@itemize
+@item
+The layout is based on splitting frames into subframes which can be split
+again or can be filled with windows (similar to i3 or musca).
+
+@item
+Tags (or workspaces or virtual desktops or …) can be added/removed at runtime.
+Each tag contains an own layout.
+
+@item
+Exactly one tag is viewed on each monitor.  The tags are monitor independent
+(similar to Xmonad).
+
+@item
+It is configured at runtime via IPC calls from @command{herbstclient}.  So the
+configuration file is just a script which is run on startup (similar to wmii
+or musca).
+
+@end itemize")
+    (home-page "https://herbstluftwm.org")
+    (license license:bsd-2)))
+
 (define-public i3status
   (package
     (name "i3status")
-- 
cgit v1.2.3


From 5216632a9552d0ea8c08a1b63cbb788f0e1ae0a2 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 16 Sep 2019 11:58:21 +0200
Subject: gnu: Add s-sysdeps.

* gnu/packages/lisp.scm (sbcl-s-sysdeps, cl-s-sysdeps, ecl-s-sysdeps): New variables.
---
 gnu/packages/lisp.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 65fc1a58cd..3ff946da15 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6861,3 +6861,42 @@ extension-points via the concept of hooks.")
 
 (define-public ecl-cl-hooks
   (sbcl-package->ecl-package sbcl-cl-hooks))
+
+(define-public sbcl-s-sysdeps
+  (let ((commit "d28246b5dffef9e73a0e0e6cfbc4e878006fe34d")
+        (revision "1"))
+    (package
+      (name "sbcl-s-sysdeps")
+      (build-system asdf-build-system/sbcl)
+      (version (git-version "1" revision commit))
+      (home-page "https://github.com/svenvc/s-sysdeps")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "14b69b81yrxmjlvmm3lfxk04x5v7hqz4fql121334wh72czznfh9"))))
+      (synopsis "Common Lisp abstraction layer over platform dependent functionality")
+      (description "@code{s-sysdeps} is an abstraction layer over platform
+dependent functionality.  This simple package is used as a building block in a
+number of other open source projects.
+
+@code{s-sysdeps} abstracts:
+
+@itemize
+@item managing processes,
+@item implementing a standard TCP/IP server,
+@item opening a client TCP/IP socket stream,
+@item working with process locks.
+@end itemize\n")
+      (license license:llgpl))))
+
+(define-public cl-s-sysdeps
+  (sbcl-package->cl-source-package sbcl-s-sysdeps))
+
+(define-public ecl-s-sysdeps
+  (sbcl-package->ecl-package sbcl-s-sysdeps))
-- 
cgit v1.2.3


From eb2e9ef4d964177cdd161ec30e9ea3c900bec8aa Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 16 Sep 2019 11:58:40 +0200
Subject: gnu: Add cl-prevalence.

* gnu/packages/lisp.scm (cl-prevalence, sbcl-cl-prevalence, ecl-cl-prevalence): New variables.
---
 gnu/packages/lisp.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 3ff946da15..0c8ad1e2fa 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6900,3 +6900,37 @@ number of other open source projects.
 
 (define-public ecl-s-sysdeps
   (sbcl-package->ecl-package sbcl-s-sysdeps))
+
+(define-public sbcl-cl-prevalence
+  (let ((commit "c163c227ed85d430b82cb1e3502f72d4f88e3cfa")
+        (revision "1"))
+    (package
+      (name "sbcl-cl-prevalence")
+      (build-system asdf-build-system/sbcl)
+      (version (git-version "5" revision commit))
+      (home-page "https://github.com/40ants/cl-prevalence")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1i9zj1q2ahgwch56an21yzbgkynz0kab9fyxkq9mg8p3xrv38jjn"))))
+      (inputs
+       `(("s-sysdeps" ,sbcl-s-sysdeps)
+         ("s-xml" ,sbcl-s-xml)))
+      (synopsis "Implementation of object prevalence for Common Lisp")
+      (description "This Common Lisp library implements object prevalence (see
+@url{https://en.wikipedia.org/wiki/System_prevalence}).  It allows
+for (de)serializing to and from s-exps as well as XML.  Serialization of arbitrary
+classes and cyclic data structures are supported.")
+      (license license:llgpl))))
+
+(define-public cl-prevalence
+  (sbcl-package->cl-source-package sbcl-cl-prevalence))
+
+(define-public ecl-cl-prevalence
+  (sbcl-package->ecl-package sbcl-cl-prevalence))
-- 
cgit v1.2.3


From ad6e168b3f29576d92b00725dedbb38cd5f05e46 Mon Sep 17 00:00:00 2001
From: Martin Becze 
Date: Fri, 6 Sep 2019 06:35:34 -0400
Subject: gnu: evolution: Wrap with required path variables.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes .

* gnu/packages/gnome.scm (evolution)[arguments]: Add a ‘wrap-program’
phase.

Signed-off-by: Tobias Geerinckx-Rice 
---
 gnu/packages/gnome.scm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5dc18b3bb5..f2edf92bd1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2019 Jelle Licht 
 ;;; Copyright © 2019 Jonathan Frederickson 
 ;;; Copyright © 2019 Maxim Cournoyer 
+;;; Copyright © 2019 Martin Becze 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8122,11 +8123,21 @@ generic enough to work for everyone.")
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-       (list "-DENABLE_PST_IMPORT=OFF"    ; libpst is not packaged
-             "-DENABLE_LIBCRYPTUI=OFF"))) ; libcryptui hasn't seen a release
-                                          ; in four years and cannot be built.
+       (list "-DENABLE_PST_IMPORT=OFF"  ; libpst is not packaged
+             "-DENABLE_LIBCRYPTUI=OFF") ; libcryptui hasn't seen a release
+                                        ; in four years and cannot be built
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-program
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/evolution")
+                 `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))
+                 `("GSETTINGS_SCHEMA_DIR" =
+                   (,(string-append out "/share/glib-2.0/schemas")))))
+             #t)))))
     (native-inputs
-     `(("glib" ,glib "bin")               ; glib-mkenums
+     `(("glib" ,glib "bin")             ; glib-mkenums
        ("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("itstool" ,itstool)))
@@ -8134,6 +8145,7 @@ generic enough to work for everyone.")
      `(("enchant" ,enchant)
        ("evolution-data-server" ,evolution-data-server) ; must be the same version
        ("gcr" ,gcr)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("gnome-autoar" ,gnome-autoar)
        ("gnome-desktop" ,gnome-desktop)
        ("gtkspell3" ,gtkspell3)
-- 
cgit v1.2.3


From 76c0b608219cc1f58decbd85f4a8194337f0558d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 16 Sep 2019 11:16:40 +0200
Subject: import/cran: Export %bioconductor-version.

* guix/import/cran.scm (%bioconductor-version): Export it.
---
 guix/import/cran.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 35caa3e463..e47aff2b12 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -49,6 +49,7 @@
             cran-recursive-import
             %cran-updater
             %bioconductor-updater
+            %bioconductor-version
 
             cran-package?
             bioconductor-package?
-- 
cgit v1.2.3


From 41ca406fa54e69f61c55b11ffe5cf465192a907c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 16 Sep 2019 11:23:57 +0200
Subject: build-system/r: Use %bioconductor-version.

* guix/build-system/r.scm (bioconductor-uri): Use %bioconductor-version
instead of hard-coding the version string.
---
 guix/build-system/r.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index dd2a9fe8de..936ad974d0 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus 
+;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +24,7 @@
   #:use-module (guix search-paths)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
+  #:use-module ((guix import cran) #:select (%bioconductor-version))
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26)
   #:export (%r-build-system-modules
@@ -58,8 +59,8 @@ release corresponding to NAME and VERSION."
                          type-url-part
                          "/src/contrib/"
                          name "_" version ".tar.gz")
-          ;; TODO: use %bioconductor-version from (guix import cran)
-          (string-append "https://bioconductor.org/packages/3.9"
+          (string-append "https://bioconductor.org/packages/"
+                         %bioconductor-version
                          type-url-part
                          "/src/contrib/Archive/"
                          name "_" version ".tar.gz"))))
-- 
cgit v1.2.3


From 456da45c1ba8d28582053354f32bdb330c02e7a6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 16 Sep 2019 12:17:59 +0200
Subject: gnu: libvterm: Update to 0.1.

* gnu/packages/terminals.scm (libvterm): Update to 0.1.
---
 gnu/packages/terminals.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f0117eead3..98ed77289a 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2016, 2017 José Miguel Sánchez García 
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Kei Kebreau 
-;;; Copyright © 2017, 2018 Ricardo Wurmus 
+;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2017 Petter 
 ;;; Copyright © 2018 Hartmut Goebel 
 ;;; Copyright © 2018 Arun Isaac 
@@ -460,7 +460,7 @@ should be thread-safe.")
 (define-public libvterm
   (package
     (name "libvterm")
-    (version "0+bzr681")
+    (version "0.1")
     (source
      (origin
        (method url-fetch)
@@ -468,12 +468,13 @@ should be thread-safe.")
                            "libvterm-" version ".tar.gz"))
        (sha256
         (base32
-         "1s56c8p1qz6frkcri0hg4qyydv2wcccj6n2xmz1dwcdqn38ldsmb"))))
+         "1pcxjhvdwhr2f3lyzf2rv1vp3l62bgkjm1ybhj82qf8yly7ca6g4"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
        (list "CC=gcc"
              (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:tests? #f ; XXX: some tests fail in this release
        #:test-target "test"
        #:phases
        (modify-phases %standard-phases
-- 
cgit v1.2.3


From 9ad3d6798170729eb49821e587c865a457c619a5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 16 Sep 2019 12:24:48 +0200
Subject: gnu: Add lua-luv.

* gnu/packages/lua.scm (lua-luv, lua5.1-luv, lua5.2-luv): New variables.
(make-lua-luv): New procedure.
---
 gnu/packages/lua.scm | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index ff62d3b362..075decc61a 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2014 Mark H Weaver 
 ;;; Copyright © 2014 Andreas Enge 
 ;;; Copyright © 2016, 2017 Efraim Flashner 
-;;; Copyright © 2016 Ricardo Wurmus 
+;;; Copyright © 2016, 2019 Ricardo Wurmus 
 ;;; Copyright © 2016 doncatnip 
 ;;; Copyright © 2016, 2017, 2019 Clément Lassieur 
 ;;; Copyright © 2016 José Miguel Sánchez García 
@@ -39,6 +39,7 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages libevent)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg)
@@ -450,6 +451,69 @@ Grammars (PEGs).")
 (define-public lua5.2-lpeg
   (make-lua-lpeg "lua5.2-lpeg" lua-5.2))
 
+(define (make-lua-luv name lua)
+  (package
+    (name name)
+    (version "1.30.1-0")
+    (source (origin
+              ;; The release tarball includes the sources of libuv but does
+              ;; not include the pkg-config files.
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/luvit/luv.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1lfzzyphpim28kw33k7zylcyxnf40ckhdg6hbqyzb5hszdf2hbka"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; there are none
+       #:configure-flags
+       '("-DWITH_LUA_ENGINE=Lua"
+         "-DWITH_SHARED_LIBUV=On"
+         "-DBUILD_MODULE=Off"
+         "-DBUILD_SHARED_LIBS=On"
+         "-DLUA_BUILD_TYPE=System")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'copy-lua-compat
+           (lambda* (#:key inputs #:allow-other-keys)
+             (copy-recursively (assoc-ref inputs "lua-compat")
+                               "lua-compat")
+             (setenv "CPATH"
+                     (string-append (getcwd) "/lua-compat:"
+                                    (or (getenv "CPATH") "")))
+             #t)))))
+    (inputs
+     `(("lua" ,lua)
+       ("libuv" ,libuv)))
+    (native-inputs
+     `(("lua-compat"
+        ,(origin
+           (method git-fetch)
+           (uri (git-reference
+                 (url "https://github.com/keplerproject/lua-compat-5.3.git")
+                 (commit "daebe77a2f498817713df37f0bb316db1d82222f")))
+           (file-name "lua-compat-5.3-checkout")
+           (sha256
+            (base32
+             "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz"))))))
+    (home-page "https://github.com/luvit/luv/")
+    (synopsis "Libuv bindings for Lua")
+    (description
+     "This library makes libuv available to Lua scripts.")
+    (license license:asl2.0)))
+
+(define-public lua-luv
+  (make-lua-luv "lua-luv" lua))
+
+(define-public lua5.1-luv
+  (make-lua-luv "lua5.1-luv" lua-5.1))
+
+(define-public lua5.2-luv
+  (make-lua-luv "lua5.2-luv" lua-5.2))
+
 ;; Lua 5.3 is not supported.
 (define (make-lua-bitop name lua)
   (package
-- 
cgit v1.2.3


From 518fd3b6592203df73fec347d30016d4260ee127 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 16 Sep 2019 12:25:30 +0200
Subject: gnu: neovim: Update to 0.4.2.

* gnu/packages/vim.scm (neovim): Update to 0.4.2.
[arguments]: Remove "patch-tic" phase; add "lua-luv" to "set-lua-paths" phase.
[inputs]: Add lua5.1-luv.
---
 gnu/packages/vim.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 8ebdbb9a35..b1f47bd010 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -735,7 +735,7 @@ are detected, the user is notified.")))
 (define-public neovim
   (package
     (name "neovim")
-    (version "0.3.7")
+    (version "0.4.2")
     (source
      (origin
        (method git-fetch)
@@ -745,7 +745,7 @@ are detected, the user is notified.")))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh"))))
+         "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss"))))
     (build-system cmake-build-system)
     (arguments
      `(#:modules ((srfi srfi-26)
@@ -754,13 +754,6 @@ are detected, the user is notified.")))
        #:configure-flags '("-DPREFER_LUA:BOOL=YES")
        #:phases
        (modify-phases %standard-phases
-         ;; TODO: remove 'patch-tic on update
-         ;; see: https://github.com/neovim/neovim/issues/9687
-         (add-after 'unpack 'patch-tic
-           (lambda _
-             (substitute* "src/nvim/tui/tui.c"
-               (("value != NULL") "value != NULL && value != (char *)-1"))
-             #t))
          (add-after 'unpack 'set-lua-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (let* ((lua-version "5.1")
@@ -774,6 +767,7 @@ are detected, the user is notified.")))
                          (string-append path "/?.lua;" path "/?/?.lua"))))
                     (lua-inputs (map (cute assoc-ref %build-inputs <>)
                                      '("lua"
+                                       "lua-luv"
                                        "lua-lpeg"
                                        "lua-bitop"
                                        "lua-libmpack"))))
@@ -791,6 +785,7 @@ are detected, the user is notified.")))
        ("jemalloc" ,jemalloc)
        ("libiconv" ,libiconv)
        ("lua" ,lua-5.1)
+       ("lua-luv" ,lua5.1-luv)
        ("lua-lpeg" ,lua5.1-lpeg)
        ("lua-bitop" ,lua5.1-bitop)
        ("lua-libmpack" ,lua5.1-libmpack)))
-- 
cgit v1.2.3


From 74e7465c9b3758c1509a3e0dbe575e2014e20f0a Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 16 Sep 2019 14:34:15 +0300
Subject: Revert "build-system/r: Use %bioconductor-version."

This reverts commit 41ca406fa54e69f61c55b11ffe5cf465192a907c.

This commit breaks 'guix pull', as reported by Hao Chen.
---
 guix/build-system/r.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index 936ad974d0..dd2a9fe8de 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus 
+;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,7 +24,6 @@
   #:use-module (guix search-paths)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix import cran) #:select (%bioconductor-version))
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26)
   #:export (%r-build-system-modules
@@ -59,8 +58,8 @@ release corresponding to NAME and VERSION."
                          type-url-part
                          "/src/contrib/"
                          name "_" version ".tar.gz")
-          (string-append "https://bioconductor.org/packages/"
-                         %bioconductor-version
+          ;; TODO: use %bioconductor-version from (guix import cran)
+          (string-append "https://bioconductor.org/packages/3.9"
                          type-url-part
                          "/src/contrib/Archive/"
                          name "_" version ".tar.gz"))))
-- 
cgit v1.2.3


From 3f19b268ea3dbd4ec266926d25f7172fbd5b9cee Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 10 Sep 2019 12:45:39 +0300
Subject: gnu: Add klavaro.

* gnu/packages/education.scm (klavaro): New variable.
---
 gnu/packages/education.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 240fc4acd8..0ec1de7b75 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 Danny Milosavljevic 
 ;;; Copyright © 2016, 2017 Ricardo Wurmus 
 ;;; Copyright © 2016 Hartmut Goebel 
-;;; Copyright © 2017, 2018 Efraim Flashner 
+;;; Copyright © 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018, 2019 Nicolas Goaziou 
 ;;;
@@ -520,3 +520,30 @@ minutes.  For simpler timetables, it may take a shorter time, under
 difficult timetables, it may take a longer time, a matter of hours.")
     (license license:agpl3+)))
 
+(define-public klavaro
+  (package
+    (name "klavaro")
+    (version "3.09")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://sourceforge/klavaro/klavaro-"
+                            version ".tar.bz2"))
+        (sha256
+         (base32
+          "12gml7h45b1w9s318h0d5wxw92h7pgajn2kh57j0ak9saq0yb0wr"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("cairo" ,cairo)
+       ("curl" ,curl)
+       ("gtk+" ,gtk+)
+       ("pango" ,pango)))
+    (home-page "https://klavaro.sourceforge.io/en/index.html")
+    (synopsis "Touch typing tutor")
+    (description
+     "Klavaro is a simple tutor to teach correct typing, almost independently of
+language and very flexible regarding to new or unknown keyboard layouts.")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From dece34332b9e4c8e1794dab7c430094f733a2d1a Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 10 Sep 2019 12:46:40 +0300
Subject: gnu: Add kqtquickcharts.

* gnu/packages/kde.scm (kqtquickcharts): New variable.
---
 gnu/packages/kde.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index f2261f7f98..9010bd71ba 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -602,3 +602,28 @@ communicate with each other.  Here's a few things KDE Connect can do:
 @end enumerate")
     (properties `((upstream-name . "kdeconnect-kde")))
     (license (list license:gpl2 license:gpl3)))) ; dual licensed
+
+(define-public kqtquickcharts
+  (package
+    (name "kqtquickcharts")
+    (version "19.08.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/applications/"
+                            version "/src/kqtquickcharts-" version ".tar.xz"))
+        (sha256
+         (base32
+          "1j3rivvh4sa94lsd0hi4xfvcikl05zrqd7634wxyaxs718ais6dg"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (home-page "https://phabricator.kde.org/source/kqtquickcharts/")
+    (synopsis "Interactive charts for Qt Quick")
+    (description
+     "Kqtquickcharts is a QtQuick plugin to render beautiful and interactive
+charts.")
+    (license license:lgpl2.1+)))
-- 
cgit v1.2.3


From d2c0a7a22f5f40a2ff745752fe6675126c1ed44b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 10 Sep 2019 12:48:22 +0300
Subject: gnu: Add ktouch.

* gnu/packages/education.scm (ktouch): New variable.
---
 gnu/packages/education.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0ec1de7b75..3181746282 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -36,6 +36,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages javascript)
+  #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks) ; extra-cmake-modules
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -547,3 +548,74 @@ difficult timetables, it may take a longer time, a matter of hours.")
      "Klavaro is a simple tutor to teach correct typing, almost independently of
 language and very flexible regarding to new or unknown keyboard layouts.")
     (license license:gpl3+)))
+
+(define-public ktouch
+  (package
+    (name "ktouch")
+    (version "19.08.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://kde/stable/applications/"
+                            version "/src/ktouch-" version ".tar.xz"))
+        (sha256
+         (base32
+          "19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:modules ((guix build cmake-build-system)
+                  (guix build qt-utils)
+                  (guix build utils))
+       #:imported-modules (,@%cmake-build-system-modules
+                            (guix build qt-utils))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'patch-makefiles
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((qtdec (assoc-ref inputs "qtdeclarative")))
+               (substitute* '("src/CMakeFiles/ktouch_autogen.dir/build.make"
+                              "src/CMakeFiles/ktouch.dir/build.make")
+                 (("/gnu/store/.*qmlcachegen")
+                  (string-append qtdec "/bin/qmlcachegen"))))
+             #t))
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-qt-program out "ktouch"))
+             #t)))))
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("kdoctools" ,kdoctools)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("kcmutils" ,kcmutils)
+       ("kcompletion" ,kcompletion)
+       ("kconfig" ,kconfig)
+       ("kconfigwidgets" ,kconfigwidgets)
+       ("kcoreaddons" ,kcoreaddons)
+       ("kdeclarative" ,kdeclarative)
+       ("ki18n" ,ki18n)
+       ("kiconthemes" ,kiconthemes)
+       ("kitemviews" ,kitemviews)
+       ("kqtquickcharts" ,kqtquickcharts)
+       ("ktextwidgets" ,ktextwidgets)
+       ("kwidgetsaddons" ,kwidgetsaddons)
+       ("kwindowsystem" ,kwindowsystem)
+       ("kxmlgui" ,kxmlgui)
+       ("libxcb" ,libxcb)
+       ("libxkbfile" ,libxkbfile)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtgraphicaleffects" ,qtgraphicaleffects)
+       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtx11extras" ,qtx11extras)
+       ("qtxmlpatterns" ,qtxmlpatterns)))
+    (home-page "https://edu.kde.org/ktouch/")
+    (synopsis "Touch typing tutor")
+    (description
+     "KTouch is an aid for learning how to type with speed and accuracy.  It
+provides a sample text to type and indicates which fingers should be used for
+each key.  A collection of lessons are included for a wide range of different
+languages and keyboard layouts, and typing statistics are used to dynamically
+adjust the level of difficulty.")
+    (license license:gpl2)))
-- 
cgit v1.2.3


From 30ba3d8593108c898dd6dbdb119c85932ea85a89 Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 16 Sep 2019 14:04:52 +0200
Subject: gnu: wireguard: Update to 0.0.20190913.

* gnu/packages/vpn.scm (wireguard): Update to 0.0.20190913.
---
 gnu/packages/vpn.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 5f78c4365a..bc875b1c99 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -452,14 +452,14 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
 (define-public wireguard
   (package
     (name "wireguard")
-    (version "0.0.20190905")
+    (version "0.0.20190913")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://git.zx2c4.com/WireGuard/snapshot/"
                                   "WireGuard-" version ".tar.xz"))
               (sha256
                (base32
-                "1xm8w773impgp11jj6kp3fghld0aj8nhfpqla6lflsr8npp7qxkq"))))
+                "06452jfibwar4sh7wf2k2k1a5qk5q703gxqqq5ymj6rdblc2fwwr"))))
     (build-system gnu-build-system)
     (outputs '("out" ; The WireGuard userspace tools
                "kernel-patch")) ; A patch to build Linux with WireGuard support
-- 
cgit v1.2.3


From 489f540b4e625324a7f5009f9fef3160bd2c42fc Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 16 Sep 2019 14:06:09 +0200
Subject: gnu: linux-libre: Update to 5.2.15.

* gnu/packages/linux.scm (linux-libre): Update to 5.2.15.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 148254e63f..c9baecfa28 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                         "linux-" version ".tar.xz"))
     (sha256 hash)))
 
-(define-public linux-libre-5.2-version "5.2.13")
+(define-public linux-libre-5.2-version "5.2.15")
 (define-public linux-libre-5.2-pristine-source
   (let ((version linux-libre-5.2-version)
-        (hash (base32 "12hpph3iynr22mfwz7745lp01waf2kg579hr56d4pvhx4iahzdhp")))
+        (hash (base32 "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
-- 
cgit v1.2.3


From 230e59da1b41d5a6e770e428cbe2b8f66eaf9ee4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 16 Sep 2019 16:16:18 +0300
Subject: gnu: education.scm: Import (gnu packages curl).

This is a follow-up to 3f19b268ea3dbd4ec266926d25f7172fbd5b9cee.

* gnu/packages/education.scm.scm: Import (gnu packages curl) module.
---
 gnu/packages/education.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 3181746282..b03b2cba2e 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages fonts)
   #:use-module (gnu packages freedesktop)
-- 
cgit v1.2.3


From c34671a69dcc6fc508c54822580e68095c6e719c Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 16 Sep 2019 16:18:39 +0300
Subject: gnu: rust-percent-encoding: Update to 2.1.0.

* gnu/packages/crates-io.scm (rust-percent-encoding): Update to 2.1.0.
---
 gnu/packages/crates-io.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e138b93e9b..906a8e66bf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2019,7 +2019,7 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}.
 (define-public rust-percent-encoding
   (package
     (name "rust-percent-encoding")
-    (version "2.0.0")
+    (version "2.1.0")
     (source
       (origin
         (method url-fetch)
@@ -2027,7 +2027,7 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}.
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "0m6rkp3iy11la04p6z3492rns6n693pvmx585dvfmzzlzak2hkxs"))))
+          "0bp3zrsk3kr47fbpipyczidbbx4g54lzxdm77ni1i3qws10mdzfl"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/servo/rust-url/")
     (synopsis "Percent encoding and decoding")
-- 
cgit v1.2.3


From 59487fc29ae4119bdf5d270f29176cbf4b300012 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 16 Sep 2019 23:28:58 +0200
Subject: gnu: libgtop: Don't use NAME in source URI.

* gnu/packages/gnome.scm (libgtop)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f2edf92bd1..0cac850eb4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5915,9 +5915,9 @@ providing graphical log-ins and managing local and remote displays.")
     (version "2.38.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/libgtop/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "libgtop-" version ".tar.xz"))
               (sha256
                (base32
                 "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"))))
-- 
cgit v1.2.3


From 015fc036116d2275a92cccd6e878d625d8903330 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 16 Sep 2019 23:29:08 +0200
Subject: gnu: libgtop: Update to 2.40.0.

* gnu/packages/gnome.scm (libgtop): Update to 2.40.0.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0cac850eb4..31ff2ab972 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5912,7 +5912,7 @@ providing graphical log-ins and managing local and remote displays.")
 (define-public libgtop
   (package
     (name "libgtop")
-    (version "2.38.0")
+    (version "2.40.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libgtop/"
@@ -5920,7 +5920,7 @@ providing graphical log-ins and managing local and remote displays.")
                                   "libgtop-" version ".tar.xz"))
               (sha256
                (base32
-                "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g"))))
+                "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("gobject-introspection" ,gobject-introspection)
-- 
cgit v1.2.3


From b938892551816aedd01fd32b7eb1d5e061afce32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 16 Sep 2019 23:45:36 +0200
Subject: gnu: go@1.12: Skip flaky GC test.

Fixes .

* gnu/packages/patches/go-skip-gc-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/golang.scm (go-1.12)[source]: Use it.
---
 gnu/local.mk                               |  1 +
 gnu/packages/golang.scm                    |  6 ++++--
 gnu/packages/patches/go-skip-gc-test.patch | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/go-skip-gc-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 7f288b3e7c..ce4510ae4a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -911,6 +911,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   %D%/packages/patches/gobject-introspection-cc.patch		\
   %D%/packages/patches/gobject-introspection-girepository.patch	\
+  %D%/packages/patches/go-skip-gc-test.patch			\
   %D%/packages/patches/gpm-glibc-2.26.patch			\
   %D%/packages/patches/gpsbabel-minizip.patch     		\
   %D%/packages/patches/gpsbabel-qstring.patch     		\
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b12fc4b4bd..128e62beef 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2016 Matthew Jordan 
 ;;; Copyright © 2016 Andy Wingo 
-;;; Copyright © 2016 Ludovic Courtès 
+;;; Copyright © 2016, 2019 Ludovic Courtès 
 ;;; Copyright © 2016, 2017 Petter 
 ;;; Copyright © 2016, 2017, 2019 Leo Famulari 
 ;;; Copyright © 2017 Sergei Trofimovich 
@@ -41,6 +41,7 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system go)
+  #:use-module (gnu packages)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages base)
@@ -408,7 +409,8 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                            name version ".src.tar.gz"))
        (sha256
         (base32
-         "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m"))))
+         "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m"))
+       (patches (search-patches "go-skip-gc-test.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments go-1.4)
        ((#:phases phases)
diff --git a/gnu/packages/patches/go-skip-gc-test.patch b/gnu/packages/patches/go-skip-gc-test.patch
new file mode 100644
index 0000000000..2baab97580
--- /dev/null
+++ b/gnu/packages/patches/go-skip-gc-test.patch
@@ -0,0 +1,17 @@
+Skip a GC test known to be flaky:
+
+  https://issues.guix.gnu.org/issue/37425
+  https://github.com/golang/go/issues/27636
+
+--- go/src/runtime/gc_test.go	2019-09-16 23:10:18.200680387 +0200
++++ go/src/runtime/gc_test.go	2019-09-16 23:11:50.324360646 +0200
+@@ -27,6 +27,9 @@ func TestGcSys(t *testing.T) {
+ 	if runtime.GOOS == "linux" && runtime.GOARCH == "arm64" {
+ 		t.Skip("skipping test; GOOS=linux GOARCH=arm64 https://github.com/golang/go/issues/27636")
+ 	}
++	if runtime.GOOS == "linux" {
++		t.Skip("skipping test; GOOS=linux https://issues.guix.gnu.org/issue/37425")
++	}
+ 	got := runTestProg(t, "testprog", "GCSys")
+ 	want := "OK\n"
+ 	if got != want {
-- 
cgit v1.2.3


From 82c4ad9646aa65f96a809d089f318680126d8b39 Mon Sep 17 00:00:00 2001
From: Timothy Sample 
Date: Thu, 12 Sep 2019 00:50:54 -0400
Subject: daemon: Include 'config.h' in 'nix-daemon.cc'.

* nix/nix-daemon/nix-daemon.cc: Include 'config.h'.
---
 nix/nix-daemon/nix-daemon.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index ffac6cde34..1163a249d1 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "shared.hh"
 #include "local-store.hh"
 #include "util.hh"
-- 
cgit v1.2.3


From 9a94ccec4c14dab78326b2b1c449cd4ccd987bcb Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Tue, 6 Aug 2019 23:43:55 +0800
Subject: gnu: Add zinnia.

* gnu/packages/ocr.scm (zinnia): New variable.
---
 gnu/packages/ocr.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 2808359ca2..14ea7e443b 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013 Ludovic Courtès 
 ;;; Copyright © 2016 Efraim Flashner 
 ;;; Copyright © 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2019 Alex Vong 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +23,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages image))
@@ -76,3 +78,56 @@ positional information and page layout analysis.  Several image formats are
 supported through the Leptonica library.  It can also detect whether text is
 monospaced or proportional.")
     (license license:asl2.0)))
+
+(define-public zinnia
+  (let* ((commit "581faa8f6f15e4a7b21964be3a5ec36265c80e5b")
+         (revision "1")
+         ;; version copied from 'configure.in'
+         (version (git-version "0.07" revision commit)))
+    (package
+      (name "zinnia")
+      (version version)
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/taku910/zinnia.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "1izjy5qw6swg0rs2ym2i72zndb90mwrfbd1iv8xbpwckbm4899lg"))
+         (file-name (git-file-name name version))
+         (modules '((guix build utils)
+                    (ice-9 ftw)
+                    (srfi srfi-26)))
+         (snippet ; remove unnecessary files with potentially different license
+          '(begin
+             (for-each delete-file-recursively
+                       (scandir "."
+                                (negate (cut member <> '("zinnia"
+                                                         "." "..")))))
+             #t))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (replace 'bootstrap
+             (lambda _
+               (chdir "zinnia")
+               (for-each make-file-writable
+                         '("config.log" "config.status"))
+               #t)))))
+      (home-page "https://taku910.github.io/zinnia/")
+      (synopsis "Online hand recognition system with machine learning")
+      (description
+       "Zinnia is a simple, customizable and portable online hand recognition
+system based on Support Vector Machines.  Zinnia simply receives user pen
+strokes as a sequence of coordinate data and outputs n-best characters sorted
+by SVM confidence.  To keep portability, Zinnia doesn't have any rendering
+functionality.  In addition to recognition, Zinnia provides training module
+that allows us to create any hand-written recognition systems with low-cost.")
+      (license (list license:bsd-3 ; all files except...
+                     (license:non-copyleft ; some autotools related files
+                      "file://zinnia/aclocal.m4")
+                     license:x11 ; 'install-sh'
+                     license:public-domain))))) ; 'install-sh'
-- 
cgit v1.2.3


From 16dd1fd044b3d47939707e0a863cb461c7455d25 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Tue, 6 Aug 2019 23:52:41 +0800
Subject: gnu: Add python2-zinnia.

* gnu/packages/ocr.scm (python2-zinnia): New variable.
---
 gnu/packages/ocr.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index 14ea7e443b..1266e7e419 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -25,7 +25,9 @@
   #: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 compression)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages image))
 
 (define-public ocrad
@@ -131,3 +133,21 @@ that allows us to create any hand-written recognition systems with low-cost.")
                       "file://zinnia/aclocal.m4")
                      license:x11 ; 'install-sh'
                      license:public-domain))))) ; 'install-sh'
+
+;;; python 2 bindings, license under the same terms as zinnia
+(define-public python2-zinnia
+  (package
+    (inherit zinnia)
+    (name "python2-zinnia")
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2 ; CObject API is used, it was removed in Python 3.2
+       #:tests? #f ; avoid circular dependency on tegaki-zinnia-japanese
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir
+           (lambda _
+             (chdir "zinnia/python")
+             #t)))))
+    (inputs
+     `(("zinnia" ,zinnia)))))
-- 
cgit v1.2.3


From 410387ad058f94be5e633a84642d2133b1c8f77a Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 13:42:46 +0800
Subject: gnu: Add python2-tegaki-wagomu.

* gnu/packages/language.scm
(python2-tegaki-wagomu, remove-pre-compiled-files-modules): New variables.
(remove-pre-compiled-files, tegaki-release-uri): New procedures.
---
 gnu/packages/language.scm | 75 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 73376feecb..cc685437c9 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015, 2016 Eric Bavier 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 ng0 
+;;; Copyright © 2019 Alex Vong 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,12 +21,17 @@
 
 (define-module (gnu packages language)
   #:use-module (gnu packages)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages perl-check)
+  #:use-module (gnu packages swig)
   #:use-module (gnu packages web)
   #:use-module (guix packages)
   #:use-module (guix build-system perl)
-  #:use-module ((guix licenses) #:select (gpl2 gpl3 perl-license))
+  #:use-module (guix build-system python)
+  #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3 perl-license))
   #:use-module (guix download))
 
 (define-public perl-lingua-en-findnumber
@@ -406,3 +412,70 @@ string can be easily inferred by a human just by reading the identifier.")
     (description "This module is a rather incomplete implementation of work
 done by Gudrun Putze-Meier.")
     (license perl-license)))
+
+(define* (tegaki-release-uri proj version
+                             #:optional (ext "tar.gz"))
+  (string-append "https://github.com/tegaki/tegaki/releases/download"
+                 "/v" version "/" proj "-" version "." ext))
+
+(define remove-pre-compiled-files
+  (lambda exts
+    "Return snippet for removing pre-compiled files matching one of the
+extensions in EXTS."
+    `(begin (for-each delete-file
+                      (find-files "."
+                                  (lambda (name _)
+                                    (any (cut string-suffix? <> name)
+                                         (map (cut string-append "." <>)
+                                              ',exts)))))
+            #t)))
+
+;;; modules required for the above snippet
+(define remove-pre-compiled-files-modules
+  '((guix build utils)
+    (srfi srfi-1)
+    (srfi srfi-26)))
+
+(define-public python2-tegaki-wagomu
+  (package
+    (name "python2-tegaki-wagomu")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri "tegaki-wagomu" version))
+       (sha256
+        (base32
+         "1pzdiq4zy1nyylaj9i6v2h4h0r05klahskzpafpp367p4rysi1x9"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "pyc"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2 ; only Python 2 is supported
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-recognizer
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; fix missing module and function
+             (substitute* "tegakiwagomu.py"
+               (("import Results,")
+                "import ")
+               (("def _recognize")
+                "def recognize")
+               (("Results\\(candidates\\)")
+                "candidates"))
+             #t)))))
+    (inputs
+     `(("glib" ,glib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("swig" ,swig)))
+    (home-page "https://tegaki.github.io/")
+    (synopsis
+     "Chinese and Japanese Handwriting Recognition (Recognition engine)")
+    (description
+     "Tegaki is an ongoing project which aims to develop a free and open-source
+modern implementation of handwriting recognition software, specifically
+designed for Chinese (simplified and traditional) and Japanese, and that is
+suitable for both the desktop and mobile devices.")
+    (license gpl2+))) ; all files
-- 
cgit v1.2.3


From c2810523102dfe4fc8153c3b02fe881bf48c6699 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 13:49:19 +0800
Subject: gnu: Add python2-tegaki-python.

* gnu/packages/language.scm (python2-tegaki-python): New variable.
---
 gnu/packages/language.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index cc685437c9..2ef4fed721 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -22,6 +22,7 @@
 (define-module (gnu packages language)
   #:use-module (gnu packages)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages ocr)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -31,8 +32,10 @@
   #:use-module (guix packages)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
-  #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3 perl-license))
-  #:use-module (guix download))
+  #:use-module ((guix licenses)
+                #:select (bsd-3 gpl2 gpl2+ gpl3 perl-license zpl2.1))
+  #:use-module (guix download)
+  #:use-module (guix utils))
 
 (define-public perl-lingua-en-findnumber
   (package
@@ -479,3 +482,50 @@ modern implementation of handwriting recognition software, specifically
 designed for Chinese (simplified and traditional) and Japanese, and that is
 suitable for both the desktop and mobile devices.")
     (license gpl2+))) ; all files
+
+(define-public python2-tegaki-python
+  (package
+    (inherit python2-tegaki-wagomu)
+    (name "python2-tegaki-python")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri "tegaki-python" version))
+       (sha256
+        (base32
+         "0x93k7pw9nh0ywd97pr8pm7jv3f94nw044i5k0zvzhdpsjqvak7p"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "pyc"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments python2-tegaki-wagomu)
+       ((#:phases _)
+        `(modify-phases %standard-phases
+           (add-after 'unpack 'pre-configure
+             (lambda* (#:key inputs #:allow-other-keys)
+               ;; Always convert string to unicode to avoid the following error
+               ;; when running "tegaki-build" in python2-tegaki-tools:
+               ;;
+               ;; sqlite3.ProgrammingError: You must not use 8-bit bytestrings
+               ;; unless you use a text_factory that can interpret 8-bit
+               ;; bytestrings (like text_factory = str).
+               ;; It is highly recommended that you instead just switch your
+               ;; application to Unicode strings.
+               (substitute* "tegaki/charcol.py"
+                 (("sqlite3.OptimizedUnicode")
+                  "lambda s: unicode(s, 'utf-8')"))
+               (substitute* "tegaki/engine.py"
+                 (("/usr(/local)?")
+                  (assoc-ref inputs "python2-tegaki-wagomu")))
+               #t))))))
+    ;; override inherited inputs
+    (inputs '())
+    (native-inputs '())
+    (propagated-inputs
+     `(("python2-tegaki-wagomu" ,python2-tegaki-wagomu)
+       ("python2-zinnia" ,python2-zinnia)))
+    (synopsis
+     "Chinese and Japanese Handwriting Recognition (Base python library)")
+    (license (list gpl2+ ; all files except...
+                   bsd-3 ; dictutils.py
+                   zpl2.1)))) ; minjson.py
-- 
cgit v1.2.3


From 58ac928925f4593bfc45c723c2f5cd2d93ba995b Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 13:53:26 +0800
Subject: gnu: Add python2-tegaki-pygtk.

* gnu/packages/language.scm (python2-tegaki-pygtk): New variable.
---
 gnu/packages/language.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 2ef4fed721..bc02ff9681 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -22,6 +22,7 @@
 (define-module (gnu packages language)
   #:use-module (gnu packages)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages ocr)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -29,6 +30,7 @@
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages xorg)
   #:use-module (guix packages)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
@@ -529,3 +531,39 @@ suitable for both the desktop and mobile devices.")
     (license (list gpl2+ ; all files except...
                    bsd-3 ; dictutils.py
                    zpl2.1)))) ; minjson.py
+
+(define-public python2-tegaki-pygtk
+  (package
+    (inherit python2-tegaki-wagomu)
+    (name "python2-tegaki-pygtk")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri "tegaki-pygtk" version))
+       (sha256
+        (base32
+         "1cip0azxhjdj2dg2z85cp1z3lz4qwx3w1j7z4xmcm7npapmsaqs2"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "pyc"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments python2-tegaki-wagomu)
+       ((#:phases _)
+        `(modify-phases %standard-phases
+           (add-after 'unpack 'fix-paths
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* "tegakigtk/fakekey.py"
+                 (("libX11.so.6" so)
+                  (string-append (assoc-ref inputs "libx11") "/lib/" so))
+                 (("libXtst.so.6" so)
+                  (string-append (assoc-ref inputs "libxtst") "/lib/" so)))
+               #t))))))
+    (inputs ; required for sending key strokes
+     `(("libx11" ,libx11)
+       ("libxtst" ,libxtst)))
+    (native-inputs '()) ; override inherited inputs
+    (propagated-inputs
+     `(("python2-pygtk" ,python2-pygtk)
+       ("python2-tegaki-python" ,python2-tegaki-python)))
+    (synopsis "Chinese and Japanese Handwriting Recognition (Base UI library)")
+    (license gpl2+))) ; all files
-- 
cgit v1.2.3


From dd97a9c4da44d490ea440f2ad774254ee26b99ac Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 13:56:56 +0800
Subject: gnu: Add python2-tegaki-tools.

* gnu/packages/language.scm (python2-tegaki-tools): New variable.
---
 gnu/packages/language.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index bc02ff9681..d12ca7451e 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -35,7 +35,7 @@
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
   #:use-module ((guix licenses)
-                #:select (bsd-3 gpl2 gpl2+ gpl3 perl-license zpl2.1))
+                #:select (bsd-3 gpl2 gpl2+ gpl3 gpl3+ perl-license zpl2.1))
   #:use-module (guix download)
   #:use-module (guix utils))
 
@@ -567,3 +567,30 @@ suitable for both the desktop and mobile devices.")
        ("python2-tegaki-python" ,python2-tegaki-python)))
     (synopsis "Chinese and Japanese Handwriting Recognition (Base UI library)")
     (license gpl2+))) ; all files
+
+(define-public python2-tegaki-tools
+  (package
+    (inherit python2-tegaki-wagomu)
+    (name "python2-tegaki-tools")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri "tegaki-tools" version))
+       (sha256
+        (base32
+         "0xxv97ggh2jgldw3r7y59lv3fhz733r6l7mdn6nh4m0gvb0ja971"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "pyc"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments python2-tegaki-wagomu)
+       ((#:phases _) '%standard-phases)))
+    (inputs
+     `(("python2-tegaki-pygtk" ,python2-tegaki-pygtk)))
+    ;; override inherited inputs
+    (native-inputs '())
+    (propagated-inputs '())
+    (synopsis "Chinese and Japanese Handwriting Recognition (Advanced tools)")
+    ;; Files in gifenc/ are licensed under gpl3+ while other files are licensed
+    ;; under gpl2+. Therefore, the combined work is licensed under gpl3+.
+    (license gpl3+)))
-- 
cgit v1.2.3


From e4f72a584bc23ad564b2ab2c0f4e71cc0edd41e2 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:00:36 +0800
Subject: gnu: Add python2-tegaki-recognize.

* gnu/packages/language.scm (python2-tegaki-recognize): New variable.
---
 gnu/packages/language.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index d12ca7451e..ad7cf2a4b3 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -35,8 +35,10 @@
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
   #:use-module ((guix licenses)
-                #:select (bsd-3 gpl2 gpl2+ gpl3 gpl3+ perl-license zpl2.1))
+                #:select
+                (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 perl-license zpl2.1))
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix utils))
 
 (define-public perl-lingua-en-findnumber
@@ -594,3 +596,55 @@ suitable for both the desktop and mobile devices.")
     ;; Files in gifenc/ are licensed under gpl3+ while other files are licensed
     ;; under gpl2+. Therefore, the combined work is licensed under gpl3+.
     (license gpl3+)))
+
+(define-public python2-tegaki-recognize
+  (let ((commit "eceec69fe651d0733c8c8752dae569d2283d0f3c")
+        (revision "1"))
+    (package
+      (inherit python2-tegaki-tools)
+      (name "python2-tegaki-recognize")
+      ;; version copied from 
+      (version (git-version "0.3.1" revision commit))
+      (source
+       (origin
+         ;; We use GIT-FETCH because 'tegaki-recognize.desktop.in' and
+         ;; 'tegaki-recognize.in' are missing in the tarball.
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/tegaki/tegaki.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "09mw2if9p885phbgah5f95q3fwy7s5b46qlmpxqyzfcnj6g7afr5"))
+         (file-name (git-file-name name version))
+         (modules `((guix build utils)
+                    (ice-9 ftw)
+                    (srfi srfi-26)
+                    ,@remove-pre-compiled-files-modules))
+         (snippet
+          `(begin
+             ;; remove unnecessary files with potentially different license
+             (for-each delete-file-recursively
+                       (scandir "."
+                                (negate (cut member <> '("tegaki-recognize"
+                                                         "." "..")))))
+             ,(remove-pre-compiled-files "pyc")
+             #t))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments python2-tegaki-tools)
+         ((#:phases _)
+          `(modify-phases %standard-phases
+             (add-after 'unpack 'chdir
+               (lambda _
+                 (chdir "tegaki-recognize")
+                 #t))
+             ;; 'setup.py' script does not support one of the Python build
+             ;; system's default flags, "--single-version-externally-managed"
+             (replace 'install
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (invoke "python" "setup.py" "install"
+                         (string-append "--prefix=" (assoc-ref outputs "out"))
+                         "--root=/")
+                 #t))))))
+      (synopsis "Chinese and Japanese Handwriting Recognition (Main program)")
+      (license gpl2+)))) ; all files
-- 
cgit v1.2.3


From 3ed30b88c3f0dfbfcad33fa139acdea65591e128 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:03:26 +0800
Subject: gnu: Add tegaki-zinnia-japanese.

* gnu/packages/language.scm (tegaki-zinnia-japanese): New variable.
---
 gnu/packages/language.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index ad7cf2a4b3..db5a7cb8d2 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -32,6 +32,7 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xorg)
   #:use-module (guix packages)
+  #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
   #:use-module ((guix licenses)
@@ -648,3 +649,40 @@ suitable for both the desktop and mobile devices.")
                  #t))))))
       (synopsis "Chinese and Japanese Handwriting Recognition (Main program)")
       (license gpl2+)))) ; all files
+
+(define-public tegaki-zinnia-japanese
+  (package
+    (inherit python2-tegaki-wagomu)
+    (name "tegaki-zinnia-japanese")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "1nmg9acxhcqly9gwkyb9m0hpy76fll91ywk4b1q4xms0ajxip1h7"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "Makefile"
+               (("/usr/local")
+                (assoc-ref outputs "out")))
+             #t)))))
+    ;; override inherited inputs
+    (inputs '())
+    (native-inputs
+     `(("python2-tegaki-tools" ,python2-tegaki-tools)))
+    (propagated-inputs '())
+    (native-search-paths
+     (list (search-path-specification
+            (variable "TEGAKI_MODEL_PATH")
+            (files '("share/tegaki/models")))))
+    (synopsis "Chinese and Japanese Handwriting Recognition (Model)")
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From c8bbd8088505022710345ae1b7102381e281c3d3 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:14:32 +0800
Subject: gnu: Add tegaki-zinnia-japanese-light.

* gnu/packages/language.scm (tegaki-zinnia-japanese-light): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index db5a7cb8d2..0f834568ea 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -686,3 +686,19 @@ suitable for both the desktop and mobile devices.")
             (files '("share/tegaki/models")))))
     (synopsis "Chinese and Japanese Handwriting Recognition (Model)")
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-zinnia-japanese-light
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-zinnia-japanese-light")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "0x0fs29ylqzxd6xvg51h7rigpbisd7q8v11df425ib2j792yfyf8"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 5fd567487294654e7b2d5e4b5d5986b842db6779 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:18:33 +0800
Subject: gnu: Add tegaki-zinnia-japanese-kyoiku.

* gnu/packages/language.scm (tegaki-zinnia-japanese-kyoiku): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 0f834568ea..0eef76d660 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -702,3 +702,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-zinnia-japanese-kyoiku
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-zinnia-japanese-kyoiku")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "0am94bcpmbzplxdnwn9gk15sgaizvcfhmv13mk14jjvx3419cvvx"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 8955412be1c05138153f1500a2593557b4348832 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:22:47 +0800
Subject: gnu: Add tegaki-zinnia-japanese-joyo.

* gnu/packages/language.scm (tegaki-zinnia-japanese-joyo): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 0eef76d660..6be09faa99 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -718,3 +718,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-zinnia-japanese-joyo
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-zinnia-japanese-joyo")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "1v0j40lzdyiz01ayws0b8r7fsdy2mr32658382kz4wyk883wzx2z"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From e06794645064f43ecd25b1759dd1afcf9973987d Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:27:15 +0800
Subject: gnu: Add tegaki-zinnia-simplified-chinese.

* gnu/packages/language.scm (tegaki-zinnia-simplified-chinese): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 6be09faa99..9daa579366 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -734,3 +734,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-zinnia-simplified-chinese
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-zinnia-simplified-chinese")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "18wq0jccv7lpnrfnzspyc110d6pj2v1i21xcx4fmgzz1lnln3fs5"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From ca1f28bd35fb699aac0f1d0bd2113dd51c49193b Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:30:08 +0800
Subject: gnu: Add tegaki-zinnia-simplified-chinese-light.

* gnu/packages/language.scm (tegaki-zinnia-simplified-chinese-light): New
variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 9daa579366..13dcd00318 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -750,3 +750,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-zinnia-simplified-chinese-light
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-zinnia-simplified-chinese-light")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "0v24yf0w0p03lb7fyx128a75mwzad166bigvlbrzqnad789qg1sr"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 0bfcc29ddf1ee04b33ea7e47b9a8bc5be2dc47ab Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:31:45 +0800
Subject: gnu: Add tegaki-zinnia-traditional-chinese.

* gnu/packages/language.scm (tegaki-zinnia-traditional-chinese): New
variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 13dcd00318..6a0273f0c1 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -766,3 +766,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-zinnia-traditional-chinese
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-zinnia-traditional-chinese")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "140nlp6hynrai2svs5670jjfw1za6ayflhyj2dl0bzsfgbk3447l"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From caee9806ac03371bb46120376a9d9cfc6773386b Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:33:27 +0800
Subject: gnu: Add tegaki-zinnia-traditional-chinese-light.

* gnu/packages/language.scm (tegaki-zinnia-traditional-chinese-light): New
variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 6a0273f0c1..75b702d24e 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -782,3 +782,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-zinnia-traditional-chinese-light
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-zinnia-traditional-chinese-light")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "1m6yk6a57vs9wg5y50qciwi1ahhmklp2mgsjysbj4mnyzv6yhcr2"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 6b32e91a4cf97fc2085fb6f815e780b74bb74045 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:34:45 +0800
Subject: gnu: Add tegaki-wagomu-japanese.

* gnu/packages/language.scm (tegaki-wagomu-japanese): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 75b702d24e..54e8867f1c 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -798,3 +798,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-wagomu-japanese
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-wagomu-japanese")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "0flj5id8xwsn7csrrzqz9prdikswnwm2wms0as2vzdpxzph1az4k"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From ee3dc52b3ff999772d3f45765ee5ad64f5d57427 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:35:45 +0800
Subject: gnu: Add tegaki-wagomu-japanese-kyoiku.

* gnu/packages/language.scm (tegaki-wagomu-japanese-kyoiku): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 54e8867f1c..ab94f6cba2 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -814,3 +814,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-wagomu-japanese-kyoiku
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-wagomu-japanese-kyoiku")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "0v8crfh8rdf6ndp16g52s5jlrrlwh73xp38zjn5i9dlacx8kfqg1"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 7c25904c98f5460c447c787440d5378cef52fc6a Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:37:41 +0800
Subject: gnu: Add tegaki-wagomu-japanese-joyo.

* gnu/packages/language.scm (tegaki-wagomu-japanese-joyo): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index ab94f6cba2..8877dbd817 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -830,3 +830,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-wagomu-japanese-joyo
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-wagomu-japanese-joyo")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "0wk8shpr963zp328g991qs6abpnacq4242003m687z2d6yp7nph2"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 708c6857c1f205ac5cdef667f80fe2220ef291a3 Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Thu, 8 Aug 2019 14:40:35 +0800
Subject: gnu: Add tegaki-wagomu-simplified-chinese.

* gnu/packages/language.scm (tegaki-wagomu-simplified-chinese): New variable.
---
 gnu/packages/language.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 8877dbd817..81f96a3870 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -846,3 +846,19 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+(define-public tegaki-wagomu-simplified-chinese
+  (package
+    (inherit tegaki-zinnia-japanese)
+    (name "tegaki-wagomu-simplified-chinese")
+    (version "0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (tegaki-release-uri name version "zip"))
+       (sha256
+        (base32
+         "0wqprynigqxqxv128i1smh81gxvmjj056d9qpznxa3n9f5ymlbj6"))
+       (modules remove-pre-compiled-files-modules)
+       (snippet (remove-pre-compiled-files "model"))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 0ed97e69805253656df929a6ad678016aa81f08a Mon Sep 17 00:00:00 2001
From: Alex Vong 
Date: Wed, 14 Aug 2019 16:19:25 +0800
Subject: gnu: Add tegaki-wagomu-traditional-chinese.

* gnu/packages/language.scm (tegaki-wagomu-traditional-chinese): New
variable.
---
 gnu/packages/language.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 81f96a3870..1ed2483615 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -862,3 +862,24 @@ suitable for both the desktop and mobile devices.")
        (modules remove-pre-compiled-files-modules)
        (snippet (remove-pre-compiled-files "model"))))
     (license lgpl2.1))) ; all files
+
+;;; Upstream does not provide the source for tegaki-wagomu-traditional-chinese.
+;;; Therefore, we use the source for tegaki-zinnia-traditional-chinese and
+;;; patch the Makefile accordingly.
+(define-public tegaki-wagomu-traditional-chinese
+  (package
+    (inherit tegaki-zinnia-traditional-chinese)
+    (name "tegaki-wagomu-traditional-chinese")
+    (arguments
+     (substitute-keyword-arguments
+         (package-arguments tegaki-zinnia-traditional-chinese)
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+           (replace 'configure
+             (lambda args
+               (let ((configure (assq-ref ,phases 'configure)))
+                 (apply configure args))
+               (substitute* "Makefile"
+                 (("zinnia") "wagomu"))
+               #t))))))
+    (license lgpl2.1))) ; all files
-- 
cgit v1.2.3


From 9e8e252026f558933bdd9cfc26a75d13954b3e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 17 Sep 2019 10:14:27 +0200
Subject: gnu: guix: Update to 1h2qlbb.

Fixes .
Reported by Mikhail Kryshen .

* gnu/packages/package-management.scm (guix): Update to 1h2qlbb.
---
 gnu/packages/package-management.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 18e8a3853f..a56c738e78 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -123,8 +123,8 @@
   ;; Note: the 'update-guix-package.scm' script expects this definition to
   ;; start precisely like this.
   (let ((version "1.0.1")
-        (commit "cc98b00857e29074de96a6ed60e325cdfffaea1a")
-        (revision 5))
+        (commit "0ed97e69805253656df929a6ad678016aa81f08a")
+        (revision 6))
     (package
       (name "guix")
 
@@ -140,7 +140,7 @@
                       (commit commit)))
                 (sha256
                  (base32
-                  "0r5v4a0lyvn97gvp1q6algpw91k77r36vlnxx8w4s0c6r767b6z3"))
+                  "1h2qlbbdqi72jslx17gp2cak5494nbm8j44rz57lnplnfcn6iwaw"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (build-system gnu-build-system)
       (arguments
-- 
cgit v1.2.3


From ae71bef532d6b1c9d1481a3ac65827f148b1e45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 17 Sep 2019 11:31:37 +0200
Subject: gnu: go@1.12: Apply patch from a build phase.

This is a followup to b938892551816aedd01fd32b7eb1d5e061afce32.

* gnu/packages/golang.scm (go-1.12)[source]: Remove 'patches'.
[arguments]: In 'pre-build' phase, invoke "patch".
[native-inputs]: Add "go-skip-gc-test.patch".
---
 gnu/packages/golang.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 128e62beef..51be20b066 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -409,8 +409,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                            name version ".src.tar.gz"))
        (sha256
         (base32
-         "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m"))
-       (patches (search-patches "go-skip-gc-test.patch"))))
+         "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m"))))
     (arguments
      (substitute-keyword-arguments (package-arguments go-1.4)
        ((#:phases phases)
@@ -425,6 +424,12 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                        (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))
                       (output (assoc-ref outputs "out")))
 
+                 ;; Having the patch in the 'patches' field of  breaks
+                 ;; the 'TestServeContent' test due to the fact that
+                 ;; timestamps are reset.  Thus, apply it from here.
+                 (invoke "patch" "-p2" "--force" "-i"
+                         (assoc-ref inputs "go-skip-gc-test.patch"))
+
                  ;; A side effect of these test scripts is testing
                  ;; cgo. Attempts at using cgo flags and directives with these
                  ;; scripts as specified here (https://golang.org/cmd/cgo/)
@@ -576,6 +581,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
                  #t)))))))
     (native-inputs
      `(("go" ,go-1.4)
+       ("go-skip-gc-test.patch" ,(search-patch "go-skip-gc-test.patch"))
        ,@(match (%current-system)
            ((or "armhf-linux" "aarch64-linux")
             `(("gold" ,binutils-gold)))
-- 
cgit v1.2.3


From ff1d80f3041bb64c8237435b81e90bd9b60079dd Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 14:00:40 +0300
Subject: gnu: youtube-dl: Update source uri.

* gnu/packages/video.scm (youtube-dl)[source]: Update to new upstream uri.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8e0362752e..422dbab57e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1495,8 +1495,8 @@ access to mpv's powerful playback capabilities.")
     (version "2019.09.12")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://github.com/rg3/youtube-dl/releases/"
-                                  "download/" version "/youtube-dl-"
+              (uri (string-append "https://github.com/ytdl-org/youtube-dl/"
+                                  "releases/download/" version "/youtube-dl-"
                                   version ".tar.gz"))
               (sha256
                (base32
-- 
cgit v1.2.3


From e905c8d6548f499bb958811d0520ce1846e9cc92 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 17 Sep 2019 16:04:15 +0200
Subject: gnu: fuse: Update to 2.9.9.

* gnu/packages/linux.scm (fuse): Update to 2.9.9.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c9baecfa28..8bdc6bdaf6 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2119,7 +2119,7 @@ processes currently causing I/O.")
 (define-public fuse
   (package
     (name "fuse")
-    (version "2.9.8")
+    (version "2.9.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/libfuse/libfuse/releases/"
@@ -2127,7 +2127,7 @@ processes currently causing I/O.")
                                   "/fuse-" version ".tar.gz"))
               (sha256
                (base32
-                "1qxg1r1mgysfq6qakmvid2njph3lr00w0swvydsfl9ymilfzi12y"))
+                "1ddlq6kzxilccgbvxjfx80jx6kamgw4sv49phks2zhlcc1frvrnh"))
               (patches (search-patches "fuse-overlapping-headers.patch"))))
     (build-system gnu-build-system)
     (inputs `(("util-linux" ,util-linux)))
-- 
cgit v1.2.3


From 9e8b549fe6601d31ada0771a32d0b21928acb94c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 17 Sep 2019 13:13:01 +0200
Subject: gnu: perl-clone: Update to 0.43.

* gnu/packages/perl.scm (perl-clone): Update to 0.43.
---
 gnu/packages/perl.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 56a857c0f8..d104c2434c 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -1266,14 +1266,14 @@ arrays for their internal representation.")
 (define-public perl-clone
   (package
     (name "perl-clone")
-    (version "0.42")
+    (version "0.43")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://cpan/authors/id/G/GA/GARU/"
+              (uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/"
                                   "Clone-" version ".tar.gz"))
               (sha256
                (base32
-                "1r87rdm0nilfayxwlzvylwc8r3hr5m24180x437j30qpizdk1aal"))))
+                "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr"))))
     (build-system perl-build-system)
     (synopsis "Recursively copy Perl datatypes")
     (description
-- 
cgit v1.2.3


From cadf846bea46a8e3acd26c0bfceb4f3e39c1655b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 17 Sep 2019 15:04:40 +0200
Subject: gnu: elixir: Don't use unstable tarball.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/elixir.scm (elixir)[source]: Use GIT-FETCH & GIT-FILE-NAME.
[arguments]: Add ‘make-git-checkout-writable’ phase.
---
 gnu/packages/elixir.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index 2a1d99452f..88ada71aea 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -24,7 +24,7 @@
 (define-module (gnu packages elixir)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
-  #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages erlang)
@@ -34,15 +34,16 @@
   (package
     (name "elixir")
     (version "1.8.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/elixir-lang/elixir"
-                                  "/archive/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0ddqxw24zdqlg7glzk22m7qjal8f18divzp364a6gi1bv6rg16yg"))
-	      (patches (search-patches "elixir-path-length.patch"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elixir-lang/elixir.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq"))
+       (patches (search-patches "elixir-path-length.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -51,7 +52,11 @@
                                          (assoc-ref %outputs "out")))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'replace-paths
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
+         (add-after 'make-git-checkout-writable 'replace-paths
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (substitute* '("lib/elixir/lib/system.ex"
-- 
cgit v1.2.3


From 530680dfaf3b735465c2d176f231ab95616f42a9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 17 Sep 2019 16:01:38 +0200
Subject: gnu: ncmpc: Update to 0.35.

* gnu/packages/mpd.scm (ncmpc): Update to 0.35.
---
 gnu/packages/mpd.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index e8b1e6e0b1..fafb61c681 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -195,7 +195,7 @@ player daemon.")
 (define-public ncmpc
   (package
     (name "ncmpc")
-    (version "0.34")
+    (version "0.35")
     (source (origin
               (method url-fetch)
               (uri
@@ -204,7 +204,7 @@ player daemon.")
                               "/ncmpc-" version ".tar.xz"))
               (sha256
                (base32
-                "0mz8r6vc4zn5sa3hlq4ii74qcrkh01nbg784zcwahgz8g3fb3i8l"))))
+                "0hfjvm1p0z7x6gfn5xhl5c0jsmidvz0qfl04pq45x4chh9iiwkxx"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From 777db6b845e3bf7d5be07c9414f09cef78168fc8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 17 Sep 2019 16:01:49 +0200
Subject: gnu: unbound: Update to 1.9.3.

* gnu/packages/dns.scm (unbound): Update to 1.9.3.
---
 gnu/packages/dns.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index ae2e5cf8fa..8b8622813b 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -373,14 +373,14 @@ to result in system-wide compromise.")
 (define-public unbound
   (package
     (name "unbound")
-    (version "1.9.2")
+    (version "1.9.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.unbound.net/downloads/unbound-"
                            version ".tar.gz"))
        (sha256
-        (base32 "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg"))))
+        (base32 "1ykdy62sgzv33ggkmzwx2h0ifm7hyyxyfkb4zckv7gz4f28xsm8v"))))
     (build-system gnu-build-system)
     (outputs '("out" "python"))
     (native-inputs
-- 
cgit v1.2.3


From 34583ec6e3995f5dd1ebf549265f0d64bbf23ab7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 17 Sep 2019 17:00:02 +0200
Subject: gnu: Add festival.

* gnu/packages/speech.scm (festival): New variable.
---
 gnu/packages/speech.scm | 218 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)

diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index dbdbe7ea49..10637e6b89 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 Leo Famulari 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2016 Kei Kebreau 
+;;; Copyright © 2019 Ricardo Wurmus 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30,12 +31,15 @@
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages emacs)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages textutils))
 
 (define-public espeak
@@ -220,3 +224,217 @@ to improve their productivity with speech engines, like eSpeak.  Sonic can also
 be used by the sighted.")
     (home-page "https://github.com/waywardgeek/sonic")
     (license license:asl2.0)))
+
+(define-public festival
+  (package
+    (name "festival")
+    (version "2.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://festvox.org/packed/festival/"
+                                  (version-major+minor version)
+                                  "/festival-" version "-release.tar.gz"))
+              (sha256
+               (base32
+                "1d5415nckiv19adxisxfm1l1xxfyw88g87ckkmcr0lhjdd10g42c"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; there is no test target
+       #:make-flags
+       (list (string-append "RM="
+                            (assoc-ref %build-inputs "coreutils")
+                            "/bin/rm")
+             (string-append "ECHO_N="
+                            (assoc-ref %build-inputs "coreutils")
+                            "/bin/printf \"%s\""))
+       #:parallel-build? #f ; not supported
+       #:modules ((guix build gnu-build-system)
+                  (guix build utils)
+                  (guix build emacs-utils))
+       #:imported-modules (,@%gnu-build-system-modules
+                           (guix build emacs-utils))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'unpack-and-patch-speech-tools
+           (lambda* (#:key inputs #:allow-other-keys)
+             (invoke "tar" "-C" ".."
+                     "-xf" (assoc-ref inputs "speech-tools"))
+             (with-directory-excursion "../speech_tools"
+               (substitute* '("config/rules/modules.mak"
+                              "config/rules/test_make_rules.mak"
+                              "config/make_system.mak")
+                 (("/bin/sh") (which "sh"))))
+             #t))
+         (add-after 'unpack 'patch-/bin/sh
+           (lambda _
+             (substitute* '("config/test_make_rules"
+                            "config/make_system.mak")
+               (("/bin/sh") (which "sh")))
+             #t))
+         (add-before 'build 'build-speech-tools
+           (lambda* (#:key configure-flags make-flags #:allow-other-keys)
+             (with-directory-excursion "../speech_tools"
+               (apply invoke "sh" "configure"
+                      (string-append "CONFIG_SHELL=" (which "sh"))
+                      (string-append "SHELL=" (which "sh"))
+                      configure-flags)
+               (apply invoke "make" make-flags))))
+         (add-after 'build 'build-documentation
+           (lambda _
+             (with-directory-excursion "doc"
+               (invoke "make" "festival.info"))))
+         (add-after 'unpack 'set-installation-directories
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* "config/project.mak"
+                 (("^FTLIBDIR.*")
+                  (string-append "FTLIBDIR=" out "/share/festival/lib")))
+               (substitute* "config/systems/default.mak"
+                 (("^INSTALL_PREFIX.*")
+                  (string-append "INSTALL_PREFIX=" out)))
+               #t)))
+         (add-after 'install 'actually-install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               ;; Install Speech Tools first
+               (with-directory-excursion "../speech_tools"
+                 ;; Target directories
+                 (for-each (lambda (dir)
+                             (mkdir-p (string-append out dir)))
+                           '("/bin"
+                             "/lib"
+                             "/include/speech_tools/"
+                             "/include/speech_tools/instantiate"
+                             "/include/speech_tools/ling_class"
+                             "/include/speech_tools/rxp"
+                             "/include/speech_tools/sigpr"
+                             "/include/speech_tools/unix"))
+                 ;; Install binaries
+                 (for-each (lambda (file)
+                             (install-file file (string-append out "/bin")))
+                           (find-files "bin" ".*"))
+                 (for-each (lambda (file)
+                             (delete-file (string-append out "/bin/" file)))
+                           '("est_gdb" "est_examples" "est_program"))
+                 ;; Install libraries
+                 (for-each (lambda (file)
+                             (install-file file (string-append out "/lib")))
+                           (find-files "lib" "lib.*\\.so.*"))
+
+                 ;; Install headers
+                 (for-each
+                  (lambda (dir)
+                    (for-each
+                     (lambda (header)
+                       (install-file header
+                                     (string-append out "/include/speech_tools/" dir)))
+                     (find-files (string-append "include/" dir)
+                                 "\\.h$")))
+                  '("." "instantiate" "ling_class" "rxp" "sigpr" "unix")))
+
+               ;; Unpack files that will be installed together with the
+               ;; Festival libraries.
+               (invoke "tar" "--strip-components=1"
+                       "-xvf" (assoc-ref inputs "festvox-cmu"))
+               (invoke "tar" "--strip-components=1"
+                       "-xf" (assoc-ref inputs "festvox-poslex"))
+
+               ;; Install Festival
+               (let ((bin (string-append out "/bin"))
+                     (incdir (string-append out "/include/festival"))
+                     (share (string-append out "/share/festival"))
+                     (info (string-append out "/share/info")))
+                 (for-each (lambda (executable)
+                             (install-file executable bin))
+                           '("src/main/festival"
+                             "src/main/festival_client"
+                             "examples/benchmark"
+                             "examples/dumpfeats"
+                             "examples/durmeanstd"
+                             "examples/latest"
+                             "examples/make_utts"
+                             "examples/powmeanstd"
+                             "examples/run-festival-script"
+                             "examples/saytime"
+                             "examples/scfg_parse_text"
+                             "examples/text2pos"
+                             "examples/text2wave"))
+
+                 ;; Documentation
+                 (install-file "doc/info/festival.info" info)
+
+                 ;; Headers
+                 (mkdir-p incdir)
+                 (for-each (lambda (header)
+                             (install-file header
+                                           (string-append incdir "/"
+                                                          (dirname header))))
+                           (find-files "src/include" "\\.h$"))
+
+                 ;; Data
+                 (mkdir-p share)
+                 (for-each (lambda (file)
+                             (install-file file
+                                           (string-append share "/"
+                                                          (dirname file))))
+                           (find-files "lib" ".*"))
+                 (for-each delete-file
+                           (append (find-files share "Makefile")
+                                   (find-files bin "Makefile")))))
+             #t))
+         (add-after 'actually-install 'install-emacs-mode
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((emacs-dir (string-append (assoc-ref outputs "out")
+                                             "/share/emacs/site-lisp")))
+               (install-file "lib/festival.el" emacs-dir)
+               (emacs-generate-autoloads ,name emacs-dir)
+               #t)))
+         ;; Rebuild the very old configure script that is confused by extra
+         ;; arguments.
+         (add-before 'configure 'bootstrap
+           (lambda _ (invoke "autoreconf" "-vif"))))))
+    (inputs
+     `(("ncurses" ,ncurses)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("texinfo" ,texinfo)
+       ("emacs" ,emacs-minimal)
+       ("festvox-cmu"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "http://festvox.org/packed/festival/"
+                               (version-major+minor version)
+                               "/festlex_CMU.tar.gz"))
+           (sha256
+            (base32
+             "01vwidqhhg2zifvk1gby91mckg1z2pv2mj6lihvdaifakf8k1561"))))
+       ("festvox-poslex"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "http://festvox.org/packed/festival/"
+                               (version-major+minor version)
+                               "/festlex_POSLEX.tar.gz"))
+           (sha256
+            (base32
+             "18wywilxaqwy63lc47p5g5529mpxhslibh1bjij0snxx5mjf7ip7"))))
+       ("speech-tools"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "http://festvox.org/packed/festival/"
+                               (version-major+minor version)
+                               "/speech_tools-" version "-release.tar.gz"))
+           (sha256
+            (base32
+             "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"))))))
+    (home-page "http://www.cstr.ed.ac.uk/projects/festival/")
+    (synopsis "Speech synthesis system")
+    (description "Festival offers a general framework for building speech
+synthesis systems as well as including examples of various modules.  As a
+whole it offers full text to speech through a number APIs: from shell level,
+though a Scheme command interpreter, as a C++ library, from Java, and an Emacs
+interface.  Festival is multi-lingual though English is the most advanced.
+The system is written in C++ and uses the Edinburgh Speech Tools Library for
+low level architecture and has a Scheme (SIOD) based command interpreter for
+control.")
+    (license (license:non-copyleft "file://COPYING"))))
-- 
cgit v1.2.3


From 80e4e9dda6e87c7498dd9cc739978fa7f6311820 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 15:39:43 +0300
Subject: gnu: Add rust-percent-encoding-1.

* gnu/packages/crates-io.scm (rust-percent-encoding-1): New variable.
---
 gnu/packages/crates-io.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 906a8e66bf..e74457dd38 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2035,6 +2035,20 @@ the @code{take_while} predicate returned false after dropping the @code{by_ref}.
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-percent-encoding-1
+  (package
+    (inherit rust-percent-encoding)
+    (name "rust-percent-encoding")
+    (version "1.0.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "percent-encoding" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0cgq08v1fvr6bs5fvy390cz830lq4fak8havdasdacxcw790s09i"))))))
+
 (define-public rust-permutohedron
   (package
     (name "rust-permutohedron")
-- 
cgit v1.2.3


From de13223a11b98e75ab54d8cc39ac52e2c9d22be7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 15:43:35 +0300
Subject: gnu: Add rust-rustc-hash.

* gnu/packages/crates-io.scm (rust-rustc-hash): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e74457dd38..b78642a3cf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2482,6 +2482,26 @@ system calls.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-rustc-hash
+  (package
+    (name "rust-rustc-hash")
+    (version "1.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "rustc-hash" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "114bf72466bl63i5hh8fgqfnhihs0w1m9c9jz505095agfixnvg0"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/rust-lang-nursery/rustc-hash")
+    (synopsis "Speedy, non-cryptographic hash used in rustc")
+    (description
+     "This package provides a speedy, non-cryptographic hash used in rustc.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-rustc-serialize
   (package
     (name "rust-rustc-serialize")
-- 
cgit v1.2.3


From 86d452f946b2e05866293bcbdb2a9b7d6533962a Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 15:47:59 +0300
Subject: gnu: Add rust-static-assertions.

* gnu/packages/crates-io.scm (rust-static-assertions): New variable.
---
 gnu/packages/crates-io.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b78642a3cf..840ca6b718 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2938,6 +2938,26 @@ deeply recursive algorithms that may accidentally blow the stack.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-static-assertions
+  (package
+    (name "rust-static-assertions")
+    (version "0.3.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "static-assertions" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1lw33i89888yb3x29c6dv4mrkg3534n0rlg3r7qzh4p58xmv6gkz"))))
+    (build-system cargo-build-system)
+    (home-page "https://github.com/nvzqz/static-assertions-rs")
+    (synopsis "Compile-time assertions for rust")
+    (description
+     "This package provides compile-time assertions to ensure that invariants
+are met.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-stdweb-internal-runtime
   (package
     (name "rust-stdweb-internal-runtime")
-- 
cgit v1.2.3


From c800a30744bee99086fc98d94be572818f2869f2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 15:49:07 +0300
Subject: gnu: Add rust-strsim-0.8.

* gnu/packages/crates-io.scm (rust-strsim-0.8): New variable.
---
 gnu/packages/crates-io.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 840ca6b718..b9acda91f1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3045,6 +3045,20 @@ metrics.  It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro,
 and Jaro-Winkler.")
     (license license:expat)))
 
+(define-public rust-strsim-0.8
+  (package
+    (inherit rust-strsim)
+    (name "rust-strsim")
+    (version "0.8.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "strsim" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0sjsm7hrvjdifz661pjxq5w4hf190hx53fra8dfvamacvff139cf"))))))
+
 (define-public rust-synstructure-test-traits
   (package
     (name "rust-synstructure-test-traits")
-- 
cgit v1.2.3


From 56b695196feb17407b48dcb2562f89484ff69793 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 15:54:17 +0300
Subject: gnu: Add rust-term.

* gnu/packages/crates-io.scm (rust-term): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b9acda91f1..79eee6ed32 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3164,6 +3164,30 @@ directories.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-term
+  (package
+    (name "rust-term")
+    (version "0.4.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "term" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1wbh8ngqkqr3f6wz902yplf60bd5yapnckvrkgmzp5nffi7n8qzs"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-kernel32-sys" ,rust-kernel32-sys)
+        ("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/Stebalien/term")
+    (synopsis "Terminal formatting library")
+    (description
+     "This package provides a terminal formatting library in rust.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-termcolor
   (package
     (name "rust-termcolor")
-- 
cgit v1.2.3


From 14f3a7e37314451b9b93d7b7536f3ae3dec1ed68 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:10:46 +0300
Subject: gnu: Add rust-clang-sys-0.26.

* gnu/packages/crates-io.scm (rust-clang-sys-0.26): New variable.
---
 gnu/packages/crates-io.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 79eee6ed32..8c68f036b5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -386,6 +386,35 @@ depending on a large number of #[cfg] parameters.  Structured like an
      "This package provides Rust bindings for @code{libclang}.")
     (license license:asl2.0)))
 
+(define-public rust-clang-sys-0.26
+  (package
+    (inherit rust-clang-sys)
+    (name "rust-clang-sys")
+    (version "0.26.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "clang-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1r50dwy5hj5gq07dn0qf8222d07qv0970ymx0j8n9779yayc3w3f"))))
+    (arguments
+     `(#:cargo-inputs
+       (("rust-glob" ,rust-glob-0.2)
+        ("rust-libc" ,rust-libc)
+        ("rust-libloading" ,rust-libloading))
+       #:cargo-development-inputs
+       (("rust-glob" ,rust-glob-0.2))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-environmental-variable
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((clang (assoc-ref inputs "libclang")))
+               (setenv "LIBCLANG_PATH"
+                       (string-append clang "/lib")))
+            #t)))))))
+
 (define-public rust-clicolors-control
   (package
     (name "rust-clicolors-control")
@@ -412,6 +441,31 @@ depending on a large number of #[cfg] parameters.  Structured like an
 colorization.")
     (license license:expat)))
 
+(define-public rust-clippy
+  (package
+    (name "rust-clippy")
+    (version "0.0.302")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "clippy" version))
+        (file-name
+          (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "1562x3sq9mgmc8j39gd34wqm7ybrdvpmj7cc1n450gwsawayw4fr"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs
+        (("rust-term" ,rust-term))))
+    (home-page "https://github.com/rust-lang/rust-clippy")
+    (synopsis
+      "A bunch of helpful lints to avoid common pitfalls in Rust.")
+    (description
+      "This package provides a bunch of helpful lints to avoid common pitfalls in Rust.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-cloudabi
   (package
     (name "rust-cloudabi")
-- 
cgit v1.2.3


From 7617f231c0ddb66f9cb7e59af88f83f13957464d Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:13:52 +0300
Subject: gnu: Add rust-num-traits-0.1.

* gnu/packages/crates-io.scm (rust-num-traits-0.1): New variable.
---
 gnu/packages/crates-io.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8c68f036b5..e1b7db2a98 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1977,6 +1977,24 @@ implementation (which is unstable / requires nightly).")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-num-traits-0.1
+  (package
+    (inherit rust-num-traits)
+    (name "rust-num-traits")
+    (version "0.1.43")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "num-traits" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0c9whknf2dm74a3cqirafy6gj83a76gl56g4v3g19k6lkwz13rcj"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-num-traits" ,rust-num-traits))))))
+
 (define-public rust-openssl-probe
   (package
     (name "rust-openssl-probe")
-- 
cgit v1.2.3


From 17b977ab54e28fb2da9eac4aa65fbe531fd7a84b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:15:50 +0300
Subject: gnu: Add rust-dtoa-0.2.

* gnu/packages/crates-io.scm (rust-dtoa-0.2): New variable.
---
 gnu/packages/crates-io.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e1b7db2a98..33357ab0d1 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -695,6 +695,20 @@ floating-point primitives to an @code{io::Write}.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-dtoa-0.2
+  (package
+    (inherit rust-dtoa)
+    (name "rust-dtoa")
+    (version "0.2.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "dtoa" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d"))))))
+
 (define-public rust-fallible-iterator
   (package
     (name "rust-fallible-iterator")
-- 
cgit v1.2.3


From c5d250d5dcc9889b1b0405a03f35292b61c5bc74 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:17:16 +0300
Subject: gnu: Add rust-itoa-0.1.

* gnu/packages/crates-io.scm (rust-itoa-0.1): New variable.
---
 gnu/packages/crates-io.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 33357ab0d1..56b3f88e12 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1276,6 +1276,20 @@ primitives to an @code{io::Write}.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-itoa-0.1
+ (package
+   (inherit rust-itoa)
+   (name "rust-itoa")
+   (version "0.1.1")
+   (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "itoa" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "18g7p2hrb3dk84z3frfgmszfc9hjb4ps9vp99qlb1kmf9gm8hc5f"))))))
+
 (define-public rust-jemalloc-sys
   (package
     (name "rust-jemalloc-sys")
-- 
cgit v1.2.3


From d7bec7535f67ac7432cb3f10d4b92fc21da2c8f9 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:21:31 +0300
Subject: gnu: Add rust-lock-api.

* gnu/packages/crates-io.scm (rust-lock-api): New variable.
---
 gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 56b3f88e12..3cbdc66d3b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1488,6 +1488,31 @@ allows loading dynamic libraries (also known as shared libraries) as well as use
 functions and static variables these libraries contain.")
     (license license:isc)))
 
+(define-public rust-lock-api
+  (package
+    (name "rust-lock-api")
+    (version "0.1.5")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "lock_api" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0b24q9mh258xa52ap636q1sxz0j5vrnp0hwbbh7ddjka3wwz3sv2"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-owning-ref" ,rust-owning-ref)
+        ("rust-scopeguard" ,rust-scopeguard-0.3))))
+    (home-page "https://github.com/Amanieu/parking_lot")
+    (synopsis "Wrappers to create fully-featured Mutex and RwLock types")
+    (description
+     "This package provides wrappers to create fully-featured @code{Mutex} and
+@code{RwLock} types.  It is compatible with @code{no_std}.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-log
   (package
     (name "rust-log")
-- 
cgit v1.2.3


From 61b10dd1bfca019c9f83e09d233852f58206f8b0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:29:04 +0300
Subject: gnu: Add rust-libnghttp2-sys.

* gnu/packages/crates-io.scm (rust-libnghttp2-sys): New variable.
---
 gnu/packages/crates-io.scm | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3cbdc66d3b..94a409a6f0 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -29,7 +29,8 @@
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages maths)
-  #:use-module (gnu packages pkg-config))
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages web))
 
 ;;;
 ;;; Please: Try to add new module packages in alphabetic order.
@@ -1883,6 +1884,33 @@ types as proposed in RFC 1158.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-libnghttp2-sys
+  (package
+    (name "rust-libnghttp2-sys")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libnghttp2-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0qr4lyh7righx9n22c7amlcpk906rn1jnb2zd6gdfpa3yi24s982"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc))))
+    (inputs
+     `(("nghttp2" ,nghttp2)))
+    (home-page "https://github.com/alexcrichton/nghttp2-rs")
+    (synopsis "FFI bindings for libnghttp2 (nghttp2)")
+    (description
+     "This package provides FFI bindings for libnghttp2 (nghttp2).")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-nodrop
   (package
     (name "rust-nodrop")
-- 
cgit v1.2.3


From fc4d385aba691ea2ec811116b1c6a04d8c2c1090 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:31:43 +0300
Subject: gnu: Add rust-libz-sys.

* gnu/packages/crates-io.scm (rust-libz-sys): New variable.
---
 gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 94a409a6f0..61681b121e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1911,6 +1911,42 @@ types as proposed in RFC 1158.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-libz-sys
+  (package
+    (name "rust-libz-sys")
+    (version "1.0.25")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libz-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1gjycyl2283525abks98bhxa4r259m617xfm5z52p3p3c8ry9d9f"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-cc" ,rust-cc)
+        ("rust-pkg-config" ,rust-pkg-config)
+        ("rust-vcpkg" ,rust-vcpkg))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-vendored-zlib
+           (lambda _
+             (delete-file-recursively "src/zlib")
+             #t)))))
+    (inputs
+     `(("pkg-config" ,pkg-config)
+       ("zlib" ,zlib)))
+    (home-page "https://github.com/rust-lang/libz-sys")
+    (synopsis "Bindings to the system libz library")
+    (description
+     "This package provides bindings to the system @code{libz} library (also
+known as zlib).")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-nodrop
   (package
     (name "rust-nodrop")
-- 
cgit v1.2.3


From ef05c6df02becb2e5849f23fa0d456b07122fa5e Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:35:48 +0300
Subject: gnu: Add rust-backtrace-sys.

* gnu/packages/crates-io.scm (rust-backtrace-sys): New variable.
---
 gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 61681b121e..e5ce4f1b43 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -159,6 +159,35 @@ support.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-backtrace-sys
+  (package
+    (name "rust-backtrace-sys")
+    (version "0.1.31")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "backtrace-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0as2pk77br4br04daywhivpi1ixxb8y2c7f726kj849dxys31a42"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-compiler-builtins"
+         ,rust-compiler-builtins)
+        ("rust-libc" ,rust-libc)
+        ("rust-rustc-std-workspace-core"
+         ,rust-rustc-std-workspace-core))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc))))
+    (home-page "https://github.com/rust-lang/backtrace-rs")
+    (synopsis "Bindings to the libbacktrace gcc library")
+    (description
+     "This package provides bindings to the libbacktrace gcc library.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-base-x
   (package
     (name "rust-base-x")
-- 
cgit v1.2.3


From a7debf9d7f655493e6c22936df6ade5d20a34ec6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:40:28 +0300
Subject: gnu: Add rust-dirs.

* gnu/packages/crates-io.scm (rust-dirs): New variable.
---
 gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e5ce4f1b43..7aa5289a29 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -666,6 +666,33 @@ hexadecimal, bas32, and base64.")
          (base32
           "17giv0n0n1r64z0dahfvkjy3ys517jxyhs8sd9lmgvcljpjyryxa"))))))
 
+(define-public rust-dirs
+  (package
+    (name "rust-dirs")
+    (version "1.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "dirs" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "02vigc566z5i6n9wr2x8sch39qp4arn89xhhrh18fhpm3jfc0ygn"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-winapi" ,rust-winapi))))
+    (home-page "https://github.com/soc/dirs-rs")
+    (synopsis "Abstractions for standard locations for various platforms")
+    (description
+     "This package provides a tiny low-level library that provides
+platform-specific standard locations of directories for config, cache and other
+data on Linux, Windows, macOS and Redox by leveraging the mechanisms defined by
+the XDG base/user directory specifications on Linux, the Known Folder API on
+Windows, and the Standard Directory guidelines on macOS.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-discard
   (package
     (name "rust-discard")
-- 
cgit v1.2.3


From 5e9fdf91896ae03d86cb1c5c98768b8d598646db Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:51:08 +0300
Subject: gnu: Add rust-openssl-src.

* gnu/packages/crates-io.scm (rust-openssl-src): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7aa5289a29..71c69a5d66 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2189,6 +2189,28 @@ system for OpenSSL.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-openssl-src
+  (package
+    (name "rust-openssl-src")
+    (version "111.6.0+1.1.1d")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "openssl-src" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "172xh95hp7aygahah1940kg1dnx60c5m80cwj5hgi8x7x0fxmhmr"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:cargo-inputs (("rust-cc" ,rust-cc))))
+    (home-page "https://github.com/alexcrichton/openssl-src-rs")
+    (synopsis "Source of OpenSSL for rust crates")
+    (description
+     "This package contains the source of OpenSSL and logic to build it.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-owning-ref
   (package
     (name "rust-owning-ref")
-- 
cgit v1.2.3


From 956e4aedeabc705411e37a5922f965fec2474c0a Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 16:54:31 +0300
Subject: gnu: Add rust-openssl-sys.

* gnu/packages/crates-io.scm (rust-openssl-sys): New variable.
---
 gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 71c69a5d66..27fdaa96a7 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -30,6 +30,7 @@
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages web))
 
 ;;;
@@ -2211,6 +2212,45 @@ system for OpenSSL.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-openssl-sys
+  (package
+    (name "rust-openssl-sys")
+    (version "0.9.49")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "openssl-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1168vivyqbzaxl48bvv9r1x714c03f5c1za8pv5x8fyj9gjxkypl"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-libc" ,rust-libc))
+       #:cargo-development-inputs
+       (("rust-autocfg" ,rust-autocfg)
+        ("rust-cc" ,rust-cc)
+        ("rust-openssl-src" ,rust-openssl-src)
+        ("rust-pkg-config" ,rust-pkg-config)
+        ("rust-vcpkg" ,rust-vcpkg))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'find-openssl
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl")))
+               (setenv "OPENSSL_DIR" openssl))
+             #t)))))
+    (inputs
+     `(("openssl" ,openssl)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/sfackler/rust-openssl")
+    (synopsis "FFI bindings to OpenSSL")
+    (description
+     "This package provides FFI bindings to OpenSSL for use in rust crates.")
+    (license license:expat)))
+
 (define-public rust-owning-ref
   (package
     (name "rust-owning-ref")
-- 
cgit v1.2.3


From e416c930084fbbed02f46f0197ce2fe2669b29b7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 17:26:27 +0300
Subject: gnu: Add rust-curl-sys.

* gnu/packages/crates-io.scm (rust-curl-sys): New variable.
---
 gnu/packages/crates-io.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 27fdaa96a7..4194e4c134 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -25,6 +25,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages llvm)
@@ -614,6 +615,51 @@ It is inspired by the Linux kernel's @code{crypto_memneq}.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-curl-sys
+  (package
+    (name "rust-curl-sys")
+    (version "0.4.20")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "curl-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "02542zmvl3fpdqf7ai4cqnamm4albx9j645dkjx5qr1myq8ax42y"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-libnghttp2-sys" ,rust-libnghttp2-sys)
+        ("rust-libz-sys" ,rust-libz-sys)
+        ("rust-openssl-sys" ,rust-openssl-sys)
+        ("rust-winapi" ,rust-winapi))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc)
+        ("rust-pkg-config" ,rust-pkg-config)
+        ("rust-openssl-src" ,rust-openssl-src)
+        ("rust-vcpkg" ,rust-vcpkg))
+        #:phases
+       (modify-phases %standard-phases
+        (add-after 'unpack 'find-openssl
+          (lambda* (#:key inputs #:allow-other-keys)
+            (let ((openssl (assoc-ref inputs "openssl")))
+              (setenv "OPENSSL_DIR" openssl))
+            #t)))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("curl" ,curl)
+       ("nghttp2" ,nghttp2)
+       ("openssl" ,openssl)
+       ("zlib" ,zlib)))
+    (home-page "https://github.com/alexcrichton/curl-rust")
+    (synopsis "Native bindings to the libcurl library")
+    (description
+     "This package provides native bindings to the @code{libcurl} library.")
+    (license license:expat)))
+
 (define-public rust-data-encoding
   (package
     (name "rust-data-encoding")
-- 
cgit v1.2.3


From b81e1ea589ccf807d56d03002c0b16f564dc2629 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 17:36:13 +0300
Subject: gnu: Add rust-libssh2-sys.

* gnu/packages/crates-io.scm (rust-libssh2-sys): New variable.
---
 gnu/packages/crates-io.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4194e4c134..1fd2094043 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web))
 
@@ -1592,6 +1593,52 @@ allows loading dynamic libraries (also known as shared libraries) as well as use
 functions and static variables these libraries contain.")
     (license license:isc)))
 
+(define-public rust-libssh2-sys
+  (package
+    (name "rust-libssh2-sys")
+    (version "0.2.12")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libssh2-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1zb6gsw795nq848nk5x2smzpfnn1s15wjlzjnvr8ihlz2l5x2549"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-libz-sys" ,rust-libz-sys)
+        ("rust-openssl-sys" ,rust-openssl-sys))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc)
+        ("rust-openssl-src" ,rust-openssl-src)
+        ("rust-pkg-config" ,rust-pkg-config)
+        ("rust-vcpkg" ,rust-vcpkg))
+      #:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'find-openssl
+          (lambda* (#:key inputs #:allow-other-keys)
+            (let ((openssl (assoc-ref inputs "openssl")))
+              (setenv "OPENSSL_DIR" openssl))
+            (delete-file-recursively "libssh2")
+            (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
+            #t)))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libssh2" ,libssh2)
+       ("openssl" ,openssl)
+       ("zlib" ,zlib)))
+    (home-page "https://github.com/alexcrichton/ssh2-rs")
+    (synopsis "Native bindings to the libssh2 library")
+    (description
+     "This package provides native rust bindings to the @code{libssh2} library.")
+    (license (list license:asl2.0
+                   license:expat))))
+
+
 (define-public rust-lock-api
   (package
     (name "rust-lock-api")
-- 
cgit v1.2.3


From 4bf8cd217a2d6d70f9bb506bbc1491cbeec172c3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 17:42:15 +0300
Subject: gnu: Add rust-libgit2-sys.

* gnu/packages/crates-io.scm (rust-libgit2-sys): New variable.
---
 gnu/packages/crates-io.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1fd2094043..e1a893a14d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -33,6 +33,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web))
 
 ;;;
@@ -1566,6 +1567,51 @@ the platform that libc is compiled for.")
     (license (list license:expat
                    license:asl2.0))))
 
+(define-public rust-libgit2-sys
+  (package
+    (name "rust-libgit2-sys")
+    (version "0.8.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libgit2-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) ))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-libc" ,rust-libc)
+        ("rust-libssh2-sys" ,rust-libssh2-sys)
+        ("rust-libz-sys" ,rust-libz-sys)
+        ("rust-openssl-sys" ,rust-openssl-sys))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc)
+        ("rust-pkg-config" ,rust-pkg-config))
+      #:phases
+      (modify-phases %standard-phases
+        (add-after 'unpack 'find-openssl
+          (lambda* (#:key inputs #:allow-other-keys)
+            (let ((openssl (assoc-ref inputs "openssl")))
+              (setenv "OPENSSL_DIR" openssl))
+            (delete-file-recursively "libgit2")
+            (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
+            (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
+            #t)))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libgit2" ,libgit2)
+       ("openssl" ,openssl)
+       ("zlib" ,zlib)))
+    (home-page "https://github.com/rust-lang/git2-rs")
+    (synopsis "Native bindings to the libgit2 library")
+    (description
+     "This package provides native rust bindings to the @code{libgit2} library.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-libloading
   (package
     (name "rust-libloading")
-- 
cgit v1.2.3


From 241bc53eaddf46a7ce58b5562893230605a3541b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 17:46:09 +0300
Subject: gnu: Add rust-libgit2-sys-0.7.

* gnu/packages/crates-io.scm (rust-libgit2-sys-0.7): New variable.
---
 gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e1a893a14d..c0163b8e05 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1612,6 +1612,34 @@ the platform that libc is compiled for.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-libgit2-sys-0.7
+  (package
+    (inherit rust-libgit2-sys)
+    (name "rust-libgit2-sys")
+    (version "0.7.11")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "libgit2-sys" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-curl-sys" ,rust-curl-sys)
+        ("rust-libc" ,rust-libc)
+        ("rust-libssh2-sys" ,rust-libssh2-sys)
+        ("rust-libz-sys" ,rust-libz-sys)
+        ("rust-openssl-sys" ,rust-openssl-sys))
+       #:cargo-development-inputs
+       (("rust-cc" ,rust-cc)
+        ("rust-pkg-config" ,rust-pkg-config))))
+   (inputs
+    `(("curl" ,curl)
+      ,@(package-inputs rust-libgit2-sys)))))
+
 (define-public rust-libloading
   (package
     (name "rust-libloading")
-- 
cgit v1.2.3


From 0cb01bb99dee40a4b6e038c886cf50ad9237e83c Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 18:30:51 +0300
Subject: gnu: Add rust-unreachable.

* gnu/packages/crates-io.scm (rust-unreachable): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c0163b8e05..948bb8748f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4118,6 +4118,28 @@ whitespace from a string.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-unreachable
+  (package
+    (name "rust-unreachable")
+    (version "1.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "unreachable" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0mps2il4xy2mjqc3appas27hhn2xmvixc3bzzhfrjj74gy3i0a1q"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-void" ,rust-void))))
+    (home-page "https://github.com/reem/rust-unreachable")
+    (synopsis "Unreachable code optimization hint in rust")
+    (description
+     "This package provides an unreachable code optimization hint in rust.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-unsafe-any
   (package
     (name "rust-unsafe-any")
-- 
cgit v1.2.3


From 03e22b2eee16a5958a112db48b2e94584ed37bf2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 18:57:16 +0300
Subject: gnu: Add rust-futures-core-preview.

* gnu/packages/crates-io.scm (rust-futures-core-preview): New variable.
---
 gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 948bb8748f..1b7989e072 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1057,6 +1057,28 @@ featuring zero allocations, composability, and iterator-like interfaces.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-futures-core-preview
+  (package
+    (name "rust-futures-core-preview")
+    (version "0.3.0-alpha.17")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "futures-core-preview" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1xaq8m609k6cz8xydwhwp8xxyxigabcw1w9ngycfy0bnkg7iq52b"))))
+    (build-system cargo-build-system)
+    (arguments
+     '(#:tests? #f)) ; The only tests are doc tests, which fail.
+    (home-page "https://rust-lang-nursery.github.io/futures-rs/")
+    (synopsis "Core traits and types in for the @code{futures} library.")
+    (description "This crate provides the core traits and types in for the
+@code{futures} library.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-futures-cpupool
   (package
     (name "rust-futures-cpupool")
-- 
cgit v1.2.3


From 7009d20ad3590dd163ffb075ae051ae1ac932cb6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 19:00:45 +0300
Subject: gnu: Add rust-futures-sink-preview.

* gnu/packages/crates-io.scm (rust-futures-sink-preview): New variable.
---
 gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1b7989e072..e2a404b54d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1124,6 +1124,30 @@ the computation on the threads themselves.")
     (license (list license:asl2.0
                    license:expat))))
 
+(define-public rust-futures-sink-preview
+  (package
+    (name "rust-futures-sink-preview")
+    (version "0.3.0-alpha.17")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "futures-sink-preview" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+         (base32
+          "1r4d0gy73hdxkh5g1lrhl1kjnwp6mywjgcj70v0z78b921da42a3"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs
+       (("rust-futures-core-preview" ,rust-futures-core-preview))))
+    (home-page "https://rust-lang-nursery.github.io/futures-rs/")
+    (synopsis  "Asynchronous `Sink` trait for the futures-rs library")
+    (description
+     "This package provides the asynchronous @code{Sink} trait for the
+futures-rs library.")
+    (license (list license:asl2.0
+                   license:expat))))
+
 (define-public rust-gcc
   (package
     (inherit rust-cc)
-- 
cgit v1.2.3


From 17bbd30d877cb361e6236ccb0e6b3166452f9214 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 17 Sep 2019 19:02:58 +0200
Subject: gnu: festival: Install missing info files.

Reported by reepca on the #guix IRC channel.

This is a follow-up to commit 34583ec6e3995f5dd1ebf549265f0d64bbf23ab7.

* gnu/packages/speech.scm (festival)[arguments]: Install missing info files.
---
 gnu/packages/speech.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 10637e6b89..6c62739ce8 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -361,7 +361,9 @@ be used by the sighted.")
                              "examples/text2wave"))
 
                  ;; Documentation
-                 (install-file "doc/info/festival.info" info)
+                 (for-each (lambda (file)
+                             (install-file file info))
+                           (find-files "doc/info/" "festival.info.*"))
 
                  ;; Headers
                  (mkdir-p incdir)
-- 
cgit v1.2.3


From 3a8d68badaca85122d91d8b7045daee87acb0aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
 
Date: Tue, 17 Sep 2019 22:23:42 +0200
Subject: gnu: emacs-elixir-mode: Use git-fetch.

Fixes a source instability reported by Josh Holland
in 

* gnu/packages/emacs-xyz.scm (emacs-elixir-mode)[source]:
Use GIT-FETCH & GIT-FILE-NAME.
---
 gnu/packages/emacs-xyz.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b2f057a439..28443ae7fd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -53,6 +53,7 @@
 ;;; Copyright © 2019 Jens Mølgaard 
 ;;; Copyright © 2019 Amin Bandali 
 ;;; Copyright © 2019 Jelle Licht 
+;;; Copyright © 2019 Björn Höfling 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18241,14 +18242,13 @@ Emacs that integrate with major modes like Org-mode.")
     (version "2.3.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://stable.melpa.org/packages/elixir-mode-"
-             version
-             ".tar"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elixir-editors/emacs-elixir.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "091cizxg1aw8bkj58y048mj020ssapjflav633z9bl6gmi10dy4v"))))
+        (base32 "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-pkg-info" ,emacs-pkg-info)))
-- 
cgit v1.2.3


From 7026ecc122c6470b9a2fbb88d4448a74b948647e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
 
Date: Tue, 17 Sep 2019 23:05:18 +0200
Subject: gnu: emacs-olivetti: Update to 1.8.0.

* gnu/packages/emacs-xyz.scm (emacs-olivetti)[version]: Update to 1.8.0.
[source]: Use github instead of melpa.
---
 gnu/packages/emacs-xyz.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 28443ae7fd..d684426091 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2126,15 +2126,16 @@ a command.")
 (define-public emacs-olivetti
   (package
     (name "emacs-olivetti")
-    (version "1.5.7")
+    (version "1.8.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://stable.melpa.org/packages/olivetti-"
-                    version ".el"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/rnkn/olivetti.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1yj2ylg46q0pw1xzlv2b0fv9x8p56x25284s9v2smwjr4vf0nwcj"))))
+                "0ba30swqxxbpa8866chymywnahby1hk670zzkz44q49328i2wksj"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/rnkn/olivetti")
     (synopsis "Emacs minor mode for a nice writing environment")
-- 
cgit v1.2.3


From f8ddfb505a51a2c794531e090dd7ee97022d1096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
 
Date: Tue, 17 Sep 2019 23:35:03 +0200
Subject: gnu: emacs-base16-theme: Update to 2.2.

* gnu/packages/emacs-xyz.scm (emacs-base16-theme): Update to 2.2.
[source]: Use github instead of melpa.
---
 gnu/packages/emacs-xyz.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d684426091..87edd4619e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4592,15 +4592,16 @@ board and goal value can be customized.")
 (define-public emacs-base16-theme
   (package
     (name "emacs-base16-theme")
-    (version "2.1")
+    (version "2.2")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://stable.melpa.org/packages/base16-theme-"
-                           version ".tar"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/belak/base16-emacs.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32
-         "0z6hrwz2jlz6jbr381rcqcqvx6hss5cad352klx07rark7zccacj"))))
+        (base32 "01w89g413s1da6rf94y1xnhw79cjy2bqb01yfjs58cy492cm0vr6"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/belak/base16-emacs")
     (synopsis "Base16 color themes for Emacs")
-- 
cgit v1.2.3


From dfcf79ac5943c68dc8013aa333add3f881e894aa Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 18 Sep 2019 09:55:04 +0200
Subject: gnu: festival: Include default voice.

* gnu/packages/speech.scm (festival)[arguments]: Install default voice.
[native-inputs]: Add default voice.
---
 gnu/packages/speech.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 6c62739ce8..220d542eda 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -337,7 +337,9 @@ be used by the sighted.")
                (invoke "tar" "--strip-components=1"
                        "-xvf" (assoc-ref inputs "festvox-cmu"))
                (invoke "tar" "--strip-components=1"
-                       "-xf" (assoc-ref inputs "festvox-poslex"))
+                       "-xvf" (assoc-ref inputs "festvox-poslex"))
+               (invoke "tar" "--strip-components=1"
+                       "-xvf" (assoc-ref inputs "default-voice"))
 
                ;; Install Festival
                (let ((bin (string-append out "/bin"))
@@ -420,6 +422,15 @@ be used by the sighted.")
            (sha256
             (base32
              "18wywilxaqwy63lc47p5g5529mpxhslibh1bjij0snxx5mjf7ip7"))))
+       ("default-voice"
+        ,(origin
+           (method url-fetch)
+           (uri (string-append "http://festvox.org/packed/festival/"
+                               (version-major+minor version)
+                               "/voices/festvox_kallpc16k.tar.gz"))
+           (sha256
+            (base32
+             "136hmsyiwnlg2qwa508dy0imf19mzrb5r3dmb2kg8kcyxnslm740"))))
        ("speech-tools"
         ,(origin
            (method url-fetch)
-- 
cgit v1.2.3


From a870b80046d532329762095683d8f9c33538eaf1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 18 Sep 2019 10:57:12 +0200
Subject: gnu: festival: Fix scripts.

* gnu/packages/speech.scm (festival)[arguments]: Fix broken shebangs in
scripts.
---
 gnu/packages/speech.scm | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 220d542eda..21d6027004 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -350,17 +350,23 @@ be used by the sighted.")
                              (install-file executable bin))
                            '("src/main/festival"
                              "src/main/festival_client"
-                             "examples/benchmark"
-                             "examples/dumpfeats"
-                             "examples/durmeanstd"
-                             "examples/latest"
-                             "examples/make_utts"
-                             "examples/powmeanstd"
-                             "examples/run-festival-script"
-                             "examples/saytime"
-                             "examples/scfg_parse_text"
-                             "examples/text2pos"
-                             "examples/text2wave"))
+                             "examples/benchmark"))
+                 (let ((scripts '("examples/dumpfeats"
+                                  "examples/durmeanstd"
+                                  "examples/latest"
+                                  "examples/make_utts"
+                                  "examples/powmeanstd"
+                                  "examples/run-festival-script"
+                                  "examples/saytime"
+                                  "examples/scfg_parse_text"
+                                  "examples/text2pos"
+                                  "examples/text2wave")))
+                   (substitute* scripts
+                     (("exec /tmp/guix-build.*/bin/festival")
+                      (string-append "exec " bin "/festival")))
+                   (for-each (lambda (script)
+                               (install-file script bin))
+                             scripts))
 
                  ;; Documentation
                  (for-each (lambda (file)
-- 
cgit v1.2.3


From 7bc46ecc34ceb042ff890e5d306d0a2a736e891d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 8 Sep 2019 14:35:44 +0200
Subject: doc: Add Guix Cookbook.

* .gitignore: Update ignore list.
* Makefile.am (assert-no-store-file-names): Exclude the cookbook.
* bootstrap: Generate po files for cookbook translations.
* doc/guix-cookbook.texi: New file.
* doc/local.mk (info_TEXINFOS): Add it; add a rule to build cookbook
translations.
* po/doc/local.mk (DOC_COOKBOOK_PO_FILES): New variable.
(EXTRA_DIST): Add cookbook pot file and po files.
(doc-po-update-cookbook-%): New target.
(doc-pot-update): Also update cookbook pot file.
(doc-po-update): Also update cookbook po files.
---
 .gitignore             |  31 +-
 Makefile.am            |   3 +-
 bootstrap              |  12 +-
 doc/guix-cookbook.texi | 821 +++++++++++++++++++++++++++++++++++++++++++++++++
 doc/local.mk           |   9 +-
 po/doc/local.mk        |  33 +-
 6 files changed, 890 insertions(+), 19 deletions(-)
 create mode 100644 doc/guix-cookbook.texi

diff --git a/.gitignore b/.gitignore
index 93d2ec9801..38cde42fca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,22 +29,23 @@
 /doc/*.1
 /doc/.dirstamp
 /doc/contributing.*.texi
-/doc/guix.*.aux
-/doc/guix.*.cp
-/doc/guix.*.cps
-/doc/guix.*.fn
-/doc/guix.*.fns
-/doc/guix.*.html
-/doc/guix.*.info
-/doc/guix.*.info-[0-9]
-/doc/guix.*.ky
-/doc/guix.*.pg
-/doc/guix.*.toc
-/doc/guix.*.t2p
-/doc/guix.*.tp
-/doc/guix.*.vr
-/doc/guix.*.vrs
+/doc/guix*.aux
+/doc/guix*.cp
+/doc/guix*.cps
+/doc/guix*.fn
+/doc/guix*.fns
+/doc/guix*.html
+/doc/guix*.info
+/doc/guix*.info-[0-9]
+/doc/guix*.ky
+/doc/guix*.pg
+/doc/guix*.toc
+/doc/guix*.t2p
+/doc/guix*.tp
+/doc/guix*.vr
+/doc/guix*.vrs
 /doc/guix.*.texi
+/doc/guix-cookbook.*.texi
 /doc/guix.aux
 /doc/guix.cp
 /doc/guix.cps
diff --git a/Makefile.am b/Makefile.am
index 7e3b5c1070..93d18d7df6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -814,7 +814,8 @@ assert-no-store-file-names:
 	$(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info			\
 	     --exclude=*.info-[0-9] --exclude=*.dot				\
 	     --exclude=*.eps --exclude-dir=bootstrap				\
-		 --exclude=guix-manual.pot --exclude=guix-manual.*.po		\
+	     --exclude=guix-manual.pot --exclude=guix-manual.*.po		\
+	     --exclude=guix-cookbook.pot --exclude=guix-cookbook.*.po		\
 	     --exclude=guix-prettify.el						\
 	     --exclude=ChangeLog*						\
 	     -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ;			\
diff --git a/bootstrap b/bootstrap
index c0b5af7677..c9e7a084a1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@
 set -e -x
 
 # Generate stubs for translations.
-langs=`find po/doc -type f -name '*.po' \
+langs=`find po/doc -type f -name 'guix-manual*.po' \
         | sed -e 's,guix-manual\.,,' \
         | xargs -n 1 -I{} basename {} .po`
 for lang in ${langs}; do
@@ -15,5 +15,15 @@ for lang in ${langs}; do
 	touch "po/doc/guix-manual.${lang}.po"
     fi
 done
+langs=`find po/doc -type f -name 'guix-cookbook*.po' \
+        | sed -e 's,guix-manual\.,,' \
+        | xargs -n 1 -I{} basename {} .po`
+for lang in ${langs}; do
+    if [ ! -e "doc/guix-cookbook.${lang}.texi" ]; then
+	echo "@setfilename guix-cookbook.${lang}.info" > "doc/guix-cookbook.${lang}.texi"
+	# Ensure .po file is newer.
+	touch "po/doc/guix-cookbook.${lang}.po"
+    fi
+done
 
 exec autoreconf -vfi
diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi
new file mode 100644
index 0000000000..66f94a0fe7
--- /dev/null
+++ b/doc/guix-cookbook.texi
@@ -0,0 +1,821 @@
+\input texinfo
+@c -*-texinfo-*-
+
+@c %**start of header
+@setfilename guix-cookbook.info
+@documentencoding UTF-8
+@settitle GNU Guix Cookbook
+@c %**end of header
+
+@copying
+Copyright @copyright{} 2019 Ricardo Wurmus@*
+Copyright @copyright{} 2019 Efraim Flashner@*
+Copyright @copyright{} 2019 Pierre Neidhardt@*
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+copy of the license is included in the section entitled ``GNU Free
+Documentation License''.
+@end copying
+
+@dircategory System administration
+@direntry
+* Guix cookbook: (guix-cookbook).    Tutorials and examples for GNU Guix.
+@end direntry
+
+@titlepage
+@title GNU Guix Cookbook
+@subtitle Tutorials and examples for using the GNU Guix Functional Package Manager
+@author The GNU Guix Developers
+
+@page
+@vskip 0pt plus 1filll
+
+@insertcopying
+@end titlepage
+
+@contents
+
+@c *********************************************************************
+@node Top
+@top GNU Guix Cookbook
+
+This document presents tutorials and detailed examples for GNU@tie{}Guix, a
+functional package management tool written for the GNU system.  Please
+@pxref{Top,,, guix, GNU Guix reference manual} for details about the system,
+its API, and related concepts.
+
+@c TRANSLATORS: You can replace the following paragraph with information on
+@c how to join your own translation team and how to report issues with the
+@c translation.
+If you would like to translate this document in your native language, consider
+joining the @uref{https://translationproject.org/domain/guix-cookbook.html,
+Translation Project}.
+
+@menu
+* Scheme tutorials::            Meet your new favorite language!
+* Packaging::                   Packaging tutorials
+* System Configuration::        Customizing the GNU System
+
+* Acknowledgments::             Thanks!
+* GNU Free Documentation License::  The license of this document.
+* Concept Index::               Concepts.
+
+@detailmenu
+ --- The Detailed Node Listing ---
+
+Scheme tutorials
+
+* A Scheme Crash Course::       Learn the basics of Scheme
+
+Packaging
+
+* Packaging Tutorial::          Let's add a package to Guix!
+
+System Configuration
+
+* Customizing the Kernel::      Creating and using a custom Linux kernel
+
+
+@end detailmenu
+@end menu
+
+@c *********************************************************************
+@node Scheme tutorials
+@chapter Scheme tutorials
+
+GNU@tie{}Guix is written in the general purpose programming language Scheme,
+and many of its features can be accessed and manipulated programmatically.
+You can use Scheme to generate package definitions, to modify them, to build
+them, to deploy whole operating systems, etc.
+
+Knowing the basics of how to program in Scheme will unlock many of the
+advanced features Guix provides --- and you don't even need to be an
+experienced programmer to use them!
+
+Let's get started!
+
+@node A Scheme Crash Course
+@section A Scheme Crash Course
+
+@cindex Scheme, crash course
+
+Guix uses the Guile implementation of Scheme.  To start playing with the
+language, install it with @code{guix install guile} and start a
+@uref{https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop,
+REPL} by running @code{guile} from the command line.
+
+Alternatively you can also run @code{guix environment --ad-hoc guile -- guile}
+if you'd rather not have Guile installed in your user profile.
+
+In the following examples we use the @code{>} symbol to denote the REPL
+prompt, that is, the line reserved for user input.  @xref{Using Guile
+Interactively,,, guile, GNU Guile Reference Manual}) for more details on the
+REPL.
+
+@itemize
+@item
+Scheme syntax boils down to a tree of expressions (or @emph{s-expression} in
+Lisp lingo).  An expression can be a literal such as numbers and strings, or a
+compound which is a parenthesized list of compounds and literals.  @code{#t}
+and @code{#f} stand for the booleans "true" and "false", respectively.
+
+Examples of valid expressions:
+
+@example scheme
+> "Hello World!"
+"Hello World!"
+> 17
+17
+> (display (string-append "Hello " "Guix" "\n"))
+"Hello Guix!"
+@end example
+
+@item
+This last example is a function call nested in another function call.  When a
+parenthesized expression is evaluated, the first term is the function and the
+rest are the arguments passed to the function.  Every function returns the
+last evaluated expression as its return value.
+
+@item
+Anonymous functions are declared with the @code{lambda} term:
+
+@example scheme
+> (lambda (x) (* x x))
+#:24:0 (x)>
+@end example
+
+The above procedure returns the square of its argument.  Since everything is
+an expression, the @code{lambda} expression returns an anonymous procedure,
+which can in turn be applied to an argument:
+
+@example scheme
+> ((lambda (x) (* x x)) 3)
+9
+@end example
+
+@item
+Anything can be assigned a global name with @code{define}:
+
+@example scheme
+> (define a 3)
+> (define square (lambda (x) (* x x)))
+> (square a)
+9
+@end example
+
+@item
+Procedures can be defined more concisely with the following syntax:
+
+@example scheme
+(define (square x) (* x x))
+@end example
+
+@item
+A list structure can be created with the @code{list} procedure:
+
+@example scheme
+> (list 2 a 5 7)
+(2 3 5 7)
+@end example
+
+@item
+The @emph{quote} disables evaluation of a parenthesized expression: the first
+term is not called over the other terms.  Thus it effectively returns a list
+of terms.
+
+@example scheme
+> '(display (string-append "Hello " "Guix" "\n"))
+(display (string-append "Hello " "Guix" "\n"))
+> '(2 a 5 7)
+(2 a 5 7)
+@end example
+
+@item
+The @emph{quasiquote} disables evaluation of a parenthesized expression until
+a comma re-enables it.  Thus it provides us with fine-grained control over
+what is evaluated and what is not.
+
+@example scheme
+> `(2 a 5 7 (2 ,a 5 ,(+ a 4)))
+(2 a 5 7 (2 3 5 7))
+@end example
+
+Note that the above result is a list of mixed elements: numbers, symbols (here
+@code{a}) and the last element is a list itself.
+
+@item
+Multiple variables can be named locally with @code{let}:
+
+@example scheme
+> (define x 10)
+> (let ((x 2)
+        (y 3))
+    (list x y))
+(2 3)
+> x
+10
+> y
+ERROR: In procedure module-lookup: Unbound variable: y
+@end example
+
+Use @code{let*} to allow later variable declarations to refer to earlier
+definitions.
+
+@example scheme
+> (let* ((x 2)
+         (y (* x 3)))
+    (list x y))
+(2 6)
+@end example
+
+@item
+The keyword syntax is @code{#:}; it is used to create unique identifiers.
+@pxref{Keywords,,, guile, GNU Guile Reference Manual}.
+
+@item
+The percentage @code{%} is typically used for read-only global variables in
+the build stage.  Note that it is merely a convention, like @code{_} in C.
+Scheme treats @code{%} exactly the same as any other letter.
+
+@item
+Modules are created with @code{define-module}.  For instance
+
+@example scheme
+(define-module (guix build-system ruby)
+  #:use-module (guix store)
+  #:export (ruby-build
+            ruby-build-system))
+@end example
+
+defines the module @code{guix build-system ruby} which must be located in
+@file{guix/build-system/ruby.scm} somewhere in the Guile load path.  It
+depends on the @code{(guix store)} module and it exports two variables,
+@code{ruby-build} and @code{ruby-build-system}.
+@end itemize
+
+For a more detailed introduction, check out
+@uref{http://www.troubleshooters.com/codecorn/scheme_guile/hello.htm, Scheme
+at a Glance}, by Steve Litt.
+
+One of the reference Scheme books is the seminal ``Structure and
+Interpretation of Computer Programs'', by Harold Abelson and Gerald Jay
+Sussman, with Julie Sussman.  You'll find a
+@uref{https://mitpress.mit.edu/sites/default/files/sicp/index.html, free copy
+online}, together with
+@uref{https://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-001-structure-and-interpretation-of-computer-programs-spring-2005/video-lectures/,
+videos of the lectures by the authors}.  The book is available in Texinfo
+format as the @code{sicp} Guix package.  Go ahead, run @code{guix install
+sicp} and start reading with @code{info sicp} (or with the Emacs Info reader).
+An @uref{https://sarabander.github.io/sicp/, unofficial ebook is also
+available}.
+
+You'll find more books, tutorials and other resources at
+@url{https://schemers.org/}.
+
+
+@c *********************************************************************
+@node Packaging
+@chapter Packaging
+
+@cindex packaging
+
+This chapter is dedicated to teaching you how to add packages to the
+collection of packages that come with GNU Guix.  This involves writing package
+definitions in Guile Scheme, organizing them in package modules, and building
+them.
+
+@menu
+* Packaging Tutorial::         A tutorial on how to add packages to Guix.
+@end menu
+
+@node Packaging Tutorial
+@section Packaging Tutorial
+
+GNU Guix stands out as the @emph{hackable} package manager, mostly because it
+uses @uref{https://www.gnu.org/software/guile/, GNU Guile}, a powerful
+high-level programming language, one of the
+@uref{https://en.wikipedia.org/wiki/Scheme_%28programming_language%29, Scheme}
+dialects from the
+@uref{https://en.wikipedia.org/wiki/Lisp_%28programming_language%29, Lisp family}.
+
+Package definitions are also written in Scheme, which empowers Guix in some
+very unique ways, unlike most other package managers that use shell scripts or
+simple languages.
+
+@itemize
+@item
+Use functions, structures, macros and all of Scheme expressiveness for your
+package definitions.
+
+@item
+Inheritance makes it easy to customize a package by inheriting from it and
+modifying only what is needed.
+ 
+@item
+Batch processing: the whole package collection can be parsed, filtered and
+processed.  Building a headless server with all graphical interfaces stripped
+out?  It's possible.  Want to rebuild everything from source using specific
+compiler optimization flags?  Pass the @code{#:make-flags "..."} argument to
+the list of packages.  It wouldn't be a stretch to think
+@uref{https://wiki.gentoo.org/wiki/USE_flag, Gentoo USE flags} here, but this
+goes even further: the changes don't have to be thought out beforehand by the
+packager, they can be @emph{programmed} by the user!
+@end itemize
+
+The following tutorial covers all the basics around package creation with Guix.
+It does not assume much knowledge of the Guix system nor of the Lisp language.
+The reader is only expected to be familiar with the command line and to have some
+basic programming knowledge.
+
+@subsection A "Hello World" package
+
+The “Defining Packages” section of the manual introduces the basics of Guix
+packaging (@pxref{Defining Packages,,, guix, GNU Guix Reference Manual}).  In
+the following section, we will partly go over those basics again.
+
+``GNU hello'' is a dummy project that serves as an idiomatic example for
+packaging.  It uses the GNU build system (@code{./configure && make && make
+install}).  Guix already provides a package definition which is a perfect
+example to start with.  You can look up its declaration with @code{guix edit
+hello} from the command line.  Let's see how it looks:
+
+@example scheme
+(define-public hello
+  (package
+    (name "hello")
+    (version "2.10")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/hello/hello-" version
+                                  ".tar.gz"))
+              (sha256
+               (base32
+                "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"))))
+    (build-system gnu-build-system)
+    (synopsis "Hello, GNU world: An example GNU package")
+    (description
+     "GNU Hello prints the message \"Hello, world!\" and then exits.  It
+serves as an example of standard GNU coding practices.  As such, it supports
+command-line arguments, multiple languages, and so on.")
+    (home-page "https://www.gnu.org/software/hello/")
+    (license gpl3+)))
+@end example
+
+As you can see, most of it is rather straightforward.  But let's review the
+fields together:
+
+@table @samp
+@item name
+The project name.  Using Scheme conventions, we prefer to keep it
+lower case, without underscore and using dash-separated words.
+
+@item source
+This field contains a description of the source code origin.  The
+@code{origin} record contains these fields:
+
+@enumerate
+@item  The method, here @code{url-fetch} to download via HTTP/FTP, but other methods
+    exist, such as @code{git-fetch} for Git repositories.
+@item  The URI, which is typically some @code{https://} location for @code{url-fetch}.  Here
+    the special `mirror://gnu` refers to a set of well known locations, all of
+    which can be used by Guix to fetch the source, should some of them fail.
+@item  The @code{sha256} checksum of the requested file.  This is essential to ensure
+    the source is not corrupted.  Note that Guix works with base32 strings,
+    hence the call to the @code{base32} function.
+@end enumerate
+
+@item build-system
+
+This is where the power of abstraction provided by the Scheme language really
+shines: in this case, the @code{gnu-build-system} abstracts away the famous
+@code{./configure && make && make install} shell invocations.  Other build
+systems include the @code{trivial-build-system} which does not do anything and
+requires from the packager to program all the build steps, the
+@code{python-build-system}, the @code{emacs-build-system}, and many more
+(@pxref{Build Systems,,, guix, GNU Guix Reference Manual}).
+
+@item synopsis
+It should be a concise summary of what the package does.  For many packages a
+tagline from the project's home page can be used as the synopsis.
+
+@item description
+Same as for the synopsis, it's fine to re-use the project description from the
+homepage.  Note that Guix uses Texinfo syntax.
+
+@item home-page
+Use HTTPS if available.
+
+@item license
+See @code{guix/licenses.scm} in the project source for a full list of
+available licenses.
+@end table
+
+Time to build our first package!  Nothing fancy here for now: we will stick to a
+dummy "my-hello", a copy of the above declaration.
+
+As with the ritualistic "Hello World" taught with most programming languages,
+this will possibly be the most "manual" approach.  We will work out an ideal
+setup later; for now we will go the simplest route.
+
+Save the following to a file @file{my-hello.scm}.
+
+@example scheme
+(use-modules (guix packages)
+             (guix download)
+             (guix build-system gnu)
+             (guix licenses))
+
+(package
+  (name "my-hello")
+  (version "2.10")
+  (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnu/hello/hello-" version
+                                ".tar.gz"))
+            (sha256
+             (base32
+              "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"))))
+  (build-system gnu-build-system)
+  (synopsis "Hello, Guix world: An example custom Guix package")
+  (description
+   "GNU Hello prints the message \"Hello, world!\" and then exits.  It
+serves as an example of standard GNU coding practices.  As such, it supports
+command-line arguments, multiple languages, and so on.")
+  (home-page "https://www.gnu.org/software/hello/")
+  (license gpl3+))
+@end example
+
+We will explain the extra code in a moment.
+
+Feel free to play with the different values of the various fields.  If you
+change the source, you'll need to update the checksum.  Indeed, Guix refuses to
+build anything if the given checksum does not match the computed checksum of the
+source code.  To obtain the correct checksum of the package declaration, we
+need to download the source, compute the sha256 checksum and convert it to
+base32.
+
+Thankfully, Guix can automate this task for us; all we need is to provide the
+URI:
+
+@c TRANSLATORS: This is example shell output.
+@example sh
+$ guix download mirror://gnu/hello/hello-2.10.tar.gz
+
+Starting download of /tmp/guix-file.JLYgL7
+From https://ftpmirror.gnu.org/gnu/hello/hello-2.10.tar.gz...
+following redirection to `https://mirror.ibcp.fr/pub/gnu/hello/hello-2.10.tar.gz'...
+ …10.tar.gz  709KiB                                 2.5MiB/s 00:00 [##################] 100.0%
+/gnu/store/hbdalsf5lpf01x4dcknwx6xbn6n5km6k-hello-2.10.tar.gz
+0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
+@end example
+
+In this specific case the output tells us which mirror was chosen.
+If the result of the above command is not the same as in the above snippet,
+update your @code{my-hello} declaration accordingly.
+
+Note that GNU package tarballs come with an OpenPGP signature, so you
+should definitely check the signature of this tarball with `gpg` to
+authenticate it before going further:
+
+@c TRANSLATORS: This is example shell output.
+@example sh
+$ guix download mirror://gnu/hello/hello-2.10.tar.gz.sig
+
+Starting download of /tmp/guix-file.03tFfb
+From https://ftpmirror.gnu.org/gnu/hello/hello-2.10.tar.gz.sig...
+following redirection to `https://ftp.igh.cnrs.fr/pub/gnu/hello/hello-2.10.tar.gz.sig'...
+ ….tar.gz.sig  819B                                                                                                                       1.2MiB/s 00:00 [##################] 100.0%
+/gnu/store/rzs8wba9ka7grrmgcpfyxvs58mly0sx6-hello-2.10.tar.gz.sig
+0q0v86n3y38z17rl146gdakw9xc4mcscpk8dscs412j22glrv9jf
+$ gpg --verify /gnu/store/rzs8wba9ka7grrmgcpfyxvs58mly0sx6-hello-2.10.tar.gz.sig /gnu/store/hbdalsf5lpf01x4dcknwx6xbn6n5km6k-hello-2.10.tar.gz
+gpg: Signature made Sun 16 Nov 2014 01:08:37 PM CET
+gpg:                using RSA key A9553245FDE9B739
+gpg: Good signature from "Sami Kerola " [unknown]
+gpg:                 aka "Sami Kerola (http://www.iki.fi/kerolasa/) " [unknown]
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: 8ED3 96E3 7E38 D471 A005  30D3 A955 3245 FDE9 B739
+@end example
+
+You can then happily run
+
+@c TRANSLATORS: Do not translate this command
+@example sh
+$ guix package --install-from-file=my-hello.scm
+@end example
+
+You should now have @code{my-hello} in your profile!
+
+@c TRANSLATORS: Do not translate this command
+@example sh
+$ guix package --list-installed=my-hello
+my-hello	2.10	out
+/gnu/store/f1db2mfm8syb8qvc357c53slbvf1g9m9-my-hello-2.10
+@end example
+
+We've gone as far as we could without any knowledge of Scheme.  Before moving
+on to more complex packages, now is the right time to brush up on your Scheme
+knowledge.  @pxref{A Scheme Crash Course} to get up to speed.
+
+@c TODO: Continue the tutorial
+
+
+@c *********************************************************************
+@node System Configuration
+@chapter System Configuration
+
+Guix offers a flexible language for declaratively configuring your Guix
+System.  This flexibility can at times be overwhelming.  The purpose of this
+chapter is to demonstrate some advanced configuration concepts.
+
+@pxref{System Configuration,,, guix, GNU Guix Reference Manual} for a complete
+reference.
+
+@menu
+* Customizing the Kernel::     Creating and using a custom Linux kernel on Guix System.
+@end menu
+
+@node Customizing the Kernel
+@section Customizing the Kernel
+
+Guix is, at its core, a source based distribution with substitutes
+(@pxref{Substitutes,,, guix, GNU Guix Reference Manual}), and as such building
+packages from their source code is an expected part of regular package
+installations and upgrades.  Given this starting point, it makes sense that
+efforts are made to reduce the amount of time spent compiling packages, and
+recent changes and upgrades to the building and distribution of substitutes
+continues to be a topic of discussion within Guix.
+
+The kernel, while not requiring an overabundance of RAM to build, does take a
+rather long time on an average machine.  The official kernel configuration, as
+is the case with many GNU/Linux distributions, errs on the side of
+inclusiveness, and this is really what causes the build to take such a long
+time when the kernel is built from source.
+
+The Linux kernel, however, can also just be described as a regular old
+package, and as such can be customized just like any other package.  The
+procedure is a little bit different, although this is primarily due to the
+nature of how the package definition is written.
+
+The @code{linux-libre} kernel package definition is actually a procedure which
+creates a package.
+
+@example scheme
+(define* (make-linux-libre version hash supported-systems
+                           #:key
+                           ;; A function that takes an arch and a variant.
+                           ;; See kernel-config for an example.
+                           (extra-version #f)
+                           (configuration-file #f)
+                           (defconfig "defconfig")
+                           (extra-options %default-extra-linux-options)
+                           (patches (list %boot-logo-patch)))
+  ...)
+@end example
+
+The current @code{linux-libre} package is for the 5.1.x series, and is
+declared like this:
+
+@example scheme
+(define-public linux-libre
+  (make-linux-libre %linux-libre-version
+                    %linux-libre-hash
+                    '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")
+                    #:patches %linux-libre-5.1-patches
+                    #:configuration-file kernel-config))
+@end example
+
+Any keys which are not assigned values inherit their default value from the
+@code{make-linux-libre} definition.  When comparing the two snippets above,
+you may notice that the code comment in the first doesn't actually refer to
+the @code{#:extra-version} keyword; it is actually for
+@code{#:configuration-file}.  Because of this, it is not actually easy to
+include a custom kernel configuration from the definition, but don't worry,
+there are other ways to work with what we do have.
+
+There are two ways to create a kernel with a custom kernel configuration.  The
+first is to provide a standard @file{.config} file during the build process by
+including an actual @file{.config} file as a native input to our custom
+kernel.  The following is a snippet from the custom @code{'configure} phase of
+the @code{make-linux-libre} package definition:
+
+@example scheme
+(let ((build  (assoc-ref %standard-phases 'build))
+      (config (assoc-ref (or native-inputs inputs) "kconfig")))
+
+  ;; Use a custom kernel configuration file or a default
+  ;; configuration file.
+  (if config
+      (begin
+        (copy-file config ".config")
+        (chmod ".config" #o666))
+      (invoke "make" ,defconfig))
+@end example
+
+Below is a sample kernel package.  The @code{linux-libre} package is nothing
+special and can be inherited from and have its fields overridden like any
+other package:
+
+@example scheme
+(define-public linux-libre/E2140
+  (package
+    (inherit linux-libre)
+    (native-inputs
+     `(("kconfig" ,(local-file "E2140.config"))
+      ,@@(alist-delete "kconfig"
+                      (package-native-inputs linux-libre))))))
+@end example
+
+In the same directory as the file defining @code{linux-libre-E2140} is a file
+named @file{E2140.config}, which is an actual kernel configuration file.  The
+@code{defconfig} keyword of @code{make-linux-libre} is left blank here, so the
+only kernel configuration in the package is the one which was included in the
+@code{native-inputs} field.
+
+The second way to create a custom kernel is to pass a new value to the
+@code{extra-options} keyword of the @code{make-linux-libre} procedure.  The
+@code{extra-options} keyword works with another function defined right below
+it:
+
+@example scheme
+(define %default-extra-linux-options
+  `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
+   ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)
+   ;; Modules required for initrd:
+   ("CONFIG_NET_9P" . m)
+   ("CONFIG_NET_9P_VIRTIO" . m)
+   ("CONFIG_VIRTIO_BLK" . m)
+   ("CONFIG_VIRTIO_NET" . m)
+   ("CONFIG_VIRTIO_PCI" . m)
+   ("CONFIG_VIRTIO_BALLOON" . m)
+   ("CONFIG_VIRTIO_MMIO" . m)
+   ("CONFIG_FUSE_FS" . m)
+   ("CONFIG_CIFS" . m)
+   ("CONFIG_9P_FS" . m)))
+
+(define (config->string options)
+  (string-join (map (match-lambda
+                      ((option . 'm)
+                       (string-append option "=m"))
+                      ((option . #t)
+                       (string-append option "=y"))
+                      ((option . #f)
+                       (string-append option "=n")))
+                    options)
+               "\n"))
+@end example
+
+And in the custom configure script from the `make-linux-libre` package:
+
+@example scheme
+;; Appending works even when the option wasn't in the
+;; file.  The last one prevails if duplicated.
+(let ((port (open-file ".config" "a"))
+      (extra-configuration ,(config->string extra-options)))
+  (display extra-configuration port)
+  (close-port port))
+
+(invoke "make" "oldconfig"))))
+@end example
+
+So by not providing a configuration-file the @file{.config} starts blank, and
+then we write into it the collection of flags that we want.  Here's another
+custom kernel:
+
+@example scheme
+(define %macbook41-full-config
+  (append %macbook41-config-options
+          %filesystems
+          %efi-support
+          %emulation
+          (@@@@ (gnu packages linux) %default-extra-linux-options)))
+
+(define-public linux-libre-macbook41
+  ;; XXX: Access the internal 'make-linux-libre' procedure, which is
+  ;; private and unexported, and is liable to change in the future.
+  ((@@@@ (gnu packages linux) make-linux-libre) (@@@@ (gnu packages linux) %linux-libre-version)
+                      (@@@@ (gnu packages linux) %linux-libre-hash)
+                      '("x86_64-linux")
+                      #:extra-version "macbook41"
+                      #:patches (@@@@ (gnu packages linux) %linux-libre-5.1-patches)
+                      #:extra-options %macbook41-config-options))
+@end example
+
+In the above example @code{%filesystems} is a collection of flags enabling
+different filesystem support, @code{%efi-support} enables EFI support and
+@code{%emulation} enables a x86_64-linux machine to act in 32-bit mode also.
+@code{%default-extra-linux-options} are the ones quoted above, which had to be
+added in since they were replaced in the @code{extra-options} keyword.
+
+This all sounds like it should be doable, but how does one even know which
+modules are required for a particular system?  Two places that can be helpful
+in trying to answer this question is the
+@uref{https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Kernel, Gentoo
+Handbook} and the
+@uref{https://www.kernel.org/doc/html/latest/admin-guide/README.html?highlight=localmodconfig,
+documentation from the kernel itself}.  From the kernel documentation, it
+seems that @code{make localmodconfig} is the command we want.
+
+In order to actually run @code{make localmodconfig} we first need to get and
+unpack the kernel source code:
+
+@example shell
+tar xf $(guix build linux-libre --source)
+@end example
+
+Once inside the directory containing the source code run @code{touch .config}
+to create an initial, empty @file{.config} to start with.  @code{make
+localmodconfig} works by seeing what you already have in @file{.config} and
+letting you know what you're missing.  If the file is blank then you're
+missing everything.  The next step is to run:
+
+@example shell
+guix environment linux-libre -- make localmodconfig
+@end example
+
+and note the output.  Do note that the @file{.config} file is still empty.
+The output generally contains two types of warnings.  The first start with
+"WARNING" and can actually be ignored in our case.  The second read:
+
+@example shell
+module pcspkr did not have configs CONFIG_INPUT_PCSPKR
+@end example
+
+For each of these lines, copy the @code{CONFIG_XXXX_XXXX} portion into the
+@file{.config} in the directory, and append @code{=m}, so in the end it looks
+like this:
+
+@example shell
+CONFIG_INPUT_PCSPKR=m
+CONFIG_VIRTIO=m
+@end example
+
+After copying all the configuration options, run @code{make localmodconfig}
+again to make sure that you don't have any output starting with "module".
+After all of these machine specific modules there are a couple more left that
+are also needed.  @code{CONFIG_MODULES} is necessary so that you can build and
+load modules separately and not have everything built into the kernel.
+@code{CONFIG_BLK_DEV_SD} is required for reading from hard drives.  It is
+possible that there are other modules which you will need.
+
+This post does not aim to be a guide to configuring your own kernel however,
+so if you do decide to build a custom kernel you'll have to seek out other
+guides to create a kernel which is just right for your needs.
+
+The second way to setup the kernel configuration makes more use of Guix's
+features and allows you to share configuration segments between different
+kernels.  For example, all machines using EFI to boot have a number of EFI
+configuration flags that they need.  It is likely that all the kernels will
+share a list of filesystems to support.  By using variables it is easier to
+see at a glance what features are enabled and to make sure you don't have
+features in one kernel but missing in another.
+
+Left undiscussed however, is Guix's initrd and its customization.  It is
+likely that you'll need to modify the initrd on a machine using a custom
+kernel, since certain modules which are expected to be built may not be
+available for inclusion into the initrd.
+
+@c *********************************************************************
+@node Acknowledgments
+@chapter Acknowledgments
+
+Guix is based on the @uref{https://nixos.org/nix/, Nix package manager},
+which was designed and
+implemented by Eelco Dolstra, with contributions from other people (see
+the @file{nix/AUTHORS} file in Guix.)  Nix pioneered functional package
+management, and promoted unprecedented features, such as transactional
+package upgrades and rollbacks, per-user profiles, and referentially
+transparent build processes.  Without this work, Guix would not exist.
+
+The Nix-based software distributions, Nixpkgs and NixOS, have also been
+an inspiration for Guix.
+
+GNU@tie{}Guix itself is a collective work with contributions from a
+number of people.  See the @file{AUTHORS} file in Guix for more
+information on these fine people.  The @file{THANKS} file lists people
+who have helped by reporting bugs, taking care of the infrastructure,
+providing artwork and themes, making suggestions, and more---thank you!
+
+This document includes adapted sections from articles that have previously
+been published on the Guix blog at @uref{https://guix.gnu.org/blog}.
+
+
+@c *********************************************************************
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@cindex license, GNU Free Documentation License
+@include fdl-1.3.texi
+
+@c *********************************************************************
+@node Concept Index
+@unnumbered Concept Index
+@printindex cp
+
+@bye
+
+@c Local Variables:
+@c ispell-local-dictionary: "american";
+@c End:
diff --git a/doc/local.mk b/doc/local.mk
index 336e961c4f..850612605b 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -26,7 +26,8 @@ info_TEXINFOS = %D%/guix.texi			\
   %D%/guix.es.texi				\
   %D%/guix.fr.texi				\
   %D%/guix.ru.texi				\
-  %D%/guix.zh_CN.texi
+  %D%/guix.zh_CN.texi				\
+  %D%/guix-cookbook.texi
 
 %C%_guix_TEXINFOS = \
   %D%/contributing.texi \
@@ -108,6 +109,12 @@ $(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.
 	-$(AM_V_POXREF)$(xref_command)
 	-mv "$@.tmp" "$@"
 
+$(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po
+	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix-cookbook.texi" -p "$<" -l "$@.tmp"
+	-sed -i "s|guix-cookbook\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp"
+	-$(AM_V_POXREF)$(xref_command)
+	-mv "$@.tmp" "$@"
+
 $(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po
 	-$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/contributing.texi" -p "$<" -l "$@.tmp"
 	-$(AM_V_POXREF)$(xref_command)
diff --git a/po/doc/local.mk b/po/doc/local.mk
index fb3c5aee03..f1a52615c1 100644
--- a/po/doc/local.mk
+++ b/po/doc/local.mk
@@ -23,9 +23,13 @@ DOC_PO_FILES=					\
   %D%/guix-manual.ru.po				\
   %D%/guix-manual.zh_CN.po
 
+DOC_COOKBOOK_PO_FILES=
+
 EXTRA_DIST = \
   %D%/guix-manual.pot \
-  $(DOC_PO_FILES)
+  %D%/guix-cookbook.pot \
+  $(DOC_PO_FILES) \
+  $(DOC_COOKBOOK_PO_FILES)
 
 POT_OPTIONS = --package-name "guix" --package-version "$(VERSION)" \
 	          --copyright-holder "Ludovic Courtès" \
@@ -52,6 +56,27 @@ doc-po-update-%:
 	     exit 1; \
 	fi
 
+doc-po-update-cookbook-%:
+	@lang=`echo "$@" | sed -e's/^doc-po-update-//'` ; \
+	output="$(srcdir)/po/doc/guix-cookbook.$$lang.po" ; \
+	input="$(srcdir)/po/doc/guix-cookbook.pot" ; \
+	if test -f "$$output"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $$output $$input"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	        '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	          $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) "$$output" "$$input";; \
+	        *) \
+	          $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} "$$output" "$$input";; \
+	      esac; \
+	    }; \
+	  touch "$$output"; \
+	else \
+	     echo "File $$output does not exist.  If you are a translator, you can create it with 'msginit'." 1>&2; \
+	     exit 1; \
+	fi
+
 $(srcdir)/po/doc/%.pot-update: doc/%.texi
 	$(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \
 		-p "$$(echo $@ | sed 's|-update||')" $(POT_OPTIONS)
@@ -64,6 +89,7 @@ doc-pot-update:
 		$(MAKE) $(srcdir)/po/doc/guix.pot-update; \
 		$(MAKE) $(srcdir)/po/doc/contributing.pot-update; \
 	done
+	$(MAKE) $(srcdir)/po/doc/guix-cookbook.pot-update;
 	msgcat $(addprefix $(srcdir)/po/doc/, $(TMP_POT_FILES)) > $(srcdir)/po/doc/guix-manual.pot
 	rm -f $(addprefix $(srcdir)/po/doc/, $(TMP_POT_FILES))
 
@@ -72,5 +98,10 @@ doc-po-update: doc-pot-update
 	  lang="`echo "$$f" | $(SED) -es'|.*/guix-manual\.\(.*\)\.po$$|\1|g'`";	\
 	  $(MAKE) "doc-po-update-$$lang";					\
 	done
+	for f in $(DOC_COOKBOOK_PO_FILES); do						\
+	  lang="`echo "$$f" | $(SED) -es'|.*/guix-cookbook\.\(.*\)\.po$$|\1|g'`";	\
+	  $(MAKE) "doc-po-update-cookbook-$$lang";						\
+	done
+
 
 .PHONY: doc-po-update doc-pot-update
-- 
cgit v1.2.3


From b2fa53d0f6f76e773a2b0736ff370ecf456ae877 Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 13:47:46 +0200
Subject: gnu: Add series.

* gnu/packages/lisp.scm (sbcl-series, cl-series, ecl-series): New variables.
---
 gnu/packages/lisp.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 0c8ad1e2fa..37a0893d2f 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6934,3 +6934,41 @@ classes and cyclic data structures are supported.")
 
 (define-public ecl-cl-prevalence
   (sbcl-package->ecl-package sbcl-cl-prevalence))
+
+(define-public sbcl-series
+  (let ((commit "da9061b336119d1e5214aff9117171d494d5a58a")
+        (revision "1"))
+    (package
+      (name "sbcl-series")
+      (version (git-version "2.2.11" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "git://git.code.sf.net/p/series/series")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "07hk2lhfx42zk018pxqvn4gs77vd4n4g8m4xxbqaxgca76mifwfw"))))
+      (build-system asdf-build-system/sbcl)
+      (arguments
+       ;; Disable the tests, they are apparently buggy and I didn't find
+       ;; a simple way to make them run and pass.
+       '(#:tests? #f))
+      (synopsis "Series data structure for Common Lisp")
+      (description
+       "This Common Lisp library provides a series data structure much like
+a sequence, with similar kinds of operations.  The difference is that in many
+situations, operations on series may be composed functionally and yet execute
+iteratively, without the need to construct intermediate series values
+explicitly.  In this manner, series provide both the clarity of a functional
+programming style and the efficiency of an iterative programming style.")
+      (home-page "http://series.sourceforge.net/")
+      (license license:expat))))
+
+(define-public cl-series
+  (sbcl-package->cl-source-package sbcl-series))
+
+(define-public ecl-series
+  (sbcl-package->ecl-package sbcl-series))
-- 
cgit v1.2.3


From 7bf9577d0cddbcd8bb85c06fd2249f2d9c4ccd27 Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 13:54:30 +0200
Subject: gnu: Add periods.

* gnu/packages/lisp.scm (sbcl-periods, cl-periods, ecl-periods): New variables.
---
 gnu/packages/lisp.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 37a0893d2f..362da8f646 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6972,3 +6972,36 @@ programming style and the efficiency of an iterative programming style.")
 
 (define-public ecl-series
   (sbcl-package->ecl-package sbcl-series))
+
+(define-public sbcl-periods
+  (let ((commit "983d4a57325db3c8def942f163133cec5391ec28")
+        (revision "1"))
+    (package
+      (name "sbcl-periods")
+      (version (git-version "0.0.2" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jwiegley/periods.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0z30jr3lxz3cmi019fsl4lgcgwf0yqpn95v9zkkkwgymdrkd4lga"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       `(("local-time" ,sbcl-local-time)))
+      (synopsis "Common Lisp library for manipulating date/time objects")
+      (description
+       "Periods is a Common Lisp library providing a set of utilities for
+manipulating times, distances between times, and both contiguous and
+discontiguous ranges of time.")
+      (home-page "https://github.com/jwiegley/periods")
+      (license license:bsd-3))))
+
+(define-public cl-periods
+  (sbcl-package->cl-source-package sbcl-periods))
+
+(define-public ecl-periods
+  (sbcl-package->ecl-package sbcl-periods))
-- 
cgit v1.2.3


From 5c2f67979e1384229a6b72a612a13a8e4ccc4e7c Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 14:40:27 +0200
Subject: gnu: Add periods-series.

* gnu/packages/lisp.scm (sbcl-periods-series, cl-periods-series,
  ecl-periods-series): New variables.
---
 gnu/packages/lisp.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 362da8f646..d88a18e358 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7005,3 +7005,23 @@ discontiguous ranges of time.")
 
 (define-public ecl-periods
   (sbcl-package->ecl-package sbcl-periods))
+
+(define-public sbcl-periods-series
+  (package
+    (inherit sbcl-periods)
+    (name "sbcl-periods-series")
+    (inputs
+     `(("periods" ,sbcl-periods)
+       ("series" ,sbcl-series)))
+    (arguments
+     '(#:asd-file "periods-series.asd"
+       #:asd-system-name "periods-series"))
+    (description
+     "Periods-series is an extension of the periods Common Lisp library
+providing functions compatible with the series Common Lisp library.")))
+
+(define-public cl-periods-series
+  (sbcl-package->cl-source-package sbcl-periods-series))
+
+(define-public ecl-periods-series
+  (sbcl-package->ecl-package sbcl-periods-series))
-- 
cgit v1.2.3


From cacbeebc753d1b1c920b9b2d20cc21e0c433ec1f Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 1 Jul 2019 20:16:38 +0200
Subject: gnu: Add metatilities-base.

* gnu/packages/lisp.scm (sbcl-metatilities-base, cl-metatilities-base,
  ecl-metatilities-base): New variables.
---
 gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index d88a18e358..b820f489e6 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7025,3 +7025,35 @@ providing functions compatible with the series Common Lisp library.")))
 
 (define-public ecl-periods-series
   (sbcl-package->ecl-package sbcl-periods-series))
+
+(define-public sbcl-metatilities-base
+  (let ((commit "6eaa9e3ff0939a93a92109dd0fcd218de85417d5")
+        (revision "1"))
+    (package
+      (name "sbcl-metatilities-base")
+      (version (git-version "0.6.6" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gwkkwg/metatilities-base.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0xpa86pdzlnf4v5g64j3ifaplx71sx2ha8b7vvakswi652679ma0"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("lift" ,sbcl-lift)))
+      (synopsis "Core of the metatilities Common Lisp library")
+      (description
+       "Metatilities-base is the core of the metatilities Common Lisp library
+which implements a set of utilities.")
+      (home-page "https://common-lisp.net/project/metatilities-base/")
+      (license license:expat))))
+
+(define-public cl-metatilities-base
+  (sbcl-package->cl-source-package sbcl-metatilities-base))
+
+(define-public ecl-metatilities-base
+  (sbcl-package->ecl-package sbcl-metatilities-base))
-- 
cgit v1.2.3


From 5f33f9aa641db7b6ef515c6d19934728e3075dfd Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Mon, 16 Sep 2019 14:46:37 +0200
Subject: gnu: sbcl-lift: Fix version number.

* gnu/packages/lisp.scm (sbcl-lift)[version]: Set to 1.7.1 instead of 0.0.0.
---
 gnu/packages/lisp.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index b820f489e6..f076798e7a 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -2485,7 +2485,7 @@ new fiends in addition to old friends like @command{aif} and
   (let ((commit "7d49a66c62759535624037826891152223d4206c"))
     (package
       (name "sbcl-lift")
-      (version (git-version "0.0.0" "1" commit))
+      (version (git-version "1.7.1" "1" commit))
       (source
        (origin
          (method git-fetch)
-- 
cgit v1.2.3


From f5d1f58bcb26bb793514711a1ee28cbc400c6a1c Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 14:57:53 +0200
Subject: gnu: Add cl-containers.

* gnu/packages/lisp.scm (sbcl-cl-containers, cl-containers, ecl-containers):
  New variables.
---
 gnu/packages/lisp.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index f076798e7a..40dba3b16c 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7057,3 +7057,54 @@ which implements a set of utilities.")
 
 (define-public ecl-metatilities-base
   (sbcl-package->ecl-package sbcl-metatilities-base))
+
+(define-public sbcl-cl-containers
+  (let ((commit "810927e19d933bcf38ffeb7a23ce521efc432d45")
+        (revision "1"))
+    (package
+      (name "sbcl-cl-containers")
+      (version (git-version "0.12.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gwkkwg/cl-containers.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1s9faxw7svhbjpkhfrz2qxgjm3cvyjb8wpyb4m8dx4i5g7vvprkv"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("lift" ,sbcl-lift)))
+      (inputs
+       `(("metatilities-base" ,sbcl-metatilities-base)))
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'relax-version-checks
+             (lambda _
+               (substitute* "cl-containers.asd"
+                 (("\\(:version \"metatilities-base\" \"0\\.6\\.6\"\\)")
+                  "\"metatilities-base\""))
+               (substitute* "cl-containers-test.asd"
+                 (("\\(:version \"lift\" \"1\\.7\\.0\"\\)")
+                  "\"lift\""))
+               #t)))))
+      (synopsis "Container library for Common Lisp")
+      (description
+       "Common Lisp ships with a set of powerful built in data structures
+including the venerable list, full featured arrays, and hash-tables.
+CL-containers enhances and builds on these structures by adding containers
+that are not available in native Lisp (for example: binary search trees,
+red-black trees, sparse arrays and so on), and by providing a standard
+interface so that they are simpler to use and so that changing design
+decisions becomes significantly easier.")
+      (home-page "https://common-lisp.net/project/cl-containers/")
+      (license license:expat))))
+
+(define-public cl-containers
+  (sbcl-package->cl-source-package sbcl-cl-containers))
+
+(define-public ecl-cl-containers
+  (sbcl-package->ecl-package sbcl-cl-containers))
-- 
cgit v1.2.3


From bc5d9a7ac1ac7cba9cf0f3ee0a21884bf4a1ca23 Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 15:03:55 +0200
Subject: gnu: Add xlunit.

* gnu/packages/lisp.scm (sbcl-xlunit, cl-xlunit, ecl-xlunit): New variables.
---
 gnu/packages/lisp.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 40dba3b16c..23204fafe8 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7108,3 +7108,41 @@ decisions becomes significantly easier.")
 
 (define-public ecl-cl-containers
   (sbcl-package->ecl-package sbcl-cl-containers))
+
+(define-public sbcl-xlunit
+  (let ((commit "3805d34b1d8dc77f7e0ee527a2490194292dd0fc")
+        (revision "1"))
+    (package
+      (name "sbcl-xlunit")
+      (version (git-version "0.6.3" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "http://git.kpe.io/xlunit.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0argfmp9nghs4sihyj3f8ch9qfib2b7ll07v5m9ziajgzsfl5xw3"))))
+      (build-system asdf-build-system/sbcl)
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-tests
+             (lambda _
+               (substitute* "xlunit.asd"
+                 ((" :force t") ""))
+               #t)))))
+      (synopsis "Unit testing package for Common Lisp")
+      (description
+       "The XLUnit package is a toolkit for building test suites.  It is based
+on the XPTest package by Craig Brozensky and the JUnit package by Kent Beck.")
+      (home-page "http://quickdocs.org/xlunit/")
+      (license license:bsd-3))))
+
+(define-public cl-xlunit
+  (sbcl-package->cl-source-package sbcl-xlunit))
+
+(define-public ecl-xlunit
+  (sbcl-package->ecl-package sbcl-xlunit))
-- 
cgit v1.2.3


From c0dcdd45d90c7906bc652cf4ca7a3825261b786f Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 15:10:03 +0200
Subject: gnu: Add fprog.

* gnu/packages/lisp.scm (sbcl-fprog, cl-fprog, ecl-fprog): New variables.
---
 gnu/packages/lisp.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 23204fafe8..6f7667f77d 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7146,3 +7146,33 @@ on the XPTest package by Craig Brozensky and the JUnit package by Kent Beck.")
 
 (define-public ecl-xlunit
   (sbcl-package->ecl-package sbcl-xlunit))
+
+(define-public sbcl-fprog
+  (let ((commit "7016d1a98215f82605d1c158e7a16504ca1f4636")
+        (revision "1"))
+    (package
+      (name "sbcl-fprog")
+      (version (git-version "1.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jwiegley/cambl.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "103mry04j2k9vznsxm7wcvccgxkil92cdrv52miwcmxl8daa4jiz"))))
+      (build-system asdf-build-system/sbcl)
+      (synopsis "Functional programming utilities for Common Lisp")
+      (description
+       "@code{fprog} is a Common Lisp library allowing iteration over
+immutable lists sharing identical sublists.")
+      (home-page "https://github.com/jwiegley/cambl")
+      (license license:bsd-3))))
+
+(define-public cl-fprog
+  (sbcl-package->cl-source-package sbcl-fprog))
+
+(define-public ecl-fprog
+  (sbcl-package->ecl-package sbcl-fprog))
-- 
cgit v1.2.3


From 66226d5d41868c7d60c8725efaeb3dba0a0a58f7 Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 15:13:53 +0200
Subject: gnu: Add cambl.

* gnu/packages/lisp.scm (sbcl-cambl, cl-cambl, ecl-cambl): New variables.
---
 gnu/packages/lisp.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 6f7667f77d..8cd27c8d54 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7176,3 +7176,31 @@ immutable lists sharing identical sublists.")
 
 (define-public ecl-fprog
   (sbcl-package->ecl-package sbcl-fprog))
+
+(define-public sbcl-cambl
+  (let ((commit "7016d1a98215f82605d1c158e7a16504ca1f4636")
+        (revision "1"))
+    (package
+      (inherit sbcl-fprog)
+      (name "sbcl-cambl")
+      (version (git-version "4.0.0" revision commit))
+      (native-inputs
+       `(("xlunit" ,sbcl-xlunit)))
+      (inputs
+       `(("alexandria" ,sbcl-alexandria)
+         ("cl-containers" ,sbcl-cl-containers)
+         ("local-time" ,sbcl-local-time)
+         ("periods" ,sbcl-periods)
+         ("fprog" ,sbcl-fprog)))
+      (synopsis "Commoditized amounts and balances for Common Lisp")
+      (description
+       "CAMBL is a Common Lisp library providing a convenient facility for
+working with commoditized values.  It does not allow compound units (and so is
+not suited for scientific operations) but does work rather nicely for the
+purpose of financial calculations."))))
+
+(define-public cl-cambl
+  (sbcl-package->cl-source-package sbcl-cambl))
+
+(define-public ecl-cambl
+  (sbcl-package->ecl-package sbcl-cambl))
-- 
cgit v1.2.3


From b1df0d9f7734c883e76a59c8afc4796c6fe8771b Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Thu, 8 Aug 2019 15:54:46 +0200
Subject: gnu: Add cl-ledger.

* gnu/packages/lisp.scm (sbcl-cl-ledger, cl-ledger, ecl-cl-ledger): New
  variables.
---
 gnu/packages/lisp.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 8cd27c8d54..6a5e8da664 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7204,3 +7204,48 @@ purpose of financial calculations."))))
 
 (define-public ecl-cambl
   (sbcl-package->ecl-package sbcl-cambl))
+
+(define-public sbcl-cl-ledger
+  (let ((commit "08e0be41795e804cd36142e51756ad0b1caa377b")
+        (revision "1"))
+    (package
+      (name "sbcl-cl-ledger")
+      (version (git-version "4.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ledger/cl-ledger.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1via0qf6wjcyxnfbmfxjvms0ik9j8rqbifgpmnhrzvkhrq9pv8h1"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       `(("cambl" ,sbcl-cambl)
+         ("cl-ppcre" ,sbcl-cl-ppcre)
+         ("local-time" ,sbcl-local-time)
+         ("periods-series" ,sbcl-periods-series)))
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-system-definition
+             (lambda _
+               (substitute* "cl-ledger.asd"
+                 (("  :build-operation program-op") "")
+                 (("  :build-pathname \"cl-ledger\"") "")
+                 (("  :entry-point \"ledger::main\"") ""))
+               #t)))))
+      (synopsis "Common Lisp port of the Ledger accounting system")
+      (description
+       "CL-Ledger is a Common Lisp port of the Ledger double-entry accounting
+system.")
+      (home-page "https://github.com/ledger/cl-ledger")
+      (license license:bsd-3))))
+
+(define-public cl-ledger
+  (sbcl-package->cl-source-package sbcl-cl-ledger))
+
+(define-public ecl-cl-ledger
+  (sbcl-package->ecl-package sbcl-cl-ledger))
-- 
cgit v1.2.3


From 76b66fbaf5881ceeea0e75693ffb6678f35fe6ed Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Thu, 8 Aug 2019 16:00:15 +0200
Subject: gnu: Add bst.

* gnu/packages/lisp.scm (sbcl-bst, cl-bst, ecl-bst): New variables.
---
 gnu/packages/lisp.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 6a5e8da664..205a6120be 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7249,3 +7249,36 @@ system.")
 
 (define-public ecl-cl-ledger
   (sbcl-package->ecl-package sbcl-cl-ledger))
+
+(define-public sbcl-bst
+  (let ((commit "34f9c7e8e0a9f2c952fe310ab36cb630d5d9c15a")
+        (revision "1"))
+    (package
+      (name "sbcl-bst")
+      (version (git-version "1.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/glv2/bst.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1amxns7hvvh4arwbh8ciwfzplg127vh37dnbamv1m1kmmnmihfc8"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("alexandria" ,sbcl-alexandria)
+         ("fiveam" ,sbcl-fiveam)))
+      (synopsis "Binary search tree for Common Lisp")
+      (description
+       "BST is a Common Lisp library for working with binary search trees that
+can contain any kind of values.")
+      (home-page "https://github.com/glv2/bst")
+      (license license:gpl3))))
+
+(define-public cl-bst
+  (sbcl-package->cl-source-package sbcl-bst))
+
+(define-public ecl-bst
+  (sbcl-package->ecl-package sbcl-bst))
-- 
cgit v1.2.3


From ed0ddadcd59c88c182e2a6e1b58b4b1c5f6f7273 Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 16 Sep 2019 15:32:41 +0200
Subject: gnu: Add cl-octet-streams.

* gnu/packages/lisp.scm (sbcl-cl-octet-streams, cl-octet-streams,
  ecl-cl-octet-streams): New variables.
---
 gnu/packages/lisp.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 205a6120be..63381a8cea 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7282,3 +7282,36 @@ can contain any kind of values.")
 
 (define-public ecl-bst
   (sbcl-package->ecl-package sbcl-bst))
+
+(define-public sbcl-cl-octet-streams
+  (package
+    (name "sbcl-cl-octet-streams")
+    (version "1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/glv2/cl-octet-streams.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1d7mn6ydv0j2x4r7clpc9ijjwrnfpxmvhifv8n5j7jh7s744sf8d"))))
+    (build-system asdf-build-system/sbcl)
+    (native-inputs
+     `(("fiveam" ,sbcl-fiveam)))
+    (inputs
+     `(("trivial-gray-streams" ,sbcl-trivial-gray-streams)))
+    (synopsis "In-memory octet streams for Common Lisp")
+    (description
+     "CL-octet-streams is a library implementing in-memory octet
+streams for Common Lisp.  It was inspired by the trivial-octet-streams and
+cl-plumbing libraries.")
+    (home-page "https://github.com/glv2/cl-octet-streams")
+    (license license:gpl3+)))
+
+(define-public cl-octet-streams
+  (sbcl-package->cl-source-package sbcl-cl-octet-streams))
+
+(define-public ecl-cl-octet-streams
+  (sbcl-package->ecl-package sbcl-cl-octet-streams))
-- 
cgit v1.2.3


From 3012486d77a1d611cfd2c141e256e21a53e2c2aa Mon Sep 17 00:00:00 2001
From: Guillaume LE VAILLANT 
Date: Mon, 1 Jul 2019 23:23:22 +0200
Subject: gnu: Add cl-lzlib.

* gnu/packages/lisp.scm (sbcl-lzlib, cl-lzlib, ecl-lzlib): New variables.
---
 gnu/packages/lisp.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 63381a8cea..94ef3731e0 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7315,3 +7315,48 @@ cl-plumbing libraries.")
 
 (define-public ecl-cl-octet-streams
   (sbcl-package->ecl-package sbcl-cl-octet-streams))
+
+(define-public sbcl-lzlib
+  (let ((commit "0de1db7129fef9a58a059d35a2fa2ecfc5b47b47")
+        (revision "1"))
+    (package
+      (name "sbcl-lzlib")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/glv2/cl-lzlib.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "12ny7vj52fgnd8hb8fc8mry92vq4c1x72x2350191m4476j95clz"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("fiveam" ,sbcl-fiveam)))
+      (inputs
+       `(("cffi" ,sbcl-cffi)
+         ("cl-octet-streams" ,sbcl-cl-octet-streams)
+         ("lzlib" ,lzlib)))
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-paths
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* "src/lzlib.lisp"
+                 (("liblz\\.so")
+                  (string-append (assoc-ref inputs "lzlib") "/lib/liblz.so")))
+               #t)))))
+      (synopsis "Common Lisp library for lzip (de)compression")
+      (description
+       "This Common Lisp library provides functions for lzip (LZMA)
+compression/decompression using bindings to the lzlib C library.")
+      (home-page "https://github.com/glv2/cl-lzlib")
+      (license license:gpl3+))))
+
+(define-public cl-lzlib
+  (sbcl-package->cl-source-package sbcl-lzlib))
+
+(define-public ecl-lzlib
+  (sbcl-package->ecl-package sbcl-lzlib))
-- 
cgit v1.2.3


From 62790449e61bfdf7835790fae89e49c210a08418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Sat, 14 Sep 2019 11:26:37 +0800
Subject: gnu: linux-libre: Enable all nftables families.

* gnu/packages/aux-files/linux-libre/4.19-arm.conf,
gnu/packages/aux-files/linux-libre/4.19-arm64.conf,
gnu/packages/aux-files/linux-libre/4.19-i686.conf,
gnu/packages/aux-files/linux-libre/4.19-x86_64.conf,
gnu/packages/aux-files/linux-libre/5.2-arm.conf,
gnu/packages/aux-files/linux-libre/5.2-arm64.conf,
gnu/packages/aux-files/linux-libre/5.2-i686.conf,
gnu/packages/aux-files/linux-libre/5.2-x86_64.conf: Set CONFIG_NF_TABLES_INET,
CONFIG_NF_TABLES_NETDEV, CONFIG_NF_TABLES_IPV4, CONFIG_NF_TABLES_IPV6 and
CONFIG_NF_TABLES_BRIDGE to 'y', and related options to 'm'.
---
 gnu/packages/aux-files/linux-libre/4.19-arm.conf   | 39 ++++++++++++++++----
 gnu/packages/aux-files/linux-libre/4.19-arm64.conf | 43 ++++++++++++++++++----
 gnu/packages/aux-files/linux-libre/4.19-i686.conf  | 35 +++++++++++++++---
 .../aux-files/linux-libre/4.19-x86_64.conf         | 35 +++++++++++++++---
 gnu/packages/aux-files/linux-libre/5.2-arm.conf    | 32 ++++++++++++----
 gnu/packages/aux-files/linux-libre/5.2-arm64.conf  | 42 +++++++++++++++------
 gnu/packages/aux-files/linux-libre/5.2-i686.conf   | 28 +++++++++++---
 gnu/packages/aux-files/linux-libre/5.2-x86_64.conf | 28 +++++++++++---
 8 files changed, 223 insertions(+), 59 deletions(-)

diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm.conf b/gnu/packages/aux-files/linux-libre/4.19-arm.conf
index 184f73276f..72161c09ff 100644
--- a/gnu/packages/aux-files/linux-libre/4.19-arm.conf
+++ b/gnu/packages/aux-files/linux-libre/4.19-arm.conf
@@ -1133,7 +1133,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
+CONFIG_NF_LOG_NETDEV=m
 CONFIG_NETFILTER_CONNCOUNT=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
@@ -1176,8 +1176,8 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -1189,15 +1189,22 @@ CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
+CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1361,8 +1368,12 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1370,6 +1381,9 @@ CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=y
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1401,7 +1415,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -1430,7 +1451,9 @@ CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/gnu/packages/aux-files/linux-libre/4.19-arm64.conf b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf
index 73cd300c18..47ec3c9765 100644
--- a/gnu/packages/aux-files/linux-libre/4.19-arm64.conf
+++ b/gnu/packages/aux-files/linux-libre/4.19-arm64.conf
@@ -1120,10 +1120,11 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
@@ -1136,12 +1137,20 @@ CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
-# CONFIG_NF_FLOW_TABLE is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -1303,14 +1312,22 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=y
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1342,7 +1359,15 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
@@ -1358,7 +1383,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
-# CONFIG_IP6_NF_MATCH_SRH is not set
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
@@ -1370,7 +1395,9 @@ CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
 CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/gnu/packages/aux-files/linux-libre/4.19-i686.conf b/gnu/packages/aux-files/linux-libre/4.19-i686.conf
index c1df3f0f49..75a18ec5ef 100644
--- a/gnu/packages/aux-files/linux-libre/4.19-i686.conf
+++ b/gnu/packages/aux-files/linux-libre/4.19-i686.conf
@@ -1209,8 +1209,8 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -1226,11 +1226,18 @@ CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1394,8 +1401,12 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1403,6 +1414,9 @@ CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=y
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1434,7 +1448,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -1468,7 +1489,9 @@ CONFIG_NF_DEFRAG_IPV6=m
 # DECnet: Netfilter Configuration
 #
 CONFIG_DECNET_NF_GRABULATOR=m
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf
index a8f8c81648..f151036410 100644
--- a/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf
+++ b/gnu/packages/aux-files/linux-libre/4.19-x86_64.conf
@@ -1219,8 +1219,8 @@ CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -1236,11 +1236,18 @@ CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1404,8 +1411,12 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_CHAIN_ROUTE_IPV4=m
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1413,6 +1424,9 @@ CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=y
+CONFIG_NFT_CHAIN_NAT_IPV4=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1444,7 +1458,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_CHAIN_ROUTE_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -1478,7 +1499,9 @@ CONFIG_NF_DEFRAG_IPV6=m
 # DECnet: Netfilter Configuration
 #
 CONFIG_DECNET_NF_GRABULATOR=m
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/gnu/packages/aux-files/linux-libre/5.2-arm.conf b/gnu/packages/aux-files/linux-libre/5.2-arm.conf
index 4ac8ed642d..7cab0ab66c 100644
--- a/gnu/packages/aux-files/linux-libre/5.2-arm.conf
+++ b/gnu/packages/aux-files/linux-libre/5.2-arm.conf
@@ -1117,7 +1117,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
+CONFIG_NF_LOG_NETDEV=m
 CONFIG_NETFILTER_CONNCOUNT=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
@@ -1157,8 +1157,8 @@ CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -1168,17 +1168,25 @@ CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
+CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1345,8 +1353,11 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1383,7 +1394,10 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -1412,7 +1426,9 @@ CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf
index 4ad652a78f..99ff63354f 100644
--- a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf
+++ b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf
@@ -1118,28 +1118,38 @@ CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
+# CONFIG_NFT_FLOW_OFFLOAD is not set
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
-# CONFIG_NF_FLOW_TABLE is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -1304,8 +1314,12 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
@@ -1341,7 +1355,11 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
@@ -1355,7 +1373,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
-# CONFIG_IP6_NF_MATCH_SRH is not set
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
@@ -1369,7 +1387,9 @@ CONFIG_IP6_NF_TARGET_NPT=m
 # end of IPv6: Netfilter Configuration
 
 CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -8028,9 +8048,9 @@ CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
+CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
+CONFIG_FS_MBCACHE=y
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set
@@ -8687,7 +8707,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_INDIRECT_PIO is not set
 CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
+CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC32=y
diff --git a/gnu/packages/aux-files/linux-libre/5.2-i686.conf b/gnu/packages/aux-files/linux-libre/5.2-i686.conf
index 0a211f6eb9..8813a70d3d 100644
--- a/gnu/packages/aux-files/linux-libre/5.2-i686.conf
+++ b/gnu/packages/aux-files/linux-libre/5.2-i686.conf
@@ -1147,8 +1147,8 @@ CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -1158,17 +1158,25 @@ CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1335,8 +1343,11 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1373,7 +1384,10 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -1409,7 +1423,9 @@ CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_DECNET_NF_GRABULATOR=m
 # end of DECnet: Netfilter Configuration
 
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/gnu/packages/aux-files/linux-libre/5.2-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.2-x86_64.conf
index 51d4e93372..e1d2c93f9a 100644
--- a/gnu/packages/aux-files/linux-libre/5.2-x86_64.conf
+++ b/gnu/packages/aux-files/linux-libre/5.2-x86_64.conf
@@ -1168,8 +1168,8 @@ CONFIG_NF_NAT_MASQUERADE=y
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_SET=m
-# CONFIG_NF_TABLES_INET is not set
-# CONFIG_NF_TABLES_NETDEV is not set
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -1179,17 +1179,25 @@ CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1356,8 +1364,11 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_TABLES_IPV4 is not set
-# CONFIG_NF_TABLES_ARP is not set
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1394,7 +1405,10 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_TABLES_IPV6 is not set
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -1430,7 +1444,9 @@ CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_DECNET_NF_GRABULATOR=m
 # end of DECnet: Netfilter Configuration
 
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
-- 
cgit v1.2.3


From 3c4f5ad7f403cc5ff0524d62a8612b0decaeaeb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 
Date: Fri, 13 Sep 2019 17:53:59 +0800
Subject: services: Add nftables-service-type.

* gnu/services/networking.scm (%default-nftables-ruleset): New variable.
(): New record type.
(nftables-shepherd-service): New procedure.
(nftables-service-type): New service type.
* doc/guix.texi (Networking Services): Document it.
---
 doc/guix.texi               | 27 +++++++++++++++
 gnu/services/networking.scm | 82 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 55935b3794..666ecb5b47 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13041,6 +13041,33 @@ objects}).
 @end table
 @end deftp
 
+@cindex nftables
+@defvr {Scheme Variable} nftables-service-type
+This is the service type to set up a nftables configuration.  nftables is a
+netfilter project that aims to replace the existing iptables, ip6tables,
+arptables and ebtables framework.  It provides a new packet filtering
+framework, a new user-space utility @command{nft}, and a compatibility layer
+for iptables.  This service comes with a default ruleset
+@code{%default-nftables-ruleset} that rejecting all incomming connections
+except those to the ssh port 22.  To use it, simply write:
+
+@lisp
+(service nftables-service-type)
+@end lisp
+@end defvr
+
+@deftp {Data Type} nftables-configuration
+The data type representing the configuration of nftables.
+
+@table @asis
+@item @code{package} (default: @code{nftables})
+The nftables package that provides @command{nft}.
+@item @code{ruleset} (default: @code{%default-nftables-ruleset})
+The nftables ruleset to use.  This may be any ``file-like'' object
+(@pxref{G-Expressions, file-like objects}).
+@end table
+@end deftp
+
 @cindex NTP (Network Time Protocol), service
 @cindex ntpd, service for the Network Time Protocol daemon
 @cindex real time clock
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index c775242f99..dd63009116 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018 Arun Isaac 
 ;;; Copyright © 2019 Florian Pelz 
 ;;; Copyright © 2019 Maxim Cournoyer 
+;;; Copyright © 2019 Sou Bunnbu 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -144,7 +145,14 @@
             iptables-configuration-iptables
             iptables-configuration-ipv4-rules
             iptables-configuration-ipv6-rules
-            iptables-service-type))
+            iptables-service-type
+
+            nftables-service-type
+            nftables-configuration
+            nftables-configuration?
+            nftables-configuration-package
+            nftables-configuration-ruleset
+            %default-nftables-ruleset))
 
 ;;; Commentary:
 ;;;
@@ -1415,4 +1423,76 @@ COMMIT
     (list (service-extension shepherd-root-service-type
                              (compose list iptables-shepherd-service))))))
 
+;;;
+;;; nftables
+;;;
+
+(define %default-nftables-ruleset
+  (plain-file "nftables.conf"
+              "# A simple and safe firewall
+table inet filter {
+  chain input {
+    type filter hook input priority 0; policy drop;
+
+    # early drop of invalid connections
+    ct state invalid drop
+
+    # allow established/related connections
+    ct state { established, related } accept
+
+    # allow from loopback
+    iifname lo accept
+
+    # allow icmp
+    ip protocol icmp accept
+    ip6 nexthdr icmpv6 accept
+
+    # allow ssh
+    tcp dport ssh accept
+
+    # reject everything else
+    reject with icmpx type port-unreachable
+  }
+  chain forward {
+    type filter hook forward priority 0; policy drop;
+  }
+  chain output {
+    type filter hook output priority 0; policy accept;
+  }
+}
+"))
+
+(define-record-type* 
+  nftables-configuration
+  make-nftables-configuration
+  nftables-configuration?
+  (package nftables-configuration-package
+           (default nftables))
+  (ruleset nftables-configuration-ruleset ; file-like object
+           (default %default-nftables-ruleset)))
+
+(define nftables-shepherd-service
+  (match-lambda
+    (($  package ruleset)
+     (let ((nft (file-append package "/sbin/nft")))
+       (shepherd-service
+        (documentation "Packet filtering and classification")
+        (provision '(nftables))
+        (start #~(lambda _
+                   (invoke #$nft "--file" #$ruleset)))
+        (stop #~(lambda _
+                  (invoke #$nft "flush" "ruleset"))))))))
+
+(define nftables-service-type
+  (service-type
+   (name 'nftables)
+   (description
+    "Run @command{nft}, setting up the specified ruleset.")
+   (extensions
+    (list (service-extension shepherd-root-service-type
+                             (compose list nftables-shepherd-service))
+          (service-extension profile-service-type
+                             (compose list nftables-configuration-package))))
+   (default-value (nftables-configuration))))
+
 ;;; networking.scm ends here
-- 
cgit v1.2.3


From f9c0400392843540a87985a67ffb9fb6e4dbc2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 14:55:44 +0200
Subject: guix package: "guix package -f FILE" ensures FILE returns a package.

* guix/scripts/package.scm (options->installable): Add clause for
'install option with a non-package object.
* tests/guix-package.sh: Add test.
---
 guix/scripts/package.scm |  6 +++++-
 tests/guix-package.sh    | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index a43c96516f..21737f43da 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -607,7 +607,11 @@ and upgrades."
                        (let-values (((package output)
                                      (specification->package+output spec)))
                          (package->manifest-entry* package output))))
-                  (_ #f))
+                  (('install . obj)
+                   (leave (G_ "cannot install non-package object: ~s~%")
+                          obj))
+                  (_
+                   #f))
                 opts))
 
   (fold manifest-transaction-install-entry
diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index 79d6ec65e4..79e89286f1 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -331,6 +331,17 @@ cat > "$module_dir/package.scm"< "$module_dir/package.scm"<
Date: Wed, 18 Sep 2019 15:11:40 +0200
Subject: linux-container: 'eval/container' correctly passes -L and -C flags.

This fixes a type error.

* gnu/system/linux-container.scm (eval/container): Use 'append-map', not
'map'.
* tests/containers.scm ("eval/container, non-empty load path"): New test.
---
 gnu/system/linux-container.scm | 12 +++++++-----
 tests/containers.scm           | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index c6124cd223..2ab679ff3f 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -257,11 +257,13 @@ effects."
                                            (lowered-gexp-guile lowered))
                                           "/bin/guile")
                            "guile"
-                           (append (map (lambda (directory) `("-L" ,directory))
-                                        (lowered-gexp-load-path lowered))
-                                   (map (lambda (directory) `("-C" ,directory))
-                                        (lowered-gexp-load-compiled-path
-                                         lowered))
+                           (append (append-map (lambda (directory)
+                                                 `("-L" ,directory))
+                                               (lowered-gexp-load-path lowered))
+                                   (append-map (lambda (directory)
+                                                 `("-C" ,directory))
+                                               (lowered-gexp-load-compiled-path
+                                                lowered))
                                    (list "-c"
                                          (object->string
                                           (lowered-gexp-sexp lowered))))))))))))
diff --git a/tests/containers.scm b/tests/containers.scm
index c6c738f234..01fbcbb45a 100644
--- a/tests/containers.scm
+++ b/tests/containers.scm
@@ -269,4 +269,31 @@
                       (lset= string=? (cons* "." ".." (map basename reqs))
                              (pk (call-with-input-file result read))))))))))
 
+(test-assert "eval/container, non-empty load path"
+  (call-with-temporary-directory
+   (lambda (directory)
+     (define store
+       (open-connection-for-tests))
+     (define result
+       (string-append directory "/r"))
+     (define requisites*
+       (store-lift requisites))
+
+     (mkdir result)
+     (run-with-store store
+       (mlet %store-monad ((status (eval/container
+                                    (with-imported-modules '((guix build utils))
+                                      #~(begin
+                                          (use-modules (guix build utils))
+                                          (mkdir-p "/result/a/b/c")))
+                                    #:mappings
+                                    (list (file-system-mapping
+                                           (source result)
+                                           (target "/result")
+                                           (writable? #t))))))
+         (close-connection store)
+         (return (and (zero? status)
+                      (file-is-directory?
+                       (string-append result "/a/b/c")))))))))
+
 (test-end)
-- 
cgit v1.2.3


From af632c6b70feaf83c534fa282904b5fdf6f6f919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 21:44:15 +0200
Subject: gnu: nlohmann-json-cpp: Update to 3.7.0.

* gnu/packages/serialization.scm (nlohmann-json-cpp): Update to 3.7.0.
[source]: Use 'git-fetch'.
[native-inputs, arguments]: New fields.
---
 gnu/packages/serialization.scm | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index f0ae0d2cab..9fefa5a0c1 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -42,6 +42,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -394,17 +395,29 @@ it is comparable to protobuf.")
 (define-public nlohmann-json-cpp
   (package
     (name "nlohmann-json-cpp")
-    (version "2.1.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "https://github.com/nlohmann/json/"
-                          "archive/v" version ".tar.gz"))
-      (file-name (string-append name "-" version ".tar.gz"))
-      (sha256
-       (base32
-        "0lrh6cjd643c7kmvmwafbgq7dqj3b778483gjhjbvp6rc6z5xf2r"))))
+    (version "3.7.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nlohmann/json.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap"))))
     (build-system cmake-build-system)
+    (native-inputs
+     ;; Integer overflow tests like those from
+     ;;  fail when building with
+     ;; gcc@5.  Thus, build with a newer GCC.
+     `(("gcc" ,gcc-9)))
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'build 'unset-path-variables
+                    (lambda _
+                      (unsetenv "C_INCLUDE_PATH")
+                      (unsetenv "CPLUS_INCLUDE_PATH")
+                      #t)))))
     (home-page "https://nlohmann.github.io/json/")
     (synopsis "JSON library for C++")
     (description
-- 
cgit v1.2.3


From 2cde4a967d162dc46cc1f6967ed21b196c14c338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 21:52:18 +0200
Subject: gnu: Add python-jupyter-protocol.

* gnu/packages/jupyter.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk             |  1 +
 gnu/packages/jupyter.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 gnu/packages/jupyter.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 3f32b9cbf2..1aaab0ebf0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -270,6 +270,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/jrnl.scm				\
   %D%/packages/jose.scm				\
   %D%/packages/julia.scm			\
+  %D%/packages/jupyter.scm			\
   %D%/packages/kawa.scm				\
   %D%/packages/kde.scm				\
   %D%/packages/kde-frameworks.scm		\
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
new file mode 100644
index 0000000000..c7c1318808
--- /dev/null
+++ b/gnu/packages/jupyter.scm
@@ -0,0 +1,57 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Ludovic Courtès 
+;;;
+;;; 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 .
+
+(define-module (gnu packages jupyter)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages time))
+
+(define-public python-jupyter-protocol
+  (package
+    (name "python-jupyter-protocol")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "jupyter_protocol" version))
+              (sha256
+               (base32
+                "1bk3as5yw9y5nmq6l15nr46aby34phmvsx9kxgqnm5pd5q2b5h57"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-dateutil" ,python-dateutil)
+       ("python-jupyter-core" ,python-jupyter-core)
+       ("python-pyzmq" ,python-pyzmq)
+       ("python-traitlets" ,python-traitlets)))
+    (native-inputs
+     `(("python-ipykernel" ,python-ipykernel)
+       ("python-ipython" ,python-ipython)
+       ("python-mock" ,python-mock)
+       ("python-pytest" ,python-pytest)))
+    (home-page "https://jupyter.org")
+    (synopsis "Jupyter protocol implementation")
+    (description
+     "This Python library is an experimental implementation of the
+@uref{https://jupyter-client.readthedocs.io/en/latest/messaging.html, Jupyter
+protocol} to be used by both clients and kernels.")
+    (license license:bsd-3)
+    (properties '((upstream-name . "jupyter_protocol")))))
-- 
cgit v1.2.3


From 2835fb07bacd5e99e99120eb9f3b7004a872f574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 21:53:57 +0200
Subject: gnu: Add python-jupyter-kernel-mgmt.

* gnu/packages/jupyter.scm (python-jupyter-kernel-mgmt): New variable.
---
 gnu/packages/jupyter.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index c7c1318808..bcea43f11c 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -55,3 +55,34 @@
 protocol} to be used by both clients and kernels.")
     (license license:bsd-3)
     (properties '((upstream-name . "jupyter_protocol")))))
+
+(define-public python-jupyter-kernel-mgmt
+  (package
+    (name "python-jupyter-kernel-mgmt")
+    (version "0.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "jupyter_kernel_mgmt" version))
+              (sha256
+               (base32
+                "0i7a78dn89ca8h0a42giyxwcmk6y4wrdr7q8h2ax9vybb84c795q"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-dateutil" ,python-dateutil)
+       ("python-entrypoints" ,python-entrypoints)
+       ("python-jupyter-core" ,python-jupyter-core)
+       ("python-jupyter-protocol" ,python-jupyter-protocol)
+       ("python-pyzmq" ,python-pyzmq)
+       ("python-traitlets" ,python-traitlets)))
+    (native-inputs
+     `(("python-ipykernel" ,python-ipykernel)
+       ("python-ipython" ,python-ipython)
+       ("python-mock" ,python-mock)
+       ("python-pytest" ,python-pytest)))
+    (home-page "https://jupyter.org")
+    (synopsis "Discover, launch, and communicate with Jupyter kernels")
+    (description
+     "This package is an experimental refactoring of the machinery for
+launching and using Jupyter kernels.")
+    (license license:bsd-3)
+    (properties '((upstream-name . "jupyter_kernel_mgmt")))))
-- 
cgit v1.2.3


From a52d8cc6c79941de3380ed763d46b38404094758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 21:58:28 +0200
Subject: gnu: Add python-jupyter-kernel-test.

* gnu/packages/jupyter.scm (python-jupyter-kernel-test): New file.
---
 gnu/packages/jupyter.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index bcea43f11c..a7ca0a9913 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -20,6 +20,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system python)
   #:use-module (gnu packages check)
   #:use-module (gnu packages python)
@@ -86,3 +87,49 @@ protocol} to be used by both clients and kernels.")
 launching and using Jupyter kernels.")
     (license license:bsd-3)
     (properties '((upstream-name . "jupyter_kernel_mgmt")))))
+
+(define-public python-jupyter-kernel-test
+  (package
+    (name "python-jupyter-kernel-test")
+    (version "0.3")
+    (home-page "https://github.com/jupyter/jupyter_kernel_test")
+    (source (origin
+              ;; PyPI has a ".whl" file but not a proper source release.
+              ;; Thus, fetch code from Git.
+              (method git-fetch)
+              (uri (git-reference (url home-page) (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "00iy74i4i8is6axb9vlsm0b9wxkvyyxnbl8r0i4gaj3xd788jm83"))))
+    (build-system python-build-system)
+    (arguments
+     ;; The repo doesn't contain a "setup.py" file so install files manually.
+     '(#:phases (modify-phases %standard-phases
+                  (delete 'build)
+                  (delete 'check)
+                  (replace 'install
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (version ((@@ (guix build python-build-system)
+                                           get-python-version)
+                                       (assoc-ref inputs "python")))
+                             (pydir (string-append out "/lib/python"
+                                                   version "/site-packages/"
+                                                   "jupyter_kernel_test")))
+                        (for-each (lambda (file)
+                                    (install-file file pydir))
+                                  (find-files "jupyter_kernel_test"
+                                              "\\.py$"))
+                        #t))))))
+    (propagated-inputs
+     `(("python-jupyter-kernel-mgmt" ,python-jupyter-kernel-mgmt)
+       ("python-jupyter-protocol" ,python-jupyter-protocol)
+       ("python-jsonschema" ,python-jsonschema)))
+    (synopsis "Test Jupyter kernels")
+    (description
+     "@code{jupyter_kernel_test} is a tool for testing Jupyter kernels.  It
+tests kernels for successful code execution and conformance with the
+@uref{https://jupyter-client.readthedocs.io/en/latest/messaging.html, Jupyter
+Messaging Protocol}.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From 4bb7d14bbe959c884dfe3a370927211b0593e6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 22:02:10 +0200
Subject: gnu: Add Xeus.

* gnu/packages/jupyter.scm (xeus): New variable.
---
 gnu/packages/jupyter.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index a7ca0a9913..7ec987b2a4 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -21,11 +21,18 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system python)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cpp)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages networking)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages time))
+  #:use-module (gnu packages serialization)
+  #:use-module (gnu packages time)
+  #:use-module (gnu packages tls))
 
 (define-public python-jupyter-protocol
   (package
@@ -133,3 +140,50 @@ tests kernels for successful code execution and conformance with the
 @uref{https://jupyter-client.readthedocs.io/en/latest/messaging.html, Jupyter
 Messaging Protocol}.")
     (license license:bsd-3)))
+
+(define-public xeus
+  (package
+    (name "xeus")
+    (version "0.23.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/QuantStack/xeus.git")
+                    (commit version)))
+              (sha256
+               (base32
+                "1m1b6z1538r7mv2ggn7bdbd9570ja7cadplq64zl8rgl2c8vdi2a"))
+              (file-name (git-file-name name version))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:configure-flags '("-DBUILD_STATIC_LIBS=OFF"
+                           "-DDISABLE_ARCH_NATIVE=ON" ;no '-march=native'
+                           "-DBUILD_TESTING=ON")))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+
+       ;; The following inputs are used by the test suite.
+       ("googletest" ,googletest)
+       ("python-pytest" ,python-pytest)
+       ("python" ,python-3)
+       ("python-jupyter-kernel-test" ,python-jupyter-kernel-test)
+       ("python-jupyter-client" ,python-jupyter-client)))
+    (inputs
+     `(("xtl" ,xtl)
+       ("nlohmann-json-cpp" ,nlohmann-json-cpp)
+       ("cppzmq" ,cppzmq)
+       ("zeromq" ,zeromq)
+       ("openssl" ,openssl)
+       ("util-linux" ,util-linux)))               ;libuuid
+    (home-page "https://quantstack.net/xeus")
+    (synopsis "C++ implementation of the Jupyter Kernel protocol")
+    (description
+     "@code{xeus} is a library meant to facilitate the implementation of
+kernels for Jupyter.  It takes the burden of implementing the Jupyter Kernel
+protocol so developers can focus on implementing the interpreter part of the
+kernel.
+
+Several Jupyter kernels are built upon @code{xeus}, such as @code{xeus-cling},
+a kernel for the C++ programming language, and @code{xeus-python}, an
+alternative Python kernel for Jupyter.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From d0980ef41859d1f0e4deb98a7f1d6f4ab2c9d4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 22:46:21 +0200
Subject: doc: Mention the "repository name" for 'guix pack -f docker'.

This is a followup to 0074844366381e3056d09492b8b437836c7adb61.

* doc/guix.texi (Invoking guix pack): Mention the repository name.
---
 doc/guix.texi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 666ecb5b47..da62194a16 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4835,7 +4835,9 @@ specified binaries and symlinks.
 @item docker
 This produces a tarball that follows the
 @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md,
-Docker Image Specification}.
+Docker Image Specification}.  The ``repository name'' as it appears in
+the output of the @command{docker images} command is computed from
+package names passed on the command line or in the manifest file.
 
 @item squashfs
 This produces a SquashFS image containing all the specified binaries and
-- 
cgit v1.2.3


From 45fbc15a48d04cf9deaa5d40658846426cc94845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 22:53:17 +0200
Subject: import: pypi: Refresher recognizes pythonhosted.org source URLs.

This is a followup to a5376200541abf8245973e601be246bf65b8b6c7.
Since that commit, 'pypi-package?' would return false for most Python
packages, and thus "guix refresh python-xxx" would report that no
updaters apply to the package.

* guix/import/pypi.scm (pypi-package?)[pypi-url?]: Recognize
"files.pythonhosted.org" URLs.
---
 guix/import/pypi.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 9b3d80a02e..354cae9c4c 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -437,7 +437,8 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
   (define (pypi-url? url)
     (or (string-prefix? "https://pypi.org/" url)
         (string-prefix? "https://pypi.python.org/" url)
-        (string-prefix? "https://pypi.org/packages" url)))
+        (string-prefix? "https://pypi.org/packages" url)
+        (string-prefix? "https://files.pythonhosted.org/packages" url)))
 
   (let ((source-url (and=> (package-source package) origin-uri))
         (fetch-method (and=> (package-source package) origin-method)))
-- 
cgit v1.2.3


From ee25048e51dd45ad91a1ad4b0f25f4013843c52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 18 Sep 2019 22:59:13 +0200
Subject: pull: Work around Ubuntu's 'sudo'.

Partly fixes .
Reported by Julien Lepiller .

* guix/scripts/pull.scm (ensure-default-profile): Do not call
'migrate-generations' when "SUDO_USER" is set.
---
 guix/scripts/pull.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 54bbaddf30..4b03cea2e3 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -293,8 +293,15 @@ true, display what would be built without actually building it."
 
   ;; In 0.15.0+ we'd create ~/.config/guix/current-[0-9]*-link symlinks.  Move
   ;; them to %PROFILE-DIRECTORY.
-  (unless (string=? %profile-directory
-                    (dirname (canonicalize-profile %user-profile-directory)))
+  ;;
+  ;; XXX: Ubuntu's 'sudo' preserves $HOME by default, and thus the second
+  ;; condition below is always false when one runs "sudo guix pull".  As a
+  ;; workaround, skip this code when $SUDO_USER is set.  See
+  ;; .
+  (unless (or (getenv "SUDO_USER")
+              (string=? %profile-directory
+                        (dirname
+                         (canonicalize-profile %user-profile-directory))))
     (migrate-generations %user-profile-directory %profile-directory))
 
   ;; Make sure ~/.config/guix/current points to /var/guix/profiles/….
-- 
cgit v1.2.3


From da551107129d22dfb2a4278a55b702a7340e7f51 Mon Sep 17 00:00:00 2001
From: Konrad Hinsen 
Date: Wed, 18 Sep 2019 09:52:18 +0200
Subject: scripts: pull: Add options for generation management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/scripts/pull.scm (%options) Add --roll-back, --switch-generation,
--delete-generations
(process-generation-change): New function
(guix-pull): Execute generation management operations

* doc/guix.texi: Document the generation management operations

Signed-off-by: Ludovic Courtès 
---
 doc/guix.texi         | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 guix/scripts/pull.scm | 41 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index da62194a16..0ed59072c9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3673,11 +3673,20 @@ Generation 3	Jun 13 2018 23:31:07	(current)
 @xref{Invoking guix describe, @command{guix describe}}, for other ways to
 describe the current status of Guix.
 
-This @code{~/.config/guix/current} profile works like any other profile
-created by @command{guix package} (@pxref{Invoking guix package}).  That
+This @code{~/.config/guix/current} profile works exactly like the profiles
+created by @command{guix package} (@pxref{Invoking guix package}). That
 is, you can list generations, roll back to the previous
 generation---i.e., the previous Guix---and so on:
 
+@example
+$ guix pull --roll-back
+switched from generation 3 to 2
+$ guix pull --delete-generations=1
+deleting /var/guix/profiles/per-user/charlie/current-guix-1-link
+@end example
+
+You can also use @command{guix package} (@pxref{Invoking guix package})
+to manage the profile by naming it explicitly:
 @example
 $ guix package -p ~/.config/guix/current --roll-back
 switched from generation 3 to 2
@@ -3724,6 +3733,40 @@ is provided, the subset of generations that match @var{pattern}.
 The syntax of @var{pattern} is the same as with @code{guix package
 --list-generations} (@pxref{Invoking guix package}).
 
+@item --roll-back
+@cindex rolling back
+@cindex undoing transactions
+@cindex transactions, undoing
+Roll back to the previous @dfn{generation} of @file{~/.config/guix/current}---i.e.,
+undo the last transaction.
+
+@item --switch-generation=@var{pattern}
+@itemx -S @var{pattern}
+@cindex generations
+Switch to a particular generation defined by @var{pattern}.
+
+@var{pattern} may be either a generation number or a number prefixed
+with ``+'' or ``-''.  The latter means: move forward/backward by a
+specified number of generations.  For example, if you want to return to
+the latest generation after @code{--roll-back}, use
+@code{--switch-generation=+1}.
+
+@item --delete-generations[=@var{pattern}]
+@itemx -d [@var{pattern}]
+When @var{pattern} is omitted, delete all generations except the current
+one.
+
+This command accepts the same patterns as @option{--list-generations}.
+When @var{pattern} is specified, delete the matching generations.  When
+@var{pattern} specifies a duration, generations @emph{older} than the
+specified duration match.  For instance, @code{--delete-generations=1m}
+deletes generations that are more than one month old.
+
+If the current generation matches, it is @emph{not} deleted.
+
+Note that deleting generations prevents rolling back to them.
+Consequently, this command must be used with care.
+
 @xref{Invoking guix describe}, for a way to display information about the
 current generation only.
 
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 4b03cea2e3..c9835cef34 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -38,7 +38,8 @@
   #:use-module (guix git)
   #:use-module (git)
   #:use-module (gnu packages)
-  #:use-module ((guix scripts package) #:select (build-and-use-profile))
+  #:use-module ((guix scripts package) #:select (build-and-use-profile
+                                                 delete-matching-generations))
   #:use-module ((gnu packages base) #:select (canonical-package))
   #:use-module (gnu packages guile)
   #:use-module ((gnu packages bootstrap)
@@ -91,6 +92,14 @@ Download and deploy the latest version of Guix.\n"))
   (display (G_ "
   -l, --list-generations[=PATTERN]
                          list generations matching PATTERN"))
+  (display (G_ "
+      --roll-back        roll back to the previous generation"))
+  (display (G_ "
+  -d, --delete-generations[=PATTERN]
+                         delete generations matching PATTERN"))
+  (display (G_ "
+  -S, --switch-generation=PATTERN
+                         switch to a generation matching PATTERN"))
   (display (G_ "
   -p, --profile=PROFILE  use PROFILE instead of ~/.config/guix/current"))
   (display (G_ "
@@ -120,6 +129,18 @@ Download and deploy the latest version of Guix.\n"))
                  (lambda (opt name arg result)
                    (cons `(query list-generations ,arg)
                          result)))
+         (option '("roll-back") #f #f
+                 (lambda (opt name arg result)
+                   (cons '(generation roll-back)
+                         result)))
+         (option '(#\S "switch-generation") #t #f
+                 (lambda (opt name arg result)
+                   (cons `(generation switch ,arg)
+                         result)))
+         (option '(#\d "delete-generations") #f #t
+                 (lambda (opt name arg result)
+                   (cons `(generation delete ,arg)
+                         result)))
          (option '(#\N "news") #f #f
                  (lambda (opt name arg result)
                    (cons '(query display-news) result)))
@@ -505,6 +526,22 @@ list of package changes.")))))
      (display-profile-news profile
                            #:current-is-newer? #t))))
 
+(define (process-generation-change opts profile)
+  "Process a request to change the current generation (roll-back, switch, delete)."
+  (unless (assoc-ref opts 'dry-run?)
+    (match (assoc-ref opts 'generation)
+      (('roll-back)
+       (with-store store
+         (roll-back* store profile)))
+      (('switch pattern)
+       (let ((number (relative-generation-spec->number profile pattern)))
+         (if number
+             (switch-to-generation* profile number)
+             (leave (G_ "cannot switch to generation '~a'~%") pattern))))
+      (('delete pattern)
+       (with-store store
+         (delete-matching-generations store profile pattern))))))
+
 (define (channel-list opts)
   "Return the list of channels to use.  If OPTS specify a channel file,
 channels are read from there; otherwise, if ~/.config/guix/channels.scm
@@ -572,6 +609,8 @@ Use '~/.config/guix/channels.scm' instead."))
             (profile  (or (assoc-ref opts 'profile) %current-profile)))
        (cond ((assoc-ref opts 'query)
               (process-query opts profile))
+             ((assoc-ref opts 'generation)
+              (process-generation-change opts profile))
              (else
               (with-store store
                 (ensure-default-profile)
-- 
cgit v1.2.3


From b48d77fcf66a7fd41ea281afdfb9a56794a0083e Mon Sep 17 00:00:00 2001
From: "Alejandro \"HiPhish\" Sanchez" 
Date: Wed, 18 Sep 2019 21:22:57 +0200
Subject: gnu: libvterm: Update to 1.1.0.

* gnu/packages/terminals.scm (libvterm): Update to 1.1.0.
[arguments]: Enable tests.

Signed-off-by: Ricardo Wurmus 
---
 gnu/packages/terminals.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 98ed77289a..f902000cae 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -460,7 +460,7 @@ should be thread-safe.")
 (define-public libvterm
   (package
     (name "libvterm")
-    (version "0.1")
+    (version "0.1.1")
     (source
      (origin
        (method url-fetch)
@@ -468,13 +468,12 @@ should be thread-safe.")
                            "libvterm-" version ".tar.gz"))
        (sha256
         (base32
-         "1pcxjhvdwhr2f3lyzf2rv1vp3l62bgkjm1ybhj82qf8yly7ca6g4"))))
+         "1n5maylann2anfifjy576vzyar9q5m1kzpyiz2hca2pacxy8xf4v"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
        (list "CC=gcc"
              (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:tests? #f ; XXX: some tests fail in this release
        #:test-target "test"
        #:phases
        (modify-phases %standard-phases
-- 
cgit v1.2.3


From ded2dab3d8d31b493233f09dab9edb031409113f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 18 Sep 2019 23:59:01 +0200
Subject: gnu: bind: Update to 9.14.6 [fixes CVE-2019-6471].

* gnu/packages/dns.scm (isc-bind): Update to 9.14.6.
---
 gnu/packages/dns.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 8b8622813b..5f3686347d 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -109,7 +109,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
 (define-public isc-bind
   (package
     (name "bind")
-    (version "9.14.5")
+    (version "9.14.6")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -117,7 +117,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
                     "/bind-" version ".tar.gz"))
               (sha256
                (base32
-                "0ic0k0kpavwnbyf10rwx6yypxg66f65fprwc0dbmp61xp0n6gl0j"))))
+                "1zpd47ckn5lf4qbscfkj7krngwn2gwsp961v5401h3lhxm0a0rw9"))))
     (build-system gnu-build-system)
     (outputs `("out" "utils"))
     (inputs
-- 
cgit v1.2.3


From f8853858b8a3532229ea637b0829dcd8169faa19 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 19 Sep 2019 00:01:53 +0200
Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.11 [fixes CVE-2019-6471].

* gnu/packages/admin.scm (isc-dhcp)[bind-patch-version]: Update to 11.
[inputs]: Update bind-source-tarball hash.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2e072deed7..645c2ef5d5 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -684,7 +684,7 @@ connection alive.")
 (define-public isc-dhcp
   (let* ((bind-major-version "9")
          (bind-minor-version "11")
-         (bind-patch-version "10")
+         (bind-patch-version "11")
          (bind-release-type "")         ; for patch release, use "-P"
          (bind-release-version "")      ; for patch release, e.g. "6"
          (bind-version (string-append bind-major-version
@@ -825,7 +825,7 @@ connection alive.")
                                         "/bind-" bind-version ".tar.gz"))
                     (sha256
                      (base32
-                      "1hvhdaar9swh5087kzkbmav1nbn19rxh0m60x0d7gri0v8689fxj"))))
+                      "0swavslyli3vcrkcm2ip11s6p58g3k7r4gjs2b899r25cqrk0lk1"))))
 
                 ;; When cross-compiling, we need the cross Coreutils and sed.
                 ;; Otherwise just use those from %FINAL-INPUTS.
-- 
cgit v1.2.3


From 52211add0b125be7e8a00bea2b3b030286109022 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sun, 8 Sep 2019 14:36:33 -0700
Subject: gnu: Move diffoscope and trydiffoscope to new diffoscope.scm.

* gnu/packages/package-management (diffoscope): Remove variable.
  (trydiffoscope): Remove variable.
  Update copyright information.
* gnu/packages/diffoscope.scm: New file.
  (diffoscope): Add variable.
  (trydiffoscope): Add variable.
* gnu/local.mk [GNU_SYSTEM_MODULES]: Add diffoscope.scm.
---
 gnu/local.mk                        |   1 +
 gnu/packages/diffoscope.scm         | 231 ++++++++++++++++++++++++++++++++++++
 gnu/packages/package-management.scm | 183 ----------------------------
 3 files changed, 232 insertions(+), 183 deletions(-)
 create mode 100644 gnu/packages/diffoscope.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index 1aaab0ebf0..1062bdcafe 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -143,6 +143,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/dejagnu.scm			\
   %D%/packages/dico.scm				\
   %D%/packages/dictionaries.scm			\
+  %D%/packages/diffoscope.scm			\
   %D%/packages/digest.scm			\
   %D%/packages/direct-connect.scm		\
   %D%/packages/disk.scm				\
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
new file mode 100644
index 0000000000..6eb5c1d9fe
--- /dev/null
+++ b/gnu/packages/diffoscope.scm
@@ -0,0 +1,231 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
+;;; Copyright © 2017 Ricardo Wurmus 
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2018 Julien Lepiller 
+;;; Copyright © 2018, 2019 Rutger Helling 
+;;; Copyright © 2019 Vagrant Cascadian 
+;;;
+;;; 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 .
+
+(define-module (gnu packages diffoscope)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages acl)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages backup)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages cdrom)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cpio)
+  #:use-module (gnu packages dbm)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages haskell)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages java)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages llvm)
+  #:use-module (gnu packages mono)
+  #:use-module (gnu packages package-management)
+  #:use-module (gnu packages patchutils)
+  #:use-module (gnu packages pdf)
+  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages ssh)
+  #:use-module (gnu packages textutils)
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages vim)
+  #:use-module (guix build-system python)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
+
+(define-public diffoscope
+  (let ((version "123"))
+    (package
+      (name "diffoscope")
+      (version version)
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://salsa.debian.org/reproducible-builds/diffoscope.git")
+                      (commit version)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "11bxms5rkhi0v4pxx29v4qgvhp3fmf0fkzci6gn5xcv4fl1zy4wj"))))
+      (build-system python-build-system)
+      (arguments
+       `(#:phases (modify-phases %standard-phases
+                    ;; setup.py mistakenly requires python-magic from PyPi, even
+                    ;; though the Python bindings of `file` are sufficient.
+                    ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844
+                    (add-after 'unpack 'dependency-on-python-magic
+                      (lambda _
+                        (substitute* "setup.py"
+                          (("'python-magic',") ""))))
+                    ;; This test is broken because our `file` package has a
+                    ;; bug in berkeley-db file type detection.
+                    (add-after 'unpack 'remove-berkeley-test
+                      (lambda _
+                        (delete-file "tests/comparators/test_berkeley_db.py")
+                        #t))
+                    ;; Test is dynamically generated and may have false
+                    ;; negatives with different ocaml versions.  Further
+                    ;; background in: https://bugs.debian.org/939386
+                    (add-after 'unpack 'remove-ocaml-test
+                      (lambda _
+                        (delete-file "tests/comparators/test_ocaml.py")
+                        #t))
+                    (add-after 'unpack 'embed-tool-references
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        (substitute* "diffoscope/comparators/utils/compare.py"
+                          (("\\['xxd',")
+                           (string-append "['" (which "xxd") "',")))
+                        (substitute* "diffoscope/comparators/elf.py"
+                          (("@tool_required\\('readelf'\\)") "")
+                          (("get_tool_name\\('readelf'\\)")
+                           (string-append "'" (which "readelf") "'")))
+                        (substitute* "diffoscope/comparators/directory.py"
+                          (("@tool_required\\('stat'\\)") "")
+                          (("@tool_required\\('getfacl'\\)") "")
+                          (("\\['stat',")
+                           (string-append "['" (which "stat") "',"))
+                          (("\\['getfacl',")
+                           (string-append "['" (which "getfacl") "',")))
+                        #t))
+                    (add-before 'check 'writable-test-data
+                      (lambda _
+                        ;; tests may need needs write access to tests
+                        ;; directory
+                        (for-each make-file-writable (find-files "tests"))
+                        #t))
+                    (add-before 'check 'delete-failing-test
+                      (lambda _
+                        ;; this requires /sbin to be on the path
+                        (delete-file "tests/test_tools.py")
+                        #t)))))
+      (inputs `(("rpm" ,rpm)                        ;for rpm-python
+                ("python-file" ,python-file)
+                ("python-debian" ,python-debian)
+                ("python-libarchive-c" ,python-libarchive-c)
+                ("python-tlsh" ,python-tlsh)
+                ("acl" ,acl)                        ;for getfacl
+                ("colordiff" ,colordiff)
+                ("xxd" ,xxd)))
+      ;; Below are modules used for tests.
+      (native-inputs `(("python-pytest" ,python-pytest)
+                       ("python-chardet" ,python-chardet)
+                       ;; test suite skips tests when tool is missing
+                       ("bdb" ,bdb)
+                       ("binutils" ,binutils)
+                       ("bzip2" ,bzip2)
+                       ("cdrtools" ,cdrtools)
+                       ("colord" ,colord)
+                       ("cpio" ,cpio)
+                       ("docx2txt" ,docx2txt)
+                       ("e2fsprogs" ,e2fsprogs)
+                       ("ffmpeg" ,ffmpeg)
+                       ("gettext" ,gettext-minimal)
+                       ("ghc" ,ghc)
+                       ("ghostscript" ,ghostscript)
+                       ("giflib:bin" ,giflib "bin")
+                       ("gnumeric" ,gnumeric)
+                       ("gnupg" ,gnupg)
+                       ("imagemagick" ,imagemagick)
+                       ("libarchive" ,libarchive)
+                       ("llvm" ,llvm)
+                       ("lz4" ,lz4)
+                       ("mono" ,mono)
+                       ("odt2txt" ,odt2txt)
+                       ;; no unversioned openjdk available
+                       ("openjdk:jdk" ,openjdk12 "jdk")
+                       ("openssh" ,openssh)
+                       ("pgpdump" ,pgpdump)
+                       ("poppler" ,poppler)
+                       ("rpm" ,rpm)
+                       ("sng" ,sng)
+                       ("sqlite" ,sqlite)
+                       ("squashfs-tools" ,squashfs-tools)
+                       ("tcpdump" ,tcpdump)
+                       ("unzip" ,unzip)
+                       ("xxd" ,xxd)
+                       ("xz" ,xz)
+                       ("zip" ,zip)))
+      (home-page "https://diffoscope.org/")
+      (synopsis "Compare files, archives, and directories in depth")
+      (description
+       "Diffoscope tries to get to the bottom of what makes files or directories
+different.  It recursively unpacks archives of many kinds and transforms
+various binary formats into more human readable forms to compare them.  It can
+compare two tarballs, ISO images, or PDFs just as easily.")
+      (license license:gpl3+))))
+
+(define-public trydiffoscope
+ (package
+   (name "trydiffoscope")
+   (version "67.0.1")
+   (source
+    (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://salsa.debian.org/reproducible-builds/trydiffoscope.git")
+            (commit version)))
+      (file-name (git-file-name name version))
+      (sha256
+       (base32
+        "03b66cjii7l2yiwffj6ym6mycd5drx7prfp4j2550281pias6mjh"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((share (string-append (assoc-ref outputs "out") "/share/")))
+               (mkdir-p (string-append share "/man/man1/" ))
+               (invoke "rst2man.py"
+                       "trydiffoscope.1.rst"
+                       (string-append share "/man/man1/trydiffoscope.1"))
+               (mkdir-p (string-append share "/doc/" ,name "-" ,version))
+               (install-file "./README.rst"
+                          (string-append share "/doc/" ,name "-" ,version)))
+             #t)))))
+    (propagated-inputs
+     `(("python-requests" ,python-requests)))
+    (native-inputs
+     `(("gzip" ,gzip)
+       ("python-docutils" ,python-docutils)))
+    (build-system python-build-system)
+    (home-page "https://try.diffoscope.org")
+    (synopsis "Client for remote diffoscope service")
+    (description "This is a client for the @url{https://try.diffoscope.org,
+remote diffoscope service}.
+
+Diffoscope tries to get to the bottom of what makes files or directories
+different.  It recursively unpacks archives of many kinds and transforms
+various binary formats into more human readable forms to compare them.  It can
+compare two tarballs, ISO images, or PDFs just as easily.
+
+Results are displayed by default, stored as local text or html files, or made
+available via a URL on @url{https://try.diffoscope.org}.  Results stored on the
+server are purged after 30 days.")
+    (license license:gpl3+)))
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index a56c738e78..26f1458028 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -10,7 +10,6 @@
 ;;; Copyright © 2018 Sou Bunnbu 
 ;;; Copyright © 2018, 2019 Eric Bavier 
 ;;; Copyright © 2019 Efraim Flashner 
-;;; Copyright © 2019 Vagrant Cascadian 
 ;;; Copyright © 2019 Jonathan Brielmaier 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -31,7 +30,6 @@
 (define-module (gnu packages package-management)
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
-  #:use-module (gnu packages admin)
   #:use-module (gnu packages attr)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages autotools)
@@ -40,7 +38,6 @@
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages bootstrap)          ;for 'bootstrap-guile-origin'
-  #:use-module (gnu packages cdrom)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpio)
@@ -50,7 +47,6 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages file)
   #:use-module (gnu packages gettext)
-  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
@@ -58,19 +54,12 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages guile-xyz)
-  #:use-module (gnu packages haskell)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages imagemagick)
-  #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lisp)
-  #:use-module (gnu packages llvm)
   #:use-module (gnu packages man)
-  #:use-module (gnu packages mono)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages patchutils)
-  #:use-module (gnu packages pdf)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages pkg-config)
@@ -82,10 +71,8 @@
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages textutils)
   #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages video)
   #:use-module (gnu packages vim)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages web)
@@ -558,176 +545,6 @@ transactions from C or Python.")
     ;; The whole is GPLv2+; librpm itself is dual-licensed LGPLv2+ | GPLv2+.
     (license license:gpl2+)))
 
-(define-public diffoscope
-  (let ((version "123"))
-    (package
-      (name "diffoscope")
-      (version version)
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://salsa.debian.org/reproducible-builds/diffoscope.git")
-                      (commit version)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "11bxms5rkhi0v4pxx29v4qgvhp3fmf0fkzci6gn5xcv4fl1zy4wj"))))
-      (build-system python-build-system)
-      (arguments
-       `(#:phases (modify-phases %standard-phases
-                    ;; setup.py mistakenly requires python-magic from PyPi, even
-                    ;; though the Python bindings of `file` are sufficient.
-                    ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844
-                    (add-after 'unpack 'dependency-on-python-magic
-                      (lambda _
-                        (substitute* "setup.py"
-                          (("'python-magic',") ""))))
-                    ;; This test is broken because our `file` package has a
-                    ;; bug in berkeley-db file type detection.
-                    (add-after 'unpack 'remove-berkeley-test
-                      (lambda _
-                        (delete-file "tests/comparators/test_berkeley_db.py")
-                        #t))
-                    ;; Test is dynamically generated and may have false
-                    ;; negatives with different ocaml versions.  Further
-                    ;; background in: https://bugs.debian.org/939386
-                    (add-after 'unpack 'remove-ocaml-test
-                      (lambda _
-                        (delete-file "tests/comparators/test_ocaml.py")
-                        #t))
-                    (add-after 'unpack 'embed-tool-references
-                      (lambda* (#:key inputs #:allow-other-keys)
-                        (substitute* "diffoscope/comparators/utils/compare.py"
-                          (("\\['xxd',")
-                           (string-append "['" (which "xxd") "',")))
-                        (substitute* "diffoscope/comparators/elf.py"
-                          (("@tool_required\\('readelf'\\)") "")
-                          (("get_tool_name\\('readelf'\\)")
-                           (string-append "'" (which "readelf") "'")))
-                        (substitute* "diffoscope/comparators/directory.py"
-                          (("@tool_required\\('stat'\\)") "")
-                          (("@tool_required\\('getfacl'\\)") "")
-                          (("\\['stat',")
-                           (string-append "['" (which "stat") "',"))
-                          (("\\['getfacl',")
-                           (string-append "['" (which "getfacl") "',")))
-                        #t))
-                    (add-before 'check 'writable-test-data
-                      (lambda _
-                        ;; tests may need needs write access to tests
-                        ;; directory
-                        (for-each make-file-writable (find-files "tests"))
-                        #t))
-                    (add-before 'check 'delete-failing-test
-                      (lambda _
-                        ;; this requires /sbin to be on the path
-                        (delete-file "tests/test_tools.py")
-                        #t)))))
-      (inputs `(("rpm" ,rpm)                        ;for rpm-python
-                ("python-file" ,python-file)
-                ("python-debian" ,python-debian)
-                ("python-libarchive-c" ,python-libarchive-c)
-                ("python-tlsh" ,python-tlsh)
-                ("acl" ,acl)                        ;for getfacl
-                ("colordiff" ,colordiff)
-                ("xxd" ,xxd)))
-      ;; Below are modules used for tests.
-      (native-inputs `(("python-pytest" ,python-pytest)
-                       ("python-chardet" ,python-chardet)
-                       ;; test suite skips tests when tool is missing
-                       ("bdb" ,bdb)
-                       ("binutils" ,binutils)
-                       ("bzip2" ,bzip2)
-                       ("cdrtools" ,cdrtools)
-                       ("colord" ,colord)
-                       ("cpio" ,cpio)
-                       ("docx2txt" ,docx2txt)
-                       ("e2fsprogs" ,e2fsprogs)
-                       ("ffmpeg" ,ffmpeg)
-                       ("gettext" ,gettext-minimal)
-                       ("ghc" ,ghc)
-                       ("ghostscript" ,ghostscript)
-                       ("giflib:bin" ,giflib "bin")
-                       ("gnumeric" ,gnumeric)
-                       ("gnupg" ,gnupg)
-                       ("imagemagick" ,imagemagick)
-                       ("libarchive" ,libarchive)
-                       ("llvm" ,llvm)
-                       ("lz4" ,lz4)
-                       ("mono" ,mono)
-                       ("odt2txt" ,odt2txt)
-                       ;; no unversioned openjdk available
-                       ("openjdk:jdk" ,openjdk12 "jdk")
-                       ("openssh" ,openssh)
-                       ("pgpdump" ,pgpdump)
-                       ("poppler" ,poppler)
-                       ("rpm" ,rpm)
-                       ("sng" ,sng)
-                       ("sqlite" ,sqlite)
-                       ("squashfs-tools" ,squashfs-tools)
-                       ("tcpdump" ,tcpdump)
-                       ("unzip" ,unzip)
-                       ("xxd" ,xxd)
-                       ("xz" ,xz)
-                       ("zip" ,(@ (gnu packages compression) zip))))
-      (home-page "https://diffoscope.org/")
-      (synopsis "Compare files, archives, and directories in depth")
-      (description
-       "Diffoscope tries to get to the bottom of what makes files or directories
-different.  It recursively unpacks archives of many kinds and transforms
-various binary formats into more human readable forms to compare them.  It can
-compare two tarballs, ISO images, or PDFs just as easily.")
-      (license license:gpl3+))))
-
-(define-public trydiffoscope
- (package
-   (name "trydiffoscope")
-   (version "67.0.1")
-   (source
-    (origin
-      (method git-fetch)
-      (uri (git-reference
-            (url "https://salsa.debian.org/reproducible-builds/trydiffoscope.git")
-            (commit version)))
-      (file-name (git-file-name name version))
-      (sha256
-       (base32
-        "03b66cjii7l2yiwffj6ym6mycd5drx7prfp4j2550281pias6mjh"))))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-doc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((share (string-append (assoc-ref outputs "out") "/share/")))
-               (mkdir-p (string-append share "/man/man1/" ))
-               (invoke "rst2man.py"
-                       "trydiffoscope.1.rst"
-                       (string-append share "/man/man1/trydiffoscope.1"))
-               (mkdir-p (string-append share "/doc/" ,name "-" ,version))
-               (install-file "./README.rst"
-                          (string-append share "/doc/" ,name "-" ,version)))
-             #t)))))
-    (propagated-inputs
-     `(("python-requests" ,python-requests)))
-    (native-inputs
-     `(("gzip" ,gzip)
-       ("python-docutils" ,python-docutils)))
-    (build-system python-build-system)
-    (home-page "https://try.diffoscope.org")
-    (synopsis "Client for remote diffoscope service")
-    (description "This is a client for the @url{https://try.diffoscope.org,
-remote diffoscope service}.
-
-Diffoscope tries to get to the bottom of what makes files or directories
-different.  It recursively unpacks archives of many kinds and transforms
-various binary formats into more human readable forms to compare them.  It can
-compare two tarballs, ISO images, or PDFs just as easily.
-
-Results are displayed by default, stored as local text or html files, or made
-available via a URL on @url{https://try.diffoscope.org}.  Results stored on the
-server are purged after 30 days.")
-    (license license:gpl3+)))
-
 (define-public python-anaconda-client
   (package
     (name "python-anaconda-client")
-- 
cgit v1.2.3


From 3244b64f708a5b3161bfada2043718c004f199a4 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sun, 8 Sep 2019 15:35:33 -0700
Subject: gnu: diffoscope: Add additional test dependencies.

* gnu/packages/diffoscope (diffoscope)[native-inputs]: Add abootimg, dtc,
  and r-minimal.
---
 gnu/packages/diffoscope.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 6eb5c1d9fe..828e06a818 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -25,8 +25,10 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages acl)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages android)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bootloaders)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -50,6 +52,7 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages ssh)
+  #:use-module (gnu packages statistics)
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages video)
   #:use-module (gnu packages vim)
@@ -137,6 +140,7 @@
       (native-inputs `(("python-pytest" ,python-pytest)
                        ("python-chardet" ,python-chardet)
                        ;; test suite skips tests when tool is missing
+                       ("abootimg" ,abootimg)
                        ("bdb" ,bdb)
                        ("binutils" ,binutils)
                        ("bzip2" ,bzip2)
@@ -144,6 +148,7 @@
                        ("colord" ,colord)
                        ("cpio" ,cpio)
                        ("docx2txt" ,docx2txt)
+                       ("dtc" ,dtc)
                        ("e2fsprogs" ,e2fsprogs)
                        ("ffmpeg" ,ffmpeg)
                        ("gettext" ,gettext-minimal)
@@ -163,6 +168,7 @@
                        ("openssh" ,openssh)
                        ("pgpdump" ,pgpdump)
                        ("poppler" ,poppler)
+                       ("r-minimal" ,r-minimal)
                        ("rpm" ,rpm)
                        ("sng" ,sng)
                        ("sqlite" ,sqlite)
-- 
cgit v1.2.3


From 3fb581ca9f18fe61e070195f4f8d1a670931b722 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Wed, 18 Sep 2019 17:28:11 -0700
Subject: gnu: diffoscope: Update to 125.

* gnu/packages/diffoscope (diffoscope): Update to 125.
  [arguments] Adjust remove-ocaml-test to selectively disable a single test.
    Add skip-elf-tests to disable a new failing test.
  [native-inputs] Add ocaml for tests.
---
 gnu/packages/diffoscope.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 828e06a818..59a15205c0 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages mono)
+  #:use-module (gnu packages ocaml)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages patchutils)
   #:use-module (gnu packages pdf)
@@ -64,7 +65,7 @@
   #:use-module (guix utils))
 
 (define-public diffoscope
-  (let ((version "123"))
+  (let ((version "125"))
     (package
       (name "diffoscope")
       (version version)
@@ -76,7 +77,7 @@
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "11bxms5rkhi0v4pxx29v4qgvhp3fmf0fkzci6gn5xcv4fl1zy4wj"))))
+                  "02kwisp9j63w27hhcwpdhg66dgxzz61q4fcyfz8z4hwlz6r0gyqy"))))
       (build-system python-build-system)
       (arguments
        `(#:phases (modify-phases %standard-phases
@@ -98,7 +99,17 @@
                     ;; background in: https://bugs.debian.org/939386
                     (add-after 'unpack 'remove-ocaml-test
                       (lambda _
-                        (delete-file "tests/comparators/test_ocaml.py")
+                        (substitute* "tests/comparators/test_ocaml.py"
+                          (("def test_diff.differences.:")
+                           "def skip_test_diff(differences):"))
+                        #t))
+                    (add-after 'unpack 'skip-elf-tests
+                      ;; FIXME: libmix_differences test added in 125, and is
+                      ;; failing, need to explore why...
+                      (lambda _
+                        (substitute* "tests/comparators/test_elf.py"
+                          (("def test_libmix_differences.libmix_differences.:")
+                           "def skip_test_libmix_differences(libmix_differences):"))
                         #t))
                     (add-after 'unpack 'embed-tool-references
                       (lambda* (#:key inputs #:allow-other-keys)
@@ -162,6 +173,7 @@
                        ("llvm" ,llvm)
                        ("lz4" ,lz4)
                        ("mono" ,mono)
+                       ("ocaml" ,ocaml)
                        ("odt2txt" ,odt2txt)
                        ;; no unversioned openjdk available
                        ("openjdk:jdk" ,openjdk12 "jdk")
-- 
cgit v1.2.3


From 222510f404c00e18788751f9739b69c21854cc2b Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Thu, 19 Sep 2019 09:56:53 +0200
Subject: gnu: linux-libre: Update to 5.2.16.

* gnu/packages/linux.scm (linux-libre): Update to 5.2.16.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8bdc6bdaf6..59874b097c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                         "linux-" version ".tar.xz"))
     (sha256 hash)))
 
-(define-public linux-libre-5.2-version "5.2.15")
+(define-public linux-libre-5.2-version "5.2.16")
 (define-public linux-libre-5.2-pristine-source
   (let ((version linux-libre-5.2-version)
-        (hash (base32 "0jhc70r2rygm91qifjagg1jgbpjwyyq6m8g1n5iv81l1v84i0mpb")))
+        (hash (base32 "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
-- 
cgit v1.2.3


From 5d484f42a87d7121b6f9d50bb5f8d61e157bb186 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 19 Sep 2019 12:27:12 +0300
Subject: gnu: python2-matplotlib: Disable tests.

* gnu/packages/python-xyz.scm (python2-matplotlib)[arguments]: Skip the
custom 'check phase.
---
 gnu/packages/python-xyz.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4541604873..66f7e176e2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3937,6 +3937,11 @@ toolkits.")
          (sha256
           (base32
            "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk"))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments matplotlib)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (delete 'check))))) ; These tests weren't run the the past.
       ;; Make sure to use special packages for Python 2 instead
       ;; of those automatically rewritten by package-with-python2.
       (propagated-inputs
-- 
cgit v1.2.3


From 66a3c2db9b1d344145ded88fd5aeec4cff77137f Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 19 Sep 2019 12:29:49 +0300
Subject: gnu: python2-matplotlib: Fix jquery-ui install path.

* gnu/packages/python-xyz.scm (python2-matplotlib)[arguments]: Override
custom 'install-jquery-ui phase to install in the appropriate directory.
---
 gnu/packages/python-xyz.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 66f7e176e2..71adf82a77 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3941,6 +3941,16 @@ toolkits.")
        (substitute-keyword-arguments (package-arguments matplotlib)
          ((#:phases phases)
           `(modify-phases ,phases
+             (replace 'install-jquery-ui
+               (lambda* (#:key outputs inputs #:allow-other-keys)
+                 (let ((dir (string-append (assoc-ref outputs "out")
+                                           "/lib/python2.7/site-packages/"
+                                           "matplotlib/backends/web_backend/")))
+                   (mkdir-p dir)
+                   (invoke "unzip"
+                           (assoc-ref inputs "jquery-ui")
+                           "-d" dir))
+                 #t))
              (delete 'check))))) ; These tests weren't run the the past.
       ;; Make sure to use special packages for Python 2 instead
       ;; of those automatically rewritten by package-with-python2.
-- 
cgit v1.2.3


From 7380df7312cc9f3fedce553954528e574df451bf Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 19 Sep 2019 12:32:31 +0300
Subject: gnu: python2-matplotlib: Update to 2.2.4.

* gnu/packages/python-xyz.scm (python2-matplotlib): Update to 2.2.4.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 71adf82a77..28b472c72e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3929,14 +3929,14 @@ toolkits.")
   (let ((matplotlib (package-with-python2
                      (strip-python2-variant python-matplotlib))))
     (package (inherit matplotlib)
-      (version "2.2.3")
+      (version "2.2.4")
       (source
        (origin
          (method url-fetch)
          (uri (pypi-uri "matplotlib" version))
          (sha256
           (base32
-           "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk"))))
+           "09i1gnrra1590brc1f8d5rh2zvnknmfgzp613ab0462qkrwj15h2"))))
       (arguments
        (substitute-keyword-arguments (package-arguments matplotlib)
          ((#:phases phases)
-- 
cgit v1.2.3


From 339b582892dea157b54879884032900bf0700d72 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 19 Sep 2019 12:36:13 +0300
Subject: gnu: python-matplotlib: Use https in home-page.

* gnu/packages/python-xyz.scm (python-matplotlib)[home-page]: Update to
use https.
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 28b472c72e..5c261cc6fd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3914,7 +3914,7 @@ tests = True~%"
                         (assoc-ref inputs "tcl")
                         (assoc-ref inputs "tk")))))
              #t)))))
-    (home-page "http://matplotlib.org")
+    (home-page "https://matplotlib.org/")
     (synopsis "2D plotting library for Python")
     (description
      "Matplotlib is a Python 2D plotting library which produces publication
-- 
cgit v1.2.3


From 2c6ebeb72b3d571d180858407c664a6e80441cd5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 19 Sep 2019 12:33:35 +0200
Subject: gnu: perl-glib: Update to 1.3291.

* gnu/packages/glib.scm (perl-glib): Update to 1.3291.
---
 gnu/packages/glib.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3a50347f86..ad000ad838 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver 
 ;;; Copyright © 2016 Efraim Flashner 
 ;;; Copyright © 2016 Lukas Gradl 
-;;; Copyright © 2017, 2018 Ricardo Wurmus 
+;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2017 Petter 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Alex Vong 
@@ -699,7 +699,7 @@ useful for C++.")
 (define-public perl-glib
   (package
     (name "perl-glib")
-    (version "1.329")
+    (version "1.3291")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -707,7 +707,7 @@ useful for C++.")
                     version ".tar.gz"))
               (sha256
                (base32
-                "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v"))))
+                "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-extutils-depends" ,perl-extutils-depends)
-- 
cgit v1.2.3


From a747ae609b683f205c4c253ad033114c92d4d093 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 19 Sep 2019 12:56:54 +0200
Subject: gnu: android-libutils: Build with GCC 5.

* gnu/packages/android.scm (android-libutils)[native-inputs]: Add gcc-5.
---
 gnu/packages/android.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 3c7ef447f3..fd900aaf03 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -38,6 +38,7 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages docker)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pcre)
@@ -615,7 +616,8 @@ file system.")
        ("android-libcutils" ,android-libcutils)))
     (native-inputs
      `(("android-bionic-uapi" ,android-bionic-uapi)
-       ("android-liblog" ,android-liblog)))
+       ("android-liblog" ,android-liblog)
+       ("gcc" ,gcc-5))) ; XXX: fails to build with GCC 7
     (home-page "https://developer.android.com/")
     (synopsis "Android utility library")
     (description "@code{android-libutils} provides utilities for Android NDK developers.")
-- 
cgit v1.2.3


From 62ef089eab5b7da97ffd66cb65fc1df1ced589b6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 19 Sep 2019 14:35:31 +0300
Subject: gnu: efl: Update to 1.22.5.

* gnu/packages/enlightenment.scm (efl): Update to 1.22.5.
---
 gnu/packages/enlightenment.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index cc9f43e935..2ff37d496f 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -65,7 +65,7 @@
 (define-public efl
   (package
     (name "efl")
-    (version "1.22.4")
+    (version "1.22.5")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -73,7 +73,7 @@
                     version ".tar.xz"))
               (sha256
                (base32
-                "084ihxy6g86yczhln5vn1amxi4qzqhvk4lpz9005kx92i6wh4h25"))))
+                "1cjk56z0whpzcqwg3xdq23kyp1g83xa67m9dlp7ywmb36bn4ca59"))))
     (outputs '("out"       ; 53 MB
                "include")) ; 21 MB
     (build-system gnu-build-system)
-- 
cgit v1.2.3


From 7670efefe4fb4aca12cb19ea5d89ff37c48e3ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 19 Sep 2019 13:58:55 +0200
Subject: gnu: fontforge: Update to 20190801.

* gnu/packages/fontutils.scm (fontforge): Update to 20190801.
[source](patches): Remove.  The patch served by github.com had been
modified in place.
---
 gnu/packages/fontutils.scm | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 041c1b3b6b..e355f7bb89 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Ricardo Wurmus 
-;;; Copyright © 2018 Ludovic Courtès 
+;;; Copyright © 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2019 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -567,27 +567,14 @@ definitions.")
 (define-public fontforge
   (package
    (name "fontforge")
-   (version "20190413")
+   (version "20190801")
    (source (origin
             (method url-fetch)
             (uri (string-append
                   "https://github.com/fontforge/fontforge/releases/download/"
                   version "/fontforge-" version ".tar.gz"))
-            (patches (list (origin
-                             ;; This patch is required to fix a segfault on i686:
-                             ;; .
-                             ;; It is a squashed version of these commits:
-                             ;; .
-                             (method url-fetch)
-                             (uri (string-append
-                                   "https://github.com/fontforge/fontforge/commit/"
-                                   "570e17b82079bb46af9b2be033c6fbb6b1f16c8f.patch"))
-                             (file-name "fontforge-scripting-array-reference.patch")
-                             (sha256
-                              (base32
-                               "1w0jbbkml149xmraxwchwrllia853i51ii6jdb3s160r2qbhvggc")))))
             (sha256
-             (base32 "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7"))))
+             (base32 "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From ebfe548c23ae6a56f777367f6c7658cfd9ada42a Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Thu, 19 Sep 2019 16:53:43 +0200
Subject: gnu: samba: Update to 4.11.0.

* gnu/packages/samba.scm (samba): Update to 4.11.0.
---
 gnu/packages/samba.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index aa344c96da..a6e71cb75a 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -153,14 +153,14 @@ anywhere.")
 (define-public samba
   (package
     (name "samba")
-    (version "4.10.8")
+    (version "4.11.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://download.samba.org/pub/samba/stable/"
                                  "samba-" version ".tar.gz"))
              (sha256
               (base32
-               "1x0hlhb674fndfkmimjicnzs543n3i8465a5ifcmjwvzavxha7y4"))))
+               "174fwi8n191dnb8ix9afchfp59hic6iwa3062iz3y7zzmxs1rpva"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 754ee7082bf06ebd34eb41dffea5b6799dcd5389 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Thu, 19 Sep 2019 18:15:52 +0200
Subject: gnu: next: Update to 1.3.2.

* gnu/packages/web-browsers.scm (next): Update to 1.3.2.
---
 gnu/packages/web-browsers.scm | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 22ecf3cfec..6d4caa0f9f 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -368,7 +368,7 @@ driven and does not detract you from your daily work.")
 (define next-gtk-webkit
   (package
     (name "next-gtk-webkit")
-    (version "1.3.1")
+    (version "1.3.2")
     (source
      (origin
        (method git-fetch)
@@ -379,7 +379,7 @@ driven and does not detract you from your daily work.")
              (commit version)))
        (sha256
         (base32
-         "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj"))
+         "0863p6ch4pdrn6b81cx2abis0ld7r2n6x34v3z0ihj3jlfj21yx4"))
        (file-name (git-file-name "next" version))))
     (build-system glib-or-gtk-build-system)
     (arguments
@@ -421,19 +421,31 @@ features for productive professionals.")
        #:asd-file "next.asd"
        #:asd-system-name "next/download-manager"))
     (inputs
-     `(;; ASD libraries:
-       ("trivial-features" ,sbcl-trivial-features)
-       ;; Lisp libraries:
-       ("cl-ppcre" ,sbcl-cl-ppcre)
+     `(("cl-ppcre" ,sbcl-cl-ppcre)
        ("dexador" ,sbcl-dexador)
        ("log4cl" ,sbcl-log4cl)
        ("lparallel" ,sbcl-lparallel)
        ("quri" ,sbcl-quri)
        ("str" ,sbcl-cl-str)))
     (native-inputs
-     `(("prove-asdf" ,sbcl-prove-asdf)))
+     `(("trivial-features" ,sbcl-trivial-features)
+       ("prove-asdf" ,sbcl-prove-asdf)))
     (synopsis "Infinitely extensible web-browser (download manager)")))
 
+(define sbcl-next-ring
+  (package
+    (inherit next-gtk-webkit)
+    (name "sbcl-next-ring")
+    (build-system asdf-build-system/sbcl)
+    (arguments
+     `(#:tests? #t
+       #:asd-file "next.asd"
+       #:asd-system-name "next/ring"))
+    (native-inputs
+     `(("trivial-features" ,sbcl-trivial-features)
+       ("prove-asdf" ,sbcl-prove-asdf)))
+    (synopsis "Infinitely extensible web-browser (ring)")))
+
 (define-public next
   (let ((version (package-version next-gtk-webkit)))
     (package
@@ -495,14 +507,11 @@ features for productive professionals.")
                                 (string-append "PREFIX="
                                                (assoc-ref outputs "out"))))))))
       (inputs
-       `(("next-gtk-webkit" ,next-gtk-webkit)
-         ;; ASD libraries:
-         ("trivial-features" ,sbcl-trivial-features)
-         ("trivial-garbage" ,sbcl-trivial-garbage)
-         ;; Lisp libraries:
-         ("alexandria" ,sbcl-alexandria)
+       `(("alexandria" ,sbcl-alexandria)
          ("bordeaux-threads" ,sbcl-bordeaux-threads)
+         ("cl-annot" ,sbcl-cl-annot)
          ("cl-css" ,sbcl-cl-css)
+         ("cl-hooks" ,sbcl-cl-hooks)
          ("cl-json" ,sbcl-cl-json)
          ("cl-markup" ,sbcl-cl-markup)
          ("cl-ppcre" ,sbcl-cl-ppcre)
@@ -511,6 +520,7 @@ features for productive professionals.")
          ("dbus" ,cl-dbus)
          ("dexador" ,sbcl-dexador)
          ("ironclad" ,sbcl-ironclad)
+         ("local-time" ,sbcl-local-time)
          ("log4cl" ,sbcl-log4cl)
          ("lparallel" ,sbcl-lparallel)
          ("mk-string-metrics" ,sbcl-mk-string-metrics)
@@ -523,9 +533,12 @@ features for productive professionals.")
          ("trivial-clipboard" ,sbcl-trivial-clipboard)
          ("unix-opts" ,sbcl-unix-opts)
          ;; Local deps
-         ("next-download-manager" ,sbcl-next-download-manager)))
+         ("next-gtk-webkit" ,next-gtk-webkit)
+         ("next-download-manager" ,sbcl-next-download-manager)
+         ("next-ring" ,sbcl-next-ring)))
       (native-inputs
-       `(("prove-asdf" ,sbcl-prove-asdf)))
+       `(("trivial-features" ,sbcl-trivial-features)
+         ("prove-asdf" ,sbcl-prove-asdf)))
       (synopsis "Infinitely extensible web-browser (with Lisp development files)"))))
 
 (define-public sbcl-next
-- 
cgit v1.2.3


From 664aa1844cae6e5175ace879301cd81b83c8cc89 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 19 Sep 2019 16:19:09 +0200
Subject: gnu: tor: Update to 0.4.1.6.

* gnu/packages/tor.scm (tor): Update to 0.4.1.6.
---
 gnu/packages/tor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 2e8e48c8e2..27090c14cf 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -50,14 +50,14 @@
 (define-public tor
   (package
     (name "tor")
-    (version "0.4.1.5")
+    (version "0.4.1.6")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://dist.torproject.org/tor-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "0984jb6hdcc10f7aq8xzl7l4jf93skp45wkv2v63z4zv0nvf0r58"))))
+               "0wgdid8w7srd218hh4rwslzdx2ickxw1pg18p2wry1r6wi65521a"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From f315673d9e56f4f2398098590ebdc080b63ce8b1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Thu, 19 Sep 2019 10:23:47 -0700
Subject: gnu: Add python-binwalk.

* gnu/packages/python-xyz (python-binwalk): New variable.
* gnu/packages/diffoscope (diffoscope)[native-inputs]: Add python-binwalk for
  tests.
---
 gnu/packages/diffoscope.scm |  1 +
 gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 59a15205c0..17a2d212e5 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -150,6 +150,7 @@
       ;; Below are modules used for tests.
       (native-inputs `(("python-pytest" ,python-pytest)
                        ("python-chardet" ,python-chardet)
+                       ("python-binwalk" ,python-binwalk)
                        ;; test suite skips tests when tool is missing
                        ("abootimg" ,abootimg)
                        ("bdb" ,bdb)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5c261cc6fd..601e4b13df 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10868,6 +10868,42 @@ binary or text.")
        `(("python2-enum34" ,python2-enum34)
          ,@(package-propagated-inputs base))))))
 
+(define-public python-binwalk
+  (let ((commit "64201acfb5b0a9cdd9faa58c40a36dcff8612e29")
+        (revision "0"))
+    (package
+      (name "python-binwalk")
+      (version (git-version "2.1.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ReFirmLabs/binwalk")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1z7ca6rfp887hw5jc3sb45mm4fa0xid4lsp2z8g4r590dr7k7w15"))))
+      (build-system python-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-before 'check 'set-pythonpath
+             (lambda _
+               (setenv "PYTHONPATH"
+                       (string-append
+                        (getcwd) "/src/"
+                        ":" (getenv "PYTHONPATH")))
+               (setenv "HOME" "")
+               #t)))))
+      (native-inputs
+       `(("python-coverage" ,python-coverage)
+         ("python-nose" ,python-nose)))
+      (home-page "https://github.com/ReFirmLabs/binwalk")
+      (synopsis "Firmware analysis tool")
+      (description "Binwalk is a tool for analyzing, reverse engineering, and extracting firmware images")
+      (license license:expat))))
+
 (define-public python-nltk
   (package
     (name "python-nltk")
-- 
cgit v1.2.3


From 4d83157cd806aeb864664ebb380c19f6be04648c Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Thu, 5 Sep 2019 11:13:22 -0700
Subject: gnu: Add wabt.

* gnu/packages/web (wabt): New variable.
* gnu/packages/diffoscope (diffoscope)[native-inputs]: Add wabt for tests.
  [arguments]: Add phase patching wabt into known tools.
---
 gnu/packages/diffoscope.scm |  8 ++++++++
 gnu/packages/web.scm        | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 17a2d212e5..e2b2565004 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -57,6 +57,7 @@
   #:use-module (gnu packages textutils)
   #:use-module (gnu packages video)
   #:use-module (gnu packages vim)
+  #:use-module (gnu packages web)
   #:use-module (guix build-system python)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
@@ -88,6 +89,12 @@
                       (lambda _
                         (substitute* "setup.py"
                           (("'python-magic',") ""))))
+                    ;; Patch in support for known tools
+                    (add-after 'unpack 'add-known-tools
+                      (lambda _
+                        (substitute* "diffoscope/external_tools.py"
+                          (("'arch': 'wabt'},")
+                           "'arch': 'wabt', 'guix': 'wabt'},"))))
                     ;; This test is broken because our `file` package has a
                     ;; bug in berkeley-db file type detection.
                     (add-after 'unpack 'remove-berkeley-test
@@ -188,6 +195,7 @@
                        ("squashfs-tools" ,squashfs-tools)
                        ("tcpdump" ,tcpdump)
                        ("unzip" ,unzip)
+                       ("wabt" ,wabt)
                        ("xxd" ,xxd)
                        ("xz" ,xz)
                        ("zip" ,zip)))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 39475bd6a8..d25f04901a 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -123,6 +123,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages re2c)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages textutils)
@@ -859,6 +860,45 @@ for efficient socket-like bidirectional reliable communication channels.")
     ;; This is LGPLv2.1-only with extra exceptions specified in 'LICENSE'.
     (license license:lgpl2.1)))
 
+(define-public wabt
+  (package
+    (name "wabt")
+    (version "1.0.11")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/WebAssembly/wabt")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0hn88vlqyclpk79v3wg3lrssd9vwhjdgvb41g03jqakygxxgnmp5"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags '("-DBUILD_TESTS=OFF")
+       #:tests? #f))
+    (inputs `(("python" ,python-2)
+              ("re2c" ,re2c)))
+    (home-page "https://github.com/WebAssembly/wabt")
+    (synopsis "WebAssembly Binary Toolkit")
+    (description "WABT (pronounced: wabbit) is a suite of tools for
+WebAssembly, including:
+
+* wat2wasm: translate from WebAssembly text format to the WebAssembly binary
+  format
+* wasm2wat: the inverse of wat2wasm, translate from the binary format back
+  to the text format (also known as a .wat)
+* wasm-objdump: print information about a wasm binary.  Similar to objdump.
+* wasm-interp: decode and run a WebAssembly binary file using a stack-based
+  interpreter
+* wat-desugar: parse .wat text form as supported by the spec interpreter
+  (s-expressions, flat syntax, or mixed) and print canonical flat format
+* wasm2c: convert a WebAssembly binary file to a C source and header
+
+These tools are intended for use in (or for development of) toolchains or
+other systems that want to manipulate WebAssembly files.")
+    (license license:asl2.0)))
+
 (define-public websocketpp
   (package
     (name "websocketpp")
-- 
cgit v1.2.3


From af760990e9651be865ccd20b935863d85f605f2e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sun, 8 Sep 2019 23:53:00 -0700
Subject: gnu: Add python-editorconfig.

* gnu/packages/python-xyz (python-editorconfig): New variable.
---
 gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 601e4b13df..44aa471bb1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -882,6 +882,27 @@ messages in color.")
 (define-public python2-coloredlogs
   (package-with-python2 python-coloredlogs))
 
+(define-public python-editorconfig
+  (package
+    (name "python-editorconfig")
+    (version "0.12.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "EditorConfig" version))
+       (sha256
+        (base32
+         "0v55z351p9qkyp3bbspwywwn28sbcknhirngjbj779n3z52z63hv"))))
+    (build-system python-build-system)
+    (home-page "https://editorconfig.org/")
+    (synopsis "EditorConfig bindings for python")
+    (description "The EditorConfig project consists of a file format for
+defining coding styles and a collection of text editor plugins that enable
+editors to read the file format and adhere to defined styles.  EditorConfig
+files are easily readable and they work nicely with version control systems.")
+    ;; "fnmatch.py" and "ini.py" are licensed under psfl, the rest is bsd-2.
+    (license (list license:bsd-2 license:psfl))))
+
 (define-public python-et-xmlfile
   (package
     (name "python-et-xmlfile")
-- 
cgit v1.2.3


From 316fa45ea4ec54a2363a22ef92c5e412bb83115a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 19 Sep 2019 14:31:41 +0200
Subject: gnu: gcc-arm-none-eabi-4.9: Build with GCC 5.

* gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9)[native-inputs]: Add gcc-5.
---
 gnu/packages/embedded.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index a65998c369..1e4c4a0da8 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus 
+;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2016, 2017 Theodoros Foradis 
 ;;; Copyright © 2016 David Craven 
 ;;; Copyright © 2017 Efraim Flashner 
@@ -85,6 +85,7 @@
                           (origin-patches (package-source xgcc))))))
       (native-inputs
        `(("flex" ,flex)
+         ("gcc" ,gcc-5)
          ,@(package-native-inputs xgcc)))
       (arguments
        (substitute-keyword-arguments (package-arguments xgcc)
-- 
cgit v1.2.3


From bed0c4c83d930880c96fba1139e8a8b7086b2cb5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 19 Sep 2019 15:01:37 +0200
Subject: gnu: alsa-modular-synth: Build with GCC 5.

* gnu/packages/audio.scm (alsa-modular-synth)[native-inputs]: Add gcc-5.
---
 gnu/packages/audio.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e1d7412bfe..1209e94e25 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -145,7 +145,8 @@
        ("qtbase" ,qtbase)
        ("qttools" ,qttools)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ("gcc" ,gcc-5)))
     (home-page "http://alsamodular.sourceforge.net/")
     (synopsis "Realtime modular synthesizer and effect processor")
     (description
-- 
cgit v1.2.3


From 081f767e8c396949997c9c61adec0a7090c708d9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 19 Sep 2019 15:03:51 +0200
Subject: gnu: avr-gcc-4.9: Build with GCC 5.

* gnu/packages/avr.scm (avr-gcc-4.9)[native-inputs]: Add gcc-5.
---
 gnu/packages/avr.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index eaa3c7d046..6eb0ad8dbf 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -67,7 +67,10 @@
               (files '("avr/include")))
              (search-path-specification
               (variable "CROSS_LIBRARY_PATH")
-              (files '("avr/lib"))))))))
+              (files '("avr/lib")))))
+      (native-inputs
+       `(("gcc" ,gcc-5)
+         ,@(package-native-inputs xgcc))))))
 
 (define-public avr-gcc-5
   (package
-- 
cgit v1.2.3


From 923b2b5a48de6c986cab26ee45db1f0e9aaa7269 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 19 Sep 2019 15:56:39 +0200
Subject: gnu: avr-libc: Unset CPATH to fix the build.

* gnu/packages/avr.scm (avr-libc)[arguments]: Unset CPATH variable.
---
 gnu/packages/avr.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index 6eb0ad8dbf..1f99f636e0 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -97,11 +97,12 @@
        (modify-phases %standard-phases
          (add-before 'unpack 'fix-cpath
            (lambda _
-             ;; C_INCLUDE_PATH poses issues for cross-building, leading to
-             ;; failures when building avr-libc on 64-bit systems.  Simply
-             ;; unsetting it allows the build to succeed because it doesn't
-             ;; try to use any of the native system's headers.
+             ;; C_INCLUDE_PATH and CPATH pose issues for cross-building,
+             ;; leading to failures when building avr-libc on 64-bit systems.
+             ;; Simply unsetting them allows the build to succeed because it
+             ;; doesn't try to use any of the native system's headers.
              (unsetenv "C_INCLUDE_PATH")
+             (unsetenv "CPATH")
              #t)))))
     (native-inputs `(("avr-binutils" ,avr-binutils)
                      ("avr-gcc" ,avr-gcc)))
-- 
cgit v1.2.3


From fb1d8d2baab907493367930e8069f937a5187b61 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 19 Sep 2019 16:04:44 +0200
Subject: gnu: klick: Fix build with GCC 7.

* gnu/packages/music.scm (klick)[arguments]: Pass -fpermissive to compiler.
---
 gnu/packages/music.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2b30308861..b81c2cb782 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -777,6 +777,11 @@ audio and video).")
        #:tests? #f ; no "check" target
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'be-permissive
+           (lambda _
+             (substitute* "SConstruct"
+               (("'-Wall'") "'-Wall', '-fpermissive'"))
+             #t))
          (add-after 'unpack 'replace-removed-scons-syntax
            (lambda _
              (substitute* "SConstruct"
-- 
cgit v1.2.3


From 6ec872231fdf746bd6e11b97f8a6b3a23498806c Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Thu, 19 Sep 2019 13:45:41 -0700
Subject: gnu: Add python-jsbeautifier.

* gnu/packages/python-xyz (python-jsbeautifier): New variable.
* gnu/packages/diffoscope (diffoscope)[native-arguments]: Add python-jsbeautifier.
  [arguments]: Add python-jsbeautifier to add-known-tools phase.
---
 gnu/packages/diffoscope.scm |  4 ++++
 gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index e2b2565004..fff331ac13 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -92,6 +92,9 @@
                     ;; Patch in support for known tools
                     (add-after 'unpack 'add-known-tools
                       (lambda _
+                        (substitute* "diffoscope/external_tools.py"
+                          (("'arch': 'python-jsbeautifier'},")
+                           "'arch': 'python-jsbeautifier', 'guix': 'python-jsbeautifier'},"))
                         (substitute* "diffoscope/external_tools.py"
                           (("'arch': 'wabt'},")
                            "'arch': 'wabt', 'guix': 'wabt'},"))))
@@ -188,6 +191,7 @@
                        ("openssh" ,openssh)
                        ("pgpdump" ,pgpdump)
                        ("poppler" ,poppler)
+                       ("python-jsbeautifier" ,python-jsbeautifier)
                        ("r-minimal" ,r-minimal)
                        ("rpm" ,rpm)
                        ("sng" ,sng)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 44aa471bb1..4e33fa575f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8035,6 +8035,45 @@ Jupyter kernels such as IJulia and IRKernel.")
 support for rich media output.")
     (license license:bsd-3)))
 
+(define-public python-jsbeautifier
+  (package
+    (name "python-jsbeautifier")
+    (version "1.10.2")
+    (home-page "https://github.com/beautify-web/js-beautify")
+    (source (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url home-page)
+                   (commit (string-append "v" version))))
+             (file-name (git-file-name name version))
+             (sha256
+              (base32
+               "0wawb070ki1axb3jc9xvsrgpji52vcfif3zmjzc3z4g98m5xw4kg"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'chdir
+                    (lambda _
+                      ;; The upstream Git repository contains all the code,
+                      ;; but this package only builds the python code.
+                      (chdir "python")
+                      #t))
+                  (add-after 'unpack 'patch-python-six-requirements
+                    (lambda _
+                      (substitute* "python/setup.py"
+                        (("six>=1.12.0")
+                         "six>=1.11.0"))
+                      #t)))))
+    (propagated-inputs
+     `(("python-editorconfig" ,python-editorconfig)
+       ("python-six" ,python-six)))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (synopsis "JavaScript unobfuscator and beautifier")
+    (description "Beautify, unpack or deobfuscate JavaScript, leveraging
+popular online obfuscators.")
+    (license license:expat)))
+
 (define-public jupyter
   (package
     (name "jupyter")
-- 
cgit v1.2.3


From d2cdef65605b9e14bfa02c3bf1612ab6b62f4a89 Mon Sep 17 00:00:00 2001
From: zimoun 
Date: Wed, 18 Sep 2019 17:57:57 +0200
Subject: ui: 'relevance' connects regexps with a logical and.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes .
Previously, the logical and connecting the regexps did not output the expected
results (introduced in 8874faaaac665100a095ef25e39c9a389f5a397f).

* guix/ui.scm (relevance)
[score]: Change its arguments.
[regexp->score]: New procedure.
* tests/ui.scm ("package-relevance"): Add test.

Signed-off-by: Ludovic Courtès 
---
 guix/ui.scm  | 48 ++++++++++++++++++++++++------------------------
 tests/ui.scm |  5 ++++-
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 7920335928..4be31db047 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2018 Ricardo Wurmus 
 ;;; Copyright © 2019 Chris Marusich 
 ;;; Copyright © 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2019 Simon Tournier 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1281,33 +1282,32 @@ weight of this field in the final score.
 
 A score of zero means that OBJ does not match any of REGEXPS.  The higher the
 score, the more relevant OBJ is to REGEXPS."
-  (define (score str)
-    (define scores
-      (map (lambda (regexp)
-             (fold-matches regexp str 0
-                           (lambda (m score)
-                             (+ score
-                                (if (string=? (match:substring m) str)
-                                    5             ;exact match
-                                    1)))))
-           regexps))
-
+  (define (score regexp str)
+    (fold-matches regexp str 0
+                  (lambda (m score)
+                    (+ score
+                       (if (string=? (match:substring m) str)
+                           5             ;exact match
+                           1)))))
+
+  (define (regexp->score regexp)
+    (let ((score-regexp (lambda (str) (score regexp str))))
+      (fold (lambda (metric relevance)
+              (match metric
+                ((field . weight)
+                 (match (field obj)
+                   (#f  relevance)
+                   ((? string? str)
+                    (+ relevance (* (score-regexp str) weight)))
+                   ((lst ...)
+                    (+ relevance (* weight (apply + (map score-regexp lst)))))))))
+            0 metrics)))
+
+  (let ((scores (map regexp->score regexps)))
     ;; Return zero if one of REGEXPS doesn't match.
     (if (any zero? scores)
         0
-        (reduce + 0 scores)))
-
-  (fold (lambda (metric relevance)
-          (match metric
-            ((field . weight)
-             (match (field obj)
-               (#f  relevance)
-               ((? string? str)
-                (+ relevance (* (score str) weight)))
-               ((lst ...)
-                (+ relevance (* weight (apply + (map score lst)))))))))
-        0
-        metrics))
+        (reduce + 0 scores))))
 
 (define %package-metrics
   ;; Metrics used to compute the "relevance score" of a package against a set
diff --git a/tests/ui.scm b/tests/ui.scm
index 2138e23369..d8573e88d8 100644
--- a/tests/ui.scm
+++ b/tests/ui.scm
@@ -267,6 +267,7 @@ Second line" 24))
         (gcrypt (specification->package "guile-gcrypt"))
         (go     (specification->package "go"))
         (gnugo  (specification->package "gnugo"))
+        (libb2  (specification->package "libb2"))
         (rx     (cut make-regexp <> regexp/icase))
         (>0     (cut > <> 0))
         (=0     zero?))
@@ -283,6 +284,8 @@ Second line" 24))
          (=0 (package-relevance go
                                 (map rx '("go" "game"))))
          (>0 (package-relevance gnugo
-                                (map rx '("go" "game")))))))
+                                (map rx '("go" "game"))))
+         (>0 (package-relevance libb2
+                                (map rx '("crypto" "library")))))))
 
 (test-end "ui")
-- 
cgit v1.2.3


From 70bb5d88e08fd7fb18fe95f55811e8f645e10ad3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 20 Sep 2019 00:39:52 +0200
Subject: gnu: octave: Use texlive-union.

* gnu/packages/maths.scm (octave)[native-inputs]: Replace texlive with
texlive-union containing texlive-epsf.
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5380b4a99e..a42b81ac6b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1544,7 +1544,7 @@ script files.")
        ,@(package-inputs octave-cli)))
     (native-inputs
      `(("qttools" , qttools) ;for lrelease
-       ("texlive" ,texlive) ;for texi2dvi
+       ("texlive" ,(texlive-union (list texlive-epsf))) ; for texi2dvi
        ,@(package-native-inputs octave-cli)))
     (arguments
      (substitute-keyword-arguments (package-arguments octave-cli)
-- 
cgit v1.2.3


From 014c3012a5eed7a5e0c62a3d0e8843ad762e07d5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 20 Sep 2019 00:41:45 +0200
Subject: gnu: guile-debbugs-next: Update to 0.0.3-2.fb0ae06.

* gnu/packages/guile-xyz.scm (guile-debbugs-next): Update to 0.0.3-2.fb0ae06.
---
 gnu/packages/guile-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a5dfa55039..d6967929be 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -936,8 +936,8 @@ format.")
     (license license:agpl3+)))
 
 (define-public guile-debbugs-next
-  (let ((commit "75a331d561c8b6f8efcf16216dab961c17759efe")
-        (revision "1"))
+  (let ((commit "fb0ae064037a38a0d526e08b4ad24c52e205edb9")
+        (revision "2"))
     (package (inherit guile-debbugs)
       (name "guile-debbugs")
       (version (git-version "0.0.3" revision commit))
@@ -949,7 +949,7 @@ format.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0br3mgbw41bpc9x57jlghl0i8dz9nl63r4wzs5l47aqszf84870y"))))
+                  "195sacx2xc1mzzfljj62nfpi8mxn0rc6dabxckizjksnhb5irfwy"))))
       (build-system gnu-build-system)
       (native-inputs
        `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From b7f1a1aafd806fadee068a026964cde6521a5315 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 20 Sep 2019 00:42:18 +0200
Subject: gnu: mumi: Update to 0.0.0-5.8a57c87.

* gnu/packages/mail.scm (mumi): Update to 0.0.0-5.8a57c87.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index fdbb082fdc..35b4e03e1b 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2937,8 +2937,8 @@ replacement for the @code{urlview} program.")
     (license gpl2+)))
 
 (define-public mumi
-  (let ((commit "ea0a28f8d5db5761765eb60043b8593901552e25")
-        (revision "4"))
+  (let ((commit "8a57c87797ffb07baa88697130204184db643521")
+        (revision "5"))
     (package
       (name "mumi")
       (version (git-version "0.0.0" revision commit))
@@ -2950,7 +2950,7 @@ replacement for the @code{urlview} program.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0b6dmi41vhssyf983blgi8a2kj3zjccc9cz7b7kvwh781ldqcywh"))))
+                  "1575gn5p086sjxz5hvg6iyskq6cxf6vf50s9nsc4xgrbcqa3pv2c"))))
       (build-system gnu-build-system)
       (arguments
        `(#:phases
-- 
cgit v1.2.3


From 68620d62f5cd49d6455c351f3a68e3c41dc6ce22 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Thu, 19 Sep 2019 16:43:47 -0700
Subject: gnu: Add enjarify.

* gnu/packages/android (enjarify): New variable.
* gnu/packages/diffoscope (diffoscope)[native-inputs]: Add enjarify.
  [arguments]: add enjarify to add-known-tools phase.
* gnu/packages/patches/enjarify-setup-py.patch: New file.
* gnu/local.mk: Add enjarify-setup-py.patch.
---
 gnu/local.mk                                 |  1 +
 gnu/packages/android.scm                     | 58 ++++++++++++++++++++++++++++
 gnu/packages/diffoscope.scm                  |  4 ++
 gnu/packages/patches/enjarify-setup-py.patch | 19 +++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 gnu/packages/patches/enjarify-setup-py.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1062bdcafe..ad85894ebe 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -796,6 +796,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/emacs-undohist-ignored.patch	\
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch	\
   %D%/packages/patches/emacs-zones-called-interactively.patch	\
+  %D%/packages/patches/enjarify-setup-py.patch			\
   %D%/packages/patches/enlightenment-fix-setuid-path.patch	\
   %D%/packages/patches/erlang-man-path.patch			\
   %D%/packages/patches/eudev-rules-directory.patch		\
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 56d5edaa75..8eb5182f51 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -39,6 +39,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages docker)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages python)
@@ -934,3 +935,60 @@ these same tools to create your own additional or alternative repository for
 publishing, or to assist in creating, testing and submitting metadata to the
 main repository.")
     (license license:agpl3+)))
+
+(define-public enjarify
+  (package
+    (name "enjarify")
+    (version "1.0.3")
+    (home-page "https://github.com/Storyyeller/enjarify")
+    (source
+     (origin
+      (method git-fetch)
+      (uri (git-reference
+            (url home-page)
+            (commit version)))
+      (file-name (git-file-name name version))
+      (patches
+       (search-patches "enjarify-setup-py.patch"))
+      (sha256
+       (base32
+        "1nam7h1g4f1h6jla4qcjjagnyvd24dv6d5445w04q8hx07nxdapk"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'enjarify-wrapper-inherit-pythonpath
+           ;; enjarify sets PYTHONPATH from a shell script, overwriting
+           ;; PYTHONPATH set from guix. Comment out this line.
+           (lambda _
+             (substitute* "enjarify.sh"
+               (("export PYTHONPATH") "# export PYTHONPATH"))
+             #t))
+         (add-before 'check 'fixup-expected-test-results
+           ;; Upstream adjusted this test in commit:
+           ;; 3ae884a6485af82d300515813f537685b08dd800
+           (lambda _
+             (substitute* "tests/test2/expected.txt"
+               (("^20") "0"))
+             #t))
+         (add-before 'check 'drop-java-xss-argument
+           ;; Upstream removed this argument in order to support 32-bit
+           ;; architectures.  commit: 4be0111d879aa95fdc0d9f24fe529f8c664d4093
+           (lambda _
+             (substitute* "enjarify/runtests.py"
+               (("java -Xss515m") "java "))
+             #t))
+         (add-after 'install 'install-enjarify-wrapper
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out")))
+                 (mkdir-p (string-append out "/bin/"))
+                 (copy-file "enjarify.sh" (string-append out "/bin/enjarify"))
+                 #t))))))
+    (native-inputs `(("openjdk:jdk" ,openjdk12 "jdk")))
+    (synopsis "Translate Dalvik bytecode to equivalent Java bytecode")
+    (description "Android applications are Java programs that run on a
+customized virtual machine, which is part of the Android operating system, the
+Dalvik VM.  Their bytecode differs from the bytecode of normal Java
+applications.  Enjarify can translate the Dalvik bytecode back to equivalent
+Java bytecode, which simplifies the analysis of Android applications.")
+    (license license:asl2.0)))
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fff331ac13..8df5a9cc0e 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -92,6 +92,9 @@
                     ;; Patch in support for known tools
                     (add-after 'unpack 'add-known-tools
                       (lambda _
+                        (substitute* "diffoscope/external_tools.py"
+                          (("'arch': 'enjarify'},")
+                           "'arch': 'enjarify', 'guix': 'enjarify'},"))
                         (substitute* "diffoscope/external_tools.py"
                           (("'arch': 'python-jsbeautifier'},")
                            "'arch': 'python-jsbeautifier', 'guix': 'python-jsbeautifier'},"))
@@ -172,6 +175,7 @@
                        ("docx2txt" ,docx2txt)
                        ("dtc" ,dtc)
                        ("e2fsprogs" ,e2fsprogs)
+                       ("enjarify" ,enjarify)
                        ("ffmpeg" ,ffmpeg)
                        ("gettext" ,gettext-minimal)
                        ("ghc" ,ghc)
diff --git a/gnu/packages/patches/enjarify-setup-py.patch b/gnu/packages/patches/enjarify-setup-py.patch
new file mode 100644
index 0000000000..4b382ca320
--- /dev/null
+++ b/gnu/packages/patches/enjarify-setup-py.patch
@@ -0,0 +1,19 @@
+Author: Reiner Herrmann 
+Origin: https://salsa.debian.org/android-tools-team/enjarify/blob/master/debian/patches/setup_py.patch
+Description: provides a minimal setup.py to build/install the package
+
+Index: enjarify/setup.py
+===================================================================
+--- /dev/null
++++ enjarify/setup.py
+@@ -0,0 +1,10 @@
++#!/usr/bin/env python3
++
++from setuptools import setup, find_packages
++
++setup(name='enjarify',
++      version='1.0.3',
++      url='https://github.com/google/enjarify',
++      packages=find_packages(),
++      )
++
-- 
cgit v1.2.3


From 5b85ba41c4a74011098f64d20c0cf478aeeeeb33 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 19 Sep 2019 07:34:48 +0200
Subject: gnu: emacs-org-sidebar: Update to 0.1-2.b2a5a69.

* gnu/packages/emacs-xyz.scm (emacs-org-sidebar): Update to 0.1-2.b2a5a69.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 87edd4619e..21de17340a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4299,8 +4299,8 @@ started with 20 minutes.  All values are customizable.")
       (license license:gpl3+))))
 
 (define-public emacs-org-sidebar
-  (let ((commit "ed951d1e0d8b7e65ed35797403fd3e8c88f507f5")
-        (revision "1"))
+  (let ((commit "b2a5a69b1ebbab63b55e7d1a9453f385624a642c")
+        (revision "2"))
     (package
       (name "emacs-org-sidebar")
       (version (git-version "0.1" revision commit))
@@ -4312,7 +4312,7 @@ started with 20 minutes.  All values are customizable.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "01sf8v53pjsy80fzwmj2n8rp2z5gsnpyld0fm6j3bdv213clp69y"))))
+          (base32 "0dajwg92kj7998xl0x35dlqwdhgwjcwxa726kf4f3wgv1azpyff6"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-- 
cgit v1.2.3


From b12405ce076a633c0d2f49d661d57dd77026f80e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 19 Sep 2019 07:37:21 +0200
Subject: gnu: emacs-org-super-agenda: Update to 1.1.1-2.f0ee7ed.

* gnu/packages/emacs-xyz.scm (emacs-org-super-agenda): Update to 1.1.1-2.f0ee7ed.
---
 gnu/packages/emacs-xyz.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 21de17340a..e682f0fadd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11242,8 +11242,8 @@ as well as functions for navigating between these headings.")
 
 (define-public emacs-org-super-agenda
   ;; emacs-org-sidebar depends on a newer commit than the latest release version.
-  (let ((commit "375bde4ca72494ac88a2a9738754f047fe45cc4e")
-        (revision "1"))
+  (let ((commit "f0ee7ed9766d352d16a787707d35695b48cbf153")
+        (revision "2"))
     (package
       (name "emacs-org-super-agenda")
       (version (git-version "1.1.1" revision commit))
@@ -11255,11 +11255,12 @@ as well as functions for navigating between these headings.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0hrwf02fqjm0d9gj146ax67ib76093qpqh7066dcxj2gy20625yj"))))
+                  "1b1qi96x83acv2frl94i4frx46i82vipaa8mfwpzyj2gyq2bq5zf"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-org" ,emacs-org)
          ("emacs-dash" ,emacs-dash)
+         ("emacs-ts" ,emacs-ts)
          ("emacs-ht" ,emacs-ht)
          ("emacs-s" ,emacs-s)))
       (home-page "https://github.com/alphapapa/org-super-agenda")
-- 
cgit v1.2.3


From 5f103185237e57a317d6bc41c3645fc576f63e62 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 18 Sep 2019 03:08:48 +0200
Subject: gnu: emacs-lispy: Include non-Elisp code.

* gnu/packages/emacs-xyz.scm (emacs-lispy): Include non-Elisp code.
---
 gnu/packages/emacs-xyz.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e682f0fadd..38011171ab 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5252,6 +5252,8 @@ navigate code in a tree-like fashion.")
        ("emacs-ivy" ,emacs-ivy)
        ("emacs-hydra" ,emacs-hydra)
        ("emacs-zoutline" ,emacs-zoutline)))
+    (arguments
+     `(#:include (cons* "\\.clj$" "\\.edn$" "\\.py$" %default-include)))
     (synopsis "Modal S-expression editing")
     (description
      "Due to the structure of Lisp syntax it's very rare for the programmer
-- 
cgit v1.2.3


From 81b8a1a98641ad68277ffcb59e4750fb2a9f0ffc Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 18 Sep 2019 03:09:19 +0200
Subject: gnu: emacs-lpy: Update to 0.1.0-2.dfd9a0f.

* gnu/packages/emacs-xyz.scm (emacs-lpy): Update to 0.1.0-2.dfd9a0f.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 38011171ab..9a252a0e3c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5292,12 +5292,11 @@ state and will work even without lispy being enabled.")
       (license license:gpl3+))))
 
 (define-public emacs-lpy
-  (let ((commit "553d28f7b6523ae5d44d34852ab770b871b0b0ad")
-        (version "0.1.0")
-        (revision "1"))
+  (let ((commit "dfd9a0fc8f84674fc669eab2942cfa038d7dc590")
+        (revision "2"))
     (package
       (name "emacs-lpy")
-      (version (git-version version revision commit))
+      (version (git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5306,7 +5305,7 @@ state and will work even without lispy being enabled.")
                (commit commit)))
          (sha256
           (base32
-           "0kl9b3gga18cwv5cq4db8i6b7waj6mp3h2l7qjnp7wq6dpvwhn0i"))
+           "15y1fvn1sjngpiqlq090hxqhmxp32f88rspfapwcisxa3hcg5r5a"))
          (file-name (git-file-name name version))))
       (propagated-inputs
        `(("emacs-zoutline" ,emacs-zoutline)
-- 
cgit v1.2.3


From 923e561e6a4b6dc0e34e26fded93ae97a9a9f712 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 00:15:41 +0200
Subject: gnu: emacs-iedit: Update to 0.9.9.9-1.e2c100c.

* gnu/packages/emacs-xyz.scm (emacs-iedit): Update to 0.9.9.9-1.e2c100c.
---
 gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9a252a0e3c..f8f897649f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5184,30 +5184,33 @@ highlighted.  Pressing that character will switch to that window.")
     (license license:gpl3+)))
 
 (define-public emacs-iedit
-  (package
-    (name "emacs-iedit")
-    (version "0.9.9.9")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/victorhge/iedit.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"))))
-    (build-system emacs-build-system)
-    (home-page "http://www.emacswiki.org/emacs/Iedit")
-    (synopsis "Edit multiple regions in the same way simultaneously")
-    (description
-     "This package is an Emacs minor mode and allows you to edit one
+  ;; Last release version was in 2016.
+  (let ((commit "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f")
+        (revision "1"))
+    (package
+      (name "emacs-iedit")
+      (version (git-version "0.9.9.9" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/victorhge/iedit.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc"))))
+      (build-system emacs-build-system)
+      (home-page "http://www.emacswiki.org/emacs/Iedit")
+      (synopsis "Edit multiple regions in the same way simultaneously")
+      (description
+       "This package is an Emacs minor mode and allows you to edit one
 occurrence of some text in a buffer (possibly narrowed) or region, and
 simultaneously have other occurrences edited in the same way.
 
 You can also use Iedit mode as a quick way to temporarily show only the buffer
 lines that match the current text being edited.  This gives you the effect of
 a temporary @code{keep-lines} or @code{occur}.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-zoutline
   (package
-- 
cgit v1.2.3


From 53366043be8460224f62cb1e068f4ad36d63f62b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 06:07:50 +0200
Subject: gnu: emacs-dante: Update to 1.5-2.a25ae9e.

* gnu/packages/emacs-xyz.scm (emacs-dante): Update to 1.5-2.a25ae9e.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f8f897649f..f95ec83703 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -739,8 +739,8 @@ programs.")
   (deprecated-package "haskell-mode" emacs-haskell-mode))
 
 (define-public emacs-dante
-  (let ((commit "149dded24ca9cdff09a3d859e4b62638db4aadda")
-        (revision "1"))
+  (let ((commit "a25ae9e5b5425cffdd88d498777e90ea8655fa37")
+        (revision "2"))
     (package
       (name "emacs-dante")
       (version (git-version "1.5" revision commit))
@@ -751,7 +751,7 @@ programs.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0i7kj3d6pfys6si9va5f36qzifyac9mahdl0qh40rya9m0syrkla"))
+                  "1ziw3snbs2z2cg8a3jbyjd48qkgrkzs4bh8lrbs0h2c87nzldvhd"))
                 (file-name (git-file-name name version))))
       (build-system emacs-build-system)
       (propagated-inputs
-- 
cgit v1.2.3


From ea1a17d9bf9c0ea75eef40feb3327647c76ce87a Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 7 Sep 2019 03:12:37 +0200
Subject: gnu: emacs-company-cabal: Include directory.

* gnu/packages/emacs-xyz.scm (emacs-company-cabal): Include directory.
---
 gnu/packages/emacs-xyz.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f95ec83703..8a6750516f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4168,6 +4168,8 @@ sgml/html integration, and indentation (working with sgml).")
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-company" ,emacs-company)))
+      (arguments
+       `(#:include (cons "^tools\\/" %default-include)))
       (home-page "https://github.com/iquiw/company-cabal/")
       (synopsis "Company completion for Haskell Cabal files")
       (description
-- 
cgit v1.2.3


From 53b23b3371f8df1c90aa80088daec7a1d4fcde92 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 19 Sep 2019 07:18:32 +0200
Subject: gnu: Add emacs-compdef.

* gnu/packages/emacs-xyz.scm (emacs-compdef): New variable.
---
 gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8a6750516f..1232def6e5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3553,6 +3553,29 @@ completion candidate when using the Company text completion framework.")
 @code{company-mode} allowing for completion of common math symbols.")
       (license license:gpl3+))))
 
+(define-public emacs-compdef
+  (let ((commit "fc08a9b049c3718fc7d6c6ee2140759aff031bc9")
+        (revision "1"))
+    (package
+      (name "emacs-compdef")
+      (version (git-version "0.2" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/jjzmajic/compdef.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1dwf4rlj19d80yp656c7nkp6hb3mabv808r6ix3hpv6rjjs38vhl"))))
+      (build-system emacs-build-system)
+      (home-page "https://gitlab.com/jjzmajic/compdef")
+      (synopsis "Set local completion backends")
+      (description "This package provides a function to cleanly set local
+completion backends according to mode, and integrates with
+@code{use-package}.")
+      (license license:gpl3+))))
+
 (define-public emacs-nswbuff
   (let ((commit "362da7f3687e2eb5bb11667347de85f4a9d002bc")
         (revision "1"))
-- 
cgit v1.2.3


From f76e4a91c25dc4441e592312a8749bd5b01ec559 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 5 Sep 2019 22:53:20 +0200
Subject: gnu: Enable tests for emacs-evil-lion.

* gnu/packages/emacs-xyz.scm (emacs-evil-lion): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1232def6e5..3f7c01999c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6953,11 +6953,10 @@ surrounding lines.")
 
 (define-public emacs-evil-lion
   (let ((commit "6b03593f5dd6e7c9ca02207f9a73615cf94c93ab")
-        (version "0.0.2")
         (revision "1"))
     (package
       (name "emacs-evil-lion")
-      (version (git-version version revision commit))
+      (version (git-version "0.0.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -6970,6 +6969,9 @@ surrounding lines.")
            "1a162hynp0jcsn50c1w5a02mrw9w3q05c7lkqzqd25px3d0p772q"))))
       (build-system emacs-build-system)
       (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+      (arguments
+       `(#:tests? #t
+         #:test-command '("make" "test")))
       (home-page "https://github.com/edkolev/evil-lion")
       (synopsis "Align operator for @code{evil-mode}")
       (description
-- 
cgit v1.2.3


From d93e36cfa520df857a8a2bfc533c3a3b6b3c8257 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 04:44:25 +0200
Subject: gnu: Add emacs-helm-lsp.

* gnu/packages/emacs-xyz.scm (emacs-helm-lsp): New variable.
---
 gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3f7c01999c..6a7bd69619 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16475,6 +16475,33 @@ like @code{company}, @code{flycheck}, and @code{projectile}.")
 and code peeking.")
     (license license:gpl3+)))
 
+(define-public emacs-helm-lsp
+  (let ((commit "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b")
+        (revision "1"))
+    (package
+      (name "emacs-helm-lsp")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/emacs-lsp/helm-lsp.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0wh5zai3s17ss2q8wcdd6d87hv1h3nbyrxxs4js9cas8m6y2ssjv"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)
+         ("emacs-lsp-mode" ,emacs-lsp-mode)
+         ("emacs-dash" ,emacs-dash)))
+      (home-page "https://github.com/emacs-lsp/helm-lsp")
+      (synopsis "Convert keyboard macros to Emacs Lisp")
+      (description
+       "This package displays keyboard macros or latest interactive commands
+as Emacs Lisp.")
+      (license license:gpl3+))))
+
 (define-public emacs-helm-notmuch
   (package
     (name "emacs-helm-notmuch")
-- 
cgit v1.2.3


From 4d33be6bd26167390f82a8589510f3f130a13733 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 05:30:02 +0200
Subject: gnu: emacs-isearch-prop: Update to 0-2.4a2765f.

* gnu/packages/emacs-xyz.scm (emacs-isearch-prop): Update to 0-2.4a2765f.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6a7bd69619..244e950c72 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12214,8 +12214,8 @@ until the top-level form is no longer a macro call.")
     (license license:gpl3)))
 
 (define-public emacs-isearch-prop
-  (let ((commit "5e9dc44cf582d998aaa73ccd4d07cbda01248156")
-        (revision "1"))
+  (let ((commit "4a2765f835dd115d472142da05215c4c748809f4")
+        (revision "2"))
     (package
       (name "emacs-isearch-prop")
       (version (git-version "0" revision commit))
@@ -12228,7 +12228,7 @@ until the top-level form is no longer a macro call.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1xawppy705ybsgx566zvj8zk2aajq0sqvhvfs7nijqq32lx0a2zl"))))
+           "06gdk5m84q6pxwng8rjxny1zkll8f3m2x6lw4xyib2dvg7iaslh3"))))
       (build-system emacs-build-system)
       (home-page "https://www.emacswiki.org/emacs/isearch-prop.el")
       (synopsis "Extensions to @code{isearch.el}")
-- 
cgit v1.2.3


From d772e3b7889a89b879b29a240b34a220b34fad64 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 05:30:35 +0200
Subject: gnu: emacs-isearch+: Update to 0-2.7c251b9.

* gnu/packages/emacs-xyz.scm (emacs-isearch+): Update to 0-2.7c251b9.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 244e950c72..50a9920c31 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13793,8 +13793,8 @@ systems.")
     (license license:gpl3+)))
 
 (define-public emacs-isearch+
-  (let ((commit "95e49af9dbf0254e095a11f115e101b52659520a")
-        (revision "1"))
+  (let ((commit "7c251b91a67bf914066e23e269ba52fda5b45f5f")
+        (revision "2"))
     (package
       (name "emacs-isearch+")
       (version (git-version "0" revision commit))
@@ -13807,7 +13807,7 @@ systems.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0xhd9zgknf4lvzyf4apirpd7spb1hbpzkvys00a7pkmd0vvahk0v"))))
+           "1w2799714jcdycjlxgs8lpmmz6dmzvcvqy8xwxhvmgpb60g4f2yr"))))
       (build-system emacs-build-system)
       (home-page "https://www.emacswiki.org/emacs/isearch+.el")
       (synopsis "Extensions to @code{isearch.el}")
-- 
cgit v1.2.3


From 9db5c4a355713d04e28b7a9b89b6da0ae440b31a Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 05:37:22 +0200
Subject: gnu: emacs-info-plus: Update to 0-2.4a6b93c.

* gnu/packages/emacs-xyz.scm (emacs-info-plus): Update to 0-2.4a6b93c.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 50a9920c31..48692a500e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17373,12 +17373,11 @@ to be examined using Ediff.")
     (license license:expat)))
 
 (define-public emacs-info-plus
-  (let ((commit "b837d710f7d58db586116cf6f75e75a9a074bc4b")
-        (version "5101")
-        (revision "55"))
+  (let ((commit "4a6b93c170169594e1e8ea60cd799a1a88a969da")
+        (revision "2"))
     (package
       (name "emacs-info-plus")
-      (version (git-version version revision commit))
+      (version (git-version "0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17388,7 +17387,7 @@ to be examined using Ediff.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1knyjkdm4rcs3qrc51jllw46ph7ycq5zxnvl70ydchzfwava43h6"))))
+           "1xzmx7m1qbl3b1x6yq1db1a108xqaa64ljfv1hdw763zmy4kc6m0"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/emacsmirror/info-plus")
       (synopsis "Extensions to @file{info.el}")
-- 
cgit v1.2.3


From 760ea037895bec47b1c1a374907ce2d79255c90e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 05:41:24 +0200
Subject: gnu: emacs-grep-context: Update to 0.1.0-1.5a4e3ef.

* gnu/packages/emacs-xyz.scm (emacs-grep-context): Update to 0.1.0-1.5a4e3ef.
---
 gnu/packages/emacs-xyz.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 48692a500e..e30d3cea71 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13171,10 +13171,11 @@ perform regression test for packages that provide font-lock rules.")
       (license license:gpl3+))))
 
 (define-public emacs-grep-context
-  (let ((commit "a17c57e66687a54e195e08afe776bdd60cb6c0a7"))
+  (let ((commit "5a4e3efdf775755c1bbefcfe4b461c1166d81d7d")
+        (revision "1"))
     (package
       (name "emacs-grep-context")
-      (version (git-version "0.1" "1" commit))
+      (version (git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13184,11 +13185,11 @@ perform regression test for packages that provide font-lock rules.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1nqfa6kjzjshww4hnwg1c0vcr90bdjihy3kmixq3c3jkvxg99b62"))))
+           "00q7l4a3c0ay6g5ff9bfa2qgkiswsyh4s6pqnpg0zpzhvv5710f5"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)))
-      (home-page "https://github.com/nashamri/academic-phrases")
+      (home-page "https://github.com/mkcms/grep-context")
       (synopsis "Increase context in compilation and grep buffers")
       (description
        "This package provides an Emacs package for more context in
-- 
cgit v1.2.3


From dc95c8b4975b097f68e21544bead2a051e86b016 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 05:57:47 +0200
Subject: gnu: emacs-unpackaged-el: Update to 0-2.c0d58cf.

* gnu/packages/emacs-xyz.scm (emacs-unpackaged-el): Update to 0-2.c0d58cf.
* gnu/packages/patches/emacs-unpackaged-req.patch: Delete it.
* gnu/local.mk (dist_patch_DATA): Remove patch.
---
 gnu/local.mk                                    |  1 -
 gnu/packages/emacs-xyz.scm                      | 16 +++++++++++-----
 gnu/packages/patches/emacs-unpackaged-req.patch | 24 ------------------------
 3 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 gnu/packages/patches/emacs-unpackaged-req.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ad85894ebe..8e535e208b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -792,7 +792,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/emacs-highlight-stages-add-gexp.patch	\
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch	\
   %D%/packages/patches/emacs-source-date-epoch.patch		\
-  %D%/packages/patches/emacs-unpackaged-req.patch		\
   %D%/packages/patches/emacs-undohist-ignored.patch	\
   %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch	\
   %D%/packages/patches/emacs-zones-called-interactively.patch	\
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e30d3cea71..f0e86016e7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -614,8 +614,8 @@ from within Emacs.")
     (license license:gpl3+)))
 
 (define-public emacs-unpackaged-el
-  (let ((commit "f4df7f8dfea715e893b2223adda32545803f5cce")
-        (revision "1"))
+  (let ((commit "c0d58cf81e531b2b6fa1bd5dd612dc1b93d4d186")
+        (revision "2"))
     (package
       (name "emacs-unpackaged-el")
       (version (git-version "0" revision commit))
@@ -628,9 +628,7 @@ from within Emacs.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1yf3zrgqfhnr0az8gn1kqqwnhfi3nc0vbjkcagwcqwk3sp1jda86"))
-         (patches
-          (search-patches "emacs-unpackaged-req.patch"))))
+           "0y3sgvd51l4pb3acps92bazfk49da6nim1f1hyxzy1ravg4kbw83"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
@@ -638,6 +636,14 @@ from within Emacs.")
          ("emacs-s" ,emacs-s)
          ("emacs-hydra" ,emacs-hydra)
          ("emacs-use-package" ,emacs-use-package)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'require-hydra
+             (lambda _
+               (substitute* "unpackaged.el"
+                 ((";;; Code:") ";;; Code:\n(require 'hydra)"))
+               #t)))))
       (home-page "https://github.com/alphapapa/unpackaged.el")
       (synopsis "Useful snippets of Emacs Lisp code")
       (description "This package provides Emacs Lisp utilities for a variety
diff --git a/gnu/packages/patches/emacs-unpackaged-req.patch b/gnu/packages/patches/emacs-unpackaged-req.patch
deleted file mode 100644
index ddb9277610..0000000000
--- a/gnu/packages/patches/emacs-unpackaged-req.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e5be173e201710538464c279335bef735a327a68 Mon Sep 17 00:00:00 2001
-From: Brian Leung 
-Date: Tue, 18 Jun 2019 06:37:46 +0200
-Subject: [PATCH] Add missing require.
-
----
- unpackaged.el | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/unpackaged.el b/unpackaged.el
-index 2d46b3c..e62184a 100644
---- a/unpackaged.el
-+++ b/unpackaged.el
-@@ -38,6 +38,7 @@
- (require 'dash)
- (require 's)
- (require 'use-package)
-+(require 'hydra)
- 
- ;;; Faces, fonts
- 
--- 
-2.22.0
-
-- 
cgit v1.2.3


From 973f938fab5e3ae4b68791b0faac58bda686ac0e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 06:05:22 +0200
Subject: gnu: emacs-scribble-mode: Update to 0.1-2.217945d.

* gnu/packages/emacs-xyz.scm (emacs-scribble-mode): Update to 0.1-2.217945d.
---
 gnu/packages/emacs-xyz.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f0e86016e7..b3d6b73265 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -558,16 +558,11 @@ handful of functions that are not resource-specific.")
     (license license:gpl3+)))
 
 (define-public emacs-scribble-mode
-  (let ((commit "34e9e5edb921813b6483e0fefa848efb6ee4b314")
-        (version "0.0")
-        (revision 0))
+  (let ((commit "217945d54de5e4bb207033f2116baa28f5c5ecf2")
+        (revision "2"))
     (package
       (name "emacs-scribble-mode")
-      (version (if (zero? revision)
-                   version
-                   (string-append version "-"
-                                  (number->string revision)
-                                  "." (string-take commit 7))))
+      (version (git-version "0.1" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -575,7 +570,7 @@ handful of functions that are not resource-specific.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0598byqpz2q6yi2q4dwd77jj9z3n99z34d3an51s9m2za0nh1qvp"))))
+                  "1s5ccw1a5ack01wd94ywfcrar9j98agchwdh30q7iyxr0d2z4sii"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/emacs-pe/scribble-mode")
       (synopsis "Emacs mode for editing the Scribble documentation syntax.")
-- 
cgit v1.2.3


From 547074359cc67fc198bdc005a7a7b4582ed37709 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 09:25:31 +0200
Subject: gnu: emacs-github-review: Update to 0.1-2.a13a3b4.

* gnu/packages/emacs-xyz.scm (emacs-github-review): Update to 0.1-2.a13a3b4.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b3d6b73265..8e73ffd07e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14717,12 +14717,11 @@ viewing files with long lines.")
       (license license:gpl3+))))
 
 (define-public emacs-github-review
-  (let ((commit "9c3ffe30fba5d02e9951e76d1a5be2ed046663da")
-        (version "0.1")
-        (revision "1"))
+  (let ((commit "a13a3b4f1b6114a32af843971a145ab880f51232")
+        (revision "2"))
     (package
       (name "emacs-github-review")
-      (version (git-version version revision commit))
+      (version (git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14732,7 +14731,7 @@ viewing files with long lines.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "078rv6f2p3wrznhgvmkhd071bwy72007f5l2m2a0r1k2i3vbfaja"))))
+           "0injfpxzgfhmqalba845j5l5cdcxxqz43knhxwinf36g52nfabl0"))))
       (build-system emacs-build-system)
       (inputs
        `(("emacs-dash" ,emacs-dash)
-- 
cgit v1.2.3


From 4a643836512f29ecb66aec2b53a7e2d1d8fc475e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 09:35:35 +0200
Subject: gnu: emacs-ccls: Update to 0.1-2.9061ebb.

* gnu/packages/emacs-xyz.scm (emacs-ccls): Update to 0.1-2.9061ebb.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8e73ffd07e..43e84b246e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14821,12 +14821,11 @@ Pandoc, the document-conversion tool.")
     (license license:bsd-3)))
 
 (define-public emacs-ccls
-  (let ((commit "2764ddd57b03646f0327ea680a954b4a67450aef")
-        (version "0.1")
-        (revision "1"))
+  (let ((commit "9061ebbf9d5ec3ee7e88dbd226c77017cf0447b1")
+        (revision "2"))
     (package
       (name "emacs-ccls")
-      (version (git-version version revision commit))
+      (version (git-version "0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14836,7 +14835,7 @@ Pandoc, the document-conversion tool.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "16427jvzhjy8kpvlgl3qzkzppv98124hkgi8q8pv1h7m46k9lhh3"))))
+           "106jh25ivq0ydiz37p51agk5zbpai7fv91pwn6dpqzsq5g281ls7"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-- 
cgit v1.2.3


From 27c35436fa374ffa363d8167ea0ad0dbe118cb9e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 09:35:54 +0200
Subject: gnu: emacs-general: Update to 0-2.f032c3a.

* gnu/packages/emacs-xyz.scm (emacs-general): Update to 0-2.f032c3a.
---
 gnu/packages/emacs-xyz.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 43e84b246e..3fee701d58 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15797,21 +15797,22 @@ other frame parameters.")
       (license license:gpl3+))))
 
 (define-public emacs-general
-  (let ((commit "675050199b5a30d54a24b58a367db32c0bdc47f5"))
+  (let ((commit "f032c3a77079487d0ea563b17ee3e5b2fb084611")
+        (revision "2"))
     (package
       (name "emacs-general")
-      (version (git-version "0" "0" commit))
-      (home-page "https://github.com/noctuid/general.el")
+      (version (git-version "0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url (string-append home-page ".git"))
+                      (url "https://github.com/noctuid/general.el.git")
                       (commit commit)))
                 (sha256
                  (base32
-                  "175yyhzk57yk1sskxh3d2jzhrh2waiibbcfsll167qxr117yji5h"))
+                  "0lgh5z17ag5wvvnqwagvam29cp1n1vd50amn6df02xln80bsbllx"))
                 (file-name (git-file-name name version))))
       (build-system emacs-build-system)
+      (home-page "https://github.com/noctuid/general.el")
       (synopsis "More convenient key definitions in emacs")
       (description "@code{general.el} provides a more convenient method for
 binding keys in emacs (for both evil and non-evil users).  Like
-- 
cgit v1.2.3


From 459550f3a5ab9c4fb9b76a2dc0a1c2c129d65ed8 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 09:46:48 +0200
Subject: gnu: emacs-undo-propose-el: Update to 3.0.0-2.47b7df0.

* gnu/packages/emacs-xyz.scm (emacs-undo-propose-el): Update to 3.0.0-2.47b7df0.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3fee701d58..a8b61423cc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16634,8 +16634,8 @@ packages with a consistent way to use them.")
       (license license:gpl3+))))
 
 (define-public emacs-undo-propose-el
-  (let ((commit "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c")
-        (revision "1"))
+  (let ((commit "47b7df0c97ad0099537d1ade21c4c52f0618a945")
+        (revision "2"))
     (package
       (name "emacs-undo-propose-el")
       (version (git-version "3.0.0" revision commit))
@@ -16648,7 +16648,7 @@ packages with a consistent way to use them.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny"))))
+           "078bs8lk9f0lklxqh15976fffayg5z5386y59nxxfhm27lmwgka9"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/jackkamm/undo-propose-el")
       (synopsis "Simple and safe navigation of @code{undo} history")
-- 
cgit v1.2.3


From 8f7234564fb23581a3301e4e4820319f504d16f8 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 09:47:14 +0200
Subject: gnu: emacs-js2-refactor-el: Update to 0.9.0-2.d4c40b5.

* gnu/packages/emacs-xyz.scm (emacs-js2-refactor-el): Update to 0.9.0-2.d4c40b5.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a8b61423cc..b2d930d724 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16738,12 +16738,11 @@ buffers.")
       (license license:gpl3+))))
 
 (define-public emacs-js2-refactor-el
-  (let ((commit "79124b3274c43ad1f9ec6205fa362576552db02f")
-        (version "0.9.0")
-        (revision "27"))
+  (let ((commit "d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28")
+        (revision "2"))
     (package
       (name "emacs-js2-refactor-el")
-      (version (git-version version revision commit))
+      (version (git-version "0.9.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16753,7 +16752,7 @@ buffers.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1wswhlpbd3airrhyncb9vblqigwnqg9n96z0iis8jnz37q2whica"))))
+           "08b25y3raz0p98zxk9xdd8nj9shqd6mzrqhbq1gg4cwsmi7h7ly1"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-- 
cgit v1.2.3


From 3edc440dbf1f2b6dcfacf2ce5b890c3e0e901f66 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 09:48:47 +0200
Subject: gnu: emacs-equake: Update to 0.85-2.7eddc02.

* gnu/packages/emacs-xyz.scm (emacs-equake): Update to 0.85-2.7eddc02.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b2d930d724..71eb54ac68 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16865,12 +16865,11 @@ Lisp functions that call themselves in tail position.")
       (license license:gpl3+))))
 
 (define-public emacs-equake
-  (let ((commit "ed15fd55cd4f2276161a6f712ed0b83cd10a8cdc")
-        (version "0.85")
-        (revision "1"))
+  (let ((commit "7eddc025ee61b83029363e22219af228b8c20681")
+        (revision "2"))
     (package
       (name "emacs-equake")
-      (version (git-version version revision commit))
+      (version (git-version "0.85" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16880,7 +16879,7 @@ Lisp functions that call themselves in tail position.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "04kj88rlnn22gwmmv2gly2ibi6jka6l2cd4979pi6lhlvqqgjdnj"))))
+           "1c55pbqak3d02sw6z1139baxzy401b90g0gxzcc3j6sgplz6sc6w"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-- 
cgit v1.2.3


From 752684568ef25d2b628c870392a07758c0d05e3f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 09:56:05 +0200
Subject: gnu: emacs-prodigy-el: Update to 0.7.0-2.0a12eec.

* gnu/packages/emacs-xyz.scm (emacs-prodigy-el): Update to 0.7.0-2.0a12eec.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 71eb54ac68..f32a3dfd98 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17020,12 +17020,11 @@ invoked.")
     (license license:gpl3+)))
 
 (define-public emacs-prodigy-el
-  (let ((commit "701dccaa56de9e6a330c05bde33bce4f3b3d6a97")
-        (version "0.7.0")
-        (revision "28"))
+  (let ((commit "0a12eec1f001a4eef16b2c0c524f02f2647a4ff1")
+        (revision "2"))
     (package
       (name "emacs-prodigy-el")
-      (version (git-version version revision commit))
+      (version (git-version "0.7.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17035,7 +17034,7 @@ invoked.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1vyvxawlayp2nra0q83146q2nzv8qwn5a4nj0sx1jc90a0a83vgj"))))
+           "02kysq57kqzg0zkhaf302ada9cp9spgp71z8vbdq4c7dl6x75h4g"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)
-- 
cgit v1.2.3


From aa4fb5961bc9f7f61fa1cd766ec57cb0946563aa Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 10 Sep 2019 10:00:16 +0200
Subject: gnu: emacs-rjsx-mode: Update to 0.4-2.0e7fa6b.

* gnu/packages/emacs-xyz.scm (emacs-rjsx-mode): Update to 0.4-2.0e7fa6b.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f32a3dfd98..76031e8620 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17169,12 +17169,11 @@ definition-jumping and type-checking on demand.")
       (license license:bsd-3))))
 
 (define-public emacs-rjsx-mode
-  (let ((commit "03dd8d1683501e81b58674d64c3032b7b718402c")
-        (version "0.4.0")
-        (revision "35"))
+  (let ((commit "0e7fa6b4facdec4f85a7a8865bdf59dfd57217b5")
+        (revision "2"))
     (package
       (name "emacs-rjsx-mode")
-      (version (git-version version revision commit))
+      (version (git-version "0.4" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17184,7 +17183,7 @@ definition-jumping and type-checking on demand.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1kc44g9f38klpjklmz9n50a28nqv7prz6ck6ghdr6bnj1s98pb8a"))))
+           "0s0871sx3ch09kgvbcp9na4zdrfrda62xjq8m9knbq5vnj8q8qpi"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-js2-mode" ,emacs-js2-mode)))
-- 
cgit v1.2.3


From 7fa6d0063c4b0100b8c7d8182f0412edcb4c539c Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 9 Sep 2019 06:58:31 +0200
Subject: gnu: emacs-auto-yasnippet: Update to 0.3.0-2.642b0d9.

* gnu/packages/emacs-xyz.scm (emacs-auto-yasnippet): Update to 0.3.0-2.642b0d9.
[arguments]: Simplify test command.
---
 gnu/packages/emacs-xyz.scm | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 76031e8620..d5de1114e7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12940,10 +12940,11 @@ browse the phrases by the paper section and fill-in the blanks if required.")
       (license license:gpl3+))))
 
 (define-public emacs-auto-yasnippet
-  (let ((commit "d1ccfea87312c6dd8cf8501ab5b71b1d3d44d95b"))
+  (let ((commit "624b0d9711222073a2a3f2186e2605eb99fc83c9")
+        (revision "2"))
     (package
       (name "emacs-auto-yasnippet")
-      (version (git-version "0.3.0" "1" commit))
+      (version (git-version "0.3.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -12952,17 +12953,11 @@ browse the phrases by the paper section and fill-in the blanks if required.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1i8k2qiyzd5rq0zplk4xb5nfa5mp0ibxbzwqj6c7877waq7244xk"))))
+                  "15g8wi067f345xhpi0c12w0h04p4f4lpccwmdjdfj8hzfl4gyxy9"))))
       (build-system emacs-build-system)
       (arguments
-       '(#:phases
-         (modify-phases %standard-phases
-           (add-before 'install 'check
-             (lambda _
-               (invoke "emacs" "--batch"
-                       "-l" "auto-yasnippet.el"
-                       "-l" "auto-yasnippet-test.el"
-                       "-f" "ert-run-tests-batch-and-exit"))))))
+       '(#:tests? #t
+         #:test-command '("make" "test")))
       (propagated-inputs
        `(("emacs-yasnippet" ,emacs-yasnippet)))
       (home-page "https://github.com/abo-abo/auto-yasnippet/")
-- 
cgit v1.2.3


From 09f1ac90c2d0fad5fa4c07ef15d8f68649bc3668 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 02:20:24 +0200
Subject: gnu: emacs-ts: Update to 0.1-2.395649a.

* gnu/packages/emacs-xyz.scm (emacs-ts): Update to 0.1-2.395649a.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d5de1114e7..2c4e629333 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11326,8 +11326,8 @@ tables of contents.")
     (license license:gpl3+)))
 
 (define-public emacs-ts
-  (let ((commit "93c074f2895a204e003e8c7f3033c37d6486fac8")
-        (revision "1"))
+  (let ((commit "395649a2f2ba79028331bb1fa9ec08b218950ff6")
+        (revision "2"))
     (package
       (name "emacs-ts")
       (version (git-version "0.1" revision commit))
@@ -11338,7 +11338,7 @@ tables of contents.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735"))
+                  "02603wv66fplsigxd87jy23hrb5g9vigszcpdqrdv0ypaqaxlr3a"))
                 (file-name (git-file-name name version))))
       (build-system emacs-build-system)
       (propagated-inputs
-- 
cgit v1.2.3


From 5afc5c31439fad0ae4d018af21944e93bf399848 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 07:38:57 +0200
Subject: gnu: emacs-ivy: Update to 0.12-2.79333e9.

* gnu/packages/emacs-xyz.scm (emacs-ivy): Update to 0.12-2.79333e9.
[source]: Enable tests.
[native-inputs]: Add emacs-wgrep.
---
 gnu/packages/emacs-xyz.scm | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2c4e629333..57d2095e17 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5026,8 +5026,8 @@ automatically.")
   ;; The latest release version introduced a new feature, swiper-isearch, that
   ;; generally works well but had some noticeable bugs; this later commit
   ;; includes fixes for several of them.
-  (let ((commit "d3e4514fd72f217c704ae18afdf711bb9036a04d")
-        (revision "1"))
+  (let ((commit "79333e9edfee38ec3b367c33711a68bdf7783259")
+        (revision "2"))
     (package
       (name "emacs-ivy")
       (version (git-version "0.12.0" revision commit))
@@ -5040,7 +5040,7 @@ automatically.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "142axxc6vsl14cfyvzj9csiykxdn7vhw88fy955hzx7av4qfqg4x"))))
+           "0dyclc51sprhmr5fi4lylhwsrn8v1jgyblwk9ly60jj84lj6278z"))))
       (build-system emacs-build-system)
       (arguments
        `(#:phases
@@ -5052,11 +5052,22 @@ automatically.")
                  (with-directory-excursion "doc"
                    (invoke "makeinfo" "ivy.texi")
                    (install-file "ivy.info" info)
-                   #t)))))))
+                   #t))))
+           (add-before 'check 'make-dummy-git-directory
+             (lambda _
+               (mkdir-p ".git")))
+           (add-after 'check 'delete-dummy-git-directory
+             (lambda _
+               (delete-file-recursively ".git"))))
+         #:tests? #t
+         #:test-command '("emacs" "--batch"
+                          "-l" "ivy-test.el"
+                          "-f" "ivy-test-run-tests")))
       (propagated-inputs
        `(("emacs-hydra" ,emacs-hydra)))
       (native-inputs
-       `(("texinfo" ,texinfo)))
+       `(("texinfo" ,texinfo)
+         ("emacs-wgrep" ,emacs-wgrep)))
       (home-page "http://oremacs.com/swiper/")
       (synopsis "Incremental vertical completion for Emacs")
       (description
-- 
cgit v1.2.3


From 3fd738f31b3fc6b31e048468980cc20c3d04261d Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 17 Sep 2019 21:50:36 +0300
Subject: import/github: Check for more version prefixes.

* guix/import/github.scm (latest-released-version): Allow the
version string to begin with the word 'version'.
---
 guix/import/github.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/guix/import/github.scm b/guix/import/github.scm
index 55ea00a111..df5f6ff32f 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2017, 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2018 Eric Bavier 
 ;;; Copyright © 2019 Arun Isaac 
+;;; Copyright © 2019 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -186,7 +187,12 @@ the package e.g. 'bedtools2'.  Return #f if there is no releases"
                        (substring tag 0 (+ name-length 1))))
         (substring tag (+ name-length 1)))
        ;; some tags start with a "v" e.g. "v0.25.0"
+       ;; or with the word "version" e.g. "version.2.1"
        ;; where some are just the version number
+       ((string-prefix? "version" tag)
+        (if (char-set-contains? char-set:digit (string-ref tag 7))
+            (substring tag 7)
+            (substring tag 8)))
        ((string-prefix? "v" tag)
         (substring tag 1))
        ;; Finally, reject tags that don't start with a digit:
-- 
cgit v1.2.3


From 747b6b049727334d23cced1cc2710540ca40ff7c Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 08:13:43 +0200
Subject: gnu: emacs-evil-matchit: Update to 2.3.4.

* gnu/packages/emacs-xyz.scm (emacs-evil-matchit): Update to 2.3.4.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 57d2095e17..69123b6aa1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10212,7 +10212,7 @@ Feautures:
 (define-public emacs-evil-matchit
   (package
     (name "emacs-evil-matchit")
-    (version "2.3.3")
+    (version "2.3.4")
     (source
      (origin
        (method git-fetch)
@@ -10221,7 +10221,7 @@ Feautures:
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r"))))
+        (base32 "1nflkmx08n3ya5vaipy1xg19hnqcp6f7ddsx9xjh5gl6ix2iz0az"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-evil" ,emacs-evil)))
-- 
cgit v1.2.3


From ee6bfffe1984c63070e5c9510722b586ccd4b35d Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 08:26:26 +0200
Subject: gnu: emacs-hercules: Update to 0.2.1.

* gnu/packages/emacs-xyz.scm (emacs-hercules): Update to 0.2.1.
---
 gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 69123b6aa1..98a2fb4233 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9325,30 +9325,29 @@ settings).")
     (license license:gpl3+)))
 
 (define-public emacs-hercules
-  (let ((commit "3345904a0dab4c7a4d4478f0766f1d9f5d1bb501")
-        (revision "1"))
-    (package
-      (name "emacs-hercules")
-      (version (git-version "0.2" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://gitlab.com/jjzmajic/hercules.el.git")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0cpq8h6l47nqhzch6snax5yrhxl8p4wn35q13ci35lj3iq8kmlk8"))))
-      (build-system emacs-build-system)
-      (propagated-inputs
-       `(("emacs-which-key" ,emacs-which-key)))
-      (home-page "https://gitlab.com/jjzmajic/hercules.el")
-      (synopsis "Call a chain of related commands without repeated prefix keys")
-      (description
-       "This package provides sticky-key-like functionality to obviate the
+  (package
+    (name "emacs-hercules")
+    (version "0.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/jjzmajic/hercules.el.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "19939pf5d6p2facmfhpyghx0vipb5k6ry3bmkmjfkj1zp132zfqf"))))
+    (build-system emacs-build-system)
+    (propagated-inputs
+     `(("emacs-which-key" ,emacs-which-key)))
+    (home-page "https://gitlab.com/jjzmajic/hercules.el")
+    (synopsis "Call a chain of related commands without repeated prefix keys")
+    (description
+     "This package provides sticky-key-like functionality to obviate the
 need for repeated prefix-key sequences, and can reuse existing keymaps. The
 list of commands is displayed in a handy popup.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public emacs-ws-butler
   (package
-- 
cgit v1.2.3


From 3a2efbc8670f72a524cc7290e11559cdb42852a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 20 Sep 2019 12:21:19 +0200
Subject: gnu: python-libxml2, itstool: Provide crash-free variants.

Fixes .

* gnu/packages/patches/python-libxml2-utf8.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/xml.scm (python-libxml2/fixed): New variable.
* gnu/packages/glib.scm (itstool/fixed): New variable.
* gnu/packages/gnome.scm (gnumeric)[native-inputs]: Use ITSTOOL/FIXED
instead of ITSTOOL.
---
 gnu/local.mk                                   |  1 +
 gnu/packages/glib.scm                          | 11 +++++++
 gnu/packages/gnome.scm                         |  2 +-
 gnu/packages/patches/python-libxml2-utf8.patch | 40 ++++++++++++++++++++++++++
 gnu/packages/xml.scm                           | 15 +++++++++-
 5 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/python-libxml2-utf8.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 63d55c5018..5705494090 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1252,6 +1252,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-keras-integration-test.patch	\
   %D%/packages/patches/python-pyfakefs-remove-bad-test.patch	\
   %D%/packages/patches/python-flint-includes.patch		\
+  %D%/packages/patches/python-libxml2-utf8.patch		\
   %D%/packages/patches/python-mox3-python3.6-compat.patch	\
   %D%/packages/patches/python-testtools.patch			\
   %D%/packages/patches/python-paste-remove-timing-test.patch	\
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ad000ad838..a2f0f2fd8e 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -65,6 +65,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (srfi srfi-1)
 
   ;; Export variables up-front to allow circular dependency with the 'xorg'
   ;; module.
@@ -495,6 +496,16 @@ information in their documents, such as whether a particular element should be
 translated.")
     (license license:gpl3+)))
 
+(define-public itstool/fixed
+  ;; This variant fixes a python-libxml2 crash when processing UTF-8
+  ;; sequences: .  Since the issue is quite rare,
+  ;; create this variant here to avoid a full rebuild.
+  (package/inherit
+   itstool
+   (inputs
+    `(("python-libxml2" ,python-libxml2/fixed)
+      ,@(alist-delete "python-libxml2" (package-inputs itstool))))))
+
 (define dbus-glib
   (package
     (name "dbus-glib")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 520d04d75f..03550b6fa8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2167,7 +2167,7 @@ Hints specification (EWMH).")
      `(("bison" ,bison)
        ("docbook-xml" ,docbook-xml)
        ("intltool" ,intltool)
-       ("itstool" ,itstool)
+       ("itstool" ,itstool/fixed)            ;see 
        ("glib:bin" ,glib "bin")
        ("pkg-config" ,pkg-config)))
     (home-page "http://www.gnumeric.org")
diff --git a/gnu/packages/patches/python-libxml2-utf8.patch b/gnu/packages/patches/python-libxml2-utf8.patch
new file mode 100644
index 0000000000..e39672faa1
--- /dev/null
+++ b/gnu/packages/patches/python-libxml2-utf8.patch
@@ -0,0 +1,40 @@
+This patch fixes a crash in the libxml2 bindings for Python 3.x
+that 'itstool' stumbles upon when processing UTF-8 data:
+
+  https://issues.guix.gnu.org/issue/37468
+
+Patch by Jan Matejek
+from .
+
+--- libxml2-2.9.5.orig/python/libxml.c
++++ libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+     PyObject *message;
+     PyObject *result;
+     char str[1000];
++    unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ 	    str[999] = 0;
+         va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++        /* Ensure the error string doesn't start at UTF8 continuation. */
++        while (*ptr && (*ptr & 0xc0) == 0x80)
++            ptr++;
++#endif
++
+         list = PyTuple_New(2);
+         PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+         Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-        message = libxml_charPtrConstWrap(str);
++        message = libxml_charPtrConstWrap(ptr);
+         PyTuple_SetItem(list, 1, message);
+         result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++        /* Forget any errors caused in the error handler. */
++        PyErr_Clear();
+         Py_XDECREF(list);
+         Py_XDECREF(result);
+     }
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 78b9b713e5..b8f3774039 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès 
+;;; Copyright © 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2013, 2015 Andreas Enge 
 ;;; Copyright © 2015 Eric Bavier 
 ;;; Copyright © 2015 Sou Bunnbu 
@@ -164,6 +164,7 @@ project (but it is usable outside of the Gnome platform).")
     (license license:x11)))
 
 (define-public python-libxml2
+  ;; TODO: Merge with 'python-libxml2/fixed' on the next rebuild cycle.
   (package/inherit libxml2
     (name "python-libxml2")
     (build-system python-build-system)
@@ -191,6 +192,18 @@ project (but it is usable outside of the Gnome platform).")
     (inputs `(("libxml2" ,libxml2)))
     (synopsis "Python bindings for the libxml2 library")))
 
+(define-public python-libxml2/fixed
+  ;; This variant fixes a crash when processing UTF-8 sequences:
+  ;;    
+  ;; TODO: Merge with 'python-libxml2' on the next rebuild cycle.
+  (package/inherit
+   python-libxml2
+   (version (string-append (package-version python-libxml2) "-1"))
+   (source (origin
+             (inherit (package-source libxml2))
+             (patches (cons (search-patch "python-libxml2-utf8.patch")
+                            (origin-patches (package-source libxml2))))))))
+
 (define-public python2-libxml2
   (package-with-python2 python-libxml2))
 
-- 
cgit v1.2.3


From 4504d18345e1effbe7e67324cf5c6e3b2ff43211 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 20 Sep 2019 12:09:34 +0200
Subject: gnu: perl-anyevent: Update to 7.17.

* gnu/packages/libevent.scm (perl-anyevent): Update to 7.17.
---
 gnu/packages/libevent.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index 4898f0a768..3d00b3843e 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -132,14 +132,14 @@ resolution, asynchronous file system operations, and threading primitives.")
 (define-public perl-anyevent
   (package
     (name "perl-anyevent")
-    (version "7.15")
+    (version "7.17")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/"
                                   "AnyEvent-" version ".tar.gz"))
               (sha256
                (base32
-                "0m73r67ah9xmcwzxs50jxf8ncd8h71mi4wf2mvnqkxvibhrv478i"))))
+                "11drlj8r02czhjgzkb39axnr8zzyp506r043xfmf93q9kilfmgjh"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-canary-stability" ,perl-canary-stability)))
-- 
cgit v1.2.3


From 30c6088e5ae87b283589fab250ad91fb8a09ff52 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 20 Sep 2019 12:46:59 +0200
Subject: gnu: rclone: Update to 1.49.3.

* gnu/packages/sync.scm (rclone): Update to 1.49.3.
---
 gnu/packages/sync.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 0c840a1a1d..7a85b6ce9e 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -264,14 +264,14 @@ over the Internet in an HTTP and CDN friendly way;
 (define-public rclone
   (package
     (name "rclone")
-    (version "1.49.2")
+    (version "1.49.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/rclone/rclone/releases/download/"
                            "v" version "/rclone-v" version ".tar.gz"))
        (sha256
-        (base32 "1q8lf85hg2havb1xsal75r19ck166rh19lffpd3i43zgblc6gs8j"))))
+        (base32 "04blngspm2hzi6d37bd3v19lpcvq0wlk38a9q0a4diwfwp2ab20n"))))
     ;; FIXME: Rclone bundles some libraries Guix already provides.  Need to
     ;; un-bundle them.
     (build-system go-build-system)
-- 
cgit v1.2.3


From aae65db560bd146ba47774cca46056d72be2a5d4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 16 Sep 2019 14:34:17 +0200
Subject: gnu: node: Disable tests that fail with openssl@1.1.1d.

Work around .

* gnu/packages/node.scm (node)[arguments]: Disable failing tests.
---
 gnu/packages/node.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index fc43fcb04c..bf585a9686 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -45,6 +45,7 @@
 (define-public node
   (package
     (name "node")
+    ;; XXX When updating, check if tests below (e.g. crypto) can be reënabled.
     (version "10.15.3")
     (source (origin
               (method url-fetch)
@@ -91,6 +92,11 @@
          (add-before 'configure 'patch-files
            (lambda* (#:key inputs #:allow-other-keys)
 
+             ;; FIXME: These tests fail with openssl@1.1.1d.
+             (for-each delete-file
+                       '("test/parallel/test-crypto-binary-default.js"
+                         "test/parallel/test-crypto-dh.js"))
+
              ;; Fix hardcoded /bin/sh references.
              (substitute* '("lib/child_process.js"
                             "lib/internal/v8_prof_polyfill.js"
-- 
cgit v1.2.3


From 36d19f0bb2b28bd4a71471c2ed887619c6ac87e7 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 17:32:11 +0200
Subject: gnu: emacs-avy: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-avy): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 98a2fb4233..c9fa6befef 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5180,6 +5180,9 @@ show icons as well.")
        (sha256
         (base32 "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs"))))
     (build-system emacs-build-system)
+    (arguments
+     `(#:tests? #t
+       #:test-command '("make" "test")))
     (home-page "https://github.com/abo-abo/avy")
     (synopsis "Tree-based completion for Emacs")
     (description
-- 
cgit v1.2.3


From 90fc79d8bf86ab6f49cb0cc01b74b6d0ea908874 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 17:35:22 +0200
Subject: gnu: emacs-ivy: Simplify #:test-command.

* gnu/packages/emacs-xyz.scm (emacs-ivy): Simplify #:test-command.
---
 gnu/packages/emacs-xyz.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c9fa6befef..d006a45e01 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5060,9 +5060,7 @@ automatically.")
              (lambda _
                (delete-file-recursively ".git"))))
          #:tests? #t
-         #:test-command '("emacs" "--batch"
-                          "-l" "ivy-test.el"
-                          "-f" "ivy-test-run-tests")))
+         #:test-command '("make" "test")))
       (propagated-inputs
        `(("emacs-hydra" ,emacs-hydra)))
       (native-inputs
-- 
cgit v1.2.3


From ab74b365ee19c035816ff77f515ac2c7cc31317b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 20 Sep 2019 17:47:04 +0200
Subject: gnu: emacs-js2-mode: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-js2-mode): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d006a45e01..7f0adaedc3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5655,6 +5655,9 @@ to all the other commands, too.")
        (sha256
         (base32 "0766bbr4piia9vfr4ivd2gwi8dxah654adv6h28ylz4q8xmfzm1b"))))
     (build-system emacs-build-system)
+    (arguments
+     `(#:tests? #t
+       #:test-command '("make" "test")))
     (home-page "https://github.com/mooz/js2-mode/")
     (synopsis "Improved JavaScript editing mode for Emacs")
     (description
-- 
cgit v1.2.3


From 38f549f28d73098dc31b879ff3dd73ecb5ab043f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 21 Sep 2019 05:57:19 +0200
Subject: gnu: emacs-lispy: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-lispy): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7f0adaedc3..ad53ebaea0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5293,8 +5293,32 @@ navigate code in a tree-like fashion.")
        ("emacs-ivy" ,emacs-ivy)
        ("emacs-hydra" ,emacs-hydra)
        ("emacs-zoutline" ,emacs-zoutline)))
+    (native-inputs
+     `(("emacs-clojure-mode" ,emacs-clojure-mode)
+       ("emacs-undercover" ,emacs-undercover)))
     (arguments
-     `(#:include (cons* "\\.clj$" "\\.edn$" "\\.py$" %default-include)))
+     `(#:include (cons* "\\.clj$" "\\.edn$" "\\.py$" %default-include)
+       #:phases
+       ;; XXX: one failing test involving python evaluation
+       (modify-phases %standard-phases
+         (add-before 'check 'make-test-writable
+           (lambda _
+             (make-file-writable "lispy-test.el")
+             #t))
+         (add-before 'check 'remove-python-eval-test
+           (lambda _
+             (emacs-batch-edit-file "lispy-test.el"
+               `(progn
+                 (progn
+                  (goto-char (point-min))
+                  (re-search-forward
+                   "ert-deftest lispy-eval-python-str")
+                  (beginning-of-line)
+                  (kill-sexp))
+                 (basic-save-buffer)))
+             #t)))
+       #:tests? #t
+       #:test-command '("make" "test")))
     (synopsis "Modal S-expression editing")
     (description
      "Due to the structure of Lisp syntax it's very rare for the programmer
-- 
cgit v1.2.3


From 82b545711823f6afc882331a150f45f3df14360d Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 21 Sep 2019 06:24:28 +0200
Subject: gnu: emacs-lispyville: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-lispyville): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ad53ebaea0..98b5347f71 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5347,6 +5347,25 @@ S-expression.")
        `(("emacs-evil" ,emacs-evil)
          ("emacs-lispy" ,emacs-lispy)))
       (build-system emacs-build-system)
+      (arguments
+       `(#:phases
+         ;; XXX: mysterious whitespace issue with one test
+         (modify-phases %standard-phases
+           (add-before 'check 'make-test-writable
+             (lambda _
+               (make-file-writable "lispyville-test.el")
+               #t))
+           (add-after 'make-test-writable 'remove-test
+             (lambda _
+               (emacs-batch-edit-file "lispyville-test.el"
+                 `(progn (progn (goto-char (point-min))
+                                (re-search-forward
+                                 "ert-deftest lispyville-comment-and-clone-dwim")
+                                (beginning-of-line)
+                                (kill-sexp))
+                         (basic-save-buffer))))))
+         #:tests? #t
+         #:test-command '("make" "test")))
       (synopsis "Minor mode for integrating Evil with lispy")
       (description
        "LispyVille's main purpose is to provide a Lisp editing environment
-- 
cgit v1.2.3


From 3eb4adc2c41896c202f3d9131c36160c0a1311e6 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Fri, 20 Sep 2019 23:10:09 -0700
Subject: gnu: enjarify: Adjust native-inputs.

* gnu/packages/android (enjarify)[native-inputs]: Use openjdk instead of
  openjdk:jdk.
---
 gnu/packages/android.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 8eb5182f51..337e60a641 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -984,7 +984,7 @@ main repository.")
                  (mkdir-p (string-append out "/bin/"))
                  (copy-file "enjarify.sh" (string-append out "/bin/enjarify"))
                  #t))))))
-    (native-inputs `(("openjdk:jdk" ,openjdk12 "jdk")))
+    (native-inputs `(("openjdk" ,openjdk12)))
     (synopsis "Translate Dalvik bytecode to equivalent Java bytecode")
     (description "Android applications are Java programs that run on a
 customized virtual machine, which is part of the Android operating system, the
-- 
cgit v1.2.3


From 44799c9f11ca3a5f99181e04f9e9017116e8a9fe Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 21 Sep 2019 08:53:43 +0200
Subject: gnu: emacs-rjsx-mode: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-rjsx-mode): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 98b5347f71..47119e165f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17239,6 +17239,9 @@ definition-jumping and type-checking on demand.")
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-js2-mode" ,emacs-js2-mode)))
+      (arguments
+       `(#:tests? #t
+         #:test-command '("make" "test")))
       (home-page "https://github.com/felipeochoa/rjsx-mode")
       (synopsis "Major mode for JSX files")
       (description "This package extends the parser of @code{js2-mode} to
-- 
cgit v1.2.3


From 5122209dde63ba369f3af2becd00cbbc3fd0d6f5 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 21 Sep 2019 08:57:20 +0200
Subject: gnu: emacs-counsel-etags: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-counsel-etags): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 47119e165f..bffd0c68eb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17316,6 +17316,9 @@ previewed by scrolling up and down within a @code{dired} buffer.")
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-ivy" ,emacs-ivy)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("make" "test")))
     (home-page "https://github.com/redguardtoo/counsel-etags")
     (synopsis "Fast @code{Ctags}/@code{Etags} solution with @code{ivy-mode}")
     (description "This package uses @code{ivy-mode} to facilitate navigating
-- 
cgit v1.2.3


From a43e9157ef479e94c19951cc9d228cf153bf78ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 20 Sep 2019 21:33:22 +0200
Subject: services: gdm: Ensure /var/lib/gdm is owned by "gdm".

Fixes .
Reported by Jan .

* gnu/services/xorg.scm (%gdm-activation): New variable.
(gdm-service-type)[extensions]: Add 'activation-service-type'.
---
 gnu/services/xorg.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 06d72b5f60..1d55e388a1 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -773,6 +773,27 @@ the GNOME desktop environment.")
          (home-directory "/var/lib/gdm")
          (shell (file-append shadow "/sbin/nologin")))))
 
+(define %gdm-activation
+  ;; Ensure /var/lib/gdm is owned by the "gdm" user.  This is normally the
+  ;; case but could be wrong if the "gdm" user was created, then removed, and
+  ;; then recreated under a different UID/GID: .
+  (with-imported-modules '((guix build utils))
+    #~(begin
+        (use-modules (guix build utils))
+
+        (let* ((gdm (getpwnam "gdm"))
+               (uid (passwd:uid gdm))
+               (gid (passwd:gid gdm))
+               (st  (stat "/var/lib/gdm" #f)))
+          ;; Recurse into /var/lib/gdm only if it has wrong ownership.
+          (when (and st
+                     (or (not (= uid (stat:uid st)))
+                         (not (= gid (stat:gid st)))))
+            (for-each (lambda (file)
+                        (chown file uid gid))
+                      (find-files "/var/lib/gdm"
+                                  #:directories? #t)))))))
+
 (define dbus-daemon-wrapper
   (program-file
    "gdm-dbus-wrapper"
@@ -915,6 +936,8 @@ the GNOME desktop environment.")
                 (extensions
                  (list (service-extension shepherd-root-service-type
                                           gdm-shepherd-service)
+                       (service-extension activation-service-type
+                                          (const %gdm-activation))
                        (service-extension account-service-type
                                           (const %gdm-accounts))
                        (service-extension pam-root-service-type
-- 
cgit v1.2.3


From 71507435225f10d8d944ba183cbcc77ef953e0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 20 Sep 2019 22:26:53 +0200
Subject: inferior: Propagate '&store-protocol-error' error conditions.

Until now '&store-protocol-error' conditions raised in the inferior
would not be correctly propagated because SRFI-35 records lack a read
syntax.

Reported at 
by Carl Dong .

* guix/inferior.scm (port->inferior): Import (srfi srfi-34) in the inferior.
(inferior-eval-with-store): Define 'error?' and 'error-message'.  Wrap
call to PROC in 'guard'.  Check the response of INFERIOR for a
'store-protocol-error' or a 'result' tag.
* tests/inferior.scm ("inferior-eval-with-store, &store-protocol-error"):
New test.
---
 guix/inferior.scm  | 31 +++++++++++++++++++++++++++----
 tests/inferior.scm | 13 +++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/guix/inferior.scm b/guix/inferior.scm
index fee97750b6..6be30d3f17 100644
--- a/guix/inferior.scm
+++ b/guix/inferior.scm
@@ -19,6 +19,8 @@
 (define-module (guix inferior)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-9 gnu)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
   #:use-module ((guix utils)
                 #:select (%current-system
                           source-properties->location
@@ -29,7 +31,8 @@
                 #:select (store-connection-socket
                           store-connection-major-version
                           store-connection-minor-version
-                          store-lift))
+                          store-lift
+                          &store-protocol-error))
   #:use-module ((guix derivations)
                 #:select (read-derivation-from-file))
   #:use-module (guix gexp)
@@ -151,6 +154,7 @@ inferior."
        (inferior-eval '(use-modules (guix)) result)
        (inferior-eval '(use-modules (gnu)) result)
        (inferior-eval '(use-modules (ice-9 match)) result)
+       (inferior-eval '(use-modules (srfi srfi-34)) result)
        (inferior-eval '(define %package-table (make-hash-table))
                       result)
        result))
@@ -462,7 +466,13 @@ thus be the code of a one-argument procedure that accepts a store."
        (listen socket 1024)
        (send-inferior-request
         `(let ((proc   ,code)
-               (socket (socket AF_UNIX SOCK_STREAM 0)))
+               (socket (socket AF_UNIX SOCK_STREAM 0))
+               (error? (if (defined? 'store-protocol-error?)
+                           store-protocol-error?
+                           nix-protocol-error?))
+               (error-message (if (defined? 'store-protocol-error-message)
+                                  store-protocol-error-message
+                                  nix-protocol-error-message)))
            (connect socket AF_UNIX ,name)
 
            ;; 'port->connection' appeared in June 2018 and we can hardly
@@ -475,7 +485,13 @@ thus be the code of a one-argument procedure that accepts a store."
              (dynamic-wind
                (const #t)
                (lambda ()
-                 (proc store))
+                 ;; Serialize '&store-protocol-error' conditions.  The
+                 ;; exception serialization mechanism that
+                 ;; 'read-repl-response' expects is unsuitable for SRFI-35
+                 ;; error conditions, hence this special case.
+                 (guard (c ((error? c)
+                            `(store-protocol-error ,(error-message c))))
+                   `(result ,(proc store))))
                (lambda ()
                  (close-connection store)
                  (close-port socket)))))
@@ -484,7 +500,14 @@ thus be the code of a one-argument procedure that accepts a store."
          ((client . address)
           (proxy client (store-connection-socket store))))
        (close-port socket)
-       (read-inferior-response inferior)))))
+
+       (match (read-inferior-response inferior)
+         (('store-protocol-error message)
+          (raise (condition
+                  (&store-protocol-error (message message)
+                                         (status 1)))))
+         (('result result)
+          result))))))
 
 (define* (inferior-package-derivation store package
                                       #:optional
diff --git a/tests/inferior.scm b/tests/inferior.scm
index 71ebf8f59b..f54b6d6037 100644
--- a/tests/inferior.scm
+++ b/tests/inferior.scm
@@ -27,6 +27,7 @@
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages guile)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 match))
 
@@ -186,6 +187,18 @@
                                  (add-text-to-store store "foo"
                                                     "Hello, world!")))))
 
+(test-assert "inferior-eval-with-store, &store-protocol-error"
+  (let* ((inferior (open-inferior %top-builddir
+                                  #:command "scripts/guix")))
+    (guard (c ((store-protocol-error? c)
+               (string-contains (store-protocol-error-message c)
+                                "invalid character")))
+      (inferior-eval-with-store inferior %store
+                                '(lambda (store)
+                                   (add-text-to-store store "we|rd/?!@"
+                                                      "uh uh")))
+      #f)))
+
 (test-equal "inferior-package-derivation"
   (map derivation-file-name
        (list (package-derivation %store %bootstrap-guile "x86_64-linux")
-- 
cgit v1.2.3


From ad34409e8581f8ad0273ddec277575fc112e1604 Mon Sep 17 00:00:00 2001
From: Alexey Abramov 
Date: Mon, 16 Sep 2019 16:42:15 +0200
Subject: services: dovecot: Fix predicate names for free-form fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/services/mail.scm (free-form-fields?, free-form-args?): Change
'string' to 'string?'.

Signed-off-by: Ludovic Courtès 
---
 gnu/services/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 3de0b4c2f3..2606aa9e3e 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -137,7 +137,7 @@
 (define (free-form-fields? val)
   (match val
     (() #t)
-    ((((? symbol?) . (? string)) . val) (free-form-fields? val))
+    ((((? symbol?) . (? string?)) . val) (free-form-fields? val))
     (_ #f)))
 (define (serialize-free-form-fields field-name val)
   (for-each (match-lambda ((k . v) (serialize-field k v))) val))
@@ -145,7 +145,7 @@
 (define (free-form-args? val)
   (match val
     (() #t)
-    ((((? symbol?) . (? string)) . val) (free-form-args? val))
+    ((((? symbol?) . (? string?)) . val) (free-form-args? val))
     (_ #f)))
 (define (serialize-free-form-args field-name val)
   (serialize-field field-name
-- 
cgit v1.2.3


From 9ba1e308c79ee8114449a928a12239239e70a6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= 
Date: Mon, 16 Sep 2019 18:15:49 +0200
Subject: gnu: Add autocutsel.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/xdisorg.scm (autocutsel): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/xdisorg.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index bcc61f59af..10ffa6f695 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2018, 2019 Rutger Helling 
 ;;; Copyright © 2018, 2019 Pierre Neidhardt 
 ;;; Copyright © 2018 Nam Nguyen 
+;;; Copyright © 2019 Wiktor Żelazny 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1708,3 +1709,28 @@ temperature of the screen.")
     (description "Wl-clipboard is a set of command-line copy/paste utilities for
 Wayland.")
     (license license:gpl3+)))
+
+(define-public autocutsel
+  (package
+    (name "autocutsel")
+    (version "0.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/sigmike/autocutsel"
+                                  "/releases/download/" version "/"
+                                  "autocutsel-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f)) ; no "check" target
+    (native-inputs `(("libx11" ,libx11)
+                     ("libxaw" ,libxaw)))
+    (home-page "https://www.nongnu.org/autocutsel/")
+    (synopsis "Automated X11 clipboard and cutbuffer synchronization")
+    (description "@code{autocutsel} tracks changes in the server's cutbuffer
+and clipboard selection.  When the clipboard is changed, it updates the
+cutbuffer.  When the cutbuffer is changed, it owns the clipboard selection.
+The cutbuffer and clipboard selection are always synchronized.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From c1bbef6920b1eb7e212b5e11d0385d477a53fbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= 
Date: Mon, 16 Sep 2019 18:19:39 +0200
Subject: gnu: Add python-bibtexparser.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-xyz.scm (python-bibtexparser): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4e33fa575f..69c8e63ecf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -65,6 +65,7 @@
 ;;; Copyright © 2019 Pierre Langlois 
 ;;; Copyright © 2019 Jacob MacDonald 
 ;;; Copyright © 2019 Giacomo Leidi 
+;;; Copyright © 2019 Wiktor Żelazny 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -16376,3 +16377,24 @@ ElementTree library and for the @uref{http://lxml.de, lxml.etree} library.
 For lxml.etree this package can be useful for providing XPath 2.0 selectors,
 because lxml.etree already has it's own implementation of XPath 1.0.")
     (license license:expat)))
+
+(define-public python-bibtexparser
+  (package
+    (name "python-bibtexparser")
+    (version "1.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "bibtexparser" version))
+       (sha256
+        (base32
+         "0zwhfkrzf3n5847dbnfng92k7ak199l9v6x6ax3dgdidfpm6d2fz"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-pyparsing" ,python-pyparsing)))
+    (native-inputs
+     `(("python-future" ,python-future)))
+    (home-page "https://github.com/sciunto-org/python-bibtexparser")
+    (synopsis "Python library to parse BibTeX files")
+    (description "BibtexParser is a Python library to parse BibTeX files.")
+    (license (list license:bsd-3 license:lgpl3))))
-- 
cgit v1.2.3


From aeb51370da7c854e8167066df9b138e15d7363e6 Mon Sep 17 00:00:00 2001
From: zimoun 
Date: Thu, 19 Sep 2019 19:24:42 +0200
Subject: guix package: Add 'guix show' alias.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/scripts/show.scm: New file.
* Makefile.am (MODULES): Add it.
* po/guix/POTFILES.in: Add it.
* tests/guix-package-aliases.sh: Add test.
* doc/guix.texi (Invoking guix package): Document it and use it in a example.

Signed-off-by: Ludovic Courtès 
---
 Makefile.am                   |  1 +
 doc/guix.texi                 |  8 ++++--
 guix/scripts/show.scm         | 67 +++++++++++++++++++++++++++++++++++++++++++
 po/guix/POTFILES.in           |  1 +
 tests/guix-package-aliases.sh |  4 +++
 5 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 guix/scripts/show.scm

diff --git a/Makefile.am b/Makefile.am
index 93d18d7df6..f71ea77671 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -241,6 +241,7 @@ MODULES =					\
   guix/scripts/remove.scm			\
   guix/scripts/upgrade.scm			\
   guix/scripts/search.scm			\
+  guix/scripts/show.scm				\
   guix/scripts/gc.scm				\
   guix/scripts/hash.scm				\
   guix/scripts/pack.scm				\
diff --git a/doc/guix.texi b/doc/guix.texi
index 0ed59072c9..af1903f6ff 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2657,7 +2657,9 @@ For your convenience, we also provide the following aliases:
 @item
 @command{guix remove} is an alias for @command{guix package -r},
 @item
-and @command{guix upgrade} is an alias for @command{guix package -u}.
+@command{guix upgrade} is an alias for @command{guix package -u},
+@item
+and @command{guix show} is an alias for @command{guix package --show=}.
 @end itemize
 
 These aliases are less expressive than @command{guix package} and provide
@@ -3020,9 +3022,9 @@ version: 3.3.5
 @end example
 
 You may also specify the full name of a package to only get details about a
-specific version of it:
+specific version of it (this time using the @command{guix show} alias):
 @example
-$ guix package --show=python@@3.4 | recsel -p name,version
+$ guix show python@@3.4 | recsel -p name,version
 name: python
 version: 3.4.3
 @end example
diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm
new file mode 100644
index 0000000000..94f0559358
--- /dev/null
+++ b/guix/scripts/show.scm
@@ -0,0 +1,67 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Simon Tournier 
+;;;
+;;; 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 .
+
+(define-module (guix scripts show)
+  #:use-module (guix ui)
+  #:use-module (guix scripts package)
+  #:use-module (guix scripts)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-37)
+  #:export (guix-show))
+
+(define (show-help)
+  (display (G_ "Usage: guix show [OPTION] PACKAGE...
+Show details about PACKAGE."))
+  (display (G_"
+This is an alias for 'guix package --show='.\n"))
+  (newline)
+  (display (G_ "
+  -h, --help             display this help and exit"))
+  (display (G_ "
+  -V, --version          display version information and exit"))
+  (newline)
+  (show-bug-report-information))
+
+(define %options
+  ;; Specification of the command-line options.
+  (list (option '(#\h "help") #f #f
+                (lambda args
+                  (show-help)
+                  (exit 0)))
+        (option '(#\V "version") #f #f
+                (lambda args
+                  (show-version-and-exit "guix show")))))
+
+(define (guix-show . args)
+  (define (handle-argument arg result)
+    ;; Treat all non-option arguments as regexps.
+    (cons `(query show ,arg)
+          result))
+
+  (define opts
+    (args-fold* args %options
+                (lambda (opt name arg . rest)
+                  (leave (G_ "~A: unrecognized option~%") name))
+                handle-argument
+                '()))
+
+  (unless (assoc-ref opts 'query)
+    (leave (G_ "missing arguments: no package to show~%")))
+
+  (guix-package* opts))
diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in
index 8b556ac0ec..f629034d61 100644
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@ -47,6 +47,7 @@ guix/scripts/install.scm
 guix/scripts/remove.scm
 guix/scripts/upgrade.scm
 guix/scripts/search.scm
+guix/scripts/show.scm
 guix/scripts/gc.scm
 guix/scripts/hash.scm
 guix/scripts/import.scm
diff --git a/tests/guix-package-aliases.sh b/tests/guix-package-aliases.sh
index 5c68664093..9c038b99a5 100644
--- a/tests/guix-package-aliases.sh
+++ b/tests/guix-package-aliases.sh
@@ -58,3 +58,7 @@ if guix remove -i guile-bootstrap -p "$profile" --bootstrap
 then false; else true; fi
 
 guix search '\' game | grep '^name: gnubg'
+
+guix show --version
+guix show guile
+guix show python@3 | grep "^name: python"
-- 
cgit v1.2.3


From 660dbe65641851aa99b810e4ae065a5f72dc37d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 20 Sep 2019 23:02:30 +0200
Subject: guix package: '--show' ignores deprecated packages.

* guix/scripts/package.scm (process-query) <'show>: Remove superseded
packages.
* tests/guix-package-aliases.sh: Add test.
---
 guix/scripts/package.scm      | 3 ++-
 tests/guix-package-aliases.sh | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 21737f43da..f03741aa9e 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -764,7 +764,8 @@ processed, #f otherwise."
       (('show requested-name)
        (let-values (((name version)
                      (package-name->name+version requested-name)))
-         (match (find-packages-by-name name version)
+         (match (remove package-superseded
+                        (find-packages-by-name name version))
            (()
             (leave (G_ "~a~@[@~a~]: package not found~%") name version))
            (packages
diff --git a/tests/guix-package-aliases.sh b/tests/guix-package-aliases.sh
index 9c038b99a5..4beed2e5b7 100644
--- a/tests/guix-package-aliases.sh
+++ b/tests/guix-package-aliases.sh
@@ -62,3 +62,6 @@ guix search '\' game | grep '^name: gnubg'
 guix show --version
 guix show guile
 guix show python@3 | grep "^name: python"
+
+# "python@2" exists but is deprecated; make sure it doesn't show up.
+if guix show python@2; then false; else true; fi
-- 
cgit v1.2.3


From c219104c7803cd31ab1cf4bef142a8fbf8ed5b7a Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sun, 15 Sep 2019 13:31:41 +0100
Subject: gnu: guile-email: Add phase to patch the module directory.

Otherwise the .go files appear within share, and Guile doesn't find them. With
this patch they appear in lib within the output. One thing this means is that
stack traces include the filenames.

* gnu/packages/guile-xyz.scm (guile-email)[arguments]: Add 'patch-module-dir
phase.
---
 gnu/packages/guile-xyz.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index d6967929be..9822cd59c6 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -926,7 +926,16 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.")
     (inputs
      `(("guile" ,guile-2.2)))
     (arguments
-     '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
+     '(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-module-dir
+           (lambda _
+             (substitute* "Makefile.in"
+               (("^godir = ([[:graph:]]+)")
+                "godir = \
+$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
+             #t)))))
     (home-page "https://guile-email.systemreboot.net")
     (synopsis "Guile email parser")
     (description "guile-email is a collection of email utilities implemented
-- 
cgit v1.2.3


From b64fa7f0626618664330e83dbdbfb7a70736f657 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sun, 8 Sep 2019 18:37:53 +0100
Subject: services: virtualization: Change libvirtd use syslog by default.

As defaulting by stderr, along with the shepherd service not directing the
output to a log file makes seeing the output difficult, compared to logging to
syslog.

* gnu/services/virtualization.scm (libvirt-configuration)[log-outputs]: Change
default from "3:stderr" to "3:syslog:libvirtd".
---
 gnu/services/virtualization.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index 3eecd2c085..bc8ac9b40a 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -313,7 +313,7 @@ be logged:
 Multiple filters can be defined in a single filters statement, they just
 need to be separated by spaces.")
   (log-outputs
-    (string "3:stderr")
+    (string "3:syslog:libvirtd")
     "Logging outputs.
 
 An output is one of the places to save logging information
-- 
cgit v1.2.3


From ca2ead31d261a209b86bc6355d3f2dec6ca95266 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 20 Sep 2019 22:07:28 +0200
Subject: gnu: wxmaxima: Update to 19.09.0.

* gnu/packages/maths.scm (wxmaxima): Update to 19.09.0.
---
 gnu/packages/maths.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a42b81ac6b..47026ec41b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2973,7 +2973,7 @@ point numbers.")
 (define-public wxmaxima
   (package
     (name "wxmaxima")
-    (version "19.08.0")
+    (version "19.09.0")
     (source
      (origin
        (method git-fetch)
@@ -2982,8 +2982,7 @@ point numbers.")
              (commit (string-append "Version-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "028g4g2081vsgslbdliskfy5q2wknvknw89lk3zp89py6wranxas"))))
+        (base32 "195j6j8z0jd6xg3a63ywbrbsc6dany795m3fb95nbx1vq0bqqvvn"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("gettext" ,gettext-minimal)))
-- 
cgit v1.2.3


From 10097e585e27c79349a39ab4743885e86a8b7797 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 21 Sep 2019 18:57:49 +0200
Subject: gnu: libgnomekbd: Update to 3.26.1.

* gnu/packages/gnome.scm (libgnomekbd): Update to 3.26.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 31ff2ab972..65ec9cdb74 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7261,7 +7261,7 @@ GLib/GObject code.")
 (define-public libgnomekbd
   (package
     (name "libgnomekbd")
-    (version "3.26.0")
+    (version "3.26.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -7269,7 +7269,7 @@ GLib/GObject code.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0xc8jrc44x2h24v28wv36k70k7bwxy6p2vsvxvvia1n3ay642fza"))))
+                "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From d47fa82dfcbd201c889d9057916d2f539cb1b864 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 21 Sep 2019 18:57:53 +0200
Subject: gnu: libgnomekbd: Don't use NAME in source URI.

* gnu/packages/gnome.scm (libgnomekbd)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 65ec9cdb74..34a0c43b50 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7264,9 +7264,9 @@ GLib/GObject code.")
     (version "3.26.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/libgnomekbd/"
                                   (version-major+minor version)  "/"
-                                  name "-" version ".tar.xz"))
+                                  "libgnomekbd-" version ".tar.xz"))
               (sha256
                (base32
                 "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"))))
-- 
cgit v1.2.3


From e13b354a7733d22bb67c8618aa41d7f759f4432e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 21 Sep 2019 20:35:04 +0200
Subject: gnu: emacs-elfeed: Update to 3.2.0.

* gnu/packages/emacs-xyz.scm (emacs-elfeed): Update to 3.2.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bffd0c68eb..a463f4cd58 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5877,7 +5877,7 @@ If you want to mark a folder manually as a project just create an empty
 (define-public emacs-elfeed
   (package
     (name "emacs-elfeed")
-    (version "3.1.0")
+    (version "3.2.0")
     (source
      (origin
        (method git-fetch)
@@ -5886,7 +5886,7 @@ If you want to mark a folder manually as a project just create an empty
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i"))))
+        (base32 "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
-- 
cgit v1.2.3


From 2f587b3f97bf384e6a62acb3af6929b609d184ca Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 21 Sep 2019 22:31:48 +0200
Subject: gnu: emacs-github-review: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-github-review): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a463f4cd58..f4311dd336 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14789,6 +14789,12 @@ viewing files with long lines.")
        `(("emacs-dash" ,emacs-dash)
          ("emacs-s" ,emacs-s)
          ("emacs-ghub" ,emacs-ghub)))
+      (native-inputs
+       `(("emacs-buttercup" ,emacs-buttercup)
+         ("emacs-undercover" ,emacs-undercover)))
+      (arguments
+       `(#:tests? #t
+         #:test-command '("buttercup" "-L" "test/github-review-test.el")))
       (home-page "https://github.com/charignon/github-review")
       (synopsis "Review GitHub pull requests within Emacs")
       (description "This package provides commands to pull in, comment on, and
-- 
cgit v1.2.3


From 71ace914cf4dbbc0c99bdaf0b33c05e737d0c8f7 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 21 Sep 2019 22:57:45 +0200
Subject: gnu: emacs-attrap: Update to 1.0-2.18cd1f7.

* gnu/packages/emacs-xyz.scm (emacs-attrap): Update to 1.0-2.18cd1f7.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f4311dd336..4fda76deaa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9516,8 +9516,8 @@ functions written in continuation-passing style.")
     (license license:gpl3+)))
 
 (define-public emacs-attrap
-  (let ((commit "3b092bb8f6755a97e6ecb7623b9d2dde58beba4a")
-        (revision "1"))
+  (let ((commit "18cd1f7832870a36c404e872fa83a271fe8e688d")
+        (revision "2"))
     (package
       (name "emacs-attrap")
       (version (git-version "1.0" revision commit))
@@ -9528,7 +9528,7 @@ functions written in continuation-passing style.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "05d32980saji8ja1pcv65l0s3dq7w0n5hpikbf246hciy1x067pp"))
+                  "078391949h0fgmshin8f79a1a595m06ig577rkgjqgngcp0d61l9"))
                 (file-name (git-file-name name version))))
       (build-system emacs-build-system)
       (propagated-inputs
-- 
cgit v1.2.3


From 265f30c9c434b5ad85a364ca780d635d32b615a0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 21 Sep 2019 23:57:59 +0200
Subject: gnu: mutt: Update to 1.12.2.

* gnu/packages/mail.scm (mutt): Update to 1.12.2.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 35b4e03e1b..3d5417bfb5 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -353,14 +353,14 @@ aliasing facilities to work just as they would on normal mail.")
 (define-public mutt
   (package
     (name "mutt")
-    (version "1.12.1")
+    (version "1.12.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://bitbucket.org/mutt/mutt/downloads/"
                                  "mutt-" version ".tar.gz"))
              (sha256
               (base32
-               "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81"))
+               "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw"))
              (patches (search-patches "mutt-store-references.patch"))))
     (build-system gnu-build-system)
     (inputs
-- 
cgit v1.2.3


From aaeb2b34cbebb12da326caed09d9d9625a8a2af1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sat, 21 Sep 2019 15:31:41 -0700
Subject: gnu: diffoscope: Adjust native-inputs for architecture limitations.

* gnu/packages/diffoscope (diffoscope)[native-inputs]: Only add ghc on
  x86_64-linux and i686-linux.
  Only add openjdk and enjarify on x86_64-linux.
---
 gnu/packages/diffoscope.scm | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 8df5a9cc0e..15d5a5787e 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -63,7 +63,8 @@
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
-  #:use-module (guix utils))
+  #:use-module (guix utils)
+  #:use-module (ice-9 match))
 
 (define-public diffoscope
   (let ((version "125"))
@@ -165,6 +166,22 @@
                        ("python-chardet" ,python-chardet)
                        ("python-binwalk" ,python-binwalk)
                        ;; test suite skips tests when tool is missing
+                       ,@(match (%current-system)
+                                ;; ghc is only available on x86 currently.
+                                ((or "x86_64-linux" "i686-linux")
+                                 `(("ghc" ,ghc)))
+                                (_
+                                 `()))
+                       ,@(match (%current-system)
+                                ;; openjdk and dependent packages are only
+                                ;; available on x86_64 currently.
+                                ((or "x86_64-linux")
+                                 `(("enjarify" ,enjarify)
+                                   ;; no unversioned openjdk available
+                                   ("openjdk:jdk" ,openjdk12 "jdk")
+                                   ))
+                                (_
+                                 `()))
                        ("abootimg" ,abootimg)
                        ("bdb" ,bdb)
                        ("binutils" ,binutils)
@@ -175,10 +192,8 @@
                        ("docx2txt" ,docx2txt)
                        ("dtc" ,dtc)
                        ("e2fsprogs" ,e2fsprogs)
-                       ("enjarify" ,enjarify)
                        ("ffmpeg" ,ffmpeg)
                        ("gettext" ,gettext-minimal)
-                       ("ghc" ,ghc)
                        ("ghostscript" ,ghostscript)
                        ("giflib:bin" ,giflib "bin")
                        ("gnumeric" ,gnumeric)
@@ -190,8 +205,6 @@
                        ("mono" ,mono)
                        ("ocaml" ,ocaml)
                        ("odt2txt" ,odt2txt)
-                       ;; no unversioned openjdk available
-                       ("openjdk:jdk" ,openjdk12 "jdk")
                        ("openssh" ,openssh)
                        ("pgpdump" ,pgpdump)
                        ("poppler" ,poppler)
-- 
cgit v1.2.3


From ee0a392fa001b3e3aea05150dd985b59fb7e5e3b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 05:00:49 +0200
Subject: gnu: emacs-lispy: Update included files.

* gnu/packages/emacs-xyz.scm (emacs-lispy): Update included files.
---
 gnu/packages/emacs-xyz.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4fda76deaa..878d0a3d6e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5297,7 +5297,9 @@ navigate code in a tree-like fashion.")
      `(("emacs-clojure-mode" ,emacs-clojure-mode)
        ("emacs-undercover" ,emacs-undercover)))
     (arguments
-     `(#:include (cons* "\\.clj$" "\\.edn$" "\\.py$" %default-include)
+     `(#:include (cons* "^lispy-clojure\\.clj$"
+                        "^lispy-python\\.py$"
+                        %default-include)
        #:phases
        ;; XXX: one failing test involving python evaluation
        (modify-phases %standard-phases
-- 
cgit v1.2.3


From c5c197cf25236411b1de51f21b179ee997e32621 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 07:03:12 +0200
Subject: gnu: emacs-crux: Update to 0.3.0-2.308f17d.

* gnu/packages/emacs-xyz.scm (emacs-crux): Update to 0.3.0-2.308f17d.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 878d0a3d6e..663dcf5c1f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12024,12 +12024,11 @@ confused by comments or @code{foo-bar} matching @code{foo}.")
     (license license:gpl3+)))
 
 (define-public emacs-crux
-  (let ((commit "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f")
-        (revision "1"))
+  (let ((commit "308f17d914e2cd79cbc809de66d02b03ceb82859")
+        (revision "2"))
     (package
       (name "emacs-crux")
-      (version (string-append "0.3.0" "-" revision "."
-                              (string-take commit 7)))
+      (version (git-version "0.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -12039,7 +12038,7 @@ confused by comments or @code{foo-bar} matching @code{foo}.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd"))))
+           "0rf84finwlvmy0xpgyljjvnrijlmkzjyw9rh97svgxp9c1rzfk0x"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/bbatsov/crux")
       (synopsis "Collection of useful functions for Emacs")
-- 
cgit v1.2.3


From 4b48101012fc1ad900e20e3b298e8f9fd9f822ae Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 07:03:43 +0200
Subject: gnu: emacs-company-lua: Update to 0.1-2.29f6819.

* gnu/packages/emacs-xyz.scm (emacs-company-lua): Update to 0.1-2.29f6819.
[arguments]: Include extra directory.
---
 gnu/packages/emacs-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 663dcf5c1f..6f81200872 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12299,10 +12299,11 @@ until the top-level form is no longer a macro call.")
       (license license:gpl3+))))
 
 (define-public emacs-company-lua
-  (let ((commit "0be8122f3adf57ad27953bf4b03545d6298d3da4"))
+  (let ((commit "29f6819de4d691e5fd0b62893a9f4fbc1c6fcb52")
+        (revision "2"))
     (package
       (name "emacs-company-lua")
-      (version (git-version "0.1" "1" commit))
+      (version (git-version "0.1" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -12312,13 +12313,15 @@ until the top-level form is no longer a macro call.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1d9i165apgmwns7b2fd5wcpjpkah3dyj20v5sb8ynvz6qhhr5r9c"))))
+           "0ny2dcc7c585p7v3j6q0rpkbj1qmf2ismy8a5020jpr585xvz0hh"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-company" ,emacs-company)
          ("emacs-s" ,emacs-s)
          ("emacs-f" ,emacs-f)
          ("emacs-lua-mode" ,emacs-lua-mode)))
+      (arguments
+       `(#:include (cons* "^lua\\/" %default-include)))
       (home-page "https://github.com/ptrv/company-lua")
       (synopsis "Company backend for Lua")
       (description
-- 
cgit v1.2.3


From f36617cbf1fab9cbc4f93924b3cbb78e70338d24 Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Wed, 3 Jul 2019 09:40:31 -0700
Subject: gnu: Add coin3D.

* gnu/packages/graphics.scm (coin3D): New variable.
---
 gnu/packages/graphics.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 988b519ffa..cd33ea2800 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2019 Mark H Weaver 
 ;;; Copyright © 2019 Carlo Zancanaro 
 ;;; Copyright © 2019 Steve Sprang 
+;;; Copyright © 2019 John Soo 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1059,3 +1060,49 @@ For example, two shapes can be combined by uniting them, by intersecting them,
 or by subtracting one shape from the other.")
       (home-page "http://www.opencsg.org/")
       (license license:gpl2))))
+
+(define-public coin3D
+  (package
+    (name "coin3D")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://bitbucket.org/Coin3D/coin/downloads/coin-"
+             version "-src.zip"))
+       (sha256
+        (base32
+         "1mqwlqzvc9ydfxi0bfskwlil16mbnkphfz36p0zl2mvw6h05aqh0"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           (for-each delete-file
+                     '("cfg/csubst.exe"
+                       "cfg/wrapmsvc.exe"))
+           #t))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("doxygen" ,doxygen)
+       ("graphviz" ,graphviz)))
+    (inputs
+     `(("boost" ,boost)
+       ("freeglut" ,freeglut)
+       ("glew" ,glew)))
+    (arguments
+     `(#:configure-flags
+       (list
+        "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
+        (string-append "-DBOOST_ROOT="
+                       (assoc-ref %build-inputs "boost")))))
+    (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home")
+    (synopsis
+     "High-level 3D visualization library with Open Inventor 2.1 API")
+    (description
+     "Coin is a 3D graphics library with an Application Programming Interface
+based on the Open Inventor 2.1 API.  For those who are not familiar with
+Open Inventor, it is a scene-graph based retain-mode rendering and model
+interaction library, written in C++, which has become the de facto
+standard graphics library for 3D visualization and visual simulation
+software in the scientific and engineering community.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From 37a3abb1c6281fb883e114e8bf828817e0c65845 Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Sat, 6 Jul 2019 09:13:50 -0700
Subject: gnu: Add python-shiboken-2.

* gnu/packages/qt.scm (python-shiboken-2): New variable.
---
 gnu/packages/qt.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 165b8fd7b4..9f012f121c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018 Nicolas Goaziou 
 ;;; Copyright © 2018 Hartmut Goebel 
 ;;; Copyright © 2018 Eric Bavier 
+;;; Copyright © 2018 John Soo 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,7 +39,9 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages databases)
@@ -54,6 +57,7 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages llvm)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages pciutils)
@@ -2283,3 +2287,58 @@ user-friendly than the default @code{QColorDialog} and several other
 color-related widgets.")
       ;; Includes a license exception for combining with GPL2 code.
       (license license:lgpl3+))))
+
+(define-public python-shiboken-2
+  (let ((revision "1")
+        ;; Pinned to branches with support for qt 5.11.3
+        (commit "4018787a3cc01d632fdca7891ac8aa9487110c26"))
+    (package
+      (name "python-shiboken-2")
+      (version (git-version "v5.11.3" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               ;; The latest versions of Shiboken live in the pyside repo.
+               ;; There is another standalone repo only for Shiboken
+               ;; but it is outdated
+               (url "https://code.qt.io/pyside/pyside-setup")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5"))))
+      (build-system cmake-build-system)
+      (inputs
+       `(("llvm-6" ,llvm-6)
+         ("clang-6" ,clang-6)
+         ("libxml2" ,libxml2)
+         ("libxslt" ,libxslt)
+         ("python-wrapper" ,python-wrapper)
+         ("qtbase" ,qtbase)
+         ("qtxmlpatterns" ,qtxmlpatterns)))
+      (arguments
+       `(#:tests? #f
+         ;; FIXME: Building tests fails
+         #:configure-flags '("-DBUILD_TESTS=off")
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'use-shiboken-dir-only
+             (lambda _ (chdir "sources/shiboken2") #t))
+           (add-before 'configure 'set-build-env
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let ((llvm (assoc-ref inputs "llvm-6")))
+                 (setenv "CLANG_INSTALL_DIR" llvm)
+                 #t))))))
+      (home-page "https://wiki.qt.io/Qt_for_Python")
+      (synopsis
+       "Shiboken generates bindings for C++ libraries using CPython source code")
+      (description
+       "Shiboken generates bindings for C++ libraries using CPython source code")
+      (license
+       (list
+        ;; The main code is GPL3 or LGPL3.
+        ;; Examples are BSD-3.
+        license:gpl3
+        license:lgpl3
+        license:bsd-3)))))
-- 
cgit v1.2.3


From 8b5107d2099ae8fe787ae5e4f60cb1d11d737d3a Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Sun, 11 Aug 2019 12:38:08 -0700
Subject: gnu: Add libcxx-6

* gnu/packages/llvm.scm (libcxx-6): New variable.
---
 gnu/packages/llvm.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 9efb4a4841..d8ffe35117 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -440,6 +440,23 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
                    "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"
                    #:patches '("clang-6.0-libc-search-path.patch")))
 
+;; Libcxx files specifically used by PySide2.
+(define-public libcxx-6
+  (package
+    (inherit libcxx)
+    (version (package-version llvm-6))
+    (source
+     (origin
+       (inherit (package-source libcxx))
+       (uri (string-append "http://llvm.org/releases/"
+                           version "/libcxx-" version ".src.tar.xz"))
+       (sha256
+        (base32
+         "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"))))
+    (native-inputs
+     `(("clang" ,clang-6)
+       ("llvm" ,llvm-6)))))
+
 (define-public llvm-3.9.1
   (package (inherit llvm)
     (name "llvm")
-- 
cgit v1.2.3


From f1c4dbfa552fd543ec89a58ab9fee680272d1663 Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Mon, 2 Sep 2019 07:27:15 -0700
Subject: gnu: Add python-pyside-2.

 * gnu/packages/qt.scm (python-pyside-2): New variable.
---
 gnu/packages/qt.scm | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9f012f121c..138ca2becb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2342,3 +2342,86 @@ color-related widgets.")
         license:gpl3
         license:lgpl3
         license:bsd-3)))))
+
+(define-public python-pyside-2
+  (let ((revision "1")
+        ;; Pinned to branches with support for qt 5.11.3
+        (commit "4018787a3cc01d632fdca7891ac8aa9487110c26"))
+    (package
+      (name "python-pyside-2")
+      (version (git-version "v5.11.3" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://code.qt.io/pyside/pyside-setup")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5"))))
+      (build-system cmake-build-system)
+      (inputs
+       `(("libcxx" ,libcxx-6)
+         ("libxml2" ,libxml2)
+         ("libxslt" ,libxslt)
+         ("llvm-6" ,llvm-6)
+         ("clang-6" ,clang-6)
+         ("qtbase" ,qtbase)
+         ("qtdatavis3d" ,qtdatavis3d)
+         ("qtlocation" ,qtlocation)
+         ("qtmultimedia" ,qtmultimedia)
+         ("qtquickcontrols" ,qtquickcontrols)
+         ("qtscript" ,qtscript)
+         ("qtscxml" ,qtscxml)
+         ("qtsensors" ,qtsensors)
+         ("qtspeech" ,qtspeech)
+         ("qtsvg" ,qtsvg)
+         ("qtwebchannel" ,qtwebchannel)
+         ("qtwebsockets" ,qtwebsockets)
+         ("qtx11extras" ,qtx11extras)
+         ("qtxmlpatterns" ,qtxmlpatterns)))
+      (native-inputs
+       `(("cmake" ,cmake)
+         ("python-shiboken-2" ,python-shiboken-2)
+         ("python-wrapper" ,python-wrapper)
+         ("qttools" ,qttools)
+         ("which" ,which)))
+      (arguments
+       `(#:tests? #f
+         ;; FIXME: Building tests fail.
+         #:configure-flags '("-DBUILD_TESTS=FALSE")
+         #:phases
+         (modify-phases
+             %standard-phases
+           (add-after 'unpack 'go-to-source-dir
+             (lambda _ (chdir "sources/pyside2") #t))
+           (add-before 'configure 'set-clang-dir
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let ((clang (assoc-ref inputs "clang-6"))
+                     (libcxx (assoc-ref inputs "libcxx")))
+                 (setenv "CLANG_INSTALL_DIR" clang)
+                 (substitute* "cmake/Macros/PySideModules.cmake"
+                   (("--include-paths=")
+                    (string-append "--include-paths=" libcxx "/include/c++/v1:")))
+                 #t))))))
+      (home-page "https://wiki.qt.io/Qt_for_Python")
+      (synopsis
+       "The Qt for Python product enables the use of Qt5 APIs in Python applications")
+      (description
+       "The Qt for Python product enables the use of Qt5 APIs in Python
+applications.  It lets Python developers utilize the full potential of Qt,
+using the PySide2 module.  The PySide2 module provides access to the
+individual Qt modules such as QtCore, QtGui,and so on.  Qt for Python also
+comes with the Shiboken2 CPython binding code generator, which can be used to
+generate Python bindings for your C or C++ code.")
+      (license (list
+                license:lgpl3
+                ;;They state that:
+                ;; this file may be used under the terms of the GNU General
+                ;; Public License version 2.0 or (at your option) the GNU
+                ;; General Public license version 3 or any later version
+                ;; approved by the KDE Free Qt Foundation.
+                ;; Thus, it is currently v2 or v3, but no "+".
+                license:gpl3
+                license:gpl2)))))
-- 
cgit v1.2.3


From 2ea8b51a713716f38b99c727a6020aa471718e96 Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Sat, 6 Jul 2019 18:49:08 -0700
Subject: gnu: Add python-pyside-2-tools.

* gnu/packages/qt.scm (python-pyside-2-tools): New variable.
---
 gnu/packages/qt.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 138ca2becb..3ee3a2c044 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2425,3 +2425,35 @@ generate Python bindings for your C or C++ code.")
                 ;; Thus, it is currently v2 or v3, but no "+".
                 license:gpl3
                 license:gpl2)))))
+
+(define-public python-pyside-2-tools
+  (let ((revision "1")
+        ;; Pinned to branches with support for qt 5.11.3
+        (commit "f1b775537e7fbd718516749583b2abf1cb6adbce"))
+    (package
+      (name "python-pyside-2-tools")
+      (version (git-version "v5.11.2" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://code.qt.io/pyside/pyside-tools")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1w2g5afvww9r89wmdm9jx8sz67x4bzy9difkh72n4c73ya1n91ry"))))
+      (build-system cmake-build-system)
+      (inputs
+       `(("python-pyside-2" ,python-pyside-2)
+         ("python-shiboken-2" ,python-shiboken-2)
+         ("qtbase" ,qtbase)))
+      (arguments
+       `(#:tests? #f
+         #:configure-flags '("-DBUILD_TESTS=off")))
+      (home-page "https://wiki.qt.io/Qt_for_Python")
+      (synopsis
+       "Contains command line tools for PySide2")
+      (description
+       "Contains lupdate, rcc and uic tools for PySide2")
+      (license license:gpl2))))
-- 
cgit v1.2.3


From 2895a87fbf8ced349390f21e25962e48bf0d604b Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Sat, 6 Jul 2019 19:05:37 -0700
Subject: gnu: Add libspnav.

* gnu/packages/engineering.scm (libspnav): New variable.
---
 gnu/packages/engineering.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index c1c1b18ed3..78b6a3a826 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2019 Tim Stahel 
 ;;; Copyright © 2019 Jovany Leandro G.C 
 ;;; Copyright © 2019 Steve Sprang 
+;;; Copyright © 2019 John Soo 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2214,3 +2215,38 @@ interactive modeler, OpenSCAD generates 3D models from a script, giving you
 full programmatic control over your models.")
     (home-page "https://www.openscad.org/")
     (license license:gpl2+)))
+
+(define-public libspnav
+  (package
+    (name "libspnav")
+    (version "0.2.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/FreeSpacenav/libspnav.git")
+                    (commit (string-append "libspnav-" version))))
+              (sha256
+               (base32
+                "098h1jhlj87axpza5zgy58prp0zn94wyrbch6x0s7q4mzh7dc8ba"))
+              (file-name (git-file-name name version))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libx11" ,libx11)))
+    (arguments `(#:tests? #f))
+    (home-page "http://spacenav.sourceforge.net/")
+    (synopsis
+     "Library for communicating with spacenavd or 3dxsrv")
+    (description
+     "The libspnav library is provided as a replacement of the magellan
+library.  It provides a cleaner, and more orthogonal interface.  libspnav
+supports both the original X11 protocol for communicating with the driver, and
+the new alternative non-X protocol.  Programs that choose to use the X11
+protocol, are automatically compatible with either the free spacenavd driver
+or the official 3dxserv, as if they were using the magellan SDK.
+
+Also, libspnav provides a magellan API wrapper on top of the new API.  So, any
+applications that were using the magellan library, can switch to libspnav
+without any changes.  And programmers that are familliar with the magellan API
+can continue using it with a free library without the restrictions of the
+official SDK.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From 2003e837f445fbd43724ac155934bcec562f9cd6 Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Sun, 7 Jul 2019 10:03:38 -0700
Subject: gnu: Add libarea.

* gnu/packages/engineering.scm (libarea): New variable.
---
 gnu/packages/engineering.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 78b6a3a826..aec7b4f676 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -51,6 +51,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages commencement)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
@@ -2216,6 +2217,49 @@ full programmatic control over your models.")
     (home-page "https://www.openscad.org/")
     (license license:gpl2+)))
 
+(define-public libarea
+  (let ((revision "1")
+        (commit "8f8bac811c10f1f01fda0d742a18591f61dd76ee"))
+    (package
+      (name "libarea")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference (url "https://github.com/Heeks/libarea.git")
+                             (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0pvqz6cabxqdz5y26wnj6alkn8v5d7gkx0d3h8xmg4lvy9r3kh3g"))))
+      (build-system gnu-build-system)
+      (inputs `(("boost" ,boost)
+                ("python-wrapper" ,python-wrapper)))
+      (native-inputs
+       `(("cmake" ,cmake)))
+      (arguments
+       `(#:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'configure 'cmake-configure
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out"))
+                     (cmake (assoc-ref inputs "cmake")))
+                 (mkdir-p "build")
+                 (invoke "cmake"
+                         (string-append "-DCMAKE_INSTALL_PREFIX=" out)))))
+           (delete 'configure))))
+      (home-page "https://github.com/Heeks/libarea")
+      (synopsis
+       "Library and python module for pocketing and profiling operations")
+      (description
+       "Area is a CAM-related software for pocketing operation.
+
+This project provides library and associated python-module to compute pocket
+operations.")
+      (license (list
+                license:bsd-3
+                license:gpl3+)))))
+
 (define-public libspnav
   (package
     (name "libspnav")
-- 
cgit v1.2.3


From 704853fb7ab9d554b52048012abaeccda09e544f Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Sun, 7 Jul 2019 10:13:17 -0700
Subject: gnu: Add libmedfile.

* gnu/packages/engineering.scm (libmedfile): New variable.
---
 gnu/packages/engineering.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index aec7b4f676..256b450a12 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2217,6 +2217,51 @@ full programmatic control over your models.")
     (home-page "https://www.openscad.org/")
     (license license:gpl2+)))
 
+(define-public libmedfile
+  (package
+    (name "libmedfile")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://files.salome-platform.org/Salome/other/med-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "017h9p0x533fm4gn6pwc8kmp72rvqmcn6vznx72nkkl2b05yjx54"))))
+    (build-system cmake-build-system)
+    (inputs `(("hdf5" ,hdf5-1.10)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'remove-test-output
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (delete-file-recursively
+                (string-append out "/bin/testc"))
+               #t))))))
+    (home-page "https://www.salome-platform.org")
+    (synopsis "Library to read and write MED files")
+    (description
+     "The purpose of the MED module is to provide a standard for storing and
+recovering computer data associated to numerical meshes and fields, and to
+facilitate the exchange between codes and solvers.
+
+The persistent data storage is based upon HDF format (like CGNS, a standard
+developed by Boeing and NASA in the area of Computational Fluid Dynamic).
+
+MED also provides structures to hold data on meshes and fields.  These
+structures are exchanged between solvers, hide the communication level (CORBA
+or MPI), and offer persistence (read/write in .med files).
+
+The main benefit of a common exchange format is reduced complexity of code
+coupling.  It also allows sharing such high level functionalities as
+computation of nodal connectivity of sub-elements (faces and edges),
+arithmetic operations on fields, entity location functionalities, and
+interpolation toolkit.")
+    (license license:gpl3+)))
+
 (define-public libarea
   (let ((revision "1")
         (commit "8f8bac811c10f1f01fda0d742a18591f61dd76ee"))
-- 
cgit v1.2.3


From 4cd9de6068f439c52f6874f00ec608c41156d095 Mon Sep 17 00:00:00 2001
From: John Soo 
Date: Sun, 7 Jul 2019 10:32:10 -0700
Subject: gnu: Add freecad.

* gnu/packages/engineering.scm (freecad): New variable.
---
 gnu/packages/engineering.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 256b450a12..bbd9151995 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -55,6 +55,7 @@
   #:use-module (gnu packages commencement)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
+  #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages fpga)
@@ -68,10 +69,12 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphics)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages image-processing)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages linux)               ;FIXME: for pcb
   #:use-module (gnu packages m4)
@@ -86,6 +89,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages swig)
+  #:use-module (gnu packages tbb)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
@@ -2217,6 +2221,94 @@ full programmatic control over your models.")
     (home-page "https://www.openscad.org/")
     (license license:gpl2+)))
 
+(define-public freecad
+  (package
+    (name "freecad")
+    (version "0.18.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/FreeCAD/FreeCAD.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1ny29y0h8smg1bwi5yn4kcnyfprqh3v7v2z8837cmmhcwp8dr95m"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("doxygen" ,doxygen)
+       ("graphviz" ,graphviz)
+       ("qttools" ,qttools)
+       ("pkg-config" ,pkg-config)
+       ("swig" ,swig)))
+    (inputs
+     `(("boost" ,boost)
+       ("coin3D" ,coin3D)
+       ("eigen" ,eigen)
+       ("freetype" ,freetype)
+       ("glew" ,glew)
+       ("hdf5" ,hdf5-1.10)
+       ("libarea" ,libarea)
+       ("libmedfile" ,libmedfile)
+       ("libspnav" ,libspnav)
+       ("libxi" ,libxi)
+       ("libxmu" ,libxmu)
+       ("openmpi" ,openmpi)
+       ("opencascade-occt" ,opencascade-occt)
+       ("python-matplotlib" ,python-matplotlib)
+       ("python-pyside-2" ,python-pyside-2)
+       ("python-pyside-2-tools" ,python-pyside-2-tools)
+       ("python-shiboken-2" ,python-shiboken-2)
+       ("python-wrapper" ,python-wrapper)
+       ("qtbase" ,qtbase)
+       ("qtsvg" ,qtsvg)
+       ("qtx11extras" ,qtx11extras)
+       ("qtxmlpatterns" ,qtxmlpatterns)
+       ;; qtwebkit is optional. We remove it currently, because it takes
+       ;; much time to compile and substitutes are often unavailable
+       ;;("qtwebkit" ,qtwebkit)
+       ("tbb" ,tbb)
+       ("vtk" ,vtk)
+       ("xerces-c" ,xerces-c)
+       ("zlib" ,zlib)))
+    (arguments
+     `(#:tests? #f
+       #:configure-flags
+       (list
+        "-DBUILD_QT5=ON"
+        (string-append "-DCMAKE_INSTALL_LIBDIR="
+                       (assoc-ref %outputs "out") "/lib"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'restore-pythonpath
+           (lambda _
+             (substitute* "src/Main/MainGui.cpp"
+               (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
+             #t))
+         (add-after 'install 'wrap-pythonpath
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/FreeCAD")
+                 (list "PYTHONPATH"
+                       'prefix (list (getenv "PYTHONPATH")))))
+             #t)))))
+    (home-page "https://www.freecadweb.org/")
+    (synopsis "Your Own 3D Parametric Modeler")
+    (description
+     "FreeCAD is a general purpose feature-based, parametric 3D modeler for
+CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and
+product design but also fits a wider range of uses in engineering, such as
+architecture or other engineering specialties.  It is 100% Open Source (LGPL2+
+license) and extremely modular, allowing for very advanced extension and
+customization.")
+    (license
+     (list
+      license:lgpl2.1+
+      license:lgpl2.0+
+      license:gpl3+
+      license:bsd-3))))
+
 (define-public libmedfile
   (package
     (name "libmedfile")
-- 
cgit v1.2.3


From b5677e61bfb2c7b55cbf2f7c82b00c417958f23b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 22 Sep 2019 20:00:48 +0200
Subject: gnu: parallel: Update to 20190922.

* gnu/packages/parallel.scm (parallel): Update to 20190922.
---
 gnu/packages/parallel.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 3b7ce4c150..253596d8e3 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -52,14 +52,14 @@
 (define-public parallel
   (package
     (name "parallel")
-    (version "20190822")
+    (version "20190922")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/parallel/parallel-"
                           version ".tar.bz2"))
       (sha256
-       (base32 "1mi3a18fdwcx50jg51pw1ks1fkmc2slyinff0yb3xhihi2szbskp"))))
+       (base32 "0qrw34rpp8g5knb2nhs8z1hz9i42nxjn6i12m4rblm0anhnfwbr8"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 0920b41c1d943a904365034ab73434dcea3ec5c7 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 22 Sep 2019 12:07:35 +0300
Subject: gnu: js-datatables: Update to 1.10.19.

* gnu/packages/javascript.scm (js-datatables): Update to 1.10.19.
---
 gnu/packages/javascript.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 2993eb66f6..0e33f889b8 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -286,14 +286,14 @@ detection.")
 (define-public js-datatables
   (package
     (name "js-datatables")
-    (version "1.10.15")
+    (version "1.10.19")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://datatables.net/releases/DataTables-"
                                   version ".zip"))
               (sha256
                (base32
-                "1y9xqyqyz7x1ls3ska71pshl2hpiy3qnw1f7wygyslbhy4ssgf57"))))
+                "0cff8a1g7pjwbjdqq0yzqd963ar7pfi4splmm6rwdzganr77rkhb"))))
     (build-system minify-build-system)
     (arguments
      `(#:javascript-files '("media/js/dataTables.bootstrap.js"
-- 
cgit v1.2.3


From 4b577961d736d53063022d58483f0200ef860b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 22 Sep 2019 21:27:44 +0200
Subject: gnu: instantmusic: Fix build failure.

This is a followup to 6bbb37a545912c6bb2513ee08587ee4fe39cc330.

* gnu/packages/music.scm (instantmusic): Move 'fix-file-permissions'
phase before 'install' rather than before 'check'.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b81c2cb782..1f6835f66c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -17,7 +17,7 @@
 ;;; Copyright © 2018 nee 
 ;;; Copyright © 2018 Stefan Reichör 
 ;;; Copyright © 2018 Pierre Neidhardt 
-;;; Copyright © 2018 Ludovic Courtès 
+;;; Copyright © 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2018 Björn Höfling 
 ;;; Copyright © 2019 Gabriel Hondet 
 ;;; Copyright © 2019 Timotej Lazar 
@@ -2794,7 +2794,7 @@ websites such as Libre.fm.")
                   (add-before 'build 'change-directory
                     (lambda _
                       (chdir "instantmusic-0.1") #t))
-                  (add-before 'check 'fix-file-permissions
+                  (add-before 'install 'fix-file-permissions
                     (lambda _
                       ;; Fix some read-only files that would cause a build failure
                       (for-each (cut chmod <> #o644)
-- 
cgit v1.2.3


From cbf4481a59eae82151d2c1307fa8a08961a26555 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 21:31:12 +0200
Subject: gnu: emacs-company-lsp: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-company-lsp): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6f81200872..b603ba2852 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3739,6 +3739,11 @@ on context.")
        ("emacs-company" ,emacs-company)
        ("emacs-s" ,emacs-s)
        ("emacs-dash" ,emacs-dash)))
+    (native-inputs
+     `(("emacs-buttercup" ,emacs-buttercup)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("buttercup" "-L" ".")))
     (home-page "https://github.com/tigersoldier/company-lsp")
     (synopsis "Completion for @code{lsp-mode}")
     (description
-- 
cgit v1.2.3


From fc60a8b714fd2166fa58a00965af1c498a8caea2 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 22:24:31 +0200
Subject: gnu: emacs-realgud: Update to 1.5.1.

* gnu/packages/emacs-xyz.scm (emacs-realgud): Update to 1.5.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index b603ba2852..fffb2ee21c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4901,7 +4901,7 @@ after buffer changes.")
 (define-public emacs-realgud
   (package
     (name "emacs-realgud")
-    (version "1.5.0")
+    (version "1.5.1")
     (source
      (origin
        (method git-fetch)
@@ -4910,7 +4910,7 @@ after buffer changes.")
              (commit version)))
        (sha256
         (base32
-         "0xnick9016wxrgi8v0lycvxhyz8l2k4nfvdpjc5yq476vwrjfzbz"))
+         "1d3s23jk0i34wpyxfajydgyyvsxnpbqrfl0mgydsq7zw2c75ylnq"))
        (file-name (git-file-name name version))))
     (build-system emacs-build-system)
     (arguments
-- 
cgit v1.2.3


From 99b63bf820eb04f4ab09f271f73666af5274704b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 22:33:10 +0200
Subject: gnu: emacs-elisp-refs: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-elisp-refs): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index fffb2ee21c..7d38dc3ce1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12021,6 +12021,12 @@ continue.")
        ("emacs-loop" ,emacs-loop)
        ("emacs-s" ,emacs-s)
        ("emacs-shut-up" ,emacs-shut-up)))
+    (native-inputs
+     `(("emacs-ert-runner" ,emacs-ert-runner)
+       ("emacs-undercover" ,emacs-undercover)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("ert-runner")))
     (home-page "https://github.com/Wilfred/elisp-refs")
     (synopsis "Find callers of elisp functions or macros")
     (description "Find references to functions, macros or variables.  Unlike a
-- 
cgit v1.2.3


From 08a36df874b69f5036ac6273006c65996cb884e7 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 22:36:20 +0200
Subject: gnu: emacs-loop: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-loop): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7d38dc3ce1..605fe4b990 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11993,6 +11993,12 @@ tramp.")
        (sha256
         (base32 "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x"))))
     (build-system emacs-build-system)
+    (native-inputs
+     `(("emacs-ert-runner" ,emacs-ert-runner)
+       ("emacs-undercover" ,emacs-undercover)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("ert-runner")))
     (home-page "https://github.com/Wilfred/loop.el")
     (synopsis "Imperative loop structures for Emacs")
     (description "Loop structures familiar to users of other languages.  This
-- 
cgit v1.2.3


From 97d4dab0a6c00405fd2997627ef06242335eb821 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 22 Sep 2019 22:37:22 +0200
Subject: gnu: emacs-tco-el: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-tco-el): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 605fe4b990..19e7ab305a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16919,11 +16919,10 @@ parent directory using @code{Eshell}.")
 
 (define-public emacs-tco-el
   (let ((commit "482db5313f090b17ed22ccd856f0e141dc75afe6")
-        (version "0.3")
         (revision "1"))
     (package
       (name "emacs-tco-el")
-      (version (git-version version revision commit))
+      (version (git-version "0.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -16937,6 +16936,12 @@ parent directory using @code{Eshell}.")
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-dash" ,emacs-dash)))
+      (native-inputs
+       `(("emacs-ert-runner" ,emacs-ert-runner)
+         ("emacs-undercover" ,emacs-undercover)))
+      (arguments
+       `(#:tests? #t
+         #:test-command '("ert-runner")))
       (home-page "https://github.com/Wilfred/tco.el")
       (synopsis "Tail-call optimization for Emacs Lisp")
       (description "This package provides tail-call optimization for Emacs
-- 
cgit v1.2.3


From 1f78a9996428fe0082eacd55767397f4f5a7758a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 22 Sep 2019 23:49:57 +0200
Subject: gnu: perf: Really build without '-Werror'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until this change, it would fail to build with:

  In file included from /tmp/guix-build-perf-5.2.15.drv-0/linux-5.2.15/tools/include/uapi/linux/ethtool.h:19:0,
		   from xsk.c:18:
  /gnu/store/…-linux-libre-headers-4.19.56/include/linux/if_ether.h:165:1: error: packed attribute is unnecessary for 'ethhdr' [-Werror=packed]

* gnu/packages/linux.scm (perf)[arguments]: In 'configure' phase, remove
"-Werror" from 'tools/lib/bpf/Makefile'.
---
 gnu/packages/linux.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index be18788687..b65303ae6f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3082,6 +3082,10 @@ in a digital read-out.")
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key inputs #:allow-other-keys)
+             ;; Don't build with '-Werror', really.
+             (substitute* "tools/lib/bpf/Makefile"
+               (("-Werror") ""))
+
              (setenv "SHELL_PATH" (which "bash"))
              (chdir "tools/perf")
              #t)))
-- 
cgit v1.2.3


From 27130ee8f7339d0eb84e87d620015dc493a566ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 00:11:13 +0200
Subject: gnu: libsmpeg: Fix build failure with GCC 7.

* gnu/packages/video.scm (libsmpeg)[arguments]: New field.
---
 gnu/packages/video.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index b6c32fabdb..11219589b6 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2515,6 +2515,10 @@ Other features include a live preview and live streaming.")
                (base32
                 "18yfkr70lr1x1hc8snn2ldnbzdcc7b64xmkqrfk8w59gpg7sl1xn"))))
     (build-system gnu-build-system)
+    (arguments
+     ;; libsmpeg fails to build with -std=c++11, which is the default with
+     ;; GCC 7.  Also, 'configure' does CXXFLAGS=$CFLAGS, hence this hack.
+     '(#:configure-flags '("CFLAGS=-O2 -g -std=c++03")))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)))
-- 
cgit v1.2.3


From 48efcdafd8bad25b3d05564ffb83f4575a4c93fb Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 23 Sep 2019 06:14:42 +0200
Subject: gnu: emacs-ht: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-ht): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 19e7ab305a..ff2276500c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7501,6 +7501,11 @@ procedures for emacs-lisp-mode.")
         (base32 "1p3qa7g0wa0wbviv2f8bda39cjys3naayk5xjm3nxxmqsyy8papx"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-dash" ,emacs-dash)))
+    (native-inputs
+     `(("emacs-ert-runner" ,emacs-ert-runner)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("ert-runner")))
     (home-page "https://github.com/Wilfred/ht.el")
     (synopsis "Hash table library for Emacs")
     (description
-- 
cgit v1.2.3


From 4455def41631bc01abd378c94f2343f5b6aca40b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 23 Sep 2019 06:19:01 +0200
Subject: gnu: emacs-helpful: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-helpful): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ff2276500c..450bb6a33c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12790,6 +12790,12 @@ downloading manager for Emacs.")
        ("emacs-s" ,emacs-s)
        ("emacs-f" ,emacs-f)
        ("emacs-shut-up" ,emacs-shut-up)))
+    (native-inputs
+     `(("emacs-ert-runner" ,emacs-ert-runner)
+       ("emacs-undercover" ,emacs-undercover)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("ert-runner")))
     (home-page "https://github.com/Wilfred/helpful")
     (synopsis "More contextual information in Emacs help")
     (description "@code{helpful} is an alternative to the built-in Emacs help
-- 
cgit v1.2.3


From d5fcb61ea7d404e553a2ec5fe19451b895f762cd Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 23 Sep 2019 06:27:04 +0200
Subject: gnu: emacs-suggest: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-suggest): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 450bb6a33c..86e2edebbb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12863,6 +12863,12 @@ and doesn't require memorisation of commands.
        ("emacs-f" ,emacs-f)
        ("emacs-spinner" ,emacs-spinner)
        ("emacs-shut-up" ,emacs-shut-up)))
+    (native-inputs
+     `(("emacs-ert-runner" ,emacs-ert-runner)
+       ("emacs-undercover" ,emacs-undercover)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("ert-runner")))
     (synopsis "Suggest Elisp functions that give the output requested")
     (description "Suggest.el will find functions that give the output
 requested.  It's a great way of exploring list, string and arithmetic
-- 
cgit v1.2.3


From 23cc2793e1b64c0d0218988fc76cf70f5ba8a612 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 23 Sep 2019 09:38:50 +0300
Subject: gnu: datamash: Update to 1.5.

* gnu/packages/datamash.scm (datamash): Update to 1.5.
---
 gnu/packages/datamash.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/datamash.scm b/gnu/packages/datamash.scm
index 81b0069aab..ac1b71e63b 100644
--- a/gnu/packages/datamash.scm
+++ b/gnu/packages/datamash.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2018 Eric Bavier 
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner 
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,7 +29,7 @@
 (define-public datamash
   (package
     (name "datamash")
-    (version "1.4")
+    (version "1.5")
     (source
      (origin
       (method url-fetch)
@@ -37,7 +37,7 @@
                           version ".tar.gz"))
       (sha256
        (base32
-        "0aj7wvv14s2fsf2rl49mqhxdagy8cbz6rz4xyi7bkg2nahnxsi7s"))))
+        "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2"))))
     (native-inputs
      `(("which" ,which)                 ;for tests
        ("perl" ,perl)))                 ;for help2man
-- 
cgit v1.2.3


From 4d70a8fe1b14789235a26ecc87d632ee3bf16cc8 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 23 Sep 2019 10:05:59 +0300
Subject: gnu: gdb-8.3: Update to 8.3.1.

* gnu/packages/gdb.scm (gdb-8.3): Update to 8.3.1.
---
 gnu/packages/gdb.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 5697664491..48d1c0da6b 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2019 Ludovic Courtès 
 ;;; Copyright © 2015 Mark H Weaver 
-;;; Copyright © 2015, 2016 Efraim Flashner 
+;;; Copyright © 2015, 2016, 2019 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -109,14 +109,14 @@ written in C, C++, Ada, Objective-C, Pascal and more.")
 (define-public gdb-8.3
   (package
     (inherit gdb-8.2)
-    (version "8.3")
+    (version "8.3.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/gdb/gdb-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0"))))))
+                "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y"))))))
 
 (define-public gdb
   ;; This is the fixed version that packages depend on.  Update it rarely
-- 
cgit v1.2.3


From acedaec798a86486e9044b4d7728a0573ea9c1bc Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 23 Sep 2019 10:21:02 +0300
Subject: gnu: wl-clipboard: Update to 2.0.0_beta2.

* gnu/packages/xdisorg.scm (wl-clipboard): Update to 2.0.0_beta2.
---
 gnu/packages/xdisorg.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 10ffa6f695..7026c7eb03 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2015 Florian Paul Schmidt 
 ;;; Copyright © 2016 Christopher Allan Webber 
 ;;; Copyright © 2016, 2018 Ricardo Wurmus 
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner 
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2016 Leo Famulari 
 ;;; Copyright © 2016 Alex Kost 
 ;;; Copyright © 2016, 2017, 2019 Marius Bakke 
@@ -1688,16 +1688,16 @@ temperature of the screen.")
 (define-public wl-clipboard
   (package
     (name "wl-clipboard")
-    (version "1.0.0")
+    (version "2.0.0_beta2")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/bugaevc/wl-clipboard.git")
-             (commit (string-append "v" version))))
+             (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "03h6ajcc30w6928bkd4h6xfj4iy2359ww6hdlybq8mr1zwmb2h0q"))))
+        (base32 "0wyqbaph9v1v6lwfcjf8gjhdl70icpss4wapshzfxcz3l9m1p8hv"))))
     (build-system meson-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From 961b95c985991ed4421c2419c22026eb0153c1ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 14 Sep 2019 14:59:58 +0200
Subject: pull: '--news' shows the list of channels added or removed.

* guix/scripts/pull.scm (display-channel, channel=?)
(display-channel-news, display-news): New procedures.
(process-query): Call 'display-news' instead of 'display-profile-news'.
---
 guix/scripts/pull.scm | 61 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index c9835cef34..472947bb3a 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -213,6 +213,62 @@ newest generation of PROFILE."
                                         (G_ "New in this revision:\n")))))
     (_ #t)))
 
+(define (display-channel channel)
+  "Display information about CHANNEL."
+  (format (current-error-port)
+          ;; TRANSLATORS: This describes a "channel"; the first placeholder is
+          ;; the channel name (e.g., "guix") and the second placeholder is its
+          ;; URL.
+          (G_ "    ~a at ~a~%")
+          (channel-name channel)
+          (channel-url channel)))
+
+(define (channel=? channel1 channel2)
+  "Return true if CHANNEL1 and CHANNEL2 are the same for all practical
+purposes."
+  ;; Assume that the URL matters less than the name.
+  (eq? (channel-name channel1) (channel-name channel2)))
+
+(define (display-channel-news profile)
+  "Display news about the channels of PROFILE "
+  (define previous
+    (and=> (relative-generation profile -1)
+           (cut generation-file-name profile <>)))
+
+  (when previous
+    (let ((old-channels (profile-channels previous))
+          (new-channels (profile-channels profile)))
+      (and (pair? old-channels) (pair? new-channels)
+           (begin
+             (match (lset-difference channel=? new-channels old-channels)
+               (()
+                #t)
+               (new
+                (let ((count (length new)))
+                  (format (current-error-port)
+                          (N_ "  ~*One new channel:~%"
+                              "  ~a new channels:~%" count)
+                          count)
+                  (for-each display-channel new))))
+             (match (lset-difference channel=? old-channels new-channels)
+               (()
+                #t)
+               (removed
+                (let ((count (length removed)))
+                  (format (current-error-port)
+                          (N_ "  ~*One channel removed:~%"
+                              "  ~a channels removed:~%" count)
+                          count)
+                  (for-each display-channel removed)))))))))
+
+(define (display-news profile)
+  ;; Display profile news, with the understanding that this process represents
+  ;; the newest generation.
+  (display-profile-news profile
+                        #:current-is-newer? #t)
+
+  (display-channel-news profile))
+
 (define* (build-and-install instances profile
                             #:key use-substitutes? verbose? dry-run?)
   "Build the tool from SOURCE, and install it in PROFILE.  When DRY-RUN? is
@@ -521,10 +577,7 @@ list of package changes.")))))
                ((numbers ...)
                 (list-generations profile numbers)))))))
     (('display-news)
-     ;; Display profile news, with the understanding that this process
-     ;; represents the newest generation.
-     (display-profile-news profile
-                           #:current-is-newer? #t))))
+     (display-news profile))))
 
 (define (process-generation-change opts profile)
   "Process a request to change the current generation (roll-back, switch, delete)."
-- 
cgit v1.2.3


From a78dcb3d599cc84b347578940bb0fd44b1ad50b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 14 Sep 2019 17:46:34 +0200
Subject: git: 'update-cached-checkout' avoids network access when unnecessary.

* guix/git.scm (reference-available?): New procedure.
(update-cached-checkout): Avoid call to 'remote-fetch' when REPOSITORY
already contains REF.
---
 guix/git.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/guix/git.scm b/guix/git.scm
index de98fed40c..92a7353b5a 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -220,6 +220,21 @@ dynamic extent of EXP."
               (G_ "Support for submodules is missing; \
 please upgrade Guile-Git.~%"))))
 
+(define (reference-available? repository ref)
+  "Return true if REF, a reference such as '(commit . \"cabba9e\"), is
+definitely available in REPOSITORY, false otherwise."
+  (match ref
+    (('commit . commit)
+     (catch 'git-error
+       (lambda ()
+         (->bool (commit-lookup repository (string->oid commit))))
+       (lambda (key error . rest)
+         (if (= GIT_ENOTFOUND (git-error-code error))
+             #f
+             (apply throw key error rest)))))
+    (_
+     #f)))
+
 (define* (update-cached-checkout url
                                  #:key
                                  (ref '(branch . "master"))
@@ -254,7 +269,8 @@ When RECURSIVE? is true, check out submodules as well, if any."
                              (repository-open cache-directory)
                              (clone* url cache-directory))))
      ;; Only fetch remote if it has not been cloned just before.
-     (when cache-exists?
+     (when (and cache-exists?
+                (not (reference-available? repository ref)))
        (remote-fetch (remote-lookup repository "origin")))
      (when recursive?
        (update-submodules repository #:log-port log-port))
-- 
cgit v1.2.3


From 873f6f1334ab06a69e768a8aea0054404237542f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 14 Sep 2019 17:54:06 +0200
Subject: git: Add 'commit-difference'.

* guix/git.scm (commit-closure, commit-difference): New procedures.
* guix/tests/git.scm, tests/git.scm: New files.
* Makefile.am (dist_noinst_DATA): Add guix/tests/git.scm.
(SCM_TESTS): Add tests/git.scm.
---
 .dir-locals.el     |  1 +
 Makefile.am        |  6 +++-
 guix/git.scm       | 40 ++++++++++++++++++++++
 guix/tests/git.scm | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/git.scm      | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 242 insertions(+), 1 deletion(-)
 create mode 100644 guix/tests/git.scm
 create mode 100644 tests/git.scm

diff --git a/.dir-locals.el b/.dir-locals.el
index 228685a69f..22aac2c402 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -90,6 +90,7 @@
    (eval . (put 'eventually 'scheme-indent-function 1))
 
    (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1))
+   (eval . (put 'with-temporary-git-repository 'scheme-indent-function 2))
 
    ;; This notably allows '(' in Paredit to not insert a space when the
    ;; preceding symbol is one of these.
diff --git a/Makefile.am b/Makefile.am
index f71ea77671..658f03bd54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -307,7 +307,10 @@ STORE_MODULES =					\
 MODULES += $(STORE_MODULES)
 
 # Internal modules with test suite support.
-dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
+dist_noinst_DATA =				\
+  guix/tests.scm				\
+  guix/tests/http.scm				\
+  guix/tests/git.scm
 
 # Auxiliary files for packages.
 AUX_FILES =						\
@@ -391,6 +394,7 @@ SCM_TESTS =					\
   tests/file-systems.scm			\
   tests/gem.scm				\
   tests/gexp.scm				\
+  tests/git.scm					\
   tests/glob.scm				\
   tests/gnu-maintenance.scm			\
   tests/grafts.scm				\
diff --git a/guix/git.scm b/guix/git.scm
index 92a7353b5a..d7dddde3a7 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -28,6 +28,7 @@
   #:use-module (guix utils)
   #:use-module (guix records)
   #:use-module (guix gexp)
+  #:use-module (guix sets)
   #:use-module (rnrs bytevectors)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
@@ -37,8 +38,10 @@
   #:export (%repository-cache-directory
             honor-system-x509-certificates!
 
+            with-repository
             update-cached-checkout
             latest-repository-commit
+            commit-difference
 
             git-checkout
             git-checkout?
@@ -339,6 +342,43 @@ Log progress and checkout info to LOG-PORT."
 
 (set-exception-printer! 'git-error print-git-error)
 
+
+;;;
+;;; Commit difference.
+;;;
+
+(define (commit-closure commit)
+  "Return the closure of COMMIT as a set."
+  (let loop ((commits (list commit))
+             (visited (setq)))
+    (match commits
+      (()
+       visited)
+      ((head . tail)
+       (if (set-contains? visited head)
+           (loop tail visited)
+           (loop (append (commit-parents head) tail)
+                 (set-insert head visited)))))))
+
+(define (commit-difference new old)
+  "Return the list of commits between NEW and OLD, where OLD is assumed to be
+an ancestor of NEW.
+
+Essentially, this computes the set difference between the closure of NEW and
+that of OLD."
+  (let loop ((commits (list new))
+             (result '())
+             (visited (commit-closure old)))
+    (match commits
+      (()
+       (reverse result))
+      ((head . tail)
+       (if (set-contains? visited head)
+           (loop tail result visited)
+           (loop (append (commit-parents head) tail)
+                 (cons head result)
+                 (set-insert head visited)))))))
+
 
 ;;;
 ;;; Checkouts.
diff --git a/guix/tests/git.scm b/guix/tests/git.scm
new file mode 100644
index 0000000000..52abe77c83
--- /dev/null
+++ b/guix/tests/git.scm
@@ -0,0 +1,97 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Ludovic Courtès 
+;;;
+;;; 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 .
+
+(define-module (guix tests git)
+  #:use-module (git)
+  #:use-module (guix utils)
+  #:use-module (guix build utils)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 control)
+  #:export (git-command
+            with-temporary-git-repository
+            find-commit))
+
+(define git-command
+  (make-parameter "git"))
+
+(define (populate-git-repository directory directives)
+  "Initialize a new Git checkout and repository in DIRECTORY and apply
+DIRECTIVES.  Each element of DIRECTIVES is an sexp like:
+
+  (add \"foo.txt\" \"hi!\")
+
+Return DIRECTORY on success."
+
+  ;; Note: As of version 0.2.0, Guile-Git lacks the necessary bindings to do
+  ;; all this, so resort to the "git" command.
+  (define (git command . args)
+    (apply invoke (git-command) "-C" directory
+           command args))
+
+  (mkdir-p directory)
+  (git "init")
+
+  (let loop ((directives directives))
+    (match directives
+      (()
+       directory)
+      ((('add file contents) rest ...)
+       (let ((file (string-append directory "/" file)))
+         (mkdir-p (dirname file))
+         (call-with-output-file file
+           (lambda (port)
+             (display contents port)))
+         (git "add" file)
+         (loop rest)))
+      ((('commit text) rest ...)
+       (git "commit" "-m" text)
+       (loop rest))
+      ((('branch name) rest ...)
+       (git "branch" name)
+       (loop rest))
+      ((('checkout branch) rest ...)
+       (git "checkout" branch)
+       (loop rest))
+      ((('merge branch message) rest ...)
+       (git "merge" branch "-m" message)
+       (loop rest)))))
+
+(define (call-with-temporary-git-repository directives proc)
+  (call-with-temporary-directory
+   (lambda (directory)
+     (populate-git-repository directory directives)
+     (proc directory))))
+
+(define-syntax-rule (with-temporary-git-repository directory
+                                                   directives exp ...)
+  "Evaluate EXP in a context where DIRECTORY contains a checkout populated as
+per DIRECTIVES."
+  (call-with-temporary-git-repository directives
+                                      (lambda (directory)
+                                        exp ...)))
+
+(define (find-commit repository message)
+  "Return the commit in REPOSITORY whose message includes MESSAGE, a string."
+  (let/ec return
+    (fold-commits (lambda (commit _)
+                    (and (string-contains (commit-message commit)
+                                          message)
+                         (return commit)))
+                  #f
+                  repository)
+    (error "commit not found" message)))
diff --git a/tests/git.scm b/tests/git.scm
new file mode 100644
index 0000000000..8ba10ece51
--- /dev/null
+++ b/tests/git.scm
@@ -0,0 +1,99 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Ludovic Courtès 
+;;;
+;;; 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 .
+
+(define-module (test-git)
+  #:use-module (git)
+  #:use-module (guix git)
+  #:use-module (guix tests git)
+  #:use-module (guix build utils)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-64))
+
+;; Test the (guix git) tools.
+
+(test-begin "git")
+
+;; 'with-temporary-git-repository' relies on the 'git' command.
+(unless (which (git-command)) (test-skip 1))
+(test-assert "commit-difference, linear history"
+  (with-temporary-git-repository directory
+      '((add "a.txt" "A")
+        (commit "first commit")
+        (add "b.txt" "B")
+        (commit "second commit")
+        (add "c.txt" "C")
+        (commit "third commit")
+        (add "d.txt" "D")
+        (commit "fourth commit"))
+    (with-repository directory repository
+      (let ((commit1 (find-commit repository "first"))
+            (commit2 (find-commit repository "second"))
+            (commit3 (find-commit repository "third"))
+            (commit4 (find-commit repository "fourth")))
+        (and (lset= eq? (commit-difference commit4 commit1)
+                    (list commit2 commit3 commit4))
+             (lset= eq? (commit-difference commit4 commit2)
+                    (list commit3 commit4))
+             (equal? (commit-difference commit3 commit2)
+                     (list commit3))
+
+             ;; COMMIT4 is not an ancestor of COMMIT1 so we should get the
+             ;; empty list.
+             (null? (commit-difference commit1 commit4)))))))
+
+(unless (which (git-command)) (test-skip 1))
+(test-assert "commit-difference, fork"
+  (with-temporary-git-repository directory
+      '((add "a.txt" "A")
+        (commit "first commit")
+        (branch "devel")
+        (checkout "devel")
+        (add "devel/1.txt" "1")
+        (commit "first devel commit")
+        (add "devel/2.txt" "2")
+        (commit "second devel commit")
+        (checkout "master")
+        (add "b.txt" "B")
+        (commit "second commit")
+        (add "c.txt" "C")
+        (commit "third commit")
+        (merge "devel" "merge")
+        (add "d.txt" "D")
+        (commit "fourth commit"))
+    (with-repository directory repository
+      (let ((master1 (find-commit repository "first commit"))
+            (master2 (find-commit repository "second commit"))
+            (master3 (find-commit repository "third commit"))
+            (master4 (find-commit repository "fourth commit"))
+            (devel1  (find-commit repository "first devel"))
+            (devel2  (find-commit repository "second devel"))
+            (merge   (find-commit repository "merge")))
+        (and (equal? (commit-difference master4 merge)
+                     (list master4))
+             (lset= eq? (commit-difference master3 master1)
+                    (list master3 master2))
+             (lset= eq? (commit-difference devel2 master1)
+                    (list devel2 devel1))
+
+             ;; The merge occurred between MASTER2 and MASTER4 so here we
+             ;; expect to see all the commits from the "devel" branch in
+             ;; addition to those on "master".
+             (lset= eq? (commit-difference master4 master2)
+                    (list master4 merge master3 devel1 devel2)))))))
+
+(test-end "git")
-- 
cgit v1.2.3


From 8ba7fd3cd6962f1c1aaaa5f71eed7f9222094f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 14 Sep 2019 23:16:54 +0200
Subject: channels: Add support for a news file.

* guix/channels.scm ()[news-file]: New field.
(read-channel-metadata): Set the 'news-file' field.
(read-channel-metadata-from-source): Likewise.
(, ): New record types.
(sexp->channel-news-entry, read-channel-news)
(channel-news-for-commit): New procedures.
* guix/tests/git.scm (populate-git-repository): For 'add', allow
CONTENTS to be a procedure.
* tests/channels.scm ("channel-news, no news")
("channel-news, one entry"): New tests.
* doc/guix.texi (Channels): Document it.
---
 doc/guix.texi      |  62 +++++++++++++++++++++++++++
 guix/channels.scm  | 123 +++++++++++++++++++++++++++++++++++++++++++++++++----
 guix/tests/git.scm |   7 ++-
 tests/channels.scm |  99 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 282 insertions(+), 9 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index af1903f6ff..cd108faa8f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3991,6 +3991,68 @@ add a meta-data file @file{.guix-channel} that contains:
   (directory "guix"))
 @end lisp
 
+@cindex news, for channels
+@subsection Writing Channel News
+
+Channel authors may occasionally want to communicate to their users
+information about important changes in the channel.  You'd send them all
+an email, but that's not convenient.
+
+Instead, channels can provide a @dfn{news file}; when the channel users
+run @command{guix pull}, that news file is automatically read and
+@command{guix pull --news} can display the announcements that correspond
+to the new commits that have been pulled, if any.
+
+To do that, channel authors must first declare the name of the news file
+in their @file{.guix-channel} file:
+
+@lisp
+(channel
+  (version 0)
+  (news-file "etc/news.txt"))
+@end lisp
+
+The news file itself, @file{etc/news.txt} in this example, must look
+something like this:
+
+@lisp
+(channel-news
+  (version 0)
+  (entry (commit "d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300")
+         (title (en "Fixed terrible bug")
+                (fr "Oh la la"))
+         (body (en "@@emph@{Good news@}!  It's fixed!")
+               (eo "Certe ĝi pli bone funkcias nun!")))
+  (entry (commit "bdcabe815cd28144a2d2b4bc3c5057b051fa9906")
+         (title (en "Added a great package")
+                (ca "Què vol dir guix?"))
+         (body (en "Don't miss the @@code@{hello@} package!"))))
+@end lisp
+
+The file consists of a list of @dfn{news entries}.  Each entry is
+associated with a commit: it describes changes made in this commit,
+possibly in preceding commits as well.  Users see entries only the first
+time they obtain the commit the entry refers to.
+
+The @code{title} field should be a one-line summary while @code{body}
+can be arbitrarily long, and both can contain Texinfo markup
+(@pxref{Overview,,, texinfo, GNU Texinfo}).  Both the title and body are
+a list of language tag/message tuples, which allows @command{guix pull}
+to display news in the language that corresponds to the user's locale.
+
+If you want to translate news using a gettext-based workflow, you can
+extract translatable strings with @command{xgettext} (@pxref{xgettext
+Invocation,,, gettext, GNU Gettext Utilities}).  For example, assuming
+you write news entries in English first, the command below creates a PO
+file containing the strings to translate:
+
+@example
+xgettext -o news.po -l scheme -ken etc/news.scm
+@end example
+
+To sum up, yes, you could use your channel as a blog.  But beware, this
+is @emph{not quite} what your users might expect.
+
 @subsection Replicating Guix
 
 @cindex pinning, channels
diff --git a/guix/channels.scm b/guix/channels.scm
index ebb2cacbc7..0dadba616f 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -19,6 +19,7 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (guix channels)
+  #:use-module (git)
   #:use-module (guix git)
   #:use-module (guix records)
   #:use-module (guix gexp)
@@ -29,6 +30,7 @@
   #:use-module (guix derivations)
   #:use-module (guix combinators)
   #:use-module (guix diagnostics)
+  #:use-module (guix sets)
   #:use-module (guix store)
   #:use-module (guix i18n)
   #:use-module ((guix utils)
@@ -67,7 +69,14 @@
             %channel-profile-hooks
             channel-instances->derivation
 
-            profile-channels))
+            profile-channels
+
+            channel-news-entry?
+            channel-news-entry-commit
+            channel-news-entry-title
+            channel-news-entry-body
+
+            channel-news-for-commit))
 
 ;;; Commentary:
 ;;;
@@ -110,10 +119,11 @@
   (checkout  channel-instance-checkout))
 
 (define-record-type 
-  (channel-metadata directory dependencies)
+  (channel-metadata directory dependencies news-file)
   channel-metadata?
   (directory     channel-metadata-directory)      ;string with leading slash
-  (dependencies  channel-metadata-dependencies))  ;list of 
+  (dependencies  channel-metadata-dependencies)   ;list of 
+  (news-file     channel-metadata-news-file))     ;string | #f
 
 (define (channel-reference channel)
   "Return the \"reference\" for CHANNEL, an sexp suitable for
@@ -129,12 +139,13 @@ if valid metadata could not be read from PORT."
   (match (read port)
     (('channel ('version 0) properties ...)
      (let ((directory    (and=> (assoc-ref properties 'directory) first))
-           (dependencies (or (assoc-ref properties 'dependencies) '())))
+           (dependencies (or (assoc-ref properties 'dependencies) '()))
+           (news-file    (and=> (assoc-ref properties 'news-file) first)))
        (channel-metadata
-        (cond ((not directory) "/")
+        (cond ((not directory) "/")               ;directory
               ((string-prefix? "/" directory) directory)
               (else (string-append "/" directory)))
-        (map (lambda (item)
+        (map (lambda (item)                       ;dependencies
                (let ((get (lambda* (key #:optional default)
                             (or (and=> (assoc-ref item key) first) default))))
                  (and-let* ((name (get 'name))
@@ -145,7 +156,8 @@ if valid metadata could not be read from PORT."
                     (branch branch)
                     (url url)
                     (commit (get 'commit))))))
-             dependencies))))
+             dependencies)
+        news-file)))                              ;news-file
     ((and ('channel ('version version) _ ...) sexp)
      (raise (condition
              (&message (message "unsupported '.guix-channel' version"))
@@ -169,7 +181,7 @@ doesn't exist."
         read-channel-metadata))
     (lambda args
       (if (= ENOENT (system-error-errno args))
-          (channel-metadata "/" '())
+          (channel-metadata "/" '() #f)
           (apply throw args)))))
 
 (define (channel-instance-metadata instance)
@@ -560,3 +572,98 @@ PROFILE is not a profile created by 'guix pull', return the empty list."
               ;; Show most recently installed packages last.
               (reverse
                (manifest-entries (profile-manifest profile)))))
+
+
+;;;
+;;; News.
+;;;
+
+;; Channel news.
+(define-record-type 
+  (channel-news entries)
+  channel-news?
+  (entries channel-news-entries))                 ;list of 
+
+;; News entry, associated with a specific commit of the channel.
+(define-record-type 
+  (channel-news-entry commit title body)
+  channel-news-entry?
+  (commit  channel-news-entry-commit)             ;hex string
+  (title   channel-news-entry-title)              ;list of language tag/string pairs
+  (body    channel-news-entry-body))              ;list of language tag/string pairs
+
+(define (sexp->channel-news-entry entry)
+  "Return the  record corresponding to ENTRY, an sexp."
+  (define (pair language message)
+    (cons (symbol->string language) message))
+
+  (match entry
+    (('entry ('commit commit)
+             ('title ((? symbol? title-tags) (? string? titles)) ...)
+             ('body ((? symbol? body-tags) (? string? bodies)) ...)
+             _ ...)
+     (channel-news-entry commit
+                         (map pair title-tags titles)
+                         (map pair body-tags bodies)))
+    (_
+     (raise (condition
+             (&message (message "invalid channel news entry"))
+             (&error-location
+              (location (source-properties->location
+                         (source-properties entry)))))))))
+
+(define (read-channel-news port)
+  "Read a channel news feed from PORT and return it as a 
+record."
+  (match (false-if-exception (read port))
+    (('channel-news ('version 0) entries ...)
+     (channel-news (map sexp->channel-news-entry entries)))
+    (('channel-news ('version version) _ ...)
+     ;; This is an unsupported version from the future.  There's nothing wrong
+     ;; with that (the user may simply need to upgrade the 'guix' channel to
+     ;; be able to read it), so silently ignore it.
+     (channel-news '()))
+    (#f
+     (raise (condition
+             (&message (message "syntactically invalid channel news file")))))
+    (sexp
+     (raise (condition
+             (&message (message "invalid channel news file"))
+             (&error-location
+              (location (source-properties->location
+                         (source-properties sexp)))))))))
+
+(define* (channel-news-for-commit channel new #:optional old)
+  "Return a list of  for CHANNEL between commits OLD and
+NEW.  When OLD is omitted or is #f, return all the news entries of CHANNEL."
+  (catch 'git-error
+    (lambda ()
+      (let* ((checkout  (update-cached-checkout (channel-url channel)
+                                                #:ref `(commit . ,new)))
+             (metadata  (read-channel-metadata-from-source checkout))
+             (news-file (channel-metadata-news-file metadata))
+             (news-file (and news-file
+                             (string-append checkout "/" news-file))))
+        (if (and news-file (file-exists? news-file))
+            (let ((entries (channel-news-entries (call-with-input-file news-file
+                                                   read-channel-news))))
+              (if old
+                  (with-repository checkout repository
+                    (let* ((new     (commit-lookup repository (string->oid new)))
+                           (old     (commit-lookup repository (string->oid old)))
+                           (commits (list->set
+                                     (map (compose oid->string commit-id)
+                                          (commit-difference new old)))))
+                      (filter (lambda (entry)
+                                (set-contains? commits
+                                               (channel-news-entry-commit entry)))
+                              entries)))
+                  entries))
+            '())))
+    (lambda (key error . rest)
+      ;; If commit NEW or commit OLD cannot be found, then something must be
+      ;; wrong (for example, the history of CHANNEL was rewritten and these
+      ;; commits no longer exist upstream), so quietly return the empty list.
+      (if (= GIT_ENOTFOUND (git-error-code error))
+          '()
+          (apply throw key error rest)))))
diff --git a/guix/tests/git.scm b/guix/tests/git.scm
index 52abe77c83..9d5b1ae321 100644
--- a/guix/tests/git.scm
+++ b/guix/tests/git.scm
@@ -18,6 +18,7 @@
 
 (define-module (guix tests git)
   #:use-module (git)
+  #:use-module ((guix git) #:select (with-repository))
   #:use-module (guix utils)
   #:use-module (guix build utils)
   #:use-module (ice-9 match)
@@ -55,7 +56,11 @@ Return DIRECTORY on success."
          (mkdir-p (dirname file))
          (call-with-output-file file
            (lambda (port)
-             (display contents port)))
+             (display (if (string? contents)
+                          contents
+                          (with-repository directory repository
+                            (contents repository)))
+                      port)))
          (git "add" file)
          (loop rest)))
       ((('commit text) rest ...)
diff --git a/tests/channels.scm b/tests/channels.scm
index e83b5437d3..58101bcb72 100644
--- a/tests/channels.scm
+++ b/tests/channels.scm
@@ -28,6 +28,10 @@
   #:use-module (guix gexp)
   #:use-module ((guix utils)
                 #:select (error-location? error-location location-line))
+  #:use-module ((guix build utils) #:select (which))
+  #:use-module (git)
+  #:use-module (guix git)
+  #:use-module (guix tests git)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-34)
@@ -246,4 +250,99 @@
                (depends? drv3
                          (list drv2 drv0) (list))))))))
 
+(unless (which (git-command)) (test-skip 1))
+(test-equal "channel-news, no news"
+  '()
+  (with-temporary-git-repository directory
+      '((add "a.txt" "A")
+        (commit "the commit"))
+    (with-repository directory repository
+      (let ((channel (channel (url (string-append "file://" directory))
+                              (name 'foo)))
+            (latest  (reference-name->oid repository "HEAD")))
+        (channel-news-for-commit channel (oid->string latest))))))
+
+(unless (which (git-command)) (test-skip 1))
+(test-assert "channel-news, one entry"
+  (with-temporary-git-repository directory
+      `((add ".guix-channel"
+             ,(object->string
+               '(channel (version 0)
+                         (news-file "news.scm"))))
+        (commit "first commit")
+        (add "src/a.txt" "A")
+        (commit "second commit")
+        (add "news.scm"
+             ,(lambda (repository)
+                (let ((previous
+                       (reference-name->oid repository "HEAD")))
+                  (object->string
+                   `(channel-news
+                     (version 0)
+                     (entry (commit ,(oid->string previous))
+                            (title (en "New file!")
+                                   (eo "Nova dosiero!"))
+                            (body (en "Yeah, a.txt."))))))))
+        (commit "third commit")
+        (add "src/b.txt" "B")
+        (commit "fourth commit")
+        (add "news.scm"
+             ,(lambda (repository)
+                (let ((second
+                       (commit-id
+                        (find-commit repository "second commit")))
+                      (previous
+                       (reference-name->oid repository "HEAD")))
+                  (object->string
+                   `(channel-news
+                     (version 0)
+                     (entry (commit ,(oid->string previous))
+                            (title (en "Another file!"))
+                            (body (en "Yeah, b.txt.")))
+                     (entry (commit ,(oid->string second))
+                            (title (en "Old news.")
+                                   (eo "Malnovaĵoj."))
+                            (body (en "For a.txt"))))))))
+        (commit "fifth commit"))
+    (with-repository directory repository
+      (define (find-commit* message)
+        (oid->string (commit-id (find-commit repository message))))
+
+      (let ((channel (channel (url (string-append "file://" directory))
+                              (name 'foo)))
+            (commit1 (find-commit* "first commit"))
+            (commit2 (find-commit* "second commit"))
+            (commit3 (find-commit* "third commit"))
+            (commit4 (find-commit* "fourth commit"))
+            (commit5 (find-commit* "fifth commit")))
+        ;; First try fetching all the news up to a given commit.
+        (and (null? (channel-news-for-commit channel commit2))
+             (lset= string=?
+                    (map channel-news-entry-commit
+                         (channel-news-for-commit channel commit5))
+                    (list commit2 commit4))
+             (lset= equal?
+                    (map channel-news-entry-title
+                         (channel-news-for-commit channel commit5))
+                    '((("en" . "Another file!"))
+                      (("en" . "Old news.") ("eo" . "Malnovaĵoj."))))
+             (lset= string=?
+                    (map channel-news-entry-commit
+                         (channel-news-for-commit channel commit3))
+                    (list commit2))
+
+             ;; Now fetch news entries that apply to a commit range.
+             (lset= string=?
+                    (map channel-news-entry-commit
+                         (channel-news-for-commit channel commit3 commit1))
+                    (list commit2))
+             (lset= string=?
+                    (map channel-news-entry-commit
+                         (channel-news-for-commit channel commit5 commit3))
+                    (list commit4))
+             (lset= string=?
+                    (map channel-news-entry-commit
+                         (channel-news-for-commit channel commit5 commit1))
+                    (list commit4 commit2)))))))
+
 (test-end "channels")
-- 
cgit v1.2.3


From 9719e8d37aaa63e1c8f9d4ab1e28d49e2e56d85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 21 Sep 2019 21:29:30 +0200
Subject: channels: Allow news entries to refer to a tag.

Suggested by Ricardo Wurmus .

* guix/channels.scm ()[tag]: New field.
(sexp->channel-news-entry): Accept either 'commit' or 'tag' in 'entry'
forms.
(resolve-channel-news-entry-tag): New procedure.
(channel-news-for-commit): Move 'with-repository' form one level
higher.  Call 'resolve-channel-news-entry-tag' on all the news entries.
* guix/tests/git.scm (populate-git-repository): Add clause for 'tag'.
* tests/channels.scm ("channel-news, one entry"): Create a tag and add
an entry with a tag.  Check that the tag is resolved and also visible in
the  record.
* doc/guix.texi (Channels): Mention tags in news entries.
---
 doc/guix.texi      |  8 ++++----
 guix/channels.scm  | 42 ++++++++++++++++++++++++++++++++----------
 guix/tests/git.scm |  3 +++
 tests/channels.scm |  9 +++++++--
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index cd108faa8f..33bf08e9dd 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4018,7 +4018,7 @@ something like this:
 @lisp
 (channel-news
   (version 0)
-  (entry (commit "d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300")
+  (entry (tag "the-bug-fix")
          (title (en "Fixed terrible bug")
                 (fr "Oh la la"))
          (body (en "@@emph@{Good news@}!  It's fixed!")
@@ -4030,9 +4030,9 @@ something like this:
 @end lisp
 
 The file consists of a list of @dfn{news entries}.  Each entry is
-associated with a commit: it describes changes made in this commit,
-possibly in preceding commits as well.  Users see entries only the first
-time they obtain the commit the entry refers to.
+associated with a commit or tag: it describes changes made in this
+commit, possibly in preceding commits as well.  Users see entries only
+the first time they obtain the commit the entry refers to.
 
 The @code{title} field should be a one-line summary while @code{body}
 can be arbitrarily long, and both can contain Texinfo markup
diff --git a/guix/channels.scm b/guix/channels.scm
index 0dadba616f..4e6e7090ac 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -40,6 +40,7 @@
   #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-35)
   #:autoload   (guix self) (whole-package make-config.scm)
@@ -73,6 +74,7 @@
 
             channel-news-entry?
             channel-news-entry-commit
+            channel-news-entry-tag
             channel-news-entry-title
             channel-news-entry-body
 
@@ -586,9 +588,10 @@ PROFILE is not a profile created by 'guix pull', return the empty list."
 
 ;; News entry, associated with a specific commit of the channel.
 (define-record-type 
-  (channel-news-entry commit title body)
+  (channel-news-entry commit tag title body)
   channel-news-entry?
-  (commit  channel-news-entry-commit)             ;hex string
+  (commit  channel-news-entry-commit)             ;hex string | #f
+  (tag     channel-news-entry-tag)                ;#f | string
   (title   channel-news-entry-title)              ;list of language tag/string pairs
   (body    channel-news-entry-body))              ;list of language tag/string pairs
 
@@ -598,11 +601,12 @@ PROFILE is not a profile created by 'guix pull', return the empty list."
     (cons (symbol->string language) message))
 
   (match entry
-    (('entry ('commit commit)
+    (('entry ((and (or 'commit 'tag) type) commit-or-tag)
              ('title ((? symbol? title-tags) (? string? titles)) ...)
              ('body ((? symbol? body-tags) (? string? bodies)) ...)
              _ ...)
-     (channel-news-entry commit
+     (channel-news-entry (and (eq? type 'commit) commit-or-tag)
+                         (and (eq? type 'tag) commit-or-tag)
                          (map pair title-tags titles)
                          (map pair body-tags bodies)))
     (_
@@ -633,6 +637,20 @@ record."
               (location (source-properties->location
                          (source-properties sexp)))))))))
 
+(define (resolve-channel-news-entry-tag repository entry)
+  "If ENTRY has its 'commit' field set, return ENTRY.  Otherwise, lookup
+ENTRY's 'tag' in REPOSITORY and return ENTRY with its 'commit' field set to
+the field its 'tag' refers to.  A 'git-error' exception is raised if the tag
+cannot be found."
+  (if (channel-news-entry-commit entry)
+      entry
+      (let* ((tag       (channel-news-entry-tag entry))
+             (reference (string-append "refs/tags/" tag))
+             (oid       (reference-name->oid repository reference)))
+        (channel-news-entry (oid->string oid) tag
+                            (channel-news-entry-title entry)
+                            (channel-news-entry-body entry)))))
+
 (define* (channel-news-for-commit channel new #:optional old)
   "Return a list of  for CHANNEL between commits OLD and
 NEW.  When OLD is omitted or is #f, return all the news entries of CHANNEL."
@@ -645,10 +663,14 @@ NEW.  When OLD is omitted or is #f, return all the news entries of CHANNEL."
              (news-file (and news-file
                              (string-append checkout "/" news-file))))
         (if (and news-file (file-exists? news-file))
-            (let ((entries (channel-news-entries (call-with-input-file news-file
-                                                   read-channel-news))))
-              (if old
-                  (with-repository checkout repository
+            (with-repository checkout repository
+              (let* ((news    (call-with-input-file news-file
+                                read-channel-news))
+                     (entries (map (lambda (entry)
+                                     (resolve-channel-news-entry-tag repository
+                                                                     entry))
+                                   (channel-news-entries news))))
+                (if old
                     (let* ((new     (commit-lookup repository (string->oid new)))
                            (old     (commit-lookup repository (string->oid old)))
                            (commits (list->set
@@ -657,8 +679,8 @@ NEW.  When OLD is omitted or is #f, return all the news entries of CHANNEL."
                       (filter (lambda (entry)
                                 (set-contains? commits
                                                (channel-news-entry-commit entry)))
-                              entries)))
-                  entries))
+                              entries))
+                    entries)))
             '())))
     (lambda (key error . rest)
       ;; If commit NEW or commit OLD cannot be found, then something must be
diff --git a/guix/tests/git.scm b/guix/tests/git.scm
index 9d5b1ae321..21573ac14e 100644
--- a/guix/tests/git.scm
+++ b/guix/tests/git.scm
@@ -66,6 +66,9 @@ Return DIRECTORY on success."
       ((('commit text) rest ...)
        (git "commit" "-m" text)
        (loop rest))
+      ((('tag name) rest ...)
+       (git "tag" name)
+       (loop rest))
       ((('branch name) rest ...)
        (git "branch" name)
        (loop rest))
diff --git a/tests/channels.scm b/tests/channels.scm
index 58101bcb72..f5a7955483 100644
--- a/tests/channels.scm
+++ b/tests/channels.scm
@@ -272,6 +272,7 @@
         (commit "first commit")
         (add "src/a.txt" "A")
         (commit "second commit")
+        (tag "tag-for-first-news-entry")
         (add "news.scm"
              ,(lambda (repository)
                 (let ((previous
@@ -299,7 +300,7 @@
                      (entry (commit ,(oid->string previous))
                             (title (en "Another file!"))
                             (body (en "Yeah, b.txt.")))
-                     (entry (commit ,(oid->string second))
+                     (entry (tag "tag-for-first-news-entry")
                             (title (en "Old news.")
                                    (eo "Malnovaĵoj."))
                             (body (en "For a.txt"))))))))
@@ -343,6 +344,10 @@
              (lset= string=?
                     (map channel-news-entry-commit
                          (channel-news-for-commit channel commit5 commit1))
-                    (list commit4 commit2)))))))
+                    (list commit4 commit2))
+             (lset= equal?
+                    (map channel-news-entry-tag
+                         (channel-news-for-commit channel commit5 commit1))
+                    '(#f "tag-for-first-news-entry")))))))
 
 (test-end "channels")
-- 
cgit v1.2.3


From a725504a3a2f855c6a618e9b4cd222df91901113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 15 Sep 2019 17:54:05 +0200
Subject: ui: Add 'current-message-language'.

* guix/ui.scm (%default-message-language): New variable.
(current-message-language): New procedure.
---
 guix/ui.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/guix/ui.scm b/guix/ui.scm
index 4be31db047..069d542131 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -121,6 +121,10 @@
             roll-back*
             switch-to-generation*
             delete-generation*
+
+            %default-message-language
+            current-message-language
+
             run-guix-command
             run-guix
             guix-main))
@@ -428,6 +432,20 @@ exiting.  ARGS is the list of arguments received by the 'throw' handler."
 report them in a user-friendly way."
   (call-with-unbound-variable-handling (lambda () exp ...)))
 
+(define %default-message-language
+  ;; Default language to use for messages.
+  (make-parameter "en"))
+
+(define (current-message-language)
+  "Return the language used for messages according to the current locale.
+Return %DEFAULT-MESSAGE-LANGUAGE if that information could not be obtained.  The
+result is an ISO-639-2 language code such as \"ar\", without the territory
+part."
+  (let ((locale (setlocale LC_MESSAGES)))
+    (match (string-index locale #\_)
+      (#f    locale)
+      (index (string-take locale index)))))
+
 (define (install-locale)
   "Install the current locale settings."
   (catch 'system-error
-- 
cgit v1.2.3


From 7faffdc2d53b982d8443c376d6ed2f41a13b3f36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 15 Sep 2019 17:57:10 +0200
Subject: pull: Display channel news.

* guix/scripts/pull.scm (display-news-entry)
(display-channel-specific-news): New procedures.
(display-channel-news): Call it.
(display-new/upgraded-packages): Adjust hint message.
* doc/guix.texi (Invoking guix pull): Mention it.
---
 doc/guix.texi         | 11 ++++++----
 guix/scripts/pull.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 33bf08e9dd..4830f39cdb 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3720,13 +3720,16 @@ Read the list of channels from @var{file} instead of
 evaluates to a list of channel objects.  @xref{Channels}, for more
 information.
 
+@cindex channel news
 @item --news
 @itemx -N
-Display the list of packages added or upgraded since the previous generation.
+Display the list of packages added or upgraded since the previous
+generation, as well as, occasionally, news written by channel authors
+for their users (@pxref{Channels, Writing Channel News}).
 
-This is the same information as displayed upon @command{guix pull} completion,
-but without ellipses; it is also similar to the output of @command{guix pull
--l} for the last generation (see below).
+The package information is the same as displayed upon @command{guix
+pull} completion, but without ellipses; it is also similar to the output
+of @command{guix pull -l} for the last generation (see below).
 
 @item --list-generations[=@var{pattern}]
 @itemx -l [@var{pattern}]
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 472947bb3a..d734df5e24 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -19,6 +19,7 @@
 
 (define-module (guix scripts pull)
   #:use-module (guix ui)
+  #:use-module (guix colors)
   #:use-module (guix utils)
   #:use-module ((guix status) #:select (with-status-verbosity))
   #:use-module (guix scripts)
@@ -229,6 +230,48 @@ purposes."
   ;; Assume that the URL matters less than the name.
   (eq? (channel-name channel1) (channel-name channel2)))
 
+(define (display-news-entry entry language port)
+  "Display ENTRY, a , in LANGUAGE, a language code, to
+PORT."
+  (let ((title (channel-news-entry-title entry))
+        (body  (channel-news-entry-body entry)))
+    (format port "  ~a~%"
+            (highlight
+             (string-trim-right
+              (texi->plain-text (or (assoc-ref title language)
+                                    (assoc-ref title (%default-message-language))
+                                    "")))))
+    (format port (G_ "    commit ~a~%")
+            (channel-news-entry-commit entry))
+    (newline port)
+    (format port "    ~a~%"
+            (indented-string
+             (parameterize ((%text-width (- (%text-width) 4)))
+               (string-trim-right
+                (texi->plain-text (or (assoc-ref body language)
+                                      (assoc-ref body (%default-message-language))
+                                      ""))))
+             4))))
+
+(define* (display-channel-specific-news new old
+                                        #:key (port (current-output-port)))
+  "Display channel news applicable the commits between OLD and NEW, where OLD
+and NEW are  records with a proper 'commit' field."
+  (let ((channel new)
+        (old     (channel-commit old))
+        (new     (channel-commit new)))
+    (when (and old new)
+      (let ((language (current-message-language)))
+        (match (channel-news-for-commit channel new old)
+          (()                                     ;no news is good news
+           #t)
+          ((entries ...)
+           (newline port)
+           (format port (G_ "News for channel '~a'~%")
+                   (channel-name channel))
+           (for-each (cut display-news-entry <> language port) entries)
+           (newline port)))))))
+
 (define (display-channel-news profile)
   "Display news about the channels of PROFILE "
   (define previous
@@ -259,7 +302,20 @@ purposes."
                           (N_ "  ~*One channel removed:~%"
                               "  ~a channels removed:~%" count)
                           count)
-                  (for-each display-channel removed)))))))))
+                  (for-each display-channel removed))))
+
+             ;; Display channel-specific news for those channels that were
+             ;; here before and are still around afterwards.
+             (for-each (match-lambda
+                         ((new old)
+                          (display-channel-specific-news new old)))
+                       (filter-map (lambda (new)
+                                     (define old
+                                       (find (cut channel=? new <>)
+                                             old-channels))
+
+                                     (and old (list new old)))
+                                   new-channels)))))))
 
 (define (display-news profile)
   ;; Display profile news, with the understanding that this process represents
@@ -534,8 +590,7 @@ display long package lists that would fill the user's screen."
     (when (and concise?
                (or (> new-count concise/max-item-count)
                    (> upgraded-count concise/max-item-count)))
-      (display-hint (G_ "Run @command{guix pull --news} to view the complete
-list of package changes.")))))
+      (display-hint (G_ "Run @command{guix pull --news} to read all the news.")))))
 
 (define (display-profile-content-diff profile gen1 gen2)
   "Display the changes in PROFILE GEN2 compared to generation GEN1."
-- 
cgit v1.2.3


From 192ee02aeb3d2f6d14ea93cfc43b30dd93df80e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 15 Sep 2019 23:55:19 +0200
Subject: pull: '-l' displays channel news.

* guix/scripts/pull.scm (display-channel-news): Make 'previous' a
parameter.
(process-query)[list-generations]: Call 'display-channel-news'.
---
 guix/scripts/pull.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index d734df5e24..4a4756dc6e 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -272,12 +272,12 @@ and NEW are  records with a proper 'commit' field."
            (for-each (cut display-news-entry <> language port) entries)
            (newline port)))))))
 
-(define (display-channel-news profile)
-  "Display news about the channels of PROFILE "
-  (define previous
-    (and=> (relative-generation profile -1)
-           (cut generation-file-name profile <>)))
-
+(define* (display-channel-news profile
+                               #:optional
+                               (previous
+                                (and=> (relative-generation profile -1)
+                                       (cut generation-file-name profile <>))))
+  "Display news about the channels of PROFILE compared to PREVIOUS."
   (when previous
     (let ((old-channels (profile-channels previous))
           (new-channels (profile-channels profile)))
@@ -614,6 +614,8 @@ display long package lists that would fill the user's screen."
               ((first second rest ...)
                (display-profile-content-diff profile
                                              first second)
+               (display-channel-news (generation-file-name profile second)
+                                     (generation-file-name profile first))
                (loop (cons second rest)))
               ((_) #t)
               (()  #t))))))
-- 
cgit v1.2.3


From dabdd7d4650da685a9bfe470abbc2ec066ff00b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 21 Sep 2019 23:00:07 +0200
Subject: pull: Display news titles directly upon 'pull'.

* guix/scripts/pull.scm (display-profile-news): Return true when there's
more to display.
(display-news-entry-title): New procedure.
(display-news-entry): Use it.
(display-channel-specific-news): Return true when there's more to
display.
(display-channel-news-headlines): New procedure.
(build-and-install): Call it.  When 'display-channel-news-headlines' or
'display-profile-news' returns #t, print a hint to run "pull --news".
(display-new/upgraded-packages): Return true when there's more to display.
---
 guix/scripts/pull.scm | 112 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 81 insertions(+), 31 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 4a4756dc6e..a7fd36fffc 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -189,7 +189,7 @@ Download and deploy the latest version of Guix.\n"))
                                current-is-newer?)
   "Display what's up in PROFILE--new packages, and all that.  If
 CURRENT-IS-NEWER? is true, assume that the current process represents the
-newest generation of PROFILE."
+newest generation of PROFILE.  Return true when there's more info to display."
   (match (memv (generation-number profile)
                (reverse (profile-generations profile)))
     ((current previous _ ...)
@@ -212,7 +212,7 @@ newest generation of PROFILE."
                                         #:concise? concise?
                                         #:heading
                                         (G_ "New in this revision:\n")))))
-    (_ #t)))
+    (_ #f)))
 
 (define (display-channel channel)
   "Display information about CHANNEL."
@@ -230,33 +230,44 @@ purposes."
   ;; Assume that the URL matters less than the name.
   (eq? (channel-name channel1) (channel-name channel2)))
 
+(define (display-news-entry-title entry language port)
+  "Display the title of ENTRY, a news entry, to PORT."
+  (define title
+    (channel-news-entry-title entry))
+
+  (format port "  ~a~%"
+          (highlight
+           (string-trim-right
+            (texi->plain-text (or (assoc-ref title language)
+                                  (assoc-ref title (%default-message-language))
+                                  ""))))))
+
 (define (display-news-entry entry language port)
   "Display ENTRY, a , in LANGUAGE, a language code, to
 PORT."
-  (let ((title (channel-news-entry-title entry))
-        (body  (channel-news-entry-body entry)))
-    (format port "  ~a~%"
-            (highlight
+  (define body
+    (channel-news-entry-body entry))
+
+  (display-news-entry-title entry language port)
+  (format port (G_ "    commit ~a~%")
+          (channel-news-entry-commit entry))
+  (newline port)
+  (format port "    ~a~%"
+          (indented-string
+           (parameterize ((%text-width (- (%text-width) 4)))
              (string-trim-right
-              (texi->plain-text (or (assoc-ref title language)
-                                    (assoc-ref title (%default-message-language))
-                                    "")))))
-    (format port (G_ "    commit ~a~%")
-            (channel-news-entry-commit entry))
-    (newline port)
-    (format port "    ~a~%"
-            (indented-string
-             (parameterize ((%text-width (- (%text-width) 4)))
-               (string-trim-right
-                (texi->plain-text (or (assoc-ref body language)
-                                      (assoc-ref body (%default-message-language))
-                                      ""))))
-             4))))
+              (texi->plain-text (or (assoc-ref body language)
+                                    (assoc-ref body (%default-message-language))
+                                    ""))))
+           4)))
 
 (define* (display-channel-specific-news new old
-                                        #:key (port (current-output-port)))
+                                        #:key (port (current-output-port))
+                                        concise?)
   "Display channel news applicable the commits between OLD and NEW, where OLD
-and NEW are  records with a proper 'commit' field."
+and NEW are  records with a proper 'commit' field.  When CONCISE? is
+true, display nothing but the news titles.  Return true if there are more news
+to display."
   (let ((channel new)
         (old     (channel-commit old))
         (new     (channel-commit new)))
@@ -264,13 +275,17 @@ and NEW are  records with a proper 'commit' field."
       (let ((language (current-message-language)))
         (match (channel-news-for-commit channel new old)
           (()                                     ;no news is good news
-           #t)
+           #f)
           ((entries ...)
            (newline port)
            (format port (G_ "News for channel '~a'~%")
                    (channel-name channel))
-           (for-each (cut display-news-entry <> language port) entries)
-           (newline port)))))))
+           (for-each (if concise?
+                         (cut display-news-entry-title <> language port)
+                         (cut display-news-entry <> language port))
+                     entries)
+           (newline port)
+           #t))))))
 
 (define* (display-channel-news profile
                                #:optional
@@ -317,6 +332,35 @@ and NEW are  records with a proper 'commit' field."
                                      (and old (list new old)))
                                    new-channels)))))))
 
+(define* (display-channel-news-headlines profile)
+  "Display the titles of news about the channels of PROFILE compared to its
+previous generation.  Return true if there are news to display."
+  (define previous
+    (and=> (relative-generation profile -1)
+           (cut generation-file-name profile <>)))
+
+  (when previous
+    (let ((old-channels (profile-channels previous))
+          (new-channels (profile-channels profile)))
+      ;; Find the channels present in both PROFILE and PREVIOUS, and print
+      ;; their news.
+      (and (pair? old-channels) (pair? new-channels)
+           (let ((channels (filter-map (lambda (new)
+                                         (define old
+                                           (find (cut channel=? new <>)
+                                                 old-channels))
+
+                                         (and old (list new old)))
+                                       new-channels)))
+             (define more?
+               (map (match-lambda
+                      ((new old)
+                       (display-channel-specific-news new old
+                                                      #:concise? #t)))
+                    channels))
+
+             (any ->bool more?))))))
+
 (define (display-news profile)
   ;; Display profile news, with the understanding that this process represents
   ;; the newest generation.
@@ -344,7 +388,12 @@ true, display what would be built without actually building it."
                       #:dry-run? dry-run?)
       (munless dry-run?
         (return (newline))
-        (return (display-profile-news profile #:concise? #t))
+        (return
+         (let ((more? (list (display-profile-news profile #:concise? #t)
+                            (display-channel-news-headlines profile))))
+           (when (any ->bool more?)
+             (display-hint
+              (G_ "Run @command{guix pull --news} to read all the news.")))))
         (if guix-command
             (let ((new (map (cut string-append <> "/bin/guix")
                             (list (user-friendly-profile profile)
@@ -544,7 +593,9 @@ it."
   "Given the two package name/version alists ALIST1 and ALIST2, display the
 list of new and upgraded packages going from ALIST1 to ALIST2.  When ALIST1
 and ALIST2 differ, display HEADING upfront.  When CONCISE? is true, do not
-display long package lists that would fill the user's screen."
+display long package lists that would fill the user's screen.
+
+Return true when there is more package info to display."
   (define (pretty str column)
     (indented-string (fill-paragraph str (- (%text-width) 4)
                                      column)
@@ -587,10 +638,9 @@ display long package lists that would fill the user's screen."
                (pretty (list->enumeration (sort upgraded string new-count concise/max-item-count)
-                   (> upgraded-count concise/max-item-count)))
-      (display-hint (G_ "Run @command{guix pull --news} to read all the news.")))))
+    (and concise?
+         (or (> new-count concise/max-item-count)
+             (> upgraded-count concise/max-item-count)))))
 
 (define (display-profile-content-diff profile gen1 gen2)
   "Display the changes in PROFILE GEN2 compared to generation GEN1."
-- 
cgit v1.2.3


From dcc90d15581189dbc30e201db2b807273d6484f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 15 Sep 2019 17:53:13 +0200
Subject: Add '.guix-channel' file.

* .guix-channel: New file.
* Makefile.am (EXTRA_DIST): Add it.
---
 .guix-channel | 5 +++++
 Makefile.am   | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .guix-channel

diff --git a/.guix-channel b/.guix-channel
new file mode 100644
index 0000000000..3e618d79f8
--- /dev/null
+++ b/.guix-channel
@@ -0,0 +1,5 @@
+;; This is a Guix channel.
+
+(channel
+  (version 0)
+  (news-file "etc/news.scm"))
diff --git a/Makefile.am b/Makefile.am
index 658f03bd54..3c27d8ee10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -533,6 +533,7 @@ EXTRA_DIST +=						\
   TODO							\
   CODE-OF-CONDUCT					\
   .dir-locals.el					\
+  .guix-channel						\
   scripts/guix.in					\
   etc/guix-install.sh					\
   build-aux/build-self.scm				\
-- 
cgit v1.2.3


From 90ca791ab082f0513cd5e8af7acfd8db63a6e73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 15 Sep 2019 18:03:56 +0200
Subject: etc: Add channel news file.

* etc/news.scm: New file.
* Makefile.am (EXTRA_DIST): Add it.
---
 Makefile.am  |  1 +
 etc/news.scm | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 etc/news.scm

diff --git a/Makefile.am b/Makefile.am
index 3c27d8ee10..6a4cfcd4a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -536,6 +536,7 @@ EXTRA_DIST +=						\
   .guix-channel						\
   scripts/guix.in					\
   etc/guix-install.sh					\
+  etc/news.scm						\
   build-aux/build-self.scm				\
   build-aux/compile-all.scm				\
   build-aux/hydra/evaluate.scm				\
diff --git a/etc/news.scm b/etc/news.scm
new file mode 100644
index 0000000000..736e8b5516
--- /dev/null
+++ b/etc/news.scm
@@ -0,0 +1,30 @@
+;; GNU Guix news, for use by 'guix pull'.
+;;
+;; Copyright © 2019 Ludovic Courtès 
+;;
+;; Copying and distribution of this file, with or without modification, are
+;; permitted in any medium without royalty provided the copyright notice and
+;; this notice are preserved.
+
+(channel-news
+ (version 0)
+ (entry (commit "dcc90d15581189dbc30e201db2b807273d6484f0")
+        (title (en "New channel news mechanism")
+               (de "Neuer Mechanismus, um Neuigkeiten über Kanäle anzuzeigen.")
+               (fr "Nouveau mécanisme d'information sur les canaux"))
+        (body
+         (en "You are reading this message through the new channel news
+mechanism, congratulations!  This mechanism allows channel authors to provide
+@dfn{news entries} that their users can view with @command{guix pull --news}.
+Run @command{info \"(guix) Invoking guix pull\"} for more info.")
+         (de "Sie lesen diese Meldung mit Hilfe des neuen Mechanismus, um
+Neuigkeiten über Kanäle anzuzeigen — Glückwunsch! Mit diesem
+Mechanismus können Kanalautoren Ihren Nutzern @dfn{Einträge zu
+Neuigkeiten} mitteilen, die diese sich mit @command{guix pull --news}
+anzeigen lassen können. Führen Sie @command{info \"(guix.de) Aufruf
+von guix pull\"} aus, um weitere Informationen zu erhalten.")
+         (fr "Ce message t'arrive à travers le nouveau mécanisme d'information
+des canaux, bravo !  Ce mécanisme permet aux auteur·rice·s de canaux de
+fournir des informations qu'on peut visualiser avec @command{guix pull
+--news}.  Tape @command{info \"(guix.fr) Invoquer guix pull\"} pour plus de
+détails."))))
-- 
cgit v1.2.3


From 624ed47d4179418f1018ec9470b6bc4db04496ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 11:40:08 +0200
Subject: gnu: perl-catalyst-runtime: Update to 5.90124.

* gnu/packages/web.scm (perl-catalyst-runtime): Update to 5.90124.
[propagated-inputs]: Add PERL-PERLIO-UTF8_STRICT.
---
 gnu/packages/web.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index f7730f3992..a269de9936 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1977,15 +1977,15 @@ MIME type directly to the browser, without being processed through Catalyst.")
 (define-public perl-catalyst-runtime
   (package
     (name "perl-catalyst-runtime")
-    (version "5.90119")
+    (version "5.90124")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
+       (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/"
                            "Catalyst-Runtime-" version ".tar.gz"))
        (sha256
         (base32
-         "1iw7x9rqk3sz2hm1bw01blz5vwm7zlljdf4xj3r8vz54f1yggzqr"))))
+         "001yk1i0xwn4v308qx15nvnp6v9qfdigdlvz1rgw5zpnq7kwnq1a"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-test-fatal" ,perl-test-fatal)))
@@ -2008,6 +2008,7 @@ MIME type directly to the browser, without being processed through Catalyst.")
        ("perl-moosex-methodattributes" ,perl-moosex-methodattributes)
        ("perl-namespace-clean" ,perl-namespace-clean)
        ("perl-path-class" ,perl-path-class)
+       ("perl-perlio-utf8-strict" ,perl-perlio-utf8_strict)
        ("perl-plack" ,perl-plack)
        ("perl-plack-middleware-fixmissingbodyinredirect"
         ,perl-plack-middleware-fixmissingbodyinredirect)
-- 
cgit v1.2.3


From e5efdbce21a0afcbb3e73cc7b59111ccf62cb532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 11:40:53 +0200
Subject: gnu: perl-catalyst-view-json: Update to 0.37.

* gnu/packages/web.scm (perl-catalyst-view-json): Update to 0.37.
---
 gnu/packages/web.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a269de9936..5b1f60cfdd 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -2097,15 +2097,15 @@ table based report in a variety of formats (CSV, HTML, etc.).")
 (define-public perl-catalyst-view-json
   (package
     (name "perl-catalyst-view-json")
-    (version "0.36")
+    (version "0.37")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://cpan/authors/id/J/JJ/JJNAPIORK/"
+       (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
                            "Catalyst-View-JSON-" version ".tar.gz"))
        (sha256
         (base32
-         "0x943j1n2r0zqanyzdrs1xsnn8ayn2wqskn7h144xcqa6v6gcisl"))))
+         "1v4xkzazs743sc7cd1kxkbi99cf00a4dadyyancckcbpi9p3znn5"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-module-install" ,perl-module-install)
-- 
cgit v1.2.3


From b69ce8a8721ad82a528acc21bed68e611e5c6114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 11:57:39 +0200
Subject: deploy: Add '--verbosity' and properly interpret build log.

This is a followup to 91300526b7d9d775bd98a700ed3758420ef9eac6.

* guix/scripts/deploy.scm (show-help, %options): Add '--verbosity'.
(guix-deploy): Wrap 'with-store' in 'with-status-verbosity'.
---
 guix/scripts/deploy.scm | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm
index cf571756fd..f311587ec3 100644
--- a/guix/scripts/deploy.scm
+++ b/guix/scripts/deploy.scm
@@ -26,6 +26,7 @@
   #:use-module (guix ui)
   #:use-module (guix utils)
   #:use-module (guix grafts)
+  #:use-module (guix status)
   #:use-module (ice-9 format)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-34)
@@ -52,6 +53,8 @@ Perform the deployment specified by FILE.\n"))
   (display (G_ "
   -V, --version          display version information and exit"))
   (newline)
+  (display (G_ "
+  -v, --verbosity=LEVEL  use the given verbosity LEVEL"))
   (show-bug-report-information))
 
 (define %options
@@ -63,6 +66,12 @@ Perform the deployment specified by FILE.\n"))
                  (lambda (opt name arg result)
                    (alist-cons 'system arg
                                (alist-delete 'system result eq?))))
+         (option '(#\v "verbosity") #t #f
+                 (lambda (opt name arg result)
+                   (let ((level (string->number* arg)))
+                     (alist-cons 'verbosity level
+                                 (alist-delete 'verbosity result)))))
+
          %standard-build-options))
 
 (define %default-options
@@ -87,25 +96,27 @@ Perform the deployment specified by FILE.\n"))
 (define (guix-deploy . args)
   (define (handle-argument arg result)
     (alist-cons 'file arg result))
+
   (let* ((opts (parse-command-line args %options (list %default-options)
                                    #:argument-handler handle-argument))
          (file (assq-ref opts 'file))
          (machines (or (and file (load-source-file file)) '())))
-    (with-store store
-      (set-build-options-from-command-line store opts)
-      (for-each (lambda (machine)
-                  (info (G_ "deploying to ~a...~%")
-                        (machine-display-name machine))
-                  (parameterize ((%graft? (assq-ref opts 'graft?)))
-                    (guard (c ((message-condition? c)
-                               (report-error (G_ "failed to deploy ~a: ~a~%")
-                                             (machine-display-name machine)
-                                             (condition-message c)))
-                              ((deploy-error? c)
-                               (when (deploy-error-should-roll-back c)
-                                 (info (G_ "rolling back ~a...~%")
-                                       (machine-display-name machine))
-                                 (run-with-store store (roll-back-machine machine)))
-                               (apply throw (deploy-error-captured-args c))))
-                      (run-with-store store (deploy-machine machine)))))
-                machines))))
+    (with-status-verbosity (assoc-ref opts 'verbosity)
+      (with-store store
+        (set-build-options-from-command-line store opts)
+        (for-each (lambda (machine)
+                    (info (G_ "deploying to ~a...~%")
+                          (machine-display-name machine))
+                    (parameterize ((%graft? (assq-ref opts 'graft?)))
+                      (guard (c ((message-condition? c)
+                                 (report-error (G_ "failed to deploy ~a: ~a~%")
+                                               (machine-display-name machine)
+                                               (condition-message c)))
+                                ((deploy-error? c)
+                                 (when (deploy-error-should-roll-back c)
+                                   (info (G_ "rolling back ~a...~%")
+                                         (machine-display-name machine))
+                                   (run-with-store store (roll-back-machine machine)))
+                                 (apply throw (deploy-error-captured-args c))))
+                        (run-with-store store (deploy-machine machine)))))
+                  machines)))))
-- 
cgit v1.2.3


From 2f1a01b7cd7763ec55c9334b84013a30a3ded96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 12:14:39 +0200
Subject: gnu: mit-scheme: Pass a valid tarball hash on non-x86.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes this bug:

  $ guix build -nd mit-scheme -s aarch64-linux
  guix build: error: derivation `/gnu/store/…-mit-scheme-c-10.1.3.tar.gz.drv' has incorrect output `/gnu/store/…-mit-scheme-c-10.1.3.tar.gz', should be `/gnu/store/…-mit-scheme-c-10.1.3.tar.gz'

This is a followup to 7d6cfa442539e8fda0c145bf7a774c13e4fdc83c.

* gnu/packages/scheme.scm (mit-scheme)[inputs]: For "source", pass a
hash of the right length in the catch-all case.
---
 gnu/packages/scheme.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 9962cbdcb5..5753035643 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -204,8 +204,8 @@
               (base32
                "05sjyz90xxfnmi87qv8x0yx0fcallnzl1dciygdafp317pn489is"))
              (_
-               (base32
-                ""))))))))
+              (base32
+               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"))))))))
 
     ;; Fails to build on MIPS, see .
     ;; Also, the portable C version of MIT/GNU Scheme did not work in time for
-- 
cgit v1.2.3


From 9338cbdbe04f1e2cacd593e3632a111687ffabf5 Mon Sep 17 00:00:00 2001
From: "Boris A. Dekshteyn" 
Date: Sat, 21 Sep 2019 01:09:05 +1200
Subject: gnu: libomp: Fix test target.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/llvm.scm (libomp)[arguments]: Change #:test-target value.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/llvm.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index d8ffe35117..9a42d4fe07 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -369,7 +369,7 @@ requirements according to version 1.1 of the OpenCL specification.")
      '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON"
                            "-DOPENMP_TEST_C_COMPILER=clang"
                            "-DOPENMP_TEST_CXX_COMPILER=clang++")
-       #:test-target "check-libomptarget"))
+       #:test-target "check-libomp"))
     (native-inputs
      `(("clang" ,clang)
        ("llvm" ,llvm)
-- 
cgit v1.2.3


From cb3ee1c5070ad3b82491d7ba61fc120910427121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 12:26:59 +0200
Subject: doc: Explain that '--profile' expects a file name.

* doc/guix.texi (Invoking guix package): Explain that the argument to
--profile is a file name.
---
 doc/guix.texi | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 4830f39cdb..d3170bb46e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2918,6 +2918,25 @@ variable, even though, taken individually, neither @file{foo} nor
 @itemx -p @var{profile}
 Use @var{profile} instead of the user's default profile.
 
+@var{profile} must be the name of a file that will be created upon
+completion.  Concretely, @var{profile} will be a mere symbolic link
+(``symlink'') pointing to the actual profile where packages are
+installed:
+
+@example
+$ guix install hello -p ~/code/my-profile
+@dots{}
+$ ~/code/my-profile/bin/hello
+Hello, world!
+@end example
+
+All it takes to get rid of the profile is to remove this symlink and its
+siblings that point to specific generations:
+
+@example
+$ rm ~/code/my-profile ~/code/my-profile-*-link
+@end example
+
 @cindex collisions, in a profile
 @cindex colliding packages in profiles
 @cindex profile collisions
-- 
cgit v1.2.3


From 04dc98291cb3cbbf871652c2ccb32c6064ae811d Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 23 Sep 2019 13:11:49 +0200
Subject: gnu: flatpak: Update to 1.4.3.

* gnu/packages/package-management.scm (flatpak): Update to 1.4.3.
---
 gnu/packages/package-management.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 26f1458028..ee9efb6eb1 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -893,7 +893,7 @@ the boot loader configuration.")
 (define-public flatpak
   (package
    (name "flatpak")
-   (version "1.4.2")
+   (version "1.4.3")
    (source
     (origin
      (method url-fetch)
@@ -901,7 +901,7 @@ the boot loader configuration.")
                          version "/flatpak-" version ".tar.xz"))
      (sha256
       (base32
-       "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj"))))
+       "11bfxmv8pxlb5x0lb2rsl45615fzfvq5r6wldf0l6ab2ngryd7i7"))))
 
    ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to
    ;; find the TLS backend in glib-networking.
-- 
cgit v1.2.3


From ec3516f1e202becd26e407f15c75a4be4176c3bd Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 23 Sep 2019 13:16:40 +0200
Subject: gnu: kitty: Update to 0.14.5.

* gnu/packages/terminals.scm (kitty): Update to 0.14.5.
---
 gnu/packages/terminals.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index f902000cae..d9a5f1db9a 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -955,7 +955,7 @@ tmux.")
 (define-public kitty
   (package
     (name "kitty")
-    (version "0.14.4")
+    (version "0.14.5")
     (home-page "https://sw.kovidgoyal.net/kitty/")
     (source
      (origin
@@ -966,7 +966,7 @@ tmux.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0z0y80wcbra3zfyaiim98afbqlfpkjkql430zfb8shx61rzzmn9i"))
+         "0qx3wj4n3zgjcpd1vjjwdlz8d1vp8bkxihsg2khlla1izandgxxa"))
        (modules '((guix build utils)))
        (snippet
         '(begin
-- 
cgit v1.2.3


From 48c97c27dbd5523df7f62a4c235157b03648358d Mon Sep 17 00:00:00 2001
From: Rutger Helling 
Date: Mon, 23 Sep 2019 13:22:29 +0200
Subject: gnu: utox: Update to 0.17.1.

* gnu/packages/messaging.scm (utox): Update to 0.17.1.
---
 gnu/packages/messaging.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index afe62eb680..7a77b45d1d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -996,18 +996,18 @@ messenger protocol.")
 (define-public utox
   (package
    (name "utox")
-   (version "0.17.0")
+   (version "0.17.1")
    (source
     (origin
      (method git-fetch)
      (uri (git-reference
            (url "https://github.com/uTox/uTox.git")
-           (commit "v0.17.0")
+           (commit (string-append "v" version))
            (recursive? #t))) ;; Needed for 'minini' git submodule.
      (file-name (string-append name "-" version "-checkout"))
      (sha256
       (base32
-       "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"))))
+       "17kwqw24iqljp2icih9k6ikx12gzr8zzqr8y5h35bg8m5s8pasq5"))))
    (build-system cmake-build-system)
    (arguments
     `(#:configure-flags '("-DENABLE_TESTS=on")
-- 
cgit v1.2.3


From 3dd3ac4d83db0609e10637e9d21d7abb2198398d Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Mon, 23 Sep 2019 13:06:36 +0200
Subject: installer: Fix run-input-page calls.

This fixes 55c43108 commit that renamed input-hide-checkbox? into
input-visibility-checkbox?.

* gnu/installer/newt/partition.scm (prompt-luks-passwords): Rename
input-hide-checkbox? into input-visibility-checkbox?.
---
 gnu/installer/newt/partition.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index cd9d46316a..7a9f11a15e 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2018 Mathieu Othacehe 
+;;; Copyright © 2018, 2019 Mathieu Othacehe 
 ;;; Copyright © 2019 Ludovic Courtès 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -159,14 +159,14 @@ USER-PARTITIONS list. Return this list with password fields filled-in."
                     (format #f (G_ "Please enter the password for the \
 encryption of partition ~a (label: ~a).") file-name crypt-label)
                     (G_ "Password required")
-                    #:input-hide-checkbox? #t)))
+                    #:input-visibility-checkbox? #t)))
                 (password-confirm-page
                  (lambda ()
                    (run-input-page
                     (format #f (G_ "Please confirm the password for the \
 encryption of partition ~a (label: ~a).") file-name crypt-label)
                     (G_ "Password confirmation required")
-                    #:input-hide-checkbox? #t))))
+                    #:input-visibility-checkbox? #t))))
            (if crypt-label
                (let loop ()
                  (let ((password (password-page))
-- 
cgit v1.2.3


From b928c5874aae7b4103ad100d8f46975d4611e284 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 22 Sep 2019 21:42:40 +0200
Subject: gnu: acpid: Update to 2.0.32.

* gnu/packages/linux.scm (acpid): Update to 2.0.32.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 59874b097c..95f7d56e41 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3301,14 +3301,14 @@ about ACPI devices.")
 (define-public acpid
   (package
     (name "acpid")
-    (version "2.0.31")
+    (version "2.0.32")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/acpid2/acpid-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1hrc0xm6q12knbgzhq0i8g2rfrkwcvh1asd7k9rs3nc5xmlwd7gw"))))
+                "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj"))))
     (build-system gnu-build-system)
     (home-page "https://sourceforge.net/projects/acpid2/")
     (synopsis "Daemon for delivering ACPI events to user-space programs")
-- 
cgit v1.2.3


From 900ddbf53dfb6e34bc1fc0ab866a970b6aa9da8b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 22 Sep 2019 23:38:30 +0200
Subject: gnu: obs: Update to 24.0.1.

* gnu/packages/video.scm (obs): Update to 24.0.1.
[inputs]: Add qtsvg.
---
 gnu/packages/video.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 422dbab57e..aaba2fb3f7 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2297,7 +2297,7 @@ be used for realtime video capture via Linux-specific APIs.")
 (define-public obs
   (package
     (name "obs")
-    (version "23.0.2")
+    (version "24.0.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2306,7 +2306,7 @@ be used for realtime video capture via Linux-specific APIs.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1c0a5vy4h3qwz69qw3bydyk7r651ib5a9jna4yj6c25p3p9isdvp"))))
+                "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f))                    ; no tests
@@ -2326,6 +2326,7 @@ be used for realtime video capture via Linux-specific APIs.")
        ("mesa" ,mesa)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase)
+       ("qtsvg" ,qtsvg)
        ("qtx11extras" ,qtx11extras)
        ("speex" ,speex)
        ("v4l-utils" ,v4l-utils)
-- 
cgit v1.2.3


From bfe194b5331fe9a60ed9e1d373fe1de9e2606d34 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 16:31:49 +0200
Subject: gnu: enchant: Update to 2.2.7.

* gnu/packages/enchant.scm (enchant): Update to 2.2.7.
---
 gnu/packages/enchant.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm
index cfec161784..bcf2507e86 100644
--- a/gnu/packages/enchant.scm
+++ b/gnu/packages/enchant.scm
@@ -33,7 +33,7 @@
 (define-public enchant
   (package
     (name "enchant")
-    (version "2.2.5")
+    (version "2.2.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/AbiWord/enchant/releases"
@@ -41,7 +41,7 @@
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0iqwzs11i9fvqdxv5kn0svcn2mzymn657qf3j66lg8dx1nh4xkpz"))))
+                "029smcna98hllgkm2gy94qa7qphxs4xaa8cdbg5kaaw16mhrf8hv"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--disable-static"
-- 
cgit v1.2.3


From aa686627ac2ca2ab43d6423595223348177f7f80 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 16:43:18 +0200
Subject: gnu: python-slugify: Update to 3.0.4.

* gnu/packages/python-web.scm (python-slugify): Update to 3.0.4.
* gnu/packages/patches/python-slugify-depend-on-unidecode.patch:
Adjust accordingly.
---
 gnu/packages/patches/python-slugify-depend-on-unidecode.patch | 4 ++--
 gnu/packages/python-web.scm                                   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
index 6038f432f1..5ac749c19d 100644
--- a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
+++ b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
@@ -6,8 +6,8 @@ index 4800173..6bdd77f 100755
  author = 'Val Neekman'
  author_email = 'info@neekware.com'
  license = 'MIT'
--install_requires = ['text-unidecode==1.2']
--extras_require = {'unidecode': ['Unidecode==1.0.23']}
+-install_requires = ['text-unidecode>=1.3']
+-extras_require = {'unidecode': ['Unidecode>=1.1.1']}
 +install_requires = ['Unidecode']
  
  classifiers = [
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9b88d66118..0c93c03adf 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3219,14 +3219,13 @@ Python.")
 (define-public python-slugify
   (package
     (name "python-slugify")
-    (version "3.0.2")
+    (version "3.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-slugify" version))
        (sha256
-        (base32
-         "0n6pfmsq899c54plpvzi46l7zrpa3zfpm8im6h32czjw6kxky5jp"))
+        (base32 "0dv97yi5fq074q5qyqbin09pmi8ixg36caf5nkpw2bqkd8jh6pap"))
        (patches
         (search-patches "python-slugify-depend-on-unidecode.patch"))))
     (native-inputs
-- 
cgit v1.2.3


From 3b4cc5cbdbd76a911e40242a020880231ddd415a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 17:09:02 +0200
Subject: gnu: python-m2crypto: Update to 0.35.2.

* gnu/packages/python-crypto.scm (python-m2crypto): Update to 0.35.2.
---
 gnu/packages/python-crypto.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 88a00070a8..9878837a6c 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -845,13 +845,13 @@ in userspace)
 (define-public python-m2crypto
   (package
     (name "python-m2crypto")
-    (version "0.30.1")
+    (version "0.35.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "M2Crypto" version))
        (sha256
-        (base32 "1iizrpkn4c2n70nvcjqlmnk6fz3vddkrjmwavz1zlsnwv8f7bcm1"))))
+        (base32 "09yirf3w77w6f49q6nxhrjm9c3a4y9s30s1k09chqrw8zdgx8sjc"))))
     (build-system python-build-system)
     (inputs `(("openssl" ,openssl)))
     (home-page "https://gitlab.com/m2crypto/m2crypto")
-- 
cgit v1.2.3


From 676487049849ca6cebe03f19f171ca912c5e8741 Mon Sep 17 00:00:00 2001
From: "Jakob L. Kreuze" 
Date: Thu, 27 Jun 2019 20:42:14 -0400
Subject: gnu: Add screenfetch.

* gnu/packages/admin.scm (screenfetch): New variable.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/admin.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 645c2ef5d5..327abe455a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2018 Pierre Neidhardt 
 ;;; Copyright © 2019 Brett Gilio 
 ;;; Copyright © 2019 Björn Höfling 
+;;; Copyright © 2019 Jakob L. Kreuze 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,6 +56,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
+  #:use-module (gnu packages algebra)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
@@ -2751,6 +2753,64 @@ 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 screenfetch
+  ;; First commit supporting current Guix System.
+  (let ((commit "e3ec82dd464e81e4d10bef218b3016e3044c766c"))
+    (package
+      (name "screenfetch")
+      (version (git-version "3.8.0" "1" commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/KittyKatt/screenFetch")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1lzs1l5xgj9mn4b59lhkfgqnyiivf8svd1iwjabzrax90rdmxfwj"))))
+      (build-system trivial-build-system)
+      (arguments
+       `(#:modules ((guix build utils))
+         #:builder
+         (begin
+           (use-modules (guix build utils))
+           (let ((source (assoc-ref %build-inputs "source"))
+                 (out    (assoc-ref %outputs "out")))
+             (mkdir-p (string-append out "/bin/"))
+             (copy-file (string-append source "/screenfetch-dev")
+                        (string-append out "/bin/screenfetch"))
+             (install-file (string-append source "/screenfetch.1")
+                           (string-append out "/man/man1/"))
+             (install-file (string-append source "/COPYING")
+                           (string-append out "/share/doc/" ,name "-" ,version))
+             (substitute* (string-append out "/bin/screenfetch")
+               (("/usr/bin/env bash")
+                (string-append (assoc-ref %build-inputs "bash")
+                               "/bin/bash")))
+             (wrap-program
+               (string-append out "/bin/screenfetch")
+               `("PATH" ":" prefix
+                 (,(string-append (assoc-ref %build-inputs "bc") "/bin:"
+                                  (assoc-ref %build-inputs "scrot") "/bin:"
+                                  (assoc-ref %build-inputs "xdpyinfo") "/bin"
+                                  (assoc-ref %build-inputs "xprop") "/bin"))))
+             (substitute* (string-append out "/bin/screenfetch")
+               (("#!#f")
+                (string-append "#!" (assoc-ref %build-inputs "bash")
+                               "/bin/bash")))))))
+      (inputs
+       `(("bash" ,bash)
+         ("bc" ,bc)
+         ("scrot" ,scrot)
+         ("xdpyinfo" ,xdpyinfo)
+         ("xprop" ,xprop)))
+      (home-page "https://github.com/KittyKatt/screenFetch")
+      (synopsis "System information script")
+      (description "Bash screenshot information tool which can be used to
+generate those nifty terminal theme information and ASCII distribution logos in
+everyone's screenshots nowadays.")
+      (license license:gpl3))))
+
 (define-public nnn
   (package
     (name "nnn")
-- 
cgit v1.2.3


From 4343eebfc9f7d44ec9a665f3374d1397301b542e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 23 Sep 2019 19:58:50 +0200
Subject: gnu: emacs-ace-window: Update to 0.9.0-1.a534492.

* gnu/packages/emacs-xyz.scm (emacs-ace-window): Update to 0.9.0-1.a534492.
---
 gnu/packages/emacs-xyz.scm | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 86e2edebbb..86653293f9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5202,29 +5202,33 @@ windows.")
     (license license:gpl3+)))
 
 (define-public emacs-ace-window
-  (package
-    (name "emacs-ace-window")
-    (version "0.9.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/abo-abo/ace-window.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-avy" ,emacs-avy)))
-    (home-page "https://github.com/abo-abo/ace-window")
-    (synopsis "Quickly switch windows in Emacs")
-    (description
-     "@code{ace-window} is meant to replace @code{other-window}.
+  ;; last release version is from 2015
+  (let ((commit "a5344925e399e1f015721cda6cf5db03c90ab87a")
+        (revision "1"))
+    (package
+      (name "emacs-ace-window")
+      (version (git-version "0.9.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/abo-abo/ace-window.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "18jm8gfgnf6ja9aarws5650lw2zfi3wdwc5j8r5ijn5fcqhfy7rc"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-avy" ,emacs-avy)))
+      (home-page "https://github.com/abo-abo/ace-window")
+      (synopsis "Quickly switch windows in Emacs")
+      (description
+       "@code{ace-window} is meant to replace @code{other-window}.
 In fact, when there are only two windows present, @code{other-window} is
 called.  If there are more, each window will have its first character
 highlighted.  Pressing that character will switch to that window.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-iedit
   ;; Last release version was in 2016.
-- 
cgit v1.2.3


From a0bd918116c60253f44e2baf83196e8fdca04324 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 20:48:04 +0200
Subject: gnu: sbcl-trivia.ppcre: Fix typo in description.

* gnu/packages/lisp.scm (sbcl-trivia.ppcre)[description]: Fix typo.
---
 gnu/packages/lisp.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 94ef3731e0..ee2d28e579 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6597,7 +6597,7 @@ This system contains the base level system of Trivia with a trivial optimizer.")
 with Optima, another pattern matching library for Common Lisp.  It is meant to
 be faster and more extensible than Optima.
 
-This system contains the PPCRE extention.")))
+This system contains the PPCRE extension.")))
 
 (define-public sbcl-trivia.quasiquote
   (package
-- 
cgit v1.2.3


From 46a8b76ce7d861ff39211536b91dbef9ed7701b5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 20:49:19 +0200
Subject: doc: Fix typo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc/guix.texi (Build Systems): Fix/spoil ‘libary’ typo/joke.
---
 doc/guix.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index d3170bb46e..093199c63b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -6181,7 +6181,7 @@ package, correctly capitalized.
 
 For packages requiring shared library dependencies, you may need to write the
 @file{/deps/deps.jl} file manually. It's usually a line of @code{const
-variable = /gnu/store/libary.so} for each dependency, plus a void function
+variable = /gnu/store/library.so} for each dependency, plus a void function
 @code{check_deps() = nothing}.
 
 Some older packages that aren't using @file{Package.toml} yet, will require
-- 
cgit v1.2.3


From 77c2eafbbb9036c0e5ccc60e39c08439731791d8 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 11:55:33 -0700
Subject: scripts: container: Fix typo.

* guix/scripts/container/exec (show-help): Fix spelling of COMMAND.
---
 guix/scripts/container/exec.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/container/exec.scm b/guix/scripts/container/exec.scm
index d598f5cac4..51b616b384 100644
--- a/guix/scripts/container/exec.scm
+++ b/guix/scripts/container/exec.scm
@@ -38,7 +38,7 @@
 
 (define (show-help)
   (display (G_ "Usage: guix container exec PID COMMAND [ARGS...]
-Execute COMMMAND within the container process PID.\n"))
+Execute COMMAND within the container process PID.\n"))
   (newline)
   (display (G_ "
   -h, --help             display this help and exit"))
-- 
cgit v1.2.3


From 7f6941492765c5f6cfe40c38af9dbb29a0700815 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 11:59:24 -0700
Subject: lint: Fix typo.

* guix/lint: Fix spelling of "mentioning".
---
 guix/lint.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/lint.scm b/guix/lint.scm
index ba38bef806..03a8e88225 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -525,7 +525,7 @@ for connections to complete; when TIMEOUT is #f, wait as long as needed."
 
 (define (validate-uri uri package field)
   "Return #t if the given URI can be reached, otherwise return a warning for
-PACKAGE mentionning the FIELD."
+PACKAGE mentioning the FIELD."
   (let-values (((status argument)
                 (probe-uri uri #:timeout 3)))     ;wait at most 3 seconds
     (case status
-- 
cgit v1.2.3


From a130544d60747d48098ef27dc0c6cf677ab65afa Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:02:33 -0700
Subject: inferior: Fix typo.

* guix/inferior: Fix spelling of "specifications".
---
 guix/inferior.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/inferior.scm b/guix/inferior.scm
index 6be30d3f17..dcbc954432 100644
--- a/guix/inferior.scm
+++ b/guix/inferior.scm
@@ -390,7 +390,7 @@ inferior package."
   (cut inferior-package-input-field <> 'package-transitive-propagated-inputs))
 
 (define (%inferior-package-search-paths package field)
-  "Return the list of search path specificiations of PACKAGE, an inferior
+  "Return the list of search path specifications of PACKAGE, an inferior
 package."
   (define paths
     (inferior-package-field package
-- 
cgit v1.2.3


From 4907b615c98cd77f1ca1dc37f01145a0d9f4dd1c Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 23 Sep 2019 22:02:29 +0300
Subject: gnu: python-html2text: Update to 2019.8.11.

* gnu/packages/python-web.scm (python-html2text): Update to 2019.8.11.
[arguments]: Use a custom 'check phase.
[home-page]: Update home-page.
---
 gnu/packages/python-web.scm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0c93c03adf..e37ae94e18 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -306,16 +306,24 @@ other HTTP libraries.")
 (define-public python-html2text
   (package
     (name "python-html2text")
-    (version "2018.1.9")
+    (version "2019.8.11")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "html2text" version))
        (sha256
         (base32
-         "1m6d7ciq30adc3d1n8g6r46072n7q8kdy039pqvnnmp763xi8xb2"))))
+         "0ppgjplg06kmv9sj0x8p7acczcq2mcfgk1jdjwm4w5w40b0vj5pm"))))
     (build-system python-build-system)
-    (home-page "https://pypi.org/project/html2text/")
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "pytest" "test/"))))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (home-page "https://github.com/Alir3z4/html2text")
     (synopsis "Convert HTML into plain text")
     (description "html2text takes HTML and converts it into plain ASCII text
 which is also valid markdown.  html2text was originally written by Aaron
-- 
cgit v1.2.3


From fa4867cc99edc1a8d98b315034a8843883021a12 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:04:36 -0700
Subject: import: stackage: Fix typo.

* guix/import/stackage: Fix spelling of "version".
---
 guix/import/stackage.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm
index 194bea633e..14150201b5 100644
--- a/guix/import/stackage.scm
+++ b/guix/import/stackage.scm
@@ -95,7 +95,7 @@
               (lts-info-packages
                (stackage-lts-info-fetch lts-version))))
      "Fetch Cabal file for PACKAGE-NAME from hackage.haskell.org.  The retrieved
-vesion corresponds to the version of PACKAGE-NAME specified in the LTS-VERSION
+version corresponds to the version of PACKAGE-NAME specified in the LTS-VERSION
 release at stackage.org.  Return the `package' S-expression corresponding to
 that package, or #f on failure.  PACKAGES-INFO is the alist with the packages
 included in the Stackage LTS release."
-- 
cgit v1.2.3


From 5da7a04abddcd9c8805131ff27abbfe2b3f1fd33 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:08:13 -0700
Subject: build: ruby-build-system: Fix typo.

* guix/build/ruby-build-system: Fix spelling of "invocation".
---
 guix/build/ruby-build-system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index 63c94765f7..c957a61115 100644
--- a/guix/build/ruby-build-system.scm
+++ b/guix/build/ruby-build-system.scm
@@ -128,7 +128,7 @@ is #f."
 (define* (install #:key inputs outputs (gem-flags '())
                   #:allow-other-keys)
   "Install the gem archive SOURCE to the output store item.  Additional
-GEM-FLAGS are passed to the 'gem' invokation, if present."
+GEM-FLAGS are passed to the 'gem' invocation, if present."
   (let* ((ruby-version
           (match:substring (string-match "ruby-(.*)\\.[0-9]$"
                                          (assoc-ref inputs "ruby"))
-- 
cgit v1.2.3


From 2847df6ba7279233c968d92122f678744ae0662e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:15:51 -0700
Subject: gnu: perl-xml-xpathengine: Fix typo.

* gnu/packages/xml (perl-xml-xpathengine)[description]: Fix spelling of
  "mimic".
---
 gnu/packages/xml.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 0cd9319c95..c2faa4cbc0 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1353,7 +1353,7 @@ maintaining each reference encountered.")
      "This module provides an XPath engine, that can be re-used by other
 modules/classes that implement trees.
 
-In order to use the XPath engine, nodes in the user module need to mimick DOM
+In order to use the XPath engine, nodes in the user module need to mimic DOM
 nodes.  The degree of similitude between the user tree and a DOM dictates how
 much of the XPath features can be used.  A module implementing all of the DOM
 should be able to use this module very easily (you might need to add the
-- 
cgit v1.2.3


From 99ce20555d02493daf3ce5df82a158d48cfcb692 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:18:41 -0700
Subject: gnu: fe: Fix typo.

* gnu/packages/text-editors (fe)[description]: Fix spelling of "menus".
---
 gnu/packages/text-editors.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 432e79e350..e5dee2f4e5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -607,7 +607,7 @@ The basic features of Geany are:
 arbitrary text regions; it is not bound to syntactic units.
 
 Fe has no configuration or extension language and requires no setup.
-Its user interface is emacs-like and it has menues for the very most
+Its user interface is emacs-like and it has menus for the very most
 important functions to help beginners.  Further there is a reference
 card.  It offers:
 
-- 
cgit v1.2.3


From 4186adce1c4bb8600f02e8bbc0d4e2639f17c1dc Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:21:36 -0700
Subject: gnu: bctoolbox: Fix typo.

* gnu/packages/telephony (bctoolbox)[description]: Fix plurality of
  "software".
---
 gnu/packages/telephony.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 41896f2eb6..5d6f0ffed6 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -284,7 +284,7 @@ supporting cryptographic kernel.")
     (home-page "https://www.linphone.org")
     (synopsis "Utilities library for linphone software")
     (description "BCtoolbox is a utilities library used by Belledonne
-Communications softwares like linphone.")
+Communications software like linphone.")
     (license license:gpl2+)))
 
 (define-public ortp
-- 
cgit v1.2.3


From 2c33a849f7a9c2ba68f7e37aa8ba489bf5603594 Mon Sep 17 00:00:00 2001
From: Arun Isaac 
Date: Mon, 23 Sep 2019 21:35:33 +0530
Subject: gnu: guile-email: Update to 0.2.1.

* gnu/packages/guile-xyz.scm (guile-email): Update to 0.2.1.
[arguments]: Remove patch-module-dir phase.
---
 gnu/packages/guile-xyz.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 9822cd59c6..05658e6425 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -909,7 +909,7 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.")
 (define-public guile-email
   (package
     (name "guile-email")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method url-fetch)
@@ -918,7 +918,7 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.")
              version ".tar.lz"))
        (sha256
         (base32
-         "0zgvh2329zrclxfb1lh7dnqrq46jj77l0lx7j9y6y3xgbhd2d9l0"))))
+         "1ph3pb69hr3d8mj05fmbpf5rc67dlm8qnb35cc7cxz8ingvl7kv3"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -926,16 +926,7 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.")
     (inputs
      `(("guile" ,guile-2.2)))
     (arguments
-     '(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-module-dir
-           (lambda _
-             (substitute* "Makefile.in"
-               (("^godir = ([[:graph:]]+)")
-                "godir = \
-$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))
-             #t)))))
+     '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
     (home-page "https://guile-email.systemreboot.net")
     (synopsis "Guile email parser")
     (description "guile-email is a collection of email utilities implemented
-- 
cgit v1.2.3


From 90c40ea209f1d8c069931c6b3cb9671b401fe21a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:25:15 -0700
Subject: gnu: go-github-com-audriusbutkevicius-pfilter: Fix typo.

* gnu/packages/syncthing (go-github-com-audriusbutkevicius-pfilter)
  [synopsis]: Fix spelling of "multiple".
---
 gnu/packages/syncthing.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 74457f6ec4..7e1d8df333 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -1219,7 +1219,7 @@ quoting, commenting, and escaping.")
       (build-system go-build-system)
       (arguments
        '(#:import-path "github.com/AudriusButkevicius/pfilter"))
-      (synopsis "Filter packets into mulitple virtual connections")
+      (synopsis "Filter packets into multiple virtual connections")
       (description "Pfilter is a Go package for filtering packets into multiple
 virtual connections from a single physical connection.")
       (home-page "https://github.com/AudriusButkevicius/pfilter")
-- 
cgit v1.2.3


From 35fc0f4cd3387d45751a2c8a888a70e073aac348 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:28:26 -0700
Subject: gnu: python-sphinxcontrib-htmlhelp: Fix typo.

* gnu/packages/sphinx (python-sphinxcontrib-htmlhelp)[synopsis]: Fix spelling
  of "extension".
---
 gnu/packages/sphinx.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 9bd1e8d421..da7492c42e 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -216,7 +216,7 @@ to code blocks.")
     (arguments
      `(#:tests? #f))                    ;XXX: circular dependency on Sphinx
     (home-page "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp")
-    (synopsis "Sphinx exension for rendering HTML help files")
+    (synopsis "Sphinx extension for rendering HTML help files")
     (description
      "@code{sphinxcontrib-htmlhelp} is a Sphinx extension which renders
 HTML help files.")
-- 
cgit v1.2.3


From 3defa90ddf949328a87645612956d991b9725fa4 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:43:45 -0700
Subject: gnu: python-py-bcrypt: Fix typo.

* gnu/packages/python-crypto (python-py-bcrypt)[description]: Fix spelling of
  "parametrised".
---
 gnu/packages/python-crypto.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 9878837a6c..b83721946c 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -160,7 +160,7 @@ to providing full-strength password hashing for multi-user application.")
 system hashes passwords using a version of Bruce Schneier's Blowfish block
 cipher with modifications designed to raise the cost of off-line password
 cracking and frustrate fast hardware implementation.  The computation cost of
-the algorithm is parametised, so it can be increased as computers get faster.
+the algorithm is parametrised, so it can be increased as computers get faster.
 The intent is to make a compromise of a password database less likely to
 result in an attacker gaining knowledge of the plaintext passwords (e.g. using
 John the Ripper).")
-- 
cgit v1.2.3


From 0def6a488cb70840f3bba6bd319be2af6f910582 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:46:15 -0700
Subject: gnu: sbcl-cl-hooks: Fix typo.

* gnu/packages/lisp (sbcl-cl-hooks)[description]: Fix spelling of
  "possibilities".
---
 gnu/packages/lisp.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index ee2d28e579..985ed45465 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6833,7 +6833,7 @@ Emacs.
 
 In the Common LISP Object System (CLOS), a similar kind of extensibility is
 possible using the flexible multi-method dispatch mechanism.  It may even seem
-that the concept of hooks does not provide any benefits over the possibilites
+that the concept of hooks does not provide any benefits over the possibilities
 of CLOS.  However, there are some differences:
 
 @itemize
-- 
cgit v1.2.3


From 028053f295f2ab1653a8bb9aed69c33702eeb1b6 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:51:49 -0700
Subject: gnu: guile-persist: Fix typo.

* gnu/packages/guile-xyx (guile-persist)[synopsis]: Fix spelling of
  "Persistence".
---
 gnu/packages/guile-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 05658e6425..2736b36a38 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2156,7 +2156,7 @@ chunks can be expressions as well as simple tokens.")
          ("libtool" ,libtool)
          ("pkg-config" ,pkg-config)))
       (home-page "https://gitlab.com/tampe/guile-persist")
-      (synopsis "Persistance programming framework for Guile")
+      (synopsis "Persistence programming framework for Guile")
       (description
        "This is a serialization library for serializing objects like classes
 and objects, closures and structs.  This currently does not support
-- 
cgit v1.2.3


From d654ad066ee4c1727bb4cd3c96ca5aca55ad2b65 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:53:40 -0700
Subject: gnu: rust-widestring: Fix typo.

* gnu/packages/crates-io (rust-widestring)[description]: Fix spelling if
  "libraries".
---
 gnu/packages/crates-io.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index e2a404b54d..7a0ea03a67 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -4421,7 +4421,7 @@ in Rust.")
     (synopsis "Wide string Rust FFI library")
     (description
      "A wide string Rust FFI library for converting to and from wide strings,
-such as those often used in Windows API or other FFI libaries.  Both UTF-16 and
+such as those often used in Windows API or other FFI libraries.  Both UTF-16 and
 UTF-32 types are provided, including support for malformed encoding.")
     (license (list license:asl2.0
                    license:expat))))
-- 
cgit v1.2.3


From 947b3ac68bddedaf98b656d8e6d3585e5551794f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 12:58:32 -0700
Subject: gnu: vco-plugins: Fix typo.

* gnu/packages/audio (vco-plugins)[description]: Fix spelling of "rectangle".
---
 gnu/packages/audio.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4dbbace3e3..6eb61583f7 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1024,7 +1024,7 @@ audio signals.")
 @enumerate
 @item Pulse-VCO, a dirac pulse oscillator with flat amplitude spectrum
 @item Saw-VCO, a sawtooth oscillator with 1/F amplitude spectrum
-@item Rec-VCO, a square / rectange oscillator
+@item Rec-VCO, a square / rectangle oscillator
 @end enumerate\n
 
 All oscillators are low-pass filtered to provide waveforms similar to the
-- 
cgit v1.2.3


From f74b6983510aa248ae35727ec50313ac706e13ee Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 13:06:25 -0700
Subject: gnu: packages: Fix typos.

* gnu/packages/emacs-xyz (emacs-litable)[description]: Fix use of singular
  form of "This package".
  (emacs-ssh-config-mode)[description]: Likewise.
* gnu/packages/haskell-xyz (ghc-process-extras)[description]: Likewise.
* gnu/packages/lisp (sbcl-fare-quasiquote-readtable)[description]: Likewise.
* gnu/packages/usb-modeswitch (usb-modeswitch-data)[description]: Likewise.
---
 gnu/packages/emacs-xyz.scm      | 4 ++--
 gnu/packages/haskell-xyz.scm    | 2 +-
 gnu/packages/lisp.scm           | 2 +-
 gnu/packages/usb-modeswitch.scm | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 86653293f9..667a7f5d3c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2704,7 +2704,7 @@ in Lisp modes.")
        `(("emacs-dash" ,emacs-dash)))
       (home-page "https://github.com/Fuco1/litable/")
       (synopsis "Dynamic evaluation replacement with Emacs")
-      (description "This packages provides dynamic evaluation in Emacs.")
+      (description "This package provides dynamic evaluation in Emacs.")
       (license license:gpl3+))))
 
 (define-public emacs-string-inflection
@@ -18337,7 +18337,7 @@ JIRA issue servers.")
       (synopsis
        "Mode for fontification of ~/.ssh/config")
       (description
-       "This packages fontifies the ssh config keywords and creates
+       "This package fontifies the ssh config keywords and creates
 keybindings for skipping from host section to host section.")
       (license license:gpl3+))))
 
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 4313b6059e..a36451fa8c 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -7801,7 +7801,7 @@ examination.")
        ("ghc-listlike" ,ghc-listlike)))
     (home-page "https://github.com/seereason/process-extras")
     (synopsis "Extra tools for managing processes")
-    (description "This packages extends
+    (description "This package extends
 @url{http://hackage.haskell.org/package/process}.  It allows you to read
 process input and output as ByteStrings or Text, or write your own
 ProcessOutput instance.  It also provides lazy process input and output,
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 985ed45465..6c373ce6e2 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6474,7 +6474,7 @@ Trivia.")
 quasiquote is enable matching of quasiquoted patterns, using Optima or
 Trivia.
 
-This packages uses fare-quasiquote with named-readtable.")))
+This package uses fare-quasiquote with named-readtable.")))
 
 (define-public sbcl-trivia.level0
   (let ((commit "902e0c65602bbfe96ae82e679330b3771ddc7603")
diff --git a/gnu/packages/usb-modeswitch.scm b/gnu/packages/usb-modeswitch.scm
index 8f1cf9df60..7e4526ae46 100644
--- a/gnu/packages/usb-modeswitch.scm
+++ b/gnu/packages/usb-modeswitch.scm
@@ -69,7 +69,7 @@
            (install-file (string-append files "/COPYING") license-dir)))))
     (home-page "http://www.draisberghof.de/usb_modeswitch/")
     (synopsis "Data package for USB_ModeSwitch")
-    (description "This packages contains data about devices and a UDEV rules
+    (description "This package contains data about devices and a UDEV rules
 file for use with USB_ModeSwitch.")
     (license license:gpl2+)))
 
-- 
cgit v1.2.3


From a2f6f3b199a93fcac34ae92ebd1c73dd37ff3cd5 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Mon, 23 Sep 2019 13:17:56 -0700
Subject: gnu: r-gplots: Fix typo.

* gnu/packages/statistics (r-gplots)[description]: Fix spelling of "balloon".
---
 gnu/packages/statistics.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 2ffe0a10d6..74eb466066 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -4288,7 +4288,7 @@ including:
 @item enhanced regression diagnostic plots
 @item formula-enabled interface to @code{stats::lowess} function
 @item displaying textual data in plots
-@item baloon plots
+@item balloon plots
 @item plotting \"Venn\" diagrams
 @item displaying Open-Office style plots
 @item plotting multiple data on same region, with separate axes
-- 
cgit v1.2.3


From 4f8c29a75c3647b104c43ebf615d4a63a5e056b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 21:22:28 +0200
Subject: show, search: Add '--load-path'.

* guix/scripts/search.scm (show-help, %options): Add -L/--load-path.
* guix/scripts/show.scm (show-help, %options): Add -L/--load-path.
---
 guix/scripts/search.scm | 11 ++++++++++-
 guix/scripts/show.scm   | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/search.scm b/guix/scripts/search.scm
index 8fceb83668..827b2eb7a9 100644
--- a/guix/scripts/search.scm
+++ b/guix/scripts/search.scm
@@ -19,6 +19,8 @@
 (define-module (guix scripts search)
   #:use-module (guix ui)
   #:use-module (guix scripts package)
+  #:use-module ((guix scripts build)
+                #:select (%standard-build-options))
   #:use-module (guix scripts)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
@@ -36,6 +38,9 @@ This is an alias for 'guix package -s'.\n"))
   (display (G_ "
   -V, --version          display version information and exit"))
   (newline)
+  (display (G_ "
+  -L, --load-path=DIR    prepend DIR to the package module search path"))
+  (newline)
   (show-bug-report-information))
 
 (define %options
@@ -46,7 +51,11 @@ This is an alias for 'guix package -s'.\n"))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-                  (show-version-and-exit "guix search")))))
+                  (show-version-and-exit "guix search")))
+
+        (find (lambda (option)
+                (member "load-path" (option-names option)))
+              %standard-build-options)))
 
 (define (guix-search . args)
   (define (handle-argument arg result)
diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm
index 94f0559358..ef64b5755b 100644
--- a/guix/scripts/show.scm
+++ b/guix/scripts/show.scm
@@ -19,6 +19,8 @@
 (define-module (guix scripts show)
   #:use-module (guix ui)
   #:use-module (guix scripts package)
+  #:use-module ((guix scripts build)
+                #:select (%standard-build-options))
   #:use-module (guix scripts)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
@@ -36,6 +38,9 @@ This is an alias for 'guix package --show='.\n"))
   (display (G_ "
   -V, --version          display version information and exit"))
   (newline)
+  (display (G_ "
+  -L, --load-path=DIR    prepend DIR to the package module search path"))
+  (newline)
   (show-bug-report-information))
 
 (define %options
@@ -46,7 +51,11 @@ This is an alias for 'guix package --show='.\n"))
                   (exit 0)))
         (option '(#\V "version") #f #f
                 (lambda args
-                  (show-version-and-exit "guix show")))))
+                  (show-version-and-exit "guix show")))
+
+        (find (lambda (option)
+                (member "load-path" (option-names option)))
+              %standard-build-options)))
 
 (define (guix-show . args)
   (define (handle-argument arg result)
-- 
cgit v1.2.3


From 7abd5997f41fec38ea1daa9099a9693062f10dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 22:07:53 +0200
Subject: repl, marionette: 'self-quoting?' matches keywords.

* guix/repl.scm (self-quoting?): Add 'keyword?' and 'array?'; remove
'vector?' and 'bytevector?'.
* gnu/tests.scm (marionette-shepherd-service) : Likewise.
: Remove (rnrs bytevector).
---
 gnu/tests.scm | 7 +++----
 guix/repl.scm | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gnu/tests.scm b/gnu/tests.scm
index 0871b4c6f7..27cb39c2b9 100644
--- a/gnu/tests.scm
+++ b/gnu/tests.scm
@@ -87,8 +87,7 @@
             (requirement `(udev ,@requirement))
 
             (modules '((ice-9 match)
-                       (srfi srfi-9 gnu)
-                       (rnrs bytevectors)))
+                       (srfi srfi-9 gnu)))
             (start
              (with-imported-modules imported-modules
                #~(lambda ()
@@ -98,8 +97,8 @@
                                                ((_ pred rest ...)
                                                 (or (pred x)
                                                     (one-of rest ...))))))
-                       (one-of symbol? string? pair? null? vector?
-                               bytevector? number? boolean?)))
+                       (one-of symbol? string? keyword? pair? null? array?
+                               number? boolean?)))
 
                    (match (primitive-fork)
                      (0
diff --git a/guix/repl.scm b/guix/repl.scm
index 5cff5c71e9..1ead18c53b 100644
--- a/guix/repl.scm
+++ b/guix/repl.scm
@@ -17,7 +17,6 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (guix repl)
-  #:use-module (rnrs bytevectors)
   #:use-module (ice-9 match)
   #:export (send-repl-response
             machine-repl))
@@ -37,9 +36,8 @@
                             ((_ pred rest ...)
                              (or (pred x)
                                  (one-of rest ...))))))
-    (one-of symbol? string? pair? null? vector?
-            bytevector? number? boolean?)))
-
+    (one-of symbol? string? keyword? pair? null? array?
+            number? boolean?)))
 
 (define (send-repl-response exp output)
   "Write the response corresponding to the evaluation of EXP to PORT, an
-- 
cgit v1.2.3


From 24ab804ce11fe12ff49cd144a3d9c4bfcf55b41c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 22:17:39 +0200
Subject: gexp: Catch and report non-self-quoting gexp inputs.

Previously we would, for example, generate build scripts in the store;
when trying to run them, we'd get a 'read' error due to the presence
of # syntax in there.

* guix/gexp.scm (gexp->sexp)[self-quoting?]: New procedure.
[reference->sexp]: Check whether the argument in a  box is
self-quoting.  Raise a '&gexp-input-error' condition if it's not.
* tests/gexp.scm ("lower-gexp, non-self-quoting input"): New test.
---
 guix/gexp.scm  | 13 ++++++++++++-
 tests/gexp.scm |  7 +++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index 45cd5869f7..0d0b661c65 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1005,6 +1005,15 @@ references; otherwise, return only non-native references."
                      (target (%current-target-system)))
   "Return (monadically) the sexp corresponding to EXP for the given OUTPUT,
 and in the current monad setting (system type, etc.)"
+  (define (self-quoting? x)
+    (letrec-syntax ((one-of (syntax-rules ()
+                              ((_) #f)
+                              ((_ pred rest ...)
+                               (or (pred x)
+                                   (one-of rest ...))))))
+      (one-of symbol? string? keyword? pair? null? array?
+              number? boolean?)))
+
   (define* (reference->sexp ref #:optional native?)
     (with-monad %store-monad
       (match ref
@@ -1034,8 +1043,10 @@ and in the current monad setting (system type, etc.)"
                                                   #:target target)))
              ;; OBJ must be either a derivation or a store file name.
              (return (expand thing obj output)))))
-        (($  x)
+        (($  (? self-quoting? x))
          (return x))
+        (($  x)
+         (raise (condition (&gexp-input-error (input x)))))
         (x
          (return x)))))
 
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 5c013d838d..50d0948659 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -871,6 +871,13 @@
                    (eq? (derivation-input-derivation (lowered-gexp-guile lexp))
                         (%guile-for-build)))))))
 
+(test-eq "lower-gexp, non-self-quoting input"
+  +
+  (guard (c ((gexp-input-error? c)
+             (gexp-error-invalid-input c)))
+    (run-with-store %store
+      (lower-gexp #~(foo #$+)))))
+
 (test-assertm "gexp->derivation #:references-graphs"
   (mlet* %store-monad
       ((one (text-file "one" (random-text)))
-- 
cgit v1.2.3


From 7b7e5b88fc341ddeada4a8df418767ce4dfca691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 22:23:52 +0200
Subject: gexp: Remove unused procedure.

* guix/gexp.scm (syntax-location-string): Remove.
---
 guix/gexp.scm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index 0d0b661c65..e788fc5981 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1055,19 +1055,6 @@ and in the current monad setting (system type, etc.)"
                    reference->sexp (gexp-references exp))))
     (return (apply (gexp-proc exp) args))))
 
-(define (syntax-location-string s)
-  "Return a string representing the source code location of S."
-  (let ((props (syntax-source s)))
-    (if props
-        (let ((file   (assoc-ref props 'filename))
-              (line   (and=> (assoc-ref props 'line) 1+))
-              (column (assoc-ref props 'column)))
-          (if file
-              (simple-format #f "~a:~a:~a"
-                             file line column)
-              (simple-format #f "~a:~a" line column)))
-        "")))
-
 (define-syntax-rule (define-syntax-parameter-once name proc)
   ;; Like 'define-syntax-parameter' but ensure the top-level binding for NAME
   ;; does not get redefined.  This works around a race condition in a
-- 
cgit v1.2.3


From 46e552cb0f6b7b11600b7c41146f94dce70eee99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 22:58:50 +0200
Subject: services: cuirass: Remove unneeded conditional.

* gnu/services/cuirass.scm (cuirass-shepherd-service): Remove unneeded 'and'.
---
 gnu/services/cuirass.scm | 120 +++++++++++++++++++++++------------------------
 1 file changed, 59 insertions(+), 61 deletions(-)

diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 7bd43cd427..914a0d337f 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -81,70 +81,68 @@
 
 (define (cuirass-shepherd-service config)
   "Return a  for the Cuirass service with CONFIG."
-  (and
-   (cuirass-configuration? config)
-   (let ((cuirass          (cuirass-configuration-cuirass config))
-         (cache-directory  (cuirass-configuration-cache-directory config))
-         (web-log-file     (cuirass-configuration-web-log-file config))
-         (log-file         (cuirass-configuration-log-file config))
-         (user             (cuirass-configuration-user config))
-         (group            (cuirass-configuration-group config))
-         (interval         (cuirass-configuration-interval config))
-         (database         (cuirass-configuration-database config))
-         (ttl              (cuirass-configuration-ttl config))
-         (port             (cuirass-configuration-port config))
-         (host             (cuirass-configuration-host config))
-         (specs            (cuirass-configuration-specifications config))
-         (use-substitutes? (cuirass-configuration-use-substitutes? config))
-         (one-shot?        (cuirass-configuration-one-shot? config))
-         (fallback?        (cuirass-configuration-fallback? config)))
-     (list (shepherd-service
-            (documentation "Run Cuirass.")
-            (provision '(cuirass))
-            (requirement '(guix-daemon networking))
-            (start #~(make-forkexec-constructor
-                      (list (string-append #$cuirass "/bin/cuirass")
-                            "--cache-directory" #$cache-directory
-                            "--specifications"
-                            #$(scheme-file "cuirass-specs.scm" specs)
-                            "--database" #$database
-                            "--ttl" #$(string-append (number->string ttl) "s")
-                            "--interval" #$(number->string interval)
-                            #$@(if use-substitutes? '("--use-substitutes") '())
-                            #$@(if one-shot? '("--one-shot") '())
-                            #$@(if fallback? '("--fallback") '()))
+  (let ((cuirass          (cuirass-configuration-cuirass config))
+        (cache-directory  (cuirass-configuration-cache-directory config))
+        (web-log-file     (cuirass-configuration-web-log-file config))
+        (log-file         (cuirass-configuration-log-file config))
+        (user             (cuirass-configuration-user config))
+        (group            (cuirass-configuration-group config))
+        (interval         (cuirass-configuration-interval config))
+        (database         (cuirass-configuration-database config))
+        (ttl              (cuirass-configuration-ttl config))
+        (port             (cuirass-configuration-port config))
+        (host             (cuirass-configuration-host config))
+        (specs            (cuirass-configuration-specifications config))
+        (use-substitutes? (cuirass-configuration-use-substitutes? config))
+        (one-shot?        (cuirass-configuration-one-shot? config))
+        (fallback?        (cuirass-configuration-fallback? config)))
+    (list (shepherd-service
+           (documentation "Run Cuirass.")
+           (provision '(cuirass))
+           (requirement '(guix-daemon networking))
+           (start #~(make-forkexec-constructor
+                     (list (string-append #$cuirass "/bin/cuirass")
+                           "--cache-directory" #$cache-directory
+                           "--specifications"
+                           #$(scheme-file "cuirass-specs.scm" specs)
+                           "--database" #$database
+                           "--ttl" #$(string-append (number->string ttl) "s")
+                           "--interval" #$(number->string interval)
+                           #$@(if use-substitutes? '("--use-substitutes") '())
+                           #$@(if one-shot? '("--one-shot") '())
+                           #$@(if fallback? '("--fallback") '()))
 
-                      #:environment-variables
-                      (list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
-                            (string-append "GIT_EXEC_PATH=" #$git
-                                           "/libexec/git-core"))
+                     #:environment-variables
+                     (list "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
+                           (string-append "GIT_EXEC_PATH=" #$git
+                                          "/libexec/git-core"))
 
-                      #:user #$user
-                      #:group #$group
-                      #:log-file #$log-file))
-            (stop #~(make-kill-destructor)))
-           (shepherd-service
-            (documentation "Run Cuirass web interface.")
-            (provision '(cuirass-web))
-            (requirement '(guix-daemon networking))
-            (start #~(make-forkexec-constructor
-                      (list (string-append #$cuirass "/bin/cuirass")
-                            "--cache-directory" #$cache-directory
-                            "--specifications"
-                            #$(scheme-file "cuirass-specs.scm" specs)
-                            "--database" #$database
-                            "--ttl" #$(string-append (number->string ttl) "s")
-                            "--web"
-                            "--port" #$(number->string port)
-                            "--listen" #$host
-                            "--interval" #$(number->string interval)
-                            #$@(if use-substitutes? '("--use-substitutes") '())
-                            #$@(if fallback? '("--fallback") '()))
+                     #:user #$user
+                     #:group #$group
+                     #:log-file #$log-file))
+           (stop #~(make-kill-destructor)))
+          (shepherd-service
+           (documentation "Run Cuirass web interface.")
+           (provision '(cuirass-web))
+           (requirement '(guix-daemon networking))
+           (start #~(make-forkexec-constructor
+                     (list (string-append #$cuirass "/bin/cuirass")
+                           "--cache-directory" #$cache-directory
+                           "--specifications"
+                           #$(scheme-file "cuirass-specs.scm" specs)
+                           "--database" #$database
+                           "--ttl" #$(string-append (number->string ttl) "s")
+                           "--web"
+                           "--port" #$(number->string port)
+                           "--listen" #$host
+                           "--interval" #$(number->string interval)
+                           #$@(if use-substitutes? '("--use-substitutes") '())
+                           #$@(if fallback? '("--fallback") '()))
 
-                      #:user #$user
-                      #:group #$group
-                      #:log-file #$web-log-file))
-            (stop #~(make-kill-destructor)))))))
+                     #:user #$user
+                     #:group #$group
+                     #:log-file #$web-log-file))
+           (stop #~(make-kill-destructor))))))
 
 (define (cuirass-account config)
   "Return the user accounts and user groups for CONFIG."
-- 
cgit v1.2.3


From 46a9d88512a706f310e91370b6313085da040d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 22:59:39 +0200
Subject: gnu: cuirass: Update to d27ff21.

* gnu/packages/ci.scm (cuirass): Update to d27ff21.
---
 gnu/packages/ci.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index 608cd0af23..5807c8b68c 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -47,8 +47,8 @@
   #:use-module (guix build-system gnu))
 
 (define-public cuirass
-  (let ((commit "1cd2f9334dde13542732c22753c4ebde61bc95e0")
-        (revision "23"))
+  (let ((commit "d27ff21e430cd38b02bd70a0dc8d60c9c2736f83")
+        (revision "24"))
     (package
       (name "cuirass")
       (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -60,7 +60,7 @@
                 (file-name (string-append name "-" version))
                 (sha256
                  (base32
-                  "0r3x8gv0v89brjqi8r31p6c0mblbaf2kdk2fz99jiab4pir16w87"))))
+                  "166xl9zfy7dm645fk2ln45bvw0y0gy0xw8fb7mprbjz8v95dh27p"))))
       (build-system gnu-build-system)
       (arguments
        '(#:modules ((guix build utils)
-- 
cgit v1.2.3


From 7b3f56f5d7f4d2bb936e1579ed442e7f5b080abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 23 Sep 2019 23:38:59 +0200
Subject: pull: Use ~/.cache/guix/checkouts instead of ~/.cache/guix/pull.

Previously 'channel-news-for-commit' would use the former while 'guix
pull' would use the latter.  Consequently, the first 'guix pull -N'
would clone the repository anew.

* guix/scripts/pull.scm (guix-pull): Remove 'cache', and leave
%REPOSITORY-CACHE-DIRECTORY to its default value.
---
 guix/scripts/pull.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index a7fd36fffc..2b7b991b50 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -764,7 +764,6 @@ Use '~/.config/guix/channels.scm' instead."))
     (with-git-error-handling
      (let* ((opts     (parse-command-line args %options
                                           (list %default-options)))
-            (cache    (string-append (cache-directory) "/pull"))
             (channels (channel-list opts))
             (profile  (or (assoc-ref opts 'profile) %current-profile)))
        (cond ((assoc-ref opts 'query)
@@ -776,8 +775,7 @@ Use '~/.config/guix/channels.scm' instead."))
                 (ensure-default-profile)
                 (with-status-verbosity (assoc-ref opts 'verbosity)
                   (parameterize ((%current-system (assoc-ref opts 'system))
-                                 (%graft? (assoc-ref opts 'graft?))
-                                 (%repository-cache-directory cache))
+                                 (%graft? (assoc-ref opts 'graft?)))
                     (set-build-options-from-command-line store opts)
                     (honor-x509-certificates store)
 
-- 
cgit v1.2.3


From 3f55b7be16c52a298b8b8d79f199119944784ca3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 22:15:54 +0200
Subject: gnu: glm: Update to 0.9.9.6.

* gnu/packages/maths.scm (glm): Update to 0.9.9.6.
[source]: Add patch.
* gnu/packages/patches/glm-restore-install-target.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |   1 +
 gnu/packages/maths.scm                             |   6 +-
 .../patches/glm-restore-install-target.patch       | 574 +++++++++++++++++++++
 3 files changed, 578 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/glm-restore-install-target.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8e535e208b..043469b716 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -895,6 +895,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/glibc-versioned-locpath.patch		\
   %D%/packages/patches/glibc-2.27-git-fixes.patch		\
   %D%/packages/patches/glibc-2.28-git-fixes.patch		\
+  %D%/packages/patches/glm-restore-install-target.patch		\
   %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch		\
   %D%/packages/patches/gmp-arm-asm-nothumb.patch		\
   %D%/packages/patches/gmp-faulty-test.patch			\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 47026ec41b..2e0883a724 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3543,15 +3543,15 @@ Failure to do so will result in a library with poor performance.")
 (define-public glm
   (package
     (name "glm")
-    (version "0.9.9.5")
+    (version "0.9.9.6")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/g-truc/glm/releases/download/"
                            version  "/glm-" version ".zip"))
        (sha256
-        (base32
-         "1vmg7hb4xvsa77zpbwiw6lqc7pyaj56dihx6xriny5b9rrh4iqsg"))))
+        (base32 "1l0pi1qi37mk6s0yrkrw07lspv4gcqnr9ryg3521hrl77ff37dwx"))
+       (patches (search-patches "glm-restore-install-target.patch"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("unzip" ,unzip)))
diff --git a/gnu/packages/patches/glm-restore-install-target.patch b/gnu/packages/patches/glm-restore-install-target.patch
new file mode 100644
index 0000000000..a628030f6f
--- /dev/null
+++ b/gnu/packages/patches/glm-restore-install-target.patch
@@ -0,0 +1,574 @@
+From: Tobias Geerinckx-Rice 
+Date: Mon, 23 Sep 2019 22:01:17 +0200
+Subject: [PATCH] gnu: glm: Restore ‘install’ target.
+
+It was removed in 0.9.9.6, making installation a tedious manual process
+for no clear reason[0].  Restore it for now.
+
+[0]: https://github.com/g-truc/glm/issues/947
+
+diff -Naur glm/cmake/CMakePackageConfigHelpers.cmake glmn/cmake/CMakePackageConfigHelpers.cmake
+--- glm/cmake/CMakePackageConfigHelpers.cmake	1970-01-01 01:00:00.000000000 +0100
++++ glmn/cmake/CMakePackageConfigHelpers.cmake	2019-09-23 00:11:21.418152249 +0200
+@@ -0,0 +1,227 @@
++# - CONFIGURE_PACKAGE_CONFIG_FILE(), WRITE_BASIC_PACKAGE_VERSION_FILE()
++#
++#    CONFIGURE_PACKAGE_CONFIG_FILE(  INSTALL_DESTINATION 
++#                                                   [PATH_VARS   ... ]
++#                                                   [NO_SET_AND_CHECK_MACRO]
++#                                                   [NO_CHECK_REQUIRED_COMPONENTS_MACRO])
++#
++# CONFIGURE_PACKAGE_CONFIG_FILE() should be used instead of the plain
++# CONFIGURE_FILE() command when creating the Config.cmake or -config.cmake
++# file for installing a project or library. It helps making the resulting package
++# relocatable by avoiding hardcoded paths in the installed Config.cmake file.
++#
++# In a FooConfig.cmake file there may be code like this to make the
++# install destinations know to the using project:
++#   set(FOO_INCLUDE_DIR   "@CMAKE_INSTALL_FULL_INCLUDEDIR@" )
++#   set(FOO_DATA_DIR   "@CMAKE_INSTALL_PREFIX@/@RELATIVE_DATA_INSTALL_DIR@" )
++#   set(FOO_ICONS_DIR   "@CMAKE_INSTALL_PREFIX@/share/icons" )
++#   ...logic to determine installedPrefix from the own location...
++#   set(FOO_CONFIG_DIR  "${installedPrefix}/@CONFIG_INSTALL_DIR@" )
++# All 4 options shown above are not sufficient, since the first 3 hardcode
++# the absolute directory locations, and the 4th case works only if the logic
++# to determine the installedPrefix is correct, and if CONFIG_INSTALL_DIR contains
++# a relative path, which in general cannot be guaranteed.
++# This has the effect that the resulting FooConfig.cmake file would work poorly
++# under Windows and OSX, where users are used to choose the install location
++# of a binary package at install time, independent from how CMAKE_INSTALL_PREFIX
++# was set at build/cmake time.
++#
++# Using CONFIGURE_PACKAGE_CONFIG_FILE() helps. If used correctly, it makes the
++# resulting FooConfig.cmake file relocatable.
++# Usage:
++#   1. write a FooConfig.cmake.in file as you are used to
++#   2. insert a line containing only the string "@PACKAGE_INIT@"
++#   3. instead of SET(FOO_DIR "@SOME_INSTALL_DIR@"), use SET(FOO_DIR "@PACKAGE_SOME_INSTALL_DIR@")
++#      (this must be after the @PACKAGE_INIT@ line)
++#   4. instead of using the normal CONFIGURE_FILE(), use CONFIGURE_PACKAGE_CONFIG_FILE()
++#
++# The  and  arguments are the input and output file, the same way
++# as in CONFIGURE_FILE().
++#
++# The  given to INSTALL_DESTINATION must be the destination where the FooConfig.cmake
++# file will be installed to. This can either be a relative or absolute path, both work.
++#
++# The variables  to  given as PATH_VARS are the variables which contain
++# install destinations. For each of them the macro will create a helper variable
++# PACKAGE_. These helper variables must be used
++# in the FooConfig.cmake.in file for setting the installed location. They are calculated
++# by CONFIGURE_PACKAGE_CONFIG_FILE() so that they are always relative to the
++# installed location of the package. This works both for relative and also for absolute locations.
++# For absolute locations it works only if the absolute location is a subdirectory
++# of CMAKE_INSTALL_PREFIX.
++#
++# By default configure_package_config_file() also generates two helper macros,
++# set_and_check() and check_required_components() into the FooConfig.cmake file.
++#
++# set_and_check() should be used instead of the normal set()
++# command for setting directories and file locations. Additionally to setting the
++# variable it also checks that the referenced file or directory actually exists
++# and fails with a FATAL_ERROR otherwise. This makes sure that the created
++# FooConfig.cmake file does not contain wrong references.
++# When using the NO_SET_AND_CHECK_MACRO, this macro is not generated into the
++# FooConfig.cmake file.
++#
++# check_required_components() should be called at the end of the
++# FooConfig.cmake file if the package supports components.
++# This macro checks whether all requested, non-optional components have been found,
++# and if this is not the case, sets the Foo_FOUND variable to FALSE, so that the package
++# is considered to be not found.
++# It does that by testing the Foo__FOUND variables for all requested
++# required components.
++# When using the NO_CHECK_REQUIRED_COMPONENTS option, this macro is not generated
++# into the FooConfig.cmake file.
++#
++# For an example see below the documentation for WRITE_BASIC_PACKAGE_VERSION_FILE().
++#
++#
++#  WRITE_BASIC_PACKAGE_VERSION_FILE( filename VERSION major.minor.patch COMPATIBILITY (AnyNewerVersion|SameMajorVersion|ExactVersion) )
++#
++# Writes a file for use as ConfigVersion.cmake file to .
++# See the documentation of FIND_PACKAGE() for details on this.
++#    filename is the output filename, it should be in the build tree.
++#    major.minor.patch is the version number of the project to be installed
++# The COMPATIBILITY mode AnyNewerVersion means that the installed package version
++# will be considered compatible if it is newer or exactly the same as the requested version.
++# This mode should be used for packages which are fully backward compatible,
++# also across major versions.
++# If SameMajorVersion is used instead, then the behaviour differs from AnyNewerVersion
++# in that the major version number must be the same as requested, e.g. version 2.0 will
++# not be considered compatible if 1.0 is requested.
++# This mode should be used for packages which guarantee backward compatibility within the
++# same major version.
++# If ExactVersion is used, then the package is only considered compatible if the requested
++# version matches exactly its own version number (not considering the tweak version).
++# For example, version 1.2.3 of a package is only considered compatible to requested version 1.2.3.
++# This mode is for packages without compatibility guarantees.
++# If your project has more elaborated version matching rules, you will need to write your
++# own custom ConfigVersion.cmake file instead of using this macro.
++#
++# Internally, this macro executes configure_file() to create the resulting
++# version file. Depending on the COMPATIBILITY, either the file
++# BasicConfigVersion-SameMajorVersion.cmake.in or BasicConfigVersion-AnyNewerVersion.cmake.in
++# is used. Please note that these two files are internal to CMake and you should
++# not call configure_file() on them yourself, but they can be used as starting
++# point to create more sophisticted custom ConfigVersion.cmake files.
++#
++#
++# Example using both configure_package_config_file() and write_basic_package_version_file():
++# CMakeLists.txt:
++#   set(INCLUDE_INSTALL_DIR include/ ... CACHE )
++#   set(LIB_INSTALL_DIR lib/ ... CACHE )
++#   set(SYSCONFIG_INSTALL_DIR etc/foo/ ... CACHE )
++#   ...
++#   include(CMakePackageConfigHelpers)
++#   configure_package_config_file(FooConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake
++#                                 INSTALL_DESTINATION ${LIB_INSTALL_DIR}/Foo/cmake
++#                                 PATH_VARS INCLUDE_INSTALL_DIR SYSCONFIG_INSTALL_DIR)
++#   write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake
++#                                    VERSION 1.2.3
++#                                    COMPATIBILITY SameMajorVersion )
++#   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake
++#           DESTINATION ${LIB_INSTALL_DIR}/Foo/cmake )
++#
++# With a FooConfig.cmake.in:
++#   set(FOO_VERSION x.y.z)
++#   ...
++#   @PACKAGE_INIT@
++#   ...
++#   set_and_check(FOO_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
++#   set_and_check(FOO_SYSCONFIG_DIR "@PACKAGE_SYSCONFIG_INSTALL_DIR@")
++#
++#   check_required_components(Foo)
++
++
++#=============================================================================
++# Copyright 2012 Alexander Neundorf 
++#
++# Distributed under the OSI-approved BSD License (the "License");
++# see accompanying file Copyright.txt for details.
++#
++# This software is distributed WITHOUT ANY WARRANTY; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++# See the License for more information.
++#=============================================================================
++# (To distribute this file outside of CMake, substitute the full
++#  License text for the above reference.)
++
++include(CMakeParseArguments)
++
++include(WriteBasicConfigVersionFile)
++
++macro(WRITE_BASIC_PACKAGE_VERSION_FILE)
++  write_basic_config_version_file(${ARGN})
++endmacro()
++
++
++function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
++  set(options NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO)
++  set(oneValueArgs INSTALL_DESTINATION )
++  set(multiValueArgs PATH_VARS )
++
++  cmake_parse_arguments(CCF "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${ARGN})
++
++  if(CCF_UNPARSED_ARGUMENTS)
++    message(FATAL_ERROR "Unknown keywords given to CONFIGURE_PACKAGE_CONFIG_FILE(): \"${CCF_UNPARSED_ARGUMENTS}\"")
++  endif()
++
++  if(NOT CCF_INSTALL_DESTINATION)
++    message(FATAL_ERROR "No INSTALL_DESTINATION given to CONFIGURE_PACKAGE_CONFIG_FILE()")
++  endif()
++
++  if(IS_ABSOLUTE "${CCF_INSTALL_DESTINATION}")
++    set(absInstallDir "${CCF_INSTALL_DESTINATION}")
++  else()
++    set(absInstallDir "${CMAKE_INSTALL_PREFIX}/${CCF_INSTALL_DESTINATION}")
++  endif()
++  file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${absInstallDir}" "${CMAKE_INSTALL_PREFIX}" )
++
++  foreach(var ${CCF_PATH_VARS})
++    if(NOT DEFINED ${var})
++      message(FATAL_ERROR "Variable ${var} does not exist")
++    else()
++      if(IS_ABSOLUTE "${${var}}")
++        string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${PACKAGE_PREFIX_DIR}"
++                        PACKAGE_${var} "${${var}}")
++      else()
++        set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}")
++      endif()
++    endif()
++  endforeach()
++
++  set(PACKAGE_INIT "
++####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
++get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE)
++")
++
++  if(NOT CCF_NO_SET_AND_CHECK_MACRO)
++    set(PACKAGE_INIT "${PACKAGE_INIT}
++macro(set_and_check _var _file)
++  set(\${_var} \"\${_file}\")
++  if(NOT EXISTS \"\${_file}\")
++    message(FATAL_ERROR \"File or directory \${_file} referenced by variable \${_var} does not exist !\")
++  endif()
++endmacro()
++")
++  endif()
++
++
++  if(NOT CCF_NO_CHECK_REQUIRED_COMPONENTS_MACRO)
++    set(PACKAGE_INIT "${PACKAGE_INIT}
++macro(check_required_components _NAME)
++  foreach(comp \${\${_NAME}_FIND_COMPONENTS})
++    if(NOT \${_NAME}_\${comp}_FOUND)
++      if(\${_NAME}_FIND_REQUIRED_\${comp})
++        set(\${_NAME}_FOUND FALSE)
++      endif()
++    endif()
++  endforeach(comp)
++endmacro()
++")
++  endif()
++
++  set(PACKAGE_INIT "${PACKAGE_INIT}
++####################################################################################")
++
++  configure_file("${_inputFile}" "${_outputFile}" @ONLY)
++
++endfunction()
+diff -Naur glm/cmake/glmBuildConfig.cmake.in glmn/cmake/glmBuildConfig.cmake.in
+--- glm/cmake/glmBuildConfig.cmake.in	1970-01-01 01:00:00.000000000 +0100
++++ glmn/cmake/glmBuildConfig.cmake.in	2019-09-23 00:12:08.090955650 +0200
+@@ -0,0 +1,6 @@
++set(GLM_VERSION "@GLM_VERSION@")
++set(GLM_INCLUDE_DIRS "@CMAKE_CURRENT_SOURCE_DIR@")
++
++if (NOT CMAKE_VERSION VERSION_LESS "3.0")
++    include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
++endif()
+diff -Naur glm/cmake/glmConfig.cmake.in glmn/cmake/glmConfig.cmake.in
+--- glm/cmake/glmConfig.cmake.in	1970-01-01 01:00:00.000000000 +0100
++++ glmn/cmake/glmConfig.cmake.in	2019-09-23 00:12:14.566373412 +0200
+@@ -0,0 +1,9 @@
++set(GLM_VERSION "@GLM_VERSION@")
++
++@PACKAGE_INIT@
++
++set_and_check(GLM_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++
++if (NOT CMAKE_VERSION VERSION_LESS "3.0")
++    include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
++endif()
+diff -Naur glm/cmake/glm.pc.in glmn/cmake/glm.pc.in
+--- glm/cmake/glm.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ glmn/cmake/glm.pc.in	2019-09-23 00:11:59.695710511 +0200
+@@ -0,0 +1,7 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++includedir=${prefix}/include
++
++Name: GLM
++Description: OpenGL Mathematics
++Version: @GLM_VERSION@
++Cflags: -I${includedir}
+diff -Naur glm/cmake/GNUInstallDirs.cmake glmn/cmake/GNUInstallDirs.cmake
+--- glm/cmake/GNUInstallDirs.cmake	1970-01-01 01:00:00.000000000 +0100
++++ glmn/cmake/GNUInstallDirs.cmake	2019-09-23 00:11:47.363819337 +0200
+@@ -0,0 +1,188 @@
++# - Define GNU standard installation directories
++# Provides install directory variables as defined for GNU software:
++#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
++# Inclusion of this module defines the following variables:
++#  CMAKE_INSTALL_      - destination for files of a given type
++#  CMAKE_INSTALL_FULL_ - corresponding absolute path
++# where  is one of:
++#  BINDIR           - user executables (bin)
++#  SBINDIR          - system admin executables (sbin)
++#  LIBEXECDIR       - program executables (libexec)
++#  SYSCONFDIR       - read-only single-machine data (etc)
++#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
++#  LOCALSTATEDIR    - modifiable single-machine data (var)
++#  LIBDIR           - object code libraries (lib or lib64 or lib/ on Debian)
++#  INCLUDEDIR       - C header files (include)
++#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
++#  DATAROOTDIR      - read-only architecture-independent data root (share)
++#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
++#  INFODIR          - info documentation (DATAROOTDIR/info)
++#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
++#  MANDIR           - man documentation (DATAROOTDIR/man)
++#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
++# Each CMAKE_INSTALL_ value may be passed to the DESTINATION options of
++# install() commands for the corresponding file type.  If the includer does
++# not define a value the above-shown default will be used and the value will
++# appear in the cache for editing by the user.
++# Each CMAKE_INSTALL_FULL_ value contains an absolute path constructed
++# from the corresponding destination by prepending (if necessary) the value
++# of CMAKE_INSTALL_PREFIX.
++
++#=============================================================================
++# Copyright 2011 Nikita Krupen'ko 
++# Copyright 2011 Kitware, Inc.
++#
++# Distributed under the OSI-approved BSD License (the "License");
++# see accompanying file Copyright.txt for details.
++#
++# This software is distributed WITHOUT ANY WARRANTY; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++# See the License for more information.
++#=============================================================================
++# (To distribute this file outside of CMake, substitute the full
++#  License text for the above reference.)
++
++# Installation directories
++#
++if(NOT DEFINED CMAKE_INSTALL_BINDIR)
++  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
++  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
++  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
++  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
++  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
++  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
++  set(_LIBDIR_DEFAULT "lib")
++  # Override this default 'lib' with 'lib64' iff:
++  #  - we are on Linux system but NOT cross-compiling
++  #  - we are NOT on debian
++  #  - we are on a 64 bits system
++  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
++  # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
++  # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
++  # See http://wiki.debian.org/Multiarch
++  if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
++      AND NOT CMAKE_CROSSCOMPILING)
++    if (EXISTS "/etc/debian_version") # is this a debian system ?
++       if(CMAKE_LIBRARY_ARCHITECTURE)
++         set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
++       endif()
++    else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
++      if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
++        message(AUTHOR_WARNING
++          "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
++          "Please enable at least one language before including GNUInstallDirs.")
++      else()
++        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
++          set(_LIBDIR_DEFAULT "lib64")
++        endif()
++      endif()
++    endif()
++  endif()
++  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
++  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
++  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
++endif()
++
++if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
++  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
++endif()
++
++#-----------------------------------------------------------------------------
++# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
++# the cache and store the defaults in local variables if the cache values are
++# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
++
++if(NOT CMAKE_INSTALL_DATADIR)
++  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
++  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
++endif()
++
++if(NOT CMAKE_INSTALL_INFODIR)
++  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
++  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
++endif()
++
++if(NOT CMAKE_INSTALL_LOCALEDIR)
++  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
++  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
++endif()
++
++if(NOT CMAKE_INSTALL_MANDIR)
++  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
++  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
++endif()
++
++if(NOT CMAKE_INSTALL_DOCDIR)
++  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
++  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
++endif()
++
++#-----------------------------------------------------------------------------
++
++mark_as_advanced(
++  CMAKE_INSTALL_BINDIR
++  CMAKE_INSTALL_SBINDIR
++  CMAKE_INSTALL_LIBEXECDIR
++  CMAKE_INSTALL_SYSCONFDIR
++  CMAKE_INSTALL_SHAREDSTATEDIR
++  CMAKE_INSTALL_LOCALSTATEDIR
++  CMAKE_INSTALL_LIBDIR
++  CMAKE_INSTALL_INCLUDEDIR
++  CMAKE_INSTALL_OLDINCLUDEDIR
++  CMAKE_INSTALL_DATAROOTDIR
++  CMAKE_INSTALL_DATADIR
++  CMAKE_INSTALL_INFODIR
++  CMAKE_INSTALL_LOCALEDIR
++  CMAKE_INSTALL_MANDIR
++  CMAKE_INSTALL_DOCDIR
++  )
++
++# Result directories
++#
++foreach(dir
++    BINDIR
++    SBINDIR
++    LIBEXECDIR
++    SYSCONFDIR
++    SHAREDSTATEDIR
++    LOCALSTATEDIR
++    LIBDIR
++    INCLUDEDIR
++    OLDINCLUDEDIR
++    DATAROOTDIR
++    DATADIR
++    INFODIR
++    LOCALEDIR
++    MANDIR
++    DOCDIR
++    )
++  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
++    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
++  else()
++    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
++  endif()
++endforeach()
+diff -Naur glm/CMakeLists.txt glmn/CMakeLists.txt
+--- glm/CMakeLists.txt	2019-09-07 14:10:16.000000000 +0200
++++ glmn/CMakeLists.txt	2019-09-23 00:10:29.559815104 +0200
+@@ -4,6 +4,11 @@
+ set(GLM_VERSION "0.9.9")
+ project(glm VERSION ${GLM_VERSION} LANGUAGES CXX)
+ 
++list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
++
++include(GNUInstallDirs)
++include(CMakePackageConfigHelpers)
++
+ enable_testing()
+ 
+ option(GLM_QUIET "No CMake Message" OFF)
+@@ -237,3 +242,62 @@
+ add_subdirectory(glm)
+ add_subdirectory(test)
+ 
++set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm")
++install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++
++
++# CMake automatically adds an architecture compatibility check to make sure
++# 32 and 64 bit code is not accidentally mixed. For a header-only library this
++# is not required. The check can be disabled by temporarily unsetting
++# CMAKE_SIZEOF_VOID_P. In CMake 3.14 and later this can be achieved more cleanly
++# with write_basic_package_version_file(ARCH_INDEPENDENT).
++# TODO: Use this once a newer CMake can be required.
++set(GLM_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
++unset(CMAKE_SIZEOF_VOID_P)
++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion)
++set(CMAKE_SIZEOF_VOID_P ${GLM_SIZEOF_VOID_P})
++
++# build tree package config
++configure_file(cmake/glmBuildConfig.cmake.in glmConfig.cmake @ONLY)
++
++# install tree package config
++configure_package_config_file(
++	cmake/glmConfig.cmake.in
++	${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake
++	INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR}
++	PATH_VARS CMAKE_INSTALL_INCLUDEDIR
++	NO_CHECK_REQUIRED_COMPONENTS_MACRO)
++
++install(FILES
++	"${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake"
++	"${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake"
++	DESTINATION ${GLM_INSTALL_CONFIGDIR})
++
++add_library(glm INTERFACE)
++target_include_directories(glm INTERFACE
++	$
++	$)
++install(TARGETS glm EXPORT glmTargets)
++
++export(EXPORT glmTargets FILE "${CMAKE_CURRENT_BINARY_DIR}/glmTargets.cmake")
++
++install(EXPORT glmTargets FILE glmTargets.cmake DESTINATION ${GLM_INSTALL_CONFIGDIR})
++
++# build pkg-config file
++configure_file("./cmake/glm.pc.in" "glm.pc" @ONLY)
++
++# install pkg-config file
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++
++export(PACKAGE glm)
++
++if(NOT TARGET uninstall)
++	configure_file(
++		${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in
++		${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
++		IMMEDIATE @ONLY)
++
++	add_custom_target(uninstall
++		COMMAND ${CMAKE_COMMAND} -P
++		${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
++endif()
+diff -Naur glm/cmake_uninstall.cmake.in glmn/cmake_uninstall.cmake.in
+--- glm/cmake_uninstall.cmake.in	1970-01-01 01:00:00.000000000 +0100
++++ glmn/cmake_uninstall.cmake.in	2019-09-23 00:12:22.495660449 +0200
+@@ -0,0 +1,26 @@
++if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
++  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
++endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
++
++if (NOT DEFINED CMAKE_INSTALL_PREFIX)
++  set (CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
++endif ()
++ message(${CMAKE_INSTALL_PREFIX})
++
++file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
++string(REGEX REPLACE "\n" ";" files "${files}")
++foreach(file ${files})
++  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
++  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
++    exec_program(
++      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
++      OUTPUT_VARIABLE rm_out
++      RETURN_VALUE rm_retval
++      )
++    if(NOT "${rm_retval}" STREQUAL 0)
++      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
++    endif(NOT "${rm_retval}" STREQUAL 0)
++  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
++    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
++  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
++endforeach(file)
-- 
cgit v1.2.3


From 5192e465ddac7ee712dd7999aa05ad97fac18530 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 23:24:59 +0200
Subject: gnu: xterm: Update to 349.

* gnu/packages/xorg.scm (xterm): Update to 349.
---
 gnu/packages/xorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 352a28a8b1..e5ff271ae9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5788,7 +5788,7 @@ to answer a question.  Xmessage can also exit after a specified time.")
 (define-public xterm
   (package
     (name "xterm")
-    (version "335")
+    (version "349")
     (source (origin
               (method url-fetch)
               (uri (list
@@ -5798,7 +5798,7 @@ to answer a question.  Xmessage can also exit after a specified time.")
                                    name "-" version ".tgz")))
               (sha256
                (base32
-                "15nbgys4s2idhx6jzzc24g9bb1s6yps5fyg2bafvs0gkkcm1ggz0"))))
+                "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts"
-- 
cgit v1.2.3


From 757f01fa4dfdbdcd551fa8cc0dc501d7424e8930 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 23:25:04 +0200
Subject: gnu: xterm: Don't use NAME in source URI.

* gnu/packages/xorg.scm (xterm)[source]: Hard-code NAME.
---
 gnu/packages/xorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e5ff271ae9..48c1e3cebe 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5793,9 +5793,9 @@ to answer a question.  Xmessage can also exit after a specified time.")
               (method url-fetch)
               (uri (list
                     (string-append "http://invisible-mirror.net/archives/xterm/"
-                                   name "-" version ".tgz")
+                                   "xterm-" version ".tgz")
                     (string-append "ftp://ftp.invisible-island.net/xterm/"
-                                   name "-" version ".tgz")))
+                                   "xterm-" version ".tgz")))
               (sha256
                (base32
                 "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir"))))
-- 
cgit v1.2.3


From 1e1efbcc64e93b6f6188ecf7abce990a939f8015 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 23 Sep 2019 23:59:42 +0200
Subject: =?UTF-8?q?doc:=20Remove=20more=20=E2=80=98guixsd=E2=80=99=20remna?=
 =?UTF-8?q?nts.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc/guix.texi (Installing Guix in a VM): Use ‘guix-system.img’ as
image file name.
---
 doc/guix.texi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 093199c63b..9fcce27597 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2431,7 +2431,7 @@ Create a disk image that will hold the installed system.  To make a
 qcow2-formatted disk image, use the @command{qemu-img} command:
 
 @example
-qemu-img create -f qcow2 guixsd.img 50G
+qemu-img create -f qcow2 guix-system.img 50G
 @end example
 
 The resulting file will be much smaller than 50 GB (typically less than
@@ -2444,7 +2444,7 @@ Boot the USB installation image in an VM:
 qemu-system-x86_64 -m 1024 -smp 1 -enable-kvm \
   -net user -net nic,model=virtio -boot menu=on \
   -drive file=guix-system-install-@value{VERSION}.@var{system}.iso \
-  -drive file=guixsd.img
+  -drive file=guix-system.img
 @end example
 
 The ordering of the drives matters.  @code{-enable-kvm} is optional, but
@@ -2460,7 +2460,7 @@ You're now root in the VM, proceed with the installation process.
 @end enumerate
 
 Once installation is complete, you can boot the system that's on your
-@file{guixsd.img} image.  @xref{Running Guix in a VM}, for how to do
+@file{guix-system.img} image.  @xref{Running Guix in a VM}, for how to do
 that.
 
 @node Building the Installation Image
-- 
cgit v1.2.3


From 5d992ed12248e94d6a470146cf60ef577254bed6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:14:57 +0200
Subject: gnu: linux-libre: Update deblobbing scripts.

* gnu/packages/linux.scm (deblob-scripts-4.4): Update to version 4.4.194
and update the 'deblob-check' hash.
(deblob-scripts-5.2, deblob-scripts-4.19)
(deblob-scripts-4.14, deblob-scripts-4.9): Update to versions 5.2.17, 4.19.75,
4.14.146, and 4.9.194 respectively, although the scripts themselves are
unchanged.
---
 gnu/packages/linux.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 95f7d56e41..e8d15822c7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -182,33 +182,33 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
 
 (define deblob-scripts-5.2
   (linux-libre-deblob-scripts
-   "5.2.10"
+   "5.2.17"
    (base32 "076fwxlm6jq6z4vg1xq3kr474zz7qk71r90sf9dnfia3rw2pb4fa")
    (base32 "0d3pp1bqchqc7vnxr1a56km5r0hzjiiipzz2xc3wgjwfi51k9kxc")))
 
 (define deblob-scripts-4.19
   (linux-libre-deblob-scripts
-   "4.19.68"
+   "4.19.75"
    (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy")
    (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za")))
 
 (define deblob-scripts-4.14
   (linux-libre-deblob-scripts
-   "4.14.140"
+   "4.14.146"
    (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6")
    (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n")))
 
 (define deblob-scripts-4.9
   (linux-libre-deblob-scripts
-   "4.9.190"
+   "4.9.194"
    (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg")
    (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w")))
 
 (define deblob-scripts-4.4
   (linux-libre-deblob-scripts
-   "4.4.190"
+   "4.4.194"
    (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw")
-   (base32 "1x40lbiaizksy8z38ax7wpqr9ldgq7qvkxbb0ca98vd1axpklb10")))
+   (base32 "12ac4g3ky8yma8sylmxvvysqvd4hnaqjiwmxrxb6wlxggfd7zkbx")))
 
 (define* (computed-origin-method gexp-promise hash-algo hash
                                  #:optional (name "source")
-- 
cgit v1.2.3


From 9fa18e5dee6e00305c2844ce859d385f381d82dd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:17:59 +0200
Subject: gnu: linux-libre: Update to 5.2.17.

* gnu/packages/linux.scm (linux-libre): Update to 5.2.17.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e8d15822c7..42dff400d2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -350,10 +350,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                         "linux-" version ".tar.xz"))
     (sha256 hash)))
 
-(define-public linux-libre-5.2-version "5.2.16")
+(define-public linux-libre-5.2-version "5.2.17")
 (define-public linux-libre-5.2-pristine-source
   (let ((version linux-libre-5.2-version)
-        (hash (base32 "0xg5jnkmc7b552jrhi200ck7q4hql3az2fpjfwxj3ay8xp4n280c")))
+        (hash (base32 "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
-- 
cgit v1.2.3


From fa470524a43287b1498c4b2a9bc0dc6dd14a8773 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:18:11 +0200
Subject: gnu: linux-libre: Update to 4.19.75.

* gnu/packages/linux.scm (linux-libre): Update to 4.19.75.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 42dff400d2..f873da5b96 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
 
-(define-public linux-libre-4.19-version "4.19.71")
+(define-public linux-libre-4.19-version "4.19.75")
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-        (hash (base32 "1bjwkb7k82l646ryyy0jbwsnygm2qsxgcwli8bdrj844skzynlqz")))
+        (hash (base32 "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
-- 
cgit v1.2.3


From cce20ea6a03386e74b4c6eed887f6fb2f8d54280 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:18:20 +0200
Subject: gnu: linux-libre: Update to 4.14.146.

* gnu/packages/linux.scm (linux-libre): Update to 4.14.146.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f873da5b96..f03ae5ea72 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
 
-(define-public linux-libre-4.14-version "4.14.142")
+(define-public linux-libre-4.14-version "4.14.146")
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-        (hash (base32 "1wwhnm1n1b6yzsd2zzzf9i3n4hlvgnph70p67cwahw0ik4ssayz6")))
+        (hash (base32 "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
-- 
cgit v1.2.3


From 21d9c5774561be5680acf67e574b7b7ac9093a28 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:18:31 +0200
Subject: gnu: linux-libre: Update to 4.9.194.

* gnu/packages/linux.scm (linux-libre): Update to 4.9.194.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f03ae5ea72..072c51e755 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -374,10 +374,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
 
-(define-public linux-libre-4.9-version "4.9.191")
+(define-public linux-libre-4.9-version "4.9.194")
 (define-public linux-libre-4.9-pristine-source
   (let ((version linux-libre-4.9-version)
-        (hash (base32 "1g5p736p8zx5rmxaj56yw93jp768npl868jsn8973dny0rsbim6y")))
+        (hash (base32 "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
-- 
cgit v1.2.3


From 0b3daeb05e1b1aa3a58eba22df7336e4b8f3f79a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:18:43 +0200
Subject: gnu: linux-libre: Update to 4.4.194.

* gnu/packages/linux.scm (linux-libre): Update to 4.4.194.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 072c51e755..f8ad96e89d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -382,10 +382,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
 
-(define-public linux-libre-4.4-version "4.4.191")
+(define-public linux-libre-4.4-version "4.4.194")
 (define-public linux-libre-4.4-pristine-source
   (let ((version linux-libre-4.4-version)
-        (hash (base32 "0x3lnq4xyj5v6r1cz4jizm4vdspws1nb806f5qczwi3yil5nm6bh")))
+        (hash (base32 "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.4)))
-- 
cgit v1.2.3


From 525961cd438c7ed2d763c91c16dfd06a4fc10628 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:35:43 +0200
Subject: gnu: ethtool: Update to 5.3.

* gnu/packages/networking.scm (ethtool): Update to 5.3.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6bdf7f9e2f..c37d07ea41 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -420,14 +420,14 @@ receiving NDP messages.")
 (define-public ethtool
   (package
     (name "ethtool")
-    (version "4.19")
+    (version "5.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kernel.org/software/network/"
                                   "ethtool/ethtool-" version ".tar.xz"))
               (sha256
                (base32
-                "1j6hyr809af2m3gqm11hdfwks5kljqy1ikspq3d9rhj29qv6r2mi"))))
+                "1i14zrg4a84zjpwvqi8an0zx0hm06g614a79zc2syrkhrvdw1npk"))))
     (build-system gnu-build-system)
     (home-page "https://www.kernel.org/pub/software/network/ethtool/")
     (synopsis "Display or change Ethernet device settings")
-- 
cgit v1.2.3


From 88808152d993ea170126ec41905a889227905873 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 02:37:35 +0200
Subject: gnu: qpdf: Update to 9.0.1.

* gnu/packages/pdf.scm (qpdf): Update to 9.0.1.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index d45a78222c..7cc6b4e77f 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -668,14 +668,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files
 (define-public qpdf
   (package
    (name "qpdf")
-   (version "8.4.0")
+   (version "9.0.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version
                                 "/qpdf-" version ".tar.gz"))
             (sha256
              (base32
-              "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"))
+              "0lhgb82s2402ad2yiswkj227vjlw9zypphdfdivfkbril7dg6495"))
             (modules '((guix build utils)))
             (snippet
              ;; Replace shebang with the bi-lingual shell/Perl trick to remove
-- 
cgit v1.2.3


From e2d69addf6f703f0b04d76988edcd6d5a84cb37b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 03:13:38 +0200
Subject: Revert "gnu: qpdf: Update to 9.0.1."

This reverts commit 88808152d993ea170126ec41905a889227905873.
It was intended for staging.
---
 gnu/packages/pdf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 7cc6b4e77f..d45a78222c 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -668,14 +668,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files
 (define-public qpdf
   (package
    (name "qpdf")
-   (version "9.0.1")
+   (version "8.4.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://sourceforge/qpdf/qpdf/" version
                                 "/qpdf-" version ".tar.gz"))
             (sha256
              (base32
-              "0lhgb82s2402ad2yiswkj227vjlw9zypphdfdivfkbril7dg6495"))
+              "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"))
             (modules '((guix build utils)))
             (snippet
              ;; Replace shebang with the bi-lingual shell/Perl trick to remove
-- 
cgit v1.2.3


From f1afdaf4766fb18911efddb778308b6a306e73d1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 06:55:46 +0200
Subject: gnu: java-dom4j: Update to 2.1.1.

* gnu/packages/xml.scm (java-dom4j): Update to 2.1.1.
---
 gnu/packages/xml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c2faa4cbc0..3603bee4b7 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1754,7 +1754,7 @@ package is in maintenance mode.")
 (define-public java-dom4j
   (package
     (name "java-dom4j")
-    (version "2.1.0")
+    (version "2.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1763,7 +1763,7 @@ package is in maintenance mode.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1827jljs8mps489fm7xw63cakdqwc5grilrr5n9spr2rlk76jpx3"))
+                "0q907srj9v4hwicpcrn4slyld5npf2jv7hzchsgrg29q2xmbwkdl"))
               (modules '((guix build utils)))
               (snippet
                 '(begin ;; Delete bundled jar archives.
-- 
cgit v1.2.3


From 1c6884eeb3dbc20cc61e3e5d55acd0b66f9af374 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 07:06:19 +0200
Subject: gnu: sxhkd: Update to 0.6.1.

* gnu/packages/xdisorg.scm (sxhkd): Update to 0.6.1.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 7026c7eb03..690a82ee90 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -810,7 +810,7 @@ Guile will work for XBindKeys.")
 (define-public sxhkd
   (package
     (name "sxhkd")
-    (version "0.6.0")
+    (version "0.6.1")
     (source
      (origin
        (method git-fetch)
@@ -818,7 +818,7 @@ Guile will work for XBindKeys.")
              (url "https://github.com/baskerville/sxhkd")
              (commit version)))
        (sha256
-        (base32 "1cz4vkm7fqd51ly9qjkf5q76kdqdzfhaajgvrs4anz5dyzrdpw68"))))
+        (base32 "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h"))))
     (build-system gnu-build-system)
     (inputs
      `(("asciidoc" ,asciidoc)
-- 
cgit v1.2.3


From b60ffcee067334b816dc7e83ff9e01f8ec2a368a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 07:17:32 +0200
Subject: gnu: mako: Update to 1.4.

* gnu/packages/wm.scm (mako): Update to 1.4.
---
 gnu/packages/wm.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e19c6c1438..72be0bdbe1 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1436,7 +1436,7 @@ Wlroots based compositors.")
 (define-public mako
   (package
     (name "mako")
-    (version "1.3")
+    (version "1.4")
     (source
      (origin
        (method git-fetch)
@@ -1445,7 +1445,7 @@ Wlroots based compositors.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "17azdc37xsbmx13fkfp23vg9lznrv9fh6nhagn64wdq3nhsxm3b6"))))
+        (base32 "11ymiq6cr2ma0iva1mqybn3j6k73bsc6lv6pcbdq7hkhd4f9b7j9"))))
     (build-system meson-build-system)
     (inputs `(("cairo" ,cairo)
               ("elogind" ,elogind)
-- 
cgit v1.2.3


From f9447dedc50489f36022c60763868edbd0aa570e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 24 Sep 2019 07:09:14 +0200
Subject: gnu: sxhkd: Sensibly name source checkout.

* gnu/packages/xdisorg.scm (sxhkd)[source]: Use GIT-FILE-NAME.
---
 gnu/packages/xdisorg.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 690a82ee90..066804ed9e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -817,6 +817,7 @@ Guile will work for XBindKeys.")
        (uri (git-reference
              (url "https://github.com/baskerville/sxhkd")
              (commit version)))
+       (file-name (git-file-name name version))
        (sha256
         (base32 "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h"))))
     (build-system gnu-build-system)
-- 
cgit v1.2.3


From 2d25b0c8bad3f0b9c5ccb91f5c4430d8245f4061 Mon Sep 17 00:00:00 2001
From: Brant Gardner 
Date: Tue, 2 Apr 2019 11:09:45 -0500
Subject: gnu: Add boinc-client and boinc-server.

* gnu/packages/distributed.scm (boinc-client, boinc-server): New variable.

Signed-off-by: Brian Leung 
---
 gnu/packages/distributed.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 gnu/packages/distributed.scm

diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm
new file mode 100644
index 0000000000..0eaa1d8b83
--- /dev/null
+++ b/gnu/packages/distributed.scm
@@ -0,0 +1,95 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Brant Gardner 
+;;;
+;;; 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 .
+
+(define-module (gnu packages distributed)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz))
+
+(define-public boinc-client
+  (package
+    (name "boinc-client")
+    (version "7.16.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/boinc/boinc.git")
+                    (commit (string-append "client_release/"
+                                           "7.16/"
+                                           version))))
+              (sha256
+               (base32
+                "0w2qimcwyjhapk3z7zyq7jkls23hsnmm35iw7m4s4if04fp70dx0"))))
+    (build-system gnu-build-system)
+    (arguments '(#:configure-flags '("--disable-server")))
+    (inputs `(("openssl" ,openssl)
+              ("curl" ,curl)
+              ("wxwidgets" ,wxwidgets)
+              ("gtk+" ,gtk+)
+              ("gdk-pixbuf" ,gdk-pixbuf)
+              ("libnotify" ,libnotify)
+              ("sqlite" ,sqlite)
+              ("python" ,python)
+              ("python-pyserial" ,python-pyserial)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
+    (synopsis "BOINC lets you help cutting-edge science research using your computer")
+    (description "BOINC is a platform for high-throughput computing on a large
+scale (thousands or millions of computers).  It can be used for volunteer
+computing (using consumer devices) or grid computing (using organizational
+resources).  It supports virtualized, parallel, and GPU-based applications.
+
+BOINC is distributed under the LGPL open source license.  It can be used for
+commercial purposes, and applications need not be open source.")
+    (home-page "https://boinc.berkeley.edu/")
+    (license license:gpl3+)))
+
+(define-public boinc-server
+  (package (inherit boinc-client)
+    (name "boinc-server")
+    (arguments '(#:configure-flags '("--disable-client" "--disable-manager")
+                 #:parallel-build? #f
+                 #:tests? #f)) ; FIXME: Looks like bad test syntax in the
+                               ; source package, 2 tests fail.  Disable for
+                               ; now.
+    (inputs `(("openssl" ,openssl)
+              ("curl" ,curl)
+              ("mariadb" ,mariadb)
+              ("zlib" ,zlib)))
+    (propagated-inputs `(("python" ,python-wrapper)
+                         ("perl" ,perl)))))
-- 
cgit v1.2.3


From 3b98e71a4b8bd549736d8c30f7ddf10928217af3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 24 Sep 2019 10:07:43 +0300
Subject: gnu: Register (gnu packages distributed).

This is a follow-up to 2d25b0c8bad3f0b9c5ccb91f5c4430d8245f4061.

* gnu/local.mk (GNU_SYSTEM_MODULES): Add (gnu packages distributed).
---
 gnu/local.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 043469b716..0e279d8303 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -146,7 +146,8 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/diffoscope.scm			\
   %D%/packages/digest.scm			\
   %D%/packages/direct-connect.scm		\
-  %D%/packages/disk.scm				\
+  %D%/packages/disk.scm			\
+  %D%/packages/distributed.scm			\
   %D%/packages/display-managers.scm		\
   %D%/packages/django.scm			\
   %D%/packages/djvu.scm				\
-- 
cgit v1.2.3


From 2395d863de36937016d29a008d18f65e32a9594e Mon Sep 17 00:00:00 2001
From: Brett Gilio 
Date: Wed, 20 Mar 2019 17:02:04 -0500
Subject: gnu: emacs-rust-mode: Update to 0.4.0.

* gnu/packages/emacs-xyz.scm (emacs-rust-mode): Update to 0.4.0.

Signed-off-by: Brian Leung 
---
 gnu/packages/emacs-xyz.scm | 54 +++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 667a7f5d3c..15fef73d3d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15066,37 +15066,31 @@ files.  It focuses on highlighting the document to improve readability.")
     (license license:gpl2+)))
 
 (define-public emacs-rust-mode
-  (let ((commit
-         ;; Last release is old (2016), use more recent commit to get bug
-         ;; fixes.
-         "64b4a2450e4d4c47f6307851c9b2598cd2254d68")
-        (revision "0"))
-    (package
-      (name "emacs-rust-mode")
-      (version (git-version "0.3.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri
-                 (git-reference
-                  (url "https://github.com/rust-lang/rust-mode")
-                  (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "0pbz36lljgb7bdgx3h3g0pq1nss1kvn8mhk1l3mknsmynd6w4nd8"))))
-      (build-system emacs-build-system)
-      (arguments
-       `(#:phases
-         (modify-phases %standard-phases
-           (replace 'check
-             (lambda _
-               (invoke "sh" "run_rust_emacs_tests.sh"))))))
-      (home-page "https://github.com/rust-lang/rust-mode")
-      (synopsis "Major Emacs mode for editing Rust source code")
-      (description "This package provides a major Emacs mode for editing Rust
+  (package
+    (name "emacs-rust-mode")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/rust-lang/rust-mode")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0bcrklyicxh032rrp585rl5mxd26nb61dp6r5bl935rlcmxzsczh"))))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "sh" "run_rust_emacs_tests.sh"))))))
+    (home-page "https://github.com/rust-lang/rust-mode")
+    (synopsis "Major Emacs mode for editing Rust source code")
+    (description "This package provides a major Emacs mode for editing Rust
 source code.")
-      (license (list license:expat
-                     license:asl2.0)))))
+    (license (list license:expat
+                   license:asl2.0))))
 
 (define-public emacs-ztree
   (let ((commit "c54425a094353ec40a8179f9eab3596f76c6cf94"))
-- 
cgit v1.2.3


From 5c1547383f1d8fca1e46a1a3a17e90b61ece915c Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Tue, 24 Sep 2019 09:44:49 +0200
Subject: gnu: Add mojoshader.

* gnu/packages/gl.scm (mojoshader): New variable.
---
 gnu/packages/gl.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index a2658a6789..c05ce4e06a 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2017 Arun Isaac 
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
+;;; Copyright © 2019 Pierre Neidhardt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -52,6 +53,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix hg-download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system meson)
@@ -801,3 +803,56 @@ applications to 3D accelerator hardware in a dedicated server and displays the
 rendered output interactively to a thin client located elsewhere on the
 network.")
     (license license:wxwindows3.1+)))
+
+(define-public mojoshader
+  (let ((changeset "5887634ea695"))
+    (package
+      (name "mojoshader")
+      (version changeset)
+      (source
+       (origin
+         (method hg-fetch)
+         (uri (hg-reference
+               (url "https://hg.icculus.org/icculus/mojoshader/")
+               (changeset changeset)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0ibl4z1696jiifv9j5drir7jm0b5px0vwkwckbi7cfd46p7p6wcy"))))
+      (arguments
+       ;; Tests only for COMPILER_SUPPORT=ON.
+       `(#:tests? #f
+         #:configure-flags '("-DBUILD_SHARED=ON")
+         #:phases
+         (modify-phases %standard-phases
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (lib (string-append out "/lib"))
+                      (header (string-append out "/include")))
+                 (install-file "libmojoshader.so" lib)
+                 (for-each (lambda (f)
+                             (install-file f header))
+                           (find-files "../source" "mojoshader.*\\.h$"))
+                 (let ((profiles-header (string-append header "/profiles")))
+                   (mkdir-p profiles-header)
+                   (rename-file (string-append header "/mojoshader_profile.h")
+                                (string-append profiles-header "/mojoshader_profile.h"))))
+               #t)))))
+      (build-system cmake-build-system)
+      (home-page "https://www.icculus.org/mojoshader/")
+      (synopsis "Work with Direct3D shaders on alternate 3D APIs")
+      (description "MojoShader is a library to work with Direct3D shaders on
+alternate 3D APIs and non-Windows platforms.  The primary motivation is moving
+shaders to OpenGL languages on the fly.  The developer deals with \"profiles\"
+that represent various target languages, such as GLSL or ARB_*_program.
+
+This allows a developer to manage one set of shaders, presumably written in
+Direct3D HLSL, and use them across multiple rendering backends.  This also
+means that the developer only has to worry about one (offline) compiler to
+manage program complexity, while MojoShader itself deals with the reduced
+complexity of the bytecode at runtime.
+
+MojoShader provides both a simple API to convert bytecode to various profiles,
+and (optionally) basic glue to rendering APIs to abstract the management of
+the shaders at runtime.")
+      (license license:zlib))))
-- 
cgit v1.2.3


From 61522fd967c6d7cc9ecbc916db538b887e78dd72 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 09:59:00 +0200
Subject: gnu: emacs-rainbow-delimiters: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-rainbow-delimiters): Enable tests.
[source] Use GIT-FETCH and GIT-FILE-NAME.
---
 gnu/packages/emacs-xyz.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 15fef73d3d..1a639491ef 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6184,16 +6184,21 @@ completion, interactive development and more.")
     (name "emacs-rainbow-delimiters")
     (version "2.1.3")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://raw.githubusercontent.com/Fanael"
-                                  "/rainbow-delimiters/" version
-                                  "/rainbow-delimiters.el"))
-              (file-name (string-append "rainbow-delimiters-" version ".el"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Fanael/rainbow-delimiters.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1b3kampwsjabhcqdp0khgff13wc5jqhy3rbvaa12vnv7qy22l9ck"))))
+                "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/Fanael/rainbow-delimiters")
+    (arguments
+     `(#:tests? #t
+       #:test-command '("emacs" "-Q" "-batch"
+                        "-l" "rainbow-delimiters-test.el"
+                        "-f" "ert-run-tests-batch-and-exit")))
     (synopsis "Highlight brackets according to their depth")
     (description
      "Rainbow-delimiters is a \"rainbow parentheses\"-like mode for Emacs which
-- 
cgit v1.2.3


From d9de8fbbab2143e6d576ed379e0b35c6d1955714 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Tue, 24 Sep 2019 10:23:52 +0200
Subject: gnu: asymptote: Update to 2.53.

* gnu/packages/plotutils.scm (asymptote): Update to 2.53.
---
 gnu/packages/plotutils.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 88bc6b3dc6..43bed8c315 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -180,14 +180,14 @@ colors, styles, options and details.")
 (define-public asymptote
   (package
     (name "asymptote")
-    (version "2.49")
+    (version "2.53")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/asymptote/"
                                   version "/asymptote-" version ".src.tgz"))
               (sha256
                (base32
-                "1vljhq68gyc2503l9fj76rk1q4a4db9a1sp3fdfagqqmirnmybp5"))))
+                "0ysj6b3ffifbraflkixh19hmdh3qjij26wyj4z66085qw17v7qkw"))))
     (build-system gnu-build-system)
     ;; Note: The 'asy' binary retains a reference to docdir for use with its
     ;; "help" command in interactive mode, so adding a "doc" output is not
@@ -199,6 +199,8 @@ colors, styles, options and details.")
        ("texinfo" ,texinfo)           ;For generating documentation
        ;; For the manual and the tests.
        ("texlive" ,(texlive-union (list texlive-amsfonts
+                                        texlive-epsf
+                                        texlive-latex-base
                                         texlive-latex-geometry
                                         texlive-latex-graphics
                                         texlive-latex-oberdiek ; for ifluatex
-- 
cgit v1.2.3


From 09b2ae95c800b8da1ecc9e12f79421302a1bde33 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 11:02:36 +0200
Subject: gnu: emacs-evil-surround: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-evil-surround): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1a639491ef..ce5ae1ca5a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8931,6 +8931,9 @@ pressed simultaneously or a single key quickly pressed twice.")
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-evil" ,emacs-evil)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("make" "test")))
     (home-page "https://github.com/emacs-evil/evil-surround")
     (synopsis "Easily modify surrounding parentheses and quotes")
     (description "@code{emacs-evil-surround} allows easy deletion, change and
-- 
cgit v1.2.3


From 85dfecbedc55a450b12a17d98a0fe70e0c193790 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 11:16:42 +0200
Subject: gnu: emacs-stream: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-stream): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ce5ae1ca5a..92c91a0537 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7457,15 +7457,22 @@ editing nginx config files.")
   (package
     (name "emacs-stream")
     (version "2.2.0")
-    (home-page "https://github.com/NicolasPetton/stream")
     (source
      (origin
-       (method url-fetch)
-       (file-name (string-append name "-" version ".tar.gz"))
-       (uri (string-append home-page "/archive/"version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/NicolasPetton/stream.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "03ql4nqfz5pn55mjly6clhvc3g7x2d28kj7mrlqmigvjbql39xxc"))))
+        (base32 "10x481lmkcmjrmdnlbqvys2b3525npn4a84j6g404pv4sfwlj6ab"))))
     (build-system emacs-build-system)
+    (arguments
+     `(#:tests? #t
+       #:test-command '("emacs" "--batch"
+                        "-l" "test/stream-tests.el"
+                        "-f" "ert-run-tests-batch-and-exit")))
+    (home-page "https://github.com/NicolasPetton/stream")
     (synopsis "Implementation of streams for Emacs")
     (description "This library provides an implementation of streams for Emacs.
 Streams are implemented as delayed evaluation of cons cells.")
-- 
cgit v1.2.3


From 3429f5d923300675a8ffa28b2d4cb1bd66ae452e Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Tue, 24 Sep 2019 11:27:31 +0200
Subject: gnu: mojoshader: Broaden feature support (viewport flipping and depth
 clipping).

* gnu/packages/gl.scm (mojoshader)[arguments]: Build with FLIP_VIEWPORT and
  DEPTH_CLIPPING.
---
 gnu/packages/gl.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index c05ce4e06a..c02d88694c 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -808,7 +808,7 @@ network.")
   (let ((changeset "5887634ea695"))
     (package
       (name "mojoshader")
-      (version changeset)
+      (version (string-append "20190825" "-" changeset))
       (source
        (origin
          (method hg-fetch)
@@ -821,7 +821,9 @@ network.")
       (arguments
        ;; Tests only for COMPILER_SUPPORT=ON.
        `(#:tests? #f
-         #:configure-flags '("-DBUILD_SHARED=ON")
+         #:configure-flags '("-DBUILD_SHARED=ON"
+                             "-DFLIP_VIEWPORT=ON"
+                             "-DDEPTH_CLIPPING=ON")
          #:phases
          (modify-phases %standard-phases
            (replace 'install
-- 
cgit v1.2.3


From b150e83bef766ca67a3931afce36b6cb6c7f8c10 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Tue, 24 Sep 2019 11:32:45 +0200
Subject: gnu: Add mojoshader-with-viewport-flip.

* gnu/packages/gl.scm (mojoshader-with-viewport-flip): New variable.
---
 gnu/packages/gl.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index c02d88694c..bfa80b1e13 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -858,3 +858,26 @@ MojoShader provides both a simple API to convert bytecode to various profiles,
 and (optionally) basic glue to rendering APIs to abstract the management of
 the shaders at runtime.")
       (license license:zlib))))
+
+(define-public mojoshader-with-viewport-flip
+  ;; Changeset c586d4590241 replaced glProgramViewportFlip with
+  ;; glProgramViewportInfo.
+  ;; https://hg.icculus.org/icculus/mojoshader/rev/c586d4590241
+  (let ((changeset "2e37299b13d8"))
+    (package
+      (inherit mojoshader)
+      (name "mojoshader-with-viewport-flip")
+      (version (string-append "20190725" "-" changeset))
+      (source
+       (origin
+         (method hg-fetch)
+         (uri (hg-reference
+               (url "https://hg.icculus.org/icculus/mojoshader/")
+               (changeset changeset)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0ffws7cqbskxwc3hjsnnzq4r2bbf008kdr3b11pa3kr7dsi50y6i"))))
+      (synopsis "Work with Direct3D shaders on alternate 3D APIs (with viewport flip)")
+      (description "This is the last version of the mojoshader library with
+the glProgramViewportFlip before it was replaced with glProgramViewportInfo.")
+      (license license:zlib))))
-- 
cgit v1.2.3


From 8f5e835b0e51a1af173bb969f19c5f1385818b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 24 Sep 2019 13:52:24 +0200
Subject: news: Add entry for the reduced binary seed bootstrap.

* etc/news.scm: Add entry for cdd3bcf03883d129581a79e6d6611b2afd3b277b.
---
 etc/news.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/etc/news.scm b/etc/news.scm
index 736e8b5516..dc02b23067 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -8,6 +8,16 @@
 
 (channel-news
  (version 0)
+
+ (entry (commit "cdd3bcf03883d129581a79e6d6611b2afd3b277b")
+        (title (en "New reduced binary seed bootstrap"))
+        (body
+         (en "The package graph on x86_64 and i686 is now rooted in a
+@dfn{reduced set of binary seeds}.  The initial set of binaries from which
+packages are built now weighs in at approximately 130 MiB, half of what it
+used to be.  Run @code{info \"(guix) Bootstrapping\"} to learn more, or watch
+the talk at @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")))
+
  (entry (commit "dcc90d15581189dbc30e201db2b807273d6484f0")
         (title (en "New channel news mechanism")
                (de "Neuer Mechanismus, um Neuigkeiten über Kanäle anzuzeigen.")
-- 
cgit v1.2.3


From f77993bb50ad2bb02664697d81d4b12f2a0923b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 24 Sep 2019 14:00:58 +0200
Subject: gnu: Add locale packages for glibc 2.28.

* gnu/packages/base.scm (glibc-locales-2.28, glibc-utf8-locales-2.28):
New variables.
(glibc-locales-2.27, glibc-utf8-locales-2.27): Deprecate.
---
 gnu/packages/base.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index ebaa93f092..4e80a2fadb 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1126,12 +1126,19 @@ test environments.")
 (define-public glibc-utf8-locales
   (make-glibc-utf8-locales glibc))
 
-(define-public glibc-locales-2.27
-  (package (inherit (make-glibc-locales glibc-2.27))
-           (name "glibc-locales-2.27")))
+;; Packages provided to ease use of binaries linked against the previous libc.
+(define-public glibc-locales-2.28
+  (package (inherit (make-glibc-locales glibc-2.28))
+           (name "glibc-locales-2.28")))
+(define-public glibc-utf8-locales-2.28
+  (package (inherit (make-glibc-utf8-locales glibc-2.28))
+           (name "glibc-utf8-locales-2.28")))
+
+;; These should no longer be needed.
 (define-public glibc-utf8-locales-2.27
-  (package (inherit (make-glibc-utf8-locales glibc-2.27))
-           (name "glibc-utf8-locales-2.27")))
+  (deprecated-package "glibc-utf8-locales-2.27" glibc-utf8-locales-2.28))
+(define-public glibc-locales-2.27
+  (deprecated-package "glibc-locales-2.27" glibc-locales-2.28))
 
 (define-public which
   (package
-- 
cgit v1.2.3


From 2cf9798e1688c28d33d12d360e7869207eca18d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 24 Sep 2019 14:18:37 +0200
Subject: news: Add entry for the glibc upgrade.

* etc/news.scm: Add entry for 5f3f70391809f8791c55c05bd1646bc58508fa2c.
---
 etc/news.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/etc/news.scm b/etc/news.scm
index dc02b23067..69418756df 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -9,6 +9,21 @@
 (channel-news
  (version 0)
 
+ (entry (commit "5f3f70391809f8791c55c05bd1646bc58508fa2c")
+        (title (en "GNU C Library upgraded"))
+        (body
+         (en "The GNU C Library (glibc) has been upgraded to version 2.29.  To
+run previously-installed programs linked against glibc 2.28, you need to
+install locale data for version 2.28 in addition to locale data for 2.29:
+
+@example
+guix install glibc-locales glibc-locales-2.28
+@end example
+
+On Guix System, you can adjust the @code{locale-libcs} field of your
+@code{operating-system} form.  Run @code{info \"(guix) Locales\"}, for more
+info.")))
+
  (entry (commit "cdd3bcf03883d129581a79e6d6611b2afd3b277b")
         (title (en "New reduced binary seed bootstrap"))
         (body
-- 
cgit v1.2.3


From 24f7bac02a70257a7cd1bb2e1ec35d7cc753057e Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Tue, 24 Sep 2019 19:18:58 +0200
Subject: gnu: openscenegraph: Update to 3.6.4 and build JPEG plugin.

* gnu/packages/graphics.scm (openscenegraph): Update to 3.6.4.
[inputs]: Add libjpeg.
---
 gnu/packages/graphics.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index cd33ea2800..d4e9adb84a 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Carlo Zancanaro 
 ;;; Copyright © 2019 Steve Sprang 
 ;;; Copyright © 2019 John Soo 
+;;; Copyright © 2019 Pierre Neidhardt 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -510,7 +511,7 @@ visual effects work for film.")
 (define-public openscenegraph
   (package
     (name "openscenegraph")
-    (version "3.6.3")
+    (version "3.6.4")
     (source
      (origin
        (method git-fetch)
@@ -519,7 +520,7 @@ visual effects work for film.")
              (commit (string-append "OpenSceneGraph-" version))))
        (sha256
         (base32
-         "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q"))
+         "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785"))
        (file-name (git-file-name name version))))
     (properties
      `((upstream-name . "OpenSceneGraph")))
@@ -538,6 +539,7 @@ visual effects work for film.")
        ("unzip" ,unzip)))
     (inputs
      `(("giflib" ,giflib)
+       ("libjpeg" ,libjpeg)             ; Required for the JPEG texture plugin.
        ("jasper" ,jasper)
        ("librsvg" ,librsvg)
        ("libxrandr" ,libxrandr)
-- 
cgit v1.2.3


From f95ec65be394538c9ec848e502a37f1c3ec21157 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Tue, 24 Sep 2019 19:21:59 +0200
Subject: gnu: openmw: Use OpenMW's fork of openscenegraph.

* gnu/packages/game-development.scm (openmw)[inputs]: Replace openscenegraph
  with openmw-openscenegraph.
---
 gnu/packages/game-development.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index bb4c1d26bb..ee9e63ea29 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1109,6 +1109,40 @@ of use.")
                '("ogre"))))
     (synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
 
+(define openmw-openscenegraph
+  ;; OpenMW prefers its own fork of openscenegraph:
+  ;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
+  (let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
+    (package
+      (inherit openscenegraph)
+      (version (git-version "3.6" "1" commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/OpenMW/osg/")
+               (commit commit)))
+         (file-name (git-file-name (package-name openscenegraph) version))
+         (sha256
+          (base32
+           "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments openscenegraph)
+         ((#:configure-flags flags)
+          ;; As per the above wiki link, the following plugins are enough:
+          `(append
+            '("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
+              "-DBUILD_OSG_PLUGIN_OSG=1"
+              "-DBUILD_OSG_PLUGIN_DDS=1"
+              "-DBUILD_OSG_PLUGIN_TGA=1"
+              "-DBUILD_OSG_PLUGIN_BMP=1"
+              "-DBUILD_OSG_PLUGIN_JPEG=1"
+              "-DBUILD_OSG_PLUGIN_PNG=1"
+              "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
+              ;; The jpeg plugin requires conversion between integers and booleans
+              "-DCMAKE_CXX_FLAGS=-fpermissive")
+            ,flags)))))))
+
 (define-public openmw
   (package
     (name "openmw")
@@ -1137,7 +1171,7 @@ of use.")
        ("libxt" ,libxt)
        ("mygui" ,mygui-gl)              ; OpenMW does not need Ogre.
        ("openal" ,openal)
-       ("openscenegraph" ,openscenegraph)
+       ("openscenegraph" ,openmw-openscenegraph)
        ("qtbase" ,qtbase)
        ("sdl" ,sdl2)
        ("unshield" ,unshield)))
-- 
cgit v1.2.3


From 9841941ac1a5e26651022fccdbf3497f9c3e9acd Mon Sep 17 00:00:00 2001
From: Florian Pelz 
Date: Tue, 24 Sep 2019 17:32:17 +0000
Subject: nls: Update 'de' translation of news entries.

* etc/news.scm: Add more 'de' translations.
---
 etc/news.scm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/etc/news.scm b/etc/news.scm
index 69418756df..4293e5ec04 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -22,7 +22,19 @@ guix install glibc-locales glibc-locales-2.28
 
 On Guix System, you can adjust the @code{locale-libcs} field of your
 @code{operating-system} form.  Run @code{info \"(guix) Locales\"}, for more
-info.")))
+info.")
+         (de "Die GNU-C-Bibliothek (glibc) wurde auf Version 2.29
+aktualisiert. Um zuvor installierte Programme, die an glibc 2.28 gebunden
+worden sind, weiter benutzen zu können, müssen Sie Locale-Daten für Version
+2.28 zusätzlich zu den Locale-Daten für 2.29 installieren:
+
+@example
+guix install glibc-locales glibc-locales-2.28
+@end example
+
+Auf Guix System genügt es, das @code{locale-libcs}-Feld Ihrer
+@code{operating-system}-Form anzupassen. Führen Sie @code{info \"(guix.de)
+Locales\"} aus, um weitere Informationen dazu zu erhalten.")))
 
  (entry (commit "cdd3bcf03883d129581a79e6d6611b2afd3b277b")
         (title (en "New reduced binary seed bootstrap"))
@@ -31,7 +43,13 @@ info.")))
 @dfn{reduced set of binary seeds}.  The initial set of binaries from which
 packages are built now weighs in at approximately 130 MiB, half of what it
 used to be.  Run @code{info \"(guix) Bootstrapping\"} to learn more, or watch
-the talk at @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")))
+the talk at @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")
+         (de "Der Paketgraph auf x86_64 und i686 hat jetzt eine @dfn{kleinere
+Menge an binären Seeds}. Das heißt, die ursprüngliche Menge an Binärdateien,
+aus denen heraus Pakete erstellt werden, machen nun ungefähr 130 MiB aus, halb
+so viel wie früher. Führen Sie @code{info \"(guix.de) Bootstrapping\"} aus, um
+mehr zu erfahren, oder schauen Sie sich den Vortrag auf
+@uref{https://archive.fosdem.org/2019/schedule/event/gnumes/} an.")))
 
  (entry (commit "dcc90d15581189dbc30e201db2b807273d6484f0")
         (title (en "New channel news mechanism")
-- 
cgit v1.2.3


From 987d7b1c67c7fa38582802c5b0bbc1eda83df838 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 18:49:18 +0200
Subject: gnu: emacs-markdown-mode: Don't use unstable tarball.

* gnu/packages/emacs-xyz.scm (emacs-markdown-mode)[source]: Use GIT-FETCH and GIT-FILE-NAME.
---
 gnu/packages/emacs-xyz.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 92c91a0537..54cdbc084f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5822,14 +5822,14 @@ provides the following features:
     (name "emacs-markdown-mode")
     (version "2.3")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://raw.githubusercontent.com/jrblevin"
-                                  "/markdown-mode/v" version
-                                  "/markdown-mode.el"))
-              (file-name (string-append "markdown-mode-" version ".el"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jrblevin/markdown-mode.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "152whyrq3dqlqy5wv4mdd94kmal19hs5kwaxjcp2gp2r97lsmdmi"))))
+                "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7"))))
     (build-system emacs-build-system)
     (home-page "http://jblevins.org/projects/markdown-mode/")
     (synopsis "Emacs Major mode for Markdown files")
-- 
cgit v1.2.3


From 3e7518b35c86875348cc72c154558a0bda302cb0 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 19:52:55 +0200
Subject: gnu: emacs-flycheck: Update to 31-1.0006a59.

* gnu/packages/emacs-xyz.scm (emacs-flycheck): Update to 31-1.0006a59.
---
 gnu/packages/emacs-xyz.scm | 67 +++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 54cdbc084f..58e7f181d5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -771,32 +771,45 @@ supports type hints, definition-jumping, completion, and more.")
       (license license:gpl3+))))
 
 (define-public emacs-flycheck
-  (package
-    (name "emacs-flycheck")
-    (version "31")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/flycheck/flycheck/releases/download/"
-                    version "/flycheck-" version ".tar"))
-              (sha256
-               (base32
-                "01rnwan16m7cyyrfca3c5c60mbj2r3knkpzbhji2fczsf0wns240"))
-              (modules '((guix build utils)))
-              (snippet `(begin
-                          ;; Change 'flycheck-version' so that it does not
-                          ;; attempt to get its version from pkg-info.el.
-                          (substitute* "flycheck.el"
-                            (("\\(pkg-info-version-info 'flycheck\\)")
-                             (string-append "\"" ,version "\"")))
-                          #t))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-dash" ,emacs-dash)))
-    (home-page "https://www.flycheck.org")
-    (synopsis "On-the-fly syntax checking")
-    (description
-     "This package provides on-the-fly syntax checking for GNU Emacs.  It is a
+  ;; last release version was more than 300 commits ago
+  (let ((commit "0006a59259ebd02c9199ddc87f0e3ce22793a2ea")
+        (revision "1"))
+    (package
+      (name "emacs-flycheck")
+      (version (git-version "31" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/flycheck/flycheck/")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "09q3h6ldpg528cfbmsbb1x2vf5hmzgm3fshqn6kdy144jxcdjlf1"))
+                (file-name (git-file-name name version))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-dash" ,emacs-dash)))
+      (native-inputs
+       `(("emacs-shut-up" ,emacs-shut-up)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'change-flycheck-version
+             (lambda _
+               (substitute* "flycheck.el"
+                 (("\\(pkg-info-version-info 'flycheck\\)")
+                  (string-append "\"" ,version "\"")))
+               #t)))
+         ;; TODO: many failing tests
+         #:tests? #f
+         #:test-command '("emacs" "-Q" "--batch" "-L" "."
+                          "--load" "test/flycheck-test"
+                          "--load" "test/run.el"
+                          "-f" "flycheck-run-tests-main")))
+      (home-page "https://www.flycheck.org")
+      (synopsis "On-the-fly syntax checking")
+      (description
+       "This package provides on-the-fly syntax checking for GNU Emacs.  It is a
 replacement for the older Flymake extension which is part of GNU Emacs, with
 many improvements and additional features.
 
@@ -804,7 +817,7 @@ Flycheck provides fully-automatic, fail-safe, on-the-fly background syntax
 checking for over 30 programming and markup languages with more than 70
 different tools.  It highlights errors and warnings inline in the buffer, and
 provides an optional IDE-like error list.")
-    (license license:gpl3+)))                     ;+GFDLv1.3+ for the manual
+      (license license:gpl3+))))                     ;+GFDLv1.3+ for the manual
 
 (define-public emacs-a
   (package
-- 
cgit v1.2.3


From 2ac02060609cde61f44d0ad1bebdec9859c5df70 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 5 Sep 2019 13:48:58 +0200
Subject: gnu: keepalived: Fix documentation generation.

* gnu/packages/cluster.scm (keepalived)[arguments]: Copy software_design.png
from the correct place.
---
 gnu/packages/cluster.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index 8b99a21356..c4a26e9faa 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -52,7 +52,7 @@
            (lambda _
              (invoke "make" "-C" "doc" "texinfo")
              ;; Put images in a subdirectory as recommended by 'texinfo'.
-             (install-file "doc/build/texinfo/software_design.png"
+             (install-file "doc/source/images/software_design.png"
                            "doc/build/texinfo/keepalived-figures")
              (substitute* "doc/build/texinfo/keepalived.texi"
                (("@image\\{software_design,")
@@ -63,7 +63,7 @@
              (let* ((out (assoc-ref outputs "out"))
                     (infodir (string-append out "/share/info")))
                (install-file "doc/build/texinfo/keepalived.info" infodir)
-               (install-file "doc/build/texinfo/software_design.png"
+               (install-file "doc/source/images/software_design.png"
                              (string-append infodir "/keepalived-figures"))
                #t))))))
     (native-inputs
-- 
cgit v1.2.3


From ce6db0fa7ce76cc05480ede1cc3789c55848efbd Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 5 Sep 2019 13:50:04 +0200
Subject: gnu: keepalived: Update to 2.0.18.

* gnu/packages/cluster.scm (keepalived): Update to 2.0.18.
---
 gnu/packages/cluster.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index c4a26e9faa..177017c260 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -35,7 +35,7 @@
 (define-public keepalived
   (package
     (name "keepalived")
-    (version "2.0.5")
+    (version "2.0.18")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -43,7 +43,7 @@
                     version ".tar.gz"))
               (sha256
                (base32
-                "021a7c1lq4aqx7dbwhlm5km6w039hapfzp5hf6wb5bfq79s25g38"))))
+                "1l2g0bzzbah9svfpwa0b9dgvwfv85r2y3qdr54822hg5p2qs48ql"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From d1bfad2f0d4306abc02f2bf713a9cc3d2d96d5d6 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 5 Sep 2019 17:39:35 +0200
Subject: gnu: keepalived: Update home page.

* gnu/packages/cluster.scm (keepalived)[home-page]: Use HTTPS.
---
 gnu/packages/cluster.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm
index 177017c260..9548352d12 100644
--- a/gnu/packages/cluster.scm
+++ b/gnu/packages/cluster.scm
@@ -74,7 +74,7 @@
      `(("openssl" ,openssl)
        ("libnfnetlink" ,libnfnetlink)
        ("libnl" ,libnl)))
-    (home-page "http://www.keepalived.org/")
+    (home-page "https://www.keepalived.org/")
     (synopsis "Load balancing and high-availability frameworks")
     (description
      "Keepalived provides frameworks for both load balancing and high
-- 
cgit v1.2.3


From 864b7f0bc18b925d1b54c0a673e2ff5401092ada Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 12 Sep 2019 16:56:25 +0200
Subject: gnu: fmt: Update to 6.0.0.

* gnu/packages/pretty-print.scm (fmt): Update to 6.0.0.
---
 gnu/packages/pretty-print.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
index 7a5b98c698..fe69af84c4 100644
--- a/gnu/packages/pretty-print.scm
+++ b/gnu/packages/pretty-print.scm
@@ -164,7 +164,7 @@ different programming languages.")
 (define-public fmt
   (package
     (name "fmt")
-    (version "5.3.0")
+    (version "6.0.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -172,7 +172,7 @@ different programming languages.")
                     version "/fmt-" version ".zip"))
               (sha256
                (base32
-                "0p51nhmvjniqlffmmb9djhprnclvm448f2vkdxymvxw307hl21sc"))))
+                "0h148anbaqgch6n69pxsvs1c9wmykgd052wmzgdia7qpz8w6p8dl"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("unzip" ,unzip)))
-- 
cgit v1.2.3


From b174cc4be3d6d5c30a17c93b3f41a18dd14924aa Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 16:45:19 +0200
Subject: gnu: openvswitch: Update to 2.12.0.

* gnu/packages/networking.scm (openvswitch): Update to 2.12.0.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index c37d07ea41..11c9c6a37f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1586,7 +1586,7 @@ procedure calls (RPCs).")
 (define-public openvswitch
   (package
     (name "openvswitch")
-    (version "2.11.1")
+    (version "2.12.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1594,7 +1594,7 @@ procedure calls (RPCs).")
                     version ".tar.gz"))
               (sha256
                (base32
-                "1p5mv44jaslvrr1ym15smqna19y0gi4vqcsyj58625vv9bj6laf1"))))
+                "1y78ix5inhhcvicbvyy2ij38am1215nr55vydhab3d4065q45z8k"))))
     (build-system gnu-build-system)
     (arguments
      '(;; FIXME: many tests fail with:
-- 
cgit v1.2.3


From 3e41d7070df80edd3fd9fc66f9a4ff5cb646cbc3 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 16:45:58 +0200
Subject: gnu: re2: Update to 2019-09-01.

* gnu/packages/regex.scm (re2): Update to 2019-09-01.
---
 gnu/packages/regex.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm
index ad01814318..7582502069 100644
--- a/gnu/packages/regex.scm
+++ b/gnu/packages/regex.scm
@@ -30,7 +30,7 @@
 (define-public re2
    (package
      (name "re2")
-     (version "2019-08-01")
+     (version "2019-09-01")
      (home-page "https://github.com/google/re2")
      (source (origin
                (method git-fetch)
@@ -38,7 +38,7 @@
                (file-name (git-file-name name version))
                (sha256
                 (base32
-                 "11w9x16y26nfgliis28ivrh9b1x6pxawdwxfwxfjh34h57c0dkzg"))))
+                 "1a0m3p0nx7vz2sgryrsjnbiwkjpj98swjb29r0w5lsv3f92dqyn4"))))
      (build-system gnu-build-system)
      (arguments
       `(#:modules ((guix build gnu-build-system)
-- 
cgit v1.2.3


From 6bdf8af5e680c719304c2f1c1a4948099b446906 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 16:46:26 +0200
Subject: gnu: ffmpeg: Update to 4.2.1.

* gnu/packages/video.scm (ffmpeg): Update to 4.2.1.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index aaba2fb3f7..d5a51a00b0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -799,14 +799,14 @@ operate properly.")
 (define-public ffmpeg
   (package
     (name "ffmpeg")
-    (version "4.2")
+    (version "4.2.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"))))
+               "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf"))))
     (build-system gnu-build-system)
     (inputs
      `(("dav1d" ,dav1d)
-- 
cgit v1.2.3


From d8fbfbf52363333b5f925a52edc4e5bbc85c45de Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 16:46:50 +0200
Subject: gnu: varnish: Update to 6.3.0.

* gnu/packages/web.scm (varnish): Update to 6.3.0.
[arguments]: Patch /bin/sh in one more file.
---
 gnu/packages/web.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index d25f04901a..4509f63f1b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4968,13 +4968,13 @@ deployments.")
   (package
     (name "varnish")
     (home-page "https://varnish-cache.org/")
-    (version "6.2.1")
+    (version "6.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append home-page "_downloads/varnish-" version ".tgz"))
               (sha256
                (base32
-                "15qfvw3fp05bgyspcm6gbsnxhs430p4z3fwz5kkd1z68jb90b3pj"))))
+                "0zwlffdd1m0ih33nq40xf2wwdyvr4czmns2fs90qpfnwy72xxk4m"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
@@ -4989,7 +4989,8 @@ deployments.")
            (lambda _
              (substitute* '("bin/varnishtest/vtc_varnish.c"
                             "bin/varnishtest/vtc_process.c"
-                            "bin/varnishd/mgt/mgt_vcc.c")
+                            "bin/varnishd/mgt/mgt_vcc.c"
+                            "bin/varnishtest/tests/u00014.vtc")
                (("/bin/sh") (which "sh")))
              (substitute* "bin/varnishd/mgt/mgt_shmem.c"
                (("rm -rf") (string-append (which "rm") " -rf")))
-- 
cgit v1.2.3


From 942c7889498fc8e680a16d500e166c9ade84e640 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 17:15:50 +0200
Subject: gnu: OpenEXR: Update to 2.4.0 [fixes CVE-2018-18443, CVE-2018-18444].

* gnu/packages/patches/ilmbase-fix-tests.patch: Adjust for new origin.
* gnu/packages/patches/ilmbase-openexr-pkg-config.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (ilmbase): Update to 2.4.0.
[source]: Change to GIT-FETCH, as tarballs are no longer provided.  Add new
patch.
[build-system]: Change to CMAKE-BUILD-SYSTEM.
[arguments]: Add phase to enter the correct source directory.
* gnu/packages/graphics.scm (openexr): Update to 2.4.0.
[source]: Inherit from ILMBASE, which comes from the same repository.
[build-system]: Change to CMAKE-BUILD-SYSTEM.
[arguments]: Add phase to enter the correct source directory.
* gnu/packages/gstreamer.scm (gst-plugins-bad)[arguments]: Enable C++11.
* gnu/packages/image-processing.scm (opencv)[arguments]: Likewise.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/graphics.scm                          | 46 +++++++++++++---------
 gnu/packages/gstreamer.scm                         |  5 +++
 gnu/packages/image-processing.scm                  |  4 ++
 gnu/packages/patches/ilmbase-fix-tests.patch       | 12 ++----
 .../patches/ilmbase-openexr-pkg-config.patch       | 40 +++++++++++++++++++
 6 files changed, 81 insertions(+), 27 deletions(-)
 create mode 100644 gnu/packages/patches/ilmbase-openexr-pkg-config.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0e279d8303..bf0f9de26e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -962,6 +962,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
   %D%/packages/patches/idris-test-no-node.patch			\
   %D%/packages/patches/ilmbase-fix-tests.patch			\
+  %D%/packages/patches/ilmbase-openexr-pkg-config.patch		\
   %D%/packages/patches/intltool-perl-compatibility.patch	\
   %D%/packages/patches/irrlicht-use-system-libs.patch		\
   %D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch	\
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index d4e9adb84a..795e750cb5 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2019 Steve Sprang 
 ;;; Copyright © 2019 John Soo 
 ;;; Copyright © 2019 Pierre Neidhardt 
+;;; Copyright © 2019 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -327,17 +328,25 @@ many more.")
 (define-public ilmbase
   (package
     (name "ilmbase")
-    (version "2.3.0")
+    (version "2.4.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/openexr/openexr/releases"
-                                  "/download/v" version "/ilmbase-"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/openexr/openexr")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name "ilmbase" version))
               (sha256
                (base32
-                "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"))
-              (patches (search-patches "ilmbase-fix-tests.patch"))))
-    (build-system gnu-build-system)
+                "0g3rz11cvb7gnphp2np9z7bfl7v4dprq4w5hnsvx7yrasgsdyn8s"))
+              (patches (search-patches "ilmbase-fix-tests.patch"
+                                       "ilmbase-openexr-pkg-config.patch"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'change-directory
+                    (lambda _
+                      (chdir "IlmBase")
+                      #t)))))
     (home-page "http://www.openexr.com/")
     (synopsis "Utility C++ libraries for threads, maths, and exceptions")
     (description
@@ -409,27 +418,26 @@ graphics.")
 (define-public openexr
   (package
     (name "openexr")
-    (version "2.3.0")
+    (version (package-version ilmbase))
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/openexr/openexr/releases"
-                                  "/download/v" version "/openexr-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"))
+              (inherit (package-source ilmbase))
+              (file-name (git-file-name "openexr" version))
               (modules '((guix build utils)))
               (snippet
                '(begin
-                  (substitute* (find-files "." "tmpDir\\.h")
+                  (substitute* (find-files "OpenEXR" "tmpDir\\.h")
                     (("\"/var/tmp/\"")
                      "\"/tmp/\""))
                   #t))))
-    (build-system gnu-build-system)
+    (build-system cmake-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'disable-broken-test
+         (add-after 'unpack 'change-directory
+           (lambda _
+             (chdir "OpenEXR")
+             #t))
+         (add-after 'change-directory 'disable-broken-test
            ;; This test fails on i686. Upstream developers suggest that
            ;; this test is broken on i686 and can be safely disabled:
            ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 13c2c2fc27..8b81cc91a0 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -286,6 +286,11 @@ developers consider to have good quality code and correct functionality.")
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f ; XXX: 13 of 53 tests fail
+
+       ;; FIXME: OpenEXR 2.4.0 requires C++ 11 or later.  Remove when the
+       ;; default compiler is >= GCC 5.
+       #:make-flags '("CXXFLAGS=-std=gnu++11")
+
        #:configure-flags
        (list (string-append "--with-html-dir="
                             (assoc-ref %outputs "doc")
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index b3972a2b76..460f35dbae 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -269,6 +269,10 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
              "-DWITH_CAROTENE=OFF" ; only visible on arm/aarch64
              "-DENABLE_PRECOMPILED_HEADERS=OFF"
 
+             ;; FIXME: OpenEXR requires C++11 or later.  Remove this when
+             ;; the default compiler is GCC 7.
+             "-DCMAKE_CXX_FLAGS=-std=gnu++11"
+
              ;; CPU-Features:
              ;; See cmake/OpenCVCompilerOptimizations.cmake
              ;; (CPU_ALL_OPTIMIZATIONS) for a list of all optimizations
diff --git a/gnu/packages/patches/ilmbase-fix-tests.patch b/gnu/packages/patches/ilmbase-fix-tests.patch
index fcaa37d201..34d3a180c4 100644
--- a/gnu/packages/patches/ilmbase-fix-tests.patch
+++ b/gnu/packages/patches/ilmbase-fix-tests.patch
@@ -22,10 +22,8 @@ Date: Wed, 24 Feb 2016 01:04:11 +0000
 
 Also fix a pre-existing typo.
 
-Index: ilmbase/ImathTest/testBoxAlgo.cpp
-===================================================================
---- ilmbase.orig/ImathTest/testBoxAlgo.cpp
-+++ ilmbase/ImathTest/testBoxAlgo.cpp
+--- a/IlmBase/ImathTest/testBoxAlgo.cpp
++++ b/IlmBase/ImathTest/testBoxAlgo.cpp
 @@ -886,10 +886,11 @@ boxMatrixTransform ()
  
      assert (approximatelyEqual (b2.min, b4.min, e));
@@ -54,10 +52,8 @@ On 32-bit x86, allow even greater discrepency at double
 precision, due to possible double-rounding.  See
 https://lists.nongnu.org/archive/html/openexr-devel/2015-12/msg00001.html
 
-Index: ilmbase/ImathTest/testBox.cpp
-===================================================================
---- ilmbase.orig/ImathTest/testBox.cpp
-+++ ilmbase/ImathTest/testBox.cpp
+--- a/IlmBase/ImathTest/testBox.cpp
++++ b/IlmBase/ImathTest/testBox.cpp
 @@ -47,6 +47,58 @@ using namespace IMATH_INTERNAL_NAMESPACE
  
  namespace {
diff --git a/gnu/packages/patches/ilmbase-openexr-pkg-config.patch b/gnu/packages/patches/ilmbase-openexr-pkg-config.patch
new file mode 100644
index 0000000000..99613080d8
--- /dev/null
+++ b/gnu/packages/patches/ilmbase-openexr-pkg-config.patch
@@ -0,0 +1,40 @@
+Fix pkg-config files when using the CMake build system.
+
+Upstream bug report:
+https://github.com/openexr/openexr/issues/567
+
+diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
+index 508176a..9e6ab91 100644
+--- a/IlmBase/config/CMakeLists.txt
++++ b/IlmBase/config/CMakeLists.txt
+@@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG)
+   # use a helper function to avoid variable pollution, but pretty simple
+   function(ilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+-    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(exec_prefix ${CMAKE_INSTALL_FULL_BINDIR})
++    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
++    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+     set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions
+diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt
+index 1ef829a..b8dc141 100644
+--- a/OpenEXR/config/CMakeLists.txt
++++ b/OpenEXR/config/CMakeLists.txt
+@@ -72,9 +72,9 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
+   # use a helper function to avoid variable pollution, but pretty simple
+   function(openexr_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+-    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(exec_prefix ${CMAKE_INSTALL_FULL_BINDIR})
++    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
++    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions
+
-- 
cgit v1.2.3


From 25c4a04fded1bc129df6af5fa563771194ebd7a1 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 17:17:04 +0200
Subject: gnu: OpenEXR: Update home page.

* gnu/packages/graphics.scm (ilmbase, openexr)[home-page]: Use HTTPS.
---
 gnu/packages/graphics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 795e750cb5..8d04e95937 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -347,7 +347,7 @@ many more.")
                     (lambda _
                       (chdir "IlmBase")
                       #t)))))
-    (home-page "http://www.openexr.com/")
+    (home-page "https://www.openexr.com/")
     (synopsis "Utility C++ libraries for threads, maths, and exceptions")
     (description
      "IlmBase provides several utility libraries for C++.  Half is a class
@@ -453,7 +453,7 @@ graphics.")
     (propagated-inputs
      `(("ilmbase" ,ilmbase)                       ;used in public headers
        ("zlib" ,zlib)))                           ;OpenEXR.pc reads "-lz"
-    (home-page "http://www.openexr.com")
+    (home-page "https://www.openexr.com/")
     (synopsis "High-dynamic range file format library")
     (description
      "OpenEXR is a high dynamic-range (HDR) image file format developed for
-- 
cgit v1.2.3


From aa0e28bc73487f2298b494ab077526ba448a1c57 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 17:25:00 +0200
Subject: gnu: p11-kit: Update to 0.23.17.

* gnu/packages/patches/p11-kit-jks-timestamps.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/tls.scm (p11-kit): Update to 0.23.17.
[source](patches): Remove.
---
 gnu/local.mk                                      |  1 -
 gnu/packages/patches/p11-kit-jks-timestamps.patch | 42 -----------------------
 gnu/packages/tls.scm                              |  5 ++-
 3 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 gnu/packages/patches/p11-kit-jks-timestamps.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index bf0f9de26e..840ef22bdb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1176,7 +1176,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/osip-CVE-2017-7853.patch			\
   %D%/packages/patches/ots-no-include-missing-file.patch	\
   %D%/packages/patches/owncloud-disable-updatecheck.patch	\
-  %D%/packages/patches/p11-kit-jks-timestamps.patch		\
   %D%/packages/patches/p7zip-CVE-2016-9296.patch		\
   %D%/packages/patches/p7zip-CVE-2017-17969.patch		\
   %D%/packages/patches/p7zip-remove-unused-code.patch		\
diff --git a/gnu/packages/patches/p11-kit-jks-timestamps.patch b/gnu/packages/patches/p11-kit-jks-timestamps.patch
deleted file mode 100644
index 8cb8ed8684..0000000000
--- a/gnu/packages/patches/p11-kit-jks-timestamps.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fix test failures induced by setting the SOURCE_DATE_EPOCH variable.
-
-Taken from upstream: .
-
-From 2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno 
-Date: Mon, 28 Jan 2019 13:03:15 +0100
-Subject: [PATCH] extract-jks: Prefer _p11_extract_jks_timestamp to
- SOURCE_DATE_EPOCH
-
-Give _p11_extract_jks_timestamp precedence over SOURCE_DATE_EPOCH so
-that the test results are not affected by the envvar settings.
----
- trust/extract-jks.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/trust/extract-jks.c b/trust/extract-jks.c
-index ad8dc35..a6f855f 100644
---- a/trust/extract-jks.c
-+++ b/trust/extract-jks.c
-@@ -250,7 +250,9 @@ prepare_jks_buffer (p11_enumerate *ex,
- 	 * when this was this certificate was added to the keystore, however
- 	 * we don't have that information. Java uses time in milliseconds
- 	 */
--	{
-+	if (_p11_extract_jks_timestamp)
-+		now = _p11_extract_jks_timestamp;
-+	else {
- 		char *source_date_epoch;
- 		source_date_epoch = secure_getenv ("SOURCE_DATE_EPOCH");
- 		if (source_date_epoch) {
-@@ -276,9 +278,7 @@ prepare_jks_buffer (p11_enumerate *ex,
- 				return false;
- 			}
- 			now = epoch;
--		} else if (_p11_extract_jks_timestamp)
--			now = _p11_extract_jks_timestamp;
--		else
-+		} else
- 			now = time (NULL);
- 	}
- 
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 45ec4f796b..c06052239f 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -122,16 +122,15 @@ in intelligent transportation networks.")
 (define-public p11-kit
   (package
     (name "p11-kit")
-    (version "0.23.15")
+    (version "0.23.17")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "https://github.com/p11-glue/p11-kit/releases/"
                           "download/" version "/p11-kit-" version ".tar.gz"))
-      (patches (search-patches "p11-kit-jks-timestamps.patch"))
       (sha256
        (base32
-        "166pwj00cffv4qq4dvx0k53zka0b0r1fa0whc49007vsqyh3khgp"))))
+        "07kwdlw07jk9833k43kkhv0q9gkll3vmd25wwp68cpy0crfv4isl"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From e4cf01c003f070ac494f6ac5d65a04a1c755ac6b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 20:31:32 +0200
Subject: gnu: emacs-stream: Update to 2.2.4-1.a3f3da1.

* gnu/packages/emacs-xyz.scm (emacs-stream): Update to 2.2.4-1.a3f3da1.
---
 gnu/packages/emacs-xyz.scm | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 58e7f181d5..1869345dca 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7467,29 +7467,31 @@ editing nginx config files.")
     (license license:gpl2+)))
 
 (define-public emacs-stream
-  (package
-    (name "emacs-stream")
-    (version "2.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/NicolasPetton/stream.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "10x481lmkcmjrmdnlbqvys2b3525npn4a84j6g404pv4sfwlj6ab"))))
-    (build-system emacs-build-system)
-    (arguments
-     `(#:tests? #t
-       #:test-command '("emacs" "--batch"
-                        "-l" "test/stream-tests.el"
-                        "-f" "ert-run-tests-batch-and-exit")))
-    (home-page "https://github.com/NicolasPetton/stream")
-    (synopsis "Implementation of streams for Emacs")
-    (description "This library provides an implementation of streams for Emacs.
+  (let ((commit "a3f3da155a49c133e2692bd8789b35492bfdc4f7")
+        (revision "1"))
+    (package
+      (name "emacs-stream")
+      (version (git-version "2.2.4" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Emacsmirror/stream.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0aig0yjb9z752ijh0mzildjmh44j051inchga8qll01dr8wf7332"))))
+      (build-system emacs-build-system)
+      (arguments
+       `(#:tests? #t
+         #:test-command '("emacs" "--batch"
+                          "-l" "tests/stream-tests.el"
+                          "-f" "ert-run-tests-batch-and-exit")))
+      (home-page "https://github.com/Emacsmirror/stream")
+      (synopsis "Implementation of streams for Emacs")
+      (description "This library provides an implementation of streams for Emacs.
 Streams are implemented as delayed evaluation of cons cells.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-el-search
   (let ((commit "f26277bfbb3fc3fc74beea6592f294c439796bd4")
-- 
cgit v1.2.3


From 3aeef226ac528b657f896c0fb8e4d03437433903 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 20:11:33 +0200
Subject: gnu: Add emacs-cl-print.

* gnu/packages/emacs-xyz.scm (emacs-cl-print): New variable.
---
 gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1869345dca..403ea749a8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7493,6 +7493,29 @@ editing nginx config files.")
 Streams are implemented as delayed evaluation of cons cells.")
       (license license:gpl3+))))
 
+(define-public emacs-cl-print
+  (let ((commit "1a70c553dfb04352afb5b8696fe0cef8acc8f991")
+        (revision "1"))
+    (package
+      (name "emacs-cl-print")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacsmirror/cl-print.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "164zbnsi5mssvcpy0158fm7fw5cmd1r5nkpn29fmd2b2scy3gm79"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/emacsmirror/cl-print")
+      (synopsis "CL-style generic printing")
+      (description "This package provides a generic function,
+@code{cl-print-object}, to which the programmer can add any method they
+please.")
+      (license license:gpl3+))))
+
 (define-public emacs-el-search
   (let ((commit "f26277bfbb3fc3fc74beea6592f294c439796bd4")
         (revision "1"))
-- 
cgit v1.2.3


From 1cfe711ac0d777c958acc3cdfdbe779ce678ff0b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 20:17:14 +0200
Subject: gnu: emacs-el-search: Update to 1.12.6.1-2.07bed84.

* gnu/packages/emacs-xyz.scm (emacs-el-search): Update to 1.12.6.1-2.07bed84.
---
 gnu/packages/emacs-xyz.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 403ea749a8..c28d094bcc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7517,24 +7517,25 @@ please.")
       (license license:gpl3+))))
 
 (define-public emacs-el-search
-  (let ((commit "f26277bfbb3fc3fc74beea6592f294c439796bd4")
-        (revision "1"))
+  (let ((commit "07bed84dd8ae9e4c6c648834224b1d33fdbd51e0")
+        (revision "2"))
     (package
       (name "emacs-el-search")
-      ;; No ufficial release.
-      (version (string-append "0.0-" revision "." (string-take commit 7)))
-      (home-page "https://github.com/emacsmirror/el-search")
+      (version (git-version "1.12.6.1" revision commit))
       (source
        (origin
          (method git-fetch)
-         (file-name (string-append name "-" version ".tar.gz"))
          (uri (git-reference
-               (commit commit)
-               (url (string-append home-page ".git"))))
+               (url "https://github.com/emacsmirror/el-search.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
          (sha256
-          (base32 "12xf40h9sb7xxg2r97gsia94q02543mgiiiw46fzh1ac7b7993g6"))))
+          (base32 "10w1ldgijdhfsrazp0y3bm76jv5wvdn94k1yp0pmc2m1896b58ak"))))
       (build-system emacs-build-system)
-      (inputs `(("emacs-stream" ,emacs-stream)))
+      (inputs
+       `(("emacs-stream" ,emacs-stream)
+         ("emacs-cl-print" ,emacs-cl-print)))
+      (home-page "https://github.com/emacsmirror/el-search")
       (synopsis "Expression based interactive search for emacs-lisp-mode")
       (description "This package provides expression based interactive search
 procedures for emacs-lisp-mode.")
-- 
cgit v1.2.3


From 84a0c6ff63afc296c1bc5873f783693dccc5ded2 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 24 Sep 2019 23:51:48 +0200
Subject: gnu: Move openmw-openscenegraph to graphics.scm.

Package inheritance across modules may cause unbound variable errors at
expansion time because of cyclic dependencies between the modules.

* gnu/packages/game-development.scm (openmw-openscenegraph): Move from here ...
* gnu/packages/graphics.scm (openmw-openscenegraph): ... to here.  Make the
variable public and "hide" the package.
---
 gnu/packages/game-development.scm | 34 ----------------------------------
 gnu/packages/graphics.scm         | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index ee9e63ea29..7fc0122faa 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1109,40 +1109,6 @@ of use.")
                '("ogre"))))
     (synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
 
-(define openmw-openscenegraph
-  ;; OpenMW prefers its own fork of openscenegraph:
-  ;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
-  (let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
-    (package
-      (inherit openscenegraph)
-      (version (git-version "3.6" "1" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/OpenMW/osg/")
-               (commit commit)))
-         (file-name (git-file-name (package-name openscenegraph) version))
-         (sha256
-          (base32
-           "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
-      (arguments
-       (substitute-keyword-arguments (package-arguments openscenegraph)
-         ((#:configure-flags flags)
-          ;; As per the above wiki link, the following plugins are enough:
-          `(append
-            '("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
-              "-DBUILD_OSG_PLUGIN_OSG=1"
-              "-DBUILD_OSG_PLUGIN_DDS=1"
-              "-DBUILD_OSG_PLUGIN_TGA=1"
-              "-DBUILD_OSG_PLUGIN_BMP=1"
-              "-DBUILD_OSG_PLUGIN_JPEG=1"
-              "-DBUILD_OSG_PLUGIN_PNG=1"
-              "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
-              ;; The jpeg plugin requires conversion between integers and booleans
-              "-DCMAKE_CXX_FLAGS=-fpermissive")
-            ,flags)))))))
-
 (define-public openmw
   (package
     (name "openmw")
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8d04e95937..6d6c8d1e1c 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -589,6 +589,42 @@ virtual reality, scientific visualization and modeling.")
      `(("libjpeg" ,libjpeg)
        ,@(package-inputs openscenegraph)))))
 
+
+(define-public openmw-openscenegraph
+  ;; OpenMW prefers its own fork of openscenegraph:
+  ;; https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OpenSceneGraph.
+  (let ((commit "36a962845a2c87a6671fd822157e0729d164e940"))
+    (hidden-package
+     (package
+       (inherit openscenegraph)
+       (version (git-version "3.6" "1" commit))
+       (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                (url "https://github.com/OpenMW/osg/")
+                (commit commit)))
+          (file-name (git-file-name (package-name openscenegraph) version))
+          (sha256
+           (base32
+            "05yhgq3qm5q277y32n5sf36vx5nv5qd3zlhz4csgd3a6190jrnia"))))
+       (arguments
+        (substitute-keyword-arguments (package-arguments openscenegraph)
+          ((#:configure-flags flags)
+           ;; As per the above wiki link, the following plugins are enough:
+           `(append
+             '("-DBUILD_OSG_PLUGINS_BY_DEFAULT=0"
+               "-DBUILD_OSG_PLUGIN_OSG=1"
+               "-DBUILD_OSG_PLUGIN_DDS=1"
+               "-DBUILD_OSG_PLUGIN_TGA=1"
+               "-DBUILD_OSG_PLUGIN_BMP=1"
+               "-DBUILD_OSG_PLUGIN_JPEG=1"
+               "-DBUILD_OSG_PLUGIN_PNG=1"
+               "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0"
+               ;; The jpeg plugin requires conversion between integers and booleans
+               "-DCMAKE_CXX_FLAGS=-fpermissive")
+             ,flags))))))))
+
 (define-public povray
   (package
     (name "povray")
-- 
cgit v1.2.3


From c3ceeb93c2801078c39fb7450e4caa3168df56be Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 23:29:31 +0200
Subject: gnu: emacs-xterm-color: Update to 1.9.

* gnu/packages/emacs-xyz.scm (emacs-xterm-color): Update to 1.9.
---
 gnu/packages/emacs-xyz.scm | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c28d094bcc..9ba355e02e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17884,27 +17884,24 @@ commands in @code{evil-mode}.")
       (license license:gpl3+))))
 
 (define-public emacs-xterm-color
-  (let ((commit "a452ab38a7cfae97078062ff8885b5d74fd1e5a6")
-        (version "1.8")
-        (revision "1"))
-    (package
-      (name "emacs-xterm-color")
-      (version (git-version version revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/atomontage/xterm-color.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "02kpajb993yshhjhsizpfcbrcndyzkf4dqfipifhxxng50dhp95i"))
-                (file-name (git-file-name name version))))
-      (build-system emacs-build-system)
-      (home-page "https://github.com/atomontage/xterm-color")
-      (synopsis "ANSI & xterm-256 color text property translator for Emacs")
-      (description "@code{xterm-color.el} is an ANSI control sequence to
+  (package
+    (name "emacs-xterm-color")
+    (version "1.9")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/atomontage/xterm-color.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0i9ivc5xhl5y5v0l18kbhfg8s2abb9zaimyx951b8bc0f5as68xm"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/atomontage/xterm-color")
+    (synopsis "ANSI & xterm-256 color text property translator for Emacs")
+    (description "@code{xterm-color.el} is an ANSI control sequence to
 text-property translator.")
-      (license license:bsd-2))))
+    (license license:bsd-2)))
 
 (define-public emacs-org-noter
   (package
-- 
cgit v1.2.3


From c463c270dc0e1690d3c7cc19cd78583ce9bf9bd1 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 24 Sep 2019 23:29:55 +0200
Subject: gnu: Add emacs-wttrin.

* gnu/packages/emacs-xyz.scm (emacs-wttrin): New variable.
---
 gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9ba355e02e..855ca73f05 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15577,6 +15577,30 @@ as better scaling of and anti aliasing of the icons.")
     (license
      (list license:expat license:gpl3+ license:silofl1.1 license:asl2.0))))
 
+(define-public emacs-wttrin
+  (let ((commit "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc")
+        (revision "1"))
+    (package
+      (name "emacs-wttrin")
+      (version (git-version "0.2.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/bcbcarl/emacs-wttrin.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-xterm-color" ,emacs-xterm-color)))
+      (home-page "https://github.com/bcbcarl/emacs-wttrin")
+      (synopsis "Frontend for weather web service @url{wttr.in}")
+      (description "This package provides local weather information from
+@url{wttr.in}.")
+      (license license:expat))))
+
 (define-public emacs-powerline
   (package
     (name "emacs-powerline")
-- 
cgit v1.2.3


From 4780db2c935110ea3254817ba0c519c229b9461e Mon Sep 17 00:00:00 2001
From: Eric Bavier 
Date: Mon, 16 Sep 2019 22:20:23 -0500
Subject: gnu: idris: Update to 1.3.2.

* gnu/packages/haskell-xyz.scm (ghc-network-2.8, ghc-megaparsec-7): New
variables.
* gnu/packages/idris.scm (idris): Update to 1.3.2.
[source]: Remove patch.
[inputs]: Use ghc-network-2.8 and ghc-megaparsec-7.
* gnu/packages/patches/idris-test-no-node.patch: Delete.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/haskell-xyz.scm                  | 37 ++++++++++++++++
 gnu/packages/idris.scm                        |  9 ++--
 gnu/packages/patches/idris-test-no-node.patch | 61 ---------------------------
 4 files changed, 41 insertions(+), 67 deletions(-)
 delete mode 100644 gnu/packages/patches/idris-test-no-node.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 840ef22bdb..da5fe09446 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -960,7 +960,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
-  %D%/packages/patches/idris-test-no-node.patch			\
   %D%/packages/patches/ilmbase-fix-tests.patch			\
   %D%/packages/patches/ilmbase-openexr-pkg-config.patch		\
   %D%/packages/patches/intltool-perl-compatibility.patch	\
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index a36451fa8c..2977398880 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -62,6 +62,7 @@
   #:use-module (guix build-system haskell)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages))
 
@@ -6070,6 +6071,24 @@ Megaparsec is a feature-rich package that strikes a nice balance between
 speed, flexibility, and quality of parse errors.")
     (license license:bsd-2)))
 
+;;; Idris 1.3.2 requires 'megaparse>=7.0.4' but we'd like to keep the public
+;;; package at the current Stackage LTS version:
+(define-public ghc-megaparsec-7
+  (hidden-package
+   (package
+     (inherit ghc-megaparsec)
+     (version "7.0.5")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://hackage.haskell.org/package/megaparsec/"
+                            "megaparsec-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j"))))
+     (arguments (strip-keyword-arguments (list #:cabal-revision)
+                                         (package-arguments ghc-megaparsec))))))
+
 (define-public ghc-memory
   (package
     (name "ghc-memory")
@@ -6740,6 +6759,24 @@ between 2 and 3 times faster than the Mersenne Twister.")
      "This package provides a low-level networking interface.")
     (license license:bsd-3)))
 
+;;; Until we update our default GHC to >=8.6 we cannot update our ghc-network
+;;; package, since the 'cabal-install' package that supports the current
+;;; 'Cabal' module requires 'network==2.6.*'.  Here we provide an updated
+;;; version to be used for our idris package.
+(define-public ghc-network-2.8
+  (hidden-package
+   (package
+     (inherit ghc-network)
+     (version "2.8.0.1")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://hackage.haskell.org/package/network/"
+                            "network-" version ".tar.gz"))
+        (sha256
+         (base32
+          "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1")))))))
+
 (define-public ghc-network-info
   (package
     (name "ghc-network-info")
diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index 894a19f0aa..7e6ee302b0 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -38,7 +38,7 @@
 (define-public idris
   (package
     (name "idris")
-    (version "1.3.1")
+    (version "1.3.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -46,8 +46,7 @@
                     "idris-" version "/idris-" version ".tar.gz"))
               (sha256
                (base32
-                "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi"))
-              (patches (search-patches "idris-test-no-node.patch"))))
+                "0wychzkg0yghd2pp8fqz78vp1ayzks191knfpl7mhh8igsmb6bc7"))))
     (build-system haskell-build-system)
     (native-inputs                      ;For tests
      `(("perl" ,perl)
@@ -71,8 +70,8 @@
        ("ghc-fsnotify" ,ghc-fsnotify)
        ("ghc-ieee754" ,ghc-ieee754)
        ("ghc-libffi" ,ghc-libffi)
-       ("ghc-megaparsec" ,ghc-megaparsec)
-       ("ghc-network" ,ghc-network)
+       ("ghc-megaparsec" ,ghc-megaparsec-7)
+       ("ghc-network" ,ghc-network-2.8)
        ("ghc-optparse-applicative" ,ghc-optparse-applicative)
        ("ghc-regex-tdfa" ,ghc-regex-tdfa)
        ("ghc-safe" ,ghc-safe)
diff --git a/gnu/packages/patches/idris-test-no-node.patch b/gnu/packages/patches/idris-test-no-node.patch
deleted file mode 100644
index c04ad41a8e..0000000000
--- a/gnu/packages/patches/idris-test-no-node.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6c52e1b902b869c25e2fe39cff6364143a04da61 Mon Sep 17 00:00:00 2001
-From: Niklas Larsson 
-Date: Tue, 11 Dec 2018 19:56:22 +0100
-Subject: [PATCH] Only check for Node when required
-
----
- test/TestRun.hs | 34 ++++++++++++++++++++--------------
- 1 file changed, 20 insertions(+), 14 deletions(-)
-
-diff --git a/test/TestRun.hs b/test/TestRun.hs
-index c7db9fdcd..4809911f3 100644
---- a/test/TestRun.hs
-+++ b/test/TestRun.hs
-@@ -11,6 +11,7 @@ import Data.Proxy
- import Data.Typeable
- import Options.Applicative
- import System.Directory
-+import System.Environment
- import System.Exit
- import System.FilePath (())
- import System.Info
-@@ -103,20 +104,25 @@ runTest path flags = do
-       normalise (x : xs) = x : normalise xs
-       normalise [] = []
- 
-+checkNode :: IO  ()
-+checkNode = do
-+    nodePath   <- findExecutable "node"
-+    nodejsPath <- findExecutable "nodejs"
-+    let node = nodePath <|> nodejsPath
-+    case node of
-+      Nothing -> do
-+        putStrLn "For running the test suite against Node, node must be installed."
-+        exitFailure
-+      Just _  -> return ()
-+
- main :: IO ()
- main = do
--  nodePath   <- findExecutable "node"
--  nodejsPath <- findExecutable "nodejs"
--  let node = nodePath <|> nodejsPath
--  case node of
--    Nothing -> do
--      putStrLn "For running the test suite against Node, node must be installed."
--      exitFailure
--    Just _  -> do
--      defaultMainWithIngredients ingredients $
-+    args <- getArgs
-+    when ("--node" `elem` args) checkNode
-+    defaultMainWithIngredients ingredients $
-         askOption $ \(NodeOpt node) ->
--          let (codegen, flags) = if node then (JS, ["--codegen", "node"])
--                                         else (C , [])
--           in
--            mkGoldenTests (testFamiliesForCodegen codegen)
--                        (flags ++ idrisFlags)
-+            let (codegen, flags) = if node then (JS, ["--codegen", "node"])
-+                                           else (C , [])
-+            in
-+                mkGoldenTests (testFamiliesForCodegen codegen) (flags ++ idrisFlags)
-+
-- 
cgit v1.2.3


From 91e633f0430c8c26e6915f79365a49d8a4327c96 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Tue, 16 Jul 2019 18:09:38 +0900
Subject: build: initrd: Fix "write-cpio-archive" return value.

* gnu/build/linux-initrd.scm (write-cpio-archive): Really return OUTPUT on
success, even when compression is disabled.
---
 gnu/build/linux-initrd.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gnu/build/linux-initrd.scm b/gnu/build/linux-initrd.scm
index 3aaa06d3a0..ea7de58553 100644
--- a/gnu/build/linux-initrd.scm
+++ b/gnu/build/linux-initrd.scm
@@ -71,8 +71,7 @@ COMPRESS? is true, compress it using GZIP.  On success, return OUTPUT."
       (cpio:write-cpio-archive files port
                                #:file->header cpio:file->cpio-header*)))
 
-  (or (not compress?)
-
+  (if compress?
       ;; Gzip insists on adding a '.gz' suffix and does nothing if the input
       ;; file already has that suffix.  Shuffle files around to placate it.
       (let* ((gz-suffix? (string-suffix? ".gz" output))
@@ -88,7 +87,6 @@ COMPRESS? is true, compress it using GZIP.  On success, return OUTPUT."
                (unless gz-suffix?
                  (rename-file (string-append output ".gz") output))
                output)))
-
       output))
 
 (define (cache-compiled-file-name file)
-- 
cgit v1.2.3


From 41e03c4beefb4d14ca1f8f9d8739a582c9430893 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Thu, 18 Jul 2019 07:23:48 +0900
Subject: linux-boot: Fix typo.

* gnu/build/linux-boot.scm (mount-root-file-system): Fix typo.
---
 gnu/build/linux-boot.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index f273957d78..84a5447977 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -359,8 +359,9 @@ the last argument of `mknod'."
 (define* (mount-root-file-system root type
                                  #:key volatile-root?)
   "Mount the root file system of type TYPE at device ROOT.  If VOLATILE-ROOT?
-is true, mount ROOT read-only and make it a overlay with a writable tmpfs
-using the kernel build-in overlayfs."
+is true, mount ROOT read-only and make it an overlay with a writable tmpfs
+using the kernel built-in overlayfs."
+
   (if volatile-root?
       (begin
         (mkdir-p "/real-root")
-- 
cgit v1.2.3


From 430ac9ccb43faacd24610d8dbdf8e6f070baaeb7 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 03:08:22 +0200
Subject: gnu: Add emacs-cmake-font-lock.

* gnu/packages/emacs-xyz.scm (emacs-cmake-font-lock): New variable.
---
 gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 855ca73f05..21ce76d3d4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16280,6 +16280,32 @@ mode for editing gnuplot scripts.  It provides syntax highlighting,
 indentation and a command to plot the file.")
     (license license:gpl3+)))
 
+(define-public emacs-cmake-font-lock
+  (let ((commit "e0ceaaae19c13b66f781512e3295bfc6707b56f4")
+        (revision "1"))
+    (package
+      (name "emacs-cmake-font-lock")
+      (version (git-version "0.1.5" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/Lindydancer/cmake-font-lock.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "03gsyn95dlmsn15bl353bphi3qy7ccn5bss3f7n97kf38bllh0yf"))))
+      (build-system emacs-build-system)
+      (native-inputs
+       `(("emacs-faceup" ,emacs-faceup)))
+      (arguments
+       `(#:include (cons "^admin\\/" %default-include)))
+      (home-page "https://github.com/Lindydancer/cmake-font-lock")
+      (synopsis "Advanced type-aware syntax-highlighting for CMake")
+      (description "This package highlights function arguments in CMake
+according to their use.")
+      (license license:gpl3+))))
+
 (define-public emacs-dtrt-indent
   (package
     (name "emacs-dtrt-indent")
-- 
cgit v1.2.3


From c83d7e964d0328637b2e2023f7e39375baaef78f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 03:13:08 +0200
Subject: gnu: emacs-helm-lsp: Fix description.

* gnu/packages/emacs-xyz.scm (emacs-helm-lsp): Fix description.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 21ce76d3d4..4ee53fbe88 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16695,10 +16695,10 @@ and code peeking.")
          ("emacs-lsp-mode" ,emacs-lsp-mode)
          ("emacs-dash" ,emacs-dash)))
       (home-page "https://github.com/emacs-lsp/helm-lsp")
-      (synopsis "Convert keyboard macros to Emacs Lisp")
+      (synopsis "Provide LSP-enhanced completion for symbols")
       (description
-       "This package displays keyboard macros or latest interactive commands
-as Emacs Lisp.")
+       "This package provides completion for symbols from workspaces with a
+LSP-compliant server running.")
       (license license:gpl3+))))
 
 (define-public emacs-helm-notmuch
-- 
cgit v1.2.3


From ac87bc57af9bcb6cbb45eaf90256f8f27e4e8729 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 05:55:19 +0200
Subject: gnu: emacs-vdiff: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-vdiff): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4ee53fbe88..0fc76a4d63 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17095,16 +17095,15 @@ compatible with Emacs' shell modes.")
 
 (define-public emacs-vdiff
   (let ((commit "09e15fc932bfd2febe1d4a65780a532394562b07")
-        (version "0.2.3")
         (revision "1"))
     (package
       (name "emacs-vdiff")
-      (version (git-version version revision commit))
+      (version (git-version "0.2.3" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/justbur/emacs-vdiff/")
+               (url "https://github.com/justbur/emacs-vdiff.git")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -17113,6 +17112,11 @@ compatible with Emacs' shell modes.")
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-hydra" ,emacs-hydra)))
+      (arguments
+       `(#:tests? #t
+         #:test-command '("emacs" "-Q" "-batch" "-L" "."
+                          "-l" "vdiff-test.el"
+                          "-f" "ert-run-tests-batch-and-exit")))
       (home-page "https://github.com/justbur/emacs-vdiff/")
       (synopsis "Frontend for diffing based on vimdiff")
       (description "This package permits comparisons of two or three buffers
-- 
cgit v1.2.3


From 1683e4863af430fa85c790dcca600fad538432e8 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sun, 15 Sep 2019 19:16:06 +0100
Subject: gnu: Add guix-data-service.

* gnu/packages/web.scm (guix-data-service): New variable.
---
 gnu/packages/web.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4509f63f1b..01c7288caa 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -56,6 +56,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix cvs-download)
   #:use-module (guix hg-download)
@@ -77,6 +78,8 @@
   #:use-module (gnu packages check)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages emacs)
+  #:use-module (gnu packages emacs-xyz)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
@@ -4013,6 +4016,98 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
 (define-public python2-feedparser
   (package-with-python2 python-feedparser))
 
+(define-public guix-data-service
+  (let ((commit "bb94f6dd05a33135fa661b86d35d203c0c099dba")
+        (revision "1"))
+    (package
+      (name "guix-data-service")
+      (version (string-append "0.0.1-" revision "." (string-take commit 7)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.savannah.gnu.org/git/guix/data-service.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1y6s4igjvi0293z4d4hbgwifs8avcam71qhis9z4f8mjz6w7vcpb"))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:tests? #f                    ; TODO Tests require PostgreSQL
+         #:modules ((guix build utils)
+                    (guix build gnu-build-system)
+                    (ice-9 rdelim)
+                    (ice-9 popen))
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'set-paths 'set-GUIX_ENVIRONMENT
+             (lambda* (#:key inputs #:allow-other-keys)
+               ;; This means guix.el finds the Emacs modules
+               (setenv "GUIX_ENVIRONMENT"
+                       (assoc-ref inputs "emacs-with-modules"))
+               #t))
+           (add-before 'build 'set-GUILE_AUTO_COMPILE
+             (lambda _
+               ;; To avoid errors relating to guild
+               (setenv "GUILE_AUTO_COMPILE" "0")
+               #t))
+           (add-after 'install 'wrap-executable
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin"))
+                      (guile (assoc-ref inputs "guile"))
+                      (guile-effective-version
+                       (read-line
+                        (open-pipe* OPEN_READ
+                                    (string-append guile "/bin/guile")
+                                    "-c" "(display (effective-version))")))
+                      (scm (string-append out "/share/guile/site/"
+                                          guile-effective-version))
+                      (go  (string-append out "/lib/guile/"
+                                          guile-effective-version
+                                          "/site-ccache")))
+                 (for-each
+                  (lambda (file)
+                    (wrap-program (string-append bin "/" file)
+                      `("PATH" ":" prefix
+                        (,bin))
+                      `("GUILE_LOAD_PATH" ":" prefix
+                        (,scm ,(getenv "GUILE_LOAD_PATH")))
+                      `("GUILE_LOAD_COMPILED_PATH" ":" prefix
+                        (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))
+                  '("guix-data-service"
+                    "guix-data-service-process-branch-updated-email"
+                    "guix-data-service-process-job"
+                    "guix-data-service-process-jobs"
+                    "guix-data-service-query-build-servers"))
+                 #t)))
+           (delete 'strip))))           ; As the .go files aren't compatible
+      (inputs
+       `(("guix" ,guix)
+         ("guile-fibers" ,guile-fibers)
+         ("guile-json" ,guile-json-3)
+         ("guile-email" ,guile-email)
+         ("guile-squee" ,guile-squee)
+         ("postgresql" ,postgresql)
+         ("sqitch" ,sqitch)))
+      (native-inputs
+       `(("guile" ,guile-2.2)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("emacs-with-modules" ,(directory-union
+                                 "emacs-union"
+                                 (list emacs-no-x
+                                       emacs-htmlize)))
+         ("pkg-config" ,pkg-config)))
+      (synopsis "Store and provide data about GNU Guix")
+      (description
+       "The Guix Data Service stores data about GNU Guix, and provides this
+through a web interface.  It supports listening to the guix-commits mailing
+list to find out about new revisions, then loads the data from these in to a
+PostgreSQL database.")
+      (home-page "http://data.guix.gnu.org/")
+      (license license:agpl3+))))
+
 (define-public gumbo-parser
   (package
     (name "gumbo-parser")
-- 
cgit v1.2.3


From dd2a83270bccb539439b2fc831d0db04e5276f11 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sun, 15 Sep 2019 19:16:11 +0100
Subject: services: Add the Guix Data Service.

* gnu/services/guix.scm: New file.
* gnu/tests/guix.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add both new files.
* doc/guix.texi (Guix Services): New section documenting the Guix Data
Service.
---
 doc/guix.texi         |  52 +++++++++++++
 gnu/local.mk          |   2 +
 gnu/services/guix.scm | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++
 gnu/tests/guix.scm    | 173 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 439 insertions(+)
 create mode 100644 gnu/services/guix.scm
 create mode 100644 gnu/tests/guix.scm

diff --git a/doc/guix.texi b/doc/guix.texi
index 9fcce27597..71deca5aba 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11788,6 +11788,7 @@ declaration.
 * Virtualization Services::     Virtualization services.
 * Version Control Services::    Providing remote access to Git repositories.
 * Game Services::               Game servers.
+* Guix Services::               Services relating specifically to Guix.
 * Miscellaneous Services::      Other services.
 @end menu
 
@@ -24327,6 +24328,57 @@ The port to bind the server to.
 @end table
 @end deftp
 
+
+@node Guix Services
+@subsection Guix Services
+
+@subsubheading Guix Data Service
+The @uref{http://data.guix.gnu.org,Guix Data Service} processes, stores
+and provides data about GNU Guix.  This includes information about
+packages, derivations and lint warnings.
+
+The data is stored in a PostgreSQL database, and available through a web
+interface.
+
+@defvar {Scheme Variable} guix-data-service-type
+Service type for the Guix Data Service.  Its value must be a
+@code{guix-data-service-configuration} object.  The service optionally
+extends the getmail service, as the guix-commits mailing list is used to
+find out about changes in the Guix git repository.
+@end defvar
+
+@deftp {Data Type} guix-data-service-configuration
+Data type representing the configuration of the Guix Data Service.
+
+@table @asis
+@item @code{package} (default: @code{guix-data-service})
+The Guix Data Service package to use.
+
+@item @code{user} (default: @code{"guix-data-service"})
+The system user to run the service as.
+
+@item @code{group} (default: @code{"guix-data-service"})
+The system group to run the service as.
+
+@item @code{port} (default: @code{8765})
+The port to bind the web service to.
+
+@item @code{host} (default: @code{"127.0.0.1"})
+The host to bind the web service to.
+
+@item @code{getmail-idle-mailboxes} (default: @code{#f})
+If set, this is the list of mailboxes that the getmail service will be
+configured to listen to.
+
+@item @code{commits-getmail-retriever-configuration} (default: @code{#f})
+If set, this is the @code{getmail-retriever-configuration} object with
+which to configure getmail to fetch mail from the guix-commits mailing
+list.
+
+@end table
+@end deftp
+
+
 @node Miscellaneous Services
 @subsection Miscellaneous Services
 
diff --git a/gnu/local.mk b/gnu/local.mk
index da5fe09446..23fc317d50 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -535,6 +535,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/services/authentication.scm		\
   %D%/services/games.scm			\
   %D%/services/getmail.scm				\
+  %D%/services/guix.scm			\
   %D%/services/kerberos.scm			\
   %D%/services/lirc.scm				\
   %D%/services/virtualization.scm		\
@@ -599,6 +600,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/tests/desktop.scm				\
   %D%/tests/dict.scm				\
   %D%/tests/docker.scm				\
+  %D%/tests/guix.scm				\
   %D%/tests/monitoring.scm                      \
   %D%/tests/nfs.scm				\
   %D%/tests/install.scm				\
diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm
new file mode 100644
index 0000000000..0f0fad39b0
--- /dev/null
+++ b/gnu/services/guix.scm
@@ -0,0 +1,212 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Christopher Baines 
+;;;
+;;; 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 .
+
+(define-module (gnu services guix)
+  #:use-module (ice-9 match)
+  #:use-module (guix gexp)
+  #:use-module (guix records)
+  #:use-module ((gnu packages base)
+                #:select (glibc-utf8-locales))
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages web)
+  #:use-module (gnu services)
+  #:use-module (gnu services base)
+  #:use-module (gnu services admin)
+  #:use-module (gnu services shepherd)
+  #:use-module (gnu services getmail)
+  #:use-module (gnu system shadow)
+  #:export (
+            guix-data-service-configuration
+            guix-data-service-configuration?
+            guix-data-service-package
+            guix-data-service-user
+            guix-data-service-group
+            guix-data-service-port
+            guix-data-service-host
+            guix-data-service-getmail-idle-mailboxes
+            guix-data-service-commits-getmail-retriever-configuration
+
+            guix-data-service-type))
+
+;;;; Commentary:
+;;;
+;;; This module implements a service that to run instances of the Guix Data
+;;; Service, which provides data about Guix over time.
+;;;
+;;;; Code:
+
+(define-record-type* 
+  guix-data-service-configuration make-guix-data-service-configuration
+  guix-data-service-configuration?
+  (package          guix-data-service-package
+                    (default guix-data-service))
+  (user             guix-data-service-configuration-user
+                    (default "guix-data-service"))
+  (group            guix-data-service-configuration-group
+                    (default "guix-data-service"))
+  (port             guix-data-service-port
+                    (default 8765))
+  (host             guix-data-service-host
+                    (default "127.0.0.1"))
+  (getmail-idle-mailboxes
+   guix-data-service-getmail-idle-mailboxes
+   (default #f))
+  (commits-getmail-retriever-configuration
+   guix-data-service-commits-getmail-retriever-configuration
+   (default #f)))
+
+(define (guix-data-service-profile-packages config)
+  "Return the guix-data-service package, this will populate the
+ca-certificates.crt file in the system profile."
+  (list
+   (guix-data-service-package config)))
+
+(define (guix-data-service-shepherd-services config)
+  (match-record config 
+    (package user group port host)
+    (list
+     (shepherd-service
+      (documentation "Guix Data Service web server")
+      (provision '(guix-data-service))
+      (requirement '(postgres networking))
+      (start #~(make-forkexec-constructor
+                (list #$(file-append package
+                                     "/bin/guix-data-service")
+                      "--pid-file=/var/run/guix-data-service/pid"
+                      #$(string-append "--port=" (number->string port))
+                      #$(string-append "--host=" host)
+                      ;; Perform any database migrations when the
+                      ;; service is started
+                      "--update-database")
+
+                #:user #$user
+                #:group #$group
+                #:pid-file "/var/run/guix-data-service/pid"
+                ;; Allow time for migrations to run
+                #:pid-file-timeout 60
+                #:environment-variables
+                `(,(string-append
+                    "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
+                  "LC_ALL=en_US.utf8")
+                #:log-file "/var/log/guix-data-service/web.log"))
+      (stop #~(make-kill-destructor)))
+
+     (shepherd-service
+      (documentation "Guix Data Service process jobs")
+      (provision '(guix-data-service-process-jobs))
+      (requirement '(postgres
+                     networking
+                     ;; Require guix-data-service, as that the database
+                     ;; migrations are handled through this service
+                     guix-data-service))
+      (start #~(make-forkexec-constructor
+                (list
+                 #$(file-append package
+                                "/bin/guix-data-service-process-jobs"))
+                #:user #$user
+                #:group #$group
+                #:environment-variables
+                `("HOME=/var/lib/guix-data-service"
+                  "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt"
+                  ,(string-append
+                    "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
+                  "LC_ALL=en_US.utf8")
+                #:log-file "/var/log/guix-data-service/process-jobs.log"))
+      (stop #~(make-kill-destructor))))))
+
+(define (guix-data-service-activation config)
+  #~(begin
+      (use-modules (guix build utils))
+
+      (define %user (getpw "guix-data-service"))
+
+      (chmod "/var/lib/guix-data-service" #o755)
+
+      (mkdir-p "/var/log/guix-data-service")
+
+      ;; Allow writing the PID file
+      (mkdir-p "/var/run/guix-data-service")
+      (chown "/var/run/guix-data-service"
+             (passwd:uid %user)
+             (passwd:gid %user))))
+
+(define (guix-data-service-account config)
+  (match-record config 
+    (user group)
+    (list (user-group
+           (name group)
+           (system? #t))
+          (user-account
+           (name user)
+           (group group)
+           (system? #t)
+           (comment "Guix Data Service user")
+           (home-directory "/var/lib/guix-data-service")
+           (shell (file-append shadow "/sbin/nologin"))))))
+
+(define (guix-data-service-getmail-configuration config)
+  (match config
+    (($  package user group
+                                          port host
+                                          #f #f)
+     '())
+    (($  package user group
+                                          port host
+                                          getmail-idle-mailboxes
+                                          commits-getmail-retriever-configuration)
+     (list
+      (getmail-configuration
+       (name 'guix-data-service)
+       (user user)
+       (group group)
+       (directory "/var/lib/getmail/guix-data-service")
+       (rcfile
+        (getmail-configuration-file
+         (retriever commits-getmail-retriever-configuration)
+         (destination
+          (getmail-destination-configuration
+           (type "MDA_external")
+           (path (file-append
+                  package
+                  "/bin/guix-data-service-process-branch-updated-email"))))
+         (options
+          (getmail-options-configuration
+           (read-all #f)
+           (delivered-to #f)
+           (received #f)))))
+       (idle getmail-idle-mailboxes))))))
+
+(define guix-data-service-type
+  (service-type
+   (name 'guix-data-service)
+   (extensions
+    (list
+     (service-extension profile-service-type
+                        guix-data-service-profile-packages)
+     (service-extension shepherd-root-service-type
+                        guix-data-service-shepherd-services)
+     (service-extension activation-service-type
+                        guix-data-service-activation)
+     (service-extension account-service-type
+                        guix-data-service-account)
+     (service-extension getmail-service-type
+                        guix-data-service-getmail-configuration)))
+   (default-value
+     (guix-data-service-configuration))
+   (description
+    "Run an instance of the Guix Data Service.")))
diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm
new file mode 100644
index 0000000000..6139e31cf0
--- /dev/null
+++ b/gnu/tests/guix.scm
@@ -0,0 +1,173 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Christopher Baines 
+;;;
+;;; 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 .
+
+(define-module (gnu tests guix)
+  #:use-module (gnu tests)
+  #:use-module (gnu system)
+  #:use-module (gnu system file-systems)
+  #:use-module (gnu system shadow)
+  #:use-module (gnu system vm)
+  #:use-module (gnu services)
+  #:use-module (gnu services guix)
+  #:use-module (gnu services databases)
+  #:use-module (gnu services shepherd)
+  #:use-module (gnu services networking)
+  #:use-module (gnu packages databases)
+  #:use-module (guix packages)
+  #:use-module (guix modules)
+  #:use-module (guix records)
+  #:use-module (guix gexp)
+  #:use-module (guix store)
+  #:use-module (guix utils)
+  #:use-module (ice-9 match)
+  #:export (%test-guix-data-service))
+
+
+;;;
+;;; Guix Data Service
+;;;
+
+(define guix-data-service-initial-database-setup-service
+  (let ((user "guix_data_service")
+        (name "guix_data_service"))
+    (define start-gexp
+      #~(lambda ()
+          (let ((pid (primitive-fork))
+                (postgres (getpwnam "postgres")))
+            (if (eq? pid 0)
+                (dynamic-wind
+                  (const #t)
+                  (lambda ()
+                    (setgid (passwd:gid postgres))
+                    (setuid (passwd:uid postgres))
+                    (primitive-exit
+                     (if (and
+                          (zero?
+                           (system* #$(file-append postgresql "/bin/createuser")
+                                    #$user))
+                          (zero?
+                           (system* #$(file-append postgresql "/bin/createdb")
+                                    "-O" #$user #$name)))
+                         0
+                         1)))
+                  (lambda ()
+                    (primitive-exit 1)))
+                (zero? (cdr (waitpid pid)))))))
+
+    (shepherd-service
+     (requirement '(postgres))
+     (provision '(guix-data-service-initial-database-setup))
+     (start start-gexp)
+     (stop #~(const #f))
+     (respawn? #f)
+     (one-shot? #t)
+     (documentation "Setup Guix Data Service database."))))
+
+(define %guix-data-service-os
+  (simple-operating-system
+   (service dhcp-client-service-type)
+   (service postgresql-service-type
+            (postgresql-configuration
+             (config-file
+              (postgresql-config-file
+               (hba-file
+                (plain-file "pg_hba.conf"
+                            "
+local	all	all			trust
+host	all	all	127.0.0.1/32 	trust
+host	all	all	::1/128 	trust"))))))
+   (service guix-data-service-type
+            (guix-data-service-configuration
+             (host "0.0.0.0")))
+   (simple-service 'guix-data-service-database-setup
+                   shepherd-root-service-type
+                   (list guix-data-service-initial-database-setup-service))))
+
+(define (run-guix-data-service-test)
+  (define os
+    (marionette-operating-system
+     %guix-data-service-os
+     #:imported-modules '((gnu services herd)
+                          (guix combinators))))
+
+  (define forwarded-port 8080)
+
+  (define vm
+    (virtual-machine
+     (operating-system os)
+     (memory-size 1024)
+     (port-forwardings `((,forwarded-port . 8765)))))
+
+  (define test
+    (with-imported-modules '((gnu build marionette))
+      #~(begin
+          (use-modules (srfi srfi-11) (srfi srfi-64)
+                       (gnu build marionette)
+                       (web uri)
+                       (web client)
+                       (web response))
+
+          (define marionette
+            (make-marionette (list #$vm)))
+
+          (mkdir #$output)
+          (chdir #$output)
+
+          (test-begin "guix-data-service")
+
+          (test-assert "service running"
+            (marionette-eval
+             '(begin
+                (use-modules (gnu services herd))
+                (match (start-service 'guix-data-service)
+                  (#f #f)
+                  (('service response-parts ...)
+                   (match (assq-ref response-parts 'running)
+                     ((pid) (number? pid))))))
+             marionette))
+
+          (test-assert "process jobs service running"
+            (marionette-eval
+             '(begin
+                (use-modules (gnu services herd))
+                (match (start-service 'guix-data-service-process-jobs)
+                  (#f #f)
+                  (('service response-parts ...)
+                   (match (assq-ref response-parts 'running)
+                     ((pid) (number? pid))))))
+             marionette))
+
+          (test-equal "http-get"
+            200
+            (let-values
+                (((response text)
+                  (http-get #$(simple-format
+                               #f "http://localhost:~A/healthcheck" forwarded-port)
+                            #:decode-body? #t)))
+              (response-code response)))
+
+          (test-end)
+          (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
+
+  (gexp->derivation "guix-data-service-test" test))
+
+(define %test-guix-data-service
+  (system-test
+   (name "guix-data-service")
+   (description "Connect to a running Guix Data Service.")
+   (value (run-guix-data-service-test))))
-- 
cgit v1.2.3


From 0876e9c116125b28806286b0313ff78de5948562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 10:45:38 +0200
Subject: colors: Add 'dim'.

* guix/colors.scm (coloring-procedure): New procedure.
(%highlight-color): Remove.
(highlight): Define in terms of 'coloring-procedure'.
(dim): New procedure.
---
 guix/colors.scm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/guix/colors.scm b/guix/colors.scm
index 7949cf5763..b63ac37027 100644
--- a/guix/colors.scm
+++ b/guix/colors.scm
@@ -31,6 +31,8 @@
 
             colorize-string
             highlight
+            dim
+
             color-rules
             color-output?
             isatty?*))
@@ -133,14 +135,16 @@ that subsequent output will not have any colors in effect."
        (not (getenv "NO_COLOR"))
        (isatty?* port)))
 
-(define %highlight-color (color BOLD))
+(define (coloring-procedure color)
+  "Return a procedure that applies COLOR to the given string."
+  (lambda* (str #:optional (port (current-output-port)))
+    "Return STR with extra ANSI color attributes if PORT supports it."
+    (if (color-output? port)
+        (colorize-string str color)
+        str)))
 
-(define* (highlight str #:optional (port (current-output-port)))
-  "Return STR with extra ANSI color attributes to highlight it if PORT
-supports it."
-  (if (color-output? port)
-      (colorize-string str %highlight-color)
-      str))
+(define highlight (coloring-procedure (color BOLD)))
+(define dim (coloring-procedure (color DARK)))
 
 (define (colorize-matches rules)
   "Return a procedure that, when passed a string, returns that string
-- 
cgit v1.2.3


From d26c290b7dac642c39f23fd65b4eb0d10534d58d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 10:48:50 +0200
Subject: pull: Dim the commit ID when displaying news.

* guix/scripts/pull.scm (display-news-entry): Dim the commit line.
---
 guix/scripts/pull.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 2b7b991b50..0372278705 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -249,7 +249,7 @@ PORT."
     (channel-news-entry-body entry))
 
   (display-news-entry-title entry language port)
-  (format port (G_ "    commit ~a~%")
+  (format port (dim (G_ "    commit ~a~%"))
           (channel-news-entry-commit entry))
   (newline port)
   (format port "    ~a~%"
-- 
cgit v1.2.3


From 012c93e916279f7df0e495aa1a73f696de15b80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 14:43:46 +0200
Subject: doc: Support paren matching via CSS hover.

* doc/build.scm (syntax-highlighted-html)[build](pair-open/close)
(highlights->sxml*): New procedures.
(syntax-highlight): Use 'highlights->sxml*'.
---
 doc/build.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/doc/build.scm b/doc/build.scm
index 5bc95d2517..b6a921c421 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -215,6 +215,58 @@ its 
 blocks (as produced by 'makeinfo --html')."
                          (ice-9 match)
                          (ice-9 threads))
 
+            (define (pair-open/close lst)
+              ;; Pair 'open' and 'close' tags produced by 'highlights' and
+              ;; produce nested 'paren' tags instead.
+              (let loop ((lst lst)
+                         (level 0)
+                         (result '()))
+                (match lst
+                  ((('open open) rest ...)
+                   (call-with-values
+                       (lambda ()
+                         (loop rest (+ 1 level) '()))
+                     (lambda (inner close rest)
+                       (loop rest level
+                             (cons `(paren ,level ,open ,inner ,close)
+                                   result)))))
+                  ((('close str) rest ...)
+                   (if (> level 0)
+                       (values (reverse result) str rest)
+                       (begin
+                         (format (current-error-port)
+                                 "warning: extra closing paren; context:~% ~y~%"
+                                 (reverse result))
+                         (loop rest 0 (cons `(close ,str) result)))))
+                  ((item rest ...)
+                   (loop rest level (cons item result)))
+                  (()
+                   (when (> level 0)
+                     (format (current-error-port)
+                             "warning: missing ~a closing parens; context:~% ~y%"
+                             level (reverse result)))
+                   (values (reverse result) "" '())))))
+
+            (define (highlights->sxml* highlights)
+              ;; Like 'highlights->sxml', but handle nested 'paren tags.  This
+              ;; allows for paren matching highlights via appropriate CSS
+              ;; "hover" properties.
+              (define (tag->class tag)
+                (string-append "syntax-" (symbol->string tag)))
+
+              (map (match-lambda
+                     ((? string? str) str)
+                     (('paren level open (body ...) close)
+                      `(span (@ (class ,(string-append "syntax-paren"
+                                                       (number->string level))))
+                             ,open
+                             (span (@ (class "syntax-symbol"))
+                                   ,@(highlights->sxml* body))
+                             ,close))
+                     ((tag text)
+                      `(span (@ (class ,(tag->class tag))) ,text)))
+                   highlights))
+
             (define entity->string
               (match-lambda
                 ("rArr"   "⇒")
@@ -252,9 +304,10 @@ its 
 blocks (as produced by 'makeinfo --html')."
                                  (href #$syntax-css-url)))))
                 (('pre ('@ ('class "lisp")) code-snippet ...)
                  `(pre (@ (class "lisp"))
-                       ,(highlights->sxml
-                         (highlight lex-scheme
-                                    (concatenate-snippets code-snippet)))))
+                       ,@(highlights->sxml*
+                          (pair-open/close
+                           (highlight lex-scheme
+                                      (concatenate-snippets code-snippet))))))
                 ((tag ('@ attributes ...) body ...)
                  `(,tag (@ ,@attributes) ,@(map syntax-highlight body)))
                 ((tag body ...)
-- 
cgit v1.2.3


From 4b67b9db7d58ef6596c9b69a3d530bc7100ab038 Mon Sep 17 00:00:00 2001
From: Divan Santana 
Date: Mon, 23 Sep 2019 12:54:56 +0200
Subject: gnu: emacs-exwm: Update to 0.23.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-exwm): Update to 0.23.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0fc76a4d63..84cfc75ebc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8694,7 +8694,7 @@ It should enable you to implement low-level X11 applications.")
 (define-public emacs-exwm
   (package
     (name "emacs-exwm")
-    (version "0.22")
+    (version "0.23")
     (synopsis "Emacs X window manager")
     (source (origin
               (method url-fetch)
@@ -8702,7 +8702,7 @@ It should enable you to implement low-level X11 applications.")
                                   version ".tar"))
               (sha256
                (base32
-                "0lppm8ng37i5s4x7xdrxhjbdcnpl6pyvn4g7w52zbckjsn8qnqh0"))))
+                "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-xelb" ,emacs-xelb)))
-- 
cgit v1.2.3


From 82b6bf8c0f05988305c126b5a6b196e1d57a19ea Mon Sep 17 00:00:00 2001
From: Brice Waegeneire 
Date: Tue, 24 Sep 2019 00:28:52 +0200
Subject: doc: Fix installing Guix in VM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc/guix.texi (Installing Guix in a Virtual Machine):
Pass "order=d" to '-boot' option.  Use "-drive media=cdrom" for the ISO
image.  Remove paragraph about ordering and the boot menu.

Signed-off-by: Ludovic Courtès 
---
 doc/guix.texi | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 71deca5aba..dd54f7f747 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2442,17 +2442,13 @@ Boot the USB installation image in an VM:
 
 @example
 qemu-system-x86_64 -m 1024 -smp 1 -enable-kvm \
-  -net user -net nic,model=virtio -boot menu=on \
-  -drive file=guix-system-install-@value{VERSION}.@var{system}.iso \
-  -drive file=guix-system.img
+  -net user -net nic,model=virtio -boot menu=on,order=d \
+  -drive file=guix-system.img \
+  -drive media=cdrom,file=guix-system-install-@value{VERSION}.@var{system}.iso
 @end example
 
-The ordering of the drives matters.  @code{-enable-kvm} is optional, but
-significantly improves performance, @pxref{Running Guix in a VM}.
-
-In the VM console, quickly press the @kbd{F12} key to enter the boot
-menu.  Then press the @kbd{2} key and the @kbd{RET} key to validate your
-selection.
+@code{-enable-kvm} is optional, but significantly improves performance,
+@pxref{Running Guix in a VM}.
 
 @item
 You're now root in the VM, proceed with the installation process.
-- 
cgit v1.2.3


From 34e624a56ad42f93d8526f7c7e2025d26a4cba5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 15:38:26 +0200
Subject: doc: Avoid @verbatiminclude for Scheme snippets.

* doc/guix.texi (Invoking guix package): Use @include instead of
@verbatiminclude.
(Additional Build Options): Likewise.
---
 doc/guix.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index dd54f7f747..267c2e9e6c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2755,7 +2755,7 @@ As an example, @var{file} might contain a definition like this
 (@pxref{Defining Packages}):
 
 @lisp
-@verbatiminclude package-hello.scm
+@include package-hello.scm
 @end lisp
 
 Developers may find it useful to include such a @file{guix.scm} file
@@ -8231,7 +8231,7 @@ As an example, @var{file} might contain a package definition like this
 (@pxref{Defining Packages}):
 
 @lisp
-@verbatiminclude package-hello.scm
+@include package-hello.scm
 @end lisp
 
 @item --expression=@var{expr}
-- 
cgit v1.2.3


From 195854a50ce8e9abe15db24b4808f78fe52ce620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wiktor=20=C5=BBelazny?= 
Date: Mon, 16 Sep 2019 18:18:06 +0200
Subject: gnu: Add r-assertable.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/cran.scm (r-assertable): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index cb0be4aedd..89a581cb5e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15610,3 +15610,30 @@ deprecated, and defunct).  It makes it easy to insert badges corresponding to
 these stages in your documentation.  Usage of deprecated functions are
 signalled with increasing levels of non-invasive verbosity.")
     (license license:gpl3)))
+
+(define-public r-assertable
+  (package
+    (name "r-assertable")
+    (version "0.2.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "assertable" version))
+       (sha256
+        (base32
+         "0jjd6ylh26fykzzv1q2lbajzfj07lyxwb3b3xmr2zdg2fp5b2w4c"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-data-table" ,r-data-table)))
+    (home-page "https://cran.r-project.org/web/packages/assertable/")
+    (synopsis "Verbose assertions for tabular data (data.frames and data.tables)")
+    (description "This package provides simple, flexible assertions on
+data.frame or data.table objects with verbose output for vetting.  While other
+assertion packages apply towards more general use-cases, @code{assertable} is
+tailored towards tabular data.  It includes functions to check variable names
+and values, whether the dataset contains all combinations of a given set of
+unique identifiers, and whether it is a certain length.  In addition,
+@code{assertable} includes utility functions to check the existence of target
+files and to efficiently import multiple tabular data files into one
+data.table.")
+    (license license:gpl3)))
-- 
cgit v1.2.3


From a3246602a271540b3ab21eb904b287da4f324eb8 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 24 Sep 2019 11:56:10 +0200
Subject: gnu: guile-parted: Update to 0.0.2.

* gnu/packages/guile-xyz.scm (guile-parted): Update to 0.0.2.
---
 gnu/packages/guile-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 2736b36a38..43a599b503 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2016, 2019 Jan Nieuwenhuizen 
 ;;; Copyright © 2017 Andy Wingo 
 ;;; Copyright © 2017 David Thompson 
-;;; Copyright © 2017, 2018 Mathieu Othacehe 
+;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe 
 ;;; Copyright © 2017 Theodoros Foradis 
 ;;; Copyright © 2017 ng0 
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
@@ -1024,7 +1024,7 @@ microblogging service.")
 (define-public guile-parted
   (package
     (name "guile-parted")
-    (version "0.0.1")
+    (version "0.0.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1033,7 +1033,7 @@ microblogging service.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1q7425gpjlwi2wvhzq7kw046yyx7v6j6jyzkd1cr861iz34mjwiq"))))
+                "01qmv6xnbbq3wih0dl9bscvca2d7zx7bjiqf35y6dkaqsp8nvdxf"))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags
-- 
cgit v1.2.3


From 70c7b7c79920dd6500ba5e4e88fe147cc44923d8 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Tue, 24 Sep 2019 11:56:46 +0200
Subject: installer: Update to Guile-Parted 0.0.2 release.

* gnu/installer/parted.scm (data-partition?, metadata-partition?,
freespace-partition?, normal-partition?, extended-partition?,
logical-partition?): Remove, as now provided by Guile-Parted.
* gnu/installer/newt/partition.scm (run-disk-page): Remove disk-destroy calls,
replace disk-delete-all by disk-remove-all-partitions and
disk-delete-partition by disk-remove-partition*.
---
 gnu/installer/newt/partition.scm |  9 +++-----
 gnu/installer/parted.scm         | 48 ++++------------------------------------
 2 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 7a9f11a15e..74e9473171 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -587,7 +587,6 @@ edit it."
                                           disks))
                      (new-user-partitions
                       (remove-user-partition-by-disk user-partitions item)))
-                (disk-destroy item)
                 `((disks . ,(cons new-disk other-disks))
                   (user-partitions . ,new-user-partitions)))
               `((disks . ,disks)
@@ -625,7 +624,7 @@ edit it."
                                       info-text)))
           (case result
             ((1)
-             (disk-delete-all item)
+             (disk-remove-all-partitions item)
              `((disks . ,disks)
                (user-partitions
                 . ,(remove-user-partition-by-disk user-partitions item))))
@@ -649,7 +648,7 @@ edit it."
                  (let ((new-user-partitions
                         (remove-user-partition-by-partition user-partitions
                                                             item)))
-                   (disk-delete-partition disk item)
+                   (disk-remove-partition* disk item)
                    `((disks . ,disks)
                      (user-partitions . ,new-user-partitions))))
                 (else
@@ -696,9 +695,7 @@ by pressing the Exit button.~%~%")))
                        #f))
                  (check-user-partitions user-partitions))))
           (if user-partitions-ok?
-              (begin
-                (for-each (cut disk-destroy <>) disks)
-                user-partitions)
+              user-partitions
               (run-disk-page disks user-partitions
                              #:guided? guided?)))
         (let* ((result-disks (assoc-ref result 'disks))
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 682e233d9f..3439f211e2 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -64,13 +64,7 @@
             user-partition-parted-object
 
             find-esp-partition
-            data-partition?
-            metadata-partition?
-            freespace-partition?
             small-freespace-partition?
-            normal-partition?
-            extended-partition?
-            logical-partition?
             esp-partition?
             boot-partition?
             default-esp-mount-point
@@ -172,24 +166,6 @@
   "Find and return the ESP partition among PARTITIONS."
   (find esp-partition? partitions))
 
-(define (data-partition? partition)
-  "Return #t if PARTITION is a partition dedicated to data (by opposition to
-freespace, metadata and protected partition types), return #f otherwise."
-  (let ((type (partition-type partition)))
-    (not (any (lambda (flag)
-                (member flag type))
-              '(free-space metadata protected)))))
-
-(define (metadata-partition? partition)
-  "Return #t if PARTITION is a metadata partition, #f otherwise."
-  (let ((type (partition-type partition)))
-    (member 'metadata type)))
-
-(define (freespace-partition? partition)
-  "Return #t if PARTITION is a free-space partition, #f otherwise."
-  (let ((type (partition-type partition)))
-    (member 'free-space type)))
-
 (define* (small-freespace-partition? device
                                      partition
                                      #:key (max-size MEBIBYTE-SIZE))
@@ -200,21 +176,6 @@ inferior to MAX-SIZE, #f otherwise."
                             (device-sector-size device))))
     (< size max-sector-size)))
 
-(define (normal-partition? partition)
-  "return #t if partition is a normal partition, #f otherwise."
-  (let ((type (partition-type partition)))
-    (member 'normal type)))
-
-(define (extended-partition? partition)
-  "return #t if partition is an extended partition, #f otherwise."
-  (let ((type (partition-type partition)))
-    (member 'extended type)))
-
-(define (logical-partition? partition)
-  "Return #t if PARTITION is a logical partition, #f otherwise."
-  (let ((type (partition-type partition)))
-    (member 'logical type)))
-
 (define (partition-user-type partition)
   "Return the type of PARTITION, to be stored in the TYPE field of
  record. It can be 'normal, 'extended or 'logical."
@@ -813,7 +774,7 @@ cause them to cross."
 (define (rmpart disk number)
   "Remove the partition with the given NUMBER on DISK."
   (let ((partition (disk-get-partition disk number)))
-    (disk-remove-partition disk partition)))
+    (disk-remove-partition* disk partition)))
 
 
 ;;
@@ -928,12 +889,12 @@ exists."
 
     (if has-extended?
         ;; msdos - remove everything.
-        (disk-delete-all disk)
+        (disk-remove-all-partitions disk)
         ;; gpt - remove everything but esp if it exists.
         (for-each
          (lambda (partition)
            (and (data-partition? partition)
-                (disk-remove-partition disk partition)))
+                (disk-remove-partition* disk partition)))
          non-boot-partitions))
 
     (let* ((start-partition
@@ -1348,7 +1309,7 @@ USER-PARTITIONS, or return nothing."
 
 (define (init-parted)
   "Initialize libparted support."
-  (probe-all-devices)
+  (probe-all-devices!)
   (exception-set-handler (lambda (exception)
                            EXCEPTION-OPTION-UNHANDLED)))
 
@@ -1364,7 +1325,6 @@ the devices not to be used before returning."
   ;; https://mail.gnome.org/archives/commits-list/2013-March/msg18423.html.
   (let ((device-file-names (map device-path devices)))
     (for-each force-device-sync devices)
-    (free-all-devices)
     (for-each (lambda (file-name)
                 (let ((in-use? (with-delay-device-in-use? file-name)))
                   (and in-use?
-- 
cgit v1.2.3


From 193cbb3d61cdf3b69e8c00e9b84df66364c52766 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 25 Sep 2019 16:40:34 +0200
Subject: gnu: freeimage: Build with the C++ 11 standard.

This is a follow-up to commit 942c7889498fc8e680a16d500e166c9ade84e640.

* gnu/packages/image.scm (freeimage)[arguments]: Pass -std=gnu++11 in CFLAGS.
---
 gnu/packages/image.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 2a9ee990be..dbc0159e22 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -981,8 +981,11 @@ supplies a generic doubly-linked list and some string functions.")
             ;; We need '-fpermissive' for Source/FreeImage.h.
             ;; libjxr doesn't have a pkg-config file.
             (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive "
-                           ;"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"
-                           ))
+                           ;;"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"
+
+                           ;; FIXME: OpenEXR 2.4.0 requires C++11 or later.
+                           ;; Remove when the default compiler is > GCC 5.
+                           "-std=gnu++11"))
       #:tests? #f)) ; no check target
    (native-inputs
     `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From 8b9570adc16e62c923d14f1f5ecbc8eb5b89c985 Mon Sep 17 00:00:00 2001
From: Kei Kebreau 
Date: Mon, 7 Jan 2019 19:32:02 -0500
Subject: gnu: libjxr: Build and install shared library.

* gnu/packages/image.scm (libjxr)[arguments]: Add -fPIC to CFLAGS for shared
library support.  Add 'build-shared-library' phase and modify 'install' phase
to install the shared libraries.

Signed-off-by: Marius Bakke 
---
 gnu/packages/image.scm | 90 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 60 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index dbc0159e22..d1a4a58575 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -437,36 +437,66 @@ lossless JPEG manipulations such as rotation, scaling or cropping:
               (patches (search-patches "libjxr-fix-function-signature.patch"
                                        "libjxr-fix-typos.patch"))))
     (build-system gnu-build-system)
-    (arguments '(#:make-flags '("CC=gcc")
-                 #:tests? #f ; no check target
-                 #:phases
-                 (modify-phases %standard-phases
-                   (delete 'configure) ; no configure script
-                   ;; The upstream makefile does not include an install phase.
-                   (replace 'install
-                     (lambda* (#:key outputs #:allow-other-keys)
-                       (let* ((out (assoc-ref outputs "out"))
-                              (bin (string-append out "/bin"))
-                              (lib (string-append out "/lib"))
-                              (include (string-append out "/include/jxrlib")))
-                         (for-each (lambda (file)
-                                     (install-file file include)
-                                     (delete-file file))
-                                   (append
-                                    '("jxrgluelib/JXRGlue.h"
-                                      "jxrgluelib/JXRMeta.h"
-                                      "jxrtestlib/JXRTest.h"
-                                      "image/sys/windowsmediaphoto.h")
-                                    (find-files "common/include" "\\.h$")))
-                         (for-each (lambda (file)
-                                     (install-file file lib)
-                                     (delete-file file))
-                                   (find-files "." "\\.a$"))
-                         (for-each (lambda (file)
-                                     (install-file file bin)
-                                     (delete-file file))
-                                   '("JxrDecApp" "JxrEncApp")))
-                       #t)))))
+    (arguments
+     '(#:make-flags
+       (list "CC=gcc"
+             ;; A substitute* procedure call would be enough to add the -fPIC
+             ;; flag if there was no file decoding error.
+             ;; The makefile is a "Non-ISO extended-ASCII text, with CRLF line
+             ;; terminators" according to the file(1) utility.
+             (string-append "CFLAGS=-I. -Icommon/include -Iimage/sys -fPIC "
+                            "-D__ANSI__ -DDISABLE_PERF_MEASUREMENT -w -O "))
+       #:tests? #f ; no check target
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure) ; no configure script
+         (add-after 'build 'build-shared-library
+           (lambda _
+             ;; The Makefile uses optimization level 1, so the same
+             ;; level is used here for consistency.
+             (invoke "gcc" "-shared" "-fPIC" "-O"
+                     ;; Common files.
+                     "adapthuff.o" "image.o" "strcodec.o" "strPredQuant.o"
+                     "strTransform.o" "perfTimerANSI.o"
+                     ;; Decoding files.
+                     "decode.o" "postprocess.o" "segdec.o" "strdec.o"
+                     "strInvTransform.o" "strPredQuantDec.o" "JXRTranscode.o"
+                     ;; Encoding files.
+                     "encode.o" "segenc.o" "strenc.o" "strFwdTransform.o"
+                     "strPredQuantEnc.o"
+                     "-o" "libjpegxr.so")
+             (invoke "gcc" "-shared" "-fPIC" "-O"
+                     ;; Glue files.
+                     "JXRGlue.o" "JXRMeta.o" "JXRGluePFC.o" "JXRGlueJxr.o"
+                     ;; Test files.
+                     "JXRTest.o" "JXRTestBmp.o" "JXRTestHdr.o" "JXRTestPnm.o"
+                     "JXRTestTif.o" "JXRTestYUV.o"
+                     "-o" "libjxrglue.so")))
+         ;; The upstream makefile does not include an install phase.
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib (string-append out "/lib"))
+                    (include (string-append out "/include/jxrlib")))
+               (for-each (lambda (file)
+                           (install-file file include)
+                           (delete-file file))
+                         (append
+                          '("jxrgluelib/JXRGlue.h"
+                            "jxrgluelib/JXRMeta.h"
+                            "jxrtestlib/JXRTest.h"
+                            "image/sys/windowsmediaphoto.h")
+                          (find-files "common/include" "\\.h$")))
+               (for-each (lambda (file)
+                           (install-file file lib)
+                           (delete-file file))
+                         (find-files "." "\\.(a|so)$"))
+               (for-each (lambda (file)
+                           (install-file file bin)
+                           (delete-file file))
+                         '("JxrDecApp" "JxrEncApp")))
+             #t)))))
     (synopsis "Implementation of the JPEG XR standard")
     (description "JPEG XR is an approved ISO/IEC International standard (its
 official designation is ISO/IEC 29199-2). This library is an implementation of that standard.")
-- 
cgit v1.2.3


From 8dc3c2a7d5fbe28b6f8ae27788b053be0d87b0b6 Mon Sep 17 00:00:00 2001
From: Kei Kebrau 
Date: Mon, 7 Jan 2019 19:36:49 -0500
Subject: gnu: freeimage: Update to 3.18.0.

* gnu/packages/image.scm (freeimage): Update to 3.18.0.
[source]: Modify snippet to remove the bundled libjxr. Remove obsolete
patches.
[arguments]: Add libjxr include directory to #:make-flags.
[inputs]: Add libjxr.
* gnu/packages/patches/freeimage-CVE-2015-0852.patch,
gnu/packages/patches/freeimage-CVE-2016-5684.patch,
gnu/packages/patches/freeimage-fix-build-with-gcc-5.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Unregister patches.
* gnu/packages/patches/freeimage-unbundle.patch: Update patch.

Signed-off-by: Marius Bakke 
---
 gnu/local.mk                                       |    3 -
 gnu/packages/image.scm                             |   16 +-
 gnu/packages/patches/freeimage-CVE-2015-0852.patch |  129 --
 gnu/packages/patches/freeimage-CVE-2016-5684.patch |   34 -
 .../patches/freeimage-fix-build-with-gcc-5.patch   | 1453 --------------------
 gnu/packages/patches/freeimage-unbundle.patch      |  167 ++-
 6 files changed, 138 insertions(+), 1664 deletions(-)
 delete mode 100644 gnu/packages/patches/freeimage-CVE-2015-0852.patch
 delete mode 100644 gnu/packages/patches/freeimage-CVE-2016-5684.patch
 delete mode 100644 gnu/packages/patches/freeimage-fix-build-with-gcc-5.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 23fc317d50..919e836b8c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -828,9 +828,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/flint-ldconfig.patch			\
   %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch	\
   %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch	\
-  %D%/packages/patches/freeimage-CVE-2015-0852.patch		\
-  %D%/packages/patches/freeimage-CVE-2016-5684.patch		\
-  %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch	\
   %D%/packages/patches/freeimage-unbundle.patch		\
   %D%/packages/patches/fuse-overlapping-headers.patch				\
   %D%/packages/patches/gawk-shell.patch				\
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index d1a4a58575..d03f4548c5 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -957,7 +957,7 @@ supplies a generic doubly-linked list and some string functions.")
 (define-public freeimage
   (package
    (name "freeimage")
-   (version "3.17.0")
+   (version "3.18.0")
    (source (origin
             (method url-fetch)
             (uri (string-append
@@ -967,7 +967,7 @@ supplies a generic doubly-linked list and some string functions.")
                   ".zip"))
             (sha256
              (base32
-              "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v"))
+              "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"))
             (modules '((guix build utils)))
             (snippet
              '(begin
@@ -975,12 +975,8 @@ supplies a generic doubly-linked list and some string functions.")
                   (lambda (dir)
                     (delete-file-recursively (string-append "Source/" dir)))
                   '("LibJPEG" "LibOpenJPEG" "LibPNG" "LibRawLite"
-                    ;; "LibJXR"
-                    "LibWebP" "OpenEXR" "ZLib"))))
-            (patches (search-patches "freeimage-unbundle.patch"
-                                     "freeimage-CVE-2015-0852.patch"
-                                     "freeimage-CVE-2016-5684.patch"
-                                     "freeimage-fix-build-with-gcc-5.patch"))))
+                    "LibJXR" "LibWebP" "OpenEXR" "ZLib"))))
+            (patches (search-patches "freeimage-unbundle.patch"))))
    (build-system gnu-build-system)
    (arguments
     '(#:phases
@@ -1011,7 +1007,7 @@ supplies a generic doubly-linked list and some string functions.")
             ;; We need '-fpermissive' for Source/FreeImage.h.
             ;; libjxr doesn't have a pkg-config file.
             (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive "
-                           ;;"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"
+                           "-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib "
 
                            ;; FIXME: OpenEXR 2.4.0 requires C++11 or later.
                            ;; Remove when the default compiler is > GCC 5.
@@ -1022,7 +1018,7 @@ supplies a generic doubly-linked list and some string functions.")
       ("unzip" ,unzip)))
    (inputs
     `(("libjpeg" ,libjpeg)
-      ;("libjxr" ,libjxr)
+      ("libjxr" ,libjxr)
       ("libpng" ,libpng)
       ("libraw" ,libraw)
       ("libtiff" ,libtiff)
diff --git a/gnu/packages/patches/freeimage-CVE-2015-0852.patch b/gnu/packages/patches/freeimage-CVE-2015-0852.patch
deleted file mode 100644
index 34d538e925..0000000000
--- a/gnu/packages/patches/freeimage-CVE-2015-0852.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Copied from Debian.
-
-Description: fix integer overflow
-Origin: upstream
- http://freeimage.cvs.sourceforge.net/viewvc/freeimage/FreeImage/Source/FreeImage/PluginPCX.cpp?view=patch&r1=1.17&r2=1.18&pathrev=MAIN
- http://freeimage.cvs.sourceforge.net/viewvc/freeimage/FreeImage/Source/FreeImage/PluginPCX.cpp?view=patch&r1=1.18&r2=1.19&pathrev=MAIN
-Bug-Debian: https://bugs.debian.org/797165
-Last-Update: 2015-09-14
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: freeimage/Source/FreeImage/PluginPCX.cpp
-===================================================================
---- freeimage.orig/Source/FreeImage/PluginPCX.cpp
-+++ freeimage/Source/FreeImage/PluginPCX.cpp
-@@ -347,12 +347,14 @@ Load(FreeImageIO *io, fi_handle handle,
- 
- 	try {
- 		// check PCX identifier
--
--		long start_pos = io->tell_proc(handle);
--		BOOL validated = pcx_validate(io, handle);		
--		io->seek_proc(handle, start_pos, SEEK_SET);
--		if(!validated) {
--			throw FI_MSG_ERROR_MAGIC_NUMBER;
-+		// (note: should have been already validated using FreeImage_GetFileType but check again)
-+		{
-+			long start_pos = io->tell_proc(handle);
-+			BOOL validated = pcx_validate(io, handle);
-+			io->seek_proc(handle, start_pos, SEEK_SET);
-+			if(!validated) {
-+				throw FI_MSG_ERROR_MAGIC_NUMBER;
-+			}
- 		}
- 
- 		// process the header
-@@ -366,20 +368,38 @@ Load(FreeImageIO *io, fi_handle handle,
- 		SwapHeader(&header);
- #endif
- 
--		// allocate a new DIB
-+		// process the window
-+		const WORD *window = header.window;	// left, upper, right,lower pixel coord.
-+		const int left		= window[0];
-+		const int top		= window[1];
-+		const int right		= window[2];
-+		const int bottom	= window[3];
- 
--		unsigned width = header.window[2] - header.window[0] + 1;
--		unsigned height = header.window[3] - header.window[1] + 1;
--		unsigned bitcount = header.bpp * header.planes;
--
--		if (bitcount == 24) {
--			dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
--		} else {
--			dib = FreeImage_AllocateHeader(header_only, width, height, bitcount);			
-+		// check image size
-+		if((left >= right) || (top >= bottom)) {
-+			throw FI_MSG_ERROR_PARSING;
- 		}
- 
--		// if the dib couldn't be allocated, throw an error
-+		const unsigned width = right - left + 1;
-+		const unsigned height = bottom - top + 1;
-+		const unsigned bitcount = header.bpp * header.planes;
-+
-+		// allocate a new DIB
-+		switch(bitcount) {
-+			case 1:
-+			case 4:
-+			case 8:
-+				dib = FreeImage_AllocateHeader(header_only, width, height, bitcount);
-+				break;
-+			case 24:
-+				dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
-+				break;
-+			default:
-+				throw FI_MSG_ERROR_DIB_MEMORY;
-+				break;
-+		}
- 
-+		// if the dib couldn't be allocated, throw an error
- 		if (!dib) {
- 			throw FI_MSG_ERROR_DIB_MEMORY;
- 		}
-@@ -426,19 +446,23 @@ Load(FreeImageIO *io, fi_handle handle,
- 
- 				if (palette_id == 0x0C) {
- 					BYTE *cmap = (BYTE*)malloc(768 * sizeof(BYTE));
--					io->read_proc(cmap, 768, 1, handle);
- 
--					pal = FreeImage_GetPalette(dib);
--					BYTE *pColormap = &cmap[0];
-+					if(cmap) {
-+						io->read_proc(cmap, 768, 1, handle);
- 
--					for(int i = 0; i < 256; i++) {
--						pal[i].rgbRed   = pColormap[0];
--						pal[i].rgbGreen = pColormap[1];
--						pal[i].rgbBlue  = pColormap[2];
--						pColormap += 3;
-+						pal = FreeImage_GetPalette(dib);
-+						BYTE *pColormap = &cmap[0];
-+
-+						for(int i = 0; i < 256; i++) {
-+							pal[i].rgbRed   = pColormap[0];
-+							pal[i].rgbGreen = pColormap[1];
-+							pal[i].rgbBlue  = pColormap[2];
-+							pColormap += 3;
-+						}
-+
-+						free(cmap);
- 					}
- 
--					free(cmap);
- 				}
- 
- 				// wrong palette ID, perhaps a gray scale is needed ?
-@@ -466,9 +490,9 @@ Load(FreeImageIO *io, fi_handle handle,
- 		// calculate the line length for the PCX and the DIB
- 
- 		// length of raster line in bytes
--		unsigned linelength = header.bytes_per_line * header.planes;
-+		const unsigned linelength = header.bytes_per_line * header.planes;
- 		// length of DIB line (rounded to DWORD) in bytes
--		unsigned pitch = FreeImage_GetPitch(dib);
-+		const unsigned pitch = FreeImage_GetPitch(dib);
- 
- 		// run-length encoding ?
- 
diff --git a/gnu/packages/patches/freeimage-CVE-2016-5684.patch b/gnu/packages/patches/freeimage-CVE-2016-5684.patch
deleted file mode 100644
index 2fc02d7b0d..0000000000
--- a/gnu/packages/patches/freeimage-CVE-2016-5684.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Debian Science Maintainers
- 
-Date: Mon, 10 Oct 2016 08:22:44 +0100
-Subject: CVE-2016-5684
-
----
- Source/FreeImage/PluginXPM.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/Source/FreeImage/PluginXPM.cpp b/Source/FreeImage/PluginXPM.cpp
-index a698321..cc7bd07 100644
---- a/Source/FreeImage/PluginXPM.cpp
-+++ b/Source/FreeImage/PluginXPM.cpp
-@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
- 		}
- 		free(str);
- 
-+		// check info string
-+		if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 0)) {
-+			throw "Improperly formed info string";
-+		}
-+
-         if (colors > 256) {
- 			dib = FreeImage_AllocateHeader(header_only, width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK);
- 		} else {
-@@ -193,7 +198,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
- 			FILE_RGBA rgba;
- 
- 			str = ReadString(io, handle);
--			if(!str)
-+			if(!str || (strlen(str) < (size_t)cpp))
- 				throw "Error reading color strings";
- 
- 			std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars
diff --git a/gnu/packages/patches/freeimage-fix-build-with-gcc-5.patch b/gnu/packages/patches/freeimage-fix-build-with-gcc-5.patch
deleted file mode 100644
index 2c9f2c3357..0000000000
--- a/gnu/packages/patches/freeimage-fix-build-with-gcc-5.patch
+++ /dev/null
@@ -1,1453 +0,0 @@
-The original patch was downloaded from here:
-https://chromium-review.googlesource.com/c/297211
-
-The paths, file names, and line endings have been adapted.
-
-From eebaf97f5a1cb713d81d311308d8a48c124e5aef Mon Sep 17 00:00:00 2001
-From: James Zern 
-Date: Wed, 02 Sep 2015 23:21:13 -0700
-Subject: [PATCH] dsp/mips: add whitespace around stringizing operator
-
-fixes compile with gcc 5.1
-BUG=259
-
-Change-Id: Ideb39c6290ab8569b1b6cc835bea11c822d0286c
----
-
-diff --git a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c
-index 6590f43..40e4d82 100644
---- a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c
-@@ -548,10 +548,10 @@
- // TEMP3 = SRC[D + D1 * BPS]
- #define LOAD_4_BYTES(TEMP0, TEMP1, TEMP2, TEMP3,                               \
-                      A, A1, B, B1, C, C1, D, D1, SRC)                          \
--  "lbu          %["#TEMP0"],   "#A"+"#A1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
--  "lbu          %["#TEMP1"],   "#B"+"#B1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
--  "lbu          %["#TEMP2"],   "#C"+"#C1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
--  "lbu          %["#TEMP3"],   "#D"+"#D1"*"XSTR(BPS)"(%["#SRC"])     \n\t"     \
-+  "lbu      %[" #TEMP0 "],   " #A "+" #A1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
-+  "lbu      %[" #TEMP1 "],   " #B "+" #B1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
-+  "lbu      %[" #TEMP2 "],   " #C "+" #C1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
-+  "lbu      %[" #TEMP3 "],   " #D "+" #D1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t"     \
- 
- static void SimpleHFilter16(uint8_t* p, int stride, int thresh) {
-   int i;
-@@ -623,8 +623,8 @@
- // DST[A * BPS]     = TEMP0
- // DST[B + C * BPS] = TEMP1
- #define STORE_8_BYTES(TEMP0, TEMP1, A, B, C, DST)                              \
--  "usw          %["#TEMP0"],   "#A"*"XSTR(BPS)"(%["#DST"])         \n\t"       \
--  "usw          %["#TEMP1"],   "#B"+"#C"*"XSTR(BPS)"(%["#DST"])    \n\t"
-+  "usw    %[" #TEMP0 "],   " #A "*"XSTR(BPS)"(%[" #DST "])         \n\t"       \
-+  "usw    %[" #TEMP1 "],   " #B "+" #C "*"XSTR(BPS)"(%[" #DST "])  \n\t"
- 
- static void VE4(uint8_t* dst) {    // vertical
-   const uint8_t* top = dst - BPS;
-@@ -725,8 +725,8 @@
- // TEMP0 = SRC[A * BPS]
- // TEMP1 = SRC[B + C * BPS]
- #define LOAD_8_BYTES(TEMP0, TEMP1, A, B, C, SRC)                               \
--  "ulw          %["#TEMP0"],   "#A"*"XSTR(BPS)"(%["#SRC"])         \n\t"       \
--  "ulw          %["#TEMP1"],   "#B"+"#C"*"XSTR(BPS)"(%["#SRC"])    \n\t"
-+  "ulw    %[" #TEMP0 "],   " #A "*"XSTR(BPS)"(%[" #SRC "])         \n\t"       \
-+  "ulw    %[" #TEMP1 "],   " #B "+" #C "*"XSTR(BPS)"(%[" #SRC "])  \n\t"
- 
- static void LD4(uint8_t* dst) {   // Down-Left
-   int temp0, temp1, temp2, temp3, temp4;
-@@ -873,24 +873,24 @@
- #define CLIPPING(SIZE)                                                         \
-   "preceu.ph.qbl   %[temp2],   %[temp0]                  \n\t"                 \
-   "preceu.ph.qbr   %[temp0],   %[temp0]                  \n\t"                 \
--".if "#SIZE" == 8                                        \n\t"                 \
-+".if " #SIZE " == 8                                      \n\t"                 \
-   "preceu.ph.qbl   %[temp3],   %[temp1]                  \n\t"                 \
-   "preceu.ph.qbr   %[temp1],   %[temp1]                  \n\t"                 \
- ".endif                                                  \n\t"                 \
-   "addu.ph         %[temp2],   %[temp2],   %[dst_1]      \n\t"                 \
-   "addu.ph         %[temp0],   %[temp0],   %[dst_1]      \n\t"                 \
--".if "#SIZE" == 8                                        \n\t"                 \
-+".if " #SIZE " == 8                                      \n\t"                 \
-   "addu.ph         %[temp3],   %[temp3],   %[dst_1]      \n\t"                 \
-   "addu.ph         %[temp1],   %[temp1],   %[dst_1]      \n\t"                 \
- ".endif                                                  \n\t"                 \
-   "shll_s.ph       %[temp2],   %[temp2],   7             \n\t"                 \
-   "shll_s.ph       %[temp0],   %[temp0],   7             \n\t"                 \
--".if "#SIZE" == 8                                        \n\t"                 \
-+".if " #SIZE " == 8                                      \n\t"                 \
-   "shll_s.ph       %[temp3],   %[temp3],   7             \n\t"                 \
-   "shll_s.ph       %[temp1],   %[temp1],   7             \n\t"                 \
- ".endif                                                  \n\t"                 \
-   "precrqu_s.qb.ph %[temp0],   %[temp2],   %[temp0]      \n\t"                 \
--".if "#SIZE" == 8                                        \n\t"                 \
-+".if " #SIZE " == 8                                      \n\t"                 \
-   "precrqu_s.qb.ph %[temp1],   %[temp3],   %[temp1]      \n\t"                 \
- ".endif                                                  \n\t"
- 
-@@ -899,7 +899,7 @@
-   int dst_1 = ((int)(DST)[-1] << 16) + (DST)[-1];                              \
-   int temp0, temp1, temp2, temp3;                                              \
-   __asm__ volatile (                                                           \
--  ".if "#SIZE" < 8                                       \n\t"                 \
-+  ".if " #SIZE " < 8                                     \n\t"                 \
-     "ulw             %[temp0],   0(%[top])               \n\t"                 \
-     "subu.ph         %[dst_1],   %[dst_1],    %[top_1]   \n\t"                 \
-     CLIPPING(4)                                                                \
-@@ -911,7 +911,7 @@
-     CLIPPING(8)                                                                \
-     "usw             %[temp0],   0(%[dst])               \n\t"                 \
-     "usw             %[temp1],   4(%[dst])               \n\t"                 \
--  ".if "#SIZE" == 16                                     \n\t"                 \
-+  ".if " #SIZE " == 16                                   \n\t"                 \
-     "ulw             %[temp0],   8(%[top])               \n\t"                 \
-     "ulw             %[temp1],   12(%[top])              \n\t"                 \
-     CLIPPING(8)                                                                \
-diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips32.c b/Source/LibWebP/src/dsp/dsp.enc_mips32.c
-index c5837f1..b50e08b 100644
---- a/Source/LibWebP/src/dsp/dsp.enc_mips32.c
-+++ b/Source/LibWebP/src/dsp/dsp.enc_mips32.c
-@@ -31,26 +31,26 @@
- // TEMP0..TEMP3 - registers for corresponding tmp elements
- // TEMP4..TEMP5 - temporary registers
- #define VERTICAL_PASS(A, B, C, D, TEMP4, TEMP0, TEMP1, TEMP2, TEMP3)        \
--  "lh      %[temp16],      "#A"(%[temp20])                 \n\t"            \
--  "lh      %[temp18],      "#B"(%[temp20])                 \n\t"            \
--  "lh      %[temp17],      "#C"(%[temp20])                 \n\t"            \
--  "lh      %[temp19],      "#D"(%[temp20])                 \n\t"            \
--  "addu    %["#TEMP4"],    %[temp16],      %[temp18]       \n\t"            \
--  "subu    %[temp16],      %[temp16],      %[temp18]       \n\t"            \
--  "mul     %["#TEMP0"],    %[temp17],      %[kC2]          \n\t"            \
--  "mul     %[temp18],      %[temp19],      %[kC1]          \n\t"            \
--  "mul     %[temp17],      %[temp17],      %[kC1]          \n\t"            \
--  "mul     %[temp19],      %[temp19],      %[kC2]          \n\t"            \
--  "sra     %["#TEMP0"],    %["#TEMP0"],    16              \n\n"            \
--  "sra     %[temp18],      %[temp18],      16              \n\n"            \
--  "sra     %[temp17],      %[temp17],      16              \n\n"            \
--  "sra     %[temp19],      %[temp19],      16              \n\n"            \
--  "subu    %["#TEMP2"],    %["#TEMP0"],    %[temp18]       \n\t"            \
--  "addu    %["#TEMP3"],    %[temp17],      %[temp19]       \n\t"            \
--  "addu    %["#TEMP0"],    %["#TEMP4"],    %["#TEMP3"]     \n\t"            \
--  "addu    %["#TEMP1"],    %[temp16],      %["#TEMP2"]     \n\t"            \
--  "subu    %["#TEMP2"],    %[temp16],      %["#TEMP2"]     \n\t"            \
--  "subu    %["#TEMP3"],    %["#TEMP4"],    %["#TEMP3"]     \n\t"
-+  "lh      %[temp16],      " #A "(%[temp20])                 \n\t"          \
-+  "lh      %[temp18],      " #B "(%[temp20])                 \n\t"          \
-+  "lh      %[temp17],      " #C "(%[temp20])                 \n\t"          \
-+  "lh      %[temp19],      " #D "(%[temp20])                 \n\t"          \
-+  "addu    %[" #TEMP4 "],    %[temp16],      %[temp18]       \n\t"          \
-+  "subu    %[temp16],      %[temp16],      %[temp18]         \n\t"          \
-+  "mul     %[" #TEMP0 "],    %[temp17],      %[kC2]          \n\t"          \
-+  "mul     %[temp18],      %[temp19],      %[kC1]            \n\t"          \
-+  "mul     %[temp17],      %[temp17],      %[kC1]            \n\t"          \
-+  "mul     %[temp19],      %[temp19],      %[kC2]            \n\t"          \
-+  "sra     %[" #TEMP0 "],    %[" #TEMP0 "],    16            \n\n"          \
-+  "sra     %[temp18],      %[temp18],      16                \n\n"          \
-+  "sra     %[temp17],      %[temp17],      16                \n\n"          \
-+  "sra     %[temp19],      %[temp19],      16                \n\n"          \
-+  "subu    %[" #TEMP2 "],    %[" #TEMP0 "],    %[temp18]     \n\t"          \
-+  "addu    %[" #TEMP3 "],    %[temp17],      %[temp19]       \n\t"          \
-+  "addu    %[" #TEMP0 "],    %[" #TEMP4 "],    %[" #TEMP3 "] \n\t"          \
-+  "addu    %[" #TEMP1 "],    %[temp16],      %[" #TEMP2 "]   \n\t"          \
-+  "subu    %[" #TEMP2 "],    %[temp16],      %[" #TEMP2 "]   \n\t"          \
-+  "subu    %[" #TEMP3 "],    %[" #TEMP4 "],    %[" #TEMP3 "] \n\t"
- 
- // macro for one horizontal pass in ITransformOne
- // MUL and STORE macros inlined
-@@ -58,59 +58,59 @@
- // temp0..temp15 holds tmp[0]..tmp[15]
- // A - offset in bytes to load from ref and store to dst buffer
- // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements
--#define HORIZONTAL_PASS(A, TEMP0, TEMP4, TEMP8, TEMP12)                     \
--  "addiu   %["#TEMP0"],    %["#TEMP0"],    4               \n\t"            \
--  "addu    %[temp16],      %["#TEMP0"],    %["#TEMP8"]     \n\t"            \
--  "subu    %[temp17],      %["#TEMP0"],    %["#TEMP8"]     \n\t"            \
--  "mul     %["#TEMP0"],    %["#TEMP4"],    %[kC2]          \n\t"            \
--  "mul     %["#TEMP8"],    %["#TEMP12"],   %[kC1]          \n\t"            \
--  "mul     %["#TEMP4"],    %["#TEMP4"],    %[kC1]          \n\t"            \
--  "mul     %["#TEMP12"],   %["#TEMP12"],   %[kC2]          \n\t"            \
--  "sra     %["#TEMP0"],    %["#TEMP0"],    16              \n\t"            \
--  "sra     %["#TEMP8"],    %["#TEMP8"],    16              \n\t"            \
--  "sra     %["#TEMP4"],    %["#TEMP4"],    16              \n\t"            \
--  "sra     %["#TEMP12"],   %["#TEMP12"],   16              \n\t"            \
--  "subu    %[temp18],      %["#TEMP0"],    %["#TEMP8"]     \n\t"            \
--  "addu    %[temp19],      %["#TEMP4"],    %["#TEMP12"]    \n\t"            \
--  "addu    %["#TEMP0"],    %[temp16],      %[temp19]       \n\t"            \
--  "addu    %["#TEMP4"],    %[temp17],      %[temp18]       \n\t"            \
--  "subu    %["#TEMP8"],    %[temp17],      %[temp18]       \n\t"            \
--  "subu    %["#TEMP12"],   %[temp16],      %[temp19]       \n\t"            \
--  "lw      %[temp20],      0(%[args])                      \n\t"            \
--  "sra     %["#TEMP0"],    %["#TEMP0"],    3               \n\t"            \
--  "sra     %["#TEMP4"],    %["#TEMP4"],    3               \n\t"            \
--  "sra     %["#TEMP8"],    %["#TEMP8"],    3               \n\t"            \
--  "sra     %["#TEMP12"],   %["#TEMP12"],   3               \n\t"            \
--  "lbu     %[temp16],      0+"XSTR(BPS)"*"#A"(%[temp20])   \n\t"            \
--  "lbu     %[temp17],      1+"XSTR(BPS)"*"#A"(%[temp20])   \n\t"            \
--  "lbu     %[temp18],      2+"XSTR(BPS)"*"#A"(%[temp20])   \n\t"            \
--  "lbu     %[temp19],      3+"XSTR(BPS)"*"#A"(%[temp20])   \n\t"            \
--  "addu    %["#TEMP0"],    %[temp16],      %["#TEMP0"]     \n\t"            \
--  "addu    %["#TEMP4"],    %[temp17],      %["#TEMP4"]     \n\t"            \
--  "addu    %["#TEMP8"],    %[temp18],      %["#TEMP8"]     \n\t"            \
--  "addu    %["#TEMP12"],   %[temp19],      %["#TEMP12"]    \n\t"            \
--  "slt     %[temp16],      %["#TEMP0"],    $zero           \n\t"            \
--  "slt     %[temp17],      %["#TEMP4"],    $zero           \n\t"            \
--  "slt     %[temp18],      %["#TEMP8"],    $zero           \n\t"            \
--  "slt     %[temp19],      %["#TEMP12"],   $zero           \n\t"            \
--  "movn    %["#TEMP0"],    $zero,          %[temp16]       \n\t"            \
--  "movn    %["#TEMP4"],    $zero,          %[temp17]       \n\t"            \
--  "movn    %["#TEMP8"],    $zero,          %[temp18]       \n\t"            \
--  "movn    %["#TEMP12"],   $zero,          %[temp19]       \n\t"            \
--  "addiu   %[temp20],      $zero,          255             \n\t"            \
--  "slt     %[temp16],      %["#TEMP0"],    %[temp20]       \n\t"            \
--  "slt     %[temp17],      %["#TEMP4"],    %[temp20]       \n\t"            \
--  "slt     %[temp18],      %["#TEMP8"],    %[temp20]       \n\t"            \
--  "slt     %[temp19],      %["#TEMP12"],   %[temp20]       \n\t"            \
--  "movz    %["#TEMP0"],    %[temp20],      %[temp16]       \n\t"            \
--  "movz    %["#TEMP4"],    %[temp20],      %[temp17]       \n\t"            \
--  "lw      %[temp16],      8(%[args])                      \n\t"            \
--  "movz    %["#TEMP8"],    %[temp20],      %[temp18]       \n\t"            \
--  "movz    %["#TEMP12"],   %[temp20],      %[temp19]       \n\t"            \
--  "sb      %["#TEMP0"],    0+"XSTR(BPS)"*"#A"(%[temp16])   \n\t"            \
--  "sb      %["#TEMP4"],    1+"XSTR(BPS)"*"#A"(%[temp16])   \n\t"            \
--  "sb      %["#TEMP8"],    2+"XSTR(BPS)"*"#A"(%[temp16])   \n\t"            \
--  "sb      %["#TEMP12"],   3+"XSTR(BPS)"*"#A"(%[temp16])   \n\t"
-+#define HORIZONTAL_PASS(A, TEMP0, TEMP4, TEMP8, TEMP12)                       \
-+  "addiu   %[" #TEMP0 "],    %[" #TEMP0 "],    4             \n\t"            \
-+  "addu    %[temp16],      %[" #TEMP0 "],    %[" #TEMP8 "]   \n\t"            \
-+  "subu    %[temp17],      %[" #TEMP0 "],    %[" #TEMP8 "]   \n\t"            \
-+  "mul     %[" #TEMP0 "],    %[" #TEMP4 "],    %[kC2]        \n\t"            \
-+  "mul     %[" #TEMP8 "],    %[" #TEMP12 "],   %[kC1]        \n\t"            \
-+  "mul     %[" #TEMP4 "],    %[" #TEMP4 "],    %[kC1]        \n\t"            \
-+  "mul     %[" #TEMP12 "],   %[" #TEMP12 "],   %[kC2]        \n\t"            \
-+  "sra     %[" #TEMP0 "],    %[" #TEMP0 "],    16            \n\t"            \
-+  "sra     %[" #TEMP8 "],    %[" #TEMP8 "],    16            \n\t"            \
-+  "sra     %[" #TEMP4 "],    %[" #TEMP4 "],    16            \n\t"            \
-+  "sra     %[" #TEMP12 "],   %[" #TEMP12 "],   16            \n\t"            \
-+  "subu    %[temp18],      %[" #TEMP0 "],    %[" #TEMP8 "]   \n\t"            \
-+  "addu    %[temp19],      %[" #TEMP4 "],    %[" #TEMP12 "]  \n\t"            \
-+  "addu    %[" #TEMP0 "],    %[temp16],      %[temp19]       \n\t"            \
-+  "addu    %[" #TEMP4 "],    %[temp17],      %[temp18]       \n\t"            \
-+  "subu    %[" #TEMP8 "],    %[temp17],      %[temp18]       \n\t"            \
-+  "subu    %[" #TEMP12 "],   %[temp16],      %[temp19]       \n\t"            \
-+  "lw      %[temp20],      0(%[args])                        \n\t"            \
-+  "sra     %[" #TEMP0 "],    %[" #TEMP0 "],    3             \n\t"            \
-+  "sra     %[" #TEMP4 "],    %[" #TEMP4 "],    3             \n\t"            \
-+  "sra     %[" #TEMP8 "],    %[" #TEMP8 "],    3             \n\t"            \
-+  "sra     %[" #TEMP12 "],   %[" #TEMP12 "],   3             \n\t"            \
-+  "lbu     %[temp16],      0+"XSTR(BPS)"*" #A "(%[temp20])   \n\t"            \
-+  "lbu     %[temp17],      1+"XSTR(BPS)"*" #A "(%[temp20])   \n\t"            \
-+  "lbu     %[temp18],      2+"XSTR(BPS)"*" #A "(%[temp20])   \n\t"            \
-+  "lbu     %[temp19],      3+"XSTR(BPS)"*" #A "(%[temp20])   \n\t"            \
-+  "addu    %[" #TEMP0 "],    %[temp16],      %[" #TEMP0 "]   \n\t"            \
-+  "addu    %[" #TEMP4 "],    %[temp17],      %[" #TEMP4 "]   \n\t"            \
-+  "addu    %[" #TEMP8 "],    %[temp18],      %[" #TEMP8 "]   \n\t"            \
-+  "addu    %[" #TEMP12 "],   %[temp19],      %[" #TEMP12 "]  \n\t"            \
-+  "slt     %[temp16],      %[" #TEMP0 "],    $zero           \n\t"            \
-+  "slt     %[temp17],      %[" #TEMP4 "],    $zero           \n\t"            \
-+  "slt     %[temp18],      %[" #TEMP8 "],    $zero           \n\t"            \
-+  "slt     %[temp19],      %[" #TEMP12 "],   $zero           \n\t"            \
-+  "movn    %[" #TEMP0 "],    $zero,          %[temp16]       \n\t"            \
-+  "movn    %[" #TEMP4 "],    $zero,          %[temp17]       \n\t"            \
-+  "movn    %[" #TEMP8 "],    $zero,          %[temp18]       \n\t"            \
-+  "movn    %[" #TEMP12 "],   $zero,          %[temp19]       \n\t"            \
-+  "addiu   %[temp20],      $zero,          255               \n\t"            \
-+  "slt     %[temp16],      %[" #TEMP0 "],    %[temp20]       \n\t"            \
-+  "slt     %[temp17],      %[" #TEMP4 "],    %[temp20]       \n\t"            \
-+  "slt     %[temp18],      %[" #TEMP8 "],    %[temp20]       \n\t"            \
-+  "slt     %[temp19],      %[" #TEMP12 "],   %[temp20]       \n\t"            \
-+  "movz    %[" #TEMP0 "],    %[temp20],      %[temp16]       \n\t"            \
-+  "movz    %[" #TEMP4 "],    %[temp20],      %[temp17]       \n\t"            \
-+  "lw      %[temp16],      8(%[args])                        \n\t"            \
-+  "movz    %[" #TEMP8 "],    %[temp20],      %[temp18]       \n\t"            \
-+  "movz    %[" #TEMP12 "],   %[temp20],      %[temp19]       \n\t"            \
-+  "sb      %[" #TEMP0 "],    0+"XSTR(BPS)"*" #A "(%[temp16]) \n\t"            \
-+  "sb      %[" #TEMP4 "],    1+"XSTR(BPS)"*" #A "(%[temp16]) \n\t"            \
-+  "sb      %[" #TEMP8 "],    2+"XSTR(BPS)"*" #A "(%[temp16]) \n\t"            \
-+  "sb      %[" #TEMP12 "],   3+"XSTR(BPS)"*" #A "(%[temp16]) \n\t"
- 
- // Does one or two inverse transforms.
- static WEBP_INLINE void ITransformOne(const uint8_t* ref, const int16_t* in,
-@@ -161,9 +161,9 @@
- // K - offset in bytes (kZigzag[n] * 4)
- // N - offset in bytes (n * 2)
- #define QUANTIZE_ONE(J, K, N)                                               \
--  "lh           %[temp0],       "#J"(%[ppin])                       \n\t"   \
--  "lhu          %[temp1],       "#J"(%[ppsharpen])                  \n\t"   \
--  "lw           %[temp2],       "#K"(%[ppzthresh])                  \n\t"   \
-+  "lh           %[temp0],       " #J "(%[ppin])                     \n\t"   \
-+  "lhu          %[temp1],       " #J "(%[ppsharpen])                \n\t"   \
-+  "lw           %[temp2],       " #K "(%[ppzthresh])                \n\t"   \
-   "sra          %[sign],        %[temp0],           15              \n\t"   \
-   "xor          %[coeff],       %[temp0],           %[sign]         \n\t"   \
-   "subu         %[coeff],       %[coeff],           %[sign]         \n\t"   \
-@@ -172,9 +172,9 @@
-   "addiu        %[temp5],       $zero,              0               \n\t"   \
-   "addiu        %[level],       $zero,              0               \n\t"   \
-   "beqz         %[temp4],       2f                                  \n\t"   \
--  "lhu          %[temp1],       "#J"(%[ppiq])                       \n\t"   \
--  "lw           %[temp2],       "#K"(%[ppbias])                     \n\t"   \
--  "lhu          %[temp3],       "#J"(%[ppq])                        \n\t"   \
-+  "lhu          %[temp1],       " #J "(%[ppiq])                     \n\t"   \
-+  "lw           %[temp2],       " #K "(%[ppbias])                   \n\t"   \
-+  "lhu          %[temp3],       " #J "(%[ppq])                      \n\t"   \
-   "mul          %[level],       %[coeff],           %[temp1]        \n\t"   \
-   "addu         %[level],       %[level],           %[temp2]        \n\t"   \
-   "sra          %[level],       %[level],           17              \n\t"   \
-@@ -184,8 +184,8 @@
-   "subu         %[level],       %[level],           %[sign]         \n\t"   \
-   "mul          %[temp5],       %[level],           %[temp3]        \n\t"   \
- "2:                                                                 \n\t"   \
--  "sh           %[temp5],       "#J"(%[ppin])                       \n\t"   \
--  "sh           %[level],       "#N"(%[pout])                       \n\t"
-+  "sh           %[temp5],       " #J "(%[ppin])                     \n\t"   \
-+  "sh           %[level],       " #N "(%[pout])                     \n\t"
- 
- static int QuantizeBlock(int16_t in[16], int16_t out[16],
-                          const VP8Matrix* const mtx) {
-@@ -253,39 +253,39 @@
- // A - offset in bytes to load from a and b buffers
- // E..H - offsets in bytes to store first results to tmp buffer
- // E1..H1 - offsets in bytes to store second results to tmp buffer
--#define HORIZONTAL_PASS(A, E, F, G, H, E1, F1, G1, H1)              \
--  "lbu    %[temp0],  0+"XSTR(BPS)"*"#A"(%[a])  \n\t"                \
--  "lbu    %[temp1],  1+"XSTR(BPS)"*"#A"(%[a])  \n\t"                \
--  "lbu    %[temp2],  2+"XSTR(BPS)"*"#A"(%[a])  \n\t"                \
--  "lbu    %[temp3],  3+"XSTR(BPS)"*"#A"(%[a])  \n\t"                \
--  "lbu    %[temp4],  0+"XSTR(BPS)"*"#A"(%[b])  \n\t"                \
--  "lbu    %[temp5],  1+"XSTR(BPS)"*"#A"(%[b])  \n\t"                \
--  "lbu    %[temp6],  2+"XSTR(BPS)"*"#A"(%[b])  \n\t"                \
--  "lbu    %[temp7],  3+"XSTR(BPS)"*"#A"(%[b])  \n\t"                \
--  "addu   %[temp8],  %[temp0],    %[temp2]     \n\t"                \
--  "subu   %[temp0],  %[temp0],    %[temp2]     \n\t"                \
--  "addu   %[temp2],  %[temp1],    %[temp3]     \n\t"                \
--  "subu   %[temp1],  %[temp1],    %[temp3]     \n\t"                \
--  "addu   %[temp3],  %[temp4],    %[temp6]     \n\t"                \
--  "subu   %[temp4],  %[temp4],    %[temp6]     \n\t"                \
--  "addu   %[temp6],  %[temp5],    %[temp7]     \n\t"                \
--  "subu   %[temp5],  %[temp5],    %[temp7]     \n\t"                \
--  "addu   %[temp7],  %[temp8],    %[temp2]     \n\t"                \
--  "subu   %[temp2],  %[temp8],    %[temp2]     \n\t"                \
--  "addu   %[temp8],  %[temp0],    %[temp1]     \n\t"                \
--  "subu   %[temp0],  %[temp0],    %[temp1]     \n\t"                \
--  "addu   %[temp1],  %[temp3],    %[temp6]     \n\t"                \
--  "subu   %[temp3],  %[temp3],    %[temp6]     \n\t"                \
--  "addu   %[temp6],  %[temp4],    %[temp5]     \n\t"                \
--  "subu   %[temp4],  %[temp4],    %[temp5]     \n\t"                \
--  "sw     %[temp7],  "#E"(%[tmp])              \n\t"                \
--  "sw     %[temp2],  "#H"(%[tmp])              \n\t"                \
--  "sw     %[temp8],  "#F"(%[tmp])              \n\t"                \
--  "sw     %[temp0],  "#G"(%[tmp])              \n\t"                \
--  "sw     %[temp1],  "#E1"(%[tmp])             \n\t"                \
--  "sw     %[temp3],  "#H1"(%[tmp])             \n\t"                \
--  "sw     %[temp6],  "#F1"(%[tmp])             \n\t"                \
--  "sw     %[temp4],  "#G1"(%[tmp])             \n\t"
-+#define HORIZONTAL_PASS(A, E, F, G, H, E1, F1, G1, H1)                \
-+  "lbu    %[temp0],  0+"XSTR(BPS)"*" #A "(%[a])  \n\t"                \
-+  "lbu    %[temp1],  1+"XSTR(BPS)"*" #A "(%[a])  \n\t"                \
-+  "lbu    %[temp2],  2+"XSTR(BPS)"*" #A "(%[a])  \n\t"                \
-+  "lbu    %[temp3],  3+"XSTR(BPS)"*" #A "(%[a])  \n\t"                \
-+  "lbu    %[temp4],  0+"XSTR(BPS)"*" #A "(%[b])  \n\t"                \
-+  "lbu    %[temp5],  1+"XSTR(BPS)"*" #A "(%[b])  \n\t"                \
-+  "lbu    %[temp6],  2+"XSTR(BPS)"*" #A "(%[b])  \n\t"                \
-+  "lbu    %[temp7],  3+"XSTR(BPS)"*" #A "(%[b])  \n\t"                \
-+  "addu   %[temp8],  %[temp0],    %[temp2]       \n\t"                \
-+  "subu   %[temp0],  %[temp0],    %[temp2]       \n\t"                \
-+  "addu   %[temp2],  %[temp1],    %[temp3]       \n\t"                \
-+  "subu   %[temp1],  %[temp1],    %[temp3]       \n\t"                \
-+  "addu   %[temp3],  %[temp4],    %[temp6]       \n\t"                \
-+  "subu   %[temp4],  %[temp4],    %[temp6]       \n\t"                \
-+  "addu   %[temp6],  %[temp5],    %[temp7]       \n\t"                \
-+  "subu   %[temp5],  %[temp5],    %[temp7]       \n\t"                \
-+  "addu   %[temp7],  %[temp8],    %[temp2]       \n\t"                \
-+  "subu   %[temp2],  %[temp8],    %[temp2]       \n\t"                \
-+  "addu   %[temp8],  %[temp0],    %[temp1]       \n\t"                \
-+  "subu   %[temp0],  %[temp0],    %[temp1]       \n\t"                \
-+  "addu   %[temp1],  %[temp3],    %[temp6]       \n\t"                \
-+  "subu   %[temp3],  %[temp3],    %[temp6]       \n\t"                \
-+  "addu   %[temp6],  %[temp4],    %[temp5]       \n\t"                \
-+  "subu   %[temp4],  %[temp4],    %[temp5]       \n\t"                \
-+  "sw     %[temp7],  " #E "(%[tmp])              \n\t"                \
-+  "sw     %[temp2],  " #H "(%[tmp])              \n\t"                \
-+  "sw     %[temp8],  " #F "(%[tmp])              \n\t"                \
-+  "sw     %[temp0],  " #G "(%[tmp])              \n\t"                \
-+  "sw     %[temp1],  " #E1 "(%[tmp])             \n\t"                \
-+  "sw     %[temp3],  " #H1 "(%[tmp])             \n\t"                \
-+  "sw     %[temp6],  " #F1 "(%[tmp])             \n\t"                \
-+  "sw     %[temp4],  " #G1 "(%[tmp])             \n\t"
- 
- // macro for one vertical pass in Disto4x4 (TTransform)
- // two calls of function TTransform are merged into single one
-@@ -300,10 +300,10 @@
- // A1..D1 - offsets in bytes to load second results from tmp buffer
- // E..H - offsets in bytes to load from w buffer
- #define VERTICAL_PASS(A, B, C, D, A1, B1, C1, D1, E, F, G, H)     \
--  "lw     %[temp0],  "#A1"(%[tmp])           \n\t"                \
--  "lw     %[temp1],  "#C1"(%[tmp])           \n\t"                \
--  "lw     %[temp2],  "#B1"(%[tmp])           \n\t"                \
--  "lw     %[temp3],  "#D1"(%[tmp])           \n\t"                \
-+  "lw     %[temp0],  " #A1 "(%[tmp])         \n\t"                \
-+  "lw     %[temp1],  " #C1 "(%[tmp])         \n\t"                \
-+  "lw     %[temp2],  " #B1 "(%[tmp])         \n\t"                \
-+  "lw     %[temp3],  " #D1 "(%[tmp])         \n\t"                \
-   "addu   %[temp8],  %[temp0],    %[temp1]   \n\t"                \
-   "subu   %[temp0],  %[temp0],    %[temp1]   \n\t"                \
-   "addu   %[temp1],  %[temp2],    %[temp3]   \n\t"                \
-@@ -324,18 +324,18 @@
-   "subu   %[temp1],  %[temp1],    %[temp5]   \n\t"                \
-   "subu   %[temp0],  %[temp0],    %[temp6]   \n\t"                \
-   "subu   %[temp8],  %[temp8],    %[temp7]   \n\t"                \
--  "lhu    %[temp4],  "#E"(%[w])              \n\t"                \
--  "lhu    %[temp5],  "#F"(%[w])              \n\t"                \
--  "lhu    %[temp6],  "#G"(%[w])              \n\t"                \
--  "lhu    %[temp7],  "#H"(%[w])              \n\t"                \
-+  "lhu    %[temp4],  " #E "(%[w])            \n\t"                \
-+  "lhu    %[temp5],  " #F "(%[w])            \n\t"                \
-+  "lhu    %[temp6],  " #G "(%[w])            \n\t"                \
-+  "lhu    %[temp7],  " #H "(%[w])            \n\t"                \
-   "madd   %[temp4],  %[temp3]                \n\t"                \
-   "madd   %[temp5],  %[temp1]                \n\t"                \
-   "madd   %[temp6],  %[temp0]                \n\t"                \
-   "madd   %[temp7],  %[temp8]                \n\t"                \
--  "lw     %[temp0],  "#A"(%[tmp])            \n\t"                \
--  "lw     %[temp1],  "#C"(%[tmp])            \n\t"                \
--  "lw     %[temp2],  "#B"(%[tmp])            \n\t"                \
--  "lw     %[temp3],  "#D"(%[tmp])            \n\t"                \
-+  "lw     %[temp0],  " #A "(%[tmp])          \n\t"                \
-+  "lw     %[temp1],  " #C "(%[tmp])          \n\t"                \
-+  "lw     %[temp2],  " #B "(%[tmp])          \n\t"                \
-+  "lw     %[temp3],  " #D "(%[tmp])          \n\t"                \
-   "addu   %[temp8],  %[temp0],    %[temp1]   \n\t"                \
-   "subu   %[temp0],  %[temp0],    %[temp1]   \n\t"                \
-   "addu   %[temp1],  %[temp2],    %[temp3]   \n\t"                \
-@@ -412,71 +412,71 @@
- // temp0..temp15 holds tmp[0]..tmp[15]
- // A - offset in bytes to load from src and ref buffers
- // TEMP0..TEMP3 - registers for corresponding tmp elements
--#define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3)            \
--  "lw     %["#TEMP1"],  0(%[args])                       \n\t"    \
--  "lw     %["#TEMP2"],  4(%[args])                       \n\t"    \
--  "lbu    %[temp16],    0+"XSTR(BPS)"*"#A"(%["#TEMP1"])  \n\t"    \
--  "lbu    %[temp17],    0+"XSTR(BPS)"*"#A"(%["#TEMP2"])  \n\t"    \
--  "lbu    %[temp18],    1+"XSTR(BPS)"*"#A"(%["#TEMP1"])  \n\t"    \
--  "lbu    %[temp19],    1+"XSTR(BPS)"*"#A"(%["#TEMP2"])  \n\t"    \
--  "subu   %[temp20],    %[temp16],    %[temp17]          \n\t"    \
--  "lbu    %[temp16],    2+"XSTR(BPS)"*"#A"(%["#TEMP1"])  \n\t"    \
--  "lbu    %[temp17],    2+"XSTR(BPS)"*"#A"(%["#TEMP2"])  \n\t"    \
--  "subu   %["#TEMP0"],  %[temp18],    %[temp19]          \n\t"    \
--  "lbu    %[temp18],    3+"XSTR(BPS)"*"#A"(%["#TEMP1"])  \n\t"    \
--  "lbu    %[temp19],    3+"XSTR(BPS)"*"#A"(%["#TEMP2"])  \n\t"    \
--  "subu   %["#TEMP1"],  %[temp16],    %[temp17]          \n\t"    \
--  "subu   %["#TEMP2"],  %[temp18],    %[temp19]          \n\t"    \
--  "addu   %["#TEMP3"],  %[temp20],    %["#TEMP2"]        \n\t"    \
--  "subu   %["#TEMP2"],  %[temp20],    %["#TEMP2"]        \n\t"    \
--  "addu   %[temp20],    %["#TEMP0"],  %["#TEMP1"]        \n\t"    \
--  "subu   %["#TEMP0"],  %["#TEMP0"],  %["#TEMP1"]        \n\t"    \
--  "mul    %[temp16],    %["#TEMP2"],  %[c5352]           \n\t"    \
--  "mul    %[temp17],    %["#TEMP2"],  %[c2217]           \n\t"    \
--  "mul    %[temp18],    %["#TEMP0"],  %[c5352]           \n\t"    \
--  "mul    %[temp19],    %["#TEMP0"],  %[c2217]           \n\t"    \
--  "addu   %["#TEMP1"],  %["#TEMP3"],  %[temp20]          \n\t"    \
--  "subu   %[temp20],    %["#TEMP3"],  %[temp20]          \n\t"    \
--  "sll    %["#TEMP0"],  %["#TEMP1"],  3                  \n\t"    \
--  "sll    %["#TEMP2"],  %[temp20],    3                  \n\t"    \
--  "addiu  %[temp16],    %[temp16],    1812               \n\t"    \
--  "addiu  %[temp17],    %[temp17],    937                \n\t"    \
--  "addu   %[temp16],    %[temp16],    %[temp19]          \n\t"    \
--  "subu   %[temp17],    %[temp17],    %[temp18]          \n\t"    \
--  "sra    %["#TEMP1"],  %[temp16],    9                  \n\t"    \
--  "sra    %["#TEMP3"],  %[temp17],    9                  \n\t"
-+#define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3)                \
-+  "lw     %[" #TEMP1 "],  0(%[args])                         \n\t"    \
-+  "lw     %[" #TEMP2 "],  4(%[args])                         \n\t"    \
-+  "lbu    %[temp16],    0+"XSTR(BPS)"*" #A "(%[" #TEMP1 "])  \n\t"    \
-+  "lbu    %[temp17],    0+"XSTR(BPS)"*" #A "(%[" #TEMP2 "])  \n\t"    \
-+  "lbu    %[temp18],    1+"XSTR(BPS)"*" #A "(%[" #TEMP1 "])  \n\t"    \
-+  "lbu    %[temp19],    1+"XSTR(BPS)"*" #A "(%[" #TEMP2 "])  \n\t"    \
-+  "subu   %[temp20],    %[temp16],    %[temp17]              \n\t"    \
-+  "lbu    %[temp16],    2+"XSTR(BPS)"*" #A "(%[" #TEMP1 "])  \n\t"    \
-+  "lbu    %[temp17],    2+"XSTR(BPS)"*" #A "(%[" #TEMP2 "])  \n\t"    \
-+  "subu   %[" #TEMP0 "],  %[temp18],    %[temp19]            \n\t"    \
-+  "lbu    %[temp18],    3+"XSTR(BPS)"*" #A "(%[" #TEMP1 "])  \n\t"    \
-+  "lbu    %[temp19],    3+"XSTR(BPS)"*" #A "(%[" #TEMP2 "])  \n\t"    \
-+  "subu   %[" #TEMP1 "],  %[temp16],    %[temp17]            \n\t"    \
-+  "subu   %[" #TEMP2 "],  %[temp18],    %[temp19]            \n\t"    \
-+  "addu   %[" #TEMP3 "],  %[temp20],    %[" #TEMP2 "]        \n\t"    \
-+  "subu   %[" #TEMP2 "],  %[temp20],    %[" #TEMP2 "]        \n\t"    \
-+  "addu   %[temp20],    %[" #TEMP0 "],  %[" #TEMP1 "]        \n\t"    \
-+  "subu   %[" #TEMP0 "],  %[" #TEMP0 "],  %[" #TEMP1 "]      \n\t"    \
-+  "mul    %[temp16],    %[" #TEMP2 "],  %[c5352]             \n\t"    \
-+  "mul    %[temp17],    %[" #TEMP2 "],  %[c2217]             \n\t"    \
-+  "mul    %[temp18],    %[" #TEMP0 "],  %[c5352]             \n\t"    \
-+  "mul    %[temp19],    %[" #TEMP0 "],  %[c2217]             \n\t"    \
-+  "addu   %[" #TEMP1 "],  %[" #TEMP3 "],  %[temp20]          \n\t"    \
-+  "subu   %[temp20],    %[" #TEMP3 "],  %[temp20]            \n\t"    \
-+  "sll    %[" #TEMP0 "],  %[" #TEMP1 "],  3                  \n\t"    \
-+  "sll    %[" #TEMP2 "],  %[temp20],    3                    \n\t"    \
-+  "addiu  %[temp16],    %[temp16],    1812                   \n\t"    \
-+  "addiu  %[temp17],    %[temp17],    937                    \n\t"    \
-+  "addu   %[temp16],    %[temp16],    %[temp19]              \n\t"    \
-+  "subu   %[temp17],    %[temp17],    %[temp18]              \n\t"    \
-+  "sra    %[" #TEMP1 "],  %[temp16],    9                    \n\t"    \
-+  "sra    %[" #TEMP3 "],  %[temp17],    9                    \n\t"
- 
- // macro for one vertical pass in FTransform
- // temp0..temp15 holds tmp[0]..tmp[15]
- // A..D - offsets in bytes to store to out buffer
- // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements
--#define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12)  \
--  "addu   %[temp16],    %["#TEMP0"],  %["#TEMP12"]     \n\t"    \
--  "subu   %[temp19],    %["#TEMP0"],  %["#TEMP12"]     \n\t"    \
--  "addu   %[temp17],    %["#TEMP4"],  %["#TEMP8"]      \n\t"    \
--  "subu   %[temp18],    %["#TEMP4"],  %["#TEMP8"]      \n\t"    \
--  "mul    %["#TEMP8"],  %[temp19],    %[c2217]         \n\t"    \
--  "mul    %["#TEMP12"], %[temp18],    %[c2217]         \n\t"    \
--  "mul    %["#TEMP4"],  %[temp19],    %[c5352]         \n\t"    \
--  "mul    %[temp18],    %[temp18],    %[c5352]         \n\t"    \
--  "addiu  %[temp16],    %[temp16],    7                \n\t"    \
--  "addu   %["#TEMP0"],  %[temp16],    %[temp17]        \n\t"    \
--  "sra    %["#TEMP0"],  %["#TEMP0"],  4                \n\t"    \
--  "addu   %["#TEMP12"], %["#TEMP12"], %["#TEMP4"]      \n\t"    \
--  "subu   %["#TEMP4"],  %[temp16],    %[temp17]        \n\t"    \
--  "sra    %["#TEMP4"],  %["#TEMP4"],  4                \n\t"    \
--  "addiu  %["#TEMP8"],  %["#TEMP8"],  30000            \n\t"    \
--  "addiu  %["#TEMP12"], %["#TEMP12"], 12000            \n\t"    \
--  "addiu  %["#TEMP8"],  %["#TEMP8"],  21000            \n\t"    \
--  "subu   %["#TEMP8"],  %["#TEMP8"],  %[temp18]        \n\t"    \
--  "sra    %["#TEMP12"], %["#TEMP12"], 16               \n\t"    \
--  "sra    %["#TEMP8"],  %["#TEMP8"],  16               \n\t"    \
--  "addiu  %[temp16],    %["#TEMP12"], 1                \n\t"    \
--  "movn   %["#TEMP12"], %[temp16],    %[temp19]        \n\t"    \
--  "sh     %["#TEMP0"],  "#A"(%[temp20])                \n\t"    \
--  "sh     %["#TEMP4"],  "#C"(%[temp20])                \n\t"    \
--  "sh     %["#TEMP8"],  "#D"(%[temp20])                \n\t"    \
--  "sh     %["#TEMP12"], "#B"(%[temp20])                \n\t"
-+#define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12)    \
-+  "addu   %[temp16],    %[" #TEMP0 "],  %[" #TEMP12 "]   \n\t"    \
-+  "subu   %[temp19],    %[" #TEMP0 "],  %[" #TEMP12 "]   \n\t"    \
-+  "addu   %[temp17],    %[" #TEMP4 "],  %[" #TEMP8 "]    \n\t"    \
-+  "subu   %[temp18],    %[" #TEMP4 "],  %[" #TEMP8 "]    \n\t"    \
-+  "mul    %[" #TEMP8 "],  %[temp19],    %[c2217]         \n\t"    \
-+  "mul    %[" #TEMP12 "], %[temp18],    %[c2217]         \n\t"    \
-+  "mul    %[" #TEMP4 "],  %[temp19],    %[c5352]         \n\t"    \
-+  "mul    %[temp18],    %[temp18],    %[c5352]           \n\t"    \
-+  "addiu  %[temp16],    %[temp16],    7                  \n\t"    \
-+  "addu   %[" #TEMP0 "],  %[temp16],    %[temp17]        \n\t"    \
-+  "sra    %[" #TEMP0 "],  %[" #TEMP0 "],  4              \n\t"    \
-+  "addu   %[" #TEMP12 "], %[" #TEMP12 "], %[" #TEMP4 "]  \n\t"    \
-+  "subu   %[" #TEMP4 "],  %[temp16],    %[temp17]        \n\t"    \
-+  "sra    %[" #TEMP4 "],  %[" #TEMP4 "],  4              \n\t"    \
-+  "addiu  %[" #TEMP8 "],  %[" #TEMP8 "],  30000          \n\t"    \
-+  "addiu  %[" #TEMP12 "], %[" #TEMP12 "], 12000          \n\t"    \
-+  "addiu  %[" #TEMP8 "],  %[" #TEMP8 "],  21000          \n\t"    \
-+  "subu   %[" #TEMP8 "],  %[" #TEMP8 "],  %[temp18]      \n\t"    \
-+  "sra    %[" #TEMP12 "], %[" #TEMP12 "], 16             \n\t"    \
-+  "sra    %[" #TEMP8 "],  %[" #TEMP8 "],  16             \n\t"    \
-+  "addiu  %[temp16],    %[" #TEMP12 "], 1                \n\t"    \
-+  "movn   %[" #TEMP12 "], %[temp16],    %[temp19]        \n\t"    \
-+  "sh     %[" #TEMP0 "],  " #A "(%[temp20])              \n\t"    \
-+  "sh     %[" #TEMP4 "],  " #C "(%[temp20])              \n\t"    \
-+  "sh     %[" #TEMP8 "],  " #D "(%[temp20])              \n\t"    \
-+  "sh     %[" #TEMP12 "], " #B "(%[temp20])              \n\t"
- 
- static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) {
-   int temp0, temp1, temp2, temp3, temp4, temp5, temp6, temp7, temp8;
-@@ -516,14 +516,14 @@
- #if !defined(WORK_AROUND_GCC)
- 
- #define GET_SSE_INNER(A, B, C, D)                               \
--  "lbu     %[temp0],    "#A"(%[a])                   \n\t"      \
--  "lbu     %[temp1],    "#A"(%[b])                   \n\t"      \
--  "lbu     %[temp2],    "#B"(%[a])                   \n\t"      \
--  "lbu     %[temp3],    "#B"(%[b])                   \n\t"      \
--  "lbu     %[temp4],    "#C"(%[a])                   \n\t"      \
--  "lbu     %[temp5],    "#C"(%[b])                   \n\t"      \
--  "lbu     %[temp6],    "#D"(%[a])                   \n\t"      \
--  "lbu     %[temp7],    "#D"(%[b])                   \n\t"      \
-+  "lbu     %[temp0],    " #A "(%[a])                 \n\t"      \
-+  "lbu     %[temp1],    " #A "(%[b])                 \n\t"      \
-+  "lbu     %[temp2],    " #B "(%[a])                 \n\t"      \
-+  "lbu     %[temp3],    " #B "(%[b])                 \n\t"      \
-+  "lbu     %[temp4],    " #C "(%[a])                 \n\t"      \
-+  "lbu     %[temp5],    " #C "(%[b])                 \n\t"      \
-+  "lbu     %[temp6],    " #D "(%[a])                 \n\t"      \
-+  "lbu     %[temp7],    " #D "(%[b])                 \n\t"      \
-   "subu    %[temp0],    %[temp0],     %[temp1]       \n\t"      \
-   "subu    %[temp2],    %[temp2],     %[temp3]       \n\t"      \
-   "subu    %[temp4],    %[temp4],     %[temp5]       \n\t"      \
-diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c
-index 56db07c..44f6fd2 100644
---- a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c
-@@ -27,25 +27,25 @@
- // I - input (macro doesn't change it)
- #define ADD_SUB_HALVES_X4(O0, O1, O2, O3, O4, O5, O6, O7,                      \
-                           I0, I1, I2, I3, I4, I5, I6, I7)                      \
--  "addq.ph          %["#O0"],   %["#I0"],  %["#I1"]           \n\t"            \
--  "subq.ph          %["#O1"],   %["#I0"],  %["#I1"]           \n\t"            \
--  "addq.ph          %["#O2"],   %["#I2"],  %["#I3"]           \n\t"            \
--  "subq.ph          %["#O3"],   %["#I2"],  %["#I3"]           \n\t"            \
--  "addq.ph          %["#O4"],   %["#I4"],  %["#I5"]           \n\t"            \
--  "subq.ph          %["#O5"],   %["#I4"],  %["#I5"]           \n\t"            \
--  "addq.ph          %["#O6"],   %["#I6"],  %["#I7"]           \n\t"            \
--  "subq.ph          %["#O7"],   %["#I6"],  %["#I7"]           \n\t"
-+  "addq.ph          %[" #O0 "],   %[" #I0 "],  %[" #I1 "]     \n\t"            \
-+  "subq.ph          %[" #O1 "],   %[" #I0 "],  %[" #I1 "]     \n\t"            \
-+  "addq.ph          %[" #O2 "],   %[" #I2 "],  %[" #I3 "]     \n\t"            \
-+  "subq.ph          %[" #O3 "],   %[" #I2 "],  %[" #I3 "]     \n\t"            \
-+  "addq.ph          %[" #O4 "],   %[" #I4 "],  %[" #I5 "]     \n\t"            \
-+  "subq.ph          %[" #O5 "],   %[" #I4 "],  %[" #I5 "]     \n\t"            \
-+  "addq.ph          %[" #O6 "],   %[" #I6 "],  %[" #I7 "]     \n\t"            \
-+  "subq.ph          %[" #O7 "],   %[" #I6 "],  %[" #I7 "]     \n\t"
- 
- // IO - input/output
- #define ABS_X8(IO0, IO1, IO2, IO3, IO4, IO5, IO6, IO7)                         \
--  "absq_s.ph        %["#IO0"],   %["#IO0"]                    \n\t"            \
--  "absq_s.ph        %["#IO1"],   %["#IO1"]                    \n\t"            \
--  "absq_s.ph        %["#IO2"],   %["#IO2"]                    \n\t"            \
--  "absq_s.ph        %["#IO3"],   %["#IO3"]                    \n\t"            \
--  "absq_s.ph        %["#IO4"],   %["#IO4"]                    \n\t"            \
--  "absq_s.ph        %["#IO5"],   %["#IO5"]                    \n\t"            \
--  "absq_s.ph        %["#IO6"],   %["#IO6"]                    \n\t"            \
--  "absq_s.ph        %["#IO7"],   %["#IO7"]                    \n\t"
-+  "absq_s.ph        %[" #IO0 "],   %[" #IO0 "]                \n\t"            \
-+  "absq_s.ph        %[" #IO1 "],   %[" #IO1 "]                \n\t"            \
-+  "absq_s.ph        %[" #IO2 "],   %[" #IO2 "]                \n\t"            \
-+  "absq_s.ph        %[" #IO3 "],   %[" #IO3 "]                \n\t"            \
-+  "absq_s.ph        %[" #IO4 "],   %[" #IO4 "]                \n\t"            \
-+  "absq_s.ph        %[" #IO5 "],   %[" #IO5 "]                \n\t"            \
-+  "absq_s.ph        %[" #IO6 "],   %[" #IO6 "]                \n\t"            \
-+  "absq_s.ph        %[" #IO7 "],   %[" #IO7 "]                \n\t"
- 
- // dpa.w.ph $ac0 temp0 ,temp1
- //  $ac += temp0[31..16] * temp1[31..16] + temp0[15..0] * temp1[15..0]
-@@ -56,15 +56,15 @@
- #define MUL_HALF(O0, I0, I1, I2, I3, I4, I5, I6, I7,                           \
-                  I8, I9, I10, I11, I12, I13, I14, I15)                         \
-     "mult            $ac0,      $zero,     $zero              \n\t"            \
--    "dpa.w.ph        $ac0,      %["#I2"],  %["#I0"]           \n\t"            \
--    "dpax.w.ph       $ac0,      %["#I5"],  %["#I6"]           \n\t"            \
--    "dpa.w.ph        $ac0,      %["#I8"],  %["#I9"]           \n\t"            \
--    "dpax.w.ph       $ac0,      %["#I11"], %["#I4"]           \n\t"            \
--    "dpa.w.ph        $ac0,      %["#I12"], %["#I7"]           \n\t"            \
--    "dpax.w.ph       $ac0,      %["#I13"], %["#I1"]           \n\t"            \
--    "dpa.w.ph        $ac0,      %["#I14"], %["#I3"]           \n\t"            \
--    "dpax.w.ph       $ac0,      %["#I15"], %["#I10"]          \n\t"            \
--    "mflo            %["#O0"],  $ac0                          \n\t"
-+    "dpa.w.ph        $ac0,      %[" #I2 "],  %[" #I0 "]       \n\t"            \
-+    "dpax.w.ph       $ac0,      %[" #I5 "],  %[" #I6 "]       \n\t"            \
-+    "dpa.w.ph        $ac0,      %[" #I8 "],  %[" #I9 "]       \n\t"            \
-+    "dpax.w.ph       $ac0,      %[" #I11 "], %[" #I4 "]       \n\t"            \
-+    "dpa.w.ph        $ac0,      %[" #I12 "], %[" #I7 "]       \n\t"            \
-+    "dpax.w.ph       $ac0,      %[" #I13 "], %[" #I1 "]       \n\t"            \
-+    "dpa.w.ph        $ac0,      %[" #I14 "], %[" #I3 "]       \n\t"            \
-+    "dpax.w.ph       $ac0,      %[" #I15 "], %[" #I10 "]      \n\t"            \
-+    "mflo            %[" #O0 "],  $ac0                        \n\t"
- 
- #define OUTPUT_EARLY_CLOBBER_REGS_17()                                         \
-   OUTPUT_EARLY_CLOBBER_REGS_10(),                                              \
-@@ -77,69 +77,69 @@
- // A - offset in bytes to load from src and ref buffers
- // TEMP0..TEMP3 - registers for corresponding tmp elements
- #define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3)                         \
--  "lw              %["#TEMP0"],   0(%[args])                        \n\t"      \
--  "lw              %["#TEMP1"],   4(%[args])                        \n\t"      \
--  "lw              %["#TEMP2"],   "XSTR(BPS)"*"#A"(%["#TEMP0"])     \n\t"      \
--  "lw              %["#TEMP3"],   "XSTR(BPS)"*"#A"(%["#TEMP1"])     \n\t"      \
--  "preceu.ph.qbl   %["#TEMP0"],   %["#TEMP2"]                       \n\t"      \
--  "preceu.ph.qbl   %["#TEMP1"],   %["#TEMP3"]                       \n\t"      \
--  "preceu.ph.qbr   %["#TEMP2"],   %["#TEMP2"]                       \n\t"      \
--  "preceu.ph.qbr   %["#TEMP3"],   %["#TEMP3"]                       \n\t"      \
--  "subq.ph         %["#TEMP0"],   %["#TEMP0"],   %["#TEMP1"]        \n\t"      \
--  "subq.ph         %["#TEMP2"],   %["#TEMP2"],   %["#TEMP3"]        \n\t"      \
--  "rotr            %["#TEMP0"],   %["#TEMP0"],   16                 \n\t"      \
--  "addq.ph         %["#TEMP1"],   %["#TEMP2"],   %["#TEMP0"]        \n\t"      \
--  "subq.ph         %["#TEMP3"],   %["#TEMP2"],   %["#TEMP0"]        \n\t"      \
--  "seh             %["#TEMP0"],   %["#TEMP1"]                       \n\t"      \
--  "sra             %[temp16],     %["#TEMP1"],   16                 \n\t"      \
--  "seh             %[temp19],     %["#TEMP3"]                       \n\t"      \
--  "sra             %["#TEMP3"],   %["#TEMP3"],   16                 \n\t"      \
--  "subu            %["#TEMP2"],   %["#TEMP0"],   %[temp16]          \n\t"      \
--  "addu            %["#TEMP0"],   %["#TEMP0"],   %[temp16]          \n\t"      \
--  "mul             %[temp17],     %[temp19],     %[c2217]           \n\t"      \
--  "mul             %[temp18],     %["#TEMP3"],   %[c5352]           \n\t"      \
--  "mul             %["#TEMP1"],   %[temp19],     %[c5352]           \n\t"      \
--  "mul             %[temp16],     %["#TEMP3"],   %[c2217]           \n\t"      \
--  "sll             %["#TEMP2"],   %["#TEMP2"],   3                  \n\t"      \
--  "sll             %["#TEMP0"],   %["#TEMP0"],   3                  \n\t"      \
--  "subu            %["#TEMP3"],   %[temp17],     %[temp18]          \n\t"      \
--  "addu            %["#TEMP1"],   %[temp16],     %["#TEMP1"]        \n\t"      \
--  "addiu           %["#TEMP3"],   %["#TEMP3"],   937                \n\t"      \
--  "addiu           %["#TEMP1"],   %["#TEMP1"],   1812               \n\t"      \
--  "sra             %["#TEMP3"],   %["#TEMP3"],   9                  \n\t"      \
--  "sra             %["#TEMP1"],   %["#TEMP1"],   9                  \n\t"
-+  "lw              %[" #TEMP0 "],   0(%[args])                          \n\t"  \
-+  "lw              %[" #TEMP1 "],   4(%[args])                          \n\t"  \
-+  "lw              %[" #TEMP2 "],   "XSTR(BPS)"*" #A "(%[" #TEMP0 "])   \n\t"  \
-+  "lw              %[" #TEMP3 "],   "XSTR(BPS)"*" #A "(%[" #TEMP1 "])   \n\t"  \
-+  "preceu.ph.qbl   %[" #TEMP0 "],   %[" #TEMP2 "]                       \n\t"  \
-+  "preceu.ph.qbl   %[" #TEMP1 "],   %[" #TEMP3 "]                       \n\t"  \
-+  "preceu.ph.qbr   %[" #TEMP2 "],   %[" #TEMP2 "]                       \n\t"  \
-+  "preceu.ph.qbr   %[" #TEMP3 "],   %[" #TEMP3 "]                       \n\t"  \
-+  "subq.ph         %[" #TEMP0 "],   %[" #TEMP0 "],   %[" #TEMP1 "]      \n\t"  \
-+  "subq.ph         %[" #TEMP2 "],   %[" #TEMP2 "],   %[" #TEMP3 "]      \n\t"  \
-+  "rotr            %[" #TEMP0 "],   %[" #TEMP0 "],   16                 \n\t"  \
-+  "addq.ph         %[" #TEMP1 "],   %[" #TEMP2 "],   %[" #TEMP0 "]      \n\t"  \
-+  "subq.ph         %[" #TEMP3 "],   %[" #TEMP2 "],   %[" #TEMP0 "]      \n\t"  \
-+  "seh             %[" #TEMP0 "],   %[" #TEMP1 "]                       \n\t"  \
-+  "sra             %[temp16],     %[" #TEMP1 "],   16                   \n\t"  \
-+  "seh             %[temp19],     %[" #TEMP3 "]                         \n\t"  \
-+  "sra             %[" #TEMP3 "],   %[" #TEMP3 "],   16                 \n\t"  \
-+  "subu            %[" #TEMP2 "],   %[" #TEMP0 "],   %[temp16]          \n\t"  \
-+  "addu            %[" #TEMP0 "],   %[" #TEMP0 "],   %[temp16]          \n\t"  \
-+  "mul             %[temp17],     %[temp19],     %[c2217]               \n\t"  \
-+  "mul             %[temp18],     %[" #TEMP3 "],   %[c5352]             \n\t"  \
-+  "mul             %[" #TEMP1 "],   %[temp19],     %[c5352]             \n\t"  \
-+  "mul             %[temp16],     %[" #TEMP3 "],   %[c2217]             \n\t"  \
-+  "sll             %[" #TEMP2 "],   %[" #TEMP2 "],   3                  \n\t"  \
-+  "sll             %[" #TEMP0 "],   %[" #TEMP0 "],   3                  \n\t"  \
-+  "subu            %[" #TEMP3 "],   %[temp17],     %[temp18]            \n\t"  \
-+  "addu            %[" #TEMP1 "],   %[temp16],     %[" #TEMP1 "]        \n\t"  \
-+  "addiu           %[" #TEMP3 "],   %[" #TEMP3 "],   937                \n\t"  \
-+  "addiu           %[" #TEMP1 "],   %[" #TEMP1 "],   1812               \n\t"  \
-+  "sra             %[" #TEMP3 "],   %[" #TEMP3 "],   9                  \n\t"  \
-+  "sra             %[" #TEMP1 "],   %[" #TEMP1 "],   9                  \n\t"
- 
- // macro for one vertical pass in FTransform
- // temp0..temp15 holds tmp[0]..tmp[15]
- // A..D - offsets in bytes to store to out buffer
- // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements
- #define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12)                 \
--  "addu            %[temp16],     %["#TEMP0"],   %["#TEMP12"] \n\t"            \
--  "subu            %[temp19],     %["#TEMP0"],   %["#TEMP12"] \n\t"            \
--  "addu            %[temp17],     %["#TEMP4"],   %["#TEMP8"]  \n\t"            \
--  "subu            %[temp18],     %["#TEMP4"],   %["#TEMP8"]  \n\t"            \
--  "mul             %["#TEMP8"],   %[temp19],     %[c2217]     \n\t"            \
--  "mul             %["#TEMP12"],  %[temp18],     %[c2217]     \n\t"            \
--  "mul             %["#TEMP4"],   %[temp19],     %[c5352]     \n\t"            \
--  "mul             %[temp18],     %[temp18],     %[c5352]     \n\t"            \
--  "addiu           %[temp16],     %[temp16],     7            \n\t"            \
--  "addu            %["#TEMP0"],   %[temp16],     %[temp17]    \n\t"            \
--  "sra             %["#TEMP0"],   %["#TEMP0"],   4            \n\t"            \
--  "addu            %["#TEMP12"],  %["#TEMP12"],  %["#TEMP4"]  \n\t"            \
--  "subu            %["#TEMP4"],   %[temp16],     %[temp17]    \n\t"            \
--  "sra             %["#TEMP4"],   %["#TEMP4"],   4            \n\t"            \
--  "addiu           %["#TEMP8"],   %["#TEMP8"],   30000        \n\t"            \
--  "addiu           %["#TEMP12"],  %["#TEMP12"],  12000        \n\t"            \
--  "addiu           %["#TEMP8"],   %["#TEMP8"],   21000        \n\t"            \
--  "subu            %["#TEMP8"],   %["#TEMP8"],   %[temp18]    \n\t"            \
--  "sra             %["#TEMP12"],  %["#TEMP12"],  16           \n\t"            \
--  "sra             %["#TEMP8"],   %["#TEMP8"],   16           \n\t"            \
--  "addiu           %[temp16],     %["#TEMP12"],  1            \n\t"            \
--  "movn            %["#TEMP12"],  %[temp16],     %[temp19]    \n\t"            \
--  "sh              %["#TEMP0"],   "#A"(%[temp20])             \n\t"            \
--  "sh              %["#TEMP4"],   "#C"(%[temp20])             \n\t"            \
--  "sh              %["#TEMP8"],   "#D"(%[temp20])             \n\t"            \
--  "sh              %["#TEMP12"],  "#B"(%[temp20])             \n\t"
-+  "addu            %[temp16],     %[" #TEMP0 "],   %[" #TEMP12 "]   \n\t"      \
-+  "subu            %[temp19],     %[" #TEMP0 "],   %[" #TEMP12 "]   \n\t"      \
-+  "addu            %[temp17],     %[" #TEMP4 "],   %[" #TEMP8 "]    \n\t"      \
-+  "subu            %[temp18],     %[" #TEMP4 "],   %[" #TEMP8 "]    \n\t"      \
-+  "mul             %[" #TEMP8 "],   %[temp19],     %[c2217]         \n\t"      \
-+  "mul             %[" #TEMP12 "],  %[temp18],     %[c2217]         \n\t"      \
-+  "mul             %[" #TEMP4 "],   %[temp19],     %[c5352]         \n\t"      \
-+  "mul             %[temp18],     %[temp18],     %[c5352]           \n\t"      \
-+  "addiu           %[temp16],     %[temp16],     7                  \n\t"      \
-+  "addu            %[" #TEMP0 "],   %[temp16],     %[temp17]        \n\t"      \
-+  "sra             %[" #TEMP0 "],   %[" #TEMP0 "],   4              \n\t"      \
-+  "addu            %[" #TEMP12 "],  %[" #TEMP12 "],  %[" #TEMP4 "]  \n\t"      \
-+  "subu            %[" #TEMP4 "],   %[temp16],     %[temp17]        \n\t"      \
-+  "sra             %[" #TEMP4 "],   %[" #TEMP4 "],   4              \n\t"      \
-+  "addiu           %[" #TEMP8 "],   %[" #TEMP8 "],   30000          \n\t"      \
-+  "addiu           %[" #TEMP12 "],  %[" #TEMP12 "],  12000          \n\t"      \
-+  "addiu           %[" #TEMP8 "],   %[" #TEMP8 "],   21000          \n\t"      \
-+  "subu            %[" #TEMP8 "],   %[" #TEMP8 "],   %[temp18]      \n\t"      \
-+  "sra             %[" #TEMP12 "],  %[" #TEMP12 "],  16             \n\t"      \
-+  "sra             %[" #TEMP8 "],   %[" #TEMP8 "],   16             \n\t"      \
-+  "addiu           %[temp16],     %[" #TEMP12 "],  1                \n\t"      \
-+  "movn            %[" #TEMP12 "],  %[temp16],     %[temp19]        \n\t"      \
-+  "sh              %[" #TEMP0 "],   " #A "(%[temp20])               \n\t"      \
-+  "sh              %[" #TEMP4 "],   " #C "(%[temp20])               \n\t"      \
-+  "sh              %[" #TEMP8 "],   " #D "(%[temp20])               \n\t"      \
-+  "sh              %[" #TEMP12 "],  " #B "(%[temp20])               \n\t"
- 
- static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) {
-   const int c2217 = 2217;
-@@ -329,11 +329,11 @@
- // Intra predictions
- 
- #define FILL_PART(J, SIZE)                                          \
--    "usw        %[value],  0+"#J"*"XSTR(BPS)"(%[dst])    \n\t"      \
--    "usw        %[value],  4+"#J"*"XSTR(BPS)"(%[dst])    \n\t"      \
--  ".if "#SIZE" == 16                                     \n\t"      \
--    "usw        %[value],  8+"#J"*"XSTR(BPS)"(%[dst])    \n\t"      \
--    "usw        %[value], 12+"#J"*"XSTR(BPS)"(%[dst])    \n\t"      \
-+    "usw        %[value],  0+" #J "*"XSTR(BPS)"(%[dst])  \n\t"      \
-+    "usw        %[value],  4+" #J "*"XSTR(BPS)"(%[dst])  \n\t"      \
-+  ".if " #SIZE " == 16                                   \n\t"      \
-+    "usw        %[value],  8+" #J "*"XSTR(BPS)"(%[dst])  \n\t"      \
-+    "usw        %[value], 12+" #J "*"XSTR(BPS)"(%[dst])  \n\t"      \
-   ".endif                                                \n\t"
- 
- #define FILL_8_OR_16(DST, VALUE, SIZE) do {                         \
-@@ -348,7 +348,7 @@
-     FILL_PART( 5, SIZE)                                             \
-     FILL_PART( 6, SIZE)                                             \
-     FILL_PART( 7, SIZE)                                             \
--  ".if "#SIZE" == 16                                     \n\t"      \
-+  ".if " #SIZE " == 16                                   \n\t"      \
-     FILL_PART( 8, 16)                                               \
-     FILL_PART( 9, 16)                                               \
-     FILL_PART(10, 16)                                               \
-@@ -425,7 +425,7 @@
-     CLIPPING()                                                                 \
-     "usw             %[temp0],   0(%[dst])               \n\t"                 \
-     "usw             %[temp1],   4(%[dst])               \n\t"                 \
--  ".if "#SIZE" == 16                                     \n\t"                 \
-+  ".if " #SIZE " == 16                                   \n\t"                 \
-     "ulw             %[temp0],   8(%[top])               \n\t"                 \
-     "ulw             %[temp1],   12(%[top])              \n\t"                 \
-     CLIPPING()                                                                 \
-@@ -1060,8 +1060,8 @@
- #if !defined(WORK_AROUND_GCC)
- 
- #define GET_SSE_INNER(A)                                                  \
--  "lw               %[temp0],    "#A"(%[a])                    \n\t"      \
--  "lw               %[temp1],    "#A"(%[b])                    \n\t"      \
-+  "lw               %[temp0],    " #A "(%[a])                  \n\t"      \
-+  "lw               %[temp1],    " #A "(%[b])                  \n\t"      \
-   "preceu.ph.qbr    %[temp2],    %[temp0]                      \n\t"      \
-   "preceu.ph.qbl    %[temp0],    %[temp0]                      \n\t"      \
-   "preceu.ph.qbr    %[temp3],    %[temp1]                      \n\t"      \
-@@ -1185,28 +1185,28 @@
- // N - offset in bytes (n * 2)
- // N1 - offset in bytes ((n + 1) * 2)
- #define QUANTIZE_ONE(J, K, N, N1)                                         \
--  "ulw         %[temp1],     "#J"(%[ppin])                   \n\t"        \
--  "ulw         %[temp2],     "#J"(%[ppsharpen])              \n\t"        \
--  "lhu         %[temp3],     "#K"(%[ppzthresh])              \n\t"        \
--  "lhu         %[temp6],     "#K"+4(%[ppzthresh])            \n\t"        \
-+  "ulw         %[temp1],     " #J "(%[ppin])                 \n\t"        \
-+  "ulw         %[temp2],     " #J "(%[ppsharpen])            \n\t"        \
-+  "lhu         %[temp3],     " #K "(%[ppzthresh])            \n\t"        \
-+  "lhu         %[temp6],     " #K "+4(%[ppzthresh])          \n\t"        \
-   "absq_s.ph   %[temp4],     %[temp1]                        \n\t"        \
-   "ins         %[temp3],     %[temp6],         16,       16  \n\t"        \
-   "addu.ph     %[coeff],     %[temp4],         %[temp2]      \n\t"        \
-   "shra.ph     %[sign],      %[temp1],         15            \n\t"        \
-   "li          %[level],     0x10001                         \n\t"        \
-   "cmp.lt.ph   %[temp3],     %[coeff]                        \n\t"        \
--  "lhu         %[temp1],     "#J"(%[ppiq])                   \n\t"        \
-+  "lhu         %[temp1],     " #J "(%[ppiq])                 \n\t"        \
-   "pick.ph     %[temp5],     %[level],         $0            \n\t"        \
--  "lw          %[temp2],     "#K"(%[ppbias])                 \n\t"        \
-+  "lw          %[temp2],     " #K "(%[ppbias])               \n\t"        \
-   "beqz        %[temp5],     0f                              \n\t"        \
--  "lhu         %[temp3],     "#J"(%[ppq])                    \n\t"        \
-+  "lhu         %[temp3],     " #J "(%[ppq])                  \n\t"        \
-   "beq         %[temp5],     %[level],         1f            \n\t"        \
-   "andi        %[temp5],     %[temp5],         0x1           \n\t"        \
-   "andi        %[temp4],     %[coeff],         0xffff        \n\t"        \
-   "beqz        %[temp5],     2f                              \n\t"        \
-   "mul         %[level],     %[temp4],         %[temp1]      \n\t"        \
--  "sh          $0,           "#J"+2(%[ppin])                 \n\t"        \
--  "sh          $0,           "#N1"(%[pout])                  \n\t"        \
-+  "sh          $0,           " #J "+2(%[ppin])               \n\t"        \
-+  "sh          $0,           " #N1 "(%[pout])                \n\t"        \
-   "addu        %[level],     %[level],         %[temp2]      \n\t"        \
-   "sra         %[level],     %[level],         17            \n\t"        \
-   "slt         %[temp4],     %[max_level],     %[level]      \n\t"        \
-@@ -1216,15 +1216,15 @@
-   "subu        %[level],     %[level],         %[temp6]      \n\t"        \
-   "mul         %[temp5],     %[level],         %[temp3]      \n\t"        \
-   "or          %[ret],       %[ret],           %[level]      \n\t"        \
--  "sh          %[level],     "#N"(%[pout])                   \n\t"        \
--  "sh          %[temp5],     "#J"(%[ppin])                   \n\t"        \
-+  "sh          %[level],     " #N "(%[pout])                 \n\t"        \
-+  "sh          %[temp5],     " #J "(%[ppin])                 \n\t"        \
-   "j           3f                                            \n\t"        \
- "2:                                                          \n\t"        \
--  "lhu         %[temp1],     "#J"+2(%[ppiq])                 \n\t"        \
-+  "lhu         %[temp1],     " #J "+2(%[ppiq])               \n\t"        \
-   "srl         %[temp5],     %[coeff],         16            \n\t"        \
-   "mul         %[level],     %[temp5],         %[temp1]      \n\t"        \
--  "lw          %[temp2],     "#K"+4(%[ppbias])               \n\t"        \
--  "lhu         %[temp3],     "#J"+2(%[ppq])                  \n\t"        \
-+  "lw          %[temp2],     " #K "+4(%[ppbias])             \n\t"        \
-+  "lhu         %[temp3],     " #J "+2(%[ppq])                \n\t"        \
-   "addu        %[level],     %[level],         %[temp2]      \n\t"        \
-   "sra         %[level],     %[level],         17            \n\t"        \
-   "srl         %[temp6],     %[sign],          16            \n\t"        \
-@@ -1233,20 +1233,20 @@
-   "xor         %[level],     %[level],         %[temp6]      \n\t"        \
-   "subu        %[level],     %[level],         %[temp6]      \n\t"        \
-   "mul         %[temp5],     %[level],         %[temp3]      \n\t"        \
--  "sh          $0,           "#J"(%[ppin])                   \n\t"        \
--  "sh          $0,           "#N"(%[pout])                   \n\t"        \
-+  "sh          $0,           " #J "(%[ppin])                 \n\t"        \
-+  "sh          $0,           " #N "(%[pout])                 \n\t"        \
-   "or          %[ret],       %[ret],           %[level]      \n\t"        \
--  "sh          %[temp5],     "#J"+2(%[ppin])                 \n\t"        \
--  "sh          %[level],     "#N1"(%[pout])                  \n\t"        \
-+  "sh          %[temp5],     " #J "+2(%[ppin])               \n\t"        \
-+  "sh          %[level],     " #N1 "(%[pout])                \n\t"        \
-   "j           3f                                            \n\t"        \
- "1:                                                          \n\t"        \
--  "lhu         %[temp1],     "#J"(%[ppiq])                   \n\t"        \
--  "lw          %[temp2],     "#K"(%[ppbias])                 \n\t"        \
--  "ulw         %[temp3],     "#J"(%[ppq])                    \n\t"        \
-+  "lhu         %[temp1],     " #J "(%[ppiq])                 \n\t"        \
-+  "lw          %[temp2],     " #K "(%[ppbias])               \n\t"        \
-+  "ulw         %[temp3],     " #J "(%[ppq])                  \n\t"        \
-   "andi        %[temp5],     %[coeff],         0xffff        \n\t"        \
-   "srl         %[temp0],     %[coeff],         16            \n\t"        \
--  "lhu         %[temp6],     "#J"+2(%[ppiq])                 \n\t"        \
--  "lw          %[coeff],     "#K"+4(%[ppbias])               \n\t"        \
-+  "lhu         %[temp6],     " #J "+2(%[ppiq])               \n\t"        \
-+  "lw          %[coeff],     " #K "+4(%[ppbias])             \n\t"        \
-   "mul         %[level],     %[temp5],         %[temp1]      \n\t"        \
-   "mul         %[temp4],     %[temp0],         %[temp6]      \n\t"        \
-   "addu        %[level],     %[level],         %[temp2]      \n\t"        \
-@@ -1259,15 +1259,15 @@
-   "subu.ph     %[level],     %[level],         %[sign]       \n\t"        \
-   "mul.ph      %[temp3],     %[level],         %[temp3]      \n\t"        \
-   "or          %[ret],       %[ret],           %[level]      \n\t"        \
--  "sh          %[level],     "#N"(%[pout])                   \n\t"        \
-+  "sh          %[level],     " #N "(%[pout])                 \n\t"        \
-   "srl         %[level],     %[level],         16            \n\t"        \
--  "sh          %[level],     "#N1"(%[pout])                  \n\t"        \
--  "usw         %[temp3],     "#J"(%[ppin])                   \n\t"        \
-+  "sh          %[level],     " #N1 "(%[pout])                \n\t"        \
-+  "usw         %[temp3],     " #J "(%[ppin])                 \n\t"        \
-   "j           3f                                            \n\t"        \
- "0:                                                          \n\t"        \
--  "sh          $0,           "#N"(%[pout])                   \n\t"        \
--  "sh          $0,           "#N1"(%[pout])                  \n\t"        \
--  "usw         $0,           "#J"(%[ppin])                   \n\t"        \
-+  "sh          $0,           " #N "(%[pout])                 \n\t"        \
-+  "sh          $0,           " #N1 "(%[pout])                \n\t"        \
-+  "usw         $0,           " #J "(%[ppin])                 \n\t"        \
- "3:                                                          \n\t"
- 
- static int QuantizeBlock(int16_t in[16], int16_t out[16],
-@@ -1326,37 +1326,37 @@
- // A, B, C, D - offset in bytes to load from in buffer
- // TEMP0, TEMP1 - registers for corresponding tmp elements
- #define HORIZONTAL_PASS_WHT(A, B, C, D, TEMP0, TEMP1)                          \
--  "lh              %["#TEMP0"],  "#A"(%[in])                \n\t"              \
--  "lh              %["#TEMP1"],  "#B"(%[in])                \n\t"              \
--  "lh              %[temp8],     "#C"(%[in])                \n\t"              \
--  "lh              %[temp9],     "#D"(%[in])                \n\t"              \
--  "ins             %["#TEMP1"],  %["#TEMP0"],  16,  16      \n\t"              \
-+  "lh              %[" #TEMP0 "],  " #A "(%[in])            \n\t"              \
-+  "lh              %[" #TEMP1 "],  " #B "(%[in])            \n\t"              \
-+  "lh              %[temp8],     " #C "(%[in])              \n\t"              \
-+  "lh              %[temp9],     " #D "(%[in])              \n\t"              \
-+  "ins             %[" #TEMP1 "],  %[" #TEMP0 "],  16,  16  \n\t"              \
-   "ins             %[temp9],     %[temp8],     16,  16      \n\t"              \
--  "subq.ph         %[temp8],     %["#TEMP1"],  %[temp9]     \n\t"              \
--  "addq.ph         %[temp9],     %["#TEMP1"],  %[temp9]     \n\t"              \
--  "precrq.ph.w     %["#TEMP0"],  %[temp8],     %[temp9]     \n\t"              \
-+  "subq.ph         %[temp8],     %[" #TEMP1 "],  %[temp9]   \n\t"              \
-+  "addq.ph         %[temp9],     %[" #TEMP1 "],  %[temp9]   \n\t"              \
-+  "precrq.ph.w     %[" #TEMP0 "],  %[temp8],     %[temp9]   \n\t"              \
-   "append          %[temp8],     %[temp9],     16           \n\t"              \
--  "subq.ph         %["#TEMP1"],  %["#TEMP0"],  %[temp8]     \n\t"              \
--  "addq.ph         %["#TEMP0"],  %["#TEMP0"],  %[temp8]     \n\t"              \
--  "rotr            %["#TEMP1"],  %["#TEMP1"],  16           \n\t"
-+  "subq.ph         %[" #TEMP1 "],  %[" #TEMP0 "],  %[temp8] \n\t"              \
-+  "addq.ph         %[" #TEMP0 "],  %[" #TEMP0 "],  %[temp8] \n\t"              \
-+  "rotr            %[" #TEMP1 "],  %[" #TEMP1 "],  16       \n\t"
- 
- // macro for one vertical pass in FTransformWHT
- // temp0..temp7 holds tmp[0]..tmp[15]
- // A, B, C, D - offsets in bytes to store to out buffer
- // TEMP0, TEMP2, TEMP4 and TEMP6 - registers for corresponding tmp elements
- #define VERTICAL_PASS_WHT(A, B, C, D, TEMP0, TEMP2, TEMP4, TEMP6)              \
--  "addq.ph         %[temp8],     %["#TEMP0"],  %["#TEMP4"]  \n\t"              \
--  "addq.ph         %[temp9],     %["#TEMP2"],  %["#TEMP6"]  \n\t"              \
--  "subq.ph         %["#TEMP2"],  %["#TEMP2"],  %["#TEMP6"]  \n\t"              \
--  "subq.ph         %["#TEMP6"],  %["#TEMP0"],  %["#TEMP4"]  \n\t"              \
--  "addqh.ph        %["#TEMP0"],  %[temp8],     %[temp9]     \n\t"              \
--  "subqh.ph        %["#TEMP4"],  %["#TEMP6"],  %["#TEMP2"]  \n\t"              \
--  "addqh.ph        %["#TEMP2"],  %["#TEMP2"],  %["#TEMP6"]  \n\t"              \
--  "subqh.ph        %["#TEMP6"],  %[temp8],     %[temp9]     \n\t"              \
--  "usw             %["#TEMP0"],  "#A"(%[out])               \n\t"              \
--  "usw             %["#TEMP2"],  "#B"(%[out])               \n\t"              \
--  "usw             %["#TEMP4"],  "#C"(%[out])               \n\t"              \
--  "usw             %["#TEMP6"],  "#D"(%[out])               \n\t"
-+  "addq.ph         %[temp8],     %[" #TEMP0 "],  %[" #TEMP4 "]    \n\t"        \
-+  "addq.ph         %[temp9],     %[" #TEMP2 "],  %[" #TEMP6 "]    \n\t"        \
-+  "subq.ph         %[" #TEMP2 "],  %[" #TEMP2 "],  %[" #TEMP6 "]  \n\t"        \
-+  "subq.ph         %[" #TEMP6 "],  %[" #TEMP0 "],  %[" #TEMP4 "]  \n\t"        \
-+  "addqh.ph        %[" #TEMP0 "],  %[temp8],     %[temp9]         \n\t"        \
-+  "subqh.ph        %[" #TEMP4 "],  %[" #TEMP6 "],  %[" #TEMP2 "]  \n\t"        \
-+  "addqh.ph        %[" #TEMP2 "],  %[" #TEMP2 "],  %[" #TEMP6 "]  \n\t"        \
-+  "subqh.ph        %[" #TEMP6 "],  %[temp8],     %[temp9]         \n\t"        \
-+  "usw             %[" #TEMP0 "],  " #A "(%[out])                 \n\t"        \
-+  "usw             %[" #TEMP2 "],  " #B "(%[out])                 \n\t"        \
-+  "usw             %[" #TEMP4 "],  " #C "(%[out])                 \n\t"        \
-+  "usw             %[" #TEMP6 "],  " #D "(%[out])                 \n\t"
- 
- static void FTransformWHT(const int16_t* in, int16_t* out) {
-   int temp0, temp1, temp2, temp3, temp4;
-@@ -1385,10 +1385,10 @@
- // convert 8 coeffs at time
- // A, B, C, D - offsets in bytes to load from out buffer
- #define CONVERT_COEFFS_TO_BIN(A, B, C, D)                                      \
--  "ulw        %[temp0],  "#A"(%[out])                  \n\t"                   \
--  "ulw        %[temp1],  "#B"(%[out])                  \n\t"                   \
--  "ulw        %[temp2],  "#C"(%[out])                  \n\t"                   \
--  "ulw        %[temp3],  "#D"(%[out])                  \n\t"                   \
-+  "ulw        %[temp0],  " #A "(%[out])                \n\t"                   \
-+  "ulw        %[temp1],  " #B "(%[out])                \n\t"                   \
-+  "ulw        %[temp2],  " #C "(%[out])                \n\t"                   \
-+  "ulw        %[temp3],  " #D "(%[out])                \n\t"                   \
-   "absq_s.ph  %[temp0],  %[temp0]                      \n\t"                   \
-   "absq_s.ph  %[temp1],  %[temp1]                      \n\t"                   \
-   "absq_s.ph  %[temp2],  %[temp2]                      \n\t"                   \
-diff --git a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c
-index 66f807d..8134af5 100644
---- a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c
-@@ -48,7 +48,7 @@
-       "srl       %[temp0],    %[length],    0x2         \n\t"                  \
-       "beqz      %[temp0],    4f                        \n\t"                  \
-       " andi     %[temp6],    %[length],    0x3         \n\t"                  \
--    ".if "#INVERSE"                                     \n\t"                  \
-+    ".if " #INVERSE "                                   \n\t"                  \
-       "lbu       %[temp1],    -1(%[src])                \n\t"                  \
-     "1:                                                 \n\t"                  \
-       "lbu       %[temp2],    0(%[src])                 \n\t"                  \
-@@ -84,7 +84,7 @@
-       "lbu       %[temp1],    -1(%[src])                \n\t"                  \
-       "lbu       %[temp2],    0(%[src])                 \n\t"                  \
-       "addiu     %[src],      %[src],       1           \n\t"                  \
--    ".if "#INVERSE"                                     \n\t"                  \
-+    ".if " #INVERSE "                                   \n\t"                  \
-       "addu      %[temp3],    %[temp1],     %[temp2]    \n\t"                  \
-       "sb        %[temp3],    -1(%[src])                \n\t"                  \
-     ".else                                              \n\t"                  \
-@@ -131,7 +131,7 @@
-       "ulw       %[temp3],    4(%[src])                 \n\t"                  \
-       "ulw       %[temp4],    4(%[pred])                \n\t"                  \
-       "addiu     %[src],      %[src],       8           \n\t"                  \
--    ".if "#INVERSE"                                     \n\t"                  \
-+    ".if " #INVERSE "                                   \n\t"                  \
-       "addu.qb   %[temp5],    %[temp1],     %[temp2]    \n\t"                  \
-       "addu.qb   %[temp6],    %[temp3],     %[temp4]    \n\t"                  \
-     ".else                                              \n\t"                  \
-@@ -152,7 +152,7 @@
-       "lbu       %[temp2],    0(%[pred])                \n\t"                  \
-       "addiu     %[src],      %[src],       1           \n\t"                  \
-       "addiu     %[pred],     %[pred],      1           \n\t"                  \
--    ".if "#INVERSE"                                     \n\t"                  \
-+    ".if " #INVERSE "                                   \n\t"                  \
-       "addu      %[temp3],    %[temp1],     %[temp2]    \n\t"                  \
-     ".else                                              \n\t"                  \
-       "subu      %[temp3],    %[temp1],     %[temp2]    \n\t"                  \
-@@ -177,7 +177,7 @@
-     __asm__ volatile (                                                         \
-       "lbu       %[temp1],   0(%[src])               \n\t"                     \
-       "lbu       %[temp2],   0(%[pred])              \n\t"                     \
--    ".if "#INVERSE"                                  \n\t"                     \
-+    ".if " #INVERSE "                                \n\t"                     \
-       "addu      %[temp3],   %[temp1],   %[temp2]    \n\t"                     \
-     ".else                                           \n\t"                     \
-       "subu      %[temp3],   %[temp1],   %[temp2]    \n\t"                     \
-diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c
-index 8ae5958..cdf0e26 100644
---- a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c
-+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c
-
-@@ -278,28 +278,28 @@
- // literal_ and successive histograms could be unaligned
- // so we must use ulw and usw
- #define ADD_TO_OUT(A, B, C, D, E, P0, P1, P2)           \
--    "ulw    %[temp0], "#A"(%["#P0"])        \n\t"       \
--    "ulw    %[temp1], "#B"(%["#P0"])        \n\t"       \
--    "ulw    %[temp2], "#C"(%["#P0"])        \n\t"       \
--    "ulw    %[temp3], "#D"(%["#P0"])        \n\t"       \
--    "ulw    %[temp4], "#A"(%["#P1"])        \n\t"       \
--    "ulw    %[temp5], "#B"(%["#P1"])        \n\t"       \
--    "ulw    %[temp6], "#C"(%["#P1"])        \n\t"       \
--    "ulw    %[temp7], "#D"(%["#P1"])        \n\t"       \
-+    "ulw    %[temp0], " #A "(%[" #P0 "])    \n\t"       \
-+    "ulw    %[temp1], " #B "(%[" #P0 "])    \n\t"       \
-+    "ulw    %[temp2], " #C "(%[" #P0 "])    \n\t"       \
-+    "ulw    %[temp3], " #D "(%[" #P0 "])    \n\t"       \
-+    "ulw    %[temp4], " #A "(%[" #P1 "])    \n\t"       \
-+    "ulw    %[temp5], " #B "(%[" #P1 "])    \n\t"       \
-+    "ulw    %[temp6], " #C "(%[" #P1 "])    \n\t"       \
-+    "ulw    %[temp7], " #D "(%[" #P1 "])    \n\t"       \
-     "addu   %[temp4], %[temp4],   %[temp0]  \n\t"       \
-     "addu   %[temp5], %[temp5],   %[temp1]  \n\t"       \
-     "addu   %[temp6], %[temp6],   %[temp2]  \n\t"       \
-     "addu   %[temp7], %[temp7],   %[temp3]  \n\t"       \
--    "addiu  %["#P0"],  %["#P0"],  16        \n\t"       \
--  ".if "#E" == 1                            \n\t"       \
--    "addiu  %["#P1"],  %["#P1"],  16        \n\t"       \
-+    "addiu  %[" #P0 "],  %[" #P0 "],  16    \n\t"       \
-+  ".if " #E " == 1                          \n\t"       \
-+    "addiu  %[" #P1 "],  %[" #P1 "],  16    \n\t"       \
-   ".endif                                   \n\t"       \
--    "usw    %[temp4], "#A"(%["#P2"])        \n\t"       \
--    "usw    %[temp5], "#B"(%["#P2"])        \n\t"       \
--    "usw    %[temp6], "#C"(%["#P2"])        \n\t"       \
--    "usw    %[temp7], "#D"(%["#P2"])        \n\t"       \
--    "addiu  %["#P2"], %["#P2"],   16        \n\t"       \
--    "bne    %["#P0"], %[LoopEnd], 1b        \n\t"       \
-+    "usw    %[temp4], " #A "(%[" #P2 "])    \n\t"       \
-+    "usw    %[temp5], " #B "(%[" #P2 "])    \n\t"       \
-+    "usw    %[temp6], " #C "(%[" #P2 "])    \n\t"       \
-+    "usw    %[temp7], " #D "(%[" #P2 "])    \n\t"       \
-+    "addiu  %[" #P2 "], %[" #P2 "],   16    \n\t"       \
-+    "bne    %[" #P0 "], %[LoopEnd], 1b      \n\t"       \
-     ".set   pop                             \n\t"       \
- 
- #define ASM_END_COMMON_0                                \
-diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c
-index ad55f2c..90aed7f 100644
---- a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c
-@@ -29,14 +29,14 @@
-     for (x = 0; x < (width >> 2); ++x) {                                       \
-       int tmp1, tmp2, tmp3, tmp4;                                              \
-       __asm__ volatile (                                                       \
--      ".ifc        "#TYPE",  uint8_t                    \n\t"                  \
-+      ".ifc        " #TYPE ",  uint8_t                  \n\t"                  \
-         "lbu       %[tmp1],  0(%[src])                  \n\t"                  \
-         "lbu       %[tmp2],  1(%[src])                  \n\t"                  \
-         "lbu       %[tmp3],  2(%[src])                  \n\t"                  \
-         "lbu       %[tmp4],  3(%[src])                  \n\t"                  \
-         "addiu     %[src],   %[src],      4             \n\t"                  \
-       ".endif                                           \n\t"                  \
--      ".ifc        "#TYPE",  uint32_t                   \n\t"                  \
-+      ".ifc        " #TYPE ",  uint32_t                 \n\t"                  \
-         "lw        %[tmp1],  0(%[src])                  \n\t"                  \
-         "lw        %[tmp2],  4(%[src])                  \n\t"                  \
-         "lw        %[tmp3],  8(%[src])                  \n\t"                  \
-@@ -55,7 +55,7 @@
-         "lwx       %[tmp2],  %[tmp2](%[color_map])      \n\t"                  \
-         "lwx       %[tmp3],  %[tmp3](%[color_map])      \n\t"                  \
-         "lwx       %[tmp4],  %[tmp4](%[color_map])      \n\t"                  \
--      ".ifc        "#TYPE",  uint8_t                    \n\t"                  \
-+      ".ifc        " #TYPE ",  uint8_t                  \n\t"                  \
-         "ext       %[tmp1],  %[tmp1],     8,        8   \n\t"                  \
-         "ext       %[tmp2],  %[tmp2],     8,        8   \n\t"                  \
-         "ext       %[tmp3],  %[tmp3],     8,        8   \n\t"                  \
-@@ -66,7 +66,7 @@
-         "sb        %[tmp4],  3(%[dst])                  \n\t"                  \
-         "addiu     %[dst],   %[dst],      4             \n\t"                  \
-       ".endif                                           \n\t"                  \
--      ".ifc        "#TYPE",  uint32_t                   \n\t"                  \
-+      ".ifc        " #TYPE ",  uint32_t                 \n\t"                  \
-         "sw        %[tmp1],  0(%[dst])                  \n\t"                  \
-         "sw        %[tmp2],  4(%[dst])                  \n\t"                  \
-         "sw        %[tmp3],  8(%[dst])                  \n\t"                  \
-diff --git a/Source/LibWebP/src/dsp/mips_macro.h b/Source/LibWebP/src/dsp/mips_macro.h
-index 4cfb23c..e09d2c4 100644
---- a/Source/LibWebP/src/dsp/mips_macro.h
-+++ b/Source/LibWebP/src/dsp/mips_macro.h
-@@ -25,25 +25,25 @@
- // I - input (macro doesn't change it)
- #define ADD_SUB_HALVES(O0, O1,                                                 \
-                        I0, I1)                                                 \
--  "addq.ph          %["#O0"],   %["#I0"],  %["#I1"]           \n\t"            \
--  "subq.ph          %["#O1"],   %["#I0"],  %["#I1"]           \n\t"
-+  "addq.ph          %[" #O0 "],   %[" #I0 "],  %[" #I1 "]           \n\t"      \
-+  "subq.ph          %[" #O1 "],   %[" #I0 "],  %[" #I1 "]           \n\t"
- 
- // O - output
- // I - input (macro doesn't change it)
- // I[0/1] - offset in bytes
- #define LOAD_IN_X2(O0, O1,                                                     \
-                    I0, I1)                                                     \
--  "lh               %["#O0"],   "#I0"(%[in])                  \n\t"            \
--  "lh               %["#O1"],   "#I1"(%[in])                  \n\t"
-+  "lh               %[" #O0 "],   " #I0 "(%[in])                  \n\t"        \
-+  "lh               %[" #O1 "],   " #I1 "(%[in])                  \n\t"
- 
- // I0 - location
- // I1..I9 - offsets in bytes
- #define LOAD_WITH_OFFSET_X4(O0, O1, O2, O3,                                    \
-                             I0, I1, I2, I3, I4, I5, I6, I7, I8, I9)            \
--  "ulw    %["#O0"],    "#I1"+"XSTR(I9)"*"#I5"(%["#I0"])       \n\t"            \
--  "ulw    %["#O1"],    "#I2"+"XSTR(I9)"*"#I6"(%["#I0"])       \n\t"            \
--  "ulw    %["#O2"],    "#I3"+"XSTR(I9)"*"#I7"(%["#I0"])       \n\t"            \
--  "ulw    %["#O3"],    "#I4"+"XSTR(I9)"*"#I8"(%["#I0"])       \n\t"
-+  "ulw    %[" #O0 "],    " #I1 "+"XSTR(I9)"*" #I5 "(%[" #I0 "])       \n\t"    \
-+  "ulw    %[" #O1 "],    " #I2 "+"XSTR(I9)"*" #I6 "(%[" #I0 "])       \n\t"    \
-+  "ulw    %[" #O2 "],    " #I3 "+"XSTR(I9)"*" #I7 "(%[" #I0 "])       \n\t"    \
-+  "ulw    %[" #O3 "],    " #I4 "+"XSTR(I9)"*" #I8 "(%[" #I0 "])       \n\t"
- 
- // O - output
- // IO - input/output
-@@ -51,42 +51,42 @@
- #define MUL_SHIFT_SUM(O0, O1, O2, O3, O4, O5, O6, O7,                          \
-                       IO0, IO1, IO2, IO3,                                      \
-                       I0, I1, I2, I3, I4, I5, I6, I7)                          \
--  "mul              %["#O0"],   %["#I0"],   %[kC2]            \n\t"            \
--  "mul              %["#O1"],   %["#I0"],   %[kC1]            \n\t"            \
--  "mul              %["#O2"],   %["#I1"],   %[kC2]            \n\t"            \
--  "mul              %["#O3"],   %["#I1"],   %[kC1]            \n\t"            \
--  "mul              %["#O4"],   %["#I2"],   %[kC2]            \n\t"            \
--  "mul              %["#O5"],   %["#I2"],   %[kC1]            \n\t"            \
--  "mul              %["#O6"],   %["#I3"],   %[kC2]            \n\t"            \
--  "mul              %["#O7"],   %["#I3"],   %[kC1]            \n\t"            \
--  "sra              %["#O0"],   %["#O0"],   16                \n\t"            \
--  "sra              %["#O1"],   %["#O1"],   16                \n\t"            \
--  "sra              %["#O2"],   %["#O2"],   16                \n\t"            \
--  "sra              %["#O3"],   %["#O3"],   16                \n\t"            \
--  "sra              %["#O4"],   %["#O4"],   16                \n\t"            \
--  "sra              %["#O5"],   %["#O5"],   16                \n\t"            \
--  "sra              %["#O6"],   %["#O6"],   16                \n\t"            \
--  "sra              %["#O7"],   %["#O7"],   16                \n\t"            \
--  "addu             %["#IO0"],  %["#IO0"],  %["#I4"]          \n\t"            \
--  "addu             %["#IO1"],  %["#IO1"],  %["#I5"]          \n\t"            \
--  "subu             %["#IO2"],  %["#IO2"],  %["#I6"]          \n\t"            \
--  "subu             %["#IO3"],  %["#IO3"],  %["#I7"]          \n\t"
-+  "mul              %[" #O0 "],   %[" #I0 "],   %[kC2]        \n\t"            \
-+  "mul              %[" #O1 "],   %[" #I0 "],   %[kC1]        \n\t"            \
-+  "mul              %[" #O2 "],   %[" #I1 "],   %[kC2]        \n\t"            \
-+  "mul              %[" #O3 "],   %[" #I1 "],   %[kC1]        \n\t"            \
-+  "mul              %[" #O4 "],   %[" #I2 "],   %[kC2]        \n\t"            \
-+  "mul              %[" #O5 "],   %[" #I2 "],   %[kC1]        \n\t"            \
-+  "mul              %[" #O6 "],   %[" #I3 "],   %[kC2]        \n\t"            \
-+  "mul              %[" #O7 "],   %[" #I3 "],   %[kC1]        \n\t"            \
-+  "sra              %[" #O0 "],   %[" #O0 "],   16            \n\t"            \
-+  "sra              %[" #O1 "],   %[" #O1 "],   16            \n\t"            \
-+  "sra              %[" #O2 "],   %[" #O2 "],   16            \n\t"            \
-+  "sra              %[" #O3 "],   %[" #O3 "],   16            \n\t"            \
-+  "sra              %[" #O4 "],   %[" #O4 "],   16            \n\t"            \
-+  "sra              %[" #O5 "],   %[" #O5 "],   16            \n\t"            \
-+  "sra              %[" #O6 "],   %[" #O6 "],   16            \n\t"            \
-+  "sra              %[" #O7 "],   %[" #O7 "],   16            \n\t"            \
-+  "addu             %[" #IO0 "],  %[" #IO0 "],  %[" #I4 "]    \n\t"            \
-+  "addu             %[" #IO1 "],  %[" #IO1 "],  %[" #I5 "]    \n\t"            \
-+  "subu             %[" #IO2 "],  %[" #IO2 "],  %[" #I6 "]    \n\t"            \
-+  "subu             %[" #IO3 "],  %[" #IO3 "],  %[" #I7 "]    \n\t"
- 
- // O - output
- // I - input (macro doesn't change it)
- #define INSERT_HALF_X2(O0, O1,                                                 \
-                        I0, I1)                                                 \
--  "ins              %["#O0"],   %["#I0"], 16,    16           \n\t"            \
--  "ins              %["#O1"],   %["#I1"], 16,    16           \n\t"
-+  "ins              %[" #O0 "],   %[" #I0 "], 16,    16           \n\t"        \
-+  "ins              %[" #O1 "],   %[" #I1 "], 16,    16           \n\t"
- 
- // O - output
- // I - input (macro doesn't change it)
- #define SRA_16(O0, O1, O2, O3,                                                 \
-                I0, I1, I2, I3)                                                 \
--  "sra              %["#O0"],  %["#I0"],  16                  \n\t"            \
--  "sra              %["#O1"],  %["#I1"],  16                  \n\t"            \
--  "sra              %["#O2"],  %["#I2"],  16                  \n\t"            \
--  "sra              %["#O3"],  %["#I3"],  16                  \n\t"
-+  "sra              %[" #O0 "],  %[" #I0 "],  16                  \n\t"        \
-+  "sra              %[" #O1 "],  %[" #I1 "],  16                  \n\t"        \
-+  "sra              %[" #O2 "],  %[" #I2 "],  16                  \n\t"        \
-+  "sra              %[" #O3 "],  %[" #I3 "],  16                  \n\t"
- 
- // temp0[31..16 | 15..0] = temp8[31..16 | 15..0] + temp12[31..16 | 15..0]
- // temp1[31..16 | 15..0] = temp8[31..16 | 15..0] - temp12[31..16 | 15..0]
-@@ -96,22 +96,22 @@
- // I - input (macro doesn't change it)
- #define SHIFT_R_SUM_X2(O0, O1, O2, O3, O4, O5, O6, O7,                         \
-                        I0, I1, I2, I3, I4, I5, I6, I7)                         \
--  "addq.ph          %["#O0"],   %["#I0"],   %["#I4"]          \n\t"            \
--  "subq.ph          %["#O1"],   %["#I0"],   %["#I4"]          \n\t"            \
--  "addq.ph          %["#O2"],   %["#I1"],   %["#I5"]          \n\t"            \
--  "subq.ph          %["#O3"],   %["#I1"],   %["#I5"]          \n\t"            \
--  "addq.ph          %["#O4"],   %["#I2"],   %["#I6"]          \n\t"            \
--  "subq.ph          %["#O5"],   %["#I2"],   %["#I6"]          \n\t"            \
--  "addq.ph          %["#O6"],   %["#I3"],   %["#I7"]          \n\t"            \
--  "subq.ph          %["#O7"],   %["#I3"],   %["#I7"]          \n\t"            \
--  "shra.ph          %["#O0"],   %["#O0"],   3                 \n\t"            \
--  "shra.ph          %["#O1"],   %["#O1"],   3                 \n\t"            \
--  "shra.ph          %["#O2"],   %["#O2"],   3                 \n\t"            \
--  "shra.ph          %["#O3"],   %["#O3"],   3                 \n\t"            \
--  "shra.ph          %["#O4"],   %["#O4"],   3                 \n\t"            \
--  "shra.ph          %["#O5"],   %["#O5"],   3                 \n\t"            \
--  "shra.ph          %["#O6"],   %["#O6"],   3                 \n\t"            \
--  "shra.ph          %["#O7"],   %["#O7"],   3                 \n\t"
-+  "addq.ph          %[" #O0 "],   %[" #I0 "],   %[" #I4 "]    \n\t"            \
-+  "subq.ph          %[" #O1 "],   %[" #I0 "],   %[" #I4 "]    \n\t"            \
-+  "addq.ph          %[" #O2 "],   %[" #I1 "],   %[" #I5 "]    \n\t"            \
-+  "subq.ph          %[" #O3 "],   %[" #I1 "],   %[" #I5 "]    \n\t"            \
-+  "addq.ph          %[" #O4 "],   %[" #I2 "],   %[" #I6 "]    \n\t"            \
-+  "subq.ph          %[" #O5 "],   %[" #I2 "],   %[" #I6 "]    \n\t"            \
-+  "addq.ph          %[" #O6 "],   %[" #I3 "],   %[" #I7 "]    \n\t"            \
-+  "subq.ph          %[" #O7 "],   %[" #I3 "],   %[" #I7 "]    \n\t"            \
-+  "shra.ph          %[" #O0 "],   %[" #O0 "],   3             \n\t"            \
-+  "shra.ph          %[" #O1 "],   %[" #O1 "],   3             \n\t"            \
-+  "shra.ph          %[" #O2 "],   %[" #O2 "],   3             \n\t"            \
-+  "shra.ph          %[" #O3 "],   %[" #O3 "],   3             \n\t"            \
-+  "shra.ph          %[" #O4 "],   %[" #O4 "],   3             \n\t"            \
-+  "shra.ph          %[" #O5 "],   %[" #O5 "],   3             \n\t"            \
-+  "shra.ph          %[" #O6 "],   %[" #O6 "],   3             \n\t"            \
-+  "shra.ph          %[" #O7 "],   %[" #O7 "],   3             \n\t"
- 
- // precrq.ph.w temp0, temp8, temp2
- //   temp0 = temp8[31..16] | temp2[31..16]
-@@ -123,14 +123,14 @@
- #define PACK_2_HALVES_TO_WORD(O0, O1, O2, O3,                                  \
-                               IO0, IO1, IO2, IO3,                              \
-                               I0, I1, I2, I3)                                  \
--  "precrq.ph.w      %["#O0"],    %["#I0"],  %["#IO0"]         \n\t"            \
--  "precrq.ph.w      %["#O1"],    %["#I1"],  %["#IO1"]         \n\t"            \
--  "ins              %["#IO0"],   %["#I0"],  16,    16         \n\t"            \
--  "ins              %["#IO1"],   %["#I1"],  16,    16         \n\t"            \
--  "precrq.ph.w      %["#O2"],    %["#I2"],  %["#IO2"]         \n\t"            \
--  "precrq.ph.w      %["#O3"],    %["#I3"],  %["#IO3"]         \n\t"            \
--  "ins              %["#IO2"],   %["#I2"],  16,    16         \n\t"            \
--  "ins              %["#IO3"],   %["#I3"],  16,    16         \n\t"
-+  "precrq.ph.w      %[" #O0 "],    %[" #I0 "],  %[" #IO0 "]       \n\t"        \
-+  "precrq.ph.w      %[" #O1 "],    %[" #I1 "],  %[" #IO1 "]       \n\t"        \
-+  "ins              %[" #IO0 "],   %[" #I0 "],  16,    16         \n\t"        \
-+  "ins              %[" #IO1 "],   %[" #I1 "],  16,    16         \n\t"        \
-+  "precrq.ph.w      %[" #O2 "],    %[" #I2 "],  %[" #IO2 "]       \n\t"        \
-+  "precrq.ph.w      %[" #O3 "],    %[" #I3 "],  %[" #IO3 "]       \n\t"        \
-+  "ins              %[" #IO2 "],   %[" #I2 "],  16,    16         \n\t"        \
-+  "ins              %[" #IO3 "],   %[" #I3 "],  16,    16         \n\t"
- 
- // preceu.ph.qbr temp0, temp8
- //   temp0 = 0 | 0 | temp8[23..16] | temp8[7..0]
-@@ -140,14 +140,14 @@
- // I - input (macro doesn't change it)
- #define CONVERT_2_BYTES_TO_HALF(O0, O1, O2, O3, O4, O5, O6, O7,                \
-                                 I0, I1, I2, I3)                                \
--  "preceu.ph.qbr    %["#O0"],   %["#I0"]                      \n\t"            \
--  "preceu.ph.qbl    %["#O1"],   %["#I0"]                      \n\t"            \
--  "preceu.ph.qbr    %["#O2"],   %["#I1"]                      \n\t"            \
--  "preceu.ph.qbl    %["#O3"],   %["#I1"]                      \n\t"            \
--  "preceu.ph.qbr    %["#O4"],   %["#I2"]                      \n\t"            \
--  "preceu.ph.qbl    %["#O5"],   %["#I2"]                      \n\t"            \
--  "preceu.ph.qbr    %["#O6"],   %["#I3"]                      \n\t"            \
--  "preceu.ph.qbl    %["#O7"],   %["#I3"]                      \n\t"
-+  "preceu.ph.qbr    %[" #O0 "],   %[" #I0 "]                      \n\t"        \
-+  "preceu.ph.qbl    %[" #O1 "],   %[" #I0 "]                      \n\t"        \
-+  "preceu.ph.qbr    %[" #O2 "],   %[" #I1 "]                      \n\t"        \
-+  "preceu.ph.qbl    %[" #O3 "],   %[" #I1 "]                      \n\t"        \
-+  "preceu.ph.qbr    %[" #O4 "],   %[" #I2 "]                      \n\t"        \
-+  "preceu.ph.qbl    %[" #O5 "],   %[" #I2 "]                      \n\t"        \
-+  "preceu.ph.qbr    %[" #O6 "],   %[" #I3 "]                      \n\t"        \
-+  "preceu.ph.qbl    %[" #O7 "],   %[" #I3 "]                      \n\t"
- 
- // temp0[31..16 | 15..0] = temp0[31..16 | 15..0] + temp8[31..16 | 15..0]
- // temp0[31..16 | 15..0] = temp0[31..16 <<(s) 7 | 15..0 <<(s) 7]
-@@ -160,30 +160,30 @@
- #define STORE_SAT_SUM_X2(IO0, IO1, IO2, IO3, IO4, IO5, IO6, IO7,               \
-                          I0, I1, I2, I3, I4, I5, I6, I7,                       \
-                          I8, I9, I10, I11, I12, I13)                           \
--  "addq.ph          %["#IO0"],  %["#IO0"],  %["#I0"]          \n\t"            \
--  "addq.ph          %["#IO1"],  %["#IO1"],  %["#I1"]          \n\t"            \
--  "addq.ph          %["#IO2"],  %["#IO2"],  %["#I2"]          \n\t"            \
--  "addq.ph          %["#IO3"],  %["#IO3"],  %["#I3"]          \n\t"            \
--  "addq.ph          %["#IO4"],  %["#IO4"],  %["#I4"]          \n\t"            \
--  "addq.ph          %["#IO5"],  %["#IO5"],  %["#I5"]          \n\t"            \
--  "addq.ph          %["#IO6"],  %["#IO6"],  %["#I6"]          \n\t"            \
--  "addq.ph          %["#IO7"],  %["#IO7"],  %["#I7"]          \n\t"            \
--  "shll_s.ph        %["#IO0"],  %["#IO0"],  7                 \n\t"            \
--  "shll_s.ph        %["#IO1"],  %["#IO1"],  7                 \n\t"            \
--  "shll_s.ph        %["#IO2"],  %["#IO2"],  7                 \n\t"            \
--  "shll_s.ph        %["#IO3"],  %["#IO3"],  7                 \n\t"            \
--  "shll_s.ph        %["#IO4"],  %["#IO4"],  7                 \n\t"            \
--  "shll_s.ph        %["#IO5"],  %["#IO5"],  7                 \n\t"            \
--  "shll_s.ph        %["#IO6"],  %["#IO6"],  7                 \n\t"            \
--  "shll_s.ph        %["#IO7"],  %["#IO7"],  7                 \n\t"            \
--  "precrqu_s.qb.ph  %["#IO0"],  %["#IO1"],  %["#IO0"]         \n\t"            \
--  "precrqu_s.qb.ph  %["#IO2"],  %["#IO3"],  %["#IO2"]         \n\t"            \
--  "precrqu_s.qb.ph  %["#IO4"],  %["#IO5"],  %["#IO4"]         \n\t"            \
--  "precrqu_s.qb.ph  %["#IO6"],  %["#IO7"],  %["#IO6"]         \n\t"            \
--  "usw              %["#IO0"],  "XSTR(I13)"*"#I9"(%["#I8"])   \n\t"            \
--  "usw              %["#IO2"],  "XSTR(I13)"*"#I10"(%["#I8"])  \n\t"            \
--  "usw              %["#IO4"],  "XSTR(I13)"*"#I11"(%["#I8"])  \n\t"            \
--  "usw              %["#IO6"],  "XSTR(I13)"*"#I12"(%["#I8"])  \n\t"
-+  "addq.ph          %[" #IO0 "],  %[" #IO0 "],  %[" #I0 "]          \n\t"      \
-+  "addq.ph          %[" #IO1 "],  %[" #IO1 "],  %[" #I1 "]          \n\t"      \
-+  "addq.ph          %[" #IO2 "],  %[" #IO2 "],  %[" #I2 "]          \n\t"      \
-+  "addq.ph          %[" #IO3 "],  %[" #IO3 "],  %[" #I3 "]          \n\t"      \
-+  "addq.ph          %[" #IO4 "],  %[" #IO4 "],  %[" #I4 "]          \n\t"      \
-+  "addq.ph          %[" #IO5 "],  %[" #IO5 "],  %[" #I5 "]          \n\t"      \
-+  "addq.ph          %[" #IO6 "],  %[" #IO6 "],  %[" #I6 "]          \n\t"      \
-+  "addq.ph          %[" #IO7 "],  %[" #IO7 "],  %[" #I7 "]          \n\t"      \
-+  "shll_s.ph        %[" #IO0 "],  %[" #IO0 "],  7                   \n\t"      \
-+  "shll_s.ph        %[" #IO1 "],  %[" #IO1 "],  7                   \n\t"      \
-+  "shll_s.ph        %[" #IO2 "],  %[" #IO2 "],  7                   \n\t"      \
-+  "shll_s.ph        %[" #IO3 "],  %[" #IO3 "],  7                   \n\t"      \
-+  "shll_s.ph        %[" #IO4 "],  %[" #IO4 "],  7                   \n\t"      \
-+  "shll_s.ph        %[" #IO5 "],  %[" #IO5 "],  7                   \n\t"      \
-+  "shll_s.ph        %[" #IO6 "],  %[" #IO6 "],  7                   \n\t"      \
-+  "shll_s.ph        %[" #IO7 "],  %[" #IO7 "],  7                   \n\t"      \
-+  "precrqu_s.qb.ph  %[" #IO0 "],  %[" #IO1 "],  %[" #IO0 "]         \n\t"      \
-+  "precrqu_s.qb.ph  %[" #IO2 "],  %[" #IO3 "],  %[" #IO2 "]         \n\t"      \
-+  "precrqu_s.qb.ph  %[" #IO4 "],  %[" #IO5 "],  %[" #IO4 "]         \n\t"      \
-+  "precrqu_s.qb.ph  %[" #IO6 "],  %[" #IO7 "],  %[" #IO6 "]         \n\t"      \
-+  "usw              %[" #IO0 "],  "XSTR(I13)"*" #I9 "(%[" #I8 "])   \n\t"      \
-+  "usw              %[" #IO2 "],  "XSTR(I13)"*" #I10 "(%[" #I8 "])  \n\t"      \
-+  "usw              %[" #IO4 "],  "XSTR(I13)"*" #I11 "(%[" #I8 "])  \n\t"      \
-+  "usw              %[" #IO6 "],  "XSTR(I13)"*" #I12 "(%[" #I8 "])  \n\t"
- 
- #define OUTPUT_EARLY_CLOBBER_REGS_10()                                         \
-   : [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), [temp3]"=&r"(temp3),             \
-diff --git a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
-index 9c9665f..46f207b 100644
---- a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c
-@@ -34,15 +34,15 @@
-     G = G - t2 + kGCst;                                                        \
-     B = B + kBCst;                                                             \
-     __asm__ volatile (                                                         \
--      "shll_s.w         %["#R"],      %["#R"],        9              \n\t"     \
--      "shll_s.w         %["#G"],      %["#G"],        9              \n\t"     \
--      "shll_s.w         %["#B"],      %["#B"],        9              \n\t"     \
--      "precrqu_s.qb.ph  %["#R"],      %["#R"],        $zero          \n\t"     \
--      "precrqu_s.qb.ph  %["#G"],      %["#G"],        $zero          \n\t"     \
--      "precrqu_s.qb.ph  %["#B"],      %["#B"],        $zero          \n\t"     \
--      "srl              %["#R"],      %["#R"],        24             \n\t"     \
--      "srl              %["#G"],      %["#G"],        24             \n\t"     \
--      "srl              %["#B"],      %["#B"],        24             \n\t"     \
-+      "shll_s.w         %[" #R "],      %[" #R "],        9          \n\t"     \
-+      "shll_s.w         %[" #G "],      %[" #G "],        9          \n\t"     \
-+      "shll_s.w         %[" #B "],      %[" #B "],        9          \n\t"     \
-+      "precrqu_s.qb.ph  %[" #R "],      %[" #R "],        $zero      \n\t"     \
-+      "precrqu_s.qb.ph  %[" #G "],      %[" #G "],        $zero      \n\t"     \
-+      "precrqu_s.qb.ph  %[" #B "],      %[" #B "],        $zero      \n\t"     \
-+      "srl              %[" #R "],      %[" #R "],        24         \n\t"     \
-+      "srl              %[" #G "],      %[" #G "],        24         \n\t"     \
-+      "srl              %[" #B "],      %[" #B "],        24         \n\t"     \
-       : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B)                                     \
-       :                                                                        \
-     );                                                                         \
-diff --git a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
-index 43f02cc..45a2200 100644
---- a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
-+++ b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c
-@@ -39,12 +39,12 @@
-   "addu             %[temp5],   %[temp0],       %[temp1]        \n\t"          \
-   "subu             %[temp6],   %[temp0],       %[temp2]        \n\t"          \
-   "addu             %[temp7],   %[temp0],       %[temp4]        \n\t"          \
--".if "#K"                                                       \n\t"          \
-+".if " #K "                                                     \n\t"          \
-   "lbu              %[temp0],   1(%[y])                         \n\t"          \
- ".endif                                                         \n\t"          \
-   "shll_s.w         %[temp5],   %[temp5],       9               \n\t"          \
-   "shll_s.w         %[temp6],   %[temp6],       9               \n\t"          \
--".if "#K"                                                       \n\t"          \
-+".if " #K "                                                     \n\t"          \
-   "mul              %[temp0],   %[t_con_5],     %[temp0]        \n\t"          \
- ".endif                                                         \n\t"          \
-   "shll_s.w         %[temp7],   %[temp7],       9               \n\t"          \
-@@ -54,9 +54,9 @@
-   "srl              %[temp5],   %[temp5],       24              \n\t"          \
-   "srl              %[temp6],   %[temp6],       24              \n\t"          \
-   "srl              %[temp7],   %[temp7],       24              \n\t"          \
--  "sb               %[temp5],   "#R"(%[dst])                    \n\t"          \
--  "sb               %[temp6],   "#G"(%[dst])                    \n\t"          \
--  "sb               %[temp7],   "#B"(%[dst])                    \n\t"          \
-+  "sb               %[temp5],   " #R "(%[dst])                  \n\t"          \
-+  "sb               %[temp6],   " #G "(%[dst])                  \n\t"          \
-+  "sb               %[temp7],   " #B "(%[dst])                  \n\t"          \
- 
- #define ASM_CLOBBER_LIST()                                                     \
-   : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2),             \
diff --git a/gnu/packages/patches/freeimage-unbundle.patch b/gnu/packages/patches/freeimage-unbundle.patch
index ca907d3276..4d9b8e25c9 100644
--- a/gnu/packages/patches/freeimage-unbundle.patch
+++ b/gnu/packages/patches/freeimage-unbundle.patch
@@ -1,4 +1,4 @@
-https://src.fedoraproject.org/cgit/rpms/freeimage.git/tree/FreeImage-3.17.0_unbundle.patch
+https://src.fedoraproject.org/cgit/rpms/freeimage.git/tree/FreeImage_unbundle.patch
 
 diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh
 --- FreeImage/genfipsrclist.sh	2015-02-20 10:52:16.000000000 +0100
@@ -25,10 +25,10 @@ diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
  #!/bin/sh
  
 -DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
-+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib"
++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit"
  
  echo "VER_MAJOR = 3" > Makefile.srcs
- echo "VER_MINOR = 17.0" >> Makefile.srcs
+ echo "VER_MINOR = 18.0" >> Makefile.srcs
 diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip
 --- FreeImage/Makefile.fip	2015-03-08 18:03:56.000000000 +0100
 +++ FreeImage-new/Makefile.fip	2015-09-05 02:14:09.212684028 +0200
@@ -90,8 +90,8 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
 -# LibJXR
 -CXXFLAGS += -D__ANSI__
 -CXXFLAGS += $(INCLUDE)
-+override CFLAGS += $(INCLUDE) -D__ANSI__ $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
-+override LDFLAGS += -ljpeg $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
++override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
++override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
  
  ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
 -	CFLAGS += -fPIC
@@ -215,6 +215,18 @@ diff -rupN FreeImage/Source/FreeImage/PluginJPEG.cpp FreeImage-new/Source/FreeIm
  }
  
  #include "FreeImage.h"
+diff -rupN FreeImage/Source/FreeImage/PluginJXR.cpp FreeImage-new/Source/FreeImage/PluginJXR.cpp
+--- FreeImage/Source/FreeImage/PluginJXR.cpp	2015-03-03 23:07:08.000000000 +0100
++++ FreeImage-new/Source/FreeImage/PluginJXR.cpp	2018-07-31 23:37:58.561953201 +0200
+@@ -23,7 +23,7 @@
+ #include "Utilities.h"
+ #include "../Metadata/FreeImageTag.h"
+ 
+-#include "../LibJXR/jxrgluelib/JXRGlue.h"
++#include 
+ 
+ // ==========================================================
+ // Plugin Interface
 diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp
 --- FreeImage/Source/FreeImage/PluginPNG.cpp	2015-03-10 20:16:12.000000000 +0100
 +++ FreeImage-new/Source/FreeImage/PluginPNG.cpp	2015-09-05 02:13:52.044353363 +0200
@@ -241,38 +253,39 @@ diff -rupN FreeImage/Source/FreeImage/PluginRAW.cpp FreeImage-new/Source/FreeIma
  
  #include "FreeImage.h"
  #include "Utilities.h"
+
 diff -rupN FreeImage/Source/FreeImage/PluginTIFF.cpp FreeImage-new/Source/FreeImage/PluginTIFF.cpp
 --- FreeImage/Source/FreeImage/PluginTIFF.cpp	2015-03-02 02:07:08.000000000 +0100
 +++ FreeImage-new/Source/FreeImage/PluginTIFF.cpp	2015-09-05 02:13:52.044353363 +0200
 @@ -37,9 +37,9 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibTIFF4/tiffiop.h"
-+#include 
- #include "../Metadata/FreeImageTag.h"
--#include "../OpenEXR/Half/half.h"
-+#include 
- 
- #include "FreeImageIO.h"
- #include "PSDParser.h"
-@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char
- 	return tif;
- }
- 
--/**
--Open a TIFF file for reading or writing
--@param name
--@param mode
--*/
--TIFF*
--TIFFOpen(const char* name, const char* mode) {
--	return 0;
--}
--
- // ----------------------------------------------------------
- //   TIFF library FreeImage-specific routines.
- // ----------------------------------------------------------
+ 
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibTIFF4/tiffiop.h"
++#include 
+ #include "../Metadata/FreeImageTag.h"
+-#include "../OpenEXR/Half/half.h"
++#include 
+ 
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char *name, const char *mode) {
+ 	return tif;
+ }
+ 
+-/**
+-Open a TIFF file for reading or writing
+-@param name
+-@param mode
+-*/
+-TIFF*
+-TIFFOpen(const char* name, const char* mode) {
+-	return 0;
+-}
+-
+ // ----------------------------------------------------------
+ //   TIFF library FreeImage-specific routines.
+ // ----------------------------------------------------------
 diff -rupN FreeImage/Source/FreeImage/PluginWebP.cpp FreeImage-new/Source/FreeImage/PluginWebP.cpp
 --- FreeImage/Source/FreeImage/PluginWebP.cpp	2015-03-02 02:07:08.000000000 +0100
 +++ FreeImage-new/Source/FreeImage/PluginWebP.cpp	2015-09-05 02:13:52.044353363 +0200
@@ -282,15 +295,81 @@ diff -rupN FreeImage/Source/FreeImage/PluginWebP.cpp FreeImage-new/Source/FreeIm
  
 -#include "../LibWebP/src/webp/decode.h"
 -#include "../LibWebP/src/webp/encode.h"
--#include "../LibWebP/src/enc/vp8enci.h"
 -#include "../LibWebP/src/webp/mux.h"
 +#include 
 +#include 
-+// #include "../LibWebP/src/enc/vp8enci.h"
 +#include 
  
  // ==========================================================
  // Plugin Interface
+ diff -rupN FreeImage/Source/FreeImage/PSDParser.cpp FreeImage-new/Source/FreeImage/PSDParser.cpp
+--- FreeImage/Source/FreeImage/PSDParser.cpp	2016-02-11 03:18:02.000000000 +0100
++++ FreeImage-new/Source/FreeImage/PSDParser.cpp	2018-08-01 00:17:18.323822675 +0200
+@@ -133,8 +133,8 @@ public:
+ template <>
+ class PSDGetValue<8> {
+ public:
+-	static inline UINT64 get(const BYTE * iprBuffer) {
+-		UINT64 v = ((const UINT64*)iprBuffer)[0];
++	static inline uint64_t get(const BYTE * iprBuffer) {
++		uint64_t v = ((const uint64_t*)iprBuffer)[0];
+ #ifndef FREEIMAGE_BIGENDIAN
+ 		SwapInt64(&v);
+ #endif
+@@ -147,7 +147,7 @@ public:
+ 
+ // --------------------------------------------------------------------------
+ 
+-static UINT64
++static uint64_t
+ psdReadSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header) {
+ 	if(header._Version == 1) {
+ 		BYTE Length[4];
+@@ -199,11 +199,11 @@ public:
+ template <>
+ class PSDSetValue<8> {
+ public:
+-	static inline void set(const BYTE * iprBuffer, UINT64 v) {
++	static inline void set(const BYTE * iprBuffer, uint64_t v) {
+ #ifndef FREEIMAGE_BIGENDIAN
+ 		SwapInt64(&v);
+ #endif
+-		((UINT64*)iprBuffer)[0] = v;
++		((uint64_t*)iprBuffer)[0] = v;
+ 	}
+ };
+ 
+@@ -213,7 +213,7 @@ public:
+ // --------------------------------------------------------------------------
+ 
+ static inline bool
+-psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header, UINT64 v) {
++psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header, uint64_t v) {
+ 	if(header._Version == 1) {
+ 		BYTE Length[4];
+ 		psdSetLongValue(Length, sizeof(Length), (DWORD)v);
+@@ -1063,10 +1063,10 @@ unsigned psdParser::GetChannelOffset(FIB
+ bool psdParser::ReadLayerAndMaskInfoSection(FreeImageIO *io, fi_handle handle)	{
+ 	bool bSuccess = true;
+ 
+-	UINT64 nTotalBytes = psdReadSize(io, handle, _headerInfo);
++	uint64_t nTotalBytes = psdReadSize(io, handle, _headerInfo);
+ 
+ 	// Hack to handle large PSB files without using fseeko().
+-	if (sizeof(long) < sizeof(UINT64)) {
++	if (sizeof(long) < sizeof(uint64_t)) {
+ 		const long offset = 0x10000000;
+ 		while (nTotalBytes > offset) {
+ 			if (io->seek_proc(handle, offset, SEEK_CUR) != 0) {
+@@ -1672,7 +1672,7 @@ bool psdParser::WriteLayerAndMaskInfoSec
+ 	// Short section with no layers.
+ 	BYTE IntValue[4];
+ 
+-	UINT64 size;
++	uint64_t size;
+ 	if(_headerInfo._Version == 1) {
+ 		size = 8;
+ 	} else {
 diff -rupN FreeImage/Source/FreeImage/ZLibInterface.cpp FreeImage-new/Source/FreeImage/ZLibInterface.cpp
 --- FreeImage/Source/FreeImage/ZLibInterface.cpp	2015-03-02 02:07:10.000000000 +0100
 +++ FreeImage-new/Source/FreeImage/ZLibInterface.cpp	2015-09-05 02:13:52.044353363 +0200
@@ -536,3 +615,21 @@ diff -rupN FreeImage/Source/Metadata/XTIFF.cpp FreeImage-new/Source/Metadata/XTI
  
  		if(skip_write_field(tif, tag_id)) {
  			// skip tags that are already handled by the LibTIFF writing process
+diff -rupN FreeImage/Source/Utilities.h FreeImage-new/Source/Utilities.h
+--- FreeImage/Source/Utilities.h	2016-04-11 15:15:32.000000000 +0200
++++ FreeImage-new/Source/Utilities.h	2018-08-01 00:16:29.826825358 +0200
+@@ -446,12 +446,12 @@ SwapLong(DWORD *lp) {
+ }
+  
+ inline void
+-SwapInt64(UINT64 *arg) {
++SwapInt64(uint64_t *arg) {
+ #if defined(_MSC_VER) && _MSC_VER >= 1310
+ 	*arg = _byteswap_uint64(*arg);
+ #else
+ 	union Swap {
+-		UINT64 sv;
++		uint64_t sv;
+ 		DWORD ul[2];
+ 	} tmp, result;
+ 	tmp.sv = *arg;
-- 
cgit v1.2.3


From 49dc1669a8bb2ba923cb064173025858931cc9c9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 17:14:21 +0200
Subject: gnu: you-get: Update to 0.4.1355.

* gnu/packages/video.scm (you-get): Update to 0.4.1355.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d5a51a00b0..5180f275ad 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1631,7 +1631,7 @@ other site that youtube-dl supports.")
 (define-public you-get
   (package
     (name "you-get")
-    (version "0.4.1328")
+    (version "0.4.1355")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1640,7 +1640,7 @@ other site that youtube-dl supports.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1r9qffwvxmp74byva12h2jsn3n33vyim052sx9lykv5dygibbp65"))))
+                "0xq7z04hvw3b3npiahlpzhbxsjvam9n9dynplyrkn84dx6k9ajbj"))))
     (build-system python-build-system)
     (inputs
      `(("ffmpeg" ,ffmpeg)))             ; for multi-part and >=1080p videos
-- 
cgit v1.2.3


From aa1c7b4914fc7aeb31b2953388d3041dbf0b0ac6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 01:13:08 +0200
Subject: gnu: spirv-tools: Update to 2019.2.

* gnu/packages/vulkan.scm (spirv-tools): Update to 2019.2.
---
 gnu/packages/vulkan.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 511831b9bd..f12062ac2f 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -82,7 +82,7 @@ and for the GLSL.std.450 extended instruction set.
 (define-public spirv-tools
   (package
     (name "spirv-tools")
-    (version "2019.1")
+    (version "2019.2")
     (source
      (origin
       (method git-fetch)
@@ -90,8 +90,7 @@ and for the GLSL.std.450 extended instruction set.
             (url "https://github.com/KhronosGroup/SPIRV-Tools")
             (commit (string-append "v" version))))
       (sha256
-       (base32
-        "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r"))
+       (base32 "0zwz6qg8g8165h7cw52agryjrdb29gbmsbziw3pwiddfkyma8vvg"))
       (file-name (string-append name "-" version "-checkout"))))
     (build-system cmake-build-system)
     (arguments
-- 
cgit v1.2.3


From d7a7d255c4566652a79210ca1d6b9b1d8fe9f9b7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 01:21:38 +0200
Subject: gnu: spirv-tools: Use GIT-FILE-NAME.

* gnu/packages/vulkan.scm (spirv-tools)[source]: Use GIT-FILE-NAME.
---
 gnu/packages/vulkan.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index f12062ac2f..9260a2cf9f 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -91,7 +91,7 @@ and for the GLSL.std.450 extended instruction set.
             (commit (string-append "v" version))))
       (sha256
        (base32 "0zwz6qg8g8165h7cw52agryjrdb29gbmsbziw3pwiddfkyma8vvg"))
-      (file-name (string-append name "-" version "-checkout"))))
+      (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ; FIXME: Tests fail.
-- 
cgit v1.2.3


From e0aa4e949e77fd945a5a2fdd4be257c8782891d8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 04:06:47 +0200
Subject: gnu: mlt: Update to 6.16.0.

* gnu/packages/video.scm (mlt): Update to 6.16.0.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 5180f275ad..fd1d98dc01 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2203,7 +2203,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
 (define-public mlt
   (package
     (name "mlt")
-    (version "6.12.0")
+    (version "6.16.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2212,7 +2212,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"))))
+                "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
cgit v1.2.3


From dc29bea3404965911acab83d7f20968bdec788bb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 16:26:20 +0200
Subject: gnu: rofi: Update to 1.5.4.

* gnu/packages/xdisorg.scm (rofi): Update to 1.5.4.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 066804ed9e..1700e7b5c2 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1178,7 +1178,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.")
 (define-public rofi
   (package
     (name "rofi")
-    (version "1.5.3")
+    (version "1.5.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/DaveDavenport/rofi/"
@@ -1186,7 +1186,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.")
                                   version "/rofi-" version ".tar.xz"))
               (sha256
                (base32
-                "0y78ya2va2lg3ww17n11y9awn8lhcp1px2d8gxaimxfqlxczs8la"))))
+                "1nslmyqyzhfr4hxd4llqkkkb8ap8apkdna32rllvar7r576059ci"))))
     (build-system gnu-build-system)
     (inputs
      `(("pango" ,pango)
-- 
cgit v1.2.3


From 005e539edf009c5431f8d11dc34ad23b8424bda2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 16:41:37 +0200
Subject: gnu: iproute2: Update to 5.3.0.

* gnu/packages/linux.scm (iproute): Update to 5.3.0.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f8ad96e89d..b2b7a480fc 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1706,7 +1706,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
 (define-public iproute
   (package
     (name "iproute2")
-    (version "5.2.0")
+    (version "5.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1714,7 +1714,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
                     version ".tar.xz"))
               (sha256
                (base32
-                "1a2dywa2kam24951byv9pl32mb9z6klh7d4vp8fwfgrm4vn5vfd5"))))
+                "0gvv269wjn4279hxr5zzwsk2c5qgswr47za3hm1x4frsk52iw76b"))))
     (build-system gnu-build-system)
     (arguments
      `( ;; There is a test suite, but it wants network namespaces and sudo.
-- 
cgit v1.2.3


From 3b6362969cb92e6b29343462ecc584a223376d25 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 16:53:05 +0200
Subject: gnu: iproute2: Add libmnl input.

* gnu/packages/linux.scm (iproute)[inputs]: Add libmnl.
---
 gnu/packages/linux.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b2b7a480fc..027c920357 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1739,7 +1739,8 @@ that the Ethernet protocol is much simpler than the IP protocol.")
                       #t)))))
     (inputs
      `(("db4" ,bdb)
-       ("iptables" ,iptables)))
+       ("iptables" ,iptables)
+       ("libmnl" ,libmnl)))
     (native-inputs
      `(("bison" ,bison)
        ("flex" ,flex)
-- 
cgit v1.2.3


From b7f5fa8285d5572a1e00f6b5933486dbb17bb41a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 16:50:04 +0200
Subject: gnu: celluloid: Update to 0.17 from gnome-mpv.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/video.scm (celluloid): ‘New’ public variable.
(gnome-mpv): Redefine as DEPRECATED-PACKAGE.
---
 gnu/packages/video.scm | 53 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index fd1d98dc01..ce848d1847 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -204,6 +204,32 @@ In fact, there is no graphical output possible.  AA-lib replaces those
 old-fashioned output methods with powerful ascii-art renderer.")
     (license license:lgpl2.0+)))
 
+(define-public celluloid
+  (package
+    (name "celluloid")
+    (version "0.17")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/celluloid-player/celluloid/releases"
+                           "/download/v" version "/celluloid-" version ".tar.xz"))
+       (sha256
+        (base32 "0a3bhvs38gxjplygb0q9cx5djl5y0bmnxgaq0sd65j610a60f5h0"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("libepoxy" ,libepoxy)
+       ("mpv" ,mpv)))
+    (home-page "https://github.com/celluloid-player/celluloid")
+    (synopsis "GTK+ frontend for the mpv media player")
+    (description "Celluloid is a simple GTK+ frontend for the mpv media player.
+It interacts with mpv via the client API exported by libmpv, allowing access to
+mpv's powerful playback capabilities.")
+    (license license:gpl3+)))
+
 (define-public liba52
   (package
     (name "liba52")
@@ -1404,32 +1430,7 @@ projects while introducing many more.")
     (license license:gpl2+)))
 
 (define-public gnome-mpv
-  (package
-    (name "gnome-mpv")
-    (version "0.16")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/gnome-mpv/gnome-mpv/releases"
-                           "/download/v" version "/gnome-mpv-" version
-                           ".tar.xz"))
-       (sha256
-        (base32
-         "0jzdzvhcqp5jp1inwk2466zf7r8iimk3x69066gl8mzaay98mk92"))))
-    (native-inputs
-     `(("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("gtk+" ,gtk+)
-       ("libepoxy" ,libepoxy)
-       ("mpv" ,mpv)))
-    (build-system glib-or-gtk-build-system)
-    (home-page "https://github.com/gnome-mpv/gnome-mpv")
-    (synopsis "GTK+ frontend for the mpv media player")
-    (description "GNOME MPV is a simple GTK+ frontend for the mpv media player.
-GNOME MPV interacts with mpv via the client API exported by libmpv, allowing
-access to mpv's powerful playback capabilities.")
-    (license license:gpl3+)))
+  (deprecated-package "gnome-mpv" celluloid))
 
 (define-public libvpx
   (package
-- 
cgit v1.2.3


From 8aba8c7b74961a199c4fc99c3181151c074225c4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 16:55:26 +0200
Subject: gnu: youtube-dl: Update to 2019.09.12.1.

* gnu/packages/video.scm (youtube-dl): Update to 2019.09.12.1.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ce848d1847..94254d0c78 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1493,7 +1493,7 @@ projects while introducing many more.")
 (define-public youtube-dl
   (package
     (name "youtube-dl")
-    (version "2019.09.12")
+    (version "2019.09.12.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/ytdl-org/youtube-dl/"
@@ -1501,7 +1501,7 @@ projects while introducing many more.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0wmc0rl4l08hnz3agh69ld1pcmjs7czg0d2k7mnnlxhwlwi38w56"))))
+                "0h7v81kcxcpy82wq9b1aiz2zg6hg7rnlcfmzd13j6k8yhr7ah9yf"))))
     (build-system python-build-system)
     (arguments
      ;; The problem here is that the directory for the man page and completion
-- 
cgit v1.2.3


From b106dd84dbf758efa8fb0212bdd8dc5999ccd8d9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 17:39:24 +0200
Subject: gnu: xf86-input-wacom: Don't use NAME in source URI.

* gnu/packages/xdisorg.scm (xf86-input-wacom)[source]: Hard-code NAME.
---
 gnu/packages/xdisorg.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 1700e7b5c2..0b40ca6909 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -999,7 +999,8 @@ Wacom tablet applet.")
        (method url-fetch)
        (uri (string-append
              "https://github.com/linuxwacom/xf86-input-wacom/releases/download/"
-             name "-" version "/" name "-" version ".tar.bz2"))
+             "xf86-input-wacom-" version "/"
+             "xf86-input-wacom-" version ".tar.bz2"))
        (sha256
         (base32
          "029y8varbricba2dzhzhy0ndd7lbfif411ca8c3wxzni9qmbj1ij"))))
-- 
cgit v1.2.3


From 0ed0e3bfb763653fbc8901e26905022fd287746c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 04:43:00 +0200
Subject: gnu: fmit: Update to 1.2.13.

* gnu/packages/music.scm (fmit): Update to 1.2.13.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4d1e11f260..2b54842c95 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4534,7 +4534,7 @@ controller.")
 (define-public fmit
   (package
     (name "fmit")
-    (version "1.2.6")
+    (version "1.2.13")
     (source (origin
 	      (method git-fetch)
 	      (uri (git-reference
@@ -4543,7 +4543,7 @@ controller.")
               (file-name (git-file-name name version))
 	      (sha256
                (base32
-                "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
+                "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From 65d20127ef15316fca52115f6ae798ffc53cc863 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 04:52:25 +0200
Subject: gnu: emacs-xelb: Update to 0.18.

* gnu/packages/emacs-xyz.scm (emacs-xelb): Update to 0.18.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 84cfc75ebc..c641e9d716 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8655,14 +8655,14 @@ which code derived from Kelvin H's org-page.")
 (define-public emacs-xelb
   (package
     (name "emacs-xelb")
-    (version "0.17")
+    (version "0.18")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://elpa.gnu.org/packages/xelb-"
                                   version ".tar"))
               (sha256
                (base32
-                "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml"))))
+                "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7"))))
     (build-system emacs-build-system)
     ;; The following functions and variables needed by emacs-xelb are
     ;; not included in emacs-minimal:
-- 
cgit v1.2.3


From d94ec407585dc4d34ec80a28567f98205c4f24c2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 05:01:12 +0200
Subject: gnu: beets: Use HTTPS home page.

* gnu/packages/music.scm (beets)[home-page]: Use HTTPS.
---
 gnu/packages/music.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2b54842c95..b28b375067 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2858,7 +2858,7 @@ Songs can be searched by artist, name or even by a part of the song text.")
        ("python-mutagen" ,python-mutagen)
        ("python-pyyaml" ,python-pyyaml)
        ("python-unidecode" ,python-unidecode)))
-    (home-page "http://beets.io")
+    (home-page "https://beets.io")
     (synopsis "Music organizer")
     (description "The purpose of beets is to get your music collection right
 once and for all.  It catalogs your collection, automatically improving its
-- 
cgit v1.2.3


From 3f3d712cc525d65c184cea4c2048a62a4ec87c73 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 05:01:26 +0200
Subject: gnu: beets: Update to 1.4.9.

* gnu/packages/music.scm (beets): Update to 1.4.9.
[source]: Remove patch.
[arguments]: Remove more Python 3.7 compatibility fixes.
* gnu/packages/patches/beets-python-3.7-fix.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                    |  1 -
 gnu/packages/music.scm                          | 11 +----
 gnu/packages/patches/beets-python-3.7-fix.patch | 57 -------------------------
 3 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 gnu/packages/patches/beets-python-3.7-fix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 919e836b8c..49dc4e7b97 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -711,7 +711,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/bash-completion-directories.patch	\
   %D%/packages/patches/bastet-change-source-of-unordered_set.patch	\
   %D%/packages/patches/bazaar-CVE-2017-14176.patch		\
-  %D%/packages/patches/beets-python-3.7-fix.patch		\
   %D%/packages/patches/beignet-correct-file-names.patch		\
   %D%/packages/patches/benchmark-unbundle-googletest.patch	\
   %D%/packages/patches/biber-fix-encoding-write.patch		\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b28b375067..508f2ea3bf 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2813,14 +2813,13 @@ Songs can be searched by artist, name or even by a part of the song text.")
 (define-public beets
   (package
     (name "beets")
-    (version "1.4.7")
+    (version "1.4.9")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "beets" version))
-              (patches (search-patches "beets-python-3.7-fix.patch"))
               (sha256
                (base32
-                "0w3gz69s9gf5ih69d4sddgh7ndj7658m621bp742zldvjakdncrs"))))
+                "0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -2829,12 +2828,6 @@ Songs can be searched by artist, name or even by a part of the song text.")
            (lambda _
              (setenv "HOME" (string-append (getcwd) "/tmp"))
              #t))
-         (add-after 'unpack 'make-python3.7-compatible
-           (lambda _
-             ;; See .
-             (substitute* "beets/autotag/hooks.py"
-              (("re\\._pattern_type") "re.Pattern"))
-             #t))
          (replace 'check
            (lambda _
              (invoke "nosetests" "-v"))))))
diff --git a/gnu/packages/patches/beets-python-3.7-fix.patch b/gnu/packages/patches/beets-python-3.7-fix.patch
deleted file mode 100644
index 43707cd9d0..0000000000
--- a/gnu/packages/patches/beets-python-3.7-fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Fix compatibility issue with Python 3.7:
-
-https://github.com/beetbox/beets/issues/2978
-
-Patch copied from upstream source repository:
-
-https://github.com/beetbox/beets/commit/15d44f02a391764da1ce1f239caef819f08beed8
-
-From 15d44f02a391764da1ce1f239caef819f08beed8 Mon Sep 17 00:00:00 2001
-From: Adrian Sampson 
-Date: Sun, 22 Jul 2018 12:34:19 -0400
-Subject: [PATCH] Fix Python 3.7 compatibility (#2978)
-
----
- beets/autotag/hooks.py | 8 +++++++-
- docs/changelog.rst     | 2 ++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
-index 3615a9333..1c62a54c5 100644
---- a/beets/autotag/hooks.py
-+++ b/beets/autotag/hooks.py
-@@ -31,6 +31,12 @@
- 
- log = logging.getLogger('beets')
- 
-+# The name of the type for patterns in re changed in Python 3.7.
-+try:
-+    Pattern = re._pattern_type
-+except AttributeError:
-+    Pattern = re.Pattern
-+
- 
- # Classes used to represent candidate options.
- 
-@@ -433,7 +439,7 @@ def _eq(self, value1, value2):
-         be a compiled regular expression, in which case it will be
-         matched against `value2`.
-         """
--        if isinstance(value1, re._pattern_type):
-+        if isinstance(value1, Pattern):
-             return bool(value1.match(value2))
-         return value1 == value2
- 
-#diff --git a/docs/changelog.rst b/docs/changelog.rst
-#index be6de2904..d487f31f5 100644
-#--- a/docs/changelog.rst
-#+++ b/docs/changelog.rst
-#@@ -19,6 +19,8 @@ New features:
-# 
-# Fixes:
-# 
-#+* Fix compatibility Python 3.7 and its change to a name in the ``re`` module.
-#+  :bug:`2978`
-# * R128 normalization tags are now properly deleted from files when the values
-#   are missing.
-#   Thanks to :user:`autrimpo`.
-- 
cgit v1.2.3


From 3eb278aa9d8abb50666ae1241b3185f422aa15f8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 05:15:01 +0200
Subject: gnu: f3: Update to 7.2.

* gnu/packages/disk.scm (f3): Update to 7.2.
---
 gnu/packages/disk.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index cf53142533..4de0745190 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -402,7 +402,7 @@ systems.  Output format is completely customizable.")
 (define-public f3
   (package
     (name "f3")
-    (version "7.1")
+    (version "7.2")
     (source
      (origin
       (method git-fetch)
@@ -411,8 +411,7 @@ systems.  Output format is completely customizable.")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
-       (base32
-        "0zglsmz683jg7f9wc6vmgljyg9w87pbnjw5x4w6x02w8233zvjqf"))))
+       (base32 "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f                      ; no check target
-- 
cgit v1.2.3


From 5dfdab05baf67eaaab9dc980a560de194b808f5e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 05:23:29 +0200
Subject: gnu: encodings: Update to 1.0.5.

* gnu/packages/xorg.scm (encodings): Update to 1.0.5.
---
 gnu/packages/xorg.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 48c1e3cebe..af8dfda922 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -423,7 +423,7 @@ Resources file.")
 (define-public encodings
   (package
     (name "encodings")
-    (version "1.0.4")
+    (version "1.0.5")
     (source
       (origin
         (method url-fetch)
@@ -432,8 +432,7 @@ Resources file.")
                version
                ".tar.bz2"))
         (sha256
-          (base32
-            "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"))))
+          (base32 "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"))))
     (build-system gnu-build-system)
     (inputs
       `(("mkfontscale" ,mkfontscale)))
-- 
cgit v1.2.3


From 0a4f9445fde97b7aedd83826b5ce51c6fc30c240 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 18:52:29 +0200
Subject: gnu: xorgproto: Don't use NAME in source URI.

* gnu/packages/xorg.scm (xorgproto)[source]: Hard-code NAME.
---
 gnu/packages/xorg.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index af8dfda922..b1d93ac6c4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -215,7 +215,7 @@ which can be read by any architecture.")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://xorg/individual/proto/"
-                                  name "-" version ".tar.bz2"))
+                                  "xorgproto-" version ".tar.bz2"))
               (sha256
                (base32
                 "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"))))
-- 
cgit v1.2.3


From 4a51d75929d9490ca8685dcd240bf567ce88544d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 18:53:44 +0200
Subject: gnu: libxcb: Don't use NAME in source URI.

* gnu/packages/xorg.scm (libxcb)[source]: Hard-code NAME.
---
 gnu/packages/xorg.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b1d93ac6c4..7f3f2dd5ec 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5021,7 +5021,7 @@ protocol.")
       (origin
         (method url-fetch)
         (uri (string-append "https://xcb.freedesktop.org/dist/"
-                            name "-" version ".tar.bz2"))
+                            "libxcb-" version ".tar.bz2"))
         (sha256
           (base32
            "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q"))))
-- 
cgit v1.2.3


From f51905a472f1ba87d61b52f532a18b23a79ffe57 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 23:40:00 +0200
Subject: gnu: vimb: Update to 3.5.0.

* gnu/packages/web-browsers.scm (vimb): Update to 3.5.0.
---
 gnu/packages/web-browsers.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 6d4caa0f9f..dd19b5fc6b 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -331,7 +331,7 @@ GUI.  It is based on PyQt5 and QtWebKit.")
 (define-public vimb
   (package
     (name "vimb")
-    (version "3.3.0")
+    (version "3.5.0")
     (source
      (origin
        (method git-fetch)
@@ -339,12 +339,11 @@ GUI.  It is based on PyQt5 and QtWebKit.")
              (url "https://github.com/fanglingsu/vimb/")
              (commit version)))
        (sha256
-        (base32
-         "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"))
+        (base32 "13q7mk1hhjri0s30a98r8ncy0skf6m6lrnbqaf0jimf6sbwgiirf"))
        (file-name (git-file-name name version))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:tests? #f ; no tests
+     '(#:tests? #f                      ; no tests
        #:make-flags (list "CC=gcc"
                           "DESTDIR="
                           (string-append "PREFIX=" %output))
-- 
cgit v1.2.3


From 9610a422b0d1640fb3dcc48740c72e0748cefb26 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 25 Sep 2019 23:44:22 +0200
Subject: gnu: bspwm: Update to 0.9.9.

* gnu/packages/wm.scm (bspwm): Update to 0.9.9.
---
 gnu/packages/wm.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 72be0bdbe1..e47979d026 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -97,7 +97,7 @@
 (define-public bspwm
   (package
     (name "bspwm")
-    (version "0.9.5")
+    (version "0.9.9")
     (source
      (origin
        (method git-fetch)
@@ -106,7 +106,7 @@
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr"))))
+        (base32 "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g"))))
     (build-system gnu-build-system)
     (inputs
      `(("libxcb" ,libxcb)
-- 
cgit v1.2.3


From 3c39dc680f9dbde2b25cfec180757f57ea391934 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 00:51:39 +0200
Subject: gnu: skopeo: Update to 0.1.39.

* gnu/packages/virtualization.scm (skopeo): Update to 0.1.39.
---
 gnu/packages/virtualization.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index f46c31df1f..d60044f65b 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -939,7 +939,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
 (define-public skopeo
   (package
     (name "skopeo")
-    (version "0.1.28")
+    (version "0.1.39")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -948,7 +948,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "068nwrr3nr27alravcq1sxyhdd5jjr24213vdgn1dqva3885gbi0"))))
+                "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi"))))
     (build-system go-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From 2359e235a4b6fae2e318a3c17ece25bd1f7f5911 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 05:32:03 +0200
Subject: gnu: dehydrated: Update to 0.6.5.

* gnu/packages/tls.scm (dehydrated): Update to 0.6.5.
---
 gnu/packages/tls.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index c06052239f..74d16f7586 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -883,7 +883,7 @@ coding footprint.")
 (define-public dehydrated
   (package
     (name "dehydrated")
-    (version "0.6.2")
+    (version "0.6.5")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -891,7 +891,7 @@ coding footprint.")
                     "v" version "/dehydrated-" version ".tar.gz"))
               (sha256
                (base32
-                "03p80yj6bnzjc6dkp5hb9wpplmlrla8n5src71cnzw4rj53q8cqn"))))
+                "0dgskgbdd95p13jx6s13p77y15wngb5cm6p4305cf2s54w0bvahh"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
-- 
cgit v1.2.3


From f70e567eea1e6adac209053fdc6dddbeec06b148 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 05:34:13 +0200
Subject: gnu: emacs-circe: Update to 2.11.

* gnu/packages/emacs-xyz.scm (emacs-circe): Update to 2.11.
---
 gnu/packages/emacs-xyz.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c641e9d716..5606482c96 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9998,7 +9998,7 @@ value of the access token.")
 (define-public emacs-circe
   (package
     (name "emacs-circe")
-    (version "2.10")
+    (version "2.11")
     (source
      (origin
        (method git-fetch)
@@ -10007,8 +10007,7 @@ value of the access token.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "10gi14kwxd81blddpvqh95lgmpbfgp0m955naxix3bs3r6a75n4s"))))
+        (base32 "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd"))))
     (build-system emacs-build-system)
     (arguments
      `(#:tests? #t
-- 
cgit v1.2.3


From 91af1031e53e85e4200046ae47c38067c3dd7a85 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 26 Sep 2019 06:24:18 +0200
Subject: gnu: dtc: Update to 1.5.1.

* gnu/packages/bootloaders.scm (dtc): Update to 1.5.1.
[arguments]: Add -Wl,-rpath to LDFLAGS #:make-flags.
---
 gnu/packages/bootloaders.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index b235e1bc78..520728b52c 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -357,7 +357,7 @@ menu to select one of the installed operating systems.")
 (define-public dtc
   (package
     (name "dtc")
-    (version "1.5.0")
+    (version "1.5.1")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -365,7 +365,7 @@ menu to select one of the installed operating systems.")
                     "dtc-" version ".tar.xz"))
               (sha256
                (base32
-                "0wh10p42hf5403ipvs0dsxddb6kzfyk2sq4fgid9zqzpr51y8wn6"))))
+                "07q3mdsvl4smbiakriq3hnsyyd0q344lsm306q0kgz4hjq1p82v6"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("bison" ,bison)
@@ -379,6 +379,11 @@ menu to select one of the installed operating systems.")
     (arguments
      `(#:make-flags
        (list "CC=gcc"
+
+             ;; /bin/fdt{get,overlay,put} need help finding libfdt.so.1.
+             (string-append "LDFLAGS=-Wl,-rpath="
+                            (assoc-ref %outputs "out") "/lib")
+
              (string-append "PREFIX=" (assoc-ref %outputs "out"))
              (string-append "SETUP_PREFIX=" (assoc-ref %outputs "out"))
              "INSTALL=install")
-- 
cgit v1.2.3


From 5d1d7ae413278594707f0735ca447872376883ec Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 20:55:06 +0200
Subject: gnu: emacs-evil-nerd-commenter: Enable tests.

* gnu/packages/emacs-xyz.scm (emacs-evil-nerd-commenter): Enable tests.
---
 gnu/packages/emacs-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5606482c96..f966862821 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7112,6 +7112,9 @@ pasting into and from @code{tmux} paste buffers.")
          "1r8shfdddys9vqvrxf7s6z83ydqx9xhqs9sa7klbsajryqcp50b7"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("make" "test")))
     (home-page "https://github.com/redguardtoo/evil-nerd-commenter")
     (synopsis "Comment and uncomment lines efficiently")
     (description
-- 
cgit v1.2.3


From fbbdce47e28a8723f08c1f224d06b0e55bbce75d Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 20:58:53 +0200
Subject: gnu: emacs-yaml-mode: Update to 0.0.14.

* gnu/packages/emacs-xyz.scm (emacs-yaml-mode): Update to 0.0.14.
---
 gnu/packages/emacs-xyz.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f966862821..c0a16ee87f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6360,15 +6360,16 @@ that uses the standard completion function completing-read.")
 (define-public emacs-yaml-mode
   (package
     (name "emacs-yaml-mode")
-    (version "0.0.13")
+    (version "0.0.14")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://raw.githubusercontent.com/yoshiki"
-                                  "/yaml-mode/v" version "/yaml-mode.el"))
-              (file-name (string-append "yaml-mode-" version ".el"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/yoshiki/yaml-mode.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0im88sk9dqw03x6d6zaspgvg9i0pfpgb8f2zygrmbifh2w4pwmvj"))))
+                "18g064ardqi1f3xz7j6rs1x9fvv9sn0iq9vgid8c6qvxq7gwj00r"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/yoshiki/yaml-mode")
     (synopsis "Major mode for editing YAML files")
-- 
cgit v1.2.3


From 595c7c339ce6c77534089d2f020b8113d9df2fd7 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 21:08:54 +0200
Subject: gnu: emacs-web-mode: Don't use unstable tarball.

* gnu/packages/emacs-xyz.scm (emacs-web-mode)[source]: Use GIT-FETCH and GIT-FILE-NAME.
---
 gnu/packages/emacs-xyz.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c0a16ee87f..1537cf1ce2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6411,13 +6411,14 @@ via @code{gitlab-ci-lint}.")
     (name "emacs-web-mode")
     (version "16")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://raw.githubusercontent.com/fxbois"
-                                  "/web-mode/v" version "/web-mode.el"))
-              (file-name (string-append "web-mode-" version ".el"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/fxbois/web-mode.git")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1hs5w7kdvcyn4ihyw1kfjg48djn5p7lz4rlbhzzdqv1g56xqx3gw"))))
+                "17dw6a8d0p304f2sa4f9zwd8r48w2wbkc3fvbmxwlg4w12h7cwf0"))))
     (build-system emacs-build-system)
     (synopsis "Major mode for editing web templates")
     (description "Web-mode is an Emacs major mode for editing web templates
-- 
cgit v1.2.3


From eee9277ba510dda6b63075831e88515fb1306cf6 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 21:16:05 +0200
Subject: gnu: emacs-make-it-so: Update to 0.1.0-2.b73dfb6.

* gnu/packages/emacs-xyz.scm (emacs-make-it-so): Update to 0.1.0-2.b73dfb6.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1537cf1ce2..7ae3702593 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9853,12 +9853,11 @@ well as Github-style emojis like @code{:smile:}.  It provides a minor mode
     (license license:gpl3+)))
 
 (define-public emacs-make-it-so
-  (let ((commit "bc3b01d6b9ed6ff66ebbd524234f9d6df60dd4be")
-        (version "0.1.0")
-        (revision "1"))
+  (let ((commit "b73dfb640588123c9eece230ad72b37604f5c126")
+        (revision "2"))
     (package
       (name "emacs-make-it-so")
-      (version (git-version version revision commit))
+      (version (git-version "0.1.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -9867,7 +9866,7 @@ well as Github-style emojis like @code{:smile:}.  It provides a minor mode
                (commit commit)))
          (sha256
           (base32
-           "0833bzlscpnkvjnrg3g54yr246afbjwri8n5wxk8drnsq6acvd8z"))))
+           "0p6xhyinzzkrwzbpxqfm8hlii0ikvmmylya240bwsa77w0g1k6xq"))))
       (build-system emacs-build-system)
       (arguments
        `(#:include (cons "^recipes/" %default-include)))
-- 
cgit v1.2.3


From e745dd119a3ba2d5b9475f79ef515758e0bc684a Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 21:16:33 +0200
Subject: gnu: emacs-websocket: Enable some tests.

* gnu/packages/emacs-xyz.scm (emacs-websocket): Enable some tests.
---
 gnu/packages/emacs-xyz.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7ae3702593..f4e0df0202 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -9965,6 +9965,12 @@ database of references on life sciences.")
         (base32
          "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52"))))
     (build-system emacs-build-system)
+    (arguments
+     `(#:tests? #t
+       ;; TODO: also enable websocket-functional-test.el
+       #:test-command '("emacs" "--batch"
+                        "-l" "websocket-test.el"
+                        "-f" "ert-run-tests-batch-and-exit")))
     (home-page "http://elpa.gnu.org/packages/websocket.html")
     (synopsis "Emacs WebSocket client and server")
     (description "This is an Elisp library for WebSocket clients to talk to
-- 
cgit v1.2.3


From 82431a10cc485981b55218a26fdbd7d9b8eb0da9 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 25 Sep 2019 21:21:12 +0200
Subject: gnu: emacs-nov-el: Update to 0.2.9.

* gnu/packages/emacs-xyz.scm (emacs-nov-el): Update to 0.2.9.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f4e0df0202..2b7b95d89a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10594,7 +10594,7 @@ the format.")
 (define-public emacs-nov-el
   (package
     (name "emacs-nov-el")
-    (version "0.2.6")
+    (version "0.2.9")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -10603,7 +10603,7 @@ the format.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "188h5gzn1zf443g0b7q5bpmvvpr6ds5h8aci8vxc92py56rhyrvc"))))
+                "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3"))))
     (build-system emacs-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 0155e23b34245699b5d2fb920dbd6d65720e621b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 26 Sep 2019 07:56:51 +0200
Subject: gnu: emacs-mu4e-conversation: Update to 0.0.1-5.98110bb.

* gnu/packages/emacs-xyz.scm (emacs-mu4e-conversation): Update to 0.0.1-5.98110bb.
---
 gnu/packages/emacs-xyz.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2b7b95d89a..22d81cd6af 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14790,21 +14790,21 @@ file.")
   (deprecated-package "emacs-wgrep-helm" emacs-wgrep))
 
 (define-public emacs-mu4e-conversation
-  (let ((commit "e7d4bfcb0d392b0aed1f705ccac2419a168d1f5e"))
+  (let ((commit "98110bb9c300fc9866dee8e0023355f9f79c9b96")
+        (revision "5"))
     (package
       (name "emacs-mu4e-conversation")
-      (version (git-version "20181126" "4" commit))
+      (version (git-version "0.0.1" revision commit))
       (source
        (origin
-         (method url-fetch)
-         (uri (string-append
-               "https://gitlab.com/Ambrevar/mu4e-conversation/"
-               "repository/archive.tar.gz?ref="
-               commit))
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/Ambrevar/mu4e-conversation.git")
+               (commit commit)))
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0b52hf9rm2afba9pvgink9bwqm705sk0y5qikp0ff5sk53wqvy29"))))
+           "080s96jkcw2p288sp1vgds91rgl693iz6hi2dv56p2ih0nnivwlg"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("mu" ,mu)))
-- 
cgit v1.2.3


From d8b352bea7657f039b669846eceb84aedd0f67ed Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 26 Sep 2019 08:02:29 +0200
Subject: gnu: emacs-youtube-dl: Update to 1.0-2.af877b5.

* gnu/packages/emacs-xyz.scm (emacs-youtube-dl): Update to 1.0-2.af877b5.
---
 gnu/packages/emacs-xyz.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 22d81cd6af..d3991427f2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15379,10 +15379,11 @@ News homepage.")
       (license license:gpl3))))
 
 (define-public emacs-youtube-dl
-  (let ((commit "7c9d7a7d05b72a7d1b1257a36c5e2b2567b185dd"))
+  (let ((commit "af877b5bc4f01c04fccfa7d47a2c328926f20ef4")
+        (revision "2"))
     (package
       (name "emacs-youtube-dl")
-      (version (git-version "1.0" "1" commit))
+      (version (git-version "1.0" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -15392,7 +15393,7 @@ News homepage.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0mh4s089a4x8s380agzb2306kdp1hl204px1n5rrrrdcls7imnh6"))))
+           "0zkl9jkjbx0lmp9ylv4rqg1zwqibk053s4rp7s1h0i18nzk7vn8j"))))
       (build-system emacs-build-system)
       (inputs
        `(("youtube-dl" ,youtube-dl)))
-- 
cgit v1.2.3


From 06bdb36837c33d7cd0ba34fd9652067df62cb027 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 26 Sep 2019 08:25:52 +0200
Subject: gnu: Add emacs-dash-docs.

* gnu/packages/emacs-xyz.scm (emacs-dash-docs): New variable.
---
 gnu/packages/emacs-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d3991427f2..f43538ecb5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17516,6 +17516,53 @@ and searching through @code{Ctags} files.")
 copied into @code{org-mode} buffers.")
       (license license:gpl3+))))
 
+(define-public emacs-dash-docs
+  (let ((commit "111fd9b97001f1ad887b45e5308a14ddd68ce70a")
+        (revision "1"))
+    (package
+      (name "emacs-dash-docs")
+      (version (git-version "1.4.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/dash-docs-el/dash-docs.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0sckb7z0ylflva212bns7iq9mfnffgjghi0qspsbfwra35zb9xng"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-async" ,emacs-async)))
+      (native-inputs
+       `(("emacs-undercover" ,emacs-undercover)
+         ("emacs-ert-runner" ,emacs-ert-runner)))
+      (arguments
+       `(#:tests? #t
+         #:test-command '("ert-runner")
+         #:phases
+         ;; this test requires network access, so remove it
+         (modify-phases %standard-phases
+           (add-before 'check 'make-tests-writable
+             (lambda _
+               (make-file-writable "test/dash-docs-test.el")
+               #t))
+           (add-before 'check 'delete-test
+             (lambda _
+               (emacs-batch-edit-file "test/dash-docs-test.el"
+                 `(progn (progn
+                          (goto-char (point-min))
+                          (re-search-forward "ert-deftest dash-docs-official-docsets-test")
+                          (beginning-of-line)
+                          (kill-sexp))
+                         (basic-save-buffer)))
+               #t)))))
+      (home-page "https://github.com/dash-docs-el/dash-docs")
+      (synopsis "Offline documentation browser for APIs using Dash docsets")
+      (description "This package exposes functionality to work with Dash docsets.")
+      (license license:gpl3+))))
+
 (define-public emacs-helm-dash
   (let ((commit "192b862185df661439a06de644791171e899348a")
         (version "1.3.0")
-- 
cgit v1.2.3


From b8563caf115e528fa07dffd64188ee6a81415a24 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 26 Sep 2019 08:26:23 +0200
Subject: gnu: emacs-counsel-dash: Update to 0.1.3-2.24d370b.

* gnu/packages/emacs-xyz.scm (emacs-counsel-dash): Update to 0.1.3-2.24d370b.
---
 gnu/packages/emacs-xyz.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f43538ecb5..826d53235f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17590,12 +17590,11 @@ Dash docsets.")
       (license license:gpl3+))))
 
 (define-public emacs-counsel-dash
-  (let ((commit "07fa74a94ff4da5b6c8c4810f5e143e701b480d2")
-        (version "0.1.3")
-        (revision "3"))
+  (let ((commit "24d370be9e94e90d045c49967e19484b9903fce9")
+        (revision "2"))
     (package
       (name "emacs-counsel-dash")
-      (version (git-version version revision commit))
+      (version (git-version "0.1.3" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -17605,11 +17604,10 @@ Dash docsets.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "17h2m9zsadq270mkq12kmdzmpbfjiwjbg8n1rg2apqnm1ndgcwf8"))))
+           "18gp7hhgng271c7bh06k9p24zqic0f64j5cicivljmyk9c3nh7an"))))
       (build-system emacs-build-system)
       (propagated-inputs
-       `(("emacs-helm-dash" ,emacs-helm-dash)
-         ("emacs-dash" ,emacs-dash)
+       `(("emacs-dash-docs" ,emacs-dash-docs)
          ("emacs-ivy" ,emacs-ivy)))
       (home-page "https://github.com/nathankot/counsel-dash")
       (synopsis "Offline documentation browser for APIs using Dash docsets")
-- 
cgit v1.2.3


From 205a0fe0948257c75619db506f033827d591c47e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 26 Sep 2019 08:26:55 +0200
Subject: gnu: emacs-helm-dash: Update to 1.3.0-2.7f853bd.

* gnu/packages/emacs-xyz.scm (emacs-helm-dash): Update to 1.3.0-2.7f853bd.
---
 gnu/packages/emacs-xyz.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 826d53235f..bea8463cd2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17564,25 +17564,25 @@ copied into @code{org-mode} buffers.")
       (license license:gpl3+))))
 
 (define-public emacs-helm-dash
-  (let ((commit "192b862185df661439a06de644791171e899348a")
-        (version "1.3.0")
-        (revision "18"))
+  (let ((commit "7f853bd34da666f0e9a883011c80f451b06f6c59")
+        (revision "2"))
     (package
       (name "emacs-helm-dash")
-      (version (git-version version revision commit))
+      (version (git-version "1.3.0" revision commit))
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/areina/helm-dash")
+               (url "https://github.com/areina/helm-dash.git")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "06am5vnr4hsxkvh2b8q8kb80y5x1h3qyv7gwggswwhfa7w2vba3w"))))
+           "0r192vzry1212ihabg9pgw9xar8zdgnbgy0vsgvfm8s5wj6ny7jp"))))
       (build-system emacs-build-system)
       (propagated-inputs
-       `(("emacs-helm" ,emacs-helm)))
+       `(("emacs-helm" ,emacs-helm)
+         ("emacs-dash-docs" ,emacs-dash-docs)))
       (home-page "https://github.com/areina/helm-dash")
       (synopsis "Offline documentation browser for APIs using Dash docsets")
       (description "This package uses Helm to install and navigate through
-- 
cgit v1.2.3


From 4a506da83a3af829a42c9433bd0087a96d6f1c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 17:49:41 +0200
Subject: doc: Fix syntax of Varnish example.

* doc/guix.texi (Web Services): Escape nested string in '%gnu-mirror'
variable definition.  Adjust indentation.
---
 doc/guix.texi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 267c2e9e6c..762e8da2bd 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19819,13 +19819,12 @@ can do something along these lines:
 
 @lisp
 (define %gnu-mirror
-  (plain-file
-   "gnu.vcl"
-   "vcl 4.1;
-backend gnu @{ .host = "www.gnu.org"; @}"))
+  (plain-file "gnu.vcl"
+              "vcl 4.1;
+backend gnu @{ .host = \"www.gnu.org\"; @}"))
 
 (operating-system
-  ...
+  ;; @dots{}
   (services (cons (service varnish-service-type
                            (varnish-configuration
                             (listen '(":80"))
-- 
cgit v1.2.3


From 473bd8100bd4039116912e0f10420240fd19f5c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 17:52:17 +0200
Subject: doc: Add missing parens in inetd example.

* doc/guix.texi (Networking Services): Add missing parens in inetd
service example.
---
 doc/guix.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 762e8da2bd..64a0742255 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13349,7 +13349,7 @@ gateway @code{hostname}:
              (program (file-append openssh "/bin/ssh"))
              (arguments
               '("ssh" "-qT" "-i" "/path/to/ssh_key"
-                "-W" "smtp-server:25" "user@@hostname")))))
+                "-W" "smtp-server:25" "user@@hostname")))))))
 @end lisp
 
 See below for more details about @code{inetd-configuration}.
-- 
cgit v1.2.3


From 31e6e6a89f354b05132a3c209161f204a00557e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 18:07:55 +0200
Subject: doc: Add missing paren in CPE example.

* doc/guix.texi (Invoking guix lint): Add missing paren in 'cpe-name'
example.
---
 doc/guix.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 64a0742255..2f4e0ad7f9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9470,7 +9470,7 @@ that Guix uses, as in this example:
   ;; @dots{}
   ;; CPE calls this package "grub2".
   (properties '((cpe-name . "grub2")
-                (cpe-version . "2.3")))
+                (cpe-version . "2.3"))))
 @end lisp
 
 @c See .
-- 
cgit v1.2.3


From 71339070a9c38dc5502697edacb11adbc30303eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 25 Sep 2019 18:08:33 +0200
Subject: doc: Do not comment out closing parens in Android examples.

* doc/guix.texi (Base Services): Arrange so that closin parens are not
commented out.
---
 doc/guix.texi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 2f4e0ad7f9..4ffffcdc81 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12389,7 +12389,7 @@ The following example showcases how we can use an existing rule file.
 @lisp
 (use-modules (guix download)     ;for url-fetch
              (guix packages)     ;for origin
-             ;; @dots{})
+             @dots{})
 
 (define %android-udev-rules
   (file->udev-rule
@@ -12423,7 +12423,7 @@ well as in the @var{groups} field of the @var{operating-system} record.
 @lisp
 (use-modules (gnu packages android)  ;for android-udev-rules
              (gnu system shadow)     ;for user-group
-             ;; @dots{})
+             @dots{})
 
 (operating-system
   ;; @dots{}
@@ -12431,8 +12431,7 @@ well as in the @var{groups} field of the @var{operating-system} record.
                 ;; @dots{}
                 (supplementary-groups
                  '("adbusers"   ;for adb
-                   "wheel" "netdev" "audio" "video"))
-                ;; @dots{})))
+                   "wheel" "netdev" "audio" "video")))))
 
   (groups (cons (user-group (system? #t) (name "adbusers"))
                 %base-groups))
-- 
cgit v1.2.3


From 3972dc5d43ea824ee4ab78592e759f62ce90bf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 24 Sep 2019 17:50:48 +0200
Subject: guix package: Add '--list-profiles'.

* guix/scripts/package.scm (show-help, %options): Add '--list-profiles'.
(process-query): Honor it.
* tests/guix-package.sh: Add test.
---
 doc/guix.texi            | 13 +++++++++++++
 guix/scripts/package.scm | 21 +++++++++++++++++++++
 tests/guix-package.sh    |  6 +++++-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 4ffffcdc81..14c4514b31 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2933,6 +2933,19 @@ siblings that point to specific generations:
 $ rm ~/code/my-profile ~/code/my-profile-*-link
 @end example
 
+@item --list-profiles
+List all the user's profiles:
+
+@example
+$ guix package --list-profiles
+/home/charlie/.guix-profile
+/home/charlie/code/my-profile
+/home/charlie/code/devel-profile
+/home/charlie/tmp/test
+@end example
+
+When running as root, list all the profiles of all the users.
+
 @cindex collisions, in a profile
 @cindex colliding packages in profiles
 @cindex profile collisions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index f03741aa9e..1a58d43e5c 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -39,6 +39,7 @@
   #:use-module (guix scripts)
   #:use-module (guix scripts build)
   #:autoload   (guix describe) (package-provenance)
+  #:autoload   (guix store roots) (gc-roots)
   #:use-module ((guix build utils)
                 #:select (directory-exists? mkdir-p))
   #:use-module (ice-9 format)
@@ -359,6 +360,8 @@ Install, remove, or upgrade packages in a single transaction.\n"))
                          switch to a generation matching PATTERN"))
   (display (G_ "
   -p, --profile=PROFILE  use PROFILE instead of the user's default profile"))
+  (display (G_ "
+      --list-profiles    list the user's profiles"))
   (newline)
   (display (G_ "
       --allow-collisions do not treat collisions in the profile as an error"))
@@ -458,6 +461,11 @@ command-line option~%")
                    (values (cons `(query list-generations ,arg)
                                  result)
                            #f)))
+         (option '("list-profiles") #f #f
+                 (lambda (opt name arg result arg-handler)
+                   (values (cons `(query list-profiles #t)
+                                 result)
+                           #f)))
          (option '(#\d "delete-generations") #f #t
                  (lambda (opt name arg result arg-handler)
                    (values (alist-cons 'delete-generations arg
@@ -750,6 +758,19 @@ processed, #f otherwise."
                              (string "$module_dir/foo.scm"< /tmp/out
 test "`guix package -L "$module_dir" -s dummy-output | grep ^name:`" = "name: dummy-package"
 rm -rf "$module_dir"
+
+# Make sure we can see user profiles.
+guix package --list-profiles | grep "$profile"
+guix package --list-profiles | grep '\.guix-profile'
-- 
cgit v1.2.3


From 8da3513fc8e303f038ae505908baea9e6d66b365 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Wed, 25 Sep 2019 11:45:39 +0200
Subject: gnu: Add ccls.

* gnu/packages/cpp.scm (ccls): New variable.
---
 gnu/packages/cpp.scm | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 9e95bacd65..4a28a394bf 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Fis Trivial 
 ;;; Copyright © 2018 Ludovic Courtès 
+;;; Copyright © 2019 Mathieu Othacehe 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,7 +34,8 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages tls))
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages web))
 
 (define-public libzen
   (package
@@ -276,3 +278,34 @@ intuitive syntax and trivial integration.")
     (description "xtl is a C++ header-only template library providing basic
 tools (containers, algorithms) used by other QuantStack packages.")
     (license license:bsd-3)))
+
+(define-public ccls
+  (package
+    (name "ccls")
+    (version "0.20190823.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/MaskRay/ccls")
+             (commit version)))
+       (sha256
+        (base32 "1sx31zp6q2qc6fz3r78rx34zp2x4blrqzxwbpww71vb6lp1clmdm"))
+       (file-name (git-file-name name version))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f)) ; no check target.
+    (inputs
+     `(("rapidjson" ,rapidjson)))
+    (native-inputs
+     `(("clang" ,clang)
+       ("llvm" ,llvm)))
+    (home-page "https://github.com/MaskRay/ccls")
+    (synopsis "C/C++/Objective-C language server")
+    (description
+     "@code{ccls} is a server implementing the Language Server Protocol (LSP)
+for C, C++ and Objective-C languages.  It uses @code{clang} to perform static
+code analysis and supports cross references, hierarchies, completion and
+syntax highlighting.  @code{ccls} is derived from @code{cquery} which is not
+maintained anymore.")
+    (license license:asl2.0)))
-- 
cgit v1.2.3


From 2ea4587d8373bce140f24bf2b9219cd73c378f8b Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Thu, 26 Sep 2019 15:58:48 +0200
Subject: gnu: python-libmpsse: Update to 1.4.

* gnu/packages/embedded.scm (python2-libmpsse): Rename to...
(python-libmpsse): ...this.
[version]: Update to 1.4.
[source]: Change repository and version.
[inputs]: Change Python version.
[arguments]: Add #parallel-build?.
(python2-libmpsse): New variable.
---
 gnu/packages/embedded.scm | 81 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index a65998c369..106675b87b 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -874,30 +874,31 @@ the Raspberry Pi chip.")
       (description "This package provides @code{gcc} for VideoCore IV,
 the Raspberry Pi chip."))))
 
-(define-public python2-libmpsse
+(define-public python-libmpsse
   (package
-    (name "python2-libmpsse")
-    (version "1.3")
+    (name "python-libmpsse")
+    (version "1.4")
     (source
       (origin
-        (method url-fetch)
-        (uri (string-append "https://storage.googleapis.com/"
-                            "google-code-archive-downloads/v2/"
-                            "code.google.com/libmpsse/"
-                            "libmpsse-" version ".tar.gz"))
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/daym/libmpsse.git")
+              (commit (string-append "v" version))))
+        (file-name "libmpsse-checkout")
         (sha256
           (base32
-            "0jq7nhqq3na8675jnpfcar3pd3dp3adhhc4lw900swkla01a1wh8"))))
+            "14f1kiiia4kfd9mzwx4h63aa8bpz9aknbrrr7mychnsp3arw0z25"))))
     (build-system gnu-build-system)
     (inputs
      `(("libftdi" ,libftdi)
-       ("python" ,python-2)))
+       ("python" ,python)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("swig" ,swig)
        ("which" ,base:which)))
     (arguments
      `(#:tests? #f ; No tests exist.
+       #:parallel-build? #f  ; Would be buggy.
        #:make-flags
        (list (string-append "CFLAGS=-Wall -fPIC -fno-strict-aliasing -g -O2 "
                             "$(shell pkg-config --cflags libftdi1)"))
@@ -905,28 +906,20 @@ the Raspberry Pi chip."))))
        (modify-phases %standard-phases
          (add-after 'unpack 'set-environment-up
            (lambda* (#:key inputs outputs #:allow-other-keys)
-             (chdir "src")
-             (setenv "PYDEV" (string-append (assoc-ref inputs "python")
-                             "/include/python2.7"))
-             #t))
-         (add-after 'unpack 'patch-global-variable
-           (lambda _
-             ;; fast_rw_buf was defined in a header file which was making
-             ;; the build not reproducible.
-             (substitute* "src/fast.c"
-               (("^int fast_build_block_buffer") "
-
-unsigned char fast_rw_buf[SPI_RW_SIZE + CMD_SIZE];
-int fast_build_block_buffer"))
-             (substitute* "src/mpsse.h"
-               (("unsigned char fast_rw_buf.*") "
-"))
-             #t))
+             (let ((python (assoc-ref inputs "python")))
+               (chdir "src")
+               (setenv "PYDEV" (string-append python
+                               "/include/python"
+                               ,(version-major+minor (package-version python))
+                               "m"))
+               #t)))
          (replace 'install
-           (lambda* (#:key outputs make-flags #:allow-other-keys #:rest args)
+           (lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args)
              (let* ((out (assoc-ref outputs "out"))
                     (out-python (string-append out
-                                               "/lib/python2.7/site-packages"))
+                                               "/lib/python"
+                                               ,(version-major+minor (package-version python))
+                                               "/site-packages"))
                     (install (assoc-ref %standard-phases 'install)))
                (install #:make-flags (cons (string-append "PYLIB=" out-python)
                                            make-flags))))))))
@@ -937,6 +930,36 @@ MPSSE (Multi-Protocol Synchronous Serial Engine) adapter by FTDI that can do
 SPI, I2C, JTAG.")
     (license license:gpl2+)))
 
+(define-public python2-libmpsse
+  (package
+    (inherit python-libmpsse)
+    (name "python2-libmpsse")
+    (arguments
+     (substitute-keyword-arguments (package-arguments python-libmpsse)
+      ((#:phases phases)
+       `(modify-phases ,phases
+         (replace 'set-environment-up
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((python (assoc-ref inputs "python")))
+               (chdir "src")
+               (setenv "PYDEV" (string-append python
+                               "/include/python"
+                               ,(version-major+minor (package-version python-2))))
+               #t)))
+         (replace 'install
+           (lambda* (#:key inputs outputs make-flags #:allow-other-keys #:rest args)
+             (let* ((out (assoc-ref outputs "out"))
+                    (out-python (string-append out
+                                               "/lib/python"
+                                               ,(version-major+minor (package-version python-2))
+                                               "/site-packages"))
+                    (install (assoc-ref %standard-phases 'install)))
+               (install #:make-flags (cons (string-append "PYLIB=" out-python)
+                                           make-flags)))))))))
+    (inputs
+     (alist-replace "python" (list python-2)
+                    (package-inputs python-libmpsse)))))
+
 (define-public picprog
   (package
     (name "picprog")
-- 
cgit v1.2.3


From 8581b40d097bf7c0b3016435e0985cf56a003afb Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 8 Sep 2019 12:07:09 +0200
Subject: gnu: Add python-distro.

* gnu/packages/python-xyz.scm (python-distro): New variable.
---
 gnu/packages/python-xyz.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 69c8e63ecf..1bd218b797 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2015, 2016 Chris Marusich 
 ;;; Copyright © 2016 Danny Milosavljevic 
 ;;; Copyright © 2016 Lukas Gradl 
-;;; Copyright © 2016, 2018 Hartmut Goebel 
+;;; Copyright © 2016, 2018-2019 Hartmut Goebel 
 ;;; Copyright © 2016 Daniel Pimentel 
 ;;; Copyright © 2016 Sou Bunnbu 
 ;;; Copyright © 2016, 2017 Troy Sankey 
@@ -16398,3 +16398,30 @@ because lxml.etree already has it's own implementation of XPath 1.0.")
     (synopsis "Python library to parse BibTeX files")
     (description "BibtexParser is a Python library to parse BibTeX files.")
     (license (list license:bsd-3 license:lgpl3))))
+
+(define-public python-distro
+  (package
+    (name "python-distro")
+    (version "1.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "distro" version))
+       (sha256
+        (base32
+         "0mrg75w4ap7mdzyga75yaid9n8bgb345ih5mwjp3plj6v1jxwb9n"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (home-page "https://github.com/nir0s/distro")
+    (synopsis
+     "OS platform information API")
+    (description
+     "@code{distro} provides information about the OS distribution it runs on,
+such as a reliable machine-readable ID, or version information.
+
+It is the recommended replacement for Python's original
+`platform.linux_distribution` function (which will be removed in Python 3.8).
+@code{distro} also provides a command-line interface to output the platform
+information in various formats.")
+    (license license:asl2.0)))
-- 
cgit v1.2.3


From 6eb1d20b682d1256bb4561517daa616b15fec22b Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 1 Aug 2019 15:27:28 +0200
Subject: gnu: Add debops.

* gnu/packages/admin.scm (debops): New variable.
* gnu/packages/patches/debops-constants-for-external-program-names.patch,
  gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch:
  New files.
* gnu/local.mk: Add them.
---
 gnu/local.mk                                       |   2 +
 gnu/packages/admin.scm                             |  98 ++++++++
 ...bops-constants-for-external-program-names.patch | 276 +++++++++++++++++++++
 .../debops-debops-defaults-fall-back-to-less.patch |  45 ++++
 4 files changed, 421 insertions(+)
 create mode 100644 gnu/packages/patches/debops-constants-for-external-program-names.patch
 create mode 100644 gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 49dc4e7b97..a6fe439904 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -765,6 +765,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/dbus-helper-search-path.patch		\
   %D%/packages/patches/dbus-CVE-2019-12749.patch		\
   %D%/packages/patches/dealii-mpi-deprecations.patch		\
+  %D%/packages/patches/debops-constants-for-external-program-names.patch \
+  %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
   %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch	\
   %D%/packages/patches/dfu-programmer-fix-libusb.patch		\
   %D%/packages/patches/diffutils-gets-undeclared.patch		\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 327abe455a..6d5e4b9fcc 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -26,6 +26,7 @@
 ;;; Copyright © 2019 Brett Gilio 
 ;;; Copyright © 2019 Björn Höfling 
 ;;; Copyright © 2019 Jakob L. Kreuze 
+;;; Copyright © 2019 Hartmut Goebel 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,6 +61,7 @@
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages dns)
   #:use-module (gnu packages file)
@@ -112,6 +114,7 @@
   #:use-module (gnu packages boost)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages mpi)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web))
 
 (define-public aide
@@ -1903,6 +1906,101 @@ ad hoc task execution, and multinode orchestration---including trivializing
 things like zero-downtime rolling updates with load balancers.")
     (license license:gpl3+)))
 
+(define-public debops
+  (package
+    (name "debops")
+    (version "1.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/debops/debops")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "052b2dykdn35pdpn9s4prawl6nl6yzih8nyf54hpvhpisvjrm1v5"))
+       (patches
+        (search-patches "debops-constants-for-external-program-names.patch"
+                        "debops-debops-defaults-fall-back-to-less.patch"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("git" ,git)))
+    (inputs
+     `(("ansible" ,ansible)
+       ("encfs" ,encfs)
+       ("fuse" ,fuse)
+       ("util-linux" ,util-linux)  ;; for umount
+       ("findutils" ,findutils)
+       ("gnupg" ,gnupg)
+       ("which" ,which)))
+    (propagated-inputs
+     `(("python-future" ,python-future)
+       ("python-distro" ,python-distro)))
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'nuke-debops-update
+           (lambda _
+             (chmod "bin/debops-update" #o755) ; FIXME work-around git-fetch issue
+             (with-output-to-file "bin/debops-update"
+               (lambda ()
+                 (format #t "#!/bin/sh
+echo 'debops is installed via guix. guix-update is useless in this case.
+Please use `guix package -u debops` instead.'")))
+             #t))
+         ;; patch shebangs only in actuall scripts, not in files included in
+         ;; roles (which are to be delivered to the targte systems)
+         (delete `patch-generated-file-shebangs)
+         (replace 'patch-source-shebangs
+           (lambda _
+             (for-each patch-shebang
+                       (find-files "bin"
+                                   (lambda (file stat)
+                                     ;; Filter out symlinks.
+                                     (eq? 'regular (stat:type stat)))
+                                   #:stat lstat))))
+         (add-after 'unpack 'fix-paths
+           (lambda _
+             (define (substitute-program-names file)
+               ;; e.g. ANSIBLE_PLAYBOOK = '/gnu/store/…/bin/ansible-playbook'
+               (for-each
+                (lambda (name)
+                  (let ((varname (string-upcase
+                                  (string-map
+                                   (lambda (c) (if (char=? c #\-) #\_ c))
+                                   name))))
+                    (substitute* file
+                      (((string-append "^(" varname " = )'.*'") line prefix)
+                       (string-append prefix "'" (which name) "'")))))
+                '("ansible-playbook" "encfs" "find" "fusermount"
+                  "umount" "gpg" "ansible" "which")))
+             (for-each substitute-program-names
+                       '("bin/debops"
+                         "bin/debops-padlock"
+                         "bin/debops-task"
+                         "debops/__init__.py"
+                         "debops/cmds/__init__.py"))
+             #t)))))
+    (home-page "https://www.debops.org/")
+    (synopsis "Collection of general-purpose Ansible roles")
+    (description "The Ansible roles provided by that can be used to manage
+Debian or Ubuntu hosts.  In addition, a default set of Ansible playbooks can
+be used to apply the provided roles in a controlled way, using Ansible
+inventory groups.
+
+The roles are written with a high customization in mind, which can be done
+using Ansible inventory.  This way the role and playbook code can be shared
+between multiple environments, with different configuration in to each one.
+
+Services can be managed on a single host, or spread between multiple hosts.
+DebOps provides support for different SQL and NoSQL databases, web servers,
+programming languages and specialized applications useful in a data center
+environment or in a cluster.  The project can also be used to deploy
+virtualization environments using KVM/libvirt, Docker or LXC technologies to
+manage virtual machines and/or containers.")
+    (license license:gpl3+)))
+
 (define-public emacs-ansible-doc
   (let ((commit "86083a7bb2ed0468ca64e52076b06441a2f8e9e0"))
     (package
diff --git a/gnu/packages/patches/debops-constants-for-external-program-names.patch b/gnu/packages/patches/debops-constants-for-external-program-names.patch
new file mode 100644
index 0000000000..b3b34ed323
--- /dev/null
+++ b/gnu/packages/patches/debops-constants-for-external-program-names.patch
@@ -0,0 +1,276 @@
+From 78d5cddafebb28e2e54efeb781495b5607ddb356 Mon Sep 17 00:00:00 2001
+From: Hartmut Goebel 
+Date: Thu, 8 Aug 2019 15:19:48 +0200
+Subject: [PATCH] Scripts: Use constants for external program names.
+
+This makes it much, much easier to replace the program
+with one using an absolute path. This is necessary for
+e.g. Guix to keep references to these external programs.
+---
+ bin/debops              | 10 +++++++---
+ bin/debops-padlock      | 21 +++++++++++++++------
+ bin/debops-task         |  7 +++++--
+ bin/debops-update       | 18 +++++++++++-------
+ debops/__init__.py      | 17 ++++++++++++-----
+ debops/cmds/__init__.py |  6 +++++-
+ 6 files changed, 55 insertions(+), 24 deletions(-)
+
+diff --git a/bin/debops b/bin/debops
+index 2b7ad3f88..caaeb892f 100755
+--- a/bin/debops
++++ b/bin/debops
+@@ -59,6 +59,10 @@ ConfigFileHeader = """\
+ # You can manipulate the contents of this file via `.debops.cfg`.
+ """
+ 
++# External programms used. List here for easy substitution for
++# hard-coded paths.
++ANSIBLE_PLAYBOOK = 'ansible-playbook'
++
+ 
+ def write_config(filename, config):
+     cfgparser = configparser.ConfigParser()
+@@ -131,7 +135,7 @@ def gen_ansible_cfg(filename, config, project_root, playbooks_path,
+             os.path.join(playbooks_path, "roles"),
+             "/etc/ansible/roles")))
+ 
+-    ansible_version_out = subprocess.check_output(["ansible-playbook",
++    ansible_version_out = subprocess.check_output([ANSIBLE_PLAYBOOK,
+                                                    "--version"]).decode()
+ 
+     # Get first line and split by spaces to get second 'word'.
+@@ -197,7 +201,7 @@ def main(cmd_args):
+         playbooks_path = '/nonexistent'
+ 
+     # Make sure required commands are present
+-    require_commands('ansible-playbook')
++    require_commands(ANSIBLE_PLAYBOOK)
+ 
+     # Check if user specified a potential playbook name as the first
+     # argument. If yes, use it as the playbook name and remove it from
+@@ -256,7 +260,7 @@ def main(cmd_args):
+         print("Running Ansible playbooks:")
+         for element in play_list:
+             print(element)
+-        return subprocess.call(['ansible-playbook'] + play_list + arg_list)
++        return subprocess.call([ANSIBLE_PLAYBOOK] + play_list + arg_list)
+     finally:
+         if revert_unlock:
+             padlock_lock(encfs_encrypted)
+diff --git a/bin/debops-padlock b/bin/debops-padlock
+index bfdfb8e06..2a97716cd 100755
+--- a/bin/debops-padlock
++++ b/bin/debops-padlock
+@@ -67,6 +67,14 @@ devrandom = os.environ.get('DEVRANDOM', "/dev/urandom")
+ 
+ SCRIPT_FILENAME = 'padlock-script'
+ 
++# External programms used. List here for easy substitution for
++# hard-coded paths.
++ENCFS = 'encfs'
++FIND = 'find'
++FUSERMOUNT = 'fusermount'
++UMOUNT = 'umount'
++GPG = 'gpg'
++
+ # ---- DebOps environment setup ----
+ 
+ 
+@@ -80,9 +88,9 @@ def main(subcommand_func, **kwargs):
+     # Make sure required commands are present
+     # OS X compatibility
+     if sys.platform == 'darwin':
+-        require_commands('encfs', 'find', 'umount', 'gpg')
++        require_commands(ENCFS, FIND, UMOUNT, GPG)
+     else:
+-        require_commands('encfs', 'find', 'fusermount', 'gpg')
++        require_commands(ENCFS, FIND, FUSERMOUNT, GPG)
+ 
+     inventory_path = find_inventorypath(project_root, required=False)
+     # If inventory hasn't been found automatically, assume it's the default
+@@ -121,7 +129,7 @@ def init(encfs_decrypted, encfs_encrypted, recipients):
+     # Generate a random password and encrypt it with GPG keys of recipients.
+     print("Generating a random", ENCFS_KEYFILE_LENGTH, "char password")
+     pwd = gen_pwd()
+-    gpg = subprocess.Popen(['gpg', '--encrypt', '--armor',
++    gpg = subprocess.Popen([GPG, '--encrypt', '--armor',
+                             '--output', encfs_keyfile] + recipients,
+                            stdin=subprocess.PIPE)
+     gpg.communicate(pwd.encode('utf-8'))
+@@ -133,9 +141,10 @@ def init(encfs_decrypted, encfs_encrypted, recipients):
+     # NB2: We can not use padlock_unlock here, because the config file
+     # does not yet exist.
+     encfs = subprocess.Popen([
+-        'encfs', encfs_encrypted, encfs_decrypted,
++        ENCFS, encfs_encrypted, encfs_decrypted,
+         '--extpass',
+-        'gpg --decrypt --no-mdc-warning --output - '+shquote(encfs_keyfile)],
++        GPG + ' --decrypt --no-mdc-warning --output - '
++        + shquote(encfs_keyfile)],
+         stdin=subprocess.PIPE)
+     encfs.communicate(('p\n'+pwd).encode('utf-8'))
+ 
+@@ -154,7 +163,7 @@ def init(encfs_decrypted, encfs_encrypted, recipients):
+ 
+     # Protect the EncFS configuration file by also encrypting it with
+     # the GPG keys of recipients.
+-    subprocess.call(['gpg', '--encrypt', '--armor',
++    subprocess.call([GPG, '--encrypt', '--armor',
+                      '--output', encfs_configfile+'.asc']
+                     + recipients + [encfs_configfile])
+     os.remove(encfs_configfile)
+diff --git a/bin/debops-task b/bin/debops-task
+index 223e5f834..dc31ad4e6 100755
+--- a/bin/debops-task
++++ b/bin/debops-task
+@@ -49,11 +49,14 @@ project_root = find_debops_project(required=True)
+ # todo: need to decide on semantics!
+ # config = read_config(project_root)
+ 
++# External programms used. List here for easy substitution for
++# hard-coded paths.
++ANSIBLE = 'ansible'
+ 
+ # ---- Main script ----
+ 
+ # Make sure required commands are present
+-require_commands('ansible')
++require_commands(ANSIBLE)
+ 
+ ansible_inventory = find_inventorypath(project_root)
+ 
+@@ -71,5 +74,5 @@ if INSECURE:
+     os.environ['ANSIBLE_HOST_KEY_CHECKING'] = 'False'
+ 
+ # Run ansible with custom environment
+-cmd = ['ansible'] + module + sys.argv[1:]
++cmd = [ANSIBLE] + module + sys.argv[1:]
+ subprocess.call(cmd)
+diff --git a/bin/debops-update b/bin/debops-update
+index 88c5e2c82..cc7e57cb0 100755
+--- a/bin/debops-update
++++ b/bin/debops-update
+@@ -90,6 +90,10 @@ GALAXY_REQUIREMENTS = "galaxy/requirements.txt"
+ # Default Ansible Galaxy user account name
+ GALAXY_ACCOUNT = "debops"
+ 
++# External programms used. List here for easy substitution for
++# hard-coded paths.
++GIT = 'git'
++
+ 
+ # ---- Functions ----
+ 
+@@ -137,7 +141,7 @@ def clone_git_repository(repo_uri, branch, destination, dry_run=False):
+     if dry_run:
+         print("Cloning '%s' to %s..." % (repo_uri, destination))
+     else:
+-        subprocess.call(['git', 'clone', '--quiet', '--branch', branch,
++        subprocess.call([GIT, 'clone', '--quiet', '--branch', branch,
+                          repo_uri, destination])
+ 
+ 
+@@ -152,22 +156,22 @@ def update_git_repository(path, dry_run=False, remote_uri=False):
+     os.chdir(path)
+ 
+     if dry_run:
+-        subprocess.call(['git', 'fetch'])
+-        subprocess.call(['git', 'diff', 'HEAD', 'origin', '--stat'])
++        subprocess.call([GIT, 'fetch'])
++        subprocess.call([GIT, 'diff', 'HEAD', 'origin', '--stat'])
+     else:
+         # Get the current sha of the head branch
+         current_sha = subprocess.check_output(
+-                ['git', 'rev-parse', 'HEAD']).strip()
++                [GIT, 'rev-parse', 'HEAD']).strip()
+ 
+         # Fetch it silently and store the new sha
+-        subprocess.call(['git', 'fetch', '--quiet'])
++        subprocess.call([GIT, 'fetch', '--quiet'])
+         fetch_sha = subprocess.check_output(
+-                ['git', 'rev-parse', 'FETCH_HEAD']).strip()
++                [GIT, 'rev-parse', 'FETCH_HEAD']).strip()
+ 
+         if current_sha != fetch_sha:
+             print()
+             print('--')
+-            subprocess.call(['git', 'merge', fetch_sha])
++            subprocess.call([GIT, 'merge', fetch_sha])
+ 
+             if remote_uri:
+                 compare_uri = (remote_uri + '/compare/' + current_sha[:7]
+diff --git a/debops/__init__.py b/debops/__init__.py
+index 1c2cedcb0..da8430e41 100644
+--- a/debops/__init__.py
++++ b/debops/__init__.py
+@@ -93,6 +93,13 @@ ENCFS_KEYFILE = ".encfs6.keyfile"
+ # Length of the random EncFS password stored in encrypted keyfile
+ ENCFS_KEYFILE_LENGTH = 256
+ 
++# External programms used. List here for easy substitution for
++# hard-coded paths.
++ENCFS = 'encfs'
++FUSERMOUNT = 'fusermount'
++UMOUNT = 'umount'
++GPG = 'gpg'
++
+ 
+ # ---- Functions ----
+ 
+@@ -180,9 +187,9 @@ def padlock_lock(encrypted_path):
+         return False
+     # OS X compatibility
+     if sys.platform == 'darwin':
+-        subprocess.call(['umount', decrypted_path])
++        subprocess.call([UMOUNT, decrypted_path])
+     else:
+-        subprocess.call(['fusermount', '-u', decrypted_path])
++        subprocess.call([FUSERMOUNT, '-u', decrypted_path])
+     return True
+ 
+ 
+@@ -237,14 +244,14 @@ def padlock_unlock(encrypted_path):
+     # Start encfs. It will wait for input on the `configfile` named
+     # pipe.
+     encfs = subprocess.Popen([
+-        'encfs', encrypted_path, decrypted_path,
++        ENCFS, encrypted_path, decrypted_path,
+         '--extpass',
+-        'gpg --decrypt --no-mdc-warning --output - %s' % shquote(keyfile)])
++        GPG + ' --decrypt --no-mdc-warning --output - %s' % shquote(keyfile)])
+     # now decrypt the config and write it into the named pipe
+     with open(configfile, 'w') as fh:
+         # NB: gpg must write to stdout to avoid it is asking whether
+         # the file should be overwritten
+-        subprocess.Popen(['gpg',
++        subprocess.Popen([GPG,
+                           '--decrypt', '--no-mdc-warning', '--output', '-',
+                           crypted_configfile], stdout=fh).wait()
+     encfs.wait()
+diff --git a/debops/cmds/__init__.py b/debops/cmds/__init__.py
+index b221fa191..9fabf43a5 100644
+--- a/debops/cmds/__init__.py
++++ b/debops/cmds/__init__.py
+@@ -55,6 +55,10 @@ SCRIPT_NAME = os.path.basename(sys.argv[0])
+ # command line)
+ INSECURE = bool(os.environ.get('INSECURE', False))
+ 
++# External programms used. List here for easy substitution for
++# hard-coded paths.
++WHICH = 'which'
++
+ 
+ def error_msg(message, severity="Error"):
+     """
+@@ -70,7 +74,7 @@ def require_commands(*cmd_names):
+     Check if required commands exist.
+     """
+     def command_exists(cmd_name):
+-        which = "where" if platform.system() == "Windows" else "which"
++        which = "where" if platform.system() == "Windows" else WHICH
+         return not subprocess.call([which, cmd_name],
+                                    stdout=DEVNULL, stderr=subprocess.STDOUT)
+ 
+-- 
+2.21.0
+
diff --git a/gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch b/gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch
new file mode 100644
index 0000000000..bbb6b7c08e
--- /dev/null
+++ b/gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch
@@ -0,0 +1,45 @@
+From 5059daf8bd59a83f520c14731173ea76ce8b8661 Mon Sep 17 00:00:00 2001
+From: Hartmut Goebel 
+Date: Sun, 8 Sep 2019 13:09:15 +0200
+Subject: [PATCH] [debops-defaults] If `view` is not available, try less, etc.
+
+---
+ bin/debops-defaults | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/bin/debops-defaults b/bin/debops-defaults
+index 9dd87fe0a..3e3db4c41 100755
+--- a/bin/debops-defaults
++++ b/bin/debops-defaults
+@@ -96,13 +96,22 @@ def main(role_list):
+     config = read_config(project_root)
+     playbooks_path = find_playbookpath(config, project_root, required=True)
+ 
+-    # Make sure required commands are present
+-    require_commands('view')
+-
+-    if sys.stdout.isatty():
++    # Check if one of the output commands is present
++    sys.stdout = io.BytesIO()  # suppress error message, if any
++    for cmd_args in (('view', '+set ft=yaml', '-'),
++                     ('less', '-'),
++                     ('more', '-')):
++        try:
++            require_commands(cmd_args[0])
++            break
++        except SystemExit:
++            # this command was not found
++            cmd_args = None
++    sys.stdout = sys.__stdout__
++
++    if cmd_args and sys.stdout.isatty():
+         # if script is run as standalone, redirect to view
+-        view = subprocess.Popen(['view', '+set ft=yaml', '-'],
+-                                stdin=subprocess.PIPE)
++        view = subprocess.Popen(cmd_args, stdin=subprocess.PIPE)
+         try:
+             aggregate_defaults(playbooks_path, role_list, view.stdin)
+         except IOError as e:
+-- 
+2.21.0
+
-- 
cgit v1.2.3


From dec845606d2d184da31065fa26cd951b84b3ce2d Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 8 Aug 2019 16:43:15 +0200
Subject: guix download: Ensure destination file-name is valid in the store.

Avoid invalid store-file-name by explicitly passing the destination
name, replacing any character not allowed in the store-file-name by an
underscore.

Fixes 

* guix/scripts/download.scm (safe-naensure-valid-store-file-nameme):
  New function. (download-to-store*): Use it to generate a "safe"
  basename of URL.
---
 guix/scripts/download.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm
index d8fe71ce12..22cd75ea0b 100644
--- a/guix/scripts/download.scm
+++ b/guix/scripts/download.scm
@@ -33,6 +33,7 @@
   #:use-module (web uri)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-14)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-37)
   #:use-module (rnrs bytevectors)
@@ -54,9 +55,23 @@
        (url-fetch url file #:mirrors %mirrors)))
     file))
 
+(define (ensure-valid-store-file-name name)
+  "Replace any character not allowed in a stror name by an underscore."
+
+  (define valid
+    ;; according to nix/libstore/store-api.cc
+    (string->char-set (string-append "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                     "abcdefghijklmnopqrstuvwxyz"
+                                     "0123456789" "+-._?=")))
+  (string-map (lambda (c)
+                (if (char-set-contains? valid c) c #\_))
+              name))
+
+
 (define* (download-to-store* url #:key (verify-certificate? #t))
   (with-store store
     (download-to-store store url
+                       (ensure-valid-store-file-name (basename url))
                        #:verify-certificate? verify-certificate?)))
 
 (define %default-options
-- 
cgit v1.2.3


From fc16ef9d906f356cd63e3fc8b14e505568978b32 Mon Sep 17 00:00:00 2001
From: Julien Lepiller 
Date: Thu, 26 Sep 2019 20:51:02 +0200
Subject: nls: Update 'fr' translation of news entries.

* etc/news.scm: Add more 'fr' translations.
---
 etc/news.scm | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/etc/news.scm b/etc/news.scm
index 4293e5ec04..890f30af76 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -10,7 +10,8 @@
  (version 0)
 
  (entry (commit "5f3f70391809f8791c55c05bd1646bc58508fa2c")
-        (title (en "GNU C Library upgraded"))
+        (title (en "GNU C Library upgraded")
+	       (fr "Mise à jour de la bibliothèque C de GNU"))
         (body
          (en "The GNU C Library (glibc) has been upgraded to version 2.29.  To
 run previously-installed programs linked against glibc 2.28, you need to
@@ -34,10 +35,22 @@ guix install glibc-locales glibc-locales-2.28
 
 Auf Guix System genügt es, das @code{locale-libcs}-Feld Ihrer
 @code{operating-system}-Form anzupassen. Führen Sie @code{info \"(guix.de)
-Locales\"} aus, um weitere Informationen dazu zu erhalten.")))
+Locales\"} aus, um weitere Informationen dazu zu erhalten.")
+         (fr "La bibliothèque C de GNU (glibc) a été mise à jour en version
+2.29.  Pour pouvoir lancer tes programmes déjà installés et liés à glibc 2.28,
+tu dois installer les données pour la version 2.28 en plus des données de
+régionalisation pour la version 2.29 :
 
+@example
+guix install glibc-locales glibc-locales-2.28
+@end example
+
+Sur le système Guix, tu peux ajuster le champ @code{locale-libcs} de ta forme
+@code{operating-system}.  Lance @code{info \"(guix.fr) Régionalisation\"} pour
+plus de détails.")))
  (entry (commit "cdd3bcf03883d129581a79e6d6611b2afd3b277b")
-        (title (en "New reduced binary seed bootstrap"))
+        (title (en "New reduced binary seed bootstrap")
+	       (fr "Nouvel ensemble de binaires de bootstrap réduit"))
         (body
          (en "The package graph on x86_64 and i686 is now rooted in a
 @dfn{reduced set of binary seeds}.  The initial set of binaries from which
@@ -49,7 +62,13 @@ Menge an binären Seeds}. Das heißt, die ursprüngliche Menge an Binärdateien,
 aus denen heraus Pakete erstellt werden, machen nun ungefähr 130 MiB aus, halb
 so viel wie früher. Führen Sie @code{info \"(guix.de) Bootstrapping\"} aus, um
 mehr zu erfahren, oder schauen Sie sich den Vortrag auf
-@uref{https://archive.fosdem.org/2019/schedule/event/gnumes/} an.")))
+@uref{https://archive.fosdem.org/2019/schedule/event/gnumes/} an.")
+         (fr "Le graphe des paquets sur x86_64 et i686 prend maintenant sa
+source dans un @dfn{ensemble réduit de binaires}.  L'ensemble initial des
+binaires à partir desquels les paquets sont construits pèse maintenant environ
+130 Mio, soit la moitié par rapport à l'ensemble précédent.  Tu peux lancer
+@code{info \"(guix) Bootstrapping\"} pour plus de détails, ou regarder la
+présentation sur @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")))
 
  (entry (commit "dcc90d15581189dbc30e201db2b807273d6484f0")
         (title (en "New channel news mechanism")
-- 
cgit v1.2.3


From 0d3a4fc867100651af8b27cdf66b1bca1c8ba663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 26 Sep 2019 17:06:33 +0200
Subject: shepherd: 'make-forkexec-constructor/container' keeps the log file.

* gnu/build/shepherd.scm (make-forkexec-constructor/container): Don't
call 'clean-up' on LOG-FILE.  This mirrors Shepherd commit
6892f638c78a14fedd075f664432757bc015c140.
---
 gnu/build/shepherd.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm
index b32765ed5e..461feb06ef 100644
--- a/gnu/build/shepherd.scm
+++ b/gnu/build/shepherd.scm
@@ -157,7 +157,6 @@ namespace, in addition to essential bind-mounts such /proc."
                               (lambda ()
                                 (mkdir-p "/var/run")
                                 (clean-up pid-file)
-                                (clean-up log-file)
 
                                 (exec-command command
                                               #:user user
-- 
cgit v1.2.3


From 464caf72f9ff7600bd49e2df07e19cd9af28a930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 26 Sep 2019 17:07:55 +0200
Subject: shepherd: Ensure the log file has correct ownership.

* gnu/build/shepherd.scm (make-forkexec-constructor/container): Ensure
LOG-FILE has correct ownership.
---
 gnu/build/shepherd.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm
index 461feb06ef..14bdf4edb8 100644
--- a/gnu/build/shepherd.scm
+++ b/gnu/build/shepherd.scm
@@ -150,7 +150,10 @@ namespace, in addition to essential bind-mounts such /proc."
     (when log-file
       ;; Create LOG-FILE so we can map it in the container.
       (unless (file-exists? log-file)
-        (call-with-output-file log-file (const #t))))
+        (call-with-output-file log-file (const #t))
+        (when user
+          (let ((pw (getpwnam user)))
+            (chown log-file (passwd:uid pw) (passwd:gid pw))))))
 
     (let ((pid (run-container container-directory
                               mounts namespaces 1
-- 
cgit v1.2.3


From 8727e0304b68cd22e827331bb40ea269f243c6ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 26 Sep 2019 18:49:25 +0200
Subject: self: Mark trivial "-modules" derivations as non-substitutable.

The resulting nar takes ~500KiB and it's quicker to build it locally
than to download it.

* guix/self.scm (node-source+compiled): Pass #:options to
'computed-file'.
---
 guix/self.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/self.scm b/guix/self.scm
index f03fe01d0c..142c834137 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -124,7 +124,11 @@ NODE's modules, under their FHS directories: share/guile/site and lib/guile."
           (symlink #$(node-compiled node) object))))
 
   (computed-file (string-append (node-name node) "-modules")
-                 build))
+                 build
+                 #:options '(#:local-build? #t
+
+                             ;; "Building" it locally is faster.
+                             #:substitutable? #f)))
 
 (define (node-fold proc init nodes)
   (let loop ((nodes nodes)
-- 
cgit v1.2.3


From 7647c0dec993159432534d0e3815367a5e8e3b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 26 Sep 2019 21:58:47 +0200
Subject: gnu: tbb: Build in a reproducible fashion.

Fixes .

* gnu/packages/tbb.scm (tbb)[source](snippets): Annihilate attempts to
capture the build time and kernel version.
---
 gnu/packages/tbb.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index 5e427ffe63..f6d7e9b8b4 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -44,6 +44,17 @@
                   (substitute* "build/common.inc"
                     (("export tbb_build_prefix.+$")
                      "export tbb_build_prefix?=guix\n"))
+
+                  ;; Don't capture the build time and kernel version.
+                  (substitute* "build/version_info_linux.sh"
+                    (("uname -srv") "uname -s")
+                    (("`date -u`") "01 Jan 1970"))
+
+                  (substitute* "build/linux.inc"
+                    (("os_kernel_version:=.*")
+                     "os_kernel_version:=5\n")
+                    (("os_version:=.*")
+                     "os_version:=1\n"))
                   #t))))
     (outputs '("out" "doc"))
     (build-system gnu-build-system)
-- 
cgit v1.2.3


From 99fcefb94c19c25dfa77f28fc8569da6d3aca64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 26 Sep 2019 22:34:35 +0200
Subject: gnu: texinfo: Add version 6.7.

* gnu/packages/texinfo.scm (texinfo-6.7): New variable.
---
 gnu/packages/texinfo.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index fa98bd56b8..cbb0c317dd 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2015, 2016, 2017 Ludovic Courtès 
+;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2019 Ludovic Courtès 
 ;;; Copyright © 2014, 2016 Eric Bavier 
 ;;; Copyright © 2015 Mark H Weaver 
 ;;; Copyright © 2017 Efraim Flashner 
@@ -62,6 +62,18 @@ their source and the command-line Info reader.  The emphasis of the language
 is on expressing the content semantically, avoiding physical markup commands.")
     (license gpl3+)))
 
+(define-public texinfo-6.7
+  (package
+    (inherit texinfo)
+    (version "6.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/texinfo/texinfo-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q"))))))
+
 (define-public texinfo-5
   (package (inherit texinfo)
     (version "5.2")
-- 
cgit v1.2.3


From d31a532417a3e92e6d1acde238ff8859c1f970b5 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Fri, 6 Sep 2019 01:10:10 +0200
Subject: gnu: Add emacs-flycheck-grammalecte.

* gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): New variable.
---
 gnu/packages/emacs-xyz.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bea8463cd2..7e1e9bfefc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -89,6 +89,7 @@
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages code)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages dictionaries)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages gtk)
@@ -3092,6 +3093,60 @@ boundaries defined by syntax highlighting.")
 for Flow files.")
       (license license:gpl3+))))
 
+(define-public emacs-flycheck-grammalecte
+  (package
+    (name "emacs-flycheck-grammalecte")
+    (version "0.9")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://git.deparis.io/"
+                                  "flycheck-grammalecte/snapshot/"
+                                  "flycheck-grammalecte-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0wjm9xyra870pci4bcrbnc9x66x18mi7iz08rkxa4clxv28xzryb"))))
+    (build-system emacs-build-system)
+    (arguments
+     `(#:include '("\\.(el|py)$")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-python
+           ;; Hardcode python3 executable in the Emacs library.
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((python3 (string-append (assoc-ref inputs "python")
+                                           "/bin/python3")))
+               (substitute* "flycheck-grammalecte.el"
+                 (("python3") python3))
+               #t)))
+         (add-after 'install 'link-to-grammalecte
+           ;; The package expects grammalecte to be in a sub-directory.
+           ;; Symlink it there from the store.
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((grammalecte (assoc-ref inputs "grammalecte"))
+                   (out (assoc-ref outputs "out"))
+                   (version ,(version-major+minor (package-version python))))
+               (with-directory-excursion
+                   (string-append out
+                                  "/share/emacs/site-lisp/guix.d/"
+                                  "flycheck-grammalecte-" ,version)
+                 (symlink (string-append grammalecte "/lib/"
+                                         "python" version "/site-packages/"
+                                         "grammalecte")
+                          "grammalecte"))
+               #t))))))
+    (inputs
+     `(("grammalecte" ,grammalecte)
+       ("python" ,python)))
+    (propagated-inputs
+     `(("emacs-flycheck" ,emacs-flycheck)))
+    (home-page "https://git.deparis.io/flycheck-grammalecte/")
+    (synopsis "Integrate Grammalecte with Flycheck")
+    (description "Integrate the French grammar and typography checker
+Grammalecte with Flycheck to automatically look for mistakes in your writings.
+It also provides an easy way to find synonyms and antonyms for a given
+word (to avoid repetitions for example).")
+    (license license:gpl3+)))
+
 (define-public emacs-elisp-demos
   (package
     (name "emacs-elisp-demos")
-- 
cgit v1.2.3


From 9a0f6a3c939a1b6c22798155045b7532b57e9604 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Thu, 26 Sep 2019 23:31:09 +0200
Subject: gnu: emacs-evil-magit: Update to 0.4.2-3.4b66a1d.

* gnu/packages/emacs-xyz.scm (emacs-evil-magit): Update to 0.4.2-3.4b66a1d.
---
 gnu/packages/emacs-xyz.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7e1e9bfefc..db5e61dd75 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14185,10 +14185,11 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
   (deprecated-package "emacs-evil-ediff" emacs-evil-collection))
 
 (define-public emacs-evil-magit
-  (let ((commit "e2fec5877994c0c19f0c25fa01f3d22cb0ab38ba"))
+  (let ((commit "4b66a1db8285457147a5436f209391016a819ea1")
+        (revision "3"))
     (package
       (name "emacs-evil-magit")
-      (version (git-version "0.4.2" "2" commit))
+      (version (git-version "0.4.2" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -14198,11 +14199,17 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "134v7s03jvbhm70mavwab85r09i68g2a5bvriirh0chz1av2y16v"))))
+           "0kkmbswfh34k3amfl3v140vsnz1gq4n4mg9g4khjd9yjph3zms4h"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-evil" ,emacs-evil)
          ("magit" ,emacs-magit)))
+      (arguments
+       `(#:tests? #t
+         #:test-command '("emacs" "-Q" "-batch"
+                          "-L" "."
+                          "-l" "evil-magit-tests"
+                          "-f" "ert-run-tests-batch-and-exit")))
       (home-page
        "https://github.com/emacs-evil/evil-magit")
       (synopsis "Evil-based key bindings for Magit")
-- 
cgit v1.2.3


From 352b1dcd6bff4bc0a8f4ed354a94ddde41f2600f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 27 Sep 2019 03:33:29 +0200
Subject: gnu: emacs-counsel-dash: Fix home page.

* gnu/packages/emacs-xyz.scm (emacs-counsel-dash): Fix home page.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index db5e61dd75..e94c05b354 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17661,7 +17661,7 @@ Dash docsets.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/nathankot/counsel-dash")
+               (url "https://github.com/dash-docs-el/counsel-dash.git")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -17671,7 +17671,7 @@ Dash docsets.")
       (propagated-inputs
        `(("emacs-dash-docs" ,emacs-dash-docs)
          ("emacs-ivy" ,emacs-ivy)))
-      (home-page "https://github.com/nathankot/counsel-dash")
+      (home-page "https://github.com/dash-docs-el/counsel-dash")
       (synopsis "Offline documentation browser for APIs using Dash docsets")
       (description "This package uses @code{ivy-mode} to install and navigate
 through Dash docsets.")
-- 
cgit v1.2.3


From 49175a9baba624eb0a48a77d8cfde2a1b4b61514 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 27 Sep 2019 05:53:06 +0200
Subject: gnu: emacs-org-re-reveal: Update to 2.5.1.

* gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 2.5.1.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e94c05b354..3b83ba8301 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12743,16 +12743,16 @@ powerful Org contents.")
 (define-public emacs-org-re-reveal
   (package
     (name "emacs-org-re-reveal")
-    (version "1.0.3")
+    (version "2.5.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://gitlab.com/oer/org-re-reveal.git")
-                    (commit "50cc6574c77f12d423f6cd096d8f76feb3673abc")))
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1v3z30gpimg4spf6zzqwp9b597zxk89h0vpq6xp58js4rjg4ixk8"))))
+                "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-htmlize" ,emacs-htmlize)
-- 
cgit v1.2.3


From 18cd5f69dd563289c76d4497687da681d5aaa204 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 27 Sep 2019 05:59:32 +0200
Subject: gnu: emacs-company-quickhelp: Update to 2.2.0-1.479676c.

* gnu/packages/emacs-xyz.scm (emacs-company-quickhelp): Update to 2.2.0-1.479676c.
---
 gnu/packages/emacs-xyz.scm | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3b83ba8301..e8ae6d93dc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3552,27 +3552,31 @@ for the current function or variable in the minibuffer.")
     (license license:gpl3+)))
 
 (define-public emacs-company-quickhelp
-  (package
-    (name "emacs-company-quickhelp")
-    (version "2.3.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/expez/company-quickhelp.git")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "08ccsfvwdpzpj0gai3xrdb2bv1nl6myjkxsc5774pbvlq9nkfdvr"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-pos-tip" ,emacs-pos-tip)
-       ("emacs-company" ,emacs-company)))
-    (home-page "https://github.com/expez/company-quickhelp")
-    (synopsis "Popup documentation for completion candidates")
-    (description "@code{company-quickhelp} shows documentation for the
+  ;; XXX: release version 2.3.0 is on an unmaintained branch for some reason,
+  ;; so we use the latest 2.2.0 commit instead
+  (let ((commit "479676cade80a9f03802ca3d956591820ed5c537")
+        (revision "1"))
+    (package
+      (name "emacs-company-quickhelp")
+      (version (git-version "2.2.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/expez/company-quickhelp.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0hbqpnaf4hnin3nmdzmfj3v22kk9a97b6zssqs96ns36d9h52xcp"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-pos-tip" ,emacs-pos-tip)
+         ("emacs-company" ,emacs-company)))
+      (home-page "https://github.com/expez/company-quickhelp")
+      (synopsis "Popup documentation for completion candidates")
+      (description "@code{company-quickhelp} shows documentation for the
 completion candidate when using the Company text completion framework.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-math-symbol-lists
   (let ((commit "dc7531cff0c845d5470a50c24d5d7309b2ced7eb")
-- 
cgit v1.2.3


From 308eb5c11a885768f81fb6136fd4d30b4639fe04 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Tue, 24 Sep 2019 20:23:31 +0200
Subject: gnu: gcc: Fix mingw cross compiler.

* gnu/packages/patches/gcc-7-cross-mingw.patch: New file.
* gnu/packages/cross-base.scm (cross-gcc-patches): Add XGCC parameter; update
caller.  Use it for target mingw and gcc >= 7.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                 |  1 +
 gnu/packages/cross-base.scm                  | 13 ++++++++-----
 gnu/packages/patches/gcc-7-cross-mingw.patch | 24 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/gcc-7-cross-mingw.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2fcd2648ed..e37c24a7ca 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -853,6 +853,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gcc-6-cross-environment-variables.patch	\
   %D%/packages/patches/gcc-6-source-date-epoch-1.patch		\
   %D%/packages/patches/gcc-6-source-date-epoch-2.patch		\
+  %D%/packages/patches/gcc-7-cross-mingw.patch			\
   %D%/packages/patches/gcc-8-cross-environment-variables.patch	\
   %D%/packages/patches/gcc-8-strmov-store-file-names.patch	\
   %D%/packages/patches/gcc-9-asan-fix-limits-include.patch	\
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 78dae7431a..7108000f06 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
 ;;; Copyright © 2014, 2015, 2018 Mark H Weaver 
-;;; Copyright © 2016 Jan Nieuwenhuizen 
+;;; Copyright © 2016, 2019 Jan (janneke) Nieuwenhuizen 
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Marius Bakke 
@@ -190,13 +190,16 @@ base compiler and using LIBC (which may be either a libc package or #f.)"
                               '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH")))
                   #t))))))))))
 
-(define (cross-gcc-patches target)
-  "Return GCC patches needed for TARGET."
+(define (cross-gcc-patches xgcc target)
+  "Return GCC patches needed for XGCC and TARGET."
   (cond ((string-prefix? "xtensa-" target)
          ;; Patch by Qualcomm needed to build the ath9k-htc firmware.
          (search-patches "ath9k-htc-firmware-gcc.patch"))
         ((target-mingw? target)
-         (search-patches "gcc-4.9.3-mingw-gthr-default.patch"))
+         (append (search-patches "gcc-4.9.3-mingw-gthr-default.patch")
+                 (if (version>=? (package-version xgcc) "7.0")
+                     (search-patches "gcc-7-cross-mingw.patch")
+                    '())))
         (else '())))
 
 (define (cross-gcc-snippet target)
@@ -229,7 +232,7 @@ target that libc."
                        ((version>=? (package-version xgcc) "8.0") (search-patch "gcc-8-cross-environment-variables.patch"))
                        ((version>=? (package-version xgcc) "6.0") (search-patch "gcc-6-cross-environment-variables.patch"))
                        (else  (search-patch "gcc-cross-environment-variables.patch")))
-                      (cross-gcc-patches target))))
+                      (cross-gcc-patches xgcc target))))
               (modules '((guix build utils)))
               (snippet
                (cross-gcc-snippet target))))
diff --git a/gnu/packages/patches/gcc-7-cross-mingw.patch b/gnu/packages/patches/gcc-7-cross-mingw.patch
new file mode 100644
index 0000000000..eec6f88953
--- /dev/null
+++ b/gnu/packages/patches/gcc-7-cross-mingw.patch
@@ -0,0 +1,24 @@
+This fixes
+
+../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc: In function ‘void* __gnu_cxx::aligned_alloc(std::size_t, std::size_t)’:
+../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc:78:10: error: ‘memalign’ was not declared in this scope
+   return memalign (al, sz);
+          ^~~~~~~~
+../../../../gcc-7.4.0/libstdc++-v3/libsupc++/new_opa.cc:78:10: note: suggested alternative: ‘max_align_t’
+   return memalign (al, sz);
+          ^~~~~~~~
+          max_align_t
+
+diff --git a/libstdc++-v3/libsupc++/new_opa.cc b/libstdc++-v3/libsupc++/new_opa.cc
+index 94e79cadb0e..084900e0daf 100644
+--- a/libstdc++-v3/libsupc++/new_opa.cc
++++ b/libstdc++-v3/libsupc++/new_opa.cc
+@@ -39,6 +39,8 @@ extern "C" void *memalign(std::size_t boundary, std::size_t size);
+ # endif
+ #endif
+ 
++#define memalign _aligned_malloc
++
+ using std::new_handler;
+ using std::bad_alloc;
+ 
-- 
cgit v1.2.3


From 8ff5c7355f4888927575e42c177b527218dd2567 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Thu, 19 Sep 2019 12:35:18 +0200
Subject: gnu: Add makeself-safeextract.

* gnu/packages/compression.scm (makeself-safeextract): New variable.
---
 gnu/packages/compression.scm | 50 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index bda43bfd18..6771de3028 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -22,7 +22,7 @@
 ;;; Copyright © 2017 Julien Lepiller 
 ;;; Copyright © 2018 Rutger Helling 
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal 
-;;; Copyright © 2018 Pierre Neidhardt 
+;;; Copyright © 2018, 2019 Pierre Neidhardt 
 ;;; Copyright © 2019 Nicolas Goaziou 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -48,6 +48,7 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
   #:use-module (gnu packages)
   #:use-module (gnu packages assembly)
   #:use-module (gnu packages autotools)
@@ -2000,3 +2001,50 @@ external compressors: the compressor to be used for each format is configurable
 at run time, and must be installed separately.")
     (license (list license:bsd-2        ; arg_parser.{cc,h}
                    license:gpl2+))))    ; the rest
+
+(define-public makeself-safeextract
+  (let ((commit "1a95e121fa8e3c02d307ae37b9b7834e616c3683"))
+    (package
+      (name "makeself-safeextract")
+      (version (git-version "0.0.0" "1" commit))
+      (home-page "https://github.com/ssokolow/makeself_safeextract")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1anlinaj9lvfi8bn00wp11vzqq0f9sig4fm9yrspisx31v0z4a2c"))))
+      (build-system trivial-build-system)
+      (inputs
+       `(("python" ,python-2)
+         ("p7zip" ,p7zip)
+         ("unzip" ,unzip)))
+      (arguments
+       `(#:modules ((guix build utils))
+         #:builder
+         (begin
+           (use-modules (guix build utils))
+           (let* ((name "makeself_safeextract")
+                  (source (string-append (assoc-ref %build-inputs "source")
+                                         "/" name ".py"))
+                  (bin (string-append (assoc-ref %outputs "out") "/bin"))
+                  (target (string-append bin "/" name))
+                  (python (string-append (assoc-ref %build-inputs "python") "/bin"))
+                  (7z (string-append (assoc-ref %build-inputs "p7zip") "/bin/7z"))
+                  (unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip")))
+             (setenv "PATH" (string-append (getenv "PATH") ":" python))
+             (mkdir-p bin)
+             (copy-file source target)
+             (substitute* target
+               (("'7z'") (format #f "'~a'" 7z))
+               (("'unzip'") (format #f "'~a'" unzip)))
+             (patch-shebang target)))))
+      (synopsis "Extract makeself and mojo archives without running untrusted code")
+      (description "This package provides a script to unpack self-extracting
+archives generated by @command{makeself} or @command{mojo} without running the
+possibly untrusted extraction shell script.")
+      (license license:gpl3+))))
-- 
cgit v1.2.3


From 772ca8e4f62d5b74286e39652b33afb817e17ca2 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Fri, 27 Sep 2019 10:46:06 +0200
Subject: gnu: supercollider: Fix build and update to 3.10.3.

* gnu/packages/patches/supercollider-boost-1.70-build-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/audio.scm (supercollider): Update to 3.10.3 and apply the
previous patch to fix build with boost-1.70. Remove outdated
'fix-build-with-boost-1.68 phase.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/audio.scm                             | 13 ++++------
 .../supercollider-boost-1.70-build-fix.patch       | 28 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/supercollider-boost-1.70-build-fix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e37c24a7ca..bee5b7024a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1328,6 +1328,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/strace-ipc-tests.patch			\
   %D%/packages/patches/streamlink-update-test.patch		\
   %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch	\
+  %D%/packages/patches/supercollider-boost-1.70-build-fix.patch	\
   %D%/packages/patches/superlu-dist-awpm-grid.patch		\
   %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch	\
   %D%/packages/patches/superlu-dist-scotchmetis.patch		\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 36fc434160..f1a45bc1ca 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2019 Leo Famulari 
 ;;; Copyright © 2019 Rutger Helling 
 ;;; Copyright © 2019 Arun Isaac 
+;;; Copyright © 2019 Mathieu Othacehe 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2177,16 +2178,18 @@ background file post-processing.")
 (define-public supercollider
   (package
     (name "supercollider")
-    (version "3.10.2")
+    (version "3.10.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "https://github.com/supercollider/supercollider"
                     "/releases/download/Version-" version
                     "/SuperCollider-" version "-Source-linux.tar.bz2"))
+              (patches
+               (search-patches "supercollider-boost-1.70-build-fix.patch"))
               (sha256
                (base32
-                "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq"))))
+                "0srm6wbazidkrd4ckjy4ypyhkdwcnx2i7k9msjyngalh0mrc9zz1"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on"
@@ -2198,12 +2201,6 @@ background file post-processing.")
                   (ice-9 ftw))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'fix-build-with-boost-1.68
-           (lambda _
-             (substitute* "server/supernova/utilities/time_tag.hpp"
-               (("(time_duration offset = .+ microseconds\\().*" _ m)
-                (string-append m "static_cast(get_nanoseconds()/1000));\n")))
-             #t))
          (add-after 'unpack 'rm-bundled-libs
            (lambda _
              ;; The build system doesn't allow us to unbundle the following
diff --git a/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch b/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch
new file mode 100644
index 0000000000..073044fccb
--- /dev/null
+++ b/gnu/packages/patches/supercollider-boost-1.70-build-fix.patch
@@ -0,0 +1,28 @@
+Patches taken from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/supercollider/files/supercollider-3.10.2-boost-1.70.patch?id=a420618dc766bba0654dbe0ef67008fdc5e901c6 to fix supercollider build with boost 1.70.
+
+diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
+index 5116a1be87..96e937ec25 100644
+--- a/server/supernova/sc/sc_osc_handler.cpp
++++ b/server/supernova/sc/sc_osc_handler.cpp
+@@ -728,7 +728,8 @@ void sc_osc_handler::tcp_connection::handle_message() {
+ 
+ 
+ void sc_osc_handler::start_tcp_accept(void) {
+-    tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service());
++    tcp_connection::pointer new_connection =
++        tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context());
+ 
+     tcp_acceptor_.async_accept(
+         new_connection->socket(),
+diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp
+index 35b8ab5ad..a7c191f2d 100644
+--- a/server/supernova/utilities/utils.hpp
++++ b/server/supernova/utilities/utils.hpp
+@@ -23,6 +23,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+ #include 
-- 
cgit v1.2.3


From 1fdab9d3b3e78b0c90b52567be5535a861a7273d Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Fri, 27 Sep 2019 11:07:30 +0200
Subject: gnu: isync: Use openssl-1.0 to fix build.

* gnu/packages/mail.scm (isync)[inputs]: Replace openssl by openssl-1.0 to fix
the build.
---
 gnu/packages/mail.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 3d5417bfb5..6fa2832b5c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1441,7 +1441,7 @@ hashing schemes plugin for @code{Dovecot}.")
     (inputs
      `(("bdb" ,bdb)
        ("cyrus-sasl" ,cyrus-sasl)
-       ("openssl" ,openssl)
+       ("openssl" ,openssl-1.0)
        ("zlib" ,zlib)))
     (home-page "http://isync.sourceforge.net/")
     (synopsis "Mailbox synchronization program")
-- 
cgit v1.2.3


From 966873e3e7238e70ebb589066e6461763314d006 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 10:22:27 +0200
Subject: gnu: Order (gnu packages license)'s imports alphabetically.

* gnu/packages/license.scm: Order module imports alphabetically.
---
 gnu/packages/license.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm
index 4003c18aca..82dbd2dba1 100644
--- a/gnu/packages/license.scm
+++ b/gnu/packages/license.scm
@@ -18,13 +18,13 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu packages license)
-  #:use-module (guix licenses)
   #:use-module (gnu packages)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system perl)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages perl-check))
+  #:use-module (gnu packages perl-check)
+  #:use-module (guix build-system perl)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix packages))
 
 ;;;
 ;;; Please: Try to add new module packages in alphabetic order.
-- 
cgit v1.2.3


From 29bdabb6fdcab38ddcae8098117d5babb2c01ac3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 12:24:06 +0200
Subject: gnu: xygrib: Update to 1.2.6.1.

* gnu/packages/geo.scm (xygrib): Update to 1.2.6.1.
---
 gnu/packages/geo.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index edb3b49841..5e1f7e39d7 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -936,7 +936,7 @@ map display.  Downloads map data from a number of websites, including
 (define-public xygrib
   (package
     (name "xygrib")
-    (version "1.2.6")
+    (version "1.2.6.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -945,7 +945,7 @@ map display.  Downloads map data from a number of websites, including
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0qzaaavil2c7mkkai5mg54cv8r452i7psy7cg75qjja96d2d7rbd"))
+                "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"))
               (modules '((guix build utils)))
               (snippet
                '(begin (delete-file-recursively "data/fonts") #t))))
-- 
cgit v1.2.3


From e6010e892091f9f0cc52fb94b57d8458d4dacd3a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 12:24:20 +0200
Subject: gnu: wabt: Update to 1.0.12.

* gnu/packages/web.scm (wabt): Update to 1.0.12.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 01c7288caa..0084db51fc 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -866,7 +866,7 @@ for efficient socket-like bidirectional reliable communication channels.")
 (define-public wabt
   (package
     (name "wabt")
-    (version "1.0.11")
+    (version "1.0.12")
     (source
      (origin
        (method git-fetch)
@@ -875,7 +875,7 @@ for efficient socket-like bidirectional reliable communication channels.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0hn88vlqyclpk79v3wg3lrssd9vwhjdgvb41g03jqakygxxgnmp5"))))
+        (base32 "1zlv3740wkqj4mn6sr84h0x6wk2lcp4pwwmqsh5yyqp1j1glbsa0"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBUILD_TESTS=OFF")
-- 
cgit v1.2.3


From 36cc160e721a764c16f53c6f7fbd9d09c581717e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 12:27:07 +0200
Subject: gnu: xbacklight: Update to 1.2.3.

* gnu/packages/xorg.scm (xbacklight): Update to 1.2.3.
---
 gnu/packages/xorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 7f3f2dd5ec..e4050a1425 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2016,7 +2016,7 @@ information used in connecting to the X server.")
 (define-public xbacklight
   (package
     (name "xbacklight")
-    (version "1.2.2")
+    (version "1.2.3")
     (source
       (origin
         (method url-fetch)
@@ -2026,7 +2026,7 @@ information used in connecting to the X server.")
                ".tar.bz2"))
         (sha256
           (base32
-            "0pmzaz4kp38qv2lqiw5rnqhwzmwrq65m1x5j001mmv99wh9isnk1"))))
+            "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"))))
     (build-system gnu-build-system)
     (inputs
      `(("libxcb" ,libxcb)
-- 
cgit v1.2.3


From b037ea963fae0c38f097e857aa5407b1d9f2782d Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 26 Sep 2019 16:38:20 +0200
Subject: gnu: Add libwpe.

* gnu/packages/webkit.scm (libwpe): New public variable.
---
 gnu/packages/webkit.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 2eca5147fe..e4e7c068e7 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Mark H Weaver 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Pierre Neidhardt 
+;;; Copyright © 2019 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,8 +55,38 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg))
 
+(define-public libwpe
+  (package
+    (name "libwpe")
+    (version "1.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://wpewebkit.org/releases/libwpe-"
+                                  version ".tar.xz"))
+              (sha256
+               (base32
+                "1221vs72zs87anrzhbm6pf8jnii7s6ms7mkzj6nlds9zqd7lklz2"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f))                    ;no tests
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("mesa" ,mesa)))
+    (propagated-inputs
+     `(;; In Requires of wpe-1.0.pc.
+       ("libxkbcommon" ,libxkbcommon)))
+    (home-page "https://wpewebkit.org/")
+    (synopsis "Platform agnostic WebKit interfaces")
+    (description
+     "@code{libwpe} is a small library that defines programming interfaces
+for use by WebKit, and provides a mechanism for loading a platform-specific
+backend which implements them.")
+    (license license:bsd-2)))
+
 (define-public webkitgtk
   (package
     (name "webkitgtk")
-- 
cgit v1.2.3


From 7970127ff0817336a6de03041aea83fc0bdc9980 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 26 Sep 2019 16:39:31 +0200
Subject: gnu: Add wpebackend-fdo.

* gnu/packages/webkit.scm (wpebackend-fdo): New public variable.
---
 gnu/packages/webkit.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index e4e7c068e7..1eb8ae699d 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -35,6 +35,7 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages enchant)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
@@ -87,6 +88,34 @@ for use by WebKit, and provides a mechanism for loading a platform-specific
 backend which implements them.")
     (license license:bsd-2)))
 
+(define-public wpebackend-fdo
+  (package
+    (name "wpebackend-fdo")
+    (version "1.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://wpewebkit.org/releases/"
+                                  "wpebackend-fdo-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1bwbs47v4nlzhsqrw9fpyny5m3n9ry0kfzsvk90zjif4bd5cl6d9"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f))                    ;no tests
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib" ,glib)
+       ("libwpe" ,libwpe)
+       ("mesa" ,mesa)
+       ("wayland" ,wayland)))
+    (home-page "https://wpewebkit.org/")
+    (synopsis "Wayland WPE backend")
+    (description
+     "This package provides a backend implementation for the WPE WebKit
+engine that uses Wayland for graphics output.")
+    (license license:bsd-2)))
+
 (define-public webkitgtk
   (package
     (name "webkitgtk")
-- 
cgit v1.2.3


From 9e0cb9d79d501f36740dade2c9a5d80f955ac2bc Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 26 Sep 2019 16:40:11 +0200
Subject: gnu: Add xdg-dbus-proxy.

* gnu/packages/glib.scm (xdg-dbus-proxy): New public variable.
---
 gnu/packages/glib.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 77b5715eb0..a02cf3b7f3 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Alex Vong 
 ;;; Copyright © 2019 Giacomo Leidi 
+;;; Copyright © 2019 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,6 +35,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages docbook)
   #:use-module (gnu packages enlightenment)
   #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
@@ -929,3 +931,37 @@ safe to use from any GObject-Introspectable language.
 Template-GLib allows you to access properties on GObjects as well as call
 simple methods via GObject-Introspection.")
     (license license:lgpl2.1+)))
+
+(define-public xdg-dbus-proxy
+  (package
+    (name "xdg-dbus-proxy")
+    (version "0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/flatpak/xdg-dbus-proxy"
+                                  "/releases/download/" version
+                                  "/xdg-dbus-proxy-" version ".tar.xz"))
+              (sha256
+               (base32
+                "03sj1h0c2l08xa8phw013fnxr4fgav7l2mkjhzf9xk3dykwxcj8p"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+
+       ;; For tests.
+       ("dbus" ,dbus)
+
+       ;; These are required to build the manual.
+       ("docbook-xml" ,docbook-xml-4.3)
+       ("docbook-xsl" ,docbook-xsl)
+       ("libxml2" ,libxml2)
+       ("xsltproc" ,libxslt)))
+    (inputs
+     `(("glib" ,glib)))
+    (home-page "https://github.com/flatpak/xdg-dbus-proxy")
+    (synopsis "D-Bus connection proxy")
+    (description
+     "xdg-dbus-proxy is a filtering proxy for D-Bus connections.  It can be
+used to create D-Bus sockets inside a Linux container that forwards requests
+to the host system, optionally with filters applied.")
+    (license license:lgpl2.1+)))
-- 
cgit v1.2.3


From 689b44bc3fe50de86c8c8b8c2ac503b2e82d7975 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 26 Sep 2019 16:40:45 +0200
Subject: gnu: WebKitGTK: Update to 2.26.1.

* gnu/packages/webkit.scm (webkitgtk-2.24): Rename to ...
(webkitgtk-2.26): ... this.  Update to 2.26.1.
[inputs]: Add BUBBLEWRAP, LIBSECCOMP, LIBWPE, WPEBACKEND-FDO, and XDG-DBUS-PROXY.
* gnu/packages/gnome.scm (eolie, epiphany)[inputs]: Adjust for changed
variable name.
* gnu/packages/web-browsers.scm (next-gtk-webkit)[inputs]: Likewise.
---
 gnu/packages/gnome.scm        |  4 ++--
 gnu/packages/web-browsers.scm |  2 +-
 gnu/packages/webkit.scm       | 15 +++++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 34a0c43b50..baebeec1c6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4386,7 +4386,7 @@ work and the interface is well tested.")
        ("libsecret" ,libsecret)
        ("gtkspell3" ,gtkspell3)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("webkitgtk" ,webkitgtk-2.24)))
+       ("webkitgtk" ,webkitgtk-2.26)))
     (home-page "https://wiki.gnome.org/Apps/Eolie")
     (synopsis "Web browser for GNOME")
     (description
@@ -4445,7 +4445,7 @@ a secret password store, an adblocker, and a modern UI.")
        ("libxslt" ,libxslt)
        ("nettle" ,nettle) ; for hogweed
        ("sqlite" ,sqlite)
-       ("webkitgtk" ,webkitgtk-2.24)))
+       ("webkitgtk" ,webkitgtk-2.26)))
     (home-page "https://wiki.gnome.org/Apps/Web")
     (synopsis "GNOME web browser")
     (description
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index dd19b5fc6b..46b5ea7327 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -398,7 +398,7 @@ driven and does not detract you from your daily work.")
     (inputs
      `(("glib-networking" ,glib-networking)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("webkitgtk" ,webkitgtk-2.24)))
+       ("webkitgtk" ,webkitgtk-2.26)))
     (native-inputs
      `(("gcc-7" ,gcc-7)   ; needed because webkitgtk-2.24 and above are compiled with gcc-7
        ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 1eb8ae699d..4864495adf 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -48,6 +48,7 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libreoffice)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -55,6 +56,7 @@
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg))
@@ -225,22 +227,27 @@ HTML/CSS applications to full-fledged web browsers.")
 ;; newer version of GCC than our default compiler, and this causes problems
 ;; when linked with C++ libraries built using our default compiler.  For now,
 ;; we use this newer webkitgtk only for selected packages, e.g. epiphany.
-(define-public webkitgtk-2.24
+(define-public webkitgtk-2.26
   (package/inherit webkitgtk
     (name "webkitgtk")
-    (version "2.24.4")
+    (version "2.26.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.webkitgtk.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46"))))
+                "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb"))))
     (native-inputs
      `(("gcc" ,gcc-7)  ; webkitgtk-2.22 requires gcc-6 or newer
        ,@(package-native-inputs webkitgtk)))
     (inputs
-     `(("openjpeg" ,openjpeg)
+     `(("bubblewrap" ,bubblewrap)
+       ("libseccomp" ,libseccomp)
+       ("libwpe" ,libwpe)
+       ("openjpeg" ,openjpeg)
+       ("wpebackend-fdo" ,wpebackend-fdo)
+       ("xdg-dbus-proxy" ,xdg-dbus-proxy)
        ,@(package-inputs webkitgtk)))
     (arguments
      (substitute-keyword-arguments (package-arguments webkitgtk)
-- 
cgit v1.2.3


From add8063742f08529a64bfbf11e1451a6be392fa3 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 26 Sep 2019 16:42:27 +0200
Subject: gnu: mbedtls-apache: Update to 2.16.3.

* gnu/packages/tls.scm (mbedtls-apache): Update to 2.16.3.
---
 gnu/packages/tls.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 74d16f7586..93c79d63e4 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -835,7 +835,7 @@ then ported to the GNU / Linux environment.")
 (define-public mbedtls-apache
   (package
     (name "mbedtls-apache")
-    (version "2.16.2")
+    (version "2.16.3")
     (source
      (origin
        (method url-fetch)
@@ -845,7 +845,7 @@ then ported to the GNU / Linux environment.")
                            version "-apache.tgz"))
        (sha256
         (base32
-         "1906hbwlkq32075hca4vjad03dcc36aycvmaz8yvhr3ygg6lz0x6"))))
+         "0qd65lnr63vmx2gxla6lcmm5gawlnaj4wy4h4vmdc3h9h9nyw6zc"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From b48eb1e934f1d457ff6a0fec1c572bb12ed15fab Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 26 Sep 2019 16:42:50 +0200
Subject: gnu: nginx: Update to 1.17.4.

* gnu/packages/web.scm (nginx): Update to 1.17.4.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 0084db51fc..5c8e5c97c6 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -212,14 +212,14 @@ Interface} specification.")
     ;; ’stable’ and recommends that “in general you deploy the NGINX mainline
     ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/)
     ;; Consider updating the nginx-documentation package together with this one.
-    (version "1.17.3")
+    (version "1.17.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://nginx.org/download/nginx-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0g0g9prwjy0rnv6n5smny5yl5dhnmflqdr3hwgyj5jpr5hfgx11v"))))
+                "0mg521bxh8pysmy20x599m252ici9w97kk7qy7s0wrv6bqv4p1b2"))))
     (build-system gnu-build-system)
     (inputs `(("openssl" ,openssl)
               ("pcre" ,pcre)
-- 
cgit v1.2.3


From 82d43b5f8fd6af53bc3cb23c907cb8acbf93273f Mon Sep 17 00:00:00 2001
From: Florian Pelz 
Date: Fri, 27 Sep 2019 20:40:28 +0200
Subject: nls: Update 'de' translation of news entries.

* etc/news.scm: Add 'de' translation for news entry titles.
---
 etc/news.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/news.scm b/etc/news.scm
index 890f30af76..d3de773ea3 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -11,7 +11,8 @@
 
  (entry (commit "5f3f70391809f8791c55c05bd1646bc58508fa2c")
         (title (en "GNU C Library upgraded")
-	       (fr "Mise à jour de la bibliothèque C de GNU"))
+               (de "GNU-C-Bibliothek aktualisiert")
+               (fr "Mise à jour de la bibliothèque C de GNU"))
         (body
          (en "The GNU C Library (glibc) has been upgraded to version 2.29.  To
 run previously-installed programs linked against glibc 2.28, you need to
@@ -50,7 +51,8 @@ Sur le système Guix, tu peux ajuster le champ @code{locale-libcs} de ta forme
 plus de détails.")))
  (entry (commit "cdd3bcf03883d129581a79e6d6611b2afd3b277b")
         (title (en "New reduced binary seed bootstrap")
-	       (fr "Nouvel ensemble de binaires de bootstrap réduit"))
+               (de "Neues Bootstrapping mit kleinerem Seed")
+               (fr "Nouvel ensemble de binaires de bootstrap réduit"))
         (body
          (en "The package graph on x86_64 and i686 is now rooted in a
 @dfn{reduced set of binary seeds}.  The initial set of binaries from which
-- 
cgit v1.2.3


From 60643d1b1930c54789c8262ae68457fe0c85fae0 Mon Sep 17 00:00:00 2001
From: Florian Pelz 
Date: Fri, 27 Sep 2019 19:18:31 +0000
Subject: nls: Update 'de' translation of news entries.

* etc/news.scm: Improve 'de' translation for news entries.
---
 etc/news.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/news.scm b/etc/news.scm
index d3de773ea3..4505a7477b 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -60,11 +60,11 @@ packages are built now weighs in at approximately 130 MiB, half of what it
 used to be.  Run @code{info \"(guix) Bootstrapping\"} to learn more, or watch
 the talk at @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")
          (de "Der Paketgraph auf x86_64 und i686 hat jetzt eine @dfn{kleinere
-Menge an binären Seeds}. Das heißt, die ursprüngliche Menge an Binärdateien,
-aus denen heraus Pakete erstellt werden, machen nun ungefähr 130 MiB aus, halb
-so viel wie früher. Führen Sie @code{info \"(guix.de) Bootstrapping\"} aus, um
-mehr zu erfahren, oder schauen Sie sich den Vortrag auf
-@uref{https://archive.fosdem.org/2019/schedule/event/gnumes/} an.")
+Menge an binären Seeds} als Wurzel. Das heißt, die ursprüngliche Menge an
+Binärdateien, aus denen heraus Pakete erstellt werden, machen nun ungefähr
+130 MiB aus, halb so viel wie früher. Führen Sie @code{info \"(guix.de)
+Bootstrapping\"} aus, um mehr zu erfahren, oder schauen Sie sich den Vortrag
+auf @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/} an.")
          (fr "Le graphe des paquets sur x86_64 et i686 prend maintenant sa
 source dans un @dfn{ensemble réduit de binaires}.  L'ensemble initial des
 binaires à partir desquels les paquets sont construits pèse maintenant environ
-- 
cgit v1.2.3


From 3e27f472dbe0037a8cdfa3423c1806be66a79e43 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Fri, 27 Sep 2019 22:44:57 +0200
Subject: gnu: Add emacs-skeletor.

* gnu/packages/emacs-xyz.scm (emacs-skeletor): New variable.
---
 gnu/packages/emacs-xyz.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e8ae6d93dc..76b3e2e8ff 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5957,6 +5957,59 @@ If you want to mark a folder manually as a project just create an empty
 .projectile file in it.")
     (license license:gpl3+)))
 
+(define-public emacs-skeletor
+  (let ((commit "47c5b761aee8452716c97a69949ac2f675affe13")
+        (revision "1"))
+    (package
+      (name "emacs-skeletor")
+      (version (git-version "1.6.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/chrisbarrett/skeletor.el.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "12bdgykfh4mwsqdazxjdvha62h3q3v33159ypy91f6x59y01fi0n"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-s" ,emacs-s)
+         ("emacs-f" ,emacs-f)
+         ("emacs-dash" ,emacs-dash)
+         ("emacs-let-alist" ,emacs-let-alist)))
+      (native-inputs
+       `(("emacs-ert-runner" ,emacs-ert-runner)))
+      (arguments
+       `(#:include (cons "^project-skeletons\\/" %default-include)
+         ;; XXX: one failing test involving initializing a git repo
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'check 'make-test-writable
+             (lambda _
+               (make-file-writable "test/skeletor-test.el")
+               #t))
+           (add-before 'check 'remove-git-test
+             (lambda _
+               (emacs-batch-edit-file "test/skeletor-test.el"
+                 `(progn
+                   (progn
+                    (goto-char (point-min))
+                    (re-search-forward
+                     "ert-deftest initialises-git-repo")
+                    (beginning-of-line)
+                    (kill-sexp))
+                   (basic-save-buffer)))
+               #t)))
+         #:tests? #t
+         #:test-command '("ert-runner")))
+      (home-page "https://github.com/chrisbarrett/skeletor.el")
+      (synopsis "Project skeletons for Emacs")
+      (description "This package provides project templates and automates the
+mundane parts of setting up a new project, such as version control, licenses,
+and tooling.")
+      (license license:gpl3+))))
+
 (define-public emacs-elfeed
   (package
     (name "emacs-elfeed")
-- 
cgit v1.2.3


From 3128d6a16a80d40d927c41f530dd48ebbb8a036d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 00:20:28 +0200
Subject: =?UTF-8?q?nls:=20Add=20=E2=80=98nl=E2=80=99=20translation=20of=20?=
 =?UTF-8?q?news=20entries.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* etc/news.scm: Add ‘nl’ translations.
---
 etc/news.scm | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/etc/news.scm b/etc/news.scm
index 4505a7477b..e19dec38dd 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -12,7 +12,8 @@
  (entry (commit "5f3f70391809f8791c55c05bd1646bc58508fa2c")
         (title (en "GNU C Library upgraded")
                (de "GNU-C-Bibliothek aktualisiert")
-               (fr "Mise à jour de la bibliothèque C de GNU"))
+               (fr "Mise à jour de la bibliothèque C de GNU")
+               (nl "GNU C-bibliotheek bijgewerkt"))
         (body
          (en "The GNU C Library (glibc) has been upgraded to version 2.29.  To
 run previously-installed programs linked against glibc 2.28, you need to
@@ -48,11 +49,24 @@ guix install glibc-locales glibc-locales-2.28
 
 Sur le système Guix, tu peux ajuster le champ @code{locale-libcs} de ta forme
 @code{operating-system}.  Lance @code{info \"(guix.fr) Régionalisation\"} pour
-plus de détails.")))
+plus de détails.")
+         (nl "De GNU C-bibliotheek (glibc) werd bijgewerkt naar versie 2.29.
+Om gebruik te maken van reeds geïnstalleerde programma's die aan glibc 2.28
+gebonden zijn, moet u de regionale informatie van versie 2.28 naast die van
+versie 2.29 installeren:
+
+@example
+guix install glibc-locales glibc-locales-2.28
+@end example
+
+Op Guix System kunt u het @code{locale-libcs}-veld van uw
+@code{operating-system}-vorm aanpassen.   Voer @code{info \"(guix) Locales\"}
+uit voor verdere uitleg." )))
  (entry (commit "cdd3bcf03883d129581a79e6d6611b2afd3b277b")
         (title (en "New reduced binary seed bootstrap")
                (de "Neues Bootstrapping mit kleinerem Seed")
-               (fr "Nouvel ensemble de binaires de bootstrap réduit"))
+               (fr "Nouvel ensemble de binaires de bootstrap réduit")
+               (nl "Nieuwe bootstrap met verkleinde binaire kiem"))
         (body
          (en "The package graph on x86_64 and i686 is now rooted in a
 @dfn{reduced set of binary seeds}.  The initial set of binaries from which
@@ -70,12 +84,19 @@ source dans un @dfn{ensemble réduit de binaires}.  L'ensemble initial des
 binaires à partir desquels les paquets sont construits pèse maintenant environ
 130 Mio, soit la moitié par rapport à l'ensemble précédent.  Tu peux lancer
 @code{info \"(guix) Bootstrapping\"} pour plus de détails, ou regarder la
-présentation sur @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")))
+présentation sur @uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")
+         (nl "Het netwerk van pakketten voor x86_64 en i686 is nu geworteld in
+een @dfn{verkleinde verzameling van binaire kiemen}.  Die beginverzameling
+van binaire bestanden waaruit pakketten gebouwd worden is nu zo'n 130 MiB
+groot; nog maar half zo groot als voorheen.  Voer @code{info \"(guix)
+Bootstrapping\"} uit voor meer details, of bekijk de presentatie op
+@uref{https://archive.fosdem.org/2019/schedule/event/gnumes/}.")))
 
  (entry (commit "dcc90d15581189dbc30e201db2b807273d6484f0")
         (title (en "New channel news mechanism")
                (de "Neuer Mechanismus, um Neuigkeiten über Kanäle anzuzeigen.")
-               (fr "Nouveau mécanisme d'information sur les canaux"))
+               (fr "Nouveau mécanisme d'information sur les canaux")
+               (nl "Nieuw mechanisme voor nieuwsberichten per kanaal"))
         (body
          (en "You are reading this message through the new channel news
 mechanism, congratulations!  This mechanism allows channel authors to provide
@@ -91,4 +112,9 @@ von guix pull\"} aus, um weitere Informationen zu erhalten.")
 des canaux, bravo !  Ce mécanisme permet aux auteur·rice·s de canaux de
 fournir des informations qu'on peut visualiser avec @command{guix pull
 --news}.  Tape @command{info \"(guix.fr) Invoquer guix pull\"} pour plus de
-détails."))))
+détails.")
+         (nl "U leest dit bericht door een nieuw mechanisme om per kanaal
+@dfn{nieuwsberichten} te verspreiden.  Proficiat!  Hiermee kunnen kanaalauteurs
+mededelingen uitzenden die hun gebruikers met @command{guix pull --news} kunnen
+lezen.  Voer @command{info \"(guix) Invoking guix pull\"} uit voor meer
+informatie."))))
-- 
cgit v1.2.3


From ba567cae9725f8adf717106f5b54baeb6efd89e4 Mon Sep 17 00:00:00 2001
From: Eric Bavier 
Date: Fri, 27 Sep 2019 22:19:39 -0500
Subject: gnu: dealii: Update to 9.1.1.

* gnu/packages/maths.scm (dealii): Update to 9.1.1.
[source]: Remove patch no longer needed.
* gnu/local.mk (dist_patch_DATA): ditto.
* gnu/packages/patches/dealii-mpi-deprecations.patch: Delete it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/maths.scm                             |  5 ++--
 gnu/packages/patches/dealii-mpi-deprecations.patch | 28 ----------------------
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 gnu/packages/patches/dealii-mpi-deprecations.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index a6fe439904..b04a5d796e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -764,7 +764,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/darkice-workaround-fpermissive-error.patch	\
   %D%/packages/patches/dbus-helper-search-path.patch		\
   %D%/packages/patches/dbus-CVE-2019-12749.patch		\
-  %D%/packages/patches/dealii-mpi-deprecations.patch		\
   %D%/packages/patches/debops-constants-for-external-program-names.patch \
   %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
   %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch	\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 2e0883a724..291a367a2f 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3636,7 +3636,7 @@ revised simplex and the branch-and-bound methods.")
 (define-public dealii
   (package
     (name "dealii")
-    (version "9.0.1")
+    (version "9.1.1")
     (source
      (origin
        (method url-fetch)
@@ -3644,8 +3644,7 @@ revised simplex and the branch-and-bound methods.")
                            "download/v" version "/dealii-" version ".tar.gz"))
        (sha256
         (base32
-         "0r7f8rhl3xr94imd372plizdcbqk0a70w73lwc3vw912dxk0sbyz"))
-       (patches (search-patches "dealii-mpi-deprecations.patch"))
+         "0xhjv0gzswpjbc43xbrpwfc5848g508l01855nszx3g5gwzlhnzw"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove bundled sources: UMFPACK, TBB, muParser, and boost
diff --git a/gnu/packages/patches/dealii-mpi-deprecations.patch b/gnu/packages/patches/dealii-mpi-deprecations.patch
deleted file mode 100644
index 816d54140a..0000000000
--- a/gnu/packages/patches/dealii-mpi-deprecations.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 40538ad31a71495649d174b0f7be5f7135d0a905 Mon Sep 17 00:00:00 2001
-From: David Wells 
-Date: Sat, 2 Feb 2019 10:00:38 -0500
-Subject: [PATCH] Avoid calling a deprecated MPI function.
-
-This was deprecated a long time ago (1996) and is not present in the
-latest version of openMPI (4.0): see
-
-https://www.open-mpi.org/faq/?category=mpi-removed
-
-Credit goes to Pratik Nayak for finding this issue.
----
- source/base/mpi.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/base/mpi.cc b/source/base/mpi.cc
-index bd1f7f9846a..b8cd45e7c26 100644
---- a/source/base/mpi.cc
-+++ b/source/base/mpi.cc
-@@ -448,7 +448,7 @@ namespace Utilities
-       MPI_Aint     displacements[] = {0, offsetof(MinMaxAvg, min_index)};
-       MPI_Datatype types[]         = {MPI_DOUBLE, MPI_INT};
- 
--      ierr = MPI_Type_struct(2, lengths, displacements, types, &type);
-+      ierr = MPI_Type_create_struct(2, lengths, displacements, types, &type);
-       AssertThrowMPI(ierr);
- 
-       ierr = MPI_Type_commit(&type);
-- 
cgit v1.2.3


From f805785e2fe1ee40d790e539c82d6c2269d5d4e1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 20:51:38 +0200
Subject: gnu: ubridge: Update to 0.9.16.

* gnu/packages/networking.scm (ubridge): Update to 0.9.16.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 11c9c6a37f..a93e2cb9fc 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2321,7 +2321,7 @@ SNMP v3 using both IPv4 and IPv6.")
 (define-public ubridge
   (package
     (name "ubridge")
-    (version "0.9.15")
+    (version "0.9.16")
     (source
      (origin
        (method git-fetch)
@@ -2330,7 +2330,7 @@ SNMP v3 using both IPv4 and IPv6.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0fl07zyall04map6v2l1bclqh8y3rrhsx61s2v0sr8b00j201jg4"))))
+        (base32 "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
cgit v1.2.3


From dcedcc7c577a660e16154a56ef2631b41ca3fdfc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 20:51:41 +0200
Subject: gnu: youtube-viewer: Update to 3.5.8.

* gnu/packages/video.scm (youtube-viewer): Update to 3.5.8.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 94254d0c78..f624f62429 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1671,7 +1671,7 @@ audio, images) from the Web.  It can use either mpv or vlc for playback.")
 (define-public youtube-viewer
   (package
     (name "youtube-viewer")
-    (version "3.5.4")
+    (version "3.5.8")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1680,7 +1680,7 @@ audio, images) from the Web.  It can use either mpv or vlc for playback.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j782m9rximybamd0qsc43hi7hgk333x9gy3ypzb61s0sifs0i6m"))))
+                "0zz0r3vd2pg9zzykhrq0vnvqp5842dbgsg8cfygw9vzb9j8mlq0a"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-module-build" ,perl-module-build)))
-- 
cgit v1.2.3


From 67e4abc53115ad81579f1ea38e4aabfee1060b5a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 01:21:51 +0200
Subject: gnu: smu: Update to 1.5.

* gnu/packages/markup.scm (smu): Update to 1.5.
---
 gnu/packages/markup.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index 2b1e2ef63c..2717ac35cd 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 David Thompson 
 ;;; Copyright © 2016 Efraim Flashner 
 ;;; Copyright © 2017 ng0 
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -224,7 +224,7 @@ for parsing and rendering CommonMark.")
 (define-public smu
   (package
     (name "smu")
-    (version "1.4")
+    (version "1.5")
     (source
      (origin
        (method url-fetch)
@@ -232,14 +232,13 @@ for parsing and rendering CommonMark.")
                            version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0iazl45rkz8ngsb5hpykl76w0ngvdvqqhym1qz5wykgmrzk293rp"))))
+        (base32 "194kc08070g70ax9lg7jcr6iancbmgfgims8zfkpj9lnb3wiifzk"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags (list "CC=gcc"
                           (string-append "PREFIX="
                                          (assoc-ref %outputs "out")))
-       #:tests? #f ;No tests included
+       #:tests? #f                      ; no tests included
        #:phases
        (modify-phases %standard-phases
          (delete 'configure))))
-- 
cgit v1.2.3


From 62b3a9b4c1a0694feb8758be908018e390170f86 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 01:23:59 +0200
Subject: gnu: smu: Don't use unstable tarball.

* gnu/packages/markup.scm (smu)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
---
 gnu/packages/markup.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index 2717ac35cd..6f1f9f6f68 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -23,6 +23,7 @@
 (define-module (gnu packages markup)
   #:use-module (guix licenses)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
@@ -227,12 +228,13 @@ for parsing and rendering CommonMark.")
     (version "1.5")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/Gottox/smu/archive/v"
-                           version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Gottox/smu.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "194kc08070g70ax9lg7jcr6iancbmgfgims8zfkpj9lnb3wiifzk"))))
+        (base32 "1jm7lhnzjx4q7gcwlkvsbffcy0zppywyh50d71ami6dnq182vvcc"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags (list "CC=gcc"
-- 
cgit v1.2.3


From c5b4916294d693bd69ea5fe82fab6740936d6c90 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 03:36:51 +0200
Subject: gnu: xtl: Update to 0.6.7.

* gnu/packages/cpp.scm (xtl): Update to 0.6.7.
---
 gnu/packages/cpp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 9e95bacd65..dd7ead05af 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -246,7 +246,7 @@ intuitive syntax and trivial integration.")
 (define-public xtl
   (package
     (name "xtl")
-    (version "0.6.4")
+    (version "0.6.7")
     (source (origin
               (method git-fetch)
               (uri
@@ -255,7 +255,7 @@ intuitive syntax and trivial integration.")
                 (commit version)))
               (sha256
                (base32
-                "0rwdw43fq7c581m6frzsd06h71sf7abk7danwa3cp6wd6cgkwdbk"))
+                "0dds2fzyis42b1c3biqr3ir9l96csyyfkwrkm3fqjksdhgdklzmj"))
               (file-name (git-file-name name version))))
     (native-inputs
      `(("googletest" ,googletest)
-- 
cgit v1.2.3


From aec6c09a3126573d40e0e8a16bb5869a6dde44b5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 03:38:50 +0200
Subject: gnu: xtensor: Update to 0.20.9.

* gnu/packages/algebra.scm (xtensor): Update to 0.20.9.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 02b4d4ca21..771fc53f44 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -987,7 +987,7 @@ features, and more.")
 (define-public xtensor
   (package
     (name "xtensor")
-    (version "0.20.5")
+    (version "0.20.9")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -995,7 +995,7 @@ features, and more.")
                     (commit version)))
               (sha256
                (base32
-                "0kkc4ar7p2d94jnclmrh46dwv7ldy9lx630vm9gci3pp4hnhbj9f"))
+                "1rw04bdi7mzp362dhkxr9m4rafnvb47xjsi9p3fp4vfif8v0jij8"))
               (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (native-inputs
-- 
cgit v1.2.3


From 3b1ccad0ed936d14e942928836cb3b89680339cd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 03:39:17 +0200
Subject: gnu: xtensor: Use HTTPS home page.

* gnu/packages/algebra.scm (xtensor)[home-page]: Use HTTPS.
---
 gnu/packages/algebra.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 771fc53f44..c517f86e53 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1005,7 +1005,7 @@ features, and more.")
      `(#:configure-flags
        '("-DBUILD_TESTS=ON")
        #:test-target "xtest"))
-    (home-page "http://quantstack.net/xtensor")
+    (home-page "https://quantstack.net/xtensor")
     (synopsis "C++ tensors with broadcasting and lazy computing")
     (description "xtensor is a C++ library meant for numerical analysis with
 multi-dimensional array expressions.
-- 
cgit v1.2.3


From d49375c72261ff3c82a7d27ba7f0ae01e5d7e610 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 03:39:26 +0200
Subject: gnu: z3: Update to 4.8.6.

* gnu/packages/maths.scm (z3): Update to 4.8.6.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 291a367a2f..ffb2f87836 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4106,7 +4106,7 @@ as equations, scalars, vectors, and matrices.")
 (define-public z3
   (package
     (name "z3")
-    (version "4.8.4")
+    (version "4.8.6")
     (home-page "https://github.com/Z3Prover/z3")
     (source (origin
               (method git-fetch)
@@ -4115,7 +4115,7 @@ as equations, scalars, vectors, and matrices.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"))))
+                "1sywcqj5y8yp28m4cdvzsgw74kd6zr1s3y1x17ky8pr9prvpvl6x"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 21391f8c83658797c9bfbc3ef8a552859e9d861d Mon Sep 17 00:00:00 2001
From: Eric Bavier 
Date: Tue, 24 Sep 2019 20:57:34 -0500
Subject: compile: Fix race condition on completion progress.

This prevent a race condition where multiple compilation threads could report
the same progress.

* guix/build/compile.scm (compile-files): Rename to...
: ...this.  Increment in same mutex region as the compilation is
reported.
---
 guix/build/compile.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/guix/build/compile.scm b/guix/build/compile.scm
index c127456fd0..06ed57c9d7 100644
--- a/guix/build/compile.scm
+++ b/guix/build/compile.scm
@@ -169,11 +169,12 @@ BUILD-DIRECTORY, using up to WORKERS parallel workers.  The resulting object
 files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"."
   (define progress-lock (make-mutex))
   (define total (length files))
-  (define completed 0)
+  (define progress 0)
 
   (define (build file)
     (with-mutex progress-lock
-      (report-compilation file total completed))
+      (report-compilation file total progress)
+      (set! progress (+ 1 progress)))
 
     ;; Exit as soon as something goes wrong.
     (exit-on-exception
@@ -185,9 +186,7 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"."
                          #:output-file (string-append build-directory "/"
                                                       (scm->go relative))
                          #:opts (append warning-options
-                                        (optimization-options relative)))))))
-    (with-mutex progress-lock
-      (set! completed (+ 1 completed))))
+                                        (optimization-options relative))))))))
 
   (with-augmented-search-path %load-path source-directory
     (with-augmented-search-path %load-compiled-path build-directory
-- 
cgit v1.2.3


From 667c004c6ee5963c7b798f28de4a28973a23ae20 Mon Sep 17 00:00:00 2001
From: Arun Isaac 
Date: Mon, 9 Sep 2019 20:06:37 +0530
Subject: gnu: Add stapler.

* gnu/packages/pdf.scm (stapler): New variable.
---
 gnu/packages/pdf.scm | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index d45a78222c..9c7cc0b7d2 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2016, 2017 Marius Bakke 
 ;;; Copyright © 2016, 2017 Ludovic Courtès 
 ;;; Copyright © 2016 Julien Lepiller 
-;;; Copyright © 2016 Arun Isaac 
+;;; Copyright © 2016, 2019 Arun Isaac 
 ;;; Copyright © 2017, 2018 Leo Famulari 
 ;;; Copyright © 2017 Alex Vong 
 ;;; Copyright © 2017, 2018 Rene Saavedra 
@@ -1116,3 +1116,45 @@ presentation.  The input files processed by pdfpc are PDF documents.")
 rendering of the file.  The rendering is done by creating outline curves
 through the Pango @code{ft2} backend.")
       (license license:lgpl2.0+))))
+
+(define-public stapler
+  (package
+    (name "stapler")
+    (version "0.3.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/hellerbarde/stapler")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "06w7xanzr7cicqik62g7zqs57j4y6fc7hflrc1rlmphxx40hkg6r"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python2-pypdf2" ,python2-pypdf2)))
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-pypdf-version-requirement
+           ;; A PyPDF2 version requirement of 1.25.1 is hard-coded in
+           ;; setup.py. Relax it to work with any version of PyPDF2.
+           (lambda _
+             (substitute* "setup.py"
+               (("PyPDF2==1.25.1") "PyPDF2"))
+             #t)))))
+    (home-page "https://github.com/hellerbarde/stapler")
+    (synopsis "PDF manipulation tool")
+    (description "Stapler is a pure Python alternative to PDFtk, a tool for
+manipulating PDF documents from the command line.  It supports
+
+@itemize
+@item cherry-picking pages and concatenating them into a new file
+@item splitting a PDF document into single pages each in its own file
+@item merging PDF documents with their pages interleaved
+@item displaying metadata in a PDF document
+@item displaying the mapping between logical and physical page numbers
+@end itemize")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From f3575adfe98a4a489ee3334f38b91418c4ad3ca2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:20:25 +0200
Subject: gnu: r-ellipsis: Update to 0.3.0.

* gnu/packages/cran.scm (r-ellipsis): Update to 0.3.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 89a581cb5e..06c0d1b071 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -98,14 +98,14 @@ the system clipboards.")
 (define-public r-ellipsis
   (package
     (name "r-ellipsis")
-    (version "0.2.0.1")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ellipsis" version))
        (sha256
         (base32
-         "0hx9l043433bwm1np9sypph77c7y9dddpz0wrhbkcv01x32jhr8f"))))
+         "01z9gq311nzwv3a0sa49jhm5ylqd59srip4vjkrf23hzgb5i9y0b"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-rlang" ,r-rlang)))
-- 
cgit v1.2.3


From 8fa788740a38a1897d7fbf576593ebb34f9ca770 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:20:34 +0200
Subject: gnu: r-callr: Update to 3.3.2.

* gnu/packages/cran.scm (r-callr): Update to 3.3.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 06c0d1b071..07f6c62a84 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -371,14 +371,14 @@ such as copy/paste from an R session.")
 (define-public r-callr
   (package
     (name "r-callr")
-    (version "3.3.1")
+    (version "3.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "callr" version))
        (sha256
         (base32
-         "0rvrlg86fxr5nadvqa0dr1iifqjs4d1rc32v76m3ccvx6m3xlq5z"))))
+         "12dbqzjngbyaqdyw0yq1blyfx8pagcvx1vqj2jm451hs25nhdrnh"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-r6" ,r-r6)
-- 
cgit v1.2.3


From 33194de22d5bb8bad1be913a23cd6eabb646c02b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:20:38 +0200
Subject: gnu: r-htmltable: Update to 1.13.2.

* gnu/packages/cran.scm (r-htmltable): Update to 1.13.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 07f6c62a84..f581a39dcf 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -582,14 +582,14 @@ applications.")
 (define-public r-htmltable
   (package
     (name "r-htmltable")
-    (version "1.13.1")
+    (version "1.13.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "htmlTable" version))
        (sha256
         (base32
-         "1l44b33xgj2698k6nz17r8fl0ink14ryzng803apm9d6bnv357v8"))))
+         "0h6jslchlx1dzqqdb70c3n9xlapcym9ykycvr0hc4q3450y8qmvh"))))
     (properties `((upstream-name . "htmlTable")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 65ddcce32cf7c758fd78115045a239745fafc432 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:20:43 +0200
Subject: gnu: r-curl: Update to 4.2.

* gnu/packages/cran.scm (r-curl): Update to 4.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f581a39dcf..9c88745093 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -615,13 +615,13 @@ LaTeX.")
 (define-public r-curl
   (package
     (name "r-curl")
-    (version "4.0")
+    (version "4.2")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "curl" version))
               (sha256
                (base32
-                "0wb1j87fa2nd4a9x1w2nmc453nzvx6qiq8dviwc4jr36hsf9ra89"))))
+                "0xh227gvb056wlipjxxbf555z1i1qcs7rr1igvs6k6645y9irrlp"))))
     (build-system r-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From e85f05037b3b0ea074503aec94dd29d641574796 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:20:47 +0200
Subject: gnu: r-recipes: Update to 0.1.7.

* gnu/packages/cran.scm (r-recipes): Update to 0.1.7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9c88745093..8daf18e29a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2996,14 +2996,14 @@ provides a one-row summary of model-level statistics.")
 (define-public r-recipes
   (package
     (name "r-recipes")
-    (version "0.1.6")
+    (version "0.1.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "recipes" version))
        (sha256
         (base32
-         "1ndz9h0zvdj141r63l8047wbhaj0x8fwzzyq7b8mh78pvrrdpq2i"))))
+         "1gw8x7vqj7k18mfpiqinyfwzv9i5r0pb51k7xcfxsjap6m9nks98"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-dplyr" ,r-dplyr)
-- 
cgit v1.2.3


From 290c75fc8fd410a71703dda8b87895ea79f6b7c6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:20:51 +0200
Subject: gnu: r-tinytex: Update to 0.16.

* gnu/packages/cran.scm (r-tinytex): Update to 0.16.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8daf18e29a..1b042ab9ba 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4048,14 +4048,14 @@ terminals.")
 (define-public r-tinytex
   (package
     (name "r-tinytex")
-    (version "0.15")
+    (version "0.16")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tinytex" version))
        (sha256
         (base32
-         "145dmgq7h55mmqqlnnj153j484x2a9s1fbvjbjkdyqzpnz9qh2ax"))))
+         "1dadq9l0527v038b1k1dyfs0dklsgxnmplls3qhqprfgskif8mga"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-xfun" ,r-xfun)))
-- 
cgit v1.2.3


From 9655b1d4223e49115397027729a09c93649c7e40 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:01 +0200
Subject: gnu: r-ttr: Update to 0.23-5.

* gnu/packages/cran.scm (r-ttr): Update to 0.23-5.
[native-inputs]: Remove gfortran.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1b042ab9ba..78b0a5f9bc 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4166,21 +4166,20 @@ generation, and 2D/3D network visualization.")
 (define-public r-ttr
   (package
     (name "r-ttr")
-    (version "0.23-4")
+    (version "0.23-5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "TTR" version))
        (sha256
         (base32
-         "18mzyv6cmxmqyqsfwlx2b2k055887mfgc2jgj8xkn8c6m56n05zb"))))
+         "0fxipnyxaz55n4camrk9cs71x9w4dsmjrihysv8i1s6khf825rg6"))))
     (properties `((upstream-name . "TTR")))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-curl" ,r-curl)
        ("r-xts" ,r-xts)
        ("r-zoo" ,r-zoo)))
-    (native-inputs `(("gfortran" ,gfortran)))
     (home-page "https://github.com/joshuaulrich/TTR")
     (synopsis "Technical trading rules")
     (description
-- 
cgit v1.2.3


From cd5d6e26db01b5727240fff7e3872299a095e0bd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:17 +0200
Subject: gnu: r-shinyace: Update to 0.4.1.

* gnu/packages/cran.scm (r-shinyace): Update to 0.4.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 78b0a5f9bc..3c3d9c6843 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4752,14 +4752,14 @@ files.")
 (define-public r-shinyace
   (package
     (name "r-shinyace")
-    (version "0.4.0")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "shinyAce" version))
        (sha256
         (base32
-         "0hvih5g0pswlnz5rf3blx5yqw11ssxvm8w4klxddp1ap20ncbgl1"))))
+         "1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"))))
     (properties `((upstream-name . "shinyAce")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 14c3e7bb5b993ae5fcdd4522e568a81239be9fe6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:23 +0200
Subject: gnu: r-sjmisc: Update to 2.8.2.

* gnu/packages/cran.scm (r-sjmisc): Update to 2.8.2.
[propagated-inputs]: Add r-tidyselect.
---
 gnu/packages/cran.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3c3d9c6843..2ea2988ad5 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6249,14 +6249,14 @@ vice versa), or to deal with multiple declared missing values.")
 (define-public r-sjmisc
   (package
     (name "r-sjmisc")
-    (version "2.8.1")
+    (version "2.8.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sjmisc" version))
        (sha256
         (base32
-         "1a30n3cyd9h9ilaiai9ywy53f03nikafc47rvpws2c2vghc8mbn7"))))
+         "0rl0bmk91wc4dxdgy008fl0dwkx3ffvys30vgpnr78lb4pk45nb2"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-dplyr" ,r-dplyr)
@@ -6264,7 +6264,8 @@ vice versa), or to deal with multiple declared missing values.")
        ("r-magrittr" ,r-magrittr)
        ("r-purrr" ,r-purrr)
        ("r-rlang" ,r-rlang)
-       ("r-sjlabelled" ,r-sjlabelled)))
+       ("r-sjlabelled" ,r-sjlabelled)
+       ("r-tidyselect" ,r-tidyselect)))
     (home-page "https://github.com/strengejacke/sjmisc")
     (synopsis "Data and variable transformation functions")
     (description
-- 
cgit v1.2.3


From e7c8c68532d15d5c52c5b7a8b56d3fcb4db80b62 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:38 +0200
Subject: gnu: r-raster: Update to 3.0-7.

* gnu/packages/cran.scm (r-raster): Update to 3.0-7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2ea2988ad5..f2005a76de 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -7025,14 +7025,14 @@ used to teach mathematics, statistics, computation and modeling.")
 (define-public r-raster
   (package
     (name "r-raster")
-    (version "3.0-2")
+    (version "3.0-7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "raster" version))
        (sha256
         (base32
-         "0z4qh3ag1iyly4zjvzi3x2namkndkqn3cjb3ac22xd11sq5gdgiz"))))
+         "0faxv71hlxkblvbi3ps1vfzm3wwi0brwzmpsr5114bddcqyiqkvn"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-rcpp" ,r-rcpp)
-- 
cgit v1.2.3


From f889a1577c96f212931ed3c7b710a0b103b57c5b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:42 +0200
Subject: gnu: r-bayestestr: Update to 0.3.0.

* gnu/packages/cran.scm (r-bayestestr): Update to 0.3.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f2005a76de..eb3e9dc10f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8215,14 +8215,14 @@ differentiation.")
 (define-public r-bayestestr
   (package
     (name "r-bayestestr")
-    (version "0.2.5")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "bayestestR" version))
        (sha256
         (base32
-         "08d3bsb6li59n17bx1zrqnlnvniyb3vls9kl856km4chx3b2ff82"))))
+         "0r453zb106hj9w53jjgckxqajjf7shlrgv10gjxsv8if6qybdz5b"))))
     (properties `((upstream-name . "bayestestR")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 6b286750d92fe4700a3c26233f43e939d3db478c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:47 +0200
Subject: gnu: r-rcppannoy: Update to 0.0.13.

* gnu/packages/cran.scm (r-rcppannoy): Update to 0.0.13.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index eb3e9dc10f..9ea55627c0 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8916,14 +8916,14 @@ address a bug.")
 (define-public r-rcppannoy
   (package
     (name "r-rcppannoy")
-    (version "0.0.12")
+    (version "0.0.13")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RcppAnnoy" version))
        (sha256
         (base32
-         "1b0fmip9c4i0my1yjrvqy8jxfiiqcggq2kms135q0b53njxnqwwg"))))
+         "1jibp9b07c5ka1kif0nl7f168hxfvysj32wnmnxg85l663hmvm8j"))))
     (properties `((upstream-name . "RcppAnnoy")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 7c27558ad7495d4c7b2638bcd248499e69b411f6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:51 +0200
Subject: gnu: r-rcpphnsw: Update to 0.2.0.

* gnu/packages/cran.scm (r-rcpphnsw): Update to 0.2.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9ea55627c0..2926597dd0 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8943,14 +8943,14 @@ This package provides an R interface.")
 (define-public r-rcpphnsw
   (package
     (name "r-rcpphnsw")
-    (version "0.1.0")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RcppHNSW" version))
        (sha256
         (base32
-         "158a069n42pbnjrlmvqsr6bm2cfp9hxpnk3nhp3dwi9qjlq4r9bm"))))
+         "0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"))))
     (properties `((upstream-name . "RcppHNSW")))
     (build-system r-build-system)
     (propagated-inputs `(("r-rcpp" ,r-rcpp)))
-- 
cgit v1.2.3


From 194c68263ac9161c8df8a7a0e71094dfaedebc48 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:21:56 +0200
Subject: gnu: r-tidytree: Update to 0.2.8.

* gnu/packages/cran.scm (r-tidytree): Update to 0.2.8.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2926597dd0..512eb2c4f8 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9550,14 +9550,14 @@ maps.")
 (define-public r-tidytree
   (package
     (name "r-tidytree")
-    (version "0.2.7")
+    (version "0.2.8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tidytree" version))
        (sha256
         (base32
-         "15ky7hj7w08jx94wm0yikckca0apwv3jy5svd77dpzgb2lr9ff9a"))))
+         "1hkddl8kj1g01dy7xiracx81f6b405b3ga2qp4wlrl552b9xxpby"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-ape" ,r-ape)
-- 
cgit v1.2.3


From b9d9bc6665831e34637f6c6728f8bb60ab933aaf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:00 +0200
Subject: gnu: r-spdata: Update to 0.3.2.

* gnu/packages/cran.scm (r-spdata): Update to 0.3.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 512eb2c4f8..d741676270 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12772,14 +12772,14 @@ univariate class intervals for mapping or other graphics purposes.")
 (define-public r-spdata
   (package
     (name "r-spdata")
-    (version "0.3.0")
+    (version "0.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "spData" version))
        (sha256
         (base32
-         "162cqb331ki43jx4r8lpkjpn2l712figd896rnawg9j1jmjyl96y"))))
+         "190msrrpn226x27pcnck4ac34f9k4xcn26cyz2apdri2nzkr6zbw"))))
     (properties `((upstream-name . "spData")))
     (build-system r-build-system)
     (home-page "https://github.com/Nowosad/spData")
-- 
cgit v1.2.3


From bc9a839fea6e600767927c84ba39681e62b8dc7f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:04 +0200
Subject: gnu: r-sf: Update to 0.8-0.

* gnu/packages/cran.scm (r-sf): Update to 0.8-0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d741676270..f8cb1d1678 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12846,14 +12846,14 @@ tessellation.")
 (define-public r-sf
   (package
     (name "r-sf")
-    (version "0.7-7")
+    (version "0.8-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sf" version))
        (sha256
         (base32
-         "192hw52x1qlif8zyai1kff1wiyr3yl5f7jj1rk3k0nr8das0qy6i"))))
+         "05dyq0vcz2f1fl03hk3v1a4nz4s84yyqw4rc9w9cwfq71gvm9qwf"))))
     (build-system r-build-system)
     (inputs
      `(("gdal" ,gdal)
-- 
cgit v1.2.3


From 4978222ad727758da1dcc16d24bd7fe32b10b95b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:09 +0200
Subject: gnu: r-spdep: Update to 1.1-3.

* gnu/packages/cran.scm (r-spdep): Update to 1.1-3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f8cb1d1678..68102c6c34 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12880,14 +12880,14 @@ datum transformations.")
 (define-public r-spdep
   (package
     (name "r-spdep")
-    (version "1.1-2")
+    (version "1.1-3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "spdep" version))
        (sha256
         (base32
-         "06mk81kc1ml2wjc8wwwgr0wasjcr4mwrxpfa8vfc373bmnha635s"))))
+         "1f8cjffqqc6rnb3n4qym70ca6nz2kvrsd3g587wrqdr79nnbwnrk"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-boot" ,r-boot)
-- 
cgit v1.2.3


From cbe42da235c99f46fa5a006023b7bac94369360d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:14 +0200
Subject: gnu: r-optparse: Update to 1.6.4.

* gnu/packages/cran.scm (r-optparse): Update to 1.6.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 68102c6c34..25a646fb89 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13343,14 +13343,14 @@ authoring books and technical documents with R Markdown.")
 (define-public r-optparse
   (package
     (name "r-optparse")
-    (version "1.6.2")
+    (version "1.6.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "optparse" version))
        (sha256
         (base32
-         "0zrp6jakjhawrwfri270ym83vj5a7nvjk0w6b41z41ahw2da99dm"))))
+         "0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-getopt" ,r-getopt)))
-- 
cgit v1.2.3


From 4d86ea4aeac6ceb1ccac29106b803231346b9abd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:18 +0200
Subject: gnu: r-uwot: Update to 0.1.4.

* gnu/packages/cran.scm (r-uwot): Update to 0.1.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 25a646fb89..1a113e6735 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -14994,14 +14994,14 @@ in R, including a translation of the original algorithm into R.")
 (define-public r-uwot
   (package
     (name "r-uwot")
-    (version "0.1.3")
+    (version "0.1.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "uwot" version))
        (sha256
         (base32
-         "1mq6qi8q9xslh1b99srj480s2a08pfv4bs9m2ykyijj44j9fcdj9"))))
+         "1y9wpzs92d1fl2x5figfywd48lkyhwx37j542z0rf6ckrl46n89n"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-dqrng" ,r-dqrng)
-- 
cgit v1.2.3


From 446735de7d114e5bc67478a4b775eacf6058a8c1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:23 +0200
Subject: gnu: r-parameters: Update to 0.2.0.

* gnu/packages/cran.scm (r-parameters): Update to 0.2.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1a113e6735..0c62d6b1b5 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15502,14 +15502,14 @@ in pipelines.")
 (define-public r-parameters
   (package
     (name "r-parameters")
-    (version "0.1.0")
+    (version "0.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "parameters" version))
        (sha256
         (base32
-         "12v301va1l3xydicbf0k04anxlmyjclbbjfg0riprryhkxwwk8g5"))))
+         "1mgggb3l67wgjiccq4y84wbs2dw9qk01akd553yiwbwky9rpawgh"))))
     (properties `((upstream-name . "parameters")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From b1a112f41bbc0f4ffe58cc17d1eb9d7d614332ad Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:27 +0200
Subject: gnu: r-assertable: Update to 0.2.7.

* gnu/packages/cran.scm (r-assertable): Update to 0.2.7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0c62d6b1b5..3a9a605efe 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15614,14 +15614,14 @@ signalled with increasing levels of non-invasive verbosity.")
 (define-public r-assertable
   (package
     (name "r-assertable")
-    (version "0.2.6")
+    (version "0.2.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "assertable" version))
        (sha256
         (base32
-         "0jjd6ylh26fykzzv1q2lbajzfj07lyxwb3b3xmr2zdg2fp5b2w4c"))))
+         "1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-data-table" ,r-data-table)))
-- 
cgit v1.2.3


From 76e8d079a3cebbd726462efc94e96ea62f14d79f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:33 +0200
Subject: gnu: r-mgcv: Update to 1.8-29.

* gnu/packages/statistics.scm (r-mgcv): Update to 1.8-29.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 74eb466066..e965f822a0 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -612,14 +612,14 @@ nonlinear mixed-effects models.")
 (define-public r-mgcv
   (package
    (name "r-mgcv")
-   (version "1.8-28")
+   (version "1.8-29")
    (source
     (origin
      (method url-fetch)
      (uri (cran-uri "mgcv" version))
      (sha256
       (base32
-       "1snkpnkkigwrj9zm31j1nlivv9ls56imz263cv167hnmghiahpmm"))))
+       "1236gz25nap1aprbvcrqvmmnl6f8cvbjy8dcl4j968cpalqax5ww"))))
    (build-system r-build-system)
    (propagated-inputs
     `(("r-matrix" ,r-matrix)
-- 
cgit v1.2.3


From ebf0b430983495c4dda9bcd11fdf13af875e8123 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:37 +0200
Subject: gnu: r-digest: Update to 0.6.21.

* gnu/packages/statistics.scm (r-digest): Update to 0.6.21.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index e965f822a0..773cd3cad3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -805,13 +805,13 @@ effects of different types of color-blindness.")
 (define-public r-digest
   (package
     (name "r-digest")
-    (version "0.6.20")
+    (version "0.6.21")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "digest" version))
        (sha256
-        (base32 "1irhk2jaj9cg57cxprgyn1if06x121xwcxh1fzzn3148bl5lnrq5"))))
+        (base32 "0qycqchmv59fb6jp369d82mcx9xgbv70m18qzam0vrs8zkmajb17"))))
     (build-system r-build-system)
     ;; Vignettes require r-knitr, which requires r-digest, so we have to
     ;; disable them and the tests.
-- 
cgit v1.2.3


From b2449a31b35f8e1ca553c20ccfd4b89525341f29 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:41 +0200
Subject: gnu: r-knitr: Update to 1.25.

* gnu/packages/statistics.scm (r-knitr): Update to 1.25.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 773cd3cad3..6286536cdd 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1451,13 +1451,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.")
 (define-public r-knitr
   (package
     (name "r-knitr")
-    (version "1.24")
+    (version "1.25")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "knitr" version))
               (sha256
                (base32
-                "12bvs9fd61m7k7bq321qzrh2ccl9rq653s1anrvfb9s5ni1j0378"))))
+                "0lsc201a4f6xksmsklhr6gmhl0mxih0xhlcdvhs2ypzcx1pvkpnv"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-evaluate" ,r-evaluate)
-- 
cgit v1.2.3


From a2b40398e9b09d4246ee0dcc5ce713e872679544 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:45 +0200
Subject: gnu: r-microbenchmark: Update to 1.4-7.

* gnu/packages/statistics.scm (r-microbenchmark): Update to 1.4-7.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 6286536cdd..1ca263a922 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1503,13 +1503,13 @@ from knitr Rmarkdown.")
 (define-public r-microbenchmark
   (package
     (name "r-microbenchmark")
-    (version "1.4-6")
+    (version "1.4-7")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "microbenchmark" version))
               (sha256
                (base32
-                "1sn1fxgzakm5iqbgc35g3k4yi0iqrkmwz33cvdrphrzh1lxnmi3s"))))
+                "1xl4m4yl4h2zcjiz8wsa7f3sh55qg2xr3sgpvz18rlix6b3173r6"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/microbenchmark/")
     (synopsis "Accurate timing functions for R")
-- 
cgit v1.2.3


From 2b953e0153ae1b1b1b1828b5bbae2abdd02ac350 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:22:56 +0200
Subject: gnu: r-devtools: Update to 2.2.1.

* gnu/packages/statistics.scm (r-devtools): Update to 2.2.1.
[propagated-inputs]: Add r-rlang.
---
 gnu/packages/statistics.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1ca263a922..e4c5b59129 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2438,13 +2438,13 @@ informative error messages when it's not available.")
 (define-public r-devtools
   (package
     (name "r-devtools")
-    (version "2.2.0")
+    (version "2.2.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "devtools" version))
               (sha256
                (base32
-                "05fag25mkqy13yja8x32aqr9c0ah9rbm8cfjcsmy1dv5h4j8cxa1"))))
+                "0i2f549hxkn0j1x1avkhwy68c9r48v9284j7x9cak2q6dfsqz61f"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-callr" ,r-callr)
@@ -2463,8 +2463,9 @@ informative error messages when it's not available.")
        ("r-pkgbuild" ,r-pkgbuild)
        ("r-pkgload" ,r-pkgload)
        ("r-rcmdcheck" ,r-rcmdcheck)
-       ("r-roxygen2" ,r-roxygen2)
        ("r-remotes" ,r-remotes)
+       ("r-rlang" ,r-rlang)
+       ("r-roxygen2" ,r-roxygen2)
        ("r-rstudioapi" ,r-rstudioapi)
        ("r-rversions" ,r-rversions)
        ("r-sessioninfo" ,r-sessioninfo)
-- 
cgit v1.2.3


From 51997203fe63234d11354f2566899b0182dc2650 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:09 +0200
Subject: gnu: r-pkgconfig: Update to 2.0.3.

* gnu/packages/statistics.scm (r-pkgconfig): Update to 2.0.3.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index e4c5b59129..4110492aa5 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2781,13 +2781,13 @@ and draw tables.")
 (define-public r-pkgconfig
   (package
     (name "r-pkgconfig")
-    (version "2.0.2")
+    (version "2.0.3")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "pkgconfig" version))
               (sha256
                (base32
-                "1jk9ip549xphb3anfixqv1yx5kidnndqgy9v3qjpmgmds5a7g695"))))
+                "0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"))))
     (build-system r-build-system)
     (home-page "https://github.com/gaborcsardi/pkgconfig")
     (synopsis "Private configuration for R packages")
-- 
cgit v1.2.3


From a416d68049f1eee38bf255097b6b2454b01e074c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:13 +0200
Subject: gnu: r-lambda-r: Update to 1.2.4.

* gnu/packages/statistics.scm (r-lambda-r): Update to 1.2.4.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 4110492aa5..1029f78cac 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2948,13 +2948,13 @@ plotted and compared with the asymptotic curve.")
 (define-public r-lambda-r
   (package
     (name "r-lambda-r")
-    (version "1.2.3")
+    (version "1.2.4")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "lambda.r" version))
               (sha256
                (base32
-                "0cc6pszs6yccn0hgjpyn9gspv9aiva9d91ba0640i5m0l5xy7n0c"))))
+                "1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"))))
     (properties `((upstream-name . "lambda.r")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 7d8986c8580ec77f44f0377cf6b6501bf06ccde1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:17 +0200
Subject: gnu: r-dt: Update to 0.9.

* gnu/packages/statistics.scm (r-dt): Update to 0.9.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1029f78cac..e4a4817327 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -3175,13 +3175,13 @@ using the multicore functionality of the parallel package.")
 (define-public r-dt
   (package
     (name "r-dt")
-    (version "0.8")
+    (version "0.9")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "DT" version))
               (sha256
                (base32
-                "08cfmv3d5awvd9h8648bvidcg2ak5pvl2p6vqwqwy1l82ia506ch"))))
+                "17han4560jv8mmfn4f8adrwh0x25fxz2qwd0sv7vv4iky5and8a7"))))
     (properties
      `((upstream-name . "DT")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From d0983f294b808d81f34d2a37f450bee389527c08 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:22 +0200
Subject: gnu: r-iranges: Update to 2.18.3.

* gnu/packages/bioinformatics.scm (r-iranges): Update to 2.18.3.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3fffb9f2ed..ce94aa1851 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7378,13 +7378,13 @@ S4Vectors package itself.")
 (define-public r-iranges
   (package
     (name "r-iranges")
-    (version "2.18.2")
+    (version "2.18.3")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "IRanges" version))
               (sha256
                (base32
-                "0dc35844c1mfj07hvy6yn4wag6qdggbgl9gjcg3wpkh9hkm60a5n"))))
+                "05rw2b2bwns443n7d6lf97zdv1jbqdii2nprhs6x852w73m2a2g3"))))
     (properties
      `((upstream-name . "IRanges")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From 272cb5a23ff8cfd359206a3a54419fff228ae361 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:26 +0200
Subject: gnu: r-rsamtools: Update to 2.0.1.

* gnu/packages/bioinformatics.scm (r-rsamtools): Update to 2.0.1.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index ce94aa1851..935d080c0f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7742,13 +7742,13 @@ biological sequences or sets of sequences.")
 (define-public r-rsamtools
   (package
     (name "r-rsamtools")
-    (version "2.0.0")
+    (version "2.0.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "Rsamtools" version))
               (sha256
                (base32
-                "1nv5idyjk75mvl4np5sig0xa6qygm1ivj33k041ffyj19q8jf7ij"))))
+                "0wzp5vsmqs7h44r7lcw8fnz5x9bcdcfiqq8d3h62wwibyk2lg0w1"))))
     (properties
      `((upstream-name . "Rsamtools")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From 80004ec01304b20750d9cd1bc57880ed304e1351 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:29 +0200
Subject: gnu: r-rhtslib: Update to 1.16.2.

* gnu/packages/bioinformatics.scm (r-rhtslib): Update to 1.16.2.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 935d080c0f..ea73186c20 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -8294,14 +8294,14 @@ secondary structure and comparative analysis in R.")
 (define-public r-rhtslib
   (package
     (name "r-rhtslib")
-    (version "1.16.1")
+    (version "1.16.2")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "Rhtslib" version))
        (sha256
         (base32
-         "178zbrm221rwhbjk7j2v9g5ra44k0xg7c5abhd810m3g7snma8k8"))))
+         "07qaqj2hypmrg40m3pci082bzar6wi10dh77r4a8x74dfppcwdzf"))))
     (properties `((upstream-name . "Rhtslib")))
     (build-system r-build-system)
     ;; Without this a temporary directory ends up in the Rhtslib.so binary,
-- 
cgit v1.2.3


From b0a5be065e022e5f8a8937ffb780d8c4572fd249 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:39 +0200
Subject: gnu: r-mzr: Update to 2.18.1.

* gnu/packages/bioinformatics.scm (r-mzr): Update to 2.18.1.
---
 gnu/packages/bioinformatics.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index ea73186c20..a411650828 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9176,14 +9176,14 @@ proteomics packages.")
 (define-public r-mzr
   (package
     (name "r-mzr")
-    (version "2.18.0")
+    (version "2.18.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "mzR" version))
        (sha256
         (base32
-         "0g5r6yk4gyz0xdwlmrcij4zv7apdgsgygr043095l33hard6nsl5"))
+         "1pr1pcrg3r3pccm5ag6l8ic6rpqbk9jnlb9mm7g4ak5jwrajbzjq"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -9204,7 +9204,8 @@ proteomics packages.")
 -lboost_iostreams -lboost_thread -lboost_filesystem -lboost_chrono\n")))
              #t)))))
     (inputs
-     `(;; XXX Boost 1.69 will not work here.
+     `(;; Our default boost package won't work here, unfortunately, even with
+       ;; mzR version 2.18.1.
        ("boost" ,boost-for-mysql) ; use this instead of the bundled boost sources
        ("zlib" ,zlib)))
     (propagated-inputs
-- 
cgit v1.2.3


From e0c6c18371e4b7029724471cf43d1c95b69d1b81 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sat, 28 Sep 2019 12:23:44 +0200
Subject: gnu: r-gviz: Update to 1.28.3.

* gnu/packages/bioinformatics.scm (r-gviz): Update to 1.28.3.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a411650828..6d36bb73ba 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10279,14 +10279,14 @@ family of feature/genome hypotheses.")
 (define-public r-gviz
   (package
     (name "r-gviz")
-    (version "1.28.1")
+    (version "1.28.3")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "Gviz" version))
        (sha256
         (base32
-         "0chsb3ijwd8zh588s1vqgfassn2rzax5rhqrhl0ini6pi4ilchp2"))))
+         "0347r1ly0vzpilflzbyzsjdf4cday294lw3fxzx61clblrmws1ki"))))
     (properties `((upstream-name . "Gviz")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 1333eb585132c6cd0a48d87346c3359f488ff843 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sat, 28 Sep 2019 15:25:50 +0200
Subject: gnu: fc-host-tools: Update to 11.

* gnu/packages/embedded.scm (fc-host-tools): Update to 11.
[arguments]<:phases>[handle-tarbomb]: Delete phase.
[patch-installation-paths]: Modify.
---
 gnu/packages/embedded.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 106675b87b..8c906a9923 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1000,14 +1000,14 @@ SPI, I2C, JTAG.")
 (define-public fc-host-tools
   (package
     (name "fc-host-tools")
-    (version "10")
+    (version "11")
     (source (origin
               (method url-fetch)
               (uri (string-append "ftp://ftp.freecalypso.org/pub/GSM/"
                                   "FreeCalypso/fc-host-tools-r" version ".tar.bz2"))
               (sha256
                (base32
-                "0ybjqkz1cpnxni66p3valv1bva39vpwzdcc4040lqzx6py9h7h8b"))))
+                "0s87lp6gd8i8ivrdd7mnnalysr65035nambcm992rgla7sk76sj1"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; No tests exist.
@@ -1016,12 +1016,7 @@ SPI, I2C, JTAG.")
              (string-append "INCLUDE_INSTALL_DIR=" %output "include/rvinterf"))
        #:phases
        (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'unpack 'handle-tarbomb
-           (lambda _
-             (chdir "..") ; url-fetch/tarbomb doesn't work for some reason.
-             #t))
-         (add-after 'handle-tarbomb 'patch-installation-paths
+         (add-after 'unpack 'patch-installation-paths
            (lambda* (#:key outputs #:allow-other-keys)
              (substitute* '("Makefile"
                             "rvinterf/etmsync/fsiomain.c"
@@ -1038,9 +1033,12 @@ SPI, I2C, JTAG.")
                 (string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
                (("\\$\\{INSTALL_PREFIX\\}/loadtools")
                 (string-append (assoc-ref outputs "out") "/lib/freecalypso/loadtools"))
+               (("\\$\\{INSTALL_PREFIX\\}/target-bin")
+                (string-append (assoc-ref outputs "out") "/lib/freecalypso/target-bin"))
                (("/opt/freecalypso")
                 (assoc-ref outputs "out")))
-             #t)))))
+             #t))
+         (delete 'configure))))
     (inputs
      `(("libx11" ,libx11)))
     (synopsis "Freecalypso host tools")
-- 
cgit v1.2.3


From 2eefe1d887c7dc34279aaee81f29c672da6662db Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Sat, 28 Sep 2019 15:39:24 +0200
Subject: gnu: fc-host-tools: Improve description.

* gnu/packages/embedded.scm (fc-host-tools)[description]: Improve description.
---
 gnu/packages/embedded.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 8c906a9923..ab2174a273 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1042,7 +1042,7 @@ SPI, I2C, JTAG.")
     (inputs
      `(("libx11" ,libx11)))
     (synopsis "Freecalypso host tools")
-    (description "This package provides some tools for debugging Freecalypso phones.
+    (description "This package provides some tools for debugging FreeCalypso phones and the FreeCalypso FCDEV3B dev board.
 
 @enumerate
 @item fc-e1decode: Decodes a binary Melody E1 file into an ASCII source file.
@@ -1117,10 +1117,10 @@ feeding melodies to be played to it.
 that can be issued through the RVTMUX (debug trace) serial channel.
 This program is our test mode shell for sending Test Mode commands to targets
 and displaying decoded target responses.
-@item fcup-smsend Send a short message via SMS
-@item fcup-smsendmult Send multiple short messages via SMS in one go
-@item fcup-smsendpdu Send multiple short messages given in PDU format via SMS
-@item sms-pdu-decode Decode PDU format messages
+@item fcup-smsend: Send a short message via SMS
+@item fcup-smsendmult: Send multiple short messages via SMS in one go
+@item fcup-smsendpdu: Send multiple short messages given in PDU format via SMS
+@item sms-pdu-decode: Decode PDU format messages
 @end enumerate")
     (home-page "https://www.freecalypso.org/")
     (license license:public-domain)))
-- 
cgit v1.2.3


From 803f05841e566c80052520b0668ba8af05f96583 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 14:40:27 +0200
Subject: gnu: urlscan: Update to 0.9.4.

* gnu/packages/mail.scm (urlscan): Update to 0.9.4.
---
 gnu/packages/mail.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 3d5417bfb5..9f0742d736 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2887,14 +2887,13 @@ servers.  The 4rev1 and 4 versions of IMAP are supported.")
 (define-public urlscan
   (package
     (name "urlscan")
-    (version "0.9.2")
+    (version "0.9.4")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "urlscan" version))
         (sha256
-         (base32
-          "1zldck7vnp7z04aacbx3cprf5kzha4gfhjmss4iv2lh5nccxjfzx"))))
+         (base32 "1q0vxv9haap01vz1cbkzss62cgwb9365lv5vnkg2gbpx4g5y7a9l"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-urwid" ,python-urwid)))
-- 
cgit v1.2.3


From 4c6d15cfb94698e2a642a0184276e19a24422734 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 15:26:01 +0200
Subject: gnu: libgnome-games-support: Update to 1.4.4.

* gnu/packages/gnome.scm (libgnome-games-support): Update to 1.4.4.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index baebeec1c6..dd97df225a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3682,7 +3682,7 @@ queries upon that data.")
 (define-public libgnome-games-support
   (package
     (name "libgnome-games-support")
-    (version "1.4.1")
+    (version "1.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -3690,7 +3690,7 @@ queries upon that data.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1"))))
+                "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From 2d8dca9d36295eb0eb06f3ea2808464e6841a703 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 15:26:10 +0200
Subject: gnu: libgnome-games-support: Don't use NAME in source URI.

* gnu/packages/gnome.scm (libgnome-games-support)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index dd97df225a..a88b4d019d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3685,9 +3685,9 @@ queries upon that data.")
     (version "1.4.4")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/libgnome-games-support/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "libgnome-games-support-" version ".tar.xz"))
               (sha256
                (base32
                 "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq"))))
-- 
cgit v1.2.3


From 737e32a4673f37fa3a66f038f8d22ff41706e440 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 15:26:30 +0200
Subject: gnu: libmanette: Update to 0.2.3.

* gnu/packages/games.scm (libmanette): Update to 0.2.3.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c5ab05ed60..42da7e689a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6126,7 +6126,7 @@ when packaged in Blorb container files or optionally from individual files.")
 (define-public libmanette
   (package
     (name "libmanette")
-    (version "0.2.2")
+    (version "0.2.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libmanette/"
@@ -6134,7 +6134,7 @@ when packaged in Blorb container files or optionally from individual files.")
                                   "libmanette-" version ".tar.xz"))
               (sha256
                (base32
-                "1lpprk2qz1lsqf9xj6kj2ciyc1zmjhj5lwd584qkh7jgz2x9y6wb"))))
+                "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60"))))
     (build-system meson-build-system)
     (native-inputs
      `(("glib" ,glib "bin")             ; for glib-compile-resources
-- 
cgit v1.2.3


From f4a1de00629a8a64f974656e31f831517aeff129 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 15:51:56 +0200
Subject: gnu: recode: Update to 3.7.6.

* gnu/packages/textutils.scm (recode): Update to 3.7.6.
[source]: Remove snippet.
---
 gnu/packages/textutils.scm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 9ce01e66ea..79cf172179 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -89,18 +89,14 @@ to DOS format and vice versa.")
 (define-public recode
   (package
     (name "recode")
-    (version "3.7.5")
+    (version "3.7.6")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/rrthomas/recode/releases/"
                            "download/v" version "/recode-" version ".tar.gz"))
        (sha256
-        (base32 "1sl99dfx2b76paq86wv3a0lcy66f1hylf6iy04rzwxj7ccwpsk30"))
-       (modules '((guix build utils)))
-       (snippet '(begin
-                   (delete-file "tests/Recode.c")
-                   #t))))
+        (base32 "0m59sd1ca0zw1aydpc3m8sw03nc885knmccqryg7byzmqs585ia6"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("python" ,python)
-- 
cgit v1.2.3


From 348d8e446fbc8f5c9a51a081047de72d735a2a8a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 16:47:29 +0200
Subject: doc: Don't support a risky mix of Guix & Nix.

* doc/guix.texi (Requirements): Remove instructions for sharing a store
and/or a daemon with Nix.
---
 doc/guix.texi | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 14c4514b31..0d3bb19325 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -794,22 +794,6 @@ GNU Coding Standards}).  The @command{configure} script protects against
 unintended misconfiguration of @var{localstatedir} so you do not
 inadvertently corrupt your store (@pxref{The Store}).
 
-@cindex Nix, compatibility
-When a working installation of @url{https://nixos.org/nix/, the Nix package
-manager} is available, you
-can instead configure Guix with @code{--disable-daemon}.  In that case,
-Nix replaces the three dependencies above.
-
-Guix is compatible with Nix, so it is possible to share the same store
-between both.  To do so, you must pass @command{configure} not only the
-same @code{--with-store-dir} value, but also the same
-@code{--localstatedir} value.  The latter is essential because it
-specifies where the database that stores metadata about the store is
-located, among other things.  The default values for Nix are
-@code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}.
-Note that @code{--disable-daemon} is not required if
-your goal is to share the store with Nix.
-
 @node Running the Test Suite
 @section Running the Test Suite
 
-- 
cgit v1.2.3


From f99bc1af54816ebcec1efc3be6b104e010840f50 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 17:15:20 +0200
Subject: gnu: gthumb: Update to 3.8.1.

* gnu/packages/gnome.scm (gthumb): Update to 3.8.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a88b4d019d..cda5dfcdd3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8172,7 +8172,7 @@ functionality.")
 (define-public gthumb
   (package
     (name "gthumb")
-    (version "3.8.0")
+    (version "3.8.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gthumb/"
@@ -8180,7 +8180,7 @@ functionality.")
                                   "gthumb-" version ".tar.xz"))
               (sha256
                (base32
-                "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f"))))
+                "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
-- 
cgit v1.2.3


From 7b6eabc709cd26a4c29e856797cf2e5378ea5791 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 29 Aug 2019 15:03:57 +0200
Subject: gnu: gpxsee: Update to 7.12.

* gnu/packages/gps.scm (gpxsee): Update to 7.12.
---
 gnu/packages/gps.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 9ede82d09e..a0cab4fc62 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015 Ludovic Courtès 
 ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner 
-;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Mathieu Othacehe 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -175,7 +175,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
 (define-public gpxsee
   (package
     (name "gpxsee")
-    (version "7.8")
+    (version "7.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -184,7 +184,7 @@ coordinates as well as partial support for adjustments in global coordinate syst
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ymqz4wrl9ghkyyqi2vrnlyvz3fc84s3p8a1dkiqlvyvj360ck9j"))))
+                "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From a8f69a2e9a5baba9930cd2a45d146b1f26cae5f2 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 28 Sep 2019 19:29:32 +0200
Subject: gnu: emacs-org-download: Update to 0.1.0-2.10c9d7c.

* gnu/packages/emacs-xyz.scm (emacs-org-download): Update to 0.1.0-2.10c9d7c.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 76b3e2e8ff..3ecd1b71b0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17610,12 +17610,11 @@ and searching through @code{Ctags} files.")
     (license license:gpl3+)))
 
 (define-public emacs-org-download
-  (let ((commit "ac72bf8fce3e855da60687027b6b8601cf1de480")
-        (version "0.1.0")
-        (revision "1"))
+  (let ((commit "10c9d7c8eed928c88a896310c882e3af4d8d0f61")
+        (revision "2"))
     (package
       (name "emacs-org-download")
-      (version (git-version version revision commit))
+      (version (git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -17623,7 +17622,7 @@ and searching through @code{Ctags} files.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0ax5wd44765wnwabkam1g2r62gq8crx2qq733s2mg1z72cfvwxqb"))
+                  "0i8wlx1i7y1vn5lqwjifvymvszg28a07vwqcm4jslf1v2ajs1lsl"))
                 (file-name (git-file-name name version))))
       (build-system emacs-build-system)
       (propagated-inputs
-- 
cgit v1.2.3


From 723fb01c62e2ce0d06d618cf6b5db8e1d0c3aabd Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 28 Sep 2019 19:34:38 +0200
Subject: gnu: emacs-dockerfile-mode: Update to 1.2-2.ed73e82.

* gnu/packages/emacs-xyz.scm (emacs-dockerfile-mode): Update to 1.2-2.ed73e82.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3ecd1b71b0..2852941bfc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16724,10 +16724,10 @@ constant expressions.")
 
 (define-public emacs-dockerfile-mode
   ;; Latest upstream release is too old.
-  (let ((commit "7223d92718f78fa3ab15667cdb2ed90cfeb579e7"))
+  (let ((commit "ed73e82dcc636dad00d1a8c3b32a49136d25ee60"))
     (package
       (name "emacs-dockerfile-mode")
-      (version (git-version "1.2" "1" commit))
+      (version (git-version "1.2" "2" commit))
       (source
        (origin
          (method git-fetch)
@@ -16737,7 +16737,7 @@ constant expressions.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0hmipgl4rk6aih11i8mnspwdijjiwk2y0wns6lzs8bgkvy3c064r"))))
+           "0lri2rnx4lr23vqfphkpq39cd4xfgzkvz1xsz7ccdvl4qj0k7fdl"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-s" ,emacs-s)))
-- 
cgit v1.2.3


From beec3e3c7e561fd3bd9382f3d499ac7dc10b0c4b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 28 Sep 2019 19:37:05 +0200
Subject: gnu: emacs-docker: Update to 1.3.0.

* gnu/packages/emacs-xyz.scm (emacs-docker): Update to 1.3.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2852941bfc..6962af017b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16693,7 +16693,7 @@ constant expressions.")
 (define-public emacs-docker
   (package
     (name "emacs-docker")
-    (version "1.2.0")
+    (version "1.3.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -16702,7 +16702,7 @@ constant expressions.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "15kd86kaq1x6giz855q9w6zvnyc742j309j0pmm86rwx398g4rq1"))))
+                "1g8r1faqp0z0vqp9qrl8m84pa0v2ddvc91klphdkfmldwv7rfipw"))))
     (inputs
      `(("emacs-undercover" ,emacs-undercover)))
     (propagated-inputs
-- 
cgit v1.2.3


From 7dd9f6e7cf8e893b75faa1253a451609f7fcc5fc Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov 
Date: Sat, 28 Sep 2019 23:08:52 +0300
Subject: gnu: emacs-mbsync: Update to 0.1.2-2.8f80c26.

* gnu/packages/emacs-xyz.scm (emacs-mbsync): Update to 0.1.2-2.8f80c26.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6962af017b..e9c2185052 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12555,7 +12555,7 @@ key again.")
     (license license:gpl3+)))
 
 (define-public emacs-mbsync
-  (let ((commit "f549eccde6033449d24cd5b6148599484850c403")
+  (let ((commit "8f80c267cab1acb0d5bdd5b0059f5d1790d499ff")
         (revision "2"))
     (package
       (name "emacs-mbsync")
@@ -12569,7 +12569,7 @@ key again.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1pdj41rq3pq4jdb5pma5j495xj7w7jgn8pnz1z1zwg75pn7ydfp0"))))
+           "1dwlpcczsa6b7bwv5149by0qmk8v2y7bjad02k4fy25yxznqzci9"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/dimitri/mbsync-el")
       (synopsis "Interface to mbsync for Emacs")
-- 
cgit v1.2.3


From 1c2fb2a3e7b844d7d858eb016e9613d1e22cc59a Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov 
Date: Sat, 28 Sep 2019 23:11:28 +0300
Subject: gnu: emacs-mbsync: Update to 0.1.2-3.8f80c26.

This commit follows 7dd9f6e7cf8e893b75faa1253a451609f7fcc5fc.

* gnu/packages/emacs-xyz.scm (emacs-mbsync): Update to 0.1.2-3.8f80c26.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e9c2185052..0cbb8e3be3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12556,7 +12556,7 @@ key again.")
 
 (define-public emacs-mbsync
   (let ((commit "8f80c267cab1acb0d5bdd5b0059f5d1790d499ff")
-        (revision "2"))
+        (revision "3"))
     (package
       (name "emacs-mbsync")
       (version (git-version "0.1.2" revision commit))
-- 
cgit v1.2.3


From 44941fd7dbc77a7bf84a9be63a309eca3ffdc1c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 28 Sep 2019 17:20:51 +0200
Subject: gnu: libssh: Update to 0.9.0.

* gnu/packages/ssh.scm (libssh): Update to 0.9.0.  Of particular
interest for robust offloading is libssh commit
e4e51ccc1340e313c203842d0180a1c4e33c95cc, which fixes a bug whereby,
instead of honoring the per-session timeout, 'ssh_channel_read_timeout'
would end up passing an infinite timeout to 'poll':
see 
---
 gnu/packages/ssh.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 010ed40707..f7eee359ac 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -70,7 +70,7 @@
 (define-public libssh
   (package
     (name "libssh")
-    (version "0.8.7")
+    (version "0.9.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -78,7 +78,7 @@
                      (commit (string-append "libssh-" version))))
               (sha256
                (base32
-                "1iqik1ba0g008k1mb1n85iih1azi7giy0c485jnlmsrjxik4q3j2"))
+                "0hxws8vl56cbjwchmj0x78ywv2b8spv6h90sgma1vj1y9dybgs7s"))
               (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (outputs '("out" "debug"))
-- 
cgit v1.2.3


From a3af06ad65eb097ddaa9a6fab893e2b688734e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 28 Sep 2019 17:22:39 +0200
Subject: offload: Include the port number in the machine lock file name.

This is useful when a single machine appears several time, with
different port numbers.

* guix/scripts/offload.scm (machine-slot-file): Add MACHINE's port to
the file name.
---
 guix/scripts/offload.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index 0c0dd9d516..bb307cefd1 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -243,7 +243,8 @@ instead of '~a' of type '~a'~%")
   ;; of these; if we fail, that means all the build slots are already taken.
   ;; Inspired by Nix's build-remote.pl.
   (string-append  (string-append %state-directory "/offload/"
-                                 (build-machine-name machine)
+                                 (build-machine-name machine) ":"
+                                 (number->string (build-machine-port machine))
                                  "/" (number->string slot))))
 
 (define (acquire-build-slot machine)
-- 
cgit v1.2.3


From ada9a19a2dca74feafcf24df1152abd685d4142f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 28 Sep 2019 18:06:15 +0200
Subject: daemon: Strictly respect timeouts for 'guix offload'.

Until now it was up to 'guix offload' to honor timeouts.  Unfortunately
it would sometimes fail to do that, for example due to the libssh bug at
.  With this change, 'guix offload' is
automatically killed by the daemon when one of the timeouts expires.

Thus, data transfers performed by 'guix offload' now count as part of
the timeouts, rather than just actual build time.

* nix/libstore/build.cc (DerivationGoal::tryBuildHook): Pass true as the
'respectTimeouts' argument to 'childStarted'.
---
 nix/libstore/build.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index ad53b81413..74cd05417f 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -1648,7 +1648,7 @@ HookReply DerivationGoal::tryBuildHook()
     set fds;
     fds.insert(hook->fromHook.readSide);
     fds.insert(hook->builderOut.readSide);
-    worker.childStarted(shared_from_this(), hook->pid, fds, false, false);
+    worker.childStarted(shared_from_this(), hook->pid, fds, false, true);
 
     if (settings.printBuildTrace)
         printMsg(lvlError, format("@ build-started %1% - %2% %3% %4%")
-- 
cgit v1.2.3


From 569832dfafbf3f31bcc2ed4545d88a0634205df1 Mon Sep 17 00:00:00 2001
From: Pierre Langlois 
Date: Fri, 27 Sep 2019 09:43:43 +0100
Subject: gnu: gpodder: Update to 3.10.10.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/gpodder.scm (gpodder): Update to 3.10.10.
[inputs]: Add youtube-dl.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/gpodder.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index 7c9994f128..f896ddae35 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -31,12 +31,13 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages qt))
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages video))
 
 (define-public gpodder
   (package
     (name "gpodder")
-    (version "3.10.9")
+    (version "3.10.10")
     (source
      (origin
        (method git-fetch)
@@ -45,7 +46,7 @@
              (commit version)))
        (sha256
         (base32
-         "1sdmr1sq1d4p492zp9kq3npl7p56yr0pr470z9r6xxcylax5mhfq"))
+         "1phgd3xly6ddrxpx5glgfs1ya4xq2qbcx5d9l3d6i4dlhji1dmja"))
        (file-name (git-file-name name version))))
     (build-system python-build-system)
     (native-inputs
@@ -58,6 +59,7 @@
        ("python-html5lib" ,python-html5lib)
        ("python-mygpoclient" ,python-mygpoclient)
        ("python-podcastparser" ,python-podcastparser)
+       ("youtube-dl" ,youtube-dl)
        ("xdg-utils" ,xdg-utils)))
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From de3896fb79984d545e7fec0b5e4f1ba37983fbce Mon Sep 17 00:00:00 2001
From: Brice Waegeneire 
Date: Thu, 26 Sep 2019 23:44:30 +0200
Subject: gnu: Add ell.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/linux.scm (ell): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/linux.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 027c920357..876eb005af 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2019 Maxim Cournoyer 
 ;;; Copyright © 2019 Stefan Stefanović 
 ;;; Copyright © 2019 Pierre Langlois 
+;;; Copyright © 2019 Brice Waegeneire 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5969,3 +5970,43 @@ have to construct the archives directly, without using the archiver.")
     (description "inputattach dispatches input events from several device
 types and interfaces and translates so that the X server can use them.")
     (license license:gpl2+)))
+
+(define-public ell
+  (package
+    (name "ell")
+    (version "0.23")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.kernel.org/pub/scm/libs/ell/ell.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1qhlcwhn0gj877yss2ymx1aczghlddzb5v9mm1dgp2zliii3jy10"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-dbus-tests
+           (lambda _
+             (substitute* '("unit/test-dbus-message-fds.c"
+                            "unit/test-dbus-properties.c"
+                            "unit/test-dbus.c")
+               (("/usr/bin/dbus-daemon") (which "dbus-daemon")))
+             #t)))))
+    (inputs
+     `(("dbus" ,dbus)
+       ("libtool" ,libtool)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("pkgconfig" ,pkg-config)
+       ("automake" ,automake)))
+    (home-page "https://01.org/ell")
+    (synopsis "Embedded Linux Library")
+    (description "The Embedded Linux* Library (ELL) provides core, low-level
+functionality for system daemons.  It typically has no dependencies other than
+the Linux kernel, C standard library, and libdl (for dynamic linking).  While
+ELL is designed to be efficient and compact enough for use on embedded Linux
+platforms, it is not limited to resource-constrained systems.")
+    (license license:lgpl2.1+)))
-- 
cgit v1.2.3


From 135b573e83f82ca0bebafd2a1acf772e977c222a Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 29 Sep 2019 01:56:26 +0200
Subject: gnu: emacs-helm-company: Enable test.

* gnu/packages/emacs-xyz.scm (emacs-helm-company): Enable test.
---
 gnu/packages/emacs-xyz.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0cbb8e3be3..fa0b5bf8d6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14591,6 +14591,11 @@ on-line service.")
     (propagated-inputs
      `(("emacs-helm" ,emacs-helm)
        ("emacs-company" ,emacs-company)))
+    (native-inputs
+     `(("emacs-ert-runner" ,emacs-ert-runner)))
+    (arguments
+     `(#:tests? #t
+       #:test-command '("ert-runner")))
     (home-page "https://github.com/Sodel-the-Vociferous/helm-company")
     (synopsis "Helm interface for company-mode")
     (description
-- 
cgit v1.2.3


From 0263366f75802b9d5794d88929ba2a4c27ac6809 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 29 Sep 2019 01:59:22 +0200
Subject: gnu: emacs-hydra: Enable test.

* gnu/packages/emacs-xyz.scm (emacs-hydra): Enable test.
---
 gnu/packages/emacs-xyz.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index fa0b5bf8d6..74568ab7f1 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -5086,6 +5086,9 @@ fully-functional one.")
         (base32
          "0fapvhmhgc9kppf3bvkgry0cd7gyilg7sfvlscfrfjxpx4xvwsfy"))))
     (build-system emacs-build-system)
+    (arguments
+     `(#:tests? #t
+       #:test-command '("make" "test")))
     (home-page "https://github.com/abo-abo/hydra")
     (synopsis "Make Emacs bindings that stick around")
     (description
-- 
cgit v1.2.3


From 52e62bbd76b06d754f409c0f277b80e6208fe152 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 29 Sep 2019 02:09:54 +0200
Subject: gnu: emacs-prescient: Update to 3.3.

* gnu/packages/emacs-xyz.scm (emacs-prescient): Update to 3.3.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 74568ab7f1..e576f18f94 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4740,7 +4740,7 @@ them easier to distinguish from other, less important buffers.")
 (define-public emacs-prescient
   (package
     (name "emacs-prescient")
-    (version "3.2")
+    (version "3.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4749,7 +4749,7 @@ them easier to distinguish from other, less important buffers.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks"))))
+                "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-company" ,emacs-company)
-- 
cgit v1.2.3


From e038bafe3b86a8b927628d26375d5ffe75119fd9 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 29 Sep 2019 03:09:36 +0200
Subject: gnu: emacs-tablist: Update to 1.0.

* gnu/packages/emacs-xyz.scm (emacs-tablist): Update to 1.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e576f18f94..49cb8bf3fc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1856,7 +1856,7 @@ single buffer.")
 (define-public emacs-tablist
   (package
     (name "emacs-tablist")
-    (version "0.70")
+    (version "1.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1865,7 +1865,7 @@ single buffer.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns"))))
+                "0pzsdg0rm59daw34ppss79cg05z9wnr8nkmdcc48nkd0p69ip2yy"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/politza/tablist")
     (synopsis "Extension for @code{tabulated-list-mode}")
-- 
cgit v1.2.3


From 5510bb01e925e46629de7bf7f04f28eda22a27f4 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Sat, 28 Sep 2019 00:11:28 +0900
Subject: doc: Add a 'Upgrading Guix' section to the 'Installation' chapter.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This follows a discussion regarding issue #36785 (see:
https://bugs.gnu.org/36785).

* doc/guix.texi (Upgrading Guix): New section.

Co-authored-by: Ludovic Courtès 
---
 doc/guix.texi | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 0d3bb19325..a6c1319405 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -513,6 +513,7 @@ ready to use it.
 * Setting Up the Daemon::       Preparing the build daemon's environment.
 * Invoking guix-daemon::        Running the build daemon.
 * Application Setup::           Application-specific setup.
+* Upgrading Guix::              Upgrading Guix and its build daemon.
 @end menu
 
 @node Binary Installation
@@ -1761,6 +1762,40 @@ invoke the actual linker with this new set of arguments.  You can instruct the
 wrapper to refuse to link against libraries not in the store by setting the
 @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}.
 
+@node Upgrading Guix
+@section Upgrading Guix
+
+@cindex Upgrading Guix, on a foreign distro
+
+To upgrade Guix, run:
+
+@example
+guix pull
+@end example
+
+@xref{Invoking guix pull}, for more information.
+
+@cindex upgrading Guix for the root user, on a foreign distro
+@cindex upgrading the Guix daemon, on a foreign distro
+@cindex @command{guix pull} for the root user, on a foreign distro
+
+On a foreign distro, you can upgrade the build daemon by running:
+
+@example
+sudo -i guix pull
+@end example
+
+@noindent
+followed by (assuming your distro uses the systemd service management
+tool):
+
+@example
+systemctl restart guix-daemon.service
+@end example
+
+On Guix System, upgrading the daemon is achieved by reconfiguring the
+system (@pxref{Invoking guix system, @code{guix system reconfigure}}).
+
 @c TODO What else?
 
 @c *********************************************************************
-- 
cgit v1.2.3


From 9b983086345557ac0a6a40c8cb3a2afd5250d3ee Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Sun, 29 Sep 2019 10:36:00 +0200
Subject: gnu: sbcl: Update to 1.5.7.

* gnu/packages/lisp.scm (sbcl): Update to 1.5.7.
---
 gnu/packages/lisp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 6c373ce6e2..ba009bb7a6 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -327,14 +327,14 @@ an interpreter, a compiler, a debugger, and much more.")
 (define-public sbcl
   (package
     (name "sbcl")
-    (version "1.5.6")
+    (version "1.5.7")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
                            version "-source.tar.bz2"))
        (sha256
-        (base32 "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a"))
+        (base32 "11cl839512898shxcgjmnn1178pwc8vcfaypmzxm1wzkwasjyx2l"))
        (modules '((guix build utils)))
        (snippet
         ;; Add sbcl-bundle-systems to 'default-system-source-registry'.
-- 
cgit v1.2.3


From a7997033fa5635ae83d5671b6bb4c80bc3289c18 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 29 Sep 2019 14:44:06 +0300
Subject: gnu: screenfetch: Update to 3.8.0-2.e7b94fc.

* gnu/packages/admin.scm (screenfetch): Update to 3.8.0-2.e7b94fc.
---
 gnu/packages/admin.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 6d5e4b9fcc..bef6dac07c 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2852,11 +2852,10 @@ you are running, what theme or icon set you are using, etc.")
     (license license:expat)))
 
 (define-public screenfetch
-  ;; First commit supporting current Guix System.
-  (let ((commit "e3ec82dd464e81e4d10bef218b3016e3044c766c"))
+  (let ((commit "e7b94fc3c529b9b97f32b71fd4bc05fb1d0f5864"))
     (package
       (name "screenfetch")
-      (version (git-version "3.8.0" "1" commit))
+      (version (git-version "3.8.0" "2" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -2865,7 +2864,7 @@ you are running, what theme or icon set you are using, etc.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1lzs1l5xgj9mn4b59lhkfgqnyiivf8svd1iwjabzrax90rdmxfwj"))))
+                  "13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg"))))
       (build-system trivial-build-system)
       (arguments
        `(#:modules ((guix build utils))
-- 
cgit v1.2.3


From e17f1c3dcccca583bc0b2d358c277d6988c51d90 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Sun, 29 Sep 2019 13:53:00 +0200
Subject: gnu: xfce4-pulseaudio-plugin: Adjust for GCC7 search path change.

* gnu/packages/xfce.scm (xfce4-pulseaudio-plugin)[arguments]: Gracefully
handle a missing C_INCLUDE_PATH.
---
 gnu/packages/xfce.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c71285c7bd..1d8ba659b3 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -434,7 +434,7 @@ matching them against regular expressions.")
                                     "/include/dbus-1.0" ":"
                                     (assoc-ref inputs "dbus")
                                     "/include/dbus-1.0" ":"
-                                    (getenv "C_INCLUDE_PATH")))
+                                    (or (getenv "C_INCLUDE_PATH") "")))
              #t)))))
     (native-inputs
      `(("intltool" ,intltool)
-- 
cgit v1.2.3


From 512c1696665fba8e6ba189dd9dc2a192cc08a1df Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Sun, 29 Sep 2019 15:25:13 +0200
Subject: gnu: mame: Update to 0.214.

* gnu/packages/emulators.scm (mame): Update to 0.214.
[source]: Remove unnecessary patch.
* gnu/packages/patches/mame-rapidjson-fix.patch: Delete file.
* gnu/local.mk: Remove reference to deleted patch.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/emulators.scm                    |  8 ++----
 gnu/packages/patches/mame-rapidjson-fix.patch | 37 ---------------------------
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 gnu/packages/patches/mame-rapidjson-fix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b04a5d796e..d3e1dbc0ba 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1091,7 +1091,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/lxsession-use-gapplication.patch         \
   %D%/packages/patches/make-glibc-compat.patch			\
   %D%/packages/patches/make-impure-dirs.patch			\
-  %D%/packages/patches/mame-rapidjson-fix.patch			\
   %D%/packages/patches/mariadb-client-test-32bit.patch		\
   %D%/packages/patches/mars-install.patch			\
   %D%/packages/patches/mars-sfml-2.3.patch			\
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index c6eda97473..38468cfc8d 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1189,7 +1189,7 @@ play them on systems for which they were never designed!")
 (define-public mame
   (package
     (name "mame")
-    (version "0.212")
+    (version "0.214")
     (source
      (origin
        (method git-fetch)
@@ -1199,11 +1199,7 @@ play them on systems for which they were never designed!")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0p3zcb9l624dsy2gyv23ppp1k1iwd1vrg8cbn5v4fx1s44mx7f5c"))
-       (patches
-       ;; FIXME: Remove once 0.213 is out.  Applied upstream as
-       ;; 0b5b13cf1e28550b49c387dec93f9801f029e313.
-        (search-patches "mame-rapidjson-fix.patch"))
+         "129yk3ybcviscy2xk1mkkzxm4h4nh5p6ndfgqbmcx547p1s6hbja"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove bundled libraries.
diff --git a/gnu/packages/patches/mame-rapidjson-fix.patch b/gnu/packages/patches/mame-rapidjson-fix.patch
deleted file mode 100644
index 70cf8458ea..0000000000
--- a/gnu/packages/patches/mame-rapidjson-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0b5b13cf1e28550b49c387dec93f9801f029e313 Mon Sep 17 00:00:00 2001
-From: Julian Sikorski 
-Date: Mon, 5 Aug 2019 21:16:54 +0200
-Subject: [PATCH] Fix building using system rapidjson
-
----
- scripts/target/mame/arcade.lua | 1 +
- src/mame/video/midtunit.cpp    | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
-index 964daa3572f..ef30ae3c2c2 100644
---- a/scripts/target/mame/arcade.lua
-+++ b/scripts/target/mame/arcade.lua
-@@ -930,6 +930,7 @@ function createMAMEProjects(_target, _subtarget, _name)
- 		ext_includedir("flac"),
- 		ext_includedir("glm"),
- 		ext_includedir("jpeg"),
-+		ext_includedir("rapidjson"),
- 	}
- 
- end
-diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp
-index b4cb98abacf..b307f3f722b 100644
---- a/src/mame/video/midtunit.cpp
-+++ b/src/mame/video/midtunit.cpp
-@@ -20,8 +20,8 @@
- #include "emuopts.h" // Used by PNG logging
- #include "png.h" // Used by PNG logging
- 
--#include "rapidjson/include/rapidjson/prettywriter.h" // Used by JSON logging
--#include "rapidjson/include/rapidjson/stringbuffer.h" // Used by JSON logging
-+#include  // Used by JSON logging
-+#include  // Used by JSON logging
- 
- DEFINE_DEVICE_TYPE(MIDTUNIT_VIDEO, midtunit_video_device, "tunitvid", "Midway T-Unit Video")
- DEFINE_DEVICE_TYPE(MIDWUNIT_VIDEO, midwunit_video_device, "wunitvid", "Midway W-Unit Video")
-- 
cgit v1.2.3


From 43124a54744b64dcdbdd8f92d2a037bf8e0dd215 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sun, 29 Sep 2019 13:08:01 +0200
Subject: gnu: gcc: Fix i686-linux cross compiler.

This resurrects

    ./pre-inst-env guix build --target=i686-unknown-linux-gnu hello

* gnu/packages/cross-base.scm (cross-gcc-arguments): Do not build libmpx;
does not cross-configure.
---
 gnu/packages/cross-base.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 7108000f06..76d15f4c59 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -144,6 +144,7 @@ base compiler and using LIBC (which may be either a libc package or #f.)"
                                "--disable-libatomic"
                                "--disable-libmudflap"
                                "--disable-libgomp"
+                               "--disable-libmpx"
                                "--disable-libssp"
                                "--disable-libquadmath"
                                "--disable-decimal-float" ;would need libc
-- 
cgit v1.2.3


From 4ecf790e70dd22c204edad269cb661d820864906 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Sun, 29 Sep 2019 16:39:19 +0200
Subject: gnu: tlsdate: Build against OpenSSL@1.0.

* gnu/packages/ntp.scm (tlsdate)[inputs]: Change from OPENSSL to OPENSSL-1.0.
---
 gnu/packages/ntp.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 6942ecec2f..9429778776 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -169,7 +169,7 @@ minimalist than ntpd.")
                       ;; received from servers.
                       (setenv "COMPILE_DATE" (number->string 1530144000))
                       (invoke "sh" "autogen.sh"))))))
-    (inputs `(("openssl" ,openssl)
+    (inputs `(("openssl" ,openssl-1.0)
               ("libevent" ,libevent)))
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("autoconf" ,autoconf)
-- 
cgit v1.2.3


From 4a06bb3338395c042967ab4511d0a7d5bca0569f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 21:47:54 +0200
Subject: gnu: perl-carp-clan: Update to 6.08.

* gnu/packages/perl.scm (perl-carp-clan): Update to 6.08.
---
 gnu/packages/perl.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index d104c2434c..1fa90aa748 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -802,15 +802,14 @@ Perl.")
 (define-public perl-carp-clan
   (package
     (name "perl-carp-clan")
-    (version "6.07")
+    (version "6.08")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
                            "Carp-Clan-" version ".tar.gz"))
        (sha256
-        (base32
-         "0gaa4ygd9q8lp2fn5d9s7miiwxz92a2lqs7j6smwmifq6w3mc20a"))))
+        (base32 "0237xx3rqa72sr4vdvws9r1m453h5f25bl85mdjmmk128kir4py7"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-test-exception" ,perl-test-exception)))
-- 
cgit v1.2.3


From b750a2ce9cc08346d1492af1cae45e76c97d1d07 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 22:06:31 +0200
Subject: gnu: emacs-dired-du: Update to 0.5.2.

* gnu/packages/emacs-xyz.scm (emacs-dired-du): Update to 0.5.2.
---
 gnu/packages/emacs-xyz.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 49cb8bf3fc..003a7ba2fa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15337,16 +15337,14 @@ was called.")
 (define-public emacs-dired-du
   (package
     (name "emacs-dired-du")
-    (version "0.5.1")
+    (version "0.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
-             "https://elpa.gnu.org/packages/dired-du-"
-             version ".tar"))
+             "https://elpa.gnu.org/packages/dired-du-" version ".tar"))
        (sha256
-        (base32
-         "1091scnrjh0a4gja4z6jxic6ghy1yryv46qk9c76pmh50cpw6766"))))
+        (base32 "0vhph7vcicsiq28b10h3b4dvnhckcy4gccpdgsad5j7pwa5k26m1"))))
     (build-system emacs-build-system)
     (home-page "http://elpa.gnu.org/packages/dired-du.html")
     (synopsis "Dired with recursive directory sizes")
-- 
cgit v1.2.3


From 2a86a18cc305ece355fa6fddd7ae9a9c9af25651 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 22:08:24 +0200
Subject: gnu: emacs-dired-du: Use HTTPS home page.

* gnu/packages/emacs-xyz.scm (emacs-dired-du)[home-page]: Use HTTPS.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 003a7ba2fa..a50a022742 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15346,7 +15346,7 @@ was called.")
        (sha256
         (base32 "0vhph7vcicsiq28b10h3b4dvnhckcy4gccpdgsad5j7pwa5k26m1"))))
     (build-system emacs-build-system)
-    (home-page "http://elpa.gnu.org/packages/dired-du.html")
+    (home-page "https://elpa.gnu.org/packages/dired-du.html")
     (synopsis "Dired with recursive directory sizes")
     (description
      "Display the recursive size of directories in Dired.
-- 
cgit v1.2.3


From e6e03f67c39edf6e182b2316a8bb1058b0e24c76 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 22:09:10 +0200
Subject: gnu: emacs-on-screen: Update to 1.3.3.

* gnu/packages/emacs-xyz.scm (emacs-on-screen): Update to 1.3.3.
---
 gnu/packages/emacs-xyz.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a50a022742..c578edf24b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13692,7 +13692,7 @@ using user-provided rules.")
 (define-public emacs-on-screen
   (package
     (name "emacs-on-screen")
-    (version "1.3.2")
+    (version "1.3.3")
     (source
      (origin
        (method url-fetch)
@@ -13700,11 +13700,9 @@ using user-provided rules.")
              "http://elpa.gnu.org/packages/on-screen-" version ".el"))
        (file-name (string-append name "-" version ".el"))
        (sha256
-        (base32
-         "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv"))))
+        (base32 "0ga4hw23ki583li2z2hr7l6hk1nc2kdg4afndg06cm9jn158wza7"))))
     (build-system emacs-build-system)
-    (home-page
-     "https://github.com/michael-heerdegen/on-screen.el")
+    (home-page "https://github.com/michael-heerdegen/on-screen.el")
     (synopsis "Guide your eyes while scrolling")
     (description
      "Scrolling can be distracting because your eyes may lose
-- 
cgit v1.2.3


From d485cdc040e5c600c1bf12f0689a77d0cc0d7333 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 22:25:20 +0200
Subject: gnu: geocode-glib: Don't use NAME in source URI.

* gnu/packages/gnome.scm (geocode-glib)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cda5dfcdd3..b6e5b3cc8f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3129,7 +3129,7 @@ permission from user.")
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/geocode-glib/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "geocode-glib-" version ".tar.xz"))
               (sha256
                (base32
                 "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"))))
-- 
cgit v1.2.3


From 5754f0cfb58f64592a6fad3fa74e7354cf187caf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 22:25:49 +0200
Subject: gnu: cogl: Don't use NAME in source URI.

* gnu/packages/gnome.scm (cogl)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b6e5b3cc8f..38339feef0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3431,9 +3431,9 @@ throughout GNOME for API documentation).")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
+       (uri (string-append "mirror://gnome/sources/cogl/"
                            (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+                           "cogl-" version ".tar.xz"))
        (sha256
         (base32
          "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"))))
-- 
cgit v1.2.3


From 84a1b00700288d263112bf169216e086a8200861 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 28 Sep 2019 22:26:06 +0200
Subject: gnu: libgee: Don't use NAME in source URI.

* gnu/packages/gnome.scm (libgee)[source]: Hard-code NAME.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 38339feef0..f98e06118d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4607,9 +4607,9 @@ wraps things up in a developer-friendly way.")
     (version "0.20.1")
     (source (origin
               (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
+              (uri (string-append "mirror://gnome/sources/libgee/"
                                   (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+                                  "libgee-" version ".tar.xz"))
               (sha256
                (base32
                 "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"))))
-- 
cgit v1.2.3


From 254cc3c3b8d704cbf6bfd4361fba95a5d7da2f34 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 29 Sep 2019 17:11:02 +0200
Subject: gnu: znc: Update to 1.7.5.

* gnu/packages/messaging.scm (znc): Update to 1.7.5.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 7a77b45d1d..2cb357ff3a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -491,14 +491,14 @@ compromised.")
 (define-public znc
   (package
     (name "znc")
-    (version "1.7.4")
+    (version "1.7.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://znc.in/releases/archive/znc-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi"))))
+                "08a7yb2xs85hyyz8dpzfbsfjwj2r6kcii022lj3l4rf8hl9ix558"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From 65de725f9740b52de528df2fb5ed47ad592528eb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 29 Sep 2019 17:11:50 +0200
Subject: gnu: geocode-glib: Update to 3.26.1.

* gnu/packages/gnome.scm (geocode-glib): Update to 3.26.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f98e06118d..c7e1a6927f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3124,7 +3124,7 @@ permission from user.")
 (define-public geocode-glib
   (package
     (name "geocode-glib")
-    (version "3.26.0")
+    (version "3.26.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/geocode-glib/"
@@ -3132,7 +3132,7 @@ permission from user.")
                                   "geocode-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"))))
+                "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From af96c417c65e417b4720320f1e639199b4c7f985 Mon Sep 17 00:00:00 2001
From: Kyle Andrews 
Date: Sun, 29 Sep 2019 10:06:49 -0400
Subject: gnu: Add xftwidth.

* gnu/packages/xdisorg.scm: added xftwidth package.
---
 gnu/packages/xdisorg.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 0b40ca6909..79e0f617fd 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -26,6 +26,7 @@
 ;;; Copyright © 2018, 2019 Pierre Neidhardt 
 ;;; Copyright © 2018 Nam Nguyen 
 ;;; Copyright © 2019 Wiktor Żelazny 
+;;; Copyright © 2019 Kyle Andrews 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -83,6 +84,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages bison)
   #:use-module (ice-9 match))
 
@@ -1322,6 +1324,46 @@ program for X11.  It was designed to be fast, tiny and scriptable in any languag
      (home-page "https://github.com/robm/dzen")
      (license license:expat))))
 
+(define-public xftwidth
+  (package
+    (name "xftwidth")
+    (version "20170402")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+	     (url "http://github.com/vixus0/xftwidth")
+	     (commit "35ff963908d41a8a6a7101c434c88255728025ee")))
+       (sha256
+	(base32
+	 "1jwl25785li24kbp0m1wxfwk4dgxkliynn03nsj813cjr34kq16h"))
+       (file-name (string-append name "-" version "-checkout"))))
+    (build-system gnu-build-system)
+    (inputs `(("freetype" ,freetype)
+              ("libx11" ,libx11)
+              ("fontconfig" ,fontconfig)
+              ("libxft" ,libxft)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-makefile ; /usr/bin doesn't show up in PATH
+           (lambda _ (substitute* "Makefile" (("usr/") "")) #t))
+         (delete 'check) ; no check included in Makefile
+         (delete 'configure))
+       #:make-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "DESTDIR=" out)))))
+    (synopsis "Calculator for determining pixel widths of displayed text using Xft fonts")
+    (description "xftwidth is a small C program for calculating the pixel
+widths of displayed text using Xft fonts. It is especially useful in scripts
+for displaying text in graphical panels, menus, popups, and notification
+windows generated using dzen. These scripts are often used in conjunction with
+minimalistic tiling window managers such as herbstluftwm and bspwm.")
+    (home-page "http://github.com/vixus0/xftwidth")
+    (license license:expat)))
+
 (define-public xcb-util-xrm
   (package
     (name "xcb-util-xrm")
-- 
cgit v1.2.3


From 54c69ae123e2965245992cd4d04d2d9aa4aa24a5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 29 Sep 2019 17:32:58 +0200
Subject: gnu: cogl: Update to 1.22.4.

* gnu/packages/gnome.scm (cogl): Update to 1.22.4.
---
 gnu/packages/gnome.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c7e1a6927f..1471884568 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3427,7 +3427,7 @@ throughout GNOME for API documentation).")
 (define-public cogl
   (package
     (name "cogl")
-    (version "1.22.2")
+    (version "1.22.4")
     (source
      (origin
        (method url-fetch)
@@ -3435,8 +3435,7 @@ throughout GNOME for API documentation).")
                            (version-major+minor version) "/"
                            "cogl-" version ".tar.xz"))
        (sha256
-        (base32
-         "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"))))
+        (base32 "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"))))
     ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to
     ;; cogl, corresponding changes may be appropriate in mutter as well.
     (build-system gnu-build-system)
-- 
cgit v1.2.3


From 4c2c5ae64146369f765761a6332c932b985adec9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 29 Sep 2019 17:33:00 +0200
Subject: gnu: libgee: Update to 0.20.2.

* gnu/packages/gnome.scm (libgee): Update to 0.20.2.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1471884568..0a5f0c84a0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4603,7 +4603,7 @@ wraps things up in a developer-friendly way.")
 (define-public libgee
   (package
     (name "libgee")
-    (version "0.20.1")
+    (version "0.20.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libgee/"
@@ -4611,7 +4611,7 @@ wraps things up in a developer-friendly way.")
                                   "libgee-" version ".tar.xz"))
               (sha256
                (base32
-                "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"))))
+                "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 9e4a244bd00b3a1db5a3ed20dd858802c5200601 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 29 Sep 2019 17:34:56 +0200
Subject: gnu: font-util: Update to 1.3.2.

* gnu/packages/xorg.scm (font-util): Update to 1.3.2.
---
 gnu/packages/xorg.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e4050a1425..cea67cb63f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -838,7 +838,7 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
 (define-public font-util
   (package
     (name "font-util")
-    (version "1.3.1")
+    (version "1.3.2")
     (source
       (origin
         (method url-fetch)
@@ -847,8 +847,7 @@ For example: @code{6x10}, @code{9x15bold}, etc.")
                version
                ".tar.bz2"))
         (sha256
-          (base32
-            "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"))))
+          (base32 "10i2a8b3d1h3w7klsqf31iz7zbd6l8wglil54fkhdb1385281n1s"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)))
     (home-page "https://www.x.org/wiki/")
-- 
cgit v1.2.3


From 066cb9bab262ce2ed70b265477a91bbe2325254e Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sun, 29 Sep 2019 10:36:46 +0200
Subject: bootstrap: mescc-tools: Use mescc-tools-0.5.2, mescc-tools.

* gnu/packages/mes.scm (mescc-tools-0.5.2): New variable; rename from
mescc-tools.
(mescc-tools): Rename from mescc-tools-0.6.1.  Fix build.
* gnu/packages/make-bootstrap.scm (%mescc-tools-static): Inherit fixed
mescc-tools-0.5.2.
---
 gnu/packages/make-bootstrap.scm | 25 +------------------------
 gnu/packages/mes.scm            | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 4594e2fe36..8db551b3a7 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -594,34 +594,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
            #t))))
     (inputs `(("gcc" ,%gcc-static)))))
 
-;; One package: build + remove store references
-;; (define %mescc-tools-static-stripped
-;;   ;; A statically linked Mescc Tools with store references removed, for
-;;   ;; bootstrap.
-;;   (package
-;;     (inherit mescc-tools)
-;;     (name "mescc-tools-static-stripped")
-;;     (arguments
-;;      `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
-;;                           "CC=gcc -static")
-;;        #:test-target "test"
-;;        #:phases (modify-phases %standard-phases
-;;                   (delete 'configure)
-;;                   (add-after 'install 'strip-store-references
-;;                     (lambda _
-;;                       (let* ((out (assoc-ref %outputs "out"))
-;;                              (bin (string-append out "/bin")))
-;;                         (for-each (lambda (file)
-;;                                  (let ((target (string-append bin "/" file)))
-;;                                    (format #t "strippingg `~a'...~%" target)
-;;                                    (remove-store-references target)))
-;;                                   '( "M1" "blood-elf" "hex2"))))))))))
-
 ;; Two packages: first build static, bare minimum content.
 (define %mescc-tools-static
   ;; A statically linked MesCC Tools.
   (package
-    (inherit mescc-tools)
+    (inherit mescc-tools-0.5.2)
     (name "mescc-tools-static")
     (arguments
      `(#:system "i686-linux"
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index e1cb736b82..e116ffc2c8 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -34,7 +34,8 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix licenses)
-  #:use-module (guix packages))
+  #:use-module (guix packages)
+  #:use-module (guix utils))
 
 (define-public nyacc-0.86
   (package
@@ -134,7 +135,8 @@ Guile.")
     (home-page "https://gnu.org/software/mes")
     (license gpl3+)))
 
-(define-public mescc-tools
+(define-public mescc-tools-0.5.2
+  ;; Mescc-tools used for bootstrap.
   (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7")
         (revision "0")
         (version "0.5.2"))
@@ -166,9 +168,9 @@ get_machine.")
     (home-page "https://savannah.nongnu.org/projects/mescc-tools")
     (license gpl3+))))
 
-(define-public mescc-tools-0.6.1
+(define-public mescc-tools
   (package
-    (inherit mescc-tools)
+    (inherit mescc-tools-0.5.2)
     (name "mescc-tools")
     (version "0.6.1")
     (source (origin
@@ -180,4 +182,9 @@ get_machine.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n"))))))
+                "06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments mescc-tools-0.5.2)
+       ((#:make-flags _)
+        `(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+               "CC=gcc"))))))
-- 
cgit v1.2.3


From bffd8fcd31e5aa839c64d5e47943c5d8389a0def Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sun, 29 Sep 2019 10:39:40 +0200
Subject: bootstrap: mes: Add mes-0.19.

* gnu/packages/mes.scm (mes-0.19): New variable.
(mes): Inherit it.
* gnu/packages/make-bootstrap.scm (%mes-minimal): Likewise.
---
 gnu/packages/make-bootstrap.scm | 35 +----------------------------------
 gnu/packages/mes.scm            | 27 ++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 8db551b3a7..b1c4feb4f4 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -633,45 +633,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
            #t))))
     (inputs `(("mescc-tools" ,%mescc-tools-static)))))
 
-;; (define-public %mes-minimal-stripped
-;;   ;; A minimal Mes without documentation dependencies, for bootstrap.
-;;   (let ((triplet "i686-unknown-linux-gnu"))
-;;     (package
-;;       (inherit mes)
-;;       (name "mes-minimal-stripped")
-;;       (native-inputs
-;;        `(("guile" ,guile-2.2)))
-;;       (arguments
-;;        `(#:system "i686-linux"
-;;          #:strip-binaries? #f
-;;          #:configure-flags '("--mes")
-;;          #:phases
-;;          (modify-phases %standard-phases
-;;            (delete 'patch-shebangs)
-;;            (add-after 'install 'strip-install
-;;              (lambda _
-;;                (let* ((out (assoc-ref %outputs "out"))
-;;                       (share (string-append out "/share")))
-;;                  (delete-file-recursively (string-append out "/lib/guile"))
-;;                  (delete-file-recursively (string-append share "/guile"))
-;;                  (delete-file-recursively (string-append share "/mes/scaffold"))
-
-;;                  (for-each delete-file
-;;                            (find-files
-;;                             (string-append share "/mes/lib") "\\.(h|c)"))
-
-;;                  (for-each (lambda (dir)
-;;                              (for-each remove-store-references
-;;                                        (find-files (string-append out "/" dir)
-;;                                                    ".*")))
-;;                            '("bin" "share/mes")))))))))))
-
 ;; Two packages: first build static, bare minimum content.
 (define-public %mes-minimal
   ;; A minimal Mes without documentation.
   (let ((triplet "i686-unknown-linux-gnu"))
     (package
-      (inherit mes)
+      (inherit mes-0.19)
       (name "mes-minimal")
       (native-inputs
        `(("guile" ,guile-2.2)))
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index e116ffc2c8..1b5bb331f5 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -38,6 +38,7 @@
   #:use-module (guix utils))
 
 (define-public nyacc-0.86
+  ;; Nyacc used for bootstrap.
   (package
     (name "nyacc")
     (version "0.86.0")
@@ -91,22 +92,23 @@ extensive examples, including parsers for the Javascript and C99 languages.")
     (inputs
      `(("guile" ,guile-2.2)))))
 
-(define-public mes
+(define-public mes-0.19
+  ;; Mes used for bootstrap.
   (package
     (name "mes")
-    (version "0.20")
+    (version "0.19")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/mes/"
                                   "mes-" version ".tar.gz"))
               (sha256
                (base32
-                "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n"))))
+                "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
     (build-system gnu-build-system)
     (supported-systems '("i686-linux" "x86_64-linux"))
     (propagated-inputs
-     `(("mescc-tools" ,mescc-tools)
-       ("nyacc" ,nyacc)))
+     `(("mescc-tools" ,mescc-tools-0.5.2)
+       ("nyacc" ,nyacc-0.86)))
     (native-inputs
      `(("guile" ,guile-2.2)
        ,@(let ((target-system (or (%current-target-system)
@@ -135,6 +137,21 @@ Guile.")
     (home-page "https://gnu.org/software/mes")
     (license gpl3+)))
 
+(define-public mes
+  (package
+    (inherit mes-0.19)
+    (version "0.20")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/mes/"
+                                  "mes-" version ".tar.gz"))
+              (sha256
+               (base32
+                "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n"))))
+    (propagated-inputs
+     `(("mescc-tools" ,mescc-tools)
+       ("nyacc" ,nyacc)))))
+
 (define-public mescc-tools-0.5.2
   ;; Mescc-tools used for bootstrap.
   (let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7")
-- 
cgit v1.2.3


From 737c83f0ff9977572516c65502bdde92abd18629 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Sun, 29 Sep 2019 12:01:51 +0200
Subject: bootstrap: bash: Update for bash-5.0.

* gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch: Remove.
* gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch: New file.
* gnu/packages/make-bootstrap.scm (static-bash-for-bootstrap): Update to use
it.
* gnu/local.mk (dist_patch_DATA): Likewise.
---
 gnu/local.mk                                       |  4 +--
 gnu/packages/make-bootstrap.scm                    |  2 +-
 .../patches/bash-4.4-linux-pgrp-pipe.patch         | 30 -------------------
 .../bash-reproducible-linux-pgrp-pipe.patch        | 34 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 33 deletions(-)
 delete mode 100644 gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch
 create mode 100644 gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9bd1e8882b..18a25e6bc7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -11,7 +11,7 @@
 # Copyright © 2016 Ben Woodcroft 
 # Copyright © 2016, 2017, 2018, 2019 Alex Vong 
 # Copyright © 2016, 2017, 2018, 2019 Efraim Flashner 
-# Copyright © 2016, 2017 Jan Nieuwenhuizen 
+# Copyright © 2016, 2017, 2018, 2019 Jan (janneke) Nieuwenhuizen 
 # Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 # Copyright © 2017, 2018 Clément Lassieur 
 # Copyright © 2017 Mathieu Othacehe 
@@ -706,7 +706,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/avidemux-install-to-lib.patch		\
   %D%/packages/patches/awesome-reproducible-png.patch		\
   %D%/packages/patches/azr3.patch				\
-  %D%/packages/patches/bash-4.4-linux-pgrp-pipe.patch		\
+  %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch	\
   %D%/packages/patches/bash-completion-directories.patch	\
   %D%/packages/patches/bastet-change-source-of-unordered_set.patch	\
   %D%/packages/patches/bazaar-CVE-2017-14176.patch		\
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index b1c4feb4f4..3a664fd94f 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -164,7 +164,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
     (source (origin
               (inherit (package-source static-bash))
               (patches
-               (cons (search-patch "bash-4.4-linux-pgrp-pipe.patch")
+               (cons (search-patch "bash-reproducible-linux-pgrp-pipe.patch")
                      (origin-patches (package-source static-bash))))))))
 
 (define %static-inputs
diff --git a/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch
deleted file mode 100644
index 0d03d7ce37..0000000000
--- a/gnu/packages/patches/bash-4.4-linux-pgrp-pipe.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of
-the kernel version in use on the build machine.
-
---- configure.ac.orig	1969-12-31 19:00:00.000000000 -0500
-+++ configure.ac	2019-08-11 22:28:26.038841961 -0400
-@@ -1092,9 +1092,7 @@
- solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
- lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
- linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
--		case "`uname -r`" in
--		2.[[456789]]*|[[34]]*)	AC_DEFINE(PGRP_PIPE) ;;
--		esac ;;
-+		AC_DEFINE(PGRP_PIPE) ;;
- *qnx6*)		LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;;
- *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
- powerux*)	LOCAL_LIBS="-lgen" ;;
---- configure.orig	1969-12-31 19:00:00.000000000 -0500
-+++ configure	2019-08-11 22:28:10.166763255 -0400
-@@ -16064,10 +16064,7 @@
- solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
- lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
- linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
--		case "`uname -r`" in
--		2.[456789]*|[34]*)	$as_echo "#define PGRP_PIPE 1" >>confdefs.h
-- ;;
--		esac ;;
-+		$as_echo "#define PGRP_PIPE 1" >>confdefs.h ;;
- *qnx6*)		LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;;
- *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
- powerux*)	LOCAL_LIBS="-lgen" ;;
diff --git a/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch b/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch
new file mode 100644
index 0000000000..8a03c4d982
--- /dev/null
+++ b/gnu/packages/patches/bash-reproducible-linux-pgrp-pipe.patch
@@ -0,0 +1,34 @@
+Unconditionally enable PGRP_PIPE on Linux (the kernel), regardless of
+the kernel version in use on the build machine.
+
+diff -purN bash-5.0-orig/configure bash-5.0/configure
+--- configure	1970-01-01 01:00:00.000000000 +0100
++++ configure	2019-09-29 11:51:42.664518665 +0200
+@@ -16312,11 +16312,7 @@ solaris2.10*)	LOCAL_CFLAGS=-DSOLARIS  ;;
+ solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
+ lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
+-		case "`uname -r`" in
+-		1.*|2.[0123]*)	: ;;
+-		*)	$as_echo "#define PGRP_PIPE 1" >>confdefs.h
+- ;;
+-		esac ;;
++		$as_echo "#define PGRP_PIPE 1" >>confdefs.h ;;
+ netbsd*|openbsd*)	LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
+ *qnx[67]*)	LOCAL_LIBS="-lncurses" ;;
+ *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
+diff -purN bash-5.0-orig/configure.ac bash-5.0/configure.ac
+--- configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2019-09-29 11:51:10.692026225 +0200
+@@ -1108,10 +1108,7 @@ solaris2.10*)	LOCAL_CFLAGS=-DSOLARIS  ;;
+ solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
+ lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
+-		case "`uname -r`" in
+-		1.*|2.[[0123]]*)	: ;;
+-		*)	AC_DEFINE(PGRP_PIPE) ;;
+-		esac ;;
++		AC_DEFINE(PGRP_PIPE) ;;
+ netbsd*|openbsd*)	LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
+ *qnx[[67]]*)	LOCAL_LIBS="-lncurses" ;;
+ *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
-- 
cgit v1.2.3


From 0c80f7c47289aeba6b30d392d30257c2b0dc3fdd Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Sun, 29 Sep 2019 18:41:39 +0200
Subject: gnu: giac: Update to 1.5.0-65.

* gnu/packages/algebra.scm (giac): Update to 1.5.0-65.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index c517f86e53..02058b24ac 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -344,7 +344,7 @@ precision.")
 (define-public giac
   (package
     (name "giac")
-    (version "1.5.0-63")
+    (version "1.5.0-65")
     (source (origin
               (method url-fetch)
               ;; "~parisse/giac" is not used because the maintainer regularly
@@ -356,7 +356,7 @@ precision.")
                                   "source/giac_" version ".tar.gz"))
               (sha256
                (base32
-                "1jp7awyp8j8w6fhn802z8ddbq1fxhkyk9xdf0mq0mm0chpkylwqk"))))
+                "1g2fp9vgy0gqjmi6mlc3ldfn8ryq3h4mfd7rcq5hs6ry21hblv30"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((ice-9 ftw)
-- 
cgit v1.2.3


From aa2441c2cf0fe5d891bd1714c20e15fedf57e76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 28 Sep 2019 23:25:29 +0200
Subject: gnu: Remove deprecated "guile2.2-" packages.

These had been deprecated since Dec. 2017.

* gnu/packages/guile-xyz.scm (guile2.2-reader, guile2.2-lib)
(guile2.2-minikanren, guile2.2-irregex, guile2.2-haunt)
(guile2.2-redis, guile2.2-commonmark): Remove.
* gnu/packages/guile.scm (guile2.2-json, guile2.2-gdbm-ffi): Remove.
* gnu/packages/ssh.scm (guile2.2-ssh): Remove.
* gnu/packages/tls.scm (gnutls/guile-2.2): Remove.
---
 gnu/packages/guile-xyz.scm | 21 ---------------------
 gnu/packages/guile.scm     |  6 ------
 gnu/packages/ssh.scm       |  3 ---
 gnu/packages/tls.scm       |  5 +----
 4 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 43a599b503..4738addba1 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1591,9 +1591,6 @@ many readers as needed).")
     (home-page "https://www.nongnu.org/guile-reader/")
     (license license:gpl3+)))
 
-(define-public guile2.2-reader
-  (deprecated-package "guile2.2-reader" guile-reader))
-
 (define-public guile-ncurses
   (package
     (name "guile-ncurses")
@@ -1689,9 +1686,6 @@ for Guile\".")
     (name "guile2.0-lib")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-lib
-  (deprecated-package "guile2.2-lib" guile-lib))
-
 (define-public guile-minikanren
   (package
     (name "guile-minikanren")
@@ -1728,9 +1722,6 @@ See http://minikanren.org/ for more on miniKanren generally.")
     (name "guile2.0-minikanren")
     (native-inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-minikanren
-  (deprecated-package "guile2.2-minikanren" guile-minikanren))
-
 (define-public guile-irregex
   (package
     (name "guile-irregex")
@@ -1777,9 +1768,6 @@ inspired by the SCSH regular expression system.")
     (name "guile2.0-irregex")
     (native-inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-irregex
-  (deprecated-package "guile2.2-irregex" guile-irregex))
-
 (define-public haunt
   (package
     (name "haunt")
@@ -1850,9 +1838,6 @@ interface for reading articles in any format.")
     (name "guile2.0-haunt")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-haunt
-  (deprecated-package "guile2.2-haunt" haunt))
-
 (define-public guile-redis
   (package
     (name "guile-redis")
@@ -1883,9 +1868,6 @@ key-value cache and store.")
                      ,@(alist-delete "guile"
                                      (package-native-inputs guile-redis))))))
 
-(define-public guile2.2-redis
-  (deprecated-package "guile2.2-redis" guile-redis))
-
 (define-public guile-commonmark
   (package
     (name "guile-commonmark")
@@ -1919,9 +1901,6 @@ is no support for parsing block and inline level HTML.")
     (name "guile2.0-commonmark")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile2.2-commonmark
-  (deprecated-package "guile2.2-commonmark" guile-commonmark))
-
 (define-public mcron
   (package
     (name "mcron")
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 0731caedc2..e845fef0a5 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -472,9 +472,6 @@ specification.  These are the main features:
   ;; This is the 1.x branch of Guile-JSON.
   guile-json)
 
-(define-public guile2.2-json
-  (deprecated-package "guile2.2-json" guile-json))
-
 (define-public guile2.0-json
   (package-for-guile-2.0 guile-json))
 
@@ -544,9 +541,6 @@ Guile's foreign function interface.")
 (define-public guile2.0-gdbm-ffi
   (package-for-guile-2.0 guile-gdbm-ffi))
 
-(define-public guile2.2-gdbm-ffi
-  (deprecated-package "guile2.2-gdbm-ffi" guile-gdbm-ffi))
-
 (define-public guile-sqlite3
   (package
     (name "guile-sqlite3")
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index f7eee359ac..a57096ee18 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -340,9 +340,6 @@ programs written in GNU Guile interpreter.  It is a wrapper to the underlying
 libssh library.")
     (license license:gpl3+)))
 
-(define-public guile2.2-ssh
-  (deprecated-package "guile2.2-ssh" guile-ssh))
-
 (define-public guile2.0-ssh
   (package
     (inherit guile-ssh)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 93c79d63e4..e8406a8ae8 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès 
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver 
 ;;; Copyright © 2014 Ian Denhardt 
 ;;; Copyright © 2013, 2015 Andreas Enge 
@@ -244,9 +244,6 @@ required structures.")
     (properties '((ftp-server . "ftp.gnutls.org")
                   (ftp-directory . "/gcrypt/gnutls")))))
 
-(define-public gnutls/guile-2.2
-  (deprecated-package "guile2.2-gnutls" gnutls))
-
 (define-public gnutls/guile-2.0
   ;; GnuTLS for Guile 2.0.
   (package
-- 
cgit v1.2.3


From 7089f98ef1c274f1607ec314f3a16bd3c3ac89a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Fri, 19 Jul 2019 00:52:36 +0200
Subject: syscalls: 'define-as-needed' does not re-export local variables.

Fixes .
Reported by Timothy Sample .

* guix/build/syscalls.scm (define-as-needed): Rewrite to use lower-level
module primitives; define VARIABLE only if it's not already defined to
avoid "re-exporting local variable" error.
---
 guix/build/syscalls.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 3c84d3893f..f2fdb4d9d1 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -396,17 +396,11 @@ the returned procedure is called."
     ((_ (proc args ...) body ...)
      (define-as-needed proc (lambda* (args ...) body ...)))
     ((_ variable value)
-     (begin
-       (when (module-defined? the-scm-module 'variable)
-         (re-export variable))
-
-       (define variable
-         (if (module-defined? the-scm-module 'variable)
-             (module-ref the-scm-module 'variable)
-             value))
-
-       (unless (module-defined? the-scm-module 'variable)
-         (export variable))))))
+     (if (module-defined? the-scm-module 'variable)
+         (module-re-export! (current-module) '(variable))
+         (begin
+           (module-define! (current-module) 'variable value)
+           (module-export! (current-module) '(variable)))))))
 
 
 ;;;
-- 
cgit v1.2.3


From 89a99d53f56c7c383659d821c28286b6d71e458d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 29 Sep 2019 22:27:42 +0200
Subject: gnu: Add "guile3.0-" package variants.

* gnu/packages/guile.scm (package-for-guile-3.0): New procedure.
(guile3.0-json, guile3.0-gdbm-ffi, guile3.0-bytestructures): New
variables.
* gnu/packages/gnupg.scm (guile3.0-gcrypt): New variable.
* gnu/packages/guile-xyz.scm (guile3.0-minikanren, guile3.0-irregex):
New variables.
---
 gnu/packages/gnupg.scm     | 10 +++++++++-
 gnu/packages/guile-xyz.scm | 12 ++++++++++++
 gnu/packages/guile.scm     | 13 +++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 69d7f34a49..58def3d76a 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2013, 2015, 2018 Andreas Enge 
 ;;; Copyright © 2014, 2018 Eric Bavier 
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver 
@@ -470,6 +470,14 @@ interface (FFI) of Guile.")
      `(("guile" ,guile-2.0)
        ,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
 
+(define-public guile3.0-gcrypt
+  (package
+    (inherit guile-gcrypt)
+    (name "guile3.0-gcrypt")
+    (inputs
+     `(("guile" ,guile-next)
+       ,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
+
 (define-public python-gpg
   (package
     (name "python-gpg")
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 4738addba1..4ad6a3575a 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1722,6 +1722,12 @@ See http://minikanren.org/ for more on miniKanren generally.")
     (name "guile2.0-minikanren")
     (native-inputs `(("guile" ,guile-2.0)))))
 
+(define-public guile3.0-minikanren
+  (package
+    (inherit guile-minikanren)
+    (name "guile3.0-minikanren")
+    (native-inputs `(("guile" ,guile-next)))))
+
 (define-public guile-irregex
   (package
     (name "guile-irregex")
@@ -1768,6 +1774,12 @@ inspired by the SCSH regular expression system.")
     (name "guile2.0-irregex")
     (native-inputs `(("guile" ,guile-2.0)))))
 
+(define-public guile3.0-irregex
+  (package
+    (inherit guile-irregex)
+    (name "guile3.0-irregex")
+    (native-inputs `(("guile" ,guile-next)))))
+
 (define-public haunt
   (package
     (name "haunt")
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index e845fef0a5..ce6c57cd12 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -396,6 +396,10 @@ GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its
   (package-input-rewriting `((,guile-2.2 . ,guile-2.0))
                            (guile-variant-package-name "guile2.0")))
 
+(define package-for-guile-3.0
+  (package-input-rewriting `((,guile-2.2 . ,guile-next))
+                           (guile-variant-package-name "guile3.0")))
+
 (define-public guile-for-guile-emacs
   (package (inherit guile-2.2)
     (name "guile-for-guile-emacs")
@@ -489,6 +493,9 @@ specification.  These are the main features:
                (base32
                 "14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz"))))))
 
+(define-public guile3.0-json
+  (package-for-guile-3.0 guile-json-3))
+
 ;; There are two guile-gdbm packages, one using the FFI and one with
 ;; direct C bindings, hence the verbose name.
 
@@ -541,6 +548,9 @@ Guile's foreign function interface.")
 (define-public guile2.0-gdbm-ffi
   (package-for-guile-2.0 guile-gdbm-ffi))
 
+(define-public guile3.0-gdbm-ffi
+  (package-for-guile-3.0 guile-gdbm-ffi))
+
 (define-public guile-sqlite3
   (package
     (name "guile-sqlite3")
@@ -602,6 +612,9 @@ type system, elevating types to first-class status.")
 (define-public guile2.0-bytestructures
   (package-for-guile-2.0 guile-bytestructures))
 
+(define-public guile3.0-bytestructures
+  (package-for-guile-3.0 guile-bytestructures))
+
 (define-public guile-git
   (package
     (name "guile-git")
-- 
cgit v1.2.3


From 2d74d42a65f14e2f4433e9784422841ed308e92d Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 29 Sep 2019 23:20:33 +0200
Subject: gnu: emacs-org-ql: Update to 0.2.1.

* gnu/packages/emacs-xyz.scm (emacs-org-ql): Update to 0.2.1.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c578edf24b..d418fcbb5d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11642,7 +11642,7 @@ timestamps by providing a @code{ts} struct.")
 (define-public emacs-org-ql
   (package
     (name "emacs-org-ql")
-    (version "0.2")
+    (version "0.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11650,7 +11650,7 @@ timestamps by providing a @code{ts} struct.")
                     (commit version)))
               (sha256
                (base32
-                "0mq0aj0a3a5gi9nz0ncpzsh731d92n86b0iinvx1m45dcal06h9y"))
+                "1xyabg9fhpip6426za6wjrn0msnaf10c5fzzaawwagk7zmjf9b48"))
               (file-name (git-file-name name version))))
     (build-system emacs-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 18b3ba6ff2f096193161742a06e4c1ae12600d0c Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sun, 29 Sep 2019 10:11:50 -0700
Subject: gnu: %default-extra-linux-options: Ensure namespaces are enabled in
 all linux-libre kernels.

The linux-libre kernels using defconfig may not have namespaces enabled, which
is needed for the default guix-daemon configuration in Guix System.

* gnu/packages/linux (%default-extra-linux-options): Enable CONFIG_NAMESPACES,
  CONFIG_UTS_NS, CONFIG_IPC_NS, CONFIG_USER_NS, CONFIG_PID_NS, and
  CONFIG_NET_NS.
---
 gnu/packages/linux.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 876eb005af..fed8d8b96d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -564,6 +564,13 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
 (define %default-extra-linux-options
   `(;; Some very mild hardening.
     ("CONFIG_SECURITY_DMESG_RESTRICT" . #t)
+    ;; All kernels should have NAMESPACES options enabled
+    ("CONFIG_NAMESPACES" . #t)
+    ("CONFIG_UTS_NS" . #t)
+    ("CONFIG_IPC_NS" . #t)
+    ("CONFIG_USER_NS" . #t)
+    ("CONFIG_PID_NS" . #t)
+    ("CONFIG_NET_NS" . #t)
     ;; Modules required for initrd:
     ("CONFIG_NET_9P" . m)
     ("CONFIG_NET_9P_VIRTIO" . m)
-- 
cgit v1.2.3


From 8d564b8b81b98fec9aac2f5f2d3cb0d1f2ea1416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 30 Sep 2019 09:48:18 +0200
Subject: gnu: xyce: Use Bison 3.0.

Xyce requires Bison 3.0 at the latest.

* gnu/packages/bison.scm (bison-3.0): New variable.
* gnu/packages/engineering.scm (xyce-serial)[native-inputs]: Use
BISON-3.0 instead of BISON.
---
 gnu/packages/bison.scm       | 15 ++++++++++++++-
 gnu/packages/engineering.scm |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm
index 5ebc883d53..12f19b785e 100644
--- a/gnu/packages/bison.scm
+++ b/gnu/packages/bison.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2015 Ludovic Courtès 
+;;; Copyright © 2012, 2013, 2015, 2019 Ludovic Courtès 
 ;;; Copyright © 2018 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Efraim Flashner 
 ;;;
@@ -63,3 +63,16 @@ deterministic or generalized LR parser from an annotated, context-free
 grammar.  It is versatile enough to have many applications, from parsers for
 simple tools through complex programming languages.")
     (license gpl3+)))
+
+(define-public bison-3.0
+  (package
+    (inherit bison)
+    (version "3.0.5")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/bison/bison-"
+                          version ".tar.xz"))
+      (sha256
+       (base32
+        "0f7kjygrckkx8vas2nm673592jif0a9mw5g8207f6hj6h4pfyp07"))))))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index bbd9151995..103cb19e83 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2015 Federico Beffa 
 ;;; Copyright © 2016, 2018 Efraim Flashner 
 ;;; Copyright © 2016 David Thompson 
-;;; Copyright © 2016, 2017, 2018 Ludovic Courtès 
+;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès 
 ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis 
 ;;; Copyright © 2017 Julien Lepiller 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
@@ -1550,7 +1550,7 @@ unique design feature of Trilinos is its focus on packages.")
         (string-append "ARCHDIR="
                        (assoc-ref %build-inputs "trilinos")))))
     (native-inputs
-     `(("bison" ,bison)
+     `(("bison" ,bison-3.0)                  ;'configure' fails with Bison 3.4
        ("flex" ,flex)
        ("fortran" ,gfortran)))
     (inputs
-- 
cgit v1.2.3


From 2d03201aab6d04d0b7481e3271c1d819f8833ebe Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Sun, 29 Sep 2019 21:25:41 +0200
Subject: gnu: bubblewrap: Update to 0.3.3.

* gnu/packages/virtualization.scm (bubblewrap): Update to 0.3.3.
[arguments]: Adjust test substitutions.
---
 gnu/packages/virtualization.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index d60044f65b..57c54db1d8 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1024,7 +1024,7 @@ virtual machines.")
 (define-public bubblewrap
   (package
     (name "bubblewrap")
-    (version "0.3.1")
+    (version "0.3.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/projectatomic/bubblewrap/"
@@ -1032,7 +1032,7 @@ virtual machines.")
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny"))))
+                "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -1052,6 +1052,9 @@ virtual machines.")
                  ;; Some tests try to access /usr, but that doesn't exist.
                  ;; Give them /gnu instead.
                  (("/usr") "/gnu")
+                 (("--ro-bind /bin /bin") "--ro-bind /gnu /bin")
+                 (("--ro-bind /sbin /sbin") "--ro-bind /gnu /sbin")
+                 (("--ro-bind /lib /lib") "--ro-bind /gnu /lib")
                  (("  */bin/bash") (which "bash"))
                  (("/bin/sh") (which "sh"))
                  (("findmnt") (which "findmnt"))))
-- 
cgit v1.2.3


From 3bc74090d9b583d0bb30a8d79e33abd3c929092f Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Mon, 30 Sep 2019 21:26:19 +0200
Subject: gnu: mcrl2: Update to 201908.0.

* gnu/packages/maths.scm (mcrl2): Update to 201908.0.
---
 gnu/packages/maths.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ffb2f87836..4be69fe030 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -22,7 +22,7 @@
 ;;; Copyright © 2017, 2019 Arun Isaac 
 ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Dave Love 
-;;; Copyright © 2018 Jan Nieuwenhuizen 
+;;; Copyright © 2018, 2019 Jan Nieuwenhuizen 
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;; Copyright © 2018 Nadya Voronova 
 ;;; Copyright © 2018 Adam Massmann 
@@ -4306,7 +4306,7 @@ reduction.")
 (define-public mcrl2
   (package
     (name "mcrl2")
-    (version "201707.1.15162")
+    (version "201908.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.mcrl2.org/download/devel/mcrl2-"
@@ -4314,9 +4314,7 @@ reduction.")
                                   ".tar.gz"))
               (sha256
                (base32
-                "1ziww2fchsklm25hl9p2mngssxfh9w07nc114cncqaxfibqp2p8f"))))
-    (native-inputs
-     `(("subversion" ,subversion)))
+                "1i4xgl2d5fgiz1mwi50cyfkrrcpm8nxfayfjgmhq7chs58wlhfsz"))))
     (inputs
      `(("boost" ,boost)
        ("glu" ,glu)
-- 
cgit v1.2.3


From e03b912600fe6aa74e0858f69920e71693f1aaa4 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Mon, 30 Sep 2019 21:26:56 +0200
Subject: gnu: Add mcrl2-minimal.

* gnu/packages/maths.scm (mcrl2-minimal): New variable.
---
 gnu/packages/maths.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4be69fe030..03738c66ea 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4332,6 +4332,15 @@ analysed.")
     (home-page "https://mcrl2.org")
     (license license:boost1.0)))
 
+(define-public mcrl2-minimal
+  (package
+    (inherit mcrl2)
+    (name "mcrl2-minimal")
+    (inputs
+     `(("boost" ,boost)))
+    (arguments
+     '(#:configure-flags '("-DMCRL2_ENABLE_GUI_TOOLS=OFF")))))
+
 (define-public r-subplex
   (package
     (name "r-subplex")
-- 
cgit v1.2.3


From cab542cbf79a91cf6e4584782fcbf5f4b63d0ed7 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 30 Sep 2019 20:41:10 +0200
Subject: gnu: emacs-compdef: Update to 0.2-2.67104a3.

* gnu/packages/emacs-xyz.scm (emacs-compdef): Update to 0.2-2.67104a3.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index d418fcbb5d..768f387187 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3627,8 +3627,8 @@ completion candidate when using the Company text completion framework.")
       (license license:gpl3+))))
 
 (define-public emacs-compdef
-  (let ((commit "fc08a9b049c3718fc7d6c6ee2140759aff031bc9")
-        (revision "1"))
+  (let ((commit "67104a38763cc819644f711248b170a43bce151b")
+        (revision "2"))
     (package
       (name "emacs-compdef")
       (version (git-version "0.2" revision commit))
@@ -3640,7 +3640,7 @@ completion candidate when using the Company text completion framework.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1dwf4rlj19d80yp656c7nkp6hb3mabv808r6ix3hpv6rjjs38vhl"))))
+          (base32 "1f6y6cr67gps9jp5hd20xszfd3k26v70g6z4g5db6wdkvlnc2wkg"))))
       (build-system emacs-build-system)
       (home-page "https://gitlab.com/jjzmajic/compdef")
       (synopsis "Set local completion backends")
-- 
cgit v1.2.3


From 8e5ffebeaa62131bda51aa16a3c47db01188e7da Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Tue, 1 Oct 2019 05:57:53 +0200
Subject: gnu: Add emacs-handle.

* gnu/packages/emacs-xyz.scm (emacs-handle): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 768f387187..12b37ff8d0 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3649,6 +3649,31 @@ completion backends according to mode, and integrates with
 @code{use-package}.")
       (license license:gpl3+))))
 
+(define-public emacs-handle
+  (let ((commit "0180a33c92b53d042c3e248a047e15337122d922")
+        (revision "1"))
+    (package
+      (name "emacs-handle")
+      (version (git-version "0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/jjzmajic/handle.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0ldrdfxspkq0m07l98hhj9nydgj9qi557mnnpd3v4xrwqwhyr4nc"))))
+      (build-system emacs-build-system)
+      (home-page "https://gitlab.com/jjzmajic/handle")
+      (synopsis "Handle generic functions across related major modes")
+      (description "This package provides generic functions that specialize on
+major modes and intended purpose rather than on arguments.  Different
+callables for tasks like expression evaluation, definition-jumping, and more
+can now be grouped accordingly and tried in sequence until one of them
+succeeds.")
+      (license license:gpl3+))))
+
 (define-public emacs-nswbuff
   (let ((commit "362da7f3687e2eb5bb11667347de85f4a9d002bc")
         (revision "1"))
-- 
cgit v1.2.3


From 8b4615ab54dcd25c6cfa22f9416a8f1c74d36612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 1 Oct 2019 10:45:05 +0200
Subject: ui: 'show-what-to-build' colorizes store file names.

* guix/ui.scm (colorize-store-file-name): New procedure.
(show-what-to-build)[colorize-store-item]: New variable.
Use it throughout.
---
 guix/ui.scm | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 069d542131..3e4bd5787e 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -867,6 +867,17 @@ warning."
     ('profile-hook #t)
     (_ #f)))
 
+(define (colorize-store-file-name file)
+  "Colorize FILE, a store file name, such that the hash part is less prominent
+that the rest."
+  (let ((len    (string-length file))
+        (prefix (+ (string-length (%store-prefix)) 32 2)))
+    (if (< len prefix)
+        file
+        (string-append (colorize-string (string-take file prefix)
+                                        (color DARK))
+                       (string-drop file prefix)))))
+
 (define* (show-what-to-build store drv
                              #:key dry-run? (use-substitutes? #t)
                              (mode (build-mode normal)))
@@ -890,6 +901,11 @@ check and report what is prerequisites are available for download."
         (substitution-oracle store inputs #:mode mode)
         (const #f)))
 
+  (define colorized-store-item
+    (if (color-output? (current-error-port))
+        colorize-store-file-name
+        identity))
+
   (let*-values (((build download)
                  (derivation-build-plan store inputs
                                         #:mode mode
@@ -935,7 +951,7 @@ check and report what is prerequisites are available for download."
                   (N_ "~:[The following derivation would be built:~%~{   ~a~%~}~;~]"
                       "~:[The following derivations would be built:~%~{   ~a~%~}~;~]"
                       (length build))
-                  (null? build) build)
+                  (null? build) (map colorized-store-item build))
           (if display-download-size?
               (format (current-error-port)
                       ;; TRANSLATORS: "MB" is for "megabyte"; it should be
@@ -943,29 +959,31 @@ check and report what is prerequisites are available for download."
                       (G_ "~:[~,1h MB would be downloaded:~%~{   ~a~%~}~;~]")
                       (null? download)
                       download-size
-                      (map substitutable-path download))
+                      (map (compose colorized-store-item substitutable-path)
+                           download))
               (format (current-error-port)
                       (N_ "~:[The following file would be downloaded:~%~{   ~a~%~}~;~]"
                           "~:[The following files would be downloaded:~%~{   ~a~%~}~;~]"
                           (length download))
                       (null? download)
-                      (map substitutable-path download)))
+                      (map (compose colorized-store-item substitutable-path)
+                           download)))
           (format (current-error-port)
                   (N_ "~:[The following graft would be made:~%~{   ~a~%~}~;~]"
                       "~:[The following grafts would be made:~%~{   ~a~%~}~;~]"
                       (length graft))
-                  (null? graft) graft)
+                  (null? graft) (map colorized-store-item graft))
           (format (current-error-port)
                   (N_ "~:[The following profile hook would be built:~%~{   ~a~%~}~;~]"
                       "~:[The following profile hooks would be built:~%~{   ~a~%~}~;~]"
                       (length hook))
-                  (null? hook) hook))
+                  (null? hook) (map colorized-store-item hook)))
         (begin
           (format (current-error-port)
                   (N_ "~:[The following derivation will be built:~%~{   ~a~%~}~;~]"
                       "~:[The following derivations will be built:~%~{   ~a~%~}~;~]"
                       (length build))
-                  (null? build) build)
+                  (null? build) (map colorized-store-item build))
           (if display-download-size?
               (format (current-error-port)
                       ;; TRANSLATORS: "MB" is for "megabyte"; it should be
@@ -973,23 +991,25 @@ check and report what is prerequisites are available for download."
                       (G_ "~:[~,1h MB will be downloaded:~%~{   ~a~%~}~;~]")
                       (null? download)
                       download-size
-                      (map substitutable-path download))
+                      (map (compose colorized-store-item substitutable-path)
+                           download))
               (format (current-error-port)
                       (N_ "~:[The following file will be downloaded:~%~{   ~a~%~}~;~]"
                           "~:[The following files will be downloaded:~%~{   ~a~%~}~;~]"
                           (length download))
                       (null? download)
-                      (map substitutable-path download)))
+                      (map (compose colorized-store-item substitutable-path)
+                           download)))
           (format (current-error-port)
                   (N_ "~:[The following graft will be made:~%~{   ~a~%~}~;~]"
                       "~:[The following grafts will be made:~%~{   ~a~%~}~;~]"
                       (length graft))
-                  (null? graft) graft)
+                  (null? graft) (map colorized-store-item graft))
           (format (current-error-port)
                   (N_ "~:[The following profile hook will be built:~%~{   ~a~%~}~;~]"
                       "~:[The following profile hooks will be built:~%~{   ~a~%~}~;~]"
                       (length hook))
-                  (null? hook) hook)))
+                  (null? hook) (map colorized-store-item hook))))
 
     (check-available-space installed-size)
 
-- 
cgit v1.2.3


From 43f7fd8783af1e824904a76115a8ae8ccbb19f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Tue, 1 Oct 2019 10:46:16 +0200
Subject: pull: Do not use '~*', which 'msgfmt' fails to interpret.

Fixes .
Reported by Konrad Hinsen .

* guix/scripts/pull.scm (display-channel-news): Use ~a instead of ~*
when reporting new channels.
---
 guix/scripts/pull.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index 0372278705..e018985469 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -304,7 +304,7 @@ to display."
                (new
                 (let ((count (length new)))
                   (format (current-error-port)
-                          (N_ "  ~*One new channel:~%"
+                          (N_ "  ~a new channel:~%"
                               "  ~a new channels:~%" count)
                           count)
                   (for-each display-channel new))))
-- 
cgit v1.2.3


From 717b6ba6aa9ac876b2c2df36096e4579b19ee06c Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro 
Date: Tue, 17 Sep 2019 22:01:01 +1000
Subject: gnu: Add abcl.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/java.scm (abcl): New variable.
* gnu/packages/patches/abcl-fix-build-xml.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                  |  1 +
 gnu/packages/java.scm                         | 66 ++++++++++++++++++++++++++-
 gnu/packages/patches/abcl-fix-build-xml.patch | 50 ++++++++++++++++++++
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/abcl-fix-build-xml.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d3e1dbc0ba..d056a2557e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -674,6 +674,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/a2ps-CVE-2001-1593.patch	\
   %D%/packages/patches/a2ps-CVE-2014-0466.patch	\
   %D%/packages/patches/a2ps-CVE-2015-8107.patch	\
+  %D%/packages/patches/abcl-fix-build-xml.patch	\
   %D%/packages/patches/abiword-explictly-cast-bools.patch	\
   %D%/packages/patches/abiword-black-drawing-with-gtk322.patch	\
   %D%/packages/patches/acl-fix-perl-regex.patch		\
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 403c446a82..6090dcd514 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2016 Leo Famulari 
 ;;; Copyright © 2016, 2017 Roel Janssen 
-;;; Copyright © 2017 Carlo Zancanaro 
+;;; Copyright © 2017, 2019 Carlo Zancanaro 
 ;;; Copyright © 2017, 2018 Julien Lepiller 
 ;;; Copyright © 2017 Thomas Danckaert 
 ;;; Copyright © 2016, 2017, 2018 Alex Vong 
@@ -11109,3 +11109,67 @@ network protocols, and core version control algorithms.")
      `(("java-javaewah" ,java-javaewah)
        ("java-jsch" ,java-jsch)
        ("java-slf4j-api" ,java-slf4j-api)))))
+
+(define-public abcl
+  (package
+    (name "abcl")
+    (version "1.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://abcl.org/releases/"
+                           version "/abcl-src-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj"))
+       (patches
+        (search-patches
+         "abcl-fix-build-xml.patch"))))
+    (build-system ant-build-system)
+    (native-inputs
+     `(("java-junit" ,java-junit)))
+    (arguments
+     `(#:build-target "abcl.jar"
+       #:test-target "abcl.test"
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((share (string-append (assoc-ref outputs "out")
+                                         "/share/java/"))
+                   (bin (string-append (assoc-ref outputs "out")
+                                       "/bin/")))
+               (mkdir-p share)
+               (install-file "dist/abcl.jar" share)
+               (install-file "dist/abcl-contrib.jar" share)
+               (mkdir-p bin)
+               (with-output-to-file (string-append bin "abcl")
+                 (lambda _
+                   (let ((classpath (string-append
+                                     share "abcl.jar"
+                                     ":"
+                                     share "abcl-contrib.jar")))
+                     (display (string-append
+                               "#!" (which "sh") "\n"
+                               "if [[ -z $CLASSPATH ]]; then\n"
+                               "  cp=\"" classpath "\"\n"
+                               "else\n"
+                               "  cp=\"" classpath ":$CLASSPATH\"\n"
+                               "fi\n"
+                               "exec " (which "java")
+                               " -cp $cp org.armedbear.lisp.Main $@\n")))))
+               (chmod (string-append bin "abcl") #o755)
+               #t))))))
+    (home-page "https://abcl.org/")
+    (synopsis "Common Lisp Implementation on the JVM")
+    (description
+     "@dfn{Armed Bear Common Lisp} (ABCL) is a full implementation of the Common
+Lisp language featuring both an interpreter and a compiler, running in the
+JVM.  It supports JSR-223 (Java scripting API): it can be a scripting engine
+in any Java application.  Additionally, it can be used to implement (parts of)
+the application using Java to Lisp integration APIs.")
+    (license (list license:gpl2+
+                   ;; named-readtables is released under 3 clause BSD
+                   license:bsd-3
+                   ;; jfli is released under CPL 1.0
+                   license:cpl1.0))))
diff --git a/gnu/packages/patches/abcl-fix-build-xml.patch b/gnu/packages/patches/abcl-fix-build-xml.patch
new file mode 100644
index 0000000000..dd315b4271
--- /dev/null
+++ b/gnu/packages/patches/abcl-fix-build-xml.patch
@@ -0,0 +1,50 @@
+ABCL's build calls the hostname command, and needs the internet to download
+JUnit. Neither of these are really required, though, so we can patch them out
+to make it build.
+
+We also remove the Implemetation-Build property that ends up in the manifest
+file, because it stores information about the time of the build, which makes
+it non-deterministic.
+
+--- a/build.xml
++++ b/build.xml
+@@ -327,7 +327,7 @@ from ${abcl.home.dir}
+     
+     
++            depends="abcl.compile,abcl.stamp.version">
+       
+       
+@@ -455,11 +455,6 @@ from ${abcl.home.dir}
+                 value="${abcl.version}-${abcl.version.src}"/>
+     
+ 
+-    
+-      
+-      abcl.hostname: ${abcl.hostname}
+-    
+-
+     
+       
+         
+@@ -500,8 +495,6 @@ from ${abcl.home.dir}
+                        value="ABCL"/>
+             
+-            
+           
+         
+          
+@@ -1019,8 +1012,7 @@ ${basedir}/../cl-bench
+       
+     
+         
+-    
++    
+       
+       
Date: Tue, 1 Oct 2019 15:47:34 +0200
Subject: gnu: guile: Add 2.2.4.

* gnu/packages/guile.scm (guile-2.2.4): New variable.
---
 gnu/packages/guile.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index b0dfa89ee5..49a6e964a3 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -258,6 +258,17 @@ without requiring the source code to be rewritten.")
                   (timeout . 72000)             ;20 hours
                   (max-silent-time . 36000))))) ;10 hours (needed on ARM
                                                 ;  when heavily loaded)
+(define-public guile-2.2.4
+  (package/inherit
+   guile-2.2
+   (version "2.2.4")
+   (source (origin
+             (inherit (package-source guile-2.2))
+             (uri (string-append "mirror://gnu/guile/guile-" version
+                                 ".tar.xz"))
+             (sha256
+              (base32
+               "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))))
 
 (define-public guile-next
   ;; This is the upcoming Guile 3.0, with JIT support.
-- 
cgit v1.2.3


From c76d19a3fce13bccc614473e8ab7d6dda201b552 Mon Sep 17 00:00:00 2001
From: Diego Nicola Barbato 
Date: Tue, 1 Oct 2019 14:24:23 +0200
Subject: gnu: youtube-dl: Update to 2019.09.28.

* gnu/packages/video.scm (youtube-dl): Update to 2019.09.28.

Signed-off-by: Tobias Geerinckx-Rice 
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index f624f62429..bb8b0fb68f 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1493,7 +1493,7 @@ projects while introducing many more.")
 (define-public youtube-dl
   (package
     (name "youtube-dl")
-    (version "2019.09.12.1")
+    (version "2019.09.28")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/ytdl-org/youtube-dl/"
@@ -1501,7 +1501,7 @@ projects while introducing many more.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0h7v81kcxcpy82wq9b1aiz2zg6hg7rnlcfmzd13j6k8yhr7ah9yf"))))
+                "0nrk0bk6lksnmng8lwhcpkc57iibzjjamlqz8rxjpsw6dnzxz82h"))))
     (build-system python-build-system)
     (arguments
      ;; The problem here is that the directory for the man page and completion
-- 
cgit v1.2.3


From 18edc9db02658c597695905121a9df68e9118ab8 Mon Sep 17 00:00:00 2001
From: Vasile Dumitrascu 
Date: Fri, 27 Sep 2019 22:32:05 +0200
Subject: gnu: conky: Add Pulseaudio support.

* gnu/packages/conky.scm (conky)[inputs]: Add pulseaudio.

Signed-off-by: Tobias Geerinckx-Rice 
---
 gnu/packages/conky.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm
index 681feb6e43..046d132a9b 100644
--- a/gnu/packages/conky.scm
+++ b/gnu/packages/conky.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Siniša Biđin 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Pierre Neidhardt 
+;;; Copyright © 2019 Vasile Dumitrascu 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,6 +32,7 @@
   #:use-module (gnu packages lua)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages xorg))
 
 (define-public conky
@@ -51,7 +53,8 @@
     (arguments
      `(#:tests? #f                      ; there are no tests
        #:configure-flags
-       (list "-DRELEASE=true")
+       (list "-DRELEASE=true"
+             "-DBUILD_PULSEAUDIO=ON")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'add-freetype-to-search-path
@@ -76,6 +79,7 @@
        ("libxext" ,libxext)
        ("libxft" ,libxft)
        ("libxinerama" ,libxinerama)
+       ("pulseaudio", pulseaudio)
        ("lua" ,lua)
        ("ncurses" ,ncurses)
        ("curl" ,curl)))
-- 
cgit v1.2.3


From 2cd599f005bb91ae120a66824b8efbac81a27a69 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sun, 29 Sep 2019 13:58:17 +0100
Subject: inferior: Change to use the (guix repl) module.

Rather than (guix scripts repl), from which the machine-repl procedure was
removed in [1].

1: 92a4087bf4862d5ba9b77111eba3c68c2a1c4679

* guix/inferior.scm (inferior-pipe): Load (guix repl) rather than (guix
scripts repl).
---
 guix/inferior.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/inferior.scm b/guix/inferior.scm
index dcbc954432..d6d2053ab8 100644
--- a/guix/inferior.scm
+++ b/guix/inferior.scm
@@ -136,8 +136,8 @@ it's an old Guix."
                       (object->string
                        `(begin
                           (primitive-load ,(search-path %load-path
-                                                        "guix/scripts/repl.scm"))
-                          ((@ (guix scripts repl) machine-repl))))))
+                                                        "guix/repl.scm"))
+                          ((@ (guix repl) machine-repl))))))
         pipe)))
 
 (define* (port->inferior pipe #:optional (close close-port))
-- 
cgit v1.2.3


From f27c6c16be002d3c132cfc09c5911384be853f27 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Tue, 1 Oct 2019 19:35:15 +0100
Subject: gnu: guix-data-service: Update to 0.0.1-2.e00aabd.

* gnu/packages/web.scm (guix-data-service): Update to 0.0.1-2.e00aabd.
[arguments]: Add new process-branch-updated-mbox executable to list.
---
 gnu/packages/web.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5c8e5c97c6..82c09dc5f3 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4017,8 +4017,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
   (package-with-python2 python-feedparser))
 
 (define-public guix-data-service
-  (let ((commit "bb94f6dd05a33135fa661b86d35d203c0c099dba")
-        (revision "1"))
+  (let ((commit "e00aabde4388c014778475966da2b7021dfef560")
+        (revision "2"))
     (package
       (name "guix-data-service")
       (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -4030,7 +4030,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1y6s4igjvi0293z4d4hbgwifs8avcam71qhis9z4f8mjz6w7vcpb"))))
+                  "0nd73bhir4c6a0smvgz7dfc6m6sbxd8v6amwpgk3c8m27g8chk5b"))))
       (build-system gnu-build-system)
       (arguments
        '(#:tests? #f                    ; TODO Tests require PostgreSQL
@@ -4077,6 +4077,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
                         (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))
                   '("guix-data-service"
                     "guix-data-service-process-branch-updated-email"
+                    "guix-data-service-process-branch-updated-mbox"
                     "guix-data-service-process-job"
                     "guix-data-service-process-jobs"
                     "guix-data-service-query-build-servers"))
-- 
cgit v1.2.3


From dc827867be9496dd7071b76c0629da2ddbb82696 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 12:07:33 +0200
Subject: gnu: Add python-boolean.py.

* gnu/packages/python-xyz.scm (python-boolean.py): New public variable.
---
 gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1bd218b797..adc6fc08bf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -387,6 +387,32 @@ certificate returned by the server to which a connection has been established,
 and verifies that it matches the intended target hostname.")
     (license license:psfl)))
 
+(define-public python-boolean.py
+  (package
+    (name "python-boolean.py")
+    (version "3.6")
+    (source
+     (origin
+       ;; There's no source tarball on PyPI.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/bastikr/boolean.py")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/bastikr/boolean.py")
+    (synopsis "Boolean algebra in one Python module")
+    (description
+     "This is a small Python library that implements boolean algebra.
+It defines two base elements, @code{TRUE} and @code{FALSE}, and a
+@code{Symbol} class that can take on one of these two values.  Calculations
+are done only in terms of @code{AND}, @code{OR}, and @code{NOT}---other
+compositions like @code{XOR} and @code{NAND} are emulated on top of them.
+Expressions are constructed from parsed strings or directly in Python.")
+    (license license:bsd-2)))
+
 (define-public python-hdf4
   (package
    (name "python-hdf4")
-- 
cgit v1.2.3


From d6803445eeff619214cc9fcf99af79975c36f740 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 12:08:03 +0200
Subject: gnu: Add python-license-expression.

* gnu/packages/python-xyz.scm (python-license-expression): New public
variable.
---
 gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index adc6fc08bf..413d68c258 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -609,6 +609,29 @@ to users of that module.")
 (define-public python2-netcdf4
   (package-with-python2 python-netcdf4))
 
+(define-public python-license-expression
+  (package
+    (name "python-license-expression")
+    (version "0.999")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "license-expression" version))
+       (sha256
+        (base32 "08ppb0bxbrsxazy88sgpl9yffvdsabw6dkk1nc332wcz2mphwwyf"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-boolean.py" ,python-boolean.py)))
+    (home-page "https://github.com/nexB/license-expression")
+    (synopsis "Apply boolean logic to license expressions")
+    (description
+     "This Python module defines a tiny language to evaluate and compare
+license expressions using boolean logic.  Logical combinations of licenses can
+be tested for equality, containment, and equivalence.  They can be normalised
+and simplified.  It supports SPDX license expressions as well as other naming
+conventions and aliases in the same expression.")
+    (license license:gpl2+)))
+
 (define-public python-lockfile
   (package
     (name "python-lockfile")
-- 
cgit v1.2.3


From 7c552913c1616b182aa885cf867e49eb0f7594f9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 27 Sep 2019 12:08:45 +0200
Subject: gnu: Add reuse.

* gnu/packages/license.scm (reuse): New public variable.
---
 gnu/packages/license.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm
index 82dbd2dba1..73b0dff3f5 100644
--- a/gnu/packages/license.scm
+++ b/gnu/packages/license.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Oleg Pykhalov 
-;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,10 +19,15 @@
 
 (define-module (gnu packages license)
   #:use-module (gnu packages)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
+  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages python-xyz)
   #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix licenses)
   #:use-module (guix packages))
 
@@ -160,3 +165,45 @@ statements and serializes in normalized format.")
 to each file passed to it, by searching the start of the file for text
 belonging to various licenses.")
     (license (package-license perl))))
+
+(define-public reuse
+  (package
+    (name "reuse")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.fsfe.org/reuse/tool.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1w17g6jvs715rjc93nnnqnfdphijq4ymj9jjkr3ccc286ywvn3ih"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (inputs
+     `(("python-binaryornot" ,python-binaryornot)
+       ("python-boolean.py" ,python-boolean.py)
+       ("python-debian" ,python-debian)
+       ("python-jinja2" ,python-jinja2)
+       ("python-license-expression" ,python-license-expression)
+       ("python-requests" ,python-requests)))
+    (home-page "https://reuse.software/")
+    (synopsis "Provide and verify copyright and licensing information")
+    (description
+     "The REUSE tool helps you achieve and confirm license compliance with the
+@uref{https://reuse.software, REUSE specification}, a set of recommendations
+for licensing Free Software projects.  REUSE makes it easy to declare the
+licenses under which your works are released, especially when reusing software
+from different projects released under different licenses.  It avoids reliance
+on fuzzy heuristicts and allows both legal experts and computers to understand
+how your project is licensed.  This allows generating a \"bill of materials\"
+for software.
+
+This tool downloads full license texts, adds copyright and license information
+to file headers, and contains a linter to identify problems.  There are other
+tools that have a lot more features and functionality surrounding the analysis
+and inspection of copyright and licenses in software projects.  This one is
+designed to be simple.")
+    (license (list asl2.0 gpl3+))))
-- 
cgit v1.2.3


From 9e34a5f3b2d37cc8fb9f16620747df41488665be Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 29 Sep 2019 20:52:48 +0200
Subject: gnu: linux-libre: Add version 5.3.1.

* gnu/packages/linux.scm (linux-libre-5.3-version)
(linux-libre-5.3-pristine-source, linux-libre-5.3-source)
(linux-libre-headers-5.3, linux-libre-5.3): New public variables.
* gnu/packages/aux-files/linux-libre/5.3-arm.conf,
gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf,
gnu/packages/aux-files/linux-libre/5.3-arm64.conf,
gnu/packages/aux-files/linux-libre/5.3-i686.conf,
gnu/packages/aux-files/linux-libre/5.3-x86_64.conf: New files.
* Makefile.am (AUX_FILES): Add them.
---
 Makefile.am                                        |     5 +
 .../aux-files/linux-libre/5.3-arm-veyron.conf      |  4997 +++++++++
 gnu/packages/aux-files/linux-libre/5.3-arm.conf    |  9316 +++++++++++++++++
 gnu/packages/aux-files/linux-libre/5.3-arm64.conf  |  9246 +++++++++++++++++
 gnu/packages/aux-files/linux-libre/5.3-i686.conf   | 10271 +++++++++++++++++++
 gnu/packages/aux-files/linux-libre/5.3-x86_64.conf | 10227 ++++++++++++++++++
 gnu/packages/linux.scm                             |    29 +
 7 files changed, 44091 insertions(+)
 create mode 100644 gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf
 create mode 100644 gnu/packages/aux-files/linux-libre/5.3-arm.conf
 create mode 100644 gnu/packages/aux-files/linux-libre/5.3-arm64.conf
 create mode 100644 gnu/packages/aux-files/linux-libre/5.3-i686.conf
 create mode 100644 gnu/packages/aux-files/linux-libre/5.3-x86_64.conf

diff --git a/Makefile.am b/Makefile.am
index 6a4cfcd4a1..3326fab495 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -316,6 +316,11 @@ dist_noinst_DATA =				\
 AUX_FILES =						\
   gnu/packages/aux-files/chromium/master-preferences.json		\
   gnu/packages/aux-files/emacs/guix-emacs.el		\
+  gnu/packages/aux-files/linux-libre/5.3-arm.conf	\
+  gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf       \
+  gnu/packages/aux-files/linux-libre/5.3-arm64.conf	\
+  gnu/packages/aux-files/linux-libre/5.3-i686.conf	\
+  gnu/packages/aux-files/linux-libre/5.3-x86_64.conf	\
   gnu/packages/aux-files/linux-libre/5.2-arm.conf	\
   gnu/packages/aux-files/linux-libre/5.2-arm-veyron.conf       \
   gnu/packages/aux-files/linux-libre/5.2-arm64.conf	\
diff --git a/gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf b/gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf
new file mode 100644
index 0000000000..72cb647b52
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/5.3-arm-veyron.conf
@@ -0,0 +1,4997 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 5.3.1-gnu Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 7.4.0
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70400
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="debsus"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_PREEMPTION=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_PSI is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# end of Scheduler features
+
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+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_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+CONFIG_EMBEDDED=y
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_ARM=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_PGTABLE_LEVELS=3
+
+#
+# System Type
+#
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP1 is not set
+
+#
+# Multiple platform selection
+#
+
+#
+# CPU Core family selection
+#
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
+# end of Multiple platform selection
+
+# CONFIG_ARCH_VIRT is not set
+# CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_ARTPEC is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_AXXIA is not set
+# CONFIG_ARCH_BCM is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_DIGICOLOR is not set
+# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_HIGHBANK is not set
+# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MILBEAUT is not set
+# CONFIG_ARCH_MMP is not set
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_NPCM is not set
+
+#
+# TI OMAP/AM/DM/DRA Family
+#
+# CONFIG_ARCH_OMAP3 is not set
+# CONFIG_ARCH_OMAP4 is not set
+# CONFIG_SOC_OMAP5 is not set
+# CONFIG_SOC_AM33XX is not set
+# CONFIG_SOC_AM43XX is not set
+# CONFIG_SOC_DRA7XX is not set
+# end of TI OMAP/AM/DM/DRA Family
+
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_RDA is not set
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_ARCH_ROCKCHIP=y
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_RENESAS is not set
+# CONFIG_ARCH_SOCFPGA is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_STM32 is not set
+# CONFIG_ARCH_SUNXI is not set
+# CONFIG_ARCH_TANGO is not set
+# CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARCH_WM8850 is not set
+# CONFIG_ARCH_ZX is not set
+# CONFIG_ARCH_ZYNQ is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_V7=y
+CONFIG_CPU_THUMB_CAPABLE=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_LPAE=y
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_SWP_EMULATE=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_SPECTRE=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_VDSO=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_CACHE_L2X0=y
+# CONFIG_CACHE_L2X0_PMU is not set
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
+CONFIG_PL310_ERRATA_753970=y
+CONFIG_PL310_ERRATA_769419=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARM_HEAVY_MB=y
+CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_643719=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_764369=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_ERRATA_798181=y
+CONFIG_ARM_ERRATA_773022=y
+CONFIG_ARM_ERRATA_818325_852422=y
+CONFIG_ARM_ERRATA_821420=y
+CONFIG_ARM_ERRATA_825619=y
+CONFIG_ARM_ERRATA_857271=y
+# CONFIG_ARM_ERRATA_852421 is not set
+CONFIG_ARM_ERRATA_852423=y
+CONFIG_ARM_ERRATA_857272=y
+# end of System Type
+
+#
+# Bus support
+#
+CONFIG_ARM_ERRATA_814220=y
+# end of Bus support
+
+#
+# Kernel Features
+#
+CONFIG_HAVE_SMP=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_SCHED_MC=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_TWD=y
+# CONFIG_MCPM is not set
+# CONFIG_BIG_LITTLE is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_NR_CPUS=4
+CONFIG_HOTPLUG_CPU=y
+CONFIG_ARM_PSCI=y
+CONFIG_ARCH_NR_GPIO=288
+CONFIG_HZ_FIXED=0
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_200 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_500 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_ARM_PATCH_IDIV=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_SECCOMP=y
+# CONFIG_PARAVIRT is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+# CONFIG_XEN is not set
+CONFIG_STACKPROTECTOR_PER_TASK=y
+# end of Kernel Features
+
+#
+# Boot options
+#
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+# CONFIG_ARM_ATAG_DTB_COMPAT is not set
+CONFIG_CMDLINE=""
+# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
+CONFIG_AUTO_ZRELADDR=y
+# CONFIG_EFI is not set
+# end of Boot options
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Frequency scaling
+#
+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_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
+# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+# CONFIG_QORIQ_CPUFREQ is not set
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+CONFIG_DT_IDLE_STATES=y
+
+#
+# ARM CPU Idle Drivers
+#
+CONFIG_ARM_CPUIDLE=y
+# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+# end of ARM CPU Idle Drivers
+# end of CPU Idle
+# end of CPU Power Management
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+# CONFIG_KERNEL_MODE_NEON is not set
+# end of Floating point emulation
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+# CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_CPU_PM=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+# end of Power management options
+
+#
+# Firmware Drivers
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_ARM_SCPI_POWER_DOMAIN=y
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_FW_CFG_SYSFS is not set
+# CONFIG_TRUSTED_FOUNDATIONS is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+# CONFIG_ARM_CRYPTO is not set
+# CONFIG_VIRTUALIZATION is not set
+
+#
+# General architecture-dependent options
+#
+# CONFIG_OPROFILE is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
+# end of GCC plugins
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS 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 is not set
+CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
+# CONFIG_BLK_WBT is not set
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_DEBUG_FS is not set
+# CONFIG_BLK_SED_OPAL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_PM=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+# CONFIG_IOSCHED_BFQ is not set
+# end of IO Schedulers
+
+CONFIG_ASN1=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_ELF_FDPIC is not set
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
+# CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+# CONFIG_CLEANCACHE is not set
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
+CONFIG_ZSMALLOC=y
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=y
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_UNIX_DIAG=y
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_INTERFACE is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_IP_MROUTE is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_NET_IPVTI is not set
+# CONFIG_NET_FOU is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+CONFIG_IPV6_MIP6=m
+# CONFIG_IPV6_ILA is not set
+# CONFIG_IPV6_VTI is not set
+# CONFIG_IPV6_SIT is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_BRIDGE_NETFILTER is not set
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NETFILTER_NETLINK_OSF is not set
+CONFIG_NF_CONNTRACK=y
+# CONFIG_NF_LOG_NETDEV is not set
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+# CONFIG_NF_CONNTRACK_LABELS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
+# CONFIG_NF_CT_PROTO_SCTP is not set
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_CONNTRACK_AMANDA is not set
+# CONFIG_NF_CONNTRACK_FTP is not set
+# CONFIG_NF_CONNTRACK_H323 is not set
+# CONFIG_NF_CONNTRACK_IRC is not set
+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
+# CONFIG_NF_CONNTRACK_SNMP is not set
+# CONFIG_NF_CONNTRACK_PPTP is not set
+# CONFIG_NF_CONNTRACK_SANE is not set
+# CONFIG_NF_CONNTRACK_SIP is not set
+# CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CT_NETLINK is not set
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
+# CONFIG_NF_NAT is not set
+# CONFIG_NF_TABLES is not set
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+# CONFIG_NETFILTER_XT_MARK is not set
+# CONFIG_NETFILTER_XT_CONNMARK is not set
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
+# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+
+#
+# Xtables matches
+#
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
+# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# end of Core Netfilter Configuration
+
+# CONFIG_IP_SET is not set
+# CONFIG_IP_VS is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=y
+# CONFIG_NF_SOCKET_IPV4 is not set
+# CONFIG_NF_TPROXY_IPV4 is not set
+# CONFIG_NF_DUP_IPV4 is not set
+# CONFIG_NF_LOG_ARP is not set
+# CONFIG_NF_LOG_IPV4 is not set
+# CONFIG_NF_REJECT_IPV4 is not set
+CONFIG_IP_NF_IPTABLES=y
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+CONFIG_IP_NF_FILTER=y
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
+# CONFIG_IP_NF_NAT is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_NF_SOCKET_IPV6 is not set
+# CONFIG_NF_TPROXY_IPV6 is not set
+# CONFIG_NF_DUP_IPV6 is not set
+# CONFIG_NF_REJECT_IPV6 is not set
+# CONFIG_NF_LOG_IPV6 is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=y
+CONFIG_NF_CONNTRACK_BRIDGE=m
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BPFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
+CONFIG_STP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_HAVE_NET_DSA=y
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+CONFIG_ATALK=y
+# CONFIG_DEV_APPLETALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_PHONET is not set
+# CONFIG_6LOWPAN is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+# CONFIG_DNS_RESOLVER is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_OPENVSWITCH is not set
+# CONFIG_VSOCKETS is not set
+# CONFIG_NETLINK_DIAG is not set
+# CONFIG_MPLS is not set
+# CONFIG_NET_NSH is not set
+# CONFIG_HSR is not set
+# CONFIG_NET_SWITCHDEV is not set
+# CONFIG_NET_L3_MASTER_DEV is not set
+# CONFIG_NET_NCSI is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+CONFIG_BT=y
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=y
+# CONFIG_BT_RFCOMM_TTY is not set
+CONFIG_BT_BNEP=y
+# CONFIG_BT_BNEP_MC_FILTER is not set
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=y
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+# CONFIG_BT_LEDS is not set
+# CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_DEBUGFS is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=y
+CONFIG_BT_HCIBTUSB=y
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+# CONFIG_BT_HCIBTUSB_BCM is not set
+CONFIG_BT_HCIBTUSB_MTK=y
+# CONFIG_BT_HCIBTUSB_RTL is not set
+# CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT_MRVL is not set
+# CONFIG_BT_ATH3K is not set
+# CONFIG_BT_MTKSDIO is not set
+# end of Bluetooth device drivers
+
+# CONFIG_AF_RXRPC is not set
+# CONFIG_AF_KCM is not set
+CONFIG_WIRELESS=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_CFG80211=y
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=y
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+# CONFIG_MAC80211_MESH is not set
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
+# CONFIG_PSAMPLE is not set
+# CONFIG_NET_IFE is not set
+# CONFIG_LWTUNNEL is not set
+CONFIG_GRO_CELLS=y
+CONFIG_FAILOVER=m
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+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 is not set
+# CONFIG_PCIE_PTM is not set
+# CONFIG_PCIE_BW is not set
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence PCIe controllers support
+#
+# CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
+# CONFIG_PCI_FTPCI100 is not set
+# CONFIG_PCI_HOST_GENERIC is not set
+# CONFIG_PCIE_XILINX is not set
+# CONFIG_PCI_V3_SEMI is not set
+# CONFIG_PCIE_ALTERA is not set
+
+#
+# DesignWare PCI Core Support
+#
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
+# CONFIG_PCCARD is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# CONFIG_BRCMSTB_GISB_ARB is not set
+# CONFIG_SIMPLE_PM_BUS is not set
+# CONFIG_VEXPRESS_CONFIG is not set
+# end of Bus devices
+
+CONFIG_CONNECTOR=m
+# CONFIG_GNSS is not set
+# CONFIG_MTD is not set
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_NULL_BLK is not set
+CONFIG_CDROM=y
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+CONFIG_ZRAM=y
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_VIRTIO_BLK=m
+# CONFIG_VIRTIO_BLK_SCSI is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_BLK_DEV_RSXX is not set
+
+#
+# NVME Support
+#
+# CONFIG_BLK_DEV_NVME is not set
+# CONFIG_NVME_FC is not set
+# CONFIG_NVME_TARGET is not set
+# end of NVME Support
+
+#
+# Misc devices
+#
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_SRAM=y
+CONFIG_SRAM_EXEC=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=y
+# CONFIG_PVPANIC is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# end of EEPROM support
+
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# end of Texas Instruments shared transport line discipline
+
+# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+# CONFIG_ALTERA_STAPL is not set
+
+#
+# Intel MIC & related support
+#
+
+#
+# Intel MIC Bus Driver
+#
+
+#
+# SCIF Bus Driver
+#
+
+#
+# VOP Bus Driver
+#
+# CONFIG_VOP_BUS is not set
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
+# SCIF Driver
+#
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
+# VOP Driver
+#
+# end of Intel MIC & related support
+
+# CONFIG_ECHO is not set
+# CONFIG_MISC_ALCOR_PCI is not set
+# CONFIG_MISC_RTSX_PCI is not set
+CONFIG_MISC_RTSX_USB=y
+# CONFIG_HABANA_AI is not set
+# end of Misc devices
+
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=y
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVUMI is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_ESAS2R is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT3SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_SMARTPQI is not set
+# CONFIG_SCSI_UFSHCD is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_MYRB is not set
+# CONFIG_SCSI_MYRS is not set
+# CONFIG_SCSI_SNIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_AM53C974 is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_WD719X is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_VIRTIO is not set
+# CONFIG_SCSI_DH is not set
+# end of SCSI device support
+
+# CONFIG_ATA is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+# CONFIG_MD_LINEAR is not set
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_BCACHE is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+# CONFIG_DM_INTEGRITY is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_NETDEVICES=y
+CONFIG_MII=y
+CONFIG_NET_CORE=y
+# CONFIG_BONDING is not set
+# CONFIG_DUMMY is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NET_TEAM is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_IPVLAN is not set
+# CONFIG_VXLAN is not set
+# CONFIG_GENEVE is not set
+# CONFIG_GTP is not set
+# CONFIG_MACSEC is not set
+# CONFIG_NETCONSOLE is not set
+CONFIG_TUN=y
+# CONFIG_TUN_VNET_CROSS_LE is not set
+# CONFIG_VETH is not set
+CONFIG_VIRTIO_NET=m
+# CONFIG_NLMON is not set
+# CONFIG_ARCNET is not set
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+# end of Distributed Switch Architecture drivers
+
+# CONFIG_ETHERNET is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_AQUANTIA_PHY is not set
+# CONFIG_AX88796B_PHY is not set
+# CONFIG_AT803X_PHY is not set
+# CONFIG_BCM7XXX_PHY is not set
+# CONFIG_BCM87XX_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_CORTINA_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_DP83822_PHY is not set
+# CONFIG_DP83TC811_PHY is not set
+# CONFIG_DP83848_PHY is not set
+# CONFIG_DP83867_PHY is not set
+CONFIG_FIXED_PHY=y
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_INTEL_XWAY_PHY is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MARVELL_10G_PHY is not set
+# CONFIG_MICREL_PHY is not set
+CONFIG_MICROCHIP_PHY=y
+# CONFIG_MICROCHIP_T1_PHY is not set
+# CONFIG_MICROSEMI_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_RENESAS_PHY is not set
+# CONFIG_ROCKCHIP_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_TERANETICS_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+CONFIG_USB_NET_DRIVERS=y
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+CONFIG_USB_RTL8150=y
+CONFIG_USB_RTL8152=y
+CONFIG_USB_LAN78XX=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_AX88179_178A=y
+CONFIG_USB_NET_CDCETHER=y
+CONFIG_USB_NET_CDC_EEM=y
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
+# CONFIG_USB_NET_CDC_MBIM is not set
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_SR9700 is not set
+# CONFIG_USB_NET_SR9800 is not set
+CONFIG_USB_NET_SMSC75XX=y
+CONFIG_USB_NET_SMSC95XX=y
+# CONFIG_USB_NET_GL620A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=y
+CONFIG_USB_NET_CDC_SUBSET=y
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+# CONFIG_USB_BELKIN is not set
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
+# CONFIG_USB_HSO is not set
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_NET_CH9200 is not set
+# CONFIG_USB_NET_AQC111 is not set
+CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+# CONFIG_ATH5K is not set
+# CONFIG_ATH5K_PCI is not set
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+# CONFIG_ATH9K is not set
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_CARL9170 is not set
+# CONFIG_ATH6KL is not set
+# CONFIG_AR5523 is not set
+# CONFIG_WIL6210 is not set
+# CONFIG_ATH10K is not set
+# CONFIG_WCN36XX is not set
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+# CONFIG_WLAN_VENDOR_BROADCOM is not set
+# CONFIG_WLAN_VENDOR_CISCO is not set
+# CONFIG_WLAN_VENDOR_INTEL is not set
+# CONFIG_WLAN_VENDOR_INTERSIL is not set
+# CONFIG_WLAN_VENDOR_MARVELL is not set
+# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+# CONFIG_WLAN_VENDOR_RALINK is not set
+# CONFIG_WLAN_VENDOR_REALTEK is not set
+# CONFIG_WLAN_VENDOR_RSI is not set
+# CONFIG_WLAN_VENDOR_ST is not set
+# CONFIG_WLAN_VENDOR_TI is not set
+# CONFIG_WLAN_VENDOR_ZYDAS is not set
+# CONFIG_WLAN_VENDOR_QUANTENNA is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_VIRT_WIFI is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+# CONFIG_VMXNET3 is not set
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+# CONFIG_NVM is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+# CONFIG_INPUT_SPARSEKMAP is not set
+CONFIG_INPUT_MATRIXKMAP=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_APMPOWER is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_QT1050 is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
+# CONFIG_KEYBOARD_TWL4030 is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=y
+# CONFIG_KEYBOARD_CAP11XX is not set
+# CONFIG_KEYBOARD_BCM is not set
+CONFIG_INPUT_MOUSE=y
+# CONFIG_MOUSE_PS2 is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
+CONFIG_MOUSE_ELAN_I2C=y
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=y
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+# CONFIG_RMI4_CORE is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+# CONFIG_TRACE_SINK is not set
+CONFIG_NULL_TTY=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_ASPEED_VUART is not set
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_RT288X is not set
+# CONFIG_SERIAL_8250_MOXA is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_ARC=y
+CONFIG_SERIAL_ARC_CONSOLE=y
+CONFIG_SERIAL_ARC_NR_PORTS=1
+# CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_DEV_BUS is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
+# CONFIG_VIRTIO_CONSOLE is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+CONFIG_TCG_TPM=y
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_I2C_ATMEL is not set
+CONFIG_TCG_TIS_I2C_INFINEON=y
+# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_VTPM_PROXY is not set
+# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
+# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
+CONFIG_DEVPORT=y
+# CONFIG_XILLYBUS is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_ALGOBIT=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NVIDIA_GPU is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_GPIO=y
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+# CONFIG_I2C_NOMADIK is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+CONFIG_I2C_RK3X=y
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_DIOLAN_U2C is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=y
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+# CONFIG_I3C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+# CONFIG_SPI_MEM is not set
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BITBANG=y
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
+CONFIG_SPI_GPIO=y
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PXA2XX is not set
+CONFIG_SPI_ROCKCHIP=y
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
+# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+# CONFIG_SPMI is not set
+# CONFIG_HSI is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AS3722=y
+# CONFIG_PINCTRL_AXP209 is not set
+# CONFIG_PINCTRL_AMD is not set
+# CONFIG_PINCTRL_MCP23S08 is not set
+CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_STMFX is not set
+CONFIG_PINCTRL_PALMAS=y
+# CONFIG_PINCTRL_RK805 is not set
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_CADENCE is not set
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_HLWD is not set
+# CONFIG_GPIO_MB86S7X is not set
+# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_SAMA5D2_PIOBU is not set
+# CONFIG_GPIO_SYSCON is not set
+CONFIG_GPIO_XILINX=m
+# CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GPIO_AMD_FCH is not set
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_GW_PLD is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_BD70528=m
+# CONFIG_GPIO_DA9052 is not set
+# CONFIG_HTC_EGPIO is not set
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_TWL4030=y
+CONFIG_GPIO_TWL6040=y
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_BT8XX is not set
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX3191X is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
+# CONFIG_W1 is not set
+CONFIG_POWER_AVS=y
+CONFIG_ROCKCHIP_IODOMAIN=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
+# CONFIG_POWER_RESET_BRCMKONA is not set
+# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+CONFIG_POWER_RESET_RESTART=y
+# CONFIG_POWER_RESET_VERSATILE is not set
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_REBOOT_MODE=y
+CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_NVMEM_REBOOT_MODE=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_CHARGER_ADP5061 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_LEGO_EV3 is not set
+CONFIG_BATTERY_SBS=y
+# CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
+# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_DA9052 is not set
+# CONFIG_AXP20X_POWER is not set
+# CONFIG_AXP288_FUEL_GAUGE is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_TWL4030 is not set
+# CONFIG_CHARGER_LP8727 is not set
+CONFIG_CHARGER_GPIO=y
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_CHARGER_RT9455 is not set
+# CONFIG_CHARGER_CROS_USBPD is not set
+# CONFIG_CHARGER_UCS1002 is not set
+# CONFIG_CHARGER_BD70528 is not set
+# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+# CONFIG_CLOCK_THERMAL is not set
+# CONFIG_DEVFREQ_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_MMIO is not set
+# CONFIG_QORIQ_THERMAL is not set
+CONFIG_ROCKCHIP_THERMAL=y
+# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+# CONFIG_WATCHDOG_SYSFS is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_BD70528_WATCHDOG=m
+# CONFIG_DA9052_WATCHDOG is not set
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+# CONFIG_ARM_SP805_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+# CONFIG_FTWDT010_WATCHDOG is not set
+CONFIG_DW_WATCHDOG=y
+# CONFIG_TWL4030_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_MEN_A21_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+CONFIG_BCMA_POSSIBLE=y
+# CONFIG_BCMA is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_AS3711 is not set
+CONFIG_MFD_AS3722=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_BD9571MWV is not set
+CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X_I2C=y
+CONFIG_MFD_CROS_EC=y
+CONFIG_MFD_CROS_EC_CHARDEV=y
+# CONFIG_MFD_MADERA is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_PMIC_DA903X is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_LPC_ICH is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
+# CONFIG_MFD_MAX77650 is not set
+CONFIG_MFD_MAX77686=y
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
+# CONFIG_MFD_VIPERBOARD is not set
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_MFD_PM8XXX is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_RK808=y
+# CONFIG_MFD_RN5T618 is not set
+CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+CONFIG_MFD_PALMAS=y
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_POWER=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_ROHM_BD718XX is not set
+CONFIG_MFD_ROHM_BD70528=m
+# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_STMFX is not set
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_ACT8865=y
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_AS3722=y
+# CONFIG_REGULATOR_AXP20X is not set
+CONFIG_REGULATOR_BD70528=m
+# CONFIG_REGULATOR_DA9052 is not set
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=y
+# CONFIG_REGULATOR_GPIO is not set
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MAX77686 is not set
+# CONFIG_REGULATOR_MAX77802 is not set
+# CONFIG_REGULATOR_MCP16502 is not set
+# CONFIG_REGULATOR_MT6311 is not set
+CONFIG_REGULATOR_PALMAS=y
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK808=y
+# CONFIG_REGULATOR_S2MPA01 is not set
+# CONFIG_REGULATOR_S2MPS11 is not set
+# CONFIG_REGULATOR_S5M8767 is not set
+CONFIG_REGULATOR_SLG51000=m
+# CONFIG_REGULATOR_SY8106A is not set
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_REGULATOR_TWL4030=y
+# CONFIG_REGULATOR_VCTRL is not set
+# CONFIG_RC_CORE is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_IMX_IPUV3_CORE is not set
+CONFIG_DRM=y
+CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_MM is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=y
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# CONFIG_DRM_HDLCD is not set
+# CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# end of ACP (Audio CoProcessor) Configuration
+
+# CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_VGEM is not set
+# CONFIG_DRM_VKMS is not set
+# CONFIG_DRM_EXYNOS is not set
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+# CONFIG_ROCKCHIP_INNO_HDMI is not set
+# CONFIG_ROCKCHIP_LVDS is not set
+# CONFIG_ROCKCHIP_RGB is not set
+CONFIG_ROCKCHIP_RK3066_HDMI=y
+# CONFIG_DRM_UDL is not set
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_RCAR_DW_HDMI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
+# CONFIG_DRM_OMAP is not set
+# CONFIG_DRM_TILCDC is not set
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_BOCHS is not set
+# CONFIG_DRM_VIRTIO_GPU is not set
+# CONFIG_DRM_FSL_DCU is not set
+# CONFIG_DRM_STM is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
+# CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_SIMPLE=y
+# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
+# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
+# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_DUMB_VGA_DAC is not set
+# CONFIG_DRM_LVDS_ENCODER is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI86 is not set
+CONFIG_DRM_ANALOGIX_DP=y
+# CONFIG_DRM_I2C_ADV7511 is not set
+CONFIG_DRM_DW_HDMI=y
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=y
+# CONFIG_DRM_DW_HDMI_CEC is not set
+CONFIG_DRM_DW_MIPI_DSI=y
+# end of Display Interface Bridges
+
+# CONFIG_DRM_STI is not set
+# CONFIG_DRM_ETNAVIV is not set
+# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_HISI_HIBMC is not set
+# CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_TINYDRM is not set
+# CONFIG_DRM_PL111 is not set
+# CONFIG_DRM_TVE200 is not set
+# CONFIG_DRM_LIMA is not set
+CONFIG_DRM_PANFROST=y
+CONFIG_DRM_MCDE=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_ARMCLCD is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=y
+CONFIG_BACKLIGHT_PWM=y
+# CONFIG_BACKLIGHT_DA9052 is not set
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_PANDORA is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_SEQ_DEVICE=y
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+# CONFIG_SND_OSSEMUL is not set
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_PROC_FS=y
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_SEQUENCER=y
+# CONFIG_SND_SEQ_DUMMY is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+# CONFIG_SND_DRIVERS is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SE6X is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+# CONFIG_SND_HDA_INTEL is not set
+# end of HD-Audio
+
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_DESIGNWARE_I2S=y
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
+# CONFIG_SND_I2S_HI6210_I2S is not set
+# CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
+CONFIG_SND_SOC_ROCKCHIP=y
+CONFIG_SND_SOC_ROCKCHIP_I2S=y
+CONFIG_SND_SOC_ROCKCHIP_PDM=y
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
+CONFIG_SND_SOC_ROCKCHIP_RT5645=y
+CONFIG_SND_SOC_RK3288_HDMI_ANALOG=y
+# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+# CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+# CONFIG_ZX_TDM is not set
+CONFIG_SND_SOC_I2C_AND_SPI=y
+
+#
+# CODEC drivers
+#
+# CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+# CONFIG_SND_SOC_ADAU7002 is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4458 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_AK5558 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+# CONFIG_SND_SOC_BD28623 is not set
+# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+# CONFIG_SND_SOC_DMIC is not set
+CONFIG_SND_SOC_HDMI_CODEC=y
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES8328=y
+CONFIG_SND_SOC_ES8328_I2C=y
+CONFIG_SND_SOC_ES8328_SPI=y
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+# CONFIG_SND_SOC_MAX98088 is not set
+CONFIG_SND_SOC_MAX98090=y
+# CONFIG_SND_SOC_MAX98357A is not set
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9867 is not set
+# CONFIG_SND_SOC_MAX98927 is not set
+# CONFIG_SND_SOC_MAX98373 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1789_I2C is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+# CONFIG_SND_SOC_PCM3060_I2C is not set
+# CONFIG_SND_SOC_PCM3060_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RL6231=y
+# CONFIG_SND_SOC_RT5616 is not set
+# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5645=y
+# CONFIG_SND_SOC_SGTL5000 is not set
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC3X is not set
+CONFIG_SND_SOC_TS3A227E=y
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8524 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+# CONFIG_SND_SOC_WM8753 is not set
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+# CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8904 is not set
+# CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_ZX_AUD96P22 is not set
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8822 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# end of CODEC drivers
+
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_AUDIO_GRAPH_CARD is not set
+
+#
+# HID support
+#
+CONFIG_HID=y
+# CONFIG_HID_BATTERY_STRENGTH is not set
+CONFIG_HIDRAW=y
+CONFIG_UHID=y
+CONFIG_HID_GENERIC=y
+
+#
+# Special HID drivers
+#
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACCUTOUCH is not set
+# CONFIG_HID_ACRUX is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_ASUS is not set
+# CONFIG_HID_AUREAL is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_BETOP_FF is not set
+# CONFIG_HID_BIGBEN_FF is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+CONFIG_HID_CORSAIR=y
+# CONFIG_HID_COUGAR is not set
+# CONFIG_HID_MACALLY is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CP2112 is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
+CONFIG_HID_ELAN=y
+# CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GEMBIRD is not set
+# CONFIG_HID_GFRM is not set
+# CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GT683R is not set
+# CONFIG_HID_KEYTOUCH is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_ICADE is not set
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LCPOWER is not set
+# CONFIG_HID_LED is not set
+# CONFIG_HID_LENOVO is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
+# CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTI is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PENMOUNT is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PLANTRONICS is not set
+# CONFIG_HID_PRIMAX is not set
+# CONFIG_HID_RETRODE is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
+# CONFIG_HID_STEELSERIES is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_HID_RMI is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_THINGM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_UDRAW_PS3 is not set
+CONFIG_HID_U2FZERO=m
+# CONFIG_HID_WACOM is not set
+# CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HID_SENSOR_HUB is not set
+# CONFIG_HID_ALPS is not set
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=y
+CONFIG_HID_PID=y
+# CONFIG_USB_HIDDEV is not set
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=y
+# end of I2C HID support
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+CONFIG_USB_OTG=y
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_OTG_FSM is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=y
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=y
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=y
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_STORAGE_CYPRESS_ATACB=y
+CONFIG_USB_STORAGE_ENE_UB6250=y
+CONFIG_USB_UAS=y
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PCI is not set
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+# CONFIG_USB_CHIPIDEA is not set
+# CONFIG_USB_ISP1760 is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_YUREX is not set
+# CONFIG_USB_EZUSB_FX2 is not set
+# CONFIG_USB_HUB_USB251XB is not set
+# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=y
+# CONFIG_AM335X_PHY_USB is not set
+CONFIG_USB_GPIO_VBUS=y
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_ULPI is not set
+# end of USB Physical Layer drivers
+
+# CONFIG_USB_GADGET is not set
+# CONFIG_TYPEC is not set
+# CONFIG_USB_ROLE_SWITCH is not set
+# CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_UWB is not set
+CONFIG_MMC=y
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=16
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_ARMMMCI is not set
+CONFIG_MMC_SDHCI=y
+# CONFIG_MMC_SDHCI_PCI is not set
+CONFIG_MMC_SDHCI_PLTFM=y
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+CONFIG_MMC_SDHCI_CADENCE=y
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+# CONFIG_MMC_TIFM_SD is not set
+CONFIG_MMC_SPI=y
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_PLTFM=y
+# CONFIG_MMC_DW_BLUEFIELD is not set
+# CONFIG_MMC_DW_EXYNOS is not set
+# CONFIG_MMC_DW_HI3798CV200 is not set
+# CONFIG_MMC_DW_K3 is not set
+# CONFIG_MMC_DW_PCI is not set
+CONFIG_MMC_DW_ROCKCHIP=y
+# CONFIG_MMC_VUB300 is not set
+CONFIG_MMC_USHC=y
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_USB=y
+# CONFIG_MMC_CQHCI is not set
+# CONFIG_MMC_TOSHIBA_PCI is not set
+# CONFIG_MMC_MTK is not set
+# CONFIG_MMC_SDHCI_XENON is not set
+# CONFIG_MMC_SDHCI_OMAP is not set
+# CONFIG_MMC_SDHCI_AM654 is not set
+# CONFIG_MEMSTICK is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3532 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP3952 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP8860 is not set
+# CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_DA9052 is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEDS_BD2802 is not set
+# CONFIG_LEDS_LT3593 is not set
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+CONFIG_LEDS_TRIGGER_CPU=y
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_PANIC is not set
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+# CONFIG_LEDS_TRIGGER_AUDIO is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+# CONFIG_RTC_DRV_AS3722 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+CONFIG_RTC_DRV_HYM8563=y
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_MAX77686 is not set
+CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_TWL4030 is not set
+# CONFIG_RTC_DRV_PALMAS is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_S5M is not set
+# CONFIG_RTC_DRV_SD3078 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+# CONFIG_RTC_DRV_DA9052 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+CONFIG_RTC_DRV_CROS_EC=y
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PL030 is not set
+# CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_CADENCE is not set
+# CONFIG_RTC_DRV_FTRTC010 is not set
+# CONFIG_RTC_DRV_SNVS is not set
+# CONFIG_RTC_DRV_R7301 is not set
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
+CONFIG_AMBA_PL08X=y
+# CONFIG_DW_AXI_DMAC is not set
+# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_QDMA is not set
+# CONFIG_INTEL_IDMA64 is not set
+# CONFIG_NBPFAXI_DMA is not set
+CONFIG_PL330_DMA=y
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+
+#
+# DMA Clients
+#
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# end of DMABUF options
+
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+# CONFIG_VFIO is not set
+# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRTIO=y
+# CONFIG_VIRTIO_MENU is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+# CONFIG_STAGING is not set
+# CONFIG_GOLDFISH is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC_I2C=y
+CONFIG_CROS_EC_SPI=y
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_EC_LIGHTBAR=y
+CONFIG_CROS_EC_VBC=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SYSFS=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+# CONFIG_CLK_HSDK is not set
+# CONFIG_COMMON_CLK_MAX77686 is not set
+# CONFIG_COMMON_CLK_MAX9485 is not set
+CONFIG_COMMON_CLK_RK808=y
+# CONFIG_COMMON_CLK_SCPI is not set
+CONFIG_COMMON_CLK_SI5341=m
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_COMMON_CLK_S2MPS11 is not set
+# CONFIG_CLK_TWL6040 is not set
+# CONFIG_CLK_QORIQ is not set
+# CONFIG_COMMON_CLK_PALMAS is not set
+# CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_BD718XX is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# end of Common Clock Framework
+
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set
+# CONFIG_PLATFORM_MHU is not set
+CONFIG_PL320_MBOX=y
+CONFIG_ROCKCHIP_MBOX=y
+# CONFIG_ALTERA_MBOX is not set
+# CONFIG_MAILBOX_TEST is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+CONFIG_ROCKCHIP_IOMMU=y
+# CONFIG_ARM_SMMU is not set
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=y
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+# CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# CONFIG_SOC_BRCMSTB is not set
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+# end of Qualcomm SoC drivers
+
+CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_PALMAS is not set
+# CONFIG_EXTCON_PTN5150 is not set
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_USB_GPIO is not set
+# CONFIG_EXTCON_USBC_CROS_EC is not set
+# CONFIG_MEMORY is not set
+CONFIG_IIO=y
+CONFIG_IIO_BUFFER=y
+# CONFIG_IIO_BUFFER_CB is not set
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=y
+CONFIG_IIO_TRIGGERED_BUFFER=y
+# CONFIG_IIO_CONFIGFS is not set
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7124 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
+# CONFIG_AXP20X_ADC is not set
+# CONFIG_AXP288_ADC is not set
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_PALMAS_GPADC is not set
+CONFIG_ROCKCHIP_SARADC=y
+CONFIG_SD_ADC_MODULATOR=y
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_TWL4030_MADC is not set
+# CONFIG_TWL6030_GPADC is not set
+# CONFIG_VF610_ADC is not set
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# end of Amplifiers
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SPS30 is not set
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
+
+#
+# Hid Sensor IIO Common
+#
+# end of Hid Sensor IIO Common
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_KMX61 is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+# CONFIG_ADJD_S311 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+CONFIG_IIO_SYSFS_TRIGGER=y
+# end of Triggers - standalone
+
+#
+# Digital potentiometers
+#
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
+CONFIG_DPS310=m
+# CONFIG_HP03 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_MAX31856 is not set
+# end of Temperature sensors
+
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_CROS_EC=y
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_ROCKCHIP=y
+# CONFIG_PWM_TWL is not set
+# CONFIG_PWM_TWL_LED is not set
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_MAX_NR=1
+# CONFIG_AL_FIC is not set
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_CADENCE_DP is not set
+# CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_SIERRA is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
+CONFIG_PHY_ROCKCHIP_DP=y
+CONFIG_PHY_ROCKCHIP_EMMC=y
+# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
+# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
+# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+CONFIG_PHY_ROCKCHIP_USB=y
+# CONFIG_PHY_SAMSUNG_USB2 is not set
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# CONFIG_ARM_CCI_PMU is not set
+# CONFIG_ARM_CCN is not set
+CONFIG_ARM_PMU=y
+# end of Performance monitor support
+
+CONFIG_RAS=y
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+# CONFIG_LIBNVDIMM is not set
+# CONFIG_DAX is not set
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_ROCKCHIP_EFUSE=y
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+# CONFIG_TEE is not set
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+# CONFIG_COUNTER is not set
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_XFS_FS=m
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_F2FS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FSNOTIFY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+# CONFIG_CUSE is not set
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=y
+# CONFIG_FSCACHE_STATS is not set
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=y
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=850
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+# end of DOS/FAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+# CONFIG_HUGETLBFS is not set
+CONFIG_MEMFD_CREATE=y
+CONFIG_CONFIGFS_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=y
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_XATTR is not set
+CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_LZ4 is not set
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XZ is not set
+# CONFIG_SQUASHFS_ZSTD is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_MAC_ROMAN is not set
+# CONFIG_NLS_MAC_CELTIC is not set
+# CONFIG_NLS_MAC_CENTEURO is not set
+# CONFIG_NLS_MAC_CROATIAN is not set
+# CONFIG_NLS_MAC_CYRILLIC is not set
+# CONFIG_NLS_MAC_GAELIC is not set
+# CONFIG_NLS_MAC_GREEK is not set
+# CONFIG_NLS_MAC_ICELAND is not set
+# CONFIG_NLS_MAC_INUIT is not set
+# CONFIG_NLS_MAC_ROMANIAN is not set
+# CONFIG_NLS_MAC_TURKISH is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+# CONFIG_UNICODE is not set
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_TRUSTED_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SECURITY is not set
+CONFIG_SECURITYFS=y
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+# CONFIG_FORTIFY_SOURCE is not set
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_USER is not set
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+# CONFIG_CRYPTO_DH is not set
+CONFIG_CRYPTO_ECC=y
+CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECRDSA=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_GCM=y
+# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
+CONFIG_CRYPTO_SEQIV=y
+# CONFIG_CRYPTO_ECHAINIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CFB is not set
+CONFIG_CRYPTO_CTR=y
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_OFB is not set
+# CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_XTS=y
+# CONFIG_CRYPTO_KEYWRAP is not set
+# CONFIG_CRYPTO_ADIANTUM is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=y
+# CONFIG_CRYPTO_POLY1305 is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_SHA3 is not set
+# CONFIG_CRYPTO_SM3 is not set
+CONFIG_CRYPTO_STREEBOG=m
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_CHACHA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SM4 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+CONFIG_CRYPTO_LZ4=y
+# CONFIG_CRYPTO_LZ4HC is not set
+# CONFIG_CRYPTO_ZSTD is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+# CONFIG_CRYPTO_USER_API_RNG is not set
+# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_ROCKCHIP=y
+CONFIG_CRYPTO_DEV_VIRTIO=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+# CONFIG_PACKING is not set
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+# CONFIG_CORDIC is not set
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+# CONFIG_CRC64 is not set
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=y
+CONFIG_LIBCRC32C=y
+# CONFIG_CRC8 is not set
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=y
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
+CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_REMAP=y
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_POOL=y
+CONFIG_SBITMAP=y
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=8
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+# CONFIG_MAGIC_SYSRQ_SERIAL is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER 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_STATS is not set
+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_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+# CONFIG_SOFTLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=300
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_TIMEKEEPING is not set
+# CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_KPROBE_EVENTS is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_RUNTIME_TESTING_MENU is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+# CONFIG_STRICT_DEVMEM is not set
+# CONFIG_ARM_PTDUMP_DEBUGFS is not set
+# CONFIG_DEBUG_WX is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+# CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_CORESIGHT is not set
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/5.3-arm.conf b/gnu/packages/aux-files/linux-libre/5.3-arm.conf
new file mode 100644
index 0000000000..66f0d3fd05
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/5.3-arm.conf
@@ -0,0 +1,9316 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm 5.3.1-gnu Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 7.4.0
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70400
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+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_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_BPF is not set
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_USE_VMALLOC=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_ARM=y
+CONFIG_ARM_HAS_SG_CHAIN=y
+CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_HAVE_PROC_CPU=y
+CONFIG_NO_IOPORT_MAP=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_ARCH_HAS_BANDGAP=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIQ=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_PGTABLE_LEVELS=2
+
+#
+# System Type
+#
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_DOVE is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_W90X900 is not set
+# CONFIG_ARCH_LPC32XX is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C24XX is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP1 is not set
+
+#
+# Multiple platform selection
+#
+
+#
+# CPU Core family selection
+#
+# CONFIG_ARCH_MULTI_V6 is not set
+CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARCH_MULTI_V6_V7=y
+# end of Multiple platform selection
+
+CONFIG_ARCH_VIRT=y
+# CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_ARTPEC is not set
+# CONFIG_ARCH_AT91 is not set
+CONFIG_ARCH_BCM=y
+
+#
+# IPROC architected SoCs
+#
+# CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_HR2 is not set
+# CONFIG_ARCH_BCM_NSP is not set
+# CONFIG_ARCH_BCM_5301X is not set
+
+#
+# KONA architected SoCs
+#
+# CONFIG_ARCH_BCM_281XX is not set
+# CONFIG_ARCH_BCM_21664 is not set
+# CONFIG_ARCH_BCM_23550 is not set
+
+#
+# Other Architectures
+#
+CONFIG_ARCH_BCM2835=y
+# CONFIG_ARCH_BCM_53573 is not set
+# CONFIG_ARCH_BCM_63XX is not set
+# CONFIG_ARCH_BRCMSTB is not set
+# CONFIG_ARCH_BERLIN is not set
+# CONFIG_ARCH_DIGICOLOR is not set
+CONFIG_ARCH_EXYNOS=y
+CONFIG_S5P_DEV_MFC=y
+# CONFIG_ARCH_EXYNOS3 is not set
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_ARCH_EXYNOS5=y
+
+#
+# EXYNOS SoCs
+#
+CONFIG_CPU_EXYNOS4210=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5800=y
+CONFIG_EXYNOS_MCPM=y
+CONFIG_EXYNOS_CPU_SUSPEND=y
+CONFIG_PLAT_SAMSUNG=y
+
+#
+# Samsung Common options
+#
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+# end of Samsung Common options
+
+CONFIG_ARCH_HIGHBANK=y
+# CONFIG_ARCH_HISI is not set
+CONFIG_ARCH_MXC=y
+CONFIG_MXC_TZIC=y
+CONFIG_HAVE_IMX_ANATOP=y
+CONFIG_HAVE_IMX_GPC=y
+CONFIG_HAVE_IMX_MMDC=y
+CONFIG_HAVE_IMX_SRC=y
+
+#
+# Device tree only
+#
+
+#
+# Cortex-A platforms
+#
+CONFIG_SOC_IMX5=y
+# CONFIG_SOC_IMX50 is not set
+CONFIG_SOC_IMX51=y
+CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6=y
+CONFIG_SOC_IMX6Q=y
+# CONFIG_SOC_IMX6SL is not set
+# CONFIG_SOC_IMX6SLL is not set
+# CONFIG_SOC_IMX6SX is not set
+# CONFIG_SOC_IMX6UL is not set
+# CONFIG_SOC_LS1021A is not set
+
+#
+# Cortex-A/Cortex-M asymmetric multiprocessing platforms
+#
+# CONFIG_SOC_IMX7D is not set
+# CONFIG_SOC_IMX7ULP is not set
+# CONFIG_SOC_VF610 is not set
+# CONFIG_ARCH_KEYSTONE is not set
+# CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MILBEAUT is not set
+# CONFIG_ARCH_MMP is not set
+CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_MVEBU_ANY=y
+CONFIG_MACH_MVEBU_V7=y
+CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_375=y
+CONFIG_MACH_ARMADA_38X=y
+CONFIG_MACH_ARMADA_39X=y
+CONFIG_MACH_ARMADA_XP=y
+# CONFIG_MACH_DOVE is not set
+# CONFIG_ARCH_NPCM is not set
+CONFIG_ARCH_OMAP=y
+
+#
+# TI OMAP Common Features
+#
+
+#
+# OMAP Feature Selections
+#
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
+CONFIG_OMAP_RESET_CLOCKS=y
+CONFIG_OMAP_32K_TIMER=y
+# CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
+# end of TI OMAP Common Features
+
+CONFIG_MACH_OMAP_GENERIC=y
+
+#
+# TI OMAP/AM/DM/DRA Family
+#
+CONFIG_ARCH_OMAP3=y
+CONFIG_ARCH_OMAP4=y
+CONFIG_SOC_OMAP5=y
+CONFIG_SOC_AM33XX=y
+# CONFIG_SOC_AM43XX is not set
+CONFIG_SOC_DRA7XX=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_OMAP_INTERCONNECT_BARRIER=y
+
+#
+# TI OMAP2/3/4 Specific Features
+#
+CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+CONFIG_SOC_HAS_OMAP2_SDRC=y
+CONFIG_SOC_HAS_REALTIME_COUNTER=y
+CONFIG_SOC_OMAP3430=y
+CONFIG_SOC_TI81XX=y
+CONFIG_OMAP_PACKAGE_CBB=y
+
+#
+# OMAP Legacy Platform Data Board Type
+#
+CONFIG_MACH_OMAP3517EVM=y
+CONFIG_MACH_OMAP3_PANDORA=y
+# CONFIG_OMAP3_SDRC_AC_TIMING is not set
+# end of TI OMAP2/3/4 Specific Features
+
+# CONFIG_OMAP5_ERRATA_801819 is not set
+# end of TI OMAP/AM/DM/DRA Family
+
+# CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_RDA is not set
+# CONFIG_ARCH_REALVIEW is not set
+CONFIG_ARCH_ROCKCHIP=y
+# CONFIG_ARCH_S5PV210 is not set
+# CONFIG_ARCH_RENESAS is not set
+CONFIG_ARCH_SOCFPGA=y
+# CONFIG_SOCFPGA_SUSPEND is not set
+# CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
+# CONFIG_ARCH_STM32 is not set
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
+CONFIG_MACH_SUN9I=y
+CONFIG_ARCH_SUNXI_MC_SMP=y
+# CONFIG_ARCH_TANGO is not set
+CONFIG_ARCH_TEGRA=y
+# CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_U8500 is not set
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
+# CONFIG_ARCH_VEXPRESS_DCSCB is not set
+# CONFIG_ARCH_VEXPRESS_SPC is not set
+# CONFIG_ARCH_VEXPRESS_TC2_PM is not set
+CONFIG_ARCH_VT8500=y
+CONFIG_ARCH_WM8850=y
+# CONFIG_ARCH_ZX is not set
+# CONFIG_ARCH_ZYNQ is not set
+CONFIG_PLAT_ORION=y
+CONFIG_PLAT_VERSATILE=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_PJ4B=y
+CONFIG_CPU_V7=y
+CONFIG_CPU_THUMB_CAPABLE=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_ARM_LPAE is not set
+CONFIG_ARM_THUMB=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_SWP_EMULATE=y
+# CONFIG_CPU_BIG_ENDIAN is not set
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
+# CONFIG_CPU_BPREDICT_DISABLE is not set
+CONFIG_CPU_SPECTRE=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_VDSO=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_CACHE_FEROCEON_L2=y
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_CACHE_L2X0=y
+# CONFIG_CACHE_L2X0_PMU is not set
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
+CONFIG_PL310_ERRATA_753970=y
+CONFIG_PL310_ERRATA_769419=y
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_DMA_MEM_BUFFERABLE=y
+CONFIG_ARM_HEAVY_MB=y
+CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
+CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_IWMMXT=y
+CONFIG_PJ4B_ERRATA_4742=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_643719=y
+CONFIG_ARM_ERRATA_720789=y
+CONFIG_ARM_ERRATA_754322=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_764369=y
+CONFIG_ARM_ERRATA_775420=y
+CONFIG_ARM_ERRATA_798181=y
+CONFIG_ARM_ERRATA_773022=y
+# CONFIG_ARM_ERRATA_818325_852422 is not set
+# CONFIG_ARM_ERRATA_821420 is not set
+# CONFIG_ARM_ERRATA_825619 is not set
+CONFIG_ARM_ERRATA_857271=y
+# CONFIG_ARM_ERRATA_852421 is not set
+# CONFIG_ARM_ERRATA_852423 is not set
+CONFIG_ARM_ERRATA_857272=y
+# end of System Type
+
+#
+# Bus support
+#
+CONFIG_ARM_ERRATA_814220=y
+# end of Bus support
+
+#
+# Kernel Features
+#
+CONFIG_HAVE_SMP=y
+CONFIG_SMP=y
+CONFIG_SMP_ON_UP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
+# CONFIG_SCHED_MC is not set
+# CONFIG_SCHED_SMT is not set
+CONFIG_HAVE_ARM_SCU=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_HAVE_ARM_TWD=y
+CONFIG_MCPM=y
+# CONFIG_BIG_LITTLE is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_NR_CPUS=8
+CONFIG_HOTPLUG_CPU=y
+CONFIG_ARM_PSCI=y
+CONFIG_ARCH_NR_GPIO=2048
+CONFIG_HZ_FIXED=0
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_200 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_500 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_ARM_PATCH_IDIV=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
+CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_SECCOMP=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_XEN_DOM0=y
+CONFIG_XEN=y
+CONFIG_STACKPROTECTOR_PER_TASK=y
+# end of Kernel Features
+
+#
+# Boot options
+#
+CONFIG_USE_OF=y
+CONFIG_ATAGS=y
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE=""
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+CONFIG_DMI=y
+# end of Boot options
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Frequency scaling
+#
+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_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
+CONFIG_ARM_ARMADA_8K_CPUFREQ=m
+# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+CONFIG_ARM_HIGHBANK_CPUFREQ=m
+CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_ARM_IMX_CPUFREQ_DT=m
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=m
+CONFIG_ARM_TEGRA20_CPUFREQ=y
+CONFIG_ARM_TEGRA124_CPUFREQ=y
+# CONFIG_ARM_TI_CPUFREQ is not set
+# CONFIG_QORIQ_CPUFREQ is not set
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+# CONFIG_CPU_IDLE is not set
+CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
+# end of CPU Idle
+# end of CPU Power Management
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
+# CONFIG_KERNEL_MODE_NEON is not set
+# end of Floating point emulation
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_APM_EMULATION=y
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+# end of Power management options
+
+#
+# Firmware Drivers
+#
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+# CONFIG_ARM_SCPI_PROTOCOL is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_TRUSTED_FOUNDATIONS=y
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_ARMSTUB=y
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
+# CONFIG_IMX_SCU is not set
+
+#
+# Tegra firmware driver
+#
+# CONFIG_TEGRA_IVC is not set
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+# CONFIG_ARM_CRYPTO is not set
+# CONFIG_VIRTUALIZATION is not set
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_PHYS_TO_DMA=y
+CONFIG_REFCOUNT_FULL=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y
+# end of GCC plugins
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS 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
+# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
+CONFIG_BLK_WBT=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_DEBUG_FS=y
+# CONFIG_BLK_SED_OPAL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_ELF_FDPIC is not set
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
+# CONFIG_BINFMT_FLAT is not set
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_BOUNCE=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_CLEANCACHE is not set
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
+CONFIG_ZSMALLOC=m
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_UNIX_DIAG=m
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_SMC is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+# CONFIG_INET_ESP_OFFLOAD is not set
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+# CONFIG_INET6_ESP_OFFLOAD is not set
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+# CONFIG_IP_SET_HASH_IPMAC is not set
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+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_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+# CONFIG_NET_ACT_SAMPLE is not set
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_DEBUGFS=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+# CONFIG_HSR is not set
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+# CONFIG_NET_NCSI is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+# CONFIG_CAN_FLEXCAN is not set
+# CONFIG_CAN_GRCAN is not set
+CONFIG_CAN_SUN4I=m
+# CONFIG_CAN_TI_HECC is not set
+# CONFIG_CAN_C_CAN is not set
+# CONFIG_CAN_CC770 is not set
+# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_PEAK_PCIEFD is not set
+# CONFIG_CAN_RCAR is not set
+# CONFIG_CAN_RCAR_CANFD is not set
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SOFTING=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+# CONFIG_CAN_MCP251X is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_LEDS is not set
+# CONFIG_BT_SELFTEST is not set
+CONFIG_BT_DEBUGFS=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=y
+# CONFIG_AF_KCM is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_XEN is not set
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+# CONFIG_NFC_NCI is not set
+# CONFIG_NFC_HCI is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+# CONFIG_NFC_TRF7970A is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+# CONFIG_NFC_PN533_I2C is not set
+# CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
+# CONFIG_PSAMPLE is not set
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_TEGRA_AHB=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+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
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_BW is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_STUB=m
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_BRIDGE_EMUL=y
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_LABEL=y
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# PCI controller drivers
+#
+CONFIG_PCI_MVEBU=y
+
+#
+# Cadence PCIe controllers support
+#
+# CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_TEGRA=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+# CONFIG_PCIE_XILINX is not set
+# CONFIG_PCI_V3_SEMI is not set
+# CONFIG_PCIE_ALTERA is not set
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCI_DRA7XX=y
+CONFIG_PCI_DRA7XX_HOST=y
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCI_IMX6=y
+# CONFIG_PCI_LAYERSCAPE is not set
+# CONFIG_PCIE_ARMADA_8K is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
+# CONFIG_PCCARD is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_AC97=m
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+CONFIG_ARM_CCI=y
+CONFIG_ARM_CCI400_COMMON=y
+CONFIG_ARM_CCI400_PORT_CTRL=y
+# CONFIG_BRCMSTB_GISB_ARB is not set
+# CONFIG_IMX_WEIM is not set
+CONFIG_MVEBU_MBUS=y
+CONFIG_OMAP_INTERCONNECT=y
+CONFIG_OMAP_OCP2SCP=m
+# CONFIG_SIMPLE_PM_BUS is not set
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=y
+# CONFIG_TEGRA_GMI is not set
+CONFIG_TI_SYSC=y
+CONFIG_VEXPRESS_CONFIG=y
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_GNSS=m
+CONFIG_MTD=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# Partition parsers
+#
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_PHYSMAP_OF is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_PCI=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+CONFIG_MTD_M25P80=m
+# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_SST25L=m
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=y
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+# CONFIG_MTD_ONENAND_GENERIC is not set
+CONFIG_MTD_ONENAND_OMAP2=m
+# CONFIG_MTD_ONENAND_SAMSUNG is not set
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+
+#
+# Raw/parallel NAND flash controllers
+#
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+# CONFIG_MTD_NAND_DENALI_DT is not set
+CONFIG_MTD_NAND_OMAP2=m
+# CONFIG_MTD_NAND_OMAP_BCH is not set
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_ORION=m
+CONFIG_MTD_NAND_MARVELL=m
+# CONFIG_MTD_NAND_BRCMNAND is not set
+CONFIG_MTD_NAND_GPMI_NAND=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_MTD_NAND_TEGRA=m
+# CONFIG_MTD_NAND_GPIO is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# CONFIG_MTD_LPDDR2_NVM is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_SPI_CADENCE_QUADSPI is not set
+# CONFIG_SPI_MTK_QUADSPI is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_DYNAMIC=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=y
+CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
+CONFIG_OF_OVERLAY=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+# CONFIG_PARPORT_PC is not set
+# CONFIG_PARPORT_AX88796 is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_CDROM=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_VIRTIO_BLK_SCSI is not set
+CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_RSXX is not set
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+# CONFIG_NVME_MULTIPATH is not set
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+# CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
+CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_LOOP is not set
+CONFIG_NVME_TARGET_RDMA=m
+# CONFIG_NVME_TARGET_FC is not set
+# CONFIG_NVME_TARGET_TCP is not set
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+# CONFIG_HP_ILO is not set
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_SRAM=y
+CONFIG_SRAM_EXEC=y
+CONFIG_VEXPRESS_SYSCFG=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+# CONFIG_PVPANIC is not set
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+# CONFIG_SENSORS_LIS3_SPI is not set
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+
+#
+# Intel MIC & related support
+#
+
+#
+# Intel MIC Bus Driver
+#
+
+#
+# SCIF Bus Driver
+#
+
+#
+# VOP Bus Driver
+#
+# CONFIG_VOP_BUS is not set
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
+# SCIF Driver
+#
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
+# VOP Driver
+#
+# end of Intel MIC & related support
+
+# CONFIG_ECHO is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+# CONFIG_HABANA_AI is not set
+# end of Misc devices
+
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+CONFIG_SCSI_HPSA=m
+# CONFIG_SCSI_3W_9XXX is not set
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+# CONFIG_SCSI_ARCMSR is not set
+CONFIG_SCSI_ESAS2R=m
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_BSG is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_MYRB is not set
+# CONFIG_SCSI_MYRS is not set
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_STEX=m
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_QEDI is not set
+# CONFIG_QEDF is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+# CONFIG_SCSI_DC395x is not set
+CONFIG_SCSI_AM53C974=m
+# CONFIG_SCSI_NSP32 is not set
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_HAVE_PATA_PLATFORM=y
+CONFIG_ATA=m
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_AHCI_DM816 is not set
+CONFIG_AHCI_IMX=m
+# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
+# CONFIG_AHCI_QORIQ is not set
+# CONFIG_SATA_INIC162X is not set
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+# CONFIG_SATA_DWC is not set
+CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+CONFIG_PATA_IMX=m
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_NETCELL is not set
+CONFIG_PATA_NINJA32=m
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_OF_PLATFORM=m
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+# CONFIG_MD_CLUSTER is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+# CONFIG_DM_WRITECACHE is not set
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+# CONFIG_DM_INTEGRITY is not set
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+# CONFIG_IPVTAP is not set
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+# CONFIG_ATM_IDT77252 is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+# CONFIG_ATM_HE is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+# CONFIG_B53_SPI_DRIVER is not set
+CONFIG_B53_MDIO_DRIVER=m
+# CONFIG_B53_MMAP_DRIVER is not set
+# CONFIG_B53_SRAB_DRIVER is not set
+# CONFIG_B53_SERDES is not set
+CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_LOOP is not set
+# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+# CONFIG_NET_DSA_QCA8K is not set
+CONFIG_NET_DSA_REALTEK_SMI=m
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+CONFIG_PCNET32=m
+CONFIG_NET_VENDOR_AQUANTIA=y
+# CONFIG_NET_VENDOR_ARC is not set
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+# CONFIG_NET_VENDOR_AURORA is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BCMGENET is not set
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+# CONFIG_MACB is not set
+CONFIG_NET_CALXEDA_XGMAC=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CIRRUS=y
+# CONFIG_CS89x0 is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_GEMINI_ETHERNET=m
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_FARADAY=y
+# CONFIG_FTMAC100 is not set
+# CONFIG_FTGMAC100 is not set
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=y
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
+# CONFIG_GIANFAR is not set
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HISILICON=y
+# CONFIG_HIX5HD2_GMAC is not set
+# CONFIG_HISI_FEMAC is not set
+# CONFIG_HIP04_ETH is not set
+# CONFIG_HNS is not set
+# CONFIG_HNS_DSAF is not set
+# CONFIG_HNS_ENET is not set
+# CONFIG_HNS3 is not set
+CONFIG_NET_VENDOR_HP=y
+# CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+# CONFIG_ICE is not set
+# CONFIG_FM10K is not set
+# CONFIG_IGC is not set
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+# CONFIG_MV643XX_ETH is not set
+CONFIG_MVMDIO=m
+# CONFIG_MVNETA_BM_ENABLE is not set
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+# CONFIG_MLXSW_CORE is not set
+# CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+# CONFIG_ENCX24J600 is not set
+# CONFIG_LAN743X is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_8390=y
+# CONFIG_AX88796 is not set
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCOM_EMAC is not set
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+# CONFIG_ROCKER is not set
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+# CONFIG_SIS900 is not set
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=m
+CONFIG_EPIC100=m
+CONFIG_SMC911X=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SOCFPGA=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TI_DAVINCI_EMAC=m
+CONFIG_TI_DAVINCI_MDIO=m
+CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPSW=m
+# CONFIG_TI_CPTS is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_RHINE is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_BCM_UNIMAC=m
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BUS_MUX=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_MDIO_I2C=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_SUN4I=y
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_SFP=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+# CONFIG_CORTINA_PHY is not set
+CONFIG_DAVICOM_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_FIXED_PHY=y
+CONFIG_ICPLUS_PHY=m
+# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+# CONFIG_MARVELL_10G_PHY is not set
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_AHB is not set
+# CONFIG_ATH10K_SDIO is not set
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+# CONFIG_WCN36XX is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+# CONFIG_ATMEL is not set
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_WLAN_VENDOR_INTEL=y
+# CONFIG_IPW2100 is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+# CONFIG_HERMES is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_MWIFIEX is not set
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+# CONFIG_RTW88 is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+# CONFIG_USB_ZD1201 is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+# CONFIG_QTNFMAC_PCIE is not set
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+# CONFIG_IEEE802154_CA8210 is not set
+# CONFIG_IEEE802154_MCR20A is not set
+# CONFIG_IEEE802154_HWSIM is not set
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+# CONFIG_VMXNET3 is not set
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+# CONFIG_NVM is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_APMPOWER is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADP5588=m
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+# CONFIG_KEYBOARD_QT1070 is not set
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+CONFIG_KEYBOARD_LM8323=m
+# CONFIG_KEYBOARD_LM8333 is not set
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
+CONFIG_KEYBOARD_IMX=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_STMPE is not set
+CONFIG_KEYBOARD_SUN4I_LRADC=m
+CONFIG_KEYBOARD_OMAP4=m
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
+CONFIG_KEYBOARD_TWL4030=m
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYBOARD_CROS_EC=m
+# CONFIG_KEYBOARD_CAP11XX is not set
+# CONFIG_KEYBOARD_BCM is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+# CONFIG_MOUSE_SERIAL is not set
+CONFIG_MOUSE_APPLETOUCH=m
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+# CONFIG_MOUSE_ELAN_I2C_SMBUS is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ADC=m
+# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+# CONFIG_TOUCHSCREEN_BU21029 is not set
+# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
+# CONFIG_TOUCHSCREEN_DA9052 is not set
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
+# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
+# CONFIG_TOUCHSCREEN_ELAN is not set
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
+CONFIG_TOUCHSCREEN_MCS5000=m
+# CONFIG_TOUCHSCREEN_MMS114 is not set
+# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
+CONFIG_TOUCHSCREEN_MTOUCH=m
+# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
+# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+# CONFIG_TOUCHSCREEN_TS4800 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+# CONFIG_TOUCHSCREEN_TSC2004 is not set
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_RM_TS is not set
+# CONFIG_TOUCHSCREEN_SILEAD is not set
+# CONFIG_TOUCHSCREEN_SIS_I2C is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SUN4I=m
+CONFIG_TOUCHSCREEN_SUR40=m
+# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
+# CONFIG_TOUCHSCREEN_SX8654 is not set
+CONFIG_TOUCHSCREEN_TPS6507X=m
+# CONFIG_TOUCHSCREEN_ZET6223 is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
+# CONFIG_TOUCHSCREEN_IQS5XX is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
+# CONFIG_INPUT_MC13783_PWRBUTTON is not set
+CONFIG_INPUT_MMA8450=m
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PALMAS_PWRBUTTON is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
+CONFIG_INPUT_RK805_PWRKEY=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_DA9052_ONKEY is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_CMA3000 is not set
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+CONFIG_RMI4_CORE=m
+# CONFIG_RMI4_I2C is not set
+# CONFIG_RMI4_SPI is not set
+# CONFIG_RMI4_SMB 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
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+# CONFIG_RMI4_F54 is not set
+# CONFIG_RMI4_F55 is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PARKBD is not set
+CONFIG_SERIO_AMBAKMI=m
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+CONFIG_SERIO_SUN4I_PS2=m
+CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_USERIO is not set
+# CONFIG_GAMEPORT is not set
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_NOZOMI=m
+CONFIG_N_GSM=m
+# CONFIG_TRACE_SINK is not set
+CONFIG_NULL_TTY=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250_ASPEED_VUART is not set
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_EM is not set
+# CONFIG_SERIAL_8250_RT288X is not set
+# CONFIG_SERIAL_8250_OMAP is not set
+CONFIG_SERIAL_8250_MOXA=m
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_UARTS_4=y
+CONFIG_SERIAL_SAMSUNG_UARTS=4
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA=y
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_VT8500=y
+CONFIG_SERIAL_VT8500_CONSOLE=y
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y
+# CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+CONFIG_SERIAL_ARC=y
+CONFIG_SERIAL_ARC_CONSOLE=y
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+# CONFIG_SERIAL_ST_ASC is not set
+# CONFIG_SERIAL_MVEBU_UART is not set
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_DEV_BUS is not set
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+# CONFIG_HVC_DCC is not set
+CONFIG_VIRTIO_CONSOLE=m
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_OMAP=m
+CONFIG_HW_RANDOM_OMAP3_ROM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_IMX_RNGC=m
+CONFIG_HW_RANDOM_EXYNOS=m
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+CONFIG_TCG_TPM=y
+# CONFIG_TCG_TIS is not set
+# CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_I2C_ATMEL is not set
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
+# CONFIG_TCG_TIS_I2C_NUVOTON is not set
+# CONFIG_TCG_XEN is not set
+# CONFIG_TCG_VTPM_PROXY is not set
+# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
+# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
+CONFIG_DEVPORT=y
+# CONFIG_XILLYBUS is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=y
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_ARB_GPIO_CHALLENGE=m
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+CONFIG_I2C_MUX_PCA954x=m
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+CONFIG_I2C_ISCH=m
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NVIDIA_GPU is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_ALTERA=m
+CONFIG_I2C_BCM2835=m
+# CONFIG_I2C_CBUS_GPIO is not set
+# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_EXYNOS5=m
+CONFIG_I2C_GPIO=y
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_IMX=m
+# CONFIG_I2C_IMX_LPI2C is not set
+CONFIG_I2C_MV64XXX=m
+# CONFIG_I2C_NOMADIK is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_OMAP=y
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA is not set
+CONFIG_I2C_RK3X=m
+CONFIG_HAVE_S3C2410_I2C=y
+CONFIG_I2C_S3C2410=y
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SUN6I_P2WI=m
+CONFIG_I2C_TEGRA=y
+CONFIG_I2C_VERSATILE=m
+# CONFIG_I2C_WMT is not set
+# CONFIG_I2C_XILINX is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+# CONFIG_I3C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_ARMADA_3700 is not set
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BCM2835=m
+CONFIG_SPI_BCM2835AUX=m
+# CONFIG_SPI_BCM_QSPI is not set
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_FSL_LPSPI is not set
+# CONFIG_SPI_FSL_QUADSPI is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
+CONFIG_SPI_GPIO=y
+CONFIG_SPI_IMX=m
+CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_OMAP24XX=m
+CONFIG_SPI_TI_QSPI=m
+CONFIG_SPI_ORION=m
+CONFIG_SPI_PL022=m
+# CONFIG_SPI_PXA2XX is not set
+CONFIG_SPI_ROCKCHIP=m
+# CONFIG_SPI_S3C64XX is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_TEGRA114=m
+CONFIG_SPI_TEGRA20_SFLASH=m
+# CONFIG_SPI_TEGRA20_SLINK is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=y
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+# CONFIG_SPMI is not set
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+CONFIG_OMAP_SSI=m
+
+#
+# HSI clients
+#
+CONFIG_NOKIA_MODEM=m
+CONFIG_CMT_SPEECH=m
+CONFIG_SSI_PROTOCOL=m
+# CONFIG_HSI_CHAR is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
+# CONFIG_PINCTRL_AMD is not set
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_STMFX is not set
+CONFIG_PINCTRL_PALMAS=y
+CONFIG_PINCTRL_RK805=m
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_BCM2835=y
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX51=y
+CONFIG_PINCTRL_IMX53=y
+CONFIG_PINCTRL_IMX6Q=y
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_375=y
+CONFIG_PINCTRL_ARMADA_38X=y
+CONFIG_PINCTRL_ARMADA_39X=y
+CONFIG_PINCTRL_ARMADA_XP=y
+CONFIG_PINCTRL_SAMSUNG=y
+CONFIG_PINCTRL_EXYNOS=y
+CONFIG_PINCTRL_EXYNOS_ARM=y
+CONFIG_PINCTRL_SUNXI=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
+# CONFIG_PINCTRL_SUN50I_A64 is not set
+# CONFIG_PINCTRL_SUN50I_A64_R is not set
+# CONFIG_PINCTRL_SUN50I_H5 is not set
+# CONFIG_PINCTRL_SUN50I_H6 is not set
+# CONFIG_PINCTRL_SUN50I_H6_R is not set
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_TI_IODELAY=y
+CONFIG_PINCTRL_WMT=y
+CONFIG_PINCTRL_WM8850=y
+CONFIG_PINCTRL_MADERA=m
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+CONFIG_GPIO_RASPBERRYPI_EXP=m
+CONFIG_GPIO_CADENCE=m
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_HLWD is not set
+CONFIG_GPIO_MB86S7X=m
+# CONFIG_GPIO_MPC8XXX is not set
+CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_OMAP=y
+CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_SAMA5D2_PIOBU is not set
+# CONFIG_GPIO_SYSCON is not set
+CONFIG_GPIO_TEGRA=y
+# CONFIG_GPIO_TS4800 is not set
+CONFIG_GPIO_XILINX=m
+# CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GPIO_AMD_FCH is not set
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_GW_PLD is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+# CONFIG_GPIO_TPIC2810 is not set
+# CONFIG_GPIO_TS4900 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_BD70528=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_DA9052=m
+# CONFIG_HTC_EGPIO is not set
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_PALMAS=y
+# CONFIG_GPIO_STMPE is not set
+CONFIG_GPIO_TWL4030=y
+CONFIG_GPIO_TWL6040=y
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+CONFIG_GPIO_MAX3191X=m
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+# CONFIG_W1_MASTER_MXC is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_HDQ_MASTER_OMAP=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+# CONFIG_W1_SLAVE_DS2405 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2406 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+# CONFIG_W1_SLAVE_DS2438 is not set
+# CONFIG_W1_SLAVE_DS2780 is not set
+# CONFIG_W1_SLAVE_DS2781 is not set
+# CONFIG_W1_SLAVE_DS28E04 is not set
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_AVS=y
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
+# CONFIG_POWER_RESET_BRCMKONA is not set
+# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_QNAP is not set
+CONFIG_POWER_RESET_RESTART=y
+# CONFIG_POWER_RESET_VERSATILE is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_REBOOT_MODE=m
+# CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_NVMEM_REBOOT_MODE=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+# CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+CONFIG_CHARGER_ADP5061=m
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_LEGO_EV3 is not set
+CONFIG_BATTERY_SBS=m
+# CONFIG_CHARGER_SBS is not set
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_DA9052 is not set
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+# CONFIG_CHARGER_MAX8903 is not set
+CONFIG_CHARGER_TWL4030=m
+# CONFIG_CHARGER_LP8727 is not set
+CONFIG_CHARGER_GPIO=m
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_BQ2415X=m
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_CHARGER_RT9455 is not set
+CONFIG_CHARGER_CROS_USBPD=m
+# CONFIG_CHARGER_UCS1002 is not set
+# CONFIG_CHARGER_BD70528 is not set
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+CONFIG_SENSORS_ADM1029=m
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ADM9240=m
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_ARM_SCMI=m
+# CONFIG_SENSORS_ASPEED is not set
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_DA9052_ADC is not set
+CONFIG_SENSORS_I5K_AMB=m
+# CONFIG_SENSORS_F71805F is not set
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FTSTEUTATES=m
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+# CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_IT87 is not set
+CONFIG_SENSORS_JC42=m
+# CONFIG_SENSORS_POWR1220 is not set
+CONFIG_SENSORS_LINEAGE=m
+# CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC2990 is not set
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+# CONFIG_SENSORS_LTC4222 is not set
+CONFIG_SENSORS_LTC4245=m
+# CONFIG_SENSORS_LTC4260 is not set
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+# CONFIG_SENSORS_MAX1619 is not set
+CONFIG_SENSORS_MAX1668=m
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX31722 is not set
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MAX31790 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
+CONFIG_SENSORS_ADCXX=m
+# CONFIG_SENSORS_LM63 is not set
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+CONFIG_SENSORS_LM93=m
+# CONFIG_SENSORS_LM95234 is not set
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_PC87360 is not set
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+# CONFIG_SENSORS_NCT7802 is not set
+# CONFIG_SENSORS_NCT7904 is not set
+# CONFIG_SENSORS_NPCM7XX is not set
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+# CONFIG_SENSORS_SHT15 is not set
+CONFIG_SENSORS_SHT21=m
+# CONFIG_SENSORS_SHT3x is not set
+# CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+# CONFIG_SENSORS_SMSC47M1 is not set
+CONFIG_SENSORS_SMSC47M192=m
+# CONFIG_SENSORS_SMSC47B397 is not set
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_STTS751 is not set
+CONFIG_SENSORS_SMM665=m
+# CONFIG_SENSORS_ADC128D818 is not set
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_TC74 is not set
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+# CONFIG_SENSORS_VEXPRESS is not set
+# CONFIG_SENSORS_VIA686A is not set
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+# CONFIG_SENSORS_W83781D is not set
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+# CONFIG_SENSORS_W83L785TS is not set
+CONFIG_SENSORS_W83L786NG=m
+# CONFIG_SENSORS_W83627HF is not set
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+# CONFIG_CLOCK_THERMAL is not set
+# CONFIG_DEVFREQ_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_MMIO is not set
+# CONFIG_IMX_THERMAL is not set
+# CONFIG_QORIQ_THERMAL is not set
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_ARMADA_THERMAL=y
+
+#
+# Broadcom thermal drivers
+#
+CONFIG_BCM2835_THERMAL=m
+# end of Broadcom thermal drivers
+
+#
+# Texas Instruments thermal drivers
+#
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_THERMAL=y
+# CONFIG_OMAP3_THERMAL is not set
+CONFIG_OMAP4_THERMAL=y
+CONFIG_OMAP5_THERMAL=y
+CONFIG_DRA752_THERMAL=y
+# end of Texas Instruments thermal drivers
+
+#
+# Samsung thermal drivers
+#
+CONFIG_EXYNOS_THERMAL=y
+# end of Samsung thermal drivers
+
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=y
+# end of NVIDIA Tegra thermal drivers
+
+# CONFIG_GENERIC_ADC_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_BD70528_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+CONFIG_ARM_SP805_WATCHDOG=m
+# CONFIG_ARMADA_37XX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_FTWDT010_WATCHDOG=m
+CONFIG_HAVE_S3C2410_WATCHDOG=y
+CONFIG_S3C2410_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_ORION_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+# CONFIG_TS4800_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_IMX2_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+CONFIG_BCM2835_WDT=m
+# CONFIG_MEN_A21_WDT is not set
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_ALTERA_A10SR is not set
+# CONFIG_MFD_ALTERA_SYSMGR is not set
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_AS3711 is not set
+CONFIG_MFD_AS3722=y
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+CONFIG_MFD_BD9571MWV=m
+# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X_I2C=y
+# CONFIG_MFD_AXP20X_RSB is not set
+CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_CHARDEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_PMIC_DA903X is not set
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_EXYNOS_LPASS is not set
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_LPC_ICH is not set
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
+# CONFIG_MFD_MAX77650 is not set
+CONFIG_MFD_MAX77686=y
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_MFD_PM8XXX is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_RK808=y
+# CONFIG_MFD_RN5T618 is not set
+CONFIG_MFD_SEC_CORE=y
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
+# CONFIG_STMPE_SPI is not set
+# end of STMicroelectronics STMPE Interface Drivers
+
+CONFIG_MFD_SUN6I_PRCM=y
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+CONFIG_MFD_OMAP_USB_HOST=y
+CONFIG_MFD_PALMAS=y
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+CONFIG_TWL4030_CORE=y
+CONFIG_TWL4030_POWER=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+CONFIG_MFD_ROHM_BD718XX=m
+CONFIG_MFD_ROHM_BD70528=m
+# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_STMFX is not set
+CONFIG_MFD_VEXPRESS_SYSREG=y
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_88PG86X is not set
+CONFIG_REGULATOR_ACT8865=m
+# CONFIG_REGULATOR_AD5398 is not set
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3722=y
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD70528=m
+CONFIG_REGULATOR_BD718XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA9052=m
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+CONFIG_REGULATOR_MAX77686=m
+# CONFIG_REGULATOR_MAX77802 is not set
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+# CONFIG_REGULATOR_MCP16502 is not set
+# CONFIG_REGULATOR_MT6311 is not set
+CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=m
+CONFIG_REGULATOR_PFUZE100=m
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+# CONFIG_REGULATOR_PWM is not set
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_S2MPA01=m
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_TI_ABB=m
+CONFIG_REGULATOR_SY8106A=m
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_REGULATOR_TWL4030=y
+# CONFIG_REGULATOR_VCTRL is not set
+CONFIG_REGULATOR_VEXPRESS=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_RC_CORE=y
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+# CONFIG_BPF_LIRC_MODE2 is not set
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+# CONFIG_IR_HIX5HD2 is not set
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+# CONFIG_IR_SPI is not set
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+# CONFIG_IR_RX51 is not set
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
+CONFIG_IR_PWM_TX=m
+CONFIG_IR_SUNXI=m
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
+CONFIG_MEDIA_SUPPORT=y
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_MEDIA_CEC_RC is not set
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_DVB_CORE=y
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+# CONFIG_VIDEO_TM6000 is not set
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+# CONFIG_DVB_USB_ZD1301 is not set
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=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
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+# CONFIG_VIDEO_CX25821 is not set
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+# CONFIG_VIDEO_SAA7134_GO7007 is not set
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_COBALT=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+CONFIG_VIDEO_ASPEED=m
+# CONFIG_VIDEO_MUX is not set
+CONFIG_VIDEO_OMAP3=m
+# CONFIG_VIDEO_OMAP3_DEBUG is not set
+# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
+# CONFIG_VIDEO_XILINX is not set
+CONFIG_VIDEO_SUN6I_CSI=m
+# CONFIG_VIDEO_TI_CAL is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+# CONFIG_VIDEO_CODA is not set
+CONFIG_VIDEO_IMX_PXP=m
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
+# CONFIG_VIDEO_SH_VEU is not set
+CONFIG_VIDEO_ROCKCHIP_RGA=m
+CONFIG_VIDEO_TI_VPE=m
+# CONFIG_VIDEO_TI_VPE_DEBUG is not set
+CONFIG_VIDEO_TI_VPDMA=m
+CONFIG_VIDEO_TI_SC=m
+CONFIG_VIDEO_TI_CSC=m
+CONFIG_V4L_TEST_DRIVERS=y
+# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VIM2M is not set
+# CONFIG_VIDEO_VICODEC is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+# CONFIG_CEC_PLATFORM_DRIVERS is not set
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=y
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+CONFIG_RADIO_SI4713=m
+# CONFIG_USB_SI4713 is not set
+# CONFIG_PLATFORM_SI4713 is not set
+CONFIG_I2C_SI4713=m
+CONFIG_USB_MR800=m
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=y
+
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV748X=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AD9389B=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_SMIAPP_PLL=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV5640=m
+CONFIG_VIDEO_OV5645=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5K6AA=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_S5K4ECGX=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_SMIAPP=m
+CONFIG_VIDEO_ET8EK8=m
+CONFIG_VIDEO_S5C73M3=m
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9807_VCM=m
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_ST_MIPID02=m
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+CONFIG_VIDEO_GS1662=m
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=y
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
+CONFIG_MEDIA_TUNER_XC4000=y
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+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
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+CONFIG_DVB_MN88443X=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_TEGRA_HOST1X is not set
+CONFIG_IMX_IPUV3_CORE=m
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_VM=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# CONFIG_DRM_HDLCD is not set
+# CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_KOMEDA is not set
+# end of ARM devices
+
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_AMDGPU is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# end of ACP (Audio CoProcessor) Configuration
+
+# CONFIG_DRM_NOUVEAU is not set
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_ATI_PCIGART=y
+CONFIG_DRM_EXYNOS=m
+
+#
+# CRTCs
+#
+CONFIG_DRM_EXYNOS_FIMD=y
+# CONFIG_DRM_EXYNOS5433_DECON is not set
+# CONFIG_DRM_EXYNOS7_DECON is not set
+CONFIG_DRM_EXYNOS_MIXER=y
+# CONFIG_DRM_EXYNOS_VIDI is not set
+
+#
+# Encoders and Bridges
+#
+# CONFIG_DRM_EXYNOS_DPI is not set
+CONFIG_DRM_EXYNOS_DSI=y
+CONFIG_DRM_EXYNOS_DP=y
+CONFIG_DRM_EXYNOS_HDMI=y
+
+#
+# Sub-drivers
+#
+# CONFIG_DRM_EXYNOS_G2D is not set
+# CONFIG_DRM_EXYNOS_FIMC is not set
+# CONFIG_DRM_EXYNOS_ROTATOR is not set
+# CONFIG_DRM_EXYNOS_SCALER is not set
+# CONFIG_DRM_EXYNOS_GSC is not set
+CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=y
+# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_DW_HDMI=y
+CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+# CONFIG_ROCKCHIP_INNO_HDMI is not set
+# CONFIG_ROCKCHIP_LVDS is not set
+# CONFIG_ROCKCHIP_RGB is not set
+CONFIG_ROCKCHIP_RK3066_HDMI=y
+CONFIG_DRM_UDL=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_RCAR_DW_HDMI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
+# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_OMAP=m
+CONFIG_OMAP2_DSS_INIT=y
+CONFIG_OMAP_DSS_BASE=m
+CONFIG_OMAP2_DSS=m
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
+CONFIG_OMAP2_DSS_DPI=y
+CONFIG_OMAP2_DSS_VENC=y
+CONFIG_OMAP2_DSS_HDMI_COMMON=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP4_DSS_HDMI_CEC=y
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
+CONFIG_OMAP2_DSS_DSI=y
+CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
+CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
+
+#
+# OMAPDRM External Display Device Drivers
+#
+# CONFIG_DRM_OMAP_ENCODER_OPA362 is not set
+CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
+CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
+CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
+# CONFIG_DRM_OMAP_PANEL_DSI_CM is not set
+CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
+# CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 is not set
+CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
+CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
+# CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 is not set
+# end of OMAPDRM External Display Device Drivers
+
+CONFIG_DRM_TILCDC=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+# CONFIG_DRM_MSM_GPU_SUDO is not set
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_10NM_PHY=y
+# CONFIG_DRM_FSL_DCU is not set
+# CONFIG_DRM_TEGRA is not set
+# CONFIG_DRM_STM is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
+# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
+# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
+# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+CONFIG_DRM_CDNS_DSI=m
+# CONFIG_DRM_DUMB_VGA_DAC is not set
+# CONFIG_DRM_LVDS_ENCODER is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI86 is not set
+CONFIG_DRM_ANALOGIX_DP=m
+# CONFIG_DRM_I2C_ADV7511 is not set
+CONFIG_DRM_DW_HDMI=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_MIPI_DSI=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_STI is not set
+CONFIG_DRM_IMX=m
+# CONFIG_DRM_IMX_PARALLEL_DISPLAY is not set
+# CONFIG_DRM_IMX_TVE is not set
+CONFIG_DRM_IMX_LDB=m
+CONFIG_DRM_IMX_HDMI=m
+CONFIG_DRM_V3D=m
+CONFIG_DRM_VC4=m
+# CONFIG_DRM_VC4_HDMI_CEC is not set
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_HISI_HIBMC is not set
+# CONFIG_DRM_MXSFB is not set
+# CONFIG_DRM_TINYDRM is not set
+# CONFIG_DRM_PL111 is not set
+# CONFIG_DRM_TVE200 is not set
+# CONFIG_DRM_XEN is not set
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_MCDE=m
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_MGA is not set
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_ARMCLCD=y
+# CONFIG_FB_IMX is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_EFI=y
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_NVIDIA=m
+# CONFIG_FB_NVIDIA_I2C is not set
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA_I2C is not set
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+# CONFIG_FB_VOODOO1 is not set
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+# CONFIG_FB_CARMINE is not set
+CONFIG_FB_VT8500=y
+CONFIG_FB_WM8505=y
+# CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_DA8XX is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+# CONFIG_FB_METRONOME is not set
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_MX3=y
+CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_DA9052 is not set
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_GPIO=m
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+CONFIG_SND_ALOOP=m
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_MTS64=m
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+CONFIG_SND_HDSPM=m
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+CONFIG_SND_LOLA=m
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+CONFIG_SND_VIRTUOSO=m
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+# CONFIG_SND_HDA_INTEL is not set
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_PREALLOC_SIZE=2048
+CONFIG_SND_ARM=y
+# CONFIG_SND_ARMAACI is not set
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREFACE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+# CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_BCM2835_SOC_I2S=m
+# CONFIG_SND_DESIGNWARE_I2S is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+# CONFIG_SND_SOC_FSL_ESAI is not set
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_UTILS=m
+CONFIG_SND_SOC_IMX_PCM_DMA=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_IMX_PCM_FIQ=m
+CONFIG_SND_SOC_IMX_SSI=m
+
+#
+# SoC Audio support for Freescale i.MX boards:
+#
+CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_IMX_ES8328=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_IMX_MC13783=m
+# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
+CONFIG_SND_SOC_IMX_AUDMIX=m
+# end of SoC Audio for Freescale CPUs
+
+# CONFIG_SND_I2S_HI6210_I2S is not set
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_I2S=m
+# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
+# CONFIG_SND_SOC_RK3288_HDMI_ANALOG is not set
+# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
+# CONFIG_SND_SOC_SAMSUNG is not set
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+#
+# Allwinner SoC Audio support
+#
+CONFIG_SND_SUN4I_CODEC=m
+# CONFIG_SND_SUN8I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN4I_I2S is not set
+CONFIG_SND_SUN4I_SPDIF=m
+# end of Allwinner SoC Audio support
+
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA20_AC97=m
+CONFIG_SND_SOC_TEGRA20_DAS=m
+CONFIG_SND_SOC_TEGRA20_I2S=m
+CONFIG_SND_SOC_TEGRA20_SPDIF=m
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_WM9712=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+CONFIG_SND_SOC_TEGRA_RT5677=m
+# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set
+
+#
+# Audio support for Texas Instruments SoCs
+#
+CONFIG_SND_SOC_TI_EDMA_PCM=m
+CONFIG_SND_SOC_TI_SDMA_PCM=m
+
+#
+# Texas Instruments DAI support for:
+#
+CONFIG_SND_SOC_DAVINCI_MCASP=m
+CONFIG_SND_SOC_OMAP_DMIC=m
+CONFIG_SND_SOC_OMAP_MCBSP=m
+CONFIG_SND_SOC_OMAP_MCPDM=m
+
+#
+# Audio support for boards with Texas Instruments SoCs
+#
+CONFIG_SND_SOC_NOKIA_RX51=m
+CONFIG_SND_SOC_OMAP3_PANDORA=m
+CONFIG_SND_SOC_OMAP3_TWL4030=m
+CONFIG_SND_SOC_OMAP_ABE_TWL6040=m
+CONFIG_SND_SOC_OMAP_HDMI=m
+# end of Audio support for Texas Instruments SoCs
+
+# CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+# CONFIG_ZX_TDM is not set
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+# CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+# CONFIG_SND_SOC_ADAU7002 is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4458 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_AK5558 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+CONFIG_SND_SOC_ALC5632=m
+# CONFIG_SND_SOC_BD28623 is not set
+# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+# CONFIG_SND_SOC_MAX98088 is not set
+CONFIG_SND_SOC_MAX98090=m
+# CONFIG_SND_SOC_MAX98357A is not set
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9867 is not set
+# CONFIG_SND_SOC_MAX98927 is not set
+# CONFIG_SND_SOC_MAX98373 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1789_I2C is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+# CONFIG_SND_SOC_PCM3060_I2C is not set
+# CONFIG_SND_SOC_PCM3060_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RL6231=m
+# CONFIG_SND_SOC_RT5616 is not set
+# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_SGTL5000=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_SOC_TWL6040=m
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8524 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+CONFIG_SND_SOC_WM8753=m
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+# CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+CONFIG_SND_SOC_WM9712=m
+# CONFIG_SND_SOC_ZX_AUD96P22 is not set
+# CONFIG_SND_SOC_MAX9759 is not set
+CONFIG_SND_SOC_MC13783=m
+# CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8822 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
+CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SND_AUDIO_GRAPH_CARD is not set
+# CONFIG_SND_XEN_FRONTEND is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+# CONFIG_HID_BIGBEN_FF is not set
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+# CONFIG_HID_ELAN is not set
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+# CONFIG_HID_GFRM is not set
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+# CONFIG_HID_VIEWSONIC is not set
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+# CONFIG_HID_MALTRON is not set
+# CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NTI is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+# CONFIG_HID_STEAM is not set
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
+# end of I2C HID support
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_MXC=m
+CONFIG_USB_EHCI_HCD_OMAP=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_OMAP3=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+# CONFIG_USB_UHCI_HCD is not set
+CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
+CONFIG_USB_UHCI_PLATFORM=y
+CONFIG_USB_U132_HCD=m
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_IMX21_HCD is not set
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+# CONFIG_USBIP_CORE is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+CONFIG_USB_MUSB_SUNXI=m
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_OMAP2PLUS=m
+CONFIG_USB_MUSB_AM35X=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
+
+#
+# MUSB DMA mode
+#
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_USB_INVENTRA_DMA=y
+CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_USB_TUSB_OMAP_DMA=y
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_OMAP=m
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+# CONFIG_USB_DWC2_PCI is not set
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_OF=m
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+# CONFIG_USB_ISP1760 is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+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 is not set
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+# CONFIG_USB_HUB_USB251XB is not set
+CONFIG_USB_HSIC_USB3503=m
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+# CONFIG_USB_ATM is not set
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_AM335X_CONTROL_USB=m
+CONFIG_AM335X_PHY_USB=m
+CONFIG_TWL6030_USB=m
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+CONFIG_USB_NET2280=m
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_G_NOKIA=m
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_TYPEC is not set
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=y
+CONFIG_PWRSEQ_EMMC=y
+# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=256
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_STM32_SDMMC=y
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_OF_ARASAN is not set
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_S3C=m
+CONFIG_MMC_SDHCI_PXAV3=m
+# CONFIG_MMC_SDHCI_S3C_DMA is not set
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_OMAP=m
+CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_ALCOR=m
+# CONFIG_MMC_MXC is not set
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+# CONFIG_MMC_DW_BLUEFIELD is not set
+CONFIG_MMC_DW_EXYNOS=m
+# CONFIG_MMC_DW_HI3798CV200 is not set
+# CONFIG_MMC_DW_K3 is not set
+# CONFIG_MMC_DW_PCI is not set
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_WMT=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_BCM2835=m
+# CONFIG_MMC_MTK is not set
+# CONFIG_MMC_SDHCI_XENON is not set
+# CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3532 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP3952 is not set
+CONFIG_LEDS_LP55XX_COMMON=m
+# CONFIG_LEDS_LP5521 is not set
+CONFIG_LEDS_LP5523=m
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP8860 is not set
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_NS2=y
+CONFIG_LEDS_TCA6507=m
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+# CONFIG_LEDS_TRIGGER_AUDIO is not set
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_DS1307=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+CONFIG_RTC_DRV_PCF8523=y
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+CONFIG_RTC_DRV_PCF8563=y
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_PALMAS=y
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_S5M=y
+# CONFIG_RTC_DRV_SD3078 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=m
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+CONFIG_RTC_DRV_DA9052=y
+CONFIG_RTC_DRV_EFI=y
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_IMXDI=y
+CONFIG_RTC_DRV_OMAP=y
+CONFIG_HAVE_S3C_RTC=y
+# CONFIG_RTC_DRV_S3C is not set
+CONFIG_RTC_DRV_PL030=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_VT8500=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_SUNXI=y
+CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_ARMADA38X=y
+# CONFIG_RTC_DRV_CADENCE is not set
+# CONFIG_RTC_DRV_FTRTC010 is not set
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_TEGRA=y
+CONFIG_RTC_DRV_MXC=y
+CONFIG_RTC_DRV_MXC_V2=m
+CONFIG_RTC_DRV_SNVS=y
+# CONFIG_RTC_DRV_R7301 is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_OF=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_AMBA_PL08X=y
+# CONFIG_AXI_DMAC is not set
+CONFIG_DMA_BCM2835=y
+CONFIG_DMA_SUN4I=y
+CONFIG_DMA_SUN6I=m
+# CONFIG_DW_AXI_DMAC is not set
+# CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_QDMA is not set
+CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
+# CONFIG_INTEL_IDMA64 is not set
+CONFIG_MV_XOR=y
+CONFIG_MXS_DMA=y
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
+# CONFIG_NBPFAXI_DMA is not set
+CONFIG_PL330_DMA=y
+CONFIG_TEGRA20_APB_DMA=y
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_TI_CPPI41=m
+CONFIG_TI_EDMA=y
+CONFIG_DMA_OMAP=y
+CONFIG_TI_DMA_CROSSBAR=y
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# end of DMABUF options
+
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_PANEL is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_PRUSS is not set
+CONFIG_UIO_MF624=m
+# CONFIG_VFIO is not set
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+# end of Xen driver support
+
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL8723BS is not set
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+# CONFIG_RTS5208 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7280 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+# CONFIG_ADE7854 is not set
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+# CONFIG_MFD_NVEC is not set
+# CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_STAGING_BOARD is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_MOST is not set
+# CONFIG_KS7010 is not set
+# CONFIG_GREYBUS is not set
+CONFIG_BCM_VIDEOCORE=y
+# CONFIG_BCM2835_VCHIQ is not set
+# CONFIG_SND_BCM2835 is not set
+# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_PI433=m
+
+#
+# Gasket devices
+#
+# end of Gasket devices
+
+# CONFIG_XIL_AXIS_FIFO is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set
+# CONFIG_EROFS_FAULT_INJECTION is not set
+CONFIG_EROFS_FS_IO_MAX_RETRIES=5
+# CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+# CONFIG_GOLDFISH is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_PROTO=y
+# CONFIG_CROS_EC_LIGHTBAR is not set
+CONFIG_CROS_EC_VBC=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_ICST=y
+CONFIG_COMMON_CLK_VERSATILE=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
+# CONFIG_CLK_HSDK is not set
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SI5341=m
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_CLK_TWL6040=m
+# CONFIG_CLK_QORIQ is not set
+CONFIG_COMMON_CLK_PALMAS=m
+# CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_BD718XX is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# CONFIG_CLK_BCM2835 is not set
+CONFIG_CLK_RASPBERRYPI=m
+CONFIG_MXC_CLK=y
+CONFIG_MVEBU_CLK_COMMON=y
+CONFIG_MVEBU_CLK_CPU=y
+CONFIG_MVEBU_CLK_COREDIV=y
+CONFIG_ARMADA_370_CLK=y
+CONFIG_ARMADA_375_CLK=y
+CONFIG_ARMADA_38X_CLK=y
+CONFIG_ARMADA_39X_CLK=y
+CONFIG_ARMADA_XP_CLK=y
+CONFIG_COMMON_CLK_SAMSUNG=y
+CONFIG_EXYNOS_AUDSS_CLK_CON=y
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN4I_A10_CCU=y
+CONFIG_SUN5I_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
+CONFIG_SUN8I_A83T_CCU=y
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_V3S_CCU=y
+# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_SUN8I_R40_CCU=y
+CONFIG_SUN9I_A80_CCU=y
+CONFIG_SUN8I_R_CCU=y
+CONFIG_TEGRA_CLK_EMC=y
+CONFIG_TEGRA_CLK_DFLL=y
+CONFIG_COMMON_CLK_TI_ADPLL=y
+# end of Common Clock Framework
+
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_OMAP_DM_TIMER=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_BCM2835_TIMER=y
+CONFIG_DW_APB_TIMER=y
+CONFIG_DW_APB_TIMER_OF=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_ARMADA_370_XP_TIMER=y
+CONFIG_SUN4I_TIMER=y
+CONFIG_SUN5I_HSTIMER=y
+CONFIG_TEGRA_TIMER=y
+CONFIG_VT8500_TIMER=y
+CONFIG_CLKSRC_TI_32K=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_TIMER_SP804=y
+CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
+CONFIG_CLKSRC_EXYNOS_MCT=y
+CONFIG_CLKSRC_SAMSUNG_PWM=y
+CONFIG_CLKSRC_VERSATILE=y
+CONFIG_CLKSRC_IMX_GPT=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set
+CONFIG_IMX_MBOX=m
+# CONFIG_PLATFORM_MHU is not set
+CONFIG_PL320_MBOX=y
+# CONFIG_ARMADA_37XX_RWTM_MBOX is not set
+CONFIG_OMAP2PLUS_MBOX=y
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+# CONFIG_ROCKCHIP_MBOX is not set
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_BCM2835_MBOX=y
+# CONFIG_MAILBOX_TEST is not set
+# CONFIG_TEGRA_HSP_MBOX is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+CONFIG_OMAP_IOMMU=y
+# CONFIG_OMAP_IOMMU_DEBUG is not set
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+# CONFIG_EXYNOS_IOMMU is not set
+# CONFIG_ARM_SMMU is not set
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+# CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+CONFIG_BCM2835_POWER=y
+CONFIG_RASPBERRYPI_POWER=y
+# CONFIG_SOC_BRCMSTB is not set
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+# end of Qualcomm SoC drivers
+
+CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SOC_SAMSUNG=y
+CONFIG_EXYNOS_PMU=y
+CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
+CONFIG_EXYNOS_PM_DOMAINS=y
+CONFIG_SUNXI_SRAM=y
+# CONFIG_ARCH_TEGRA_2x_SOC is not set
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
+# CONFIG_ARCH_TEGRA_114_SOC is not set
+CONFIG_ARCH_TEGRA_124_SOC=y
+CONFIG_SOC_TEGRA_FUSE=y
+CONFIG_SOC_TEGRA_FLOWCTRL=y
+CONFIG_SOC_TEGRA_PMC=y
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+
+#
+# DEVFREQ Drivers
+#
+# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_TEGRA_DEVFREQ=m
+# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_MEMORY=y
+CONFIG_DDR=y
+# CONFIG_ARM_PL172_MPMC is not set
+CONFIG_TI_EMIF=m
+CONFIG_OMAP_GPMC=y
+# CONFIG_OMAP_GPMC_DEBUG is not set
+CONFIG_TI_EMIF_SRAM=m
+CONFIG_MVEBU_DEVBUS=y
+CONFIG_PL353_SMC=y
+CONFIG_SAMSUNG_MC=y
+CONFIG_EXYNOS_SROM=y
+CONFIG_TEGRA_MC=y
+CONFIG_TEGRA124_EMC=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_CONFIGFS is not set
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+CONFIG_MMA8452=m
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7124 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+CONFIG_EXYNOS_ADC=m
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_IMX7D_ADC is not set
+CONFIG_LTC2471=m
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_PALMAS_GPADC is not set
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_SD_ADC_MODULATOR=m
+# CONFIG_STMPE_ADC is not set
+# CONFIG_SUN4I_GPADC is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+CONFIG_TI_AM335X_ADC=m
+# CONFIG_TI_TLC4541 is not set
+CONFIG_TWL4030_MADC=m
+# CONFIG_TWL6030_GPADC is not set
+# CONFIG_VF610_ADC is not set
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# end of Amplifiers
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_BME680 is not set
+CONFIG_CCS811=m
+# CONFIG_IAQCORE is not set
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SPS30 is not set
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_KMX61 is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+# CONFIG_ADJD_S311 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_BH1750 is not set
+CONFIG_BH1780=m
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+CONFIG_SENSORS_TSL2563=m
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
+
+#
+# Digital potentiometers
+#
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HP03 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_MAX31856 is not set
+# end of Temperature sensors
+
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_BCM2835=m
+# CONFIG_PWM_CROS_EC is not set
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_IMX1 is not set
+# CONFIG_PWM_IMX27 is not set
+CONFIG_PWM_IMX_TPM=m
+CONFIG_PWM_OMAP_DMTIMER=m
+# CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SAMSUNG=m
+# CONFIG_PWM_STMPE is not set
+CONFIG_PWM_SUN4I=m
+CONFIG_PWM_TEGRA=m
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
+CONFIG_PWM_TIPWMSS=y
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+CONFIG_PWM_VT8500=m
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_MAX_NR=1
+CONFIG_ARM_GIC_V2M=y
+CONFIG_GIC_NON_BANKED=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
+CONFIG_ARMADA_370_XP_IRQ=y
+# CONFIG_AL_FIC is not set
+CONFIG_MADERA_IRQ=m
+CONFIG_OMAP_IRQCHIP=y
+# CONFIG_TS4800_IRQ is not set
+CONFIG_IRQ_CROSSBAR=y
+CONFIG_PARTITION_PERCPU=y
+CONFIG_IMX_IRQSTEER=y
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SOCFPGA=y
+CONFIG_RESET_SUNXI=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN6I_MIPI_DPHY=m
+CONFIG_PHY_SUN9I_USB=m
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_CADENCE_DP is not set
+# CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_SIERRA is not set
+# CONFIG_PHY_FSL_IMX8MQ_USB is not set
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_ARMADA375_USBCLUSTER_PHY=y
+CONFIG_PHY_MVEBU_A3700_COMPHY=m
+CONFIG_PHY_MVEBU_A3700_UTMI=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_COMPHY=m
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
+# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
+# CONFIG_PHY_ROCKCHIP_PCIE is not set
+# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+# CONFIG_PHY_EXYNOS_PCIE is not set
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_EXYNOS4210_USB2=y
+CONFIG_PHY_EXYNOS4X12_USB2=y
+CONFIG_PHY_EXYNOS5250_USB2=y
+CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_PHY_EXYNOS5250_SATA=m
+CONFIG_PHY_TEGRA_XUSB=m
+# CONFIG_PHY_DM816X_USB is not set
+CONFIG_OMAP_CONTROL_PHY=m
+CONFIG_OMAP_USB2=m
+CONFIG_TI_PIPE3=m
+CONFIG_PHY_TUSB1210=m
+CONFIG_TWL4030_USB=m
+CONFIG_PHY_TI_GMII_SEL=m
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# CONFIG_ARM_CCI_PMU is not set
+# CONFIG_ARM_CCN is not set
+CONFIG_ARM_PMU=y
+CONFIG_FSL_IMX8_DDR_PMU=m
+# end of Performance monitor support
+
+CONFIG_RAS=y
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_DAX=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+# CONFIG_NVMEM_IMX_IIM is not set
+# CONFIG_NVMEM_IMX_OCOTP is not set
+CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_NVMEM_SNVS_LPGPR=m
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+# CONFIG_TEE is not set
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+CONFIG_COUNTER=m
+CONFIG_FTM_QUADDEC=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=m
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+# CONFIG_UBIFS_ATIME_SUPPORT is not set
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_LZ4 is not set
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+# CONFIG_PSTORE is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+# CONFIG_UNICODE is not set
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_TRUSTED_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+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_SECURITY_SAFESETID is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+# CONFIG_IMA_TEMPLATE is not set
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
+CONFIG_IMA_DEFAULT_HASH_SHA256=y
+CONFIG_IMA_DEFAULT_HASH="sha256"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+CONFIG_IMA_TRUSTED_KEYRING=y
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
+# CONFIG_IMA_LOAD_X509 is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=m
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+# CONFIG_CRYPTO_DH is not set
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128L=m
+CONFIG_CRYPTO_AEGIS256=m
+CONFIG_CRYPTO_MORUS640=m
+CONFIG_CRYPTO_MORUS1280=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+# CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_SHA3 is not set
+# CONFIG_CRYPTO_SM3 is not set
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
+# CONFIG_CRYPTO_DEV_OMAP is not set
+# CONFIG_CRYPTO_DEV_SAHARA is not set
+# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
+# CONFIG_CRYPTO_DEV_S5P is not set
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
+# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_STMP_DEVICE=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
+CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
+CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_REMAP=y
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_SPLIT=y
+CONFIG_SG_POOL=y
+CONFIG_SBITMAP=y
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
+# CONFIG_PAGE_POISONING_ZERO is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+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=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_OF_RECONFIG_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+CONFIG_RUNTIME_TESTING_MENU=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 is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_STRSCPY=m
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BITFIELD is not set
+# CONFIG_TEST_UUID is not set
+CONFIG_TEST_XARRAY=m
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_LKM is not set
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+CONFIG_FIND_BIT_BENCHMARK=m
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_MEMTEST is not set
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_ARM_PTDUMP_CORE=y
+# CONFIG_ARM_PTDUMP_DEBUGFS is not set
+CONFIG_DEBUG_WX=y
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_DEBUG_USER is not set
+# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+# CONFIG_ARM_KPROBES_TEST is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_CORESIGHT is not set
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/5.3-arm64.conf b/gnu/packages/aux-files/linux-libre/5.3-arm64.conf
new file mode 100644
index 0000000000..968400030a
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/5.3-arm64.conf
@@ -0,0 +1,9246 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/arm64 5.3.1-gnu Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 7.4.0
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70400
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+# CONFIG_USELIB is not set
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_IRQ_MSI_IOMMU=y
+CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_GENERIC_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+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 is not set
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+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
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_ARM64=y
+CONFIG_64BIT=y
+CONFIG_MMU=y
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CSUM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA32=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_SMP=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+
+#
+# Platform selection
+#
+# CONFIG_ARCH_ACTIONS is not set
+# CONFIG_ARCH_AGILEX is not set
+CONFIG_ARCH_SUNXI=y
+# CONFIG_ARCH_ALPINE is not set
+CONFIG_ARCH_BCM2835=y
+# CONFIG_ARCH_BCM_IPROC is not set
+# CONFIG_ARCH_BERLIN is not set
+CONFIG_ARCH_BITMAIN=y
+# CONFIG_ARCH_BRCMSTB is not set
+# CONFIG_ARCH_EXYNOS is not set
+# CONFIG_ARCH_K3 is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
+# CONFIG_ARCH_LG1K is not set
+CONFIG_ARCH_HISI=y
+# CONFIG_ARCH_MEDIATEK is not set
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_MXC=y
+CONFIG_ARCH_QCOM=y
+# CONFIG_ARCH_REALTEK is not set
+# CONFIG_ARCH_RENESAS is not set
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SEATTLE=y
+# CONFIG_ARCH_STRATIX10 is not set
+CONFIG_ARCH_SYNQUACER=y
+CONFIG_ARCH_TEGRA=y
+# CONFIG_ARCH_SPRD is not set
+CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_THUNDER2=y
+# CONFIG_ARCH_UNIPHIER is not set
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_XGENE=y
+# CONFIG_ARCH_ZX is not set
+# CONFIG_ARCH_ZYNQMP is not set
+# end of Platform selection
+
+#
+# Kernel Features
+#
+
+#
+# ARM errata workarounds via the alternatives framework
+#
+CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
+CONFIG_ARM64_ERRATUM_826319=y
+CONFIG_ARM64_ERRATUM_827319=y
+CONFIG_ARM64_ERRATUM_824069=y
+CONFIG_ARM64_ERRATUM_819472=y
+CONFIG_ARM64_ERRATUM_832075=y
+CONFIG_ARM64_ERRATUM_834220=y
+CONFIG_ARM64_ERRATUM_845719=y
+CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_ARM64_ERRATUM_1024718=y
+CONFIG_ARM64_ERRATUM_1418040=y
+CONFIG_ARM64_ERRATUM_1165522=y
+CONFIG_ARM64_ERRATUM_1286807=y
+CONFIG_ARM64_ERRATUM_1463225=y
+CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
+CONFIG_CAVIUM_ERRATUM_23154=y
+CONFIG_CAVIUM_ERRATUM_27456=y
+CONFIG_CAVIUM_ERRATUM_30115=y
+CONFIG_QCOM_FALKOR_ERRATUM_1003=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
+CONFIG_QCOM_FALKOR_ERRATUM_1009=y
+CONFIG_QCOM_QDF2400_ERRATUM_0065=y
+CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
+CONFIG_HISILICON_ERRATUM_161600802=y
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_FUJITSU_ERRATUM_010001=y
+# end of ARM errata workarounds via the alternatives framework
+
+CONFIG_ARM64_4K_PAGES=y
+# CONFIG_ARM64_16K_PAGES is not set
+# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_VA_BITS_39 is not set
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARM64_VA_BITS=48
+CONFIG_ARM64_PA_BITS_48=y
+CONFIG_ARM64_PA_BITS=48
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SCHED_MC=y
+# CONFIG_SCHED_SMT is not set
+CONFIG_NR_CPUS=256
+CONFIG_HOTPLUG_CPU=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=2
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_HOLES_IN_ZONE=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_HW_PERF_EVENTS=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_SECCOMP=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+# CONFIG_KEXEC_VERIFY_SIG is not set
+CONFIG_CRASH_DUMP=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_EL2_VECTORS=y
+CONFIG_ARM64_SSBD=y
+CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
+# CONFIG_ARM64_SW_TTBR0_PAN is not set
+CONFIG_COMPAT=y
+CONFIG_KUSER_HELPERS=y
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_SETEND_EMULATION=y
+
+#
+# ARMv8.1 architectural features
+#
+CONFIG_ARM64_HW_AFDBM=y
+CONFIG_ARM64_PAN=y
+# CONFIG_ARM64_LSE_ATOMICS is not set
+CONFIG_ARM64_VHE=y
+# end of ARMv8.1 architectural features
+
+#
+# ARMv8.2 architectural features
+#
+CONFIG_ARM64_UAO=y
+CONFIG_ARM64_PMEM=y
+CONFIG_ARM64_RAS_EXTN=y
+CONFIG_ARM64_CNP=y
+# end of ARMv8.2 architectural features
+
+#
+# ARMv8.3 architectural features
+#
+CONFIG_ARM64_PTR_AUTH=y
+# end of ARMv8.3 architectural features
+
+CONFIG_ARM64_SVE=y
+CONFIG_ARM64_MODULE_PLTS=y
+# CONFIG_ARM64_PSEUDO_NMI is not set
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+# end of Kernel Features
+
+#
+# Boot options
+#
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
+CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_FORCE is not set
+CONFIG_EFI_STUB=y
+CONFIG_EFI=y
+CONFIG_DMI=y
+# end of Boot options
+
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+
+#
+# Power management options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
+CONFIG_CPU_PM=y
+CONFIG_ENERGY_MODEL=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+# end of Power management options
+
+#
+# CPU Power Management
+#
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+CONFIG_DT_IDLE_STATES=y
+
+#
+# ARM CPU Idle Drivers
+#
+CONFIG_ARM_CPUIDLE=y
+# end of ARM CPU Idle Drivers
+# end of CPU Idle
+
+#
+# CPU Frequency scaling
+#
+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_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_ACPI_CPPC_CPUFREQ=m
+# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set
+# CONFIG_ARM_ARMADA_8K_CPUFREQ is not set
+CONFIG_ARM_IMX_CPUFREQ_DT=m
+# CONFIG_ARM_QCOM_CPUFREQ_HW is not set
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=m
+CONFIG_ARM_TEGRA20_CPUFREQ=y
+CONFIG_ARM_TEGRA124_CPUFREQ=y
+# CONFIG_ARM_TEGRA186_CPUFREQ is not set
+# CONFIG_QORIQ_CPUFREQ is not set
+# end of CPU Frequency scaling
+# end of CPU Power Management
+
+#
+# Firmware Drivers
+#
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+# CONFIG_ARM_SCPI_PROTOCOL is not set
+# CONFIG_ARM_SDE_INTERFACE is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_RASPBERRYPI_FIRMWARE=y
+# CONFIG_FW_CFG_SYSFS is not set
+CONFIG_QCOM_SCM=y
+CONFIG_QCOM_SCM_64=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_ARMSTUB=y
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_EFI_EARLYCON=y
+CONFIG_IMX_SCU=y
+CONFIG_IMX_SCU_PD=y
+CONFIG_MESON_SM=y
+
+#
+# Tegra firmware driver
+#
+CONFIG_TEGRA_IVC=y
+CONFIG_TEGRA_BPMP=y
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_GENERIC_GSI=y
+CONFIG_ACPI_CCA_REQUIRED=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_TAD=m
+# CONFIG_ACPI_DOCK is not set
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_MCFG=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+# CONFIG_ACPI_IPMI is not set
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_NUMA=y
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_CONTAINER=y
+# CONFIG_ACPI_HED is not set
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+# CONFIG_ACPI_BGRT is not set
+CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
+CONFIG_ACPI_NFIT=y
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+# CONFIG_ACPI_APEI is not set
+# CONFIG_PMIC_OPREGION is not set
+# CONFIG_ACPI_CONFIGFS is not set
+CONFIG_ACPI_IORT=y
+CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_PPTT=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
+CONFIG_IRQ_BYPASS_MANAGER=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_KVM_ARM_HOST=y
+CONFIG_KVM_ARM_PMU=y
+CONFIG_KVM_INDIRECT_VECTORS=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA256_ARM64=m
+# CONFIG_CRYPTO_SHA512_ARM64 is not set
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+# CONFIG_CRYPTO_SHA512_ARM64_CE is not set
+# CONFIG_CRYPTO_SHA3_ARM64 is not set
+# CONFIG_CRYPTO_SM3_ARM64_CE is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
+CONFIG_CRYPTO_AES_ARM64=m
+CONFIG_CRYPTO_AES_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
+# CONFIG_CRYPTO_CHACHA20_NEON is not set
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+# CONFIG_CRYPTO_AES_ARM64_BS is not set
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_KEEPINITRD=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+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_HUGE_VMAP=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_REFCOUNT_FULL=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS 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
+# CONFIG_BLK_DEV_ZONED is not set
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
+CONFIG_BLK_WBT=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_SED_OPAL=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
+CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
+CONFIG_ARCH_INLINE_SPIN_LOCK=y
+CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y
+CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y
+CONFIG_ARCH_INLINE_READ_LOCK=y
+CONFIG_ARCH_INLINE_READ_LOCK_BH=y
+CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_READ_UNLOCK=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y
+CONFIG_ARCH_INLINE_WRITE_LOCK=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y
+CONFIG_INLINE_SPIN_TRYLOCK=y
+CONFIG_INLINE_SPIN_TRYLOCK_BH=y
+CONFIG_INLINE_SPIN_LOCK=y
+CONFIG_INLINE_SPIN_LOCK_BH=y
+CONFIG_INLINE_SPIN_LOCK_IRQ=y
+CONFIG_INLINE_SPIN_LOCK_IRQSAVE=y
+CONFIG_INLINE_SPIN_UNLOCK_BH=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE=y
+CONFIG_INLINE_READ_LOCK=y
+CONFIG_INLINE_READ_LOCK_BH=y
+CONFIG_INLINE_READ_LOCK_IRQ=y
+CONFIG_INLINE_READ_LOCK_IRQSAVE=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_BH=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y
+CONFIG_INLINE_WRITE_LOCK=y
+CONFIG_INLINE_WRITE_LOCK_BH=y
+CONFIG_INLINE_WRITE_LOCK_IRQ=y
+CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_BH=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
+# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+# CONFIG_CLEANCACHE is not set
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
+CONFIG_ZSMALLOC=m
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_FRAME_VECTOR=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_UNIX_DIAG=m
+# CONFIG_TLS is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_SMC is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+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
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+# CONFIG_INET_RAW_DIAG is not set
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+# CONFIG_NFT_FLOW_OFFLOAD is not set
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+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_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+# CONFIG_NET_SCH_CBS is not set
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+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
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=m
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_DEBUGFS=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+# CONFIG_HSR is not set
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+# CONFIG_QRTR is not set
+# CONFIG_NET_NCSI is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=m
+# end of Network testing
+# end of Networking options
+
+# CONFIG_HAMRADIO is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_VXCAN is not set
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_FLEXCAN=m
+# CONFIG_CAN_GRCAN is not set
+# CONFIG_CAN_XILINXCAN is not set
+# CONFIG_CAN_C_CAN is not set
+# CONFIG_CAN_CC770 is not set
+# CONFIG_CAN_IFI_CANFD is not set
+# CONFIG_CAN_M_CAN is not set
+# CONFIG_CAN_PEAK_PCIEFD is not set
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
+# CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SOFTING=m
+
+#
+# CAN SPI interfaces
+#
+# CONFIG_CAN_HI311X is not set
+# CONFIG_CAN_MCP251X is not set
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+# CONFIG_CAN_MCBA_USB is not set
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
+# CONFIG_BT_SELFTEST is not set
+CONFIG_BT_DEBUGFS=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_NOKIA is not set
+# CONFIG_BT_HCIUART_BCSP is not set
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_HCIVHCI is not set
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_QCOMSMD=m
+CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=y
+# CONFIG_AF_KCM is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_XEN is not set
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+# CONFIG_NFC_NCI is not set
+# CONFIG_NFC_HCI is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+# CONFIG_NFC_TRF7970A is not set
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+# CONFIG_NFC_PN533_I2C is not set
+# CONFIG_NFC_ST95HF is not set
+# end of Near Field Communication (NFC) devices
+
+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=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_TEGRA_AHB=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEAER_INJECT=m
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+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
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_BW is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_PCI_ATS=y
+CONFIG_PCI_ECAM=y
+CONFIG_PCI_BRIDGE_EMUL=y
+CONFIG_PCI_IOV=y
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
+CONFIG_PCI_LABEL=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+CONFIG_PCI_AARDVARK=y
+
+#
+# Cadence PCIe controllers support
+#
+# CONFIG_PCIE_CADENCE_HOST is not set
+# end of Cadence PCIe controllers support
+
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_TEGRA=y
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+# CONFIG_PCIE_XILINX is not set
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_XGENE_MSI=y
+# CONFIG_PCIE_ALTERA is not set
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_HISI=y
+CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_KIRIN=y
+# CONFIG_PCIE_HISI_STB is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
+# end of PCI switch controller drivers
+
+# CONFIG_PCCARD is not set
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+# CONFIG_UEVENT_HELPER is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_SOC_BUS=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+CONFIG_GENERIC_ARCH_TOPOLOGY=y
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# CONFIG_BRCMSTB_GISB_ARB is not set
+# CONFIG_HISILICON_LPC is not set
+# CONFIG_IMX_WEIM is not set
+CONFIG_QCOM_EBI2=y
+# CONFIG_SIMPLE_PM_BUS is not set
+CONFIG_SUN50I_DE2_BUS=y
+CONFIG_SUNXI_RSB=y
+CONFIG_TEGRA_ACONNECT=y
+# CONFIG_TEGRA_GMI is not set
+CONFIG_VEXPRESS_CONFIG=y
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# Partition parsers
+#
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PCI=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+# CONFIG_MTD_DATAFLASH_OTP is not set
+CONFIG_MTD_M25P80=m
+# CONFIG_MTD_MCHP23K256 is not set
+CONFIG_MTD_SST25L=m
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+# CONFIG_MTD_ONENAND_GENERIC is not set
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+# CONFIG_MTD_NAND_DENALI_PCI is not set
+CONFIG_MTD_NAND_DENALI_DT=m
+# CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_MARVELL=m
+CONFIG_MTD_NAND_BRCMNAND=m
+CONFIG_MTD_NAND_MXC=m
+CONFIG_MTD_NAND_SUNXI=m
+CONFIG_MTD_NAND_HISI504=m
+CONFIG_MTD_NAND_QCOM=m
+CONFIG_MTD_NAND_TEGRA=m
+CONFIG_MTD_NAND_MESON=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_SPI_CADENCE_QUADSPI is not set
+CONFIG_SPI_HISI_SFC=m
+# CONFIG_SPI_MTK_QUADSPI is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+CONFIG_HBMC_AM654=m
+CONFIG_DTC=y
+CONFIG_OF=y
+# CONFIG_OF_UNITTEST is not set
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=m
+CONFIG_OF_RESERVED_MEM=y
+# CONFIG_OF_OVERLAY is not set
+CONFIG_OF_NUMA=y
+CONFIG_PARPORT=m
+# CONFIG_PARPORT_AX88796 is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_CDROM=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SKD=m
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_VIRTIO_BLK_SCSI is not set
+CONFIG_BLK_DEV_RBD=m
+# CONFIG_BLK_DEV_RSXX is not set
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+# CONFIG_NVME_TARGET_LOOP is not set
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+# CONFIG_NVME_TARGET_FCLOOP is not set
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_PHANTOM is not set
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+# CONFIG_HP_ILO is not set
+CONFIG_QCOM_COINCELL=m
+# CONFIG_QCOM_FASTRPC is not set
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+CONFIG_SRAM=y
+CONFIG_VEXPRESS_SYSCFG=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_PVPANIC=m
+CONFIG_C2PORT=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+# CONFIG_EEPROM_IDT_89HPESX is not set
+# CONFIG_EEPROM_EE1004 is not set
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+
+#
+# Intel MIC & related support
+#
+
+#
+# Intel MIC Bus Driver
+#
+
+#
+# SCIF Bus Driver
+#
+
+#
+# VOP Bus Driver
+#
+# CONFIG_VOP_BUS is not set
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
+# SCIF Driver
+#
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
+# VOP Driver
+#
+# end of Intel MIC & related support
+
+# CONFIG_GENWQE is not set
+# CONFIG_ECHO is not set
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+# end of Misc devices
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+CONFIG_AIC79XX_DEBUG_ENABLE=y
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_HISI_SAS=m
+CONFIG_SCSI_HISI_SAS_PCI=m
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+# CONFIG_SCSI_ARCMSR is not set
+CONFIG_SCSI_ESAS2R=m
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_HPTIOP=m
+# CONFIG_SCSI_MYRB is not set
+# CONFIG_SCSI_MYRS is not set
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_QEDI is not set
+# CONFIG_QEDF is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_AM53C974 is not set
+CONFIG_SCSI_WD719X=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_HAVE_PATA_PLATFORM=y
+CONFIG_ATA=m
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_IMX=m
+# CONFIG_AHCI_CEVA is not set
+CONFIG_AHCI_MVEBU=m
+# CONFIG_AHCI_SUNXI is not set
+CONFIG_AHCI_TEGRA=m
+CONFIG_AHCI_XGENE=m
+# CONFIG_AHCI_QORIQ is not set
+CONFIG_SATA_AHCI_SEATTLE=m
+# CONFIG_SATA_INIC162X is not set
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+# CONFIG_SATA_DWC is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+CONFIG_PATA_ARTOP=m
+# CONFIG_PATA_ATIIXP is not set
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IMX is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+# CONFIG_PATA_NETCELL is not set
+CONFIG_PATA_NINJA32=m
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_PATA_ACPI is not set
+CONFIG_ATA_GENERIC=m
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+# CONFIG_MD_CLUSTER is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+# CONFIG_DM_UNSTRIPED is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+# CONFIG_DM_INTEGRITY is not set
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_VSOCKMON is not set
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+# CONFIG_ATM_IDT77252 is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+# CONFIG_ATM_HE is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_B53 is not set
+# CONFIG_NET_DSA_BCM_SF2 is not set
+# CONFIG_NET_DSA_LOOP is not set
+# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
+# CONFIG_NET_DSA_MT7530 is not set
+CONFIG_NET_DSA_MV88E6060=m
+# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+# CONFIG_NET_DSA_QCA8K is not set
+CONFIG_NET_DSA_REALTEK_SMI=m
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
+CONFIG_NET_DSA_VITESSE_VSC73XX=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m
+CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+# CONFIG_SLICOSS is not set
+CONFIG_NET_VENDOR_ALLWINNER=y
+# CONFIG_SUN4I_EMAC is not set
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+# CONFIG_AMD8111_ETH is not set
+CONFIG_PCNET32=m
+CONFIG_AMD_XGBE=m
+# CONFIG_AMD_XGBE_DCB is not set
+CONFIG_NET_XGENE=m
+CONFIG_NET_XGENE_V2=m
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+# CONFIG_NET_VENDOR_ARC is not set
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+# CONFIG_NET_VENDOR_AURORA is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+# CONFIG_BCMGENET is not set
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+# CONFIG_MACB is not set
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=y
+CONFIG_LIQUIDIO=m
+# CONFIG_LIQUIDIO_VF is not set
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+# CONFIG_GEMINI_ETHERNET is not set
+# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_FREESCALE=y
+CONFIG_FEC=m
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HISILICON=y
+CONFIG_HIX5HD2_GMAC=m
+CONFIG_HISI_FEMAC=m
+CONFIG_HIP04_ETH=m
+CONFIG_HI13X1_GMAC=y
+CONFIG_HNS_MDIO=m
+CONFIG_HNS=m
+CONFIG_HNS_DSAF=m
+CONFIG_HNS_ENET=m
+# CONFIG_HNS3 is not set
+CONFIG_NET_VENDOR_HP=y
+# CONFIG_HP100 is not set
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+# CONFIG_I40EVF is not set
+# CONFIG_ICE is not set
+# CONFIG_FM10K is not set
+# CONFIG_IGC is not set
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+# CONFIG_OCTEONTX2_AF is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+# CONFIG_MLXSW_CORE is not set
+# CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_MICREL=y
+# CONFIG_KS8842 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCX24J600 is not set
+# CONFIG_LAN743X is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_MSCC_OCELOT_SWITCH_OCELOT=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NE2K_PCI=m
+CONFIG_NET_VENDOR_NVIDIA=y
+# CONFIG_FORCEDETH is not set
+CONFIG_NET_VENDOR_OKI=y
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+# CONFIG_QCA7000_SPI is not set
+# CONFIG_QCA7000_UART is not set
+CONFIG_QCOM_EMAC=m
+# CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+# CONFIG_ROCKER is not set
+CONFIG_NET_VENDOR_SAMSUNG=y
+# CONFIG_SXGBE_ETH is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+# CONFIG_SIS900 is not set
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC91X=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_SNI_NETSEC=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+# CONFIG_DWMAC_DWC_QOS_ETH is not set
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
+CONFIG_DWMAC_ROCKCHIP=m
+CONFIG_DWMAC_SUNXI=m
+CONFIG_DWMAC_SUN8I=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+# CONFIG_VIA_RHINE is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+# CONFIG_WIZNET_W5100 is not set
+# CONFIG_WIZNET_W5300 is not set
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BUS_MUX=m
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+CONFIG_MDIO_BUS_MUX_MESON_G12A=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_MSCC_MIIM=m
+# CONFIG_MDIO_OCTEON is not set
+# CONFIG_MDIO_SUN4I is not set
+CONFIG_MDIO_THUNDER=m
+CONFIG_MDIO_XGENE=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=m
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+
+#
+# MII PHY device drivers
+#
+# CONFIG_SFP is not set
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_AT803X_PHY=m
+# CONFIG_BCM7XXX_PHY is not set
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+# CONFIG_CORTINA_PHY is not set
+CONFIG_DAVICOM_PHY=m
+# CONFIG_DP83822_PHY is not set
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_FIXED_PHY=m
+CONFIG_ICPLUS_PHY=m
+# CONFIG_INTEL_XWAY_PHY is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MESON_GXL_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+# CONFIG_RENESAS_PHY is not set
+# CONFIG_ROCKCHIP_PHY is not set
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=m
+# CONFIG_XILINX_GMII2RGMII is not set
+# CONFIG_MICREL_KS8995MA is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Host-side USB support is needed for USB Network Adapter support
+#
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+# CONFIG_ATH9K_HWRNG is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_AHB is not set
+# CONFIG_ATH10K_SDIO is not set
+# CONFIG_ATH10K_USB is not set
+# CONFIG_ATH10K_SNOC is not set
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+# CONFIG_ATMEL is not set
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_WLAN_VENDOR_INTEL=y
+# CONFIG_IPW2100 is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+# CONFIG_HERMES is not set
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_MWIFIEX is not set
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+# CONFIG_RTW88 is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+CONFIG_RSI_DEBUGFS=y
+# CONFIG_RSI_SDIO is not set
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+# CONFIG_CW1200 is not set
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+# CONFIG_USB_ZD1201 is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+# CONFIG_IEEE802154_CA8210 is not set
+CONFIG_IEEE802154_MCR20A=m
+# CONFIG_IEEE802154_HWSIM is not set
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+# CONFIG_VMXNET3 is not set
+# CONFIG_FUJITSU_ES is not set
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+# CONFIG_ISDN is not set
+# CONFIG_NVM is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+CONFIG_KEYBOARD_ADP5588=m
+# CONFIG_KEYBOARD_ADP5589 is not set
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+# CONFIG_KEYBOARD_QT1070 is not set
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_GPIO=m
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+CONFIG_KEYBOARD_LM8323=m
+# CONFIG_KEYBOARD_LM8333 is not set
+CONFIG_KEYBOARD_MAX7359=m
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+CONFIG_KEYBOARD_SNVS_PWRKEY=m
+CONFIG_KEYBOARD_IMX=m
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OPENCORES=m
+# CONFIG_KEYBOARD_SAMSUNG is not set
+CONFIG_KEYBOARD_STOWAWAY=m
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_SUN4I_LRADC is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_CROS_EC is not set
+# CONFIG_KEYBOARD_CAP11XX is not set
+# CONFIG_KEYBOARD_BCM is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
+# CONFIG_MOUSE_ELAN_I2C is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+# CONFIG_INPUT_JOYSTICK is not set
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
+CONFIG_INPUT_PM8941_PWRKEY=m
+# CONFIG_INPUT_PM8XXX_VIBRATOR is not set
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
+# CONFIG_INPUT_GPIO_VIBRA is not set
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_KXTJ9 is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
+# CONFIG_INPUT_RK805_PWRKEY is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_CMA3000 is not set
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2665_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
+CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_RMI4_CORE=m
+# CONFIG_RMI4_I2C is not set
+# CONFIG_RMI4_SPI is not set
+# CONFIG_RMI4_SMB 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
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+# CONFIG_RMI4_F54 is not set
+# CONFIG_RMI4_F55 is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_AMBAKMI is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
+# CONFIG_SERIO_ARC_PS2 is not set
+# CONFIG_SERIO_APBPS2 is not set
+# CONFIG_SERIO_SUN4I_PS2 is not set
+# CONFIG_SERIO_GPIO_PS2 is not set
+# CONFIG_USERIO is not set
+# CONFIG_GAMEPORT is not set
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+CONFIG_NOZOMI=m
+CONFIG_N_GSM=m
+# CONFIG_TRACE_SINK is not set
+CONFIG_NULL_TTY=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+# CONFIG_SERIAL_8250_ASPEED_VUART is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_RSA is not set
+CONFIG_SERIAL_8250_BCM2835AUX=y
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_MOXA=m
+CONFIG_SERIAL_OF_PLATFORM=y
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_TEGRA=y
+CONFIG_SERIAL_TEGRA_TCU=m
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_IMX=m
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_QCOM_GENI=m
+# CONFIG_SERIAL_SIFIVE is not set
+# CONFIG_SERIAL_SCCNXP is not set
+# CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
+# CONFIG_SERIAL_ARC is not set
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_SERIAL_MVEBU_CONSOLE=y
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_TTY_PRINTK=m
+CONFIG_TTY_PRINTK_LEVEL=6
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+# CONFIG_HVC_DCC is not set
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+# CONFIG_IPMI_WATCHDOG is not set
+# CONFIG_IPMI_POWEROFF is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_HW_RANDOM_BCM2835=m
+# CONFIG_HW_RANDOM_OMAP is not set
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_IMX_RNGC=m
+CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_XGENE=m
+CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_CAVIUM=m
+CONFIG_HW_RANDOM_OPTEE=m
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_XILLYBUS is not set
+# end of Character devices
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+# CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_GPMUX is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
+# CONFIG_I2C_MUX_PCA9541 is not set
+# CONFIG_I2C_MUX_PCA954x is not set
+# CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
+# CONFIG_I2C_MUX_MLXCPLD is not set
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_AMD_MP2 is not set
+# CONFIG_I2C_HIX5HD2 is not set
+# CONFIG_I2C_I801 is not set
+CONFIG_I2C_ISCH=m
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_NVIDIA_GPU is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# ACPI drivers
+#
+# CONFIG_I2C_SCMI is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_BCM2835=m
+# CONFIG_I2C_CADENCE is not set
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+# CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_IMX=m
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_MESON=m
+CONFIG_I2C_MV64XXX=m
+# CONFIG_I2C_NOMADIK is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_SLAVE is not set
+CONFIG_I2C_QCOM_GENI=m
+CONFIG_I2C_QUP=m
+CONFIG_I2C_RK3X=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SYNQUACER=m
+CONFIG_I2C_TEGRA=m
+CONFIG_I2C_TEGRA_BPMP=y
+# CONFIG_I2C_VERSATILE is not set
+CONFIG_I2C_THUNDERX=m
+# CONFIG_I2C_XILINX is not set
+CONFIG_I2C_XLP9XX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_XGENE_SLIMPRO=m
+# end of I2C Hardware Bus support
+
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+CONFIG_SPI_ARMADA_3700=m
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BCM2835=m
+CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_CADENCE is not set
+# CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_FSL_LPSPI=m
+CONFIG_SPI_FSL_QUADSPI=m
+CONFIG_SPI_NXP_FLEXSPI=m
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_IMX=m
+CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_MESON_SPICC is not set
+CONFIG_SPI_MESON_SPIFC=m
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_ROCKCHIP is not set
+# CONFIG_SPI_QCOM_QSPI is not set
+CONFIG_SPI_QUP=m
+# CONFIG_SPI_QCOM_GENI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
+# CONFIG_SPI_SUN4I is not set
+# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SYNQUACER=m
+# CONFIG_SPI_MXIC is not set
+CONFIG_SPI_TEGRA114=m
+CONFIG_SPI_TEGRA20_SFLASH=m
+CONFIG_SPI_TEGRA20_SLINK=m
+CONFIG_SPI_THUNDERX=m
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_XLP=m
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPMI=y
+CONFIG_SPMI_MSM_PMIC_ARB=y
+# CONFIG_HSI is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+# CONFIG_PPS_CLIENT_GPIO is not set
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_QORIQ=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_GENERIC_PINCTRL_GROUPS=y
+CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_BM1880=y
+# CONFIG_PINCTRL_MCP23S08 is not set
+CONFIG_PINCTRL_ROCKCHIP=y
+CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_STMFX is not set
+CONFIG_PINCTRL_MAX77620=y
+# CONFIG_PINCTRL_RK805 is not set
+# CONFIG_PINCTRL_OCELOT is not set
+CONFIG_PINCTRL_BCM2835=y
+CONFIG_PINCTRL_IMX=y
+CONFIG_PINCTRL_IMX_SCU=y
+CONFIG_PINCTRL_IMX8MM=y
+CONFIG_PINCTRL_IMX8MN=y
+CONFIG_PINCTRL_IMX8MQ=y
+CONFIG_PINCTRL_IMX8QM=y
+CONFIG_PINCTRL_IMX8QXP=y
+CONFIG_PINCTRL_MVEBU=y
+CONFIG_PINCTRL_ARMADA_AP806=y
+CONFIG_PINCTRL_ARMADA_CP110=y
+CONFIG_PINCTRL_ARMADA_37XX=y
+CONFIG_PINCTRL_MSM=y
+# CONFIG_PINCTRL_APQ8064 is not set
+# CONFIG_PINCTRL_APQ8084 is not set
+# CONFIG_PINCTRL_IPQ4019 is not set
+# CONFIG_PINCTRL_IPQ8064 is not set
+# CONFIG_PINCTRL_IPQ8074 is not set
+# CONFIG_PINCTRL_MSM8660 is not set
+# CONFIG_PINCTRL_MSM8960 is not set
+# CONFIG_PINCTRL_MDM9615 is not set
+# CONFIG_PINCTRL_MSM8X74 is not set
+CONFIG_PINCTRL_MSM8916=y
+# CONFIG_PINCTRL_MSM8994 is not set
+CONFIG_PINCTRL_MSM8996=y
+# CONFIG_PINCTRL_MSM8998 is not set
+# CONFIG_PINCTRL_QCS404 is not set
+# CONFIG_PINCTRL_QDF2XXX is not set
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=y
+# CONFIG_PINCTRL_SDM660 is not set
+# CONFIG_PINCTRL_SDM845 is not set
+CONFIG_PINCTRL_SM8150=m
+CONFIG_PINCTRL_SUNXI=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
+CONFIG_PINCTRL_SUN50I_A64=y
+CONFIG_PINCTRL_SUN50I_A64_R=y
+CONFIG_PINCTRL_SUN50I_H5=y
+CONFIG_PINCTRL_SUN50I_H6=y
+CONFIG_PINCTRL_SUN50I_H6_R=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA210=y
+CONFIG_PINCTRL_TEGRA194=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_PINCTRL_MESON_GXL=y
+CONFIG_PINCTRL_MESON8_PMX=y
+CONFIG_PINCTRL_MESON_AXG=y
+CONFIG_PINCTRL_MESON_AXG_PMX=y
+CONFIG_PINCTRL_MESON_G12A=y
+CONFIG_PINCTRL_MADERA=m
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=y
+
+#
+# Memory mapped GPIO drivers
+#
+# CONFIG_GPIO_74XX_MMIO is not set
+# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_RASPBERRYPI_EXP=m
+CONFIG_GPIO_CADENCE=m
+# CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_EXAR is not set
+# CONFIG_GPIO_FTGPIO010 is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_HLWD is not set
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MVEBU=y
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_SAMA5D2_PIOBU is not set
+# CONFIG_GPIO_SYSCON is not set
+CONFIG_GPIO_TEGRA=y
+# CONFIG_GPIO_THUNDERX is not set
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_XGENE_SB=m
+CONFIG_GPIO_XILINX=m
+CONFIG_GPIO_XLP=y
+# CONFIG_GPIO_AMD_FCH is not set
+# end of Memory mapped GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_GW_PLD is not set
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_TPIC2810 is not set
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_BD70528=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MAX77620=y
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+# CONFIG_GPIO_RDC321X is not set
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_74X164 is not set
+# CONFIG_GPIO_MAX3191X is not set
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_MXC=m
+# CONFIG_W1_MASTER_DS1WM is not set
+CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+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
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_AVS=y
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_BRCMSTB is not set
+# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
+CONFIG_POWER_RESET_HISI=y
+CONFIG_POWER_RESET_MSM=y
+CONFIG_POWER_RESET_QCOM_PON=m
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_REBOOT_MODE=m
+# CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_NVMEM_REBOOT_MODE=m
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+# CONFIG_PDA_POWER is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+CONFIG_CHARGER_ADP5061=m
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_LEGO_EV3 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
+CONFIG_BATTERY_BQ27XXX=m
+# CONFIG_BATTERY_BQ27XXX_I2C is not set
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1721X is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
+CONFIG_CHARGER_QCOM_SMBB=m
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ25890 is not set
+# CONFIG_CHARGER_SMB347 is not set
+# CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_CHARGER_RT9455 is not set
+CONFIG_CHARGER_CROS_USBPD=m
+# CONFIG_CHARGER_UCS1002 is not set
+# CONFIG_CHARGER_BD70528 is not set
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+CONFIG_SENSORS_ADM1029=m
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ADM9240=m
+# CONFIG_SENSORS_ADT7310 is not set
+# CONFIG_SENSORS_ADT7410 is not set
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_ARM_SCMI=m
+# CONFIG_SENSORS_ASPEED is not set
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+# CONFIG_SENSORS_DS1621 is not set
+CONFIG_SENSORS_I5K_AMB=m
+# CONFIG_SENSORS_F71805F is not set
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FTSTEUTATES=m
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+CONFIG_SENSORS_G760A=m
+# CONFIG_SENSORS_G762 is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
+# CONFIG_SENSORS_HIH6130 is not set
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+# CONFIG_SENSORS_IIO_HWMON is not set
+# CONFIG_SENSORS_IT87 is not set
+CONFIG_SENSORS_JC42=m
+# CONFIG_SENSORS_POWR1220 is not set
+CONFIG_SENSORS_LINEAGE=m
+# CONFIG_SENSORS_LTC2945 is not set
+# CONFIG_SENSORS_LTC2990 is not set
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+# CONFIG_SENSORS_LTC4222 is not set
+CONFIG_SENSORS_LTC4245=m
+# CONFIG_SENSORS_LTC4260 is not set
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+# CONFIG_SENSORS_MAX1619 is not set
+CONFIG_SENSORS_MAX1668=m
+# CONFIG_SENSORS_MAX197 is not set
+# CONFIG_SENSORS_MAX31722 is not set
+# CONFIG_SENSORS_MAX6621 is not set
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+# CONFIG_SENSORS_MAX6697 is not set
+# CONFIG_SENSORS_MAX31790 is not set
+# CONFIG_SENSORS_MCP3021 is not set
+# CONFIG_SENSORS_TC654 is not set
+CONFIG_SENSORS_ADCXX=m
+# CONFIG_SENSORS_LM63 is not set
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+CONFIG_SENSORS_LM93=m
+# CONFIG_SENSORS_LM95234 is not set
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_PC87360 is not set
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+# CONFIG_SENSORS_NCT7802 is not set
+# CONFIG_SENSORS_NCT7904 is not set
+# CONFIG_SENSORS_NPCM7XX is not set
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_PMBUS is not set
+# CONFIG_SENSORS_PWM_FAN is not set
+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+# CONFIG_SENSORS_SHT15 is not set
+CONFIG_SENSORS_SHT21=m
+# CONFIG_SENSORS_SHT3x is not set
+# CONFIG_SENSORS_SHTC1 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+# CONFIG_SENSORS_SMSC47M1 is not set
+CONFIG_SENSORS_SMSC47M192=m
+# CONFIG_SENSORS_SMSC47B397 is not set
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+# CONFIG_SENSORS_SCH5636 is not set
+# CONFIG_SENSORS_STTS751 is not set
+CONFIG_SENSORS_SMM665=m
+# CONFIG_SENSORS_ADC128D818 is not set
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+# CONFIG_SENSORS_INA209 is not set
+# CONFIG_SENSORS_INA2XX is not set
+# CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_TC74 is not set
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+# CONFIG_SENSORS_TMP103 is not set
+# CONFIG_SENSORS_TMP108 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+# CONFIG_SENSORS_VEXPRESS is not set
+# CONFIG_SENSORS_VIA686A is not set
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+# CONFIG_SENSORS_W83773G is not set
+# CONFIG_SENSORS_W83781D is not set
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+# CONFIG_SENSORS_W83L785TS is not set
+CONFIG_SENSORS_W83L786NG=m
+# CONFIG_SENSORS_W83627HF is not set
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_XGENE=m
+
+#
+# ACPI drivers
+#
+# CONFIG_SENSORS_ACPI_POWER is not set
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_CPU_THERMAL=y
+# CONFIG_CLOCK_THERMAL is not set
+# CONFIG_DEVFREQ_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+# CONFIG_THERMAL_MMIO is not set
+CONFIG_HISI_THERMAL=m
+CONFIG_IMX_THERMAL=m
+# CONFIG_MAX77620_THERMAL is not set
+# CONFIG_QORIQ_THERMAL is not set
+# CONFIG_ROCKCHIP_THERMAL is not set
+CONFIG_ARMADA_THERMAL=m
+
+#
+# Broadcom thermal drivers
+#
+CONFIG_BCM2835_THERMAL=m
+# end of Broadcom thermal drivers
+
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=y
+# CONFIG_TEGRA_BPMP_THERMAL is not set
+# end of NVIDIA Tegra thermal drivers
+
+# CONFIG_GENERIC_ADC_THERMAL is not set
+
+#
+# Qualcomm thermal drivers
+#
+CONFIG_QCOM_TSENS=m
+CONFIG_QCOM_SPMI_TEMP_ALARM=m
+# end of Qualcomm thermal drivers
+
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_BD70528_WATCHDOG=m
+CONFIG_GPIO_WATCHDOG=m
+# CONFIG_WDAT_WDT is not set
+# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_ZIIRAVE_WATCHDOG is not set
+CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_ARM_SBSA_WATCHDOG=m
+# CONFIG_ARMADA_37XX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
+CONFIG_DW_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_MAX77620_WATCHDOG is not set
+CONFIG_IMX2_WDT=m
+CONFIG_IMX_SC_WDT=m
+CONFIG_TEGRA_WATCHDOG=m
+CONFIG_QCOM_WDT=m
+CONFIG_MESON_GXBB_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
+CONFIG_PM8916_WATCHDOG=m
+# CONFIG_ALIM7101_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+CONFIG_BCM2835_WDT=m
+# CONFIG_MEN_A21_WDT is not set
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_GPIO is not set
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
+# CONFIG_BCMA_DRIVER_GPIO is not set
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+# CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_ATMEL_HLCDC is not set
+# CONFIG_MFD_BCM590XX is not set
+# CONFIG_MFD_BD9571MWV is not set
+# CONFIG_MFD_AC100 is not set
+CONFIG_MFD_AXP20X=m
+# CONFIG_MFD_AXP20X_I2C is not set
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_CROS_EC=y
+# CONFIG_MFD_CROS_EC_CHARDEV is not set
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_MC13XXX_SPI is not set
+# CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+CONFIG_MFD_HI655X_PMIC=m
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
+# CONFIG_LPC_ICH is not set
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+CONFIG_MFD_MAX77620=y
+# CONFIG_MFD_MAX77650 is not set
+# CONFIG_MFD_MAX77686 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_EZX_PCAP is not set
+# CONFIG_MFD_CPCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+# CONFIG_MFD_RETU is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_SPMI_PMIC=m
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
+CONFIG_MFD_RK808=m
+# CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_SEC_CORE is not set
+# CONFIG_MFD_SI476X_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUN6I_PRCM=y
+CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
+# CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS65217 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TI_LP87565 is not set
+# CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+CONFIG_MFD_ROHM_BD718XX=m
+CONFIG_MFD_ROHM_BD70528=m
+# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_STMFX is not set
+CONFIG_MFD_VEXPRESS_SYSREG=y
+# CONFIG_RAVE_SP_CORE is not set
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_88PG86X is not set
+# CONFIG_REGULATOR_ACT8865 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ANATOP is not set
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD70528=m
+CONFIG_REGULATOR_BD718XX=m
+# CONFIG_REGULATOR_DA9210 is not set
+# CONFIG_REGULATOR_DA9211 is not set
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI655X=m
+# CONFIG_REGULATOR_ISL9305 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_REGULATOR_LP8755 is not set
+# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX77620=m
+# CONFIG_REGULATOR_MAX8649 is not set
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_MAX8973 is not set
+# CONFIG_REGULATOR_MCP16502 is not set
+# CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_PFUZE100 is not set
+# CONFIG_REGULATOR_PV88060 is not set
+# CONFIG_REGULATOR_PV88080 is not set
+# CONFIG_REGULATOR_PV88090 is not set
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_SY8106A=m
+# CONFIG_REGULATOR_TPS51632 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
+# CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VCTRL is not set
+# CONFIG_REGULATOR_VEXPRESS is not set
+CONFIG_CEC_CORE=m
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+# CONFIG_IR_HIX5HD2 is not set
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+# CONFIG_IR_ITE_CIR is not set
+# CONFIG_IR_FINTEK is not set
+# CONFIG_IR_MESON is not set
+# CONFIG_IR_NUVOTON is not set
+CONFIG_IR_REDRAT3=m
+# CONFIG_IR_SPI is not set
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+# CONFIG_IR_GPIO_CIR is not set
+# CONFIG_IR_GPIO_TX is not set
+# CONFIG_IR_PWM_TX is not set
+# CONFIG_IR_SUNXI is not set
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_SIR is not set
+CONFIG_RC_XBOX_DVD=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_MEDIA_CEC_RC is not set
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=16
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+# CONFIG_VIDEO_TM6000 is not set
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+# CONFIG_DVB_USB_ZD1301 is not set
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=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
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+# CONFIG_VIDEO_CX25821 is not set
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+# CONFIG_VIDEO_SAA7134_GO7007 is not set
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_CADENCE=y
+# CONFIG_VIDEO_ASPEED is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=m
+CONFIG_VIDEO_IMX_PXP=m
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+# CONFIG_VIDEO_SH_VEU is not set
+# CONFIG_VIDEO_ROCKCHIP_RGA is not set
+CONFIG_VIDEO_QCOM_VENUS=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+# CONFIG_VIDEO_VIM2M is not set
+# CONFIG_VIDEO_VICODEC is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+# CONFIG_CEC_PLATFORM_DRIVERS is not set
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+# CONFIG_I2C_SI470X is not set
+# CONFIG_RADIO_SI4713 is not set
+CONFIG_USB_MR800=m
+# CONFIG_USB_DSBR is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+# CONFIG_RADIO_TEA5764 is not set
+# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_TEF6862 is not set
+# CONFIG_RADIO_WL1273 is not set
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+# CONFIG_RADIO_WL128X is not set
+# end of Texas Instruments WL128x FM driver (ST based)
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+CONFIG_VIDEO_V4L2_TPG=m
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_RJ54N1=m
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_I2C=m
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+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
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+CONFIG_DVB_MN88443X=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_VM=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_NXP_TDA9950 is not set
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+CONFIG_DRM_HDLCD=m
+# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
+CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_KOMEDA=m
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
+
+# CONFIG_HSA_AMD is not set
+CONFIG_DRM_NOUVEAU=m
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
+CONFIG_NOUVEAU_PLATFORM_DRIVER=y
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_ATI_PCIGART=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_RCAR_DW_HDMI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
+CONFIG_DRM_RCAR_WRITEBACK=y
+# CONFIG_DRM_SUN4I is not set
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_GPU_STATE=y
+# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+# CONFIG_DRM_MSM_GPU_SUDO is not set
+CONFIG_DRM_MSM_HDMI_HDCP=y
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_10NM_PHY=y
+CONFIG_DRM_TEGRA=m
+# CONFIG_DRM_TEGRA_DEBUG is not set
+CONFIG_DRM_TEGRA_STAGING=y
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_LVDS is not set
+CONFIG_DRM_PANEL_SIMPLE=m
+# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
+# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
+# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
+# CONFIG_DRM_PANEL_LG_LG4573 is not set
+# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
+# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m
+# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
+# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
+# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
+# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
+# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+CONFIG_DRM_CDNS_DSI=m
+# CONFIG_DRM_DUMB_VGA_DAC is not set
+# CONFIG_DRM_LVDS_ENCODER is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
+# CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PARADE_PS8622 is not set
+# CONFIG_DRM_SIL_SII8620 is not set
+# CONFIG_DRM_SII902X is not set
+# CONFIG_DRM_SII9234 is not set
+# CONFIG_DRM_THINE_THC63LVD1024 is not set
+# CONFIG_DRM_TOSHIBA_TC358764 is not set
+# CONFIG_DRM_TOSHIBA_TC358767 is not set
+# CONFIG_DRM_TI_TFP410 is not set
+# CONFIG_DRM_TI_SN65DSI86 is not set
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_I2C_ADV7533=y
+CONFIG_DRM_I2C_ADV7511_CEC=y
+CONFIG_DRM_DW_HDMI=m
+# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_DW_HDMI_CEC is not set
+# end of Display Interface Bridges
+
+CONFIG_DRM_VC4=m
+# CONFIG_DRM_VC4_HDMI_CEC is not set
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
+# CONFIG_DRM_ARCPGU is not set
+CONFIG_DRM_HISI_HIBMC=m
+CONFIG_DRM_HISI_KIRIN=m
+CONFIG_HISI_KIRIN_DW_DSI=m
+# CONFIG_DRM_MXSFB is not set
+CONFIG_DRM_MESON=m
+CONFIG_DRM_MESON_DW_HDMI=m
+# CONFIG_DRM_TINYDRM is not set
+# CONFIG_DRM_PL111 is not set
+# CONFIG_DRM_XEN is not set
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_LEGACY=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_MGA is not set
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=y
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_ARMCLCD=y
+CONFIG_FB_IMX=m
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_EFI=y
+# CONFIG_FB_OPENCORES is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_3DFX_I2C=y
+# CONFIG_FB_VOODOO1 is not set
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+# CONFIG_FB_CARMINE is not set
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
+# CONFIG_FB_METRONOME is not set
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+# CONFIG_FB_MX3 is not set
+CONFIG_FB_SIMPLE=y
+# CONFIG_FB_SSD1307 is not set
+# CONFIG_FB_SM712 is not set
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3630A is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+CONFIG_SND_ALOOP=m
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_MTS64=m
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+CONFIG_SND_HDSPM=m
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+CONFIG_SND_VIRTUOSO=m
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_PREALLOC_SIZE=2048
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+# CONFIG_SND_FIREWIRE_MOTU is not set
+# CONFIG_SND_FIREFACE is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+# CONFIG_SND_SOC_AMD_ACP is not set
+# CONFIG_SND_ATMEL_SOC is not set
+CONFIG_SND_BCM2835_SOC_I2S=m
+# CONFIG_SND_DESIGNWARE_I2S is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_IMX_PCM_DMA=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_IMX_SOC=m
+
+#
+# SoC Audio support for Freescale i.MX boards:
+#
+CONFIG_SND_SOC_IMX_ES8328=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_IMX_AUDMIX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
+
+#
+# ASoC support for Amlogic platforms
+#
+# CONFIG_SND_MESON_AXG_FRDDR is not set
+# CONFIG_SND_MESON_AXG_TODDR is not set
+# CONFIG_SND_MESON_AXG_TDMIN is not set
+# CONFIG_SND_MESON_AXG_TDMOUT is not set
+# CONFIG_SND_MESON_AXG_SOUND_CARD is not set
+# CONFIG_SND_MESON_AXG_SPDIFOUT is not set
+# CONFIG_SND_MESON_AXG_SPDIFIN is not set
+# CONFIG_SND_MESON_AXG_PDM is not set
+# CONFIG_SND_MESON_G12A_TOHDMITX is not set
+# end of ASoC support for Amlogic platforms
+
+CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_LPASS_CPU=m
+CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_LPASS_APQ8016=m
+# CONFIG_SND_SOC_STORM is not set
+CONFIG_SND_SOC_APQ8016_SBC=m
+CONFIG_SND_SOC_QCOM_COMMON=m
+CONFIG_SND_SOC_QDSP6_COMMON=m
+CONFIG_SND_SOC_QDSP6_CORE=m
+CONFIG_SND_SOC_QDSP6_AFE=m
+CONFIG_SND_SOC_QDSP6_AFE_DAI=m
+CONFIG_SND_SOC_QDSP6_ADM=m
+CONFIG_SND_SOC_QDSP6_ROUTING=m
+CONFIG_SND_SOC_QDSP6_ASM=m
+CONFIG_SND_SOC_QDSP6_ASM_DAI=m
+CONFIG_SND_SOC_QDSP6=m
+CONFIG_SND_SOC_MSM8996=m
+CONFIG_SND_SOC_SDM845=m
+# CONFIG_SND_SOC_ROCKCHIP is not set
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+#
+# Allwinner SoC Audio support
+#
+# CONFIG_SND_SUN4I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC is not set
+# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN50I_CODEC_ANALOG is not set
+# CONFIG_SND_SUN4I_I2S is not set
+# CONFIG_SND_SUN4I_SPDIF is not set
+# end of Allwinner SoC Audio support
+
+CONFIG_SND_SOC_TEGRA=m
+# CONFIG_SND_SOC_TEGRA20_AC97 is not set
+# CONFIG_SND_SOC_TEGRA20_DAS is not set
+# CONFIG_SND_SOC_TEGRA20_I2S is not set
+CONFIG_SND_SOC_TEGRA20_SPDIF=m
+# CONFIG_SND_SOC_TEGRA30_AHUB is not set
+# CONFIG_SND_SOC_TEGRA30_I2S is not set
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_WM8753=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+# CONFIG_SND_SOC_TEGRA_WM9712 is not set
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_MAX98090=m
+CONFIG_SND_SOC_TEGRA_RT5677=m
+# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set
+CONFIG_SND_SOC_XILINX_I2S=m
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+# CONFIG_SND_SOC_XTFPGA_I2S is not set
+# CONFIG_ZX_TDM is not set
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+# CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
+# CONFIG_SND_SOC_ADAU7002 is not set
+# CONFIG_SND_SOC_AK4104 is not set
+# CONFIG_SND_SOC_AK4118 is not set
+# CONFIG_SND_SOC_AK4458 is not set
+# CONFIG_SND_SOC_AK4554 is not set
+# CONFIG_SND_SOC_AK4613 is not set
+# CONFIG_SND_SOC_AK4642 is not set
+# CONFIG_SND_SOC_AK5386 is not set
+# CONFIG_SND_SOC_AK5558 is not set
+# CONFIG_SND_SOC_ALC5623 is not set
+CONFIG_SND_SOC_ALC5632=m
+# CONFIG_SND_SOC_BD28623 is not set
+# CONFIG_SND_SOC_BT_SCO is not set
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_CS35L33 is not set
+# CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
+# CONFIG_SND_SOC_CS42L42 is not set
+# CONFIG_SND_SOC_CS42L51_I2C is not set
+# CONFIG_SND_SOC_CS42L52 is not set
+# CONFIG_SND_SOC_CS42L56 is not set
+# CONFIG_SND_SOC_CS42L73 is not set
+# CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_CS4270 is not set
+# CONFIG_SND_SOC_CS4271_I2C is not set
+# CONFIG_SND_SOC_CS4271_SPI is not set
+# CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
+# CONFIG_SND_SOC_CS4349 is not set
+# CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_CX2072X is not set
+# CONFIG_SND_SOC_DMIC is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
+# CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8316 is not set
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+# CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_INNO_RK3036 is not set
+# CONFIG_SND_SOC_MAX98088 is not set
+CONFIG_SND_SOC_MAX98090=m
+# CONFIG_SND_SOC_MAX98357A is not set
+# CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX9867 is not set
+CONFIG_SND_SOC_MAX98927=m
+# CONFIG_SND_SOC_MAX98373 is not set
+# CONFIG_SND_SOC_MAX9860 is not set
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+# CONFIG_SND_SOC_PCM1681 is not set
+# CONFIG_SND_SOC_PCM1789_I2C is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
+# CONFIG_SND_SOC_PCM186X_I2C is not set
+# CONFIG_SND_SOC_PCM186X_SPI is not set
+# CONFIG_SND_SOC_PCM3060_I2C is not set
+# CONFIG_SND_SOC_PCM3060_SPI is not set
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
+# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_PCM512x_SPI is not set
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RL6231=m
+# CONFIG_SND_SOC_RT5616 is not set
+# CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_SGTL5000=m
+# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SPDIF is not set
+# CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_STA32X is not set
+# CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
+# CONFIG_SND_SOC_TAS2552 is not set
+# CONFIG_SND_SOC_TAS5086 is not set
+# CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_SND_SOC_TAS5720 is not set
+# CONFIG_SND_SOC_TAS6424 is not set
+# CONFIG_SND_SOC_TDA7419 is not set
+# CONFIG_SND_SOC_TFA9879 is not set
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC31XX is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
+# CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_TS3A227E is not set
+# CONFIG_SND_SOC_TSCS42XX is not set
+# CONFIG_SND_SOC_TSCS454 is not set
+# CONFIG_SND_SOC_WM8510 is not set
+# CONFIG_SND_SOC_WM8523 is not set
+# CONFIG_SND_SOC_WM8524 is not set
+# CONFIG_SND_SOC_WM8580 is not set
+# CONFIG_SND_SOC_WM8711 is not set
+# CONFIG_SND_SOC_WM8728 is not set
+# CONFIG_SND_SOC_WM8731 is not set
+# CONFIG_SND_SOC_WM8737 is not set
+# CONFIG_SND_SOC_WM8741 is not set
+# CONFIG_SND_SOC_WM8750 is not set
+CONFIG_SND_SOC_WM8753=m
+# CONFIG_SND_SOC_WM8770 is not set
+# CONFIG_SND_SOC_WM8776 is not set
+# CONFIG_SND_SOC_WM8782 is not set
+# CONFIG_SND_SOC_WM8804_I2C is not set
+# CONFIG_SND_SOC_WM8804_SPI is not set
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+# CONFIG_SND_SOC_WM8960 is not set
+# CONFIG_SND_SOC_WM8962 is not set
+# CONFIG_SND_SOC_WM8974 is not set
+# CONFIG_SND_SOC_WM8978 is not set
+# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_ZX_AUD96P22 is not set
+# CONFIG_SND_SOC_MAX9759 is not set
+# CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
+# CONFIG_SND_SOC_NAU8540 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8822 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
+# CONFIG_SND_SOC_TPA6130A2 is not set
+# end of CODEC drivers
+
+# CONFIG_SND_SIMPLE_CARD is not set
+# CONFIG_SND_AUDIO_GRAPH_CARD is not set
+# CONFIG_SND_XEN_FRONTEND is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+# CONFIG_HID_ACCUTOUCH is not set
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+# CONFIG_HID_APPLEIR is not set
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+# CONFIG_HID_BIGBEN_FF is not set
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+# CONFIG_HID_ELAN is not set
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+# CONFIG_HID_GFRM is not set
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+# CONFIG_HID_GOOGLE_HAMMER is not set
+# CONFIG_HID_GT683R is not set
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+# CONFIG_HID_VIEWSONIC is not set
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+# CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+# CONFIG_HID_NTI is not set
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+# CONFIG_HID_PICOLCD_LCD is not set
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+# CONFIG_HID_STEAM is not set
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+# CONFIG_I2C_HID is not set
+# end of I2C HID support
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_XHCI_HCD=m
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_XHCI_HISTB=m
+# CONFIG_USB_XHCI_MVEBU is not set
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_MXC=m
+CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_USB_EHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
+# CONFIG_USB_MAX3421_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+# CONFIG_USB_UHCI_HCD is not set
+CONFIG_USB_U132_HCD=m
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=15
+CONFIG_USBIP_VHCI_NR_HCS=8
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+CONFIG_USB_MUSB_SUNXI=m
+
+#
+# MUSB DMA mode
+#
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC3_MESON_G12A=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
+CONFIG_USB_DWC3_QCOM=m
+CONFIG_USB_DWC2=m
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+# CONFIG_USB_DWC2_PERIPHERAL is not set
+CONFIG_USB_DWC2_DUAL_ROLE=y
+# CONFIG_USB_DWC2_PCI is not set
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_OF=m
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_SERIAL_F8153X is not set
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+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 is not set
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+# CONFIG_USB_HUB_USB251XB is not set
+CONFIG_USB_HSIC_USB3503=m
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+# CONFIG_USB_ATM is not set
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+CONFIG_USB_MXS_PHY=m
+CONFIG_USB_TEGRA_PHY=m
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FSL_USB2=m
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+CONFIG_USB_NET2280=m
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_AUDIO is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_GADGET_TARGET is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_TYPEC is not set
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=y
+CONFIG_PWRSEQ_EMMC=y
+# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SIMPLE=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=256
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_QCOM_DML=y
+CONFIG_MMC_STM32_SDMMC=y
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+# CONFIG_MMC_SDHCI_OF_AT91 is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
+# CONFIG_MMC_SDHCI_CADENCE is not set
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_TEGRA=m
+# CONFIG_MMC_SDHCI_PXAV3 is not set
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MESON_MX_SDIO is not set
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_MXC=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_PLTFM=m
+# CONFIG_MMC_DW_BLUEFIELD is not set
+# CONFIG_MMC_DW_EXYNOS is not set
+# CONFIG_MMC_DW_HI3798CV200 is not set
+CONFIG_MMC_DW_K3=m
+# CONFIG_MMC_DW_PCI is not set
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+# CONFIG_MMC_USDHI6ROL0 is not set
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_BCM2835=m
+# CONFIG_MMC_MTK is not set
+CONFIG_MMC_SDHCI_XENON=m
+# CONFIG_MMC_SDHCI_OMAP is not set
+CONFIG_MMC_SDHCI_AM654=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_AN30259A is not set
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
+# CONFIG_LEDS_CR0014114 is not set
+# CONFIG_LEDS_LM3530 is not set
+# CONFIG_LEDS_LM3532 is not set
+# CONFIG_LEDS_LM3642 is not set
+# CONFIG_LEDS_LM3692X is not set
+# CONFIG_LEDS_PCA9532 is not set
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+# CONFIG_LEDS_LP3952 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
+# CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
+# CONFIG_LEDS_LP8860 is not set
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+# CONFIG_LEDS_PCA963X is not set
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_LT3593=m
+# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_TLC591XX is not set
+# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
+# CONFIG_LEDS_IS31FL32XX is not set
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+# CONFIG_LEDS_BLINKM is not set
+# CONFIG_LEDS_SYSCON is not set
+# CONFIG_LEDS_MLXREG is not set
+# CONFIG_LEDS_USER is not set
+CONFIG_LEDS_SPI_BYTE=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM3697=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+# CONFIG_INFINIBAND_HNS is not set
+# CONFIG_INFINIBAND_BNXT_RE is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_THUNDERX=m
+CONFIG_EDAC_XGENE=m
+# CONFIG_EDAC_QCOM is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
+# CONFIG_RTC_DRV_ABX80X is not set
+CONFIG_RTC_DRV_DS1307=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_HYM8563 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_RK808=m
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_ISL12022 is not set
+# CONFIG_RTC_DRV_ISL12026 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8523 is not set
+# CONFIG_RTC_DRV_PCF85063 is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+CONFIG_RTC_DRV_BD70528=m
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8010 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+# CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3028 is not set
+# CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD3078 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1302 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1343 is not set
+# CONFIG_RTC_DRV_DS1347 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6916 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_MCP795 is not set
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
+# CONFIG_RTC_DRV_RV3029C2 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1685_FAMILY is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
+CONFIG_RTC_DRV_EFI=y
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+# CONFIG_RTC_DRV_ZYNQMP is not set
+# CONFIG_RTC_DRV_CROS_EC is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_IMXDI=m
+# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_CADENCE=m
+# CONFIG_RTC_DRV_FTRTC010 is not set
+CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_RTC_DRV_TEGRA=y
+CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
+# CONFIG_RTC_DRV_SNVS is not set
+CONFIG_RTC_DRV_IMX_SC=m
+CONFIG_RTC_DRV_XGENE=y
+# CONFIG_RTC_DRV_R7301 is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
+# CONFIG_ALTERA_MSGDMA is not set
+# CONFIG_AMBA_PL08X is not set
+# CONFIG_BCM_SBA_RAID is not set
+CONFIG_DMA_BCM2835=y
+CONFIG_DMA_SUN6I=m
+# CONFIG_DW_AXI_DMAC is not set
+# CONFIG_FSL_EDMA is not set
+CONFIG_FSL_QDMA=m
+CONFIG_IMX_DMA=m
+CONFIG_IMX_SDMA=m
+# CONFIG_INTEL_IDMA64 is not set
+CONFIG_K3_DMA=m
+CONFIG_MV_XOR=y
+CONFIG_MV_XOR_V2=y
+# CONFIG_MXS_DMA is not set
+CONFIG_MX3_IPU=y
+CONFIG_MX3_IPU_IRQS=4
+CONFIG_PL330_DMA=m
+CONFIG_TEGRA20_APB_DMA=y
+CONFIG_TEGRA210_ADMA=y
+CONFIG_XGENE_DMA=m
+# CONFIG_XILINX_DMA is not set
+# CONFIG_XILINX_ZYNQMP_DMA is not set
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# end of DMABUF options
+
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_PANEL is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_PRUSS is not set
+CONFIG_UIO_MF624=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+# CONFIG_VFIO_PLATFORM is not set
+# CONFIG_VFIO_MDEV is not set
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+# CONFIG_XEN_PVCALLS_FRONTEND is not set
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+# end of Xen driver support
+
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+# CONFIG_RTS5208 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7280 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+# CONFIG_ADE7854 is not set
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+# CONFIG_MFD_NVEC is not set
+# CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_STAGING_BOARD is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_FIREWIRE_SERIAL is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+# CONFIG_FB_TFT is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_MOST is not set
+# CONFIG_KS7010 is not set
+# CONFIG_GREYBUS is not set
+CONFIG_BCM_VIDEOCORE=y
+# CONFIG_BCM2835_VCHIQ is not set
+# CONFIG_SND_BCM2835 is not set
+# CONFIG_VIDEO_BCM2835 is not set
+# CONFIG_PI433 is not set
+
+#
+# Gasket devices
+#
+# CONFIG_STAGING_GASKET_FRAMEWORK is not set
+# end of Gasket devices
+
+# CONFIG_XIL_AXIS_FIFO is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set
+# CONFIG_EROFS_FAULT_INJECTION is not set
+CONFIG_EROFS_FS_IO_MAX_RETRIES=5
+# CONFIG_EROFS_FS_ZIP is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+# CONFIG_GOLDFISH is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_RPMSG=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_USBPD_LOGGER=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_VERSATILE=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
+# CONFIG_CLK_HSDK is not set
+# CONFIG_COMMON_CLK_MAX77686 is not set
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_HI655X=m
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SI5341=m
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI514 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_SI570 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+# CONFIG_CLK_QORIQ is not set
+CONFIG_COMMON_CLK_XGENE=y
+# CONFIG_COMMON_CLK_PWM is not set
+# CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_BD718XX is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
+# CONFIG_CLK_BCM2835 is not set
+CONFIG_CLK_RASPBERRYPI=m
+CONFIG_COMMON_CLK_HI3516CV300=y
+CONFIG_COMMON_CLK_HI3519=y
+CONFIG_COMMON_CLK_HI3660=y
+CONFIG_COMMON_CLK_HI3670=y
+CONFIG_COMMON_CLK_HI3798CV200=y
+CONFIG_COMMON_CLK_HI6220=y
+CONFIG_RESET_HISI=y
+CONFIG_STUB_CLK_HI6220=y
+# CONFIG_STUB_CLK_HI3660 is not set
+CONFIG_MXC_CLK=y
+CONFIG_MXC_CLK_SCU=y
+CONFIG_CLK_IMX8MM=y
+CONFIG_CLK_IMX8MQ=y
+CONFIG_CLK_IMX8QXP=y
+CONFIG_COMMON_CLK_MESON_INPUT=y
+CONFIG_COMMON_CLK_MESON_REGMAP=y
+CONFIG_COMMON_CLK_MESON_DUALDIV=y
+CONFIG_COMMON_CLK_MESON_MPLL=y
+CONFIG_COMMON_CLK_MESON_PHASE=m
+CONFIG_COMMON_CLK_MESON_PLL=y
+CONFIG_COMMON_CLK_MESON_SCLK_DIV=m
+CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y
+CONFIG_COMMON_CLK_MESON_AO_CLKC=y
+CONFIG_COMMON_CLK_MESON_EE_CLKC=y
+CONFIG_COMMON_CLK_GXBB=y
+CONFIG_COMMON_CLK_AXG=y
+CONFIG_COMMON_CLK_AXG_AUDIO=m
+CONFIG_COMMON_CLK_G12A=y
+CONFIG_ARMADA_37XX_CLK=y
+CONFIG_ARMADA_AP806_SYSCON=y
+CONFIG_ARMADA_CP110_SYSCON=y
+CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_RPMCC=y
+CONFIG_COMMON_CLK_QCOM=y
+CONFIG_QCOM_A53PLL=y
+CONFIG_QCOM_CLK_APCS_MSM8916=m
+CONFIG_QCOM_CLK_RPM=m
+CONFIG_QCOM_CLK_SMD_RPM=m
+# CONFIG_APQ_GCC_8084 is not set
+# CONFIG_APQ_MMCC_8084 is not set
+# CONFIG_IPQ_GCC_4019 is not set
+# CONFIG_IPQ_GCC_806X is not set
+# CONFIG_IPQ_LCC_806X is not set
+# CONFIG_IPQ_GCC_8074 is not set
+# CONFIG_MSM_GCC_8660 is not set
+CONFIG_MSM_GCC_8916=y
+# CONFIG_MSM_GCC_8960 is not set
+# CONFIG_MSM_LCC_8960 is not set
+# CONFIG_MDM_GCC_9615 is not set
+# CONFIG_MDM_LCC_9615 is not set
+# CONFIG_MSM_MMCC_8960 is not set
+# CONFIG_MSM_GCC_8974 is not set
+# CONFIG_MSM_MMCC_8974 is not set
+# CONFIG_MSM_GCC_8994 is not set
+CONFIG_MSM_GCC_8996=y
+CONFIG_MSM_MMCC_8996=y
+# CONFIG_MSM_GCC_8998 is not set
+# CONFIG_QCS_GCC_404 is not set
+# CONFIG_SDM_CAMCC_845 is not set
+# CONFIG_SDM_GCC_660 is not set
+# CONFIG_QCS_TURING_404 is not set
+CONFIG_SDM_GCC_845=m
+CONFIG_SDM_GPUCC_845=m
+CONFIG_SDM_VIDEOCC_845=m
+CONFIG_SDM_DISPCC_845=m
+CONFIG_SDM_LPASSCC_845=m
+# CONFIG_SPMI_PMIC_CLKDIV is not set
+# CONFIG_QCOM_HFPLL is not set
+# CONFIG_KPSS_XCC is not set
+CONFIG_CLK_SUNXI=y
+CONFIG_CLK_SUNXI_CLOCKS=y
+CONFIG_CLK_SUNXI_PRCM_SUN6I=y
+CONFIG_CLK_SUNXI_PRCM_SUN8I=y
+CONFIG_CLK_SUNXI_PRCM_SUN9I=y
+CONFIG_SUNXI_CCU=y
+CONFIG_SUN50I_A64_CCU=y
+CONFIG_SUN50I_H6_CCU=y
+CONFIG_SUN50I_H6_R_CCU=y
+# CONFIG_SUN8I_A83T_CCU is not set
+CONFIG_SUN8I_H3_CCU=y
+CONFIG_SUN8I_DE2_CCU=y
+CONFIG_SUN8I_R_CCU=y
+CONFIG_CLK_TEGRA_BPMP=y
+CONFIG_TEGRA_CLK_DFLL=y
+# end of Common Clock Framework
+
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_ACPI=y
+CONFIG_TIMER_PROBE=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_ROCKCHIP_TIMER=y
+CONFIG_TEGRA_TIMER=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
+CONFIG_FSL_ERRATUM_A008585=y
+CONFIG_HISILICON_ERRATUM_161010101=y
+CONFIG_ARM64_ERRATUM_858921=y
+CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
+CONFIG_ARM_TIMER_SP804=y
+CONFIG_CLKSRC_VERSATILE=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set
+CONFIG_IMX_MBOX=m
+# CONFIG_PLATFORM_MHU is not set
+# CONFIG_PL320_MBOX is not set
+CONFIG_ARMADA_37XX_RWTM_MBOX=m
+# CONFIG_ROCKCHIP_MBOX is not set
+CONFIG_PCC=y
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_BCM2835_MBOX=y
+# CONFIG_HI3660_MBOX is not set
+CONFIG_HI6220_MBOX=y
+# CONFIG_MAILBOX_TEST is not set
+CONFIG_QCOM_APCS_IPC=m
+CONFIG_TEGRA_HSP_MBOX=y
+CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+CONFIG_IOMMU_IO_PGTABLE=y
+CONFIG_IOMMU_IO_PGTABLE_LPAE=y
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_OF_IOMMU=y
+CONFIG_IOMMU_DMA=y
+# CONFIG_ROCKCHIP_IOMMU is not set
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+CONFIG_ARM_SMMU_V3=y
+CONFIG_QCOM_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+# CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+# CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+CONFIG_MESON_CANVAS=m
+CONFIG_MESON_CLK_MEASURE=y
+CONFIG_MESON_GX_SOCINFO=y
+CONFIG_MESON_GX_PM_DOMAINS=y
+CONFIG_MESON_MX_SOCINFO=y
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+CONFIG_BCM2835_POWER=y
+CONFIG_RASPBERRYPI_POWER=y
+# CONFIG_SOC_BRCMSTB is not set
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+CONFIG_FSL_GUTS=y
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
+# CONFIG_IMX_SCU_SOC is not set
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+CONFIG_QCOM_AOSS_QMP=m
+# CONFIG_QCOM_COMMAND_DB is not set
+CONFIG_QCOM_GENI_SE=m
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_LLCC=m
+CONFIG_QCOM_SDM845_LLCC=m
+CONFIG_QCOM_MDT_LOADER=m
+# CONFIG_QCOM_RMTFS_MEM is not set
+# CONFIG_QCOM_RPMH is not set
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_WCNSS_CTRL=m
+CONFIG_QCOM_APR=m
+# end of Qualcomm SoC drivers
+
+CONFIG_ROCKCHIP_GRF=y
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SUNXI_SRAM=y
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
+# CONFIG_ARCH_TEGRA_186_SOC is not set
+CONFIG_ARCH_TEGRA_194_SOC=y
+CONFIG_SOC_TEGRA_FUSE=y
+CONFIG_SOC_TEGRA_FLOWCTRL=y
+CONFIG_SOC_TEGRA_PMC=y
+CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
+# CONFIG_DEVFREQ_GOV_PASSIVE is not set
+
+#
+# DEVFREQ Drivers
+#
+# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+CONFIG_EXTCON_FSA9480=m
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_QCOM_SPMI_MISC=m
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+CONFIG_EXTCON_USB_GPIO=m
+# CONFIG_EXTCON_USBC_CROS_EC is not set
+CONFIG_MEMORY=y
+# CONFIG_ARM_PL172_MPMC is not set
+CONFIG_TEGRA_MC=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+# CONFIG_IIO_BUFFER_CB is not set
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+# CONFIG_IIO_CONFIGFS is not set
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+CONFIG_HID_SENSOR_ACCEL_3D=m
+# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+CONFIG_IMX7D_ADC=m
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+CONFIG_MESON_SARADC=m
+# CONFIG_NAU7802 is not set
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+# CONFIG_QCOM_SPMI_ADC5 is not set
+# CONFIG_ROCKCHIP_SARADC is not set
+# CONFIG_SD_ADC_MODULATOR is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_VF610_ADC is not set
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# CONFIG_IIO_RESCALE is not set
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# end of Amplifiers
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_PMS7003 is not set
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SPS30 is not set
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+CONFIG_AD5446=m
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+CONFIG_ADF4371=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+CONFIG_HID_SENSOR_GYRO_3D=m
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+CONFIG_DHT11=m
+# CONFIG_HDC100X is not set
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_KMX61 is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+# CONFIG_ADJD_S311 is not set
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
+# CONFIG_BH1750 is not set
+CONFIG_BH1780=m
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8974 is not set
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# CONFIG_IIO_MUX is not set
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
+
+#
+# Digital potentiometers
+#
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+# CONFIG_HP03 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_MAX31856 is not set
+# end of Temperature sensors
+
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_BCM2835=m
+# CONFIG_PWM_CROS_EC is not set
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_HIBVT is not set
+# CONFIG_PWM_IMX1 is not set
+# CONFIG_PWM_IMX27 is not set
+# CONFIG_PWM_IMX_TPM is not set
+CONFIG_PWM_MESON=m
+# CONFIG_PWM_PCA9685 is not set
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SUN4I=m
+CONFIG_PWM_TEGRA=m
+
+#
+# IRQ chip support
+#
+CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
+CONFIG_ARM_GIC_PM=y
+CONFIG_ARM_GIC_MAX_NR=1
+CONFIG_ARM_GIC_V2M=y
+CONFIG_ARM_GIC_V3=y
+CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
+# CONFIG_AL_FIC is not set
+CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_MADERA_IRQ=m
+CONFIG_IMX_GPCV2=y
+CONFIG_MVEBU_GICP=y
+CONFIG_MVEBU_ICU=y
+CONFIG_MVEBU_ODMI=y
+CONFIG_MVEBU_PIC=y
+CONFIG_MVEBU_SEI=y
+CONFIG_PARTITION_PERCPU=y
+CONFIG_QCOM_IRQ_COMBINER=y
+CONFIG_MESON_IRQ_GPIO=y
+# CONFIG_QCOM_PDC is not set
+CONFIG_IMX_IRQSTEER=y
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_IMX7=y
+CONFIG_RESET_MESON=y
+# CONFIG_RESET_MESON_AUDIO_ARB is not set
+# CONFIG_RESET_QCOM_AOSS is not set
+# CONFIG_RESET_QCOM_PDC is not set
+CONFIG_RESET_SIMPLE=y
+CONFIG_RESET_SUNXI=y
+# CONFIG_RESET_TI_SYSCON is not set
+CONFIG_COMMON_RESET_HI3660=y
+CONFIG_COMMON_RESET_HI6220=y
+CONFIG_RESET_TEGRA_BPMP=y
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PHY_MIPI_DPHY=y
+CONFIG_PHY_XGENE=m
+CONFIG_PHY_SUN4I_USB=m
+# CONFIG_PHY_SUN6I_MIPI_DPHY is not set
+# CONFIG_PHY_SUN9I_USB is not set
+CONFIG_PHY_MESON8B_USB2=m
+CONFIG_PHY_MESON_GXL_USB2=y
+CONFIG_PHY_MESON_GXL_USB3=y
+CONFIG_PHY_MESON_G12A_USB2=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+# CONFIG_BCM_KONA_USB2_PHY is not set
+# CONFIG_PHY_CADENCE_DP is not set
+# CONFIG_PHY_CADENCE_DPHY is not set
+# CONFIG_PHY_CADENCE_SIERRA is not set
+CONFIG_PHY_FSL_IMX8MQ_USB=m
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
+CONFIG_PHY_HI6220_USB=m
+CONFIG_PHY_HI3660_USB=m
+# CONFIG_PHY_HISTB_COMBPHY is not set
+# CONFIG_PHY_HISI_INNO_USB2 is not set
+CONFIG_PHY_MVEBU_A3700_COMPHY=m
+CONFIG_PHY_MVEBU_A3700_UTMI=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
+CONFIG_PHY_MVEBU_CP110_COMPHY=m
+# CONFIG_PHY_PXA_28NM_HSIC is not set
+# CONFIG_PHY_PXA_28NM_USB2 is not set
+# CONFIG_PHY_CPCAP_USB is not set
+# CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_OCELOT_SERDES is not set
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_PHY_QCOM_PCIE2=m
+CONFIG_PHY_QCOM_QMP=m
+CONFIG_PHY_QCOM_QUSB2=m
+CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_QCOM_UFS_14NM=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+# CONFIG_PHY_ROCKCHIP_DP is not set
+CONFIG_PHY_ROCKCHIP_EMMC=m
+# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+# CONFIG_PHY_ROCKCHIP_TYPEC is not set
+# CONFIG_PHY_ROCKCHIP_USB is not set
+# CONFIG_PHY_SAMSUNG_USB2 is not set
+CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# CONFIG_ARM_CCI_PMU is not set
+# CONFIG_ARM_CCN is not set
+CONFIG_ARM_PMU=y
+CONFIG_ARM_PMU_ACPI=y
+CONFIG_ARM_SMMU_V3_PMU=m
+# CONFIG_ARM_DSU_PMU is not set
+CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_HISI_PMU is not set
+# CONFIG_QCOM_L2_PMU is not set
+# CONFIG_QCOM_L3_PMU is not set
+CONFIG_THUNDERX2_PMU=m
+# CONFIG_XGENE_PMU is not set
+# CONFIG_ARM_SPE_PMU is not set
+# end of Performance monitor support
+
+CONFIG_RAS=y
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=y
+CONFIG_ND_BLK=y
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=y
+CONFIG_BTT=y
+CONFIG_OF_PMEM=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_NVMEM_IMX_IIM=m
+CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
+CONFIG_QCOM_QFPROM=m
+# CONFIG_ROCKCHIP_EFUSE is not set
+CONFIG_NVMEM_SUNXI_SID=m
+# CONFIG_MESON_EFUSE is not set
+# CONFIG_MESON_MX_EFUSE is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+# CONFIG_FPGA is not set
+# CONFIG_FSI is not set
+CONFIG_TEE=m
+
+#
+# TEE drivers
+#
+CONFIG_OPTEE=m
+CONFIG_OPTEE_SHM_NUM_PRIV_PAGES=1
+# end of TEE drivers
+
+CONFIG_MULTIPLEXER=m
+
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_ADG792A=m
+CONFIG_MUX_ADGS1408=m
+CONFIG_MUX_GPIO=m
+CONFIG_MUX_MMIO=m
+# end of Multiplexer drivers
+
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+# CONFIG_COUNTER is not set
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_UTF8=y
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=m
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+CONFIG_JFFS2_CMODE_PRIORITY=y
+# CONFIG_JFFS2_CMODE_SIZE is not set
+# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+# CONFIG_UBIFS_ATIME_SUPPORT is not set
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+# CONFIG_CRAMFS is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+# CONFIG_ROMFS_BACKED_BY_BLOCK is not set
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+CONFIG_ROMFS_BACKED_BY_BOTH=y
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_ROMFS_ON_MTD=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+# CONFIG_UNICODE is not set
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_KEYS_REQUEST_CACHE=y
+# CONFIG_PERSISTENT_KEYRINGS is not set
+# CONFIG_BIG_KEYS is not set
+# CONFIG_ENCRYPTED_KEYS is not set
+# CONFIG_KEY_DH_OPERATIONS is not set
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_LSM_MMAP_MIN_ADDR=32768
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+# CONFIG_FORTIFY_SOURCE is not set
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+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_SECURITY_SAFESETID is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_IMA is not set
+# CONFIG_EVM is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=m
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128L=m
+CONFIG_CRYPTO_AEGIS256=m
+CONFIG_CRYPTO_MORUS640=m
+CONFIG_CRYPTO_MORUS1280=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+# CONFIG_CRYPTO_KEYWRAP is not set
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA3=m
+# CONFIG_CRYPTO_SM3 is not set
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+# CONFIG_CRYPTO_AES_TI is not set
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+# CONFIG_CRYPTO_842 is not set
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_HMAC=y
+# CONFIG_CRYPTO_DRBG_HASH is not set
+# CONFIG_CRYPTO_DRBG_CTR is not set
+CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_JITTERENTROPY=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
+# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
+CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+# CONFIG_CRYPTO_DEV_CCP is not set
+# CONFIG_CRYPTO_DEV_MXS_DCP is not set
+CONFIG_CRYPTO_DEV_CPT=m
+CONFIG_CAVIUM_CPT=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
+CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
+# CONFIG_CRYPTO_DEV_ROCKCHIP is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+# CONFIG_CRYPTO_DEV_CCREE is not set
+CONFIG_CRYPTO_DEV_HISI_SEC=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_STMP_DEVICE=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+# CONFIG_INDIRECT_PIO is not set
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
+CONFIG_AUDIT_COMPAT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_XZ_DEC=y
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
+CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
+CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
+CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
+CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y
+CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
+CONFIG_DMA_REMAP=y
+CONFIG_DMA_DIRECT_REMAP=y
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=64
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_LIBFDT=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_COMPAT_VDSO=y
+CONFIG_CROSS_COMPILE_COMPAT_VDSO=""
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_SPLIT=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_SBITMAP=y
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
+# CONFIG_PAGE_POISONING_ZERO 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
+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=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+# CONFIG_KASAN is not set
+CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_HAVE_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+# CONFIG_FUNCTION_PROFILER is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+CONFIG_RUNTIME_TESTING_MENU=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 is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_STRSCPY=m
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BITFIELD is not set
+# CONFIG_TEST_UUID is not set
+CONFIG_TEST_XARRAY=m
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_LKM is not set
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+# CONFIG_FIND_BIT_BENCHMARK is not set
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+# CONFIG_MEMTEST is not set
+CONFIG_BUG_ON_DATA_CORRUPTION=y
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_ARM64_PTDUMP_DEBUGFS is not set
+# CONFIG_PID_IN_CONTEXTIDR is not set
+# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
+# CONFIG_DEBUG_WX is not set
+# CONFIG_DEBUG_ALIGN_RODATA is not set
+# CONFIG_DEBUG_EFI is not set
+# CONFIG_ARM64_RELOC_TEST is not set
+# CONFIG_CORESIGHT is not set
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/5.3-i686.conf b/gnu/packages/aux-files/linux-libre/5.3-i686.conf
new file mode 100644
index 0000000000..47f1538026
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/5.3-i686.conf
@@ -0,0 +1,10271 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 5.3.1-gnu Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 7.4.0
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70400
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+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
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+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
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+CONFIG_FORCE_DYNAMIC_FTRACE=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=3
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
+# CONFIG_X86_CPU_RESCTRL is not set
+# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_GOLDFISH is not set
+CONFIG_X86_INTEL_MID=y
+# CONFIG_X86_INTEL_QUARK is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+CONFIG_IOSF_MBI_DEBUG=y
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_32_NON_STANDARD is not set
+CONFIG_X86_32_IRIS=m
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_KVM_GUEST=y
+CONFIG_PVH=y
+CONFIG_KVM_DEBUG_FS=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=6
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_CYRIX_32=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_CPU_SUP_UMC_32=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_APB_TIMER=y
+CONFIG_DMI=y
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=8
+CONFIG_NR_CPUS_DEFAULT=8
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=y
+CONFIG_PERF_EVENTS_INTEL_CSTATE=y
+CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
+# CONFIG_X86_LEGACY_VM86 is not set
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX32=y
+# CONFIG_TOSHIBA is not set
+CONFIG_I8K=m
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+# CONFIG_X86_CPA_STATISTICS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_HIGHPTE=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_UMIP=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+# end of Processor type and features
+
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_CLK=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_EINJ=m
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_DPTF_POWER=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_SFI=y
+CONFIG_X86_APM_BOOT=y
+CONFIG_APM=m
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+# CONFIG_APM_DO_ENABLE is not set
+# CONFIG_APM_CPU_IDLE is not set
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_ALLOW_INTS is not set
+
+#
+# CPU Frequency scaling
+#
+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_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_SFI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=y
+CONFIG_X86_SPEEDSTEP_SMI=y
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=y
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+# CONFIG_X86_E_POWERSAVER is not set
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=y
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+CONFIG_SCx200=m
+CONFIG_SCx200HR_TIMER=m
+CONFIG_ALIX=y
+CONFIG_NET5501=y
+CONFIG_GEOS=y
+CONFIG_AMD_NB=y
+# CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_COMPAT_32=y
+# end of Binary Emulations
+
+CONFIG_HAVE_ATOMIC_IOMAP=y
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=y
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=y
+CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
+# CONFIG_EFI_TEST is not set
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+# CONFIG_KVM_MMU_AUDIT is not set
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_ISA_BUS_API=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
+CONFIG_REFCOUNT_FULL=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SIG is not set
+# 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
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_CMDLINE_PARSER=y
+CONFIG_BLK_WBT=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+# CONFIG_BLK_SED_OPAL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_SYSV68_PARTITION=y
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+# CONFIG_BFQ_GROUP_IOSCHED is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+CONFIG_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_FRAME_VECTOR=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+CONFIG_GUP_GET_PTE_LOW_HIGH=y
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+# CONFIG_TLS_DEVICE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_SMC is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+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
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+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
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+# end of DECnet: Netfilter Configuration
+
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+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_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_LTPC=m
+CONFIG_COPS=m
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+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
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_DEBUGFS=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_NET_NCSI=y
+# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_SCC=m
+# CONFIG_SCC_DELAY is not set
+# CONFIG_SCC_TRXECHO is not set
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_PCH_CAN=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_TSCAN1=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_LEDS is not set
+# CONFIG_BT_SELFTEST is not set
+CONFIG_BT_DEBUGFS=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_DEBUGFS=y
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_MESSAGE_TRACING=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+CONFIG_EISA=y
+CONFIG_EISA_VLB_PRIMING=y
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+CONFIG_EISA_NAMES=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
+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
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_BW is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_LABEL=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_COMPAQ=m
+CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
+CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+# CONFIG_RAPIDIO_DEBUG is not set
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# Partition parsers
+#
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_SCx200_DOCFLASH=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_M25P80=m
+CONFIG_MTD_MCHP23K256=m
+CONFIG_MTD_SST25L=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_MTK_QUADSPI=m
+CONFIG_SPI_INTEL_SPI=m
+CONFIG_SPI_INTEL_SPI_PCI=m
+CONFIG_SPI_INTEL_SPI_PLATFORM=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+CONFIG_PNPBIOS=y
+CONFIG_PNPBIOS_PROC_FS=y
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_BPCK6=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+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_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+# CONFIG_NVME_MULTIPATH is not set
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_INTEL_MID_PTI=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+# CONFIG_CS5535_MFGPT is not set
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_PCH_PHUB=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_PVPANIC=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MEI_HDCP is not set
+CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC & related support
+#
+
+#
+# Intel MIC Bus Driver
+#
+
+#
+# SCIF Bus Driver
+#
+
+#
+# VOP Bus Driver
+#
+CONFIG_VOP_BUS=m
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
+# SCIF Driver
+#
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
+# VOP Driver
+#
+CONFIG_VOP=m
+CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
+CONFIG_ECHO=m
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+# end of Misc devices
+
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AHA1740=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=5000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+CONFIG_SCSI_FDOMAIN_ISA=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+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
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_NSP32=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_QDI=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_WINBOND_VLB=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+# CONFIG_DM_INIT is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+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
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_ISA=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+# CONFIG_CAIF_SPI_SYNC is not set
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL3=m
+CONFIG_3C515=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_LANCE=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+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
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+CONFIG_CS89x0_PLATFORM=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLXSW_CORE=m
+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_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2000=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_ULTRA=m
+CONFIG_WD80x3=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+# CONFIG_WIZNET_W5100_SPI is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_SFP=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_FIXED_PHY=y
+CONFIG_ICPLUS_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PLIP=m
+CONFIG_PPP=y
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=y
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+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
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_STATION_STATISTICS=y
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC_DEBUGFS=y
+CONFIG_ATH9K_HWRNG=y
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_SPECTRAL is not set
+CONFIG_ATH10K_TRACING=y
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_SDIO is not set
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+# CONFIG_RTW88 is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
+CONFIG_WAN=y
+CONFIG_HOSTESS_SV11=m
+CONFIG_COSA=m
+CONFIG_LANMEDIA=m
+CONFIG_SEALEVEL_4021=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_N2=m
+CONFIG_C101=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+CONFIG_DSCC4_PCI_RST=y
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_SDLA=m
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_AT86RF230_DEBUGFS=y
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+CONFIG_IEEE802154_MCR20A=m
+# CONFIG_IEEE802154_HWSIM is not set
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_THUNDERBOLT_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=y
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=m
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_HDLC=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_NVM=y
+CONFIG_NVM_PBLK=m
+# CONFIG_NVM_PBLK_DEBUG is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5520=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+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
+CONFIG_KEYBOARD_MTK_PMIC=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+# CONFIG_MOUSE_INPORT is not set
+CONFIG_MOUSE_LOGIBM=m
+CONFIG_MOUSE_PC110PAD=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_88PM860X=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_HTCPEN=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM831X=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
+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_TOUCHSCREEN_IQS5XX=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_88PM860X_ONKEY=m
+CONFIG_INPUT_88PM80X_ONKEY=m
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_MSM_VIBRATOR=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MAX8925_ONKEY=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
+CONFIG_INPUT_WM831X_ON=m
+CONFIG_INPUT_PCAP=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_RAVE_SP_PWRBUTTON=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=0
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+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_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=48
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_FOURPORT=m
+CONFIG_SERIAL_8250_ACCENT=m
+CONFIG_SERIAL_8250_BOCA=m
+CONFIG_SERIAL_8250_EXAR_ST16C554=m
+CONFIG_SERIAL_8250_HUB6=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_8250_MOXA=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_KGDB_NMI=y
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_MEN_Z135=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_TTY_PRINTK=y
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_IPMB_DEVICE_INTERFACE=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_DTLK=m
+CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+CONFIG_MWAVE=m
+CONFIG_SCx200_GPIO=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+# end of Character devices
+
+# CONFIG_RANDOM_TRUST_CPU is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_CHT_WC=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_EG20T=m
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_PCA_ISA=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_SCx200_ACB=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MID_DMA=y
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_NXP_FLEXSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_TOPCLIFF_PCH=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_ZYNQMP_GQSPI=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPMI=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+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
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_MERRIFIELD=m
+CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_MADERA=m
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_LYNXPOINT=y
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_XILINX=m
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_CRYSTAL_COVE=m
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_MSIC=y
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_RC5T583=y
+CONFIG_GPIO_TIMBERDALE=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_UCB1400=m
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_WM831X=m
+CONFIG_GPIO_WM8350=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+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_PCIE_IDIO_24=m
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+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
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_AVS=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_MAX8925_POWER=m
+CONFIG_WM831X_BACKUP=m
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_88PM860X=m
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_DA9030=m
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_CHARGER_88PM860X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_LP8788=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_MAX14577=m
+CONFIG_CHARGER_MAX77693=m
+CONFIG_CHARGER_MAX8997=m
+CONFIG_CHARGER_MAX8998=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_TPS65090=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_WILCO=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR38064=m
+CONFIG_SENSORS_IRPS5401=m
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+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
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_XGENE=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9055_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+CONFIG_MENZ069_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_RAVE_SP_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_INTEL_SCU_WATCHDOG=y
+CONFIG_INTEL_MID_WATCHDOG=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_SBC7240_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# ISA-based Watchdog Cards
+#
+CONFIG_PCWATCHDOG=m
+CONFIG_MIXCOMWD=m
+CONFIG_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_AS3711=y
+CONFIG_PMIC_ADP5520=y
+CONFIG_MFD_AAT2870_CORE=y
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_CHARDEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+CONFIG_PMIC_DA903X=y
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=y
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_HTC_I2CPLD=y
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=y
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_MSIC=y
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_88PM800=m
+CONFIG_MFD_88PM805=m
+CONFIG_MFD_88PM860X=y
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
+CONFIG_MFD_MAX77843=y
+CONFIG_MFD_MAX8907=m
+CONFIG_MFD_MAX8925=y
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX8998=y
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT5033=m
+CONFIG_MFD_RC5T583=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SMSC=y
+CONFIG_ABX500_CORE=y
+CONFIG_AB3100_CORE=y
+CONFIG_AB3100_OTP=m
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
+CONFIG_MFD_PALMAS=y
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+CONFIG_MFD_TPS65090=y
+# CONFIG_MFD_TPS68470 is not set
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_TPS80031=y
+CONFIG_TWL4030_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TIMBERDALE=m
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+CONFIG_MFD_WM8998=y
+CONFIG_MFD_WM8400=y
+CONFIG_MFD_WM831X=y
+CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM831X_SPI=y
+CONFIG_MFD_WM8350=y
+CONFIG_MFD_WM8350_I2C=y
+CONFIG_MFD_WM8994=m
+CONFIG_RAVE_SP_CORE=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_AB3100=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP8788=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_S2MPA01=m
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS80031=m
+CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_SIR=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_MEDIA_CEC_RC is not set
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+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
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=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_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_COBALT=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+CONFIG_VIDEO_ASPEED=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_V4L_TEST_DRIVERS=y
+# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CROS_EC_CEC=m
+CONFIG_VIDEO_SECO_CEC=m
+# CONFIG_VIDEO_SECO_RC is not set
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
+
+CONFIG_V4L_RADIO_ISA_DRIVERS=y
+CONFIG_RADIO_ISA=m
+CONFIG_RADIO_CADET=m
+CONFIG_RADIO_RTRACK=m
+CONFIG_RADIO_RTRACK2=m
+CONFIG_RADIO_AZTECH=m
+CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MIROPCM20=m
+CONFIG_RADIO_SF16FMI=m
+CONFIG_RADIO_SF16FMR2=m
+CONFIG_RADIO_TERRATEC=m
+CONFIG_RADIO_TRUST=m
+CONFIG_RADIO_TYPHOON=m
+CONFIG_RADIO_ZOLTRIX=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+CONFIG_SMS_SIANO_DEBUGFS=y
+CONFIG_VIDEO_V4L2_TPG=m
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AD9389B=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_SMIAPP_PLL=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5K6AA=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_S5K4ECGX=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_SMIAPP=m
+CONFIG_VIDEO_ET8EK8=m
+CONFIG_VIDEO_S5C73M3=m
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9807_VCM=m
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_ST_MIPID02=m
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+CONFIG_VIDEO_GS1662=m
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+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
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+CONFIG_DVB_MN88443X=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=y
+CONFIG_AGP_NVIDIA=y
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=y
+CONFIG_AGP_EFFICEON=m
+CONFIG_INTEL_GTT=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_SI is not set
+# CONFIG_DRM_AMDGPU_CIK is not set
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN1_0=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
+
+CONFIG_DRM_NOUVEAU=m
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_MEDFIELD=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_TINYDRM is not set
+CONFIG_DRM_XEN=y
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_ASILIANT=y
+CONFIG_FB_IMSTT=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+# CONFIG_FB_NVIDIA is not set
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_I810=m
+# CONFIG_FB_I810_GTF is not set
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+# CONFIG_FB_SAVAGE_ACCEL is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+# CONFIG_FB_3DFX_I2C is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+CONFIG_FB_SM501=m
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_MAX8925=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_PM8941_WLED=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
+CONFIG_BACKLIGHT_ADP5520=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_88PM860X=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_AAT2870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_LP8788=m
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_AS3711=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+CONFIG_BACKLIGHT_RAVE_SP=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_MDA_CONSOLE=m
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL4_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_OPL4_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_WSS_LIB=m
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB8_DSP=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_ISA=y
+CONFIG_SND_ADLIB=m
+CONFIG_SND_AD1816A=m
+CONFIG_SND_AD1848=m
+CONFIG_SND_ALS100=m
+CONFIG_SND_AZT1605=m
+CONFIG_SND_AZT2316=m
+CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
+CONFIG_SND_CMI8330=m
+CONFIG_SND_CS4231=m
+CONFIG_SND_CS4236=m
+CONFIG_SND_ES1688=m
+CONFIG_SND_ES18XX=m
+CONFIG_SND_SC6000=m
+CONFIG_SND_GUSCLASSIC=m
+CONFIG_SND_GUSEXTREME=m
+CONFIG_SND_GUSMAX=m
+CONFIG_SND_INTERWAVE=m
+CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_JAZZ16=m
+CONFIG_SND_OPL3SA2=m
+CONFIG_SND_OPTI92X_AD1848=m
+CONFIG_SND_OPTI92X_CS4231=m
+CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SBAWE_SEQ=m
+CONFIG_SND_SB16_CSP=y
+CONFIG_SND_SSCAPE=m
+CONFIG_SND_WAVEFRONT=m
+CONFIG_SND_MSND_PINNACLE=m
+CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SIS7019=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SST_IPC=m
+CONFIG_SND_SST_IPC_PCI=m
+CONFIG_SND_SST_IPC_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
+CONFIG_SND_SOC_INTEL_HASWELL=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_HASWELL_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
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_ZX_TDM=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=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_HDAC_HDA=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+# CONFIG_SND_SOC_RK3328 is not set
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_XEN_FRONTEND=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+# end of I2C HID support
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+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
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+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
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+# CONFIG_USB_M66592 is not set
+CONFIG_USB_BDC_UDC=m
+
+#
+# Platform Support
+#
+CONFIG_USB_BDC_PCI=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+CONFIG_USB_ZERO=m
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_TYPEC_TPS6598X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_PI3USB30532=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+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
+#
+CONFIG_LEDS_88PM860X=m
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_MT6323=m
+CONFIG_LEDS_NET48XX=m
+CONFIG_LEDS_WRAP=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8788=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_DA903X=m
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_ADP5520=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX8997=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+# CONFIG_LEDS_MLXCPLD is not set
+# CONFIG_LEDS_MLXREG is not set
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM36274=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+# CONFIG_EDAC_LEGACY_SYSFS is not set
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_R82600=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_88PM860X=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_LP8788=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX8907=m
+CONFIG_RTC_DRV_MAX8925=m
+CONFIG_RTC_DRV_MAX8998=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BD70528=m
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_RTC_DRV_TPS6586X=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
+CONFIG_RTC_DRV_RC5T583=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RX6110=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_VRTC=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB3100=m
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_WILCO_EC=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_PCH_DMA=m
+CONFIG_TIMB_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_HSU_DMA=m
+CONFIG_HSU_DMA_PCI=m
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# end of DMABUF options
+
+CONFIG_AUXDISPLAY=y
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_CHARLCD=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_VFIO_MDEV=m
+CONFIG_VFIO_MDEV_DEVICE=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=4
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=y
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+# end of Xen driver support
+
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SSV_DNP=m
+CONFIG_COMEDI_ISA_DRIVERS=y
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAC02=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_ISADMA=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+CONFIG_AD7192=m
+CONFIG_AD7280=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_STAGING_MEDIA=y
+CONFIG_I2C_BCM2048=m
+# CONFIG_VIDEO_IPU3_IMGU is not set
+
+#
+# soc_camera sensor drivers
+#
+
+#
+# Android
+#
+# end of Android
+
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+CONFIG_GS_FPGABOOT=m
+# CONFIG_UNISYSSPAR is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+CONFIG_WILC1000_SPI=m
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_MOST=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_NET=m
+CONFIG_MOST_SOUND=m
+CONFIG_MOST_VIDEO=m
+CONFIG_MOST_I2C=m
+CONFIG_MOST_USB=m
+CONFIG_KS7010=m
+# CONFIG_GREYBUS is not set
+# CONFIG_PI433 is not set
+
+#
+# Gasket devices
+#
+# end of Gasket devices
+
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set
+# CONFIG_EROFS_FAULT_INJECTION is not set
+CONFIG_EROFS_FS_IO_MAX_RETRIES=5
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_FIELDBUS_DEV=m
+# CONFIG_KPC2000 is not set
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_LED=m
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_RBU=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+# CONFIG_GPD_POCKET_FAN is not set
+CONFIG_TC1100_WMI=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WIRELESS=m
+CONFIG_HP_WMI=m
+CONFIG_LG_LAPTOP=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SURFACE3_WMI=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_XIAOMI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_PEAQ_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_CHT_INT33FE=m
+CONFIG_INTEL_INT0002_VGPIO=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_SCU_IPC=y
+CONFIG_INTEL_SCU_IPC_UTIL=m
+CONFIG_INTEL_MID_POWER_BUTTON=m
+CONFIG_INTEL_MFLD_THERMAL=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_IBM_RTL=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_PMC_IPC=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_INTEL_PUNIT_IPC=m
+# CONFIG_MLX_PLATFORM is not set
+# CONFIG_TOUCHSCREEN_DMI is not set
+CONFIG_INTEL_CHTDC_TI_PWRBTN=m
+CONFIG_I2C_MULTI_INSTANTIATE=m
+CONFIG_INTEL_ATOMISP2_PM=m
+# CONFIG_HUAWEI_WMI is not set
+CONFIG_PCENGINES_APU2=m
+CONFIG_PMC_ATOM=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_DEBUGFS is not set
+CONFIG_WILCO_EC_EVENTS=m
+CONFIG_WILCO_EC_TELEMETRY=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_WM831X=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_SI5341=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_COMMON_CLK_PWM=m
+# end of Common Clock Framework
+
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+CONFIG_DW_APB_TIMER=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_HYPERV_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+# CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+# CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_ARIZONA=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA180=m
+CONFIG_BMA220=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_LP8788_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2497=m
+CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=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
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+# end of Amplifiers
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SPS30=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+CONFIG_AD5755=m
+CONFIG_AD5758=m
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DS4424=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+CONFIG_ADF4371=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_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
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+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
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6070=m
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_T5403=m
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+CONFIG_AS3935=m
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_RFD77402=m
+CONFIG_SRF04=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+CONFIG_NTB_MSI=y
+CONFIG_NTB_IDT=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_MSI_TEST=m
+CONFIG_NTB_TRANSPORT=m
+CONFIG_VME_BUS=y
+
+#
+# VME Bridge Drivers
+#
+CONFIG_VME_CA91CX42=m
+CONFIG_VME_TSI148=m
+# CONFIG_VME_FAKE is not set
+
+#
+# VME Board Drivers
+#
+CONFIG_VMIVME_7805=m
+
+#
+# VME Device Drivers
+#
+CONFIG_VME_USER=m
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_CRC=y
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+
+#
+# IRQ chip support
+#
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_TI_SYSCON=m
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+# CONFIG_IDLE_INJECT is not set
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_THUNDERBOLT=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_NVDIMM_KEYS=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_RAVE_SP_EEPROM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_PM_OPP=y
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+CONFIG_COUNTER=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=y
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+CONFIG_UBIFS_ATIME_SUPPORT=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+# CONFIG_UNICODE is not set
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
+CONFIG_TRUSTED_KEYS=y
+CONFIG_ENCRYPTED_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_WRITABLE_HOOKS=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_SECURITY_SMACK=y
+# CONFIG_SECURITY_SMACK_BRINGUP is not set
+CONFIG_SECURITY_SMACK_NETFILTER=y
+# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+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_SECURITY_SAFESETID is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+# CONFIG_IMA_TEMPLATE is not set
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+CONFIG_IMA_DEFAULT_HASH_SHA1=y
+# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
+CONFIG_IMA_DEFAULT_HASH="sha1"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+CONFIG_IMA_TRUSTED_KEYRING=y
+CONFIG_IMA_BLACKLIST_KEYRING=y
+# CONFIG_IMA_LOAD_X509 is not set
+CONFIG_EVM=y
+CONFIG_EVM_ATTR_FSUUID=y
+CONFIG_EVM_EXTRA_SMACK_XATTRS=y
+# CONFIG_EVM_ADD_XATTRS is not set
+# CONFIG_EVM_LOAD_X509 is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128L=m
+CONFIG_CRYPTO_AEGIS256=m
+CONFIG_CRYPTO_MORUS640=m
+CONFIG_CRYPTO_MORUS1280=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_ADIANTUM=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_TGR192=m
+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
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=y
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+# CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_CMA is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_GENERIC_VDSO_32=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+CONFIG_PAGE_EXTENSION=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER 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
+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
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# 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
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+# CONFIG_UPROBE_EVENTS is not set
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+CONFIG_RUNTIME_TESTING_MENU=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 is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+CONFIG_INTERVAL_TREE_TEST=m
+CONFIG_PERCPU_TEST=m
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+CONFIG_TEST_STRING_HELPERS=m
+CONFIG_TEST_STRSCPY=m
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_BITFIELD=m
+CONFIG_TEST_UUID=m
+CONFIG_TEST_XARRAY=m
+CONFIG_TEST_OVERFLOW=m
+CONFIG_TEST_RHASHTABLE=m
+CONFIG_TEST_HASH=m
+CONFIG_TEST_IDA=m
+CONFIG_TEST_PARMAN=m
+CONFIG_TEST_LKM=m
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+CONFIG_FIND_BIT_BENCHMARK=m
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+CONFIG_TEST_UDELAY=m
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+CONFIG_TEST_OBJAGG=m
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+CONFIG_MEMTEST=y
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_LOW_LEVEL_TRAP=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_EARLY_PRINTK_USB=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_WX is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+# CONFIG_IO_DELAY_0X80 is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+CONFIG_PUNIT_ATOM_DEBUG=m
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/gnu/packages/aux-files/linux-libre/5.3-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.3-x86_64.conf
new file mode 100644
index 0000000000..d15a0d1ded
--- /dev/null
+++ b/gnu/packages/aux-files/linux-libre/5.3-x86_64.conf
@@ -0,0 +1,10227 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 5.3.1-gnu Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 7.4.0
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70400
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+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
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+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
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+# CONFIG_ZONE_DMA is not set
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
+# CONFIG_X86_CPU_RESCTRL is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+CONFIG_X86_NUMACHIP=y
+# CONFIG_X86_VSMP is not set
+# CONFIG_X86_UV is not set
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_MID is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+CONFIG_IOSF_MBI_DEBUG=y
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_KVM_GUEST=y
+CONFIG_PVH=y
+CONFIG_KVM_DEBUG_FS=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_JAILHOUSE_GUEST=y
+# CONFIG_ACRN_GUEST is not set
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS_RANGE_BEGIN=2
+CONFIG_NR_CPUS_RANGE_END=512
+CONFIG_NR_CPUS_DEFAULT=64
+CONFIG_NR_CPUS=256
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCELOG_LEGACY is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=y
+CONFIG_PERF_EVENTS_INTEL_CSTATE=y
+CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_X86_5LEVEL is not set
+CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_X86_CPA_STATISTICS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+# CONFIG_AMD_MEM_ENCRYPT is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_UMIP=y
+CONFIG_X86_INTEL_MPX=y
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
+CONFIG_KEXEC_VERIFY_SIG=y
+CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_DYNAMIC_MEMORY_LAYOUT=y
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
+# end of Processor type and features
+
+CONFIG_ARCH_HAS_ADD_PAGES=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_CLK=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_LPIT=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_DPTF_POWER=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_ADXL=y
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_X86_PM_TIMER=y
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+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_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_MMCONF_FAM10H=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_IA32_EMULATION=y
+CONFIG_X86_X32=y
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=y
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_AMD_SEV=y
+# CONFIG_KVM_MMU_AUDIT is not set
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_ISA_BUS_API=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
+CONFIG_REFCOUNT_FULL=y
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_HAVE_GCC_PLUGINS=y
+CONFIG_GCC_PLUGINS=y
+
+#
+# GCC plugins
+#
+# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
+# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
+# end of GCC plugins
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SIG is not set
+# 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
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_CMDLINE_PARSER=y
+CONFIG_BLK_WBT=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+# CONFIG_BLK_SED_OPAL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_SYSV68_PARTITION=y
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+# CONFIG_BFQ_GROUP_IOSCHED is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+CONFIG_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+# CONFIG_HMM_MIRROR is not set
+# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+# CONFIG_TLS_DEVICE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_SMC is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+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
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+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
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+# end of DECnet: Netfilter Configuration
+
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+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_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ_COMMON=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_KSZ9477=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+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
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_DEBUGFS=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_NET_NCSI=y
+# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+# CONFIG_BPF_JIT is not set
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_NET_DROP_MONITOR is not set
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+# CONFIG_BT_LEDS is not set
+# CONFIG_BT_SELFTEST is not set
+CONFIG_BT_DEBUGFS=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_DEBUGFS=y
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_MESSAGE_TRACING=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=y
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
+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
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_BW is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
+
+# CONFIG_VMD is not set
+
+#
+# DesignWare PCI Core Support
+#
+# CONFIG_PCIE_DW_PLAT_HOST is not set
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+# CONFIG_RAPIDIO_DEBUG is not set
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# Partition parsers
+#
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_M25P80=m
+CONFIG_MTD_MCHP23K256=m
+CONFIG_MTD_SST25L=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# end of Self-contained MTD device drivers
+
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_MTK_QUADSPI=m
+CONFIG_SPI_INTEL_SPI=m
+CONFIG_SPI_INTEL_SPI_PCI=m
+CONFIG_SPI_INTEL_SPI_PLATFORM=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SKD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+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_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+# CONFIG_NVME_MULTIPATH is not set
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_PVPANIC=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+# CONFIG_INTEL_MEI is not set
+# CONFIG_INTEL_MEI_ME is not set
+# CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MEI_HDCP is not set
+CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC & related support
+#
+
+#
+# Intel MIC Bus Driver
+#
+CONFIG_INTEL_MIC_BUS=m
+
+#
+# SCIF Bus Driver
+#
+CONFIG_SCIF_BUS=m
+
+#
+# VOP Bus Driver
+#
+CONFIG_VOP_BUS=m
+
+#
+# Intel MIC Host Driver
+#
+CONFIG_INTEL_MIC_HOST=m
+
+#
+# Intel MIC Card Driver
+#
+CONFIG_INTEL_MIC_CARD=m
+
+#
+# SCIF Driver
+#
+CONFIG_SCIF=m
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+CONFIG_MIC_COSM=m
+
+#
+# VOP Driver
+#
+CONFIG_VOP=m
+CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+CONFIG_ECHO=m
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+# end of Misc devices
+
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=5000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+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
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_DUST=m
+# CONFIG_DM_INIT is not set
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+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
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+# CONFIG_CAIF_SPI_SYNC is not set
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+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
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_SYSTEMPORT is not set
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+# CONFIG_MLX5_FPGA is not set
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_CORE_EN_DCB=y
+# CONFIG_MLX5_CORE_IPOIB is not set
+CONFIG_MLXSW_CORE=m
+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_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+# CONFIG_STMMAC_PCI is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+# CONFIG_WIZNET_W5100_SPI is not set
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_THUNDER=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_SFP=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_FIXED_PHY=y
+CONFIG_ICPLUS_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PLIP=m
+CONFIG_PPP=y
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=y
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+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
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_STATION_STATISTICS=y
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC_DEBUGFS=y
+CONFIG_ATH9K_HWRNG=y
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_SPECTRAL is not set
+CONFIG_ATH10K_TRACING=y
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_SDIO is not set
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_PCIE_RTPM is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+# CONFIG_MT76x0U is not set
+# CONFIG_MT76x0E is not set
+# CONFIG_MT76x2E is not set
+# CONFIG_MT76x2U is not set
+# CONFIG_MT7603E is not set
+# CONFIG_MT7615E is not set
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+# CONFIG_RTW88 is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+CONFIG_DSCC4_PCI_RST=y
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_AT86RF230_DEBUGFS=y
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+CONFIG_IEEE802154_MCR20A=m
+# CONFIG_IEEE802154_HWSIM is not set
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_THUNDERBOLT_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=y
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=m
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_HDLC=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_NVM=y
+CONFIG_NVM_PBLK=m
+# CONFIG_NVM_PBLK_DEBUG is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5520=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+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
+CONFIG_KEYBOARD_MTK_PMIC=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_88PM860X=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM831X=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
+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_TOUCHSCREEN_IQS5XX=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_88PM860X_ONKEY=m
+CONFIG_INPUT_88PM80X_ONKEY=m
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_MSM_VIBRATOR=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MAX8925_ONKEY=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
+CONFIG_INPUT_WM831X_ON=m
+CONFIG_INPUT_PCAP=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_RAVE_SP_PWRBUTTON=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+# CONFIG_RMI4_F54 is not set
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=0
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+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_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=48
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_8250_MOXA=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_KGDB_NMI=y
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_MEN_Z135=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_TTY_PRINTK=y
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_IPMB_DEVICE_INTERFACE=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+# end of Character devices
+
+# CONFIG_RANDOM_TRUST_CPU is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_CHT_WC=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_MLXCPLD=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MID_DMA=y
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_NXP_FLEXSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_ZYNQMP_GQSPI=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+# CONFIG_SPI_LOOPBACK_TEST is not set
+CONFIG_SPI_TLE62X0=m
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPMI=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
+CONFIG_PTP_1588_CLOCK_KVM=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_MADERA=m
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_LYNXPOINT=y
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_XILINX=m
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_CRYSTAL_COVE=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_RC5T583=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_UCB1400=m
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_WM831X=m
+CONFIG_GPIO_WM8350=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+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
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_AVS=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_MAX8925_POWER=m
+CONFIG_WM831X_BACKUP=m
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_88PM860X=m
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_DA9030=m
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_CHARGER_88PM860X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_LP8788=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_MAX14577=m
+CONFIG_CHARGER_MAX77693=m
+CONFIG_CHARGER_MAX8997=m
+CONFIG_CHARGER_MAX8998=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_TPS65090=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_WILCO=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR38064=m
+CONFIG_SENSORS_IRPS5401=m
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+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
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_XGENE=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
+CONFIG_PROC_THERMAL_MMIO_RAPL=y
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9055_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+CONFIG_MENZ069_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_RAVE_SP_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_AS3711=y
+CONFIG_PMIC_ADP5520=y
+CONFIG_MFD_AAT2870_CORE=y
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_CHARDEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+# CONFIG_MFD_CS47L15 is not set
+# CONFIG_MFD_CS47L35 is not set
+# CONFIG_MFD_CS47L85 is not set
+# CONFIG_MFD_CS47L90 is not set
+# CONFIG_MFD_CS47L92 is not set
+CONFIG_PMIC_DA903X=y
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=y
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_HTC_I2CPLD=y
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=y
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_88PM800=m
+CONFIG_MFD_88PM805=m
+CONFIG_MFD_88PM860X=y
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
+CONFIG_MFD_MAX77843=y
+CONFIG_MFD_MAX8907=m
+CONFIG_MFD_MAX8925=y
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX8998=y
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT5033=m
+CONFIG_MFD_RC5T583=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SMSC=y
+CONFIG_ABX500_CORE=y
+CONFIG_AB3100_CORE=y
+CONFIG_AB3100_OTP=m
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
+CONFIG_MFD_PALMAS=y
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+CONFIG_MFD_TPS65090=y
+# CONFIG_MFD_TPS68470 is not set
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_TPS80031=y
+CONFIG_TWL4030_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+CONFIG_MFD_WM8998=y
+CONFIG_MFD_WM8400=y
+CONFIG_MFD_WM831X=y
+CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM831X_SPI=y
+CONFIG_MFD_WM8350=y
+CONFIG_MFD_WM8350_I2C=y
+CONFIG_MFD_WM8994=m
+CONFIG_RAVE_SP_CORE=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_AB3100=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP8788=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_S2MPA01=m
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS80031=m
+CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_SIR=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+# CONFIG_MEDIA_CEC_RC is not set
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+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
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=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_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_COBALT=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+CONFIG_VIDEO_ASPEED=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_V4L_TEST_DRIVERS=y
+# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CROS_EC_CEC=m
+CONFIG_VIDEO_SECO_CEC=m
+# CONFIG_VIDEO_SECO_RC is not set
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+CONFIG_SMS_SIANO_DEBUGFS=y
+CONFIG_VIDEO_V4L2_TPG=m
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AD9389B=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_SMIAPP_PLL=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5K6AA=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_S5K4ECGX=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_SMIAPP=m
+CONFIG_VIDEO_ET8EK8=m
+CONFIG_VIDEO_S5C73M3=m
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9807_VCM=m
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_ST_MIPID02=m
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+CONFIG_VIDEO_GS1662=m
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+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
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+CONFIG_DVB_MN88443X=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=y
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=y
+CONFIG_INTEL_GTT=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_AMDGPU=m
+# CONFIG_DRM_AMDGPU_SI is not set
+# CONFIG_DRM_AMDGPU_CIK is not set
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN1_0=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
+
+# CONFIG_HSA_AMD is not set
+CONFIG_DRM_NOUVEAU=m
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+# CONFIG_DRM_I915_GVT is not set
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_HISI_HIBMC=m
+# CONFIG_DRM_TINYDRM is not set
+CONFIG_DRM_XEN=y
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_ASILIANT=y
+CONFIG_FB_IMSTT=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+# CONFIG_FB_NVIDIA is not set
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+# CONFIG_FB_SAVAGE_ACCEL is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+# CONFIG_FB_3DFX_I2C is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_SM501=m
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_MAX8925=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_PM8941_WLED=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
+CONFIG_BACKLIGHT_ADP5520=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_88PM860X=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_AAT2870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_LP8788=m
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_AS3711=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+CONFIG_BACKLIGHT_RAVE_SP=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_DESIGNWARE_I2S=m
+# CONFIG_SND_DESIGNWARE_PCM is not set
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+# CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SST_IPC=m
+CONFIG_SND_SST_IPC_PCI=m
+CONFIG_SND_SST_IPC_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
+CONFIG_SND_SOC_INTEL_HASWELL=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_HASWELL_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
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE_LP=m
+CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
+CONFIG_SND_SOC_SOF_COMETLAKE_H=m
+CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_ZX_TDM=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=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_HDAC_HDA=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+# CONFIG_SND_SOC_RK3328 is not set
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_XEN_FRONTEND=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+# end of I2C HID support
+
+#
+# Intel ISH HID support
+#
+CONFIG_INTEL_ISH_HID=m
+# CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set
+# end of Intel ISH HID support
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+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
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+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
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+# CONFIG_USB_M66592 is not set
+CONFIG_USB_BDC_UDC=m
+
+#
+# Platform Support
+#
+CONFIG_USB_BDC_PCI=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+# CONFIG_USB_CONFIGFS_F_TCM is not set
+CONFIG_USB_ZERO=m
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_TYPEC_TPS6598X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_PI3USB30532=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+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
+#
+CONFIG_LEDS_88PM860X=m
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_MT6323=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8788=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X_GPIO is not set
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_DA903X=m
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_ADP5520=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX8997=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM36274=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_OPA_VNIC=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+# CONFIG_EDAC_LEGACY_SYSFS is not set
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
+CONFIG_EDAC_PND2=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_88PM860X=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_LP8788=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX8907=m
+CONFIG_RTC_DRV_MAX8925=m
+CONFIG_RTC_DRV_MAX8998=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BD70528=m
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_RTC_DRV_TPS6586X=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
+CONFIG_RTC_DRV_RC5T583=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RX6110=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB3100=m
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_WILCO_EC=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_INTEL_MIC_X100_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_HSU_DMA=m
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# end of DMABUF options
+
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_CHARLCD=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_VFIO_MDEV=m
+CONFIG_VFIO_MDEV_DEVICE=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_TSCPAGE=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+# CONFIG_XEN_GRANT_DMA_ALLOC is not set
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=y
+CONFIG_XEN_MCE_LOG=y
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+# end of Xen driver support
+
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_ISA_DRIVERS=y
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAC02=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_ISADMA=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+CONFIG_AD7192=m
+CONFIG_AD7280=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_STAGING_MEDIA=y
+CONFIG_I2C_BCM2048=m
+CONFIG_VIDEO_IPU3_IMGU=m
+
+#
+# soc_camera sensor drivers
+#
+
+#
+# Android
+#
+# end of Android
+
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+CONFIG_GS_FPGABOOT=m
+CONFIG_UNISYSSPAR=y
+CONFIG_UNISYS_VISORNIC=m
+CONFIG_UNISYS_VISORINPUT=m
+CONFIG_UNISYS_VISORHBA=m
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SH1106=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+CONFIG_WILC1000_SPI=m
+# CONFIG_WILC1000_HW_OOB_INTR is not set
+CONFIG_MOST=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_NET=m
+CONFIG_MOST_SOUND=m
+CONFIG_MOST_VIDEO=m
+CONFIG_MOST_I2C=m
+CONFIG_MOST_USB=m
+CONFIG_KS7010=m
+# CONFIG_GREYBUS is not set
+# CONFIG_PI433 is not set
+
+#
+# Gasket devices
+#
+CONFIG_STAGING_GASKET_FRAMEWORK=m
+CONFIG_STAGING_APEX_DRIVER=m
+# end of Gasket devices
+
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_USE_VM_MAP_RAM is not set
+# CONFIG_EROFS_FAULT_INJECTION is not set
+CONFIG_EROFS_FS_IO_MAX_RETRIES=5
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_FIELDBUS_DEV=m
+# CONFIG_KPC2000 is not set
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_LED=m
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_RBU=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WIRELESS=m
+CONFIG_HP_WMI=m
+CONFIG_LG_LAPTOP=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SURFACE3_WMI=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_XIAOMI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_PEAQ_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_CHT_INT33FE=m
+CONFIG_INTEL_INT0002_VGPIO=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_IBM_RTL=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_PMC_IPC=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_TELEMETRY=m
+# CONFIG_MLX_PLATFORM is not set
+# CONFIG_INTEL_TURBO_MAX_3 is not set
+# CONFIG_TOUCHSCREEN_DMI is not set
+CONFIG_INTEL_CHTDC_TI_PWRBTN=m
+CONFIG_I2C_MULTI_INSTANTIATE=m
+CONFIG_INTEL_ATOMISP2_PM=m
+CONFIG_HUAWEI_WMI=m
+CONFIG_PCENGINES_APU2=m
+
+#
+# Intel Speed Select Technology interface support
+#
+CONFIG_INTEL_SPEED_SELECT_INTERFACE=m
+# end of Intel Speed Select Technology interface support
+
+CONFIG_PMC_ATOM=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_WILCO_EC=m
+# CONFIG_WILCO_EC_DEBUGFS is not set
+CONFIG_WILCO_EC_EVENTS=m
+CONFIG_WILCO_EC_TELEMETRY=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_WM831X=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_SI5341=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_COMMON_CLK_PWM=m
+# end of Common Clock Framework
+
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+# CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+CONFIG_XILINX_VCU=m
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_ARIZONA=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA180=m
+CONFIG_BMA220=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_LP8788_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2497=m
+CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=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
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+# end of Amplifiers
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SPS30=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+CONFIG_AD5755=m
+CONFIG_AD5758=m
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_AD8801=m
+CONFIG_DS4424=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+CONFIG_ADF4371=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_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
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+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
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6070=m
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_T5403=m
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+CONFIG_AS3935=m
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_RFD77402=m
+CONFIG_SRF04=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+CONFIG_NTB_MSI=y
+CONFIG_NTB_AMD=m
+CONFIG_NTB_IDT=m
+CONFIG_NTB_INTEL=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_MSI_TEST=m
+CONFIG_NTB_TRANSPORT=m
+CONFIG_VME_BUS=y
+
+#
+# VME Bridge Drivers
+#
+CONFIG_VME_CA91CX42=m
+CONFIG_VME_TSI148=m
+# CONFIG_VME_FAKE is not set
+
+#
+# VME Board Drivers
+#
+CONFIG_VMIVME_7805=m
+
+#
+# VME Device Drivers
+#
+CONFIG_VME_USER=m
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_CRC=y
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+
+#
+# IRQ chip support
+#
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_TI_SYSCON=m
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+# CONFIG_IDLE_INJECT is not set
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+# CONFIG_RAS_CEC is not set
+CONFIG_THUNDERBOLT=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_NVDIMM_KEYS=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_RAVE_SP_EEPROM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_PM_OPP=y
+CONFIG_UNISYS_VISORBUS=m
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+CONFIG_COUNTER=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=y
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+CONFIG_UBIFS_ATIME_SUPPORT=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+# CONFIG_UNICODE is not set
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
+CONFIG_TRUSTED_KEYS=y
+CONFIG_ENCRYPTED_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_WRITABLE_HOOKS=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_SECURITY_SMACK=y
+# CONFIG_SECURITY_SMACK_BRINGUP is not set
+CONFIG_SECURITY_SMACK_NETFILTER=y
+# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+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_SECURITY_SAFESETID is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+# CONFIG_IMA_TEMPLATE is not set
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+CONFIG_IMA_DEFAULT_HASH_SHA1=y
+# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
+# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
+CONFIG_IMA_DEFAULT_HASH="sha1"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+CONFIG_IMA_TRUSTED_KEYRING=y
+CONFIG_IMA_BLACKLIST_KEYRING=y
+# CONFIG_IMA_LOAD_X509 is not set
+CONFIG_EVM=y
+CONFIG_EVM_ATTR_FSUUID=y
+CONFIG_EVM_EXTRA_SMACK_XATTRS=y
+# CONFIG_EVM_ADD_XATTRS is not set
+# CONFIG_EVM_LOAD_X509 is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
+
+#
+# Kernel hardening options
+#
+CONFIG_GCC_PLUGIN_STRUCTLEAK=y
+
+#
+# Memory initialization
+#
+# CONFIG_INIT_STACK_NONE is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
+CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_TRACK_MIN_SIZE=100
+# CONFIG_STACKLEAK_METRICS is not set
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128L=m
+CONFIG_CRYPTO_AEGIS256=m
+CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m
+CONFIG_CRYPTO_AEGIS256_AESNI_SSE2=m
+CONFIG_CRYPTO_MORUS640=m
+CONFIG_CRYPTO_MORUS640_GLUE=m
+CONFIG_CRYPTO_MORUS640_SSE2=m
+CONFIG_CRYPTO_MORUS1280=m
+CONFIG_CRYPTO_MORUS1280_GLUE=m
+CONFIG_CRYPTO_MORUS1280_SSE2=m
+CONFIG_CRYPTO_MORUS1280_AVX2=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_ADIANTUM=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+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
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=y
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_SP_PSP=y
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+# CONFIG_CRYPTO_DEV_CHELSIO_TLS is not set
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+# CONFIG_CRC4 is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_CMA is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_FRAME_POINTER=y
+CONFIG_STACK_VALIDATION=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER 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
+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
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+# CONFIG_KASAN is not set
+CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# 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
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+# CONFIG_UPROBE_EVENTS is not set
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+CONFIG_RUNTIME_TESTING_MENU=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 is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+CONFIG_INTERVAL_TREE_TEST=m
+CONFIG_PERCPU_TEST=m
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+CONFIG_TEST_HEXDUMP=m
+CONFIG_TEST_STRING_HELPERS=m
+CONFIG_TEST_STRSCPY=m
+CONFIG_TEST_KSTRTOX=m
+CONFIG_TEST_PRINTF=m
+CONFIG_TEST_BITMAP=m
+CONFIG_TEST_BITFIELD=m
+CONFIG_TEST_UUID=m
+CONFIG_TEST_XARRAY=m
+CONFIG_TEST_OVERFLOW=m
+CONFIG_TEST_RHASHTABLE=m
+CONFIG_TEST_HASH=m
+CONFIG_TEST_IDA=m
+CONFIG_TEST_PARMAN=m
+CONFIG_TEST_LKM=m
+CONFIG_TEST_VMALLOC=m
+CONFIG_TEST_USER_COPY=m
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+CONFIG_FIND_BIT_BENCHMARK=m
+CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
+CONFIG_TEST_UDELAY=m
+CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_LIVEPATCH is not set
+CONFIG_TEST_OBJAGG=m
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+CONFIG_MEMTEST=y
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_LOW_LEVEL_TRAP=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_EARLY_PRINTK_USB=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_WX is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+# CONFIG_IO_DELAY_0X80 is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+CONFIG_PUNIT_ATOM_DEBUG=m
+# CONFIG_UNWINDER_ORC is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index fed8d8b96d..e333135a0f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -181,6 +181,12 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
                               "deblob-check"))
           (sha256 deblob-check-hash))))
 
+(define deblob-scripts-5.3
+  (linux-libre-deblob-scripts
+   "5.3.1"
+   (base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4")
+   (base32 "1av9ykv714cnl0clls8rhwa8rwflz6ivg17gharj1x650qp6vnw3")))
+
 (define deblob-scripts-5.2
   (linux-libre-deblob-scripts
    "5.2.17"
@@ -351,6 +357,14 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                         "linux-" version ".tar.xz"))
     (sha256 hash)))
 
+(define-public linux-libre-5.3-version "5.3.1")
+(define-public linux-libre-5.3-pristine-source
+  (let ((version linux-libre-5.3-version)
+        (hash (base32 "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q")))
+   (make-linux-libre-source version
+                            (%upstream-linux-source version hash)
+                            deblob-scripts-5.3)))
+
 (define-public linux-libre-5.2-version "5.2.17")
 (define-public linux-libre-5.2-pristine-source
   (let ((version linux-libre-5.2-version)
@@ -419,6 +433,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
     (patches (append (origin-patches source)
                      patches))))
 
+(define-public linux-libre-5.3-source
+  (source-with-patches linux-libre-5.3-pristine-source
+                       (list %boot-logo-patch
+                             %linux-libre-arm-export-__sync_icache_dcache-patch)))
+
 (define-public linux-libre-5.2-source
   (source-with-patches linux-libre-5.2-pristine-source
                        (list %boot-logo-patch
@@ -511,6 +530,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
     (description "Headers of the Linux-Libre kernel.")
     (license license:gpl2)))
 
+(define-public linux-libre-headers-5.3
+  (make-linux-libre-headers* linux-libre-5.3-version
+                             linux-libre-5.3-source))
+
 (define-public linux-libre-headers-5.2
   (make-linux-libre-headers* linux-libre-5.2-version
                              linux-libre-5.2-source))
@@ -756,6 +779,12 @@ It has been modified to remove all non-free binary blobs.")
 ;;; Generic kernel packages.
 ;;;
 
+(define-public linux-libre-5.3
+  (make-linux-libre* linux-libre-5.3-version
+                     linux-libre-5.3-source
+                     '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")
+                     #:configuration-file kernel-config))
+
 (define-public linux-libre-5.2
   (make-linux-libre* linux-libre-5.2-version
                      linux-libre-5.2-source
-- 
cgit v1.2.3


From 13169000f6a1cc8513345542f3bae8978d0c6b1a Mon Sep 17 00:00:00 2001
From: Konrad Hinsen 
Date: Tue, 1 Oct 2019 17:06:58 +0200
Subject: pull: Do not use '~*', which 'msgfmt' fails to interpret.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Really fixes .
This is a followup to f751b4646d3989d76dad9e33e39f9724c7c50be6.

* guix/scripts/pull.scm (display-channel-news): Remove second occurrence
of '~*' in a format string.

Signed-off-by: Ludovic Courtès 
---
 guix/scripts/pull.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index e018985469..04970cf503 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -314,7 +314,7 @@ to display."
                (removed
                 (let ((count (length removed)))
                   (format (current-error-port)
-                          (N_ "  ~*One channel removed:~%"
+                          (N_ "  ~a channel removed:~%"
                               "  ~a channels removed:~%" count)
                           count)
                   (for-each display-channel removed))))
-- 
cgit v1.2.3


From b72c22c01a4ccc2c4287b2bf8fb11666f0aeb7ae Mon Sep 17 00:00:00 2001
From: Brice Waegeneire 
Date: Mon, 30 Sep 2019 16:43:21 +0200
Subject: gnu: Add iwd.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/networking.scm (iwd): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/networking.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a93e2cb9fc..07b056adab 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2019 Vasile Dumitrascu 
 ;;; Copyright © 2019 Julien Lepiller 
 ;;; Copyright © 2019 Timotej Lazar 
+;;; Copyright © 2019 Brice Waegeneire 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2578,3 +2579,61 @@ communication.")
     (description "FRRouting (FRR) is an IP routing protocol suite which includes
 protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
     (license license:gpl2+)))
+
+(define-public iwd
+  (package
+    (name "iwd")
+    (version "0.21")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://git.kernel.org/pub/scm/network/wireless/iwd.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "001dikinsa6kshwscjbvwipavzwpqnpvx9fpshcn63gbvbhyd393"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("dbus" ,dbus)
+       ("libtool" ,libtool)
+       ("ell" ,ell)
+       ("readline" ,readline)))
+    (native-inputs
+     `(("asciidoc" ,asciidoc)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkgconfig" ,pkg-config)
+       ("python" ,python)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:configure-flags
+       (let ((dbus (assoc-ref %outputs "out")))
+         (list "--disable-systemd-service"
+               "--enable-external-ell"
+               "--enable-hwsim"
+               "--enable-tools"
+               "--enable-wired"
+               "--enable-docs"
+               "--localstatedir=/var"
+               (string-append "--with-dbus-datadir=" dbus "/share/")
+               (string-append "--with-dbus-busdir="
+                              dbus "/share/dbus-1/system-services")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'bootstrap 'pre-bootstrap
+           (lambda _
+             (substitute* "Makefile.am"
+               ;; Test disabled because it needs the kernel module
+               ;; 'pkcs8_key_parser' loaded.
+               (("unit\\/test-eapol.*? ") "")
+               ;; Don't try to 'mkdir /var'.
+               (("\\$\\(MKDIR_P\\) -m 700") "true"))
+             #t)))))
+    (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/")
+    (synopsis "Internet Wireless Daemon")
+    (description "iwd is a wireless daemon for Linux that aims to replace WPA
+Supplicant.  It optimizes resource utilization by not depending on any external
+libraries and instead utilizing features provided by the Linux kernel to the
+maximum extent possible.")
+    (license license:lgpl2.1+)))
-- 
cgit v1.2.3


From f8372932027680a1f2f1b41ea8e19c12bb7d7070 Mon Sep 17 00:00:00 2001
From: Martin Becze 
Date: Tue, 1 Oct 2019 16:54:56 -0400
Subject: import: crate: Support recursive imports.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/import/crate.scm (crate-recursive-import): New procedure.
(crate->guix-package): Return dependencies as a second value.

Signed-off-by: Ludovic Courtès 
---
 guix/import/crate.scm | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index fd1974eae8..8dc014d232 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -40,6 +40,7 @@
   #:use-module (srfi srfi-26)
   #:export (crate->guix-package
             guix-package->crate-name
+            crate-recursive-import
             %crate-updater))
 
 
@@ -218,16 +219,24 @@ latest version of CRATE-NAME."
               (cargo-development-inputs
                (sort (map crate-dependency-id dev-dep-crates)
                      string-ci (crate-version-license version*)
-                                           string->license)))))
+         (values
+          (make-crate-sexp #:name crate-name
+                           #:version (crate-version-number version*)
+                           #:cargo-inputs cargo-inputs
+                           #:cargo-development-inputs cargo-development-inputs
+                           #:home-page (or (crate-home-page crate)
+                                           (crate-repository crate))
+                           #:synopsis (crate-description crate)
+                           #:description (crate-description crate)
+                           #:license (and=> (crate-version-license version*)
+                                            string->license))
+          (append cargo-inputs cargo-development-inputs)))))
+
+(define (crate-recursive-import crate-name)
+  (recursive-import crate-name #f
+                    #:repo->guix-package (lambda (name repo)
+                                           (crate->guix-package name))
+                    #:guix-name crate-name->package-name))
 
 (define (guix-package->crate-name package)
   "Return the crate name of PACKAGE."
-- 
cgit v1.2.3


From ed661e38d8ce3c4efa5c495b2c34ba86e1e43290 Mon Sep 17 00:00:00 2001
From: Martin Becze 
Date: Tue, 1 Oct 2019 16:54:57 -0400
Subject: import: crate: Add '--recursive'.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* guix/scripts/import/crate.scm (show-help, guix-import-crate): Add '--recursive'.
* doc/guix.texi (Invoking guix import): Mention '--recursive'.

Co-authored-by: Ludovic Courtès 
---
 doc/guix.texi                 | 10 ++++++++++
 guix/scripts/import/crate.scm | 36 ++++++++++++++++++++++++++----------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index a6c1319405..93139e2d05 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9083,6 +9083,16 @@ The crate importer also allows you to specify a version string:
 guix import crate constant-time-eq@@0.1.0
 @end example
 
+Additional options include:
+
+@table @code
+@item --recursive
+@itemx -r
+Traverse the dependency graph of the given upstream package recursively
+and generate package expressions for all those packages that are not yet
+in Guix.
+@end table
+
 @item opam
 @cindex OPAM
 @cindex OCaml
diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm
index 7ae8638911..4690cceb4d 100644
--- a/guix/scripts/import/crate.scm
+++ b/guix/scripts/import/crate.scm
@@ -28,6 +28,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-37)
+  #:use-module (srfi srfi-41)
   #:use-module (ice-9 match)
   #:use-module (ice-9 format)
   #:export (guix-import-crate))
@@ -43,6 +44,9 @@
 (define (show-help)
   (display (G_ "Usage: guix import crate PACKAGE-NAME
 Import and convert the crate.io package for PACKAGE-NAME.\n"))
+  (display (G_ "
+  -r, --recursive        import packages recursively"))
+  (newline)
   (display (G_ "
   -h, --help             display this help and exit"))
   (display (G_ "
@@ -59,6 +63,9 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
          (option '(#\V "version") #f #f
                  (lambda args
                    (show-version-and-exit "guix import crate")))
+         (option '(#\r "recursive") #f #f
+                 (lambda (opt name arg result)
+                   (alist-cons 'recursive #t result)))
          %standard-import-options))
 
 
@@ -79,22 +86,31 @@ Import and convert the crate.io package for PACKAGE-NAME.\n"))
 
   (let* ((opts (parse-options))
          (args (filter-map (match-lambda
-                            (('argument . value)
-                             value)
-                            (_ #f))
+                             (('argument . value)
+                              value)
+                             (_ #f))
                            (reverse opts))))
     (match args
       ((spec)
        (define-values (name version)
          (package-name->name+version spec))
 
-       (let ((sexp (crate->guix-package name version)))
-         (unless sexp
-           (leave (G_ "failed to download meta-data for package '~a'~%")
-                  (if version
-                      (string-append name "@" version)
-                      name)))
-         sexp))
+       (if (assoc-ref opts 'recursive)
+           (map (match-lambda
+                  ((and ('package ('name name) . rest) pkg)
+                   `(define-public ,(string->symbol name)
+                      ,pkg))
+                  (_ #f))
+                (reverse
+                 (stream->list
+                  (crate-recursive-import name))))
+           (let ((sexp (crate->guix-package name version)))
+             (unless sexp
+               (leave (G_ "failed to download meta-data for package '~a'~%")
+                      (if version
+                          (string-append name "@" version)
+                          name)))
+             sexp)))
       (()
        (leave (G_ "too few arguments~%")))
       ((many ...)
-- 
cgit v1.2.3


From 8c765a3b26cfcedf02208dfda151d154835f0b85 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Tue, 1 Oct 2019 14:37:12 +0200
Subject: gnu: Add keybinder-3.0.

* gnu/packages/wm.scm: Add keybinder-3.0 package.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/wm.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e47979d026..865b1edee1 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2019 Timothy Sample 
 ;;; Copyright © 2019 Gábor Boskovits 
 ;;; Copyright © 2019 Kyle Andrews 
+;;; Copyright © 2019 Ingo Ruhnke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1000,6 +1001,34 @@ Keybinder works with GTK-based applications using the X Window System.")
     (home-page "https://github.com/kupferlauncher/keybinder")
     (license license:gpl2+)))
 
+(define-public keybinder-3.0
+  (package
+    (name "keybinder-3.0")
+    (version "0.3.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/kupferlauncher/keybinder"
+                           "/releases/download/" name "-v" version "/" name "-"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0830ihwnalw59pp1xzrp37dn58n8vwb8zasnm4a1h81v3x7dxqz6"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("gobject-introspection" ,gobject-introspection)))
+    (native-inputs
+     `(("gtk-doc" ,gtk-doc)
+       ("pkg-config" ,pkg-config)))
+    (synopsis "Library for registering global keyboard shortcuts, Gtk3 version")
+    (description
+     "Keybinder is a library for registering global keyboard shortcuts.
+Keybinder works with GTK-based applications using the X Window System.")
+    (home-page "https://github.com/kupferlauncher/keybinder")
+    (license license:x11)))
+
 (define-public spectrwm
   (package
     (name "spectrwm")
-- 
cgit v1.2.3


From b6b257ed94a9f01451e9d1b1e3c72a2df21125b7 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Tue, 1 Oct 2019 14:37:13 +0200
Subject: gnu: Add xfce4-volumed-pulse.

* gnu/packages/xfce.scm: Add xfce4-volumed-pulse.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index c71285c7bd..d8f67374fa 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Pkill -9 
 ;;; Copyright © 2019 L  p R n  d n 
+;;; Copyright © 2019 Ingo Ruhnke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,7 +62,8 @@
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages popt)
-  #:use-module (gnu packages pulseaudio))
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages wm))
 
 (define-public gtk-xfce-engine
   (package
@@ -1198,3 +1200,32 @@ A plugin for the Xfce panel is also available.")
      "Xfce Screensaver is a screen saver and locker that aims to have simple,
  sane, secure defaults and be well integrated with the Xfce desktop. ")
     (license gpl2+)))
+
+(define-public xfce4-volumed-pulse
+  (package
+    (name "xfce4-volumed-pulse")
+    (version "0.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://archive.xfce.org/src/apps/"
+                                  name "/" (version-major+minor version) "/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1q639iwwj7q2plgz0wdgdbi5wkgaq177ca9rnnlrnbdmid5z5fqk"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("xfconf" ,xfconf)
+       ("libnotify" ,libnotify)
+       ("pulseaudio" ,pulseaudio)
+       ("keybinder-3.0" ,keybinder-3.0)
+       ("gtk+" ,gtk+)))
+    (home-page "https://goodies.xfce.org/projects/applications/xfce4-volumed")
+    (synopsis "XFCE volume keys daemon")
+    (description
+     "This is a volume keys control daemon for Xfce Desktop environment. It controls
+ the volume using multimedia keys. It also provides volume change notifications.")
+    (license gpl3+)))
-- 
cgit v1.2.3


From 0bf7d34d77ffca40be9e04586195054e9f2c7a13 Mon Sep 17 00:00:00 2001
From: Jesse Gibbons 
Date: Sat, 14 Sep 2019 16:35:39 -0600
Subject: services: For "gdm-password" pam service, include "limits.conf".

* gnu/services/base.scm (pam-limits-service-type): For "gdm-password" pam
service, include "limits.conf".

Signed-off-by: Danny Milosavljevic 
---
 gnu/services/base.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 25716ef152..6ab7b110ec 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1478,7 +1478,7 @@ information on the configuration file syntax."
                               (module "pam_limits.so")
                               (arguments '("conf=/etc/security/limits.conf")))))
              (if (member (pam-service-name pam)
-                         '("login" "su" "slim"))
+                         '("login" "su" "slim" "gdm-password"))
                  (pam-service
                   (inherit pam)
                   (session (cons pam-limits
-- 
cgit v1.2.3


From 0992cfa13aabee70e214057b7343bcb76de77b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= 
Date: Thu, 12 Sep 2019 19:33:45 +0000
Subject: gnu: Add tigervnc-client.

* gnu/packages/tigervnc.scm: New file.
(tigervnc-client): New variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add tigervnc.scm.

Signed-off-by: Danny Milosavljevic 
---
 gnu/local.mk              |  1 +
 gnu/packages/tigervnc.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 gnu/packages/tigervnc.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index d056a2557e..54ae09f619 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -475,6 +475,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/tex.scm				\
   %D%/packages/textutils.scm			\
   %D%/packages/text-editors.scm			\
+  %D%/packages/tigervnc.scm			\
   %D%/packages/time.scm				\
   %D%/packages/tls.scm				\
   %D%/packages/tmux.scm				\
diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm
new file mode 100644
index 0000000000..89aac1c63a
--- /dev/null
+++ b/gnu/packages/tigervnc.scm
@@ -0,0 +1,84 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Todor Kondić 
+;;;
+;;; 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 .
+
+(define-module (gnu packages tigervnc)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages fltk)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages cmake)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages commencement)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix utils)
+  #:use-module ((guix licenses) #:prefix license:))
+
+(define-public tigervnc-client
+  (package
+    (name "tigervnc-client")
+    (version "1.9.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri
+        (git-reference
+         (url "https://github.com/TigerVNC/tigervnc.git")
+         (commit (string-append "v" version))))
+       (sha256
+        (base32
+         "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f ; Tests that do exists are not automated.
+       #:phases (modify-phases %standard-phases
+                  (replace 'install
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (with-directory-excursion "vncviewer"
+                        (invoke "make" "install")))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("gettext-minimal" ,gettext-minimal)
+       ("automake" ,automake)))
+    (inputs
+     `(("zlib" ,zlib)
+       ("gnutls" ,gnutls)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("fltk" ,fltk)
+       ("linux-pam" ,linux-pam)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxtst" ,libxtst)
+       ("libxrandr" ,libxrandr)
+       ("libxdamage" ,libxdamage)))
+    (home-page "https://tigervnc.org/")
+    (synopsis "High-performance, platform-neutral
+implementation of VNC (client)")
+    (description "TigerVNC is a client/server implementation of VNC (Virtual
+Network Computing).  It provides enough performance to run even 3D and video
+applications.  It also provides extensions for advanced authentication methods
+and TLS encryption.  This package installs only the VNC client, the
+application which is needed to connect to VNC servers.")
+    (license license:gpl2)))
-- 
cgit v1.2.3


From 04784d217a279b22434920ec3054fda1d6ac24ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= 
Date: Wed, 2 Oct 2019 01:20:15 +0200
Subject: gnu: Add tigervnc-server.

* gnu/packages/tigervnc.scm (tigervnc-server): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/tigervnc.scm | 148 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)

diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm
index 89aac1c63a..695f5bb4f4 100644
--- a/gnu/packages/tigervnc.scm
+++ b/gnu/packages/tigervnc.scm
@@ -82,3 +82,151 @@ applications.  It also provides extensions for advanced authentication methods
 and TLS encryption.  This package installs only the VNC client, the
 application which is needed to connect to VNC servers.")
     (license license:gpl2)))
+
+;; A VNC server is, in fact, an X server so it seems like a good idea
+;; to build on the work already done for xorg-server package.  This is
+;; not entirely compatible with the recommendation in BUILDING.txt
+;; where the client is built first, then the source code of the X
+;; server is copied into a subdir of the build directory, patched with
+;; VNC additions and then build and installed as Xvnc.  The procedure
+;; was turned around, where TigerVNC code is downloaded and built
+;; inside the Guix X server build dir. Also, the VNC patching process
+;; for the X server is automated in a straightforward manner.
+(define-public tigervnc-server
+  (package
+    (inherit xorg-server)
+    (name "tigervnc-server")
+    (version "1.9.0")
+    (native-inputs
+     `(("tigervnc-src" ,(origin
+                          (method git-fetch)
+                          (uri
+                           (git-reference
+                            (url "https://github.com/TigerVNC/tigervnc.git")
+                            (commit "v1.9.0")))
+                          (sha256
+                           (base32
+                            "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x"))))
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("gettext-minimal" ,gettext-minimal)
+       ("font-util" ,font-util)
+       ("cmake" ,cmake)
+       ("gcc-toolchain" ,gcc-toolchain)
+       ("perl" ,perl)
+       ,@(package-native-inputs tigervnc-client)
+       ,@(package-inputs tigervnc-client)
+       ,@(package-native-inputs xorg-server)))
+    (inputs
+     `(("perl" ,perl)
+       ("coreutils" ,coreutils)
+       ("xauth" ,xauth)
+       ,@(package-inputs xorg-server)))
+    (propagated-inputs
+     `(("xauth" ,xauth)
+       ,@(package-propagated-inputs xorg-server)))
+    (arguments
+     (substitute-keyword-arguments
+         (package-arguments xorg-server)
+       ((#:configure-flags flags)
+        `(append '("--with-pic"         ; Taken from BUILDING.txt
+                   "--without-dtrace"
+                   "--disable-static"
+                   "--disable-dri2"
+                   "--disable-xinerama"
+                   "--disable-xvfb"
+                   "--disable-xnest"
+                   "--disable-xorg"
+                   "--disable-dmx"
+                   "--disable-xwin"
+                   "--disable-xephyr"   ; Is this necessary? (*)
+                   "--disable-kdrive"
+                   ;; "--disable-config-dbus" ; This was a warning.
+                   "--disable-config-hal"
+                   "--disable-config-udev"
+                   "--disable-dri2"
+                   ;; "--enable-install-libxf86config" ; This, too, was a warning.
+                   "--enable-glx")
+                 (delete "--enable-xephyr" ,flags))) ; Is this necessary? (*)
+       ((#:modules modules)
+        `(append '((ice-9 ftw)
+                   (ice-9 match)
+                   (guix build utils)
+                   (guix build gnu-build-system))
+                 modules))
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (delete 'check)              ;)
+           (add-after 'unpack 'copy-tvnc-xserver
+             (lambda _
+               (let*
+                   ((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
+                    (tvnc-xserver (string-append tvnc-src "/unix/xserver")))
+                 (copy-recursively tvnc-xserver ".")
+                 #t)))
+           (add-after 'copy-tvnc-xserver 'patch-xserver
+             (lambda _
+               (let*
+                   ((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
+                    (xorg-server-version ,(package-version xorg-server))
+                    (which-patch (lambda ()
+                                   (let*
+                                       ((patch-num (apply string-append
+                                                          (list-head (string-split xorg-server-version
+                                                                                   #\.)
+                                                                     2)))
+                                        (fn (format "~a/unix/xserver~a.patch" tvnc-src patch-num)))
+                                     (when (not (file-exists? fn))
+                                       (error (format "Patch file, ~a,
+corresponding to the input xorg-server version, does not exist.  Installation
+will fail.  " fn)))
+
+                                     fn))) ; VNC patches for xserver have the
+                                           ; form xserverXY[Y].patch, where
+                                           ; X.Y[Y].Z is the Xorg server
+					; version.
+                    (xserver-patch (which-patch)))
+                 (invoke "patch" "-p1" "-i" xserver-patch)
+                 (invoke "autoreconf" "-fiv"))))
+           (add-before 'build 'build-tigervnc
+             (lambda _
+               (let* ((out (assoc-ref %outputs "out"))
+                      (tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
+                      (tvnc-build (string-append (getcwd) "/tigervnc-build")))
+                 (mkdir-p tvnc-build)
+                 (with-directory-excursion tvnc-build
+                   (invoke "cmake" "-G" "Unix Makefiles"
+                           (string-append "-DCMAKE_INSTALL_PREFIX=" out)
+                           tvnc-src)
+                   (invoke "make" "-j" (number->string (parallel-job-count)))))))
+           (replace 'build
+             (lambda _
+               (let*  ((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
+                       (tvnc-build (string-append (getcwd) "/tigervnc-build"))
+                       (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src))
+                       (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build)))
+                 (invoke "make" srcarg buildarg "-j"
+                         (number->string (parallel-job-count))))))
+           (add-before 'install 'install-tigervnc-aux
+             (lambda _
+               (let*  ((out (assoc-ref %outputs 'out))
+                       (tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
+                       (tvnc-build (string-append (getcwd) "/tigervnc-build"))
+                       (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src))
+                       (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build)))
+                 (with-directory-excursion (string-append tvnc-build "/unix")
+                   (invoke "make" srcarg buildarg "install")))))
+           (replace 'install
+             (lambda* _
+               (let*  ((tvnc-src (assoc-ref %build-inputs "tigervnc-src"))
+                       (tvnc-build (string-append (getcwd) "/tigervnc-build"))
+                       (srcarg (string-append "TIGERVNC_SRCDIR=" tvnc-src))
+                       (buildarg (string-append "TIGERVNC_BUILDDIR=" tvnc-build)))
+                 (invoke "make" "install" srcarg buildarg))))))))
+    (description "TigerVNC is a client/server implementation of VNC (Virtual
+Network Computing).  It provides enough performance to run even 3D and video
+applications.  It also provides extensions for advanced authentication methods
+and TLS encryption.  This package installs the VNC server, a program that will
+enable users with VNC clients to log into a graphical session on the machine
+where the server is installed.")))
-- 
cgit v1.2.3


From d8de38563b7a32a96873a8dbc918b6448f3d8665 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic 
Date: Wed, 2 Oct 2019 01:27:23 +0200
Subject: gnu: tigervnc-server: Clean up comments.

* gnu/packages/tigervnc.scm (tigervnc-server): Clean up comments.
---
 gnu/packages/tigervnc.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tigervnc.scm b/gnu/packages/tigervnc.scm
index 695f5bb4f4..cb44d355c6 100644
--- a/gnu/packages/tigervnc.scm
+++ b/gnu/packages/tigervnc.scm
@@ -140,7 +140,7 @@ application which is needed to connect to VNC servers.")
                    "--disable-xorg"
                    "--disable-dmx"
                    "--disable-xwin"
-                   "--disable-xephyr"   ; Is this necessary? (*)
+                   "--disable-xephyr"
                    "--disable-kdrive"
                    ;; "--disable-config-dbus" ; This was a warning.
                    "--disable-config-hal"
@@ -148,7 +148,7 @@ application which is needed to connect to VNC servers.")
                    "--disable-dri2"
                    ;; "--enable-install-libxf86config" ; This, too, was a warning.
                    "--enable-glx")
-                 (delete "--enable-xephyr" ,flags))) ; Is this necessary? (*)
+                 (delete "--enable-xephyr" ,flags)))
        ((#:modules modules)
         `(append '((ice-9 ftw)
                    (ice-9 match)
-- 
cgit v1.2.3


From 37c0d4580e464a5915ea34109f78898325aae2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 2 Oct 2019 11:15:48 +0200
Subject: channels: Add quirk to build recent 'master' with Guile 2.2.4.

Fixes .
Reported by Marius Bakke .

* guix/channels.scm (syscalls-reexports-local-variables?)
(guile-2.2.4, guile-for-source): New procedures.
(%quirks): New variable.
(build-from-source): Add calls to 'guile-for-source' and
'set-guile-for-build'.
---
 guix/channels.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/guix/channels.scm b/guix/channels.scm
index 4e6e7090ac..2c28dccbcb 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -27,6 +27,7 @@
   #:use-module (guix discovery)
   #:use-module (guix monads)
   #:use-module (guix profiles)
+  #:use-module (guix packages)
   #:use-module (guix derivations)
   #:use-module (guix combinators)
   #:use-module (guix diagnostics)
@@ -47,6 +48,7 @@
   #:autoload   (guix inferior) (gexp->derivation-in-inferior) ;FIXME: circular dep
   #:use-module (ice-9 match)
   #:use-module (ice-9 vlist)
+  #:use-module ((ice-9 rdelim) #:select (read-string))
   #:export (channel
             channel?
             channel-name
@@ -306,6 +308,46 @@ to '%package-module-path'."
 
     (gexp->derivation-in-inferior name build core)))
 
+(define (syscalls-reexports-local-variables? source)
+  "Return true if (guix build syscalls) contains the bug described at
+."
+  (catch 'system-error
+    (lambda ()
+      (define content
+        (call-with-input-file (string-append source
+                                             "/guix/build/syscalls.scm")
+          read-string))
+
+      ;; The faulty code would use the 're-export' macro, causing the
+      ;; 'AT_SYMLINK_NOFOLLOW' local variable to be re-exported when using
+      ;; Guile > 2.2.4.
+      (string-contains content "(re-export variable)"))
+    (lambda args
+      (if (= ENOENT (system-error-errno args))
+          #f
+          (apply throw args)))))
+
+(define (guile-2.2.4)
+  (module-ref (resolve-interface '(gnu packages guile))
+              'guile-2.2.4))
+
+(define %quirks
+  ;; List of predicate/package pairs.  This allows us provide information
+  ;; about specific Guile versions that old Guix revisions might need to use
+  ;; just to be able to build and run the trampoline in %SELF-BUILD-FILE.  See
+  ;; 
+  `((,syscalls-reexports-local-variables? . ,guile-2.2.4)))
+
+(define* (guile-for-source source #:optional (quirks %quirks))
+  "Return the Guile package to use when building SOURCE or #f if the default
+'%guile-for-build' should be good enough."
+  (let loop ((quirks quirks))
+    (match quirks
+      (()
+       #f)
+      (((predicate . guile) rest ...)
+       (if (predicate source) (guile) (loop rest))))))
+
 (define* (build-from-source name source
                             #:key core verbose? commit
                             (dependencies '()))
@@ -327,15 +369,19 @@ package modules under SOURCE using CORE, an instance of Guix."
                       ;; about it.
                       (parameterize ((guix-warning-port
                                       (%make-void-port "w")))
-                        (primitive-load script))))))
+                        (primitive-load script)))))
+            (guile (guile-for-source source)))
         ;; BUILD must be a monadic procedure of at least one argument: the
         ;; source tree.
         ;;
         ;; Note: BUILD can return #f if it does not support %PULL-VERSION.  In
         ;; the future we'll fall back to a previous version of the protocol
         ;; when that happens.
-        (build source #:verbose? verbose? #:version commit
-               #:pull-version %pull-version))
+        (mbegin %store-monad
+          (mwhen guile
+            (set-guile-for-build guile))
+          (build source #:verbose? verbose? #:version commit
+                 #:pull-version %pull-version)))
 
       ;; Build a set of modules that extend Guix using the standard method.
       (standard-module-derivation name source core dependencies)))
-- 
cgit v1.2.3


From ece22ac8ccb6744eaec0320f0c7c9b6680fffa46 Mon Sep 17 00:00:00 2001
From: Pierre Langlois 
Date: Mon, 30 Sep 2019 17:43:34 +0100
Subject: gnu: translate-shell: Update to 0.9.6.11.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/dictionnaries.scm (translate-shell): Update to 0.9.6.11.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/dictionaries.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 37bd4aaf6b..96d496d439 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Pierre-Antoine Rouby 
 ;;; Copyright © 2018 Arun Isaac 
+;;; Copyright © 2019 Pierre Langlois 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -245,7 +246,7 @@ and a Python library.")
 (define-public translate-shell
   (package
     (name "translate-shell")
-    (version "0.9.6.10")
+    (version "0.9.6.11")
     (source
       (origin
         (method git-fetch)
@@ -254,7 +255,7 @@ and a Python library.")
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-         (base32 "1dmh3flldfhnqfay3a6c5hanqcjwrmbly1bq8mlk022qfi1fv33y"))))
+         (base32 "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From e8ded3ee6af0324fbca067511768be1c3bd1ad66 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 12:07:46 +0200
Subject: gnu: linux-libre-headers@5.3: Install.

Upstream has separated building and installing the UAPI headers, and now
requires rsync for the latter.

Follow-up to commit 9e34a5f3b2d37cc8fb9f16620747df41488665be.

* gnuk/packages/linux.scm (make-linux-libre-headers*)[native-inputs]:
Add rsync for version 5.3 and higher.
---
 gnu/packages/linux.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e333135a0f..679d0b00c7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -116,6 +116,7 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages groff)
+  #:use-module (gnu packages rsync)
   #:use-module (gnu packages selinux)
   #:use-module (gnu packages swig)
   #:use-module (guix build-system cmake)
@@ -482,6 +483,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                      ,@(if (version>=? version "4.16")
                            `(("flex" ,flex)
                              ("bison" ,bison))
+                           '())
+                     ,@(if (version>=? version "5.3")
+                           `(("rsync" ,rsync))
                            '())))
     (arguments
      `(#:modules ((guix build gnu-build-system)
-- 
cgit v1.2.3


From ab0ede51c041927a1c35535aec3504f84d7a9751 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Wed, 2 Oct 2019 13:11:51 +0200
Subject: gnu: next: Update to 1.3.3.

* gnu/packages/web-browsers.scm (next-gtk-webkit): Bump version.
(sbcl-next-history-tree): New package.
(sbcl-next-password-manager): New package.
(next)[inputs]: Add cl-ansi-text, cl-prevalence, sbcl-next-history-tree,
sbcl-next-password-manager.
---
 gnu/packages/web-browsers.scm | 44 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 46b5ea7327..ae63ca6cc5 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -367,7 +367,7 @@ driven and does not detract you from your daily work.")
 (define next-gtk-webkit
   (package
     (name "next-gtk-webkit")
-    (version "1.3.2")
+    (version "1.3.3")
     (source
      (origin
        (method git-fetch)
@@ -378,7 +378,7 @@ driven and does not detract you from your daily work.")
              (commit version)))
        (sha256
         (base32
-         "0863p6ch4pdrn6b81cx2abis0ld7r2n6x34v3z0ihj3jlfj21yx4"))
+         "0vxjihldvif147l2kjd83kk1wcs4ixgv1yxjnpn3wgg8306pgnlh"))
        (file-name (git-file-name "next" version))))
     (build-system glib-or-gtk-build-system)
     (arguments
@@ -445,6 +445,40 @@ features for productive professionals.")
        ("prove-asdf" ,sbcl-prove-asdf)))
     (synopsis "Infinitely extensible web-browser (ring)")))
 
+(define sbcl-next-history-tree
+  (package
+    (inherit next-gtk-webkit)
+    (name "sbcl-next-history-tree")
+    (build-system asdf-build-system/sbcl)
+    (arguments
+     `(#:tests? #t
+       #:asd-file "next.asd"
+       #:asd-system-name "next/history-tree"))
+    (native-inputs
+     `(("trivial-features" ,sbcl-trivial-features)
+       ("prove-asdf" ,sbcl-prove-asdf)))
+    (synopsis "Infinitely extensible web-browser (history-tree)")))
+
+(define sbcl-next-password-manager
+  (package
+    (inherit next-gtk-webkit)
+    (name "sbcl-next-password-manager")
+    (build-system asdf-build-system/sbcl)
+    (arguments
+     `(#:tests? #t
+       #:asd-file "next.asd"
+       #:asd-system-name "next/password-manager"))
+    (inputs
+     `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+       ("cl-annot" ,sbcl-cl-annot)
+       ("cl-ppcre" ,sbcl-cl-ppcre)
+       ("str" ,sbcl-cl-str)
+       ("trivial-clipboard" ,sbcl-trivial-clipboard)))
+    (native-inputs
+     `(("trivial-features" ,sbcl-trivial-features)
+       ("prove-asdf" ,sbcl-prove-asdf)))
+    (synopsis "Infinitely extensible web-browser (password manager)")))
+
 (define-public next
   (let ((version (package-version next-gtk-webkit)))
     (package
@@ -509,12 +543,14 @@ features for productive professionals.")
        `(("alexandria" ,sbcl-alexandria)
          ("bordeaux-threads" ,sbcl-bordeaux-threads)
          ("cl-annot" ,sbcl-cl-annot)
+         ("cl-ansi-text" ,sbcl-cl-ansi-text)
          ("cl-css" ,sbcl-cl-css)
          ("cl-hooks" ,sbcl-cl-hooks)
          ("cl-json" ,sbcl-cl-json)
          ("cl-markup" ,sbcl-cl-markup)
          ("cl-ppcre" ,sbcl-cl-ppcre)
          ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
+         ("cl-prevalence" ,sbcl-cl-prevalence)
          ("closer-mop" ,sbcl-closer-mop)
          ("dbus" ,cl-dbus)
          ("dexador" ,sbcl-dexador)
@@ -534,7 +570,9 @@ features for productive professionals.")
          ;; Local deps
          ("next-gtk-webkit" ,next-gtk-webkit)
          ("next-download-manager" ,sbcl-next-download-manager)
-         ("next-ring" ,sbcl-next-ring)))
+         ("next-ring" ,sbcl-next-ring)
+         ("next-history-tree" ,sbcl-next-history-tree)
+         ("next-password-manager" ,sbcl-next-password-manager)))
       (native-inputs
        `(("trivial-features" ,sbcl-trivial-features)
          ("prove-asdf" ,sbcl-prove-asdf)))
-- 
cgit v1.2.3


From 359a57b6e12aac05847c1dbee397a16c7b1d9559 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 14:22:22 +0200
Subject: gnu: alex4: Don't use unstable tarball.

* gnu/packages/games.scm (alex4)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
---
 gnu/packages/games.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 42da7e689a..67395e6e12 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -256,14 +256,16 @@ mouse and joystick control, and original music.")
     (version "1.2-alpha")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/carstene1ns/alex4/archive/"
-                           version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/carstene1ns/alex4.git")
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "0jj1g3v1a6lyfwp5g2ly0n9z65ryqck8jxvzr01kaqjj3lsfkrhg"))))
+        (base32 "104nlhdsv1sg9g08fh5adwazw80400081awy7jsrn842srca0q1f"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f ; no check target
+     `(#:tests? #f                      ; no check target
        #:make-flags
        (list "-Csrc"
              "CC=gcc"
-- 
cgit v1.2.3


From 8ef3f2e3ac54f2c7b41ac76d4e61a16436332d2f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 14:33:59 +0200
Subject: gnu: alex4: Update to 1.2.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/games.scm (alex4): Update to 1.2.1.
[arguments]: Use top-level Makefile.  Drop DATADIR.
Remove ’configure’ phase.
---
 gnu/packages/games.scm | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 67395e6e12..844f9cab68 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -253,7 +253,7 @@ mouse and joystick control, and original music.")
 (define-public alex4
   (package
     (name "alex4")
-    (version "1.2-alpha")
+    (version "1.2.1")
     (source
      (origin
        (method git-fetch)
@@ -262,27 +262,17 @@ mouse and joystick control, and original music.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "104nlhdsv1sg9g08fh5adwazw80400081awy7jsrn842srca0q1f"))))
+        (base32 "098wy72mh4lsvq3gm0rhamjssf9l1hp6hhkpzrv7klpb97cwwc3h"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no check target
        #:make-flags
-       (list "-Csrc"
-             "CC=gcc"
+       (list "CC=gcc"
              "CFLAGS=-D_FILE_OFFSET_BITS=64"
-             (string-append "DATADIR=" (assoc-ref %outputs "out")
-                            "/share/" ,name)
              (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:phases
        (modify-phases %standard-phases
-         (replace 'configure
-           (lambda _
-             (substitute* '("src/main.c"
-                            "src/shooter.c")
-               (("fcos") "fixcos")
-               (("fmul") "fixmul")
-               (("fsin") "fixsin"))
-             #t))
+         (delete 'configure)            ; no configure script
          (add-after 'install 'install-data
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((share (string-append (assoc-ref outputs "out")
-- 
cgit v1.2.3


From 6811256745bb4bbff0a0b12b8bd7513b79ea4d8f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 14:45:15 +0200
Subject: gnu: emacs-relint: Update to 1.11.

* gnu/packages/emacs-xyz.scm (emacs-relint): Update to 1.11.
---
 gnu/packages/emacs-xyz.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 12b37ff8d0..f8aea62f40 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -976,15 +976,14 @@ optional minor mode which can apply this command automatically on save.")
 (define-public emacs-relint
   (package
     (name "emacs-relint")
-    (version "1.10")
+    (version "1.11")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
-             "https://elpa.gnu.org/packages/relint-" version ".el"))
+             "https://elpa.gnu.org/packages/relint-" version ".tar"))
        (sha256
-        (base32
-         "1l0lh4pkksw7brmhhbaikwzs4zkgd2962ks1zy7m262dvkhxjfv8"))))
+        (base32 "0c7d35kp5k11fnyjrq9cg8i2r005gs57pmb3rvpf8ilwv0scn1m7"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-xr" ,emacs-xr)))
     (home-page "https://github.com/mattiase/relint")
-- 
cgit v1.2.3


From 86f2124b0f015e99416e5e6efc15f0ef790eb366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Wed, 2 Oct 2019 12:03:03 +0200
Subject: gnu: dconf-editor: Fix build failure.

Fixes .
Reported by Jack Hill .

* gnu/packages/gnome.scm (dconf-editor)[arguments]: New field.
---
 gnu/packages/gnome.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a5c0ffbf77..d8b73e25d9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6548,6 +6548,17 @@ beautifying border effects.")
         (base32
          "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia"))))
     (build-system meson-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'set-glib-minimum-version
+                    (lambda _
+                      ;; Change the minimum required GLib version so that
+                      ;; 'valac' is passed '--target-glib 2.60.0'; failing to
+                      ;; do that, it complains that "55" is not an even
+                      ;; number.  See .
+                      (substitute* "editor/meson.build"
+                        (("2\\.55\\.1") "2.60.0"))
+                      #t)))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, gio-2.0.
        ("gtk+-bin" ,gtk+ "bin") ; for gtk-update-icon-cache
-- 
cgit v1.2.3


From 4ee948e39be1c783022242735bdb6f7f7da3aebd Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 2 Oct 2019 00:32:23 +0200
Subject: gnu: python-defusedxml: Update to 0.6.0.

* gnu/packages/xml.scm (python-defusedxml): Update to 0.6.0.
---
 gnu/packages/xml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 3603bee4b7..0689c87360 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1235,14 +1235,14 @@ files.  It is designed to be fast and to handle large input files.")
 (define-public python-defusedxml
   (package
     (name "python-defusedxml")
-    (version "0.5.0")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "defusedxml" version))
        (sha256
         (base32
-         "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4"))))
+         "1xbp8fivl3wlbyg2jrvs4lalaqv1xp9a9f29p75wdx2s2d6h717n"))))
     (build-system python-build-system)
     (home-page "https://bitbucket.org/tiran/defusedxml")
     (synopsis "XML bomb protection for Python stdlib modules")
-- 
cgit v1.2.3


From 4cc0b485be8806e7e1b2575cd94645ee2a31e1d4 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 2 Oct 2019 11:51:10 +0200
Subject: gnu: libpcap: Update to 1.9.1.

* gnu/packages/admin.scm (libpcap): Update to 1.9.1.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index bef6dac07c..dcf938bcef 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -851,14 +851,14 @@ tools: server, client, and relay agent.")
 (define-public libpcap
   (package
     (name "libpcap")
-    (version "1.9.0")
+    (version "1.9.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.tcpdump.org/release/libpcap-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf"))))
+                "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("bison" ,bison)
-- 
cgit v1.2.3


From 645d0c92e0961cd0705529c4eeff4e1845170e1b Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 2 Oct 2019 11:51:36 +0200
Subject: gnu: tcpdump: Update to 4.9.3 [security fixes].

This release fixes the following CVEs: CVE-2017-16808, CVE-2018-14468,
CVE-2018-14469, CVE-2018-14470, CVE-2018-14466, CVE-2018-14461,
CVE-2018-14462, CVE-2018-14465, CVE-2018-14881, CVE-2018-14464,
CVE-2018-14463, CVE-2018-14467, CVE-2018-10103, CVE-2018-10105,
CVE-2018-14880, CVE-2018-16451, CVE-2018-14882, CVE-2018-16227,
CVE-2018-16229, CVE-2018-16301, CVE-2018-16230, CVE-2018-16452,
CVE-2018-16300, CVE-2018-16228, CVE-2019-15166, CVE-2019-15167,
CVE-2018-14879.

* gnu/packages/admin.scm (tcpdump): Update to 4.9.3.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index dcf938bcef..b9e1f1b608 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -879,14 +879,14 @@ network statistics collection, security monitoring, network debugging, etc.")
 (define-public tcpdump
   (package
     (name "tcpdump")
-    (version "4.9.2")
+    (version "4.9.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.tcpdump.org/release/tcpdump-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0ygy0layzqaj838r5xd613iraz09wlfgpyh7pc6cwclql8v3b2vr"))))
+                "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c"))))
     (build-system gnu-build-system)
     (inputs `(("libpcap" ,libpcap)
               ("openssl" ,openssl)))
-- 
cgit v1.2.3


From c692c1b7ea05e90a670d4ad00774f6af228cb8bf Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 2 Oct 2019 11:52:04 +0200
Subject: gnu: libcap-ng: Update to 0.7.10.

* gnu/packages/admin.scm (libcap-ng): Update to 0.7.10.
---
 gnu/packages/admin.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index b9e1f1b608..98827ca303 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1723,7 +1723,7 @@ track changes in important system configuration files.")
 (define-public libcap-ng
   (package
     (name "libcap-ng")
-    (version "0.7.9")
+    (version "0.7.10")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1731,7 +1731,7 @@ track changes in important system configuration files.")
                     version ".tar.gz"))
               (sha256
                (base32
-                "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa"))))
+                "1gzzy12agfa9ddipdf72h9y68zqqnvsjjylv4vnq6hj4w2safk58"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From 9383208029b01980cf00f6cf91bf31fa08109744 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 2 Oct 2019 11:52:32 +0200
Subject: gnu: p11-kit: Update to 0.23.18.1.

* gnu/packages/tls.scm (p11-kit): Update to 0.23.18.1.
---
 gnu/packages/tls.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index e8406a8ae8..5d45484915 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -122,7 +122,7 @@ in intelligent transportation networks.")
 (define-public p11-kit
   (package
     (name "p11-kit")
-    (version "0.23.17")
+    (version "0.23.18.1")
     (source
      (origin
       (method url-fetch)
@@ -130,7 +130,7 @@ in intelligent transportation networks.")
                           "download/" version "/p11-kit-" version ".tar.gz"))
       (sha256
        (base32
-        "07kwdlw07jk9833k43kkhv0q9gkll3vmd25wwp68cpy0crfv4isl"))))
+        "0vrwab1082f7l5sbzpb28nrs3q4d2q7wzbi8c977rpah026bvhrl"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From 58da4b0a840d9424f629688257c0dc54ed6d1d3d Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 2 Oct 2019 11:52:52 +0200
Subject: gnu: msmtp: Update to 1.8.6.

* gnu/packages/mail.scm (msmtp): Update to 1.8.6.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 9f0742d736..61d11b7e2c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1151,14 +1151,14 @@ which can add many functionalities to the base client.")
 (define-public msmtp
   (package
     (name "msmtp")
-    (version "1.8.5")
+    (version "1.8.6")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://marlam.de/msmtp/releases/"
                            "/msmtp-" version ".tar.xz"))
        (sha256
-        (base32 "0fczpfxlr62wkr7bwhp24clxg962k5khgz14h818qyy4v77dl4qn"))))
+        (base32 "1qa260xrm0fzlwxpjvgvq39m4dfkskjlyb7m4y2vlr8c8d3z29b6"))))
     (build-system gnu-build-system)
     (inputs
      `(("libsecret" ,libsecret)
-- 
cgit v1.2.3


From 8b0ac06a181d1159b30df70f2df9613d12833b3f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 2 Oct 2019 19:25:01 +0200
Subject: gnu: Add emacs-lsp-ivy.

* gnu/packages/emacs-xyz.scm (emacs-lsp-ivy): New variable.
---
 gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f8aea62f40..848905fed6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16831,6 +16831,33 @@ like @code{company}, @code{flycheck}, and @code{projectile}.")
 and code peeking.")
     (license license:gpl3+)))
 
+(define-public emacs-lsp-ivy
+  (let ((commit "6fd55316dd62d290429c25ea9b0c1f66069b2f37")
+        (revision "1"))
+    (package
+      (name "emacs-lsp-ivy")
+      (version (git-version "0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/emacs-lsp/lsp-ivy.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0hx9rs66ahl2rqgnmyiyrwk12v7iv8c6gnn7b66985mxjqyyh94r"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-ivy" ,emacs-ivy)
+         ("emacs-lsp-mode" ,emacs-lsp-mode)
+         ("emacs-dash" ,emacs-dash)))
+      (home-page "https://github.com/emacs-lsp/lsp-ivy")
+      (synopsis "Provide LSP-enhanced completion for symbols")
+      (description
+       "This package enhances @code{ivy} with completion for symbols from
+workspaces with a LSP-compliant server running.")
+      (license license:gpl3+))))
+
 (define-public emacs-helm-lsp
   (let ((commit "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b")
         (revision "1"))
-- 
cgit v1.2.3


From 9e9f6b377337484ce4a67c2558d2376799de804f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Wed, 2 Oct 2019 19:27:45 +0200
Subject: gnu: emacs-helm-lsp: Fix description.

* gnu/packages/emacs-xyz.scm (emacs-helm-lsp): Fix description.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 848905fed6..44fe73c3ef 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16881,8 +16881,8 @@ workspaces with a LSP-compliant server running.")
       (home-page "https://github.com/emacs-lsp/helm-lsp")
       (synopsis "Provide LSP-enhanced completion for symbols")
       (description
-       "This package provides completion for symbols from workspaces with a
-LSP-compliant server running.")
+       "This package enhances @code{helm} with completion for symbols from
+workspaces with a LSP-compliant server running.")
       (license license:gpl3+))))
 
 (define-public emacs-helm-notmuch
-- 
cgit v1.2.3


From dde9d858181c45dbed09a51145da4e66fc559997 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Wed, 2 Oct 2019 09:07:06 +0300
Subject: gnu: screen: Update to 4.7.0.

* gnu/packages/screen.scm (screen): Update to 4.7.0.
---
 gnu/packages/screen.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 7763354158..b9a0f6a864 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -38,13 +38,13 @@
 (define-public screen
   (package
     (name "screen")
-    (version "4.6.2")
+    (version "4.7.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/screen/screen-"
                                  version ".tar.gz"))
              (sha256
-              (base32 "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v"))))
+              (base32 "1h90bpy2wk304xw367y1zwz0kilrpm6h28nphykx4fvqz8l56xys"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("makeinfo" ,texinfo)))
-- 
cgit v1.2.3


From ecca80e25c76e5076fa02f498038a169f3bbe65a Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Wed, 2 Oct 2019 15:16:32 +0300
Subject: gnu: efl: Update to 1.23.0.

* gnu/packages/enlightenment.scm (efl): Update to 1.23.0.
[outputs]: Remove field.
[build-system]: Switch to meson-build-system.
[native-inputs]: Add check, gettext-minimal.
[inputs]: Remove alsa-lib, ghostscript, libexif, openjpeg-1, printproto,
xinput, xpr, xorgproto. Add ibus. Move mesa to here. Move libjpeg,
libsndfile, libtiff, libwebp, libx11, lz4, pulseaudio ...
[propagated-inputs]: ... to here. Add avahi.
[arguments]: Add custom phase to work around dbus path issues. Adjust
configure-flags for build-system change.
---
 gnu/packages/enlightenment.scm | 113 +++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 2ff37d496f..737b70b8a6 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -29,6 +29,7 @@
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
+  #:use-module (gnu packages avahi)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages code)
@@ -45,6 +46,7 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages ibus)
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
@@ -65,7 +67,7 @@
 (define-public efl
   (package
     (name "efl")
-    (version "1.22.5")
+    (version "1.23.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -73,28 +75,22 @@
                     version ".tar.xz"))
               (sha256
                (base32
-                "1cjk56z0whpzcqwg3xdq23kyp1g83xa67m9dlp7ywmb36bn4ca59"))))
-    (outputs '("out"       ; 53 MB
-               "include")) ; 21 MB
-    (build-system gnu-build-system)
+                "1iawq5k1ggas41h3vrwc0y98hf83vr0vh3phfgw22iij3cb2b5nd"))))
+    (build-system meson-build-system)
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("check" ,check)
+       ("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)))
     (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("curl" ,curl)
-       ("ghostscript" ,ghostscript)
+     `(("curl" ,curl)
        ("giflib" ,giflib)
        ("gstreamer" ,gstreamer)
        ("gst-plugins-base" ,gst-plugins-base)
-       ("libexif" ,libexif)
-       ("libjpeg" ,libjpeg)
+       ("ibus" ,ibus)
+       ("mesa" ,mesa)
        ("libraw" ,libraw)
        ("librsvg" ,librsvg)
-       ("libsndfile" ,libsndfile)
        ("libspectre" ,libspectre)
-       ("libtiff" ,libtiff)
-       ("libwebp" ,libwebp)
-       ("libx11" ,libx11)
        ("libxau" ,libxau)
        ("libxcomposite" ,libxcomposite)
        ("libxcursor" ,libxcursor)
@@ -107,55 +103,56 @@
        ("libxp" ,libxp)
        ("libxrandr" ,libxrandr)
        ("libxrender" ,libxrender)
-       ("libxscrnsaver" ,libxscrnsaver)
+       ("libxss" ,libxscrnsaver)
        ("libxtst" ,libxtst)
-       ("lz4" ,lz4)
-       ("openjpeg" ,openjpeg-1)
        ("poppler" ,poppler)
-       ("printproto" ,printproto)
-       ("pulseaudio" ,pulseaudio)
-       ("wayland-protocols" ,wayland-protocols)
-       ("xinput" ,xinput)
-       ("xpr" ,xpr)
-       ("xorgproto" ,xorgproto)))
+       ("wayland-protocols" ,wayland-protocols)))
     (propagated-inputs
      ;; All these inputs are in package config files in section
      ;; Requires.private.
-     `(("bullet" ,bullet) ; ephysics.pc
-       ("dbus" ,dbus) ; eldbus.pc, elementary.pc, elocation.pc, ethumb_client.pc
-       ("eudev" ,eudev) ; eeze.pc
-       ("fontconfig" ,fontconfig) ; evas.pc, evas-cxx.pc
-       ("freetype" ,freetype) ; evas.pc, evas-cxx.pc
-       ("fribidi" ,fribidi) ; evas.pc, evas-cxx.pc
-       ("glib" ,glib) ; ecore.pc, ecore-cxx.pc
-       ("harfbuzz" ,harfbuzz) ; evas.pc, evas-cxx.pc
-       ("luajit" ,luajit) ; elua.pc, evas.pc, evas-cxx.pc
-       ("libinput" ,libinput-minimal) ; elput.pc
-       ("libpng" ,libpng) ; evas.pc, evas-cxx.pc
-       ("libxkbcommon" ,libxkbcommon) ; ecore-wl2.pc, elementary.pc, elput.pc
-       ("mesa" ,mesa) ; ecore-drm2.pc
-       ("openssl" ,openssl) ; ecore-con.pc, eet.pc, eet-cxx.pc, emile.pc
-       ("util-linux" ,util-linux) ; mount: eeze.pc
-       ("wayland" ,wayland) ; ecore-wl2.pc, elementary.pc
-       ("zlib" ,zlib))) ; eet.pc, eet-cxx.pc, emile.pc
+     `(("avahi" ,avahi)
+       ("bullet" ,bullet)
+       ("dbus" ,dbus)
+       ("eudev" ,eudev)
+       ("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("fribidi" ,fribidi)
+       ("glib" ,glib)
+       ("harfbuzz" ,harfbuzz)
+       ("luajit" ,luajit)
+       ("libinput" ,libinput-minimal)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("libsndfile" ,libsndfile)
+       ("libtiff" ,libtiff)
+       ("libwebp" ,libwebp)
+       ("libx11" ,libx11)
+       ("libxkbcommon" ,libxkbcommon)
+       ("lz4" ,lz4)
+       ("openssl" ,openssl)
+       ("pulseaudio" ,pulseaudio)
+       ("util-linux" ,util-linux)
+       ("wayland" ,wayland)
+       ("zlib" ,zlib)))
     (arguments
-     `(#:configure-flags '("--disable-silent-rules"
-                           "--disable-systemd"
-                           "--with-profile=release"
-                           "--enable-liblz4"
-                           "--enable-xinput22"
-                           "--enable-image-loader-webp"
-                           "--enable-multisense"
+     `(#:configure-flags '("-Dsystemd=false"
+                           "-Dembedded-lz4=false"
+                           "-Devas-loaders-disabler=json"
+                           "-Dbuild-examples=false"
+                           ;(string-append "-Ddictionaries-hyphen-dir="
+                           ;               (assoc-ref %build-inputs "hyphen")
+                           ;               "/share/hyphen")
                            ,@(match (%current-system)
                                ("armhf-linux"
-                                '("--with-opengl=es" "--with-egl"))
+                                '("-opengl=es-egl"))
                                (_
-                                '("--with-opengl=full")))
-                           "--enable-harfbuzz"
+                                '("-Dopengl=full")))
                            ;; for wayland
-                           "--enable-wayland"
-                           "--enable-elput"
-                           "--enable-drm")
+                           "-Dwl-deprecated=true" ; ecore_wayland
+                           "-Ddrm-deprecated=true" ; ecore_drm
+                           "-Dwl=true"
+                           "-Ddrm=true")
+       #:tests? #f ; Many tests fail due to timeouts and network requests.
        #:phases
        (modify-phases %standard-phases
          ;; If we don't hardcode the location of libcurl.so then we
@@ -168,6 +165,14 @@
                  (("libcurl.so.?" libcurl) ; libcurl.so.[45]
                   (string-append lib libcurl)))
                #t)))
+         (add-after 'unpack 'fix-install-paths
+           (lambda _
+             (substitute* "dbus-services/meson.build"
+               (("install_dir.*")
+                "install_dir: join_paths(dir_data, 'dbus-1', 'services'))\n"))
+             (substitute* "src/tests/elementary/meson.build"
+               (("dir_data") "meson.source_root(), 'test-output'"))
+             #t))
          (add-after 'unpack 'set-home-directory
            ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2
            (lambda _ (setenv "HOME" "/tmp") #t)))))
-- 
cgit v1.2.3


From 35d62990b5956628410a9b1bb1496eb6acf3770b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Wed, 2 Oct 2019 15:48:50 +0300
Subject: gnu: evisum: Update to 0.2.6.

* gnu/packages/enlightenment.scm (evisum): Update to 0.2.6.
---
 gnu/packages/enlightenment.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 737b70b8a6..c0e5ffc5df 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -536,7 +536,7 @@ directories.
 (define-public evisum
   (package
     (name "evisum")
-    (version "0.2.3")
+    (version "0.2.6")
     (source
       (origin
         (method url-fetch)
@@ -544,7 +544,7 @@ directories.
                             "evisum/evisum-" version ".tar.xz"))
         (sha256
          (base32
-          "1lj62n896kablsl687c66yxrwajrh6ralb3y6nmcqv34pglnigca"))))
+          "1rg3kri6j8nmab0kdljnmcc096c8ibgwzvbhqr0b25xpmrq8bcac"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f   ; no tests
-- 
cgit v1.2.3


From 6a3823de895b4bf36af65e08b128a9c103ca337f Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Wed, 2 Oct 2019 16:54:43 +0300
Subject: gnu: enlightenment: Update to 0.23.1.

* gnu/packages/enlightenment.scm (enlightenment): Update to 0.23.1.
---
 gnu/packages/enlightenment.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index c0e5ffc5df..f3434c654d 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -278,7 +278,7 @@ Libraries with some extra bells and whistles.")
 (define-public enlightenment
   (package
     (name "enlightenment")
-    (version "0.23.0")
+    (version "0.23.1")
     (source (origin
               (method url-fetch)
               (uri
@@ -286,7 +286,7 @@ Libraries with some extra bells and whistles.")
                               "enlightenment/enlightenment-" version ".tar.xz"))
               (sha256
                (base32
-                "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq"))
+                "0d1cyl07w9pvi2pf029kablazks2q9aislzl46b6fq5m1465jc75"))
               (patches (search-patches "enlightenment-fix-setuid-path.patch"))))
     (build-system meson-build-system)
     (arguments
-- 
cgit v1.2.3


From 8ce47c20209ad9b87e1b7595556f22b2b5e2b8a2 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Wed, 2 Oct 2019 18:53:20 +0300
Subject: gnu: efl: Build with elogind support.

* gnu/packages/enlightenment.scm (efl)[arguments]: Add configure flag to
enable support for elogind.
[propagated-inputs]: Add elogind.
---
 gnu/packages/enlightenment.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index f3434c654d..8384f4c0ed 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -113,6 +113,7 @@
      `(("avahi" ,avahi)
        ("bullet" ,bullet)
        ("dbus" ,dbus)
+       ("elogind" ,elogind)
        ("eudev" ,eudev)
        ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
@@ -142,6 +143,8 @@
                            ;(string-append "-Ddictionaries-hyphen-dir="
                            ;               (assoc-ref %build-inputs "hyphen")
                            ;               "/share/hyphen")
+                           "-Delogind=true"
+                           "-Dnetwork-backend=connman"
                            ,@(match (%current-system)
                                ("armhf-linux"
                                 '("-opengl=es-egl"))
-- 
cgit v1.2.3


From 2026204a13515aaa9b7814f9a6f0a60b65493bd1 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Wed, 2 Oct 2019 21:48:02 +0200
Subject: gnu: slime-swank: Update to 2.24 and use asdf-build-system/source.

* gnu/packages/lisp.scm (sbcl-slime-swank): Deprecate in favour of cl-slime-swank.
(cl-slime-swank): New package.
(sbcl-mgl-pax): Use cl-slime-swank.

* gnu/packages/web-browsers.scm (next): Use cl-slime-swank.
---
 gnu/packages/lisp.scm         | 46 ++++++++++++++++---------------------------
 gnu/packages/web-browsers.scm |  2 +-
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index ba009bb7a6..2939fdc4ed 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -2327,42 +2327,27 @@ writing code that contains string literals that contain code themselves.")
 (define-public ecl-pythonic-string-reader
   (sbcl-package->ecl-package sbcl-pythonic-string-reader))
 
-(define-public sbcl-slime-swank
+;; SLIME does not have a ASDF system definition to build all of Swank.  As a
+;; result, the asdf-build-system/sbcl will produce an almost empty package.
+;; Some work was done to fix this at
+;; https://github.com/sionescu/slime/tree/swank-asdf but it was never merged
+;; and is now lagging behind.  Building SBCL fasls might not be worth the
+;; hassle, so let's just ship the source then.
+(define-public cl-slime-swank
   (package
-    (name "sbcl-slime-swank")
-    (version "2.22")
+    (name "cl-slime-swank")
+    (version "2.24")
     (source
      (origin
        (file-name (string-append name "-" version ".tar.gz"))
        (method git-fetch)
        (uri (git-reference
-             ;; (url "https://github.com/slime/slime/")
-             ;; (commit "841f61467c03dea9f38ff9d5af0e21a8aa29e8f7")
-             ;; REVIEW: Do we need sionescu's patch to package SWANK?
-             (url "https://github.com/sionescu/slime/")
-             ;; (commit "swank-asdf")
-             (commit "2f7c3fcb3ac7d50d844d5c6ca0e89b52a45e1d3a")))
+             (url "https://github.com/slime/slime/")
+             (commit (string-append "v" version))))
        (sha256
         (base32
-         ;; "065bc4y6iskazdfwlhgcjlzg9bi2hyjbhmyjw3461506pgkj08vi"
-         "0pkmg94wn4ii1zhlrncn44mdc5i6c5v0i9gbldx4dwl2yy7ibz5c"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (substitute* "contrib/swank-listener-hooks.lisp"
-             ((":compile-toplevel :load-toplevel ") ""))
-           (substitute* "contrib/swank-presentations.lisp"
-             ((":compile-toplevel :load-toplevel ") ""))
-           (substitute* "swank.asd"
-             ((":file \"packages\".*" all)
-              (string-append all "(:file \"swank-loader-asdf\")\n")))
-           (substitute* "swank-loader-asdf.lisp"
-             ((":common-lisp" all) (string-append all " #:asdf")))
-           #t))))
-    (build-system asdf-build-system/sbcl)
-    (arguments
-     `(#:asd-file "swank.asd"
-       #:asd-system-name "swank"))
+         "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh"))))
+    (build-system asdf-build-system/source)
     (home-page "https://github.com/slime/slime")
     (synopsis "Common Lisp Swank server")
     (description
@@ -2371,6 +2356,9 @@ processes that doesn't run under Emacs.  Lisp processes created by
 @command{M-x slime} automatically start the server.")
     (license (list license:gpl2+ license:public-domain))))
 
+(define-public sbcl-slime-swank
+  (deprecated-package "sbcl-slime-swank" cl-slime-swank))
+
 (define-public sbcl-mgl-pax
   (let ((commit "818448418d6b9de74620f606f5b23033c6082769"))
     (package
@@ -2395,7 +2383,7 @@ processes that doesn't run under Emacs.  Lisp processes created by
          ("ironclad" ,sbcl-ironclad)
          ("named-readtables" ,sbcl-named-readtables)
          ("pythonic-string-reader" ,sbcl-pythonic-string-reader)
-         ("swank" ,sbcl-slime-swank)))
+         ("swank" ,cl-slime-swank)))
       (synopsis "Exploratory programming environment and documentation generator")
       (description
        "PAX provides an extremely poor man's Explorable Programming
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index ae63ca6cc5..9010c26897 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -563,7 +563,7 @@ features for productive professionals.")
          ("quri" ,sbcl-quri)
          ("sqlite" ,sbcl-cl-sqlite)
          ("str" ,sbcl-cl-str)
-         ("swank" ,sbcl-slime-swank)
+         ("swank" ,cl-slime-swank)
          ("trivia" ,sbcl-trivia)
          ("trivial-clipboard" ,sbcl-trivial-clipboard)
          ("unix-opts" ,sbcl-unix-opts)
-- 
cgit v1.2.3


From 60d2aaa567cd6aa79d25e4ea0878a76d87216fde Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Thu, 3 Oct 2019 00:36:35 +0200
Subject: gnu: jumpnbump: Update to 1.61.

* gnu/packages/games.scm (jumpnbump): Update to 1.61.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 844f9cab68..4b14fce771 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7117,7 +7117,7 @@ simulator.")
 (define-public jumpnbump
   (package
     (name "jumpnbump")
-    (version "1.60")
+    (version "1.61")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -7126,7 +7126,7 @@ simulator.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0gwi58ck4magvdim8wmxdqnsi0fqdpvqia9kcc7q73nqf34jjz3v"))))
+                "12lwl5sl5n009nb83r8l4lakb9286csqdf1ynpmwwydy17giqsdp"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
-- 
cgit v1.2.3


From e5bb683aebaf9fbe82566f1c0a1a5511dd1579fe Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Thu, 3 Oct 2019 00:38:45 +0200
Subject: gnu: grammalecte: Update to 1.5.0.

* gnu/packages/dictionaries.scm (grammalecte): Update to 1.5.0.
---
 gnu/packages/dictionaries.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 37bd4aaf6b..d857b9b23c 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -218,7 +218,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
 (define-public grammalecte
   (package
     (name "grammalecte")
-    (version "1.4.0")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch/zipbomb)
@@ -226,7 +226,7 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
                            "Grammalecte-fr-v" version ".zip"))
        (sha256
         (base32
-         "0k30b9kcczsadjjgwja03rkm11cpcc1xi6w8l6k0qfbjfpkhsh66"))))
+         "0byh578apbyq2jdpgmbaw01izlkyw2h5nsr28az44rvaqrsndy0z"))))
     (build-system python-build-system)
     (home-page "https://grammalecte.net")
     (synopsis "French spelling and grammar checker")
-- 
cgit v1.2.3


From dbd634b0fb9c86c1488abb9e924629a68dc4c394 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Thu, 3 Oct 2019 00:43:56 +0200
Subject: gnu: asymptote: Update to 2.55.

* gnu/packages/plotutils.scm (asymptote): Update to 2.55.
---
 gnu/packages/plotutils.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 43bed8c315..a96b2eafa1 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -180,14 +180,14 @@ colors, styles, options and details.")
 (define-public asymptote
   (package
     (name "asymptote")
-    (version "2.53")
+    (version "2.55")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/asymptote/"
                                   version "/asymptote-" version ".src.tgz"))
               (sha256
                (base32
-                "0ysj6b3ffifbraflkixh19hmdh3qjij26wyj4z66085qw17v7qkw"))))
+                "07704k1p9bzchv7r8x6sj22gcphdyjmj6caa3y83r7gk0r9xi56c"))))
     (build-system gnu-build-system)
     ;; Note: The 'asy' binary retains a reference to docdir for use with its
     ;; "help" command in interactive mode, so adding a "doc" output is not
-- 
cgit v1.2.3


From 7dc1e65fbe0d3db0f9f8221f1be05276084c2407 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Thu, 3 Oct 2019 01:05:55 +0200
Subject: gnu: wireshark: Update to 3.0.5.

* gnu/packages/networking.scm (wireshark): Update to 3.0.5.
---
 gnu/packages/networking.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 07b056adab..c750f691cc 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -595,14 +595,14 @@ of the same name.")
 (define-public wireshark
   (package
     (name "wireshark")
-    (version "3.0.3")
+    (version "3.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.wireshark.org/download/src/wireshark-"
                            version ".tar.xz"))
        (sha256
-        (base32 "0711jilp9sbgi46d105m3galw8n4wk5yncawi08031qxg2f754mg"))))
+        (base32 "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 2b2f7e5d8cd154c8bbf8d531d2edd6801956d36d Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Thu, 3 Oct 2019 01:09:32 +0200
Subject: gnu: rclone: Update to 1.49.4.

* gnu/packages/sync.scm (rclone): Update to 1.49.4.
---
 gnu/packages/sync.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 7a85b6ce9e..b3305be6ba 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -264,14 +264,14 @@ over the Internet in an HTTP and CDN friendly way;
 (define-public rclone
   (package
     (name "rclone")
-    (version "1.49.3")
+    (version "1.49.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/rclone/rclone/releases/download/"
                            "v" version "/rclone-v" version ".tar.gz"))
        (sha256
-        (base32 "04blngspm2hzi6d37bd3v19lpcvq0wlk38a9q0a4diwfwp2ab20n"))))
+        (base32 "1bs7b3iy39igli1jqrgjzh32zzzhp1yj8rybsx8i34p9wj2zq2h7"))))
     ;; FIXME: Rclone bundles some libraries Guix already provides.  Need to
     ;; un-bundle them.
     (build-system go-build-system)
-- 
cgit v1.2.3


From cbc8c658d6a6c0d2ff76644060145bafa4e72c89 Mon Sep 17 00:00:00 2001
From: Kei Kebreau 
Date: Fri, 27 Sep 2019 20:37:47 -0400
Subject: gnu: gnucash: Update to 3.7.

* gnu/packages/gnucash.scm (gnucash): Update to 3.7.
[arguments]: Remove "disable-stress-options-test" phase.
(gnucash-docs): Update to 3.7.
---
 gnu/packages/gnucash.scm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index 2ed1a890f7..de916a8829 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -54,7 +54,7 @@
   ;; directory.
   (package
     (name "gnucash")
-    (version "3.5")
+    (version "3.7")
     (source
      (origin
        (method url-fetch)
@@ -62,7 +62,7 @@
                            version "/gnucash-" version ".tar.bz2"))
        (sha256
         (base32
-         "0ibp7g6aknvnkwkin97kv04ipksy3l18dsz9qysjb7h2nr8hnvbp"))))
+         "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb"))))
     (build-system cmake-build-system)
     (inputs
      `(("guile" ,guile-2.2)
@@ -125,13 +125,6 @@
              (substitute* "libgnucash/scm/price-quotes.scm"
                (("\"perl\" \"-w\" ") ""))
              #t))
-         ;; The test-stress-options unit test is known to fail, so we disable
-         ;; it (see: https://bugs.gnucash.org/show_bug.cgi?id=796877).
-         (add-after 'unpack 'disable-stress-options-test
-           (lambda _
-             (substitute* "gnucash/report/standard-reports/test/CMakeLists.txt"
-               (("test-stress-options.scm") ""))
-             #t))
          ;; The qof test requires the en_US, en_GB, and fr_FR locales.
          (add-before 'check 'install-locales
            (lambda _
@@ -207,7 +200,7 @@ installed as well as Yelp, the Gnome help browser.")
                              version "/gnucash-docs-" version revision ".tar.gz"))
          (sha256
           (base32
-           "0gjndyms413vilf5nqh39frs1691sxib8l7y9mbvcyirj1f8285k"))))
+           "1h4hm58ikffbhplx4gm8pzm9blfwqa1sz8yc2fqi21vs5v0ijf9r"))))
       (build-system gnu-build-system)
       ;; These are native-inputs because they are only required for building the
       ;; documentation.
-- 
cgit v1.2.3


From ccbc1c5eb2f3cc1979902b6bfd3e7b31aa66e661 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Thu, 3 Oct 2019 12:01:27 +0200
Subject: gnu: mesa: Disable faulty test on i686 also when cross-compiling.

* gnu/packages/gl.scm (mesa)[arguments]: Fix 'patch-create_test_cases phase
  for cross-compilation.
---
 gnu/packages/gl.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index bfa80b1e13..ec3a5d8cee 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -342,7 +342,8 @@ also known as DXTn or DXTC) for Mesa.")
              (substitute* "src/intel/genxml/gen_pack_header.py"
                (("/usr/bin/env python2") (which "python")))
              #t))
-         ,@(if (string-prefix? "i686" (%current-system))
+         ,@(if (string-prefix? "i686" (or (%current-target-system)
+                                          (%current-system)))
                ;; Disable new test from Mesa 19 that fails on i686.  Upstream
                ;; report: .
                `((add-after 'unpack 'disable-failing-test
-- 
cgit v1.2.3


From 97b44f5ea358ab60803aee8efabb90226bd79abe Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 16:13:21 +0200
Subject: gnu: r-sjplot: Update to 2.7.2.

* gnu/packages/cran.scm (r-sjplot): Update to 2.7.2.
---
 gnu/packages/cran.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3a9a605efe..a14a361933 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2016, 2017 Ben Woodcroft 
 ;;; Copyright © 2017, 2018 Roel Janssen 
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Raoul Bonnal 
 ;;; Copyright © 2018 Vijayalakshmi Vedantham 
 ;;; Copyright © 2018 Sahithi Yarlagadda 
@@ -8301,14 +8301,13 @@ results using @code{ggplot2}.")
 (define-public r-sjplot
   (package
     (name "r-sjplot")
-    (version "2.7.1")
+    (version "2.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sjPlot" version))
        (sha256
-        (base32
-         "14shypabpahf68hd66rb1dpqhiyl3i0yx1yc85wamdvljh9fdymb"))))
+        (base32 "1kx1qqgp4fhwwwpqn9mv8m1pnpjxfs7ww36ns7j1ja4a7ydwn2hp"))))
     (properties `((upstream-name . "sjPlot")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 908497b46bc987edf83f391e7b14e532ff5456b5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 16:34:59 +0200
Subject: gnu: r-gdal: Update to 1.4-6.

* gnu/packages/cran.scm (r-gdal): Update to 1.4-6.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a14a361933..e36d2af2e3 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15528,14 +15528,13 @@ effect size.")
 (define-public r-rgdal
   (package
     (name "r-rgdal")
-    (version "1.4-4")
+    (version "1.4-6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rgdal" version))
        (sha256
-        (base32
-         "1my56hdc9x40ynxx1qwqwqxjvjxybmm00w4xg5gi8zgj19pffci5"))))
+        (base32 "0lj1dax56dxxsj1hindxcvgz169p9dxd0y4wjypbyr01nja8rz4d"))))
     (properties `((upstream-name . "rgdal")))
     (build-system r-build-system)
     (inputs
-- 
cgit v1.2.3


From bc11837ceb48aa9a5cbd9d10b1664259bfba3235 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 17:16:23 +0200
Subject: gnu: r-globaloptions: Update to 0.1.1.

* gnu/packages/cran.scm (r-globaloptions): Update to 0.1.1.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e36d2af2e3..2f6c5a64e1 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1733,14 +1733,13 @@ ellipses, circles, cylinders, arrows, ...")
 (define-public r-globaloptions
   (package
     (name "r-globaloptions")
-    (version "0.1.0")
+    (version "0.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "GlobalOptions" version))
        (sha256
-        (base32
-         "1wlyqz1yhmhjwslrd7q69jbd9vsbjkjfc01g60kl3cdpyr8hlyjn"))))
+        (base32 "0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2"))))
     (properties `((upstream-name . "GlobalOptions")))
     (build-system r-build-system)
     (home-page "https://github.com/jokergoo/GlobalOptions")
-- 
cgit v1.2.3


From 4c9a3173d36f64f90ca9fc7091cc6e8448db5b01 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 20:36:56 +0200
Subject: gnu: r-pls: Update to 2.7-2.

* gnu/packages/cran.scm (r-pls): Update to 2.7-2.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2f6c5a64e1..bb495da03a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1492,14 +1492,13 @@ error stream.")
 (define-public r-pls
   (package
     (name "r-pls")
-    (version "2.7-1")
+    (version "2.7-2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pls" version))
        (sha256
-        (base32
-         "0jw3zl5z06023zxr74phnvwax8m3i4a4i6lsqiq6j15aq9zq3zgq"))))
+        (base32 "121byimd6bg7jbrq5wz5fpi0vxq0vh8g724vkhnjzszbvcv1xsb7"))))
     (build-system r-build-system)
     (home-page "http://mevik.net/work/software/pls.html")
     (synopsis "Partial Least Squares and Principal Component Regression")
-- 
cgit v1.2.3


From 934f7e31d69536b0b2c99e93f5e63fb802687fe8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Wed, 2 Oct 2019 20:37:04 +0200
Subject: gnu: r-calibrate: Update to 1.7.5.

* gnu/packages/cran.scm (r-calibrate): Update to 1.7.5.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bb495da03a..5a0cc81f61 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1692,14 +1692,13 @@ is provided.")
 (define-public r-calibrate
   (package
     (name "r-calibrate")
-    (version "1.7.2")
+    (version "1.7.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "calibrate" version))
        (sha256
-        (base32
-         "010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"))))
+        (base32 "1s423nr176l2sc66wp7hzgqkv7c2bq8d2bjrrvrrm5qa9y3zdx1k"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-mass" ,r-mass)))
-- 
cgit v1.2.3


From 9bcd8b68ca766fde04b27cb700b44f9a9e8b8ca4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 12:52:23 +0200
Subject: gnu: r-rvcheck: Update to 0.1.5.

* gnu/packages/cran.scm (r-rvcheck): Update to 0.1.5.
[propagated-inputs]: Add r-biocmanager.
---
 gnu/packages/cran.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5a0cc81f61..6450faf6b6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9574,17 +9574,17 @@ manipulate tree data.")
 (define-public r-rvcheck
   (package
     (name "r-rvcheck")
-    (version "0.1.3")
+    (version "0.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rvcheck" version))
        (sha256
-        (base32
-         "1i2g6gyiqyd1pn6y0h6vmlcmg1qb5pv7rym8mkw8jnyc3in9hn8b"))))
+        (base32 "15222q3sglq0mad5q806p99fhrb96qizmpqw35fa1rb148f95paf"))))
     (build-system r-build-system)
     (propagated-inputs
-     `(("r-rlang" ,r-rlang)))
+     `(("r-biocmanager" ,r-biocmanager)
+       ("r-rlang" ,r-rlang)))
     (home-page "https://cran.r-project.org/web/packages/rvcheck")
     (synopsis "R package version check")
     (description
-- 
cgit v1.2.3


From dcb45ce5764364934610c2e57d2d8cdcf19de839 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 12:58:31 +0200
Subject: gnu: r-bookdown: Update to 0.14.

* gnu/packages/cran.scm (r-bookdown): Update to 0.14.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 6450faf6b6..bacec4544a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13315,13 +13315,13 @@ SELECT or UPDATE queries to an end-point.")
 (define-public r-bookdown
   (package
     (name "r-bookdown")
-    (version "0.13")
+    (version "0.14")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "bookdown" version))
               (sha256
                (base32
-                "15r9scgnq68hmfcfxvjk286hpbr825bib1d2kgh0lv3dgz2i2bg1"))))
+                "1jiq2d292y0l3f4npyfzfpnmb0sqxsl212kkjfbjg5301h0na762"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-htmltools" ,r-htmltools)
-- 
cgit v1.2.3


From afbc3a87587449a6cccb0cee9fd3902a53850393 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 13:00:42 +0200
Subject: gnu: r-glasso: Update to 1.11.

* gnu/packages/cran.scm (r-glasso): Update to 1.11.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bacec4544a..43939c34f0 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15061,14 +15061,13 @@ customize styles using a readable syntax.")
 (define-public r-glasso
   (package
     (name "r-glasso")
-    (version "1.10")
+    (version "1.11")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "glasso" version))
        (sha256
-        (base32
-         "0nshpx14v2yny7lr8ll6nnz71n0f02sddh2c2dglfprbk89p9yp6"))))
+        (base32 "02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"))))
     (build-system r-build-system)
     (native-inputs `(("gfortran" ,gfortran)))
     (home-page "http://www-stat.stanford.edu/~tibs/glasso")
-- 
cgit v1.2.3


From 322f4657510ccc61a446a6d3db782e50f02a078e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 13:02:54 +0200
Subject: gnu: r-rmarkdown: Update to 1.16.

* gnu/packages/statistics.scm (r-rmarkdown): Update to 1.16.
---
 gnu/packages/statistics.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index e4a4817327..0e0b6ca11e 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2706,14 +2706,13 @@ certain criterion, e.g., it contains a certain regular file.")
 (define-public r-rmarkdown
   (package
     (name "r-rmarkdown")
-    (version "1.15")
+    (version "1.16")
     (source
       (origin
         (method url-fetch)
         (uri (cran-uri "rmarkdown" version))
         (sha256
-          (base32
-            "0fkfzxkvakc6bb1s2lx7sxmnfff8q1m9isihynhiyqh4x8yikcmw"))))
+          (base32 "1p11g9lma604ndrhvyvriqxxp91lardc543nmvmr49n1m7309qvz"))))
     (properties `((upstream-name . "rmarkdown")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 3757f5cbc1f5f5b7d49bf8555c0e3bc37f9ae310 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 13:03:30 +0200
Subject: gnu: r-rmarkdown: Use HTTPS home page.

* gnu/packages/statistics.scm (r-rmarkdown)[home-page]: Use HTTPS.
---
 gnu/packages/statistics.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0e0b6ca11e..668372ca87 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2727,7 +2727,7 @@ certain criterion, e.g., it contains a certain regular file.")
        ("r-xfun" ,r-xfun)
        ("r-yaml" ,r-yaml)
        ("ghc-pandoc" ,ghc-pandoc)))
-    (home-page "http://rmarkdown.rstudio.com")
+    (home-page "https://rmarkdown.rstudio.com")
     (synopsis "Convert R Markdown documents into a variety of formats")
     (description
      "This package provides tools to convert R Markdown documents into a
-- 
cgit v1.2.3


From 5767547e7351c761d40bc0af739fcb787e74c16e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 15:09:38 +0200
Subject: gnu: rcas-web: Fix build with RCAS > 1.3.x.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/bioinformatics.scm (rcas-web)[arguments]: Add ‘find-RCAS’ phase.
---
 gnu/packages/bioinformatics.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 6d36bb73ba..5ec600598b 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -8418,6 +8418,13 @@ library implementing most of the pipeline's features.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-before 'configure 'find-RCAS
+           ;; The configure script can't find non-1.3.x versions of RCAS because
+           ;; its R expression ‘1.10.1 >= 1.3.4’ evaluates to false.
+           (lambda _
+             (substitute* "configure"
+               (("1\\.3\\.4") "0.0.0"))
+             #t))
          (add-after 'install 'wrap-executable
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-- 
cgit v1.2.3


From 7e09914117845de09b70111c4410fd578d403ed8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 15:10:05 +0200
Subject: gnu: r-xfun: Update to 0.10.

* gnu/packages/cran.scm (r-xfun): Update to 0.10.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 43939c34f0..95af508b2c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3900,14 +3900,13 @@ iVAT).")
 (define-public r-xfun
   (package
     (name "r-xfun")
-    (version "0.9")
+    (version "0.10")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "xfun" version))
        (sha256
-        (base32
-         "1c3wmy6s4ck821mwl7i2g8cxd31g30llbpivbgq21g1rxs4zwlyl"))))
+        (base32 "065ygh046ah43p5aqyrkv2vkxcnvnb4j7blfdygysg6hmqzp4pbv"))))
     (build-system r-build-system)
     (home-page "https://github.com/yihui/xfun")
     (synopsis "Miscellaneous functions")
-- 
cgit v1.2.3


From 9a68b89e8ab47b6e3297dc82bde576f4c70a6a2a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Thu, 3 Oct 2019 15:59:47 +0200
Subject: gnu: linux-libre: Update to 5.3.

* gnu/packages/linux.scm (linux-libre-version)
(linux-libre-pristine-source, linux-libre-source, linux-libre):
Assign -5.3 values.
---
 gnu/packages/linux.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 679d0b00c7..71991c8eec 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -789,17 +789,17 @@ It has been modified to remove all non-free binary blobs.")
                      '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")
                      #:configuration-file kernel-config))
 
+(define-public linux-libre-version         linux-libre-5.3-version)
+(define-public linux-libre-pristine-source linux-libre-5.3-pristine-source)
+(define-public linux-libre-source          linux-libre-5.3-source)
+(define-public linux-libre                 linux-libre-5.3)
+
 (define-public linux-libre-5.2
   (make-linux-libre* linux-libre-5.2-version
                      linux-libre-5.2-source
                      '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux")
                      #:configuration-file kernel-config))
 
-(define-public linux-libre-version         linux-libre-5.2-version)
-(define-public linux-libre-pristine-source linux-libre-5.2-pristine-source)
-(define-public linux-libre-source          linux-libre-5.2-source)
-(define-public linux-libre                 linux-libre-5.2)
-
 (define-public linux-libre-4.19
   (make-linux-libre* linux-libre-4.19-version
                      linux-libre-4.19-source
-- 
cgit v1.2.3


From aace6f6dba3a0e7dd46146f5c7947b11e1076e5d Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 3 Oct 2019 19:28:56 +0300
Subject: gnu: mysql: Update to 5.7.27.

* gnu/packages/databases.scm (mysql): Update to 5.7.27.
[native-inputs]: Add pkg-config.
[inputs]: Add libtirpc, rpcsvc-proto.
---
 gnu/packages/databases.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9cc424573c..7960b7087a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -84,6 +84,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages man)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages parallel)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
@@ -544,7 +545,7 @@ RDBMS systems (which are deep in functionality).")
 (define-public mysql
   (package
     (name "mysql")
-    (version "5.7.23")
+    (version "5.7.27")
     (source (origin
              (method url-fetch)
              (uri (list (string-append
@@ -556,7 +557,7 @@ RDBMS systems (which are deep in functionality).")
                           name "-" version ".tar.gz")))
              (sha256
               (base32
-               "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"))))
+               "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
@@ -593,12 +594,15 @@ RDBMS systems (which are deep in functionality).")
                        #t))))))
     (native-inputs
      `(("bison" ,bison)
-       ("perl" ,perl)))
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
     (inputs
      `(("boost" ,boost-for-mysql)
        ("libaio" ,libaio)
+       ("libtirpc" ,libtirpc)
        ("ncurses" ,ncurses)
        ("openssl" ,openssl)
+       ("rpcsvc-proto" ,rpcsvc-proto) ; rpcgen
        ("zlib" ,zlib)))
     (home-page "https://www.mysql.com/")
     (synopsis "Fast, easy to use, and popular database")
-- 
cgit v1.2.3


From 5a02f8e3842c19d28f39e5b47d804ef70e1b3160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 3 Oct 2019 22:19:11 +0200
Subject: environment: '--container' honors '--preserve'.

* guix/scripts/environment.scm (launch-environment/container): Add
 #:white-list parameter and  honor it.
(guix-environment): Pass #:white-list to 'launch-environment/container'.
* tests/guix-environment-container.sh: Add test.
---
 guix/scripts/environment.scm        | 19 +++++++++++++++++--
 tests/guix-environment-container.sh |  5 +++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 535f181bfd..4a51654ce6 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -452,7 +452,7 @@ regexps in WHITE-LIST."
 
 (define* (launch-environment/container #:key command bash user user-mappings
                                        profile manifest link-profile? network?
-                                       map-cwd?)
+                                       map-cwd? (white-list '()))
   "Run COMMAND within a container that features the software in PROFILE.
 Environment variables are set according to the search paths of MANIFEST.
 The global shell is BASH, a file name for a GNU Bash binary in the
@@ -461,7 +461,10 @@ USER-MAPPINGS, a list of file system mappings, contains the user-specified
 host file systems to mount inside the container.  If USER is not #f, each
 target of USER-MAPPINGS will be re-written relative to '/home/USER', and USER
 will be used for the passwd entry.  LINK-PROFILE? creates a symbolic link from
-~/.guix-profile to the environment profile."
+~/.guix-profile to the environment profile.
+
+Preserve environment variables whose name matches the one of the regexps in
+WHILE-LIST."
   (define (optional-mapping->fs mapping)
     (and (file-exists? (file-system-mapping-source mapping))
          (file-system-mapping->bind-mount mapping)))
@@ -487,6 +490,11 @@ will be used for the passwd entry.  LINK-PROFILE? creates a symbolic link from
                             (group-entry (gid 65534) ;the overflow GID
                                          (name "overflow"))))
             (home-dir (password-entry-directory passwd))
+            (environ  (filter (match-lambda
+                                ((variable . value)
+                                 (find (cut regexp-exec <> variable)
+                                       white-list)))
+                              (get-environment-variables)))
             ;; Bind-mount all requisite store items, user-specified mappings,
             ;; /bin/sh, the current working directory, and possibly networking
             ;; configuration files within the container.
@@ -555,6 +563,12 @@ will be used for the passwd entry.  LINK-PROFILE? creates a symbolic link from
                        (override-user-dir user home cwd)
                        home-dir))
 
+            ;; Set environment variables that match WHITE-LIST.
+            (for-each (match-lambda
+                        ((variable . value)
+                         (setenv variable value)))
+                      environ)
+
             (primitive-exit/status
              ;; A container's environment is already purified, so no need to
              ;; request it be purified again.
@@ -759,6 +773,7 @@ message if any test fails."
                                                     #:user-mappings mappings
                                                     #:profile profile
                                                     #:manifest manifest
+                                                    #:white-list white-list
                                                     #:link-profile? link-prof?
                                                     #:network? network?
                                                     #:map-cwd? (not no-cwd?))))
diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh
index 32a5ba1f97..d313f2e734 100644
--- a/tests/guix-environment-container.sh
+++ b/tests/guix-environment-container.sh
@@ -44,6 +44,11 @@ else
     test $? = 42
 fi
 
+# Make sure '--preserve' is honored.
+result="`FOOBAR=42; export FOOBAR; guix environment -C --ad-hoc --bootstrap \
+   guile-bootstrap -E ^FOO -- guile -c '(display (getenv \"FOOBAR\"))'`"
+test "$result" = "42"
+
 # By default, the UID inside the container should be the same as outside.
 uid="`id -u`"
 inner_uid="`guix environment -C --ad-hoc --bootstrap guile-bootstrap \
-- 
cgit v1.2.3


From cdf9811d24b9c857cb79e0ddd38181862ec34bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Thu, 3 Oct 2019 22:54:28 +0200
Subject: gexp: 'load-path-expression' produces an expression that deletes
 duplicates.

Fixes .

"herd eval root '(length %load-path)'" on a freshly-booted bare-bones
system now returns 8 instead of 119 before.

* guix/gexp.scm (load-path-expression): Rewrite expression to that it
deletes duplicates.
---
 guix/gexp.scm | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index e788fc5981..26881ce16c 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1527,24 +1527,37 @@ are searched for in PATH.  Return #f when MODULES and EXTENSIONS are empty."
                                                       #:module-path path
                                                       #:system system
                                                       #:target target)))
-        (return (gexp (eval-when (expand load eval)
-                        (set! %load-path
-                          (cons (ungexp modules)
-                                (append (map (lambda (extension)
-                                               (string-append extension
-                                                              "/share/guile/site/"
-                                                              (effective-version)))
-                                             '((ungexp-native-splicing extensions)))
-                                        %load-path)))
-                        (set! %load-compiled-path
-                          (cons (ungexp compiled)
-                                (append (map (lambda (extension)
-                                               (string-append extension
-                                                              "/lib/guile/"
-                                                              (effective-version)
-                                                              "/site-ccache"))
-                                             '((ungexp-native-splicing extensions)))
-                                        %load-compiled-path)))))))))
+        (return
+         (gexp (eval-when (expand load eval)
+                 ;; Augment the load paths and delete duplicates.  Do that
+                 ;; without loading (srfi srfi-1) or anything.
+                 (let ((extensions '((ungexp-native-splicing extensions)))
+                       (prepend (lambda (items lst)
+                                  ;; This is O(N²) but N is typically small.
+                                  (let loop ((items items)
+                                             (lst lst))
+                                    (if (null? items)
+                                        lst
+                                        (loop (cdr items)
+                                              (cons (car items)
+                                                    (delete (car items) lst))))))))
+                   (set! %load-path
+                     (prepend (cons (ungexp modules)
+                                    (map (lambda (extension)
+                                           (string-append extension
+                                                          "/share/guile/site/"
+                                                          (effective-version)))
+                                         extensions))
+                              %load-path))
+                   (set! %load-compiled-path
+                     (prepend (cons (ungexp compiled)
+                                    (map (lambda (extension)
+                                           (string-append extension
+                                                          "/lib/guile/"
+                                                          (effective-version)
+                                                          "/site-ccache"))
+                                         extensions))
+                              %load-compiled-path)))))))))
 
 (define* (gexp->script name exp
                        #:key (guile (default-guile))
-- 
cgit v1.2.3


From 5fb38c1dd9d0b0a6c444d7e1026682d171fb1c82 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 00:48:27 +0200
Subject: gnu: perl-io-pager: Update to 0.44.

* gnu/packages/perl.scm (perl-io-pager): Update to 0.44.
---
 gnu/packages/perl.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 1fa90aa748..3c91d552db 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -4329,17 +4329,16 @@ and busy().")
 (define-public perl-io-pager
   (package
     (name "perl-io-pager")
-    (version "0.4")
+    (version "0.44")
     (source
      (origin
        (method url-fetch)
        (uri (string-append
              "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-"
              version
-             "0.tgz"))
+             ".tgz"))
        (sha256
-        (base32
-         "1vzdypsr7vkj8nnda9ccrksci6pqj5awwmi89l7x3mbpq36gad87"))))
+        (base32 "0h52gplhc3rij18xc4ngpg5kqv6mylxfzig18xll1aqda8iwa8kl"))))
     (build-system perl-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From 85c739750960db0f90e300f2ffef77871ab9caa7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 01:06:06 +0200
Subject: gnu: perl-role-tiny: Update to 2.001001.

* gnu/packages/perl.scm (perl-role-tiny): Update to 2.001001.
---
 gnu/packages/perl.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 3c91d552db..4849b1be82 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7319,15 +7319,14 @@ and @code{deserialize_regexp}.")
 (define-public perl-role-tiny-2
   (package
     (inherit perl-role-tiny)
-    (version "2.000006")
+    (version "2.001001")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/"
                            "Role-Tiny-" version ".tar.gz"))
        (sha256
-        (base32
-         "10p3sc639c0nj56bb77a2wg8samyyl8sqpliv3n8c0jaj2642wyc"))))))
+        (base32 "16yryg3cr14xw201gm8k8ci00hs60fy8lk2xhnaqa85n5m68flk8"))))))
 
 (define-public perl-safe-isa
   (package
-- 
cgit v1.2.3


From e8190ba9fb880c759bc4bc0d6799442fcf6ba14f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 01:06:16 +0200
Subject: gnu: perl-sub-quote: Update to 2.006006.

* gnu/packages/perl.scm (perl-sub-quote): Update to 2.006006.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 4849b1be82..7fc6363462 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -7895,7 +7895,7 @@ return value is the sub.")
 (define-public perl-sub-quote
   (package
     (name "perl-sub-quote")
-    (version "2.006003")
+    (version "2.006006")
     (source
      (origin
        (method url-fetch)
@@ -7903,7 +7903,7 @@ return value is the sub.")
              "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-"
              version ".tar.gz"))
        (sha256
-        (base32 "0xl1w55qilqc3xdqvmjzs5vjnjdc0d4633yw7hh1yd9zfxpkl7xy"))))
+        (base32 "17fq4iskrisnqs96amrz493vxikwvqbj9s7014k6vyl84gs2lkkf"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-test-fatal" ,perl-test-fatal)))
-- 
cgit v1.2.3


From dd32676b067caeeeed46a582435852d97da6ad88 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 01:06:48 +0200
Subject: gnu: linux-libre@5.3: Update to 5.3.2.

* gnu/packages/linux.scm (linux-libre-5.3-version)
(linux-libre-5.3-pristine-source): Update to 5.3.2.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 71991c8eec..ac5674b583 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                         "linux-" version ".tar.xz"))
     (sha256 hash)))
 
-(define-public linux-libre-5.3-version "5.3.1")
+(define-public linux-libre-5.3-version "5.3.2")
 (define-public linux-libre-5.3-pristine-source
   (let ((version linux-libre-5.3-version)
-        (hash (base32 "0n7qjakglzh6rpbjdjqr4fgp8f8fd3qgb5as0hfj25nk16lvb44q")))
+        (hash (base32 "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.3)))
-- 
cgit v1.2.3


From 1bedc74e7f98940d728a28ccca75779fed60b72d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 01:10:11 +0200
Subject: gnu: linux-libre@5.2: Update to 5.2.18.

* gnu/packages/linux.scm (linux-libre-5.2-version)
(linux-libre-5.2-pristine-source): Update to 5.2.18.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ac5674b583..7607609891 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.3)))
 
-(define-public linux-libre-5.2-version "5.2.17")
+(define-public linux-libre-5.2-version "5.2.18")
 (define-public linux-libre-5.2-pristine-source
   (let ((version linux-libre-5.2-version)
-        (hash (base32 "1y9d218w83qgd6wima6h6n4zbj1rxz15yb6hdlhv8dm9kv88lfvv")))
+        (hash (base32 "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
-- 
cgit v1.2.3


From 57ec0551c8a360c592a8ecdd3ad30d315353a3d0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 01:10:42 +0200
Subject: gnu: linux-libre@4.19: Update to 4.19.76.

* gnu/packages/linux.scm (linux-libre-4.19-version)
(linux-libre-4.19-pristine-source): Update to 4.19.76.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7607609891..21cd4a205f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -374,10 +374,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
 
-(define-public linux-libre-4.19-version "4.19.75")
+(define-public linux-libre-4.19-version "4.19.76")
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-        (hash (base32 "0y0vcmxyfg98mm63vaqq6n2bmxkbmrnvigm5zdh1al74w53p2pnx")))
+        (hash (base32 "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
-- 
cgit v1.2.3


From 0c34b9494333fb355d288a0165b85cb3c1c2a628 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 4 Oct 2019 12:21:07 +0300
Subject: gnu: vdirsyncer: Skip tests.

* gnu/packages/dav.scm (vdirsyncer)[arguments]: Disable tests.
Update custom 'check phase to only run the tests when enabled.
---
 gnu/packages/dav.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 3b040028a1..fb370fd716 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016, 2017 Leo Famulari 
-;;; Copyright © 2018 Efraim Flashner 
+;;; Copyright © 2018, 2019 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -69,14 +69,17 @@ clients.")
                "1vqjhn2bffy2bx45a1r14crsyn2cylf5by567g44c4mhpjwwz6vc"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
+     `(#:tests? #f ; The test suite is very flakey.
+       #:phases (modify-phases %standard-phases
         (replace 'check
-          (lambda* (#:key inputs outputs #:allow-other-keys)
+          (lambda* (#:key inputs outputs tests? #:allow-other-keys)
             (add-installed-pythonpath inputs outputs)
             (setenv "DETERMINISTIC_TESTS" "true")
             (setenv "DAV_SERVER" "radicale")
             (setenv "REMOTESTORAGE_SERVER" "skip")
-            (invoke "make" "test")))
+            (if tests?
+                (invoke "make" "test")
+                #t)))
         (add-after 'install 'manpage
           (lambda* (#:key inputs outputs #:allow-other-keys)
             (invoke "make" "--directory=docs/" "man")
-- 
cgit v1.2.3


From f800291e0809ab477e07df4fbd23216d451d8c58 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:21 +0200
Subject: gnu: Add xfce4-wavelan-plugin.

* gnu/packages/xfce.scm (xfce4-wavelan-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d8f67374fa..13d16def99 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1229,3 +1229,30 @@ A plugin for the Xfce panel is also available.")
      "This is a volume keys control daemon for Xfce Desktop environment. It controls
  the volume using multimedia keys. It also provides volume change notifications.")
     (license gpl3+)))
+
+(define-public xfce4-wavelan-plugin
+  (package
+   (name "xfce4-wavelan-plugin")
+   (version "0.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-wavelan-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-wavelan-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "05zdiq1igr1fcvnwlivg8g3szvxmlr3yc7jfj3bwgqrs0vm827zl"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin")
+    (synopsis "Show stats from WLAN interface in Xfce panel")
+    (description "This plugin is used to display stats from a wireless
+lan interface (signal state, signal quality, network name (SSID)).")
+    (license bsd-2)))
-- 
cgit v1.2.3


From c6927c08bde76d83758674747ca718cf543772aa Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:22 +0200
Subject: gnu: Add xfce4-verve-plugin.

* gnu/packages/xfce.scm (xfce4-verve-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 13d16def99..ec699a79df 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1230,6 +1230,40 @@ A plugin for the Xfce panel is also available.")
  the volume using multimedia keys. It also provides volume change notifications.")
     (license gpl3+)))
 
+(define-public xfce4-verve-plugin
+  (package
+   (name "xfce4-verve-plugin")
+   (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-verve-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-verve-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1ljcmgc8ixrbz134ggxbbh4zzdnp7mhi9ay6s5hgrz28djx10rcy"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin")
+    (synopsis "Command line for the Xfce panel")
+    (description "The Verve plugin provides a comfortable command line
+for the Xfce panel.  It supports several features, such as:
+@itemize
+@item Opens URLs, e-mail addresses, directories, and programs
+@item Command history
+@item Auto-completion (including command history)
+@item Focus grabbing via D-BUS (so you can bind a shortcut to it)
+@item Custom input field width
+@end itemize")
+    (license gpl2+)))
+
 (define-public xfce4-wavelan-plugin
   (package
    (name "xfce4-wavelan-plugin")
-- 
cgit v1.2.3


From 415e7e2046ea8eeb7fa0cf3ccb51429be2ca2627 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:23 +0200
Subject: gnu: Add xfce4-timer-plugin.

* gnu/packages/xfce.scm (xfce4-timer-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index ec699a79df..e3ff59eed1 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1230,6 +1230,34 @@ A plugin for the Xfce panel is also available.")
  the volume using multimedia keys. It also provides volume change notifications.")
     (license gpl3+)))
 
+(define-public xfce4-timer-plugin
+  (package
+   (name "xfce4-timer-plugin")
+   (version "1.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-timer-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-timer-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin")
+    (synopsis "Simple countdown and alarm plugin for the Xfce panel")
+    (description "This is a simple plugin that lets the user run an
+alarm at a specified time or at the end of a specified countdown
+period.")
+    (license gpl2+)))
+
 (define-public xfce4-verve-plugin
   (package
    (name "xfce4-verve-plugin")
-- 
cgit v1.2.3


From 820a0869eaf662c60451afcee7cdc7e2574ed686 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:24 +0200
Subject: gnu: Add xfce4-systemload-plugin.

* gnu/packages/xfce.scm (xfce4-systemload-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e3ff59eed1..cae32aeb09 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1230,6 +1230,34 @@ A plugin for the Xfce panel is also available.")
  the volume using multimedia keys. It also provides volume change notifications.")
     (license gpl3+)))
 
+(define-public xfce4-systemload-plugin
+  (package
+   (name "xfce4-systemload-plugin")
+   (version "1.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-systemload-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-systemload-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin")
+    (synopsis "System load display plugin for the Xfce panel")
+    (description "A system load plugin for the Xfce4 desktop
+environment.  It displays the current CPU load, the memory in use, the
+swap space and the system uptime in the Xfce4 panel.")
+    (license bsd-2)))
+
 (define-public xfce4-timer-plugin
   (package
    (name "xfce4-timer-plugin")
-- 
cgit v1.2.3


From 2ebc7316ce757cef78098c26e8ed91d688fdc522 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:25 +0200
Subject: gnu: Add xfce4-smartbookmark-plugin.

* gnu/packages/xfce.scm (xfce4-smartbookmark-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index cae32aeb09..25d2b05124 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1230,6 +1230,34 @@ A plugin for the Xfce panel is also available.")
  the volume using multimedia keys. It also provides volume change notifications.")
     (license gpl3+)))
 
+(define-public xfce4-smartbookmark-plugin
+  (package
+   (name "xfce4-smartbookmark-plugin")
+   (version "0.5.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-smartbookmark-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-smartbookmark-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "001nf2bqly8vm868qvafzgihc9463c488mkim24iw9g2s9ygna1y"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin")
+    (synopsis "Perform custom searches in your browser from the Xfce panel")
+    (description "This plugin allows you to send search requests
+directly to your browser, such that you can search through your
+favorite search engine or bug tracker right from the Xfce panel.")
+    (license gpl2+)))
+
 (define-public xfce4-systemload-plugin
   (package
    (name "xfce4-systemload-plugin")
-- 
cgit v1.2.3


From 461790c919f5a60240b6b5ba6afb5df439892dac Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:26 +0200
Subject: gnu: Add xfce4-mount-plugin.

* gnu/packages/xfce.scm (xfce4-mount-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 25d2b05124..0717979607 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1230,6 +1230,35 @@ A plugin for the Xfce panel is also available.")
  the volume using multimedia keys. It also provides volume change notifications.")
     (license gpl3+)))
 
+(define-public xfce4-mount-plugin
+  (package
+   (name "xfce4-mount-plugin")
+   (version "1.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-mount-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-mount-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "07lijjhimjrcyrhasr2299km6wm22xcd3fazdfpqvisbk1mvvrda"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin")
+    (synopsis "Mount/unmount plugin for the Xfce panel")
+    (description "The plugin will display a list of items representing
+your various devices.  If you click on an unmounted devices it will
+mount it and vice versa.  There is a warning in case a device can't be
+mounted or when unmounting fails.")
+    (license gpl2+)))
+
 (define-public xfce4-smartbookmark-plugin
   (package
    (name "xfce4-smartbookmark-plugin")
-- 
cgit v1.2.3


From 7e53f357ac9387b50b3f110dcf2d5db6c712f30c Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:27 +0200
Subject: gnu: Add xfce4-cpugraph-plugin.

* gnu/packages/xfce.scm (xfce4-cpugraph-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 0717979607..199e1faf97 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1230,6 +1230,39 @@ A plugin for the Xfce panel is also available.")
  the volume using multimedia keys. It also provides volume change notifications.")
     (license gpl3+)))
 
+(define-public xfce4-cpugraph-plugin
+  (package
+   (name "xfce4-cpugraph-plugin")
+   (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-cpugraph-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-cpugraph-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin")
+    (synopsis "Display CPU load as a graph in the Xfce panel")
+    (description "This panel plugin offers multiple display
+modes (LED, gradient, fire, etc…) to show the current CPU load of the
+system.  Various appearance options, like colors or size, are
+customizable.
+
+On multi core or multi CPU systems, CPU Graph can either track and
+display all of them at once, or at the user's option only a specific
+core or CPU.")
+    (license gpl2+)))
+
 (define-public xfce4-mount-plugin
   (package
    (name "xfce4-mount-plugin")
-- 
cgit v1.2.3


From 58253d9f5b02452424a5f73246be40af95309195 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:28 +0200
Subject: gnu: Add xfce4-eyes-plugin.

* gnu/packages/xfce.scm (xfce4-eyes-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 199e1faf97..62686f5ece 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1263,6 +1263,33 @@ display all of them at once, or at the user's option only a specific
 core or CPU.")
     (license gpl2+)))
 
+(define-public xfce4-eyes-plugin
+  (package
+   (name "xfce4-eyes-plugin")
+   (version "4.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-eyes-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-eyes-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin")
+    (synopsis "Display a pair of eyes for the Xfce panel")
+    (description "Eyes is a toy Xfce panel plugin that adds eyes which
+watch your every step.")
+    (license gpl2+)))
+
 (define-public xfce4-mount-plugin
   (package
    (name "xfce4-mount-plugin")
-- 
cgit v1.2.3


From 3372e5d1fcf6f9eac25f0f33ef1effb34e5d6133 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:29 +0200
Subject: gnu: Add xfce4-embed-plugin.

* gnu/packages/xfce.scm (xfce4-embed-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 62686f5ece..afea4ccea2 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1290,6 +1290,41 @@ core or CPU.")
 watch your every step.")
     (license gpl2+)))
 
+(define-public xfce4-embed-plugin
+  (package
+   (name "xfce4-embed-plugin")
+   (version "1.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-embed-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-embed-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)
+       ("gtk+-2" ,gtk+-2)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin")
+    (synopsis "Embed arbitary applications inside the Xfce panel")
+    (description "This plugin enables the embedding of arbitrary
+application windows into the Xfce panel.  The window is resized into
+the panel space available, and the associated program can be
+automatically launched if it is not open.
+
+Example uses include embedding an instant messaging buddy list, a mail
+client's new mail ticker, a simple media application, or a fancy clock
+or timer.  Combining with Xfce's ability to auto-hide panels can make
+this very convenient.")
+    (license gpl2+)))
+
 (define-public xfce4-mount-plugin
   (package
    (name "xfce4-mount-plugin")
-- 
cgit v1.2.3


From c8417d327ab52c53bc08391c72f0017bed2e83e8 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:30 +0200
Subject: gnu: Add xfce4-datetime-plugin.

* gnu/packages/xfce.scm (xfce4-datetime-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index afea4ccea2..bfd6542aa0 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1290,6 +1290,33 @@ core or CPU.")
 watch your every step.")
     (license gpl2+)))
 
+(define-public xfce4-datetime-plugin
+  (package
+   (name "xfce4-datetime-plugin")
+   (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-datetime-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-datetime-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1m7bmpvbmiz2xdffpg675qn80zx2n0cnlf842ppvh1q7zz18ndfd"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin")
+    (synopsis "Display date and time inside the Xfce panel")
+    (description "This plugin shows the date and time in the panel,
+and a calendar appears when you left-click on it.")
+    (license gpl2+)))
+
 (define-public xfce4-embed-plugin
   (package
    (name "xfce4-embed-plugin")
-- 
cgit v1.2.3


From 2f81e67850502394d17ac7e74d23cdf8ee215516 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:31 +0200
Subject: gnu: Add xfce4-calculator-plugin.

* gnu/packages/xfce.scm (xfce4-calculator-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bfd6542aa0..9aaabe02c6 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1317,6 +1317,34 @@ watch your every step.")
 and a calendar appears when you left-click on it.")
     (license gpl2+)))
 
+(define-public xfce4-calculator-plugin
+  (package
+   (name "xfce4-calculator-plugin")
+   (version "0.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-calculator-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-calculator-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1scx7z5ijg2fpcqrzv1nxhpj9vrqic7pyghig70f2n5hgaaanl3v"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin")
+    (synopsis "Calculator for the Xfce panel")
+    (description "This plugin is a calculator for the Xfce4 panel.  It
+supports common mathematical operators (+, -, *, /, ^) with usual
+precedence rules, and the following functions and common constants.")
+    (license gpl2+)))
+
 (define-public xfce4-embed-plugin
   (package
    (name "xfce4-embed-plugin")
-- 
cgit v1.2.3


From 18af33827bb446b09605d29b2e8ea0e3106d6da4 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:32 +0200
Subject: gnu: Add xfce4-cpufreq-plugin.

* gnu/packages/xfce.scm (xfce4-cpufreq-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 9aaabe02c6..510fa78260 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1345,6 +1345,33 @@ supports common mathematical operators (+, -, *, /, ^) with usual
 precedence rules, and the following functions and common constants.")
     (license gpl2+)))
 
+(define-public xfce4-cpufreq-plugin
+  (package
+   (name "xfce4-cpufreq-plugin")
+   (version "1.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-cpufreq-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-cpufreq-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1dgmx3ygil51s1az298ly0gybcw8ln1dz8q8y9k207a0vk049q65"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin")
+    (synopsis "Xfce panel plugin for displaying CPU frequency")
+    (description "This panel plugin shows information about the CPU
+governor and frequencies supported and used by your system.")
+    (license gpl2+)))
+
 (define-public xfce4-embed-plugin
   (package
    (name "xfce4-embed-plugin")
-- 
cgit v1.2.3


From fa6a9d9863c111f84eaca3a56af93a3ae2c9bc9a Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:33 +0200
Subject: gnu: Add xfce4-diskperf-plugin.

* gnu/packages/xfce.scm (xfce4-diskperf-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 510fa78260..d4c2cb701a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1372,6 +1372,33 @@ precedence rules, and the following functions and common constants.")
 governor and frequencies supported and used by your system.")
     (license gpl2+)))
 
+(define-public xfce4-diskperf-plugin
+  (package
+   (name "xfce4-diskperf-plugin")
+   (version "2.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-diskperf-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-diskperf-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0i4nrsvwcn15g5gmnba9p07sad3c96x517l2lybdw8jqv91rhbpx"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin")
+    (synopsis "Display disk performance in the Xfce panel")
+    (description "This Xfce panel plugin displays instant disk/partition
+performance (bytes transfered per second).")
+    (license gpl2+)))
+
 (define-public xfce4-embed-plugin
   (package
    (name "xfce4-embed-plugin")
-- 
cgit v1.2.3


From 2aee1fef0bef7eed58f1c68f8996affa22149b2c Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:34 +0200
Subject: gnu: Add xfce4-fsguard-plugin.

* gnu/packages/xfce.scm (xfce4-fsguard-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index d4c2cb701a..5b4ebaf603 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1434,6 +1434,36 @@ or timer.  Combining with Xfce's ability to auto-hide panels can make
 this very convenient.")
     (license gpl2+)))
 
+(define-public xfce4-fsguard-plugin
+  (package
+   (name "xfce4-fsguard-plugin")
+   (version "1.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-fsguard-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-fsguard-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin")
+    (synopsis "Xfce panel plugin to monitor free disk space")
+    (description "The panel plugin checks free space on a chosen mount
+point frequently and displays a message when a limit is reached.  There
+are two limits: a warning limit where only the icon changes, and an
+urgent limit that advise the user with a message.  The icon button can
+be clicked to open the chosen mount point.")
+    (license bsd-2)))
+
 (define-public xfce4-mount-plugin
   (package
    (name "xfce4-mount-plugin")
-- 
cgit v1.2.3


From a004609a1315969b9f78ac8ce104653758c2b6a3 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:35 +0200
Subject: gnu: Add xfce4-mpc-plugin.

* gnu/packages/xfce.scm (xfce4-mpc-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5b4ebaf603..bf1e84366e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1464,6 +1464,49 @@ urgent limit that advise the user with a message.  The icon button can
 be clicked to open the chosen mount point.")
     (license bsd-2)))
 
+(define-public xfce4-mpc-plugin
+  (package
+   (name "xfce4-mpc-plugin")
+   (version "0.5.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-mpc-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-mpc-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin")
+    (synopsis "Music Player Daemon plugin for the Xfce panel")
+    (description "This is a simple client plugin for Music Player Daemon.
+
+Features:
+@itemize
+@item send Play/Stop/Next/Previous command to MPD.
+@item uses media icons names from icon-naming-spec (at least nuvola,
+tango and rodent themes provides these icons)
+@item decrease/increase volume using the mouse wheel.
+@item show the current volume, status and title as a tooltip when
+hovering the mouse over the plugin.
+@item show a simple playlist window upon middle-click, permitting to
+select a track to play
+@item configurable MPD host/port/password.
+@item toggles repeat/random features + enable/disable MPD outputs in
+the right-click menu.
+@item launch configurable client (gmpc, xterm -e ncmpc,..) through
+right-click menu
+@item configurable markup for tooltip and playlist, using a gmpc-like markup
+@end itemize")
+    (license isc)))
+
 (define-public xfce4-mount-plugin
   (package
    (name "xfce4-mount-plugin")
-- 
cgit v1.2.3


From 3b04836ebbda1bec6dbc108e922a67320e5db86c Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:36 +0200
Subject: gnu: Add xfce4-time-out-plugin.

* gnu/packages/xfce.scm (xfce4-time-out-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bf1e84366e..3708f9d2ed 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1592,6 +1592,36 @@ environment.  It displays the current CPU load, the memory in use, the
 swap space and the system uptime in the Xfce4 panel.")
     (license bsd-2)))
 
+(define-public xfce4-time-out-plugin
+  (package
+   (name "xfce4-time-out-plugin")
+   (version "1.0.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-time-out-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-time-out-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0sqggsnkj40337v0c9vgakyh1zjzri6if38l85gcrnc39rlx973z"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+-2" ,gtk+-2)
+       ("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin")
+    (synopsis "Xfce panel plugin that encourages periodical breaks")
+    (description "This plugin encourages to take periodical
+breaks from the computer every X minutes.  During breaks it locks your
+screen.  It optionally allows you to postpone breaks for a certain
+time.")
+    (license gpl2+)))
+
 (define-public xfce4-timer-plugin
   (package
    (name "xfce4-timer-plugin")
-- 
cgit v1.2.3


From 40f0181bf72982b51dc8910df83cb61d6afdbfd4 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:37 +0200
Subject: gnu: Add xfce4-genmon-plugin.

* gnu/packages/xfce.scm (xfce4-genmon-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 3708f9d2ed..f542b19227 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1464,6 +1464,37 @@ urgent limit that advise the user with a message.  The icon button can
 be clicked to open the chosen mount point.")
     (license bsd-2)))
 
+(define-public xfce4-genmon-plugin
+  (package
+   (name "xfce4-genmon-plugin")
+   (version "4.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-genmon-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-genmon-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin")
+    (synopsis "Generic program output monitor for the Xfce panel")
+    (description "This plugin cyclically spawns the indicated
+script/program, captures its output (stdout) and displays the
+resulting string into the panel.
+
+The string can also contain markup to displayed an image, a bar, a
+button and a personalized tooltip.")
+    (license gpl2+)))
+
 (define-public xfce4-mpc-plugin
   (package
    (name "xfce4-mpc-plugin")
-- 
cgit v1.2.3


From e18bc5e0112c38fc67fa07b9bf34cbb5d1df4eca Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:38 +0200
Subject: gnu: Add xfce4-kbdleds-plugin.

* gnu/packages/xfce.scm (xfce4-kbdleds-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index f542b19227..13836cf4a5 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1495,6 +1495,34 @@ The string can also contain markup to displayed an image, a bar, a
 button and a personalized tooltip.")
     (license gpl2+)))
 
+(define-public xfce4-kbdleds-plugin
+  (package
+   (name "xfce4-kbdleds-plugin")
+   (version "0.0.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-kbdleds-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-kbdleds-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1k810asjjxwix1c7ixl7bqr97zc4j2mw7797gk49rjvv43bhla3d"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+-2" ,gtk+-2)
+       ("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin")
+    (synopsis "Display keyboard LEDs in the Xfce panel")
+    (description "This plugin shows the state of your keyboard LEDs:
+Caps, Scroll and Num Lock in Xfce panel.")
+    (license gpl2+)))
+
 (define-public xfce4-mpc-plugin
   (package
    (name "xfce4-mpc-plugin")
-- 
cgit v1.2.3


From d6056cc7fec16764c5212c8df9cc33fb201690aa Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:39 +0200
Subject: gnu: Add xfce4-netload-plugin.

* gnu/packages/xfce.scm (xfce4-netload-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 13836cf4a5..aaae28fa9a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1595,6 +1595,33 @@ mount it and vice versa.  There is a warning in case a device can't be
 mounted or when unmounting fails.")
     (license gpl2+)))
 
+(define-public xfce4-netload-plugin
+  (package
+   (name "xfce4-netload-plugin")
+   (version "1.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-netload-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-netload-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0p91875n6s8n88l7wb4w9prqly3wvkyilnr7zq0ppq71rwjh9r12"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin")
+    (synopsis "Netload plugin for the Xfce Panel")
+    (description "This plugin displays the current load of the network
+interfaces of your choice in the panel.")
+    (license gpl2+)))
+
 (define-public xfce4-smartbookmark-plugin
   (package
    (name "xfce4-smartbookmark-plugin")
-- 
cgit v1.2.3


From b05edff0b2ba5f698e677bc36d80e33779312048 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:40 +0200
Subject: gnu: Add xfce4-stopwatch-plugin.

* gnu/packages/xfce.scm (xfce4-stopwatch-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index aaae28fa9a..225ecbbc01 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1650,6 +1650,35 @@ directly to your browser, such that you can search through your
 favorite search engine or bug tracker right from the Xfce panel.")
     (license gpl2+)))
 
+(define-public xfce4-stopwatch-plugin
+  (package
+   (name "xfce4-stopwatch-plugin")
+   (version "0.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-stopwatch-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-stopwatch-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "07dadvgivly44w7qj74i2w60nk01h8567paxrli8vzmhb3p6xi2h"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; test fails in po/ directory
+     `(#:tests? #f))
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-stopwatch-plugin")
+    (synopsis "Stopwatch plugin for the Xfce panel")
+    (description "This Xfce panel plugin keeps track of elapsed time.")
+    (license bsd-2)))
+
 (define-public xfce4-systemload-plugin
   (package
    (name "xfce4-systemload-plugin")
-- 
cgit v1.2.3


From de838a63383aa50f27bd311e5c04627da2e1922c Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:41 +0200
Subject: gnu: Add xfce4-statusnotifier-plugin.

* gnu/packages/xfce.scm (xfce4-statusnotifier-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 225ecbbc01..95c60630fc 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1650,6 +1650,38 @@ directly to your browser, such that you can search through your
 favorite search engine or bug tracker right from the Xfce panel.")
     (license gpl2+)))
 
+(define-public xfce4-statusnotifier-plugin
+  (package
+   (name "xfce4-statusnotifier-plugin")
+   (version "0.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-statusnotifier-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-statusnotifier-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "154b0q9pmlbjh30vvx4c48msdfxp4pq8x4mbn71mk7pibk018hsj"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("glib:bin" ,glib "bin")))
+    (inputs
+     `(("libxfce4ui" ,libxfce4ui)
+       ("libdbusmenu" ,libdbusmenu)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-statusnotifier-plugin")
+    (synopsis "Xfce panel plugin for status notifier items")
+(description "This plugin provides a panel area for status
+notifier items (application indicators).  Applications may use these
+items to display their status and interact with the user.  This
+technology is a modern alternative to systray and follows the
+freedesktop.org specification.")
+    (license gpl2+)))
+
 (define-public xfce4-stopwatch-plugin
   (package
    (name "xfce4-stopwatch-plugin")
-- 
cgit v1.2.3


From dd249f1b8c371c08459f47a6b39c6dc477c5566b Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:42 +0200
Subject: gnu: Add xfce4-mailwatch-plugin.

* gnu/packages/xfce.scm (xfce4-mailwatch-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 95c60630fc..2fcfab8a0c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1523,6 +1523,44 @@ button and a personalized tooltip.")
 Caps, Scroll and Num Lock in Xfce panel.")
     (license gpl2+)))
 
+(define-public xfce4-mailwatch-plugin
+  (package
+   (name "xfce4-mailwatch-plugin")
+   (version "1.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-mailwatch-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-mailwatch-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+-2" ,gtk+-2)
+       ("libxfce4ui" ,libxfce4ui)
+       ("exo" ,exo)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin")
+    (synopsis "Mail watch plugin for the Xfce panel")
+    (description "The Xfce4 Mailwatch Plugin is a multi-protocol,
+multi-mailbox mail watcher.  Currently, the protocols supported are:
+
+@itemize
+@item IMAP (SSL/TLS and cleartext, CRAM-MD5)
+@item POP3 (SSL/TLS and cleartext, CRAM-MD5)
+@item Mbox mail spool (local)
+@item Maildir mail spool (local)
+@item MH-Maildir mail spool (local)
+@item Google Mail (GMail) mailbox (remote) (requires gnutls)
+@end itemize")
+    (license gpl2)))
+
 (define-public xfce4-mpc-plugin
   (package
    (name "xfce4-mpc-plugin")
-- 
cgit v1.2.3


From cd0826d60bcfaba3233c2562776301ae0a65d978 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:43 +0200
Subject: gnu: Add xfce4-equake-plugin.

* gnu/packages/xfce.scm (xfce4-equake-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2fcfab8a0c..2995d99a48 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1290,6 +1290,35 @@ core or CPU.")
 watch your every step.")
     (license gpl2+)))
 
+(define-public xfce4-equake-plugin
+   (package
+   (name "xfce4-equake-plugin")
+   (version "1.3.8")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-equake-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-equake-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "09b9k0n5xm115k44x74w4ad0xqklilyfh0hglsps7zj97pd7a5a3"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+-2" ,gtk+-2)
+       ("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-equake-plugin")
+    (synopsis "Earthquake monitor for the Xfce panel")
+    (description "Equake is a panel plugin for the XFCE desktop
+environment.  Equake monitors earthquakes and will display an update
+each time a new earthquake occurs.")
+    (license gpl2+)))
+
 (define-public xfce4-datetime-plugin
   (package
    (name "xfce4-datetime-plugin")
-- 
cgit v1.2.3


From 5d0059e02efeba259923e02ab7e1bac9ef0210f4 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:44 +0200
Subject: gnu: Add xfce4-places-plugin.

* gnu/packages/xfce.scm (xfce4-places-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2995d99a48..77a5356466 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1689,6 +1689,48 @@ mounted or when unmounting fails.")
 interfaces of your choice in the panel.")
     (license gpl2+)))
 
+(define-public xfce4-places-plugin
+  (package
+   (name "xfce4-places-plugin")
+   (version "1.8.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-places-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-places-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1chac4ki70axgvkmhw94m0srsv0pwiwqrqbh8di0y9n90fgj24gj"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("gtk+-2" ,gtk+-2)
+       ("exo" ,exo)
+       ("libxfce4ui" ,libxfce4ui)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin")
+    (synopsis "Gnome-like Places menu for the Xfce panel")
+    (description "This plugin provides a menu with quick access to folders,
+documents, and removable media.  The places plugin brings much of the
+functionality of GNOME's Places menu to Xfce.
+
+The plugin puts a simple button on the panel.  Clicking on this button
+opens up a menu with the following:
+
+@itemize
+@item System-defined directories (home folder, trash, desktop, file system)
+@item Removable media (using thunar-vfs)
+@item User-defined bookmarks (reads @file{~/.gtk-bookmarks})
+@item Search program launcher (optional)
+@item Recent documents submenu
+@end itemize")
+    (license gpl2+)))
+
 (define-public xfce4-smartbookmark-plugin
   (package
    (name "xfce4-smartbookmark-plugin")
-- 
cgit v1.2.3


From 59b83c5029b8f56b2ec2613f667e40d0a2bbdf69 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke 
Date: Thu, 3 Oct 2019 21:38:45 +0200
Subject: gnu: Add xfce4-weather-plugin.

* gnu/packages/xfce.scm (xfce4-weather-plugin): New variable.

Signed-off-by: Danny Milosavljevic 
---
 gnu/packages/xfce.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 77a5356466..20b679c0df 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -63,6 +63,7 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages xml)
   #:use-module (gnu packages wm))
 
 (define-public gtk-xfce-engine
@@ -1966,3 +1967,34 @@ for the Xfce panel.  It supports several features, such as:
     (description "This plugin is used to display stats from a wireless
 lan interface (signal state, signal quality, network name (SSID)).")
     (license bsd-2)))
+
+(define-public xfce4-weather-plugin
+  (package
+   (name "xfce4-weather-plugin")
+   (version "0.10.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://archive.xfce.org/src/panel-plugins/"
+                                  "xfce4-weather-plugin/"
+                                  (version-major+minor version)
+                                  "/xfce4-weather-plugin-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0wlm80panxyn86l9qm3mbliqj7gkf2zyzak3w041zz9hg31a08s4"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gtk+" ,gtk+)
+       ("libsoup" ,libsoup)
+       ("libxfce4ui" ,libxfce4ui)
+       ("libxml2" ,libxml2)
+       ("xfce4-panel" ,xfce4-panel)))
+    (home-page
+     "https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin")
+    (synopsis "Show information about local weather in the Xfce panel")
+    (description "This Xfce panel plugin shows information about your
+local weather in the panel, using forecast data provided by the
+@uref{https://met.no, Norwegian Meteorological Institute}.")
+    (license gpl2+)))
-- 
cgit v1.2.3


From 4b3b5a06fc6879876fe130c161b87888632ab3ad Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 14:25:08 +0200
Subject: gnu: rust-unindent: Update to 0.1.5.

* gnu/packages/crates-io.scm (rust-unindent): Update to 0.1.5.
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7a0ea03a67..be2a1bd890 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2019 Efraim Flashner 
 ;;; Copyright © 2019 Nicolas Goaziou 
 ;;; Copyright © 2019 Giacomo Leidi 
+;;; Copyright © 2019 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4147,15 +4148,14 @@ or XID_Continue properties according to Unicode Standard Annex #31.")
 (define-public rust-unindent
   (package
     (name "rust-unindent")
-    (version "0.1.3")
+    (version "0.1.5")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "unindent" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "1x21ilf78aqcq9xzb9b7i628wm10rhk0jp0chlv06rkc690l8jw3"))))
+         (base32 "14s97blyqgf9hzxk22iazrghj60midajkw2801dfspz3n2iqmwb3"))))
     (build-system cargo-build-system)
     (home-page "https://github.com/dtolnay/indoc")
     (synopsis "Remove a column of leading whitespace from a string")
-- 
cgit v1.2.3


From 0c3cf628299458dbbbd783adca5b1d277ead0fc8 Mon Sep 17 00:00:00 2001
From: Giacomo Leidi 
Date: Fri, 4 Oct 2019 16:22:35 +0200
Subject: gnu: Add emacs-extempore-mode.

* gnu/packages/emacs-xyz.scm (emacs-extempore-mode): New variable.

Signed-off-by: Tobias Geerinckx-Rice 
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 44fe73c3ef..2c5d1cec83 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2118,6 +2118,31 @@ code written in the D programming language.  This mode is currently known to
 work with Emacs 24 and 25.")
     (license license:gpl2+)))
 
+(define-public emacs-extempore-mode
+  ;; Use the latest commit at time of packaging.  There are no releases or tags.
+  (let ((commit "848ad0084f27b92d1cf98dabffbad29f959a642d")
+        (revision "1"))
+    (package
+      (name "emacs-extempore-mode")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/extemporelang/extempore-emacs-mode.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c"))))
+      (build-system emacs-build-system)
+      (home-page "https://github.com/extemporelang/extempore-emacs-mode")
+      (synopsis "Emacs major mode for Extempore source files")
+      (description
+       "This package provides a major mode for editing Extempore code.  It can
+create an Extempore REPL, connect the current @code{extempore-mode} buffer to a
+running Extempore process, and more.")
+      (license license:bsd-2))))
+
 (define-public emacs-keyfreq
   (package
     (name "emacs-keyfreq")
-- 
cgit v1.2.3


From 3a69dd5c1558caa295b22476bbf00d88e62e81a8 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen 
Date: Fri, 4 Oct 2019 17:03:24 +0200
Subject: services: httpd: Fix virtual-host doc and config.

* doc/guix.texi (Web Services): Fix httpd-virtualhost examples.
* gnu/services/web.scm (httpd-process-extensions): Add missing newline
separator.
---
 doc/guix.texi        | 16 ++++++++--------
 gnu/services/web.scm |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 93139e2d05..b49934dc0e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19419,13 +19419,13 @@ Other services can also extend the @code{httpd-service-type} to add to
 the configuration.
 
 @lisp
-(simple-service 'my-extra-server httpd-service-type
+(simple-service 'www.example.com-server httpd-service-type
                 (list
                   (httpd-virtualhost
                     "*:80"
-                    (list (string-append
-                           "ServerName "www.example.com
-                            DocumentRoot \"/srv/http/www.example.com\"")))))
+                    (list (string-join '("ServerName www.example.com"
+                                          "DocumentRoot /srv/http/www.example.com")
+                                       "\n")))))
 @end lisp
 @end deffn
 
@@ -19559,13 +19559,13 @@ This data type represents a virtualhost configuration block for the httpd servic
 These should be added to the extra-config for the httpd-service.
 
 @lisp
-(simple-service 'my-extra-server httpd-service-type
+(simple-service 'www.example.com-server httpd-service-type
                 (list
                   (httpd-virtualhost
                     "*:80"
-                    (list (string-append
-                           "ServerName "www.example.com
-                            DocumentRoot \"/srv/http/www.example.com\"")))))
+                    (list (string-join '("ServerName www.example.com"
+                                          "DocumentRoot /srv/http/www.example.com")
+                                       "\n")))))
 @end lisp
 
 @table @asis
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 56971238ab..899be1c168 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -438,7 +438,7 @@
                            addresses-and-ports
                            contents)
                         `(,(string-append
-                            "\n")
+                            "\n\n")
                           ,@contents
                           "\n\n"))
                        ((? string? x)
-- 
cgit v1.2.3


From 3dbc41c042df418298e36e0f9e945b266ae78783 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Sat, 5 Oct 2019 09:54:57 +0200
Subject: gnu: next: Update to 1.3.4.

* gnu/packages/web-browsers.scm (next-gtk-webkit): Update to 1.3.4.
---
 gnu/packages/web-browsers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 9010c26897..e1d2051386 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -367,7 +367,7 @@ driven and does not detract you from your daily work.")
 (define next-gtk-webkit
   (package
     (name "next-gtk-webkit")
-    (version "1.3.3")
+    (version "1.3.4")
     (source
      (origin
        (method git-fetch)
@@ -378,7 +378,7 @@ driven and does not detract you from your daily work.")
              (commit version)))
        (sha256
         (base32
-         "0vxjihldvif147l2kjd83kk1wcs4ixgv1yxjnpn3wgg8306pgnlh"))
+         "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"))
        (file-name (git-file-name "next" version))))
     (build-system glib-or-gtk-build-system)
     (arguments
-- 
cgit v1.2.3


From 0af697d94092057842ddb63867b2ded2b2289618 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 19:00:29 +0200
Subject: gnu: python-importlib-metadata: Update to 0.23.

* gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 0.23.
---
 gnu/packages/python-xyz.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 413d68c258..840281600b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5052,14 +5052,13 @@ older Python versions.")
 (define-public python-importlib-metadata
   (package
     (name "python-importlib-metadata")
-    (version "0.18")
+    (version "0.23")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "importlib_metadata" version))
        (sha256
-        (base32
-         "1nqj6vj2z4byi8flzf2lbldhqgicsz9mkpv4k69kjd8p8qxy4vnb"))))
+        (base32 "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-configparser" ,python-configparser)
-- 
cgit v1.2.3


From 4d755996a7f49465490e049caf9d6952aaa12f09 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 19:03:17 +0200
Subject: gnu: python-pytest-checkdocs: Update to 1.2.2.

* gnu/packages/python-check.scm (python-pytest-checkdocs): Update to 1.2.2.
[propagated-inputs]: Add python-more-itertools.
---
 gnu/packages/python-check.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index b8aaef9b77..15cf9138d4 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -110,17 +110,17 @@ interactions, which will update them to correspond to the new API.")
 (define-public python-pytest-checkdocs
   (package
     (name "python-pytest-checkdocs")
-    (version "1.2.0")
+    (version "1.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pytest-checkdocs" version))
        (sha256
-        (base32
-         "07c27cdjcw6jph5kbgpxchrvwlps4ggwb2j6m7y64imnik0asrq8"))))
+        (base32 "0j6j1gvj6x451y3qsx4xbaq9p1w9gg3mwk7n0w80cy8vdyjkngb0"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-importlib-metadata" ,python-importlib-metadata)))
+     `(("python-importlib-metadata" ,python-importlib-metadata)
+       ("python-more-itertools" ,python-more-itertools)))
     (native-inputs
      `(("python-setuptools-scm" ,python-setuptools-scm)))
     (home-page "https://github.com/jaraco/pytest-checkdocs")
-- 
cgit v1.2.3


From 9dbda847af45fe4ede75db58b748ae491916a486 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 10:34:51 +0200
Subject: gnu: screenfetch: Use the tagged release.

* gnu/packages/admin.scm (screenfetch): Use the new 3.9.0 release tag
instead of a (functionally identical) naked commit.
---
 gnu/packages/admin.scm | 103 ++++++++++++++++++++++++-------------------------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 98827ca303..8c550a79af 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2852,61 +2852,60 @@ you are running, what theme or icon set you are using, etc.")
     (license license:expat)))
 
 (define-public screenfetch
-  (let ((commit "e7b94fc3c529b9b97f32b71fd4bc05fb1d0f5864"))
-    (package
-      (name "screenfetch")
-      (version (git-version "3.8.0" "2" commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/KittyKatt/screenFetch")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg"))))
-      (build-system trivial-build-system)
-      (arguments
-       `(#:modules ((guix build utils))
-         #:builder
-         (begin
-           (use-modules (guix build utils))
-           (let ((source (assoc-ref %build-inputs "source"))
-                 (out    (assoc-ref %outputs "out")))
-             (mkdir-p (string-append out "/bin/"))
-             (copy-file (string-append source "/screenfetch-dev")
-                        (string-append out "/bin/screenfetch"))
-             (install-file (string-append source "/screenfetch.1")
-                           (string-append out "/man/man1/"))
-             (install-file (string-append source "/COPYING")
-                           (string-append out "/share/doc/" ,name "-" ,version))
-             (substitute* (string-append out "/bin/screenfetch")
-               (("/usr/bin/env bash")
-                (string-append (assoc-ref %build-inputs "bash")
-                               "/bin/bash")))
-             (wrap-program
+  (package
+    (name "screenfetch")
+    (version "3.9.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/KittyKatt/screenFetch")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "13i7dczbqwhws08zzrdraki1zkqv0qkbgx9c1r8vmg5qr9f7hfzg"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let ((source (assoc-ref %build-inputs "source"))
+               (out    (assoc-ref %outputs "out")))
+           (mkdir-p (string-append out "/bin/"))
+           (copy-file (string-append source "/screenfetch-dev")
+                      (string-append out "/bin/screenfetch"))
+           (install-file (string-append source "/screenfetch.1")
+                         (string-append out "/man/man1/"))
+           (install-file (string-append source "/COPYING")
+                         (string-append out "/share/doc/" ,name "-" ,version))
+           (substitute* (string-append out "/bin/screenfetch")
+             (("/usr/bin/env bash")
+              (string-append (assoc-ref %build-inputs "bash")
+                             "/bin/bash")))
+           (wrap-program
                (string-append out "/bin/screenfetch")
-               `("PATH" ":" prefix
-                 (,(string-append (assoc-ref %build-inputs "bc") "/bin:"
-                                  (assoc-ref %build-inputs "scrot") "/bin:"
-                                  (assoc-ref %build-inputs "xdpyinfo") "/bin"
-                                  (assoc-ref %build-inputs "xprop") "/bin"))))
-             (substitute* (string-append out "/bin/screenfetch")
-               (("#!#f")
-                (string-append "#!" (assoc-ref %build-inputs "bash")
-                               "/bin/bash")))))))
-      (inputs
-       `(("bash" ,bash)
-         ("bc" ,bc)
-         ("scrot" ,scrot)
-         ("xdpyinfo" ,xdpyinfo)
-         ("xprop" ,xprop)))
-      (home-page "https://github.com/KittyKatt/screenFetch")
-      (synopsis "System information script")
-      (description "Bash screenshot information tool which can be used to
+             `("PATH" ":" prefix
+               (,(string-append (assoc-ref %build-inputs "bc") "/bin:"
+                                (assoc-ref %build-inputs "scrot") "/bin:"
+                                (assoc-ref %build-inputs "xdpyinfo") "/bin"
+                                (assoc-ref %build-inputs "xprop") "/bin"))))
+           (substitute* (string-append out "/bin/screenfetch")
+             (("#!#f")
+              (string-append "#!" (assoc-ref %build-inputs "bash")
+                             "/bin/bash")))))))
+    (inputs
+     `(("bash" ,bash)
+       ("bc" ,bc)
+       ("scrot" ,scrot)
+       ("xdpyinfo" ,xdpyinfo)
+       ("xprop" ,xprop)))
+    (home-page "https://github.com/KittyKatt/screenFetch")
+    (synopsis "System information script")
+    (description "Bash screenshot information tool which can be used to
 generate those nifty terminal theme information and ASCII distribution logos in
 everyone's screenshots nowadays.")
-      (license license:gpl3))))
+    (license license:gpl3)))
 
 (define-public nnn
   (package
-- 
cgit v1.2.3


From d5e445e1d5b1db458f679f9c37acaf87b922b6cb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 12:28:35 +0200
Subject: gnu: cryptsetup: Don't use NAME in source URI.

* gnu/packages/cryptsetup.scm (cryptsetup)[source]: Hard-code NAME.
---
 gnu/packages/cryptsetup.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 9df26edc77..aae1082a38 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -37,7 +37,7 @@
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
                                 (version-major+minor version)
-                                "/" name "-" version ".tar.xz"))
+                                "/cryptsetup-" version ".tar.xz"))
             (sha256
              (base32
               "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b"))))
-- 
cgit v1.2.3


From b5c84b8a37aa268c370ad9c1cf335e5b6c1b3420 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 12:30:47 +0200
Subject: gnu: cryptsetup-static: Don't build veritysetup.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/cryptsetup.scm (cryptsetup-static)[arguments]: Pass
‘--disable-veritysetup’ #:configure-flag.  Adjust ‘remove-cruft’ phase.
---
 gnu/packages/cryptsetup.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index aae1082a38..8425135245 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge 
 ;;; Copyright © 2016 Ludovic Courtès 
+;;; Copyright © 2019 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -81,6 +82,8 @@ files).  This assumes LIBRARY uses Libtool."
      '(#:configure-flags '("--disable-shared"
                            "--enable-static-cryptsetup"
 
+                           "--disable-veritysetup"
+
                            ;; 'libdevmapper.a' pulls in libpthread, libudev and libm.
                            "LIBS=-ludev -pthread -lm")
 
@@ -94,8 +97,7 @@ files).  This assumes LIBRARY uses Libtool."
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'remove-cruft
                     (lambda* (#:key outputs #:allow-other-keys)
-                      ;; Remove everything except the 'cryptsetup' command and
-                      ;; its friend.
+                      ;; Remove everything except the 'cryptsetup' command.
                       (let ((out (assoc-ref outputs "out")))
                         (with-directory-excursion out
                           (let ((dirs (scandir "."
@@ -109,7 +111,7 @@ files).  This assumes LIBRARY uses Libtool."
                                                                     ".static")
                                                      file)
                                         (remove-store-references file))
-                                      '("sbin/cryptsetup" "sbin/veritysetup"))
+                                      '("sbin/cryptsetup"))
                             #t))))))))
     (inputs
      (let ((libgcrypt-static
-- 
cgit v1.2.3


From c11caf2060d82c1dc56969ce3668ec9e6561fe79 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Fri, 4 Oct 2019 12:31:30 +0200
Subject: gnu: cryptsetup: Update to 2.2.1.

* gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.2.1.
[arguments]: Add #:configure-flags.
[native-inputs]: Remove python & add pkg-config.
[inputs]: Add argon2 & json-c.
(cryptsetup-static): Disable new binaries.  Keep using libgcrypt.
Disable blkid support.
[inputs]: Add json-c.
---
 gnu/packages/cryptsetup.scm | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 8425135245..3bb1388910 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -26,14 +26,16 @@
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages password-utils)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages popt)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages linux))
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages web))
 
 (define-public cryptsetup
   (package
    (name "cryptsetup")
-   (version "1.7.5")
+   (version "2.2.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v"
@@ -41,15 +43,26 @@
                                 "/cryptsetup-" version ".tar.xz"))
             (sha256
              (base32
-              "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b"))))
+              "0q8w3khiwsw708169vahm0nccajsc2hwqz5gv6nb1g9qxlqrmrwl"))))
    (build-system gnu-build-system)
-   (inputs
-    `(("libgcrypt" ,libgcrypt)
-      ("lvm2" ,lvm2)
-      ("util-linux" ,util-linux)
-      ("popt" ,popt)))
+   (arguments
+    `(#:configure-flags
+      (list
+       ;; Argon2 is always enabled, this just selects the (faster) full version.
+       "--enable-libargon2"
+       ;; The default is OpenSSL which provides better PBKDF performance.
+       "--with-crypto_backend=gcrypt"
+       ;; GRUB as of 2.04 still can't read LUKS2 containers.
+       "--with-default-luks-format=LUKS1")))
    (native-inputs
-    `(("python" ,python-wrapper)))
+    `(("pkg-config" ,pkg-config)))
+   (inputs
+    `(("argon2" ,argon2)
+      ("json-c" ,json-c)
+      ("libgcrypt" ,libgcrypt)
+      ("lvm2" ,lvm2)                    ; device-mapper
+      ("popt" ,popt)
+      ("util-linux" ,util-linux)))      ; libuuid
    (synopsis "Hard disk encryption tool")
    (description
     "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk
@@ -83,7 +96,13 @@ files).  This assumes LIBRARY uses Libtool."
                            "--enable-static-cryptsetup"
 
                            "--disable-veritysetup"
+                           "--disable-cryptsetup-reencrypt"
+                           "--disable-integritysetup"
+
+                           ;; The default is OpenSSL which provides better PBKDF performance.
+                           "--with-crypto_backend=gcrypt"
 
+                           "--disable-blkid"
                            ;; 'libdevmapper.a' pulls in libpthread, libudev and libm.
                            "LIBS=-ludev -pthread -lm")
 
@@ -119,7 +138,8 @@ files).  This assumes LIBRARY uses Libtool."
               (inherit (static-library libgcrypt))
               (propagated-inputs
                `(("libgpg-error-host" ,(static-library libgpg-error)))))))
-       `(("libgcrypt" ,libgcrypt-static)
+       `(("json-c" ,json-c)
+         ("libgcrypt" ,libgcrypt-static)
          ("lvm2" ,lvm2-static)
          ("util-linux" ,util-linux "static")
          ("util-linux" ,util-linux)
-- 
cgit v1.2.3


From 6760b26330f81afe3c1026c7d047512388da50f8 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Sat, 5 Oct 2019 11:18:10 +0100
Subject: gnu: guix-data-service: Update to 0.0.1-3.8019d2e.

* gnu/packages/web.scm (guix-data-service): Update to 0.0.1-3.8019d2e.
---
 gnu/packages/web.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 82c09dc5f3..186d349197 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4017,8 +4017,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
   (package-with-python2 python-feedparser))
 
 (define-public guix-data-service
-  (let ((commit "e00aabde4388c014778475966da2b7021dfef560")
-        (revision "2"))
+  (let ((commit "8019d2e6878908f40cb6b047f60d2e4fd3c6712e")
+        (revision "3"))
     (package
       (name "guix-data-service")
       (version (string-append "0.0.1-" revision "." (string-take commit 7)))
@@ -4030,7 +4030,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0nd73bhir4c6a0smvgz7dfc6m6sbxd8v6amwpgk3c8m27g8chk5b"))))
+                  "06xv43az1aklrdb5y0if17xdqc80qnfdlyjiww8zmv4m3qnvj607"))))
       (build-system gnu-build-system)
       (arguments
        '(#:tests? #f                    ; TODO Tests require PostgreSQL
-- 
cgit v1.2.3


From f561d7774ceea16710ef336a6fe71bf3d313660c Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 5 Oct 2019 05:53:34 +0200
Subject: gnu: emacs-handle: Update to 0.1-2.51c050b.

* gnu/packages/emacs-xyz.scm (emacs-handle): Update to 0.1-2.51c050b.
---
 gnu/packages/emacs-xyz.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 2c5d1cec83..a88684959a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3674,8 +3674,8 @@ completion backends according to mode, and integrates with
       (license license:gpl3+))))
 
 (define-public emacs-handle
-  (let ((commit "0180a33c92b53d042c3e248a047e15337122d922")
-        (revision "1"))
+  (let ((commit "51c050bc1c6e5caf0eb47ecd985daea1db7241ab")
+        (revision "2"))
     (package
       (name "emacs-handle")
       (version (git-version "0.1" revision commit))
@@ -3687,8 +3687,10 @@ completion backends according to mode, and integrates with
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0ldrdfxspkq0m07l98hhj9nydgj9qi557mnnpd3v4xrwqwhyr4nc"))))
+          (base32 "14f15qzfmwdslml4rv37zb5d1lsjf0jibriz636hb7q7knx1n4sg"))))
       (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-parent-mode" ,emacs-parent-mode)))
       (home-page "https://gitlab.com/jjzmajic/handle")
       (synopsis "Handle generic functions across related major modes")
       (description "This package provides generic functions that specialize on
-- 
cgit v1.2.3


From ecfd74e5f77f510f0d7b9aeefeb5dd6b8aae4329 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 5 Oct 2019 08:05:57 +0200
Subject: gnu: emacs-eros: Update to 0.0.1-2.dd89102.

* gnu/packages/emacs-xyz.scm (emacs-eros): Update to 0.0.1-2.dd89102.
---
 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index a88684959a..afa21ee19e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13865,12 +13865,11 @@ interactive loop.")
     (license license:gpl3+)))
 
 (define-public emacs-eros
-  (let ((commit "a42e45c9b2397156c684330b0fc90ee0eba773f5")
-        (revision "1"))
+  (let ((commit "dd8910279226259e100dab798b073a52f9b4233a")
+        (revision "2"))
     (package
       (name "emacs-eros")
-      (version (string-append "0.0.1" "-" revision "."
-                              (string-take commit 7)))
+      (version (git-version "0.0.1" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -13880,7 +13879,7 @@ interactive loop.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"))))
+           "08chj3a0lw4ygi2sv7wj0i6ihfbi8jhylr8p92inif8b88r6wg3k"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/xiongtx/eros")
       (synopsis "Evaluation result overlays")
-- 
cgit v1.2.3


From 8c3fd490d5977492615bf18fd3b5df1506fd237c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 19:31:27 +0200
Subject: gnu: nano: Update to 4.5.

* gnu/packages/nano.scm (nano): Update to 4.5.
---
 gnu/packages/nano.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm
index 8a3cef3377..83afdf455b 100644
--- a/gnu/packages/nano.scm
+++ b/gnu/packages/nano.scm
@@ -30,13 +30,13 @@
 (define-public nano
   (package
     (name "nano")
-    (version "4.4")
+    (version "4.5")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz"))
       (sha256
-       (base32 "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia"))))
+       (base32 "0czmz1yq8s5qcxcmfjdxzg9nkhbmlc9q1nz04jvf57fdbs7w7mfy"))))
     (build-system gnu-build-system)
     (inputs
      `(("gettext" ,gettext-minimal)
-- 
cgit v1.2.3


From 567b223d01ff0b9bd44b05caebc9816a78809002 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 19:45:41 +0200
Subject: gnu: r-wgaim: Update to 2.0-1.

* gnu/packages/cran.scm (r-wgaim): Update to 2.0-1.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 95af508b2c..411a4ef564 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12497,14 +12497,13 @@ extensions.")
 (define-public r-wgaim
   (package
     (name "r-wgaim")
-    (version "2.0-0")
+    (version "2.0-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "wgaim" version))
        (sha256
-        (base32
-         "0wnb10vibgq8h1ly6lq8kzymf30vx0j0g8fc2zidblbvwag9ka1g"))))
+        (base32 "1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-ggplot2" ,r-ggplot2)
-- 
cgit v1.2.3


From 992f2069d5635f823a7f7ecde7417432e5b7242e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 20:26:21 +0200
Subject: gnu: gmime: Update to 3.2.4.

* gnu/packages/mail.scm (gmime): Update to 3.2.4.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 61d11b7e2c..2f2e7fd4eb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -491,7 +491,7 @@ It adds a large amount of new and improved features to mutt.")
 (define-public gmime
   (package
     (name "gmime")
-    (version "3.2.3")
+    (version "3.2.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gmime/"
@@ -499,7 +499,7 @@ It adds a large amount of new and improved features to mutt.")
                                   "/gmime-" version ".tar.xz"))
               (sha256
                (base32
-                "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a"))))
+                "096hh4g6z343kncw9svcrzv05d41n4v2q5k9jsm6gc40w30ag7i4"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-- 
cgit v1.2.3


From d2fd037fd04623d626132501eb97bb73d74d0ef4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 20:52:40 +0200
Subject: gnu: libxls: Update to 1.5.1.

* gnu/packages/statistics.scm (libxls): Update to 1.5.1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 668372ca87..e745c4026e 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -158,14 +158,14 @@ simulation not wholly unlike BUGS.  JAGS was written with three aims in mind:
 (define-public libxls
   (package
     (name "libxls")
-    (version "1.5.0")
+    (version "1.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/libxls/libxls/releases/download/"
                            "v" version "/libxls-" version ".tar.gz"))
        (sha256
-        (base32 "00j2lrcvvhclmh3z9vy7myqq1br1jnnqkz2wzgk4a1gbg8c5afn5"))))
+        (base32 "0dam8qgbc5ykzaxmrjhpmfm8lnlcdk6cbpzyaya91qwwa80qbj1v"))))
     (build-system gnu-build-system)
     (home-page "https://github.com/libxls/libxls")
     (synopsis "Read binary (.xls) Excel spreadsheet files")
-- 
cgit v1.2.3


From 5e5f7167943b408ae55736a44908a82056c87780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 5 Oct 2019 21:54:31 +0200
Subject: syscalls: Add 'add-to-entropy-count'.

* guix/build/syscalls.scm (RNDADDTOENTCNT): New variable.
(add-to-entropy-count): New procedure.
* tests/syscalls.scm ("add-to-entropy-count"): New test.
---
 guix/build/syscalls.scm | 28 ++++++++++++++++++++++++++++
 tests/syscalls.scm      | 13 +++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index f2fdb4d9d1..bbf2531c79 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -68,6 +68,7 @@
             statfs
             free-disk-space
             device-in-use?
+            add-to-entropy-count
 
             processes
             mkdtemp!
@@ -706,6 +707,33 @@ backend device."
              (list (strerror err))
              (list err))))))
 
+
+;;;
+;;; Random.
+;;;
+
+;; From .
+(define RNDADDTOENTCNT #x40045201)
+
+(define (add-to-entropy-count port-or-fd n)
+  "Add N to the kernel's entropy count (the value that can be read from
+/proc/sys/kernel/random/entropy_avail).  PORT-OR-FD must correspond to
+/dev/urandom or /dev/random.  Raise to 'system-error with EPERM when the
+caller lacks root privileges."
+  (let ((fd  (if (port? port-or-fd)
+                 (fileno port-or-fd)
+                 port-or-fd))
+        (box (make-bytevector (sizeof int))))
+    (bytevector-sint-set! box 0 n (native-endianness)
+                          (sizeof int))
+    (let-values (((ret err)
+                  (%ioctl fd RNDADDTOENTCNT
+                          (bytevector->pointer box))))
+      (unless (zero? err)
+        (throw 'system-error "add-to-entropy-count" "~A"
+               (list (strerror err))
+               (list err))))))
+
 
 ;;;
 ;;; Containers.
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index eeb223b950..1b3121e503 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -567,6 +567,19 @@
   (let ((result (call-with-input-file "/var/run/utmpx" read-utmpx)))
     (or (utmpx? result) (eof-object? result))))
 
+(when (zero? (getuid))
+  (test-skip 1))
+(test-equal "add-to-entropy-count"
+  EPERM
+  (call-with-output-file "/dev/urandom"
+    (lambda (port)
+      (catch 'system-error
+        (lambda ()
+          (add-to-entropy-count port 77)
+          #f)
+        (lambda args
+          (system-error-errno args))))))
+
 (test-end)
 
 (false-if-exception (delete-file temp-file))
-- 
cgit v1.2.3


From 81bc4533aa1d7d81472c1d8d9f697ba2a9c9cbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sat, 5 Oct 2019 22:03:06 +0200
Subject: services: urandom-seed: Credit the entropy added to the PRNG.

Partly fixes .
Reported by Marius Bakke .

* gnu/services/base.scm (urandom-seed-shepherd-service): In 'start'
method, add calls to 'add-to-entropy-count'.
---
 gnu/services/base.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 25716ef152..f7e90e26b7 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -573,7 +573,13 @@ file systems, as well as corresponding @file{/etc/fstab} entries.")))
                         (lambda (seed)
                           (call-with-output-file "/dev/urandom"
                             (lambda (urandom)
-                              (dump-port seed urandom))))))
+                              (dump-port seed urandom)
+
+                              ;; Writing SEED to URANDOM isn't enough: we must
+                              ;; also tell the kernel to account for these
+                              ;; extra bits of entropy.
+                              (let ((bits (* 8 (stat:size (stat seed)))))
+                                (add-to-entropy-count urandom bits)))))))
 
                     ;; Try writing from /dev/hwrng into /dev/urandom.
                     ;; It seems that the file /dev/hwrng always exists, even
@@ -590,7 +596,9 @@ file systems, as well as corresponding @file{/etc/fstab} entries.")))
                       (when buf
                         (call-with-output-file "/dev/urandom"
                           (lambda (urandom)
-                            (put-bytevector urandom buf)))))
+                            (put-bytevector urandom buf)
+                            (let ((bits (* 8 (bytevector-length buf))))
+                              (add-to-entropy-count urandom bits))))))
 
                     ;; Immediately refresh the seed in case the system doesn't
                     ;; shut down cleanly.
-- 
cgit v1.2.3


From 07c1a10ef6cd24a0a02aefb281931fdd6fa3895e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 19:30:13 +0200
Subject: gnu: axoloti-runtime: Don't use unstable tarball.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/axoloti.scm (axoloti-runtime)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
(axoloti-patcher)[arguments]: Add ‘make-git-checkout-writable’ phase.
---
 gnu/packages/axoloti.scm | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm
index 6a76ad6be7..a3ca6b6844 100644
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus 
+;;; Copyright © 2019 Tobias Geerinckx-Rice 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,6 +21,7 @@
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system ant)
@@ -64,20 +66,21 @@
   (package
     (name "axoloti-runtime")
     (version "1.0.12")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/axoloti/axoloti/"
-                                  "archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1dynk6h0nixp4zihpirpqa4vi8fq1lhm443jsmvhk135ykhf364p"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  ;; Remove pre-built Java binaries.
-                  (delete-file-recursively "lib/")
-                  #t))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/axoloti/axoloti.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "05hyr9qx9dplp0gkx4v34i17972b3f512qndnarzy4wzfpnp0s3b"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Remove pre-built Java binaries.
+           (delete-file-recursively "lib/")
+           #t))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no check target
@@ -231,6 +234,10 @@ runtime.")
                            ,@%gnu-build-system-modules)
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
          (delete 'configure)
          (replace 'build
            (lambda* (#:key inputs #:allow-other-keys)
-- 
cgit v1.2.3


From 9e560c185cf8781c0e14ddf2efd9c0992956dae5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 22:23:12 +0200
Subject: gnu: ocaml-qcheck: Update to 0.11.

* gnu/packages/ocaml.scm (ocaml-qcheck): Update to 0.11.
---
 gnu/packages/ocaml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 146fb63d5e..981781f39e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1186,7 +1186,7 @@ GNU CC attributes.  It provides also a C pretty printer as an example of use.")
 (define-public ocaml-qcheck
   (package
     (name "ocaml-qcheck")
-    (version "0.10")
+    (version "0.11")
     (source
      (origin
        (method git-fetch)
@@ -1195,7 +1195,7 @@ GNU CC attributes.  It provides also a C pretty printer as an example of use.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1i7axg7vmivrkzsahyg79my584myvzxv0922k4000bdwnhzd0kzh"))))
+        (base32 "0d2wih4zxn2zm7kxd9dnf5nlp838km3vz6wv80fa3m51609fb24i"))))
     (build-system dune-build-system)
     (arguments
      `(#:test-target "."))
-- 
cgit v1.2.3


From 1e6e526e0cf924637d3912b0116aff46662d147a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sat, 5 Oct 2019 22:23:19 +0200
Subject: gnu: ocaml-utop: Update to 2.4.2.

* gnu/packages/ocaml.scm (ocaml-utop): Update to 2.4.2.
---
 gnu/packages/ocaml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 981781f39e..7984e40382 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3123,7 +3123,7 @@ instead of bindings to a C library.")
 (define-public ocaml-utop
   (package
     (name "ocaml-utop")
-    (version "2.4.1")
+    (version "2.4.2")
     (source
      (origin
        (method git-fetch)
@@ -3132,7 +3132,7 @@ instead of bindings to a C library.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3"))))
+        (base32 "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm"))))
     (build-system dune-build-system)
     (arguments
      `(#:jbuild? #t
-- 
cgit v1.2.3


From 32faec65aa271ba90faef24d5c461470c7925c6e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sat, 5 Oct 2019 20:36:33 +0200
Subject: gnu: emacs-org-tanglesync: Update to 0.6-2.d99181f.

* gnu/packages/emacs-xyz.scm (emacs-org-tanglesync): Update to 0.6-2.d99181f.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index afa21ee19e..4e205ded7e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -4513,8 +4513,8 @@ organizer.")
     (license license:gpl3+)))
 
 (define-public emacs-org-tanglesync
-  (let ((commit "ab76a3eaaed263677d2e029d43f6c4de8fc21418")
-        (revision "1"))
+  (let ((commit "d99181f173b4e55b4e835d99fcd415e62beb047f")
+        (revision "2"))
     (package
       (name "emacs-org-tanglesync")
       (version (git-version "0.6" revision commit))
@@ -4526,7 +4526,7 @@ organizer.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "14ify3yirq2qmi9isk8kcbwx8pbclv1fyg49kraz4srhgf2fssgf"))))
+          (base32 "0x94gy1bgfd1f3p9w2bfrqj11bwy9ql0cpi1gw6srpj7kykx0lml"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-org" ,emacs-org)))
-- 
cgit v1.2.3


From d7885bbf071e19c6faa2b3fc7c07822682ffc2d9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 00:01:01 +0200
Subject: gnu: libmpack: Don't use unstable tarball.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/serialization.scm (libmpack)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
(lua-libmpack)[arguments]: Adjust ‘unpack-mpack-sources’ phase.
---
 gnu/packages/serialization.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 9fefa5a0c1..b2198d2bd0 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2017 Gregor Giesen 
 ;;; Copyright © 2017 Frederick M. Muriithi 
 ;;; Copyright © 2017 ng0 
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -141,14 +141,15 @@ serialization.")
   (package
     (name "libmpack")
     (version "1.0.5")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/tarruda/libmpack/"
-                                  "archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0ml922gv8y99lbldqb9ykpjndla0hlprdjyl79yskkhwv2ai7sac"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tarruda/libmpack.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -205,10 +206,9 @@ that implements both the msgpack and msgpack-rpc specifications.")
              ;; prerequisites are added to the inputs of the gcc invocation.
              (substitute* "Makefile"
                (("\\$\\(MPACK\\): mpack-src") "$(MPACK): "))
-             (mkdir-p "mpack-src")
-             (zero? (system* "tar" "-C" "mpack-src"
-                             "--strip-components=1"
-                             "-xvf" (assoc-ref inputs "libmpack"))))))))
+             (copy-recursively (assoc-ref inputs "libmpack")
+                               "mpack-src")
+             #t)))))
     (inputs
      `(("lua" ,lua)))
     (native-inputs
-- 
cgit v1.2.3


From 9fde2268bcc8c28959e7d7146f6f6d7698f853e9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 00:19:34 +0200
Subject: gnu: lua-libmpack: Don't use unstable tarball.

* gnu/packages/serialization.scm (lua-libmpack)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
---
 gnu/packages/serialization.scm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index b2198d2bd0..eb8f6de791 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -170,14 +170,15 @@ that implements both the msgpack and msgpack-rpc specifications.")
 (define-public lua-libmpack
   (package (inherit libmpack)
     (name "lua-libmpack")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/libmpack/libmpack-lua/"
-                                  "archive/" (package-version libmpack) ".tar.gz"))
-              (file-name (string-append name "-" (package-version libmpack) ".tar.gz"))
-              (sha256
-               (base32
-                "153zrrbyxhf71dgzjjhrk56rfwk3nisslpgcqyg44v8fnz1xpk6i"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/libmpack/libmpack-lua.git")
+             (commit (package-version libmpack))))
+       (file-name (git-file-name name (package-version libmpack)))
+       (sha256
+        (base32 "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92"))))
     (build-system gnu-build-system)
     (arguments
      `(;; FIXME: tests require "busted", which is not yet available in Guix.
-- 
cgit v1.2.3


From 0395c5335985ae103cec97eca85b1e282b3d9b88 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 01:22:06 +0200
Subject: gnu: libqmatrixclient: Update to 0.5.2.

* gnu/packages/messaging.scm (libqmatrixclient): Update to 0.5.2.
---
 gnu/packages/messaging.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 2cb357ff3a..695bc18ff4 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1734,23 +1734,23 @@ notifications, and Python scripting support.")
 (define-public libqmatrixclient
   (package
     (name "libqmatrixclient")
-    (version "0.4.0")
+    (version "0.5.2")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
               (url "https://github.com/QMatrixClient/libqmatrixclient")
-              (commit (string-append "v" version))))
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"))))
+        (base32 "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr"))))
     (build-system cmake-build-system)
     (inputs
-     `(("qtbase" ,qtbase)))
+     `(("qtbase" ,qtbase)
+       ("qtmultimedia" ,qtmultimedia)))
     (arguments
      `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON")
-       #:tests? #f)) ; No tests
+       #:tests? #f))                    ; no tests
     (home-page "https://matrix.org/docs/projects/sdk/libqmatrixclient.html")
     (synopsis "Qt5 client library for the Matrix instant messaging protocol")
     (description "libqmatrixclient is a Qt5 library to write clients for the
-- 
cgit v1.2.3


From 1e9b956e414821087ba5c1e4e7a47c853d9728a3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 01:23:55 +0200
Subject: gnu: quaternion: Update to 0.0.9.4c.

* gnu/packages/messaging.scm (quaternion): Update to 0.0.9.4c.
---
 gnu/packages/messaging.scm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 695bc18ff4..c69f76893a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1762,27 +1762,27 @@ QMatrixClient project.")
 (define-public quaternion
   (package
     (name "quaternion")
-    (version "0.0.9.3")
+    (version "0.0.9.4c")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
               (url "https://github.com/QMatrixClient/Quaternion")
-              (commit (string-append "v" version))))
+              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32
-         "1hr9zqf301rg583n9jv256vzj7y57d8qgayk7c723bfknf1s6hh3"))))
+        (base32 "0gpv6b3nn3lsyym8809kiqkpdszfasldqjpk5s542zyn41gdlql4"))))
     (build-system cmake-build-system)
     (inputs
      `(("libqmatrixclient" ,libqmatrixclient)
        ("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)
+       ("qtmultimedia" ,qtmultimedia)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtsvg" ,qtsvg)
        ("qttools" ,qttools)))
     (arguments
-     `(#:tests? #f ; No tests
+     `(#:tests? #f                      ; no tests
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-program
@@ -1804,8 +1804,8 @@ QMatrixClient project.")
 messaging protocol.  It uses libqmatrixclient and is its reference client
 implementation.  Quaternion and libqmatriclient together form the
 QMatrixClient project.")
-    (license (list license:gpl3+ ; all source code
-                   license:lgpl3+)))) ; icons/breeze
+    (license (list license:gpl3+        ; all source code
+                   license:lgpl3+))))   ; icons/breeze
 
 (define-public hangups
   (package
-- 
cgit v1.2.3


From d1b0e1fd6ded6213427353cc5178bf9c1e961473 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 01:25:42 +0200
Subject: gnu: perl-html-form: Update to 6.05.

* gnu/packages/web.scm (perl-html-form): Update to 6.05.
---
 gnu/packages/web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 186d349197..8cca0da22d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -2599,14 +2599,14 @@ composed of HTML::Element style components.")
 (define-public perl-html-form
   (package
     (name "perl-html-form")
-    (version "6.04")
+    (version "6.05")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://cpan/authors/id/O/OA/OALDERS/"
                            "HTML-Form-" version ".tar.gz"))
        (sha256
-        (base32 "100090bdsr5kapv8h0wxzwlzfbfqn57rq9gzrvg9i6hvnsl5gmcw"))))
+        (base32 "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin"))))
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-html-parser" ,perl-html-parser)
-- 
cgit v1.2.3


From 3acd85ac3080f7c82b8ed9fe89f7c8227203fcf5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 01:26:47 +0200
Subject: gnu: lua-libmpack: Update to 1.0.8.

* gnu/packages/serialization.scm (lua-libmpack): Update to 1.0.8.
---
 gnu/packages/serialization.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index eb8f6de791..4f571243f4 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -170,15 +170,16 @@ that implements both the msgpack and msgpack-rpc specifications.")
 (define-public lua-libmpack
   (package (inherit libmpack)
     (name "lua-libmpack")
+    (version "1.0.8")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/libmpack/libmpack-lua.git")
-             (commit (package-version libmpack))))
-       (file-name (git-file-name name (package-version libmpack)))
+             (commit version)))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "10zx4biyi9gmk90aa6674vvqsrz74jy74fxqlcrx66c8sl8yxr92"))))
+        (base32 "1ijvzgq5hvib03w5rghv31wi7byamwg7qdx5pawvhvnflaii8ivw"))))
     (build-system gnu-build-system)
     (arguments
      `(;; FIXME: tests require "busted", which is not yet available in Guix.
-- 
cgit v1.2.3


From 5327fbb39163cb8630ecfab39ebbb6bcd90d6788 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 01:32:03 +0200
Subject: gnu: lua-luv: Update to 1.30.1-1.

* gnu/packages/lua.scm (lua-luv): Update to 1.30.1-1.
---
 gnu/packages/lua.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 075decc61a..23604868a5 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 doncatnip 
 ;;; Copyright © 2016, 2017, 2019 Clément Lassieur 
 ;;; Copyright © 2016 José Miguel Sánchez García 
-;;; Copyright © 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Fis Trivial 
 ;;;
 ;;; This file is part of GNU Guix.
@@ -454,7 +454,7 @@ Grammars (PEGs).")
 (define (make-lua-luv name lua)
   (package
     (name name)
-    (version "1.30.1-0")
+    (version "1.30.1-1")
     (source (origin
               ;; The release tarball includes the sources of libuv but does
               ;; not include the pkg-config files.
@@ -465,10 +465,10 @@ Grammars (PEGs).")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1lfzzyphpim28kw33k7zylcyxnf40ckhdg6hbqyzb5hszdf2hbka"))))
+                "0b2zxrsjxzhzwfp28lchplrp272v6zkbpq1ddz7a0rf20l7dbls1"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f ; there are none
+     `(#:tests? #f                      ; there are none
        #:configure-flags
        '("-DWITH_LUA_ENGINE=Lua"
          "-DWITH_SHARED_LIBUV=On"
-- 
cgit v1.2.3


From 5d7e1c807dd1184b9145f27d83b72fde34f204b7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 01:37:32 +0200
Subject: gnu: perl-test-mockobject: Update to 1.20191002.

* gnu/packages/perl-check.scm (perl-test-mockobject): Update to 1.20191002.
---
 gnu/packages/perl-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index 98d01d598a..5eac984423 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -836,14 +836,14 @@ you @code{unmock()} the subroutine.")
 (define-public perl-test-mockobject
   (package
     (name "perl-test-mockobject")
-    (version "1.20180705")
+    (version "1.20191002")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://cpan/authors/id/C/CH/CHROMATIC/"
                            "Test-MockObject-" version ".tar.gz"))
        (sha256
-        (base32 "06250ayzzd90vbvkpxwr9d3nlbbngl1b9nk2qk0ma4aibn6ha5j5"))))
+        (base32 "160r36j727hw6syazh6sfq862f95dp1zcga0nil7cjlry77lqsn7"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-cgi" ,perl-cgi)
-- 
cgit v1.2.3


From d71bbfea5430462d130f18acf5d93b8fc7a065d9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 02:03:16 +0200
Subject: gnu: perl-test-tcp: Update to 2.21.

* gnu/packages/web.scm (perl-test-tcp): Update to 2.21.
---
 gnu/packages/web.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8cca0da22d..ea25812157 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3635,14 +3635,14 @@ either mocked HTTP or a locally spawned server.")
 (define-public perl-test-tcp
   (package
     (name "perl-test-tcp")
-    (version "2.19")
+    (version "2.21")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://cpan/authors/id/T/TO/TOKUHIROM/"
+       (uri (string-append "mirror://cpan/authors/id/K/KA/KAZUHO/"
                            "Test-TCP-" version ".tar.gz"))
        (sha256
-        (base32 "14ahzklq3xgmwj58p9vdcfgpggrmh3nigq5mzqk4wakbb6fjs0fx"))))
+        (base32 "1djnaw1yli0kcd7azchqnp59l62f6mp13q50xyrjirpaxhd51j32"))))
     (build-system perl-build-system)
     (propagated-inputs
      `(("perl-test-sharedfork" ,perl-test-sharedfork)))
-- 
cgit v1.2.3


From 11820827d017de089ce3ce32a311c59b9b08d547 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 02:17:32 +0200
Subject: gnu: r-polspline: Update to 1.1.16.

* gnu/packages/cran.scm (r-polspline): Update to 1.1.16.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 411a4ef564..e08bac57e2 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13056,14 +13056,13 @@ either PDF/EPS files.")
 (define-public r-polspline
   (package
     (name "r-polspline")
-    (version "1.1.15")
+    (version "1.1.16")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "polspline" version))
        (sha256
-        (base32
-         "19zs4kpagsrzhng1byjbz1c4jxnfk58h4rgr096ml1bjwrgamnwc"))))
+        (base32 "0d49h7if8h6d784nsnqqxakg19kvl8cmz8k53901m2h0c0amlfxa"))))
     (build-system r-build-system)
     (native-inputs `(("gfortran" ,gfortran)))
     (home-page "https://cran.r-project.org/web/packages/polspline/")
-- 
cgit v1.2.3


From 79e3e6a5c0a9187fdd00f42a9f0fc5d16b72f883 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 02:18:29 +0200
Subject: gnu: rust-openssl-sys: Update to 0.9.50.

* gnu/packages/crates-io.scm (rust-openssl-sys): Update to 0.9.50.
---
 gnu/packages/crates-io.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index be2a1bd890..306af3a9ee 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2429,15 +2429,14 @@ system for OpenSSL.")
 (define-public rust-openssl-sys
   (package
     (name "rust-openssl-sys")
-    (version "0.9.49")
+    (version "0.9.50")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "openssl-sys" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "1168vivyqbzaxl48bvv9r1x714c03f5c1za8pv5x8fyj9gjxkypl"))))
+         (base32 "1dn3capgiz77s6rpmc2sf8gadwkmhwgfd6mw4rcnnm9jp36dqhic"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
cgit v1.2.3


From 12a66af6b03a4fabb2e129e79690cf90d9d17cc0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 02:21:16 +0200
Subject: gnu: rust-miniz-oxide: Update to 0.3.3.

* gnu/packages/crates-io.scm (rust-miniz-oxide): Update to 0.3.3.
---
 gnu/packages/crates-io.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 306af3a9ee..b4b1a0440e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1972,15 +1972,14 @@ file IO.")
 (define-public rust-miniz-oxide
   (package
     (name "rust-miniz-oxide")
-    (version "0.3.2")
+    (version "0.3.3")
     (source
       (origin
         (method url-fetch)
         (uri (crate-uri "miniz_oxide" version))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32
-          "041s41l5w7z8pkp93pdzn8rngxr93q4wxp034pr0cvc7bgway23i"))))
+         (base32 "1bmanbbcdmssfbgik3fs323g7vljc5wkjz7s61jsbbz2kg0nckrh"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
-- 
cgit v1.2.3


From 44805ca5039be6439f37ab68a4406c68c6904dde Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 02:26:37 +0200
Subject: gnu: r-pegas: Update to 0.12.

* gnu/packages/cran.scm (r-pegas): Update to 0.12.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e08bac57e2..31d1bc6b7a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12948,14 +12948,13 @@ also provided to illustrate various methods.")
 (define-public r-pegas
   (package
     (name "r-pegas")
-    (version "0.11")
+    (version "0.12")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pegas" version))
        (sha256
-        (base32
-         "0l21bapzbjcvblbvks3jh9rpy9hng1ccd7f0glhqw695lc737bpx"))))
+        (base32 "0sb8cmz4d238mcb56hv9fa0cagm00k82r7aj4cj4lxa1flxlpy8p"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-adegenet" ,r-adegenet)
-- 
cgit v1.2.3


From ac5e205a3c09c20d08d8c5cea8fde8f4ebb45cf2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 02:47:52 +0200
Subject: gnu: python-traitlets: Update to 4.3.3.

* gnu/packages/python-xyz.scm (python-traitlets): Update to 4.3.3.
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 840281600b..42c2b2730f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5222,14 +5222,14 @@ away.")
 (define-public python-traitlets
   (package
     (name "python-traitlets")
-    (version "4.3.2")
+    (version "4.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "traitlets" version))
        (sha256
         (base32
-         "0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww"))))
+         "1xsrwgivpkxlbr4dfndfsi098s29yqgswgjc1qqn69yxklvfw8yh"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -5237,7 +5237,7 @@ away.")
          (replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets"))))))
     (propagated-inputs
      `(("python-ipython-genutils" ,python-ipython-genutils)
-       ("python-decorator" ,python-decorator)))    ;not needed for >4.3.2
+       ("python-decorator" ,python-decorator)))
     (native-inputs
      `(("python-pytest" ,python-pytest)))
     (properties `((python2-variant . ,(delay python2-traitlets))))
-- 
cgit v1.2.3


From ef10cbb41f89b4a021433ca4fa9f5924a1d45d14 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 02:56:59 +0200
Subject: gnu: r-gamlss-dist: Update to 5.1-5.

* gnu/packages/cran.scm (r-gamlss-dist): Update to 5.1-5.
---
 gnu/packages/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 31d1bc6b7a..1f35356e05 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -11799,14 +11799,13 @@ such software by imputing dropout events.")
 (define-public r-gamlss-dist
   (package
     (name "r-gamlss-dist")
-    (version "5.1-4")
+    (version "5.1-5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gamlss.dist" version))
        (sha256
-        (base32
-         "0zi87lgigr83l35zqq1y1g4cdq6ssjamripzz7yis74aznh6qg1l"))))
+        (base32 "1rl7hzdg5xpvaq3yyzwxhsaqzzs0qidi3ibv454fisijgv8l4vqw"))))
     (properties `((upstream-name . "gamlss.dist")))
     (build-system r-build-system)
     (propagated-inputs `(("r-mass" ,r-mass)))
-- 
cgit v1.2.3


From 011ec062f3626bf02df3bf8a665aa5074183b269 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 04:13:49 +0200
Subject: gnu: python-mnemonic: Update to 0.19.

* gnu/packages/finance.scm (python-mnemonic): Update to 0.19.
---
 gnu/packages/finance.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3fa0a4d331..2388839524 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -732,14 +732,13 @@ Ledger Nano as a hardware SSH/GPG agent.")
 (define-public python-mnemonic
   (package
     (name "python-mnemonic")
-    (version "0.18")
+    (version "0.19")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "mnemonic" version))
         (sha256
-          (base32
-            "07bzfa5di6nv5xwwcwbypnflpj50wlfczhh6q6hg8w13g5m319q2"))))
+          (base32 "0cd9prmdj8wzdmc7lxbf9lz0xrlkvak5ignag406mmfbn81fndsf"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pbkdf2" ,python-pbkdf2)))
-- 
cgit v1.2.3


From 5a54baf67cfb91ad5062a4a061bc6d083096f9d8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 04:46:22 +0200
Subject: gnu: r-data-table: Update to 1.12.4.

* gnu/packages/statistics.scm (r-data-table): Update to 1.12.4.
[inputs]: Add zlib.
---
 gnu/packages/statistics.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index e745c4026e..0c98e61cbc 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1848,14 +1848,16 @@ times.")
 (define-public r-data-table
   (package
     (name "r-data-table")
-    (version "1.12.2")
+    (version "1.12.4")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "data.table" version))
               (sha256
                (base32
-                "1x929lwhai6nkppm4zvicyw5qh5va5sizp86r30qnfkh1n7w2mfv"))))
+                "0zdcbr4nixvl8ga4mp9pw1dfww35dzhzpb6ixajqasiri824m7i9"))))
     (build-system r-build-system)
+    (inputs
+     `(("zlib" ,zlib)))
     (home-page "https://github.com/Rdatatable/data.table/wiki")
     (synopsis "Enhanced version of data.frame R object")
     (description
-- 
cgit v1.2.3


From 6792908d6d142e0c97acdf748b5591ca6f18cc0b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 6 Oct 2019 11:05:27 +0300
Subject: gnu: waybar: Update to 0.8.0.

* gnu/packages/wm.scm (waybar): Update to 0.8.0.
---
 gnu/packages/wm.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 865b1edee1..4c0a9bbc4b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1420,7 +1420,7 @@ modules for building a Wayland compositor.")
 (define-public waybar
   (package
     (name "waybar")
-    (version "0.6.8")
+    (version "0.8.0")
     (source
      (origin
        (method git-fetch)
@@ -1429,7 +1429,7 @@ modules for building a Wayland compositor.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0wyp1p9r1k8jnjq8clp2fx8xa3f4lfrgbp67fxrjh9718p4br0ab"))))
+        (base32 "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From 1e8826bdd3103dbe187b2443b2d8ea937cbd1f1c Mon Sep 17 00:00:00 2001
From: "tlecarrour@easter-eggs.com" 
Date: Fri, 4 Oct 2019 09:48:40 +0200
Subject: gnu: Update python-pastel to 0.1.1.

* gnu/packages/graphics.scm (python-pastel): Update to 0.1.1.
[arguments]: Add custom 'check phase.
[description]: Simplify description.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/graphics.scm | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 6d6c8d1e1c..88bb500450 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2019 John Soo 
 ;;; Copyright © 2019 Pierre Neidhardt 
 ;;; Copyright © 2019 Marius Bakke 
+;;; Copyright © 2019 Tanguy Le Carrour 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -913,28 +914,25 @@ rendering SVG graphics.")
 (define-public python-pastel
   (package
     (name "python-pastel")
-    (version "0.1.0")
+    (version "0.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pastel" version))
        (sha256
         (base32
-         "1hqbm934n5yjwn31aq8h7shrr0rcy326wrqfc856vyn0gr0sy21i"))))
+         "1qxcrcl8pzh66l8s6hym153mijdhwna0afcsmgca0bj4n80ijfxz"))))
     (build-system python-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda _ (invoke "pytest" "pastel" "tests/"))))))
     (native-inputs
      `(("python-pytest" ,python-pytest)))
     (home-page "https://github.com/sdispater/pastel")
     (synopsis "Library to colorize strings in your terminal")
     (description "Pastel is a simple library to help you colorize strings in
-your terminal.  It comes bundled with predefined styles:
-@enumerate
-@item info: green
-@item comment: yellow
-@item question: black on cyan
-@item error: white on red
-@end enumerate
-")
+your terminal.")
     (license license:expat)))
 
 (define-public python2-pastel
-- 
cgit v1.2.3


From e7f6d13722aed00ac16b49dfc03b2712e465b46a Mon Sep 17 00:00:00 2001
From: Giovanni Biscuolo 
Date: Fri, 4 Oct 2019 18:15:28 +0200
Subject: gnu: zabbix: Update to 4.2.7.

* gnu/packages/monitoring.scm: (zabbix) Update to 4.2.7.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/monitoring.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index a34e002a8c..b165e6952d 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -152,7 +152,7 @@ etc. via a Web interface.  Features include:
 (define-public zabbix-agentd
   (package
     (name "zabbix-agentd")
-    (version "4.2.0")
+    (version "4.2.7")
     (source
      (origin
        (method url-fetch)
@@ -161,7 +161,7 @@ etc. via a Web interface.  Features include:
              "/zabbix-" version ".tar.gz"))
        (sha256
         (base32
-         "1b9wx6z15jfg8yakb7mlaqqri1ia9i12rgk58c3nparzsjdd9p2c"))))
+         "09znh8x1sass5mw6wjrfmizjbfls8ad2c16y24ldfj40hlfxz6wx"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From aa641984923ffe2c5a5aecff4315e906d5b4c6fc Mon Sep 17 00:00:00 2001
From: Timotej Lazar 
Date: Sat, 5 Oct 2019 18:46:12 +0200
Subject: gnu: endless-sky: Update to 0.9.10.

* gnu/packages/games.scm (endless-sky): Update to 0.9.10.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/games.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4b14fce771..c0d8ce9c71 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -43,6 +43,7 @@
 ;;; Copyright © 2019 Jesse Gibbons 
 ;;; Copyright © 2019 Dan Frumin 
 ;;; Copyright © 2019 Guillaume Le Vaillant 
+;;; Copyright © 2019 Timotej Lazar 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6187,7 +6188,7 @@ your score gets higher, you level up and the blocks fall faster.")
 (define-public endless-sky
   (package
     (name "endless-sky")
-    (version "0.9.8")
+    (version "0.9.10")
     (source
       (origin
         (method git-fetch)
@@ -6197,7 +6198,7 @@ your score gets higher, you level up and the blocks fall faster.")
         (file-name (git-file-name name version))
         (sha256
          (base32
-          "0i36lawypikbq8vvzfis1dn7yf6q0d2s1cllshfn7kmjb6pqfi6c"))))
+          "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i"))))
     (build-system scons-build-system)
     (arguments
      `(#:scons ,scons-python2
-- 
cgit v1.2.3


From d24d980e8e649911ec551530b58519e8d9995c69 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 6 Oct 2019 14:38:02 +0300
Subject: gnu: Remove rust-clippy.

This was added by accident in 14f3a7e37314451b9b93d7b7536f3ae3dec1ed68.

* gnu/packages/crates-io.scm (rust-clippy): Remove variable.
---
 gnu/packages/crates-io.scm | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b4b1a0440e..51d9363b55 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -476,31 +476,6 @@ depending on a large number of #[cfg] parameters.  Structured like an
 colorization.")
     (license license:expat)))
 
-(define-public rust-clippy
-  (package
-    (name "rust-clippy")
-    (version "0.0.302")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "clippy" version))
-        (file-name
-          (string-append name "-" version ".tar.gz"))
-        (sha256
-          (base32
-            "1562x3sq9mgmc8j39gd34wqm7ybrdvpmj7cc1n450gwsawayw4fr"))))
-    (build-system cargo-build-system)
-    (arguments
-      `(#:cargo-inputs
-        (("rust-term" ,rust-term))))
-    (home-page "https://github.com/rust-lang/rust-clippy")
-    (synopsis
-      "A bunch of helpful lints to avoid common pitfalls in Rust.")
-    (description
-      "This package provides a bunch of helpful lints to avoid common pitfalls in Rust.")
-    (license (list license:asl2.0
-                   license:expat))))
-
 (define-public rust-cloudabi
   (package
     (name "rust-cloudabi")
-- 
cgit v1.2.3


From d3287fc157e98a0f5d13f2e12e06fb8660711e73 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Tue, 1 Oct 2019 10:55:24 +0200
Subject: gnu: Add chanl.

* gnu/packages/lisp.scm (sbcl-chanl, cl-chanl, ecl-chanl): New variables.
---
 gnu/packages/lisp.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 2939fdc4ed..80ceb95271 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7348,3 +7348,57 @@ compression/decompression using bindings to the lzlib C library.")
 
 (define-public ecl-lzlib
   (sbcl-package->ecl-package sbcl-lzlib))
+
+(define-public sbcl-chanl
+  (let ((commit "2362b57550c2c9238cc882d03553aaa1040b7340")
+        (revision "0"))
+    (package
+      (name "sbcl-chanl")
+      (version (git-version "0.4.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/zkat/chanl.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0ag3wz7yrqwp0s5069wwda98z3rrqd25spg8sa8rdqghj084w28w"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("fiveam" ,sbcl-fiveam)))
+      (inputs
+       `(("bordeaux-threads" ,sbcl-bordeaux-threads)))
+      (synopsis "Portable channel-based concurrency for Common Lisp")
+      (description "Common Lisp library for channel-based concurrency.  In
+a nutshell, you create various threads sequentially executing tasks you need
+done, and use channel objects to communicate and synchronize the state of these
+threads.")
+      (home-page "https://github.com/zkat/chanl")
+      (license (list license:expat license:bsd-3)))))
+
+(define-public cl-chanl
+  (sbcl-package->cl-source-package sbcl-chanl))
+
+(define-public ecl-chanl
+  (let ((base (sbcl-package->ecl-package sbcl-chanl)))
+    (package
+      (inherit base)
+      (arguments
+       (substitute-keyword-arguments (package-arguments base)
+         ;; The CHANL.ACTORS package uses the :ARGUMENTS option of
+         ;; DEFINE-METHOD-COMBINATION, which is not implemented in ECL yet
+         ;; (see https://gitlab.com/embeddable-common-lisp/ecl/issues/305).
+         ;; So let's disable it for now, as it allows compiling the library
+         ;; and using the rest of it.
+         ((#:phases phases '%standard-phases)
+          `(modify-phases ,phases
+             (add-after 'unpack 'disable-chanl-actors
+               (lambda _
+                 (substitute* "chanl.asd"
+                   (("\\(:file \"actors\"\\)") ""))
+                 #t))))
+         ;; Disable the tests for now, as the SEND-SEQUENCE test seems to
+         ;; never end.
+         ((#:tests? _ #f) #f))))))
-- 
cgit v1.2.3


From fd0f8860ec667d091abb34f1e4dda4911e834dee Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Thu, 3 Oct 2019 11:01:11 +0200
Subject: gnu: ecl: Do not compile the deprecated MIT-RT.

Compiling the rt bundled with ECL prevents the ecl-rt package from compiling
properly, as ECL thinks it has already been compiled.

* gnu/packages/lisp.scm (ecl)[arguments]: Add '--without-rt' to
  'configure-flags'.
---
 gnu/packages/lisp.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 80ceb95271..3b810f4093 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -217,7 +217,8 @@ interface to the Tk widget system.")
               ("libgc" ,libgc)
               ("libffi" ,libffi)))
     (arguments
-     '(#:tests? #t
+     '(#:configure-flags '("--without-rt")
+       #:tests? #t
        #:parallel-tests? #f
        #:phases
        (modify-phases %standard-phases
-- 
cgit v1.2.3


From f65f7138460bf7dffdfebdb839c64405b8f10d8e Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Thu, 3 Oct 2019 11:01:12 +0200
Subject: gnu: sbcl-alexandria: Update to 1.0.0.

* gnu/packages/lisp.scm (sbcl-alexandria): Update to 1.0.0.
  [native-inputs]: Add rt.
---
 gnu/packages/lisp.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 3b810f4093..7a7baafe7e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -701,10 +701,10 @@ libraries for Machine Learning, Neural Nets and statistical estimation.")
 
 (define-public sbcl-alexandria
   (let ((revision "1")
-        (commit "926a066611b7b11cb71e26c827a271e500888c30"))
+        (commit "3b849bc0116ea70f215ee6b2fbf354e862aaa9dd"))
     (package
       (name "sbcl-alexandria")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
+      (version (git-version "1.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -713,9 +713,11 @@ libraries for Machine Learning, Neural Nets and statistical estimation.")
                (commit commit)))
          (sha256
           (base32
-           "18yncicdkh294j05rhgm23gzi36y9qy6vrfba8vg69jrxjp1hx8l"))
-         (file-name (string-append "alexandria-" version "-checkout"))))
+           "04amwvx2vl691f0plcfbqqwxgib9zimih7jrn5zl7mbwvrxy022b"))
+         (file-name (git-file-name name version))))
       (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("rt" ,sbcl-rt)))
       (synopsis "Collection of portable utilities for Common Lisp")
       (description
        "Alexandria is a collection of portable utilities.  It does not contain
-- 
cgit v1.2.3


From 7273b3b2a666b470fe508ae3221d9b93b60a4f15 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Thu, 3 Oct 2019 11:01:13 +0200
Subject: gnu: sbcl-hu.dwim.asdf: Update to 20190521.

* gnu/packages/lisp.scm (sbcl-hu.dwim.asdf): Update to 20190521.
  [uri]: Fetch more recent version from Quicklisp.
---
 gnu/packages/lisp.scm | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 7a7baafe7e..cc181dca06 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -1706,26 +1706,23 @@ consistent across multiple Common Lisp implementations.")
   (sbcl-package->ecl-package sbcl-trivial-features))
 
 (define-public sbcl-hu.dwim.asdf
-  (let ((commit "170b0e4fdde3df0bc537327e7600575daac9e141"))
-    (package
-      (name "sbcl-hu.dwim.asdf")
-      (version (git-version "0.0.0" "1" commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-           (url "https://github.com/nixeagle/hu.dwim.asdf")
-           (commit commit)))
-         (sha256
-          (base32 "10ax7p8y6vjqxzcq125p62kf68zi455a65ysgk0kl1f2v839c33v"))
-         (file-name (git-file-name "hu.dwim.asdf" version))))
-      (build-system asdf-build-system/sbcl)
-      (home-page "https://hub.darcs.net/hu.dwim/hu.dwim.asdf")
-      (synopsis "Extensions to ASDF")
-      (description "Various ASDF extensions such as attached test and
+  (package
+    (name "sbcl-hu.dwim.asdf")
+    (version "20190521")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://beta.quicklisp.org/archive/hu.dwim.asdf/"
+                           "2019-05-21/hu.dwim.asdf-" version "-darcs.tgz"))
+       (sha256
+        (base32
+         "0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn"))))
+    (build-system asdf-build-system/sbcl)
+    (home-page "https://hub.darcs.net/hu.dwim/hu.dwim.asdf")
+    (synopsis "Extensions to ASDF")
+    (description "Various ASDF extensions such as attached test and
 documentation system, explicit development support, etc.")
-      (license license:public-domain))))
+    (license license:public-domain)))
 
 (define-public cl-hu.dwim.asdf
   (sbcl-package->cl-source-package sbcl-hu.dwim.asdf))
-- 
cgit v1.2.3


From 2601da052314ee399711e34a1e5d958a14c2725b Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Thu, 3 Oct 2019 14:11:28 +0200
Subject: gnu: Add cl-store.

* gnu/packages/lisp.scm (sbcl-cl-store, cl-store, ecl-cl-store): New
  variables.
---
 gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index cc181dca06..007cdb7e0e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7402,3 +7402,35 @@ threads.")
          ;; Disable the tests for now, as the SEND-SEQUENCE test seems to
          ;; never end.
          ((#:tests? _ #f) #f))))))
+
+(define-public sbcl-cl-store
+  (let ((commit "cd01f2610d3360dc01ab972bd9317407aaea7745")
+        (revision "0"))
+    (package
+      (name "sbcl-cl-store")
+      (version (git-version "0.8.11" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/skypher/cl-store.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "05b7kh5af2ax7vlmphpac4vbqr84j5ivppj96qzb64fxpjpqglm4"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("rt" ,sbcl-rt)))
+      (synopsis "Common Lisp library to serialize data")
+      (description
+       "CL-STORE is a portable serialization package which should give you the
+ability to store all Common Lisp data types into streams.")
+      (home-page "http://www.common-lisp.net/project/cl-store/")
+      (license license:expat))))
+
+(define-public cl-store
+  (sbcl-package->cl-source-package sbcl-cl-store))
+
+(define-public ecl-cl-store
+  (sbcl-package->ecl-package sbcl-cl-store))
-- 
cgit v1.2.3


From 6e76087223b05ea57d357e345d120504dba9665c Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Thu, 3 Oct 2019 14:11:29 +0200
Subject: gnu: Add cl-libsvm-format.

* gnu/packages/machine-learning.scm (sbcl-cl-libsvm-format, cl-libsvm-format,
  ecl-cl-libsvm-format): New variables.
---
 gnu/packages/machine-learning.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index e48c91a2cf..a5b86b8010 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018 Julien Lepiller 
 ;;; Copyright © 2018 Björn Höfling 
 ;;; Copyright © 2019 Nicolas Goaziou 
+;;; Copyright © 2019 Guillaume Le Vaillant 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,6 +34,7 @@
   #:use-module (guix utils)
   #:use-module (guix download)
   #:use-module (guix svn-download)
+  #:use-module (guix build-system asdf)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system ocaml)
@@ -58,6 +60,7 @@
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages lisp)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages mpi)
   #:use-module (gnu packages ocaml)
@@ -1918,3 +1921,38 @@ that:
 @item Runs seamlessly on CPU and GPU.
 @end itemize\n")
     (license license:expat)))
+
+(define-public sbcl-cl-libsvm-format
+  (let ((commit "3300f84fd8d9f5beafc114f543f9d83417c742fb")
+        (revision "0"))
+    (package
+      (name "sbcl-cl-libsvm-format")
+      (version (git-version "0.1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/masatoi/cl-libsvm-format.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0284aj84xszhkhlivaigf9qj855fxad3mzmv3zfr0qzb5k0nzwrg"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("prove" ,sbcl-prove)
+         ("prove-asdf" ,sbcl-prove-asdf)))
+      (inputs
+       `(("alexandria" ,sbcl-alexandria)))
+      (synopsis "LibSVM data format reader for Common Lisp")
+      (description
+       "This Common Lisp library provides a fast reader for data in LibSVM
+format.")
+      (home-page "https://github.com/masatoi/cl-libsvm-format")
+      (license license:expat))))
+
+(define-public cl-libsvm-format
+  (sbcl-package->cl-source-package sbcl-cl-libsvm-format))
+
+(define-public ecl-cl-libsvm-format
+  (sbcl-package->ecl-package sbcl-cl-libsvm-format))
-- 
cgit v1.2.3


From 7a15aab83651afb90c4d8835b6a15370f996cce6 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Thu, 3 Oct 2019 14:11:30 +0200
Subject: gnu: Add cl-online-learning.

* gnu/packages/machine-learning.scm (sbcl-cl-online-learning,
  cl-online-learning, ecl-cl-online-learning): New variables.
---
 gnu/packages/machine-learning.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index a5b86b8010..2b46148095 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1956,3 +1956,42 @@ format.")
 
 (define-public ecl-cl-libsvm-format
   (sbcl-package->ecl-package sbcl-cl-libsvm-format))
+
+(define-public sbcl-cl-online-learning
+  (let ((commit "fc7a34f4f161cd1c7dd747d2ed8f698947781423")
+        (revision "0"))
+    (package
+      (name "sbcl-cl-online-learning")
+      (version (git-version "0.5" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/masatoi/cl-online-learning.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "14x95rlg80ay5hv645ki57pqvy12v28hz4k1w0f6bsfi2rmpxchq"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("prove" ,sbcl-prove)
+         ("prove-asdf" ,sbcl-prove-asdf)))
+      (inputs
+       `(("cl-libsvm-format" ,sbcl-cl-libsvm-format)
+         ("cl-store" ,sbcl-cl-store)))
+      (arguments
+       `(;; FIXME: Tests pass but then the check phase crashes
+         #:tests? #f))
+      (synopsis "Online Machine Learning for Common Lisp")
+      (description
+       "This library contains a collection of machine learning algorithms for
+online linear classification written in Common Lisp.")
+      (home-page "https://github.com/masatoi/cl-online-learning")
+      (license license:expat))))
+
+(define-public cl-online-learning
+  (sbcl-package->cl-source-package sbcl-cl-online-learning))
+
+(define-public ecl-cl-online-learning
+  (sbcl-package->ecl-package sbcl-cl-online-learning))
-- 
cgit v1.2.3


From 5a65fede0b44424a420c905b59fa16282285de77 Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant 
Date: Thu, 3 Oct 2019 14:11:31 +0200
Subject: gnu: Add cl-random-forest.

* gnu/packages/machine-learning.scm (sbcl-cl-random-forest, cl-random-forest,
  ecl-cl-random-forest): New variables.
---
 gnu/packages/machine-learning.scm | 53 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 2b46148095..8d6e4dc0b6 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1995,3 +1995,56 @@ online linear classification written in Common Lisp.")
 
 (define-public ecl-cl-online-learning
   (sbcl-package->ecl-package sbcl-cl-online-learning))
+
+(define-public sbcl-cl-random-forest
+  (let ((commit "85fbdd4596d40e824f70f1b7cf239cf544e49d51")
+        (revision "0"))
+    (package
+      (name "sbcl-cl-random-forest")
+      (version (git-version "0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/masatoi/cl-random-forest.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "097xv60i1ndz68sg9p4pc7c5gvyp9i1xgw966b4wwfq3x6hbz421"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("prove" ,sbcl-prove)
+         ("prove-asdf" ,sbcl-prove-asdf)
+         ("trivial-garbage" ,sbcl-trivial-garbage)))
+      (inputs
+       `(("alexandria" ,sbcl-alexandria)
+         ("cl-libsvm-format" ,sbcl-cl-libsvm-format)
+         ("cl-online-learning" ,sbcl-cl-online-learning)
+         ("lparallel" ,sbcl-lparallel)))
+      (arguments
+       `(;; The tests download data from the Internet
+         #:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'add-sb-cltl2-dependency
+             (lambda _
+               ;; sb-cltl2 is required by lparallel when using sbcl, but it is
+               ;; not loaded automatically.
+               (substitute* "cl-random-forest.asd"
+                 (("\\(in-package :cl-user\\)")
+                  "(in-package :cl-user) #+sbcl (require :sb-cltl2)"))
+               #t)))))
+      (synopsis "Random Forest and Global Refinement for Common Lisp")
+      (description
+       "CL-random-forest is an implementation of Random Forest for multiclass
+classification and univariate regression written in Common Lisp.  It also
+includes an implementation of Global Refinement of Random Forest.")
+      (home-page "https://github.com/masatoi/cl-random-forest")
+      (license license:expat))))
+
+(define-public cl-random-forest
+  (sbcl-package->cl-source-package sbcl-cl-random-forest))
+
+(define-public ecl-cl-random-forest
+  (sbcl-package->ecl-package sbcl-cl-random-forest))
-- 
cgit v1.2.3


From 19944227528502e3619a6d1557bc735224f6fef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 6 Oct 2019 11:44:06 +0200
Subject: system: Add 'mount' and 'umount' to '%setuid-programs'.

Fixes .
Reported by Diego Nicola Barbato .

* gnu/system.scm (%setuid-programs): Add "mount" and "umount" from
util-linux.
---
 gnu/system.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index c860c22433..c57b302c4e 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -825,7 +825,12 @@ use 'plain-file' instead~%")
           (file-append inetutils "/bin/ping6")
           (file-append sudo "/bin/sudo")
           (file-append sudo "/bin/sudoedit")
-          (file-append fuse "/bin/fusermount"))))
+          (file-append fuse "/bin/fusermount")
+
+          ;; To allow mounts with the "user" option, "mount" and "umount" must
+          ;; be setuid-root.
+          (file-append util-linux "/bin/mount")
+          (file-append util-linux "/bin/umount"))))
 
 (define %sudoers-specification
   ;; Default /etc/sudoers contents: 'root' and all members of the 'wheel'
-- 
cgit v1.2.3


From 62c2217570fb3a3437e8316d3679b7fe13db0884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 6 Oct 2019 12:01:24 +0200
Subject: services: agetty: Explicitly depend on (gnu build linux-boot).

* gnu/services/base.scm (default-serial-port): Wrap in
'with-imported-modules'.
---
 gnu/services/base.scm | 62 ++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 6ab7b110ec..b1c6f3c941 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -939,36 +939,38 @@ the message of the day, among other things."
 (define (default-serial-port)
   "Return a gexp that determines a reasonable default serial port
 to use as the tty.  This is primarily useful for headless systems."
-  #~(begin
-      ;; console=device,options
-      ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
-      ;; options: BBBBPNF. P n|o|e, N number of bits,
-      ;; F flow control (r RTS)
-      (let* ((not-comma (char-set-complement (char-set #\,)))
-             (command (linux-command-line))
-             (agetty-specs (find-long-options "agetty.tty" command))
-             (console-specs (filter (lambda (spec)
-                                     (and (string-prefix? "tty" spec)
-                                          (not (or
-                                                (string-prefix? "tty0" spec)
-                                                (string-prefix? "tty1" spec)
-                                                (string-prefix? "tty2" spec)
-                                                (string-prefix? "tty3" spec)
-                                                (string-prefix? "tty4" spec)
-                                                (string-prefix? "tty5" spec)
-                                                (string-prefix? "tty6" spec)
-                                                (string-prefix? "tty7" spec)
-                                                (string-prefix? "tty8" spec)
-                                                (string-prefix? "tty9" spec)))))
-                                    (find-long-options "console" command)))
-             (specs (append agetty-specs console-specs)))
-        (match specs
-         (() #f)
-         ((spec _ ...)
-          ;; Extract device name from first spec.
-          (match (string-tokenize spec not-comma)
-           ((device-name _ ...)
-            device-name)))))))
+  (with-imported-modules (source-module-closure
+                          '((gnu build linux-boot))) ;for 'find-long-options'
+    #~(begin
+        ;; console=device,options
+        ;; device: can be tty0, ttyS0, lp0, ttyUSB0 (serial).
+        ;; options: BBBBPNF. P n|o|e, N number of bits,
+        ;; F flow control (r RTS)
+        (let* ((not-comma (char-set-complement (char-set #\,)))
+               (command (linux-command-line))
+               (agetty-specs (find-long-options "agetty.tty" command))
+               (console-specs (filter (lambda (spec)
+                                        (and (string-prefix? "tty" spec)
+                                             (not (or
+                                                   (string-prefix? "tty0" spec)
+                                                   (string-prefix? "tty1" spec)
+                                                   (string-prefix? "tty2" spec)
+                                                   (string-prefix? "tty3" spec)
+                                                   (string-prefix? "tty4" spec)
+                                                   (string-prefix? "tty5" spec)
+                                                   (string-prefix? "tty6" spec)
+                                                   (string-prefix? "tty7" spec)
+                                                   (string-prefix? "tty8" spec)
+                                                   (string-prefix? "tty9" spec)))))
+                                      (find-long-options "console" command)))
+               (specs (append agetty-specs console-specs)))
+          (match specs
+            (() #f)
+            ((spec _ ...)
+             ;; Extract device name from first spec.
+             (match (string-tokenize spec not-comma)
+               ((device-name _ ...)
+                device-name))))))))
 
 (define agetty-shepherd-service
   (match-lambda
-- 
cgit v1.2.3


From 38b1ea0434665260fa1381555ce7d725ba427f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 6 Oct 2019 12:42:41 +0200
Subject: services: udev: Explicitly depend on (gnu build linux-boot).

* gnu/services/base.scm (udev-shepherd-service): Wrap 'start' method in
'with-imported-modules'.
---
 gnu/services/base.scm | 121 ++++++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index b1c6f3c941..de1321d763 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1996,64 +1996,67 @@ item of @var{packages}."
          (requirement '(root-file-system))
 
          (documentation "Populate the /dev directory, dynamically.")
-         (start #~(lambda ()
-                    (define udevd
-                      ;; 'udevd' from eudev.
-                      #$(file-append udev "/sbin/udevd"))
-
-                    (define (wait-for-udevd)
-                      ;; Wait until someone's listening on udevd's control
-                      ;; socket.
-                      (let ((sock (socket AF_UNIX SOCK_SEQPACKET 0)))
-                        (let try ()
-                          (catch 'system-error
-                            (lambda ()
-                              (connect sock PF_UNIX "/run/udev/control")
-                              (close-port sock))
-                            (lambda args
-                              (format #t "waiting for udevd...~%")
-                              (usleep 500000)
-                              (try))))))
-
-                    ;; Allow udev to find the modules.
-                    (setenv "LINUX_MODULE_DIRECTORY"
-                            "/run/booted-system/kernel/lib/modules")
-
-                    ;; The first one is for udev, the second one for eudev.
-                    (setenv "UDEV_CONFIG_FILE" #$udev.conf)
-                    (setenv "EUDEV_RULES_DIRECTORY"
-                            #$(file-append rules "/lib/udev/rules.d"))
-
-                    (let* ((kernel-release
-                            (utsname:release (uname)))
-                           (linux-module-directory
-                            (getenv "LINUX_MODULE_DIRECTORY"))
-                           (directory
-                            (string-append linux-module-directory "/"
-                                           kernel-release))
-                           (old-umask (umask #o022)))
-                      ;; If we're in a container, DIRECTORY might not exist,
-                      ;; for instance because the host runs a different
-                      ;; kernel.  In that case, skip it; we'll just miss a few
-                      ;; nodes like /dev/fuse.
-                      (when (file-exists? directory)
-                        (make-static-device-nodes directory))
-                      (umask old-umask))
-
-                    (let ((pid (fork+exec-command (list udevd))))
-                      ;; Wait until udevd is up and running.  This appears to
-                      ;; be needed so that the events triggered below are
-                      ;; actually handled.
-                      (wait-for-udevd)
-
-                      ;; Trigger device node creation.
-                      (system* #$(file-append udev "/bin/udevadm")
-                               "trigger" "--action=add")
-
-                      ;; Wait for things to settle down.
-                      (system* #$(file-append udev "/bin/udevadm")
-                               "settle")
-                      pid)))
+         (start
+          (with-imported-modules (source-module-closure
+                                  '((gnu build linux-boot)))
+            #~(lambda ()
+                (define udevd
+                  ;; 'udevd' from eudev.
+                  #$(file-append udev "/sbin/udevd"))
+
+                (define (wait-for-udevd)
+                  ;; Wait until someone's listening on udevd's control
+                  ;; socket.
+                  (let ((sock (socket AF_UNIX SOCK_SEQPACKET 0)))
+                    (let try ()
+                      (catch 'system-error
+                        (lambda ()
+                          (connect sock PF_UNIX "/run/udev/control")
+                          (close-port sock))
+                        (lambda args
+                          (format #t "waiting for udevd...~%")
+                          (usleep 500000)
+                          (try))))))
+
+                ;; Allow udev to find the modules.
+                (setenv "LINUX_MODULE_DIRECTORY"
+                        "/run/booted-system/kernel/lib/modules")
+
+                ;; The first one is for udev, the second one for eudev.
+                (setenv "UDEV_CONFIG_FILE" #$udev.conf)
+                (setenv "EUDEV_RULES_DIRECTORY"
+                        #$(file-append rules "/lib/udev/rules.d"))
+
+                (let* ((kernel-release
+                        (utsname:release (uname)))
+                       (linux-module-directory
+                        (getenv "LINUX_MODULE_DIRECTORY"))
+                       (directory
+                        (string-append linux-module-directory "/"
+                                       kernel-release))
+                       (old-umask (umask #o022)))
+                  ;; If we're in a container, DIRECTORY might not exist,
+                  ;; for instance because the host runs a different
+                  ;; kernel.  In that case, skip it; we'll just miss a few
+                  ;; nodes like /dev/fuse.
+                  (when (file-exists? directory)
+                    (make-static-device-nodes directory))
+                  (umask old-umask))
+
+                (let ((pid (fork+exec-command (list udevd))))
+                  ;; Wait until udevd is up and running.  This appears to
+                  ;; be needed so that the events triggered below are
+                  ;; actually handled.
+                  (wait-for-udevd)
+
+                  ;; Trigger device node creation.
+                  (system* #$(file-append udev "/bin/udevadm")
+                           "trigger" "--action=add")
+
+                  ;; Wait for things to settle down.
+                  (system* #$(file-append udev "/bin/udevadm")
+                           "settle")
+                  pid))))
          (stop #~(make-kill-destructor))
 
          ;; When halting the system, 'udev' is actually killed by
@@ -2061,7 +2064,7 @@ item of @var{packages}."
          ;; Thus, make sure it is not respawned.
          (respawn? #f)
          ;; We need additional modules.
-         (modules `((gnu build linux-boot)
+         (modules `((gnu build linux-boot)        ;'make-static-device-nodes'
                     ,@%default-modules))
 
          (actions (list (shepherd-action
-- 
cgit v1.2.3


From 63b0ce391f6ea79012fac893e933e39d7a16abbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Sun, 6 Oct 2019 12:51:33 +0200
Subject: services: shepherd: Compile service files.

This reduces resident memory for PID 1 from 29.8MiB to 28.7MiB right
after boot on a bare-bones system (x86_64-linux).

* gnu/services/shepherd.scm (scm->go): New procedure.
(shepherd-configuration-file)[config]: Call it and use 'load-compiled'
instead of 'primitive-load'.
---
 gnu/services/shepherd.scm | 77 +++++++++++++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index 45c67e04eb..08bb33039c 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -255,6 +255,22 @@ stored."
                                    #~(#$name #$doc #$proc)))
                                 (shepherd-service-actions service))))))))
 
+(define (scm->go file)
+  "Compile FILE, which contains code to be loaded by shepherd's config file,
+and return the resulting '.go' file."
+  (with-extensions (list shepherd)
+    (computed-file (string-append (basename (scheme-file-name file) ".scm")
+                                  ".go")
+                   #~(begin
+                       (use-modules (system base compile))
+
+                       ;; Do the same as the Shepherd's 'load-in-user-module'.
+                       (let ((env (make-fresh-user-module)))
+                         (module-use! env (resolve-interface '(oop goops)))
+                         (module-use! env (resolve-interface '(shepherd service)))
+                         (compile-file #$file #:output-file #$output
+                                       #:env env))))))
+
 (define (shepherd-configuration-file services)
   "Return the shepherd configuration file for SERVICES."
   (assert-valid-graph services)
@@ -269,36 +285,37 @@ stored."
           ;; than a kernel panic.
           (call-with-error-handling
             (lambda ()
-              (apply register-services (map primitive-load '#$files))
-
-              ;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around
-              ;; it.
-              (setenv "PATH" "/run/current-system/profile/bin")
-
-              (format #t "starting services...~%")
-              (for-each (lambda (service)
-                          ;; In the Shepherd 0.3 the 'start' method can raise
-                          ;; '&action-runtime-error' if it fails, so protect
-                          ;; against it.  (XXX: 'action-runtime-error?' is not
-                          ;; exported is 0.3, hence 'service-error?'.)
-                          (guard (c ((service-error? c)
-                                     (format (current-error-port)
-                                             "failed to start service '~a'~%"
-                                             service)))
-                            (start service)))
-                        '#$(append-map shepherd-service-provision
-                                       (filter shepherd-service-auto-start?
-                                               services)))
-
-              ;; Hang up stdin.  At this point, we assume that 'start' methods
-              ;; that required user interaction on the console (e.g.,
-              ;; 'cryptsetup open' invocations, post-fsck emergency REPL) have
-              ;; completed.  User interaction becomes impossible after this
-              ;; call; this avoids situations where services wrongfully lead
-              ;; PID 1 to read from stdin (the console), which users may not
-              ;; have access to (see ).
-              (redirect-port (open-input-file "/dev/null")
-                             (current-input-port))))))
+              (apply register-services
+                     (map load-compiled '#$(map scm->go files)))))
+
+          ;; guix-daemon 0.6 aborts if 'PATH' is undefined, so work around
+          ;; it.
+          (setenv "PATH" "/run/current-system/profile/bin")
+
+          (format #t "starting services...~%")
+          (for-each (lambda (service)
+                      ;; In the Shepherd 0.3 the 'start' method can raise
+                      ;; '&action-runtime-error' if it fails, so protect
+                      ;; against it.  (XXX: 'action-runtime-error?' is not
+                      ;; exported is 0.3, hence 'service-error?'.)
+                      (guard (c ((service-error? c)
+                                 (format (current-error-port)
+                                         "failed to start service '~a'~%"
+                                         service)))
+                        (start service)))
+                    '#$(append-map shepherd-service-provision
+                                   (filter shepherd-service-auto-start?
+                                           services)))
+
+          ;; Hang up stdin.  At this point, we assume that 'start' methods
+          ;; that required user interaction on the console (e.g.,
+          ;; 'cryptsetup open' invocations, post-fsck emergency REPL) have
+          ;; completed.  User interaction becomes impossible after this
+          ;; call; this avoids situations where services wrongfully lead
+          ;; PID 1 to read from stdin (the console), which users may not
+          ;; have access to (see ).
+          (redirect-port (open-input-file "/dev/null")
+                         (current-input-port))))
 
     (scheme-file "shepherd.conf" config)))
 
-- 
cgit v1.2.3


From 5157edd8854c895dfb78f6cf49e906e49745ca8a Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 23 Sep 2019 16:13:43 +0200
Subject: gnu: perf: Treat kernel headers as system headers.

* gnu/packages/linux.scm (perf)[arguments]: Instead of disabling -Werror,
set C_INCLUDE_PATH.
---
 gnu/packages/linux.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6664620c04..d7e3d7ef7f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3091,15 +3091,16 @@ in a digital read-out.")
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key inputs #:allow-other-keys)
-             ;; Don't build with '-Werror', really.
-             (substitute* "tools/lib/bpf/Makefile"
-               (("-Werror") ""))
-
              (setenv "SHELL_PATH" (which "bash"))
              (chdir "tools/perf")
              #t)))
        #:make-flags (list (string-append "prefix="
                                          (assoc-ref %outputs "out"))
+                          ;; Make sure the kernel headers are treated as system
+                          ;; headers to suppress warnings from those.
+                          (string-append "C_INCLUDE_PATH="
+                                         (assoc-ref %build-inputs "kernel-headers")
+                                         "/include")
                           "WERROR=0"
 
                           ;; By default, 'config/Makefile' uses lib64 on
-- 
cgit v1.2.3


From dd6989711370c43676edc974f86c8586f21f80f6 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 3 Oct 2019 22:22:08 +0200
Subject: gnu: linux-libre: Try to aggressively gather entropy during boot.

Fixes .

* gnu/packages/patches/linux-libre-active-entropy.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (linux-libre-5.2-source): Use it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/linux.scm                             |  3 +-
 .../patches/linux-libre-active-entropy.patch       | 86 ++++++++++++++++++++++
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/linux-libre-active-entropy.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 9f8ce842b6..b9b6ea3ae7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1078,6 +1078,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/lierolibre-remove-arch-warning.patch	\
   %D%/packages/patches/lierolibre-try-building-other-arch.patch	\
   %D%/packages/patches/linkchecker-tests-require-network.patch	\
+  %D%/packages/patches/linux-libre-active-entropy.patch		\
   %D%/packages/patches/linux-pam-no-setfsuid.patch		\
   %D%/packages/patches/lirc-localstatedir.patch			\
   %D%/packages/patches/lirc-reproducible-build.patch		\
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d7e3d7ef7f..2a6709c6fe 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -420,7 +420,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 
 (define-public linux-libre-5.2-source
   (source-with-patches linux-libre-5.2-pristine-source
-                       (list %boot-logo-patch
+                       (list (search-patch "linux-libre-active-entropy.patch")
+                             %boot-logo-patch
                              %linux-libre-arm-export-__sync_icache_dcache-patch)))
 
 (define-public linux-libre-4.19-source
diff --git a/gnu/packages/patches/linux-libre-active-entropy.patch b/gnu/packages/patches/linux-libre-active-entropy.patch
new file mode 100644
index 0000000000..8f081f4a19
--- /dev/null
+++ b/gnu/packages/patches/linux-libre-active-entropy.patch
@@ -0,0 +1,86 @@
+Try to actively add entropy instead of waiting forever.
+Fixes .
+
+Taken from upstream:
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=50ee7529ec4500c88f8664560770a7a1b65db72b
+
+diff --git a/drivers/char/random.c b/drivers/char/random.c
+index 5d5ea4ce1442..2fda6166c1dd 100644
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -1731,6 +1731,56 @@ void get_random_bytes(void *buf, int nbytes)
+ }
+ EXPORT_SYMBOL(get_random_bytes);
+ 
++
++/*
++ * Each time the timer fires, we expect that we got an unpredictable
++ * jump in the cycle counter. Even if the timer is running on another
++ * CPU, the timer activity will be touching the stack of the CPU that is
++ * generating entropy..
++ *
++ * Note that we don't re-arm the timer in the timer itself - we are
++ * happy to be scheduled away, since that just makes the load more
++ * complex, but we do not want the timer to keep ticking unless the
++ * entropy loop is running.
++ *
++ * So the re-arming always happens in the entropy loop itself.
++ */
++static void entropy_timer(struct timer_list *t)
++{
++	credit_entropy_bits(&input_pool, 1);
++}
++
++/*
++ * If we have an actual cycle counter, see if we can
++ * generate enough entropy with timing noise
++ */
++static void try_to_generate_entropy(void)
++{
++	struct {
++		unsigned long now;
++		struct timer_list timer;
++	} stack;
++
++	stack.now = random_get_entropy();
++
++	/* Slow counter - or none. Don't even bother */
++	if (stack.now == random_get_entropy())
++		return;
++
++	timer_setup_on_stack(&stack.timer, entropy_timer, 0);
++	while (!crng_ready()) {
++		if (!timer_pending(&stack.timer))
++			mod_timer(&stack.timer, jiffies+1);
++		mix_pool_bytes(&input_pool, &stack.now, sizeof(stack.now));
++		schedule();
++		stack.now = random_get_entropy();
++	}
++
++	del_timer_sync(&stack.timer);
++	destroy_timer_on_stack(&stack.timer);
++	mix_pool_bytes(&input_pool, &stack.now, sizeof(stack.now));
++}
++
+ /*
+  * Wait for the urandom pool to be seeded and thus guaranteed to supply
+  * cryptographically secure random numbers. This applies to: the /dev/urandom
+@@ -1745,7 +1795,17 @@ int wait_for_random_bytes(void)
+ {
+ 	if (likely(crng_ready()))
+ 		return 0;
+-	return wait_event_interruptible(crng_init_wait, crng_ready());
++
++	do {
++		int ret;
++		ret = wait_event_interruptible_timeout(crng_init_wait, crng_ready(), HZ);
++		if (ret)
++			return ret > 0 ? 0 : ret;
++
++		try_to_generate_entropy();
++	} while (!crng_ready());
++
++	return 0;
+ }
+ EXPORT_SYMBOL(wait_for_random_bytes);
+ 
-- 
cgit v1.2.3


From c5ceec4150f6a6cdc1b64781afa2d05547cf8542 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Fri, 4 Oct 2019 21:36:42 +0200
Subject: gnu: linux-libre: Remove glibc from CPATH before the build.

Fixes .

* gnu/packages/linux.scm (make-linux-libre*)[arguments]: Drop "libc" from CPATH.
---
 gnu/packages/linux.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2a6709c6fe..78de223947 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -663,6 +663,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
      `(#:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (srfi srfi-1)
+                  (srfi srfi-26)
                   (ice-9 match))
        #:phases
        (modify-phases %standard-phases
@@ -679,6 +680,18 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
              ,@(if (%current-target-system)
                    '((unsetenv "CROSS_CPATH"))
                    '())
+
+             ;; On AArch64 (at least), we need to remove glibc headers from CPATH
+             ;; (they are still available as "system headers"), so that the kernel
+             ;; can override uint64_t.  See .
+             (setenv "CPATH"
+                     (string-join
+                      (remove (cut string-prefix? (assoc-ref inputs "libc") <>)
+                              (string-split (getenv "CPATH") #\:))
+                      ":"))
+             (format #t "environment variable `CPATH' changed to `~a'~%"
+                     (getenv "CPATH"))
+
              ;; Avoid introducing timestamps
              (setenv "KCONFIG_NOTIMESTAMP" "1")
              (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))
-- 
cgit v1.2.3


From 1714edc3d4e8d6da1b0cdef300ae882d0885f182 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Sun, 6 Oct 2019 14:24:04 +0200
Subject: gnu: WebKitGTK: Embed absolute file name of libWPEBackend-fdo-1.0.so.

Fixes .
Reported by Vagrant Cascadian .

* gnu/packages/webkit.scm (webkitgtk)[arguments]: Add phase.
---
 gnu/packages/webkit.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 3169c7d15a..bda0fc6ba2 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -165,6 +165,13 @@ engine that uses Wayland for graphics output.")
                                            "/xml/dtd/docbook/docbookx.dtd"))))
                        (find-files "Source" "\\.sgml$"))
              #t))
+         (add-after 'unpack 'embed-absolute-wpebackend-reference
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo")))
+               (substitute* "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp"
+                 (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version)
+                  (string-append wpebackend-fdo "/lib/" all)))
+               #t)))
          (add-after 'install 'move-doc-files
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))
-- 
cgit v1.2.3


From cec23736d34b1050ef959daca8c1a3f4dd0c6201 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Sun, 6 Oct 2019 19:34:13 +0200
Subject: gnu: Add cl-goject-introspection.

* gnu/packages/lisp.scm (cl-goject-introspection,
  sbcl-cl-gobject-introspection): New variables.
---
 gnu/packages/lisp.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 007cdb7e0e..ed3efc7bdb 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7434,3 +7434,57 @@ ability to store all Common Lisp data types into streams.")
 
 (define-public ecl-cl-store
   (sbcl-package->ecl-package sbcl-cl-store))
+
+(define-public sbcl-cl-gobject-introspection
+  (let ((commit "7b703e2384945ea0ac39d9b766de434a08d81560")
+        (revision "0"))
+    (package
+      (name "sbcl-cl-gobject-introspection")
+      (version (git-version "0.3" revision commit))
+      (home-page "https://github.com/andy128k/cl-gobject-introspection")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1zcqd2qj14f6b38vys8gr89s6cijsp9r8j43xa8lynilwva7bwyh"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       `(("alexandria" ,sbcl-alexandria)
+         ("cffi" ,sbcl-cffi)
+         ("iterate" ,sbcl-iterate)
+         ("trivial-garbage" ,sbcl-trivial-garbage)
+         ("glib" ,glib)
+         ("gobject-introspection" ,gobject-introspection)))
+      (native-inputs
+       `(("fiveam" ,sbcl-fiveam)))
+      (arguments
+       ;; TODO: Tests fail, see
+       ;; https://github.com/andy128k/cl-gobject-introspection/issues/70.
+       '(#:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (add-after (quote unpack) (quote fix-paths)
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* "src/init.lisp"
+                 (("libgobject-2\\.0\\.so")
+                  (string-append (assoc-ref inputs "glib") "/lib/libgobject-2.0.so"))
+                 (("libgirepository-1\\.0\\.so")
+                  (string-append (assoc-ref inputs "gobject-introspection")
+                                 "/lib/libgirepository-1.0.so")))
+               #t)))))
+      (synopsis "Common Lisp bindings to GObject Introspection")
+      (description
+       "This library is a bridge between Common Lisp and GObject
+Introspection, which enables Common Lisp programs to access the full interface
+of C+GObject libraries without the need of writing dedicated bindings.")
+      (license (list license:bsd-3
+                     ;; Tests are under a different license.
+                     license:llgpl)))))
+
+(define-public cl-gobject-introspection
+  (sbcl-package->cl-source-package sbcl-cl-gobject-introspection))
-- 
cgit v1.2.3


From 1017ba7dd589fd4b69fadb177c7c9a5817bb6922 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 6 Oct 2019 19:57:09 +0200
Subject: gnu: emacs-evil-mc: Update to 0.0.3-2.1cabb86.

* gnu/packages/emacs-xyz.scm (emacs-evil-mc): Update to 0.0.3-2.1cabb86.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 4e205ded7e..99a0fe633f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -14373,8 +14373,8 @@ defaults.")
     (license license:gpl3+)))
 
 (define-public emacs-evil-mc
-  (let ((commit "5205fe671803465149e578849bbbe803c23a8e4e")
-        (revision "1"))
+  (let ((commit "1cabb869fe70cef49f7dc06f015c3ade1a969c8c")
+        (revision "2"))
     (package
       (name "emacs-evil-mc")
       (version (git-version "0.0.3" revision commit))
@@ -14386,7 +14386,7 @@ defaults.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42"))))
+          (base32 "0p83p90faq1p02lmsfs7zrnky3cyzgy8z4m83a81r9kakjzhkrnb"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-evil" ,emacs-evil)))
-- 
cgit v1.2.3


From 9049f28f573fb24c7405d80a124843495a97137f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 6 Oct 2019 20:17:59 +0200
Subject: gnu: emacs-undo-propose-el: Update to 3.0.0-3.f80baee.

* gnu/packages/emacs-xyz.scm (emacs-undo-propose-el): Update to 3.0.0-3.f80baee.
---
 gnu/packages/emacs-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 99a0fe633f..db95bd8ad9 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -17042,8 +17042,8 @@ packages with a consistent way to use them.")
       (license license:gpl3+))))
 
 (define-public emacs-undo-propose-el
-  (let ((commit "47b7df0c97ad0099537d1ade21c4c52f0618a945")
-        (revision "2"))
+  (let ((commit "f80baee566807d733fbacbab08a897bcd62579c3")
+        (revision "3"))
     (package
       (name "emacs-undo-propose-el")
       (version (git-version "3.0.0" revision commit))
@@ -17056,8 +17056,11 @@ packages with a consistent way to use them.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "078bs8lk9f0lklxqh15976fffayg5z5386y59nxxfhm27lmwgka9"))))
+           "00rqz63bhh66q78l646q3w16gydygj8h4d8np0dpbifgzciak90b"))))
       (build-system emacs-build-system)
+      (arguments
+       `(#:tests? #t
+         #:test-command '("make" "test")))
       (home-page "https://github.com/jackkamm/undo-propose-el")
       (synopsis "Simple and safe navigation of @code{undo} history")
       (description "This package permits navigation of @code{undo} history in a
-- 
cgit v1.2.3


From ff810d21a5a070484a5ef39b3570c93c1fb55f53 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 6 Oct 2019 20:39:31 +0200
Subject: gnu: emacs-hackernews: Update to 0.5.0-2.2362d7b.

* gnu/packages/emacs-xyz.scm (emacs-hackernews): Update to 0.5.0-2.2362d7b.
---
 gnu/packages/emacs-xyz.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index db95bd8ad9..442115882d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15528,10 +15528,11 @@ files) are provided.")
       (license license:gpl2+))))
 
 (define-public emacs-hackernews
-  (let ((commit "916c3da8da45c757f5ec2faeed57fa370513d4ac"))
+  (let ((commit "2362d7b00e59da7caddc8c0adc24dccb42fddef9")
+        (revision "2"))
     (package
       (name "emacs-hackernews")
-      (version (git-version "0.5.0" "1" commit))
+      (version (git-version "0.5.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -15541,7 +15542,7 @@ files) are provided.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "09bxaaczana1cfvxyk9aagjvdszkj0j1yldl5r4xa60b59lxihsg"))))
+           "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/clarete/hackernews.el")
       (synopsis "Hacker News client for Emacs")
-- 
cgit v1.2.3


From fc37b4afb29095e222f7ddd3fb3df1ad196926a3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 4 Oct 2019 10:35:22 +0200
Subject: gnu: jamvm-1-bootstrap: Fix segfault in bootstrap JVM.

* gnu/packages/java.scm (jamvm-1-bootstrap)[arguments]: Add configure flags:
--disable-int-caching, --enable-runtime-reloc-checks, and --enable-ffi.
[inputs]: Add libffi.
---
 gnu/packages/java.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 6090dcd514..aa624b4c28 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -186,10 +186,14 @@ language.")
     (arguments
      `(#:configure-flags
        (list (string-append "--with-classpath-install-dir="
-                            (assoc-ref %build-inputs "classpath")))))
+                            (assoc-ref %build-inputs "classpath"))
+             "--disable-int-caching"
+             "--enable-runtime-reloc-checks"
+             "--enable-ffi")))
     (inputs
      `(("classpath" ,classpath-bootstrap)
        ("jikes" ,jikes)
+       ("libffi" ,libffi)
        ("zlib" ,zlib)))
     (home-page "http://jamvm.sourceforge.net/")
     (synopsis "Small Java Virtual Machine")
-- 
cgit v1.2.3


From 1b6f99ea538d767099596860017e67755c1ac42f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 4 Oct 2019 10:36:29 +0200
Subject: gnu: icedtea-7: Fix build on i686-linux.

* gnu/packages/java.scm (icedtea-7)[arguments]: Use "i386" lib directory when
the system is "i686-linux".
---
 gnu/packages/java.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index aa624b4c28..3b7404973a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1376,7 +1376,12 @@ bootstrapping purposes.")
            (add-after 'install 'install-libjvm
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((lib-path (string-append (assoc-ref outputs "out")
-                                               "/lib/amd64")))
+                                               "/lib/"
+                                               ,(match (%current-system)
+                                                  ("i686-linux"
+                                                   "i386")
+                                                  ("x86_64-linux"
+                                                   "amd64")))))
                  (symlink (string-append lib-path "/server/libjvm.so")
                           (string-append lib-path "/libjvm.so")))
                #t))
-- 
cgit v1.2.3


From 4b94e63db6a53d74dbe7932d18aa591162aaa9fe Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 21:59:01 +0200
Subject: gnu: guile-studio: Update to 0-2.4d63f3d.

* gnu/packages/guile-xyz.scm (guile-studio): Update to 0-2.4d63f3d.
---
 gnu/packages/guile-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 4ad6a3575a..2e9ba7bc65 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1994,8 +1994,8 @@ The picture values can directly be displayed in Geiser.")
       (license license:lgpl3+))))
 
 (define-public guile-studio
-  (let ((commit "e2da64f014942a73996286c4abe3c3b1f8bd220c")
-        (revision "1"))
+  (let ((commit "4d63f3d684f61bf83566745e8572496cdf6daad0")
+        (revision "2"))
     (package
       (name "guile-studio")
       (version (git-version "0" revision commit))
@@ -2006,7 +2006,7 @@ The picture values can directly be displayed in Geiser.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "10v3kw41bzd8c2a6vxgrwbvl216d0k8f5s9h6pm8hahpd03jl7lm"))))
+                  "1d3hhw3c3mk5i87xvfqa643674f08j1jd1rc1pl534gydz529vd5"))))
       (build-system gnu-build-system)
       (arguments
        `(#:tests? #f                      ; there are none
-- 
cgit v1.2.3


From f58702465d0b2daab1775d29439b73b4486a108a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 21:59:30 +0200
Subject: gnu: Add mloop.

* gnu/packages/music.scm (mloop): New variable.
---
 gnu/packages/music.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 508f2ea3bf..ce333e8240 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4585,3 +4585,43 @@ with error and volume history, and advanced features.")
     ;; Most of the code is under GPL2+, but some abstract or helper classes
     ;; are under LGPL2.1.
     (license (list license:gpl2+ license:lgpl2.1))))
+
+(define-public mloop
+  (let ((commit "adebff98b0b4dc5872a03acb82e89c77cb29c127")
+        (revision "0"))
+    (package
+      (name "mloop")
+      (version (git-version "0.0.1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "http://git.fuzzle.org/mloop")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "175gxvg5slq0bllcx1c381rjlq3xpxww8c3kpiw5i2kfr4m52myz"))))
+      (build-system waf-build-system)
+      (arguments
+       `(#:python ,python-2
+         #:tests? #f))                     ; no "check" target
+      (inputs
+       `(("jack" ,jack-1)
+         ("ncurses" ,ncurses)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)))
+      (home-page "https://fuzzle.org/~petern/mloop.html")
+      (synopsis "Live MIDI looper")
+      (description "mloop is a live MIDI looping system, using jack-midi.
+Loops are recorded, optionally with beat quantization, and can then be played
+back, either once or looping.  A 'note cache' system is implemented to
+remember which notes are pressed and their velocities.  This allows for a loop
+to start off with the currently pressed notes, making seamless loops much
+easier to perform.  Features include:
+
+@itemize
+@item Quantisation; end a loop on a beat exactly.
+@item Delayed recording; wait for a MIDI event before starting a loop record.
+@item Adjust tempo; Playback speed of loops can be adjusted on the fly.
+@end itemize\n")
+      (license license:gpl2))))
-- 
cgit v1.2.3


From 4722330d68581d9ac20c419b1a4d2c8bf5137506 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 22:07:03 +0200
Subject: gnu: nss-pam-ldapd: Update to 0.9.11.

* gnu/packages/openldap.scm (nss-pam-ldapd): Update to 0.9.11.
[inputs]: Replace python-2 with python.
---
 gnu/packages/openldap.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index b84a417ff5..b355665da0 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -112,14 +112,14 @@
 (define-public nss-pam-ldapd
   (package
     (name "nss-pam-ldapd")
-    (version "0.9.10")
+    (version "0.9.11")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/"
                                   "nss-pam-ldapd-" version ".tar.gz"))
               (sha256
                (base32
-                "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0"))))
+                "1dna3r0q6sjhhlkhcp8x2zkslrd4y7701kk6fl5r940sdph1pmyh"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -146,7 +146,7 @@
      `(("linux-pam" ,linux-pam)
        ("openldap" ,openldap)
        ("mit-krb5" ,mit-krb5)
-       ("python" ,python-2)))
+       ("python" ,python)))
     (home-page "https://arthurdejong.org/nss-pam-ldapd")
     (synopsis "NSS and PAM modules for LDAP")
     (description "nss-pam-ldapd provides a @dfn{Name Service Switch} (NSS)
-- 
cgit v1.2.3


From 45d04b2a7d01f693020149853e1d810cf92205a4 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 6 Oct 2019 22:02:25 +0200
Subject: gnu: emacs-helm: Update to 3.5.0.

* gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.5.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 442115882d..bfcfb98d1e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6621,7 +6621,7 @@ ack, ag, helm and pt.")
 (define-public emacs-helm
   (package
     (name "emacs-helm")
-    (version "3.3")
+    (version "3.5.0")
     (source
      (origin
        (method git-fetch)
@@ -6630,7 +6630,7 @@ ack, ag, helm and pt.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0fqhw7r9fcsja5d3pgbipw7pkw9nj534faav6hi45413hc3gyv92"))))
+        (base32 "07bijcnfkv60l3swasxv53x32l6glds05mxnbb3xbnmkgm1pm9if"))))
     (build-system emacs-build-system)
     (propagated-inputs
      `(("emacs-async" ,emacs-async)
-- 
cgit v1.2.3


From cb2197508a62210b8bdb132b6f96aebba637e6b3 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 6 Oct 2019 22:02:46 +0200
Subject: gnu: Add emacs-helm-org.

* gnu/packages/emacs-xyz.scm (emacs-helm-org): New variable.
---
 gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bfcfb98d1e..cc16a5d04f 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6647,6 +6647,31 @@ considered to be its successor.  Helm sets out to clean up the legacy code in
 not tied in the trap of backward compatibility.")
     (license license:gpl3+)))
 
+(define-public emacs-helm-org
+  (let ((commit "542dda7bc9a3b9dfb439e4f8a1e5f60cfb6cc256")
+        (revision "1"))
+    (package
+      (name "emacs-helm-org")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/emacs-helm/helm-org.git")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1xa32w80icrykpyfb89fhb0s4l7ysi0sc7f7lfwqz5najwbgqipl"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-helm" ,emacs-helm)))
+      (home-page "https://github.com/emacs-helm/helm-org")
+      (synopsis "Helm interface to the Silver Searcher")
+      (description
+       "This package provides a frontend for grepping tools like ag and ack,
+as well as features for editing search results.")
+      (license license:gpl3+))))
+
 (define-public emacs-helm-swoop
   (package
     (name "emacs-helm-swoop")
-- 
cgit v1.2.3


From d050fdf4c6309cf5e0bfad3806cac51e3fefaa1b Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 6 Oct 2019 22:02:56 +0200
Subject: gnu: emacs-helm-ag: Fix version.

* gnu/packages/emacs-xyz.scm (emacs-helm-ag): Fix version.
---
 gnu/packages/emacs-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index cc16a5d04f..5be5b4be45 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6700,7 +6700,7 @@ for search-based navigation of buffers.")
         (revision "1"))
     (package
       (name "emacs-helm-ag")
-      (version "0.58")
+      (version (git-version "0.58" revision commit))
       (source
        (origin
          (method git-fetch)
-- 
cgit v1.2.3


From 122c1b3ce7718e956db0c6ce7e1058362dd7bb1c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:03:27 +0200
Subject: gnu: r-biomart: Update to 2.40.5.

* gnu/packages/bioinformatics.scm (r-biomart): Update to 2.40.5.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 5ec600598b..93a458b133 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7658,13 +7658,13 @@ annotation data packages using SQLite data storage.")
 (define-public r-biomart
   (package
     (name "r-biomart")
-    (version "2.40.4")
+    (version "2.40.5")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "biomaRt" version))
               (sha256
                (base32
-                "0dj51qkxm7bh24b3bs1di7lic6zgi7g5gf9iqkqhrwkbm7sqvn0v"))))
+                "1kjvxnkpsx3j2hji3cg3ka2gv8a9mg117lzzxyqjb7qa4zw7dipx"))))
     (properties
      `((upstream-name . "biomaRt")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From 94638cbe77f070645dbbeb983e1e8db8917c1be9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:03:39 +0200
Subject: gnu: r-rsamtools: Update to 2.0.2.

* gnu/packages/bioinformatics.scm (r-rsamtools): Update to 2.0.2.
---
 gnu/packages/bioinformatics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 93a458b133..e4cfa0cad3 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -7742,13 +7742,13 @@ biological sequences or sets of sequences.")
 (define-public r-rsamtools
   (package
     (name "r-rsamtools")
-    (version "2.0.1")
+    (version "2.0.2")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "Rsamtools" version))
               (sha256
                (base32
-                "0wzp5vsmqs7h44r7lcw8fnz5x9bcdcfiqq8d3h62wwibyk2lg0w1"))))
+                "188k5g40lbli7dxr96hldyvg9r9hmlbh2fp0qs5nnd12b8zbf338"))))
     (properties
      `((upstream-name . "Rsamtools")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From 33651044c6e4989d2e3546a772963b2b3a8b0703 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:03:49 +0200
Subject: gnu: r-seurat: Update to 3.1.1.

* gnu/packages/bioinformatics.scm (r-seurat): Update to 3.1.1.
[propagated-inputs]: Add r-httr.
---
 gnu/packages/bioinformatics.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index e4cfa0cad3..f2f67f36b0 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9465,13 +9465,13 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
 (define-public r-seurat
   (package
     (name "r-seurat")
-    (version "3.1.0")
+    (version "3.1.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "Seurat" version))
               (sha256
                (base32
-                "0icxndnnkkmmr9hhd01dv3w8pih7x9r0rlp3fq9pk3qajp9gmlyq"))))
+                "084lr2fjdksshsmv1ww82bgn3a9mml7kswsidjrs89snabgvn360"))))
     (properties `((upstream-name . "Seurat")))
     (build-system r-build-system)
     (propagated-inputs
@@ -9484,6 +9484,7 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.")
        ("r-ggplot2" ,r-ggplot2)
        ("r-ggrepel" ,r-ggrepel)
        ("r-ggridges" ,r-ggridges)
+       ("r-httr" ,r-httr)
        ("r-ica" ,r-ica)
        ("r-igraph" ,r-igraph)
        ("r-irlba" ,r-irlba)
-- 
cgit v1.2.3


From 82acc94fbfc5cfb1257f0a75ae9997262d90fef6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:04:11 +0200
Subject: gnu: r-htmltools: Update to 0.4.0.

* gnu/packages/cran.scm (r-htmltools): Update to 0.4.0.
[arguments]: Remove field.
[propagated-inputs]: Add r-rlang.
---
 gnu/packages/cran.scm | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1f35356e05..1e153b1284 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -525,31 +525,18 @@ directory.")
 (define-public r-htmltools
   (package
     (name "r-htmltools")
-    (version "0.3.6")
+    (version "0.4.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "htmltools" version))
               (sha256
                (base32
-                "18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"))))
+                "06l17d8jkf438yk2mchpsp4j90bynnapz3nabh5vkcc324p5a62v"))))
     (build-system r-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; See https://github.com/rstudio/htmltools/pull/68
-         ;; The resource files are in the store and have mode 444.  After
-         ;; copying the files R fails to remove them again because it doesn't
-         ;; have write access to them.
-         (add-after 'unpack 'copy-files-without-mode
-           (lambda _
-             (substitute* "R/html_dependency.R"
-               (("file.copy\\(from, to, " prefix)
-                (string-append prefix
-                               "copy.mode = FALSE, ")))
-             #t)))))
     (propagated-inputs
      `(("r-digest" ,r-digest)
-       ("r-rcpp" ,r-rcpp)))
+       ("r-rcpp" ,r-rcpp)
+       ("r-rlang" ,r-rlang)))
     (home-page "https://cran.r-project.org/web/packages/htmltools")
     (synopsis "R tools for HTML")
     (description
-- 
cgit v1.2.3


From ff743445975ba67fc827c415e686b0ec2a0a7baf Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:20 +0200
Subject: gnu: r-htmlwidgets: Update to 1.5.

* gnu/packages/cran.scm (r-htmlwidgets): Update to 1.5.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 1e153b1284..902a9975a8 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -546,13 +546,13 @@ directory.")
 (define-public r-htmlwidgets
   (package
     (name "r-htmlwidgets")
-    (version "1.3")
+    (version "1.5")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "htmlwidgets" version))
               (sha256
                (base32
-                "04jsdh14l2zifbjpbbh23w7bxz1wpsas0zb2gy2zwv4yqamzzr7i"))))
+                "1h2sj5h9vcssb73nz63gmw5bajs73m9q807fsypvr621gb1s124i"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-htmltools" ,r-htmltools)
-- 
cgit v1.2.3


From b7e7c320a27e013cd0bfd949f1825924c005278e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:26 +0200
Subject: gnu: r-maptools: Update to 0.9-8.

* gnu/packages/cran.scm (r-maptools): Update to 0.9-8.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 902a9975a8..500379bdae 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5326,14 +5326,14 @@ simple method for converting between file types.")
 (define-public r-maptools
   (package
     (name "r-maptools")
-    (version "0.9-5")
+    (version "0.9-8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "maptools" version))
        (sha256
         (base32
-         "1pbvcn9xfx0hxq1ppbfg9xm5j04q4c15nj983yjmg7dlkzq135ax"))))
+         "1ix3cg74w0w6cj8nwi0r9n3y5q9ljc21hm8xq6yqqngs57prvn2x"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-foreign" ,r-foreign)
-- 
cgit v1.2.3


From ab99236eba6d7f932b50652c80eb41946c0a92ef Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:31 +0200
Subject: gnu: r-later: Update to 1.0.0.

* gnu/packages/cran.scm (r-later): Update to 1.0.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 500379bdae..384a0afa5c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5354,14 +5354,14 @@ exchanging spatial objects with other R packages.")
 (define-public r-later
   (package
     (name "r-later")
-    (version "0.8.0")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "later" version))
        (sha256
         (base32
-         "08g503xjxrfxvrzj0cavsrz4m8ykbha64344j1w2r6v17js2hakb"))))
+         "11xjavj7siz0xv2ffq1ld4bwl35jyrcfpvvs4p3ilpifxx49hyr7"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-bh" ,r-bh)
-- 
cgit v1.2.3


From 2e6ccd6c2d94313ba37c6d48042a052ff9b0f829 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:37 +0200
Subject: gnu: r-promises: Update to 1.1.0.

* gnu/packages/cran.scm (r-promises): Update to 1.1.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 384a0afa5c..b1e0847622 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5377,14 +5377,14 @@ time after the current time, after the R execution stack has emptied.")
 (define-public r-promises
   (package
     (name "r-promises")
-    (version "1.0.1")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "promises" version))
        (sha256
         (base32
-         "0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"))))
+         "01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-later" ,r-later)
-- 
cgit v1.2.3


From 770321180fda2e9359842761699a5439047bdf94 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:42 +0200
Subject: gnu: r-hdf5r: Update to 1.3.0.

* gnu/packages/cran.scm (r-hdf5r): Update to 1.3.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b1e0847622..6073804398 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5847,14 +5847,14 @@ results to the user.")
 (define-public r-hdf5r
   (package
     (name "r-hdf5r")
-    (version "1.2.0")
+    (version "1.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "hdf5r" version))
        (sha256
         (base32
-         "10gynjwaaxks8y9c2fl8k040j0nbwn372nil70009yfk9wrkx0aq"))))
+         "1pq12vkfqxvcaznwaxvjdg3acimk5a20m8h18sixvxc34vnqxw8f"))))
     (build-system r-build-system)
     (inputs
      `(("hdf5" ,hdf5)
-- 
cgit v1.2.3


From 9b112f403059aadb268b8844c84fe08a5747f8c7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:49 +0200
Subject: gnu: r-rcppparallel: Update to 4.4.4.

* gnu/packages/cran.scm (r-rcppparallel): Update to 4.4.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 6073804398..7a856df734 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8947,14 +8947,14 @@ package provides a minimal R interface by relying on the Rcpp package.")
 (define-public r-rcppparallel
   (package
     (name "r-rcppparallel")
-    (version "4.4.3")
+    (version "4.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RcppParallel" version))
        (sha256
         (base32
-         "1ym0bzs9g6bsg2lz24fisxxa3gypr6xcvrczn304czmrrag9413s"))))
+         "0p13f2mywjr7gmskf8ri4y8p5yr1bvr4xrpw2w11vdvafwz1vcia"))))
     (properties `((upstream-name . "RcppParallel")))
     (build-system r-build-system)
     (home-page "http://rcppcore.github.io/RcppParallel")
-- 
cgit v1.2.3


From f817005bfeb904810e102c3f675036ff34857229 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:54 +0200
Subject: gnu: r-gargle: Update to 0.4.0.

* gnu/packages/cran.scm (r-gargle): Update to 0.4.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7a856df734..8754f83f72 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -10304,14 +10304,14 @@ and manipulating sets of ontological terms.")
 (define-public r-gargle
   (package
     (name "r-gargle")
-    (version "0.3.1")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gargle" version))
        (sha256
         (base32
-         "0vqgp4w03sdyj0q96gxkybqflzzbaw84zifsbi7pxk5y08fimj2v"))))
+         "08zhfk2sl342w35i5n2c93ayypg3z0kbl0020l3y9adqka1vazgx"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-fs" ,r-fs)
-- 
cgit v1.2.3


From 07d0645b6bc0d191dcf3d635159a8951ad395e0b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:06:59 +0200
Subject: gnu: r-backports: Update to 1.1.5.

* gnu/packages/statistics.scm (r-backports): Update to 1.1.5.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0c98e61cbc..3c69901a0a 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2119,14 +2119,14 @@ limited to R.")
 (define-public r-backports
   (package
     (name "r-backports")
-    (version "1.1.4")
+    (version "1.1.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "backports" version))
        (sha256
         (base32
-         "00zz969vc2gfi5p9q65pzghq2bxm3p9zqgwqswkyz9rgybz5wjzf"))))
+         "0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/backports")
     (synopsis "Reimplementations of functions introduced since R 3.0.0")
-- 
cgit v1.2.3


From 1c2e573302421bf7c130afcac4c9207f63222333 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:07:04 +0200
Subject: gnu: r-regioner: Update to 1.16.5.

* gnu/packages/bioconductor.scm (r-regioner): Update to 1.16.5.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 7ca6788dd8..9d6f5bb2ad 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -1192,14 +1192,14 @@ the Human Protein Atlas project.")
 (define-public r-regioner
   (package
     (name "r-regioner")
-    (version "1.16.4")
+    (version "1.16.5")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "regioneR" version))
        (sha256
         (base32
-         "0xzk057h6nkr3rvd412prxgnkpq625b90laj1kwb0i5q8j5ch760"))))
+         "12x7sh5d8y549hqz4qjb2j3ak22l79w9l0vdbv4gn0bwi5206k8h"))))
     (properties `((upstream-name . "regioneR")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From eb796f53efd5332b401a5756429b8710664ee930 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:07:09 +0200
Subject: gnu: r-mixomics: Update to 6.8.5.

* gnu/packages/bioconductor.scm (r-mixomics): Update to 6.8.5.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9d6f5bb2ad..9de3deedea 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -5343,14 +5343,14 @@ self-organizing map clustering and minimal spanning trees.")
 (define-public r-mixomics
   (package
     (name "r-mixomics")
-    (version "6.8.4")
+    (version "6.8.5")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "mixOmics" version))
        (sha256
         (base32
-         "0lw4c9lxcm83xrvl4y120i1z710qjbdqginhrw738azpr1f82hcg"))))
+         "0s93ai5d7li8pnxd87n12j9gypvac5zfahsk68j7zjv68dglj8s7"))))
     (properties `((upstream-name . "mixOmics")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 326746e14ce792710d41c24ad6994d1ac432d1b3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Sun, 6 Oct 2019 23:07:16 +0200
Subject: gnu: r-variancepartition: Update to 1.14.1.

* gnu/packages/bioconductor.scm (r-variancepartition): Update to 1.14.1.
[propagated-inputs]: Add r-biocparallel.
---
 gnu/packages/bioconductor.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 9de3deedea..7b0405427c 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -6010,19 +6010,20 @@ arrays based on fast wavelet-based functional models.")
 (define-public r-variancepartition
   (package
     (name "r-variancepartition")
-    (version "1.14.0")
+    (version "1.14.1")
     (source
      (origin
        (method url-fetch)
        (uri (bioconductor-uri "variancePartition" version))
        (sha256
         (base32
-         "1ycapwb2mq57xibrzzjz9zwxqz4nwz9f3n5gskhlr5vcs7irkjd6"))))
+         "0w4kri2389x1082xppx7l6xl1a5g74fyp02iwb4938x3gzwqwbjd"))))
     (properties
      `((upstream-name . "variancePartition")))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-biobase" ,r-biobase)
+       ("r-biocparallel" ,r-biocparallel)
        ("r-colorramps" ,r-colorramps)
        ("r-doparallel" ,r-doparallel)
        ("r-foreach" ,r-foreach)
-- 
cgit v1.2.3


From b44271350b897aff8cd90b5e77b3c40b0bf6e3dc Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 7 Oct 2019 01:43:37 +0200
Subject: gnu: emacs-deadgrep: Update to 0.8-2.3fc7ca1.

* gnu/packages/emacs-xyz.scm (emacs-deadgrep): Update to 0.8-2.3fc7ca1.
---
 gnu/packages/emacs-xyz.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5be5b4be45..85931912d4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15107,10 +15107,8 @@ accept and reject GitHub pull requests.")
       (license license:gpl3+))))
 
 (define-public emacs-deadgrep
-  ;; We prefer a newer commit (four commits newer than release) because of a
-  ;; bugfix for globbing.
-  (let ((commit "329119c65126f7917d3910bc584f4191ba8f21ac")
-        (revision "1"))
+  (let ((commit "3fc7ca1f58e190f0c80da455a0e40187e673020e")
+        (revision "2"))
     (package
       (name "emacs-deadgrep")
       (version (git-version "0.8" revision commit))
@@ -15123,7 +15121,7 @@ accept and reject GitHub pull requests.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "0fxf7gq9sjfkgpdfqx10w3l3nd4rwa8kv9plyxk1fqacb3s5m6ai"))))
+           "016gwqxd9aqzjw3hqv3vdf8cs6la8r65g6azg5rlmjqwfx3vsaha"))))
       (build-system emacs-build-system)
       (inputs
        `(("emacs-dash" ,emacs-dash)
-- 
cgit v1.2.3


From 47467ce75ab8c4ea24b9c8bf21d7e1041b8e603e Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Sun, 6 Oct 2019 07:31:25 +0200
Subject: gnu: Add emacs-peg.

* gnu/packages/emacs-xyz.scm (emacs-peg): New variable.
---
 gnu/packages/emacs-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 85931912d4..95cb9951de 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11715,6 +11715,26 @@ tables of contents.")
 timestamps by providing a @code{ts} struct.")
       (license license:gpl3+))))
 
+(define-public emacs-peg
+  (package
+    (name "emacs-peg")
+    (version "0.6")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/emacsmirror/peg")
+                    (commit version)))
+              (sha256
+               (base32
+                "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n"))
+              (file-name (git-file-name name version))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/emacsmirror/peg/")
+    (synopsis "Parsing Expression Grammars in Elisp")
+    (description "This package provides a macro that parses the current buffer
+according to a parsing expression grammar.")
+    (license license:gpl3+)))
+
 (define-public emacs-org-ql
   (package
     (name "emacs-org-ql")
-- 
cgit v1.2.3


From 3f68853557ba57918c99cca5aad1c2d3daee8f54 Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 7 Oct 2019 05:15:55 +0200
Subject: gnu: emacs-evil-traces: Update to 0.0.1-2.1931e3e.

* gnu/packages/emacs-xyz.scm (emacs-evil-traces): Update to 0.0.1-2.1931e3e.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 95cb9951de..7959f283f7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -18204,8 +18204,8 @@ corresponding Evil keys.")
       (license license:expat))))
 
 (define-public emacs-evil-traces
-  (let ((commit "b41b7432b8110378c199a3d25af464083777f453")
-        (revision "1"))
+  (let ((commit "1931e3ea2c64b4aec393a9c25063c330deff55e3")
+        (revision "2"))
     (package
       (name "emacs-evil-traces")
       (version (git-version "0.0.1" revision commit))
@@ -18217,7 +18217,7 @@ corresponding Evil keys.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0a15f2saynz9fws1h5s7py3cshsk4xs1kwgwj1m5rsin36g0j6hc"))))
+                  "12p9lfxscs182vbd4dy0m5gacs3d4kyprbz5yndpwvl8g2qsqplz"))))
       (build-system emacs-build-system)
       (propagated-inputs
        `(("emacs-evil" ,emacs-evil)))
-- 
cgit v1.2.3


From 4f2a3fbe8872f02e5186d354444da2dbee6b7c5f Mon Sep 17 00:00:00 2001
From: Brian Leung 
Date: Mon, 7 Oct 2019 08:20:50 +0200
Subject: gnu: emacs-evil-nerd-commenter: Update to 3.3.8.

* gnu/packages/emacs-xyz.scm (emacs-evil-nerd-commenter): Update to 3.3.8.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7959f283f7..5f8b3952fd 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -7292,7 +7292,7 @@ pasting into and from @code{tmux} paste buffers.")
 (define-public emacs-evil-nerd-commenter
   (package
     (name "emacs-evil-nerd-commenter")
-    (version "3.3.7")
+    (version "3.3.8")
     (source
      (origin
        (method git-fetch)
@@ -7302,7 +7302,7 @@ pasting into and from @code{tmux} paste buffers.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1r8shfdddys9vqvrxf7s6z83ydqx9xhqs9sa7klbsajryqcp50b7"))))
+         "0qd5a89mzvdyhd8lm13iwp220vzpd6dajwx54frlc5bzsxdmg6vc"))))
     (build-system emacs-build-system)
     (propagated-inputs `(("emacs-evil" ,emacs-evil)))
     (arguments
-- 
cgit v1.2.3


From 4261a9d162f723347981dfc6e72c8938343681a5 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov 
Date: Mon, 7 Oct 2019 10:21:19 +0300
Subject: gnu: emacs-mbsync: Update to 0.1.2-4.b62491c.

* gnu/packages/emacs-xyz.scm (emacs-mbsync): Update to 0.1.2-4.b62491c.
---
 gnu/packages/emacs-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5f8b3952fd..e87fa2ad11 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -12654,8 +12654,8 @@ key again.")
     (license license:gpl3+)))
 
 (define-public emacs-mbsync
-  (let ((commit "8f80c267cab1acb0d5bdd5b0059f5d1790d499ff")
-        (revision "3"))
+  (let ((commit "b62491c0e0d89eb9c66261a16d7ac81231c9c453")
+        (revision "4"))
     (package
       (name "emacs-mbsync")
       (version (git-version "0.1.2" revision commit))
@@ -12668,7 +12668,7 @@ key again.")
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1dwlpcczsa6b7bwv5149by0qmk8v2y7bjad02k4fy25yxznqzci9"))))
+           "1zlih37mkqjn2czl12zn7lgxxljvrwhqqpbksj9c91zn0f0rm3mz"))))
       (build-system emacs-build-system)
       (home-page "https://github.com/dimitri/mbsync-el")
       (synopsis "Interface to mbsync for Emacs")
-- 
cgit v1.2.3


From d3e22bcc1141cd33dde7017f51058f18d428917c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 7 Oct 2019 09:50:51 +0200
Subject: gnu: icedtea-7: Support non-Intel systems.

This is a followup to 1b6f99ea538d767099596860017e67755c1ac42f.

* gnu/packages/java.scm (icedtea-7)[arguments]: In 'install-libjvm'
phase, match armhf and aarch64.
[supported-systems]: New field.
---
 gnu/packages/java.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 3b7404973a..452180eead 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1377,11 +1377,17 @@ bootstrapping purposes.")
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((lib-path (string-append (assoc-ref outputs "out")
                                                "/lib/"
+                                               ;; See 'INSTALL_ARCH_DIR' in
+                                               ;; 'configure'.
                                                ,(match (%current-system)
                                                   ("i686-linux"
                                                    "i386")
                                                   ("x86_64-linux"
-                                                   "amd64")))))
+                                                   "amd64")
+                                                  ("armhf-linux"
+                                                   "arm")
+                                                  ("aarch64-linux"
+                                                   "aarch64")))))
                  (symlink (string-append lib-path "/server/libjvm.so")
                           (string-append lib-path "/libjvm.so")))
                #t))
@@ -1529,6 +1535,10 @@ bootstrapping purposes.")
       (description
        "This package provides the Java development kit OpenJDK built with the
 IcedTea build harness.")
+
+      ;; 'configure' lists "mips" and "mipsel", but not "mips64el'.
+      (supported-systems (delete "mips64el-linux" %supported-systems))
+
       ;; IcedTea is released under the GPL2 + Classpath exception, which is the
       ;; same license as both GNU Classpath and OpenJDK.
       (license license:gpl2+))))
-- 
cgit v1.2.3


From 7b6a8e23b0de18262a42e44432f955517d71d796 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 7 Oct 2019 11:18:45 +0300
Subject: gnu: aria2: Update to 1.35.0.

* gnu/packages/bittorrent.scm (aria2): Update to 1.35.0.
[source]: Use new upstream uri. Remove patch.
* gnu/packages/patches/aria2-CVE-2019-3500.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                   |  1 -
 gnu/packages/bittorrent.scm                    | 13 +++---
 gnu/packages/patches/aria2-CVE-2019-3500.patch | 55 --------------------------
 3 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 gnu/packages/patches/aria2-CVE-2019-3500.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 54ae09f619..ffe697c2e1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -695,7 +695,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch	\
   %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch	\
   %D%/packages/patches/apr-skip-getservbyname-test.patch	\
-  %D%/packages/patches/aria2-CVE-2019-3500.patch		\
   %D%/packages/patches/aspell-default-dict-dir.patch		\
   %D%/packages/patches/ath9k-htc-firmware-binutils.patch	\
   %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 50b63048e4..da01848ec7 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer 
 ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès 
 ;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari 
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner 
+;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner 
 ;;; Copyright © 2016 Tomáš Čech 
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Jelle Licht 
@@ -262,16 +262,15 @@ maintained upstream.")
 (define-public aria2
   (package
     (name "aria2")
-    (version "1.34.0")
+    (version "1.35.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://github.com/tatsuhiro-t/aria2/"
-                                  "releases/download/release-" version "/"
-                                  name "-" version ".tar.xz"))
-              (patches (search-patches "aria2-CVE-2019-3500.patch"))
+              (uri (string-append "https://github.com/aria2/aria2/releases/"
+                                  "download/release-" version
+                                  "/aria2-" version ".tar.xz"))
               (sha256
                (base32
-                "18vpgr430vxlwbcc3598rr1srfmwypls6wp1m4wf21hncc1ahi1s"))))
+                "1zbxc517d97lb96f15xcy4l7b66grxrp3h2ids2jiwkaip87yaqy"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list "--enable-libaria2"
diff --git a/gnu/packages/patches/aria2-CVE-2019-3500.patch b/gnu/packages/patches/aria2-CVE-2019-3500.patch
deleted file mode 100644
index 891c9047ba..0000000000
--- a/gnu/packages/patches/aria2-CVE-2019-3500.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix CVE-2019-3500:
-
-https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3500
-https://github.com/aria2/aria2/issues/1329
-
-Patch copied from upstream source repository:
-
-https://github.com/aria2/aria2/commit/37368130ca7de5491a75fd18a20c5c5cc641824a
-
-From 37368130ca7de5491a75fd18a20c5c5cc641824a Mon Sep 17 00:00:00 2001
-From: Tatsuhiro Tsujikawa 
-Date: Sat, 5 Jan 2019 09:32:40 +0900
-Subject: [PATCH] Mask headers
-
----
- src/HttpConnection.cc | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
-index 77cb9d27a..be5b97723 100644
---- a/src/HttpConnection.cc
-+++ b/src/HttpConnection.cc
-@@ -102,11 +102,17 @@ std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
-   std::string result;
-   std::string line;
-   while (getline(istr, line)) {
--    if (util::startsWith(line, "Authorization: Basic")) {
--      result += "Authorization: Basic ********\n";
-+    if (util::istartsWith(line, "Authorization: ")) {
-+      result += "Authorization: \n";
-     }
--    else if (util::startsWith(line, "Proxy-Authorization: Basic")) {
--      result += "Proxy-Authorization: Basic ********\n";
-+    else if (util::istartsWith(line, "Proxy-Authorization: ")) {
-+      result += "Proxy-Authorization: \n";
-+    }
-+    else if (util::istartsWith(line, "Cookie: ")) {
-+      result += "Cookie: \n";
-+    }
-+    else if (util::istartsWith(line, "Set-Cookie: ")) {
-+      result += "Set-Cookie: \n";
-     }
-     else {
-       result += line;
-@@ -154,8 +160,8 @@ std::unique_ptr HttpConnection::receiveResponse()
-   const auto& proc = outstandingHttpRequests_.front()->getHttpHeaderProcessor();
-   if (proc->parse(socketRecvBuffer_->getBuffer(),
-                   socketRecvBuffer_->getBufferLength())) {
--    A2_LOG_INFO(
--        fmt(MSG_RECEIVE_RESPONSE, cuid_, proc->getHeaderString().c_str()));
-+    A2_LOG_INFO(fmt(MSG_RECEIVE_RESPONSE, cuid_,
-+                    eraseConfidentialInfo(proc->getHeaderString()).c_str()));
-     auto result = proc->getResult();
-     if (result->getStatusCode() / 100 == 1) {
-       socketRecvBuffer_->drain(proc->getLastBytesProcessed());
-- 
cgit v1.2.3


From 048d21a8733f4173705ed59a22a03caddb876fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 
Date: Mon, 7 Oct 2019 10:38:22 +0200
Subject: gnu: icedtea-7: Avoid massive rebuild.

Reported by Efraim Flashner.

* gnu/packages/java.scm (icedtea-7)[arguments]: Change 'lib-path'
definition in 'install-libjvm' to avoid the rebuilds that commit
1b6f99ea538d767099596860017e67755c1ac42f would otherwise entail.
---
 gnu/packages/java.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 452180eead..1f5e39d9c6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1376,18 +1376,17 @@ bootstrapping purposes.")
            (add-after 'install 'install-libjvm
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((lib-path (string-append (assoc-ref outputs "out")
-                                               "/lib/"
                                                ;; See 'INSTALL_ARCH_DIR' in
                                                ;; 'configure'.
                                                ,(match (%current-system)
                                                   ("i686-linux"
-                                                   "i386")
+                                                   "/lib/i386")
                                                   ("x86_64-linux"
-                                                   "amd64")
+                                                   "/lib/amd64")
                                                   ("armhf-linux"
-                                                   "arm")
+                                                   "/lib/arm")
                                                   ("aarch64-linux"
-                                                   "aarch64")))))
+                                                   "/lib/aarch64")))))
                  (symlink (string-append lib-path "/server/libjvm.so")
                           (string-append lib-path "/libjvm.so")))
                #t))
-- 
cgit v1.2.3


From 7d82e920717f08bceb42bb570d786dff233171e1 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Sun, 6 Oct 2019 06:07:15 +0000
Subject: gnu: linux-libre: Update to 5.3.4.

* gnu/packages/linux (linux-libre-5.3-version): Update to 5.3.4.
  (deblob-scripts-5.3): Update to 5.3.4.
---
 gnu/packages/linux.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 21cd4a205f..910aeed6ff 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -184,9 +184,9 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
 
 (define deblob-scripts-5.3
   (linux-libre-deblob-scripts
-   "5.3.1"
+   "5.3.4"
    (base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4")
-   (base32 "1av9ykv714cnl0clls8rhwa8rwflz6ivg17gharj1x650qp6vnw3")))
+   (base32 "0nrimraf46nf6y1hwkg29fyl0a83wnj0mwq54ggxvffn9gk5h9pa")))
 
 (define deblob-scripts-5.2
   (linux-libre-deblob-scripts
@@ -358,10 +358,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                         "linux-" version ".tar.xz"))
     (sha256 hash)))
 
-(define-public linux-libre-5.3-version "5.3.2")
+(define-public linux-libre-5.3-version "5.3.4")
 (define-public linux-libre-5.3-pristine-source
   (let ((version linux-libre-5.3-version)
-        (hash (base32 "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn")))
+        (hash (base32 "0vi4bgcr921z5l6fbcrcgmhaji5gl2avpmp7njna6v0f7sxism0r")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.3)))
-- 
cgit v1.2.3


From 85747bab82f529a476a5468f0c0f48b8ba047594 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:45:53 +0200
Subject: gnu: sbcl-optima: Fix version number

* gnu/packages/lisp.scm (sbcl-optima)[version]: It's actually 1.0.
---
 gnu/packages/lisp.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index ed3efc7bdb..c358aa6465 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6388,7 +6388,7 @@ the return type of a function.")
     (package
       (name "sbcl-optima")
       (build-system asdf-build-system/sbcl)
-      (version (git-version "0.1" revision commit))
+      (version (git-version "1.0" revision commit))
       (home-page "https://github.com/m2ym/optima")
       (source
        (origin
-- 
cgit v1.2.3


From 7baaf7f3587961255d429087e5d18d35275a176d Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:46:36 +0200
Subject: gnu: Add cl-fare-quasiquote.

* gnu/packages/lisp.scm (cl-fare-quasiquote): New variable.
---
 gnu/packages/lisp.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index c358aa6465..c1ea8cc37b 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6451,6 +6451,9 @@ quasiquote is enable matching of quasiquoted patterns, using Optima or
 Trivia.")
     (license license:expat)))
 
+(define-public cl-fare-quasiquote
+  (sbcl-package->cl-source-package sbcl-fare-quasiquote))
+
 (define-public sbcl-fare-quasiquote-readtable
   (package
     (inherit sbcl-fare-quasiquote)
-- 
cgit v1.2.3


From 06e2da719ea95a9d48ad86002ab183c5114ff2b1 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:46:55 +0200
Subject: gnu: Add fare-quasiquote-optima.

* gnu/packages/lisp.scm (cl-fare-quasiquote-optima,
  sbcl-fare-quasiquote-optima): New variables.
---
 gnu/packages/lisp.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index c1ea8cc37b..4d3b4fbcbc 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6454,6 +6454,26 @@ Trivia.")
 (define-public cl-fare-quasiquote
   (sbcl-package->cl-source-package sbcl-fare-quasiquote))
 
+(define-public sbcl-fare-quasiquote-optima
+  (package
+    (inherit sbcl-fare-quasiquote)
+    (name "sbcl-fare-quasiquote-optima")
+    (inputs
+     `(("optima" ,sbcl-optima)
+       ("fare-quasiquote" ,sbcl-fare-quasiquote)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-requirement
+           (lambda _
+             (substitute* "fare-quasiquote-optima.asd"
+               (("\\(:version \"optima\" \"1\\.0\"\\)")
+                "\"optima\""))
+             #t)))))))
+
+(define-public cl-fare-quasiquote-optima
+  (sbcl-package->cl-source-package sbcl-fare-quasiquote-optima))
+
 (define-public sbcl-fare-quasiquote-readtable
   (package
     (inherit sbcl-fare-quasiquote)
-- 
cgit v1.2.3


From 7b9cb9c01c097f66c0b617ad4e7462ee72a349c9 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:47:46 +0200
Subject: gnu: Add cl-fare-quasiquote-readtable.

* gnu/packages/lisp.scm (cl-fare-quasiquote-readtable): New variable.
---
 gnu/packages/lisp.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 4d3b4fbcbc..b2cd4dd352 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6487,6 +6487,9 @@ Trivia.
 
 This package uses fare-quasiquote with named-readtable.")))
 
+(define-public cl-fare-quasiquote-readtable
+  (sbcl-package->cl-source-package sbcl-fare-quasiquote-readtable))
+
 (define-public sbcl-trivia.level0
   (let ((commit "902e0c65602bbfe96ae82e679330b3771ddc7603")
         (revision "1"))
-- 
cgit v1.2.3


From 6fdb5b79478d0c6087a1b05cd092ec87f7435c72 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:48:00 +0200
Subject: gnu: Add cl-fare-quasiquote-extras.

* gnu/packages/lisp.scm (cl-fare-quasiquote-extras): New variable.
---
 gnu/packages/lisp.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index b2cd4dd352..0ca815fb2e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -6490,6 +6490,19 @@ This package uses fare-quasiquote with named-readtable.")))
 (define-public cl-fare-quasiquote-readtable
   (sbcl-package->cl-source-package sbcl-fare-quasiquote-readtable))
 
+;; TODO: Add support for component-less system in asdf-build-system/sbcl.
+(define-public cl-fare-quasiquote-extras
+  (package
+    (inherit cl-fare-quasiquote)
+    (name "cl-fare-quasiquote-extras")
+    (build-system asdf-build-system/source)
+    (propagated-inputs
+     `(("fare-quasiquote" ,cl-fare-quasiquote)
+       ("fare-quasiquote-optima" ,cl-fare-quasiquote-optima)
+       ("fare-quasiquote-readtable" ,cl-fare-quasiquote-readtable)))
+    (description "This library combines @code{fare-quasiquote-readtable} and
+@code{fare-quasiquote-optima}.")))
+
 (define-public sbcl-trivia.level0
   (let ((commit "902e0c65602bbfe96ae82e679330b3771ddc7603")
         (revision "1"))
-- 
cgit v1.2.3


From 3658db3fd73d3e04e81e5a3b03d2c395312e833a Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:48:23 +0200
Subject: gnu: Add string-case.

* gnu/packages/lisp.scm (cl-string-case, ecl-string-case, sbcl-string-case):
  New variables.
---
 gnu/packages/lisp.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 0ca815fb2e..debe568347 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7527,3 +7527,33 @@ of C+GObject libraries without the need of writing dedicated bindings.")
 
 (define-public cl-gobject-introspection
   (sbcl-package->cl-source-package sbcl-cl-gobject-introspection))
+
+(define-public sbcl-string-case
+  (let ((commit "718c761e33749e297cd2809c7ba3ade1985c49f7")
+        (revision "0"))
+    (package
+      (name "sbcl-string-case")
+      (version (git-version "0.0.2" revision commit))
+      (home-page "https://github.com/pkhuong/string-case")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1n5i3yh0h5s636rcnwn7jwqy3rjflikra04lymimhpcshhjsk0md"))))
+      (build-system asdf-build-system/sbcl)
+      (synopsis "Efficient string= case in Common Lisp")
+      (description
+       "@code{string-case} is a Common Lisp macro that generates specialised decision
+trees to dispatch on string equality.")
+      (license license:bsd-3))))
+
+(define-public cl-string-case
+  (sbcl-package->cl-source-package sbcl-string-case))
+
+(define-public ecl-string-case
+  (sbcl-package->ecl-package sbcl-string-case))
-- 
cgit v1.2.3


From 003a714e7e1f458b84e60b7480149a59b034312c Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:48:52 +0200
Subject: gnu: Add global-vars.

* gnu/packages/lisp.scm (cl-global-vars, ecl-global-vars, sbcl-global-vars):
  New variables.
---
 gnu/packages/lisp.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index debe568347..88261d5f8e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7557,3 +7557,40 @@ trees to dispatch on string equality.")
 
 (define-public ecl-string-case
   (sbcl-package->ecl-package sbcl-string-case))
+
+(define-public sbcl-global-vars
+  (let ((commit "c749f32c9b606a1457daa47d59630708ac0c266e")
+        (revision "0"))
+    (package
+      (name "sbcl-global-vars")
+      (version (git-version "1.0.0" revision commit))
+      (home-page "https://github.com/lmj/global-vars")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "06m3xc8l3pgsapl8fvsi9wf6y46zs75cp9zn7zh6dc65v4s5wz3d"))))
+      (build-system asdf-build-system/sbcl)
+      (synopsis "Efficient global variables in Common Lisp")
+      (description
+       "In Common Lisp, a special variable that is never dynamically bound
+typically serves as a stand-in for a global variable.  The @code{global-vars}
+library provides true global variables that are implemented by some compilers.
+An attempt to rebind a global variable properly results in a compiler error.
+That is, a global variable cannot be dynamically bound.
+
+Global variables therefore allow us to communicate an intended usage that
+differs from special variables.  Global variables are also more efficient than
+special variables, especially in the presence of threads.")
+      (license license:expat))))
+
+(define-public cl-global-vars
+  (sbcl-package->cl-source-package sbcl-global-vars))
+
+(define-public ecl-global-vars
+  (sbcl-package->ecl-package sbcl-global-vars))
-- 
cgit v1.2.3


From c6dd9cf7ffd968520e78c438f7064935c40e139d Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:49:42 +0200
Subject: gnu: Add trivial-file-size.

* gnu/packages/lisp.scm (cl-trivial-file-size, ecl-trivial-file-size,
  sbcl-trivial-file-size): New variables.
---
 gnu/packages/lisp.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 88261d5f8e..031d172c39 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7594,3 +7594,41 @@ special variables, especially in the presence of threads.")
 
 (define-public ecl-global-vars
   (sbcl-package->ecl-package sbcl-global-vars))
+
+(define-public sbcl-trivial-file-size
+  (let ((commit "1c1d672a01a446ba0391dbb4ffc40be3b0476f23")
+        (revision "0"))
+    (package
+      (name "sbcl-trivial-file-size")
+      (version (git-version "0.0.0" revision commit))
+      (home-page "https://github.com/ruricolist/trivial-file-size")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "17pp86c9zs4y7i1sh7q9gbfw9iqv6655k7fz8qbj9ly1ypgxp4qs"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("fiveam" ,sbcl-fiveam)))
+      (synopsis "Size of a file in bytes in Common Lisp")
+      (description
+       "The canonical way to determine the size of a file in bytes, using Common Lisp,
+is to open the file with an element type of (unsigned-byte 8) and then
+calculate the length of the stream.  This is less than ideal.  In most cases
+it is better to get the size of the file from its metadata, using a system
+call.
+
+This library exports a single function, file-size-in-octets.  It returns the
+size of a file in bytes, using system calls when possible.")
+      (license license:expat))))
+
+(define-public cl-trivial-file-size
+  (sbcl-package->cl-source-package sbcl-trivial-file-size))
+
+(define-public ecl-trivial-file-size
+  (sbcl-package->ecl-package sbcl-trivial-file-size))
-- 
cgit v1.2.3


From fa4bbd9f3427994b3041ec6834500a864dbbe238 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Mon, 7 Oct 2019 13:50:07 +0200
Subject: gnu: Add trivial-macroexpand-all.

* gnu/packages/lisp.scm (cl-trivial-macroexpand-all,
  ecl-trivial-macroexpand-all, sbcl-trivial-macroexpand-all): New variables.
---
 gnu/packages/lisp.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 031d172c39..84597e4e73 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7632,3 +7632,35 @@ size of a file in bytes, using system calls when possible.")
 
 (define-public ecl-trivial-file-size
   (sbcl-package->ecl-package sbcl-trivial-file-size))
+
+(define-public sbcl-trivial-macroexpand-all
+  (let ((commit "933270ac7107477de1bc92c1fd641fe646a7a8a9")
+        (revision "0"))
+    (package
+      (name "sbcl-trivial-macroexpand-all")
+      (version (git-version "0.0.0" revision commit))
+      (home-page "https://github.com/cbaggers/trivial-macroexpand-all")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "191hnn4b5j4i3crydmlzbm231kj0h7l8zj6mzj69r1npbzkas4bd"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("fiveam" ,sbcl-fiveam)))
+      (synopsis "Portable macroexpand-all for Common Lisp")
+      (description
+       "This library provides a macroexpand-all function that calls the
+implementation specific equivalent.")
+      (license license:unlicense))))
+
+(define-public cl-trivial-macroexpand-all
+  (sbcl-package->cl-source-package sbcl-trivial-macroexpand-all))
+
+(define-public ecl-trivial-macroexpand-all
+  (sbcl-package->ecl-package sbcl-trivial-macroexpand-all))
-- 
cgit v1.2.3


From fa984fa678f98ddc72cc89c6f6dc50ba4aff2487 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 7 Oct 2019 16:32:03 +0200
Subject: gnu: jack-2: Update to 1.9.13.

* gnu/packages/audio.scm (jack-2): Update to 1.9.13.
[arguments]: Don't build with python-2.
[inputs]: Replace python2-dbus with python-dbus.
---
 gnu/packages/audio.scm | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 6eb61583f7..afa02c1239 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1532,7 +1532,7 @@ synchronous execution of all clients, and low latency operation.")
 (define-public jack-2
   (package (inherit jack-1)
     (name "jack2")
-    (version "1.9.12")
+    (version "1.9.13")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/jackaudio/jack2/releases/"
@@ -1541,40 +1541,38 @@ synchronous execution of all clients, and low latency operation.")
              (file-name (string-append name "-" version ".tar.gz"))
              (sha256
               (base32
-               "0crf4y9a5j9miw8r5ji4l3w5w0y2frrf7xyfsfdgacnw6vwy5vyy"))))
+               "1d1d403jn4366mqig6g8ghr8057b3rn7gs26b5p3rkal34j20qw2"))))
     (build-system waf-build-system)
     (arguments
-     `(#:python ,python-2
-       #:tests? #f  ; no check target
+     `(#:tests? #f  ; no check target
        #:configure-flags '("--dbus"
                            "--alsa")
        #:phases
        (modify-phases %standard-phases
-         (add-before
-          'configure 'set-linkflags
-          (lambda _
-            ;; Add $libdir to the RUNPATH of all the binaries.
-            (substitute* "wscript"
-              ((".*CFLAGS.*-Wall.*" m)
-               (string-append m
-                              "    conf.env.append_unique('LINKFLAGS',"
-                              "'-Wl,-rpath=" %output "/lib')\n")))
-            #t))
+         (add-before 'configure 'set-linkflags
+           (lambda _
+             ;; Add $libdir to the RUNPATH of all the binaries.
+             (substitute* "wscript"
+               ((".*CFLAGS.*-Wall.*" m)
+                (string-append m
+                               "    conf.env.append_unique('LINKFLAGS',"
+                               "'-Wl,-rpath=" %output "/lib')\n")))
+             #t))
          (add-after 'install 'wrap-python-scripts
-          (lambda* (#:key inputs outputs #:allow-other-keys)
-            ;; Make sure 'jack_control' runs with the correct PYTHONPATH.
-            (let* ((out (assoc-ref outputs "out"))
-                   (path (getenv "PYTHONPATH")))
-              (wrap-program (string-append out "/bin/jack_control")
-                `("PYTHONPATH" ":" prefix (,path))))
-            #t)))))
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; Make sure 'jack_control' runs with the correct PYTHONPATH.
+             (let* ((out (assoc-ref outputs "out"))
+                    (path (getenv "PYTHONPATH")))
+               (wrap-program (string-append out "/bin/jack_control")
+                 `("PYTHONPATH" ":" prefix (,path))))
+             #t)))))
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("dbus" ,dbus)
        ("expat" ,expat)
        ("libsamplerate" ,libsamplerate)
        ("opus" ,opus)
-       ("python2-dbus" ,python2-dbus)
+       ("python-dbus" ,python-dbus)
        ("readline" ,readline)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From 4cced9895ed20410880029fda622f18e559d2612 Mon Sep 17 00:00:00 2001
From: Arun Isaac 
Date: Mon, 7 Oct 2019 21:19:41 +0530
Subject: gnu: emacs-linum-relative: Update to 0.6.

* gnu/packages/emacs-xyz.scm (emacs-linum-relative): Update to 0.6.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e87fa2ad11..e9e20844cf 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8197,7 +8197,7 @@ memoizing functions.")
 (define-public emacs-linum-relative
   (package
     (name "emacs-linum-relative")
-    (version "0.5")
+    (version "0.6")
     (source
      (origin
        (method git-fetch)
@@ -8206,7 +8206,7 @@ memoizing functions.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"))))
+        (base32 "0b3n1gk2w1p72x0zfdz9l70winq2fnjpjrgq0awxx730xk7ypp5n"))))
     (build-system emacs-build-system)
     (home-page "https://github.com/coldnew/linum-relative")
     (synopsis "Relative line numbering for Emacs")
-- 
cgit v1.2.3


From edaa6167369b60dc4668e4369ebef2c6adced06e Mon Sep 17 00:00:00 2001
From: Eric Bavier 
Date: Mon, 7 Oct 2019 19:48:31 -0500
Subject: gnu: ncmpc: Fix manual install.

The default manual installation directory was fixed upstream in version 0.34.

* gnu/packages/mpd.scm (ncmpc)[arguments]: Remove #:configure-flags.
---
 gnu/packages/mpd.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index fafb61c681..89979db15b 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -207,12 +207,7 @@ player daemon.")
                 "0hfjvm1p0z7x6gfn5xhl5c0jsmidvz0qfl04pq45x4chh9iiwkxx"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags
-       ;; Otherwise, they are installed incorrectly, in
-       ;; '$out/share/man/man/man1'.
-       (list (string-append "-Dmandir=" (assoc-ref %outputs "out")
-                            "/share"))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-before 'configure 'expand-C++-include-path
            ;; Make /include/c++/ext/string_conversions.h find .
-- 
cgit v1.2.3


From 248f218e447900d41510d6e68343cd2d1eda1d9f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 11:53:18 +0200
Subject: gnu: lynis: Update to 2.7.5.

* gnu/packages/admin.scm (lynis): Update to 2.7.5.
---
 gnu/packages/admin.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 8c550a79af..3dc5f35af0 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3341,7 +3341,7 @@ Logitech Unifying Receiver.")
   (package
     (name "lynis")
     ;; Also update the ‘lynis-sdk’ input to the commit matching this release.
-    (version "2.7.4")
+    (version "2.7.5")
     (source
      (origin
        (method git-fetch)
@@ -3350,7 +3350,7 @@ Logitech Unifying Receiver.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1jjk5hcxmp4f4ppsljiq95l2ln6b03azydap3b35lsvxkjybv88k"))
+        (base32 "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -3367,10 +3367,10 @@ Logitech Unifying Receiver.")
            (method git-fetch)
            (uri (git-reference
                  (url "https://github.com/CISOfy/lynis-sdk")
-                 (commit "90f301e21c204792cf372f1cf05890a562f2e31b")))
+                 (commit "bf1c1d95121da9ca79a9eac5a15ed8d81e34094d")))
            (file-name (git-file-name "lynis-sdk" version))
            (sha256
-            (base32 "1d0smr1fxrvbc3hl8lzy33im9ahzr0hgs3kk09r8g8xccjkcm52l"))))))
+            (base32 "1ndz5v0039dqa87cva2dk55a8hkw0fibsw8hh2ddmny9qkr4l3dp"))))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-- 
cgit v1.2.3


From 2dc0a6cf368231b8f0a7cde7f9ceb68cad262f79 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 6 Oct 2019 23:59:02 +0200
Subject: gnu: maxflow: Use GIT-FILE-NAME.

* gnu/packages/maths.scm (maxflow)[source]: Use GIT-FILE-NAME.
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 03738c66ea..c1640fa02b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1772,7 +1772,7 @@ ASCII text files using Gmsh's own scripting language.")
               (uri (git-reference
                     (url "https://github.com/gerddie/maxflow.git")
                     (commit "42401fa54823d16b9da47716f04e5d9ef1605875")))
-              (file-name (string-append name "-" version "-checkout"))
+              (file-name (git-file-name name version))
               (sha256
                (base32
                 "0rll38whw55h0vcjrrwdnh9ascvxby0ph7n1l0d12z17cg215kkb"))))
-- 
cgit v1.2.3


From 0af12a1367b5ab8b94c3bdc99b1c1b3bba093610 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 00:02:46 +0200
Subject: gnu: maxflow: Correct version to 3.0.5.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This won't be picked up by ‘guix package -u’, but the code is identical
anyway.  By changing this now, fewer installations will fail to upgrade
at all if upstream ever release a new <3.4.

* gnu/packages/maths.scm (maxflow)[version]: Change to 3.0.5.
[source]: Use version tag instead of raw matching commit.
---
 gnu/packages/maths.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c1640fa02b..b4edc3f073 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1766,12 +1766,14 @@ ASCII text files using Gmsh's own scripting language.")
 (define-public maxflow
   (package
     (name "maxflow")
-    (version "3.04")
+    ;; Versioning is ambiguous: the git tag matching this commit is ‘3.0.5’,
+    ;; which matches CMakeLists.txt, but README.md and CHANGES say ‘3.04’.
+    (version "3.0.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/gerddie/maxflow.git")
-                    (commit "42401fa54823d16b9da47716f04e5d9ef1605875")))
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-- 
cgit v1.2.3


From 1c8d6d6d7a764e7b8065eab49baabb8843ff8c0b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 10:30:08 +0200
Subject: gnu: qucs-s: Update to 0.0.21.

* gnu/packages/engineering.scm (qucs-s): Update to 0.0.21.
---
 gnu/packages/engineering.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index bbd9151995..7c2e5fb326 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1816,7 +1816,7 @@ simulations are also supported.")
 (define-public qucs-s
   (package
     (name "qucs-s")
-    (version "0.0.20")
+    (version "0.0.21")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/ra3xdh/qucs_s/archive/"
@@ -1824,7 +1824,7 @@ simulations are also supported.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "01dizf4rjciqc8x7bmv3kbhdlz90bm6n9m9fz7dbzqcwvszcs1hx"))))
+                "12m1jwhb9qwvb141qzyskbxnw3wn1x22d02z4b4862p7xvccl5h7"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f ; no tests
-- 
cgit v1.2.3


From aa714a06db991b929282fe2dcce1f77b8c9337f4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 10:32:18 +0200
Subject: gnu: perl-regexp-pattern-license: Update to 3.1.94.

* gnu/packages/license.scm (perl-regexp-pattern-license): Update to 3.1.94.
---
 gnu/packages/license.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm
index 73b0dff3f5..f071d0a710 100644
--- a/gnu/packages/license.scm
+++ b/gnu/packages/license.scm
@@ -38,7 +38,7 @@
 (define-public perl-regexp-pattern-license
   (package
     (name "perl-regexp-pattern-license")
-    (version "3.1.92")
+    (version "3.1.94")
     (source
      (origin
        (method url-fetch)
@@ -46,8 +46,7 @@
              "mirror://cpan/authors/id/J/JO/JONASS/Regexp-Pattern-License-"
              "v" version ".tar.gz"))
        (sha256
-        (base32
-         "0gxv8wpvlllmvhkpixv5x23ywn1s6zs7ypcs38s7nfh4phamyixh"))))
+        (base32 "0kznpv628jrndn4nw646f6pl7yqvmacwljlygvsjfdkyh0i4sr2k"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-regexp-pattern" ,perl-regexp-pattern)
-- 
cgit v1.2.3


From bdc63012d142bea789b100699e96aaecdb99f0a4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 10:32:49 +0200
Subject: gnu: licensecheck: Update to 3.0.37.

* gnu/packages/license.scm (licensecheck): Update to 3.0.37.
---
 gnu/packages/license.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm
index f071d0a710..b7519f91ae 100644
--- a/gnu/packages/license.scm
+++ b/gnu/packages/license.scm
@@ -113,7 +113,7 @@ statements and serializes in normalized format.")
 (define-public licensecheck
   (package
     (name "licensecheck")
-    (version "3.0.36")
+    (version "3.0.37")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -121,7 +121,7 @@ statements and serializes in normalized format.")
                     "v" version ".tar.gz"))
               (sha256
                (base32
-                "0y14ppq6f9hc0rc0syhfgms1r7fd51vpgfx5va6b2v84y8anb6g1"))))
+                "12l83zf85zagpagizmzy3bwkc659sbzqf18cycx8g4h6d3mc5kqw"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-regexp-pattern" ,perl-regexp-pattern)
-- 
cgit v1.2.3


From 0be9038c95c65258ca557e5cd084751ee9d8a3ec Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 10:48:41 +0200
Subject: gnu: maxflow: Use HTTPS home page.

* gnu/packages/maths.scm (maxflow)[home-page]: Use HTTPS.
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index b4edc3f073..e46c740e57 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1779,7 +1779,7 @@ ASCII text files using Gmsh's own scripting language.")
                (base32
                 "0rll38whw55h0vcjrrwdnh9ascvxby0ph7n1l0d12z17cg215kkb"))))
     (build-system cmake-build-system)
-    (home-page "http://pub.ist.ac.at/~vnk/software.html")
+    (home-page "https://pub.ist.ac.at/~vnk/software.html")
     (synopsis "Library implementing Maxflow algorithm")
     (description "An implementation of the maxflow algorithm described in
 @cite{An Experimental Comparison of Min-Cut/Max-Flow Algorithms for
-- 
cgit v1.2.3


From 2608d3ea5b48d5dd3d335f4fdad6d4203933e4ba Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 10:50:23 +0200
Subject: gnu: perl-async-interrupt: Update to 1.25.

* gnu/packages/perl.scm (perl-async-interrupt): Update to 1.25.
---
 gnu/packages/perl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 7fc6363462..20c17995ba 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -298,14 +298,14 @@ list manipulation routines.")
 (define-public perl-async-interrupt
   (package
     (name "perl-async-interrupt")
-    (version "1.24")
+    (version "1.25")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://cpan/authors/id/M/ML/MLEHMANN/"
                                   "Async-Interrupt-" version ".tar.gz"))
               (sha256
                (base32
-                "1lx4am3cqb9vvng9fhlwgfd7mk3afbrg8rps6xgpas6ij67dw8m0"))))
+                "0jh94wj1b6a0cnni8prsb59g5lak5rfj2fw5ng96291zmz2yqp1w"))))
     (build-system perl-build-system)
     (native-inputs
      `(("perl-canary-stability" ,perl-canary-stability)))
-- 
cgit v1.2.3


From 9be266116ba274ecf6a66178c17e51414dde3eec Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 15:32:20 +0200
Subject: gnu: me-cleaner: Update to 1.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/flashing-tools.scm (me-cleaner): Update to 1.2.
[arguments]: Remove ‘create-setup.py’ phase.  Add ‘install-documentation’ phase.
---
 gnu/packages/flashing-tools.scm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 42ce560ca7..7d5c1cf723 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -413,28 +413,25 @@ Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
 (define-public me-cleaner
   (package
     (name "me-cleaner")
-    (version "1.1")
+    (version "1.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/corna/me_cleaner/"
                                   "archive/v" version ".tar.gz"))
               (sha256
                (base32
-                "1pgwdqy0jly80nhxmlmyibs343497yjzs6dwfbkcw0l1gjm8i5hw"))
+                "0hdnay1ai0r6l69z63jkiz6yfwdsqc2mrfyj77hgadv7xxxqm6na"))
               (file-name (string-append name "-" version ".tar.gz"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'create-setup.py
-           (lambda _
-             (call-with-output-file "setup.py"
-               (lambda (port)
-                 (format port "\
-from setuptools import setup
-setup(name='me_cleaner', version='~a', scripts=['me_cleaner.py'])
-" ,version)))
-             #t)))))
+         (add-after 'install 'install-documentation
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (man (string-append out "/share/man/man1")))
+               (install-file "man/me_cleaner.1" man)
+               #t))))))
     (home-page "https://github.com/corna/me_cleaner")
     (synopsis "Intel ME cleaner")
     (description "This package provides tools for disabling Intel
-- 
cgit v1.2.3


From 24268ec4184860192d2ec9043501ab6dc8aee99e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Mon, 7 Oct 2019 23:13:51 +0200
Subject: gnu: coin3D: Use a specific changeset.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/graphics.scm (coin3D)[source]: Use HG-FETCH and…
GIT-FILE-NAME.
---
 gnu/packages/graphics.scm | 86 +++++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 40 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 88bb500450..caaf6c660b 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2016 Andreas Enge 
 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis 
 ;;; Copyright © 2017, 2018 Ben Woodcroft 
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice 
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice 
 ;;; Copyright © 2018 Mathieu Othacehe 
 ;;; Copyright © 2018 Alex Kost 
 ;;; Copyright © 2018 Kei Kebreau 
@@ -79,6 +79,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix hg-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils))
@@ -1106,47 +1107,52 @@ or by subtracting one shape from the other.")
       (license license:gpl2))))
 
 (define-public coin3D
-  (package
-    (name "coin3D")
-    (version "4.0.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://bitbucket.org/Coin3D/coin/downloads/coin-"
-             version "-src.zip"))
-       (sha256
-        (base32
-         "1mqwlqzvc9ydfxi0bfskwlil16mbnkphfz36p0zl2mvw6h05aqh0"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (for-each delete-file
-                     '("cfg/csubst.exe"
-                       "cfg/wrapmsvc.exe"))
-           #t))))
-    (build-system cmake-build-system)
-    (native-inputs
-     `(("doxygen" ,doxygen)
-       ("graphviz" ,graphviz)))
-    (inputs
-     `(("boost" ,boost)
-       ("freeglut" ,freeglut)
-       ("glew" ,glew)))
-    (arguments
-     `(#:configure-flags
-       (list
-        "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
-        (string-append "-DBOOST_ROOT="
-                       (assoc-ref %build-inputs "boost")))))
-    (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home")
-    (synopsis
-     "High-level 3D visualization library with Open Inventor 2.1 API")
-    (description
-     "Coin is a 3D graphics library with an Application Programming Interface
+  ;; The ‘4.0.0’ zip archive isn't stable, nor in fact a release.  See:
+  ;; https://bitbucket.org/Coin3D/coin/issues/179/coin-400-srczip-has-been-modified
+  (let ((revision 1)
+        (changeset "ab8d0e47a4de3230a8137feb39c142d6ba45f97d"))
+    (package
+      (name "coin3D")
+      (version
+       (simple-format #f "3.1.3-~A-~A" revision (string-take changeset 7)))
+      (source
+       (origin
+         (method hg-fetch)
+         (uri (hg-reference
+               (url "https://bitbucket.org/Coin3D/coin")
+               (changeset changeset)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1ff44jz6lg4rylljvy69n1hcjh9y6achbv9jpn1cv2sf8cxn3r2j"))
+         (modules '((guix build utils)))
+         (snippet
+          '(begin
+             (for-each delete-file
+                       '("cfg/csubst.exe"
+                         "cfg/wrapmsvc.exe"))
+             #t))))
+      (build-system cmake-build-system)
+      (native-inputs
+       `(("doxygen" ,doxygen)
+         ("graphviz" ,graphviz)))
+      (inputs
+       `(("boost" ,boost)
+         ("freeglut" ,freeglut)
+         ("glew" ,glew)))
+      (arguments
+       `(#:configure-flags
+         (list
+          "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
+          (string-append "-DBOOST_ROOT="
+                         (assoc-ref %build-inputs "boost")))))
+      (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home")
+      (synopsis
+       "High-level 3D visualization library with Open Inventor 2.1 API")
+      (description
+       "Coin is a 3D graphics library with an Application Programming Interface
 based on the Open Inventor 2.1 API.  For those who are not familiar with
 Open Inventor, it is a scene-graph based retain-mode rendering and model
 interaction library, written in C++, which has become the de facto
 standard graphics library for 3D visualization and visual simulation
 software in the scientific and engineering community.")
-    (license license:bsd-3)))
+      (license license:bsd-3))))
-- 
cgit v1.2.3


From c26b1d43fa61616212cf791082d3e38f57e6cf33 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 8 Oct 2019 01:23:02 +0200
Subject: gnu: linux-libre@5.2: Update to 5.2.19.

* gnu/packages/linux.scm (deblob-scripts-5.2)
(linux-libre-5.2-version, linux-libre-5.2-pristine-source):
Update to 5.2.19.
---
 gnu/packages/linux.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 910aeed6ff..cbb6033eb7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -190,9 +190,9 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
 
 (define deblob-scripts-5.2
   (linux-libre-deblob-scripts
-   "5.2.17"
+   "5.2.19"
    (base32 "076fwxlm6jq6z4vg1xq3kr474zz7qk71r90sf9dnfia3rw2pb4fa")
-   (base32 "0d3pp1bqchqc7vnxr1a56km5r0hzjiiipzz2xc3wgjwfi51k9kxc")))
+   (base32 "1vghzpvlsvz5q8baxjza8jdryjmcx61g2pmnm6dd1k7glr6jy1a9")))
 
 (define deblob-scripts-4.19
   (linux-libre-deblob-scripts
@@ -366,10 +366,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.3)))
 
-(define-public linux-libre-5.2-version "5.2.18")
+(define-public linux-libre-5.2-version "5.2.19")
 (define-public linux-libre-5.2-pristine-source
   (let ((version linux-libre-5.2-version)
-        (hash (base32 "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd")))
+        (hash (base32 "12mi857lyd5vj8qhj2f505hqnwzsnd829hxd78n9kk88iv1f966y")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
-- 
cgit v1.2.3


From ddefa2ff5cb12b55696874b9acf969754994d0f0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 8 Oct 2019 01:24:08 +0200
Subject: gnu: linux-libre@4.19: Update to 4.19.77.

* gnu/packages/linux.scm (deblob-scripts-4.19)
(linux-libre-4.19-version, linux-libre-4.19-pristine-source):
Update to 4.19.77.
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index cbb6033eb7..8a3d6b7d75 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -196,7 +196,7 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
 
 (define deblob-scripts-4.19
   (linux-libre-deblob-scripts
-   "4.19.75"
+   "4.19.77"
    (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy")
    (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za")))
 
@@ -374,10 +374,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.2)))
 
-(define-public linux-libre-4.19-version "4.19.76")
+(define-public linux-libre-4.19-version "4.19.77")
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-        (hash (base32 "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds")))
+        (hash (base32 "1agksl35amjzc6g6d9zjwz6p5qir2cligb5c1d9s2bag9766jav1")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
-- 
cgit v1.2.3


From a48f08bc81a72d25197ba8b88adb0c65aa6198e4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 8 Oct 2019 05:14:59 +0200
Subject: gnu: linux-libre@4.9: Update to 4.9.195.

* gnu/packages/linux.scm (deblob-scripts-4.9)
(linux-libre-4.9-version, linux-libre-4.9-pristine-source):
Update to 4.9.195.
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8a3d6b7d75..908a55e78b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -208,7 +208,7 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
 
 (define deblob-scripts-4.9
   (linux-libre-deblob-scripts
-   "4.9.194"
+   "4.9.195"
    (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg")
    (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w")))
 
@@ -390,10 +390,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
 
-(define-public linux-libre-4.9-version "4.9.194")
+(define-public linux-libre-4.9-version "4.9.195")
 (define-public linux-libre-4.9-pristine-source
   (let ((version linux-libre-4.9-version)
-        (hash (base32 "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m")))
+        (hash (base32 "0s4xj8f1dpnz3fbrqmgwq02smhcrq1ni8hgn2bbfqvm15lm5dgjl")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
-- 
cgit v1.2.3


From d7a6a3f32843c7bd700aae1b7c9acdf7da2d3ab9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Tue, 8 Oct 2019 05:22:32 +0200
Subject: gnu: linux-libre@4.14: Update to 4.14.147.

* gnu/packages/linux.scm (deblob-scripts-4.14)
(linux-libre-4.14-version, linux-libre-4.14-pristine-source):
Update to 4.14.147.
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 908a55e78b..d77e136a0f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -202,7 +202,7 @@ defconfig.  Return the appropriate make target if applicable, otherwise return
 
 (define deblob-scripts-4.14
   (linux-libre-deblob-scripts
-   "4.14.146"
+   "4.14.147"
    (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6")
    (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n")))
 
@@ -382,10 +382,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
 
-(define-public linux-libre-4.14-version "4.14.146")
+(define-public linux-libre-4.14-version "4.14.147")
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-        (hash (base32 "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3")))
+        (hash (base32 "04jvp05spszcxmkdsl21dylbcf76ns9bwxf1zlk4x7cxiil97mwg")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
-- 
cgit v1.2.3


From ce94fcfd6e4966fff12c4c246b11a843ac77af85 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Thu, 8 Aug 2019 21:23:50 +0100
Subject: gnu: Add fifechan.

* gnu/packages/games.scm (fifechan): New variable.
---
 gnu/packages/games.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c0d8ce9c71..ebd21fb501 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2027,6 +2027,33 @@ some of the restrictions in the venerable Z-machine format.  This is the
 reference interpreter, using the Glk API.")
    (license license:expat)))
 
+(define-public fifechan
+  (package
+    (name "fifechan")
+    (version "0.1.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://codeload.github.com/fifengine/"
+                                  "fifechan/tar.gz/" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0wxs9vz5x9y8chghd8vp7vfk089lfb0qnzggi17zrqkrngs5zgi9"))))
+    (build-system cmake-build-system)
+    (inputs
+     `(("sdl2" ,sdl2)
+       ("sdl2-image" ,sdl2-image)
+       ("mesa" ,mesa)))
+    (arguments
+     '(#:tests? #f))                    ; No included tests
+    (home-page "https://fifengine.github.io/fifechan/")
+    (synopsis "Cross platform GUI library specifically for games")
+    (description
+     "Fifechan is a lightweight cross platform GUI library written in C++
+specifically designed for games.  It has a built in set of extendable GUI
+Widgets, and allows users to create more.")
+    (license license:lgpl2.1+)))
+
 (define-public fizmo
   (package
     (name "fizmo")
-- 
cgit v1.2.3


From 2372a5f92e14d3b96e9d658cfb1176101a00bea1 Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Thu, 8 Aug 2019 21:23:51 +0100
Subject: gnu: Add fifengine.

* gnu/packcages/games.scm (fifengine): New variable.
---
 gnu/packages/games.scm | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index ebd21fb501..0ebf262126 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2054,6 +2054,99 @@ specifically designed for games.  It has a built in set of extendable GUI
 Widgets, and allows users to create more.")
     (license license:lgpl2.1+)))
 
+(define-public fifengine
+  (package
+    (name "fifengine")
+    (version "0.4.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://codeload.github.com/fifengine/"
+                                  "fifengine/tar.gz/" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1y4grw25cq5iqlg05rnbyxw1njl11ypidnlsm3qy4sm3xxdvb0p8"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f            ; TODO The test running fails to run some tests.
+       #:modules ((srfi srfi-1)
+                  (guix build cmake-build-system)
+                  (guix build utils))
+       #:configure-flags
+       (list
+        (string-append "-DOPENALSOFT_INCLUDE_DIR="
+                       (assoc-ref %build-inputs "openal")
+                       "/include/AL")
+        (string-append "-DPYTHON_SITE_PACKAGES="
+                       (assoc-ref %outputs "out")
+                       "/lib/python3.7/site-packages"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-run_tests.py
+           (lambda _
+             ;; Patch the test runner to exit with a status of 1 if any test
+             ;; fails, to allow detecting failures.
+             (substitute* "run_tests.py"
+               (("ERROR\\. One or more tests failed!'\\)")
+                "ERROR. One or more tests failed!')
+\t\texit(1)"))
+             #t))
+         ;; Run tests after installation so that we can make use of the built
+         ;; python modules.
+         (delete 'check)
+         (add-after 'install 'check
+           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+             (define python-version
+               (let* ((version     (last (string-split
+                                          (assoc-ref inputs "python")
+                                          #\-)))
+                      (components  (string-split version #\.))
+                      (major+minor (take components 2)))
+                 (string-join major+minor ".")))
+
+             (when tests?
+               ;; Set PYTHONPATH so that python finds the installed modules.
+               (setenv "PYTHONPATH"
+                       (string-append (getenv "PYTHONPATH") ":"
+                                      (assoc-ref outputs "out")
+                                      "/lib/python"
+                                      python-version
+                                      "/site-packages"))
+               ;; The tests require an X server.
+               (system "Xvfb :1 &")
+               (setenv "DISPLAY" ":1")
+               (setenv "XDG_RUNTIME_DIR" "/tmp")
+               ;; Run tests
+               (chdir ,(string-append "../" name "-" version))
+               (invoke "python3" "run_tests.py" "-a"))
+             #t)))))
+    (inputs
+     `(("sdl2" ,sdl2)
+       ("sdl2-image" ,sdl2-image)
+       ("sdl2-ttf" ,sdl2-ttf)
+       ("tinyxml" ,tinyxml)
+       ("openal" ,openal)
+       ("libogg" ,libogg)
+       ("glew" ,glew)
+       ("libvorbis" ,libvorbis)
+       ("boost" ,boost)
+       ("fifechan" ,fifechan)
+       ("swig" ,swig)
+       ("python" ,python)))
+    (native-inputs
+     `(("python" ,python)
+       ("swig" ,swig)
+       ("xvfb" ,xorg-server)))
+    (propagated-inputs
+     `(("python-future" ,python-future)))
+    (home-page "https://www.fifengine.net/")
+    (synopsis "FIFE is a multi-platform isometric game engine written in C++")
+    (description
+     "@acronym{FIFE, Flexible Isometric Free Engine} is a multi-platform
+isometric game engine.  Python bindings are included allowing users to create
+games using Python as well as C++.")
+    (license license:lgpl2.1+)))
+
 (define-public fizmo
   (package
     (name "fizmo")
-- 
cgit v1.2.3


From a1c1943b7c49dfb6aef9a98b2cbce0d31cbed08b Mon Sep 17 00:00:00 2001
From: Christopher Baines 
Date: Thu, 8 Aug 2019 21:23:52 +0100
Subject: gnu: Add unknown-horizons.

* gnu/packages/games.scm (unknown-horizons): New variable.
---
 gnu/packages/games.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 0ebf262126..3489c90644 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2306,6 +2306,78 @@ against each other or just trying to beat the computer; single-player mode is
 also available.")
     (license license:gpl3+)))
 
+(define-public unknown-horizons
+  (package
+    (name "unknown-horizons")
+    (version "2019.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://codeload.github.com/unknown-horizons/"
+                                  "unknown-horizons/tar.gz/" version))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1n747p7h0qp48szgp262swg0xh8kxy1bw8ag1qczs4i26hyzs5x4"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-HOME
+           (lambda _
+             (setenv "HOME" "/tmp")))
+         (add-after 'build 'build-extra
+           (lambda _
+             (invoke "python3" "./setup.py" "build_i18n")
+             (invoke "python3" "horizons/engine/generate_atlases.py" "2048")
+             #t))
+         (add-after 'install 'patch
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* (string-append out "/bin/unknown-horizons")
+                 (("os\\.chdir\\(get\\_content\\_dir\\_parent_path\\(\\)\\)")
+                  (string-append "os.chdir(\""
+                                 (assoc-ref outputs "out")
+                                 "/share/unknown-horizons\")"))))
+             #t))
+         ;; TODO: Run GUI tests as well
+         (replace 'check
+           (lambda _
+             (substitute* "horizons/constants.py"
+               (("IS_DEV_VERSION = False")
+                "IS_DEV_VERSION = True"))
+             (invoke "pytest" "tests")
+             (substitute* "horizons/constants.py"
+               (("IS_DEV_VERSION = True")
+                "IS_DEV_VERSION = False"))
+             #t)))))
+    (inputs
+     `(("fifengine" ,fifengine)
+       ("python:tk" ,python "tk")
+       ("python-pillow" ,python-pillow)
+       ("python-pyyaml" ,python-pyyaml)))
+    (native-inputs
+     `(("intltool" ,intltool)
+
+       ;; Required for tests
+       ("python-greenlet" ,python-greenlet)
+       ("python-polib" ,python-polib)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-mock" ,python-pytest-mock)))
+    (home-page "http://unknown-horizons.org/")
+    (synopsis "Isometric realtime strategy, economy and city building simulation")
+    (description
+     "Unknown Horizons is a 2D realtime strategy simulation with an emphasis
+on economy and city building.  Expand your small settlement to a strong and
+wealthy colony, collect taxes and supply your inhabitants with valuable
+goods.  Increase your power with a well balanced economy and with strategic
+trade and diplomacy.")
+    (license (list
+              license:gpl2+        ; Covers code
+              license:expat        ; tests/dummy.py, ext/polib.py
+              license:cc-by-sa3.0  ; Covers some media content
+              license:cc-by3.0     ; Covers some media content
+              license:bsd-3))))    ; horizons/ext/speaklater.py
+
 (define-public gnujump
   (package
     (name "gnujump")
-- 
cgit v1.2.3


From d57660c54907cc6fba8b0adf6295fd2311ada6cf Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt 
Date: Tue, 8 Oct 2019 10:03:54 +0200
Subject: gnu: Add serapeum.

* gnu/packages/lisp.scm (cl-serapeum, ecl-serapeum, sbcl-serapeum): New variables.
---
 gnu/packages/lisp.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 84597e4e73..2bdebed04e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -7664,3 +7664,57 @@ implementation specific equivalent.")
 
 (define-public ecl-trivial-macroexpand-all
   (sbcl-package->ecl-package sbcl-trivial-macroexpand-all))
+
+(define-public sbcl-serapeum
+  (let ((commit "65837f8a0d65b36369ec8d000fff5c29a395b5fe")
+        (revision "0"))
+    (package
+      (name "sbcl-serapeum")
+      (version (git-version "0.0.0" revision commit))
+      (home-page "https://github.com/ruricolist/serapeum")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url home-page)
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "0clwf81r2lvk1rbfvk91s9zmbkas9imf57ilqclw12mxaxlfsnbw"))))
+      (build-system asdf-build-system/sbcl)
+      (inputs
+       `(("alexandria" ,sbcl-alexandria)
+         ("trivia" ,sbcl-trivia)
+         ("trivia.quasiquote" ,sbcl-trivia.quasiquote)
+         ("split-sequence" ,sbcl-split-sequence)
+         ("string-case" ,sbcl-string-case)
+         ("parse-number" ,sbcl-parse-number)
+         ("trivial-garbage" ,sbcl-trivial-garbage)
+         ("bordeaux-threads" ,sbcl-bordeaux-threads)
+         ("named-readtables" ,sbcl-named-readtables)
+         ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras)
+         ("parse-declarations-1.0" ,sbcl-parse-declarations)
+         ("global-vars" ,sbcl-global-vars)
+         ("trivial-file-size" ,sbcl-trivial-file-size)
+         ("trivial-macroexpand-all" ,sbcl-trivial-macroexpand-all)))
+      (native-inputs
+       `(("fiveam" ,sbcl-fiveam)
+         ("local-time" ,sbcl-local-time)))
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'disable-failing-tests
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* "serapeum.asd"
+                 ;; Guix does not have Quicklisp, and probably never will.
+                 (("\\(:file \"quicklisp\"\\)") ""))
+               #t)))))
+      (synopsis "Common Lisp utility library beyond Alexandria")
+      (description
+       "Serapeum is a conservative library of Common Lisp utilities.  It is a
+supplement, not a competitor, to Alexandria.")
+      (license license:expat))))
+
+(define-public cl-serapeum
+  (sbcl-package->cl-source-package sbcl-serapeum))
-- 
cgit v1.2.3


From 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 8 Oct 2019 10:16:04 +0200
Subject: gnu: mariadb: Build with GCC 5 on ARMv7.

Fixes .

* gnu/packages/databases.scm (mariadb)[native-inputs]: Add GCC-5 when the
current system is ARMv7.
---
 gnu/packages/databases.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7960b7087a..bb7adf25a6 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -72,6 +72,7 @@
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
@@ -779,6 +780,10 @@ Language.")
               #t))))))
     (native-inputs
      `(("bison" ,bison)
+       ;; XXX: On armhf, use GCC 5 to work around .
+       ,@(if (string-prefix? "armhf" (%current-system))
+             `(("gcc", gcc-5))
+             '())
        ("perl" ,perl)))
     (inputs
      `(("jemalloc" ,jemalloc)
-- 
cgit v1.2.3


From 861907f01efb1cae7f260e8cb7b991d5034a486a Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 8 Oct 2019 13:14:16 +0200
Subject: gnu: linux-libre@5.3: Apply upstream entropy fix.

See .

* gnu/packages/linux.scm (linux-libre-5.3-source): Add
"linux-libre-active-entropy.patch".
---
 gnu/packages/linux.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6f7ec1bb15..e4abeadaa0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -435,7 +435,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
 
 (define-public linux-libre-5.3-source
   (source-with-patches linux-libre-5.3-pristine-source
-                       (list %boot-logo-patch
+                       (list (search-patch "linux-libre-active-entropy.patch")
+                             %boot-logo-patch
                              %linux-libre-arm-export-__sync_icache_dcache-patch)))
 
 (define-public linux-libre-5.2-source
-- 
cgit v1.2.3